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

* link_allways -> link_always

Browse Source 
git-svn-id: trunk@2594 -
This commit is contained in:
Jonas Maebe 2006-02-15 14:36:30 +00:00
parent 718d697498
commit 5f3e0b5398
15 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/link.pas
View File

@ -291,7 +291,7 @@ begin
if (flags and uf_no_link)=0 then if (flags and uf_no_link)=0 then
begin begin
{ create mask which unit files need linking } { create mask which unit files need linking }
mask:=link_allways; mask:=link_always;
{ static linking ? } { static linking ? }
if (cs_link_static in aktglobalswitches) then if (cs_link_static in aktglobalswitches) then
begin begin
@ -352,7 +352,7 @@ begin
AddSharedLibrary(linkunitsharedlibs.getusemask(mask)); AddSharedLibrary(linkunitsharedlibs.getusemask(mask));
end; end;
{ Other needed .o and libs, specified using $L,$LINKLIB,external } { Other needed .o and libs, specified using $L,$LINKLIB,external }
mask:=link_allways; mask:=link_always;
while not linkotherofiles.empty do while not linkotherofiles.empty do
AddObject(linkotherofiles.Getusemask(mask),path^,false); AddObject(linkotherofiles.Getusemask(mask),path^,false);
while not linkotherstaticlibs.empty do while not linkotherstaticlibs.empty do

6
compiler/pmodules.pas
View File

@ -64,7 +64,7 @@ implementation
{ Walk all shared libs } { Walk all shared libs }
While not current_module.linkOtherSharedLibs.Empty do While not current_module.linkOtherSharedLibs.Empty do
begin begin
S:=current_module.linkOtherSharedLibs.Getusemask(link_allways); S:=current_module.linkOtherSharedLibs.Getusemask(link_always);
if not DLLScanner.scan(s) then if not DLLScanner.scan(s) then
KeepShared.Concat(s); KeepShared.Concat(s);
end; end;
@ -82,7 +82,7 @@ implementation
while not KeepShared.Empty do while not KeepShared.Empty do
begin begin
s:=KeepShared.GetFirst; s:=KeepShared.GetFirst;
current_module.linkOtherSharedLibs.add(s,link_allways); current_module.linkOtherSharedLibs.add(s,link_always);
end; end;
KeepShared.Free; KeepShared.Free;
end; end;
@ -247,7 +247,7 @@ implementation
ResourceInfo.concat(Tai_symbol.Createname_global('FPC_RESLOCATION',AT_DATA,0)); ResourceInfo.concat(Tai_symbol.Createname_global('FPC_RESLOCATION',AT_DATA,0));
ResourceInfo.concat(Tai_const.Createname('FPC_RESSYMBOL',AT_DATA,0)); ResourceInfo.concat(Tai_const.Createname('FPC_RESSYMBOL',AT_DATA,0));
{$ifdef EXTERNALRESPTRS} {$ifdef EXTERNALRESPTRS}
current_module.linkotherofiles.add('resptrs.o',link_allways); current_module.linkotherofiles.add('resptrs.o',link_always);
{$else EXTERNALRESPTRS} {$else EXTERNALRESPTRS}
new_section(ResourceInfo,sec_fpc,'resptrs',4); new_section(ResourceInfo,sec_fpc,'resptrs',4);
ResourceInfo.concat(Tai_symbol.Createname_global('FPC_RESSYMBOL',AT_DATA,0)); ResourceInfo.concat(Tai_symbol.Createname_global('FPC_RESSYMBOL',AT_DATA,0));

6
compiler/scandir.pas
View File

@ -470,7 +470,7 @@ implementation
else else
s:= trimspace(current_scanner.readcomment); s:= trimspace(current_scanner.readcomment);
s:=AddExtension(FixFileName(s),target_info.objext); s:=AddExtension(FixFileName(s),target_info.objext);
current_module.linkotherofiles.add(s,link_allways); current_module.linkotherofiles.add(s,link_always);
end; end;
procedure dir_linklib; procedure dir_linklib;
@ -538,9 +538,9 @@ implementation
{ add to the list of other libraries } { add to the list of other libraries }
if linkMode=lm_static then if linkMode=lm_static then
current_module.linkOtherStaticLibs.add(libname,link_allways) current_module.linkOtherStaticLibs.add(libname,link_always)
else else
current_module.linkOtherSharedLibs.add(libname,link_allways); current_module.linkOtherSharedLibs.add(libname,link_always);
end; end;
procedure dir_localsymbols; procedure dir_localsymbols;

