Merged revisions 11693 via svnmerge from

svn+ssh://jonas@svn.freepascal.org/FPC/svn/fpc/trunk

........
r11693 | jonas | 2008-09-02 12:14:45 +0200 (Tue, 02 Sep 2008) | 4 lines

  * moved fplstat(ansistring,pstat) overload to bunxovl(h).inc, so all
    platforms have (fixes compilation for FPC_USE_LIBC platforms after
    r11681)

........


git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_2_2@12097 3ad0048d-3df7-0310-abae-a5850022a9f2

6 files changed, 55 insertions, 74 deletions

diff --git a/compiler/utils/fpcfg.inc b/compiler/utils/fpcfg.inc
index 2ecb10514f..df14ce6739 100644
--- a/compiler/utils/fpcfg.inc
+++ b/compiler/utils/fpcfg.inc
@@ -1,49 +1,49 @@
 {$ifdef Delphi}
-const fpcfg : array[0..3] of string[240]=(
+const fpcfg : array[0..2] of string[240]=(
 {$else Delphi}
-const fpcfg : array[0..3,1..240] of char=(
+const fpcfg : array[0..2,1..240] of char=(
 {$endif Delphi}
-  '#IFDEF NORMAL'#013#010+
-  ' -T%fpctargetos%'#013#010+
-  ' -Sg'#013#010+
-  ' -O1'#013#010+
-  ' -Oppentium3'#013#010+
-  ' -Ratt'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\rtl'#013#010+
-  ' -g-'#013#010+
-  ' -p-'#013#010+
-  ' -b-'#013#010+
-  '#ENDI','F'#013#010+
-  #013#010+
-  '#IFDEF DEBUG'#013#010+
-  ' -T%fpctargetos%'#013#010+
-  ' -Sg'#013#010+
-  ' -Cr'#013#010+
-  ' -Ci'#013#010+
-  ' -Co'#013#010+
-  ' -Oppentium3'#013#010+
-  ' -Ratt'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\rtl'#013#010+
-  ' -g'#013#010+
-  ' -','p-'#013#010+
-  ' -b-'#013#010+
-  '#ENDIF'#013#010+
-  #013#010+
-  '#IFDEF RELEASE'#013#010+
-  ' -T%fpctargetos%'#013#010+
-  ' -Sg'#013#010+
-  ' -O2'#013#010+
-  ' -Oppentium3'#013#010+
-  ' -Ratt'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\rtl'#013#010+
-  ' -','g-'#013#010+
-  ' -p-'#013#010+
-  ' -b-'#013#010+
-  '#ENDIF'#013#010
+  '#IFDEF NORMAL'#010+
+  ' -T%fpctargetos%'#010+
+  ' -Sg'#010+
+  ' -O1'#010+
+  ' -Oppentium3'#010+
+  ' -Ratt'#010+
+  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%'#010+
+  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*'#010+
+  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\rtl'#010+
+  ' -g-'#010+
+  ' -p-'#010+
+  ' -b-'#010+
+  '#ENDIF'#010+
+  #010+
+  '#IFDEF DE','BUG'#010+
+  ' -T%fpctargetos%'#010+
+  ' -Sg'#010+
+  ' -Cr'#010+
+  ' -Ci'#010+
+  ' -Co'#010+
+  ' -Oppentium3'#010+
+  ' -Ratt'#010+
+  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%'#010+
+  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*'#010+
+  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\rtl'#010+
+  ' -g'#010+
+  ' -p-'#010+
+  ' -b-'#010+
+  '#ENDIF'#010+
+  #010+
+  '#IFDEF REL','EASE'#010+
+  ' -T%fpctargetos%'#010+
+  ' -Sg'#010+
+  ' -O2'#010+
+  ' -Oppentium3'#010+
+  ' -Ratt'#010+
+  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%'#010+
+  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*'#010+
+  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\rtl'#010+
+  ' -g-'#010+
+  ' -p-'#010+
+  ' -b-'#010+
+  '#ENDIF'#010
 );
diff --git a/rtl/bsd/bunxsysc.inc b/rtl/bsd/bunxsysc.inc
index a79d98a907..5784b7e1a0 100644
--- a/rtl/bsd/bunxsysc.inc
+++ b/rtl/bsd/bunxsysc.inc
@@ -446,15 +446,6 @@ begin
  fpLStat:=do_syscall(syscall_nr_lstat,TSysParam(path),TSysParam(info));
 end;
 
-Function fpLstat(Filename: ansistring;Info:pstat):cint;
-{
-  Get all information on a link (the link itself), and return it in info.
-}
-
-begin
- fpLStat:=do_syscall(syscall_nr_lstat,TSysParam(pchar(filename)),TSysParam(info));
-end;
-
 function fpNice(N:cint):cint;
 {
   Set process priority. A positive N means a lower priority.
diff --git a/rtl/linux/bunxsysc.inc b/rtl/linux/bunxsysc.inc
index 075895eea7..57197129c6 100644
--- a/rtl/linux/bunxsysc.inc
+++ b/rtl/linux/bunxsysc.inc
@@ -415,21 +415,6 @@ begin
     TSysParam(path),TSysParam(info));
 end;
 
-Function fpLstat(Filename: ansistring;Info:pstat):cint;
-{
-  Get all information on a link (the link itself), and return it in info.
-}
-
-begin
- fpLStat:=do_syscall(
-{$ifdef cpux86_64}
-    syscall_nr_lstat,
-{$else}
-    syscall_nr_lstat64,
-{$endif}
-    TSysParam(pchar(filename)),TSysParam(info));
-end;
-
 
 function fpNice(N:cint):cint;
 {
diff --git a/rtl/unix/bunxh.inc b/rtl/unix/bunxh.inc
index dc1e3098fb..417a3184f3 100644
--- a/rtl/unix/bunxh.inc
+++ b/rtl/unix/bunxh.inc
@@ -93,7 +93,6 @@ Type TGrpArr = Array [0..0] of TGid;            { C style array workarounds}
     Function  FpIOCtl      (Handle:cint;Ndx: TIOCtlRequest; Data: Pointer):cint; external name  'FPC_SYSC_IOCTL';
     Function  FpNanoSleep  (req : ptimespec;rem : ptimespec):cint; external name 'FPC_SYSC_NANOSLEEP';
     Function  fpLstat(path:pchar;Info:pstat):cint;
-    Function  fpLstat(Filename: ansistring;Info:pstat):cint;
     Function  fpSymlink(oldname,newname:pchar):cint;
     Function  fpReadLink(name,linkname:pchar;maxlen:size_t):cint; external name  'FPC_SYSC_READLINK';
 
diff --git a/rtl/unix/bunxovl.inc b/rtl/unix/bunxovl.inc
index 5393822d9e..3626af705b 100644
--- a/rtl/unix/bunxovl.inc
+++ b/rtl/unix/bunxovl.inc
@@ -110,13 +110,18 @@ begin
   FpStat:=FpStat(pchar(path),buf);
 End;
 
-Function  fpLstat   (path:pchar;var Info:stat):cint;
+Function  fpLstat   (path: Ansistring; Info: pstat):cint; inline;
+begin
+  fplstat:=fplstat(pchar(path), info);
+end;
+
+Function  fpLstat   (path:pchar;var Info:stat):cint; inline;
 
 begin
   fpLstat:=fplstat(path,@info);
 end;
 
-Function  fpLstat   (Filename: ansistring;var Info:stat):cint;
+Function  fpLstat   (Filename: ansistring;var Info:stat):cint; inline;
 
 begin
   fpLstat:=fplstat(filename,@info);
diff --git a/rtl/unix/bunxovlh.inc b/rtl/unix/bunxovlh.inc
index 3421f097ad..9e60a04d95 100644
--- a/rtl/unix/bunxovlh.inc
+++ b/rtl/unix/bunxovlh.inc
@@ -37,8 +37,9 @@ Function  FpRmdir   (path : AnsiString): cInt; inline;
 Function  FpRename  (old  : AnsiString;newpath: AnsiString): cInt; inline;
 Function  FpStat    (path: AnsiString; var buf : stat): cInt; inline;
 Function  FpStat    (path: String; var buf : stat): cInt;
-Function  fpLstat   (path:pchar;var Info:stat):cint;
-Function  fpLstat   (Filename: ansistring;var Info:stat):cint;
+Function  fpLstat   (path: Ansistring; Info: pstat):cint; inline;
+Function  fpLstat   (path:pchar;var Info:stat):cint; inline;
+Function  fpLstat   (Filename: ansistring;var Info:stat):cint; inline;
 Function  FpAccess  (pathname : AnsiString; aMode : cInt): cInt; inline;
 function  FpWaitPid (pid : TPid; Var Status : cInt; Options : cint) : TPid;