JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2007-05-16 Paolo Bonzini <bonzini@gnu.org>

Browse Source 
* Makefile.def (bootstrap_stage): Replace stage_make_flags with
	stage_cflags.
	* Makefile.tpl (POSTSTAGE1_HOST_EXPORTS, POSTSTAGE1_FLAGS_TO_PASS):
	Remove CFLAGS/LIBCFLAGS.
	(configure-stage[+id+]-[+prefix+][+module+],
	all-stage[+id+]-[+prefix+][+module+]): Pass it from [+stage_cflags+].
	* Makefile.in: Regenerate.
This commit is contained in:
Paolo Bonzini 2007-05-16 09:03:22 +00:00
parent f9a963b8a0
commit 2ba0944446
4 changed files with 443 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2007-05-16 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (bootstrap_stage): Replace stage_make_flags with
stage_cflags.
* Makefile.tpl (POSTSTAGE1_HOST_EXPORTS, POSTSTAGE1_FLAGS_TO_PASS):
Remove CFLAGS/LIBCFLAGS.
(configure-stage[+id+]-[+prefix+][+module+],
all-stage[+id+]-[+prefix+][+module+]): Pass it from [+stage_cflags+].
* Makefile.in: Regenerate.
2007-04-14 Steve Ellcey <sje@cup.hp.com> 2007-04-14 Steve Ellcey <sje@cup.hp.com>
* config-ml.in: Update from GCC. * config-ml.in: Update from GCC.

12
Makefile.def
View File

@ -506,31 +506,31 @@ bootstrap_stage = {
// compiler probably has never heard of them. // compiler probably has never heard of them.
stage_configure_flags='--disable-intermodule $(STAGE1_CHECKING) \ stage_configure_flags='--disable-intermodule $(STAGE1_CHECKING) \
--disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ; --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ;
stage_make_flags='CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"' ; }; stage_cflags='$(STAGE1_CFLAGS)' ; };
bootstrap_stage = { bootstrap_stage = {
id=2 ; prev=1 ; id=2 ; prev=1 ;
bootstrap_target=bootstrap2 ; bootstrap_target=bootstrap2 ;
stage_configure_flags="@stage2_werror_flag@" ; stage_configure_flags="@stage2_werror_flag@" ;
stage_make_flags="" ; }; stage_cflags="$(BOOT_CFLAGS)" ; };
bootstrap_stage = { bootstrap_stage = {
id=3 ; prev=2 ; lean=1 ; id=3 ; prev=2 ; lean=1 ;
compare_target=compare ; compare_target=compare ;
bootstrap_target=bootstrap ; bootstrap_target=bootstrap ;
cleanstrap_target=cleanstrap ; cleanstrap_target=cleanstrap ;
stage_configure_flags="@stage2_werror_flag@" ; stage_configure_flags="@stage2_werror_flag@" ;
stage_make_flags="" ; }; stage_cflags="$(BOOT_CFLAGS)" ; };
bootstrap_stage = { bootstrap_stage = {
id=4 ; prev=3 ; lean=2 ; id=4 ; prev=3 ; lean=2 ;
compare_target=compare3 ; compare_target=compare3 ;
bootstrap_target=bootstrap4 ; bootstrap_target=bootstrap4 ;
stage_configure_flags="@stage2_werror_flag@" ; stage_configure_flags="@stage2_werror_flag@" ;
stage_make_flags="" ; }; stage_cflags="$(BOOT_CFLAGS)" ; };
bootstrap_stage = { bootstrap_stage = {
id=profile ; prev=1 ; id=profile ; prev=1 ;
stage_configure_flags="@stage2_werror_flag@" ; stage_configure_flags="@stage2_werror_flag@" ;
stage_make_flags='CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"' ; }; stage_cflags='$(BOOT_CFLAGS) -fprofile-generate' ; };
bootstrap_stage = { bootstrap_stage = {
id=feedback ; prev=profile ; id=feedback ; prev=profile ;
bootstrap_target=profiledbootstrap ; bootstrap_target=profiledbootstrap ;
stage_configure_flags="@stage2_werror_flag@" ; stage_configure_flags="@stage2_werror_flag@" ;
stage_make_flags='CFLAGS="$(BOOT_CFLAGS) -fprofile-use"' ; }; stage_cflags='$(BOOT_CFLAGS) -fprofile-use' ; };

