diff options
| author | Simon Marlow <simonmar@microsoft.com> | 2007-09-05 08:49:41 +0000 |
|---|---|---|
| committer | Simon Marlow <simonmar@microsoft.com> | 2007-09-05 08:49:41 +0000 |
| commit | 2a01dd4c7371e4c56cbe1045b7abbee086e72f4a (patch) | |
| tree | 971db8460ccb99cd6e3336b13fdc27f7c0d84287 | |
| parent | 272f0ba89eca1d9fc700cf4c27b9f8c3e23d6fe8 (diff) | |
| download | haskell-2a01dd4c7371e4c56cbe1045b7abbee086e72f4a.tar.gz | |
{Enter,Leave}CriticalSection imports should be outside #ifdef __PIC__
| -rw-r--r-- | rts/HeapStackCheck.cmm | 4 | ||||
| -rw-r--r-- | rts/PrimOps.cmm | 2 | ||||
| -rw-r--r-- | rts/StgMiscClosures.cmm | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/rts/HeapStackCheck.cmm b/rts/HeapStackCheck.cmm index 44005c8b61..5b21ee1da1 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 110d975d69..67227d05af 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 88490b8c75..d24eb63d9d 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. |