From 1d18aba0166ca678120f027eac06c9484b57edc7 Mon Sep 17 00:00:00 2001
From: Yonggang Luo <luoyonggang@gmail.com>
Date: Sat, 9 Mar 2024 04:34:01 +0800
Subject: [PATCH] meson: Remove the non-used -DDEBUG manually

And also remove the workarounds for LLVM and bellagio

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28092>
---
 meson.build                                   |  5 -----
 src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 13 -------------
 src/gallium/frontends/omx/bellagio/vid_dec.c  |  6 ------
 src/gallium/frontends/omx/bellagio/vid_enc.c  |  7 -------
 4 files changed, 31 deletions(-)

diff --git a/meson.build b/meson.build
index bf2612ebc38..d74ad39b18a 100644
--- a/meson.build
+++ b/meson.build
@@ -956,11 +956,6 @@ if cc.get_define('ETIME', prefix : '#include <errno.h>') == ''
   pre_args += '-DETIME=ETIMEDOUT'
 endif
 
-# Define DEBUG for debug builds only (debugoptimized is not included on this one)
-if with_mesa_debug
-  pre_args += '-DDEBUG'
-endif
-
 # Define MESA_DEBUG to 1 for debug builds only (debugoptimized is not included on this one);
 # otherwise define MESA_DEBUG to 0
 pre_args += '-DMESA_DEBUG=' + (with_mesa_debug ? '1' : '0')
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index 2ef45606275..817be7b5300 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -42,14 +42,6 @@
 
 #include <stddef.h>
 
-#include <llvm/Config/llvm-config.h>
-
-#if LLVM_VERSION_MAJOR < 7
-// Workaround http://llvm.org/PR23628
-#pragma push_macro("DEBUG")
-#undef DEBUG
-#endif
-
 #include <llvm/Config/llvm-config.h>
 #include <llvm-c/Core.h>
 #include <llvm-c/Support.h>
@@ -87,11 +79,6 @@
 #include <llvm/ExecutionEngine/JITEventListener.h>
 #endif
 
-#if LLVM_VERSION_MAJOR < 7
-// Workaround http://llvm.org/PR23628
-#pragma pop_macro("DEBUG")
-#endif
-
 #include "c11/threads.h"
 #include "util/u_thread.h"
 #include "util/detect.h"
diff --git a/src/gallium/frontends/omx/bellagio/vid_dec.c b/src/gallium/frontends/omx/bellagio/vid_dec.c
index d17caa30b72..a093fea85a9 100644
--- a/src/gallium/frontends/omx/bellagio/vid_dec.c
+++ b/src/gallium/frontends/omx/bellagio/vid_dec.c
@@ -36,13 +36,7 @@
 
 #include <OMX_Video.h>
 
-/* bellagio defines a DEBUG macro that we don't want */
-#if !MESA_DEBUG
 #include <bellagio/omxcore.h>
-#undef DEBUG
-#else
-#include <bellagio/omxcore.h>
-#endif
 
 #include "pipe/p_screen.h"
 #include "pipe/p_video_codec.h"
diff --git a/src/gallium/frontends/omx/bellagio/vid_enc.c b/src/gallium/frontends/omx/bellagio/vid_enc.c
index 50f1ee1a774..ceaa2876a8e 100644
--- a/src/gallium/frontends/omx/bellagio/vid_enc.c
+++ b/src/gallium/frontends/omx/bellagio/vid_enc.c
@@ -36,14 +36,7 @@
 
 #include <OMX_Video.h>
 
-/* bellagio defines a DEBUG macro that we don't want */
-#if !MESA_DEBUG
 #include <bellagio/omxcore.h>
-#undef DEBUG
-#else
-#include <bellagio/omxcore.h>
-#endif
-
 #include <bellagio/omx_base_video_port.h>
 
 #include "pipe/p_screen.h"