From 2a01dd4c7371e4c56cbe1045b7abbee086e72f4a Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 5 Sep 2007 08:49:41 +0000 Subject: [PATCH] {Enter,Leave}CriticalSection imports should be outside #ifdef __PIC__ --- rts/HeapStackCheck.cmm | 4 ++-- rts/PrimOps.cmm | 2 +- rts/StgMiscClosures.cmm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rts/HeapStackCheck.cmm b/rts/HeapStackCheck.cmm index 44005c8..5b21ee1 100644 --- a/rts/HeapStackCheck.cmm +++ b/rts/HeapStackCheck.cmm @@ -13,10 +13,10 @@ #include "Cmm.h" #ifdef __PIC__ -import EnterCriticalSection; -import LeaveCriticalSection; import pthread_mutex_unlock; #endif +import EnterCriticalSection; +import LeaveCriticalSection; /* Stack/Heap Check Failure * ------------------------ diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm index 110d975..67227d0 100644 --- a/rts/PrimOps.cmm +++ b/rts/PrimOps.cmm @@ -47,9 +47,9 @@ import __gmpz_com; import base_GHCziIOBase_NestedAtomically_closure; import pthread_mutex_lock; import pthread_mutex_unlock; +#endif import EnterCriticalSection; import LeaveCriticalSection; -#endif /*----------------------------------------------------------------------------- Array Primitives diff --git a/rts/StgMiscClosures.cmm b/rts/StgMiscClosures.cmm index 88490b8..d24eb63 100644 --- a/rts/StgMiscClosures.cmm +++ b/rts/StgMiscClosures.cmm @@ -14,11 +14,11 @@ #ifdef __PIC__ import pthread_mutex_lock; -import EnterCriticalSection; -import LeaveCriticalSection; import base_GHCziBase_Czh_static_info; import base_GHCziBase_Izh_static_info; #endif +import EnterCriticalSection; +import LeaveCriticalSection; /* ---------------------------------------------------------------------------- Support for the bytecode interpreter. -- 1.7.10.4