KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: pan/bi: Use new disassembler (v2) 

(v2) bifrost_gen_disasm.c generated source belongs to libpanfrost_bifrost_disasm

Fixes the following build errors, which happen with Android P, but not with Android Q

FAILED: out/target/product/x86_64/obj_x86/SHARED_LIBRARIES/gallium_dri_intermediates/LINKED/gallium_dri.so
...
external/mesa/src/panfrost/bifrost/disassemble.c:678: error: undefined reference to 'bi_disasm_fma'
external/mesa/src/panfrost/bifrost/disassemble.c:679: error: undefined reference to 'bi_disasm_add'

Fixes: 792b51713 ("android: pan/bi: Use new disassembler")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6996>
This commit is contained in:
Mauro Rossi 2020-10-04 00:14:29 +02:00 committed by Marge Bot
parent 8163c818e3
commit 27921171e3
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/panfrost/Android.bifrost.mk
View File

@ -39,6 +39,19 @@ LOCAL_C_INCLUDES := \
LOCAL_EXPORT_C_INCLUDE_DIRS := \
$(MESA_TOP)/src/panfrost/bifrost/ \
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
intermediates := $(call local-generated-sources-dir)
LOCAL_GENERATED_SOURCES := \
$(intermediates)/bifrost_gen_disasm.c
bifrost_gen_disasm_gen := $(LOCAL_PATH)/bifrost/gen_disasm.py
bifrost_gen_disasm_deps := $(LOCAL_PATH)/bifrost/ISA.xml
$(intermediates)/bifrost_gen_disasm.c: $(bifrost_gen_disasm_deps)
@mkdir -p $(dir $@)
$(hide) $(MESA_PYTHON2) $(bifrost_gen_disasm_gen) $< > $@
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
@ -70,7 +83,6 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_GENERATED_SOURCES := \
$(intermediates)/bifrost_nir_algebraic.c \
$(intermediates)/bifrost_gen_disasm.c \
$(intermediates)/bi_generated_pack.h \
$(MESA_GEN_GLSL_H)
@ -82,13 +94,6 @@ $(intermediates)/bifrost_nir_algebraic.c: $(bifrost_nir_algebraic_deps)
@mkdir -p $(dir $@)
$(hide) $(MESA_PYTHON2) $(bifrost_nir_algebraic_gen) -p $< > $@
bifrost_gen_disasm_gen := $(LOCAL_PATH)/bifrost/gen_disasm.py
bifrost_gen_disasm_deps := $(LOCAL_PATH)/bifrost/ISA.xml
$(intermediates)/bifrost_gen_disasm.c: $(bifrost_gen_disasm_deps)
@mkdir -p $(dir $@)
$(hide) $(MESA_PYTHON2) $(bifrost_gen_disasm_gen) $< > $@
bi_generated_pack_gen := $(LOCAL_PATH)/bifrost/gen_pack.py
bi_generated_pack_deps := $(LOCAL_PATH)/bifrost/ISA.xml