diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1fb815879e3..ae04a76d60b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,7 @@
 2011-06-10  Hans-Peter Nilsson  <hp@axis.com>
 
+	* system.h (SETJMP_VIA_SAVE_AREA): Poison.
+
 	PR bootstrap/49354
 	* ira-costs.c (setup_regno_cost_classes_by_mode): Add missing cast
 	to last assignment.
diff --git a/gcc/system.h b/gcc/system.h
index baf5e2d236c..70c006a6100 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -826,7 +826,8 @@ extern void fancy_abort (const char *, int, const char *) ATTRIBUTE_NORETURN;
 	FUNCTION_ARG_BOUNDARY MUST_USE_SJLJ_EXCEPTIONS US_SOFTWARE_GOFAST  \
 	USING_SVR4_H SVR4_ASM_SPEC FUNCTION_ARG FUNCTION_ARG_ADVANCE	   \
 	FUNCTION_INCOMING_ARG IRA_COVER_CLASSES TARGET_VERSION		   \
-	MACHINE_TYPE TARGET_HAS_TARGETCM ASM_OUTPUT_BSS
+	MACHINE_TYPE TARGET_HAS_TARGETCM ASM_OUTPUT_BSS			   \
+	SETJMP_VIA_SAVE_AREA
 
 /* Hooks that are no longer used.  */
  #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE	\