diff options
| author | Roland McGrath <roland@hack.frob.com> | 2012-01-30 09:48:55 -0800 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2012-01-30 09:48:55 -0800 |
| commit | 53fb8811fd7873ab67d55d72386a303e9734603a (patch) | |
| tree | 095841d4e2c8fa3754f8ba0040d61009f709a43c | |
| parent | 631581072026701ffd4f3490a68d1e752adaf94f (diff) | |
| parent | e034841eac8e96fa255c52864be06352ee7981ae (diff) | |
| download | glibc-53fb8811fd7873ab67d55d72386a303e9734603a.tar.gz glibc-53fb8811fd7873ab67d55d72386a303e9734603a.tar.xz glibc-53fb8811fd7873ab67d55d72386a303e9734603a.zip | |
Merge remote-tracking branch 'origin/cmetcalf/tile_firstversions'
Conflicts: ChangeLog
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | scripts/firstversions.awk | 8 |
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) |