changeset 2374:ce332a8436ec

Summary: Correct 'zero' build failures
author kurt
date Thu, 07 Apr 2011 23:16:33 -0400
parents ea3fbdac4cdc
children 34736b0e59c1
files src/cpu/zero/vm/globals_zero.hpp src/cpu/zero/vm/methodHandles_zero.cpp src/cpu/zero/vm/relocInfo_zero.cpp
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/zero/vm/globals_zero.hpp	Mon Apr 04 22:44:30 2011 -0700
+++ b/src/cpu/zero/vm/globals_zero.hpp	Thu Apr 07 23:16:33 2011 -0400
@@ -58,4 +58,6 @@
 define_pd_global(bool,  UseMembar,            false);
 #endif
 
+// GC Ergo Flags
+define_pd_global(intx, CMSYoungGenPerWorker, 16*M);  // default max size of CMS young gen, per GC worker thread
 #endif // CPU_ZERO_VM_GLOBALS_ZERO_HPP
--- a/src/cpu/zero/vm/methodHandles_zero.cpp	Mon Apr 04 22:44:30 2011 -0700
+++ b/src/cpu/zero/vm/methodHandles_zero.cpp	Thu Apr 07 23:16:33 2011 -0400
@@ -33,6 +33,6 @@
 }
 
 void MethodHandles::generate_method_handle_stub(MacroAssembler*          masm,
-                                                MethodHandles::EntryKind ek, TRAPS) {
+                                                MethodHandles::EntryKind ek) {
   ShouldNotCallThis();
 }
--- a/src/cpu/zero/vm/relocInfo_zero.cpp	Mon Apr 04 22:44:30 2011 -0700
+++ b/src/cpu/zero/vm/relocInfo_zero.cpp	Thu Apr 07 23:16:33 2011 -0400
@@ -31,7 +31,7 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/safepoint.hpp"
 
-void Relocation::pd_set_data_value(address x, intptr_t o) {
+void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
   ShouldNotCallThis();
 }