X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FSMP.h;h=a1f14e48c93b0d42f8d6316d877cf6c19ff50cbd;hb=153b9cb9b11e05c4edb1b6bc0a7b972660e41f70;hp=3a31d96c64247626f3a9e1f4e184d6d571be2a23;hpb=f832c312c2a879f98da09cf261ce4f8cb63259eb;p=ghc-hetmet.git

diff --git a/ghc/includes/SMP.h b/ghc/includes/SMP.h
index 3a31d96..a1f14e4 100644
--- a/ghc/includes/SMP.h
+++ b/ghc/includes/SMP.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
- * $Id: SMP.h,v 1.2 2001/02/08 14:36:21 simonmar Exp $
+ * $Id: SMP.h,v 1.5 2005/01/28 12:55:52 simonmar Exp $
  *
  * (c) The GHC Team, 1999
  *
@@ -20,9 +20,7 @@
 
 #if defined(SMP)
 
-#if    defined(INTERPRETER) \
-     || defined(PROFILING)  \
-     || defined(TICKY_TICKY)
+#if  defined(PROFILING)  || defined(TICKY_TICKY)
 #error Build options incompatible with SMP.
 #endif
 
@@ -33,7 +31,7 @@
  * (because another thread is altering it in parallel), we just jump
  * to the new entry point.
  */
-#if defined(i386_TARGET_ARCH) && defined(TABLES_NEXT_TO_CODE)
+#if defined(i386_HOST_ARCH) && defined(TABLES_NEXT_TO_CODE)
 #define CMPXCHG(p, cmp, new)			\
   __asm__ __volatile__ (  			\
 	  "lock ; cmpxchg %1, %0\n"		\
@@ -76,15 +74,10 @@
 #define LOCK_THUNK(__info)				\
   CMPXCHG(R1.cl->header.info, __info, &stg_WHITEHOLE_info);
 
-#define ACQUIRE_LOCK(mutex) pthread_mutex_lock(mutex);
-#define RELEASE_LOCK(mutex) pthread_mutex_unlock(mutex);
-
 #else /* !SMP */
 
 #define LOCK_CLOSURE(c)     /* nothing */
 #define LOCK_THUNK(__info)  /* nothing */
-#define ACQUIRE_LOCK(mutex) /* nothing */
-#define RELEASE_LOCK(mutex) /* nothing */
 
 #endif /* SMP */