diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-03-15 06:11:53 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-04-01 05:11:32 -0700 |
| commit | 47e021f19d4d19b170a8a4a0237cfc6dbd8772e7 (patch) | |
| tree | 2bd86fc6fb617be67783b1293881779a1a6a12e7 /gold/compressed_output.cc | |
| parent | cf39cfc52ebd683d55fc396a77355f34b5094c04 (diff) | |
| download | binutils-gdb-users/hjl/zlib.tar.gz | |
Add --with-system-zlib in goldusers/hjl/zlib
This patch adds --with-system-zlib and removes --with-zlib in gold.
* 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.
* aclocal.m4: Likewise.
* config.in: Likewise.
* configure: Likewise.
* testsuite/Makefile.in: Likewise.
Diffstat (limited to 'gold/compressed_output.cc')
| -rw-r--r-- | gold/compressed_output.cc | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/gold/compressed_output.cc b/gold/compressed_output.cc index 5a10329a2c6..8c9fc1e96f7 100644 --- a/gold/compressed_output.cc +++ b/gold/compressed_output.cc @@ -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. |