* unified names of system_*/systems_* sets

git-svn-id: trunk@14566 -

compiler/aggas.pas

@@ -414,7 +414,7 @@ implementation
            (aname<>'') and
            (atype<>sec_toc) and
            { on embedded systems every byte counts, so smartlink bss too }
-           ((atype<>sec_bss) or (target_info.system in system_embedded)) then
+           ((atype<>sec_bss) or (target_info.system in systems_embedded)) then
           begin
             case aorder of
               secorder_begin :
@@ -1242,7 +1242,7 @@ implementation
         AsmWriteLn(#9'.subsections_via_symbols');
 
       { "no executable stack" marker for Linux }
-      if (target_info.system in system_linux) and
+      if (target_info.system in systems_linux) and
          not(cs_executable_stack in current_settings.moduleswitches) then
         begin
           AsmWriteLn('.section .note.GNU-stack,"",%progbits');
@@ -1366,7 +1366,7 @@ implementation
               end;
             sec_objc_message_refs:
               begin
-                if (target_info.system in system_objc_nfabi) then
+                if (target_info.system in systems_objc_nfabi) then
                   begin
                     result:='.section __DATA, __objc_selrefs, literal_pointers, no_dead_strip';
                     exit;
@@ -1374,7 +1374,7 @@ implementation
               end;
             sec_objc_cls_refs:
               begin
-                if (target_info.system in system_objc_nfabi) then
+                if (target_info.system in systems_objc_nfabi) then
                   begin
                     result:='.section __DATA, __objc_clsrefs, regular, no_dead_strip';
                     exit;
@@ -1383,7 +1383,7 @@ implementation
             sec_objc_meth_var_names,
             sec_objc_class_names:
               begin
-                if (target_info.system in system_objc_nfabi) then
+                if (target_info.system in systems_objc_nfabi) then
                   begin
                     result:='.cstring';
                     exit
@@ -1394,7 +1394,7 @@ implementation
             sec_objc_cat_inst_meth,
             sec_objc_cat_cls_meth:
               begin
-                if (target_info.system in system_objc_nfabi) then
+                if (target_info.system in systems_objc_nfabi) then
                   begin
                     result:='.section __DATA, __objc_const';
                     exit;
@@ -1403,7 +1403,7 @@ implementation
             sec_objc_meta_class,
             sec_objc_class:
               begin
-                if (target_info.system in system_objc_nfabi) then
+                if (target_info.system in systems_objc_nfabi) then
                   begin
                     result:='.section __DATA, __objc_data';
                     exit;

compiler/dbgdwarf.pas

@@ -664,7 +664,7 @@ implementation
          _use_64bit_headers:=state;
          if not(state) then
            begin
-             if (target_info.system in system_windows+system_wince) then
+             if (target_info.system in systems_windows+systems_wince) then
                offsetabstype:=aitconst_secrel32_symbol
              else
                offsetabstype:=aitconst_32bit;

compiler/nadd.pas

@@ -1926,7 +1926,7 @@ implementation
                 only need to compare the length with 0 }
               if (nodetype in [equaln,unequaln,gtn,gten,ltn,lten]) and
                 { windows widestrings are too complicated to be handled optimized }
-                not(is_widestring(left.resultdef) and (target_info.system in system_windows)) and
+                not(is_widestring(left.resultdef) and (target_info.system in systems_windows)) and
                  (((left.nodetype=stringconstn) and (tstringconstnode(left).len=0)) or
                   ((right.nodetype=stringconstn) and (tstringconstnode(right).len=0))) then
                 begin
@@ -2310,7 +2310,7 @@ implementation
         if not (cs_fp_emulation in current_settings.moduleswitches) then
           exit;
 
-        if not(target_info.system in system_wince) then
+        if not(target_info.system in systems_wince) then
           begin
             case tfloatdef(left.resultdef).floattype of
               s32real:
@@ -2408,7 +2408,7 @@ implementation
 
           end;
         { cast softfpu result? }
-        if not(target_info.system in system_wince) then
+        if not(target_info.system in systems_wince) then
           begin
             if nodetype in [ltn,lten,gtn,gten,equaln,unequaln] then
               resultdef:=booltype;

compiler/ncal.pas

@@ -1724,7 +1724,7 @@ implementation
             if not(cnf_inherited in callnodeflags) then
               msgsendname:='OBJC_MSGSEND_STRET'
 {$if defined(onlymacosx10_6) or defined(arm) }
