Andreas Boll pushed to branch debian-unstable at X Strike Force / driver / xserver-xorg-video-intel
Commits: 6d3f716d by Andreas Boll at 2018-10-09T15:49:09Z Add 01_Fix-build-on-i686.diff, fixes FTBFS on i386 with gcc-8 (Closes: #909860). - - - - - 03f6165e by Andreas Boll at 2018-10-09T15:49:25Z Upload to unstable. - - - - - 3 changed files: - debian/changelog - + debian/patches/01_Fix-build-on-i686.diff - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +xserver-xorg-video-intel (2:2.99.917+git20180925-2) unstable; urgency=medium + + * Add 01_Fix-build-on-i686.diff, fixes FTBFS on i386 with gcc-8 + (Closes: #909860). + + -- Andreas Boll <[email protected]> Tue, 09 Oct 2018 17:42:33 +0200 + xserver-xorg-video-intel (2:2.99.917+git20180925-1) unstable; urgency=medium * New upstream snapshot ===================================== debian/patches/01_Fix-build-on-i686.diff ===================================== @@ -0,0 +1,49 @@ +From a414d4e24461da1cb4cef8ee910bc57bab360ceb Mon Sep 17 00:00:00 2001 +From: Adam Jackson <[email protected]> +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. + +- ajax +--- + 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 3c176a16..bc447c7a 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 + #define fastcall __attribute__((regparm(3))) + #define must_check __attribute__((warn_unused_result)) + #define constant __attribute__((const)) +-- +2.16.2 + ===================================== debian/patches/series ===================================== @@ -1 +1 @@ -#placeholder +01_Fix-build-on-i686.diff View it on GitLab: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-intel/compare/5463c52b38759ab78aeb397990e97c5d5009bc8d...03f6165efb212730bec220ba2a7626ce90f310c5 -- View it on GitLab: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-intel/compare/5463c52b38759ab78aeb397990e97c5d5009bc8d...03f6165efb212730bec220ba2a7626ce90f310c5 You're receiving this email because of your account on salsa.debian.org.
