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

Use ${TOOL_M4} instead of "m4". (I only tested this fix

Browse Source 
for sparc but not sparc64 or alpha yet.)

Noticed problem when building NetBSD/sparc from a Linux/i386 host
that didn't have "m4".
This commit is contained in:
reed 2005-04-22 00:22:55 +00:00
parent cf28de227f
commit b8643619e6
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/lib/libkern/arch/alpha/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.23 2002/04/24 16:56:36 ross Exp $ # $NetBSD: Makefile.inc,v 1.24 2005/04/22 00:22:55 reed Exp $
SRCS+= __main.c __assert.c _mcount.S \ SRCS+= __main.c __assert.c _mcount.S \
imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \ imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
@ -20,39 +20,39 @@ CLEANFILES+= __remqu.S __remq.S __remlu.S __reml.S
__divqu.S: ${M}/divrem.m4 __divqu.S: ${M}/divrem.m4
@echo 'building ${.TARGET} from ${.ALLSRC}' @echo 'building ${.TARGET} from ${.ALLSRC}'
@(echo "define(NAME,\`__divqu')define(OP,\`div')define(S,\`false')"; \ @(echo "define(NAME,\`__divqu')define(OP,\`div')define(S,\`false')"; \
echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET} echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}
__divq.S: ${M}/divrem.m4 __divq.S: ${M}/divrem.m4
@echo 'building ${.TARGET} from ${.ALLSRC}' @echo 'building ${.TARGET} from ${.ALLSRC}'
@(echo "define(NAME,\`__divq')define(OP,\`div')define(S,\`true')"; \ @(echo "define(NAME,\`__divq')define(OP,\`div')define(S,\`true')"; \
echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET} echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}
__divlu.S: ${M}/divrem.m4 __divlu.S: ${M}/divrem.m4
@echo 'building ${.TARGET} from ${.ALLSRC}' @echo 'building ${.TARGET} from ${.ALLSRC}'
@(echo "define(NAME,\`__divlu')define(OP,\`div')define(S,\`false')"; \ @(echo "define(NAME,\`__divlu')define(OP,\`div')define(S,\`false')"; \
echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET} echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}
__divl.S: ${M}/divrem.m4 __divl.S: ${M}/divrem.m4
@echo 'building ${.TARGET} from ${.ALLSRC}' @echo 'building ${.TARGET} from ${.ALLSRC}'
@(echo "define(NAME,\`__divl')define(OP,\`div')define(S,\`true')"; \ @(echo "define(NAME,\`__divl')define(OP,\`div')define(S,\`true')"; \
echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET} echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}
__remqu.S: ${M}/divrem.m4 __remqu.S: ${M}/divrem.m4
@echo 'building ${.TARGET} from ${.ALLSRC}' @echo 'building ${.TARGET} from ${.ALLSRC}'
@(echo "define(NAME,\`__remqu')define(OP,\`rem')define(S,\`false')"; \ @(echo "define(NAME,\`__remqu')define(OP,\`rem')define(S,\`false')"; \
echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET} echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}
__remq.S: ${M}/divrem.m4 __remq.S: ${M}/divrem.m4
@echo 'building ${.TARGET} from ${.ALLSRC}' @echo 'building ${.TARGET} from ${.ALLSRC}'
@(echo "define(NAME,\`__remq')define(OP,\`rem')define(S,\`true')"; \ @(echo "define(NAME,\`__remq')define(OP,\`rem')define(S,\`true')"; \
echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET} echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}
__remlu.S: ${M}/divrem.m4 __remlu.S: ${M}/divrem.m4
@echo 'building ${.TARGET} from ${.ALLSRC}' @echo 'building ${.TARGET} from ${.ALLSRC}'
@(echo "define(NAME,\`__remlu')define(OP,\`rem')define(S,\`false')"; \ @(echo "define(NAME,\`__remlu')define(OP,\`rem')define(S,\`false')"; \
echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET} echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}
__reml.S: ${M}/divrem.m4 __reml.S: ${M}/divrem.m4
@echo 'building ${.TARGET} from ${.ALLSRC}' @echo 'building ${.TARGET} from ${.ALLSRC}'
@(echo "define(NAME,\`__reml')define(OP,\`rem')define(S,\`true')"; \ @(echo "define(NAME,\`__reml')define(OP,\`rem')define(S,\`true')"; \
echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET} echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}

10
sys/lib/libkern/arch/sparc/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.30 2003/11/08 14:45:02 lukem Exp $ # $NetBSD: Makefile.inc,v 1.31 2005/04/22 00:22:55 reed Exp $
SRCS+= __main.c __assert.c \ SRCS+= __main.c __assert.c \
imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \ imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
@ -25,19 +25,19 @@ CLEANFILES+=rem.S sdiv.S udiv.S urem.S
sdiv.S: divrem.m4 sdiv.S: divrem.m4
echo 'building ${.TARGET} from ${.ALLSRC}' echo 'building ${.TARGET} from ${.ALLSRC}'
(echo "define(NAME,\`.div')define(OP,\`div')define(S,\`true')"; \ (echo "define(NAME,\`.div')define(OP,\`div')define(S,\`true')"; \
cat ${.ALLSRC}) | m4 > ${.TARGET} cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}
udiv.S: divrem.m4 udiv.S: divrem.m4
@echo 'building ${.TARGET} from ${.ALLSRC}' @echo 'building ${.TARGET} from ${.ALLSRC}'
@(echo "define(NAME,\`.udiv')define(OP,\`div')define(S,\`false')"; \ @(echo "define(NAME,\`.udiv')define(OP,\`div')define(S,\`false')"; \
cat ${.ALLSRC}) | m4 > ${.TARGET} cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}
rem.S: divrem.m4 rem.S: divrem.m4
echo 'building ${.TARGET} from ${.ALLSRC}' echo 'building ${.TARGET} from ${.ALLSRC}'
(echo "define(NAME,\`.rem')define(OP,\`rem')define(S,\`true')"; \ (echo "define(NAME,\`.rem')define(OP,\`rem')define(S,\`true')"; \
cat ${.ALLSRC}) | m4 > ${.TARGET} cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}
urem.S: divrem.m4 urem.S: divrem.m4
@echo 'building ${.TARGET} from ${.ALLSRC}' @echo 'building ${.TARGET} from ${.ALLSRC}'
@(echo "define(NAME,\`.urem')define(OP,\`rem')define(S,\`false')"; \ @(echo "define(NAME,\`.urem')define(OP,\`rem')define(S,\`false')"; \
cat ${.ALLSRC}) | m4 > ${.TARGET} cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}

10
sys/lib/libkern/arch/sparc64/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.6 2003/11/09 11:25:18 martin Exp $ # $NetBSD: Makefile.inc,v 1.7 2005/04/22 00:22:55 reed Exp $
SRCS+= __main.c __assert.c \ SRCS+= __main.c __assert.c \
imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \ imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
@ -21,19 +21,19 @@ CLEANFILES+=rem.S sdiv.S udiv.S urem.S
sdiv.S: $M/divrem.m4 sdiv.S: $M/divrem.m4
echo 'building ${.TARGET} from ${.ALLSRC}' echo 'building ${.TARGET} from ${.ALLSRC}'
(echo "define(NAME,\`.div')define(OP,\`div')define(S,\`true')"; \ (echo "define(NAME,\`.div')define(OP,\`div')define(S,\`true')"; \
cat ${.ALLSRC}) | m4 > ${.TARGET} cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}
udiv.S: $M/divrem.m4 udiv.S: $M/divrem.m4
@echo 'building ${.TARGET} from ${.ALLSRC}' @echo 'building ${.TARGET} from ${.ALLSRC}'
@(echo "define(NAME,\`.udiv')define(OP,\`div')define(S,\`false')"; \ @(echo "define(NAME,\`.udiv')define(OP,\`div')define(S,\`false')"; \
cat ${.ALLSRC}) | m4 > ${.TARGET} cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}
rem.S: $M/divrem.m4 rem.S: $M/divrem.m4
echo 'building ${.TARGET} from ${.ALLSRC}' echo 'building ${.TARGET} from ${.ALLSRC}'
(echo "define(NAME,\`.rem')define(OP,\`rem')define(S,\`true')"; \ (echo "define(NAME,\`.rem')define(OP,\`rem')define(S,\`true')"; \
cat ${.ALLSRC}) | m4 > ${.TARGET} cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}
urem.S: $M/divrem.m4 urem.S: $M/divrem.m4
@echo 'building ${.TARGET} from ${.ALLSRC}' @echo 'building ${.TARGET} from ${.ALLSRC}'
@(echo "define(NAME,\`.urem')define(OP,\`rem')define(S,\`false')"; \ @(echo "define(NAME,\`.urem')define(OP,\`rem')define(S,\`false')"; \
cat ${.ALLSRC}) | m4 > ${.TARGET} cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}