Update check for working assembler --gdwarf-4 option

Rename HAVE_AS_WORKING_DWARF_4_FLAG to HAVE_AS_WORKING_DWARF_N_FLAG
Don't set HAVE_AS_WORKING_DWARF_N_FLAG if --gdwarf-5/--gdwarf-4 generate
an extra assembly input file in debug info from compiler generated
.debug_line or fail with the APP marker:

https://sourceware.org/bugzilla/show_bug.cgi?id=25878
https://sourceware.org/bugzilla/show_bug.cgi?id=26740
https://sourceware.org/bugzilla/show_bug.cgi?id=26778

Also replace success with dwarf4_success in the 32-bit --gdwarf-4 check.

	PR bootstrap/97451
	* configure.ac (HAVE_AS_WORKING_DWARF_4_FLAG): Renamed to ...
	(HAVE_AS_WORKING_DWARF_N_FLAG): This.  Don't define if there is
	an extra assembly input file in debug info.  Replace success
	with dwarf4_success in the 32-bit --gdwarf-4 check.
	* dwarf2out.c (asm_outputs_debug_line_str): Check
	HAVE_AS_WORKING_DWARF_N_FLAG instead of
	HAVE_AS_WORKING_DWARF_4_FLAG.
	* gcc.c (ASM_DEBUG_SPEC): Likewise.
	(ASM_DEBUG_OPTION_SPEC): Likewise.
	* config.in: Regenerated.
	* configure: Likewise.

5 files changed, 164 insertions, 13 deletions

diff --git a/gcc/config.in b/gcc/config.in
index 3657c46..b7c3107 100644
--- a/gcc/config.in
+++ b/gcc/config.in
@@ -719,10 +719,10 @@
 #endif
 
 
-/* Define if your assembler supports --gdwarf-4 even with compiler generated
-   .debug_line */
+/* Define if your assembler supports --gdwarf-4/--gdwarf-5 even with compiler
+   generated .debug_line. */
 #ifndef USED_FOR_TARGET
-#undef HAVE_AS_WORKING_DWARF_4_FLAG
+#undef HAVE_AS_WORKING_DWARF_N_FLAG
 #endif
 
 
diff --git a/gcc/configure b/gcc/configure
index abff47d..f96a89e 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -28701,7 +28701,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_debug_line_32_flag" >&5
 $as_echo "$gcc_cv_as_debug_line_32_flag" >&6; }
 if test $gcc_cv_as_debug_line_32_flag = yes; then
-  success=yes
+  dwarf4_success=yes
 fi
 
    else
@@ -28741,6 +28741,7 @@ fi
 
    fi
    if test $dwarf4_success = yes; then
+     dwarf4_success=no
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for --gdwarf-4 not refusing compiler generated .debug_line" >&5
 $as_echo_n "checking assembler for --gdwarf-4 not refusing compiler generated .debug_line... " >&6; }
 if ${gcc_cv_as_dwarf_4_debug_line_flag+:} false; then :
@@ -28772,9 +28773,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_dwarf_4_debug_line_flag" >&5
 $as_echo "$gcc_cv_as_dwarf_4_debug_line_flag" >&6; }
 if test $gcc_cv_as_dwarf_4_debug_line_flag = yes; then
-
-$as_echo "#define HAVE_AS_WORKING_DWARF_4_FLAG 1" >>confdefs.h
-
+  dwarf4_success=yes
 fi
 
      break
@@ -28785,6 +28784,105 @@ fi
    dwarf4_line_sz=5
  done
 
