diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-10 13:08:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 09:25:42 +0200 |
| commit | 5909e6d0d10de3e1370b3ea0bc596f580101e3b4 (patch) | |
| tree | 6acc39b8ea0165562d480f1c54608c6c4ae9f865 /Source/bmalloc/bmalloc/BPlatform.h | |
| parent | beaeeb99881184fd368c121fcbb1a31c78b794a3 (diff) | |
| parent | 81cbb264cb9446c4408124d50aeff50164ad0ab4 (diff) | |
| download | qtwebkit-5909e6d0d10de3e1370b3ea0bc596f580101e3b4.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.212' into dev"
Diffstat (limited to 'Source/bmalloc/bmalloc/BPlatform.h')
| -rw-r--r-- | Source/bmalloc/bmalloc/BPlatform.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/bmalloc/bmalloc/BPlatform.h b/Source/bmalloc/bmalloc/BPlatform.h index 8d768db63..400143a63 100644 --- a/Source/bmalloc/bmalloc/BPlatform.h +++ b/Source/bmalloc/bmalloc/BPlatform.h @@ -120,7 +120,8 @@ || defined(__ARM_ARCH_7S__) #define BARM_ARCH_VERSION 7 -#elif defined(__ARM_ARCH_8__) +#elif defined(__ARM_ARCH_8__) \ +|| defined(__ARM_ARCH_8A__) #define BARM_ARCH_VERSION 8 /* MSVC sets _M_ARM */ |