diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3e2e923582f9..2d42c7c7e18c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-29  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.c (ASM_DEBUG_SPEC): Only check HAVE_AS_G*_DEBUG_FLAG
+	macros for the supported debugging types.
+
 2001-11-29  Craig Rodrigues  <rodrigc@gcc.gnu.org>
 
 	PR other/4932
diff --git a/gcc/gcc.c b/gcc/gcc.c
index ea7aa1c6a01c..b83557d4ac8b 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -590,19 +590,18 @@ proper position among the other output files.  */
 /* Define ASM_DEBUG_SPEC to be a spec suitable for translating '-g'
    to the assembler.  */
 #ifndef ASM_DEBUG_SPEC
-# if defined(HAVE_AS_GDWARF2_DEBUG_FLAG) && defined(HAVE_AS_GSTABS_DEBUG_FLAG)
-#  if defined(DBX_DEBUGGING_INFO) && defined(DWARF2_DEBUGGING_INFO)
-#   define ASM_DEBUG_SPEC					\
+# if defined(DBX_DEBUGGING_INFO) && defined(DWARF2_DEBUGGING_INFO) \
+     && defined(HAVE_AS_GDWARF2_DEBUG_FLAG) && defined(HAVE_AS_GSTABS_DEBUG_FLAG)
+#  define ASM_DEBUG_SPEC					\
       (PREFERRED_DEBUGGING_TYPE == DBX_DEBUG			\
        ? "%{gdwarf-2*:--gdwarf2}%{!gdwarf-2*:%{g*:--gstabs}}"	\
        : "%{gstabs*:--gstabs}%{!gstabs*:%{g*:--gdwarf2}}")
-#  else
-#   ifdef DBX_DEBUGGING_INFO
-#    define ASM_DEBUG_SPEC "%{g*:--gstabs}"
-#   endif
-#   ifdef DWARF2_DEBUGGING_INFO
-#    define ASM_DEBUG_SPEC "%{g*:--gdwarf2}"
-#   endif
+# else
+#  if defined(DBX_DEBUGGING_INFO) && defined(HAVE_AS_GSTABS_DEBUG_FLAG)
+#   define ASM_DEBUG_SPEC "%{g*:--gstabs}"
+#  endif
+#  if defined(DWARF2_DEBUGGING_INFO) && defined(HAVE_AS_GDWARF2_DEBUG_FLAG)
+#   define ASM_DEBUG_SPEC "%{g*:--gdwarf2}"
 #  endif
 # endif
 #endif