diff options
| author | A. Wilcox <awilfox@adelielinux.org> | 2023-10-05 12:13:08 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2023-10-05 12:13:08 +0100 |
| commit | 41ef7afa97212aa219b90b72c4f363eac0aaae40 (patch) | |
| tree | 9f22c1c80626f6371aba31119925b9bf024f0733 /ld | |
| parent | 0515a7b643c6f7bbfb647764b702d4c6445618e8 (diff) | |
| download | gdb-41ef7afa97212aa219b90b72c4f363eac0aaae40.zip gdb-41ef7afa97212aa219b90b72c4f363eac0aaae40.tar.gz gdb-41ef7afa97212aa219b90b72c4f363eac0aaae40.tar.bz2 | |
Fix: ld testsuite: 'Version' pattern grabs 'Version5 EABI', breaking test on arm-linux-musleabihf
PR 30924
* testsuite/ld-elfvers/vers.exp (objdump_emptyverstuff): Handle EABI version information in objdump's output.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/testsuite/ld-elfvers/vers.exp | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 4e4f532..d402b59 100644 --- 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 b266cc0..73c1f79 100644 --- 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 - } } - + } } } } # |