diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index db2f9aed92dc..b5ddc2663e0f 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 043b8d4a2202..c70afb6a16d8 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 a1e48956a56f..4e111fa75a03 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