Module Name: src
Committed By: isaki
Date: Thu Jan 16 12:54:16 UTC 2020
Modified Files:
src/sys/arch/x68k/stand/xxboot: Makefile.xxboot
Log Message:
Remove .else part of .if OBJECT_FMT == ELF.
All similar parts in other Makefiles are removed in 2010.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x68k/stand/xxboot/Makefile.xxboot
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/xxboot/Makefile.xxboot
diff -u src/sys/arch/x68k/stand/xxboot/Makefile.xxboot:1.4 src/sys/arch/x68k/stand/xxboot/Makefile.xxboot:1.5
--- src/sys/arch/x68k/stand/xxboot/Makefile.xxboot:1.4 Sat Apr 8 19:53:23 2017
+++ src/sys/arch/x68k/stand/xxboot/Makefile.xxboot Thu Jan 16 12:54:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xxboot,v 1.4 2017/04/08 19:53:23 christos Exp $
+# $NetBSD: Makefile.xxboot,v 1.5 2020/01/16 12:54:16 isaki Exp $
NOMAN= # defined
@@ -38,12 +38,8 @@ CPPFLAGS+= -DBOOT_STAGE1 $(BOOTCPPFLAGS)
CPPFLAGS+= -nostdinc -I${.OBJDIR} -I${S}
CPPFLAGS+= -I$M/stand/libiocs -I$M/stand/libsa -I$M/stand/common
AFLAGS= ${CFLAGS:M-[ID]*}
-.if ${OBJECT_FMT} == "ELF"
LINKFLAGS= -n -Bstatic -T ${.CURDIR}/../xxboot.ldscript -M
LINKFLAGS+= -noinhibit-exec # XXX
-.else
-LINKFLAGS= -n -Bstatic -Ttext ${TEXT} -M
-.endif
LIBIOCS!= cd $M/stand/libiocs && ${PRINTOBJDIR}
LIBSA!= cd $M/stand/libsa && ${PRINTOBJDIR}
LDLIBS= -L${LIBSA}/lib/sa -lsa -L ${LIBSA}/lib/kern -lkern
@@ -68,7 +64,6 @@ ${PROG}: $(OBJS)
${_MKTARGET_LINK}
$(LD) $(LINKFLAGS) -o ${PROG} $(OBJS) $(LDLIBS) > $(PROG).map
@grep first_kbyte $(PROG).map
-.if ${OBJECT_FMT} == "ELF"
@if [ `(echo ibase=16; \
${TOOL_SED} -n \
's/^.*0x\([0-9a-f]*\).* first_kbyte$$/\1-$(TEXT)-400/p' \
@@ -85,27 +80,6 @@ ${PROG}: $(OBJS)
then echo '$(BOOT): text+data is too large'; \
rm $(PROG) ; exit 1; \
fi
-.else
- mv $(PROG) $(PROG).x
- $(OBJCOPY) -I a.out-m68k-netbsd -O binary $(PROG).x $(PROG)
- @rm -f $(PROG).x
- @if [ `(echo ibase=16; \
- ${TOOL_SED} -n \
- 's/ first_kbyte:.*0x\(.*\),.*$$/\1-$(TEXT)-400/p' \
- $(PROG).map | \
- tr a-f A-F) | bc` -gt 0 ]; \
- then echo '$(BOOT): first_kbyte exceeds the first killobyte'; \
- rm $(PROG) ; exit 1; \
- fi
- @if [ `(echo ibase=16; \
- ${TOOL_SED} -n \
- 's/ _edata:.*0x\(.*\),.*$$/\1-$(TEXT)-$(TEXTDATASIZE)/p' \
- $(PROG).map | \
- tr a-f A-F) | bc` -gt 0 ]; \
- then echo '$(BOOT): text+data is too large'; \
- rm $(PROG) ; exit 1; \
- fi
-.endif
${TOUCHPROG}
.include <bsd.prog.mk>
