From 5e8c1cf25beccac1d22d10dc866912394f42771b Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Tue, 9 Dec 2014 17:57:18 +0800 Subject: [2.25] sync to a30720e3e633f275250e26f85ccae5dbdddfb6c6 local patches will be re-applied later commit a30720e3e633f275250e26f85ccae5dbdddfb6c6 Author: Alan Modra Date: Wed Nov 19 10:30:16 2014 +1030 daily update Change-Id: Ieb2a3f4dd2ecb289ac5305ff08d428b2847494ab --- binutils-2.25/ld/emultempl/vms.em | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'binutils-2.25/ld/emultempl/vms.em') diff --git a/binutils-2.25/ld/emultempl/vms.em b/binutils-2.25/ld/emultempl/vms.em index 30c1a160..40be66d8 100644 --- a/binutils-2.25/ld/emultempl/vms.em +++ b/binutils-2.25/ld/emultempl/vms.em @@ -1,6 +1,5 @@ # This shell script emits a C file. -*- C -*- -# Copyright 2010, 2012 -# Free Software Foundation, Inc. +# Copyright (C) 2010-2014 Free Software Foundation, Inc. # # This file is part of the GNU Binutils. # @@ -58,7 +57,7 @@ gld${EMULATION_NAME}_open_dynamic_archive (const char *arch ATTRIBUTE_UNUSED, { char *string; - if (! entry->flags.maybe_archive) + if (! entry->flags.maybe_archive || entry->flags.full_name_provided) return FALSE; string = (char *) xmalloc (strlen (search->name) @@ -208,9 +207,12 @@ gld${EMULATION_NAME}_before_allocation (void) static void gld${EMULATION_NAME}_after_allocation (void) { - bfd_boolean need_layout = bfd_elf_discard_info (link_info.output_bfd, - &link_info); - gld${EMULATION_NAME}_map_segments (need_layout); + int need_layout = bfd_elf_discard_info (link_info.output_bfd, &link_info); + + if (need_layout < 0) + einfo ("%X%P: .eh_frame/.stab edit: %E\n"); + else + gld${EMULATION_NAME}_map_segments (need_layout); } static void -- cgit v1.2.3