[commit: ghc] ghc-8.0: mk/config.mk.in: enable SMP on ARMv7+ (Trac #12981) (7b4ab5b)

git at git.haskell.org git at git.haskell.org
Sun Dec 18 21:26:41 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/7b4ab5bde04c2cd49681068c290a3a19111ea401/ghc

>---------------------------------------------------------------

commit 7b4ab5bde04c2cd49681068c290a3a19111ea401
Author: Sergei Trofimovich <siarheit at google.com>
Date:   Thu Dec 15 09:02:50 2016 +0000

    mk/config.mk.in: enable SMP on ARMv7+ (Trac #12981)
    
    Before the change result of expression
        ArchSupportsSMP="$(if $(filter $(ARM_ISA),ARMv5 ARMv6),NO,YES)"
    to evaluate to
        ArchSupportsSMP="YES"
    
    After the change it's
        ArchSupportsSMP=YES
    
    Thanks to orion for the fix!
    
    Fixes Trac #12981
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>
    
    (cherry picked from commit 52c5e55348170f27f5ef1cb010c4c96ab4aa47cc)


>---------------------------------------------------------------

7b4ab5bde04c2cd49681068c290a3a19111ea401
 mk/config.mk.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 9de3537..bfaaa66 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -187,7 +187,7 @@ HaveLibDL = @HaveLibDL@
 # includes/stg/SMP.h
 ifeq "$(TargetArch_CPP)" "arm"
 # We don't support load/store barriers pre-ARMv7. See #10433.
-ArchSupportsSMP="$(if $(filter $(ARM_ISA),ARMv5 ARMv6),NO,YES)"
+ArchSupportsSMP=$(if $(filter $(ARM_ISA),ARMv5 ARMv6),NO,YES)
 else
 ArchSupportsSMP=$(strip $(patsubst $(TargetArch_CPP), YES, $(findstring $(TargetArch_CPP), i386 x86_64 sparc powerpc powerpc64 powerpc64le aarch64)))
 endif



More information about the ghc-commits mailing list