. Backport some fixes from 1.4 for the HotSpot Server VM when compiled

  under gcc 3.4.  In particular, this fixes some places where an enumerated
  type is assumed to be the same width as an int (which the standard
  doesn't guarantee and gcc 3.4 now enforces).

  For full details, see the log for the jdk14 equivalent changes.

2 files changed, 56 insertions, 0 deletions

diff --git a/java/jdk13/files/patch-bytecodes.hpp b/java/jdk13/files/patch-bytecodes.hpp
new file mode 100644
index 000000000000..003ab81d3314
--- /dev/null
+++ b/java/jdk13/files/patch-bytecodes.hpp
@@ -0,0 +1,22 @@
+$FreeBSD$
+
+--- ../../hotspot1.3.1/src/share/vm/interpreter/bytecodes.hpp	11 Jul 2001 21:33:21 -0000	1.1.1.1
++++ ../../hotspot1.3.1/src/share/vm/interpreter/bytecodes.hpp	22 Nov 2004 17:19:42 -0000
+@@ -14,6 +14,7 @@
+ 
+ // CopyrightVersion 1.2
+ 
++#include <limits.h>
+ 
+ // Bytecodes specifies all bytecodes used in the VM and
+ // provides utility functions to get bytecode attributes.
+@@ -279,7 +280,8 @@
+     // Platform specific JVM bytecodes
+     #include "incls/_bytecodes_pd.hpp.incl"
+ 
+-    number_of_codes
++    number_of_codes,
++    WIDTH_HINT = INT_MAX
+   };
+ 
+  private:
diff --git a/java/jdk13/files/patch-shared.hpp b/java/jdk13/files/patch-shared.hpp
new file mode 100644
index 000000000000..d7211f301f35
--- /dev/null
+++ b/java/jdk13/files/patch-shared.hpp
@@ -0,0 +1,34 @@
+$FreeBSD$
+
+--- ../../hotspot1.3.1/src/share/vm/interpreter/shared.hpp	11 Jul 2001 21:33:22 -0000	1.1.1.1
++++ ../../hotspot1.3.1/src/share/vm/interpreter/shared.hpp	22 Nov 2004 17:19:42 -0000
+@@ -35,15 +35,13 @@
+ // to control the C++ namespace.
+ class OptoReg VALUE_OBJ_CLASS_SPEC { 
+  public:
+-  enum Name {
+-    // Chunk 0
++  typedef int Name;
+ #ifdef COMPILER2
+-    Physical = AdlcVMDeps::Physical, // Start of physical regs 
++  static const Name Physical = AdlcVMDeps::Physical; // Start of physical regs
+ #endif
+-    // A few oddballs at the edge of the world
+-    Special = -2,		// All special (not allocated) values
+-    Bad = -1			// Not a register
+-  };
++  // A few oddballs at the edge of the world
++  static const Name Special = -2;	// All special (not allocated) values
++  static const Name Bad = -1;		// Not a register
+ 
+   // Increment a register number.  As in:
+   //    "for ( OptoReg::Name i; i=Control; i = add(i,1) ) ..."
+@@ -64,7 +62,7 @@
+ // when we do not yet know how big the frame will be.
+ class VMReg VALUE_OBJ_CLASS_SPEC { 
+ public:
+-  enum Name { };
++  typedef int Name;
+ };
+ 
+