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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 125dea37ca57f5fbcc3ff554c25344f61ae3210d..587695850e3609869e0760266607a24d17edd37a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-02  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+       * pa/x-ada (ADA_CFLAGS): Rename to X_ADA_CFLAGS.
+
 2002-05-02  Catherine Moore  <clm@redhat.com>
 
        * config/v850/v850.h (TRAMPOLINE_TEMPLATE): Change r5 to r20.

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 492dd09db084e383e7b6d7c21d4d17400e3ccaac..5a53e6dd8189d2586fb3131b57a38c4db78bb870 100644 (file)
--- 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 4d73f9ca7689e922d9db93df2dbe3b2b03df1fdf..4305575cf32f7cec97b6ed5fff3232db76c4d6bf 100644 (file)
--- 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 88c39e27f4e5c463ef0adab041a7f162220653c5..b60b3d7925bfb6337e9b8d3867ead1bccf585741 100644 (file)
--- 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