X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=5358cc2727d265ebd752d8b19fcec45ac5178d6f;hb=28c2bbb03ff6144f3a09e5286c8c3ca6ad3689e8;hp=53bd165bec50facecef493a0d1a45c3bc4a30cff;hpb=30fad70245d9ddfae0b781460bc51468a01f92f6;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index 53bd165..5358cc2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -962,6 +962,9 @@ AC_SUBST([GhcPkgCmd])
 # reordering things in the module and confusing the manger and/or splitter.
 # (eg. Trac #1427)
 #
+# If gcc knows about the stack protector, turn it off.
+# Otherwise the stack-smash handler gets triggered.
+#
 AC_DEFUN([FP_GCC_EXTRA_FLAGS],
 [AC_REQUIRE([FP_HAVE_GCC])
 AC_CACHE_CHECK([for extra options to pass gcc when compiling via C], [fp_cv_gcc_extra_opts],
@@ -987,6 +990,12 @@ AC_CACHE_CHECK([for extra options to pass gcc when compiling via C], [fp_cv_gcc_
       [])
   ;;
  esac
+ echo 'int main(void) {return 0;}' > conftest.c
+ if $CC -c conftest.c -fno-stack-protector > /dev/null 2>&1
+ then
+     fp_cv_gcc_extra_opts="$fp_cv_gcc_extra_opts -fno-stack-protector"
+ fi
+ rm conftest.c conftest.o
 ])
 AC_SUBST([GccExtraViaCOpts],$fp_cv_gcc_extra_opts)
 ])