Module Name: src
Committed By: christos
Date: Mon Dec 31 19:25:46 UTC 2018
Modified Files:
src/sys/arch/x68k/stand/boot: Makefile boot.ldscript
Log Message:
use elf2aout for boot.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/x68k/stand/boot/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x68k/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/x68k/stand/boot/Makefile
diff -u src/sys/arch/x68k/stand/boot/Makefile:1.28 src/sys/arch/x68k/stand/boot/Makefile:1.29
--- src/sys/arch/x68k/stand/boot/Makefile:1.28 Sat Apr 8 15:53:23 2017
+++ src/sys/arch/x68k/stand/boot/Makefile Mon Dec 31 14:25:46 2018
@@ -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 @@ BINDIR= /usr/mdec
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 @@ realall: ${PROG}
${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>
Index: src/sys/arch/x68k/stand/boot/boot.ldscript
diff -u src/sys/arch/x68k/stand/boot/boot.ldscript:1.6 src/sys/arch/x68k/stand/boot/boot.ldscript:1.7
--- src/sys/arch/x68k/stand/boot/boot.ldscript:1.6 Sun Mar 2 01:16:27 2014
+++ src/sys/arch/x68k/stand/boot/boot.ldscript Mon Dec 31 14:25:46 2018
@@ -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);
