From: Andreas Schwab Date: Mon, 30 Apr 2012 23:10:20 +0000 (+0200) Subject: Fix missing nearbyintl@GLIBC_2.1 on powerpc X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=291392f02a27b4d95fdb60e98cb8774d584497ba;p=thirdparty%2Fglibc.git Fix missing nearbyintl@GLIBC_2.1 on powerpc (cherry picked from commit 412bd96612ff5422befb98e990b66d10c26a4b21) --- diff --git a/ChangeLog b/ChangeLog index c9eaa234300..591e1f18059 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-05-01 Andreas Schwab + + [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 [BZ #14648] diff --git a/NEWS b/NEWS index f26e2f4bd6c..57e9a856832 100644 --- 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 0102aa3318a..bccea8bfc8d 100644 --- 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 , 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 436160f48e3..8ea1472beb3 100644 --- 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 , 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