diff --git a/ChangeLog b/ChangeLog
index cd6264b7f0..1ca1cca3c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
 2011-10-18  Andreas Schwab  <schwab@redhat.com>
 
 	* sysdeps/x86_64/fpu/bits/fenv.h: Add C linkage markers.
-	(__feraiseexcept_renamed): Add __THROW.
-	(feraiseexcept): Add __THROW.  Rename local variables to fix
+	(__feraiseexcept_renamed): Add __NTH.
+	(feraiseexcept): Add __NTH.  Rename local variables to fix
 	namespace violations.
 
 2011-10-17  Ulrich Drepper  <drepper@gmail.com>
diff --git a/sysdeps/x86_64/fpu/bits/fenv.h b/sysdeps/x86_64/fpu/bits/fenv.h
index b344d0a82c..4af1643747 100644
--- a/sysdeps/x86_64/fpu/bits/fenv.h
+++ b/sysdeps/x86_64/fpu/bits/fenv.h
@@ -101,8 +101,9 @@ fenv_t;
 __BEGIN_DECLS
 
 /* Optimized versions.  */
-extern int __feraiseexcept_renamed (int) __THROW __asm__ ("feraiseexcept");
-__extern_inline int feraiseexcept (int __excepts) __THROW
+extern int __NTH (__feraiseexcept_renamed (int)) __asm__ ("feraiseexcept");
+__extern_inline int
+__NTH (feraiseexcept (int __excepts))
 {
   if (__builtin_constant_p (__excepts)
       && (__excepts & ~(FE_INVALID | FE_DIVBYZERO)) == 0)