diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
commit | d99093fb4bb5652015c06274d64083daa2439e4f (patch) | |
tree | cf61513204d97974179580065e85df5c8009087c /games-emulation/pcsx2/files | |
parent | 463397cf1e064185110fe57c568d73f99a06f5d1 (diff) |
gentoo resync : 03.03.2021
Diffstat (limited to 'games-emulation/pcsx2/files')
-rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch | 26 | ||||
-rw-r--r-- | games-emulation/pcsx2/files/pcsx2-1.4.0-xgetbv.patch | 26 |
2 files changed, 0 insertions, 52 deletions
diff --git a/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch b/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch deleted file mode 100644 index cfc941f28244..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 71991f24ef75b7da678d8de8d593bf82677d2708 Mon Sep 17 00:00:00 2001 -From: Yuri Konotopov <ykonotopov@gnome.org> -Date: Mon, 9 Jan 2017 18:37:44 +0400 -Subject: [PATCH] x86emitter: gcc 5 compilation fix - ---- - common/src/x86emitter/cpudetect.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/common/src/x86emitter/cpudetect.cpp b/common/src/x86emitter/cpudetect.cpp -index 717ca89..cf94d7f 100644 ---- a/common/src/x86emitter/cpudetect.cpp -+++ b/common/src/x86emitter/cpudetect.cpp -@@ -16,6 +16,9 @@ - #include "PrecompiledHeader.h" - #include "cpudetect_internal.h" - #include "internal.h" -+#if defined(__GNUC__) -+#include "x86intrin.h" -+#endif - - using namespace x86Emitter; - --- -2.10.2 - diff --git a/games-emulation/pcsx2/files/pcsx2-1.4.0-xgetbv.patch b/games-emulation/pcsx2/files/pcsx2-1.4.0-xgetbv.patch deleted file mode 100644 index e90b0df9b6e2..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.4.0-xgetbv.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 171e7f016dc9e132f9faf40a22f0312d45d356a5 Mon Sep 17 00:00:00 2001 -From: Jonathan Li <jonathan.li@hotmail.co.uk> -Date: Fri, 11 May 2018 01:42:27 +0100 -Subject: [PATCH] common: Work around GCC8 _xgetbv bug - -clang and earlier GCC versions do not provide the _xgetbv intrinsic. -GCC8 does, but unfortunately it's broken. -(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85684). - -Re-use our _xgetbv implementation to avoid the bug, but rename it to -avoid compilation errors as well. ---- - common/include/x86emitter/x86_intrin.h | 7 ++++--- - common/src/x86emitter/cpudetect.cpp | 2 +- - 2 files changed, 5 insertions(+), 4 deletions(-) - ---- a/common/include/intrin_x86.h -+++ b/common/include/intrin_x86.h -@@ -107 +107 @@ static __inline__ __attribute__((always_inline)) void __cpuidex(int CPUInfo[], c --static __inline__ __attribute__((always_inline)) unsigned long long _xgetbv(unsigned int index) -+static __inline__ __attribute__((always_inline)) unsigned long long _xgetbv_pcsx2(unsigned int index) ---- a/common/src/x86emitter/cpudetect.cpp -+++ b/common/src/x86emitter/cpudetect.cpp -@@ -273 +276 @@ void x86capabilities::Identify() -- if((_xgetbv(0) & 6) == 6) // XFEATURE_ENABLED_MASK[2:1] = '11b' (XMM state and YMM state are enabled by OS). -+ if((_xgetbv_pcsx2(0) & 6) == 6) // XFEATURE_ENABLED_MASK[2:1] = '11b' (XMM state and YMM state are enabled by OS). |