paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-13 18:24:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Renamefest

Browse Source
This commit is contained in:
marco 2000-11-13 15:26:12 +00:00
parent 6da2a09067
commit b65958a61e
7 changed files with 66 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/Makefile
View File

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

11
compiler/assemble.pas
View File

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

11
compiler/catch.pas
View File

@ -36,7 +36,7 @@ Unit catch;
interface interface
uses uses
{$ifdef linux} {$ifdef unix}
{$define has_signal} {$define has_signal}
linux, linux,
{$endif} {$endif}
@ -57,7 +57,7 @@ Const in_const_evaluation : boolean = false;
Implementation Implementation
{$ifdef has_signal} {$ifdef has_signal}
{$ifdef linux} {$ifdef unix}
Procedure CatchSignal(Sig : SmallInt);cdecl; Procedure CatchSignal(Sig : SmallInt);cdecl;
{$else} {$else}
Function CatchSignal(Sig : longint):longint; Function CatchSignal(Sig : longint):longint;
@ -81,7 +81,7 @@ begin
Stop; Stop;
end; end;
end; end;
{$ifndef linux} {$ifndef unix}
CatchSignal:=0; CatchSignal:=0;
{$endif} {$endif}
end; end;
@ -101,7 +101,10 @@ end.
{ {
$Log$ $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 * use defines.inc
Revision 1.3 2000/09/10 20:26:55 peter Revision 1.3 2000/09/10 20:26:55 peter

13
compiler/comphook.pas
View File

@ -138,7 +138,7 @@ const
implementation implementation
uses uses
{$ifdef Linux} {$ifdef Unix}
linux, linux,
{$endif} {$endif}
{$ifdef delphi} {$ifdef delphi}
@ -340,14 +340,14 @@ end;
Function def_GetNamedFileTime (Const F : String) : Longint; Function def_GetNamedFileTime (Const F : String) : Longint;
var var
L : Longint; L : Longint;
{$ifndef linux} {$ifndef Unix}
info : SearchRec; info : SearchRec;
{$else} {$else}
info : stat; info : stat;
{$endif} {$endif}
begin begin
l:=-1; l:=-1;
{$ifdef linux} {$ifdef Unix}
if FStat (F,Info) then if FStat (F,Info) then
L:=info.mtime; L:=info.mtime;
{$else} {$else}
@ -359,14 +359,17 @@ begin
if DosError=0 then if DosError=0 then
l:=info.time; l:=info.time;
FindClose(info); FindClose(info);
{$endif linux} {$endif Unix}
def_GetNamedFileTime:=l; def_GetNamedFileTime:=l;
end; end;
end. end.
{ {
$Log$ $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) * prefix fix (merged)
Revision 1.7 2000/09/24 21:33:46 peter Revision 1.7 2000/09/24 21:33:46 peter

37
compiler/globals.pas
View File

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

19
compiler/options.pas
View File

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

7
compiler/pp.pas
View File

@ -91,7 +91,7 @@ uses
{$ifdef heaptrc} {$ifdef heaptrc}
ppheap, ppheap,
{$endif heaptrc} {$endif heaptrc}
{$ifdef linux} {$ifdef Unix}
catch, catch,
{$endif} {$endif}
{$ifdef go32v2} {$ifdef go32v2}
@ -149,7 +149,10 @@ begin
end. end.
{ {
$Log$ $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 * lineinfo explicit load not needed anymore
Revision 1.3 2000/09/24 15:06:23 peter Revision 1.3 2000/09/24 15:06:23 peter