From b2fa4708ade8ed5b02d8dfd99e238b6a5d03aadb Mon Sep 17 00:00:00 2001 From: John Cuthbertson Date: Fri, 17 Dec 2010 11:26:53 -0800 Subject: [PATCH 01/12] 7006113: G1: Initialize ReferenceProcessor::_is_alive_non_header field Initialize the _is_alive_non_header field of G1's reference processor with an instance of the G1CMIsAliveClosure. This will stop adding reference objects with live referents to the discovered reference lists unnecessarily. Reviewed-by: tonyp, ysr, jwilhelm, brutisso --- .../gc_implementation/g1/concurrentMark.cpp | 39 +++++++------------ .../gc_implementation/g1/concurrentMark.hpp | 19 +++++++++ .../gc_implementation/g1/g1CollectedHeap.cpp | 4 +- .../gc_implementation/g1/g1CollectedHeap.hpp | 8 +++- 4 files changed, 42 insertions(+), 28 deletions(-) diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp index cea107220ab..d1989d4a24e 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp @@ -1825,23 +1825,11 @@ void ConcurrentMark::completeCleanup() { } } - -class G1CMIsAliveClosure: public BoolObjectClosure { - G1CollectedHeap* _g1; - public: - G1CMIsAliveClosure(G1CollectedHeap* g1) : - _g1(g1) - {} - - void do_object(oop obj) { - assert(false, "not to be invoked"); - } - bool do_object_b(oop obj) { - HeapWord* addr = (HeapWord*)obj; - return addr != NULL && - (!_g1->is_in_g1_reserved(addr) || !_g1->is_obj_ill(obj)); - } -}; +bool G1CMIsAliveClosure::do_object_b(oop obj) { + HeapWord* addr = (HeapWord*)obj; + return addr != NULL && + (!_g1->is_in_g1_reserved(addr) || !_g1->is_obj_ill(obj)); +} class G1CMKeepAliveClosure: public OopClosure { G1CollectedHeap* _g1; @@ -1896,16 +1884,15 @@ void ConcurrentMark::weakRefsWork(bool clear_all_soft_refs) { rp->setup_policy(clear_all_soft_refs); assert(_markStack.isEmpty(), "mark stack should be empty"); - G1CMIsAliveClosure g1IsAliveClosure (g1h); - G1CMKeepAliveClosure g1KeepAliveClosure(g1h, this, nextMarkBitMap()); + G1CMIsAliveClosure g1_is_alive(g1h); + G1CMKeepAliveClosure g1_keep_alive(g1h, this, nextMarkBitMap()); G1CMDrainMarkingStackClosure - g1DrainMarkingStackClosure(nextMarkBitMap(), &_markStack, - &g1KeepAliveClosure); + g1_drain_mark_stack(nextMarkBitMap(), &_markStack, &g1_keep_alive); // XXXYYY Also: copy the parallel ref processing code from CMS. - rp->process_discovered_references(&g1IsAliveClosure, - &g1KeepAliveClosure, - &g1DrainMarkingStackClosure, + rp->process_discovered_references(&g1_is_alive, + &g1_keep_alive, + &g1_drain_mark_stack, NULL); assert(_markStack.overflow() || _markStack.isEmpty(), "mark stack should be empty (unless it overflowed)"); @@ -1918,8 +1905,8 @@ void ConcurrentMark::weakRefsWork(bool clear_all_soft_refs) { assert(!rp->discovery_enabled(), "should have been disabled"); // Now clean up stale oops in SymbolTable and StringTable - SymbolTable::unlink(&g1IsAliveClosure); - StringTable::unlink(&g1IsAliveClosure); + SymbolTable::unlink(&g1_is_alive); + StringTable::unlink(&g1_is_alive); } void ConcurrentMark::swapMarkBitMaps() { diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp index 7f13483b72e..f02d6f049fa 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp +++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp @@ -33,6 +33,25 @@ class CMTask; typedef GenericTaskQueue CMTaskQueue; typedef GenericTaskQueueSet CMTaskQueueSet; +// Closure used by CM during concurrent reference discovery +// and reference processing (during remarking) to determine +// if a particular object is alive. It is primarily used +// to determine if referents of discovered reference objects +// are alive. An instance is also embedded into the +// reference processor as the _is_alive_non_header field +class G1CMIsAliveClosure: public BoolObjectClosure { + G1CollectedHeap* _g1; + public: + G1CMIsAliveClosure(G1CollectedHeap* g1) : + _g1(g1) + {} + + void do_object(oop obj) { + ShouldNotCallThis(); + } + bool do_object_b(oop obj); +}; + // A generic CM bit map. This is essentially a wrapper around the BitMap // class, with one bit per (1<<_shifter) HeapWords. diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp index 29a2cc24743..0c496472ea9 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp @@ -1768,6 +1768,7 @@ G1CollectedHeap::G1CollectedHeap(G1CollectorPolicy* policy_) : _g1_policy(policy_), _dirty_card_queue_set(false), _into_cset_dirty_card_queue_set(false), + _is_alive_closure(this), _ref_processor(NULL), _process_strong_tasks(new SubTasksDone(G1H_PS_NumElements)), _bot_shared(NULL), @@ -2061,7 +2062,8 @@ void G1CollectedHeap::ref_processing_init() { mr, // span false, // Reference discovery is not atomic true, // mt_discovery - NULL, // is alive closure: need to fill this in for efficiency + &_is_alive_closure, // is alive closure + // for efficiency ParallelGCThreads, ParallelRefProcEnabled, true); // Setting next fields of discovered diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp index ad5ca71a143..0cec92564fe 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp @@ -849,6 +849,12 @@ protected: void print_gc_alloc_regions(); #endif // !PRODUCT + // Instance of the concurrent mark is_alive closure for embedding + // into the reference processor as the is_alive_non_header. This + // prevents unnecessary additions to the discovered lists during + // concurrent discovery. + G1CMIsAliveClosure _is_alive_closure; + // ("Weak") Reference processing support ReferenceProcessor* _ref_processor; @@ -893,7 +899,7 @@ public: // specified by the policy object. jint initialize(); - void ref_processing_init(); + virtual void ref_processing_init(); void set_par_threads(int t) { SharedHeap::set_par_threads(t); From 41bf31bff44e7d5baabc720b132a63959c12f127 Mon Sep 17 00:00:00 2001 From: "Y. Srinivas Ramakrishna" Date: Fri, 17 Dec 2010 23:41:31 -0800 Subject: [PATCH 02/12] 6807801: CMS: could save/restore fewer header words during scavenge Age bits need not enter the mark-word preservation calculus; also affected, in addition to CMS, per CR synopsis above, were ParNew (but not DefNew), ParallelScavenge and G1, albeit to a lesser degree than CMS. Reviewed-by: tonyp, johnc --- .../gc_implementation/g1/g1CollectedHeap.cpp | 7 +++--- .../parNew/parNewGeneration.cpp | 7 +++--- .../parallelScavenge/psScavenge.cpp | 2 ++ .../src/share/vm/memory/defNewGeneration.cpp | 17 ++++++++----- .../src/share/vm/memory/defNewGeneration.hpp | 1 + hotspot/src/share/vm/oops/markOop.inline.hpp | 24 ++++++++++++------- 6 files changed, 37 insertions(+), 21 deletions(-) diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp index 0c496472ea9..02c9a104793 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp @@ -3958,8 +3958,6 @@ void G1CollectedHeap::remove_self_forwarding_pointers() { // Now restore saved marks, if any. if (_objs_with_preserved_marks != NULL) { assert(_preserved_marks_of_objs != NULL, "Both or none."); - assert(_objs_with_preserved_marks->length() == - _preserved_marks_of_objs->length(), "Both or none."); guarantee(_objs_with_preserved_marks->length() == _preserved_marks_of_objs->length(), "Both or none."); for (int i = 0; i < _objs_with_preserved_marks->length(); i++) { @@ -4054,7 +4052,10 @@ void G1CollectedHeap::handle_evacuation_failure_common(oop old, markOop m) { } void G1CollectedHeap::preserve_mark_if_necessary(oop obj, markOop m) { - if (m != markOopDesc::prototype()) { + assert(evacuation_failed(), "Oversaving!"); + // We want to call the "for_promotion_failure" version only in the + // case of a promotion failure. + if (m->must_be_preserved_for_promotion_failure(obj)) { if (_objs_with_preserved_marks == NULL) { assert(_preserved_marks_of_objs == NULL, "Both or none."); _objs_with_preserved_marks = diff --git a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp b/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp index 2b63c9382f4..d8d1ae9b4bf 100644 --- a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp +++ b/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp @@ -1058,10 +1058,11 @@ bool ParNewGeneration::is_legal_forward_ptr(oop p) { #endif void ParNewGeneration::preserve_mark_if_necessary(oop obj, markOop m) { - if ((m != markOopDesc::prototype()) && - (!UseBiasedLocking || (m != markOopDesc::biased_locking_prototype()))) { + if (m->must_be_preserved_for_promotion_failure(obj)) { + // We should really have separate per-worker stacks, rather + // than use locking of a common pair of stacks. MutexLocker ml(ParGCRareEvent_lock); - DefNewGeneration::preserve_mark_if_necessary(obj, m); + preserve_mark(obj, m); } } diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp index 9cf294eb97c..f87db47e7cb 100644 --- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp @@ -694,6 +694,8 @@ void PSScavenge::clean_up_failed_promotion() { void PSScavenge::oop_promotion_failed(oop obj, markOop obj_mark) { _promotion_failed = true; if (obj_mark->must_be_preserved_for_promotion_failure(obj)) { + // Should use per-worker private stakcs hetre rather than + // locking a common pair of stacks. ThreadCritical tc; _preserved_oop_stack.push(obj); _preserved_mark_stack.push(obj_mark); diff --git a/hotspot/src/share/vm/memory/defNewGeneration.cpp b/hotspot/src/share/vm/memory/defNewGeneration.cpp index 746119ada93..cbb6c38cfc3 100644 --- a/hotspot/src/share/vm/memory/defNewGeneration.cpp +++ b/hotspot/src/share/vm/memory/defNewGeneration.cpp @@ -684,23 +684,28 @@ void DefNewGeneration::remove_forwarding_pointers() { _preserved_marks_of_objs.clear(true); } +void DefNewGeneration::preserve_mark(oop obj, markOop m) { + assert(promotion_failed() && m->must_be_preserved_for_promotion_failure(obj), + "Oversaving!"); + _objs_with_preserved_marks.push(obj); + _preserved_marks_of_objs.push(m); +} + void DefNewGeneration::preserve_mark_if_necessary(oop obj, markOop m) { if (m->must_be_preserved_for_promotion_failure(obj)) { - _objs_with_preserved_marks.push(obj); - _preserved_marks_of_objs.push(m); + preserve_mark(obj, m); } } void DefNewGeneration::handle_promotion_failure(oop old) { - preserve_mark_if_necessary(old, old->mark()); - if (!_promotion_failed && PrintPromotionFailure) { + if (PrintPromotionFailure && !_promotion_failed) { gclog_or_tty->print(" (promotion failure size = " SIZE_FORMAT ") ", old->size()); } - + _promotion_failed = true; + preserve_mark_if_necessary(old, old->mark()); // forward to self old->forward_to(old); - _promotion_failed = true; _promo_failure_scan_stack.push(old); diff --git a/hotspot/src/share/vm/memory/defNewGeneration.hpp b/hotspot/src/share/vm/memory/defNewGeneration.hpp index e21fb2cb875..e7b85285775 100644 --- a/hotspot/src/share/vm/memory/defNewGeneration.hpp +++ b/hotspot/src/share/vm/memory/defNewGeneration.hpp @@ -85,6 +85,7 @@ protected: // Preserve the mark of "obj", if necessary, in preparation for its mark // word being overwritten with a self-forwarding-pointer. void preserve_mark_if_necessary(oop obj, markOop m); + void preserve_mark(oop obj, markOop m); // work routine used by the above // Together, these keep pairs. // They should always contain the same number of elements. diff --git a/hotspot/src/share/vm/oops/markOop.inline.hpp b/hotspot/src/share/vm/oops/markOop.inline.hpp index 6e82ada2c58..b5893669355 100644 --- a/hotspot/src/share/vm/oops/markOop.inline.hpp +++ b/hotspot/src/share/vm/oops/markOop.inline.hpp @@ -30,7 +30,7 @@ #include "oops/markOop.hpp" #include "runtime/globals.hpp" -// Should this header be preserved during GC? +// Should this header be preserved during GC (when biased locking is enabled)? inline bool markOopDesc::must_be_preserved_with_bias(oop obj_containing_mark) const { assert(UseBiasedLocking, "unexpected"); if (has_bias_pattern()) { @@ -47,14 +47,15 @@ inline bool markOopDesc::must_be_preserved_with_bias(oop obj_containing_mark) co return (!is_unlocked() || !has_no_hash()); } +// Should this header be preserved during GC? inline bool markOopDesc::must_be_preserved(oop obj_containing_mark) const { if (!UseBiasedLocking) return (!is_unlocked() || !has_no_hash()); return must_be_preserved_with_bias(obj_containing_mark); } -// Should this header (including its age bits) be preserved in the -// case of a promotion failure during scavenge? +// Should this header be preserved in the case of a promotion failure +// during scavenge (when biased locking is enabled)? inline bool markOopDesc::must_be_preserved_with_bias_for_promotion_failure(oop obj_containing_mark) const { assert(UseBiasedLocking, "unexpected"); // We don't explicitly save off the mark words of biased and @@ -70,18 +71,20 @@ inline bool markOopDesc::must_be_preserved_with_bias_for_promotion_failure(oop o prototype_for_object(obj_containing_mark)->has_bias_pattern()) { return true; } - return (this != prototype()); + return (!is_unlocked() || !has_no_hash()); } +// Should this header be preserved in the case of a promotion failure +// during scavenge? inline bool markOopDesc::must_be_preserved_for_promotion_failure(oop obj_containing_mark) const { if (!UseBiasedLocking) - return (this != prototype()); + return (!is_unlocked() || !has_no_hash()); return must_be_preserved_with_bias_for_promotion_failure(obj_containing_mark); } -// Should this header (including its age bits) be preserved in the -// case of a scavenge in which CMS is the old generation? +// Same as must_be_preserved_with_bias_for_promotion_failure() except that +// it takes a klassOop argument, instead of the object of which this is the mark word. inline bool markOopDesc::must_be_preserved_with_bias_for_cms_scavenge(klassOop klass_of_obj_containing_mark) const { assert(UseBiasedLocking, "unexpected"); // CMS scavenges preserve mark words in similar fashion to promotion failures; see above @@ -89,11 +92,14 @@ inline bool markOopDesc::must_be_preserved_with_bias_for_cms_scavenge(klassOop k klass_of_obj_containing_mark->klass_part()->prototype_header()->has_bias_pattern()) { return true; } - return (this != prototype()); + return (!is_unlocked() || !has_no_hash()); } + +// Same as must_be_preserved_for_promotion_failure() except that +// it takes a klassOop argument, instead of the object of which this is the mark word. inline bool markOopDesc::must_be_preserved_for_cms_scavenge(klassOop klass_of_obj_containing_mark) const { if (!UseBiasedLocking) - return (this != prototype()); + return (!is_unlocked() || !has_no_hash()); return must_be_preserved_with_bias_for_cms_scavenge(klass_of_obj_containing_mark); } From 2aa9ac11779261b3933c8983682d0e2814bbf1bb Mon Sep 17 00:00:00 2001 From: Antonios Printezis Date: Sun, 19 Dec 2010 20:57:16 -0500 Subject: [PATCH 03/12] 6896624: G1: hotspot:::gc and hotspot:::mem-pool-gc probes are not fired Fire the gc-begin and gc-end probes for G1. Reviewed-by: kamg, ysr, jcoomes --- .../share/vm/gc_implementation/g1/g1CollectedHeap.cpp | 6 ++++-- .../vm/gc_implementation/shared/vmGCOperations.hpp | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp index 02c9a104793..030aecade77 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp @@ -1192,6 +1192,7 @@ bool G1CollectedHeap::do_collection(bool explicit_gc, return false; } + DTraceGCProbeMarker gc_probe_marker(true /* full */); ResourceMark rm; if (PrintHeapAtGC) { @@ -3213,13 +3214,14 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) { return false; } + DTraceGCProbeMarker gc_probe_marker(false /* full */); + ResourceMark rm; + if (PrintHeapAtGC) { Universe::print_heap_before_gc(); } { - ResourceMark rm; - // This call will decide whether this pause is an initial-mark // pause. If it is, during_initial_mark_pause() will return true // for the duration of this pause. diff --git a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp b/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp index 93611bdaf61..c7ee95f445b 100644 --- a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp +++ b/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp @@ -209,4 +209,15 @@ class VM_GenCollectForPermanentAllocation: public VM_GC_Operation { HeapWord* result() const { return _res; } }; +class DTraceGCProbeMarker : public StackObj { +public: + DTraceGCProbeMarker(bool full) { + VM_GC_Operation::notify_gc_begin(full); + } + + ~DTraceGCProbeMarker() { + VM_GC_Operation::notify_gc_end(); + } +}; + #endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_VMGCOPERATIONS_HPP From d5ee3dcc8a4046b86737bae645812d8206c2bbdf Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Tue, 21 Dec 2010 16:44:00 -0800 Subject: [PATCH 04/12] 6360517: ALT_MSDEVTOOLS_PATH and rc.exe location, and rebase location Reviewed-by: ksrini --- Makefile | 3 --- README-builds.html | 13 ++++++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index d42650e58ce..6b296080ad9 100644 --- a/Makefile +++ b/Makefile @@ -456,7 +456,6 @@ CACERTS_FILE.desc = Location of certificates file DEVTOOLS_PATH.desc = Directory containing zip and gnumake CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files DXSDK_PATH.desc = Root directory of DirectX SDK -MSDEVTOOLS_PATH.desc = Root directory of VC++ tools (e.g. rc.exe) MSVCRT_DLL_PATH.desc = Directory containing mscvrt.dll # Make variables to print out (description and value) @@ -487,12 +486,10 @@ ifeq ($(PLATFORM), windows) VARIABLE_PRINTVAL_LIST += \ DXSDK_PATH \ - MSDEVTOOLS_PATH \ MSVCRT_DLL_PATH VARIABLE_CHECKDIR_LIST += \ DXSDK_PATH \ - MSDEVTOOLS_PATH \ MSVCRT_DLL_PATH endif diff --git a/README-builds.html b/README-builds.html index 1c2504c4dc5..297494f74b5 100644 --- a/README-builds.html +++ b/README-builds.html @@ -1650,13 +1650,16 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING.
Windows specific:
-
ALT_MSDEVTOOLS_PATH
+
ALT_WINDOWSSDKDIR
The location of the - Microsoft Visual Studio - tools 'bin' directory. - The default is usually derived from - ALT_COMPILER_PATH. + Microsoft Windows SDK where some tools will be + located. + The default is whatever WINDOWSSDKDIR is set to + (or WindowsSdkDir) or the path + 
+                            c:\Program Files\Microsoft SDKs\Windows\v6.1a
+
ALT_DXSDK_PATH
From 213481a24b80d7fd3fca25a250d020fa2ce35c48 Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Wed, 22 Dec 2010 12:25:52 -0800 Subject: [PATCH 05/12] 7003845: README-builds document proper location of forest extension, provide alternatives Reviewed-by: robilad --- README | 38 +- README-builds.html | 1186 ++++++++++++++++++++------------------ get_source.sh | 33 ++ make/scripts/hgforest.sh | 104 ++++ 4 files changed, 791 insertions(+), 570 deletions(-) create mode 100644 get_source.sh create mode 100644 make/scripts/hgforest.sh diff --git a/README b/README index eef68df24a7..722131d683f 100644 --- a/README +++ b/README @@ -1,28 +1,38 @@ README: - This file should be located at the top of the OpenJDK Mercurial repository - forest. This top or enclosing repository will include a "make" directory, - and a Makefile at the very top of the repository. - It should also include the 6 repositories: "jdk", "hotspot", "langtools", - "corba", "jaxws" and "jaxp". + This file should be located at the top of the OpenJDK Mercurial root + repository. This root repository will include a "make" directory, + and a Makefile for building the entire OpenJDK. + A full OpenJDK repository set (forest) should also include the following + 6 nested repositories: + "jdk", "hotspot", "langtools", "corba", "jaxws" and "jaxp". + There are also several source downloads for the jax* repositories that + will be needed. + + This one root repository can be obtained with something like: + hg clone http://hg.openjdk.java.net/jdk7/jdk7 openjdk7 + To make sure you have all the nested repositories, you can run: + cd openjdk7 && sh ./get_source.sh + (This is identical to using the Mercurial Forest Extension command + 'hg fclone http://hg.openjdk.java.net/jdk7/jdk7 openjdk7'). + People unfamiliar with Mercurial should read the first few chapters of + the Mercurial book: http://hgbook.red-bean.com/read/ See http://openjdk.java.net/ for more information about the OpenJDK. Simple Build Instructions: + + 0. Get the necessary system software/packages installed on your system, see + http://hg.openjdk.java.net/jdk7/build/raw-file/tip/README-builds.html - 1. Download and install a JDK 6 from + 1. If you don't have a jdk6 installed, download and install a JDK 6 from http://java.sun.com/javase/downloads/index.jsp - Set the environment variable ALT_BOOTDIR to the location of this JDK 6. + Set the environment variable ALT_BOOTDIR to the location of JDK 6. - 2. Download and install the Binary Plugs for the most recent JDK7 from - http://download.java.net/openjdk/jdk7/ - Set the environment variable ALT_BINARY_PLUGS_PATH to the location of - these binary plugs. - - 3. Check the sanity of doing a build with the current machine: + 2. Check the sanity of doing a build with your current system: gnumake sanity See README-builds.html if you run into problems. - 4. Do a complete build of the jdk: + 3. Do a complete build of the OpenJDK: gnumake all The resulting JDK image should be found in build/*/j2sdk-image diff --git a/README-builds.html b/README-builds.html index 1c2504c4dc5..dd5005ee091 100644 --- a/README-builds.html +++ b/README-builds.html @@ -24,12 +24,12 @@

