diff options
| author | Roland McGrath <roland@gnu.org> | 2008-05-22 00:03:36 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2008-05-22 00:03:36 +0000 |
| commit | 6fa165975fcfc758243633559b0022f2d1f4acfe (patch) | |
| tree | eed5929f76dc3bb4c2d020132432e2710eadcee1 | |
| parent | e92799fc450f529c860fefe3068df782b7041b9b (diff) | |
| download | glibc-6fa165975fcfc758243633559b0022f2d1f4acfe.tar.gz glibc-6fa165975fcfc758243633559b0022f2d1f4acfe.tar.xz glibc-6fa165975fcfc758243633559b0022f2d1f4acfe.zip | |
2008-05-21 Roland McGrath <roland@redhat.com>
* scripts/soversions.awk: Grok ABI line. * Makeconfig ($(common-objpfx)soversions.mk): Likewise. Emit definition for abi-name variable.
| -rw-r--r-- | Makeconfig | 1 | ||||
| -rw-r--r-- | scripts/soversions.awk | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/Makeconfig b/Makeconfig index d269936f32..7de7621f56 100644 --- a/Makeconfig +++ b/Makeconfig @@ -826,6 +826,7 @@ $(common-objpfx)soversions.mk: $(common-objpfx)soversions.i $(..)Makeconfig (seen_DEFAULT=0; seen_WORDSIZE32=0; seen_WORDSIZE64=0; \ 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 32ce076ba9..55577ccc7e 100644 --- a/scripts/soversions.awk +++ b/scripts/soversions.awk @@ -18,6 +18,16 @@ $2 ~ /WORDSIZE[3264]/ { next; } +$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 = ""; @@ -66,6 +76,9 @@ END { } } } + if (abiname) { + print "ABI", abiname + } for (c in lines) { print lines[c] } |