[commit: ghc] master: rts: Don't build StgCRunAsm.S if unregisterised (aa8dcb3)

git at git.haskell.org git at git.haskell.org
Thu May 11 21:33:37 UTC 2017


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/aa8dcb33fd26d8bfd4cac2fbd1b1785b4a869897/ghc

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

commit aa8dcb33fd26d8bfd4cac2fbd1b1785b4a869897
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu May 11 15:41:38 2017 -0400

    rts: Don't build StgCRunAsm.S if unregisterised
    
    StgCRunAsm.S provides StgCRun on powerpc64le platforms when
    registerised.  However, in the unregisterised setting we use the
    mini-interpreter and consequently shouldn't build StgCRunAsm.S lest we
    get duplicate symbols.
    
    Test Plan: Build unregisterised compiler on AIX.
    
    Reviewers: hvr, trommler, austin, simonmar
    
    Reviewed By: trommler, simonmar
    
    Subscribers: rwbarton, thomie
    
    Differential Revision: https://phabricator.haskell.org/D3560


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

aa8dcb33fd26d8bfd4cac2fbd1b1785b4a869897
 rts/ghc.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rts/ghc.mk b/rts/ghc.mk
index d089859..990f4db 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -55,9 +55,12 @@ rts_S_SRCS += rts/AdjustorAsm.S
 endif
 # this matches substrings of powerpc64le, including "powerpc" and "powerpc64"
 ifneq "$(findstring $(TargetArch_CPP), powerpc64le)" ""
+# unregisterised builds use the mini interpreter
+ifneq "$(GhcUnregisterised)" "YES"
 rts_S_SRCS += rts/StgCRunAsm.S
 endif
 endif
+endif
 
 ifeq "$(GhcUnregisterised)" "YES"
 GENAPPLY_OPTS = -u



More information about the ghc-commits mailing list