Mon Nov 26 18:57:36 2012 UTC ()
collect common rules in the shared Makefile, this propagates the .OBJDIR
fix done for i386 last year to all other ports


(drochner)
diff -r1.13 -r1.14 src/external/lgpl3/gmp/lib/libgmp/Makefile
diff -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/alpha/Makefile.inc
diff -r1.3 -r1.4 src/external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc
diff -r1.3 -r1.4 src/external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc
diff -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/earm/Makefile.inc
diff -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/hppa/Makefile.inc
diff -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc
diff -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/m68000/Makefile.inc
diff -r1.2 -r1.3 src/external/lgpl3/gmp/lib/libgmp/arch/m68k/Makefile.inc
diff -r1.2 -r1.3 src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc
diff -r1.2 -r1.3 src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/Makefile.inc
diff -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/mipseb/Makefile.inc
diff -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/mipsel/Makefile.inc
diff -r1.3 -r1.4 src/external/lgpl3/gmp/lib/libgmp/arch/powerpc/Makefile.inc
diff -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64/Makefile.inc
diff -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/sh3eb/Makefile.inc
diff -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/sh3el/Makefile.inc
diff -r1.3 -r1.4 src/external/lgpl3/gmp/lib/libgmp/arch/sparc/Makefile.inc
diff -r1.2 -r1.3 src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/Makefile.inc
diff -r1.3 -r1.4 src/external/lgpl3/gmp/lib/libgmp/arch/vax/Makefile.inc
diff -r1.3 -r1.4 src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/Makefile.inc
cvs diff -r1.13 -r1.14 src/external/lgpl3/gmp/lib/libgmp/Makefile (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/Makefile 2012/08/10 16:05:26 1.13
+++ src/external/lgpl3/gmp/lib/libgmp/Makefile 2012/11/26 18:57:33 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.13 2012/08/10 16:05:26 joerg Exp $ 1# $NetBSD: Makefile,v 1.14 2012/11/26 18:57:33 drochner Exp $
2 2
3.include <bsd.init.mk> 3.include <bsd.init.mk>
4 4
5# We don't install gmp, just provide it for GCC. 5# We don't install gmp, just provide it for GCC.
6LIBISPRIVATE?= yes 6LIBISPRIVATE?= yes
7 7
8.if ${LIBISPRIVATE} != "yes" 8.if ${LIBISPRIVATE} != "yes"
9INCS= gmp.h 9INCS= gmp.h
10INCSDIR= /usr/include 10INCSDIR= /usr/include
11.endif 11.endif
12 12
13DIST=${.CURDIR}/../../dist 13DIST=${.CURDIR}/../../dist
14 14
@@ -171,26 +171,59 @@ mp_bases.h: gen-bases @@ -171,26 +171,59 @@ mp_bases.h: gen-bases
171 ${.OBJDIR}/gen-bases header ${GMP_LIMB_BITS} 0 > ${.OBJDIR}/mp_bases.h 171 ${.OBJDIR}/gen-bases header ${GMP_LIMB_BITS} 0 > ${.OBJDIR}/mp_bases.h
172 172
173mp_bases.c: gen-bases 173mp_bases.c: gen-bases
174 ${.OBJDIR}/gen-bases table ${GMP_LIMB_BITS} 0 > ${.OBJDIR}/mp_bases.c 174 ${.OBJDIR}/gen-bases table ${GMP_LIMB_BITS} 0 > ${.OBJDIR}/mp_bases.c
175 175
176perfsqr.h: gen-psqr.c 176perfsqr.h: gen-psqr.c
177 ${HOST_CC} -o ${.OBJDIR}/gen-psqr ${.ALLSRC} 177 ${HOST_CC} -o ${.OBJDIR}/gen-psqr ${.ALLSRC}
178 ${.OBJDIR}/gen-psqr ${GMP_LIMB_BITS} 0 > ${.OBJDIR}/perfsqr.h 178 ${.OBJDIR}/gen-psqr ${GMP_LIMB_BITS} 0 > ${.OBJDIR}/perfsqr.h
179 179
180CLEANFILES+= ${DPSRCS} gen-fac_ui gen-fib gen-bases gen-psqr gen-trialdivtab 180CLEANFILES+= ${DPSRCS} gen-fac_ui gen-fib gen-bases gen-psqr gen-trialdivtab
181 181
182.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" 182.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
183 183
 184# XXX stuff looks for "../config.m4"
 185dummy:
 186 mkdir dummy
 187${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4
 188 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.OBJDIR}/config.m4
 189
 190CLEANFILES+= config.m4
 191clean: cleandummy
 192cleandummy: .PHONY
 193 -rmdir dummy
 194
 195BUILD_S_INCS= -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn
 196
 197.for _build _src in ${ASM_SRCS_LIST}
 198${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4
 199 ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} ${BUILD_S_INCS} \
 200 ${M4FLAGS} ${M4FLAGS.${.TARGET:R}} \
 201 -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET}
 202
 203SRCS+= ${_build:R}.s
 204CLEANFILES+= ${_build:R}.s
 205.endfor
 206
 207.for _build _src in ${C_SRCS_LIST}
 208mpn_${_build}: Makefile
 209 echo '#include "${_src}"' > ${.TARGET}
 210
 211CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R}
 212
 213SRCS+= mpn_${_build}
 214CLEANFILES+= mpn_${_build}
 215.endfor
 216
184.include <bsd.lib.mk> 217.include <bsd.lib.mk>
185 218
186.PATH: ${DIST} \ 219.PATH: ${DIST} \
187 ${DIST}/mpn/generic \ 220 ${DIST}/mpn/generic \
188 ${.CURDIR}/arch/${MACHINE_ARCH} \ 221 ${.CURDIR}/arch/${MACHINE_ARCH} \
189 ${DIST}/mpf \ 222 ${DIST}/mpf \
190 ${DIST}/mpz 223 ${DIST}/mpz
191 224
192# Don't warn about functions which cannot be stack smash protected as 225# Don't warn about functions which cannot be stack smash protected as
193# there are a lot of them. 226# there are a lot of them.
194COPTS += -Wno-stack-protector 227COPTS += -Wno-stack-protector
195 228
196CWARNFLAGS.clang+= -Wno-unused-value -Wno-tautological-compare 229CWARNFLAGS.clang+= -Wno-unused-value -Wno-tautological-compare
cvs diff -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/alpha/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/alpha/Makefile.inc 2011/07/07 02:06:32 1.1
+++ src/external/lgpl3/gmp/lib/libgmp/arch/alpha/Makefile.inc 2012/11/26 18:57:34 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.1 2011/07/07 02:06:32 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.2 2012/11/26 18:57:34 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 toom_interpolate_7pts.c \ 5 toom_interpolate_7pts.c \
6 sbpi1_divappr_q.c \ 6 sbpi1_divappr_q.c \
7 random2.c \ 7 random2.c \
8 mu_bdiv_q.c \ 8 mu_bdiv_q.c \
9 toom32_mul.c \ 9 toom32_mul.c \
10 toom44_mul.c \ 10 toom44_mul.c \
11 toom8h_mul.c \ 11 toom8h_mul.c \
12 toom2_sqr.c \ 12 toom2_sqr.c \
13 zero.c \ 13 zero.c \
14 mod_1_4.c \ 14 mod_1_4.c \
@@ -157,38 +157,13 @@ ASM_SRCS_LIST= \ @@ -157,38 +157,13 @@ ASM_SRCS_LIST= \
157 divrem_2.asm mpn/alpha/divrem_2.asm \ 157 divrem_2.asm mpn/alpha/divrem_2.asm \
158 sub_n.asm mpn/alpha/sub_n.asm \ 158 sub_n.asm mpn/alpha/sub_n.asm \
159 159
160gen-trialdivtab: gen-trialdivtab.c 160gen-trialdivtab: gen-trialdivtab.c
161 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm 161 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
162 162
163GMP_LIMB_BITS=64 163GMP_LIMB_BITS=64
164 164
165trialdiv.c: trialdivtab.h 165trialdiv.c: trialdivtab.h
166trialdivtab.h: gen-trialdivtab 166trialdivtab.h: gen-trialdivtab
167 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 167 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
168 168
169CLEANFILES+= trialdivtab.h 169CLEANFILES+= trialdivtab.h
170 
171# XXX stuff looks for "../config.m4" 
172dummy: 
173 mkdir dummy 
174${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
175 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET} 
176 
177.for _build _src in ${ASM_SRCS_LIST} 
178${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4 
179 ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET} 
180 
181SRCS+= ${_build:R}.s 
182CLEANFILES+= ${_build:R}.s 
183 
184.endfor 
185 
186.for _build _src in ${C_SRCS_LIST} 
187mpn_${_build}: Makefile 
188 echo '#include "${_src}"' > ${.TARGET} 
189 
190CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R} 
191 
192SRCS+= mpn_${_build} 
193CLEANFILES+= mpn_${_build} 
194.endfor 
cvs diff -r1.3 -r1.4 src/external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc 2011/07/10 02:41:50 1.3
+++ src/external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc 2012/11/26 18:57:34 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.3 2011/07/10 02:41:50 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.4 2012/11/26 18:57:34 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 divrem_2.c \ 5 divrem_2.c \
6 toom_interpolate_7pts.c \ 6 toom_interpolate_7pts.c \
7 sbpi1_divappr_q.c \ 7 sbpi1_divappr_q.c \
8 random2.c \ 8 random2.c \
9 mu_bdiv_q.c \ 9 mu_bdiv_q.c \
10 toom32_mul.c \ 10 toom32_mul.c \
11 toom44_mul.c \ 11 toom44_mul.c \
12 toom8h_mul.c \ 12 toom8h_mul.c \
13 toom2_sqr.c \ 13 toom2_sqr.c \
14 zero.c \ 14 zero.c \
@@ -154,43 +154,15 @@ ASM_SRCS_LIST= \ @@ -154,43 +154,15 @@ ASM_SRCS_LIST= \
154 sub_n.asm mpn/arm/sub_n.asm \ 154 sub_n.asm mpn/arm/sub_n.asm \
155 155
156gen-trialdivtab: gen-trialdivtab.c 156gen-trialdivtab: gen-trialdivtab.c
157 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm 157 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
158 158
159GMP_LIMB_BITS=32 159GMP_LIMB_BITS=32
160 160
161trialdiv.c: trialdivtab.h 161trialdiv.c: trialdivtab.h
162trialdivtab.h: gen-trialdivtab 162trialdivtab.h: gen-trialdivtab
163 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 163 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
164 164
165CLEANFILES+= trialdivtab.h 165CLEANFILES+= trialdivtab.h
166 166
167# XXX stuff looks for "../config.m4" 
168dummy: 
169 mkdir dummy 
170${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
171 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET} 
172 
173BUILD_S_INCS= -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn 
174 
175M4FLAGS= -DPIC 167M4FLAGS= -DPIC
176COPTS+= -fPIC 168COPTS+= -fPIC
177.for _build _src in ${ASM_SRCS_LIST} 
178${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4 
179 ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} ${BUILD_S_INCS} \ 
180 ${M4FLAGS} ${M4FLAGS.${.TARGET:R}} \ 
181 -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET} 
182 
183SRCS+= ${_build:R}.s 
184CLEANFILES+= ${_build:R}.s 
185 
186.endfor 
187 
188.for _build _src in ${C_SRCS_LIST} 
189mpn_${_build}: Makefile 
190 echo '#include "${_src}"' > ${.TARGET} 
191 
192CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R} 
193 
194SRCS+= mpn_${_build} 
195CLEANFILES+= mpn_${_build} 
196.endfor 
cvs diff -r1.3 -r1.4 src/external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc 2011/07/10 02:41:50 1.3
+++ src/external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc 2012/11/26 18:57:34 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.3 2011/07/10 02:41:50 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.4 2012/11/26 18:57:34 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 divrem_2.c \ 5 divrem_2.c \
6 toom_interpolate_7pts.c \ 6 toom_interpolate_7pts.c \
7 sbpi1_divappr_q.c \ 7 sbpi1_divappr_q.c \
8 random2.c \ 8 random2.c \
9 mu_bdiv_q.c \ 9 mu_bdiv_q.c \
10 toom32_mul.c \ 10 toom32_mul.c \
11 toom44_mul.c \ 11 toom44_mul.c \
12 toom8h_mul.c \ 12 toom8h_mul.c \
13 toom2_sqr.c \ 13 toom2_sqr.c \
14 zero.c \ 14 zero.c \
@@ -154,43 +154,15 @@ ASM_SRCS_LIST= \ @@ -154,43 +154,15 @@ ASM_SRCS_LIST= \
154 sub_n.asm mpn/arm/sub_n.asm \ 154 sub_n.asm mpn/arm/sub_n.asm \
155 155
156gen-trialdivtab: gen-trialdivtab.c 156gen-trialdivtab: gen-trialdivtab.c
157 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm 157 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
158 158
159GMP_LIMB_BITS=32 159GMP_LIMB_BITS=32
160 160
161trialdiv.c: trialdivtab.h 161trialdiv.c: trialdivtab.h
162trialdivtab.h: gen-trialdivtab 162trialdivtab.h: gen-trialdivtab
163 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 163 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
164 164
165CLEANFILES+= trialdivtab.h 165CLEANFILES+= trialdivtab.h
166 166
167# XXX stuff looks for "../config.m4" 
168dummy: 
169 mkdir dummy 
170${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
171 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET} 
172 
173BUILD_S_INCS= -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn 
174 
175M4FLAGS= -DPIC 167M4FLAGS= -DPIC
176COPTS+= -fPIC 168COPTS+= -fPIC
177.for _build _src in ${ASM_SRCS_LIST} 
178${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4 
179 ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} ${BUILD_S_INCS} \ 
180 ${M4FLAGS} ${M4FLAGS.${.TARGET:R}} \ 
181 -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET} 
182 
183SRCS+= ${_build:R}.s 
184CLEANFILES+= ${_build:R}.s 
185 
186.endfor 
187 
188.for _build _src in ${C_SRCS_LIST} 
189mpn_${_build}: Makefile 
190 echo '#include "${_src}"' > ${.TARGET} 
191 
192CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R} 
193 
194SRCS+= mpn_${_build} 
195CLEANFILES+= mpn_${_build} 
196.endfor 
cvs diff -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/earm/Attic/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/earm/Attic/Makefile.inc 2012/08/05 18:27:13 1.1
+++ src/external/lgpl3/gmp/lib/libgmp/arch/earm/Attic/Makefile.inc 2012/11/26 18:57:34 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.1 2012/08/05 18:27:13 matt Exp $ 1# $NetBSD: Makefile.inc,v 1.2 2012/11/26 18:57:34 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 divrem_2.c \ 5 divrem_2.c \
6 toom_interpolate_7pts.c \ 6 toom_interpolate_7pts.c \
7 sbpi1_divappr_q.c \ 7 sbpi1_divappr_q.c \
8 random2.c \ 8 random2.c \
9 mu_bdiv_q.c \ 9 mu_bdiv_q.c \
10 toom32_mul.c \ 10 toom32_mul.c \
11 toom44_mul.c \ 11 toom44_mul.c \
12 toom8h_mul.c \ 12 toom8h_mul.c \
13 toom2_sqr.c \ 13 toom2_sqr.c \
14 zero.c \ 14 zero.c \
@@ -154,43 +154,15 @@ ASM_SRCS_LIST= \ @@ -154,43 +154,15 @@ ASM_SRCS_LIST= \
154 sub_n.asm mpn/arm/sub_n.asm \ 154 sub_n.asm mpn/arm/sub_n.asm \
155 155
156gen-trialdivtab: gen-trialdivtab.c 156gen-trialdivtab: gen-trialdivtab.c
157 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm 157 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
158 158
159GMP_LIMB_BITS=32 159GMP_LIMB_BITS=32
160 160
161trialdiv.c: trialdivtab.h 161trialdiv.c: trialdivtab.h
162trialdivtab.h: gen-trialdivtab 162trialdivtab.h: gen-trialdivtab
163 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 163 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
164 164
165CLEANFILES+= trialdivtab.h 165CLEANFILES+= trialdivtab.h
166 166
167# XXX stuff looks for "../config.m4" 
168dummy: 
169 mkdir dummy 
170${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
171 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET} 
172 
173BUILD_S_INCS= -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn 
174 
175M4FLAGS= -DPIC 167M4FLAGS= -DPIC
176COPTS+= -fPIC 168COPTS+= -fPIC
177.for _build _src in ${ASM_SRCS_LIST} 
178${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4 
179 ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} ${BUILD_S_INCS} \ 
180 ${M4FLAGS} ${M4FLAGS.${.TARGET:R}} \ 
181 -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET} 
182 
183SRCS+= ${_build:R}.s 
184CLEANFILES+= ${_build:R}.s 
185 
186.endfor 
187 
188.for _build _src in ${C_SRCS_LIST} 
189mpn_${_build}: Makefile 
190 echo '#include "${_src}"' > ${.TARGET} 
191 
192CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R} 
193 
194SRCS+= mpn_${_build} 
195CLEANFILES+= mpn_${_build} 
196.endfor 
cvs diff -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/hppa/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/hppa/Makefile.inc 2011/07/07 02:06:32 1.1
+++ src/external/lgpl3/gmp/lib/libgmp/arch/hppa/Makefile.inc 2012/11/26 18:57:34 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.1 2011/07/07 02:06:32 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.2 2012/11/26 18:57:34 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 divrem_2.c \ 5 divrem_2.c \
6 toom_interpolate_7pts.c \ 6 toom_interpolate_7pts.c \
7 sbpi1_divappr_q.c \ 7 sbpi1_divappr_q.c \
8 random2.c \ 8 random2.c \
9 mu_bdiv_q.c \ 9 mu_bdiv_q.c \
10 toom32_mul.c \ 10 toom32_mul.c \
11 toom44_mul.c \ 11 toom44_mul.c \
12 toom8h_mul.c \ 12 toom8h_mul.c \
13 toom2_sqr.c \ 13 toom2_sqr.c \
14 zero.c \ 14 zero.c \
@@ -154,38 +154,13 @@ ASM_SRCS_LIST= \ @@ -154,38 +154,13 @@ ASM_SRCS_LIST= \
154 addmul_1.asm mpn/pa32/hppa1_1/pa7100/addmul_1.asm \ 154 addmul_1.asm mpn/pa32/hppa1_1/pa7100/addmul_1.asm \
155 sub_n.asm mpn/pa32/hppa1_1/pa7100/sub_n.asm \ 155 sub_n.asm mpn/pa32/hppa1_1/pa7100/sub_n.asm \
156 156
157gen-trialdivtab: gen-trialdivtab.c 157gen-trialdivtab: gen-trialdivtab.c
158 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm 158 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
159 159
160GMP_LIMB_BITS=32 160GMP_LIMB_BITS=32
161 161
162trialdiv.c: trialdivtab.h 162trialdiv.c: trialdivtab.h
163trialdivtab.h: gen-trialdivtab 163trialdivtab.h: gen-trialdivtab
164 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 164 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
165 165
166CLEANFILES+= trialdivtab.h 166CLEANFILES+= trialdivtab.h
167 
168# XXX stuff looks for "../config.m4" 
169dummy: 
170 mkdir dummy 
171${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
172 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET} 
173 
174.for _build _src in ${ASM_SRCS_LIST} 
175${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4 
176 ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET} 
177 
178SRCS+= ${_build:R}.s 
179CLEANFILES+= ${_build:R}.s 
180 
181.endfor 
182 
183.for _build _src in ${C_SRCS_LIST} 
184mpn_${_build}: Makefile 
185 echo '#include "${_src}"' > ${.TARGET} 
186 
187CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R} 
188 
189SRCS+= mpn_${_build} 
190CLEANFILES+= mpn_${_build} 
191.endfor 
cvs diff -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc 2011/07/07 17:55:26 1.5
+++ src/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc 2012/11/26 18:57:35 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.5 2011/07/07 17:55:26 drochner Exp $ 1# $NetBSD: Makefile.inc,v 1.6 2012/11/26 18:57:35 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 toom_interpolate_7pts.c \ 5 toom_interpolate_7pts.c \
6 sbpi1_divappr_q.c \ 6 sbpi1_divappr_q.c \
7 random2.c \ 7 random2.c \
8 mu_bdiv_q.c \ 8 mu_bdiv_q.c \
9 toom32_mul.c \ 9 toom32_mul.c \
10 toom44_mul.c \ 10 toom44_mul.c \
11 toom8h_mul.c \ 11 toom8h_mul.c \
12 toom2_sqr.c \ 12 toom2_sqr.c \
13 zero.c \ 13 zero.c \
14 mod_1_4.c \ 14 mod_1_4.c \
@@ -165,44 +165,13 @@ SRCS+= mul_1.c sqr_basecase.c mul_baseca @@ -165,44 +165,13 @@ SRCS+= mul_1.c sqr_basecase.c mul_baseca
165 165
166gen-trialdivtab: gen-trialdivtab.c 166gen-trialdivtab: gen-trialdivtab.c
167 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm 167 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
168 168
169# XXX 169# XXX
170# XXX is this right? 170# XXX is this right?
171GMP_LIMB_BITS=32 171GMP_LIMB_BITS=32
172 172
173trialdiv.c: trialdivtab.h 173trialdiv.c: trialdivtab.h
174trialdivtab.h: gen-trialdivtab 174trialdivtab.h: gen-trialdivtab
175 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 175 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
176 176
177CLEANFILES+= trialdivtab.h 177CLEANFILES+= trialdivtab.h
178 
179# XXX stuff looks for "../config.m4" 
180dummy: 
181 mkdir dummy 
182${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
183 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.OBJDIR}/config.m4 
184 
185CLEANFILES+= config.m4 
186clean: cleandummy 
187cleandummy: .PHONY 
188 -rmdir dummy 
189 
190.for _build _src in ${ASM_SRCS_LIST} 
191${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4 
192 ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET} 
193 
194SRCS+= ${_build:R}.s 
195CLEANFILES+= ${_build:R}.s 
196 
197.endfor 
198 
199.for _build _src in ${C_SRCS_LIST} 
200mpn_${_build}: Makefile 
201 echo '#include "${_src}"' > ${.TARGET} 
202 
203CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R} 
204 
205SRCS+= mpn_${_build} 
206CLEANFILES+= mpn_${_build} 
207.endfor 
208 
cvs diff -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/m68000/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/m68000/Makefile.inc 2011/07/03 06:52:26 1.1
+++ src/external/lgpl3/gmp/lib/libgmp/arch/m68000/Makefile.inc 2012/11/26 18:57:35 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.1 2011/07/03 06:52:26 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.2 2012/11/26 18:57:35 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 divrem_2.c \ 5 divrem_2.c \
6 toom_interpolate_7pts.c \ 6 toom_interpolate_7pts.c \
7 sbpi1_divappr_q.c \ 7 sbpi1_divappr_q.c \
8 random2.c \ 8 random2.c \
9 mu_bdiv_q.c \ 9 mu_bdiv_q.c \
10 toom32_mul.c \ 10 toom32_mul.c \
11 toom44_mul.c \ 11 toom44_mul.c \
12 toom8h_mul.c \ 12 toom8h_mul.c \
13 toom2_sqr.c \ 13 toom2_sqr.c \
14 zero.c \ 14 zero.c \
@@ -151,38 +151,13 @@ ASM_SRCS_LIST= \ @@ -151,38 +151,13 @@ ASM_SRCS_LIST= \
151 rshift.asm mpn/m68k/rshift.asm \ 151 rshift.asm mpn/m68k/rshift.asm \
152 sub_n.asm mpn/m68k/aors_n.asm \ 152 sub_n.asm mpn/m68k/aors_n.asm \
153 153
154gen-trialdivtab: gen-trialdivtab.c 154gen-trialdivtab: gen-trialdivtab.c
155 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm 155 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
156 156
157GMP_LIMB_BITS=32 157GMP_LIMB_BITS=32
158 158
159trialdiv.c: trialdivtab.h 159trialdiv.c: trialdivtab.h
160trialdivtab.h: gen-trialdivtab 160trialdivtab.h: gen-trialdivtab
161 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 161 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
162 162
163CLEANFILES+= trialdivtab.h 163CLEANFILES+= trialdivtab.h
164 
165# XXX stuff looks for "../config.m4" 
166dummy: 
167 mkdir dummy 
168${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
169 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET} 
170 
171.for _build _src in ${ASM_SRCS_LIST} 
172${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4 
173 ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET} 
174 
175SRCS+= ${_build:R}.s 
176CLEANFILES+= ${_build:R}.s 
177 
178.endfor 
179 
180.for _build _src in ${C_SRCS_LIST} 
181mpn_${_build}: Makefile 
182 echo '#include "${_src}"' > ${.TARGET} 
183 
184CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R} 
185 
186SRCS+= mpn_${_build} 
187CLEANFILES+= mpn_${_build} 
188.endfor 
cvs diff -r1.2 -r1.3 src/external/lgpl3/gmp/lib/libgmp/arch/m68k/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/m68k/Makefile.inc 2011/07/03 06:43:16 1.2
+++ src/external/lgpl3/gmp/lib/libgmp/arch/m68k/Makefile.inc 2012/11/26 18:57:35 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.2 2011/07/03 06:43:16 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.3 2012/11/26 18:57:35 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 divrem_2.c \ 5 divrem_2.c \
6 toom_interpolate_7pts.c \ 6 toom_interpolate_7pts.c \
7 sbpi1_divappr_q.c \ 7 sbpi1_divappr_q.c \
8 random2.c \ 8 random2.c \
9 mu_bdiv_q.c \ 9 mu_bdiv_q.c \
10 toom32_mul.c \ 10 toom32_mul.c \
11 toom44_mul.c \ 11 toom44_mul.c \
12 toom8h_mul.c \ 12 toom8h_mul.c \
13 toom2_sqr.c \ 13 toom2_sqr.c \
14 zero.c \ 14 zero.c \
@@ -151,38 +151,13 @@ ASM_SRCS_LIST= \ @@ -151,38 +151,13 @@ ASM_SRCS_LIST= \
151 rshift.asm mpn/m68k/rshift.asm \ 151 rshift.asm mpn/m68k/rshift.asm \
152 sub_n.asm mpn/m68k/aors_n.asm \ 152 sub_n.asm mpn/m68k/aors_n.asm \
153 153
154gen-trialdivtab: gen-trialdivtab.c 154gen-trialdivtab: gen-trialdivtab.c
155 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm 155 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
156 156
157GMP_LIMB_BITS=32 157GMP_LIMB_BITS=32
158 158
159trialdiv.c: trialdivtab.h 159trialdiv.c: trialdivtab.h
160trialdivtab.h: gen-trialdivtab 160trialdivtab.h: gen-trialdivtab
161 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 161 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
162 162
163CLEANFILES+= trialdivtab.h 163CLEANFILES+= trialdivtab.h
164 
165# XXX stuff looks for "../config.m4" 
166dummy: 
167 mkdir dummy 
168${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
169 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET} 
170 
171.for _build _src in ${ASM_SRCS_LIST} 
172${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4 
173 ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET} 
174 
175SRCS+= ${_build:R}.s 
176CLEANFILES+= ${_build:R}.s 
177 
178.endfor 
179 
180.for _build _src in ${C_SRCS_LIST} 
181mpn_${_build}: Makefile 
182 echo '#include "${_src}"' > ${.TARGET} 
183 
184CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R} 
185 
186SRCS+= mpn_${_build} 
187CLEANFILES+= mpn_${_build} 
188.endfor 
cvs diff -r1.2 -r1.3 src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc 2011/07/10 03:05:33 1.2
+++ src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc 2012/11/26 18:57:35 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.2 2011/07/10 03:05:33 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.3 2012/11/26 18:57:35 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 divrem_2.c \ 5 divrem_2.c \
6 toom_interpolate_7pts.c \ 6 toom_interpolate_7pts.c \
7 sbpi1_divappr_q.c \ 7 sbpi1_divappr_q.c \
8 random2.c \ 8 random2.c \
9 mu_bdiv_q.c \ 9 mu_bdiv_q.c \
10 toom32_mul.c \ 10 toom32_mul.c \
11 toom44_mul.c \ 11 toom44_mul.c \
12 toom8h_mul.c \ 12 toom8h_mul.c \
13 toom2_sqr.c \ 13 toom2_sqr.c \
14 zero.c \ 14 zero.c \
@@ -158,39 +158,14 @@ gen-trialdivtab: gen-trialdivtab.c @@ -158,39 +158,14 @@ gen-trialdivtab: gen-trialdivtab.c
158 158
159.if (defined(CPUFLAGS) && !empty(CPUFLAGS:M-mabi=64)) 159.if (defined(CPUFLAGS) && !empty(CPUFLAGS:M-mabi=64))
160GMP_LIMB_BITS=64 160GMP_LIMB_BITS=64
161.else 161.else
162GMP_LIMB_BITS=32 162GMP_LIMB_BITS=32
163.endif 163.endif
164 164
165trialdiv.c: trialdivtab.h 165trialdiv.c: trialdivtab.h
166trialdivtab.h: gen-trialdivtab Makefile 166trialdivtab.h: gen-trialdivtab Makefile
167 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 167 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
168 168
169CLEANFILES+= trialdivtab.h 169CLEANFILES+= trialdivtab.h
170 170
171# XXX stuff looks for "../config.m4" 
172dummy: 
173 mkdir dummy 
174${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
175 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET} 
176 
177.for _build _src in ${ASM_SRCS_LIST} 
178${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4 
179 ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET} 
180 
181SRCS+= ${_build:R}.s 
182CLEANFILES+= ${_build:R}.s 
183 
184.endfor 
185 
186.for _build _src in ${C_SRCS_LIST} 
187mpn_${_build}: Makefile 
188 echo '#include "${_src}"' > ${.TARGET} 
189 
190CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R} 
191 
192SRCS+= mpn_${_build} 
193CLEANFILES+= mpn_${_build} 
194.endfor 
195 
196COPTS+= -Wno-error 171COPTS+= -Wno-error
cvs diff -r1.2 -r1.3 src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/Makefile.inc 2011/07/10 03:05:34 1.2
+++ src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/Makefile.inc 2012/11/26 18:57:35 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.2 2011/07/10 03:05:34 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.3 2012/11/26 18:57:35 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 divrem_2.c \ 5 divrem_2.c \
6 toom_interpolate_7pts.c \ 6 toom_interpolate_7pts.c \
7 sbpi1_divappr_q.c \ 7 sbpi1_divappr_q.c \
8 random2.c \ 8 random2.c \
9 mu_bdiv_q.c \ 9 mu_bdiv_q.c \
10 toom32_mul.c \ 10 toom32_mul.c \
11 toom44_mul.c \ 11 toom44_mul.c \
12 toom8h_mul.c \ 12 toom8h_mul.c \
13 toom2_sqr.c \ 13 toom2_sqr.c \
14 zero.c \ 14 zero.c \
@@ -154,30 +154,14 @@ gen-trialdivtab: gen-trialdivtab.c @@ -154,30 +154,14 @@ gen-trialdivtab: gen-trialdivtab.c
154 154
155.if (defined(CPUFLAGS) && !empty(CPUFLAGS:M-mabi=64)) 155.if (defined(CPUFLAGS) && !empty(CPUFLAGS:M-mabi=64))
156GMP_LIMB_BITS=64 156GMP_LIMB_BITS=64
157.else 157.else
158GMP_LIMB_BITS=32 158GMP_LIMB_BITS=32
159.endif 159.endif
160 160
161trialdiv.c: trialdivtab.h 161trialdiv.c: trialdivtab.h
162trialdivtab.h: gen-trialdivtab Makefile 162trialdivtab.h: gen-trialdivtab Makefile
163 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 163 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
164 164
165CLEANFILES+= trialdivtab.h 165CLEANFILES+= trialdivtab.h
166 166
167# XXX stuff looks for "../config.m4" 
168dummy: 
169 mkdir dummy 
170${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
171 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET} 
172 
173.for _build _src in ${C_SRCS_LIST} 
174mpn_${_build}: Makefile 
175 echo '#include "${_src}"' > ${.TARGET} 
176 
177CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R} 
178 
179SRCS+= mpn_${_build} 
180CLEANFILES+= mpn_${_build} 
181.endfor 
182 
183COPTS+= -Wno-error 167COPTS+= -Wno-error
cvs diff -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/mipseb/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/mipseb/Makefile.inc 2011/07/03 11:41:30 1.1
+++ src/external/lgpl3/gmp/lib/libgmp/arch/mipseb/Makefile.inc 2012/11/26 18:57:35 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.1 2011/07/03 11:41:30 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.2 2012/11/26 18:57:35 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 divrem_2.c \ 5 divrem_2.c \
6 toom_interpolate_7pts.c \ 6 toom_interpolate_7pts.c \
7 sbpi1_divappr_q.c \ 7 sbpi1_divappr_q.c \
8 random2.c \ 8 random2.c \
9 mu_bdiv_q.c \ 9 mu_bdiv_q.c \
10 toom32_mul.c \ 10 toom32_mul.c \
11 toom44_mul.c \ 11 toom44_mul.c \
12 toom8h_mul.c \ 12 toom8h_mul.c \
13 toom2_sqr.c \ 13 toom2_sqr.c \
14 zero.c \ 14 zero.c \
@@ -154,38 +154,13 @@ ASM_SRCS_LIST= \ @@ -154,38 +154,13 @@ ASM_SRCS_LIST= \
154 154
155gen-trialdivtab: gen-trialdivtab.c 155gen-trialdivtab: gen-trialdivtab.c
156 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm 156 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
157 157
158# XXX 158# XXX
159# XXX is this right? 159# XXX is this right?
160GMP_LIMB_BITS=32 160GMP_LIMB_BITS=32
161 161
162trialdiv.c: trialdivtab.h 162trialdiv.c: trialdivtab.h
163trialdivtab.h: gen-trialdivtab 163trialdivtab.h: gen-trialdivtab
164 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 164 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
165 165
166CLEANFILES+= trialdivtab.h 166CLEANFILES+= trialdivtab.h
167 
168# XXX stuff looks for "../config.m4" 
169dummy: 
170 mkdir dummy 
171${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
172 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET} 
173 
174.for _build _src in ${ASM_SRCS_LIST} 
175${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4 
176 ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET} 
177 
178SRCS+= ${_build:R}.s 
179CLEANFILES+= ${_build:R}.s 
180 
181.endfor 
182 
183.for _build _src in ${C_SRCS_LIST} 
184mpn_${_build}: Makefile 
185 echo '#include "${_src}"' > ${.TARGET} 
186 
187CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R} 
188 
189SRCS+= mpn_${_build} 
190CLEANFILES+= mpn_${_build} 
191.endfor 
cvs diff -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/mipsel/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/mipsel/Makefile.inc 2011/07/03 11:41:30 1.1
+++ src/external/lgpl3/gmp/lib/libgmp/arch/mipsel/Makefile.inc 2012/11/26 18:57:35 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.1 2011/07/03 11:41:30 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.2 2012/11/26 18:57:35 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 divrem_2.c \ 5 divrem_2.c \
6 toom_interpolate_7pts.c \ 6 toom_interpolate_7pts.c \
7 sbpi1_divappr_q.c \ 7 sbpi1_divappr_q.c \
8 random2.c \ 8 random2.c \
9 mu_bdiv_q.c \ 9 mu_bdiv_q.c \
10 toom32_mul.c \ 10 toom32_mul.c \
11 toom44_mul.c \ 11 toom44_mul.c \
12 toom8h_mul.c \ 12 toom8h_mul.c \
13 toom2_sqr.c \ 13 toom2_sqr.c \
14 zero.c \ 14 zero.c \
@@ -154,38 +154,13 @@ ASM_SRCS_LIST= \ @@ -154,38 +154,13 @@ ASM_SRCS_LIST= \
154 154
155gen-trialdivtab: gen-trialdivtab.c 155gen-trialdivtab: gen-trialdivtab.c
156 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm 156 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
157 157
158# XXX 158# XXX
159# XXX is this right? 159# XXX is this right?
160GMP_LIMB_BITS=32 160GMP_LIMB_BITS=32
161 161
162trialdiv.c: trialdivtab.h 162trialdiv.c: trialdivtab.h
163trialdivtab.h: gen-trialdivtab 163trialdivtab.h: gen-trialdivtab
164 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 164 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
165 165
166CLEANFILES+= trialdivtab.h 166CLEANFILES+= trialdivtab.h
167 
168# XXX stuff looks for "../config.m4" 
169dummy: 
170 mkdir dummy 
171${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
172 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET} 
173 
174.for _build _src in ${ASM_SRCS_LIST} 
175${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4 
176 ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET} 
177 
178SRCS+= ${_build:R}.s 
179CLEANFILES+= ${_build:R}.s 
180 
181.endfor 
182 
183.for _build _src in ${C_SRCS_LIST} 
184mpn_${_build}: Makefile 
185 echo '#include "${_src}"' > ${.TARGET} 
186 
187CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R} 
188 
189SRCS+= mpn_${_build} 
190CLEANFILES+= mpn_${_build} 
191.endfor 
cvs diff -r1.3 -r1.4 src/external/lgpl3/gmp/lib/libgmp/arch/powerpc/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/powerpc/Makefile.inc 2011/07/07 08:02:52 1.3
+++ src/external/lgpl3/gmp/lib/libgmp/arch/powerpc/Makefile.inc 2012/11/26 18:57:35 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.3 2011/07/07 08:02:52 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.4 2012/11/26 18:57:35 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 toom_interpolate_7pts.c \ 5 toom_interpolate_7pts.c \
6 sbpi1_divappr_q.c \ 6 sbpi1_divappr_q.c \
7 random2.c \ 7 random2.c \
8 mu_bdiv_q.c \ 8 mu_bdiv_q.c \
9 toom32_mul.c \ 9 toom32_mul.c \
10 toom44_mul.c \ 10 toom44_mul.c \
11 toom8h_mul.c \ 11 toom8h_mul.c \
12 toom2_sqr.c \ 12 toom2_sqr.c \
13 zero.c \ 13 zero.c \
14 mod_1_4.c \ 14 mod_1_4.c \
@@ -157,42 +157,14 @@ ASM_SRCS_LIST= \ @@ -157,42 +157,14 @@ ASM_SRCS_LIST= \
157 157
158gen-trialdivtab: gen-trialdivtab.c 158gen-trialdivtab: gen-trialdivtab.c
159 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm 159 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
160 160
161# XXX 161# XXX
162GMP_LIMB_BITS=32 162GMP_LIMB_BITS=32
163 163
164trialdiv.c: trialdivtab.h 164trialdiv.c: trialdivtab.h
165trialdivtab.h: gen-trialdivtab 165trialdivtab.h: gen-trialdivtab
166 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 166 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
167 167
168CLEANFILES+= trialdivtab.h 168CLEANFILES+= trialdivtab.h
169 169
170# XXX stuff looks for "../config.m4" 
171dummy: 
172 mkdir dummy 
173${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
174 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET} 
175 
176BUILD_S_INCS= -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn 
177 
178M4FLAGS= -DPIC 170M4FLAGS= -DPIC
179.for _build _src in ${ASM_SRCS_LIST} 
180${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4 
181 ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} ${BUILD_S_INCS} \ 
182 ${M4FLAGS} ${M4FLAGS.${.TARGET:R}} \ 
183 -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET} 
184 
185SRCS+= ${_build:R}.s 
186CLEANFILES+= ${_build:R}.s 
187 
188.endfor 
189 
190.for _build _src in ${C_SRCS_LIST} 
191mpn_${_build}: Makefile 
192 echo '#include "${_src}"' > ${.TARGET} 
193 
194CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R} 
195 
196SRCS+= mpn_${_build} 
197CLEANFILES+= mpn_${_build} 
198.endfor 
cvs diff -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64/Makefile.inc 2011/10/29 09:16:54 1.1
+++ src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64/Makefile.inc 2012/11/26 18:57:36 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.1 2011/10/29 09:16:54 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.2 2012/11/26 18:57:36 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 divrem_2.c \ 5 divrem_2.c \
6 toom_interpolate_7pts.c \ 6 toom_interpolate_7pts.c \
7 sbpi1_divappr_q.c \ 7 sbpi1_divappr_q.c \
8 random2.c \ 8 random2.c \
9 mu_bdiv_q.c \ 9 mu_bdiv_q.c \
10 toom32_mul.c \ 10 toom32_mul.c \
11 toom44_mul.c \ 11 toom44_mul.c \
12 toom8h_mul.c \ 12 toom8h_mul.c \
13 toom2_sqr.c \ 13 toom2_sqr.c \
14 zero.c \ 14 zero.c \
@@ -155,42 +155,14 @@ ASM_SRCS_LIST= \ @@ -155,42 +155,14 @@ ASM_SRCS_LIST= \
155 155
156gen-trialdivtab: gen-trialdivtab.c 156gen-trialdivtab: gen-trialdivtab.c
157 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm 157 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
158 158
159# XXX 159# XXX
160GMP_LIMB_BITS=64 160GMP_LIMB_BITS=64
161 161
162trialdiv.c: trialdivtab.h 162trialdiv.c: trialdivtab.h
163trialdivtab.h: gen-trialdivtab 163trialdivtab.h: gen-trialdivtab
164 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 164 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
165 165
166CLEANFILES+= trialdivtab.h 166CLEANFILES+= trialdivtab.h
167 167
168# XXX stuff looks for "../config.m4" 
169dummy: 
170 mkdir dummy 
171${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
172 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET} 
173 
174BUILD_S_INCS= -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn 
175 
176M4FLAGS= -DPIC 168M4FLAGS= -DPIC
177.for _build _src in ${ASM_SRCS_LIST} 
178${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4 
179 ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} ${BUILD_S_INCS} \ 
180 ${M4FLAGS} ${M4FLAGS.${.TARGET:R}} \ 
181 -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET} 
182 
183SRCS+= ${_build:R}.s 
184CLEANFILES+= ${_build:R}.s 
185 
186.endfor 
187 
188.for _build _src in ${C_SRCS_LIST} 
189mpn_${_build}: Makefile 
190 echo '#include "${_src}"' > ${.TARGET} 
191 
192CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R} 
193 
194SRCS+= mpn_${_build} 
195CLEANFILES+= mpn_${_build} 
196.endfor 
cvs diff -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/sh3eb/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/sh3eb/Makefile.inc 2011/07/03 06:52:26 1.1
+++ src/external/lgpl3/gmp/lib/libgmp/arch/sh3eb/Makefile.inc 2012/11/26 18:57:36 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.1 2011/07/03 06:52:26 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.2 2012/11/26 18:57:36 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 divrem_2.c \ 5 divrem_2.c \
6 toom_interpolate_7pts.c \ 6 toom_interpolate_7pts.c \
7 sbpi1_divappr_q.c \ 7 sbpi1_divappr_q.c \
8 random2.c \ 8 random2.c \
9 mu_bdiv_q.c \ 9 mu_bdiv_q.c \
10 toom32_mul.c \ 10 toom32_mul.c \
11 toom44_mul.c \ 11 toom44_mul.c \
12 toom8h_mul.c \ 12 toom8h_mul.c \
13 toom2_sqr.c \ 13 toom2_sqr.c \
14 zero.c \ 14 zero.c \
@@ -149,29 +149,13 @@ C_SRCS_LIST= \ @@ -149,29 +149,13 @@ C_SRCS_LIST= \
149 iorn_n.c mpn/generic/logops_n.c \ 149 iorn_n.c mpn/generic/logops_n.c \
150 andn_n.c mpn/generic/logops_n.c \ 150 andn_n.c mpn/generic/logops_n.c \
151 151
152gen-trialdivtab: gen-trialdivtab.c 152gen-trialdivtab: gen-trialdivtab.c
153 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm 153 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
154 154
155GMP_LIMB_BITS=32 155GMP_LIMB_BITS=32
156 156
157trialdiv.c: trialdivtab.h 157trialdiv.c: trialdivtab.h
158trialdivtab.h: gen-trialdivtab 158trialdivtab.h: gen-trialdivtab
159 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 159 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
160 160
161CLEANFILES+= trialdivtab.h 161CLEANFILES+= trialdivtab.h
162 
163# XXX stuff looks for "../config.m4" 
164dummy: 
165 mkdir dummy 
166${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
167 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET} 
168 
169.for _build _src in ${C_SRCS_LIST} 
170mpn_${_build}: Makefile 
171 echo '#include "${_src}"' > ${.TARGET} 
172 
173CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R} 
174 
175SRCS+= mpn_${_build} 
176CLEANFILES+= mpn_${_build} 
177.endfor 
cvs diff -r1.1 -r1.2 src/external/lgpl3/gmp/lib/libgmp/arch/sh3el/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/sh3el/Makefile.inc 2011/07/03 06:52:27 1.1
+++ src/external/lgpl3/gmp/lib/libgmp/arch/sh3el/Makefile.inc 2012/11/26 18:57:36 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.1 2011/07/03 06:52:27 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.2 2012/11/26 18:57:36 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 divrem_2.c \ 5 divrem_2.c \
6 toom_interpolate_7pts.c \ 6 toom_interpolate_7pts.c \
7 sbpi1_divappr_q.c \ 7 sbpi1_divappr_q.c \
8 random2.c \ 8 random2.c \
9 mu_bdiv_q.c \ 9 mu_bdiv_q.c \
10 toom32_mul.c \ 10 toom32_mul.c \
11 toom44_mul.c \ 11 toom44_mul.c \
12 toom8h_mul.c \ 12 toom8h_mul.c \
13 toom2_sqr.c \ 13 toom2_sqr.c \
14 zero.c \ 14 zero.c \
@@ -149,29 +149,13 @@ C_SRCS_LIST= \ @@ -149,29 +149,13 @@ C_SRCS_LIST= \
149 iorn_n.c mpn/generic/logops_n.c \ 149 iorn_n.c mpn/generic/logops_n.c \
150 andn_n.c mpn/generic/logops_n.c \ 150 andn_n.c mpn/generic/logops_n.c \
151 151
152gen-trialdivtab: gen-trialdivtab.c 152gen-trialdivtab: gen-trialdivtab.c
153 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm 153 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
154 154
155GMP_LIMB_BITS=32 155GMP_LIMB_BITS=32
156 156
157trialdiv.c: trialdivtab.h 157trialdiv.c: trialdivtab.h
158trialdivtab.h: gen-trialdivtab 158trialdivtab.h: gen-trialdivtab
159 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 159 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
160 160
161CLEANFILES+= trialdivtab.h 161CLEANFILES+= trialdivtab.h
162 
163# XXX stuff looks for "../config.m4" 
164dummy: 
165 mkdir dummy 
166${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
167 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET} 
168 
169.for _build _src in ${C_SRCS_LIST} 
170mpn_${_build}: Makefile 
171 echo '#include "${_src}"' > ${.TARGET} 
172 
173CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R} 
174 
175SRCS+= mpn_${_build} 
176CLEANFILES+= mpn_${_build} 
177.endfor 
cvs diff -r1.3 -r1.4 src/external/lgpl3/gmp/lib/libgmp/arch/sparc/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/sparc/Makefile.inc 2011/07/08 09:21:17 1.3
+++ src/external/lgpl3/gmp/lib/libgmp/arch/sparc/Makefile.inc 2012/11/26 18:57:36 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.3 2011/07/08 09:21:17 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.4 2012/11/26 18:57:36 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 divrem_2.c \ 5 divrem_2.c \
6 toom_interpolate_7pts.c \ 6 toom_interpolate_7pts.c \
7 sbpi1_divappr_q.c \ 7 sbpi1_divappr_q.c \
8 random2.c \ 8 random2.c \
9 mu_bdiv_q.c \ 9 mu_bdiv_q.c \
10 toom32_mul.c \ 10 toom32_mul.c \
11 toom44_mul.c \ 11 toom44_mul.c \
12 toom8h_mul.c \ 12 toom8h_mul.c \
13 toom2_sqr.c \ 13 toom2_sqr.c \
14 zero.c \ 14 zero.c \
@@ -154,42 +154,14 @@ ASM_SRCS_LIST= \ @@ -154,42 +154,14 @@ ASM_SRCS_LIST= \
154 sub_n.asm mpn/sparc32/sub_n.asm \ 154 sub_n.asm mpn/sparc32/sub_n.asm \
155 155
156gen-trialdivtab: gen-trialdivtab.c 156gen-trialdivtab: gen-trialdivtab.c
157 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm 157 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
158 158
159GMP_LIMB_BITS=32 159GMP_LIMB_BITS=32
160 160
161trialdiv.c: trialdivtab.h 161trialdiv.c: trialdivtab.h
162trialdivtab.h: gen-trialdivtab 162trialdivtab.h: gen-trialdivtab
163 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 163 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
164 164
165CLEANFILES+= trialdivtab.h 165CLEANFILES+= trialdivtab.h
166 166
167# XXX stuff looks for "../config.m4" 
168dummy: 
169 mkdir dummy 
170${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
171 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET} 
172 
173BUILD_S_INCS= -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn 
174 
175M4FLAGS= -DPIC 167M4FLAGS= -DPIC
176.for _build _src in ${ASM_SRCS_LIST} 
177${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4 
178 ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} ${BUILD_S_INCS} \ 
179 ${M4FLAGS} ${M4FLAGS.${.TARGET:R}} \ 
180 -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET} 
181 
182SRCS+= ${_build:R}.s 
183CLEANFILES+= ${_build:R}.s 
184 
185.endfor 
186 
187.for _build _src in ${C_SRCS_LIST} 
188mpn_${_build}: Makefile 
189 echo '#include "${_src}"' > ${.TARGET} 
190 
191CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R} 
192 
193SRCS+= mpn_${_build} 
194CLEANFILES+= mpn_${_build} 
195.endfor 
cvs diff -r1.2 -r1.3 src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/Makefile.inc 2011/07/03 06:43:16 1.2
+++ src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/Makefile.inc 2012/11/26 18:57:36 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.2 2011/07/03 06:43:16 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.3 2012/11/26 18:57:36 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 divrem_2.c \ 5 divrem_2.c \
6 toom_interpolate_7pts.c \ 6 toom_interpolate_7pts.c \
7 sbpi1_divappr_q.c \ 7 sbpi1_divappr_q.c \
8 random2.c \ 8 random2.c \
9 mu_bdiv_q.c \ 9 mu_bdiv_q.c \
10 toom32_mul.c \ 10 toom32_mul.c \
11 toom44_mul.c \ 11 toom44_mul.c \
12 toom8h_mul.c \ 12 toom8h_mul.c \
13 toom2_sqr.c \ 13 toom2_sqr.c \
14 zero.c \ 14 zero.c \
@@ -156,39 +156,13 @@ ASM_SRCS_LIST= \ @@ -156,39 +156,13 @@ ASM_SRCS_LIST= \
156 sub_n.asm mpn/sparc64/sub_n.asm \ 156 sub_n.asm mpn/sparc64/sub_n.asm \
157 157
158gen-trialdivtab: gen-trialdivtab.c 158gen-trialdivtab: gen-trialdivtab.c
159 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm 159 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
160 160
161# XXX 161# XXX
162GMP_LIMB_BITS=64 162GMP_LIMB_BITS=64
163 163
164trialdiv.c: trialdivtab.h 164trialdiv.c: trialdivtab.h
165trialdivtab.h: gen-trialdivtab 165trialdivtab.h: gen-trialdivtab
166 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 166 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
167 167
168CLEANFILES+= trialdivtab.h 168CLEANFILES+= trialdivtab.h
169 
170# XXX stuff looks for "../config.m4" 
171dummy: 
172 mkdir dummy 
173${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
174 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET} 
175 
176.for _build _src in ${ASM_SRCS_LIST} 
177${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4 
178 ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET} 
179 
180SRCS+= ${_build:R}.s 
181CLEANFILES+= ${_build:R}.s 
182 
183.endfor 
184 
185.for _build _src in ${C_SRCS_LIST} 
186mpn_${_build}: Makefile 
187 echo '#include "${_src}"' > ${.TARGET} 
188 
189CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R} 
190 
191SRCS+= mpn_${_build} 
192CLEANFILES+= mpn_${_build} 
193.endfor 
194 
cvs diff -r1.3 -r1.4 src/external/lgpl3/gmp/lib/libgmp/arch/vax/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/vax/Makefile.inc 2011/07/03 06:43:17 1.3
+++ src/external/lgpl3/gmp/lib/libgmp/arch/vax/Makefile.inc 2012/11/26 18:57:36 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.3 2011/07/03 06:43:17 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.4 2012/11/26 18:57:36 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 divrem_2.c \ 5 divrem_2.c \
6 toom_interpolate_7pts.c \ 6 toom_interpolate_7pts.c \
7 sbpi1_divappr_q.c \ 7 sbpi1_divappr_q.c \
8 random2.c \ 8 random2.c \
9 mu_bdiv_q.c \ 9 mu_bdiv_q.c \
10 toom32_mul.c \ 10 toom32_mul.c \
11 toom44_mul.c \ 11 toom44_mul.c \
12 toom8h_mul.c \ 12 toom8h_mul.c \
13 toom2_sqr.c \ 13 toom2_sqr.c \
14 zero.c \ 14 zero.c \
@@ -164,38 +164,13 @@ C_SRCS_LIST+= \ @@ -164,38 +164,13 @@ C_SRCS_LIST+= \
164 sub_n.c mpn/generic/sub_n.c \ 164 sub_n.c mpn/generic/sub_n.c \
165 submul_1.c mpn/generic/submul_1.c \ 165 submul_1.c mpn/generic/submul_1.c \
166 166
167gen-trialdivtab: gen-trialdivtab.c 167gen-trialdivtab: gen-trialdivtab.c
168 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm 168 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
169 169
170GMP_LIMB_BITS=32 170GMP_LIMB_BITS=32
171 171
172DPSRCS+=trialdivtab.h 172DPSRCS+=trialdivtab.h
173trialdivtab.h: gen-trialdivtab 173trialdivtab.h: gen-trialdivtab
174 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 174 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
175 175
176CLEANFILES+= trialdivtab.h 176CLEANFILES+= trialdivtab.h
177 
178.for _build _src in ${ASM_SRCS_LIST} 
179${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4 ${_src} 
180 ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET} 
181 
182SRCS+= ${_build:R}.s 
183CLEANFILES+= ${_build:R}.s 
184 
185.endfor 
186 
187# XXX stuff looks for "../config.m4" 
188dummy: 
189 mkdir dummy 
190${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
191 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET} 
192 
193.for _build _src in ${C_SRCS_LIST} 
194mpn_${_build}: Makefile ${_src} 
195 echo '#include "${_src}"' > ${.TARGET} 
196 
197CPPFLAGS.mpn_${_build}+= -DOPERATION_${_build:R} 
198 
199SRCS+= mpn_${_build} 
200CLEANFILES+= mpn_${_build} 
201.endfor 
cvs diff -r1.3 -r1.4 src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/Makefile.inc (expand / switch to unified diff)

