@@ -38,7 +38,7 @@ if ![gdb_target_supports_trace] {
}
set libipa [get_in_proc_agent]
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
# Can't use prepare_for_testing, because that splits compiling into
# building objects and then linking, and we'd fail with "linker input
@@ -51,7 +51,7 @@ proc one_catch_load_test {scenario kind match sostop} {
global decimal gdb_prompt
clean_restart $testfile
- gdb_load_shlibs $binfile2
+ gdb_load_shlib $binfile2
if {![runto_main]} {
fail "can't run to main"
@@ -55,8 +55,8 @@ if { [gdb_compile "${srcdir}/${subdir}/${executable}.c" \
}
clean_restart $executable
-gdb_load_shlibs $libobj1
-gdb_load_shlibs $libobj2
+gdb_load_shlib $libobj1
+gdb_load_shlib $libobj2
if ![runto_main] {
untested "could not run to main"
@@ -63,7 +63,7 @@ with_test_prefix "without symbols" {
"single pending dprintf info"
gdb_load ${binfile}
- gdb_load_shlibs $lib_sl
+ gdb_load_shlib $lib_sl
gdb_run_cmd
@@ -71,7 +71,7 @@ with_test_prefix "without symbols" {
}
clean_restart ${binfile}
-gdb_load_shlibs $lib_sl
+gdb_load_shlib $lib_sl
#
# Test setting, querying, and modifying pending breakpoints
@@ -57,8 +57,8 @@ if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable \
}
clean_restart $binfile
-gdb_load_shlibs $binfile_libdso2
-gdb_load_shlibs $binfile_libdso1
+gdb_load_shlib $binfile_libdso2
+gdb_load_shlib $binfile_libdso1
if { ![runto_main] } {
return -1
@@ -44,7 +44,7 @@ gdb_exit
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-gdb_load_shlibs ${lib_sl}
+gdb_load_shlib ${lib_sl}
if ![runto_main] then {
fail "Can't run to main"
@@ -36,7 +36,7 @@ set objfile [standard_output_file ${testfile}.o]
}
clean_restart ${binfile}
-gdb_load_shlibs ${binfile_lib}
+gdb_load_shlib ${binfile_lib}
if ![runto lib] {
return -1
@@ -49,7 +49,7 @@ if {![gdb_gcore_cmd $gcorefile "save a corefile"]} {
# Now restart gdb and load the corefile.
clean_restart ${binfile}
-gdb_load_shlibs ${binfile_lib}
+gdb_load_shlib ${binfile_lib}
gdb_test "core ${gcorefile}" "Core was generated by .*" "re-load generated corefile"
@@ -42,7 +42,7 @@ if { [gdb_compile_shlib $libsrc $libobj {debug}] != ""
}
clean_restart ${binfile}
-gdb_load_shlibs $libobj
+gdb_load_shlib $libobj
if ![runto_main] then {
fail "Can't run to main"
@@ -45,8 +45,8 @@ if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable \
}
clean_restart $binfile
-gdb_load_shlibs $binfile_lib1
-gdb_load_shlibs $binfile_lib2
+gdb_load_shlib $binfile_lib1
+gdb_load_shlib $binfile_lib2
if { ![runto_main] } {
return -1
@@ -59,7 +59,7 @@ if { [gdb_compile_shlib ${srcdir}/${subdir}/$libsrc $lib_so $lib_opts] != ""
# Start with a fresh gdb.
clean_restart $executable
-gdb_load_shlibs ${lib_so}
+gdb_load_shlib ${lib_so}
if ![runto_main] then {
fail "Can't run to main"
@@ -41,7 +41,7 @@ if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib_src} ${lib_so} $lib_opts] != "
}
clean_restart $binfile
-gdb_load_shlibs $lib_so
+gdb_load_shlib $lib_so
if ![runto_main] then {
fail "Can't run to main"
@@ -68,7 +68,7 @@ proc one_jit_test {count match_str} {
global verbose testfile srcfile2 binfile2 binfile2_dlopen solib_binfile_target solib_binfile_test_msg
clean_restart $testfile
- gdb_load_shlibs $binfile2
+ gdb_load_shlib $binfile2
# This is just to help debugging when things fail
if {$verbose > 0} {
@@ -62,7 +62,7 @@ gdb_test "info break" \
"single pending breakpoint info (without symbols)"
gdb_load ${binfile}
-gdb_load_shlibs $lib_sl
+gdb_load_shlib $lib_sl
set pendfunc1_loc [gdb_get_line_number "y = x + 4" ${libfile}.c]
@@ -79,7 +79,7 @@ gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-gdb_load_shlibs $lib_sl
+gdb_load_shlib $lib_sl
#
# Test setting, querying, and modifying pending breakpoints
@@ -46,8 +46,8 @@ if { [gdb_compile "${srcdir}/${subdir}/${executable}.c" \
}
clean_restart $executable
-gdb_load_shlibs $libobj1
-gdb_load_shlibs $libobj2
+gdb_load_shlib $libobj1
+gdb_load_shlib $libobj2
if ![runto_main] {
untested "could not run to main"
@@ -38,7 +38,7 @@ if { [gdb_compile ${objfile} ${binfile} executable $opts] != "" } {
}
clean_restart ${binfile}
-gdb_load_shlibs ${binfile_lib}
+gdb_load_shlib ${binfile_lib}
if ![runto lib] {
return -1
@@ -57,8 +57,8 @@ if { [gdb_compile_shlib ${lib1src} ${lib1} $lib_opts] != ""
# Start with a fresh gdb.
clean_restart ${binfile}
-gdb_load_shlibs $lib1
-gdb_load_shlibs $lib2
+gdb_load_shlib $lib1
+gdb_load_shlib $lib2
gdb_test_no_output "set print sevenbit-strings"
gdb_test_no_output "set print address off"
@@ -72,8 +72,8 @@ if { [gdb_compile_shlib $lib1src $lib1_sl $lib_opts] != ""} {
# Start with a fresh gdb.
clean_restart $binfile
-gdb_load_shlibs $lib1_sl
-gdb_load_shlibs $lib2_sl
+gdb_load_shlib $lib1_sl
+gdb_load_shlib $lib2_sl
# Load up the shared objects
if ![runto_main] then {
@@ -40,7 +40,7 @@ if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
# Start with a fresh gdb
clean_restart ${binfile}
-gdb_load_shlibs $lib_sl
+gdb_load_shlib $lib_sl
# This program implicitly loads SOM shared libraries.
#
@@ -53,7 +53,7 @@ gdb_exit
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-gdb_load_shlibs $libobj
+gdb_load_shlib $libobj
if ![runto_main] then {
fail "Can't run to main"
@@ -41,7 +41,7 @@ if { [get_compiler_info]
}
clean_restart $executable
-gdb_load_shlibs ${binlibfile}
+gdb_load_shlib ${binlibfile}
gdb_test_no_output "set env LD_LIBRARY_PATH=:"
gdb_test "cd ${binlibfiledir}" "Working directory [string_to_regexp ${binlibfiledir}]\\." "cd OBJDIR/${subdir}"
@@ -99,8 +99,8 @@ foreach prelink_lib1 {0x40000000 0x50000000} { with_test_prefix "$prelink_lib1"
clean_restart ${binfile_base}
# This testcase currently does not support remote targets.
- # gdb_load_shlibs ${binfile_lib1}
- # gdb_load_shlibs ${binfile_lib2}
+ # gdb_load_shlib ${binfile_lib1}
+ # gdb_load_shlib ${binfile_lib2}
# Here we should get:
# warning: .dynamic section for ".../solib-overlap-lib1.so" is not at the expected address (wrong library or version mismatch?)
@@ -44,7 +44,7 @@ gdb_exit
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-gdb_load_shlibs $binfile_lib
+gdb_load_shlib $binfile_lib
# Set a breakpoint in the binary.
gdb_test "br foo2" \
@@ -94,8 +94,8 @@ proc do_test { lib1opts lib2opts lib1first } {
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
- gdb_load_shlibs $lib1
- gdb_load_shlibs $lib2
+ gdb_load_shlib $lib1
+ gdb_load_shlib $lib2
runto_main
@@ -73,7 +73,7 @@ if {[prepare_for_testing $testfile $binfile "$srcfile $srcfile2" $exec_opts]} {
return
}
-gdb_load_shlibs ${lib_so}
+gdb_load_shlib ${lib_so}
if ![runto_main] then {
fail "Can't run to main"
@@ -40,7 +40,7 @@ if { [gdb_compile_shlib $lib1src $lib1 $lib_opts] != ""
# Start with a fresh gdb.
clean_restart $binfile
-gdb_load_shlibs $lib1
+gdb_load_shlib $lib1
if ![runto_main] {
fail "Can't run to main"
@@ -40,7 +40,7 @@ if { [gdb_compile_shlib $libsrc $libobj {debug}] != ""
}
clean_restart ${binfile}
-gdb_load_shlibs ${libobj}
+gdb_load_shlib ${libobj}
if ![runto_main] then {
fail "Can't run to main"
@@ -62,8 +62,8 @@ gdb_exit
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-gdb_load_shlibs $lib_sl
-gdb_load_shlibs $lib_sl2
+gdb_load_shlib $lib_sl
+gdb_load_shlib $lib_sl2
#
# Test setting a breakpoint in a dynamically loaded library which is
@@ -52,7 +52,7 @@ gdb_exit
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-gdb_load_shlibs $lib_sl
+gdb_load_shlib $lib_sl
runto_main
@@ -371,7 +371,7 @@ if { [gdb_compile_shlib ${srcdir}/${subdir}/${srcfile2} $libbin {debug}] != ""
}
clean_restart $binfile
-gdb_load_shlibs $libbin
+gdb_load_shlib $libbin
if ![runto_main] {
return -1
@@ -41,7 +41,7 @@ if { [gdb_compile_shlib $srcdir/$subdir/$srcfile2 $sofile {debug c++}] != ""
}
clean_restart ${binfile}
-gdb_load_shlibs ${sofile}
+gdb_load_shlib ${sofile}
if ![runto_main] then {
@@ -31,7 +31,7 @@ if { [gdb_compile_shlib ${srcdir}/${subdir}/${srcfile2} ${libfile} {debug c++}]
return -1
}
-gdb_load_shlibs $libfile
+gdb_load_shlib $libfile
if { ![runto_main] } {
return -1
@@ -33,7 +33,7 @@ if { [gdb_compile_shlib $srcdir/$subdir/$srcfile2 $sofile {debug c++}] != ""
}
clean_restart $testfile
-gdb_load_shlibs ${sofile}
+gdb_load_shlib ${sofile}
gdb_test_no_output "set breakpoint pending yes"
gdb_test "break C::C" {Breakpoint [0-9]+ \(C::C\) pending\.} "break C::C"
@@ -39,7 +39,7 @@ if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable [list debug f90
clean_restart $testfile
-gdb_load_shlibs $libfile
+gdb_load_shlib $libfile
if ![runto MAIN__] then {
perror "couldn't run to breakpoint MAIN__"
@@ -41,7 +41,7 @@ if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != ""
}
clean_restart ${binfile}
-gdb_load_shlibs $binfile_lib
+gdb_load_shlib $binfile_lib
if ![runto_main] then {
return 0
@@ -61,7 +61,7 @@ if { [skip_python_tests] } { continue }
#
clean_restart ${testfile}
-gdb_load_shlibs ${lib_sl}
+gdb_load_shlib ${lib_sl}
if ![runto_main] then {
fail "Cannot run to main."
@@ -108,7 +108,7 @@ gdb_test "python MyFinishBreakpoint (None, gdb.selected_frame ())" \
#
clean_restart ${testfile}
-gdb_load_shlibs ${lib_sl}
+gdb_load_shlib ${lib_sl}
gdb_test "source $python_file" "Python script imported.*" \
"import python scripts"
@@ -135,7 +135,7 @@ gdb_test "python print (finishBP.return_value)" "None" "check return value witho
#
clean_restart ${testfile}
-gdb_load_shlibs ${lib_sl}
+gdb_load_shlib ${lib_sl}
gdb_test "source $python_file" "Python script imported.*" \
"import python scripts"
@@ -161,7 +161,7 @@ gdb_test "python print (finishbp.is_valid())" "False.*"\
#
clean_restart ${testfile}
-gdb_load_shlibs ${lib_sl}
+gdb_load_shlib ${lib_sl}
gdb_test "source $python_file" "Python script imported.*" \
"import python scripts"
@@ -187,7 +187,7 @@ gdb_test "print i" "8" "check stopped location"
#
clean_restart ${testfile}
-gdb_load_shlibs ${lib_sl}
+gdb_load_shlib ${lib_sl}
gdb_test "source $python_file" "Python script imported.*" \
"import python scripts"
@@ -214,7 +214,7 @@ gdb_test "print i" "8" "check stopped location"
#
clean_restart ${testfile}
-gdb_load_shlibs ${lib_sl}
+gdb_load_shlib ${lib_sl}
gdb_test "source $python_file" "Python script imported.*" \
"import python scripts"
@@ -41,7 +41,7 @@ if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $exec_opt
# Start with a fresh gdb.
clean_restart $testfile
-gdb_load_shlibs ${library}
+gdb_load_shlib ${library}
# Skip all tests if Python scripting is not enabled.
if { [skip_python_tests] } { continue }
@@ -76,8 +76,8 @@ gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-gdb_load_shlibs $library1
-gdb_load_shlibs $library2
+gdb_load_shlib $library1
+gdb_load_shlib $library2
runto main
@@ -68,8 +68,8 @@ gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-gdb_load_shlibs $library1
-gdb_load_shlibs $library2
+gdb_load_shlib $library1
+gdb_load_shlib $library2
runto main
@@ -48,7 +48,7 @@ foreach nonstop { 0 1 } { with_test_prefix "non-stop $nonstop" {
gdb_exit
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
- gdb_load_shlibs ${binlibfile}
+ gdb_load_shlib ${binlibfile}
set remote_binfile [gdb_remote_download target $binfile]
@@ -34,7 +34,7 @@ if {$relink_args == "" || ![prelink_no $relink_args]
|| [prepare_for_testing ${testfile}.exp ${executable} ${srcmainfile} {debug shlib_load}] } {
return -1
}
-gdb_load_shlibs $binfile_lib
+gdb_load_shlib $binfile_lib
if { ![runto_main] } {
return -1
@@ -36,7 +36,7 @@ if { [gdb_compile_shlib_pthreads ${srcdir}/${subdir}/${srcfile_lib} ${binfile_li
clean_restart ${binfile}
-gdb_load_shlibs ${binfile_lib}
+gdb_load_shlib ${binfile_lib}
if ![runto_main] then {
fail "Can't run to main"
@@ -35,7 +35,7 @@ if { [gdb_compile_shlib_pthreads ${srcdir}/${subdir}/${srcfile_lib} ${binfile_li
clean_restart ${binfile}
-gdb_load_shlibs ${binfile_lib}
+gdb_load_shlib ${binfile_lib}
if ![runto_main] then {
fail "Can't run to main"
@@ -45,8 +45,8 @@ if { [gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""
clean_restart $executable
-gdb_load_shlibs $lib_sl1
-gdb_load_shlibs $lib_sl2
+gdb_load_shlib $lib_sl1
+gdb_load_shlib $lib_sl2
if ![runto_main] {
fail "Can't run to main to check for trace support"
@@ -354,7 +354,7 @@ tracepoint_install_in_trace_disabled "trace"
# Re-compile test case with IPA.
set libipa [get_in_proc_agent]
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable \
[list debug nowarnings shlib=$libipa shlib=$lib_sl1 shlib_load] ] != "" } {
@@ -48,7 +48,7 @@ if ![gdb_target_supports_trace] {
# Compile the test case with the in-process agent library.
set libipa [get_in_proc_agent]
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
lappend options shlib=$libipa
@@ -38,7 +38,7 @@ if ![gdb_target_supports_trace] {
}
set libipa [get_in_proc_agent]
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
# Can't use prepare_for_testing, because that splits compiling into
# building objects and then linking, and we'd fail with "linker input
@@ -63,8 +63,8 @@ proc test_reconnect { } {
}
clean_restart $executable
- gdb_load_shlibs $lib_sl1
- gdb_load_shlibs $lib_sl2
+ gdb_load_shlib $lib_sl1
+ gdb_load_shlib $lib_sl2
if ![runto_main] then {
fail "Can't run to main"
return 0
@@ -243,8 +243,8 @@ proc test_pending_resolved { } {
clean_restart $executable
-gdb_load_shlibs $lib_sl1
-gdb_load_shlibs $lib_sl2
+gdb_load_shlib $lib_sl1
+gdb_load_shlib $lib_sl2
if ![runto_main] {
fail "Can't run to main to check for trace support"
@@ -43,8 +43,8 @@ if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""
clean_restart $executable
-gdb_load_shlibs $lib_sl1
-gdb_load_shlibs $lib_sl2
+gdb_load_shlib $lib_sl1
+gdb_load_shlib $lib_sl2
if ![runto_main] {
fail "Can't run to main to check for trace support"
@@ -503,7 +503,7 @@ pending_tracepoint_installed_during_trace "trace"
# Re-compile test case with IPA.
set libipa [get_in_proc_agent]
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
lappend exec_opts "shlib=$libipa"
@@ -67,7 +67,7 @@ proc range_stepping_with_tracepoint { type } {
range_stepping_with_tracepoint "trace"
set libipa [get_in_proc_agent]
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
executable [list debug nowarnings shlib=$libipa] ] != "" } {
@@ -49,7 +49,7 @@ proc strace_remove_socket { action } {
# Restart with a fresh gdb.
clean_restart $executable
- gdb_load_shlibs $libipa
+ gdb_load_shlib $libipa
if ![runto_main] {
fail "Can't run to main"
return -1
@@ -134,7 +134,7 @@ proc strace_info_marker { } {
# Restart with a fresh gdb.
clean_restart $executable
- gdb_load_shlibs $libipa
+ gdb_load_shlib $libipa
if ![runto_main] {
fail "Can't run to main"
return -1
@@ -171,7 +171,7 @@ proc strace_probe_marker { } {
# Restart with a fresh gdb.
clean_restart $executable
- gdb_load_shlibs $libipa
+ gdb_load_shlib $libipa
if ![runto_main] {
fail "Can't run to main"
return -1
@@ -211,7 +211,7 @@ proc strace_trace_on_same_addr { type } {
# Restart with a fresh gdb.
clean_restart $executable
- gdb_load_shlibs $libipa
+ gdb_load_shlib $libipa
if ![runto_main] {
fail "Can't run to main"
return -1
@@ -315,7 +315,7 @@ proc strace_trace_on_diff_addr { } {
# Restart with a fresh gdb.
clean_restart $executable
- gdb_load_shlibs $libipa
+ gdb_load_shlib $libipa
if ![runto_main] {
fail "Can't run to main"
return -1
@@ -375,7 +375,7 @@ if { [istarget "x86_64-*-linux*"] || [istarget "i\[34567\]86-*-linux*"] } {
}
clean_restart $executable
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
if ![runto_main] {
fail "Can't run to main to check for trace support"
return -1
@@ -349,7 +349,7 @@ break_trace_same_addr_6 "trace" "enable" "trace" "disable"
break_trace_same_addr_6 "trace" "disable" "trace" "enable"
set libipa [get_in_proc_agent]
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
# Can't use prepare_for_testing, because that splits compiling into
# building objects and then linking, and we'd fail with "linker input
@@ -38,7 +38,7 @@ if ![gdb_target_supports_trace] {
}
set libipa [get_in_proc_agent]
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
# Can't use prepare_for_testing, because that splits compiling into
# building objects and then linking, and we'd fail with "linker input
@@ -107,7 +107,7 @@ foreach break_always_inserted { "on" "off" } {
step_over_tracepoint "trace"
set libipa [get_in_proc_agent]
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
# Compile test case again with IPA.
if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
@@ -4229,11 +4229,11 @@ proc gdb_remote_download {dest fromfile {tofile {}}} {
}
}
-# gdb_load_shlibs LIB...
+# gdb_load_shlib LIB...
#
# Copy the listed library to the target.
-proc gdb_load_shlibs { file } {
+proc gdb_load_shlib { file } {
set dest [gdb_remote_download target [shlib_target_file $file]]
if {[is_remote target]} {