diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3ab2f54c2e9..d4e26153f66 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-14  Steven Bosscher  <stevenb@suse.de>
+
+	* system.h: Poison PROMOTED_MODE
+	* integrate.c (expand_inline_function): Don't mention the
+	PROMOTED_MODE.
+	* loop.c (update_giv_derive): Same.
+	* tree.h (DECL_RTL): Same.
+
 2004-01-14  J"orn Rennecke <joern.rennecke@superh.com>
 
 	PR target/9365
@@ -117,7 +125,7 @@
 
 2004-01-13  Vladimir Makarov  <vmakarov@redhat.com>
 
-        * rtl.def: Add comment about new option in automata_option.
+	* rtl.def: Add comment about new option in automata_option.
 	
 	* genautomata.c (PROGRESS_OPTION): New macro.
 	(progress_flag): New global variable.
diff --git a/gcc/integrate.c b/gcc/integrate.c
index d3e47a6a055..47327de03b9 100644
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -771,7 +771,7 @@ expand_inline_function (tree fndecl, tree parms, rtx target, int ignore,
 		abort ();
 
 	      /* The mode if LOC and ARG can differ if LOC was a variable
-		 that had its mode promoted via PROMOTED_MODE.  */
+		 that had its mode promoted.  */
 	      arg_vals[i] = convert_modes (pmode,
 					   TYPE_MODE (TREE_TYPE (arg)),
 					   expand_expr (arg, NULL_RTX, mode,
diff --git a/gcc/loop.c b/gcc/loop.c
index 21369dec22e..96f49998e69 100644
--- a/gcc/loop.c
+++ b/gcc/loop.c
@@ -6212,7 +6212,7 @@ update_giv_derive (const struct loop *loop, rtx p)
    *MULT_VAL to CONST0_RTX, and store the invariant into *INC_VAL.
 
    We also want to detect a BIV when it corresponds to a variable
-   whose mode was promoted via PROMOTED_MODE.  In that case, an increment
+   whose mode was promoted.  In that case, an increment
    of the variable may be a PLUS that adds a SUBREG of that variable to
    an invariant and then sign- or zero-extends the result of the PLUS
    into the variable.
diff --git a/gcc/system.h b/gcc/system.h
index dc939697c93..02863c255b3 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -622,7 +622,8 @@ typedef char _Bool;
 	LIBGCC_NEEDS_DOUBLE FINAL_PRESCAN_LABEL DEFAULT_CALLER_SAVES	   \
 	LOAD_ARGS_REVERSED MAX_INTEGER_COMPUTATION_MODE			   \
 	CONVERT_HARD_REGISTER_TO_SSA_P ASM_OUTPUT_MAIN_SOURCE_FILENAME	   \
-	FIRST_INSN_ADDRESS TEXT_SECTION SHARED_BSS_SECTION_ASM_OP
+	FIRST_INSN_ADDRESS TEXT_SECTION SHARED_BSS_SECTION_ASM_OP	   \
+	PROMOTED_MODE
 
 /* Hooks that are no longer used.  */
  #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE	\
diff --git a/gcc/tree.h b/gcc/tree.h
index aa967d9f5e0..8f4334f0f58 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -1346,12 +1346,7 @@ struct tree_type GTY(())
    field.  Always equal to TYPE_MODE (TREE_TYPE (decl)) except for a
    FIELD_DECL.  */
 #define DECL_MODE(NODE) (DECL_CHECK (NODE)->decl.mode)
-/* Holds the RTL expression for the value of a variable or function.  If
-   PROMOTED_MODE is defined, the mode of this expression may not be same
-   as DECL_MODE.  In that case, DECL_MODE contains the mode corresponding
-   to the variable's data type, while the mode
-   of DECL_RTL is the mode actually used to contain the data.
-
+/* Holds the RTL expression for the value of a variable or function.
    This value can be evaluated lazily for functions, variables with
    static storage duration, and labels.  */
 #define DECL_RTL(NODE)					\