diff options
| author | Andreas Schwab <schwab@redhat.com> | 2011-10-18 14:11:02 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2011-10-18 14:11:29 +0200 |
| commit | 83c7615c2dc344562f6a1a499a269b114f74c7e5 (patch) | |
| tree | 650ffd9d7025e59b8a5253a491fac442e91f66ea | |
| parent | caa6c9d8454e81d365f039c835abd3cb54c06a05 (diff) | |
| download | glibc-83c7615c2dc344562f6a1a499a269b114f74c7e5.tar.gz glibc-83c7615c2dc344562f6a1a499a269b114f74c7e5.tar.xz glibc-83c7615c2dc344562f6a1a499a269b114f74c7e5.zip | |
Fix last change
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/x86_64/fpu/bits/fenv.h | 5 |
2 files changed, 5 insertions, 4 deletions
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) |