-            else if (target_info.system in system_objc_nfabi) then
+            else if (target_info.system in systems_objc_nfabi) then
               msgsendname:='OBJC_MSGSENDSUPER2_STRET'
 {$endif onlymacosx10_6 or arm}
             else
@@ -1741,7 +1741,7 @@ implementation
         else if not(cnf_inherited in callnodeflags) then
           msgsendname:='OBJC_MSGSEND'
 {$if defined(onlymacosx10_6) or defined(arm) }
-        else if (target_info.system in system_objc_nfabi) then
+        else if (target_info.system in systems_objc_nfabi) then
           msgsendname:='OBJC_MSGSENDSUPER2'
 {$endif onlymacosx10_6 or arm}
         else

compiler/ncgcal.pas

@@ -1211,7 +1211,7 @@ implementation
 
 {$if defined(x86) or defined(arm)}
          if (procdefinition.proccalloption=pocall_safecall) and
-            (target_info.system in system_all_windows) then
+            (target_info.system in systems_all_windows) then
            begin
 {$ifdef x86_64}
              cgpara.init;

compiler/ncgflw.pas

@@ -1586,7 +1586,7 @@ implementation
              if codegenerror then
                exit;
 {$if defined(x86) or defined(arm)}
-             if (target_info.system in system_all_windows) and
+             if (target_info.system in systems_all_windows) and
                 (current_procinfo.procdef.proccalloption=pocall_safecall) then
                begin
                  { Remove and destroy the last exception object }

compiler/ncgmem.pas

@@ -117,7 +117,7 @@ implementation
                    current_asmdata.ConstPools[sp_objcclassnamerefs]:=THashSet.Create(64, True, False);
                  pool:=current_asmdata.ConstPools[sp_objcclassnamerefs];
                  entry:=pool.FindOrAdd(@tobjectdef(left.resultdef).objextname^[1],length(tobjectdef(left.resultdef).objextname^));
-                 if (target_info.system in system_objc_nfabi) then
+                 if (target_info.system in systems_objc_nfabi) then
                    begin
                      { find/add necessary classref/classname pool entries }
                      objcfinishclassrefnfpoolentry(entry,tobjectdef(left.resultdef));
@@ -417,7 +417,7 @@ implementation
            end;
 
          if is_objc_class_or_protocol(left.resultdef) and
-            (target_info.system in system_objc_nfabi) then
+            (target_info.system in systems_objc_nfabi) then
            begin
              if (location.loc<>LOC_REFERENCE) or
                 (location.reference.index<>NR_NO) then

compiler/ncnv.pas

@@ -810,7 +810,7 @@ implementation
                 internalerror(2001020801);
               {$endif} {$endif}
             {$endif}
-            
+
             if not(nf_explicit in flags) then
               if (tordconstnode(left).value.svalue=0) then
                 CGMessage(type_w_zero_to_nil)
