From 6c84d5762f1e1a60b1d4cee0caf8b4e7e0ba5f6f Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@codesourcery.com>
Date: Thu, 20 Jun 2013 16:44:23 +0000
Subject: [PATCH] libitm.exp: Reorder lib loads into dependency order.
2013-06-20 Iain Sandoe <iain@codesourcery.com>
Cesar Philippidis <cesar@codesourcery.com>
* testsuite/lib/libitm.exp: Reorder lib loads into dependency order.
Do not load_gcc_lib gcc-dg.exp and add a comment as to why.
* testsuite/libitm.c/c.exp: load_gcc_lib gcc-dg.exp.
* testsuite/libitm.c++/c++.exp: load_gcc_lib gcc-dg.exp.
Co-Authored-By: Cesar Philippidis <cesar@codesourcery.com>
From-SVN: r200252
---
libitm/ChangeLog | 8 ++++++++
libitm/testsuite/lib/libitm.exp | 20 ++++++++++++--------
libitm/testsuite/libitm.c++/c++.exp | 1 +
libitm/testsuite/libitm.c/c.exp | 1 +
4 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index 81e5b6f447ba..247886aaac27 100644
--- a/libitm/ChangeLog
+++ b/libitm/ChangeLog
@@ -1,3 +1,11 @@
+2013-06-20 Iain Sandoe <iain@codesourcery.com>
+ Cesar Philippidis <cesar@codesourcery.com>
+
+ * testsuite/lib/libitm.exp: Reorder lib loads into dependency order.
+ Do not load_gcc_lib gcc-dg.exp and add a comment as to why.
+ * testsuite/libitm.c/c.exp: load_gcc_lib gcc-dg.exp.
+ * testsuite/libitm.c++/c++.exp: load_gcc_lib gcc-dg.exp.
+
2013-06-20 Torvald Riegel <triegel@redhat.com>
* query.cc (_ITM_inTransaction): Abort when using the HTM fastpath.
diff --git a/libitm/testsuite/lib/libitm.exp b/libitm/testsuite/lib/libitm.exp
index f322ed5d0c26..669ed904327d 100644
--- a/libitm/testsuite/lib/libitm.exp
+++ b/libitm/testsuite/lib/libitm.exp
@@ -23,23 +23,27 @@ proc load_gcc_lib { filename } {
}
load_lib dg.exp
-load_gcc_lib file-format.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 prune.exp
+load_gcc_lib target-libpath.exp
+load_gcc_lib wrapper.exp
+load_gcc_lib gcc-defs.exp
+load_gcc_lib timeout.exp
load_gcc_lib target-supports.exp
+load_gcc_lib file-format.exp
load_gcc_lib target-supports-dg.exp
load_gcc_lib scanasm.exp
load_gcc_lib scandump.exp
load_gcc_lib scanrtl.exp
load_gcc_lib scantree.exp
load_gcc_lib scanipa.exp
-load_gcc_lib prune.exp
-load_gcc_lib target-libpath.exp
-load_gcc_lib wrapper.exp
-load_gcc_lib gcc-defs.exp
-load_gcc_lib torture-options.exp
-load_gcc_lib timeout.exp
load_gcc_lib timeout-dg.exp
+load_gcc_lib torture-options.exp
load_gcc_lib fortran-modules.exp
-load_gcc_lib gcc-dg.exp
set dg-do-what-default run
diff --git a/libitm/testsuite/libitm.c++/c++.exp b/libitm/testsuite/libitm.c++/c++.exp
index 2386e0e3cadd..31b3b64756ba 100644
--- a/libitm/testsuite/libitm.c++/c++.exp
+++ b/libitm/testsuite/libitm.c++/c++.exp
@@ -15,6 +15,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
load_lib libitm-dg.exp
+load_gcc_lib gcc-dg.exp
global shlib_ext
diff --git a/libitm/testsuite/libitm.c/c.exp b/libitm/testsuite/libitm.c/c.exp
index f7229a5bcdf4..daa71427d64c 100644
--- a/libitm/testsuite/libitm.c/c.exp
+++ b/libitm/testsuite/libitm.c/c.exp
@@ -21,6 +21,7 @@ if [info exists lang_test_file] then {
}
load_lib libitm-dg.exp
+load_gcc_lib gcc-dg.exp
# If a testcase doesn't have special options, use these.
if ![info exists DEFAULT_CFLAGS] then {
--
GitLab