Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename LDFLAGS to LINKFLAGS, as the former is for CC not LD.

This commit is contained in:
lukem 2006-06-29 03:38:24 +00:00
parent 1e9eece03f
commit 0de20fdaf1
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/x68k/stand/boot/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2005/12/11 12:19:44 christos Exp $
# $NetBSD: Makefile,v 1.12 2006/06/29 03:38:24 lukem Exp $
NOMAN= # defined
@ -39,9 +39,9 @@ CPPFLAGS+= -DTEXTADDR="0x${TEXT}"
CPPFLAGS+= -DBOOT=\"${BOOT}\" -DBOOT_VERS=\"${VERSION}\"
CFLAGS= -Wno-main -Os -m68020-60
.if ${OBJECT_FMT} == "ELF"
LDFLAGS= -N -static -T ${.CURDIR}/boot.ldscript
LINKFLAGS= -N -static -T ${.CURDIR}/boot.ldscript
.else
LDFLAGS= -N -static -Ttext ${TEXT}
LINKFLAGS= -N -static -Ttext ${TEXT}
.endif
LIBIOCS!= cd $M/stand/libiocs && ${PRINTOBJDIR}
LIBSA!= cd $M/stand/libsa && ${PRINTOBJDIR}
@ -51,7 +51,7 @@ LDLIBS= -L${LIBSA} -lsa -L${LIBIOCS} -liocs
realall: machine-links ${PROG}
${PROG}: ${OBJS}
${LD} ${LDFLAGS} -o ${PROG}.sym ${OBJS} ${LDLIBS}
${LD} ${LINKFLAGS} -o ${PROG}.sym ${OBJS} ${LDLIBS}
${STRIP} -F ${BFDNAME} -o ${PROG} ${PROG}.sym
CLEANFILES+= ${PROG}.sym

10
sys/arch/x68k/stand/boot_ufs/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.18 2005/12/27 23:20:50 he Exp $
# $NetBSD: Makefile,v 1.19 2006/06/29 03:38:24 lukem Exp $
NOMAN= # defined
@ -44,10 +44,10 @@ CPPFLAGS+= -DUSE_FFS -DUSE_LFS -DUSE_UFS1 -DUSE_UFS2 -D__daddr_t=int32_t
CPPFLAGS+= -I${COMMONDIR} -I${LIBIOCS} -I${S} -I. -D_STANDALONE
AFLAGS= ${CFLAGS:M-[ID]*}
.if ${OBJECT_FMT} == "ELF"
LDFLAGS= -n -Bstatic -T ${.CURDIR}/${BOOT}.ldscript -M
LDFLAGS+= -noinhibit-exec # XXX
LINKFLAGS= -n -Bstatic -T ${.CURDIR}/${BOOT}.ldscript -M
LINKFLAGS+= -noinhibit-exec # XXX
.else
LDFLAGS= -n -Bstatic -Ttext ${TEXT} -M
LINKFLAGS= -n -Bstatic -Ttext ${TEXT} -M
OBJCOPY?= objcopy
.endif
@ -64,7 +64,7 @@ $(PROG): $(OBJS)
: Other errors are fatal.
:
.endif
$(LD) $(LDFLAGS) -o $(PROG).x $(OBJS) $(LDADD) >$(PROG).map
$(LD) $(LINKFLAGS) -o $(PROG).x $(OBJS) $(LDADD) >$(PROG).map
@grep first_kbyte $(PROG).map
@if [ `(echo ibase=16; \
sed -n -e '/[ ]first_kbyte/{' \

10
sys/arch/x68k/stand/boot_ustar/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2005/12/11 12:19:44 christos Exp $
# $NetBSD: Makefile,v 1.12 2006/06/29 03:38:24 lukem Exp $
NOMAN= # defined
@ -35,10 +35,10 @@ CPPFLAGS+= -I${COMMONDIR} -I${LIBIOCS}
AFLAGS= ${CFLAGS:M-[ID]*}
AFLAGS+= -Wa,-mc68000
.if ${OBJECT_FMT} == "ELF"
LDFLAGS= -n -Bstatic -T ${.CURDIR}/${BOOT}.ldscript -M
LDFLAGS+= -noinhibit-exec # XXX
LINKFLAGS= -n -Bstatic -T ${.CURDIR}/${BOOT}.ldscript -M
LINKFLAGS+= -noinhibit-exec # XXX
.else
LDFLAGS= -n -Bstatic -Ttext ${TEXT} -M
LINKFLAGS= -n -Bstatic -Ttext ${TEXT} -M
OBJCOPY?= objcopy
.endif
@ -46,7 +46,7 @@ CLEANFILES+= ${PROG}.x $(PROG).map
${PROG}: $(OBJS)
$(LD) $(LDFLAGS) -o ${PROG} $(OBJS) $(LDADD) > $(PROG).map
$(LD) $(LINKFLAGS) -o ${PROG} $(OBJS) $(LDADD) > $(PROG).map
@grep first_kbyte $(PROG).map
.if ${OBJECT_FMT} == "ELF"
@if [ `(echo ibase=16; \

6
sys/arch/x68k/stand/mboot/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.12 2005/12/11 12:19:45 christos Exp $
# $NetBSD: Makefile,v 1.13 2006/06/29 03:38:24 lukem Exp $
BOOT= mboot
VERSION= 0.1
@ -25,13 +25,13 @@ CPPFLAGS+= -DTEXTADDR="0x${TEXT}"
CPPFLAGS+= -DBOOT=\"${BOOT}\" -DBOOT_VERS=\"${VERSION}\"
CFLAGS= -Wno-main -Os -m68000
LDFLAGS= -N -static -Ttext ${TEXT}
LINKFLAGS= -N -static -Ttext ${TEXT}
.include "../Makefile.booters"
realall: machine-links ${PROG}
${BOOT}: ${OBJS}
${LD} ${LDFLAGS} -o ${BOOT}.x ${OBJS} ${LDLIBS}
${LD} ${LINKFLAGS} -o ${BOOT}.x ${OBJS} ${LDLIBS}
# ${STRIP} ${BOOT}.x
# dd bs=32 skip=1 count=32 if=${BOOT}.x of=${BOOT}
${OBJCOPY} -O binary ${BOOT}.x ${BOOT}