Introduction

- This README file contains build instructions for the - OpenJDK. - Building the source code for the - OpenJDK - requires - a certain degree of technical expertise. + This README file contains build instructions for the + OpenJDK. + Building the source code for the + OpenJDK + requires + a certain degree of technical expertise.

@@ -37,18 +37,23 @@
+ + +
+

Use of Mercurial

+
+ The OpenJDK sources are maintained with the revision control system + Mercurial. + If you are new to Mercurial, please see the + Beginner Guides + or refer to the Mercurial Book. + The first few chapters of the book provide an excellent overview of + Mercurial, what it is and how it works. +
+ For using Mercurial with the OpenJDK refer to the + + Developer Guide: Installing and Configuring Mercurial + section for more information. + The Forest Extension is not part of the Mercurial install, + and is optional, + but can be obtained with the following commands: +
+ + hg clone https://bitbucket.org/pmezard/hgforest-crew/overview/ YourHgForest + +
+ Once you have the file forest.py, you need to add these + lines to your ${HOME}/.hgrc file: +
+ + [extensions] +
forest = YourHgForest/forest.py + +
+ + +

Getting the Source

+
+ To get the entire set of OpenJDK Mercurial repositories + using the Forest Extension: +
+ + hg fclone http://openjdk.java.net/jdk7/jdk7 YourOpenJDK + +
+ To get the entire set of OpenJDK Mercurial repositories + without using the Forest Extension: +
+ + hg clone http://openjdk.java.net/jdk7/jdk7 YourOpenJDK +
cd YourOpenJDK +
sh ./get_source.sh + +
+ Once you have all the repositories, the + script make/scripts/hgforest.sh + can be used to repeat the same hg + command on every repository in the forest, e.g. +
+ + cd YourOpenJDK +
sh ./make/scripts/hgforest.sh pull -u + +
+ You may find this script make/scripts/hgforest.sh faster + than the hg forest commands provided by the + Forest Extension. +
+ +
+

