From 10647d4e2e8e3b5eb5486bd6aafbe17cda139577 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Tue, 3 Nov 2015 17:10:12 +1100 Subject: 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 --- rts/LinkerInternals.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'rts/LinkerInternals.h') 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. */ -- cgit v1.2.1