501
Makefile.in
View File

File diff suppressed because it is too large Load Diff

14
Makefile.tpl
View File

@ -191,7 +191,6 @@ POSTSTAGE1_HOST_EXPORTS = \
$$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \ $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
-B$$r/$(HOST_SUBDIR)/prev-gcc/ \ -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
-B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \
CFLAGS="$(BOOT_CFLAGS)"; export CFLAGS; \
LDFLAGS="$(BOOT_LDFLAGS)"; export LDFLAGS; LDFLAGS="$(BOOT_LDFLAGS)"; export LDFLAGS;
# Target libraries are put under this directory: # Target libraries are put under this directory:
@ -456,8 +455,6 @@ X11_FLAGS_TO_PASS = \
POSTSTAGE1_FLAGS_TO_PASS = \ POSTSTAGE1_FLAGS_TO_PASS = \
CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind" \ GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind" \
CFLAGS="$(BOOT_CFLAGS)" \
LIBCFLAGS="$(BOOT_CFLAGS)" \
LDFLAGS="$(BOOT_LDFLAGS)" \ LDFLAGS="$(BOOT_LDFLAGS)" \
"`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" "`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
@ -824,6 +821,8 @@ configure-stage[+id+]-[+prefix+][+module+]:
[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \ [+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
[+exports+][+ IF prev +] \ [+exports+][+ IF prev +] \
[+poststage1_exports+][+ ENDIF prev +] \ [+poststage1_exports+][+ ENDIF prev +] \
CFLAGS="[+stage_cflags+]"; export CFLAGS; \
LIBCFLAGS="[+stage_cflags+]"; export LIBCFLAGS; \
echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \ echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \
$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \ $(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
cd [+subdir+]/[+module+] || exit 1; \ cd [+subdir+]/[+module+] || exit 1; \
@ -880,9 +879,10 @@ all-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+]
[+exports+][+ IF prev +] \ [+exports+][+ IF prev +] \
[+poststage1_exports+][+ ENDIF prev +] \ [+poststage1_exports+][+ ENDIF prev +] \
cd [+subdir+]/[+module+] && \ cd [+subdir+]/[+module+] && \
$(MAKE) [+args+] [+ IF prev $(MAKE) [+args+] \
+][+poststage1_args+][+ ENDIF prev CFLAGS="[+stage_cflags+]" LIBCFLAGS="[+stage_cflags+]" [+
+] [+stage_make_flags+] [+extra_make_flags+] \ IF prev +][+poststage1_args+][+ ENDIF prev
+] [+extra_make_flags+] \
$(TARGET-stage[+id+]-[+prefix+][+module+]) $(TARGET-stage[+id+]-[+prefix+][+module+])
maybe-clean-stage[+id+]-[+prefix+][+module+]: clean-stage[+id+]-[+prefix+][+module+] maybe-clean-stage[+id+]-[+prefix+][+module+]: clean-stage[+id+]-[+prefix+][+module+]
@ -897,7 +897,7 @@ clean-stage[+id+]-[+prefix+][+module+]:
cd [+subdir+]/[+module+] && \ cd [+subdir+]/[+module+] && \
$(MAKE) [+args+] [+ IF prev +] \ $(MAKE) [+args+] [+ IF prev +] \
[+poststage1_args+] [+ ENDIF prev +] \ [+poststage1_args+] [+ ENDIF prev +] \
[+stage_make_flags+] [+extra_make_flags+] clean [+extra_make_flags+] clean
@endif [+prefix+][+module+]-bootstrap @endif [+prefix+][+module+]-bootstrap
[+ ENDFOR bootstrap_stage +] [+ ENDFOR bootstrap_stage +]