* scripts/soversions.awk: Fix default version set handling.

1 files changed, 15 insertions, 9 deletions

diff --git a/scripts/soversions.awk b/scripts/soversions.awk
index 3d50c4d..eab2e17 100644
--- a/scripts/soversions.awk
+++ b/scripts/soversions.awk
@@ -20,11 +20,8 @@ $2 ~ /WORDSIZE[3264]/ {
 
 # Obey the first matching DEFAULT line.
 $2 == "DEFAULT" {
-  if (!matched_default[thiscf]) {
-    matched_default[thiscf] = 1;
-    $1 = $2 = "";
-    default_set[thiscf] = $0;
-  }
+  $1 = $2 = "";
+  default_set[++ndefault_set] = thiscf "\n" $0;
   next
 }
 
@@ -48,12 +45,21 @@ END {
     split(elt, x);
     cf = x[1];
     lib = x[2];
-    if (default_setname && !(cf in default_set) && config ~ cf)
-      default_set[cf] = default_setname;
-    set = (elt in versions) ? versions[elt] : default_set[cf];
-    line = set ? (lib FS numbers[elt] FS set) : (lib FS numbers[elt]);
     for (c in configs)
       if (c ~ cf) {
+	if (elt in versions)
+	  set = versions[elt];
+	else {
+	  set = (c == config) ? default_setname : "";
+	  for (i = 1; i <= ndefault_set; ++i) {
+	    split(default_set[i], x, "\n");
+	    if (c ~ x[1]) {
+	      set = x[2];
+	      break;
+	    }
+	  }
+	}
+	line = set ? (lib FS numbers[elt] FS set) : (lib FS numbers[elt]);
 	if (!((c FS lib) in lineorder) || order[elt] < lineorder[c FS lib]) {
 	  lineorder[c FS lib] = order[elt];
 	  lines[c FS lib] = configs[c] FS line;