[patch] Fix textrel on x86

webkit_textrel.patch (text/plain), 2.08 KB, created by Magnus Granberg on 2014-03-20 21:45:27 UTC

2014-03-20  Magnus Granberg  <[e-mail]>,
	Francisco Blas Izquierdo Riera  <[e-mail]>

	# 483610
	* Source/WTF/wtf/InlineASM.h GLOBAL_REFERENCE: Add plt if PIC
	* Source/JavaScriptCore/jit/ThunkGenerators.cpp defineUnaryDoubleOpWrapper:
	if PIC then setup %ebx so we can use plt

--- a/Source/WTF/wtf/InlineASM.h	2014-03-11 00:14:11.000000000 +0100
+++ b/Source/WTF/wtf/InlineASM.h	2014-03-11 00:20:17.555239286 +0100
@@ -44,6 +44,8 @@
 #define GLOBAL_REFERENCE(name) #name "@plt"
 #elif CPU(X86) && COMPILER(MINGW)
 #define GLOBAL_REFERENCE(name) "@" #name "@4"
+#elif OS(LINUX) && CPU(X86) && defined(__PIC__)
+#define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) "@plt"
 #else
 #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name)
 #endif
--- a/Source/JavaScriptCore/jit/ThunkGenerators.cpp	2014-03-20 23:06:23.615063596 +0100
+++ b/Source/JavaScriptCore/jit/ThunkGenerators.cpp	2014-03-20 22:40:57.000000000 +0100
@@ -604,6 +604,29 @@ double jsRound(double d)
         MathThunkCallingConvention function##Thunk(MathThunkCallingConvention); \
     } \
     static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk;
+#elif CPU(X86) && COMPILER(GCC) && OS(LINUX) && defined(__PIC__)
+#define defineUnaryDoubleOpWrapper(function) \
+    asm( \
+        ".text\n" \
+        ".globl " SYMBOL_STRING(function##Thunk) "\n" \
+        HIDE_SYMBOL(function##Thunk) "\n" \
+        SYMBOL_STRING(function##Thunk) ":" "\n" \
+        "pushl %ebx\n" \
+        "subl $20, %esp\n" \
+        "movsd %xmm0, (%esp) \n" \
+        "call __x86.get_pc_thunk.bx\n" \
+        "addl $_GLOBAL_OFFSET_TABLE_, %ebx\n" \
+        "call " GLOBAL_REFERENCE(function) "\n" \
+        "fstpl (%esp) \n" \
+        "movsd (%esp), %xmm0 \n" \
+        "addl $20, %esp\n" \
+        "popl %ebx\n" \
+        "ret\n" \
+    );\
+    extern "C" { \
+        MathThunkCallingConvention function##Thunk(MathThunkCallingConvention); \
+    } \
+    static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk;
 #elif CPU(X86) && COMPILER(GCC) && (OS(DARWIN) || OS(LINUX))
 #define defineUnaryDoubleOpWrapper(function) \
     asm( \