amd: remove always-true BRAHMA_BUILD define
Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
parent
d555929239
commit
13a7a2d455
|
@ -30,8 +30,6 @@ LOCAL_MODULE := libmesa_amdgpu_addrlib
|
||||||
|
|
||||||
LOCAL_SRC_FILES := $(ADDRLIB_FILES)
|
LOCAL_SRC_FILES := $(ADDRLIB_FILES)
|
||||||
|
|
||||||
LOCAL_CFLAGS := -DBRAHMA_BUILD=1
|
|
||||||
|
|
||||||
LOCAL_C_INCLUDES := \
|
LOCAL_C_INCLUDES := \
|
||||||
$(MESA_TOP)/src \
|
$(MESA_TOP)/src \
|
||||||
$(MESA_TOP)/src/amd/common \
|
$(MESA_TOP)/src/amd/common \
|
||||||
|
|
|
@ -29,8 +29,7 @@ addrlib_libamdgpu_addrlib_la_CPPFLAGS = \
|
||||||
-I$(srcdir)/addrlib/inc/chip/gfx9 \
|
-I$(srcdir)/addrlib/inc/chip/gfx9 \
|
||||||
-I$(srcdir)/addrlib/inc/chip/r800 \
|
-I$(srcdir)/addrlib/inc/chip/r800 \
|
||||||
-I$(srcdir)/addrlib/gfx9/chip \
|
-I$(srcdir)/addrlib/gfx9/chip \
|
||||||
-I$(srcdir)/addrlib/r800/chip \
|
-I$(srcdir)/addrlib/r800/chip
|
||||||
-DBRAHMA_BUILD=1
|
|
||||||
|
|
||||||
addrlib_libamdgpu_addrlib_la_CXXFLAGS = \
|
addrlib_libamdgpu_addrlib_la_CXXFLAGS = \
|
||||||
$(VISIBILITY_CXXFLAGS) $(CXX11_CXXFLAGS)
|
$(VISIBILITY_CXXFLAGS) $(CXX11_CXXFLAGS)
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#if BRAHMA_BUILD && !defined(DEBUG)
|
#if !defined(DEBUG)
|
||||||
#ifdef NDEBUG
|
#ifdef NDEBUG
|
||||||
#define DEBUG 0
|
#define DEBUG 0
|
||||||
#else
|
#else
|
||||||
|
@ -73,18 +73,7 @@
|
||||||
#define ADDR_ANALYSIS_ASSUME(expr) do { (void)(expr); } while (0)
|
#define ADDR_ANALYSIS_ASSUME(expr) do { (void)(expr); } while (0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if BRAHMA_BUILD
|
|
||||||
#define ADDR_ASSERT(__e) assert(__e)
|
#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_ALWAYS() ADDR_DBG_BREAK()
|
#define ADDR_ASSERT_ALWAYS() ADDR_DBG_BREAK()
|
||||||
#define ADDR_UNHANDLED_CASE() ADDR_ASSERT(!"Unhandled case")
|
#define ADDR_UNHANDLED_CASE() ADDR_ASSERT(!"Unhandled case")
|
||||||
#define ADDR_NOT_IMPLEMENTED() ADDR_ASSERT(!"Not implemented");
|
#define ADDR_NOT_IMPLEMENTED() ADDR_ASSERT(!"Not implemented");
|
||||||
|
|
|
@ -56,5 +56,5 @@ libamdgpu_addrlib = static_library(
|
||||||
include_directories : include_directories(
|
include_directories : include_directories(
|
||||||
'core', 'inc/chip/gfx9', 'inc/chip/r800', 'gfx9/chip', 'r800/chip',
|
'core', 'inc/chip/gfx9', 'inc/chip/r800', 'gfx9/chip', 'r800/chip',
|
||||||
'../common', '../../'),
|
'../common', '../../'),
|
||||||
cpp_args : [cpp_vis_args, '-DBRAHMA_BUILD=1'],
|
cpp_args : cpp_vis_args,
|
||||||
)
|
)
|
||||||
|
|
|
@ -30,9 +30,7 @@ include $(CLEAR_VARS)
|
||||||
|
|
||||||
LOCAL_SRC_FILES := $(C_SOURCES)
|
LOCAL_SRC_FILES := $(C_SOURCES)
|
||||||
|
|
||||||
LOCAL_CFLAGS := \
|
LOCAL_CFLAGS := $(AMDGPU_CFLAGS)
|
||||||
$(AMDGPU_CFLAGS) \
|
|
||||||
-DBRAHMA_BUILD=1
|
|
||||||
|
|
||||||
LOCAL_STATIC_LIBRARIES := libmesa_amdgpu_addrlib
|
LOCAL_STATIC_LIBRARIES := libmesa_amdgpu_addrlib
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue