Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • rts/external-symbols.list.in
    ... ... @@ -54,6 +54,12 @@ ghczminternal_GHCziInternalziWord_W16zh_con_info
    54 54
     ghczminternal_GHCziInternalziWord_W32zh_con_info
    
    55 55
     ghczminternal_GHCziInternalziWord_W64zh_con_info
    
    56 56
     ghczminternal_GHCziInternalziStable_StablePtr_con_info
    
    57
    +ghczminternal_GHCziInternalziStackziCloneStack_StackSnapshot_closure
    
    58
    +
    
    59
    +#if 0
    
    60
    +N.B. These symbols are defined in ghc-internal and may be referenced by the
    
    61
    +unregisterised code-generator when compiling RTS Cmm sources.
    
    62
    +#endif
    
    57 63
     hs_atomic_add8
    
    58 64
     hs_atomic_add16
    
    59 65
     hs_atomic_add32
    
    ... ... @@ -94,4 +100,3 @@ hs_atomicwrite8
    94 100
     hs_atomicwrite16
    
    95 101
     hs_atomicwrite32
    
    96 102
     hs_atomicwrite64
    97
    -ghczminternal_GHCziInternalziStackziCloneStack_StackSnapshot_closure

  • rts/rts.cabal
    ... ... @@ -596,8 +596,7 @@ library
    596 596
     -- GHC already does `-undefined dynamic_lookup`, so we just do that for now, but
    
    597 597
     -- we might try to get more precise with `-U` in the future.
    
    598 598
     --
    
    599
    --- Note that the RTS also `-u`s some atomics symbols that *are* defined --- and
    
    600
    --- defined within the RTS! It is not immediately clear why this is needed. This
    
    601
    --- dates back to c06e3f46d24ef69f3a3d794f5f604cb8c2a40cbc which mentions a build
    
    602
    --- failure that it was suggested that this fix, but the precise reasoning is not
    
    603
    --- explained.
    599
    +-- Note that the RTS also `-u`s some symbols for atomic operations that *are* defined
    
    600
    +-- by `ghc-internal`. This is needed when the RTS is compiled when the RTS is
    
    601
    +-- compiled with, e.g., the unregisterised backend since the code-generator will
    
    602
    +-- reference these symbols when compiling atomic primops in Cmm sources.