diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2017-04-05 12:01:12 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-04-05 12:12:48 -0400 |
| commit | 819c3db73acf5246cd332ad3062c61b7a2e8ee68 (patch) | |
| tree | 7425f16a8771d1bb917afb65b848ebf855c8c619 /includes/stg/HaskellMachRegs.h | |
| parent | 4a1eed40bec08d50634b9754448ae34666e71fb2 (diff) | |
| download | haskell-819c3db73acf5246cd332ad3062c61b7a2e8ee68.tar.gz | |
Revert "Enable new warning for fragile/incorrect CPP #if usage"
This is causing too much platform dependent breakage at the moment. We
will need a more rigorous testing strategy before this can be
merged again.
This reverts commit 7e340c2bbf4a56959bd1e95cdd1cfdb2b7e537c2.
Diffstat (limited to 'includes/stg/HaskellMachRegs.h')
| -rw-r--r-- | includes/stg/HaskellMachRegs.h | 36 |
1 files changed, 8 insertions, 28 deletions
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 |