@@ -935,7 +935,7 @@ implementation
          result:=nil;
          { we can't do widechar to ansichar conversions at compile time, since }
          { this maps all non-ascii chars to '?' -> loses information           }
-         
+
          if (left.nodetype=ordconstn) and
             ((tstringdef(resultdef).stringtype in [st_widestring,st_unicodestring]) or
              (torddef(left.resultdef).ordtype=uchar) or
@@ -2324,7 +2324,7 @@ implementation
       var
         fname: string[32];
       begin
-        if target_info.system in system_wince then
+        if target_info.system in systems_wince then
           begin
             { converting a 64bit integer to a float requires a helper }
             if is_64bitint(left.resultdef) or
@@ -2401,7 +2401,7 @@ implementation
 {$ifdef cpufpemu}
         if cs_fp_emulation in current_settings.moduleswitches then
           begin
-            if target_info.system in system_wince then
+            if target_info.system in systems_wince then
               begin
                 case tfloatdef(left.resultdef).floattype of
                   s32real:

compiler/nmat.pas

@@ -675,7 +675,7 @@ implementation
 
         if (cs_fp_emulation in current_settings.moduleswitches) and (left.resultdef.typ=floatdef) then
           begin
-            if not(target_info.system in system_wince) then
+            if not(target_info.system in systems_wince) then
               begin
                 case tfloatdef(resultdef).floattype of
                   s32real:

compiler/objcgutl.pas

@@ -200,7 +200,7 @@ procedure objcfinishstringrefpoolentry(entry: phashsetitem; stringpool: tconstpo
         { in case of a class reference, also add a lazy symbol reference for
           the class (the linker requires this for the fragile ABI). }
         if (refsec=sec_objc_cls_refs) and
-           not(target_info.system in system_objc_nfabi) then
+           not(target_info.system in systems_objc_nfabi) then
           begin
             setlength(classname,entry^.keylength);
             move(entry^.key^,classname[1],entry^.keylength);
@@ -1588,7 +1588,7 @@ procedure MaybeGenerateObjectiveCImageInfo(globalst, localst: tsymtable);
 
         { generate rtti for all obj-c classes, protocols and categories
           defined in this module. }
-        if not(target_info.system in system_objc_nfabi) then
+        if not(target_info.system in systems_objc_nfabi) then
           objcrttiwriter:=tobjcrttiwriter_fragile.create
         else
           objcrttiwriter:=tobjcrttiwriter_nonfragile.create;

compiler/objcutil.pas

@@ -150,7 +150,7 @@ end;
 {$if defined(onlymacosx10_6) or defined(arm) }
                 { NOTE: those send2 methods are only available on Mac OS X 10.6 and later!
                     (but also on all iPhone SDK revisions we support) }
-                if (target_info.system in system_objc_nfabi) then
+                if (target_info.system in systems_objc_nfabi) then
                   result:=cloadvmtaddrnode.create(ctypenode.create(tobjectdef(tclassrefdef(def).pointeddef).childof))
                 else
 {$endif onlymacosx10_6 or arm}
@@ -181,7 +181,7 @@ end;
 
           NOTE: those send2 methods are only available on Mac OS X 10.6 and later!
             (but also on all iPhone SDK revisions we support) }
-        if not(target_info.system in system_objc_nfabi) then
+        if not(target_info.system in systems_objc_nfabi) then
 {$endif onlymacosx10_6 or arm}
           result:=objcloadbasefield(result,'SUPERCLASS');
         typecheckpass(result);
@@ -870,7 +870,7 @@ end;
 
     procedure exportobjcclass(def: tobjectdef);
       begin
-        if (target_info.system in system_objc_nfabi) then
+        if (target_info.system in systems_objc_nfabi) then
           begin
             { export class and metaclass symbols }
             exportname(def.rtti_mangledname(objcclassrtti),0);

compiler/ogbase.pas

@@ -1461,7 +1461,7 @@ implementation
         FMangledName:=AName;
         { 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
+        if target_info.system in systems_all_windows then
           begin
             Replace(FMangledName,'?','__q$$');
 {$ifdef arm}

compiler/ogcoff.pas

@@ -1990,7 +1990,7 @@ const pemagic : array[0..3] of byte = (
         if target_info.system in [system_x86_64_win64] then
           MaxMemPos:=$FFFFFFFF
         else
-          if target_info.system in system_wince then
+          if target_info.system in systems_wince then
             MaxMemPos:=$1FFFFFF
           else
             MaxMemPos:=$7FFFFFFF;
@@ -2300,7 +2300,7 @@ const pemagic : array[0..3] of byte = (
             peoptheader.MinorOperatingSystemVersion:=0;
             peoptheader.MajorImageVersion:=dllmajor;
             peoptheader.MinorImageVersion:=dllminor;
-            if target_info.system in system_wince then
+            if target_info.system in systems_wince then
               peoptheader.MajorSubsystemVersion:=3
             else
               peoptheader.MajorSubsystemVersion:=4;
@@ -2314,7 +2314,7 @@ const pemagic : array[0..3] of byte = (
                 not checked in DLLs except for maybe drivers}
               peoptheader.Subsystem:=PE_SUBSYSTEM_NATIVE
             else
-              if target_info.system in system_wince then
+              if target_info.system in systems_wince then
                 peoptheader.Subsystem:=PE_SUBSYSTEM_WINDOWS_CE_GUI
               else
                 if apptype=app_gui then
@@ -2355,7 +2355,7 @@ const pemagic : array[0..3] of byte = (
         { For some unknown reason WM 6.1 requires .idata section to be read only.
           Otherwise it refuses to load DLLs greater than 64KB.
           Earlier versions of WinCE load DLLs regardless of .idata flags. }
-        if target_info.system in system_wince then
+        if target_info.system in systems_wince then
           begin
             idataExeSec:=FindExeSection('.idata');
             if idataExeSec<>nil then

compiler/ogelf.pas

@@ -1100,7 +1100,7 @@ implementation
            strtabsect:=TElfObjSection.create_ext(ObjSectionList,'.strtab',SHT_STRTAB,0,0,0,1,0);
            shstrtabsect:=TElfObjSection.create_ext(ObjSectionList,'.shstrtab',SHT_STRTAB,0,0,0,1,0);
            { "no executable stack" marker for Linux }
-           if (target_info.system in system_linux) and
+           if (target_info.system in systems_linux) and
               not(cs_executable_stack in current_settings.moduleswitches) then
              TElfObjSection.create_ext(ObjSectionList,'.note.GNU-stack',SHT_PROGBITS,0,0,0,1,0);
            { insert the empty and filename as first in strtab }

compiler/options.pas

@@ -124,7 +124,7 @@ const
                         + [system_i386_netbsd]
                         + [system_i386_wdosx];
                         
-  suppported_targets_x_smallr = system_linux + systems_solaris
+  suppported_targets_x_smallr = systems_linux + systems_solaris
                              + [system_i386_haiku]
                              + [system_i386_beos];
 
@@ -1575,7 +1575,7 @@ begin
                       end;
                     'X':
                       begin
-                        if (target_info.system in system_linux) then
+                        if (target_info.system in systems_linux) then
                           begin
                             if UnsetBool(More, j) then
                               exclude(init_settings.moduleswitches,cs_executable_stack)
@@ -2387,7 +2387,7 @@ begin
   option.firstpass:=false;
 
 { target is set here, for wince the default app type is gui }
-  if target_info.system in system_wince then
+  if target_info.system in systems_wince then
     apptype:=app_gui;
 
 { default defines }
@@ -2809,7 +2809,7 @@ if (target_info.system=system_arm_darwin) then
   set_system_macro('FPC_PATCH',patch_nr);
   set_system_macro('FPC_FULLVERSION',Format('%d%.02d%.02d',[StrToInt(version_nr),StrToInt(release_nr),StrToInt(patch_nr)]));
 
-  if not(target_info.system in system_windows) then
+  if not(target_info.system in systems_windows) then
     def_system_macro('FPC_WIDESTRING_EQUAL_UNICODESTRING');
 
   for i:=low(tfeature) to high(tfeature) do

compiler/pdecsub.pas

@@ -106,7 +106,7 @@ implementation
 
 {$if defined(i386)}
            { For left to right add it at the end to be delphi compatible }
-           if (target_info.system in system_all_windows) and
+           if (target_info.system in systems_all_windows) and
               (pd.proccalloption in (pushleftright_pocalls+[pocall_safecall])) then
              paranr:=paranr_result_leftright
            else
@@ -114,7 +114,7 @@ implementation
            { other platforms don't have a "safecall" convention,
              and never reverse the parameter pushing order
            }
-           if (target_info.system in system_all_windows) and
+           if (target_info.system in systems_all_windows) and
               (pd.proccalloption = pocall_safecall)  then
              paranr:=paranr_result_leftright
            else
@@ -1741,7 +1741,7 @@ end;
 
 procedure pd_weakexternal(pd:tabstractprocdef);
 begin
-  if not(target_info.system in system_weak_linking) then
+  if not(target_info.system in systems_weak_linking) then
     message(parser_e_weak_external_not_supported)
   else
     pd_external(pd);
@@ -2372,7 +2372,7 @@ const
 *)
                 if assigned(pd.import_name) then
                   begin
-                    if target_info.system in (system_all_windows + systems_nativent +
+                    if target_info.system in (systems_all_windows + systems_nativent +
                                        [system_i386_emx, system_i386_os2]) then
                    { cprefix is not used in DLL imports under Windows or OS/2 }
                       result:=pd.import_name^
@@ -2431,7 +2431,7 @@ const
                         { 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
+                        if (target_info.system in systems_all_windows) and (pd.import_dll<>nil) then
                           begin
                             Replace(s,'?','__q$$');
 {$ifdef arm}
@@ -2465,7 +2465,7 @@ const
                   else
                     begin
                       { Export names are not mangled on Windows and OS/2, see also pexports.pas }
-                      if (target_info.system in (system_all_windows+[system_i386_emx, system_i386_os2])) and
+                      if (target_info.system in (systems_all_windows+[system_i386_emx, system_i386_os2])) and
                         (po_exports in pd.procoptions) then
                         pd.aliasnames.insert(pd.procsym.realname)
                       else

compiler/pdecvar.pas

@@ -900,7 +900,7 @@ implementation
 
       { Windows uses an indirect reference using import tables }
       if is_dll and
-         (target_info.system in system_all_windows) then
+         (target_info.system in systems_all_windows) then
         include(vs.varoptions,vo_is_dll_var);
 
       { Add C _ prefix }
@@ -928,7 +928,7 @@ implementation
           include(vs.varoptions,vo_is_external);
           if (is_weak_external) then
             begin
-              if not(target_info.system in system_weak_linking) then
+              if not(target_info.system in systems_weak_linking) then
                 message(parser_e_weak_external_not_supported);
               include(vs.varoptions,vo_is_weak_external);
             end;

compiler/pexports.pas

@@ -200,7 +200,7 @@ implementation
 
                           if ((options and eo_name)=0) then
                             { Export names are not mangled on Windows and OS/2 }
-                            if (target_info.system in (system_all_windows+[system_i386_emx, system_i386_os2])) then
+                            if (target_info.system in (systems_all_windows+[system_i386_emx, system_i386_os2])) then
                               hpname:=orgs
                             { Use set mangled name in case of cdecl/cppdecl/mwpascal }
                             { and no name specified                                  }

compiler/pmodules.pas

@@ -535,7 +535,7 @@ implementation
            - loaded_units list, so that the unit object file doesn't get linked
              with the executable. }
         { Note: on windows we always need resources! }
-        resources_used:=(target_info.system in system_all_windows)
+        resources_used:=(target_info.system in systems_all_windows)
                          or CheckResourcesUsed;
         if (not resources_used) and (tf_has_winlike_resources in target_info.flags) then
           begin
@@ -669,7 +669,7 @@ implementation
 
         { CPU targets with microcontroller support can add a controller specific unit }
 {$if defined(ARM)}
-        if (target_info.system in system_embedded) and (current_settings.controllertype<>ct_none) then
+        if (target_info.system in systems_embedded) and (current_settings.controllertype<>ct_none) then
           AddUnit(controllerunitstr[current_settings.controllertype]);
 {$endif ARM}
       end;
@@ -1032,7 +1032,7 @@ implementation
              dispose(s1);
           end;
 
-         if (target_info.system in system_unit_program_exports) then
+         if (target_info.system in systems_unit_program_exports) then
            exportlib.preparelib(current_module.realmodulename^);
 
          consume(_ID);
@@ -1704,7 +1704,7 @@ implementation
          { AV error when DLL is loaded and relocation is needed.  }
          { Internal linker does not have this problem.            }
          if RelocSection and
-            (target_info.system in system_all_windows+[system_i386_wdosx]) and
+            (target_info.system in systems_all_windows+[system_i386_wdosx]) and
             (cs_link_extern in current_settings.globalswitches) then
            begin
               include(current_settings.globalswitches,cs_link_strip);
@@ -1999,7 +1999,7 @@ implementation
          { AV error when DLL is loaded and relocation is needed.  }
          { Internal linker does not have this problem.            }
          if RelocSection and
-            (target_info.system in system_all_windows+[system_i386_wdosx]) and
+            (target_info.system in systems_all_windows+[system_i386_wdosx]) and
             (cs_link_extern in current_settings.globalswitches) then
            begin
               include(current_settings.globalswitches,cs_link_strip);
@@ -2038,7 +2038,7 @@ implementation
             begin
               consume(_PROGRAM);
               current_module.setmodulename(orgpattern);
-              if (target_info.system in system_unit_program_exports) then
+              if (target_info.system in systems_unit_program_exports) then
                 exportlib.preparelib(orgpattern);
               consume(_ID);
               if token=_LKLAMMER then
@@ -2051,7 +2051,7 @@ implementation
                 end;
               consume(_SEMICOLON);
             end
-         else if (target_info.system in system_unit_program_exports) then
+         else if (target_info.system in systems_unit_program_exports) then
            exportlib.preparelib(current_module.realmodulename^);
 
          { global switches are read, so further changes aren't allowed }
@@ -2222,7 +2222,7 @@ implementation
          resources_used:=MaybeRemoveResUnit;
 
          linker.initsysinitunitname;
-         if target_info.system in system_internal_sysinit then
+         if target_info.system in systems_internal_sysinit then
          begin
            { add start/halt unit }
            AddUnit(linker.sysinitunit);
@@ -2257,7 +2257,7 @@ implementation
          if (cs_debuginfo in current_settings.moduleswitches) then
            current_debuginfo.inserttypeinfo;
 
-         if islibrary or (target_info.system in system_unit_program_exports) then
+         if islibrary or (target_info.system in systems_unit_program_exports) then
            exportlib.generatelib;
 
          { Reference all DEBUGINFO sections from the main .fpc section }

compiler/psub.pas

@@ -754,7 +754,7 @@ implementation
 
 {$if defined(x86) or defined(arm)}
         { set implicit_finally flag for if procedure is safecall }
-        if (target_info.system in system_all_windows) and
+        if (target_info.system in systems_all_windows) and
            (procdef.proccalloption=pocall_safecall) then
           include(flags, pi_needs_implicit_finally);
 {$endif}
@@ -1083,7 +1083,7 @@ implementation
 {$if defined(x86) or defined(arm)}
             { Set return value of safecall procedure if implicit try/finally blocks are disabled }
             if not (cs_implicit_exceptions in current_settings.moduleswitches) and
-               (target_info.system in system_all_windows) and
+               (target_info.system in systems_all_windows) and
                (procdef.proccalloption=pocall_safecall) then
               cg.a_load_const_reg(aktproccode,OS_ADDR,0,NR_FUNCTION_RETURN_REG);
 {$endif}
@@ -1743,7 +1743,7 @@ implementation
                         consume_all_until(_SEMICOLON);
                      end
                    else if islibrary or
-                     (target_info.system in system_unit_program_exports) then
+                     (target_info.system in systems_unit_program_exports) then
                      read_exports
                    else
                      begin

compiler/psystem.pas

@@ -163,7 +163,7 @@ implementation
         { should we give a length to the default long and ansi string definition ?? }
         clongstringtype:=tstringdef.createlong(-1);
         cansistringtype:=tstringdef.createansi;
-        if target_info.system in system_windows then
+        if target_info.system in systems_windows then
           cwidestringtype:=tstringdef.createwide
         else
           cwidestringtype:=tstringdef.createunicode;

compiler/scandir.pas

@@ -231,7 +231,7 @@ unit scandir;
       var
          hs : string;
       begin
-        if not (target_info.system in system_all_windows + [system_i386_os2,
+        if not (target_info.system in systems_all_windows + [system_i386_os2,
                                        system_i386_emx, system_powerpc_macos,
                                        system_arm_nds] + systems_nativent) then
           begin
@@ -252,7 +252,7 @@ unit scandir;
                    apptype:=app_gui
                  else if hs='CONSOLE' then
                    apptype:=app_cui
-                 else if (hs='NATIVE') and (target_info.system in system_windows + systems_nativent) then
+                 else if (hs='NATIVE') and (target_info.system in systems_windows + systems_nativent) then
                    apptype:=app_native
                  else if (hs='FS') and (target_info.system in [system_i386_os2,
                                                              system_i386_emx]) then
@@ -312,7 +312,7 @@ unit scandir;
 
     procedure dir_description;
       begin
-        if not (target_info.system in system_all_windows+[system_i386_os2,system_i386_emx,
+        if not (target_info.system in systems_all_windows+[system_i386_os2,system_i386_emx,
                  system_i386_netware,system_i386_wdosx,system_i386_netwlibc]) then
           Message(scan_w_description_not_support);
         { change description global var in all cases }
@@ -407,7 +407,7 @@ unit scandir;
 
     procedure dir_imagebase;
       begin
-        if not (target_info.system in (system_windows+system_wince)) then
+        if not (target_info.system in (systems_windows+systems_wince)) then
           Message(scan_w_imagebase_not_support);
         current_scanner.skipspace;
         imagebase:=current_scanner.readval;
@@ -648,7 +648,7 @@ unit scandir;
 
     procedure dir_maxstacksize;
       begin
-        if not (target_info.system in (system_windows+system_wince)) then
+        if not (target_info.system in (systems_windows+systems_wince)) then
           Message(scan_w_maxstacksize_not_support);
         current_scanner.skipspace;
         maxstacksize:=current_scanner.readval;
@@ -721,7 +721,7 @@ unit scandir;
 
     procedure dir_minstacksize;
       begin
-        if not (target_info.system in (system_windows+system_wince)) then
+        if not (target_info.system in (systems_windows+systems_wince)) then
           Message(scan_w_minstacksize_not_support);
         current_scanner.skipspace;
         minstacksize:=current_scanner.readval;
@@ -1019,7 +1019,7 @@ unit scandir;
 
     procedure dir_setpeflags;
       begin
-        if not (target_info.system in (system_all_windows)) then
+        if not (target_info.system in (systems_all_windows)) then
           Message(scan_w_setpeflags_not_support);
         current_scanner.skipspace;
         peflags:=current_scanner.readval;
@@ -1100,7 +1100,7 @@ unit scandir;
         major, minor, revision : longint;
         error : integer;
       begin
-        if not (target_info.system in system_all_windows+[system_i386_os2,system_i386_emx,
+        if not (target_info.system in systems_all_windows+[system_i386_os2,system_i386_emx,
                  system_i386_netware,system_i386_wdosx,
                  system_i386_netwlibc]) then
           begin

compiler/scanner.pas

@@ -472,7 +472,7 @@ implementation
               }
               if doinclude and
                  (i=m_objectivec1) and
-                 not(target_info.system in system_objc_supported) then
+                 not(target_info.system in systems_objc_supported) then
                 begin
                   Message1(option_unsupported_target_for_feature,'Objective-C');
                   break;

compiler/symdef.pas

@@ -4444,7 +4444,7 @@ implementation
           result:=inherited rtti_mangledname(rt)
         else
           begin
-            if not(target_info.system in system_objc_nfabi) then
+            if not(target_info.system in systems_objc_nfabi) then
               begin
                 result:=target_asm.labelprefix;
                 case objecttype of

compiler/systems.pas

@@ -394,15 +394,15 @@ interface
        { alias for supported_target field in tasminfo }
        system_any = system_none;
 
-       system_wince = [system_arm_wince,system_i386_wince];
-       system_linux = [system_i386_linux,system_x86_64_linux,system_powerpc_linux,system_powerpc64_linux,
+       systems_wince = [system_arm_wince,system_i386_wince];
+       systems_linux = [system_i386_linux,system_x86_64_linux,system_powerpc_linux,system_powerpc64_linux,
                        system_arm_linux,system_sparc_linux,system_alpha_linux,system_m68k_linux,
                        system_x86_6432_linux,system_mips_linux,system_mipsel_linux];
 
        { all real windows systems, no cripple ones like wince, wdosx et. al. }
-       system_windows = [system_i386_win32,system_x86_64_win64,system_ia64_win64];
+       systems_windows = [system_i386_win32,system_x86_64_win64,system_ia64_win64];
        { all windows systems }
-       system_all_windows = [system_i386_win32,system_x86_64_win64,system_ia64_win64,
+       systems_all_windows = [system_i386_win32,system_x86_64_win64,system_ia64_win64,
                              system_arm_wince,system_i386_wince];
 
        { all darwin systems }
@@ -415,10 +415,10 @@ interface
 			  system_x86_64_solaris];
 
        { systems supporting Objective-C }
-       system_objc_supported = systems_darwin;
+       systems_objc_supported = systems_darwin;
 
        { systems using the non-fragile Objective-C ABI }
-       system_objc_nfabi = [system_powerpc64_darwin,system_x86_64_darwin,system_arm_darwin];
+       systems_objc_nfabi = [system_powerpc64_darwin,system_x86_64_darwin,system_arm_darwin];
 
        { all embedded systems }
        systems_embedded = [system_i386_embedded,system_m68k_embedded,
@@ -429,23 +429,18 @@ interface
                            system_powerpc64_embedded];
 
        { all systems supporting exports from programs or units }
-       system_unit_program_exports = [system_i386_win32,
+       systems_unit_program_exports = [system_i386_win32,
                                          system_i386_wdosx,
                                          system_i386_Netware,
                                          system_i386_netwlibc,
                                          system_arm_wince,
                                          system_x86_64_win64,
-                                         system_ia64_win64]+system_linux;
+                                         system_ia64_win64]+systems_linux;
 
        { all systems for which weak linking has been tested/is supported }
-       system_weak_linking = systems_darwin + systems_solaris;
+       systems_weak_linking = systems_darwin + systems_solaris;
 
-       system_internal_sysinit = [system_i386_linux,system_i386_win32];
-
-       system_embedded = [system_i386_embedded,system_m68k_embedded,system_alpha_embedded,
-             system_powerpc_embedded,system_sparc_embedded,system_vm_embedded,
-             system_iA64_embedded,system_x86_64_embedded,system_mips_embedded,
-             system_arm_embedded,system_powerpc64_embedded];
+       systems_internal_sysinit = [system_i386_linux,system_i386_win32];
 
        { all symbian systems }
        systems_symbian = [system_i386_symbian,system_arm_symbian];
@@ -453,9 +448,9 @@ interface
        { all native nt systems }
        systems_nativent = [system_i386_nativent];
 
-       { all systems for which istack must be at a 16 byte boundary 
+       { all systems for which istack must be at a 16 byte boundary
          when calling a function }
-       system_needs_16_byte_stack_alignment = [
+       systems_need_16_byte_stack_alignment = [
       	system_i386_darwin,
         system_x86_64_darwin,
         system_x86_64_win64,
@@ -463,7 +458,6 @@ interface
         system_x86_64_freebsd,
         system_x86_64_solaris];
 
-
        cpu2str : array[TSystemCpu] of string[10] =
             ('','i386','m68k','alpha','powerpc','sparc','vm','ia64','x86_64',
              'mips','arm', 'powerpc64', 'avr', 'mipsel');

compiler/systems/t_linux.pas

@@ -380,7 +380,7 @@ begin
 
       StartSection('INPUT(');
       { add objectfiles, start with prt0 always }
-      if not (target_info.system in system_internal_sysinit) and (prtobj<>'') then
+      if not (target_info.system in systems_internal_sysinit) and (prtobj<>'') then
        AddFileName(maybequoted(FindObjectFile(prtobj,'',false)));
       { try to add crti and crtbegin if linking to C }
       if linklibc and (libctype<>uclibc) then

compiler/systems/t_win.pas

@@ -966,7 +966,7 @@ implementation
                 if IsSharedLibrary then
                   imagebase:={$ifdef cpu64bitaddr} $110000000 {$else} $10000000 {$endif}
                 else
-                  if target_info.system in system_wince then
+                  if target_info.system in systems_wince then
                     imagebase:=$10000
                   else
                     imagebase:={$ifdef cpu64bitaddr} $100000000 {$else} $400000 {$endif};
@@ -1346,7 +1346,7 @@ implementation
           RelocStr:='--base-file base.$$$';
         if create_smartlink_sections then
           GCSectionsStr:='--gc-sections';
-        if target_info.system in system_wince then
+        if target_info.system in systems_wince then
           AppTypeStr:='--subsystem wince'
         else
           begin
@@ -1615,7 +1615,7 @@ implementation
         { gui=2 }
         { cui=3 }
         { wincegui=9 }
-        if target_info.system in system_wince then
+        if target_info.system in systems_wince then
           peoptheader.Subsystem:=9
         else
           case apptype of

compiler/x86/cgx86.pas

@@ -441,7 +441,7 @@ unit cgx86;
               end
             else
               { Always use RIP relative symbol addressing for Windows and Darwin targets. }
-              if (target_info.system in (system_all_windows+[system_x86_64_darwin])) and (ref.base<>NR_RIP) then
+              if (target_info.system in (systems_all_windows+[system_x86_64_darwin])) and (ref.base<>NR_RIP) then
                 begin
                   if (ref.refaddr=addr_no) and (ref.base=NR_NO) and (ref.index=NR_NO) then
                     begin
@@ -932,7 +932,7 @@ unit cgx86;
                           a_op_const_reg(list,OP_ADD,OS_ADDR,offset,r);
                       end
 {$ifdef x86_64}
-                    else if (target_info.system in (system_all_windows+[system_x86_64_darwin])) 
+                    else if (target_info.system in (systems_all_windows+[system_x86_64_darwin]))
 			 or ((target_info.system = system_x86_64_solaris) and
                              (cs_create_pic in current_settings.moduleswitches))
 			 then
@@ -2115,12 +2115,12 @@ unit cgx86;
 
             { allocate stackframe space }
             if (localsize<>0) or
-               ((target_info.system in system_needs_16_byte_stack_alignment) and
+               ((target_info.system in systems_need_16_byte_stack_alignment) and
                 (stackmisalignment <> 0) and
                 ((pi_do_call in current_procinfo.flags) or
                  (po_assembler in current_procinfo.procdef.procoptions))) then
               begin
-                if (target_info.system in system_needs_16_byte_stack_alignment) then
+                if (target_info.system in systems_need_16_byte_stack_alignment) then
                   localsize := align(localsize+stackmisalignment,16)-stackmisalignment;
                 cg.g_stackpointer_alloc(list,localsize);
                 if current_procinfo.framepointer=NR_STACK_POINTER_REG then

compiler/x86_64/cgcpu.pas

@@ -168,7 +168,7 @@ unit cgcpu;
             if (current_procinfo.framepointer=NR_STACK_POINTER_REG) then
               begin
                 stacksize:=current_procinfo.calc_stackframe_size;
-                if (target_info.system in system_needs_16_byte_stack_alignment) and
+                if (target_info.system in systems_need_16_byte_stack_alignment) and
                    ((stacksize <> 0) or
                     (pi_do_call in current_procinfo.flags) or
                     { can't detect if a call in this case -> use nostackframe }
@@ -284,5 +284,5 @@ unit cgcpu;
       begin
         cg:=tcgx86_64.create;
       end;
-      
+
 end.