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/xxboot Remove .else part of .if OBJECT_F...



details:   https://anonhg.NetBSD.org/src/rev/f73d99139516
branches:  trunk
changeset: 1006459:f73d99139516
user:      isaki <isaki%NetBSD.org@localhost>
date:      Thu Jan 16 12:54:16 2020 +0000

description:
Remove .else part of .if OBJECT_FMT == ELF.
All similar parts in other Makefiles are removed in 2010.

diffstat:

 sys/arch/x68k/stand/xxboot/Makefile.xxboot |  28 +---------------------------
 1 files changed, 1 insertions(+), 27 deletions(-)

diffs (58 lines):

diff -r dae1c441d433 -r f73d99139516 sys/arch/x68k/stand/xxboot/Makefile.xxboot
--- a/sys/arch/x68k/stand/xxboot/Makefile.xxboot        Thu Jan 16 09:23:43 2020 +0000
+++ b/sys/arch/x68k/stand/xxboot/Makefile.xxboot        Thu Jan 16 12:54:16 2020 +0000
@@ -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+= -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 @@
        ${_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 @@
        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>



Home | Main Index | Thread Index | Old Index