Fix PLT use in feupdateenv on x86_64

diff --git a/ChangeLog b/ChangeLog
index 36cd1e23e9b211f2d2079a947c8596e1fadcc720..9e61f353ea36c2cf3d7dd75b2de50710985d937e 100644 (file)
--- 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 291c56bd1001ace0b6287b4a2bba57779703e7bf..b2c62916c3d6d2025bbaa47ebc853f0c4d17686f 100644 (file)
--- 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 d1d3c0330223c35620f5e8271e36fc5b56a1cdfe..d0f1422e30ed690fbf7701ce3ce31e1e58639bc1 100644 (file)
--- 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)