[commit: ghc] ghc-8.4: rts: export new absentSumFieldError from base (e4e61f7)

git at git.haskell.org git at git.haskell.org
Sun May 20 18:36:38 UTC 2018


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

On branch  : ghc-8.4
Link       : http://ghc.haskell.org/trac/ghc/changeset/e4e61f77a7d5ee1d13d229bc926ee35a9d19b00a/ghc

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

commit e4e61f77a7d5ee1d13d229bc926ee35a9d19b00a
Author: Sergei Trofimovich <slyfox at gentoo.org>
Date:   Mon May 14 21:51:48 2018 +0100

    rts: export new absentSumFieldError from base
    
    commit b2ff5dde399cd012218578945ada1d9ff68daa35 "Fix #15038"
    added new stable closure 'absentSumFieldError_closure' to
    base package. This closure is used in rts package.
    
    Unfortunately the symbol was not explicitly exported and build
    failed on windows as:
    
    ```
    "inplace/bin/ghc-stage1" -o ...hsc2hs.exe ...
    rts/dist/build/libHSrts.a(RtsStartup.o): In function `hs_init_ghc':
    
    rts/RtsStartup.c:272:0: error:
         undefined reference to `base_ControlziExceptionziBase_absentSumFieldError_closure'
        |
    272 |     getStablePtr((StgPtr)absentSumFieldError_closure);
        | ^
    
    ```
    
    This change adds 'absentSumFieldError_closure' to explicit export
    into libHSbase.def.
    
    Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>
    (cherry picked from commit 79bbb23fd3085c3dc52497175e9e74f73f7f6b68)


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

e4e61f77a7d5ee1d13d229bc926ee35a9d19b00a
 rts/package.conf.in     | 2 ++
 rts/rts.cabal.in        | 2 ++
 rts/win32/libHSbase.def | 1 +
 3 files changed, 5 insertions(+)

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 05d98a5..14e9258 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -93,6 +93,7 @@ ld-options:
          , "-Wl,-u,_base_GHCziIOziException_cannotCompactFunction_closure"
          , "-Wl,-u,_base_GHCziIOziException_cannotCompactPinned_closure"
          , "-Wl,-u,_base_GHCziIOziException_cannotCompactMutable_closure"
+         , "-Wl,-u,_base_ControlziExceptionziBase_absentSumFieldError_closure"
          , "-Wl,-u,_base_ControlziExceptionziBase_nonTermination_closure"
          , "-Wl,-u,_base_ControlziExceptionziBase_nestedAtomically_closure"
          , "-Wl,-u,_base_GHCziEventziThread_blockedOnBadFD_closure"
@@ -190,6 +191,7 @@ ld-options:
          , "-Wl,-u,base_GHCziIOziException_cannotCompactFunction_closure"
          , "-Wl,-u,base_GHCziIOziException_cannotCompactPinned_closure"
          , "-Wl,-u,base_GHCziIOziException_cannotCompactMutable_closure"
+         , "-Wl,-u,base_ControlziExceptionziBase_absentSumFieldError_closure"
          , "-Wl,-u,base_ControlziExceptionziBase_nonTermination_closure"
          , "-Wl,-u,base_ControlziExceptionziBase_nestedAtomically_closure"
          , "-Wl,-u,base_GHCziEventziThread_blockedOnBadFD_closure"
diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in
index 71aef3d..664a8f1 100644
--- a/rts/rts.cabal.in
+++ b/rts/rts.cabal.in
@@ -175,6 +175,7 @@ library
          "-Wl,-u,_base_GHCziIOziException_cannotCompactFunction_closure"
          "-Wl,-u,_base_GHCziIOziException_cannotCompactPinned_closure"
          "-Wl,-u,_base_GHCziIOziException_cannotCompactMutable_closure"
+         "-Wl,-u,_base_ControlziExceptionziBase_absentSumFieldError_closure"
          "-Wl,-u,_base_ControlziExceptionziBase_nonTermination_closure"
          "-Wl,-u,_base_ControlziExceptionziBase_nestedAtomically_closure"
          "-Wl,-u,_base_GHCziEventziThread_blockedOnBadFD_closure"
@@ -244,6 +245,7 @@ library
          "-Wl,-u,base_GHCziIOziException_cannotCompactFunction_closure"
          "-Wl,-u,base_GHCziIOziException_cannotCompactPinned_closure"
          "-Wl,-u,base_GHCziIOziException_cannotCompactMutable_closure"
+         "-Wl,-u,base_ControlziExceptionziBase_absentSumFieldError_closure"
          "-Wl,-u,base_ControlziExceptionziBase_nonTermination_closure"
          "-Wl,-u,base_ControlziExceptionziBase_nestedAtomically_closure"
          "-Wl,-u,base_GHCziEventziThread_blockedOnBadFD_closure"
diff --git a/rts/win32/libHSbase.def b/rts/win32/libHSbase.def
index 496893a..d4ec1fa 100644
--- a/rts/win32/libHSbase.def
+++ b/rts/win32/libHSbase.def
@@ -42,6 +42,7 @@ EXPORTS
         base_GHCziIOziException_cannotCompactPinned_closure
         base_GHCziIOziException_cannotCompactMutable_closure
 
+	base_ControlziExceptionziBase_absentSumFieldError_closure
 	base_ControlziExceptionziBase_nonTermination_closure
 	base_ControlziExceptionziBase_nestedAtomically_closure
 	base_GHCziEventziThread_blockedOnBadFD_closure



More information about the ghc-commits mailing list