<div dir="ltr">Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Dec 4, 2017 at 6:21 PM, Rob Herring <span dir="ltr"><<a href="mailto:robh@kernel.org" target="_blank">robh@kernel.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Commit 94ca8e04adf6 ("spirv: Add vtn_fail and vtn_assert helpers") broke<br>
Android builds which have -Werror enabled with the following errors:<br>
<br>
external/mesa3d/src/compiler/<wbr>spirv/spirv_to_nir.c:272:1: error: control may reach end of non-void function [-Werror,-Wreturn-type]<br>
external/mesa3d/src/compiler/<wbr>spirv/spirv_to_nir.c:810:1: error: control may reach end of non-void function [-Werror,-Wreturn-type]<br>
...<br>
<br>
The problem is the noreturn attribute is not enabled and we to define<br>
HAVE_FUNC_ATTRIBUTE_NORETURN.<br>
<br>
Auditing src/util/macros.h, we're also missing<br>
HAVE_FUNC_ATTRIBUTE_RETURNS_<wbr>NONNULL, so add it too.<br>
<br>
Fixes: 94ca8e04adf6 ("spirv: Add vtn_fail and vtn_assert helpers")<br>
Cc: Jason Ekstrand <<a href="mailto:jason.ekstrand@intel.com">jason.ekstrand@intel.com</a>><br>
Signed-off-by: Rob Herring <<a href="mailto:robh@kernel.org">robh@kernel.org</a>><br>
---<br>
<a href="http://Android.common.mk" rel="noreferrer" target="_blank">Android.common.mk</a> | 2 ++<br>
1 file changed, 2 insertions(+)<br>
<br>
diff --git a/<a href="http://Android.common.mk" rel="noreferrer" target="_blank">Android.common.mk</a> b/<a href="http://Android.common.mk" rel="noreferrer" target="_blank">Android.common.mk</a><br>
index f080d996a7d9..f905c5e697d0 100644<br>
--- a/<a href="http://Android.common.mk" rel="noreferrer" target="_blank">Android.common.mk</a><br>
+++ b/<a href="http://Android.common.mk" rel="noreferrer" target="_blank">Android.common.mk</a><br>
@@ -57,6 +57,8 @@ LOCAL_CFLAGS += \<br>
-DHAVE_FUNC_ATTRIBUTE_FORMAT \<br>
-DHAVE_FUNC_ATTRIBUTE_PACKED \<br>
-DHAVE_FUNC_ATTRIBUTE_ALIAS \<br>
+ -DHAVE_FUNC_ATTRIBUTE_NORETURN \<br>
+ -DHAVE_FUNC_ATTRIBUTE_RETURNS_<wbr>NONNULL \<br>
-DHAVE___BUILTIN_CTZ \<br>
-DHAVE___BUILTIN_POPCOUNT \<br>
-DHAVE___BUILTIN_POPCOUNTLL \<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.14.1<br>
<br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div>