From 95fac19588af3ba9776b969786c3cbe161b3c084 Mon Sep 17 00:00:00 2001 From: Slice Date: Wed, 22 Nov 2023 19:10:59 +0300 Subject: [PATCH] workaround for gcc Signed-off-by: Slice --- OpenCorePkg | 2 +- rEFIt_UEFI/Platform/smbios.cpp | 4 ++++ rEFIt_UEFI/PlatformPOSIX/posix/abort.cpp | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/OpenCorePkg b/OpenCorePkg index c24f740b0..a38c3a370 160000 --- a/OpenCorePkg +++ b/OpenCorePkg @@ -1 +1 @@ -Subproject commit c24f740b07c97efec0b772d914a9bdab448f3039 +Subproject commit a38c3a3705021e3808d62d135e0a4089d74986b5 diff --git a/rEFIt_UEFI/Platform/smbios.cpp b/rEFIt_UEFI/Platform/smbios.cpp index 87ab8ef96..ee855828a 100755 --- a/rEFIt_UEFI/Platform/smbios.cpp +++ b/rEFIt_UEFI/Platform/smbios.cpp @@ -1454,10 +1454,14 @@ void PatchTableType17(const SmbiosInjectedSettings& smbiosSettings, XArray& mHandle17 = *mHandle17Ptr; XString8 deviceLocator; XString8 bankLocator; +#if defined (__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wvla-extension" +#endif UINT8 channelMap[mMemory17.size()]; // mMemory17.size() == SlotCounts +#if defined (__clang__) #pragma clang diagnostic pop +#endif UINT8 expectedCount = 0; UINT8 channels = 2; XBool insertingEmpty = true; diff --git a/rEFIt_UEFI/PlatformPOSIX/posix/abort.cpp b/rEFIt_UEFI/PlatformPOSIX/posix/abort.cpp index a0cfc4f4a..e595b3546 100644 --- a/rEFIt_UEFI/PlatformPOSIX/posix/abort.cpp +++ b/rEFIt_UEFI/PlatformPOSIX/posix/abort.cpp @@ -38,9 +38,10 @@ static void panic_(const char* format, VA_LIST va) printf(FATAL_ERROR_MSG); abort(); } - +#if defined (__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Winvalid-noreturn" +#endif void panic(const char* format, ...) { @@ -59,7 +60,9 @@ void panic(const char* format, ...) panic_(format, va); // panic doesn't return #endif } +#if defined (__clang__) #pragma clang diagnostic pop +#endif /* * Future version to warn about problem but offer the possibility to try to continue