lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

Remove shlib-versions ABI names support.

Browse Source 
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.
This commit is contained in:
Joseph Myers
2014-06-27 20:24:23 +00:00
parent 37caf178e2
commit f1eafb41fa
6 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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> 2014-06-27 Roland McGrath <roland@hack.frob.com>
* sysdeps/unix/sysv/linux/mips/mips32/nptl/c++-types.data: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/nptl/c++-types.data: Moved ...

1
Makeconfig
View File

@ -972,7 +972,6 @@ $(common-objpfx)soversions.i: $(..)scripts/soversions.awk \
$(common-objpfx)soversions.mk: $(common-objpfx)soversions.i $(..)Makeconfig $(common-objpfx)soversions.mk: $(common-objpfx)soversions.i $(..)Makeconfig
(while read which lib number setname; do \ (while read which lib number setname; do \
eval seen_$$which=1; \ eval seen_$$which=1; \
test x"$$which" != xABI || echo abi-name = "$$lib"; \
test x"$$which" = xDEFAULT || continue; \ test x"$$which" = xDEFAULT || continue; \
case $$number in \ case $$number in \
[0-9]*) echo "$$lib.so-version=.$$number"; \ [0-9]*) echo "$$lib.so-version=.$$number"; \

13
scripts/soversions.awk
View File

@ -7,16 +7,6 @@ BEGIN {
{ thiscf = $1 } { 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. # Obey the first matching DEFAULT line.
$2 == "DEFAULT" { $2 == "DEFAULT" {
$1 = $2 = ""; $1 = $2 = "";
@ -65,9 +55,6 @@ END {
} }
} }
} }
if (abiname) {
print "ABI", abiname
}
for (c in lines) { for (c in lines) {
print lines[c] print lines[c]
} }

5
shlib-versions
View File

@ -26,11 +26,6 @@ powerpc64-.*-linux.* DEFAULT GLIBC_2.3
powerpc.*le-.*-linux.* DEFAULT GLIBC_2.17 powerpc.*le-.*-linux.* DEFAULT GLIBC_2.17
.*-.*-gnu-gnu.* DEFAULT GLIBC_2.2.6 .*-.*-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) # Configuration Library=version Earliest symbol set (optional)
# ------------- --------------- ------------------------------ # ------------- --------------- ------------------------------

1
sysdeps/powerpc/nofpu/shlib-versions
View File

@ -1 +0,0 @@
powerpc.*-.*-.* ABI powerpcsoft-@OS@

4
sysdeps/x86_64/x32/shlib-versions
View File

@ -1,7 +1,3 @@
# Configuration DEFAULT Earliest symbol set # Configuration DEFAULT Earliest symbol set
# ------------- --------------- ------------------------------ # ------------- --------------- ------------------------------
x86_64-.*-linux.* DEFAULT GLIBC_2.16 x86_64-.*-linux.* DEFAULT GLIBC_2.16
# Configuration ABI Identifier for ABI data files
# ------------- ---------- -----------------------------
x86_64-.*-.* ABI x32-@OS@