aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRainer Orth <ro@TechFak.Uni-Bielefeld.DE>2004-02-04 20:39:15 +0000
committerRainer Orth <ro@gcc.gnu.org>2004-02-04 20:39:15 +0000
commit7e63a64ecec9cbef98c626771e0c4d9ed0ff6347 (patch)
tree934367d89f96d385b9a986c8eac13ed6f60aeae0
parent5efb104680a4b5552fec02cb1a69804682cbe42f (diff)
downloadgcc-7e63a64ecec9cbef98c626771e0c4d9ed0ff6347.zip
gcc-7e63a64ecec9cbef98c626771e0c4d9ed0ff6347.tar.gz
gcc-7e63a64ecec9cbef98c626771e0c4d9ed0ff6347.tar.bz2
Makefile.in: Move target, host overrides after per-language fragments.
* Makefile.in: Move target, host overrides after per-language fragments. * config/mips/t-iris5-as (FORCE_DEBUG_ADAFLAGS): Clear. (GNATLIBCFLAGS): Remove -g. From-SVN: r77270
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/Makefile.in23
-rw-r--r--gcc/config/mips/t-iris5-as4
3 files changed, 25 insertions, 10 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index db2f9ae..b5ddc26 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2004-02-04 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
+
+ * Makefile.in: Move target, host overrides after per-language
+ fragments.
+
+ * config/mips/t-iris5-as (FORCE_DEBUG_ADAFLAGS): Clear.
+ (GNATLIBCFLAGS): Remove -g.
+
2004-02-04 Kazu Hirata <kazu@cs.umass.edu>
* config/alpha/alpha.c, config/arc/arc.c, config/avr/avr.c,
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 043b8d4..c70afb6 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -685,16 +685,6 @@ PRETTY_PRINT_H = pretty-print.h input.h $(OBSTACK_H)
DIAGNOSTIC_H = diagnostic.h diagnostic.def $(PRETTY_PRINT_H)
C_PRETTY_PRINT_H = $(PRETTY_PRINT_H) $(C_COMMON_H) $(TREE_H)
-# target overrides
-ifneq ($(tmake_file),)
-include $(tmake_file)
-endif
-
-# host overrides
-ifneq ($(xmake_file),)
-include $(xmake_file)
-endif
-
#
# Now figure out from those variables how to compile and link.
@@ -954,6 +944,19 @@ ifneq ($(LANG_MAKEFRAGS),)
include $(LANG_MAKEFRAGS)
endif
+# target and host overrides must follow the per-language makefile fragments
+# so they can override or augment language-specific variables
+
+# target overrides
+ifneq ($(tmake_file),)
+include $(tmake_file)
+endif
+
+# host overrides
+ifneq ($(xmake_file),)
+include $(xmake_file)
+endif
+
#
# -----------------------------
diff --git a/gcc/config/mips/t-iris5-as b/gcc/config/mips/t-iris5-as
index a1e4895..4e111fa 100644
--- a/gcc/config/mips/t-iris5-as
+++ b/gcc/config/mips/t-iris5-as
@@ -5,3 +5,7 @@ BOOT_CFLAGS = -O2 -save-temps
# omit -g1
LIBGCC2_DEBUG_CFLAGS =
+
+# omit -g
+FORCE_DEBUG_ADAFLAGS =
+GNATLIBCFLAGS = -O2