* Versions.def (libdl, librt): Add GLIBC_2.3.4 version.

* scripts/versions.awk: Print all errors and die at the end.
	Use library name in versions array keys.
This commit is contained in:
Roland McGrath 2005-03-22 23:52:59 +00:00
parent 0dad51c172
commit 2fb9a65c22
3 changed files with 24 additions and 7 deletions

View File

@ -1,3 +1,10 @@
2005-03-22 Roland McGrath <roland@redhat.com>
* Versions.def (libdl, librt): Add GLIBC_2.3.4 version.
* scripts/versions.awk: Print all errors and die at the end.
Use library name in versions array keys.
2005-03-22 Daniel Jacobowitz <dan@codesourcery.com> 2005-03-22 Daniel Jacobowitz <dan@codesourcery.com>
* elf/elf.h (PT_ARM_EXIDX): New macro. * elf/elf.h (PT_ARM_EXIDX): New macro.

View File

@ -36,6 +36,7 @@ libdl {
GLIBC_2.0 GLIBC_2.0
GLIBC_2.1 GLIBC_2.1
GLIBC_2.3.3 GLIBC_2.3.3
GLIBC_2.3.4
} }
libm { libm {
GLIBC_2.0 GLIBC_2.0
@ -91,6 +92,7 @@ librt {
GLIBC_2.2 GLIBC_2.2
GLIBC_2.3 GLIBC_2.3
GLIBC_2.3.3 GLIBC_2.3.3
GLIBC_2.3.4
} }
libutil { libutil {
GLIBC_2.0 GLIBC_2.0

View File

@ -1,5 +1,5 @@
# Combine version map fragments into version scripts for our shared objects. # Combine version map fragments into version scripts for our shared objects.
# Copyright (C) 1998,99,2000,02 Free Software Foundation, Inc. # Copyright (C) 1998,99,2000,2002,2005 Free Software Foundation, Inc.
# Written by Ulrich Drepper <drepper@cygnus.com>, 1998. # Written by Ulrich Drepper <drepper@cygnus.com>, 1998.
# This script expects the following variables to be defined: # This script expects the following variables to be defined:
@ -9,17 +9,19 @@
# Read definitions for the versions. # Read definitions for the versions.
BEGIN { BEGIN {
lossage = 0;
nlibs=0; nlibs=0;
while (getline < defsfile) { while (getline < defsfile) {
if (/^[a-zA-Z0-9_.]+ \{/) { if (/^[a-zA-Z0-9_.]+ \{/) {
libs[$1] = 1; libs[$1] = 1;
curlib = $1; curlib = $1;
while (getline < defsfile && ! /^}/) { while (getline < defsfile && ! /^}/) {
if ($2 == "=") { if ($2 == "=") {
renamed[curlib "::" $1] = $3; renamed[curlib "::" $1] = $3;
} }
else else
versions[$1] = 1; versions[curlib "::" $1] = 1;
} }
} }
} }
@ -42,7 +44,7 @@ BEGIN {
actlib = $1; actlib = $1;
if (!libs[$1]) { if (!libs[$1]) {
printf("no versions defined for %s\n", $1) > "/dev/stderr"; printf("no versions defined for %s\n", $1) > "/dev/stderr";
exit 1; ++lossage;
} }
next; next;
} }
@ -51,9 +53,9 @@ BEGIN {
/^ [A-Za-z_]/ { /^ [A-Za-z_]/ {
if (renamed[actlib "::" $1]) if (renamed[actlib "::" $1])
actver = renamed[actlib "::" $1]; actver = renamed[actlib "::" $1];
else if (!versions[$1]) { else if (!versions[actlib "::" $1]) {
printf("version %s not defined for %s\n", $1, actlib) > "/dev/stderr"; printf("version %s not defined for %s\n", $1, actlib) > "/dev/stderr";
exit 1; ++lossage;
} }
else else
actver = $1; actver = $1;
@ -93,6 +95,12 @@ function close_and_move(name, real_name) {
# Now print the accumulated information. # Now print the accumulated information.
END { END {
close(sort); close(sort);
if (lossage) {
system("rm -f " tmpfile);
exit 1;
}
oldlib = ""; oldlib = "";
oldver = ""; oldver = "";
printf("version-maps ="); printf("version-maps =");