diff options
| author | mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-06-20 16:44:23 +0000 |
|---|---|---|
| committer | mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-06-20 16:44:23 +0000 |
| commit | a14c31ec6abbdeaa4c24599cbbcfea01ea580a56 (patch) | |
| tree | 58e7dc85e01bd83eab569420f1d32b2fddf90621 /libitm | |
| parent | 27ca454e9b64ef2b79d0747ab581c88bcb16e28c (diff) | |
| download | gcc-a14c31ec6abbdeaa4c24599cbbcfea01ea580a56.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@200252 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libitm')
| -rw-r--r-- | libitm/ChangeLog | 8 | ||||
| -rw-r--r-- | libitm/testsuite/lib/libitm.exp | 20 | ||||
| -rw-r--r-- | libitm/testsuite/libitm.c++/c++.exp | 1 | ||||
| -rw-r--r-- | libitm/testsuite/libitm.c/c.exp | 1 |
4 files changed, 22 insertions, 8 deletions
diff --git a/libitm/ChangeLog b/libitm/ChangeLog index 81e5b6f447b..247886aaac2 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 f322ed5d0c2..669ed904327 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 2386e0e3cad..31b3b64756b 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 f7229a5bcdf..daa71427d64 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 { |