Fix bug in firstversions.awk version range handling.

(cherry picked from commit e034841eac8e96fa255c52864be06352ee7981ae)

diff --git a/ChangeLog b/ChangeLog
index 88280958dd409cd3622a860d820b2cfbacb63b2c..267266b4cc8576256c06118248bc0ae3c58fa74c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -131,6 +131,10 @@
        * sysdeps/i386/fpu/feupdateenv.c (__feupdateenv) Invoke __feraiseexcept
        instead of feraiseexcept.
 
+2012-01-28  Chris Metcalf  <cmetcalf@tilera.com>
+
+       * scripts/firstversions.awk: Fix bug in version range handling.
+
 2012-01-26  Ulrich Drepper  <drepper@gmail.com>
 
        [BZ #13583]

diff --git a/NEWS b/NEWS
index a6dc6a9856b48bbeb842839319b1bc054c968f05..7a84d2cc33a486a91853a20ed00c6937d4321a1f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Version 2.15.1
 * The following bugs are resolved with this release:
 
   411, 2547, 2548, 11365, 11494, 13583, 13731, 13732, 13733, 13747, 13748,
-  13749, 13753, 13774, 14059
+  13749, 13753, 13771, 13774, 14059
 
 Version 2.15
 

diff --git a/scripts/firstversions.awk b/scripts/firstversions.awk
index 4a20fc0f9dc9cf2630c8c5146bc5c0c9bf895add..ccde4b59b444351e58338380432f515840766ee8 100644 (file)
--- a/scripts/firstversions.awk
+++ b/scripts/firstversions.awk
@@ -54,9 +54,13 @@ $1 == "}" {
     while (vers_compare($1, v) >= 0) {
       delete firstversion[thislib, idx[thislib]];
       idx[thislib]++;
-      if ((thislib, idx[thislib]) in firstversion)
+      if ((thislib, idx[thislib]) in firstversion) {
+        # If we're skipping a referenced version to jump ahead to a
+        # later version, synthesize the earlier referenced version now.
+        if (v != $1 && (thislib, v) in usedversion)
+          print "  " v;
         v = firstversion[thislib, idx[thislib]];
-      else
+      } else
         break;
     }
     if ($1 == v || $1 == f)