[src/trunk]: src make mips64 builds of gmp and mpfr work including compat libs.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src make mips64 builds of gmp and mpfr work including compat libs.
From: mrg <mrg%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 20:47:45 +0000

details:   https://anonhg.NetBSD.org/src/rev/aaf2dfd45416
branches:  trunk
changeset: 767160:aaf2dfd45416
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Jul 10 03:05:33 2011 +0000

description:
make mips64 builds of gmp and mpfr work including compat libs.

diffstat:

 compat/mips64/64/bsd.64.mk                               |   6 ++----
 compat/mips64/o32/bsd.o32.mk                             |   6 ++----
 external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc |  10 ++++++----
 external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp-mparam.h |   5 +++++
 external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h        |   6 ++++++
 external/lgpl3/gmp/lib/libgmp/arch/mips64el/Makefile.inc |  10 ++++++----
 external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp-mparam.h |   5 +++++
 external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp.h        |   6 ++++++
 8 files changed, 38 insertions(+), 16 deletions(-)

diffs (186 lines):

diff -r 434b686f4436 -r aaf2dfd45416 compat/mips64/64/bsd.64.mk
--- a/compat/mips64/64/bsd.64.mk        Sun Jul 10 02:41:50 2011 +0000
+++ b/compat/mips64/64/bsd.64.mk        Sun Jul 10 03:05:33 2011 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: bsd.64.mk,v 1.6 2011/07/04 12:00:49 mrg Exp $
+#      $NetBSD: bsd.64.mk,v 1.7 2011/07/10 03:05:33 mrg Exp $
 
 .if ${MACHINE_ARCH} == "mips64eb"
 LD+=           -m elf64btsmip
 .else
 LD+=           -m elf64ltsmip
 .endif
+LIBGMP_MACHINE_ARCH=   ${MACHINE_ARCH}
 MLIBDIR=       64
 
 COPTS+=                -mabi=64
@@ -13,7 +14,4 @@
 LDFLAGS+=      -mabi=64
 MKDEPFLAGS+=   -mabi=64
 
-LIBMPFR_MACHINE_ARCH=  mipseb
-LIBGMP_MACHINE_ARCH=   mipseb
-
 .include "${.PARSEDIR}/../../Makefile.compat"
diff -r 434b686f4436 -r aaf2dfd45416 compat/mips64/o32/bsd.o32.mk
--- a/compat/mips64/o32/bsd.o32.mk      Sun Jul 10 02:41:50 2011 +0000
+++ b/compat/mips64/o32/bsd.o32.mk      Sun Jul 10 03:05:33 2011 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: bsd.o32.mk,v 1.6 2011/07/04 12:00:49 mrg Exp $
+#      $NetBSD: bsd.o32.mk,v 1.7 2011/07/10 03:05:33 mrg Exp $
 
 .if ${MACHINE_ARCH} == "mips64eb"
 LD+=           -m elf32btsmip
 .else
 LD+=           -m elf32ltsmip
 .endif
+LIBGMP_MACHINE_ARCH=   ${MACHINE_ARCH}
 MLIBDIR=       o32
 
 COPTS+=                -mabi=32 -march=mips3
@@ -13,7 +14,4 @@
 LDFLAGS+=      -mabi=32 -march=mips3
 MKDEPFLAGS+=   -mabi=32 -march=mips3
 
-LIBMPFR_MACHINE_ARCH=  mipsel
-LIBGMP_MACHINE_ARCH=   mipsel
-
 .include "${.PARSEDIR}/../../Makefile.compat"
diff -r 434b686f4436 -r aaf2dfd45416 external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc
--- a/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc  Sun Jul 10 02:41:50 2011 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc  Sun Jul 10 03:05:33 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.1 2011/07/03 13:43:23 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.2 2011/07/10 03:05:33 mrg Exp $
 
 SRCS+= \
        random.c \
@@ -156,12 +156,14 @@
 gen-trialdivtab: gen-trialdivtab.c
        ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
 
-# XXX
-# XXX is this right?
+.if (defined(CPUFLAGS) && !empty(CPUFLAGS:M-mabi=64))
 GMP_LIMB_BITS=64
+.else
+GMP_LIMB_BITS=32
+.endif
 
 trialdiv.c: trialdivtab.h
-trialdivtab.h: gen-trialdivtab
+trialdivtab.h: gen-trialdivtab Makefile
        ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
 
 CLEANFILES+=   trialdivtab.h
diff -r 434b686f4436 -r aaf2dfd45416 external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp-mparam.h
--- a/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp-mparam.h  Sun Jul 10 02:41:50 2011 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp-mparam.h  Sun Jul 10 03:05:33 2011 +0000
@@ -19,8 +19,13 @@
 with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 
+#ifdef _ABI64
 #define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
