-
Rob Herring authored
Commit 94ca8e04 ("spirv: Add vtn_fail and vtn_assert helpers") broke Android builds which have -Werror enabled with the following errors: external/mesa3d/src/compiler/spirv/spirv_to_nir.c:272:1: error: control may reach end of non-void function [-Werror,-Wreturn-type] external/mesa3d/src/compiler/spirv/spirv_to_nir.c:810:1: error: control may reach end of non-void function [-Werror,-Wreturn-type] ... The problem is the noreturn attribute is not enabled and we to define HAVE_FUNC_ATTRIBUTE_NORETURN. Auditing src/util/macros.h, we're also missing HAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL and HAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT, so add them too. Fixes: 94ca8e04 ("spirv: Add vtn_fail and vtn_assert helpers") Cc: Jason Ekstrand <jason.ekstrand@intel.com> Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Signed-off-by: Rob Herring <robh@kernel.org>
20d37da5