summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/lib/ChangeLog4
-rw-r--r--Build/source/texk/web2c/lib/texmfmp.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index ee8ec05b24e..7f6fb0dd535 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-03 Magnus Granberg <zorry@gentoo.org>
+
+ * texmfmp.c: Use C code for i?86 when -fPIC.
+
2011-07-04 Peter Breitenlohner <peb@mppmu.mpg.de>
* texmfmp.c: Drop `#warning SyncTeX: -synctex command line...'.
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index 1cc014bd5de..818dceb3d3b 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -2439,6 +2439,10 @@ makesrcspecial (strnumber srcfilename, int lineno)
#if defined (__sun__) || defined (__cplusplus)
#define NO_MF_ASM
#endif
+/* The assembler code is not PIC safe on i?86 so use C code. */
+#if defined (__PIC__) && defined (__i386__)
+#define NO_MF_ASM
+#endif
#if defined(WIN32) && !defined(NO_MF_ASM) && !defined(__MINGW32__)
#include "lib/mfmpw32.c"
#elif defined (__i386__) && defined (__GNUC__) && !defined (NO_MF_ASM)