MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
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> 2015-03-18 H.J. Lu <hongjiu.lu@intel.com>
* compress.c (bfd_compress_section_contents): Make it static. * compress.c (bfd_compress_section_contents): Make it static.

7
bfd/compress.c
View File

@ -61,7 +61,6 @@ decompress_contents (bfd_byte *compressed_buffer,
rc |= inflateEnd (&strm); rc |= inflateEnd (&strm);
return rc == Z_OK && strm.avail_out == 0; return rc == Z_OK && strm.avail_out == 0;
} }
#endif
/* Compress data of the size specified in @var{uncompressed_size} /* Compress data of the size specified in @var{uncompressed_size}
and pointed to by @var{uncompressed_buffer} using zlib and store 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_byte *uncompressed_buffer ATTRIBUTE_UNUSED,
bfd_size_type uncompressed_size 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; uLong compressed_size;
bfd_byte *compressed_buffer; bfd_byte *compressed_buffer;
@ -123,8 +118,8 @@ bfd_compress_section_contents (bfd *abfd ATTRIBUTE_UNUSED,
sec->compress_status = COMPRESS_SECTION_DONE; sec->compress_status = COMPRESS_SECTION_DONE;
return TRUE; return TRUE;
#endif /* HAVE_ZLIB_H */
} }
#endif /* HAVE_ZLIB_H */
/* /*
FUNCTION FUNCTION

6
gas/testsuite/ChangeLog
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> 2015-03-18 H.J. Lu <hongjiu.lu@intel.com>
PR gas/18087 PR gas/18087

2
gas/testsuite/gas/i386/dw2-compress-1.d
View File

@ -2,7 +2,7 @@
#readelf: -w #readelf: -w
#name: DWARF2 debugging information 1 #name: DWARF2 debugging information 1
Contents of the .zdebug_info section: Contents of the .*debug_info section:
Compilation Unit @ offset 0x0: Compilation Unit @ offset 0x0:
Length: 0x4e \(32-bit\) Length: 0x4e \(32-bit\)