Wed, 31 Mar 2010 16:29:10 -0700
Merge
1.1 --- a/src/cpu/zero/vm/methodHandles_zero.cpp Wed Mar 31 11:54:03 2010 -0700 1.2 +++ b/src/cpu/zero/vm/methodHandles_zero.cpp Wed Mar 31 16:29:10 2010 -0700 1.3 @@ -1,6 +1,6 @@ 1.4 /* 1.5 * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. 1.6 - * Copyright 2009 Red Hat, Inc. 1.7 + * Copyright 2009, 2010 Red Hat, Inc. 1.8 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.9 * 1.10 * This code is free software; you can redistribute it and/or modify it 1.11 @@ -23,4 +23,10 @@ 1.12 * 1.13 */ 1.14 1.15 -// This file is intentionally empty 1.16 +#include "incls/_precompiled.incl" 1.17 +#include "incls/_methodHandles_zero.cpp.incl" 1.18 + 1.19 +void MethodHandles::generate_method_handle_stub(MacroAssembler* masm, 1.20 + MethodHandles::EntryKind ek) { 1.21 + ShouldNotCallThis(); 1.22 +}
2.1 --- a/src/cpu/zero/vm/stubRoutines_zero.hpp Wed Mar 31 11:54:03 2010 -0700 2.2 +++ b/src/cpu/zero/vm/stubRoutines_zero.hpp Wed Mar 31 16:29:10 2010 -0700 2.3 @@ -1,6 +1,6 @@ 2.4 /* 2.5 * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. 2.6 - * Copyright 2007, 2008, 2009 Red Hat, Inc. 2.7 + * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. 2.8 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.9 * 2.10 * This code is free software; you can redistribute it and/or modify it 2.11 @@ -41,6 +41,10 @@ 2.12 code_size2 = 0 // if these are too small. Simply increase 2.13 }; // them if that happens. 2.14 2.15 + enum method_handles_platform_dependent_constants { 2.16 + method_handles_adapters_code_size = 0 2.17 + }; 2.18 + 2.19 #ifdef IA32 2.20 class x86 { 2.21 friend class VMStructs;