--- old/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	2012-05-15 14:29:49.654930425 +0200
+++ new/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	2012-05-15 14:29:49.485747989 +0200
@@ -522,7 +522,7 @@
 
       if ((sig == SIGSEGV || sig == SIGBUS) && os::is_poll_address((address)info->si_addr)) {
         stub = SharedRuntime::get_poll_stub(pc);
-#if defined(__APPLE__) && !defined(AMD64)
+#if defined(__APPLE__)
       // 32-bit Darwin reports a SIGBUS for nearly all memory access exceptions.
       // Catching SIGBUS here prevents the implicit SIGBUS NULL check below from
       // being called, so only do so if the implicit NULL check is not necessary.