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

Commits:

13 changed files:

Changes:

  • rts/CloneStack.h
    ... ... @@ -8,8 +8,8 @@
    8 8
    9 9 
     #pragma once
    10 10
    11 
    -extern StgClosure DLL_IMPORT_DATA_VARNAME(ghczminternal_GHCziInternalziStackziCloneStack_StackSnapshot_closure);
    12 
    -#define StackSnapshot_constructor_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziStackziCloneStack_StackSnapshot_closure)
    11 
    +extern StgClosure ghczminternal_GHCziInternalziStackziCloneStack_StackSnapshot_closure;
    12 
    +#define StackSnapshot_constructor_closure (&(ghczminternal_GHCziInternalziStackziCloneStack_StackSnapshot_closure))
    13 13
    14 14 
     StgStack* cloneStack(Capability* capability, const StgStack* stack);
    15 15

  • rts/Prelude.h
    ... ... @@ -15,8 +15,8 @@
    15 15 
     #define PRELUDE_INFO(i)       extern W_(i)[]
    16 16 
     #define PRELUDE_CLOSURE(i)    extern W_(i)[]
    17 17 
     #else
    18 
    -#define PRELUDE_INFO(i)       extern const StgInfoTable DLL_IMPORT_DATA_VARNAME(i)
    19 
    -#define PRELUDE_CLOSURE(i)    extern StgClosure DLL_IMPORT_DATA_VARNAME(i)
    18 
    +#define PRELUDE_INFO(i)       extern const StgInfoTable (i)
    19 
    +#define PRELUDE_CLOSURE(i)    extern StgClosure (i)
    20 20 
     #endif
    21 21
    22 22 
     /* See Note [Wired-in exceptions are not CAFfy] in GHC.Core.Make. */
    ... ... @@ -87,58 +87,58 @@ PRELUDE_INFO(ghczminternal_GHCziInternalziWord_W32zh_con_info);
    87 87 
     PRELUDE_INFO(ghczminternal_GHCziInternalziWord_W64zh_con_info);
    88 88 
     PRELUDE_INFO(ghczminternal_GHCziInternalziStable_StablePtr_con_info);
    89 89
    90 
    -#define Unit_closure              DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTuple_Z0T_closure)
    91 
    -#define True_closure              DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_True_closure)
    92 
    -#define False_closure             DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_False_closure)
    93 
    -#define unpackCString_closure     DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziPack_unpackCString_closure)
    94 
    -#define runFinalizerBatch_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziWeakziFinalizze_runFinalizzerBatch_closure)
    90 
    +#define Unit_closure              (&(ghczminternal_GHCziInternalziTuple_Z0T_closure))
    91 
    +#define True_closure              (&(ghczminternal_GHCziInternalziTypes_True_closure))
    92 
    +#define False_closure             (&(ghczminternal_GHCziInternalziTypes_False_closure))
    93 
    +#define unpackCString_closure     (&(ghczminternal_GHCziInternalziPack_unpackCString_closure))
    94 
    +#define runFinalizerBatch_closure (&(ghczminternal_GHCziInternalziWeakziFinalizze_runFinalizzerBatch_closure))
    95 95 
     #define mainIO_closure            (&ZCMain_main_closure)
    96 96
    97 
    -#define runSparks_closure         DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziConcziSync_runSparks_closure)
    98 
    -#define ensureIOManagerIsRunning_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziConcziIO_ensureIOManagerIsRunning_closure)
    99 
    -#define interruptIOManager_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziConcziIO_interruptIOManager_closure)
    100 
    -#define ioManagerCapabilitiesChanged_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziConcziIO_ioManagerCapabilitiesChanged_closure)
    101 
    -#define runHandlersPtr_closure       DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziConcziSignal_runHandlersPtr_closure)
    97 
    +#define runSparks_closure         (&(ghczminternal_GHCziInternalziConcziSync_runSparks_closure))
    98 
    +#define ensureIOManagerIsRunning_closure (&(ghczminternal_GHCziInternalziConcziIO_ensureIOManagerIsRunning_closure))
    99 
    +#define interruptIOManager_closure (&(ghczminternal_GHCziInternalziConcziIO_interruptIOManager_closure))
    100 
    +#define ioManagerCapabilitiesChanged_closure (&(ghczminternal_GHCziInternalziConcziIO_ioManagerCapabilitiesChanged_closure))
    101 
    +#define runHandlersPtr_closure       (&(ghczminternal_GHCziInternalziConcziSignal_runHandlersPtr_closure))
    102 102 
     #if defined(mingw32_HOST_OS)
    103 
    -#define processRemoteCompletion_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziEventziWindows_processRemoteCompletion_closure)
    103 
    +#define processRemoteCompletion_closure (&(ghczminternal_GHCziInternalziEventziWindows_processRemoteCompletion_closure))
    104 104 
     #endif
    105 
    -#define runAllocationLimitHandler_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziAllocationLimitHandler_runAllocationLimitHandler_closure)
    106 
    -
    107 
    -#define flushStdHandles_closure   DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTopHandler_flushStdHandles_closure)
    108 
    -#define runMainIO_closure   DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTopHandler_runMainIO_closure)
    109 
    -
    110 
    -#define stackOverflow_closure     DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_stackOverflow_closure)
    111 
    -#define heapOverflow_closure      DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_heapOverflow_closure)
    112 
    -#define allocationLimitExceeded_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_allocationLimitExceeded_closure)
    113 
    -#define blockedIndefinitelyOnMVar_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnMVar_closure)
    114 
    -#define blockedIndefinitelyOnSTM_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnSTM_closure)
    115 
    -#define cannotCompactFunction_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_cannotCompactFunction_closure)
    116 
    -#define cannotCompactPinned_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_cannotCompactPinned_closure)
    117 
    -#define cannotCompactMutable_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_cannotCompactMutable_closure)
    118 
    -#define nonTermination_closure    DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziControlziExceptionziBase_nonTermination_closure)
    119 
    -#define nestedAtomically_closure  DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziControlziExceptionziBase_nestedAtomically_closure)
    120 
    -#define absentSumFieldError_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziPrimziPanic_absentSumFieldError_closure)
    121 
    -#define underflowException_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziExceptionziType_underflowException_closure)
    122 
    -#define overflowException_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziExceptionziType_overflowException_closure)
    123 
    -#define divZeroException_closure  DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziExceptionziType_divZZeroException_closure)
    124 
    -
    125 
    -#define blockedOnBadFD_closure    DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziEventziThread_blockedOnBadFD_closure)
    126 
    -
    127 
    -#define Czh_con_info              DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_Czh_con_info)
    128 
    -#define Izh_con_info              DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_Izh_con_info)
    129 
    -#define Fzh_con_info              DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_Fzh_con_info)
    130 
    -#define Dzh_con_info              DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_Dzh_con_info)
    131 
    -#define Wzh_con_info              DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_Wzh_con_info)
    132 
    -#define W8zh_con_info             DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziWord_W8zh_con_info)
    133 
    -#define W16zh_con_info            DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziWord_W16zh_con_info)
    134 
    -#define W32zh_con_info            DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziWord_W32zh_con_info)
    135 
    -#define W64zh_con_info            DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziWord_W64zh_con_info)
    136 
    -#define I8zh_con_info             DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziInt_I8zh_con_info)
    137 
    -#define I16zh_con_info            DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziInt_I16zh_con_info)
    138 
    -#define I32zh_con_info            DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziInt_I32zh_con_info)
    139 
    -#define I64zh_con_info            DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziInt_I64zh_con_info)
    140 
    -#define I64zh_con_info            DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziInt_I64zh_con_info)
    141 
    -#define Ptr_con_info              DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziPtr_Ptr_con_info)
    142 
    -#define FunPtr_con_info           DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziPtr_FunPtr_con_info)
    143 
    -#define StablePtr_static_info     DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziStable_StablePtr_static_info)
    144 
    -#define StablePtr_con_info        DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziStable_StablePtr_con_info)
    105 
    +#define runAllocationLimitHandler_closure (&(ghczminternal_GHCziInternalziAllocationLimitHandler_runAllocationLimitHandler_closure))
    106 
    +
    107 
    +#define flushStdHandles_closure   (&(ghczminternal_GHCziInternalziTopHandler_flushStdHandles_closure))
    108 
    +#define runMainIO_closure   (&(ghczminternal_GHCziInternalziTopHandler_runMainIO_closure))
    109 
    +
    110 
    +#define stackOverflow_closure     (&(ghczminternal_GHCziInternalziIOziException_stackOverflow_closure))
    111 
    +#define heapOverflow_closure      (&(ghczminternal_GHCziInternalziIOziException_heapOverflow_closure))
    112 
    +#define allocationLimitExceeded_closure (&(ghczminternal_GHCziInternalziIOziException_allocationLimitExceeded_closure))
    113 
    +#define blockedIndefinitelyOnMVar_closure (&(ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnMVar_closure))
    114 
    +#define blockedIndefinitelyOnSTM_closure (&(ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnSTM_closure))
    115 
    +#define cannotCompactFunction_closure (&(ghczminternal_GHCziInternalziIOziException_cannotCompactFunction_closure))
    116 
    +#define cannotCompactPinned_closure (&(ghczminternal_GHCziInternalziIOziException_cannotCompactPinned_closure))
    117 
    +#define cannotCompactMutable_closure (&(ghczminternal_GHCziInternalziIOziException_cannotCompactMutable_closure))
    118 
    +#define nonTermination_closure    (&(ghczminternal_GHCziInternalziControlziExceptionziBase_nonTermination_closure))
    119 
    +#define nestedAtomically_closure  (&(ghczminternal_GHCziInternalziControlziExceptionziBase_nestedAtomically_closure))
    120 
    +#define absentSumFieldError_closure (&(ghczminternal_GHCziInternalziPrimziPanic_absentSumFieldError_closure))
    121 
    +#define underflowException_closure (&(ghczminternal_GHCziInternalziExceptionziType_underflowException_closure))
    122 
    +#define overflowException_closure (&(ghczminternal_GHCziInternalziExceptionziType_overflowException_closure))
    123 
    +#define divZeroException_closure  (&(ghczminternal_GHCziInternalziExceptionziType_divZZeroException_closure))
    124 
    +
    125 
    +#define blockedOnBadFD_closure    (&(ghczminternal_GHCziInternalziEventziThread_blockedOnBadFD_closure))
    126 
    +
    127 
    +#define Czh_con_info              (&(ghczminternal_GHCziInternalziTypes_Czh_con_info))
    128 
    +#define Izh_con_info              (&(ghczminternal_GHCziInternalziTypes_Izh_con_info))
    129 
    +#define Fzh_con_info              (&(ghczminternal_GHCziInternalziTypes_Fzh_con_info))
    130 
    +#define Dzh_con_info              (&(ghczminternal_GHCziInternalziTypes_Dzh_con_info))
    131 
    +#define Wzh_con_info              (&(ghczminternal_GHCziInternalziTypes_Wzh_con_info))
    132 
    +#define W8zh_con_info             (&(ghczminternal_GHCziInternalziWord_W8zh_con_info))
    133 
    +#define W16zh_con_info            (&(ghczminternal_GHCziInternalziWord_W16zh_con_info))
    134 
    +#define W32zh_con_info            (&(ghczminternal_GHCziInternalziWord_W32zh_con_info))
    135 
    +#define W64zh_con_info            (&(ghczminternal_GHCziInternalziWord_W64zh_con_info))
    136 
    +#define I8zh_con_info             (&(ghczminternal_GHCziInternalziInt_I8zh_con_info))
    137 
    +#define I16zh_con_info            (&(ghczminternal_GHCziInternalziInt_I16zh_con_info))
    138 
    +#define I32zh_con_info            (&(ghczminternal_GHCziInternalziInt_I32zh_con_info))
    139 
    +#define I64zh_con_info            (&(ghczminternal_GHCziInternalziInt_I64zh_con_info))
    140 
    +#define I64zh_con_info            (&(ghczminternal_GHCziInternalziInt_I64zh_con_info))
    141 
    +#define Ptr_con_info              (&(ghczminternal_GHCziInternalziPtr_Ptr_con_info))
    142 
    +#define FunPtr_con_info           (&(ghczminternal_GHCziInternalziPtr_FunPtr_con_info))
    143 
    +#define StablePtr_static_info     (&(ghczminternal_GHCziInternalziStable_StablePtr_static_info))
    144 
    +#define StablePtr_con_info        (&(ghczminternal_GHCziInternalziStable_StablePtr_con_info))

  • rts/RtsSymbols.c
    ... ... @@ -1054,9 +1054,9 @@ RTS_ARM_OUTLINE_ATOMIC_SYMBOLS
    1054 1054 
     #define SymI_HasDataProto(vvv) { MAYBE_LEADING_UNDERSCORE_STR(#vvv), \
    1055 1055 
                         (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_DATA },
    1056 1056 
     #define SymE_HasProto(vvv) { MAYBE_LEADING_UNDERSCORE_STR(#vvv), \
    1057 
    -            (void*)DLL_IMPORT_DATA_REF(vvv), STRENGTH_NORMAL, SYM_TYPE_CODE },
    1057 
    +            (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_CODE },
    1058 1058 
     #define SymE_HasDataProto(vvv) { MAYBE_LEADING_UNDERSCORE_STR(#vvv), \
    1059 
    -            (void*)DLL_IMPORT_DATA_REF(vvv), STRENGTH_NORMAL, SYM_TYPE_DATA },
    1059 
    +            (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_DATA },
    1060 1060
    1061 1061 
     #define SymI_NeedsProto(vvv) SymI_HasProto(vvv)
    1062 1062 
     #define SymI_NeedsDataProto(vvv) SymI_HasDataProto(vvv)

  • rts/include/Rts.h
    ... ... @@ -265,9 +265,9 @@ void _warnFail(const char *filename, unsigned int linenum);
    265 265 
     #include "rts/LibdwPool.h"
    266 266
    267 267 
     /* Misc stuff without a home */
    268 
    -DLL_IMPORT_RTS extern char **prog_argv; /* so we can get at these from Haskell */
    269 
    -DLL_IMPORT_RTS extern int    prog_argc;
    270 
    -DLL_IMPORT_RTS extern char  *prog_name;
    268 
    +extern char **prog_argv; /* so we can get at these from Haskell */
    269 
    +extern int    prog_argc;
    270 
    +extern char  *prog_name;
    271 271
    272 272 
     void reportStackOverflow(StgTSO* tso);
    273 273 
     void reportHeapOverflow(void);

  • rts/include/RtsAPI.h
    ... ... @@ -587,8 +587,8 @@ void rts_done (void);
    587 587 
     extern StgClosure ghczminternal_GHCziInternalziTopHandler_runIO_closure;
    588 588 
     extern StgClosure ghczminternal_GHCziInternalziTopHandler_runNonIO_closure;
    589 589
    590 
    -#define runIO_closure     DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTopHandler_runIO_closure)
    591 
    -#define runNonIO_closure  DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTopHandler_runNonIO_closure)
    590 
    +#define runIO_closure     (&(ghczminternal_GHCziInternalziTopHandler_runIO_closure))
    591 
    +#define runNonIO_closure  (&(ghczminternal_GHCziInternalziTopHandler_runNonIO_closure))
    592 592
    593 593 
     /* ------------------------------------------------------------------------ */
    594 594

  • rts/include/Stg.h
    ... ... @@ -332,7 +332,6 @@ external prototype return neither of these types to workaround #11395.
    332 332 
        Other Stg stuff...
    333 333 
        -------------------------------------------------------------------------- */
    334 334
    335 
    -#include "stg/DLL.h"
    336 335 
     #include "stg/MachRegsForHost.h"
    337 336 
     #include "stg/Regs.h"
    338 337 
     #include "stg/Ticky.h"

  • rts/include/rts/Flags.h
    ... ... @@ -358,7 +358,7 @@ typedef struct _RTS_FLAGS {
    358 358 
     } RTS_FLAGS;
    359 359
    360 360 
     #if defined(COMPILING_RTS_MAIN)
    361 
    -extern DLLIMPORT RTS_FLAGS RtsFlags;
    361 
    +extern RTS_FLAGS RtsFlags;
    362 362 
     #elif IN_STG_CODE
    363 363 
     /* Note [RtsFlags is a pointer in STG code]
    364 364 
      * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

  • rts/include/rts/NonMoving.h
    ... ... @@ -19,10 +19,10 @@ struct StgThunk_;
    19 19 
     struct Capability_;
    20 20
    21 21 
     /* This is called by the code generator */
    22 
    -extern DLL_IMPORT_RTS
    22 
    +extern
    23 23 
     void updateRemembSetPushClosure_(StgRegTable *reg, struct StgClosure_ *p);
    24 24
    25 
    -extern DLL_IMPORT_RTS
    25 
    +extern
    26 26 
     void updateRemembSetPushThunk_(StgRegTable *reg, struct StgThunk_ *p);
    27 27
    28 28 
     // Forward declaration for unregisterised backend.
    ... ... @@ -31,7 +31,7 @@ EF_(stg_copyArray_barrier);
    31 31 
     // Note that RTS code should not condition on this directly by rather
    32 32 
     // use the IF_NONMOVING_WRITE_BARRIER_ENABLED macro to ensure that
    33 33 
     // the barrier is eliminated in the non-threaded RTS.
    34 
    -extern StgWord DLL_IMPORT_DATA_VAR(nonmoving_write_barrier_enabled);
    34 
    +extern StgWord nonmoving_write_barrier_enabled;
    35 35
    36 36 
     // A similar macro is defined in rts/include/Cmm.h for C-- code.
    37 37 
     #if defined(THREADED_RTS)

  • rts/include/rts/StableName.h
    ... ... @@ -29,4 +29,4 @@ typedef struct {
    29 29 
                              // free
    30 30 
     } snEntry;
    31 31
    32 
    -extern DLL_IMPORT_RTS snEntry *stable_name_table;
    32 
    +extern snEntry *stable_name_table;

  • rts/include/rts/StablePtr.h
    ... ... @@ -26,7 +26,7 @@ typedef struct {
    26 26 
                              // otherwise.
    27 27 
     } spEntry;
    28 28
    29 
    -extern DLL_IMPORT_RTS spEntry *stable_ptr_table;
    29 
    +extern spEntry *stable_ptr_table;
    30 30
    31 31 
     ATTR_ALWAYS_INLINE EXTERN_INLINE
    32 32 
     StgPtr deRefStablePtr(StgStablePtr sp)

  • rts/include/stg/DLL.h deleted
    1 
    -/* -----------------------------------------------------------------------------
    2 
    - *
    3 
    - * (c) The GHC Team, 1998-2009
    4 
    - *
    5 
    - * Support for Windows DLLs.
    6 
    - *
    7 
    - * Do not #include this file directly: #include "Rts.h" instead.
    8 
    - *
    9 
    - * To understand the structure of the RTS headers, see the wiki:
    10 
    - *   https://gitlab.haskell.org/ghc/ghc/wikis/commentary/source-tree/includes
    11 
    - *
    12 
    - * ---------------------------------------------------------------------------*/
    13 
    -
    14 
    -#pragma once
    15 
    -
    16 
    -#  define DLL_IMPORT_DATA_REF(x) (&(x))
    17 
    -#  define DLL_IMPORT_DATA_VARNAME(x) x
    18 
    -#  define DLLIMPORT
    19 
    -
    20 
    -/* The view of the rts/include/ header files differ ever so
    21 
    -   slightly depending on whether the RTS is being compiled
    22 
    -   or not - so we're forced to distinguish between two.
    23 
    -   [oh, you want details :) : Data symbols defined by the RTS
    24 
    -    have to be accessed through an extra level of indirection
    25 
    -    when compiling generated .hc code compared to when the RTS
    26 
    -    sources are being processed. This is only the case when
    27 
    -    using Win32 DLLs. ]
    28 
    -*/
    29 
    -#if defined(COMPILING_RTS)
    30 
    -#define DLL_IMPORT_RTS
    31 
    -#define DLL_IMPORT_DATA_VAR(x) x
    32 
    -#else
    33 
    -#define DLL_IMPORT_RTS DLLIMPORT
    34 
    -#define DLL_IMPORT_DATA_VAR(x) x
    35 
    -#endif

  • rts/include/stg/MiscClosures.h
    ... ... @@ -25,14 +25,14 @@
    25 25 
     #  define RTS_THUNK_INFO(i) extern const W_(i)[]
    26 26 
     #  define RTS_INFO(i)       extern const W_(i)[]
    27 27 
     #  define RTS_CLOSURE(i)    extern W_(i)[]
    28 
    -#  define RTS_FUN_DECL(f)   extern DLL_IMPORT_RTS StgFunPtr f(void)
    28 
    +#  define RTS_FUN_DECL(f)   extern StgFunPtr f(void)
    29 29 
     #else
    30 
    -#  define RTS_RET_INFO(i)   extern DLL_IMPORT_RTS const StgRetInfoTable i
    31 
    -#  define RTS_FUN_INFO(i)   extern DLL_IMPORT_RTS const StgFunInfoTable i
    32 
    -#  define RTS_THUNK_INFO(i) extern DLL_IMPORT_RTS const StgThunkInfoTable i
    33 
    -#  define RTS_INFO(i)       extern DLL_IMPORT_RTS const StgInfoTable i
    34 
    -#  define RTS_CLOSURE(i)    extern DLL_IMPORT_RTS StgClosure i
    35 
    -#  define RTS_FUN_DECL(f)   extern DLL_IMPORT_RTS StgFunPtr f(void)
    30 
    +#  define RTS_RET_INFO(i)   extern const StgRetInfoTable i
    31 
    +#  define RTS_FUN_INFO(i)   extern const StgFunInfoTable i
    32 
    +#  define RTS_THUNK_INFO(i) extern const StgThunkInfoTable i
    33 
    +#  define RTS_INFO(i)       extern const StgInfoTable i
    34 
    +#  define RTS_CLOSURE(i)    extern StgClosure i
    35 
    +#  define RTS_FUN_DECL(f)   extern StgFunPtr f(void)
    36 36 
     #endif
    37 37
    38 38 
     #if defined(TABLES_NEXT_TO_CODE)
    ... ... @@ -274,11 +274,11 @@ RTS_CLOSURE(stg_NO_TREC_closure);
    274 274 
     RTS_ENTRY(stg_NO_FINALIZER);
    275 275
    276 276 
     #if IN_STG_CODE
    277 
    -extern DLL_IMPORT_RTS StgWordArray stg_CHARLIKE_closure;
    278 
    -extern DLL_IMPORT_RTS StgWordArray stg_INTLIKE_closure;
    277 
    +extern StgWordArray stg_CHARLIKE_closure;
    278 
    +extern StgWordArray stg_INTLIKE_closure;
    279 279 
     #else
    280 
    -extern DLL_IMPORT_RTS StgIntCharlikeClosure stg_CHARLIKE_closure[];
    281 
    -extern DLL_IMPORT_RTS StgIntCharlikeClosure stg_INTLIKE_closure[];
    280 
    +extern StgIntCharlikeClosure stg_CHARLIKE_closure[];
    281 
    +extern StgIntCharlikeClosure stg_INTLIKE_closure[];
    282 282 
     #endif
    283 283
    284 284 
     /* StgStartup */

  • rts/rts.cabal
    ... ... @@ -334,7 +334,6 @@ library
    334 334 
                             rts/storage/InfoTables.h
    335 335 
                             rts/storage/MBlock.h
    336 336 
                             rts/storage/TSO.h
    337 
    -                        stg/DLL.h
    338 337 
                             stg/MachRegs.h
    339 338 
                             stg/MachRegs/arm32.h
    340 339 
                             stg/MachRegs/arm64.h

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications · Help