Add a "-O 0" option to the linker section

[Alan Modra]

Only put labels in first column of tests, for hppa64-hpux.
Also trim off trailing whitespace.  The test will continue to fail on
hppa64-hpux until Dave's dummy milli.a testsuite change is committed.

diff --git a/ld/testsuite/ld-elf/merge5.a.s b/ld/testsuite/ld-elf/merge5.a.s
index 8fe6a6967f2..8a635d09834 100644
--- a/ld/testsuite/ld-elf/merge5.a.s
+++ b/ld/testsuite/ld-elf/merge5.a.s
@@ -1,4 +1,4 @@
-.section .rodata.str,"aMS","progbits",1 
-.global .merge1
-.merge1: 
-	.asciz "abc" 
+	.section .rodata.str,"aMS","progbits",1
+	.global .merge1
+.merge1:
+	.asciz "abc"
diff --git a/ld/testsuite/ld-elf/merge5.b.s b/ld/testsuite/ld-elf/merge5.b.s
index 79ac2fc4e6c..8ed36dfeacb 100644
--- a/ld/testsuite/ld-elf/merge5.b.s
+++ b/ld/testsuite/ld-elf/merge5.b.s
@@ -1,4 +1,4 @@
-.section .rodata.str,"aMS","progbits",1 
-.global .merge2
-.merge2: 
-	.asciz "abc" 
+	.section .rodata.str,"aMS","progbits",1
+	.global .merge2
+.merge2:
+	.asciz "abc"

-- 
Alan Modra