diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2aa741dca62..94b12008aa2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-14  Andreas Tobler  <andreast@fgznet.ch>
+
+	* config/i386/i386.c (ix86_get_function_versions_dispatcher): Guard
+	variables with ASM_OUTPUT_TYPE_DIRECTIVE and
+	HAVE_GNU_INDIRECT_FUNCTION where needed.
+
 2012-11-13  Ian Lance Taylor  <iant@google.com>
 
 	* common.opt (fPIC, fPIE, fpic, fpie): Create a Negative loop such
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index de94d4b0f7c..eee2b93771d 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -28907,12 +28907,15 @@ ix86_get_function_versions_dispatcher (void *decl)
   struct cgraph_node *node = NULL;
   struct cgraph_node *default_node = NULL;
   struct cgraph_function_version_info *node_v = NULL;
-  struct cgraph_function_version_info *it_v = NULL;
   struct cgraph_function_version_info *first_v = NULL;
 
   tree dispatch_decl = NULL;
+
+#if defined (ASM_OUTPUT_TYPE_DIRECTIVE) && HAVE_GNU_INDIRECT_FUNCTION
+  struct cgraph_function_version_info *it_v = NULL;
   struct cgraph_node *dispatcher_node = NULL;
   struct cgraph_function_version_info *dispatcher_version_info = NULL;
+#endif
 
   struct cgraph_function_version_info *default_version_info = NULL;