On 15 Jan 11:20, Mike Stump wrote:
> On Jan 15, 2015, at 9:53 AM, Ilya Verbin <iver...@gmail.com> wrote:
> > If I just remove 'load_gcc_lib gcc-dg.exp' from libatomic.exp, like this is
> > done
> > in libitm.exp, it will not work:
>
> Ok, original patch is fine.
Oh, I see, it's loaded by libitm/testsuite/libitm.c/c.exp, so I changed the
patch for consistency. Here is the final version, OK to commit?
PR testsuite/64605
* testsuite/lib/libatomic.exp: Do not load gcc-dg.exp.
* testsuite/libatomic.c/c.exp: Load gcc-dg.exp.
diff --git a/libatomic/testsuite/lib/libatomic.exp
b/libatomic/testsuite/lib/libatomic.exp
index 28cbaa8..0491c18 100644
--- 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
--- 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 {
-- Ilya
