* Makerules, elf/Makefile, elf/do-rel.h, extra-lib.mk,

	include/libc-symbols.h, include/shlib-compat.h, nptl/Makefile,
	nptl/pthread_kill_other_threads.c, resolv/res_libc.c,
	scripts/versions.awk, sysdeps/ieee754/ldbl-128ibm/s_finitel.c,
	sysdeps/ieee754/ldbl-128ibm/s_isinfl.c,
	sysdeps/ieee754/ldbl-128ibm/s_isnanl.c,
	sysdeps/ieee754/ldbl-128ibm/strtold_l.c,
	sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h,
	sysdeps/powerpc/longjmp.c, sysdeps/powerpc/powerpc32/dl-machine.c,
	sysdeps/wordsize-32/divdi3.c: Revert --disable-versioning support
	changes.
	* Makerules: Change $(versioning) conditional in local code to
	$(build-shared).


git-svn-id: svn://svn.eglibc.org/trunk@23871 7b3dc134-2b1b-0410-93df-9e9f96275f8d

5 files changed, 9 insertions, 10 deletions

diff --git a/libc/sysdeps/ieee754/ldbl-128ibm/s_finitel.c b/libc/sysdeps/ieee754/ldbl-128ibm/s_finitel.c
index 33b92b86a..8edb34154 100644
--- a/libc/sysdeps/ieee754/ldbl-128ibm/s_finitel.c
+++ b/libc/sysdeps/ieee754/ldbl-128ibm/s_finitel.c
@@ -37,9 +37,9 @@ ___finitel (long double x)
 hidden_ver (___finitel, __finitel)
 weak_alias (___finitel, ____finitel)
 #ifdef IS_IN_libm
-long_double_symbol (libm, ____finitel, finitel) versioned_weak;
+long_double_symbol (libm, ____finitel, finitel);
 long_double_symbol (libm, ___finitel, __finitel);
 #else
-long_double_symbol (libc, ____finitel, finitel) versioned_weak;
+long_double_symbol (libc, ____finitel, finitel);
 long_double_symbol (libc, ___finitel, __finitel);
 #endif
diff --git a/libc/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c b/libc/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c
index dfaf5ee38..5f5b0144b 100644
--- a/libc/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c
+++ b/libc/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c
@@ -31,5 +31,5 @@ hidden_ver (___isinfl, __isinfl)
 #ifndef IS_IN_libm
 weak_alias (___isinfl, ____isinfl)
 long_double_symbol (libc, ___isinfl, isinfl);
-long_double_symbol (libc, ____isinfl, __isinfl) versioned_weak;
+long_double_symbol (libc, ____isinfl, __isinfl);
 #endif
diff --git a/libc/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c b/libc/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c
index aa4eb7132..264dec745 100644
--- a/libc/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c
+++ b/libc/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c
@@ -40,5 +40,5 @@ hidden_ver (___isnanl, __isnanl)
 #ifndef IS_IN_libm
 weak_alias (___isnanl, ____isnanl)
 long_double_symbol (libc, ___isnanl, isnanl);
-long_double_symbol (libc, ____isnanl, __isnanl) versioned_weak;
+long_double_symbol (libc, ____isnanl, __isnanl);
 #endif
diff --git a/libc/sysdeps/ieee754/ldbl-128ibm/strtold_l.c b/libc/sysdeps/ieee754/ldbl-128ibm/strtold_l.c
index 0947814f7..93415f0f0 100644
--- a/libc/sysdeps/ieee754/ldbl-128ibm/strtold_l.c
+++ b/libc/sysdeps/ieee754/ldbl-128ibm/strtold_l.c
@@ -57,11 +57,11 @@ libc_hidden_proto (STRTOF)
 # include <math_ldbl_opt.h>
 # ifdef USE_WIDE_CHAR
 weak_alias (____new_wcstold_l, ___new_wcstold_l);
-long_double_symbol (libc, ___new_wcstold_l, wcstold_l) versioned_weak;
+long_double_symbol (libc, ___new_wcstold_l, wcstold_l);
 long_double_symbol (libc, ____new_wcstold_l, __wcstold_l);
 # else
 weak_alias (____new_strtold_l, ___new_strtold_l);
-long_double_symbol (libc, ___new_strtold_l, strtold_l) versioned_weak;
+long_double_symbol (libc, ___new_strtold_l, strtold_l);
 long_double_symbol (libc, ____new_strtold_l, __strtold_l);
 # endif
 #endif
diff --git a/libc/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h b/libc/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h
index 961fa6c5f..b0b863cba 100644
--- a/libc/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h
+++ b/libc/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h
@@ -10,15 +10,14 @@
   SHLIB_COMPAT(lib, introduced, LONG_DOUBLE_COMPAT_VERSION)
 #define long_double_symbol(lib, local, symbol) \
   long_double_symbol_1 (lib, local, symbol, LONG_DOUBLE_COMPAT_VERSION)
-#if defined SHARED
+#if defined SHARED && defined DO_VERSIONING
 # define ldbl_hidden_def(local, name) libc_hidden_ver (local, name)
 # define ldbl_strong_alias(name, aliasname) \
   strong_alias (name, __GL_##name##_##aliasname) \
   long_double_symbol (libc, __GL_##name##_##aliasname, aliasname);
 # define ldbl_weak_alias(name, aliasname) \
-  weak_alias (name, __GL_##name##_##aliasname)				\
-  long_double_symbol (libc, __GL_##name##_##aliasname, aliasname)	\
-  versioned_weak;
+  weak_alias (name, __GL_##name##_##aliasname) \
+  long_double_symbol (libc, __GL_##name##_##aliasname, aliasname);
 # define long_double_symbol_1(lib, local, symbol, version) \
   versioned_symbol (lib, local, symbol, version)
 #else