2007-03-23 Andreas Tobler <a.tobler@schweiz.org>

	* testsuite/lib/libgomp.exp (libgomp_init): Add -shared-libgcc for
	*-*-darwin*.
	* testsuite/libgomp.c++/c++.exp: Look for shared libstdc++ library
	and use it if found.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123162 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index a6f7032..bcfa440 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-23  Andreas Tobler  <a.tobler@schweiz.org>
+
+       * testsuite/lib/libgomp.exp (libgomp_init): Add -shared-libgcc for
+       *-*-darwin*.
+       * testsuite/libgomp.c++/c++.exp: Look for shared libstdc++ library
+       and use it if found.
+
 2007-03-18  Uros Bizjak  <ubizjak@gmail.com>
 
        * testsuite/config/default.exp: New file.

diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index 98c07aa..2e9f9d8 100644 (file)
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -124,6 +124,11 @@ proc libgomp_init { args } {
         && [check_effective_target_ilp32] } {
        lappend ALWAYS_CFLAGS "additional_flags=-march=i486"
     }
+
+    if [istarget *-*-darwin*] {
+       lappend ALWAYS_CFLAGS "additional_flags=-shared-libgcc"
+    }
+
     if [istarget sparc*-*-*] {
        lappend ALWAYS_CFLAGS "additional_flags=-mcpu=v9"
     }

diff --git a/libgomp/testsuite/libgomp.c++/c++.exp b/libgomp/testsuite/libgomp.c++/c++.exp
index 0bc657e..213ce02 100644 (file)
--- a/libgomp/testsuite/libgomp.c++/c++.exp
+++ b/libgomp/testsuite/libgomp.c++/c++.exp
@@ -1,14 +1,30 @@
-set lang_library_path  "../libstdc++-v3/src/.libs"
-set lang_test_file     "${lang_library_path}/libstdc++.a"
-set lang_link_flags    "-lstdc++"
-
 load_lib libgomp-dg.exp
 
+global shlib_ext
+
+set shlib_ext [get_shlib_extension]
+set lang_link_flags "-lstdc++"
+set lang_test_file_found 0
+set lang_library_path "../libstdc++-v3/src/.libs"
+
 # Initialize dg.
 dg-init
 
-if [file exists "${blddir}/${lang_test_file}"] {
+set blddir [lookfor_file [get_multilibs] libgomp]
+
+# Look for a static libstdc++ first.
+if [file exists "${blddir}/${lang_library_path}/libstdc++.a"] {
+    set lang_test_file "${lang_library_path}/libstdc++.a"
+    set lang_test_file_found 1
+# We may have a shared only build, so look for a shared libstdc++.
+} elseif [file exists "${blddir}/${lang_library_path}/libstdc++.${shlib_ext}"] {
+    set lang_test_file "${lang_library_path}/libstdc++.${shlib_ext}"
+    set lang_test_file_found 1
+} else {
+    puts "No libstdc++ library found, will not execute c++ tests"
+}
 
+if { $lang_test_file_found } {
     # Gather a list of all tests.
     set tests [lsort [glob -nocomplain $srcdir/$subdir/*.C]]