diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0156562447db3085ddcd864a8eee9b07d849aaf2..b3bcfc57df4ed77b9b9bd3343552b1e90f14085d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2009-06-01  Jakub Jelinek  <jakub@redhat.com>
 
+	* config/i386/i386.h (struct machine_cfa_state,
+	struct machine_function): Guard with ifndef USED_FOR_TARGET
+	instead of not IN_LIBGCC2 and not in IN_TARGET_LIBS.
+
 	PR other/40024
 	* emutls.c (__emutls_get_address): Change arr->size to mean number
 	of allocated arr->data entries instead of # of slots + 1.
diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index fe8544ce3f3b4b481372e13f68ce91da135f7d1c..72dcf3265f7695b0b731f51951645d1d2963eb6e 100644
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -2395,7 +2395,7 @@ enum ix86_stack_slot
 
 /* Machine specific CFA tracking during prologue/epilogue generation.  */
 
-#if !defined(IN_LIBGCC2) && !defined(IN_TARGET_LIBS)
+#ifndef USED_FOR_TARGET
 struct GTY(()) machine_cfa_state
 {
   rtx reg;