From b2c62c451f88c61b516da023b82a6d446af9c293 Mon Sep 17 00:00:00 2001 From: Nathanael Nerode Date: Fri, 31 Oct 2003 09:53:53 +0000 Subject: [PATCH] re PR ada/12761 ([3.3 only] Segmentation fault in gnat1 compiling a-except.adb) (gcc) PR ada/12761 * Makefile.in: Move default definitions of X_ADA_CFLAGS, T_ADA_CFLAGS, X_ADAFLAGS, T_ADAFLAGS from ada/Make-lang.in to here. (gcc/ada) PR ada/12761 * ada/Make-lang.in: Move default definitions of X_ADA_CFLAGS, T_ADA_CFLAGS, X_ADAFLAGS, T_ADAFLAGS from here to master Makefile.in. From-SVN: r73125 --- gcc/ChangeLog | 6 ++++++ gcc/Makefile.in | 12 ++++++++++++ gcc/ada/ChangeLog | 6 ++++++ gcc/ada/Make-lang.in | 5 ----- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fee124fce18..ddb0d9ceb3a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-10-31 Nathanael Nerode + + PR ada/12761 + * Makefile.in: Move default definitions of X_ADA_CFLAGS, + T_ADA_CFLAGS, X_ADAFLAGS, T_ADAFLAGS from ada/Make-lang.in to here. + 2003-10-30 Richard Henderson * c-objc-common.c (c_tree_printer): Handle types correctly. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 81f819c256f..492f88b78d6 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -99,6 +99,18 @@ VPATH = @srcdir@ vpath %.texi $(docdir):$(docdir)/include +# ---- +# Default values for variables overridden in Makefile fragments. +# These need to be quite early in the Makefile so as to avoid +# trouble induced by changes in fragment ordering. +# ---- + +# For ada/Make-lang.in; overridden in, for example, config/pa/x-ada. +X_ADA_CFLAGS = +T_ADA_CFLAGS = +X_ADAFLAGS = +T_ADAFLAGS = + # -------- # UNSORTED # -------- diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 40e7313edfd..1ddde538726 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2003-10-31 Nathanael Nerode + + PR ada/12761 + * ada/Make-lang.in: Move default definitions of X_ADA_CFLAGS, + T_ADA_CFLAGS, X_ADAFLAGS, T_ADAFLAGS from here to master Makefile.in. + 2003-10-30 Kelley Cook * adadecode.c, adaint.c, argv.c, aux-io.c, cal.c, cio.c, cstreams.c, diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in index bbc769a9a84..329c714b0a5 100644 --- a/gcc/ada/Make-lang.in +++ b/gcc/ada/Make-lang.in @@ -46,11 +46,6 @@ RMDIR = rm -rf # default extensions shext = -X_ADA_CFLAGS = -T_ADA_CFLAGS = - -X_ADAFLAGS = -T_ADAFLAGS = # Extra flags to pass to recursive makes. BOOT_ADAFLAGS= $(ADAFLAGS) -- 2.30.2