This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
linux-gnu strikes again
- From: Alan Modra <amodra at gmail dot com>
- To: binutils at sourceware dot org
- Date: Thu, 18 Nov 2010 17:32:18 +1030
- Subject: linux-gnu strikes again
Fixes failures on i386-linuxaout introduced by the 2010-11-08 addition
of *-*-gnu* to many linux tests, and tidies a few other places.
* ld-elf/binutils.exp: Correct x86 gnu target match.
* ld-i386/i386.exp: Likewise.
* ld-ifunc/binutils.exp: Likewise.
* ld-ifunc/ifunc.exp: Likewise.
* ld-discard/discard.exp: Remove unnecessary line continuations.
* ld-elfvers/vers.exp: Likewise. Simplify linuxaout and linuxoldld
test.
* ld-elfweak/elfweak.exp: Likewise.
Index: ld/testsuite/ld-discard/discard.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-discard/discard.exp,v
retrieving revision 1.10
diff -u -p -r1.10 discard.exp
--- ld/testsuite/ld-discard/discard.exp 8 Nov 2010 06:43:36 -0000 1.10
+++ ld/testsuite/ld-discard/discard.exp 18 Nov 2010 04:20:20 -0000
@@ -25,14 +25,14 @@
# Test for ELF here, so we don't have to qualify on ELF specifically
# in every .d-file.
-if { ![istarget *-*-linux*] \
- && ![istarget *-*-gnu*] \
- && ![istarget hppa*64*-*-hpux*] \
+if { ![istarget *-*-linux*]
+ && ![istarget *-*-gnu*]
+ && ![istarget hppa*64*-*-hpux*]
&& ![istarget *-*-elf] } {
return
}
-if { [istarget *-*-linux*aout*] \
+if { [istarget *-*-linux*aout*]
|| [istarget *-*-linux*oldld*] } {
return
}
Index: ld/testsuite/ld-elf/binutils.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elf/binutils.exp,v
retrieving revision 1.12
diff -u -p -r1.12 binutils.exp
--- ld/testsuite/ld-elf/binutils.exp 8 Nov 2010 06:43:36 -0000 1.12
+++ ld/testsuite/ld-elf/binutils.exp 18 Nov 2010 04:20:20 -0000
@@ -109,10 +109,10 @@ binutils_test strip "-z relro -shared" r
binutils_test objcopy "-z relro" relro1
binutils_test objcopy "-z relro -shared" relro1
if { ([istarget "i?86-*-elf*"]
- || ([istarget "i?86-*-linux*"]
+ || (([istarget "i?86-*-linux*"]
+ || [istarget "i?86-*-gnu*"])
&& ![istarget "*-*-*aout*"]
&& ![istarget "*-*-*oldld*"])
- || [istarget "i?86-*-gnu*"]
|| [istarget "x86_64-*-linux*"]
|| [istarget "amd64-*-linux*"]) } {
binutils_test strip "-z relro -shared" relro2
Index: ld/testsuite/ld-elfvers/vers.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers.exp,v
retrieving revision 1.50
diff -u -p -r1.50 vers.exp
--- ld/testsuite/ld-elfvers/vers.exp 8 Nov 2010 06:43:37 -0000 1.50
+++ ld/testsuite/ld-elfvers/vers.exp 18 Nov 2010 04:20:21 -0000
@@ -29,35 +29,34 @@ if ![isnative] then {return}
# This test can only be run on a couple of ELF platforms.
# Square bracket expressions seem to confuse istarget.
# This is similar to the test that is used in ld-shared, BTW.
-if { ![istarget hppa*64*-*-hpux*] \
- && ![istarget hppa*-*-linux*] \
- && ![istarget i?86-*-sysv4*] \
- && ![istarget i?86-*-unixware] \
- && ![istarget i?86-*-elf*] \
- && ![istarget i?86-*-linux*] \
- && ![istarget i?86-*-gnu*] \
- && ![istarget ia64-*-elf*] \
- && ![istarget ia64-*-linux*] \
- && ![istarget m68k-*-linux*] \
- && ![istarget mips*-*-irix5*] \
- && ![istarget powerpc*-*-elf*] \
- && ![istarget powerpc*-*-linux*] \
- && ![istarget powerpc*-*-sysv4*] \
- && ![istarget sparc*-*-elf] \
- && ![istarget sparc*-*-solaris2*] \
- && ![istarget sparc*-*-linux*] \
- && ![istarget arm*-*-linux*] \
- && ![istarget mips*-*-linux*] \
- && ![istarget alpha*-*-linux*] \
- && ![istarget s390*-*-linux*] \
- && ![istarget sh\[34\]*-*-linux*] \
+if { ![istarget hppa*64*-*-hpux*]
+ && ![istarget hppa*-*-linux*]
+ && ![istarget i?86-*-sysv4*]
+ && ![istarget i?86-*-unixware]
+ && ![istarget i?86-*-elf*]
+ && ![istarget i?86-*-linux*]
+ && ![istarget i?86-*-gnu*]
+ && ![istarget ia64-*-elf*]
+ && ![istarget ia64-*-linux*]
+ && ![istarget m68k-*-linux*]
+ && ![istarget mips*-*-irix5*]
+ && ![istarget powerpc*-*-elf*]
+ && ![istarget powerpc*-*-linux*]
+ && ![istarget powerpc*-*-sysv4*]
+ && ![istarget sparc*-*-elf]
+ && ![istarget sparc*-*-solaris2*]
+ && ![istarget sparc*-*-linux*]
+ && ![istarget arm*-*-linux*]
+ && ![istarget mips*-*-linux*]
+ && ![istarget alpha*-*-linux*]
+ && ![istarget s390*-*-linux*]
+ && ![istarget sh\[34\]*-*-linux*]
&& ![istarget x86_64-*-linux*] } {
return
}
-if { [istarget i?86-*-linux*aout*] \
- || [istarget i?86-*-linux*oldld*] \
- || [istarget m68k-*-linux*aout*] } {
+if { [istarget *-*-linux*aout*]
+ || [istarget *-*-linux*oldld*] } {
return
}
@@ -84,9 +83,9 @@ if [istarget mips*-*-*] {
catch "exec $CC $picflag" exec_output
send_log "$exec_output\n"
verbose "--" "$exec_output"
- if { [string match "*illegal option*" $exec_output] \
- || [string match "*option ignored*" $exec_output] \
- || [string match "*unrecognized option*" $exec_output] \
+ if { [string match "*illegal option*" $exec_output]
+ || [string match "*option ignored*" $exec_output]
+ || [string match "*unrecognized option*" $exec_output]
|| [string match "*passed to ld*" $exec_output] } {
if [istarget *-*-sunos4*] {
set picflag "-pic"
Index: ld/testsuite/ld-elfweak/elfweak.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfweak/elfweak.exp,v
retrieving revision 1.16
diff -u -p -r1.16 elfweak.exp
--- ld/testsuite/ld-elfweak/elfweak.exp 8 Nov 2010 06:43:37 -0000 1.16
+++ ld/testsuite/ld-elfweak/elfweak.exp 18 Nov 2010 04:20:21 -0000
@@ -29,33 +29,32 @@ if ![isnative] then {return}
# This test can only be run on a couple of ELF platforms.
# Square bracket expressions seem to confuse istarget.
# This is similar to the test that is used in ld-shared, BTW.
-if { ![istarget alpha*-*-linux*] \
- && ![istarget arm*-*-linux*] \
- && ![istarget hppa*64*-*-hpux*] \
- && ![istarget hppa*-*-linux*] \
- && ![istarget i?86-*-sysv4*] \
- && ![istarget i?86-*-unixware] \
- && ![istarget i?86-*-elf*] \
- && ![istarget i?86-*-linux*] \
- && ![istarget i?86-*-gnu*] \
- && ![istarget ia64-*-elf*] \
- && ![istarget ia64-*-linux*] \
- && ![istarget m68k-*-linux*] \
- && ![istarget mips*-*-irix5*] \
- && ![istarget mips*-*-linux*] \
- && ![istarget powerpc*-*-elf*] \
- && ![istarget powerpc*-*-linux*] \
- && ![istarget powerpc*-*-sysv4*] \
- && ![istarget sh\[34\]*-*-linux*] \
- && ![istarget sparc*-*-elf] \
- && ![istarget sparc*-*-solaris2*] \
+if { ![istarget alpha*-*-linux*]
+ && ![istarget arm*-*-linux*]
+ && ![istarget hppa*64*-*-hpux*]
+ && ![istarget hppa*-*-linux*]
+ && ![istarget i?86-*-sysv4*]
+ && ![istarget i?86-*-unixware]
+ && ![istarget i?86-*-elf*]
+ && ![istarget i?86-*-linux*]
+ && ![istarget i?86-*-gnu*]
+ && ![istarget ia64-*-elf*]
+ && ![istarget ia64-*-linux*]
+ && ![istarget m68k-*-linux*]
+ && ![istarget mips*-*-irix5*]
+ && ![istarget mips*-*-linux*]
+ && ![istarget powerpc*-*-elf*]
+ && ![istarget powerpc*-*-linux*]
+ && ![istarget powerpc*-*-sysv4*]
+ && ![istarget sh\[34\]*-*-linux*]
+ && ![istarget sparc*-*-elf]
+ && ![istarget sparc*-*-solaris2*]
&& ![istarget sparc*-*-linux*] } {
return
}
-if { [istarget i?86-*-linux*aout*] \
- || [istarget i?86-*-linux*oldld*] \
- || [istarget m68k-*-linux*aout*] } {
+if { [istarget *-*-linux*aout*]
+ || [istarget *-*-linux*oldld*] } {
return
}
@@ -304,7 +303,7 @@ proc build_lib {test libname objs dynsym
return
}
- if {![string match "" $dynsymexp] \
+ if {![string match "" $dynsymexp]
&& ![objdump_dynsymstuff $objdump $tmpdir/$libname.so $srcdir/$subdir/$dynsymexp]} {
fail $test
return
@@ -382,9 +381,9 @@ if [istarget mips*-*-*] {
catch "exec $CC $picflag" exec_output
send_log "$exec_output\n"
verbose "--" "$exec_output"
- if { [string match "*illegal option*" $exec_output] \
- || [string match "*option ignored*" $exec_output] \
- || [string match "*unrecognized option*" $exec_output] \
+ if { [string match "*illegal option*" $exec_output]
+ || [string match "*option ignored*" $exec_output]
+ || [string match "*unrecognized option*" $exec_output]
|| [string match "*passed to ld*" $exec_output] } {
if [istarget *-*-sunos4*] {
set picflag "-pic"
Index: ld/testsuite/ld-i386/i386.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-i386/i386.exp,v
retrieving revision 1.34
diff -u -p -r1.34 i386.exp
--- ld/testsuite/ld-i386/i386.exp 8 Nov 2010 06:43:38 -0000 1.34
+++ ld/testsuite/ld-i386/i386.exp 18 Nov 2010 04:20:21 -0000
@@ -99,10 +99,10 @@ if [istarget "*-*-go32*"] {
}
if { !([istarget "i?86-*-elf*"]
- || ([istarget "i?86-*-linux*"]
+ || (([istarget "i?86-*-linux*"]
+ || [istarget "i?86-*-gnu*"])
&& ![istarget "*-*-*aout*"]
&& ![istarget "*-*-*oldld*"])
- || [istarget "i?86-*-gnu*"]
|| [istarget "x86_64-*-linux*"]
|| [istarget "amd64-*-linux*"]) } {
return
Index: ld/testsuite/ld-ifunc/binutils.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-ifunc/binutils.exp,v
retrieving revision 1.2
diff -u -p -r1.2 binutils.exp
--- ld/testsuite/ld-ifunc/binutils.exp 8 Nov 2010 06:43:38 -0000 1.2
+++ ld/testsuite/ld-ifunc/binutils.exp 18 Nov 2010 04:20:21 -0000
@@ -25,10 +25,10 @@
# STT_GNU_IFUNC symbols.
if { !([istarget "i?86-*-elf*"]
- || ([istarget "i?86-*-linux*"]
+ || (([istarget "i?86-*-linux*"]
+ || [istarget "i?86-*-gnu*"])
&& ![istarget "*-*-*aout*"]
&& ![istarget "*-*-*oldld*"])
- || [istarget "i?86-*-gnu*"]
|| [istarget "x86_64-*-linux*"]
|| [istarget "amd64-*-linux*"]) } {
return
Index: ld/testsuite/ld-ifunc/ifunc.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-ifunc/ifunc.exp,v
retrieving revision 1.10
diff -u -p -r1.10 ifunc.exp
--- ld/testsuite/ld-ifunc/ifunc.exp 8 Nov 2010 06:43:39 -0000 1.10
+++ ld/testsuite/ld-ifunc/ifunc.exp 18 Nov 2010 04:20:21 -0000
@@ -30,10 +30,10 @@ if {!(([istarget "i?86-*-*"]
|| [istarget "powerpc*-*-*"]
|| [istarget "sparc*-*-*"])
&& ([istarget "*-*-elf*"]
- || ([istarget "*-*-linux*"]
+ || (([istarget "*-*-linux*"]
+ || [istarget "*-*-gnu*"])
&& ![istarget "*-*-*aout*"]
- && ![istarget "*-*-*oldld*"])
- || ([istarget "*-*-gnu*"]))) } {
+ && ![istarget "*-*-*oldld*"]))) } {
verbose "IFUNC tests not run - target does not support IFUNC"
return
}
--
Alan Modra
Australia Development Lab, IBM