This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.19-712-gf1eafb4
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 Jun 2014 20:24:54 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.19-712-gf1eafb4
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via f1eafb41fa71cb5d88fbeda3136c9be965eeaa41 (commit)
from 37caf178e25419c2c82663f10c7a09f12e1b4142 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f1eafb41fa71cb5d88fbeda3136c9be965eeaa41
commit f1eafb41fa71cb5d88fbeda3136c9be965eeaa41
Author: Joseph Myers <joseph@codesourcery.com>
Date: Fri Jun 27 20:24:23 2014 +0000
Remove shlib-versions ABI names support.
shlib-versions files can contain ABI lines that map triplets to a
canonical ABI name. This name was once used for various purposes
where test baseline files for different ABIs went in a single
directory; now these purposes use sysdeps files, generation of headers
which have per-ABI variants uses abi-variants and related Makefile
variables and the shlib-versions ABI names are unused. This patch
duly removes those lines and associated build system support for them.
Tested for x86_64 (both a full testsuite run and confirming the
installed shared libraries are unchanged by the patch).
* Makeconfig ($(common-objpfx)soversions.mk): Do not generate
abi-name definition.
* scripts/soversions.awk: Do not handle or generate ABI lines.
* shlib-versions: Remove ABI entries.
* sysdeps/powerpc/nofpu/shlib-versions: Remove file.
* sysdeps/x86_64/x32/shlib-versions: Remove ABI entry.
diff --git a/ChangeLog b/ChangeLog
index 91f0e87..3582966 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-06-27 Joseph Myers <joseph@codesourcery.com>
+
+ * Makeconfig ($(common-objpfx)soversions.mk): Do not generate
+ abi-name definition.
+ * scripts/soversions.awk: Do not handle or generate ABI lines.
+ * shlib-versions: Remove ABI entries.
+ * sysdeps/powerpc/nofpu/shlib-versions: Remove file.
+ * sysdeps/x86_64/x32/shlib-versions: Remove ABI entry.
+
2014-06-27 Roland McGrath <roland@hack.frob.com>
* sysdeps/unix/sysv/linux/mips/mips32/nptl/c++-types.data: Moved ...
diff --git a/Makeconfig b/Makeconfig
index e07823f..cef0f06 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -972,7 +972,6 @@ $(common-objpfx)soversions.i: $(..)scripts/soversions.awk \
$(common-objpfx)soversions.mk: $(common-objpfx)soversions.i $(..)Makeconfig
(while read which lib number setname; do \
eval seen_$$which=1; \
- test x"$$which" != xABI || echo abi-name = "$$lib"; \
test x"$$which" = xDEFAULT || continue; \
case $$number in \
[0-9]*) echo "$$lib.so-version=.$$number"; \
diff --git a/scripts/soversions.awk b/scripts/soversions.awk
index dc8afdc..adba155 100644
--- a/scripts/soversions.awk
+++ b/scripts/soversions.awk
@@ -7,16 +7,6 @@ BEGIN {
{ thiscf = $1 }
-$2 == "ABI" {
- if ((config ~ thiscf) && !abiname) {
- abiname = $3;
- sub(/@CPU@/, cpu, abiname);
- sub(/@VENDOR@/, vendor, abiname);
- sub(/@OS@/, os, abiname);
- }
- next;
-}
-
# Obey the first matching DEFAULT line.
$2 == "DEFAULT" {
$1 = $2 = "";
@@ -65,9 +55,6 @@ END {
}
}
}
- if (abiname) {
- print "ABI", abiname
- }
for (c in lines) {
print lines[c]
}
diff --git a/shlib-versions b/shlib-versions
index 78b0ad7..40469bd 100644
--- a/shlib-versions
+++ b/shlib-versions
@@ -26,11 +26,6 @@ powerpc64-.*-linux.* DEFAULT GLIBC_2.3
powerpc.*le-.*-linux.* DEFAULT GLIBC_2.17
.*-.*-gnu-gnu.* DEFAULT GLIBC_2.2.6
-# Configuration ABI Identifier for ABI data files
-# ------------- ---------- -----------------------------
-sparc64.*-.*-.* ABI sparc64-@OS@
-sparc.*-.*-.* ABI sparc-@OS@
-
# Configuration Library=version Earliest symbol set (optional)
# ------------- --------------- ------------------------------
diff --git a/sysdeps/powerpc/nofpu/shlib-versions b/sysdeps/powerpc/nofpu/shlib-versions
deleted file mode 100644
index 72085dd..0000000
--- a/sysdeps/powerpc/nofpu/shlib-versions
+++ /dev/null
@@ -1 +0,0 @@
-powerpc.*-.*-.* ABI powerpcsoft-@OS@
diff --git a/sysdeps/x86_64/x32/shlib-versions b/sysdeps/x86_64/x32/shlib-versions
index ae3979b..223dfb6 100644
--- a/sysdeps/x86_64/x32/shlib-versions
+++ b/sysdeps/x86_64/x32/shlib-versions
@@ -1,7 +1,3 @@
# Configuration DEFAULT Earliest symbol set
# ------------- --------------- ------------------------------
x86_64-.*-linux.* DEFAULT GLIBC_2.16
-
-# Configuration ABI Identifier for ABI data files
-# ------------- ---------- -----------------------------
-x86_64-.*-.* ABI x32-@OS@
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 +++++++++
Makeconfig | 1 -
scripts/soversions.awk | 13 -------------
shlib-versions | 5 -----
sysdeps/powerpc/nofpu/shlib-versions | 1 -
sysdeps/x86_64/x32/shlib-versions | 4 ----
6 files changed, 9 insertions(+), 24 deletions(-)
delete mode 100644 sysdeps/powerpc/nofpu/shlib-versions
hooks/post-receive
--
GNU C Library master sources