--- src/BASE_Math.cxx.orig	Thu Dec  3 00:23:58 1998
+++ src/BASE_Math.cxx	Fri Dec  4 20:50:43 1998
@@ -43,7 +43,7 @@
 
 //______________________________________________________________________________
 #if (defined(sun) && !defined(R__I386) && !defined(__SunOS_5_6)) || \
-    (defined(__OPTIMIZE__) && \
+    (defined(__OPTIMIZE__) && !defined(R__MKLINUX) && \
      (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 7)))
    extern "C" void sincos(Double_t, Double_t*, Double_t*);
 #else
--- src/Makefile.mklinux.orig	Fri Dec  4 18:54:21 1998
+++ src/Makefile.mklinux	Fri Dec  4 21:04:26 1998
@@ -4,11 +4,13 @@
 
 CXX           = g++
 CC            = gcc
-CXXFLAGS      = -Wall -fsigned-char -fPIC -DR__GLIBC \
+CXXFLAGS      = -Wall -fsigned-char -fno-rtti -fno-exceptions \
+		-fPIC -DR__GLIBC \
                 -I/usr/X11/include/  -I/usr/include/g++/
 CFLAGS        = -Wall -fPIC -fsigned-char -DR__GLIBC \
                 -I/usr/X11/include/  -I/usr/include/g++/
-CINTCXXFLAGS  = -Wall -fPIC -fsigned-char -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
+CINTCXXFLAGS  = -Wall -fPIC -fsigned-char -fno-rtti -fno-exceptions \
+		-DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
                 -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO \
                 -I/usr/include/g++/
 CINTCFLAGS    = -Wall -fPIC -fsigned-char -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
@@ -16,13 +18,13 @@
 OPT           = -O2
 NOOPT         =
 LD            = g++
-LDFLAGS       = $(OPT)
+LDFLAGS       = $(OPT) -rdynamic
 SOFLAGS       = -shared -Wl,-soname,
 SOEXT         = so
-SYSLIBS       = -lg++ -lm -ldl
-SYSXLIBS      = -L/usr/X11R6/lib -lX11 -lSM -lICE -lg++ -lm -ldl
-XLIBS         = -L/usr/X11R6/lib -lX11 -lSM -lICE -lXpm -lg++
-CILIBS        = -lm -ltermcap -lbsd -ldl -lg++
+SYSLIBS       = -lm -ldl
+SYSXLIBS      = -L/usr/X11R6/lib -lX11 -lSM -lICE -lm -ldl
+XLIBS         = -L/usr/X11R6/lib -lX11 -lSM -lICE -lXpm
+CILIBS        = -lm -ltermcap -lbsd -ldl
 
 
 
--- src/ROOTX_rootx.cxx.orig	Sat Nov 28 20:30:35 1998
+++ src/ROOTX_rootx.cxx	Fri Dec  4 20:47:41 1998
@@ -17,7 +17,6 @@
 // (depending on the platform).                                         //
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -47,6 +46,9 @@
         extern "C" {
 # endif
 # include <utmp.h>
+# if defined(__linux) && defined(__powerpc) && (__GNUC_MINOR__ < 90)
+}
+# endif
 # define STRUCT_UTMP struct utmp
 # endif
 #endif
--- src/UNIX_UnixSystem.cxx.orig	Thu Dec  3 02:04:17 1998
+++ src/UNIX_UnixSystem.cxx	Fri Dec  4 20:47:41 1998
@@ -167,6 +167,9 @@
         extern "C" {
 #endif
 #include <utmp.h>
+#if defined(R__MKLINUX) && !defined(R__PPCEGCS)
+}
+#endif
 #define STRUCT_UTMP struct utmp
 #endif
 #if !defined(UTMP_FILE) && defined(_PATH_UTMP)      // 4.4BSD
@@ -188,6 +191,10 @@
 
 const char *kServerPath     = "/tmp";
 const char *kProtocolName   = "tcp";
+
+#if defined(R__MKLINUX)
+#define socklen_t size_t
+#endif
 
 
 //______________________________________________________________________________
--- src/BASE_MapFile.cxx.ORIG	Thu Feb 11 00:15:47 1999
+++ src/BASE_MapFile.cxx	Fri Feb 12 12:54:48 1999
@@ -107,7 +107,7 @@
 #include <sys/ipc.h>
 #include <sys/sem.h>
 #if defined(R__HPUX) || defined (R__ALPHA) || defined (R__SOLARIS) || \
-    defined(R__AIX) || defined(R__HIUX) || defined (R__MKLINUX)
+    defined(R__AIX) || defined(R__HIUX)
 union semun {
    int val;                      // value for SETVAL
    struct semid_ds *buf;         // buffer for IPC_STAT & IPC_SET