diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ac76f2a3bac..cf3b8ee1b9b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-04  Pat Haugen  <pthaugen@us.ibm.com>
+
+	* config/rs6000/rs6000.c (atomic_hold_decl, atomic_clear_decl,
+	atomic_update_decl): Guard declaration with #ifdef.
+
 2014-11-04  Marek Polacek  <polacek@redhat.com>
 
 	* sanopt.c (sanopt_optimize_walker): Remove unused variables.
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 719878c1f84..336dd439075 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -34590,8 +34590,10 @@ make_pass_analyze_swaps (gcc::context *ctxt)
   return new pass_analyze_swaps (ctxt);
 }
 
+#ifdef RS6000_GLIBC_ATOMIC_FENV
 /* Function declarations for rs6000_atomic_assign_expand_fenv.  */
 static tree atomic_hold_decl, atomic_clear_decl, atomic_update_decl;
+#endif
 
 /* Implement TARGET_ATOMIC_ASSIGN_EXPAND_FENV hook.  */