diff -urN ooo_OOA680_m1_src.orig/sal/osl/unx/interlck.c ooo_OOA680_m1_src/sal/osl/unx/interlck.c
--- ooo_OOA680_m1_src.orig/sal/osl/unx/interlck.c	2005-10-02 16:52:17.000000000 +0200
+++ ooo_OOA680_m1_src/sal/osl/unx/interlck.c	2005-12-17 23:45:16.000000000 +0100
@@ -43,7 +43,7 @@
 #error please use asm/interlck_sparc.s
 #elif defined ( SOLARIS) && defined ( X86 )
 #error please use asm/interlck_x86.s
-#elif defined ( GCC ) && ( defined ( X86 ) || defined ( X86_64 ) )
+#elif defined ( GCC ) && ( defined ( X86 ) || defined ( X86_64 ) ) && !defined (TARGET_CPU_X86)
 /* That's possible on x86-64 too since oslInterlockedCount is a sal_Int32 */
 
 /*****************************************************************************/
@@ -81,7 +81,7 @@
     return nCount;
 }
 
-#elif defined ( GCC ) && defined ( POWERPC )
+#elif defined ( GCC ) && defined ( POWERPC ) && !defined TARGET_CPU_PPC
 
 /*****************************************************************************/
 /* osl_incrementInterlockedCount */
diff -urN ooo_OOA680_m1_src.orig/sal/osl/unx/system.h ooo_OOA680_m1_src/sal/osl/unx/system.h
--- ooo_OOA680_m1_src.orig/sal/osl/unx/system.h	2005-10-20 15:14:43.000000000 +0200
+++ ooo_OOA680_m1_src/sal/osl/unx/system.h	2005-12-17 23:44:15.000000000 +0100
@@ -359,6 +359,8 @@
 #	define  NO_PTHREAD_RTL
 /* for NSGetArgc/Argv/Environ */
 #       include <crt_externs.h>
+/* for TARGET_CPU_X86 and TARGET_CPU_PPC */
+#	include <TargetConditionals.h>
 int  readdir_r( DIR *dirp, struct dirent *entry, struct dirent **result );
 char *asctime_r( const struct tm *tm, char *buffer );
 char *macxp_tempnam( const char *tmpdir, const char *prefix );