Minimum Build Environments

@@ -116,8 +192,8 @@ specific platforms, and in fact creating these specific platforms may be difficult due to the age of some of this software.

- The minimum OS and C/C++ compiler versions needed for building the - OpenJDK: + The minimum OS and C/C++ compiler versions needed for building the + OpenJDK:

@@ -146,7 +222,7 @@ @@ -156,7 +232,7 @@ @@ -166,7 +242,7 @@ @@ -176,7 +252,7 @@ @@ -195,14 +271,14 @@
Solaris 10u2 + patches
See - SunSolve for patch downloads. + SunSolve for patch downloads. 		Sun Studio 12 Update 1 + patches JDK 6u14 FCS Solaris 10u2 + patches
See - SunSolve for patch downloads. + SunSolve for patch downloads. 		Sun Studio 12 Update 1 + patches JDK 6u14 FCS Solaris 10u2 + patches
See - SunSolve for patch downloads. + SunSolve for patch downloads. 		Sun Studio 12 Update 1 + patches JDK 6u14 FCS Solaris 10u2 + patches
See - SunSolve for patch downloads. + SunSolve for patch downloads. 		Sun Studio 12 Update 1 + patches JDK 6u14 FCS
-

+

These same sources do indeed build on many more systems than the above older generation systems, again the above is just a minimum. -

+

Compilation problems with newer or different C/C++ compilers is a common problem. Similarly, compilation problems related to changes to the - /usr/include or system header files is also a + /usr/include or system header files is also a common problem with newer or unreleased OS versions. Please report these types of problems as bugs so that they can be dealt with accordingly. @@ -217,57 +293,57 @@

Fedora

-

Fedora 9

-

-

- After installing Fedora 9 +

Fedora 9

+

+

+ After installing Fedora 9 you need to install several build dependencies. The simplest way to do it is to execute the following commands as user - root: -

- yum-builddep java-openjdk -

- yum install gcc gcc-c++ -

+ root: +

+ yum-builddep java-openjdk +

+ yum install gcc gcc-c++ +

In addition, it's necessary to set a few environment variables for the build: -

- export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk +

+ export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk

-

Fedora 10

-

-

- After installing Fedora 10 +

Fedora 10

+

+

+ After installing Fedora 10 you need to install several build dependencies. The simplest way to do it is to execute the following commands as user - root: -

- yum-builddep java-1.6.0-openjdk -

- yum install gcc gcc-c++ -

+ root: +

+ yum-builddep java-1.6.0-openjdk +

+ yum install gcc gcc-c++ +

In addition, it's necessary to set a few environment variables for the build: -

- export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk +

+ export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk

-

Fedora 11

-

-

- After installing Fedora 11 +

Fedora 11

+

+

+ After installing Fedora 11 you need to install several build dependencies. The simplest way to do it is to execute the following commands as user - root: -

- yum-builddep java-1.6.0-openjdk -

- yum install gcc gcc-c++ -

+ root: +

+ yum-builddep java-1.6.0-openjdk +

+ yum install gcc gcc-c++ +

In addition, it's necessary to set a few environment variables for the build: -

- export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk -

+

+ export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk +

CentOS 5.2

@@ -285,7 +361,7 @@

- Plus the following packages: + Plus the following packages:

  • cups devel: Cups Development Package
    • @@ -295,188 +371,188 @@

- The freetype 2.3 packages don't seem to be available, - but the freetype 2.3 sources can be downloaded, built, - and installed easily enough from - - the freetype site. - Build and install with something like: + The freetype 2.3 packages don't seem to be available, + but the freetype 2.3 sources can be downloaded, built, + and installed easily enough from + + the freetype site. + Build and install with something like:

./configure && make && sudo -u root make install

- Mercurial packages could not be found easily, but a Google - search should find ones, and they usually include Python if - it's needed. + Mercurial packages could not be found easily, but a Google + search should find ones, and they usually include Python if + it's needed.

Debian

Debian 5.0 (Lenny)

-

+
After installing Debian 5 you need to install several build dependencies. The simplest way to install the build dependencies is to execute the following commands as user root: -

- aptitude build-dep openjdk-6 -

- aptitude install openjdk-6-jdk libmotif-dev -

+

+ aptitude build-dep openjdk-6 +

+ aptitude install openjdk-6-jdk libmotif-dev +

In addition, it's necessary to set a few environment variables for the build: -

- export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk -

+

+ export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk +

-

Ubuntu

+

Ubuntu

Ubuntu 8.04

-

+
After installing Ubuntu 8.04 you need to install several build dependencies. -

+

First, you need to enable the universe repository in the Software Sources application and reload the repository information. The Software Sources application is available under the System/Administration menu. -

+

The simplest way to install the build dependencies is to execute the following commands: -

- sudo aptitude build-dep openjdk-6 -

- sudo aptitude install openjdk-6-jdk -

+

+ sudo aptitude build-dep openjdk-6 +

+ sudo aptitude install openjdk-6-jdk +

In addition, it's necessary to set a few environment variables for the build: -

- export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk -

-

Ubuntu 8.10

+

+ export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk +

+

Ubuntu 8.10

-

+
After installing Ubuntu 8.10 you need to install several build dependencies. The simplest way to do it is to execute the following commands: -

- sudo aptitude build-dep openjdk-6 -

- sudo aptitude install openjdk-6-jdk -

+

+ sudo aptitude build-dep openjdk-6 +

+ sudo aptitude install openjdk-6-jdk +

In addition, it's necessary to set a few environment variables for the build: -

- export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk -

-

Ubuntu 9.04

+

+ export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk +

+

Ubuntu 9.04

-

+
After installing Ubuntu 9.04 you need to install several build dependencies. The simplest way to do it is to execute the following commands: -

- sudo aptitude build-dep openjdk-6 -

- sudo aptitude install openjdk-6-jdk -

+

+ sudo aptitude build-dep openjdk-6 +

+ sudo aptitude install openjdk-6-jdk +

In addition, it's necessary to set a few environment variables for the build: -

- export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk -

+

+ export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk +

OpenSUSE

OpenSUSE 11.1

-

+
After installing OpenSUSE 11.1 you need to install several build dependencies. The simplest way to install the build dependencies is to execute the following commands: -

- sudo zypper source-install -d java-1_6_0-openjdk -

- sudo zypper install make -

+

+ sudo zypper source-install -d java-1_6_0-openjdk +

+ sudo zypper install make +

In addition, it is necessary to set a few environment variables for the build: -

- export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-1.6.0-openjdk -

+

+ export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-1.6.0-openjdk +

Finally, you need to unset the JAVA_HOME environment variable: -

- export -n JAVA_HOME -

-
+

+ export -n JAVA_HOME +

+

Mandriva

Mandriva Linux One 2009 Spring

-

+
After installing Mandriva Linux One 2009 Spring you need to install several build dependencies. The simplest way to install the build dependencies is to execute the following commands as user root: -

- urpmi java-1.6.0-openjdk-devel ant make gcc gcc-c++ freetype-devel zip unzip libcups2-devel libxrender1-devel libalsa2-devel libstc++-static-devel libxtst6-devel libxi-devel +

+ urpmi java-1.6.0-openjdk-devel ant make gcc gcc-c++ freetype-devel zip unzip libcups2-devel libxrender1-devel libalsa2-devel libstc++-static-devel libxtst6-devel libxi-devel

In addition, it is necessary to set a few environment variables for the build: -

- export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-1.6.0-openjdk -

+

+ export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-1.6.0-openjdk +

OpenSolaris

OpenSolaris 2009.06

-

+
After installing OpenSolaris 2009.06 you need to install several build dependencies. The simplest way to install the build dependencies is to execute the following commands: -

- pfexec pkg install SUNWgmake SUNWj6dev SUNWant sunstudioexpress SUNWcups SUNWzip SUNWunzip SUNWxwhl SUNWxorg-headers SUNWaudh SUNWfreetype2 +

+ pfexec pkg install SUNWgmake SUNWj6dev SUNWant sunstudioexpress SUNWcups SUNWzip SUNWunzip SUNWxwhl SUNWxorg-headers SUNWaudh SUNWfreetype2

In addition, it is necessary to set a few environment variables for the build: -

- export LANG=C ALT_COMPILER_PATH=/opt/SunStudioExpress/bin/ ALT_CUPS_HEADERS_PATH=/usr/include/ -

+

+ export LANG=C ALT_COMPILER_PATH=/opt/SunStudioExpress/bin/ ALT_CUPS_HEADERS_PATH=/usr/include/ +

Finally, you need to make sure that the build process can find the Sun Studio compilers: -

- export PATH=$PATH:/opt/SunStudioExpress/bin/ -

+

+ export PATH=$PATH:/opt/SunStudioExpress/bin/ +

Source Directory Structure

- The source code for the OpenJDK is delivered in a set of - directories: - hotspot, - langtools, - corba, - jaxws, - jaxp, - and - jdk. - The hotspot directory contains the source code and make - files for building the OpenJDK Hotspot Virtual Machine. - The langtools directory contains the source code and make - files for building the OpenJDK javac and language tools. - The corba directory contains the source code and make - files for building the OpenJDK Corba files. - The jaxws directory contains the source code and make - files for building the OpenJDK JAXWS files. - The jaxp directory contains the source code and make - files for building the OpenJDK JAXP files. - The jdk directory contains the source code and make files for - building the OpenJDK runtime libraries and misc files. - The top level Makefile - is used to build the entire OpenJDK. + The source code for the OpenJDK is delivered in a set of + directories: + hotspot, + langtools, + corba, + jaxws, + jaxp, + and + jdk. + The hotspot directory contains the source code and make + files for building the OpenJDK Hotspot Virtual Machine. + The langtools directory contains the source code and make + files for building the OpenJDK javac and language tools. + The corba directory contains the source code and make + files for building the OpenJDK Corba files. + The jaxws directory contains the source code and make + files for building the OpenJDK JAXWS files. + The jaxp directory contains the source code and make + files for building the OpenJDK JAXP files. + The jdk directory contains the source code and make files for + building the OpenJDK runtime libraries and misc files. + The top level Makefile + is used to build the entire OpenJDK.

@@ -495,10 +571,10 @@ ALT_* variables (alternates) can be used to help the makefiles locate components.

- Refer to the bash/sh/ksh setup file - jdk/make/jdk_generic_profile.sh - if you need help in setting up your environment variables. - A build could be as simple as: + Refer to the bash/sh/ksh setup file + jdk/make/jdk_generic_profile.sh + if you need help in setting up your environment variables. + A build could be as simple as: 


                 bash
@@ -507,12 +583,12 @@

- Of course ksh or sh would work too. - But some customization will probably be necessary. - The sanity rule will make some basic checks on build - dependencies and generate appropriate warning messages - regarding missing, out of date, or newer than expected components - found on your system. + Of course ksh or sh would work too. + But some customization will probably be necessary. + The sanity rule will make some basic checks on build + dependencies and generate appropriate warning messages + regarding missing, out of date, or newer than expected components + found on your system.

@@ -559,14 +635,14 @@ version that has this problem fixed. The older 3.80 version of make.exe can be downloaded with this - link. + link. Use of this older 3.80 make.exe may require that you install the libintl2.dll library or libintl2 cygwin package which is no longer installed by default by the cygwin installer.
Also see the - mozilla developer center + mozilla developer center on this topic.
It's hoped that when make 3.82 starts shipping in a future cygwin @@ -574,19 +650,19 @@ In addition to the above 3.80 make.exe you can download this - www.cmake.org make.exe which will not have a libintl2.dll + www.cmake.org make.exe which will not have a libintl2.dll dependency.

- Information on GNU make, and access to ftp download sites, are - available on the - - GNU make web site - . - The latest source to GNU make is available at - - ftp.gnu.org/pub/gnu/make/. + Information on GNU make, and access to ftp download sites, are + available on the + + GNU make web site + . + The latest source to GNU make is available at + + ftp.gnu.org/pub/gnu/make/.

