diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5b692abde12..aef56317c4e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* doc/tm.texi (STACK_CHECK_PROBE_LOAD): Delete.
+	* expr.h (STACK_CHECK_PROBE_LOAD): Likewise.
+	* explow.c (emit_stack_probe): Do not test STACK_CHECK_PROBE_LOAD.
+	* system.h (STACK_CHECK_PROBE_LOAD): Poison.
+
 2009-12-13  Michael Matz  <matz@suse.de>
 
 	PR tree-optimization/42027
diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index 3950967b7a3..9a9d493976b 100644
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -3564,12 +3564,6 @@ the ``guard pages'' at the end of a stack area.  The default value
 of 12 (4096-byte interval) is suitable for most systems.
 @end defmac
 
-@defmac STACK_CHECK_PROBE_LOAD
-An integer which is nonzero if GCC should perform the stack probe
-as a load instruction and zero if GCC should use a store instruction.
-The default is zero, which is the most efficient choice on most systems.
-@end defmac
-
 @defmac STACK_CHECK_MOVING_SP
 An integer which is nonzero if GCC should move the stack pointer page by page
 when doing probes.  This can be necessary on systems where the stack pointer
diff --git a/gcc/explow.c b/gcc/explow.c
index 4d1d24e501d..1f66f3e7705 100644
--- a/gcc/explow.c
+++ b/gcc/explow.c
@@ -1366,9 +1366,6 @@ emit_stack_probe (rtx address)
     emit_insn (gen_probe_stack (memref));
   else
 #endif
-  if (STACK_CHECK_PROBE_LOAD)
-    emit_move_insn (gen_reg_rtx (word_mode), memref);
-  else
     emit_move_insn (memref, const0_rtx);
 }
 
diff --git a/gcc/expr.h b/gcc/expr.h
index 93c66a8d474..3ff0145f33e 100644
--- a/gcc/expr.h
+++ b/gcc/expr.h
@@ -223,11 +223,6 @@ do {								\
 #define STACK_CHECK_PROBE_INTERVAL_EXP 12
 #endif
 
-/* The default is to do a store into the stack.  */
-#ifndef STACK_CHECK_PROBE_LOAD
-#define STACK_CHECK_PROBE_LOAD 0
-#endif
-
 /* The default is not to move the stack pointer.  */
 #ifndef STACK_CHECK_MOVING_SP
 #define STACK_CHECK_MOVING_SP 0
diff --git a/gcc/system.h b/gcc/system.h
index 03910d0152f..3f7732fd817 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -756,12 +756,12 @@ extern void fancy_abort (const char *, int, const char *) ATTRIBUTE_NORETURN;
         TARGET_ESC TARGET_FF TARGET_NEWLINE TARGET_TAB TARGET_VT	   \
         LINK_LIBGCC_SPECIAL DONT_ACCESS_GBLS_AFTER_EPILOGUE		   \
 	TARGET_OPTIONS TARGET_SWITCHES EXTRA_CC_MODES FINALIZE_PIC	   \
-	PREDICATE_CODES SPECIAL_MODE_PREDICATES				   \
+	PREDICATE_CODES SPECIAL_MODE_PREDICATES	UNALIGNED_WORD_ASM_OP	   \
 	EXTRA_SECTIONS EXTRA_SECTION_FUNCTIONS READONLY_DATA_SECTION	   \
 	TARGET_ASM_EXCEPTION_SECTION TARGET_ASM_EH_FRAME_SECTION	   \
 	SMALL_ARG_MAX ASM_OUTPUT_SHARED_BSS ASM_OUTPUT_SHARED_COMMON	   \
-	ASM_OUTPUT_SHARED_LOCAL UNALIGNED_WORD_ASM_OP			   \
-	ASM_MAKE_LABEL_LINKONCE STACK_CHECK_PROBE_INTERVAL
+	ASM_OUTPUT_SHARED_LOCAL ASM_MAKE_LABEL_LINKONCE			   \
+	STACK_CHECK_PROBE_INTERVAL STACK_CHECK_PROBE_LOAD
 
 /* Hooks that are no longer used.  */
  #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE	\