Commit 7d600178 by Rainer Orth Committed by Rainer Orth

Makefile.in (ADAC): Define.

	* Makefile.in (ADAC): Define.
	(SYSLIBS): Define.
	(.SUFFIXES): Move before language makefile fragments.
	(STAGE2_FLAGS_TO_PASS): Use stage CC as ADAC.

	ada:
	* Make-lang.in (CP, ECHO): Copy from Makefile.in.
	(X_ADA_CFLAGS, T_ADA_CFLAGS, X_ADAFLAGS, T_ADAFLAGS): Likewise.
	(ALL_ADAFLAGS, FORCE_DEBUG_ADAFLAGS, ADA_CFLAGS): Likewise.
	(ALL_ADA_CFLAGS): Likewise.
	(ADA_INCLUDES): Likewise.
	Adapt for new working dir.
	(GNATBIND): Use Makefile.in version.
	(.SUFFIXES): Copy from Makefile.in.
	(ada-warn): Define.
	(.adb.o, .ads.o): Copy from Makefile.in.
	Added $(OUTPUT_OPTION).
	(GNAT1_C_OBJS): Moved from Makefile.in.
	Prefix with ada subdir.
	(GNAT_ADA_OBJS, GNAT1_ADA_OBJS, GNAT1_OBJS, GNATBIND_OBJS): Likewise.
	(EXTRA_GNAT1_OBJS): Moved from Makefile.in.
	Adapt for new working dir.
	(EXTRA_GNATBIND_OBJS): Likewise.
	(ADA_BACKEND): Moved from Makefile.in.
	Renamed to avoid conflict with global BACKEND.
	Use that one.
	(TARGET_ADA_SRCS): Moved from Makefile.in.
	(gnat1$(exeext)): Replaced recursive rule with Makefile.in version.
	Use ADA_BACKEND.
	(gnatbind$(exeext)): Replaced recursive rule with Makefile.in version.
	(ada_extra_files): Moved from Makefile.in.
	Prefix with ada subdir.
	(ada/b_gnat1.c, ada/b_gnat1.o, ada/b_gnatb.c, ada/b_gnatb.o): Likewise.
	(ada/treeprs.ads, ada/einfo.h, ada/sinfo.h, ada/nmake.adb): Likewise.
	(ada/nmake.ads): Likewise.
	(update-sources): Moved from Makefile.in.
	Prefix with ada subdir.
	(ada/sdefault.adb, ada/stamp-sdefault, ada/sdefault.o): Likewise.
	(ADA_TREE_H): Likewise.
	(ada/a-except.o, ada/s-assert.o, ada/s-memory.o): Likewise.
	(ada/memtrack.o): Likewise.
	(ada/adadecode.o): Likewise.
	Update dependencies.
	(ada/adaint.o): New.
	(ada/argv.o): Moved from Makefile.in.
	Prefix with ada subdir.
	Update dependencies.
	(ada/cstreams.o, ada/exit.o, ada/final.o, ada/link.o): Likewise.
	(ada/cio.o, ada/init.o, ada/raise.o, ada/tracebak.o): Likewise.
	(ada/cuintp.o, ada/decl.o, ada/misc.o): Moved from Makefile.in.
	Prefix with ada subdir.
	(ada/targtyps.o, ada/trans.o, ada/utils.o, ada/utils2.o): Likewise.
	(GNAT DEPENDENCIES): Regenerate.
	* Makefile.in (MACHMODE_H, RTL_H, TREE_H): Removed, provided by
	toplevel Makefile.in.
	(EXTRA_GNAT1_OBJS, EXTRA_GNATBIND_OBJS): Removed.
	(TARGET_ADA_SRCS): Removed.
	(GNAT1_C_OBJS, GNAT_ADA_OBJS, GNAT1_ADA_OBJS, GNAT1_OBJS): Likewise.
	(GNATBIND_OBJS): Likewise.
	(ADA_INCLUDE_DIR, ADA_RTL_OBJ_DIR): Moved here.
	(BACKEND): Removed.
	(../gnat1$(exeext), ../gnatbind$(exeext)): Likewise.
	(TREE_H): Likewise.
	(ada_extra_files): Likewise.
	(b_gnat1.c, b_gnat1.o, b_gnatb.c, b_gnatb.o): Likewise.
	(treeprs.ads, einfo.h, sinfo.h, nmake.adb, nmake.ads): Likewise.
	(update-sources): Likewise.
	(sdefault.adb, stamp-sdefault, sdefault.o): Likewise
	(ADA_TREE_H): Likewise.
	(adadecoce.o): Likewise.
	(cuintp.o, decl.o, misc.o, trans.o, utils.o, utils2.o): Likewise.
	(GNAT DEPENDENCIES): Likewise.

