From 911422da02cfb683f9d97c46e7a4049449ec1a23 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Wed, 25 Jun 2014 08:47:13 +0530 Subject: Add compat symbols for scalb* in i386 Bring back symbols into libc.so for scalb* functions. They are no longer used but unfortunately they're now part of the ABI. --- ChangeLog | 7 +++++++ NEWS | 2 +- sysdeps/i386/fpu/s_scalbn.S | 5 +++++ sysdeps/i386/fpu/s_scalbnf.S | 5 +++++ sysdeps/i386/fpu/s_scalbnl.S | 5 +++++ 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d95375372c..9409918ca9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-06-25 Siddhesh Poyarekar + + [BZ #17086] + * sysdeps/i386/fpu/s_scalbn.S: Add compat symbol for libc.so. + * sysdeps/i386/fpu/s_scalbnf.S: Likewise. + * sysdeps/i386/fpu/s_scalbnl.S: Likewise. + 2014-06-24 Roland McGrath * sysdeps/i386/i486/nptl/pthread_spin_trylock.S: Moved ... diff --git a/NEWS b/NEWS index 66e363e384..3ddbec1a21 100644 --- a/NEWS +++ b/NEWS @@ -21,7 +21,7 @@ Version 2.20 16888, 16890, 16912, 16915, 16916, 16917, 16918, 16922, 16927, 16928, 16932, 16943, 16958, 16965, 16966, 16967, 16977, 16978, 16984, 16990, 16996, 17009, 17022, 17031, 17042, 17048, 17050, 17058, 17061, 17062, - 17069, 17075, 17079, 17084. + 17069, 17075, 17079, 17084, 17086. * Optimized strchr implementation for AArch64. Contributed by ARM Ltd. diff --git a/sysdeps/i386/fpu/s_scalbn.S b/sysdeps/i386/fpu/s_scalbn.S index 548f19f2f9..cc9d708022 100644 --- a/sysdeps/i386/fpu/s_scalbn.S +++ b/sysdeps/i386/fpu/s_scalbn.S @@ -16,3 +16,8 @@ ENTRY(__scalbn) END (__scalbn) weak_alias (__scalbn, scalbn) strong_alias (__scalbn, __scalbln) + +#include +#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_20) +compat_symbol (libc, __scalbn, scalbln, GLIBC_2_1); +#endif diff --git a/sysdeps/i386/fpu/s_scalbnf.S b/sysdeps/i386/fpu/s_scalbnf.S index fe6516ee74..0de0694c70 100644 --- a/sysdeps/i386/fpu/s_scalbnf.S +++ b/sysdeps/i386/fpu/s_scalbnf.S @@ -16,3 +16,8 @@ ENTRY(__scalbnf) END (__scalbnf) weak_alias (__scalbnf, scalbnf) strong_alias (__scalbnf, __scalblnf) + +#include +#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_20) +compat_symbol (libc, __scalbnf, scalblnf, GLIBC_2_1); +#endif diff --git a/sysdeps/i386/fpu/s_scalbnl.S b/sysdeps/i386/fpu/s_scalbnl.S index 8f65de41a8..8da0b009e0 100644 --- a/sysdeps/i386/fpu/s_scalbnl.S +++ b/sysdeps/i386/fpu/s_scalbnl.S @@ -17,3 +17,8 @@ ENTRY(__scalbnl) END (__scalbnl) weak_alias (__scalbnl, scalbnl) strong_alias (__scalbnl, __scalblnl) + +#include +#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_20) +compat_symbol (libc, __scalbnl, scalblnl, GLIBC_2_1); +#endif -- cgit v1.2.3-70-g09d2