2008-02-18 H.J. Lu <hongjiu.lu@intel.com>

	* cfi/cfi.exp (gas_x86_64_check): New.
	(gas_x86_32_check): Likewise.
	Run 32bit and 64bit tests for x86 targets if they are supportd.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index d973db729141ba1a1a3131d20d0dece0ce52c9ca..fb46a2727f8d9dc7b4134d64c42de3726e6dbb32 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * cfi/cfi.exp (gas_x86_64_check): New.
+       (gas_x86_32_check): Likewise.
+       Run 32bit and 64bit tests for x86 targets if they are supportd.
+
 2008-02-18  Jan Beulich  <jbeulich@novell.com>
 
        * gas/i386/att-regs.s, gas/i386/att-regs.d,

diff --git a/gas/testsuite/gas/cfi/cfi.exp b/gas/testsuite/gas/cfi/cfi.exp
index 593c8ff4e6b05c10abbe3e369f4e2cc547004db2..68290da9a7ed23a4c49f34a9464710bac809f83c 100644 (file)
--- a/gas/testsuite/gas/cfi/cfi.exp
+++ b/gas/testsuite/gas/cfi/cfi.exp
@@ -2,11 +2,38 @@ if ![is_elf_format] then {
     return
 }
 
-if [istarget "x86_64-*"] then {
-    run_dump_test "cfi-x86_64"
+proc gas_x86_64_check { } {
+    global NM
+    global NMFLAGS
+
+    set status [gas_host_run "$NM $NMFLAGS --help" ""]
+    return [regexp "targets:.*x86-64" [lindex $status 1]];
+}
+
+proc gas_x86_32_check { } {
+    global NM
+    global NMFLAGS
 
-} elseif [istarget "i?86-*"] then {
-    run_dump_test "cfi-i386"
+    set status [gas_host_run "$NM $NMFLAGS --help" ""]
+    return [regexp "targets:.*i386" [lindex $status 1]];
+}
+
+if  { [istarget "i*86-*-*"] || [istarget "x86_64-*-*"] } then {
+
+    global ASFLAGS
+    set old_ASFLAGS "$ASFLAGS"
+
+    if { [gas_x86_64_check] } then {
+       set ASFLAGS "$ASFLAGS --64"
+       run_dump_test "cfi-x86_64"
+       set ASFLAGS "$old_ASFLAGS"
+    }
+
+    if { [gas_x86_32_check] }  then {
+       set ASFLAGS "$ASFLAGS --32"
+       run_dump_test "cfi-i386"
+       set ASFLAGS "$old_ASFLAGS"
+    }
 
 } elseif { [istarget alpha*-*-*] } then {
     run_dump_test "cfi-alpha-1"