From b1058ce98878654d8c19b7b6741d84615795b9a1 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 3 Jun 2016 04:10:11 -0700 Subject: [PATCH] Update x86 linker tests for --disable-x86-relax-relocations Pass -mrelax-relocations=yes to x86 linker tests, which require relax relocations, to support --disable-x86-relax-relocations. * testsuite/ld-i386/i386.exp: Assemble gotpc1.o and pr19319b.o with -mrelax-relocations=yes. * testsuite/ld-i386/lea1a.d (as): Add -mrelax-relocations=yes. * testsuite/ld-i386/lea1b.d (as): Likewise. * testsuite/ld-i386/lea1d.d (as): Likewise. * testsuite/ld-i386/lea1e.d (as): Likewise. * testsuite/ld-i386/lea1f.d (as): Likewise. * testsuite/ld-i386/load7.d (as): Likewise. * testsuite/ld-i386/mov1b.d (as): Likewise. * testsuite/ld-i386/pr19175.d (as): Likewise. * testsuite/ld-ifunc/ifunc-13-i386.d (as): Likewise. * testsuite/ld-ifunc/ifunc-21-i386.d (as): Likewise. * testsuite/ld-ifunc/ifunc-22-i386.d (as): Likewise. * testsuite/ld-x86-64/x86-64.exp: Assemble gotpcrel1a.o, gotpcrel1b.o and gotpcrel1c.o with -mrelax-relocations=yes. --- ld/ChangeLog | 18 ++++++++++++++++++ ld/testsuite/ld-i386/i386.exp | 6 +++--- ld/testsuite/ld-i386/lea1a.d | 2 +- ld/testsuite/ld-i386/lea1b.d | 2 +- ld/testsuite/ld-i386/lea1d.d | 2 +- ld/testsuite/ld-i386/lea1e.d | 2 +- ld/testsuite/ld-i386/lea1f.d | 2 +- ld/testsuite/ld-i386/load7.d | 2 +- ld/testsuite/ld-i386/mov1b.d | 2 +- ld/testsuite/ld-i386/pr19175.d | 2 +- ld/testsuite/ld-ifunc/ifunc-13-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-21-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-22-i386.d | 2 +- ld/testsuite/ld-x86-64/x86-64.exp | 8 +++----- 14 files changed, 35 insertions(+), 19 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 463f1a1fc9..60e73ac7a3 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,21 @@ +2016-06-03 H.J. Lu + + * testsuite/ld-i386/i386.exp: Assemble gotpc1.o and pr19319b.o + with -mrelax-relocations=yes. + * testsuite/ld-i386/lea1a.d (as): Add -mrelax-relocations=yes. + * testsuite/ld-i386/lea1b.d (as): Likewise. + * testsuite/ld-i386/lea1d.d (as): Likewise. + * testsuite/ld-i386/lea1e.d (as): Likewise. + * testsuite/ld-i386/lea1f.d (as): Likewise. + * testsuite/ld-i386/load7.d (as): Likewise. + * testsuite/ld-i386/mov1b.d (as): Likewise. + * testsuite/ld-i386/pr19175.d (as): Likewise. + * testsuite/ld-ifunc/ifunc-13-i386.d (as): Likewise. + * testsuite/ld-ifunc/ifunc-21-i386.d (as): Likewise. + * testsuite/ld-ifunc/ifunc-22-i386.d (as): Likewise. + * testsuite/ld-x86-64/x86-64.exp: Assemble gotpcrel1a.o, + gotpcrel1b.o and gotpcrel1c.o with -mrelax-relocations=yes. + 2016-06-02 Vineet Gupta * configure.tgt: Replace -uclibc with *. diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index 8e662806b8..d30f9fb53b 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -664,7 +664,7 @@ if { [isnative] [list \ "Build gotpc1.o" \ "-r -nostdlib" \ - "" \ + "-Wa,-mrelax-relocations=yes" \ { got1a.S got1b.c got1c.c } \ "" \ "gotpc1.o" \ @@ -672,7 +672,7 @@ if { [isnative] [list \ "Build gotpc1" \ "-Wl,--as-needed tmpdir/gotpc1.o tmpdir/got1d.so" \ - "-Wa,-mrelax-relocations=yes" \ + "" \ { dummy.s } \ {{objdump {-dw} got1.dd}} \ "got1" \ @@ -688,7 +688,7 @@ if { [isnative] [list \ "Build pr19319" \ "-pie -nostdlib -nostartfiles tmpdir/pr19319.so" \ - "" \ + "-Wa,-mrelax-relocations=yes" \ { pr19319b.S } \ {{objdump {-dw} pr19319.dd}} \ "pr19319" \ diff --git a/ld/testsuite/ld-i386/lea1a.d b/ld/testsuite/ld-i386/lea1a.d index d882522700..b84ad7fb81 100644 --- a/ld/testsuite/ld-i386/lea1a.d +++ b/ld/testsuite/ld-i386/lea1a.d @@ -1,5 +1,5 @@ #source: lea1.s -#as: --32 +#as: --32 -mrelax-relocations=yes #ld: -Bsymbolic -shared -melf_i386 #objdump: -dw diff --git a/ld/testsuite/ld-i386/lea1b.d b/ld/testsuite/ld-i386/lea1b.d index b3f6507d17..b2bc6cb856 100644 --- a/ld/testsuite/ld-i386/lea1b.d +++ b/ld/testsuite/ld-i386/lea1b.d @@ -1,5 +1,5 @@ #source: lea1.s -#as: --32 +#as: --32 -mrelax-relocations=yes #ld: -pie -melf_i386 #objdump: -dw diff --git a/ld/testsuite/ld-i386/lea1d.d b/ld/testsuite/ld-i386/lea1d.d index 7deab262d6..0b583d2cd5 100644 --- a/ld/testsuite/ld-i386/lea1d.d +++ b/ld/testsuite/ld-i386/lea1d.d @@ -1,5 +1,5 @@ #source: lea1.s -#as: --32 +#as: --32 -mrelax-relocations=yes #ld: -Bsymbolic -shared -melf_i386 #readelf: -Sw diff --git a/ld/testsuite/ld-i386/lea1e.d b/ld/testsuite/ld-i386/lea1e.d index ae669581c3..253943d5c4 100644 --- a/ld/testsuite/ld-i386/lea1e.d +++ b/ld/testsuite/ld-i386/lea1e.d @@ -1,5 +1,5 @@ #source: lea1.s -#as: --32 +#as: --32 -mrelax-relocations=yes #ld: -pie -melf_i386 #readelf: -Sw diff --git a/ld/testsuite/ld-i386/lea1f.d b/ld/testsuite/ld-i386/lea1f.d index 3c16996c64..1b773189e0 100644 --- a/ld/testsuite/ld-i386/lea1f.d +++ b/ld/testsuite/ld-i386/lea1f.d @@ -1,5 +1,5 @@ #source: lea1.s -#as: --32 +#as: --32 -mrelax-relocations=yes #ld: -melf_i386 #readelf: -Sw diff --git a/ld/testsuite/ld-i386/load7.d b/ld/testsuite/ld-i386/load7.d index 898dc3900d..47eb809f2b 100644 --- a/ld/testsuite/ld-i386/load7.d +++ b/ld/testsuite/ld-i386/load7.d @@ -1,4 +1,4 @@ -#as: --32 +#as: --32 -mrelax-relocations=yes #ld: -shared -melf_i386 --version-script load7.map #objdump: -dw diff --git a/ld/testsuite/ld-i386/mov1b.d b/ld/testsuite/ld-i386/mov1b.d index 1b7cc2fa72..aaeeb63849 100644 --- a/ld/testsuite/ld-i386/mov1b.d +++ b/ld/testsuite/ld-i386/mov1b.d @@ -1,5 +1,5 @@ #source: mov1.s -#as: --32 +#as: --32 -mrelax-relocations=yes #ld: -pie -melf_i386 --no-dynamic-linker #objdump: -dw diff --git a/ld/testsuite/ld-i386/pr19175.d b/ld/testsuite/ld-i386/pr19175.d index 3f2edb1230..aaf929f221 100644 --- a/ld/testsuite/ld-i386/pr19175.d +++ b/ld/testsuite/ld-i386/pr19175.d @@ -1,5 +1,5 @@ #source: pr19175.s -#as: --32 +#as: --32 -mrelax-relocations=yes #ld: -Bsymbolic -shared -melf_i386 -T pr19175.t #objdump: -dw diff --git a/ld/testsuite/ld-ifunc/ifunc-13-i386.d b/ld/testsuite/ld-ifunc/ifunc-13-i386.d index 746945b43c..677fa9284c 100644 --- a/ld/testsuite/ld-ifunc/ifunc-13-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-13-i386.d @@ -1,7 +1,7 @@ #source: ifunc-13a-i386.s #source: ifunc-13b-i386.s #ld: -shared -m elf_i386 -z nocombreloc -#as: --32 +#as: --32 -mrelax-relocations=yes #readelf: -r --wide #target: x86_64-*-* i?86-*-* diff --git a/ld/testsuite/ld-ifunc/ifunc-21-i386.d b/ld/testsuite/ld-ifunc/ifunc-21-i386.d index 36fcfc093e..e609dbe74a 100644 --- a/ld/testsuite/ld-ifunc/ifunc-21-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-21-i386.d @@ -1,5 +1,5 @@ #ld: -m elf_i386 -#as: --32 +#as: --32 -mrelax-relocations=yes #objdump: -dw #target: x86_64-*-* i?86-*-* diff --git a/ld/testsuite/ld-ifunc/ifunc-22-i386.d b/ld/testsuite/ld-ifunc/ifunc-22-i386.d index 36fcfc093e..e609dbe74a 100644 --- a/ld/testsuite/ld-ifunc/ifunc-22-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-22-i386.d @@ -1,5 +1,5 @@ #ld: -m elf_i386 -#as: --32 +#as: --32 -mrelax-relocations=yes #objdump: -dw #target: x86_64-*-* i?86-*-* diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 3f4d737bee..b3ceaa1c62 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -718,18 +718,16 @@ if { [isnative] && [which $CC] != 0 } { "gotpcrel1d.so" \ ] \ [list \ - "Build libgotpcrel1.a" \ - "" \ + "Build gotpcrel1a.o gotpcrel1b.o gotpcrel1c.o" \ "" \ + "-Wa,-mrelax-relocations=yes" \ { gotpcrel1a.S gotpcrel1b.c gotpcrel1c.c } \ - "" \ - "libgotpcrel1.a" \ ] \ [list \ "Build gotpcrel1" \ "-Wl,--as-needed tmpdir/gotpcrel1a.o tmpdir/gotpcrel1b.o tmpdir/gotpcrel1c.o tmpdir/gotpcrel1d.so" \ - "-Wa,-mrelax-relocations=yes" \ { dummy.s } \ + "" \ {{objdump {-dw} gotpcrel1.dd}} \ "gotpcrel1" \ ] \ -- 2.34.1