diff --git a/ChangeLog b/ChangeLog
index 623d927f4f..392d141339 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-20  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* sysdeps/ieee754/bits/nan.h [!__GNUC__] (__nan_union): Change
+	__attribute__ ((unused)) to __attribute__ ((__unused__)).
+
 2013-02-20  Petr Machata  <pmachata@redhat.com>
 
 	* elf/elf.h (R_ARM_TARGET1): New macro.
diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips
index 5574d72209..f06c986333 100644
--- a/ports/ChangeLog.mips
+++ b/ports/ChangeLog.mips
@@ -1,5 +1,8 @@
 2013-02-20  Thomas Schwinge  <thomas@codesourcery.com>
 
+	* sysdeps/mips/bits/nan.h [!__GNUC__] (__nan_union): Change
+	__attribute__ ((unused)) to __attribute__ ((__unused__)).
+
 	* sysdeps/unix/sysv/linux/mips/mips32/nptl/libc.abilist: Sort
 	properly.
 
diff --git a/ports/sysdeps/mips/bits/nan.h b/ports/sysdeps/mips/bits/nan.h
index 8f4666d005..7aa157b1d6 100644
--- a/ports/sysdeps/mips/bits/nan.h
+++ b/ports/sysdeps/mips/bits/nan.h
@@ -50,7 +50,7 @@
 # endif
 
 static union { unsigned char __c[4]; float __d; } __nan_union
-  __attribute__ ((unused)) = { __nan_bytes };
+  __attribute__ ((__unused__)) = { __nan_bytes };
 # define NAN	(__nan_union.__d)
 
 #endif	/* GCC.  */
diff --git a/sysdeps/ieee754/bits/nan.h b/sysdeps/ieee754/bits/nan.h
index a1e6a5189d..935271a7c0 100644
--- a/sysdeps/ieee754/bits/nan.h
+++ b/sysdeps/ieee754/bits/nan.h
@@ -46,7 +46,7 @@
 # endif
 
 static union { unsigned char __c[4]; float __d; } __nan_union
-  __attribute__ ((unused)) = { __nan_bytes };
+  __attribute__ ((__unused__)) = { __nan_bytes };
 # define NAN	(__nan_union.__d)
 
 #endif	/* GCC.  */