From 1f6d2f6ece8495f3e66f825d09f8a605f4de4100 Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 19 Nov 2004 16:30:24 +0000 Subject: [PATCH] * fixed setting of mangledname when importing --- compiler/systems/t_beos.pas | 10 ++++------ compiler/systems/t_bsd.pas | 21 ++++----------------- compiler/systems/t_macos.pas | 12 ++++-------- compiler/systems/t_nwl.pas | 12 ++++-------- compiler/systems/t_nwm.pas | 12 ++++-------- compiler/systems/t_sunos.pas | 12 ++++-------- 6 files changed, 24 insertions(+), 55 deletions(-) diff --git a/compiler/systems/t_beos.pas b/compiler/systems/t_beos.pas index 3f7cbef93b..27b01fe5f5 100644 --- a/compiler/systems/t_beos.pas +++ b/compiler/systems/t_beos.pas @@ -79,11 +79,6 @@ procedure timportlibbeos.importprocedure(aprocdef:tprocdef;const module:string;i begin { insert sharedlibrary } current_module.linkothersharedlibs.add(SplitName(module),link_allways); - { do nothing with the procedure, only set the mangledname } - if name<>'' then - aprocdef.setmangledname(name) - else - message(parser_e_empty_import_name); end; @@ -501,7 +496,10 @@ initialization end. { $Log$ - Revision 1.15 2004-11-08 22:09:59 peter + Revision 1.16 2004-11-19 16:30:24 peter + * fixed setting of mangledname when importing + + Revision 1.15 2004/11/08 22:09:59 peter * tvarsym splitted Revision 1.14 2004/10/15 09:24:38 mazen diff --git a/compiler/systems/t_bsd.pas b/compiler/systems/t_bsd.pas index a69acd87fb..37cd847666 100644 --- a/compiler/systems/t_bsd.pas +++ b/compiler/systems/t_bsd.pas @@ -98,14 +98,6 @@ implementation begin { insert sharedlibrary } { current_module.linkothersharedlibs.add(SplitName(module),link_allways); } - { force the mangledname } - if assigned(aprocdef) then - begin - if (aprocdef.proccalloption in [pocall_cdecl,pocall_cppdecl]) then - aprocdef.setmangledname(target_info.Cprefix+name) - else - aprocdef.setmangledname(name); - end; end; @@ -142,14 +134,6 @@ procedure timportlibbsd.importprocedure(aprocdef:tprocdef;const module:string;in begin { insert sharedlibrary } current_module.linkothersharedlibs.add(SplitName(module),link_allways); - { do nothing with the procedure, only set the mangledname } -{ if name<>'' then - begin - aprocdef.setmangledname(name); - end - else - message(parser_e_empty_import_name); -} end; @@ -628,7 +612,10 @@ initialization end. { $Log$ - Revision 1.25 2004-11-19 14:21:44 marco + Revision 1.26 2004-11-19 16:30:24 peter + * fixed setting of mangledname when importing + + Revision 1.25 2004/11/19 14:21:44 marco * cycle fix. Revision 1.24 2004/11/08 22:09:59 peter diff --git a/compiler/systems/t_macos.pas b/compiler/systems/t_macos.pas index 660b6c72d2..f2ca4ab385 100644 --- a/compiler/systems/t_macos.pas +++ b/compiler/systems/t_macos.pas @@ -66,13 +66,6 @@ procedure timportlibmacos.importprocedure(aprocdef:tprocdef;const module:string; begin { insert sharedlibrary } current_module.linkothersharedlibs.add(SplitName(module),link_allways); - { do nothing with the procedure, only set the mangledname } - if name<>'' then - begin - aprocdef.setmangledname(name); - end - else - message(parser_e_empty_import_name); end; @@ -252,7 +245,10 @@ initialization end. { $Log$ - Revision 1.14 2004-11-11 19:31:33 peter + Revision 1.15 2004-11-19 16:30:24 peter + * fixed setting of mangledname when importing + + Revision 1.14 2004/11/11 19:31:33 peter * fixed compile of powerpc,sparc,arm Revision 1.13 2004/10/25 15:38:41 peter diff --git a/compiler/systems/t_nwl.pas b/compiler/systems/t_nwl.pas index 9168f21c17..dac948a3cf 100644 --- a/compiler/systems/t_nwl.pas +++ b/compiler/systems/t_nwl.pas @@ -150,13 +150,6 @@ procedure timportlibnetwlibc.importprocedure(aprocdef:tprocdef;const module:stri begin { insert sharedlibrary } current_module.linkothersharedlibs.add(SplitName(module),link_allways); - { do nothing with the procedure, only set the mangledname } - if name<>'' then - begin - aprocdef.setmangledname(name); - end - else - message(parser_e_empty_import_name); end; @@ -653,7 +646,10 @@ initialization end. { $Log$ - Revision 1.9 2004-11-08 22:09:59 peter + Revision 1.10 2004-11-19 16:30:24 peter + * fixed setting of mangledname when importing + + Revision 1.9 2004/11/08 22:09:59 peter * tvarsym splitted Revision 1.8 2004/10/25 15:38:41 peter diff --git a/compiler/systems/t_nwm.pas b/compiler/systems/t_nwm.pas index 6d43074354..60960caa0d 100644 --- a/compiler/systems/t_nwm.pas +++ b/compiler/systems/t_nwm.pas @@ -142,13 +142,6 @@ procedure timportlibnetware.importprocedure(aprocdef:tprocdef;const module:strin begin { insert sharedlibrary } current_module.linkothersharedlibs.add(SplitName(module),link_allways); - { do nothing with the procedure, only set the mangledname } - if name<>'' then - begin - aprocdef.setmangledname(name); - end - else - message(parser_e_empty_import_name); end; @@ -571,7 +564,10 @@ initialization end. { $Log$ - Revision 1.20 2004-11-08 22:09:59 peter + Revision 1.21 2004-11-19 16:30:24 peter + * fixed setting of mangledname when importing + + Revision 1.20 2004/11/08 22:09:59 peter * tvarsym splitted Revision 1.19 2004/10/25 15:38:41 peter diff --git a/compiler/systems/t_sunos.pas b/compiler/systems/t_sunos.pas index d6bbe0341a..54e9c3dd1b 100644 --- a/compiler/systems/t_sunos.pas +++ b/compiler/systems/t_sunos.pas @@ -88,13 +88,6 @@ begin WriteLN('Import: f:',func,' m:',module,' n:',name); {$EndIf} current_module.linkothersharedlibs.add(SplitName(module),link_allways); - { do nothing with the procedure, only set the mangledname } - if name<>'' then - begin - aprocdef.setmangledname(name); - end - else - message(parser_e_empty_import_name); end; @@ -498,7 +491,10 @@ initialization end. { $Log$ - Revision 1.14 2004-11-08 22:09:59 peter + Revision 1.15 2004-11-19 16:30:24 peter + * fixed setting of mangledname when importing + + Revision 1.14 2004/11/08 22:09:59 peter * tvarsym splitted Revision 1.13 2004/11/03 12:04:03 florian