Make compiler options in dejagnu runs compiler specific

diff --git a/ChangeLog b/ChangeLog
index 163197c673281cceefdaadfbf2c6441cbe446568..7719a488fe245430778239542113bfffd16b2131 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-01-08  Anthony Green  <green@moxielogic.com>
+
+       * testsuite/libffi.call/call.exp: Run tests with different
+       options, depending on whether or not we are using gcc or the
+       vendor compiler.
+       * testsuite/lib/libffi.exp (libffi-init): Set using_gcc based on
+       whether or not we are building/testing with gcc.
+
 2013-01-08  Anthony Green  <green@moxielogic.com>
 
        * configure.ac: Switch x86 solaris target to X86 by default.

diff --git a/testsuite/lib/libffi.exp b/testsuite/lib/libffi.exp
index 8ee3f1509fcb80e1ef97bd4e82e950fc9bacf10f..1ac2c36088725e6bffaa1f4ab9e80de67b46b5b6 100644 (file)
--- a/testsuite/lib/libffi.exp
+++ b/testsuite/lib/libffi.exp
@@ -101,9 +101,17 @@ proc libffi-init { args } {
     global tool_root_dir
     global ld_library_path
 
+    global using_gcc
+
     set blddirffi [pwd]/.. 
     verbose "libffi $blddirffi"
 
+    # Are we building with GCC?
+    set tmp [grep ../config.status "GCC='yes'"]
+    if { [string match $tmp "GCC='yes'"] } {
+
+      set using_gcc "yes"
+
     set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a]
     if {$gccdir != ""} {
        set gccdir [file dirname $gccdir]
@@ -127,6 +135,13 @@ proc libffi-init { args } {
            }
        }
     }
+ 
+    } else {
+
+      set using_gcc "no"
+
+    }
+
     # add the library path for libffi.
     append ld_library_path ":${blddirffi}/.libs"
 

diff --git a/testsuite/libffi.call/call.exp b/testsuite/libffi.call/call.exp
index 26acd813c01f6ea528422a1b1cf36277511ecc67..c3346850a96b59afd492e93eb2acdae222c19395 100644 (file)
--- a/testsuite/libffi.call/call.exp
+++ b/testsuite/libffi.call/call.exp
@@ -19,11 +19,20 @@ libffi-init
 
 global srcdir subdir
 
-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "-O0 -W -Wall" ""
-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "-O2" ""
-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "-O3" ""
-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "-Os" ""
-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "-O2 -fomit-frame-pointer" ""
+if { [string match $using_gcc "yes"] } {
+
+  dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "-O0 -W -Wall" ""
+  dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "-O2" ""
+  dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "-O3" ""
+  dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "-Os" ""
+  dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "-O2 -fomit-frame-pointer" ""
+ 
+} else { 
+
+  # Assume we are using the vendor compiler.
+  dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "" ""
+
+}
 
 dg-finish