/hg/icedtea6: 2009-11-18 Gary Benson <gbenson at redhat.com>

[gbenson at icedtea.classpath.org]

changeset 1daa0bb701a8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1daa0bb701a8
author: Gary Benson <gbenson at redhat.com>
date: Wed Nov 18 14:24:09 2009 +0000

	2009-11-18 Gary Benson <gbenson at redhat.com>

	 *
	ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp:
		* ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp:
		* ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp: Non-
	code cleanups to better match upstream Zero.


diffstat:

4 files changed, 10 insertions(+), 6 deletions(-)
ChangeLog                                                  |    7 +++++++
ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp |    2 --
ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp       |    5 ++---
ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp       |    2 +-

diffs (51 lines):

diff -r 86479d159627 -r 1daa0bb701a8 ChangeLog
--- a/ChangeLog	Thu Nov 12 16:39:22 2009 +0100
+++ b/ChangeLog	Wed Nov 18 14:24:09 2009 +0000
@@ -1,3 +1,10 @@ 2009-11-12  Xerxes RÃ¥nby  <xerxes at zafen
+2009-11-18  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp:
+	* ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp:
+	* ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp:
+	Non-code cleanups to better match upstream Zero.
+
 2009-11-12  Xerxes RÃ¥nby  <xerxes at zafena.se>
 
 	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp
diff -r 86479d159627 -r 1daa0bb701a8 ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp	Thu Nov 12 16:39:22 2009 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp	Wed Nov 18 14:24:09 2009 +0000
@@ -146,5 +146,3 @@
                                                   ((VMJavaVal64*)(addr))->d)
 #define SET_LOCALS_LONG_FROM_ADDR(addr, offset) (((VMJavaVal64*)&locals[-((offset)+1)])->l = \
                                                 ((VMJavaVal64*)(addr))->l)
-
-
diff -r 86479d159627 -r 1daa0bb701a8 ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp	Thu Nov 12 16:39:22 2009 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp	Wed Nov 18 14:24:09 2009 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
  * Copyright 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,5 +23,4 @@
  *
  */
 
-#include "incls/_precompiled.incl"
-#include "incls/_methodHandles_zero.cpp.incl"
+// This file is intentionally empty
diff -r 86479d159627 -r 1daa0bb701a8 ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp	Thu Nov 12 16:39:22 2009 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp	Wed Nov 18 14:24:09 2009 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009 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