[src/trunk]: src/sys/arch/luna68k/stand/boot Revert to using elf2aout(1) to b...

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

details:   https://anonhg.NetBSD.org/src/rev/8d6d50aa1036
branches:  trunk
changeset: 783846:8d6d50aa1036
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Thu Jan 10 15:51:32 2013 +0000

description:
Revert to using elf2aout(1) to build a.out binary.
a.out binary linked by ldscript doesn't work on some uncertain conditions.

diffstat:

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

diffs (42 lines):

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