Implement new integer-gmp2 from scratch (re #9281)

This is done as a separate `integer-gmp2` backend library because it turned out to become a complete rewrite from scratch. Due to the different (over)allocation scheme and potentially different accounting (via the new `{shrink,resize}MutableByteArray#` primitives), some of the nofib benchmarks actually results in increased allocation numbers (but not necessarily an increase in runtime!). I believe the allocation numbers could improve if `{resize,shrink}MutableByteArray#` could be optimised to reallocate in-place more efficiently. Here are the more apparent changes in the latest nofib comparision between `integer-gmp` and `integer-gmp2`: ------------------------------------------------------------------ Program Size Allocs Runtime Elapsed TotalMem ------------------------------------------------------------------ ... bernouilli +1.6% +15.3% 0.132 0.132 0.0% ... cryptarithm1 -2.2% 0.0% -9.7% -9.7% 0.0% ... fasta -0.7% -0.0% +10.9% +10.9% 0.0% ... kahan +0.6% +38.9% 0.169 0.169 0.0% ... lcss -0.7% -0.0% -6.4% -6.4% 0.0% ... mandel +1.6% +33.6% 0.049 0.049 0.0% ... pidigits +0.8% +8.5% +3.9% +3.9% 0.0% power +1.4% -23.8% -18.6% -18.6% -16.7% ... primetest +1.3% +50.1% 0.085 0.085 0.0% ... rsa +1.6% +53.4% 0.026 0.026 0.0% ... scs +1.2% +6.6% +6.5% +6.6% +14.3% ... symalg +1.0% +9.5% 0.010 0.010 0.0% ... transform -0.6% -0.0% -5.9% -5.9% 0.0% ... ------------------------------------------------------------------ Min -2.3% -23.8% -18.6% -18.6% -16.7% Max +1.6% +53.4% +10.9% +10.9% +14.3% Geometric Mean -0.3% +1.9% -0.8% -0.8% +0.0% (see P35 / https://phabricator.haskell.org/P35 for full report) By default, `INTEGER_LIBRARY=integer-gmp2` is active now, which results in the package `integer-gmp-1.0.0.0` being registered in the package db. The previous `integer-gmp-0.5.1.0` can be restored by setting `INTEGER_LIBRARY=integer-gmp` (but will probably be removed altogether for GHC 7.12). In-tree GMP support has been stolen from the old `integer-gmp` (while unpatching the custom memory-allocators, as well as forcing `-fPIC`) A minor hack to `ghc-cabal` was necessary in order to support two different `integer-gmp` packages (in different folders) with the same package key. There will be a couple of follow-up commits re-implementing some features that were dropped to keep D82 minimal, as well as further clean-ups/improvements. More information can be found via #9281 and https://ghc.haskell.org/trac/ghc/wiki/Design/IntegerGmp2 Reviewed By: austin, rwbarton, simonmar Differential Revision: https://phabricator.haskell.org/D82
author: Herbert Valerio Riedel <hvr@gnu.org> 2014-10-19 20:37:40 +0200
committer: Herbert Valerio Riedel <hvr@gnu.org> 2014-11-12 11:03:42 +0100
commit: c774b28f76ee4c220f7c1c9fd81585e0e3af0e8a (patch)
tree: 9fc156d8e3c7d8fd414b572826f139c1efa5f34c
parent: fcfc87dce752c3c1702eeb54d1023213729f1832 (diff)
download: haskell-c774b28f76ee4c220f7c1c9fd81585e0e3af0e8a.tar.gz
40 files changed, 6103 insertions, 18 deletions
diff --git a/compiler/basicTypes/Module.lhs b/compiler/basicTypes/Module.lhs
index edd2986ed3..57f02d9b2a 100644
--- a/compiler/basicTypes/Module.lhs
+++ b/compiler/basicTypes/Module.lhs
@@ -380,7 +380,12 @@ integerPackageKey, primPackageKey,
   thPackageKey, dphSeqPackageKey, dphParPackageKey,
   mainPackageKey, thisGhcPackageKey, interactivePackageKey  :: PackageKey
 primPackageKey        = fsToPackageKey (fsLit "ghc-prim")
-integerPackageKey     = fsToPackageKey (fsLit cIntegerLibrary)
+integerPackageKey     = fsToPackageKey (fsLit n)
+  where
+    n = case cIntegerLibraryType of
+        IntegerGMP    -> "integer-gmp"
+        IntegerGMP2   -> "integer-gmp"
+        IntegerSimple -> "integer-simple"
 basePackageKey        = fsToPackageKey (fsLit "base")
 rtsPackageKey         = fsToPackageKey (fsLit "rts")
 thPackageKey          = fsToPackageKey (fsLit "template-haskell")
diff --git a/compiler/coreSyn/CorePrep.lhs b/compiler/coreSyn/CorePrep.lhs
index 374b98ece9..537cc01b43 100644
--- a/compiler/coreSyn/CorePrep.lhs
+++ b/compiler/coreSyn/CorePrep.lhs
@@ -1123,7 +1123,8 @@ lookupIntegerSDataConName :: DynFlags -> HscEnv -> IO (Maybe DataCon)
 lookupIntegerSDataConName dflags hsc_env = case cIntegerLibraryType of
     IntegerGMP -> guardIntegerUse dflags $ liftM Just $
                   initTcForLookup hsc_env (tcLookupDataCon integerSDataConName)
-
+    IntegerGMP2-> guardIntegerUse dflags $ liftM Just $
+                  initTcForLookup hsc_env (tcLookupDataCon integerSDataConName)
     IntegerSimple -> return Nothing
 
 -- | Helper for 'lookupMkIntegerName' and 'lookupIntegerSDataConName'
diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index b5f5dbce8f..46773d840f 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -53,8 +53,10 @@ compiler/stage%/build/Config.hs : mk/config.mk mk/project.mk | $$(dir $$@)/.
 	@echo                                                               >> $@
 	@echo '#include "ghc_boot_platform.h"'                              >> $@
 	@echo                                                               >> $@
-	@echo 'data IntegerLibrary = IntegerGMP | IntegerSimple'            >> $@
-	@echo '    deriving Eq'                                             >> $@
+	@echo 'data IntegerLibrary = IntegerGMP'                            >> $@
+	@echo '                    | IntegerGMP2'                           >> $@
+	@echo '                    | IntegerSimple'                         >> $@
+	@echo '                    deriving Eq'                             >> $@
 	@echo                                                               >> $@
 	@echo 'cBuildPlatformString :: String'                              >> $@
 	@echo 'cBuildPlatformString = BuildPlatform_NAME'                   >> $@
@@ -84,6 +86,8 @@ compiler/stage%/build/Config.hs : mk/config.mk mk/project.mk | $$(dir $$@)/.
 	@echo 'cIntegerLibraryType   :: IntegerLibrary'                     >> $@
 ifeq "$(INTEGER_LIBRARY)" "integer-gmp"
 	@echo 'cIntegerLibraryType   = IntegerGMP'                          >> $@
+else ifeq "$(INTEGER_LIBRARY)" "integer-gmp2"
+	@echo 'cIntegerLibraryType   = IntegerGMP2'                         >> $@
 else ifeq "$(INTEGER_LIBRARY)" "integer-simple"
 	@echo 'cIntegerLibraryType   = IntegerSimple'                       >> $@
 else ifneq "$(CLEANING)" "YES"
diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs
index f6699415c5..6e40546d2c 100644
--- a/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
@@ -356,6 +356,7 @@ basicKnownKeyNames
         , ghciIoClassName, ghciStepIoMName
     ] ++ case cIntegerLibraryType of
            IntegerGMP    -> [integerSDataConName]
+           IntegerGMP2   -> [integerSDataConName]
            IntegerSimple -> []
 
 genericTyConNames :: [Name]
@@ -936,6 +937,7 @@ integerTyConName      = tcQual  gHC_INTEGER_TYPE (fsLit "Integer")           int
 integerSDataConName   = conName gHC_INTEGER_TYPE (fsLit n)                   integerSDataConKey
   where n = case cIntegerLibraryType of
             IntegerGMP    -> "S#"
+            IntegerGMP2   -> "S#"
             IntegerSimple -> panic "integerSDataConName evaluated for integer-simple"
 mkIntegerName         = varQual gHC_INTEGER_TYPE (fsLit "mkInteger")         mkIntegerIdKey
 integerToWord64Name   = varQual gHC_INTEGER_TYPE (fsLit "integerToWord64")   integerToWord64IdKey
diff --git a/ghc.mk b/ghc.mk
index d6f1bef23f..587152de52 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -590,7 +590,9 @@ libraries/ghc-prim_dist-install_EXTRA_HADDOCK_SRCS = libraries/ghc-prim/dist-ins
 
 ifneq "$(CLEANING)" "YES"
 ifeq "$(INTEGER_LIBRARY)" "integer-gmp"
-libraries/base_dist-install_CONFIGURE_OPTS += --flags=-integer-simple
+libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-gmp
+else ifeq "$(INTEGER_LIBRARY)" "integer-gmp2"
+libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-gmp2
 else ifeq "$(INTEGER_LIBRARY)" "integer-simple"
 libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-simple
 else
@@ -657,6 +659,12 @@ BUILD_DIRS += libraries/integer-gmp/gmp
 BUILD_DIRS += libraries/integer-gmp/mkGmpDerivedConstants
 endif
 
+ifeq "$(INTEGER_LIBRARY)" "integer-gmp2"
+BUILD_DIRS += libraries/integer-gmp2/gmp
+else ifneq "$(findstring clean,$(MAKECMDGOALS))" ""
+BUILD_DIRS += libraries/integer-gmp2/gmp
+endif
+
 BUILD_DIRS += utils/haddock
 BUILD_DIRS += utils/haddock/doc
 BUILD_DIRS += compiler
@@ -1212,6 +1220,7 @@ sdist_%:
 CLEAN_FILES += libraries/bootstrapping.conf
 CLEAN_FILES += libraries/integer-gmp/cbits/GmpDerivedConstants.h
 CLEAN_FILES += libraries/integer-gmp/include/HsIntegerGmp.h
+CLEAN_FILES += libraries/integer-gmp2/include/HsIntegerGmp.h
 CLEAN_FILES += libraries/base/include/EventConfig.h
 CLEAN_FILES += mk/config.mk.old
 CLEAN_FILES += mk/project.mk.old
diff --git a/libraries/base/GHC/Real.hs b/libraries/base/GHC/Real.hs
index dd806bc561..2b5f6cc78d 100644
--- a/libraries/base/GHC/Real.hs
+++ b/libraries/base/GHC/Real.hs
@@ -27,7 +27,11 @@ import GHC.Show
 import {-# SOURCE #-} GHC.Exception( divZeroException, overflowException, ratioZeroDenomException )
 
 #ifdef OPTIMISE_INTEGER_GCD_LCM
+# if defined(MIN_VERSION_integer_gmp) || defined(MIN_VERSION_integer_gmp2)
 import GHC.Integer.GMP.Internals
+# else
+#  error unsupported OPTIMISE_INTEGER_GCD_LCM configuration
+# endif
 #endif
 
 infixr 8  ^, ^^
diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
index 7e5ca15476..c3f4d28a1e 100644
--- a/libraries/base/base.cabal
+++ b/libraries/base/base.cabal
@@ -44,6 +44,18 @@ source-repository head
 
 Flag integer-simple
     Description: Use integer-simple
+    Manual: True
+    Default: False
+
+Flag integer-gmp
+    Description: Use integer-gmp
+    Manual: True
+    Default: False
+
+Flag integer-gmp2
+    Description: Use integer-gmp2
+    Manual: True
+    Default: False
 
 Library
     default-language: Haskell2010
@@ -90,10 +102,15 @@ Library
     build-depends: rts == 1.0.*, ghc-prim >= 0.3.1 && < 0.4
     if flag(integer-simple)
         build-depends: integer-simple >= 0.1.1 && < 0.2
-    else
+
+    if flag(integer-gmp)
         build-depends: integer-gmp >= 0.5.1 && < 0.6
         cpp-options: -DOPTIMISE_INTEGER_GCD_LCM
 
+    if flag(integer-gmp2)
+        build-depends: integer-gmp >= 1.0 && < 1.1
+        cpp-options: -DOPTIMISE_INTEGER_GCD_LCM
+
     exposed-modules:
         Control.Applicative
         Control.Arrow
diff --git a/libraries/integer-gmp2/.gitignore b/libraries/integer-gmp2/.gitignore
new file mode 100644
index 0000000000..98b7b18898
--- /dev/null
+++ b/libraries/integer-gmp2/.gitignore
@@ -0,0 +1,13 @@
+/GNUmakefile
+/autom4te.cache/
+/config.log
+/config.status
+/configure
+/dist-install/
+/ghc.mk
+/gmp/config.mk
+/include/HsIntegerGmp.h
+/integer-gmp.buildinfo
+
+/gmp/gmp.h
+/gmp/gmpbuild
diff --git a/libraries/integer-gmp2/LICENSE b/libraries/integer-gmp2/LICENSE
new file mode 100644
index 0000000000..0ce51e0bd0
--- /dev/null
+++ b/libraries/integer-gmp2/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2014, Herbert Valerio Riedel
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Herbert Valerio Riedel nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libraries/integer-gmp2/Setup.hs b/libraries/integer-gmp2/Setup.hs
new file mode 100644
index 0000000000..54f57d6f11
--- /dev/null
+++ b/libraries/integer-gmp2/Setup.hs
@@ -0,0 +1,6 @@
+module Main (main) where
+
+import Distribution.Simple
+
+main :: IO ()
+main = defaultMainWithHooks autoconfUserHooks
diff --git a/libraries/integer-gmp2/aclocal.m4 b/libraries/integer-gmp2/aclocal.m4
new file mode 100644
index 0000000000..be248615f5
--- /dev/null
+++ b/libraries/integer-gmp2/aclocal.m4
@@ -0,0 +1,44 @@
+
+dnl--------------------------------------------------------------------
+dnl * Check whether this machine has gmp/gmp3 installed
+dnl--------------------------------------------------------------------
+
+AC_DEFUN([LOOK_FOR_GMP_LIB],[
+    if test "$HaveFrameworkGMP" = "NO"
+    then
+        AC_CHECK_LIB([gmp],  [__gmpz_powm],
+                     [HaveLibGmp=YES; GMP_LIBS=gmp])
+        if test "$HaveLibGmp" = "NO"
+        then
+            AC_CHECK_LIB([gmp3], [__gmpz_powm],
+                         [HaveLibGmp=YES; GMP_LIBS=gmp3])
+        fi
+        if test "$HaveLibGmp" = "YES"
+        then
+            AC_CHECK_LIB([$GMP_LIBS], [__gmpz_powm_sec],
+                         [HaveSecurePowm=1])
+        fi
+    fi
+])
+
+dnl--------------------------------------------------------------------
+dnl * Mac OS X only: check for GMP.framework
+dnl--------------------------------------------------------------------
+
+AC_DEFUN([LOOK_FOR_GMP_FRAMEWORK],[
+    if test "$HaveLibGmp" = "NO"
+    then
+        case $target_os in
+        darwin*)
+            AC_MSG_CHECKING([for GMP.framework])
+            save_libs="$LIBS"
+            LIBS="-framework GMP"
+            AC_TRY_LINK_FUNC(__gmpz_powm_sec,
+                             [HaveFrameworkGMP=YES; GMP_FRAMEWORK=GMP])
+            LIBS="$save_libs"
+            AC_MSG_RESULT([$HaveFrameworkGMP])
+            ;;
+        esac
+    fi
+])
+
diff --git a/libraries/integer-gmp2/cbits/wrappers.c b/libraries/integer-gmp2/cbits/wrappers.c
new file mode 100644
index 0000000000..ecee592317
--- /dev/null
+++ b/libraries/integer-gmp2/cbits/wrappers.c
@@ -0,0 +1,281 @@
+#define _ISOC99_SOURCE
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <math.h>
+#include <float.h>
+#include <stdio.h>
+
+#include <gmp.h>
+
+#include "HsFFI.h"
+#include "MachDeps.h"
+
+#if (GMP_NUMB_BITS) != (GMP_LIMB_BITS)
+# error GMP_NUMB_BITS != GMP_LIMB_BITS not supported
+#endif
+
+#if (WORD_SIZE_IN_BITS) != (GMP_LIMB_BITS)
+# error WORD_SIZE_IN_BITS != GMP_LIMB_BITS not supported
+#endif
+
+// sanity check
+#if (SIZEOF_HSWORD*8) != WORD_SIZE_IN_BITS
+# error (SIZEOF_HSWORD*8) != WORD_SIZE_IN_BITS
+#endif
+
+/* Perform arithmetic right shift on MPNs (multi-precision naturals)
+ *
+ * pre-conditions:
+ *  - 0 < count < sn*GMP_NUMB_BITS
+ *  - rn = sn - floor(count / GMP_NUMB_BITS)
+ *  - sn > 0
+ *
+ * write {sp,sn} right-shifted by count bits into {rp,rn}
+ *
+ * return value: most-significant limb stored in {rp,rn} result
+ */
+mp_limb_t
+integer_gmp_mpn_rshift (mp_limb_t rp[], const mp_limb_t sp[], mp_size_t sn,
+                        mp_bitcnt_t count)
+{
+  const mp_size_t    limb_shift = count / GMP_NUMB_BITS;
+  const unsigned int bit_shift  = count % GMP_NUMB_BITS;
+  const mp_size_t    rn         = sn - limb_shift;
+
+  if (bit_shift)
+    mpn_rshift(rp, &sp[limb_shift], rn, bit_shift);
+  else
+    memcpy(rp, &sp[limb_shift], rn*sizeof(mp_limb_t));
+
+  return rp[rn-1];
+}
+
+/* Twos-complement version of 'integer_gmp_mpn_rshift' for performing
+ * arithmetic right shifts on "negative" MPNs.
+ *
+ * Same pre-conditions as 'integer_gmp_mpn_rshift'
+ *
+ * This variant is needed to operate on MPNs interpreted as negative
+ * numbers, which require "rounding" towards minus infinity iff a
+ * non-zero bit is shifted out.
+ */
+mp_limb_t
+integer_gmp_mpn_rshift_2c (mp_limb_t rp[], const mp_limb_t sp[],
+                           const mp_size_t sn, const mp_bitcnt_t count)
+{
+  const mp_size_t    limb_shift = count / GMP_NUMB_BITS;
+  const unsigned int bit_shift  = count % GMP_NUMB_BITS;
+  const mp_size_t    rn         = sn - limb_shift;
+
+  // whether non-zero bits were shifted out
+  bool nz_shift_out = false;
+
+  if (bit_shift) {
+    if (mpn_rshift(rp, &sp[limb_shift], rn, bit_shift))
+      nz_shift_out = true;
+  } else
+    memcpy(rp, &sp[limb_shift], rn*sizeof(mp_limb_t));
+
+  if (!nz_shift_out)
+    for (unsigned i = 0; i < limb_shift; i++)
+      if (sp[i]) {
+        nz_shift_out = true;
+        break;
+      }
+
+  // round if non-zero bits were shifted out
+  if (nz_shift_out)
+    if (mpn_add_1(rp, rp, rn, 1))
+      abort(); /* should never happen */
+
+  return rp[rn-1];
+}
+
+/* Perform left-shift operation on MPN
+ *
+ * pre-conditions:
+ *  - 0 < count
+ *  - rn = sn + ceil(count / GMP_NUMB_BITS)
+ *  - sn > 0
+ *
+ * return value: most-significant limb stored in {rp,rn} result
+ */
+mp_limb_t
+integer_gmp_mpn_lshift (mp_limb_t rp[], const mp_limb_t sp[],
+                        const mp_size_t sn, const mp_bitcnt_t count)
+{
+  const mp_size_t    limb_shift = count / GMP_NUMB_BITS;
+  const unsigned int bit_shift  = count % GMP_NUMB_BITS;
+  const mp_size_t    rn0        = sn + limb_shift;
+
+  memset(rp, 0, limb_shift*sizeof(mp_limb_t));
+  if (bit_shift) {
+    const mp_limb_t msl = mpn_lshift(&rp[limb_shift], sp, sn, bit_shift);
+    rp[rn0] = msl;
+    return msl;
+  } else {
+    memcpy(&rp[limb_shift], sp, sn*sizeof(mp_limb_t));
+    return rp[rn0-1];
+  }
+}
+
+/*
+ *
+ * sign of mp_size_t argument controls sign of converted double
+ */
+HsDouble
+integer_gmp_mpn_get_d (const mp_limb_t sp[], const mp_size_t sn,
+                       const HsInt exponent)
+{
+  if (sn == 0)
+    return 0.0; // should not happen
+
+  if (sn == 1 && sp[0] == 0)
+    return 0.0;
+
+  __mpz_struct const mpz = {
+    ._mp_alloc = abs(sn),
+    ._mp_size  = sn,
+    ._mp_d = (mp_limb_t*)sp
+  };
+
+  if (!exponent)
+    return mpz_get_d(&mpz);
+
+  long e = 0;
+  double d = mpz_get_d_2exp (&e, &mpz);
+
+  // TODO: over/underflow handling?
+  return ldexp(d, e+exponent);
+}
+
+mp_limb_t
+integer_gmp_gcd_word(const mp_limb_t x, const mp_limb_t y)
+{
+  if (!x) return y;
+  if (!y) return x;
+
+  return mpn_gcd_1(&x, 1, y);
+}
+
+mp_limb_t
+integer_gmp_mpn_gcd_1(const mp_limb_t x[], const mp_size_t xn,
+                      const mp_limb_t y)
+{
+  assert (xn > 0);
+  assert (xn == 1 || y != 0);
+
+  if (xn == 1)
+    return integer_gmp_gcd_word(x[0], y);
+
+  return mpn_gcd_1(x, xn, y);
+}
+
+
+mp_size_t
+integer_gmp_mpn_gcd(mp_limb_t r[],
+                    const mp_limb_t x0[], const mp_size_t xn,
+                    const mp_limb_t y0[], const mp_size_t yn)
+{
+  assert (xn >= yn);
+  assert (yn > 0);
+  assert (xn == yn || yn > 1 || y0[0] != 0);
+  /* post-condition: rn <= xn */
+
+  if (yn == 1) {
+    if (y0[0]) {
+      r[0] = integer_gmp_mpn_gcd_1(x0, xn, y0[0]);
+      return 1;
+    } else { /* {y0,yn} == 0 */
+      assert (xn==yn); /* NB: redundant assertion */
+      memcpy(r, x0, xn*sizeof(mp_limb_t));
+      return xn;
+    }
+  } else {
+    // mpn_gcd() seems to require non-trivial normalization of its
+    // input arguments (which does not seem to be documented anywhere,
+    // see source of mpz_gcd() for more details), so we resort to just
+    // use mpz_gcd() which does the tiresome normalization for us at
+    // the cost of a few additional temporary buffer allocations in
+    // C-land.
+
+    const mpz_t op1 = {{
+      ._mp_alloc = xn,
+      ._mp_size  = xn,
+      ._mp_d = (mp_limb_t*)x0
+      }};
+
+    const mpz_t op2 = {{
+      ._mp_alloc = yn,
+      ._mp_size  = yn,
+      ._mp_d = (mp_limb_t*)y0
+      }};
+
+    mpz_t rop;
+    mpz_init (rop);
+
+    mpz_gcd(rop, op1, op2);
+
+    const mp_size_t rn = rop[0]._mp_size;
+    assert(rn > 0);
+    assert(rn <= xn);
+
+    /* the allocation/memcpy of the result can be neglectable since
+       mpz_gcd() already has to allocate other temporary buffers
+       anyway */
+    memcpy(r, rop[0]._mp_d, rn*sizeof(mp_limb_t));
+
+    mpz_clear(rop);
+
+    return rn;
+  }
+}
+
+/* Truncating (i.e. rounded towards zero) integer division-quotient of MPN */
+void
+integer_gmp_mpn_tdiv_q (mp_limb_t q[],
+                        const mp_limb_t n[], const mp_size_t nn,
+                        const mp_limb_t d[], const mp_size_t dn)
+{
+  /* qn = 1+nn-dn; rn = dn */
+  assert(nn>=dn);
+
+  if (dn > 128) {
+    // Use temporary heap allocated throw-away buffer for MPNs larger
+    // than 1KiB for 64bit-sized limbs (larger than 512bytes for
+    // 32bit-sized limbs)
+    mp_limb_t *const r = malloc(dn*sizeof(mp_limb_t));
+    mpn_tdiv_qr(q, r, 0, n, nn, d, dn);
+    free (r);
+  } else { // allocate smaller arrays on the stack
+    mp_limb_t r[dn];
+    mpn_tdiv_qr(q, r, 0, n, nn, d, dn);
+  }
+}
+
+/* Truncating (i.e. rounded towards zero) integer division-remainder of MPNs */
+void
+integer_gmp_mpn_tdiv_r (mp_limb_t r[],
+                        const mp_limb_t n[], const mp_size_t nn,
+                        const mp_limb_t d[], const mp_size_t dn)
+{
+  /* qn = 1+nn-dn; rn = dn */
+  assert(nn>=dn);
+  const mp_size_t qn = 1+nn-dn;
+
+  if (qn > 128) {
+    // Use temporary heap allocated throw-away buffer for MPNs larger
+    // than 1KiB for 64bit-sized limbs (larger than 512bytes for
+    // 32bit-sized limbs)
+    mp_limb_t *const q = malloc(qn*sizeof(mp_limb_t));
+    mpn_tdiv_qr(q, r, 0, n, nn, d, dn);
+    free (q);
+  } else { // allocate smaller arrays on the stack
+    mp_limb_t q[qn];
+    mpn_tdiv_qr(q, r, 0, n, nn, d, dn);
+  }
+}
diff --git a/libraries/integer-gmp2/changelog.md b/libraries/integer-gmp2/changelog.md
new file mode 100644
index 0000000000..af3ac83e2b
--- /dev/null
+++ b/libraries/integer-gmp2/changelog.md
@@ -0,0 +1,51 @@
+# Changelog for [`integer-gmp` package](http://hackage.haskell.org/package/integer-gmp)
+
+## 1.0.0.0  **TBA**
+
+  * Bundled with GHC 7.10.1
+
+  * Complete rewrite of `integer-gmp`. For more details, see
+    https://ghc.haskell.org/trac/ghc/wiki/Design/IntegerGmp2
+
+## 0.5.1.0  *Feb 2014*
+
+  * Bundled with GHC 7.8.1
+
+  * Improved Haddock documentation
+
+  * New [PrimBool](https://ghc.haskell.org/trac/ghc/wiki/PrimBool)
+    versions of comparison predicates in `GHC.Integer`:
+
+        eqInteger# :: Integer -> Integer -> Int#
+        geInteger# :: Integer -> Integer -> Int#
+        gtInteger# :: Integer -> Integer -> Int#
+        leInteger# :: Integer -> Integer -> Int#
+        ltInteger# :: Integer -> Integer -> Int#
+        neqInteger# :: Integer -> Integer -> Int#
+
+  * New `GHC.Integer.testBitInteger` primitive for use with `Data.Bits`
+
+  * Reduce short-lived heap allocation and try to demote `J#` back
+    to `S#` more aggressively.  See also
+    [#8647](https://ghc.haskell.org/trac/ghc/ticket/8647)
+    for more details.
+
+  * New GMP-specific binary (de)serialization primitives added to
+    `GHC.Integer.GMP.Internals`:
+
+        importIntegerFromByteArray
+        importIntegerFromAddr
+        exportIntegerToAddr
+        exportIntegerToMutableByteArray
+        sizeInBaseInteger
+
+  * New GMP-implemented number-theoretic operations added to
+    `GHC.Integer.GMP.Internals`:
+
+        gcdExtInteger
+        nextPrimeInteger
+        testPrimeInteger
+        powInteger
+        powModInteger
+        powModSecInteger
+        recipModInteger
diff --git a/libraries/integer-gmp2/config.guess b/libraries/integer-gmp2/config.guess
new file mode 100755
index 0000000000..1f5c50c0d1
--- /dev/null
+++ b/libraries/integer-gmp2/config.guess
@@ -0,0 +1,1420 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
+
+timestamp='2014-03-23'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+#
+# Originally written by Per Bothner.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright 1992-2014 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	;;
+esac
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+	echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			esac ;;
+		    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+	exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+	exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+	exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+	exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    5000:UNIX_System_V:4.*:*)
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    *:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
+    i*:windows32*:*)
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+	    fi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    cris:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    crisv32:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    frv:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:Linux:*:*)
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	;;
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
+	exit ;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-${LIBC}
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-${LIBC}
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-${LIBC}
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+	exit ;;
+    sh64*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	exit ;;
+    x86_64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    xtensa*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv${UNAME_RELEASE}
+	else
+		echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+	exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+	echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
+esac
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/libraries/integer-gmp2/config.sub b/libraries/integer-gmp2/config.sub
new file mode 100755
index 0000000000..d654d03cdc
--- /dev/null
+++ b/libraries/integer-gmp2/config.sub
@@ -0,0 +1,1794 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
+
+timestamp='2014-05-01'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+
+
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright 1992-2014 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze*)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| aarch64 | aarch64_be \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
+	| bfin \
+	| c4x | c8051 | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
+	| fido | fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| k1om \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 | nios2eb | nios2el \
+	| ns16k | ns32k \
+	| open8 | or1k | or1knd | or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pyramid \
+	| rl78 | rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| we32k \
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| aarch64-* | aarch64_be-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| k1om-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| or1k*-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pyramid-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	microblaze*)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
+	mingw32)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	msys)
+		basic_machine=i686-pc
+		os=-msys
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc | ppcbe)	basic_machine=powerpc-unknown
+		;;
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+	# First match some system type aliases
+	# that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	c8051-*)
+		os=-elf
+		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/libraries/integer-gmp2/configure.ac b/libraries/integer-gmp2/configure.ac
new file mode 100644
index 0000000000..0794d9630c
--- /dev/null
+++ b/libraries/integer-gmp2/configure.ac
@@ -0,0 +1,86 @@
+AC_INIT([Haskell integer (GMP)], [0.1], [libraries@haskell.org], [integer])
+
+# Safety check: Ensure that we are in the correct source directory.
+AC_CONFIG_SRCDIR([cbits/wrappers.c])
+
+AC_CANONICAL_TARGET
+
+AC_ARG_WITH([cc],
+            [C compiler],
+            [CC=$withval])
+AC_PROG_CC()
+
+
+dnl--------------------------------------------------------------------
+dnl * Deal with arguments telling us gmp is somewhere odd
+dnl--------------------------------------------------------------------
+
+AC_ARG_WITH([gmp-includes],
+  [AC_HELP_STRING([--with-gmp-includes],
+    [directory containing gmp.h])],
+    [GMP_INCLUDE_DIRS=$withval; CPPFLAGS="-I$withval"],
+    [GMP_INCLUDE_DIRS=])
+
+AC_ARG_WITH([gmp-libraries],
+  [AC_HELP_STRING([--with-gmp-libraries],
+    [directory containing gmp library])],
+    [GMP_LIB_DIRS=$withval; LDFLAGS="-L$withval"],
+    [GMP_LIB_DIRS=])
+
+AC_ARG_WITH([gmp-framework-preferred],
+  [AC_HELP_STRING([--with-gmp-framework-preferred],
+    [on OSX, prefer the GMP framework to the gmp lib])],
+    [GMP_PREFER_FRAMEWORK=YES],
+    [GMP_PREFER_FRAMEWORK=NO])
+
+AC_ARG_WITH([intree-gmp],
+  [AC_HELP_STRING([--with-intree-gmp],
+    [force using the in-tree GMP])],
+    [GMP_FORCE_INTREE=YES],
+    [GMP_FORCE_INTREE=NO])
+
+dnl--------------------------------------------------------------------
+dnl * Detect gmp
+dnl--------------------------------------------------------------------
+
+HaveLibGmp=NO
+GMP_LIBS=
+HaveFrameworkGMP=NO
+GMP_FRAMEWORK=
+HaveSecurePowm=0
+
+if test "$GMP_FORCE_INTREE" != "YES"
+then
+    if test "$GMP_PREFER_FRAMEWORK" = "YES"
+    then
+        LOOK_FOR_GMP_FRAMEWORK
+        LOOK_FOR_GMP_LIB
+    else
+        LOOK_FOR_GMP_LIB
+        LOOK_FOR_GMP_FRAMEWORK
+    fi
+fi
+if test "$HaveFrameworkGMP" = "YES" || test "$HaveLibGmp" = "YES"
+then
+    AC_CHECK_HEADER([gmp.h], , [AC_MSG_ERROR([Cannot find gmp.h])])
+fi
+
+dnl--------------------------------------------------------------------
+dnl * Make sure we got some form of gmp
+dnl--------------------------------------------------------------------
+
+AC_SUBST(GMP_INCLUDE_DIRS)
+AC_SUBST(GMP_LIBS)
+AC_SUBST(GMP_LIB_DIRS)
+AC_SUBST(GMP_FRAMEWORK)
+AC_SUBST(HaveLibGmp)
+AC_SUBST(HaveFrameworkGMP)
+AC_SUBST(HaveSecurePowm)
+
+AC_CONFIG_FILES([integer-gmp.buildinfo gmp/config.mk include/HsIntegerGmp.h])
+
+dnl--------------------------------------------------------------------
+dnl * Generate the header cbits/GmpDerivedConstants.h
+dnl--------------------------------------------------------------------
+
+AC_OUTPUT
diff --git a/libraries/integer-gmp2/gmp/config.mk.in b/libraries/integer-gmp2/gmp/config.mk.in
new file mode 100644
index 0000000000..93a4f5369b
--- /dev/null
+++ b/libraries/integer-gmp2/gmp/config.mk.in
@@ -0,0 +1,11 @@
+ifeq "$(HaveLibGmp)" ""
+ HaveLibGmp = @HaveLibGmp@
+endif
+
+ifeq "$(HaveFrameworkGMP)" ""
+ HaveFrameworkGMP = @HaveFrameworkGMP@
+endif
+
+GMP_INCLUDE_DIRS = @GMP_INCLUDE_DIRS@
+GMP_LIB_DIRS = @GMP_LIB_DIRS@
+
diff --git a/libraries/integer-gmp2/gmp/ghc.mk b/libraries/integer-gmp2/gmp/ghc.mk
new file mode 100644
index 0000000000..298005ff1f
--- /dev/null
+++ b/libraries/integer-gmp2/gmp/ghc.mk
@@ -0,0 +1,124 @@
+# -----------------------------------------------------------------------------
+#
+# (c) 2009 The University of Glasgow
+#
+# This file is part of the GHC build system.
+#
+# To understand how the build system works and how to modify it, see
+#      http://ghc.haskell.org/trac/ghc/wiki/Building/Architecture
+#      http://ghc.haskell.org/trac/ghc/wiki/Building/Modifying
+#
+# -----------------------------------------------------------------------------
+
+# We use a tarball like gmp-4.2.4-nodoc.tar.bz2, which is
+# gmp-4.2.4.tar.bz2 repacked without the doc/ directory contents.
+# That's because the doc/ directory contents are under the GFDL,
+# which causes problems for Debian.
+
+GMP_TARBALL := $(wildcard libraries/integer-gmp/gmp/tarball/gmp*.tar.bz2)
+GMP_DIR := $(patsubst libraries/integer-gmp/gmp/tarball/%-nodoc-patched.tar.bz2,%,$(GMP_TARBALL))
+
+ifneq "$(NO_CLEAN_GMP)" "YES"
+$(eval $(call clean-target,gmp,,\
+  libraries/integer-gmp2/gmp/config.mk \
+  libraries/integer-gmp2/gmp/libgmp.a \
+  libraries/integer-gmp2/gmp/gmp.h \
+  libraries/integer-gmp2/gmp/gmpbuild \
+  libraries/integer-gmp2/gmp/$(GMP_DIR)))
+
+clean : clean_gmp
+.PHONY: clean_gmp
+clean_gmp:
+	$(call removeTrees,libraries/integer-gmp2/gmp/objs)
+	$(call removeTrees,libraries/integer-gmp2/gmp/gmpbuild)
+endif
+
+ifeq "$(Windows_Host)" "YES"
+# Apparently building on Windows fails when there is a system gmp
+# available, so we never try to use the system gmp on Windows
+libraries/integer-gmp2_CONFIGURE_OPTS += --configure-option=--with-intree-gmp
+endif
+
+ifeq "$(GMP_PREFER_FRAMEWORK)" "YES"
+libraries/integer-gmp2_CONFIGURE_OPTS += --with-gmp-framework-preferred
+endif
+
+ifeq "$(phase)" "final"
+
+ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
+include libraries/integer-gmp2/gmp/config.mk
+endif
+
+gmp_CC_OPTS += $(addprefix -I,$(GMP_INCLUDE_DIRS))
+gmp_CC_OPTS += $(addprefix -L,$(GMP_LIB_DIRS))
+
+# Compile GMP only if we don't have it already
+#
+# We use GMP's own configuration stuff, because it's all rather hairy
+# and not worth re-implementing in our Makefile framework.
+
+ifeq "$(findstring dyn, $(GhcRTSWays))" "dyn"
+BUILD_SHARED=yes
+else
+BUILD_SHARED=no
+endif
+
+# In a bindist, we don't want to know whether /this/ machine has gmp,
+# but whether the machine the bindist was built on had gmp.
+ifeq "$(BINDIST)" "YES"
+ifeq "$(wildcard libraries/integer-gmp2/gmp/libgmp.a)" ""
+HaveLibGmp = YES
+HaveFrameworkGMP = YES
+else
+HaveLibGmp = NO
+HaveFrameworkGMP = NO
+endif
+endif
+
+ifneq "$(HaveLibGmp)" "YES"
+ifneq "$(HaveFrameworkGMP)" "YES"
+$(libraries/integer-gmp2_dist-install_depfile_c_asm): libraries/integer-gmp2/gmp/gmp.h
+
+gmp_CC_OPTS += -Ilibraries/integer-gmp2/gmp
+
+libraries/integer-gmp2_dist-install_EXTRA_OBJS += libraries/integer-gmp2/gmp/objs/*.o
+endif
+endif
+
+libraries/integer-gmp2_dist-install_EXTRA_CC_OPTS += $(gmp_CC_OPTS)
+
+CLANG = $(findstring clang, $(shell $(CC_STAGE1) --version))
+
+ifeq "$(CLANG)" "clang"
+CCX = $(CLANG)
+else
+CCX = $(CC_STAGE1)
+endif
+
+libraries/integer-gmp2/gmp/libgmp.a libraries/integer-gmp2/gmp/gmp.h:
+	$(RM) -rf libraries/integer-gmp2/gmp/$(GMP_DIR) libraries/integer-gmp2/gmp/gmpbuild libraries/integer-gmp2/gmp/objs
+	cat $(GMP_TARBALL) | $(BZIP2_CMD) -d | { cd libraries/integer-gmp2/gmp && $(TAR_CMD) -xf - ; }
+	mv libraries/integer-gmp2/gmp/$(GMP_DIR) libraries/integer-gmp2/gmp/gmpbuild
+	cd libraries/integer-gmp2/gmp && patch -p0 < gmpsrc.patch
+	chmod +x libraries/integer-gmp2/gmp/ln
+
+	# Their cmd invocation only works on msys. On cygwin it starts
+	# a cmd interactive shell. The replacement works in both environments.
+	mv libraries/integer-gmp2/gmp/gmpbuild/ltmain.sh libraries/integer-gmp2/gmp/gmpbuild/ltmain.sh.orig
+	sed 's#cmd //c echo "\$$1"#cmd /c "echo $$1"#' < libraries/integer-gmp2/gmp/gmpbuild/ltmain.sh.orig > libraries/integer-gmp2/gmp/gmpbuild/ltmain.sh
+
+	cd libraries/integer-gmp2/gmp; (set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
+	    PATH=`pwd`:$$PATH; \
+	    export PATH; \
+	    cd gmpbuild && \
+	    CC=$(CCX) NM=$(NM) AR=$(AR_STAGE1) ./configure \
+	          --enable-shared=no \
+	          --host=$(HOSTPLATFORM) --build=$(BUILDPLATFORM)
+	$(MAKE) -C libraries/integer-gmp2/gmp/gmpbuild MAKEFLAGS=
+	$(CP) libraries/integer-gmp2/gmp/gmpbuild/gmp.h libraries/integer-gmp2/gmp/
+	$(CP) libraries/integer-gmp2/gmp/gmpbuild/.libs/libgmp.a libraries/integer-gmp2/gmp/
+	$(MKDIRHIER) libraries/integer-gmp2/gmp/objs
+	cd libraries/integer-gmp2/gmp/objs && $(AR_STAGE1) x ../libgmp.a
+	$(RANLIB_CMD) libraries/integer-gmp2/gmp/libgmp.a
+
+endif
diff --git a/libraries/integer-gmp2/gmp/gmpsrc.patch b/libraries/integer-gmp2/gmp/gmpsrc.patch
new file mode 100644
index 0000000000..e3906329ee
--- /dev/null
+++ b/libraries/integer-gmp2/gmp/gmpsrc.patch
@@ -0,0 +1,37 @@
+--- gmp-5.0.3/configure	2012-02-03 16:52:49.000000000 +0100
++++ gmpbuild/configure	2014-11-07 23:46:33.629758238 +0100
+@@ -3937,8 +3937,8 @@
+ #
+ cclist="gcc cc"
+ 
+-gcc_cflags="-O2 -pedantic"
+-gcc_64_cflags="-O2 -pedantic"
++gcc_cflags="-O2 -pedantic -fPIC"
++gcc_64_cflags="-O2 -pedantic -fPIC"
+ cc_cflags="-O"
+ cc_64_cflags="-O"
+ 
+--- gmp-5.0.3/memory.c	2012-02-03 16:52:49.000000000 +0100
++++ gmpbuild/memory.c	2014-11-07 23:54:20.734523242 +0100
+@@ -24,21 +24,10 @@
+ #include "gmp-impl.h"
+ 
+ 
+-/* Patched for GHC: */
+-void * stgAllocForGMP   (size_t size_in_bytes);
+-void * stgReallocForGMP (void *ptr, size_t old_size, size_t new_size);
+-void   stgDeallocForGMP (void *ptr, size_t size);
+-
+-void *  (*__gmp_allocate_func) __GMP_PROTO ((size_t)) = stgAllocForGMP;
+-void *  (*__gmp_reallocate_func) __GMP_PROTO ((void *, size_t, size_t))
+-     = stgReallocForGMP;
+-void    (*__gmp_free_func) __GMP_PROTO ((void *, size_t)) = stgDeallocForGMP;
+-/*
+ void *	(*__gmp_allocate_func) __GMP_PROTO ((size_t)) = __gmp_default_allocate;
+ void *	(*__gmp_reallocate_func) __GMP_PROTO ((void *, size_t, size_t))
+      = __gmp_default_reallocate;
+ void	(*__gmp_free_func) __GMP_PROTO ((void *, size_t)) = __gmp_default_free;
+-*/
+ 
+ 
+ /* Default allocation functions.  In case of failure to allocate/reallocate
diff --git a/libraries/integer-gmp2/gmp/ln b/libraries/integer-gmp2/gmp/ln
new file mode 100755
index 0000000000..a3a297ccdb
--- /dev/null
+++ b/libraries/integer-gmp2/gmp/ln
@@ -0,0 +1,3 @@
+#!/bin/sh
+exit 1
+
diff --git a/libraries/integer-gmp2/include/HsIntegerGmp.h.in b/libraries/integer-gmp2/include/HsIntegerGmp.h.in
new file mode 100644
index 0000000000..11c64677e8
--- /dev/null
+++ b/libraries/integer-gmp2/include/HsIntegerGmp.h.in
@@ -0,0 +1,6 @@
+#ifndef _HS_INTEGER_GMP_H_
+#define _HS_INTEGER_GMP_H_
+
+#define HAVE_SECURE_POWM @HaveSecurePowm@
+
+#endif /* _HS_INTEGER_GMP_H_ */
diff --git a/libraries/integer-gmp2/integer-gmp.buildinfo.in b/libraries/integer-gmp2/integer-gmp.buildinfo.in
new file mode 100644
index 0000000000..91b4313226
--- /dev/null
+++ b/libraries/integer-gmp2/integer-gmp.buildinfo.in
@@ -0,0 +1,5 @@
+include-dirs: @GMP_INCLUDE_DIRS@
+extra-lib-dirs: @GMP_LIB_DIRS@
+extra-libraries: @GMP_LIBS@
+frameworks: @GMP_FRAMEWORK@
+install-includes: HsIntegerGmp.h
diff --git a/libraries/integer-gmp2/integer-gmp.cabal b/libraries/integer-gmp2/integer-gmp.cabal
new file mode 100644
index 0000000000..a76e62214a
--- /dev/null
+++ b/libraries/integer-gmp2/integer-gmp.cabal
@@ -0,0 +1,65 @@
+name:                integer-gmp
+version:             1.0.0.0
+synopsis:            Integer library based on GMP
+license:             BSD3
+license-file:        LICENSE
+author:              Herbert Valerio Riedel
+maintainer:          hvr@gnu.org
+category:            Numeric, Algebra
+build-type:          Configure
+cabal-version:       >=1.10
+
+extra-source-files:
+    aclocal.m4
+    cbits/wrappers.c
+    changelog.md
+    config.guess
+    config.sub
+    configure
+    configure.ac
+    gmp/config.mk.in
+    include/HsIntegerGmp.h.in
+    integer-gmp.buildinfo.in
+
+extra-tmp-files:
+    autom4te.cache
+    config.log
+    config.status
+    gmp/config.mk
+    integer-gmp.buildinfo
+    include/HsIntegerGmp.h
+
+library
+  default-language:    Haskell2010
+  other-extensions:
+    BangPatterns
+    CApiFFI
+    CPP
+    DeriveDataTypeable
+    ExplicitForAll
+    GHCForeignImportPrim
+    MagicHash
+    NegativeLiterals
+    NoImplicitPrelude
+    RebindableSyntax
+    StandaloneDeriving
+    UnboxedTuples
+    UnliftedFFITypes
+  build-depends:       ghc-prim
+  hs-source-dirs:      src/
+  ghc-options: -this-package-key integer-gmp -Wall
+  cc-options: -std=c99 -Wall
+
+  include-dirs: include
+  c-sources:
+    cbits/wrappers.c
+
+  exposed-modules:
+    GHC.Integer
+    GHC.Integer.Logarithms
+    GHC.Integer.Logarithms.Internals
+
+    GHC.Integer.GMP.Internals
+
+  other-modules:
+    GHC.Integer.Type
diff --git a/libraries/integer-gmp2/src/GHC/Integer.hs b/libraries/integer-gmp2/src/GHC/Integer.hs
new file mode 100644
index 0000000000..ffd708bb93
--- /dev/null
+++ b/libraries/integer-gmp2/src/GHC/Integer.hs
@@ -0,0 +1,73 @@
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE MagicHash #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+
+#include "MachDeps.h"
+
+-- |
+-- Module      :  GHC.Integer.Type
+-- Copyright   :  (c) Herbert Valerio Riedel 2014
+-- License     :  BSD3
+--
+-- Maintainer  :  ghc-devs@haskell.org
+-- Stability   :  provisional
+-- Portability :  non-portable (GHC Extensions)
+--
+-- The 'Integer' type.
+--
+-- This module exposes the /portable/ 'Integer' API.  See
+-- "GHC.Integer.GMP.Internals" for the @integer-gmp@-specific internal
+-- representation of 'Integer' as well as optimized GMP-specific
+-- operations.
+
+module GHC.Integer (
+    Integer,
+
+    -- * Construct 'Integer's
+    mkInteger, smallInteger, wordToInteger,
+#if WORD_SIZE_IN_BITS < 64
+    word64ToInteger, int64ToInteger,
+#endif
+    -- * Conversion to other integral types
+    integerToWord, integerToInt,
+#if WORD_SIZE_IN_BITS < 64
+    integerToWord64, integerToInt64,
+#endif
+
+    -- * Helpers for 'RealFloat' type-class operations
+    encodeFloatInteger, floatFromInteger,
+    encodeDoubleInteger, decodeDoubleInteger, doubleFromInteger,
+
+    -- * Arithmetic operations
+    plusInteger, minusInteger, timesInteger, negateInteger,
+    absInteger, signumInteger,
+
+    divModInteger, divInteger, modInteger,
+    quotRemInteger, quotInteger, remInteger,
+
+    -- * Comparison predicates
+    eqInteger,  neqInteger,  leInteger,  gtInteger,  ltInteger,  geInteger,
+    compareInteger,
+
+    -- ** 'Int#'-boolean valued versions of comparision predicates
+    --
+    -- | These operations return @0#@ and @1#@ instead of 'False' and
+    -- 'True' respectively.  See
+    -- <https://ghc.haskell.org/trac/ghc/wiki/PrimBool PrimBool wiki-page>
+    -- for more details
+    eqInteger#, neqInteger#, leInteger#, gtInteger#, ltInteger#, geInteger#,
+
+
+    -- * Bit-operations
+    andInteger, orInteger, xorInteger,
+
+    complementInteger,
+    shiftLInteger, shiftRInteger, testBitInteger,
+
+    -- * Hashing
+    hashInteger,
+    ) where
+
+import GHC.Integer.Type
+
+default ()
diff --git a/libraries/integer-gmp2/src/GHC/Integer/GMP/Internals.hs b/libraries/integer-gmp2/src/GHC/Integer/GMP/Internals.hs
new file mode 100644
index 0000000000..d119adb9f8
--- /dev/null
+++ b/libraries/integer-gmp2/src/GHC/Integer/GMP/Internals.hs
@@ -0,0 +1,126 @@
+{-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE CApiFFI #-}
+{-# LANGUAGE MagicHash #-}
+{-# LANGUAGE UnboxedTuples #-}
+{-# LANGUAGE UnliftedFFITypes #-}
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE GHCForeignImportPrim #-}
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+
+#include "MachDeps.h"
+
+-- |
+-- Module      :  GHC.Integer.GMP.Internals
+-- Copyright   :  (c) Herbert Valerio Riedel 2014
+-- License     :  BSD3
+--
+-- Maintainer  :  ghc-devs@haskell.org
+-- Stability   :  provisional
+-- Portability :  non-portable (GHC Extensions)
+--
+-- This modules provides access to the 'Integer' constructors and
+-- exposes some highly optimized GMP-operations.
+--
+-- Note that since @integer-gmp@ does not depend on `base`, error
+-- reporting via exceptions, 'error', or 'undefined' is not
+-- available. Instead, the low-level functions will crash the runtime
+-- if called with invalid arguments.
+--
+-- See also
+-- <https://ghc.haskell.org/trac/ghc/wiki/Commentary/Libraries/Integer GHC Commentary: Libraries/Integer>.
+
+module GHC.Integer.GMP.Internals
+    ( -- * The 'Integer' type
+      Integer(..)
+    , isValidInteger#
+
+      -- ** Basic 'Integer' operations
+
+    , module GHC.Integer
+
+      -- ** Additional 'Integer' operations
+    , bitInteger
+    , popCountInteger
+    , gcdInteger
+    , lcmInteger
+    , sqrInteger
+
+      -- ** Additional conversion operations to 'Integer'
+    , wordToNegInteger
+    , bigNatToInteger
+    , bigNatToNegInteger
+
+      -- * The 'BigNat' type
+    , BigNat(..)
+
+    , GmpLimb, GmpLimb#
+    , GmpSize, GmpSize#
+
+      -- **
+
+    , isValidBigNat#
+    , sizeofBigNat#
+    , zeroBigNat
+    , oneBigNat
+    , nullBigNat
+
+      -- ** Conversions to/from 'BigNat'
+
+    , byteArrayToBigNat#
+    , wordToBigNat
+    , wordToBigNat2
+    , bigNatToWord
+    , indexBigNat#
+
+      -- ** 'BigNat' arithmetic operations
+    , plusBigNat
+    , plusBigNatWord
+    , minusBigNat
+    , minusBigNatWord
+    , timesBigNat
+    , timesBigNatWord
+    , sqrBigNat
+
+    , quotRemBigNat
+    , quotRemBigNatWord
+    , quotBigNatWord
+    , quotBigNat
+    , remBigNat
+    , remBigNatWord
+
+    , gcdBigNat
+    , gcdBigNatWord
+
+      -- ** 'BigNat' logic operations
+    , shiftRBigNat
+    , shiftLBigNat
+    , testBitBigNat
+    , andBigNat
+    , xorBigNat
+    , popCountBigNat
+    , orBigNat
+    , bitBigNat
+
+      -- ** 'BigNat' comparision predicates
+    , isZeroBigNat
+    , isNullBigNat#
+
+    , compareBigNatWord
+    , compareBigNat
+    , eqBigNatWord
+    , eqBigNatWord#
+    , eqBigNat
+    , eqBigNat#
+    , gtBigNatWord#
+
+      -- * Miscellaneous GMP-provided operations
+    , gcdInt
+
+    ) where
+
+import GHC.Integer.Type
+import GHC.Integer
+
+default ()
diff --git a/libraries/integer-gmp2/src/GHC/Integer/Logarithms.hs b/libraries/integer-gmp2/src/GHC/Integer/Logarithms.hs
new file mode 100644
index 0000000000..cbcc860002
--- /dev/null
+++ b/libraries/integer-gmp2/src/GHC/Integer/Logarithms.hs
@@ -0,0 +1,73 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE MagicHash #-}
+{-# LANGUAGE UnboxedTuples #-}
+{-# LANGUAGE UnliftedFFITypes #-}
+{-# LANGUAGE CPP #-}
+
+module GHC.Integer.Logarithms
+    ( wordLog2#
+    , integerLog2#
+    , integerLogBase#
+    ) where
+
+#include "MachDeps.h"
+
+#if WORD_SIZE_IN_BITS == 32
+# define LD_WORD_SIZE_IN_BITS 5
+#elif WORD_SIZE_IN_BITS == 64
+# define LD_WORD_SIZE_IN_BITS 6
+#else
+# error unsupported WORD_SIZE_IN_BITS
+#endif
+
+import GHC.Integer.Type
+
+import GHC.Prim
+
+default ()
+
+-- | Calculate the integer logarithm for an arbitrary base.
+--
+-- The base must be greater than @1@, the second argument, the number
+-- whose logarithm is sought, shall be positive, otherwise the
+-- result is meaningless.
+--
+-- The following property holds
+--
+-- @base ^ 'integerLogBase#' base m <= m < base ^('integerLogBase#' base m + 1)@
+--
+-- for @base > 1@ and @m > 0@.
+--
+-- Note: Internally uses 'integerLog2#' for base 2
+integerLogBase# :: Integer -> Integer -> Int#
+integerLogBase# (S# 2#) m = integerLog2# m
+integerLogBase# b m = e'
+  where
+    (# _, e' #) = go b
+
+    go pw | m `ltInteger` pw = (# m, 0# #)
+    go pw = case go (sqrInteger pw) of
+              (# q, e #) | q `ltInteger` pw -> (# q, 2# *# e #)
+              (# q, e #) -> (# q `quotInteger` pw, 2# *# e +# 1# #)
+
+
+-- | Calculate the integer base 2 logarithm of an 'Integer'.  The
+-- calculation is more efficient than for the general case, on
+-- platforms with 32- or 64-bit words much more efficient.
+--
+-- The argument must be strictly positive, that condition is /not/ checked.
+integerLog2# :: Integer -> Int#
+integerLog2# (S# i#) = wordLog2# (int2Word# i#)
+integerLog2# (Jn#  _) = -1#
+integerLog2# (Jp# bn) = go (s -# 1#)
+  where
+    s = sizeofBigNat# bn
+    go i = case indexBigNat# bn i of
+               0## -> go (i -# 1#)
+               w   -> wordLog2# w +# (uncheckedIShiftL# i LD_WORD_SIZE_IN_BITS#)
+
+-- | Compute base-2 log of 'Word#'
+--
+-- This is internally implemented as count-leading-zeros machine instruction.
+wordLog2# :: Word# -> Int#
+wordLog2# w# = (WORD_SIZE_IN_BITS# -# 1#) -# (word2Int# (clz# w#))
diff --git a/libraries/integer-gmp2/src/GHC/Integer/Logarithms/Internals.hs b/libraries/integer-gmp2/src/GHC/Integer/Logarithms/Internals.hs
new file mode 100644
index 0000000000..7ac3645c74
--- /dev/null
+++ b/libraries/integer-gmp2/src/GHC/Integer/Logarithms/Internals.hs
@@ -0,0 +1,118 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE MagicHash #-}
+{-# LANGUAGE UnboxedTuples #-}
+{-# LANGUAGE CPP #-}
+
+{-# OPTIONS_HADDOCK hide #-}
+
+#include "MachDeps.h"
+
+#if WORD_SIZE_IN_BITS == 32
+# define WSHIFT 5
+# define MMASK 31
+#elif WORD_SIZE_IN_BITS == 64
+# define WSHIFT 6
+# define MMASK 63
+#else
+# error unsupported WORD_SIZE_IN_BITS
+#endif
+
+-- | Fast 'Integer' logarithms to base 2.  'integerLog2#' and
+-- 'wordLog2#' are of general usefulness, the others are only needed
+-- for a fast implementation of 'fromRational'.  Since they are needed
+-- in "GHC.Float", we must expose this module, but it should not show
+-- up in the docs.
+--
+-- See https://ghc.haskell.org/trac/ghc/ticket/5122
+-- for the origin of the code in this module
+module GHC.Integer.Logarithms.Internals
+    ( wordLog2#
+    , integerLog2IsPowerOf2#
+    , integerLog2#
+    , roundingMode#
+    ) where
+
+import GHC.Integer.Type
+import GHC.Integer.Logarithms
+
+import GHC.Types
+import GHC.Prim
+
+default ()
+
+-- | Extended version of 'integerLog2#'
+--
+-- Assumption: Integer is strictly positive
+--
+-- First component of result is @log2 n@, second is @0#@ iff /n/ is a
+-- power of two.
+integerLog2IsPowerOf2# :: Integer -> (# Int#, Int# #)
+-- The power of 2 test is n&(n-1) == 0, thus powers of 2
+-- are indicated bythe second component being zero.
+integerLog2IsPowerOf2# (S# i#) = case int2Word# i# of
+      w -> (# wordLog2# w, word2Int# (w `and#` (w `minusWord#` 1##)) #)
+integerLog2IsPowerOf2# (Jn# _) = (# -1#, -1# #)
+-- Find the log2 as above, test whether that word is a power
+-- of 2, if so, check whether only zero bits follow.
+integerLog2IsPowerOf2# (Jp# bn) = check (s -# 1#)
+  where
+    s = sizeofBigNat# bn
+    check :: Int# -> (# Int#, Int# #)
+    check i = case indexBigNat# bn i of
+                0## -> check (i -# 1#)
+                w   -> (# wordLog2# w +# (uncheckedIShiftL# i WSHIFT#)
+                        , case w `and#` (w `minusWord#` 1##) of
+                            0## -> test (i -# 1#)
+                            _   -> 1# #)
+    test :: Int# -> Int#
+    test i = if isTrue# (i <# 0#)
+                then 0#
+                else case indexBigNat# bn i of
+                        0## -> test (i -# 1#)
+                        _   -> 1#
+
+
+-- Assumption: Integer and Int# are strictly positive, Int# is less
+-- than logBase 2 of Integer, otherwise havoc ensues.
+-- Used only for the numerator in fromRational when the denominator
+-- is a power of 2.
+-- The Int# argument is log2 n minus the number of bits in the mantissa
+-- of the target type, i.e. the index of the first non-integral bit in
+-- the quotient.
+--
+-- 0# means round down (towards zero)
+-- 1# means we have a half-integer, round to even
+-- 2# means round up (away from zero)
+roundingMode# :: Integer -> Int# -> Int#
+roundingMode# (S# i#) t =
+    case int2Word# i# `and#` ((uncheckedShiftL# 2## t) `minusWord#` 1##) of
+      k -> case uncheckedShiftL# 1## t of
+            c -> if isTrue# (c `gtWord#` k)
+                    then 0#
+                    else if isTrue# (c `ltWord#` k)
+                            then 2#
+                            else 1#
+
+roundingMode# (Jn# bn) t = roundingMode# (Jp# bn) t -- dummy
+roundingMode# (Jp# bn) t =
+    case word2Int# (int2Word# t `and#` MMASK##) of
+      j ->      -- index of relevant bit in word
+        case uncheckedIShiftRA# t WSHIFT# of
+          k ->  -- index of relevant word
+            case indexBigNat# bn k `and#`
+                    ((uncheckedShiftL# 2## j) `minusWord#` 1##) of
+              r ->
+                case uncheckedShiftL# 1## j of
+                  c -> if isTrue# (c `gtWord#` r)
+                        then 0#
+                        else if isTrue# (c `ltWord#` r)
+
+
+                                then 2#
+                                else test (k -# 1#)
+  where
+    test i = if isTrue# (i <# 0#)
+                then 1#
+                else case indexBigNat# bn i of
+                        0## -> test (i -# 1#)
+                        _   -> 2#
diff --git a/libraries/integer-gmp2/src/GHC/Integer/Type.hs b/libraries/integer-gmp2/src/GHC/Integer/Type.hs
new file mode 100644
index 0000000000..985d2ae0a7
--- /dev/null
+++ b/libraries/integer-gmp2/src/GHC/Integer/Type.hs
@@ -0,0 +1,1663 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE GHCForeignImportPrim #-}
+{-# LANGUAGE MagicHash #-}
+{-# LANGUAGE UnboxedTuples #-}
+{-# LANGUAGE UnliftedFFITypes #-}
+{-# LANGUAGE RebindableSyntax #-}
+{-# LANGUAGE NegativeLiterals #-}
+{-# LANGUAGE ExplicitForAll #-}
+
+-- |
+-- Module      :  GHC.Integer.Type
+-- Copyright   :  (c) Herbert Valerio Riedel 2014
+-- License     :  BSD3
+--
+-- Maintainer  :  ghc-devs@haskell.org
+-- Stability   :  provisional
+-- Portability :  non-portable (GHC Extensions)
+--
+-- GHC needs this module to be named "GHC.Integer.Type" and provide
+-- all the low-level 'Integer' operations.
+
+module GHC.Integer.Type where
+
+#include "MachDeps.h"
+
+-- Sanity check as CPP defines are implicitly 0-valued when undefined
+#if !(defined(SIZEOF_LONG) && defined(SIZEOF_HSWORD) \
+           && defined(WORD_SIZE_IN_BITS))
+# error missing defines
+#endif
+
+import GHC.Classes
+import GHC.Magic
+import GHC.Prim
+import GHC.Types
+#if WORD_SIZE_IN_BITS < 64
+import GHC.IntWord64
+#endif
+
+default ()
+
+-- Most high-level operations need to be marked `NOINLINE` as
+-- otherwise GHC doesn't recognize them and fails to apply constant
+-- folding to `Integer`-typed expression.
+--
+-- To this end, the CPP hack below allows to write the pseudo-pragma
+--
+--   {-# CONSTANT_FOLDED plusInteger #-}
+--
+-- which is simply expaned into a
+--
+--   {-# NOINLINE plusInteger #-}
+--
+#define CONSTANT_FOLDED NOINLINE
+
+----------------------------------------------------------------------------
+-- type definitions
+
+-- NB: all code assumes GMP_LIMB_BITS == WORD_SIZE_IN_BITS
+-- The C99 code in cbits/wrappers.c will fail to compile if this doesn't hold
+
+-- | Type representing a GMP Limb
+type GmpLimb = Word -- actually, 'CULong'
+type GmpLimb# = Word#
+
+-- | Count of 'GmpLimb's, must be positive (unless specified otherwise).
+type GmpSize = Int  -- actually, a 'CLong'
+type GmpSize# = Int#
+
+narrowGmpSize# :: Int# -> Int#
+#if SIZEOF_LONG == SIZEOF_HSWORD
+narrowGmpSize# x = x
+#elif (SIZEOF_LONG == 4) && (SIZEOF_HSWORD == 8)
+-- On IL32P64 (i.e. Win64), we have to be careful with CLong not being
+-- 64bit.  This is mostly an issue on values returned from C functions
+-- due to sign-extension.
+narrowGmpSize# = narrow32Int#
+#endif
+
+
+type GmpBitCnt = Word -- actually, 'CULong'
+type GmpBitCnt# = Word# -- actually, 'CULong'
+
+-- Pseudo FFI CType
+type CInt = Int
+type CInt# = Int#
+
+narrowCInt# :: Int# -> Int#
+narrowCInt# = narrow32Int#
+
+-- | Bits in a 'GmpLimb'. Same as @WORD_SIZE_IN_BITS@.
+gmpLimbBits :: Word -- 8 `shiftL` gmpLimbShift
+gmpLimbBits = W# WORD_SIZE_IN_BITS##
+
+#if WORD_SIZE_IN_BITS == 64
+# define GMP_LIMB_SHIFT   3
+# define GMP_LIMB_BYTES   8
+# define GMP_LIMB_BITS    64
+# define INT_MINBOUND     -0x8000000000000000
+# define INT_MAXBOUND      0x7fffffffffffffff
+# define ABS_INT_MINBOUND  0x8000000000000000
+# define SQRT_INT_MAXBOUND 0xb504f333
+#elif WORD_SIZE_IN_BITS == 32
+# define GMP_LIMB_SHIFT   2
+# define GMP_LIMB_BYTES   4
+# define GMP_LIMB_BITS    32
+# define INT_MINBOUND     -0x80000000
+# define INT_MAXBOUND      0x7fffffff
+# define ABS_INT_MINBOUND  0x80000000
+# define SQRT_INT_MAXBOUND 0xb504
+#else
+# error unsupported WORD_SIZE_IN_BITS config
+#endif
+
+-- | Type representing /raw/ arbitrary-precision Naturals
+--
+-- This is common type used by 'Natural' and 'Integer'.  As this type
+-- consists of a single constructor wrapping a 'ByteArray#' it can be
+-- unpacked.
+--
+-- Essential invariants:
+--
+--  - 'ByteArray#' size is an exact multiple of 'Word#' size
+--  - limbs are stored in least-significant-limb-first order,
+--  - the most-significant limb must be non-zero, except for
+--  - @0@ which is represented as a 1-limb.
+data BigNat = BN# ByteArray#
+
+instance Eq BigNat where
+    (==) = eqBigNat
+
+instance Ord BigNat where
+    compare = compareBigNat
+
+-- | Invariant: 'Jn#' and 'Jp#' are used iff value doesn't fit in 'S#'
+--
+-- Useful properties resulting from the invariants:
+--
+--  - @abs ('S#' _) <= abs ('Jp#' _)@
+--  - @abs ('S#' _) <  abs ('Jn#' _)@
+--
+data Integer  = S#                !Int#
+                -- ^ iff value in @[minBound::'Int', maxBound::'Int']@ range
+              | Jp# {-# UNPACK #-} !BigNat
+                -- ^ iff value in @]maxBound::'Int', +inf[@ range
+              | Jn# {-# UNPACK #-} !BigNat
+                -- ^ iff value in @]-inf, minBound::'Int'[@ range
+
+-- TODO: experiment with different constructor-ordering
+
+instance Eq Integer where
+    (==)    = eqInteger
+    (/=)    = neqInteger
+
+instance Ord Integer where
+    compare = compareInteger
+    (>)     = gtInteger
+    (>=)    = geInteger
+    (<)     = ltInteger
+    (<=)    = leInteger
+
+----------------------------------------------------------------------------
+
+-- | Construct 'Integer' value from list of 'Int's.
+--
+-- This function is used by GHC for constructing 'Integer' literals.
+mkInteger :: Bool   -- ^ sign of integer ('True' if non-negative)
+          -> [Int]  -- ^ absolute value expressed in 31 bit chunks, least
+                    --   significant first (ideally these would be machine-word
+                    --   'Word's rather than 31-bit truncated 'Int's)
+          -> Integer
+mkInteger nonNegative is
+  | nonNegative = f is
+  | True        = negateInteger (f is)
+  where
+    f [] = S# 0#
+    f (I# i : is') = smallInteger (i `andI#` 0x7fffffff#) `orInteger`
+                         shiftLInteger (f is') 31#
+{-# CONSTANT_FOLDED mkInteger #-}
+
+-- | Test whether all internal invariants are satisfied by 'Integer' value
+--
+-- Returns @1#@ if valid, @0#@ otherwise.
+--
+-- This operation is mostly useful for test-suites and/or code which
+-- constructs 'Integer' values directly.
+isValidInteger# :: Integer -> Int#
+isValidInteger# (S#  _) = 1#
+isValidInteger# (Jp# bn)
+    = isValidBigNat# bn `andI#` (bn `gtBigNatWord#` INT_MAXBOUND##)
+isValidInteger# (Jn# bn)
+    = isValidBigNat# bn `andI#` (bn `gtBigNatWord#` ABS_INT_MINBOUND##)
+
+-- | Should rather be called @intToInteger@
+smallInteger :: Int# -> Integer
+smallInteger i# = S# i#
+{-# CONSTANT_FOLDED smallInteger #-}
+
+----------------------------------------------------------------------------
+-- Int64/Word64 specific primitives
+
+#if WORD_SIZE_IN_BITS < 64
+int64ToInteger :: Int64# -> Integer
+int64ToInteger i
+  | isTrue# (i `leInt64#` intToInt64#  0x7FFFFFFF#)
+  , isTrue# (i `geInt64#` intToInt64# -0x80000000#)
+    = S# (int64ToInt# i)
+  | isTrue# (i `geInt64#` intToInt64# 0#)
+    = Jp# (word64ToBigNat (int64ToWord64# i))
+  | True
+    = Jn# (word64ToBigNat (int64ToWord64# (negateInt64# i)))
+{-# CONSTANT_FOLDED int64ToInteger #-}
+
+word64ToInteger :: Word64# -> Integer
+word64ToInteger w
+  | isTrue# (w `leWord64#` wordToWord64# 0x7FFFFFFF##)
+    = S# (int64ToInt# (word64ToInt64# w))
+  | True
+    = Jp# (word64ToBigNat w)
+{-# CONSTANT_FOLDED word64ToInteger #-}
+
+integerToInt64 :: Integer -> Int64#
+integerToInt64 (S# i#)  = intToInt64# i#
+integerToInt64 (Jp# bn) = word64ToInt64# (bigNatToWord64 bn)
+integerToInt64 (Jn# bn) = negateInt64# (word64ToInt64# (bigNatToWord64 bn))
+{-# CONSTANT_FOLDED integerToInt64 #-}
+
+integerToWord64 :: Integer -> Word64#
+integerToWord64 (S# i#)  = int64ToWord64# (intToInt64# i#)
+integerToWord64 (Jp# bn) = bigNatToWord64 bn
+integerToWord64 (Jn# bn)
+    = int64ToWord64# (negateInt64# (word64ToInt64# (bigNatToWord64 bn)))
+{-# CONSTANT_FOLDED integerToWord64 #-}
+
+#if GMP_LIMB_BITS == 32
+word64ToBigNat :: Word64# -> BigNat
+word64ToBigNat w64 = wordToBigNat2 wh# wl#
+  where
+    wh# = word64ToWord# (uncheckedShiftRL64# w64 32#)
+    wl# = word64ToWord# w64
+
+bigNatToWord64 :: BigNat -> Word64#
+bigNatToWord64 bn
+  | isTrue# (sizeofBigNat# bn ># 1#)
+    = let wh# = wordToWord64# (indexBigNat# bn 1#)
+      in uncheckedShiftL64# wh# 32# `or64#` wl#
+  | True = wl#
+  where
+    wl# = wordToWord64# (bigNatToWord bn)
+#endif
+#endif
+
+-- End of Int64/Word64 specific primitives
+----------------------------------------------------------------------------
+
+-- | Truncates 'Integer' to least-significant 'Int#'
+integerToInt :: Integer -> Int#
+integerToInt (S# i#)  = i#
+integerToInt (Jp# bn) = bigNatToInt bn
+integerToInt (Jn# bn) = negateInt# (bigNatToInt bn)
+{-# CONSTANT_FOLDED integerToInt #-}
+
+hashInteger :: Integer -> Int#
+hashInteger = integerToInt -- emulating what integer-{simple,gmp} already do
+
+integerToWord :: Integer -> Word#
+integerToWord (S# i#)  = int2Word# i#
+integerToWord (Jp# bn) = bigNatToWord bn
+integerToWord (Jn# bn) = int2Word# (negateInt# (bigNatToInt bn))
+{-# CONSTANT_FOLDED integerToWord #-}
+
+wordToInteger :: Word# -> Integer
+wordToInteger w#
+  | isTrue# (i# >=# 0#) = S# i#
+  | True                = Jp# (wordToBigNat w#)
+  where
+    i# = word2Int# w#
+{-# CONSTANT_FOLDED wordToInteger #-}
+
+wordToNegInteger :: Word# -> Integer
+wordToNegInteger w#
+  | isTrue# (i# <=# 0#) = S# i#
+  | True                = Jn# (wordToBigNat w#)
+  where
+    i# = negateInt# (word2Int# w#)
+
+-- we could almost auto-derive Ord if it wasn't for the Jn#-Jn# case
+compareInteger :: Integer -> Integer -> Ordering
+compareInteger (Jn# x)  (Jn# y) = compareBigNat y x
+compareInteger (S#  x)  (S#  y) = compareInt#   x y
+compareInteger (Jp# x)  (Jp# y) = compareBigNat x y
+compareInteger (Jn# _)  _       = LT
+compareInteger (S#  _)  (Jp# _) = LT
+compareInteger (S#  _)  (Jn# _) = GT
+compareInteger (Jp# _)  _       = GT
+{-# CONSTANT_FOLDED compareInteger #-}
+
+isNegInteger# :: Integer -> Int#
+isNegInteger# (S# i#) = i# <# 0#
+isNegInteger# (Jp# _)  = 0#
+isNegInteger# (Jn# _)  = 1#
+
+-- | Not-equal predicate.
+neqInteger :: Integer -> Integer -> Bool
+neqInteger x y = isTrue# (neqInteger# x y)
+
+eqInteger, leInteger, ltInteger, gtInteger, geInteger
+  :: Integer -> Integer -> Bool
+eqInteger  x y = isTrue# (eqInteger#  x y)
+leInteger  x y = isTrue# (leInteger#  x y)
+ltInteger  x y = isTrue# (ltInteger#  x y)
+gtInteger  x y = isTrue# (gtInteger#  x y)
+geInteger  x y = isTrue# (geInteger#  x y)
+
+eqInteger#, neqInteger#, leInteger#, ltInteger#, gtInteger#, geInteger#
+  :: Integer -> Integer -> Int#
+eqInteger# (S# x#) (S# y#)   = x# ==# y#
+eqInteger# (Jn# x) (Jn# y)   = eqBigNat# x y
+eqInteger# (Jp# x) (Jp# y)   = eqBigNat# x y
+eqInteger# _       _         = 0#
+{-# CONSTANT_FOLDED eqInteger# #-}
+
+neqInteger# (S# x#) (S# y#)  = x# /=# y#
+neqInteger# (Jn# x) (Jn# y)  = neqBigNat# x y
+neqInteger# (Jp# x) (Jp# y)  = neqBigNat# x y
+neqInteger# _       _        = 1#
+{-# CONSTANT_FOLDED neqInteger# #-}
+
+
+gtInteger# (S# x#) (S# y#)   = x# ># y#
+gtInteger# x y | inline compareInteger x y == GT  = 1#
+gtInteger# _ _                                    = 0#
+{-# CONSTANT_FOLDED gtInteger# #-}
+
+leInteger# (S# x#) (S# y#)   = x# <=# y#
+leInteger# x y | inline compareInteger x y /= GT  = 1#
+leInteger# _ _                             = 0#
+{-# CONSTANT_FOLDED leInteger# #-}
+
+ltInteger# (S# x#) (S# y#)   = x# <# y#
+ltInteger# x y | inline compareInteger x y == LT  = 1#
+ltInteger# _ _                             = 0#
+{-# CONSTANT_FOLDED ltInteger# #-}
+
+geInteger# (S# x#) (S# y#)   = x# >=# y#
+geInteger# x y | inline compareInteger x y /= LT  = 1#
+geInteger# _ _                             = 0#
+{-# CONSTANT_FOLDED geInteger# #-}
+
+-- | Compute absolute value of an 'Integer'
+absInteger :: Integer -> Integer
+absInteger (Jn# n)                       = Jp# n
+absInteger (S# INT_MINBOUND#)            = Jp# (wordToBigNat ABS_INT_MINBOUND##)
+absInteger (S# i#) | isTrue# (i# <# 0#)  = S# (negateInt# i#)
+absInteger i@(S# _)                      = i
+absInteger i@(Jp# _)                     = i
+{-# CONSTANT_FOLDED absInteger #-}
+
+-- | Return @-1@, @0@, and @1@ depending on whether argument is
+-- negative, zero, or positive, respectively
+signumInteger :: Integer -> Integer
+signumInteger j = S# (signumInteger# j)
+{-# CONSTANT_FOLDED signumInteger #-}
+
+-- | Return @-1#@, @0#@, and @1#@ depending on whether argument is
+-- negative, zero, or positive, respectively
+signumInteger# :: Integer -> Int#
+signumInteger# (Jn# _)  = -1#
+signumInteger# (S# i#) = sgnI# i#
+signumInteger# (Jp# _ ) =  1#
+
+-- | Negate 'Integer'
+negateInteger :: Integer -> Integer
+negateInteger (Jn# n)      = Jp# n
+negateInteger (S# INT_MINBOUND#) = Jp# (wordToBigNat ABS_INT_MINBOUND##)
+negateInteger (S# i#)             = S# (negateInt# i#)
+negateInteger (Jp# bn)
+  | isTrue# (eqBigNatWord# bn ABS_INT_MINBOUND##) = S# INT_MINBOUND#
+  | True                                        = Jn# bn
+{-# CONSTANT_FOLDED negateInteger #-}
+
+-- one edge-case issue to take into account is that Int's range is not
+-- symmetric around 0.  I.e. @minBound+maxBound = -1@
+--
+-- Jp# is used iff n > maxBound::Int
+-- Jn# is used iff n < minBound::Int
+
+-- | Add two 'Integer's
+plusInteger :: Integer -> Integer -> Integer
+plusInteger x    (S# 0#)  = x
+plusInteger (S# 0#) y     = y
+plusInteger (S# x#) (S# y#)
+  = case addIntC# x# y# of
+    (# z#, 0# #) -> S# z#
+    (# 0#, _  #) -> Jn# (wordToBigNat2 1## 0##) -- 2*minBound::Int
+    (# z#, _  #)
+      | isTrue# (z# ># 0#) -> Jn# (wordToBigNat ( (int2Word# (negateInt# z#))))
+      | True               -> Jp# (wordToBigNat ( (int2Word# z#)))
+plusInteger y@(S# _) x = plusInteger x y
+-- no S# as first arg from here on
+plusInteger (Jp# x) (Jp# y) = Jp# (plusBigNat x y)
+plusInteger (Jn# x) (Jn# y) = Jn# (plusBigNat x y)
+plusInteger (Jp# x) (S# y#) -- edge-case: @(maxBound+1) + minBound == 0@
+  | isTrue# (y# >=# 0#) = Jp# (plusBigNatWord x (int2Word# y#))
+  | True                = bigNatToInteger (minusBigNatWord x (int2Word#
+                                                              (negateInt# y#)))
+plusInteger (Jn# x) (S# y#) -- edge-case: @(minBound-1) + maxBound == -2@
+  | isTrue# (y# >=# 0#) = bigNatToNegInteger (minusBigNatWord x (int2Word# y#))
+  | True                = Jn# (plusBigNatWord x (int2Word# (negateInt# y#)))
+plusInteger y@(Jn# _) x@(Jp# _) = plusInteger x y
+plusInteger (Jp# x) (Jn# y)
+    = case compareBigNat x y of
+      LT -> bigNatToNegInteger (minusBigNat y x)
+      EQ -> S# 0#
+      GT -> bigNatToInteger (minusBigNat x y)
+{-# CONSTANT_FOLDED plusInteger #-}
+
+-- TODO
+-- | Subtract two 'Integer's from each other.
+minusInteger :: Integer -> Integer -> Integer
+minusInteger x y = inline plusInteger x (inline negateInteger y)
+{-# CONSTANT_FOLDED minusInteger #-}
+
+-- | Multiply two 'Integer's
+timesInteger :: Integer -> Integer -> Integer
+timesInteger _       (S# 0#) = S# 0#
+timesInteger (S# 0#) _       = S# 0#
+timesInteger x       (S# 1#) = x
+timesInteger (S# 1#) y       = y
+timesInteger x      (S# -1#) = negateInteger x
+timesInteger (S# -1#) y      = negateInteger y
+timesInteger (S# x#) (S# y#)
+  = case mulIntMayOflo# x# y# of
+    0# -> S# (x# *# y#)
+    _  -> timesInt2Integer x# y#
+timesInteger x@(S# _) y      = timesInteger y x
+-- no S# as first arg from here on
+timesInteger (Jp# x) (Jp# y) = Jp# (timesBigNat x y)
+timesInteger (Jp# x) (Jn# y) = Jn# (timesBigNat x y)
+timesInteger (Jp# x) (S# y#)
+  | isTrue# (y# >=# 0#) = Jp# (timesBigNatWord x (int2Word# y#))
+  | True       = Jn# (timesBigNatWord x (int2Word# (negateInt# y#)))
+timesInteger (Jn# x) (Jn# y) = Jp# (timesBigNat x y)
+timesInteger (Jn# x) (Jp# y) = Jn# (timesBigNat x y)
+timesInteger (Jn# x) (S# y#)
+  | isTrue# (y# >=# 0#) = Jn# (timesBigNatWord x (int2Word# y#))
+  | True       = Jp# (timesBigNatWord x (int2Word# (negateInt# y#)))
+{-# CONSTANT_FOLDED timesInteger #-}
+
+-- | Square 'Integer'
+sqrInteger :: Integer -> Integer
+sqrInteger (S# INT_MINBOUND#) = timesInt2Integer INT_MINBOUND# INT_MINBOUND#
+sqrInteger (S# j#) | isTrue# (absI# j# <=# SQRT_INT_MAXBOUND#) = S# (j# *# j#)
+sqrInteger (S# j#) = timesInt2Integer j# j#
+sqrInteger (Jp# bn) = Jp# (sqrBigNat bn)
+sqrInteger (Jn# bn) = Jp# (sqrBigNat bn)
+
+-- | Construct 'Integer' from the product of two 'Int#'s
+timesInt2Integer :: Int# -> Int# -> Integer
+timesInt2Integer x# y# = case (# x# >=# 0#, y# >=# 0# #) of
+    (# 0#, 0# #) -> case timesWord2# (int2Word# (negateInt# x#))
+                                     (int2Word# (negateInt# y#)) of
+        (# 0##,l #) -> inline wordToInteger l
+        (# h  ,l #) -> Jp# (wordToBigNat2 h l)
+
+    (#  _, 0# #) -> case timesWord2# (int2Word# x#)
+                                     (int2Word# (negateInt# y#)) of
+        (# 0##,l #) -> wordToNegInteger l
+        (# h  ,l #) -> Jn# (wordToBigNat2 h l)
+
+    (# 0#,  _ #) -> case timesWord2# (int2Word# (negateInt# x#))
+                                     (int2Word# y#) of
+        (# 0##,l #) -> wordToNegInteger l
+        (# h  ,l #) -> Jn# (wordToBigNat2 h l)
+
+    (#  _,  _ #) -> case timesWord2# (int2Word# x#)
+                                     (int2Word# y#) of
+        (# 0##,l #) -> inline wordToInteger l
+        (# h  ,l #) -> Jp# (wordToBigNat2 h l)
+
+bigNatToInteger :: BigNat -> Integer
+bigNatToInteger bn
+  | isTrue# ((sizeofBigNat# bn ==# 1#) `andI#` (i# >=# 0#)) = S# i#
+  | True                                                    = Jp# bn
+  where
+    i# = word2Int# (bigNatToWord bn)
+
+bigNatToNegInteger :: BigNat -> Integer
+bigNatToNegInteger bn
+  | isTrue# ((sizeofBigNat# bn ==# 1#) `andI#` (i# <=# 0#)) = S# i#
+  | True                                                    = Jn# bn
+  where
+    i# = negateInt# (word2Int# (bigNatToWord bn))
+
+-- | Count number of set bits. For negative arguments returns negative
+-- population count of negated argument.
+popCountInteger :: Integer -> Int#
+popCountInteger (S# i#)
+  | isTrue# (i# >=# 0#) = popCntI# i#
+  | True                = negateInt# (popCntI# (negateInt# i#))
+popCountInteger (Jp# bn)  = popCountBigNat bn
+popCountInteger (Jn# bn)  = negateInt# (popCountBigNat bn)
+{-# CONSTANT_FOLDED popCountInteger #-}
+
+-- | 'Integer' for which only /n/-th bit is set. Undefined behaviour
+-- for negative /n/ values.
+bitInteger :: Int# -> Integer
+bitInteger i#
+  | isTrue# (i# <# (GMP_LIMB_BITS# -# 1#)) = S# (uncheckedIShiftL# 1# i#)
+  | True = Jp# (bitBigNat i#)
+{-# CONSTANT_FOLDED bitInteger #-}
+
+-- | Test if /n/-th bit is set.
+testBitInteger :: Integer -> Int# -> Bool
+testBitInteger _  n# | isTrue# (n# <# 0#) = False
+testBitInteger (S# i#) n#
+  | isTrue# (n# <# GMP_LIMB_BITS#) = isTrue# (((uncheckedIShiftL# 1# n#)
+                                               `andI#` i#) /=# 0#)
+  | True                          = isTrue# (i# <# 0#)
+testBitInteger (Jp# bn) n = testBitBigNat bn n
+testBitInteger (Jn# bn) n = testBitNegBigNat bn n
+{-# CONSTANT_FOLDED testBitInteger #-}
+
+-- | Bitwise @NOT@ operation
+complementInteger :: Integer -> Integer
+complementInteger (S# i#) = S# (notI# i#)
+complementInteger (Jp# bn) = Jn# (plusBigNatWord  bn 1##)
+complementInteger (Jn# bn) = Jp# (minusBigNatWord bn 1##)
+{-# CONSTANT_FOLDED complementInteger #-}
+
+-- | Arithmetic shift-right operation
+--
+-- Even though the shift-amount is expressed as `Int#`, the result is
+-- undefined for negative shift-amounts.
+shiftRInteger :: Integer -> Int# -> Integer
+shiftRInteger x        0# = x
+shiftRInteger (S# i#)  n# = S# (iShiftRA# i# n#)
+  where
+    iShiftRA# a b
+      | isTrue# (b >=# WORD_SIZE_IN_BITS#) = (a <# 0#) *# (-1#)
+      | True                               = a `uncheckedIShiftRA#` b
+shiftRInteger (Jp# bn) n# = bigNatToInteger (shiftRBigNat bn n#)
+shiftRInteger (Jn# bn) n#
+    = case bigNatToNegInteger (shiftRNegBigNat bn n#) of
+        S# 0# -> S# -1#
+        r           -> r
+{-# CONSTANT_FOLDED shiftRInteger #-}
+
+-- | Shift-left operation
+--
+-- Even though the shift-amount is expressed as `Int#`, the result is
+-- undefined for negative shift-amounts.
+shiftLInteger :: Integer -> Int# -> Integer
+shiftLInteger x       0#  = x
+shiftLInteger (S# 0#) _  = S# 0#
+shiftLInteger (S# 1#) n# = bitInteger n#
+shiftLInteger (S# i#) n#
+  | isTrue# (i# >=# 0#)   = bigNatToInteger (shiftLBigNat
+                                             (wordToBigNat (int2Word# i#)) n#)
+  | True               = bigNatToNegInteger (shiftLBigNat
+                                             (wordToBigNat (int2Word#
+                                                         (negateInt# i#))) n#)
+shiftLInteger (Jp# bn) n# = Jp# (shiftLBigNat bn n#)
+shiftLInteger (Jn# bn) n# = Jn# (shiftLBigNat bn n#)
+{-# CONSTANT_FOLDED shiftLInteger #-}
+
+-- | Bitwise OR operation
+orInteger :: Integer -> Integer -> Integer
+-- short-cuts
+orInteger  (S# 0#)     y         = y
+orInteger  x           (S# 0#)   = x
+orInteger  (S# -1#)    _         = S# -1#
+orInteger  _           (S# -1#)  = S# -1#
+-- base-cases
+orInteger  (S# x#)     (S# y#)   = S# (orI# x# y#)
+orInteger  (Jp# x)     (Jp# y)   = Jp# (orBigNat x y)
+orInteger  (Jn# x)     (Jn# y)
+    = bigNatToNegInteger (plusBigNatWord (andBigNat
+                                          (minusBigNatWord x 1##)
+                                          (minusBigNatWord y 1##)) 1##)
+orInteger  x@(Jn# _)   y@(Jp# _)  = orInteger y x -- retry with swapped args
+orInteger  (Jp# x)     (Jn# y)
+    = bigNatToNegInteger (plusBigNatWord (andnBigNat (minusBigNatWord y 1##) x)
+                                         1##)
+-- TODO/FIXpromotion-hack
+orInteger  x@(S# _)   y          = orInteger (unsafePromote x) y
+orInteger  x           y {- S# -}= orInteger x (unsafePromote y)
+{-# CONSTANT_FOLDED orInteger #-}
+
+-- | Bitwise XOR operation
+xorInteger :: Integer -> Integer -> Integer
+-- short-cuts
+xorInteger (S# 0#)     y          = y
+xorInteger x           (S# 0#)    = x
+-- TODO: (S# -1) cases
+-- base-cases
+xorInteger (S# x#)     (S# y#)    = S# (xorI# x# y#)
+xorInteger (Jp# x)     (Jp# y)    = bigNatToInteger (xorBigNat x y)
+xorInteger (Jn# x)     (Jn# y)
+    = bigNatToInteger (xorBigNat (minusBigNatWord x 1##)
+                                 (minusBigNatWord y 1##))
+xorInteger x@(Jn# _)   y@(Jp# _)  = xorInteger y x -- retry with swapped args
+xorInteger (Jp# x)     (Jn# y)
+    = bigNatToNegInteger (plusBigNatWord (xorBigNat x (minusBigNatWord y 1##))
+                                         1##)
+-- TODO/FIXME promotion-hack
+xorInteger x@(S# _)    y          = xorInteger (unsafePromote x) y
+xorInteger x           y {- S# -} = xorInteger x (unsafePromote y)
+{-# CONSTANT_FOLDED xorInteger #-}
+
+-- | Bitwise AND operation
+andInteger :: Integer -> Integer -> Integer
+-- short-cuts
+andInteger (S# 0#)       _       = S# 0#
+andInteger _           (S# 0#)   = S# 0#
+andInteger (S# -1#)   y          = y
+andInteger x           (S# -1#)  = x
+-- base-cases
+andInteger (S# x#)     (S# y#)   = S# (andI# x# y#)
+andInteger (Jp# x)     (Jp# y)   = bigNatToInteger (andBigNat x y)
+andInteger (Jn# x)     (Jn# y)
+    = bigNatToNegInteger (plusBigNatWord (orBigNat (minusBigNatWord x 1##)
+                                                   (minusBigNatWord y 1##)) 1##)
+andInteger x@(Jn# _)   y@(Jp# _)  = andInteger y x
+andInteger (Jp# x)     (Jn# y)
+    = bigNatToInteger (andnBigNat x (minusBigNatWord y 1##))
+-- TODO/FIXME promotion-hack
+andInteger x@(S# _)   y          = andInteger (unsafePromote x) y
+andInteger x           y {- S# -}= andInteger x (unsafePromote y)
+{-# CONSTANT_FOLDED andInteger #-}
+
+-- HACK warning! breaks invariant on purpose
+unsafePromote :: Integer -> Integer
+unsafePromote (S# x#)
+    | isTrue# (x# >=# 0#) = Jp# (wordToBigNat (int2Word# x#))
+    | True                = Jn# (wordToBigNat (int2Word# (negateInt# x#)))
+unsafePromote x = x
+
+-- | Simultaneous 'quotInteger' and 'remInteger'.
+--
+-- Divisor must be non-zero otherwise the GHC runtime will terminate
+-- with a division-by-zero fault.
+quotRemInteger :: Integer -> Integer -> (# Integer, Integer #)
+quotRemInteger n       (S# 1#) = (# n, S# 0# #)
+quotRemInteger n      (S# -1#) = let !q = negateInteger n in (# q, (S# 0#) #)
+quotRemInteger _       (S# 0#) = (# S# (quotInt# 0# 0#),S# (remInt# 0# 0#) #)
+quotRemInteger (S# 0#) _       = (# S# 0#, S# 0# #)
+quotRemInteger (S# n#) (S# d#) = case quotRemInt# n# d# of
+    (# q#, r# #) -> (# S# q#, S# r# #)
+quotRemInteger (Jp# n)  (Jp# d)  = case quotRemBigNat n d of
+    (# q, r #) -> (# bigNatToInteger q, bigNatToInteger r #)
+quotRemInteger (Jp# n)  (Jn# d)  = case quotRemBigNat n d of
+    (# q, r #) -> (# bigNatToNegInteger q, bigNatToInteger r #)
+quotRemInteger (Jn# n)  (Jn# d)  = case quotRemBigNat n d of
+    (# q, r #) -> (# bigNatToInteger q, bigNatToNegInteger r #)
+quotRemInteger (Jn# n)  (Jp# d)  = case quotRemBigNat n d of
+    (# q, r #) -> (# bigNatToNegInteger q, bigNatToNegInteger r #)
+quotRemInteger (Jp# n)  (S# d#)
+  | isTrue# (d# >=# 0#) = case quotRemBigNatWord n (int2Word# d#) of
+      (# q, r# #) -> (# bigNatToInteger q, wordToInteger r# #)
+  | True               = case quotRemBigNatWord n (int2Word# (negateInt# d#)) of
+      (# q, r# #) -> (# bigNatToNegInteger q, wordToInteger r# #)
+quotRemInteger (Jn# n)  (S# d#)
+  | isTrue# (d# >=# 0#) = case quotRemBigNatWord n (int2Word# d#) of
+      (# q, r# #) -> (# bigNatToNegInteger q, wordToNegInteger r# #)
+  | True               = case quotRemBigNatWord n (int2Word# (negateInt# d#)) of
+      (# q, r# #) -> (# bigNatToInteger q, wordToNegInteger r# #)
+quotRemInteger n@(S# _) (Jn# _) = (# S# 0#, n #) -- since @n < d@
+quotRemInteger n@(S# n#) (Jp# d) -- need to account for (S# minBound)
+    | isTrue# (n# ># 0#)                                    = (# S# 0#, n #)
+    | isTrue# (gtBigNatWord# d (int2Word# (negateInt# n#))) = (# S# 0#, n #)
+    | True {- abs(n) == d -}                          = (# S# -1#, S# 0# #)
+{-# CONSTANT_FOLDED quotRemInteger #-}
+
+
+quotInteger :: Integer -> Integer -> Integer
+quotInteger n       (S# 1#) = n
+quotInteger n      (S# -1#) = negateInteger n
+quotInteger _       (S# 0#) = S# (quotInt# 0# 0#)
+quotInteger (S# 0#) _       = S# 0#
+quotInteger (S# n#)  (S# d#) = S# (quotInt# n# d#)
+quotInteger (Jp# n)   (S# d#)
+  | isTrue# (d# >=# 0#) = bigNatToInteger    (quotBigNatWord n (int2Word# d#))
+  | True                = bigNatToNegInteger (quotBigNatWord n
+                                              (int2Word# (negateInt# d#)))
+quotInteger (Jn# n)   (S# d#)
+  | isTrue# (d# >=# 0#) = bigNatToNegInteger (quotBigNatWord n (int2Word# d#))
+  | True                = bigNatToInteger    (quotBigNatWord n
+                                              (int2Word# (negateInt# d#)))
+quotInteger (Jp# n) (Jp# d) = bigNatToInteger    (quotBigNat n d)
+quotInteger (Jp# n) (Jn# d) = bigNatToNegInteger (quotBigNat n d)
+quotInteger (Jn# n) (Jp# d) = bigNatToNegInteger (quotBigNat n d)
+quotInteger (Jn# n) (Jn# d) = bigNatToInteger    (quotBigNat n d)
+-- handle remaining non-allocating cases
+quotInteger n d = case inline quotRemInteger n d of (# q, _ #) -> q
+{-# CONSTANT_FOLDED quotInteger #-}
+
+remInteger :: Integer -> Integer -> Integer
+remInteger _        (S# 1#) = S# 0#
+remInteger _       (S# -1#) = S# 0#
+remInteger _        (S# 0#) = S# (remInt# 0# 0#)
+remInteger (S# 0#) _        = S# 0#
+remInteger (S# n#) (S# d#) = S# (remInt# n# d#)
+remInteger (Jp# n)  (S# d#)
+    = wordToInteger    (remBigNatWord n (int2Word# (absI# d#)))
+remInteger (Jn# n)  (S# d#)
+    = wordToNegInteger (remBigNatWord n (int2Word# (absI# d#)))
+remInteger (Jp# n)  (Jp# d)  = bigNatToInteger    (remBigNat n d)
+remInteger (Jp# n)  (Jn# d)  = bigNatToInteger    (remBigNat n d)
+remInteger (Jn# n)  (Jp# d)  = bigNatToNegInteger (remBigNat n d)
+remInteger (Jn# n)  (Jn# d)  = bigNatToNegInteger (remBigNat n d)
+-- handle remaining non-allocating cases
+remInteger n d = case inline quotRemInteger n d of (# _, r #) -> r
+{-# CONSTANT_FOLDED remInteger #-}
+
+-- | Simultaneous 'divInteger' and 'modInteger'.
+--
+-- Divisor must be non-zero otherwise the GHC runtime will terminate
+-- with a division-by-zero fault.
+divModInteger :: Integer -> Integer -> (# Integer, Integer #)
+divModInteger n d
+  | isTrue# (signumInteger# r ==# negateInt# (signumInteger# d))
+     = let !q' = plusInteger q (S# -1#) -- TODO: optimize
+           !r' = plusInteger r d
+       in (# q', r' #)
+  | True = qr
+  where
+    qr@(# q, r #) = quotRemInteger n d
+{-# CONSTANT_FOLDED divModInteger #-}
+
+divInteger :: Integer -> Integer -> Integer
+-- same-sign ops can be handled by more efficient 'quotInteger'
+divInteger n d | isTrue# (isNegInteger# n ==# isNegInteger# d) = quotInteger n d
+divInteger n d = case inline divModInteger n d of (# q, _ #) -> q
+{-# CONSTANT_FOLDED divInteger #-}
+
+modInteger :: Integer -> Integer -> Integer
+-- same-sign ops can be handled by more efficient 'remInteger'
+modInteger n d | isTrue# (isNegInteger# n ==# isNegInteger# d) = remInteger n d
+modInteger n d = case inline divModInteger n d of (# _, r #) -> r
+{-# CONSTANT_FOLDED modInteger #-}
+
+-- | Compute greatest common divisor.
+gcdInteger :: Integer -> Integer -> Integer
+gcdInteger (S# 0#)        b = absInteger b
+gcdInteger a        (S# 0#) = absInteger a
+gcdInteger (S# 1#)        _ = S# 1#
+gcdInteger (S# -1#)       _ = S# 1#
+gcdInteger _        (S# 1#) = S# 1#
+gcdInteger _       (S# -1#) = S# 1#
+gcdInteger (S# a#) (S# b#)
+    = wordToInteger (gcdWord# (int2Word# (absI# a#)) (int2Word# (absI# b#)))
+gcdInteger a@(S# _) b = gcdInteger b a
+gcdInteger (Jn# a) b = gcdInteger (Jp# a) b
+gcdInteger (Jp# a) (Jp# b) = bigNatToInteger (gcdBigNat a b)
+gcdInteger (Jp# a) (Jn# b) = bigNatToInteger (gcdBigNat a b)
+gcdInteger (Jp# a) (S# b#)
+    = wordToInteger (gcdBigNatWord a (int2Word# (absI# b#)))
+{-# CONSTANT_FOLDED gcdInteger #-}
+
+-- | Compute least common multiple.
+lcmInteger :: Integer -> Integer -> Integer
+lcmInteger (S# 0#) _   = S# 0#
+lcmInteger (S# 1#)  b  = absInteger b
+lcmInteger (S# -1#) b  = absInteger b
+lcmInteger _ (S# 0#)   = S# 0#
+lcmInteger a (S# 1#)   = absInteger a
+lcmInteger a (S# -1#)  = absInteger a
+lcmInteger a b = (aa `quotInteger` (aa `gcdInteger` ab)) `timesInteger` ab
+  where
+    aa = absInteger a
+    ab = absInteger b
+{-# CONSTANT_FOLDED lcmInteger #-}
+
+-- | Compute greatest common divisor.
+--
+-- Warning: result may become negative if (at least) one argument is 'minBound'
+gcdInt :: Int# -> Int# -> Int#
+gcdInt x# y#
+    = word2Int# (gcdWord# (int2Word# (absI# x#)) (int2Word# (absI# y#)))
+
+----------------------------------------------------------------------------
+-- BigNat operations
+
+compareBigNat :: BigNat -> BigNat -> Ordering
+compareBigNat x@(BN# x#) y@(BN# y#)
+  | isTrue# (nx# ==# ny#)
+      = compareInt# (narrowCInt# (c_mpn_cmp x# y# nx#)) 0#
+  | isTrue# (nx# <#  ny#) = LT
+  | True                  = GT
+  where
+    nx# = sizeofBigNat# x
+    ny# = sizeofBigNat# y
+
+compareBigNatWord :: BigNat -> GmpLimb# -> Ordering
+compareBigNatWord bn w#
+  | isTrue# (sizeofBigNat# bn ==# 1#) = cmpW# (bigNatToWord bn) w#
+  | True                              = GT
+
+gtBigNatWord# :: BigNat -> GmpLimb# -> Int#
+gtBigNatWord# bn w#
+    = (sizeofBigNat# bn ># 1#) `orI#` (bigNatToWord bn `gtWord#` w#)
+
+eqBigNat :: BigNat -> BigNat -> Bool
+eqBigNat x y = isTrue# (eqBigNat# x y)
+
+eqBigNat# :: BigNat -> BigNat -> Int#
+eqBigNat# x@(BN# x#) y@(BN# y#)
+  | isTrue# (nx# ==# ny#) = c_mpn_cmp x# y# nx# ==# 0#
+  | True                  = 0#
+  where
+    nx# = sizeofBigNat# x
+    ny# = sizeofBigNat# y
+
+neqBigNat# :: BigNat -> BigNat -> Int#
+neqBigNat# x@(BN# x#) y@(BN# y#)
+  | isTrue# (nx# ==# ny#) = c_mpn_cmp x# y# nx# /=# 0#
+  | True                  = 1#
+  where
+    nx# = sizeofBigNat# x
+    ny# = sizeofBigNat# y
+
+eqBigNatWord :: BigNat -> GmpLimb# -> Bool
+eqBigNatWord bn w# = isTrue# (eqBigNatWord# bn w#)
+
+eqBigNatWord# :: BigNat -> GmpLimb# -> Int#
+eqBigNatWord# bn w#
+    = sizeofBigNat# bn ==# 1# `andI#` (bigNatToWord bn `eqWord#` w#)
+
+
+-- | Same as @'indexBigNat#' bn 0\#@
+bigNatToWord :: BigNat -> Word#
+bigNatToWord bn = indexBigNat# bn 0#
+
+bigNatToInt :: BigNat -> Int#
+bigNatToInt (BN# ba#) = indexIntArray# ba# 0#
+
+-- | CAF representing the value @0 :: BigNat@
+zeroBigNat :: BigNat
+zeroBigNat = runS $ do
+    mbn <- newBigNat# 1#
+    _ <- svoid (writeBigNat# mbn 0# 0##)
+    unsafeFreezeBigNat# mbn
+{-# NOINLINE zeroBigNat #-}
+
+-- | Test if 'BigNat' value is equal to zero.
+isZeroBigNat :: BigNat -> Bool
+isZeroBigNat bn = eqBigNatWord bn 0##
+
+-- | CAF representing the value @1 :: BigNat@
+oneBigNat :: BigNat
+oneBigNat = runS $ do
+    mbn <- newBigNat# 1#
+    _ <- svoid (writeBigNat# mbn 0# 1##)
+    unsafeFreezeBigNat# mbn
+{-# NOINLINE oneBigNat #-}
+
+czeroBigNat :: BigNat
+czeroBigNat = runS $ do
+    mbn <- newBigNat# 1#
+    _ <- svoid (writeBigNat# mbn 0# (not# 0##))
+    unsafeFreezeBigNat# mbn
+{-# NOINLINE czeroBigNat #-}
+
+-- | Special 0-sized bigNat returned in case of arithmetic underflow
+--
+-- This is currently only returned by the following operations:
+--
+--  - 'minusBigNat'
+--  - 'minusBigNatWord'
+--
+-- Other operations such as 'quotBigNat' may return 'nullBigNat' as
+-- well as a dummy/place-holder value instead of 'undefined' since we
+-- can't throw exceptions. But that behaviour should not be relied
+-- upon.
+--
+-- NB: @isValidBigNat# nullBigNat@ is false
+nullBigNat :: BigNat
+nullBigNat = runS (newBigNat# 0# >>= unsafeFreezeBigNat#)
+{-# NOINLINE nullBigNat #-}
+
+-- | Test for special 0-sized 'BigNat' representing underflows.
+isNullBigNat# :: BigNat -> Int#
+isNullBigNat# (BN# ba#) = sizeofByteArray# ba# ==# 0#
+
+-- | Construct 1-limb 'BigNat' from 'Word#'
+wordToBigNat :: Word# -> BigNat
+wordToBigNat 0## = zeroBigNat
+wordToBigNat 1## = oneBigNat
+wordToBigNat w#
+  | isTrue# (not# w# `eqWord#` 0##) = czeroBigNat
+  | True = runS $ do
+    mbn <- newBigNat# 1#
+    _ <- svoid (writeBigNat# mbn 0# w#)
+    unsafeFreezeBigNat# mbn
+
+-- | Construct BigNat from 2 limbs.
+-- The first argument is the most-significant limb.
+wordToBigNat2 :: Word# -> Word# -> BigNat
+wordToBigNat2 0## lw# = wordToBigNat lw#
+wordToBigNat2 hw# lw# = runS $ do
+    mbn <- newBigNat# 2#
+    _ <- svoid (writeBigNat# mbn 0# lw#)
+    _ <- svoid (writeBigNat# mbn 1# hw#)
+    unsafeFreezeBigNat# mbn
+
+plusBigNat :: BigNat -> BigNat -> BigNat
+plusBigNat x y
+  | isTrue# (eqBigNatWord# x 0##) = y
+  | isTrue# (eqBigNatWord# y 0##) = x
+  | isTrue# (nx# >=# ny#) = go x nx# y ny#
+  | True                  = go y ny# x nx#
+  where
+    go (BN# a#) na# (BN# b#) nb# = runS $ do
+        mbn@(MBN# mba#) <- newBigNat# na#
+        (W# c#) <- liftIO (c_mpn_add mba# a# na# b# nb#)
+        case c# of
+              0## -> unsafeFreezeBigNat# mbn
+              _   -> unsafeSnocFreezeBigNat# mbn c#
+
+    nx# = sizeofBigNat# x
+    ny# = sizeofBigNat# y
+
+plusBigNatWord :: BigNat -> GmpLimb# -> BigNat
+plusBigNatWord x          0## = x
+plusBigNatWord x@(BN# x#) y# = runS $ do
+    mbn@(MBN# mba#) <- newBigNat# nx#
+    (W# c#) <- liftIO (c_mpn_add_1 mba# x# nx# y#)
+    case c# of
+        0## -> unsafeFreezeBigNat# mbn
+        _   -> unsafeSnocFreezeBigNat# mbn c#
+  where
+    nx# = sizeofBigNat# x
+
+-- | Returns 'nullBigNat' (see 'isNullBigNat#') in case of underflow
+minusBigNat :: BigNat -> BigNat -> BigNat
+minusBigNat x@(BN# x#) y@(BN# y#)
+  | isZeroBigNat y = x
+  | isTrue# (nx# >=# ny#) = runS $ do
+    mbn@(MBN# mba#) <- newBigNat# nx#
+    (W# b#) <- liftIO (c_mpn_sub mba# x# nx# y# ny#)
+    case b# of
+        0## -> unsafeRenormFreezeBigNat# mbn
+        _   -> return nullBigNat
+
+  | True = nullBigNat
+  where
+    nx# = sizeofBigNat# x
+    ny# = sizeofBigNat# y
+
+-- | Returns 'nullBigNat' (see 'isNullBigNat#') in case of underflow
+minusBigNatWord :: BigNat -> GmpLimb# -> BigNat
+minusBigNatWord x 0## = x
+minusBigNatWord x@(BN# x#) y# = runS $ do
+    mbn@(MBN# mba#) <- newBigNat# nx#
+    (W# b#) <- liftIO $ c_mpn_sub_1 mba# x# nx# y#
+    case b# of
+        0## -> unsafeRenormFreezeBigNat# mbn
+        _   -> return nullBigNat
+  where
+    nx# = sizeofBigNat# x
+
+
+timesBigNat :: BigNat -> BigNat -> BigNat
+timesBigNat x y
+  | isZeroBigNat x = zeroBigNat
+  | isZeroBigNat y = zeroBigNat
+  | isTrue# (nx# >=# ny#) = go x nx# y ny#
+  | True                  = go y ny# x nx#
+  where
+    go (BN# a#) na# (BN# b#) nb# = runS $ do
+        let n# = nx# +# ny#
+        mbn@(MBN# mba#) <- newBigNat# n#
+        (W# msl#) <- liftIO (c_mpn_mul mba# a# na# b# nb#)
+        case msl# of
+              0## -> unsafeShrinkFreezeBigNat# mbn (n# -# 1#)
+              _   -> unsafeFreezeBigNat# mbn
+
+    nx# = sizeofBigNat# x
+    ny# = sizeofBigNat# y
+
+-- | Square 'BigNat'
+sqrBigNat :: BigNat -> BigNat
+sqrBigNat x
+  | isZeroBigNat x = zeroBigNat
+  -- TODO: 1-limb BigNats below sqrt(maxBound::GmpLimb)
+sqrBigNat x = timesBigNat x x -- TODO: mpn_sqr
+
+timesBigNatWord :: BigNat -> GmpLimb# -> BigNat
+timesBigNatWord _ 0## = zeroBigNat
+timesBigNatWord x 1## = x
+timesBigNatWord x@(BN# x#) y#
+  | isTrue# (nx# ==# 1#) =
+      let (# !h#, !l# #) = timesWord2# (bigNatToWord x) y#
+      in wordToBigNat2 h# l#
+  | True = runS $ do
+        mbn@(MBN# mba#) <- newBigNat# nx#
+        (W# msl#) <- liftIO (c_mpn_mul_1 mba# x# nx# y#)
+        case msl# of
+              0## -> unsafeFreezeBigNat# mbn
+              _   -> unsafeSnocFreezeBigNat# mbn msl#
+
+  where
+    nx# = sizeofBigNat# x
+
+bitBigNat :: Int# -> BigNat
+bitBigNat i# = shiftLBigNat (wordToBigNat 1##) i# -- FIXME
+
+testBitBigNat :: BigNat -> Int# -> Bool
+testBitBigNat bn i#
+  | isTrue# (i#  <#  0#) = False
+  | isTrue# (li# <# nx#) = isTrue# (testBitWord# (indexBigNat# bn li#) bi#)
+  | True                 = False
+  where
+    (# li#, bi# #) = quotRemInt# i# GMP_LIMB_BITS#
+    nx# = sizeofBigNat# bn
+
+testBitNegBigNat :: BigNat -> Int# -> Bool
+testBitNegBigNat bn i#
+  | isTrue# (i#  <#  0#)  = False
+  | isTrue# (li# >=# nx#) = True
+  | allZ li# = isTrue# ((testBitWord#
+                         (indexBigNat# bn li# `minusWord#` 1##) bi#) ==# 0#)
+  | True     = isTrue# ((testBitWord# (indexBigNat# bn li#) bi#) ==# 0#)
+  where
+    (# li#, bi# #) = quotRemInt# i# GMP_LIMB_BITS#
+    nx# = sizeofBigNat# bn
+
+    allZ 0# = True
+    allZ j | isTrue# (indexBigNat# bn (j -# 1#) `eqWord#` 0##) = allZ (j -# 1#)
+           | True                 = False
+
+popCountBigNat :: BigNat -> Int#
+popCountBigNat bn@(BN# ba#) = word2Int# (c_mpn_popcount ba# (sizeofBigNat# bn))
+
+
+shiftLBigNat :: BigNat -> Int# -> BigNat
+shiftLBigNat x 0# = x
+shiftLBigNat x _ | isZeroBigNat x = zeroBigNat
+shiftLBigNat x@(BN# xba#) n# = runS $ do
+    ymbn@(MBN# ymba#) <- newBigNat# yn#
+    W# ymsl <- liftIO (c_mpn_lshift ymba# xba# xn# (int2Word# n#))
+    case ymsl of
+        0## -> unsafeShrinkFreezeBigNat# ymbn (yn# -# 1#)
+        _   -> unsafeFreezeBigNat# ymbn
+  where
+    xn# = sizeofBigNat# x
+    yn# = xn# +# nlimbs# +# (nbits# /=# 0#)
+    (# nlimbs#, nbits# #) = quotRemInt# n# GMP_LIMB_BITS#
+
+
+
+shiftRBigNat :: BigNat -> Int# -> BigNat
+shiftRBigNat x 0# = x
+shiftRBigNat x _ | isZeroBigNat x = zeroBigNat
+shiftRBigNat x@(BN# xba#) n#
+  | isTrue# (nlimbs# >=# xn#) = zeroBigNat
+  | True = runS $ do
+      ymbn@(MBN# ymba#) <- newBigNat# yn#
+      W# ymsl <- liftIO (c_mpn_rshift ymba# xba# xn# (int2Word# n#))
+      case ymsl of
+          0## -> unsafeRenormFreezeBigNat# ymbn -- may shrink more than one
+          _   -> unsafeFreezeBigNat# ymbn
+  where
+    xn# = sizeofBigNat# x
+    yn# = xn# -# nlimbs#
+    nlimbs# = quotInt# n# GMP_LIMB_BITS#
+
+shiftRNegBigNat :: BigNat -> Int# -> BigNat
+shiftRNegBigNat x 0# = x
+shiftRNegBigNat x _ | isZeroBigNat x = zeroBigNat
+shiftRNegBigNat x@(BN# xba#) n#
+  | isTrue# (nlimbs# >=# xn#) = zeroBigNat
+  | True = runS $ do
+      ymbn@(MBN# ymba#) <- newBigNat# yn#
+      W# ymsl <- liftIO (c_mpn_rshift_2c ymba# xba# xn# (int2Word# n#))
+      case ymsl of
+          0## -> unsafeRenormFreezeBigNat# ymbn -- may shrink more than one
+          _   -> unsafeFreezeBigNat# ymbn
+  where
+    xn# = sizeofBigNat# x
+    yn# = xn# -# nlimbs#
+    nlimbs# = quotInt# n# GMP_LIMB_BITS#
+
+
+orBigNat :: BigNat -> BigNat -> BigNat
+orBigNat x@(BN# x#) y@(BN# y#)
+  | isZeroBigNat x = y
+  | isZeroBigNat y = x
+  | isTrue# (nx# >=# ny#) = runS (ior' x# nx# y# ny#)
+  | True                  = runS (ior' y# ny# x# nx#)
+  where
+    ior' a# na# b# nb# = do -- na >= nb
+        mbn@(MBN# mba#) <- newBigNat# na#
+        _ <- liftIO (c_mpn_ior_n mba# a# b# nb#)
+        _ <- case na# ==# nb# of
+            0# -> svoid (copyWordArray# a# nb# mba# nb# (na# -# nb#))
+            _  -> return ()
+        unsafeFreezeBigNat# mbn
+
+    nx# = sizeofBigNat# x
+    ny# = sizeofBigNat# y
+
+
+xorBigNat :: BigNat -> BigNat -> BigNat
+xorBigNat x@(BN# x#) y@(BN# y#)
+  | isZeroBigNat x = y
+  | isZeroBigNat y = x
+  | isTrue# (nx# >=# ny#) = runS (xor' x# nx# y# ny#)
+  | True                  = runS (xor' y# ny# x# nx#)
+  where
+    xor' a# na# b# nb# = do -- na >= nb
+        mbn@(MBN# mba#) <- newBigNat# na#
+        _ <- liftIO (c_mpn_xor_n mba# a# b# nb#)
+        case na# ==# nb# of
+            0# -> do _ <- svoid (copyWordArray# a# nb# mba# nb# (na# -# nb#))
+                     unsafeFreezeBigNat# mbn
+            _  -> unsafeRenormFreezeBigNat# mbn
+
+    nx# = sizeofBigNat# x
+    ny# = sizeofBigNat# y
+
+-- | aka @\x y -> x .&. (complement y)@
+andnBigNat :: BigNat -> BigNat -> BigNat
+andnBigNat x@(BN# x#) y@(BN# y#)
+  | isZeroBigNat x = zeroBigNat
+  | isZeroBigNat y = x
+  | True = runS $ do
+      mbn@(MBN# mba#) <- newBigNat# nx#
+      _ <- liftIO (c_mpn_andn_n mba# x# y# n#)
+      _ <- case nx# ==# n# of
+            0# -> svoid (copyWordArray# x# n# mba# n# (nx# -# n#))
+            _  -> return ()
+      unsafeRenormFreezeBigNat# mbn
+  where
+    n# | isTrue# (nx# <# ny#) = nx#
+       | True                 = ny#
+    nx# = sizeofBigNat# x
+    ny# = sizeofBigNat# y
+
+
+andBigNat :: BigNat -> BigNat -> BigNat
+andBigNat x@(BN# x#) y@(BN# y#)
+  | isZeroBigNat x = zeroBigNat
+  | isZeroBigNat y = zeroBigNat
+  | True = runS $ do
+      mbn@(MBN# mba#) <- newBigNat# n#
+      _ <- liftIO (c_mpn_and_n mba# x# y# n#)
+      unsafeRenormFreezeBigNat# mbn
+  where
+    n# | isTrue# (nx# <# ny#) = nx#
+       | True                 = ny#
+    nx# = sizeofBigNat# x
+    ny# = sizeofBigNat# y
+
+-- | If divisor is zero, @(\# 'nullBigNat', 'nullBigNat' \#)@ is returned
+quotRemBigNat :: BigNat -> BigNat -> (# BigNat,BigNat #)
+quotRemBigNat n@(BN# nba#) d@(BN# dba#)
+  | isZeroBigNat d     = (# nullBigNat, nullBigNat #)
+  | eqBigNatWord d 1## = (# n, zeroBigNat #)
+  | n < d              = (# zeroBigNat, n #)
+  | True = case runS go of (!q,!r) -> (# q, r #)
+  where
+    nn# = sizeofBigNat# n
+    dn# = sizeofBigNat# d
+    qn# = 1# +# nn# -# dn#
+    rn# = dn#
+
+    go = do
+      qmbn@(MBN# qmba#) <- newBigNat# qn#
+      rmbn@(MBN# rmba#) <- newBigNat# rn#
+
+      _ <- liftIO (c_mpn_tdiv_qr qmba# rmba# 0# nba# nn# dba# dn#)
+
+      q <- unsafeRenormFreezeBigNat# qmbn
+      r <- unsafeRenormFreezeBigNat# rmbn
+      return (q, r)
+
+quotBigNat :: BigNat -> BigNat -> BigNat
+quotBigNat n@(BN# nba#) d@(BN# dba#)
+  | isZeroBigNat d     = nullBigNat
+  | eqBigNatWord d 1## = n
+  | n < d              = zeroBigNat
+  | True = runS $ do
+      let nn# = sizeofBigNat# n
+      let dn# = sizeofBigNat# d
+      let qn# = 1# +# nn# -# dn#
+      qmbn@(MBN# qmba#) <- newBigNat# qn#
+      _ <- liftIO (c_mpn_tdiv_q qmba# nba# nn# dba# dn#)
+      unsafeRenormFreezeBigNat# qmbn
+
+remBigNat :: BigNat -> BigNat -> BigNat
+remBigNat n@(BN# nba#) d@(BN# dba#)
+  | isZeroBigNat d     = nullBigNat
+  | eqBigNatWord d 1## = zeroBigNat
+  | n < d              = n
+  | True = runS $ do
+      let nn# = sizeofBigNat# n
+      let dn# = sizeofBigNat# d
+      rmbn@(MBN# rmba#) <- newBigNat# dn#
+      _ <- liftIO (c_mpn_tdiv_r rmba# nba# nn# dba# dn#)
+      unsafeRenormFreezeBigNat# rmbn
+
+-- | Note: Result of div/0 undefined
+quotRemBigNatWord :: BigNat -> GmpLimb# -> (# BigNat, GmpLimb# #)
+quotRemBigNatWord _            0## = (# nullBigNat, 0## #)
+quotRemBigNatWord n            1## = (# n,          0## #)
+quotRemBigNatWord n@(BN# nba#) d# = case compareBigNatWord n d# of
+    LT -> (# zeroBigNat, bigNatToWord n #)
+    EQ -> (# oneBigNat, 0## #)
+    GT -> case runS go of (!q,!(W# r#)) -> (# q, r# #) -- TODO: handle word/word
+  where
+    go = do
+      let nn# = sizeofBigNat# n
+      qmbn@(MBN# qmba#) <- newBigNat# nn#
+      r <- liftIO (c_mpn_divrem_1 qmba# 0# nba# nn# d#)
+      q <- unsafeRenormFreezeBigNat# qmbn
+      return (q,r)
+
+quotBigNatWord :: BigNat -> GmpLimb# -> BigNat
+quotBigNatWord n d# = case inline quotRemBigNatWord n d# of (# q, _ #) -> q
+
+-- | div/0 not checked
+remBigNatWord :: BigNat -> GmpLimb# -> Word#
+remBigNatWord n@(BN# nba#) d# = c_mpn_mod_1 nba# (sizeofBigNat# n) d#
+
+gcdBigNatWord :: BigNat -> Word# -> Word#
+gcdBigNatWord bn@(BN# ba#) = c_mpn_gcd_1# ba# (sizeofBigNat# bn)
+
+gcdBigNat :: BigNat -> BigNat -> BigNat
+gcdBigNat x@(BN# x#) y@(BN# y#)
+  | isZeroBigNat x = y
+  | isZeroBigNat y = x
+  | isTrue# (nx# >=# ny#) = runS (gcd' x# nx# y# ny#)
+  | True                  = runS (gcd' y# ny# x# nx#)
+  where
+    gcd' a# na# b# nb# = do -- na >= nb
+        mbn@(MBN# mba#) <- newBigNat# nb#
+        I# rn'# <- liftIO (c_mpn_gcd# mba# a# na# b# nb#)
+        let rn# = narrowGmpSize# rn'#
+        case rn# ==# nb# of
+            0# -> unsafeShrinkFreezeBigNat# mbn rn#
+            _  -> unsafeFreezeBigNat# mbn
+
+    nx# = sizeofBigNat# x
+    ny# = sizeofBigNat# y
+
+
+----------------------------------------------------------------------------
+-- Conversions to/from floating point
+
+decodeDoubleInteger :: Double# -> (# Integer, Int# #)
+-- decodeDoubleInteger 0.0## = (# S# 0#, 0# #)
+#if WORD_SIZE_IN_BITS == 64
+decodeDoubleInteger x = case decodeDouble_Int64# x of
+                          (# m#, e# #) -> (# S# m#, e# #)
+#elif WORD_SIZE_IN_BITS == 32
+decodeDoubleInteger x = case decodeDouble_Int64# x of
+                          (# m#, e# #) -> (# int64ToInteger m#, e# #)
+#endif
+{-# CONSTANT_FOLDED decodeDoubleInteger #-}
+
+-- provided by GHC's RTS
+foreign import ccall unsafe "__int_encodeDouble"
+  int_encodeDouble# :: Int# -> Int# -> Double#
+
+encodeDoubleInteger :: Integer -> Int# -> Double#
+encodeDoubleInteger (S# m#) 0# = int2Double# m#
+encodeDoubleInteger (S# m#) e# = int_encodeDouble# m# e#
+encodeDoubleInteger (Jp# bn@(BN# bn#)) e#
+    = c_mpn_get_d bn# (sizeofBigNat# bn) e#
+encodeDoubleInteger (Jn# bn@(BN# bn#)) e#
+    = c_mpn_get_d bn# (negateInt# (sizeofBigNat# bn)) e#
+{-# CONSTANT_FOLDED encodeDoubleInteger #-}
+
+-- double integer_gmp_mpn_get_d (const mp_limb_t sp[], const mp_size_t sn)
+foreign import ccall unsafe "integer_gmp_mpn_get_d"
+  c_mpn_get_d :: ByteArray# -> GmpSize# -> Int# -> Double#
+
+doubleFromInteger :: Integer -> Double#
+doubleFromInteger (S# m#) = int2Double# m#
+doubleFromInteger (Jp# bn@(BN# bn#))
+    = c_mpn_get_d bn# (sizeofBigNat# bn) 0#
+doubleFromInteger (Jn# bn@(BN# bn#))
+    = c_mpn_get_d bn# (negateInt# (sizeofBigNat# bn)) 0#
+{-# CONSTANT_FOLDED doubleFromInteger #-}
+
+-- TODO: Not sure if it's worth to write 'Float' optimized versions here
+floatFromInteger :: Integer -> Float#
+floatFromInteger i = double2Float# (doubleFromInteger i)
+
+encodeFloatInteger :: Integer -> Int# -> Float#
+encodeFloatInteger m e = double2Float# (encodeDoubleInteger m e)
+
+----------------------------------------------------------------------------
+-- FFI ccall imports
+
+foreign import ccall unsafe "integer_gmp_gcd_word"
+  gcdWord# :: GmpLimb# -> GmpLimb# -> GmpLimb#
+
+foreign import ccall unsafe "integer_gmp_mpn_gcd_1"
+  c_mpn_gcd_1# :: ByteArray# -> GmpSize# -> GmpLimb# -> GmpLimb#
+
+foreign import ccall unsafe "integer_gmp_mpn_gcd"
+  c_mpn_gcd# :: MutableByteArray# s -> ByteArray# -> GmpSize#
+                -> ByteArray# -> GmpSize# -> IO GmpSize
+
+-- mp_limb_t mpn_add_1 (mp_limb_t *rp, const mp_limb_t *s1p, mp_size_t n,
+--                      mp_limb_t s2limb)
+foreign import ccall unsafe "gmp.h __gmpn_add_1"
+  c_mpn_add_1 :: MutableByteArray# s -> ByteArray# -> GmpSize# -> GmpLimb#
+                 -> IO GmpLimb
+
+-- mp_limb_t mpn_sub_1 (mp_limb_t *rp, const mp_limb_t *s1p, mp_size_t n,
+--                      mp_limb_t s2limb)
+foreign import ccall unsafe "gmp.h __gmpn_sub_1"
+  c_mpn_sub_1 :: MutableByteArray# s -> ByteArray# -> GmpSize# -> GmpLimb#
+                 -> IO GmpLimb
+
+-- mp_limb_t mpn_mul_1 (mp_limb_t *rp, const mp_limb_t *s1p, mp_size_t n,
+--                      mp_limb_t s2limb)
+foreign import ccall unsafe "gmp.h __gmpn_mul_1"
+  c_mpn_mul_1 :: MutableByteArray# s -> ByteArray# -> GmpSize# -> GmpLimb#
+                 -> IO GmpLimb
+
+-- mp_limb_t mpn_add (mp_limb_t *rp, const mp_limb_t *s1p, mp_size_t s1n,
+--                    const mp_limb_t *s2p, mp_size_t s2n)
+foreign import ccall unsafe "gmp.h __gmpn_add"
+  c_mpn_add :: MutableByteArray# s -> ByteArray# -> GmpSize#
+               -> ByteArray# -> GmpSize# -> IO GmpLimb
+
+-- mp_limb_t mpn_sub (mp_limb_t *rp, const mp_limb_t *s1p, mp_size_t s1n,
+--                    const mp_limb_t *s2p, mp_size_t s2n)
+foreign import ccall unsafe "gmp.h __gmpn_sub"
+  c_mpn_sub :: MutableByteArray# s -> ByteArray# -> GmpSize# -> ByteArray#
+               -> GmpSize# -> IO GmpLimb
+
+-- mp_limb_t mpn_mul (mp_limb_t *rp, const mp_limb_t *s1p, mp_size_t s1n,
+--                    const mp_limb_t *s2p, mp_size_t s2n)
+foreign import ccall unsafe "gmp.h __gmpn_mul"
+  c_mpn_mul :: MutableByteArray# s -> ByteArray# -> GmpSize# -> ByteArray#
+               -> GmpSize# -> IO GmpLimb
+
+-- int mpn_cmp (const mp_limb_t *s1p, const mp_limb_t *s2p, mp_size_t n)
+foreign import ccall unsafe "gmp.h __gmpn_cmp"
+  c_mpn_cmp :: ByteArray# -> ByteArray# -> GmpSize# -> CInt#
+
+-- void mpn_tdiv_qr (mp_limb_t *qp, mp_limb_t *rp, mp_size_t qxn,
+--                   const mp_limb_t *np, mp_size_t nn,
+--                   const mp_limb_t *dp, mp_size_t dn)
+foreign import ccall unsafe "gmp.h __gmpn_tdiv_qr"
+  c_mpn_tdiv_qr :: MutableByteArray# s -> MutableByteArray# s -> GmpSize#
+                   -> ByteArray# -> GmpSize# -> ByteArray# -> GmpSize# -> IO ()
+
+foreign import ccall unsafe "integer_gmp_mpn_tdiv_q"
+  c_mpn_tdiv_q :: MutableByteArray# s -> ByteArray# -> GmpSize# -> ByteArray#
+                  -> GmpSize# -> IO ()
+
+foreign import ccall unsafe "integer_gmp_mpn_tdiv_r"
+  c_mpn_tdiv_r :: MutableByteArray# s -> ByteArray# -> GmpSize# -> ByteArray#
+                  -> GmpSize# -> IO ()
+
+-- mp_limb_t mpn_divrem_1 (mp_limb_t *r1p, mp_size_t qxn, mp_limb_t *s2p,
+--                         mp_size_t s2n, mp_limb_t s3limb)
+foreign import ccall unsafe "gmp.h __gmpn_divrem_1"
+  c_mpn_divrem_1 :: MutableByteArray# s -> GmpSize# -> ByteArray# -> GmpSize#
+                    -> GmpLimb# -> IO GmpLimb
+
+-- mp_limb_t mpn_mod_1 (const mp_limb_t *s1p, mp_size_t s1n, mp_limb_t s2limb)
+foreign import ccall unsafe "gmp.h __gmpn_mod_1"
+  c_mpn_mod_1 :: ByteArray# -> GmpSize# -> GmpLimb# -> GmpLimb#
+
+-- mp_limb_t integer_gmp_mpn_rshift (mp_limb_t rp[], const mp_limb_t sp[],
+--                                   mp_size_t sn, mp_bitcnt_t count)
+foreign import ccall unsafe "integer_gmp_mpn_rshift"
+  c_mpn_rshift :: MutableByteArray# s -> ByteArray# -> GmpSize# -> GmpBitCnt#
+                  -> IO GmpLimb
+
+-- mp_limb_t integer_gmp_mpn_rshift (mp_limb_t rp[], const mp_limb_t sp[],
+--                                   mp_size_t sn, mp_bitcnt_t count)
+foreign import ccall unsafe "integer_gmp_mpn_rshift_2c"
+  c_mpn_rshift_2c :: MutableByteArray# s -> ByteArray# -> GmpSize# -> GmpBitCnt#
+                     -> IO GmpLimb
+
+-- mp_limb_t integer_gmp_mpn_lshift (mp_limb_t rp[], const mp_limb_t sp[],
+--                                   mp_size_t sn, mp_bitcnt_t count)
+foreign import ccall unsafe "integer_gmp_mpn_lshift"
+  c_mpn_lshift :: MutableByteArray# s -> ByteArray# -> GmpSize# -> GmpBitCnt#
+                  -> IO GmpLimb
+
+-- void mpn_and_n (mp_limb_t *rp, const mp_limb_t *s1p, const mp_limb_t *s2p,
+--                 mp_size_t n)
+foreign import ccall unsafe "gmp.h __gmpn_and_n"
+  c_mpn_and_n :: MutableByteArray# s -> ByteArray# -> ByteArray# -> GmpSize#
+                 -> IO ()
+
+-- void mpn_andn_n (mp_limb_t *rp, const mp_limb_t *s1p, const mp_limb_t *s2p,
+--                  mp_size_t n)
+foreign import ccall unsafe "gmp.h __gmpn_andn_n"
+  c_mpn_andn_n :: MutableByteArray# s -> ByteArray# -> ByteArray# -> GmpSize#
+                  -> IO ()
+
+-- void mpn_ior_n (mp_limb_t *rp, const mp_limb_t *s1p, const mp_limb_t *s2p,
+--                 mp_size_t n)
+foreign import ccall unsafe "gmp.h __gmpn_ior_n"
+  c_mpn_ior_n :: MutableByteArray# s -> ByteArray# -> ByteArray# -> GmpSize#
+                 -> IO ()
+
+-- void mpn_xor_n (mp_limb_t *rp, const mp_limb_t *s1p, const mp_limb_t *s2p,
+--                 mp_size_t n)
+foreign import ccall unsafe "gmp.h __gmpn_xor_n"
+  c_mpn_xor_n :: MutableByteArray# s -> ByteArray# -> ByteArray# -> GmpSize#
+                 -> IO ()
+
+-- mp_bitcnt_t mpn_popcount (const mp_limb_t *s1p, mp_size_t n)
+foreign import ccall unsafe "gmp.h __gmpn_popcount"
+  c_mpn_popcount :: ByteArray# -> GmpSize# -> GmpBitCnt#
+
+----------------------------------------------------------------------------
+-- BigNat-wrapped ByteArray#-primops
+
+-- | Return number of limbs contained in 'BigNat'.
+sizeofBigNat# :: BigNat -> GmpSize#
+sizeofBigNat# (BN# x#)
+    = sizeofByteArray# x# `uncheckedIShiftRL#` GMP_LIMB_SHIFT#
+
+data MutBigNat s = MBN# !(MutableByteArray# s)
+
+sizeofMutBigNat# :: MutBigNat s -> GmpSize#
+sizeofMutBigNat# (MBN# x#)
+    = sizeofMutableByteArray# x# `uncheckedIShiftRL#` GMP_LIMB_SHIFT#
+
+newBigNat# :: GmpSize# -> S s (MutBigNat s)
+newBigNat# limbs# s =
+    case newByteArray# (limbs# `uncheckedIShiftL#` GMP_LIMB_SHIFT#) s of
+        (# s', mba# #) -> (# s', MBN# mba# #)
+
+writeBigNat# :: MutBigNat s -> GmpSize# -> GmpLimb# -> State# s -> State# s
+writeBigNat# (MBN# mba#) = writeWordArray# mba#
+
+-- | Extract /n/-th (0-based) limb in 'BigNat'.
+-- /n/ must be less than size as reported by 'sizeofBigNat#'.
+indexBigNat# :: BigNat -> GmpSize# -> GmpLimb#
+indexBigNat# (BN# ba#) = indexWordArray# ba#
+
+unsafeFreezeBigNat# :: MutBigNat s -> S s BigNat
+unsafeFreezeBigNat# (MBN# mba#) s = case unsafeFreezeByteArray# mba# s of
+                                      (# s', ba# #) -> (# s', BN# ba# #)
+
+resizeMutBigNat# :: MutBigNat s -> GmpSize# -> S s (MutBigNat s)
+resizeMutBigNat# (MBN# mba0#) nsz# s
+  | isTrue# (bsz# ==# sizeofMutableByteArray# mba0#) = (# s, MBN# mba0# #)
+  | True = case resizeMutableByteArray# mba0# bsz# s of
+        (# s', mba# #) -> (# s' , MBN# mba# #)
+  where
+    bsz# = nsz# `uncheckedIShiftL#` GMP_LIMB_SHIFT#
+
+shrinkMutBigNat# :: MutBigNat s -> GmpSize# -> State# s -> State# s
+shrinkMutBigNat# (MBN# mba0#) nsz#
+  | isTrue# (bsz# ==# sizeofMutableByteArray# mba0#) = \s -> s -- no-op
+  | True = shrinkMutableByteArray# mba0# bsz#
+  where
+    bsz# = nsz# `uncheckedIShiftL#` GMP_LIMB_SHIFT#
+
+unsafeSnocFreezeBigNat# :: MutBigNat s -> GmpLimb# -> S s BigNat
+unsafeSnocFreezeBigNat# mbn0@(MBN# mba0#) limb# = do
+    -- (MBN# mba#) <- newBigNat# (n# +# 1#)
+    -- _ <- svoid (copyMutableByteArray# mba0# 0# mba# 0# nb0#)
+    (MBN# mba#) <- resizeMutBigNat# mbn0 (n# +# 1#)
+    _ <- svoid (writeWordArray# mba# n# limb#)
+    unsafeFreezeBigNat# (MBN# mba#)
+  where
+    n#   = nb0# `uncheckedIShiftRL#` GMP_LIMB_SHIFT#
+    nb0# = sizeofMutableByteArray# mba0#
+
+-- | May shrink underlyng 'ByteArray#' if needed to satisfy BigNat invariant
+unsafeRenormFreezeBigNat# :: MutBigNat s -> S s BigNat
+unsafeRenormFreezeBigNat# mbn s
+  | isTrue# (n0# ==# 0#)  = (# s', nullBigNat #)
+  | isTrue# (n#  ==# 0#)  = (# s', zeroBigNat #)
+  | isTrue# (n#  ==# n0#) = (unsafeFreezeBigNat# mbn) s'
+  | True                  = (unsafeShrinkFreezeBigNat# mbn n#) s'
+  where
+    (# s', n# #) = normSizeofMutBigNat'# mbn n0# s
+    n0# = sizeofMutBigNat# mbn
+
+-- | Shrink MBN
+unsafeShrinkFreezeBigNat# :: MutBigNat s -> GmpSize# -> S s BigNat
+unsafeShrinkFreezeBigNat# x@(MBN# xmba) 1#
+    = \s -> case readWordArray# xmba 0# s of
+        (# s', w#   #) -> freezeOneLimb w# s'
+  where
+    freezeOneLimb 0## = return zeroBigNat
+    freezeOneLimb 1## = return oneBigNat
+    freezeOneLimb w# | isTrue# (not# w# `eqWord#` 0##) = return czeroBigNat
+    freezeOneLimb _   = do
+        _ <- svoid (shrinkMutBigNat# x 1#)
+        unsafeFreezeBigNat# x
+unsafeShrinkFreezeBigNat# x y# = do
+    _ <- svoid (shrinkMutBigNat# x y#)
+    unsafeFreezeBigNat# x
+
+
+copyWordArray# :: ByteArray# -> Int# -> MutableByteArray# s -> Int# -> Int#
+                  -> State# s -> State# s
+copyWordArray# src src_ofs dst dst_ofs len
+  = copyByteArray# src (src_ofs `uncheckedIShiftL#` GMP_LIMB_SHIFT#)
+                   dst (dst_ofs `uncheckedIShiftL#` GMP_LIMB_SHIFT#)
+                   (len `uncheckedIShiftL#` GMP_LIMB_SHIFT#)
+
+-- | Version of 'normSizeofMutBigNat'#' which scans all allocated 'MutBigNat#'
+normSizeofMutBigNat# :: MutBigNat s -> State# s -> (# State# s, Int# #)
+normSizeofMutBigNat# mbn@(MBN# mba) = normSizeofMutBigNat'# mbn sz#
+  where
+    sz# = sizeofMutableByteArray# mba `uncheckedIShiftRA#` GMP_LIMB_SHIFT#
+
+-- | Find most-significant non-zero limb and return its index-position
+-- plus one. Start scanning downward from the initial limb-size
+-- (i.e. start-index plus one) given as second argument.
+--
+-- NB: The 'normSizeofMutBigNat' of 'zeroBigNat' would be @0#@
+normSizeofMutBigNat'# :: MutBigNat s -> GmpSize#
+                         -> State# s -> (# State# s, GmpSize# #)
+normSizeofMutBigNat'# (MBN# mba) = go
+  where
+    go  0# s = (# s, 0# #)
+    go i0# s = case readWordArray# mba (i0# -# 1#) s of
+        (# s', 0## #) -> go (i0# -# 1#) s'
+        (# s', _  #) -> (# s', i0# #)
+
+-- | Construct 'BigNat' from existing 'ByteArray#' containing /n/
+-- 'GmpLimb's in least-significant-first order.
+--
+-- If possible 'ByteArray#', will be used directly (i.e. shared
+-- /without/ cloning the 'ByteArray#' into a newly allocated one)
+--
+-- Note: size parameter (times @sizeof(GmpLimb)@) must be less or
+-- equal to its 'sizeofByteArray#'.
+byteArrayToBigNat# :: ByteArray# -> GmpSize# -> BigNat
+byteArrayToBigNat# ba# n0#
+  | isTrue# (n#  ==# 0#)    = zeroBigNat
+  | isTrue# (baszr# ==# 0#) -- i.e. ba# is multiple of limb-size
+  , isTrue# (baszq# ==# n#) = (BN# ba#)
+  | True = runS $ do
+      mbn@(MBN# mba#) <- newBigNat# n#
+      _ <- svoid (copyByteArray# ba# 0# mba# 0# (sizeofMutableByteArray# mba#))
+      unsafeFreezeBigNat# mbn
+  where
+    (# baszq#, baszr# #) = quotRemInt# (sizeofByteArray# ba#) GMP_LIMB_BYTES#
+
+    n#  = fmssl (n0# -# 1#)
+
+    -- find most signifcant set limb, return normalized size
+    fmssl i#
+      | isTrue# (i# <# 0#)                             = 0#
+      | isTrue# (neWord# (indexWordArray# ba# i#) 0##) = i# +# 1#
+      | True                                           = fmssl (i# -# 1#)
+
+-- | Test whether all internal invariants are satisfied by 'BigNat' value
+--
+-- Returns @1#@ if valid, @0#@ otherwise.
+--
+-- This operation is mostly useful for test-suites and/or code which
+-- constructs 'Integer' values directly.
+isValidBigNat# :: BigNat -> Int#
+isValidBigNat# (BN# ba#)
+  = (szq# ># 0#) `andI#` (szr# ==# 0#) `andI#` isNorm#
+  where
+    isNorm# = case szq# ># 1# of
+                1# -> (indexWordArray# ba# (szq# -# 1#)) `neWord#` 0##
+                _  -> 1#
+
+    sz# = sizeofByteArray# ba#
+
+    (# szq#, szr# #) = quotRemInt# sz# GMP_LIMB_BYTES#
+
+----------------------------------------------------------------------------
+-- monadic combinators for low-level state threading
+
+type S s a = State# s -> (# State# s, a #)
+
+infixl 1 >>=
+infixl 1 >>
+infixr 0 $
+
+{-# INLINE ($) #-}
+($)                     :: (a -> b) -> a -> b
+f $ x                   =  f x
+
+{-# INLINE (>>=) #-}
+(>>=) :: S s a -> (a -> S s b) -> S s b
+(>>=) m k = \s -> case m s of (# s', a #) -> k a s'
+
+{-# INLINE (>>) #-}
+(>>) :: S s a -> S s b -> S s b
+(>>) m k = \s -> case m s of (# s', _ #) -> k s'
+
+{-# INLINE svoid #-}
+svoid :: (State# s -> State# s) -> S s ()
+svoid m0 = \s -> case m0 s of s' -> (# s', () #)
+
+{-# INLINE return #-}
+return :: a -> S s a
+return a = \s -> (# s, a #)
+
+{-# INLINE liftIO #-}
+liftIO :: IO a -> S RealWorld a
+liftIO (IO m) = m
+
+-- NB: equivalent of GHC.IO.unsafeDupablePerformIO, see notes there
+runS :: S RealWorld a -> a
+runS m = lazy (case m realWorld# of (# _, r #) -> r)
+{-# NOINLINE runS #-}
+
+-- stupid hack
+fail :: [Char] -> S s a
+fail s = return (raise# s)
+
+----------------------------------------------------------------------------
+-- misc helpers, some of these should rather be primitives exported by ghc-prim
+
+cmpW# :: Word# -> Word# -> Ordering
+cmpW# x# y#
+  | isTrue# (x# `ltWord#` y#) = LT
+  | isTrue# (x# `eqWord#` y#) = EQ
+  | True                      = GT
+{-# INLINE cmpW# #-}
+
+subWordC# :: Word# -> Word# -> (# Word#, Int# #)
+subWordC# x# y# = (# d#, c# #)
+  where
+    d# = x# `minusWord#` y#
+    c# = d# `gtWord#` x#
+{-# INLINE subWordC# #-}
+
+bitWord# :: Int# -> Word#
+bitWord# = uncheckedShiftL# 1##
+{-# INLINE bitWord# #-}
+
+testBitWord# :: Word# -> Int# -> Int#
+testBitWord# w# i# = (bitWord# i# `and#` w#) `neWord#` 0##
+{-# INLINE testBitWord# #-}
+
+popCntI# :: Int# -> Int#
+popCntI# i# = word2Int# (popCnt# (int2Word# i#))
+{-# INLINE popCntI# #-}
+
+-- branchless version
+absI# :: Int# -> Int#
+absI# i# = (i# `xorI#` nsign) -# nsign
+  where
+    -- nsign = negateInt# (i# <# 0#)
+    nsign = uncheckedIShiftRA# i# (WORD_SIZE_IN_BITS# -# 1#)
+
+-- branchless version
+sgnI# :: Int# -> Int#
+sgnI# x# = (x# ># 0#) -# (x# <# 0#)
+
+cmpI# :: Int# -> Int# -> Int#
+cmpI# x# y# = (x# ># y#) -# (x# <# y#)
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 4d860ec1da..4f22c56cc5 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -230,7 +230,7 @@ ExtraMakefileSanityChecks = NO
 # Options for Libraries
 
 # Which directory (in libraries/) contains the integer library?
-INTEGER_LIBRARY=integer-gmp
+INTEGER_LIBRARY=integer-gmp2
 
 # We build the libraries at least the "vanilla" way (way "v")
 GhcLibWays = v
diff --git a/rules/foreachLibrary.mk b/rules/foreachLibrary.mk
index cdd54962db..254321e3b0 100644
--- a/rules/foreachLibrary.mk
+++ b/rules/foreachLibrary.mk
@@ -31,6 +31,7 @@
 #  - bin-package-db
 #  - ghc-prim
 #  - integer-gmp
+#  - integer-gmp2
 #  - integer-simple
 #  - template-haskell
 
@@ -41,6 +42,7 @@ $$(foreach hashline,libraries/bin-package-db#-#no-remote-repo#no-vcs        \
                     libraries/base#-#no-remote-repo#no-vcs                  \
                     libraries/ghc-prim#-#no-remote-repo#no-vcs              \
                     libraries/integer-gmp#-#no-remote-repo#no-vcs           \
+                    libraries/integer-gmp2#-#no-remote-repo#no-vcs          \
                     libraries/integer-simple#-#no-remote-repo#no-vcs        \
                     libraries/template-haskell#-#no-remote-repo#no-vcs      \
                     $$(shell grep '^libraries/' packages | sed 's/  */#/g'),\
diff --git a/testsuite/tests/ghci/scripts/ghci025.stdout b/testsuite/tests/ghci/scripts/ghci025.stdout
index e5654b3734..532a3347cc 100644
--- a/testsuite/tests/ghci/scripts/ghci025.stdout
+++ b/testsuite/tests/ghci/scripts/ghci025.stdout
@@ -56,9 +56,9 @@ Prelude.length ::
   Data.Foldable.Foldable t => forall a. t a -> GHC.Types.Int
 -- imported via T
 data T.Integer
-  = integer-gmp-0.5.1.0:GHC.Integer.Type.S# GHC.Prim.Int#
-  | integer-gmp-0.5.1.0:GHC.Integer.Type.J# GHC.Prim.Int#
-                                            GHC.Prim.ByteArray#
+  = integer-gmp-1.0.0.0:GHC.Integer.Type.S# !GHC.Prim.Int#
+  | integer-gmp-1.0.0.0:GHC.Integer.Type.Jp# {-# UNPACK #-}integer-gmp-1.0.0.0:GHC.Integer.Type.BigNat
+  | integer-gmp-1.0.0.0:GHC.Integer.Type.Jn# {-# UNPACK #-}integer-gmp-1.0.0.0:GHC.Integer.Type.BigNat
 T.length :: Data.ByteString.Internal.ByteString -> GHC.Types.Int
 :browse! T
 -- defined locally
diff --git a/testsuite/tests/lib/integer/all.T b/testsuite/tests/lib/integer/all.T
index 7b5e5f2dbe..55154265fc 100644
--- a/testsuite/tests/lib/integer/all.T
+++ b/testsuite/tests/lib/integer/all.T
@@ -1,7 +1,8 @@
 test('integerBits', normal, compile_and_run, [''])
 test('integerConversions', normal, compile_and_run, [''])
+## 'integerGmpInternals' disabled till the extra primitives are re-implemented
 # skip ghci as it doesn't support unboxed tuples
-test('integerGmpInternals', [reqlib('integer-gmp'), omit_ways('ghci')], compile_and_run, [''])
+# test('integerGmpInternals', [reqlib('integer-gmp'), omit_ways('ghci')], compile_and_run, [''])
 test('integerConstantFolding',
      [ extra_clean(['integerConstantFolding.simpl'])
      , when(compiler_debugged(), expect_broken(8525))],
diff --git a/testsuite/tests/llvm/should_compile/all.T b/testsuite/tests/llvm/should_compile/all.T
index e9154196f0..b630645f1e 100644
--- a/testsuite/tests/llvm/should_compile/all.T
+++ b/testsuite/tests/llvm/should_compile/all.T
@@ -7,7 +7,7 @@ setTestOpts(f)
 
 test('T5054', reqlib('hmatrix'), compile, ['-package hmatrix'])
 test('T5054_2', reqlib('hmatrix'), compile, ['-package hmatrix'])
-test('T5486', reqlib('integer-gmp'), compile, [''])
+# test('T5486', reqlib('integer-gmp'), compile, [''])
 test('T5681', normal, compile, [''])
 test('T6158', [reqlib('vector'), reqlib('primitive')], compile, ['-package vector -package primitive'])
 test('T7571', cmm_src, compile, [''])
diff --git a/testsuite/tests/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T
index 749e8aefe6..d8af52bbef 100644
--- a/testsuite/tests/perf/should_run/all.T
+++ b/testsuite/tests/perf/should_run/all.T
@@ -169,8 +169,9 @@ test('T5549',
      [stats_num_field('bytes allocated',
                       [(wordsize(32), 3362958676, 5),
                     # expected value: 3362958676 (Windows)
-                       (wordsize(64), 6725846120, 5)]),
+                       (wordsize(64), 8193140752, 5)]),
                     # expected value: 6725846120 (amd64/Linux)
+                    #                 8193140752 (amd64/Linux) integer-gmp2
       only_ways(['normal'])
       ],
      compile_and_run,
diff --git a/testsuite/tests/perf/space_leaks/all.T b/testsuite/tests/perf/space_leaks/all.T
index ac60c8fa58..af7eefccc5 100644
--- a/testsuite/tests/perf/space_leaks/all.T
+++ b/testsuite/tests/perf/space_leaks/all.T
@@ -4,7 +4,8 @@ test('space_leak_001',
      # Now it's: 3 (amd64/Linux)
      #           4 (x86/OS X)
      #           5 (x86/Linux)
-     [stats_num_field('peak_megabytes_allocated', (4, 1)),
+     [stats_num_field('peak_megabytes_allocated', (3, 1)),
+                        # 3 (amd64/Linux, integer-gmp2)
       stats_num_field('max_bytes_used',
           [(wordsize(64), 440000, 15),
                         # 440224 (amd64/Linux)
@@ -14,11 +15,12 @@ test('space_leak_001',
            (wordsize(32), 405650, 10)]),
              # 2013-02-10 372072 (x86/OSX)
              # 2013-02-10 439228 (x86/OSX)
-      stats_num_field('bytes allocated', (9079316016, 1)),
+      stats_num_field('bytes allocated', (11315747416, 1)),
                         # expected value: 9079316016 (amd64/Linux)
                         #                 9331570416 (x86/Linux)
                         #                 9329073952 (x86/OS X)
                         #                 9327959840 (x86/Windows)
+                        #                 11315747416 (amd64/Lnx, integer-gmp2)
       omit_ways(['profasm','profthreaded','threaded1','threaded2'])
       ],
      compile_and_run,
diff --git a/testsuite/tests/safeHaskell/check/pkg01/all.T b/testsuite/tests/safeHaskell/check/pkg01/all.T
index 604a5cc777..f121b99add 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/all.T
+++ b/testsuite/tests/safeHaskell/check/pkg01/all.T
@@ -40,6 +40,7 @@ test('safePkg01',
       normalise_errmsg_fun(ignoreLdOutput),
       normalise_fun(
         normaliseArrayPackage,
+        normaliseIntegerPackage,
         normaliseBytestringPackage)],
      run_command,
      ['$MAKE -s --no-print-directory safePkg01 ' + make_args])
diff --git a/testsuite/tests/simplCore/should_run/T5603.hs b/testsuite/tests/simplCore/should_run/T5603.hs
index 635de33d6a..c1545d2c39 100644
--- a/testsuite/tests/simplCore/should_run/T5603.hs
+++ b/testsuite/tests/simplCore/should_run/T5603.hs
@@ -12,4 +12,5 @@ main = (encodeDouble 0 :: Double) `seq` return ()
 {-# INLINE encodeDouble #-}
 encodeDouble :: Integer -> Double
 encodeDouble (S# _)   = D# 3.0##
-encodeDouble (J# _ _) = D# 4.0##
+encodeDouble (Jp# _)  = D# 4.0##
+encodeDouble (Jn# _)  = D# 5.0##
diff --git a/testsuite/tests/typecheck/should_fail/T5095.stderr b/testsuite/tests/typecheck/should_fail/T5095.stderr
index 82613e64d9..701bd761d3 100644
--- a/testsuite/tests/typecheck/should_fail/T5095.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5095.stderr
@@ -56,8 +56,10 @@ T5095.hs:9:11:
       instance Eq Ordering -- Defined in ‘GHC.Classes’
       instance Eq Word -- Defined in ‘GHC.Classes’
       instance Eq a => Eq [a] -- Defined in ‘GHC.Classes’
+      instance Eq integer-gmp-1.0.0.0:GHC.Integer.Type.BigNat
+        -- Defined in ‘integer-gmp-1.0.0.0:GHC.Integer.Type’
       instance Eq Integer
-        -- Defined in ‘integer-gmp-0.5.1.0:GHC.Integer.Type’
+        -- Defined in ‘integer-gmp-1.0.0.0:GHC.Integer.Type’
     (The choice depends on the instantiation of ‘a’
      To pick the first instance above, use IncoherentInstances
      when compiling the other instance declarations)
diff --git a/testsuite/tests/typecheck/should_fail/tcfail072.stderr b/testsuite/tests/typecheck/should_fail/tcfail072.stderr
index d5eb4aa87f..c9b1d10b2b 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail072.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail072.stderr
@@ -10,6 +10,6 @@ tcfail072.hs:23:13:
       instance Ord a => Ord (Maybe a) -- Defined in ‘GHC.Base’
       instance Ord () -- Defined in ‘GHC.Classes’
       instance (Ord a, Ord b) => Ord (a, b) -- Defined in ‘GHC.Classes’
-      ...plus 22 others
+      ...plus 23 others
     In the expression: g A
     In an equation for ‘g’: g (B _ _) = g A
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs
index 1847aafce5..8729fd42be 100644
--- a/utils/ghc-cabal/Main.hs
+++ b/utils/ghc-cabal/Main.hs
@@ -418,11 +418,15 @@ generate directory distdir dll0Modules config_args
           transitiveDepNames = map (display . packageName) transitive_dep_ids
 
           libraryDirs = forDeps Installed.libraryDirs
+          -- temporary hack to support two in-tree versions of `integer-gmp`
+          isIntegerGmp2 = any ("integer-gmp2" `isInfixOf`) libraryDirs
           -- The mkLibraryRelDir function is a bit of a hack.
           -- Ideally it should be handled in the makefiles instead.
           mkLibraryRelDir "rts"   = "rts/dist/build"
           mkLibraryRelDir "ghc"   = "compiler/stage2/build"
           mkLibraryRelDir "Cabal" = "libraries/Cabal/Cabal/dist-install/build"
+          mkLibraryRelDir "integer-gmp"
+                  | isIntegerGmp2 = mkLibraryRelDir "integer-gmp2"
           mkLibraryRelDir l       = "libraries/" ++ l ++ "/dist-install/build"
           libraryRelDirs = map mkLibraryRelDir transitiveDepNames
       wrappedIncludeDirs <- wrap $ forDeps Installed.includeDirs
author	Herbert Valerio Riedel <hvr@gnu.org>	2014-10-19 20:37:40 +0200
committer	Herbert Valerio Riedel <hvr@gnu.org>	2014-11-12 11:03:42 +0100
commit	c774b28f76ee4c220f7c1c9fd81585e0e3af0e8a (patch)
tree	9fc156d8e3c7d8fd414b572826f139c1efa5f34c
parent	fcfc87dce752c3c1702eeb54d1023213729f1832 (diff)
download	haskell-c774b28f76ee4c220f7c1c9fd81585e0e3af0e8a.tar.gz