diff options
| author | Eric Engestrom <[email protected]> | 2017-11-24 16:23:03 +0000 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2017-12-01 13:49:42 +0000 |
| commit | 13a7a2d4557a068fbf86af9eaa43b600fa8bce88 (patch) | |
| tree | 23727bc807c9c30fd610940272840aa681d32ae9 | |
| parent | d5559292394f0e9b1c682baca05f81366fb389af (diff) | |
amd: remove always-true BRAHMA_BUILD define
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/amd/Android.addrlib.mk | 2 | ||||
| -rw-r--r-- | src/amd/Makefile.addrlib.am | 3 | ||||
| -rw-r--r-- | src/amd/addrlib/core/addrcommon.h | 15 | ||||
| -rw-r--r-- | src/amd/addrlib/meson.build | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/Android.mk | 4 |
5 files changed, 5 insertions, 21 deletions
diff --git a/src/amd/Android.addrlib.mk b/src/amd/Android.addrlib.mk index a29f7c16d17..a37112d7154 100644 --- a/src/amd/Android.addrlib.mk +++ b/src/amd/Android.addrlib.mk @@ -30,8 +30,6 @@ LOCAL_MODULE := libmesa_amdgpu_addrlib LOCAL_SRC_FILES := $(ADDRLIB_FILES) -LOCAL_CFLAGS := -DBRAHMA_BUILD=1 - LOCAL_C_INCLUDES := \ $(MESA_TOP)/src \ $(MESA_TOP)/src/amd/common \ diff --git a/src/amd/Makefile.addrlib.am b/src/amd/Makefile.addrlib.am index 90dfe963445..322a5c86973 100644 --- a/src/amd/Makefile.addrlib.am +++ b/src/amd/Makefile.addrlib.am @@ -29,8 +29,7 @@ addrlib_libamdgpu_addrlib_la_CPPFLAGS = \ -I$(srcdir)/addrlib/inc/chip/gfx9 \ -I$(srcdir)/addrlib/inc/chip/r800 \ -I$(srcdir)/addrlib/gfx9/chip \ - -I$(srcdir)/addrlib/r800/chip \ - -DBRAHMA_BUILD=1 + -I$(srcdir)/addrlib/r800/chip addrlib_libamdgpu_addrlib_la_CXXFLAGS = \ $(VISIBILITY_CXXFLAGS) $(CXX11_CXXFLAGS) diff --git a/src/amd/addrlib/core/addrcommon.h b/src/amd/addrlib/core/addrcommon.h index 62f8ac61618..99bb62e77f4 100644 --- a/src/amd/addrlib/core/addrcommon.h +++ b/src/amd/addrlib/core/addrcommon.h @@ -40,7 +40,7 @@ #include <string.h> #include <assert.h> -#if BRAHMA_BUILD && !defined(DEBUG) +#if !defined(DEBUG) #ifdef NDEBUG #define DEBUG 0 #else @@ -73,18 +73,7 @@ #define ADDR_ANALYSIS_ASSUME(expr) do { (void)(expr); } while (0) #endif -#if BRAHMA_BUILD - #define ADDR_ASSERT(__e) assert(__e) -#elif DEBUG - #define ADDR_ASSERT(__e) \ - do { \ - ADDR_ANALYSIS_ASSUME(__e); \ - if ( !((__e) ? TRUE : FALSE)) { ADDR_DBG_BREAK(); } \ - } while (0) -#else //DEBUG - #define ADDR_ASSERT(__e) ADDR_ANALYSIS_ASSUME(__e) -#endif //DEBUG - +#define ADDR_ASSERT(__e) assert(__e) #define ADDR_ASSERT_ALWAYS() ADDR_DBG_BREAK() #define ADDR_UNHANDLED_CASE() ADDR_ASSERT(!"Unhandled case") #define ADDR_NOT_IMPLEMENTED() ADDR_ASSERT(!"Not implemented"); diff --git a/src/amd/addrlib/meson.build b/src/amd/addrlib/meson.build index 1a7f2fdef5d..ed0dde6245b 100644 --- a/src/amd/addrlib/meson.build +++ b/src/amd/addrlib/meson.build @@ -56,5 +56,5 @@ libamdgpu_addrlib = static_library( include_directories : include_directories( 'core', 'inc/chip/gfx9', 'inc/chip/r800', 'gfx9/chip', 'r800/chip', '../common', '../../'), - cpp_args : [cpp_vis_args, '-DBRAHMA_BUILD=1'], + cpp_args : cpp_vis_args, ) diff --git a/src/gallium/winsys/amdgpu/drm/Android.mk b/src/gallium/winsys/amdgpu/drm/Android.mk index a05304ae5de..6e84a0c8de1 100644 --- a/src/gallium/winsys/amdgpu/drm/Android.mk +++ b/src/gallium/winsys/amdgpu/drm/Android.mk @@ -30,9 +30,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(C_SOURCES) -LOCAL_CFLAGS := \ - $(AMDGPU_CFLAGS) \ - -DBRAHMA_BUILD=1 +LOCAL_CFLAGS := $(AMDGPU_CFLAGS) LOCAL_STATIC_LIBRARIES := libmesa_amdgpu_addrlib |