Revert "Fix the test for PR 18963 so that it will work on 16-bit targets."

This reverts commit 7a1a12f4d1c6152017142d74c736dc1cc6b0e81c.

3 files changed, 15 insertions, 24 deletions

diff --git a/ld/testsuite/ld-scripts/pr18963.d b/ld/testsuite/ld-scripts/pr18963.d
index 293887f..699db59 100644
--- a/ld/testsuite/ld-scripts/pr18963.d
+++ b/ld/testsuite/ld-scripts/pr18963.d
@@ -1,22 +1,15 @@
-# source: pr18963.s
+# source: data.s
 # ld: -T pr18963.t
 # nm: -B -n
-# notarget: tic*-*-*  ia64-*-* *-*-aix* microblaze-*-* *-*-vms
-# Skip this test on targets which have sizeof(byte) != sizeof(octet).
-# On these targets the ".lcomm _bss,0x100" directive does not create
-# a 0x100 byte long section as needed by the test.
-# Also skip it for AIX and IA64 targets because they use a non-standard version of .lcomm.
-# And skip for the microblaze target which does not support a .bss section at all.
-# Plus skip for VMS based targets as the linker automatically adds extra libraries that may not be present in a cross build.
 
 #...
-0+a00 . D
+0+70000 A D
 #...
-0+a00 . E
+0+70000 A E
 #...
-[02]+b00 T A
+0+80000 T A
 #...
-[02]+c00 D B
+0+90000 T B
 #...
-[02]+d00 . C
+0+a0000 D C
 #pass
diff --git a/ld/testsuite/ld-scripts/pr18963.s b/ld/testsuite/ld-scripts/pr18963.s
deleted file mode 100644
index 6a59f55..0000000
--- a/ld/testsuite/ld-scripts/pr18963.s
+++ /dev/null
@@ -1,7 +0,0 @@
-	.globl	_start
-	.text
-_start:
-	.=.+0x800
-	.data
-	.=.+0x100
-	.lcomm _bss,0x100
diff --git a/ld/testsuite/ld-scripts/pr18963.t b/ld/testsuite/ld-scripts/pr18963.t
index 94f8f16..830ded7 100644
--- a/ld/testsuite/ld-scripts/pr18963.t
+++ b/ld/testsuite/ld-scripts/pr18963.t
@@ -1,20 +1,25 @@
 SECTIONS
 {
-  .text 0x300 :
+  . = 0x80000;
+  A = .;
+  .text :
   {
+    _start = .;
     *(.text)
+    . = 0x10000;
   }
-  A = .;
+  B = .;
   .data :
   {
     *(.data)
+    . = 0x10000;
   }
-  B = .;
+  C = .;
   .bss :
   {
     *(.bss)
+    . = 0x10000;
   }
-  C = .;
   D = A - C + B;
   E = A + B - C;
   /DISCARD/ : {*(*)}