OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR bootstrap/30541 (Top-level should pass GNATBIND, GNATLINK and GNATMAKE variables down)

Browse Source 
2007-01-23  Richard Guenther  <rguenther@suse.de>

	PR bootstrap/30541
	* Makefile.def (flags_to_pass): Add GNATBIND and GNATMAKE.
	* Makefile.tpl (GNATBIND): Substitute it.
	(GNATMAKE): Likewise.
	(POSTSTAGE1_FLAGS_TO_PASS): Pass staged GNATBIND instead
	of STAGE_PREFIX.
	* Makefile.in: Regenerate.
	* configure: Regenerate.

        config/
	* acx.m4 (ACX_PROG_GNAT): Check for gnatmake.

	libada/
	* Makefile.in (STAGE_PREFIX): Do not define.
	(FLAGS_TO_PASS): Do not pass STAGE_PREFIX.

	gnattools/
	* Makefile.in (STAGE_PREFIX): Do not define.

	ada/
	* Make-lang.in: Replace invocations of gnatmake with $(GNATMAKE).
	(gnatboot2): Pass staged GNATMAKE instead of STAGE_PREFIX.
	(gnatboot3): Likewise.
	(GNATBIND): Do not define.
	* Makefile.in (GNATBIND): Do not define.

From-SVN: r121082
This commit is contained in:
Richard Guenther 2007-01-23 16:37:09 +00:00 committed by Richard Biener
parent d5dc6badbf
commit 5305be7e84
14 changed files with 253 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2007-01-23 Richard Guenther <rguenther@suse.de>
PR bootstrap/30541
* Makefile.def (flags_to_pass): Add GNATBIND and GNATMAKE.
* Makefile.tpl (GNATBIND): Substitute it.
(GNATMAKE): Likewise.
(POSTSTAGE1_FLAGS_TO_PASS): Pass staged GNATBIND instead
of STAGE_PREFIX.
* Makefile.in: Regenerate.
* configure: Regenerate.
2007-01-18 Mike Stump <mrs@apple.com>
* configure.in: Re-enable -Werror for gcc builds.

2
Makefile.def
View File

@ -237,6 +237,8 @@ flags_to_pass = { flag= LIBCXXFLAGS ; };
flags_to_pass = { flag= STAGE1_CFLAGS ; };
flags_to_pass = { flag= STAGE1_CHECKING ; };
flags_to_pass = { flag= STAGE1_LANGUAGES ; };
flags_to_pass = { flag= GNATBIND ; };
flags_to_pass = { flag= GNATMAKE ; };
// Target tools
flags_to_pass = { flag= AR_FOR_TARGET ; };

7
Makefile.in
View File

@ -296,6 +296,9 @@ RANLIB = @RANLIB@
STRIP = @STRIP@
WINDRES = @WINDRES@
GNATBIND = @GNATBIND@
GNATMAKE = @GNATMAKE@
CFLAGS = @CFLAGS@
LDFLAGS =
LIBCFLAGS = $(CFLAGS)
@ -482,6 +485,8 @@ BASE_FLAGS_TO_PASS = \
"STAGE1_CFLAGS=$(STAGE1_CFLAGS)" \
"STAGE1_CHECKING=$(STAGE1_CHECKING)" \
"STAGE1_LANGUAGES=$(STAGE1_LANGUAGES)" \
"GNATBIND=$(GNATBIND)" \
"GNATMAKE=$(GNATMAKE)" \
"AR_FOR_TARGET=$(AR_FOR_TARGET)" \
"AS_FOR_TARGET=$(AS_FOR_TARGET)" \
"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
@ -544,7 +549,7 @@ X11_FLAGS_TO_PASS = \
POSTSTAGE1_FLAGS_TO_PASS = \
CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
STAGE_PREFIX="$$r/$(HOST_SUBDIR)/prev-gcc/" \
GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind" \
CFLAGS="$(BOOT_CFLAGS)" \
LIBCFLAGS="$(BOOT_CFLAGS)" \
LDFLAGS="$(BOOT_LDFLAGS)" \

5
Makefile.tpl
View File

@ -299,6 +299,9 @@ RANLIB = @RANLIB@
STRIP = @STRIP@
WINDRES = @WINDRES@
GNATBIND = @GNATBIND@
GNATMAKE = @GNATMAKE@
CFLAGS = @CFLAGS@
LDFLAGS =
LIBCFLAGS = $(CFLAGS)
@ -451,7 +454,7 @@ X11_FLAGS_TO_PASS = \
POSTSTAGE1_FLAGS_TO_PASS = \
CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
STAGE_PREFIX="$$r/$(HOST_SUBDIR)/prev-gcc/" \
GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind" \
CFLAGS="$(BOOT_CFLAGS)" \
LIBCFLAGS="$(BOOT_CFLAGS)" \
LDFLAGS="$(BOOT_LDFLAGS)" \

