From 91f919d4005937fb5ce16bee95f10e9da8552204 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Fri, 2 Dec 2011 02:31:20 +0100
Subject: [PATCH 3/6] multi-arch binary: use compiler defines in FPU detection code

---
 libs/pbd/fpu.cc |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libs/pbd/fpu.cc b/libs/pbd/fpu.cc
index a004d8a..1018414 100644
--- a/libs/pbd/fpu.cc
+++ b/libs/pbd/fpu.cc
@@ -19,12 +19,12 @@ FPU::FPU ()
 
 	_flags = Flags (0);
 
-#ifndef ARCH_X86
+#if !( (defined __x86_64__) || (defined __i386__) ) // !ARCH_X86
 	return;
-#endif
+#else
 
 	
-#ifndef USE_X86_64_ASM
+#ifndef _LP64 //USE_X86_64_ASM
 	asm volatile (
 		"mov $1, %%eax\n"
 		"pushl %%ebx\n"
@@ -102,6 +102,7 @@ FPU::FPU ()
 			free (fxbuf);
 		}
 	}
+#endif
 }			
 
 FPU::~FPU ()
-- 
1.6.5.2