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.
This commit is contained in:
Nick Clifton 2015-03-19 12:14:56 +00:00
parent 590d1e9a30
commit e2575e05e7
4 changed files with 14 additions and 7 deletions

View File

@ -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.

View File

@ -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

View File

@ -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

View File

@ -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\)