5
config/ChangeLog
View File

@ -1,3 +1,8 @@
2007-01-23 Richard Guenther <rguenther@suse.de>
PR bootstrap/30541
* config/acx.m4 (ACX_PROG_GNAT): Check for gnatmake.
2007-01-14 H.J. Lu <hongjiu.lu@intel.com>
* ld-symbolic.m4: New.

5
config/acx.m4
View File

@ -330,11 +330,12 @@ ac_c_preproc_warn_flag=yes])# AC_PROG_CPP_WERROR
# understands Ada. We use the user's CC setting, already found.
#
# Sets the shell variable have_gnat to yes or no as appropriate, and
# substitutes GNATBIND.
# substitutes GNATBIND and GNATMAKE.
AC_DEFUN([ACX_PROG_GNAT],
[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])
AC_REQUIRE([AC_PROG_CC])
AC_CHECK_TOOL(GNATBIND, gnatbind, no)
AC_CHECK_TOOL(GNATMAKE, gnatmake, no)
AC_CACHE_CHECK([whether compiler driver understands Ada],
acx_cv_cc_gcc_supports_ada,
[cat >conftest.adb <<EOF
@ -355,7 +356,7 @@ if test x"$errors" = x && test -f conftest.$ac_objext; then
fi
rm -f conftest.*])
if test x$GNATBIND != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then
if test x$GNATBIND != xno && test x$GNATMAKE != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then
have_gnat=yes
else
have_gnat=no

320
configure vendored
View File

File diff suppressed because it is too large Load Diff

9
gcc/ada/ChangeLog
View File

@ -1,3 +1,12 @@
2007-01-23 Richard Guenther <rguenther@suse.de>
PR bootstrap/30541
* Make-lang.in: Replace invocations of gnatmake with $(GNATMAKE).
(gnatboot2): Pass staged GNATMAKE instead of STAGE_PREFIX.
(gnatboot3): Likewise.
(GNATBIND): Do not define.
* Makefile.in (GNATBIND): Do not define.
2007-01-08 Richard Guenther <rguenther@suse.de>
* cuintp.c (build_cst_from_int): Use built_int_cst_type.

17
gcc/ada/Make-lang.in
View File

