From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Thu, 15 Jan 2026 10:13:49 +0000 (+0100)
Subject: Use -m32/-m64 with Solaris/x86 as
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0f7e577fcd7759638049be87e7632a1c27852b2;p=thirdparty%2Fgcc.git

Use -m32/-m64 with Solaris/x86 as

GCC currently uses -xarch=generic/-xarch=generic64 with Solaris/x86 as
to select either 32 or 64-bit output.  However, -xarch isn't even
documented any longer, but still accepted for compatibility.  Even for
-xchip, only generic is documented, not generic64.

This patch uses -m32/-m64 instead, which is already used in
gcc/configure.ac.

Bootstrapped without regressions on i386-pc-solaris2.11 and
amd64-pc-solaris2.11.

2026-01-14  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	gcc:
	* config/i386/sol2.h [!HAVE_GNU_AS] (ASM_CPU32_DEFAULT_SPEC): Use -m32.
	(ASM_CPU64_DEFAULT_SPEC): Use -m64.
---

diff --git a/gcc/config/i386/sol2.h b/gcc/config/i386/sol2.h
index 63d5006c237..d727eea41e6 100644
--- a/gcc/config/i386/sol2.h
+++ b/gcc/config/i386/sol2.h
@@ -59,13 +59,13 @@ along with GCC; see the file COPYING3.  If not see
   " %{mx32:%e-mx32 is not supported on Solaris}"
 
 /* GNU as understands --32 and --64, but the native Solaris
-   assembler requires -xarch=generic or -xarch=generic64 instead.  */
+   assembler requires -m32 or -m64 instead.  */
 #if HAVE_GNU_AS
 #define ASM_CPU32_DEFAULT_SPEC "--32"
 #define ASM_CPU64_DEFAULT_SPEC "--64"
 #else
-#define ASM_CPU32_DEFAULT_SPEC "-xarch=generic"
-#define ASM_CPU64_DEFAULT_SPEC "-xarch=generic64"
+#define ASM_CPU32_DEFAULT_SPEC "-m32"
+#define ASM_CPU64_DEFAULT_SPEC "-m64"
 #endif
 
 #if !HAVE_GNU_AS