On 08/06/2011 12:43 PM, Mikael Morin wrote:
On Friday 05 August 2011 21:48:34 Paolo Bonzini wrote:
On Fri, Aug 5, 2011 at 20:18, Mikael Morin<mikael.mo...@sfr.fr> wrote:
I suppose it is this patch that breaks bootstrap
The culprit is indeed r177447.
Adding a -I flag? I suppose that makes sense even if crtstuff is
moved soon to toplevel libgcc.
How about this? It fixes the problem.
Index: gcc/Makefile.in
===================================================================
--- gcc/Makefile.in (révision 177491)
+++ gcc/Makefile.in (copie de travail)
@@ -1088,7 +1088,7 @@
INCLUDES = -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \
-I$(srcdir)/../include @INCINTL@ \
$(CPPINC) $(GMPINC) $(DECNUMINC) \
- $(PPLINC) $(CLOOGINC)
+ $(PPLINC) $(CLOOGINC) -I$(srcdir)/../libgcc
.c.o:
$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $< $(OUTPUT_OPTION)
Thanks.
Can you try this instead?
Paolo
2011-08-06 Paolo Bonzini <bonz...@gnu.org>
Mikael Morin <mikael.mo...@sfr.fr>
* Makefile.in (INCLUDES_FOR_TARGET): New.
(LIBGCC2_CFLAGS): Use it.
(CRTSTUFF_CFLAGS): Use it instead of INCLUDES.
Index: ../gcc/gcc/Makefile.in
===================================================================
--- ../gcc/gcc/Makefile.in (revision 177266)
+++ ../gcc/gcc/Makefile.in (working copy)
@@ -668,9 +668,9 @@ endif
# Options to use when compiling libgcc2.a.
#
LIBGCC2_DEBUG_CFLAGS = -g
-LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(TARGET_LIBGCC2_CFLAGS) \
- $(LIBGCC2_DEBUG_CFLAGS) $(GTHREAD_FLAGS) \
- -DIN_LIBGCC2 \
+LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(INCLUDES_FOR_TARGET) $(GCC_CFLAGS) \
+ $(TARGET_LIBGCC2_CFLAGS) $(LIBGCC2_DEBUG_CFLAGS) \
+ $(GTHREAD_FLAGS) -DIN_LIBGCC2 \
-fbuilding-libgcc -fno-stack-protector \
$(INHIBIT_LIBC_CFLAGS)
@@ -682,8 +682,8 @@ LIBGCC2_INCLUDES =
TARGET_LIBGCC2_CFLAGS =
# Options to use when compiling crtbegin/end.
-CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \
- -finhibit-size-directive -fno-inline -fno-exceptions \
+CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(INCLUDES_FOR_TARGET) $(MULTILIB_CFLAGS) \
+ -g0 -finhibit-size-directive -fno-inline -fno-exceptions \
-fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize \
-fno-stack-protector \
$(INHIBIT_LIBC_CFLAGS)
@@ -1102,6 +1102,9 @@ INCLUDES = -I. -I$(@D) -I$(srcdir) -I$(s
$(CPPINC) $(GMPINC) $(DECNUMINC) \
$(PPLINC) $(CLOOGINC)
+INCLUDES_FOR_TARGET = -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \
+ -I$(srcdir)/../include $(DECNUMINC) -I$(srcdir)/../libgcc
+
.c.o:
$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $< $(OUTPUT_OPTION)