Fix missing nearbyintl@GLIBC_2.1 on powerpc

(cherry picked from commit 412bd96612ff5422befb98e990b66d10c26a4b21)

diff --git a/ChangeLog b/ChangeLog
index c9eaa234300c6286b4ce997dd15f3504c0de0821..591e1f18059983b108f8b1854e601bda4952069c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-05-01  Andreas Schwab  <schwab@linux-m68k.org>
+
+       [BZ #14040]
+       * sysdeps/powerpc/powerpc32/fpu/s_nearbyint.S (nearbyintl): Define
+       in version GLIBC_2.1, not GLIBC_2.0.
+       * sysdeps/powerpc/powerpc64/fpu/s_nearbyint.S (nearbyintl):
+       Likewise.
+
 2012-10-04  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #14648]

diff --git a/NEWS b/NEWS
index f26e2f4bd6c3a74b99faa8743ab0879121bd163d..57e9a8568325dba75b12da2d92dfe6871cb5dd76 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,7 @@ Version 2.15.1
 
   411, 2547, 2548, 11365, 11494, 13583, 13731, 13732, 13733, 13747, 13748,
   13749, 13753, 13771, 13774, 13786, 14048, 14059, 14167, 14273, 14459,
-  14621, 14648
+  14621, 14648, 14040
 
 Version 2.15
 

diff --git a/sysdeps/powerpc/powerpc32/fpu/s_nearbyint.S b/sysdeps/powerpc/powerpc32/fpu/s_nearbyint.S
index 0102aa3318aaf555236210a9eb33e145b311a778..bccea8bfc8d628f8a29d8743d8980ee7e113b769 100644 (file)
--- a/sysdeps/powerpc/powerpc32/fpu/s_nearbyint.S
+++ b/sysdeps/powerpc/powerpc32/fpu/s_nearbyint.S
@@ -1,5 +1,5 @@
 /* Round to int floating-point values.  PowerPC32 version.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Adhemerval Zanella <azanella@br.ibm.com>, 2011
 
@@ -75,6 +75,6 @@ weak_alias (__nearbyint, nearbyint)
 weak_alias (__nearbyint, nearbyintl)
 strong_alias (__nearbyint, __nearbyintl)
 #endif
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __nearbyint, nearbyintl, GLIBC_2_0)
+#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
+compat_symbol (libm, __nearbyint, nearbyintl, GLIBC_2_1)
 #endif

diff --git a/sysdeps/powerpc/powerpc64/fpu/s_nearbyint.S b/sysdeps/powerpc/powerpc64/fpu/s_nearbyint.S
index 436160f48e338ef18b05d09843145e3d35c4fa2d..8ea1472beb324d3145810fa525a43e513b06bb7b 100644 (file)
--- a/sysdeps/powerpc/powerpc64/fpu/s_nearbyint.S
+++ b/sysdeps/powerpc/powerpc64/fpu/s_nearbyint.S
@@ -1,5 +1,5 @@
 /* Round to int floating-point values.  PowerPC64 version.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Adhemerval Zanella <azanella@br.ibm.com>, 2011
 
@@ -63,6 +63,6 @@ weak_alias (__nearbyint, nearbyint)
 weak_alias (__nearbyint, nearbyint)
 strong_alias (__nearbyint, __nearbyintl)
 #endif
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __nearbyint, nearbyintl, GLIBC_2_0)
+#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
+compat_symbol (libm, __nearbyint, nearbyintl, GLIBC_2_1)
 #endif