Handle --enable-compressed-debug-sections=ld,gas

gas/

	PR gas/19109
	* configure.ac: Handle --enable-compressed-debug-sections=*,gas,*.
	* configure: Regenerated.

ld/

	PR gas/19109
	* configure.ac: Handle --enable-compressed-debug-sections=*,ld,*.
	* configure: Regenerated.

6 files changed, 36 insertions, 22 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index f9d87bad166..28b139ef9a0 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,11 @@
 2015-10-22  H.J. Lu  <hongjiu.lu@intel.com>
 
+	PR gas/19109
+	* configure.ac: Handle --enable-compressed-debug-sections=*,gas,*.
+	* configure: Regenerated.
+
+2015-10-22  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* config/tc-i386.c (tc_i386_fix_adjustable): Handle
 	BFD_RELOC_X86_64_GOTPCRELX and BFD_RELOC_X86_64_REX_GOTPCRELX.
 	(tc_gen_reloc): Likewise.
diff --git a/gas/configure b/gas/configure
index 3de933399a2..d2e35de9aed 100755
--- a/gas/configure
+++ b/gas/configure
@@ -1413,7 +1413,8 @@ Optional Features:
   --disable-largefile     omit support for large files
   --enable-targets        alternative target configurations besides the primary
   --enable-checking       enable run-time checks
-  --enable-compressed-debug-sections={all,gas,none}  compress debug sections by default
+  --enable-compressed-debug-sections={all,gas,none}
+                          compress debug sections by default]
   --enable-werror         treat compile warnings as errors
   --enable-build-warnings enable build-time compiler warnings
   --disable-nls           do not use Native Language Support
@@ -10971,7 +10972,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10974 "configure"
+#line 10975 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11077,7 +11078,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11080 "configure"
+#line 11081 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11672,9 +11673,9 @@ ac_default_compressed_debug_sections=unset
 # Provide a configure time option to override our default.
 # Check whether --enable-compressed_debug_sections was given.
 if test "${enable_compressed_debug_sections+set}" = set; then :
-  enableval=$enable_compressed_debug_sections; case "${enableval}" in
-  yes | all | gas) ac_default_compressed_debug_sections=yes ;;
-  no | none)  ac_default_compressed_debug_sections=no ;;
+  enableval=$enable_compressed_debug_sections; case ,"${enableval}", in
+  *,yes,* | *,all,* | *,gas,*) ac_default_compressed_debug_sections=yes ;;
+  ,no, | ,none,)  ac_default_compressed_debug_sections=no ;;
   *)   ac_default_compressed_debug_sections=unset ;;
 esac
 fi
diff --git a/gas/configure.ac b/gas/configure.ac
index f7ed1b3d707..9002552b4cc 100644
--- a/gas/configure.ac
+++ b/gas/configure.ac
@@ -69,10 +69,11 @@ fi
 ac_default_compressed_debug_sections=unset
 # Provide a configure time option to override our default.
 AC_ARG_ENABLE(compressed_debug_sections,
-[  --enable-compressed-debug-sections={all,gas,none}  compress debug sections by default],
-[case "${enableval}" in
-  yes | all | gas) ac_default_compressed_debug_sections=yes ;;
-  no | none)  ac_default_compressed_debug_sections=no ;;
+	      AS_HELP_STRING([--enable-compressed-debug-sections={all,gas,none}],
+	      [compress debug sections by default])],
+[case ,"${enableval}", in
+  *,yes,* | *,all,* | *,gas,*) ac_default_compressed_debug_sections=yes ;;
+  ,no, | ,none,)  ac_default_compressed_debug_sections=no ;;
   *)   ac_default_compressed_debug_sections=unset ;;
 esac])dnl
 
diff --git a/ld/ChangeLog b/ld/ChangeLog
index fae891568a3..089075e3439 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,11 @@
 2015-10-22  H.J. Lu  <hongjiu.lu@intel.com>
 
+	PR gas/19109
+	* configure.ac: Handle --enable-compressed-debug-sections=*,ld,*.
+	* configure: Regenerated.
+
+2015-10-22  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* ld/ld.texinfo: Document "-z call-nop=PADDING" option.
 	* emulparams/call_nop.sh: New file.
 	* emulparams/elf_i386_be.sh: Source
diff --git a/ld/configure b/ld/configure
index 5b6eb705cf8..ce51f5f2dc6 100755
--- a/ld/configure
+++ b/ld/configure
@@ -1445,7 +1445,8 @@ Optional Features:
   --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
   --enable-got=<type>     GOT handling scheme (target, single, negative,
                           multigot)
-  --enable-compressed-debug-sections={all,ld,none}  compress debug sections by default
+  --enable-compressed-debug-sections={all,ld,none}
+                          compress debug sections by default]
   --enable-werror         treat compile warnings as errors
   --enable-build-warnings enable build-time compiler warnings
   --disable-nls           do not use Native Language Support
@@ -11715,7 +11716,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11718 "configure"
+#line 11719 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11821,7 +11822,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11824 "configure"
+#line 11825 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15529,10 +15530,9 @@ ac_default_compressed_debug_sections=unset
 # Provide a configure time option to override our default.
 # Check whether --enable-compressed_debug_sections was given.
 if test "${enable_compressed_debug_sections+set}" = set; then :
-  enableval=$enable_compressed_debug_sections; case "${enableval}" in
-  yes | all | ld) ac_default_compressed_debug_sections=yes ;;
-  no | none)  ac_default_compressed_debug_sections=no ;;
-  *)   ac_default_compressed_debug_sections=unset ;;
+  enableval=$enable_compressed_debug_sections; case ,"${enableval}", in
+  *,yes,* | *,all,* | *,ld,*) ac_default_compressed_debug_sections=yes ;;
+  ,no, | ,none,)  ac_default_compressed_debug_sections=no ;;
 esac
 fi
 
diff --git a/ld/configure.ac b/ld/configure.ac
index 21a69e5a54c..84d1b036e77 100644
--- a/ld/configure.ac
+++ b/ld/configure.ac
@@ -148,11 +148,11 @@ esac
 ac_default_compressed_debug_sections=unset
 # Provide a configure time option to override our default.
 AC_ARG_ENABLE(compressed_debug_sections,
-[  --enable-compressed-debug-sections={all,ld,none}  compress debug sections by default],
-[case "${enableval}" in
-  yes | all | ld) ac_default_compressed_debug_sections=yes ;;
-  no | none)  ac_default_compressed_debug_sections=no ;;
-  *)   ac_default_compressed_debug_sections=unset ;;
+	      AS_HELP_STRING([--enable-compressed-debug-sections={all,ld,none}],
+	      [compress debug sections by default])],
+[case ,"${enableval}", in
+  *,yes,* | *,all,* | *,ld,*) ac_default_compressed_debug_sections=yes ;;
+  ,no, | ,none,)  ac_default_compressed_debug_sections=no ;;
 esac])dnl
 
 AM_BINUTILS_WARNINGS