diff options
| author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-06-22 09:00:12 +0000 |
|---|---|---|
| committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-06-22 09:00:12 +0000 |
| commit | 6890c71f322a3a2261b624567be3f5d894250ebe (patch) | |
| tree | 7aaebaba091c5fb791187307d9c0ea49941b9830 | |
| parent | a3c9997fcbf2c1421de4be924b69f06c1d2ae136 (diff) | |
| download | fpc-6890c71f322a3a2261b624567be3f5d894250ebe.tar.gz | |
* manually merged r36194, fixes a regression introduced by 3.0.0 on Win64 (due to SEH).
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36571 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | compiler/pmodules.pas | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/pmodules.pas b/compiler/pmodules.pas index d5aee1d6c6..91bbcf7094 100644 --- a/compiler/pmodules.pas +++ b/compiler/pmodules.pas @@ -620,12 +620,12 @@ implementation case flag of uf_init : begin - result:=create_main_proc(make_mangledname('',current_module.localsymtable,'init_implicit'),potype_unitinit,st); + result:=create_main_proc(make_mangledname('',current_module.localsymtable,'init_implicit$'),potype_unitinit,st); result.procdef.aliasnames.insert(make_mangledname('INIT$',current_module.localsymtable,'')); end; uf_finalize : begin - result:=create_main_proc(make_mangledname('',current_module.localsymtable,'finalize_implicit'),potype_unitfinalize,st); + result:=create_main_proc(make_mangledname('',current_module.localsymtable,'finalize_implicit$'),potype_unitfinalize,st); result.procdef.aliasnames.insert(make_mangledname('FINALIZE$',current_module.localsymtable,'')); if (not current_module.is_unit) then result.procdef.aliasnames.insert('PASCALFINALIZE'); @@ -952,7 +952,7 @@ type internalerror(200212285); { Compile the unit } - init_procinfo:=create_main_proc(make_mangledname('',current_module.localsymtable,'init'),potype_unitinit,current_module.localsymtable); + init_procinfo:=create_main_proc(make_mangledname('',current_module.localsymtable,'init$'),potype_unitinit,current_module.localsymtable); init_procinfo.procdef.aliasnames.insert(make_mangledname('INIT$',current_module.localsymtable,'')); init_procinfo.parse_body; { save file pos for debuginfo } @@ -1084,7 +1084,7 @@ type if not current_module.interface_only and (token=_FINALIZATION) then begin { Compile the finalize } - finalize_procinfo:=create_main_proc(make_mangledname('',current_module.localsymtable,'finalize'),potype_unitfinalize,current_module.localsymtable); + finalize_procinfo:=create_main_proc(make_mangledname('',current_module.localsymtable,'finalize$'),potype_unitfinalize,current_module.localsymtable); finalize_procinfo.procdef.aliasnames.insert(make_mangledname('FINALIZE$',current_module.localsymtable,'')); finalize_procinfo.parse_body; end @@ -2150,7 +2150,7 @@ type if token=_FINALIZATION then begin { Parse the finalize } - finalize_procinfo:=create_main_proc(make_mangledname('',current_module.localsymtable,'finalize'),potype_unitfinalize,current_module.localsymtable); + finalize_procinfo:=create_main_proc(make_mangledname('',current_module.localsymtable,'finalize$'),potype_unitfinalize,current_module.localsymtable); finalize_procinfo.procdef.aliasnames.insert(make_mangledname('FINALIZE$',current_module.localsymtable,'')); finalize_procinfo.procdef.aliasnames.insert('PASCALFINALIZE'); finalize_procinfo.parse_body; |