b30bfd402f
gcc/testsuite/ * 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. libffi/ * 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. libgomp/ * 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. libjava/ * 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. libmudflap/ * 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. libstdc++-v3/ * 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. From-SVN: r149113
189 lines
4.9 KiB
Plaintext
189 lines
4.9 KiB
Plaintext
# Damn dejagnu for not having proper library search paths for load_lib.
|
|
# We have to explicitly load everything that gcc-dg.exp wants to load.
|
|
|
|
proc load_gcc_lib { filename } {
|
|
global srcdir loaded_libs
|
|
|
|
load_file $srcdir/../../gcc/testsuite/lib/$filename
|
|
set loaded_libs($filename) ""
|
|
}
|
|
|
|
load_lib dg.exp
|
|
load_gcc_lib file-format.exp
|
|
load_gcc_lib target-supports.exp
|
|
load_gcc_lib target-supports-dg.exp
|
|
load_gcc_lib scanasm.exp
|
|
load_gcc_lib scandump.exp
|
|
load_gcc_lib scanrtl.exp
|
|
load_gcc_lib scantree.exp
|
|
load_gcc_lib scanipa.exp
|
|
load_gcc_lib prune.exp
|
|
load_gcc_lib target-libpath.exp
|
|
load_gcc_lib wrapper.exp
|
|
load_gcc_lib gcc-defs.exp
|
|
load_gcc_lib torture-options.exp
|
|
load_gcc_lib timeout.exp
|
|
load_gcc_lib timeout-dg.exp
|
|
load_gcc_lib gcc-dg.exp
|
|
load_gcc_lib gfortran-dg.exp
|
|
|
|
set dg-do-what-default run
|
|
|
|
#
|
|
# GCC_UNDER_TEST is the compiler under test.
|
|
#
|
|
|
|
set libgomp_compile_options ""
|
|
|
|
#
|
|
# libgomp_init
|
|
#
|
|
|
|
if [info exists TOOL_OPTIONS] {
|
|
set multilibs [get_multilibs $TOOL_OPTIONS]
|
|
} else {
|
|
set multilibs [get_multilibs]
|
|
}
|
|
|
|
proc libgomp_init { args } {
|
|
global srcdir blddir objdir tool_root_dir
|
|
global libgomp_initialized
|
|
global tmpdir
|
|
global blddir
|
|
global gluefile wrap_flags
|
|
global ALWAYS_CFLAGS
|
|
global CFLAGS
|
|
global TOOL_EXECUTABLE TOOL_OPTIONS
|
|
global GCC_UNDER_TEST
|
|
global TESTING_IN_BUILD_TREE
|
|
global target_triplet
|
|
global always_ld_library_path
|
|
|
|
set blddir [lookfor_file [get_multilibs] libgomp]
|
|
|
|
# We set LC_ALL and LANG to C so that we get the same error
|
|
# messages as expected.
|
|
setenv LC_ALL C
|
|
setenv LANG C
|
|
|
|
if ![info exists GCC_UNDER_TEST] then {
|
|
if [info exists TOOL_EXECUTABLE] {
|
|
set GCC_UNDER_TEST $TOOL_EXECUTABLE
|
|
} else {
|
|
set GCC_UNDER_TEST "[find_gcc]"
|
|
}
|
|
}
|
|
|
|
if ![info exists tmpdir] {
|
|
set tmpdir "/tmp"
|
|
}
|
|
|
|
if [info exists gluefile] {
|
|
unset gluefile
|
|
}
|
|
|
|
if {![info exists CFLAGS]} {
|
|
set CFLAGS ""
|
|
}
|
|
|
|
set always_ld_library_path "${blddir}/.libs"
|
|
add_path always_ld_library_path [find_libgcc_s $GCC_UNDER_TEST]
|
|
|
|
set ALWAYS_CFLAGS ""
|
|
if { $blddir != "" } {
|
|
lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/"
|
|
lappend ALWAYS_CFLAGS "additional_flags=-I${blddir}"
|
|
lappend ALWAYS_CFLAGS "ldflags=-L${blddir}/.libs"
|
|
}
|
|
lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}/.."
|
|
lappend ALWAYS_CFLAGS "ldflags=-lgomp"
|
|
|
|
# We use atomic operations in the testcases to validate results.
|
|
if { ([istarget i?86-*-*] || [istarget x86_64-*-*])
|
|
&& [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"
|
|
}
|
|
|
|
if [info exists TOOL_OPTIONS] {
|
|
lappend ALWAYS_CFLAGS "additional_flags=$TOOL_OPTIONS"
|
|
}
|
|
|
|
# Make sure that lines are not wrapped. That can confuse the
|
|
# error-message parsing machinery.
|
|
lappend ALWAYS_CFLAGS "additional_flags=-fmessage-length=0"
|
|
|
|
# And, gee, turn on OpenMP.
|
|
lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
|
|
}
|
|
|
|
#
|
|
# libgomp_target_compile -- compile a source file
|
|
#
|
|
|
|
proc libgomp_target_compile { source dest type options } {
|
|
global blddir
|
|
global libgomp_compile_options
|
|
global gluefile wrap_flags
|
|
global ALWAYS_CFLAGS
|
|
global GCC_UNDER_TEST
|
|
global lang_test_file
|
|
global lang_library_path
|
|
global lang_link_flags
|
|
|
|
if { [info exists lang_test_file] } {
|
|
if { $blddir != "" } {
|
|
# Some targets use libgfortran.a%s in their specs, so they need
|
|
# a -B option for uninstalled testing.
|
|
lappend options "additional_flags=-B${blddir}/${lang_library_path}"
|
|
lappend options "ldflags=-L${blddir}/${lang_library_path}"
|
|
}
|
|
lappend options "ldflags=${lang_link_flags}"
|
|
}
|
|
|
|
if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } {
|
|
lappend options "libs=${gluefile}"
|
|
lappend options "ldflags=${wrap_flags}"
|
|
}
|
|
|
|
lappend options "additional_flags=[libio_include_flags]"
|
|
lappend options "timeout=[timeout_value]"
|
|
lappend options "compiler=$GCC_UNDER_TEST"
|
|
|
|
set options [concat $libgomp_compile_options $options]
|
|
|
|
if [info exists ALWAYS_CFLAGS] {
|
|
set options [concat "$ALWAYS_CFLAGS" $options]
|
|
}
|
|
|
|
set options [dg-additional-files-options $options $source]
|
|
|
|
set result [target_compile $source $dest $type $options]
|
|
|
|
return $result
|
|
}
|
|
|
|
proc libgomp_option_help { } {
|
|
send_user " --additional_options,OPTIONS\t\tUse OPTIONS to compile the testcase files. OPTIONS should be comma-separated.\n"
|
|
}
|
|
|
|
proc libgomp_option_proc { option } {
|
|
if [regexp "^--additional_options," $option] {
|
|
global libgomp_compile_options
|
|
regsub "--additional_options," $option "" option
|
|
foreach x [split $option ","] {
|
|
lappend libgomp_compile_options "additional_flags=$x"
|
|
}
|
|
return 1
|
|
} else {
|
|
return 0
|
|
}
|
|
}
|