From d3929b6af18bcd62dbf3fe5003d43f8ea615bf81 Mon Sep 17 00:00:00 2001
From: Ykkrosh <philip@wildfiregames.com>
Date: Sat, 5 Mar 2011 14:11:57 +0000
Subject: [PATCH] Actually, delete the cpuid() inline asm entirely since it
 still causes various problems in various compilers

This was SVN commit r9024.
---
 source/lib/sysdep/arch/x86_x64/x86_x64.cpp | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/source/lib/sysdep/arch/x86_x64/x86_x64.cpp b/source/lib/sysdep/arch/x86_x64/x86_x64.cpp
index be0c20775e..c34530d974 100644
--- a/source/lib/sysdep/arch/x86_x64/x86_x64.cpp
+++ b/source/lib/sysdep/arch/x86_x64/x86_x64.cpp
@@ -48,8 +48,6 @@
 #if MSC_VERSION >= 1500	// __cpuidex available (allows setting ecx beforehand)
 # undef CPUID_INTRINSIC
 # define CPUID_INTRINSIC 1
-#elif GCC_VERSION
-// (no additional includes needed)
 #else
 # if ARCH_AMD64
 #  include "lib/sysdep/arch/amd64/amd64_asm.h"
@@ -78,25 +76,6 @@ static void cpuid(x86_x64_CpuidRegs* regs)
 	cassert(sizeof(regs->eax) == sizeof(int));
 	cassert(sizeof(*regs) == 4*sizeof(int));
 	__cpuidex((int*)regs, regs->eax, regs->ecx);
-#elif GCC_VERSION
-// Need to preserve the PIC register (ebx/rbx) in case GCC is using it
-# if ARCH_AMD64
-	__asm__ __volatile__ (
-			"pushq %%rbx\n"
-			"cpuid\n"
-			"movl %%ebx, %1\n"
-			"popq %%rbx\n"
-			: "=a" (regs->eax), "=m" (regs->ebx), "=c" (regs->ecx), "=d" (regs->edx)
-			: "a" (regs->eax), "c" (regs->ecx));
-# else
-	__asm__ __volatile__ (
-			"pushl %%ebx\n"
-			"cpuid\n"
-			"movl %%ebx, %1\n"
-			"popl %%ebx\n"
-			: "=a" (regs->eax), "=m" (regs->ebx), "=c" (regs->ecx), "=d" (regs->edx)
-			: "a" (regs->eax), "c" (regs->ecx));
-# endif
 #else
 # if ARCH_AMD64
 	amd64_asm_cpuid(regs);