From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Tue, 31 Jan 2012 11:40:17 +0000 (+0000)
Subject: Link C++ tests with -shared-libgcc (PR libitm/51822)
X-Git-Tag: upstream/12.2.0~78233
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=681355e30d6b3267ab211871fd40f7398e3cd04f;p=platform%2Fupstream%2Fgcc.git

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
---

diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index 9da73d0..fd1bb9b 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 d30e945..ed9b4e8 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"