This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
4.1 PATCH: Fix Solaris/x86 bootstrap failure with ASM_OUTPUT_ALIGNED_BSS redefinition
- From: Rainer Orth <ro at TechFak dot Uni-Bielefeld dot DE>
- To: gcc-patches at gcc dot gnu dot org
- Date: Wed, 10 Aug 2005 19:36:20 +0200 (MEST)
- Subject: 4.1 PATCH: Fix Solaris/x86 bootstrap failure with ASM_OUTPUT_ALIGNED_BSS redefinition
This patch
http://gcc.gnu.org/ml/gcc-patches/2005-07/msg01593.html
broke bootstrap on Solaris 10/x86 due to a redefinition of
ASM_OUTPUT_ALIGNED_BSS in config/i386/x86-64.h:
stage1/xgcc -Bstage1/ -B/vol/gcc/share/i386-pc-solaris2.10/bin/ -c -g -O2 -DIN_GCC -W -Wall -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -pedantic -Wno-long-long -Wno-variadic-macros -Wold-style-definition -Wmissing-format-attribute -Werror -fno-common -DHAVE_CONFIG_H -DGENERATOR_FILE -I. -Ibuild -I/vol/gnu/src/gcc/gcc-dist/gcc -I/vol/gnu/src/gcc/gcc-dist/gcc/build -I/vol/gnu/src/gcc/gcc-dist/gcc/../include -I/vol/gnu/src/gcc/gcc-dist/gcc/../libcpp/include -I/vol/gnu/obj/gmp-4.1.3/mpfr -I/vol/gnu/obj/gmp-4.1.3 \
-o build/gengtype.o /vol/gnu/src/gcc/gcc-dist/gcc/gengtype.c
In file included from ./tm.h:18,
from /vol/gnu/src/gcc/gcc-dist/gcc/gengtype.c:24:
/vol/gnu/src/gcc/gcc-dist/gcc/config/i386/x86-64.h:54:1: error: "ASM_OUTPUT_ALIGNED_BSS" redefined
In file included from ./tm.h:14,
from /vol/gnu/src/gcc/gcc-dist/gcc/gengtype.c:24:
/vol/gnu/src/gcc/gcc-dist/gcc/config/i386/sysv4.h:99:1: error: this is the location of the previous definition
make[2]: *** [build/gengtype.o] Error 1
The following trivial patch fixes this and allows bootstrap to continue
(fails again later building libjava, but this is unrelated and fixed by a
separate patch to be submitted shortly).
Ok for mainline?
Rainer
-----------------------------------------------------------------------------
Rainer Orth, Faculty of Technology, Bielefeld University
Fri Aug 5 19:01:02 2005 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* config/i386/x86-64.h (ASM_OUTPUT_ALIGNED_BSS): Undef before
redefinition.
Index: config/i386/x86-64.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/x86-64.h,v
retrieving revision 1.14
diff -u -p -r1.14 x86-64.h
--- config/i386/x86-64.h 31 Jul 2005 09:12:33 -0000 1.14
+++ config/i386/x86-64.h 10 Aug 2005 17:35:47 -0000
@@ -51,6 +51,7 @@ Boston, MA 02110-1301, USA. */
#define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \
%{Wa,*:%*} %{m32:--32} %{m64:--64}"
+#undef ASM_OUTPUT_ALIGNED_BSS
#define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \
x86_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN)