From 69e72f4e91bc3b4aa05108ecd763078497c7d584 Mon Sep 17 00:00:00 2001
From: patrick <patrick@openbsd.org>
Date: Sat, 10 Feb 2018 06:52:47 +0000
Subject: [PATCH] Put the ldscript parts into a single file instead of storing
 it as head and tail and cat(1) it together.  It was maybe needed when ports
 needed different contents, but now it's just a headache.

ok deraadt@
---
 .../arm/conf/{ldscript.tail => kern.ldscript} | 26 ++++++++++++++++++-
 sys/arch/arm/conf/ldscript.head               | 26 -------------------
 sys/arch/armv7/conf/Makefile.armv7            |  6 ++---
 3 files changed, 28 insertions(+), 30 deletions(-)
 rename sys/arch/arm/conf/{ldscript.tail => kern.ldscript} (66%)
 delete mode 100644 sys/arch/arm/conf/ldscript.head

diff --git a/sys/arch/arm/conf/ldscript.tail b/sys/arch/arm/conf/kern.ldscript
similarity index 66%
rename from sys/arch/arm/conf/ldscript.tail
rename to sys/arch/arm/conf/kern.ldscript
index 36579dcaa4a..77fc9948f47 100644
--- a/sys/arch/arm/conf/ldscript.tail
+++ b/sys/arch/arm/conf/kern.ldscript
@@ -1,4 +1,28 @@
-/*     $OpenBSD: ldscript.tail,v 1.5 2017/10/26 19:01:06 kettenis Exp $         */
+/*	$OpenBSD: kern.ldscript,v 1.1 2018/02/10 06:52:47 patrick Exp $	*/
+/*	$NetBSD: ldscript.evbarm,v 1.2 2003/03/05 23:54:22 thorpej Exp $	*/
+
+OUTPUT_ARCH(arm)
+ENTRY(KERNEL_BASE_phys)
+SECTIONS
+{
+  KERNEL_BASE_phys = @KERNEL_BASE_PHYS@;
+  KERNEL_BASE_virt = @KERNEL_BASE_VIRT@;
+
+  /* Kernel start: */
+  .start (KERNEL_BASE_phys) :
+  {
+  *(.start)
+  } =0
+
+  /* Read-only sections, merged into text segment: */
+  .text (KERNEL_BASE_virt + SIZEOF(.start)) :
+  AT (LOADADDR(.start) + SIZEOF(.start))
+  {
+    *(.text)
+    *(.text.*)
+    *(.stub)
+    *(.glue_7t) *(.glue_7)
+    *(.rodata) *(.rodata.*)
   } =0
   PROVIDE (__etext = .);
   PROVIDE (_etext = .);
diff --git a/sys/arch/arm/conf/ldscript.head b/sys/arch/arm/conf/ldscript.head
deleted file mode 100644
index 7cc5b7fa873..00000000000
--- a/sys/arch/arm/conf/ldscript.head
+++ /dev/null
@@ -1,26 +0,0 @@
-/*     $OpenBSD: ldscript.head,v 1.2 2005/01/02 19:57:57 drahn Exp $         */
-/*     $NetBSD: ldscript.evbarm,v 1.2 2003/03/05 23:54:22 thorpej Exp $        
-*/
-
-OUTPUT_ARCH(arm)
-ENTRY(KERNEL_BASE_phys)
-SECTIONS
-{
-  KERNEL_BASE_phys = @KERNEL_BASE_PHYS@;
-  KERNEL_BASE_virt = @KERNEL_BASE_VIRT@;
-
-  /* Kernel start: */
-  .start (KERNEL_BASE_phys) :
-  {
-  *(.start)
-  } =0
-
-  /* Read-only sections, merged into text segment: */
-  .text (KERNEL_BASE_virt + SIZEOF(.start)) :
-  AT (LOADADDR(.start) + SIZEOF(.start))
-  {
-    *(.text)
-    *(.text.*)
-    *(.stub)
-    *(.glue_7t) *(.glue_7)
-    *(.rodata) *(.rodata.*)
diff --git a/sys/arch/armv7/conf/Makefile.armv7 b/sys/arch/armv7/conf/Makefile.armv7
index 9b77191dcc7..fe0564e4a8a 100644
--- a/sys/arch/armv7/conf/Makefile.armv7
+++ b/sys/arch/armv7/conf/Makefile.armv7
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.armv7,v 1.39 2018/02/09 03:59:15 tb Exp $
+#	$OpenBSD: Makefile.armv7,v 1.40 2018/02/10 06:52:47 patrick Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -119,8 +119,8 @@ mcount.o: $S/lib/libkern/mcount.c Makefile
 ioconf.o: ioconf.c
 	${NORMAL_C}
 
-ld.script: ${_archdir}/conf/ldscript.head ${_archdir}/conf/ldscript.tail
-	cat ${_archdir}/conf/ldscript.head ${_archdir}/conf/ldscript.tail | \
+ld.script: ${_archdir}/conf/kern.ldscript
+	cat ${_archdir}/conf/kern.ldscript | \
 	    sed -e 's/@KERNEL_BASE_PHYS@/0/' \
 	    -e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
 	    -e 's/(KERNEL_BASE_phys)/(KERNEL_BASE_virt)/' > ld.script
-- 
2.20.1