paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-31 11:50:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Replace ? and @ in external names only if the external is imported from DLL on Windows.

Browse Source 
Also @ character is allowed in symbol names by GNU AS for x86.

git-svn-id: trunk@12842 -
This commit is contained in:
yury 2009-03-01 12:24:53 +00:00
parent 1658ca9919
commit afa7ade545
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/ogbase.pas
View File

@ -1383,13 +1383,15 @@ implementation
FOrdNr:=AOrdNr;
FIsVar:=AIsVar;
FMangledName:=AName;
{ Replace ? and @ in import name }
{ these replaces broke existing code on i386-win32 at least, while fixed
bug 8391 on arm-wince so limit this to arm-wince (KB) }
if (target_info.system in [system_arm_wince]) then
{ Replace ? and @ in import name, since GNU AS does not allow these characters in symbol names. }
{ This allows to import VC++ mangled names from DLLs. }
if target_info.system in system_all_windows then
begin
Replace(FMangledName,'?','__q$$');
{$ifdef arm}
{ @ symbol is not allowed in ARM assembler only }
Replace(FMangledName,'@','__a$$');
{$endif arm}
end;
end;

11
compiler/pdecsub.pas
View File

@ -2266,13 +2266,16 @@ const
s:=proc_get_importname(pd);
if s<>'' then
begin
{ Replace ? and @ in import name }
{ these replaces broke existing code on i386-win32 at least, while fixed
bug 8391 on arm-wince so limit this to arm-wince (KB) }
if target_info.system in [system_arm_wince] then
{ Replace ? and @ in import name, since GNU AS does not allow these characters in symbol names. }
{ This allows to import VC++ mangled names from DLLs. }
{ Do not perform replacement, if external symbol is not imported from DLL. }
if (target_info.system in system_all_windows) and (pd.import_dll<>nil) then
begin
Replace(s,'?','__q$$');
{$ifdef arm}
{ @ symbol is not allowed in ARM assembler only }
Replace(s,'@','__a$$');
{$endif arm}
end;
pd.setmangledname(s);
end;