diff -ur mpfr-3.1.5.orig/src/mparam_h.in mpfr-3.1.5/src/mparam_h.in --- mpfr-3.1.5.orig/src/mparam_h.in Tue Sep 27 16:58:15 2016 +++ mpfr-3.1.5/src/mparam_h.in Wed Sep 28 16:53:41 2016 @@ -27,7 +27,9 @@ for example with gcc -dM -E -xc /dev/null As of gcc 4.2, you can also use: -march=native or -mtune=native */ -#if defined (__tune_pentium4__) /* Threshold for Pentium 4 */ +#if 1 /* no processor specific optimization for TeX Live */ +#define MPFR_TUNE_CASE "default" +#elif defined (__tune_pentium4__) /* Threshold for Pentium 4 */ #define MPFR_TUNE_CASE "src/x86_64/pentium4/mparam.h" #include "x86_64/pentium4/mparam.h" diff -ur mpfr-3.1.5.orig/src/mpfr-impl.h mpfr-3.1.5/src/mpfr-impl.h --- mpfr-3.1.5.orig/src/mpfr-impl.h Tue Sep 27 16:58:15 2016 +++ mpfr-3.1.5/src/mpfr-impl.h Wed Sep 28 16:55:05 2016 @@ -23,6 +23,11 @@ #ifndef __MPFR_IMPL_H__ #define __MPFR_IMPL_H__ +/* Include MPFR 'config.h' before ANY system headers */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + /* Let's include some standard headers unconditionally as they are already needed by several source files or when some options are enabled/disabled, and it is easy to forget them (some configure @@ -55,12 +60,6 @@ /****************************************************** ****************** Include files ********************* ******************************************************/ - -/* Include 'config.h' before using ANY configure macros if needed - NOTE: It isn't MPFR 'config.h', but GMP's one! */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif /* For the definition of MPFR_THREAD_ATTR. GCC/ICC detection macros are no longer used, as they sometimes gave incorrect information about