+ if test $dwarf4_success = yes; then
+   conftest_s="\
+	.file	\"foo.c\"
+	.text
+bar:
+#APP
+# 82 \"xxx.h\" 1
+	$insn
+# 0 \"\" 2
+#NO_APP
+	$insn
+foo:
+	.file 1 \"foo.c\"
+	$insn
+	.file 2 \"foo.h\"
+	ret
+"
+   dwarf4_success=no
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for --gdwarf-4 with the APP marker" >&5
+$as_echo_n "checking assembler for --gdwarf-4 with the APP marker... " >&6; }
+if ${gcc_cv_as_dwarf_4_app_flag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gcc_cv_as_dwarf_4_app_flag=no
+  if test x$gcc_cv_as != x; then
+    $as_echo "$conftest_s" > conftest.s
+    if { ac_try='$gcc_cv_as $gcc_cv_as_flags --gdwarf-4 -o conftest.o conftest.s >&5'
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }
+    then
+	gcc_cv_as_dwarf_4_app_flag=yes
+    else
+      echo "configure: failed program was" >&5
+      cat conftest.s >&5
+    fi
+    rm -f conftest.o conftest.s
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_dwarf_4_app_flag" >&5
+$as_echo "$gcc_cv_as_dwarf_4_app_flag" >&6; }
+if test $gcc_cv_as_dwarf_4_app_flag = yes; then
+  dwarf4_success=yes
+fi
+
+ fi
+
+ if test $dwarf4_success = yes; then
+   conftest_s="\
+	.text
+	.globl	foo
+	.type	foo, %function
+foo:
+	$insn
+	.size	foo, .-foo
+	.file	1 \"foo.c\"
+"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for working --gdwarf-4/--gdwarf-5 for all sources" >&5
+$as_echo_n "checking assembler for working --gdwarf-4/--gdwarf-5 for all sources... " >&6; }
+if ${gcc_cv_as_working_gdwarf_n_flag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gcc_cv_as_working_gdwarf_n_flag=no
+  if test x$gcc_cv_as != x; then
+    $as_echo "$conftest_s" > conftest.s
+    if { ac_try='$gcc_cv_as $gcc_cv_as_flags --gdwarf-4 -o conftest.o conftest.s >&5'
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }
+    then
+	      if test x$gcc_cv_readelf != x \
+	 && $gcc_cv_readelf -w conftest.o 2>&1 \
+		| grep conftest.s > /dev/null 2>&1; then
+	gcc_cv_as_working_gdwarf_n_flag=no
+      else
+	gcc_cv_as_working_gdwarf_n_flag=yes
+      fi
+          else
+      echo "configure: failed program was" >&5
+      cat conftest.s >&5
+    fi
+    rm -f conftest.o conftest.s
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_working_gdwarf_n_flag" >&5
+$as_echo "$gcc_cv_as_working_gdwarf_n_flag" >&6; }
+
+
+   if test $gcc_cv_as_working_gdwarf_n_flag = yes; then
+
+$as_echo "#define HAVE_AS_WORKING_DWARF_N_FLAG 1" >>confdefs.h
+
+   fi
+ fi
+
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for --gstabs option" >&5
 $as_echo_n "checking assembler for --gstabs option... " >&6; }
 if ${gcc_cv_as_gstabs_flag+:} false; then :
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 26a5d8e..9154a54 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -5364,7 +5364,7 @@ foo:
      gcc_GAS_CHECK_FEATURE([assembly of compiler generated 32-bit .debug_line],
       gcc_cv_as_debug_line_32_flag,
       [elf,2,36,0], [], [$conftest_s],,
-      [success=yes])
+      [dwarf4_success=yes])
    else
      gcc_GAS_CHECK_FEATURE([assembly of compiler generated 64-bit .debug_line],
       gcc_cv_as_debug_line_64_flag,
@@ -5372,11 +5372,11 @@ foo:
       [dwarf4_success=yes])
    fi
    if test $dwarf4_success = yes; then
+     dwarf4_success=no
      gcc_GAS_CHECK_FEATURE([--gdwarf-4 not refusing compiler generated .debug_line],
       gcc_cv_as_dwarf_4_debug_line_flag,
       [elf,2,36,0], [--gdwarf-4], [$conftest_s],,
-      [AC_DEFINE(HAVE_AS_WORKING_DWARF_4_FLAG, 1,
-[Define if your assembler supports --gdwarf-4 even with compiler generated .debug_line])])
+      [dwarf4_success=yes])
      break
    fi
    dwarf4_debug_info_size=0x36
@@ -5385,6 +5385,59 @@ foo:
    dwarf4_line_sz=5
  done
 
