blob: 52916f8b4aa9f67481c4c9b9c1e10fe32bf9a08f [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -04001From a414d4e24461da1cb4cef8ee910bc57bab360ceb Mon Sep 17 00:00:00 2001
2From: Adam Jackson <ajax@redhat.com>
3Date: Tue, 6 Mar 2018 12:07:46 -0500
4Subject: [PATCH] Fix build on i686
5
6Presumably this only matters for i686 because amd64 implies sse2, but:
7
8BUILDSTDERR: In file included from gen4_vertex.c:34:
9BUILDSTDERR: gen4_vertex.c: In function 'emit_vertex':
10BUILDSTDERR: sna_render_inline.h:40:26: error: inlining failed in call to always_inline 'vertex_emit_2s': target specific option mismatch
11BUILDSTDERR: static force_inline void vertex_emit_2s(struct sna *sna, int16_t x, int16_t y)
12BUILDSTDERR: ^~~~~~~~~~~~~~
13BUILDSTDERR: gen4_vertex.c:308:25: note: called from here
14BUILDSTDERR: #define OUT_VERTEX(x,y) vertex_emit_2s(sna, x,y) /* XXX assert(!too_large(x, y)); */
15BUILDSTDERR: ^~~~~~~~~~~~~~~~~~~~~~~~
16BUILDSTDERR: gen4_vertex.c:360:2: note: in expansion of macro 'OUT_VERTEX'
17BUILDSTDERR: OUT_VERTEX(dstX, dstY);
18BUILDSTDERR: ^~~~~~~~~~
19
20The bug here appears to be that emit_vertex() is declared 'sse2' but
21vertex_emit_2s is merely always_inline. gcc8 decides that since you said
22always_inline you need to have explicitly cloned it for every
23permutation of targets. Merely saying inline seems to do the job of
24cloning vertex_emit_2s as much as necessary.
25
26So to reiterate: if you say always-inline, it won't, but if you just say
27maybe inline, it will. Thanks gcc, that's helpful.
28
29- ajax
30
31Patch taken from Fedora.
32
33Upstream-Status: Pending
34Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
35
36---
37 src/sna/compiler.h | 2 +-
38 1 file changed, 1 insertion(+), 1 deletion(-)
39
40diff --git a/src/sna/compiler.h b/src/sna/compiler.h
41index 3c176a16..bc447c7a 100644
42--- a/src/sna/compiler.h
43+++ b/src/sna/compiler.h
44@@ -32,7 +32,7 @@
45 #define likely(expr) (__builtin_expect (!!(expr), 1))
46 #define unlikely(expr) (__builtin_expect (!!(expr), 0))
47 #define noinline __attribute__((noinline))
48-#define force_inline inline __attribute__((always_inline))
49+#define force_inline inline
50 #define fastcall __attribute__((regparm(3)))
51 #define must_check __attribute__((warn_unused_result))
52 #define constant __attribute__((const))
53--
542.16.2
55