diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2017-04-17 21:02:07 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-04-18 18:57:37 -0400 |
| commit | fc7601c5dc9fb826db13c5a644b3a64e7594d0b5 (patch) | |
| tree | 5a7784dc2ea4f351f48849c200be9e00355b9e0e | |
| parent | ebb780f1b384b0d2fa2517c1b8093930ea12b6de (diff) | |
| download | haskell-fc7601c5dc9fb826db13c5a644b3a64e7594d0b5.tar.gz | |
Revert "linker/mach-o: Catch the case where there is no symCmd"
This causes validation failures on Windows.
This reverts commit 6c05b27e5bafe9f232e7014f4760335f5e3ba591.
| -rw-r--r-- | rts/Linker.c | 2 | ||||
| -rw-r--r-- | rts/linker/MachO.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/rts/Linker.c b/rts/Linker.c index b214e9c01f..7366904831 100644 --- a/rts/Linker.c +++ b/rts/Linker.c @@ -1215,8 +1215,6 @@ mkOc( pathchar *path, char *image, int imageSize, IF_DEBUG(linker, debugBelch("mkOc: start\n")); oc = stgMallocBytes(sizeof(ObjectCode), "mkOc(oc)"); - oc->info = NULL; - # if defined(OBJFORMAT_ELF) oc->formatName = "ELF"; # elif defined(OBJFORMAT_PEi386) diff --git a/rts/linker/MachO.c b/rts/linker/MachO.c index e09d151c14..16b712a804 100644 --- a/rts/linker/MachO.c +++ b/rts/linker/MachO.c @@ -130,9 +130,7 @@ ocInit_MachO(ObjectCode * oc) oc->info->nlist = oc->info->symCmd == NULL ? NULL : (MachONList *)(oc->image + oc->info->symCmd->symoff); - oc->info->names = oc->info->symCmd == NULL - ? NULL - : (oc->image + oc->info->symCmd->stroff); + oc->info->names = oc->image + oc->info->symCmd->stroff; /* If we have symbols, allocate and fill the macho_symbols * This will make relocation easier. |