From 10ad311e7cdba862fd994a8b47576146a8e64efb Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 15 Jul 2023 14:27:33 +0100 Subject: [PATCH 1/2] gpt: it's __mips64, not __mips64__ But it's __mips__ not __mips, obviously Follow-up for d75ec33ed2a1781a82f9e0d62a79244ecd1e1edc --- src/systemd/sd-gpt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/systemd/sd-gpt.h b/src/systemd/sd-gpt.h index 9d30f3f33c..55f9177d75 100644 --- a/src/systemd/sd-gpt.h +++ b/src/systemd/sd-gpt.h @@ -223,7 +223,7 @@ _SD_BEGIN_DECLARATIONS; # define SD_GPT_USR_NATIVE SD_GPT_USR_MIPS_LE # define SD_GPT_USR_NATIVE_VERITY SD_GPT_USR_MIPS_LE_VERITY # define SD_GPT_USR_NATIVE_VERITY_SIG SD_GPT_USR_MIPS_LE_VERITY_SIG -#elif defined(__mips64__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +#elif defined(__mips64) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ # define SD_GPT_ROOT_NATIVE SD_GPT_ROOT_MIPS64_LE # define SD_GPT_ROOT_NATIVE_VERITY SD_GPT_ROOT_MIPS64_LE_VERITY # define SD_GPT_ROOT_NATIVE_VERITY_SIG SD_GPT_ROOT_MIPS64_LE_VERITY_SIG From c26a01ac8be0a9ab2857cd2006d9f6705c77b9b3 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 15 Jul 2023 14:28:23 +0100 Subject: [PATCH 2/2] sd-gpt: __mips__ is also defined when building __mips64 Follow-up for d75ec33ed2a1781a82f9e0d62a79244ecd1e1edc --- src/systemd/sd-gpt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/systemd/sd-gpt.h b/src/systemd/sd-gpt.h index 55f9177d75..0e3a5d9ee8 100644 --- a/src/systemd/sd-gpt.h +++ b/src/systemd/sd-gpt.h @@ -216,7 +216,7 @@ _SD_BEGIN_DECLARATIONS; # define SD_GPT_USR_NATIVE_VERITY SD_GPT_USR_LOONGARCH64_VERITY # define SD_GPT_USR_NATIVE_VERITY_SIG SD_GPT_USR_LOONGARCH64_VERITY_SIG -#elif defined(__mips__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +#elif defined(__mips__) && !defined(__mips64) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ # define SD_GPT_ROOT_NATIVE SD_GPT_ROOT_MIPS_LE # define SD_GPT_ROOT_NATIVE_VERITY SD_GPT_ROOT_MIPS_LE_VERITY # define SD_GPT_ROOT_NATIVE_VERITY_SIG SD_GPT_ROOT_MIPS_LE_VERITY_SIG