syscall.exp: Enabled 64-bit tests on s390x, 32-bit test to use -m31 on s390x.

2 files changed, 11 insertions, 1 deletions

diff --git a/testsuite/systemtap.syscall/ChangeLog b/testsuite/systemtap.syscall/ChangeLog
index af5e9458..3b2470a5 100644
--- a/testsuite/systemtap.syscall/ChangeLog
+++ b/testsuite/systemtap.syscall/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-24  David Wilder <dwilder@us.ibm.com>
+
+	* syscall.exp: Enabled 64-bit tests on s390, 32-bit test to use -m31
+	  on s390.
+
 2007-04-23  Martin Hunt  <hunt@redhat.com>
 
 	* clock.c (main): Ifdef SYS_time.
diff --git a/testsuite/systemtap.syscall/syscall.exp b/testsuite/systemtap.syscall/syscall.exp
index dfb6ca27..3e799933 100644
--- a/testsuite/systemtap.syscall/syscall.exp
+++ b/testsuite/systemtap.syscall/syscall.exp
@@ -13,7 +13,7 @@ proc test_procedure {} {
     # To find tcl's platform name for your machine, run the following:
     # echo "puts $::tcl_platform(machine)" | tclsh
     set do_64_bit_pass 0
-    if {$::tcl_platform(machine) == "x86_64" || $::tcl_platform(machine) == "ppc64"} {
+    if {$::tcl_platform(machine) == "x86_64" || $::tcl_platform(machine) == "ppc64" || $::tcl_platform(machine) == "s390x" } {
 	set do_64_bit_pass 1
     }
 
@@ -37,7 +37,12 @@ proc test_procedure {} {
 	}
     }
 
+    if { $::tcl_platform(machine) == "s390x" } {
+	set flags "additional_flags=-m31"
+    } else {
     set flags "additional_flags=-m32"
+    }
+
     foreach filename [lsort [glob $pattern]] {
 	set file [file tail [string range $filename 0 end-2]]
 	if {![installtest_p]} { untested $file; continue }