+#else
+#define GMP_LIMB_BITS 32
+#define BYTES_PER_MP_LIMB 4
+#endif
 
 
 /* Generated by tuneup.c, 2004-02-10, gcc 3.2 & MIPSpro C 7.2.1 (R1x000) */
diff -r 434b686f4436 -r aaf2dfd45416 external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h
--- a/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h Sun Jul 10 02:41:50 2011 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h Sun Jul 10 03:05:33 2011 +0000
@@ -30,7 +30,11 @@
 #if ! defined (__GMP_WITHIN_CONFIGURE)
 #define __GMP_HAVE_HOST_CPU_FAMILY_power   0
 #define __GMP_HAVE_HOST_CPU_FAMILY_powerpc 0
+#ifdef _ABI64
 #define GMP_LIMB_BITS                      64
+#else
+#define GMP_LIMB_BITS                      32
+#endif
 #define GMP_NAIL_BITS                      0
 #endif
 #define GMP_NUMB_BITS     (GMP_LIMB_BITS - GMP_NAIL_BITS)
@@ -55,7 +59,9 @@
 
 /* Instantiated by configure. */
 #if ! defined (__GMP_WITHIN_CONFIGURE)
+#ifdef _LP64
 #define _LONG_LONG_LIMB 1
+#endif
 #define __GMP_LIBGMP_DLL  0
 #endif
 
diff -r 434b686f4436 -r aaf2dfd45416 external/lgpl3/gmp/lib/libgmp/arch/mips64el/Makefile.inc
--- a/external/lgpl3/gmp/lib/libgmp/arch/mips64el/Makefile.inc  Sun Jul 10 02:41:50 2011 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/mips64el/Makefile.inc  Sun Jul 10 03:05:33 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.1 2011/07/03 13:43:23 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.2 2011/07/10 03:05:34 mrg Exp $
 
 SRCS+= \
        random.c \
@@ -152,12 +152,14 @@
 gen-trialdivtab: gen-trialdivtab.c
        ${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
 
-# XXX
-# XXX is this right?
+.if (defined(CPUFLAGS) && !empty(CPUFLAGS:M-mabi=64))
 GMP_LIMB_BITS=64
+.else
+GMP_LIMB_BITS=32
+.endif
 
 trialdiv.c: trialdivtab.h
-trialdivtab.h: gen-trialdivtab
+trialdivtab.h: gen-trialdivtab Makefile
        ${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 > ${.OBJDIR}/trialdivtab.h
 
 CLEANFILES+=   trialdivtab.h
diff -r 434b686f4436 -r aaf2dfd45416 external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp-mparam.h
--- a/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp-mparam.h  Sun Jul 10 02:41:50 2011 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp-mparam.h  Sun Jul 10 03:05:33 2011 +0000
@@ -19,8 +19,13 @@
 with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 
+#ifdef _ABI64
 #define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
+#else
+#define GMP_LIMB_BITS 32
+#define BYTES_PER_MP_LIMB 4
+#endif
 
 
 /* Generated by tuneup.c, 2004-02-10, gcc 3.2 & MIPSpro C 7.2.1 (R1x000) */
diff -r 434b686f4436 -r aaf2dfd45416 external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp.h
--- a/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp.h Sun Jul 10 02:41:50 2011 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp.h Sun Jul 10 03:05:33 2011 +0000
@@ -30,7 +30,11 @@
 #if ! defined (__GMP_WITHIN_CONFIGURE)
 #define __GMP_HAVE_HOST_CPU_FAMILY_power   0
 #define __GMP_HAVE_HOST_CPU_FAMILY_powerpc 0
+#ifdef _ABI64
 #define GMP_LIMB_BITS                      64
+#else
+#define GMP_LIMB_BITS                      32
+#endif
 #define GMP_NAIL_BITS                      0
 #endif
 #define GMP_NUMB_BITS     (GMP_LIMB_BITS - GMP_NAIL_BITS)
@@ -55,7 +59,9 @@
 
 /* Instantiated by configure. */
 #if ! defined (__GMP_WITHIN_CONFIGURE)
+#ifdef _LP64
 #define _LONG_LONG_LIMB 1
+#endif
 #define __GMP_LIBGMP_DLL  0
 #endif

Prev by Date: [src/trunk]: src/external/gpl3/gcc/lib/libgcc add a hack for emips libgcc (32...
Next by Date: [src/trunk]: src/share/mk Add OBJCOPY_ELF2AOUT_FLAGS for some arm ports to cr...
Previous by Thread: [src/trunk]: src/external/gpl3/gcc/lib/libgcc add a hack for emips libgcc (32...
Next by Thread: [src/trunk]: src/share/mk Add OBJCOPY_ELF2AOUT_FLAGS for some arm ports to cr...
Indexes:

Home | Main Index | Thread Index | Old Index