Remove COMPRESS_DEBUG_ZLIB

COMPRESS_DEBUG_ZLIB isn't needed.  This patch removes COMPRESS_DEBUG_ZLIB
and replace COMPRESS_DEBUG_ZLIB with COMPRESS_DEBUG_GNU_ZLIB.

bfd/

	* bfd-in.h (compressed_debug_section_type): Remove
	COMPRESS_DEBUG_ZLIB.
	* bfd-in2.h : Regenerated.
gas/

	* as.c (parse_args): Replace COMPRESS_DEBUG_ZLIB with
	COMPRESS_DEBUG_GNU_ZLIB.
	* config/tc-i386.c (flag_compress_debug): Likewise.

ld/

	* emultempl/elf32.em  (gld${EMULATION_NAME}_handle_option):
	Replace COMPRESS_DEBUG_ZLIB with COMPRESS_DEBUG_GNU_ZLIB.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 89a6a0c062a6f55dab6b6f70445dcd80a5c6f2d9..c4ff6589716cae92ec07ab56d98dc95ef898718c 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * bfd-in.h (compressed_debug_section_type): Remove
+       COMPRESS_DEBUG_ZLIB.
+       * bfd-in2.h : Regenerated.
+
 2015-06-26  Matthew Fortune  <matthew.fortune@imgtec.com>
 
        * elfxx-mips.c (_bfd_mips_elf_create_dynamic_sections): Use executable

diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 2e324cdc9e9f943c0823b206fcc2fad5484f8c75..ae99d1e356118d46655c6d8284e4a9b1c294e77d 100644 (file)
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -443,9 +443,8 @@ enum compressed_debug_section_type
 {
   COMPRESS_DEBUG_NONE = 0,
   COMPRESS_DEBUG = 1 << 0,
-  COMPRESS_DEBUG_ZLIB = COMPRESS_DEBUG | 1 << 1,
-  COMPRESS_DEBUG_GNU_ZLIB = COMPRESS_DEBUG | 1 << 2,
-  COMPRESS_DEBUG_GABI_ZLIB = COMPRESS_DEBUG | 1 << 3
+  COMPRESS_DEBUG_GNU_ZLIB = COMPRESS_DEBUG | 1 << 1,
+  COMPRESS_DEBUG_GABI_ZLIB = COMPRESS_DEBUG | 1 << 2
 };
 
 /* This structure is used to keep track of stabs in sections

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 2d32c7481b77531f99378cdbcb06eb1e4d0739f9..35e9d77f347218175ef9b564b88317ea3cba75af 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -450,9 +450,8 @@ enum compressed_debug_section_type
 {
   COMPRESS_DEBUG_NONE = 0,
   COMPRESS_DEBUG = 1 << 0,
-  COMPRESS_DEBUG_ZLIB = COMPRESS_DEBUG | 1 << 1,
-  COMPRESS_DEBUG_GNU_ZLIB = COMPRESS_DEBUG | 1 << 2,
-  COMPRESS_DEBUG_GABI_ZLIB = COMPRESS_DEBUG | 1 << 3
+  COMPRESS_DEBUG_GNU_ZLIB = COMPRESS_DEBUG | 1 << 1,
+  COMPRESS_DEBUG_GABI_ZLIB = COMPRESS_DEBUG | 1 << 2
 };
 
 /* This structure is used to keep track of stabs in sections

diff --git a/gas/ChangeLog b/gas/ChangeLog
index eb18335a6d694496fb9c6ff8036ac953922cf78b..7c49ea6b18f89de80a3113aaf4f16735150ad9e2 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * as.c (parse_args): Replace COMPRESS_DEBUG_ZLIB with
+       COMPRESS_DEBUG_GNU_ZLIB.
+       * config/tc-i386.c (flag_compress_debug): Likewise.
+
 2015-06-24  H.J. Lu  <hongjiu.lu@intel.com>
 
        * doc/as.texinfo (.cfi_lsda): Remove the extra @section.

diff --git a/gas/as.c b/gas/as.c
index fecfcd2143268728cf3fddaad2d15c95c105413b..b8a5be4c7172136d7f8d5142460e40a3f27c7290 100644 (file)
--- a/gas/as.c
+++ b/gas/as.c
@@ -665,7 +665,7 @@ This program has absolutely no warranty.\n"));
              if (strcasecmp (optarg, "none") == 0)
                flag_compress_debug = COMPRESS_DEBUG_NONE;
              else if (strcasecmp (optarg, "zlib") == 0)
-               flag_compress_debug = COMPRESS_DEBUG_ZLIB;
+               flag_compress_debug = COMPRESS_DEBUG_GNU_ZLIB;
              else if (strcasecmp (optarg, "zlib-gnu") == 0)
                flag_compress_debug = COMPRESS_DEBUG_GNU_ZLIB;
              else if (strcasecmp (optarg, "zlib-gabi") == 0)

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 34b5c28e513174806d59c0a2dee52194ca90c922..d8405b5d8ee1886573b6ed498ba695f69dc99e5c 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -36,7 +36,7 @@
 #ifdef TE_LINUX
 /* Default to compress debug sections for Linux.  */
 enum compressed_debug_section_type flag_compress_debug
-  = COMPRESS_DEBUG_ZLIB;
+  = COMPRESS_DEBUG_GNU_ZLIB;
 #endif
 
 #ifndef REGISTER_WARNINGS

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 69eef8f8b47bba823fe287f32c0990a8eedfa332..eeb08cdac38ae825620d6a93c66affaa2afcf8a2 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * emultempl/elf32.em  (gld${EMULATION_NAME}_handle_option):
+       Replace COMPRESS_DEBUG_ZLIB with COMPRESS_DEBUG_GNU_ZLIB.
+
 2015-06-26  H.J. Lu  <hongjiu.lu@intel.com>
 
        * emulparams/elf_iamcu.sh (COMPILE_IN): New.

diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index cdea5d8704e7859a628227e4a747fe02486d9c14..14f7963fbd420b9284c5bfcf0b08f470afa180a8 100644 (file)
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -2223,7 +2223,7 @@ gld${EMULATION_NAME}_handle_option (int optc)
       if (strcasecmp (optarg, "none") == 0)
        link_info.compress_debug = COMPRESS_DEBUG_NONE;
       else if (strcasecmp (optarg, "zlib") == 0)
-       link_info.compress_debug = COMPRESS_DEBUG_ZLIB;
+       link_info.compress_debug = COMPRESS_DEBUG_GNU_ZLIB;
       else if (strcasecmp (optarg, "zlib-gnu") == 0)
        link_info.compress_debug = COMPRESS_DEBUG_GNU_ZLIB;
       else if (strcasecmp (optarg, "zlib-gabi") == 0)