gnat.exp: Load gcc.exp.

	* lib/gnat.exp: Load gcc.exp.
	(gnat_target_compile): Use gcc_target_compile for *.c sources.
	* gnat.dg/sse_nolib.adb: Use dg-require-effective-target sse_runtime.

	Backport from mainline:
	2010-11-25  Eric Botcazou  <ebotcazou@adacore.com>

	* gnat.dg/loop_optimization7.adb: Remove dg-require-effective-target.
	* gnat.dg/sse_nolib.adb: Likewise.

From-SVN: r167187

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 58dc4d4271202960f15fe0d1080ee8a05dafdc52..c285812bbbadaced01992dc08dce57397c8336a9 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-26  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * lib/gnat.exp: Load gcc.exp.
+       (gnat_target_compile): Use gcc_target_compile for *.c sources.
+       * gnat.dg/sse_nolib.adb: Use dg-require-effective-target sse_runtime.
+
+       Backport from mainline:
+       2010-11-25  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gnat.dg/loop_optimization7.adb: Remove dg-require-effective-target.
+       * gnat.dg/sse_nolib.adb: Likewise.
+
 2010-11-25  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/46638

diff --git a/gcc/testsuite/gnat.dg/loop_optimization7.adb b/gcc/testsuite/gnat.dg/loop_optimization7.adb
index c6a5dc98900d6ea4064d5ee80803a91141c2c614..166839494658e67da9fa926d303b8bf1ae2164dc 100644 (file)
--- a/gcc/testsuite/gnat.dg/loop_optimization7.adb
+++ b/gcc/testsuite/gnat.dg/loop_optimization7.adb
@@ -1,7 +1,6 @@
 -- { dg-do compile }
 -- { dg-options "-O3" }
 -- { dg-options "-O3 -msse" { target i?86-*-* x86_64-*-* } }
--- { dg-require-effective-target sse } 
 
 package body Loop_Optimization7 is
 

diff --git a/gcc/testsuite/gnat.dg/sse_nolib.adb b/gcc/testsuite/gnat.dg/sse_nolib.adb
index d678b9a868b24748a069d938673808563b636889..d8d96ead39737aad9f71f2649adc417e699193f6 100644 (file)
--- a/gcc/testsuite/gnat.dg/sse_nolib.adb
+++ b/gcc/testsuite/gnat.dg/sse_nolib.adb
@@ -1,6 +1,6 @@
 --  { dg-do run { target i?86-*-* x86_64-*-* } }
 --  { dg-options "-O1 -msse" }
---  { dg-require-effective-target sse } 
+--  { dg-require-effective-target sse_runtime } 
 
 with Ada.Unchecked_Conversion;
 

diff --git a/gcc/testsuite/lib/gnat.exp b/gcc/testsuite/lib/gnat.exp
index 90db48551822b88499959c587d6b630f55cc1ac0..79fb3e6064dec181b1b5004d097aa32033e702cc 100644 (file)
--- a/gcc/testsuite/lib/gnat.exp
+++ b/gcc/testsuite/lib/gnat.exp
@@ -27,6 +27,7 @@
 load_lib libgloss.exp
 load_lib prune.exp
 load_lib gcc-defs.exp
+load_lib gcc.exp
 load_lib timeout.exp
 
 #
@@ -132,6 +133,11 @@ proc gnat_target_compile { source dest type options } {
     global gnat_libgcc_s_path
     global gnat_target_current
 
+    # dg-require-effective-target tests must be compiled as C.
+    if [ string match "*.c" $source ] then {
+       return [gcc_target_compile $source $dest $type $options]
+    }
+
     # If we detect a change of target, we need to recompute both
     # GNAT_UNDER_TEST and the appropriate RTS.
     if { $gnat_target_current!="[current_target_name]" } {