7 files changed, 113 insertions, 44 deletions

diff --git a/lang/cli/files/patch-pal::unix::arch::i386::context.c b/lang/cli/files/patch-pal::unix::arch::i386::context.c
new file mode 100644
index 000000000000..d2a460cf0d9a
--- /dev/null
+++ b/lang/cli/files/patch-pal::unix::arch::i386::context.c
@@ -0,0 +1,14 @@
+--- pal/unix/arch/i386/context.c.orig	Wed Jun 19 16:43:58 2002
++++ pal/unix/arch/i386/context.c	Tue Jul 30 00:24:36 2002
+@@ -65,8 +65,9 @@
+ 
+         if ((regFd = open(buf, O_RDONLY)) == -1) 
+         {
+-          ASSERT("open() failed %d (%s) \n", errno, strerror(errno));
+-          return FALSE;
++	  bzero(registers, sizeof(struct reg));
++	  bRet = TRUE;
++	  goto EXIT;
+         }
+ 
+         if (lseek(regFd, 0, 0) == -1)
diff --git a/lang/cli/files/patch-pal::unix::configure b/lang/cli/files/patch-pal::unix::configure
index 6995b788073d..61a9eedf897d 100644
--- a/lang/cli/files/patch-pal::unix::configure
+++ b/lang/cli/files/patch-pal::unix::configure
@@ -1,14 +1,10 @@
 
 $FreeBSD$
 
---- pal/unix/configure.orig	Thu Mar 14 20:21:45 2002
-+++ pal/unix/configure	Tue Apr  9 19:29:27 2002
-@@ -1010,17 +1010,17 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- 
--CFLAGS="-Wall -fPIC -fno-builtin -fno-exceptions"
-+CFLAGS="$CFLAGS -Wall -fpic -DPIC -fno-builtin -fno-exceptions -fno-rtti"
+--- pal/unix/configure.orig	Fri Jun 14 06:01:07 2002
++++ pal/unix/configure	Fri Jul 26 17:53:12 2002
+@@ -1037,14 +1037,14 @@
+ CFLAGS="$CFLAGS -Wall -fno-builtin -fno-exceptions -fno-rtti"
  
  if test "$NTDEBUG" != "ntsdnodbg"; then
 -   CFLAGS="$CFLAGS -g"
@@ -23,5 +19,5 @@ $FreeBSD$
 -   CFLAGS="$CFLAGS -O2"
 +#   CFLAGS="$CFLAGS -O2"
  fi
- 
- 
+ CFLAGS_NO_PIC="$CFLAGS"
+ CFLAGS="$CFLAGS -fPIC -DPIC"
diff --git a/lang/cli/files/patch-pal::unix::exception::signal.c b/lang/cli/files/patch-pal::unix::exception::signal.c
deleted file mode 100644
index 895fb61284b6..000000000000
--- a/lang/cli/files/patch-pal::unix::exception::signal.c
+++ /dev/null
@@ -1,27 +0,0 @@
-
-$FreeBSD$
-
---- pal/unix/exception/signal.c	2002/03/28 19:30:03	1.1
-+++ pal/unix/exception/signal.c	2002/03/28 19:33:48
-@@ -31,6 +31,7 @@
- #include <signal.h>
- #include <errno.h>
- #include <string.h>
-+#include <sys/ucontext.h>
- #include <sys/utsname.h>
- #include <fcntl.h>
- #include <unistd.h>
-@@ -601,11 +602,13 @@
-     case T_ARITHTRAP : /* arithmetic trap */
-         TRACE("Trap code T_ARITHTRAP maps to floating point exception...\n");
-         return 0;      /* let the caller pick an exception code */
-+#ifdef T_ASTFLT
-     case T_ASTFLT :    /* system forced exception : ^C, ^\. SIGINT signal 
-                           handler shouldn't be calling this function, since
-                           it doesn't need an exception code */
-         ASSERT("Trap code T_ASTFLT received, shouldn't get here\n");
-         return 0;  
-+#endif
-     case T_PROTFLT :   /* protection fault */
-         TRACE("Trap code T_PROTFLT mapped to EXCEPTION_ACCESS_VIOLATION\n");
-         return EXCEPTION_ACCESS_VIOLATION; 
diff --git a/lang/cli/files/patch-rotorenv::bin::makefile.def b/lang/cli/files/patch-rotorenv::bin::makefile.def
index b5661c9f9919..35cbd93ec48c 100644
--- a/lang/cli/files/patch-rotorenv::bin::makefile.def
+++ b/lang/cli/files/patch-rotorenv::bin::makefile.def
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- rotorenv/bin/makefile.def.orig	Tue Apr  9 21:37:31 2002
-+++ rotorenv/bin/makefile.def	Tue Apr  9 21:45:20 2002
+--- rotorenv/bin/makefile.def.orig	Tue Jul 30 15:43:31 2002
++++ rotorenv/bin/makefile.def	Tue Jul 30 15:44:42 2002
 @@ -340,6 +340,8 @@
  ! else
  !  if "$(TARGETTYPE)" == "DYNLINK"
@@ -12,7 +12,15 @@ $FreeBSD$
  !  endif
  ! endif
  !endif