--- src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/Makefile.inc 2011/07/03 06:43:17 1.3
+++ src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/Makefile.inc 2012/11/26 18:57:36 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.3 2011/07/03 06:43:17 mrg Exp $ 1# $NetBSD: Makefile.inc,v 1.4 2012/11/26 18:57:36 drochner Exp $
2 2
3SRCS+= \ 3SRCS+= \
4 random.c \ 4 random.c \
5 toom_interpolate_7pts.c \ 5 toom_interpolate_7pts.c \
6 sbpi1_divappr_q.c \ 6 sbpi1_divappr_q.c \
7 random2.c \ 7 random2.c \
8 mu_bdiv_q.c \ 8 mu_bdiv_q.c \
9 toom32_mul.c \ 9 toom32_mul.c \
10 toom44_mul.c \ 10 toom44_mul.c \
11 toom8h_mul.c \ 11 toom8h_mul.c \
12 toom2_sqr.c \ 12 toom2_sqr.c \
13 zero.c \ 13 zero.c \
14 gcdext.c \ 14 gcdext.c \
@@ -165,28 +165,13 @@ ASM_SRCS_LIST= \ @@ -165,28 +165,13 @@ ASM_SRCS_LIST= \
165SRCS+= redc_1.c gcd_1.c mod_1_4.c 165SRCS+= redc_1.c gcd_1.c mod_1_4.c
166 166
167gen-trialdivtab: gen-trialdivtab.c 167gen-trialdivtab: gen-trialdivtab.c
168 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm 168 ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
169 169
170# XXX 170# XXX
171GMP_LIMB_BITS=64 171GMP_LIMB_BITS=64
172 172
173trialdiv.c: trialdivtab.h 173trialdiv.c: trialdivtab.h
174trialdivtab.h: gen-trialdivtab 174trialdivtab.h: gen-trialdivtab
175 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h 175 ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
176 176
177CLEANFILES+= trialdivtab.h 177CLEANFILES+= trialdivtab.h
178 
179# XXX stuff looks for "../config.m4" 
180dummy: 
181 mkdir dummy 
182${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 
183 cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET} 
184 
185.for _build _src in ${ASM_SRCS_LIST} 
186${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4 
187 ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn -DOPERATION_${.TARGET:R} ${DIST}/${_src} > ${.TARGET} 
188 
189SRCS+= ${_build:R}.s 
190CLEANFILES+= ${_build:R}.s 
191 
192.endfor