summaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>2015-12-19 10:39:25 +0100
committerSergei Trofimovich <siarheit@google.com>2015-12-19 17:15:07 +0000
commit59de6e84ff022ddca540724ab1aa0577c6aa2363 (patch)
treed427608ebcb428244feabcc3c57c7d36a21a8e40 /aclocal.m4
parentb02838405b00bcdeebb44da0a7a9562cd7fda66b (diff)
downloadhaskell-59de6e84ff022ddca540724ab1aa0577c6aa2363.tar.gz
Add sparc64 a known architecture (Ticket #11211)
Explicitly pass "--no-relax" on ArchSPARC64 (as ArchSPARC does) where gcc's default specs set "-mrelax" which conflicts with "-Wl,-r". Known architecture will also help extending sparc NCG support 64-bit ABI. Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Signed-off-by: Sergei Trofimovich <siarheit@google.com>
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m45
1 files changed, 4 insertions, 1 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 79b980a5ab..e50d008b5b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -196,6 +196,9 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
sparc)
test -z "[$]2" || eval "[$]2=ArchSPARC"
;;
+ sparc64)
+ test -z "[$]2" || eval "[$]2=ArchSPARC64"
+ ;;
arm)
GET_ARM_ISA()
test -z "[$]2" || eval "[$]2=\"ArchARM {armISA = \$ARM_ISA, armISAExt = \$ARM_ISA_EXT, armABI = \$ARM_ABI}\""
@@ -212,7 +215,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
mipsel)
test -z "[$]2" || eval "[$]2=ArchMipsel"
;;
- hppa|hppa1_1|ia64|m68k|rs6000|s390|s390x|sh4|sparc64|vax)
+ hppa|hppa1_1|ia64|m68k|rs6000|s390|s390x|sh4|vax)
test -z "[$]2" || eval "[$]2=ArchUnknown"
;;
*)