diff --git a/src/amd/addrlib/src/core/addrcommon.h b/src/amd/addrlib/src/core/addrcommon.h
index 61eb9083146..c30a67d98d5 100644
--- a/src/amd/addrlib/src/core/addrcommon.h
+++ b/src/amd/addrlib/src/core/addrcommon.h
@@ -64,7 +64,7 @@
         #define ADDR_DBG_BREAK()    { __debugbreak(); }
     #endif
 #else
-    #define ADDR_DBG_BREAK()
+    #define ADDR_DBG_BREAK() do {} while(0)
 #endif
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -143,15 +143,15 @@
 
 #define ADDRDPF 1 ? (void)0 : (void)
 
-#define ADDR_PRNT(a)
+#define ADDR_PRNT(a) do {} while(0)
 
-#define ADDR_DBG_BREAK()
+#define ADDR_DBG_BREAK() do {} while(0)
 
-#define ADDR_INFO(cond, a)
+#define ADDR_INFO(cond, a) do {} while(0)
 
-#define ADDR_WARN(cond, a)
+#define ADDR_WARN(cond, a) do {} while(0)
 
-#define ADDR_EXIT(cond, a)
+#define ADDR_EXIT(cond, a) do {} while(0)
 
 #endif // DEBUG
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/amd/common/ac_debug.c b/src/amd/common/ac_debug.c
index 36a01fd8bf7..77c0e0aa790 100644
--- a/src/amd/common/ac_debug.c
+++ b/src/amd/common/ac_debug.c
@@ -28,7 +28,7 @@
 #include <memcheck.h>
 #define VG(x) x
 #else
-#define VG(x)
+#define VG(x) ((void)0)
 #endif
 
 #include <inttypes.h>
diff --git a/src/amd/compiler/aco_ir.h b/src/amd/compiler/aco_ir.h
index 5a16afdca36..5b01ca7addf 100644
--- a/src/amd/compiler/aco_ir.h
+++ b/src/amd/compiler/aco_ir.h
@@ -1162,7 +1162,7 @@ bool validate_ra(Program* program, const struct radv_nir_compiler_options *optio
 #ifndef NDEBUG
 void perfwarn(bool cond, const char *msg, Instruction *instr=NULL);
 #else
-#define perfwarn(program, cond, msg, ...)
+#define perfwarn(program, cond, msg, ...) do {} while(0)
 #endif
 
 void aco_print_instr(Instruction *instr, FILE *output);
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 70f62fe5e21..0b99756755e 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -266,7 +266,7 @@ void radv_logi_v(const char *format, va_list va);
 				fprintf(stderr, "%s:%d ASSERT: %s\n", __FILE__, __LINE__, #x); \
 		})
 #else
-#define radv_assert(x)
+#define radv_assert(x) do {} while(0)
 #endif
 
 #define stub_return(v)					\