Merge remote-tracking branch 'origin/cmetcalf/tile_firstversions'

Conflicts:
	ChangeLog

2 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3f60309b7b..98ac48207c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-01-28  Chris Metcalf  <cmetcalf@tilera.com>
 
+	* scripts/firstversions.awk: Fix bug in version range handling.
+
 	* sysdeps/unix/sysv/linux/faccessat.c (faccessat): Call __fxstatat64.
 
 2012-01-28  Ulrich Drepper  <drepper@gmail.com>
diff --git a/scripts/firstversions.awk b/scripts/firstversions.awk
index 4a20fc0f9d..ccde4b59b4 100644
--- 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)