diff options
| author | Rob Herring <robh@kernel.org> | 2017-12-04 18:35:48 -0600 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2017-12-05 07:47:04 -0600 |
| commit | 20d37da597653201d2c524434907e817bd03b1d0 (patch) | |
| tree | 7d05d776fd848b7c07eb9cfc05b11a30878ce076 /Android.common.mk | |
| parent | dbad0acfaf2930648d85b49f9795c36e077888f8 (diff) | |
| download | mesa-20d37da597653201d2c524434907e817bd03b1d0.tar.gz | |
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>
Diffstat (limited to 'Android.common.mk')
| -rw-r--r-- | Android.common.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Android.common.mk b/Android.common.mk index fcd9a874d53..103e3fec615 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -57,6 +57,9 @@ LOCAL_CFLAGS += \ -DHAVE_FUNC_ATTRIBUTE_FORMAT \ -DHAVE_FUNC_ATTRIBUTE_PACKED \ -DHAVE_FUNC_ATTRIBUTE_ALIAS \ + -DHAVE_FUNC_ATTRIBUTE_NORETURN \ + -DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL \ + -DHAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT \ -DHAVE___BUILTIN_CTZ \ -DHAVE___BUILTIN_POPCOUNT \ -DHAVE___BUILTIN_POPCOUNTLL \ |