ld/testsuite/

[platform/upstream/binutils.git] / ld / testsuite / ld-size / size.exp

diff --git a/ld/testsuite/ld-size/size.exp b/ld/testsuite/ld-size/size.exp
index 24269c5..9eedfd5 100644 (file)
--- a/ld/testsuite/ld-size/size.exp
+++ b/ld/testsuite/ld-size/size.exp
@@ -35,6 +35,13 @@ if {!(([istarget "i?86-*-*"]
     return
 }
 
+# So as to avoid rewriting every last test case here in a nacl variant,
+# we use black magic to massage the generic cases into nacl-variant cases.
+if [istarget "*-*-nacl*"] {
+    # Change all the -melf_i386 to -melf_i386_nacl so linking can succeed.
+    set options_regsub(ld) {-m(\\S+) -m\\1_nacl}
+}
+
 set test_list [lsort [glob -nocomplain $srcdir/$subdir/*.d]]
 foreach t $test_list {
     # We need to strip the ".d", but can leave the dirname.
@@ -44,7 +51,7 @@ foreach t $test_list {
 
 # We need a native system.
 if ![isnative] {
-    verbose "Natibe size relocation tests not run - not a native toolchain"
+    verbose "Native size relocation tests not run - not a native toolchain"
     return
 }
 
@@ -77,13 +84,13 @@ set build_tests {
    "-shared" "-fPIC"
    {size-7b.c} {} "libsize-7.so"}
   {"Build size-7"
-   "tmpdir/libsize-7.so" ""
+   "-Wl,--no-as-needed tmpdir/libsize-7.so" ""
    {size-7a.c} {{readelf -rW size-7.rd}} "size-7.exe"}
   {"Build libsize-8.so"
    "-shared" "-fPIC"
    {size-8b.c} {} "libsize-8.so"}
   {"Build size-8"
-   "tmpdir/libsize-8.so" ""
+   "-Wl,--no-as-needed tmpdir/libsize-8.so" ""
    {size-8a.c} {{readelf -rW size-8.rd}} "size-8.exe"}
   {"Build libsize-9.so"
    "-shared" "-fPIC"
@@ -156,7 +163,7 @@ if { [regexp_diff "tmpdir/dump.out" "$srcdir/$subdir/size-7.out" ] } then {
 # Run-time size relocation tests.
 set run_time_tests {
     {"Run size-8"
-     "tmpdir/libsize-8.so" ""
+     "tmpdir/libsize-8.so --hash-styl=gnu" ""
      {size-8a.c} "size-8" "size-8.out"}
     {"Run size-9"
      "tmpdir/libsize-9.so" ""