Attachment #187541 for bug #223289

View | Details | Raw Unified | Return to bug 223289
Collapse All | Expand All

Lines 179-185 Link Here

(-)Mk/bsd.qt.mk (-1 / +2 lines)
179	_EXTRA_PATCHES_QT4+= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-armv6	179	_EXTRA_PATCHES_QT4+= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-armv6
180	. else	180	. else
181	_EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \	181	_EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \
182	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf	182	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \
		183	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests_unix_arch.test
183	. endif	184	. endif
184	EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \	185	EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \
185	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \	186	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \




For many architectures (armv6, aarch64), is -mcpu is essential for proper
detection of  CPU features. Follow compile.test case and reuse CXXFLAGS 
from make environment also in arch.test.

--- config.tests/unix/arch.test.orig	2017-02-05 07:43:57 UTC
+++ config.tests/unix/arch.test
@@ -17,7 +17,7 @@ else
 fi
 
 LFLAGS="$SYSROOT_FLAG"
-CXXFLAGS="$SYSROOT_FLAG"
+CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG"
 
 while [ "$#" -gt 0 ]; do
     PARAM=$1




armv6/v7: cacheFlush support
See PR 222612

--- 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




armv6/v7: cacheFlush support
See PR 222612

--- 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




armv6/v7: cacheFlush support
See PR 222612

--- 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"




armv6/v7:
See PR 222612

Add proper architecture name:
  https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html

--- 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__)




armv6/v7: cacheFlush support
See PR 222612

--- 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




armv6/v7:
See PR 222612

Add proper architecture name:
  https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html

--- 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__)

Return to bug 223289

Line 0 Link Here

(-)devel/qt5/files/extrapatch-config.tests_unix_arch.test (+15 lines)
	1	For many architectures (armv6, aarch64), is -mcpu is essential for proper
	2	detection of CPU features. Follow compile.test case and reuse CXXFLAGS
	3	from make environment also in arch.test.
	4
	5	--- config.tests/unix/arch.test.orig 2017-02-05 07:43:57 UTC
	6	+++ config.tests/unix/arch.test
	7	@@ -17,7 +17,7 @@ else
	8	fi
	9
	10	LFLAGS="$SYSROOT_FLAG"
	11	-CXXFLAGS="$SYSROOT_FLAG"
	12	+CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG"
	13
	14	while [ "$#" -gt 0 ]; do
	15	PARAM=$1

Line 0 Link Here

(-)www/qt5-webkit/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h (+14 lines)
	1	armv6/v7: cacheFlush support
	2	See PR 222612
	3
	4	--- Source/JavaScriptCore/assembler/ARMAssembler.h.orig 2017-08-23 05:02:37 UTC
	5	+++ Source/JavaScriptCore/assembler/ARMAssembler.h
	6	@@ -1128,6 +1128,8 @@ namespace JSC {
	7	linuxPageFlush(current, current + page);
	8
	9	linuxPageFlush(current, end);
	10	+#elif OS(FREEBSD)
	11	+ __clear_cache(code, reinterpret_cast<char*>(code) + size);
	12	#else
	13	#error "The cacheFlush support is missing on this platform."
	14	#endif

Line 0 Link Here

(-)www/qt5-webkit/files/patch-Source_WTF_wtf_Platform.h (+24 lines)
	1	armv6/v7:
	2	See PR 222612
	3
	4	Add proper architecture name:
	5	https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html
	6
	7	--- Source/WTF/wtf/Platform.h.orig 2017-06-04 20:16:06 UTC
	8	+++ Source/WTF/wtf/Platform.h
	9	@@ -226,6 +226,7 @@
	10	#elif defined(__ARM_ARCH_6__) \
	11	\|\| defined(__ARM_ARCH_6J__) \
	12	\|\| defined(__ARM_ARCH_6K__) \
	13	+ \|\| defined(__ARM_ARCH_6KZ__) \
	14	\|\| defined(__ARM_ARCH_6Z__) \
	15	\|\| defined(__ARM_ARCH_6ZK__) \
	16	\|\| defined(__ARM_ARCH_6T2__) \
	17	@@ -272,6 +273,7 @@
	18
	19	#elif defined(__ARM_ARCH_6J__) \
	20	\|\| defined(__ARM_ARCH_6K__) \
	21	+ \|\| defined(__ARM_ARCH_6KZ__) \
	22	\|\| defined(__ARM_ARCH_6Z__) \
	23	\|\| defined(__ARM_ARCH_6ZK__) \
	24	\|\| defined(__ARM_ARCH_6M__)

Line 0 Link Here

(-)www/qt5-webkit/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp (+14 lines)
	1	armv6/v7: cacheFlush support
	2	See PR 222612
	3
	4	--- Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp.orig 2017-08-23 05:04:24 UTC
	5	+++ Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp
	6	@@ -403,7 +403,7 @@ TOSTRING(neonDrawLighting) ":" NL
	7	"vmin.f32 " TMP2_D0 ", " TMP2_D0 ", " CONST_ONE_HI_D NL
	8	"vmul.f32 " TMP3_Q ", " COLOR_Q ", " TMP2_D0 "[1]" NL
	9	"vcvt.u32.f32 " TMP3_Q ", " TMP3_Q NL
	10	- "vmov.u32 r2, r3, " TMP3_S0 ", " TMP3_S1 NL
	11	+ "vmov r2, r3, " TMP3_S0 ", " TMP3_S1 NL
	12	// The color values are stored in-place.
	13	"strb r2, [" PIXELS_R ", #-11]" NL
	14	"strb r3, [" PIXELS_R ", #-10]" NL

Line 0 Link Here

(-)www/qt5-webkit/files/patch-Source_bmalloc_bmalloc_BPlatform.h (+24 lines)
	1	armv6/v7:
	2	See PR 222612
	3
	4	Add proper architecture name:
	5	https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html
	6
	7	--- Source/bmalloc/bmalloc/BPlatform.h.orig 2017-06-04 20:16:07 UTC
	8	+++ Source/bmalloc/bmalloc/BPlatform.h
	9	@@ -108,6 +108,7 @@
	10	#elif defined(__ARM_ARCH_6__) \
	11	\|\| defined(__ARM_ARCH_6J__) \
	12	\|\| defined(__ARM_ARCH_6K__) \
	13	+\|\| defined(__ARM_ARCH_6KZ__) \
	14	\|\| defined(__ARM_ARCH_6Z__) \
	15	\|\| defined(__ARM_ARCH_6ZK__) \
	16	\|\| defined(__ARM_ARCH_6T2__) \
	17	@@ -147,6 +148,7 @@
	18
	19	#elif defined(__ARM_ARCH_6J__) \
	20	\|\| defined(__ARM_ARCH_6K__) \
	21	+\|\| defined(__ARM_ARCH_6KZ__) \
	22	\|\| defined(__ARM_ARCH_6Z__) \
	23	\|\| defined(__ARM_ARCH_6ZK__) \
	24	\|\| defined(__ARM_ARCH_6M__)