Title: [239378] trunk
Revision
239378
Author
[email protected]
Date
2018-12-19 07:37:50 -0800 (Wed, 19 Dec 2018)

Log Message

Fix build on 64bit ARM with arm64 SYSTEM_PROCESSOR
https://bugs.webkit.org/show_bug.cgi?id=192497

Patch by Lucas Stach <[email protected]> on 2018-12-19
Reviewed by Philippe Normand.

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:

Modified Paths

Diff

Modified: trunk/CMakeLists.txt (239377 => 239378)


--- trunk/CMakeLists.txt	2018-12-19 12:12:37 UTC (rev 239377)
+++ trunk/CMakeLists.txt	2018-12-19 15:37:50 UTC (rev 239378)
@@ -84,10 +84,10 @@
 else ()
     string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR)
 endif ()
-if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+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 "^aarch64")
-    set(WTF_CPU_ARM64 1)
 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
     set(WTF_CPU_MIPS64 1)
 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")

Modified: trunk/ChangeLog (239377 => 239378)


--- trunk/ChangeLog	2018-12-19 12:12:37 UTC (rev 239377)
+++ trunk/ChangeLog	2018-12-19 15:37:50 UTC (rev 239378)
@@ -1,3 +1,15 @@
+2018-12-19  Lucas Stach  <[email protected]>
+
+        Fix build on 64bit ARM with arm64 SYSTEM_PROCESSOR
+        https://bugs.webkit.org/show_bug.cgi?id=192497
+
+        Reviewed by Philippe Normand.
+
+        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  <[email protected]>
 
         [FreeType] Add initial implementation of variation fonts
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to