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.

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"; \

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]
   }