From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Tue, 27 Jan 2026 22:25:12 +0000 (+0100)
Subject: build: Fix Linux/x86 bootstrap  without --with-gnu-as/--with-as [PR123841]
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=20bc4561ecdebfcc818f1053da847fa3213aa8a3;p=thirdparty%2Fgcc.git

build: Fix Linux/x86 bootstrap  without --with-gnu-as/--with-as [PR123841]

My recent patch r16-7073 broke Linux/x86 bootstrap without
--with-gnu-as/with-as by only setting gcc_cv_as_flags in acinclude.m4
with gas_flag=yes.  Instead it should allow for any value.

Bootstrapped without regressions on x86_64-pc-linux-gnu,
i386-pc-solaris2.11 --with-gnu-as --with-as, and and
x86_64-apple-darwin21.6.0 (both in state 2 now with gcc/auto-host.h
unchanged).

2026-01-27  Jakub Jelinek  <jakub@redhat.com>

	gcc:
	PR other/123841
	* acinclude.m4 (gcc_GAS_FLAGS) <i?86-*-* | x86_64-*-*>: Set
	gcc_cv_as_flags irrespective of $gas_flag.
	* configure: Regenerate.
---

diff --git a/gcc/acinclude.m4 b/gcc/acinclude.m4
index 740db2bade7..aef4ca46db8 100644
--- a/gcc/acinclude.m4
+++ b/gcc/acinclude.m4
@@ -478,7 +478,7 @@ AC_DEFUN([gcc_GAS_FLAGS],
     as_32_opt=-m32
     as_64_opt=-m64
     ;;
-  i?86-*-*:yes | x86_64-*-*:yes )
+  i?86-*-*:* | x86_64-*-*:* )
     dnl Override the default, which may be incompatible.
     case "$target" in
       i?86-*-*)
diff --git a/gcc/configure b/gcc/configure
index a6b11aa6c94..a26971e0ded 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -26124,7 +26124,7 @@ else
     as_32_opt=-m32
     as_64_opt=-m64
     ;;
-  i?86-*-*:yes | x86_64-*-*:yes )
+  i?86-*-*:* | x86_64-*-*:* )
         case "$target" in
       i?86-*-*)
 	gcc_cv_as_flags=--32