From 8bc809b7d3bc416d63eba96013553498c95ecc6f Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Sun, 23 Oct 2016 08:30:19 +1100 Subject: Enable new warning for bad CPP #if usage The C code in the RTS now gets built with `-Wundef` and the Haskell code (stages 1 and 2 only) with `-Wcpp-undef`. We now get warnings whereever `#if` is used on undefined identifiers. --- compiler/utils/Util.hs | 2 +- ghc/GHCi/UI.hs | 2 +- includes/CodeGen.Platform.hs | 53 ++++++++++++++++++++++-------------------- includes/Stg.h | 6 ++--- includes/rts/OSThreads.h | 4 ++-- includes/stg/MachRegs.h | 14 +++++------ includes/stg/SMP.h | 37 +++++++++++++++-------------- libraries/ghci/GHCi/ObjLink.hs | 2 +- mk/warnings.mk | 4 ++-- rts/LinkerInternals.h | 3 ++- rts/OldARMAtomic.c | 2 +- rts/RtsUtils.c | 4 ++-- rts/Schedule.c | 16 ++++++------- rts/Threads.c | 2 +- rts/ghc.mk | 5 +++- rts/posix/GetTime.c | 2 +- rts/posix/OSMem.c | 8 +++---- rts/sm/CNF.c | 2 +- rts/sm/GCUtils.c | 2 +- rts/sm/GCUtils.h | 2 +- rts/sm/MBlock.c | 2 +- 21 files changed, 92 insertions(+), 82 deletions(-) diff --git a/compiler/utils/Util.hs b/compiler/utils/Util.hs index 5c09959f6d..b4e95f4a17 100644 --- a/compiler/utils/Util.hs +++ b/compiler/utils/Util.hs @@ -1337,7 +1337,7 @@ type HasCallStack = (() :: Constraint) #endif -- | A call stack constraint, but only when 'isDebugOn'. -#if DEBUG +#ifdef DEBUG type HasDebugCallStack = HasCallStack #else type HasDebugCallStack = (() :: Constraint) diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs index 6310e3ce32..1da7df2bba 100644 --- a/ghc/GHCi/UI.hs +++ b/ghc/GHCi/UI.hs @@ -379,7 +379,7 @@ findEditor :: IO String findEditor = do getEnv "EDITOR" `catchIO` \_ -> do -#if mingw32_HOST_OS +#ifdef 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 46550af213..72a4d2b375 100644 --- a/includes/CodeGen.Platform.hs +++ b/includes/CodeGen.Platform.hs @@ -1,6 +1,7 @@ import CmmExpr -#if !(MACHREGS_i386 || MACHREGS_x86_64 || MACHREGS_sparc || MACHREGS_powerpc) +#if !(defined MACHREGS_i386 || defined MACHREGS_x86_64 \ + || defined MACHREGS_sparc || defined MACHREGS_powerpc) import Panic #endif import Reg @@ -8,9 +9,9 @@ import Reg #include "ghcautoconf.h" #include "stg/MachRegs.h" -#if MACHREGS_i386 || MACHREGS_x86_64 +#if defined MACHREGS_i386 || defined MACHREGS_x86_64 -# if MACHREGS_i386 +# if defined MACHREGS_i386 # define eax 0 # define ebx 1 # define ecx 2 @@ -21,7 +22,7 @@ import Reg # define esp 7 # endif -# if MACHREGS_x86_64 +# if defined MACHREGS_x86_64 # define rax 0 # define rbx 1 # define rcx 2 @@ -103,7 +104,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 MACHREGS_powerpc || MACHREGS_arm || MACHREGS_aarch64 +#elif defined MACHREGS_powerpc || defined MACHREGS_arm || defined MACHREGS_aarch64 # define r0 0 # define r1 1 @@ -139,8 +140,8 @@ import Reg # 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 MACHREGS_aarch64 || MACHREGS_arm +-- 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 # define s0 32 # define s1 33 # define s2 34 @@ -208,7 +209,7 @@ import Reg # define d31 63 #endif -# if MACHREGS_darwin +# if defined MACHREGS_darwin # define f0 32 # define f1 33 # define f2 34 @@ -276,7 +277,7 @@ import Reg # define fr31 63 # endif -#elif MACHREGS_sparc +#elif defined MACHREGS_sparc # define g0 0 # define g1 1 @@ -631,7 +632,9 @@ 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 MACHREGS_i386 || MACHREGS_x86_64 || MACHREGS_sparc || MACHREGS_powerpc || MACHREGS_arm || MACHREGS_aarch64 +#if defined MACHREGS_i386 || defined MACHREGS_x86_64 \ + || defined MACHREGS_sparc || defined MACHREGS_powerpc \ + || defined MACHREGS_arm || defined MACHREGS_aarch64 # ifdef REG_Base globalRegMaybe BaseReg = Just (RealRegSingle REG_Base) # endif @@ -685,7 +688,7 @@ globalRegMaybe (FloatReg 6) = Just (RealRegSingle REG_F6) # endif # ifdef REG_D1 globalRegMaybe (DoubleReg 1) = -# if MACHREGS_sparc +# if defined MACHREGS_sparc Just (RealRegPair REG_D1 (REG_D1 + 1)) # else Just (RealRegSingle REG_D1) @@ -693,7 +696,7 @@ globalRegMaybe (DoubleReg 1) = # endif # ifdef REG_D2 globalRegMaybe (DoubleReg 2) = -# if MACHREGS_sparc +# if defined MACHREGS_sparc Just (RealRegPair REG_D2 (REG_D2 + 1)) # else Just (RealRegSingle REG_D2) @@ -701,7 +704,7 @@ globalRegMaybe (DoubleReg 2) = # endif # ifdef REG_D3 globalRegMaybe (DoubleReg 3) = -# if MACHREGS_sparc +# if defined MACHREGS_sparc Just (RealRegPair REG_D3 (REG_D3 + 1)) # else Just (RealRegSingle REG_D3) @@ -709,7 +712,7 @@ globalRegMaybe (DoubleReg 3) = # endif # ifdef REG_D4 globalRegMaybe (DoubleReg 4) = -# if MACHREGS_sparc +# if defined MACHREGS_sparc Just (RealRegPair REG_D4 (REG_D4 + 1)) # else Just (RealRegSingle REG_D4) @@ -717,7 +720,7 @@ globalRegMaybe (DoubleReg 4) = # endif # ifdef REG_D5 globalRegMaybe (DoubleReg 5) = -# if MACHREGS_sparc +# if defined MACHREGS_sparc Just (RealRegPair REG_D5 (REG_D5 + 1)) # else Just (RealRegSingle REG_D5) @@ -725,7 +728,7 @@ globalRegMaybe (DoubleReg 5) = # endif # ifdef REG_D6 globalRegMaybe (DoubleReg 6) = -# if MACHREGS_sparc +# if defined MACHREGS_sparc Just (RealRegPair REG_D6 (REG_D6 + 1)) # else Just (RealRegSingle REG_D6) @@ -751,7 +754,7 @@ globalRegMaybe (XmmReg 5) = Just (RealRegSingle REG_XMM5) globalRegMaybe (XmmReg 6) = Just (RealRegSingle REG_XMM6) # endif # endif -# if MAX_REAL_YMM_REG != 0 +# if defined MAX_REAL_YMM_REG && MAX_REAL_YMM_REG != 0 # ifdef REG_YMM1 globalRegMaybe (YmmReg 1) = Just (RealRegSingle REG_YMM1) # endif @@ -771,7 +774,7 @@ globalRegMaybe (YmmReg 5) = Just (RealRegSingle REG_YMM5) globalRegMaybe (YmmReg 6) = Just (RealRegSingle REG_YMM6) # endif # endif -# if MAX_REAL_ZMM_REG != 0 +# if defined MAX_REAL_ZMM_REG && MAX_REAL_ZMM_REG != 0 # ifdef REG_ZMM1 globalRegMaybe (ZmmReg 1) = Just (RealRegSingle REG_ZMM1) # endif @@ -819,7 +822,7 @@ globalRegMaybe CurrentNursery = Just (RealRegSingle REG_CurrentNursery globalRegMaybe MachSp = Just (RealRegSingle REG_MachSp) # endif globalRegMaybe _ = Nothing -#elif MACHREGS_NO_REGS +#elif defined MACHREGS_NO_REGS globalRegMaybe _ = Nothing #else globalRegMaybe = panic "globalRegMaybe not defined for this platform" @@ -827,14 +830,14 @@ globalRegMaybe = panic "globalRegMaybe not defined for this platform" freeReg :: RegNo -> Bool -#if MACHREGS_i386 || MACHREGS_x86_64 +#if defined MACHREGS_i386 || defined MACHREGS_x86_64 -# if MACHREGS_i386 +# if defined MACHREGS_i386 freeReg esp = False -- %esp is the C stack pointer freeReg esi = False -- Note [esi/edi not allocatable] freeReg edi = False # endif -# if MACHREGS_x86_64 +# if defined MACHREGS_x86_64 freeReg rsp = False -- %rsp is the C stack pointer # endif @@ -875,14 +878,14 @@ freeRegBase REG_HpLim = False -- their liveness accurately. freeRegBase _ = True -#elif MACHREGS_powerpc +#elif defined 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 !MACHREGS_darwin +# if !defined 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 @@ -983,7 +986,7 @@ freeReg REG_HpLim = False # endif freeReg _ = True -#elif MACHREGS_sparc +#elif defined (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 939bed6444..9dc5b65be5 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 __GNUC_GNU_INLINE__ && __GNUC__ == 4 && __GNUC_MINOR__ == 2 +#elif defined __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 -#if FORCE_GNU_INLINE +#ifdef 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 __GNUC_GNU_INLINE__ +#elif defined __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 2ebbd1e0f1..fd9b44cc55 100644 --- a/includes/rts/OSThreads.h +++ b/includes/rts/OSThreads.h @@ -17,7 +17,7 @@ #if defined(HAVE_PTHREAD_H) && !defined(mingw32_HOST_OS) -#if CMINUSMINUS +#ifdef 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) -#if CMINUSMINUS +#ifdef 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/MachRegs.h b/includes/stg/MachRegs.h index 232ce03810..cbb48df761 100644 --- a/includes/stg/MachRegs.h +++ b/includes/stg/MachRegs.h @@ -82,7 +82,7 @@ Leaving SpLim out of the picture. -------------------------------------------------------------------------- */ -#if MACHREGS_i386 +#if defined MACHREGS_i386 #define REG(x) __asm__("%" #x) @@ -156,7 +156,7 @@ --------------------------------------------------------------------------- */ -#elif MACHREGS_x86_64 +#elif defined 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 MACHREGS_powerpc +#elif defined 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 -#if MACHREGS_darwin +#if defined MACHREGS_darwin #define REG_F1 f14 #define REG_F2 f15 @@ -442,7 +442,7 @@ the stack. See Note [Overlapping global registers] for implications. -------------------------------------------------------------------------- */ -#elif MACHREGS_sparc +#elif defined 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 MACHREGS_arm +#elif defined MACHREGS_arm #define REG(x) __asm__(#x) @@ -578,7 +578,7 @@ the stack. See Note [Overlapping global registers] for implications. ----------------------------------------------------------------------------- */ -#elif MACHREGS_aarch64 +#elif defined MACHREGS_aarch64 #define REG(x) __asm__(#x) diff --git a/includes/stg/SMP.h b/includes/stg/SMP.h index 0e806b6716..424de89872 100644 --- a/includes/stg/SMP.h +++ b/includes/stg/SMP.h @@ -14,7 +14,7 @@ #ifndef SMP_H #define SMP_H -#if arm_HOST_ARCH && defined(arm_HOST_ARCH_PRE_ARMv6) +#if defined arm_HOST_ARCH && defined arm_HOST_ARCH_PRE_ARMv6 void arm_atomic_spin_lock(void); void arm_atomic_spin_unlock(void); #endif @@ -187,14 +187,15 @@ EXTERN_INLINE void write_barrier(void) { #if defined(NOSMP) return; -#elif i386_HOST_ARCH || x86_64_HOST_ARCH +#elif defined i386_HOST_ARCH || defined x86_64_HOST_ARCH __asm__ __volatile__ ("" : : : "memory"); -#elif powerpc_HOST_ARCH || powerpc64_HOST_ARCH || powerpc64le_HOST_ARCH +#elif defined powerpc_HOST_ARCH || defined powerpc64_HOST_ARCH \ + || defined powerpc64le_HOST_ARCH __asm__ __volatile__ ("lwsync" : : : "memory"); -#elif sparc_HOST_ARCH +#elif defined sparc_HOST_ARCH /* Sparc in TSO mode does not require store/store barriers. */ __asm__ __volatile__ ("" : : : "memory"); -#elif (arm_HOST_ARCH) || aarch64_HOST_ARCH +#elif defined arm_HOST_ARCH || defined aarch64_HOST_ARCH __asm__ __volatile__ ("dmb st" : : : "memory"); #else #error memory barriers unimplemented on this architecture @@ -205,17 +206,18 @@ EXTERN_INLINE void store_load_barrier(void) { #if defined(NOSMP) return; -#elif i386_HOST_ARCH +#elif defined i386_HOST_ARCH __asm__ __volatile__ ("lock; addl $0,0(%%esp)" : : : "memory"); -#elif x86_64_HOST_ARCH +#elif defined x86_64_HOST_ARCH __asm__ __volatile__ ("lock; addq $0,0(%%rsp)" : : : "memory"); -#elif powerpc_HOST_ARCH || powerpc64_HOST_ARCH || powerpc64le_HOST_ARCH +#elif defined powerpc_HOST_ARCH || defined powerpc64_HOST_ARCH \ + || defined powerpc64le_HOST_ARCH __asm__ __volatile__ ("sync" : : : "memory"); -#elif sparc_HOST_ARCH +#elif defined sparc_HOST_ARCH __asm__ __volatile__ ("membar #StoreLoad" : : : "memory"); -#elif arm_HOST_ARCH +#elif defined arm_HOST_ARCH __asm__ __volatile__ ("dmb" : : : "memory"); -#elif aarch64_HOST_ARCH +#elif defined aarch64_HOST_ARCH __asm__ __volatile__ ("dmb sy" : : : "memory"); #else #error memory barriers unimplemented on this architecture @@ -226,18 +228,19 @@ EXTERN_INLINE void load_load_barrier(void) { #if defined(NOSMP) return; -#elif i386_HOST_ARCH +#elif defined i386_HOST_ARCH __asm__ __volatile__ ("" : : : "memory"); -#elif x86_64_HOST_ARCH +#elif defined x86_64_HOST_ARCH __asm__ __volatile__ ("" : : : "memory"); -#elif powerpc_HOST_ARCH || powerpc64_HOST_ARCH || powerpc64le_HOST_ARCH +#elif defined powerpc_HOST_ARCH || defined powerpc64_HOST_ARCH \ + || defined powerpc64le_HOST_ARCH __asm__ __volatile__ ("lwsync" : : : "memory"); -#elif sparc_HOST_ARCH +#elif defined sparc_HOST_ARCH /* Sparc in TSO mode does not require load/load barriers. */ __asm__ __volatile__ ("" : : : "memory"); -#elif arm_HOST_ARCH +#elif defined arm_HOST_ARCH __asm__ __volatile__ ("dmb" : : : "memory"); -#elif aarch64_HOST_ARCH +#elif defined 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 d7dbdd3373..3adb7ebaf9 100644 --- a/libraries/ghci/GHCi/ObjLink.hs +++ b/libraries/ghci/GHCi/ObjLink.hs @@ -187,7 +187,7 @@ cLeadingUnderscore = False #endif isWindowsHost :: Bool -#if mingw32_HOST_OS +#ifdef mingw32_HOST_OS isWindowsHost = True #else isWindowsHost = False diff --git a/mk/warnings.mk b/mk/warnings.mk index 5ca097f17b..3c4c26d218 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) -SRC_HC_OPTS_STAGE2 += $(WERROR) +SRC_HC_OPTS_STAGE1 += $(WERROR) -Wcpp-undef +SRC_HC_OPTS_STAGE2 += $(WERROR) -Wcpp-undef ifneq "$(GccIsClang)" "YES" diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h index 76497df257..9b4fc17e75 100644 --- a/rts/LinkerInternals.h +++ b/rts/LinkerInternals.h @@ -85,7 +85,8 @@ typedef struct ForeignExportStablePtr_ { struct ForeignExportStablePtr_ *next; } ForeignExportStablePtr; -#if powerpc_HOST_ARCH || x86_64_HOST_ARCH || arm_HOST_ARCH +#if defined powerpc_HOST_ARCH || defined x86_64_HOST_ARCH \ + || defined arm_HOST_ARCH #define NEED_SYMBOL_EXTRAS 1 #endif diff --git a/rts/OldARMAtomic.c b/rts/OldARMAtomic.c index 3c60e6d669..d639af1ecb 100644 --- a/rts/OldARMAtomic.c +++ b/rts/OldARMAtomic.c @@ -20,7 +20,7 @@ #include #endif -#if arm_HOST_ARCH && defined(arm_HOST_ARCH_PRE_ARMv6) +#if defined arm_HOST_ARCH && defined arm_HOST_ARCH_PRE_ARMv6 static volatile int atomic_spin = 0; diff --git a/rts/RtsUtils.c b/rts/RtsUtils.c index 31dc060244..51453fd6fd 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 HAVE_CTIME_R && !HAVE_DECL_CTIME_R +#if defined HAVE_CTIME_R && !HAVE_DECL_CTIME_R extern char *ctime_r(const time_t *, char *); #endif @@ -171,7 +171,7 @@ time_str(void) if (now == 0) { time(&now); -#if HAVE_CTIME_R +#if defined HAVE_CTIME_R ctime_r(&now, nowstr); #else strcpy(nowstr, ctime(&now)); diff --git a/rts/Schedule.c b/rts/Schedule.c index a4d0c1da80..c092e43516 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; -#if mingw32_HOST_OS +#ifdef 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; -#if mingw32_HOST_OS +#ifdef 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; -#if mingw32_HOST_OS +#ifdef mingw32_HOST_OS StgWord32 saved_winerror; #endif saved_errno = errno; -#if mingw32_HOST_OS +#ifdef mingw32_HOST_OS saved_winerror = GetLastError(); #endif @@ -2419,7 +2419,7 @@ suspendThread (StgRegTable *reg, bool interruptible) RELEASE_LOCK(&cap->lock); errno = saved_errno; -#if mingw32_HOST_OS +#ifdef mingw32_HOST_OS SetLastError(saved_winerror); #endif return task; @@ -2433,12 +2433,12 @@ resumeThread (void *task_) Capability *cap; Task *task = task_; int saved_errno; -#if mingw32_HOST_OS +#ifdef mingw32_HOST_OS StgWord32 saved_winerror; #endif saved_errno = errno; -#if mingw32_HOST_OS +#ifdef 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; -#if mingw32_HOST_OS +#ifdef mingw32_HOST_OS SetLastError(saved_winerror); #endif diff --git a/rts/Threads.c b/rts/Threads.c index f5eb9d360c..9cfd36a7c9 100644 --- a/rts/Threads.c +++ b/rts/Threads.c @@ -826,7 +826,7 @@ loop: * Debugging: why is a thread blocked * ------------------------------------------------------------------------- */ -#if DEBUG +#ifdef DEBUG void printThreadBlockage(StgTSO *tso) { diff --git a/rts/ghc.mk b/rts/ghc.mk index b756d942ca..e24e199598 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -267,7 +267,10 @@ WARNING_OPTS += -Waggregate-return WARNING_OPTS += -Wpointer-arith WARNING_OPTS += -Wmissing-noreturn WARNING_OPTS += -Wnested-externs -WARNING_OPTS += -Wredundant-decls +WARNING_OPTS += -Wredundant-decls +ifeq "$(GccLT46)" "NO" +WARNING_OPTS += -Wundef +endif # These ones are hard to avoid: #WARNING_OPTS += -Wconversion diff --git a/rts/posix/GetTime.c b/rts/posix/GetTime.c index 4d25795948..a5d4c25a35 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) || haiku_HOST_OS +#if !defined(HAVE_GETRUSAGE) || defined haiku_HOST_OS return 0; #else struct rusage t; diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c index dcf734f19d..cfacd65cdc 100644 --- a/rts/posix/OSMem.c +++ b/rts/posix/OSMem.c @@ -39,7 +39,7 @@ #include -#if darwin_HOST_OS || ios_HOST_OS +#if defined darwin_HOST_OS || defined ios_HOST_OS #include #include #include @@ -114,7 +114,7 @@ my_mmap (void *addr, W_ size, int operation) { void *ret; -#if darwin_HOST_OS +#ifdef 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; -#if hpux_HOST_OS +#ifdef hpux_HOST_OS ret = mmap(addr, size, prot, flags | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); -#elif linux_HOST_OS +#elif defined 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/sm/CNF.c b/rts/sm/CNF.c index 7dfaced7ef..c24accd005 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; -#if DEBUG +#ifdef DEBUG if (root) verify_consistency_loop(str); #endif diff --git a/rts/sm/GCUtils.c b/rts/sm/GCUtils.c index 9fda2fe070..3717faebed 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 * -------------------------------------------------------------------------- */ -#if DEBUG +#ifdef DEBUG void printMutableList(bdescr *bd) { diff --git a/rts/sm/GCUtils.h b/rts/sm/GCUtils.h index 3092262af6..3ea762376a 100644 --- a/rts/sm/GCUtils.h +++ b/rts/sm/GCUtils.h @@ -52,7 +52,7 @@ isPartiallyFull(bdescr *bd) } -#if DEBUG +#ifdef DEBUG void printMutableList (bdescr *bd); #endif diff --git a/rts/sm/MBlock.c b/rts/sm/MBlock.c index f6640d173c..833dd8c7c2 100644 --- a/rts/sm/MBlock.c +++ b/rts/sm/MBlock.c @@ -657,7 +657,7 @@ initMBlocks(void) #ifdef USE_LARGE_ADDRESS_SPACE { W_ size; -#if aarch64_HOST_ARCH +#ifdef aarch64_HOST_ARCH size = (W_)1 << 38; // 1/4 TByte #else size = (W_)1 << 40; // 1 TByte -- cgit v1.2.1