Attachment 186759 Details for Bug 222612 – Fix build on armv6 and armv7

[patch] Fix build on armv6 and armv7

qt5-webkit.patch (text/plain), 7.27 KB, created by Michal Meloun on 2017-09-27 13:42:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Meloun

Created: 2017-09-27 13:42:52 UTC

Size: 7.27 KB

patch

obsolete

>Index: files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
>===================================================================
>--- files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h	(nonexistent)
>+++ files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- Source/JavaScriptCore/assembler/ARMAssembler.h.orig	2017-08-23 05:02:37 UTC
>++++ Source/JavaScriptCore/assembler/ARMAssembler.h
>+@@ -1128,6 +1128,8 @@ namespace JSC {
>+                 linuxPageFlush(current, current + page);
>+ 
>+             linuxPageFlush(current, end);
>++#elif OS(FREEBSD)
>++        __clear_cache(code, reinterpret_cast<char*>(code) + size);
>+ #else
>+ #error "The cacheFlush support is missing on this platform."
>+ #endif
>
>Property changes on: files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h
>===================================================================
>--- files/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h	(nonexistent)
>+++ files/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- Source/JavaScriptCore/assembler/ARMv7Assembler.h.orig	2017-08-23 04:59:46 UTC
>++++ Source/JavaScriptCore/assembler/ARMv7Assembler.h
>+@@ -2373,6 +2373,8 @@ class ARMv7Assembler { (public)
>+             linuxPageFlush(current, current + page);
>+ 
>+         linuxPageFlush(current, end);
>++#elif OS(FREEBSD)
>++        __clear_cache(code, reinterpret_cast<char*>(code) + size);
>+ #else
>+ #error "The cacheFlush support is missing on this platform."
>+ #endif
>
>Property changes on: files/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-Source_JavaScriptCore_offlineasm_arm.rb
>===================================================================
>--- files/patch-Source_JavaScriptCore_offlineasm_arm.rb	(nonexistent)
>+++ files/patch-Source_JavaScriptCore_offlineasm_arm.rb	(working copy)
>@@ -0,0 +1,15 @@
>+--- Source/JavaScriptCore/offlineasm/arm.rb.orig	2017-08-24 10:30:41 UTC
>++++ Source/JavaScriptCore/offlineasm/arm.rb
>+@@ -502,8 +502,12 @@ class Instruction
>+                 $asm.puts "mov #{armFlippedOperands(operands)}"
>+             end
>+         when "mvlbl"
>++            if isARMv7 or isARMv7Traditional
>+                 $asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}"
>+                 $asm.puts "movt #{operands[1].armOperand}, \#:upper16:#{operands[0].value}"
>++            else
>++                $asm.puts "ldr #{operands[1].armOperand}, =#{operands[0].value}"
>++            end
>+         when "nop"
>+             $asm.puts "nop"
>+         when "bieq", "bpeq", "bbeq"
>
>Property changes on: files/patch-Source_JavaScriptCore_offlineasm_arm.rb
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-Source_WTF_wtf_Platform.h
>===================================================================
>--- files/patch-Source_WTF_wtf_Platform.h	(nonexistent)
>+++ files/patch-Source_WTF_wtf_Platform.h	(working copy)
>@@ -0,0 +1,18 @@
>+--- Source/WTF/wtf/Platform.h.orig	2017-06-04 20:16:06 UTC
>++++ Source/WTF/wtf/Platform.h
>+@@ -226,6 +226,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__) \
>+@@ -272,6 +273,7 @@
>+ 
>+ #elif defined(__ARM_ARCH_6J__) \
>+     || defined(__ARM_ARCH_6K__) \
>++    || defined(__ARM_ARCH_6KZ__) \
>+     || defined(__ARM_ARCH_6Z__) \
>+     || defined(__ARM_ARCH_6ZK__) \
>+     || defined(__ARM_ARCH_6M__)
>
>Property changes on: files/patch-Source_WTF_wtf_Platform.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp
>===================================================================
>--- files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp	(nonexistent)
>+++ files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp.orig	2017-08-23 05:04:24 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
>
>Property changes on: files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-Source_bmalloc_bmalloc_BPlatform.h
>===================================================================
>--- files/patch-Source_bmalloc_bmalloc_BPlatform.h	(nonexistent)
>+++ files/patch-Source_bmalloc_bmalloc_BPlatform.h	(working copy)
>@@ -0,0 +1,18 @@
>+--- Source/bmalloc/bmalloc/BPlatform.h.orig	2017-06-04 20:16:07 UTC
>++++ Source/bmalloc/bmalloc/BPlatform.h
>+@@ -108,6 +108,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__) \
>+@@ -147,6 +148,7 @@
>+ 
>+ #elif defined(__ARM_ARCH_6J__) \
>+ || defined(__ARM_ARCH_6K__) \
>++|| defined(__ARM_ARCH_6KZ__) \
>+ || defined(__ARM_ARCH_6Z__) \
>+ || defined(__ARM_ARCH_6ZK__) \
>+ || defined(__ARM_ARCH_6M__)
>
>Property changes on: files/patch-Source_bmalloc_bmalloc_BPlatform.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 222612: 186759