Commit 41c9a2e7 authored by maurossi's avatar maurossi
Browse files

android: pan/mdg: Separate disassembler and compiler targets

Fixes the following building errors:

ld.lld: error: undefined symbol: mir_print_constant_component
>>> referenced by disassemble.c:356 (external/mesa/src/panfrost/midgard/disassemble.c:356)
...
ld.lld: error: undefined symbol: mir_print_constant_component
>>> referenced by disassemble.c:416 (external/mesa/src/panfrost/midgard/disassemble.c:416)

Fixes: b792d613

 ("pan/mdg: Separate disassembler and compiler targets")
Signed-off-by: maurossi's avatarMauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Alyssa Rosenzweig's avatarAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <mesa/mesa!6261>
parent b9e58be3
......@@ -64,6 +64,7 @@ LOCAL_STATIC_LIBRARIES += \
libpanfrost_bifrost \
libpanfrost_lib \
libpanfrost_midgard \
libpanfrost_midgard_disasm \
libpanfrost_shared \
libpanfrost_util \
......
......@@ -18,6 +18,31 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
# build libpanfrost_midgard_disasm
include $(CLEAR_VARS)
LOCAL_MODULE := libpanfrost_midgard_disasm
LOCAL_SRC_FILES := \
$(midgard_disasm_FILES)
LOCAL_C_INCLUDES := \
$(MESA_TOP)/include \
$(MESA_TOP)/src/compiler/nir/ \
$(MESA_TOP)/src/gallium/auxiliary/ \
$(MESA_TOP)/src/gallium/include/ \
$(MESA_TOP)/src/mapi/ \
$(MESA_TOP)/src/mesa/ \
$(MESA_TOP)/src/panfrost/include/ \
$(MESA_TOP)/src/panfrost/midgard/
LOCAL_EXPORT_C_INCLUDE_DIRS := \
$(MESA_TOP)/src/panfrost/midgard/ \
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
# build libpanfrost_midgard
include $(CLEAR_VARS)
LOCAL_MODULE := libpanfrost_midgard
......@@ -46,6 +71,7 @@ LOCAL_STATIC_LIBRARIES := \
libmesa_nir \
libmesa_st_mesa \
libpanfrost_util \
libpanfrost_midgard_disasm
midgard_nir_algebraic_gen := $(LOCAL_PATH)/midgard/midgard_nir_algebraic.py
midgard_nir_algebraic_deps := \
......@@ -59,4 +85,4 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \
$(MESA_TOP)/src/panfrost/midgard/ \
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
\ No newline at end of file
include $(BUILD_STATIC_LIBRARY)
......@@ -74,6 +74,13 @@ midgard_FILES := \
midgard/nir_undef_to_zero.c \
midgard/nir_fuse_io_16.c \
midgard_disasm_FILES := \
midgard/disassemble.c \
midgard/disassemble.h \
midgard/midgard_ops.c \
midgard/midgard_ops.h \
midgard/midgard_print_constant.c
shared_FILES := \
shared/pan_minmax_cache.c \
shared/pan_tiling.c \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment