From: Nick Clifton <nickc@redhat.com>
Date: Thu, 19 Mar 2015 12:14:56 +0000 (+0000)
Subject: Fix building and testing dwarf debug section compression feature when zlib is not... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e2575e05e73c3b2f08a8b5f579a504ac6a45ad60;p=binutils-gdb.git

Fix building and testing dwarf debug section compression feature when zlib is not available.

	PR gas/18087
gas/test	* gas/i386/dw2-compress-1.d: Allow the test to pass regardless of
	whether the .debug_info section was compressed on not.

bfd	* compress.c (bfd_compress_section_contents): Do not define this
	function if it is not used.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0bc727d7608..e1585910979 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-19  Nick Clifton  <nickc@redhat.com>
+
+	PR 18078
+	* compress.c (bfd_compress_section_contents): Do not define this
+	function if it is not used.
+
 2015-03-18  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* compress.c (bfd_compress_section_contents): Make it static.
diff --git a/bfd/compress.c b/bfd/compress.c
index fa791ded2e0..de74d60b195 100644
--- a/bfd/compress.c
+++ b/bfd/compress.c
@@ -61,7 +61,6 @@ decompress_contents (bfd_byte *compressed_buffer,
   rc |= inflateEnd (&strm);
   return rc == Z_OK && strm.avail_out == 0;
 }
-#endif
 
 /* Compress data of the size specified in @var{uncompressed_size}
    and pointed to by @var{uncompressed_buffer} using zlib and store
@@ -78,10 +77,6 @@ bfd_compress_section_contents (bfd *abfd ATTRIBUTE_UNUSED,
 			       bfd_byte *uncompressed_buffer ATTRIBUTE_UNUSED,
 			       bfd_size_type uncompressed_size ATTRIBUTE_UNUSED)
 {
-#ifndef HAVE_ZLIB_H
-  bfd_set_error (bfd_error_invalid_operation);
-  return FALSE;
-#else
   uLong compressed_size;
   bfd_byte *compressed_buffer;
 
@@ -123,8 +118,8 @@ bfd_compress_section_contents (bfd *abfd ATTRIBUTE_UNUSED,
   sec->compress_status = COMPRESS_SECTION_DONE;
 
   return TRUE;
-#endif  /* HAVE_ZLIB_H */
 }
+#endif  /* HAVE_ZLIB_H */
 
 /*
 FUNCTION
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index f814d363f4d..4e3b1ecae1f 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-19  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/18087
+	* gas/i386/dw2-compress-1.d: Allow the test to pass regardless of
+	whether the .debug_info section was compressed on not.
+
 2015-03-18  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR gas/18087
diff --git a/gas/testsuite/gas/i386/dw2-compress-1.d b/gas/testsuite/gas/i386/dw2-compress-1.d
index c29a26cd33a..da0c2b8e1e5 100644
--- a/gas/testsuite/gas/i386/dw2-compress-1.d
+++ b/gas/testsuite/gas/i386/dw2-compress-1.d
@@ -2,7 +2,7 @@
 #readelf: -w
 #name: DWARF2 debugging information 1
 
-Contents of the .zdebug_info section:
+Contents of the .*debug_info section:
 
   Compilation Unit @ offset 0x0:
    Length:        0x4e \(32-bit\)