Fix: ld testsuite: 'Version' pattern grabs 'Version5 EABI', breaking test on arm...

  PR 30924
  * testsuite/ld-elfvers/vers.exp (objdump_emptyverstuff): Handle EABI version information in objdump's output.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 4e4f5326d80b67cbeb0c52ff1d8728dd5215f0ba..d402b59e8f2db35f307d104f34f6b10bec21d118 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2023-10-05  A. Wilcox  <awilfox@adelielinux.org>
+
+       PR 30924
+       * testsuite/ld-elfvers/vers.exp (objdump_emptyverstuff): Handle
+       EABI version information in objdump's output.
+
 2023-10-02  Nick Clifton  <nickc@redhat.com>
 
        * pe-dll.c (fill_edata): Use bfd_get_current_time when filling in

diff --git a/ld/testsuite/ld-elfvers/vers.exp b/ld/testsuite/ld-elfvers/vers.exp
index b266cc0226f5beacd31f0f7e093330a93c488f08..73c1f79f59c0226e61edad69efd936e949ace7ca 100644 (file)
--- a/ld/testsuite/ld-elfvers/vers.exp
+++ b/ld/testsuite/ld-elfvers/vers.exp
@@ -215,12 +215,14 @@ proc objdump_emptyverstuff { objdump object } {
 # this probably means that there is version information in libc, so we
 # can't really perform this test.
        return 1
+    } else { if { [string match "*Version? EABI*" $exec_output] } then {
+# there is EABI Version information in the private flags of the binary.
+       return 1
     } else {
        verbose -log "$exec_output"
        verbose -log "objdump_emptyverstuff: did not expect any output from objdump"
        return 0
-    } }
-
+    } } }
 }
 
 #