diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index db8643e7ac9..71660a1fc96 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-28  Trevor Saunders  <tsaunders@mozilla.com>
+
+	* config/i386/i386.c (ix86_return_in_memory): replace one
+	ATTRIBUTE_UNUSED where the attribute can actually sometimes be unused.
+
 2014-07-28  Marek Polacek  <polacek@redhat.com>
 
 	* doc/invoke.texi (-Wno-odr): Fix @item entry.  Tweak wording.
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 9de2035336c..1cb62976ebd 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -8018,7 +8018,7 @@ ix86_libcall_value (enum machine_mode mode)
 /* Return true iff type is returned in memory.  */
 
 static bool
-ix86_return_in_memory (const_tree type, const_tree fntype)
+ix86_return_in_memory (const_tree type, const_tree fntype ATTRIBUTE_UNUSED)
 {
 #ifdef SUBTARGET_RETURN_IN_MEMORY
   return SUBTARGET_RETURN_IN_MEMORY (type, fntype);