All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [git commit branch/2018.02.x] supertuxkart: fix build on bdver3
@ 2018-11-25 22:24 Peter Korsgaard
  0 siblings, 0 replies; only message in thread
From: Peter Korsgaard @ 2018-11-25 22:24 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=e43f9631d7f20bfac1dea0e2beabf822f5b97458
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2018.02.x

Retrieve upstream patch to fix build failure in
lib/graphics_utils/mipmap/cpusimd.h due to direct inclusion of
intrinsics headers:
https://github.com/supertuxkart/stk-code/issues/3091

Fixes:
 - http://autobuild.buildroot.org/results/52bd5c45b0d04a863a2530d388899b3e46494ee9

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 236a7d5d786ba332154d770bc434c5f4e978d539)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/supertuxkart/0001-Fix-3091.patch | 59 ++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/package/supertuxkart/0001-Fix-3091.patch b/package/supertuxkart/0001-Fix-3091.patch
new file mode 100644
index 0000000000..dae2a37ce1
--- /dev/null
+++ b/package/supertuxkart/0001-Fix-3091.patch
@@ -0,0 +1,59 @@
+From 813b08bc73e4e93714b972ee56c64b4771735e01 Mon Sep 17 00:00:00 2001
+From: Benau <Benau@users.noreply.github.com>
+Date: Sun, 14 Jan 2018 10:19:37 +0800
+Subject: [PATCH] Fix #3091
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com
+[Retrieved from:
+https://github.com/supertuxkart/stk-code/commit/813b08bc73e4e93714b972ee56c64b4771735e01]
+---
+ lib/graphics_utils/mipmap/cpusimd.h | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/lib/graphics_utils/mipmap/cpusimd.h b/lib/graphics_utils/mipmap/cpusimd.h
+index 1dc2c730b2..5e2cf30e5f 100644
+--- a/lib/graphics_utils/mipmap/cpusimd.h
++++ b/lib/graphics_utils/mipmap/cpusimd.h
+@@ -38,11 +38,11 @@
+  #include <mmintrin.h>
+  #define CPU_MMX_SUPPORT (1)
+ #endif
+-#if __SSE__ || _M_X64 || _M_IX86_FP >= 1  || CPU_ENABLE_SSE
++#if __SSE__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 1 ) ) || CPU_ENABLE_SSE
+  #include <xmmintrin.h>
+  #define CPU_SSE_SUPPORT (1)
+ #endif
+-#if __SSE2__ || _M_X64 || _M_IX86_FP >= 2  || CPU_ENABLE_SSE2
++#if __SSE2__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 2 ) ) || CPU_ENABLE_SSE2
+  #include <emmintrin.h>
+  #define CPU_SSE2_SUPPORT (1)
+ #endif
+@@ -95,23 +95,23 @@
+  #define CPU_POPCNT_SUPPORT (1)
+ #endif
+ #if __LZCNT__ || CPU_ENABLE_LZCNT
+- #include <lzcntintrin.h>
++ #include <x86intrin.h>
+  #define CPU_LZCNT_SUPPORT (1)
+ #endif
+ #if __F16C__ || CPU_ENABLE_F16C
+- #include <f16cintrin.h>
++ #include <x86intrin.h>
+  #define CPU_F16C_SUPPORT (1)
+ #endif
+ #if __BMI__ || CPU_ENABLE_BMI
+- #include <bmiintrin.h>
++ #include <x86intrin.h>
+  #define CPU_BMI_SUPPORT (1)
+ #endif
+ #if __BMI2__ || CPU_ENABLE_BMI2
+- #include <bmi2intrin.h>
++ #include <x86intrin.h>
+  #define CPU_BMI2_SUPPORT (1)
+ #endif
+ #if __TBM__ || CPU_ENABLE_TBM
+- #include <tbmintrin.h>
++ #include <x86intrin.h>
+  #define CPU_TBM_SUPPORT (1)
+ #endif
+ 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2018-11-25 22:24 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-25 22:24 [Buildroot] [git commit branch/2018.02.x] supertuxkart: fix build on bdver3 Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.