This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

ld testsuite tweaks


Allows tests to pass on more targets.

	* ld-elf/sec64k.exp: Add "main" symbol.  Use dc.a for addresses.
	Cater for different address sizes.  Match end of line when
	comparing symbols.
	* ld-elf/start.s: Use dc.a for addresses.

Index: ld/testsuite/ld-elf/sec64k.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elf/sec64k.exp,v
retrieving revision 1.10
diff -u -p -r1.10 sec64k.exp
--- ld/testsuite/ld-elf/sec64k.exp	2 Jun 2006 00:31:59 -0000	1.10
+++ ld/testsuite/ld-elf/sec64k.exp	5 Jun 2006 07:49:10 -0000
@@ -50,12 +50,16 @@ for { set i 0 } { $i < $max_sec / $secs_
     }
 
     if { $i == 0 } {
+	puts $ofd " .global start"
+	puts $ofd "start:"
 	puts $ofd " .global _start"
-	puts $ofd " .global __start"
 	puts $ofd "_start:"
+	puts $ofd " .global __start"
 	puts $ofd "__start:"
+	puts $ofd " .global main"
+	puts $ofd "main:"
 	puts $ofd " .global foo_0"
-	puts $ofd "foo_0: .long 0"
+	puts $ofd "foo_0: .dc.a 0"
     }
 
     # Make sure the used section is not covered by common linker scripts.
@@ -65,9 +69,9 @@ for { set i 0 } { $i < $max_sec / $secs_
     puts $ofd "  .section .foo.\\secn,\"ax\""
     puts $ofd "  .global foo_\\secn"
     puts $ofd "foo_\\secn:"
-    puts $ofd "  .long foo_\\secp"
+    puts $ofd "  .dc.a foo_\\secp"
     puts $ofd "bar_\\secn:"
-    puts $ofd "  .long bar_\\secn"
+    puts $ofd "  .dc.a bar_\\secn"
     puts $ofd " .endm"
     puts $ofd " secn = [expr $i * $secs_per_file]"
     puts $ofd " .rept $secs_per_file"
@@ -103,16 +107,16 @@ puts $ofd "  \\\[65536\\\] (.rel\[a\]?)?
 puts $ofd "#..."
 puts $ofd " 340..: 0+\[ \]+0\[ \]+SECTION\[ \]+LOCAL\[ \]+DEFAULT\[ \]+68... "
 puts $ofd "#..."
-puts $ofd " 340..: 0+4\[ \]+0\[ \]+NOTYPE\[ \]+LOCAL\[ \]+DEFAULT\[ \]+\[23\] bar_1"
+puts $ofd " 340..: 0+(2|4|8)\[ \]+0\[ \]+NOTYPE\[ \]+LOCAL\[ \]+DEFAULT\[ \]+\[23\] bar_1$"
 puts $ofd "#..."
-puts $ofd ".* bar_34000"
+puts $ofd ".* bar_34000$"
 puts $ofd "#..."
 # Global symbols are not in "alphanumeric" order, so we just check
 # that the first and the last are present in any order (assuming no
 # duplicates).
-puts $ofd ".* (\[0-9\] foo_1|68... foo_34000)"
+puts $ofd ".* (\[0-9\] foo_1|68... foo_34000)$"
 puts $ofd "#..."
-puts $ofd ".* (\[0-9\] foo_1|68... foo_34000)"
+puts $ofd ".* (\[0-9\] foo_1|68... foo_34000)$"
 puts $ofd "#pass"
 close $ofd
 run_dump_test "tmpdir/$test1"
@@ -134,16 +138,16 @@ puts $ofd "  \\\[65536\\\] \\.foo\\.\[0-
 puts $ofd "#..."
 puts $ofd " 660..: \[0-9a-f\]+\[ \]+0\[ \]+SECTION\[ \]+LOCAL\[ \]+DEFAULT\[ \]+662.. "
 puts $ofd "#..."
-puts $ofd " 660..: \[0-9a-f\]+\[ \]+0\[ \]+NOTYPE\[ \]+LOCAL\[ \]+DEFAULT\[ \]+\[0-9\] bar_1"
+puts $ofd " 660..: \[0-9a-f\]+\[ \]+0\[ \]+NOTYPE\[ \]+LOCAL\[ \]+DEFAULT\[ \]+\[0-9\] bar_1$"
 puts $ofd "#..."
-puts $ofd ".* bar_66000"
+puts $ofd ".* bar_66000$"
 puts $ofd "#..."
 # Global symbols are not in "alphanumeric" order, so we just check
 # that the first and the last are present in any order (assuming no
 # duplicates).
-puts $ofd ".* (\[0-9\] foo_1|66... foo_66000)"
+puts $ofd ".* (\[0-9\] foo_1|66... foo_66000)$"
 puts $ofd "#..."
-puts $ofd ".* (\[0-9\] foo_1|66... foo_66000)"
+puts $ofd ".* (\[0-9\] foo_1|66... foo_66000)$"
 puts $ofd "#pass"
 close $ofd
 run_dump_test "tmpdir/$test2"
Index: ld/testsuite/ld-elf/start.s
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elf/start.s,v
retrieving revision 1.3
diff -u -p -r1.3 start.s
--- ld/testsuite/ld-elf/start.s	22 May 2006 08:45:18 -0000	1.3
+++ ld/testsuite/ld-elf/start.s	5 Jun 2006 07:49:10 -0000
@@ -1,10 +1,10 @@
 	.text
+	.global start	/* Used by SH targets.  */
+start:
 	.global _start
 _start:
 	.global __start
 __start:
-	.global start	/* Used by SH targets.  */
-start:
 	.global main	/* Used by HPPA targets.  */
 main:
-	.long 0
+	.dc.a 0

-- 
Alan Modra
IBM OzLabs - Linux Technology Centre


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]