/[packages]/backports/5/java-1.8.0-openjfx/current/SOURCES/java-1.8.0-openjfx-1.8.0.101-fix-arm64-build.patch
ViewVC logotype

Contents of /backports/5/java-1.8.0-openjfx/current/SOURCES/java-1.8.0-openjfx-1.8.0.101-fix-arm64-build.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1084231 - (show annotations) (download)
Mon Jan 30 15:36:40 2017 UTC (7 years, 5 months ago) by ns80
File size: 1974 byte(s)
- SILENT: update patch fix-arm64-build

1 From: Iain Lane <iain.lane@canonical.com>
2 Description: Fix arm64 build
3 Add AArch64 support in Platform.h
4 Don't use COMPARE_AND_SWAP on arm64; it produces invalid asm.
5 Fix some other areas where disabling JIT doesn't work.
6 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752735
7 Forwarded: no
8 Index: b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
9 ===================================================================
10 --- a/modules/web/src/main/native/Source/WTF/wtf/Platform.h
11 +++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
12 @@ -164,6 +164,14 @@
13 #define WTF_CPU_ARM64 1
14 #endif
15
16 +/* CPU(ARM64) - AArch64 */
17 +#if defined(__aarch64__)
18 +#define WTF_CPU_ARM64 1
19 +#if defined(__AARCH64BE__)
20 +#define WTF_CPU_BIG_ENDIAN 1
21 +#endif
22 +#endif
23 +
24 /* CPU(ARM) - ARM, any version*/
25 #define WTF_ARM_ARCH_AT_LEAST(N) (CPU(ARM) && WTF_ARM_ARCH_VERSION >= N)
26
27 @@ -973,7 +981,7 @@
28 #define USE_IMLANG_FONT_LINK2 1
29 #endif
30
31 -#if !defined(ENABLE_COMPARE_AND_SWAP) && (OS(WINDOWS) || (COMPILER(GCC) && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM64))))
32 +#if !defined(ENABLE_COMPARE_AND_SWAP) && (OS(WINDOWS) || (COMPILER(GCC) && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2))))
33 #define ENABLE_COMPARE_AND_SWAP 1
34 #endif
35
36 Index: b/modules/web/src/main/native/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
37 ===================================================================
38 --- a/modules/web/src/main/native/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
39 +++ b/modules/web/src/main/native/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
40 @@ -1035,7 +1035,7 @@ TransformationMatrix TransformationMatri
41 // this = mat * this.
42 TransformationMatrix& TransformationMatrix::multiply(const TransformationMatrix& mat)
43 {
44 -#if CPU(ARM64)
45 +#if CPU(ARM64) && PLATFORM(IOS)
46 double* leftMatrix = &(m_matrix[0][0]);
47 const double* rightMatrix = &(mat.m_matrix[0][0]);
48 asm volatile (

  ViewVC Help
Powered by ViewVC 1.1.30