[src/trunk]: src/external/lgpl3/gmp/lib/libgmp consolidate the trialdivtab.h ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b389e1b21d6b
branches:  trunk
changeset: 325078:b389e1b21d6b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Dec 04 00:49:17 2013 +0000

description:
consolidate the trialdivtab.h generation code.

diffstat:

 external/lgpl3/gmp/lib/libgmp/Makefile                    |  27 ++++++++++++--
 external/lgpl3/gmp/lib/libgmp/arch/alpha/Makefile.inc     |  11 +-----
 external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc       |  11 +-----
 external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc     |  11 +-----
 external/lgpl3/gmp/lib/libgmp/arch/coldfire/Makefile.inc  |  11 +-----
 external/lgpl3/gmp/lib/libgmp/arch/earm/Makefile.inc      |  11 +-----
 external/lgpl3/gmp/lib/libgmp/arch/earmeb/Makefile.inc    |  11 +-----
 external/lgpl3/gmp/lib/libgmp/arch/earmhf/Makefile.inc    |  11 +-----
 external/lgpl3/gmp/lib/libgmp/arch/earmhfeb/Makefile.inc  |  11 +-----
 external/lgpl3/gmp/lib/libgmp/arch/hppa/Makefile.inc      |  11 +-----
 external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc      |  13 +------
 external/lgpl3/gmp/lib/libgmp/arch/ia64/Makefile.inc      |  13 +------
 external/lgpl3/gmp/lib/libgmp/arch/m68000/Makefile.inc    |  11 +-----
 external/lgpl3/gmp/lib/libgmp/arch/m68k/Makefile.inc      |  11 +-----
 external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc  |  11 +-----
 external/lgpl3/gmp/lib/libgmp/arch/mips64el/Makefile.inc  |  11 +-----
 external/lgpl3/gmp/lib/libgmp/arch/mipseb/Makefile.inc    |  13 +------
 external/lgpl3/gmp/lib/libgmp/arch/mipsel/Makefile.inc    |  13 +------
 external/lgpl3/gmp/lib/libgmp/arch/powerpc/Makefile.inc   |  12 +------
 external/lgpl3/gmp/lib/libgmp/arch/powerpc64/Makefile.inc |  12 +------
 external/lgpl3/gmp/lib/libgmp/arch/sh3eb/Makefile.inc     |  11 +-----
 external/lgpl3/gmp/lib/libgmp/arch/sh3el/Makefile.inc     |  11 +-----
 external/lgpl3/gmp/lib/libgmp/arch/sparc/Makefile.inc     |  11 +-----
 external/lgpl3/gmp/lib/libgmp/arch/sparc64/Makefile.inc   |  12 +------
 external/lgpl3/gmp/lib/libgmp/arch/vax/Makefile.inc       |  11 +-----
 external/lgpl3/gmp/lib/libgmp/arch/x86_64/Makefile.inc    |  12 +------
 26 files changed, 47 insertions(+), 267 deletions(-)

diffs (truncated from 685 to 300 lines):

diff -r f89242b7e91b -r b389e1b21d6b external/lgpl3/gmp/lib/libgmp/Makefile
--- a/external/lgpl3/gmp/lib/libgmp/Makefile    Tue Dec 03 22:42:55 2013 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/Makefile    Wed Dec 04 00:49:17 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.21 2013/12/01 09:29:37 martin Exp $
+#      $NetBSD: Makefile,v 1.22 2013/12/04 00:49:17 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -147,11 +147,13 @@
 
 .endfor
 
-CPPFLAGS+=     -I. -I${DIST} -I${.CURDIR}/arch/${GMP_MACHINE_ARCH} -D__GMP_WITHIN_GMP -DHAVE_CONFIG_H
+CPPFLAGS+=     -I. -I${DIST} -I${.CURDIR}/arch/${GMP_MACHINE_ARCH} \
+               -D__GMP_WITHIN_GMP -DHAVE_CONFIG_H
 
 WITHOUT_MAN=   yes
 
-DPSRCS= fac_table.h fib_table.h fib_table.c jacobitab.h mp_bases.h mp_bases.c perfsqr.h
+DPSRCS= fac_table.h fib_table.h fib_table.c jacobitab.h mp_bases.h \
+       mp_bases.c perfsqr.h trialdivtab.h
 
 gen-fac: gen-fac.c
        ${HOST_CC} -o ${.OBJDIR}/gen-fac ${.ALLSRC}
@@ -187,11 +189,25 @@
        ${HOST_CC} -o ${.OBJDIR}/gen-psqr ${.ALLSRC}
        ${.OBJDIR}/gen-psqr ${GMP_LIMB_BITS} 0 > ${.OBJDIR}/perfsqr.h
 
-CLEANFILES+=   ${DPSRCS} gen-fac gen-fib gen-bases gen-jacobitab gen-psqr gen-trialdivtab
+gen-trialdivtab: gen-trialdivtab.c
+       ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
 
+trialdiv.c: trialdivtab.h
+trialdivtab.h: gen-trialdivtab
+       ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
+
+CLEANFILES+=   ${DPSRCS} gen-fac gen-fib gen-bases gen-jacobitab \
+               gen-psqr gen-trialdivtab
 
 .include "${.CURDIR}/arch/${GMP_MACHINE_ARCH}/Makefile.inc"
 
