mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-22 08:58:47 +00:00
www/qt*-webkit: unbreak on armv6
In file included from Source/JavaScriptCore/llint/LLIntOffsetsExtractor.cpp:26: In file included from ./Source/JavaScriptCore/config.h:30: ./Source/WTF/wtf/Platform.h:308:6: error: "Not supported ARM architecture" # error "Not supported ARM architecture" ^ <inline asm>:149:16: error: invalid operand for instruction vmov.u32 r2, r3, s8, s9 PR: 216153 217208 Submitted by: mikael.urankar@gmail.com
This commit is contained in:
parent
2abf7d87c5
commit
b0d780b034
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=440357
@ -0,0 +1,11 @@
|
||||
--- src/3rdparty/webkit/Source/JavaScriptCore/jit/ExecutableAllocator.h.orig 2017-01-05 13:47:51 UTC
|
||||
+++ src/3rdparty/webkit/Source/JavaScriptCore/jit/ExecutableAllocator.h
|
||||
@@ -326,6 +326,8 @@ public:
|
||||
syscall(__NR_cacheflush, reinterpret_cast<unsigned>(code), size, CACHEFLUSH_D_WB | CACHEFLUSH_I);
|
||||
#endif
|
||||
}
|
||||
+#elif CPU(ARM_TRADITIONAL) && OS(FREEBSD) && COMPILER(CLANG)
|
||||
+ __clear_cache(code, reinterpret_cast<char*>(code) + size);
|
||||
#else
|
||||
#error "The cacheFlush support is missing on this platform."
|
||||
#endif
|
@ -0,0 +1,12 @@
|
||||
This patch reportedly fixes build for ARM. See PR 208569
|
||||
|
||||
--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig 2017-02-07 10:30:44 UTC
|
||||
+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
|
||||
@@ -218,6 +218,7 @@
|
||||
#elif defined(__ARM_ARCH_6__) \
|
||||
|| defined(__ARM_ARCH_6J__) \
|
||||
|| defined(__ARM_ARCH_6K__) \
|
||||
+ || defined(__ARM_ARCH_6KZ__) \
|
||||
|| defined(__ARM_ARCH_6Z__) \
|
||||
|| defined(__ARM_ARCH_6ZK__) \
|
||||
|| defined(__ARM_ARCH_6T2__) \
|
@ -0,0 +1,11 @@
|
||||
--- src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm/FEGaussianBlurNEON.cpp.orig 2017-01-10 15:46:28 UTC
|
||||
+++ src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm/FEGaussianBlurNEON.cpp
|
||||
@@ -285,7 +285,7 @@ TOSTRING(neonDrawAlphaChannelGaussianBlu
|
||||
"vmov.u32 " REMAINING_STRIDES_R ", " REMAINING_STRIDES_S0 NL
|
||||
// Early return for 0 strides.
|
||||
"cmp " REMAINING_STRIDES_R ", #0" NL
|
||||
- "ldmeqia sp!, {r4-r8, r10, r11, pc}" NL
|
||||
+ "ldmiaeq sp!, {r4-r8, r10, r11, pc}" NL
|
||||
|
||||
// Initialize the sum variable.
|
||||
"vmov.u32 " SUM_Q ", #0" NL
|
@ -0,0 +1,11 @@
|
||||
--- src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm/FELightingNEON.cpp.orig 2016-12-21 17:09:11 UTC
|
||||
+++ src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm/FELightingNEON.cpp
|
||||
@@ -403,7 +403,7 @@ TOSTRING(neonDrawLighting) ":" NL
|
||||
"vmin.f32 " TMP2_D0 ", " TMP2_D0 ", " CONST_ONE_HI_D NL
|
||||
"vmul.f32 " TMP3_Q ", " COLOR_Q ", " TMP2_D0 "[1]" NL
|
||||
"vcvt.u32.f32 " TMP3_Q ", " TMP3_Q NL
|
||||
- "vmov.u32 r2, r3, " TMP3_S0 ", " TMP3_S1 NL
|
||||
+ "vmov r2, r3, " TMP3_S0 ", " TMP3_S1 NL
|
||||
// The color values are stored in-place.
|
||||
"strb r2, [" PIXELS_R ", #-11]" NL
|
||||
"strb r3, [" PIXELS_R ", #-10]" NL
|
12
www/qt5-webkit/files/patch-Source_WTF_wtf_Platform.h
Normal file
12
www/qt5-webkit/files/patch-Source_WTF_wtf_Platform.h
Normal file
@ -0,0 +1,12 @@
|
||||
This patch reportedly fixes build for ARM. See PR 208569
|
||||
|
||||
--- Source/WTF/wtf/Platform.h.orig 2016-04-10 06:48:36 UTC
|
||||
+++ Source/WTF/wtf/Platform.h
|
||||
@@ -218,6 +218,7 @@
|
||||
#elif defined(__ARM_ARCH_6__) \
|
||||
|| defined(__ARM_ARCH_6J__) \
|
||||
|| defined(__ARM_ARCH_6K__) \
|
||||
+ || defined(__ARM_ARCH_6KZ__) \
|
||||
|| defined(__ARM_ARCH_6Z__) \
|
||||
|| defined(__ARM_ARCH_6ZK__) \
|
||||
|| defined(__ARM_ARCH_6T2__) \
|
@ -0,0 +1,11 @@
|
||||
--- Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp.orig 2016-04-10 06:48:37 UTC
|
||||
+++ Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp
|
||||
@@ -403,7 +403,7 @@ TOSTRING(neonDrawLighting) ":" NL
|
||||
"vmin.f32 " TMP2_D0 ", " TMP2_D0 ", " CONST_ONE_HI_D NL
|
||||
"vmul.f32 " TMP3_Q ", " COLOR_Q ", " TMP2_D0 "[1]" NL
|
||||
"vcvt.u32.f32 " TMP3_Q ", " TMP3_Q NL
|
||||
- "vmov.u32 r2, r3, " TMP3_S0 ", " TMP3_S1 NL
|
||||
+ "vmov r2, r3, " TMP3_S0 ", " TMP3_S1 NL
|
||||
// The color values are stored in-place.
|
||||
"strb r2, [" PIXELS_R ", #-11]" NL
|
||||
"strb r3, [" PIXELS_R ", #-10]" NL
|
Loading…
Reference in New Issue
Block a user