Merge remote-tracking branch 'upstream/main'

BattleAxeVR · Mar 17, 2024 · d9e7042 · d9e7042
2 parents e1d27e8 + 99256e9
commit d9e7042
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/changes/sdk/pr.464.gh.OpenXR-SDK-Source.md b/changes/sdk/pr.464.gh.OpenXR-SDK-Source.md
@@ -0,0 +1,4 @@
+---
+- issue.463.gh.OpenXR-SDK-Source
+---
+- loader: Fix build issue for ARMv6 architectures, and note architecture naming quirk of Raspberry Pi OS in the architecture table in the loader documentation.
diff --git a/specification/loader/runtime.adoc b/specification/loader/runtime.adoc
@@ -319,7 +319,7 @@ architectures and ABIs is used.
 
 |`armv5te`
   |
-  | `armel`
+  | `armel` (See <<armhf-rpios-note,note>>.)
   | 32-bit ARMv5TE architecture or compatible, little endian
 
 |`mips64`
@@ -386,6 +386,11 @@ While the Android ABI called `armeabi-v7a` does not use VFP PCS as the
 __system__ ABI, a definition in `openxr_platform_defines.h` enables the VFP
 PCS calling convention for all OpenXR API calls and function pointers.
 
+[[armhf-rpios-note]]
+Note: Raspberry Pi OS differs in its architecture definitions from upstream
+Debian by redefining `armhf` as ARMv6, rather than ARMv7.
+Therefore, on that operating system, `armhf` maps to ID `armv5te`.
+
 [[runtime-enumeration]]
 ==== Runtime Enumeration
 

diff --git a/src/common/platform_utils.hpp b/src/common/platform_utils.hpp
@@ -47,7 +47,7 @@
 #define XR_ARCH_ABI "aarch64"
 #elif (defined(__ARM_ARCH) && __ARM_ARCH >= 7 && (defined(__ARM_PCS_VFP) || defined(__ANDROID__))) || defined(_M_ARM)
 #define XR_ARCH_ABI "armv7a-vfp"
-#elif defined(__ARM_ARCH_5TE__)
+#elif defined(__ARM_ARCH_5TE__) || (defined(__ARM_ARCH) && __ARM_ARCH > 5)
 #define XR_ARCH_ABI "armv5te"
 #elif defined(__mips64)
 #define XR_ARCH_ABI "mips64"