diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebkit')
-rw-r--r-- | recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch deleted file mode 100644 index d7627ec2..00000000 --- a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch +++ /dev/null | |||
@@ -1,76 +0,0 @@ | |||
1 | From f6989fec34f0bafdeda549d71751f236ef1f3b96 Mon Sep 17 00:00:00 2001 | ||
2 | From: Magnus Granberg <zorry@gentoo.org> | ||
3 | Date: Fri, 27 Feb 2015 11:55:09 +0100 | ||
4 | Subject: [PATCH] Remove TEXTREL tag in x86 | ||
5 | |||
6 | Fix textrel QA warnings when building qtwebkit for x86: | ||
7 | |||
8 | WARNING: QA Issue: ELF binary '/home/andre/rdk/rdk-master/build-vbox32/tmp/work/core2-32-rdk-linux/qtwebkit/5.4.0-r0/packages-split/qtwebkit/usr/lib/libQt5WebKit.so.5.4.0' has relocations in .text [textrel] | ||
9 | |||
10 | Patch from upstream webkit: | ||
11 | |||
12 | https://bugs.webkit.org/show_bug.cgi?id=70610 | ||
13 | |||
14 | Minor refresh required to apply cleanly to the older webkit sources used | ||
15 | by qtwebkit. Specifically, the patch needed to be modified to account | ||
16 | for PLATFORM(MAC) -> OS(DARWIN) renaming in recent webkit which is not | ||
17 | part of qtwebkit yet ( https://bugs.webkit.org/show_bug.cgi?id=99683 ). | ||
18 | |||
19 | Upstream status [webkit] : backport | ||
20 | Upstream status [qtwebkit] : unclear | ||
21 | |||
22 | Bug: https://bugs.webkit.org/show_bug.cgi?id=70610 | ||
23 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
24 | --- | ||
25 | Source/JavaScriptCore/jit/ThunkGenerators.cpp | 24 ++++++++++++++++++++++++ | ||
26 | Source/WTF/wtf/InlineASM.h | 2 ++ | ||
27 | 2 files changed, 26 insertions(+) | ||
28 | |||
29 | diff --git a/Source/JavaScriptCore/jit/ThunkGenerators.cpp b/Source/JavaScriptCore/jit/ThunkGenerators.cpp | ||
30 | index 9684df2..8af82d8 100644 | ||
31 | --- a/Source/JavaScriptCore/jit/ThunkGenerators.cpp | ||
32 | +++ b/Source/JavaScriptCore/jit/ThunkGenerators.cpp | ||
33 | @@ -524,6 +524,30 @@ double jsRound(double d) | ||
34 | } \ | ||
35 | static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk; | ||
36 | |||
37 | +#elif CPU(X86) && COMPILER(GCC) && OS(LINUX) && defined(__PIC__) | ||
38 | +#define defineUnaryDoubleOpWrapper(function) \ | ||
39 | + asm( \ | ||
40 | + ".text\n" \ | ||
41 | + ".globl " SYMBOL_STRING(function##Thunk) "\n" \ | ||
42 | + HIDE_SYMBOL(function##Thunk) "\n" \ | ||
43 | + SYMBOL_STRING(function##Thunk) ":" "\n" \ | ||
44 | + "pushl %ebx\n" \ | ||
45 | + "subl $20, %esp\n" \ | ||
46 | + "movsd %xmm0, (%esp) \n" \ | ||
47 | + "call __x86.get_pc_thunk.bx\n" \ | ||
48 | + "addl $_GLOBAL_OFFSET_TABLE_, %ebx\n" \ | ||
49 | + "call " GLOBAL_REFERENCE(function) "\n" \ | ||
50 | + "fstpl (%esp) \n" \ | ||
51 | + "movsd (%esp), %xmm0 \n" \ | ||
52 | + "addl $20, %esp\n" \ | ||
53 | + "popl %ebx\n" \ | ||
54 | + "ret\n" \ | ||
55 | + );\ | ||
56 | + extern "C" { \ | ||
57 | + MathThunkCallingConvention function##Thunk(MathThunkCallingConvention); \ | ||
58 | + } \ | ||
59 | + static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk; | ||
60 | + | ||
61 | #elif CPU(X86) && COMPILER(GCC) && (PLATFORM(MAC) || OS(LINUX)) | ||
62 | #define defineUnaryDoubleOpWrapper(function) \ | ||
63 | asm( \ | ||
64 | diff --git a/Source/WTF/wtf/InlineASM.h b/Source/WTF/wtf/InlineASM.h | ||
65 | index 0a2fe78..2dc40ef 100644 | ||
66 | --- a/Source/WTF/wtf/InlineASM.h | ||
67 | +++ b/Source/WTF/wtf/InlineASM.h | ||
68 | @@ -46,6 +46,8 @@ | ||
69 | #define GLOBAL_REFERENCE(name) #name "@plt" | ||
70 | #elif CPU(X86) && COMPILER(MINGW) | ||
71 | #define GLOBAL_REFERENCE(name) "@" #name "@4" | ||
72 | +#elif OS(LINUX) && CPU(X86) && defined(__PIC__) | ||
73 | +#define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) "@plt" | ||
74 | #else | ||
75 | #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) | ||
76 | #endif | ||