From 2e72a56e451cf26fb01712d6004d3b6a70749756 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 17 Aug 2018 15:06:46 +0930 Subject: [PATCH] Remove duplicate ld testsuite function It's in binutils/testsuite/lib/binutils-common.exp * testsuite/ld-elf/elf.exp (is_elf64): Delete. --- ld/ChangeLog | 4 ++++ ld/testsuite/ld-elf/elf.exp | 26 -------------------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index b1b8cf5d1a6..89eddd36486 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2018-08-18 Alan Modra + + * testsuite/ld-elf/elf.exp (is_elf64): Delete. + 2018-08-17 H.J. Lu PR ld/23515 diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp index cabc79daade..bb7f4b04634 100644 --- a/ld/testsuite/ld-elf/elf.exp +++ b/ld/testsuite/ld-elf/elf.exp @@ -73,32 +73,6 @@ run_ld_link_tests [list \ ] -# True if the object format is known to be 64-bit ELF. -# -proc is_elf64 { binary_file } { - global READELF - global READELFFLAGS - - set readelf_size "" - catch "exec $READELF $READELFFLAGS -h $binary_file > readelf.out" got - - if ![string match "" $got] then { - return 0 - } - - if { ![regexp "\n\[ \]*Class:\[ \]*ELF(\[0-9\]+)\n" \ - [file_contents readelf.out] nil readelf_size] } { - verbose "FAILED to determine ELF size" - return 0 - } - - if { $readelf_size == "64" } { - return 1 - } - - return 0 -} - if [is_elf64 tmpdir/symbol3w.a] { set ASFLAGS "$ASFLAGS --defsym ALIGN=3" } else { -- 2.30.2