From b303008e9aa0f713866b4bc7456289543825f1cb Mon Sep 17 00:00:00 2001 From: John David Anglin Date: Thu, 2 May 2002 15:07:09 +0000 Subject: [PATCH] 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 --- gcc/ChangeLog | 4 ++++ gcc/ada/ChangeLog | 6 ++++++ gcc/ada/Makefile.in | 22 ++++++++++++++-------- gcc/config/pa/x-ada | 2 +- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 125dea37ca5..587695850e3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2001-05-02 John David Anglin + + * pa/x-ada (ADA_CFLAGS): Rename to X_ADA_CFLAGS. + 2002-05-02 Catherine Moore * config/v850/v850.h (TRAMPOLINE_TEMPLATE): Change r5 to r20. 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 + + * 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 * 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)\" $< diff --git a/gcc/config/pa/x-ada b/gcc/config/pa/x-ada index 88c39e27f4e..b60b3d7925b 100644 --- a/gcc/config/pa/x-ada +++ b/gcc/config/pa/x-ada @@ -1,4 +1,4 @@ # The ada virtual array implementation requires that indexing be disabled on # hosts such as hpux that use a segmented memory architecture. Both the c # and ada files need to be compiled with this option for correct operation. -ADA_CFLAGS=-mdisable-indexing +X_ADA_CFLAGS=-mdisable-indexing -- 2.30.2