[commit: ghc] ghc-8.2: Check TargetPlatform instead of HostPlatform for leading underscore (808cd4e)
git at git.haskell.org
git at git.haskell.org
Wed Mar 29 23:42:05 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-8.2
Link : http://ghc.haskell.org/trac/ghc/changeset/808cd4e8f94306f36363d4d2da21e2e3d861608b/ghc
>---------------------------------------------------------------
commit 808cd4e8f94306f36363d4d2da21e2e3d861608b
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date: Wed Mar 29 17:28:16 2017 -0400
Check TargetPlatform instead of HostPlatform for leading underscore
Reviewers: austin, hvr, rwbarton, bgamari
Reviewed By: rwbarton, bgamari
Subscribers: rwbarton, thomie, erikd
Differential Revision: https://phabricator.haskell.org/D3348
(cherry picked from commit 81f5b6ecbadec49af53189756dda5e0b199f9703)
>---------------------------------------------------------------
808cd4e8f94306f36363d4d2da21e2e3d861608b
aclocal.m4 | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 3337215..6341bc9 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -874,12 +874,14 @@ FP_CHECK_ALIGNMENT([$1])
# checking for *no* leading underscore first. Sigh. --SDM
#
# Similarly on OpenBSD, but this test doesn't help. -- dons
+#
AC_DEFUN([FP_LEADING_UNDERSCORE],
[AC_CHECK_LIB([elf], [nlist], [LIBS="-lelf $LIBS"])
AC_CACHE_CHECK([leading underscore in symbol names], [fptools_cv_leading_underscore], [
# Hack!: nlist() under Digital UNIX insist on there being an _,
# but symbol table listings shows none. What is going on here?!?
-case $HostPlatform in
+case $TargetPlatform in
+*linux-android*) fptools_cv_leading_underscore=no;;
*openbsd*) # x86 openbsd is ELF from 3.4 >, meaning no leading uscore
case $build in
i386-*2\.@<:@0-9@:>@ | i386-*3\.@<:@0-3@:>@ ) fptools_cv_leading_underscore=yes ;;
More information about the ghc-commits
mailing list