From ebccfd031f23c5bfbdd2a0194404a8ce264c1e48 Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Sun, 26 May 2024 14:32:11 -0700
Subject: [PATCH] ams: fix compilation with gcc 14 (closes #2330)

---
 .../svc/codegen/impl/svc_codegen_impl_code_generator.hpp  | 8 ++++----
 .../codegen/impl/svc_codegen_impl_layout_conversion.hpp   | 4 ++--
 .../svc/codegen/impl/svc_codegen_impl_meta_code.hpp       | 2 +-
 .../include/vapours/util/arch/arm64/util_atomic.hpp       | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_code_generator.hpp b/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_code_generator.hpp
index 355ac141..e33b88a5 100644
--- a/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_code_generator.hpp
+++ b/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_code_generator.hpp
@@ -201,7 +201,7 @@ namespace ams::svc::codegen::impl {
                 } else if constexpr (Size == 8) {
                     __asm__ __volatile__("ldr     x%c[r], [sp, %c[offset]]" :: [r]"i"(Reg), [offset]"i"(Offset) : "memory");
                 } else {
-                    static_assert(Size != Size);
+                    static_assert(false, "Invalid Size");
                 }
             }
 
@@ -212,7 +212,7 @@ namespace ams::svc::codegen::impl {
                 } else if constexpr (Size == 8) {
                     __asm__ __volatile__("ldp     x%c[r0], x%c[r1], [sp, %c[offset]]" :: [r0]"i"(Reg0), [r1]"i"(Reg1), [offset]"i"(Offset) : "memory");
                 } else {
-                    static_assert(Size != Size);
+                    static_assert(false, "Invalid Size");
                 }
             }
 
@@ -223,7 +223,7 @@ namespace ams::svc::codegen::impl {
                 } else if constexpr (Size == 8) {
                     __asm__ __volatile__("str     x%c[r], [sp, %c[offset]]" :: [r]"i"(Reg), [offset]"i"(Offset) : "memory");
                 } else {
-                    static_assert(Size != Size);
+                    static_assert(false, "Invalid Size");
                 }
             }
 
@@ -234,7 +234,7 @@ namespace ams::svc::codegen::impl {
                 } else if constexpr (Size == 8) {
                     __asm__ __volatile__("stp     x%c[r0], x%c[r1], [sp, %c[offset]]" :: [r0]"i"(Reg0), [r1]"i"(Reg1), [offset]"i"(Offset) : "memory");
                 } else {
-                    static_assert(Size != Size);
+                    static_assert(false, "Invalid Size");
                 }
             }
 
diff --git a/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_layout_conversion.hpp b/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_layout_conversion.hpp
index 213c0d39..ab1ee69f 100644
--- a/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_layout_conversion.hpp
+++ b/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_layout_conversion.hpp
@@ -461,7 +461,7 @@ namespace ams::svc::codegen::impl {
                 if constexpr (CodeGenKind == CodeGenerationKind::SvcInvocationToKernelProcedure) {
                     return Operation::ImplType::template CanGenerateCodeForSvcInvocationToKernelProcedure<Operation>(allocator);
                 } else {
-                    static_assert(CodeGenKind != CodeGenKind, "Invalid CodeGenerationKind");
+                    static_assert(false, "Invalid CodeGenerationKind");
                 }
             }
 
@@ -474,7 +474,7 @@ namespace ams::svc::codegen::impl {
                 } else if constexpr (CodeGenKind == CodeGenerationKind::KernelProcedureToSvcInvocation) {
                     Operation::ImplType::template GenerateCodeForKernelProcedureToSvcInvocation<Operation>(mcg);
                 } else {
-                    static_assert(CodeGenKind != CodeGenKind, "Invalid CodeGenerationKind");
+                    static_assert(false, "Invalid CodeGenerationKind");
                 }
             }
     };
diff --git a/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_meta_code.hpp b/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_meta_code.hpp
index 47dba1d2..7dcb8e73 100644
--- a/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_meta_code.hpp
+++ b/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_meta_code.hpp
@@ -127,7 +127,7 @@ namespace ams::svc::codegen::impl {
         META_CODE_OPERATION_KIND_GENERATE_CODE(Pack)
         META_CODE_OPERATION_KIND_GENERATE_CODE(Unpack)
         META_CODE_OPERATION_KIND_GENERATE_CODE(LoadStackAddress)
-        else { static_assert(Kind != Kind, "Unknown MetaOperationKind"); }
+        else { static_assert(false, "Unknown MetaOperationKind"); }
         #undef META_CODE_OPERATION_KIND_GENERATE_CODE
     }
 
diff --git a/libvapours/include/vapours/util/arch/arm64/util_atomic.hpp b/libvapours/include/vapours/util/arch/arm64/util_atomic.hpp
index 54312602..a06b54b5 100644
--- a/libvapours/include/vapours/util/arch/arm64/util_atomic.hpp
+++ b/libvapours/include/vapours/util/arch/arm64/util_atomic.hpp
@@ -157,7 +157,7 @@ namespace ams::util {
             } else if constexpr (Order == std::memory_order_acq_rel || Order == std::memory_order_seq_cst) {
                 return ::ams::util::impl::LoadAcquireExclusiveForAtomic(p);
             } else {
-                static_assert(Order != Order, "Invalid memory order");
+                static_assert(false, "Invalid memory order");
             }
         }
 
@@ -172,7 +172,7 @@ namespace ams::util {
             } else if constexpr (Order == std::memory_order_acq_rel || Order == std::memory_order_seq_cst) {
                 return ::ams::util::impl::StoreReleaseExclusiveForAtomic(p, s);
             } else {
-                static_assert(Order != Order, "Invalid memory order");
+                static_assert(false, "Invalid memory order");
             }
         }