* new style for m68k/i386 infos and enums

compiler/ag68kgas.pas

@@ -158,12 +158,12 @@ unit ag68kgas;
 
       begin
          case t of
-            top_reg : if target_info.target=target_PalmOS then
+            top_reg : if target_info.target=target_m68k_PalmOS then
                         getopstr:=gasPalmOS_reg2str[tregister(o)]
                       else
                         getopstr:=gas_reg2str[tregister(o)];
-               top_ref : getopstr:=getreferencestring(preference(o)^);
-         top_reglist: begin
+            top_ref : getopstr:=getreferencestring(preference(o)^);
+        top_reglist : begin
                       hs:='';
                       for i:=R_NO to R_FPSR do
                       begin
@@ -512,7 +512,7 @@ ait_labeled_instruction : begin
                             A_SNE,A_SPL,A_ST,A_SVC,A_SVS,A_SF]) then
                         s:=#9+mot_op2str[pai68k(hp)^._operator]
                        else
-                        if target_info.target=target_PalmOS then
+                        if target_info.target=target_m68k_PalmOS then
                           s:=#9+mot_op2str[pai68k(hp)^._operator]+gas_opsize2str[pai68k(hp)^.size]
                         else
                           s:=#9+mot_op2str[pai68k(hp)^._operator]+mit_opsize2str[pai68k(hp)^.size];
