Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x68k/stand/boot use elf2aout for boot.



details:   https://anonhg.NetBSD.org/src/rev/790cc3a47883
branches:  trunk
changeset: 447114:790cc3a47883
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Dec 31 19:25:46 2018 +0000

description:
use elf2aout for boot.

diffstat:

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

diffs (43 lines):

diff -r fb6eba83db71 -r 790cc3a47883 sys/arch/x68k/stand/boot/Makefile
--- a/sys/arch/x68k/stand/boot/Makefile Mon Dec 31 19:07:21 2018 +0000
+++ b/sys/arch/x68k/stand/boot/Makefile Mon Dec 31 19:25:46 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.28 2017/04/08 19:53:23 christos Exp $
+#      $NetBSD: Makefile,v 1.29 2018/12/31 19:25:46 christos Exp $
 
 NOMAN=         # defined
 
@@ -21,8 +21,6 @@
 BINMODE=       444
 STRIPFLAG=
 
-BFDNAME=       a.out-m68k-netbsd
-
 SRCS=          srt0.S boot.c conf.c switch.c exec_image.S
 SRCS+=         if_ne.c ne.c dp8390.c
 S=             ${.CURDIR}/../../../..
@@ -56,8 +54,9 @@
 ${PROG}:       ${OBJS} ${LDLIBS}
        ${_MKTARGET_LINK}
        ${LD} ${LINKFLAGS} -o ${PROG}.sym ${OBJS} ${LDLIBS}
-       ${STRIP} -F ${BFDNAME} -o ${PROG} ${PROG}.sym
+       ${STRIP} ${PROG}.sym -o ${PROG}.strip
+       ${ELF2AOUT} ${PROG}.strip ${PROG}
 
-CLEANFILES+=   ${PROG}.sym
+CLEANFILES+=   ${PROG}.sym ${PROG}.strip
 
 .include <bsd.prog.mk>
diff -r fb6eba83db71 -r 790cc3a47883 sys/arch/x68k/stand/boot/boot.ldscript
--- a/sys/arch/x68k/stand/boot/boot.ldscript    Mon Dec 31 19:07:21 2018 +0000
+++ b/sys/arch/x68k/stand/boot/boot.ldscript    Mon Dec 31 19:25:46 2018 +0000
@@ -1,6 +1,8 @@
 /* /boot must be a.out, OMAGIC starting from 0x6000. */
+/* ... but new binutils don't support a.out anymore... 
 OUTPUT_FORMAT("a.out-m68k-netbsd", "a.out-m68k-netbsd",
-             "a.out-m68k-netbsd")
+             "a.out-m68k-netbsd")
+*/
 OUTPUT_ARCH(m68k)
 ENTRY(start)
 SEARCH_DIR(/usr/lib);



Home | Main Index | Thread Index | Old Index