Module Name: src Committed By: tsutsui Date: Thu Jan 10 15:51:32 UTC 2013
Modified Files: src/sys/arch/luna68k/stand/boot: Makefile boot.ldscript Log Message: Revert to using elf2aout(1) to build a.out binary. a.out binary linked by ldscript doesn't work on some uncertain conditions. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/stand/boot/Makefile cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/stand/boot/boot.ldscript Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/luna68k/stand/boot/Makefile diff -u src/sys/arch/luna68k/stand/boot/Makefile:1.3 src/sys/arch/luna68k/stand/boot/Makefile:1.4 --- src/sys/arch/luna68k/stand/boot/Makefile:1.3 Thu Jan 10 13:10:26 2013 +++ src/sys/arch/luna68k/stand/boot/Makefile Thu Jan 10 15:51:32 2013 @@ -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 @@ vers.c: ${.CURDIR}/version ${.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 Index: src/sys/arch/luna68k/stand/boot/boot.ldscript diff -u src/sys/arch/luna68k/stand/boot/boot.ldscript:1.2 src/sys/arch/luna68k/stand/boot/boot.ldscript:1.3 --- src/sys/arch/luna68k/stand/boot/boot.ldscript:1.2 Thu Jan 10 13:10:26 2013 +++ src/sys/arch/luna68k/stand/boot/boot.ldscript Thu Jan 10 15:51:32 2013 @@ -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 @@ SECTIONS _end = .; _bss_end__ = . ; __bss_end__ = . ; __end__ = . ; PROVIDE (end = .); - - /DISCARD/ : { *(.ident) *(.stab) *(.stabstr) *(.comment) } }