Mercurial > hg > release > icedtea6-1.11

changeset 1935:1365cc7a840d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with main repo
author Deepak Bhole <dbhole@redhat.com>
date Tue, 23 Feb 2010 11:46:21 -0500
parents 6692226bafb6 (current diff) 9748785082e5 (diff)
children a9569f1ff015
files ChangeLog
diffstat 5 files changed, 19 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Feb 22 17:53:44 2010 -0500
+++ b/ChangeLog	Tue Feb 23 11:46:21 2010 -0500
@@ -1,9 +1,20 @@
-2010-02-22  Deepak Bhole <dbhole@redhat.com>
+2010-02-23  Deepak Bhole <dbhole@redhat.com>
 
 	* Makefile.am: Provide JDK_UPDATE_VERSION when compiling the plugin
 	* plugin/icedteanp/IcedTeaNPPlugin.cc: Use JDK_UPDATE_VERSION to set the
 	jpi version.
 
+2010-02-23  Gary Benson  <gbenson@redhat.com>
+
+	* ports/hotspot/make/linux/makefiles/shark.make: Update copyright.
+	* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+
+2010-02-23  Gary Benson  <gbenson@redhat.com>
+
+	* ports/hotspot/make/linux/makefiles/shark.make: Comment fix.
+
 2010-02-22  Deepak Bhole <dbhole@redhat.com>
 
 	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Centralized
--- a/ports/hotspot/make/linux/makefiles/shark.make	Mon Feb 22 17:53:44 2010 -0500
+++ b/ports/hotspot/make/linux/makefiles/shark.make	Tue Feb 23 11:46:21 2010 -0500
@@ -1,6 +1,6 @@
 #
 # Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
-# Copyright 2008 Red Hat, Inc.
+# Copyright 2008, 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,7 +23,7 @@
 #  
 #
 
-# Sets make macros for making shark version of VM
+# Sets make macros for making Shark version of VM
 
 TYPE = SHARK
 
--- a/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp	Mon Feb 22 17:53:44 2010 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp	Tue Feb 23 11:46:21 2010 -0500
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2008 Red Hat, Inc.
+ * Copyright 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
@@ -23,10 +23,8 @@
  *  
  */
 
-//
-// Sets the default values for platform dependent flags used by the
-// Shark compiler.
-//
+// Set the default values for platform dependent flags used by the
+// Shark compiler.  See globals.hpp for details of what they do.
 
 define_pd_global(bool,  BackgroundCompilation,        true );
 define_pd_global(bool,  UseTLAB,                      true );
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Mon Feb 22 17:53:44 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Tue Feb 23 11:46:21 2010 -0500
@@ -1,6 +1,6 @@
 /*
  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2008, 2009 Red Hat, Inc.
+ * Copyright 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
--- a/ports/hotspot/src/share/vm/shark/sharkContext.hpp	Mon Feb 22 17:53:44 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkContext.hpp	Tue Feb 23 11:46:21 2010 -0500
@@ -1,6 +1,6 @@
 /*
  * Copyright 1999-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