summaryrefslogtreecommitdiff
path: root/gcc/ada
diff options
context:
space:
mode:
authorJohn David Anglin <dave@hiauly1.hia.nrc.ca>2002-05-02 15:07:09 +0000
committerJohn David Anglin <danglin@gcc.gnu.org>2002-05-02 15:07:09 +0000
commitb303008e9aa0f713866b4bc7456289543825f1cb (patch)
tree283ce22de5d8c4927a3b89e9f61de93492d564b7 /gcc/ada
parent6ed7412a290444b89de0e9fb963107fd7f1404f1 (diff)
downloadgcc-b303008e9aa0f713866b4bc7456289543825f1cb.tar.gz
x-ada (ADA_CFLAGS): Rename to X_ADA_CFLAGS.
* pa/x-ada (ADA_CFLAGS): Rename to X_ADA_CFLAGS. * ada/Makefile.in (X_ADA_CFLAGS, T_ADA_CFLAGS): New fragment overrides. (ALL_ADA_CFLAGS): Define. Replace ADA_CFLAGS with ALL_ADA_CFLAGS in ALL_ADAFLAGS, MOST_ADAFLAGS, and all compilations using CC. From-SVN: r53047
Diffstat (limited to 'gcc/ada')
-rw-r--r--gcc/ada/ChangeLog6
-rw-r--r--gcc/ada/Makefile.in22
2 files changed, 20 insertions, 8 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 492dd09db08..5a53e6dd818 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-02 John David Anglin <dave@hiauly1.hia.nrc.ca>
+
+ * ada/Makefile.in (X_ADA_CFLAGS, T_ADA_CFLAGS): New fragment overrides.
+ (ALL_ADA_CFLAGS): Define. Replace ADA_CFLAGS with ALL_ADA_CFLAGS in
+ ALL_ADAFLAGS, MOST_ADAFLAGS, and all compilations using CC.
+
2002-04-25 Neil Booth <neil@daikokuya.demon.co.uk>
* misc.c (gnat_parse_file): Update.
diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in
index 4d73f9ca768..4305575cf32 100644
--- a/gcc/ada/Makefile.in
+++ b/gcc/ada/Makefile.in
@@ -82,6 +82,9 @@ T_CFLAGS =
X_CPPFLAGS =
T_CPPFLAGS =
+X_ADA_CFLAGS =
+T_ADA_CFLAGS =
+
X_ADAFLAGS =
T_ADAFLAGS =
@@ -126,8 +129,11 @@ GNATLIBFLAGS = -gnatpg
GNATLIBCFLAGS = -g -O2
GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \
-DIN_RTS
-ALL_ADAFLAGS = $(CFLAGS) $(ADA_CFLAGS) $(ADAFLAGS)
-MOST_ADAFLAGS = $(CFLAGS) $(ADA_CFLAGS) $(SOME_ADAFLAGS)
+ALL_ADA_CFLAGS = $(X_ADA_CFLAGS) $(T_ADA_CFLAGS) $(ADA_CFLAGS)
+ALL_ADAFLAGS = $(CFLAGS) $(ALL_ADA_CFLAGS) $(X_ADAFLAGS) $(T_ADAFLAGS) \
+ $(ADAFLAGS)
+MOST_ADAFLAGS = $(CFLAGS) $(ALL_ADA_CFLAGS) $(X_ADAFLAGS) $(T_ADAFLAGS) \
+ $(SOME_ADAFLAGS)
THREAD_KIND = native
THREADSLIB =
GMEM_LIB =
@@ -276,7 +282,7 @@ ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)
# Always use -I$(srcdir)/config when compiling.
.c.o:
- $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $<
+ $(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $<
.adb.o:
$(ADAC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $<
.ads.o:
@@ -2293,21 +2299,21 @@ mkdir.o : mkdir.c
sysdep.o : sysdep.c
cio.o : cio.c
- $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) $(RT_FLAGS) \
+ $(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) $(RT_FLAGS) \
$(ALL_CPPFLAGS) $(INCLUDES) $<
init.o : init.c ada.h types.h raise.h
- $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) $(RT_FLAGS) \
+ $(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) $(RT_FLAGS) \
$(ALL_CPPFLAGS) $(INCLUDES) $<
raise.o : raise.c raise.h
- $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) $(RT_FLAGS) \
+ $(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) $(RT_FLAGS) \
$(ALL_CPPFLAGS) $(INCLUDES) $<
# Need to keep the frame pointer in this file to pop the stack properly on
# some targets.
tracebak.o : tracebak.c
- $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+ $(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-fno-omit-frame-pointer $<
cuintp.o : cuintp.c $(CONFIG_H) $(TREE_H) ada.h types.h uintp.h atree.h \
@@ -2347,7 +2353,7 @@ utils2.o : utils2.c $(CONFIG_H) $(TREE_H) $(srcdir)/../flags.h ada.h types.h \
# Rule to compile prefix.o for the run-time.
prefix.o : $(srcdir)/../prefix.c
- $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) $(RT_FLAGS) \
+ $(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) $(RT_FLAGS) \
$(ALL_CPPFLAGS) $(INCLUDES) -I$(srcdir)/../.. -I../.. \
-DPREFIX=\"$(prefix)\" $<