[commit: ghc] ghc-8.6: Revert "rts: Ensure that the_gc_thread is aligned" (da11727)

git at git.haskell.org git at git.haskell.org
Fri Aug 10 13:21:27 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.6
Link       : http://ghc.haskell.org/trac/ghc/changeset/da11727090d2f7c340df2df7e667521328b31d14/ghc

>---------------------------------------------------------------

commit da11727090d2f7c340df2df7e667521328b31d14
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Aug 10 09:21:05 2018 -0400

    Revert "rts: Ensure that the_gc_thread is aligned"
    
    This reverts commit 87a79e394013e5f722496900227b126015d0d780.


>---------------------------------------------------------------

da11727090d2f7c340df2df7e667521328b31d14
 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 bd4a81c..67eba93 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