Mon Apr 20 00:34:20 2020 UTC ()
Don't conflict with macros from *intrin.h.


(joerg)
diff -r1.3 -r1.4 pkgsrc/emulators/dolphin-emu/distinfo
diff -r0 -r1.1 pkgsrc/emulators/dolphin-emu/patches/patch-Source_Core_Common_x64CPUDetect.cpp
cvs diff -r1.3 -r1.4 pkgsrc/emulators/dolphin-emu/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/dolphin-emu/distinfo 2019/10/25 09:56:51 1.3
+++ pkgsrc/emulators/dolphin-emu/distinfo 2020/04/20 00:34:20 1.4
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: distinfo,v 1.3 2019/10/25 09:56:51 kamil Exp $ 1$NetBSD: distinfo,v 1.4 2020/04/20 00:34:20 joerg Exp $
2 2
3SHA1 (dolphin-emu-5.0.tar.gz) = 6553f9fe5281326b86f33fb6b99a93fe6a8820af 3SHA1 (dolphin-emu-5.0.tar.gz) = 6553f9fe5281326b86f33fb6b99a93fe6a8820af
4RMD160 (dolphin-emu-5.0.tar.gz) = e8c4cb2c903b78c3e21cb12b0724ab0728c1391a 4RMD160 (dolphin-emu-5.0.tar.gz) = e8c4cb2c903b78c3e21cb12b0724ab0728c1391a
5SHA512 (dolphin-emu-5.0.tar.gz) = 8de76f811abfb82e19502336734e86ba600c11d9fa95bcf7f70a2a525165d07ead826854c39377602aab7856a057af9ba91bff458cf2dd008712527290489d3a 5SHA512 (dolphin-emu-5.0.tar.gz) = 8de76f811abfb82e19502336734e86ba600c11d9fa95bcf7f70a2a525165d07ead826854c39377602aab7856a057af9ba91bff458cf2dd008712527290489d3a
6Size (dolphin-emu-5.0.tar.gz) = 38246344 bytes 6Size (dolphin-emu-5.0.tar.gz) = 38246344 bytes
7SHA1 (patch-CMakeLists.txt) = 6e0163c4d385f31981a13e4f8527c873820ba6a6 7SHA1 (patch-CMakeLists.txt) = 6e0163c4d385f31981a13e4f8527c873820ba6a6
8SHA1 (patch-Externals_SFML_include_SFML_Config.hpp) = 75ece2ce86b54b219a80d6ff028ecc80a00454f5 8SHA1 (patch-Externals_SFML_include_SFML_Config.hpp) = 75ece2ce86b54b219a80d6ff028ecc80a00454f5
9SHA1 (patch-Source_Core_Common_FileUtil.cpp) = 27b859714e294abbfb3f468928e22b30abfd0099 9SHA1 (patch-Source_Core_Common_FileUtil.cpp) = 27b859714e294abbfb3f468928e22b30abfd0099
10SHA1 (patch-Source_Core_Common_MemoryUtil.cpp) = af681a3f43687f7af09c87732a7a2da8e8c58e05 10SHA1 (patch-Source_Core_Common_MemoryUtil.cpp) = af681a3f43687f7af09c87732a7a2da8e8c58e05
11SHA1 (patch-Source_Core_Common_StringUtil.cpp) = 3a53d42ae9da1d50c0693bd222cb20be9ebe5a16 11SHA1 (patch-Source_Core_Common_StringUtil.cpp) = 3a53d42ae9da1d50c0693bd222cb20be9ebe5a16
12SHA1 (patch-Source_Core_Common_Thread.cpp) = 8356c548c43ad762f4d226cf3d51a854f0a8b7f3 12SHA1 (patch-Source_Core_Common_Thread.cpp) = 8356c548c43ad762f4d226cf3d51a854f0a8b7f3
 13SHA1 (patch-Source_Core_Common_x64CPUDetect.cpp) = 9238fc6d7c9f225fbd9885c1e5b07b237041e4f7
13SHA1 (patch-Source_Core_Core_HW_EXI__DeviceEthernet.h) = 144250d51b78e287a8305e75ee06e24c305c3d75 14SHA1 (patch-Source_Core_Core_HW_EXI__DeviceEthernet.h) = 144250d51b78e287a8305e75ee06e24c305c3d75
14SHA1 (patch-Source_Core_Core_IPC__HLE_WII__Socket.h) = 8de6dec95689efb63c3795d3e361b5bd9a8d7768 15SHA1 (patch-Source_Core_Core_IPC__HLE_WII__Socket.h) = 8de6dec95689efb63c3795d3e361b5bd9a8d7768
15SHA1 (patch-Source_Core_Core_MemTools.cpp) = 2316e8103749fe174db7f694f2eeb22035cd135c 16SHA1 (patch-Source_Core_Core_MemTools.cpp) = 2316e8103749fe174db7f694f2eeb22035cd135c
16SHA1 (patch-Source_Core_VideoCommon_DriverDetails.cpp) = 227d2ab5835be08b23f13346c9b9252ae3295155 17SHA1 (patch-Source_Core_VideoCommon_DriverDetails.cpp) = 227d2ab5835be08b23f13346c9b9252ae3295155
17SHA1 (patch-Source_Core_VideoCommon_DriverDetails.h) = dc3a8f559253ea2a3f75223cfe7eb0a6c2c39ce1 18SHA1 (patch-Source_Core_VideoCommon_DriverDetails.h) = dc3a8f559253ea2a3f75223cfe7eb0a6c2c39ce1
File Added: pkgsrc/emulators/dolphin-emu/patches/patch-Source_Core_Common_x64CPUDetect.cpp
$NetBSD: patch-Source_Core_Common_x64CPUDetect.cpp,v 1.1 2020/04/20 00:34:20 joerg Exp $

--- Source/Core/Common/x64CPUDetect.cpp.orig	2020-04-19 15:52:44.582835202 +0000
+++ Source/Core/Common/x64CPUDetect.cpp
@@ -42,13 +42,18 @@ static inline void __cpuid(int info[4], 
 }
 
 #define _XCR_XFEATURE_ENABLED_MASK 0
-static u64 _xgetbv(u32 index)
+static u64 my_xgetbv(u32 index)
 {
 	u32 eax, edx;
 	__asm__ __volatile__("xgetbv" : "=a"(eax), "=d"(edx) : "c"(index));
 	return ((u64)edx << 32) | eax;
 }
 
+#else
+static u64 my_xgetbv(u32 index)
+{
+	return _xgetbv(index);
+}
 #endif // ifndef _WIN32
 
 CPUInfo cpu_info;
@@ -134,7 +139,7 @@ void CPUInfo::Detect()
 		//  - XGETBV result has the XCR bit set.
 		if (((cpu_id[2] >> 28) & 1) && ((cpu_id[2] >> 27) & 1))
 		{
-			if ((_xgetbv(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6)
+			if ((my_xgetbv(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6)
 			{
 				bAVX = true;
 				if ((cpu_id[2] >> 12) & 1)