4
compiler/systems/t_beos.pas
View File

@ -77,14 +77,14 @@ end;
procedure timportlibbeos.importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string); procedure timportlibbeos.importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string);
begin begin
{ insert sharedlibrary } { insert sharedlibrary }
current_module.linkothersharedlibs.add(SplitName(module),link_allways); current_module.linkothersharedlibs.add(SplitName(module),link_always);
end; end;
procedure timportlibbeos.importvariable(vs:tglobalvarsym;const name,module:string); procedure timportlibbeos.importvariable(vs:tglobalvarsym;const name,module:string);
begin begin
{ insert sharedlibrary } { insert sharedlibrary }
current_module.linkothersharedlibs.add(SplitName(module),link_allways); current_module.linkothersharedlibs.add(SplitName(module),link_always);
{ reset the mangledname and turn off the dll_var option } { reset the mangledname and turn off the dll_var option }
vs.set_mangledname(name); vs.set_mangledname(name);
exclude(vs.varoptions,vo_is_dll_var); exclude(vs.varoptions,vo_is_dll_var);

8
compiler/systems/t_bsd.pas
View File

@ -98,14 +98,14 @@ implementation
procedure timportlibdarwin.importprocedure(aprocdef:tprocdef;const module : string;index : longint;const name : string); procedure timportlibdarwin.importprocedure(aprocdef:tprocdef;const module : string;index : longint;const name : string);
begin begin
{ insert sharedlibrary } { insert sharedlibrary }
{ current_module.linkothersharedlibs.add(SplitName(module),link_allways); } current_module.linkothersharedlibs.add(SplitName(module),link_always);
end; end;
procedure timportlibdarwin.importvariable(vs:tglobalvarsym;const name,module:string); procedure timportlibdarwin.importvariable(vs:tglobalvarsym;const name,module:string);
begin begin
{ insert sharedlibrary } { insert sharedlibrary }
{ current_module.linkothersharedlibs.add(SplitName(module),link_allways); } current_module.linkothersharedlibs.add(SplitName(module),link_always);
{ the rest is handled in the nppcld.pas tppcloadnode } { the rest is handled in the nppcld.pas tppcloadnode }
vs.set_mangledname(name); vs.set_mangledname(name);
end; end;
@ -134,14 +134,14 @@ end;
procedure timportlibbsd.importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string); procedure timportlibbsd.importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string);
begin begin
{ insert sharedlibrary } { insert sharedlibrary }
current_module.linkothersharedlibs.add(SplitName(module),link_allways); current_module.linkothersharedlibs.add(SplitName(module),link_always);
end; end;
procedure timportlibbsd.importvariable(vs:tglobalvarsym;const name,module:string); procedure timportlibbsd.importvariable(vs:tglobalvarsym;const name,module:string);
begin begin
{ insert sharedlibrary } { insert sharedlibrary }
current_module.linkothersharedlibs.add(SplitName(module),link_allways); current_module.linkothersharedlibs.add(SplitName(module),link_always);
{ reset the mangledname and turn off the dll_var option } { reset the mangledname and turn off the dll_var option }
vs.set_mangledname(name); vs.set_mangledname(name);
exclude(vs.varoptions,vo_is_dll_var); exclude(vs.varoptions,vo_is_dll_var);

2
compiler/systems/t_emx.pas
View File

@ -273,7 +273,7 @@ var
begin begin
LibName:=FixFileName(S + Target_Info.StaticCLibExt); LibName:=FixFileName(S + Target_Info.StaticCLibExt);
seq_no:=1; seq_no:=1;
current_module.linkotherstaticlibs.add(libname,link_allways); current_module.linkotherstaticlibs.add(libname,link_always);
assign(out_file,current_module.outputpath^+libname); assign(out_file,current_module.outputpath^+libname);
rewrite(out_file,1); rewrite(out_file,1);
blockwrite(out_file,ar_magic,sizeof(ar_magic)); blockwrite(out_file,ar_magic,sizeof(ar_magic));

