|
[AMD Official Use Only]
Sorry I think I forgot to attach the patch
🙂
From: Newton, Jeremy
Sent: January 27, 2022 8:39 AM To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx <amd-gfx@xxxxxxxxxxxxxxxxxxxxx> Cc: StDenis, Tom <Tom.StDenis@xxxxxxx> Subject: FIx for UMR arm build
I know we only technically only care about x86, but this just fixes a syntax issue if you build on arm.
|
From d20c6d41ed47553ddbb6cf90a31649da4d40bd72 Mon Sep 17 00:00:00 2001
From: Jeremy Newton <Jeremy.Newton@xxxxxxx>
Date: Wed, 12 Jan 2022 10:43:07 -0500
Subject: [PATCH] umr/gui: fix ARM build
Simple syntax error in one of the arm cases for imgui
Signed-off-by: Jeremy Newton <Jeremy.Newton@xxxxxxx>
---
src/app/gui/imgui/imgui_internal.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/gui/imgui/imgui_internal.h b/src/app/gui/imgui/imgui_internal.h
index 3180cc5..bf00e91 100644
--- a/src/app/gui/imgui/imgui_internal.h
+++ b/src/app/gui/imgui/imgui_internal.h
@@ -264,7 +264,7 @@ namespace ImStb
#define IM_DEBUG_BREAK() __asm__ volatile("int $0x03")
#elif defined(__GNUC__) && defined(__thumb__)
#define IM_DEBUG_BREAK() __asm__ volatile(".inst 0xde01")
-#elif defined(__GNUC__) defined(__arm__) && !defined(__thumb__)
+#elif defined(__GNUC__) && defined(__arm__) && !defined(__thumb__)
#define IM_DEBUG_BREAK() __asm__ volatile(".inst 0xe7f001f0");
#else
#define IM_DEBUG_BREAK() IM_ASSERT(0) // It is expected that you define IM_DEBUG_BREAK() into something that will break nicely in a debugger!
--
2.33.1
