diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3de6362aa82..9201cd0d667 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -4,6 +4,7 @@
 	(TARGET_INITIALIZER): Include it.
 	* target.h (struct gcc_target): Add machine_dependent_reorg field.
 	* toplev.c (rest_of_compilation): Use targetm.machine_dependent_reorg.
+	* system.h: Poison MACHINE_DEPENDENT_REORG.
 
 	* config/alpha/alpha-protos.h (alpha_reorg): Remove declaration.
 	* config/alpha/alpha.h (MACHINE_DEPENDENT_REORG): Remove.
diff --git a/gcc/system.h b/gcc/system.h
index adece55d99b..9cca06f9fd1 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -623,7 +623,7 @@ typedef char _Bool;
 	WCHAR_UNSIGNED UNIQUE_SECTION SELECT_SECTION SELECT_RTX_SECTION	\
 	ENCODE_SECTION_INFO STRIP_NAME_ENCODING ASM_GLOBALIZE_LABEL	\
 	ASM_OUTPUT_MI_THUNK CONST_COSTS RTX_COSTS DEFAULT_RTX_COSTS	\
-	ADDRESS_COST
+	ADDRESS_COST MACHINE_DEPENDENT_REORG
 
 /* Other obsolete target macros, or macros that used to be in target
    headers and were not used, and may be obsolete or may never have