diff options
| author | John Ericson <git@JohnEricson.me> | 2019-07-10 11:54:47 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-07-14 01:21:48 -0400 |
| commit | d7c6c4717cdf1b7bd8550e37da66c52275c802f0 (patch) | |
| tree | 7488a774c7b8e288b4373bcdc9121b53ba1492ea /rts/linker | |
| parent | bd9fc1b2adea718be089b8370d2e82ea55af6539 (diff) | |
| download | haskell-d7c6c4717cdf1b7bd8550e37da66c52275c802f0.tar.gz | |
Expunge #ifdef and #ifndef from the codebase
These are unexploded minds as far as the linter is concerned. I don't
want to hit in my MRs by mistake!
I did this with `sed`, and then rolled back some changes in the docs,
config.guess, and the linter itself.
Diffstat (limited to 'rts/linker')
| -rw-r--r-- | rts/linker/ELFRelocs/AArch64.def | 2 | ||||
| -rw-r--r-- | rts/linker/ELFRelocs/ARM.def | 2 | ||||
| -rw-r--r-- | rts/linker/ELFRelocs/i386.def | 2 | ||||
| -rw-r--r-- | rts/linker/ELFRelocs/x86_64.def | 2 | ||||
| -rw-r--r-- | rts/linker/Elf.c | 4 | ||||
| -rw-r--r-- | rts/linker/ElfTypes.h | 2 | ||||
| -rw-r--r-- | rts/linker/elf_compat.h | 2 | ||||
| -rw-r--r-- | rts/linker/elf_util.h | 2 | ||||
| -rw-r--r-- | rts/linker/util.h | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/rts/linker/ELFRelocs/AArch64.def b/rts/linker/ELFRelocs/AArch64.def index c21df07d2d..d77b681dc6 100644 --- a/rts/linker/ELFRelocs/AArch64.def +++ b/rts/linker/ELFRelocs/AArch64.def @@ -1,5 +1,5 @@ -#ifndef ELF_RELOC +#if !defined(ELF_RELOC) #error "ELF_RELOC must be defined" #endif diff --git a/rts/linker/ELFRelocs/ARM.def b/rts/linker/ELFRelocs/ARM.def index 730fc5b883..eb21e6cef6 100644 --- a/rts/linker/ELFRelocs/ARM.def +++ b/rts/linker/ELFRelocs/ARM.def @@ -1,5 +1,5 @@ -#ifndef ELF_RELOC +#if !defined(ELF_RELOC) #error "ELF_RELOC must be defined" #endif diff --git a/rts/linker/ELFRelocs/i386.def b/rts/linker/ELFRelocs/i386.def index 1d28cf595c..3191195ea8 100644 --- a/rts/linker/ELFRelocs/i386.def +++ b/rts/linker/ELFRelocs/i386.def @@ -1,5 +1,5 @@ -#ifndef ELF_RELOC +#if !defined(ELF_RELOC) #error "ELF_RELOC must be defined" #endif diff --git a/rts/linker/ELFRelocs/x86_64.def b/rts/linker/ELFRelocs/x86_64.def index 18fdcf9472..197931fa51 100644 --- a/rts/linker/ELFRelocs/x86_64.def +++ b/rts/linker/ELFRelocs/x86_64.def @@ -1,5 +1,5 @@ -#ifndef ELF_RELOC +#if !defined(ELF_RELOC) #error "ELF_RELOC must be defined" #endif diff --git a/rts/linker/Elf.c b/rts/linker/Elf.c index 954993f086..0882f8d349 100644 --- a/rts/linker/Elf.c +++ b/rts/linker/Elf.c @@ -1122,13 +1122,13 @@ do_Elf_Rel_relocations ( ObjectCode* oc, char* ehdrC, #endif switch (reloc_type) { -# ifdef i386_HOST_ARCH +# if defined(i386_HOST_ARCH) case COMPAT_R_386_NONE: break; case COMPAT_R_386_32: *pP = value; break; case COMPAT_R_386_PC32: *pP = value - P; break; # endif -# ifdef arm_HOST_ARCH +# if defined(arm_HOST_ARCH) case COMPAT_R_ARM_ABS32: /* (S + A) | T */ // Specified by Linux ARM ABI to be equivalent to ABS32 case COMPAT_R_ARM_TARGET1: diff --git a/rts/linker/ElfTypes.h b/rts/linker/ElfTypes.h index 852d82a498..e5333d71a7 100644 --- a/rts/linker/ElfTypes.h +++ b/rts/linker/ElfTypes.h @@ -1,4 +1,4 @@ -#ifndef ElfTypes_h +#if !defined(ElfTypes_h) #define ElfTypes_h #if defined(OBJFORMAT_ELF) diff --git a/rts/linker/elf_compat.h b/rts/linker/elf_compat.h index c42f1f8949..b409728a09 100644 --- a/rts/linker/elf_compat.h +++ b/rts/linker/elf_compat.h @@ -9,7 +9,7 @@ // under which it is distrubuted. // -#ifndef RTS_ELF_COMPAT_H +#if !defined(RTS_ELF_COMPAT_H) #define RTS_ELF_COMPAT_H #define PASTE(x,y) x ## y diff --git a/rts/linker/elf_util.h b/rts/linker/elf_util.h index d94eb6992e..2ece198268 100644 --- a/rts/linker/elf_util.h +++ b/rts/linker/elf_util.h @@ -1,4 +1,4 @@ -#ifndef RTS_LINKER_ELF_UTIL_H +#if !defined(RTS_LINKER_ELF_UTIL_H) #define RTS_LINKER_ELF_UTIL_H #include "LinkerInternals.h" diff --git a/rts/linker/util.h b/rts/linker/util.h index f2aa50649d..77f06978ab 100644 --- a/rts/linker/util.h +++ b/rts/linker/util.h @@ -1,4 +1,4 @@ -#ifndef RTS_LINKER_UTIL_H +#if !defined(RTS_LINKER_UTIL_H) #define RTS_LINKER_UTIL_H #include <stdint.h> |