+2009-06-30 Richard Sandiford <r.sandiford@uk.ibm.com>
+
+ * lib/gcc-defs.exp (gcc-set-multilib-library-path): Delete.
+ * lib/target-libpath.exp (ld_library_path_vars): New variable.
+ (init_ld_library_path_env_vars): New function, replacing the
+ orig_*_saved assignments. Call it after defining it.
+ (set_ld_library_path_env_vars): Rewrite to use ld_library_path_vars.
+ (restore_ld_library_path_env_vars): Likewise.
+ (add_path, find_libgcc_s): New functions.
+ * lib/objc.exp (objc_init): Use find_libgcc_s instead of
+ gcc-set-multilib-library-path.
+ (objc_target_compile): Don't add "." to ld_library_path.
+ Use add_path.
+ * lib/gfortran.exp (gfortran_link_flags): Don't add "." to
+ ld_library_path. Use add_path. Use find_libgcc_s instead of
+ gcc-set-multilib-library-path.
+ * lib/g++.exp (g++_link_flags): Likewise.
+ * lib/obj-c++.exp (obj-c++_link_flags): Likewise.
+ * lib/c-torture.exp: Do not manipulate ld_library_path at the
+ top level; do it...
+ (c-torture-execute): ...here instead. Use $ld_library_path_multilib
+ to tell when this needs to happen. Use find_libgcc_s instead of
+ gcc-set-multilib-library-path.
+ * lib/gcc-dg.exp: Likewise.
+ * lib/gnat.exp (gnat_target_compile): Don't add "." to ld_library_path.
+ * g++.dg/compat/compat.exp (alt_ld_library_path): Don't add "."
+ unless it is in $ALT_LD_LIBRARY_PATH.
+ * g++.dg/compat/struct-layout-1.exp (alt_ld_library_path): Likewise.
+
2009-06-30 Eric Botcazou <ebotcazou@adacore.com>
* gnat.dg/discr12.adb: New test.
# are different.
set use_alt 0
set same_alt 0
-set alt_ld_library_path "."
+set alt_ld_library_path ""
if [info exists ALT_CXX_UNDER_TEST] then {
set use_alt 1
if [string match "same" $ALT_CXX_UNDER_TEST] then {
set same_alt 1
} else {
if [info exists ALT_LD_LIBRARY_PATH] then {
- append alt_ld_library_path ":${ALT_LD_LIBRARY_PATH}"
+ set alt_ld_library_path $ALT_LD_LIBRARY_PATH
}
}
}
# are different.
set use_alt 0
set same_alt 0
-set alt_ld_library_path "."
+set alt_ld_library_path ""
if [info exists ALT_CXX_UNDER_TEST] then {
set use_alt 1
if [string match "same" $ALT_CXX_UNDER_TEST] then {
set same_alt 1
} else {
if [info exists ALT_LD_LIBRARY_PATH] then {
- append alt_ld_library_path ":${ALT_LD_LIBRARY_PATH}"
+ set alt_ld_library_path $ALT_LD_LIBRARY_PATH
}
}
}
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
#
#
proc c-torture-execute { sources args } {
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.
set src [lindex $sources 0]
set gccpath ${paths}
set libio_dir ""
set flags ""
- set ld_library_path "."
+ set ld_library_path ""
set shlib_ext [get_shlib_extension]
verbose "shared lib extension: $shlib_ext"
if { $gccpath != "" } {
if [file exists "${gccpath}/lib/libstdc++.a"] {
- append ld_library_path ":${gccpath}/lib"
+ add_path ld_library_path "${gccpath}/lib"
}
if [file exists "${gccpath}/libg++/libg++.a"] {
append flags "-L${gccpath}/libg++ "
- append ld_library_path ":${gccpath}/libg++"
+ add_path ld_library_path "${gccpath}/libg++"
}
if [file exists "${gccpath}/libstdc++/libstdc++.a"] {
append flags "-L${gccpath}/libstdc++ "
- append ld_library_path ":${gccpath}/libstdc++"
+ add_path ld_library_path "${gccpath}/libstdc++"
}
if [file exists "${gccpath}/libstdc++-v3/src/.libs/libstdc++.a"] {
append flags " -L${gccpath}/libstdc++-v3/src/.libs "
- append ld_library_path ":${gccpath}/libstdc++-v3/src/.libs"
+ add_path ld_library_path "${gccpath}/libstdc++-v3/src/.libs"
}
# Look for libstdc++.${shlib_ext}.
if [file exists "${gccpath}/libstdc++-v3/src/.libs/libstdc++.${shlib_ext}"] {
append flags " -L${gccpath}/libstdc++-v3/src/.libs "
- append ld_library_path ":${gccpath}/libstdc++-v3/src/.libs"
+ add_path ld_library_path "${gccpath}/libstdc++-v3/src/.libs"
}
-
if [file exists "${gccpath}/libiberty/libiberty.a"] {
append flags "-L${gccpath}/libiberty "
}
if [file exists "${gccpath}/librx/librx.a"] {
append flags "-L${gccpath}/librx "
}
- append ld_library_path [gcc-set-multilib-library-path $GXX_UNDER_TEST]
+ add_path ld_library_path [find_libgcc_s $GXX_UNDER_TEST]
} else {
global tool_root_dir
set libgpp [lookfor_file ${tool_root_dir} libg++]
if { $libgpp != "" } {
append flags "-L${libgpp} "
- append ld_library_path ":${libgpp}"
+ add_path ld_library_path ${libgpp}
}
set libstdcpp [lookfor_file ${tool_root_dir} libstdc++]
if { $libstdcpp != "" } {
append flags "-L${libstdcpp} "
- append ld_library_path ":${libstdcpp}"
+ add_path ld_library_path ${libstdcpp}
}
set libiberty [lookfor_file ${tool_root_dir} libiberty]
if { $libiberty != "" } {
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
-}
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.
proc gcc-dg-test-1 { target_compile prog do_what extra_tool_flags } {
set output_file "[file rootname [file tail $prog]].o"
}
"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"
# FIXME: "./" is to cope with "." not being in $PATH.
# Should this be handled elsewhere?
set gccpath ${paths}
set libio_dir ""
set flags ""
- set ld_library_path "."
+ set ld_library_path ""
set shlib_ext [get_shlib_extension]
verbose "shared lib extension: $shlib_ext"
# for uninstalled testing.
append flags "-B${gccpath}/libgfortran/.libs "
append flags "-L${gccpath}/libgfortran/.libs "
- append ld_library_path ":${gccpath}/libgfortran/.libs"
+ add_path ld_library_path "${gccpath}/libgfortran/.libs"
}
if [file exists "${gccpath}/libgfortran/.libs/libgfortran.${shlib_ext}"] {
append flags "-L${gccpath}/libgfortran/.libs "
- append ld_library_path ":${gccpath}/libgfortran/.libs"
+ add_path ld_library_path "${gccpath}/libgfortran/.libs"
}
if [file exists "${gccpath}/libgfortran/libgforbegin.a"] {
append flags "-L${gccpath}/libgfortran "
if [file exists "${gccpath}/libiberty/libiberty.a"] {
append flags "-L${gccpath}/libiberty "
}
- append ld_library_path \
- [gcc-set-multilib-library-path $GFORTRAN_UNDER_TEST]
+ add_path ld_library_path [find_libgcc_s $GFORTRAN_UNDER_TEST]
}
set_ld_library_path_env_vars
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 "timeout=[timeout_value]"
set gccpath ${paths}
set libio_dir ""
set flags ""
- set ld_library_path "."
+ set ld_library_path ""
set shlib_ext [get_shlib_extension]
verbose "shared lib extension: $shlib_ext"
if { $gccpath != "" } {
if [file exists "${gccpath}/lib/libstdc++.a"] {
- append ld_library_path ":${gccpath}/lib"
+ add_path ld_library_path "${gccpath}/lib"
}
if [file exists "${gccpath}/libg++/libg++.a"] {
append flags "-L${gccpath}/libg++ "
- append ld_library_path ":${gccpath}/libg++"
+ add_path ld_library_path "${gccpath}/libg++"
}
if [file exists "${gccpath}/libstdc++/libstdc++.a"] {
append flags "-L${gccpath}/libstdc++ "
- append ld_library_path ":${gccpath}/libstdc++"
+ add_path ld_library_path "${gccpath}/libstdc++"
}
if [file exists "${gccpath}/libstdc++-v3/src/.libs/libstdc++.a"] {
append flags " -L${gccpath}/libstdc++-v3/src/.libs "
- append ld_library_path ":${gccpath}/libstdc++-v3/src/.libs"
+ add_path ld_library_path "${gccpath}/libstdc++-v3/src/.libs"
}
# Look for libstdc++.${shlib_ext}.
if [file exists "${gccpath}/libstdc++-v3/src/.libs/libstdc++.${shlib_ext}"] {
append flags " -L${gccpath}/libstdc++-v3/src/.libs "
- append ld_library_path ":${gccpath}/libstdc++-v3/src/.libs"
+ add_path ld_library_path "${gccpath}/libstdc++-v3/src/.libs"
}
if [file exists "${gccpath}/libiberty/libiberty.a"] {
append flags "-L${gccpath}/libiberty "
if { $libobjc_dir != "" } {
set libobjc_dir [file dirname ${libobjc_dir}]
append flags "-L${libobjc_dir}"
- append ld_library_path ":${libobjc_dir}"
+ add_path ld_library_path ${libobjc_dir}
}
- append ld_library_path \
- [gcc-set-multilib-library-path $OBJCXX_UNDER_TEST]
-
+ add_path ld_library_path [find_libgcc_s $OBJCXX_UNDER_TEST]
} else {
global tool_root_dir;
set libgpp [lookfor_file ${tool_root_dir} libg++];
if { $libgpp != "" } {
append flags "-L${libgpp} ";
- append ld_library_path ":${libgpp}"
+ add_path ld_library_path ${libgpp}
}
set libstdcpp [lookfor_file ${tool_root_dir} libstdc++];
if { $libstdcpp != "" } {
append flags "-L${libstdcpp} ";
- append ld_library_path ":${libstdcpp}"
+ add_path ld_library_path ${libstdcpp}
}
set libiberty [lookfor_file ${tool_root_dir} libiberty];
if { $libiberty != "" } {
objc_maybe_build_wrapper "${tmpdir}/objc-testglue.o"
- set objc_libgcc_s_path [gcc-set-multilib-library-path $OBJC_UNDER_TEST]
+ set objc_libgcc_s_path [find_libgcc_s $OBJC_UNDER_TEST]
}
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"
set libobjc_dir [file dirname ${libobjc_dir}]
set objc_link_flags "-L${libobjc_dir}"
lappend options "additional_flags=${objc_link_flags}"
- append ld_library_path ":${libobjc_dir}"
+ add_path ld_library_path ${libobjc_dir}
}
if { $type == "precompiled_header" } {
# If we generating a precompiled header, we have say this is an
# 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_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_checked 0
-
+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 orig_environment_saved
- 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_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 TEST_GCC_EXEC_PREFIX
- global env
-
- # Save the original GCC_EXEC_PREFIX.
- if { $orig_gcc_exec_prefix_checked == 0 } {
- if [info exists env(GCC_EXEC_PREFIX)] {
- set orig_gcc_exec_prefix "$env(GCC_EXEC_PREFIX)"
- set orig_gcc_exec_prefix_saved 1
+ global ld_library_path
+ global orig_environment_saved
+ global ld_library_path_vars
+ global orig_gcc_exec_prefix_saved
+ global orig_gcc_exec_prefix_checked
+ global orig_gcc_exec_prefix
+ global TEST_GCC_EXEC_PREFIX
+ global ld_library_path_multilib
+ global env
+
+ # Save the original GCC_EXEC_PREFIX.
+ if { $orig_gcc_exec_prefix_checked == 0 } {
+ if [info exists env(GCC_EXEC_PREFIX)] {
+ set orig_gcc_exec_prefix "$env(GCC_EXEC_PREFIX)"
+ set orig_gcc_exec_prefix_saved 1
+ }
+ set orig_gcc_exec_prefix_checked 1
}
- set orig_gcc_exec_prefix_checked 1
- }
-
- # Set GCC_EXEC_PREFIX for the compiler under test to pick up files not in
- # the build tree from a specified location (normally the install tree).
- if [info exists TEST_GCC_EXEC_PREFIX] {
- setenv GCC_EXEC_PREFIX "$TEST_GCC_EXEC_PREFIX"
- }
- # Setting the ld library path causes trouble when testing cross-compilers.
- if { [is_remote target] } {
- return
- }
-
- if { $orig_environment_saved == 0 } {
- set orig_environment_saved 1
-
- # Save the original environment.
- 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
+ # Set GCC_EXEC_PREFIX for the compiler under test to pick up files not in
+ # the build tree from a specified location (normally the install tree).
+ if [info exists TEST_GCC_EXEC_PREFIX] {
+ setenv GCC_EXEC_PREFIX "$TEST_GCC_EXEC_PREFIX"
}
- if [info exists env(DYLD_LIBRARY_PATH)] {
- set orig_dyld_library_path "$env(DYLD_LIBRARY_PATH)"
- set orig_dyld_library_path_saved 1
- }
- }
- # We need to set ld library path in the environment. Currently,
- # unix.exp doesn't set the environment correctly for all systems.
- # It only sets SHLIB_PATH and LD_LIBRARY_PATH when it executes a
- # 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"
- }
- # The default shared library dynamic path search for 64-bit
- # HP-UX executables searches LD_LIBRARY_PATH before SHLIB_PATH.
- # LD_LIBRARY_PATH isn't used for 32-bit executables. Thus, we
- # set LD_LIBRARY_PATH and SHLIB_PATH as if they were independent.
- if { $orig_shlib_path_saved } {
- 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"
- }
- 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"
- }
- 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"
- }
+ # Setting the ld library path causes trouble when testing cross-compilers.
+ if { [is_remote target] } {
+ return
+ }
- verbose -log "set_ld_library_path_env_vars: ld_library_path=$ld_library_path"
+ set ld_library_path_multilib [board_info target multilib_flags]
+
+ foreach spec $ld_library_path_vars {
+ set var [lindex $spec 0]
+ set lvar [string tolower $var]
+
+ global orig_$lvar
+ global orig_${lvar}_saved
+
+ if { $orig_environment_saved == 0 } {
+ if [info exists env($var)] {
+ set orig_$lvar [set env($var)]
+ set orig_${lvar}_saved 1
+ }
+ }
+ set value $ld_library_path
+ foreach extra $spec {
+ set lextra [string tolower $extra]
+ if [set orig_${lextra}_saved] {
+ add_path value [set orig_$lextra]
+ break
+ }
+ }
+ setenv $var $value
+ }
+ set orig_environment_saved 1
+ verbose -log "set_ld_library_path_env_vars: ld_library_path=$ld_library_path"
}
#######################################
#######################################
proc restore_ld_library_path_env_vars { } {
- global orig_environment_saved
- 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_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 env
+ global orig_environment_saved
+ global ld_library_path_vars
+ global orig_gcc_exec_prefix_saved
+ global orig_gcc_exec_prefix
+ global env
+
+ if { $orig_gcc_exec_prefix_saved } {
+ setenv GCC_EXEC_PREFIX "$orig_gcc_exec_prefix"
+ } elseif [info exists env(GCC_EXEC_PREFIX)] {
+ unsetenv GCC_EXEC_PREFIX
+ }
- if { $orig_gcc_exec_prefix_saved } {
- setenv GCC_EXEC_PREFIX "$orig_gcc_exec_prefix"
- } elseif [info exists env(GCC_EXEC_PREFIX)] {
- unsetenv GCC_EXEC_PREFIX
- }
+ if { $orig_environment_saved == 0 } {
+ return
+ }
+
+ foreach spec $ld_library_path_vars {
+ set var [lindex $spec 0]
+ set lvar [string tolower $var]
- if { $orig_environment_saved == 0 } {
- return
- }
+ global orig_$lvar
+ global orig_${lvar}_saved
- if { $orig_ld_library_path_saved } {
- setenv LD_LIBRARY_PATH "$orig_ld_library_path"
- } elseif [info exists env(LD_LIBRARY_PATH)] {
- unsetenv LD_LIBRARY_PATH
- }
- if { $orig_ld_run_path_saved } {
- setenv LD_RUN_PATH "$orig_ld_run_path"
- } elseif [info exists env(LD_RUN_PATH)] {
- unsetenv LD_RUN_PATH
- }
- 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
- }
+ if [set orig_${lvar}_saved] {
+ setenv $var [set orig_$lvar]
+ } elseif [info exists env($var)] {
+ unsetenv $var
+ }
+ }
}
#######################################
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
+}
+2009-06-30 Richard Sandiford <r.sandiford@uk.ibm.com>
+
+ * testsuite/lib/libffi-dg.exp (libffi-init): Don't add "."
+ to ld_library_path. Use add_path. Add just find_libgcc_s
+ to ld_library_path, not every libgcc multilib directory.
+
2009-06-16 Wim Lewis <wiml@hhhh.org>
* src/powerpc/ffi.c: Avoid clobbering cr3 and cr4, which are
verbose "libstdc++ $blddircxx"
set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a]
- if {$gccdir != ""} {
- set gccdir [file dirname $gccdir]
- }
- 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_path ld_library_path [find_libgcc_s "$gccdir/xgcc"]
# add the library path for libffi.
- append ld_library_path ":${blddirffi}/.libs"
+ add_path ld_library_path "${blddirffi}/.libs"
# add the library path for libstdc++ as well.
- append ld_library_path ":${blddircxx}/src/.libs"
+ add_path ld_library_path "${blddircxx}/src/.libs"
verbose "ld_library_path: $ld_library_path"
+2009-06-30 Richard Sandiford <r.sandiford@uk.ibm.com>
+
+ * testsuite/lib/libgomp.exp (libgomp_init): Don't add "." to
+ ld_library_path. Use add_path. Add just find_libgcc_s to
+ ld_library_path, not every libgcc multilib directory.
+ * testsuite/libgomp.c/c.exp (ld_library_path): Don't call
+ gcc-set-multilib-library-path; rely on $always_ld_library_path instead.
+ * testsuite/libgomp.c++/c++.exp (ld_library_path): Likewise.
+ Use add_path.
+ * testsuite/libgomp.fortran/fortran.exp (ld_library_path): Likewise.
+
2009-06-09 Nathan Froyd <froydnj@codesourcery.com>
* Makefile.am (LTLDFLAGS): Define.
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_ld_library_path "${blddir}/.libs"
+ add_path always_ld_library_path [find_libgcc_s $GCC_UNDER_TEST]
set ALWAYS_CFLAGS ""
if { $blddir != "" } {
# Gather a list of all tests.
set tests [lsort [glob -nocomplain $srcdir/$subdir/*.C]]
+ set ld_library_path $always_ld_library_path
if { $blddir != "" } {
- set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}"
- } else {
- set ld_library_path "$always_ld_library_path"
+ add_path ld_library_path "${blddir}/${lang_library_path}"
}
- append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST]
set_ld_library_path_env_vars
set flags_file "${blddir}/../libstdc++-v3/scripts/testsuite_flags"
set tests [lsort [find $srcdir/$subdir *.c]]
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
# Main loop.
# Gather a list of all tests.
set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03,08}]]
+ set ld_library_path $always_ld_library_path
if { $blddir != "" } {
- set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}"
- } else {
- set ld_library_path "$always_ld_library_path"
+ add_path ld_library_path "${blddir}/${lang_library_path}"
}
- append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST]
set_ld_library_path_env_vars
# Main loop.
+2009-06-30 Richard Sandiford <r.sandiford@uk.ibm.com>
+
+ * testsuite/lib/libjava.exp (libjava_init): Just add
+ find_libgcc_s to libjava_libgcc_s_path, rather than every
+ libgcc multilib directory.
+ (libjava_arguments): Explain why we add "." to ld_library_path.
+ (gcj_invoke, exec_gij, libjava_invoke): Use add_path.
+
2009-06-22 Matthias Klose <doko@ubuntu.com>
* libtool-version: Bump soversion.
}
# Finally, add the gcc build directory so that we can find the
- # shared libgcc. This, like much of dejagnu, is hideous.
- 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}"
- }
- }
- }
- }
+ # shared libgcc.
+ set libjava_libgcc_s_path [find_libgcc_s $GCJ_UNDER_TEST]
set libjava_initialized 1
}
# Basically we want to build up a colon separated path list from
# the value of $libjava.
+ # Add "." to the list so that we pick up shared libraries created
+ # by the testsuite itself.
set lpath "."
foreach dir [list $libjava] {
foreach item [split $dir " "] {
global ld_library_path
set ld_library_path "$libjava_ld_library_path"
- if {[llength $ld_library_additions] > 0} {
- append ld_library_path :[join $ld_library_additions :]
+ foreach path $ld_library_additions {
+ add_path ld_library_path $path
}
set_ld_library_path_env_vars
global ld_library_path
set ld_library_path "$libjava_ld_library_path"
- if {[llength $ld_library_additions] > 0} {
- append ld_library_path :[join $ld_library_additions :]
+ foreach path $ld_library_additions {
+ add_path ld_library_path $path
}
set_ld_library_path_env_vars
global ld_library_path
set ld_library_path "$libjava_ld_library_path"
- if {[llength $ld_library_additions] > 0} {
- append ld_library_path :[join $ld_library_additions :]
+ foreach path $ld_library_additions {
+ add_path ld_library_path $path
}
set_ld_library_path_env_vars
+2009-06-30 Richard Sandiford <r.sandiford@uk.ibm.com>
+
+ * testsuite/lib/libmudflap.exp (libmudflap-init): Don't add "."
+ to ld_library_path. Use add_path. Add just find_libgcc_s to
+ ld_library_path, not every libgcc multilib directory.
+
2009-04-09 Nick Clifton <nickc@redhat.com>
* mf-hooks1.c: Change copyright header to refer to version 3
# 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
# SHLIB_EXT on different platforms
- set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a]
- if {$gccdir != ""} {
- 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 ld_library_path [find_libgcc_s $cxx]
+ add_path ld_library_path "${cxxblddir}/src/.libs"
+ add_path ld_library_path "${blddir}/.libs"
set libs "-L${blddir}/.libs"
set cxxflags "-ggdb3 -DDEBUG_ASSERT"
+2009-06-30 Richard Sandiford <r.sandiford@uk.ibm.com>
+
+ * testsuite/lib/libstdc++.exp (libstdc++_init): Don't add "."
+ to ld_library_path. Use add_path. Add just find_libgcc_s to
+ ld_library_path, not every libgcc multilib directory.
+
2009-06-30 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/40600
set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a]
if {$gccdir != ""} {
set gccdir [file dirname $gccdir]
- append ld_library_path_tmp ":${gccdir}"
}
v3track gccdir 3
if {$libgompdir != ""} {
set v3-libgomp 1
set libgompdir [file dirname $libgompdir]
- append ld_library_path_tmp ":${libgompdir}"
+ add_path ld_library_path_tmp ${libgompdir}
verbose -log "libgomp support detected"
}
v3track libgompdir 3
if {$gccdir != ""} {
set compiler ${gccdir}/g++
set ld_library_path ${ld_library_path_tmp}
- append ld_library_path ":${blddir}/src/.libs"
-
- 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_path ld_library_path "${blddir}/src/.libs"
+ add_path ld_library_path [find_libgcc_s $compiler]
set_ld_library_path_env_vars
if [info exists env(LD_LIBRARY_PATH)] {
verbose -log "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)"
projects / fpga / lx-cpu1 / gcc-tumbl.git / commitdiff