Use BUILDSYMLINKS instead of custom rules for ${G_LIB2ADD} and unwind.h

Add some MAKEVERBOSE love.
This commit is contained in:
lukem 2008-08-04 04:55:55 +00:00
parent d929f5af49
commit 044c3465a8
5 changed files with 13 additions and 34 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.9 2008/05/25 21:37:02 christos Exp $
# $NetBSD: Makefile.inc,v 1.10 2008/08/04 04:55:55 lukem Exp $
.if exists(${.CURDIR}/arch/${MACHINE_ARCH}.mk) && ${MKGCC} != "no"
.include "${.CURDIR}/arch/${MACHINE_ARCH}.mk"
@ -60,8 +60,10 @@ CPICFLAGS:=
COMPILE.S= ${CC} ${AFLAGS} ${CPPFLAGS} -c
_TRADITIONAL_CPP=
fpgnulib.c: ${DIST}/gcc/config/m68k/fpgnulib.c
${_MKTARGET_CREATE}
cp ${DIST}/gcc/config/m68k/fpgnulib.c fpgnulib.c
xfgnulib.c: ${DIST}/gcc/config/m68k/fpgnulib.c
${_MKTARGET_CREATE}
echo '#define EXTFLOAT' > xfgnulib.c
cat ${DIST}/gcc/config/m68k/fpgnulib.c >> xfgnulib.c
CLEANFILES+= fpgnulib.c xfgnulib.c
@ -92,14 +94,9 @@ ${LIB1ASMFUNCS}: ${.CURDIR}/Makefile
printf '#define L${.PREFIX}\n#include <${G_LIB1ASMSRC}>\n' >${.TARGET}
.endif
${G_LIB2ADD:M${GNUHOSTDIST}/*:T:S/.asm/.S/}: ${.CURDIR}/Makefile ${G_LIB2ADD}
@echo copying ${G_LIB2ADD}
for i in ${G_LIB2ADD}; do \
j=$${i##*/}; \
j=`echo $$j | sed 's/\.asm$$/\.S/'`; \
cp $$i $$j; \
done
@echo copying ${G_LIB2ADD} complete
.for asmfile in ${G_LIB2ADD:M*.asm}
BUILDSYMLINKS+= ${asmfile} ${asmfile:T:S/.asm/.S/}
.endfor
${LIB2_EH:.c=.o}:
${_MKTARGET_COMPILE}
@ -130,10 +127,13 @@ tconfig.h:
HEADERS="$(G_xm_include_list)" DEFINES="USED_FOR_TARGET $(G_xm_defines)" \
${HOST_SH} $(GNUHOSTDIST)/gcc/mkconfig.sh tconfig.h
BUILDSYMLINKS+= ${G_UNWIND_H} unwind.h
DPSRCS+= unwind.h
# these aren't necessary but are #include'd
FAKEHEADERS=options.h insn-flags.h insn-constants.h
${FAKEHEADERS}:
${_MKTARGET_CREATE}
touch ${.TARGET}
tm.h ${SRCS}: ${FAKEHEADERS}
DPSRCS+= ${FAKEHEADERS}
CLEANFILES+= ${FAKEHEADERS}

View File

@ -1,15 +0,0 @@
# $NetBSD: Makefile.unwind_h,v 1.1 2006/06/23 17:27:08 mrg Exp $
.if !defined(_GNU_LIBGCC_UNWIND_H)
_GNU_LIBGCC_UNWIND_H=1
# fragment to build unwind.h.
${LIB2_EH}: unwind.h
unwind.h: ${G_UNWIND_H}
${_MKTARGET_CREATE}
rm -f ${.TARGET}
ln -s ${G_UNWIND_H} ${.TARGET}
CLEANFILES+= unwind.h
.endif

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2007/03/09 04:40:38 matt Exp $
# $NetBSD: Makefile,v 1.4 2008/08/04 04:55:55 lukem Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@ -23,8 +23,6 @@ SRCS+= ${LIB2_EH}
.include <bsd.lib.mk>
.include "../Makefile.unwind_h"
CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.tmp2}
.c.so:

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2006/11/09 04:07:11 christos Exp $
# $NetBSD: Makefile,v 1.4 2008/08/04 04:55:55 lukem Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@ -20,8 +20,6 @@ COPTS.unwind-dw2.c = -Wno-stack-protector
.include <bsd.lib.mk>
.include "../Makefile.unwind_h"
.else
.include <bsd.prog.mk> # do nothing
.endif

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2006/11/09 04:08:50 christos Exp $
# $NetBSD: Makefile,v 1.4 2008/08/04 04:55:55 lukem Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@ -33,8 +33,6 @@ CLEANFILES+= libgcc.map
.include <bsd.lib.mk>
.include "../Makefile.unwind_h"
.if ${MKPICLIB} != "no"
LIBGCC_S_OBJS= ${SOBJS}
.else