From-SVN: r53800
parent 5ff225fc
2002-05-23 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Makefile.in (ADAC): Define.
(SYSLIBS): Define.
(.SUFFIXES): Move before language makefile fragments.
(STAGE2_FLAGS_TO_PASS): Use stage CC as ADAC.
2002-05-23 Mark Mitchell <mark@codesourcery.com>
* varasm.c (make_decl_rtl): Don't allow weak variables to be
......
......@@ -101,6 +101,7 @@ T_CFLAGS =
X_CPPFLAGS =
T_CPPFLAGS =
ADAC = @ADAC@
AWK = @AWK@
CC = @CC@
BISON = @BISON@
......@@ -615,6 +616,9 @@ HOST_LIBDEPS= $(BUILD_LIBIBERTY)
# and the system's installed libraries.
LIBS = $(INTLLIBS) @LIBS@ $(LIBIBERTY)
# Any system libraries needed just for GNAT.
SYSLIBS = @GNAT_LIBEXC@
# Likewise, for use in the tools that must run on this machine
# even if we are cross-building GCC.
HOST_LIBS = $(BUILD_LIBIBERTY)
......@@ -794,6 +798,14 @@ DPBIT_FUNCS = _pack_df _unpack_df _addsub_df _mul_df _div_df \
# unwinder info.
LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
# The only suffixes we want for implicit rules are .c and .o, so clear
# the list and add them. This speeds up GNU Make, and allows -r to work.
# For i18n support, we also need .gmo, .po, .pox.
# This must come before the language makefile fragments to allow them to
# add suffixes and rules of their own.
.SUFFIXES:
.SUFFIXES: .c .o .po .pox .gmo
#
# Language makefile fragments.
......@@ -819,11 +831,6 @@ LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
# End of language makefile fragments.
#
# The only suffixes we want for implicit rules are .c and .o, so clear
# the list and add them. This speeds up GNU Make, and allows -r to work.
# For i18n support, we also need .gmo, .po, .pox.
.SUFFIXES:
.SUFFIXES: .c .o .po .pox .gmo
Makefile: $(srcdir)/Makefile.in config.status $(srcdir)/version.c \
$(xmake_file) $(tmake_file) $(LANG_MAKEFILES)
......@@ -3075,6 +3082,7 @@ VOL_FILES=`echo $(BACKEND) $(OBJS) $(C_OBJS) $(LIBCPP_OBJS) *.c *.h gen*`
# WARN_CFLAGS setting can't be to the expansion of GCC_WARN_CFLAGS in
# the context of the stage_x rule.
STAGE2_FLAGS_TO_PASS = \
ADAC="\$$(CC)" \
CFLAGS="$(BOOT_CFLAGS)" \
LDFLAGS="$(BOOT_LDFLAGS)" \
WARN_CFLAGS="\$$(GCC_WARN_CFLAGS)" \
......
2002-05-23 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Make-lang.in (CP, ECHO): Copy from Makefile.in.
(X_ADA_CFLAGS, T_ADA_CFLAGS, X_ADAFLAGS, T_ADAFLAGS): Likewise.
(ALL_ADAFLAGS, FORCE_DEBUG_ADAFLAGS, ADA_CFLAGS): Likewise.
(ALL_ADA_CFLAGS): Likewise.
(ADA_INCLUDES): Likewise.
Adapt for new working dir.
(GNATBIND): Use Makefile.in version.
(.SUFFIXES): Copy from Makefile.in.
(ada-warn): Define.
(.adb.o, .ads.o): Copy from Makefile.in.
Added $(OUTPUT_OPTION).
(GNAT1_C_OBJS): Moved from Makefile.in.
Prefix with ada subdir.
(GNAT_ADA_OBJS, GNAT1_ADA_OBJS, GNAT1_OBJS, GNATBIND_OBJS): Likewise.
(EXTRA_GNAT1_OBJS): Moved from Makefile.in.
Adapt for new working dir.
(EXTRA_GNATBIND_OBJS): Likewise.
(ADA_BACKEND): Moved from Makefile.in.
Renamed to avoid conflict with global BACKEND.
Use that one.
(TARGET_ADA_SRCS): Moved from Makefile.in.
(gnat1$(exeext)): Replaced recursive rule with Makefile.in version.
Use ADA_BACKEND.
(gnatbind$(exeext)): Replaced recursive rule with Makefile.in version.
(ada_extra_files): Moved from Makefile.in.
Prefix with ada subdir.
(ada/b_gnat1.c, ada/b_gnat1.o, ada/b_gnatb.c, ada/b_gnatb.o): Likewise.
(ada/treeprs.ads, ada/einfo.h, ada/sinfo.h, ada/nmake.adb): Likewise.
(ada/nmake.ads): Likewise.
(update-sources): Moved from Makefile.in.
Prefix with ada subdir.
(ada/sdefault.adb, ada/stamp-sdefault, ada/sdefault.o): Likewise.
(ADA_TREE_H): Likewise.
(ada/a-except.o, ada/s-assert.o, ada/s-memory.o): Likewise.
(ada/memtrack.o): Likewise.
(ada/adadecode.o): Likewise.
Update dependencies.
(ada/adaint.o): New.
(ada/argv.o): Moved from Makefile.in.
Prefix with ada subdir.
Update dependencies.
(ada/cstreams.o, ada/exit.o, ada/final.o, ada/link.o): Likewise.
(ada/cio.o, ada/init.o, ada/raise.o, ada/tracebak.o): Likewise.
(ada/cuintp.o, ada/decl.o, ada/misc.o): Moved from Makefile.in.
Prefix with ada subdir.
(ada/targtyps.o, ada/trans.o, ada/utils.o, ada/utils2.o): Likewise.
(GNAT DEPENDENCIES): Regenerate.
* Makefile.in (MACHMODE_H, RTL_H, TREE_H): Removed, provided by
toplevel Makefile.in.
(EXTRA_GNAT1_OBJS, EXTRA_GNATBIND_OBJS): Removed.
(TARGET_ADA_SRCS): Removed.
(GNAT1_C_OBJS, GNAT_ADA_OBJS, GNAT1_ADA_OBJS, GNAT1_OBJS): Likewise.
(GNATBIND_OBJS): Likewise.
(ADA_INCLUDE_DIR, ADA_RTL_OBJ_DIR): Moved here.
(BACKEND): Removed.
(../gnat1$(exeext), ../gnatbind$(exeext)): Likewise.
(TREE_H): Likewise.
(ada_extra_files): Likewise.
(b_gnat1.c, b_gnat1.o, b_gnatb.c, b_gnatb.o): Likewise.
(treeprs.ads, einfo.h, sinfo.h, nmake.adb, nmake.ads): Likewise.
(update-sources): Likewise.
(sdefault.adb, stamp-sdefault, sdefault.o): Likewise
(ADA_TREE_H): Likewise.
(adadecoce.o): Likewise.
(cuintp.o, decl.o, misc.o, trans.o, utils.o, utils2.o): Likewise.
(GNAT DEPENDENCIES): Likewise.
2002-05-16 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Makefile.adalib: Allow for PWDCMD to override hardcoded pwd.
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment