Module: Mesa Branch: master Commit: 27921171e349a7708298a798ddeeec113c5af4be URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=27921171e349a7708298a798ddeeec113c5af4be
Author: Mauro Rossi <[email protected]> Date: Sun Oct 4 00:14:29 2020 +0200 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 <[email protected]> Reviewed-by: Alyssa Rosenzweig <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6996> --- src/panfrost/Android.bifrost.mk | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/panfrost/Android.bifrost.mk b/src/panfrost/Android.bifrost.mk index f5157c428ec..a94f1736be7 100644 --- a/src/panfrost/Android.bifrost.mk +++ b/src/panfrost/Android.bifrost.mk @@ -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 _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
