diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 9b003cbb027..7c106d46ab0 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-16  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	* target.c (num_devices): Guard with PLUGIN_SUPPORT.
+
 2015-01-15  Thomas Schwinge  <thomas@codesourcery.com>
 	    James Norris  <jnorris@codesourcery.com>
 	    Tom de Vries  <tom@codesourcery.com>
diff --git a/libgomp/target.c b/libgomp/target.c
index 83ad51108d0..72d64fcbd9b 100644
--- a/libgomp/target.c
+++ b/libgomp/target.c
@@ -63,8 +63,10 @@ static int num_offload_images;
 /* Array of descriptors for all available devices.  */
 static struct gomp_device_descr *devices;
 
+#ifdef PLUGIN_SUPPORT
 /* Total number of available devices.  */
 static int num_devices;
+#endif
 
 /* Number of GOMP_OFFLOAD_CAP_OPENMP_400 devices.  */
 static int num_devices_openmp;