Upgrade to 20021101 release (aka 1.0), which fixes compilation on

recent FreeBSD versions and allows to remove all of the gcc 3.x
fixes. sscli now supports Darwin/ppc, so that it might be possible
to port it to FreeBSD/ppc once it is available.

9 files changed, 96 insertions, 85 deletions

diff --git a/lang/cli/files/patch-configure b/lang/cli/files/patch-configure
new file mode 100644
index 000000000000..67a1adac94cf
--- /dev/null
+++ b/lang/cli/files/patch-configure
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- configure	2003/04/25 08:43:30	1.1
++++ configure	2003/04/25 08:44:09
+@@ -2041,7 +2041,7 @@
+ 
+ PTHREAD_OPTIONS=
+ 
+-CFLAGS="-g -O2 -Wall -fPIC -DPIC"
++CFLAGS="$CFLAGS -Wall -fPIC -DPIC"
+ 
+ if test "$FEATURE_CASE_SENSITIVE_FS" = "1"; then
+     CFLAGS="$CFLAGS -DFEATURE_CASE_SENSITIVE_FILESYSTEM"
diff --git a/lang/cli/files/patch-env.sh b/lang/cli/files/patch-env.sh
index ac71a056bb81..8c821a533d2f 100644
--- a/lang/cli/files/patch-env.sh
+++ b/lang/cli/files/patch-env.sh
@@ -1,29 +1,29 @@
 
 $FreeBSD$
 
---- env.sh.orig	Fri Mar 22 03:47:54 2002
-+++ env.sh	Tue Apr 16 18:38:49 2002
-@@ -69,7 +69,15 @@
- export DEBUGGING_SUPPORTED_BUILD=1
- export SVR_WKS_DIRS=wks
+--- env.sh.orig	Sat Nov  2 04:21:57 2002
++++ env.sh	Fri Apr 25 10:16:50 2003
+@@ -188,7 +188,15 @@
+     CSC_COMPILE_FLAGS="${CSC_COMPILE_FLAGS} /d:FEATURE_CASE_SENSITIVE_FILESYSTEM"
+ fi
  
 -if test X"$1" = "Xfree"
 +if test X"$1" = "Xretail"
 +then
 +echo "Retail Environment"
-+export DDKBUILDENV=free
-+export C_DEFINES="${C_DEFINES} -DNTMAKEENV -DNDEBUG -DPERF_TRACKING"
-+export BUILD_ALT_DIR=r
-+export TARGETCOMPLUS="${ROTOR_DIR}/build/v1.x86fre.rotor"
-+export NTDEBUG=retail
++    DDKBUILDENV=free
++    C_DEFINES="${C_DEFINES} -DNTMAKEENV -DNDEBUG -DPERF_TRACKING"
++    BUILD_ALT_DIR=r
++    TARGETCOMPLUS="${ROTOR_DIR}/build/v1.x86fre.rotor"
++    NTDEBUG=retail
 +else if test X"$1" = "Xfree"
  then
- echo "Free Environment"
- export DDKBUILDENV=free
-@@ -93,6 +101,7 @@
- export BUILD_ALT_DIR=df
- export TARGETCOMPLUS="${ROTOR_DIR}/build/v1.x86fstchk.rotor"
- export NTDEBUG=ntsd
+     echo "Free Environment"
+     DDKBUILDENV=free
+@@ -213,6 +221,7 @@
+     BUILD_ALT_DIR=df
+     TARGETCOMPLUS="${ROTOR_DIR}/build/v1.${PROCESSOR_ARCHITECTURE}fstchk.rotor"
+     NTDEBUG=ntsd
 +fi
  fi
  fi