@@ -597,27 +673,27 @@ is a Pentium class processor or better, at least 256 MB of RAM, and approximately 1.5 GB of free disk space.

- X64 only: - The minimum recommended hardware for building the Linux - version is an AMD Opteron class processor, at least 512 MB of RAM, and - approximately 4 GB of free disk space. + X64 only: + The minimum recommended hardware for building the Linux + version is an AMD Opteron class processor, at least 512 MB of RAM, and + approximately 4 GB of free disk space.

- The build will use the tools contained in - /bin and - /usr/bin - of a standard installation of the Linux operating environment. - You should ensure that these directories are in your - PATH. + The build will use the tools contained in + /bin and + /usr/bin + of a standard installation of the Linux operating environment. + You should ensure that these directories are in your + PATH.

- Note that some Linux systems have a habit of pre-populating - your environment variables for you, for example JAVA_HOME - might get pre-defined for you to refer to the JDK installed on - your Linux system. - You will need to unset JAVA_HOME. - It's a good idea to run env and verify the - environment variables you are getting from the default system - settings make sense for building the - OpenJDK. + Note that some Linux systems have a habit of pre-populating + your environment variables for you, for example JAVA_HOME + might get pre-defined for you to refer to the JDK installed on + your Linux system. + You will need to unset JAVA_HOME. + It's a good idea to run env and verify the + environment variables you are getting from the default system + settings make sense for building the + OpenJDK.

Basic Linux Check List

@@ -639,7 +715,7 @@
  • Install or upgrade the FreeType development - package. + package.
  • Install @@ -660,23 +736,23 @@ Approximately 1.4 GB of free disk space is needed for a 32-bit build.

    - If you are building the 64-bit version, you should - run the command "isainfo -v" to verify that you have a - 64-bit installation, it should say sparcv9 or - amd64. - An additional 7 GB of free disk space is needed - for a 64-bit build. + If you are building the 64-bit version, you should + run the command "isainfo -v" to verify that you have a + 64-bit installation, it should say sparcv9 or + amd64. + An additional 7 GB of free disk space is needed + for a 64-bit build.

    - The build uses the tools contained in /usr/ccs/bin - and /usr/bin of a standard developer or full installation of - the Solaris operating environment. + The build uses the tools contained in /usr/ccs/bin + and /usr/bin of a standard developer or full installation of + the Solaris operating environment.

    - Solaris patches specific to the JDK can be downloaded from the - - SunSolve JDK Solaris patches download page. - You should ensure that the latest patch cluster for - your version of the Solaris operating environment has also - been installed. + Solaris patches specific to the JDK can be downloaded from the + + SunSolve JDK Solaris patches download page. + You should ensure that the latest patch cluster for + your version of the Solaris operating environment has also + been installed.

    Basic Solaris Check List

    @@ -731,10 +807,10 @@ because FAT32 doesn't support case-sensitivity in file names.

    - X64 only: - The minimum recommended hardware for building - the Windows X64 version is an AMD Opteron class processor, at least 1 - GB of RAM, and approximately 10 GB of free disk space. + X64 only: + The minimum recommended hardware for building + the Windows X64 version is an AMD Opteron class processor, at least 1 + GB of RAM, and approximately 10 GB of free disk space.

    Windows Paths

    @@ -753,18 +829,18 @@ (called 'mixed'), e.g. cygpath -s -m "path".

    - The makefiles will try to translate any pathnames supplied - to it into the C:/ style automatically. + The makefiles will try to translate any pathnames supplied + to it into the C:/ style automatically.

    - Note that use of CYGWIN creates a unique problem with regards to - setting PATH. Normally on Windows - the PATH variable contains directories - separated with the ";" character (Solaris and Linux uses ":"). - With CYGWIN, it uses ":", but that means that paths like "C:/path" - cannot be placed in the CYGWIN version of PATH and - instead CYGWIN uses something like /cygdrive/c/path - which CYGWIN understands, but only CYGWIN understands. - So be careful with paths on Windows. + Note that use of CYGWIN creates a unique problem with regards to + setting PATH. Normally on Windows + the PATH variable contains directories + separated with the ";" character (Solaris and Linux uses ":"). + With CYGWIN, it uses ":", but that means that paths like "C:/path" + cannot be placed in the CYGWIN version of PATH and + instead CYGWIN uses something like /cygdrive/c/path + which CYGWIN understands, but only CYGWIN understands. + So be careful with paths on Windows.

    Basic Windows Check List

    @@ -828,7 +904,7 @@ JDK 6, this is often called a bootstrap JDK. The JDK 6 binaries can be downloaded from Sun's JDK 6 download site. + target="_blank">JDK 6 download site. For build performance reasons is very important that this bootstrap JDK be made available on the local disk of the machine doing the build. @@ -841,12 +917,12 @@ in the PATH environment variable, although it's not required.

    - Solaris: - Some pre-installed JDK images may be available to you in the - directory /usr/jdk/instances. - If you don't set - ALT_BOOTDIR - the makefiles will look in that location for a JDK it can use. + Solaris: + Some pre-installed JDK images may be available to you in the + directory /usr/jdk/instances. + If you don't set + ALT_BOOTDIR + the makefiles will look in that location for a JDK it can use.

    Binary Plugs

    @@ -896,7 +972,7 @@ All OpenJDK builds require access to least Ant 1.6.5. The Ant tool is available from the - Ant download site. + Ant download site. You should always make sure ant is in your PATH, and on Windows you may also need to set ANT_HOME @@ -908,7 +984,7 @@

    Certificate Authority File (cacert)

    See - http://en.wikipedia.org/wiki/Certificate_Authority + http://en.wikipedia.org/wiki/Certificate_Authority for a better understanding of the Certificate Authority (CA). A certificates file named "cacerts" represents a system-wide keystore with CA certificates. @@ -942,121 +1018,121 @@
    At a minimum, the - Sun Studio 12 Update 1 Compilers + Sun Studio 12 Update 1 Compilers (containing version 5.10 of the C and C++ compilers) is required, including specific patches. -

    +

    The Solaris SPARC patch list is: -

      -
    • - 118683-05: SunOS 5.10: Patch for profiling libraries and assembler -
      • -
    • - 119963-21: SunOS 5.10: Shared library patch for C++ -
      • -
    • - 120753-08: SunOS 5.10: Microtasking libraries (libmtsk) patch -
      • -
    • - 128228-09: Sun Studio 12 Update 1: Patch for Sun C++ Compiler -
      • -
    • - 141860-03: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95 -
      • -
    • - 141861-05: Sun Studio 12 Update 1: Patch for Sun C Compiler -
      • -
    • - 142371-01: Sun Studio 12.1 Update 1: Patch for dbx -
      • -
    • - 143384-02: Sun Studio 12 Update 1: Patch for debuginfo handling -
      • -
    • - 143385-02: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95 -
      • -
    • - 142369-01: Sun Studio 12.1: Patch for Performance Analyzer Tools -
      • +
        +
      • + 118683-05: SunOS 5.10: Patch for profiling libraries and assembler +
        • +
      • + 119963-21: SunOS 5.10: Shared library patch for C++ +
        • +
      • + 120753-08: SunOS 5.10: Microtasking libraries (libmtsk) patch +
        • +
      • + 128228-09: Sun Studio 12 Update 1: Patch for Sun C++ Compiler +
        • +
      • + 141860-03: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95 +
        • +
      • + 141861-05: Sun Studio 12 Update 1: Patch for Sun C Compiler +
        • +
      • + 142371-01: Sun Studio 12.1 Update 1: Patch for dbx +
        • +
      • + 143384-02: Sun Studio 12 Update 1: Patch for debuginfo handling +
        • +
      • + 143385-02: Sun Studio 12 Update 1: Patch for Compiler Common patch for Sun C C++ F77 F95 +
        • +
      • + 142369-01: Sun Studio 12.1: Patch for Performance Analyzer Tools +

      - The Solaris X86 patch list is: + The Solaris X86 patch list is:

        -
      • - 119961-07: SunOS 5.10_x86, x64, Patch for profiling libraries and assembler -
        • -
      • - 119964-21: SunOS 5.10_x86: Shared library patch for C++_x86 -
        • -
      • - 120754-08: SunOS 5.10_x86: Microtasking libraries (libmtsk) patch -
        • -
      • - 141858-06: Sun Studio 12 Update 1_x86: Sun Compiler Common patch for x86 backend -
        • -
      • - 128229-09: Sun Studio 12 Update 1_x86: Patch for C++ Compiler -
        • -
      • - 142363-05: Sun Studio 12 Update 1_x86: Patch for C Compiler -
        • -
      • - 142368-01: Sun Studio 12.1_x86: Patch for Performance Analyzer Tools -
        • +
      • + 119961-07: SunOS 5.10_x86, x64, Patch for profiling libraries and assembler +
        • +
      • + 119964-21: SunOS 5.10_x86: Shared library patch for C++_x86 +
        • +
      • + 120754-08: SunOS 5.10_x86: Microtasking libraries (libmtsk) patch +
        • +
      • + 141858-06: Sun Studio 12 Update 1_x86: Sun Compiler Common patch for x86 backend +
        • +
      • + 128229-09: Sun Studio 12 Update 1_x86: Patch for C++ Compiler +
        • +
      • + 142363-05: Sun Studio 12 Update 1_x86: Patch for C Compiler +
        • +
      • + 142368-01: Sun Studio 12.1_x86: Patch for Performance Analyzer Tools +

      - Set - ALT_COMPILER_PATH - to point to the location of - the compiler binaries, and place this location in the PATH. + Set + ALT_COMPILER_PATH + to point to the location of + the compiler binaries, and place this location in the PATH.

      - The Oracle Solaris Studio Express compilers at: - - Oracle Solaris Studio Express Download site - are also an option, although these compilers have not - been extensively used yet. + The Oracle Solaris Studio Express compilers at: + + Oracle Solaris Studio Express Download site + are also an option, although these compilers have not + been extensively used yet.

    Windows i586: Microsoft Visual Studio 2010 Compilers
    -

    -BEGIN WARNING: At this time (Spring/Summer 2010) JDK 7 is starting a transition to -use the newest VS2010 Microsoft compilers. These build instructions are updated -to show where we are going. We have a QA process to go through before -official builds actually use VS2010. So for now, official builds are -still using VS2003. No other compilers are known to build the entire JDK, -including non-open portions. -So for now you should be able to build with either VS2003 or VS2010. -We do not guarantee that VS2008 will work, although there is sufficient -makefile support to make at least basic JDK builds plausible. -Visual Studio 2010 Express compilers are now able to build all the -open source repositories, but this is 32 bit only. To build 64 bit -Windows binaries use the the 7.1 Windows SDK.END WARNING. -

    - The 32-bit OpenJDK Windows build - requires - Microsoft Visual Studio C++ 2010 (VS2010) Professional - Edition or Express compiler. - The compiler and other tools are expected to reside - in the location defined by the variable - VS100COMNTOOLS which - is set by the Microsoft Visual Studio installer. -

    - Once the compiler is installed, - it is recommended that you run VCVARS32.BAT - to set the compiler environment variables - INCLUDE, - LIB, and - PATH - prior to building the - OpenJDK. - The above environment variables MUST be set. - This compiler also contains the Windows SDK v 7.0a, - which is an update to the Windows 7 SDK.

    - WARNING: Make sure you check out the - CYGWIN link.exe WARNING. - The path /usr/bin must be after the path to the - Visual Studio product. + BEGIN WARNING: At this time (Spring/Summer 2010) JDK 7 is starting a transition to + use the newest VS2010 Microsoft compilers. These build instructions are updated + to show where we are going. We have a QA process to go through before + official builds actually use VS2010. So for now, official builds are + still using VS2003. No other compilers are known to build the entire JDK, + including non-open portions. + So for now you should be able to build with either VS2003 or VS2010. + We do not guarantee that VS2008 will work, although there is sufficient + makefile support to make at least basic JDK builds plausible. + Visual Studio 2010 Express compilers are now able to build all the + open source repositories, but this is 32 bit only. To build 64 bit + Windows binaries use the the 7.1 Windows SDK.END WARNING. +

    + The 32-bit OpenJDK Windows build + requires + Microsoft Visual Studio C++ 2010 (VS2010) Professional + Edition or Express compiler. + The compiler and other tools are expected to reside + in the location defined by the variable + VS100COMNTOOLS which + is set by the Microsoft Visual Studio installer. +

    + Once the compiler is installed, + it is recommended that you run VCVARS32.BAT + to set the compiler environment variables + INCLUDE, + LIB, and + PATH + prior to building the + OpenJDK. + The above environment variables MUST be set. + This compiler also contains the Windows SDK v 7.0a, + which is an update to the Windows 7 SDK. +

    + WARNING: Make sure you check out the + CYGWIN link.exe WARNING. + The path /usr/bin must be after the path to the + Visual Studio product.

    Windows x64: Microsoft Visual Studio 2010 Professional Compiler
    @@ -1069,22 +1145,22 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. you have VS2010 Professional.
    Windows x64: Microsoft Windows 7.1 SDK 64 bit compilers. - For a free alternative for 64 bit builds, use the 7.1 SDK. - Microsoft say that to set up your paths for this run -
    +                For a free alternative for 64 bit builds, use the 7.1 SDK.
+                Microsoft say that to set up your paths for this run
+                
         c:\Program Files\Microsoft SDKs\Windows\v7.1\bin\setenv.cmd /x64.
-
    
-                   What was tested is just directly setting up LIB, INCLUDE,
-                   PATH and based on the installation directories using the
-                   DOS short name appropriate for the system, (you will
-                   need to set them for yours, not just blindly copy this) eg :
-
    +                
    
+                What was tested is just directly setting up LIB, INCLUDE,
+                PATH and based on the installation directories using the
+                DOS short name appropriate for the system, (you will
+                need to set them for yours, not just blindly copy this) eg :
+                
         set VSINSTALLDIR=c:\PROGRA~2\MICROS~1.0
     set WindowsSdkDir=c:\PROGRA~1\MICROS~1\Windows\v7.1
     set PATH=%VSINSTALLDIR%\vc\bin\amd64;%VSINSTALLDIR%\Common7\IDE;%WindowsSdkDir%\bin;%PATH%
     set INCLUDE=%VSINSTALLDIR%\vc\include;%WindowsSdkDir%\include
     set LIB=%VSINSTALLDIR%\vc\lib\amd64;%WindowsSdkDir%\lib\x64
-
    
+

    Zip and Unzip

    @@ -1110,41 +1186,41 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. Companion CD/DVD, these often will be installed into /opt/sfw/cups.

    - Linux: - CUPS header files are required for building the - OpenJDK on Linux. - The Linux header files are usually available from a "cups" - development package, it's recommended that you try and use - the package provided by the particular version of Linux that - you are using. + Linux: + CUPS header files are required for building the + OpenJDK on Linux. + The Linux header files are usually available from a "cups" + development package, it's recommended that you try and use + the package provided by the particular version of Linux that + you are using.

    - The CUPS header files can always be downloaded from - www.cups.org. - The variable - ALT_CUPS_HEADERS_PATH - can be used to override the default location of the - CUPS Header files. + The CUPS header files can always be downloaded from + www.cups.org. + The variable + ALT_CUPS_HEADERS_PATH + can be used to override the default location of the + CUPS Header files.

    XRender Extension Headers (Solaris & Linux)

    - Solaris: - XRender header files are required for building the - OpenJDK on Solaris. - The XRender header file is included with the other X11 header files - in the package SFWxwinc on new enough versions of - Solaris and will be installed in - /usr/X11/include/X11/extensions/Xrender.h + Solaris: + XRender header files are required for building the + OpenJDK on Solaris. + The XRender header file is included with the other X11 header files + in the package SFWxwinc on new enough versions of + Solaris and will be installed in + /usr/X11/include/X11/extensions/Xrender.h

    - Linux: - XRender header files are required for building the - OpenJDK on Linux. - The Linux header files are usually available from a "Xrender" - development package, it's recommended that you try and use - the package provided by the particular distribution of Linux that - you are using. -

    + Linux: + XRender header files are required for building the + OpenJDK on Linux. + The Linux header files are usually available from a "Xrender" + development package, it's recommended that you try and use + the package provided by the particular distribution of Linux that + you are using. +

    FreeType 2

    @@ -1155,31 +1231,31 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. Note that you need development version of package that includes both FreeType library and header files.

    - You can always download latest FreeType version from the - FreeType website. + You can always download latest FreeType version from the + FreeType website.

    - Makefiles will try to pick FreeType from /usr/lib and /usr/include. - In case it is installed elsewhere you will need to set environment - variables - ALT_FREETYPE_LIB_PATH - and - ALT_FREETYPE_HEADERS_PATH - to refer to place where library and header files are installed. + Makefiles will try to pick FreeType from /usr/lib and /usr/include. + In case it is installed elsewhere you will need to set environment + variables + ALT_FREETYPE_LIB_PATH + and + ALT_FREETYPE_HEADERS_PATH + to refer to place where library and header files are installed.

    - Building the freetype 2 libraries from scratch is also possible, - however on Windows refer to the - - Windows FreeType DLL build instructions. + Building the freetype 2 libraries from scratch is also possible, + however on Windows refer to the + + Windows FreeType DLL build instructions.

    - Note that by default FreeType is built with byte code hinting - support disabled due to licensing restrictions. - In this case, text appearance and metrics are expected to - differ from Sun's official JDK build. - See - - the SourceForge FreeType2 Home Page - - for more information. + Note that by default FreeType is built with byte code hinting + support disabled due to licensing restrictions. + In this case, text appearance and metrics are expected to + differ from Sun's official JDK build. + See + + the SourceForge FreeType2 Home Page + + for more information.

    Advanced Linux Sound Architecture (ALSA) (Linux only)

    @@ -1195,25 +1271,25 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. The makefiles will check this emit a sanity error if it is missing or the wrong version.

    - In particular, older Linux systems will likely not have the - right version of ALSA installed, for example - Redhat AS 2.1 U2 and SuSE 8.1 do not include a sufficiently - recent ALSA distribution. - On rpm-based systems, you can see if ALSA is installed by - running this command: + In particular, older Linux systems will likely not have the + right version of ALSA installed, for example + Redhat AS 2.1 U2 and SuSE 8.1 do not include a sufficiently + recent ALSA distribution. + On rpm-based systems, you can see if ALSA is installed by + running this command: 

                         rpm -qa | grep alsa
    Both alsa and alsa-devel packages are needed.

    - If your distribution does not come with ALSA, and you can't - find ALSA packages built for your particular system, - you can try to install the pre-built ALSA rpm packages from - - www.freshrpms.net. - Note that installing a newer ALSA could - break sound output if an older version of ALSA was previously - installed on the system, but it will enable JDK compilation. + If your distribution does not come with ALSA, and you can't + find ALSA packages built for your particular system, + you can try to install the pre-built ALSA rpm packages from + + www.freshrpms.net. + Note that installing a newer ALSA could + break sound output if an older version of ALSA was previously + installed on the system, but it will enable JDK compilation.

    Installation: execute as root
    [i586]: rpm -Uv --force alsa-lib-devel-0.9.1-rh61.i386.rpm
    @@ -1228,7 +1304,7 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING.
    As a last resort you can go to the - Advanced Linux Sound Architecture Site and build it from + Advanced Linux Sound Architecture Site and build it from source.
    Download driver and library @@ -1256,9 +1332,9 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. building the JDK platform. To actually use ALSA sound drivers, more steps are necessary as outlined in the documentation on ALSA's homepage.

    - ALSA can be uninstalled by executing make uninstall first in - the alsa-lib-0.9.1 directory and then in - alsa-driver-0.9.1. + ALSA can be uninstalled by executing make uninstall first in + the alsa-lib-0.9.1 directory and then in + alsa-driver-0.9.1.

    There are no ALT* variables to change the assumed locations of ALSA, the makefiles will expect to find the ALSA include files and library at: @@ -1273,15 +1349,15 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. on Windows which can be supplied by CYGWIN.

    - The OpenJDK build requires CYGWIN version 1.5.12 or newer. - Information about CYGWIN can - be obtained from the CYGWIN website at - www.cygwin.com. + The OpenJDK build requires CYGWIN version 1.5.12 or newer. + Information about CYGWIN can + be obtained from the CYGWIN website at + www.cygwin.com.

    - By default CYGWIN doesn't install all the tools required for building - the OpenJDK. - Along with the default installation, you need to install - the following tools. + By default CYGWIN doesn't install all the tools required for building + the OpenJDK. + Along with the default installation, you need to install + the following tools.

    @@ -1298,21 +1374,21 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. + utilities + NOTE: See the GNU make section + processor @@ -1354,21 +1430,21 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING.
    Devel binutils The GNU assembler, linker and binary - utilities
    make.exe Devel make The GNU version of the 'make' utility built for CYGWIN.
    - NOTE: See the GNU make section
    m4.exe Interpreters m4 GNU implementation of the traditional Unix macro - processor
    cpio.exe

    - Note that the CYGWIN software can conflict with other non-CYGWIN - software on your Windows system. - CYGWIN provides a - FAQ for - known issues and problems, of particular interest is the - section on - - BLODA (applications that interfere with CYGWIN). + Note that the CYGWIN software can conflict with other non-CYGWIN + software on your Windows system. + CYGWIN provides a + FAQ for + known issues and problems, of particular interest is the + section on + + BLODA (applications that interfere with CYGWIN).

    - WARNING: - Be very careful with link.exe, it will conflict - with the Visual Studio version. You need the Visual Studio - version of link.exe, not the CYGWIN one. - So it's important that the Visual Studio paths in PATH preceed - the CYGWIN path /usr/bin. + WARNING: + Be very careful with link.exe, it will conflict + with the Visual Studio version. You need the Visual Studio + version of link.exe, not the CYGWIN one. + So it's important that the Visual Studio paths in PATH preceed + the CYGWIN path /usr/bin. Microsoft DirectX 9.0 SDK header files and libraries

    @@ -1377,7 +1453,7 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. OpenJDK. This SDK can be downloaded from - Microsoft DirectX 9.0 SDK (Summer 2004). + Microsoft DirectX 9.0 SDK (Summer 2004). If the link above becomes obsolete, the SDK can be found from the Microsoft Download Site (search with "DirectX 9.0 SDK Update Summer 2004"). @@ -1431,14 +1507,14 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING.

    • - Solaris: - Note that ARCH_DATA_MODEL is really only needed on Solaris to - indicate you want to built the 64-bit version. - And before the Solaris 64-bit binaries can be used, they - must be merged with the binaries from a separate 32-bit build. - The merged binaries may then be used in either 32-bit or 64-bit mode, with - the selection occurring at runtime - with the -d32 or -d64 options. + Solaris: + Note that ARCH_DATA_MODEL is really only needed on Solaris to + indicate you want to built the 64-bit version. + And before the Solaris 64-bit binaries can be used, they + must be merged with the binaries from a separate 32-bit build. + The merged binaries may then be used in either 32-bit or 64-bit mode, with + the selection occurring at runtime + with the -d32 or -d64 options.

    @@ -1450,37 +1526,39 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. The default output directory is build/platform, where platform is one of -
      -
    • solaris-sparc
      • -
    • solaris-sparcv9
      • -
    • solaris-i586
      • -
    • solaris-amd64
      • -
    • linux-i586
      • -
    • linux-amd64
      • -
    • windows-i586
      • -
    • windows-amd64
      • -
    +
    +
      +
    • solaris-sparc
      • +
    • solaris-sparcv9
      • +
    • solaris-i586
      • +
    • solaris-amd64
      • +
    • linux-i586
      • +
    • linux-amd64
      • +
    • windows-i586
      • +
    • windows-amd64
      • +
    +
    In particular, the build/platform/j2sdk-image/bin directory should contain executables for the OpenJDK tools and utilities.

    - You can test that the build completed properly by using the build - to run the various demos that you will find in the - build/platform/j2sdk-image/demo - directory. + You can test that the build completed properly by using the build + to run the various demos that you will find in the + build/platform/j2sdk-image/demo + directory.

    - The provided regression tests can be run with the jtreg - utility from - the jtreg site. + The provided regression tests can be run with the jtreg + utility from + the jtreg site.

    Environment/Make Variables

    - Some of the - environment or make variables (just called variables in this - document) that can impact the build are: + Some of the + environment or make variables (just called variables in this + document) that can impact the build are:

    PATH
    @@ -1488,11 +1566,11 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING.
    • The location of the GNU make binary
    • The location of the Bootstrap JDK java - (see Bootstrap JDK)
      • + (see Bootstrap JDK)
    • The location of the C/C++ compilers - (see compilers)
      • + (see compilers)
    • The location or locations for the Unix command utilities - (e.g. /usr/bin)
      • + (e.g. /usr/bin)
    MILESTONE
    @@ -1694,17 +1772,17 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. Look for the check list of the platform you are building on in the Table of Contents.

    - You can validate your build environment by using the sanity - target. - Any errors listed - will stop the build from starting, and any warnings may result in - a flawed product build. - We strongly encourage you to evaluate every - sanity check warning and fix it if required, before you proceed - further with your build. + You can validate your build environment by using the sanity + target. + Any errors listed + will stop the build from starting, and any warnings may result in + a flawed product build. + We strongly encourage you to evaluate every + sanity check warning and fix it if required, before you proceed + further with your build.

    - Some of the more common problems with builds are briefly described - below, with suggestions for remedies. + Some of the more common problems with builds are briefly described + below, with suggestions for remedies.

    • Slow Builds: @@ -1715,15 +1793,15 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. machine, setting it to more than the the number of CPUs is probably not a good idea).

      - Creating the javadocs can be very slow, if you are running - javadoc, consider skipping that step. + Creating the javadocs can be very slow, if you are running + javadoc, consider skipping that step.

      - Faster hardware and more RAM always helps too. - The VM build tends to be CPU intensive (many C++ compiles), - and the rest of the JDK will often be disk intensive. + Faster hardware and more RAM always helps too. + The VM build tends to be CPU intensive (many C++ compiles), + and the rest of the JDK will often be disk intensive.

      - Faster compiles are possible using a tool called - ccache. + Faster compiles are possible using a tool called + ccache.

    • @@ -1732,10 +1810,10 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. If you see warnings that refer to file time stamps, e.g.
      Warning message: File `xxx' has modification time in - the future. + the future.
      Warning message: Clock skew detected. Your build may - be incomplete. + be incomplete.
      These warnings can occur when the clock on the build machine is out of sync with the timestamps on the source files. Other errors, apparently @@ -1747,9 +1825,9 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. when the pre-1.4 compiler ran across the new assert keyword in the 1.4 source code.

      - If you see these warnings, reset the clock on the build - machine, run "gmake clobber" or delete the directory - containing the build output, and restart the build from the beginning. + If you see these warnings, reset the clock on the build + machine, run "gmake clobber" or delete the directory + containing the build output, and restart the build from the beginning.

    • @@ -1776,32 +1854,28 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING.
      This is probably an issue with SELinux (See - http://en.wikipedia.org/wiki/SELinux). + http://en.wikipedia.org/wiki/SELinux). Parts of the VM is built without the -fPIC for performance reasons.

      - To completely disable SELinux: - -

        -
      1. $ su root
        2. -
      2. # system-config-securitylevel
        3. -
      3. In the window that appears, select the SELinux tab
        4. -
      4. Disable SELinux
        5. -
      - + To completely disable SELinux: +
        +
      1. $ su root
        2. +
      2. # system-config-securitylevel
        3. +
      3. In the window that appears, select the SELinux tab
        4. +
      4. Disable SELinux
        5. +

      - Alternatively, instead of completely disabling it you could - disable just this one check. - -

        -
      1. Select System->Administration->SELinux Management
        2. -
      2. In the SELinux Management Tool which appears, + Alternatively, instead of completely disabling it you could + disable just this one check. +
          +
        1. Select System->Administration->SELinux Management
          2. +
        2. In the SELinux Management Tool which appears, select "Boolean" from the menu on the left
          3. -
        3. Expand the "Memory Protection" group
          4. -
        4. Check the first item, labeled +
        5. Expand the "Memory Protection" group
          6. +
        6. Check the first item, labeled "Allow all unconfined executables to use libraries requiring text relocation ..."
          7. -
        -         +
    • @@ -1810,7 +1884,7 @@ Windows binaries use the the 7.1 Windows SDK.END WARNING. The CYGWIN software can conflict with other non-CYGWIN software. See the CYGWIN FAQ section on - BLODA (applications that interfere with CYGWIN). + BLODA (applications that interfere with CYGWIN).
    • diff --git a/get_source.sh b/get_source.sh new file mode 100644 index 00000000000..bc609b3ee8d --- /dev/null +++ b/get_source.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# Get clones of all nested repositories +sh ./make/scripts/hgforest.sh clone + +# Update all existing repositories to the latest sources +sh ./make/scripts/hgforest.sh pull -u + diff --git a/make/scripts/hgforest.sh b/make/scripts/hgforest.sh new file mode 100644 index 00000000000..7834826d8eb --- /dev/null +++ b/make/scripts/hgforest.sh @@ -0,0 +1,104 @@ +#!/bin/sh + +# +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# Shell script for a fast parallel forest command + +tmp=/tmp/forest.$$ +rm -f -r ${tmp} +mkdir -p ${tmp} + +# Remove tmp area on A. B. Normal termination +trap 'rm -f -r ${tmp}' KILL +trap 'rm -f -r ${tmp}' EXIT + +# Only look in specific locations for possible forests (avoids long searches) +pull_default="" +if [ "$1" = "clone" -o "$1" = "fclone" ] ; then + subrepos="corba jaxp jaxws langtools jdk hotspot" + if [ -f .hg/hgrc ] ; then + pull_default=`hg paths default` + fi + if [ "${pull_default}" = "" ] ; then + echo "ERROR: Need initial clone with 'hg paths default' defined" + exit 1 + fi + repos="" + for i in ${subrepos} ; do + if [ ! -f ${i}/.hg/hgrc ] ; then + repos="${repos} ${i}" + fi + done + at_a_time=2 +else + hgdirs=`ls -d ./.hg ./*/.hg ./*/*/.hg ./*/*/*/.hg ./*/*/*/*/.hg 2>/dev/null` + # Derive repository names from the .hg directory locations + repos="" + for i in ${hgdirs} ; do + repos="${repos} `echo ${i} | sed -e 's@/.hg$@@'`" + done + at_a_time=8 +fi + +# Any repos to deal with? +if [ "${repos}" = "" ] ; then + echo "No repositories to process." + exit +fi + +# Echo out what repositories we will process +echo "# Repos: ${repos}" + +# Run the supplied command on all repos in parallel, save output until end +n=0 +for i in ${repos} ; do + echo "Starting on ${i}" + n=`expr ${n} '+' 1` + ( + ( + if [ "$1" = "clone" -o "$1" = "fclone" ] ; then + cline="hg $* ${pull_default}/${i} ${i}" + echo "# ${cline}" + ( eval "${cline}" ) + else + cline="hg $*" + echo "# cd ${i} && ${cline}" + ( cd ${i} && eval "${cline}" ) + fi + echo "# exit code $?" + ) > ${tmp}/repo.${n} 2>&1 ; cat ${tmp}/repo.${n} ) & + if [ `expr ${n} '%' ${at_a_time}` -eq 0 ] ; then + sleep 5 + fi +done + +# Wait for all hg commands to complete +wait + +# Cleanup +rm -f -r ${tmp} + +# Terminate with exit 0 all the time (hard to know when to say "failed") +exit 0 + From cf458a1f543063f9336bad6cf4089b8f643c85b0 Mon Sep 17 00:00:00 2001 From: Christine Lu Date: Wed, 22 Dec 2010 15:57:04 -0800 Subject: [PATCH 06/12] Added tag jdk7-b123 for changeset 346d9718942b --- .hgtags-top-repo | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags-top-repo b/.hgtags-top-repo index 86759295812..6a03d78b921 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -97,3 +97,4 @@ a12a9e78df8a9d534da0b4a244ed68f0de0bd58e jdk7-b118 366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120 2c2d4f88637b488014c37e1a2eb401f68bca8838 jdk7-b121 f1591eed71f64f6eba79fb7426f5616cc4dfea73 jdk7-b122 +ed6950da30cf1e8904b4bdb034d471647942271f jdk7-b123 From edd7bbf2396526b365430b1116e5e651f7aeae08 Mon Sep 17 00:00:00 2001 From: Christine Lu Date: Wed, 22 Dec 2010 15:57:14 -0800 Subject: [PATCH 07/12] Added tag jdk7-b123 for changeset 5d1dc8153960 --- hotspot/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/.hgtags b/hotspot/.hgtags index b92574b671c..8122fc02445 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -136,3 +136,4 @@ f5603a6e50422046ebc0d2f1671d55cb8f1bf1e9 jdk7-b120 3f3653ab7af8dc1ddb9fa75dad56bf94f89e81a8 jdk7-b121 3a548dc9cb456110ca8fc1514441a8c3bda0014d jdk7-b122 5484e7c53fa7da5e869902437ee08a9ae10c1c69 hs20-b03 +9669f9b284108a9ee0a0ccbe215c37a130c9dcf5 jdk7-b123 From 088fd232f96df38b53c659360519d993105c9072 Mon Sep 17 00:00:00 2001 From: Erik Trimble Date: Wed, 22 Dec 2010 19:20:47 -0800 Subject: [PATCH 08/12] Added tag hs20-b04 for changeset 5d1dc8153960 --- hotspot/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/.hgtags b/hotspot/.hgtags index 8122fc02445..cb26cd3520f 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -137,3 +137,4 @@ f5603a6e50422046ebc0d2f1671d55cb8f1bf1e9 jdk7-b120 3a548dc9cb456110ca8fc1514441a8c3bda0014d jdk7-b122 5484e7c53fa7da5e869902437ee08a9ae10c1c69 hs20-b03 9669f9b284108a9ee0a0ccbe215c37a130c9dcf5 jdk7-b123 +9669f9b284108a9ee0a0ccbe215c37a130c9dcf5 hs20-b04 From d77b051398aa831dde2bc6402967721605b50337 Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Thu, 23 Dec 2010 18:41:57 -0800 Subject: [PATCH 09/12] 7008723: Remove binary plugs creation and use from openjdk Reviewed-by: mchung, andrew, aph, dholmes --- Makefile | 10 +----- README-builds.html | 76 ---------------------------------------------- 2 files changed, 1 insertion(+), 85 deletions(-) diff --git a/Makefile b/Makefile index 6b296080ad9..7c5b2db01c0 100644 --- a/Makefile +++ b/Makefile @@ -156,12 +156,6 @@ ifeq ($(BUILD_DEPLOY), true) clobber:: deploy-clobber endif -ifeq ($(BUILD_JDK), true) - ifeq ($(BUNDLE_RULES_AVAILABLE), true) - generic_build_repo_series:: openjdk-binary-plugs-bundles - endif -endif - # The debug build, fastdebug or debug. Needs special handling. # Note that debug builds do NOT do INSTALL steps, but must be done # after the product build and before the INSTALL step of the product build. @@ -301,7 +295,6 @@ ifneq ($(SKIP_OPENJDK_BUILD), true) ifeq ($(BUILD_JDK), true) ifeq ($(BUNDLE_RULES_AVAILABLE), true) -OPENJDK_PLUGS=$(ABS_OUTPUTDIR)/$(OPENJDK_BINARY_PLUGS_INAME) OPENJDK_OUTPUTDIR=$(ABS_OUTPUTDIR)/open-output OPENJDK_BUILD_NAME \ = openjdk-$(JDK_MINOR_VERSION)-$(BUILD_NUMBER)-$(PLATFORM)-$(ARCH)-$(BUNDLE_DATE) @@ -330,7 +323,6 @@ openjdk_build: GENERATE_DOCS=false \ ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR) \ ALT_OUTPUTDIR=$(OPENJDK_OUTPUTDIR) \ - ALT_BINARY_PLUGS_PATH=$(OPENJDK_PLUGS) \ ALT_BOOTDIR=$(OPENJDK_BOOTDIR) \ ALT_JDK_IMPORT_PATH=$(OPENJDK_IMPORTJDK) \ product_build ) @@ -545,7 +537,7 @@ examples_help: " ################################################################ -# Source and binary plug bundling +# Source bundling ################################################################ ifeq ($(BUNDLE_RULES_AVAILABLE), true) include $(BUNDLE_RULES) diff --git a/README-builds.html b/README-builds.html index 4b64ac22216..e48aaff3612 100644 --- a/README-builds.html +++ b/README-builds.html @@ -64,7 +64,6 @@
    • Build Dependencies
    -
    ALT_BINARY_PLUGS_PATH
    -
    - The location of the binary plugs installation. - See Binary Plugs for more information. - You should always have a local copy of a - recent Binary Plugs install image - and set this variable to that location. -
    ALT_JDK_IMPORT_PATH
    The location of a previously built JDK installation. @@ -1705,26 +1649,6 @@ Where each of these directories contain the import JDK image for that platform.
    -
    ALT_BUILD_BINARY_PLUGS_PATH
    -
    - These are useful in managing builds on multiple platforms. - The default network location for all of the binary plug images - for all platforms. - If ALT_BINARY_PLUGS_PATH - is not set, this directory will be used and should contain - the following directories: - solaris-sparc, - solaris-i586, - solaris-sparcv9, - solaris-amd64, - linux-i586, - linux-amd64, - windows-i586, - and - windows-amd64. - Where each of these directories contain the binary plugs image - for that platform. -
    Windows specific:
    From e02ff5e906a3a230f155ce9e7f85c80a912695fa Mon Sep 17 00:00:00 2001 From: Erik Trimble Date: Fri, 24 Dec 2010 07:59:50 -0800 Subject: [PATCH 10/12] 7008759: Bump the HS20 build number to 05 Update the HS20 build number to 05 Reviewed-by: jcoomes --- hotspot/make/hotspot_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hotspot/make/hotspot_version b/hotspot/make/hotspot_version index 57260490cc0..e0c46bb74d8 100644 --- a/hotspot/make/hotspot_version +++ b/hotspot/make/hotspot_version @@ -35,7 +35,7 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2010 HS_MAJOR_VER=20 HS_MINOR_VER=0 -HS_BUILD_NUMBER=04 +HS_BUILD_NUMBER=05 JDK_MAJOR_VER=1 JDK_MINOR_VER=7 From ce82625a2c3c3e9c32b591f14e8c1f039237eb1e Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Tue, 28 Dec 2010 15:52:09 -0800 Subject: [PATCH 11/12] 6962318: Update copyright year Reviewed-by: xdono --- make/Defs-internal.gmk | 2 +- make/deploy-rules.gmk | 2 +- make/hotspot-rules.gmk | 2 +- make/install-rules.gmk | 2 +- make/jprt.gmk | 2 +- make/sanity-rules.gmk | 2 +- make/scripts/update_copyright_year.sh | 189 ++++++++++++++++++++++++++ 7 files changed, 195 insertions(+), 6 deletions(-) create mode 100644 make/scripts/update_copyright_year.sh diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk index cab13f38de8..907ee95ac1e 100644 --- a/make/Defs-internal.gmk +++ b/make/Defs-internal.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/make/deploy-rules.gmk b/make/deploy-rules.gmk index 6b9f50c9767..1308d51518b 100644 --- a/make/deploy-rules.gmk +++ b/make/deploy-rules.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/make/hotspot-rules.gmk b/make/hotspot-rules.gmk index 9a85b93f990..674ce633da0 100644 --- a/make/hotspot-rules.gmk +++ b/make/hotspot-rules.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/make/install-rules.gmk b/make/install-rules.gmk index 56b9baa05dd..8e1f189d521 100644 --- a/make/install-rules.gmk +++ b/make/install-rules.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/make/jprt.gmk b/make/jprt.gmk index 57fd1d32e34..49687d9921d 100644 --- a/make/jprt.gmk +++ b/make/jprt.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/make/sanity-rules.gmk b/make/sanity-rules.gmk index 1ab62f7d601..58345ad09f4 100644 --- a/make/sanity-rules.gmk +++ b/make/sanity-rules.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/make/scripts/update_copyright_year.sh b/make/scripts/update_copyright_year.sh new file mode 100644 index 00000000000..cd8b0a07e2f --- /dev/null +++ b/make/scripts/update_copyright_year.sh @@ -0,0 +1,189 @@ +#!/bin/sh -f + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# Script to update the Copyright YEAR range in Mercurial sources. +# (Originally from xdono, Thanks!) + +if [ "`uname -s`" = "SunOS" ] ; then + awk=nawk +else + awk=awk +fi + +# Stop on any error +set -e + +# Temp area +tmp=/tmp/`basename $0`.${USER}.$$ +rm -f -r ${tmp} +mkdir -p ${tmp} +total=0 + +# This year or supplied year +if [ "$1" != "" ] ; then + year="$1" +else + year=`date +%Y` +fi + +# Return true if it makes sense to edit this file +saneFileToCheck() +{ + if [ "$1" != "" -a -f $1 ] ; then + isText=`file "$1" | egrep -i '(text|source)' | cat` + hasCopyright=`grep 'Copyright' "$1" | cat` + lastLineCount=`tail -1 "$1" | wc -l` + if [ "${isText}" != "" \ + -a "${hasCopyright}" != "" \ + -a ${lastLineCount} -eq 1 ] ; then + echo "true" + else + echo "false" + fi + else + echo "false" + fi +} + +# Update the copyright year on a file +updateFile() # file +{ + changed="false" + if [ `saneFileToCheck "$1"` = "true" ] ; then + copyright="Copyright (c)" + company="Oracle" + rm -f $1.OLD + mv $1 $1.OLD + cat $1.OLD | \ + sed -e "s@\(${copyright} [12][0-9][0-9][0-9],\) [12][0-9][0-9][0-9], ${company}@\1 ${year}, ${company}@" | \ + sed -e "s@\(${copyright} [12][0-9][0-9][0-9],\) ${company}@\1 ${year}, ${company}@" | \ + sed -e "s@${copyright} ${year}, ${year}, ${company}@${copyright} ${year}, ${company}@" \ + > $1 + if ! diff -b -w $1.OLD $1 > /dev/null ; then \ + changed="true" + rm -f $1.OLD + else + rm -f $1 + mv $1.OLD $1 + fi + fi + echo "${changed}" +} + +# Update the copyright year on all files changed by this changeset +updateChangesetFiles() # changeset +{ + count=0 + files=${tmp}/files.$1 + rm -f ${files} + hg log --rev $1 -v --template '{files}\n' | expand \ + | ${awk} -F' ' '{for(i=1;i<=NF;i++)print $i}' \ + > ${files} + if [ -f "${files}" -a -s "${files}" ] ; then + copyright="Copyright (c)" + company="Oracle" + fcount=`cat ${files}| wc -l` + for i in `cat ${files}` ; do + if [ `updateFile "${i}"` = "true" ] ; then + count=`expr ${count} '+' 1` + fi + done + if [ ${count} -gt 0 ] ; then + printf " UPDATED year on %d of %d files.\n" ${count} ${fcount} + total=`expr ${total} '+' ${count}` + else + printf " None of the %d files were changed.\n" ${fcount} + fi + else + printf " ERROR: No files changed in the changeset? Must be a mistake.\n" + set -x + ls -al ${files} + hg log --rev $1 -v --template '{files}\n' + hg log --rev $1 -v --template '{files}\n' | expand \ + | ${awk} -F' ' '{for(i=1;i<=NF;i++)print $i}' + set +x + exit 1 + fi + rm -f ${files} +} + +# Check if repository is clean +previous=`hg status|wc -l` +if [ ${previous} -ne 0 ] ; then + echo "WARNING: This repository contains previously edited working set files." + echo " hg status | wc -l = `hg status | wc -l`" +fi + +# Get all changesets this year +all_changesets=${tmp}/all_changesets +rm -f ${all_changesets} +hg log --no-merges -v -d "${year}-01-01 to ${year}-12-31" --template '{node}\n' > ${all_changesets} + +# Check changeset to see if it is Copyright only changes, filter changesets +if [ -s ${all_changesets} ] ; then + echo "Changesets made in ${year}: `cat ${all_changesets} | wc -l`" + index=0 + cat ${all_changesets} | while read changeset ; do + index=`expr ${index} '+' 1` + desc=${tmp}/desc.${changeset} + rm -f ${desc} + echo "------------------------------------------------" + hg log --rev ${changeset} --template '{desc}\n' > ${desc} + printf "%d: %s\n%s\n" ${index} "${changeset}" "`cat ${desc}|head -1`" + if cat ${desc} | fgrep -i "Added tag" > /dev/null ; then + printf " EXCLUDED tag changeset.\n" + elif cat ${desc} | fgrep -i rebrand > /dev/null ; then + printf " EXCLUDED rebrand changeset.\n" + elif cat ${desc} | fgrep -i copyright > /dev/null ; then + printf " EXCLUDED copyright changeset.\n" + else + updateChangesetFiles ${changeset} + fi + rm -f ${desc} + done +fi + +if [ ${total} -gt 0 ] ; then + echo "---------------------------------------------" + echo "Updated the copyright year on a total of ${total} files." + if [ ${previous} -eq 0 ] ; then + echo "This count should match the count of modified files in the repository: hg status -m" + else + echo "WARNING: This repository contained previously edited working set files." + fi + echo " hg status -m | wc -l = `hg status -m | wc -l`" +else + echo "---------------------------------------------" + echo "No files were changed" + if [ ${previous} -ne 0 ] ; then + echo "WARNING: This repository contained previously edited working set files." + fi + echo " hg status -m | wc -l = `hg status -m | wc -l`" +fi + +# Cleanup +rm -f -r ${tmp} +exit 0 + From 3c6a7c89ff6e0847eb59818cbfa36ce803e18de4 Mon Sep 17 00:00:00 2001 From: Erik Trimble Date: Mon, 3 Jan 2011 15:30:05 -0800 Subject: [PATCH 12/12] 7010068: Update all 2010 Oracle-changed OpenJDK files to have the proper copyright dates - first pass Update the copyright to be 2010 on all changed files in OpenJDK Reviewed-by: jcoomes --- hotspot/agent/src/os/linux/libproc_impl.c | 2 +- hotspot/agent/src/os/linux/ps_core.c | 2 +- hotspot/agent/src/os/linux/ps_proc.c | 2 +- hotspot/agent/src/os/linux/symtab.c | 2 +- hotspot/agent/src/os/linux/symtab.h | 2 +- .../classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java | 2 +- .../sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java | 2 +- .../share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java | 2 +- .../sun/jvm/hotspot/memory/CompactibleFreeListSpace.java | 2 +- .../share/classes/sun/jvm/hotspot/memory/SystemDictionary.java | 2 +- .../share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java | 2 +- .../classes/sun/jvm/hotspot/oops/ConstantPoolCacheEntry.java | 2 +- .../src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java | 2 +- hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Oop.java | 2 +- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java | 2 +- .../classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java | 2 +- .../src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js | 2 +- hotspot/make/hotspot_distro | 2 +- hotspot/make/hotspot_version | 2 +- hotspot/make/jprt.gmk | 2 +- hotspot/make/jprt.properties | 2 +- hotspot/make/linux/makefiles/defs.make | 2 +- hotspot/make/linux/makefiles/jvmti.make | 2 +- hotspot/make/linux/makefiles/mapfile-vers-debug | 2 +- hotspot/make/linux/makefiles/mapfile-vers-product | 2 +- hotspot/make/linux/makefiles/product.make | 2 +- hotspot/make/linux/makefiles/saproc.make | 2 +- hotspot/make/linux/makefiles/shark.make | 2 +- hotspot/make/linux/makefiles/sparcWorks.make | 2 +- hotspot/make/solaris/makefiles/defs.make | 2 +- hotspot/make/solaris/makefiles/fastdebug.make | 2 +- hotspot/make/solaris/makefiles/jvmti.make | 2 +- hotspot/make/solaris/makefiles/optimized.make | 2 +- hotspot/make/solaris/makefiles/product.make | 2 +- hotspot/make/solaris/makefiles/saproc.make | 2 +- hotspot/make/windows/build.bat | 2 +- hotspot/make/windows/get_msc_ver.sh | 2 +- hotspot/make/windows/makefiles/defs.make | 2 +- hotspot/make/windows/makefiles/sanity.make | 2 +- hotspot/src/os/solaris/dtrace/hotspot.d | 2 +- hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.s | 2 +- hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il | 2 +- hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.s | 2 +- hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.il | 2 +- hotspot/test/Makefile | 2 +- hotspot/test/compiler/6431242/Test.java | 2 +- hotspot/test/compiler/6857159/Test6857159.java | 2 +- hotspot/test/compiler/6877254/Test.java | 2 +- hotspot/test/compiler/6895383/Test.java | 2 +- hotspot/test/compiler/6896727/Test.java | 2 +- 50 files changed, 50 insertions(+), 50 deletions(-) diff --git a/hotspot/agent/src/os/linux/libproc_impl.c b/hotspot/agent/src/os/linux/libproc_impl.c index ade0638da66..971a8283519 100644 --- a/hotspot/agent/src/os/linux/libproc_impl.c +++ b/hotspot/agent/src/os/linux/libproc_impl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/agent/src/os/linux/ps_core.c b/hotspot/agent/src/os/linux/ps_core.c index 21dfd05cd7e..9739e161471 100644 --- a/hotspot/agent/src/os/linux/ps_core.c +++ b/hotspot/agent/src/os/linux/ps_core.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/agent/src/os/linux/ps_proc.c b/hotspot/agent/src/os/linux/ps_proc.c index 73b99c50021..676e88a44bc 100644 --- a/hotspot/agent/src/os/linux/ps_proc.c +++ b/hotspot/agent/src/os/linux/ps_proc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/agent/src/os/linux/symtab.c b/hotspot/agent/src/os/linux/symtab.c index 70ecf82e5aa..bea59e37823 100644 --- a/hotspot/agent/src/os/linux/symtab.c +++ b/hotspot/agent/src/os/linux/symtab.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/agent/src/os/linux/symtab.h b/hotspot/agent/src/os/linux/symtab.h index 534e33d7588..b2b9a3b9a27 100644 --- a/hotspot/agent/src/os/linux/symtab.h +++ b/hotspot/agent/src/os/linux/symtab.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java index aaf216676d9..15b49869cf7 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java index 55aba177058..fc0730feb14 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java index 16e35562f74..1306dc419db 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java index 2733af50aa1..06f149156ce 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java index 92cd92b9115..f8bb01adb96 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java index 0b162a438af..47a3facedfa 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCacheEntry.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCacheEntry.java index c3982615ccc..48bee4b9ed1 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCacheEntry.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCacheEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java index 82a20a5c96b..04d64086740 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Oop.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Oop.java index 02ba1eaff90..0e7e6fcce01 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Oop.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Oop.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java index 3d2afd9d754..c0b31065b72 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java index 508357f82f9..737bbc630ea 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js index f181bd6262a..246dbc6772b 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/hotspot_distro b/hotspot/make/hotspot_distro index fb960646c19..059f4d1f547 100644 --- a/hotspot/make/hotspot_distro +++ b/hotspot/make/hotspot_distro @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/hotspot_version b/hotspot/make/hotspot_version index e0c46bb74d8..d18a4e382c2 100644 --- a/hotspot/make/hotspot_version +++ b/hotspot/make/hotspot_version @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/jprt.gmk b/hotspot/make/jprt.gmk index 7495cc31456..8da610d7433 100644 --- a/hotspot/make/jprt.gmk +++ b/hotspot/make/jprt.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/jprt.properties b/hotspot/make/jprt.properties index 04554aabe92..132331e10f6 100644 --- a/hotspot/make/jprt.properties +++ b/hotspot/make/jprt.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/linux/makefiles/defs.make b/hotspot/make/linux/makefiles/defs.make index 561f7f58107..88329a6f583 100644 --- a/hotspot/make/linux/makefiles/defs.make +++ b/hotspot/make/linux/makefiles/defs.make @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/linux/makefiles/jvmti.make b/hotspot/make/linux/makefiles/jvmti.make index 292ccc8ef2d..43cdb9d8789 100644 --- a/hotspot/make/linux/makefiles/jvmti.make +++ b/hotspot/make/linux/makefiles/jvmti.make @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/linux/makefiles/mapfile-vers-debug b/hotspot/make/linux/makefiles/mapfile-vers-debug index edd213ea194..a7ba4583ee9 100644 --- a/hotspot/make/linux/makefiles/mapfile-vers-debug +++ b/hotspot/make/linux/makefiles/mapfile-vers-debug @@ -3,7 +3,7 @@ # # -# Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/linux/makefiles/mapfile-vers-product b/hotspot/make/linux/makefiles/mapfile-vers-product index 4cc8f15735d..7f7e279aa2f 100644 --- a/hotspot/make/linux/makefiles/mapfile-vers-product +++ b/hotspot/make/linux/makefiles/mapfile-vers-product @@ -3,7 +3,7 @@ # # -# Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/linux/makefiles/product.make b/hotspot/make/linux/makefiles/product.make index ff768b6a6bd..379685f5f51 100644 --- a/hotspot/make/linux/makefiles/product.make +++ b/hotspot/make/linux/makefiles/product.make @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/linux/makefiles/saproc.make b/hotspot/make/linux/makefiles/saproc.make index e65bf5ba142..68ec2378ad4 100644 --- a/hotspot/make/linux/makefiles/saproc.make +++ b/hotspot/make/linux/makefiles/saproc.make @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/linux/makefiles/shark.make b/hotspot/make/linux/makefiles/shark.make index f767a805039..ca702ee6616 100644 --- a/hotspot/make/linux/makefiles/shark.make +++ b/hotspot/make/linux/makefiles/shark.make @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2008, 2010 Red Hat, Inc. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # diff --git a/hotspot/make/linux/makefiles/sparcWorks.make b/hotspot/make/linux/makefiles/sparcWorks.make index d6fe9679b4b..77076fff16c 100644 --- a/hotspot/make/linux/makefiles/sparcWorks.make +++ b/hotspot/make/linux/makefiles/sparcWorks.make @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/solaris/makefiles/defs.make b/hotspot/make/solaris/makefiles/defs.make index 637b3b49c54..6fc596404d1 100644 --- a/hotspot/make/solaris/makefiles/defs.make +++ b/hotspot/make/solaris/makefiles/defs.make @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/solaris/makefiles/fastdebug.make b/hotspot/make/solaris/makefiles/fastdebug.make index 3537b3ab06e..1a033f0cba4 100644 --- a/hotspot/make/solaris/makefiles/fastdebug.make +++ b/hotspot/make/solaris/makefiles/fastdebug.make @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/solaris/makefiles/jvmti.make b/hotspot/make/solaris/makefiles/jvmti.make index 1a32cab7060..be07e0546bc 100644 --- a/hotspot/make/solaris/makefiles/jvmti.make +++ b/hotspot/make/solaris/makefiles/jvmti.make @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/solaris/makefiles/optimized.make b/hotspot/make/solaris/makefiles/optimized.make index 9cf8543233e..563bd4c4a09 100644 --- a/hotspot/make/solaris/makefiles/optimized.make +++ b/hotspot/make/solaris/makefiles/optimized.make @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/solaris/makefiles/product.make b/hotspot/make/solaris/makefiles/product.make index daf335cf332..e6ebeea7580 100644 --- a/hotspot/make/solaris/makefiles/product.make +++ b/hotspot/make/solaris/makefiles/product.make @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/solaris/makefiles/saproc.make b/hotspot/make/solaris/makefiles/saproc.make index 0f5a0bb4cd6..f94a9b4270d 100644 --- a/hotspot/make/solaris/makefiles/saproc.make +++ b/hotspot/make/solaris/makefiles/saproc.make @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/windows/build.bat b/hotspot/make/windows/build.bat index f40b2654a5e..ee0a6b058d2 100644 --- a/hotspot/make/windows/build.bat +++ b/hotspot/make/windows/build.bat @@ -1,6 +1,6 @@ @echo off REM -REM Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. +REM Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. REM REM This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/windows/get_msc_ver.sh b/hotspot/make/windows/get_msc_ver.sh index 0cea6d99b85..339e92b2f71 100644 --- a/hotspot/make/windows/get_msc_ver.sh +++ b/hotspot/make/windows/get_msc_ver.sh @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/windows/makefiles/defs.make b/hotspot/make/windows/makefiles/defs.make index b126c702a7d..ded87af7b46 100644 --- a/hotspot/make/windows/makefiles/defs.make +++ b/hotspot/make/windows/makefiles/defs.make @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/make/windows/makefiles/sanity.make b/hotspot/make/windows/makefiles/sanity.make index f874416d728..99f98d7e206 100644 --- a/hotspot/make/windows/makefiles/sanity.make +++ b/hotspot/make/windows/makefiles/sanity.make @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/src/os/solaris/dtrace/hotspot.d b/hotspot/src/os/solaris/dtrace/hotspot.d index 08cf99ad303..1f7d51b8cec 100644 --- a/hotspot/src/os/solaris/dtrace/hotspot.d +++ b/hotspot/src/os/solaris/dtrace/hotspot.d @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.s b/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.s index ff315197949..819293c8faa 100644 --- a/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.s +++ b/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.s @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il index 99b19a313ad..be111f4322e 100644 --- a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il +++ b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il @@ -1,5 +1,5 @@ // -// Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. +// Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. // // This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.s b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.s index 6219a698d66..1fac3b25f11 100644 --- a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.s +++ b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.s @@ -1,5 +1,5 @@ // -// Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved. +// Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. // // This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.il b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.il index 9b66b3652a1..b260375b164 100644 --- a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.il +++ b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.il @@ -1,5 +1,5 @@ // -// Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved. +// Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. // // This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/test/Makefile b/hotspot/test/Makefile index 8e245d120fc..9c66ade7e31 100644 --- a/hotspot/test/Makefile +++ b/hotspot/test/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/test/compiler/6431242/Test.java b/hotspot/test/compiler/6431242/Test.java index a5d6cea53ca..d5d8155634d 100644 --- a/hotspot/test/compiler/6431242/Test.java +++ b/hotspot/test/compiler/6431242/Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/test/compiler/6857159/Test6857159.java b/hotspot/test/compiler/6857159/Test6857159.java index 9d4ffc04954..58efa373e68 100644 --- a/hotspot/test/compiler/6857159/Test6857159.java +++ b/hotspot/test/compiler/6857159/Test6857159.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/test/compiler/6877254/Test.java b/hotspot/test/compiler/6877254/Test.java index d3805aad2e0..d4702217c13 100644 --- a/hotspot/test/compiler/6877254/Test.java +++ b/hotspot/test/compiler/6877254/Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/test/compiler/6895383/Test.java b/hotspot/test/compiler/6895383/Test.java index a234b13c9ee..a1a20e93250 100644 --- a/hotspot/test/compiler/6895383/Test.java +++ b/hotspot/test/compiler/6895383/Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/hotspot/test/compiler/6896727/Test.java b/hotspot/test/compiler/6896727/Test.java index 8a6afec0b1b..c2eb93b05e2 100644 --- a/hotspot/test/compiler/6896727/Test.java +++ b/hotspot/test/compiler/6896727/Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it