--- binutils-2.27.orig/binutils/objdump.c	2016-11-08 15:39:41.094551341 +0000

+++ binutils-2.27/binutils/objdump.c	2016-11-08 16:04:52.433507357 +0000

@@ -620,6 +620,18 @@ slurp_dynamic_symtab (bfd *abfd)

   return sy;

 }

+/* Some symbol names are significant and should be kept in the

+   table of sorted symbol names, even if they are marked as

+   debugging/section symbols.  */

+

+static bfd_boolean

+is_significant_symbol_name (const char * name)

+{

+  return strcmp (name, ".plt") == 0

+    ||   strcmp (name, ".got") == 0

+    ||   strcmp (name, ".plt.got") == 0;

+}

+

 /* Filter out (in place) symbols that are useless for disassembly.

    COUNT is the number of elements in SYMBOLS.

    Return the number of useful symbols.  */

@@ -635,7 +647,8 @@ remove_useless_symbols (asymbol **symbol

       if (sym->name == NULL || sym->name[0] == '\0')

 	continue;

-      if (sym->flags & (BSF_DEBUGGING | BSF_SECTION_SYM))

+      if ((sym->flags & (BSF_DEBUGGING | BSF_SECTION_SYM))

+	  && ! is_significant_symbol_name (sym->name))

 	continue;

       if (bfd_is_und_section (sym->section)

 	  || bfd_is_com_section (sym->section))

@@ -903,11 +916,13 @@ find_symbol_for_address (bfd_vma vma,

   /* The symbol we want is now in min, the low end of the range we

      were searching.  If there are several symbols with the same

-     value, we want the first one.  */

+     value, we want the first (non-section/non-debugging) one.  */

   thisplace = min;

   while (thisplace > 0

 	 && (bfd_asymbol_value (sorted_syms[thisplace])

-	     == bfd_asymbol_value (sorted_syms[thisplace - 1])))

+	     == bfd_asymbol_value (sorted_syms[thisplace - 1]))

+	 && ((sorted_syms[thisplace - 1]->flags

+	      & (BSF_SECTION_SYM | BSF_DEBUGGING)) == 0))

     --thisplace;

   /* Prefer a symbol in the current section if we have multple symbols

@@ -993,6 +1008,41 @@ find_symbol_for_address (bfd_vma vma,

 	return NULL;

     }

+  /* If we have not found an exact match for the specified address

+     and we have dynamic relocations available, then we can produce

+     a better result by matching a relocation to the address and

+     using the symbol associated with that relocation.  */

+  if (!want_section

+      && aux->dynrelbuf != NULL

+      && sorted_syms[thisplace]->value != vma

+      /* If we have matched a synthetic symbol, then stick with that.  */

+      && (sorted_syms[thisplace]->flags & BSF_SYNTHETIC) == 0)

+    {

+      arelent **  rel_pp;

+      long        rel_count;

+

+      for (rel_count = aux->dynrelcount, rel_pp = aux->dynrelbuf;

+	   rel_count--;)

+	{

+	  arelent * rel = rel_pp[rel_count];

+

+	  if (rel->address == vma

+	      && rel->sym_ptr_ptr != NULL

+	      /* Absolute relocations do not provide a more helpful symbolic address.  */

+	      && ! bfd_is_abs_section ((* rel->sym_ptr_ptr)->section))

+	    {

+	      if (place != NULL)

+		* place = thisplace;

+	      return * rel->sym_ptr_ptr;

+	    }

+

+	  /* We are scanning backwards, so if we go below the target address

+	     we have failed.  */

+	  if (rel_pp[rel_count]->address < vma)

+	    break;

+	}

+    }

+

   if (place != NULL)

     *place = thisplace;

