Merge branch 'master' into i486

2 files changed, 21 insertions, 0 deletions

diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
new file mode 100644
index 00000000..5db015dd
--- /dev/null
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -0,0 +1,9 @@
+source+=('xf86-video-intel-no-forced-inlining.patch')
+sha256sums+=('9f3bafc54f22799c9c653321cb7d16b42f938b0085567b000c6271c8ebeac3e7')
+
+eval "$(
+  declare -f prepare | \
+    sed '
+      /patch/a patch -Np1 -i ../xf86-video-intel-no-forced-inlining.patch
+    '
+)"
diff --git a/extra/xf86-video-intel/xf86-video-intel-no-forced-inlining.patch b/extra/xf86-video-intel/xf86-video-intel-no-forced-inlining.patch
new file mode 100644
index 00000000..66bbceea
--- /dev/null
+++ b/extra/xf86-video-intel/xf86-video-intel-no-forced-inlining.patch
@@ -0,0 +1,12 @@
+diff -rauN xf86-video-intel/src/sna/compiler.h xf86-video-intel-no-forced-inlining-patch/src/sna/compiler.h
+--- xf86-video-intel/src/sna/compiler.h	2018-09-15 11:20:05.083333262 +0200
++++ xf86-video-intel-no-forced-inlining-patch/src/sna/compiler.h	2018-09-15 11:21:26.483333263 +0200
+@@ -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))