Revert x32 lib-names changes

7 files changed, 9 insertions, 164 deletions

diff --git a/ChangeLog.x32 b/ChangeLog.x32
index b4b0780df5..a619608db6 100644
--- a/ChangeLog.x32
+++ b/ChangeLog.x32
@@ -1,5 +1,14 @@
 2012-05-23  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* sysdeps/unix/sysv/linux/i386/configure.in: Removed.
+	* sysdeps/unix/sysv/linux/i386/configure: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/configure.in: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/configure: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/lib-names.awk: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/stubs-biarch.h: Likewise.
+
+2012-05-23  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu.S: Rearrange
 	code so that pseudo_end is just ret and the stack pointer is
 	correct also for static library in error case.
diff --git a/sysdeps/unix/sysv/linux/i386/configure b/sysdeps/unix/sysv/linux/i386/configure
deleted file mode 100644
index 482a0b4884..0000000000
--- a/sysdeps/unix/sysv/linux/i386/configure
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file is generated from configure.in by Autoconf.  DO NOT EDIT!
- # Local configure fragment for sysdeps/unix/sysv/linux/x86_64.
-
-lib_names_awk=sysdeps/unix/sysv/linux/x86_64/lib-names.awk
diff --git a/sysdeps/unix/sysv/linux/i386/configure.in b/sysdeps/unix/sysv/linux/i386/configure.in
deleted file mode 100644
index 8009ee9b9e..0000000000
--- a/sysdeps/unix/sysv/linux/i386/configure.in
+++ /dev/null
@@ -1,5 +0,0 @@
-GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
-# Local configure fragment for sysdeps/unix/sysv/linux/x86_64.
-
-dnl Need to handle lib-names properly for x86-64 and x32.
-lib_names_awk=sysdeps/unix/sysv/linux/x86_64/lib-names.awk
diff --git a/sysdeps/unix/sysv/linux/x86_64/configure b/sysdeps/unix/sysv/linux/x86_64/configure
deleted file mode 100644
index 482a0b4884..0000000000
--- a/sysdeps/unix/sysv/linux/x86_64/configure
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file is generated from configure.in by Autoconf.  DO NOT EDIT!
- # Local configure fragment for sysdeps/unix/sysv/linux/x86_64.
-
-lib_names_awk=sysdeps/unix/sysv/linux/x86_64/lib-names.awk
diff --git a/sysdeps/unix/sysv/linux/x86_64/configure.in b/sysdeps/unix/sysv/linux/x86_64/configure.in
deleted file mode 100644
index 8009ee9b9e..0000000000
--- a/sysdeps/unix/sysv/linux/x86_64/configure.in
+++ /dev/null
@@ -1,5 +0,0 @@
-GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
-# Local configure fragment for sysdeps/unix/sysv/linux/x86_64.
-
-dnl Need to handle lib-names properly for x86-64 and x32.
-lib_names_awk=sysdeps/unix/sysv/linux/x86_64/lib-names.awk
diff --git a/sysdeps/unix/sysv/linux/x86_64/lib-names.awk b/sysdeps/unix/sysv/linux/x86_64/lib-names.awk
deleted file mode 100644
index 5a2d0d4c98..0000000000
--- a/sysdeps/unix/sysv/linux/x86_64/lib-names.awk
+++ /dev/null
@@ -1,122 +0,0 @@
-# awk script for soversions.i -> gnu/lib-names.h; see Makeconfig.
-
-$1 != "DEFAULT" { multi = 1 }
-
-#
-{
-  lib = $2;
-  version = $3;
-  if ($3 !~ /^[0-9]/) {
-    soname = $3;
-    extra = $3;
-    sub(/\.so.*$/, "", extra);
-  }
-  else {
-    soname = lib ".so." $3;
-    extra = "";
-  }
-  soname = "\"" soname "\"";
-  lib = toupper(lib);
-  extra = toupper(extra);
-  gsub(/-/, "_", lib);
-  gsub(/-/, "_", extra);
-  if (extra) {
-    if (extra == "LD_LINUX_X32") {
-      x32_macros[$1 FS lib "_SO"] = soname;
-      x32_macros[$1 FS extra "_SO"] = soname;
-      x86_64_macros[$1 FS lib "_SO"] = "\"ld-linux-x86-64.so.2\"";
-      x86_64_macros[$1 FS "LD_LINUX_X86_64_SO"] = "\"ld-linux-x86-64.so.2\"";
-    }
-    else if (extra == "LD_LINUX_X86_64") {
-      x86_64_macros[$1 FS lib "_SO"] = soname;
-      x86_64_macros[$1 FS extra "_SO"] = soname;
-      x32_macros[$1 FS lib "_SO"] = "\"ld-linux-x32.so.2\"";
-      x32_macros[$1 FS "LD_LINUX_X32_SO"] = "\"ld-linux-x32.so.2\"";
-    }
-    else if (extra == "LD_LINUX") {
-      x86_64_macros[$1 FS lib "_SO"] = "\"ld-linux-x86-64.so.2\"";
-      x86_64_macros[$1 FS "LD_LINUX_X86_64_SO"] = "\"ld-linux-x86-64.so.2\"";
-      x32_macros[$1 FS lib "_SO"] = "\"ld-linux-x32.so.2\"";
-      x32_macros[$1 FS "LD_LINUX_X32_SO"] = "\"ld-linux-x32.so.2\"";
-      macros[$1 FS lib "_SO"] = soname;
-      macros[$1 FS extra "_SO"] = soname;
-    }
-    else if (extra != "LD") {
-      macros[$1 FS lib "_SO"] = soname;
-      macros[$1 FS extra "_SO"] = soname;
-    }
-  }
-  else {
-    macros[$1 FS lib "_SO"] = soname;
-  }
-}
-
-END {
-  print "/* This file is automatically generated.";
-  print "   It defines macros to allow user program to find the shared";
-  print "   library files which come as part of GNU libc.  */";
-  print "#ifndef __GNU_LIB_NAMES_H";
-  print "#define __GNU_LIB_NAMES_H	1";
-  print "";
-
-  pfx = multi ? "# define " : "#define ";
-  for (elt in macros) {
-    split(elt, x);
-    line = sprintf("%-40s%s", pfx x[2], macros[elt]);
-    if (x[1] in lines)
-      lines[x[1]] = lines[x[1]] "\n" line;
-    else
-      lines[x[1]] = line;
-  }
-
-  if (multi) {
-    # Print these in a fixed order so the result is identical
-    # on both sides of the coin.
-    pfx = "#  define ";
-    for (elt in x32_macros) {
-      split(elt, x);
-      line = sprintf("%-40s%s", pfx x[2], x32_macros[elt]);
-      if (x[1] in x32_lines)
-	x32_lines[x[1]] = x32_lines[x[1]] "\n" line;
-      else
-	x32_lines[x[1]] = line;
-    }
-    for (elt in x86_64_macros) {
-      split(elt, x);
-      line = sprintf("%-40s%s", pfx x[2], x86_64_macros[elt]);
-      if (x[1] in x86_64_lines)
-	x86_64_lines[x[1]] = x86_64_lines[x[1]] "\n" line;
-      else
-	x86_64_lines[x[1]] = line;
-    }
-    if (!("WORDSIZE32" in lines))
-      lines["WORDSIZE32"] = lines["DEFAULT"];
-    if (!("WORDSIZE64" in lines))
-      lines["WORDSIZE64"] = lines["DEFAULT"];
-    if (!("WORDSIZE32" in x32_lines))
-      x32_lines["WORDSIZE32"] = x32_lines["DEFAULT"];
-    if (!("WORDSIZE64" in x32_lines))
-      x32_lines["WORDSIZE64"] = x32_lines["DEFAULT"];
-    if (!("WORDSIZE32" in x86_64_lines))
-      x86_64_lines["WORDSIZE32"] = x86_64_lines["DEFAULT"];
-    if (!("WORDSIZE64" in x86_64_lines))
-      x86_64_lines["WORDSIZE64"] = x86_64_lines["DEFAULT"];
-    print "#include <bits/wordsize.h>\n";
-    print "#ifndef __x86_64__";
-    cmd = "LC_ALL=C sort"; print lines["WORDSIZE32"] | cmd; close(cmd);
-    print "#else"
-    print "# if __WORDSIZE == 32"
-    cmd = "LC_ALL=C sort"; print x32_lines["WORDSIZE64"] | cmd; close(cmd);
-    print "# else"
-    cmd = "LC_ALL=C sort"; print x86_64_lines["WORDSIZE64"] | cmd; close(cmd);
-    print "# endif"
-    cmd = "LC_ALL=C sort"; print lines["WORDSIZE64"] | cmd; close(cmd);
-    print "#endif";
-  }
-  else {
-    cmd = "LC_ALL=C sort"; print lines["DEFAULT"] | cmd; close(cmd);
-  }
-
-  print "";
-  print "#endif	/* gnu/lib-names.h */"
-}
diff --git a/sysdeps/unix/sysv/linux/x86_64/stubs-biarch.h b/sysdeps/unix/sysv/linux/x86_64/stubs-biarch.h
deleted file mode 100644
index 241a95e18f..0000000000
--- a/sysdeps/unix/sysv/linux/x86_64/stubs-biarch.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* This file selects the right generated file of `__stub_FUNCTION' macros
-   based on the architecture being compiled for.  */
-
-#ifdef __x86_64__
-# include <gnu/stubs-64.h>
-/* The following obsolete system calls are available in x86-64 kernel.
-   But they are not supported in x32 kernel.  We always undef them for
-   x86-64 and define them for x32.  It works with gnu/stubs-64.h
-   generated during x32 glibc build as well as x86-64 glibc build.  */
-# undef __stub_create_module
-# undef __stub_get_kernel_syms
-# undef __stub_nfsservctl
-# undef __stub_query_module
-# undef __stub_uselib
-# ifdef __ILP32__
-#  define __stub_create_module
-#  define __stub_get_kernel_syms
-#  define __stub_nfsservctl
-#  define __stub_query_module
-#  define __stub_uselib
-# endif
-#else
-# include <gnu/stubs-32.h>
-#endif