[commit: ghc] ghc-7.10: arm: Force non-executable stack (part 2) (f84df20)

[git at git.haskell.org]

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

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/f84df20e219ce0e56008c34cacd3b17872a2371d/ghc

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

commit f84df20e219ce0e56008c34cacd3b17872a2371d
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Mon May 4 23:39:31 2015 +0000

    arm: Force non-executable stack (part 2)
    
    This was supposed to be part of commit 63a10bbc42 but I pushed
    from the wrong machine. This fixes cross compiling to arm.
    
    Signed-off-by: Erik de Castro Lopo <erikd at mega-nerd.com>
    (cherry picked from commit 1a4374c1e246d81a5c1d00a720919804093a8241)


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

f84df20e219ce0e56008c34cacd3b17872a2371d
 aclocal.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aclocal.m4 b/aclocal.m4
index b275460..c17a7d5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -571,7 +571,7 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
         # gcc to link using the gold linker.
         # Forcing LD to be ld.gold is done in FIND_LD m4 macro.
         $3="$$3 -fuse-ld=gold -Wl,-z,noexecstack"
-        $4="$$4 -z,noexecstack"
+        $4="$$4 -z noexecstack"
         ;;
     esac