diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-07-12 12:31:09 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-07-16 23:50:36 -0400 |
| commit | 03c69d8d1ffeb85055d71f6c144c18309a13308f (patch) | |
| tree | bb0e00f4e6a2441f351ef11e05627d4d41fd0f26 | |
| parent | cdd3be20684c696d9008b6ca7c83731adb13e1b6 (diff) | |
| download | haskell-03c69d8d1ffeb85055d71f6c144c18309a13308f.tar.gz | |
rts/linker/PEi386: Rename finit field to fini
fini is short for "finalizer", which does not contain a "t".
| -rw-r--r-- | rts/LinkerInternals.h | 2 | ||||
| -rw-r--r-- | rts/linker/PEi386.c | 6 | ||||
| -rw-r--r-- | rts/linker/PEi386Types.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h index 503d281a71..71a939f8c0 100644 --- a/rts/LinkerInternals.h +++ b/rts/LinkerInternals.h @@ -100,7 +100,7 @@ typedef /* Static initializer section. e.g. .ctors. */ SECTIONKIND_INIT_ARRAY, /* Static finalizer section. e.g. .dtors. */ - SECTIONKIND_FINIT_ARRAY, + SECTIONKIND_FINI_ARRAY, /* We don't know what the section is and don't care. */ SECTIONKIND_OTHER, /* Section contains debug information. e.g. .debug$. */ diff --git a/rts/linker/PEi386.c b/rts/linker/PEi386.c index 7549c67c57..97b7a12e76 100644 --- a/rts/linker/PEi386.c +++ b/rts/linker/PEi386.c @@ -1197,7 +1197,7 @@ ocVerifyImage_PEi386 ( ObjectCode* oc ) oc->info = stgCallocBytes (sizeof(struct ObjectCodeFormatInfo), 1, "ocVerifyImage_PEi386(info)"); oc->info->init = NULL; - oc->info->finit = NULL; + oc->info->fini = NULL; oc->info->ch_info = info; /* Copy the tables over from object-file. Copying these allows us to @@ -1474,8 +1474,8 @@ ocGetNames_PEi386 ( ObjectCode* oc ) } if (0==strncmp(".dtors", section->info->name, 6)) { - kind = SECTIONKIND_FINIT_ARRAY; - oc->info->finit = &oc->sections[i]; + kind = SECTIONKIND_FINI_ARRAY; + oc->info->fini = &oc->sections[i]; } if ( 0 == strncmp(".stab" , section->info->name, 5 ) diff --git a/rts/linker/PEi386Types.h b/rts/linker/PEi386Types.h index 792cc03fda..dbe6d51e3e 100644 --- a/rts/linker/PEi386Types.h +++ b/rts/linker/PEi386Types.h @@ -18,7 +18,7 @@ struct SectionFormatInfo { }; struct ObjectCodeFormatInfo { Section* init; - Section* finit; + Section* fini; Section* pdata; Section* xdata; COFF_HEADER_INFO* ch_info; |