diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-07-22 07:26:47 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-08-03 17:33:08 +0000 |
| commit | 562991def56ea199865e0404365c41314c66c646 (patch) | |
| tree | 0476cae915656f05f874e9af85e489c7b1cceeac /compiler/GHC/Runtime/Heap/Layout.hs | |
| parent | 7a5636a18c821f6bfe3f4400d1fb368d110dead3 (diff) | |
| download | haskell-wip/organize-headers.tar.gz | |
Move `/includes` to `/rts/include`, sort per package betterwip/organize-headers
In order to make the packages in this repo "reinstallable", we need to
associate source code with a specific packages. Having a top level
`/includes` dir that mixes concerns (which packages' includes?) gets in
the way of this.
To start, I have moved everything to `rts/`, which is mostly correct.
There are a few things however that really don't belong in the rts (like
the generated constants haskell type, `CodeGen.Platform.h`). Those
needed to be manually adjusted.
Things of note:
- No symlinking for sake of windows, so we hard-link at configure time.
- `CodeGen.Platform.h` no longer as `.hs` extension (in addition to
being moved to `compiler/`) so as not to confuse anyone, since it is
next to Haskell files.
- Blanket `-Iincludes` is gone in both build systems, include paths now
more strictly respect per-package dependencies.
- `deriveConstants` has been taught to not require a `--target-os` flag
when generating the platform-agnostic Haskell type. Make takes
advantage of this, but Hadrian has yet to.
Diffstat (limited to 'compiler/GHC/Runtime/Heap/Layout.hs')
| -rw-r--r-- | compiler/GHC/Runtime/Heap/Layout.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/GHC/Runtime/Heap/Layout.hs b/compiler/GHC/Runtime/Heap/Layout.hs index 51f209f6b6..1195f83937 100644 --- a/compiler/GHC/Runtime/Heap/Layout.hs +++ b/compiler/GHC/Runtime/Heap/Layout.hs @@ -181,7 +181,7 @@ data SMRep type IsStatic = Bool -- From an SMRep you can get to the closure type defined in --- includes/rts/storage/ClosureTypes.h. Described by the function +-- rts/include/rts/storage/ClosureTypes.h. Described by the function -- rtsClosureType below. data ClosureTypeInfo @@ -404,8 +404,8 @@ cardTableSizeW platform elems = ----------------------------------------------------------------------------- -- deriving the RTS closure type from an SMRep -#include "../includes/rts/storage/ClosureTypes.h" -#include "../includes/rts/storage/FunTypes.h" +#include "ClosureTypes.h" +#include "FunTypes.h" -- Defines CONSTR, CONSTR_1_0 etc -- | Derives the RTS closure type from an 'SMRep' |