1*4882a593SmuzhiyunFrom daf2e222903bacf85f27dfb0fffc4459bbf58b77 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: =?utf-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@savoirfairelinux.com> 3*4882a593SmuzhiyunDate: Sun, 10 Jun 2018 08:23:50 -0400 4*4882a593SmuzhiyunSubject: [PATCH] Detect 32-bits armv8-a architecture 5*4882a593SmuzhiyunMIME-Version: 1.0 6*4882a593SmuzhiyunContent-Type: text/plain; charset=utf-8 7*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunThese toolchains define __ARM_ARCH_8A__ (for ARM architecture version) 10*4882a593Smuzhiyunand __arm__ (for 32-bits word-size; __aarch64__ for 64-bits). 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunThis commit catches this new architecture (armv8a) within a #ifdef/#endif 13*4882a593Smuzhiyuninside the if statement dedicated for 32-bits ARM detection. See commit 14*4882a593Smuzhiyunfrom WebKit [1] and [2]. 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunFixes: 17*4882a593Smuzhiyun 18*4882a593Smuzhiyun In file included from ../3rdparty/javascriptcore/JavaScriptCore/config.h:26, 19*4882a593Smuzhiyun from ../3rdparty/javascriptcore/JavaScriptCore/pcre/pcre_compile.cpp:44: 20*4882a593Smuzhiyun ../3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h:370:6: error: #error "Not supported ARM architecture" 21*4882a593Smuzhiyun # error "Not supported ARM architecture" 22*4882a593Smuzhiyun ^~~~~ 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun[1]: https://github.com/WebKit/webkit/commit/313d9fc4bdd2f020a5d0cf834c3c61982f161ebb 25*4882a593Smuzhiyun[2]: https://github.com/WebKit/webkit/commit/98f0de0709786f5d9b09dfd5908266990eb909d6 26*4882a593Smuzhiyun 27*4882a593SmuzhiyunSigned-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> 28*4882a593Smuzhiyun--- 29*4882a593Smuzhiyun src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 4 ++++ 30*4882a593Smuzhiyun 1 file changed, 4 insertions(+) 31*4882a593Smuzhiyun 32*4882a593Smuzhiyundiff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 33*4882a593Smuzhiyunindex 00caa6d..c4b758e 100644 34*4882a593Smuzhiyun--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 35*4882a593Smuzhiyun+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 36*4882a593Smuzhiyun@@ -306,6 +306,10 @@ 37*4882a593Smuzhiyun || defined(__ARM_ARCH_7R__) 38*4882a593Smuzhiyun #define WTF_ARM_ARCH_VERSION 7 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun+#elif defined(__ARM_ARCH_8__) \ 41*4882a593Smuzhiyun+ || defined(__ARM_ARCH_8A__) 42*4882a593Smuzhiyun+#define WTF_ARM_ARCH_VERSION 8 43*4882a593Smuzhiyun+ 44*4882a593Smuzhiyun /* RVCT sets _TARGET_ARCH_ARM */ 45*4882a593Smuzhiyun #elif defined(__TARGET_ARCH_ARM) 46*4882a593Smuzhiyun #define WTF_ARM_ARCH_VERSION __TARGET_ARCH_ARM 47*4882a593Smuzhiyun-- 48*4882a593Smuzhiyun2.17.1 49*4882a593Smuzhiyun 50