Title: [197556] releases/WebKitGTK/webkit-2.4
- Revision
- 197556
- Author
- [email protected]
- Date
- 2016-03-04 04:54:39 -0800 (Fri, 04 Mar 2016)
Log Message
Merge r166232 - [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.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/CMakeLists.txt (197555 => 197556)
--- releases/WebKitGTK/webkit-2.4/CMakeLists.txt 2016-03-04 12:51:49 UTC (rev 197555)
+++ releases/WebKitGTK/webkit-2.4/CMakeLists.txt 2016-03-04 12:54:39 UTC (rev 197556)
@@ -77,6 +77,8 @@
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")
Modified: releases/WebKitGTK/webkit-2.4/ChangeLog (197555 => 197556)
--- releases/WebKitGTK/webkit-2.4/ChangeLog 2016-03-04 12:51:49 UTC (rev 197555)
+++ releases/WebKitGTK/webkit-2.4/ChangeLog 2016-03-04 12:54:39 UTC (rev 197556)
@@ -1,3 +1,12 @@
+2014-03-25 Gabor Rapcsanyi <[email protected]>
+
+ [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.
+
2015-05-20 Carlos Garcia Campos <[email protected]>
Unreviewed. Update NEWS and Versions.m4 for 2.4.9 release.
Modified: releases/WebKitGTK/webkit-2.4/Source/ThirdParty/ChangeLog (197555 => 197556)
--- releases/WebKitGTK/webkit-2.4/Source/ThirdParty/ChangeLog 2016-03-04 12:51:49 UTC (rev 197555)
+++ releases/WebKitGTK/webkit-2.4/Source/ThirdParty/ChangeLog 2016-03-04 12:54:39 UTC (rev 197556)
@@ -1,3 +1,12 @@
+2014-03-25 Gabor Rapcsanyi <[email protected]>
+
+ [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-01-12 Andy Estes <[email protected]>
Fix the Mac build after r161777.
Modified: releases/WebKitGTK/webkit-2.4/Source/ThirdParty/leveldb/port/atomic_pointer.h (197555 => 197556)
--- releases/WebKitGTK/webkit-2.4/Source/ThirdParty/leveldb/port/atomic_pointer.h 2016-03-04 12:51:49 UTC (rev 197555)
+++ releases/WebKitGTK/webkit-2.4/Source/ThirdParty/leveldb/port/atomic_pointer.h 2016-03-04 12:54:39 UTC (rev 197556)
@@ -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
Modified: releases/WebKitGTK/webkit-2.4/Source/WTF/ChangeLog (197555 => 197556)
--- releases/WebKitGTK/webkit-2.4/Source/WTF/ChangeLog 2016-03-04 12:51:49 UTC (rev 197555)
+++ releases/WebKitGTK/webkit-2.4/Source/WTF/ChangeLog 2016-03-04 12:54:39 UTC (rev 197556)
@@ -1,3 +1,12 @@
+2014-03-25 Gabor Rapcsanyi <[email protected]>
+
+ [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.
+
2015-04-17 Milan Crha <[email protected]>
[GTK] Miscellaneous changes for msys/mingw
Modified: releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/Platform.h (197555 => 197556)
--- releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/Platform.h 2016-03-04 12:51:49 UTC (rev 197555)
+++ releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/Platform.h 2016-03-04 12:54:39 UTC (rev 197556)
@@ -169,7 +169,7 @@
#endif
/* CPU(ARM64) - Apple */
-#if defined(__arm64__) && defined(__APPLE__)
+#if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
#define WTF_CPU_ARM64 1
#endif
Modified: releases/WebKitGTK/webkit-2.4/Tools/ChangeLog (197555 => 197556)
--- releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2016-03-04 12:51:49 UTC (rev 197555)
+++ releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2016-03-04 12:54:39 UTC (rev 197556)
@@ -1,3 +1,13 @@
+2014-03-25 Gabor Rapcsanyi <[email protected]>
+
+ [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-02-27 Alberto Garcia <[email protected]>
[gtk-doc] UnicodeEncodeError: 'ascii' codec can't encode character
Modified: releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm (197555 => 197556)
--- releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm 2016-03-04 12:51:49 UTC (rev 197555)
+++ releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm 2016-03-04 12:54:39 UTC (rev 197556)
@@ -1089,7 +1089,7 @@
sub isARM()
{
- return $Config{archname} =~ /^arm[v\-]/;
+ return ($Config{archname} =~ /^arm[v\-]/) || ($Config{archname} =~ /^aarch64[v\-]/);
}
sub isCrossCompilation()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
