diff options
| author | Andreas Schwab <schwab@redhat.com> | 2011-10-13 15:10:31 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2011-10-13 15:26:45 +0200 |
| commit | 714fad23c6f546c16a3f975cac984384a592537b (patch) | |
| tree | 91175563f909a4e38ac6a8b12ae51047816c7434 | |
| parent | 81dcc7fb74a766f970800b9975e85b5fe7f6ea38 (diff) | |
| download | glibc-714fad23c6f546c16a3f975cac984384a592537b.tar.gz glibc-714fad23c6f546c16a3f975cac984384a592537b.tar.xz glibc-714fad23c6f546c16a3f975cac984384a592537b.zip | |
Fix PLT use in feupdateenv on x86_64
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/x86_64/fpu/feupdateenv.c | 4 | ||||
| -rw-r--r-- | sysdeps/x86_64/fpu/fraiseexcpt.c | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 36cd1e23e9..9e61f353ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-10-13 Andreas Schwab <schwab@redhat.com> + * sysdeps/x86_64/fpu/fraiseexcpt.c: Add __feraiseexcept alias. + * sysdeps/x86_64/fpu/feupdateenv.c: Use __feraiseexcept instead of + feraiseexcept. + * sysdeps/x86_64/memrchr.S: Check for zero size. * string/stratcliff.c: Add memrchr tests. diff --git a/sysdeps/x86_64/fpu/feupdateenv.c b/sysdeps/x86_64/fpu/feupdateenv.c index 291c56bd10..b2c62916c3 100644 --- a/sysdeps/x86_64/fpu/feupdateenv.c +++ b/sysdeps/x86_64/fpu/feupdateenv.c @@ -1,5 +1,5 @@ /* Install given floating-point environment and raise exceptions. - Copyright (C) 1997,99,2000,01,07,2010 Free Software Foundation, Inc. + Copyright (C) 1997,99,2000,01,07,2010,2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -36,7 +36,7 @@ __feupdateenv (const fenv_t *envp) /* Raise the saved exception. Incidently for us the implementation defined format of the values in objects of type fexcept_t is the same as the ones specified using the FE_* constants. */ - feraiseexcept ((int) temp); + __feraiseexcept ((int) temp); /* Success. */ return 0; diff --git a/sysdeps/x86_64/fpu/fraiseexcpt.c b/sysdeps/x86_64/fpu/fraiseexcpt.c index d1d3c03302..d0f1422e30 100644 --- a/sysdeps/x86_64/fpu/fraiseexcpt.c +++ b/sysdeps/x86_64/fpu/fraiseexcpt.c @@ -1,5 +1,5 @@ /* Raise given exceptions. - Copyright (C) 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #include <math.h> int -feraiseexcept (int excepts) +__feraiseexcept (int excepts) { /* Raise exceptions represented by EXPECTS. But we must raise only one signal at a time. It is important that if the overflow/underflow @@ -117,4 +117,4 @@ feraiseexcept (int excepts) /* Success. */ return 0; } -libm_hidden_def (feraiseexcept) +libm_hidden_ver (__feraiseexcept, feraiseexcept) |