git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

From-SVN: r183754
This commit is contained in:
Rainer Orth 2012-01-31 11:40:17 +00:00 committed by Rainer Orth
parent dd887943bf
commit 681355e30d
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libitm/ChangeLog
View File

@ -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> 2012-01-24 Torvald Riegel <triegel@redhat.com>
* config/linux/rwlock.cc (GTM::gtm_rwlock::write_unlock): Fix reader * config/linux/rwlock.cc (GTM::gtm_rwlock::write_unlock): Fix reader

10
libitm/testsuite/libitm.c++/c++.exp
View File

@ -1,3 +1,5 @@
# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or
@ -17,14 +19,16 @@ load_lib libitm-dg.exp
global shlib_ext global shlib_ext
set shlib_ext [get_shlib_extension] 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_test_file_found 0
set lang_library_path "../libstdc++-v3/src/.libs" set lang_library_path "../libstdc++-v3/src/.libs"
# Initialize dg. # Initialize dg.
dg-init dg-init
set blddir [lookfor_file [get_multilibs] libgomp] set blddir [lookfor_file [get_multilibs] libitm]
if { $blddir != "" } { if { $blddir != "" } {
@ -41,7 +45,7 @@ if { $blddir != "" } {
} }
} elseif { [info exists GXX_UNDER_TEST] } { } elseif { [info exists GXX_UNDER_TEST] } {
set lang_test_file_found 1 set lang_test_file_found 1
# Needs to exist for libgomp.exp. # Needs to exist for libitm.exp.
set lang_test_file "" set lang_test_file ""
} else { } else {
puts "GXX_UNDER_TEST not defined, will not execute c++ tests" puts "GXX_UNDER_TEST not defined, will not execute c++ tests"