From 93739d4f9573bc877d70a377a443d1365835e66b Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Wed, 3 Aug 2011 11:03:59 +0000 Subject: 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 --- Build/source/texk/web2c/lib/ChangeLog | 4 ++++ Build/source/texk/web2c/lib/texmfmp.c | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'Build/source') 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 + + * texmfmp.c: Use C code for i?86 when -fPIC. + 2011-07-04 Peter Breitenlohner * 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) -- cgit v1.2.3