diff options
author | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2006-02-15 14:36:30 +0000 |
---|---|---|
committer | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2006-02-15 14:36:30 +0000 |
commit | 467829afc7c6ee9cb42cea78ffb9610aafe1ab67 (patch) | |
tree | f06b02dd97d12114f252ab542f728e2c2cbff85b | |
parent | f34a5fb7a782c8902c999e18ff735298aca55ce4 (diff) | |
download | fpc-467829afc7c6ee9cb42cea78ffb9610aafe1ab67.tar.gz |
* link_allways -> link_always
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk/compiler@2594 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r-- | link.pas | 4 | ||||
-rw-r--r-- | pmodules.pas | 6 | ||||
-rw-r--r-- | scandir.pas | 6 | ||||
-rw-r--r-- | systems/t_beos.pas | 4 | ||||
-rw-r--r-- | systems/t_bsd.pas | 8 | ||||
-rw-r--r-- | systems/t_emx.pas | 2 | ||||
-rw-r--r-- | systems/t_linux.pas | 4 | ||||
-rw-r--r-- | systems/t_macos.pas | 4 | ||||
-rw-r--r-- | systems/t_nwl.pas | 4 | ||||
-rw-r--r-- | systems/t_nwm.pas | 4 | ||||
-rw-r--r-- | systems/t_os2.pas | 2 | ||||
-rw-r--r-- | systems/t_sunos.pas | 4 | ||||
-rw-r--r-- | systems/t_win.pas | 4 | ||||
-rw-r--r-- | utils/ppudump.pp | 4 | ||||
-rw-r--r-- | utils/ppumove.pp | 2 |
15 files changed, 31 insertions, 31 deletions
@@ -291,7 +291,7 @@ begin if (flags and uf_no_link)=0 then begin { create mask which unit files need linking } - mask:=link_allways; + mask:=link_always; { static linking ? } if (cs_link_static in aktglobalswitches) then begin @@ -352,7 +352,7 @@ begin AddSharedLibrary(linkunitsharedlibs.getusemask(mask)); end; { Other needed .o and libs, specified using $L,$LINKLIB,external } - mask:=link_allways; + mask:=link_always; while not linkotherofiles.empty do AddObject(linkotherofiles.Getusemask(mask),path^,false); while not linkotherstaticlibs.empty do diff --git a/pmodules.pas b/pmodules.pas index 63bc11b5ad..6085132b4b 100644 --- a/pmodules.pas +++ b/pmodules.pas @@ -64,7 +64,7 @@ implementation { Walk all shared libs } While not current_module.linkOtherSharedLibs.Empty do begin - S:=current_module.linkOtherSharedLibs.Getusemask(link_allways); + S:=current_module.linkOtherSharedLibs.Getusemask(link_always); if not DLLScanner.scan(s) then KeepShared.Concat(s); end; @@ -82,7 +82,7 @@ implementation while not KeepShared.Empty do begin s:=KeepShared.GetFirst; - current_module.linkOtherSharedLibs.add(s,link_allways); + current_module.linkOtherSharedLibs.add(s,link_always); end; KeepShared.Free; end; @@ -247,7 +247,7 @@ implementation ResourceInfo.concat(Tai_symbol.Createname_global('FPC_RESLOCATION',AT_DATA,0)); ResourceInfo.concat(Tai_const.Createname('FPC_RESSYMBOL',AT_DATA,0)); {$ifdef EXTERNALRESPTRS} - current_module.linkotherofiles.add('resptrs.o',link_allways); + current_module.linkotherofiles.add('resptrs.o',link_always); {$else EXTERNALRESPTRS} new_section(ResourceInfo,sec_fpc,'resptrs',4); ResourceInfo.concat(Tai_symbol.Createname_global('FPC_RESSYMBOL',AT_DATA,0)); diff --git a/scandir.pas b/scandir.pas index 9deee4648b..842b2b7ed8 100644 --- a/scandir.pas +++ b/scandir.pas @@ -470,7 +470,7 @@ implementation else s:= trimspace(current_scanner.readcomment); s:=AddExtension(FixFileName(s),target_info.objext); - current_module.linkotherofiles.add(s,link_allways); + current_module.linkotherofiles.add(s,link_always); end; procedure dir_linklib; @@ -538,9 +538,9 @@ implementation { add to the list of other libraries } if linkMode=lm_static then - current_module.linkOtherStaticLibs.add(libname,link_allways) + current_module.linkOtherStaticLibs.add(libname,link_always) else - current_module.linkOtherSharedLibs.add(libname,link_allways); + current_module.linkOtherSharedLibs.add(libname,link_always); end; procedure dir_localsymbols; diff --git a/systems/t_beos.pas b/systems/t_beos.pas index 5e9ea9f54e..3db531626b 100644 --- a/systems/t_beos.pas +++ b/systems/t_beos.pas @@ -77,14 +77,14 @@ end; procedure timportlibbeos.importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string); begin { insert sharedlibrary } - current_module.linkothersharedlibs.add(SplitName(module),link_allways); + current_module.linkothersharedlibs.add(SplitName(module),link_always); end; procedure timportlibbeos.importvariable(vs:tglobalvarsym;const name,module:string); begin { 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 } vs.set_mangledname(name); exclude(vs.varoptions,vo_is_dll_var); diff --git a/systems/t_bsd.pas b/systems/t_bsd.pas index 86d14d169e..6a9cedace1 100644 --- a/systems/t_bsd.pas +++ b/systems/t_bsd.pas @@ -98,14 +98,14 @@ implementation procedure timportlibdarwin.importprocedure(aprocdef:tprocdef;const module : string;index : longint;const name : string); begin { insert sharedlibrary } -{ current_module.linkothersharedlibs.add(SplitName(module),link_allways); } + current_module.linkothersharedlibs.add(SplitName(module),link_always); end; procedure timportlibdarwin.importvariable(vs:tglobalvarsym;const name,module:string); begin { 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 } vs.set_mangledname(name); end; @@ -134,14 +134,14 @@ end; procedure timportlibbsd.importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string); begin { insert sharedlibrary } - current_module.linkothersharedlibs.add(SplitName(module),link_allways); + current_module.linkothersharedlibs.add(SplitName(module),link_always); end; procedure timportlibbsd.importvariable(vs:tglobalvarsym;const name,module:string); begin { 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 } vs.set_mangledname(name); exclude(vs.varoptions,vo_is_dll_var); diff --git a/systems/t_emx.pas b/systems/t_emx.pas index 44427e627f..54f2c71e96 100644 --- a/systems/t_emx.pas +++ b/systems/t_emx.pas @@ -273,7 +273,7 @@ var begin LibName:=FixFileName(S + Target_Info.StaticCLibExt); seq_no:=1; - current_module.linkotherstaticlibs.add(libname,link_allways); + current_module.linkotherstaticlibs.add(libname,link_always); assign(out_file,current_module.outputpath^+libname); rewrite(out_file,1); blockwrite(out_file,ar_magic,sizeof(ar_magic)); diff --git a/systems/t_linux.pas b/systems/t_linux.pas index c18f1464f0..d0fa18fa58 100644 --- a/systems/t_linux.pas +++ b/systems/t_linux.pas @@ -82,14 +82,14 @@ end; procedure timportliblinux.importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string); begin { insert sharedlibrary } - current_module.linkothersharedlibs.add(SplitName(module),link_allways); + current_module.linkothersharedlibs.add(SplitName(module),link_always); end; procedure timportliblinux.importvariable(vs:tglobalvarsym;const name,module:string); begin { 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 } vs.set_mangledname(name); exclude(vs.varoptions,vo_is_dll_var); diff --git a/systems/t_macos.pas b/systems/t_macos.pas index 115fbbc330..8418dae2c5 100644 --- a/systems/t_macos.pas +++ b/systems/t_macos.pas @@ -64,14 +64,14 @@ end; procedure timportlibmacos.importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string); begin { insert sharedlibrary } - current_module.linkothersharedlibs.add(SplitName(module),link_allways); + current_module.linkothersharedlibs.add(SplitName(module),link_always); end; procedure timportlibmacos.importvariable(vs:tglobalvarsym;const name,module:string); begin { 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 } vs.set_mangledname(name); exclude(vs.varoptions,vo_is_dll_var); diff --git a/systems/t_nwl.pas b/systems/t_nwl.pas index 78e1ba0d93..e87a960f2c 100644 --- a/systems/t_nwl.pas +++ b/systems/t_nwl.pas @@ -148,14 +148,14 @@ end; procedure timportlibnetwlibc.importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string); begin { insert sharedlibrary } - current_module.linkothersharedlibs.add(SplitName(module),link_allways); + current_module.linkothersharedlibs.add(SplitName(module),link_always); end; procedure timportlibnetwlibc.importvariable(vs:tglobalvarsym;const name,module:string); begin { 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 } vs.set_mangledname(name); exclude(vs.varoptions,vo_is_dll_var); diff --git a/systems/t_nwm.pas b/systems/t_nwm.pas index d231a67c98..e5be4591fa 100644 --- a/systems/t_nwm.pas +++ b/systems/t_nwm.pas @@ -140,14 +140,14 @@ end; procedure timportlibnetware.importprocedure(aprocdef:tprocdef;const module:string;index:longint;const name:string); begin { insert sharedlibrary } - current_module.linkothersharedlibs.add(SplitName(module),link_allways); + current_module.linkothersharedlibs.add(SplitName(module),link_always); end; procedure timportlibnetware.importvariable(vs:tglobalvarsym;const name,module:string); begin { 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 } vs.set_mangledname(name); exclude(vs.varoptions,vo_is_dll_var); diff --git a/systems/t_os2.pas b/systems/t_os2.pas index ed86fe5e21..52fdde31fa 100644 --- a/systems/t_os2.pas +++ b/systems/t_os2.pas @@ -273,7 +273,7 @@ var begin libname:=FixFileName(S + Target_Info.StaticCLibExt); seq_no:=1; - current_module.linkotherstaticlibs.add(libname,link_allways); + current_module.linkotherstaticlibs.add(libname,link_always); assign(out_file,current_module.outputpath^+libname); rewrite(out_file,1); blockwrite(out_file,ar_magic,sizeof(ar_magic)); diff --git a/systems/t_sunos.pas b/systems/t_sunos.pas index 74eac2511c..1b34ae3db3 100644 --- a/systems/t_sunos.pas +++ b/systems/t_sunos.pas @@ -87,14 +87,14 @@ begin {$ifDef LinkTest} WriteLN('Import: f:',func,' m:',module,' n:',name); {$EndIf} - current_module.linkothersharedlibs.add(SplitName(module),link_allways); + current_module.linkothersharedlibs.add(SplitName(module),link_always); end; procedure timportlibsolaris.importvariable(vs:tglobalvarsym;const name,module:string); begin { 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 } vs.set_mangledname(name); exclude(vs.varoptions,vo_is_dll_var); diff --git a/systems/t_win.pas b/systems/t_win.pas index 2982297f41..bce68ad55d 100644 --- a/systems/t_win.pas +++ b/systems/t_win.pas @@ -136,7 +136,7 @@ implementation if not GenerateImportSection then begin hs:=AddExtension(module,target_info.sharedlibext); - current_module.linkdlls.add(hs,link_allways); + current_module.linkdlls.add(hs,link_always); exit; end; @@ -218,7 +218,7 @@ implementation if not GenerateImportSection then begin hs:=AddExtension(module,target_info.sharedlibext); - current_module.linkdlls.add(hs,link_allways); + current_module.linkdlls.add(hs,link_always); exit; end; diff --git a/utils/ppudump.pp b/utils/ppudump.pp index d00879b09c..c42ebb3ced 100644 --- a/utils/ppudump.pp +++ b/utils/ppudump.pp @@ -357,7 +357,7 @@ Procedure ReadLinkContainer(const prefix:string); const { link options } link_none = $0; - link_allways = $1; + link_always = $1; link_static = $2; link_smart = $4; link_shared = $8; @@ -365,7 +365,7 @@ Procedure ReadLinkContainer(const prefix:string); s : string; begin s:=''; - if (m and link_allways)<>0 then + if (m and link_always)<>0 then s:=s+'always '; if (m and link_static)<>0 then s:=s+'static '; diff --git a/utils/ppumove.pp b/utils/ppumove.pp index 8fe1bbcc0f..5632171898 100644 --- a/utils/ppumove.pp +++ b/utils/ppumove.pp @@ -52,7 +52,7 @@ const { link options } link_none = $0; - link_allways = $1; + link_always = $1; link_static = $2; link_smart = $4; link_shared = $8; |