[src/trunk]: src/external/lgpl3/gmp repply the hacks from rev 1.2 to the gmp*...

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

details:   https://anonhg.NetBSD.org/src/rev/d8df59aeaf00
branches:  trunk
changeset: 791820:d8df59aeaf00
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Dec 04 01:03:15 2013 +0000

description:
repply the hacks from rev 1.2 to the gmp*.h files, and
make a note about it.

diffstat:

 external/lgpl3/gmp/README                                |  7 ++++++-
 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/gmp-mparam.h |  5 +++++
 external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp.h        |  6 ++++++
 5 files changed, 28 insertions(+), 1 deletions(-)

diffs (105 lines):

diff -r 4072d9bdd2a3 -r d8df59aeaf00 external/lgpl3/gmp/README
--- a/external/lgpl3/gmp/README Wed Dec 04 00:57:21 2013 +0000
+++ b/external/lgpl3/gmp/README Wed Dec 04 01:03:15 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.4 2013/07/15 08:59:47 mrg Exp $
+$NetBSD: README,v 1.5 2013/12/04 01:03:15 mrg Exp $
 
 GMP in NetBSD.  We need GMP for GCC >= 4.2.
 
@@ -44,6 +44,11 @@
 The amd64 port is a good reference to compare.  The trialdivtab.h
 generation may need to be moved the into libgmp/Makefile itself.
 
+This mips64* ports need some minor hacks to the generated gmp*.h
+files to fix their library builds for compat issues.  See these
+files in:
+       http://mail-index.netbsd.org/source-changes/2011/07/10/msg024467.html
+
 
 This is still a work in progress and methods used to build may be
 changed at any time.
diff -r 4072d9bdd2a3 -r d8df59aeaf00 external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp-mparam.h
--- a/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp-mparam.h  Wed Dec 04 00:57:21 2013 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp-mparam.h  Wed Dec 04 01:03:15 2013 +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 4072d9bdd2a3 -r d8df59aeaf00 external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h
--- a/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h Wed Dec 04 00:57:21 2013 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h Wed Dec 04 01:03:15 2013 +0000
@@ -31,7 +31,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)
@@ -56,7 +60,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 4072d9bdd2a3 -r d8df59aeaf00 external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp-mparam.h
--- a/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp-mparam.h  Wed Dec 04 00:57:21 2013 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp-mparam.h  Wed Dec 04 01:03:15 2013 +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 4072d9bdd2a3 -r d8df59aeaf00 external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp.h
--- a/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp.h Wed Dec 04 00:57:21 2013 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp.h Wed Dec 04 01:03:15 2013 +0000
@@ -31,7 +31,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)
@@ -56,7 +60,9 @@
 
 /* Instantiated by configure. */
 #if ! defined (__GMP_WITHIN_CONFIGURE)
+#ifdef _LP64
 #define _LONG_LONG_LIMB 1
+#endif
 #define __GMP_LIBGMP_DLL  0
 #endif