* 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

1 files changed, 3 insertions, 10 deletions

diff --git a/libc/scripts/versions.awk b/libc/scripts/versions.awk
index 458415443..315278d8f 100644
--- a/libc/scripts/versions.awk
+++ b/libc/scripts/versions.awk
@@ -6,7 +6,6 @@
 # defsfile		name of Versions.def file
 # buildroot		name of build directory with trailing slash
 # move_if_change	move-if-change command
-# versioning            "yes", if symbol versioning is being used
 
 # Read definitions for the versions.
 BEGIN {
@@ -68,10 +67,7 @@ BEGIN {
   sortver=actver
   # Ensure GLIBC_ versions come always first
   sub(/^GLIBC_/," GLIBC_",sortver)
-  if (versioning == "yes") printf("%s %s %s\n", actlib, sortver, $0) | sort;
-  # When not using symbol versioning, assign all symbols non-existent GLIBC
-  # version 1.1; this will allow us to make all necessary symbols global.
-  else printf("%s GLIBC_1.1 %s\n", actlib, $0) | sort;
+  printf("%s %s %s\n", actlib, sortver, $0) | sort;
 }
 
 
@@ -85,7 +81,7 @@ function closeversion(name, oldname) {
   # or FOO_x and FOO_y but not GLIBC_x and FOO_y.
   pfx = oldname;
   sub(/[0-9.]+/,".+",pfx);
-  if (oldname == "" || name !~ pfx || versioning != "yes") print "};" > outfile;
+  if (oldname == "" || name !~ pfx) print "};" > outfile;
   else printf("} %s;\n", oldname) > outfile;
 }
 
@@ -125,10 +121,7 @@ END {
 	closeversion(oldver, veryoldver);
 	veryoldver = oldver;
       }
-      if (versioning == "yes") printf("%s {\n  global:\n", $2) > outfile;
-      # When not using symbol versioning, just output which symbols should be
-      # made global.
-      else print "{\n  global:\n" > outfile;
+      printf("%s {\n  global:\n", $2) > outfile;
       oldver = $2;
     }
     printf("   ") > outfile;