aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/testsuite/ChangeLog9
-rw-r--r--gas/testsuite/gas/i386/ilp32/cfi/ilp32.exp10
-rw-r--r--gas/testsuite/gas/i386/ilp32/elf/ilp32.exp10
-rw-r--r--gas/testsuite/gas/i386/ilp32/ilp32.exp10
-rw-r--r--gas/testsuite/gas/i386/ilp32/lns/ilp32.exp10
5 files changed, 21 insertions, 28 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 735e0b4..89a2f7f 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,14 @@
2012-08-24 H.J. Lu <hongjiu.lu@intel.com>
+ * gas/i386/ilp32/ilp32.exp (gas_64_check): Renamed to ...
+ (gas_x32_check): This. Check elf32-x86-64.
+ Remove Solaris check.
+ * gas/i386/ilp32/cfi/ilp32.exp: Likewise.
+ * gas/i386/ilp32/elf/ilp32.exp: Likewise.
+ * gas/i386/ilp32/lns/ilp32.exp: Likewise.
+
+2012-08-24 H.J. Lu <hongjiu.lu@intel.com>
+
* gas/i386/ilp32/ilp32.exp: Skip Solaris.
* gas/i386/ilp32/cfi/ilp32.exp: Likewise.
* gas/i386/ilp32/elf/ilp32.exp: Likewise.
diff --git a/gas/testsuite/gas/i386/ilp32/cfi/ilp32.exp b/gas/testsuite/gas/i386/ilp32/cfi/ilp32.exp
index 3a6dbd5..96e9b78 100644
--- a/gas/testsuite/gas/i386/ilp32/cfi/ilp32.exp
+++ b/gas/testsuite/gas/i386/ilp32/cfi/ilp32.exp
@@ -1,19 +1,15 @@
#
# x86-64 ILP32 tests
#
-proc gas_64_check { } {
+proc gas_x32_check { } {
global NM
global NMFLAGS
set status [gas_host_run "$NM $NMFLAGS --help" ""]
- return [regexp "targets:.*x86-64" [lindex $status 1]];
+ return [regexp "targets:.*elf32-x86-64" [lindex $status 1]];
}
-if [expr [istarget "i*86-*-solaris*"] || [istarget "x86_64-*-solaris*"]] then {
- return
-}
-
-if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] && [is_elf_format]] then {
+if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_x32_check] && [is_elf_format]] then {
global ASFLAGS
set old_ASFLAGS "$ASFLAGS"
diff --git a/gas/testsuite/gas/i386/ilp32/elf/ilp32.exp b/gas/testsuite/gas/i386/ilp32/elf/ilp32.exp
index 3a6dbd5..96e9b78 100644
--- a/gas/testsuite/gas/i386/ilp32/elf/ilp32.exp
+++ b/gas/testsuite/gas/i386/ilp32/elf/ilp32.exp
@@ -1,19 +1,15 @@
#
# x86-64 ILP32 tests
#
-proc gas_64_check { } {
+proc gas_x32_check { } {
global NM
global NMFLAGS
set status [gas_host_run "$NM $NMFLAGS --help" ""]
- return [regexp "targets:.*x86-64" [lindex $status 1]];
+ return [regexp "targets:.*elf32-x86-64" [lindex $status 1]];
}
-if [expr [istarget "i*86-*-solaris*"] || [istarget "x86_64-*-solaris*"]] then {
- return
-}
-
-if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] && [is_elf_format]] then {
+if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_x32_check] && [is_elf_format]] then {
global ASFLAGS
set old_ASFLAGS "$ASFLAGS"
diff --git a/gas/testsuite/gas/i386/ilp32/ilp32.exp b/gas/testsuite/gas/i386/ilp32/ilp32.exp
index 5197022..e2ec85c 100644
--- a/gas/testsuite/gas/i386/ilp32/ilp32.exp
+++ b/gas/testsuite/gas/i386/ilp32/ilp32.exp
@@ -1,19 +1,15 @@
#
# x86-64 ILP32 tests
#
-proc gas_64_check { } {
+proc gas_x32_check { } {
global NM
global NMFLAGS
set status [gas_host_run "$NM $NMFLAGS --help" ""]
- return [regexp "targets:.*x86-64" [lindex $status 1]];
+ return [regexp "targets:.*elf32-x86-64" [lindex $status 1]];
}
-if [expr [istarget "i*86-*-solaris*"] || [istarget "x86_64-*-solaris*"]] then {
- return
-}
-
-if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] && [is_elf_format]] then {
+if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_x32_check] && [is_elf_format]] then {
global ASFLAGS
set old_ASFLAGS "$ASFLAGS"
diff --git a/gas/testsuite/gas/i386/ilp32/lns/ilp32.exp b/gas/testsuite/gas/i386/ilp32/lns/ilp32.exp
index 3a6dbd5..96e9b78 100644
--- a/gas/testsuite/gas/i386/ilp32/lns/ilp32.exp
+++ b/gas/testsuite/gas/i386/ilp32/lns/ilp32.exp
@@ -1,19 +1,15 @@
#
# x86-64 ILP32 tests
#
-proc gas_64_check { } {
+proc gas_x32_check { } {
global NM
global NMFLAGS
set status [gas_host_run "$NM $NMFLAGS --help" ""]
- return [regexp "targets:.*x86-64" [lindex $status 1]];
+ return [regexp "targets:.*elf32-x86-64" [lindex $status 1]];
}
-if [expr [istarget "i*86-*-solaris*"] || [istarget "x86_64-*-solaris*"]] then {
- return
-}
-
-if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] && [is_elf_format]] then {
+if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_x32_check] && [is_elf_format]] then {
global ASFLAGS
set old_ASFLAGS "$ASFLAGS"