[PATCH] ld/testsuite: correct aarch64 uses of load_lib

Jan Beulich jbeulich@suse.com
Fri Dec 13 10:11:24 GMT 2024


Using $srcdir/$subdir directly doesn't work, at least not with expect
5.45, dejagnu 1.6, and an out-of-tree build (I assume it's the latter
aspect which is crucial here). Make use of $libdirs instead.

--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp
+++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp
@@ -23,7 +23,8 @@ if { ![is_elf_format] || ![istarget "aar
     return
 }
 
-load_lib $srcdir/$subdir/lib/aarch64-elf-lib.exp
+lappend libdirs $srcdir/$subdir/lib
+load_lib aarch64-elf-lib.exp
 
 # List contains test-items with 3 items followed by 2 lists:
 # 0:name 1:ld early options 2:ld late options 3:assembler options
--- a/ld/testsuite/ld-aarch64/protections/aarch64-protections.exp
+++ b/ld/testsuite/ld-aarch64/protections/aarch64-protections.exp
@@ -23,7 +23,8 @@ if { ![is_elf_format] || ![istarget "aar
   return
 }
 
-load_lib $srcdir/$subdir/../lib/aarch64-elf-lib.exp
+lappend libdirs $srcdir/$subdir/../lib
+load_lib aarch64-elf-lib.exp
 
 set test_list [lsort [glob -nocomplain $srcdir/$subdir/*.d]]
 set test_lp64_list [lsort [glob -nocomplain $srcdir/$subdir/bti-far-*.d]]


More information about the Binutils mailing list