On Fri, Mar 07, 2014 at 08:26:47AM +0100, Paolo Bonzini wrote:
> Il 06/03/2014 19:58, Jakub Jelinek ha scritto:
> >Bootstrapped/regtested on x86_64-linux and i686-linux and tested also
> >with make bootstrap-lean; make install, ok for trunk?
>
> Nice fix! Did you check that on a regular bootstrap (formerly
> bubblestrap) you can modify the source code for the affected headers
> in libstdc++-v3, and alias.o/dfp.o will be rebuilt?
It isn't rebuilt with the patch, but I don't see how it is any different
from all the other -isystem headers (e.g. the gcc/include headers like
stddef.h etc. that we use -isystem for too).
I'm not sure it is worth bothering, while there are occassional changes
to those headers, it is at most a few occurrences a year and usually just
addition of new stuff, after all the headers should remain ABI compatible.
Anyway, bootstrapping/regtesting now this variant where it only changes
things for *-lean cases and not for normal bootstrap.
2014-03-07 Jakub Jelinek <ja...@redhat.com>
PR bootstrap/58572
* Makefile.tpl (POSTSTAGE1_CXX_EXPORT): Use -isystem instead of
-I for libstdc++-v3 includes if $(LEAN).
* Makefile.in: Regenerated.
--- Makefile.tpl.jj 2013-11-11 22:38:29.000000000 +0100
+++ Makefile.tpl 2014-03-07 10:56:42.221105929 +0100
@@ -242,9 +242,9 @@ POSTSTAGE1_CXX_EXPORT = \
-B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ -nostdinc++ \
-B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
-B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
- -I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \
- -I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \
- -I$$s/libstdc++-v3/libsupc++ \
+ `if $(LEAN); then echo ' -isystem '; else echo ' -I';
fi`$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \
+ `if $(LEAN); then echo ' -isystem '; else echo ' -I';
fi`$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \
+ `if $(LEAN); then echo ' -isystem '; else echo ' -I';
fi`$$s/libstdc++-v3/libsupc++ \
-L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
-L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs"; \
export CXX; \
--- Makefile.in.jj 2013-11-11 22:38:21.000000000 +0100
+++ Makefile.in 2014-03-07 10:56:13.059107667 +0100
@@ -239,9 +239,9 @@ POSTSTAGE1_CXX_EXPORT = \
-B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ -nostdinc++ \
-B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
-B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
- -I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \
- -I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \
- -I$$s/libstdc++-v3/libsupc++ \
+ `if $(LEAN); then echo ' -isystem '; else echo ' -I';
fi`$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \
+ `if $(LEAN); then echo ' -isystem '; else echo ' -I';
fi`$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \
+ `if $(LEAN); then echo ' -isystem '; else echo ' -I';
fi`$$s/libstdc++-v3/libsupc++ \
-L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
-L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs"; \
export CXX; \
Jakub
