# D. Brylow and B. Kuperman
# Purdue University
# 2001 Oct 4
#
#    This patch allows the standard FTP site version of XINU to be compiled
# by a stock installation of RedHat 7.1 Linux.  The result is an a.out format
# XINU kernel, which can be uploaded to backend machines via tftp and executed
# directly.
#    Execute this patch using
#
#	patch -p0 < xinu-linux.patch
#
# in the top-level directory of the unpacked XINU tarball.

--- compile/Makefile	Sat Nov 25 16:36:15 1995
+++ compile/Makefile	Thu Oct  4 00:08:29 2001
@@ -6,10 +6,10 @@
 CFLAGS	= -c -traditional ${DEFS} ${INCLUDE}
 SDEFS	= -I../h
 
-CC      =       /usr/local/gnu/gcc
-CPP     =       /usr/local/gnu/gcc -E
-AS      =       /usr/local/gnu/gas-2.5.2
-LD      =       /usr/ccs/bin/ld
+CC      =       /usr/bin/gcc
+CPP     =       /usr/bin/gcc -E
+AS      =       /usr/bin/as
+LD      =       /usr/bin/ld
 LIB     =       ../lib
 AWK	=	awk
 XINU    =       ./pcxinu
@@ -342,11 +342,14 @@
 
 all: xinu FRC
 
-xinu: Makefile xinu.mapfile Configuration ${OBJ} ${XOBJ} ${LIB}/libxc.a
-	$(LD) -dn -M xinu.mapfile -e start ${XOBJ} ${OBJ} \
+mkboot: mkboot.c
+	${CC} -o mkboot mkboot.c
+
+xinu: Makefile xinu.mapfile Configuration ${OBJ} ${XOBJ} ${LIB}/libxc.a mkboot
+	$(LD) -dn -Ttext 0x0 -n -e start ${XOBJ} ${OBJ} ${LIB}/libxc.a \
 	${LIB}/libxc.a -o ${XINU}.elf
 	./mkboot ${XINU}.elf ${XINU}
-	rcp ${XINU} lin@balan.cs:/tftpboot/pcxinu.emu
+#	rcp ${XINU} lin@balan.cs:/tftpboot/pcxinu.emu
 
 install: xinu FRC
 	cp xinu /floppy/xinu
--- compile/mkboot.c	Sat Nov 25 14:58:36 1995
+++ compile/mkboot.c	Thu Oct  4 00:10:39 2001
@@ -1,4 +1,4 @@
-#include <sys/elf.h>
+#include <elf.h>
 #include <sys/fcntl.h>
 
 Elf32_Ehdr elfhdr;
--- compile/mkvers.sh	Sat Nov 25 16:28:11 1995
+++ compile/mkvers.sh	Thu Oct  4 00:12:24 2001
@@ -5,6 +5,5 @@
 fi
 USER=`whoami`
 HOST=`hostname`
-HOST=`basename $HOST .purdue.edu`
 VN=`cat vn`
 echo "#$VN ("$USER"@"$HOST") "`date` > version
--- lib/libxc/Makefile	Sat Nov 25 14:48:15 1995
+++ lib/libxc/Makefile	Thu Oct  4 00:13:34 2001
@@ -2,11 +2,11 @@
 #  Make the Xinu version of the C run-time support library
 #
 
-CC	=	/usr/local/gnu/gcc
-AS	=	/usr/local/gnu/gas-2.5.2
+CC	=	/usr/bin/gcc
+AS	=	/usr/bin/as
 CFLAGS	=	-O -c -I../../h
 SFLAGS	=	-I../../h
-AR	=	/bin/ar
+AR	=	/usr/bin/ar
 LIB	=	..
 
 
--- lib/libxc/ctype_.c	Sat Nov 25 14:48:17 1995
+++ lib/libxc/ctype_.c	Thu Oct  4 00:14:41 2001
@@ -1,4 +1,4 @@
-#include	<ctype.h>
+#include	<linux/ctype.h>
 
 char _ctype_[] = {
 	0,
@@ -8,8 +8,8 @@
 	_C,	_C,	_C,	_C,	_C,	_C,	_C,	_C,
 	_S,	_P,	_P,	_P,	_P,	_P,	_P,	_P,
 	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P,
-	_N,	_N,	_N,	_N,	_N,	_N,	_N,	_N,
-	_N,	_N,	_P,	_P,	_P,	_P,	_P,	_P,
+	_D,	_D,	_D,	_D,	_D,	_D,	_D,	_D,
+	_D,	_D,	_P,	_P,	_P,	_P,	_P,	_P,
 	_P,	_U|_X,	_U|_X,	_U|_X,	_U|_X,	_U|_X,	_U|_X,	_U,
 	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U,
 	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U,
--- shell/Makefile	Sat Nov 25 16:36:20 1995
+++ shell/Makefile	Thu Oct  4 00:08:29 2001
@@ -6,9 +6,9 @@
 DEFS =
 INCLUDE = -I../h
 CFLAGS	=  ${DEFS} ${INCLUDE} -g -c
-CC      = /usr/local/gnu/gcc
-LD      = /usr/ccs/bin/ld
-MAKETD  = /p/X11R6/makedepend
+CC      = /usr/bin/gcc
+LD      = /usr/bin/ld
+MAKETD  = /usr/X11R6/bin/makedepend
 AR	= ar
 
 .c.o:
--- sys/intr.S	Sat Nov 25 14:45:12 1995
+++ sys/intr.S	Thu Oct  4 00:08:29 2001
@@ -17,7 +17,7 @@
  */
 Xtrap:
 	call	trap
-	movw	$OCW1_2,%al
+	movb	$OCW1_2,%al
 	outb	%al,$EOI
 	popl	%eax		/* exception # */
 	testl	$35,%eax