OSDN Git Service

Android: enable noreturn and returns_nonnull attributes
authorRob Herring <robh@kernel.org>
Tue, 5 Dec 2017 00:35:48 +0000 (18:35 -0600)
committerRob Herring <robh@kernel.org>
Tue, 5 Dec 2017 13:47:04 +0000 (07:47 -0600)
commit20d37da597653201d2c524434907e817bd03b1d0
tree7d05d776fd848b7c07eb9cfc05b11a30878ce076
parentdbad0acfaf2930648d85b49f9795c36e077888f8
Android: enable noreturn and returns_nonnull attributes

Commit 94ca8e04adf6 ("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: 94ca8e04adf6 ("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>
Android.common.mk