gdb/testsuite/

* gdb.base/break-interp.exp: Use ldlags for linking flags.
	* gdb.base/prelink.exp: Likewise.
	* gdb.base/solib-nodir.exp: Likewise.
	* lib/gdb.exp (gdb_compile) <*-*-openbsd*>
	(gdb_compile) <shlib_load>: Use ldlags for linking flags.
	* lib/prelink-support.exp (build_executable_own_libs): Likewise.
This commit is contained in:
Jan Kratochvil 2010-10-12 18:12:49 +00:00
parent e0cc584ecf
commit d8b34041e0
6 changed files with 17 additions and 8 deletions

View File

@ -1,3 +1,12 @@
2010-10-12 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb.base/break-interp.exp: Use ldlags for linking flags.
* gdb.base/prelink.exp: Likewise.
* gdb.base/solib-nodir.exp: Likewise.
* lib/gdb.exp (gdb_compile) <*-*-openbsd*>
(gdb_compile) <shlib_load>: Use ldlags for linking flags.
* lib/prelink-support.exp (build_executable_own_libs): Likewise.
2010-10-12 Ulrich Weigand <uweigand@de.ibm.com>
* break-interp.exp (test_ld): Use two separate gdb_expect statements

View File

@ -35,7 +35,7 @@ if [get_compiler_info ${binfile_lib}] {
# Use -soname so that the new library gets copied by build_executable_own_libs.
if {[gdb_compile_shlib ${srcdir}/${subdir}/${srcfile_lib} ${binfile_lib} [list debug additional_flags=-Wl,-soname,${test}.so]] != ""} {
if {[gdb_compile_shlib ${srcdir}/${subdir}/${srcfile_lib} ${binfile_lib} [list debug ldflags=-Wl,-soname,${test}.so]] != ""} {
return -1
}
@ -622,7 +622,7 @@ foreach ldprelink {NO YES} {
set pf_prefix $old_binprefix
lappend pf_prefix "$binname:"
set opts "additional_flags=-Wl,$binfile_lib,-rpath,[file dirname $binfile_lib]"
set opts "ldflags=-Wl,$binfile_lib,-rpath,[file dirname $binfile_lib]"
if {$binsepdebug != "NO"} {
lappend opts {debug}
}

View File

@ -44,7 +44,7 @@ set libfile ${objdir}/${subdir}/${testfile}.so
# Use -soname so that the new library gets copied by build_executable_own_libs.
if { [gdb_compile_shlib "${srcdir}/${subdir}/${libsrcfile}" "${libfile}" [list debug "additional_flags=-Wl,-soname,[file tail ${libfile}]"]] != ""} {
if { [gdb_compile_shlib "${srcdir}/${subdir}/${libsrcfile}" "${libfile}" [list debug "ldflags=-Wl,-soname,[file tail ${libfile}]"]] != ""} {
# If creating the shared library fails, maybe we don't have the right tools
return -1
}
@ -52,7 +52,7 @@ if { [gdb_compile_shlib "${srcdir}/${subdir}/${libsrcfile}" "${libfile}" [list d
set srcfile ${testfile}.c
set executable ${testfile}t
set binfile ${objdir}/${subdir}/${executable}
set prelink_args [build_executable_own_libs ${testfile}.exp $executable $srcfile [list debug "additional_flags=-Wl,${libfile},-rpath,[file dirname ${libfile}]"]]
set prelink_args [build_executable_own_libs ${testfile}.exp $executable $srcfile [list debug "ldflags=-Wl,${libfile},-rpath,[file dirname ${libfile}]"]]
if {$prelink_args == ""} {
return -1
}

View File

@ -32,7 +32,7 @@ set binfile ${objdir}/${subdir}/${executable}
# build the first test case
if { [get_compiler_info unused]
|| [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" "${binlibfile}" [list debug additional_flags=-Wl,-soname,${binlibfilebase}]] != ""
|| [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" "${binlibfile}" [list debug ldflags=-Wl,-soname,${binlibfilebase}]] != ""
|| [gdb_gnu_strip_debug $binlibfile]
|| [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object {debug}] != ""
|| [gdb_compile "${objfile} ${binlibfile}" "${binfile}" executable {}] != "" } {

View File

@ -2010,7 +2010,7 @@ proc gdb_compile {source dest type options} {
|| [istarget hppa*-*-hpux*])} {
# Do not need anything.
} elseif { [istarget *-*-openbsd*] } {
lappend new_options "additional_flags=-Wl,-rpath,${outdir}"
lappend new_options "ldflags=-Wl,-rpath,${outdir}"
} elseif { [istarget arm*-*-symbianelf*] } {
if { $shlib_load } {
lappend new_options "libs=-ldl"
@ -2019,7 +2019,7 @@ proc gdb_compile {source dest type options} {
if { $shlib_load } {
lappend new_options "libs=-ldl"
}
lappend new_options "additional_flags=-Wl,-rpath,\\\$ORIGIN"
lappend new_options "ldflags=-Wl,-rpath,\\\$ORIGIN"
}
}
set options $new_options

View File

@ -164,7 +164,7 @@ proc build_executable_own_libs {testname executable sources options {interp ""}
# Do not lappend it so that "-rpath $dir" overrides any possible "-rpath"s
# specified by the caller to be able to link it for ldd" above.
set options [linsert $options 0 "additional_flags=-Wl,--dynamic-linker,$interp,-rpath,$dir"]
set options [linsert $options 0 "ldflags=-Wl,--dynamic-linker,$interp,-rpath,$dir"]
if {[build_executable $testname $executable $sources $options] == -1} {
return ""