From: Jan Janssen <medhefgo@web.de>
Date: Mon, 27 Feb 2023 14:58:42 +0000 (+0100)
Subject: boot: Fix data model detection for ARM
X-Git-Tag: v254-rc1~1144^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d14eb24925362e30a1f362e99c93a127757aa471;p=thirdparty%2Fsystemd.git

boot: Fix data model detection for ARM

For whatever reason, ARM does not define __ILP32__.
---

diff --git a/src/boot/efi/efi-string.h b/src/boot/efi/efi-string.h
index 410bfd8ef5e..4df37a85054 100644
--- a/src/boot/efi/efi-string.h
+++ b/src/boot/efi/efi-string.h
@@ -126,7 +126,7 @@ _gnu_printf_(2, 0) _warn_unused_result_ char16_t *xvasprintf_status(EFI_STATUS s
 /* inttypes.h is provided by libc instead of the compiler and is not supposed to be used in freestanding
  * environments. We could use clang __*_FMT*__ constants for this, bug gcc does not have them. :( */
 
-#  if defined(__ILP32__)
+#  if defined(__ILP32__) || defined(__arm__)
 #    define PRI64_PREFIX "ll"
 #  elif defined(__LP64__)
 #    define PRI64_PREFIX "l"