diff options
| author | Dimitrios Apostolou <[email protected]> | 2023-03-15 19:22:30 +0100 |
|---|---|---|
| committer | Dimitrios Apostolou <[email protected]> | 2023-04-17 17:18:52 +0100 |
| commit | 35d6c73620761609e21b835211c67cff7829b44d (patch) | |
| tree | b0424b0dd457aa8ded344025297b32696bc649b1 /src/3rdparty/masm | |
| parent | c41f1c32289d36a6da9bd04a7cef4d7466183bc7 (diff) | |
Support building for Raspberry Pi 1 or Zero
Cross-compiling (using Clang-13) for Raspberry Pi OS on Raspberry Pi 1
and Zero, requires adding "-target arm-linux-gnueabihf" to the compiler
flags, which defines macro __ARM_ARCH_6KZ__ to detect for armv6.
Fixes error:
qtdeclarative/src/qml/../3rdparty/masm/wtf/Platform.h:312:6: error: "Not supported ARM architecture"
More details: it turns out that the already checked macro
__ARM_ARCH_6ZK__ is a typo with significance because older versions of
GCC only had this. On the other hand __ARM_ARCH_6KZ__ (that this patch
checks for) is the correct spelling, and it's the only one defined by
Clang. Newer versions of GCC define both.
Pick-to: 6.5 6.4 6.2
Change-Id: I60532bfcaa62677f88ed2cff05d872a14c4c2111
Reviewed-by: Ulf Hermann <[email protected]>
Diffstat (limited to 'src/3rdparty/masm')
| -rw-r--r-- | src/3rdparty/masm/wtf/Platform.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/masm/wtf/Platform.h b/src/3rdparty/masm/wtf/Platform.h index 29decfadcf..5c83dec2b9 100644 --- a/src/3rdparty/masm/wtf/Platform.h +++ b/src/3rdparty/masm/wtf/Platform.h @@ -224,6 +224,7 @@ || defined(__ARM_ARCH_6K__) \ || defined(__ARM_ARCH_6Z__) \ || defined(__ARM_ARCH_6ZK__) \ + || defined(__ARM_ARCH_6KZ__) \ || defined(__ARM_ARCH_6T2__) \ || defined(__ARMV6__) #define WTF_ARM_ARCH_VERSION 6 |