* Renamefest

compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/11/08]
 #
 
 defaultrule: all
@@ -103,7 +103,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 
-export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION FPCOPT
 
 #####################################################################
 # Pre Settings
@@ -116,6 +116,12 @@ override FPCOPT+=-dUNIX
 endif
 endif
 
+ifeq ($(OS_TARGET),freebsd)
+ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
+override FPCOPT+=-dUNIX
+endif
+endif
+
 # Don't export OS_SOURCE because it can change after the first compile
 unexport OS_SOURCE FPC_VERSION
 

compiler/assemble.pas

@@ -90,7 +90,7 @@ Implementation
 
 uses
   cutils,script,fmodule,systems,verbose
-{$ifdef linux}
+{$ifdef unix}
   ,linux
 {$endif}
 {$ifdef i386}
@@ -351,7 +351,7 @@ begin
   place:=Aplace;
   if SmartAsm then
    NextSmartName;
-{$ifdef linux}
+{$ifdef unix}
   if DoPipe then
    begin
      Message1(exec_i_assembling_pipe,asmfile);
@@ -379,7 +379,7 @@ var
   l : longint;
 begin
   AsmFlush;
-{$ifdef linux}
+{$ifdef unix}
   if DoPipe then
    Close(outfile)
   else
@@ -596,7 +596,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.6  2000-10-01 19:48:23  peter
+  Revision 1.7  2000-11-13 15:26:12  marco
+   * Renamefest
+
+  Revision 1.6  2000/10/01 19:48:23  peter
     * lot of compile updates for cg11
 
   Revision 1.5  2000/09/24 15:06:11  peter

compiler/catch.pas

@@ -36,7 +36,7 @@ Unit catch;
 
 interface
 uses
-{$ifdef linux}
+{$ifdef unix}
   {$define has_signal}
   linux,
 {$endif}
@@ -57,7 +57,7 @@ Const in_const_evaluation : boolean = false;
 Implementation
 
 {$ifdef has_signal}
-{$ifdef linux}
+{$ifdef unix}
 Procedure CatchSignal(Sig : SmallInt);cdecl;
 {$else}
 Function CatchSignal(Sig : longint):longint;
@@ -81,7 +81,7 @@ begin
                Stop;
              end;
   end;
-{$ifndef linux}
+{$ifndef unix}
   CatchSignal:=0;
 {$endif}
 end;
@@ -101,7 +101,10 @@ end.
 
 {
   $Log$
-  Revision 1.4  2000-09-24 15:06:11  peter
+  Revision 1.5  2000-11-13 15:26:12  marco
+   * Renamefest
+
+  Revision 1.4  2000/09/24 15:06:11  peter
     * use defines.inc
 
   Revision 1.3  2000/09/10 20:26:55  peter

compiler/comphook.pas

@@ -138,7 +138,7 @@ const
 implementation
 
   uses
-{$ifdef Linux}
+{$ifdef Unix}
    linux,
 {$endif}
 {$ifdef delphi}
@@ -340,14 +340,14 @@ end;
 Function def_GetNamedFileTime (Const F : String) : Longint;
 var
   L : Longint;
-{$ifndef linux}
+{$ifndef Unix}
   info : SearchRec;
 {$else}
   info : stat;
 {$endif}
 begin
   l:=-1;
-{$ifdef linux}
+{$ifdef Unix}
   if FStat (F,Info) then
    L:=info.mtime;
 {$else}
@@ -359,14 +359,17 @@ begin
   if DosError=0 then
    l:=info.time;
   FindClose(info);
-{$endif linux}
+{$endif Unix}
   def_GetNamedFileTime:=l;
 end;
 
 end.
 {
   $Log$
-  Revision 1.8  2000-09-30 16:07:20  peter
+  Revision 1.9  2000-11-13 15:26:12  marco
+   * Renamefest
+
+  Revision 1.8  2000/09/30 16:07:20  peter
     * prefix fix (merged)
 
   Revision 1.7  2000/09/24 21:33:46  peter

compiler/globals.pas

@@ -30,7 +30,7 @@ interface
 {$ifdef win32}
       windows,
 {$endif}
-{$ifdef linux}
+{$ifdef unix}
       linux,
 {$endif}
 {$ifdef Delphi}
@@ -43,7 +43,7 @@ interface
       globtype,version,systems,cutils,cobjects;
 
     const
-{$ifdef linux}
+{$ifdef unix}
        DirSep = '/';
 {$else}
   {$ifdef amiga}
@@ -368,7 +368,7 @@ implementation
      convert dos datetime t to a string YY/MM/DD HH:MM:SS
    }
      var
-     {$ifndef linux}
+     {$ifndef unix}
        DT : DateTime;
      {$endif}
        Year,Month,Day,Hour,Min,Sec : Word;
@@ -378,7 +378,7 @@ implementation
           FileTimeString:='Not Found';
           exit;
         end;
-     {$ifndef linux}
+     {$ifndef unix}
        unpacktime(t,DT);
        Year:=dT.year;month:=dt.month;day:=dt.day;
        Hour:=dt.hour;min:=dt.min;sec:=dt.sec;
@@ -426,10 +426,10 @@ implementation
    }
      begin
         path_absolute:=false;
-{$ifdef linux}
+{$ifdef unix}
         if (length(s)>0) and (s[1]='/') then
           path_absolute:=true;
-{$else linux}
+{$else unix}
   {$ifdef amiga}
         if ((length(s)>0) and ((s[1]='\') or (s[1]='/'))) or (Pos(':',s) = length(s)) then
           path_absolute:=true;
@@ -438,7 +438,7 @@ implementation
            ((length(s)>2) and (s[2]=':') and ((s[3]='\') or (s[3]='/'))) then
           path_absolute:=true;
   {$endif amiga}
-{$endif linux}
+{$endif unix}
      end;
 
 {$ifndef FPC}
@@ -593,7 +593,7 @@ implementation
         if (not allowdot) and (s='.'+DirSep) then
          s:='';
         { return }
-{$ifdef linux}
+{$ifdef unix}
         FixPath:=s;
 {$else}
         FixPath:=Lower(s);
@@ -812,12 +812,12 @@ implementation
 
    Function GetFileTime ( Var F : File) : Longint;
    Var
-   {$ifdef linux}
+   {$ifdef unix}
      Info : Stat;
    {$endif}
      L : longint;
    begin
-   {$ifdef linux}
+   {$ifdef unix}
      FStat (F,Info);
      L:=Info.Mtime;
    {$else}
@@ -867,7 +867,7 @@ implementation
         singlepathstring : string;
         i : longint;
      begin
-     {$ifdef linux}
+     {$ifdef unix}
        for i:=1 to length(path) do
         if path[i]=':' then
        path[i]:=';';
@@ -941,7 +941,7 @@ implementation
         hp,p,p2 : pchar;
       {$endif}
       begin
-      {$ifdef linux}
+      {$ifdef unix}
         GetEnvPchar:=Linux.Getenv(envname);
         {$define GETENVOK}
       {$endif}
@@ -977,7 +977,7 @@ implementation
 
     procedure FreeEnvPChar(p:pchar);
       begin
-      {$ifndef linux}
+      {$ifndef unix}
         StrDispose(p);
       {$endif}
       end;
@@ -986,7 +986,7 @@ implementation
     Procedure Shell(const command:string);
       { This is already defined in the linux.ppu for linux, need for the *
         expansion under linux }
-      {$ifdef linux}
+      {$ifdef unix}
       begin
         Linux.Shell(command);
       end;
@@ -1131,9 +1131,9 @@ implementation
                                     Init
 ****************************************************************************}
 
-{$ifdef linux}
+{$ifdef unix}
   {$define need_path_search}
-{$endif linux}
+{$endif unix}
 {$ifdef os2}
   {$define need_path_search}
 {$endif os2}
@@ -1270,7 +1270,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.19  2000-11-12 22:20:37  peter
+  Revision 1.20  2000-11-13 15:26:12  marco
+   * Renamefest
+
+  Revision 1.19  2000/11/12 22:20:37  peter
     * create generic toutputsection for binary writers
 
   Revision 1.18  2000/11/04 14:25:19  florian

compiler/options.pas

@@ -249,7 +249,7 @@ begin
 {$ifdef GDB}
          'g',
 {$endif}
-{$ifdef linux}
+{$ifdef Unix}
          'L',
 {$endif}
 {$ifdef os2}
@@ -698,7 +698,7 @@ begin
                           IllegalPara(opt);
                         end;
                     end;
-{$ifdef linux}
+{$ifdef Unix}
               'P' : initglobalswitches:=initglobalswitches+[cs_asm_pipe];
 {$endif}
               's' : initglobalswitches:=initglobalswitches+[cs_asm_extern,cs_link_extern];
@@ -1308,7 +1308,7 @@ begin
 {$else Delphi}
   configpath:=FixPath(dos.getenv('PPC_CONFIG_PATH'),false);
 {$endif Delphi}
-{$ifdef linux}
+{$ifdef Unix}
   if configpath='' then
    configpath:='/etc/';
 {$endif}
@@ -1317,7 +1317,7 @@ begin
      read_configfile:=true;
      if not FileExists(ppccfg) then
       begin
-{$ifdef linux}
+{$ifdef Unix}
         if (dos.getenv('HOME')<>'') and FileExists(FixPath(dos.getenv('HOME'),false)+'.'+ppccfg) then
          ppccfg:=FixPath(dos.getenv('HOME'),false)+'.'+ppccfg
         else
@@ -1325,7 +1325,7 @@ begin
          if FileExists(configpath+ppccfg) then
           ppccfg:=configpath+ppccfg
         else
-{$ifndef linux}
+{$ifndef Unix}
          if FileExists(exepath+ppccfg) then
           ppccfg:=exepath+ppccfg
         else
@@ -1393,7 +1393,7 @@ begin
      Message(option_no_source_found);
      StopOptions;
    end;
-{$ifndef linux}
+{$ifndef Unix}
   param_file:=FixFileName(param_file);
 {$endif}
   fsplit(param_file,inputdir,inputfile,inputextension);
@@ -1421,7 +1421,7 @@ begin
 {$else}
   UnitSearchPath.AddPath(dos.getenv(target_info.unit_env),false);
 {$endif Delphi}
-{$ifdef linux}
+{$ifdef Unix}
   fpcdir:=FixPath(getenv('FPCDIR'),false);
   if fpcdir='' then
    begin
@@ -1515,7 +1515,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.16  2000-11-12 22:20:37  peter
+  Revision 1.17  2000-11-13 15:26:12  marco
+   * Renamefest
+
+  Revision 1.16  2000/11/12 22:20:37  peter
     * create generic toutputsection for binary writers
 
   Revision 1.15  2000/11/07 15:09:27  marco

compiler/pp.pas

@@ -91,7 +91,7 @@ uses
   {$ifdef heaptrc}
     ppheap,
   {$endif heaptrc}
-  {$ifdef linux}
+  {$ifdef Unix}
     catch,
   {$endif}
   {$ifdef go32v2}
@@ -149,7 +149,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.4  2000-10-01 21:15:55  pierre
+  Revision 1.5  2000-11-13 15:26:12  marco
+   * Renamefest
+
+  Revision 1.4  2000/10/01 21:15:55  pierre
    * lineinfo explicit load not needed anymore
 
   Revision 1.3  2000/09/24 15:06:23  peter