* scripts/abilist.awk: Grok .opd foo plus .text .foo as "foo F" alone.

2 files changed, 11 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c6e7164720..1fad0b81fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-03-30  Roland McGrath  <roland@redhat.com>
 
+	* scripts/abilist.awk: Grok .opd foo plus .text .foo as "foo F" alone.
+
 	* intl/po2test.sed: Anchor substitution regexps to fix last change.
 
 2003-03-29  Paolo Bonzini  <bonzini@gnu.org>
diff --git a/scripts/abilist.awk b/scripts/abilist.awk
index c0b123f528..efadc1cbf8 100644
--- a/scripts/abilist.awk
+++ b/scripts/abilist.awk
@@ -12,6 +12,8 @@ BEGIN {
 /[^ :]+\.so\.[0-9]+:[ 	]+.file format .*$/ {
   emit(0);
 
+  seen_opd = 0;
+
   sofullname = $1;
   sub(/:$/, "", sofullname);
   soname = sofullname;
@@ -52,8 +54,11 @@ $2 == "g" || $2 == "w" && NF == 7 {
     type = "T";
   }
   else if (type == "D" && $4 == ".opd") {
-    type = "O";
+    type = "F";
     size = "";
+    if (seen_opd < 0)
+      type = "O";
+    seen_opd = 1;
   }
   else if ($4 == "*ABS*") {
     type = "A";
@@ -63,6 +68,9 @@ $2 == "g" || $2 == "w" && NF == 7 {
     type = "D";
   }
   else if (type == "DF") {
+    if (symbol ~ /^\./ && seen_opd >= 0)
+      next;
+    seen_opd = -1;
     type = "F";
     size = "";
   }