diff --git a/lang/cli/files/patch-makefile.common.in b/lang/cli/files/patch-makefile.common.in
index 002f08243d2c..356714350b37 100644
--- a/lang/cli/files/patch-makefile.common.in
+++ b/lang/cli/files/patch-makefile.common.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- makefile.common.in.orig	Fri Mar 22 03:48:17 2002
-+++ makefile.common.in	Fri Mar 29 00:54:26 2002
-@@ -38,7 +38,7 @@
- CPP = @CPP@
- # The flags should be adjusted based on the compiler, but we
- # only support GCC so this will do for now.
--CFLAGS = -g -O2 -Wall
-+CFLAGS ?= -g -O2 -Wall
+--- makefile.common.in	2003/04/25 08:00:00	1.1
++++ makefile.common.in	2003/04/25 08:00:14
+@@ -45,7 +45,7 @@
+ PAL_LIB_FILE = $(LIB_PREFIX)$(PAL_LIB)$(LIB_SUFFIX)
+ ROTOR_LIBS = -l$(PAL_LIB)
+ LDFLAGS = -L$(TARGETCOMPLUS)
+-GCC_LIB = @GCC_LIB@
++GCC_LIB = %%GCC_LIB%%
+ LINKER_FLAGS = @LINKER_FLAGS@
  
- # Linker information
- PAL_LIB = rotor_pal
+ # The C runtime static libraries that we need to get an application
diff --git a/lang/cli/files/patch-pal::unix::configure b/lang/cli/files/patch-pal::unix::configure
index 61a9eedf897d..d0125df24465 100644
--- a/lang/cli/files/patch-pal::unix::configure
+++ b/lang/cli/files/patch-pal::unix::configure
@@ -1,23 +1,36 @@
 
 $FreeBSD$
 
---- 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"
+--- pal/unix/configure.orig	Thu Oct 31 03:00:09 2002
++++ pal/unix/configure	Fri Apr 25 10:33:47 2003
+@@ -1899,17 +1899,17 @@
+ fi
  
  if test "$NTDEBUG" != "ntsdnodbg"; then
--   CFLAGS="$CFLAGS -g"
-+#   CFLAGS="$CFLAGS -g"
+-    CFLAGS="$CFLAGS -g"
++#    CFLAGS="$CFLAGS -g"
  fi
  
+ if test "$BUILD_ALT_DIR" = "d"; then
+-    CFLAGS="$CFLAGS -O0 -finline"
++    CFLAGS="$CFLAGS -finline"
+ fi
  if test "$BUILD_ALT_DIR" = "df"; then
--   CFLAGS="$CFLAGS -O2"
-+#   CFLAGS="$CFLAGS -O2"
+-    CFLAGS="$CFLAGS -O2"
++#    CFLAGS="$CFLAGS -O2"
  fi
  if test "$BUILD_ALT_DIR" = "r"; then
--   CFLAGS="$CFLAGS -O2"
-+#   CFLAGS="$CFLAGS -O2"
+-    CFLAGS="$CFLAGS -O2"
++#    CFLAGS="$CFLAGS -O2"
  fi
  CFLAGS_NO_PIC="$CFLAGS"
- CFLAGS="$CFLAGS -fPIC -DPIC"
+ 
+@@ -4898,7 +4898,7 @@
+ fi
+ done
+ 
+-for ac_func in setcontext getcontext copysign
++for ac_func in setcontext copysign
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:4904: checking for $ac_func" >&5
diff --git a/lang/cli/files/patch-pal::unix::startup::makefile.in b/lang/cli/files/patch-pal::unix::startup::makefile.in
deleted file mode 100644
index 43cae2f41400..000000000000
--- a/lang/cli/files/patch-pal::unix::startup::makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- pal/unix/startup/makefile.in.orig	Fri Mar 22 03:48:22 2002
-+++ pal/unix/startup/makefile.in	Wed Apr 10 12:14:41 2002
-@@ -50,6 +50,8 @@
-     OPTCFLAGS+= -g
- .endif
- 
-+OPTCFLAGS=$(CFLAGS)
-+
- #################
- # Targets
- 
diff --git a/lang/cli/files/patch-rotorenv::bin::rotor_x86mk.inc b/lang/cli/files/patch-rotorenv::bin::rotor_x86mk.inc
index c0b51a7809bb..df4ccb7c9e19 100644
--- a/lang/cli/files/patch-rotorenv::bin::rotor_x86mk.inc
+++ b/lang/cli/files/patch-rotorenv::bin::rotor_x86mk.inc
@@ -1,9 +1,18 @@
 
 $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 @@
