diff options
| author | Gabor Greif <ggreif@gmail.com> | 2017-05-03 11:07:10 +0200 |
|---|---|---|
| committer | Gabor Greif <ggreif@gmail.com> | 2017-05-04 15:38:26 +0200 |
| commit | 81af480a0fd3b37fff17245c1468638597261bcb (patch) | |
| tree | 5493a9adcb9857c062f0664700aaeafe12c37bec /rts/linker/Elf.c | |
| parent | 783dfa744b14e682951a8358e51356a2dedda325 (diff) | |
| download | haskell-81af480a0fd3b37fff17245c1468638597261bcb.tar.gz | |
Abandon typedefing the {Section,ObjectCode}FormatInfo structs
Summary:
This is a follow-up to @angerman 's refactoring for ELF
that happened with e5e8646d3c6af82549b55fbee6764b087144a7ec
My previous commit a6675a93efe7cae2f206508047a39e73ce4e92a5
corrected a typedef redefinition issue with GCC v4.4
(which is pervasive with RHEL 6). Now the problem has resurfaced.
Instead of dancing after the different compiler's pipe, I decided
to eliminate the typedefs altogether and refer to the struct
namespace explicitly.
Added a note to describe why typedefs are not
applied on customisable structs.
Reviewers: austin, bgamari, erikd, simonmar
Subscribers: rwbarton, thomie, angerman
Differential Revision: https://phabricator.haskell.org/D3527
Diffstat (limited to 'rts/linker/Elf.c')
| -rw-r--r-- | rts/linker/Elf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rts/linker/Elf.c b/rts/linker/Elf.c index c1caf9af23..da3e7c69a6 100644 --- a/rts/linker/Elf.c +++ b/rts/linker/Elf.c @@ -161,8 +161,8 @@ get_shndx_table(Elf_Ehdr* ehdr) void ocInit_ELF(ObjectCode * oc) { - oc->info = (ObjectCodeFormatInfo*)stgCallocBytes( - 1, sizeof(ObjectCodeFormatInfo), + oc->info = (struct ObjectCodeFormatInfo*)stgCallocBytes( + 1, sizeof *oc->info, "ocInit_Elf(ObjectCodeFormatInfo)"); // TODO: fill info oc->info->elfHeader = (Elf_Ehdr *)oc->image; |