+ if test $dwarf4_success = yes; then
+   conftest_s="\
+	.file	\"foo.c\"
+	.text
+bar:
+#APP
+# 82 \"xxx.h\" 1
+	$insn
+# 0 \"\" 2
+#NO_APP
+	$insn
+foo:
+	.file 1 \"foo.c\"
+	$insn
+	.file 2 \"foo.h\"
+	ret
+"
+   dwarf4_success=no
+   gcc_GAS_CHECK_FEATURE([--gdwarf-4 with the APP marker],
+     gcc_cv_as_dwarf_4_app_flag,,
+     [--gdwarf-4], [$conftest_s],, [dwarf4_success=yes])
+ fi
+
+ if test $dwarf4_success = yes; then
+   conftest_s="\
+	.text
+	.globl	foo
+	.type	foo, %function
+foo:
+	$insn
+	.size	foo, .-foo
+	.file	1 \"foo.c\"
+"
+   gcc_GAS_CHECK_FEATURE([working --gdwarf-4/--gdwarf-5 for all sources],
+     gcc_cv_as_working_gdwarf_n_flag,,
+     [--gdwarf-4],
+     [$conftest_s],
+     [changequote(,)dnl
+      if test x$gcc_cv_readelf != x \
+	 && $gcc_cv_readelf -w conftest.o 2>&1 \
+		| grep conftest.s > /dev/null 2>&1; then
+	gcc_cv_as_working_gdwarf_n_flag=no
+      else
+	gcc_cv_as_working_gdwarf_n_flag=yes
+      fi
+      changequote([,])dnl])
+   if test $gcc_cv_as_working_gdwarf_n_flag = yes; then
+     AC_DEFINE(HAVE_AS_WORKING_DWARF_N_FLAG, 1,
+[Define if your assembler supports --gdwarf-4/--gdwarf-5 even with
+ compiler generated .debug_line.])
+   fi
+ fi
+
  gcc_GAS_CHECK_FEATURE([--gstabs option],
   gcc_cv_as_gstabs_flag,
   [elf,2,11,0], [--gstabs], [$insn],,
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index ba93a6c..534877b 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -11884,7 +11884,7 @@ asm_outputs_debug_line_str (void)
     return true;
   else
     {
-#if defined(HAVE_AS_GDWARF_5_DEBUG_FLAG) && defined(HAVE_AS_WORKING_DWARF_4_FLAG)
+#if defined(HAVE_AS_GDWARF_5_DEBUG_FLAG) && defined(HAVE_AS_WORKING_DWARF_N_FLAG)
       return !dwarf_split_debug_info && dwarf_version >= 5;
 #else
       return false;
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 337c274..cdf4d4f 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -880,7 +880,7 @@ proper position among the other output files.  */
 /* Define ASM_DEBUG_SPEC to be a spec suitable for translating '-g'
    to the assembler, when compiling assembly sources only.  */
 #ifndef ASM_DEBUG_SPEC
-# if defined(HAVE_AS_GDWARF_5_DEBUG_FLAG) && defined(HAVE_AS_WORKING_DWARF_4_FLAG)
+# if defined(HAVE_AS_GDWARF_5_DEBUG_FLAG) && defined(HAVE_AS_WORKING_DWARF_N_FLAG)
 /* If --gdwarf-N is supported and as can handle even compiler generated
    .debug_line with it, supply --gdwarf-N in ASM_DEBUG_OPTION_SPEC rather
    than in ASM_DEBUG_SPEC, so that it applies to both .s and .c etc.
@@ -921,7 +921,7 @@ proper position among the other output files.  */
 /* Define ASM_DEBUG_OPTION_SPEC to be a spec suitable for translating '-g'
    to the assembler when compiling all sources.  */
 #ifndef ASM_DEBUG_OPTION_SPEC
-# if defined(HAVE_AS_GDWARF_5_DEBUG_FLAG) && defined(HAVE_AS_WORKING_DWARF_4_FLAG)
+# if defined(HAVE_AS_GDWARF_5_DEBUG_FLAG) && defined(HAVE_AS_WORKING_DWARF_N_FLAG)
 #  define ASM_DEBUG_OPTION_DWARF_OPT					\
 	"%{%:dwarf-version-gt(4):--gdwarf-5 ;"				\
 	"%:dwarf-version-gt(3):--gdwarf-4 ;"				\