diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2013-01-17 16:42:38 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2013-01-17 20:30:01 +0000 |
| commit | 0dcccf0ca650a3f6fd69e4af428e827b718f0b4b (patch) | |
| tree | 619f13bbb52acb78a403ffff155d15e56abf1674 /rts/Task.c | |
| parent | 81f4cd3e08996d35b3a70dfee4d70a829f2f2622 (diff) | |
| download | haskell-0dcccf0ca650a3f6fd69e4af428e827b718f0b4b.tar.gz | |
Hopefully fix breakage on OS X w/ LLVM
Reordering of includes in GC.c broke on OS X because gctKey is
declared in Task.h and is needed in the storage manager. This is
really the wrong place for it anyway, so I've moved the gctKey pieces
to where they should be.
Diffstat (limited to 'rts/Task.c')
| -rw-r--r-- | rts/Task.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/rts/Task.c b/rts/Task.c index 78725dd41c..e6781a17ff 100644 --- a/rts/Task.c +++ b/rts/Task.c @@ -54,9 +54,6 @@ __thread Task *my_task; # else ThreadLocalKey currentTaskKey; # endif -#ifdef llvm_CC_FLAVOR -ThreadLocalKey gctKey; -#endif #else Task *my_task; #endif @@ -78,9 +75,6 @@ initTaskManager (void) #if !defined(MYTASK_USE_TLV) newThreadLocalKey(¤tTaskKey); #endif -#if defined(llvm_CC_FLAVOR) - newThreadLocalKey(&gctKey); -#endif initMutex(&all_tasks_mutex); #endif } @@ -115,9 +109,6 @@ freeTaskManager (void) #if !defined(MYTASK_USE_TLV) freeThreadLocalKey(¤tTaskKey); #endif -#if defined(llvm_CC_FLAVOR) - freeThreadLocalKey(&gctKey); -#endif #endif tasksInitialized = 0; |