summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Trommler <ptrommler@acm.org>2020-07-27 17:17:56 +0200
committerPeter Trommler <ptrommler@acm.org>2020-07-27 17:17:56 +0200
commit796fc314333dd042fa4db85fbf3fe97a76b5ed64 (patch)
treee87b3386cb1805438df47e3295105ed7a2b9f44c
parent6ff89c173f39813f74d7bbf95770c5e40039f155 (diff)
downloadhaskell-wip/remove-gcc44-support.tar.gz
config: Remove workaraound for GCC 4.4wip/remove-gcc44-support
Minimum requirement is GCC 4.7 now.
-rw-r--r--aclocal.m49
1 files changed, 1 insertions, 8 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 791af7f4fa..164b445640 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -338,12 +338,6 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
dnl *** check for GNU non-executable stack note support (ELF only)
dnl (.section .note.GNU-stack,"",@progbits)
-
- dnl This test doesn't work with "gcc -g" in gcc 4.4 (GHC trac #3889:
- dnl Error: can't resolve `.note.GNU-stack' {.note.GNU-stack section} - `.Ltext0' {.text section}
- dnl so we empty CFLAGS while running this test
- CFLAGS2="$CFLAGS"
- CFLAGS=
case $TargetArch in
arm)
dnl See #13937.
@@ -367,7 +361,6 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
TargetHasGnuNonexecStack=YES],
[AC_MSG_RESULT(no)
TargetHasGnuNonexecStack=NO])
- CFLAGS="$CFLAGS2"
checkArch "$BuildArch" "HaskellBuildArch"
checkVendor "$BuildVendor"
@@ -1919,7 +1912,7 @@ AC_MSG_CHECKING(for path to top of build tree)
# GHC_CONVERT_CPU(cpu, target_var)
# --------------------------------
# Converts cpu from gnu to ghc naming, and assigns the result to $target_var.
-# Should you modify this list, you are invited to reflect the changes in
+# Should you modify this list, you are invited to reflect the changes in
# `libraries/base/System/Info.hs`'s documentation.
AC_DEFUN([GHC_CONVERT_CPU],[
case "$1" in