mirror of
git://slackware.nl/current.git
synced 2025-01-09 05:24:36 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
49 lines
2 KiB
Diff
49 lines
2 KiB
Diff
From a414d4e24461da1cb4cef8ee910bc57bab360ceb 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.
|
|
|
|
- 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
|
|
|