# HG changeset patch
# User never
# Date 1270078150 25200
# Node ID a04d5732b3561c1807270dbb11f2ac2b9c25047c
# Parent  cca2469087c4fd949006215aa3160a37bbf4830c# Parent  6eae8e0ade26005669e2e479faa7441594b03bdf
Merge

diff -r cca2469087c4 -r a04d5732b356 hotspot/src/cpu/zero/vm/methodHandles_zero.cpp
--- a/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp	Wed Mar 31 11:54:03 2010 -0700
+++ b/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp	Wed Mar 31 16:29:10 2010 -0700
@@ -1,6 +1,6 @@
 /*
  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2009 Red Hat, Inc.
+ * Copyright 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,4 +23,10 @@
  *
  */
 
-// This file is intentionally empty
+#include "incls/_precompiled.incl"
+#include "incls/_methodHandles_zero.cpp.incl"
+
+void MethodHandles::generate_method_handle_stub(MacroAssembler*          masm,
+                                                MethodHandles::EntryKind ek) {
+  ShouldNotCallThis();
+}
diff -r cca2469087c4 -r a04d5732b356 hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp
--- a/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp	Wed Mar 31 11:54:03 2010 -0700
+++ b/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp	Wed Mar 31 16:29:10 2010 -0700
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008, 2009 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,10 @@
     code_size2 = 0       // if these are too small.  Simply increase
   };                     // them if that happens.
 
+  enum method_handles_platform_dependent_constants {
+    method_handles_adapters_code_size = 0
+  };
+
 #ifdef IA32
   class x86 {
     friend class VMStructs;