diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-09-16 17:45:03 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-09-16 17:45:03 +0000 |
| commit | af296fcdaba31c3a8062fec0b4198443bb43bd47 (patch) | |
| tree | c1d1bb13ff470bf534a077541d21262b0ab82901 /scripts | |
| parent | d330b980e9ee2349492087a279a9c7bf294f6b47 (diff) | |
| download | glibc-af296fcdaba31c3a8062fec0b4198443bb43bd47.tar glibc-af296fcdaba31c3a8062fec0b4198443bb43bd47.tar.gz glibc-af296fcdaba31c3a8062fec0b4198443bb43bd47.tar.bz2 glibc-af296fcdaba31c3a8062fec0b4198443bb43bd47.zip | |
Remove bitrotten --enable-oldest-abi (bug 6652).
This patch removes the --enable-oldest-abi configure option, which has
long been bitrotten (as reported in bug 6652). The principle of
removing this option was agreed in the thread starting at
<https://sourceware.org/ml/libc-alpha/2013-07/msg00174.html>.
Tested for x86_64 and x86 that the installed shared libraries other
than libc.so are unchanged by this patch and that libc.so disassembly
and symbol versions are unchanged (debug info changes because of
changed line numbers in csu/version.c).
[BZ #6652]
* Makeconfig (soversions-default-setname): Remove variable.
($(common-objpfx)soversions.i): Don't pass default_setname to
soversions.awk.
* Makerules ($(common-objpfx)abi-versions.h): Don't pass
oldest_abi to abi-versions.awk.
* config.h.in (GLIBC_OLDEST_ABI): Remove macro undefine.
* config.make.in (oldest-abi): Remove variable.
* configure.ac (--enable-oldest-abi): Remove configure option.
* configure: Regenerated.
* csu/version.c (banner) [GLIBC_OLDEST_ABI]: Remove conditional
text.
* scripts/abi-versions.awk: Do not handle oldest_abi variable.
* scripts/soversions.awk: Do not handle default_setname variable.
* sysdeps/mach/hurd/configure.ac: Do not handle oldest_abi
variable.
* sysdeps/mach/hurd/configure: Regenerated.
* sysdeps/unix/sysv/linux/configure.ac: Do not handle oldest_abi
variable.
* sysdeps/unix/sysv/linux/configure: Regenerated.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/abi-versions.awk | 9 | ||||
| -rw-r--r-- | scripts/soversions.awk | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/scripts/abi-versions.awk b/scripts/abi-versions.awk index 06fa14833c..c369793459 100644 --- a/scripts/abi-versions.awk +++ b/scripts/abi-versions.awk @@ -1,9 +1,6 @@ # Script to generate <abi-versions.h> header file from Versions.all list. # See include/shlib-compat.h comments for explanation. -# This script expects the following variables to be defined: -# oldest_abi the oldest ABI supported - BEGIN { print "/* This file is automatically generated by abi-versions.awk."; print " It defines symbols used by shlib-compat.h, which see. */"; @@ -31,8 +28,6 @@ $2 == "=" { printf "#define ABI_%s_%s\tABI_%s_%s\n", libid, oldid, libid, newid; printf "#define VERSION_%s_%s\t%s\n", libid, oldid, new; - if ("GLIBC_" oldest_abi == old) - oldest_abi = "default"; next; } @@ -43,10 +38,6 @@ $2 == "=" { printf "#define ABI_%s_%s\t%d\t/* support %s */\n", libid, versid, ++n, vers; printf "#define VERSION_%s_%s\t%s\n", libid, versid, vers; - if ("GLIBC_" oldest_abi == vers) - start = 1; - if (start == 0 && oldest_abi != "default") - --n; next; } diff --git a/scripts/soversions.awk b/scripts/soversions.awk index dbc90590e8..247f061bc3 100644 --- a/scripts/soversions.awk +++ b/scripts/soversions.awk @@ -27,7 +27,7 @@ END { if (lib in versions) set = versions[lib]; else { - set = default_setname; + set = ""; if (ndefault_set >= 1) set = default_set[1]; } |