diff options
-rw-r--r-- | compiler/utils/Util.hs | 2 | ||||
-rw-r--r-- | ghc/GHCi/UI.hs | 2 | ||||
-rw-r--r-- | includes/CodeGen.Platform.hs | 57 | ||||
-rw-r--r-- | includes/Stg.h | 6 | ||||
-rw-r--r-- | includes/rts/OSThreads.h | 4 | ||||
-rw-r--r-- | includes/stg/HaskellMachRegs.h | 36 | ||||
-rw-r--r-- | includes/stg/MachRegs.h | 14 | ||||
-rw-r--r-- | includes/stg/RtsMachRegs.h | 36 | ||||
-rw-r--r-- | includes/stg/SMP.h | 37 | ||||
-rw-r--r-- | libraries/ghci/GHCi/ObjLink.hs | 2 | ||||
-rw-r--r-- | mk/warnings.mk | 4 | ||||
-rw-r--r-- | rts/LinkerInternals.h | 11 | ||||
-rw-r--r-- | rts/OldARMAtomic.c | 2 | ||||
-rw-r--r-- | rts/PrimOps.cmm | 4 | ||||
-rw-r--r-- | rts/RtsUtils.c | 4 | ||||
-rw-r--r-- | rts/Schedule.c | 16 | ||||
-rw-r--r-- | rts/Threads.c | 2 | ||||
-rw-r--r-- | rts/ghc.mk | 5 | ||||
-rw-r--r-- | rts/linker/MachO.c | 10 | ||||
-rw-r--r-- | rts/posix/GetTime.c | 2 | ||||
-rw-r--r-- | rts/posix/OSMem.c | 8 | ||||
-rw-r--r-- | rts/posix/OSThreads.c | 2 | ||||
-rw-r--r-- | rts/posix/itimer/Pthread.c | 6 | ||||
-rw-r--r-- | rts/sm/CNF.c | 2 | ||||
-rw-r--r-- | rts/sm/GCUtils.c | 2 | ||||
-rw-r--r-- | rts/sm/GCUtils.h | 2 | ||||
-rw-r--r-- | rts/sm/MBlock.c | 2 |
27 files changed, 113 insertions, 167 deletions
diff --git a/compiler/utils/Util.hs b/compiler/utils/Util.hs index 1c519ebeef..03e0e58213 100644 --- a/compiler/utils/Util.hs +++ b/compiler/utils/Util.hs @@ -1345,7 +1345,7 @@ type HasCallStack = (() :: Constraint) #endif -- | A call stack constraint, but only when 'isDebugOn'. -#ifdef DEBUG +#if DEBUG type HasDebugCallStack = HasCallStack #else type HasDebugCallStack = (() :: Constraint) diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs index f3154c6fc5..deee24ab33 100644 --- a/ghc/GHCi/UI.hs +++ b/ghc/GHCi/UI.hs @@ -379,7 +379,7 @@ findEditor :: IO String findEditor = do getEnv "EDITOR" `catchIO` \_ -> do -#ifdef mingw32_HOST_OS +#if mingw32_HOST_OS win <- System.Win32.getWindowsDirectory return (win </> "notepad.exe") #else diff --git a/includes/CodeGen.Platform.hs b/includes/CodeGen.Platform.hs index 6691484f66..3674ea6f95 100644 --- a/includes/CodeGen.Platform.hs +++ b/includes/CodeGen.Platform.hs @@ -1,7 +1,6 @@ import CmmExpr -#if !(defined(MACHREGS_i386) || defined(MACHREGS_x86_64) \ - || defined(MACHREGS_sparc) || defined(MACHREGS_powerpc)) +#if !(MACHREGS_i386 || MACHREGS_x86_64 || MACHREGS_sparc || MACHREGS_powerpc) import Panic #endif import Reg @@ -9,9 +8,9 @@ import Reg #include "ghcautoconf.h" #include "stg/MachRegs.h" -#if defined(MACHREGS_i386) || defined(MACHREGS_x86_64) +#if MACHREGS_i386 || MACHREGS_x86_64 -# if defined(MACHREGS_i386) +# if MACHREGS_i386 # define eax 0 # define ebx 1 # define ecx 2 @@ -22,7 +21,7 @@ import Reg # define esp 7 # endif -# if defined(MACHREGS_x86_64) +# if MACHREGS_x86_64 # define rax 0 # define rbx 1 # define rcx 2 @@ -104,8 +103,7 @@ import Reg -- I'm not sure if these are the correct numberings. -- Normally, the register names are just stringified as part of the REG() macro -#elif defined(MACHREGS_powerpc) || defined(MACHREGS_arm) \ - || defined(MACHREGS_aarch64) +#elif MACHREGS_powerpc || MACHREGS_arm || MACHREGS_aarch64 # define r0 0 # define r1 1 @@ -140,10 +138,9 @@ import Reg # define r30 30 # define r31 31 --- See note above. These aren't actually used for anything except satisfying --- the compiler for globalRegMaybe so I'm unsure if they're the correct --- numberings, should they ever be attempted to be used in the NCG. -#if defined(MACHREGS_aarch64) || defined(MACHREGS_arm) +-- See note above. These aren't actually used for anything except satisfying the compiler for globalRegMaybe +-- so I'm unsure if they're the correct numberings, should they ever be attempted to be used in the NCG. +#if MACHREGS_aarch64 || MACHREGS_arm # define s0 32 # define s1 33 # define s2 34 @@ -211,7 +208,7 @@ import Reg # define d31 63 #endif -# if defined(MACHREGS_darwin) +# if MACHREGS_darwin # define f0 32 # define f1 33 # define f2 34 @@ -279,7 +276,7 @@ import Reg # define fr31 63 # endif -#elif defined(MACHREGS_sparc) +#elif MACHREGS_sparc # define g0 0 # define g1 1 @@ -634,9 +631,7 @@ haveRegBase = False -- in a real machine register, otherwise returns @'Just' reg@, where -- reg is the machine register it is stored in. globalRegMaybe :: GlobalReg -> Maybe RealReg -#if defined(MACHREGS_i386) || defined(MACHREGS_x86_64) \ - || defined(MACHREGS_sparc) || defined(MACHREGS_powerpc) \ - || defined(MACHREGS_arm) || defined(MACHREGS_aarch64) +#if MACHREGS_i386 || MACHREGS_x86_64 || MACHREGS_sparc || MACHREGS_powerpc || MACHREGS_arm || MACHREGS_aarch64 # ifdef REG_Base globalRegMaybe BaseReg = Just (RealRegSingle REG_Base) # endif @@ -690,7 +685,7 @@ globalRegMaybe (FloatReg 6) = Just (RealRegSingle REG_F6) # endif # ifdef REG_D1 globalRegMaybe (DoubleReg 1) = -# if defined(MACHREGS_sparc) +# if MACHREGS_sparc Just (RealRegPair REG_D1 (REG_D1 + 1)) # else Just (RealRegSingle REG_D1) @@ -698,7 +693,7 @@ globalRegMaybe (DoubleReg 1) = # endif # ifdef REG_D2 globalRegMaybe (DoubleReg 2) = -# if defined(MACHREGS_sparc) +# if MACHREGS_sparc Just (RealRegPair REG_D2 (REG_D2 + 1)) # else Just (RealRegSingle REG_D2) @@ -706,7 +701,7 @@ globalRegMaybe (DoubleReg 2) = # endif # ifdef REG_D3 globalRegMaybe (DoubleReg 3) = -# if defined(MACHREGS_sparc) +# if MACHREGS_sparc Just (RealRegPair REG_D3 (REG_D3 + 1)) # else Just (RealRegSingle REG_D3) @@ -714,7 +709,7 @@ globalRegMaybe (DoubleReg 3) = # endif # ifdef REG_D4 globalRegMaybe (DoubleReg 4) = -# if defined(MACHREGS_sparc) +# if MACHREGS_sparc Just (RealRegPair REG_D4 (REG_D4 + 1)) # else Just (RealRegSingle REG_D4) @@ -722,7 +717,7 @@ globalRegMaybe (DoubleReg 4) = # endif # ifdef REG_D5 globalRegMaybe (DoubleReg 5) = -# if defined(MACHREGS_sparc) +# if MACHREGS_sparc Just (RealRegPair REG_D5 (REG_D5 + 1)) # else Just (RealRegSingle REG_D5) @@ -730,7 +725,7 @@ globalRegMaybe (DoubleReg 5) = # endif # ifdef REG_D6 globalRegMaybe (DoubleReg 6) = -# if defined(MACHREGS_sparc) +# if MACHREGS_sparc Just (RealRegPair REG_D6 (REG_D6 + 1)) # else Just (RealRegSingle REG_D6) @@ -756,7 +751,7 @@ globalRegMaybe (XmmReg 5) = Just (RealRegSingle REG_XMM5) globalRegMaybe (XmmReg 6) = Just (RealRegSingle REG_XMM6) # endif # endif -# if defined MAX_REAL_YMM_REG && MAX_REAL_YMM_REG != 0 +# if MAX_REAL_YMM_REG != 0 # ifdef REG_YMM1 globalRegMaybe (YmmReg 1) = Just (RealRegSingle REG_YMM1) # endif @@ -776,7 +771,7 @@ globalRegMaybe (YmmReg 5) = Just (RealRegSingle REG_YMM5) globalRegMaybe (YmmReg 6) = Just (RealRegSingle REG_YMM6) # endif # endif -# if defined MAX_REAL_ZMM_REG && MAX_REAL_ZMM_REG != 0 +# if MAX_REAL_ZMM_REG != 0 # ifdef REG_ZMM1 globalRegMaybe (ZmmReg 1) = Just (RealRegSingle REG_ZMM1) # endif @@ -824,7 +819,7 @@ globalRegMaybe CurrentNursery = Just (RealRegSingle REG_CurrentNursery globalRegMaybe MachSp = Just (RealRegSingle REG_MachSp) # endif globalRegMaybe _ = Nothing -#elif defined MACHREGS_NO_REGS +#elif MACHREGS_NO_REGS globalRegMaybe _ = Nothing #else globalRegMaybe = panic "globalRegMaybe not defined for this platform" @@ -832,14 +827,14 @@ globalRegMaybe = panic "globalRegMaybe not defined for this platform" freeReg :: RegNo -> Bool -#if defined(MACHREGS_i386) || defined(MACHREGS_x86_64) +#if MACHREGS_i386 || MACHREGS_x86_64 -# if defined(MACHREGS_i386) +# if MACHREGS_i386 freeReg esp = False -- %esp is the C stack pointer freeReg esi = False -- Note [esi/edi not allocatable] freeReg edi = False # endif -# if defined(MACHREGS_x86_64) +# if MACHREGS_x86_64 freeReg rsp = False -- %rsp is the C stack pointer # endif @@ -880,14 +875,14 @@ freeRegBase REG_HpLim = False -- their liveness accurately. freeRegBase _ = True -#elif defined(MACHREGS_powerpc) +#elif MACHREGS_powerpc freeReg 0 = False -- Used by code setting the back chain pointer -- in stack reallocations on Linux -- r0 is not usable in all insns so also reserved -- on Darwin. freeReg 1 = False -- The Stack Pointer -# if !defined(MACHREGS_darwin) +# if !MACHREGS_darwin -- most non-darwin powerpc OSes use r2 as a TOC pointer or something like that freeReg 2 = False freeReg 13 = False -- reserved for system thread ID on 64 bit @@ -988,7 +983,7 @@ freeReg REG_HpLim = False # endif freeReg _ = True -#elif defined(MACHREGS_sparc) +#elif MACHREGS_sparc -- SPARC regs used by the OS / ABI -- %g0(r0) is always zero diff --git a/includes/Stg.h b/includes/Stg.h index 88c8794726..939bed6444 100644 --- a/includes/Stg.h +++ b/includes/Stg.h @@ -147,7 +147,7 @@ // to force gnu90-style 'external inline' semantics. #if defined(FORCE_GNU_INLINE) // disable auto-detection since HAVE_GNU_INLINE has been defined externally -#elif defined(__GNUC_GNU_INLINE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 +#elif __GNUC_GNU_INLINE__ && __GNUC__ == 4 && __GNUC_MINOR__ == 2 // GCC 4.2.x didn't properly support C99 inline semantics (GCC 4.3 was the first // release to properly support C99 inline semantics), and therefore warned when // using 'extern inline' while in C99 mode unless `__attributes__((gnu_inline))` @@ -155,14 +155,14 @@ # define FORCE_GNU_INLINE 1 #endif -#ifdef FORCE_GNU_INLINE +#if FORCE_GNU_INLINE // Force compiler into gnu90 semantics # if defined(KEEP_INLINES) # define EXTERN_INLINE inline __attribute__((gnu_inline)) # else # define EXTERN_INLINE extern inline __attribute__((gnu_inline)) # endif -#elif defined(__GNUC_GNU_INLINE__) +#elif __GNUC_GNU_INLINE__ // we're currently in gnu90 inline mode by default and // __attribute__((gnu_inline)) may not be supported, so better leave it off # if defined(KEEP_INLINES) diff --git a/includes/rts/OSThreads.h b/includes/rts/OSThreads.h index fd9b44cc55..2ebbd1e0f1 100644 --- a/includes/rts/OSThreads.h +++ b/includes/rts/OSThreads.h @@ -17,7 +17,7 @@ #if defined(HAVE_PTHREAD_H) && !defined(mingw32_HOST_OS) -#ifdef CMINUSMINUS +#if CMINUSMINUS #define OS_ACQUIRE_LOCK(mutex) foreign "C" pthread_mutex_lock(mutex) #define OS_RELEASE_LOCK(mutex) foreign "C" pthread_mutex_unlock(mutex) @@ -76,7 +76,7 @@ EXTERN_INLINE int TRY_ACQUIRE_LOCK(pthread_mutex_t *mutex) # elif defined(HAVE_WINDOWS_H) -#ifdef CMINUSMINUS +#if CMINUSMINUS /* We jump through a hoop here to get a CCall EnterCriticalSection and LeaveCriticalSection, as that's what C-- wants. */ diff --git a/includes/stg/HaskellMachRegs.h b/includes/stg/HaskellMachRegs.h index 00199d7858..e95cefd822 100644 --- a/includes/stg/HaskellMachRegs.h +++ b/includes/stg/HaskellMachRegs.h @@ -33,34 +33,14 @@ #define MACHREGS_NO_REGS 0 -#ifdef i386_TARGET_ARCH -#define MACHREGS_i386 1 -#endif - -#ifdef x86_64_TARGET_ARCH -#define MACHREGS_x86_64 1 -#endif - -#if defined(powerpc_TARGET_ARCH) || defined(powerpc64_TARGET_ARCH) \ - || defined(powerpc64le_TARGET_ARCH) || defined(rs6000_TARGET_ARCH) -#define MACHREGS_powerpc 1 -#endif - -#ifdef sparc_TARGET_ARCH -#define MACHREGS_sparc 1 -#endif - -#ifdef arm_TARGET_ARCH -#define MACHREGS_arm 1 -#endif - -#ifdef aarch64_TARGET_ARCH -#define MACHREGS_aarch64 1 -#endif - -#ifdef darwin_TARGET_OS -#define MACHREGS_darwin 1 -#endif +#define MACHREGS_i386 i386_TARGET_ARCH +#define MACHREGS_x86_64 x86_64_TARGET_ARCH +#define MACHREGS_powerpc (powerpc_TARGET_ARCH || powerpc64_TARGET_ARCH \ + || powerpc64le_TARGET_ARCH || rs6000_TARGET_ARCH) +#define MACHREGS_sparc sparc_TARGET_ARCH +#define MACHREGS_arm arm_TARGET_ARCH +#define MACHREGS_aarch64 aarch64_TARGET_ARCH +#define MACHREGS_darwin darwin_TARGET_OS #endif diff --git a/includes/stg/MachRegs.h b/includes/stg/MachRegs.h index bed6b90324..232ce03810 100644 --- a/includes/stg/MachRegs.h +++ b/includes/stg/MachRegs.h @@ -82,7 +82,7 @@ Leaving SpLim out of the picture. -------------------------------------------------------------------------- */ -#ifdef MACHREGS_i386 +#if MACHREGS_i386 #define REG(x) __asm__("%" #x) @@ -156,7 +156,7 @@ --------------------------------------------------------------------------- */ -#elif defined(MACHREGS_x86_64) +#elif MACHREGS_x86_64 #define REG(x) __asm__("%" #x) @@ -303,7 +303,7 @@ the stack. See Note [Overlapping global registers] for implications. We can do the Whole Business with callee-save registers only! -------------------------------------------------------------------------- */ -#elif defined(MACHREGS_powerpc) +#elif MACHREGS_powerpc #define REG(x) __asm__(#x) @@ -316,7 +316,7 @@ the stack. See Note [Overlapping global registers] for implications. #define REG_R7 r20 #define REG_R8 r21 -#ifdef MACHREGS_darwin +#if MACHREGS_darwin #define REG_F1 f14 #define REG_F2 f15 @@ -442,7 +442,7 @@ the stack. See Note [Overlapping global registers] for implications. -------------------------------------------------------------------------- */ -#elif defined(MACHREGS_sparc) +#elif MACHREGS_sparc #define REG(x) __asm__("%" #x) @@ -521,7 +521,7 @@ the stack. See Note [Overlapping global registers] for implications. d16-d31/q8-q15 Argument / result/ scratch registers ----------------------------------------------------------------------------- */ -#elif defined(MACHREGS_arm) +#elif MACHREGS_arm #define REG(x) __asm__(#x) @@ -578,7 +578,7 @@ the stack. See Note [Overlapping global registers] for implications. ----------------------------------------------------------------------------- */ -#elif defined(MACHREGS_aarch64) +#elif MACHREGS_aarch64 #define REG(x) __asm__(#x) diff --git a/includes/stg/RtsMachRegs.h b/includes/stg/RtsMachRegs.h index e6298cf8c9..29262dc17a 100644 --- a/includes/stg/RtsMachRegs.h +++ b/includes/stg/RtsMachRegs.h @@ -39,34 +39,14 @@ #define MACHREGS_NO_REGS 0 -#ifdef i386_HOST_ARCH -#define MACHREGS_i386 1 -#endif - -#ifdef x86_64_HOST_ARCH -#define MACHREGS_x86_64 1 -#endif - -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH) \ - || defined(powerpc64le_HOST_ARCH) || defined(rs6000_HOST_ARCH) -#define MACHREGS_powerpc 1 -#endif - -#ifdef sparc_HOST_ARCH -#define MACHREGS_sparc 1 -#endif - -#ifdef arm_HOST_ARCH -#define MACHREGS_arm 1 -#endif - -#ifdef aarch64_HOST_ARCH -#define MACHREGS_aarch64 1 -#endif - -#ifdef darwin_HOST_OS -#define MACHREGS_darwin 1 -#endif +#define MACHREGS_i386 i386_HOST_ARCH +#define MACHREGS_x86_64 x86_64_HOST_ARCH +#define MACHREGS_powerpc (powerpc_HOST_ARCH || powerpc64_HOST_ARCH \ + || powerpc64le_HOST_ARCH || rs6000_HOST_ARCH) +#define MACHREGS_sparc sparc_HOST_ARCH +#define MACHREGS_arm arm_HOST_ARCH +#define MACHREGS_aarch64 aarch64_HOST_ARCH +#define MACHREGS_darwin darwin_HOST_OS #endif diff --git a/includes/stg/SMP.h b/includes/stg/SMP.h index 21ab0e1214..0e806b6716 100644 --- a/includes/stg/SMP.h +++ b/includes/stg/SMP.h @@ -14,7 +14,7 @@ #ifndef SMP_H #define SMP_H -#if defined(arm_HOST_ARCH) && defined(arm_HOST_ARCH_PRE_ARMv6) +#if arm_HOST_ARCH && defined(arm_HOST_ARCH_PRE_ARMv6) void arm_atomic_spin_lock(void); void arm_atomic_spin_unlock(void); #endif @@ -187,15 +187,14 @@ EXTERN_INLINE void write_barrier(void) { #if defined(NOSMP) return; -#elif defined(i386_HOST_ARCH) || defined(x86_64_HOST_ARCH) +#elif i386_HOST_ARCH || x86_64_HOST_ARCH __asm__ __volatile__ ("" : : : "memory"); -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH) \ - || defined(powerpc64le_HOST_ARCH) +#elif powerpc_HOST_ARCH || powerpc64_HOST_ARCH || powerpc64le_HOST_ARCH __asm__ __volatile__ ("lwsync" : : : "memory"); -#elif defined(sparc_HOST_ARCH) +#elif sparc_HOST_ARCH /* Sparc in TSO mode does not require store/store barriers. */ __asm__ __volatile__ ("" : : : "memory"); -#elif defined(arm_HOST_ARCH) || defined(aarch64_HOST_ARCH) +#elif (arm_HOST_ARCH) || aarch64_HOST_ARCH __asm__ __volatile__ ("dmb st" : : : "memory"); #else #error memory barriers unimplemented on this architecture @@ -206,18 +205,17 @@ EXTERN_INLINE void store_load_barrier(void) { #if defined(NOSMP) return; -#elif defined(i386_HOST_ARCH) +#elif i386_HOST_ARCH __asm__ __volatile__ ("lock; addl $0,0(%%esp)" : : : "memory"); -#elif defined(x86_64_HOST_ARCH) +#elif x86_64_HOST_ARCH __asm__ __volatile__ ("lock; addq $0,0(%%rsp)" : : : "memory"); -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH) \ - || defined(powerpc64le_HOST_ARCH) +#elif powerpc_HOST_ARCH || powerpc64_HOST_ARCH || powerpc64le_HOST_ARCH __asm__ __volatile__ ("sync" : : : "memory"); -#elif defined(sparc_HOST_ARCH) +#elif sparc_HOST_ARCH __asm__ __volatile__ ("membar #StoreLoad" : : : "memory"); -#elif defined(arm_HOST_ARCH) +#elif arm_HOST_ARCH __asm__ __volatile__ ("dmb" : : : "memory"); -#elif defined(aarch64_HOST_ARCH) +#elif aarch64_HOST_ARCH __asm__ __volatile__ ("dmb sy" : : : "memory"); #else #error memory barriers unimplemented on this architecture @@ -228,19 +226,18 @@ EXTERN_INLINE void load_load_barrier(void) { #if defined(NOSMP) return; -#elif defined(i386_HOST_ARCH) +#elif i386_HOST_ARCH __asm__ __volatile__ ("" : : : "memory"); -#elif defined(x86_64_HOST_ARCH) +#elif x86_64_HOST_ARCH __asm__ __volatile__ ("" : : : "memory"); -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH) \ - || defined(powerpc64le_HOST_ARCH) +#elif powerpc_HOST_ARCH || powerpc64_HOST_ARCH || powerpc64le_HOST_ARCH __asm__ __volatile__ ("lwsync" : : : "memory"); -#elif defined(sparc_HOST_ARCH) +#elif sparc_HOST_ARCH /* Sparc in TSO mode does not require load/load barriers. */ __asm__ __volatile__ ("" : : : "memory"); -#elif defined(arm_HOST_ARCH) +#elif arm_HOST_ARCH __asm__ __volatile__ ("dmb" : : : "memory"); -#elif defined(aarch64_HOST_ARCH) +#elif aarch64_HOST_ARCH __asm__ __volatile__ ("dmb sy" : : : "memory"); #else #error memory barriers unimplemented on this architecture diff --git a/libraries/ghci/GHCi/ObjLink.hs b/libraries/ghci/GHCi/ObjLink.hs index 3adb7ebaf9..d7dbdd3373 100644 --- a/libraries/ghci/GHCi/ObjLink.hs +++ b/libraries/ghci/GHCi/ObjLink.hs @@ -187,7 +187,7 @@ cLeadingUnderscore = False #endif isWindowsHost :: Bool -#ifdef mingw32_HOST_OS +#if mingw32_HOST_OS isWindowsHost = True #else isWindowsHost = False diff --git a/mk/warnings.mk b/mk/warnings.mk index 3c4c26d218..5ca097f17b 100644 --- a/mk/warnings.mk +++ b/mk/warnings.mk @@ -8,8 +8,8 @@ SRC_HC_OPTS += -Wall # isn't supported yet (https://ghc.haskell.org/trac/ghc/wiki/Design/Warnings). # # See Note [Stage number in build variables] in mk/config.mk.in. -SRC_HC_OPTS_STAGE1 += $(WERROR) -Wcpp-undef -SRC_HC_OPTS_STAGE2 += $(WERROR) -Wcpp-undef +SRC_HC_OPTS_STAGE1 += $(WERROR) +SRC_HC_OPTS_STAGE2 += $(WERROR) ifneq "$(GccIsClang)" "YES" diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h index 02fe167829..9d47661f12 100644 --- a/rts/LinkerInternals.h +++ b/rts/LinkerInternals.h @@ -91,8 +91,7 @@ typedef struct ForeignExportStablePtr_ { struct ForeignExportStablePtr_ *next; } ForeignExportStablePtr; -#if defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH) \ - || defined(arm_HOST_ARCH) +#if powerpc_HOST_ARCH || x86_64_HOST_ARCH || arm_HOST_ARCH /* ios currently uses adjacent got tables, and no symbol extras */ #if !defined(ios_HOST_OS) #define NEED_SYMBOL_EXTRAS 1 @@ -103,17 +102,17 @@ typedef struct ForeignExportStablePtr_ { * address relocations on the PowerPC, x86_64 and ARM. */ typedef struct { -#if defined(powerpc_HOST_ARCH) +#ifdef powerpc_HOST_ARCH struct { short lis_r12, hi_addr; short ori_r12_r12, lo_addr; long mtctr_r12; long bctr; } jumpIsland; -#elif defined(x86_64_HOST_ARCH) +#elif x86_64_HOST_ARCH uint64_t addr; uint8_t jumpIsland[6]; -#elif defined(arm_HOST_ARCH) +#elif arm_HOST_ARCH uint8_t jumpIsland[16]; #endif } SymbolExtra; @@ -284,7 +283,7 @@ ObjectCode* mkOc( pathchar *path, char *image, int imageSize, int misalignment ); -#if defined(mingw32_HOST_OS) +#if defined (mingw32_HOST_OS) /* We use myindex to calculate array addresses, rather than simply doing the normal subscript thing. That's because some of the above structs have sizes which are not diff --git a/rts/OldARMAtomic.c b/rts/OldARMAtomic.c index e76f4c6354..3c60e6d669 100644 --- a/rts/OldARMAtomic.c +++ b/rts/OldARMAtomic.c @@ -20,7 +20,7 @@ #include <sched.h> #endif -#if defined(arm_HOST_ARCH) && defined(arm_HOST_ARCH_PRE_ARMv6) +#if arm_HOST_ARCH && defined(arm_HOST_ARCH_PRE_ARMv6) static volatile int atomic_spin = 0; diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm index 37eee439ac..4baf63a8f7 100644 --- a/rts/PrimOps.cmm +++ b/rts/PrimOps.cmm @@ -561,7 +561,7 @@ stg_atomicModifyMutVarzh ( gcptr mv, gcptr f ) r = [stg_sel_1 z] (max (HS + 1) MIN_UPD_SIZE) */ -#if defined(MIN_UPD_SIZE) && MIN_UPD_SIZE > 1 +#if MIN_UPD_SIZE > 1 #define THUNK_1_SIZE (SIZEOF_StgThunkHeader + WDS(MIN_UPD_SIZE)) #define TICK_ALLOC_THUNK_1() TICK_ALLOC_UP_THK(WDS(1),WDS(MIN_UPD_SIZE-1)) #else @@ -569,7 +569,7 @@ stg_atomicModifyMutVarzh ( gcptr mv, gcptr f ) #define TICK_ALLOC_THUNK_1() TICK_ALLOC_UP_THK(WDS(1),0) #endif -#if defined(MIN_UPD_SIZE) && MIN_UPD_SIZE > 2 +#if MIN_UPD_SIZE > 2 #define THUNK_2_SIZE (SIZEOF_StgThunkHeader + WDS(MIN_UPD_SIZE)) #define TICK_ALLOC_THUNK_2() TICK_ALLOC_UP_THK(WDS(2),WDS(MIN_UPD_SIZE-2)) #else diff --git a/rts/RtsUtils.c b/rts/RtsUtils.c index 996d28ac4c..85f951addd 100644 --- a/rts/RtsUtils.c +++ b/rts/RtsUtils.c @@ -22,7 +22,7 @@ /* HACK: On Mac OS X 10.4 (at least), time.h doesn't declare ctime_r with * _POSIX_C_SOURCE. If this is the case, we declare it ourselves. */ -#if defined(HAVE_CTIME_R) && !HAVE_DECL_CTIME_R +#if HAVE_CTIME_R && !HAVE_DECL_CTIME_R extern char *ctime_r(const time_t *, char *); #endif @@ -164,7 +164,7 @@ time_str(void) if (now == 0) { time(&now); -#if defined(HAVE_CTIME_R) +#if HAVE_CTIME_R ctime_r(&now, nowstr); #else strcpy(nowstr, ctime(&now)); diff --git a/rts/Schedule.c b/rts/Schedule.c index 296461b38d..b77e7a21ef 100644 --- a/rts/Schedule.c +++ b/rts/Schedule.c @@ -411,7 +411,7 @@ run_thread: prev_what_next = t->what_next; errno = t->saved_errno; -#ifdef mingw32_HOST_OS +#if mingw32_HOST_OS SetLastError(t->saved_winerror); #endif @@ -490,7 +490,7 @@ run_thread: // XXX: possibly bogus for SMP because this thread might already // be running again, see code below. t->saved_errno = errno; -#ifdef mingw32_HOST_OS +#if mingw32_HOST_OS // Similarly for Windows error code t->saved_winerror = GetLastError(); #endif @@ -2374,12 +2374,12 @@ suspendThread (StgRegTable *reg, bool interruptible) int saved_errno; StgTSO *tso; Task *task; -#ifdef mingw32_HOST_OS +#if mingw32_HOST_OS StgWord32 saved_winerror; #endif saved_errno = errno; -#ifdef mingw32_HOST_OS +#if mingw32_HOST_OS saved_winerror = GetLastError(); #endif @@ -2419,7 +2419,7 @@ suspendThread (StgRegTable *reg, bool interruptible) RELEASE_LOCK(&cap->lock); errno = saved_errno; -#ifdef mingw32_HOST_OS +#if mingw32_HOST_OS SetLastError(saved_winerror); #endif return task; @@ -2433,12 +2433,12 @@ resumeThread (void *task_) Capability *cap; Task *task = task_; int saved_errno; -#ifdef mingw32_HOST_OS +#if mingw32_HOST_OS StgWord32 saved_winerror; #endif saved_errno = errno; -#ifdef mingw32_HOST_OS +#if mingw32_HOST_OS saved_winerror = GetLastError(); #endif @@ -2475,7 +2475,7 @@ resumeThread (void *task_) cap->r.rCurrentTSO = tso; cap->in_haskell = true; errno = saved_errno; -#ifdef mingw32_HOST_OS +#if mingw32_HOST_OS SetLastError(saved_winerror); #endif diff --git a/rts/Threads.c b/rts/Threads.c index 9cfd36a7c9..f5eb9d360c 100644 --- a/rts/Threads.c +++ b/rts/Threads.c @@ -826,7 +826,7 @@ loop: * Debugging: why is a thread blocked * ------------------------------------------------------------------------- */ -#ifdef DEBUG +#if DEBUG void printThreadBlockage(StgTSO *tso) { diff --git a/rts/ghc.mk b/rts/ghc.mk index e24e199598..b756d942ca 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -267,10 +267,7 @@ WARNING_OPTS += -Waggregate-return WARNING_OPTS += -Wpointer-arith WARNING_OPTS += -Wmissing-noreturn WARNING_OPTS += -Wnested-externs -WARNING_OPTS += -Wredundant-decls -ifeq "$(GccLT46)" "NO" -WARNING_OPTS += -Wundef -endif +WARNING_OPTS += -Wredundant-decls # These ones are hard to avoid: #WARNING_OPTS += -Wconversion diff --git a/rts/linker/MachO.c b/rts/linker/MachO.c index a7c9189250..16b712a804 100644 --- a/rts/linker/MachO.c +++ b/rts/linker/MachO.c @@ -248,8 +248,7 @@ ocVerifyImage_MachO(ObjectCode * oc) IF_DEBUG(linker, debugBelch("ocVerifyImage_MachO: start\n")); -#if defined(x86_64_HOST_ARCH) || defined(powerpc64_HOST_ARCH) \ - || defined(aarch64_HOST_ARCH) +#if x86_64_HOST_ARCH || powerpc64_HOST_ARCH || aarch64_HOST_ARCH if(header->magic != MH_MAGIC_64) { errorBelch("Could not load image %s: bad magic!\n" " Expected %08x (64bit), got %08x%s\n", @@ -282,7 +281,7 @@ resolveImports( IF_DEBUG(linker, debugBelch("resolveImports: start\n")); -#if defined(i386_HOST_ARCH) +#if i386_HOST_ARCH int isJumpTable = 0; if (strcmp(sect->sectname,"__jump_table") == 0) { @@ -320,7 +319,7 @@ resolveImports( } ASSERT(addr); -#if defined(i386_HOST_ARCH) +#if i386_HOST_ARCH if (isJumpTable) { checkProddableBlock(oc,oc->image + sect->offset + i*itemSize, 5); @@ -1923,8 +1922,7 @@ machoGetMisalignment( FILE * f ) } fseek(f, -sizeof(header), SEEK_CUR); -#if defined(x86_64_HOST_ARCH) || defined(powerpc64_HOST_ARCH) \ - || defined(aarch64_HOST_ARCH) +#if x86_64_HOST_ARCH || powerpc64_HOST_ARCH || aarch64_HOST_ARCH if(header.magic != MH_MAGIC_64) { barf("Bad magic. Expected: %08x, got: %08x.", MH_MAGIC_64, header.magic); diff --git a/rts/posix/GetTime.c b/rts/posix/GetTime.c index 5be9c8e350..4d25795948 100644 --- a/rts/posix/GetTime.c +++ b/rts/posix/GetTime.c @@ -190,7 +190,7 @@ void getUnixEpochTime(StgWord64 *sec, StgWord32 *nsec) W_ getPageFaults(void) { -#if !defined(HAVE_GETRUSAGE) || defined(haiku_HOST_OS) +#if !defined(HAVE_GETRUSAGE) || haiku_HOST_OS return 0; #else struct rusage t; diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c index 48b154fa11..dcf734f19d 100644 --- a/rts/posix/OSMem.c +++ b/rts/posix/OSMem.c @@ -39,7 +39,7 @@ #include <errno.h> -#if defined(darwin_HOST_OS) || defined(ios_HOST_OS) +#if darwin_HOST_OS || ios_HOST_OS #include <mach/mach.h> #include <mach/vm_map.h> #include <sys/sysctl.h> @@ -114,7 +114,7 @@ my_mmap (void *addr, W_ size, int operation) { void *ret; -#ifdef darwin_HOST_OS +#if darwin_HOST_OS // Without MAP_FIXED, Apple's mmap ignores addr. // With MAP_FIXED, it overwrites already mapped regions, whic // mmap(0, ... MAP_FIXED ...) is worst of all: It unmaps the program text @@ -170,9 +170,9 @@ my_mmap (void *addr, W_ size, int operation) else flags = 0; -#ifdef hpux_HOST_OS +#if hpux_HOST_OS ret = mmap(addr, size, prot, flags | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); -#elif defined(linux_HOST_OS) +#elif linux_HOST_OS ret = mmap(addr, size, prot, flags | MAP_ANON | MAP_PRIVATE, -1, 0); if (ret == (void *)-1 && errno == EPERM) { // Linux may return EPERM if it tried to give us diff --git a/rts/posix/OSThreads.c b/rts/posix/OSThreads.c index 465c8675a3..45f394208f 100644 --- a/rts/posix/OSThreads.c +++ b/rts/posix/OSThreads.c @@ -137,7 +137,7 @@ createOSThread (OSThreadId* pId, char *name STG_UNUSED, int result = pthread_create(pId, NULL, (void *(*)(void *))startProc, param); if (!result) { pthread_detach(*pId); -#ifdef HAVE_PTHREAD_SETNAME_NP +#if HAVE_PTHREAD_SETNAME_NP pthread_setname_np(*pId, name); #endif } diff --git a/rts/posix/itimer/Pthread.c b/rts/posix/itimer/Pthread.c index 5c708ecf4d..3b31fe4103 100644 --- a/rts/posix/itimer/Pthread.c +++ b/rts/posix/itimer/Pthread.c @@ -65,7 +65,7 @@ #include <unistd.h> #include <fcntl.h> -#ifdef HAVE_SYS_TIMERFD_H +#if HAVE_SYS_TIMERFD_H #include <sys/timerfd.h> #define USE_TIMERFD_FOR_ITIMER 1 #else @@ -101,7 +101,7 @@ static void *itimer_thread_func(void *_handle_tick) uint64_t nticks; int timerfd = -1; -#if defined(USE_TIMERFD_FOR_ITIMER) && USE_TIMERFD_FOR_ITIMER +#if USE_TIMERFD_FOR_ITIMER struct itimerspec it; it.it_value.tv_sec = TimeToSeconds(itimer_interval); it.it_value.tv_nsec = TimeToNS(itimer_interval) % 1000000000; @@ -169,7 +169,7 @@ initTicker (Time interval, TickProc handle_tick) * to the thread we create so we can later join to it if requested */ if (! pthread_create(&thread, NULL, itimer_thread_func, (void*)handle_tick)) { -#ifdef HAVE_PTHREAD_SETNAME_NP +#if HAVE_PTHREAD_SETNAME_NP pthread_setname_np(thread, "ghc_ticker"); #endif } else { diff --git a/rts/sm/CNF.c b/rts/sm/CNF.c index af90718b4f..624dba30b2 100644 --- a/rts/sm/CNF.c +++ b/rts/sm/CNF.c @@ -1170,7 +1170,7 @@ compactFixupPointers(StgCompactNFData *str, dbl_link_onto(bd, &g0->compact_objects); RELEASE_SM_LOCK; -#ifdef DEBUG +#if DEBUG if (root) verify_consistency_loop(str); #endif diff --git a/rts/sm/GCUtils.c b/rts/sm/GCUtils.c index 3717faebed..9fda2fe070 100644 --- a/rts/sm/GCUtils.c +++ b/rts/sm/GCUtils.c @@ -346,7 +346,7 @@ alloc_todo_block (gen_workspace *ws, uint32_t size) * Debugging * -------------------------------------------------------------------------- */ -#ifdef DEBUG +#if DEBUG void printMutableList(bdescr *bd) { diff --git a/rts/sm/GCUtils.h b/rts/sm/GCUtils.h index 3ea762376a..3092262af6 100644 --- a/rts/sm/GCUtils.h +++ b/rts/sm/GCUtils.h @@ -52,7 +52,7 @@ isPartiallyFull(bdescr *bd) } -#ifdef DEBUG +#if DEBUG void printMutableList (bdescr *bd); #endif diff --git a/rts/sm/MBlock.c b/rts/sm/MBlock.c index 833dd8c7c2..f6640d173c 100644 --- a/rts/sm/MBlock.c +++ b/rts/sm/MBlock.c @@ -657,7 +657,7 @@ initMBlocks(void) #ifdef USE_LARGE_ADDRESS_SPACE { W_ size; -#ifdef aarch64_HOST_ARCH +#if aarch64_HOST_ARCH size = (W_)1 << 38; // 1/4 TByte #else size = (W_)1 << 40; // 1 TByte |