-@@ -1428,7 +1430,7 @@
+@@ -1421,14 +1423,14 @@
+ 
+ !IFNDEF MSC_WARNING_LEVEL
+ !IFDEF PLATFORM_UNIX
+-MSC_WARNING_LEVEL=-Wall -Wno-non-virtual-dtor -Wno-non-template-friend
++MSC_WARNING_LEVEL=-Wno-non-virtual-dtor -Wno-non-template-friend -w
+ !ELSE
+ MSC_WARNING_LEVEL=/W3
+ !ENDIF
  !ENDIF
  
  !ifdef PLATFORM_UNIX
@@ -21,3 +29,20 @@ $FreeBSD$
  !else
  DEFAULT_MSC_OPT = /Oxs
  !endif
+@@ -1466,14 +1468,14 @@
+ DBGFLAGS=
+ !ELSEIF "$(NTDEBUG)" == "ntsdnodbg"
+ !if "$(PLATFORM_UNIX)" == "1"
+-DBGFLAGS=-g
++DBGFLAGS=
+ !else
+ DBGFLAGS=/Zi
+ !endif
+ TARGET_DBG_DEFINES= -DDEVL=1
+ !ELSEIF "$(NTDEBUG)" == "ntsd"
+ !if "$(PLATFORM_UNIX)" == "1"
+-DBGFLAGS=-g
++DBGFLAGS=
+ !else
+ DBGFLAGS= /Zi
+ !endif
diff --git a/lang/cli/files/patch-rotorenv::bin::rotor_x86mk.inc b/lang/cli/files/patch-rotorenv::bin::rotor_x86mk.inc
new file mode 100644
index 000000000000..c0b51a7809bb
--- /dev/null
+++ b/lang/cli/files/patch-rotorenv::bin::rotor_x86mk.inc
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- rotorenv/bin/rotor_x86mk.inc.orig	Thu Jun 20 02:44:05 2002
++++ rotorenv/bin/rotor_x86mk.inc	Tue Jul 30 15:45:22 2002
+@@ -336,7 +336,7 @@
+ 
+ !IFNDEF COMPILER_WARNINGS
+ !IFDEF PLATFORM_UNIX
+-COMPILER_WARNINGS=-Wall -Wno-non-virtual-dtor -Wno-non-template-friend
++COMPILER_WARNINGS=-Wno-non-virtual-dtor -Wno-non-template-friend -w
+ !ENDIF
+ !ENDIF
+ 
diff --git a/lang/cli/files/patch-rotorenv::bin::sources.cor b/lang/cli/files/patch-rotorenv::bin::sources.cor
new file mode 100644
index 000000000000..ec9fe560c547
--- /dev/null
+++ b/lang/cli/files/patch-rotorenv::bin::sources.cor
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- rotorenv/bin/sources.cor	2002/07/26 16:22:24	1.1
++++ rotorenv/bin/sources.cor	2002/07/26 16:22:32
+@@ -280,7 +280,7 @@
+ !if "$(PLATFORM_UNIX)" != "1"
+ COMPILER_WARNINGS   =/WX /FI$(CORBASE)\src\inc\WarningControl.h
+ !else
+-COMPILER_WARNINGS   = -Wall -Wno-non-virtual-dtor -Wno-non-template-friend
++COMPILER_WARNINGS   = -Wno-non-virtual-dtor -Wno-non-template-friend -w
+ !endif
+ 
+ #######################################################################################
diff --git a/lang/cli/files/patch-tools::build::buildexe.c b/lang/cli/files/patch-tools::build::buildexe.c
index 01bb3af5faae..ec624feba4af 100644
--- a/lang/cli/files/patch-tools::build::buildexe.c
+++ b/lang/cli/files/patch-tools::build::buildexe.c
@@ -1,14 +1,47 @@
 
 $FreeBSD$
 
---- tools/build/buildexe.c	2002/03/29 18:41:58	1.1
-+++ tools/build/buildexe.c	2002/03/29 18:42:44
-@@ -1927,7 +1927,7 @@
+--- tools/build/buildexe.c.orig	Thu Jun 20 02:45:40 2002
++++ tools/build/buildexe.c	Fri Jul 26 22:17:07 2002
+@@ -1152,7 +1152,9 @@
+         } else if (strstr(p, "might be clobbered by `longjmp' or `vfork'")) {
+             // Ignore this warning, too
+             goto notgcc;
+-        }
++        } else if (strstr(p, "from ")) {
++	    goto notgcc;
++	}
+         p1 = strchr(p, ':');
+         if (!p1) {
+             // not of the form "filename:..."
+@@ -1176,6 +1178,20 @@
+         }
+         *p1 = '\0'; // null-terminate the line number
+         p1++;
++
++	// Check that there is a sub-line number appeared in gcc 3.x
++	if (isdigit(*p1)) {
++	    // Skip over the line number and following collon
++	    do {
++		p1++;
++	    } while (isdigit(*p1));
++	    if (*p1 != ':') {
++		// not of the form "filename:linenum:sublinenum:"
++		goto notgcc;
++	    }
++	    p1++;
++	}
++
+         if (TestPrefix(&p1, " warning: ")) {
+           // Found a warning
+           Warning = TRUE;
+@@ -2111,7 +2127,8 @@
          }
  #ifdef __GNUC__
    else
 -    if ( TestPrefixPath( &p, "gcc " )) {
 +    if ( TestPrefixPath( &p, "cc " )) {
-          ThreadState->FilterProc = C510Filter;
++	 {static int i = 0; while (i);}
+          ThreadState->FilterProc = GCCFilter;
           ThreadState->ChildFlags = 0;
           if ( strstr( p, "-Wall" ) != NULL || strstr( p, "-Werror" ) != NULL) {