Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
jberryman
GHC
Commits
85056f03
Commit
85056f03
authored
Jan 29, 2013
by
Simon Marlow
Browse files
Detect hard/soft float in the same way as other ARM features
parent
6ac7bae7
Changes
2
Hide whitespace changes
Inline
Side-by-side
aclocal.m4
View file @
85056f03
...
...
@@ -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"]
)]
)
])
...
...
configure.ac
View file @
85056f03
...
...
@@ -207,19 +207,6 @@ AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
# Testing ARM ABI
# required for code generation (LLVM options)
ARM_ABI=SOFT
case $target in
arm*-*-linux-gnueabihf | arm*-linux-gnueabihf)
ARM_ABI=HARD
;;
arm*-*-linux-gnueabi | arm*-linux-gnueabi)
ARM_ABI=SOFTFP
;;
esac
FPTOOLS_SET_PLATFORM_VARS
# Verify that the installed (bootstrap) GHC is capable of generating
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment