i965: Add a weak no-op nir_print_instr() symbol

intel_asm_annotation.c is part of libintel_compiler.la, which contains
code for disassembling and validating shaders that we want to call in
aubinator_error_decode.

dump_assembly() calls nir_print_instr() to print annotations, and
although dump_assembly() is not called by aubinator_error_decode (nor is
any function in intel_asm_annotation.c) it causes undefined references
to nir_print_instr().

To work around, provide a no-op weak symbol to resolve against.
This commit is contained in:
Matt Turner
2017-05-01 11:43:07 -07:00
parent d98e82c772
commit aae2626be8

View File

@@ -27,6 +27,8 @@
#include "intel_asm_annotation.h" #include "intel_asm_annotation.h"
#include "compiler/nir/nir.h" #include "compiler/nir/nir.h"
__attribute__((weak)) void nir_print_instr(const nir_instr *instr, FILE *fp) {}
void void
dump_assembly(void *assembly, int num_annotations, struct annotation *annotation, dump_assembly(void *assembly, int num_annotations, struct annotation *annotation,
const struct gen_device_info *devinfo) const struct gen_device_info *devinfo)