2003-05-06 H.J. Lu <hjl@gnu.org>

	* ld-elfvers/vers.exp (objdump_versionstuff): Support comment
	in expected version file.

	* ld-elfvers/vers25b.c: Add a line of comment.
	* ld-elfvers/vers25b.dsym: Likwise.
	* ld-elfvers/vers25b.ver: Likwise.
	* ld-elfvers/vers26b.dsym: Likwise.
	* ld-elfvers/vers26b.ver: Likwise.
	* ld-elfvers/vers27b.dsym: Likwise.
	* ld-elfvers/vers27b.ver: Likwise.
	* ld-elfvers/vers27c.c: Likwise.
	* ld-elfvers/vers27c.dsym: Likwise.
	* ld-elfvers/vers27c.ver: Likwise.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 10d1ddd..0e79c0f 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,19 @@
+2003-05-06  H.J. Lu <hjl@gnu.org>
+
+       * ld-elfvers/vers.exp (objdump_versionstuff): Support comment
+       in expected version file.
+
+       * ld-elfvers/vers25b.c: Add a line of comment.
+       * ld-elfvers/vers25b.dsym: Likwise.
+       * ld-elfvers/vers25b.ver: Likwise.
+       * ld-elfvers/vers26b.dsym: Likwise.
+       * ld-elfvers/vers26b.ver: Likwise.
+       * ld-elfvers/vers27b.dsym: Likwise.
+       * ld-elfvers/vers27b.ver: Likwise.
+       * ld-elfvers/vers27c.c: Likwise.
+       * ld-elfvers/vers27c.dsym: Likwise.
+       * ld-elfvers/vers27c.ver: Likwise.
+
 2003-05-04  H.J. Lu <hjl@gnu.org>
 
        * ld-elfvsb/main.c: Updated.

diff --git a/ld/testsuite/ld-elfvers/vers.exp b/ld/testsuite/ld-elfvers/vers.exp
index a26927e..c28733e 100644 (file)
--- a/ld/testsuite/ld-elfvers/vers.exp
+++ b/ld/testsuite/ld-elfvers/vers.exp
@@ -457,7 +457,11 @@ proc objdump_versionstuff { objdump object expectfile } {
 
        set f1 [open $tmpdir/objdump.out r]
        set f2 [open $expectfile r]
-       gets $f2 l2
+       while { [gets $f2 l2] != -1 } {
+           if { ![regexp "^#.*$" $l2] } then {
+               break
+           }
+       } 
        while { [gets $f1 l1] != -1 } {
            if { [string match $l2 $l1] } then {
                if { [gets $f2 l2] == -1 } then {

diff --git a/ld/testsuite/ld-elfvers/vers25b.c b/ld/testsuite/ld-elfvers/vers25b.c
index e69de29..b119c69 100644 (file)
--- a/ld/testsuite/ld-elfvers/vers25b.c
+++ b/ld/testsuite/ld-elfvers/vers25b.c
@@ -0,0 +1 @@
+/* Empty file  */

diff --git a/ld/testsuite/ld-elfvers/vers25b.dsym b/ld/testsuite/ld-elfvers/vers25b.dsym
index e69de29..71923c3 100644 (file)
--- a/ld/testsuite/ld-elfvers/vers25b.dsym
+++ b/ld/testsuite/ld-elfvers/vers25b.dsym
@@ -0,0 +1 @@
+# Empty file.

diff --git a/ld/testsuite/ld-elfvers/vers25b.ver b/ld/testsuite/ld-elfvers/vers25b.ver
index e69de29..932b798 100644 (file)
--- a/ld/testsuite/ld-elfvers/vers25b.ver
+++ b/ld/testsuite/ld-elfvers/vers25b.ver
@@ -0,0 +1 @@
+# Empty file

diff --git a/ld/testsuite/ld-elfvers/vers26b.dsym b/ld/testsuite/ld-elfvers/vers26b.dsym
index e69de29..932b798 100644 (file)
--- a/ld/testsuite/ld-elfvers/vers26b.dsym
+++ b/ld/testsuite/ld-elfvers/vers26b.dsym
@@ -0,0 +1 @@
+# Empty file

diff --git a/ld/testsuite/ld-elfvers/vers26b.ver b/ld/testsuite/ld-elfvers/vers26b.ver
index e69de29..932b798 100644 (file)
--- a/ld/testsuite/ld-elfvers/vers26b.ver
+++ b/ld/testsuite/ld-elfvers/vers26b.ver
@@ -0,0 +1 @@
+# Empty file

diff --git a/ld/testsuite/ld-elfvers/vers27b.dsym b/ld/testsuite/ld-elfvers/vers27b.dsym
index e69de29..932b798 100644 (file)
--- a/ld/testsuite/ld-elfvers/vers27b.dsym
+++ b/ld/testsuite/ld-elfvers/vers27b.dsym
@@ -0,0 +1 @@
+# Empty file

diff --git a/ld/testsuite/ld-elfvers/vers27b.ver b/ld/testsuite/ld-elfvers/vers27b.ver
index e69de29..932b798 100644 (file)
--- a/ld/testsuite/ld-elfvers/vers27b.ver
+++ b/ld/testsuite/ld-elfvers/vers27b.ver
@@ -0,0 +1 @@
+# Empty file

diff --git a/ld/testsuite/ld-elfvers/vers27c.c b/ld/testsuite/ld-elfvers/vers27c.c
index e69de29..b119c69 100644 (file)
--- a/ld/testsuite/ld-elfvers/vers27c.c
+++ b/ld/testsuite/ld-elfvers/vers27c.c
@@ -0,0 +1 @@
+/* Empty file  */

diff --git a/ld/testsuite/ld-elfvers/vers27c.dsym b/ld/testsuite/ld-elfvers/vers27c.dsym
index e69de29..932b798 100644 (file)
--- a/ld/testsuite/ld-elfvers/vers27c.dsym
+++ b/ld/testsuite/ld-elfvers/vers27c.dsym
@@ -0,0 +1 @@
+# Empty file

diff --git a/ld/testsuite/ld-elfvers/vers27c.ver b/ld/testsuite/ld-elfvers/vers27c.ver
index e69de29..932b798 100644 (file)
--- a/ld/testsuite/ld-elfvers/vers27c.ver
+++ b/ld/testsuite/ld-elfvers/vers27c.ver
@@ -0,0 +1 @@
+# Empty file