svn commit: r440357 - in head/www: qt4-webkit/files qt5-webkit/files
Jan Beich
jbeich at FreeBSD.org
Sun May 7 19:29:47 UTC 2017
Author: jbeich
Date: Sun May 7 19:29:45 2017
New Revision: 440357
URL: https://svnweb.freebsd.org/changeset/ports/440357
Log:
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 at gmail.com
Added:
head/www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_ExecutableAllocator.h
- copied, changed from r440356, head/www/qt5-webkit/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
head/www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h
- copied, changed from r440079, head/www/webkit-gtk2/files/patch-Source_WTF_wtf_Platform.h
head/www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FEGaussianBlurNEON.cpp (contents, props changed)
head/www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FELightingNEON.cpp
- copied, changed from r440079, head/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp
head/www/qt5-webkit/files/patch-Source_WTF_wtf_Platform.h
- copied unchanged from r440079, head/www/webkit-gtk2/files/patch-Source_WTF_wtf_Platform.h
head/www/qt5-webkit/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp
- copied unchanged from r440079, head/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp
Copied and modified: head/www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_ExecutableAllocator.h (from r440356, head/www/qt5-webkit/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h)
==============================================================================
--- head/www/qt5-webkit/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h Sun May 7 18:45:52 2017 (r440356, copy source)
+++ head/www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_ExecutableAllocator.h Sun May 7 19:29:45 2017 (r440357)
@@ -1,11 +1,11 @@
---- Source/JavaScriptCore/assembler/ARMAssembler.h
-+++ Source/JavaScriptCore/assembler/ARMAssembler.h
-@@ -1064,6 +1064,8 @@
- linuxPageFlush(current, end);
- #elif OS(WINCE)
- CacheRangeFlush(code, size, CACHE_SYNC_ALL);
+--- 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);
- #elif OS(QNX) && ENABLE(ASSEMBLER_WX_EXCLUSIVE)
- UNUSED_PARAM(code);
- UNUSED_PARAM(size);
++ __clear_cache(code, reinterpret_cast<char*>(code) + size);
+ #else
+ #error "The cacheFlush support is missing on this platform."
+ #endif
Copied and modified: head/www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h (from r440079, head/www/webkit-gtk2/files/patch-Source_WTF_wtf_Platform.h)
==============================================================================
--- head/www/webkit-gtk2/files/patch-Source_WTF_wtf_Platform.h Thu May 4 01:51:58 2017 (r440079, copy source)
+++ head/www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h Sun May 7 19:29:45 2017 (r440357)
@@ -1,7 +1,7 @@
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
+--- 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__) \
Added: head/www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FEGaussianBlurNEON.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FEGaussianBlurNEON.cpp Sun May 7 19:29:45 2017 (r440357)
@@ -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
Copied and modified: head/www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FELightingNEON.cpp (from r440079, head/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp)
==============================================================================
--- head/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp Thu May 4 01:51:58 2017 (r440079, copy source)
+++ head/www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FELightingNEON.cpp Sun May 7 19:29:45 2017 (r440357)
@@ -1,5 +1,5 @@
---- 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
+--- 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
Copied: head/www/qt5-webkit/files/patch-Source_WTF_wtf_Platform.h (from r440079, head/www/webkit-gtk2/files/patch-Source_WTF_wtf_Platform.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/qt5-webkit/files/patch-Source_WTF_wtf_Platform.h Sun May 7 19:29:45 2017 (r440357, copy of r440079, head/www/webkit-gtk2/files/patch-Source_WTF_wtf_Platform.h)
@@ -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__) \
Copied: head/www/qt5-webkit/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp (from r440079, head/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/qt5-webkit/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp Sun May 7 19:29:45 2017 (r440357, copy of r440079, head/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp)
@@ -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
More information about the svn-ports-head
mailing list