comparison make/windows/makefiles/projectcreator.make @ 8124:5fc51c1ecdeb

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 05 Mar 2013 23:44:54 +0100
parents 5a95c784febf 8b46b0196eb0
children ded5288f5b96
comparison
equal deleted inserted replaced
7943:a413bcd552a4 8124:5fc51c1ecdeb
1 # 1 #
2 # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. 7 # published by the Free Software Foundation.
168 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ 168 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
169 $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=core) \ 169 $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=core) \
170 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=core) 170 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=core)
171 171
172 ################################################## 172 ##################################################
173 # JKERNEL specific options
174 ##################################################
175 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
176 -define_kernel KERNEL \
177 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=kernel) \
178 -ignorePath_kernel src/share/vm/gc_implementation/parallelScavenge \
179 -ignorePath_kernel src/share/vm/gc_implementation/parNew \
180 -ignorePath_kernel src/share/vm/gc_implementation/concurrentMarkSweep \
181 -ignorePath_kernel src/share/vm/gc_implementation/g1 \
182 -ignoreFile_kernel attachListener.cpp \
183 -ignoreFile_kernel attachListener_windows.cpp \
184 -ignoreFile_kernel dump.cpp \
185 -ignoreFile_kernel dump_$(Platform_arch_model).cpp \
186 -ignoreFile_kernel forte.cpp \
187 -ignoreFile_kernel fprofiler.cpp \
188 -ignoreFile_kernel heapDumper.cpp \
189 -ignoreFile_kernel heapInspection.cpp \
190 -ignoreFile_kernel jniCheck.cpp \
191 -ignoreFile_kernel jvmtiCodeBlobEvents.cpp \
192 -ignoreFile_kernel jvmtiExtensions.cpp \
193 -ignoreFile_kernel jvmtiImpl.cpp \
194 -ignoreFile_kernel jvmtiRawMonitor.cpp \
195 -ignoreFile_kernel jvmtiTagMap.cpp \
196 -ignoreFile_kernel jvmtiTrace.cpp \
197 -ignoreFile_kernel jvmtiTrace.hpp \
198 -ignoreFile_kernel restore.cpp \
199 -ignoreFile_kernel serialize.cpp \
200 -ignoreFile_kernel vmStructs.cpp \
201 -ignoreFile_kernel g1MemoryPool.cpp \
202 -ignoreFile_kernel g1MemoryPool.hpp \
203 -ignoreFile_kernel psMemoryPool.cpp \
204 -ignoreFile_kernel psMemoryPool.hpp \
205 -ignoreFile_kernel gcAdaptivePolicyCounters.cpp \
206 -ignoreFile_kernel concurrentGCThread.cpp \
207 -ignoreFile_kernel mutableNUMASpace.cpp \
208 -ignoreFile_kernel ciTypeFlow.cpp \
209 -ignoreFile_kernel ciTypeFlow.hpp \
210 -ignoreFile_kernel oop.pcgc.inline.hpp \
211 -ignoreFile_kernel oop.psgc.inline.hpp \
212 -ignoreFile_kernel allocationStats.cpp \
213 -ignoreFile_kernel allocationStats.hpp \
214 -ignoreFile_kernel concurrentGCThread.hpp \
215 -ignoreFile_kernel gSpaceCounters.cpp \
216 -ignoreFile_kernel gSpaceCounters.hpp \
217 -ignoreFile_kernel gcAdaptivePolicyCounters.hpp \
218 -ignoreFile_kernel immutableSpace.cpp \
219 -ignoreFile_kernel mutableNUMASpace.hpp \
220 -ignoreFile_kernel mutableSpace.cpp \
221 -ignoreFile_kernel spaceCounters.cpp \
222 -ignoreFile_kernel spaceCounters.hpp \
223 -ignoreFile_kernel yieldingWorkgroup.cpp \
224 -ignoreFile_kernel yieldingWorkgroup.hpp \
225 -ignorePath_kernel vmStructs_ \
226 -ignoreFile_kernel $(Platform_arch_model).ad \
227 -additionalFile_kernel gcTaskManager.hpp
228
229 ##################################################
230 # Client(C1) compiler specific options 173 # Client(C1) compiler specific options
231 ################################################## 174 ##################################################
232 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ 175 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
233 -define_compiler1 COMPILER1 \ 176 -define_compiler1 COMPILER1 \
234 -ignorePath_compiler1 core \ 177 -ignorePath_compiler1 core \