about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2017-08-28 15:19:52 +0000
committerJoseph Myers <joseph@codesourcery.com>2017-08-28 15:19:52 +0000
commita48c0fb4b4c322a0e0214f59516b9bb7883352f8 (patch)
tree3d5f29b89994baf7309a4b0f7ba6fd9af8d36421 /sysdeps
parentee17d4e99af9e49378217209d3708053ef148032 (diff)
downloadglibc-a48c0fb4b4c322a0e0214f59516b9bb7883352f8.tar.gz
glibc-a48c0fb4b4c322a0e0214f59516b9bb7883352f8.tar.xz
glibc-a48c0fb4b4c322a0e0214f59516b9bb7883352f8.zip
Simplify math-svid-compat code.
Now there are no more assembly wrappers using _LIB_VERSION or
__kernel_standard, the math-svid-compat code can be slighly
simplified.  math-svid-compat.h no longer needs __ASSEMBLER__
conditionals, and the _LIB_VERSION variable no longer needs to be
built for static libm, since all references are now in C code that
includes math-svid-compat.h and so gets the macro definition of
_LIB_VERSION to _POSIX_ outside the compat case.  This patch makes
those cleanups.

Tested for x86_64, and with build-many-glibcs.py.

	* math/math-svid-compat.h [!__ASSEMBLER__]: Make code
	unconditional.
	* sysdeps/ieee754/s_lib_version.c [!defined SHARED]: Remove
	conditional code; define contents only for [LIBM_SVID_COMPAT].
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/ieee754/s_lib_version.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sysdeps/ieee754/s_lib_version.c b/sysdeps/ieee754/s_lib_version.c
index f11d1c31f6..40f708d82d 100644
--- a/sysdeps/ieee754/s_lib_version.c
+++ b/sysdeps/ieee754/s_lib_version.c
@@ -24,12 +24,7 @@ static char rcsid[] = "$NetBSD: s_lib_version.c,v 1.6 1995/05/10 20:47:44 jtc Ex
  * define and initialize _LIB_VERSION
  */
 #undef _LIB_VERSION
-#if LIBM_SVID_COMPAT || !defined SHARED
-_LIB_VERSION_TYPE _LIB_VERSION_INTERNAL = _POSIX_;
-#endif
 #if LIBM_SVID_COMPAT
+_LIB_VERSION_TYPE _LIB_VERSION_INTERNAL = _POSIX_;
 compat_symbol (libm, _LIB_VERSION_INTERNAL, _LIB_VERSION, GLIBC_2_0);
-#elif !defined SHARED
-/* For use in .S wrappers.  */
-weak_alias (_LIB_VERSION_INTERNAL, _LIB_VERSION)
 #endif