From 0203cad215219c3f78c5dff246fbc189946d06ce Mon Sep 17 00:00:00 2001
From: Stephen Casner <casner@acm.org>
Date: Fri, 17 Apr 2020 14:16:27 +0100
Subject: [PATCH] Fix the test for PR 18963 so that it will work on 16-bit
 targets.

	PR 18963
	* testsuite/ld-scripts/pr18963.t: Reduce section sizes to fit in
	16-bit address space.
	* testsuite/ld-scripts/pr18963.d: Likewise.
---
 ld/ChangeLog                      |  7 +++++++
 ld/testsuite/ld-scripts/pr18963.d | 14 +++++++++-----
 ld/testsuite/ld-scripts/pr18963.t |  8 ++++----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 095748b0d60..5b5ba5229d1 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2020-04-16  Stephen Casner  <casner@acm.org>
+
+	PR 18963
+	* testsuite/ld-scripts/pr18963.t: Reduce section sizes to fit in
+	16-bit address space.
+	* testsuite/ld-scripts/pr18963.d: Likewise.
+
 2020-04-17  Juan Manuel Guerrero  <juan.guerrero@gmx.de>
             Jan W. Jagersma  <jwjagersma@gmail.com>
 
diff --git a/ld/testsuite/ld-scripts/pr18963.d b/ld/testsuite/ld-scripts/pr18963.d
index 699db594ac3..875fe136ad7 100644
--- a/ld/testsuite/ld-scripts/pr18963.d
+++ b/ld/testsuite/ld-scripts/pr18963.d
@@ -1,15 +1,19 @@
 # source: data.s
 # ld: -T pr18963.t
 # nm: -B -n
+# notarget: *-*-aix* *-*-vms
+# Skip on AIX targets because they require non-empty sections.
+# Plus skip for VMS based targets as the linker automatically adds extra libraries that may not be present in a cross build.
+# 64-bit Cygwin targets always start their sections at 0x200000000 which is why the regexps include a 2.
 
 #...
-0+70000 A D
+0+700 A D
 #...
-0+70000 A E
+0+700 A E
 #...
-0+80000 T A
+[02]+800 T A
 #...
-0+90000 T B
+[02]+900 T B
 #...
-0+a0000 D C
+[02]+a00 D C
 #pass
diff --git a/ld/testsuite/ld-scripts/pr18963.t b/ld/testsuite/ld-scripts/pr18963.t
index 830ded78dd9..be0c61de0ac 100644
--- a/ld/testsuite/ld-scripts/pr18963.t
+++ b/ld/testsuite/ld-scripts/pr18963.t
@@ -1,24 +1,24 @@
 SECTIONS
 {
-  . = 0x80000;
+  . = 0x800;
   A = .;
   .text :
   {
     _start = .;
     *(.text)
-    . = 0x10000;
+    . = 0x100;
   }
   B = .;
   .data :
   {
     *(.data)
-    . = 0x10000;
+    . = 0x100;
   }
   C = .;
   .bss :
   {
     *(.bss)
-    . = 0x10000;
+    . = 0x100;
   }
   D = A - C + B;
   E = A + B - C;
-- 
2.30.2