From f1eafb41fa71cb5d88fbeda3136c9be965eeaa41 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 27 Jun 2014 20:24:23 +0000 Subject: 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. --- scripts/soversions.awk | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'scripts') diff --git a/scripts/soversions.awk b/scripts/soversions.awk index dc8afdc205..adba1556f0 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] } -- cgit v1.2.3