aboutsummaryrefslogtreecommitdiff
path: root/gcc/testsuite/lib/objc.exp
diff options
context:
space:
mode:
authorRichard Sandiford <rdsandiford@googlemail.com>2009-07-11 06:10:49 +0000
committerRichard Sandiford <rsandifo@gcc.gnu.org>2009-07-11 06:10:49 +0000
commit33cde5161f2bc0738d24bcafe8ea9a858a63f9f4 (patch)
tree3ae36f07c961c579d1e473b88f00c276ca8cf2e1 /gcc/testsuite/lib/objc.exp
parent82e45095505d635a123bc8928e46f6b25d5bbb4f (diff)
downloadgcc-33cde5161f2bc0738d24bcafe8ea9a858a63f9f4.zip
gcc-33cde5161f2bc0738d24bcafe8ea9a858a63f9f4.tar.gz
gcc-33cde5161f2bc0738d24bcafe8ea9a858a63f9f4.tar.bz2
re PR testsuite/40699 (All sparcv9 libjava execution tests fail on Solaris 11/SPARC)
gcc/testsuite/ PR testsuite/40699 PR testsuite/40707 PR testsuite/40709 * lib/gcc-defs.exp, lib/target-libpath.exp, lib/objc.exp, lib/gfortran.exp, lib/g++.exp, lib/obj-c++.exp, lib/c-torture.exp, lib/gcc-dg.exp, lib/gnat.exp, g++.dg/compat/compat.exp, g++.dg/compat/struct-layout-1.exp: Revert 2009-06-30 commit. libstdc++-v3/ PR testsuite/40699 PR testsuite/40707 PR testsuite/40709 * testsuite/lib/libstdc++.exp: Revert 2009-06-30 commit. libjava/ PR testsuite/40699 PR testsuite/40707 PR testsuite/40709 * testsuite/lib/libjava.exp: Revert 2009-06-30 commit. libgomp/ PR testsuite/40699 PR testsuite/40707 PR testsuite/40709 * testsuite/lib/libgomp.exp: Revert 2009-07-02 and 2009-06-30 commits. * testsuite/libgomp.c/c.exp, testsuite/libgomp.c++/c++.exp, testsuite/libgomp.fortran/fortran.exp: Revert 2009-06-30 commits. libffi/ PR testsuite/40699 PR testsuite/40707 PR testsuite/40709 * testsuite/lib/libffi-dg.exp: Revert 2009-07-02, 2009-07-01 and 2009-06-30 commits. libmudflap/ PR testsuite/40699 PR testsuite/40707 PR testsuite/40709 * testsuite/lib/libmudflap.exp: Revert 2009-06-30 commit. From-SVN: r149508
Diffstat (limited to 'gcc/testsuite/lib/objc.exp')
-rw-r--r--gcc/testsuite/lib/objc.exp6
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/testsuite/lib/objc.exp b/gcc/testsuite/lib/objc.exp
index c0eeb02..934f31d 100644
--- a/gcc/testsuite/lib/objc.exp
+++ b/gcc/testsuite/lib/objc.exp
@@ -121,7 +121,7 @@ proc objc_init { args } {
objc_maybe_build_wrapper "${tmpdir}/objc-testglue.o"
- set objc_libgcc_s_path [find_libgcc_s $OBJC_UNDER_TEST]
+ set objc_libgcc_s_path [gcc-set-multilib-library-path $OBJC_UNDER_TEST]
}
proc objc_target_compile { source dest type options } {
@@ -135,7 +135,7 @@ proc objc_target_compile { source dest type options } {
global objc_libgcc_s_path
global shlib_ext
- set ld_library_path ${objc_libgcc_s_path}
+ set ld_library_path ".:${objc_libgcc_s_path}"
lappend options "libs=-lobjc"
set shlib_ext [get_shlib_extension]
verbose "shared lib extension: $shlib_ext"
@@ -191,7 +191,7 @@ proc objc_target_compile { source dest type options } {
set libobjc_dir [file dirname ${libobjc_dir}]
set objc_link_flags "-L${libobjc_dir}"
lappend options "additional_flags=${objc_link_flags}"
- add_path ld_library_path ${libobjc_dir}
+ append ld_library_path ":${libobjc_dir}"
}
if { $type == "precompiled_header" } {
# If we generating a precompiled header, we have say this is an