From 12653beacba00146f5bf31816a7c1dc8e51735ff Mon Sep 17 00:00:00 2001 From: "Kristian H. Kristensen" Date: Fri, 22 May 2020 14:37:38 -0700 Subject: [PATCH] mapi: Fix a couple of warning in generated code MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit safe_mul may not be used and clang doesn't understand the "optimize" attribute. src/mapi/glapi/gen/marshal_generated0.c:1216:16: warning: unknown attribute 'optimize' ignored [-Wunknown-attributes] src/mapi/glapi/gen/marshal_generated0.c:36:19: warning: unused function 'safe_mul' [-Wunused-function] Reviewed-by: Rob Clark Reviewed-by: Marek Olšák Reviewed-by: Alyssa Rosenzweig Part-of: --- src/mapi/glapi/gen/gl_marshal.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mapi/glapi/gen/gl_marshal.py b/src/mapi/glapi/gen/gl_marshal.py index 6e8ad20f5cd..c7019a80328 100644 --- a/src/mapi/glapi/gen/gl_marshal.py +++ b/src/mapi/glapi/gen/gl_marshal.py @@ -37,7 +37,7 @@ header = """ #define COMPAT (ctx->API != API_OPENGL_CORE) -static inline int safe_mul(int a, int b) +UNUSED static inline int safe_mul(int a, int b) { if (a < 0 || b < 0) return -1; if (a == 0 || b == 0) return 0; @@ -336,7 +336,7 @@ class PrintCode(gl_XML.gl_print_base): def print_create_marshal_table(self, api): out('/* _mesa_create_marshal_table takes a long time to compile with -O2 */') - out('#ifdef __GNUC__') + out('#if defined(__GNUC__) && !defined(__clang__)') out('__attribute__((optimize("O1")))') out('#endif') out('struct _glapi_table *') -- 2.30.2