diff --git a/SPKG.txt b/SPKG.txt
--- a/SPKG.txt
+++ b/SPKG.txt
@@ -24,9 +24,6 @@
 
 == Special Update/Build Instructions ==
  * TODO:
-   - Use 'patch' also to (unconditionally) apply the harmless patch for Sun CC 
-     (on SunOS), as the current prepatched file which is still copied over has
-     to get refreshed on each upgrade.
    - Perhaps also modify CXXFLAGS (and/or CPPFLAGS).
    - We currently don't use anything of GMP's/MPIR's CC setting, and matching
      with the current compiler (`$CC`) is perhaps suboptimal.
@@ -46,15 +43,37 @@
    (Saves 13 of 40 MB uncompressed.)
 
 === Patches ===
- * We currently apply a trivial patch to gmp-h.in on SunOS such that
-   MPIR would compile with Sun CC there.  See also `spkg-install`.
-   This patch could be applied on all platforms, as the changes only take
-   effect if the preprocessor variable `__SUNPRO_CC` is defined.
+ * gmp-h.in.patch: a trivial patch adding some #includes such that MPIR
+   would compile on SunOS with Sun CC.  The changes in this patch only
+   take effect if the preprocessor variable `__SUNPRO_CC` is defined.
  * We apply a simple patch to upstream yasm's re2c code, to avoid a potential
    race condition when building yasm in parallel.  (Cf. #11844.)
+ * quote_asm.patch: replace things of the form "define(OPERATION_foo,1)" by
+   "define(`OPERATION_foo',1)".  This gives proper quoting for use with m4,
+   otherwise the define might expand to "define(,1)".  Some versions of m4
+   bail out with an error when encountering "define(,1)".
+   These files were patched using
+     find mpn -name '*.asm' -exec sed -i 's/define(\(OPERATION[^,]*\),/define(\`\1'"'"',/' {} \;
 
 == Changelog ==
 
+=== mpir-2.4.0.p3 (Jeroen Demeyer, April 26th, 2012) ===
+ Trac #11616, reviewer fixes:
+ * When the first configure run (with CFLAGS unset) of MPIR fails, bail
+   out with an error.  I am not aware of any system where MPIR fails
+   to configure with CFLAGS unset but succeeds with CFLAGS set.
+   This implies the following simplifications:
+   - We no longer read CC and CFLAGS from /usr/include/gmp.h or
+     /usr/local/include/gmp.h
+   - We no longer try to add -march=native, we simply use MPIR's flags.
+ * Extract $CC and $CFLAGS from Makefile instead of mpir.h, which is
+   simpler and more reliable.
+ * Added `quote_asm.patch` to add proper quoting to the m4 in .asm files.
+ * Use `patch` to patch gmp-h.in instead of copying the file.
+ * In get_processor_specific_cflags() in spkg-install, also check for
+   -mpower* and -mno-power* flags, as MPIR adds -mpower on 32-bit
+   PowerPC systems.
+
 === mpir-2.4.0.p2 (Leif Leonhardy, April 4th, 2012) ===
  #11616 (upgrading MPIR), further fixes:
  * Before enabling `-march=native`, minimalistically check whether the
diff --git a/patches/gmp-h.in b/patches/gmp-h.in
deleted file mode 100644
--- a/patches/gmp-h.in
+++ /dev/null
@@ -1,2418 +0,0 @@
-/* Definitions for GNU multiple precision functions.   -*- mode: c -*-
-
-Copyright 1991, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
-Copyright 2008 William Hart, Gonzalo Tornaria
-
-This file is part of the MPIR Library.
-
-The MPIR Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or (at your
-option) any later version.
-
-The MPIR Library 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 Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
-
-#ifndef __GMP_H__
-
-#ifdef __SUNPRO_CC    /* See: http://trac.sagemath.org/sage_trac/ticket/7849 */
-#include <stddef.h>   /* This is Bill Hart's fix, but I've applied it only */
-#include <stdarg.h>   /* on Sun Studio */
-#endif 
-
-#if defined (__cplusplus)
-#include <iosfwd>   /* for std::istream, std::ostream, std::string */
-#include <cstdio>
-#endif
-
-
-/* Instantiated by configure. */
-#if ! defined (__GMP_WITHIN_CONFIGURE)
-#define __GMP_BITS_PER_MP_LIMB             @BITS_PER_MP_LIMB@
-#define __GMP_HAVE_HOST_CPU_FAMILY_power   @HAVE_HOST_CPU_FAMILY_power@
-#define __GMP_HAVE_HOST_CPU_FAMILY_powerpc @HAVE_HOST_CPU_FAMILY_powerpc@
-#define GMP_LIMB_BITS                      @BITS_PER_MP_LIMB@
-#define GMP_NAIL_BITS                      @GMP_NAIL_BITS@
-#endif
-#define GMP_NUMB_BITS     (GMP_LIMB_BITS - GMP_NAIL_BITS)
-#define GMP_NUMB_MASK     ((~ __GMP_CAST (mp_limb_t, 0)) >> GMP_NAIL_BITS)
-#define GMP_NUMB_MAX      GMP_NUMB_MASK
-#define GMP_NAIL_MASK     (~ GMP_NUMB_MASK)
-
-
-#ifndef __GNU_MP__
-#define __GNU_MP__ 4
-
-#define __need_size_t  /* tell gcc stddef.h we only want size_t */
-#if defined (__cplusplus)
-#include <cstddef>     /* for size_t */
-#else
-#include <stddef.h>    /* for size_t */
-#endif
-#undef __need_size_t
-
-/* Instantiated by configure. */
-#if ! defined (__GMP_WITHIN_CONFIGURE)
-@DEFN_LONG_LONG_LIMB@
-#define __GMP_LIBGMP_DLL  @LIBGMP_DLL@
-#endif
-
-/*  #if defined(__GMP_WITHIN_CONFIGURE) && defined(_WIN64)   */
-#ifdef __WIN64
-#define _LONG_LONG_LIMB	1
-#endif
-
-/* __STDC__ - some ANSI compilers define this only to 0, hence the use of
-       "defined" and not "__STDC__-0".  In particular Sun workshop C 5.0
-       sets __STDC__ to 0, but requires "##" for token pasting.
-
-   _AIX - gnu ansidecl.h asserts that all known AIX compilers are ANSI but
-       don't always define __STDC__.
-
-   __DECC - current versions of DEC C (5.9 for instance) for alpha are ANSI,
-       but don't define __STDC__ in their default mode.  Don't know if old
-       versions might have been K&R, but let's not worry about that unless
-       someone is still using one.
-
-   _mips - gnu ansidecl.h says the RISC/OS MIPS compiler is ANSI in SVR4
-       mode, but doesn't define __STDC__.
-
-   _MSC_VER - Microsoft C is ANSI, but __STDC__ is undefined unless the /Za
-       option is given (in which case it's 1).
-
-   _WIN32 - tested for by gnu ansidecl.h, no doubt on the assumption that
-      all w32 compilers are ansi.
-
-   Note: This same set of tests is used by gen-psqr.c and
-   demos/expr/expr-impl.h, so if anything needs adding, then be sure to
-   update those too.  */
-
-#if  defined (__STDC__)                                 \
-  || defined (__cplusplus)                              \
-  || defined (_AIX)                                     \
-  || defined (__DECC)                                   \
-  || (defined (__mips) && defined (_SYSTYPE_SVR4))      \
-  || defined (_MSC_VER)                                 \
-  || defined (_WIN32)
-#define __GMP_HAVE_CONST        1
-#define __GMP_HAVE_PROTOTYPES   1
-#define __GMP_HAVE_TOKEN_PASTE  1
-#else
-#define __GMP_HAVE_CONST        0
-#define __GMP_HAVE_PROTOTYPES   0
-#define __GMP_HAVE_TOKEN_PASTE  0
-#endif
-
-
-#if __GMP_HAVE_CONST
-#define __gmp_const   const
-#define __gmp_signed  signed
-#else
-#define __gmp_const
-#define __gmp_signed
-#endif
-
-
-/* __GMP_DECLSPEC supports Windows DLL versions of libmpir, and is empty in
-   all other circumstances.
-
-   When compiling objects for libmpir, __GMP_DECLSPEC is an export directive,
-   or when compiling for an application it's an import directive.  The two
-   cases are differentiated by __GMP_WITHIN_GMP defined by the GMP Makefiles
-   (and not defined from an application).
-
-   __GMP_DECLSPEC_XX is similarly used for libmpirxx.  __GMP_WITHIN_GMPXX
-   indicates when building libmpirxx, and in that case libmpirxx functions are
-   exports, but libmpir functions which might get called are imports.
-
-   libmp.la uses __GMP_DECLSPEC, just as if it were libmpir.la.  libmpir and
-   libmp don't call each other, so there's no conflict or confusion.
-
-   Libtool DLL_EXPORT define is not used.
-
-   There's no attempt to support GMP built both static and DLL.  Doing so
-   would mean applications would have to tell us which of the two is going
-   to be used when linking, and that seems very tedious and error prone if
-   using GMP by hand, and equally tedious from a package since autoconf and
-   automake don't give much help.
-
-   __GMP_DECLSPEC is required on all documented global functions and
-   variables, the various internals in gmp-impl.h etc can be left unadorned.
-   But internals used by the test programs or speed measuring programs
-   should have __GMP_DECLSPEC, and certainly constants or variables must
-   have it or the wrong address will be resolved.
-
-   In gcc __declspec can go at either the start or end of a prototype.
-
-   In Microsoft C __declspec must go at the start, or after the type like
-   void __declspec(...) *foo()".  There's no __dllexport or anything to
-   guard against someone foolish #defining dllexport.  _export used to be
-   available, but no longer.
-
-   In Borland C _export still exists, but needs to go after the type, like
-   "void _export foo();".  Would have to change the __GMP_DECLSPEC syntax to
-   make use of that.  Probably more trouble than it's worth.  */
-
-#if defined (__GNUC__)
-#define __GMP_DECLSPEC_EXPORT  __declspec(__dllexport__)
-#define __GMP_DECLSPEC_IMPORT  __declspec(__dllimport__)
-#endif
-#if defined (_MSC_VER) || defined (__BORLANDC__)
-#define __GMP_DECLSPEC_EXPORT  __declspec(dllexport)
-#define __GMP_DECLSPEC_IMPORT  __declspec(dllimport)
-#endif
-#ifdef __WATCOMC__
-#define __GMP_DECLSPEC_EXPORT  __export
-#define __GMP_DECLSPEC_IMPORT  __import
-#endif
-#ifdef __IBMC__
-#define __GMP_DECLSPEC_EXPORT  _Export
-#define __GMP_DECLSPEC_IMPORT  _Import
-#endif
-
-#if __GMP_LIBGMP_DLL
-#if __GMP_WITHIN_GMP
-/* compiling to go into a DLL libmpir */
-#define __GMP_DECLSPEC  __GMP_DECLSPEC_EXPORT
-#else
-/* compiling to go into an application which will link to a DLL libmpir */
-#define __GMP_DECLSPEC  __GMP_DECLSPEC_IMPORT
-#endif
-#else
-/* all other cases */
-#define __GMP_DECLSPEC
-#endif
-
-
-#ifdef __GMP_SHORT_LIMB
-typedef unsigned int		mp_limb_t;
-typedef int			mp_limb_signed_t;
-#else
-#ifdef _LONG_LONG_LIMB
-typedef unsigned long long int	mp_limb_t;
-typedef long long int		mp_limb_signed_t;
-#else
-typedef unsigned long int	mp_limb_t;
-typedef long int		mp_limb_signed_t;
-#endif
-#endif
-
-#ifdef _WIN64
-typedef unsigned long long int	mp_bitcnt_t;
-#define __GMP_BITCNT_MAX  (~(unsigned long long) 0)
-#else
-typedef unsigned long int mp_bitcnt_t;
-#define __GMP_BITCNT_MAX  (~(unsigned long) 0)
-#endif
-
-/* For reference, note that the name __mpz_struct gets into C++ mangled
-   function names, which means although the "__" suggests an internal, we
-   must leave this name for binary compatibility.  */
-typedef struct
-{
-  int _mp_alloc;		/* Number of *limbs* allocated and pointed
-				   to by the _mp_d field.  */
-  int _mp_size;			/* abs(_mp_size) is the number of limbs the
-				   last field points to.  If _mp_size is
-				   negative this is a negative number.  */
-  mp_limb_t *_mp_d;		/* Pointer to the limbs.  */
-} __mpz_struct;
-
-#endif /* __GNU_MP__ */
-
-typedef __mpz_struct mpz_t[1];
-
-typedef mp_limb_t *		mp_ptr;
-typedef __gmp_const mp_limb_t *	mp_srcptr;
-#if defined( _WIN64)
-#define __GMP_MP_SIZE_T_INT     0
-typedef long long int	mp_size_t;
-typedef long int		mp_exp_t;
-#else
-#define __GMP_MP_SIZE_T_INT     0
-typedef long int		mp_size_t;
-typedef long int		mp_exp_t;
-#endif
-
-typedef struct
-{
-  __mpz_struct _mp_num;
-  __mpz_struct _mp_den;
-} __mpq_struct;
-
-typedef __mpq_struct mpq_t[1];
-
-typedef struct
-{
-  int _mp_prec;			/* Max precision, in number of `mp_limb_t's.
-				   Set by mpf_init and modified by
-				   mpf_set_prec.  The area pointed to by the
-				   _mp_d field contains `prec' + 1 limbs.  */
-  int _mp_size;			/* abs(_mp_size) is the number of limbs the
-				   last field points to.  If _mp_size is
-				   negative this is a negative number.  */
-  mp_exp_t _mp_exp;		/* Exponent, in the base of `mp_limb_t'.  */
-  mp_limb_t *_mp_d;		/* Pointer to the limbs.  */
-} __mpf_struct;
-
-typedef __mpf_struct mpf_t[1];
-
-/* Available random number generation algorithms.  */
-typedef enum
-{
-  GMP_RAND_ALG_DEFAULT = 0,
-  GMP_RAND_ALG_LC = GMP_RAND_ALG_DEFAULT /* Linear congruential.  */
-} gmp_randalg_t;
-
-/* Random state struct.  */
-typedef struct
-{
-  mpz_t _mp_seed;	  /* _mp_d member points to state of the generator. */
-  gmp_randalg_t _mp_alg;  /* Currently unused. */
-  union {
-    void *_mp_lc;         /* Pointer to function pointers structure.  */
-  } _mp_algdata;
-} __gmp_randstate_struct;
-typedef __gmp_randstate_struct gmp_randstate_t[1];
-
-/* Types for function declarations in gmp files.  */
-/* ??? Should not pollute user name space with these ??? */
-typedef __gmp_const __mpz_struct *mpz_srcptr;
-typedef __mpz_struct *mpz_ptr;
-typedef __gmp_const __mpf_struct *mpf_srcptr;
-typedef __mpf_struct *mpf_ptr;
-typedef __gmp_const __mpq_struct *mpq_srcptr;
-typedef __mpq_struct *mpq_ptr;
-
-
-#if __GMP_LIBGMP_DLL
-#if __GMP_WITHIN_GMPXX
-/* compiling to go into a DLL libmpirxx */
-#define __GMP_DECLSPEC_XX  __GMP_DECLSPEC_EXPORT
-#else
-/* compiling to go into a application which will link to a DLL libmpirxx */
-#define __GMP_DECLSPEC_XX  __GMP_DECLSPEC_IMPORT
-#endif
-#else
-/* all other cases */
-#define __GMP_DECLSPEC_XX
-#endif
-
-
-#if __GMP_HAVE_PROTOTYPES
-#define __GMP_PROTO(x) x
-#else
-#define __GMP_PROTO(x) ()
-#endif
-
-#ifndef __MPN
-#if __GMP_HAVE_TOKEN_PASTE
-#define __MPN(x) __gmpn_##x
-#else
-#define __MPN(x) __gmpn_/**/x
-#endif
-#endif
-
-/* For reference, "defined(EOF)" cannot be used here.  In g++ 2.95.4,
-   <iostream> defines EOF but not FILE.  */
-#if defined (FILE)                                              \
-  || defined (H_STDIO)                                          \
-  || defined (_H_STDIO)               /* AIX */                 \
-  || defined (_STDIO_H)               /* glibc, Sun, SCO */     \
-  || defined (_STDIO_H_)              /* BSD, OSF */            \
-  || defined (__STDIO_H)              /* Borland */             \
-  || defined (__STDIO_H__)            /* IRIX */                \
-  || defined (_STDIO_INCLUDED)        /* HPUX */                \
-  || defined (_FILE_DEFINED)          /* Microsoft */           \
-  || defined (__STDIO__)              /* Apple MPW MrC */       \
-  || defined (_MSL_STDIO_H)           /* Metrowerks */          \
-  || defined (_STDIO_H_INCLUDED)      /* QNX4 */		\
-  || defined (_ISO_STDIO_ISO_H)       /* Sun C++ */
-#define _GMP_H_HAVE_FILE 1
-#endif
-
-/* In ISO C, if a prototype involving "struct obstack *" is given without
-   that structure defined, then the struct is scoped down to just the
-   prototype, causing a conflict if it's subsequently defined for real.  So
-   only give prototypes if we've got obstack.h.  */
-#if defined (_OBSTACK_H)   /* glibc <obstack.h> */
-#define _GMP_H_HAVE_OBSTACK 1
-#endif
-
-/* The prototypes for gmp_vprintf etc are provided only if va_list is
-   available, via an application having included <stdarg.h> or <varargs.h>.
-   Usually va_list is a typedef so can't be tested directly, but C99
-   specifies that va_start is a macro (and it was normally a macro on past
-   systems too), so look for that.
-
-   <stdio.h> will define some sort of va_list for vprintf and vfprintf, but
-   let's not bother trying to use that since it's not standard and since
-   application uses for gmp_vprintf etc will almost certainly require the
-   whole <stdarg.h> or <varargs.h> anyway.  */
-
-#ifdef va_start
-#define _GMP_H_HAVE_VA_LIST 1
-#endif
-
-/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
-#if defined (__GNUC__) && defined (__GNUC_MINOR__)
-#define __GMP_GNUC_PREREQ(maj, min) \
-  ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-#else
-#define __GMP_GNUC_PREREQ(maj, min)  0
-#endif
-
-/* "pure" is in gcc 2.96 and up, see "(gcc)Function Attributes".  Basically
-   it means a function does nothing but examine its arguments and memory
-   (global or via arguments) to generate a return value, but changes nothing
-   and has no side-effects.  __GMP_NO_ATTRIBUTE_CONST_PURE lets
-   tune/common.c etc turn this off when trying to write timing loops.  */
-#if __GMP_GNUC_PREREQ (2,96) && ! defined (__GMP_NO_ATTRIBUTE_CONST_PURE)
-#define __GMP_ATTRIBUTE_PURE   __attribute__ ((__pure__))
-#else
-#define __GMP_ATTRIBUTE_PURE
-#endif
-
-
-/* __GMP_CAST allows us to use static_cast in C++, so our macros are clean
-   to "g++ -Wold-style-cast".
-
-   Casts in "extern inline" code within an extern "C" block don't induce
-   these warnings, so __GMP_CAST only needs to be used on documented
-   macros.  */
-
-#ifdef __cplusplus
-#define __GMP_CAST(type, expr)  (static_cast<type> (expr))
-#else
-#define __GMP_CAST(type, expr)  ((type) (expr))
-#endif
-
-
-/* An empty "throw ()" means the function doesn't throw any C++ exceptions,
-   this can save some stack frame info in applications.
-
-   Currently it's given only on functions which never divide-by-zero etc,
-   don't allocate memory, and are expected to never need to allocate memory.
-   This leaves open the possibility of a C++ throw from a future GMP
-   exceptions scheme.
-
-   mpz_set_ui etc are omitted to leave open the lazy allocation scheme
-   described in doc/tasks.html.  mpz_get_d etc are omitted to leave open
-   exceptions for float overflows.
-
-   Note that __GMP_NOTHROW must be given on any inlines the same as on their
-   prototypes (for g++ at least, where they're used together).  Note also
-   that g++ 3.0 demands that __GMP_NOTHROW is before other attributes like
-   __GMP_ATTRIBUTE_PURE.  */
-
-#if defined (__cplusplus)
-#define __GMP_NOTHROW  throw ()
-#else
-#define __GMP_NOTHROW
-#endif
-
-/* PORTME: What other compilers have a useful "extern inline"?  "static
-   inline" would be an acceptable substitute if the compiler (or linker)
-   discards unused statics.  */
-
-/* gcc has __inline__ in all modes, including strict ansi.  Give a prototype
-   for an inline too, so as to correctly specify "dllimport" on windows, in
-   case the function is called rather than inlined.  */
-
-#ifdef __GNUC__
-#if defined(__APPLE_CC__) && (__APPLE_CC__ != 1) /* FSF GCC sets this flag to 1 on Apple machines */
-
-#if ! (__APPLE_CC__ >= 5465 && __STDC_VERSION__ >= 199901L)
-#define __GMP_EXTERN_INLINE extern __inline__
-#define __GMP_INLINE_PROTOTYPES  1
-#endif
-
-#else /*GNU CC*/
-
-#if defined(__GNUC_STDC_INLINE__) || defined (__GNUC_GNU_INLINE__)
-#define __GMP_EXTERN_INLINE extern __inline__ __attribute__((__gnu_inline__))
-#else
-#define __GMP_EXTERN_INLINE extern __inline__
-#endif
-#define __GMP_INLINE_PROTOTYPES  1
-
-#endif
-#endif
-
-/* DEC C (eg. version 5.9) supports "static __inline foo()", even in -std1
-   strict ANSI mode.  Inlining is done even when not optimizing (ie. -O0
-   mode, which is the default), but an unnecessary local copy of foo is
-   emitted unless -O is used.  "extern __inline" is accepted, but the
-   "extern" appears to be ignored, ie. it becomes a plain global function
-   but which is inlined within its file.  Don't know if all old versions of
-   DEC C supported __inline, but as a start let's do the right thing for
-   current versions.  */
-#ifdef __DECC
-#define __GMP_EXTERN_INLINE  static __inline
-#endif
-
-/* SCO OpenUNIX 8 cc supports "static inline foo()" but not in -Xc strict
-   ANSI mode (__STDC__ is 1 in that mode).  Inlining only actually takes
-   place under -O.  Without -O "foo" seems to be emitted whether it's used
-   or not, which is wasteful.  "extern inline foo()" isn't useful, the
-   "extern" is apparently ignored, so foo is inlined if possible but also
-   emitted as a global, which causes multiple definition errors when
-   building a shared libmpir.  */
-#ifdef __SCO_VERSION__
-#if __SCO_VERSION__ > 400000000 && __STDC__ != 1 \
-  && ! defined (__GMP_EXTERN_INLINE)
-#define __GMP_EXTERN_INLINE  static inline
-#endif
-#endif
-
-#if defined _MSC_VER
-#define __GMP_EXTERN_INLINE  static __inline
-#endif
-
-/* C++ always has "inline" and since it's a normal feature the linker should
-   discard duplicate non-inlined copies, or if it doesn't then that's a
-   problem for everyone, not just GMP.  */
-#if defined (__cplusplus) && ! defined (__GMP_EXTERN_INLINE)
-#define __GMP_EXTERN_INLINE  inline
-#endif
-
-/* Don't do any inlining within a configure run, since if the compiler ends
-   up emitting copies of the code into the object file it can end up
-   demanding the various support routines (like mpn_popcount) for linking,
-   making the "alloca" test and perhaps others fail.  And on hppa ia64 a
-   pre-release gcc 3.2 was seen not respecting the "extern" in "extern
-   __inline__", triggering this problem too.  */
-#if defined (__GMP_WITHIN_CONFIGURE) && ! __GMP_WITHIN_CONFIGURE_INLINE
-#undef __GMP_EXTERN_INLINE
-#endif
-
-/* By default, don't give a prototype when there's going to be an inline
-   version.  Note in particular that Cray C++ objects to the combination of
-   prototype and inline.  */
-#ifdef __GMP_EXTERN_INLINE
-#ifndef __GMP_INLINE_PROTOTYPES
-#define __GMP_INLINE_PROTOTYPES  0
-#endif
-#else
-#define __GMP_INLINE_PROTOTYPES  1
-#endif
-
-
-#define __GMP_ABS(x)   ((x) >= 0 ? (x) : -(x))
-#define __GMP_MAX(h,i) ((h) > (i) ? (h) : (i))
-
-/* __GMP_USHRT_MAX is not "~ (unsigned short) 0" because short is promoted
-   to int by "~".  */
-#define __GMP_UINT_MAX   (~ (unsigned) 0)
-#define __GMP_ULONG_MAX  (~ (unsigned long) 0)
-#define __GMP_USHRT_MAX  ((unsigned short) ~0)
-
-
-/* __builtin_expect is in gcc 3.0, and not in 2.95. */
-#if __GMP_GNUC_PREREQ (3,0)
-#define __GMP_LIKELY(cond)    __builtin_expect ((cond) != 0, 1)
-#define __GMP_UNLIKELY(cond)  __builtin_expect ((cond) != 0, 0)
-#else
-#define __GMP_LIKELY(cond)    (cond)
-#define __GMP_UNLIKELY(cond)  (cond)
-#endif
-
-/* Allow direct user access to numerator and denominator of a mpq_t object.  */
-#define mpq_numref(Q) (&((Q)->_mp_num))
-#define mpq_denref(Q) (&((Q)->_mp_den))
-
-
-#if defined (__cplusplus)
-extern "C" {
-using std::FILE;
-#endif
-
-#define mp_set_memory_functions __gmp_set_memory_functions
-__GMP_DECLSPEC void mp_set_memory_functions __GMP_PROTO ((void *(*) (size_t),
-				      void *(*) (void *, size_t, size_t),
-				      void (*) (void *, size_t))) __GMP_NOTHROW;
-
-#define mp_get_memory_functions __gmp_get_memory_functions
-__GMP_DECLSPEC void mp_get_memory_functions __GMP_PROTO ((void *(**) (size_t),
-                                      void *(**) (void *, size_t, size_t),
-                                      void (**) (void *, size_t))) __GMP_NOTHROW;
-
-#define mp_bits_per_limb __gmp_bits_per_limb
-__GMP_DECLSPEC extern __gmp_const int mp_bits_per_limb;
-
-#define gmp_errno __gmp_errno
-__GMP_DECLSPEC extern int gmp_errno;
-
-#define gmp_version __gmp_version
-__GMP_DECLSPEC extern __gmp_const char * __gmp_const gmp_version;
-
-#define mpir_version __mpir_version
-__GMP_DECLSPEC extern __gmp_const char * __gmp_const mpir_version;
-
-
-/**************** Random number routines.  ****************/
-
-#define gmp_randinit_default __gmp_randinit_default
-__GMP_DECLSPEC void gmp_randinit_default __GMP_PROTO ((gmp_randstate_t));
-
-#define gmp_randinit_lc_2exp __gmp_randinit_lc_2exp
-__GMP_DECLSPEC void gmp_randinit_lc_2exp __GMP_PROTO ((gmp_randstate_t,
-						       mpz_srcptr, unsigned long int,
-						       mp_bitcnt_t));
-
-#define gmp_randinit_lc_2exp_size __gmp_randinit_lc_2exp_size
-__GMP_DECLSPEC int gmp_randinit_lc_2exp_size __GMP_PROTO ((gmp_randstate_t, mp_bitcnt_t));
-
-#define gmp_randinit_mt __gmp_randinit_mt
-__GMP_DECLSPEC void gmp_randinit_mt __GMP_PROTO ((gmp_randstate_t));
-
-#define gmp_randinit_set __gmp_randinit_set
-__GMP_DECLSPEC void gmp_randinit_set __GMP_PROTO ((gmp_randstate_t, __gmp_const __gmp_randstate_struct *));
-
-#define gmp_randseed __gmp_randseed
-__GMP_DECLSPEC void gmp_randseed __GMP_PROTO ((gmp_randstate_t, mpz_srcptr));
-
-#define gmp_randseed_ui __gmp_randseed_ui
-__GMP_DECLSPEC void gmp_randseed_ui __GMP_PROTO ((gmp_randstate_t, unsigned long int));
-
-#define gmp_randclear __gmp_randclear
-__GMP_DECLSPEC void gmp_randclear __GMP_PROTO ((gmp_randstate_t));
-
-#define gmp_urandomb_ui __gmp_urandomb_ui
-__GMP_DECLSPEC unsigned long gmp_urandomb_ui __GMP_PROTO ((gmp_randstate_t, unsigned long));
-
-#define gmp_urandomm_ui __gmp_urandomm_ui
-__GMP_DECLSPEC unsigned long gmp_urandomm_ui __GMP_PROTO ((gmp_randstate_t, unsigned long));
-
-
-/**************** Formatted output routines.  ****************/
-
-#define gmp_asprintf __gmp_asprintf
-__GMP_DECLSPEC int gmp_asprintf __GMP_PROTO ((char **, __gmp_const char *, ...));
-
-#define gmp_fprintf __gmp_fprintf
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC int gmp_fprintf __GMP_PROTO ((FILE *, __gmp_const char *, ...));
-#endif
-
-#define gmp_obstack_printf __gmp_obstack_printf
-#if defined (_GMP_H_HAVE_OBSTACK)
-__GMP_DECLSPEC int gmp_obstack_printf __GMP_PROTO ((struct obstack *, __gmp_const char *, ...));
-#endif
-
-#define gmp_obstack_vprintf __gmp_obstack_vprintf
-#if defined (_GMP_H_HAVE_OBSTACK) && defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_obstack_vprintf __GMP_PROTO ((struct obstack *, __gmp_const char *, va_list));
-#endif
-
-#define gmp_printf __gmp_printf
-__GMP_DECLSPEC int gmp_printf __GMP_PROTO ((__gmp_const char *, ...));
-
-#define gmp_snprintf __gmp_snprintf
-__GMP_DECLSPEC int gmp_snprintf __GMP_PROTO ((char *, size_t, __gmp_const char *, ...));
-
-#define gmp_sprintf __gmp_sprintf
-__GMP_DECLSPEC int gmp_sprintf __GMP_PROTO ((char *, __gmp_const char *, ...));
-
-#define gmp_vasprintf __gmp_vasprintf
-#if defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vasprintf __GMP_PROTO ((char **, __gmp_const char *, va_list));
-#endif
-
-#define gmp_vfprintf __gmp_vfprintf
-#if defined (_GMP_H_HAVE_FILE) && defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vfprintf __GMP_PROTO ((FILE *, __gmp_const char *, va_list));
-#endif
-
-#define gmp_vprintf __gmp_vprintf
-#if defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vprintf __GMP_PROTO ((__gmp_const char *, va_list));
-#endif
-
-#define gmp_vsnprintf __gmp_vsnprintf
-#if defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vsnprintf __GMP_PROTO ((char *, size_t, __gmp_const char *, va_list));
-#endif
-
-#define gmp_vsprintf __gmp_vsprintf
-#if defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vsprintf __GMP_PROTO ((char *, __gmp_const char *, va_list));
-#endif
-
-
-/**************** Formatted input routines.  ****************/
-
-#define gmp_fscanf __gmp_fscanf
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC int gmp_fscanf __GMP_PROTO ((FILE *, __gmp_const char *, ...));
-#endif
-
-#define gmp_scanf __gmp_scanf
-__GMP_DECLSPEC int gmp_scanf __GMP_PROTO ((__gmp_const char *, ...));
-
-#define gmp_sscanf __gmp_sscanf
-__GMP_DECLSPEC int gmp_sscanf __GMP_PROTO ((__gmp_const char *, __gmp_const char *, ...));
-
-#define gmp_vfscanf __gmp_vfscanf
-#if defined (_GMP_H_HAVE_FILE) && defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vfscanf __GMP_PROTO ((FILE *, __gmp_const char *, va_list));
-#endif
-
-#define gmp_vscanf __gmp_vscanf
-#if defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vscanf __GMP_PROTO ((__gmp_const char *, va_list));
-#endif
-
-#define gmp_vsscanf __gmp_vsscanf
-#if defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vsscanf __GMP_PROTO ((__gmp_const char *, __gmp_const char *, va_list));
-#endif
-
-
-/**************** Integer (i.e. Z) routines.  ****************/
-
-#define __GMP_BITS_PER_ULONG	(8*sizeof(unsigned long))
-
-#define _mpz_realloc __gmpz_realloc
-#define mpz_realloc __gmpz_realloc
-__GMP_DECLSPEC void *_mpz_realloc __GMP_PROTO ((mpz_ptr, mp_size_t));
-
-#define mpz_abs __gmpz_abs
-#define __GMP_MPZ_ABS_MIN_ALLOC(x,y) (__GMP_ABS(y->_mp_size))
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_abs)
-__GMP_DECLSPEC void mpz_abs __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-#endif
-
-#define __GMP_MPZ_ADD_MIN_ALLOC(x,y,z) (__GMP_MAX(__GMP_ABS(y->_mp_size),__GMP_ABS(z->_mp_size))+1)
-#define mpz_add __gmpz_add
-__GMP_DECLSPEC void mpz_add __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define __GMP_MPZ_ADD_UI_MIN_ALLOC(x,y,z) (__GMP_MAX(__GMP_ABS(y->_mp_size),1+(__GMP_BITS_PER_ULONG-1)/GMP_NUMB_BITS)+1)
-#define mpz_add_ui __gmpz_add_ui
-__GMP_DECLSPEC void mpz_add_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_addmul __gmpz_addmul
-__GMP_DECLSPEC void mpz_addmul __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_addmul_ui __gmpz_addmul_ui
-__GMP_DECLSPEC void mpz_addmul_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_and __gmpz_and
-__GMP_DECLSPEC void mpz_and __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_array_init __gmpz_array_init
-__GMP_DECLSPEC void mpz_array_init __GMP_PROTO ((mpz_ptr, mp_size_t, mp_size_t));
-
-#define mpz_bin_ui __gmpz_bin_ui
-__GMP_DECLSPEC void mpz_bin_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_bin_uiui __gmpz_bin_uiui
-__GMP_DECLSPEC void mpz_bin_uiui __GMP_PROTO ((mpz_ptr, unsigned long int, unsigned long int));
-
-#define mpz_cdiv_q __gmpz_cdiv_q
-__GMP_DECLSPEC void mpz_cdiv_q __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_cdiv_q_2exp __gmpz_cdiv_q_2exp
-__GMP_DECLSPEC void mpz_cdiv_q_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, mp_bitcnt_t));
-
-#define mpz_cdiv_q_ui __gmpz_cdiv_q_ui
-__GMP_DECLSPEC unsigned long int mpz_cdiv_q_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_cdiv_qr __gmpz_cdiv_qr
-__GMP_DECLSPEC void mpz_cdiv_qr __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_cdiv_qr_ui __gmpz_cdiv_qr_ui
-__GMP_DECLSPEC unsigned long int mpz_cdiv_qr_ui __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_cdiv_r __gmpz_cdiv_r
-__GMP_DECLSPEC void mpz_cdiv_r __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_cdiv_r_2exp __gmpz_cdiv_r_2exp
-__GMP_DECLSPEC void mpz_cdiv_r_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, mp_bitcnt_t));
-
-#define mpz_cdiv_r_ui __gmpz_cdiv_r_ui
-__GMP_DECLSPEC unsigned long int mpz_cdiv_r_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_cdiv_ui __gmpz_cdiv_ui
-__GMP_DECLSPEC unsigned long int mpz_cdiv_ui __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_clear __gmpz_clear
-__GMP_DECLSPEC void mpz_clear __GMP_PROTO ((mpz_ptr));
-
-#define mpz_clears __gmpz_clears
-__GMP_DECLSPEC void mpz_clears __GMP_PROTO ((mpz_ptr, ...));
-
-#define mpz_clrbit __gmpz_clrbit
-__GMP_DECLSPEC void mpz_clrbit __GMP_PROTO ((mpz_ptr, mp_bitcnt_t));
-
-#define mpz_cmp __gmpz_cmp
-__GMP_DECLSPEC int mpz_cmp __GMP_PROTO ((mpz_srcptr, mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_cmp_d __gmpz_cmp_d
-__GMP_DECLSPEC int mpz_cmp_d __GMP_PROTO ((mpz_srcptr, double)) __GMP_ATTRIBUTE_PURE;
-
-#define _mpz_cmp_si __gmpz_cmp_si
-__GMP_DECLSPEC int _mpz_cmp_si __GMP_PROTO ((mpz_srcptr, signed long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define _mpz_cmp_ui __gmpz_cmp_ui
-__GMP_DECLSPEC int _mpz_cmp_ui __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_cmpabs __gmpz_cmpabs
-__GMP_DECLSPEC int mpz_cmpabs __GMP_PROTO ((mpz_srcptr, mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_cmpabs_d __gmpz_cmpabs_d
-__GMP_DECLSPEC int mpz_cmpabs_d __GMP_PROTO ((mpz_srcptr, double)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_cmpabs_ui __gmpz_cmpabs_ui
-__GMP_DECLSPEC int mpz_cmpabs_ui __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_com __gmpz_com
-__GMP_DECLSPEC void mpz_com __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-
-#define mpz_combit __gmpz_combit
-__GMP_DECLSPEC void mpz_combit __GMP_PROTO ((mpz_ptr, mp_bitcnt_t));
-
-#define mpz_congruent_p __gmpz_congruent_p
-__GMP_DECLSPEC int mpz_congruent_p __GMP_PROTO ((mpz_srcptr, mpz_srcptr, mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_congruent_2exp_p __gmpz_congruent_2exp_p
-__GMP_DECLSPEC int mpz_congruent_2exp_p __GMP_PROTO ((mpz_srcptr, mpz_srcptr, mp_bitcnt_t)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_congruent_ui_p __gmpz_congruent_ui_p
-__GMP_DECLSPEC int mpz_congruent_ui_p __GMP_PROTO ((mpz_srcptr, unsigned long, unsigned long)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_divexact __gmpz_divexact
-__GMP_DECLSPEC void mpz_divexact __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_divexact_ui __gmpz_divexact_ui
-__GMP_DECLSPEC void mpz_divexact_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long));
-
-#define mpz_divisible_p __gmpz_divisible_p
-__GMP_DECLSPEC int mpz_divisible_p __GMP_PROTO ((mpz_srcptr, mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_divisible_ui_p __gmpz_divisible_ui_p
-__GMP_DECLSPEC int mpz_divisible_ui_p __GMP_PROTO ((mpz_srcptr, unsigned long)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_divisible_2exp_p __gmpz_divisible_2exp_p
-__GMP_DECLSPEC int mpz_divisible_2exp_p __GMP_PROTO ((mpz_srcptr, mp_bitcnt_t)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_dump __gmpz_dump
-__GMP_DECLSPEC void mpz_dump __GMP_PROTO ((mpz_srcptr));
-
-#define mpz_export __gmpz_export
-__GMP_DECLSPEC void *mpz_export __GMP_PROTO ((void *, size_t *, int, size_t, int, size_t, mpz_srcptr));
-
-#define mpz_fac_ui __gmpz_fac_ui
-__GMP_DECLSPEC void mpz_fac_ui __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_fdiv_q __gmpz_fdiv_q
-__GMP_DECLSPEC void mpz_fdiv_q __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_fdiv_q_2exp __gmpz_fdiv_q_2exp
-__GMP_DECLSPEC void mpz_fdiv_q_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, mp_bitcnt_t));
-
-#define mpz_fdiv_q_ui __gmpz_fdiv_q_ui
-__GMP_DECLSPEC unsigned long int mpz_fdiv_q_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_fdiv_qr __gmpz_fdiv_qr
-__GMP_DECLSPEC void mpz_fdiv_qr __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_fdiv_qr_ui __gmpz_fdiv_qr_ui
-__GMP_DECLSPEC unsigned long int mpz_fdiv_qr_ui __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_fdiv_r __gmpz_fdiv_r
-__GMP_DECLSPEC void mpz_fdiv_r __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_fdiv_r_2exp __gmpz_fdiv_r_2exp
-__GMP_DECLSPEC void mpz_fdiv_r_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, mp_bitcnt_t));
-
-#define mpz_fdiv_r_ui __gmpz_fdiv_r_ui
-__GMP_DECLSPEC unsigned long int mpz_fdiv_r_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_fdiv_ui __gmpz_fdiv_ui
-__GMP_DECLSPEC unsigned long int mpz_fdiv_ui __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_fib_ui __gmpz_fib_ui
-__GMP_DECLSPEC void mpz_fib_ui __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_fib2_ui __gmpz_fib2_ui
-__GMP_DECLSPEC void mpz_fib2_ui __GMP_PROTO ((mpz_ptr, mpz_ptr, unsigned long int));
-
-#define mpz_fits_sint_p __gmpz_fits_sint_p
-__GMP_DECLSPEC int mpz_fits_sint_p __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_fits_slong_p __gmpz_fits_slong_p
-__GMP_DECLSPEC int mpz_fits_slong_p __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_fits_sshort_p __gmpz_fits_sshort_p
-__GMP_DECLSPEC int mpz_fits_sshort_p __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_fits_uint_p __gmpz_fits_uint_p
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_fits_uint_p)
-__GMP_DECLSPEC int mpz_fits_uint_p __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_fits_ulong_p __gmpz_fits_ulong_p
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_fits_ulong_p)
-__GMP_DECLSPEC int mpz_fits_ulong_p __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_fits_ushort_p __gmpz_fits_ushort_p
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_fits_ushort_p)
-__GMP_DECLSPEC int mpz_fits_ushort_p __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_gcd __gmpz_gcd
-__GMP_DECLSPEC void mpz_gcd __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_gcd_ui __gmpz_gcd_ui
-__GMP_DECLSPEC unsigned long int mpz_gcd_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_gcdext __gmpz_gcdext
-__GMP_DECLSPEC void mpz_gcdext __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_get_d __gmpz_get_d
-__GMP_DECLSPEC double mpz_get_d __GMP_PROTO ((mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_get_d_2exp __gmpz_get_d_2exp
-__GMP_DECLSPEC double mpz_get_d_2exp __GMP_PROTO ((signed long int *, mpz_srcptr));
-
-#define mpz_get_si __gmpz_get_si
-__GMP_DECLSPEC /* signed */ long int mpz_get_si __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_get_str __gmpz_get_str
-__GMP_DECLSPEC char *mpz_get_str __GMP_PROTO ((char *, int, mpz_srcptr));
-
-#define mpz_get_ui __gmpz_get_ui
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_get_ui)
-__GMP_DECLSPEC unsigned long int mpz_get_ui __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_getlimbn __gmpz_getlimbn
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_getlimbn)
-__GMP_DECLSPEC mp_limb_t mpz_getlimbn __GMP_PROTO ((mpz_srcptr, mp_size_t)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_hamdist __gmpz_hamdist
-__GMP_DECLSPEC mp_bitcnt_t mpz_hamdist __GMP_PROTO ((mpz_srcptr, mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_import __gmpz_import
-__GMP_DECLSPEC void mpz_import __GMP_PROTO ((mpz_ptr, size_t, int, size_t, int, size_t, __gmp_const void *));
-
-#define mpz_init __gmpz_init
-__GMP_DECLSPEC void mpz_init __GMP_PROTO ((mpz_ptr));
-
-#define mpz_init2 __gmpz_init2
-__GMP_DECLSPEC void mpz_init2 __GMP_PROTO ((mpz_ptr, mp_bitcnt_t));
-
-#define mpz_inits __gmpz_inits
-__GMP_DECLSPEC void mpz_inits __GMP_PROTO ((mpz_ptr, ...));
-
-#define mpz_init_set __gmpz_init_set
-__GMP_DECLSPEC void mpz_init_set __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-
-#define mpz_init_set_d __gmpz_init_set_d
-__GMP_DECLSPEC void mpz_init_set_d __GMP_PROTO ((mpz_ptr, double));
-
-#define mpz_init_set_si __gmpz_init_set_si
-__GMP_DECLSPEC void mpz_init_set_si __GMP_PROTO ((mpz_ptr, signed long int));
-
-#define mpz_init_set_str __gmpz_init_set_str
-__GMP_DECLSPEC int mpz_init_set_str __GMP_PROTO ((mpz_ptr, __gmp_const char *, int));
-
-#define mpz_init_set_ui __gmpz_init_set_ui
-__GMP_DECLSPEC void mpz_init_set_ui __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_inp_raw __gmpz_inp_raw
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpz_inp_raw __GMP_PROTO ((mpz_ptr, FILE *));
-#endif
-
-#define mpz_inp_str __gmpz_inp_str
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpz_inp_str __GMP_PROTO ((mpz_ptr, FILE *, int));
-#endif
-
-#define mpz_invert __gmpz_invert
-__GMP_DECLSPEC int mpz_invert __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_ior __gmpz_ior
-__GMP_DECLSPEC void mpz_ior __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_jacobi __gmpz_jacobi
-__GMP_DECLSPEC int mpz_jacobi __GMP_PROTO ((mpz_srcptr, mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_kronecker mpz_jacobi  /* alias */
-
-#define mpz_kronecker_si __gmpz_kronecker_si
-__GMP_DECLSPEC int mpz_kronecker_si __GMP_PROTO ((mpz_srcptr, long)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_kronecker_ui __gmpz_kronecker_ui
-__GMP_DECLSPEC int mpz_kronecker_ui __GMP_PROTO ((mpz_srcptr, unsigned long)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_si_kronecker __gmpz_si_kronecker
-__GMP_DECLSPEC int mpz_si_kronecker __GMP_PROTO ((long, mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_ui_kronecker __gmpz_ui_kronecker
-__GMP_DECLSPEC int mpz_ui_kronecker __GMP_PROTO ((unsigned long, mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_lcm __gmpz_lcm
-__GMP_DECLSPEC void mpz_lcm __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_lcm_ui __gmpz_lcm_ui
-__GMP_DECLSPEC void mpz_lcm_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long));
-
-#define mpz_legendre mpz_jacobi  /* alias */
-
-#define mpz_lucnum_ui __gmpz_lucnum_ui
-__GMP_DECLSPEC void mpz_lucnum_ui __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_lucnum2_ui __gmpz_lucnum2_ui
-__GMP_DECLSPEC void mpz_lucnum2_ui __GMP_PROTO ((mpz_ptr, mpz_ptr, unsigned long int));
-
-#define mpz_millerrabin __gmpz_millerrabin
-__GMP_DECLSPEC int mpz_millerrabin __GMP_PROTO ((mpz_srcptr, int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_mod __gmpz_mod
-__GMP_DECLSPEC void mpz_mod __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_mod_ui mpz_fdiv_r_ui /* same as fdiv_r because divisor unsigned */
-
-#define __GMP_MPZ_MUL_MIN_ALLOC(x,y,z) (__GMP_ABS(y->_mp_size)+__GMP_ABS(z->_mp_size)+1)
-#define mpz_mul __gmpz_mul
-__GMP_DECLSPEC void mpz_mul __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_mul_2exp __gmpz_mul_2exp
-__GMP_DECLSPEC void mpz_mul_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, mp_bitcnt_t));
-
-#define __GMP_MPZ_MUL_SI_MIN_ALLOC(x,y,z) (__GMP_ABS(y->_mp_size)+(__GMP_BITS_PER_ULONG-1)/GMP_NUMB_BITS+1)
-#define mpz_mul_si __gmpz_mul_si
-__GMP_DECLSPEC void mpz_mul_si __GMP_PROTO ((mpz_ptr, mpz_srcptr, long int));
-
-#define __GMP_MPZ_MUL_UI_MIN_ALLOC(x,y,z) (__GMP_ABS(y->_mp_size)+(__GMP_BITS_PER_ULONG-1)/GMP_NUMB_BITS+1)
-#define mpz_mul_ui __gmpz_mul_ui
-__GMP_DECLSPEC void mpz_mul_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_neg __gmpz_neg
-#define __GMP_MPZ_NEG_MIN_ALLOC(x,y) (__GMP_ABS(y->_mp_size))
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_neg)
-__GMP_DECLSPEC void mpz_neg __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-#endif
-
-#define mpz_nextprime __gmpz_nextprime
-__GMP_DECLSPEC void mpz_nextprime __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-
-#define mpz_next_likely_prime __gmpz_next_likely_prime
-__GMP_DECLSPEC void mpz_next_likely_prime __GMP_PROTO ((mpz_ptr, mpz_srcptr,gmp_randstate_t));
-
-#define mpz_out_raw __gmpz_out_raw
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpz_out_raw __GMP_PROTO ((FILE *, mpz_srcptr));
-#endif
-
-#define mpz_out_str __gmpz_out_str
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpz_out_str __GMP_PROTO ((FILE *, int, mpz_srcptr));
-#endif
-
-#define mpz_perfect_power_p __gmpz_perfect_power_p
-__GMP_DECLSPEC int mpz_perfect_power_p __GMP_PROTO ((mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_perfect_square_p __gmpz_perfect_square_p
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_perfect_square_p)
-__GMP_DECLSPEC int mpz_perfect_square_p __GMP_PROTO ((mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_popcount __gmpz_popcount
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_popcount)
-__GMP_DECLSPEC mp_bitcnt_t mpz_popcount __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_pow_ui __gmpz_pow_ui
-__GMP_DECLSPEC void mpz_pow_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_powm __gmpz_powm
-__GMP_DECLSPEC void mpz_powm __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_powm_ui __gmpz_powm_ui
-__GMP_DECLSPEC void mpz_powm_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int, mpz_srcptr));
-
-#define mpz_probab_prime_p __gmpz_probab_prime_p
-__GMP_DECLSPEC int mpz_probab_prime_p __GMP_PROTO ((mpz_srcptr, int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_probable_prime_p __gmpz_probable_prime_p
-__GMP_DECLSPEC int mpz_probable_prime_p __GMP_PROTO ((mpz_srcptr,gmp_randstate_t, int,unsigned long));
-
-#define mpz_likely_prime_p __gmpz_likely_prime_p
-__GMP_DECLSPEC int mpz_likely_prime_p __GMP_PROTO ((mpz_srcptr,gmp_randstate_t, unsigned long));
-
-#define mpz_realloc2 __gmpz_realloc2
-__GMP_DECLSPEC void mpz_realloc2 __GMP_PROTO ((mpz_ptr, mp_bitcnt_t));
-
-#define mpz_remove __gmpz_remove
-__GMP_DECLSPEC mp_bitcnt_t mpz_remove __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_root __gmpz_root
-__GMP_DECLSPEC int mpz_root __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_nthroot __gmpz_nthroot
-__GMP_DECLSPEC void mpz_nthroot __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_rootrem __gmpz_rootrem
-__GMP_DECLSPEC void mpz_rootrem __GMP_PROTO ((mpz_ptr,mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_rrandomb __gmpz_rrandomb
-__GMP_DECLSPEC void mpz_rrandomb __GMP_PROTO ((mpz_ptr, gmp_randstate_t, mp_bitcnt_t));
-
-#define mpz_scan0 __gmpz_scan0
-__GMP_DECLSPEC mp_bitcnt_t mpz_scan0 __GMP_PROTO ((mpz_srcptr, mp_bitcnt_t)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_scan1 __gmpz_scan1
-__GMP_DECLSPEC mp_bitcnt_t mpz_scan1 __GMP_PROTO ((mpz_srcptr, mp_bitcnt_t)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define __GMP_MPZ_SET_MIN_ALLOC(x,y) __GMP_ABS(y->_mp_size)
-#define mpz_set __gmpz_set
-__GMP_DECLSPEC void mpz_set __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-
-#define mpz_set_d __gmpz_set_d
-__GMP_DECLSPEC void mpz_set_d __GMP_PROTO ((mpz_ptr, double));
-
-#define mpz_set_f __gmpz_set_f
-__GMP_DECLSPEC void mpz_set_f __GMP_PROTO ((mpz_ptr, mpf_srcptr));
-
-#define mpz_set_q __gmpz_set_q
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_set_q)
-__GMP_DECLSPEC void mpz_set_q __GMP_PROTO ((mpz_ptr, mpq_srcptr));
-#endif
-
-#define __GMP_MPZ_SET_SI_MIN_ALLOC(x,y) (1+(__GMP_BITS_PER_ULONG-1)/GMP_NUMB_BITS)
-#define mpz_set_si __gmpz_set_si
-__GMP_DECLSPEC void mpz_set_si __GMP_PROTO ((mpz_ptr, signed long int));
-
-#define mpz_set_str __gmpz_set_str
-__GMP_DECLSPEC int mpz_set_str __GMP_PROTO ((mpz_ptr, __gmp_const char *, int));
-
-#define __GMP_MPZ_SET_UI_MIN_ALLOC(x,y) (1+(__GMP_BITS_PER_ULONG-1)/GMP_NUMB_BITS)
-#define mpz_set_ui __gmpz_set_ui
-__GMP_DECLSPEC void mpz_set_ui __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_setbit __gmpz_setbit
-__GMP_DECLSPEC void mpz_setbit __GMP_PROTO ((mpz_ptr, mp_bitcnt_t));
-
-#define mpz_size __gmpz_size
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_size)
-__GMP_DECLSPEC size_t mpz_size __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_sizeinbase __gmpz_sizeinbase
-__GMP_DECLSPEC size_t mpz_sizeinbase __GMP_PROTO ((mpz_srcptr, int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_sqrt __gmpz_sqrt
-__GMP_DECLSPEC void mpz_sqrt __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-
-#define mpz_sqrtrem __gmpz_sqrtrem
-__GMP_DECLSPEC void mpz_sqrtrem __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr));
-
-#define __GMP_MPZ_SUB_MIN_ALLOC(x,y,z) (__GMP_MAX(__GMP_ABS(y->_mp_size),__GMP_ABS(z->_mp_size))+1)
-#define mpz_sub __gmpz_sub
-__GMP_DECLSPEC void mpz_sub __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define __GMP_MPZ_SUB_UI_MIN_ALLOC(x,y,z) (__GMP_MAX(__GMP_ABS(y->_mp_size),1+(__GMP_BITS_PER_ULONG-1)/GMP_NUMB_BITS)+1)
-#define mpz_sub_ui __gmpz_sub_ui
-__GMP_DECLSPEC void mpz_sub_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define __GMP_MPZ_UI_SUB_MIN_ALLOC(x,y,z) (__GMP_MAX(__GMP_ABS(z->_mp_size),1+(__GMP_BITS_PER_ULONG-1)/GMP_NUMB_BITS)+1)
-#define mpz_ui_sub __gmpz_ui_sub
-__GMP_DECLSPEC void mpz_ui_sub __GMP_PROTO ((mpz_ptr, unsigned long int, mpz_srcptr));
-
-#define mpz_submul __gmpz_submul
-__GMP_DECLSPEC void mpz_submul __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_submul_ui __gmpz_submul_ui
-__GMP_DECLSPEC void mpz_submul_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_swap __gmpz_swap
-__GMP_DECLSPEC void mpz_swap __GMP_PROTO ((mpz_ptr, mpz_ptr)) __GMP_NOTHROW;
-
-#define mpz_tdiv_ui __gmpz_tdiv_ui
-__GMP_DECLSPEC unsigned long int mpz_tdiv_ui __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_tdiv_q __gmpz_tdiv_q
-__GMP_DECLSPEC void mpz_tdiv_q __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_tdiv_q_2exp __gmpz_tdiv_q_2exp
-__GMP_DECLSPEC void mpz_tdiv_q_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, mp_bitcnt_t));
-
-#define mpz_tdiv_q_ui __gmpz_tdiv_q_ui
-__GMP_DECLSPEC unsigned long int mpz_tdiv_q_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_tdiv_qr __gmpz_tdiv_qr
-__GMP_DECLSPEC void mpz_tdiv_qr __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_tdiv_qr_ui __gmpz_tdiv_qr_ui
-__GMP_DECLSPEC unsigned long int mpz_tdiv_qr_ui __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_tdiv_r __gmpz_tdiv_r
-__GMP_DECLSPEC void mpz_tdiv_r __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_tdiv_r_2exp __gmpz_tdiv_r_2exp
-__GMP_DECLSPEC void mpz_tdiv_r_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, mp_bitcnt_t));
-
-#define mpz_tdiv_r_ui __gmpz_tdiv_r_ui
-__GMP_DECLSPEC unsigned long int mpz_tdiv_r_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_tstbit __gmpz_tstbit
-__GMP_DECLSPEC int mpz_tstbit __GMP_PROTO ((mpz_srcptr, mp_bitcnt_t)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_ui_pow_ui __gmpz_ui_pow_ui
-__GMP_DECLSPEC void mpz_ui_pow_ui __GMP_PROTO ((mpz_ptr, unsigned long int, unsigned long int));
-
-#define mpz_urandomb __gmpz_urandomb
-__GMP_DECLSPEC void mpz_urandomb __GMP_PROTO ((mpz_ptr, gmp_randstate_t, mp_bitcnt_t));
-
-#define mpz_urandomm __gmpz_urandomm
-__GMP_DECLSPEC void mpz_urandomm __GMP_PROTO ((mpz_ptr, gmp_randstate_t, mpz_srcptr));
-
-#define mpz_xor __gmpz_xor
-#define mpz_eor __gmpz_xor
-__GMP_DECLSPEC void mpz_xor __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-
-/****** Integer (i.e. Z) routines for intmaax_t/uintmax_t types ******/
-
-#if defined( _STDINT_H ) || defined ( _STDINT_H_ ) || defined ( _STDINT )
-
-#define __GMP_BITS_PER_UINTMAX  (8*sizeof(uintmax_t))
-
-#define mpz_get_ux __gmpz_get_ux
-__GMP_DECLSPEC uintmax_t mpz_get_ux __GMP_PROTO ((mpz_srcptr));
-
-#define mpz_get_sx __gmpz_get_sx
-__GMP_DECLSPEC intmax_t mpz_get_sx __GMP_PROTO ((mpz_srcptr));
-
-#define mpz_set_ux __gmpz_set_ux
-__GMP_DECLSPEC void mpz_set_ux __GMP_PROTO ((mpz_ptr, uintmax_t));
-
-#define mpz_set_sx __gmpz_set_sx
-__GMP_DECLSPEC void mpz_set_sx __GMP_PROTO ((mpz_ptr, intmax_t));
-
-#define mpz_init_set_ux __gmpz_init_set_ux
-__GMP_DECLSPEC void mpz_init_set_ux __GMP_PROTO ((mpz_ptr, uintmax_t));
-
-#define mpz_init_set_sx __gmpz_init_set_sx
-__GMP_DECLSPEC void mpz_init_set_sx __GMP_PROTO ((mpz_ptr, intmax_t));
-
-#endif
-
-
-/**************** Rational (i.e. Q) routines.  ****************/
-
-#define mpq_abs __gmpq_abs
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpq_abs)
-__GMP_DECLSPEC void mpq_abs __GMP_PROTO ((mpq_ptr, mpq_srcptr));
-#endif
-
-#define mpq_add __gmpq_add
-__GMP_DECLSPEC void mpq_add __GMP_PROTO ((mpq_ptr, mpq_srcptr, mpq_srcptr));
-
-#define mpq_canonicalize __gmpq_canonicalize
-__GMP_DECLSPEC void mpq_canonicalize __GMP_PROTO ((mpq_ptr));
-
-#define mpq_clear __gmpq_clear
-__GMP_DECLSPEC void mpq_clear __GMP_PROTO ((mpq_ptr));
-
-#define mpq_clears __gmpq_clears
-__GMP_DECLSPEC void mpq_clears __GMP_PROTO ((mpq_ptr, ...));
-
-#define mpq_cmp __gmpq_cmp
-__GMP_DECLSPEC int mpq_cmp __GMP_PROTO ((mpq_srcptr, mpq_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define _mpq_cmp_si __gmpq_cmp_si
-__GMP_DECLSPEC int _mpq_cmp_si __GMP_PROTO ((mpq_srcptr, long, unsigned long)) __GMP_ATTRIBUTE_PURE;
-
-#define _mpq_cmp_ui __gmpq_cmp_ui
-__GMP_DECLSPEC int _mpq_cmp_ui __GMP_PROTO ((mpq_srcptr, unsigned long int, unsigned long int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpq_div __gmpq_div
-__GMP_DECLSPEC void mpq_div __GMP_PROTO ((mpq_ptr, mpq_srcptr, mpq_srcptr));
-
-#define mpq_div_2exp __gmpq_div_2exp
-__GMP_DECLSPEC void mpq_div_2exp __GMP_PROTO ((mpq_ptr, mpq_srcptr, mp_bitcnt_t));
-
-#define mpq_equal __gmpq_equal
-__GMP_DECLSPEC int mpq_equal __GMP_PROTO ((mpq_srcptr, mpq_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpq_get_num __gmpq_get_num
-__GMP_DECLSPEC void mpq_get_num __GMP_PROTO ((mpz_ptr, mpq_srcptr));
-
-#define mpq_get_den __gmpq_get_den
-__GMP_DECLSPEC void mpq_get_den __GMP_PROTO ((mpz_ptr, mpq_srcptr));
-
-#define mpq_get_d __gmpq_get_d
-__GMP_DECLSPEC double mpq_get_d __GMP_PROTO ((mpq_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpq_get_str __gmpq_get_str
-__GMP_DECLSPEC char *mpq_get_str __GMP_PROTO ((char *, int, mpq_srcptr));
-
-#define mpq_init __gmpq_init
-__GMP_DECLSPEC void mpq_init __GMP_PROTO ((mpq_ptr));
-
-#define mpq_inits __gmpq_inits
-__GMP_DECLSPEC void mpq_inits __GMP_PROTO ((mpq_ptr, ...));
-
-#define mpq_inp_str __gmpq_inp_str
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpq_inp_str __GMP_PROTO ((mpq_ptr, FILE *, int));
-#endif
-
-#define mpq_inv __gmpq_inv
-__GMP_DECLSPEC void mpq_inv __GMP_PROTO ((mpq_ptr, mpq_srcptr));
-
-#define mpq_mul __gmpq_mul
-__GMP_DECLSPEC void mpq_mul __GMP_PROTO ((mpq_ptr, mpq_srcptr, mpq_srcptr));
-
-#define mpq_mul_2exp __gmpq_mul_2exp
-__GMP_DECLSPEC void mpq_mul_2exp __GMP_PROTO ((mpq_ptr, mpq_srcptr, mp_bitcnt_t));
-
-#define mpq_neg __gmpq_neg
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpq_neg)
-__GMP_DECLSPEC void mpq_neg __GMP_PROTO ((mpq_ptr, mpq_srcptr));
-#endif
-
-#define mpq_out_str __gmpq_out_str
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpq_out_str __GMP_PROTO ((FILE *, int, mpq_srcptr));
-#endif
-
-#define mpq_set __gmpq_set
-__GMP_DECLSPEC void mpq_set __GMP_PROTO ((mpq_ptr, mpq_srcptr));
-
-#define mpq_set_d __gmpq_set_d
-__GMP_DECLSPEC void mpq_set_d __GMP_PROTO ((mpq_ptr, double));
-
-#define mpq_set_den __gmpq_set_den
-__GMP_DECLSPEC void mpq_set_den __GMP_PROTO ((mpq_ptr, mpz_srcptr));
-
-#define mpq_set_f __gmpq_set_f
-__GMP_DECLSPEC void mpq_set_f __GMP_PROTO ((mpq_ptr, mpf_srcptr));
-
-#define mpq_set_num __gmpq_set_num
-__GMP_DECLSPEC void mpq_set_num __GMP_PROTO ((mpq_ptr, mpz_srcptr));
-
-#define mpq_set_si __gmpq_set_si
-__GMP_DECLSPEC void mpq_set_si __GMP_PROTO ((mpq_ptr, signed long int, unsigned long int));
-
-#define mpq_set_str __gmpq_set_str
-__GMP_DECLSPEC int mpq_set_str __GMP_PROTO ((mpq_ptr, __gmp_const char *, int));
-
-#define mpq_set_ui __gmpq_set_ui
-__GMP_DECLSPEC void mpq_set_ui __GMP_PROTO ((mpq_ptr, unsigned long int, unsigned long int));
-
-#define mpq_set_z __gmpq_set_z
-__GMP_DECLSPEC void mpq_set_z __GMP_PROTO ((mpq_ptr, mpz_srcptr));
-
-#define mpq_sub __gmpq_sub
-__GMP_DECLSPEC void mpq_sub __GMP_PROTO ((mpq_ptr, mpq_srcptr, mpq_srcptr));
-
-#define mpq_swap __gmpq_swap
-__GMP_DECLSPEC void mpq_swap __GMP_PROTO ((mpq_ptr, mpq_ptr)) __GMP_NOTHROW;
-
-
-/**************** Float (i.e. F) routines.  ****************/
-
-#define mpf_abs __gmpf_abs
-__GMP_DECLSPEC void mpf_abs __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_add __gmpf_add
-__GMP_DECLSPEC void mpf_add __GMP_PROTO ((mpf_ptr, mpf_srcptr, mpf_srcptr));
-
-#define mpf_add_ui __gmpf_add_ui
-__GMP_DECLSPEC void mpf_add_ui __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
-#define mpf_ceil __gmpf_ceil
-__GMP_DECLSPEC void mpf_ceil __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_clear __gmpf_clear
-__GMP_DECLSPEC void mpf_clear __GMP_PROTO ((mpf_ptr));
-
-#define mpf_clears __gmpf_clears
-__GMP_DECLSPEC void mpf_clears __GMP_PROTO ((mpf_ptr, ...));
-
-#define mpf_cmp __gmpf_cmp
-__GMP_DECLSPEC int mpf_cmp __GMP_PROTO ((mpf_srcptr, mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_cmp_d __gmpf_cmp_d
-__GMP_DECLSPEC int mpf_cmp_d __GMP_PROTO ((mpf_srcptr, double)) __GMP_ATTRIBUTE_PURE;
-
-#define mpf_cmp_si __gmpf_cmp_si
-__GMP_DECLSPEC int mpf_cmp_si __GMP_PROTO ((mpf_srcptr, signed long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_cmp_ui __gmpf_cmp_ui
-__GMP_DECLSPEC int mpf_cmp_ui __GMP_PROTO ((mpf_srcptr, unsigned long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_div __gmpf_div
-__GMP_DECLSPEC void mpf_div __GMP_PROTO ((mpf_ptr, mpf_srcptr, mpf_srcptr));
-
-#define mpf_div_2exp __gmpf_div_2exp
-__GMP_DECLSPEC void mpf_div_2exp __GMP_PROTO ((mpf_ptr, mpf_srcptr, mp_bitcnt_t));
-
-#define mpf_div_ui __gmpf_div_ui
-__GMP_DECLSPEC void mpf_div_ui __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
-
-#define mpf_dump __gmpf_dump
-__GMP_DECLSPEC void mpf_dump __GMP_PROTO ((mpf_srcptr));
-
-#define mpf_eq __gmpf_eq
-__GMP_DECLSPEC int mpf_eq __GMP_PROTO ((mpf_srcptr, mpf_srcptr, mp_bitcnt_t)) __GMP_ATTRIBUTE_PURE;
-
-#define mpf_fits_sint_p __gmpf_fits_sint_p
-__GMP_DECLSPEC int mpf_fits_sint_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_fits_slong_p __gmpf_fits_slong_p
-__GMP_DECLSPEC int mpf_fits_slong_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_fits_sshort_p __gmpf_fits_sshort_p
-__GMP_DECLSPEC int mpf_fits_sshort_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_fits_uint_p __gmpf_fits_uint_p
-__GMP_DECLSPEC int mpf_fits_uint_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_fits_ulong_p __gmpf_fits_ulong_p
-__GMP_DECLSPEC int mpf_fits_ulong_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_fits_ushort_p __gmpf_fits_ushort_p
-__GMP_DECLSPEC int mpf_fits_ushort_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_floor __gmpf_floor
-__GMP_DECLSPEC void mpf_floor __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_get_d __gmpf_get_d
-__GMP_DECLSPEC double mpf_get_d __GMP_PROTO ((mpf_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpf_get_d_2exp __gmpf_get_d_2exp
-__GMP_DECLSPEC double mpf_get_d_2exp __GMP_PROTO ((signed long int *, mpf_srcptr));
-
-#define mpf_get_default_prec __gmpf_get_default_prec
-__GMP_DECLSPEC mp_bitcnt_t mpf_get_default_prec __GMP_PROTO ((void)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_get_prec __gmpf_get_prec
-__GMP_DECLSPEC mp_bitcnt_t mpf_get_prec __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_get_si __gmpf_get_si
-__GMP_DECLSPEC long mpf_get_si __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_get_str __gmpf_get_str
-__GMP_DECLSPEC char *mpf_get_str __GMP_PROTO ((char *, mp_exp_t *, int, size_t, mpf_srcptr));
-
-#define mpf_get_ui __gmpf_get_ui
-__GMP_DECLSPEC unsigned long mpf_get_ui __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_init __gmpf_init
-__GMP_DECLSPEC void mpf_init __GMP_PROTO ((mpf_ptr));
-
-#define mpf_init2 __gmpf_init2
-__GMP_DECLSPEC void mpf_init2 __GMP_PROTO ((mpf_ptr, mp_bitcnt_t));
-
-#define mpf_inits __gmpf_inits
-__GMP_DECLSPEC void mpf_inits __GMP_PROTO ((mpf_ptr, ...));
-
-#define mpf_init_set __gmpf_init_set
-__GMP_DECLSPEC void mpf_init_set __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_init_set_d __gmpf_init_set_d
-__GMP_DECLSPEC void mpf_init_set_d __GMP_PROTO ((mpf_ptr, double));
-
-#define mpf_init_set_si __gmpf_init_set_si
-__GMP_DECLSPEC void mpf_init_set_si __GMP_PROTO ((mpf_ptr, signed long int));
-
-#define mpf_init_set_str __gmpf_init_set_str
-__GMP_DECLSPEC int mpf_init_set_str __GMP_PROTO ((mpf_ptr, __gmp_const char *, int));
-
-#define mpf_init_set_ui __gmpf_init_set_ui
-__GMP_DECLSPEC void mpf_init_set_ui __GMP_PROTO ((mpf_ptr, unsigned long int));
-
-#define mpf_inp_str __gmpf_inp_str
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpf_inp_str __GMP_PROTO ((mpf_ptr, FILE *, int));
-#endif
-
-#define mpf_integer_p __gmpf_integer_p
-__GMP_DECLSPEC int mpf_integer_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_mul __gmpf_mul
-__GMP_DECLSPEC void mpf_mul __GMP_PROTO ((mpf_ptr, mpf_srcptr, mpf_srcptr));
-
-#define mpf_mul_2exp __gmpf_mul_2exp
-__GMP_DECLSPEC void mpf_mul_2exp __GMP_PROTO ((mpf_ptr, mpf_srcptr, mp_bitcnt_t));
-
-#define mpf_mul_ui __gmpf_mul_ui
-__GMP_DECLSPEC void mpf_mul_ui __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
-
-#define mpf_neg __gmpf_neg
-__GMP_DECLSPEC void mpf_neg __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_out_str __gmpf_out_str
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpf_out_str __GMP_PROTO ((FILE *, int, size_t, mpf_srcptr));
-#endif
-
-#define mpf_pow_ui __gmpf_pow_ui
-__GMP_DECLSPEC void mpf_pow_ui __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
-
-#define mpf_random2 __gmpf_random2
-__GMP_DECLSPEC void mpf_random2 __GMP_PROTO ((mpf_ptr, mp_size_t, mp_exp_t));
-
-#define mpf_rrandomb __gmpf_rrandomb
-__GMP_DECLSPEC void mpf_rrandomb __GMP_PROTO ((mpf_ptr, gmp_randstate_t, mp_size_t, mp_exp_t));
-
-#define mpf_reldiff __gmpf_reldiff
-__GMP_DECLSPEC void mpf_reldiff __GMP_PROTO ((mpf_ptr, mpf_srcptr, mpf_srcptr));
-
-#define mpf_set __gmpf_set
-__GMP_DECLSPEC void mpf_set __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_set_d __gmpf_set_d
-__GMP_DECLSPEC void mpf_set_d __GMP_PROTO ((mpf_ptr, double));
-
-#define mpf_set_default_prec __gmpf_set_default_prec
-__GMP_DECLSPEC void mpf_set_default_prec __GMP_PROTO ((mp_bitcnt_t)) __GMP_NOTHROW;
-
-#define mpf_set_prec __gmpf_set_prec
-__GMP_DECLSPEC void mpf_set_prec __GMP_PROTO ((mpf_ptr, mp_bitcnt_t));
-
-#define mpf_set_prec_raw __gmpf_set_prec_raw
-__GMP_DECLSPEC void mpf_set_prec_raw __GMP_PROTO ((mpf_ptr, mp_bitcnt_t)) __GMP_NOTHROW;
-
-#define mpf_set_q __gmpf_set_q
-__GMP_DECLSPEC void mpf_set_q __GMP_PROTO ((mpf_ptr, mpq_srcptr));
-
-#define mpf_set_si __gmpf_set_si
-__GMP_DECLSPEC void mpf_set_si __GMP_PROTO ((mpf_ptr, signed long int));
-
-#define mpf_set_str __gmpf_set_str
-__GMP_DECLSPEC int mpf_set_str __GMP_PROTO ((mpf_ptr, __gmp_const char *, int));
-
-#define mpf_set_ui __gmpf_set_ui
-__GMP_DECLSPEC void mpf_set_ui __GMP_PROTO ((mpf_ptr, unsigned long int));
-
-#define mpf_set_z __gmpf_set_z
-__GMP_DECLSPEC void mpf_set_z __GMP_PROTO ((mpf_ptr, mpz_srcptr));
-
-#define mpf_size __gmpf_size
-__GMP_DECLSPEC size_t mpf_size __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_sqrt __gmpf_sqrt
-__GMP_DECLSPEC void mpf_sqrt __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_sqrt_ui __gmpf_sqrt_ui
-__GMP_DECLSPEC void mpf_sqrt_ui __GMP_PROTO ((mpf_ptr, unsigned long int));
-
-#define mpf_sub __gmpf_sub
-__GMP_DECLSPEC void mpf_sub __GMP_PROTO ((mpf_ptr, mpf_srcptr, mpf_srcptr));
-
-#define mpf_sub_ui __gmpf_sub_ui
-__GMP_DECLSPEC void mpf_sub_ui __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
-
-#define mpf_swap __gmpf_swap
-__GMP_DECLSPEC void mpf_swap __GMP_PROTO ((mpf_ptr, mpf_ptr)) __GMP_NOTHROW;
-
-#define mpf_trunc __gmpf_trunc
-__GMP_DECLSPEC void mpf_trunc __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_ui_div __gmpf_ui_div
-__GMP_DECLSPEC void mpf_ui_div __GMP_PROTO ((mpf_ptr, unsigned long int, mpf_srcptr));
-
-#define mpf_ui_sub __gmpf_ui_sub
-__GMP_DECLSPEC void mpf_ui_sub __GMP_PROTO ((mpf_ptr, unsigned long int, mpf_srcptr));
-
-#define mpf_urandomb __gmpf_urandomb
-__GMP_DECLSPEC void mpf_urandomb __GMP_PROTO ((mpf_t, gmp_randstate_t, mp_bitcnt_t));
-
-
-/************ Low level positive-integer (i.e. N) routines.  ************/
-
-/* This is ugly, but we need to make user calls reach the prefixed function. */
-
-#define mpn_add __MPN(add)
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpn_add)
-__GMP_DECLSPEC mp_limb_t mpn_add __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_srcptr,mp_size_t));
-#endif
-
-#define mpn_add_1 __MPN(add_1)
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpn_add_1)
-__GMP_DECLSPEC mp_limb_t mpn_add_1 __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t)) __GMP_NOTHROW;
-#endif
-
-#define mpn_add_n __MPN(add_n)
-__GMP_DECLSPEC mp_limb_t mpn_add_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
-
-#define mpn_addmul_1 __MPN(addmul_1)
-__GMP_DECLSPEC mp_limb_t mpn_addmul_1 __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t));
-
-#define mpn_bdivmod __MPN(bdivmod)
-__GMP_DECLSPEC mp_limb_t mpn_bdivmod __GMP_PROTO ((mp_ptr, mp_ptr, mp_size_t, mp_srcptr, mp_size_t, unsigned long int));
-
-#define mpn_divrem __MPN(divrem)
-__GMP_DECLSPEC mp_limb_t mpn_divrem __GMP_PROTO ((mp_ptr, mp_size_t, mp_ptr, mp_size_t, mp_srcptr, mp_size_t));
-
-#define mpn_mulmod_2expp1 __MPN(mulmod_2expp1)
-__GMP_DECLSPEC int mpn_mulmod_2expp1 __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr,int,unsigned long, mp_ptr));
-
-#define mpn_mulmod_2expm1 __MPN(mulmod_2expm1)
-__GMP_DECLSPEC void mpn_mulmod_2expm1 __GMP_PROTO ((mp_ptr, mp_ptr, mp_ptr,unsigned long, mp_ptr));
-
-#define mpn_cmp __MPN(cmp)
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpn_cmp)
-__GMP_DECLSPEC int mpn_cmp __GMP_PROTO ((mp_srcptr, mp_srcptr, mp_size_t)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpn_redc_1 __MPN(redc_1)
-__GMP_DECLSPEC void mpn_redc_1 __GMP_PROTO ((mp_ptr, mp_ptr, mp_srcptr, mp_size_t, mp_limb_t);)
-
-#define mpn_divexact_by3(dst,src,size) \
-  mpn_divexact_by3c (dst, src, size, __GMP_CAST (mp_limb_t, 0))
-
-#define mpn_divexact_by3c __MPN(divexact_by3c)
-__GMP_DECLSPEC mp_limb_t mpn_divexact_by3c __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t));
-
-#define mpn_divmod_1(qp,np,nsize,dlimb) \
-  mpn_divrem_1 (qp, __GMP_CAST (mp_size_t, 0), np, nsize, dlimb)
-
-#define mpn_divrem_1 __MPN(divrem_1)
-__GMP_DECLSPEC mp_limb_t mpn_divrem_1 __GMP_PROTO ((mp_ptr, mp_size_t, mp_srcptr, mp_size_t, mp_limb_t));
-
-#define mpn_divrem_2 __MPN(divrem_2)
-__GMP_DECLSPEC mp_limb_t mpn_divrem_2 __GMP_PROTO ((mp_ptr, mp_size_t, mp_ptr, mp_size_t, mp_srcptr));
-
-#define mpn_invert __MPN(invert)
-__GMP_DECLSPEC void mpn_invert __GMP_PROTO ((mp_ptr xp, mp_srcptr ap, mp_size_t n));
-
-#define mpn_sb_divappr_q __MPN(sb_divappr_q)
-__GMP_DECLSPEC mp_limb_t mpn_sb_divappr_q __GMP_PROTO ((mp_ptr qp, mp_ptr np, mp_size_t nn,
-		  mp_srcptr dp, mp_size_t dn, mp_limb_t dip)); 
-
-#define mpn_dc_divappr_q_n __MPN(dc_divappr_q_n)
-__GMP_DECLSPEC mp_limb_t mpn_dc_divappr_q_n __GMP_PROTO ((mp_ptr qp, mp_ptr np, mp_srcptr dp, mp_size_t n, 
-		         mp_limb_t dip, mp_ptr tp));
-
-#define mpn_dc_bdiv_q_n __MPN(dc_bdiv_q_n)
-__GMP_DECLSPEC void mpn_dc_bdiv_q_n __GMP_PROTO ((mp_ptr qp, mp_ptr wp, mp_ptr np, mp_srcptr dp, mp_size_t n,
-                 mp_limb_t dinv, mp_ptr scratch));
-
-#define mpn_inv_divappr_q_n __MPN(inv_divappr_q_n)
-__GMP_DECLSPEC mp_limb_t mpn_inv_divappr_q_n __GMP_PROTO ((mp_ptr qp, mp_ptr np, mp_srcptr dp, mp_size_t n,
-                         mp_srcptr dip));
-
-#define mpn_dc_divappr_q __MPN(dc_divappr_q)
-__GMP_DECLSPEC mp_limb_t mpn_dc_divappr_q __GMP_PROTO ((mp_ptr qp, mp_ptr np, mp_size_t nn, mp_srcptr dp, mp_size_t n,
-                 mp_limb_t dinv));
-
-#define mpn_dc_div_q __MPN(dc_div_q)
-__GMP_DECLSPEC mp_limb_t mpn_dc_div_q __GMP_PROTO ((mp_ptr qp, mp_ptr np, mp_size_t nn,
-         mp_srcptr dp, mp_size_t dn, mp_limb_t dinv));
-
-#define mpn_inv_divappr_q __MPN(inv_divappr_q)
-__GMP_DECLSPEC mp_limb_t mpn_inv_divappr_q __GMP_PROTO ((mp_ptr qp, mp_ptr np, mp_size_t nn, mp_srcptr dp, mp_size_t n,
-                 mp_srcptr dinv));
-
-#define mpn_inv_div_q __MPN(inv_div_q)
-__GMP_DECLSPEC mp_limb_t mpn_inv_div_q __GMP_PROTO ((mp_ptr qp, mp_ptr np, mp_size_t nn,
-         mp_srcptr dp, mp_size_t dn, mp_srcptr dinv));
-
-#define mpn_inv_div_qr __MPN(inv_div_qr)
-__GMP_DECLSPEC mp_limb_t mpn_inv_div_qr __GMP_PROTO ((mp_ptr qp, mp_ptr np, mp_size_t nn,
-         mp_srcptr dp, mp_size_t dn, mp_srcptr dinv));
-
-#define mpn_inv_div_qr_n __MPN(inv_div_qr_n)
-__GMP_DECLSPEC mp_limb_t mpn_inv_div_qr_n __GMP_PROTO ((mp_ptr qp, mp_ptr np,
-         mp_srcptr dp, mp_size_t dn, mp_srcptr dinv));
-
-#define mpn_dc_div_qr __MPN(dc_div_qr)
-__GMP_DECLSPEC mp_limb_t mpn_dc_div_qr __GMP_PROTO ((mp_ptr qp, mp_ptr np, mp_size_t nn,
-         mp_srcptr dp, mp_size_t dn, mp_limb_t dinv));
-
-#define mpn_dc_div_qr_n __MPN(dc_div_qr_n)
-__GMP_DECLSPEC mp_limb_t mpn_dc_div_qr_n __GMP_PROTO ((mp_ptr qp, mp_ptr np, mp_srcptr dp, mp_size_t n,
-         mp_limb_t dinv, mp_ptr tp));
-
-#define mpn_sb_div_q __MPN(sb_div_q)
-__GMP_DECLSPEC mp_limb_t mpn_sb_div_q __GMP_PROTO ((mp_ptr qp, mp_ptr np, mp_size_t nn,
-         mp_srcptr dp, mp_size_t dn, mp_limb_t dinv));
-
-#define mpn_sb_bdiv_q __MPN(sb_bdiv_q)
-__GMP_DECLSPEC void mpn_sb_bdiv_q __GMP_PROTO ((mp_ptr qp, mp_ptr wp, mp_ptr np, mp_size_t nn,
-         mp_srcptr dp, mp_size_t dn, mp_limb_t dinv));
-
-#define mpn_dc_bdiv_q __MPN(dc_bdiv_q)
-__GMP_DECLSPEC void mpn_dc_bdiv_q __GMP_PROTO ((mp_ptr qp, mp_ptr np, mp_size_t nn,
-         mp_srcptr dp, mp_size_t dn, mp_limb_t dinv));
-
-#define mpn_dc_bdiv_qr __MPN(dc_bdiv_qr)
-__GMP_DECLSPEC mp_limb_t mpn_dc_bdiv_qr __GMP_PROTO ((mp_ptr qp, mp_ptr np, mp_size_t nn,
-         mp_srcptr dp, mp_size_t dn, mp_limb_t dinv));
-
-#define mpn_dc_bdiv_qr_n __MPN(dc_bdiv_qr_n)
-__GMP_DECLSPEC mp_limb_t mpn_dc_bdiv_qr_n __GMP_PROTO ((mp_ptr qp, mp_ptr np,
-         mp_srcptr dp, mp_size_t n, mp_limb_t dinv, mp_ptr tp));
-
-#define mpn_sb_div_qr __MPN(sb_div_qr)
-__GMP_DECLSPEC mp_limb_t mpn_sb_div_qr __GMP_PROTO ((mp_ptr qp, mp_ptr np, mp_size_t nn,
-         mp_srcptr dp, mp_size_t dn, mp_limb_t dinv));
-
-#define mpn_sb_bdiv_qr __MPN(sb_bdiv_qr)
-__GMP_DECLSPEC mp_limb_t mpn_sb_bdiv_qr __GMP_PROTO ((mp_ptr qp, mp_ptr np, mp_size_t nn,
-         mp_srcptr dp, mp_size_t dn, mp_limb_t dinv));
-
-#define mpn_tdiv_q __MPN(tdiv_q)
-__GMP_DECLSPEC void mpn_tdiv_q __GMP_PROTO ((mp_ptr qp, mp_srcptr np, mp_size_t nn, 
-                                   mp_srcptr dp, mp_size_t dn));
-
-#define mpn_divexact __MPN(divexact)
-__GMP_DECLSPEC void  mpn_divexact __GMP_PROTO ((mp_ptr qp,
-	      mp_srcptr np, mp_size_t nn, mp_srcptr dp, mp_size_t dn));
-
-#define mpn_gcd __MPN(gcd)
-__GMP_DECLSPEC mp_size_t mpn_gcd __GMP_PROTO ((mp_ptr, mp_ptr, mp_size_t, mp_ptr, mp_size_t));
-
-#define mpn_gcd_1 __MPN(gcd_1)
-__GMP_DECLSPEC mp_limb_t mpn_gcd_1 __GMP_PROTO ((mp_srcptr, mp_size_t, mp_limb_t)) __GMP_ATTRIBUTE_PURE;
-
-#define mpn_gcdext __MPN(gcdext)
-__GMP_DECLSPEC mp_size_t mpn_gcdext __GMP_PROTO ((mp_ptr, mp_ptr, mp_size_t *, mp_ptr, mp_size_t, mp_ptr, mp_size_t));
-
-#define mpn_get_str __MPN(get_str)
-__GMP_DECLSPEC size_t mpn_get_str __GMP_PROTO ((unsigned char *, int, mp_ptr, mp_size_t));
-
-#define mpn_hamdist __MPN(hamdist)
-__GMP_DECLSPEC mp_bitcnt_t mpn_hamdist __GMP_PROTO ((mp_srcptr, mp_srcptr, mp_size_t)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpn_lshift __MPN(lshift)
-__GMP_DECLSPEC mp_limb_t mpn_lshift __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, unsigned int));
-
-#define mpn_mod_1 __MPN(mod_1)
-__GMP_DECLSPEC mp_limb_t mpn_mod_1 __GMP_PROTO ((mp_srcptr, mp_size_t, mp_limb_t)) __GMP_ATTRIBUTE_PURE;
-
-#define mpn_mul __MPN(mul)
-__GMP_DECLSPEC mp_limb_t mpn_mul __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t));
-
-#define mpn_mul_1 __MPN(mul_1)
-__GMP_DECLSPEC mp_limb_t mpn_mul_1 __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t));
-
-#define mpn_mul_n __MPN(mul_n)
-__GMP_DECLSPEC void mpn_mul_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
-
-#define mpn_sqr   __MPN(sqr)
-__GMP_DECLSPEC void mpn_sqr __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t));
-
-#define mpn_neg_n __MPN(neg_n)
-#define mpn_neg   __MPN(neg_n)
-__GMP_DECLSPEC mp_limb_t mpn_neg_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t));
-
-#define mpn_com_n __MPN(com_n)
-#define mpn_com   __MPN(com_n)
-__GMP_DECLSPEC void mpn_com_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t));
-
-#define mpn_perfect_square_p __MPN(perfect_square_p)
-__GMP_DECLSPEC int mpn_perfect_square_p __GMP_PROTO ((mp_srcptr, mp_size_t)) __GMP_ATTRIBUTE_PURE;
-
-#define mpn_popcount __MPN(popcount)
-__GMP_DECLSPEC mp_bitcnt_t mpn_popcount __GMP_PROTO ((mp_srcptr, mp_size_t)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpn_pow_1 __MPN(pow_1)
-__GMP_DECLSPEC mp_size_t mpn_pow_1 __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t, mp_ptr));
-
-/* undocumented now, but retained here for upward compatibility */
-#define mpn_preinv_mod_1 __MPN(preinv_mod_1)
-__GMP_DECLSPEC mp_limb_t mpn_preinv_mod_1 __GMP_PROTO ((mp_srcptr, mp_size_t, mp_limb_t, mp_limb_t)) __GMP_ATTRIBUTE_PURE;
-
-#define mpn_random __MPN(random)
-__GMP_DECLSPEC void mpn_random __GMP_PROTO ((mp_ptr, mp_size_t));
-
-#define mpn_random2 __MPN(random2)
-__GMP_DECLSPEC void mpn_random2 __GMP_PROTO ((mp_ptr, mp_size_t));
-
-#define mpn_urandomb __MPN(urandomb)
-__GMP_DECLSPEC void mpn_urandomb __GMP_PROTO ((mp_ptr, gmp_randstate_t, unsigned long));
-
-#define mpn_urandomm __MPN(urandomm)
-__GMP_DECLSPEC void mpn_urandomm __GMP_PROTO ((mp_ptr, gmp_randstate_t, mp_srcptr, mp_size_t));
-
-#define mpn_randomb __MPN(randomb)
-__GMP_DECLSPEC void mpn_randomb __GMP_PROTO ((mp_ptr, gmp_randstate_t, mp_size_t));
-
-#define mpn_rrandom __MPN(rrandom)
-__GMP_DECLSPEC void mpn_rrandom __GMP_PROTO ((mp_ptr, gmp_randstate_t, mp_size_t));
-
-#define mpn_rshift __MPN(rshift)
-__GMP_DECLSPEC mp_limb_t mpn_rshift __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, unsigned int));
-
-#define mpn_scan0 __MPN(scan0)
-__GMP_DECLSPEC mp_bitcnt_t mpn_scan0 __GMP_PROTO ((mp_srcptr, mp_bitcnt_t)) __GMP_ATTRIBUTE_PURE;
-
-#define mpn_scan1 __MPN(scan1)
-__GMP_DECLSPEC mp_bitcnt_t mpn_scan1 __GMP_PROTO ((mp_srcptr, mp_bitcnt_t)) __GMP_ATTRIBUTE_PURE;
-
-#define mpn_set_str __MPN(set_str)
-__GMP_DECLSPEC mp_size_t mpn_set_str __GMP_PROTO ((mp_ptr, __gmp_const unsigned char *, size_t, int));
-
-#define mpn_sqrtrem __MPN(sqrtrem)
-__GMP_DECLSPEC mp_size_t mpn_sqrtrem __GMP_PROTO ((mp_ptr, mp_ptr, mp_srcptr, mp_size_t));
-
-#define mpn_sub __MPN(sub)
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpn_sub)
-__GMP_DECLSPEC mp_limb_t mpn_sub __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_srcptr,mp_size_t));
-#endif
-
-#define mpn_sub_1 __MPN(sub_1)
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpn_sub_1)
-__GMP_DECLSPEC mp_limb_t mpn_sub_1 __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t)) __GMP_NOTHROW;
-#endif
-
-#define mpn_sub_n __MPN(sub_n)
-__GMP_DECLSPEC mp_limb_t mpn_sub_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
-
-#define mpn_submul_1 __MPN(submul_1)
-__GMP_DECLSPEC mp_limb_t mpn_submul_1 __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t));
-
-#define mpn_tdiv_qr __MPN(tdiv_qr)
-__GMP_DECLSPEC void mpn_tdiv_qr __GMP_PROTO ((mp_ptr, mp_ptr, mp_size_t, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t));
-
-#define mpn_and_n __MPN(and_n)
-__GMP_DECLSPEC void mpn_and_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
-#define mpn_andn_n __MPN(andn_n)
-__GMP_DECLSPEC void mpn_andn_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
-#define mpn_nand_n __MPN(nand_n)
-__GMP_DECLSPEC void mpn_nand_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
-#define mpn_ior_n __MPN(ior_n)
-__GMP_DECLSPEC void mpn_ior_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
-#define mpn_iorn_n __MPN(iorn_n)
-__GMP_DECLSPEC void mpn_iorn_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
-#define mpn_nior_n __MPN(nior_n)
-__GMP_DECLSPEC void mpn_nior_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
-#define mpn_xor_n __MPN(xor_n)
-__GMP_DECLSPEC void mpn_xor_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
-#define mpn_xnor_n __MPN(xnor_n)
-__GMP_DECLSPEC void mpn_xnor_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
-
-#define mpn_copyi __MPN(copyi)
-__GMP_DECLSPEC void mpn_copyi __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t));
-#define mpn_copyd __MPN(copyd)
-__GMP_DECLSPEC void mpn_copyd __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t));
-#define mpn_zero __MPN(zero)
-__GMP_DECLSPEC void mpn_zero __GMP_PROTO ((mp_ptr, mp_size_t));
-
-/**************** mpz inlines ****************/
-
-/* The following are provided as inlines where possible, but always exist as
-   library functions too, for binary compatibility.
-
-   Within gmp itself this inlining generally isn't relied on, since it
-   doesn't get done for all compilers, whereas if something is worth
-   inlining then it's worth arranging always.
-
-   There are two styles of inlining here.  When the same bit of code is
-   wanted for the inline as for the library version, then __GMP_FORCE_foo
-   arranges for that code to be emitted and the __GMP_EXTERN_INLINE
-   directive suppressed, eg. mpz_fits_uint_p.  When a different bit of code
-   is wanted for the inline than for the library version, then
-   __GMP_FORCE_foo arranges the inline to be suppressed, eg. mpz_abs.  */
-
-#if defined (__GMP_EXTERN_INLINE) && ! defined (__GMP_FORCE_mpz_abs)
-__GMP_EXTERN_INLINE void
-mpz_abs (mpz_ptr __gmp_w, mpz_srcptr __gmp_u)
-{
-  if (__gmp_w != __gmp_u)
-    mpz_set (__gmp_w, __gmp_u);
-  __gmp_w->_mp_size = __GMP_ABS (__gmp_w->_mp_size);
-}
-#endif
-
-#if GMP_NAIL_BITS == 0
-#define __GMPZ_FITS_UTYPE_P(z,maxval)					\
-  mp_size_t  __gmp_n = z->_mp_size;					\
-  mp_ptr  __gmp_p = z->_mp_d;						\
-  return (__gmp_n == 0 || (__gmp_n == 1 && __gmp_p[0] <= maxval));
-#else
-#define __GMPZ_FITS_UTYPE_P(z,maxval)					\
-  mp_size_t  __gmp_n = z->_mp_size;					\
-  mp_ptr  __gmp_p = z->_mp_d;						\
-  return (__gmp_n == 0 || (__gmp_n == 1 && __gmp_p[0] <= maxval)	\
-	  || (__gmp_n == 2 && __gmp_p[1] <= ((mp_limb_t) maxval >> GMP_NUMB_BITS)));
-#endif
-
-#if defined (__GMP_EXTERN_INLINE) || defined (__GMP_FORCE_mpz_fits_uint_p)
-#if ! defined (__GMP_FORCE_mpz_fits_uint_p)
-__GMP_EXTERN_INLINE
-#endif
-int
-mpz_fits_uint_p (mpz_srcptr __gmp_z) __GMP_NOTHROW
-{
-  __GMPZ_FITS_UTYPE_P (__gmp_z, __GMP_UINT_MAX);
-}
-#endif
-
-#if defined (__GMP_EXTERN_INLINE) || defined (__GMP_FORCE_mpz_fits_ulong_p)
-#if ! defined (__GMP_FORCE_mpz_fits_ulong_p)
-__GMP_EXTERN_INLINE
-#endif
-int
-mpz_fits_ulong_p (mpz_srcptr __gmp_z) __GMP_NOTHROW
-{
-  __GMPZ_FITS_UTYPE_P (__gmp_z, __GMP_ULONG_MAX);
-}
-#endif
-
-#if defined (__GMP_EXTERN_INLINE) || defined (__GMP_FORCE_mpz_fits_ushort_p)
-#if ! defined (__GMP_FORCE_mpz_fits_ushort_p)
-__GMP_EXTERN_INLINE
-#endif
-int
-mpz_fits_ushort_p (mpz_srcptr __gmp_z) __GMP_NOTHROW
-{
-  __GMPZ_FITS_UTYPE_P (__gmp_z, __GMP_USHRT_MAX);
-}
-#endif
-
-#if defined (__GMP_EXTERN_INLINE) || defined (__GMP_FORCE_mpz_get_ui)
-#if ! defined (__GMP_FORCE_mpz_get_ui)
-__GMP_EXTERN_INLINE
-#endif
-unsigned long
-mpz_get_ui (mpz_srcptr __gmp_z) __GMP_NOTHROW
-{
-  mp_ptr __gmp_p = __gmp_z->_mp_d;
-  mp_size_t __gmp_n = __gmp_z->_mp_size;
-  mp_limb_t __gmp_l = __gmp_p[0];
-  /* This is a "#if" rather than a plain "if" so as to avoid gcc warnings
-     about "<< GMP_NUMB_BITS" exceeding the type size, and to avoid Borland
-     C++ 6.0 warnings about condition always true for something like
-     "__GMP_ULONG_MAX < GMP_NUMB_MASK".  */
-#if GMP_NAIL_BITS == 0 || defined (_LONG_LONG_LIMB)
-  /* limb==long and no nails, or limb==longlong, one limb is enough */
-  return (unsigned long)(__gmp_n != 0 ? __gmp_l : 0);
-#else
-  /* limb==long and nails, need two limbs when available */
-  __gmp_n = __GMP_ABS (__gmp_n);
-  if (__gmp_n <= 1)
-    return (__gmp_n != 0 ? __gmp_l : 0);
-  else
-    return __gmp_l + (__gmp_p[1] << GMP_NUMB_BITS);
-#endif
-}
-#endif
-
-#if defined (__GMP_EXTERN_INLINE) || defined (__GMP_FORCE_mpz_getlimbn)
-#if ! defined (__GMP_FORCE_mpz_getlimbn)
-__GMP_EXTERN_INLINE
-#endif
-mp_limb_t
-mpz_getlimbn (mpz_srcptr __gmp_z, mp_size_t __gmp_n) __GMP_NOTHROW
-{
-  mp_limb_t  __gmp_result = 0;
-  if (__GMP_LIKELY (__gmp_n >= 0 && __gmp_n < __GMP_ABS (__gmp_z->_mp_size)))
-    __gmp_result = __gmp_z->_mp_d[__gmp_n];
-  return __gmp_result;
-}
-#endif
-
-#if defined (__GMP_EXTERN_INLINE) && ! defined (__GMP_FORCE_mpz_neg)
-__GMP_EXTERN_INLINE void
-mpz_neg (mpz_ptr __gmp_w, mpz_srcptr __gmp_u)
-{
-  if (__gmp_w != __gmp_u)
-    mpz_set (__gmp_w, __gmp_u);
-  __gmp_w->_mp_size = - __gmp_w->_mp_size;
-}
-#endif
-
-#if defined (__GMP_EXTERN_INLINE) || defined (__GMP_FORCE_mpz_perfect_square_p)
-#if ! defined (__GMP_FORCE_mpz_perfect_square_p)
-__GMP_EXTERN_INLINE
-#endif
-int
-mpz_perfect_square_p (mpz_srcptr __gmp_a)
-{
-  mp_size_t __gmp_asize;
-  int       __gmp_result;
-
-  __gmp_asize = __gmp_a->_mp_size;
-  __gmp_result = (__gmp_asize >= 0);  /* zero is a square, negatives are not */
-  if (__GMP_LIKELY (__gmp_asize > 0))
-    __gmp_result = mpn_perfect_square_p (__gmp_a->_mp_d, __gmp_asize);
-  return __gmp_result;
-}
-#endif
-
-#if defined (__GMP_EXTERN_INLINE) || defined (__GMP_FORCE_mpz_popcount)
-#if ! defined (__GMP_FORCE_mpz_popcount)
-__GMP_EXTERN_INLINE
-#endif
-mp_bitcnt_t
-mpz_popcount (mpz_srcptr __gmp_u) __GMP_NOTHROW
-{
-  mp_size_t      __gmp_usize;
-  mp_bitcnt_t    __gmp_result;
-
-  __gmp_usize = __gmp_u->_mp_size;
-  __gmp_result = (__gmp_usize < 0 ? __GMP_BITCNT_MAX : 0);
-  if (__GMP_LIKELY (__gmp_usize > 0))
-    __gmp_result =  mpn_popcount (__gmp_u->_mp_d, __gmp_usize);
-  return __gmp_result;
-}
-#endif
-
-#if defined (__GMP_EXTERN_INLINE) || defined (__GMP_FORCE_mpz_set_q)
-#if ! defined (__GMP_FORCE_mpz_set_q)
-__GMP_EXTERN_INLINE
-#endif
-void
-mpz_set_q (mpz_ptr __gmp_w, mpq_srcptr __gmp_u)
-{
-  mpz_tdiv_q (__gmp_w, mpq_numref (__gmp_u), mpq_denref (__gmp_u));
-}
-#endif
-
-#if defined (__GMP_EXTERN_INLINE) || defined (__GMP_FORCE_mpz_size)
-#if ! defined (__GMP_FORCE_mpz_size)
-__GMP_EXTERN_INLINE
-#endif
-size_t
-mpz_size (mpz_srcptr __gmp_z) __GMP_NOTHROW
-{
-  return __GMP_ABS (__gmp_z->_mp_size);
-}
-#endif
-
-
-/**************** mpq inlines ****************/
-
-#if defined (__GMP_EXTERN_INLINE) && ! defined (__GMP_FORCE_mpq_abs)
-__GMP_EXTERN_INLINE void
-mpq_abs (mpq_ptr __gmp_w, mpq_srcptr __gmp_u)
-{
-  if (__gmp_w != __gmp_u)
-    mpq_set (__gmp_w, __gmp_u);
-  __gmp_w->_mp_num._mp_size = __GMP_ABS (__gmp_w->_mp_num._mp_size);
-}
-#endif
-
-#if defined (__GMP_EXTERN_INLINE) && ! defined (__GMP_FORCE_mpq_neg)
-__GMP_EXTERN_INLINE void
-mpq_neg (mpq_ptr __gmp_w, mpq_srcptr __gmp_u)
-{
-  if (__gmp_w != __gmp_u)
-    mpq_set (__gmp_w, __gmp_u);
-  __gmp_w->_mp_num._mp_size = - __gmp_w->_mp_num._mp_size;
-}
-#endif
-
-
-/**************** mpn inlines ****************/
-
-/* The comments with __GMPN_ADD_1 below apply here too.
-
-   The test for FUNCTION returning 0 should predict well.  If it's assumed
-   {yp,ysize} will usually have a random number of bits then the high limb
-   won't be full and a carry out will occur a good deal less than 50% of the
-   time.
-
-   ysize==0 isn't a documented feature, but is used internally in a few
-   places.
-
-   Producing cout last stops it using up a register during the main part of
-   the calculation, though gcc (as of 3.0) on an "if (mpn_add (...))"
-   doesn't seem able to move the true and false legs of the conditional up
-   to the two places cout is generated.  */
-
-#define __GMPN_AORS(cout, wp, xp, xsize, yp, ysize, FUNCTION, TEST)     \
-  do {                                                                  \
-    mp_size_t  __gmp_i;                                                 \
-    mp_limb_t  __gmp_x;                                                 \
-                                                                        \
-    /* ASSERT ((ysize) >= 0); */                                        \
-    /* ASSERT ((xsize) >= (ysize)); */                                  \
-    /* ASSERT (MPN_SAME_OR_SEPARATE2_P (wp, xsize, xp, xsize)); */      \
-    /* ASSERT (MPN_SAME_OR_SEPARATE2_P (wp, xsize, yp, ysize)); */      \
-                                                                        \
-    __gmp_i = (ysize);                                                  \
-    if (__gmp_i != 0)                                                   \
-      {                                                                 \
-        if (FUNCTION (wp, xp, yp, __gmp_i))                             \
-          {                                                             \
-            do                                                          \
-              {                                                         \
-                if (__gmp_i >= (xsize))                                 \
-                  {                                                     \
-                    (cout) = 1;                                         \
-                    goto __gmp_done;                                    \
-                  }                                                     \
-                __gmp_x = (xp)[__gmp_i];                                \
-              }                                                         \
-            while (TEST);                                               \
-          }                                                             \
-      }                                                                 \
-    if ((wp) != (xp))                                                   \
-      __GMPN_COPY_REST (wp, xp, xsize, __gmp_i);                        \
-    (cout) = 0;                                                         \
-  __gmp_done:                                                           \
-    ;                                                                   \
-  } while (0)
-
-#define __GMPN_ADD(cout, wp, xp, xsize, yp, ysize)              \
-  __GMPN_AORS (cout, wp, xp, xsize, yp, ysize, mpn_add_n,       \
-               (((wp)[__gmp_i++] = (__gmp_x + 1) & GMP_NUMB_MASK) == 0))
-#define __GMPN_SUB(cout, wp, xp, xsize, yp, ysize)              \
-  __GMPN_AORS (cout, wp, xp, xsize, yp, ysize, mpn_sub_n,       \
-               (((wp)[__gmp_i++] = (__gmp_x - 1) & GMP_NUMB_MASK), __gmp_x == 0))
-
-
-/* The use of __gmp_i indexing is designed to ensure a compile time src==dst
-   remains nice and clear to the compiler, so that __GMPN_COPY_REST can
-   disappear, and the load/add/store gets a chance to become a
-   read-modify-write on CISC CPUs.
-
-   Alternatives:
-
-   Using a pair of pointers instead of indexing would be possible, but gcc
-   isn't able to recognise compile-time src==dst in that case, even when the
-   pointers are incremented more or less together.  Other compilers would
-   very likely have similar difficulty.
-
-   gcc could use "if (__builtin_constant_p(src==dst) && src==dst)" or
-   similar to detect a compile-time src==dst.  This works nicely on gcc
-   2.95.x, it's not good on gcc 3.0 where __builtin_constant_p(p==p) seems
-   to be always false, for a pointer p.  But the current code form seems
-   good enough for src==dst anyway.
-
-   gcc on x86 as usual doesn't give particularly good flags handling for the
-   carry/borrow detection.  It's tempting to want some multi instruction asm
-   blocks to help it, and this was tried, but in truth there's only a few
-   instructions to save and any gain is all too easily lost by register
-   juggling setting up for the asm.  */
-
-#if GMP_NAIL_BITS == 0
-#define __GMPN_AORS_1(cout, dst, src, n, v, OP, CB)		\
-  do {								\
-    mp_size_t  __gmp_i;						\
-    mp_limb_t  __gmp_x, __gmp_r;                                \
-								\
-    /* ASSERT ((n) >= 1); */					\
-    /* ASSERT (MPN_SAME_OR_SEPARATE_P (dst, src, n)); */	\
-								\
-    __gmp_x = (src)[0];						\
-    __gmp_r = __gmp_x OP (v);                                   \
-    (dst)[0] = __gmp_r;						\
-    if (CB (__gmp_r, __gmp_x, (v)))                             \
-      {								\
-	(cout) = 1;						\
-	for (__gmp_i = 1; __gmp_i < (n);)                       \
-	  {							\
-	    __gmp_x = (src)[__gmp_i];                           \
-	    __gmp_r = __gmp_x OP 1;                             \
-	    (dst)[__gmp_i] = __gmp_r;                           \
-	    ++__gmp_i;						\
-	    if (!CB (__gmp_r, __gmp_x, 1))                      \
-	      {							\
-		if ((src) != (dst))				\
-		  __GMPN_COPY_REST (dst, src, n, __gmp_i);      \
-		(cout) = 0;					\
-		break;						\
-	      }							\
-	  }							\
-      }								\
-    else							\
-      {								\
-	if ((src) != (dst))					\
-	  __GMPN_COPY_REST (dst, src, n, 1);			\
-	(cout) = 0;						\
-      }								\
-  } while (0)
-#endif
-
-#if GMP_NAIL_BITS >= 1
-#define __GMPN_AORS_1(cout, dst, src, n, v, OP, CB)		\
-  do {								\
-    mp_size_t  __gmp_i;						\
-    mp_limb_t  __gmp_x, __gmp_r;				\
-								\
-    /* ASSERT ((n) >= 1); */					\
-    /* ASSERT (MPN_SAME_OR_SEPARATE_P (dst, src, n)); */	\
-								\
-    __gmp_x = (src)[0];						\
-    __gmp_r = __gmp_x OP (v);					\
-    (dst)[0] = __gmp_r & GMP_NUMB_MASK;				\
-    if (__gmp_r >> GMP_NUMB_BITS != 0)				\
-      {								\
-	(cout) = 1;						\
-	for (__gmp_i = 1; __gmp_i < (n);)			\
-	  {							\
-	    __gmp_x = (src)[__gmp_i];				\
-	    __gmp_r = __gmp_x OP 1;				\
-	    (dst)[__gmp_i] = __gmp_r & GMP_NUMB_MASK;		\
-	    ++__gmp_i;						\
-	    if (__gmp_r >> GMP_NUMB_BITS == 0)			\
-	      {							\
-		if ((src) != (dst))				\
-		  __GMPN_COPY_REST (dst, src, n, __gmp_i);	\
-		(cout) = 0;					\
-		break;						\
-	      }							\
-	  }							\
-      }								\
-    else							\
-      {								\
-	if ((src) != (dst))					\
-	  __GMPN_COPY_REST (dst, src, n, 1);			\
-	(cout) = 0;						\
-      }								\
-  } while (0)
-#endif
-
-#define __GMPN_ADDCB(r,x,y) ((r) < (y))
-#define __GMPN_SUBCB(r,x,y) ((x) < (y))
-
-#define __GMPN_ADD_1(cout, dst, src, n, v)	     \
-  __GMPN_AORS_1(cout, dst, src, n, v, +, __GMPN_ADDCB)
-#define __GMPN_SUB_1(cout, dst, src, n, v)	     \
-  __GMPN_AORS_1(cout, dst, src, n, v, -, __GMPN_SUBCB)
-
-
-/* Compare {xp,size} and {yp,size}, setting "result" to positive, zero or
-   negative.  size==0 is allowed.  On random data usually only one limb will
-   need to be examined to get a result, so it's worth having it inline.  */
-#define __GMPN_CMP(result, xp, yp, size)                                \
-  do {                                                                  \
-    mp_size_t  __gmp_i;                                                 \
-    mp_limb_t  __gmp_x, __gmp_y;                                        \
-                                                                        \
-    /* ASSERT ((size) >= 0); */                                         \
-                                                                        \
-    (result) = 0;                                                       \
-    __gmp_i = (size);                                                   \
-    while (--__gmp_i >= 0)                                              \
-      {                                                                 \
-        __gmp_x = (xp)[__gmp_i];                                        \
-        __gmp_y = (yp)[__gmp_i];                                        \
-        if (__gmp_x != __gmp_y)                                         \
-          {                                                             \
-            /* Cannot use __gmp_x - __gmp_y, may overflow an "int" */   \
-            (result) = (__gmp_x > __gmp_y ? 1 : -1);                    \
-            break;                                                      \
-          }                                                             \
-      }                                                                 \
-  } while (0)
-
-
-#if defined (__GMPN_COPY) && ! defined (__GMPN_COPY_REST)
-#define __GMPN_COPY_REST(dst, src, size, start)                 \
-  do {                                                          \
-    /* ASSERT ((start) >= 0); */                                \
-    /* ASSERT ((start) <= (size)); */                           \
-    __GMPN_COPY ((dst)+(start), (src)+(start), (size)-(start)); \
-  } while (0)
-#endif
-
-/* Copy {src,size} to {dst,size}, starting at "start".  This is designed to
-   keep the indexing dst[j] and src[j] nice and simple for __GMPN_ADD_1,
-   __GMPN_ADD, etc.  */
-#if ! defined (__GMPN_COPY_REST)
-#define __GMPN_COPY_REST(dst, src, size, start)                 \
-  do {                                                          \
-    mp_size_t __gmp_j;                                          \
-    /* ASSERT ((size) >= 0); */                                 \
-    /* ASSERT ((start) >= 0); */                                \
-    /* ASSERT ((start) <= (size)); */                           \
-    /* ASSERT (MPN_SAME_OR_SEPARATE_P (dst, src, size)); */     \
-    for (__gmp_j = (start); __gmp_j < (size); __gmp_j++)        \
-      (dst)[__gmp_j] = (src)[__gmp_j];                          \
-  } while (0)
-#endif
-
-/* Enhancement: Use some of the smarter code from gmp-impl.h.  Maybe use
-   mpn_copyi if there's a native version, and if we don't mind demanding
-   binary compatibility for it (on targets which use it).  */
-
-#if ! defined (__GMPN_COPY)
-#define __GMPN_COPY(dst, src, size)   __GMPN_COPY_REST (dst, src, size, 0)
-#endif
-
-
-#if defined (__GMP_EXTERN_INLINE) || defined (__GMP_FORCE_mpn_add)
-#if ! defined (__GMP_FORCE_mpn_add)
-__GMP_EXTERN_INLINE
-#endif
-mp_limb_t
-mpn_add (mp_ptr __gmp_wp, mp_srcptr __gmp_xp, mp_size_t __gmp_xsize, mp_srcptr __gmp_yp, mp_size_t __gmp_ysize)
-{
-  mp_limb_t  __gmp_c;
-  __GMPN_ADD (__gmp_c, __gmp_wp, __gmp_xp, __gmp_xsize, __gmp_yp, __gmp_ysize);
-  return __gmp_c;
-}
-#endif
-
-#if defined (__GMP_EXTERN_INLINE) || defined (__GMP_FORCE_mpn_add_1)
-#if ! defined (__GMP_FORCE_mpn_add_1)
-__GMP_EXTERN_INLINE
-#endif
-mp_limb_t
-mpn_add_1 (mp_ptr __gmp_dst, mp_srcptr __gmp_src, mp_size_t __gmp_size, mp_limb_t __gmp_n) __GMP_NOTHROW
-{
-  mp_limb_t  __gmp_c;
-  __GMPN_ADD_1 (__gmp_c, __gmp_dst, __gmp_src, __gmp_size, __gmp_n);
-  return __gmp_c;
-}
-#endif
-
-#if defined (__GMP_EXTERN_INLINE) || defined (__GMP_FORCE_mpn_cmp)
-#if ! defined (__GMP_FORCE_mpn_cmp)
-__GMP_EXTERN_INLINE
-#endif
-int
-mpn_cmp (mp_srcptr __gmp_xp, mp_srcptr __gmp_yp, mp_size_t __gmp_size) __GMP_NOTHROW
-{
-  int __gmp_result;
-  __GMPN_CMP (__gmp_result, __gmp_xp, __gmp_yp, __gmp_size);
-  return __gmp_result;
-}
-#endif
-
-#if defined (__GMP_EXTERN_INLINE) || defined (__GMP_FORCE_mpn_sub)
-#if ! defined (__GMP_FORCE_mpn_sub)
-__GMP_EXTERN_INLINE
-#endif
-mp_limb_t
-mpn_sub (mp_ptr __gmp_wp, mp_srcptr __gmp_xp, mp_size_t __gmp_xsize, mp_srcptr __gmp_yp, mp_size_t __gmp_ysize)
-{
-  mp_limb_t  __gmp_c;
-  __GMPN_SUB (__gmp_c, __gmp_wp, __gmp_xp, __gmp_xsize, __gmp_yp, __gmp_ysize);
-  return __gmp_c;
-}
-#endif
-
-#if defined (__GMP_EXTERN_INLINE) || defined (__GMP_FORCE_mpn_sub_1)
-#if ! defined (__GMP_FORCE_mpn_sub_1)
-__GMP_EXTERN_INLINE
-#endif
-mp_limb_t
-mpn_sub_1 (mp_ptr __gmp_dst, mp_srcptr __gmp_src, mp_size_t __gmp_size, mp_limb_t __gmp_n) __GMP_NOTHROW
-{
-  mp_limb_t  __gmp_c;
-  __GMPN_SUB_1 (__gmp_c, __gmp_dst, __gmp_src, __gmp_size, __gmp_n);
-  return __gmp_c;
-}
-#endif
-
-#if defined (__cplusplus)
-}
-#endif
-
-
-/* Allow faster testing for negative, zero, and positive.  */
-#define mpz_sgn(Z) ((Z)->_mp_size < 0 ? -1 : (Z)->_mp_size > 0)
-#define mpf_sgn(F) ((F)->_mp_size < 0 ? -1 : (F)->_mp_size > 0)
-#define mpq_sgn(Q) ((Q)->_mp_num._mp_size < 0 ? -1 : (Q)->_mp_num._mp_size > 0)
-
-/* When using GCC, optimize certain common comparisons.  */
-#if defined (__GNUC__)
-#define mpz_cmp_ui(Z,UI) \
-  (__builtin_constant_p (UI) && (UI) == 0				\
-   ? mpz_sgn (Z) : _mpz_cmp_ui (Z,UI))
-#define mpz_cmp_si(Z,SI) \
-  (__builtin_constant_p (SI) && (SI) == 0 ? mpz_sgn (Z)			\
-   : __builtin_constant_p (SI) && (SI) > 0				\
-    ? _mpz_cmp_ui (Z, __GMP_CAST (unsigned long int, SI))		\
-   : _mpz_cmp_si (Z,SI))
-#define mpq_cmp_ui(Q,NUI,DUI) \
-  (__builtin_constant_p (NUI) && (NUI) == 0				\
-   ? mpq_sgn (Q) : _mpq_cmp_ui (Q,NUI,DUI))
-#define mpq_cmp_si(q,n,d)                       \
-  (__builtin_constant_p ((n) >= 0) && (n) >= 0  \
-   ? mpq_cmp_ui (q, __GMP_CAST (unsigned long, n), d) \
-   : _mpq_cmp_si (q, n, d))
-#else
-#define mpz_cmp_ui(Z,UI) _mpz_cmp_ui (Z,UI)
-#define mpz_cmp_si(Z,UI) _mpz_cmp_si (Z,UI)
-#define mpq_cmp_ui(Q,NUI,DUI) _mpq_cmp_ui (Q,NUI,DUI)
-#define mpq_cmp_si(q,n,d)  _mpq_cmp_si(q,n,d)
-#endif
-
-
-/* Using "&" rather than "&&" means these can come out branch-free.  Every
-   mpz_t has at least one limb allocated, so fetching the low limb is always
-   allowed.  */
-#define mpz_odd_p(z)   (((z)->_mp_size != 0) & __GMP_CAST (int, (z)->_mp_d[0]))
-#define mpz_even_p(z)  (! mpz_odd_p (z))
-
-
-/**************** C++ routines ****************/
-
-#ifdef __cplusplus
-__GMP_DECLSPEC_XX std::ostream& operator<< (std::ostream &, mpz_srcptr);
-__GMP_DECLSPEC_XX std::ostream& operator<< (std::ostream &, mpq_srcptr);
-__GMP_DECLSPEC_XX std::ostream& operator<< (std::ostream &, mpf_srcptr);
-__GMP_DECLSPEC_XX std::istream& operator>> (std::istream &, mpz_ptr);
-__GMP_DECLSPEC_XX std::istream& operator>> (std::istream &, mpq_ptr);
-__GMP_DECLSPEC_XX std::istream& operator>> (std::istream &, mpf_ptr);
-#endif
-
-/* Source-level compatibility with GMP 1.  */
-#define mpz_mdiv    mpz_fdiv_q
-#define mpz_mdivmod mpz_fdiv_qr
-#define mpz_mmod    mpz_fdiv_r
-#define mpz_mdiv_ui mpz_fdiv_q_ui
-#define mpz_mdivmod_ui(q,r,n,d) \
-  (((r) == 0) ? mpz_fdiv_q_ui (q,n,d) : mpz_fdiv_qr_ui (q,r,n,d))
-#define mpz_mmod_ui(r,n,d) \
-  (((r) == 0) ? mpz_fdiv_ui (n,d) : mpz_fdiv_r_ui (r,n,d))
-
-#define gmp_randinit(x,y,z)  gmp_randinit_lc_2exp_size(x,z)
-
-typedef __mpz_struct MP_INT;    /* gmp 1 source compatibility */
-typedef __mpq_struct MP_RAT;    /* gmp 1 source compatibility */
-
-#define mpz_div		    mpz_fdiv_q
-#define mpz_divmod	    mpz_fdiv_qr
-#define mpz_div_ui	    mpz_fdiv_q_ui
-#define mpz_divmod_ui	mpz_fdiv_qr_ui
-#define mpz_div_2exp	mpz_fdiv_q_2exp
-#define mpz_mod_2exp	mpz_fdiv_r_2exp
-
-enum
-{
-  GMP_ERROR_NONE = 0,
-  GMP_ERROR_UNSUPPORTED_ARGUMENT = 1,
-  GMP_ERROR_DIVISION_BY_ZERO = 2,
-  GMP_ERROR_SQRT_OF_NEGATIVE = 4,
-  GMP_ERROR_INVALID_ARGUMENT = 8
-};
-
-/* Major version number is the value of __GNU_MP__ too, above and in mp.h. */
-#define __GNU_MP_VERSION 5 
-#define __GNU_MP_VERSION_MINOR 0 
-#define __GNU_MP_VERSION_PATCHLEVEL 2
-#define GMP_VERSION "5.0.2"
-
-#define __MPIR_VERSION 2
-#define __MPIR_VERSION_MINOR 4
-#define __MPIR_VERSION_PATCHLEVEL 0
-#if defined( _MSC_VER )
-#define _MSC_MPIR_VERSION "2.4.0"
-#endif
-
-/* These are for programs like MPFR to use the same CC and CFLAGS as MPIR */
-
-#if ! defined (__GMP_WITHIN_CONFIGURE)
-@GMP_CC@
-@GMP_CFLAGS@
-#define __MPIR_CC "@CC@"
-#define __MPIR_CFLAGS "@CFLAGS@"
-#endif
-
-#define __GMP_H__
-#endif /* __GMP_H__ */
diff --git a/patches/gmp-h.in.diff b/patches/gmp-h.in.diff
deleted file mode 100644
--- a/patches/gmp-h.in.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../src/gmp-h.in	2010-06-24 03:35:47.000000000 -0700
-+++ gmp-h.in	2010-08-16 22:04:40.000000000 -0700
-@@ -22,6 +22,11 @@
- 
- #ifndef __GMP_H__
- 
-+#ifdef __SUNPRO_CC    /* See: http://trac.sagemath.org/sage_trac/ticket/7849 */
-+#include <stddef.h>   /* This is Bill Hart's fix, but I've applied it only */
-+#include <stdarg.h>   /* on Sun Studio */
-+#endif 
-+
- #if defined (__cplusplus)
- #include <iosfwd>   /* for std::istream, std::ostream, std::string */
- #include <cstdio>
diff --git a/patches/gmp-h.in.patch b/patches/gmp-h.in.patch
new file mode 100644
--- /dev/null
+++ b/patches/gmp-h.in.patch
@@ -0,0 +1,15 @@
+diff -ru src/gmp-h.in src.patched/gmp-h.in
+--- src/gmp-h.in	2011-06-14 07:33:49.000000000 +0200
++++ src.patched/gmp-h.in	2012-04-07 14:32:53.758280009 +0200
+@@ -22,6 +22,11 @@
+ 
+ #ifndef __GMP_H__
+ 
++#ifdef __SUNPRO_CC    /* See: http://trac.sagemath.org/sage_trac/ticket/7849 */
++#include <stddef.h>   /* This is Bill Hart's fix, but I've applied it only */
++#include <stdarg.h>   /* on Sun Studio */
++#endif 
++
+ #if defined (__cplusplus)
+ #include <iosfwd>   /* for std::istream, std::ostream, std::string */
+ #include <cstdio>
diff --git a/patches/quote_asm.patch b/patches/quote_asm.patch
new file mode 100644
--- /dev/null
+++ b/patches/quote_asm.patch
@@ -0,0 +1,888 @@
+diff -ru src/mpn/alpha/addlsh1_n.asm src.patched/mpn/alpha/addlsh1_n.asm
+--- src/mpn/alpha/addlsh1_n.asm	2010-12-31 08:26:24.000000000 +0100
++++ src.patched/mpn/alpha/addlsh1_n.asm	2012-04-07 14:27:57.058280100 +0200
+@@ -54,7 +54,7 @@
+ define(`ps', `r25')
+ define(`sl', `r28')
+ 
+-define(OPERATION_addlsh1_n,1)
++define(`OPERATION_addlsh1_n',1)
+ 
+ ifdef(`OPERATION_addlsh1_n',`
+   define(ADDSUB,       addq)
+diff -ru src/mpn/alpha/sublsh1_n.asm src.patched/mpn/alpha/sublsh1_n.asm
+--- src/mpn/alpha/sublsh1_n.asm	2010-12-31 08:26:10.000000000 +0100
++++ src.patched/mpn/alpha/sublsh1_n.asm	2012-04-07 14:27:57.048279798 +0200
+@@ -54,7 +54,7 @@
+ define(`ps', `r25')
+ define(`sl', `r28')
+ 
+-define(OPERATION_sublsh1_n,1)
++define(`OPERATION_sublsh1_n',1)
+ 
+ ifdef(`OPERATION_addlsh1_n',`
+   define(ADDSUB,       addq)
+diff -ru src/mpn/ia64/add_n.asm src.patched/mpn/ia64/add_n.asm
+--- src/mpn/ia64/add_n.asm	2010-12-31 08:21:21.000000000 +0100
++++ src.patched/mpn/ia64/add_n.asm	2012-04-07 14:27:57.628279922 +0200
+@@ -33,7 +33,7 @@
+ define(`vp',`r34')
+ define(`n',`r35')
+ 
+-define(OPERATION_add_n,1)
++define(`OPERATION_add_n',1)
+ 
+ ifdef(`OPERATION_add_n',`
+   define(ADDSUB,	add)
+diff -ru src/mpn/ia64/addlsh1_n.asm src.patched/mpn/ia64/addlsh1_n.asm
+--- src/mpn/ia64/addlsh1_n.asm	2010-12-31 08:25:53.000000000 +0100
++++ src.patched/mpn/ia64/addlsh1_n.asm	2012-04-07 14:27:57.668283269 +0200
+@@ -32,7 +32,7 @@
+ define(`vp',`r34')
+ define(`n',`r35')
+ 
+-define(OPERATION_addlsh1_n,1)
++define(`OPERATION_addlsh1_n',1)
+ 
+ ifdef(`OPERATION_addlsh1_n',`
+   define(ADDSUB,       add)
+diff -ru src/mpn/ia64/and_n.asm src.patched/mpn/ia64/and_n.asm
+--- src/mpn/ia64/and_n.asm	2010-12-31 08:11:37.000000000 +0100
++++ src.patched/mpn/ia64/and_n.asm	2012-04-07 14:27:57.678272121 +0200
+@@ -34,7 +34,7 @@
+ define(`vp', `r34')
+ define(`n', `r35')
+ 
+-define(OPERATION_and_n,1)
++define(`OPERATION_and_n',1)
+ 
+ ifdef(`OPERATION_and_n',
+ `	define(`func',`mpn_and_n')
+diff -ru src/mpn/ia64/andn_n.asm src.patched/mpn/ia64/andn_n.asm
+--- src/mpn/ia64/andn_n.asm	2010-12-31 08:11:10.000000000 +0100
++++ src.patched/mpn/ia64/andn_n.asm	2012-04-07 14:27:57.468269051 +0200
+@@ -34,7 +34,7 @@
+ define(`vp', `r34')
+ define(`n', `r35')
+ 
+-define(OPERATION_andn_n,1)
++define(`OPERATION_andn_n',1)
+ 
+ ifdef(`OPERATION_and_n',
+ `	define(`func',`mpn_and_n')
+diff -ru src/mpn/ia64/ior_n.asm src.patched/mpn/ia64/ior_n.asm
+--- src/mpn/ia64/ior_n.asm	2010-12-31 08:12:01.000000000 +0100
++++ src.patched/mpn/ia64/ior_n.asm	2012-04-07 14:27:57.448269684 +0200
+@@ -34,7 +34,7 @@
+ define(`vp', `r34')
+ define(`n', `r35')
+ 
+-define(OPERATION_ior_n,1)
++define(`OPERATION_ior_n',1)
+ 
+ ifdef(`OPERATION_and_n',
+ `	define(`func',`mpn_and_n')
+diff -ru src/mpn/ia64/iorn_n.asm src.patched/mpn/ia64/iorn_n.asm
+--- src/mpn/ia64/iorn_n.asm	2010-12-31 08:12:11.000000000 +0100
++++ src.patched/mpn/ia64/iorn_n.asm	2012-04-07 14:27:57.658279932 +0200
+@@ -34,7 +34,7 @@
+ define(`vp', `r34')
+ define(`n', `r35')
+ 
+-define(OPERATION_iorn_n,1)
++define(`OPERATION_iorn_n',1)
+ 
+ ifdef(`OPERATION_and_n',
+ `	define(`func',`mpn_and_n')
+diff -ru src/mpn/ia64/lshift.asm src.patched/mpn/ia64/lshift.asm
+--- src/mpn/ia64/lshift.asm	2010-12-31 08:26:45.000000000 +0100
++++ src.patched/mpn/ia64/lshift.asm	2012-04-07 14:27:57.618271813 +0200
+@@ -39,7 +39,7 @@
+ 
+ define(`tnc',`r9')
+ 
+-define(OPERATION_lshift,1)
++define(`OPERATION_lshift',1)
+ 
+ ifdef(`OPERATION_lshift',`
+ 	define(`FSH',`shl')
+diff -ru src/mpn/ia64/nand_n.asm src.patched/mpn/ia64/nand_n.asm
+--- src/mpn/ia64/nand_n.asm	2010-12-31 08:11:26.000000000 +0100
++++ src.patched/mpn/ia64/nand_n.asm	2012-04-07 14:27:57.488270124 +0200
+@@ -34,7 +34,7 @@
+ define(`vp', `r34')
+ define(`n', `r35')
+ 
+-define(OPERATION_nand_n,1)
++define(`OPERATION_nand_n',1)
+ 
+ ifdef(`OPERATION_and_n',
+ `	define(`func',`mpn_and_n')
+diff -ru src/mpn/ia64/nior_n.asm src.patched/mpn/ia64/nior_n.asm
+--- src/mpn/ia64/nior_n.asm	2010-12-31 08:12:21.000000000 +0100
++++ src.patched/mpn/ia64/nior_n.asm	2012-04-07 14:27:57.548279945 +0200
+@@ -34,7 +34,7 @@
+ define(`vp', `r34')
+ define(`n', `r35')
+ 
+-define(OPERATION_nior_n,1)
++define(`OPERATION_nior_n',1)
+ 
+ ifdef(`OPERATION_and_n',
+ `	define(`func',`mpn_and_n')
+diff -ru src/mpn/ia64/rsh1add_n.asm src.patched/mpn/ia64/rsh1add_n.asm
+--- src/mpn/ia64/rsh1add_n.asm	2010-12-31 08:24:25.000000000 +0100
++++ src.patched/mpn/ia64/rsh1add_n.asm	2012-04-07 14:27:57.538280044 +0200
+@@ -33,7 +33,7 @@
+ define(`vp',`r34')
+ define(`n',`r35')
+ 
+-define(OPERATION_rsh1add_n,1)
++define(`OPERATION_rsh1add_n',1)
+ 
+ ifdef(`OPERATION_rsh1add_n',`
+   define(ADDSUB,       add)
+diff -ru src/mpn/ia64/rsh1sub_n.asm src.patched/mpn/ia64/rsh1sub_n.asm
+--- src/mpn/ia64/rsh1sub_n.asm	2010-12-31 08:24:36.000000000 +0100
++++ src.patched/mpn/ia64/rsh1sub_n.asm	2012-04-07 14:27:57.508269882 +0200
+@@ -33,7 +33,7 @@
+ define(`vp',`r34')
+ define(`n',`r35')
+ 
+-define(OPERATION_rsh1sub_n,1)
++define(`OPERATION_rsh1sub_n',1)
+ 
+ ifdef(`OPERATION_rsh1add_n',`
+   define(ADDSUB,       add)
+diff -ru src/mpn/ia64/rshift.asm src.patched/mpn/ia64/rshift.asm
+--- src/mpn/ia64/rshift.asm	2010-12-31 08:26:55.000000000 +0100
++++ src.patched/mpn/ia64/rshift.asm	2012-04-07 14:27:57.628279922 +0200
+@@ -39,7 +39,7 @@
+ 
+ define(`tnc',`r9')
+ 
+-define(OPERATION_rshift,1)
++define(`OPERATION_rshift',1)
+ 
+ ifdef(`OPERATION_lshift',`
+ 	define(`FSH',`shl')
+diff -ru src/mpn/ia64/sub_n.asm src.patched/mpn/ia64/sub_n.asm
+--- src/mpn/ia64/sub_n.asm	2010-12-31 08:21:31.000000000 +0100
++++ src.patched/mpn/ia64/sub_n.asm	2012-04-07 14:27:57.518279963 +0200
+@@ -33,7 +33,7 @@
+ define(`vp',`r34')
+ define(`n',`r35')
+ 
+-define(OPERATION_sub_n,1)
++define(`OPERATION_sub_n',1)
+ 
+ ifdef(`OPERATION_add_n',`
+   define(ADDSUB,	add)
+diff -ru src/mpn/ia64/sublsh1_n.asm src.patched/mpn/ia64/sublsh1_n.asm
+--- src/mpn/ia64/sublsh1_n.asm	2010-12-31 08:25:40.000000000 +0100
++++ src.patched/mpn/ia64/sublsh1_n.asm	2012-04-07 14:27:57.638269756 +0200
+@@ -32,7 +32,7 @@
+ define(`vp',`r34')
+ define(`n',`r35')
+ 
+-define(OPERATION_sublsh1_n,1)
++define(`OPERATION_sublsh1_n',1)
+ 
+ ifdef(`OPERATION_addlsh1_n',`
+   define(ADDSUB,       add)
+diff -ru src/mpn/ia64/xnor_n.asm src.patched/mpn/ia64/xnor_n.asm
+--- src/mpn/ia64/xnor_n.asm	2010-12-31 08:12:45.000000000 +0100
++++ src.patched/mpn/ia64/xnor_n.asm	2012-04-07 14:27:57.608279181 +0200
+@@ -34,7 +34,7 @@
+ define(`vp', `r34')
+ define(`n', `r35')
+ 
+-define(OPERATION_xnor_n,1)
++define(`OPERATION_xnor_n',1)
+ 
+ ifdef(`OPERATION_and_n',
+ `	define(`func',`mpn_and_n')
+diff -ru src/mpn/ia64/xor_n.asm src.patched/mpn/ia64/xor_n.asm
+--- src/mpn/ia64/xor_n.asm	2010-12-31 08:12:33.000000000 +0100
++++ src.patched/mpn/ia64/xor_n.asm	2012-04-07 14:27:57.608279181 +0200
+@@ -34,7 +34,7 @@
+ define(`vp', `r34')
+ define(`n', `r35')
+ 
+-define(OPERATION_xor_n,1)
++define(`OPERATION_xor_n',1)
+ 
+ ifdef(`OPERATION_and_n',
+ `	define(`func',`mpn_and_n')
+diff -ru src/mpn/m68k/add_n.asm src.patched/mpn/m68k/add_n.asm
+--- src/mpn/m68k/add_n.asm	2010-12-31 08:23:57.000000000 +0100
++++ src.patched/mpn/m68k/add_n.asm	2012-04-07 14:27:53.028268643 +0200
+@@ -25,7 +25,7 @@
+ C         cycles/limb
+ C 68040:      6
+ 
+-define(OPERATION_add_n,1)
++define(`OPERATION_add_n',1)
+ 
+ ifdef(`OPERATION_add_n',`
+   define(M4_inst,       addxl)
+diff -ru src/mpn/m68k/mc68020/addmul_1.asm src.patched/mpn/m68k/mc68020/addmul_1.asm
+--- src/mpn/m68k/mc68020/addmul_1.asm	2010-12-30 08:34:14.000000000 +0100
++++ src.patched/mpn/m68k/mc68020/addmul_1.asm	2012-04-07 14:27:53.008279908 +0200
+@@ -25,7 +25,7 @@
+ C         cycles/limb
+ C 68040:     25
+ 
+-define(OPERATION_addmul_1,1)
++define(`OPERATION_addmul_1',1)
+ 
+ ifdef(`OPERATION_addmul_1',`
+   define(M4_inst,       addl)
+diff -ru src/mpn/m68k/mc68020/submul_1.asm src.patched/mpn/m68k/mc68020/submul_1.asm
+--- src/mpn/m68k/mc68020/submul_1.asm	2010-12-30 08:34:34.000000000 +0100
++++ src.patched/mpn/m68k/mc68020/submul_1.asm	2012-04-07 14:27:53.008279908 +0200
+@@ -25,7 +25,7 @@
+ C         cycles/limb
+ C 68040:     25
+ 
+-define(OPERATION_submul_1,1)
++define(`OPERATION_submul_1',1)
+ 
+ ifdef(`OPERATION_addmul_1',`
+   define(M4_inst,       addl)
+diff -ru src/mpn/m68k/sub_n.asm src.patched/mpn/m68k/sub_n.asm
+--- src/mpn/m68k/sub_n.asm	2010-12-31 08:24:06.000000000 +0100
++++ src.patched/mpn/m68k/sub_n.asm	2012-04-07 14:27:52.988268768 +0200
+@@ -25,7 +25,7 @@
+ C         cycles/limb
+ C 68040:      6
+ 
+-define(OPERATION_sub_n,1)
++define(`OPERATION_sub_n',1)
+ 
+ ifdef(`OPERATION_add_n',`
+   define(M4_inst,       addxl)
+diff -ru src/mpn/powerpc32/vmx/and_n.asm src.patched/mpn/powerpc32/vmx/and_n.asm
+--- src/mpn/powerpc32/vmx/and_n.asm	2010-12-31 08:16:01.000000000 +0100
++++ src.patched/mpn/powerpc32/vmx/and_n.asm	2012-04-07 14:27:52.968280448 +0200
+@@ -56,7 +56,7 @@
+ define(`vnegb', `')		C default neg-before to null
+ define(`vnega', `')		C default neg-before to null
+ 
+-define(OPERATION_and_n,1)
++define(`OPERATION_and_n',1)
+ 
+ ifdef(`OPERATION_and_n',
+ `	define(`func',	`mpn_and_n')
+diff -ru src/mpn/powerpc32/vmx/andn_n.asm src.patched/mpn/powerpc32/vmx/andn_n.asm
+--- src/mpn/powerpc32/vmx/andn_n.asm	2010-12-31 08:16:13.000000000 +0100
++++ src.patched/mpn/powerpc32/vmx/andn_n.asm	2012-04-07 14:27:52.918280512 +0200
+@@ -56,7 +56,7 @@
+ define(`vnegb', `')		C default neg-before to null
+ define(`vnega', `')		C default neg-before to null
+ 
+-define(OPERATION_andn_n,1)
++define(`OPERATION_andn_n',1)
+ 
+ ifdef(`OPERATION_and_n',
+ `	define(`func',	`mpn_and_n')
+diff -ru src/mpn/powerpc32/vmx/ior_n.asm src.patched/mpn/powerpc32/vmx/ior_n.asm
+--- src/mpn/powerpc32/vmx/ior_n.asm	2010-12-31 08:16:39.000000000 +0100
++++ src.patched/mpn/powerpc32/vmx/ior_n.asm	2012-04-07 14:27:52.918280512 +0200
+@@ -56,7 +56,7 @@
+ define(`vnegb', `')		C default neg-before to null
+ define(`vnega', `')		C default neg-before to null
+ 
+-define(OPERATION_ior_n,1)
++define(`OPERATION_ior_n',1)
+ 
+ ifdef(`OPERATION_and_n',
+ `	define(`func',	`mpn_and_n')
+diff -ru src/mpn/powerpc32/vmx/iorn_n.asm src.patched/mpn/powerpc32/vmx/iorn_n.asm
+--- src/mpn/powerpc32/vmx/iorn_n.asm	2010-12-31 08:16:51.000000000 +0100
++++ src.patched/mpn/powerpc32/vmx/iorn_n.asm	2012-04-07 14:27:52.968280448 +0200
+@@ -56,7 +56,7 @@
+ define(`vnegb', `')		C default neg-before to null
+ define(`vnega', `')		C default neg-before to null
+ 
+-define(OPERATION_iorn_n,1)
++define(`OPERATION_iorn_n',1)
+ 
+ ifdef(`OPERATION_and_n',
+ `	define(`func',	`mpn_and_n')
+diff -ru src/mpn/powerpc32/vmx/nand_n.asm src.patched/mpn/powerpc32/vmx/nand_n.asm
+--- src/mpn/powerpc32/vmx/nand_n.asm	2010-12-31 08:16:26.000000000 +0100
++++ src.patched/mpn/powerpc32/vmx/nand_n.asm	2012-04-07 14:27:52.928276559 +0200
+@@ -56,7 +56,7 @@
+ define(`vnegb', `')		C default neg-before to null
+ define(`vnega', `')		C default neg-before to null
+ 
+-define(OPERATION_nand_n,1)
++define(`OPERATION_nand_n',1)
+ 
+ ifdef(`OPERATION_and_n',
+ `	define(`func',	`mpn_and_n')
+diff -ru src/mpn/powerpc32/vmx/nior_n.asm src.patched/mpn/powerpc32/vmx/nior_n.asm
+--- src/mpn/powerpc32/vmx/nior_n.asm	2010-12-31 08:17:04.000000000 +0100
++++ src.patched/mpn/powerpc32/vmx/nior_n.asm	2012-04-07 14:27:52.938268875 +0200
+@@ -56,7 +56,7 @@
+ define(`vnegb', `')		C default neg-before to null
+ define(`vnega', `')		C default neg-before to null
+ 
+-define(OPERATION_nior_n,1)
++define(`OPERATION_nior_n',1)
+ 
+ ifdef(`OPERATION_and_n',
+ `	define(`func',	`mpn_and_n')
+diff -ru src/mpn/powerpc32/vmx/xnor_n.asm src.patched/mpn/powerpc32/vmx/xnor_n.asm
+--- src/mpn/powerpc32/vmx/xnor_n.asm	2010-12-31 08:17:31.000000000 +0100
++++ src.patched/mpn/powerpc32/vmx/xnor_n.asm	2012-04-07 14:27:52.958279999 +0200
+@@ -56,7 +56,7 @@
+ define(`vnegb', `')		C default neg-before to null
+ define(`vnega', `')		C default neg-before to null
+ 
+-define(OPERATION_xnor_n,1)
++define(`OPERATION_xnor_n',1)
+ 
+ ifdef(`OPERATION_and_n',
+ `	define(`func',	`mpn_and_n')
+diff -ru src/mpn/powerpc32/vmx/xor_n.asm src.patched/mpn/powerpc32/vmx/xor_n.asm
+--- src/mpn/powerpc32/vmx/xor_n.asm	2010-12-31 08:17:18.000000000 +0100
++++ src.patched/mpn/powerpc32/vmx/xor_n.asm	2012-04-07 14:27:52.958279999 +0200
+@@ -56,7 +56,7 @@
+ define(`vnegb', `')		C default neg-before to null
+ define(`vnega', `')		C default neg-before to null
+ 
+-define(OPERATION_xor_n,1)
++define(`OPERATION_xor_n',1)
+ 
+ ifdef(`OPERATION_and_n',
+ `	define(`func',	`mpn_and_n')
+diff -ru src/mpn/x86/add_n.asm src.patched/mpn/x86/add_n.asm
+--- src/mpn/x86/add_n.asm	2010-12-31 08:30:17.000000000 +0100
++++ src.patched/mpn/x86/add_n.asm	2012-04-07 14:27:56.118269524 +0200
+@@ -30,7 +30,7 @@
+ C K7:   2.25
+ C P4:   8.75
+ 
+-define(OPERATION_add_n,1)
++define(`OPERATION_add_n',1)
+ 
+ ifdef(`OPERATION_add_n',`
+ 	define(M4_inst,        adcl)
+diff -ru src/mpn/x86/addmul_1.asm src.patched/mpn/x86/addmul_1.asm
+--- src/mpn/x86/addmul_1.asm	2010-12-31 08:21:58.000000000 +0100
++++ src.patched/mpn/x86/addmul_1.asm	2012-04-07 14:27:55.848269439 +0200
+@@ -38,7 +38,7 @@
+ C K7:                            5.25
+ C K8:
+ 
+-define(OPERATION_addmul_1,1)
++define(`OPERATION_addmul_1',1)
+ 
+ ifdef(`OPERATION_addmul_1',`
+       define(M4_inst,        addl)
+diff -ru src/mpn/x86/applenopic/addmul_1.asm src.patched/mpn/x86/applenopic/addmul_1.asm
+--- src/mpn/x86/applenopic/addmul_1.asm	2010-12-31 08:22:55.000000000 +0100
++++ src.patched/mpn/x86/applenopic/addmul_1.asm	2012-04-07 14:27:56.058280957 +0200
+@@ -38,7 +38,7 @@
+ C K7:                            5.25
+ C K8:
+ 
+-define(OPERATION_addmul_1,1)
++define(`OPERATION_addmul_1',1)
+ 
+ ifdef(`OPERATION_addmul_1',`
+       define(M4_inst,        addl)
+diff -ru src/mpn/x86/applenopic/submul_1.asm src.patched/mpn/x86/applenopic/submul_1.asm
+--- src/mpn/x86/applenopic/submul_1.asm	2010-12-31 08:23:06.000000000 +0100
++++ src.patched/mpn/x86/applenopic/submul_1.asm	2012-04-07 14:27:56.028279791 +0200
+@@ -38,7 +38,7 @@
+ C K7:                            5.25
+ C K8:
+ 
+-define(OPERATION_submul_1,1)
++define(`OPERATION_submul_1',1)
+ 
+ ifdef(`OPERATION_addmul_1',`
+       define(M4_inst,        addl)
+diff -ru src/mpn/x86/core2/add_n.asm src.patched/mpn/x86/core2/add_n.asm
+--- src/mpn/x86/core2/add_n.asm	2010-12-31 08:30:57.000000000 +0100
++++ src.patched/mpn/x86/core2/add_n.asm	2012-04-07 14:27:55.428291699 +0200
+@@ -35,7 +35,7 @@
+ 
+ deflit(UNROLL_COUNT, 16)
+ 
+-define(OPERATION_add_n,1)
++define(`OPERATION_add_n',1)
+ 
+ ifdef(`OPERATION_add_n', `
+ 	define(M4_inst,        adcl)
+diff -ru src/mpn/x86/core2/sub_n.asm src.patched/mpn/x86/core2/sub_n.asm
+--- src/mpn/x86/core2/sub_n.asm	2010-12-31 08:31:08.000000000 +0100
++++ src.patched/mpn/x86/core2/sub_n.asm	2012-04-07 14:27:55.368279962 +0200
+@@ -35,7 +35,7 @@
+ 
+ deflit(UNROLL_COUNT, 16)
+ 
+-define(OPERATION_sub_n,1)
++define(`OPERATION_sub_n',1)
+ 
+ ifdef(`OPERATION_add_n', `
+ 	define(M4_inst,        adcl)
+diff -ru src/mpn/x86/k6/add_n.asm src.patched/mpn/x86/k6/add_n.asm
+--- src/mpn/x86/k6/add_n.asm	2010-12-31 08:29:14.000000000 +0100
++++ src.patched/mpn/x86/k6/add_n.asm	2012-04-07 14:27:55.778269241 +0200
+@@ -24,7 +24,7 @@
+ 
+ C K6: normal 3.25 cycles/limb, in-place 2.75 cycles/limb.
+ 
+-define(OPERATION_add_n,1)
++define(`OPERATION_add_n',1)
+ 
+ ifdef(`OPERATION_add_n', `
+ 	define(M4_inst,        adcl)
+diff -ru src/mpn/x86/k6/addmul_1.asm src.patched/mpn/x86/k6/addmul_1.asm
+--- src/mpn/x86/k6/addmul_1.asm	2010-12-31 08:29:47.000000000 +0100
++++ src.patched/mpn/x86/k6/addmul_1.asm	2012-04-07 14:27:55.628279965 +0200
+@@ -52,7 +52,7 @@
+ 
+ deflit(UNROLL_COUNT, 16)
+ 
+-define(OPERATION_addmul_1,1)
++define(`OPERATION_addmul_1',1)
+ 
+ ifdef(`OPERATION_addmul_1', `
+ 	define(M4_inst,        addl)
+diff -ru src/mpn/x86/k6/mmx/and_n.asm src.patched/mpn/x86/k6/mmx/and_n.asm
+--- src/mpn/x86/k6/mmx/and_n.asm	2010-12-31 08:13:39.000000000 +0100
++++ src.patched/mpn/x86/k6/mmx/and_n.asm	2012-04-07 14:27:55.758280292 +0200
+@@ -41,7 +41,7 @@
+ dnl  M4_*_neg_dst means whether to negate the final result before writing
+ dnl  M4_*_neg_src2 means whether to negate the src2 values before using them
+ 
+-define(OPERATION_and_n,1)
++define(`OPERATION_and_n',1)
+ 
+ define(M4_choose_op,
+ m4_assert_numargs(7)
+diff -ru src/mpn/x86/k6/mmx/andn_n.asm src.patched/mpn/x86/k6/mmx/andn_n.asm
+--- src/mpn/x86/k6/mmx/andn_n.asm	2010-12-31 08:13:53.000000000 +0100
++++ src.patched/mpn/x86/k6/mmx/andn_n.asm	2012-04-07 14:27:55.668280102 +0200
+@@ -41,7 +41,7 @@
+ dnl  M4_*_neg_dst means whether to negate the final result before writing
+ dnl  M4_*_neg_src2 means whether to negate the src2 values before using them
+ 
+-define(OPERATION_andn_n,1)
++define(`OPERATION_andn_n',1)
+ 
+ define(M4_choose_op,
+ m4_assert_numargs(7)
+diff -ru src/mpn/x86/k6/mmx/hamdist.asm src.patched/mpn/x86/k6/mmx/hamdist.asm
+--- src/mpn/x86/k6/mmx/hamdist.asm	2010-12-31 08:19:05.000000000 +0100
++++ src.patched/mpn/x86/k6/mmx/hamdist.asm	2012-04-07 14:27:55.698278894 +0200
+@@ -34,7 +34,7 @@
+ C The code here isn't optimal, but it's already a 2x speedup over the plain
+ C integer mpn/generic/popcount.c,hamdist.c.
+ 
+-define(OPERATION_hamdist,1)
++define(`OPERATION_hamdist',1)
+ 
+ ifdef(`OPERATION_popcount',,
+ `ifdef(`OPERATION_hamdist',,
+diff -ru src/mpn/x86/k6/mmx/ior_n.asm src.patched/mpn/x86/k6/mmx/ior_n.asm
+--- src/mpn/x86/k6/mmx/ior_n.asm	2010-12-31 08:14:20.000000000 +0100
++++ src.patched/mpn/x86/k6/mmx/ior_n.asm	2012-04-07 14:27:55.668280102 +0200
+@@ -41,7 +41,7 @@
+ dnl  M4_*_neg_dst means whether to negate the final result before writing
+ dnl  M4_*_neg_src2 means whether to negate the src2 values before using them
+ 
+-define(OPERATION_ior_n,1)
++define(`OPERATION_ior_n',1)
+ 
+ define(M4_choose_op,
+ m4_assert_numargs(7)
+diff -ru src/mpn/x86/k6/mmx/iorn_n.asm src.patched/mpn/x86/k6/mmx/iorn_n.asm
+--- src/mpn/x86/k6/mmx/iorn_n.asm	2010-12-31 08:14:32.000000000 +0100
++++ src.patched/mpn/x86/k6/mmx/iorn_n.asm	2012-04-07 14:27:55.748280101 +0200
+@@ -41,7 +41,7 @@
+ dnl  M4_*_neg_dst means whether to negate the final result before writing
+ dnl  M4_*_neg_src2 means whether to negate the src2 values before using them
+ 
+-define(OPERATION_iorn_n,1)
++define(`OPERATION_iorn_n',1)
+ 
+ define(M4_choose_op,
+ m4_assert_numargs(7)
+diff -ru src/mpn/x86/k6/mmx/nand_n.asm src.patched/mpn/x86/k6/mmx/nand_n.asm
+--- src/mpn/x86/k6/mmx/nand_n.asm	2010-12-31 08:14:07.000000000 +0100
++++ src.patched/mpn/x86/k6/mmx/nand_n.asm	2012-04-07 14:27:55.678270024 +0200
+@@ -41,7 +41,7 @@
+ dnl  M4_*_neg_dst means whether to negate the final result before writing
+ dnl  M4_*_neg_src2 means whether to negate the src2 values before using them
+ 
+-define(OPERATION_nand_n,1)
++define(`OPERATION_nand_n',1)
+ 
+ define(M4_choose_op,
+ m4_assert_numargs(7)
+diff -ru src/mpn/x86/k6/mmx/nior_n.asm src.patched/mpn/x86/k6/mmx/nior_n.asm
+--- src/mpn/x86/k6/mmx/nior_n.asm	2010-12-31 08:14:43.000000000 +0100
++++ src.patched/mpn/x86/k6/mmx/nior_n.asm	2012-04-07 14:27:55.708275203 +0200
+@@ -41,7 +41,7 @@
+ dnl  M4_*_neg_dst means whether to negate the final result before writing
+ dnl  M4_*_neg_src2 means whether to negate the src2 values before using them
+ 
+-define(OPERATION_nior_n,1)
++define(`OPERATION_nior_n',1)
+ 
+ define(M4_choose_op,
+ m4_assert_numargs(7)
+diff -ru src/mpn/x86/k6/mmx/popcount.asm src.patched/mpn/x86/k6/mmx/popcount.asm
+--- src/mpn/x86/k6/mmx/popcount.asm	2010-12-31 08:18:54.000000000 +0100
++++ src.patched/mpn/x86/k6/mmx/popcount.asm	2012-04-07 14:27:55.688279899 +0200
+@@ -34,7 +34,7 @@
+ C The code here isn't optimal, but it's already a 2x speedup over the plain
+ C integer mpn/generic/popcount.c,hamdist.c.
+ 
+-define(OPERATION_popcount,1)
++define(`OPERATION_popcount',1)
+ 
+ ifdef(`OPERATION_popcount',,
+ `ifdef(`OPERATION_hamdist',,
+diff -ru src/mpn/x86/k6/mmx/xnor_n.asm src.patched/mpn/x86/k6/mmx/xnor_n.asm
+--- src/mpn/x86/k6/mmx/xnor_n.asm	2010-12-31 08:15:05.000000000 +0100
++++ src.patched/mpn/x86/k6/mmx/xnor_n.asm	2012-04-07 14:27:55.718279824 +0200
+@@ -41,7 +41,7 @@
+ dnl  M4_*_neg_dst means whether to negate the final result before writing
+ dnl  M4_*_neg_src2 means whether to negate the src2 values before using them
+ 
+-define(OPERATION_xnor_n,1)
++define(`OPERATION_xnor_n',1)
+ 
+ define(M4_choose_op,
+ m4_assert_numargs(7)
+diff -ru src/mpn/x86/k6/mmx/xor_n.asm src.patched/mpn/x86/k6/mmx/xor_n.asm
+--- src/mpn/x86/k6/mmx/xor_n.asm	2010-12-31 08:14:55.000000000 +0100
++++ src.patched/mpn/x86/k6/mmx/xor_n.asm	2012-04-07 14:27:55.728269986 +0200
+@@ -41,7 +41,7 @@
+ dnl  M4_*_neg_dst means whether to negate the final result before writing
+ dnl  M4_*_neg_src2 means whether to negate the src2 values before using them
+ 
+-define(OPERATION_xor_n,1)
++define(`OPERATION_xor_n',1)
+ 
+ define(M4_choose_op,
+ m4_assert_numargs(7)
+diff -ru src/mpn/x86/k6/sub_n.asm src.patched/mpn/x86/k6/sub_n.asm
+--- src/mpn/x86/k6/sub_n.asm	2010-12-31 08:29:24.000000000 +0100
++++ src.patched/mpn/x86/k6/sub_n.asm	2012-04-07 14:27:55.598269852 +0200
+@@ -24,7 +24,7 @@
+ 
+ C K6: normal 3.25 cycles/limb, in-place 2.75 cycles/limb.
+ 
+-define(OPERATION_sub_n,1)
++define(`OPERATION_sub_n',1)
+ 
+ ifdef(`OPERATION_add_n', `
+ 	define(M4_inst,        adcl)
+diff -ru src/mpn/x86/k6/submul_1.asm src.patched/mpn/x86/k6/submul_1.asm
+--- src/mpn/x86/k6/submul_1.asm	2010-12-31 08:29:58.000000000 +0100
++++ src.patched/mpn/x86/k6/submul_1.asm	2012-04-07 14:27:55.608280112 +0200
+@@ -52,7 +52,7 @@
+ 
+ deflit(UNROLL_COUNT, 16)
+ 
+-define(OPERATION_submul_1,1)
++define(`OPERATION_submul_1',1)
+ 
+ ifdef(`OPERATION_addmul_1', `
+ 	define(M4_inst,        addl)
+diff -ru src/mpn/x86/k7/add_n.asm src.patched/mpn/x86/k7/add_n.asm
+--- src/mpn/x86/k7/add_n.asm	2010-12-31 08:27:25.000000000 +0100
++++ src.patched/mpn/x86/k7/add_n.asm	2012-04-07 14:27:56.808269459 +0200
+@@ -35,7 +35,7 @@
+ 
+ deflit(UNROLL_COUNT, 16)
+ 
+-define(OPERATION_add_n,1)
++define(`OPERATION_add_n',1)
+ 
+ ifdef(`OPERATION_add_n', `
+ 	define(M4_inst,        adcl)
+diff -ru src/mpn/x86/k7/addmul_1.asm src.patched/mpn/x86/k7/addmul_1.asm
+--- src/mpn/x86/k7/addmul_1.asm	2010-12-31 08:28:08.000000000 +0100
++++ src.patched/mpn/x86/k7/addmul_1.asm	2012-04-07 14:27:56.698279971 +0200
+@@ -47,7 +47,7 @@
+ 
+ deflit(UNROLL_COUNT, 16)
+ 
+-define(OPERATION_addmul_1,1)
++define(`OPERATION_addmul_1',1)
+ 
+ ifdef(`OPERATION_addmul_1',`
+ 	define(M4_inst,        addl)
+diff -ru src/mpn/x86/k7/mmx/hamdist.asm src.patched/mpn/x86/k7/mmx/hamdist.asm
+--- src/mpn/x86/k7/mmx/hamdist.asm	2010-12-31 08:20:40.000000000 +0100
++++ src.patched/mpn/x86/k7/mmx/hamdist.asm	2012-04-07 14:27:56.728280013 +0200
+@@ -38,7 +38,7 @@
+ C MMX instructions" in the Athlon Optimization Guide, AMD document 22007,
+ C page 158 of rev E (reference in mpn/x86/k7/README).
+ 
+-define(OPERATION_hamdist,1)
++define(`OPERATION_hamdist',1)
+ 
+ ifdef(`OPERATION_popcount',,
+ `ifdef(`OPERATION_hamdist',,
+diff -ru src/mpn/x86/k7/mmx/popcount.asm src.patched/mpn/x86/k7/mmx/popcount.asm
+--- src/mpn/x86/k7/mmx/popcount.asm	2010-12-31 08:20:30.000000000 +0100
++++ src.patched/mpn/x86/k7/mmx/popcount.asm	2012-04-07 14:27:56.728280013 +0200
+@@ -38,7 +38,7 @@
+ C MMX instructions" in the Athlon Optimization Guide, AMD document 22007,
+ C page 158 of rev E (reference in mpn/x86/k7/README).
+ 
+-define(OPERATION_popcount,1)
++define(`OPERATION_popcount',1)
+ 
+ ifdef(`OPERATION_popcount',,
+ `ifdef(`OPERATION_hamdist',,
+diff -ru src/mpn/x86/k7/sub_n.asm src.patched/mpn/x86/k7/sub_n.asm
+--- src/mpn/x86/k7/sub_n.asm	2010-12-31 08:27:37.000000000 +0100
++++ src.patched/mpn/x86/k7/sub_n.asm	2012-04-07 14:27:56.668269259 +0200
+@@ -35,7 +35,7 @@
+ 
+ deflit(UNROLL_COUNT, 16)
+ 
+-define(OPERATION_sub_n,1)
++define(`OPERATION_sub_n',1)
+ 
+ ifdef(`OPERATION_add_n', `
+ 	define(M4_inst,        adcl)
+diff -ru src/mpn/x86/k7/submul_1.asm src.patched/mpn/x86/k7/submul_1.asm
+--- src/mpn/x86/k7/submul_1.asm	2010-12-31 08:28:18.000000000 +0100
++++ src.patched/mpn/x86/k7/submul_1.asm	2012-04-07 14:27:56.678279889 +0200
+@@ -47,7 +47,7 @@
+ 
+ deflit(UNROLL_COUNT, 16)
+ 
+-define(OPERATION_submul_1,1)
++define(`OPERATION_submul_1',1)
+ 
+ ifdef(`OPERATION_addmul_1',`
+ 	define(M4_inst,        addl)
+diff -ru src/mpn/x86/nehalem/hamdist.asm src.patched/mpn/x86/nehalem/hamdist.asm
+--- src/mpn/x86/nehalem/hamdist.asm	2010-12-31 08:20:07.000000000 +0100
++++ src.patched/mpn/x86/nehalem/hamdist.asm	2012-04-07 14:27:55.478269000 +0200
+@@ -38,7 +38,7 @@
+ C might be possible, but 8.5 c/l relying on out-of-order execution is
+ C already quite reasonable.
+ 
+-define(OPERATION_hamdist,1)
++define(`OPERATION_hamdist',1)
+ 
+ ifdef(`OPERATION_popcount',,
+ `ifdef(`OPERATION_hamdist',,
+diff -ru src/mpn/x86/nehalem/popcount.asm src.patched/mpn/x86/nehalem/popcount.asm
+--- src/mpn/x86/nehalem/popcount.asm	2010-12-31 08:19:57.000000000 +0100
++++ src.patched/mpn/x86/nehalem/popcount.asm	2012-04-07 14:27:55.468288235 +0200
+@@ -38,7 +38,7 @@
+ C might be possible, but 8.5 c/l relying on out-of-order execution is
+ C already quite reasonable.
+ 
+-define(OPERATION_popcount,1)
++define(`OPERATION_popcount',1)
+ 
+ ifdef(`OPERATION_popcount',,
+ `ifdef(`OPERATION_hamdist',,
+diff -ru src/mpn/x86/pentium/add_n.asm src.patched/mpn/x86/pentium/add_n.asm
+--- src/mpn/x86/pentium/add_n.asm	2010-12-31 08:32:53.000000000 +0100
++++ src.patched/mpn/x86/pentium/add_n.asm	2012-04-07 14:27:56.318273599 +0200
+@@ -25,7 +25,7 @@
+ 
+ C P5: 2.375 cycles/limb
+ 
+-define(OPERATION_add_n,1)
++define(`OPERATION_add_n',1)
+ 
+ ifdef(`OPERATION_add_n',`
+ 	define(M4_inst,        adcl)
+diff -ru src/mpn/x86/pentium/addmul_1.asm src.patched/mpn/x86/pentium/addmul_1.asm
+--- src/mpn/x86/pentium/addmul_1.asm	2010-12-31 08:33:16.000000000 +0100
++++ src.patched/mpn/x86/pentium/addmul_1.asm	2012-04-07 14:27:56.238269339 +0200
+@@ -25,7 +25,7 @@
+ 
+ C P5: 14.0 cycles/limb
+ 
+-define(OPERATION_addmul_1,1)
++define(`OPERATION_addmul_1',1)
+ 
+ ifdef(`OPERATION_addmul_1', `
+       define(M4_inst,        addl)
+diff -ru src/mpn/x86/pentium/and_n.asm src.patched/mpn/x86/pentium/and_n.asm
+--- src/mpn/x86/pentium/and_n.asm	2010-12-31 07:06:04.000000000 +0100
++++ src.patched/mpn/x86/pentium/and_n.asm	2012-04-07 14:27:56.348273028 +0200
+@@ -25,7 +25,7 @@
+ C P5: 3.0 c/l  and, ior, xor
+ C     3.5 c/l  andn, iorn, nand, nior, xnor
+ 
+-define(OPERATION_and_n,1)
++define(`OPERATION_and_n',1)
+ 
+ define(M4_choose_op,
+ `ifdef(`OPERATION_$1',`
+diff -ru src/mpn/x86/pentium/andn_n.asm src.patched/mpn/x86/pentium/andn_n.asm
+--- src/mpn/x86/pentium/andn_n.asm	2010-12-31 07:08:32.000000000 +0100
++++ src.patched/mpn/x86/pentium/andn_n.asm	2012-04-07 14:27:56.148279866 +0200
+@@ -25,7 +25,7 @@
+ C P5: 3.0 c/l  and, ior, xor
+ C     3.5 c/l  andn, iorn, nand, nior, xnor
+ 
+-define(OPERATION_andn_n,1)
++define(`OPERATION_andn_n',1)
+ 
+ define(M4_choose_op,
+ `ifdef(`OPERATION_$1',`
+diff -ru src/mpn/x86/pentium/ior_n.asm src.patched/mpn/x86/pentium/ior_n.asm
+--- src/mpn/x86/pentium/ior_n.asm	2010-12-31 07:00:34.000000000 +0100
++++ src.patched/mpn/x86/pentium/ior_n.asm	2012-04-07 14:27:56.128280857 +0200
+@@ -25,7 +25,7 @@
+ C P5: 3.0 c/l  and, ior, xor
+ C     3.5 c/l  andn, iorn, nand, nior, xnor
+ 
+-define(OPERATION_ior_n,1)
++define(`OPERATION_ior_n',1)
+ 
+ define(M4_choose_op,
+ `ifdef(`OPERATION_$1',`
+diff -ru src/mpn/x86/pentium/iorn_n.asm src.patched/mpn/x86/pentium/iorn_n.asm
+--- src/mpn/x86/pentium/iorn_n.asm	2010-12-31 07:01:04.000000000 +0100
++++ src.patched/mpn/x86/pentium/iorn_n.asm	2012-04-07 14:27:56.338280957 +0200
+@@ -25,7 +25,7 @@
+ C P5: 3.0 c/l  and, ior, xor
+ C     3.5 c/l  andn, iorn, nand, nior, xnor
+ 
+-define(OPERATION_iorn_n,1)
++define(`OPERATION_iorn_n',1)
+ 
+ define(M4_choose_op,
+ `ifdef(`OPERATION_$1',`
+diff -ru src/mpn/x86/pentium/nand_n.asm src.patched/mpn/x86/pentium/nand_n.asm
+--- src/mpn/x86/pentium/nand_n.asm	2010-12-31 07:08:55.000000000 +0100
++++ src.patched/mpn/x86/pentium/nand_n.asm	2012-04-07 14:27:56.158270225 +0200
+@@ -25,7 +25,7 @@
+ C P5: 3.0 c/l  and, ior, xor
+ C     3.5 c/l  andn, iorn, nand, nior, xnor
+ 
+-define(OPERATION_nand_n,1)
++define(`OPERATION_nand_n',1)
+ 
+ define(M4_choose_op,
+ `ifdef(`OPERATION_$1',`
+diff -ru src/mpn/x86/pentium/nior_n.asm src.patched/mpn/x86/pentium/nior_n.asm
+--- src/mpn/x86/pentium/nior_n.asm	2010-12-31 07:01:31.000000000 +0100
++++ src.patched/mpn/x86/pentium/nior_n.asm	2012-04-07 14:27:56.188269997 +0200
+@@ -25,7 +25,7 @@
+ C P5: 3.0 c/l  and, ior, xor
+ C     3.5 c/l  andn, iorn, nand, nior, xnor
+ 
+-define(OPERATION_nior_n,1)
++define(`OPERATION_nior_n',1)
+ 
+ define(M4_choose_op,
+ `ifdef(`OPERATION_$1',`
+diff -ru src/mpn/x86/pentium/sub_n.asm src.patched/mpn/x86/pentium/sub_n.asm
+--- src/mpn/x86/pentium/sub_n.asm	2010-12-31 08:33:04.000000000 +0100
++++ src.patched/mpn/x86/pentium/sub_n.asm	2012-04-07 14:27:56.178269643 +0200
+@@ -25,7 +25,7 @@
+ 
+ C P5: 2.375 cycles/limb
+ 
+-define(OPERATION_sub_n,1)
++define(`OPERATION_sub_n',1)
+ 
+ ifdef(`OPERATION_add_n',`
+ 	define(M4_inst,        adcl)
+diff -ru src/mpn/x86/pentium/submul_1.asm src.patched/mpn/x86/pentium/submul_1.asm
+--- src/mpn/x86/pentium/submul_1.asm	2010-12-31 08:33:30.000000000 +0100
++++ src.patched/mpn/x86/pentium/submul_1.asm	2012-04-07 14:27:56.198268327 +0200
+@@ -25,7 +25,7 @@
+ 
+ C P5: 14.0 cycles/limb
+ 
+-define(OPERATION_submul_1,1)
++define(`OPERATION_submul_1',1)
+ 
+ ifdef(`OPERATION_addmul_1', `
+       define(M4_inst,        addl)
+diff -ru src/mpn/x86/pentium/xnor_n.asm src.patched/mpn/x86/pentium/xnor_n.asm
+--- src/mpn/x86/pentium/xnor_n.asm	2010-12-31 07:09:38.000000000 +0100
++++ src.patched/mpn/x86/pentium/xnor_n.asm	2012-04-07 14:27:56.258279761 +0200
+@@ -25,7 +25,7 @@
+ C P5: 3.0 c/l  and, ior, xor
+ C     3.5 c/l  andn, iorn, nand, nior, xnor
+ 
+-define(OPERATION_xnor_n,1)
++define(`OPERATION_xnor_n',1)
+ 
+ define(M4_choose_op,
+ `ifdef(`OPERATION_$1',`
+diff -ru src/mpn/x86/pentium/xor_n.asm src.patched/mpn/x86/pentium/xor_n.asm
+--- src/mpn/x86/pentium/xor_n.asm	2010-12-31 07:09:16.000000000 +0100
++++ src.patched/mpn/x86/pentium/xor_n.asm	2012-04-07 14:27:56.268279961 +0200
+@@ -25,7 +25,7 @@
+ C P5: 3.0 c/l  and, ior, xor
+ C     3.5 c/l  andn, iorn, nand, nior, xnor
+ 
+-define(OPERATION_xor_n,1)
++define(`OPERATION_xor_n',1)
+ 
+ define(M4_choose_op,
+ `ifdef(`OPERATION_$1',`
+diff -ru src/mpn/x86/pentium4/mmx/hamdist.asm src.patched/mpn/x86/pentium4/mmx/hamdist.asm
+--- src/mpn/x86/pentium4/mmx/hamdist.asm	2010-12-31 08:19:38.000000000 +0100
++++ src.patched/mpn/x86/pentium4/mmx/hamdist.asm	2012-04-07 14:27:56.508279960 +0200
+@@ -38,7 +38,7 @@
+ C might be possible, but 8.5 c/l relying on out-of-order execution is
+ C already quite reasonable.
+ 
+-define(OPERATION_hamdist,1)
++define(`OPERATION_hamdist',1)
+ 
+ ifdef(`OPERATION_popcount',,
+ `ifdef(`OPERATION_hamdist',,
+diff -ru src/mpn/x86/pentium4/mmx/popcount.asm src.patched/mpn/x86/pentium4/mmx/popcount.asm
+--- src/mpn/x86/pentium4/mmx/popcount.asm	2010-12-31 08:19:29.000000000 +0100
++++ src.patched/mpn/x86/pentium4/mmx/popcount.asm	2012-04-07 14:27:56.498279890 +0200
+@@ -38,7 +38,7 @@
+ C might be possible, but 8.5 c/l relying on out-of-order execution is
+ C already quite reasonable.
+ 
+-define(OPERATION_popcount,1)
++define(`OPERATION_popcount',1)
+ 
+ ifdef(`OPERATION_popcount',,
+ `ifdef(`OPERATION_hamdist',,
+diff -ru src/mpn/x86/sub_n.asm src.patched/mpn/x86/sub_n.asm
+--- src/mpn/x86/sub_n.asm	2010-12-31 08:30:28.000000000 +0100
++++ src.patched/mpn/x86/sub_n.asm	2012-04-07 14:27:55.438279940 +0200
+@@ -30,7 +30,7 @@
+ C K7:   2.25
+ C P4:   8.75
+ 
+-define(OPERATION_sub_n,1)
++define(`OPERATION_sub_n',1)
+ 
+ ifdef(`OPERATION_add_n',`
+ 	define(M4_inst,        adcl)
+diff -ru src/mpn/x86/submul_1.asm src.patched/mpn/x86/submul_1.asm
+--- src/mpn/x86/submul_1.asm	2010-12-31 08:21:49.000000000 +0100
++++ src.patched/mpn/x86/submul_1.asm	2012-04-07 14:27:55.808285202 +0200
+@@ -38,7 +38,7 @@
+ C K7:                            5.25
+ C K8:
+ 
+-define(OPERATION_submul_1,1)
++define(`OPERATION_submul_1',1)
+ 
+ ifdef(`OPERATION_addmul_1',`
+       define(M4_inst,        addl)
diff --git a/spkg-install b/spkg-install
--- a/spkg-install
+++ b/spkg-install
@@ -1,10 +1,5 @@
 #!/usr/bin/env bash
 
-###############################################################################
-# IMPORTANT: WHEN EDITING THIS FILE, MAKE SURE YOUR EDITOR DOES NOT REPLACE
-#            TABS BY SPACES.
-###############################################################################
-
 if [ -z "$SAGE_LOCAL" ]; then
     echo >&2 "Error: SAGE_LOCAL undefined - exiting..."
     echo >&2 "Maybe run 'sage -sh'?"
@@ -19,22 +14,7 @@
 # Apply patches (if any):
 ###############################################################################
 
-# Add a patch which allows MPIR to build with Sun Studio:
-# (This only adds some includes if __SUNPRO_CC is defined, so is a completely
-# harmless change that doesn't depend on the actual compiler used.)
-if [ "$UNAME" = SunOS ]; then
-    # TODO: Use 'patch' instead of copying over a patched version, which
-    #       has to be refreshed on each new release, since gmp-h.in also
-    #       contains the full version number.
-    echo "Copying a version of gmp-h.in which is patched for Sun Studio..."
-    cp ../patches/gmp-h.in . # We are in src/.
-    if [ $? -ne 0 ]; then
-        echo >&2 "Error: Failed to patch MPIR for Sun Studio."
-        exit 1
-    fi
-fi
-
-echo "Applying further patches (if any) to upstream sources..."
+echo "Applying patches to upstream sources..."
 for patch in ../patches/*.patch; do
     patch -p1 <"$patch"
     if [ $? -ne 0 ]; then
@@ -78,45 +58,6 @@
     cd "$saved"
 }
 
-get_upstream_selected_cflags() # Get MPIR's choice on empty CFLAGS (or system GMP's).
-{
-    # Internal sanity check:
-    if [ $# -ne 1 ]; then
-        echo >&2 "Error: get_upstream_selected_cflags() requires 'file' parameter."
-        exit 1
-    fi
-    header_file=$1
-    if ! [ -f "$header_file" ]; then
-        upstream_cc=""
-        upstream_cflags=""
-        return 1
-    fi
-    # The following patterns only extract the contents of (double-quoted) strings:
-    gmp_cc_pat='/^[ 	]*#[ 	]*define[ 	]\{1,\}__GMP_CC[ 	]\{1,\}/s/.*"\([^"]*\)"/\1/p'
-    gmp_cflags_pat='/^[ 	]*#[ 	]*define[ 	]\{1,\}__GMP_CFLAGS[ 	]\{1,\}/s/.*"\([^"]*\)"/\1/p'
-    # Extract preprocessor definitions of __GMP_CC and __GMP_CFLAGS:
-    upstream_cc=`sed -n -e "$gmp_cc_pat" "$header_file"`
-    upstream_cflags=`sed -n -e "$gmp_cflags_pat" "$header_file"`
-    # At least /some/ newer versions of MPIR define __GMP_CC and __GMP_CFLAGS
-    # (also in gmp.h! -- how compatible is that?) to (literally) __MPIR_CC and
-    # __MPIR_CFLAGS, respectively, i.e., to preprocessor variables, so we might
-    # have to get the real strings from their definitions:
-    # (Since we currently only match string literals above, both variables would
-    # be empty in that case, and not contain the names of preprocessor variables.
-    # We could change the patterns to actually match any definition / "value".) 
-    case "$upstream_cc" in __MPIR_CC|"")
-        upstream_cc=`sed -n -e "${gmp_cc_pat/GMP/MPIR}" "$header_file"`
-    esac
-    case "$upstream_cflags" in __MPIR_CFLAGS|"")
-        upstream_cflags=`sed -n -e "${gmp_cflags_pat/GMP/MPIR}" "$header_file"`
-    esac
-    # Upstream-selected CFLAGS may be empty, CC shouldn't:
-    if [ -z "$upstream_cc" ]; then
-        return 1
-    fi
-    return 0
-}
-
 get_processor_specific_cflags() # Extract some processor-specific CFLAGS.
 {
     # Internal sanity check:
@@ -124,54 +65,21 @@
         echo >&2 "Error: get_processor_specific_cflags() requires 'CFLAGS' parameter."
         exit 1
     fi
-    flags=$@
+    flags=$*
     arch_flags=""
     for opt in $flags; do
         case $opt in
-            -march=*|-mcpu=*|-mtune=*)
+            -march=*|-mcpu=*|-mtune=*|-mpower*|-mno-power*)
                 arch_flags="$arch_flags $opt"
                 ;;
             # We could add further '-m' or '-f' options here, but note that
             # this function is also used to determine if the user specified
             # some, which we don't want to override.
-            # AFAIK, MPIR currently uses / defines at most '-m{arch,cpu,tune}',
-            # not more specific / additional ones like e.g. '-mavx' or '-mvsx'.
-            # (-leif, 04/2012)
         esac
     done
     echo $arch_flags
 }
 
-native_build_cflags_if_supported() # Give option for a native build if supported.
-{
-    # Some GCC 4.0.x versions don't support '-march=native', and it's currently
-    # not supported on all platforms supported by Sage.
-    # (Compilers other than 'gcc' might support it as well, in which case the
-    # following also works. Other flavours could be added, too.)
-    if touch foo.c && $CC -march=native -c foo.c &>/dev/null; then
-        # Ok, the compiler (presumably GCC) understands '-march=native', which
-        # doesn't yet mean the *assembler* will know the fancy instructions
-        # the compiler emits with that option.
-        # For example, Apple's assembler on Mac OS X 10.7.1 apparently doesn't
-        # yet support AVX, which could also cause MPIR's 'configure' to fail.
-        cat >foo.c <<-"EOF"
-		double d;
-		unsigned long fancy_insns() { return (unsigned long) d; }
-		int main () { return 0; }
-	EOF
-        if $CC -march=native -o foo foo.c &>/dev/null && ./foo >/dev/null; then
-            echo "-march=native"
-        else
-            echo >&2 "Warning: Your assembler apparently doesn't understand the instructions"
-            echo >&2 "         your compiler ($CC) generates with '-march=native'."
-            echo >&2 "         You might also try to compile MPIR with (e.g.)"
-            echo >&2 "             CFLAGS=\"-march=native -mno-avx\""
-            echo >&2 "         to disable specific instruction set extension (in this case, AVX)."
-        fi
-    fi
-    rm -f foo foo.* >/dev/null
-}
-
 ###############################################################################
 # Set up environment variables:
 ###############################################################################
@@ -179,13 +87,12 @@
 # The Yasm build uses PYTHON from the environment to find the Python interpreter,
 # so unset it in case it apparently contains nothing useful (like it did in Sage
 # versions prior to 5.0.beta10; cf. #10492), to not break Yasm's 'configure':
-if ! $PYTHON --version &>/dev/null; then
-    # Only issue a warning if it was really non-empty, to not confuse users:
-    if [ -n "$PYTHON" ]; then
+if [ -n "$PYTHON" ]; then
+    if ! $PYTHON --version &>/dev/null; then
         echo >&2 "Warning: Unsetting PYTHON (=\"$PYTHON\"), since it doesn't seem"
         echo >&2 "         to contain the name of / path to a Python interpreter."
+        unset PYTHON
     fi
-    unset PYTHON
 fi
 
 user_cflags=$CFLAGS # Save them. 'sage-env' sets CC, but not CFLAGS.
@@ -317,19 +224,6 @@
             fi
             rm -f foo foo.c
         fi
-
-        # Work around a bug in GCC 4.7.0 which breaks the build on Itanium CPUs:
-        # (Cf. #12765, #12751, and bug URL below.)
-        case "`uname -m`-`$CC -dumpversion 2>/dev/null`" in ia64-4.7.*)
-            # It's quite unlikely we match other compilers than GCC (e.g. clang) here.
-            required_cflags="$required_cflags -O0 -finline-functions -fschedule-insns"
-            echo >&2 "Warning: Disabling almost all optimization due to a bug in (at least)"
-            echo >&2 "         GCC 4.7.0 on Itanium, which otherwise would break the build."
-            echo >&2 "         See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48496"
-            echo >&2 "         for current status and further details."
-            echo >&2 "         (And please report to e.g. sage-devel in case you feel this bug"
-            echo >&2 "          should already be fixed in GCC `$CC -dumpversion`.)"
-        esac
         ;; # Linux
     CYGWIN)
         # Nothing special performed (yet).
@@ -339,11 +233,22 @@
             "by this MPIR spkg, i.e., by Sage's part of it."
 esac
 
-export ABI CFLAGS CXXFLAGS # Partially redundant, but safe(r).
+# Work around a bug in GCC 4.7.0 which breaks the build on Itanium CPUs:
+# See #12765, #12751, and http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48496
+if [ "`uname -m`" = ia64 ] && [ "`testcc.sh $CC`" = GCC ] ; then
+    if $CC -dumpversion | grep >/dev/null '^4\.7\.' ; then
+        required_cflags="$required_cflags -O0 -finline-functions -fschedule-insns"
+        echo >&2 "Warning: Disabling almost all optimization due to a bug in (at least)"
+        echo >&2 "         GCC 4.7.0 on Itanium, which otherwise would break the build."
+        echo >&2 "         See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48496"
+        echo >&2 "         for current status and further details."
+        echo >&2 "         (And please report to e.g. sage-devel in case you think this"
+        echo >&2 "         bug is already fixed in GCC `$CC -dumpversion`.)"
+    fi
+fi
+
+export ABI CFLAGS CXXFLAGS LDFLAGS # Partially redundant, but safe(r).
 # We don't export CPPFLAGS here, since we don't (have to) modify them.
-if [ -n "$required_ldflags" ]; then
-    export LDFLAGS # Probably redundant, but safe(r).
-fi
 
 ###############################################################################
 # Now configure MPIR, eventually modifying CFLAGS [further]:
@@ -368,36 +273,27 @@
 
 # Pre-configure MPIR to get the settings it would use if CFLAGS were empty:
 echo "Checking what CFLAGS MPIR would use if they were empty..."
-if (unset CFLAGS CPPFLAGS CXXFLAGS &&
-    ./configure $SAGE_CONF_OPTS $MPIR_EXTRA_OPTS) &>/dev/null;
-then
-    if get_upstream_selected_cflags mpir.h; then
-        mpir_cflags=$upstream_cflags
-        mpir_cc=$upstream_cc
-        echo "Settings chosen by MPIR when configuring with CFLAGS unset:"
-        echo "  CC:      $mpir_cc"
-        echo "  CFLAGS:  $mpir_cflags"
-    else
-        echo >&2 "Warning: Couldn't determine MPIR-selected CFLAGS from 'mpir.h'"
-    fi
-else
-    # We ignore errors in the first place, since we redirected all
-    # messages to /dev/null. (The messages can be found in the 'config.log'
-    # files if someone really wants to read them.)
-    :;
+(unset CFLAGS CPPFLAGS CXXFLAGS && ./configure $SAGE_CONF_OPTS $MPIR_EXTRA_OPTS) &>configure-empty.log
+if [ $? -ne 0 ]; then
+    # Output the log of the failed configure run
+    cat configure-empty.log
+    echo >&2 "Error configuring MPIR (with CFLAGS unset)."
+    echo >&2 "Consult `pwd`/config.log for for details."
+    exit 1
 fi
-find . -name config.cache -o -name config.status -exec rm -f {} \;
 
-for header in /usr/include/gmp.h /usr/local/include/gmp.h; do
-    if get_upstream_selected_cflags $header; then
-        system_cflags=upstream_cflags
-        system_cc=upstream_cc
-        echo "Settings found in $header:"
-        echo "  CC:      $upstream_cc"
-        echo "  CFLAGS:  $upstream_cflags"
-    fi
-done
 
+# Read MPIR-selected flags from Makefile
+mpir_cc=`sed -n 's/^CC *= *//p' Makefile`
+mpir_cflags=`sed -n 's/^CFLAGS *= *//p' Makefile`
+if [ -z "$mpir_cc" ]; then
+    echo >&2 "Error: failed to determine \$CC from Makefile"
+    echo >&2 "Please report this to <sage-devel@googlegroups.com>"
+    exit 1
+fi
+echo "Settings chosen by MPIR when configuring with CFLAGS unset:"
+echo "  CC:      $mpir_cc"
+echo "  CFLAGS:  $mpir_cflags"
 echo "Settings required to properly build MPIR, taking into account SAGE_DEBUG etc.:"
 echo "  CFLAGS:  $required_cflags"  # Might be empty.
 echo "  LDFLAGS: $required_ldflags" # Might be empty.
@@ -410,25 +306,10 @@
 echo "  (CPP, CPPFLAGS, CXX and CXXFLAGS are listed below; these don't get modified.)"
 
 if [ -z "$user_cflags" ]; then
-    # No CFLAGS specified by user => Use either MPIR's, GMP's or our default
-    # ones, plus those required by Sage for the package to build properly:
-    if [ -n "$mpir_cflags" ]; then
-        # Fine. Use upstream settings. MPIR honors '--enable-fat'.
-        echo "Using MPIR's settings (plus mandatory ones)."
-        CFLAGS="$mpir_cflags $required_cflags"
-    elif [ -n "$system_cflags" ] && [ "$system_cc" = "$CC" ] &&
-        [ "$SAGE_FAT_BINARY" != yes ];
-    then
-        # Use system-wide GMP's settings (since compilers match).
-        echo "Using the settings from the system-wide GMP installation (plus mandatory ones.)"
-        CFLAGS="$system_cflags $required_cflags"
-    else # Use spkg's defaults, and add '-march=native' if supported and appropriate.
-        echo "Using the spkg's (i.e. Sage's) default (plus mandatory) settings."
-        CFLAGS="$default_cflags $required_cflags"
-        if [ "$SAGE_FAT_BINARY" != yes ]; then
-            CFLAGS="`native_build_cflags_if_supported` $CFLAGS"
-        fi
-    fi
+    # No CFLAGS specified by user => Use MPIR's flags, plus those
+    # required by Sage for the package to build properly:
+    echo "Using MPIR's settings (plus mandatory ones)."
+    CFLAGS="$mpir_cflags $required_cflags"
 else
     # CFLAGS were specified by the user, so don't override them (unless
     # necessary) and only add some useful ones to improve code generation:
@@ -438,25 +319,13 @@
     # Now add processor-specific flags if appropriate:
     if [ -z "`get_processor_specific_cflags $CFLAGS`" ]; then
         # User didn't specify specific architecture, so try to add such flag(s):
-        if [ -n "$mpir_cflags" ]; then
-            # Add MPIR's. Honors '--enable-fat'.
-            echo "Adding processor-specific options from MPIR."
-            CFLAGS="`get_processor_specific_cflags $mpir_cflags` $CFLAGS"
-        elif [ -n "$system_cflags" ] && [ "$system_cc" = "$CC" ] &&
-            [ "$SAGE_FAT_BINARY" != yes ];
-        then
-            # Add system-wide GMP's processor-specific settings (since compilers match).
-            echo "Adding processor-specific options from the system-wide GMP."
-            CFLAGS="`get_processor_specific_cflags $system_cflags` $CFLAGS"
-        elif [ "$SAGE_FAT_BINARY" != yes ]; then
-            CFLAGS="`native_build_cflags_if_supported` $CFLAGS"
-        fi
+        # Add MPIR's. Honors '--enable-fat'.
+        echo "Adding processor-specific options from MPIR."
+        CFLAGS="`get_processor_specific_cflags $mpir_cflags` $CFLAGS"
     else
         # User did specify some processor-specific CFLAGS.
         # We *might* prepend all of MPIR's CFLAGS here in addition,
         # but doing so could raise a conflict.
-        # (I'm not aware of any processor-specific flags MPIR uses / writes
-        # to gmp.h other than -mcpu, -mtune / -march.)
         :;
     fi
 fi
@@ -493,6 +362,9 @@
     echo "    --prefix=\"$SAGE_LOCAL\" --libdir=\"$SAGE_LOCAL/lib\" $SAGE_CONF_OPTS $MPIR_EXTRA_OPTS"
 fi
 
+# Clear the cache of the previous configure run
+find . -name config.cache -exec rm -f {} \;
+
 ./configure --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" $SAGE_CONF_OPTS $MPIR_EXTRA_OPTS
 if [ $? -ne 0 ]; then
     echo >&2 "Error configuring MPIR. (See above for the options passed to it.)"
