[commit: ghc] ghc-8.0: SysTools: Revert linker flags change (b0dccac)

git at git.haskell.org git at git.haskell.org
Wed Jan 11 17:57:18 UTC 2017


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

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/b0dccaccb304541e7f56d702bfbf65e18b98c05d/ghc

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

commit b0dccaccb304541e7f56d702bfbf65e18b98c05d
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Jan 10 16:05:31 2017 -0600

    SysTools: Revert linker flags change
    
    fefe02c0324a25a52455a61f7f6e48be6d82d1ab inadvertently removed a
    linker flag needed to ensure that stack allocations don't fail
    (see #8870 and #12186 for original motivation). Undo this change.
    
    Fixes #13100.


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

b0dccaccb304541e7f56d702bfbf65e18b98c05d
 compiler/main/SysTools.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
index 1ab5b13..e5ee54d 100644
--- a/compiler/main/SysTools.hs
+++ b/compiler/main/SysTools.hs
@@ -860,7 +860,7 @@ getLinkerInfo' dflags = do
                      -- Note [Windows stack usage]
                      -- Force static linking of libGCC
                      -- Note [Windows static libGCC]
-                   , "-static-libgcc" ]
+                   , "-Xlinker", "--stack=0x800000,0x800000", "-static-libgcc" ]
                _ -> do
                  -- In practice, we use the compiler as the linker here. Pass
                  -- -Wl,--version to get linker version info.



More information about the ghc-commits mailing list