Mercurial > hg > release > icedtea6-1.6

view patches/hotspot/original/icedtea-includedb.patch @ 1702:6cb729c4a876

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make the normal (non-Zero/Shark) HotSpot original build work. 2010-03-10 Andrew John Hughes <ahughes@redhat.com> Fix the normal (non-Zero/Shark) build with the original HotSpot. * Makefile.am: Move format-warnings, fortify-source, 6791168 and includedb patch to set applied to all HotSpots. Add bytecodeInterpreter XSL fix back for original HotSpot. * patches/hotspot/default/icedtea-explicit-target-arch.patch: Move HotSpot chunk to separate hs14-specific file. * patches/hotspot/original/icedtea-6791168.patch, * patches/hotspot/original/icedtea-explicit-target-arch.patch, * patches/hotspot/original/icedtea-includedb.patch: New variants for original HotSpot (hs11). * patches/hotspot/original/icedtea-shark.patch: Fixed to apply to original HotSpot. * patches/icedtea-bytecodeInterpreterWithChecks.patch: Readded, reverting part of Gary's patch of 2009-05-08. * patches/icedtea-explicit-target-arch.patch: Remove HotSpot chunk and specialise it in HotSpot subdirectories.
author Andrew John Hughes <ahughes@redhat.com>
date Thu, 11 Mar 2010 22:57:54 +0000
parents patches/hotspot/default/icedtea-includedb.patch@0040fb0dcaf8
children
line wrap: on
line source

diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep
--- openjdk.orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep	2009-04-24 08:30:55.000000000 +0100
+++ openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep	2010-03-11 18:19:46.000000000 +0000
@@ -28,6 +28,7 @@
 binaryTreeDictionary.cpp                binaryTreeDictionary.hpp
 binaryTreeDictionary.cpp                globals.hpp
 binaryTreeDictionary.cpp                ostream.hpp
+binaryTreeDictionary.cpp                space.inline.hpp
 
 binaryTreeDictionary.hpp                freeBlockDictionary.hpp
 binaryTreeDictionary.hpp                freeList.hpp
diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge
--- openjdk.orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge	2009-04-24 08:30:55.000000000 +0100
+++ openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge	2010-03-11 18:19:04.000000000 +0000
@@ -302,6 +302,8 @@
 psPermGen.cpp                           psMarkSweepDecorator.hpp
 psPermGen.cpp                           psParallelCompact.hpp
 psPermGen.cpp                           psPermGen.hpp
+psPermGen.cpp                           markOop.inline.hpp
+psPermGen.cpp                           markSweep.inline.hpp
 
 psPermGen.hpp                           psOldGen.hpp
 
diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew
--- openjdk.orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew	2009-04-24 08:30:55.000000000 +0100
+++ openjdk/hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew	2010-03-11 18:20:07.000000000 +0000
@@ -29,6 +29,8 @@
 asParNewGeneration.cpp			cmsAdaptiveSizePolicy.hpp
 asParNewGeneration.cpp                  cmsGCAdaptivePolicyCounters.hpp
 asParNewGeneration.cpp			defNewGeneration.inline.hpp
+asParNewGeneration.cpp                  markOop.inline.hpp
+asParNewGeneration.cpp                  markSweep.inline.hpp
 asParNewGeneration.cpp			oop.pcgc.inline.hpp
 asParNewGeneration.cpp			parNewGeneration.hpp
 asParNewGeneration.cpp                  referencePolicy.hpp
@@ -39,7 +41,7 @@
 parCardTableModRefBS.cpp                java.hpp
 parCardTableModRefBS.cpp                mutexLocker.hpp
 parCardTableModRefBS.cpp                sharedHeap.hpp
-parCardTableModRefBS.cpp                space.hpp
+parCardTableModRefBS.cpp                space.inline.hpp
 parCardTableModRefBS.cpp                universe.hpp
 parCardTableModRefBS.cpp                virtualspace.hpp
 
diff -Nru openjdk.orig/hotspot/src/share/vm/includeDB_compiler2 openjdk/hotspot/src/share/vm/includeDB_compiler2
--- openjdk.orig/hotspot/src/share/vm/includeDB_compiler2	2009-04-24 08:30:55.000000000 +0100
+++ openjdk/hotspot/src/share/vm/includeDB_compiler2	2010-03-11 18:18:56.000000000 +0000
@@ -140,6 +140,7 @@
 c2_globals_<os_family>.hpp              macros.hpp
 
 c2_init_<arch>.cpp                      compile.hpp
+c2_init_<arch>.cpp                      node.hpp
 
 c2compiler.cpp                          ad_<arch_model>.hpp
 c2compiler.cpp                          c2compiler.hpp
@@ -833,6 +834,7 @@
 phase.cpp                               compile.hpp
 phase.cpp                               compileBroker.hpp
 phase.cpp                               nmethod.hpp
+phase.cpp                               node.hpp
 phase.cpp                               phase.hpp
 
 phase.hpp                               port.hpp
diff -Nru openjdk.orig/hotspot/src/share/vm/includeDB_core openjdk/hotspot/src/share/vm/includeDB_core
--- openjdk.orig/hotspot/src/share/vm/includeDB_core	2009-04-24 08:30:55.000000000 +0100
+++ openjdk/hotspot/src/share/vm/includeDB_core	2010-03-11 18:19:04.000000000 +0000
@@ -1304,6 +1304,7 @@
 cppInterpreter_<arch>.cpp               debug.hpp
 cppInterpreter_<arch>.cpp               deoptimization.hpp
 cppInterpreter_<arch>.cpp               frame.inline.hpp
+cppInterpreter_<arch>.cpp               interfaceSupport.hpp
 cppInterpreter_<arch>.cpp               interpreterRuntime.hpp
 cppInterpreter_<arch>.cpp               interpreter.hpp
 cppInterpreter_<arch>.cpp               interpreterGenerator.hpp
diff -Nru openjdk.orig/hotspot/src/share/vm/includeDB_features openjdk/hotspot/src/share/vm/includeDB_features
--- openjdk.orig/hotspot/src/share/vm/includeDB_features	2009-04-24 08:30:55.000000000 +0100
+++ openjdk/hotspot/src/share/vm/includeDB_features	2010-03-11 18:19:04.000000000 +0000
@@ -58,6 +58,8 @@
 
 dump_<arch_model>.cpp                   assembler_<arch_model>.inline.hpp
 dump_<arch_model>.cpp                   compactingPermGenGen.hpp
+dump_<arch_model>.cpp                   generation.inline.hpp
+dump_<arch_model>.cpp                   space.inline.hpp
 
 forte.cpp                               collectedHeap.inline.hpp
 forte.cpp                               debugInfoRec.hpp