4
compiler/systems/t_linux.pas
View File

@ -82,14 +82,14 @@ end;
procedure timportliblinux.importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string); procedure timportliblinux.importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string);
begin begin
{ insert sharedlibrary } { insert sharedlibrary }
current_module.linkothersharedlibs.add(SplitName(module),link_allways); current_module.linkothersharedlibs.add(SplitName(module),link_always);
end; end;
procedure timportliblinux.importvariable(vs:tglobalvarsym;const name,module:string); procedure timportliblinux.importvariable(vs:tglobalvarsym;const name,module:string);
begin begin
{ insert sharedlibrary } { insert sharedlibrary }
current_module.linkothersharedlibs.add(SplitName(module),link_allways); current_module.linkothersharedlibs.add(SplitName(module),link_always);
{ reset the mangledname and turn off the dll_var option } { reset the mangledname and turn off the dll_var option }
vs.set_mangledname(name); vs.set_mangledname(name);
exclude(vs.varoptions,vo_is_dll_var); exclude(vs.varoptions,vo_is_dll_var);

4
compiler/systems/t_macos.pas
View File

@ -64,14 +64,14 @@ end;
procedure timportlibmacos.importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string); procedure timportlibmacos.importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string);
begin begin
{ insert sharedlibrary } { insert sharedlibrary }
current_module.linkothersharedlibs.add(SplitName(module),link_allways); current_module.linkothersharedlibs.add(SplitName(module),link_always);
end; end;
procedure timportlibmacos.importvariable(vs:tglobalvarsym;const name,module:string); procedure timportlibmacos.importvariable(vs:tglobalvarsym;const name,module:string);
begin begin
{ insert sharedlibrary } { insert sharedlibrary }
current_module.linkothersharedlibs.add(SplitName(module),link_allways); current_module.linkothersharedlibs.add(SplitName(module),link_always);
{ reset the mangledname and turn off the dll_var option } { reset the mangledname and turn off the dll_var option }
vs.set_mangledname(name); vs.set_mangledname(name);
exclude(vs.varoptions,vo_is_dll_var); exclude(vs.varoptions,vo_is_dll_var);

4
compiler/systems/t_nwl.pas
View File

@ -148,14 +148,14 @@ end;
procedure timportlibnetwlibc.importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string); procedure timportlibnetwlibc.importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string);
begin begin
{ insert sharedlibrary } { insert sharedlibrary }
current_module.linkothersharedlibs.add(SplitName(module),link_allways); current_module.linkothersharedlibs.add(SplitName(module),link_always);
end; end;
procedure timportlibnetwlibc.importvariable(vs:tglobalvarsym;const name,module:string); procedure timportlibnetwlibc.importvariable(vs:tglobalvarsym;const name,module:string);
begin begin
{ insert sharedlibrary } { insert sharedlibrary }
current_module.linkothersharedlibs.add(SplitName(module),link_allways); current_module.linkothersharedlibs.add(SplitName(module),link_always);
{ reset the mangledname and turn off the dll_var option } { reset the mangledname and turn off the dll_var option }
vs.set_mangledname(name); vs.set_mangledname(name);
exclude(vs.varoptions,vo_is_dll_var); exclude(vs.varoptions,vo_is_dll_var);

4
compiler/systems/t_nwm.pas
View File

@ -140,14 +140,14 @@ end;
procedure timportlibnetware.importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string); procedure timportlibnetware.importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string);
begin begin
{ insert sharedlibrary } { insert sharedlibrary }
current_module.linkothersharedlibs.add(SplitName(module),link_allways); current_module.linkothersharedlibs.add(SplitName(module),link_always);
end; end;
procedure timportlibnetware.importvariable(vs:tglobalvarsym;const name,module:string); procedure timportlibnetware.importvariable(vs:tglobalvarsym;const name,module:string);
begin begin
{ insert sharedlibrary } { insert sharedlibrary }
current_module.linkothersharedlibs.add(SplitName(module),link_allways); current_module.linkothersharedlibs.add(SplitName(module),link_always);
{ reset the mangledname and turn off the dll_var option } { reset the mangledname and turn off the dll_var option }
vs.set_mangledname(name); vs.set_mangledname(name);
exclude(vs.varoptions,vo_is_dll_var); exclude(vs.varoptions,vo_is_dll_var);

