From cbf0179287a799be27e278a41f7705d4c20d9f11 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 3 Apr 2015 04:03:07 -0700 Subject: [PATCH] Make is_zlib_supported always return 1 * lib/binutils-common.exp (is_zlib_supported): Always return 1. --- binutils/testsuite/ChangeLog | 4 ++++ binutils/testsuite/lib/binutils-common.exp | 22 +--------------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog index 5c85ba8..04dfa46 100644 --- a/binutils/testsuite/ChangeLog +++ b/binutils/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-04-03 H.J. Lu + + * lib/binutils-common.exp (is_zlib_supported): Always return 1. + 2015-04-02 Nick Clifton * binutils-all/readelf.ss-64: Move possible location of the $d diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp index 7540045..e989da4 100644 --- a/binutils/testsuite/lib/binutils-common.exp +++ b/binutils/testsuite/lib/binutils-common.exp @@ -154,27 +154,7 @@ proc is_elf64 { binary_file } { # True if the build supports zlib compression. proc is_zlib_supported {} { - - # This replicates the AS selection logic of dejagnu's target_assemble. - global AS_FOR_TARGET - if [info exists AS_FOR_TARGET] { - set AS $AS_FOR_TARGET - } else { - if {![board_info target exists assembler]} { - set AS [find_gas] - } else { - set AS [board_info target assembler] - } - } - - set as_output [remote_exec host "$AS --help"] - - set have_zlib 0 - if {[string first "--compress-debug-sections" $as_output] >= 0} { - set have_zlib 1 - } - - return $have_zlib + return 1 } # Compare two files line-by-line. FILE_1 is the actual output and FILE_2 -- 2.7.4