2005-05-05 Paul Brook <paul@codesourcery.com>

gas/testsuite/
	* lib/gas-defs.exp (regexp_diff): Pass test if last line is "#...".
ld/testsuite/
	* lib/ld-lib.exp (regexp_diff): Pass test if last line is "#...".
	* ld-elfweak/elfweak.exp: Run size2.d.
	* ld-elfwaek/size2.d: New file.
	* ld-elfwaek/size2a.s: New file.
	* ld-elfwaek/size2b.s: New file.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 2504e0cad4e76dd747b9baa2ac9f23ea0a47f865..d49061a7d5ad4272bbebab25566e84a3a116742c 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-05  Paul Brook  <paul@codesourcery.com>
+
+       * lib/gas-defs.exp (regexp_diff): Pass test if last line is "#...".
+
 2005-04-26  H.J. Lu  <hongjiu.lu@intel.com>
 
        * gas/all/assign.s: Make `x' and `y' global.

diff --git a/gas/testsuite/lib/gas-defs.exp b/gas/testsuite/lib/gas-defs.exp
index 9f933734bb901b131f9abda68ce6d0093069fdfa..87efa5e07a741571b3aee6ab311a7db8741185db 100644 (file)
--- a/gas/testsuite/lib/gas-defs.exp
+++ b/gas/testsuite/lib/gas-defs.exp
@@ -663,6 +663,7 @@ proc regexp_diff { file_1 file_2 } {
            } elseif [ string match "#..." $line_b ] {
                if { [gets $file_b line_b] == $eof } {
                    set end_2 1
+                   set diff_pass 1
                    break
                }
                verbose "looking for \"^$line_b$\"" 3

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 277374fb999d69042f5287ad94f9ea62c0897101..5e37a91d167e91efb551393b1b2917d5996ed982 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-05  Paul Brook  <paul@codesourcery.com>
+
+       * lib/ld-lib.exp (regexp_diff): Pass test if last line is "#...".
+       * ld-elfweak/elfweak.exp: Run size2.d.
+       * ld-elfwaek/size2.d: New file.
+       * ld-elfwaek/size2a.s: New file.
+       * ld-elfwaek/size2b.s: New file.
+
 2005-04-26  Mark Kettenis  <kettenis@gnu.org>
 
        * ld-fastcall/fastcall.exp: Don't run on i*86-*-openbsd*.

diff --git a/ld/testsuite/ld-elfweak/elfweak.exp b/ld/testsuite/ld-elfweak/elfweak.exp
index 1560a2955dd4cb42d82f4fc4d5ba69fc1eff5d20..9ea04b72de04e898e9fd4f75577476c16000e8b6 100644 (file)
--- a/ld/testsuite/ld-elfweak/elfweak.exp
+++ b/ld/testsuite/ld-elfweak/elfweak.exp
@@ -493,3 +493,6 @@ if ![ld_compile "$CC $CFLAGS" $srcdir/$subdir/size_main.c $tmpdir/size_main.o] {
 }
 
 build_exec "ELF weak size" size_main "size_main.o libsize_foo.so libsize_bar.so" "-Wl,-rpath,." size "" ""
+
+verbose "size2"
+run_dump_test $srcdir/$subdir/size2

diff --git a/ld/testsuite/ld-elfweak/size2.d b/ld/testsuite/ld-elfweak/size2.d
new file mode 100644 (file)
index 0000000..59d5489
--- /dev/null
+++ b/ld/testsuite/ld-elfweak/size2.d
@@ -0,0 +1,8 @@
+#source: size2a.s
+#source: size2b.s
+#ld:
+#readelf: -s
+Symbol table '.symtab' contains .* entries:
+#...
+    .*: [0-9a-f]* *1 *FUNC *GLOBAL *DEFAULT *[0-9] *_start
+#...

diff --git a/ld/testsuite/ld-elfweak/size2a.s b/ld/testsuite/ld-elfweak/size2a.s
new file mode 100644 (file)
index 0000000..d5252ce
--- /dev/null
+++ b/ld/testsuite/ld-elfweak/size2a.s
@@ -0,0 +1,6 @@
+       .text
+       .global _start
+       .type _start, "function"
+_start:
+       .byte 0
+       .size _start, 1

diff --git a/ld/testsuite/ld-elfweak/size2b.s b/ld/testsuite/ld-elfweak/size2b.s
new file mode 100644 (file)
index 0000000..d4afe02
--- /dev/null
+++ b/ld/testsuite/ld-elfweak/size2b.s
@@ -0,0 +1,7 @@
+       .text
+       .weak _start
+       .type _start, "function"
+_start:
+       .byte 0
+       .byte 0
+       .size _start, 2

diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index 48e9957e66400163b2ce6341b352d4bef3e049e7..2e27abb2bae4a428550313e91053e9122ca01524 100644 (file)
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -1029,6 +1029,7 @@ proc regexp_diff { file_1 file_2 } {
            } elseif [ string match "#..." $line_b ] {
                if { [gets $file_b line_b] == $eof } {
                    set end_2 1
+                   set diff_pass 1
                    break
                }
                verbose "looking for \"^$line_b$\"" 3