Module: Mesa
Branch: master
Commit: db3aaa313740dbdb16b75c68ec05c72d31003ece
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=db3aaa313740dbdb16b75c68ec05c72d31003ece
Author: Mauro Rossi <issor.or...@gmail.com>
Date: Tue Jan 10 01:53:01 2017 +0100
android: radeonsi: fix LLVMInitializeAMDGPU* functions declaration
LLVMInitializeAMDGPU* functions need to be explicitly declared
and mesa expects them via <llvm-c/Target.h> header,
but LLVM needs to be instructed to invoke its own LLVM_TARGET(AMDGPU) macro,
or the functions will not be available.
A new llvm cflag (-DFORCE_BUILD_AMDGPU) serves this purpose,
the same mechanism is used also by other llvm targets e.g. FORCE_BUILD_ARM
A necessary prerequisite is to have AMDGPU target handled accordingly
in llvm config files i.e. {Target,AsmParser,AsmPrinter}.def
for llvm device build includes.
This avoids the following building errors:
external/mesa/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c:129:2: error:
implicit declaration of function 'LLVMInitializeAMDGPUTargetInfo' is invalid in
C99 [-Werror,-Wimplicit-function-declaration]
LLVMInitializeAMDGPUTargetInfo();
^
external/mesa/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c:130:2: error:
implicit declaration of function 'LLVMInitializeAMDGPUTarget' is invalid in C99
[-Werror,-Wimplicit-function-declaration]
LLVMInitializeAMDGPUTarget();
^
external/mesa/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c:131:2: error:
implicit declaration of function 'LLVMInitializeAMDGPUTargetMC' is invalid in
C99 [-Werror,-Wimplicit-function-declaration]
LLVMInitializeAMDGPUTargetMC();
^
external/mesa/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c:132:2: error:
implicit declaration of function 'LLVMInitializeAMDGPUAsmPrinter' is invalid in
C99 [-Werror,-Wimplicit-function-declaration]
LLVMInitializeAMDGPUAsmPrinter();
^
Acked-by: Nicolai Hähnle <nicolai.haeh...@amd.com>
Acked-by: Emil Velikov <emil.veli...@collabora.com>
---
src/gallium/drivers/radeonsi/Android.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/gallium/drivers/radeonsi/Android.mk
b/src/gallium/drivers/radeonsi/Android.mk
index e35f6b1..b32c8dc 100644
--- a/src/gallium/drivers/radeonsi/Android.mk
+++ b/src/gallium/drivers/radeonsi/Android.mk
@@ -30,6 +30,8 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(C_SOURCES)
+LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare
LLVMInitializeAMDGPU* functions
+
LOCAL_C_INCLUDES := $(MESA_TOP)/src/amd/common
LOCAL_SHARED_LIBRARIES := libdrm_radeon
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
