Enhance objdump so that it will use .got, .plt and .plt.got section symbols when disassembling, and it will use dynamic relocs to interpret entries in the PLT and GOT.

binutils * objdump.c (is_significant_symbol_name): New function.
	(remove_useless_symbols): Do not remove significanr symbols.
	(find_symbol_for_address): If an exact match for the specified
	address has not been found, try scanning the dynamic relocs to see
	if one of these matches the address.  If so, use the symbol
	associated with the reloc.
	(objdump_print_addr_with_symbol): Do not print offsets to symbols
	with no value.
	(disassemble_section): Only use dynamic relocs if the user
	requested this.
	(disassemble_data): Always load dynamic relocs if they are
	available.

ld	* ld-aarch64/emit-relocs-515-be.d: Adjust output to match change
	in objdump.
	* ld-aarch64/emit-relocs-515.d: Likewise.
	* ld-aarch64/emit-relocs-516-be.d: Likewise.
	* ld-aarch64/emit-relocs-516.d: Likewise.
	* ld-aarch64/farcall-b-plt.d: Likewise.
	* ld-aarch64/farcall-bl-plt.d: Likewise.
	* ld-aarch64/gc-plt-relocs.d: Likewise.
	* ld-aarch64/tls-desc-ie.d: Likewise.
	* ld-aarch64/tls-tiny-desc.d: Likewise.
	* ld-aarch64/tls-tiny-gd.d: Likewise.
	* ld-aarch64/tls-tiny-ie.d: Likewise.
	* ld-arm/arm-app-abs32.d: Likewise.
	* ld-arm/arm-app.d: Likewise.
	* ld-arm/arm-lib-plt32.d: Likewise.
	* ld-arm/arm-lib.d: Likewise.
	* ld-arm/armthumb-lib.d: Likewise.
	* ld-arm/cortex-a8-fix-b-plt.d: Likewise.
	* ld-arm/cortex-a8-fix-bcc-plt.d: Likewise.
	* ld-arm/cortex-a8-fix-bl-plt.d: Likewise.
	* ld-arm/cortex-a8-fix-bl-rel-plt.d: Likewise.
	* ld-arm/cortex-a8-fix-blx-plt.d: Likewise.
	* ld-arm/farcall-mixed-app-v5.d: Likewise.
	* ld-arm/farcall-mixed-app.d: Likewise.
	* ld-arm/farcall-mixed-app2.d: Likewise.
	* ld-arm/farcall-mixed-lib-v4t.d: Likewise.
	* ld-arm/farcall-mixed-lib.d: Likewise.
	* ld-arm/ifunc-10.dd: Likewise.
	* ld-arm/ifunc-14.dd: Likewise.
	* ld-arm/ifunc-15.dd: Likewise.
	* ld-arm/ifunc-3.dd: Likewise.
	* ld-arm/ifunc-4.dd: Likewise.
	* ld-arm/ifunc-9.dd: Likewise.
	* ld-arm/long-plt-format.d: Likewise.
	* ld-arm/mixed-app-v5.d: Likewise.
	* ld-arm/mixed-app.d: Likewise.
	* ld-arm/mixed-lib.d: Likewise.
	* ld-arm/tls-lib-loc.d: Likewise.
	* ld-cris/dso-pltdis1.d: Likewise.
	* ld-cris/dso-pltdis2.d: Likewise.
	* ld-cris/dso12-pltdis.d: Likewise.
	* ld-elf/symbolic-func.r: Likewise.
	* ld-frv/fdpic-pie-1.d: Likewise.
	* ld-frv/fdpic-pie-2.d: Likewise.
	* ld-frv/fdpic-pie-6.d: Likewise.
	* ld-frv/fdpic-pie-7.d: Likewise.
	* ld-frv/fdpic-pie-8.d: Likewise.
	* ld-frv/fdpic-shared-1.d: Likewise.
	* ld-frv/fdpic-shared-2.d: Likewise.
	* ld-frv/fdpic-shared-3.d: Likewise.
	* ld-frv/fdpic-shared-4.d: Likewise.
	* ld-frv/fdpic-shared-5.d: Likewise.
	* ld-frv/fdpic-shared-6.d: Likewise.
	* ld-frv/fdpic-shared-7.d: Likewise.
	* ld-frv/fdpic-shared-8.d: Likewise.
	* ld-frv/fdpic-shared-local-2.d: Likewise.
	* ld-frv/fdpic-shared-local-8.d: Likewise.
	* ld-frv/fdpic-static-1.d: Likewise.
	* ld-frv/fdpic-static-2.d: Likewise.
	* ld-frv/fdpic-static-6.d: Likewise.
	* ld-frv/fdpic-static-7.d: Likewise.
	* ld-frv/fdpic-static-8.d: Likewise.
	* ld-frv/tls-dynamic-2.d: Likewise.
	* ld-frv/tls-initial-shared-2.d: Likewise.
	* ld-frv/tls-relax-shared-2.d: Likewise.
	* ld-frv/tls-shared-2.d: Likewise.
	* ld-i386/plt-nacl.pd: Likewise.
	* ld-i386/plt-pic-nacl.pd: Likewise.
	* ld-i386/plt-pic.pd: Likewise.
	* ld-i386/plt.pd: Likewise.
	* ld-i386/pr19636-1d-nacl.d: Likewise.
	* ld-i386/pr19636-1d.d: Likewise.
	* ld-i386/pr19636-2c-nacl.d: Likewise.
	* ld-i386/pr19636-2c.d: Likewise.
	* ld-ifunc/ifunc-21-x86-64.d: Likewise.
	* ld-ifunc/ifunc-22-x86-64.d: Likewise.
	* ld-ifunc/pr17154-i386.d: Likewise.
	* ld-ifunc/pr17154-x86-64.d: Likewise.
	* ld-m68k/plt1-68020.d: Likewise.
	* ld-m68k/plt1-cpu32.d: Likewise.
	* ld-m68k/plt1-isab.d: Likewise.
	* ld-m68k/plt1-isac.d: Likewise.
	* ld-metag/shared.d: Likewise.
	* ld-metag/stub_pic_app.d: Likewise.
	* ld-metag/stub_pic_shared.d: Likewise.
	* ld-metag/stub_shared.d: Likewise.
	* ld-s390/tlsbin_64.dd: Likewise.
	* ld-s390/tlspic_64.dd: Likewise.
	* ld-tic6x/shlib-1.dd: Likewise.
	* ld-tic6x/shlib-1b.dd: Likewise.
	* ld-tic6x/shlib-1rb.dd: Likewise.
	* ld-tic6x/shlib-app-1.dd: Likewise.
	* ld-tic6x/shlib-app-1b.dd: Likewise.
	* ld-tic6x/shlib-app-1r.dd: Likewise.
	* ld-tic6x/shlib-app-1rb.dd: Likewise.
	* ld-tic6x/shlib-noindex.dd: Likewise.
	* ld-vax-elf/export-class-data.dd: Likewise.
	* ld-vax-elf/plt-local-lib.dd: Likewise.
	* ld-vax-elf/plt-local.dd: Likewise.
	* ld-x86-64/bnd-ifunc-2.d: Likewise.
	* ld-x86-64/bnd-plt-1.d: Likewise.
	* ld-x86-64/gotpcrel1.dd: Likewise.
	* ld-x86-64/libno-plt-1b.dd: Likewise.
	* ld-x86-64/load1c-nacl.d: Likewise.
	* ld-x86-64/load1c.d: Likewise.
	* ld-x86-64/load1d-nacl.d: Likewise.
	* ld-x86-64/load1d.d: Likewise.
	* ld-x86-64/mov1a.d: Likewise.
	* ld-x86-64/mov1b.d: Likewise.
	* ld-x86-64/mov1c.d: Likewise.
	* ld-x86-64/mov1d.d: Likewise.
	* ld-x86-64/mov2a.d: Likewise.
	* ld-x86-64/mov2b.d: Likewise.
	* ld-x86-64/mov2c.d: Likewise.
	* ld-x86-64/mov2d.d: Likewise.
	* ld-x86-64/mpx3.dd: Likewise.
	* ld-x86-64/mpx4.dd: Likewise.
	* ld-x86-64/no-plt-1a.dd: Likewise.
	* ld-x86-64/no-plt-1b.dd: Likewise.
	* ld-x86-64/no-plt-1c.dd: Likewise.
	* ld-x86-64/no-plt-1e.dd: Likewise.
	* ld-x86-64/no-plt-1f.dd: Likewise.
	* ld-x86-64/no-plt-1g.dd: Likewise.
	* ld-x86-64/plt-main-bnd.dd: Likewise.
	* ld-x86-64/plt-nacl.pd: Likewise.
	* ld-x86-64/plt.pd: Likewise.
	* ld-x86-64/pr18591.d: Likewise.
	* ld-x86-64/pr19609-1c.d: Likewise.
	* ld-x86-64/pr19609-1e.d: Likewise.
	* ld-x86-64/pr19609-1j.d: Likewise.
	* ld-x86-64/pr19609-1l.d: Likewise.
	* ld-x86-64/pr19609-1m.d: Likewise.
	* ld-x86-64/pr19609-5b.d: Likewise.
	* ld-x86-64/pr19609-5c.d: Likewise.
	* ld-x86-64/pr19609-5e.d: Likewise.
	* ld-x86-64/pr19609-6b.d: Likewise.
	* ld-x86-64/pr19609-7b.d: Likewise.
	* ld-x86-64/pr19609-7d.d: Likewise.
	* ld-x86-64/pr19636-2d.d: Likewise.
	* ld-x86-64/pr20093-1.d: Likewise.
	* ld-x86-64/pr20093-2.d: Likewise.
	* ld-x86-64/pr20253-1b.d: Likewise.
	* ld-x86-64/pr20253-1d.d: Likewise.
	* ld-x86-64/pr20253-1f.d: Likewise.
	* ld-x86-64/pr20253-1h.d: Likewise.
	* ld-x86-64/pr20253-1j.d: Likewise.
	* ld-x86-64/pr20253-1l.d: Likewise.
	* ld-x86-64/protected3.d: Likewise.
	* ld-x86-64/tlsbin.dd: Likewise.
	* ld-x86-64/tlsbin2.dd: Likewise.
	* ld-x86-64/tlsbindesc.dd: Likewise.
	* ld-x86-64/tlsdesc-nacl.pd: Likewise.
	* ld-x86-64/tlsdesc.dd: Likewise.
	* ld-x86-64/tlsdesc.pd: Likewise.
	* ld-x86-64/tlsgd10.dd: Likewise.
	* ld-x86-64/tlsgd5.dd: Likewise.
	* ld-x86-64/tlsgd6.dd: Likewise.
	* ld-x86-64/tlsgd8.dd: Likewise.
	* ld-x86-64/tlsgdesc.dd: Likewise.
	* ld-x86-64/tlspic.dd: Likewise.
	* ld-x86-64/tlspic2.dd: Likewise.

2016-10-11  Nick Clifton  <nickc@redhat.com>

	PR ld/20535
	* emultempl/elf32.em (_search_needed): Add support for pseudo
	environment variables supported by ld.so.  Namely $ORIGIN, $LIB
	and $PLATFORM.
	* configure.ac: Add getauxval to list AC_CHECK_FUNCS list.
	* config.in: Regenerate.
	* configure: Regenerate.

2016-10-11  Alan Modra  <amodra@gmail.com>

	* ldlang.c (lang_do_assignments_1): Descend into output section
	statements that do not yet have bfd sections.  Set symbol section
	temporarily for symbols defined in such statements to the undefined
	section.  Don't error on data or reloc statements until final phase.
	* ldexp.c (exp_fold_tree_1 <etree_assign>): Handle bfd_und_section
	in expld.section.
	* testsuite/ld-mmix/bpo-10.d: Adjust.
	* testsuite/ld-mmix/bpo-11.d: Adjust.

2016-10-10  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	* emulparams/elf64_s390.sh: Move binary start to 16M.
	* testsuite/ld-s390/tlsbin_64.dd: Adjust testcases accordingly.
	* testsuite/ld-s390/tlsbin_64.rd: Likewise.

2016-10-07  Alan Modra  <amodra@gmail.com>

	* ldexp.c (MAX): Define.
	(exp_unop, exp_binop, exp_trinop): Alloc at least enough for
	etree_type.value.

2016-10-07  Alan Modra  <amodra@gmail.com>

	* testsuite/lib/ld-lib.exp (is_generic_elf): New, extracted from..
	* testsuite/ld-elf/elf.exp: ..here.

2016-10-06  Ludovic Court?s  <ludo@gnu.org>

	* emulparams/elf32bmipn32-defs.sh: Shift quote of
	"x$EMULATION_NAME" to the left to work around
	<http://ftp.gnu.org/gnu/bash/bash-4.2-patches/bash42-007>.

2016-10-06  Alan Modra  <amodra@gmail.com>

	* lexsup.c: Spell fall through comments consistently and add
	missing fall through comments.

2016-10-06  Alan Modra  <amodra@gmail.com>

	* plugin.c (asymbol_from_plugin_symbol): Avoid compiler warning
	by adding return.

2016-10-04  Alan Modra  <amodra@gmail.com>

	* ld.texinfo (Expression Section): Update result of arithmetic
	expressions.
	* ldexp.c (arith_result_section): New function.
	(fold_binary): Use it.

2016-10-04  Alan Modra  <amodra@gmail.com>

	* ldexp.c (exp_value_fold): New function.
	(exp_unop, exp_binop, exp_trinop): Use it.

2016-09-30  Alan Modra  <amodra@gmail.com>

	* scripttempl/v850.sc: Don't reference __ctbp, __ep, __gp when
	not relocating.
	* scripttempl/v850_rh850.sc: Likewise.

2016-09-30  Alan Modra  <amodra@gmail.com>

	PR ld/20528
	* testsuite/ld-elf/pr20528a.d: xfail generic elf targets.  Allow
	multiple .text sections for hppa-linux.
	* testsuite/ld-elf/pr20528b.d: Likewise.

2016-09-30  Alan Modra  <amodra@gmail.com>

	* ldmain.c (default_bfd_error_handler): New function pointer.
	(ld_bfd_error_handler): New function.
	(main): Arrange to call it on bfd errors/warnings.
	(ld_bfd_assert_handler): Enable tail call.

2016-09-30  Alan Modra  <amodra@gmail.com>

	* ldlang.c (ignore_bfd_errors): Update params.

2016-09-29  H.J. Lu  <hongjiu.lu@intel.com>

	PR ld/20528
	* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Don't
	merge 2 sections with different SHF_EXCLUDE.
	* testsuite/ld-elf/pr20528a.d: New file.
	* testsuite/ld-elf/pr20528a.s: Likewise.
	* testsuite/ld-elf/pr20528b.d: Likewise.
	* testsuite/ld-elf/pr20528b.s: Likewise.

2016-09-28  Christophe Lyon  <christophe.lyon@linaro.org>

	PR ld/20608
	* testsuite/ld-arm/arm-elf.exp: Handle new testcase.
	* testsuite/ld-arm/farcall-mixed-app2.d: New file.
	* testsuite/ld-arm/farcall-mixed-app2.r: Likewise.
	* testsuite/ld-arm/farcall-mixed-app2.s: Likewise.
	* testsuite/ld-arm/farcall-mixed-app2.sym: Likewise.

2016-09-26  Vlad Zakharov  <vzakhar@synopsys.com>

	* Makefile.in: Regenerate.
	* configure: Likewise.

2016-09-26  Alan Modra  <amodra@gmail.com>

	* testsuite/ld-powerpc/attr-gnu-4-4.s: Delete.
	* testsuite/ld-powerpc/attr-gnu-4-14.d: Delete.
	* testsuite/ld-powerpc/attr-gnu-4-24.d: Delete.
	* testsuite/ld-powerpc/attr-gnu-4-34.d: Delete.
	* testsuite/ld-powerpc/attr-gnu-4-41.d: Delete.
	* testsuite/ld-powerpc/attr-gnu-4-32.d: Adjust expected warning.
	* testsuite/ld-powerpc/attr-gnu-8-23.d: Likewise.
	* testsuite/ld-powerpc/attr-gnu-4-01.d: Adjust expected output.
	* testsuite/ld-powerpc/attr-gnu-4-02.d: Likewise.
	* testsuite/ld-powerpc/attr-gnu-4-03.d: Likewise.
	* testsuite/ld-powerpc/attr-gnu-4-10.d: Likewise.
	* testsuite/ld-powerpc/attr-gnu-4-11.d: Likewise.
	* testsuite/ld-powerpc/attr-gnu-4-20.d: Likewise.
	* testsuite/ld-powerpc/attr-gnu-4-22.d: Likewise.
	* testsuite/ld-powerpc/attr-gnu-4-33.d: Likewise.
	* testsuite/ld-powerpc/attr-gnu-8-11.d: Likewise.
	* testsuite/ld-powerpc/powerpc.exp: Don't run deleted tests.

2016-09-23  Akihiko Odaki  <akihiko.odaki.4i@stu.hosei.ac.jp>

	PR ld/20595
	* testsuite/ld-arm/unwind-4.d: Add -q option to linker command
	line and -r option to objdump command line.  Match emitted relocs
	to make sure that superflous relocs are not generated.

2016-09-23  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	* emulparams/elf64_s390.sh: Change TEXT_START_ADDR to 256MB.
	* testsuite/ld-s390/tlsbin_64.dd: Adjust testcase accordingly.
	* testsuite/ld-s390/tlsbin_64.rd: Likewise.

2016-09-22  Nick Clifton  <nickc@redhat.com>

	* emultempl/elf32.em (_try_needed): In verbose mode, report failed
	attempts to find a needed library.

2016-09-21  Richard Sandiford  <richard.sandiford@arm.com>

	* testsuite/ld-aarch64/emit-relocs-28.d: Expect spaces after ","
	in addresses.
	* testsuite/ld-aarch64/emit-relocs-301-be.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-301.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-302-be.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-302.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-310-be.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-310.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-313.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-515-be.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-515.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-516-be.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-516.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-531.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-532.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-533.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-534.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-535.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-536.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-537.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-538.d: Likewise.
	* testsuite/ld-aarch64/erratum835769.d: Likewise.
	* testsuite/ld-aarch64/erratum843419.d: Likewise.
	* testsuite/ld-aarch64/farcall-b-plt.d: Likewise.
	* testsuite/ld-aarch64/farcall-bl-plt.d: Likewise.
	* testsuite/ld-aarch64/gc-plt-relocs.d: Likewise.
	* testsuite/ld-aarch64/ifunc-21.d: Likewise.
	* testsuite/ld-aarch64/ifunc-7c.d: Likewise.
	* testsuite/ld-aarch64/tls-desc-ie.d: Likewise.
	* testsuite/ld-aarch64/tls-large-desc-be.d: Likewise.
	* testsuite/ld-aarch64/tls-large-desc.d: Likewise.
	* testsuite/ld-aarch64/tls-large-ie-be.d: Likewise.
	* testsuite/ld-aarch64/tls-large-ie.d: Likewise.
	* testsuite/ld-aarch64/tls-relax-all.d: Likewise.
	* testsuite/ld-aarch64/tls-relax-gd-ie.d: Likewise.
	* testsuite/ld-aarch64/tls-relax-gdesc-ie-2.d: Likewise.
	* testsuite/ld-aarch64/tls-relax-gdesc-ie.d: Likewise.
	* testsuite/ld-aarch64/tls-relax-large-desc-ie-be.d: Likewise.
	* testsuite/ld-aarch64/tls-relax-large-desc-ie.d: Likewise.
	* testsuite/ld-aarch64/tls-tiny-desc.d: Likewise.
	* testsuite/ld-aarch64/tls-tiny-gd.d: Likewise.

gas	* gas/arm/tls.d: Adjust output to match change in objdump.

160 files changed, 677 insertions, 677 deletions

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/farcall-b-plt.d b/ld/testsuite/ld-aarch64/farcall-b-plt.d
index 00469af..e89f0bb 100644
--- a/ld/testsuite/ld-aarch64/farcall-b-plt.d
+++ b/ld/testsuite/ld-aarch64/farcall-b-plt.d
@@ -7,7 +7,7 @@
 
 Disassembly of section .plt:
 
-.* <foo@plt.*>:
+.* <.plt>:
 .*:	a9bf7bf0 	stp	x16, x30, \[sp, #-16\]!
 .*:	.* 	adrp	x16, .* <__foo_veneer\+.*>
 .*:	.* 	ldr	x17, \[x16, #.*\]
@@ -32,7 +32,7 @@ Disassembly of section .text:
 .*:	.* 	b	.* <__foo_veneer\+.*>
 
 .* <__foo_veneer>:
-.*:	.* 	adrp	x16, 0 <foo@plt.*>
+.*:	.* 	adrp	x16, 0 <.*>
 .*:	.* 	add	x16, x16, #.*
 .*:	d61f0200 	br	x16
 	...
diff --git a/ld/testsuite/ld-aarch64/farcall-bl-plt.d b/ld/testsuite/ld-aarch64/farcall-bl-plt.d
index 28fcb8c..c5bb372 100644
--- a/ld/testsuite/ld-aarch64/farcall-bl-plt.d
+++ b/ld/testsuite/ld-aarch64/farcall-bl-plt.d
@@ -7,7 +7,7 @@
 
 Disassembly of section .plt:
 
-.* <foo@plt.*>:
+.* <.plt>:
 .*:	a9bf7bf0 	stp	x16, x30, \[sp, #-16\]!
 .*:	.* 	adrp	x16, .* <__foo_veneer\+.*>
 .*:	.* 	ldr	x17, \[x16, #.*\]
@@ -32,7 +32,7 @@ Disassembly of section .text:
 .*:	.* 	b	.* <__foo_veneer\+.*>
 
 .* <__foo_veneer>:
-.*:	.* 	adrp	x16, 0 <foo@plt.*>
+.*:	.* 	adrp	x16, 0 <.*>
 .*:	.* 	add	x16, x16, #.*
 .*:	d61f0200 	br	x16
 	...
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-desc-ie.d b/ld/testsuite/ld-aarch64/tls-desc-ie.d
index 5b77872..1b1b927 100644
--- a/ld/testsuite/ld-aarch64/tls-desc-ie.d
+++ b/ld/testsuite/ld-aarch64/tls-desc-ie.d
@@ -4,7 +4,7 @@
 #...
  +10000:	90000080 	adrp	x0, 20000 <_GLOBAL_OFFSET_TABLE_>
  +10004:	91004000 	add	x0, x0, #0x10
- +10008:	94000016 	bl	10060 <v1\+0x10060>
+ +10008:	94000016 	bl	10060 <.*>
  +1000c:	d503201f 	nop
  +10010:	90000080 	adrp	x0, 20000 <_GLOBAL_OFFSET_TABLE_>
  +10014:	f9400400 	ldr	x0, \[x0, #8\]
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 \<var>
+ +10004:	10080120 	adr	x0, 20028 \<var>
  +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 \<var>
+ +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-app2.d b/ld/testsuite/ld-arm/farcall-mixed-app2.d
index 54338d0..535710d 100644
--- a/ld/testsuite/ld-arm/farcall-mixed-app2.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-app2.d
@@ -6,9 +6,9 @@ start address 0x.*
 
 Disassembly of section .plt:
 
-.* <lib_func2@plt-0x14>:
+.* <.*>:
  .*:	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
@@ -24,21 +24,21 @@ Disassembly of section \.plt:
 	\.\.\.
 
 0+1fe <dsofn4@plt>:
- 1fe:	6f0d 0c00 0000      	addo\.d c <dsofn4@plt-0x1f2>,\$r0,\$acr
+ 1fe:	6f0d 0c00 0000      	addo\.d c <.*>,\$r0,\$acr
  204:	6ffa                	move\.d \[\$acr\],\$acr
  206:	bf09                	jump \$acr
  208:	b005                	nop 
- 20a:	3f7e 0000 0000      	move 0 <dsofn4@plt-0x1fe>,\$mof
- 210:	bf0e d4ff ffff      	ba 1e4 <dsofn4@plt-0x1a>
+ 20a:	3f7e 0000 0000      	move 0 <.*>,\$mof
+ 210:	bf0e d4ff ffff      	ba 1e4 <.*>
  216:	b005                	nop 
 
 0+218 <dsofn@plt>:
- 218:	6f0d 1000 0000      	addo\.d 10 <dsofn4@plt-0x1ee>,\$r0,\$acr
+ 218:	6f0d 1000 0000      	addo\.d 10 <.*>,\$r0,\$acr
  21e:	6ffa                	move\.d \[\$acr\],\$acr
  220:	bf09                	jump \$acr
  222:	b005                	nop 
- 224:	3f7e 0c00 0000      	move c <dsofn4@plt-0x1f2>,\$mof
- 22a:	bf0e baff ffff      	ba 1e4 <dsofn4@plt-0x1a>
+ 224:	3f7e 0c00 0000      	move c <.*>,\$mof
+ 22a:	bf0e baff ffff      	ba 1e4 <.*>
  230:	b005                	nop 
 
 Disassembly of section \.text:
diff --git a/ld/testsuite/ld-elf/symbolic-func.r b/ld/testsuite/ld-elf/symbolic-func.r
index 3d31f8f..448b01a 100644
--- a/ld/testsuite/ld-elf/symbolic-func.r
+++ b/ld/testsuite/ld-elf/symbolic-func.r
@@ -14,5 +14,5 @@
 
 Relocation section.*
  *Offset.*
-0*[1-9a-f][0-9a-f]* +[^ ]+ +[^ ]+ +([0-9a-f]+( +\.text( \+ [0-9a-f]+)?)?)?
+0*[1-9a-f][0-9a-f]* +[^ ]+ +[^ ]+ +([0-9a-f]+( +(\.text|fun)( \+ [0-9a-f]+)?)?)?
 #pass
diff --git a/ld/testsuite/ld-frv/fdpic-pie-1.d b/ld/testsuite/ld-frv/fdpic-pie-1.d
index 0e37324..5369d07 100644
--- a/ld/testsuite/ld-frv/fdpic-pie-1.d
+++ b/ld/testsuite/ld-frv/fdpic-pie-1.d
@@ -42,7 +42,7 @@ Disassembly of section \.data:
 [0-9a-f	 ]+: R_FRV_32	\.text
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x8>:
+[0-9a-f ]+<.got>:
 [0-9a-f ]+:	00 00 00 04 	add\.p gr0,gr4,gr0
 [0-9a-f	 ]+: R_FRV_FUNCDESC_VALUE	\.text
 [0-9a-f ]+:	00 00 00 02 	add\.p gr0,fp,gr0
diff --git a/ld/testsuite/ld-frv/fdpic-pie-2.d b/ld/testsuite/ld-frv/fdpic-pie-2.d
index 3583a3b..40c1532 100644
--- a/ld/testsuite/ld-frv/fdpic-pie-2.d
+++ b/ld/testsuite/ld-frv/fdpic-pie-2.d
@@ -42,7 +42,7 @@ Disassembly of section \.dat[0-9a-f ]+:
 [0-9a-f	 ]+: R_FRV_32	\.text
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x18>:
+[0-9a-f ]+<.got>:
 [0-9a-f ]+:	00 00 00 04 	add\.p gr0,gr4,gr0
 [0-9a-f	 ]+: R_FRV_FUNCDESC_VALUE	\.text
 [0-9a-f ]+:	00 00 00 02 	add\.p gr0,fp,gr0
diff --git a/ld/testsuite/ld-frv/fdpic-pie-6.d b/ld/testsuite/ld-frv/fdpic-pie-6.d
index c59b304..743166e 100644
--- a/ld/testsuite/ld-frv/fdpic-pie-6.d
+++ b/ld/testsuite/ld-frv/fdpic-pie-6.d
@@ -9,11 +9,11 @@ Disassembly of section \.plt:
 
 [0-9a-f ]+<\.plt>:
 [0-9a-f ]+:	00 00 00 08 	add\.p gr0,gr8,gr0
-[0-9a-f ]+:	c0 1a 00 06 	bra [0-9a-f]+ <F6-0x10>
+[0-9a-f ]+:	c0 1a 00 06 	bra [0-9a-f]+ <.*>
 [0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
-[0-9a-f ]+:	c0 1a 00 04 	bra [0-9a-f]+ <F6-0x10>
+[0-9a-f ]+:	c0 1a 00 04 	bra [0-9a-f]+ <.*>
 [0-9a-f ]+:	00 00 00 10 	add\.p gr0,gr16,gr0
-[0-9a-f ]+:	c0 1a 00 02 	bra [0-9a-f]+ <F6-0x10>
+[0-9a-f ]+:	c0 1a 00 02 	bra [0-9a-f]+ <.*>
 [0-9a-f ]+:	00 00 00 18 	add\.p gr0,gr24,gr0
 [0-9a-f ]+:	88 08 f1 40 	ldd @\(gr15,gr0\),gr4
 [0-9a-f ]+:	80 30 40 00 	jmpl @\(gr4,gr0\)
@@ -22,7 +22,7 @@ Disassembly of section \.plt:
 Disassembly of section \.text:
 
 [0-9a-f ]+<F6>:
-[0-9a-f ]+:	fe 3f ff fe 	call [0-9a-f]+ <F6-0x8>
+[0-9a-f ]+:	fe 3f ff fe 	call [0-9a-f]+ <.*>
 [0-9a-f ]+:	80 40 f0 0c 	addi gr15,12,gr0
 [0-9a-f ]+:	80 fc 00 24 	setlos 0x24,gr0
 [0-9a-f ]+:	80 f4 00 20 	setlo 0x20,gr0
@@ -48,7 +48,7 @@ Disassembly of section \.dat[0-9a-f ]+:
 [0-9a-f	 ]+: R_FRV_32	WFb
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x20>:
+[0-9a-f ]+<.got>:
 [0-9a-f ]+:	00 00 03 b0 	.*
 [0-9a-f	 ]+: R_FRV_FUNCDESC_VALUE	WF9
 [0-9a-f ]+:	00 00 00 02 	.*
diff --git a/ld/testsuite/ld-frv/fdpic-pie-7.d b/ld/testsuite/ld-frv/fdpic-pie-7.d
index 7ebd0b7..7eceec2 100644
--- a/ld/testsuite/ld-frv/fdpic-pie-7.d
+++ b/ld/testsuite/ld-frv/fdpic-pie-7.d
@@ -42,7 +42,7 @@ Disassembly of section \.dat[0-9a-f ]+:
 [0-9a-f	 ]+: R_FRV_32	\.text
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x8>:
+[0-9a-f ]+<.got>:
 [0-9a-f ]+:	00 00 00 08 	add\.p gr0,gr8,gr0
 [0-9a-f	 ]+: R_FRV_FUNCDESC_VALUE	\.text
 [0-9a-f ]+:	00 00 00 02 	add\.p gr0,fp,gr0
diff --git a/ld/testsuite/ld-frv/fdpic-pie-8.d b/ld/testsuite/ld-frv/fdpic-pie-8.d
index 0de4a81..8f7c344 100644
--- a/ld/testsuite/ld-frv/fdpic-pie-8.d
+++ b/ld/testsuite/ld-frv/fdpic-pie-8.d
@@ -42,7 +42,7 @@ Disassembly of section \.dat[0-9a-f ]+:
 [0-9a-f	 ]+: R_FRV_32	\.text
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x18>:
+[0-9a-f ]+<.got>:
 [0-9a-f ]+:	00 00 00 08 	add\.p gr0,gr8,gr0
 [0-9a-f	 ]+: R_FRV_FUNCDESC_VALUE	\.text
 [0-9a-f ]+:	00 00 00 02 	add\.p gr0,fp,gr0
diff --git a/ld/testsuite/ld-frv/fdpic-shared-1.d b/ld/testsuite/ld-frv/fdpic-shared-1.d
index 7f88e18..4968deb 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-1.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-1.d
@@ -42,7 +42,7 @@ Disassembly of section \.dat[0-9a-f ]+:
 [0-9a-f	 ]+: R_FRV_32	\.text
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x8>:
+[0-9a-f ]+<.got>:
 [0-9a-f ]+:	00 00 00 04 	add\.p gr0,gr4,gr0
 [0-9a-f	 ]+: R_FRV_FUNCDESC_VALUE	\.text
 [0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
diff --git a/ld/testsuite/ld-frv/fdpic-shared-2.d b/ld/testsuite/ld-frv/fdpic-shared-2.d
index cb4b68d..13e140a 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-2.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-2.d
@@ -9,11 +9,11 @@ Disassembly of section \.plt:
 
 [0-9a-f ]+ <\.plt>:
 [0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
-[0-9a-f ]+:	c0 1a 00 06 	bra [0-9a-f]+ <F2-0x10>
+[0-9a-f ]+:	c0 1a 00 06 	bra [0-9a-f]+ <.*>
 [0-9a-f ]+:	00 00 00 10 	add\.p gr0,gr16,gr0
-[0-9a-f ]+:	c0 1a 00 04 	bra [0-9a-f]+ <F2-0x10>
+[0-9a-f ]+:	c0 1a 00 04 	bra [0-9a-f]+ <.*>
 [0-9a-f ]+:	00 00 00 18 	add\.p gr0,gr24,gr0
-[0-9a-f ]+:	c0 1a 00 02 	bra [0-9a-f]+ <F2-0x10>
+[0-9a-f ]+:	c0 1a 00 02 	bra [0-9a-f]+ <.*>
 [0-9a-f ]+:	00 00 00 08 	add\.p gr0,gr8,gr0
 [0-9a-f ]+:	88 08 f1 40 	ldd @\(gr15,gr0\),gr4
 [0-9a-f ]+:	80 30 40 00 	jmpl @\(gr4,gr0\)
@@ -22,7 +22,7 @@ Disassembly of section \.plt:
 Disassembly of section \.text:
 
 [0-9a-f ]+<F2>:
-[0-9a-f ]+:	fe 3f ff fe 	call [0-9a-f]+ <F2-0x8>
+[0-9a-f ]+:	fe 3f ff fe 	call [0-9a-f]+ <.*>
 
 [0-9a-f ]+<GF0>:
 [0-9a-f ]+:	80 40 f0 10 	addi gr15,16,gr0
@@ -55,7 +55,7 @@ Disassembly of section \.dat[0-9a-f ]+:
 [0-9a-f	 ]+: R_FRV_32	GFb
 [0-9A-F ]+isassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x20>:
+[0-9a-f ]+<.got>:
 [0-9a-f ]+:	00 00 04 a4 	.*
 [0-9a-f	 ]+: R_FRV_FUNCDESC_VALUE	GF9
 [0-9a-f ]+:	00 00 00 00 	.*
diff --git a/ld/testsuite/ld-frv/fdpic-shared-3.d b/ld/testsuite/ld-frv/fdpic-shared-3.d
index fceb16a..fc59185 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-3.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-3.d
@@ -42,7 +42,7 @@ Disassembly of section \.dat[0-9a-f ]+:
 [0-9a-f	 ]+: R_FRV_32	\.text
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x38>:
+[0-9a-f ]+<.got>:
 [0-9a-f ]+:	00 00 00 04 	add\.p gr0,gr4,gr0
 [0-9a-f	 ]+: R_FRV_FUNCDESC_VALUE	\.text
 [0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
diff --git a/ld/testsuite/ld-frv/fdpic-shared-4.d b/ld/testsuite/ld-frv/fdpic-shared-4.d
index 4045562..298ae28 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-4.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-4.d
@@ -42,7 +42,7 @@ Disassembly of section \.dat[0-9a-f ]+:
 [0-9a-f	 ]+: R_FRV_32	\.text
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x18>:
+[0-9a-f ]+<.got>:
 [0-9a-f ]+:	00 00 00 04 	add\.p gr0,gr4,gr0
 [0-9a-f	 ]+: R_FRV_FUNCDESC_VALUE	\.text
 [0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
diff --git a/ld/testsuite/ld-frv/fdpic-shared-5.d b/ld/testsuite/ld-frv/fdpic-shared-5.d
index 009c62c..dbfd143 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-5.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-5.d
@@ -9,11 +9,11 @@ Disassembly of section \.plt:
 
 [0-9a-f ]+<\.plt>:
 [0-9a-f ]+:	00 00 00 10 	add\.p gr0,gr16,gr0
-[0-9a-f ]+:	c0 1a 00 06 	bra [0-9a-f]+ <F5-0x10>
+[0-9a-f ]+:	c0 1a 00 06 	bra [0-9a-f]+ <.*>
 [0-9a-f ]+:	00 00 00 08 	add\.p gr0,gr8,gr0
-[0-9a-f ]+:	c0 1a 00 04 	bra [0-9a-f]+ <F5-0x10>
+[0-9a-f ]+:	c0 1a 00 04 	bra [0-9a-f]+ <.*>
 [0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
-[0-9a-f ]+:	c0 1a 00 02 	bra [0-9a-f]+ <F5-0x10>
+[0-9a-f ]+:	c0 1a 00 02 	bra [0-9a-f]+ <.*>
 [0-9a-f ]+:	00 00 00 18 	add\.p gr0,gr24,gr0
 [0-9a-f ]+:	88 08 f1 40 	ldd @\(gr15,gr0\),gr4
 [0-9a-f ]+:	80 30 40 00 	jmpl @\(gr4,gr0\)
@@ -22,7 +22,7 @@ Disassembly of section \.plt:
 Disassembly of section \.text:
 
 [0-9a-f ]+<F5>:
-[0-9a-f ]+:	fe 3f ff fe 	call [0-9a-f]+ <F5-0x8>
+[0-9a-f ]+:	fe 3f ff fe 	call [0-9a-f]+ <.*>
 [0-9a-f ]+:	80 40 f0 0c 	addi gr15,12,gr0
 [0-9a-f ]+:	80 fc 00 24 	setlos 0x24,gr0
 [0-9a-f ]+:	80 f4 00 20 	setlo 0x20,gr0
@@ -48,7 +48,7 @@ Disassembly of section \.dat[0-9a-f ]+:
 [0-9a-f	 ]+: R_FRV_32	UFb
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x20>:
+[0-9a-f ]+<.got>:
 [0-9a-f ]+:	00 00 04 7c 	.*
 [0-9a-f	 ]+: R_FRV_FUNCDESC_VALUE	UF9
 [0-9a-f ]+:	00 00 00 00 	.*
diff --git a/ld/testsuite/ld-frv/fdpic-shared-6.d b/ld/testsuite/ld-frv/fdpic-shared-6.d
index 06a335f..2191af8 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-6.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-6.d
@@ -9,11 +9,11 @@ Disassembly of section \.plt:
 
 [0-9a-f ]+<\.plt>:
 [0-9a-f ]+:	00 00 00 08 	add\.p gr0,gr8,gr0
-[0-9a-f ]+:	c0 1a 00 06 	bra [0-9a-f]+ <F6-0x10>
+[0-9a-f ]+:	c0 1a 00 06 	bra [0-9a-f]+ <.*>
 [0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
-[0-9a-f ]+:	c0 1a 00 04 	bra [0-9a-f]+ <F6-0x10>
+[0-9a-f ]+:	c0 1a 00 04 	bra [0-9a-f]+ <.*>
 [0-9a-f ]+:	00 00 00 10 	add\.p gr0,gr16,gr0
-[0-9a-f ]+:	c0 1a 00 02 	bra [0-9a-f]+ <F6-0x10>
+[0-9a-f ]+:	c0 1a 00 02 	bra [0-9a-f]+ <.*>
 [0-9a-f ]+:	00 00 00 18 	add\.p gr0,gr24,gr0
 [0-9a-f ]+:	88 08 f1 40 	ldd @\(gr15,gr0\),gr4
 [0-9a-f ]+:	80 30 40 00 	jmpl @\(gr4,gr0\)
@@ -22,7 +22,7 @@ Disassembly of section \.plt:
 Disassembly of section \.text:
 
 [0-9a-f ]+<F6>:
-[0-9a-f ]+:	fe 3f ff fe 	call [0-9a-f]+ <F6-0x8>
+[0-9a-f ]+:	fe 3f ff fe 	call [0-9a-f]+ <.*>
 [0-9a-f ]+:	80 40 f0 0c 	addi gr15,12,gr0
 [0-9a-f ]+:	80 fc 00 24 	setlos 0x24,gr0
 [0-9a-f ]+:	80 f4 00 20 	setlo 0x20,gr0
@@ -48,7 +48,7 @@ Disassembly of section \.dat[0-9a-f ]+:
 [0-9a-f	 ]+: R_FRV_32	WFb
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x20>:
+[0-9a-f ]+<.got>:
 [0-9a-f ]+:	00 00 03 60 .*
 [0-9a-f	 ]+: R_FRV_FUNCDESC_VALUE	WF9
 [0-9a-f ]+:	00 00 00 00 .*
diff --git a/ld/testsuite/ld-frv/fdpic-shared-7.d b/ld/testsuite/ld-frv/fdpic-shared-7.d
index 2004a84..071dd8f 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-7.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-7.d
@@ -42,7 +42,7 @@ Disassembly of section \.dat[0-9a-f ]+:
 [0-9a-f	 ]+: R_FRV_32	\.text
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x8>:
+[0-9a-f ]+<.got>:
 [0-9a-f ]+:	00 00 00 08 	add\.p gr0,gr8,gr0
 [0-9a-f	 ]+: R_FRV_FUNCDESC_VALUE	\.text
 [0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
diff --git a/ld/testsuite/ld-frv/fdpic-shared-8.d b/ld/testsuite/ld-frv/fdpic-shared-8.d
index 543d313..e50e7b9 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-8.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-8.d
@@ -42,7 +42,7 @@ Disassembly of section \.text:
 [0-9a-f	 ]+: R_FRV_32	\.text
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x38>:
+[0-9a-f ]+<.got>:
 [0-9a-f ]+:	00 00 00 08 	add\.p gr0,gr8,gr0
 [0-9a-f	 ]+: R_FRV_FUNCDESC_VALUE	\.text
 [0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
diff --git a/ld/testsuite/ld-frv/fdpic-shared-local-2.d b/ld/testsuite/ld-frv/fdpic-shared-local-2.d
index 51ca126..0074172 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-local-2.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-local-2.d
@@ -42,7 +42,7 @@ Disassembly of section \.dat[0-9a-f ]+:
 [0-9a-f	 ]+: R_FRV_32	\.text
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x38>:
+[0-9a-f ]+<.got>:
 [0-9a-f ]+:	00 00 00 04 	add\.p gr0,gr4,gr0
 [0-9a-f	 ]+: R_FRV_FUNCDESC_VALUE	\.text
 [0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
diff --git a/ld/testsuite/ld-frv/fdpic-shared-local-8.d b/ld/testsuite/ld-frv/fdpic-shared-local-8.d
index 8d2c67e..7d238e9 100644
--- a/ld/testsuite/ld-frv/fdpic-shared-local-8.d
+++ b/ld/testsuite/ld-frv/fdpic-shared-local-8.d
@@ -42,7 +42,7 @@ Disassembly of section \.dat[0-9a-f ]+:
 [0-9a-f	 ]+: R_FRV_32	\.text
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x38>:
+[0-9a-f ]+<.got>:
 [0-9a-f ]+:	00 00 00 08 	add\.p gr0,gr8,gr0
 [0-9a-f	 ]+: R_FRV_FUNCDESC_VALUE	\.text
 [0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
diff --git a/ld/testsuite/ld-frv/fdpic-static-1.d b/ld/testsuite/ld-frv/fdpic-static-1.d
index 1c4dce1..9bab5d7 100644
--- a/ld/testsuite/ld-frv/fdpic-static-1.d
+++ b/ld/testsuite/ld-frv/fdpic-static-1.d
@@ -51,7 +51,7 @@ Disassembly of section \.dat[0-9a-f ]+:
 [0-9a-f ]+:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x8>:
+[0-9a-f ]+<.got>:
 [0-9a-f ]+:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
 [0-9a-f ]+:	00 01 41 18 	sub\.p gr20,gr24,gr0
 
diff --git a/ld/testsuite/ld-frv/fdpic-static-2.d b/ld/testsuite/ld-frv/fdpic-static-2.d
index d2b794f..e388e2c 100644
--- a/ld/testsuite/ld-frv/fdpic-static-2.d
+++ b/ld/testsuite/ld-frv/fdpic-static-2.d
@@ -67,7 +67,7 @@ Disassembly of section \.dat[0-9a-f ]+:
 [0-9a-f ]+:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x38>:
+[0-9a-f ]+<.got>:
 [0-9a-f ]+:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
 [0-9a-f ]+:	00 01 41 88 	subx\.p gr20,gr8,gr0,icc0
 [0-9a-f ]+:	00 01 00 98 	addx\.p gr16,gr24,gr0,icc0
diff --git a/ld/testsuite/ld-frv/fdpic-static-6.d b/ld/testsuite/ld-frv/fdpic-static-6.d
index 491b7c7..1c197a2 100644
--- a/ld/testsuite/ld-frv/fdpic-static-6.d
+++ b/ld/testsuite/ld-frv/fdpic-static-6.d
@@ -36,7 +36,7 @@ Disassembly of section \.dat[0-9a-f ]+:
 	\.\.\.
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x38>:
+[0-9a-f ]+<.got>:
 	\.\.\.
 
 [0-9a-f ]+<_GLOBAL_OFFSET_TABLE_>:
diff --git a/ld/testsuite/ld-frv/fdpic-static-7.d b/ld/testsuite/ld-frv/fdpic-static-7.d
index 6f8313c..77899f6 100644
--- a/ld/testsuite/ld-frv/fdpic-static-7.d
+++ b/ld/testsuite/ld-frv/fdpic-static-7.d
@@ -51,7 +51,7 @@ Disassembly of section \.dat[0-9a-f ]+:
 [0-9a-f ]+:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x8>:
+[0-9a-f ]+<.got>:
 [0-9a-f ]+:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
 [0-9a-f ]+:	00 01 41 18 	sub\.p gr20,gr24,gr0
 
diff --git a/ld/testsuite/ld-frv/fdpic-static-8.d b/ld/testsuite/ld-frv/fdpic-static-8.d
index c0cc732..03e795e 100644
--- a/ld/testsuite/ld-frv/fdpic-static-8.d
+++ b/ld/testsuite/ld-frv/fdpic-static-8.d
@@ -67,7 +67,7 @@ Disassembly of section \.dat[0-9a-f ]+:
 [0-9a-f ]+:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
 Disassembly of section \.got:
 
-[0-9a-f ]+<_GLOBAL_OFFSET_TABLE_-0x38>:
+[0-9a-f ]+<.got>:
 [0-9a-f ]+:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
 [0-9a-f ]+:	00 01 41 88 	subx\.p gr20,gr8,gr0,icc0
 [0-9a-f ]+:	00 01 00 9c 	addx\.p gr16,gr28,gr0,icc0
diff --git a/ld/testsuite/ld-frv/tls-dynamic-2.d b/ld/testsuite/ld-frv/tls-dynamic-2.d
index 07bf332..d943e86 100644
--- a/ld/testsuite/ld-frv/tls-dynamic-2.d
+++ b/ld/testsuite/ld-frv/tls-dynamic-2.d
@@ -155,7 +155,7 @@ Disassembly of section \.text:
 [0-9a-f ]+:	80 88 00 00 	nop
 Disassembly of section \.got:
 
-[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_-0x60)>:
+[0-9a-f ]+<.*>:
 [0-9a-f ]+:	00 01 02 c0 	.*
 [0-9a-f ]+:	00 00 08 21 	.*
 [0-9a-f ]+:	00 01 02 c0 	.*
diff --git a/ld/testsuite/ld-frv/tls-initial-shared-2.d b/ld/testsuite/ld-frv/tls-initial-shared-2.d
index e4ea6a1..7f73c27 100644
--- a/ld/testsuite/ld-frv/tls-initial-shared-2.d
+++ b/ld/testsuite/ld-frv/tls-initial-shared-2.d
@@ -149,7 +149,7 @@ Disassembly of section \.text:
 [0-9a-f ]+:	92 c8 f0 5c 	ldi @\(gr15,92\),gr9
 Disassembly of section \.got:
 
-[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_-0x20)>:
+[0-9a-f ]+<.*>:
 [0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
 [0-9a-f	 ]+: R_FRV_TLSDESC_VALUE	\.tbss
 [0-9a-f ]+:	00 00 10 11 	add\.p sp,gr17,gr0
diff --git a/ld/testsuite/ld-frv/tls-relax-shared-2.d b/ld/testsuite/ld-frv/tls-relax-shared-2.d
index c07bb35..7519247 100644
--- a/ld/testsuite/ld-frv/tls-relax-shared-2.d
+++ b/ld/testsuite/ld-frv/tls-relax-shared-2.d
@@ -151,7 +151,7 @@ Disassembly of section \.text:
 [0-9a-f ]+:	82 30 80 00 	calll @\(gr8,gr0\)
 Disassembly of section \.got:
 
-[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_-0x60)>:
+[0-9a-f ]+<.*>:
 [0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
 [0-9a-f	 ]+: R_FRV_TLSDESC_VALUE	\.tbss
 [0-9a-f ]+:	00 00 17 f3 	\*unknown\*
diff --git a/ld/testsuite/ld-frv/tls-shared-2.d b/ld/testsuite/ld-frv/tls-shared-2.d
index bd92cdb..1e6b533 100644
--- a/ld/testsuite/ld-frv/tls-shared-2.d
+++ b/ld/testsuite/ld-frv/tls-shared-2.d
@@ -151,7 +151,7 @@ Disassembly of section \.text:
 [0-9a-f ]+:	82 30 80 00 	calll @\(gr8,gr0\)
 Disassembly of section \.got:
 
-[0-9a-f ]+<(__data_start|_GLOBAL_OFFSET_TABLE_-0x60)>:
+[0-9a-f ]+<.*>:
 [0-9a-f ]+:	00 00 00 00 	add\.p gr0,gr0,gr0
 [0-9a-f	 ]+: R_FRV_TLSDESC_VALUE	\.tbss
 [0-9a-f ]+:	00 00 17 f3 	\*unknown\*
diff --git a/ld/testsuite/ld-i386/plt-nacl.pd b/ld/testsuite/ld-i386/plt-nacl.pd
index 0f8e114..d95e888e 100644
--- a/ld/testsuite/ld-i386/plt-nacl.pd
+++ b/ld/testsuite/ld-i386/plt-nacl.pd
@@ -8,7 +8,7 @@
 
 Disassembly of section .plt:
 
-[0-9a-f]+ <fn1@plt-0x40>:
+[0-9a-f]+ <.plt>:
  +[0-9a-f]+:	ff 35 ([0-9a-f]{2} ){4} *	pushl  0x[0-9a-f]+
  +[0-9a-f]+:	8b 0d ([0-9a-f]{2} ){4} *	mov    0x[0-9a-f]+,%ecx
  +[0-9a-f]+:	83 e1 e0             	and    \$0xffffffe0,%ecx
@@ -87,7 +87,7 @@ Disassembly of section .plt:
  +[0-9a-f]+:	90                   	nop
  +[0-9a-f]+:	90                   	nop
  +[0-9a-f]+:	68 00 00 00 00       	push   \$0x0
- +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <fn1@plt-0x40>
+ +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <.plt>
  +[0-9a-f]+:	90                   	nop
  +[0-9a-f]+:	90                   	nop
  +[0-9a-f]+:	90                   	nop
@@ -137,7 +137,7 @@ Disassembly of section .plt:
  +[0-9a-f]+:	90                   	nop
  +[0-9a-f]+:	90                   	nop
  +[0-9a-f]+:	68 08 00 00 00       	push   \$0x8
- +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <fn1@plt-0x40>
+ +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <.plt>
  +[0-9a-f]+:	90                   	nop
  +[0-9a-f]+:	90                   	nop
  +[0-9a-f]+:	90                   	nop
diff --git a/ld/testsuite/ld-i386/plt-pic-nacl.pd b/ld/testsuite/ld-i386/plt-pic-nacl.pd
index 77e8a2a..03aa007 100644
--- a/ld/testsuite/ld-i386/plt-pic-nacl.pd
+++ b/ld/testsuite/ld-i386/plt-pic-nacl.pd
@@ -8,7 +8,7 @@
 
 Disassembly of section .plt:
 
-[0-9a-f]+ <fn1@plt-0x40>:
+[0-9a-f]+ <.plt>:
  +[0-9a-f]+:	ff 73 04             	pushl  0x4\(%ebx\)
  +[0-9a-f]+:	8b 4b 08             	mov    0x8\(%ebx\),%ecx
  +[0-9a-f]+:	83 e1 e0             	and    \$0xffffffe0,%ecx
@@ -93,7 +93,7 @@ Disassembly of section .plt:
  +[0-9a-f]+:	90                   	nop
  +[0-9a-f]+:	90                   	nop
  +[0-9a-f]+:	68 00 00 00 00       	push   \$0x0
- +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <fn1@plt-0x40>
+ +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <.plt>
  +[0-9a-f]+:	90                   	nop
  +[0-9a-f]+:	90                   	nop
  +[0-9a-f]+:	90                   	nop
@@ -143,7 +143,7 @@ Disassembly of section .plt:
  +[0-9a-f]+:	90                   	nop
  +[0-9a-f]+:	90                   	nop
  +[0-9a-f]+:	68 08 00 00 00       	push   \$0x8
- +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <fn1@plt-0x40>
+ +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <.plt>
  +[0-9a-f]+:	90                   	nop
  +[0-9a-f]+:	90                   	nop
  +[0-9a-f]+:	90                   	nop
diff --git a/ld/testsuite/ld-i386/plt-pic.pd b/ld/testsuite/ld-i386/plt-pic.pd
index 5fe2930..4122c46 100644
--- a/ld/testsuite/ld-i386/plt-pic.pd
+++ b/ld/testsuite/ld-i386/plt-pic.pd
@@ -8,7 +8,7 @@
 
 Disassembly of section .plt:
 
-[0-9a-f]+ <fn1@plt-0x10>:
+[0-9a-f]+ <.plt>:
  +[0-9a-f]+:	ff b3 04 00 00 00    	pushl  0x4\(%ebx\)
  +[0-9a-f]+:	ff a3 08 00 00 00    	jmp    \*0x8\(%ebx\)
 #...
@@ -16,9 +16,9 @@ Disassembly of section .plt:
 [0-9a-f]+ <fn1@plt>:
  +[0-9a-f]+:	ff a3 ([0-9a-f]{2} ){4} *	jmp    \*0x[0-9a-f]+\(%ebx\)
  +[0-9a-f]+:	68 00 00 00 00       	push   \$0x0
- +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <fn1@plt-0x10>
+ +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <.plt>
 
 [0-9a-f]+ <fn2@plt>:
  +[0-9a-f]+:	ff a3 ([0-9a-f]{2} ){4} *	jmp    \*0x[0-9a-f]+\(%ebx\)
  +[0-9a-f]+:	68 08 00 00 00       	push   \$0x8
- +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <fn1@plt-0x10>
+ +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <.plt>
diff --git a/ld/testsuite/ld-i386/plt.pd b/ld/testsuite/ld-i386/plt.pd
index 1b1f57d..a6e6d35 100644
--- a/ld/testsuite/ld-i386/plt.pd
+++ b/ld/testsuite/ld-i386/plt.pd
@@ -8,7 +8,7 @@
 
 Disassembly of section .plt:
 
-[0-9a-f]+ <fn1@plt-0x10>:
+[0-9a-f]+ <.plt>:
  +[0-9a-f]+:	ff 35 ([0-9a-f]{2} ){4} *	pushl  0x[0-9a-f]+
  +[0-9a-f]+:	ff 25 ([0-9a-f]{2} ){4} *	jmp    \*0x[0-9a-f]+
 #...
@@ -16,9 +16,9 @@ Disassembly of section .plt:
 [0-9a-f]+ <fn1@plt>:
  +[0-9a-f]+:	ff 25 ([0-9a-f]{2} ){4} *	jmp    \*0x[0-9a-f]+
  +[0-9a-f]+:	68 00 00 00 00       	push   \$0x0
- +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <fn1@plt-0x10>
+ +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <.plt>
 
 [0-9a-f]+ <fn2@plt>:
  +[0-9a-f]+:	ff 25 ([0-9a-f]{2} ){4} *	jmp    \*0x[0-9a-f]+
  +[0-9a-f]+:	68 08 00 00 00       	push   \$0x8
- +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <fn1@plt-0x10>
+ +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <.plt>
diff --git a/ld/testsuite/ld-i386/pr19636-1d-nacl.d b/ld/testsuite/ld-i386/pr19636-1d-nacl.d
index fef5eea..489eab6 100644
--- a/ld/testsuite/ld-i386/pr19636-1d-nacl.d
+++ b/ld/testsuite/ld-i386/pr19636-1d-nacl.d
@@ -121,4 +121,4 @@ Disassembly of section .text:
 0+80 <_start>:
 [ 	]*[a-f0-9]+:	3b 80 f8 ff ff ff    	cmp    -0x8\(%eax\),%eax
 [ 	]*[a-f0-9]+:	ff a0 fc ff ff ff    	jmp    \*-0x4\(%eax\)
-[ 	]*[a-f0-9]+:	e8 af ff ff ff       	call   40 <_start-0x40>
+[ 	]*[a-f0-9]+:	e8 af ff ff ff       	call   40 <.*>
diff --git a/ld/testsuite/ld-i386/pr19636-1d.d b/ld/testsuite/ld-i386/pr19636-1d.d
index 16e316c..ac86786 100644
--- a/ld/testsuite/ld-i386/pr19636-1d.d
+++ b/ld/testsuite/ld-i386/pr19636-1d.d
@@ -23,4 +23,4 @@ Disassembly of section .text:
 0+e0 <_start>:
 [ 	]*[a-f0-9]+:	3b 80 f8 ff ff ff    	cmp    -0x8\(%eax\),%eax
 [ 	]*[a-f0-9]+:	ff a0 fc ff ff ff    	jmp    \*-0x4\(%eax\)
-[ 	]*[a-f0-9]+:	e8 df ff ff ff       	call   d0 <_start-0x10>
+[ 	]*[a-f0-9]+:	e8 df ff ff ff       	call   d0 <.*>
diff --git a/ld/testsuite/ld-i386/pr19636-2c-nacl.d b/ld/testsuite/ld-i386/pr19636-2c-nacl.d
index 7543e0e..7a6cce1 100644
--- a/ld/testsuite/ld-i386/pr19636-2c-nacl.d
+++ b/ld/testsuite/ld-i386/pr19636-2c-nacl.d
@@ -121,6 +121,6 @@ Disassembly of section .text:
 0+80 <_start>:
 [ 	]*[a-f0-9]+:	3b 80 fc ff ff ff    	cmp    -0x4\(%eax\),%eax
 [ 	]*[a-f0-9]+:	ff a0 fc ff ff ff    	jmp    \*-0x4\(%eax\)
-[ 	]*[a-f0-9]+:	e8 af ff ff ff       	call   40 <_start-0x40>
+[ 	]*[a-f0-9]+:	e8 af ff ff ff       	call   40 <.*>
 [ 	]*[a-f0-9]+:	3d 00 00 00 00       	cmp    \$0x0,%eax
-[ 	]*[a-f0-9]+:	e8 fc ff ff ff       	call   97 <_start\+0x17>
+[ 	]*[a-f0-9]+:	e8 fc ff ff ff       	call   97 <.*>
diff --git a/ld/testsuite/ld-i386/pr19636-2c.d b/ld/testsuite/ld-i386/pr19636-2c.d
index 98b53aa..08db119 100644
--- a/ld/testsuite/ld-i386/pr19636-2c.d
+++ b/ld/testsuite/ld-i386/pr19636-2c.d
@@ -23,6 +23,6 @@ Disassembly of section .text:
 0+150 <_start>:
 [ 	]*[a-f0-9]+:	3b 80 fc ff ff ff    	cmp    -0x4\(%eax\),%eax
 [ 	]*[a-f0-9]+:	ff a0 fc ff ff ff    	jmp    \*-0x4\(%eax\)
-[ 	]*[a-f0-9]+:	e8 df ff ff ff       	call   140 <_start-0x10>
+[ 	]*[a-f0-9]+:	e8 df ff ff ff       	call   140 <.*>
 [ 	]*[a-f0-9]+:	3d 00 00 00 00       	cmp    \$0x0,%eax
-[ 	]*[a-f0-9]+:	e8 fc ff ff ff       	call   167 <_start\+0x17>
+[ 	]*[a-f0-9]+:	e8 fc ff ff ff       	call   167 <.*>
diff --git a/ld/testsuite/ld-ifunc/ifunc-21-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-21-x86-64.d
index 4e3582d..fd42acc 100644
--- a/ld/testsuite/ld-ifunc/ifunc-21-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-21-x86-64.d
@@ -9,11 +9,11 @@
 Disassembly of section .text:
 
 0+4000c8 <__start>:
- +[a-f0-9]+:	ff 15 2a 00 20 00    	callq  \*0x20002a\(%rip\)        # 6000f8 <bar\+0x200007>
- +[a-f0-9]+:	ff 25 24 00 20 00    	jmpq   \*0x200024\(%rip\)        # 6000f8 <bar\+0x200007>
- +[a-f0-9]+:	48 03 05 1d 00 20 00 	add    0x20001d\(%rip\),%rax        # 6000f8 <bar\+0x200007>
- +[a-f0-9]+:	48 8b 05 16 00 20 00 	mov    0x200016\(%rip\),%rax        # 6000f8 <bar\+0x200007>
- +[a-f0-9]+:	48 85 05 0f 00 20 00 	test   %rax,0x20000f\(%rip\)        # 6000f8 <bar\+0x200007>
+ +[a-f0-9]+:	ff 15 2a 00 20 00    	callq  \*0x20002a\(%rip\)        # 6000f8 <.got>
+ +[a-f0-9]+:	ff 25 24 00 20 00    	jmpq   \*0x200024\(%rip\)        # 6000f8 <.got>
+ +[a-f0-9]+:	48 03 05 1d 00 20 00 	add    0x20001d\(%rip\),%rax        # 6000f8 <.got>
+ +[a-f0-9]+:	48 8b 05 16 00 20 00 	mov    0x200016\(%rip\),%rax        # 6000f8 <.got>
+ +[a-f0-9]+:	48 85 05 0f 00 20 00 	test   %rax,0x20000f\(%rip\)        # 6000f8 <.got>
  +[a-f0-9]+:	48 c7 c0 f1 00 40 00 	mov    \$0x4000f1,%rax
 
 0+4000f0 <foo>:
diff --git a/ld/testsuite/ld-ifunc/ifunc-22-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-22-x86-64.d
index 4e3582d..fd42acc 100644
--- a/ld/testsuite/ld-ifunc/ifunc-22-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-22-x86-64.d
@@ -9,11 +9,11 @@
 Disassembly of section .text:
 
 0+4000c8 <__start>:
- +[a-f0-9]+:	ff 15 2a 00 20 00    	callq  \*0x20002a\(%rip\)        # 6000f8 <bar\+0x200007>
- +[a-f0-9]+:	ff 25 24 00 20 00    	jmpq   \*0x200024\(%rip\)        # 6000f8 <bar\+0x200007>
- +[a-f0-9]+:	48 03 05 1d 00 20 00 	add    0x20001d\(%rip\),%rax        # 6000f8 <bar\+0x200007>
- +[a-f0-9]+:	48 8b 05 16 00 20 00 	mov    0x200016\(%rip\),%rax        # 6000f8 <bar\+0x200007>
- +[a-f0-9]+:	48 85 05 0f 00 20 00 	test   %rax,0x20000f\(%rip\)        # 6000f8 <bar\+0x200007>
+ +[a-f0-9]+:	ff 15 2a 00 20 00    	callq  \*0x20002a\(%rip\)        # 6000f8 <.got>
+ +[a-f0-9]+:	ff 25 24 00 20 00    	jmpq   \*0x200024\(%rip\)        # 6000f8 <.got>
+ +[a-f0-9]+:	48 03 05 1d 00 20 00 	add    0x20001d\(%rip\),%rax        # 6000f8 <.got>
+ +[a-f0-9]+:	48 8b 05 16 00 20 00 	mov    0x200016\(%rip\),%rax        # 6000f8 <.got>
+ +[a-f0-9]+:	48 85 05 0f 00 20 00 	test   %rax,0x20000f\(%rip\)        # 6000f8 <.got>
  +[a-f0-9]+:	48 c7 c0 f1 00 40 00 	mov    \$0x4000f1,%rax
 
 0+4000f0 <foo>:
diff --git a/ld/testsuite/ld-ifunc/pr17154-i386.d b/ld/testsuite/ld-ifunc/pr17154-i386.d
index e526223..16fcd4e 100644
--- a/ld/testsuite/ld-ifunc/pr17154-i386.d
+++ b/ld/testsuite/ld-ifunc/pr17154-i386.d
@@ -5,7 +5,7 @@
 #target: x86_64-*-* i?86-*-*
 
 #...
-0+1d0 <\*ABS\*@plt-0x10>:
+0+1d0 <.*>:
 [ 	]*[a-f0-9]+:	ff b3 04 00 00 00    	pushl  0x4\(%ebx\)
 [ 	]*[a-f0-9]+:	ff a3 08 00 00 00    	jmp    \*0x8\(%ebx\)
 [ 	]*[a-f0-9]+:	00 00                	add    %al,\(%eax\)
@@ -14,22 +14,22 @@
 0+1e0 <\*ABS\*@plt>:
 [ 	]*[a-f0-9]+:	ff a3 0c 00 00 00    	jmp    \*0xc\(%ebx\)
 [ 	]*[a-f0-9]+:	68 18 00 00 00       	push   \$0x18
-[ 	]*[a-f0-9]+:	e9 e0 ff ff ff       	jmp    1d0 <\*ABS\*@plt-0x10>
+[ 	]*[a-f0-9]+:	e9 e0 ff ff ff       	jmp    1d0 <.*>
 
 0+1f0 <func1@plt>:
 [ 	]*[a-f0-9]+:	ff a3 10 00 00 00    	jmp    \*0x10\(%ebx\)
 [ 	]*[a-f0-9]+:	68 00 00 00 00       	push   \$0x0
-[ 	]*[a-f0-9]+:	e9 d0 ff ff ff       	jmp    1d0 <\*ABS\*@plt-0x10>
+[ 	]*[a-f0-9]+:	e9 d0 ff ff ff       	jmp    1d0 <.*>
 
 0+200 <func2@plt>:
 [ 	]*[a-f0-9]+:	ff a3 14 00 00 00    	jmp    \*0x14\(%ebx\)
 [ 	]*[a-f0-9]+:	68 08 00 00 00       	push   \$0x8
-[ 	]*[a-f0-9]+:	e9 c0 ff ff ff       	jmp    1d0 <\*ABS\*@plt-0x10>
+[ 	]*[a-f0-9]+:	e9 c0 ff ff ff       	jmp    1d0 <.*>
 
 0+210 <\*ABS\*@plt>:
 [ 	]*[a-f0-9]+:	ff a3 18 00 00 00    	jmp    \*0x18\(%ebx\)
 [ 	]*[a-f0-9]+:	68 10 00 00 00       	push   \$0x10
-[ 	]*[a-f0-9]+:	e9 b0 ff ff ff       	jmp    1d0 <\*ABS\*@plt-0x10>
+[ 	]*[a-f0-9]+:	e9 b0 ff ff ff       	jmp    1d0 <.*>
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-ifunc/pr17154-x86-64.d b/ld/testsuite/ld-ifunc/pr17154-x86-64.d
index 9d2a688..1cdcf50 100644
--- a/ld/testsuite/ld-ifunc/pr17154-x86-64.d
+++ b/ld/testsuite/ld-ifunc/pr17154-x86-64.d
@@ -5,30 +5,30 @@
 #target: x86_64-*-*
 
 #...
-0+2b0 <\*ABS\*\+0x30a@plt-0x10>:
-[ 	]*[a-f0-9]+:	ff 35 5a 01 20 00    	pushq  0x20015a\(%rip\)        # 200410 <_GLOBAL_OFFSET_TABLE_\+0x8>
-[ 	]*[a-f0-9]+:	ff 25 5c 01 20 00    	jmpq   \*0x20015c\(%rip\)        # 200418 <_GLOBAL_OFFSET_TABLE_\+0x10>
+0+2b0 <.*>:
+[ 	]*[a-f0-9]+:	ff 35 5a 01 20 00    	pushq  0x20015a\(%rip\)        # 200410 <.*>
+[ 	]*[a-f0-9]+:	ff 25 5c 01 20 00    	jmpq   \*0x20015c\(%rip\)        # 200418 <.*>
 [ 	]*[a-f0-9]+:	0f 1f 40 00          	nopl   0x0\(%rax\)
 
 0+2c0 <\*ABS\*\+0x30a@plt>:
-[ 	]*[a-f0-9]+:	ff 25 5a 01 20 00    	jmpq   \*0x20015a\(%rip\)        # 200420 <_GLOBAL_OFFSET_TABLE_\+0x18>
+[ 	]*[a-f0-9]+:	ff 25 5a 01 20 00    	jmpq   \*0x20015a\(%rip\)        # 200420 <.*>
 [ 	]*[a-f0-9]+:	68 03 00 00 00       	pushq  \$0x3
-[ 	]*[a-f0-9]+:	e9 e0 ff ff ff       	jmpq   2b0 <\*ABS\*\+0x30a@plt-0x10>
+[ 	]*[a-f0-9]+:	e9 e0 ff ff ff       	jmpq   2b0 <.*>
 
 0+2d0 <func1@plt>:
-[ 	]*[a-f0-9]+:	ff 25 52 01 20 00    	jmpq   \*0x200152\(%rip\)        # 200428 <_GLOBAL_OFFSET_TABLE_\+0x20>
+[ 	]*[a-f0-9]+:	ff 25 52 01 20 00    	jmpq   \*0x200152\(%rip\)        # 200428 <.*>
 [ 	]*[a-f0-9]+:	68 00 00 00 00       	pushq  \$0x0
-[ 	]*[a-f0-9]+:	e9 d0 ff ff ff       	jmpq   2b0 <\*ABS\*\+0x30a@plt-0x10>
+[ 	]*[a-f0-9]+:	e9 d0 ff ff ff       	jmpq   2b0 <.*>
 
 0+2e0 <func2@plt>:
-[ 	]*[a-f0-9]+:	ff 25 4a 01 20 00    	jmpq   \*0x20014a\(%rip\)        # 200430 <_GLOBAL_OFFSET_TABLE_\+0x28>
+[ 	]*[a-f0-9]+:	ff 25 4a 01 20 00    	jmpq   \*0x20014a\(%rip\)        # 200430 <.*>
 [ 	]*[a-f0-9]+:	68 01 00 00 00       	pushq  \$0x1
-[ 	]*[a-f0-9]+:	e9 c0 ff ff ff       	jmpq   2b0 <\*ABS\*\+0x30a@plt-0x10>
+[ 	]*[a-f0-9]+:	e9 c0 ff ff ff       	jmpq   2b0 <.*>
 
 0+2f0 <\*ABS\*\+0x300@plt>:
-[ 	]*[a-f0-9]+:	ff 25 42 01 20 00    	jmpq   \*0x200142\(%rip\)        # 200438 <_GLOBAL_OFFSET_TABLE_\+0x30>
+[ 	]*[a-f0-9]+:	ff 25 42 01 20 00    	jmpq   \*0x200142\(%rip\)        # 200438 <.*>
 [ 	]*[a-f0-9]+:	68 02 00 00 00       	pushq  \$0x2
-[ 	]*[a-f0-9]+:	e9 b0 ff ff ff       	jmpq   2b0 <\*ABS\*\+0x30a@plt-0x10>
+[ 	]*[a-f0-9]+:	e9 b0 ff ff ff       	jmpq   2b0 <.*>
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-m68k/plt1-68020.d b/ld/testsuite/ld-m68k/plt1-68020.d
index 54463b9..ed3e1c1 100644
--- a/ld/testsuite/ld-m68k/plt1-68020.d
+++ b/ld/testsuite/ld-m68k/plt1-68020.d
@@ -3,7 +3,7 @@
 
 Disassembly of section \.plt:
 
-00020800 <f.@plt-0x14>:
+00020800 <.plt>:
    20800:	2f3b 0170 0000 	movel %pc@\(30404 <_GLOBAL_OFFSET_TABLE_\+0x4>\),%sp@-
    20806:	fc02 
    20808:	4efb 0171 0000 	jmp %pc@\(30408 <_GLOBAL_OFFSET_TABLE_\+0x8>\)@\(0*\)
@@ -11,22 +11,22 @@ Disassembly of section \.plt:
    20810:	0000 0000      	orib #0,%d0
 
 00020814 <f.@plt>:
-   20814:	4efb 0171 0000 	jmp %pc@\(3040c <_GLOBAL_OFFSET_TABLE_\+0xc>\)@\(0*\)
+   20814:	4efb 0171 0000 	jmp %pc@\(3040c <f3>\)@\(0*\)
    2081a:	fbf6 
    2081c:	2f3c 0000 0000 	movel #0,%sp@-
-   20822:	60ff ffff ffdc 	bral 20800 <f.@plt-0x14>
+   20822:	60ff ffff ffdc 	bral 20800 <.plt>
 
 00020828 <f.@plt>:
-   20828:	4efb 0171 0000 	jmp %pc@\(30410 <_GLOBAL_OFFSET_TABLE_\+0x10>\)@\(0*\)
+   20828:	4efb 0171 0000 	jmp %pc@\(30410 <f2>\)@\(0*\)
    2082e:	fbe6 
    20830:	2f3c 0000 000c 	movel #12,%sp@-
-   20836:	60ff ffff ffc8 	bral 20800 <f.@plt-0x14>
+   20836:	60ff ffff ffc8 	bral 20800 <.plt>
 
 0002083c <f.@plt>:
-   2083c:	4efb 0171 0000 	jmp %pc@\(30414 <_GLOBAL_OFFSET_TABLE_\+0x14>\)@\(0*\)
+   2083c:	4efb 0171 0000 	jmp %pc@\(30414 <f1>\)@\(0*\)
    20842:	fbd6 
    20844:	2f3c 0000 0018 	movel #24,%sp@-
-   2084a:	60ff ffff ffb4 	bral 20800 <f.@plt-0x14>
+   2084a:	60ff ffff ffb4 	bral 20800 <.plt>
 Disassembly of section \.text:
 
 00020c00 <.*>:
diff --git a/ld/testsuite/ld-m68k/plt1-cpu32.d b/ld/testsuite/ld-m68k/plt1-cpu32.d
index a497740..e303cd1 100644
--- a/ld/testsuite/ld-m68k/plt1-cpu32.d
+++ b/ld/testsuite/ld-m68k/plt1-cpu32.d
@@ -3,7 +3,7 @@
 
 Disassembly of section \.plt:
 
-00020800 <f.@plt-0x18>:
+00020800 <.plt>:
    20800:	2f3b 0170 0000 	movel %pc@\(30404 <_GLOBAL_OFFSET_TABLE_\+0x4>\),%sp@-
    20806:	fc02 
    20808:	227b 0170 0000 	moveal %pc@\(30408 <_GLOBAL_OFFSET_TABLE_\+0x8>\),%a1
@@ -13,27 +13,27 @@ Disassembly of section \.plt:
 	\.\.\.
 
 00020818 <f.@plt>:
-   20818:	227b 0170 0000 	moveal %pc@\(3040c <_GLOBAL_OFFSET_TABLE_\+0xc>\),%a1
+   20818:	227b 0170 0000 	moveal %pc@\(3040c <f3>\),%a1
    2081e:	fbf2 
    20820:	4ed1           	jmp %a1@
    20822:	2f3c 0000 0000 	movel #0,%sp@-
-   20828:	60ff ffff ffd6 	bral 20800 <f.@plt-0x18>
+   20828:	60ff ffff ffd6 	bral 20800 <.plt>
 	\.\.\.
 
 00020830 <f.@plt>:
-   20830:	227b 0170 0000 	moveal %pc@\(30410 <_GLOBAL_OFFSET_TABLE_\+0x10>\),%a1
+   20830:	227b 0170 0000 	moveal %pc@\(30410 <f2>\),%a1
    20836:	fbde 
    20838:	4ed1           	jmp %a1@
    2083a:	2f3c 0000 000c 	movel #12,%sp@-
-   20840:	60ff ffff ffbe 	bral 20800 <f.@plt-0x18>
+   20840:	60ff ffff ffbe 	bral 20800 <.plt>
 	\.\.\.
 
 00020848 <f.@plt>:
-   20848:	227b 0170 0000 	moveal %pc@\(30414 <_GLOBAL_OFFSET_TABLE_\+0x14>\),%a1
+   20848:	227b 0170 0000 	moveal %pc@\(30414 <f1>\),%a1
    2084e:	fbca 
    20850:	4ed1           	jmp %a1@
    20852:	2f3c 0000 0018 	movel #24,%sp@-
-   20858:	60ff ffff ffa6 	bral 20800 <f.@plt-0x18>
+   20858:	60ff ffff ffa6 	bral 20800 <.plt>
 	\.\.\.
 Disassembly of section \.text:
 
diff --git a/ld/testsuite/ld-m68k/plt1-isab.d b/ld/testsuite/ld-m68k/plt1-isab.d
index a9aeacb..00e88b7 100644
--- a/ld/testsuite/ld-m68k/plt1-isab.d
+++ b/ld/testsuite/ld-m68k/plt1-isab.d
@@ -3,23 +3,23 @@
 
 Disassembly of section \.plt:
 
-00020800 <f.@plt-0x18>:
+00020800 <.plt>:
 # _GLOBAL_OFFSET_TABLE_ + 4 == 0x30404 == 0x20802 + 0xfc02
    20800:	203c 0000 fc02 	movel #64514,%d0
-   20806:	2f3b 08fa      	movel %pc@\(20802 <f.@plt-0x16>,%d0:l\),%sp@-
+   20806:	2f3b 08fa      	movel %pc@\(20802 <.*>,%d0:l\),%sp@-
 # _GLOBAL_OFFSET_TABLE_ + 8 == 0x30408 == 0x2080c + 0xfbfc
    2080a:	203c 0000 fbfc 	movel #64508,%d0
-   20810:	207b 08fa      	moveal %pc@\(2080c <f.@plt-0xc>,%d0:l\),%a0
+   20810:	207b 08fa      	moveal %pc@\(2080c <.*>,%d0:l\),%a0
    20814:	4ed0           	jmp %a0@
    20816:	4e71           	nop
 
 00020818 <f.@plt>:
 # _GLOBAL_OFFSET_TABLE_ + 12 == 0x3040c == 0x2081a + 0xfbf2
    20818:	203c 0000 fbf2 	movel #64498,%d0
-   2081e:	207b 08fa      	moveal %pc@\(2081a <f.@plt\+0x2>,%d0:l\),%a0
+   2081e:	207b 08fa      	moveal %pc@\(2081a <.*>,%d0:l\),%a0
    20822:	4ed0           	jmp %a0@
    20824:	2f3c 0000 0000 	movel #0,%sp@-
-   2082a:	60ff ffff ffd4 	bral 20800 <f.@plt-0x18>
+   2082a:	60ff ffff ffd4 	bral 20800 <.plt>
 
 00020830 <f.@plt>:
 # _GLOBAL_OFFSET_TABLE_ + 16 == 0x30410 == 0x20832 + 0xfbde
@@ -27,7 +27,7 @@ Disassembly of section \.plt:
    20836:	207b 08fa      	moveal %pc@\(20832 <f.@plt\+0x2>,%d0:l\),%a0
    2083a:	4ed0           	jmp %a0@
    2083c:	2f3c 0000 000c 	movel #12,%sp@-
-   20842:	60ff ffff ffbc 	bral 20800 <f.@plt-0x18>
+   20842:	60ff ffff ffbc 	bral 20800 <.*>
 
 00020848 <f.@plt>:
 # _GLOBAL_OFFSET_TABLE_ + 20 == 0x30414 == 0x2084a + 0xfbca
@@ -35,7 +35,7 @@ Disassembly of section \.plt:
    2084e:	207b 08fa      	moveal %pc@\(2084a <f.@plt\+0x2>,%d0:l\),%a0
    20852:	4ed0           	jmp %a0@
    20854:	2f3c 0000 0018 	movel #24,%sp@-
-   2085a:	60ff ffff ffa4 	bral 20800 <f.@plt-0x18>
+   2085a:	60ff ffff ffa4 	bral 20800 <.*>
 Disassembly of section \.text:
 
 00020c00 <.*>:
diff --git a/ld/testsuite/ld-m68k/plt1-isac.d b/ld/testsuite/ld-m68k/plt1-isac.d
index ae299ce..d3d775e 100644
--- a/ld/testsuite/ld-m68k/plt1-isac.d
+++ b/ld/testsuite/ld-m68k/plt1-isac.d
@@ -3,13 +3,13 @@
 
 Disassembly of section \.plt:
 
-00020800 <f.@plt-0x18>:
+00020800 <.plt>:
 # _GLOBAL_OFFSET_TABLE_ + 4 == 0x30404 == 0x20802 + 0xfc02
    20800:	203c 0000 fc02 	movel #64514,%d0
-   20806:	2ebb 08fa      	movel %pc@\(20802 <f.@plt-0x16>,%d0:l\),%sp@
+   20806:	2ebb 08fa      	movel %pc@\(20802 <.*>,%d0:l\),%sp@
 # _GLOBAL_OFFSET_TABLE_ + 8 == 0x30408 == 0x2080c + 0xfbfc
    2080a:	203c 0000 fbfc 	movel #64508,%d0
-   20810:	207b 08fa      	moveal %pc@\(2080c <f.@plt-0xc>,%d0:l\),%a0
+   20810:	207b 08fa      	moveal %pc@\(2080c <.*>,%d0:l\),%a0
    20814:	4ed0           	jmp %a0@
    20816:	4e71           	nop
 
@@ -19,7 +19,7 @@ Disassembly of section \.plt:
    2081e:	207b 08fa      	moveal %pc@\(2081a <f.@plt\+0x2>,%d0:l\),%a0
    20822:	4ed0           	jmp %a0@
    20824:	2f3c 0000 0000 	movel #0,%sp@-
-   2082a:	61ff ffff ffd4 	bsrl 20800 <f.@plt-0x18>
+   2082a:	61ff ffff ffd4 	bsrl 20800 <.plt>
 
 00020830 <f.@plt>:
 # _GLOBAL_OFFSET_TABLE_ + 16 == 0x30410 == 0x20832 + 0xfbde
@@ -27,7 +27,7 @@ Disassembly of section \.plt:
    20836:	207b 08fa      	moveal %pc@\(20832 <f.@plt\+0x2>,%d0:l\),%a0
    2083a:	4ed0           	jmp %a0@
    2083c:	2f3c 0000 000c 	movel #12,%sp@-
-   20842:	61ff ffff ffbc 	bsrl 20800 <f.@plt-0x18>
+   20842:	61ff ffff ffbc 	bsrl 20800 <.plt>
 
 00020848 <f.@plt>:
 # _GLOBAL_OFFSET_TABLE_ + 20 == 0x30414 == 0x2084a + 0xfbca
@@ -35,7 +35,7 @@ Disassembly of section \.plt:
    2084e:	207b 08fa      	moveal %pc@\(2084a <f.@plt\+0x2>,%d0:l\),%a0
    20852:	4ed0           	jmp %a0@
    20854:	2f3c 0000 0018 	movel #24,%sp@-
-   2085a:	61ff ffff ffa4 	bsrl 20800 <f.@plt-0x18>
+   2085a:	61ff ffff ffa4 	bsrl 20800 <.plt>
 Disassembly of section \.text:
 
 00020c00 <.*>:
diff --git a/ld/testsuite/ld-metag/shared.d b/ld/testsuite/ld-metag/shared.d
index 7662dbc..94e48c0 100644
--- a/ld/testsuite/ld-metag/shared.d
+++ b/ld/testsuite/ld-metag/shared.d
@@ -17,7 +17,7 @@ Disassembly of section .plt:
  .*:	82120780 	          ADD       A0.2,A0.2,#0x40f0
  .*:	c600806a 	          GETD      PC,\[A0.2\]
  .*:	03000004 	          MOV       D1Re0,#0
- .*:	a0fffee0 	          B         184 <app_func2@plt-0x14>
+ .*:	a0fffee0 	          B         184 <.*>
 Disassembly of section .text:
 
 .* <lib_func1>:
diff --git a/ld/testsuite/ld-metag/stub_pic_app.d b/ld/testsuite/ld-metag/stub_pic_app.d
index 7a763b9..a6cf3d4 100644
--- a/ld/testsuite/ld-metag/stub_pic_app.d
+++ b/ld/testsuite/ld-metag/stub_pic_app.d
@@ -16,7 +16,7 @@ Disassembly of section .plt:
 .*:	821496e0 	          ADD       A0.2,A0.2,#0x92dc
 .*:	c600806a 	          GETD      PC,\[A0.2\]
 .*:	03000004 	          MOV       D1Re0,#0
-.*:	a0fffee0 	          B         .* <_lib_func@plt-0x14>
+.*:	a0fffee0 	          B         .* <.*>
 Disassembly of section .text:
 .* <__start-0x10>:
 .*:	82188105 	          MOVT      A0.3,#0x1020
diff --git a/ld/testsuite/ld-metag/stub_pic_shared.d b/ld/testsuite/ld-metag/stub_pic_shared.d
index 41129c3..c422b09 100644
--- a/ld/testsuite/ld-metag/stub_pic_shared.d
+++ b/ld/testsuite/ld-metag/stub_pic_shared.d
@@ -16,7 +16,7 @@ Disassembly of section .plt:
  .*:	82120580 	          ADD       A0.2,A0.2,#0x40b0
  .*:	c600806a 	          GETD      PC,\[A0.2\]
  .*:	03000004 	          MOV       D1Re0,#0
- .*:	a0fffee0 	          B         .* <_far2@plt-0x14>
+ .*:	a0fffee0 	          B         .* <.*>
 Disassembly of section .text:
 .* <__start-0xc>:
 .*:	82980101 	          ADDT      A0.3,CPC0,#0x20
diff --git a/ld/testsuite/ld-metag/stub_shared.d b/ld/testsuite/ld-metag/stub_shared.d
index e937f1e..dbcd4b9 100644
--- a/ld/testsuite/ld-metag/stub_shared.d
+++ b/ld/testsuite/ld-metag/stub_shared.d
@@ -17,7 +17,7 @@ Disassembly of section .plt:
  .*:	82120620 	          ADD       A0.2,A0.2,#0x40c4
  .*:	c600806a 	          GETD      PC,\[A0.2\]
  .*:	03000004 	          MOV       D1Re0,#0
- .*:	a0fffee0 	          B         .* <_far2@plt-0x14>
+ .*:	a0fffee0 	          B         .* <.*>
 Disassembly of section .text:
 
 .* <_lib_func>:
diff --git a/ld/testsuite/ld-s390/tlsbin_64.dd b/ld/testsuite/ld-s390/tlsbin_64.dd
index eac7f41..fe11a23 100644
--- a/ld/testsuite/ld-s390/tlsbin_64.dd
+++ b/ld/testsuite/ld-s390/tlsbin_64.dd
@@ -129,7 +129,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	eb 43 00 00 00 0d 	sllg	%r4,%r3,0
  +[0-9a-f]+:	41 54 90 00       	la	%r5,0\(%r4,%r9\)
 # IE against global var with larl got access
- +[0-9a-f]+:	c0 30 [0-9a-f ]+ 	larl	%r3,[0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x28>
+ +[0-9a-f]+:	c0 30 [0-9a-f ]+ 	larl	%r3,[0-9a-f]+ <.*>
  +[0-9a-f]+:	e3 33 c0 00 00 04 	lg	%r3,0\(%r3,%r12\)
  +[0-9a-f]+:	41 33 90 00       	la	%r3,0\(%r3,%r9\)
 # IE against global var defined in exec with larl got access
diff --git a/ld/testsuite/ld-s390/tlspic_64.dd b/ld/testsuite/ld-s390/tlspic_64.dd
index 274cd16..86fdbbd 100644
--- a/ld/testsuite/ld-s390/tlspic_64.dd
+++ b/ld/testsuite/ld-s390/tlspic_64.dd
@@ -160,7 +160,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	e3 43 c0 00 00 04 	lg	%r4,0\(%r3,%r12\)
  +[0-9a-f]+:	41 54 90 00       	la	%r5,0\(%r4,%r9\)
 # IE against global var with larl got access
- +[0-9a-f]+:	c0 30 [0-9a-f ]+ 	larl	%r3,[0-9a-f]+ <\_GLOBAL\_OFFSET\_TABLE\_\+0x68>
+ +[0-9a-f]+:	c0 30 [0-9a-f ]+ 	larl	%r3,[0-9a-f]+ <.*>
  +[0-9a-f]+:	e3 33 c0 00 00 04 	lg	%r3,0\(%r3,%r12\)
  +[0-9a-f]+:	41 33 90 00       	la	%r3,0\(%r3,%r9\)
 # IE against local var with larl got access
diff --git a/ld/testsuite/ld-tic6x/shlib-1.dd b/ld/testsuite/ld-tic6x/shlib-1.dd
index d33887e..a00c136 100644
--- a/ld/testsuite/ld-tic6x/shlib-1.dd
+++ b/ld/testsuite/ld-tic6x/shlib-1.dd
@@ -4,7 +4,7 @@ tmpdir/libtest\.so:     file format elf32-tic6x-le
 
 Disassembly of section \.plt:
 
-10000020 <sub0@plt-0x18>:
+10000020 <.plt>:
 10000020:[ \t]*0100036e[ \t]*ldw \.D2T2 \*\+b14\(12\),b2
 10000024:[ \t]*0080046e[ \t]*ldw \.D2T2 \*\+b14\(16\),b1
 10000028:[ \t]*00004000[ \t]*nop 3
diff --git a/ld/testsuite/ld-tic6x/shlib-1b.dd b/ld/testsuite/ld-tic6x/shlib-1b.dd
index 658da73..fa597d6 100644
--- a/ld/testsuite/ld-tic6x/shlib-1b.dd
+++ b/ld/testsuite/ld-tic6x/shlib-1b.dd
@@ -4,7 +4,7 @@ tmpdir/libtestb\.so:     file format elf32-tic6x-be
 
 Disassembly of section \.plt:
 
-10000020 <sub0@plt-0x18>:
+10000020 <.plt>:
 10000020:[ \t]*0100036e[ \t]*ldw \.D2T2 \*\+b14\(12\),b2
 10000024:[ \t]*0080046e[ \t]*ldw \.D2T2 \*\+b14\(16\),b1
 10000028:[ \t]*00004000[ \t]*nop 3
diff --git a/ld/testsuite/ld-tic6x/shlib-1rb.dd b/ld/testsuite/ld-tic6x/shlib-1rb.dd
index ee1a607..6b3a2c2 100644
--- a/ld/testsuite/ld-tic6x/shlib-1rb.dd
+++ b/ld/testsuite/ld-tic6x/shlib-1rb.dd
@@ -4,7 +4,7 @@ tmpdir/libtestrb\.so:     file format elf32-tic6x-be
 
 Disassembly of section \.plt:
 
-10000020 <sub0@plt-0x18>:
+10000020 <.plt>:
 10000020:[ \t]*0100036e[ \t]*ldw \.D2T2 \*\+b14\(12\),b2
 10000024:[ \t]*0080046e[ \t]*ldw \.D2T2 \*\+b14\(16\),b1
 10000028:[ \t]*00004000[ \t]*nop 3
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1.dd b/ld/testsuite/ld-tic6x/shlib-app-1.dd
index 411d47f..9e437bb 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1.dd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1.dd
@@ -4,7 +4,7 @@ tmpdir/shlib-dynapp-1:     file format elf32-tic6x-le
 
 Disassembly of section \.plt:
 
-10000020 <sub0@plt-0x18>:
+10000020 <.plt>:
 10000020:[ \t]*0100036e[ \t]*ldw \.D2T2 \*\+b14\(12\),b2
 10000024:[ \t]*0080046e[ \t]*ldw \.D2T2 \*\+b14\(16\),b1
 10000028:[ \t]*00004000[ \t]*nop 3
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1b.dd b/ld/testsuite/ld-tic6x/shlib-app-1b.dd
index 5312ff8..b7cb86b 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1b.dd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1b.dd
@@ -4,7 +4,7 @@ tmpdir/shlib-dynapp-1b:     file format elf32-tic6x-be
 
 Disassembly of section \.plt:
 
-10000020 <sub0@plt-0x18>:
+10000020 <.plt>:
 10000020:[ \t]*0100036e[ \t]*ldw \.D2T2 \*\+b14\(12\),b2
 10000024:[ \t]*0080046e[ \t]*ldw \.D2T2 \*\+b14\(16\),b1
 10000028:[ \t]*00004000[ \t]*nop 3
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1r.dd b/ld/testsuite/ld-tic6x/shlib-app-1r.dd
index 3e68bf2..6d7cd09 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1r.dd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1r.dd
@@ -4,7 +4,7 @@ tmpdir/shlib-dynapp-1r:     file format elf32-tic6x-le
 
 Disassembly of section \.plt:
 
-10000020 <sub0@plt-0x18>:
+10000020 <.plt>:
 10000020:[ \t]*0100036e[ \t]*ldw \.D2T2 \*\+b14\(12\),b2
 10000024:[ \t]*0080046e[ \t]*ldw \.D2T2 \*\+b14\(16\),b1
 10000028:[ \t]*00004000[ \t]*nop 3
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1rb.dd b/ld/testsuite/ld-tic6x/shlib-app-1rb.dd
index ad1f28e..57809ab 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1rb.dd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1rb.dd
@@ -4,7 +4,7 @@ tmpdir/shlib-dynapp-1rb:     file format elf32-tic6x-be
 
 Disassembly of section \.plt:
 
-10000020 <sub0@plt-0x18>:
+10000020 <.plt>:
 10000020:[ \t]*0100036e[ \t]*ldw \.D2T2 \*\+b14\(12\),b2
 10000024:[ \t]*0080046e[ \t]*ldw \.D2T2 \*\+b14\(16\),b1
 10000028:[ \t]*00004000[ \t]*nop 3
diff --git a/ld/testsuite/ld-tic6x/shlib-noindex.dd b/ld/testsuite/ld-tic6x/shlib-noindex.dd
index bfdf499..fd37bac 100644
--- a/ld/testsuite/ld-tic6x/shlib-noindex.dd
+++ b/ld/testsuite/ld-tic6x/shlib-noindex.dd
@@ -4,7 +4,7 @@ tmpdir/libtestn\.so:     file format elf32-tic6x-le
 
 Disassembly of section \.plt:
 
-10000020 <sub0@plt-0x18>:
+10000020 <.plt>:
 10000020:	0100036e 	ldw \.D2T2 \*\+b14\(12\),b2
 10000024:	0080046e 	ldw \.D2T2 \*\+b14\(16\),b1
 10000028:	00004000 	nop 3
diff --git a/ld/testsuite/ld-vax-elf/export-class-data.dd b/ld/testsuite/ld-vax-elf/export-class-data.dd
index c2be30c..7d152c8 100644
--- a/ld/testsuite/ld-vax-elf/export-class-data.dd
+++ b/ld/testsuite/ld-vax-elf/export-class-data.dd
@@ -5,7 +5,7 @@ Disassembly of section \.text:
 
 12340000 <foo>:
 12340000:	00 00       	\.word 0x0000 # Entry mask: < >
-12340002:	9e ff 2c 00 	movab \*12340034 <_GLOBAL_OFFSET_TABLE_\+0x10>,r0
+12340002:	9e ff 2c 00 	movab \*12340034 <.*>,r0
 12340006:	00 00 50 
 12340009:	9e ef 0c 00 	movab 1234001b <hidden_foo>,r0
 1234000d:	00 00 50 
diff --git a/ld/testsuite/ld-vax-elf/plt-local-lib.dd b/ld/testsuite/ld-vax-elf/plt-local-lib.dd
index 95e8176..3c1268c 100644
--- a/ld/testsuite/ld-vax-elf/plt-local-lib.dd
+++ b/ld/testsuite/ld-vax-elf/plt-local-lib.dd
@@ -2,7 +2,7 @@
 
 Disassembly of section \.plt:
 
-00001000 <foo_local@plt-0xc>:
+00001000 <.plt>:
     1000:	dd ef 76 20 	pushl 307c <_GLOBAL_OFFSET_TABLE_\+0x4>
     1004:	00 00 
     1006:	17 ff 74 20 	jmp \*3080 <_GLOBAL_OFFSET_TABLE_\+0x8>
@@ -10,25 +10,25 @@ Disassembly of section \.plt:
 
 0000100c <foo_local@plt>:
     100c:	fc 0f       	\.word 0x0ffc # Entry mask: < r11 r10 r9 r8 r7 r6 r5 r4 r3 r2 >
-    100e:	16 ef ec ff 	jsb 1000 <foo_local@plt-0xc>
+    100e:	16 ef ec ff 	jsb 1000 <.plt>
     1012:	ff ff 
     1014:	00 00 00 00 	\.long 0x00000000
 
 00001018 <foo_extern@plt>:
     1018:	fc 0f       	\.word 0x0ffc # Entry mask: < r11 r10 r9 r8 r7 r6 r5 r4 r3 r2 >
-    101a:	16 ef e0 ff 	jsb 1000 <foo_local@plt-0xc>
+    101a:	16 ef e0 ff 	jsb 1000 <.plt>
     101e:	ff ff 
     1020:	0c 00 00 00 	\.long 0x0000000c
 
 00001024 <foo_rehidden@plt>:
     1024:	fc 0f       	\.word 0x0ffc # Entry mask: < r11 r10 r9 r8 r7 r6 r5 r4 r3 r2 >
-    1026:	16 ef d4 ff 	jsb 1000 <foo_local@plt-0xc>
+    1026:	16 ef d4 ff 	jsb 1000 <.plt>
     102a:	ff ff 
     102c:	18 00 00 00 	\.long 0x00000018
 
 00001030 <foo_global@plt>:
     1030:	fc 0f       	\.word 0x0ffc # Entry mask: < r11 r10 r9 r8 r7 r6 r5 r4 r3 r2 >
-    1032:	16 ef c8 ff 	jsb 1000 <foo_local@plt-0xc>
+    1032:	16 ef c8 ff 	jsb 1000 <.plt>
     1036:	ff ff 
     1038:	24 00 00 00 	\.long 0x00000024
 
@@ -36,56 +36,56 @@ Disassembly of section \.text:
 
 00002000 <foo_extern>:
     2000:	00 00       	\.word 0x0000 # Entry mask: < >
-    2002:	fb 00 ff 7f 	calls \$0x0,\*3088 <_GLOBAL_OFFSET_TABLE_\+0x10>
+    2002:	fb 00 ff 7f 	calls \$0x0,\*3088 <.*>
     2006:	10 00 00 
-    2009:	fb 00 ff 80 	calls \$0x0,\*3090 <_GLOBAL_OFFSET_TABLE_\+0x18>
+    2009:	fb 00 ff 80 	calls \$0x0,\*3090 <.*>
     200d:	10 00 00 
-    2010:	fb 00 ff 6d 	calls \$0x0,\*3084 <_GLOBAL_OFFSET_TABLE_\+0xc>
+    2010:	fb 00 ff 6d 	calls \$0x0,\*3084 <.*>
     2014:	10 00 00 
     2017:	fb 00 ef 2e 	calls \$0x0,204c <foo_hidden>
     201b:	00 00 00 
-    201e:	fb 00 ff 67 	calls \$0x0,\*308c <_GLOBAL_OFFSET_TABLE_\+0x14>
+    201e:	fb 00 ff 67 	calls \$0x0,\*308c <.*>
     2022:	10 00 00 
     2025:	04          	ret
 
 00002026 <foo_local>:
     2026:	00 00       	\.word 0x0000 # Entry mask: < >
-    2028:	fb 00 ff 59 	calls \$0x0,\*3088 <_GLOBAL_OFFSET_TABLE_\+0x10>
+    2028:	fb 00 ff 59 	calls \$0x0,\*3088 <.*>
     202c:	10 00 00 
-    202f:	fb 00 ff 5a 	calls \$0x0,\*3090 <_GLOBAL_OFFSET_TABLE_\+0x18>
+    202f:	fb 00 ff 5a 	calls \$0x0,\*3090 <.*>
     2033:	10 00 00 
-    2036:	fb 00 ff 47 	calls \$0x0,\*3084 <_GLOBAL_OFFSET_TABLE_\+0xc>
+    2036:	fb 00 ff 47 	calls \$0x0,\*3084 <.*>
     203a:	10 00 00 
     203d:	fb 00 ef 08 	calls \$0x0,204c <foo_hidden>
     2041:	00 00 00 
-    2044:	fb 00 ff 41 	calls \$0x0,\*308c <_GLOBAL_OFFSET_TABLE_\+0x14>
+    2044:	fb 00 ff 41 	calls \$0x0,\*308c <.*>
     2048:	10 00 00 
     204b:	04          	ret
 
 0000204c <foo_hidden>:
     204c:	00 00       	\.word 0x0000 # Entry mask: < >
-    204e:	fb 00 ff 33 	calls \$0x0,\*3088 <_GLOBAL_OFFSET_TABLE_\+0x10>
+    204e:	fb 00 ff 33 	calls \$0x0,\*3088 <.*>
     2052:	10 00 00 
-    2055:	fb 00 ff 34 	calls \$0x0,\*3090 <_GLOBAL_OFFSET_TABLE_\+0x18>
+    2055:	fb 00 ff 34 	calls \$0x0,\*3090 <.*>
     2059:	10 00 00 
-    205c:	fb 00 ff 21 	calls \$0x0,\*3084 <_GLOBAL_OFFSET_TABLE_\+0xc>
+    205c:	fb 00 ff 21 	calls \$0x0,\*3084 <.*>
     2060:	10 00 00 
     2063:	fb 00 ef e2 	calls \$0x0,204c <foo_hidden>
     2067:	ff ff ff 
-    206a:	fb 00 ff 1b 	calls \$0x0,\*308c <_GLOBAL_OFFSET_TABLE_\+0x14>
+    206a:	fb 00 ff 1b 	calls \$0x0,\*308c <.*>
     206e:	10 00 00 
     2071:	04          	ret
 
 00002072 <foo_rehidden>:
     2072:	00 00       	\.word 0x0000 # Entry mask: < >
-    2074:	fb 00 ff 0d 	calls \$0x0,\*3088 <_GLOBAL_OFFSET_TABLE_\+0x10>
+    2074:	fb 00 ff 0d 	calls \$0x0,\*3088 <.*>
     2078:	10 00 00 
-    207b:	fb 00 ff 0e 	calls \$0x0,\*3090 <_GLOBAL_OFFSET_TABLE_\+0x18>
+    207b:	fb 00 ff 0e 	calls \$0x0,\*3090 <.*>
     207f:	10 00 00 
-    2082:	fb 00 ff fb 	calls \$0x0,\*3084 <_GLOBAL_OFFSET_TABLE_\+0xc>
+    2082:	fb 00 ff fb 	calls \$0x0,\*3084 <.*>
     2086:	0f 00 00 
     2089:	fb 00 ef bc 	calls \$0x0,204c <foo_hidden>
     208d:	ff ff ff 
-    2090:	fb 00 ff f5 	calls \$0x0,\*308c <_GLOBAL_OFFSET_TABLE_\+0x14>
+    2090:	fb 00 ff f5 	calls \$0x0,\*308c <.*>
     2094:	0f 00 00 
     2097:	04          	ret
diff --git a/ld/testsuite/ld-vax-elf/plt-local.dd b/ld/testsuite/ld-vax-elf/plt-local.dd
index 84eca55..94fbadd 100644
--- a/ld/testsuite/ld-vax-elf/plt-local.dd
+++ b/ld/testsuite/ld-vax-elf/plt-local.dd
@@ -2,7 +2,7 @@
 
 Disassembly of section \.plt:
 
-00001000 <foo_extern@plt-0xc>:
+00001000 <.plt>:
     1000:	dd ef 86 20 	pushl 308c <_GLOBAL_OFFSET_TABLE_\+0x4>
     1004:	00 00 
     1006:	17 ff 84 20 	jmp \*3090 <_GLOBAL_OFFSET_TABLE_\+0x8>
@@ -10,7 +10,7 @@ Disassembly of section \.plt:
 
 0000100c <foo_extern@plt>:
     100c:	fc 0f       	\.word 0x0ffc # Entry mask: < r11 r10 r9 r8 r7 r6 r5 r4 r3 r2 >
-    100e:	16 ef ec ff 	jsb 1000 <foo_extern@plt-0xc>
+    100e:	16 ef ec ff 	jsb 1000 <.plt>
     1012:	ff ff 
     1014:	00 00 00 00 	\.long 0x00000000
 
@@ -18,7 +18,7 @@ Disassembly of section \.text:
 
 00002000 <foo_hidden>:
     2000:	00 00       	\.word 0x0000 # Entry mask: < >
-    2002:	fb 00 ff 8b 	calls \$0x0,\*3094 <_GLOBAL_OFFSET_TABLE_\+0xc>
+    2002:	fb 00 ff 8b 	calls \$0x0,\*3094 <foo_extern>
     2006:	10 00 00 
     2009:	fb 00 ef 3c 	calls \$0x0,204c <foo_global>
     200d:	00 00 00 
@@ -32,7 +32,7 @@ Disassembly of section \.text:
 
 00002026 <foo_rehidden>:
     2026:	00 00       	\.word 0x0000 # Entry mask: < >
-    2028:	fb 00 ff 65 	calls \$0x0,\*3094 <_GLOBAL_OFFSET_TABLE_\+0xc>
+    2028:	fb 00 ff 65 	calls \$0x0,\*3094 <foo_extern>
     202c:	10 00 00 
     202f:	fb 00 ef 16 	calls \$0x0,204c <foo_global>
     2033:	00 00 00 
@@ -46,7 +46,7 @@ Disassembly of section \.text:
 
 0000204c <foo_global>:
     204c:	00 00       	\.word 0x0000 # Entry mask: < >
-    204e:	fb 00 ff 3f 	calls \$0x0,\*3094 <_GLOBAL_OFFSET_TABLE_\+0xc>
+    204e:	fb 00 ff 3f 	calls \$0x0,\*3094 <foo_extern>
     2052:	10 00 00 
     2055:	fb 00 ef f0 	calls \$0x0,204c <foo_global>
     2059:	ff ff ff 
@@ -60,7 +60,7 @@ Disassembly of section \.text:
 
 00002072 <foo_local>:
     2072:	00 00       	\.word 0x0000 # Entry mask: < >
-    2074:	fb 00 ff 19 	calls \$0x0,\*3094 <_GLOBAL_OFFSET_TABLE_\+0xc>
+    2074:	fb 00 ff 19 	calls \$0x0,\*3094 <foo_extern>
     2078:	10 00 00 
     207b:	fb 00 ef ca 	calls \$0x0,204c <foo_global>
     207f:	ff ff ff 
diff --git a/ld/testsuite/ld-x86-64/bnd-ifunc-2.d b/ld/testsuite/ld-x86-64/bnd-ifunc-2.d
index 61750c9..306a17d 100644
--- a/ld/testsuite/ld-x86-64/bnd-ifunc-2.d
+++ b/ld/testsuite/ld-x86-64/bnd-ifunc-2.d
@@ -8,16 +8,16 @@
 [ 	]*[a-f0-9]+:	f2 ff 25 7b 01 20 00 	bnd jmpq \*0x20017b\(%rip\)        # 200438 <_GLOBAL_OFFSET_TABLE_\+0x10>
 [ 	]*[a-f0-9]+:	0f 1f 00             	nopl   \(%rax\)
 [ 	]*[a-f0-9]+:	68 03 00 00 00       	pushq  \$0x3
-[ 	]*[a-f0-9]+:	f2 e9 e5 ff ff ff    	bnd jmpq 2b0 <\*ABS\*\+0x32c@plt-0x50>
+[ 	]*[a-f0-9]+:	f2 e9 e5 ff ff ff    	bnd jmpq 2b0 <.*>
 [ 	]*[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	68 00 00 00 00       	pushq  \$0x0
-[ 	]*[a-f0-9]+:	f2 e9 d5 ff ff ff    	bnd jmpq 2b0 <\*ABS\*\+0x32c@plt-0x50>
+[ 	]*[a-f0-9]+:	f2 e9 d5 ff ff ff    	bnd jmpq 2b0 <.*>
 [ 	]*[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	68 01 00 00 00       	pushq  \$0x1
-[ 	]*[a-f0-9]+:	f2 e9 c5 ff ff ff    	bnd jmpq 2b0 <\*ABS\*\+0x32c@plt-0x50>
+[ 	]*[a-f0-9]+:	f2 e9 c5 ff ff ff    	bnd jmpq 2b0 <.*>
 [ 	]*[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	68 02 00 00 00       	pushq  \$0x2
-[ 	]*[a-f0-9]+:	f2 e9 b5 ff ff ff    	bnd jmpq 2b0 <\*ABS\*\+0x32c@plt-0x50>
+[ 	]*[a-f0-9]+:	f2 e9 b5 ff ff ff    	bnd jmpq 2b0 <.*>
 [ 	]*[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%rax,%rax,1\)
 
 Disassembly of section .plt.bnd:
@@ -27,11 +27,11 @@ Disassembly of section .plt.bnd:
 [ 	]*[a-f0-9]+:	90                   	nop
 
 0+308 <func1@plt>:
-[ 	]*[a-f0-9]+:	f2 ff 25 39 01 20 00 	bnd jmpq \*0x200139\(%rip\)        # 200448 <_GLOBAL_OFFSET_TABLE_\+0x20>
+[ 	]*[a-f0-9]+:	f2 ff 25 39 01 20 00 	bnd jmpq \*0x200139\(%rip\)        # 200448 <func1>
 [ 	]*[a-f0-9]+:	90                   	nop
 
 0+310 <func2@plt>:
-[ 	]*[a-f0-9]+:	f2 ff 25 39 01 20 00 	bnd jmpq \*0x200139\(%rip\)        # 200450 <_GLOBAL_OFFSET_TABLE_\+0x28>
+[ 	]*[a-f0-9]+:	f2 ff 25 39 01 20 00 	bnd jmpq \*0x200139\(%rip\)        # 200450 <func2>
 [ 	]*[a-f0-9]+:	90                   	nop
 
 0+318 <\*ABS\*\+0x320@plt>:
diff --git a/ld/testsuite/ld-x86-64/bnd-plt-1.d b/ld/testsuite/ld-x86-64/bnd-plt-1.d
index 1c1f2d3..6bd50b2 100644
--- a/ld/testsuite/ld-x86-64/bnd-plt-1.d
+++ b/ld/testsuite/ld-x86-64/bnd-plt-1.d
@@ -13,34 +13,34 @@ Disassembly of section .plt:
 [ 	]*[a-f0-9]+:	f2 ff 25 83 01 20 00 	bnd jmpq \*0x200183\(%rip\)        # 200420 <_GLOBAL_OFFSET_TABLE_\+0x10>
 [ 	]*[a-f0-9]+:	0f 1f 00             	nopl   \(%rax\)
 [ 	]*[a-f0-9]+:	68 00 00 00 00       	pushq  \$0x0
-[ 	]*[a-f0-9]+:	f2 e9 e5 ff ff ff    	bnd jmpq 290 <foo2@plt-0x50>
+[ 	]*[a-f0-9]+:	f2 e9 e5 ff ff ff    	bnd jmpq 290 <.*>
 [ 	]*[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	68 01 00 00 00       	pushq  \$0x1
-[ 	]*[a-f0-9]+:	f2 e9 d5 ff ff ff    	bnd jmpq 290 <foo2@plt-0x50>
+[ 	]*[a-f0-9]+:	f2 e9 d5 ff ff ff    	bnd jmpq 290 <.*>
 [ 	]*[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	68 02 00 00 00       	pushq  \$0x2
-[ 	]*[a-f0-9]+:	f2 e9 c5 ff ff ff    	bnd jmpq 290 <foo2@plt-0x50>
+[ 	]*[a-f0-9]+:	f2 e9 c5 ff ff ff    	bnd jmpq 290 <.*>
 [ 	]*[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	68 03 00 00 00       	pushq  \$0x3
-[ 	]*[a-f0-9]+:	f2 e9 b5 ff ff ff    	bnd jmpq 290 <foo2@plt-0x50>
+[ 	]*[a-f0-9]+:	f2 e9 b5 ff ff ff    	bnd jmpq 290 <.*>
 [ 	]*[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%rax,%rax,1\)
 
 Disassembly of section .plt.bnd:
 
 0+2e0 <foo2@plt>:
-[ 	]*[a-f0-9]+:	f2 ff 25 41 01 20 00 	bnd jmpq \*0x200141\(%rip\)        # 200428 <_GLOBAL_OFFSET_TABLE_\+0x18>
+[ 	]*[a-f0-9]+:	f2 ff 25 41 01 20 00 	bnd jmpq \*0x200141\(%rip\)        # 200428 <foo2>
 [ 	]*[a-f0-9]+:	90                   	nop
 
 0+2e8 <foo3@plt>:
-[ 	]*[a-f0-9]+:	f2 ff 25 41 01 20 00 	bnd jmpq \*0x200141\(%rip\)        # 200430 <_GLOBAL_OFFSET_TABLE_\+0x20>
+[ 	]*[a-f0-9]+:	f2 ff 25 41 01 20 00 	bnd jmpq \*0x200141\(%rip\)        # 200430 <foo3>
 [ 	]*[a-f0-9]+:	90                   	nop
 
 0+2f0 <foo1@plt>:
-[ 	]*[a-f0-9]+:	f2 ff 25 41 01 20 00 	bnd jmpq \*0x200141\(%rip\)        # 200438 <_GLOBAL_OFFSET_TABLE_\+0x28>
+[ 	]*[a-f0-9]+:	f2 ff 25 41 01 20 00 	bnd jmpq \*0x200141\(%rip\)        # 200438 <foo1>
 [ 	]*[a-f0-9]+:	90                   	nop
 
 0+2f8 <foo4@plt>:
-[ 	]*[a-f0-9]+:	f2 ff 25 41 01 20 00 	bnd jmpq \*0x200141\(%rip\)        # 200440 <_GLOBAL_OFFSET_TABLE_\+0x30>
+[ 	]*[a-f0-9]+:	f2 ff 25 41 01 20 00 	bnd jmpq \*0x200141\(%rip\)        # 200440 <foo4>
 [ 	]*[a-f0-9]+:	90                   	nop
 
 Disassembly of section .text:
diff --git a/ld/testsuite/ld-x86-64/gotpcrel1.dd b/ld/testsuite/ld-x86-64/gotpcrel1.dd
index 46321db..58450bd 100644
--- a/ld/testsuite/ld-x86-64/gotpcrel1.dd
+++ b/ld/testsuite/ld-x86-64/gotpcrel1.dd
@@ -2,13 +2,13 @@
 [a-f0-9]+ <main>:
 [ 	]*[a-f0-9]+:	48 83 ec 08          	sub    \$0x8,%rsp
 [ 	]*[a-f0-9]+:	[ a-f0-9]+    	addr32 callq [a-f0-9]+ <foo>
-[ 	]*[a-f0-9]+:	[ a-f0-9]+    	callq  \*0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	[ a-f0-9]+    	callq  \*0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	[ a-f0-9]+    	callq  \*0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	[ a-f0-9]+    	callq  \*0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
 [ 	]*[a-f0-9]+:	[ a-f0-9]+	(rex mov|mov   ) \$0x[a-f0-9]+,%(r|e)ax
 [ 	]*[a-f0-9]+:	ff d0                	callq  \*%rax
-[ 	]*[a-f0-9]+:	[ a-f0-9]+	mov    0x[a-f0-9]+\(%rip\),%rcx        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	[ a-f0-9]+	mov    0x[a-f0-9]+\(%rip\),%rcx        # [a-f0-9]+ <.*>
 [ 	]*[a-f0-9]+:	ff d1                	callq  \*%rcx
-[ 	]*[a-f0-9]+:	[ a-f0-9]+	mov    0x[a-f0-9]+\(%rip\),%rdx        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	[ a-f0-9]+	mov    0x[a-f0-9]+\(%rip\),%rdx        # [a-f0-9]+ <.*>
 [ 	]*[a-f0-9]+:	ff d2                	callq  \*%rdx
 [ 	]*[a-f0-9]+:	31 ff                	xor    %edi,%edi
 [ 	]*[a-f0-9]+:	48 83 c4 08          	add    \$0x8,%rsp
diff --git a/ld/testsuite/ld-x86-64/libno-plt-1b.dd b/ld/testsuite/ld-x86-64/libno-plt-1b.dd
index 2892ce4..93d8a7b 100644
--- a/ld/testsuite/ld-x86-64/libno-plt-1b.dd
+++ b/ld/testsuite/ld-x86-64/libno-plt-1b.dd
@@ -7,9 +7,9 @@ Disassembly of section .text:
 
 #...
 [0-9a-f]+ <get_func>:
- +[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
  +[a-f0-9]+:	c3                   	retq   
 #...
 [0-9a-f]+ <call_func>:
- +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/load1c-nacl.d b/ld/testsuite/ld-x86-64/load1c-nacl.d
index be90480..57bc2c2 100644
--- a/ld/testsuite/ld-x86-64/load1c-nacl.d
+++ b/ld/testsuite/ld-x86-64/load1c-nacl.d
@@ -9,40 +9,40 @@
 Disassembly of section .text:
 
 0+ <_start>:
-[ 	]*[a-f0-9]+:	13 05 0a 03 01 10    	adc    0x1001030a\(%rip\),%eax        # 10010310 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	03 1d 04 03 01 10    	add    0x10010304\(%rip\),%ebx        # 10010310 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	23 0d fe 02 01 10    	and    0x100102fe\(%rip\),%ecx        # 10010310 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	3b 15 f8 02 01 10    	cmp    0x100102f8\(%rip\),%edx        # 10010310 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	0b 35 f2 02 01 10    	or     0x100102f2\(%rip\),%esi        # 10010310 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	1b 3d ec 02 01 10    	sbb    0x100102ec\(%rip\),%edi        # 10010310 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	2b 2d e6 02 01 10    	sub    0x100102e6\(%rip\),%ebp        # 10010310 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	44 33 05 df 02 01 10 	xor    0x100102df\(%rip\),%r8d        # 10010310 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	44 85 3d d8 02 01 10 	test   %r15d,0x100102d8\(%rip\)        # 10010310 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	48 13 05 d1 02 01 10 	adc    0x100102d1\(%rip\),%rax        # 10010310 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	48 03 1d ca 02 01 10 	add    0x100102ca\(%rip\),%rbx        # 10010310 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	48 23 0d c3 02 01 10 	and    0x100102c3\(%rip\),%rcx        # 10010310 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	48 3b 15 bc 02 01 10 	cmp    0x100102bc\(%rip\),%rdx        # 10010310 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	48 0b 3d b5 02 01 10 	or     0x100102b5\(%rip\),%rdi        # 10010310 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	48 1b 35 ae 02 01 10 	sbb    0x100102ae\(%rip\),%rsi        # 10010310 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	48 2b 2d a7 02 01 10 	sub    0x100102a7\(%rip\),%rbp        # 10010310 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	4c 33 05 a0 02 01 10 	xor    0x100102a0\(%rip\),%r8        # 10010310 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	4c 85 3d 99 02 01 10 	test   %r15,0x10010299\(%rip\)        # 10010310 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	13 05 9b 02 01 10    	adc    0x1001029b\(%rip\),%eax        # 10010318 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	03 1d 95 02 01 10    	add    0x10010295\(%rip\),%ebx        # 10010318 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	23 0d 8f 02 01 10    	and    0x1001028f\(%rip\),%ecx        # 10010318 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	3b 15 89 02 01 10    	cmp    0x10010289\(%rip\),%edx        # 10010318 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	0b 35 83 02 01 10    	or     0x10010283\(%rip\),%esi        # 10010318 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	1b 3d 7d 02 01 10    	sbb    0x1001027d\(%rip\),%edi        # 10010318 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	2b 2d 77 02 01 10    	sub    0x10010277\(%rip\),%ebp        # 10010318 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	44 33 05 70 02 01 10 	xor    0x10010270\(%rip\),%r8d        # 10010318 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	44 85 3d 69 02 01 10 	test   %r15d,0x10010269\(%rip\)        # 10010318 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	48 13 05 62 02 01 10 	adc    0x10010262\(%rip\),%rax        # 10010318 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	48 03 1d 5b 02 01 10 	add    0x1001025b\(%rip\),%rbx        # 10010318 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	48 23 0d 54 02 01 10 	and    0x10010254\(%rip\),%rcx        # 10010318 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	48 3b 15 4d 02 01 10 	cmp    0x1001024d\(%rip\),%rdx        # 10010318 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	48 0b 3d 46 02 01 10 	or     0x10010246\(%rip\),%rdi        # 10010318 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	48 1b 35 3f 02 01 10 	sbb    0x1001023f\(%rip\),%rsi        # 10010318 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	48 2b 2d 38 02 01 10 	sub    0x10010238\(%rip\),%rbp        # 10010318 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	4c 33 05 31 02 01 10 	xor    0x10010231\(%rip\),%r8        # 10010318 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	4c 85 3d 2a 02 01 10 	test   %r15,0x1001022a\(%rip\)        # 10010318 <_DYNAMIC\+0xe8>
+[ 	]*[a-f0-9]+:	13 05 0a 03 01 10    	adc    0x1001030a\(%rip\),%eax        # 10010310 <.*>
+[ 	]*[a-f0-9]+:	03 1d 04 03 01 10    	add    0x10010304\(%rip\),%ebx        # 10010310 <.*>
+[ 	]*[a-f0-9]+:	23 0d fe 02 01 10    	and    0x100102fe\(%rip\),%ecx        # 10010310 <.*>
+[ 	]*[a-f0-9]+:	3b 15 f8 02 01 10    	cmp    0x100102f8\(%rip\),%edx        # 10010310 <.*>
+[ 	]*[a-f0-9]+:	0b 35 f2 02 01 10    	or     0x100102f2\(%rip\),%esi        # 10010310 <.*>
+[ 	]*[a-f0-9]+:	1b 3d ec 02 01 10    	sbb    0x100102ec\(%rip\),%edi        # 10010310 <.*>
+[ 	]*[a-f0-9]+:	2b 2d e6 02 01 10    	sub    0x100102e6\(%rip\),%ebp        # 10010310 <.*>
+[ 	]*[a-f0-9]+:	44 33 05 df 02 01 10 	xor    0x100102df\(%rip\),%r8d        # 10010310 <.*>
+[ 	]*[a-f0-9]+:	44 85 3d d8 02 01 10 	test   %r15d,0x100102d8\(%rip\)        # 10010310 <.*>
+[ 	]*[a-f0-9]+:	48 13 05 d1 02 01 10 	adc    0x100102d1\(%rip\),%rax        # 10010310 <.*>
+[ 	]*[a-f0-9]+:	48 03 1d ca 02 01 10 	add    0x100102ca\(%rip\),%rbx        # 10010310 <.*>
+[ 	]*[a-f0-9]+:	48 23 0d c3 02 01 10 	and    0x100102c3\(%rip\),%rcx        # 10010310 <.*>
+[ 	]*[a-f0-9]+:	48 3b 15 bc 02 01 10 	cmp    0x100102bc\(%rip\),%rdx        # 10010310 <.*>
+[ 	]*[a-f0-9]+:	48 0b 3d b5 02 01 10 	or     0x100102b5\(%rip\),%rdi        # 10010310 <.*>
+[ 	]*[a-f0-9]+:	48 1b 35 ae 02 01 10 	sbb    0x100102ae\(%rip\),%rsi        # 10010310 <.*>
+[ 	]*[a-f0-9]+:	48 2b 2d a7 02 01 10 	sub    0x100102a7\(%rip\),%rbp        # 10010310 <.*>
+[ 	]*[a-f0-9]+:	4c 33 05 a0 02 01 10 	xor    0x100102a0\(%rip\),%r8        # 10010310 <.*>
+[ 	]*[a-f0-9]+:	4c 85 3d 99 02 01 10 	test   %r15,0x10010299\(%rip\)        # 10010310 <.*>
+[ 	]*[a-f0-9]+:	13 05 9b 02 01 10    	adc    0x1001029b\(%rip\),%eax        # 10010318 <.*>
+[ 	]*[a-f0-9]+:	03 1d 95 02 01 10    	add    0x10010295\(%rip\),%ebx        # 10010318 <.*>
+[ 	]*[a-f0-9]+:	23 0d 8f 02 01 10    	and    0x1001028f\(%rip\),%ecx        # 10010318 <.*>
+[ 	]*[a-f0-9]+:	3b 15 89 02 01 10    	cmp    0x10010289\(%rip\),%edx        # 10010318 <.*>
+[ 	]*[a-f0-9]+:	0b 35 83 02 01 10    	or     0x10010283\(%rip\),%esi        # 10010318 <.*>
+[ 	]*[a-f0-9]+:	1b 3d 7d 02 01 10    	sbb    0x1001027d\(%rip\),%edi        # 10010318 <.*>
+[ 	]*[a-f0-9]+:	2b 2d 77 02 01 10    	sub    0x10010277\(%rip\),%ebp        # 10010318 <.*>
+[ 	]*[a-f0-9]+:	44 33 05 70 02 01 10 	xor    0x10010270\(%rip\),%r8d        # 10010318 <.*>
+[ 	]*[a-f0-9]+:	44 85 3d 69 02 01 10 	test   %r15d,0x10010269\(%rip\)        # 10010318 <.*>
+[ 	]*[a-f0-9]+:	48 13 05 62 02 01 10 	adc    0x10010262\(%rip\),%rax        # 10010318 <.*>
+[ 	]*[a-f0-9]+:	48 03 1d 5b 02 01 10 	add    0x1001025b\(%rip\),%rbx        # 10010318 <.*>
+[ 	]*[a-f0-9]+:	48 23 0d 54 02 01 10 	and    0x10010254\(%rip\),%rcx        # 10010318 <.*>
+[ 	]*[a-f0-9]+:	48 3b 15 4d 02 01 10 	cmp    0x1001024d\(%rip\),%rdx        # 10010318 <.*>
+[ 	]*[a-f0-9]+:	48 0b 3d 46 02 01 10 	or     0x10010246\(%rip\),%rdi        # 10010318 <.*>
+[ 	]*[a-f0-9]+:	48 1b 35 3f 02 01 10 	sbb    0x1001023f\(%rip\),%rsi        # 10010318 <.*>
+[ 	]*[a-f0-9]+:	48 2b 2d 38 02 01 10 	sub    0x10010238\(%rip\),%rbp        # 10010318 <.*>
+[ 	]*[a-f0-9]+:	4c 33 05 31 02 01 10 	xor    0x10010231\(%rip\),%r8        # 10010318 <.*>
+[ 	]*[a-f0-9]+:	4c 85 3d 2a 02 01 10 	test   %r15,0x1001022a\(%rip\)        # 10010318 <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/load1c.d b/ld/testsuite/ld-x86-64/load1c.d
index d4bf277..a4f7d8a 100644
--- a/ld/testsuite/ld-x86-64/load1c.d
+++ b/ld/testsuite/ld-x86-64/load1c.d
@@ -9,40 +9,40 @@
 Disassembly of section .text:
 
 [a-f0-9]+ <_start>:
-[ 	]*[a-f0-9]+:	13 05 ca 01 20 00    	adc    0x2001ca\(%rip\),%eax        # 2003c8 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	03 1d c4 01 20 00    	add    0x2001c4\(%rip\),%ebx        # 2003c8 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	23 0d be 01 20 00    	and    0x2001be\(%rip\),%ecx        # 2003c8 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	3b 15 b8 01 20 00    	cmp    0x2001b8\(%rip\),%edx        # 2003c8 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	0b 35 b2 01 20 00    	or     0x2001b2\(%rip\),%esi        # 2003c8 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	1b 3d ac 01 20 00    	sbb    0x2001ac\(%rip\),%edi        # 2003c8 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	2b 2d a6 01 20 00    	sub    0x2001a6\(%rip\),%ebp        # 2003c8 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	44 33 05 9f 01 20 00 	xor    0x20019f\(%rip\),%r8d        # 2003c8 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	44 85 3d 98 01 20 00 	test   %r15d,0x200198\(%rip\)        # 2003c8 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	48 13 05 91 01 20 00 	adc    0x200191\(%rip\),%rax        # 2003c8 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	48 03 1d 8a 01 20 00 	add    0x20018a\(%rip\),%rbx        # 2003c8 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	48 23 0d 83 01 20 00 	and    0x200183\(%rip\),%rcx        # 2003c8 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	48 3b 15 7c 01 20 00 	cmp    0x20017c\(%rip\),%rdx        # 2003c8 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	48 0b 3d 75 01 20 00 	or     0x200175\(%rip\),%rdi        # 2003c8 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	48 1b 35 6e 01 20 00 	sbb    0x20016e\(%rip\),%rsi        # 2003c8 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	48 2b 2d 67 01 20 00 	sub    0x200167\(%rip\),%rbp        # 2003c8 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	4c 33 05 60 01 20 00 	xor    0x200160\(%rip\),%r8        # 2003c8 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	4c 85 3d 59 01 20 00 	test   %r15,0x200159\(%rip\)        # 2003c8 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	13 05 5b 01 20 00    	adc    0x20015b\(%rip\),%eax        # 2003d0 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	03 1d 55 01 20 00    	add    0x200155\(%rip\),%ebx        # 2003d0 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	23 0d 4f 01 20 00    	and    0x20014f\(%rip\),%ecx        # 2003d0 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	3b 15 49 01 20 00    	cmp    0x200149\(%rip\),%edx        # 2003d0 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	0b 35 43 01 20 00    	or     0x200143\(%rip\),%esi        # 2003d0 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	1b 3d 3d 01 20 00    	sbb    0x20013d\(%rip\),%edi        # 2003d0 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	2b 2d 37 01 20 00    	sub    0x200137\(%rip\),%ebp        # 2003d0 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	44 33 05 30 01 20 00 	xor    0x200130\(%rip\),%r8d        # 2003d0 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	44 85 3d 29 01 20 00 	test   %r15d,0x200129\(%rip\)        # 2003d0 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	48 13 05 22 01 20 00 	adc    0x200122\(%rip\),%rax        # 2003d0 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	48 03 1d 1b 01 20 00 	add    0x20011b\(%rip\),%rbx        # 2003d0 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	48 23 0d 14 01 20 00 	and    0x200114\(%rip\),%rcx        # 2003d0 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	48 3b 15 0d 01 20 00 	cmp    0x20010d\(%rip\),%rdx        # 2003d0 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	48 0b 3d 06 01 20 00 	or     0x200106\(%rip\),%rdi        # 2003d0 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	48 1b 35 ff 00 20 00 	sbb    0x2000ff\(%rip\),%rsi        # 2003d0 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	48 2b 2d f8 00 20 00 	sub    0x2000f8\(%rip\),%rbp        # 2003d0 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	4c 33 05 f1 00 20 00 	xor    0x2000f1\(%rip\),%r8        # 2003d0 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	4c 85 3d ea 00 20 00 	test   %r15,0x2000ea\(%rip\)        # 2003d0 <_DYNAMIC\+0xe8>
+[ 	]*[a-f0-9]+:	13 05 ca 01 20 00    	adc    0x2001ca\(%rip\),%eax        # 2003c8 <.*>
+[ 	]*[a-f0-9]+:	03 1d c4 01 20 00    	add    0x2001c4\(%rip\),%ebx        # 2003c8 <.*>
+[ 	]*[a-f0-9]+:	23 0d be 01 20 00    	and    0x2001be\(%rip\),%ecx        # 2003c8 <.*>
+[ 	]*[a-f0-9]+:	3b 15 b8 01 20 00    	cmp    0x2001b8\(%rip\),%edx        # 2003c8 <.*>
+[ 	]*[a-f0-9]+:	0b 35 b2 01 20 00    	or     0x2001b2\(%rip\),%esi        # 2003c8 <.*>
+[ 	]*[a-f0-9]+:	1b 3d ac 01 20 00    	sbb    0x2001ac\(%rip\),%edi        # 2003c8 <.*>
+[ 	]*[a-f0-9]+:	2b 2d a6 01 20 00    	sub    0x2001a6\(%rip\),%ebp        # 2003c8 <.*>
+[ 	]*[a-f0-9]+:	44 33 05 9f 01 20 00 	xor    0x20019f\(%rip\),%r8d        # 2003c8 <.*>
+[ 	]*[a-f0-9]+:	44 85 3d 98 01 20 00 	test   %r15d,0x200198\(%rip\)        # 2003c8 <.*>
+[ 	]*[a-f0-9]+:	48 13 05 91 01 20 00 	adc    0x200191\(%rip\),%rax        # 2003c8 <.*>
+[ 	]*[a-f0-9]+:	48 03 1d 8a 01 20 00 	add    0x20018a\(%rip\),%rbx        # 2003c8 <.*>
+[ 	]*[a-f0-9]+:	48 23 0d 83 01 20 00 	and    0x200183\(%rip\),%rcx        # 2003c8 <.*>
+[ 	]*[a-f0-9]+:	48 3b 15 7c 01 20 00 	cmp    0x20017c\(%rip\),%rdx        # 2003c8 <.*>
+[ 	]*[a-f0-9]+:	48 0b 3d 75 01 20 00 	or     0x200175\(%rip\),%rdi        # 2003c8 <.*>
+[ 	]*[a-f0-9]+:	48 1b 35 6e 01 20 00 	sbb    0x20016e\(%rip\),%rsi        # 2003c8 <.*>
+[ 	]*[a-f0-9]+:	48 2b 2d 67 01 20 00 	sub    0x200167\(%rip\),%rbp        # 2003c8 <.*>
+[ 	]*[a-f0-9]+:	4c 33 05 60 01 20 00 	xor    0x200160\(%rip\),%r8        # 2003c8 <.*>
+[ 	]*[a-f0-9]+:	4c 85 3d 59 01 20 00 	test   %r15,0x200159\(%rip\)        # 2003c8 <.*>
+[ 	]*[a-f0-9]+:	13 05 5b 01 20 00    	adc    0x20015b\(%rip\),%eax        # 2003d0 <.*>
+[ 	]*[a-f0-9]+:	03 1d 55 01 20 00    	add    0x200155\(%rip\),%ebx        # 2003d0 <.*>
+[ 	]*[a-f0-9]+:	23 0d 4f 01 20 00    	and    0x20014f\(%rip\),%ecx        # 2003d0 <.*>
+[ 	]*[a-f0-9]+:	3b 15 49 01 20 00    	cmp    0x200149\(%rip\),%edx        # 2003d0 <.*>
+[ 	]*[a-f0-9]+:	0b 35 43 01 20 00    	or     0x200143\(%rip\),%esi        # 2003d0 <.*>
+[ 	]*[a-f0-9]+:	1b 3d 3d 01 20 00    	sbb    0x20013d\(%rip\),%edi        # 2003d0 <.*>
+[ 	]*[a-f0-9]+:	2b 2d 37 01 20 00    	sub    0x200137\(%rip\),%ebp        # 2003d0 <.*>
+[ 	]*[a-f0-9]+:	44 33 05 30 01 20 00 	xor    0x200130\(%rip\),%r8d        # 2003d0 <.*>
+[ 	]*[a-f0-9]+:	44 85 3d 29 01 20 00 	test   %r15d,0x200129\(%rip\)        # 2003d0 <.*>
+[ 	]*[a-f0-9]+:	48 13 05 22 01 20 00 	adc    0x200122\(%rip\),%rax        # 2003d0 <.*>
+[ 	]*[a-f0-9]+:	48 03 1d 1b 01 20 00 	add    0x20011b\(%rip\),%rbx        # 2003d0 <.*>
+[ 	]*[a-f0-9]+:	48 23 0d 14 01 20 00 	and    0x200114\(%rip\),%rcx        # 2003d0 <.*>
+[ 	]*[a-f0-9]+:	48 3b 15 0d 01 20 00 	cmp    0x20010d\(%rip\),%rdx        # 2003d0 <.*>
+[ 	]*[a-f0-9]+:	48 0b 3d 06 01 20 00 	or     0x200106\(%rip\),%rdi        # 2003d0 <.*>
+[ 	]*[a-f0-9]+:	48 1b 35 ff 00 20 00 	sbb    0x2000ff\(%rip\),%rsi        # 2003d0 <.*>
+[ 	]*[a-f0-9]+:	48 2b 2d f8 00 20 00 	sub    0x2000f8\(%rip\),%rbp        # 2003d0 <.*>
+[ 	]*[a-f0-9]+:	4c 33 05 f1 00 20 00 	xor    0x2000f1\(%rip\),%r8        # 2003d0 <.*>
+[ 	]*[a-f0-9]+:	4c 85 3d ea 00 20 00 	test   %r15,0x2000ea\(%rip\)        # 2003d0 <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/load1d-nacl.d b/ld/testsuite/ld-x86-64/load1d-nacl.d
index 3e9b144..b741917 100644
--- a/ld/testsuite/ld-x86-64/load1d-nacl.d
+++ b/ld/testsuite/ld-x86-64/load1d-nacl.d
@@ -9,40 +9,40 @@
 Disassembly of section .text:
 
 0+ <_start>:
-[ 	]*[a-f0-9]+:	13 05 e2 01 01 10    	adc    0x100101e2\(%rip\),%eax        # 100101e8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	03 1d dc 01 01 10    	add    0x100101dc\(%rip\),%ebx        # 100101e8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	23 0d d6 01 01 10    	and    0x100101d6\(%rip\),%ecx        # 100101e8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	3b 15 d0 01 01 10    	cmp    0x100101d0\(%rip\),%edx        # 100101e8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	0b 35 ca 01 01 10    	or     0x100101ca\(%rip\),%esi        # 100101e8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	1b 3d c4 01 01 10    	sbb    0x100101c4\(%rip\),%edi        # 100101e8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	2b 2d be 01 01 10    	sub    0x100101be\(%rip\),%ebp        # 100101e8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	44 33 05 b7 01 01 10 	xor    0x100101b7\(%rip\),%r8d        # 100101e8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	44 85 3d b0 01 01 10 	test   %r15d,0x100101b0\(%rip\)        # 100101e8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	48 13 05 a9 01 01 10 	adc    0x100101a9\(%rip\),%rax        # 100101e8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	48 03 1d a2 01 01 10 	add    0x100101a2\(%rip\),%rbx        # 100101e8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	48 23 0d 9b 01 01 10 	and    0x1001019b\(%rip\),%rcx        # 100101e8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	48 3b 15 94 01 01 10 	cmp    0x10010194\(%rip\),%rdx        # 100101e8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	48 0b 3d 8d 01 01 10 	or     0x1001018d\(%rip\),%rdi        # 100101e8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	48 1b 35 86 01 01 10 	sbb    0x10010186\(%rip\),%rsi        # 100101e8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	48 2b 2d 7f 01 01 10 	sub    0x1001017f\(%rip\),%rbp        # 100101e8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	4c 33 05 78 01 01 10 	xor    0x10010178\(%rip\),%r8        # 100101e8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	4c 85 3d 71 01 01 10 	test   %r15,0x10010171\(%rip\)        # 100101e8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	13 05 73 01 01 10    	adc    0x10010173\(%rip\),%eax        # 100101f0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	03 1d 6d 01 01 10    	add    0x1001016d\(%rip\),%ebx        # 100101f0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	23 0d 67 01 01 10    	and    0x10010167\(%rip\),%ecx        # 100101f0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	3b 15 61 01 01 10    	cmp    0x10010161\(%rip\),%edx        # 100101f0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	0b 35 5b 01 01 10    	or     0x1001015b\(%rip\),%esi        # 100101f0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	1b 3d 55 01 01 10    	sbb    0x10010155\(%rip\),%edi        # 100101f0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	2b 2d 4f 01 01 10    	sub    0x1001014f\(%rip\),%ebp        # 100101f0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	44 33 05 48 01 01 10 	xor    0x10010148\(%rip\),%r8d        # 100101f0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	44 85 3d 41 01 01 10 	test   %r15d,0x10010141\(%rip\)        # 100101f0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	48 13 05 3a 01 01 10 	adc    0x1001013a\(%rip\),%rax        # 100101f0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	48 03 1d 33 01 01 10 	add    0x10010133\(%rip\),%rbx        # 100101f0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	48 23 0d 2c 01 01 10 	and    0x1001012c\(%rip\),%rcx        # 100101f0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	48 3b 15 25 01 01 10 	cmp    0x10010125\(%rip\),%rdx        # 100101f0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	48 0b 3d 1e 01 01 10 	or     0x1001011e\(%rip\),%rdi        # 100101f0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	48 1b 35 17 01 01 10 	sbb    0x10010117\(%rip\),%rsi        # 100101f0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	48 2b 2d 10 01 01 10 	sub    0x10010110\(%rip\),%rbp        # 100101f0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	4c 33 05 09 01 01 10 	xor    0x10010109\(%rip\),%r8        # 100101f0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	4c 85 3d 02 01 01 10 	test   %r15,0x10010102\(%rip\)        # 100101f0 <_DYNAMIC\+0x78>
+[ 	]*[a-f0-9]+:	13 05 e2 01 01 10    	adc    0x100101e2\(%rip\),%eax        # 100101e8 <.*>
+[ 	]*[a-f0-9]+:	03 1d dc 01 01 10    	add    0x100101dc\(%rip\),%ebx        # 100101e8 <.*>
+[ 	]*[a-f0-9]+:	23 0d d6 01 01 10    	and    0x100101d6\(%rip\),%ecx        # 100101e8 <.*>
+[ 	]*[a-f0-9]+:	3b 15 d0 01 01 10    	cmp    0x100101d0\(%rip\),%edx        # 100101e8 <.*>
+[ 	]*[a-f0-9]+:	0b 35 ca 01 01 10    	or     0x100101ca\(%rip\),%esi        # 100101e8 <.*>
+[ 	]*[a-f0-9]+:	1b 3d c4 01 01 10    	sbb    0x100101c4\(%rip\),%edi        # 100101e8 <.*>
+[ 	]*[a-f0-9]+:	2b 2d be 01 01 10    	sub    0x100101be\(%rip\),%ebp        # 100101e8 <.*>
+[ 	]*[a-f0-9]+:	44 33 05 b7 01 01 10 	xor    0x100101b7\(%rip\),%r8d        # 100101e8 <.*>
+[ 	]*[a-f0-9]+:	44 85 3d b0 01 01 10 	test   %r15d,0x100101b0\(%rip\)        # 100101e8 <.*>
+[ 	]*[a-f0-9]+:	48 13 05 a9 01 01 10 	adc    0x100101a9\(%rip\),%rax        # 100101e8 <.*>
+[ 	]*[a-f0-9]+:	48 03 1d a2 01 01 10 	add    0x100101a2\(%rip\),%rbx        # 100101e8 <.*>
+[ 	]*[a-f0-9]+:	48 23 0d 9b 01 01 10 	and    0x1001019b\(%rip\),%rcx        # 100101e8 <.*>
+[ 	]*[a-f0-9]+:	48 3b 15 94 01 01 10 	cmp    0x10010194\(%rip\),%rdx        # 100101e8 <.*>
+[ 	]*[a-f0-9]+:	48 0b 3d 8d 01 01 10 	or     0x1001018d\(%rip\),%rdi        # 100101e8 <.*>
+[ 	]*[a-f0-9]+:	48 1b 35 86 01 01 10 	sbb    0x10010186\(%rip\),%rsi        # 100101e8 <.*>
+[ 	]*[a-f0-9]+:	48 2b 2d 7f 01 01 10 	sub    0x1001017f\(%rip\),%rbp        # 100101e8 <.*>
+[ 	]*[a-f0-9]+:	4c 33 05 78 01 01 10 	xor    0x10010178\(%rip\),%r8        # 100101e8 <.*>
+[ 	]*[a-f0-9]+:	4c 85 3d 71 01 01 10 	test   %r15,0x10010171\(%rip\)        # 100101e8 <.*>
+[ 	]*[a-f0-9]+:	13 05 73 01 01 10    	adc    0x10010173\(%rip\),%eax        # 100101f0 <.*>
+[ 	]*[a-f0-9]+:	03 1d 6d 01 01 10    	add    0x1001016d\(%rip\),%ebx        # 100101f0 <.*>
+[ 	]*[a-f0-9]+:	23 0d 67 01 01 10    	and    0x10010167\(%rip\),%ecx        # 100101f0 <.*>
+[ 	]*[a-f0-9]+:	3b 15 61 01 01 10    	cmp    0x10010161\(%rip\),%edx        # 100101f0 <.*>
+[ 	]*[a-f0-9]+:	0b 35 5b 01 01 10    	or     0x1001015b\(%rip\),%esi        # 100101f0 <.*>
+[ 	]*[a-f0-9]+:	1b 3d 55 01 01 10    	sbb    0x10010155\(%rip\),%edi        # 100101f0 <.*>
+[ 	]*[a-f0-9]+:	2b 2d 4f 01 01 10    	sub    0x1001014f\(%rip\),%ebp        # 100101f0 <.*>
+[ 	]*[a-f0-9]+:	44 33 05 48 01 01 10 	xor    0x10010148\(%rip\),%r8d        # 100101f0 <.*>
+[ 	]*[a-f0-9]+:	44 85 3d 41 01 01 10 	test   %r15d,0x10010141\(%rip\)        # 100101f0 <.*>
+[ 	]*[a-f0-9]+:	48 13 05 3a 01 01 10 	adc    0x1001013a\(%rip\),%rax        # 100101f0 <.*>
+[ 	]*[a-f0-9]+:	48 03 1d 33 01 01 10 	add    0x10010133\(%rip\),%rbx        # 100101f0 <.*>
+[ 	]*[a-f0-9]+:	48 23 0d 2c 01 01 10 	and    0x1001012c\(%rip\),%rcx        # 100101f0 <.*>
+[ 	]*[a-f0-9]+:	48 3b 15 25 01 01 10 	cmp    0x10010125\(%rip\),%rdx        # 100101f0 <.*>
+[ 	]*[a-f0-9]+:	48 0b 3d 1e 01 01 10 	or     0x1001011e\(%rip\),%rdi        # 100101f0 <.*>
+[ 	]*[a-f0-9]+:	48 1b 35 17 01 01 10 	sbb    0x10010117\(%rip\),%rsi        # 100101f0 <.*>
+[ 	]*[a-f0-9]+:	48 2b 2d 10 01 01 10 	sub    0x10010110\(%rip\),%rbp        # 100101f0 <.*>
+[ 	]*[a-f0-9]+:	4c 33 05 09 01 01 10 	xor    0x10010109\(%rip\),%r8        # 100101f0 <.*>
+[ 	]*[a-f0-9]+:	4c 85 3d 02 01 01 10 	test   %r15,0x10010102\(%rip\)        # 100101f0 <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/load1d.d b/ld/testsuite/ld-x86-64/load1d.d
index 2987048..ee1e3f0 100644
--- a/ld/testsuite/ld-x86-64/load1d.d
+++ b/ld/testsuite/ld-x86-64/load1d.d
@@ -9,40 +9,40 @@
 Disassembly of section .text:
 
 0+[a-f0-9]+ <_start>:
-[ 	]*[a-f0-9]+:	13 05 5a 01 20 00    	adc    0x20015a\(%rip\),%eax        # 2002b8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	03 1d 54 01 20 00    	add    0x200154\(%rip\),%ebx        # 2002b8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	23 0d 4e 01 20 00    	and    0x20014e\(%rip\),%ecx        # 2002b8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	3b 15 48 01 20 00    	cmp    0x200148\(%rip\),%edx        # 2002b8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	0b 35 42 01 20 00    	or     0x200142\(%rip\),%esi        # 2002b8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	1b 3d 3c 01 20 00    	sbb    0x20013c\(%rip\),%edi        # 2002b8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	2b 2d 36 01 20 00    	sub    0x200136\(%rip\),%ebp        # 2002b8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	44 33 05 2f 01 20 00 	xor    0x20012f\(%rip\),%r8d        # 2002b8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	44 85 3d 28 01 20 00 	test   %r15d,0x200128\(%rip\)        # 2002b8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	48 13 05 21 01 20 00 	adc    0x200121\(%rip\),%rax        # 2002b8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	48 03 1d 1a 01 20 00 	add    0x20011a\(%rip\),%rbx        # 2002b8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	48 23 0d 13 01 20 00 	and    0x200113\(%rip\),%rcx        # 2002b8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	48 3b 15 0c 01 20 00 	cmp    0x20010c\(%rip\),%rdx        # 2002b8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	48 0b 3d 05 01 20 00 	or     0x200105\(%rip\),%rdi        # 2002b8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	48 1b 35 fe 00 20 00 	sbb    0x2000fe\(%rip\),%rsi        # 2002b8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	48 2b 2d f7 00 20 00 	sub    0x2000f7\(%rip\),%rbp        # 2002b8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	4c 33 05 f0 00 20 00 	xor    0x2000f0\(%rip\),%r8        # 2002b8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	4c 85 3d e9 00 20 00 	test   %r15,0x2000e9\(%rip\)        # 2002b8 <_DYNAMIC\+0x70>
-[ 	]*[a-f0-9]+:	13 05 eb 00 20 00    	adc    0x2000eb\(%rip\),%eax        # 2002c0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	03 1d e5 00 20 00    	add    0x2000e5\(%rip\),%ebx        # 2002c0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	23 0d df 00 20 00    	and    0x2000df\(%rip\),%ecx        # 2002c0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	3b 15 d9 00 20 00    	cmp    0x2000d9\(%rip\),%edx        # 2002c0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	0b 35 d3 00 20 00    	or     0x2000d3\(%rip\),%esi        # 2002c0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	1b 3d cd 00 20 00    	sbb    0x2000cd\(%rip\),%edi        # 2002c0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	2b 2d c7 00 20 00    	sub    0x2000c7\(%rip\),%ebp        # 2002c0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	44 33 05 c0 00 20 00 	xor    0x2000c0\(%rip\),%r8d        # 2002c0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	44 85 3d b9 00 20 00 	test   %r15d,0x2000b9\(%rip\)        # 2002c0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	48 13 05 b2 00 20 00 	adc    0x2000b2\(%rip\),%rax        # 2002c0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	48 03 1d ab 00 20 00 	add    0x2000ab\(%rip\),%rbx        # 2002c0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	48 23 0d a4 00 20 00 	and    0x2000a4\(%rip\),%rcx        # 2002c0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	48 3b 15 9d 00 20 00 	cmp    0x20009d\(%rip\),%rdx        # 2002c0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	48 0b 3d 96 00 20 00 	or     0x200096\(%rip\),%rdi        # 2002c0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	48 1b 35 8f 00 20 00 	sbb    0x20008f\(%rip\),%rsi        # 2002c0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	48 2b 2d 88 00 20 00 	sub    0x200088\(%rip\),%rbp        # 2002c0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	4c 33 05 81 00 20 00 	xor    0x200081\(%rip\),%r8        # 2002c0 <_DYNAMIC\+0x78>
-[ 	]*[a-f0-9]+:	4c 85 3d 7a 00 20 00 	test   %r15,0x20007a\(%rip\)        # 2002c0 <_DYNAMIC\+0x78>
+[ 	]*[a-f0-9]+:	13 05 5a 01 20 00    	adc    0x20015a\(%rip\),%eax        # 2002b8 <.*>
+[ 	]*[a-f0-9]+:	03 1d 54 01 20 00    	add    0x200154\(%rip\),%ebx        # 2002b8 <.*>
+[ 	]*[a-f0-9]+:	23 0d 4e 01 20 00    	and    0x20014e\(%rip\),%ecx        # 2002b8 <.*>
+[ 	]*[a-f0-9]+:	3b 15 48 01 20 00    	cmp    0x200148\(%rip\),%edx        # 2002b8 <.*>
+[ 	]*[a-f0-9]+:	0b 35 42 01 20 00    	or     0x200142\(%rip\),%esi        # 2002b8 <.*>
+[ 	]*[a-f0-9]+:	1b 3d 3c 01 20 00    	sbb    0x20013c\(%rip\),%edi        # 2002b8 <.*>
+[ 	]*[a-f0-9]+:	2b 2d 36 01 20 00    	sub    0x200136\(%rip\),%ebp        # 2002b8 <.*>
+[ 	]*[a-f0-9]+:	44 33 05 2f 01 20 00 	xor    0x20012f\(%rip\),%r8d        # 2002b8 <.*>
+[ 	]*[a-f0-9]+:	44 85 3d 28 01 20 00 	test   %r15d,0x200128\(%rip\)        # 2002b8 <.*>
+[ 	]*[a-f0-9]+:	48 13 05 21 01 20 00 	adc    0x200121\(%rip\),%rax        # 2002b8 <.*>
+[ 	]*[a-f0-9]+:	48 03 1d 1a 01 20 00 	add    0x20011a\(%rip\),%rbx        # 2002b8 <.*>
+[ 	]*[a-f0-9]+:	48 23 0d 13 01 20 00 	and    0x200113\(%rip\),%rcx        # 2002b8 <.*>
+[ 	]*[a-f0-9]+:	48 3b 15 0c 01 20 00 	cmp    0x20010c\(%rip\),%rdx        # 2002b8 <.*>
+[ 	]*[a-f0-9]+:	48 0b 3d 05 01 20 00 	or     0x200105\(%rip\),%rdi        # 2002b8 <.*>
+[ 	]*[a-f0-9]+:	48 1b 35 fe 00 20 00 	sbb    0x2000fe\(%rip\),%rsi        # 2002b8 <.*>
+[ 	]*[a-f0-9]+:	48 2b 2d f7 00 20 00 	sub    0x2000f7\(%rip\),%rbp        # 2002b8 <.*>
+[ 	]*[a-f0-9]+:	4c 33 05 f0 00 20 00 	xor    0x2000f0\(%rip\),%r8        # 2002b8 <.*>
+[ 	]*[a-f0-9]+:	4c 85 3d e9 00 20 00 	test   %r15,0x2000e9\(%rip\)        # 2002b8 <.*>
+[ 	]*[a-f0-9]+:	13 05 eb 00 20 00    	adc    0x2000eb\(%rip\),%eax        # 2002c0 <.*>
+[ 	]*[a-f0-9]+:	03 1d e5 00 20 00    	add    0x2000e5\(%rip\),%ebx        # 2002c0 <.*>
+[ 	]*[a-f0-9]+:	23 0d df 00 20 00    	and    0x2000df\(%rip\),%ecx        # 2002c0 <.*>
+[ 	]*[a-f0-9]+:	3b 15 d9 00 20 00    	cmp    0x2000d9\(%rip\),%edx        # 2002c0 <.*>
+[ 	]*[a-f0-9]+:	0b 35 d3 00 20 00    	or     0x2000d3\(%rip\),%esi        # 2002c0 <.*>
+[ 	]*[a-f0-9]+:	1b 3d cd 00 20 00    	sbb    0x2000cd\(%rip\),%edi        # 2002c0 <.*>
+[ 	]*[a-f0-9]+:	2b 2d c7 00 20 00    	sub    0x2000c7\(%rip\),%ebp        # 2002c0 <.*>
+[ 	]*[a-f0-9]+:	44 33 05 c0 00 20 00 	xor    0x2000c0\(%rip\),%r8d        # 2002c0 <.*>
+[ 	]*[a-f0-9]+:	44 85 3d b9 00 20 00 	test   %r15d,0x2000b9\(%rip\)        # 2002c0 <.*>
+[ 	]*[a-f0-9]+:	48 13 05 b2 00 20 00 	adc    0x2000b2\(%rip\),%rax        # 2002c0 <.*>
+[ 	]*[a-f0-9]+:	48 03 1d ab 00 20 00 	add    0x2000ab\(%rip\),%rbx        # 2002c0 <.*>
+[ 	]*[a-f0-9]+:	48 23 0d a4 00 20 00 	and    0x2000a4\(%rip\),%rcx        # 2002c0 <.*>
+[ 	]*[a-f0-9]+:	48 3b 15 9d 00 20 00 	cmp    0x20009d\(%rip\),%rdx        # 2002c0 <.*>
+[ 	]*[a-f0-9]+:	48 0b 3d 96 00 20 00 	or     0x200096\(%rip\),%rdi        # 2002c0 <.*>
+[ 	]*[a-f0-9]+:	48 1b 35 8f 00 20 00 	sbb    0x20008f\(%rip\),%rsi        # 2002c0 <.*>
+[ 	]*[a-f0-9]+:	48 2b 2d 88 00 20 00 	sub    0x200088\(%rip\),%rbp        # 2002c0 <.*>
+[ 	]*[a-f0-9]+:	4c 33 05 81 00 20 00 	xor    0x200081\(%rip\),%r8        # 2002c0 <.*>
+[ 	]*[a-f0-9]+:	4c 85 3d 7a 00 20 00 	test   %r15,0x20007a\(%rip\)        # 2002c0 <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/mov1a.d b/ld/testsuite/ld-x86-64/mov1a.d
index 4ac6d7e..4c26d6f 100644
--- a/ld/testsuite/ld-x86-64/mov1a.d
+++ b/ld/testsuite/ld-x86-64/mov1a.d
@@ -9,7 +9,7 @@
 Disassembly of section .text:
 
 #...
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/mov1b.d b/ld/testsuite/ld-x86-64/mov1b.d
index 7421853..51a9190 100644
--- a/ld/testsuite/ld-x86-64/mov1b.d
+++ b/ld/testsuite/ld-x86-64/mov1b.d
@@ -9,7 +9,7 @@
 Disassembly of section .text:
 
 #...
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
 [ 	]*[a-f0-9]+:	48 c7 c0 00 00 00 00 *	mov    \$0x0,%rax
 [ 	]*[a-f0-9]+:	48 c7 c0 00 00 00 00 *	mov    \$0x0,%rax
 #pass
diff --git a/ld/testsuite/ld-x86-64/mov1c.d b/ld/testsuite/ld-x86-64/mov1c.d
index bb7bab1..be3337a 100644
--- a/ld/testsuite/ld-x86-64/mov1c.d
+++ b/ld/testsuite/ld-x86-64/mov1c.d
@@ -9,7 +9,7 @@
 Disassembly of section .text:
 
 #...
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/mov1d.d b/ld/testsuite/ld-x86-64/mov1d.d
index 7cdab0c..720b150 100644
--- a/ld/testsuite/ld-x86-64/mov1d.d
+++ b/ld/testsuite/ld-x86-64/mov1d.d
@@ -9,7 +9,7 @@
 Disassembly of section .text:
 
 #...
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
 [ 	]*[a-f0-9]+:	40 c7 c0 00 00 00 00 *	rex mov \$0x0,%eax
 [ 	]*[a-f0-9]+:	40 c7 c0 00 00 00 00 *	rex mov \$0x0,%eax
 #pass
diff --git a/ld/testsuite/ld-x86-64/mov2a.d b/ld/testsuite/ld-x86-64/mov2a.d
index aaf5707..09f8790 100644
--- a/ld/testsuite/ld-x86-64/mov2a.d
+++ b/ld/testsuite/ld-x86-64/mov2a.d
@@ -9,7 +9,7 @@
 Disassembly of section .text:
 
 #...
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/mov2b.d b/ld/testsuite/ld-x86-64/mov2b.d
index ee1b308..41d4b95 100644
--- a/ld/testsuite/ld-x86-64/mov2b.d
+++ b/ld/testsuite/ld-x86-64/mov2b.d
@@ -9,7 +9,7 @@
 Disassembly of section .text:
 
 #...
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/mov2c.d b/ld/testsuite/ld-x86-64/mov2c.d
index 8991121..766584c 100644
--- a/ld/testsuite/ld-x86-64/mov2c.d
+++ b/ld/testsuite/ld-x86-64/mov2c.d
@@ -9,7 +9,7 @@
 Disassembly of section .text:
 
 #...
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/mov2d.d b/ld/testsuite/ld-x86-64/mov2d.d
index 744028e..6b93947 100644
--- a/ld/testsuite/ld-x86-64/mov2d.d
+++ b/ld/testsuite/ld-x86-64/mov2d.d
@@ -9,7 +9,7 @@
 Disassembly of section .text:
 
 #...
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/mpx3.dd b/ld/testsuite/ld-x86-64/mpx3.dd
index eb529f4..d5d8049 100644
--- a/ld/testsuite/ld-x86-64/mpx3.dd
+++ b/ld/testsuite/ld-x86-64/mpx3.dd
@@ -8,13 +8,13 @@ Disassembly of section .plt:
 [  	]*[a-f0-9]+:	f2 ff ([0-9a-f]{2} ){5}	bnd jmpq \*0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x10>
 [  	]*[a-f0-9]+:	0f 1f 00             	nopl   \(%rax\)
 [  	]*[a-f0-9]+:	68 00 00 00 00       	pushq  \$0x0
-[  	]*[a-f0-9]+:	f2 e9 ([0-9a-f]{2} ){4}   	bnd jmpq [a-f0-9]+ <call1@plt-0x20>
+[  	]*[a-f0-9]+:	f2 e9 ([0-9a-f]{2} ){4}   	bnd jmpq [a-f0-9]+ <.plt>
 [  	]*[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%rax,%rax,1\)
 
 Disassembly of section .plt.bnd:
 
 0+[a-f0-9]+ <call1@plt>:
-[  	]*[a-f0-9]+:	f2 ff ([0-9a-f]{2} ){5}	bnd jmpq \*0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_GLOBAL_OFFSET_TABLE_\+0x18>
+[  	]*[a-f0-9]+:	f2 ff ([0-9a-f]{2} ){5}	bnd jmpq \*0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <call1>
 [  	]*[a-f0-9]+:	90                   	nop
 
 Disassembly of section .text:
@@ -22,7 +22,7 @@ Disassembly of section .text:
 0+[a-f0-9]+ <_start>:
 [  	]*[a-f0-9]+:	bf ([0-9a-f]{2} ){4}      	mov    \$0x[a-f0-9]+,%edi
 [  	]*[a-f0-9]+:	f2 ff d7             	bnd callq \*%rdi
-[  	]*[a-f0-9]+:	48 8b ([0-9a-f]{2} ){5}	mov    0x[a-f0-9]+\(%rip\),%rdi        # [a-f0-9]+ <func>
+[  	]*[a-f0-9]+:	48 8b ([0-9a-f]{2} ){5}	mov    0x[a-f0-9]+\(%rip\),%rdi        # [a-f0-9]+ <call2>
 [  	]*[a-f0-9]+:	f2 ff d7             	bnd callq \*%rdi
 [  	]*[a-f0-9]+:	c3                   	retq   
 #pass
diff --git a/ld/testsuite/ld-x86-64/mpx4.dd b/ld/testsuite/ld-x86-64/mpx4.dd
index 0cf0f75..1bcb13b 100644
--- a/ld/testsuite/ld-x86-64/mpx4.dd
+++ b/ld/testsuite/ld-x86-64/mpx4.dd
@@ -8,13 +8,13 @@ Disassembly of section .plt:
 [  	]*[a-f0-9]+:	f2 ff 25 43 01 20 00 	bnd jmpq \*0x200143\(%rip\)        # 6003b0 <_GLOBAL_OFFSET_TABLE_\+0x10>
 [  	]*[a-f0-9]+:	0f 1f 00             	nopl   \(%rax\)
 [  	]*[a-f0-9]+:	68 00 00 00 00       	pushq  \$0x0
-[  	]*[a-f0-9]+:	f2 e9 e5 ff ff ff    	bnd jmpq 400260 <call1@plt-0x20>
+[  	]*[a-f0-9]+:	f2 e9 e5 ff ff ff    	bnd jmpq 400260 <.plt>
 [  	]*[a-f0-9]+:	0f 1f 44 00 00       	nopl   0x0\(%rax,%rax,1\)
 
 Disassembly of section .plt.bnd:
 
 0+400280 <call1@plt>:
-[  	]*[a-f0-9]+:	f2 ff 25 31 01 20 00 	bnd jmpq \*0x200131\(%rip\)        # 6003b8 <_GLOBAL_OFFSET_TABLE_\+0x18>
+[  	]*[a-f0-9]+:	f2 ff 25 31 01 20 00 	bnd jmpq \*0x200131\(%rip\)        # 6003b8 <call1>
 [  	]*[a-f0-9]+:	90                   	nop
 
 Disassembly of section .text:
diff --git a/ld/testsuite/ld-x86-64/no-plt-1a.dd b/ld/testsuite/ld-x86-64/no-plt-1a.dd
index 7c2f5b2..a8445c7 100644
--- a/ld/testsuite/ld-x86-64/no-plt-1a.dd
+++ b/ld/testsuite/ld-x86-64/no-plt-1a.dd
@@ -21,8 +21,8 @@ Disassembly of section .text:
  +[a-f0-9]+:	75 11                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
  +[a-f0-9]+:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.*
  +[a-f0-9]+:	48 83 c4 08          	add    \$0x8,%rsp
- +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
- +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
 #...
 [0-9a-f]+ <get_func>:
  +[a-f0-9]+:	4(0|8) c7 c0 ([0-9a-f]{2} ){4}[ 	]+(rex |)mov +\$0x[0-9a-f]+,%(e|r)ax
diff --git a/ld/testsuite/ld-x86-64/no-plt-1b.dd b/ld/testsuite/ld-x86-64/no-plt-1b.dd
index 13d24b8..c21e912 100644
--- a/ld/testsuite/ld-x86-64/no-plt-1b.dd
+++ b/ld/testsuite/ld-x86-64/no-plt-1b.dd
@@ -8,19 +8,19 @@ Disassembly of section .text:
 #...
 [0-9a-f]+ <check>:
  +[a-f0-9]+:	48 83 ec 08          	sub    \$0x8,%rsp
- +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
- +[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4}[ 	]+cmp    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
+ +[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4}[ 	]+cmp    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
  +[a-f0-9]+:	75 34                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
  +[a-f0-9]+:	4(0|8) 39 05 ([0-9a-f]{2} ){4}[ 	]+(rex |)cmp +%(e|r)ax,0x[0-9a-f]+\(%rip\) +# [a-f0-9]+ <.*>
  +[a-f0-9]+:	75 2b                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
- +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
  +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
  +[a-f0-9]+:	75 1e                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
- +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
  +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
  +[a-f0-9]+:	75 11                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
  +[a-f0-9]+:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.*
  +[a-f0-9]+:	48 83 c4 08          	add    \$0x8,%rsp
- +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
- +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1c.dd b/ld/testsuite/ld-x86-64/no-plt-1c.dd
index 75287c9..b41246b 100644
--- a/ld/testsuite/ld-x86-64/no-plt-1c.dd
+++ b/ld/testsuite/ld-x86-64/no-plt-1c.dd
@@ -8,7 +8,7 @@ Disassembly of section .text:
 #...
 [0-9a-f]+ <check>:
  +[a-f0-9]+:	48 83 ec 08          	sub    \$0x8,%rsp
- +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
  +[a-f0-9]+:	48 81 f8 ([0-9a-f]{2} ){4}[ 	]+cmp    \$0x[0-9a-f]+,%rax
  +[a-f0-9]+:	75 34                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
  +[a-f0-9]+:	4(0|8) 39 05 ([0-9a-f]{2} ){4}[ 	]+(rex |)cmp +%(e|r)ax,0x[0-9a-f]+\(%rip\) +# [a-f0-9]+ <.*>
@@ -16,11 +16,11 @@ Disassembly of section .text:
  +[a-f0-9]+:	67 e8 ([0-9a-f]{2} ){4}[ 	]+addr32 callq [0-9a-f]+ <func>
  +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
  +[a-f0-9]+:	75 1e                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
- +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
  +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
  +[a-f0-9]+:	75 11                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
  +[a-f0-9]+:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.*
  +[a-f0-9]+:	48 83 c4 08          	add    \$0x8,%rsp
- +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
- +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1e.dd b/ld/testsuite/ld-x86-64/no-plt-1e.dd
index 0126abe..f3b07ab 100644
--- a/ld/testsuite/ld-x86-64/no-plt-1e.dd
+++ b/ld/testsuite/ld-x86-64/no-plt-1e.dd
@@ -9,7 +9,7 @@ Disassembly of section .text:
 [0-9a-f]+ <check>:
  +[a-f0-9]+:	48 83 ec 08          	sub    \$0x8,%rsp
  +[a-f0-9]+:	67 e8 ([0-9a-f]{2} ){4}[ 	]+addr32 callq [0-9a-f]+ <get_func>
- +[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4}[ 	]+cmp    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4}[ 	]+cmp    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
  +[a-f0-9]+:	75 34                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
  +[a-f0-9]+:	4(0|8) 39 05 ([0-9a-f]{2} ){4}[ 	]+(rex |)cmp +%(e|r)ax,0x[0-9a-f]+\(%rip\) +# [a-f0-9]+ <func_p>
  +[a-f0-9]+:	75 2b                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
@@ -21,8 +21,8 @@ Disassembly of section .text:
  +[a-f0-9]+:	75 11                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
  +[a-f0-9]+:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.*
  +[a-f0-9]+:	48 83 c4 08          	add    \$0x8,%rsp
- +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
- +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
 #...
 [0-9a-f]+ <get_func>:
  +[a-f0-9]+:	48 8d 05 ([0-9a-f]{2} ){4}[ 	]+lea    -0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <func>
diff --git a/ld/testsuite/ld-x86-64/no-plt-1f.dd b/ld/testsuite/ld-x86-64/no-plt-1f.dd
index 13d24b8..c21e912 100644
--- a/ld/testsuite/ld-x86-64/no-plt-1f.dd
+++ b/ld/testsuite/ld-x86-64/no-plt-1f.dd
@@ -8,19 +8,19 @@ Disassembly of section .text:
 #...
 [0-9a-f]+ <check>:
  +[a-f0-9]+:	48 83 ec 08          	sub    \$0x8,%rsp
- +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
- +[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4}[ 	]+cmp    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
+ +[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4}[ 	]+cmp    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
  +[a-f0-9]+:	75 34                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
  +[a-f0-9]+:	4(0|8) 39 05 ([0-9a-f]{2} ){4}[ 	]+(rex |)cmp +%(e|r)ax,0x[0-9a-f]+\(%rip\) +# [a-f0-9]+ <.*>
  +[a-f0-9]+:	75 2b                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
- +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
  +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
  +[a-f0-9]+:	75 1e                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
- +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
  +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
  +[a-f0-9]+:	75 11                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
  +[a-f0-9]+:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.*
  +[a-f0-9]+:	48 83 c4 08          	add    \$0x8,%rsp
- +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
- +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/no-plt-1g.dd b/ld/testsuite/ld-x86-64/no-plt-1g.dd
index 5a3dd17..ca4eb59 100644
--- a/ld/testsuite/ld-x86-64/no-plt-1g.dd
+++ b/ld/testsuite/ld-x86-64/no-plt-1g.dd
@@ -8,19 +8,19 @@ Disassembly of section .text:
 #...
 [0-9a-f]+ <check>:
  +[a-f0-9]+:	48 83 ec 08          	sub    \$0x8,%rsp
- +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
- +[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4}[ 	]+cmp    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
+ +[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4}[ 	]+cmp    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
  +[a-f0-9]+:	75 34                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
  +[a-f0-9]+:	4(0|8) 39 05 ([0-9a-f]{2} ){4}[ 	]+(rex |)cmp +%(e|r)ax,0x[0-9a-f]+\(%rip\) +# [a-f0-9]+ <.*>
  +[a-f0-9]+:	75 2b                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
  +[a-f0-9]+:	67 e8 ([0-9a-f]{2} ){4}[ 	]+addr32 callq [0-9a-f]+ <func>
  +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
  +[a-f0-9]+:	75 1e                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
- +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
  +[a-f0-9]+:	3d 78 56 34 12       	cmp    \$0x12345678,%eax
  +[a-f0-9]+:	75 11                	jne    [0-9a-f]+ <check\+0x[0-9a-f]+>
  +[a-f0-9]+:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[a-f0-9]+\(%rip\),%rdi +# [a-f0-9]+.*
  +[a-f0-9]+:	48 83 c4 08          	add    \$0x8,%rsp
- +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
- +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[a-f0-9]+:	ff 25 ([0-9a-f]{2} ){4}[ 	]+jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
+ +[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4}[ 	]+callq  \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/plt-main-bnd.dd b/ld/testsuite/ld-x86-64/plt-main-bnd.dd
index 8598e30..91fc945 100644
--- a/ld/testsuite/ld-x86-64/plt-main-bnd.dd
+++ b/ld/testsuite/ld-x86-64/plt-main-bnd.dd
@@ -2,6 +2,6 @@
 Disassembly of section .plt.got:
 
 [a-f0-9]+ <.plt.got>:
-[ 	]*[a-f0-9]+:	f2 ff 25 .. .. 20 00 	bnd jmpq \*0x20....\(%rip\)        # ...... <_DYNAMIC\+0x...>
+[ 	]*[a-f0-9]+:	f2 ff 25 .. .. 20 00 	bnd jmpq \*0x20....\(%rip\)        # ...... <.*>
 [ 	]*[a-f0-9]+:	90                   	nop
 #pass
diff --git a/ld/testsuite/ld-x86-64/plt-nacl.pd b/ld/testsuite/ld-x86-64/plt-nacl.pd
index b17bf71..e0ff471 100644
--- a/ld/testsuite/ld-x86-64/plt-nacl.pd
+++ b/ld/testsuite/ld-x86-64/plt-nacl.pd
@@ -8,7 +8,7 @@
 
 Disassembly of section .plt:
 
-[0-9a-f]+ <fn1@plt-0x40>:
+[0-9a-f]+ <.plt>:
  +[0-9a-f]+:	ff 35 ([0-9a-f]{2} ){4} *	pushq  0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x8>
  +[0-9a-f]+:	4c 8b 1d ([0-9a-f]{2} ){4} *	mov    0x[0-9a-f]+\(%rip\),%r11 +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x10>
  +[0-9a-f]+:	41 83 e3 e0          	and    \$0xffffffe0,%r11d
@@ -33,7 +33,7 @@ Disassembly of section .plt:
  +[0-9a-f]+:	0f 1f 84 00 00 00 00 *
  +[0-9a-f]+:	00 *
  +[0-9a-f]+:	68 00 00 00 00       	pushq  \$0x0
- +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmpq   [0-9a-f]+ <fn1@plt-0x40>
+ +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmpq   [0-9a-f]+ <.plt>
  +[0-9a-f]+:	66 66 66 66 66 66 2e 	data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
  +[0-9a-f]+:	0f 1f 84 00 00 00 00 *
  +[0-9a-f]+:	00 *
@@ -48,7 +48,7 @@ Disassembly of section .plt:
  +[0-9a-f]+:	0f 1f 84 00 00 00 00 *
  +[0-9a-f]+:	00 *
  +[0-9a-f]+:	68 01 00 00 00       	pushq  \$0x1
- +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmpq   [0-9a-f]+ <fn1@plt-0x40>
+ +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmpq   [0-9a-f]+ <.plt>
  +[0-9a-f]+:	66 66 66 66 66 66 2e 	data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
  +[0-9a-f]+:	0f 1f 84 00 00 00 00 *
  +[0-9a-f]+:	00 *
diff --git a/ld/testsuite/ld-x86-64/plt.pd b/ld/testsuite/ld-x86-64/plt.pd
index b11cc22..b303d36 100644
--- a/ld/testsuite/ld-x86-64/plt.pd
+++ b/ld/testsuite/ld-x86-64/plt.pd
@@ -8,17 +8,17 @@
 
 Disassembly of section .plt:
 
-[0-9a-f]+ <fn1@plt-0x10>:
+[0-9a-f]+ <.plt>:
  +[0-9a-f]+:	ff 35 ([0-9a-f]{2} ){4} *	pushq  0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x8>
  +[0-9a-f]+:	ff 25 ([0-9a-f]{2} ){4} *	jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x10>
  +[0-9a-f]+:	0f 1f 40 00          	nopl   0x0\(%rax\)
 
 [0-9a-f]+ <fn1@plt>:
- +[0-9a-f]+:	ff 25 ([0-9a-f]{2} ){4} *	jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x18>
+ +[0-9a-f]+:	ff 25 ([0-9a-f]{2} ){4} *	jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <fn1>
  +[0-9a-f]+:	68 00 00 00 00       	pushq  \$0x0
- +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmpq   [0-9a-f]+ <fn1@plt-0x10>
+ +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmpq   [0-9a-f]+ <.plt>
 
 [0-9a-f]+ <fn2@plt>:
- +[0-9a-f]+:	ff 25 ([0-9a-f]{2} ){4} *	jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x20>
+ +[0-9a-f]+:	ff 25 ([0-9a-f]{2} ){4} *	jmpq   \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <fn2>
  +[0-9a-f]+:	68 01 00 00 00       	pushq  \$0x1
- +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmpq   [0-9a-f]+ <fn1@plt-0x10>
+ +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmpq   [0-9a-f]+ <.plt>
diff --git a/ld/testsuite/ld-x86-64/pr18591.d b/ld/testsuite/ld-x86-64/pr18591.d
index d5c2150..af930f6 100644
--- a/ld/testsuite/ld-x86-64/pr18591.d
+++ b/ld/testsuite/ld-x86-64/pr18591.d
@@ -8,5 +8,5 @@
 Disassembly of section .text:
 
 [a-f0-9]+ <bar>:
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4}	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4}	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/pr19609-1c.d b/ld/testsuite/ld-x86-64/pr19609-1c.d
index 3b1e98d..32bf67a 100644
--- a/ld/testsuite/ld-x86-64/pr19609-1c.d
+++ b/ld/testsuite/ld-x86-64/pr19609-1c.d
@@ -9,15 +9,15 @@
 Disassembly of section .text:
 
 [a-f0-9]+ <_start>:
-[ 	]*[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	3b 0d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%ecx        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	4c 3b 1d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	44 3b 25 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r12d        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	8b 0d ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%ecx        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	4c 8b 1d ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	44 8b 25 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%r12d        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 85 05 ([0-9a-f]{2} ){4} *	test   %rax,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	85 0d ([0-9a-f]{2} ){4} *	test   %ecx,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	4c 85 1d ([0-9a-f]{2} ){4} *	test   %r11,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	44 85 25 ([0-9a-f]{2} ){4} *	test   %r12d,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	3b 0d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%ecx        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	4c 3b 1d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	44 3b 25 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r12d        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	8b 0d ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%ecx        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	4c 8b 1d ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	44 8b 25 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%r12d        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 85 05 ([0-9a-f]{2} ){4} *	test   %rax,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	85 0d ([0-9a-f]{2} ){4} *	test   %ecx,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	4c 85 1d ([0-9a-f]{2} ){4} *	test   %r11,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	44 85 25 ([0-9a-f]{2} ){4} *	test   %r12d,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
diff --git a/ld/testsuite/ld-x86-64/pr19609-1e.d b/ld/testsuite/ld-x86-64/pr19609-1e.d
index dac5fef..4edc56e 100644
--- a/ld/testsuite/ld-x86-64/pr19609-1e.d
+++ b/ld/testsuite/ld-x86-64/pr19609-1e.d
@@ -9,15 +9,15 @@
 Disassembly of section .text:
 
 [a-f0-9]+ <_start>:
-[ 	]*[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	3b 0d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%ecx        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	4c 3b 1d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	44 3b 25 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r12d        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	8b 0d ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%ecx        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	4c 8b 1d ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	44 8b 25 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%r12d        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 85 05 ([0-9a-f]{2} ){4} *	test   %rax,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	85 0d ([0-9a-f]{2} ){4} *	test   %ecx,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	4c 85 1d ([0-9a-f]{2} ){4} *	test   %r11,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	44 85 25 ([0-9a-f]{2} ){4} *	test   %r12d,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	3b 0d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%ecx        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	4c 3b 1d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	44 3b 25 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r12d        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	8b 0d ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%ecx        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	4c 8b 1d ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	44 8b 25 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%r12d        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 85 05 ([0-9a-f]{2} ){4} *	test   %rax,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	85 0d ([0-9a-f]{2} ){4} *	test   %ecx,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	4c 85 1d ([0-9a-f]{2} ){4} *	test   %r11,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	44 85 25 ([0-9a-f]{2} ){4} *	test   %r12d,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
diff --git a/ld/testsuite/ld-x86-64/pr19609-1j.d b/ld/testsuite/ld-x86-64/pr19609-1j.d
index 4a36a70..c8b940a 100644
--- a/ld/testsuite/ld-x86-64/pr19609-1j.d
+++ b/ld/testsuite/ld-x86-64/pr19609-1j.d
@@ -9,15 +9,15 @@
 Disassembly of section .text:
 
 [a-f0-9]+ <_start>:
-[ 	]*[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	3b 0d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%ecx        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	4c 3b 1d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	44 3b 25 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r12d        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	8b 0d ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%ecx        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	4c 8b 1d ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	44 8b 25 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%r12d        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 85 05 ([0-9a-f]{2} ){4} *	test   %rax,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	85 0d ([0-9a-f]{2} ){4} *	test   %ecx,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	4c 85 1d ([0-9a-f]{2} ){4} *	test   %r11,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	44 85 25 ([0-9a-f]{2} ){4} *	test   %r12d,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	3b 0d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%ecx        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	4c 3b 1d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	44 3b 25 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r12d        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	8b 0d ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%ecx        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	4c 8b 1d ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	44 8b 25 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%r12d        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 85 05 ([0-9a-f]{2} ){4} *	test   %rax,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	85 0d ([0-9a-f]{2} ){4} *	test   %ecx,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	4c 85 1d ([0-9a-f]{2} ){4} *	test   %r11,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	44 85 25 ([0-9a-f]{2} ){4} *	test   %r12d,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
diff --git a/ld/testsuite/ld-x86-64/pr19609-1l.d b/ld/testsuite/ld-x86-64/pr19609-1l.d
index aedf5d8..5559399 100644
--- a/ld/testsuite/ld-x86-64/pr19609-1l.d
+++ b/ld/testsuite/ld-x86-64/pr19609-1l.d
@@ -9,15 +9,15 @@
 Disassembly of section .text:
 
 [a-f0-9]+ <_start>:
-[ 	]*[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_start\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	3b 0d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%ecx        # [a-f0-9]+ <_start\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	4c 3b 1d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <_start\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	44 3b 25 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r12d        # [a-f0-9]+ <_start\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	3b 0d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%ecx        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	4c 3b 1d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	44 3b 25 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r12d        # [a-f0-9]+ <.*>
 [ 	]*[a-f0-9]+:	48 8d 05 ([0-9a-f]{2} ){4} *	lea    -0x[a-f0-9]+\(%rip\),%rax        # 0 <_start-0x[a-f0-9]+>
 [ 	]*[a-f0-9]+:	8d 0d ([0-9a-f]{2} ){4} *	lea    -0x[a-f0-9]+\(%rip\),%ecx        # 0 <_start-0x[a-f0-9]+>
 [ 	]*[a-f0-9]+:	4c 8d 1d ([0-9a-f]{2} ){4} *	lea    -0x[a-f0-9]+\(%rip\),%r11        # 0 <_start-0x[a-f0-9]+>
 [ 	]*[a-f0-9]+:	44 8d 25 ([0-9a-f]{2} ){4} *	lea    -0x[a-f0-9]+\(%rip\),%r12d        # 0 <_start-0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 85 05 ([0-9a-f]{2} ){4} *	test   %rax,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_start\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	85 0d ([0-9a-f]{2} ){4} *	test   %ecx,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_start\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	4c 85 1d ([0-9a-f]{2} ){4} *	test   %r11,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_start\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	44 85 25 ([0-9a-f]{2} ){4} *	test   %r12d,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_start\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 85 05 ([0-9a-f]{2} ){4} *	test   %rax,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	85 0d ([0-9a-f]{2} ){4} *	test   %ecx,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	4c 85 1d ([0-9a-f]{2} ){4} *	test   %r11,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	44 85 25 ([0-9a-f]{2} ){4} *	test   %r12d,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
diff --git a/ld/testsuite/ld-x86-64/pr19609-1m.d b/ld/testsuite/ld-x86-64/pr19609-1m.d
index 8e80cbb..c6831d8 100644
--- a/ld/testsuite/ld-x86-64/pr19609-1m.d
+++ b/ld/testsuite/ld-x86-64/pr19609-1m.d
@@ -9,15 +9,15 @@
 Disassembly of section .text:
 
 [a-f0-9]+ <_start>:
-[ 	]*[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	3b 0d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%ecx        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	4c 3b 1d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	44 3b 25 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r12d        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	8b 0d ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%ecx        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	4c 8b 1d ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	44 8b 25 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%r12d        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	48 85 05 ([0-9a-f]{2} ){4} *	test   %rax,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	85 0d ([0-9a-f]{2} ){4} *	test   %ecx,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	4c 85 1d ([0-9a-f]{2} ){4} *	test   %r11,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
-[ 	]*[a-f0-9]+:	44 85 25 ([0-9a-f]{2} ){4} *	test   %r12d,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 3b 05 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	3b 0d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%ecx        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	4c 3b 1d ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	44 3b 25 ([0-9a-f]{2} ){4} *	cmp    0x[a-f0-9]+\(%rip\),%r12d        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	8b 0d ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%ecx        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	4c 8b 1d ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%r11        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	44 8b 25 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%r12d        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	48 85 05 ([0-9a-f]{2} ){4} *	test   %rax,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	85 0d ([0-9a-f]{2} ){4} *	test   %ecx,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	4c 85 1d ([0-9a-f]{2} ){4} *	test   %r11,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
+[ 	]*[a-f0-9]+:	44 85 25 ([0-9a-f]{2} ){4} *	test   %r12d,0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
diff --git a/ld/testsuite/ld-x86-64/pr19609-5b.d b/ld/testsuite/ld-x86-64/pr19609-5b.d
index 4183d56..257fa63 100644
--- a/ld/testsuite/ld-x86-64/pr19609-5b.d
+++ b/ld/testsuite/ld-x86-64/pr19609-5b.d
@@ -9,4 +9,4 @@
 Disassembly of section .text:
 
 [a-f0-9]+ <_start>:
-[ ]+[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4} *	callq  \*0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ ]+[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4} *	callq  \*0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
diff --git a/ld/testsuite/ld-x86-64/pr19609-5c.d b/ld/testsuite/ld-x86-64/pr19609-5c.d
index 4eaeb2b..1de68b4 100644
--- a/ld/testsuite/ld-x86-64/pr19609-5c.d
+++ b/ld/testsuite/ld-x86-64/pr19609-5c.d
@@ -9,4 +9,4 @@
 Disassembly of section .text:
 
 [a-f0-9]+ <_start>:
-[ ]+[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4} *	callq  \*0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ ]+[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4} *	callq  \*0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <bar>
diff --git a/ld/testsuite/ld-x86-64/pr19609-5e.d b/ld/testsuite/ld-x86-64/pr19609-5e.d
index b6b6c65..90bdb3d 100644
--- a/ld/testsuite/ld-x86-64/pr19609-5e.d
+++ b/ld/testsuite/ld-x86-64/pr19609-5e.d
@@ -9,4 +9,4 @@
 Disassembly of section .text:
 
 [a-f0-9]+ <_start>:
-[ ]+[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4} *	callq  \*-?0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <[0-9a-zA-Z_]+[\+\-]+0x[a-f0-9]+>
+[ ]+[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4} *	callq  \*-?0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*>
diff --git a/ld/testsuite/ld-x86-64/pr19609-6b.d b/ld/testsuite/ld-x86-64/pr19609-6b.d
index 64e1f5b..810023b 100644
--- a/ld/testsuite/ld-x86-64/pr19609-6b.d
+++ b/ld/testsuite/ld-x86-64/pr19609-6b.d
@@ -9,5 +9,5 @@
 Disassembly of section .text:
 
 [a-f0-9]+ <_start>:
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_start\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.got>
 #pass
diff --git a/ld/testsuite/ld-x86-64/pr19609-7b.d b/ld/testsuite/ld-x86-64/pr19609-7b.d
index 2e8fd35..898a5df 100644
--- a/ld/testsuite/ld-x86-64/pr19609-7b.d
+++ b/ld/testsuite/ld-x86-64/pr19609-7b.d
@@ -9,5 +9,5 @@
 Disassembly of section .text:
 
 [a-f0-9]+ <_start>:
-[ ]*[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4} *	callq  \*-?0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*0x[a-f0-9]+>
+[ ]*[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4} *	callq  \*-?0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.got>
 #pass
diff --git a/ld/testsuite/ld-x86-64/pr19609-7d.d b/ld/testsuite/ld-x86-64/pr19609-7d.d
index ba28828..476cafa 100644
--- a/ld/testsuite/ld-x86-64/pr19609-7d.d
+++ b/ld/testsuite/ld-x86-64/pr19609-7d.d
@@ -9,5 +9,5 @@
 Disassembly of section .text:
 
 [a-f0-9]+ <_start>:
-[ ]*[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4} *	callq  \*-?0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.*0x[a-f0-9]+>
+[ ]*[a-f0-9]+:	ff 15 ([0-9a-f]{2} ){4} *	callq  \*-?0x[a-f0-9]+\(%rip\)        # [a-f0-9]+ <.got>
 #pass
diff --git a/ld/testsuite/ld-x86-64/pr19636-2d.d b/ld/testsuite/ld-x86-64/pr19636-2d.d
index ff25ec1..4f5c1f0 100644
--- a/ld/testsuite/ld-x86-64/pr19636-2d.d
+++ b/ld/testsuite/ld-x86-64/pr19636-2d.d
@@ -20,6 +20,6 @@ Disassembly of section .plt:
 Disassembly of section .text:
 
 0+140 <_start>:
-[ 	]*[a-f0-9]+:	48 3b 05 f1 00 20 00 	cmp    0x2000f1\(%rip\),%rax        # 200238 <_DYNAMIC\+0xe0>
-[ 	]*[a-f0-9]+:	ff 25 f3 00 20 00    	jmpq   \*0x2000f3\(%rip\)        # 200240 <_DYNAMIC\+0xe8>
-[ 	]*[a-f0-9]+:	e8 de ff ff ff       	callq  130 <_start-0x10>
+[ 	]*[a-f0-9]+:	48 3b 05 f1 00 20 00 	cmp    0x2000f1\(%rip\),%rax        # 200238 <.*>
+[ 	]*[a-f0-9]+:	ff 25 f3 00 20 00    	jmpq   \*0x2000f3\(%rip\)        # 200240 <.*>
+[ 	]*[a-f0-9]+:	e8 de ff ff ff       	callq  130 <.*>
diff --git a/ld/testsuite/ld-x86-64/pr20093-1.d b/ld/testsuite/ld-x86-64/pr20093-1.d
index de81443..90bb3ab 100644
--- a/ld/testsuite/ld-x86-64/pr20093-1.d
+++ b/ld/testsuite/ld-x86-64/pr20093-1.d
@@ -8,4 +8,4 @@
 Disassembly of section .text:
 
 [a-f0-9]+ <_start>:
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
diff --git a/ld/testsuite/ld-x86-64/pr20093-2.d b/ld/testsuite/ld-x86-64/pr20093-2.d
index de81443..90bb3ab 100644
--- a/ld/testsuite/ld-x86-64/pr20093-2.d
+++ b/ld/testsuite/ld-x86-64/pr20093-2.d
@@ -8,4 +8,4 @@
 Disassembly of section .text:
 
 [a-f0-9]+ <_start>:
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
diff --git a/ld/testsuite/ld-x86-64/pr20253-1b.d b/ld/testsuite/ld-x86-64/pr20253-1b.d
index 247e042..d68dd46 100644
--- a/ld/testsuite/ld-x86-64/pr20253-1b.d
+++ b/ld/testsuite/ld-x86-64/pr20253-1b.d
@@ -16,10 +16,10 @@ Disassembly of section .text:
  +[a-f0-9]+:	c3                   	retq   
 
 0+4000e2 <_start>:
- +[a-f0-9]+:	ff 15 28 00 20 00    	callq  \*0x200028\(%rip\)        # 600110 <_start\+0x20002e>
- +[a-f0-9]+:	ff 25 2a 00 20 00    	jmpq   \*0x20002a\(%rip\)        # 600118 <_start\+0x200036>
- +[a-f0-9]+:	48 c7 05 1f 00 20 00 00 00 00 00 	movq   \$0x0,0x20001f\(%rip\)        # 600118 <_start\+0x200036>
- +[a-f0-9]+:	48 83 3d 0f 00 20 00 00 	cmpq   \$0x0,0x20000f\(%rip\)        # 600110 <_start\+0x20002e>
- +[a-f0-9]+:	48 3b 0d 08 00 20 00 	cmp    0x200008\(%rip\),%rcx        # 600110 <_start\+0x20002e>
- +[a-f0-9]+:	48 3b 0d 09 00 20 00 	cmp    0x200009\(%rip\),%rcx        # 600118 <_start\+0x200036>
+ +[a-f0-9]+:	ff 15 28 00 20 00    	callq  \*0x200028\(%rip\)        # 600110 <.*>
+ +[a-f0-9]+:	ff 25 2a 00 20 00    	jmpq   \*0x20002a\(%rip\)        # 600118 <.*>
+ +[a-f0-9]+:	48 c7 05 1f 00 20 00 00 00 00 00 	movq   \$0x0,0x20001f\(%rip\)        # 600118 <.*>
+ +[a-f0-9]+:	48 83 3d 0f 00 20 00 00 	cmpq   \$0x0,0x20000f\(%rip\)        # 600110 <.*>
+ +[a-f0-9]+:	48 3b 0d 08 00 20 00 	cmp    0x200008\(%rip\),%rcx        # 600110 <.*>
+ +[a-f0-9]+:	48 3b 0d 09 00 20 00 	cmp    0x200009\(%rip\),%rcx        # 600118 <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/pr20253-1d.d b/ld/testsuite/ld-x86-64/pr20253-1d.d
index 35c04f8..6953c79 100644
--- a/ld/testsuite/ld-x86-64/pr20253-1d.d
+++ b/ld/testsuite/ld-x86-64/pr20253-1d.d
@@ -16,10 +16,10 @@ Disassembly of section .text:
  +[a-f0-9]+:	c3                   	retq   
 
 0+1ca <_start>:
- +[a-f0-9]+:	ff 15 28 01 20 00    	callq  \*0x200128\(%rip\)        # 2002f8 <_DYNAMIC\+0x100>
- +[a-f0-9]+:	ff 25 2a 01 20 00    	jmpq   \*0x20012a\(%rip\)        # 200300 <_DYNAMIC\+0x108>
- +[a-f0-9]+:	48 c7 05 1f 01 20 00 00 00 00 00 	movq   \$0x0,0x20011f\(%rip\)        # 200300 <_DYNAMIC\+0x108>
- +[a-f0-9]+:	48 83 3d 0f 01 20 00 00 	cmpq   \$0x0,0x20010f\(%rip\)        # 2002f8 <_DYNAMIC\+0x100>
- +[a-f0-9]+:	48 3b 0d 08 01 20 00 	cmp    0x200108\(%rip\),%rcx        # 2002f8 <_DYNAMIC\+0x100>
- +[a-f0-9]+:	48 3b 0d 09 01 20 00 	cmp    0x200109\(%rip\),%rcx        # 200300 <_DYNAMIC\+0x108>
+ +[a-f0-9]+:	ff 15 28 01 20 00    	callq  \*0x200128\(%rip\)        # 2002f8 <.got>
+ +[a-f0-9]+:	ff 25 2a 01 20 00    	jmpq   \*0x20012a\(%rip\)        # 200300 <.got\+0x8>
+ +[a-f0-9]+:	48 c7 05 1f 01 20 00 00 00 00 00 	movq   \$0x0,0x20011f\(%rip\)        # 200300 <.got\+0x8>
+ +[a-f0-9]+:	48 83 3d 0f 01 20 00 00 	cmpq   \$0x0,0x20010f\(%rip\)        # 2002f8 <.got>
+ +[a-f0-9]+:	48 3b 0d 08 01 20 00 	cmp    0x200108\(%rip\),%rcx        # 2002f8 <.got>
+ +[a-f0-9]+:	48 3b 0d 09 01 20 00 	cmp    0x200109\(%rip\),%rcx        # 200300 <.got\+0x8>
 #pass
diff --git a/ld/testsuite/ld-x86-64/pr20253-1f.d b/ld/testsuite/ld-x86-64/pr20253-1f.d
index d84b60e..9319350 100644
--- a/ld/testsuite/ld-x86-64/pr20253-1f.d
+++ b/ld/testsuite/ld-x86-64/pr20253-1f.d
@@ -16,10 +16,10 @@ Disassembly of section .text:
  +[a-f0-9]+:	c3                   	retq   
 
 0+1fa <_start>:
- +[a-f0-9]+:	ff 15 08 01 20 00    	callq  \*0x200108\(%rip\)        # 200308 <_DYNAMIC\+0xe0>
- +[a-f0-9]+:	ff 25 0a 01 20 00    	jmpq   \*0x20010a\(%rip\)        # 200310 <_DYNAMIC\+0xe8>
- +[a-f0-9]+:	48 c7 05 ff 00 20 00 00 00 00 00 	movq   \$0x0,0x2000ff\(%rip\)        # 200310 <_DYNAMIC\+0xe8>
- +[a-f0-9]+:	48 83 3d ef 00 20 00 00 	cmpq   \$0x0,0x2000ef\(%rip\)        # 200308 <_DYNAMIC\+0xe0>
- +[a-f0-9]+:	48 3b 0d e8 00 20 00 	cmp    0x2000e8\(%rip\),%rcx        # 200308 <_DYNAMIC\+0xe0>
- +[a-f0-9]+:	48 3b 0d e9 00 20 00 	cmp    0x2000e9\(%rip\),%rcx        # 200310 <_DYNAMIC\+0xe8>
+ +[a-f0-9]+:	ff 15 08 01 20 00    	callq  \*0x200108\(%rip\)        # 200308 <.*>
+ +[a-f0-9]+:	ff 25 0a 01 20 00    	jmpq   \*0x20010a\(%rip\)        # 200310 <.*>
+ +[a-f0-9]+:	48 c7 05 ff 00 20 00 00 00 00 00 	movq   \$0x0,0x2000ff\(%rip\)        # 200310 <.*>
+ +[a-f0-9]+:	48 83 3d ef 00 20 00 00 	cmpq   \$0x0,0x2000ef\(%rip\)        # 200308 <.*>
+ +[a-f0-9]+:	48 3b 0d e8 00 20 00 	cmp    0x2000e8\(%rip\),%rcx        # 200308 <.*>
+ +[a-f0-9]+:	48 3b 0d e9 00 20 00 	cmp    0x2000e9\(%rip\),%rcx        # 200310 <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/pr20253-1h.d b/ld/testsuite/ld-x86-64/pr20253-1h.d
index 77ff100..14a8f1b 100644
--- a/ld/testsuite/ld-x86-64/pr20253-1h.d
+++ b/ld/testsuite/ld-x86-64/pr20253-1h.d
@@ -16,10 +16,10 @@ Disassembly of section .text:
  +[a-f0-9]+:	c3                   	retq   
 
 0+40008e <_start>:
- +[a-f0-9]+:	ff 15 28 00 20 00    	callq  \*0x200028\(%rip\)        # 6000bc <_start\+0x20002e>
- +[a-f0-9]+:	ff 25 2a 00 20 00    	jmpq   \*0x20002a\(%rip\)        # 6000c4 <_start\+0x200036>
- +[a-f0-9]+:	48 c7 05 1f 00 20 00 00 00 00 00 	movq   \$0x0,0x20001f\(%rip\)        # 6000c4 <_start\+0x200036>
- +[a-f0-9]+:	48 83 3d 0f 00 20 00 00 	cmpq   \$0x0,0x20000f\(%rip\)        # 6000bc <_start\+0x20002e>
- +[a-f0-9]+:	48 3b 0d 08 00 20 00 	cmp    0x200008\(%rip\),%rcx        # 6000bc <_start\+0x20002e>
- +[a-f0-9]+:	48 3b 0d 09 00 20 00 	cmp    0x200009\(%rip\),%rcx        # 6000c4 <_start\+0x200036>
+ +[a-f0-9]+:	ff 15 28 00 20 00    	callq  \*0x200028\(%rip\)        # 6000bc <.*>
+ +[a-f0-9]+:	ff 25 2a 00 20 00    	jmpq   \*0x20002a\(%rip\)        # 6000c4 <.*>
+ +[a-f0-9]+:	48 c7 05 1f 00 20 00 00 00 00 00 	movq   \$0x0,0x20001f\(%rip\)        # 6000c4 <.*>
+ +[a-f0-9]+:	48 83 3d 0f 00 20 00 00 	cmpq   \$0x0,0x20000f\(%rip\)        # 6000bc <.*>
+ +[a-f0-9]+:	48 3b 0d 08 00 20 00 	cmp    0x200008\(%rip\),%rcx        # 6000bc <.*>
+ +[a-f0-9]+:	48 3b 0d 09 00 20 00 	cmp    0x200009\(%rip\),%rcx        # 6000c4 <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/pr20253-1j.d b/ld/testsuite/ld-x86-64/pr20253-1j.d
index 6f5d666..5662e0c 100644
--- a/ld/testsuite/ld-x86-64/pr20253-1j.d
+++ b/ld/testsuite/ld-x86-64/pr20253-1j.d
@@ -16,10 +16,10 @@ Disassembly of section .text:
  +[a-f0-9]+:	c3                   	retq   
 
 0+122 <_start>:
- +[a-f0-9]+:	ff 15 a8 00 20 00    	callq  \*0x2000a8\(%rip\)        # 2001d0 <_DYNAMIC\+0x80>
- +[a-f0-9]+:	ff 25 aa 00 20 00    	jmpq   \*0x2000aa\(%rip\)        # 2001d8 <_DYNAMIC\+0x88>
- +[a-f0-9]+:	48 c7 05 9f 00 20 00 00 00 00 00 	movq   \$0x0,0x20009f\(%rip\)        # 2001d8 <_DYNAMIC\+0x88>
- +[a-f0-9]+:	48 83 3d 8f 00 20 00 00 	cmpq   \$0x0,0x20008f\(%rip\)        # 2001d0 <_DYNAMIC\+0x80>
- +[a-f0-9]+:	48 3b 0d 88 00 20 00 	cmp    0x200088\(%rip\),%rcx        # 2001d0 <_DYNAMIC\+0x80>
- +[a-f0-9]+:	48 3b 0d 89 00 20 00 	cmp    0x200089\(%rip\),%rcx        # 2001d8 <_DYNAMIC\+0x88>
+ +[a-f0-9]+:	ff 15 a8 00 20 00    	callq  \*0x2000a8\(%rip\)        # 2001d0 <.*>
+ +[a-f0-9]+:	ff 25 aa 00 20 00    	jmpq   \*0x2000aa\(%rip\)        # 2001d8 <.*>
+ +[a-f0-9]+:	48 c7 05 9f 00 20 00 00 00 00 00 	movq   \$0x0,0x20009f\(%rip\)        # 2001d8 <.*>
+ +[a-f0-9]+:	48 83 3d 8f 00 20 00 00 	cmpq   \$0x0,0x20008f\(%rip\)        # 2001d0 <.*>
+ +[a-f0-9]+:	48 3b 0d 88 00 20 00 	cmp    0x200088\(%rip\),%rcx        # 2001d0 <.*>
+ +[a-f0-9]+:	48 3b 0d 89 00 20 00 	cmp    0x200089\(%rip\),%rcx        # 2001d8 <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/pr20253-1l.d b/ld/testsuite/ld-x86-64/pr20253-1l.d
index 0276558..83a61db 100644
--- a/ld/testsuite/ld-x86-64/pr20253-1l.d
+++ b/ld/testsuite/ld-x86-64/pr20253-1l.d
@@ -16,10 +16,10 @@ Disassembly of section .text:
  +[a-f0-9]+:	c3                   	retq   
 
 0+15a <_start>:
- +[a-f0-9]+:	ff 15 98 00 20 00    	callq  \*0x200098\(%rip\)        # 2001f8 <_DYNAMIC\+0x70>
- +[a-f0-9]+:	ff 25 9a 00 20 00    	jmpq   \*0x20009a\(%rip\)        # 200200 <_DYNAMIC\+0x78>
- +[a-f0-9]+:	48 c7 05 8f 00 20 00 00 00 00 00 	movq   \$0x0,0x20008f\(%rip\)        # 200200 <_DYNAMIC\+0x78>
- +[a-f0-9]+:	48 83 3d 7f 00 20 00 00 	cmpq   \$0x0,0x20007f\(%rip\)        # 2001f8 <_DYNAMIC\+0x70>
- +[a-f0-9]+:	48 3b 0d 78 00 20 00 	cmp    0x200078\(%rip\),%rcx        # 2001f8 <_DYNAMIC\+0x70>
- +[a-f0-9]+:	48 3b 0d 79 00 20 00 	cmp    0x200079\(%rip\),%rcx        # 200200 <_DYNAMIC\+0x78>
+ +[a-f0-9]+:	ff 15 98 00 20 00    	callq  \*0x200098\(%rip\)        # 2001f8 <.*>
+ +[a-f0-9]+:	ff 25 9a 00 20 00    	jmpq   \*0x20009a\(%rip\)        # 200200 <.*>
+ +[a-f0-9]+:	48 c7 05 8f 00 20 00 00 00 00 00 	movq   \$0x0,0x20008f\(%rip\)        # 200200 <.*>
+ +[a-f0-9]+:	48 83 3d 7f 00 20 00 00 	cmpq   \$0x0,0x20007f\(%rip\)        # 2001f8 <.*>
+ +[a-f0-9]+:	48 3b 0d 78 00 20 00 	cmp    0x200078\(%rip\),%rcx        # 2001f8 <.*>
+ +[a-f0-9]+:	48 3b 0d 79 00 20 00 	cmp    0x200079\(%rip\),%rcx        # 200200 <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/protected3.d b/ld/testsuite/ld-x86-64/protected3.d
index d8f09da..0c60167 100644
--- a/ld/testsuite/ld-x86-64/protected3.d
+++ b/ld/testsuite/ld-x86-64/protected3.d
@@ -8,7 +8,7 @@
 Disassembly of section .text:
 
 0+[a-f0-9]+ <bar>:
-[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 8b 05 ([0-9a-f]{2} ){4} *	mov    0x[a-f0-9]+\(%rip\),%rax        # [a-f0-9]+ <.*>
 [ 	]*[a-f0-9]+:	8b 00                	mov    \(%rax\),%eax
 [ 	]*[a-f0-9]+:	c3                   	retq *
 #pass
diff --git a/ld/testsuite/ld-x86-64/tlsbin.dd b/ld/testsuite/ld-x86-64/tlsbin.dd
index c89e7ee..6bc7ca2 100644
--- a/ld/testsuite/ld-x86-64/tlsbin.dd
+++ b/ld/testsuite/ld-x86-64/tlsbin.dd
@@ -24,7 +24,7 @@ Disassembly of section .text:
 #  GD -> IE because variable is not defined in executable
  +[0-9a-f]+:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +[0-9a-f]+:	00 00 *
- +[0-9a-f]+:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x158>
+ +[0-9a-f]+:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG1
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -34,7 +34,7 @@ Disassembly of section .text:
 #  the variable is referenced through IE too
  +[0-9a-f]+:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +[0-9a-f]+:	00 00 *
- +[0-9a-f]+:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x148>
+ +[0-9a-f]+:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG2
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -102,7 +102,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	00 00 *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
- +[0-9a-f]+:	4c 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%r9 +# [0-9a-f]+ <_DYNAMIC\+0x148>
+ +[0-9a-f]+:	4c 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%r9 +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG2
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -143,7 +143,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	90[ 	]+nop *
 #  Direct access through %fs
 #  IE against global var
- +[0-9a-f]+:	48 8b 0d ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x140>
+ +[0-9a-f]+:	48 8b 0d ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG5
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -183,7 +183,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	00 00 *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
- +[0-9a-f]+:	4c 03 1d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%r11 +# [0-9a-f]+ <_DYNAMIC\+0x150>
+ +[0-9a-f]+:	4c 03 1d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%r11 +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG6
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
diff --git a/ld/testsuite/ld-x86-64/tlsbin2.dd b/ld/testsuite/ld-x86-64/tlsbin2.dd
index a73fcef..0010d38 100644
--- a/ld/testsuite/ld-x86-64/tlsbin2.dd
+++ b/ld/testsuite/ld-x86-64/tlsbin2.dd
@@ -24,7 +24,7 @@ Disassembly of section .text:
 #  GD -> IE because variable is not defined in executable
  +[0-9a-f]+:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +[0-9a-f]+:	00 00 *
- +[0-9a-f]+:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +[0-9a-f]+:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG1
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -34,7 +34,7 @@ Disassembly of section .text:
 #  the variable is referenced through IE too
  +[0-9a-f]+:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +[0-9a-f]+:	00 00 *
- +[0-9a-f]+:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x108>
+ +[0-9a-f]+:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG2
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -102,7 +102,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	00 00 *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
- +[0-9a-f]+:	4c 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%r9 +# [0-9a-f]+ <_DYNAMIC\+0x108>
+ +[0-9a-f]+:	4c 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%r9 +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG2
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -143,7 +143,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	90[ 	]+nop *
 #  Direct access through %fs
 #  IE against global var
- +[0-9a-f]+:	48 8b 0d ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x100>
+ +[0-9a-f]+:	48 8b 0d ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG5
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -183,7 +183,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	00 00 *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
- +[0-9a-f]+:	4c 03 1d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%r11 +# [0-9a-f]+ <_DYNAMIC\+0x118>
+ +[0-9a-f]+:	4c 03 1d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%r11 +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG6
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
diff --git a/ld/testsuite/ld-x86-64/tlsbindesc.dd b/ld/testsuite/ld-x86-64/tlsbindesc.dd
index f77ebf2..50dc6d1 100644
--- a/ld/testsuite/ld-x86-64/tlsbindesc.dd
+++ b/ld/testsuite/ld-x86-64/tlsbindesc.dd
@@ -22,7 +22,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	55[ 	]+push   %rbp
  +[0-9a-f]+:	48 89 e5[ 	]+mov    %rsp,%rbp
 #  GD -> IE because variable is not defined in executable
- +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x118>
+ +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG1
  +[0-9a-f]+:	66 90[ 	]+xchg   %ax,%ax
  +[0-9a-f]+:	90[ 	]+nop *
@@ -31,7 +31,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	90[ 	]+nop *
 #  GD -> IE because variable is not defined in executable where
 #  the variable is referenced through IE too
- +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x108>
+ +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG2
  +[0-9a-f]+:	66 90[ 	]+xchg   %ax,%ax
  +[0-9a-f]+:	90[ 	]+nop *
@@ -93,7 +93,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	00 00 *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
- +[0-9a-f]+:	4c 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%r9 +# [0-9a-f]+ <_DYNAMIC\+0x108>
+ +[0-9a-f]+:	4c 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%r9 +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG2
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -134,7 +134,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	90[ 	]+nop *
 #  Direct access through %fs
 #  IE against global var
- +[0-9a-f]+:	48 8b 0d ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x100>
+ +[0-9a-f]+:	48 8b 0d ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG5
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -174,7 +174,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	00 00 *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
- +[0-9a-f]+:	4c 03 1d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%r11 +# [0-9a-f]+ <_DYNAMIC\+0x110>
+ +[0-9a-f]+:	4c 03 1d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%r11 +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG6
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
diff --git a/ld/testsuite/ld-x86-64/tlsdesc-nacl.pd b/ld/testsuite/ld-x86-64/tlsdesc-nacl.pd
index eff90a8..f744f0e 100644
--- a/ld/testsuite/ld-x86-64/tlsdesc-nacl.pd
+++ b/ld/testsuite/ld-x86-64/tlsdesc-nacl.pd
@@ -25,7 +25,7 @@ Disassembly of section .plt:
  +[0-9a-f]+:	00 *
  +[0-9a-f]+:	66 90                	xchg   %ax,%ax
  +[0-9a-f]+:	ff 35 .. .. .. ..    	pushq  0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x8>
- +[0-9a-f]+:	4c 8b 1d .. .. .. .. 	mov    0x[0-9a-f]+\(%rip\),%r11 +# [0-9a-f]+ <_DYNAMIC\+0x190>
+ +[0-9a-f]+:	4c 8b 1d .. .. .. .. 	mov    0x[0-9a-f]+\(%rip\),%r11 +# [0-9a-f]+ <.*>
  +[0-9a-f]+:	41 83 e3 e0          	and    \$0xffffffe0,%r11d
  +[0-9a-f]+:	4d 01 fb             	add    %r15,%r11
  +[0-9a-f]+:	41 ff e3             	jmpq   \*%r11
diff --git a/ld/testsuite/ld-x86-64/tlsdesc.dd b/ld/testsuite/ld-x86-64/tlsdesc.dd
index a6f22b6..c9b1cf8 100644
--- a/ld/testsuite/ld-x86-64/tlsdesc.dd
+++ b/ld/testsuite/ld-x86-64/tlsdesc.dd
@@ -17,7 +17,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
 #  GD
- +[0-9a-f]+:	48 8d 05 ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x48>
+ +[0-9a-f]+:	48 8d 05 ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TLSDESC	sg1
  +[0-9a-f]+:	ff 10[ 	]+callq  \*\(%rax\)
  +[0-9a-f]+:	90[ 	]+nop *
@@ -25,7 +25,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
 #  GD -> IE because variable is referenced through IE too
- +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x180>
+ +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sg2
  +[0-9a-f]+:	66 90[ 	]+xchg   %ax,%ax
  +[0-9a-f]+:	90[ 	]+nop *
@@ -41,7 +41,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
 #  GD -> IE against local variable referenced through IE too
- +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x150>
+ +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x24
  +[0-9a-f]+:	66 90[ 	]+xchg   %ax,%ax
  +[0-9a-f]+:	90[ 	]+nop *
@@ -57,7 +57,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
 #  GD -> IE against hidden and local variable referenced through IE too
- +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x188>
+ +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x44
  +[0-9a-f]+:	66 90[ 	]+xchg   %ax,%ax
  +[0-9a-f]+:	90[ 	]+nop *
@@ -73,7 +73,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
 #  GD -> IE against hidden but not local variable referenced through IE too
- +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x160>
+ +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x64
  +[0-9a-f]+:	66 90[ 	]+xchg   %ax,%ax
  +[0-9a-f]+:	90[ 	]+nop *
@@ -115,7 +115,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	00 00 *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
- +[0-9a-f]+:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x180>
+ +[0-9a-f]+:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sg2
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -126,7 +126,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	00 00 *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
- +[0-9a-f]+:	4c 03 35 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%r14 +# [0-9a-f]+ <_DYNAMIC\+0x150>
+ +[0-9a-f]+:	4c 03 35 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%r14 +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x24
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -137,7 +137,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	00 00 *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
- +[0-9a-f]+:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x188>
+ +[0-9a-f]+:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x44
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -148,7 +148,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	00 00 *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
- +[0-9a-f]+:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x160>
+ +[0-9a-f]+:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x64
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -156,7 +156,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	90[ 	]+nop *
 #  Direct access through %fs
 #  IE against global var
- +[0-9a-f]+:	48 8b 0d ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x168>
+ +[0-9a-f]+:	48 8b 0d ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sg5
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -166,7 +166,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
 #  IE against local var
- +[0-9a-f]+:	4c 8b 15 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%r10 +# [0-9a-f]+ <_DYNAMIC\+0x158>
+ +[0-9a-f]+:	4c 8b 15 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%r10 +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x30
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -176,7 +176,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
 #  IE against hidden and local var
- +[0-9a-f]+:	48 8b 15 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rdx +# [0-9a-f]+ <_DYNAMIC\+0x170>
+ +[0-9a-f]+:	48 8b 15 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rdx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x50
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -186,7 +186,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
 #  IE against hidden but not local var
- +[0-9a-f]+:	48 8b 0d ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x178>
+ +[0-9a-f]+:	48 8b 0d ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x70
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
diff --git a/ld/testsuite/ld-x86-64/tlsdesc.pd b/ld/testsuite/ld-x86-64/tlsdesc.pd
index c24403c..0fa36f3 100644
--- a/ld/testsuite/ld-x86-64/tlsdesc.pd
+++ b/ld/testsuite/ld-x86-64/tlsdesc.pd
@@ -14,6 +14,6 @@ Disassembly of section .plt:
  [0-9a-f]+:	ff 25 .. .. 20 00    	jmpq   \*.*\(%rip\)        # 201360 <_GLOBAL_OFFSET_TABLE_\+0x10>
  [0-9a-f]+:	0f 1f 40 00          	nopl   0x0\(%rax\)
  [0-9a-f]+:	ff 35 .. .. 20 00    	pushq  .*\(%rip\)        # 201358 <_GLOBAL_OFFSET_TABLE_\+0x8>
- [0-9a-f]+:	ff 25 .. .. 20 00    	jmpq   \*.*\(%rip\)        # 201348 <_DYNAMIC\+0x190>
+ [0-9a-f]+:	ff 25 .. .. 20 00    	jmpq   \*.*\(%rip\)        # 201348 <.*>
  [0-9a-f]+:	0f 1f 40 00          	nopl   0x0\(%rax\)
 
diff --git a/ld/testsuite/ld-x86-64/tlsgd10.dd b/ld/testsuite/ld-x86-64/tlsgd10.dd
index 448015e..6c3ca5c 100644
--- a/ld/testsuite/ld-x86-64/tlsgd10.dd
+++ b/ld/testsuite/ld-x86-64/tlsgd10.dd
@@ -15,7 +15,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	4c 8d 3d eb ff ff ff 	lea    -0x15\(%rip\),%r15        # [0-9a-f]+ <_start>
 [ 	]*[a-f0-9]+:	4d 01 df             	add    %r11,%r15
 [ 	]*[a-f0-9]+:	64 48 8b 04 25 00 00 00 00 	mov    %fs:0x0,%rax
-[ 	]*[a-f0-9]+:	48 03 05 ([0-9a-f]{2} ){4}	add    0x[0-9a-f]+\(%rip\),%rax        # [0-9a-f]+ <_DYNAMIC\+0x140>
+[ 	]*[a-f0-9]+:	48 03 05 ([0-9a-f]{2} ){4}	add    0x[0-9a-f]+\(%rip\),%rax        # [0-9a-f]+ <.*>
 [ 	]*[a-f0-9]+:	66 0f 1f 44 00 00    	nopw   0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	41 5f                	pop    %r15
 [ 	]*[a-f0-9]+:	41 5f                	pop    %r15
diff --git a/ld/testsuite/ld-x86-64/tlsgd5.dd b/ld/testsuite/ld-x86-64/tlsgd5.dd
index 54cf357..c2e2621 100644
--- a/ld/testsuite/ld-x86-64/tlsgd5.dd
+++ b/ld/testsuite/ld-x86-64/tlsgd5.dd
@@ -10,5 +10,5 @@ Disassembly of section .text:
 
 [a-f0-9]+ <_start>:
 [ 	]*[a-f0-9]+:	64 48 8b 04 25 00 00 00 00 	mov    %fs:0x0,%rax
-[ 	]*[a-f0-9]+:	48 03 05 ([0-9a-f]{2} ){4} *	add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 03 05 ([0-9a-f]{2} ){4} *	add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #pass
diff --git a/ld/testsuite/ld-x86-64/tlsgd6.dd b/ld/testsuite/ld-x86-64/tlsgd6.dd
index 2cbfda6..08e3b99 100644
--- a/ld/testsuite/ld-x86-64/tlsgd6.dd
+++ b/ld/testsuite/ld-x86-64/tlsgd6.dd
@@ -10,5 +10,5 @@ Disassembly of section .text:
 
 [a-f0-9]+ <_start>:
 [ 	]*[a-f0-9]+:	64 8b 04 25 00 00 00 00 	mov    %fs:0x0,%eax
-[ 	]*[a-f0-9]+:	48 03 05 ([0-9a-f]{2} ){4} *	add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ 	]*[a-f0-9]+:	48 03 05 ([0-9a-f]{2} ){4} *	add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <foo>
 #pass
diff --git a/ld/testsuite/ld-x86-64/tlsgd8.dd b/ld/testsuite/ld-x86-64/tlsgd8.dd
index 1055052..2bb1132 100644
--- a/ld/testsuite/ld-x86-64/tlsgd8.dd
+++ b/ld/testsuite/ld-x86-64/tlsgd8.dd
@@ -15,7 +15,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	48 8d 1d ed ff ff ff 	lea    -0x13\(%rip\),%rbx        # [0-9a-f]+ <_start>
 [ 	]*[a-f0-9]+:	4c 01 db             	add    %r11,%rbx
 [ 	]*[a-f0-9]+:	64 48 8b 04 25 00 00 00 00 	mov    %fs:0x0,%rax
-[ 	]*[a-f0-9]+:	48 03 05 ([0-9a-f]{2} ){4}	add    0x[0-9a-f]+\(%rip\),%rax        # [0-9a-f]+ <_DYNAMIC\+0x140>
+[ 	]*[a-f0-9]+:	48 03 05 ([0-9a-f]{2} ){4}	add    0x[0-9a-f]+\(%rip\),%rax        # [0-9a-f]+ <foo>
 [ 	]*[a-f0-9]+:	66 0f 1f 44 00 00    	nopw   0x0\(%rax,%rax,1\)
 [ 	]*[a-f0-9]+:	5b                   	pop    %rbx
 [ 	]*[a-f0-9]+:	5b                   	pop    %rbx
diff --git a/ld/testsuite/ld-x86-64/tlsgdesc.dd b/ld/testsuite/ld-x86-64/tlsgdesc.dd
index a983a75..d0a274b 100644
--- a/ld/testsuite/ld-x86-64/tlsgdesc.dd
+++ b/ld/testsuite/ld-x86-64/tlsgdesc.dd
@@ -20,7 +20,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	00 00 *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
- +[0-9a-f]+:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x150>
+ +[0-9a-f]+:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG3
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -31,14 +31,14 @@ Disassembly of section .text:
  +[0-9a-f]+:	00 00 *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
- +[0-9a-f]+:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x170>
+ +[0-9a-f]+:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG4
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
 # GD, gd first
- +[0-9a-f]+:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x180>
+ +[0-9a-f]+:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
  +[0-9a-f]+:	[0-9a-f]{2} *
 #				-> R_X86_64_DTPMOD64	sG1
  +[0-9a-f]+:	66 66 48 e8 ([0-9a-f]{2} ){3}[ 	]+data16 data16 rex.W callq [0-9a-f]+ <__tls_get_addr@plt>
@@ -48,7 +48,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
- +[0-9a-f]+:	48 8d 05 ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x30>
+ +[0-9a-f]+:	48 8d 05 ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TLSDESC	sG1
  +[0-9a-f]+:	ff 10[ 	]+callq  \*\(%rax\)
  +[0-9a-f]+:	90[ 	]+nop *
@@ -56,14 +56,14 @@ Disassembly of section .text:
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
 # GD, desc first
- +[0-9a-f]+:	48 8d 05 ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x20>
+ +[0-9a-f]+:	48 8d 05 ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TLSDESC	sG2
  +[0-9a-f]+:	ff 10[ 	]+callq  \*\(%rax\)
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
- +[0-9a-f]+:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x160>
+ +[0-9a-f]+:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
  +[0-9a-f]+:	[0-9a-f]{2} *
 #				-> R_X86_64_DTPMOD64	sG2
  +[0-9a-f]+:	66 66 48 e8 ([0-9a-f]{2} ){3}[ 	]+data16 data16 rex.W callq [0-9a-f]+ <__tls_get_addr@plt>
@@ -76,13 +76,13 @@ Disassembly of section .text:
 # GD -> IE, gd first, after IE use
  +[0-9a-f]+:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +[0-9a-f]+:	00 00 *
- +[0-9a-f]+:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x150>
+ +[0-9a-f]+:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG3
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
- +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x150>
+ +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG3
  +[0-9a-f]+:	66 90[ 	]+xchg   %ax,%ax
  +[0-9a-f]+:	90[ 	]+nop *
@@ -90,7 +90,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
 # GD -> IE, desc first, after IE use
- +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x170>
+ +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG4
  +[0-9a-f]+:	66 90[ 	]+xchg   %ax,%ax
  +[0-9a-f]+:	90[ 	]+nop *
@@ -99,7 +99,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +[0-9a-f]+:	00 00 *
- +[0-9a-f]+:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x170>
+ +[0-9a-f]+:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG4
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -108,13 +108,13 @@ Disassembly of section .text:
 # GD -> IE, gd first, before IE use
  +[0-9a-f]+:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +[0-9a-f]+:	00 00 *
- +[0-9a-f]+:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x158>
+ +[0-9a-f]+:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG5
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
- +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x158>
+ +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG5
  +[0-9a-f]+:	66 90[ 	]+xchg   %ax,%ax
  +[0-9a-f]+:	90[ 	]+nop *
@@ -122,7 +122,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
 # GD -> IE, desc first, before IE use
- +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x178>
+ +[0-9a-f]+:	48 8b 05 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG6
  +[0-9a-f]+:	66 90[ 	]+xchg   %ax,%ax
  +[0-9a-f]+:	90[ 	]+nop *
@@ -131,7 +131,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +[0-9a-f]+:	00 00 *
- +[0-9a-f]+:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x178>
+ +[0-9a-f]+:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG6
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -142,7 +142,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	00 00 *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
- +[0-9a-f]+:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x158>
+ +[0-9a-f]+:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG5
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
@@ -153,7 +153,7 @@ Disassembly of section .text:
  +[0-9a-f]+:	00 00 *
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
- +[0-9a-f]+:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x178>
+ +[0-9a-f]+:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sG6
  +[0-9a-f]+:	90[ 	]+nop *
  +[0-9a-f]+:	90[ 	]+nop *
diff --git a/ld/testsuite/ld-x86-64/tlspic.dd b/ld/testsuite/ld-x86-64/tlspic.dd
index bf3ba69..88026c1 100644
--- a/ld/testsuite/ld-x86-64/tlspic.dd
+++ b/ld/testsuite/ld-x86-64/tlspic.dd
@@ -17,7 +17,7 @@ Disassembly of section .text:
  +1006:	90[ 	]+nop *
  +1007:	90[ 	]+nop *
 #  GD
- +1008:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x180>
+ +1008:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
  +100f:	[0-9a-f 	]+
 #				-> R_X86_64_DTPMOD64	sg1
  +1010:	66 66 48 e8 [0-9a-f 	]+data16 data16 rex.W callq [0-9a-f]+ <.*>
@@ -30,14 +30,14 @@ Disassembly of section .text:
 #  GD -> IE because variable is referenced through IE too
  +101c:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +1023:	00 00 *
- +1025:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x1a0>
+ +1025:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sg2
  +102c:	90[ 	]+nop *
  +102d:	90[ 	]+nop *
  +102e:	90[ 	]+nop *
  +102f:	90[ 	]+nop *
 #  GD against local variable
- +1030:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x130>
+ +1030:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
  +1037:	[0-9a-f 	]+
 #				-> R_X86_64_DTPMOD64	[0 0x2000000000000000]
  +1038:	66 66 48 e8 [0-9a-f 	]+data16 data16 rex.W callq [0-9a-f]+ <.*>
@@ -50,14 +50,14 @@ Disassembly of section .text:
 #  GD -> IE against local variable referenced through IE too
  +1044:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +104b:	00 00 *
- +104d:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x140>
+ +104d:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x24
  +1054:	90[ 	]+nop *
  +1055:	90[ 	]+nop *
  +1056:	90[ 	]+nop *
  +1057:	90[ 	]+nop *
 #  GD against hidden and local variable
- +1058:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x1a8>
+ +1058:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
  +105f:	[0-9a-f 	]+
 #				-> R_X86_64_DTPMOD64	[0 0x4000000000000000]
  +1060:	66 66 48 e8 [0-9a-f 	]+data16 data16 rex.W callq [0-9a-f]+ <.*>
@@ -70,14 +70,14 @@ Disassembly of section .text:
 #  GD -> IE against hidden and local variable referenced through IE too
  +106c:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +1073:	00 00 *
- +1075:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x1b8>
+ +1075:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x44
  +107c:	90[ 	]+nop *
  +107d:	90[ 	]+nop *
  +107e:	90[ 	]+nop *
  +107f:	90[ 	]+nop *
 #  GD against hidden but not local variable
- +1080:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x160>
+ +1080:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
  +1087:	[0-9a-f 	]+
 #				-> R_X86_64_DTPMOD64	[0 0x6000000000000000]
  +1088:	66 66 48 e8 [0-9a-f 	]+data16 data16 rex.W callq [0-9a-f]+ <.*>
@@ -90,14 +90,14 @@ Disassembly of section .text:
 #  GD -> IE against hidden but not local variable referenced through IE too
  +1094:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +109b:	00 00 *
- +109d:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x170>
+ +109d:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x64
  +10a4:	90[ 	]+nop *
  +10a5:	90[ 	]+nop *
  +10a6:	90[ 	]+nop *
  +10a7:	90[ 	]+nop *
 #  LD
- +10a8:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x150>
+ +10a8:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	[0 0x000000000000000]
  +10af:	e8 [0-9a-f 	]+callq  [0-9a-f]+ <.*>
 #				-> R_X86_64_JUMP_SLOT	__tls_get_addr
@@ -112,7 +112,7 @@ Disassembly of section .text:
  +10c8:	90[ 	]+nop *
  +10c9:	90[ 	]+nop *
 #  LD against hidden and local variables
- +10ca:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x150>
+ +10ca:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	[0 0x000000000000000]
  +10d1:	e8 [0-9a-f 	]+callq  [0-9a-f]+ <.*>
 #				-> R_X86_64_JUMP_SLOT	__tls_get_addr
@@ -127,7 +127,7 @@ Disassembly of section .text:
  +10ea:	90[ 	]+nop *
  +10eb:	90[ 	]+nop *
 #  LD against hidden but not local variables
- +10ec:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x150>
+ +10ec:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	[0 0x000000000000000]
  +10f3:	e8 [0-9a-f 	]+callq  [0-9a-f]+ <.*>
 #				-> R_X86_64_JUMP_SLOT	__tls_get_addr
@@ -144,7 +144,7 @@ Disassembly of section .text:
  +1113:	00 00 *
  +1115:	90[ 	]+nop *
  +1116:	90[ 	]+nop *
- +1117:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x1a0>
+ +1117:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sg2
  +111e:	90[ 	]+nop *
  +111f:	90[ 	]+nop *
@@ -155,7 +155,7 @@ Disassembly of section .text:
  +1129:	00 00 *
  +112b:	90[ 	]+nop *
  +112c:	90[ 	]+nop *
- +112d:	4c 03 35 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%r14 +# [0-9a-f]+ <_DYNAMIC\+0x140>
+ +112d:	4c 03 35 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%r14 +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x24
  +1134:	90[ 	]+nop *
  +1135:	90[ 	]+nop *
@@ -166,7 +166,7 @@ Disassembly of section .text:
  +113f:	00 00 *
  +1141:	90[ 	]+nop *
  +1142:	90[ 	]+nop *
- +1143:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x1b8>
+ +1143:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x44
  +114a:	90[ 	]+nop *
  +114b:	90[ 	]+nop *
@@ -177,7 +177,7 @@ Disassembly of section .text:
  +1155:	00 00 *
  +1157:	90[ 	]+nop *
  +1158:	90[ 	]+nop *
- +1159:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x170>
+ +1159:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x64
  +1160:	90[ 	]+nop *
  +1161:	90[ 	]+nop *
@@ -185,7 +185,7 @@ Disassembly of section .text:
  +1163:	90[ 	]+nop *
 #  Direct access through %fs
 #  IE against global var
- +1164:	48 8b 0d ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x178>
+ +1164:	48 8b 0d ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sg5
  +116b:	90[ 	]+nop *
  +116c:	90[ 	]+nop *
@@ -195,7 +195,7 @@ Disassembly of section .text:
  +1173:	90[ 	]+nop *
  +1174:	90[ 	]+nop *
 #  IE against local var
- +1175:	4c 8b 15 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%r10 +# [0-9a-f]+ <_DYNAMIC\+0x148>
+ +1175:	4c 8b 15 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%r10 +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x30
  +117c:	90[ 	]+nop *
  +117d:	90[ 	]+nop *
@@ -205,7 +205,7 @@ Disassembly of section .text:
  +1184:	90[ 	]+nop *
  +1185:	90[ 	]+nop *
 #  IE against hidden and local var
- +1186:	48 8b 15 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rdx +# [0-9a-f]+ <_DYNAMIC\+0x190>
+ +1186:	48 8b 15 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rdx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x50
  +118d:	90[ 	]+nop *
  +118e:	90[ 	]+nop *
@@ -215,7 +215,7 @@ Disassembly of section .text:
  +1195:	90[ 	]+nop *
  +1196:	90[ 	]+nop *
 #  IE against hidden but not local var
- +1197:	48 8b 0d ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x198>
+ +1197:	48 8b 0d ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x70
  +119e:	90[ 	]+nop *
  +119f:	90[ 	]+nop *
@@ -237,7 +237,7 @@ Disassembly of section .text:
 # -mcmodel=large sequences
 #
 #  -mcmodel=large GD
- +11c2:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x180>
+ +11c2:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	sg1
  +11c9:	48 b8 ([0-9a-f]{2} ){5}[ 	]+movabs \$0x[0-9a-f]+,%rax
 #				-> R_X86_64_JUMP_SLOT	__tls_get_addr
@@ -252,7 +252,7 @@ Disassembly of section .text:
 #				-> R_X86_64_TPOFF64	sg2
  +11dc:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +11e3:	00 00 
- +11e5:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x1a0>
+ +11e5:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sg2
  +11ec:	66 0f 1f 44 00 00[ 	]+nopw   0x0\(%rax,%rax,1\)
  +11f2:	90[ 	]+nop *
@@ -260,7 +260,7 @@ Disassembly of section .text:
  +11f4:	90[ 	]+nop *
  +11f5:	90[ 	]+nop *
 #  -mcmodel=large GD against local variable
- +11f6:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x130>
+ +11f6:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	[0 0x2000000000000000]
  +11fd:	48 b8 ([0-9a-f]{2} ){5}[ 	]+movabs \$0x[0-9a-f]+,%rax
 #				-> R_X86_64_JUMP_SLOT	__tls_get_addr
@@ -274,7 +274,7 @@ Disassembly of section .text:
 #  -mcmodel=large GD -> IE against local variable referenced through IE too
  +1210:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +1217:	00 00 
- +1219:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x140>
+ +1219:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x24
  +1220:	66 0f 1f 44 00 00[ 	]+nopw   0x0\(%rax,%rax,1\)
  +1226:	90[ 	]+nop *
@@ -282,7 +282,7 @@ Disassembly of section .text:
  +1228:	90[ 	]+nop *
  +1229:	90[ 	]+nop *
 #  -mcmodel=large GD against hidden and local variable
- +122a:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x1a8>
+ +122a:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	[0 0x4000000000000000]
  +1231:	48 b8 ([0-9a-f]{2} ){5}[ 	]+movabs \$0x[0-9a-f]+,%rax
 #				-> R_X86_64_JUMP_SLOT	__tls_get_addr
@@ -296,7 +296,7 @@ Disassembly of section .text:
 #  -mcmodel=large GD -> IE against hidden and local variable referenced through IE too
  +1244:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +124b:	00 00 
- +124d:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x1b8>
+ +124d:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x44
  +1254:	66 0f 1f 44 00 00[ 	]+nopw   0x0\(%rax,%rax,1\)
  +125a:	90[ 	]+nop *
@@ -304,7 +304,7 @@ Disassembly of section .text:
  +125c:	90[ 	]+nop *
  +125d:	90[ 	]+nop *
 #  -mcmodel=large GD against hidden but not local variable
- +125e:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x160>
+ +125e:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	[0 0x6000000000000000]
  +1265:	48 b8 ([0-9a-f]{2} ){5}[ 	]+movabs \$0x[0-9a-f]+,%rax
 #				-> R_X86_64_JUMP_SLOT	__tls_get_addr
@@ -318,7 +318,7 @@ Disassembly of section .text:
 #  -mcmodel=large GD -> IE against hidden but not local variable referenced through IE too
  +1278:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +127f:	00 00 
- +1281:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x170>
+ +1281:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x64
  +1288:	66 0f 1f 44 00 00[ 	]+nopw   0x0\(%rax,%rax,1\)
  +128e:	90[ 	]+nop *
@@ -326,7 +326,7 @@ Disassembly of section .text:
  +1290:	90[ 	]+nop *
  +1291:	90[ 	]+nop *
 #  -mcmodel=large LD
- +1292:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x150>
+ +1292:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	[0 0x000000000000000]
  +1299:	48 b8 ([0-9a-f]{2} ){5}[ 	]+movabs \$0x[0-9a-f]+,%rax
 #				-> R_X86_64_JUMP_SLOT	__tls_get_addr
@@ -344,7 +344,7 @@ Disassembly of section .text:
  +12bc:	90[ 	]+nop *
  +12bd:	90[ 	]+nop *
 #  -mcmodel=large LD against hidden and local variables
- +12be:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x150>
+ +12be:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	[0 0x000000000000000]
  +12c5:	48 b8 ([0-9a-f]{2} ){5}[ 	]+movabs \$0x[0-9a-f]+,%rax
 #				-> R_X86_64_JUMP_SLOT	__tls_get_addr
@@ -362,7 +362,7 @@ Disassembly of section .text:
  +12e8:	90[ 	]+nop *
  +12e9:	90[ 	]+nop *
 #  -mcmodel=large LD against hidden but not local variables
- +12ea:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x150>
+ +12ea:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	[0 0x000000000000000]
  +12f1:	48 b8 ([0-9a-f]{2} ){5}[ 	]+movabs \$0x[0-9a-f]+,%rax
 #				-> R_X86_64_JUMP_SLOT	__tls_get_addr
diff --git a/ld/testsuite/ld-x86-64/tlspic2.dd b/ld/testsuite/ld-x86-64/tlspic2.dd
index 18358f1..596fcb4 100644
--- a/ld/testsuite/ld-x86-64/tlspic2.dd
+++ b/ld/testsuite/ld-x86-64/tlspic2.dd
@@ -17,10 +17,10 @@ Disassembly of section .text:
  +1006:	90[ 	]+nop *
  +1007:	90[ 	]+nop *
 #  GD
- +1008:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1008:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
  +100f:	[0-9a-f 	]+
 #				-> R_X86_64_DTPMOD64	sg1
- +1010:	66 48 ff [0-9a-f 	]+data16 rex\.W callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1010:	66 48 ff [0-9a-f 	]+data16 rex\.W callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
 #				-> R_X86_64_GLOB_DAT	__tls_get_addr
  +1017:	[0-9a-f 	]+
  +1018:	90[ 	]+nop *
@@ -30,17 +30,17 @@ Disassembly of section .text:
 #  GD -> IE because variable is referenced through IE too
  +101c:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +1023:	00 00 *
- +1025:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1025:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sg2
  +102c:	90[ 	]+nop *
  +102d:	90[ 	]+nop *
  +102e:	90[ 	]+nop *
  +102f:	90[ 	]+nop *
 #  GD against local variable
- +1030:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1030:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
  +1037:	[0-9a-f 	]+
 #				-> R_X86_64_DTPMOD64	[0 0x2000000000000000]
- +1038:	66 48 ff [0-9a-f 	]+data16 rex\.W callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1038:	66 48 ff [0-9a-f 	]+data16 rex\.W callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
 #				-> R_X86_64_GLOB_DAT	__tls_get_addr
  +103f:	[0-9a-f 	]+
  +1040:	90[ 	]+nop *
@@ -50,17 +50,17 @@ Disassembly of section .text:
 #  GD -> IE against local variable referenced through IE too
  +1044:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +104b:	00 00 *
- +104d:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +104d:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x24
  +1054:	90[ 	]+nop *
  +1055:	90[ 	]+nop *
  +1056:	90[ 	]+nop *
  +1057:	90[ 	]+nop *
 #  GD against hidden and local variable
- +1058:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1058:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
  +105f:	[0-9a-f 	]+
 #				-> R_X86_64_DTPMOD64	[0 0x4000000000000000]
- +1060:	66 48 ff [0-9a-f 	]+data16 rex\.W callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1060:	66 48 ff [0-9a-f 	]+data16 rex\.W callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
 #				-> R_X86_64_GLOB_DAT	__tls_get_addr
  +1067:	[0-9a-f 	]+
  +1068:	90[ 	]+nop *
@@ -70,17 +70,17 @@ Disassembly of section .text:
 #  GD -> IE against hidden and local variable referenced through IE too
  +106c:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +1073:	00 00 *
- +1075:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1075:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x44
  +107c:	90[ 	]+nop *
  +107d:	90[ 	]+nop *
  +107e:	90[ 	]+nop *
  +107f:	90[ 	]+nop *
 #  GD against hidden but not local variable
- +1080:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1080:	66 48 8d 3d ([0-9a-f]{2} ){3}[ 	]+data16 lea 0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
  +1087:	[0-9a-f 	]+
 #				-> R_X86_64_DTPMOD64	[0 0x6000000000000000]
- +1088:	66 48 ff [0-9a-f 	]+data16 rex\.W callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1088:	66 48 ff [0-9a-f 	]+data16 rex\.W callq \*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
 #				-> R_X86_64_GLOB_DAT	__tls_get_addr
  +108f:	[0-9a-f 	]+
  +1090:	90[ 	]+nop *
@@ -90,16 +90,16 @@ Disassembly of section .text:
 #  GD -> IE against hidden but not local variable referenced through IE too
  +1094:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +109b:	00 00 *
- +109d:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +109d:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x64
  +10a4:	90[ 	]+nop *
  +10a5:	90[ 	]+nop *
  +10a6:	90[ 	]+nop *
  +10a7:	90[ 	]+nop *
 #  LD
- +10a8:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +10a8:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	[0 0x000000000000000]
- +10af:	ff [0-9a-f 	]+callq[ 	]+\*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +10af:	ff [0-9a-f 	]+callq[ 	]+\*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
 #				-> R_X86_64_GLOB_DAT	__tls_get_addr
  +10b5:	90[ 	]+nop *
  +10b6:	48 8d 90 20 00 00 00[ 	]+lea    0x20\(%rax\),%rdx
@@ -111,9 +111,9 @@ Disassembly of section .text:
  +10c8:	90[ 	]+nop *
  +10c9:	90[ 	]+nop *
 #  LD against hidden and local variables
- +10ca:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +10ca:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	[0 0x000000000000000]
- +10d1:	ff [0-9a-f 	]+callq[ 	]+\*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +10d1:	ff [0-9a-f 	]+callq[ 	]+\*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
 #				-> R_X86_64_GLOB_DAT	__tls_get_addr
  +10d7:	90[ 	]+nop *
  +10d8:	48 8d 90 40 00 00 00[ 	]+lea    0x40\(%rax\),%rdx
@@ -125,9 +125,9 @@ Disassembly of section .text:
  +10ea:	90[ 	]+nop *
  +10eb:	90[ 	]+nop *
 #  LD against hidden but not local variables
- +10ec:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +10ec:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	[0 0x000000000000000]
- +10f3:	ff [0-9a-f 	]+callq[ 	]+\*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +10f3:	ff [0-9a-f 	]+callq[ 	]+\*0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <.*>
 #				-> R_X86_64_GLOB_DAT	__tls_get_addr
  +10f9:	90[ 	]+nop *
  +10fa:	4c 8d a0 60 00 00 00[ 	]+lea    0x60\(%rax\),%r12
@@ -141,7 +141,7 @@ Disassembly of section .text:
  +1113:	00 00 *
  +1115:	90[ 	]+nop *
  +1116:	90[ 	]+nop *
- +1117:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1117:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sg2
  +111e:	90[ 	]+nop *
  +111f:	90[ 	]+nop *
@@ -152,7 +152,7 @@ Disassembly of section .text:
  +1129:	00 00 *
  +112b:	90[ 	]+nop *
  +112c:	90[ 	]+nop *
- +112d:	4c 03 35 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%r14 +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +112d:	4c 03 35 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%r14 +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x24
  +1134:	90[ 	]+nop *
  +1135:	90[ 	]+nop *
@@ -163,7 +163,7 @@ Disassembly of section .text:
  +113f:	00 00 *
  +1141:	90[ 	]+nop *
  +1142:	90[ 	]+nop *
- +1143:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1143:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x44
  +114a:	90[ 	]+nop *
  +114b:	90[ 	]+nop *
@@ -174,7 +174,7 @@ Disassembly of section .text:
  +1155:	00 00 *
  +1157:	90[ 	]+nop *
  +1158:	90[ 	]+nop *
- +1159:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1159:	48 03 0d ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x64
  +1160:	90[ 	]+nop *
  +1161:	90[ 	]+nop *
@@ -182,7 +182,7 @@ Disassembly of section .text:
  +1163:	90[ 	]+nop *
 #  Direct access through %fs
 #  IE against global var
- +1164:	48 8b 0d ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1164:	48 8b 0d ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sg5
  +116b:	90[ 	]+nop *
  +116c:	90[ 	]+nop *
@@ -192,7 +192,7 @@ Disassembly of section .text:
  +1173:	90[ 	]+nop *
  +1174:	90[ 	]+nop *
 #  IE against local var
- +1175:	4c 8b 15 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%r10 +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1175:	4c 8b 15 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%r10 +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x30
  +117c:	90[ 	]+nop *
  +117d:	90[ 	]+nop *
@@ -202,7 +202,7 @@ Disassembly of section .text:
  +1184:	90[ 	]+nop *
  +1185:	90[ 	]+nop *
 #  IE against hidden and local var
- +1186:	48 8b 15 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rdx +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1186:	48 8b 15 ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rdx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x50
  +118d:	90[ 	]+nop *
  +118e:	90[ 	]+nop *
@@ -212,7 +212,7 @@ Disassembly of section .text:
  +1195:	90[ 	]+nop *
  +1196:	90[ 	]+nop *
 #  IE against hidden but not local var
- +1197:	48 8b 0d ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1197:	48 8b 0d ([0-9a-f]{2} ){4}[ 	]+mov    0x[0-9a-f]+\(%rip\),%rcx +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x70
  +119e:	90[ 	]+nop *
  +119f:	90[ 	]+nop *
@@ -232,7 +232,7 @@ Disassembly of section .text:
 # -mcmodel=large sequences
 #
 #  -mcmodel=large GD
- +11c2:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +11c2:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	sg1
  +11c9:	48 b8 ([0-9a-f]{2} ){5}[ 	]+movabs \$0x[0-9a-f]+,%rax
 #				-> R_X86_64_GLOB_DAT	__tls_get_addr
@@ -247,7 +247,7 @@ Disassembly of section .text:
 #				-> R_X86_64_TPOFF64	sg2
  +11dc:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +11e3:	00 00 
- +11e5:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +11e5:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	sg2
  +11ec:	66 0f 1f 44 00 00[ 	]+nopw   0x0\(%rax,%rax,1\)
  +11f2:	90[ 	]+nop *
@@ -255,7 +255,7 @@ Disassembly of section .text:
  +11f4:	90[ 	]+nop *
  +11f5:	90[ 	]+nop *
 #  -mcmodel=large GD against local variable
- +11f6:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +11f6:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	[0 0x2000000000000000]
  +11fd:	48 b8 ([0-9a-f]{2} ){5}[ 	]+movabs \$0x[0-9a-f]+,%rax
 #				-> R_X86_64_GLOB_DAT	__tls_get_addr
@@ -269,7 +269,7 @@ Disassembly of section .text:
 #  -mcmodel=large GD -> IE against local variable referenced through IE too
  +1210:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +1217:	00 00 
- +1219:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1219:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x24
  +1220:	66 0f 1f 44 00 00[ 	]+nopw   0x0\(%rax,%rax,1\)
  +1226:	90[ 	]+nop *
@@ -277,7 +277,7 @@ Disassembly of section .text:
  +1228:	90[ 	]+nop *
  +1229:	90[ 	]+nop *
 #  -mcmodel=large GD against hidden and local variable
- +122a:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +122a:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	[0 0x4000000000000000]
  +1231:	48 b8 ([0-9a-f]{2} ){5}[ 	]+movabs \$0x[0-9a-f]+,%rax
 #				-> R_X86_64_GLOB_DAT	__tls_get_addr
@@ -291,7 +291,7 @@ Disassembly of section .text:
 #  -mcmodel=large GD -> IE against hidden and local variable referenced through IE too
  +1244:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +124b:	00 00 
- +124d:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +124d:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x44
  +1254:	66 0f 1f 44 00 00[ 	]+nopw   0x0\(%rax,%rax,1\)
  +125a:	90[ 	]+nop *
@@ -299,7 +299,7 @@ Disassembly of section .text:
  +125c:	90[ 	]+nop *
  +125d:	90[ 	]+nop *
 #  -mcmodel=large GD against hidden but not local variable
- +125e:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +125e:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	[0 0x6000000000000000]
  +1265:	48 b8 ([0-9a-f]{2} ){5}[ 	]+movabs \$0x[0-9a-f]+,%rax
 #				-> R_X86_64_GLOB_DAT	__tls_get_addr
@@ -313,7 +313,7 @@ Disassembly of section .text:
 #  -mcmodel=large GD -> IE against hidden but not local variable referenced through IE too
  +1278:	64 48 8b 04 25 00 00[ 	]+mov    %fs:0x0,%rax
  +127f:	00 00 
- +1281:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1281:	48 03 05 ([0-9a-f]{2} ){4}[ 	]+add    0x[0-9a-f]+\(%rip\),%rax +# [0-9a-f]+ <.*>
 #				-> R_X86_64_TPOFF64	*ABS*+0x64
  +1288:	66 0f 1f 44 00 00[ 	]+nopw   0x0\(%rax,%rax,1\)
  +128e:	90[ 	]+nop *
@@ -321,7 +321,7 @@ Disassembly of section .text:
  +1290:	90[ 	]+nop *
  +1291:	90[ 	]+nop *
 #  -mcmodel=large LD
- +1292:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +1292:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	[0 0x000000000000000]
  +1299:	48 b8 ([0-9a-f]{2} ){5}[ 	]+movabs \$0x[0-9a-f]+,%rax
 #				-> R_X86_64_GLOB_DAT	__tls_get_addr
@@ -339,7 +339,7 @@ Disassembly of section .text:
  +12bc:	90[ 	]+nop *
  +12bd:	90[ 	]+nop *
 #  -mcmodel=large LD against hidden and local variables
- +12be:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +12be:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	[0 0x000000000000000]
  +12c5:	48 b8 ([0-9a-f]{2} ){5}[ 	]+movabs \$0x[0-9a-f]+,%rax
 #				-> R_X86_64_GLOB_DAT	__tls_get_addr
@@ -357,7 +357,7 @@ Disassembly of section .text:
  +12e8:	90[ 	]+nop *
  +12e9:	90[ 	]+nop *
 #  -mcmodel=large LD against hidden but not local variables
- +12ea:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <_DYNAMIC\+0x[0-9a-f]+>
+ +12ea:	48 8d 3d ([0-9a-f]{2} ){4}[ 	]+lea    0x[0-9a-f]+\(%rip\),%rdi +# [0-9a-f]+ <.*>
 #				-> R_X86_64_DTPMOD64	[0 0x000000000000000]
  +12f1:	48 b8 ([0-9a-f]{2} ){5}[ 	]+movabs \$0x[0-9a-f]+,%rax
 #				-> R_X86_64_GLOB_DAT	__tls_get_addr