From 068bf2d2d91382ea0d8ec24a142a30ea429704db Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 15 Aug 2017 18:28:49 -0400 Subject: [PATCH] Detect 32-bits armv8-a architecture MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Adds WTF platform support for the 32-bits armv8-a architectures. Theses toolchains define __ARM_ARCH_8A__ (for ARM architecture version) and __arm__ (for 32-bits word-size; __aarch64__ for 64-bits). This commit catches this new architecture (armv8a) within a #ifdef/#endif inside the if statement dedicated for 32-bits ARM detection. Fixes: In file included from ./config.h:30:0, from ... ./wtf/Platform.h:323:6: error: #error "Not supported ARM architecture" # error "Not supported ARM architecture" ^~~~~ Upstream-Status: Backport [with adaptations] Signed-off-by: Gaël PORTAY --- Source/WTF/wtf/Platform.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h index 562840cf7..9cf656845 100644 --- a/Source/WTF/wtf/Platform.h +++ b/Source/WTF/wtf/Platform.h @@ -243,6 +243,10 @@ || defined(__ARM_ARCH_7S__) #define WTF_ARM_ARCH_VERSION 7 +#elif defined(__ARM_ARCH_8__) \ + || defined(__ARM_ARCH_8A__) +#define WTF_ARM_ARCH_VERSION 8 + /* MSVC sets _M_ARM */ #elif defined(_M_ARM) #define WTF_ARM_ARCH_VERSION _M_ARM -- 2.16.1