[commit: ghc] master: Revert "rts: Ensure that the_gc_thread is aligned" (e2b5c54)
git at git.haskell.org
git at git.haskell.org
Wed Aug 8 23:05:00 UTC 2018
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/e2b5c54f30a31f6b030d29394356fb133b8a0001/ghc
>---------------------------------------------------------------
commit e2b5c54f30a31f6b030d29394356fb133b8a0001
Author: Ben Gamari <ben at smart-cactus.org>
Date: Wed Aug 8 19:02:03 2018 -0400
Revert "rts: Ensure that the_gc_thread is aligned"
This caused segmentation faults on Darwin.
This reverts commit c6cc93bca69abc258513af8cf2370b14e70fd8fb.
>---------------------------------------------------------------
e2b5c54f30a31f6b030d29394356fb133b8a0001
rts/sm/GC.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/rts/sm/GC.c b/rts/sm/GC.c
index 9b31516..742ae36 100644
--- a/rts/sm/GC.c
+++ b/rts/sm/GC.c
@@ -128,11 +128,7 @@ uint32_t mutlist_MUTVARS,
gc_thread **gc_threads = NULL;
#if !defined(THREADED_RTS)
-/* Use conservative alignment since we will cast this to a gc_thread and
- * consequently the compiler may assume it is aligned. See #15482.
- */
-StgWord8 the_gc_thread[sizeof(gc_thread) + 64 * sizeof(gen_workspace)]
- __attribute__((aligned(sizeof(W_))));
+StgWord8 the_gc_thread[sizeof(gc_thread) + 64 * sizeof(gen_workspace)];
#endif
// Number of threads running in *this* GC. Affects how many
More information about the ghc-commits
mailing list