+# Makefile.inc must define GMP_LIMB_BITS.
+.if !defined(GMP_LIMB_BITS)
+.BEGIN:
+       @echo "GMP_LIMB_BITS not defined!"
+       false
+.endif
+
 # XXX stuff looks for "../config.m4"
 dummy:
        mkdir dummy
@@ -203,7 +219,8 @@
 cleandummy: .PHONY
        -rmdir dummy
 
-BUILD_S_INCS=  -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn -I${.OBJDIR}
+BUILD_S_INCS=  -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn \
+               -I${.OBJDIR}
 
 .for _build _src in ${ASM_SRCS_LIST}
 ${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4 ${DIST}/${_src}
diff -r f89242b7e91b -r b389e1b21d6b external/lgpl3/gmp/lib/libgmp/arch/alpha/Makefile.inc
--- a/external/lgpl3/gmp/lib/libgmp/arch/alpha/Makefile.inc     Tue Dec 03 22:42:55 2013 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/alpha/Makefile.inc     Wed Dec 04 00:49:17 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.3 2013/11/29 08:03:41 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.4 2013/12/04 00:49:17 mrg Exp $
 
 SRCS+= \
        random.c \
@@ -189,13 +189,4 @@
        divrem_2.asm            mpn/alpha/divrem_2.asm \
        sub_n.asm               mpn/alpha/sub_n.asm \
 
-gen-trialdivtab: gen-trialdivtab.c
-       ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
-
 GMP_LIMB_BITS=64
-
-trialdiv.c: trialdivtab.h
-trialdivtab.h: gen-trialdivtab
-       ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
-
-CLEANFILES+=   trialdivtab.h
diff -r f89242b7e91b -r b389e1b21d6b external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc
--- a/external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc       Tue Dec 03 22:42:55 2013 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc       Wed Dec 04 00:49:17 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.5 2013/11/29 08:03:41 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.6 2013/12/04 00:49:17 mrg Exp $
 
 SRCS+= \
        random.c \
@@ -189,16 +189,7 @@
        addmul_1.asm            mpn/arm/aorsmul_1.asm \
        sub_n.asm               mpn/arm/aors_n.asm \
 
-gen-trialdivtab: gen-trialdivtab.c
-       ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
-
 GMP_LIMB_BITS=32
 
-trialdiv.c: trialdivtab.h
-trialdivtab.h: gen-trialdivtab
-       ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
-
-CLEANFILES+=   trialdivtab.h
-
 M4FLAGS= -DPIC
 COPTS+= -fPIC
diff -r f89242b7e91b -r b389e1b21d6b external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc
--- a/external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc     Tue Dec 03 22:42:55 2013 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc     Wed Dec 04 00:49:17 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.5 2013/11/29 08:03:41 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.6 2013/12/04 00:49:17 mrg Exp $
 
 SRCS+= \
        random.c \
@@ -189,16 +189,7 @@
        addmul_1.asm            mpn/arm/aorsmul_1.asm \
        sub_n.asm               mpn/arm/aors_n.asm \
 
-gen-trialdivtab: gen-trialdivtab.c
-       ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
-
 GMP_LIMB_BITS=32
 
-trialdiv.c: trialdivtab.h
-trialdivtab.h: gen-trialdivtab
-       ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
-
-CLEANFILES+=   trialdivtab.h
-
 M4FLAGS= -DPIC
 COPTS+= -fPIC
diff -r f89242b7e91b -r b389e1b21d6b external/lgpl3/gmp/lib/libgmp/arch/coldfire/Makefile.inc
--- a/external/lgpl3/gmp/lib/libgmp/arch/coldfire/Makefile.inc  Tue Dec 03 22:42:55 2013 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/coldfire/Makefile.inc  Wed Dec 04 00:49:17 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.2 2013/11/29 08:03:41 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.3 2013/12/04 00:49:17 mrg Exp $
 
 SRCS+= \
        random.c \
@@ -181,13 +181,4 @@
        sbpi1_div_r_sec.c       mpn/generic/sbpi1_div_sec.c \
        andn_n.c                mpn/generic/logops_n.c \
 
-gen-trialdivtab: gen-trialdivtab.c
-       ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
-
 GMP_LIMB_BITS=32
-
-trialdiv.c: trialdivtab.h
-trialdivtab.h: gen-trialdivtab
-       ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
-
-CLEANFILES+=   trialdivtab.h
diff -r f89242b7e91b -r b389e1b21d6b external/lgpl3/gmp/lib/libgmp/arch/earm/Makefile.inc
--- a/external/lgpl3/gmp/lib/libgmp/arch/earm/Makefile.inc      Tue Dec 03 22:42:55 2013 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/earm/Makefile.inc      Wed Dec 04 00:49:17 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.3 2013/11/29 08:03:41 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.4 2013/12/04 00:49:17 mrg Exp $
 
 SRCS+= \
        random.c \
@@ -189,16 +189,7 @@
        addmul_1.asm            mpn/arm/aorsmul_1.asm \
        sub_n.asm               mpn/arm/aors_n.asm \
 
-gen-trialdivtab: gen-trialdivtab.c
-       ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
-
 GMP_LIMB_BITS=32
 
-trialdiv.c: trialdivtab.h
-trialdivtab.h: gen-trialdivtab
-       ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
-
-CLEANFILES+=   trialdivtab.h
-
 M4FLAGS= -DPIC
 COPTS+= -fPIC
diff -r f89242b7e91b -r b389e1b21d6b external/lgpl3/gmp/lib/libgmp/arch/earmeb/Makefile.inc
--- a/external/lgpl3/gmp/lib/libgmp/arch/earmeb/Makefile.inc    Tue Dec 03 22:42:55 2013 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/earmeb/Makefile.inc    Wed Dec 04 00:49:17 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.2 2013/11/29 08:03:41 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.3 2013/12/04 00:49:17 mrg Exp $
 
 SRCS+= \
        random.c \
@@ -189,16 +189,7 @@
        addmul_1.asm            mpn/arm/aorsmul_1.asm \
        sub_n.asm               mpn/arm/aors_n.asm \
 
-gen-trialdivtab: gen-trialdivtab.c
-       ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
-
 GMP_LIMB_BITS=32
 
-trialdiv.c: trialdivtab.h
-trialdivtab.h: gen-trialdivtab
-       ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
-
-CLEANFILES+=   trialdivtab.h
-
 M4FLAGS= -DPIC
 COPTS+= -fPIC
diff -r f89242b7e91b -r b389e1b21d6b external/lgpl3/gmp/lib/libgmp/arch/earmhf/Makefile.inc
--- a/external/lgpl3/gmp/lib/libgmp/arch/earmhf/Makefile.inc    Tue Dec 03 22:42:55 2013 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/earmhf/Makefile.inc    Wed Dec 04 00:49:17 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.2 2013/11/29 08:03:42 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.3 2013/12/04 00:49:17 mrg Exp $
 
 SRCS+= \
        random.c \
@@ -189,16 +189,7 @@
        addmul_1.asm            mpn/arm/aorsmul_1.asm \
        sub_n.asm               mpn/arm/aors_n.asm \
 
-gen-trialdivtab: gen-trialdivtab.c
-       ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
-
 GMP_LIMB_BITS=32
 
-trialdiv.c: trialdivtab.h
-trialdivtab.h: gen-trialdivtab
-       ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
-
-CLEANFILES+=   trialdivtab.h
-
 M4FLAGS= -DPIC
 COPTS+= -fPIC
diff -r f89242b7e91b -r b389e1b21d6b external/lgpl3/gmp/lib/libgmp/arch/earmhfeb/Makefile.inc
--- a/external/lgpl3/gmp/lib/libgmp/arch/earmhfeb/Makefile.inc  Tue Dec 03 22:42:55 2013 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/earmhfeb/Makefile.inc  Wed Dec 04 00:49:17 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.2 2013/11/29 08:03:42 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.3 2013/12/04 00:49:17 mrg Exp $
 
 SRCS+= \
        random.c \
@@ -189,16 +189,7 @@
        addmul_1.asm            mpn/arm/aorsmul_1.asm \
        sub_n.asm               mpn/arm/aors_n.asm \
 
-gen-trialdivtab: gen-trialdivtab.c
-       ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
-
 GMP_LIMB_BITS=32
 
-trialdiv.c: trialdivtab.h
-trialdivtab.h: gen-trialdivtab
-       ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
-
-CLEANFILES+=   trialdivtab.h
-
 M4FLAGS= -DPIC
 COPTS+= -fPIC
diff -r f89242b7e91b -r b389e1b21d6b external/lgpl3/gmp/lib/libgmp/arch/hppa/Makefile.inc
--- a/external/lgpl3/gmp/lib/libgmp/arch/hppa/Makefile.inc      Tue Dec 03 22:42:55 2013 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/hppa/Makefile.inc      Wed Dec 04 00:49:17 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.3 2013/11/29 08:03:42 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.4 2013/12/04 00:49:18 mrg Exp $
 
 SRCS+= \
        random.c \
@@ -186,13 +186,4 @@
        addmul_1.asm            mpn/pa32/hppa1_1/pa7100/addmul_1.asm \
        sub_n.asm               mpn/pa32/hppa1_1/pa7100/sub_n.asm \
 
-gen-trialdivtab: gen-trialdivtab.c
-       ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
-
 GMP_LIMB_BITS=32
-
-trialdiv.c: trialdivtab.h
-trialdivtab.h: gen-trialdivtab
-       ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
-
-CLEANFILES+=   trialdivtab.h
diff -r f89242b7e91b -r b389e1b21d6b external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc
--- a/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc      Tue Dec 03 22:42:55 2013 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/i386/Makefile.inc      Wed Dec 04 00:49:17 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.7 2013/11/29 08:03:42 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.8 2013/12/04 00:49:18 mrg Exp $
 
 SRCS+= \
        random.c \
@@ -215,15 +215,4 @@
 # XXX? put in C_SRCS_LIST?
 # divrem.c