summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-08-03 11:03:59 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-08-03 11:03:59 +0000
commit93739d4f9573bc877d70a377a443d1365835e66b (patch)
treee23e3ce6680682599f973e03d21f6460dfb7ce7c /Build/source
parent796b20394952986311b3b4152fe2107fd231a91f (diff)
web2c: Use C code for i?86 when -fPIC, from Magnus Granberg.
git-svn-id: svn://tug.org/texlive/trunk@23365 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-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)