2
compiler/systems/t_os2.pas
View File

@ -273,7 +273,7 @@ var
begin begin
libname:=FixFileName(S + Target_Info.StaticCLibExt); libname:=FixFileName(S + Target_Info.StaticCLibExt);
seq_no:=1; seq_no:=1;
current_module.linkotherstaticlibs.add(libname,link_allways); current_module.linkotherstaticlibs.add(libname,link_always);
assign(out_file,current_module.outputpath^+libname); assign(out_file,current_module.outputpath^+libname);
rewrite(out_file,1); rewrite(out_file,1);
blockwrite(out_file,ar_magic,sizeof(ar_magic)); blockwrite(out_file,ar_magic,sizeof(ar_magic));

4
compiler/systems/t_sunos.pas
View File

@ -87,14 +87,14 @@ begin
{$ifDef LinkTest} {$ifDef LinkTest}
WriteLN('Import: f:',func,' m:',module,' n:',name); WriteLN('Import: f:',func,' m:',module,' n:',name);
{$EndIf} {$EndIf}
current_module.linkothersharedlibs.add(SplitName(module),link_allways); current_module.linkothersharedlibs.add(SplitName(module),link_always);
end; end;
procedure timportlibsolaris.importvariable(vs:tglobalvarsym;const name,module:string); procedure timportlibsolaris.importvariable(vs:tglobalvarsym;const name,module:string);
begin begin
{ insert sharedlibrary } { insert sharedlibrary }
current_module.linkothersharedlibs.add(SplitName(module),link_allways); current_module.linkothersharedlibs.add(SplitName(module),link_always);
{ reset the mangledname and turn off the dll_var option } { reset the mangledname and turn off the dll_var option }
vs.set_mangledname(name); vs.set_mangledname(name);
exclude(vs.varoptions,vo_is_dll_var); exclude(vs.varoptions,vo_is_dll_var);

4
compiler/systems/t_win.pas
View File

@ -136,7 +136,7 @@ implementation
if not GenerateImportSection then if not GenerateImportSection then
begin begin
hs:=AddExtension(module,target_info.sharedlibext); hs:=AddExtension(module,target_info.sharedlibext);
current_module.linkdlls.add(hs,link_allways); current_module.linkdlls.add(hs,link_always);
exit; exit;
end; end;
@ -218,7 +218,7 @@ implementation
if not GenerateImportSection then if not GenerateImportSection then
begin begin
hs:=AddExtension(module,target_info.sharedlibext); hs:=AddExtension(module,target_info.sharedlibext);
current_module.linkdlls.add(hs,link_allways); current_module.linkdlls.add(hs,link_always);
exit; exit;
end; end;

4
compiler/utils/ppudump.pp
View File

@ -357,7 +357,7 @@ Procedure ReadLinkContainer(const prefix:string);
const const
{ link options } { link options }
link_none = $0; link_none = $0;
link_allways = $1; link_always = $1;
link_static = $2; link_static = $2;
link_smart = $4; link_smart = $4;
link_shared = $8; link_shared = $8;
@ -365,7 +365,7 @@ Procedure ReadLinkContainer(const prefix:string);
s : string; s : string;
begin begin
s:=''; s:='';
if (m and link_allways)<>0 then if (m and link_always)<>0 then
s:=s+'always '; s:=s+'always ';
if (m and link_static)<>0 then if (m and link_static)<>0 then
s:=s+'static '; s:=s+'static ';

2
compiler/utils/ppumove.pp
View File

@ -52,7 +52,7 @@ const
{ link options } { link options }
link_none = $0; link_none = $0;
link_allways = $1; link_always = $1;
link_static = $2; link_static = $2;
link_smart = $4; link_smart = $4;
link_shared = $8; link_shared = $8;