Kurt Miller | 15 Mar 16:44

precompiled headers and includeDB*

Hi,

The use of precompiled headers obscures problems with
the includeDB* files and they have become out of date.
Building on linux without defining USE_PRECOMPILED_HEADER
in build/linux/makefiles/gcc.make reveals the problems
with the includeDB* files.

I've taken a stab at updating the includeDB files but
I'm not fully sure I've got it all right so far. compiler2
completes ok, but compiler1 bails like this:

make[4]: Entering directory `/home/truk/openjdk/hotspot/build/linux/linux_i486_compiler1/product'
make[4]: *** No rule to make target `node.hpp', needed by `compactingPermGenGen.o'. Stop.

I could use some guidance at this point. Do the patches
below look correct so far?

Thanks,
-Kurt

--- src/share/vm/includeDB_core.orig	Fri Mar  9 09:52:24 2007
+++ src/share/vm/includeDB_core	Sat Mar 10 19:43:08 2007
@@ -429,7 +429,7 @@ cardTableModRefBS.cpp			cardTableRS.hpp
 cardTableModRefBS.cpp			java.hpp
 cardTableModRefBS.cpp			mutexLocker.hpp
 cardTableModRefBS.cpp			sharedHeap.hpp
-cardTableModRefBS.cpp			space.hpp
+cardTableModRefBS.cpp			space.inline.hpp
 cardTableModRefBS.cpp			virtualspace.hpp
 cardTableModRefBS.cpp			universe.hpp

@@ -706,7 +706,6 @@ compactPermGen.hpp			permGen.hpp

 compactingPermGenGen.cpp                compactingPermGenGen.hpp
 compactingPermGenGen.cpp                filemap.hpp
-compactingPermGenGen.cpp                generation.inline.hpp
 compactingPermGenGen.cpp                generationSpec.hpp
 compactingPermGenGen.cpp                genOopClosures.inline.hpp
 compactingPermGenGen.cpp                concurrentMarkSweepGeneration.inline.hpp
@@ -715,7 +714,8 @@ compactingPermGenGen.cpp                
 compactingPermGenGen.cpp                symbolTable.hpp
 compactingPermGenGen.cpp                systemDictionary.hpp

-compactingPermGenGen.hpp                space.hpp
+compactingPermGenGen.hpp                space.inline.hpp
+compactingPermGenGen.hpp                generation.inline.hpp

 compile.hpp				jvmpi.h

@@ -911,6 +911,7 @@ debug.cpp                               
 debug.cpp                               vframe.hpp
 debug.cpp                               vmError.hpp
 debug.cpp                               vtableStubs.hpp
+debug.cpp                               node.hpp

 debug.hpp                               globalDefinitions.hpp

@@ -1067,7 +1068,7 @@ filemap.cpp                             
 filemap.cpp                             symbolTable.hpp

 filemap.hpp                             compactingPermGenGen.hpp
-filemap.hpp                             space.hpp
+filemap.hpp                             node.hpp

 forte.cpp                               collectedHeap.inline.hpp
 forte.cpp                               forte.hpp
@@ -1093,6 +1094,7 @@ fprofiler.cpp                           
 fprofiler.cpp                           task.hpp
 fprofiler.cpp                           universe.inline.hpp
 fprofiler.cpp                           vframe.hpp
+fprofiler.cpp                           node.hpp

 fprofiler.hpp                           thread_<os_family>.inline.hpp
 fprofiler.hpp                           timer.hpp
@@ -1318,7 +1320,7 @@ genOopClosures.inline.hpp               
 genOopClosures.inline.hpp               genRemSet.hpp
 genOopClosures.inline.hpp               parNewGeneration.hpp
 genOopClosures.inline.hpp               sharedHeap.hpp
-genOopClosures.inline.hpp               space.hpp
+genOopClosures.inline.hpp               node.hpp

 generationSpec.cpp                      asParNewGeneration.hpp
 generationSpec.cpp                      compactPermGen.hpp
@@ -2343,7 +2345,7 @@ klass.hpp                               
 klass.hpp                               specialized_oop_closures.hpp

 klass.inline.hpp                        klass.hpp
