This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Bootstrap fixincludes
- From: Matt Kraai <kraai at ftbfs dot org>
- To: gcc-patches at gcc dot gnu dot org
- Date: Sun, 28 Nov 2004 11:18:32 -0800
- Subject: Bootstrap fixincludes
Howdy,
As reported in comment 4 of PR 18176, when configure is passed
--enable-bootstrap, the build fails because all-stage1-gcc depends on
maybe-all-stage1-fixincludes. The attached patch makes fixincludes a
bootstrap module, which creates the missing target.
Tested on powerpc-unknown-linux-gnu until the build failed due to the
warnings reported in PR 18176. OK to commit?
--
Matt
* Makefile.def: Bootstrap fixincludes.
* Makefile: Regenerate.
Index: Makefile.def
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.def,v
retrieving revision 1.41
diff -u -c -3 -p -r1.41 Makefile.def
*** Makefile.def 13 Nov 2004 07:32:48 -0000 1.41
--- Makefile.def 28 Nov 2004 18:25:32 -0000
*************** host_modules= { module= fastjar; no_chec
*** 51,57 ****
host_modules= { module= fileutils; };
host_modules= { module= findutils; };
host_modules= { module= find; };
! host_modules= { module= fixincludes;
missing= info;
missing= dvi;
missing= TAGS;
--- 51,57 ----
host_modules= { module= fileutils; };
host_modules= { module= findutils; };
host_modules= { module= find; };
! host_modules= { module= fixincludes; bootstrap=true;
missing= info;
missing= dvi;
missing= TAGS;
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.in,v
retrieving revision 1.246
diff -u -c -3 -p -r1.246 Makefile.in
*** Makefile.in 13 Nov 2004 07:32:48 -0000 1.246
--- Makefile.in 28 Nov 2004 18:25:59 -0000
*************** maybe-configure-fixincludes:
*** 8575,8581 ****
@if fixincludes
maybe-configure-fixincludes: configure-fixincludes
configure-fixincludes:
! @test ! -f fixincludes/Makefile || exit 0; \
[ -d fixincludes ] || mkdir fixincludes; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--- 8575,8582 ----
@if fixincludes
maybe-configure-fixincludes: configure-fixincludes
configure-fixincludes:
! @test -f stage_last && exit 0; \
! test ! -f fixincludes/Makefile || exit 0; \
[ -d fixincludes ] || mkdir fixincludes; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
*************** maybe-all-fixincludes:
*** 8604,8610 ****
TARGET-fixincludes=all
maybe-all-fixincludes: all-fixincludes
all-fixincludes: configure-fixincludes
! @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \
$(HOST_EXPORTS) \
--- 8605,8612 ----
TARGET-fixincludes=all
maybe-all-fixincludes: all-fixincludes
all-fixincludes: configure-fixincludes
! @test -f stage_last && exit 0; \
! r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \
$(HOST_EXPORTS) \
*************** stage1-start::
*** 30571,30576 ****
--- 30573,30582 ----
@[ -d stage1-binutils ] || mkdir stage1-binutils; \
set stage1-binutils binutils ; @CREATE_LINK_TO_DIR@
@endif binutils
+ @if fixincludes
+ @[ -d stage1-fixincludes ] || mkdir stage1-fixincludes; \
+ set stage1-fixincludes fixincludes ; @CREATE_LINK_TO_DIR@
+ @endif fixincludes
@if gas
@[ -d stage1-gas ] || mkdir stage1-gas; \
set stage1-gas gas ; @CREATE_LINK_TO_DIR@
*************** stage1-end::
*** 30611,30616 ****
--- 30617,30625 ----
@if binutils
@set binutils stage1-binutils ; @UNDO_LINK_TO_DIR@
@endif binutils
+ @if fixincludes
+ @set fixincludes stage1-fixincludes ; @UNDO_LINK_TO_DIR@
+ @endif fixincludes
@if gas
@set gas stage1-gas ; @UNDO_LINK_TO_DIR@
@endif gas
*************** stage1-bubble::
*** 30648,30654 ****
all-stage1: \
maybe-all-stage1-bfd \
maybe-all-stage1-opcodes \
! maybe-all-stage1-binutils \
maybe-all-stage1-gas \
maybe-all-stage1-gcc \
maybe-all-stage1-intl \
--- 30657,30664 ----
all-stage1: \
maybe-all-stage1-bfd \
maybe-all-stage1-opcodes \
! maybe-all-stage1-binutils \
! maybe-all-stage1-fixincludes \
maybe-all-stage1-gas \
maybe-all-stage1-gcc \
maybe-all-stage1-intl \
*************** do-clean: clean-stage1
*** 30661,30667 ****
clean-stage1: \
maybe-clean-stage1-bfd \
maybe-clean-stage1-opcodes \
! maybe-clean-stage1-binutils \
maybe-clean-stage1-gas \
maybe-clean-stage1-gcc \
maybe-clean-stage1-intl \
--- 30671,30678 ----
clean-stage1: \
maybe-clean-stage1-bfd \
maybe-clean-stage1-opcodes \
! maybe-clean-stage1-binutils \
! maybe-clean-stage1-fixincludes \
maybe-clean-stage1-gas \
maybe-clean-stage1-gcc \
maybe-clean-stage1-intl \
*************** clean-stage1-binutils:
*** 30833,30838 ****
--- 30844,30903 ----
@endif binutils-bootstrap
+ .PHONY: configure-stage1-fixincludes maybe-configure-stage1-fixincludes
+ .PHONY: all-stage1-fixincludes maybe-all-stage1-fixincludes
+ .PHONY: clean-stage1-fixincludes maybe-clean-stage1-fixincludes
+
+ maybe-configure-stage1-fixincludes:
+ maybe-all-stage1-fixincludes:
+ maybe-clean-stage1-fixincludes:
+
+ @if fixincludes-bootstrap
+ maybe-configure-stage1-fixincludes: configure-stage1-fixincludes
+ configure-stage1-fixincludes:
+ @$(MAKE) stage1-start
+ @[ -f fixincludes/Makefile ] && exit 0 || : ; \
+ r=`${PWD_COMMAND}`; export r; \
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ $(HOST_EXPORTS) \
+ echo Configuring stage 1 in fixincludes ; \
+ cd fixincludes || exit 1; \
+ case $(srcdir) in \
+ \.) \
+ srcdiroption="--srcdir=."; \
+ libsrcdir=".";; \
+ /* | [A-Za-z]:[\\/]*) \
+ srcdiroption="--srcdir=$(srcdir)/fixincludes"; \
+ libsrcdir="$$s/fixincludes";; \
+ *) \
+ srcdiroption="--srcdir=../$(srcdir)/fixincludes"; \
+ libsrcdir="$$s/fixincludes";; \
+ esac; \
+ $(SHELL) $${libsrcdir}/configure \
+ $(HOST_CONFIGARGS) $${srcdiroption} \
+ --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
+
+ maybe-all-stage1-fixincludes: all-stage1-fixincludes
+ all-stage1-fixincludes: configure-stage1-fixincludes
+ @$(MAKE) stage1-start
+ @r=`${PWD_COMMAND}`; export r; \
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ $(HOST_EXPORTS) \
+ cd fixincludes && \
+ $(MAKE) $(FLAGS_TO_PASS) \
+ CFLAGS="$(STAGE1_CFLAGS)"
+
+ maybe-clean-stage1-fixincludes: clean-stage1-fixincludes
+ clean-stage1-fixincludes:
+ @[ -f fixincludes/Makefile ] || [ -f stage1-fixincludes/Makefile ] \
+ || exit 0 ; \
+ [ -f fixincludes/Makefile ] || $(MAKE) stage1-start ; \
+ cd fixincludes && \
+ $(MAKE) $(FLAGS_TO_PASS) \
+ CFLAGS="$(STAGE1_CFLAGS)" clean
+ @endif fixincludes-bootstrap
+
+
.PHONY: configure-stage1-gas maybe-configure-stage1-gas
.PHONY: all-stage1-gas maybe-all-stage1-gas
.PHONY: clean-stage1-gas maybe-clean-stage1-gas
*************** stage2-start::
*** 31251,31256 ****
--- 31316,31326 ----
set stage2-binutils binutils ; @CREATE_LINK_TO_DIR@ ; \
set stage1-binutils prev-binutils ; @CREATE_LINK_TO_DIR@
@endif binutils
+ @if fixincludes
+ @[ -d stage2-fixincludes ] || mkdir stage2-fixincludes; \
+ set stage2-fixincludes fixincludes ; @CREATE_LINK_TO_DIR@ ; \
+ set stage1-fixincludes prev-fixincludes ; @CREATE_LINK_TO_DIR@
+ @endif fixincludes
@if gas
@[ -d stage2-gas ] || mkdir stage2-gas; \
set stage2-gas gas ; @CREATE_LINK_TO_DIR@ ; \
*************** stage2-end::
*** 31301,31306 ****
--- 31371,31380 ----
@set binutils stage2-binutils ; @UNDO_LINK_TO_DIR@ ; \
set prev-binutils stage1-binutils ; @UNDO_LINK_TO_DIR@
@endif binutils
+ @if fixincludes
+ @set fixincludes stage2-fixincludes ; @UNDO_LINK_TO_DIR@ ; \
+ set prev-fixincludes stage1-fixincludes ; @UNDO_LINK_TO_DIR@
+ @endif fixincludes
@if gas
@set gas stage2-gas ; @UNDO_LINK_TO_DIR@ ; \
set prev-gas stage1-gas ; @UNDO_LINK_TO_DIR@
*************** stage2-bubble:: stage1-bubble
*** 31345,31351 ****
all-stage2: \
maybe-all-stage2-bfd \
maybe-all-stage2-opcodes \
! maybe-all-stage2-binutils \
maybe-all-stage2-gas \
maybe-all-stage2-gcc \
maybe-all-stage2-intl \
--- 31419,31426 ----
all-stage2: \
maybe-all-stage2-bfd \
maybe-all-stage2-opcodes \
! maybe-all-stage2-binutils \
! maybe-all-stage2-fixincludes \
maybe-all-stage2-gas \
maybe-all-stage2-gcc \
maybe-all-stage2-intl \
*************** do-clean: clean-stage2
*** 31358,31364 ****
clean-stage2: \
maybe-clean-stage2-bfd \
maybe-clean-stage2-opcodes \
! maybe-clean-stage2-binutils \
maybe-clean-stage2-gas \
maybe-clean-stage2-gcc \
maybe-clean-stage2-intl \
--- 31433,31440 ----
clean-stage2: \
maybe-clean-stage2-bfd \
maybe-clean-stage2-opcodes \
! maybe-clean-stage2-binutils \
! maybe-clean-stage2-fixincludes \
maybe-clean-stage2-gas \
maybe-clean-stage2-gcc \
maybe-clean-stage2-intl \
*************** clean-stage2-binutils:
*** 31536,31541 ****
--- 31612,31673 ----
@endif binutils-bootstrap
+ .PHONY: configure-stage2-fixincludes maybe-configure-stage2-fixincludes
+ .PHONY: all-stage2-fixincludes maybe-all-stage2-fixincludes
+ .PHONY: clean-stage2-fixincludes maybe-clean-stage2-fixincludes
+
+ maybe-configure-stage2-fixincludes:
+ maybe-all-stage2-fixincludes:
+ maybe-clean-stage2-fixincludes:
+
+ @if fixincludes-bootstrap
+ maybe-configure-stage2-fixincludes: configure-stage2-fixincludes
+ configure-stage2-fixincludes:
+ @$(MAKE) stage2-start
+ @[ -f fixincludes/Makefile ] && exit 0 || : ; \
+ r=`${PWD_COMMAND}`; export r; \
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ $(STAGE_HOST_EXPORTS) \
+ echo Configuring stage 2 in fixincludes ; \
+ cd fixincludes || exit 1; \
+ case $(srcdir) in \
+ \.) \
+ srcdiroption="--srcdir=."; \
+ libsrcdir=".";; \
+ /* | [A-Za-z]:[\\/]*) \
+ srcdiroption="--srcdir=$(srcdir)/fixincludes"; \
+ libsrcdir="$$s/fixincludes";; \
+ *) \
+ srcdiroption="--srcdir=../$(srcdir)/fixincludes"; \
+ libsrcdir="$$s/fixincludes";; \
+ esac; \
+ $(SHELL) $${libsrcdir}/configure \
+ $(HOST_CONFIGARGS) $${srcdiroption} \
+ @stage2_werror_flag@
+
+ maybe-all-stage2-fixincludes: all-stage2-fixincludes
+ all-stage2-fixincludes: configure-stage2-fixincludes
+ @$(MAKE) stage2-start
+ @r=`${PWD_COMMAND}`; export r; \
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ $(STAGE_HOST_EXPORTS) \
+ cd fixincludes && \
+ $(MAKE) $(FLAGS_TO_PASS) \
+ $(POSTSTAGE1_FLAGS_TO_PASS) \
+
+
+ maybe-clean-stage2-fixincludes: clean-stage2-fixincludes
+ clean-stage2-fixincludes:
+ @[ -f fixincludes/Makefile ] || [ -f stage2-fixincludes/Makefile ] \
+ || exit 0 ; \
+ [ -f fixincludes/Makefile ] || $(MAKE) stage2-start ; \
+ cd fixincludes && \
+ $(MAKE) $(FLAGS_TO_PASS) \
+ $(POSTSTAGE1_FLAGS_TO_PASS) \
+ clean
+ @endif fixincludes-bootstrap
+
+
.PHONY: configure-stage2-gas maybe-configure-stage2-gas
.PHONY: all-stage2-gas maybe-all-stage2-gas
.PHONY: clean-stage2-gas maybe-clean-stage2-gas
*************** stage3-start::
*** 31971,31976 ****
--- 32103,32113 ----
set stage3-binutils binutils ; @CREATE_LINK_TO_DIR@ ; \
set stage2-binutils prev-binutils ; @CREATE_LINK_TO_DIR@
@endif binutils
+ @if fixincludes
+ @[ -d stage3-fixincludes ] || mkdir stage3-fixincludes; \
+ set stage3-fixincludes fixincludes ; @CREATE_LINK_TO_DIR@ ; \
+ set stage2-fixincludes prev-fixincludes ; @CREATE_LINK_TO_DIR@
+ @endif fixincludes
@if gas
@[ -d stage3-gas ] || mkdir stage3-gas; \
set stage3-gas gas ; @CREATE_LINK_TO_DIR@ ; \
*************** stage3-end::
*** 32021,32026 ****
--- 32158,32167 ----
@set binutils stage3-binutils ; @UNDO_LINK_TO_DIR@ ; \
set prev-binutils stage2-binutils ; @UNDO_LINK_TO_DIR@
@endif binutils
+ @if fixincludes
+ @set fixincludes stage3-fixincludes ; @UNDO_LINK_TO_DIR@ ; \
+ set prev-fixincludes stage2-fixincludes ; @UNDO_LINK_TO_DIR@
+ @endif fixincludes
@if gas
@set gas stage3-gas ; @UNDO_LINK_TO_DIR@ ; \
set prev-gas stage2-gas ; @UNDO_LINK_TO_DIR@
*************** stage3-bubble:: stage2-bubble
*** 32066,32072 ****
all-stage3: \
maybe-all-stage3-bfd \
maybe-all-stage3-opcodes \
! maybe-all-stage3-binutils \
maybe-all-stage3-gas \
maybe-all-stage3-gcc \
maybe-all-stage3-intl \
--- 32207,32214 ----
all-stage3: \
maybe-all-stage3-bfd \
maybe-all-stage3-opcodes \
! maybe-all-stage3-binutils \
! maybe-all-stage3-fixincludes \
maybe-all-stage3-gas \
maybe-all-stage3-gcc \
maybe-all-stage3-intl \
*************** do-clean: clean-stage3
*** 32079,32085 ****
clean-stage3: \
maybe-clean-stage3-bfd \
maybe-clean-stage3-opcodes \
! maybe-clean-stage3-binutils \
maybe-clean-stage3-gas \
maybe-clean-stage3-gcc \
maybe-clean-stage3-intl \
--- 32221,32228 ----
clean-stage3: \
maybe-clean-stage3-bfd \
maybe-clean-stage3-opcodes \
! maybe-clean-stage3-binutils \
! maybe-clean-stage3-fixincludes \
maybe-clean-stage3-gas \
maybe-clean-stage3-gcc \
maybe-clean-stage3-intl \
*************** clean-stage3-binutils:
*** 32257,32262 ****
--- 32400,32461 ----
@endif binutils-bootstrap
+ .PHONY: configure-stage3-fixincludes maybe-configure-stage3-fixincludes
+ .PHONY: all-stage3-fixincludes maybe-all-stage3-fixincludes
+ .PHONY: clean-stage3-fixincludes maybe-clean-stage3-fixincludes
+
+ maybe-configure-stage3-fixincludes:
+ maybe-all-stage3-fixincludes:
+ maybe-clean-stage3-fixincludes:
+
+ @if fixincludes-bootstrap
+ maybe-configure-stage3-fixincludes: configure-stage3-fixincludes
+ configure-stage3-fixincludes:
+ @$(MAKE) stage3-start
+ @[ -f fixincludes/Makefile ] && exit 0 || : ; \
+ r=`${PWD_COMMAND}`; export r; \
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ $(STAGE_HOST_EXPORTS) \
+ echo Configuring stage 3 in fixincludes ; \
+ cd fixincludes || exit 1; \
+ case $(srcdir) in \
+ \.) \
+ srcdiroption="--srcdir=."; \
+ libsrcdir=".";; \
+ /* | [A-Za-z]:[\\/]*) \
+ srcdiroption="--srcdir=$(srcdir)/fixincludes"; \
+ libsrcdir="$$s/fixincludes";; \
+ *) \
+ srcdiroption="--srcdir=../$(srcdir)/fixincludes"; \
+ libsrcdir="$$s/fixincludes";; \
+ esac; \
+ $(SHELL) $${libsrcdir}/configure \
+ $(HOST_CONFIGARGS) $${srcdiroption} \
+ @stage2_werror_flag@
+
+ maybe-all-stage3-fixincludes: all-stage3-fixincludes
+ all-stage3-fixincludes: configure-stage3-fixincludes
+ @$(MAKE) stage3-start
+ @r=`${PWD_COMMAND}`; export r; \
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ $(STAGE_HOST_EXPORTS) \
+ cd fixincludes && \
+ $(MAKE) $(FLAGS_TO_PASS) \
+ $(POSTSTAGE1_FLAGS_TO_PASS) \
+
+
+ maybe-clean-stage3-fixincludes: clean-stage3-fixincludes
+ clean-stage3-fixincludes:
+ @[ -f fixincludes/Makefile ] || [ -f stage3-fixincludes/Makefile ] \
+ || exit 0 ; \
+ [ -f fixincludes/Makefile ] || $(MAKE) stage3-start ; \
+ cd fixincludes && \
+ $(MAKE) $(FLAGS_TO_PASS) \
+ $(POSTSTAGE1_FLAGS_TO_PASS) \
+ clean
+ @endif fixincludes-bootstrap
+
+
.PHONY: configure-stage3-gas maybe-configure-stage3-gas
.PHONY: all-stage3-gas maybe-all-stage3-gas
.PHONY: clean-stage3-gas maybe-clean-stage3-gas
*************** stage4-start::
*** 32722,32727 ****
--- 32921,32931 ----
set stage4-binutils binutils ; @CREATE_LINK_TO_DIR@ ; \
set stage3-binutils prev-binutils ; @CREATE_LINK_TO_DIR@
@endif binutils
+ @if fixincludes
+ @[ -d stage4-fixincludes ] || mkdir stage4-fixincludes; \
+ set stage4-fixincludes fixincludes ; @CREATE_LINK_TO_DIR@ ; \
+ set stage3-fixincludes prev-fixincludes ; @CREATE_LINK_TO_DIR@
+ @endif fixincludes
@if gas
@[ -d stage4-gas ] || mkdir stage4-gas; \
set stage4-gas gas ; @CREATE_LINK_TO_DIR@ ; \
*************** stage4-end::
*** 32772,32777 ****
--- 32976,32985 ----
@set binutils stage4-binutils ; @UNDO_LINK_TO_DIR@ ; \
set prev-binutils stage3-binutils ; @UNDO_LINK_TO_DIR@
@endif binutils
+ @if fixincludes
+ @set fixincludes stage4-fixincludes ; @UNDO_LINK_TO_DIR@ ; \
+ set prev-fixincludes stage3-fixincludes ; @UNDO_LINK_TO_DIR@
+ @endif fixincludes
@if gas
@set gas stage4-gas ; @UNDO_LINK_TO_DIR@ ; \
set prev-gas stage3-gas ; @UNDO_LINK_TO_DIR@
*************** stage4-bubble:: stage3-bubble
*** 32817,32823 ****
all-stage4: \
maybe-all-stage4-bfd \
maybe-all-stage4-opcodes \
! maybe-all-stage4-binutils \
maybe-all-stage4-gas \
maybe-all-stage4-gcc \
maybe-all-stage4-intl \
--- 33025,33032 ----
all-stage4: \
maybe-all-stage4-bfd \
maybe-all-stage4-opcodes \
! maybe-all-stage4-binutils \
! maybe-all-stage4-fixincludes \
maybe-all-stage4-gas \
maybe-all-stage4-gcc \
maybe-all-stage4-intl \
*************** do-clean: clean-stage4
*** 32830,32836 ****
clean-stage4: \
maybe-clean-stage4-bfd \
maybe-clean-stage4-opcodes \
! maybe-clean-stage4-binutils \
maybe-clean-stage4-gas \
maybe-clean-stage4-gcc \
maybe-clean-stage4-intl \
--- 33039,33046 ----
clean-stage4: \
maybe-clean-stage4-bfd \
maybe-clean-stage4-opcodes \
! maybe-clean-stage4-binutils \
! maybe-clean-stage4-fixincludes \
maybe-clean-stage4-gas \
maybe-clean-stage4-gcc \
maybe-clean-stage4-intl \
*************** clean-stage4-binutils:
*** 33008,33013 ****
--- 33218,33279 ----
@endif binutils-bootstrap
+ .PHONY: configure-stage4-fixincludes maybe-configure-stage4-fixincludes
+ .PHONY: all-stage4-fixincludes maybe-all-stage4-fixincludes
+ .PHONY: clean-stage4-fixincludes maybe-clean-stage4-fixincludes
+
+ maybe-configure-stage4-fixincludes:
+ maybe-all-stage4-fixincludes:
+ maybe-clean-stage4-fixincludes:
+
+ @if fixincludes-bootstrap
+ maybe-configure-stage4-fixincludes: configure-stage4-fixincludes
+ configure-stage4-fixincludes:
+ @$(MAKE) stage4-start
+ @[ -f fixincludes/Makefile ] && exit 0 || : ; \
+ r=`${PWD_COMMAND}`; export r; \
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ $(STAGE_HOST_EXPORTS) \
+ echo Configuring stage 4 in fixincludes ; \
+ cd fixincludes || exit 1; \
+ case $(srcdir) in \
+ \.) \
+ srcdiroption="--srcdir=."; \
+ libsrcdir=".";; \
+ /* | [A-Za-z]:[\\/]*) \
+ srcdiroption="--srcdir=$(srcdir)/fixincludes"; \
+ libsrcdir="$$s/fixincludes";; \
+ *) \
+ srcdiroption="--srcdir=../$(srcdir)/fixincludes"; \
+ libsrcdir="$$s/fixincludes";; \
+ esac; \
+ $(SHELL) $${libsrcdir}/configure \
+ $(HOST_CONFIGARGS) $${srcdiroption} \
+ @stage2_werror_flag@
+
+ maybe-all-stage4-fixincludes: all-stage4-fixincludes
+ all-stage4-fixincludes: configure-stage4-fixincludes
+ @$(MAKE) stage4-start
+ @r=`${PWD_COMMAND}`; export r; \
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ $(STAGE_HOST_EXPORTS) \
+ cd fixincludes && \
+ $(MAKE) $(FLAGS_TO_PASS) \
+ $(POSTSTAGE1_FLAGS_TO_PASS) \
+
+
+ maybe-clean-stage4-fixincludes: clean-stage4-fixincludes
+ clean-stage4-fixincludes:
+ @[ -f fixincludes/Makefile ] || [ -f stage4-fixincludes/Makefile ] \
+ || exit 0 ; \
+ [ -f fixincludes/Makefile ] || $(MAKE) stage4-start ; \
+ cd fixincludes && \
+ $(MAKE) $(FLAGS_TO_PASS) \
+ $(POSTSTAGE1_FLAGS_TO_PASS) \
+ clean
+ @endif fixincludes-bootstrap
+
+
.PHONY: configure-stage4-gas maybe-configure-stage4-gas
.PHONY: all-stage4-gas maybe-all-stage4-gas
.PHONY: clean-stage4-gas maybe-clean-stage4-gas
*************** stageprofile-start::
*** 33470,33475 ****
--- 33736,33746 ----
set stageprofile-binutils binutils ; @CREATE_LINK_TO_DIR@ ; \
set stage1-binutils prev-binutils ; @CREATE_LINK_TO_DIR@
@endif binutils
+ @if fixincludes
+ @[ -d stageprofile-fixincludes ] || mkdir stageprofile-fixincludes; \
+ set stageprofile-fixincludes fixincludes ; @CREATE_LINK_TO_DIR@ ; \
+ set stage1-fixincludes prev-fixincludes ; @CREATE_LINK_TO_DIR@
+ @endif fixincludes
@if gas
@[ -d stageprofile-gas ] || mkdir stageprofile-gas; \
set stageprofile-gas gas ; @CREATE_LINK_TO_DIR@ ; \
*************** stageprofile-end::
*** 33520,33525 ****
--- 33791,33800 ----
@set binutils stageprofile-binutils ; @UNDO_LINK_TO_DIR@ ; \
set prev-binutils stage1-binutils ; @UNDO_LINK_TO_DIR@
@endif binutils
+ @if fixincludes
+ @set fixincludes stageprofile-fixincludes ; @UNDO_LINK_TO_DIR@ ; \
+ set prev-fixincludes stage1-fixincludes ; @UNDO_LINK_TO_DIR@
+ @endif fixincludes
@if gas
@set gas stageprofile-gas ; @UNDO_LINK_TO_DIR@ ; \
set prev-gas stage1-gas ; @UNDO_LINK_TO_DIR@
*************** stageprofile-bubble:: stage1-bubble
*** 33564,33570 ****
all-stageprofile: \
maybe-all-stageprofile-bfd \
maybe-all-stageprofile-opcodes \
! maybe-all-stageprofile-binutils \
maybe-all-stageprofile-gas \
maybe-all-stageprofile-gcc \
maybe-all-stageprofile-intl \
--- 33839,33846 ----
all-stageprofile: \
maybe-all-stageprofile-bfd \
maybe-all-stageprofile-opcodes \
! maybe-all-stageprofile-binutils \
! maybe-all-stageprofile-fixincludes \
maybe-all-stageprofile-gas \
maybe-all-stageprofile-gcc \
maybe-all-stageprofile-intl \
*************** do-clean: clean-stageprofile
*** 33577,33583 ****
clean-stageprofile: \
maybe-clean-stageprofile-bfd \
maybe-clean-stageprofile-opcodes \
! maybe-clean-stageprofile-binutils \
maybe-clean-stageprofile-gas \
maybe-clean-stageprofile-gcc \
maybe-clean-stageprofile-intl \
--- 33853,33860 ----
clean-stageprofile: \
maybe-clean-stageprofile-bfd \
maybe-clean-stageprofile-opcodes \
! maybe-clean-stageprofile-binutils \
! maybe-clean-stageprofile-fixincludes \
maybe-clean-stageprofile-gas \
maybe-clean-stageprofile-gcc \
maybe-clean-stageprofile-intl \
*************** clean-stageprofile-binutils:
*** 33755,33760 ****
--- 34032,34093 ----
@endif binutils-bootstrap
+ .PHONY: configure-stageprofile-fixincludes maybe-configure-stageprofile-fixincludes
+ .PHONY: all-stageprofile-fixincludes maybe-all-stageprofile-fixincludes
+ .PHONY: clean-stageprofile-fixincludes maybe-clean-stageprofile-fixincludes
+
+ maybe-configure-stageprofile-fixincludes:
+ maybe-all-stageprofile-fixincludes:
+ maybe-clean-stageprofile-fixincludes:
+
+ @if fixincludes-bootstrap
+ maybe-configure-stageprofile-fixincludes: configure-stageprofile-fixincludes
+ configure-stageprofile-fixincludes:
+ @$(MAKE) stageprofile-start
+ @[ -f fixincludes/Makefile ] && exit 0 || : ; \
+ r=`${PWD_COMMAND}`; export r; \
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ $(STAGE_HOST_EXPORTS) \
+ echo Configuring stage profile in fixincludes ; \
+ cd fixincludes || exit 1; \
+ case $(srcdir) in \
+ \.) \
+ srcdiroption="--srcdir=."; \
+ libsrcdir=".";; \
+ /* | [A-Za-z]:[\\/]*) \
+ srcdiroption="--srcdir=$(srcdir)/fixincludes"; \
+ libsrcdir="$$s/fixincludes";; \
+ *) \
+ srcdiroption="--srcdir=../$(srcdir)/fixincludes"; \
+ libsrcdir="$$s/fixincludes";; \
+ esac; \
+ $(SHELL) $${libsrcdir}/configure \
+ $(HOST_CONFIGARGS) $${srcdiroption} \
+ @stage2_werror_flag@
+
+ maybe-all-stageprofile-fixincludes: all-stageprofile-fixincludes
+ all-stageprofile-fixincludes: configure-stageprofile-fixincludes
+ @$(MAKE) stageprofile-start
+ @r=`${PWD_COMMAND}`; export r; \
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ $(STAGE_HOST_EXPORTS) \
+ cd fixincludes && \
+ $(MAKE) $(FLAGS_TO_PASS) \
+ $(POSTSTAGE1_FLAGS_TO_PASS) \
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"
+
+ maybe-clean-stageprofile-fixincludes: clean-stageprofile-fixincludes
+ clean-stageprofile-fixincludes:
+ @[ -f fixincludes/Makefile ] || [ -f stageprofile-fixincludes/Makefile ] \
+ || exit 0 ; \
+ [ -f fixincludes/Makefile ] || $(MAKE) stageprofile-start ; \
+ cd fixincludes && \
+ $(MAKE) $(FLAGS_TO_PASS) \
+ $(POSTSTAGE1_FLAGS_TO_PASS) \
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean
+ @endif fixincludes-bootstrap
+
+
.PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas
.PHONY: all-stageprofile-gas maybe-all-stageprofile-gas
.PHONY: clean-stageprofile-gas maybe-clean-stageprofile-gas
*************** stagefeedback-start::
*** 34187,34192 ****
--- 34520,34530 ----
set stagefeedback-binutils binutils ; @CREATE_LINK_TO_DIR@ ; \
set stage1-binutils prev-binutils ; @CREATE_LINK_TO_DIR@
@endif binutils
+ @if fixincludes
+ @[ -d stagefeedback-fixincludes ] || mkdir stagefeedback-fixincludes; \
+ set stagefeedback-fixincludes fixincludes ; @CREATE_LINK_TO_DIR@ ; \
+ set stage1-fixincludes prev-fixincludes ; @CREATE_LINK_TO_DIR@
+ @endif fixincludes
@if gas
@[ -d stagefeedback-gas ] || mkdir stagefeedback-gas; \
set stagefeedback-gas gas ; @CREATE_LINK_TO_DIR@ ; \
*************** stagefeedback-end::
*** 34237,34242 ****
--- 34575,34584 ----
@set binutils stagefeedback-binutils ; @UNDO_LINK_TO_DIR@ ; \
set prev-binutils stage1-binutils ; @UNDO_LINK_TO_DIR@
@endif binutils
+ @if fixincludes
+ @set fixincludes stagefeedback-fixincludes ; @UNDO_LINK_TO_DIR@ ; \
+ set prev-fixincludes stage1-fixincludes ; @UNDO_LINK_TO_DIR@
+ @endif fixincludes
@if gas
@set gas stagefeedback-gas ; @UNDO_LINK_TO_DIR@ ; \
set prev-gas stage1-gas ; @UNDO_LINK_TO_DIR@
*************** stagefeedback-bubble:: stage1-bubble
*** 34281,34287 ****
all-stagefeedback: \
maybe-all-stagefeedback-bfd \
maybe-all-stagefeedback-opcodes \
! maybe-all-stagefeedback-binutils \
maybe-all-stagefeedback-gas \
maybe-all-stagefeedback-gcc \
maybe-all-stagefeedback-intl \
--- 34623,34630 ----
all-stagefeedback: \
maybe-all-stagefeedback-bfd \
maybe-all-stagefeedback-opcodes \
! maybe-all-stagefeedback-binutils \
! maybe-all-stagefeedback-fixincludes \
maybe-all-stagefeedback-gas \
maybe-all-stagefeedback-gcc \
maybe-all-stagefeedback-intl \
*************** do-clean: clean-stagefeedback
*** 34294,34300 ****
clean-stagefeedback: \
maybe-clean-stagefeedback-bfd \
maybe-clean-stagefeedback-opcodes \
! maybe-clean-stagefeedback-binutils \
maybe-clean-stagefeedback-gas \
maybe-clean-stagefeedback-gcc \
maybe-clean-stagefeedback-intl \
--- 34637,34644 ----
clean-stagefeedback: \
maybe-clean-stagefeedback-bfd \
maybe-clean-stagefeedback-opcodes \
! maybe-clean-stagefeedback-binutils \
! maybe-clean-stagefeedback-fixincludes \
maybe-clean-stagefeedback-gas \
maybe-clean-stagefeedback-gcc \
maybe-clean-stagefeedback-intl \
*************** clean-stagefeedback-binutils:
*** 34472,34477 ****
--- 34816,34877 ----
@endif binutils-bootstrap
+ .PHONY: configure-stagefeedback-fixincludes maybe-configure-stagefeedback-fixincludes
+ .PHONY: all-stagefeedback-fixincludes maybe-all-stagefeedback-fixincludes
+ .PHONY: clean-stagefeedback-fixincludes maybe-clean-stagefeedback-fixincludes
+
+ maybe-configure-stagefeedback-fixincludes:
+ maybe-all-stagefeedback-fixincludes:
+ maybe-clean-stagefeedback-fixincludes:
+
+ @if fixincludes-bootstrap
+ maybe-configure-stagefeedback-fixincludes: configure-stagefeedback-fixincludes
+ configure-stagefeedback-fixincludes:
+ @$(MAKE) stagefeedback-start
+ @[ -f fixincludes/Makefile ] && exit 0 || : ; \
+ r=`${PWD_COMMAND}`; export r; \
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ $(STAGE_HOST_EXPORTS) \
+ echo Configuring stage feedback in fixincludes ; \
+ cd fixincludes || exit 1; \
+ case $(srcdir) in \
+ \.) \
+ srcdiroption="--srcdir=."; \
+ libsrcdir=".";; \
+ /* | [A-Za-z]:[\\/]*) \
+ srcdiroption="--srcdir=$(srcdir)/fixincludes"; \
+ libsrcdir="$$s/fixincludes";; \
+ *) \
+ srcdiroption="--srcdir=../$(srcdir)/fixincludes"; \
+ libsrcdir="$$s/fixincludes";; \
+ esac; \
+ $(SHELL) $${libsrcdir}/configure \
+ $(HOST_CONFIGARGS) $${srcdiroption} \
+ @stage2_werror_flag@
+
+ maybe-all-stagefeedback-fixincludes: all-stagefeedback-fixincludes
+ all-stagefeedback-fixincludes: configure-stagefeedback-fixincludes
+ @$(MAKE) stagefeedback-start
+ @r=`${PWD_COMMAND}`; export r; \
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ $(STAGE_HOST_EXPORTS) \
+ cd fixincludes && \
+ $(MAKE) $(FLAGS_TO_PASS) \
+ $(POSTSTAGE1_FLAGS_TO_PASS) \
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-use"
+
+ maybe-clean-stagefeedback-fixincludes: clean-stagefeedback-fixincludes
+ clean-stagefeedback-fixincludes:
+ @[ -f fixincludes/Makefile ] || [ -f stagefeedback-fixincludes/Makefile ] \
+ || exit 0 ; \
+ [ -f fixincludes/Makefile ] || $(MAKE) stagefeedback-start ; \
+ cd fixincludes && \
+ $(MAKE) $(FLAGS_TO_PASS) \
+ $(POSTSTAGE1_FLAGS_TO_PASS) \
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean
+ @endif fixincludes-bootstrap
+
+
.PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas
.PHONY: all-stagefeedback-gas maybe-all-stagefeedback-gas
.PHONY: clean-stagefeedback-gas maybe-clean-stagefeedback-gas
*************** all-stage4-libcpp: maybe-all-stage4-intl
*** 35212,35217 ****
--- 35612,35624 ----
all-stageprofile-libcpp: maybe-all-stageprofile-intl
all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
all-fixincludes: maybe-all-libiberty
+
+ all-stage1-fixincludes: maybe-all-stage1-libiberty
+ all-stage2-fixincludes: maybe-all-stage2-libiberty
+ all-stage3-fixincludes: maybe-all-stage3-libiberty
+ all-stage4-fixincludes: maybe-all-stage4-libiberty
+ all-stageprofile-fixincludes: maybe-all-stageprofile-libiberty
+ all-stagefeedback-fixincludes: maybe-all-stagefeedback-libiberty
configure-gdb: maybe-configure-itcl
configure-gdb: maybe-configure-tcl
configure-gdb: maybe-configure-tk
*************** all-target-winsup: maybe-all-target-libt
*** 35517,35522 ****
--- 35924,35930 ----
all-prebootstrap: maybe-all-bfd
all-prebootstrap: maybe-all-opcodes
all-prebootstrap: maybe-all-binutils
+ all-prebootstrap: maybe-all-fixincludes
all-prebootstrap: maybe-all-gas
all-prebootstrap: maybe-all-intl
all-prebootstrap: maybe-all-ld