PR testsuite/64605

libatomic/
	* testsuite/lib/libatomic.exp: Do not load gcc-dg.exp.
	* testsuite/libatomic.c/c.exp: Load gcc-dg.exp.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@219722 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog
index b0c72d3..ef5b6cd 100644 (file)
--- a/libatomic/ChangeLog
+++ b/libatomic/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-16  Ilya Verbin  <ilya.verbin@intel.com>
+
+       PR testsuite/64605
+       * testsuite/lib/libatomic.exp: Do not load gcc-dg.exp.
+       * testsuite/libatomic.c/c.exp: Load gcc-dg.exp.
+
 2015-01-09  Andreas Tobler  <andreast@gcc.gnu.org>
 
        * configure.tgt: Exclude arm*-*-freebsd* from try_ifunc.

diff --git a/libatomic/testsuite/lib/libatomic.exp b/libatomic/testsuite/lib/libatomic.exp
index 28cbaa8..0491c18 100644 (file)
--- a/libatomic/testsuite/lib/libatomic.exp
+++ b/libatomic/testsuite/lib/libatomic.exp
@@ -23,6 +23,11 @@ proc load_gcc_lib { filename } {
 }
 
 load_lib dg.exp
+
+# Required to use gcc-dg.exp - however, the latter should NOT be
+# loaded until ${tool}_target_compile is defined since it uses that
+# to determine default LTO options.
+
 load_gcc_lib file-format.exp
 load_gcc_lib target-supports.exp
 load_gcc_lib target-utils.exp
@@ -40,7 +45,6 @@ load_gcc_lib torture-options.exp
 load_gcc_lib timeout.exp
 load_gcc_lib timeout-dg.exp
 load_gcc_lib fortran-modules.exp
-load_gcc_lib gcc-dg.exp
 
 set dg-do-what-default run
 

diff --git a/libatomic/testsuite/libatomic.c/c.exp b/libatomic/testsuite/libatomic.c/c.exp
index 1da3cb1..dbdb5eb 100644 (file)
--- a/libatomic/testsuite/libatomic.c/c.exp
+++ b/libatomic/testsuite/libatomic.c/c.exp
@@ -21,6 +21,7 @@ if [info exists lang_test_file] then {
 }
 
 load_lib libatomic-dg.exp
+load_gcc_lib gcc-dg.exp
 
 # If a testcase doesn't have special options, use these.
 if ![info exists DEFAULT_CFLAGS] then {