-klass.inline.hpp                        markOop.hpp
+klass.inline.hpp                        markOop.inline.hpp

 klassKlass.cpp                          collectedHeap.hpp
 klassKlass.cpp                          collectedHeap.inline.hpp
@@ -2885,6 +2887,7 @@ oopMap.cpp                              
 oopMap.cpp                              oopMap.hpp
 oopMap.cpp                              resourceArea.hpp
 oopMap.cpp                              signature.hpp
+oopMap.cpp                              node.hpp

 oopMap.hpp                              allocation.hpp
 oopMap.hpp                              compressedStream.hpp
@@ -3506,7 +3509,7 @@ space.hpp                               
 space.hpp                               blockOffsetTable.hpp
 space.hpp                               cardTableModRefBS.hpp
 space.hpp                               iterator.hpp
-space.hpp                               markOop.hpp
+space.hpp                               markOop.inline.hpp
 space.hpp                               memRegion.hpp
 space.hpp                               mutexLocker.hpp
 space.hpp                               os_<os_family>.inline.hpp
@@ -3678,7 +3681,7 @@ symbolTable.hpp	                        
 symbolTable.hpp                         symbolOop.hpp

 synchronizer.hpp                        handles.hpp
-synchronizer.hpp                        markOop.hpp
+synchronizer.hpp                        markOop.inline.hpp
 synchronizer.hpp                        top.hpp
 synchronizer.hpp                        perfData.hpp

@@ -4150,6 +4153,7 @@ virtualspace.cpp                        
 virtualspace.hpp                        allocation.hpp

 vmError.hpp                             globalDefinitions.hpp
+vmError.hpp                             thread_<os_family>.inline.hpp

 vmError.cpp                             arguments.hpp
 vmError.cpp                             debug.hpp
--- src/share/vm/includeDB_compiler2.orig	Fri Mar  9 10:06:49 2007
+++ src/share/vm/includeDB_compiler2	Sat Mar 10 13:55:25 2007
@@ -140,7 +140,7 @@ c2compiler.cpp                          

 c2compiler.hpp                          abstractCompiler.hpp

-c2_init_≤arch>.cpp                      compile.hpp
+c2_init_≤arch>.cpp                      node.hpp

 callGenerator.hpp                       callnode.hpp
 callGenerator.hpp                       compile.hpp
@@ -1052,6 +1052,7 @@ phase.cpp                               
 phase.cpp                               compileBroker.hpp
 phase.cpp                               nmethod.hpp
 phase.cpp                               phase.hpp
+phase.cpp                               node.hpp

 phase.hpp                               port.hpp
 phase.hpp                               timer.hpp
--- src/share/vm/gc_implementation/includeDB_gc_shared.orig	Fri Mar  9 09:45:44 2007
+++ src/share/vm/gc_implementation/includeDB_gc_shared	Fri Mar  9 09:46:07 2007
@@ -44,7 +44,7 @@ ageTable.cpp                            
 ageTable.cpp                            resourceArea.hpp
 ageTable.cpp                            sharedHeap.hpp

-ageTable.hpp                            markOop.hpp
+ageTable.hpp                            markOop.inline.hpp
 ageTable.hpp                            oop.hpp
 ageTable.hpp                            perfData.hpp

@@ -114,7 +114,7 @@ markSweep.cpp                           

 markSweep.hpp                           growableArray.hpp
 markSweep.hpp                           jvmpi.hpp
-markSweep.hpp                           markOop.hpp
+markSweep.hpp                           markOop.inline.hpp
 markSweep.hpp                           oop.hpp
 markSweep.hpp                           timer.hpp
 markSweep.hpp                           universe.hpp
--- src/share/vm/gc_implementation/includeDB_gc_parallelScavenge.orig	Fri Mar  9 11:43:24 2007
+++ src/share/vm/gc_implementation/includeDB_gc_parallelScavenge	Fri Mar  9 11:44:05 2007
@@ -92,6 +92,7 @@ gcTaskManager.cpp                       
 gcTaskManager.cpp                       gcTaskThread.hpp
 gcTaskManager.cpp                       mutex.hpp
 gcTaskManager.cpp                       mutexLocker.hpp
+gcTaskManager.cpp                       thread_<os_family>.inline.hpp

 gcTaskThread.hpp                        thread.hpp


Gmane