JDK 1.6.0 patchset 1 "Brumby"

[Jung-uk Kim]

On Thursday 09 August 2007 04:44 pm, Jung-uk Kim wrote:
> On Sunday 05 August 2007 11:34 am, Rene Ladan wrote:
> > I tried installing this on my i386 FreeBSD-CURRENT SMP box
> > (2007-08-04 06:32 UTC) using diablo-jdk15 as bootstrap.  The
> > build first failed because of GCC 4.2 warnings-as-errors about
> > deprecated string conversions.  After commenting out a -Werror in
> > work/hotspot/build/bsd/makefiles/gcc.make , the hotspot-fastdebug
> > server built fine, but it failed in test_gamma.  I've attached
> > the hs_err log.
>
> The attached patch should fix the build problem on -CURRENT.

Sorry, the attachment was removed.  Re-attaching...

Jung-uk Kim
-------------- next part --------------
--- ../../hotspot/src/os/bsd/vm/jvm_bsd.cpp	28 Mar 2007 04:52:29 -0000	1.1
+++ ../../hotspot/src/os/bsd/vm/jvm_bsd.cpp	9 Aug 2007 16:12:56 -0000	1.3
@@ -116,8 +116,8 @@
 */
 
 struct siglabel {
-  char *name;
-  int   number;
+  const char *name;
+  int	number;
 };
 
 struct siglabel siglabels[] =
--- ../../hotspot/src/os/bsd/vm/vmError_bsd.cpp	28 Mar 2007 04:52:29 -0000	1.1
+++ ../../hotspot/src/os/bsd/vm/vmError_bsd.cpp	9 Aug 2007 15:52:44 -0000	1.3
@@ -30,7 +30,7 @@
 // Unlike system(), this function can be called from signal handler. It
 // doesn't block SIGINT et al.
 int VMError::fork_and_exec(char* cmd) {
-  char * argv[4];
+  const char *argv[4];
   argv[0] = "sh";
   argv[1] = "-c";
   argv[2] = cmd;
--- ../../hotspot/src/share/vm/opto/escape.cpp	21 Jul 2006 17:22:54 -0000	1.1.1.2
+++ ../../hotspot/src/share/vm/opto/escape.cpp	9 Aug 2007 16:24:59 -0000	1.3
@@ -35,21 +35,21 @@
 }
 
 #ifndef PRODUCT
-static char *node_type_names[] = {
+static const char *node_type_names[] = {
   "UnknownType",
   "JavaObject",
   "LocalVar",
   "Field"
 };
 
-static char *esc_names[] = {
+static const char *esc_names[] = {
   "UnknownEscape",
   "NoEscape     ",
   "ArgEscape    ",
   "GlobalEscape "
 };
 
-static char *edge_type_suffix[] = {
+static const char *edge_type_suffix[] = {
  "?", // UnknownEdge
  "P", // PointsToEdge
  "D", // DeferredEdge