diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-08-08 20:20:43 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-09-18 13:39:23 -0700 |
| commit | 00109687cb48c33965afbc6d821f3f0e3fec365c (patch) | |
| tree | 2b202d333169ac743b4be1793b6258c5f401798a | |
| parent | e6ff33ca50c1180725dde11c84ee93fcdb4235ef (diff) | |
| download | binutils-gdb-00109687cb48c33965afbc6d821f3f0e3fec365c.tar.gz | |
ld: Require GCC 5 or above for 3 x86 tests
Require GCC 5 or above for 3 x86 tests which fail with GCC 4.9.3.
PR ld/21924
* testsuite/ld-i386/i386.exp: Require GCC 5 or above for
"weakundef1 with PIE" test.
* testsuite/ld-x86-64/tls.exp: Require GCC 5 or above for
"tlsdesc1" and "tlsdesc1 with PIE" tests.
(cherry picked from commit 25d28c91b89d8f4a7e78b98b01e2c2382cea3e60)
| -rw-r--r-- | ld/ChangeLog | 8 | ||||
| -rw-r--r-- | ld/testsuite/ld-i386/i386.exp | 22 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/tls.exp | 41 |
3 files changed, 44 insertions, 27 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 406e72c1125..552f7067be7 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,11 @@ +2017-09-18 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/21924 + * testsuite/ld-i386/i386.exp: Require GCC 5 or above for + "weakundef1 with PIE" test. + * testsuite/ld-x86-64/tls.exp: Require GCC 5 or above for + "tlsdesc1" and "tlsdesc1 with PIE" tests. + 2017-09-15 Nick Clifton <nickc@redhat.com> 2.29.1 Release diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index 1734d67a37f..1a35a572b23 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -1251,16 +1251,20 @@ if { [isnative] "pass.out" \ "$NOPIE_CFLAGS" \ ] \ - [list \ - "Run weakundef1 with PIE" \ - "-pie" \ - "" \ - { weakundef1.c } \ - "weakundef1pie" \ - "pass.out" \ - "-fPIE" \ - ] \ ] + if { [at_least_gcc_version 5 0] } { + run_ld_link_exec_tests [list \ + [list \ + "Run weakundef1 with PIE" \ + "-pie" \ + "" \ + { weakundef1.c } \ + "weakundef1pie" \ + "pass.out" \ + "-fPIE" \ + ] \ + ] + } } if { !([istarget "i?86-*-linux*"] diff --git a/ld/testsuite/ld-x86-64/tls.exp b/ld/testsuite/ld-x86-64/tls.exp index 4263d95bd1b..7896451c014 100644 --- a/ld/testsuite/ld-x86-64/tls.exp +++ b/ld/testsuite/ld-x86-64/tls.exp @@ -206,17 +206,31 @@ if { ![check_gnu2_tls_available] } { return } +if { [at_least_gcc_version 5 0] } { + run_ld_link_exec_tests [list \ + [list \ + "Run tlsdesc1" \ + "-Wl,--no-as-needed tmpdir/libtlsdesc1.so" \ + "" \ + { tlsdesc1a.c } \ + "tlsdesc1a" \ + "pass.out" \ + "$GNU2_CFLAGS" \ + ] \ + [list \ + "Run tlsdesc1 with PIE" \ + "-pie -Wl,--no-as-needed tmpdir/libtlsdesc1.so" \ + "" \ + { tlsdesc1a.c } \ + "tlsdesc1c" \ + "pass.out" \ + "-fPIE $GNU2_CFLAGS" \ + ] \ + ] +} + run_ld_link_exec_tests [list \ [list \ - "Run tlsdesc1" \ - "-Wl,--no-as-needed tmpdir/libtlsdesc1.so" \ - "" \ - { tlsdesc1a.c } \ - "tlsdesc1a" \ - "pass.out" \ - "$GNU2_CFLAGS" \ - ] \ - [list \ "Run tlsdesc1 (-z now)" \ "-Wl,-z,now -Wl,--no-as-needed tmpdir/libtlsdesc1n.so" \ "" \ @@ -226,15 +240,6 @@ run_ld_link_exec_tests [list \ "$GNU2_CFLAGS" \ ] \ [list \ - "Run tlsdesc1 with PIE" \ - "-pie -Wl,--no-as-needed tmpdir/libtlsdesc1.so" \ - "" \ - { tlsdesc1a.c } \ - "tlsdesc1c" \ - "pass.out" \ - "-fPIE $GNU2_CFLAGS" \ - ] \ - [list \ "Run tlsdesc1 with PIE (-z now)" \ "-pie -Wl,-z,now -Wl,--no-as-needed tmpdir/libtlsdesc1n.so" \ "" \ |