{Enter,Leave}CriticalSection imports should be outside #ifdef __PIC__

diff --git a/rts/HeapStackCheck.cmm b/rts/HeapStackCheck.cmm
index 44005c8..5b21ee1 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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.