* ld-mmix/b-nosym.d, ld-mmix/sec-6.d: Tweak for change in symbol

	output.
	* ld-mmix/sec-7m.d, ld-mmix/sec-7a.s, ld-mmix/sec-7b.s,
	ld-mmix/sec-7c.s, ld-mmix/sec-7d.s, ld-mmix/sec-7e.s: New test.

9 files changed, 79 insertions, 4 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index b99b915..93c5a05 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2002-02-17  Hans-Peter Nilsson  <hp@bitrange.com>
 
+	* ld-mmix/b-nosym.d, ld-mmix/sec-6.d: Tweak for change in symbol
+	output.
+	* ld-mmix/sec-7m.d, ld-mmix/sec-7a.s, ld-mmix/sec-7b.s,
+	ld-mmix/sec-7c.s, ld-mmix/sec-7d.s, ld-mmix/sec-7e.s: New test.
+
 	* ld-mmix/bpo-22.d: New test.
 
 	* ld-mmix/local12.d (Sections): Match any LMA for .data, .sbss,
diff --git a/ld/testsuite/ld-mmix/b-nosym.d b/ld/testsuite/ld-mmix/b-nosym.d
index 11576df..9c00d71 100644
--- a/ld/testsuite/ld-mmix/b-nosym.d
+++ b/ld/testsuite/ld-mmix/b-nosym.d
@@ -3,12 +3,13 @@
 #source: b-nosym.s
 #ld: --oformat binary
 #objcopy_linked_file:
-#objdump: -st
+#objdump: -st 2>/dev/null
 
-.*:     file format mmo
+# Note that we have to redirect stderr when objdumping to get rid of the
+# "no symbols" message that would otherwise cause a spurious failure and
+# which we seemingly can't identify or prune in another way.
 
-SYMBOL TABLE:
-0+4 g       \.text Main
+.*:     file format mmo
 
 Contents of section \.text:
  0000 e3fd0001 e3fd0004                    .*
diff --git a/ld/testsuite/ld-mmix/sec-6.d b/ld/testsuite/ld-mmix/sec-6.d
index ea4f6bc..5b692e2 100644
--- a/ld/testsuite/ld-mmix/sec-6.d
+++ b/ld/testsuite/ld-mmix/sec-6.d
@@ -23,6 +23,7 @@ Idx Name          Size      VMA               LMA               File off  Algn
   1 \.debug_frame  0+10  0+  0+  0+  2\*\*2
                   CONTENTS, READONLY, DEBUGGING
 SYMBOL TABLE:
+0+ g       \.text Main
 0+ g       \.text _start
 0+8 g       \.text debugb
 2000000000000000 g       \*ABS\* __bss_start
diff --git a/ld/testsuite/ld-mmix/sec-7a.s b/ld/testsuite/ld-mmix/sec-7a.s
new file mode 100644
index 0000000..607150b
--- /dev/null
+++ b/ld/testsuite/ld-mmix/sec-7a.s
@@ -0,0 +1,6 @@
+ .section .debug_info
+ .byte 42
+ .rept 32763
+ .byte 0
+ .endr
+ .byte 43
diff --git a/ld/testsuite/ld-mmix/sec-7b.s b/ld/testsuite/ld-mmix/sec-7b.s
new file mode 100644
index 0000000..77474b2
--- /dev/null
+++ b/ld/testsuite/ld-mmix/sec-7b.s
@@ -0,0 +1,6 @@
+ .section .debug_info
+ .byte 44
+ .rept 32764
+ .byte 0
+ .endr
+ .byte 45
diff --git a/ld/testsuite/ld-mmix/sec-7c.s b/ld/testsuite/ld-mmix/sec-7c.s
new file mode 100644
index 0000000..0631bfb
--- /dev/null
+++ b/ld/testsuite/ld-mmix/sec-7c.s
@@ -0,0 +1,6 @@
+ .section .debug_info
+ .byte 46
+ .rept 32765
+ .byte 0
+ .endr
+ .byte 47
diff --git a/ld/testsuite/ld-mmix/sec-7d.s b/ld/testsuite/ld-mmix/sec-7d.s
new file mode 100644
index 0000000..fe464e4
--- /dev/null
+++ b/ld/testsuite/ld-mmix/sec-7d.s
@@ -0,0 +1,6 @@
+ .section .debug_info
+ .byte 48
+ .rept 32766
+ .byte 0
+ .endr
+ .byte 49
diff --git a/ld/testsuite/ld-mmix/sec-7e.s b/ld/testsuite/ld-mmix/sec-7e.s
new file mode 100644
index 0000000..50b2281
--- /dev/null
+++ b/ld/testsuite/ld-mmix/sec-7e.s
@@ -0,0 +1,6 @@
+ .section .debug_info
+ .byte 50
+ .rept 32767
+ .byte 0
+ .endr
+ .byte 51
diff --git a/ld/testsuite/ld-mmix/sec-7m.d b/ld/testsuite/ld-mmix/sec-7m.d
new file mode 100644
index 0000000..c744954
--- /dev/null
+++ b/ld/testsuite/ld-mmix/sec-7m.d
@@ -0,0 +1,38 @@
+#source: start.s
+#source: sec-7a.s
+#source: sec-7b.s
+#source: sec-7c.s
+#source: sec-7d.s
+#source: sec-7e.s
+#ld: -m mmo
+#objcopy_linked_file:
+#objdump: -hs
+
+# When producing mmo output: sections with an input length not a
+# multiple of 4, and whose total length in linked output
+# exceeded the "chunk size" (32768), would get to-4-padding
+# inserted at each chunk division.  Also check that section
+# sizes aren't rounded up at objcopy.
+
+.*:     file format mmo
+
+Sections:
+Idx Name[ ]+Size[ ]+VMA[ ]+LMA[ ]+File off  Algn
+  0 \.text[ ]+0+4  0+  0+  0+  2\*\*2
+[ ]+CONTENTS, ALLOC, LOAD, CODE
+  1 \.debug_info   0+27ffb  0+  0+  0+  2\*\*2
+[ ]+CONTENTS, READONLY, DEBUGGING
+Contents of section \.text:
+ 0000 e3fd0001[ ]+.*
+Contents of section \.debug_info:
+ 0000 2a000000 00000000 00000000 00000000  .*
+#...
+ 7ff0 00000000 00000000 00000000 2b2c0000  .*
+#...
+ fff0 00000000 00000000 00002d2e 00000000  .*
+#...
+ 17ff0 00000000 00000000 002f3000 00000000  .*
+#...
+ 1fff0 00000000 00000000 00313200 00000000  .*
+#...
+ 27ff0 00000000 00000000 000033[ ]+.*