Skip to content

R
riscv-gcc-1
Commit 33cde516 by Richard Sandiford Committed by Richard Sandiford
Options

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
parent 82e45095
Showing with 451 additions and 190 deletions
gcc/testsuite/ChangeLog
2009-07-11 Richard Sandiford <rdsandiford@googlemail.com>
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.
2009-07-11 Tobias Burnus <burnus@net-b.de> 2009-07-11 Tobias Burnus <burnus@net-b.de>
PR fortran/33197 PR fortran/33197
......
gcc/testsuite/g++.dg/compat/compat.exp
...@@ -103,14 +103,14 @@ set sid "cp_compat" ...@@ -103,14 +103,14 @@ set sid "cp_compat"
# are different. # are different.
set use_alt 0 set use_alt 0
set same_alt 0 set same_alt 0
set alt_ld_library_path "" set alt_ld_library_path "."
if [info exists ALT_CXX_UNDER_TEST] then { if [info exists ALT_CXX_UNDER_TEST] then {
set use_alt 1 set use_alt 1
if [string match "same" $ALT_CXX_UNDER_TEST] then { if [string match "same" $ALT_CXX_UNDER_TEST] then {
set same_alt 1 set same_alt 1
} else { } else {
if [info exists ALT_LD_LIBRARY_PATH] then { if [info exists ALT_LD_LIBRARY_PATH] then {
set alt_ld_library_path $ALT_LD_LIBRARY_PATH append alt_ld_library_path ":${ALT_LD_LIBRARY_PATH}"
} }
} }
} }
......
gcc/testsuite/g++.dg/compat/struct-layout-1.exp
...@@ -109,14 +109,14 @@ set sid "cp_compat" ...@@ -109,14 +109,14 @@ set sid "cp_compat"
# are different. # are different.
set use_alt 0 set use_alt 0
set same_alt 0 set same_alt 0
set alt_ld_library_path "" set alt_ld_library_path "."
if [info exists ALT_CXX_UNDER_TEST] then { if [info exists ALT_CXX_UNDER_TEST] then {
set use_alt 1 set use_alt 1
if [string match "same" $ALT_CXX_UNDER_TEST] then { if [string match "same" $ALT_CXX_UNDER_TEST] then {
set same_alt 1 set same_alt 1
} else { } else {
if [info exists ALT_LD_LIBRARY_PATH] then { if [info exists ALT_LD_LIBRARY_PATH] then {
set alt_ld_library_path $ALT_LD_LIBRARY_PATH append alt_ld_library_path ":${ALT_LD_LIBRARY_PATH}"
} }
} }
} }
......
gcc/testsuite/lib/c-torture.exp
...@@ -54,6 +54,15 @@ if ![info exists GCC_UNDER_TEST] { ...@@ -54,6 +54,15 @@ if ![info exists GCC_UNDER_TEST] {
set GCC_UNDER_TEST "[find_gcc]" set GCC_UNDER_TEST "[find_gcc]"
} }
global orig_environment_saved
# This file may be sourced, so don't override environment settings
# that have been previously setup.
if { $orig_environment_saved == 0 } {
append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST]
set_ld_library_path_env_vars
}
# #
# c-torture-compile -- runs the Tege C-torture test # c-torture-compile -- runs the Tege C-torture test
# #
...@@ -99,13 +108,6 @@ proc c-torture-compile { src option } { ...@@ -99,13 +108,6 @@ proc c-torture-compile { src option } {
# #
proc c-torture-execute { sources args } { proc c-torture-execute { sources args } {
global tmpdir tool srcdir output compiler_conditional_xfail_data global tmpdir tool srcdir output compiler_conditional_xfail_data
global ld_library_path ld_library_path_multilib GCC_UNDER_TEST
if { "$ld_library_path_multilib"
!= "[board_info target multilib_flags]" } {
set ld_library_path [find_libgcc_s $GCC_UNDER_TEST]
set_ld_library_path_env_vars
}
# Use the first source filename given as the filename under test. # Use the first source filename given as the filename under test.
set src [lindex $sources 0] set src [lindex $sources 0]
......
gcc/testsuite/lib/g++.exp
...@@ -106,51 +106,52 @@ proc g++_link_flags { paths } { ...@@ -106,51 +106,52 @@ proc g++_link_flags { paths } {
set gccpath ${paths} set gccpath ${paths}
set libio_dir "" set libio_dir ""
set flags "" set flags ""
set ld_library_path "" set ld_library_path "."
set shlib_ext [get_shlib_extension] set shlib_ext [get_shlib_extension]
verbose "shared lib extension: $shlib_ext" verbose "shared lib extension: $shlib_ext"
if { $gccpath != "" } { if { $gccpath != "" } {
if [file exists "${gccpath}/lib/libstdc++.a"] { if [file exists "${gccpath}/lib/libstdc++.a"] {
add_path ld_library_path "${gccpath}/lib" append ld_library_path ":${gccpath}/lib"
} }
if [file exists "${gccpath}/libg++/libg++.a"] { if [file exists "${gccpath}/libg++/libg++.a"] {
append flags "-L${gccpath}/libg++ " append flags "-L${gccpath}/libg++ "
add_path ld_library_path "${gccpath}/libg++" append ld_library_path ":${gccpath}/libg++"
} }
if [file exists "${gccpath}/libstdc++/libstdc++.a"] { if [file exists "${gccpath}/libstdc++/libstdc++.a"] {
append flags "-L${gccpath}/libstdc++ " append flags "-L${gccpath}/libstdc++ "
add_path ld_library_path "${gccpath}/libstdc++" append ld_library_path ":${gccpath}/libstdc++"
} }
if [file exists "${gccpath}/libstdc++-v3/src/.libs/libstdc++.a"] { if [file exists "${gccpath}/libstdc++-v3/src/.libs/libstdc++.a"] {
append flags " -L${gccpath}/libstdc++-v3/src/.libs " append flags " -L${gccpath}/libstdc++-v3/src/.libs "
add_path ld_library_path "${gccpath}/libstdc++-v3/src/.libs" append ld_library_path ":${gccpath}/libstdc++-v3/src/.libs"
} }
# Look for libstdc++.${shlib_ext}. # Look for libstdc++.${shlib_ext}.
if [file exists "${gccpath}/libstdc++-v3/src/.libs/libstdc++.${shlib_ext}"] { if [file exists "${gccpath}/libstdc++-v3/src/.libs/libstdc++.${shlib_ext}"] {
append flags " -L${gccpath}/libstdc++-v3/src/.libs " append flags " -L${gccpath}/libstdc++-v3/src/.libs "
add_path ld_library_path "${gccpath}/libstdc++-v3/src/.libs" append ld_library_path ":${gccpath}/libstdc++-v3/src/.libs"
} }
if [file exists "${gccpath}/libiberty/libiberty.a"] { if [file exists "${gccpath}/libiberty/libiberty.a"] {
append flags "-L${gccpath}/libiberty " append flags "-L${gccpath}/libiberty "
} }
if [file exists "${gccpath}/librx/librx.a"] { if [file exists "${gccpath}/librx/librx.a"] {
append flags "-L${gccpath}/librx " append flags "-L${gccpath}/librx "
} }
add_path ld_library_path [find_libgcc_s $GXX_UNDER_TEST] append ld_library_path [gcc-set-multilib-library-path $GXX_UNDER_TEST]
} else { } else {
global tool_root_dir global tool_root_dir
set libgpp [lookfor_file ${tool_root_dir} libg++] set libgpp [lookfor_file ${tool_root_dir} libg++]
if { $libgpp != "" } { if { $libgpp != "" } {
append flags "-L${libgpp} " append flags "-L${libgpp} "
add_path ld_library_path ${libgpp} append ld_library_path ":${libgpp}"
} }
set libstdcpp [lookfor_file ${tool_root_dir} libstdc++] set libstdcpp [lookfor_file ${tool_root_dir} libstdc++]
if { $libstdcpp != "" } { if { $libstdcpp != "" } {
append flags "-L${libstdcpp} " append flags "-L${libstdcpp} "
add_path ld_library_path ${libstdcpp} append ld_library_path ":${libstdcpp}"
} }
set libiberty [lookfor_file ${tool_root_dir} libiberty] set libiberty [lookfor_file ${tool_root_dir} libiberty]
if { $libiberty != "" } { if { $libiberty != "" } {
......
gcc/testsuite/lib/gcc-defs.exp
...@@ -233,3 +233,35 @@ proc dg-additional-files-options { options source } { ...@@ -233,3 +233,35 @@ proc dg-additional-files-options { options source } {
return $options return $options
} }
# Return a colon-separate list of directories to search for libraries
# for COMPILER, including multilib directories.
proc gcc-set-multilib-library-path { compiler } {
global rootme
# ??? rootme will not be set when testing an installed compiler.
# In that case, we should perhaps use some other method to find
# libraries.
if {![info exists rootme]} {
return ""
}
set libpath ":${rootme}"
set compiler [lindex $compiler 0]
if { [is_remote host] == 0 && [which $compiler] != 0 } {
foreach i "[exec $compiler --print-multi-lib]" {
set mldir ""
regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
set mldir [string trimright $mldir "\;@"]
if { "$mldir" == "." } {
continue
}
if { [llength [glob -nocomplain ${rootme}/${mldir}/libgcc_s*.so.*]] >= 1 } {
append libpath ":${rootme}/${mldir}"
}
}
}
return $libpath
}
gcc/testsuite/lib/gcc-dg.exp
...@@ -65,6 +65,15 @@ if ![info exists GCC_UNDER_TEST] { ...@@ -65,6 +65,15 @@ if ![info exists GCC_UNDER_TEST] {
set GCC_UNDER_TEST "[find_gcc]" set GCC_UNDER_TEST "[find_gcc]"
} }
global orig_environment_saved
# This file may be sourced, so don't override environment settings
# that have been previously setup.
if { $orig_environment_saved == 0 } {
append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST]
set_ld_library_path_env_vars
}
# Define gcc callbacks for dg.exp. # Define gcc callbacks for dg.exp.
proc gcc-dg-test-1 { target_compile prog do_what extra_tool_flags } { proc gcc-dg-test-1 { target_compile prog do_what extra_tool_flags } {
...@@ -108,14 +117,6 @@ proc gcc-dg-test-1 { target_compile prog do_what extra_tool_flags } { ...@@ -108,14 +117,6 @@ proc gcc-dg-test-1 { target_compile prog do_what extra_tool_flags } {
set output_file "[file rootname [file tail $prog]].o" set output_file "[file rootname [file tail $prog]].o"
} }
"run" { "run" {
global ld_library_path ld_library_path_multilib GCC_UNDER_TEST
if { "$ld_library_path_multilib"
!= "[board_info target multilib_flags]" } {
set ld_library_path [find_libgcc_s $GCC_UNDER_TEST]
set_ld_library_path_env_vars
}
set compile_type "executable" set compile_type "executable"
# FIXME: "./" is to cope with "." not being in $PATH. # FIXME: "./" is to cope with "." not being in $PATH.
# Should this be handled elsewhere? # Should this be handled elsewhere?
......
gcc/testsuite/lib/gfortran.exp
...@@ -84,7 +84,7 @@ proc gfortran_link_flags { paths } { ...@@ -84,7 +84,7 @@ proc gfortran_link_flags { paths } {
set gccpath ${paths} set gccpath ${paths}
set libio_dir "" set libio_dir ""
set flags "" set flags ""
set ld_library_path "" set ld_library_path "."
set shlib_ext [get_shlib_extension] set shlib_ext [get_shlib_extension]
verbose "shared lib extension: $shlib_ext" verbose "shared lib extension: $shlib_ext"
...@@ -94,11 +94,11 @@ proc gfortran_link_flags { paths } { ...@@ -94,11 +94,11 @@ proc gfortran_link_flags { paths } {
# for uninstalled testing. # for uninstalled testing.
append flags "-B${gccpath}/libgfortran/.libs " append flags "-B${gccpath}/libgfortran/.libs "
append flags "-L${gccpath}/libgfortran/.libs " append flags "-L${gccpath}/libgfortran/.libs "
add_path ld_library_path "${gccpath}/libgfortran/.libs" append ld_library_path ":${gccpath}/libgfortran/.libs"
} }
if [file exists "${gccpath}/libgfortran/.libs/libgfortran.${shlib_ext}"] { if [file exists "${gccpath}/libgfortran/.libs/libgfortran.${shlib_ext}"] {
append flags "-L${gccpath}/libgfortran/.libs " append flags "-L${gccpath}/libgfortran/.libs "
add_path ld_library_path "${gccpath}/libgfortran/.libs" append ld_library_path ":${gccpath}/libgfortran/.libs"
} }
if [file exists "${gccpath}/libgfortran/libgforbegin.a"] { if [file exists "${gccpath}/libgfortran/libgforbegin.a"] {
append flags "-L${gccpath}/libgfortran " append flags "-L${gccpath}/libgfortran "
...@@ -106,7 +106,8 @@ proc gfortran_link_flags { paths } { ...@@ -106,7 +106,8 @@ proc gfortran_link_flags { paths } {
if [file exists "${gccpath}/libiberty/libiberty.a"] { if [file exists "${gccpath}/libiberty/libiberty.a"] {
append flags "-L${gccpath}/libiberty " append flags "-L${gccpath}/libiberty "
} }
add_path ld_library_path [find_libgcc_s $GFORTRAN_UNDER_TEST] append ld_library_path \
[gcc-set-multilib-library-path $GFORTRAN_UNDER_TEST]
} }
set_ld_library_path_env_vars set_ld_library_path_env_vars
......
gcc/testsuite/lib/gnat.exp
...@@ -147,7 +147,7 @@ proc gnat_target_compile { source dest type options } { ...@@ -147,7 +147,7 @@ proc gnat_target_compile { source dest type options } {
set GNAT_UNDER_TEST "$GNAT_UNDER_TEST_ORIG $gnat_rts_opt" set GNAT_UNDER_TEST "$GNAT_UNDER_TEST_ORIG $gnat_rts_opt"
} }
set ld_library_path ${gnat_libgcc_s_path} set ld_library_path ".:${gnat_libgcc_s_path}"
lappend options "compiler=$GNAT_UNDER_TEST -q -f" lappend options "compiler=$GNAT_UNDER_TEST -q -f"
lappend options "timeout=[timeout_value]" lappend options "timeout=[timeout_value]"
......
gcc/testsuite/lib/obj-c++.exp
...@@ -106,30 +106,30 @@ proc obj-c++_link_flags { paths } { ...@@ -106,30 +106,30 @@ proc obj-c++_link_flags { paths } {
set gccpath ${paths} set gccpath ${paths}
set libio_dir "" set libio_dir ""
set flags "" set flags ""
set ld_library_path "" set ld_library_path "."
set shlib_ext [get_shlib_extension] set shlib_ext [get_shlib_extension]
verbose "shared lib extension: $shlib_ext" verbose "shared lib extension: $shlib_ext"
if { $gccpath != "" } { if { $gccpath != "" } {
if [file exists "${gccpath}/lib/libstdc++.a"] { if [file exists "${gccpath}/lib/libstdc++.a"] {
add_path ld_library_path "${gccpath}/lib" append ld_library_path ":${gccpath}/lib"
} }
if [file exists "${gccpath}/libg++/libg++.a"] { if [file exists "${gccpath}/libg++/libg++.a"] {
append flags "-L${gccpath}/libg++ " append flags "-L${gccpath}/libg++ "
add_path ld_library_path "${gccpath}/libg++" append ld_library_path ":${gccpath}/libg++"
} }
if [file exists "${gccpath}/libstdc++/libstdc++.a"] { if [file exists "${gccpath}/libstdc++/libstdc++.a"] {
append flags "-L${gccpath}/libstdc++ " append flags "-L${gccpath}/libstdc++ "
add_path ld_library_path "${gccpath}/libstdc++" append ld_library_path ":${gccpath}/libstdc++"
} }
if [file exists "${gccpath}/libstdc++-v3/src/.libs/libstdc++.a"] { if [file exists "${gccpath}/libstdc++-v3/src/.libs/libstdc++.a"] {
append flags " -L${gccpath}/libstdc++-v3/src/.libs " append flags " -L${gccpath}/libstdc++-v3/src/.libs "
add_path ld_library_path "${gccpath}/libstdc++-v3/src/.libs" append ld_library_path ":${gccpath}/libstdc++-v3/src/.libs"
} }
# Look for libstdc++.${shlib_ext}. # Look for libstdc++.${shlib_ext}.
if [file exists "${gccpath}/libstdc++-v3/src/.libs/libstdc++.${shlib_ext}"] { if [file exists "${gccpath}/libstdc++-v3/src/.libs/libstdc++.${shlib_ext}"] {
append flags " -L${gccpath}/libstdc++-v3/src/.libs " append flags " -L${gccpath}/libstdc++-v3/src/.libs "
add_path ld_library_path "${gccpath}/libstdc++-v3/src/.libs" append ld_library_path ":${gccpath}/libstdc++-v3/src/.libs"
} }
if [file exists "${gccpath}/libiberty/libiberty.a"] { if [file exists "${gccpath}/libiberty/libiberty.a"] {
append flags "-L${gccpath}/libiberty " append flags "-L${gccpath}/libiberty "
...@@ -158,21 +158,23 @@ proc obj-c++_link_flags { paths } { ...@@ -158,21 +158,23 @@ proc obj-c++_link_flags { paths } {
if { $libobjc_dir != "" } { if { $libobjc_dir != "" } {
set libobjc_dir [file dirname ${libobjc_dir}] set libobjc_dir [file dirname ${libobjc_dir}]
append flags "-L${libobjc_dir}" append flags "-L${libobjc_dir}"
add_path ld_library_path ${libobjc_dir} append ld_library_path ":${libobjc_dir}"
} }
add_path ld_library_path [find_libgcc_s $OBJCXX_UNDER_TEST] append ld_library_path \
[gcc-set-multilib-library-path $OBJCXX_UNDER_TEST]
} else { } else {
global tool_root_dir; global tool_root_dir;
set libgpp [lookfor_file ${tool_root_dir} libg++]; set libgpp [lookfor_file ${tool_root_dir} libg++];
if { $libgpp != "" } { if { $libgpp != "" } {
append flags "-L${libgpp} "; append flags "-L${libgpp} ";
add_path ld_library_path ${libgpp} append ld_library_path ":${libgpp}"
} }
set libstdcpp [lookfor_file ${tool_root_dir} libstdc++]; set libstdcpp [lookfor_file ${tool_root_dir} libstdc++];
if { $libstdcpp != "" } { if { $libstdcpp != "" } {
append flags "-L${libstdcpp} "; append flags "-L${libstdcpp} ";
add_path ld_library_path ${libstdcpp} append ld_library_path ":${libstdcpp}"
} }
set libiberty [lookfor_file ${tool_root_dir} libiberty]; set libiberty [lookfor_file ${tool_root_dir} libiberty];
if { $libiberty != "" } { if { $libiberty != "" } {
......
gcc/testsuite/lib/objc.exp
...@@ -121,7 +121,7 @@ proc objc_init { args } { ...@@ -121,7 +121,7 @@ proc objc_init { args } {
objc_maybe_build_wrapper "${tmpdir}/objc-testglue.o" 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 } { proc objc_target_compile { source dest type options } {
...@@ -135,7 +135,7 @@ 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 objc_libgcc_s_path
global shlib_ext global shlib_ext
set ld_library_path ${objc_libgcc_s_path} set ld_library_path ".:${objc_libgcc_s_path}"
lappend options "libs=-lobjc" lappend options "libs=-lobjc"
set shlib_ext [get_shlib_extension] set shlib_ext [get_shlib_extension]
verbose "shared lib extension: $shlib_ext" verbose "shared lib extension: $shlib_ext"
...@@ -191,7 +191,7 @@ proc objc_target_compile { source dest type options } { ...@@ -191,7 +191,7 @@ proc objc_target_compile { source dest type options } {
set libobjc_dir [file dirname ${libobjc_dir}] set libobjc_dir [file dirname ${libobjc_dir}]
set objc_link_flags "-L${libobjc_dir}" set objc_link_flags "-L${libobjc_dir}"
lappend options "additional_flags=${objc_link_flags}" 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 { $type == "precompiled_header" } {
# If we generating a precompiled header, we have say this is an # If we generating a precompiled header, we have say this is an
......
gcc/testsuite/lib/target-libpath.exp
...@@ -16,43 +16,18 @@ ...@@ -16,43 +16,18 @@
# This file was contributed by John David Anglin (dave.anglin@nrc-cnrc.gc.ca) # This file was contributed by John David Anglin (dave.anglin@nrc-cnrc.gc.ca)
# A list of ld library path environment variables that might need to be
# defined.
#
# Some variables represent ABI-specific paths, and if these variables
# aren't defined, the dynamic loader might fall back on a more general
# variable. We must do the same when trying to read the current setting
# of such a path. Each element of this list is therefore itself a list:
# the first element of each sublist specifies the name of the variable,
# and the other elements specify fallback alternatives. We use FOO as a
# shorthand for { FOO }.
set ld_library_path_vars {
LD_LIBRARY_PATH
LD_RUN_PATH
SHLIB_PATH
{ LD_LIBRARYN32_PATH LD_LIBRARY_PATH }
{ LD_LIBRARY64_PATH LD_LIBRARY_PATH }
{ LD_LIBRARY_PATH_32 LD_LIBRARY_PATH }
{ LD_LIBRARY_PATH_64 LD_LIBRARY_PATH }
DYLD_LIBRARY_PATH
}
# Set up the global orig_FOO_saved variables. We define this as a function
# to avoid polluting the global namespace with local variables.
proc init_ld_library_path_env_vars { } {
global ld_library_path_vars
foreach spec $ld_library_path_vars {
set var orig_[string tolower [lindex $spec 0]]_saved
global $var
set $var 0
}
}
init_ld_library_path_env_vars
set orig_environment_saved 0 set orig_environment_saved 0
set orig_ld_library_path_saved 0
set orig_ld_run_path_saved 0
set orig_shlib_path_saved 0
set orig_ld_libraryn32_path_saved 0
set orig_ld_library64_path_saved 0
set orig_ld_library_path_32_saved 0
set orig_ld_library_path_64_saved 0
set orig_dyld_library_path_saved 0
set orig_gcc_exec_prefix_saved 0 set orig_gcc_exec_prefix_saved 0
set orig_gcc_exec_prefix_checked 0 set orig_gcc_exec_prefix_checked 0
set ld_library_path_multilib unset
####################################### #######################################
# proc set_ld_library_path_env_vars { } # proc set_ld_library_path_env_vars { }
...@@ -61,12 +36,26 @@ set ld_library_path_multilib unset ...@@ -61,12 +36,26 @@ set ld_library_path_multilib unset
proc set_ld_library_path_env_vars { } { proc set_ld_library_path_env_vars { } {
global ld_library_path global ld_library_path
global orig_environment_saved global orig_environment_saved
global ld_library_path_vars global orig_ld_library_path_saved
global orig_ld_run_path_saved
global orig_shlib_path_saved
global orig_ld_libraryn32_path_saved
global orig_ld_library64_path_saved
global orig_ld_library_path_32_saved
global orig_ld_library_path_64_saved
global orig_dyld_library_path_saved
global orig_gcc_exec_prefix_saved global orig_gcc_exec_prefix_saved
global orig_gcc_exec_prefix_checked global orig_gcc_exec_prefix_checked
global orig_ld_library_path
global orig_ld_run_path
global orig_shlib_path
global orig_ld_libraryn32_path
global orig_ld_library64_path
global orig_ld_library_path_32
global orig_ld_library_path_64
global orig_dyld_library_path
global orig_gcc_exec_prefix global orig_gcc_exec_prefix
global TEST_GCC_EXEC_PREFIX global TEST_GCC_EXEC_PREFIX
global ld_library_path_multilib
global env global env
# Save the original GCC_EXEC_PREFIX. # Save the original GCC_EXEC_PREFIX.
...@@ -89,32 +78,112 @@ proc set_ld_library_path_env_vars { } { ...@@ -89,32 +78,112 @@ proc set_ld_library_path_env_vars { } {
return return
} }
set ld_library_path_multilib [board_info target multilib_flags] if { $orig_environment_saved == 0 } {
set orig_environment_saved 1
foreach spec $ld_library_path_vars {
set var [lindex $spec 0]
set lvar [string tolower $var]
global orig_$lvar # Save the original environment.
global orig_${lvar}_saved if [info exists env(LD_LIBRARY_PATH)] {
set orig_ld_library_path "$env(LD_LIBRARY_PATH)"
set orig_ld_library_path_saved 1
}
if [info exists env(LD_RUN_PATH)] {
set orig_ld_run_path "$env(LD_RUN_PATH)"
set orig_ld_run_path_saved 1
}
if [info exists env(SHLIB_PATH)] {
set orig_shlib_path "$env(SHLIB_PATH)"
set orig_shlib_path_saved 1
}
if [info exists env(LD_LIBRARYN32_PATH)] {
set orig_ld_libraryn32_path "$env(LD_LIBRARYN32_PATH)"
set orig_ld_libraryn32_path_saved 1
}
if [info exists env(LD_LIBRARY64_PATH)] {
set orig_ld_library64_path "$env(LD_LIBRARY64_PATH)"
set orig_ld_library64_path_saved 1
}
if [info exists env(LD_LIBRARY_PATH_32)] {
set orig_ld_library_path_32 "$env(LD_LIBRARY_PATH_32)"
set orig_ld_library_path_32_saved 1
}
if [info exists env(LD_LIBRARY_PATH_64)] {
set orig_ld_library_path_64 "$env(LD_LIBRARY_PATH_64)"
set orig_ld_library_path_64_saved 1
}
if [info exists env(DYLD_LIBRARY_PATH)] {
set orig_dyld_library_path "$env(DYLD_LIBRARY_PATH)"
set orig_dyld_library_path_saved 1
}
}
if { $orig_environment_saved == 0 } { # We need to set ld library path in the environment. Currently,
if [info exists env($var)] { # unix.exp doesn't set the environment correctly for all systems.
set orig_$lvar [set env($var)] # It only sets SHLIB_PATH and LD_LIBRARY_PATH when it executes a
set orig_${lvar}_saved 1 # program. We also need the environment set for compilations, etc.
#
# On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but
# called LD_LIBRARYN32_PATH (for the N32 ABI) and LD_LIBRARY64_PATH
# (for the 64-bit ABI). The same applies to Darwin (DYLD_LIBRARY_PATH),
# Solaris 32 bit (LD_LIBRARY_PATH_32), Solaris 64 bit (LD_LIBRARY_PATH_64),
# and HP-UX (SHLIB_PATH). In some cases, the variables are independent
# of LD_LIBRARY_PATH, and in other cases LD_LIBRARY_PATH is used if the
# variable is not defined.
#
# Doing this is somewhat of a hack as ld_library_path gets repeated in
# SHLIB_PATH and LD_LIBRARY_PATH when unix_load sets these variables.
if { $orig_ld_library_path_saved } {
setenv LD_LIBRARY_PATH "$ld_library_path:$orig_ld_library_path"
} else {
setenv LD_LIBRARY_PATH "$ld_library_path"
} }
if { $orig_ld_run_path_saved } {
setenv LD_RUN_PATH "$ld_library_path:$orig_ld_run_path"
} else {
setenv LD_RUN_PATH "$ld_library_path"
} }
set value $ld_library_path # The default shared library dynamic path search for 64-bit
foreach extra $spec { # HP-UX executables searches LD_LIBRARY_PATH before SHLIB_PATH.
set lextra [string tolower $extra] # LD_LIBRARY_PATH isn't used for 32-bit executables. Thus, we
if [set orig_${lextra}_saved] { # set LD_LIBRARY_PATH and SHLIB_PATH as if they were independent.
add_path value [set orig_$lextra] if { $orig_shlib_path_saved } {
break setenv SHLIB_PATH "$ld_library_path:$orig_shlib_path"
} else {
setenv SHLIB_PATH "$ld_library_path"
} }
if { $orig_ld_libraryn32_path_saved } {
setenv LD_LIBRARYN32_PATH "$ld_library_path:$orig_ld_libraryn32_path"
} elseif { $orig_ld_library_path_saved } {
setenv LD_LIBRARYN32_PATH "$ld_library_path:$orig_ld_library_path"
} else {
setenv LD_LIBRARYN32_PATH "$ld_library_path"
} }
setenv $var $value if { $orig_ld_library64_path_saved } {
setenv LD_LIBRARY64_PATH "$ld_library_path:$orig_ld_library64_path"
} elseif { $orig_ld_library_path_saved } {
setenv LD_LIBRARY64_PATH "$ld_library_path:$orig_ld_library_path"
} else {
setenv LD_LIBRARY64_PATH "$ld_library_path"
} }
set orig_environment_saved 1 if { $orig_ld_library_path_32_saved } {
setenv LD_LIBRARY_PATH_32 "$ld_library_path:$orig_ld_library_path_32"
} elseif { $orig_ld_library_path_saved } {
setenv LD_LIBRARY_PATH_32 "$ld_library_path:$orig_ld_library_path"
} else {
setenv LD_LIBRARY_PATH_32 "$ld_library_path"
}
if { $orig_ld_library_path_64_saved } {
setenv LD_LIBRARY_PATH_64 "$ld_library_path:$orig_ld_library_path_64"
} elseif { $orig_ld_library_path_saved } {
setenv LD_LIBRARY_PATH_64 "$ld_library_path:$orig_ld_library_path"
} else {
setenv LD_LIBRARY_PATH_64 "$ld_library_path"
}
if { $orig_dyld_library_path_saved } {
setenv DYLD_LIBRARY_PATH "$ld_library_path:$orig_dyld_library_path"
} else {
setenv DYLD_LIBRARY_PATH "$ld_library_path"
}
verbose -log "set_ld_library_path_env_vars: ld_library_path=$ld_library_path" verbose -log "set_ld_library_path_env_vars: ld_library_path=$ld_library_path"
} }
...@@ -124,8 +193,23 @@ proc set_ld_library_path_env_vars { } { ...@@ -124,8 +193,23 @@ proc set_ld_library_path_env_vars { } {
proc restore_ld_library_path_env_vars { } { proc restore_ld_library_path_env_vars { } {
global orig_environment_saved global orig_environment_saved
global ld_library_path_vars global orig_ld_library_path_saved
global orig_ld_run_path_saved
global orig_shlib_path_saved
global orig_ld_libraryn32_path_saved
global orig_ld_library64_path_saved
global orig_ld_library_path_32_saved
global orig_ld_library_path_64_saved
global orig_dyld_library_path_saved
global orig_gcc_exec_prefix_saved global orig_gcc_exec_prefix_saved
global orig_ld_library_path
global orig_ld_run_path
global orig_shlib_path
global orig_ld_libraryn32_path
global orig_ld_library64_path
global orig_ld_library_path_32
global orig_ld_library_path_64
global orig_dyld_library_path
global orig_gcc_exec_prefix global orig_gcc_exec_prefix
global env global env
...@@ -139,18 +223,45 @@ proc restore_ld_library_path_env_vars { } { ...@@ -139,18 +223,45 @@ proc restore_ld_library_path_env_vars { } {
return return
} }
foreach spec $ld_library_path_vars { if { $orig_ld_library_path_saved } {
set var [lindex $spec 0] setenv LD_LIBRARY_PATH "$orig_ld_library_path"
set lvar [string tolower $var] } elseif [info exists env(LD_LIBRARY_PATH)] {
unsetenv LD_LIBRARY_PATH
global orig_$lvar }
global orig_${lvar}_saved if { $orig_ld_run_path_saved } {
setenv LD_RUN_PATH "$orig_ld_run_path"
if [set orig_${lvar}_saved] { } elseif [info exists env(LD_RUN_PATH)] {
setenv $var [set orig_$lvar] unsetenv LD_RUN_PATH
} elseif [info exists env($var)] {
unsetenv $var
} }
if { $orig_shlib_path_saved } {
setenv SHLIB_PATH "$orig_shlib_path"
} elseif [info exists env(SHLIB_PATH)] {
unsetenv SHLIB_PATH
}
if { $orig_ld_libraryn32_path_saved } {
setenv LD_LIBRARYN32_PATH "$orig_ld_libraryn32_path"
} elseif [info exists env(LD_LIBRARYN32_PATH)] {
unsetenv LD_LIBRARYN32_PATH
}
if { $orig_ld_library64_path_saved } {
setenv LD_LIBRARY64_PATH "$orig_ld_library64_path"
} elseif [info exists env(LD_LIBRARY64_PATH)] {
unsetenv LD_LIBRARY64_PATH
}
if { $orig_ld_library_path_32_saved } {
setenv LD_LIBRARY_PATH_32 "$orig_ld_library_path_32"
} elseif [info exists env(LD_LIBRARY_PATH_32)] {
unsetenv LD_LIBRARY_PATH_32
}
if { $orig_ld_library_path_64_saved } {
setenv LD_LIBRARY_PATH_64 "$orig_ld_library_path_64"
} elseif [info exists env(LD_LIBRARY_PATH_64)] {
unsetenv LD_LIBRARY_PATH_64
}
if { $orig_dyld_library_path_saved } {
setenv DYLD_LIBRARY_PATH "$orig_dyld_library_path"
} elseif [info exists env(DYLD_LIBRARY_PATH)] {
unsetenv DYLD_LIBRARY_PATH
} }
} }
...@@ -173,46 +284,3 @@ proc get_shlib_extension { } { ...@@ -173,46 +284,3 @@ proc get_shlib_extension { } {
return $shlib_ext return $shlib_ext
} }
# If DIR is not an empty string, add it to the end of variable UPPATH,
# which represents a colon-separated path.
proc add_path { uppath dir } {
upvar $uppath path
if { $dir != "" } {
if { [info exists path] && $path != "" } {
append path ":"
}
append path $dir
}
}
# Return the directory that contains the shared libgcc for this multilib,
# or "" if we don't know.
proc find_libgcc_s { compiler } {
# Remote host testing requires an installed compiler (get_multilibs
# imposes the same restriction). It is up to the board file or
# tester to make sure that the installed compiler's libraries
# can be found in the library path.
if { [is_remote host] } {
return ""
}
# The same goes if we can't find the compiler.
set compiler_path [which [lindex $compiler 0]]
if { $compiler_path == "" } {
return ""
}
# Run the compiler with the current multilib flags to get the
# relative multilib directory.
set subdir [eval exec $compiler [board_info target multilib_flags] \
--print-multi-directory]
# We are only interested in cases where libgcc_s is in the same
# directory as the compiler itself.
set dir [file dirname $compiler_path]
if { $subdir != "." } {
set dir [file join $dir $subdir]
}
if { ![file exists $dir] } {
return ""
}
return $dir
}
libffi/ChangeLog
2009-07-11 Richard Sandiford <rdsandiford@googlemail.com>
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.
2009-07-01 Richard Sandiford <r.sandiford@uk.ibm.com> 2009-07-01 Richard Sandiford <r.sandiford@uk.ibm.com>
* testsuite/lib/libffi-dg.exp (libffi-init): Set ld_library_path * testsuite/lib/libffi-dg.exp (libffi-init): Set ld_library_path
......
libffi/testsuite/lib/libffi-dg.exp
...@@ -107,16 +107,33 @@ proc libffi-init { args } { ...@@ -107,16 +107,33 @@ proc libffi-init { args } {
set blddircxx [lookfor_file [get_multilibs] libstdc++-v3] set blddircxx [lookfor_file [get_multilibs] libstdc++-v3]
verbose "libstdc++ $blddircxx" verbose "libstdc++ $blddircxx"
set ld_library_path ""
set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a] set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a]
if {$gccdir != ""} { if {$gccdir != ""} {
set gccdir [file dirname $gccdir] set gccdir [file dirname $gccdir]
add_path ld_library_path [find_libgcc_s "$gccdir/xgcc"] }
verbose "gccdir $gccdir"
set ld_library_path "."
append ld_library_path ":${gccdir}"
set compiler "${gccdir}/xgcc"
if { [is_remote host] == 0 && [which $compiler] != 0 } {
foreach i "[exec $compiler --print-multi-lib]" {
set mldir ""
regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
set mldir [string trimright $mldir "\;@"]
if { "$mldir" == "." } {
continue
}
if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.so.*]] >= 1 } {
append ld_library_path ":${gccdir}/${mldir}"
}
}
} }
# add the library path for libffi. # add the library path for libffi.
add_path ld_library_path "${blddirffi}/.libs" append ld_library_path ":${blddirffi}/.libs"
# add the library path for libstdc++ as well. # add the library path for libstdc++ as well.
add_path ld_library_path "${blddircxx}/src/.libs" append ld_library_path ":${blddircxx}/src/.libs"
verbose "ld_library_path: $ld_library_path" verbose "ld_library_path: $ld_library_path"
......
libgomp/ChangeLog
2009-07-11 Richard Sandiford <rdsandiford@googlemail.com>
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.
2009-07-02 Richard Sandiford <r.sandiford@uk.ibm.com> 2009-07-02 Richard Sandiford <r.sandiford@uk.ibm.com>
* testsuite/lib/libgomp.exp (libgomp_init): Use the ALWAYS_CFLAGS * testsuite/lib/libgomp.exp (libgomp_init): Use the ALWAYS_CFLAGS
......
libgomp/testsuite/lib/libgomp.exp
...@@ -86,6 +86,40 @@ proc libgomp_init { args } { ...@@ -86,6 +86,40 @@ proc libgomp_init { args } {
set CFLAGS "" set CFLAGS ""
} }
# Locate libgcc.a so we don't need to account for different values of
# SHLIB_EXT on different platforms
set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a]
if {$gccdir != ""} {
set gccdir [file dirname $gccdir]
}
# Compute what needs to be put into LD_LIBRARY_PATH
set always_ld_library_path ".:${blddir}/.libs"
# Compute what needs to be added to the existing LD_LIBRARY_PATH.
if {$gccdir != ""} {
# Add AIX pthread directory first.
if { [llength [glob -nocomplain ${gccdir}/pthread/libgcc_s*.a]] >= 1 } {
append always_ld_library_path ":${gccdir}/pthread"
}
append always_ld_library_path ":${gccdir}"
set compiler [lindex $GCC_UNDER_TEST 0]
if { [is_remote host] == 0 && [which $compiler] != 0 } {
foreach i "[exec $compiler --print-multi-lib]" {
set mldir ""
regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
set mldir [string trimright $mldir "\;@"]
if { "$mldir" == "." } {
continue
}
if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.so.*]] >= 1 } {
append always_ld_library_path ":${gccdir}/${mldir}"
}
}
}
}
set ALWAYS_CFLAGS "" set ALWAYS_CFLAGS ""
if { $blddir != "" } { if { $blddir != "" } {
lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/" lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/"
...@@ -119,16 +153,6 @@ proc libgomp_init { args } { ...@@ -119,16 +153,6 @@ proc libgomp_init { args } {
# And, gee, turn on OpenMP. # And, gee, turn on OpenMP.
lappend ALWAYS_CFLAGS "additional_flags=-fopenmp" lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
set compiler $GCC_UNDER_TEST
foreach flag $ALWAYS_CFLAGS {
if { [regexp {^(additional_flags|ldflags)=(.*)} $flag d1 d2 option] } {
lappend compiler $option
}
}
set always_ld_library_path "${blddir}/.libs"
add_path always_ld_library_path [find_libgcc_s $compiler]
} }
# #
......
libgomp/testsuite/libgomp.c++/c++.exp
...@@ -37,10 +37,12 @@ if { $lang_test_file_found } { ...@@ -37,10 +37,12 @@ if { $lang_test_file_found } {
# Gather a list of all tests. # Gather a list of all tests.
set tests [lsort [glob -nocomplain $srcdir/$subdir/*.C]] set tests [lsort [glob -nocomplain $srcdir/$subdir/*.C]]
set ld_library_path $always_ld_library_path
if { $blddir != "" } { if { $blddir != "" } {
add_path ld_library_path "${blddir}/${lang_library_path}" set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}"
} else {
set ld_library_path "$always_ld_library_path"
} }
append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST]
set_ld_library_path_env_vars set_ld_library_path_env_vars
set flags_file "${blddir}/../libstdc++-v3/scripts/testsuite_flags" set flags_file "${blddir}/../libstdc++-v3/scripts/testsuite_flags"
......
libgomp/testsuite/libgomp.c/c.exp
...@@ -20,6 +20,7 @@ dg-init ...@@ -20,6 +20,7 @@ dg-init
set tests [lsort [find $srcdir/$subdir *.c]] set tests [lsort [find $srcdir/$subdir *.c]]
set ld_library_path $always_ld_library_path set ld_library_path $always_ld_library_path
append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST]
set_ld_library_path_env_vars set_ld_library_path_env_vars
# Main loop. # Main loop.
......
libgomp/testsuite/libgomp.fortran/fortran.exp
...@@ -26,10 +26,12 @@ if { $lang_test_file_found } { ...@@ -26,10 +26,12 @@ if { $lang_test_file_found } {
# Gather a list of all tests. # Gather a list of all tests.
set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03,08}]] set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03,08}]]
set ld_library_path $always_ld_library_path
if { $blddir != "" } { if { $blddir != "" } {
add_path ld_library_path "${blddir}/${lang_library_path}" set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}"
} else {
set ld_library_path "$always_ld_library_path"
} }
append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST]
set_ld_library_path_env_vars set_ld_library_path_env_vars
# Main loop. # Main loop.
......
libjava/ChangeLog
2009-07-11 Richard Sandiford <rdsandiford@googlemail.com>
PR testsuite/40699
PR testsuite/40707
PR testsuite/40709
* testsuite/lib/libjava.exp: Revert 2009-06-30 commit.
2009-06-30 Richard Sandiford <r.sandiford@uk.ibm.com> 2009-06-30 Richard Sandiford <r.sandiford@uk.ibm.com>
* testsuite/lib/libjava.exp (libjava_init): Just add * testsuite/lib/libjava.exp (libjava_init): Just add
......
libjava/testsuite/lib/libjava.exp
...@@ -197,8 +197,36 @@ proc libjava_init { args } { ...@@ -197,8 +197,36 @@ proc libjava_init { args } {
} }
# Finally, add the gcc build directory so that we can find the # Finally, add the gcc build directory so that we can find the
# shared libgcc. # shared libgcc. This, like much of dejagnu, is hideous.
set libjava_libgcc_s_path [find_libgcc_s $GCJ_UNDER_TEST] set libjava_libgcc_s_path {}
if { [istarget "*-*-darwin*"] } {
set so_extension "dylib"
} elseif { [istarget "*-*-cygwin*"] || [istarget "*-*-mingw*"] } {
set so_extension "dll"
} else {
set so_extension "so"
}
set gccdir [lookfor_file $tool_root_dir gcc/libgcc_s.${so_extension}]
if {$gccdir != ""} {
set gccdir [file dirname $gccdir]
lappend libjava_libgcc_s_path $gccdir
verbose "libjava_libgcc_s_path = $libjava_libgcc_s_path"
set compiler ${gccdir}/xgcc
if { [is_remote host] == 0 && [which $compiler] != 0 } {
foreach i "[exec $compiler --print-multi-lib]" {
set mldir ""
regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
set mldir [string trimright $mldir "\;@"]
if { "$mldir" == "." } {
continue
}
if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.${so_extension}.*]] >= 1 } {
lappend libjava_libgcc_s_path "${gccdir}/${mldir}"
}
}
}
}
set libjava_initialized 1 set libjava_initialized 1
} }
...@@ -309,8 +337,6 @@ proc libjava_arguments {{mode compile}} { ...@@ -309,8 +337,6 @@ proc libjava_arguments {{mode compile}} {
# Basically we want to build up a colon separated path list from # Basically we want to build up a colon separated path list from
# the value of $libjava. # the value of $libjava.
# Add "." to the list so that we pick up shared libraries created
# by the testsuite itself.
set lpath "." set lpath "."
foreach dir [list $libjava] { foreach dir [list $libjava] {
foreach item [split $dir " "] { foreach item [split $dir " "] {
...@@ -444,8 +470,8 @@ proc gcj_invoke {program expectFile ld_library_additions} { ...@@ -444,8 +470,8 @@ proc gcj_invoke {program expectFile ld_library_additions} {
global ld_library_path global ld_library_path
set ld_library_path "$libjava_ld_library_path" set ld_library_path "$libjava_ld_library_path"
foreach path $ld_library_additions { if {[llength $ld_library_additions] > 0} {
add_path ld_library_path $path append ld_library_path :[join $ld_library_additions :]
} }
set_ld_library_path_env_vars set_ld_library_path_env_vars
...@@ -486,8 +512,8 @@ proc exec_gij {jarfile expectFile {ld_library_additions {}} {addl_flags {}}} { ...@@ -486,8 +512,8 @@ proc exec_gij {jarfile expectFile {ld_library_additions {}} {addl_flags {}}} {
global ld_library_path global ld_library_path
set ld_library_path "$libjava_ld_library_path" set ld_library_path "$libjava_ld_library_path"
foreach path $ld_library_additions { if {[llength $ld_library_additions] > 0} {
add_path ld_library_path $path append ld_library_path :[join $ld_library_additions :]
} }
set_ld_library_path_env_vars set_ld_library_path_env_vars
...@@ -536,8 +562,8 @@ proc libjava_invoke {errname testName optName executable inpfile resultfile ...@@ -536,8 +562,8 @@ proc libjava_invoke {errname testName optName executable inpfile resultfile
global ld_library_path global ld_library_path
set ld_library_path "$libjava_ld_library_path" set ld_library_path "$libjava_ld_library_path"
foreach path $ld_library_additions { if {[llength $ld_library_additions] > 0} {
add_path ld_library_path $path append ld_library_path :[join $ld_library_additions :]
} }
set_ld_library_path_env_vars set_ld_library_path_env_vars
......
libmudflap/ChangeLog
2009-07-11 Richard Sandiford <rdsandiford@googlemail.com>
PR testsuite/40699
PR testsuite/40707
PR testsuite/40709
* testsuite/lib/libmudflap.exp: Revert 2009-06-30 commit.
2009-07-01 Richard Guenther <rguenther@suse.de> 2009-07-01 Richard Guenther <rguenther@suse.de>
PR tree-optimization/19831 PR tree-optimization/19831
......
libmudflap/testsuite/lib/libmudflap.exp
...@@ -60,9 +60,28 @@ proc libmudflap-init { language } { ...@@ -60,9 +60,28 @@ proc libmudflap-init { language } {
# set LD_LIBRARY_PATH so that libgcc_s, libstdc++ binaries can be found. # set LD_LIBRARY_PATH so that libgcc_s, libstdc++ binaries can be found.
# locate libgcc.a so we don't need to account for different values of # locate libgcc.a so we don't need to account for different values of
# SHLIB_EXT on different platforms # SHLIB_EXT on different platforms
set ld_library_path [find_libgcc_s $cxx] set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a]
add_path ld_library_path "${cxxblddir}/src/.libs" if {$gccdir != ""} {
add_path ld_library_path "${blddir}/.libs" set gccdir [file dirname $gccdir]
}
set ld_library_path "."
append ld_library_path ":${gccdir}"
append ld_library_path ":${cxxblddir}/src/.libs"
if {[is_remote host] == 0} {
foreach i "[exec ${gccdir}/xgcc --print-multi-lib]" {
set mldir ""
regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
set mldir [string trimright $mldir "\;@"]
if { "$mldir" == "." } {
continue
}
if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.so.*]] >= 1 } {
append ld_library_path ":${gccdir}/${mldir}"
}
}
}
append ld_library_path ":${blddir}/.libs"
set libs "-L${blddir}/.libs" set libs "-L${blddir}/.libs"
set cxxflags "-ggdb3 -DDEBUG_ASSERT" set cxxflags "-ggdb3 -DDEBUG_ASSERT"
......
libstdc++-v3/ChangeLog
2009-07-11 Richard Sandiford <rdsandiford@googlemail.com>
PR testsuite/40699
PR testsuite/40707
PR testsuite/40709
* testsuite/lib/libstdc++.exp: Revert 2009-06-30 commit.
2009-07-08 Janis Johnson <janis187@us.ibm.com> 2009-07-08 Janis Johnson <janis187@us.ibm.com>
PR libstdc++/40691 PR libstdc++/40691
......
libstdc++-v3/testsuite/lib/libstdc++.exp
...@@ -132,6 +132,7 @@ proc libstdc++_init { testfile } { ...@@ -132,6 +132,7 @@ proc libstdc++_init { testfile } {
set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a] set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a]
if {$gccdir != ""} { if {$gccdir != ""} {
set gccdir [file dirname $gccdir] set gccdir [file dirname $gccdir]
append ld_library_path_tmp ":${gccdir}"
} }
v3track gccdir 3 v3track gccdir 3
...@@ -141,7 +142,7 @@ proc libstdc++_init { testfile } { ...@@ -141,7 +142,7 @@ proc libstdc++_init { testfile } {
if {$libgompdir != ""} { if {$libgompdir != ""} {
set v3-libgomp 1 set v3-libgomp 1
set libgompdir [file dirname $libgompdir] set libgompdir [file dirname $libgompdir]
add_path ld_library_path_tmp ${libgompdir} append ld_library_path_tmp ":${libgompdir}"
verbose -log "libgomp support detected" verbose -log "libgomp support detected"
} }
v3track libgompdir 3 v3track libgompdir 3
...@@ -161,8 +162,22 @@ proc libstdc++_init { testfile } { ...@@ -161,8 +162,22 @@ proc libstdc++_init { testfile } {
if {$gccdir != ""} { if {$gccdir != ""} {
set compiler ${gccdir}/g++ set compiler ${gccdir}/g++
set ld_library_path ${ld_library_path_tmp} set ld_library_path ${ld_library_path_tmp}
add_path ld_library_path "${blddir}/src/.libs" append ld_library_path ":${blddir}/src/.libs"
add_path ld_library_path [find_libgcc_s $compiler]
if { [is_remote host] == 0 && [which $compiler] != 0 } {
foreach i "[exec $compiler --print-multi-lib]" {
set mldir ""
regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
set mldir [string trimright $mldir "\;@"]
if { "$mldir" == "." } {
continue
}
if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.so.*]] >= 1 } {
append ld_library_path ":${gccdir}/${mldir}"
}
}
}
set_ld_library_path_env_vars set_ld_library_path_env_vars
if [info exists env(LD_LIBRARY_PATH)] { if [info exists env(LD_LIBRARY_PATH)] {
verbose -log "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)" verbose -log "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment