diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-03 13:42:34 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-03 13:42:34 +0000 |
commit | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch) | |
tree | 3cb05783d73b2c33589ba305144a31c718e123cd /x11-drivers/xf86-video-intel/files | |
parent | 16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff) |
gentoo resync : 03.03.2019
Diffstat (limited to 'x11-drivers/xf86-video-intel/files')
-rw-r--r-- | x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917_p20180214-Fix-build-on-i686.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917_p20180214-Fix-build-on-i686.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917_p20180214-Fix-build-on-i686.patch new file mode 100644 index 000000000000..279a61ae4439 --- /dev/null +++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917_p20180214-Fix-build-on-i686.patch @@ -0,0 +1,47 @@ +From 9e6e003e3468dca674ac848e2669af973da02fd4 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 6 Mar 2018 12:07:46 -0500 +Subject: [PATCH] Fix build on i686 + +Presumably this only matters for i686 because amd64 implies sse2, but: + +BUILDSTDERR: In file included from gen4_vertex.c:34: +BUILDSTDERR: gen4_vertex.c: In function 'emit_vertex': +BUILDSTDERR: sna_render_inline.h:40:26: error: inlining failed in call to always_inline 'vertex_emit_2s': target specific option mismatch +BUILDSTDERR: static force_inline void vertex_emit_2s(struct sna *sna, int16_t x, int16_t y) +BUILDSTDERR: ^~~~~~~~~~~~~~ +BUILDSTDERR: gen4_vertex.c:308:25: note: called from here +BUILDSTDERR: #define OUT_VERTEX(x,y) vertex_emit_2s(sna, x,y) /* XXX assert(!too_large(x, y)); */ +BUILDSTDERR: ^~~~~~~~~~~~~~~~~~~~~~~~ +BUILDSTDERR: gen4_vertex.c:360:2: note: in expansion of macro 'OUT_VERTEX' +BUILDSTDERR: OUT_VERTEX(dstX, dstY); +BUILDSTDERR: ^~~~~~~~~~ + +The bug here appears to be that emit_vertex() is declared 'sse2' but +vertex_emit_2s is merely always_inline. gcc8 decides that since you said +always_inline you need to have explicitly cloned it for every +permutation of targets. Merely saying inline seems to do the job of +cloning vertex_emit_2s as much as necessary. + +So to reiterate: if you say always-inline, it won't, but if you just say +maybe inline, it will. Thanks gcc, that's helpful. +--- + src/sna/compiler.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sna/compiler.h b/src/sna/compiler.h +index 0f3775ec..2e579b15 100644 +--- a/src/sna/compiler.h ++++ b/src/sna/compiler.h +@@ -32,7 +32,7 @@ + #define likely(expr) (__builtin_expect (!!(expr), 1)) + #define unlikely(expr) (__builtin_expect (!!(expr), 0)) + #define noinline __attribute__((noinline)) +-#define force_inline inline __attribute__((always_inline)) ++#define force_inline inline /* __attribute__((always_inline)) */ + #define fastcall __attribute__((regparm(3))) + #define must_check __attribute__((warn_unused_result)) + #define constant __attribute__((const)) +-- +2.19.2 + |