mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-08 14:20:07 +00:00
Remove the error handling wrapper from log2
Introduce new log2 symbol version that doesn't do SVID compatible error handling. The standard errno and fp exception based error handling is inline in the new code and does not have significant overhead. The wrapper is disabled for sysdeps/ieee754/dbl-64 by using empty w_log2.c and enabled for targets with their own log2 implementation by including math/w_log2.c. The compatibility symbol version still uses the wrapper with SVID error handling around the new code. There is no new symbol version nor compatibility code on !LIBM_SVID_COMPAT targets (e.g. riscv). On targets where previously log2l was an alias of log2, now it points to the compatibility symbol with the wrapper, because it still need the SVID compatible error handling. This affects NO_LONG_DOUBLE (e.g. arm) and LONG_DOUBLE_COMPAT (e.g. alpha) targets as well. The __log2_finite symbol is now an alias of log2. Both __log2_finite and log2 set errno and thus not const functions. The ia64 asm is changed so the compat and new symbol versions map to the same address. Tested with build-many-glibcs.py. * math/Versions (GLIBC_2.29): Add log2. * math/w_log2_compat.c (__log2_compat): Change to versioned compat symbol. * math/w_log2.c: New file. * sysdeps/i386/fpu/w_log2.c: New file. * sysdeps/ia64/fpu/e_log2.S: Add versioned symbols. * sysdeps/ieee754/dbl-64/e_log2.c (__ieee754_log2): Rename to __log2 and add necessary aliases. * sysdeps/ieee754/dbl-64/w_log2.c: New file. * sysdeps/m68k/m680x0/fpu/w_log2.c: New file. * sysdeps/mach/hurd/i386/libm.abilist: Update. * sysdeps/unix/sysv/linux/aarch64/libm.abilist: Update. * sysdeps/unix/sysv/linux/alpha/libm.abilist: Update. * sysdeps/unix/sysv/linux/arm/libm.abilist: Update. * sysdeps/unix/sysv/linux/hppa/libm.abilist: Update. * sysdeps/unix/sysv/linux/i386/libm.abilist: Update. * sysdeps/unix/sysv/linux/ia64/libm.abilist: Update. * sysdeps/unix/sysv/linux/m68k/coldfire/libm.abilist: Update. * sysdeps/unix/sysv/linux/m68k/m680x0/libm.abilist: Update. * sysdeps/unix/sysv/linux/microblaze/libm.abilist: Update. * sysdeps/unix/sysv/linux/mips/mips32/libm.abilist: Update. * sysdeps/unix/sysv/linux/mips/mips64/libm.abilist: Update. * sysdeps/unix/sysv/linux/nios2/libm.abilist: Update. * sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libm.abilist: Update. * sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libm.abilist: Update. * sysdeps/unix/sysv/linux/powerpc/powerpc64/libm-le.abilist: Update. * sysdeps/unix/sysv/linux/powerpc/powerpc64/libm.abilist: Update. * sysdeps/unix/sysv/linux/s390/s390-32/libm.abilist: Update. * sysdeps/unix/sysv/linux/s390/s390-64/libm.abilist: Update. * sysdeps/unix/sysv/linux/sh/libm.abilist: Update. * sysdeps/unix/sysv/linux/sparc/sparc32/libm.abilist: Update. * sysdeps/unix/sysv/linux/sparc/sparc64/libm.abilist: Update. * sysdeps/unix/sysv/linux/x86_64/64/libm.abilist: Update. * sysdeps/unix/sysv/linux/x86_64/x32/libm.abilist: Update.
This commit is contained in:
Szabolcs Nagy
parent
f29b7c492d
commit
718d6542f2
37
ChangeLog
37
ChangeLog
@ -1,3 +1,40 @@
|
||||
2018-11-21 Szabolcs Nagy <szabolcs.nagy@arm.com>
|
||||
|
||||
* math/Versions (GLIBC_2.29): Add log2.
|
||||
* math/w_log2_compat.c (__log2_compat): Change to versioned compat
|
||||
symbol.
|
||||
* math/w_log2.c: New file.
|
||||
* sysdeps/i386/fpu/w_log2.c: New file.
|
||||
* sysdeps/ia64/fpu/e_log2.S: Add versioned symbols.
|
||||
* sysdeps/ieee754/dbl-64/e_log2.c (__ieee754_log2): Rename to __log2
|
||||
and add necessary aliases.
|
||||
* sysdeps/ieee754/dbl-64/w_log2.c: New file.
|
||||
* sysdeps/m68k/m680x0/fpu/w_log2.c: New file.
|
||||
* sysdeps/mach/hurd/i386/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/aarch64/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/alpha/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/arm/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/hppa/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/i386/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/ia64/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/m68k/coldfire/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/m68k/m680x0/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/microblaze/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/mips/mips32/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/mips/mips64/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/nios2/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libm-le.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/s390/s390-32/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/s390/s390-64/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/sh/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/sparc/sparc32/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/sparc/sparc64/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/x86_64/64/libm.abilist: Update.
|
||||
* sysdeps/unix/sysv/linux/x86_64/x32/libm.abilist: Update.
|
||||
|
||||
2018-11-21 Szabolcs Nagy <szabolcs.nagy@arm.com>
|
||||
|
||||
* math/Versions (GLIBC_2.29): Add log.
|
||||
|
||||
@ -577,6 +577,6 @@ libm {
|
||||
}
|
||||
GLIBC_2.29 {
|
||||
# No SVID compatible error handling.
|
||||
exp; exp2; log;
|
||||
exp; exp2; log; log2;
|
||||
}
|
||||
}
|
||||
|
||||
8
math/w_log2.c
Normal file
8
math/w_log2.c
Normal file
@ -0,0 +1,8 @@
|
||||
#include <math-type-macros-double.h>
|
||||
#undef __USE_WRAPPER_TEMPLATE
|
||||
#define __USE_WRAPPER_TEMPLATE 1
|
||||
#undef declare_mgen_alias
|
||||
#define declare_mgen_alias(a, b)
|
||||
#include <w_log2_template.c>
|
||||
versioned_symbol (libm, __log2, log2, GLIBC_2_29);
|
||||
libm_alias_double_other (__log2, log2)
|
||||
@ -23,10 +23,12 @@
|
||||
#include <libm-alias-double.h>
|
||||
|
||||
|
||||
#if LIBM_SVID_COMPAT
|
||||
#if LIBM_SVID_COMPAT && (SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_29) \
|
||||
|| defined NO_LONG_DOUBLE \
|
||||
|| defined LONG_DOUBLE_COMPAT)
|
||||
/* wrapper log2(x) */
|
||||
double
|
||||
__log2 (double x)
|
||||
__log2_compat (double x)
|
||||
{
|
||||
if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
|
||||
{
|
||||
@ -44,5 +46,17 @@ __log2 (double x)
|
||||
|
||||
return __ieee754_log2 (x);
|
||||
}
|
||||
libm_alias_double (__log2, log2)
|
||||
# if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_29)
|
||||
compat_symbol (libm, __log2_compat, log2, GLIBC_2_1);
|
||||
# endif
|
||||
# ifdef NO_LONG_DOUBLE
|
||||
weak_alias (__log2_compat, log2l)
|
||||
# endif
|
||||
# ifdef LONG_DOUBLE_COMPAT
|
||||
/* Work around gas bug "multiple versions for symbol". */
|
||||
weak_alias (__log2_compat, __log2_compat_alias)
|
||||
|
||||
LONG_DOUBLE_COMPAT_CHOOSE_libm_log2l (
|
||||
compat_symbol (libm, __log2_compat_alias, log2l, FIRST_VERSION_libm_log2l), );
|
||||
# endif
|
||||
#endif
|
||||
|
||||
1
sysdeps/i386/fpu/w_log2.c
Normal file
1
sysdeps/i386/fpu/w_log2.c
Normal file
@ -0,0 +1 @@
|
||||
#include <sysdeps/../math/w_log2.c>
|
||||
@ -385,7 +385,7 @@ LOCAL_OBJECT_END(T_table)
|
||||
|
||||
|
||||
.section .text
|
||||
GLOBAL_LIBM_ENTRY(log2)
|
||||
WEAK_LIBM_ENTRY(log2)
|
||||
|
||||
{ .mfi
|
||||
alloc r32=ar.pfs,1,4,4,0
|
||||
@ -653,8 +653,14 @@ SPECIAL_LOG2:
|
||||
br.ret.sptk b0;;
|
||||
}
|
||||
|
||||
GLOBAL_LIBM_END(log2)
|
||||
libm_alias_double_other (log2, log2)
|
||||
WEAK_LIBM_END(log2)
|
||||
libm_alias_double_other (__log2, log2)
|
||||
#ifdef SHARED
|
||||
.symver log2,log2@@GLIBC_2.29
|
||||
.weak __log2_compat
|
||||
.set __log2_compat,__log2
|
||||
.symver __log2_compat,log2@GLIBC_2.2
|
||||
#endif
|
||||
|
||||
|
||||
LOCAL_LIBM_ENTRY(__libm_error_region)
|
||||
|
||||
@ -18,6 +18,9 @@
|
||||
|
||||
#include <math.h>
|
||||
#include <stdint.h>
|
||||
#include <math-svid-compat.h>
|
||||
#include <shlib-compat.h>
|
||||
#include <libm-alias-double.h>
|
||||
#include "math_config.h"
|
||||
|
||||
#define T __log2_data.tab
|
||||
@ -37,7 +40,7 @@ top16 (double x)
|
||||
}
|
||||
|
||||
double
|
||||
__ieee754_log2 (double x)
|
||||
__log2 (double x)
|
||||
{
|
||||
/* double_t for better performance on targets with FLT_EVAL_METHOD==2. */
|
||||
double_t z, r, r2, r4, y, invc, logc, kd, hi, lo, t1, t2, t3, p;
|
||||
@ -136,6 +139,13 @@ __ieee754_log2 (double x)
|
||||
y = lo + r2 * p + hi;
|
||||
return y;
|
||||
}
|
||||
#ifndef __ieee754_log2
|
||||
strong_alias (__ieee754_log2, __log2_finite)
|
||||
#ifndef __log2
|
||||
strong_alias (__log2, __ieee754_log2)
|
||||
strong_alias (__log2, __log2_finite)
|
||||
# if LIBM_SVID_COMPAT
|
||||
versioned_symbol (libm, __log2, log2, GLIBC_2_29);
|
||||
libm_alias_double_other (__log2, log2)
|
||||
# else
|
||||
libm_alias_double (__log2, log2)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
1
sysdeps/ieee754/dbl-64/w_log2.c
Normal file
1
sysdeps/ieee754/dbl-64/w_log2.c
Normal file
@ -0,0 +1 @@
|
||||
/* Not needed. */
|
||||
1
sysdeps/m68k/m680x0/fpu/w_log2.c
Normal file
1
sysdeps/m68k/m680x0/fpu/w_log2.c
Normal file
@ -0,0 +1 @@
|
||||
#include <sysdeps/../math/w_log2.c>
|
||||
@ -1071,3 +1071,4 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
|
||||
@ -1035,3 +1035,4 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
|
||||
@ -1046,6 +1046,7 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
GLIBC_2.3.4 __c1_cabsf F
|
||||
GLIBC_2.3.4 __c1_cacosf F
|
||||
GLIBC_2.3.4 __c1_cacoshf F
|
||||
|
||||
@ -456,6 +456,7 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
GLIBC_2.4 _LIB_VERSION D 0x4
|
||||
GLIBC_2.4 __clog10 F
|
||||
GLIBC_2.4 __clog10f F
|
||||
|
||||
@ -767,4 +767,5 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
GLIBC_2.4 exp2l F
|
||||
|
||||
@ -1078,3 +1078,4 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
|
||||
@ -1008,3 +1008,4 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
|
||||
@ -456,6 +456,7 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
GLIBC_2.4 _LIB_VERSION D 0x4
|
||||
GLIBC_2.4 __clog10 F
|
||||
GLIBC_2.4 __clog10f F
|
||||
|
||||
@ -807,3 +807,4 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
|
||||
@ -768,3 +768,4 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
|
||||
@ -767,4 +767,5 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
GLIBC_2.4 exp2l F
|
||||
|
||||
@ -1035,3 +1035,4 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
|
||||
@ -768,3 +768,4 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
|
||||
@ -813,6 +813,7 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
GLIBC_2.4 __clog10l F
|
||||
GLIBC_2.4 __finitel F
|
||||
GLIBC_2.4 __fpclassifyl F
|
||||
|
||||
@ -812,6 +812,7 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
GLIBC_2.4 __clog10l F
|
||||
GLIBC_2.4 __finitel F
|
||||
GLIBC_2.4 __fpclassifyl F
|
||||
|
||||
@ -1079,3 +1079,4 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
|
||||
@ -491,6 +491,7 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
GLIBC_2.3 _LIB_VERSION D 0x4
|
||||
GLIBC_2.3 __clog10 F
|
||||
GLIBC_2.3 __clog10f F
|
||||
|
||||
@ -1036,6 +1036,7 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
GLIBC_2.4 __clog10l F
|
||||
GLIBC_2.4 __finitel F
|
||||
GLIBC_2.4 __fpclassifyl F
|
||||
|
||||
@ -1036,6 +1036,7 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
GLIBC_2.4 __clog10l F
|
||||
GLIBC_2.4 __finitel F
|
||||
GLIBC_2.4 __fpclassifyl F
|
||||
|
||||
@ -767,4 +767,5 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
GLIBC_2.4 exp2l F
|
||||
|
||||
@ -1043,6 +1043,7 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
GLIBC_2.4 __clog10l F
|
||||
GLIBC_2.4 __finitel F
|
||||
GLIBC_2.4 __fpclassifyl F
|
||||
|
||||
@ -1035,3 +1035,4 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
|
||||
@ -1069,3 +1069,4 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
|
||||
@ -1069,3 +1069,4 @@ GLIBC_2.28 fsubl F
|
||||
GLIBC_2.29 exp F
|
||||
GLIBC_2.29 exp2 F
|
||||
GLIBC_2.29 log F
|
||||
GLIBC_2.29 log2 F
|
||||
|
||||
Loading…
Reference in New Issue
Block a user