[src/trunk]: src/sys/arch/luna68k/stand/boot Link the target boot binary as a...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bf3f8387581b
branches:  trunk
changeset: 783842:bf3f8387581b
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Thu Jan 10 13:10:26 2013 +0000

description:
Link the target boot binary as a.out directly rather than using elf2aout(1).
Confirmed working on LUNA-I.

diffstat:

 sys/arch/luna68k/stand/boot/Makefile      |  7 +++----
 sys/arch/luna68k/stand/boot/boot.ldscript |  6 ++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r 41684ff35ac1 -r bf3f8387581b sys/arch/luna68k/stand/boot/Makefile
--- a/sys/arch/luna68k/stand/boot/Makefile      Thu Jan 10 10:36:41 2013 +0000
+++ b/sys/arch/luna68k/stand/boot/Makefile      Thu Jan 10 13:10:26 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2013/01/09 16:28:41 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.3 2013/01/10 13:10:26 tsutsui Exp $
 #      @(#)Makefile    8.2 (Berkeley) 8/15/93
 
 NOMAN= # defined
@@ -73,11 +73,10 @@
            ${.CURDIR}/version ${MACHINE} ${NEWVERSWHAT}
 
 ${PROG}: ${LDSCRIPT} ${OBJS} ${LIBS}
-       ${LD} ${LINKFORMAT} -x -o ${PROG}.elf ${OBJS} ${LIBS}
-       ${ELF2AOUT} ${PROG}.elf ${PROG}.aout
+       ${LD} ${LINKFORMAT} -x -o ${PROG}.aout ${OBJS} ${LIBS}
        mv ${PROG}.aout ${PROG}
 
-CLEANFILES+=   ${PROG}.map ${PROG}.elf ${PROG}.gz
+CLEANFILES+=   ${PROG}.aout
 
 cleandir distclean: .WAIT cleanlibdir
 
diff -r 41684ff35ac1 -r bf3f8387581b sys/arch/luna68k/stand/boot/boot.ldscript
--- a/sys/arch/luna68k/stand/boot/boot.ldscript Thu Jan 10 10:36:41 2013 +0000
+++ b/sys/arch/luna68k/stand/boot/boot.ldscript Thu Jan 10 13:10:26 2013 +0000
@@ -1,6 +1,6 @@
-/*     $NetBSD: boot.ldscript,v 1.1 2013/01/05 17:44:24 tsutsui Exp $  */
+/*     $NetBSD: boot.ldscript,v 1.2 2013/01/10 13:10:26 tsutsui Exp $  */
 
-OUTPUT_FORMAT("elf32-m68k")
+OUTPUT_FORMAT("a.out-m68k-netbsd")
 OUTPUT_ARCH(m68k)
 ENTRY(start)
 SECTIONS
@@ -45,4 +45,6 @@
   _end = .;
   _bss_end__ = . ; __bss_end__ = . ; __end__ = . ;
   PROVIDE (end = .);
+
+  /DISCARD/ : { *(.ident) *(.stab) *(.stabstr) *(.comment) }
 }