Re: Patch: gcc-3.0.4 workaround for AS_SPARC64_FLAG/autoconf-2.53

[Adam J. Richter]

        Sorry, I forgot to attach the actual patch to my previous
email.

Adam J. Richter     __     ______________   4880 Stevens Creek Blvd, Suite 104
address@hidden     \ /                  San Jose, California 95129-1034
+1 408 261-6630         | g g d r a s i l   United States of America
fax +1 408 261-6631      "Free Software For The Rest Of Us."

--- gcc-3.0.4/gcc/config/sparc/sol2-64.h        1999-12-08 04:30:22.000000000 
-0800
+++ gcc/gcc/config/sparc/sol2-64.h      2002-04-07 06:36:50.000000000 -0700
@@ -7,7 +7,7 @@
 #undef LINKER_DOES_NOT_WORK_WITH_DWARF2
 #endif
 
-#ifdef AS_SPARC64_FLAG
+#ifdef ASM_SPARC64_FLAG
 
 #ifdef LINK_ARCH_SPEC
 #undef LINK_ARCH_SPEC
--- gcc-3.0.4/gcc/config/sparc/sol2-sld-64.h    2001-06-11 13:29:44.000000000 
-0700
+++ gcc/gcc/config/sparc/sol2-sld-64.h  2002-04-07 06:36:50.000000000 -0700
@@ -1,7 +1,7 @@
 /* Definitions of target machine for GNU compiler, for 64-bit SPARC
    running Solaris 2 using the system linker.  */
 
-#ifdef AS_SPARC64_FLAG
+#ifdef ASM_SPARC64_FLAG
 
 #define SPARC_BI_ARCH
 
@@ -9,7 +9,7 @@
 
 #include "sparc/sol2.h"
 
-#ifdef AS_SPARC64_FLAG
+#ifdef ASM_SPARC64_FLAG
 
 /* At least up through Solaris 2.6,
    the system linker does not work with DWARF or DWARF2,
@@ -37,7 +37,7 @@
 #undef ASM_CPU32_DEFAULT_SPEC
 #define ASM_CPU32_DEFAULT_SPEC ""
 #undef ASM_CPU64_DEFAULT_SPEC
-#define ASM_CPU64_DEFAULT_SPEC AS_SPARC64_FLAG
+#define ASM_CPU64_DEFAULT_SPEC ASM_SPARC64_FLAG
 
 #if TARGET_CPU_DEFAULT == TARGET_CPU_v9
 #undef CPP_CPU64_DEFAULT_SPEC
@@ -51,7 +51,7 @@
 #undef ASM_CPU32_DEFAULT_SPEC
 #define ASM_CPU32_DEFAULT_SPEC "-xarch=v8plusa"
 #undef ASM_CPU64_DEFAULT_SPEC
-#define ASM_CPU64_DEFAULT_SPEC AS_SPARC64_FLAG "a"
+#define ASM_CPU64_DEFAULT_SPEC ASM_SPARC64_FLAG "a"
 #endif
 
 /* The sun bundled assembler doesn't accept -Yd, (and neither does gas).
@@ -90,9 +90,9 @@
 
 #undef ASM_CPU_SPEC
 #define ASM_CPU_SPEC "\
-%{mcpu=ultrasparc:" DEF_ARCH32_SPEC("-xarch=v8plusa") 
DEF_ARCH64_SPEC(AS_SPARC64_FLAG "a") "} \
-%{mcpu=v9:" DEF_ARCH32_SPEC("-xarch=v8plus") DEF_ARCH64_SPEC(AS_SPARC64_FLAG) 
"} \
-%{!mcpu=ultrasparc:%{!mcpu=v9:%{mcpu*:" DEF_ARCH32_SPEC("-xarch=v8") 
DEF_ARCH64_SPEC(AS_SPARC64_FLAG) "}}} \
+%{mcpu=ultrasparc:" DEF_ARCH32_SPEC("-xarch=v8plusa") 
DEF_ARCH64_SPEC(ASM_SPARC64_FLAG "a") "} \
+%{mcpu=v9:" DEF_ARCH32_SPEC("-xarch=v8plus") DEF_ARCH64_SPEC(ASM_SPARC64_FLAG) 
"} \
+%{!mcpu=ultrasparc:%{!mcpu=v9:%{mcpu*:" DEF_ARCH32_SPEC("-xarch=v8") 
DEF_ARCH64_SPEC(ASM_SPARC64_FLAG) "}}} \
 %{!mcpu*:%(asm_cpu_default)} \
 "
 
--- gcc-3.0.4/gcc/config.in     2002-02-20 11:40:47.000000000 -0800
+++ gcc/gcc/config.in   2002-04-07 06:36:50.000000000 -0700
@@ -456,7 +456,7 @@
 #undef HAVE_AS_RELAX_OPTION
 
 /* Define if the assembler supports 64bit sparc. */
-#undef AS_SPARC64_FLAG
+#undef ASM_SPARC64_FLAG
 
 /* Define if your assembler supports offsetable %lo(). */
 #undef HAVE_AS_OFFSETABLE_LO10
--- gcc-3.0.4/gcc/configure     2002-02-05 14:11:19.000000000 -0800
+++ gcc/gcc/configure   2002-04-07 06:36:50.000000000 -0700
@@ -6653,7 +6653,7 @@
 
        else
            cat >> confdefs.h <<EOF
-#define AS_SPARC64_FLAG "$gcc_cv_as_flags64"
+#define ASM_SPARC64_FLAG "$gcc_cv_as_flags64"
 EOF
 
        fi
--- gcc-3.0.4/gcc/configure.in  2002-02-05 14:11:19.000000000 -0800
+++ gcc/gcc/configure.in        2002-04-07 06:36:50.000000000 -0700
@@ -1493,7 +1493,7 @@
            dep_tmake_file=`echo " $dep_tmake_file " | sed -e 's, [^ 
]*/config/sparc/t-sol2-64 , ,' -e 's,^ ,,' -e 's, $,,'`
 changequote([, ])
        else
-           AC_DEFINE_UNQUOTED(AS_SPARC64_FLAG, "$gcc_cv_as_flags64",
+           AC_DEFINE_UNQUOTED(ASM_SPARC64_FLAG, "$gcc_cv_as_flags64",
                        [Define if the assembler supports 64bit sparc.])
        fi
        ;;