@ -54,7 +54,6 @@ ALL_ADA_CFLAGS = $(X_ADA_CFLAGS) $(T_ADA_CFLAGS) $(ADA_CFLAGS)
ADA_INCLUDES = -I- -I. -Iada -I$(srcdir)/ada
ADA_INCLUDE_DIR = $(libsubdir)/adainclude
ADA_RTL_OBJ_DIR = $(libsubdir)/adalib
GNATBIND = $(STAGE_PREFIX)gnatbind
ADA_FLAGS_TO_PASS = \
"ADA_FOR_BUILD=$(ADA_FOR_BUILD)" \
"ADA_INCLUDE_DIR=$(ADA_INCLUDE_DIR)" \
@ -384,7 +383,7 @@ ada.tags: force
ada/doctools/xgnatugn$(build_exeext): ada/xgnatugn.adb
-$(MKDIR) ada/doctools
$(CP) $^ ada/doctools
cd ada/doctools && gnatmake -q xgnatugn
cd ada/doctools && $(GNATMAKE) -q xgnatugn
# Note that gnat_ugn_unw.texi does not depend on xgnatugn
# being built so we can distribute a pregenerated gnat_ugn_unw.info
@ -864,7 +863,7 @@ gnatboot2: force
CFLAGS="$(BOOT_CFLAGS)" \
ADAFLAGS="$(BOOT_ADAFLAGS)"\
LDFLAGS="$(BOOT_LDFLAGS)" \
STAGE_PREFIX=../stage1/
GNATBIND="../stage1/gnatbind"
$(MAKE) gnatboot3 BOOT_CFLAGS="$(BOOT_CFLAGS)" \
BOOT_ADAFLAGS="$(BOOT_ADAFLAGS)" \
LDFLAGS="$(BOOT_LDFLAGS)"
@ -875,7 +874,7 @@ gnatboot3:
CFLAGS="$(BOOT_CFLAGS)" \
ADAFLAGS="$(BOOT_ADAFLAGS)"\
LDFLAGS="$(BOOT_LDFLAGS)" \
STAGE_PREFIX=../stage2/
GNATBIND="../stage2/gnatbind"
gnatstage1: force
-$(MKDIR) stage1
@ -915,27 +914,27 @@ ada/b_gnatb.o : ada/b_gnatb.c
ada/treeprs.ads : ada/treeprs.adt ada/sinfo.ads ada/xtreeprs.adb
-$(MKDIR) ada/bldtools/treeprs
$(CP) $^ ada/bldtools/treeprs
(cd ada/bldtools/treeprs; gnatmake -q xtreeprs ; ./xtreeprs ../../treeprs.ads )
(cd ada/bldtools/treeprs; $(GNATMAKE) -q xtreeprs ; ./xtreeprs ../../treeprs.ads )
ada/einfo.h : ada/einfo.ads ada/einfo.adb ada/xeinfo.adb
-$(MKDIR) ada/bldtools/einfo
$(CP) $^ ada/bldtools/einfo
(cd ada/bldtools/einfo; gnatmake -q xeinfo ; ./xeinfo ../../einfo.h )
(cd ada/bldtools/einfo; $(GNATMAKE) -q xeinfo ; ./xeinfo ../../einfo.h )
ada/sinfo.h : ada/sinfo.ads ada/xsinfo.adb
-$(MKDIR) ada/bldtools/sinfo
$(CP) $^ ada/bldtools/sinfo
(cd ada/bldtools/sinfo; gnatmake -q xsinfo ; ./xsinfo ../../sinfo.h )
(cd ada/bldtools/sinfo; $(GNATMAKE) -q xsinfo ; ./xsinfo ../../sinfo.h )
ada/nmake.adb : ada/sinfo.ads ada/nmake.adt ada/xnmake.adb
-$(MKDIR) ada/bldtools/nmake_b
$(CP) $^ ada/bldtools/nmake_b
(cd ada/bldtools/nmake_b; gnatmake -q xnmake ; ./xnmake -b ../../nmake.adb )
(cd ada/bldtools/nmake_b; $(GNATMAKE) -q xnmake ; ./xnmake -b ../../nmake.adb )
ada/nmake.ads : ada/sinfo.ads ada/nmake.adt ada/xnmake.adb ada/nmake.adb
-$(MKDIR) ada/bldtools/nmake_s
$(CP) $^ ada/bldtools/nmake_s
(cd ada/bldtools/nmake_s; gnatmake -q xnmake ; ./xnmake -s ../../nmake.ads )
(cd ada/bldtools/nmake_s; $(GNATMAKE) -q xnmake ; ./xnmake -s ../../nmake.ads )
update-sources : ada/treeprs.ads ada/einfo.h ada/sinfo.h ada/nmake.adb \
ada/nmake.ads

1
gcc/ada/Makefile.in
View File

@ -115,7 +115,6 @@ INSTALL_DATA_DATE = cp -p
MAKEINFO = makeinfo
TEXI2DVI = texi2dvi
TEXI2PDF = texi2pdf
GNATBIND = $(STAGE_PREFIX)gnatbind
GNATBIND_FLAGS = -static -x
ADA_CFLAGS =
ADAFLAGS = -W -Wall -gnatpg -gnata

5
gnattools/ChangeLog
View File

@ -1,3 +1,8 @@
2007-01-23 Richard Guenther <rguenther@suse.de>
PR bootstrap/30541
* Makefile.in (STAGE_PREFIX): Do not define.
2006-10-10 Brooks Moses <bmoses@stanford.edu>
* Makefile.in: Added empty "pdf" target.

1
gnattools/Makefile.in
View File

@ -38,7 +38,6 @@ TRACE=no
ADA_FOR_BUILD=
ADA_FOR_TARGET=
LDFLAGS=
STAGE_PREFIX=
PWD_COMMAND = $${PWDCMD-pwd}
# The tedious process of getting CFLAGS right.

6
libada/ChangeLog
View File

@ -1,3 +1,9 @@
2007-01-23 Richard Guenther <rguenther@suse.de>
PR bootstrap/30541
* Makefile.in (STAGE_PREFIX): Do not define.
(FLAGS_TO_PASS): Do not pass STAGE_PREFIX.
2006-11-16 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/29802

2
libada/Makefile.in
View File

@ -35,7 +35,6 @@ GNATLIBFLAGS= -W -Wall -gnatpg
THREAD_KIND=native
TRACE=no
LDFLAGS=
STAGE_PREFIX=
# The tedious process of getting CFLAGS right.
CFLAGS=-g
@ -74,7 +73,6 @@ FLAGS_TO_PASS = \
"exeext=$(exeext)" \
"objext=$(objext)" \
"prefix=$(prefix)" \
"STAGE_PREFIX=$(STAGE_PREFIX)" \
"CC=$(host_cc_for_libada)" \
"GCC_FOR_TARGET=$(CC)" \
"CFLAGS=$(CFLAGS) $(WARN_CFLAGS)"