diff options
author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2015-11-03 17:10:12 +1100 |
---|---|---|
committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2015-11-04 16:40:26 +1100 |
commit | 10647d4e2e8e3b5eb5486bd6aafbe17cda139577 (patch) | |
tree | da9d5c53d5a6417522d48c63452feec498be1478 /rts/LinkerInternals.h | |
parent | e5479541599eec6237e3a3d784290d76fe01e5bc (diff) | |
download | haskell-10647d4e2e8e3b5eb5486bd6aafbe17cda139577.tar.gz |
Linker: #ifdef cleanup
Test Plan:
- Run tests on x86_64/linux and powerpc/linux
- Cross compile rts/Linker.c with the i686-w64-mingw32-gcc and
x86_64-w64-mingw32-gcc Linux to Windows cross-compilers.
Reviewers: bgamari, austin, hvr, Phyx
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1429
Diffstat (limited to 'rts/LinkerInternals.h')
-rw-r--r-- | rts/LinkerInternals.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h index f5f17d2380..c972fa2ad3 100644 --- a/rts/LinkerInternals.h +++ b/rts/LinkerInternals.h @@ -19,12 +19,12 @@ typedef enum { the GC for deciding whether or not a pointer on the stack is a code pointer. */ -typedef +typedef enum { SECTIONKIND_CODE_OR_RODATA, SECTIONKIND_RWDATA, SECTIONKIND_INIT_ARRAY, SECTIONKIND_OTHER, - SECTIONKIND_NOINFOAVAIL } + SECTIONKIND_NOINFOAVAIL } SectionKind; typedef @@ -36,7 +36,7 @@ typedef SectionAlloc; typedef - struct _Section { + struct _Section { void* start; /* actual start of section in memory */ StgWord size; /* actual size of section in memory */ SectionKind kind; @@ -122,11 +122,9 @@ typedef struct _ObjectCode { /* flag used when deciding whether to unload an object file */ int referenced; -#ifdef darwin_HOST_OS /* record by how much image has been deliberately misaligned after allocation, so that we can use realloc */ int misalignment; -#endif /* The section-kind entries for this object module. Linked list. */ |