forked from Imagelibrary/binutils-gdb
Regenerate configure in gold
Regenerate configure for zlib.m4 change, which adds --with-system-zlib and removes --with-zlib in gold. zlib is enabled unconditionally with builtin zlib imported from GCC. * Makefile.am (ZLIB): New. (ZLIBINC): Likewise. (AM_CFLAGS): Add $(ZLIBINC). (AM_CXXFLAGS): Likewise. (ldadd_varldadd_var): Add $(ZLIB). (incremental_dump_LDADD): Likewise. (dwp_LDADD): Likewise. * compressed_output.cc: Don't check HAVE_ZLIB_H to include <zlib.h>. (zlib_compress): Don't check HAVE_ZLIB_H. (zlib_decompress): Likewise. * options.h (compress_debug_sections): Likewise. * configure.ac (AM_CONDITIONAL): Removed. * testsuite/Makefile.am (ZLIB): New. (LDADD): Add $(ZLIB). Don't check HAVE_ZLIB. * Makefile.in: Regenerated. * config.in: Likewise. * configure: Likewise. * testsuite/Makefile.in: Likewise.
This commit is contained in:
@@ -21,11 +21,7 @@
|
||||
// MA 02110-1301, USA.
|
||||
|
||||
#include "gold.h"
|
||||
|
||||
#ifdef HAVE_ZLIB_H
|
||||
#include <zlib.h>
|
||||
#endif
|
||||
|
||||
#include "parameters.h"
|
||||
#include "options.h"
|
||||
#include "compressed_output.h"
|
||||
@@ -33,8 +29,6 @@
|
||||
namespace gold
|
||||
{
|
||||
|
||||
#ifdef HAVE_ZLIB_H
|
||||
|
||||
// Compress UNCOMPRESSED_DATA of size UNCOMPRESSED_SIZE. Returns true
|
||||
// if it successfully compressed, false if it failed for any reason
|
||||
// (including not having zlib support in the library). If it returns
|
||||
@@ -124,24 +118,6 @@ zlib_decompress(const unsigned char* compressed_data,
|
||||
return true;
|
||||
}
|
||||
|
||||
#else // !defined(HAVE_ZLIB_H)
|
||||
|
||||
static bool
|
||||
zlib_compress(const unsigned char*, unsigned long,
|
||||
unsigned char**, unsigned long*)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool
|
||||
zlib_decompress(const unsigned char*, unsigned long,
|
||||
unsigned char*, unsigned long)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
#endif // !defined(HAVE_ZLIB_H)
|
||||
|
||||
// Read the compression header of a compressed debug section and return
|
||||
// the uncompressed size.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user