diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6abdfe3ac6..5eb4813d22 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,4 +1,8 @@
-2014-10-09  Jose E. Marchesi  <jose.marchesi@oracle.com>
+2014-10-14  Alan Modra  <amodra@gmail.com>
+
+	* config/tc-sparc.c (sparc_md_end): Fix unused variable warnings.
+
+2014-10-09  Jose E. Marchesi  <jose.marchesi@oracle.com>
 
 	* config/tc-sparc.c (v9a_asr_table): Entry for %cps removed.
 	(sparc_arch_table): Remove the HWCAP_RANDOM, HWCAP_TRANS and
diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
index 1d2f945d67..758fcc810e 100644
--- a/gas/config/tc-sparc.c
+++ b/gas/config/tc-sparc.c
@@ -971,7 +971,9 @@ void
 sparc_md_end (void)
 {
   unsigned long mach = bfd_mach_sparc;
+#if defined(OBJ_ELF) && !defined(TE_SOLARIS)
   int hwcaps, hwcaps2;
+#endif
 
   if (sparc_arch_size == 64)
     switch (current_architecture)