diff -r dfe27f03244a -r e9ff18c4ace7 src/share/vm/utilities/globalDefinitions.cpp
--- a/src/share/vm/utilities/globalDefinitions.cpp	Tue Jun 01 11:48:33 2010 -0700
+++ b/src/share/vm/utilities/globalDefinitions.cpp	Wed Jun 02 22:45:42 2010 -0700
@@ -34,6 +34,18 @@
 int BytesPerHeapOop    = 0;
 int BitsPerHeapOop     = 0;
 
+// Object alignment, in units of HeapWords.
+// Defaults are -1 so things will break badly if incorrectly initialized.
+int MinObjAlignment            = -1;
+int MinObjAlignmentInBytes     = -1;
+int MinObjAlignmentInBytesMask = 0;
+
+int LogMinObjAlignment         = -1;
+int LogMinObjAlignmentInBytes  = -1;
+
+// Oop encoding heap max
+uint64_t OopEncodingHeapMax = 0;
+
 void basic_fatal(const char* msg) {
   fatal(msg);
 }