@@ -1031,7 +1081,19 @@ objdump_print_addr_with_sym (bfd *abfd,

     {

       (*inf->fprintf_func) (inf->stream, " <");

       objdump_print_symname (abfd, inf, sym);

-      if (bfd_asymbol_value (sym) > vma)

+

+      if (bfd_asymbol_value (sym) == vma)

+	;

+      /* Undefined symbols in an executables and dynamic objects do not have

+	 a value associated with them, so it does not make sense to display

+	 an offset relative to them.  Normally we would not be provided with

+	 this kind of symbol, but the target backend might choose to do so,

+	 and the code in find_symbol_for_address might return an as yet

+	 unresolved symbol associated with a dynamic reloc.  */

+      else if ((bfd_get_file_flags (abfd) & (EXEC_P | DYNAMIC))

+	       && bfd_is_und_section (sym->section))

+	;

+      else if (bfd_asymbol_value (sym) > vma)

 	{

 	  (*inf->fprintf_func) (inf->stream, "-0x");

 	  objdump_print_value (bfd_asymbol_value (sym) - vma, inf, TRUE);

@@ -1996,7 +2058,7 @@ disassemble_section (bfd *abfd, asection

   /* Decide which set of relocs to use.  Load them if necessary.  */

   paux = (struct objdump_disasm_info *) pinfo->application_data;

-  if (paux->dynrelbuf)

+  if (paux->dynrelbuf && dump_dynamic_reloc_info)

     {

       rel_pp = paux->dynrelbuf;

       rel_count = paux->dynrelcount;

@@ -2273,13 +2335,11 @@ disassemble_data (bfd *abfd)

   /* Allow the target to customize the info structure.  */

   disassemble_init_for_target (& disasm_info);

-  /* Pre-load the dynamic relocs if we are going

-     to be dumping them along with the disassembly.  */

-  if (dump_dynamic_reloc_info)

+  /* Pre-load the dynamic relocs as we may need them during the disassembly.  */

     {

       long relsize = bfd_get_dynamic_reloc_upper_bound (abfd);

-      if (relsize < 0)

+      if (relsize < 0 && dump_dynamic_reloc_info)

 	bfd_fatal (bfd_get_filename (abfd));

       if (relsize > 0)

--- binutils-2.27/gas/testsuite/gas/arm/tls.d	2015-11-13 08:27:41.000000000 +0000

+++ /work/sources/binutils/current/gas/testsuite/gas/arm/tls.d	2016-10-11 12:14:08.383657767 +0100

@@ -15,7 +15,7 @@ Disassembly of section .text:

    0:	e1a00000 	nop			; .*

 			0: R_ARM_TLS_DESCSEQ	af

    4:	e59f0014 	ldr	r0, \[pc, #20\]	; 20 .*

-   8:	fa000000 	blx	8 <ae\+.*>

+   8:	fa000000 	blx	8 <ae.*>

 			8: R_ARM_TLS_CALL	ae

    c:	e1a00000 	nop			; .*

 0+10 <.arm_pool>:

@@ -34,7 +34,7 @@ Disassembly of section .text:

   26:	46c0      	nop			; .*

 			26: R_ARM_THM_TLS_DESCSEQ	tf

   28:	4805      	ldr	r0, \[pc, #20\]	; \(40 .*\)

-  2a:	f000 e800 	blx	4 <te\+0x4>

+  2a:	f000 e800 	blx	4 <te.*>

 			2a: R_ARM_THM_TLS_CALL	te

   2e:	46c0      	nop			; .*

   30:	00000002 	.word	0x00000002

diff --git a/ld/testsuite/ld-aarch64/emit-relocs-515-be.d b/ld/testsuite/ld-aarch64/emit-relocs-515-be.d

index 0bd39e3..82d5bd6 100644

--- a/ld/testsuite/ld-aarch64/emit-relocs-515-be.d

+++ b/ld/testsuite/ld-aarch64/emit-relocs-515-be.d

@@ -12,7 +12,7 @@ Disassembly of section .text:

    10008:	8b020021 	add	x1, x1, x2

    1000c:	d2a00000 	movz	x0, #0x0, lsl #16

    10010:	8b000020 	add	x0, x1, x0

-   10014:	9400000c 	bl	10044 \<test\+0x44\>

+   10014:	9400000c 	bl	10044 \<.*\>

    10018:	d503201f 	nop

    1001c:	00000000 	.word	0x00000000

    10020:	0000ffe4 	.word	0x0000ffe4

diff --git a/ld/testsuite/ld-aarch64/emit-relocs-515.d b/ld/testsuite/ld-aarch64/emit-relocs-515.d

index 67f436b..9d84bf1 100644

--- a/ld/testsuite/ld-aarch64/emit-relocs-515.d

+++ b/ld/testsuite/ld-aarch64/emit-relocs-515.d

@@ -12,7 +12,7 @@ Disassembly of section .text:

    10008:	8b020021 	add	x1, x1, x2

    1000c:	d2a00000 	movz	x0, #0x0, lsl #16

    10010:	8b000020 	add	x0, x1, x0

-   10014:	9400000c 	bl	10044 \<test\+0x44\>

+   10014:	9400000c 	bl	10044 \<.*\>

    10018:	d503201f 	nop

    1001c:	0000ffe4 	.word	0x0000ffe4

    10020:	00000000 	.word	0x00000000

diff --git a/ld/testsuite/ld-aarch64/emit-relocs-516-be.d b/ld/testsuite/ld-aarch64/emit-relocs-516-be.d

index e3b528d..23332b0 100644

--- a/ld/testsuite/ld-aarch64/emit-relocs-516-be.d

+++ b/ld/testsuite/ld-aarch64/emit-relocs-516-be.d

@@ -13,7 +13,7 @@ Disassembly of section .text:

    1000c:	f2800100 	movk	x0, #0x8

    10010:	f2800300 	movk	x0, #0x18

    10014:	8b000020 	add	x0, x1, x0

-   10018:	9400000c 	bl	10048 \<test\+0x48\>

+   10018:	9400000c 	bl	10048 \<.*\>

    1001c:	d503201f 	nop

    10020:	00000000 	.word	0x00000000

    10024:	0000ffe0 	.word	0x0000ffe0

diff --git a/ld/testsuite/ld-aarch64/emit-relocs-516.d b/ld/testsuite/ld-aarch64/emit-relocs-516.d

index 2ace032..e2ad1d6 100644

--- a/ld/testsuite/ld-aarch64/emit-relocs-516.d

+++ b/ld/testsuite/ld-aarch64/emit-relocs-516.d

@@ -13,7 +13,7 @@ Disassembly of section .text:

    1000c:	f2800100 	movk	x0, #0x8

    10010:	f2800300 	movk	x0, #0x18

    10014:	8b000020 	add	x0, x1, x0

-   10018:	9400000c 	bl	10048 \<test\+0x48\>

+   10018:	9400000c 	bl	10048 \<.*\>

    1001c:	d503201f 	nop

    10020:	0000ffe0 	.word	0x0000ffe0

    10024:	00000000 	.word	0x00000000

diff --git a/ld/testsuite/ld-aarch64/gc-plt-relocs.d b/ld/testsuite/ld-aarch64/gc-plt-relocs.d

index 086968c..d9f9413 100644

--- a/ld/testsuite/ld-aarch64/gc-plt-relocs.d

+++ b/ld/testsuite/ld-aarch64/gc-plt-relocs.d

@@ -20,7 +20,7 @@ DYNAMIC SYMBOL TABLE:

 Disassembly of section .text:

 0+8000 \<_start\>:

-    8000:	9400000c 	bl	8030 \<foo\+0x24\>

+    8000:	9400000c 	bl	8030 \<.*>

 0+8004 \<hidfn\>:

     8004:	8a000000 	and	x0, x0, x0

diff --git a/ld/testsuite/ld-aarch64/tls-tiny-desc.d b/ld/testsuite/ld-aarch64/tls-tiny-desc.d

index 7b88786..c17c448 100644

--- a/ld/testsuite/ld-aarch64/tls-tiny-desc.d

+++ b/ld/testsuite/ld-aarch64/tls-tiny-desc.d

@@ -6,8 +6,8 @@

 Disassembly of section .text:

 0000000000010000 \<test\>:

- +10000:	58080141 	ldr	x1, 20028 \<_GLOBAL_OFFSET_TABLE_\+0x28\>

- +10004:	10080120 	adr	x0, 20028 \<_GLOBAL_OFFSET_TABLE_\+0x28\>

+ +10000:	58080141 	ldr	x1, 20028 \

+ +10004:	10080120 	adr	x0, 20028 \

  +10008:	d63f0020 	blr	x1

 Disassembly of section .plt:

diff --git a/ld/testsuite/ld-aarch64/tls-tiny-gd.d b/ld/testsuite/ld-aarch64/tls-tiny-gd.d

index 2f55f7b..9133492 100644

--- a/ld/testsuite/ld-aarch64/tls-tiny-gd.d

+++ b/ld/testsuite/ld-aarch64/tls-tiny-gd.d

@@ -6,8 +6,8 @@

 Disassembly of section .text:

 0000000000010000 \<test\>:

- +10000:	10080040 	adr	x0, 20008 \<_GLOBAL_OFFSET_TABLE_\+0x8\>

- +10004:	9400000a 	bl	1002c \<test\+0x2c\>

+ +10000:	10080040 	adr	x0, 20008 \

+ +10004:	9400000a 	bl	1002c \<.*>

  +10008:	d503201f 	nop

 Disassembly of section .plt:

diff --git a/ld/testsuite/ld-aarch64/tls-tiny-ie.d b/ld/testsuite/ld-aarch64/tls-tiny-ie.d

index 02aff35..849e73d 100644

--- a/ld/testsuite/ld-aarch64/tls-tiny-ie.d

+++ b/ld/testsuite/ld-aarch64/tls-tiny-ie.d

@@ -3,6 +3,6 @@

 #objdump: -dr

 #...

  +10000:	d53bd042 	mrs	x2, tpidr_el0

- +10004:	58080020 	ldr	x0, 20008 <_GLOBAL_OFFSET_TABLE_\+0x8>

+ +10004:	58080020 	ldr	x0, 20008 <.*>

  +10008:	8b000040 	add	x0, x2, x0

  +1000c:	b9400000 	ldr	w0, \[x0\]

diff --git a/ld/testsuite/ld-arm/arm-app-abs32.d b/ld/testsuite/ld-arm/arm-app-abs32.d

index 13221f0..d888929 100644

--- a/ld/testsuite/ld-arm/arm-app-abs32.d

+++ b/ld/testsuite/ld-arm/arm-app-abs32.d

@@ -6,9 +6,9 @@ start address .*

 Disassembly of section .plt:

-.* <lib_func1@plt-0x14>:

+.* <.plt>:

  +.*:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

- +.*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <lib_func1@plt-0x4>

+ +.*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <.*>

  +.*:	e08fe00e 	add	lr, pc, lr

  +.*:	e5bef008 	ldr	pc, \[lr, #8\]!

  +.*:	.* 	.*

diff --git a/ld/testsuite/ld-arm/arm-app.d b/ld/testsuite/ld-arm/arm-app.d

index 98fc899..dd4cf81 100644

--- a/ld/testsuite/ld-arm/arm-app.d

+++ b/ld/testsuite/ld-arm/arm-app.d

@@ -6,9 +6,9 @@ start address 0x.*

 Disassembly of section .plt:

-.* <lib_func1@plt-0x14>:

+.* <.plt>:

  .*:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

- .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <lib_func1@plt-0x4>

+ .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <.*>

  .*:	e08fe00e 	add	lr, pc, lr

  .*:	e5bef008 	ldr	pc, \[lr, #8\]!

  .*:	.*

diff --git a/ld/testsuite/ld-arm/arm-lib-plt32.d b/ld/testsuite/ld-arm/arm-lib-plt32.d

index ecc2cf2..2eaf89a 100644

--- a/ld/testsuite/ld-arm/arm-lib-plt32.d

+++ b/ld/testsuite/ld-arm/arm-lib-plt32.d

@@ -6,9 +6,9 @@ start address 0x.*

 Disassembly of section .plt:

-.* <app_func2@plt-0x14>:

+.* <.plt>:

  .*:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

- .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <app_func2@plt-0x4>

+ .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <.*>

  .*:	e08fe00e 	add	lr, pc, lr

  .*:	e5bef008 	ldr	pc, \[lr, #8\]!

  .*:	.*

diff --git a/ld/testsuite/ld-arm/arm-lib.d b/ld/testsuite/ld-arm/arm-lib.d

index 0e2a7aa..ac439ea 100644

--- a/ld/testsuite/ld-arm/arm-lib.d

+++ b/ld/testsuite/ld-arm/arm-lib.d

@@ -6,9 +6,9 @@ start address 0x.*

 Disassembly of section .plt:

-.* <app_func2@plt-0x14>:

+.* <.plt>:

  .*:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

- .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <app_func2@plt-0x4>

+ .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <.*>

  .*:	e08fe00e 	add	lr, pc, lr

  .*:	e5bef008 	ldr	pc, \[lr, #8\]!

  .*:	.*

diff --git a/ld/testsuite/ld-arm/armthumb-lib.d b/ld/testsuite/ld-arm/armthumb-lib.d

index 9a5dea8..4f43b8e 100644

--- a/ld/testsuite/ld-arm/armthumb-lib.d

+++ b/ld/testsuite/ld-arm/armthumb-lib.d

@@ -6,9 +6,9 @@ start address 0x.*

 Disassembly of section .plt:

-.* <app_func2@plt-0x14>:

+.* <.plt>:

  .*:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

- .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <app_func2@plt-0x4>

+ .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <.*>

  .*:	e08fe00e 	add	lr, pc, lr

  .*:	e5bef008 	ldr	pc, \[lr, #8\]!

  .*:	.*

diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d

index 0f40861..bbf6839 100644

--- a/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d

+++ b/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d

@@ -4,9 +4,9 @@

 Disassembly of section \.plt:

-00008000 <bar@plt-0x14>:

+00008000 <.*>:

     8000:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

-    8004:	e59fe004 	ldr	lr, \[pc, #4\]	; 8010 <bar@plt-0x4>

+    8004:	e59fe004 	ldr	lr, \[pc, #4\]	; 8010 <.*>

     8008:	e08fe00e 	add	lr, pc, lr

     800c:	e5bef008 	ldr	pc, \[lr, #8\]!

     8010:	00000ffc 	\.word	0x00000ffc

diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d

index b6e6fff..079c928 100644

--- a/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d

+++ b/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d

@@ -4,9 +4,9 @@

 Disassembly of section \.plt:

-00008000 <bar@plt-0x14>:

+00008000 <.plt>:

     8000:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

-    8004:	e59fe004 	ldr	lr, \[pc, #4\]	; 8010 <bar@plt-0x4>

+    8004:	e59fe004 	ldr	lr, \[pc, #4\]	; 8010 <.*>

     8008:	e08fe00e 	add	lr, pc, lr

     800c:	e5bef008 	ldr	pc, \[lr, #8\]!

     8010:	00001004 	\.word	0x00001004

diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d

index baad3d0..e4e6760 100644

--- a/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d

+++ b/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d

@@ -4,9 +4,9 @@

 Disassembly of section \.plt:

-00008000 <bar@plt-0x14>:

+00008000 <.plt>:

     8000:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

-    8004:	e59fe004 	ldr	lr, \[pc, #4\]	; 8010 <bar@plt-0x4>

+    8004:	e59fe004 	ldr	lr, \[pc, #4\]	; 8010 <.*>

     8008:	e08fe00e 	add	lr, pc, lr

     800c:	e5bef008 	ldr	pc, \[lr, #8\]!

     8010:	00000ffc 	\.word	0x00000ffc

diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d

index c504f79..4a5be27 100644

--- a/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d

+++ b/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d

@@ -4,9 +4,9 @@

 Disassembly of section \.plt:

-00008e00 <targetfn@plt-0x14>:

+00008e00 <.plt>:

     8e00:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

-    8e04:	e59fe004 	ldr	lr, \[pc, #4\]	; 8e10 <targetfn@plt-0x4>

+    8e04:	e59fe004 	ldr	lr, \[pc, #4\]	; 8e10 <.*>

     8e08:	e08fe00e 	add	lr, pc, lr

     8e0c:	e5bef008 	ldr	pc, \[lr, #8\]!

     8e10:	0001027c 	\.word	0x0001027c

diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d

index baad3d0..e4e6760 100644

--- a/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d

+++ b/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d

@@ -4,9 +4,9 @@

 Disassembly of section \.plt:

-00008000 <bar@plt-0x14>:

+00008000 <.plt>:

     8000:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

-    8004:	e59fe004 	ldr	lr, \[pc, #4\]	; 8010 <bar@plt-0x4>

+    8004:	e59fe004 	ldr	lr, \[pc, #4\]	; 8010 <.*>

     8008:	e08fe00e 	add	lr, pc, lr

     800c:	e5bef008 	ldr	pc, \[lr, #8\]!

     8010:	00000ffc 	\.word	0x00000ffc

diff --git a/ld/testsuite/ld-arm/farcall-mixed-app-v5.d b/ld/testsuite/ld-arm/farcall-mixed-app-v5.d

index ea0e823..b570bad 100644

--- a/ld/testsuite/ld-arm/farcall-mixed-app-v5.d

+++ b/ld/testsuite/ld-arm/farcall-mixed-app-v5.d

@@ -6,9 +6,9 @@ start address 0x.*

 Disassembly of section .plt:

-.* <lib_func2@plt-0x14>:

+.* <.plt>:

  .*:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

- .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <lib_func2@plt-0x4>

+ .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <.*>

  .*:	e08fe00e 	add	lr, pc, lr

  .*:	e5bef008 	ldr	pc, \[lr, #8\]!

  .*:	.*

diff --git a/ld/testsuite/ld-arm/farcall-mixed-app.d b/ld/testsuite/ld-arm/farcall-mixed-app.d

index 86127ef..9fa97dc 100644

--- a/ld/testsuite/ld-arm/farcall-mixed-app.d

+++ b/ld/testsuite/ld-arm/farcall-mixed-app.d

@@ -6,9 +6,9 @@ start address 0x.*

 Disassembly of section .plt:

-.* <lib_func2@plt-0x14>:

+.* <.plt>:

  .*:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

- .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <lib_func2@plt-0x4>

+ .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <.*>

  .*:	e08fe00e 	add	lr, pc, lr

  .*:	e5bef008 	ldr	pc, \[lr, #8\]!

  .*:	.*

diff --git a/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d b/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d

index e2dbc1b..fa52ad1 100644

--- a/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d

+++ b/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d

@@ -5,9 +5,9 @@ start address 0x.*

 Disassembly of section .plt:

-.* <app_func@plt-0x14>:

+.* <.plt>:

  .*:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

- .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <app_func@plt-0x4>

+ .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <.*>

  .*:	e08fe00e 	add	lr, pc, lr

  .*:	e5bef008 	ldr	pc, \[lr, #8\]!

  .*:	.* 	.word	.*

diff --git a/ld/testsuite/ld-arm/farcall-mixed-lib.d b/ld/testsuite/ld-arm/farcall-mixed-lib.d

index b736983..ad7352b 100644

--- a/ld/testsuite/ld-arm/farcall-mixed-lib.d

+++ b/ld/testsuite/ld-arm/farcall-mixed-lib.d

@@ -5,9 +5,9 @@ start address 0x.*

 Disassembly of section .plt:

-.* <app_func@plt-0x14>:

+.* <.plt>:

  .*:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

- .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <app_func@plt-0x4>

+ .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <.*>

  .*:	e08fe00e 	add	lr, pc, lr

  .*:	e5bef008 	ldr	pc, \[lr, #8\]!

  .*:	.*

diff --git a/ld/testsuite/ld-arm/ifunc-10.dd b/ld/testsuite/ld-arm/ifunc-10.dd

index d96c086..05e4be5 100644

--- a/ld/testsuite/ld-arm/ifunc-10.dd

+++ b/ld/testsuite/ld-arm/ifunc-10.dd

@@ -4,9 +4,9 @@

 Disassembly of section \.plt:

-00009000 <atf2@plt-0x14>:

+00009000 <.plt>:

     9000:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

-    9004:	e59fe004 	ldr	lr, \[pc, #4\]	; 9010 <atf2@plt-0x4>

+    9004:	e59fe004 	ldr	lr, \[pc, #4\]	; 9010 <.*>

     9008:	e08fe00e 	add	lr, pc, lr

     900c:	e5bef008 	ldr	pc, \[lr, #8\]!

 #------------------------------------------------------------------------------

diff --git a/ld/testsuite/ld-arm/ifunc-14.dd b/ld/testsuite/ld-arm/ifunc-14.dd

index cbad1c8..281373c 100644

--- a/ld/testsuite/ld-arm/ifunc-14.dd

+++ b/ld/testsuite/ld-arm/ifunc-14.dd

@@ -4,9 +4,9 @@

 Disassembly of section \.plt:

-00009000 <f2t@plt-0x14>:

+00009000 <.plt>:

     9000:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

-    9004:	e59fe004 	ldr	lr, \[pc, #4\]	; 9010 <__irel_end\+0xff0>

+    9004:	e59fe004 	ldr	lr, \[pc, #4\]	; 9010 <.*>

     9008:	e08fe00e 	add	lr, pc, lr

     900c:	e5bef008 	ldr	pc, \[lr, #8\]!

 #------------------------------------------------------------------------------

diff --git a/ld/testsuite/ld-arm/ifunc-15.dd b/ld/testsuite/ld-arm/ifunc-15.dd

index f23e8e8..d3fbf9d 100644

--- a/ld/testsuite/ld-arm/ifunc-15.dd

+++ b/ld/testsuite/ld-arm/ifunc-15.dd

@@ -4,9 +4,9 @@

 Disassembly of section \.plt:

-00009000 <f2t@plt-0x14>:

+00009000 <.plt>:

     9000:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

-    9004:	e59fe004 	ldr	lr, \[pc, #4\]	; 9010 <__irel_end\+0xff0>

+    9004:	e59fe004 	ldr	lr, \[pc, #4\]	; 9010 <.*>

     9008:	e08fe00e 	add	lr, pc, lr

     900c:	e5bef008 	ldr	pc, \[lr, #8\]!

 #------------------------------------------------------------------------------

diff --git a/ld/testsuite/ld-arm/ifunc-3.dd b/ld/testsuite/ld-arm/ifunc-3.dd

index b267bf1..2297e5a 100644

--- a/ld/testsuite/ld-arm/ifunc-3.dd

+++ b/ld/testsuite/ld-arm/ifunc-3.dd

@@ -4,9 +4,9 @@

 Disassembly of section \.plt:

-00009000 <f2@plt-0x14>:

+00009000 <.plt>:

     9000:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

-    9004:	e59fe004 	ldr	lr, \[pc, #4\]	; 9010 <f2@plt-0x4>

+    9004:	e59fe004 	ldr	lr, \[pc, #4\]	; 9010 <.*>

     9008:	e08fe00e 	add	lr, pc, lr

     900c:	e5bef008 	ldr	pc, \[lr, #8\]!

 #------------------------------------------------------------------------------

diff --git a/ld/testsuite/ld-arm/ifunc-4.dd b/ld/testsuite/ld-arm/ifunc-4.dd

index 6ce996b..647a340 100644

--- a/ld/testsuite/ld-arm/ifunc-4.dd

+++ b/ld/testsuite/ld-arm/ifunc-4.dd

@@ -4,9 +4,9 @@

 Disassembly of section \.plt:

-00009000 <atf2@plt-0x14>:

+00009000 <.plt>:

     9000:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

-    9004:	e59fe004 	ldr	lr, \[pc, #4\]	; 9010 <atf2@plt-0x4>

+    9004:	e59fe004 	ldr	lr, \[pc, #4\]	; 9010 <.*>

     9008:	e08fe00e 	add	lr, pc, lr

     900c:	e5bef008 	ldr	pc, \[lr, #8\]!

 #------------------------------------------------------------------------------

diff --git a/ld/testsuite/ld-arm/ifunc-9.dd b/ld/testsuite/ld-arm/ifunc-9.dd

index af7ec4b..cc4afa8 100644

--- a/ld/testsuite/ld-arm/ifunc-9.dd

+++ b/ld/testsuite/ld-arm/ifunc-9.dd

@@ -4,9 +4,9 @@

 Disassembly of section \.plt:

-00009000 <f2@plt-0x14>:

+00009000 <.plt>:

     9000:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

-    9004:	e59fe004 	ldr	lr, \[pc, #4\]	; 9010 <f2@plt-0x4>

+    9004:	e59fe004 	ldr	lr, \[pc, #4\]	; 9010 <.*>

     9008:	e08fe00e 	add	lr, pc, lr

     900c:	e5bef008 	ldr	pc, \[lr, #8\]!

 #------------------------------------------------------------------------------

diff --git a/ld/testsuite/ld-arm/long-plt-format.d b/ld/testsuite/ld-arm/long-plt-format.d

index b0a1abc..b14d9b5 100644

--- a/ld/testsuite/ld-arm/long-plt-format.d

+++ b/ld/testsuite/ld-arm/long-plt-format.d

@@ -3,7 +3,7 @@

 Disassembly of section .plt:

-.* <foo@plt-0x14>:

+.* <.plt>:

  .*:	.*

  .*:	.*

  .*:	.*

diff --git a/ld/testsuite/ld-arm/mixed-app-v5.d b/ld/testsuite/ld-arm/mixed-app-v5.d

index 0ad39e6..9c734a9 100644

--- a/ld/testsuite/ld-arm/mixed-app-v5.d

+++ b/ld/testsuite/ld-arm/mixed-app-v5.d

@@ -6,9 +6,9 @@ start address 0x.*

 Disassembly of section .plt:

-.* <lib_func2@plt-0x14>:

+.* <.plt>:

  .*:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

- .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <lib_func2@plt-0x4>

+ .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <.*>

  .*:	e08fe00e 	add	lr, pc, lr

  .*:	e5bef008 	ldr	pc, \[lr, #8\]!

  .*:	.*

diff --git a/ld/testsuite/ld-arm/mixed-app.d b/ld/testsuite/ld-arm/mixed-app.d

index 6083161..4bcbdad 100644

--- a/ld/testsuite/ld-arm/mixed-app.d

+++ b/ld/testsuite/ld-arm/mixed-app.d

@@ -6,9 +6,9 @@ start address 0x.*

 Disassembly of section .plt:

-.* <lib_func2@plt-0x14>:

+.* <.plt>:

  .*:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

- .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <lib_func2@plt-0x4>

+ .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <.*>

  .*:	e08fe00e 	add	lr, pc, lr

  .*:	e5bef008 	ldr	pc, \[lr, #8\]!

  .*:	.*

diff --git a/ld/testsuite/ld-arm/mixed-lib.d b/ld/testsuite/ld-arm/mixed-lib.d

index 271692c..a4bb26b 100644

--- a/ld/testsuite/ld-arm/mixed-lib.d

+++ b/ld/testsuite/ld-arm/mixed-lib.d

@@ -6,9 +6,9 @@ start address 0x.*

 Disassembly of section .plt:

-.* <app_func2@plt-0x14>:

+.* <.plt>:

  .*:	e52de004 	push	{lr}		; \(str lr, \[sp, #-4\]!\)

- .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <app_func2@plt-0x4>

+ .*:	e59fe004 	ldr	lr, \[pc, #4\]	; .* <.*>

  .*:	e08fe00e 	add	lr, pc, lr

  .*:	e5bef008 	ldr	pc, \[lr, #8\]!

  .*:	.*

diff --git a/ld/testsuite/ld-arm/tls-lib-loc.d b/ld/testsuite/ld-arm/tls-lib-loc.d

index 27789b4..2e641b3 100644

--- a/ld/testsuite/ld-arm/tls-lib-loc.d

+++ b/ld/testsuite/ld-arm/tls-lib-loc.d

@@ -28,6 +28,6 @@ Disassembly of section .text:

 [0-9a-f]+ <foo>:

     [0-9a-f]+:	e59f0004 	ldr	r0, \[pc, #4\]	; 818c .*

-    [0-9a-f]+:	fafffff2 	blx	8154 <.*\+0x8154>

+    [0-9a-f]+:	fafffff2 	blx	8154 <.*>

     [0-9a-f]+:	e1a00000 	nop			; .*

     818c:	000080a0 	.word	0x000080a0

diff --git a/ld/testsuite/ld-cris/dso-pltdis1.d b/ld/testsuite/ld-cris/dso-pltdis1.d

index 4bc3c70..e2c0f93 100644

--- a/ld/testsuite/ld-cris/dso-pltdis1.d

+++ b/ld/testsuite/ld-cris/dso-pltdis1.d

@@ -20,7 +20,7 @@

 Disassembly of section \.plt:

-0+1b4 <(dsofn4@plt-0x1a|dsofn@plt-0x34)>:

+0+1b4 <.*>:

  1b4:	84e2                	subq 4,\$sp

  1b6:	0401                	addoq 4,\$r0,\$acr

  1b8:	7e7a                	move \$mof,\[\$sp\]

@@ -45,7 +45,7 @@ Disassembly of section \.plt:

  1f0:	bf09                	jump \$acr

  1f2:	b005                	nop 

  1f4:	3f7e .... ....      	move .*,\$mof

- 1fa:	bf0e baff ffff      	ba 1b4 <(dsofn4@plt-0x1a|dsofn@plt-0x34)>

+ 1fa:	bf0e baff ffff      	ba 1b4 <.*>

  200:	b005                	nop 

 Disassembly of section \.text:

@@ -57,5 +57,5 @@ Disassembly of section \.text:

 0+20a <dsofn4>:

  20a:	7f0d ae20 0000      	lapc 22b8 <_GLOBAL_OFFSET_TABLE_>,\$r0

  210:	5f0d 1400           	addo\.w 0x14,\$r0,\$acr

- 214:	bfbe baff ffff      	bsr 1ce <(dsofn4@plt|dsofn@plt-0x1a)>

+ 214:	bfbe baff ffff      	bsr 1ce <.*>

 #pass

diff --git a/ld/testsuite/ld-cris/dso-pltdis2.d b/ld/testsuite/ld-cris/dso-pltdis2.d

index 5348a8a..24da97a 100644

--- a/ld/testsuite/ld-cris/dso-pltdis2.d

+++ b/ld/testsuite/ld-cris/dso-pltdis2.d

@@ -12,7 +12,7 @@

 Disassembly of section \.plt:

-0+1b4 <(dsofn4@plt-0x1a|dsofn@plt-0x34)>:

+0+1b4 <.*>:

  1b4:	84e2                	subq 4,\$sp

  1b6:	0401                	addoq 4,\$r0,\$acr

@@ -44,7 +44,7 @@ Disassembly of section \.plt:

 Disassembly of section \.text:

 #...

 0+202 <dsofn3>:

- 202:	bfbe e6ff ffff      	bsr 1e8 <(dsofn@plt|dsofn4@plt\+0x1a)>

+ 202:	bfbe e6ff ffff      	bsr 1e8 <.*>

  208:	b005                	nop 

 0+20a <dsofn4>:

diff --git a/ld/testsuite/ld-cris/dso12-pltdis.d b/ld/testsuite/ld-cris/dso12-pltdis.d

index 71a1748..187730b 100644

--- a/ld/testsuite/ld-cris/dso12-pltdis.d

+++ b/ld/testsuite/ld-cris/dso12-pltdis.d

@@ -11,7 +11,7 @@

 Disassembly of section \.plt:

-0+1e4 <dsofn4@plt-0x1a>:

+0+1e4 <.plt>:

  1e4:	84e2                	subq 4,\$sp

  1e6:	0401                	addoq 4,\$r0,\$acr