@@ -678,7 +678,10 @@ ait_stab_function_name : funcname:=pai_stab_function_name(hp)^.str;
 end.
 {
   $Log$
-  Revision 1.16  1998-10-12 12:27:44  pierre
+  Revision 1.17  1998-10-13 13:10:08  peter
+    * new style for m68k/i386 infos and enums
+
+  Revision 1.16  1998/10/12 12:27:44  pierre
    * typo error for tai_const_symbol_offset corrected
 
   Revision 1.15  1998/10/12 12:20:43  pierre

compiler/asmutils.pas

@@ -1020,18 +1020,15 @@ end;
 
 
 {$ifdef i386}
-
   Procedure FWaitWarning;
   begin
-    if (target_info.target=target_GO32V2) and (cs_fp_emulation in aktmoduleswitches) then
+    if (target_info.target=target_i386_GO32V2) and (cs_fp_emulation in aktmoduleswitches) then
      Message(assem_w_fwait_emu_prob);
   end;
 {$endif i386}
 
 
 
-
-
   Function GetVarOffset(var Instr: TInstruction;const base: string; const field: string;
     Var Offset: longint; operandnum: byte):boolean;
   { search and returns the offset of records/objects of the base }
@@ -1872,7 +1869,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.9  1998-09-24 17:54:15  carl
+  Revision 1.10  1998-10-13 13:10:10  peter
+    * new style for m68k/i386 infos and enums
+
+  Revision 1.9  1998/09/24 17:54:15  carl
     * bugfixes from fix branch
 
   Revision 1.8.2.1  1998/09/24 17:46:25  carl

compiler/assemble.pas

@@ -104,7 +104,9 @@ uses
   {$ifndef NoAg68kMit}
     ,ag68kmit
   {$endif NoAg68kMit}
+  {$ifndef NoAg68kMpw}
     ,ag68kmpw
+  {$endif NoAg68kMpw}
 {$endif}
   ;
 
@@ -117,13 +119,7 @@ Function DoPipe:boolean;
 begin
   DoPipe:=(cs_asm_pipe in aktglobalswitches) and
           not(cs_asm_leave in aktglobalswitches)
-{$ifdef i386}
-          and (aktoutputformat=as_o)
-{$else}
-{$ifdef m68k}
-          and (aktoutputformat=as_m68k_o)
-{$endif m68k}
-{$endif i386}
+          and (aktoutputformat in [as_i386_o,as_m68k_o]);
 end;
 
 
@@ -416,32 +412,43 @@ begin
   case aktoutputformat of
 {$ifdef i386}
   {$ifndef NoAg386Att}
-        as_o,as_o_aout,as_asw : a:=new(pi386attasmlist,Init);
+     as_i386_o,
+     as_i386_o_aout,
+     as_i386_asw :
+       a:=new(pi386attasmlist,Init);
   {$endif NoAg386Att}
   {$ifndef NoAg386Nsm}
- as_nasmcoff,
-  as_nasmelf,
-  as_nasmobj : a:=new(pi386nasmasmlist,Init);
+     as_i386_nasmcoff,
+     as_i386_nasmelf,
+     as_i386_nasmobj :
+       a:=new(pi386nasmasmlist,Init);
   {$endif NoAg386Nsm}
   {$ifndef NoAg386Int}
-     as_tasm : a:=new(pi386intasmlist,Init);
+     as_i386_tasm :
+       a:=new(pi386intasmlist,Init);
   {$endif NoAg386Int}
 {$endif}
 {$ifdef m68k}
   {$ifndef NoAg68kGas}
      as_m68k_o,
-   as_m68k_gas : a:=new(pm68kgasasmlist,Init);
+     as_m68k_gas :
+       a:=new(pm68kgasasmlist,Init);
   {$endif NoAg86KGas}
   {$ifndef NoAg68kMot}
-   as_m68k_mot : a:=new(pm68kmotasmlist,Init);
+     as_m68k_mot :
+       a:=new(pm68kmotasmlist,Init);
   {$endif NoAg86kMot}
   {$ifndef NoAg68kMit}
-   as_m68k_mit : a:=new(pm68kmitasmlist,Init);
+     as_m68k_mit :
+       a:=new(pm68kmitasmlist,Init);
   {$endif NoAg86KMot}
-   as_m68k_mpw : a:=new(pm68kmpwasmlist,Init);
+  {$ifndef NoAg68kMpw}
+     as_m68k_mpw :
+       a:=new(pm68kmpwasmlist,Init);
+  {$endif NoAg68kMpw}
 {$endif}
   else
-   Message(assem_f_assembler_output_not_supported);
+    Message(assem_f_assembler_output_not_supported);
   end;
   a^.AsmCreate;
   a^.WriteAsmList;
@@ -464,7 +471,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.25  1998-10-13 08:19:24  pierre
+  Revision 1.26  1998-10-13 13:10:11  peter
+    * new style for m68k/i386 infos and enums
+
+  Revision 1.25  1998/10/13 08:19:24  pierre
     + source_os is now set correctly for cross-processor compilers
       (tos contains all target_infos and
        we use CPU86 and CPU68 conditionnals to

compiler/cga68k.pas

@@ -536,7 +536,7 @@ begin
         begin
             {Init the stack checking.}
             if (cs_check_stack in aktlocalswitches) and
-             (target_info.target=target_linux_m68k) then
+             (target_info.target=target_m68k_linux) then
                 begin
                     procinfo.aktentrycode^.insert(new(pai68k,
                      op_csymbol(A_JSR,S_NO,newcsymbol('FPC_INIT_STACK_CHECK',0))));
@@ -614,7 +614,7 @@ begin
                     if cs_littlesize in aktglobalswitches  then
                         begin
                             if (cs_check_stack in aktlocalswitches) and
-                               (target_info.target<>target_linux_m68k) then
+                               (target_info.target<>target_m68k_linux) then
                                 begin
                                   { If only not in main program, do we setup stack checking }
                                   if (aktprocsym^.definition^.options and poproginit=0) then
@@ -749,7 +749,7 @@ begin
     { call __EXIT for main program }
     { ????????? }
     if ((aktprocsym^.definition^.options and poproginit)<>0) and
-      (target_info.target<>target_PalmOS) then
+      (target_info.target<>target_m68k_PalmOS) then
      begin
        procinfo.aktexitcode^.concat(new(pai68k,op_csymbol(A_JSR,S_NO,newcsymbol('FPC_DO_EXIT',0))));
        externals^.concat(new(pai_external,init('FPC_DO_EXIT',EXT_NEAR)));
@@ -1345,7 +1345,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.20  1998-10-13 08:19:29  pierre
+  Revision 1.21  1998-10-13 13:10:12  peter
+    * new style for m68k/i386 infos and enums
+
+  Revision 1.20  1998/10/13 08:19:29  pierre
     + source_os is now set correctly for cross-processor compilers
       (tos contains all target_infos and
        we use CPU86 and CPU68 conditionnals to

compiler/gendef.pas

@@ -88,42 +88,35 @@ begin
   if ioresult<>0 then
    exit;
 {$ifdef i386}
-
   case target_info.target of
-   target_Os2 : begin
-
-                  write(t,'NAME '+inputfile);
-                  if usewindowapi then
-                   write(t,' WINDOWAPI');
-                  writeln(t,'');
-
-                  writeln(t,'PROTMODE');
-                  writeln(t,'DESCRIPTION '+''''+description+'''');
-                  writeln(t,'DATA'#9'MULTIPLE');
-                  writeln(t,'STACKSIZE'#9+tostr(stacksize));
-                  writeln(t,'HEAPSIZE'#9+tostr(heapsize));
-                end;
-
+    target_i386_Os2 :
+      begin
+        write(t,'NAME '+inputfile);
+        if usewindowapi then
+          write(t,' WINDOWAPI');
+        writeln(t,'');
+        writeln(t,'PROTMODE');
+        writeln(t,'DESCRIPTION '+''''+description+'''');
+        writeln(t,'DATA'#9'MULTIPLE');
+        writeln(t,'STACKSIZE'#9+tostr(stacksize));
+        writeln(t,'HEAPSIZE'#9+tostr(heapsize));
+      end;
   end;
 {$endif}
 
 {write imports}
-
   if not importlist.empty then
    begin
      writeln(t,'');
-
      writeln(t,'IMPORTS');
      while not importlist.empty do
       writeln(t,#9+importlist.get);
    end;
 
 {write exports}
-
   if not exportlist.empty then
    begin
      writeln(t,'');
-
      writeln(t,'EXPORTS');
      while not exportlist.empty do
       writeln(t,#9+exportlist.get);
@@ -135,10 +128,12 @@ end;
 end.
 {
   $Log$
-  Revision 1.1  1998-06-04 23:51:39  peter
+  Revision 1.2  1998-10-13 13:10:14  peter
+    * new style for m68k/i386 infos and enums
+
+  Revision 1.1  1998/06/04 23:51:39  peter
     * m68k compiles
     + .def file creation moved to gendef.pas so it could also be used
       for win32
 
 }
-  

compiler/import.pas

@@ -140,30 +140,34 @@ end;
 
 procedure DoneImport;
 begin
-   if assigned(importlib) then
-     dispose(importlib,done);
+  if assigned(importlib) then
+    dispose(importlib,done);
 end;
 
+
 procedure InitImport;
 begin
 {$ifdef i386}
-
   case target_info.target of
- target_Win32 : importlib:=new(pimportlibwin32,Init);
-   target_OS2 : importlib:=new(pimportlibos2,Init);
-  else
-   importlib:=new(pimportlib,Init);
+    target_i386_Win32 :
+      importlib:=new(pimportlibwin32,Init);
+    target_i386_OS2 :
+      importlib:=new(pimportlibos2,Init);
+    else
+      importlib:=new(pimportlib,Init);
   end;
-{$endif i386}
-{$ifdef m68k}
+{$else i386}
   importlib:=new(pimportlib,Init);
-{$endif m68k}
+{$endif i386}
 end;
 
 end.
 {
   $Log$
-  Revision 1.5  1998-10-06 17:16:51  pierre
+  Revision 1.6  1998-10-13 13:10:17  peter
+    * new style for m68k/i386 infos and enums
+
+  Revision 1.5  1998/10/06 17:16:51  pierre
     * some memory leaks fixed (thanks to Peter for heaptrc !)
 
   Revision 1.4  1998/09/30 12:16:47  peter

compiler/link.pas

@@ -274,38 +274,33 @@ Var
 begin
   WriteResponseFile:=False;
 { set special options for some targets }
-  linklibc:=SharedLibFiles.Find('c');
+  linklibc:=false;
   prtobj:='prt0';
   case target_info.target of
-{$ifdef i386}
-   target_Win32 : prtobj:='';
-   target_linux : begin
-                    if cs_profile in aktmoduleswitches then
-                     begin
-                       prtobj:='gprt0';
-                       if not glibc2 then
-                        AddSharedLibrary('gmon');
-                       AddSharedLibrary('c');
-                       linklibc:=true;
-                     end
-                    else
-                     begin
-                       if linklibc then
-                        prtobj:='cprt0';
-                     end;
-                  end;
-{$endif i386}
-{$ifdef m68k}
-  target_Palmos : prtobj:='';
-   target_linux_m68k : begin
-                    if cs_profile in aktmoduleswitches then
-                     begin
-                       prtobj:='gprt0';
-                       AddSharedLibrary('gmon');
-                       AddSharedLibrary('c');
-                     end;
-                  end;
-{$endif}
+   target_m68k_Palmos,
+   target_i386_Win32 :
+     begin
+       prtobj:='';
+     end;
+
+   target_m68k_linux,
+   target_i386_linux :
+     begin
+       linklibc:=SharedLibFiles.Find('c');
+       if cs_profile in aktmoduleswitches then
+        begin
+          prtobj:='gprt0';
+          if not glibc2 then
+           AddSharedLibrary('gmon');
+          AddSharedLibrary('c');
+          linklibc:=true;
+        end
+       else
+        begin
+          if linklibc then
+           prtobj:='cprt0';
+        end;
+     end;
   end;
 
 { Fix command line options }
@@ -343,7 +338,6 @@ begin
      WriteRes(search('crti.o',librarysearchpath,found)+'crti.o');
      WriteRes(search('crtbegin.o',librarysearchpath,found)+'crtbegin.o');
    end;
-
   while not ObjectFiles.Empty do
    begin
      s:=ObjectFiles.Get;
@@ -433,10 +427,13 @@ begin
       end;
      DoExec(bindbin,s,false,false);
    end;
+
+{ Post processor executable }
 {$ifdef i386}
-  if target_info.target=target_Win32 then
+  if target_info.target=target_i386_Win32 then
     win_targ.postprocessexecutable;
 {$endif}
+
 {Remove ReponseFile}
   if (success) and not(cs_link_extern in aktglobalswitches) then
    RemoveFile(LinkResName);
@@ -502,7 +499,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.29  1998-10-13 08:19:34  pierre
+  Revision 1.30  1998-10-13 13:10:18  peter
+    * new style for m68k/i386 infos and enums
+
+  Revision 1.29  1998/10/13 08:19:34  pierre
     + source_os is now set correctly for cross-processor compilers
       (tos contains all target_infos and
        we use CPU86 and CPU68 conditionnals to

compiler/opts386.pas

@@ -75,13 +75,13 @@ begin
          end;
    'R' : begin
            if More='ATT' then
-            initasmmode:=I386_ATT
+            initasmmode:=asmmode_i386_att
            else
             if More='INTEL' then
-             initasmmode:=I386_INTEL
+             initasmmode:=asmmode_i386_intel
            else
             if More='DIRECT' then
-             initasmmode:=I386_DIRECT
+             initasmmode:=asmmode_i386_direct
            else
             IllegalPara(opt);
          end;
@@ -93,7 +93,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.11  1998-09-25 09:57:08  peter
+  Revision 1.12  1998-10-13 13:10:20  peter
+    * new style for m68k/i386 infos and enums
+
+  Revision 1.11  1998/09/25 09:57:08  peter
     * moved -A to options.pas, becuase the code is the same
 
 }

compiler/opts68k.pas

@@ -58,7 +58,7 @@ begin
          end;
    'R' : begin
            if More='MOT' then
-            initasmmode:=M68K_MOT
+            initasmmode:=asmmode_m68k_mot
            else
             IllegalPara(opt);
          end;
@@ -71,7 +71,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.5  1998-09-25 09:57:09  peter
+  Revision 1.6  1998-10-13 13:10:21  peter
+    * new style for m68k/i386 infos and enums
+
+  Revision 1.5  1998/09/25 09:57:09  peter
     * moved -A to options.pas, becuase the code is the same
 
   Revision 1.4  1998/08/19 16:07:50  jonas

compiler/pdecl.pas

@@ -245,11 +245,8 @@ unit pdecl;
          symdone : boolean;
          { to handle absolute }
          abssym : pabsolutesym;
-{$ifdef i386}
-
          l    : longint;
          code : word;
-{$endif i386}
          { c var }
          Csym : pvarsym;
          newtype : ptypesym;
@@ -345,8 +342,7 @@ unit pdecl;
                 { absolute address ?!? }
                  if token=INTCONST then
                   begin
-{$ifdef i386}
-                    if (target_info.target=target_GO32V2) then
+                    if (target_info.target=target_i386_go32v2) then
                      begin
                        storetokenpos:=tokenpos;
                        tokenpos:=declarepos;
@@ -370,7 +366,6 @@ unit pdecl;
                        symtablestack^.insert(abssym);
                      end
                     else
-{$endif i386}
                      Message(parser_e_absolute_only_to_var_or_const);
                   end
                 else
@@ -2068,7 +2063,10 @@ unit pdecl;
 end.
 {
   $Log$
-  Revision 1.69  1998-10-09 12:07:49  pierre
+  Revision 1.70  1998-10-13 13:10:22  peter
+    * new style for m68k/i386 infos and enums
+
+  Revision 1.69  1998/10/09 12:07:49  pierre
     * typo error for propertyparas dispose corrected
 
   Revision 1.68  1998/10/09 11:47:54  pierre

compiler/pexpr.pas

@@ -1170,9 +1170,8 @@ unit pexpr;
                                  end;
                       arraydef : begin
                                    p2:=comp_expr(true);
-{$ifdef i386}
                                  { support SEG:OFS for go32v2 Mem[] }
-                                   if (target_info.target=target_GO32V2) and
+                                   if (target_info.target=target_i386_go32v2) and
                                       (p1^.treetype=loadn) and
                                       assigned(p1^.symtableentry) and
                                       assigned(p1^.symtableentry^.owner^.name) and
@@ -1198,7 +1197,6 @@ unit pexpr;
                                         end;
                                      end
                                    else
-{$endif}
                                      p1:=gennode(vecn,p1,p2);
                                    pd:=parraydef(pd)^.definition;
                                  end;
@@ -1865,7 +1863,10 @@ unit pexpr;
 end.
 {
   $Log$
-  Revision 1.64  1998-10-12 12:20:55  pierre
+  Revision 1.65  1998-10-13 13:10:24  peter
+    * new style for m68k/i386 infos and enums
+
+  Revision 1.64  1998/10/12 12:20:55  pierre
     + added tai_const_symbol_offset
       for r : pointer = @var.field;
     * better message for different arg names on implementation

compiler/pmodules.pas

@@ -126,10 +126,10 @@ unit pmodules;
           not output a pointer }
          case target_info.target of
 {$ifdef i386}
-          target_OS2 : ;
+       target_i386_OS2 : ;
 {$endif i386}
 {$ifdef m68k}
-       target_Mac68K : bsssegment^.concat(new(pai_datablock,init_global('HEAP',4)));
+       target_m68k_Mac : bsssegment^.concat(new(pai_datablock,init_global('HEAP',4)));
 {$endif m68k}
          else
            bsssegment^.concat(new(pai_datablock,init_global('HEAP',heapsize)));
@@ -148,24 +148,27 @@ unit pmodules;
       begin
         case target_info.target of
 {$ifdef i386}
-       target_GO32V2 : begin
-                       { stacksize can be specified }
-                         datasegment^.concat(new(pai_symbol,init_global('__stklen')));
-                         datasegment^.concat(new(pai_const,init_32bit(stacksize)));
-                       end;
-        target_WIN32 : begin
-                       { Generate an external entry to be sure that _mainCRTStarup will be
-                         linked, can't use concat_external because those aren't written for
-                         asw (PFV) }
-                         datasegment^.concat(new(pai_const,init_symbol('_mainCRTStartup')));
-                       end;
+          target_i386_GO32V2 :
+            begin
+              { stacksize can be specified }
+              datasegment^.concat(new(pai_symbol,init_global('__stklen')));
+              datasegment^.concat(new(pai_const,init_32bit(stacksize)));
+            end;
+          target_i386_WIN32 :
+            begin
+              { Generate an external entry to be sure that _mainCRTStarup will be
+                linked, can't use concat_external because those aren't written for
+                asw (PFV) }
+              datasegment^.concat(new(pai_const,init_symbol('_mainCRTStartup')));
+            end;
 {$endif i386}
 {$ifdef m68k}
-       target_Atari : begin
-                       { stacksize can be specified }
-                         datasegment^.concat(new(pai_symbol,init_global('__stklen')));
-                         datasegment^.concat(new(pai_const,init_32bit(stacksize)));
-                       end;
+          target_m68k_Atari :
+            begin
+              { stacksize can be specified }
+              datasegment^.concat(new(pai_symbol,init_global('__stklen')));
+              datasegment^.concat(new(pai_const,init_32bit(stacksize)));
+            end;
 {$endif m68k}
         end;
       end;
@@ -1017,7 +1020,7 @@ unit pmodules;
          names.insert('PASCALMAIN');
          names.insert(target_os.cprefix+'main');
 {$ifdef m68k}
-         if target_info.target=target_PalmOS then
+         if target_info.target=target_m68k_PalmOS then
            names.insert('PilotMain');
 {$endif}
          compile_proc_body(names,true,false);
@@ -1071,7 +1074,10 @@ unit pmodules;
 end.
 {
   $Log$
-  Revision 1.66  1998-10-09 16:36:05  pierre
+  Revision 1.67  1998-10-13 13:10:25  peter
+    * new style for m68k/i386 infos and enums
+
+  Revision 1.66  1998/10/09 16:36:05  pierre
     * some memory leaks specific to usebrowser define fixed
     * removed tmodule.implsymtable (was like tmodule.localsymtable)
 

compiler/pstatmnt.pas

@@ -672,18 +672,22 @@ unit pstatmnt;
          case aktasmmode of
 {$ifdef i386}
   {$ifndef NoRA386Att}
-            I386_ATT : asmstat:=ra386att.assemble;
+           asmmode_i386_att:
+             asmstat:=ra386att.assemble;
   {$endif NoRA386Att}
   {$ifndef NoRA386Int}
-          I386_INTEL : asmstat:=ra386int.assemble;
+           asmmode_i386_intel:
+             asmstat:=ra386int.assemble;
   {$endif NoRA386Int}
   {$ifndef NoRA386Dir}
-         I386_DIRECT : asmstat:=ra386dir.assemble;
+           asmmode_i386_direct:
+             asmstat:=ra386dir.assemble;
   {$endif NoRA386Dir}
 {$endif}
 {$ifdef m68k}
   {$ifndef NoRA68kMot}
-            M68K_MOT : asmstat:=ra68kmot.assemble;
+           asmmode_m68k_mot:
+             asmstat:=ra68kmot.assemble;
   {$endif NoRA68kMot}
 {$endif}
          else
@@ -1211,7 +1215,10 @@ unit pstatmnt;
 end.
 {
   $Log$
-  Revision 1.43  1998-10-08 13:46:22  peter
+  Revision 1.44  1998-10-13 13:10:27  peter
+    * new style for m68k/i386 infos and enums
+
+  Revision 1.43  1998/10/08 13:46:22  peter
     * added eof message
     * fixed unit init section parsing with finalize
 

compiler/scandir.inc

@@ -723,13 +723,11 @@ const
 
     procedure dir_oldasmmode(t:tdirectivetoken);
       begin
-{$ifdef i386}
         case t of
-         _DIR_I386_ATT    : aktasmmode:=I386_ATT;
-         _DIR_I386_DIRECT : aktasmmode:=I386_DIRECT;
-         _DIR_I386_INTEL  : aktasmmode:=I386_INTEL;
+         _DIR_I386_ATT    : aktasmmode:=asmmode_i386_att;
+         _DIR_I386_DIRECT : aktasmmode:=asmmode_i386_direct;
+         _DIR_I386_INTEL  : aktasmmode:=asmmode_i386_intel;
         end;
-{$endif}
       end;
 
 
@@ -944,7 +942,10 @@ const
 
 {
   $Log$
-  Revision 1.37  1998-10-08 23:29:04  peter
+  Revision 1.38  1998-10-13 13:10:28  peter
+    * new style for m68k/i386 infos and enums
+
+  Revision 1.37  1998/10/08 23:29:04  peter
     * -vu shows unit info, -vt shows tried/used files
 
   Revision 1.36  1998/10/08 17:17:29  pierre

compiler/switches.pas

@@ -92,15 +92,9 @@ begin
                    else
                     aktlocalswitches:=aktlocalswitches-[tlocalswitch(setsw)];
                  { Message for linux which has global checking only }
-                   if (switch='S')
-{$ifdef i386}
-                      and (target_info.target=target_linux)
-{$endif i386}
-{$ifdef m68k}
-                      and (target_info.target=target_linux_m68k)
-{$endif m68k}
-                      then
-                    Message(scan_n_stack_check_global_under_linux);
+                   if (switch='S') and
+                      (target_info.target in [target_i386_linux,target_m68k_linux]) then
+                     Message(scan_n_stack_check_global_under_linux);
                  end;
       modulesw : begin
                    if current_module^.in_global then
@@ -161,7 +155,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.14  1998-10-13 08:19:41  pierre
+  Revision 1.15  1998-10-13 13:10:29  peter
+    * new style for m68k/i386 infos and enums
+
+  Revision 1.14  1998/10/13 08:19:41  pierre
     + source_os is now set correctly for cross-processor compilers
       (tos contains all target_infos and
        we use CPU86 and CPU68 conditionnals to

compiler/symppu.inc

@@ -191,7 +191,7 @@
             if use_dbx then
              flags:=flags or uf_has_dbx;
 {$endif GDB}
-            if target_os.endian=en_big_endian then
+            if target_os.endian=endian_big then
              flags:=flags or uf_big_endian;
 {$ifdef UseBrowser}
             if cs_browser in aktmoduleswitches then
@@ -443,7 +443,10 @@
 
 {
   $Log$
-  Revision 1.19  1998-10-08 23:29:07  peter
+  Revision 1.20  1998-10-13 13:10:30  peter
+    * new style for m68k/i386 infos and enums
+
+  Revision 1.19  1998/10/08 23:29:07  peter
     * -vu shows unit info, -vt shows tried/used files
 
   Revision 1.18  1998/09/28 16:57:27  pierre

compiler/tcmat.pas

@@ -171,11 +171,8 @@ implementation
               exit;
            end;
            { nasm can not cope with negativ reals !! }
-         if is_constrealnode(p^.left)
-{$ifdef i386}
-         and not(aktoutputformat in [as_nasmcoff,as_nasmelf,as_nasmobj])
-{$endif}
-           then
+         if is_constrealnode(p^.left) and
+            not(aktoutputformat in [as_i386_nasmcoff,as_i386_nasmelf,as_i386_nasmobj]) then
            begin
               t:=genrealconstnode(-p^.left^.value_real);
               disposetree(p);
@@ -322,7 +319,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.2  1998-10-11 14:31:20  peter
+  Revision 1.3  1998-10-13 13:10:33  peter
+    * new style for m68k/i386 infos and enums
+
+  Revision 1.2  1998/10/11 14:31:20  peter
     + checks for division by zero
 
   Revision 1.1  1998/09/23 20:42:24  peter