diff --git a/gdb/testsuite/gdb.base/libsegfault.exp b/gdb/testsuite/gdb.base/libsegfault.exp index 6b8453f5550..ceb8c417d4d 100644 --- a/gdb/testsuite/gdb.base/libsegfault.exp +++ b/gdb/testsuite/gdb.base/libsegfault.exp @@ -33,7 +33,7 @@ if { [is_remote host] } { proc gdb_spawn_with_ld_preload {lib cmdline_opts} { global env - save_vars { env(LD_PRELOAD) } { + save_vars { env(LD_PRELOAD) env(ASAN_OPTIONS)} { if { ![info exists env(LD_PRELOAD) ] || $env(LD_PRELOAD) == "" } { set env(LD_PRELOAD) "$lib" @@ -41,6 +41,12 @@ proc gdb_spawn_with_ld_preload {lib cmdline_opts} { append env(LD_PRELOAD) ":$lib" } + # Prevent address sanitizer error: + # ASan runtime does not come first in initial library list; you should + # either link runtime to your application or manually preload it with + # LD_PRELOAD. + set_sanitizer_default ASAN_OPTIONS verify_asan_link_order 0 + gdb_spawn_with_cmdline_opts $cmdline_opts } } diff --git a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp b/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp index 68c866a36f0..93b1d88c0dc 100644 --- a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp +++ b/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp @@ -71,7 +71,7 @@ with_test_prefix "compile test executable" { proc gdb_spawn_with_ld_preload {lib} { global env - save_vars { env(LD_PRELOAD) } { + save_vars { env(LD_PRELOAD) env(ASAN_OPTIONS) } { if { ![info exists env(LD_PRELOAD) ] || $env(LD_PRELOAD) == "" } { set env(LD_PRELOAD) "$lib" @@ -79,6 +79,12 @@ proc gdb_spawn_with_ld_preload {lib} { append env(LD_PRELOAD) ":$lib" } + # Prevent address sanitizer error: + # ASan runtime does not come first in initial library list; you should + # either link runtime to your application or manually preload it with + # LD_PRELOAD. + set_sanitizer_default ASAN_OPTIONS verify_asan_link_order 0 + gdb_start } }