[EFL] Add ARM64 build support

https://bugs.webkit.org/show_bug.cgi?id=130506

Rubber stamped by Gyuyoung Kim.

.:

* CMakeLists.txt: Set WTF_CPU_ARM64 when aarch64 is defined.

Source/ThirdParty:

* leveldb/port/atomic_pointer.h: Set ARCH_CPU_ARM_FAMILY when __aarch64__ is defined.

Source/WTF:

* wtf/Platform.h: Set WTF_CPU_ARM64 when __aarch64__ is defined.

Tools:

* Scripts/webkitdirs.pm:
(isARM): Detect aarch64 as ARM.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@166232 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75bb067..aa3579d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,6 +77,8 @@ else ()
 endif ()
 if (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 "^mips")
     set(WTF_CPU_MIPS 1)
 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sh4")

diff --git a/ChangeLog b/ChangeLog
index 2837948..a453b7d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-03-25  Gabor Rapcsanyi  <rgabor@webkit.org>
+
+        [EFL] Add ARM64 build support
+        https://bugs.webkit.org/show_bug.cgi?id=130506
+
+        Rubber stamped by Gyuyoung Kim.
+
+        * CMakeLists.txt: Set WTF_CPU_ARM64 when aarch64 is defined.
+
 2014-03-25  Michał Pakuła vel Rutka  <m.pakula@samsung.com>
 
         [EFL][WK2] Add NETWORK_PROCESS build option

diff --git a/Source/ThirdParty/ChangeLog b/Source/ThirdParty/ChangeLog
index 4f541fc..d15ab3c 100644 (file)
--- a/Source/ThirdParty/ChangeLog
+++ b/Source/ThirdParty/ChangeLog
@@ -1,3 +1,12 @@
+2014-03-25  Gabor Rapcsanyi  <rgabor@webkit.org>
+
+        [EFL] Add ARM64 build support
+        https://bugs.webkit.org/show_bug.cgi?id=130506
+
+        Rubber stamped by Gyuyoung Kim.
+
+        * leveldb/port/atomic_pointer.h: Set ARCH_CPU_ARM_FAMILY when __aarch64__ is defined.
+
 2014-03-14  Landry Breuil  <landry@openbsd.org>
 
         Fix leveldb build on OpenBSD/NetBSD by using the FreeBSD codepaths.

diff --git a/Source/ThirdParty/leveldb/port/atomic_pointer.h b/Source/ThirdParty/leveldb/port/atomic_pointer.h
index e17bf43..7a480ad 100644 (file)
--- a/Source/ThirdParty/leveldb/port/atomic_pointer.h
+++ b/Source/ThirdParty/leveldb/port/atomic_pointer.h
@@ -34,7 +34,7 @@
 #define ARCH_CPU_X86_FAMILY 1
 #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
 #define ARCH_CPU_X86_FAMILY 1
-#elif defined(__ARMEL__)
+#elif defined(__ARMEL__) || defined(__aarch64__)
 #define ARCH_CPU_ARM_FAMILY 1
 #elif defined(__ppc__) || defined(__powerpc__) || defined(__powerpc64__)
 #define ARCH_CPU_PPC_FAMILY 1

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 104699d..8a0d822 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,12 @@
+2014-03-25  Gabor Rapcsanyi  <rgabor@webkit.org>
+
+        [EFL] Add ARM64 build support
+        https://bugs.webkit.org/show_bug.cgi?id=130506
+
+        Rubber stamped by Gyuyoung Kim.
+
+        * wtf/Platform.h: Set WTF_CPU_ARM64 when __aarch64__ is defined.
+
 2014-03-24  Andy Estes  <aestes@apple.com>
 
         Fix the iOS build.

diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index cf9ead8..bf7d1fa 100644 (file)
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -152,7 +152,7 @@
 #endif
 
 /* CPU(ARM64) - Apple */
-#if defined(__arm64__) && defined(__APPLE__)
+#if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
 #define WTF_CPU_ARM64 1
 #endif
 

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 139add0..57b33fd 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2014-03-25  Gabor Rapcsanyi  <rgabor@webkit.org>
+
+        [EFL] Add ARM64 build support
+        https://bugs.webkit.org/show_bug.cgi?id=130506
+
+        Rubber stamped by Gyuyoung Kim.
+
+        * Scripts/webkitdirs.pm:
+        (isARM): Detect aarch64 as ARM.
+
 2014-03-25  Eva Balazsfalvi  <evab.u-szeged@partner.samsung.com>
 
         [webkitpy] Improve _parse_bug_description to recognize more descriptions

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index 6aec142..8873887 100755 (executable)
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -1107,7 +1107,7 @@ sub isBSD()
 
 sub isARM()
 {
-    return $Config{archname} =~ /^arm[v\-]/;
+    return ($Config{archname} =~ /^arm[v\-]/) || ($Config{archname} =~ /^aarch64[v\-]/);
 }
 
 sub isCrossCompilation()