[binutils-gdb] Remove COMPRESS_DEBUG_ZLIB

[H.J.Lu <hjl at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ee0c0c503deffb7baf900ac8e092b18bf8c1528a

commit ee0c0c503deffb7baf900ac8e092b18bf8c1528a
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Sun Jun 28 06:30:10 2015 -0700

    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:
---
 bfd/ChangeLog         | 6 ++++++
 bfd/bfd-in.h          | 5 ++---
 bfd/bfd-in2.h         | 5 ++---
 gas/ChangeLog         | 6 ++++++
 gas/as.c              | 2 +-
 gas/config/tc-i386.c  | 2 +-
 ld/ChangeLog          | 5 +++++
 ld/emultempl/elf32.em | 2 +-
 8 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 89a6a0c..c4ff658 100644
--- 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 2e324cd..ae99d1e 100644
--- 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 2d32c74..35e9d77 100644
--- 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 eb18335..7c49ea6 100644
--- 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 fecfcd2..b8a5be4 100644
--- 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 34b5c28..d8405b5 100644
--- 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 69eef8f..eeb08cd 100644
--- 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 cdea5d8..14f7963 100644
--- 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)