android: pan/bi: Separate disasm/compiler targets

Fixes the following building errors:

ld.lld: error: undefined symbol: bi_interp_mode_name
>>> referenced by bi_print.c:207 (external/mesa/src/panfrost/bifrost/bi_print.c:207)
...
ld.lld: error: undefined symbol: bi_round_mode_name
>>> referenced by bi_print.c:285 (external/mesa/src/panfrost/bifrost/bi_print.c:285)

ld.lld: error: undefined symbol: bi_clause_type_name
>>> referenced by disassemble.c:142 (external/mesa/src/panfrost/bifrost/disassemble.c:142)
...
ld.lld: error: undefined symbol: bi_ldst_type_name
>>> referenced by disassemble.c:0 (external/mesa/src/panfrost/bifrost/disassemble.c:0)

Fixes: 14bb72c68 ("pan/bi: Separate disasm/compiler targets")
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/6261>

diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk
index 8e4e202dde11f7961b7bec6d431d7187d218b1b3..a5a779176fdcab144e0a2f7eb6d98df769079602 100644 (file)
--- a/src/gallium/targets/dri/Android.mk
+++ b/src/gallium/targets/dri/Android.mk
@@ -62,6 +62,7 @@ LOCAL_STATIC_LIBRARIES += \
        libfreedreno_perfcntrs \
        libmesa_gallium \
        libpanfrost_bifrost \
+       libpanfrost_bifrost_disasm \
        libpanfrost_lib \
        libpanfrost_midgard \
        libpanfrost_midgard_disasm \

diff --git a/src/panfrost/Android.bifrost.mk b/src/panfrost/Android.bifrost.mk
index 3c77cb4dac2f726bb88d91e1ea711ea8ce330436..fc1a3a1ed557583df1f671984681d19134566832 100644 (file)
--- a/src/panfrost/Android.bifrost.mk
+++ b/src/panfrost/Android.bifrost.mk
@@ -18,6 +18,31 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+# build libpanfrost_bifrost_disasm
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libpanfrost_bifrost_disasm
+
+LOCAL_SRC_FILES := \
+       $(bifrost_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/bifrost/ \
+       $(MESA_TOP)/src/panfrost/include/
+
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+       $(MESA_TOP)/src/panfrost/bifrost/ \
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+# build libpanfrost_bifrost
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libpanfrost_bifrost
@@ -58,4 +83,4 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \
        $(MESA_TOP)/src/panfrost/bifrost/ \
 
 include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
\ No newline at end of file
+include $(BUILD_STATIC_LIBRARY)

diff --git a/src/panfrost/Makefile.sources b/src/panfrost/Makefile.sources
index 19437f39b3c32b6348d018976327f960aee72048..3bb00e9b733421b5c0ed353a0cc02cecc7a66523 100644 (file)
--- a/src/panfrost/Makefile.sources
+++ b/src/panfrost/Makefile.sources
@@ -16,9 +16,13 @@ bifrost_FILES := \
         bifrost/bi_quirks.h \
         bifrost/bir.c \
         bifrost/compiler.h \
-        bifrost/cmdline.c \
+        bifrost/cmdline.c
+
+bifrost_disasm_FILES := \
         bifrost/disassemble.c \
-        bifrost/disassemble.h
+        bifrost/disassemble.h \
+        bifrost/bi_print_common.c \
+        bifrost/bi_print_common.h
 
 lib_FILES := \
         lib/decode_common.c \