summaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2013-01-29 11:53:35 +0000
committerSimon Marlow <marlowsd@gmail.com>2013-01-30 20:25:52 +0000
commit85056f039d8ce4176556f934094e31e5d1b25de9 (patch)
treefce86443201d9f13e4e01a5fc717a976e463e614 /aclocal.m4
parent6ac7bae74c02d8db306ad236d6498dfad8771ee9 (diff)
downloadhaskell-85056f039d8ce4176556f934094e31e5d1b25de9.tar.gz
Detect hard/soft float in the same way as other ARM features
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m433
1 files changed, 31 insertions, 2 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 7b185b9853..0fe79cfd34 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -379,10 +379,12 @@ AC_DEFUN([GET_ARM_ISA],
)],
[changequote(, )dnl
ARM_ISA_EXT="[VFPv2]"
- changequote([, ])dnl],
+ changequote([, ])dnl
+ ],
[changequote(, )dnl
ARM_ISA_EXT="[]"
- changequote([, ])dnl]
+ changequote([, ])dnl
+ ]
)],
[changequote(, )dnl
ARM_ISA=ARMv7
@@ -390,6 +392,33 @@ AC_DEFUN([GET_ARM_ISA],
changequote([, ])dnl
])
])
+
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [],
+ [#if defined(__SOFTFP__)
+ return 0;
+ #else
+ not softfp
+ #endif]
+ )],
+ [changequote(, )dnl
+ ARM_ABI="SOFT"
+ changequote([, ])dnl
+ ],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [],
+ [#if defined(__ARM_PCS_VFP)
+ return 0;
+ #else
+ no hard float ABI
+ #endif]
+ )],
+ [ARM_ABI="HARD"],
+ [ARM_ABI="SOFTFP"]
+ )]
+ )
])