Index: Source/NSObject.m
===================================================================
--- Source/NSObject.m	(revision 24352)
+++ Source/NSObject.m	(working copy)
@@ -941,9 +941,10 @@
 #endif
 #endif
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && defined(__i386__)
       // Manipulate the FPU to add the exception mask. (Fixes SIGFPE
       // problems on *BSD)
+      // Note this only works on x86
 
       {
 	volatile short cw;
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24352)
+++ ChangeLog	(working copy)
@@ -1,3 +1,8 @@
+2007-01-16  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSObject.m ([NSObject +initialize]): Apply BSD FPU fix
+	only on x86 machines.
+
 2007-01-07  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSNetServices.m: Locking fix pointed out by Chris.