diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index d11ea22c4e..5b53e54a21 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,18 @@
+2001-11-19  H.J. Lu <hjl@gnu.org>
+
+	* ld-elfvsb/define.s: Mark all global lables as object.
+
+	* ld-elfvsb/hidden0.d: Match large section number.
+	* ld-elfvsb/hidden1.d: Likewise.
+	* ld-elfvsb/internal0.d: Likewise.
+	* ld-elfvsb/internal1.d: Likewise.
+	* ld-elfvsb/protected0.d: Likewise.
+	* ld-elfvsb/protected1.d: Likewise.
+
+	* ld-elfvsb/hidden0.d: Change NOTYPE to OBJECT.
+	* ld-elfvsb/internal0.d: Likewise.
+	* ld-elfvsb/protected0.d: Likewise.
+
 2001-11-15  H.J. Lu <hjl@gnu.org>
 
 	* ld-sh/ld-r-1.d: Updated.
diff --git a/ld/testsuite/ld-elfvsb/define.s b/ld/testsuite/ld-elfvsb/define.s
index 3d29f7c0c3..66cf4c2b51 100644
--- a/ld/testsuite/ld-elfvsb/define.s
+++ b/ld/testsuite/ld-elfvsb/define.s
@@ -1,6 +1,10 @@
+	.data
 	.globl protected
+	.type protected,@object
 protected:
 	.globl hidden
+	.type hidden,@object
 hidden:
 	.globl internal
+	.type internal,@object
 internal:
diff --git a/ld/testsuite/ld-elfvsb/hidden0.d b/ld/testsuite/ld-elfvsb/hidden0.d
index 33356c1997..46fc647568 100644
--- a/ld/testsuite/ld-elfvsb/hidden0.d
+++ b/ld/testsuite/ld-elfvsb/hidden0.d
@@ -6,5 +6,5 @@
 Symbol table '.symtab' contains .* entries:
    Num:    Value[ 	]+Size Type    Bind   Vis      Ndx Name
 #...
-     .: [0-9a-fA-F]*     0 NOTYPE  GLOBAL HIDDEN    . hidden
+[ 	]*[0-9]+: [0-9a-fA-F]*     0 OBJECT  GLOBAL HIDDEN    . hidden
 #pass
diff --git a/ld/testsuite/ld-elfvsb/hidden1.d b/ld/testsuite/ld-elfvsb/hidden1.d
index 30032b2913..667f1088a8 100644
--- a/ld/testsuite/ld-elfvsb/hidden1.d
+++ b/ld/testsuite/ld-elfvsb/hidden1.d
@@ -5,5 +5,5 @@
 Symbol table '.symtab' contains .* entries:
    Num:    Value[ 	]+Size Type    Bind   Vis      Ndx Name
 #...
-     .: [0-9a-fA-F]*     0 NOTYPE  GLOBAL HIDDEN  UND hidden
+[ 	]*[0-9]+: [0-9a-fA-F]*     0 NOTYPE  GLOBAL HIDDEN  UND hidden
 #pass
diff --git a/ld/testsuite/ld-elfvsb/internal0.d b/ld/testsuite/ld-elfvsb/internal0.d
index 259ed6d0dc..a42ae02ffb 100644
--- a/ld/testsuite/ld-elfvsb/internal0.d
+++ b/ld/testsuite/ld-elfvsb/internal0.d
@@ -6,5 +6,5 @@
 Symbol table '.symtab' contains .* entries:
    Num:    Value[ 	]+Size Type    Bind   Vis      Ndx Name
 #...
-     .: [0-9a-fA-F]*     0 NOTYPE  GLOBAL INTERNAL    . internal
+[ 	]*[0-9]+: [0-9a-fA-F]*     0 OBJECT  GLOBAL INTERNAL    . internal
 #pass
diff --git a/ld/testsuite/ld-elfvsb/internal1.d b/ld/testsuite/ld-elfvsb/internal1.d
index 2d36bba625..c110ac62f4 100644
--- a/ld/testsuite/ld-elfvsb/internal1.d
+++ b/ld/testsuite/ld-elfvsb/internal1.d
@@ -5,5 +5,5 @@
 Symbol table '.symtab' contains .* entries:
    Num:    Value[ 	]+Size Type    Bind   Vis      Ndx Name
 #...
-     .: [0-9a-fA-F]*     0 NOTYPE  GLOBAL INTERNAL  UND internal
+[ 	]*[0-9]+: [0-9a-fA-F]*     0 NOTYPE  GLOBAL INTERNAL  UND internal
 #pass
diff --git a/ld/testsuite/ld-elfvsb/protected0.d b/ld/testsuite/ld-elfvsb/protected0.d
index 56bbdd40a0..48b7885e45 100644
--- a/ld/testsuite/ld-elfvsb/protected0.d
+++ b/ld/testsuite/ld-elfvsb/protected0.d
@@ -6,5 +6,5 @@
 Symbol table '.symtab' contains .* entries:
    Num:    Value[ 	]+Size Type    Bind   Vis      Ndx Name
 #...
-     .: [0-9a-fA-F]*     0 NOTYPE  GLOBAL PROTECTED    . protected
+[ 	]*[0-9]+: [0-9a-fA-F]*     0 OBJECT  GLOBAL PROTECTED    . protected
 #pass
diff --git a/ld/testsuite/ld-elfvsb/protected1.d b/ld/testsuite/ld-elfvsb/protected1.d
index beaa4444f5..2f4931ae42 100644
--- a/ld/testsuite/ld-elfvsb/protected1.d
+++ b/ld/testsuite/ld-elfvsb/protected1.d
@@ -5,5 +5,5 @@
 Symbol table '.symtab' contains .* entries:
    Num:    Value[ 	]+Size Type    Bind   Vis      Ndx Name
 #...
-     .: [0-9a-fA-F]*     0 NOTYPE  GLOBAL PROTECTED  UND protected
+[ 	]*[0-9]+: [0-9a-fA-F]*     0 NOTYPE  GLOBAL PROTECTED  UND protected
 #pass