+--- rotorenv/bin/rotor_x86mk.inc.orig	Sat Nov  2 04:22:40 2002
++++ rotorenv/bin/rotor_x86mk.inc	Fri Apr 25 11:06:16 2003
+@@ -329,7 +329,7 @@
+ CC_LIB              =$(GCC_LIB_DIR)/libgcc.a $(GCC_EH_LIB) \
+                      /usr/local/lib/libstdc++.a
+ !else
+-CC_LIB              =/usr/lib/libgcc.a
++CC_LIB              =%%GCC_LIB%%
+ !endif
+ !else
+ ASM_SUFFIX          =asm
+@@ -362,7 +362,7 @@
  
  !IFNDEF COMPILER_WARNINGS
  !IFDEF PLATFORM_UNIX
diff --git a/lang/cli/files/patch-tools::build::buildexe.c b/lang/cli/files/patch-tools::build::buildexe.c
index ec624feba4af..db12a47a2402 100644
--- a/lang/cli/files/patch-tools::build::buildexe.c
+++ b/lang/cli/files/patch-tools::build::buildexe.c
@@ -1,11 +1,11 @@
 
 $FreeBSD$
 
---- 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
+--- tools/build/buildexe.c.orig	Sat Nov  2 04:25:49 2002
++++ tools/build/buildexe.c	Fri Apr 25 10:23:19 2003
+@@ -1170,7 +1170,9 @@
+         } else if (strstr(p, "invalid offsetof from non-POD type")) {
+             // Ignore this
              goto notgcc;
 -        }
 +        } else if (strstr(p, "from ")) {
@@ -14,7 +14,7 @@ $FreeBSD$
          p1 = strchr(p, ':');
          if (!p1) {
              // not of the form "filename:..."
-@@ -1176,6 +1178,20 @@
+@@ -1194,6 +1196,20 @@
          }
          *p1 = '\0'; // null-terminate the line number
          p1++;
@@ -35,13 +35,3 @@ $FreeBSD$
          if (TestPrefix(&p1, " warning: ")) {
            // Found a warning
            Warning = TRUE;
-@@ -2111,7 +2127,8 @@
-         }
- #ifdef __GNUC__
-   else
--    if ( TestPrefixPath( &p, "gcc " )) {
-+    if ( TestPrefixPath( &p, "cc " )) {
-+	 {static int i = 0; while (i);}
-          ThreadState->FilterProc = GCCFilter;
-          ThreadState->ChildFlags = 0;
-          if ( strstr( p, "-Wall" ) != NULL || strstr( p, "-Werror" ) != NULL) {
diff --git a/lang/cli/files/patch-tools::cppmunge::makefile b/lang/cli/files/patch-tools::cppmunge::makefile
deleted file mode 100644
index 09565c91cd53..000000000000
--- a/lang/cli/files/patch-tools::cppmunge::makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- tools/cppmunge/makefile.orig	Fri Mar 22 03:49:22 2002
-+++ tools/cppmunge/makefile	Wed Apr 10 12:10:29 2002
-@@ -17,7 +17,8 @@
- # makefile for cppmunge
- # ============================================================================
- 
--CFLAGS = -g -Wall -O2
-+CFLAGS ?= -g -Wall -O2
-+CFLAGS += -fno-builtin -fno-exceptions -fno-rtti
- TARGET_NAME = $(TARGETCOMPLUS)/cppmunge
- 
- SOURCES=cppmunge.c
diff --git a/lang/cli/files/patch-tools::cppmunge::makefile.in b/lang/cli/files/patch-tools::cppmunge::makefile.in
new file mode 100644
index 000000000000..0bd5ad79cc49
--- /dev/null
+++ b/lang/cli/files/patch-tools::cppmunge::makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- tools/cppmunge/makefile.in	2003/04/25 07:24:34	1.1
++++ tools/cppmunge/makefile.in	2003/04/25 07:25:00
+@@ -18,7 +18,7 @@
+ # ============================================================================
+ 
+ BIGENDIAN=@BIGENDIAN@
+-CFLAGS = -g -Wall -O2 $(BIGENDIAN)
++CFLAGS += -fno-builtin -fno-exceptions -fno-rtti $(BIGENDIAN)
+ TARGET_NAME = $(TARGETCOMPLUS)/cppmunge
+ CC = @CC@
+