No longer build luna88k kernels as a.out binaries, now that we have a native

bootloader for ELF kernels.

2 files changed, 3 insertions, 60 deletions

diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k
index e64dd31895b..666907bfe10 100644
--- a/sys/arch/luna88k/conf/Makefile.luna88k
+++ b/sys/arch/luna88k/conf/Makefile.luna88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.luna88k,v 1.49 2013/10/15 19:23:28 guenther Exp $
+#	$OpenBSD: Makefile.luna88k,v 1.50 2013/10/30 18:20:59 miod Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -12,7 +12,6 @@
 
 SIZE?=	size
 STRIP?=	strip
-OBJCOPY?= objcopy
 
 # source tree is located via $S relative to the compilation directory
 .ifndef S
@@ -39,8 +38,7 @@ CMACHFLAGS+=	-fno-stack-protector
 COPTS?=		-O2
 CFLAGS=		${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE}
 AFLAGS=		-D_LOCORE -x assembler-with-cpp ${CWARNFLAGS} ${CMACHFLAGS}
-LINKFLAGS=	-T ${_machdir}/conf/ld.script -Ttext 0x20000 -e __start -X -N \
-		    --warn-common -nopie
+LINKFLAGS=	-Ttext 0x20000 -e __start -X -N --warn-common -nopie
 
 .if ${IDENT:M-DDDB_STRUCT}
 DB_STRUCTINFO=	db_structinfo.h
@@ -78,7 +76,7 @@ SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD=	@rm -f $@
 SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_HEAD} vers.o $${OBJS}'; \
 		${LD} ${LINKFLAGS} -o $@ ${SYSTEM_HEAD} vers.o ${OBJS}
-SYSTEM_LD_TAIL=	@${SIZE} $@
+SYSTEM_LD_TAIL=	@${SIZE} $@; chmod 755 $@
 
 DEBUG?=
 .if ${DEBUG} == "-g"
@@ -91,10 +89,6 @@ SYSTEM_LD_TAIL+=; \
 .else
 LINKFLAGS+=	-S -x
 .endif
-SYSTEM_LD_TAIL+=; \
-		echo ${OBJCOPY} -O a.out-m88k-openbsd --impure $@; \
-		${OBJCOPY} -O a.out-m88k-openbsd --impure $@; \
-		chmod 755 $@
 
 %LOAD
 
diff --git a/sys/arch/luna88k/conf/ld.script b/sys/arch/luna88k/conf/ld.script
deleted file mode 100644
index 9836ad241fd..00000000000
--- a/sys/arch/luna88k/conf/ld.script
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$OpenBSD: ld.script,v 1.1 2013/01/05 11:20:55 miod Exp $	*/
-
-/*
- * Copyright (c) 2012 Miodrag Vallat.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * This linker script is used to merge .rodata into .text and pad .text to
- * a page size. This allows objcopy to correctly be able to convert it to
- * an OMAGIC binary, suitable to be booted from the PROM.
- */
-OUTPUT_FORMAT("elf32-m88k")
-OUTPUT_ARCH(m88k)
-ENTRY(__start)
-SECTIONS
-{
-	.text :
-	{
-		*(.text)
-		*(.rodata*)
-		PROVIDE(etext = ABSOLUTE(.));
-		FILL(0xf4005800)
-		. = ALIGN(0x1000);
-	}
-	.data :
-	{
-		*(.data)
-		PROVIDE(edata = ABSOLUTE(.));
-	}
-	.bss :
-	{
-		*(.bss)
-	}
-	PROVIDE(end = ABSOLUTE(.));
-	/DISCARD/ :
-	{
-		*(.comment)
-	}
-}