diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-01-31 11:40:17 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-01-31 11:40:17 +0000 |
| commit | c91830f05cf2804c6e69bae7d44c29baf204ccbe (patch) | |
| tree | 6c69c7d42b79d9d7e8d1bcda431c9867ad629bac | |
| parent | b74ba78c23d88090bc63593b19cf4e5d366b9bfe (diff) | |
| download | gcc-c91830f05cf2804c6e69bae7d44c29baf204ccbe.tar.gz | |
Link C++ tests with -shared-libgcc (PR libitm/51822)
PR libstdc++/51296
* testsuite/libitm.c++/c++.exp (lang_link_flags): Add
-shared-libgcc.
Correct libgomp references.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@183754 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libitm/ChangeLog | 7 | ||||
| -rw-r--r-- | libitm/testsuite/libitm.c++/c++.exp | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/libitm/ChangeLog b/libitm/ChangeLog index 9da73d02237..fd1bb9b5bc9 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,3 +1,10 @@ +2012-01-31 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR libstdc++/51296 + * testsuite/libitm.c++/c++.exp (lang_link_flags): Add + -shared-libgcc. + Correct libgomp references. + 2012-01-24 Torvald Riegel <triegel@redhat.com> * config/linux/rwlock.cc (GTM::gtm_rwlock::write_unlock): Fix reader diff --git a/libitm/testsuite/libitm.c++/c++.exp b/libitm/testsuite/libitm.c++/c++.exp index d30e9455c16..ed9b4e8ddde 100644 --- a/libitm/testsuite/libitm.c++/c++.exp +++ b/libitm/testsuite/libitm.c++/c++.exp @@ -1,3 +1,5 @@ +# Copyright (C) 2011, 2012 Free Software Foundation, Inc. +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -17,14 +19,16 @@ load_lib libitm-dg.exp global shlib_ext set shlib_ext [get_shlib_extension] -set lang_link_flags "-lstdc++" +# The C++ tests should be linked with g++, which defaults to -shared-libgcc. +# Doing that is currently too intrusive, so hardcode here. +set lang_link_flags "-shared-libgcc -lstdc++" set lang_test_file_found 0 set lang_library_path "../libstdc++-v3/src/.libs" # Initialize dg. dg-init -set blddir [lookfor_file [get_multilibs] libgomp] +set blddir [lookfor_file [get_multilibs] libitm] if { $blddir != "" } { @@ -41,7 +45,7 @@ if { $blddir != "" } { } } elseif { [info exists GXX_UNDER_TEST] } { set lang_test_file_found 1 - # Needs to exist for libgomp.exp. + # Needs to exist for libitm.exp. set lang_test_file "" } else { puts "GXX_UNDER_TEST not defined, will not execute c++ tests" |