* More fixes

rtl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/08/10]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2003/09/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx
@@ -217,11 +217,13 @@ endif
 UNITPREFIX=rtl
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
-LINUXUNIT=linux
+LINUXUNIT1=
+LINUXUNIT2=linux oldlinux
 PRT0=prt0
 else
 SYSTEMUNIT=syslinux
-LINUXUNIT=linux
+LINUXUNIT1=linux
+LINUXUNIT2=
 PRT0=prt0_10
 override FPCOPT+=-dUNIX
 endif
@@ -233,7 +235,7 @@ GRAPHDIR=$(INC)/graph
 ifndef USELIBGGI
 USELIBGGI=NO
 endif
-override TARGET_UNITS+=$(SYSTEMUNIT) baseunix strings systhrds objpas syscall unixutil heaptrc lineinfo $(LINUXUNIT) unix initc $(CPU_UNITS) dos crt objects printer ggigraph sysutils typinfo math varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types
+override TARGET_UNITS+=$(SYSTEMUNIT) baseunix strings systhrds objpas syscall unixutil heaptrc lineinfo $(LINUXUNIT1) unix $(LINUXUNIT2) initc $(CPU_UNITS) dos crt objects printer ggigraph sysutils typinfo math varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types
 override TARGET_LOADERS+=prt0 dllprt0 cprt0 gprt0 cprt21 gprt21
 override TARGET_RSTS+=math varutils typinfo variants
 override CLEAN_UNITS+=syslinux linux

rtl/linux/Makefile.fpc

@@ -9,7 +9,7 @@ main=rtl
 loaders=prt0 dllprt0 cprt0 gprt0 cprt21 gprt21
 units=$(SYSTEMUNIT) baseunix strings systhrds objpas syscall unixutil \
       heaptrc lineinfo \
-      $(LINUXUNIT) unix initc $(CPU_UNITS) \
+      $(LINUXUNIT1) unix $(LINUXUNIT2) initc $(CPU_UNITS) \
       dos crt objects printer ggigraph \
       sysutils typinfo math varutils \
       charset ucomplex getopts \
@@ -61,11 +61,13 @@ UNITPREFIX=rtl
 
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
-LINUXUNIT=linux
+LINUXUNIT1=
+LINUXUNIT2=linux oldlinux
 PRT0=prt0
 else
 SYSTEMUNIT=syslinux
-LINUXUNIT=linux
+LINUXUNIT1=linux
+LINUXUNIT2=
 PRT0=prt0_10
 override FPCOPT+=-dUNIX
 endif

rtl/unix/ports.pp

@@ -61,49 +61,52 @@ var
 
 implementation
 
-uses unix;
+uses x86;
 
 { to give easy port access like tp with port[] }
 
 procedure tport.writeport(p : Longint;data : byte);
 
 begin
-  unix.writeport (p,data)
+  x86.writeport (p,data)
 end;
 
 function tport.readport(p : Longint) : byte;
 
 begin
-  readport := unix.readportb (p);
+  readport := x86.readportb (p);
 end;
 
 procedure tportw.writeport(p : longint;data : word);
 
 begin
-  unix.writeport (p,data)
+  x86.writeport (p,data)
 end;
 
 function tportw.readport(p : longint) : word;
 
 begin
-  readport := unix.readportw(p);
+  readport := x86.readportw(p);
 end;
 
 procedure tportl.writeport(p : longint;data : longint);
 
 begin
-  unix.writeport (p,data)
+  x86.writeport (p,data)
 end;
 
 function tportl.readport(p : longint) : longint;
 
 begin
-  readPort := Unix.readportl(p);
+  readPort := x86.readportl(p);
 end;
 
 end.
   $Log$
-  Revision 1.4  2002-09-07 16:01:27  peter
+  Revision 1.5  2003-09-20 18:10:28  marco
+   * More fixes
+
+  Revision 1.4  2002/09/07 16:01:27  peter
     * old logs removed and tabs fixed
 
 }