Hi!
This patch fixes 'make check-target-libatomic'.
The problem is that gcc-dg.exp calls check_effective_target_lto, which calls
libatomic_target_compile. Therefore gcc-dg.exp should be loaded only after the
definition of libatomic_target_compile.
However, a similar exp file in other tree (libitm/testsuite/lib/libitm.exp)
doesn't contain any explicit 'load_gcc_lib gcc-dg.exp' at all, but it loads
gcc-dg.exp implicitly. So I'm not sure whether this patch is correct.
Could someone familiar with DejaGnu please review it?
diff --git a/libatomic/testsuite/lib/libatomic.exp
b/libatomic/testsuite/lib/libatomic.exp
index 28cbaa8..b95032a 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
@@ -219,3 +223,5 @@ proc libatomic_option_proc { option } {
return 0
}
}
+
+load_gcc_lib gcc-dg.exp
Thanks,
-- Ilya
