Attachment 357593 Details for Bug 192497 – Patch

[patch] Patch

bug-192497.diff (text/plain), 1.35 KB, created by Don Olmstead on 2018-12-18 11:56:49 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2018-12-18 11:56:49 PST

Size: 1.35 KB

patch

obsolete

>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index fea7e30f289..31adc44968c 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -84,10 +84,10 @@ if (MSVC_CXX_ARCHITECTURE_ID)
> else ()
>     string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR)
> endif ()
>-if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
>-    set(WTF_CPU_ARM 1)
>-elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
>+if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(^aarch64|^arm64)")
>     set(WTF_CPU_ARM64 1)
>+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
>+    set(WTF_CPU_ARM 1)
> elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
>     set(WTF_CPU_MIPS64 1)
> elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
>diff --git a/ChangeLog b/ChangeLog
>index ddee8a71d6c..7df2e1d3231 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-12-18  Lucas Stach  <l.stach@pengutronix.de>
>+
>+        Fix build on 64bit ARM with arm64 SYSTEM_PROCESSOR
>+        https://bugs.webkit.org/show_bug.cgi?id=192497
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Android and some embedded Linux build systems use arm64 instead of
>+        aarch64 as the CMAKE_HOST_PROCESSOR. Fix the JIT build for this scenario.
>+
>+        * CMakeLists.txt:
>+
> 2018-12-12  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [FreeType] Add initial implementation of variation fonts

Actions: View | Formatted Diff | Diff

Attachments on bug 192497: 356802 | 356805 | 357593 | 357607