Mercurial > hg > graal-compiler

comparison make/windows/makefiles/projectcreator.make @ 10408:836a62f43af9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 10:45:56 +0200
parents 62838eadbf56 f2110083203d
children f40010b67b6e
comparison
equal deleted inserted replaced
10086:e0fb8a213650 10408:836a62f43af9
17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 # 18 #
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 # or visit www.oracle.com if you need additional information or have any 20 # or visit www.oracle.com if you need additional information or have any
21 # questions. 21 # questions.
22 # 22 #
23 # 23 #
24 24
25 !include $(WorkSpace)/make/windows/makefiles/rules.make 25 !include $(WorkSpace)/make/windows/makefiles/rules.make
26 26
27 # This is used externally by both batch and IDE builds, so can't 27 # This is used externally by both batch and IDE builds, so can't
58 -relativeInclude src\gpu \ 58 -relativeInclude src\gpu \
59 -absoluteInclude $(HOTSPOTBUILDSPACE)/%f/generated \ 59 -absoluteInclude $(HOTSPOTBUILDSPACE)/%f/generated \
60 -relativeSrcInclude src \ 60 -relativeSrcInclude src \
61 -absoluteSrcInclude $(HOTSPOTBUILDSPACE) \ 61 -absoluteSrcInclude $(HOTSPOTBUILDSPACE) \
62 -ignorePath $(HOTSPOTBUILDSPACE) \ 62 -ignorePath $(HOTSPOTBUILDSPACE) \
63 -ignorePath launcher \
64 -ignorePath share\vm\adlc \ 63 -ignorePath share\vm\adlc \
65 -ignorePath share\vm\shark \ 64 -ignorePath share\vm\shark \
66 -ignorePath share\tools \ 65 -ignorePath share\tools \
67 -ignorePath solaris \ 66 -ignorePath solaris \
68 -ignorePath posix \ 67 -ignorePath posix \
72 -ignorePath osx \ 71 -ignorePath osx \
73 -ignorePath arm \ 72 -ignorePath arm \
74 -ignorePath ppc \ 73 -ignorePath ppc \
75 -ignorePath zero \ 74 -ignorePath zero \
76 -hidePath .hg 75 -hidePath .hg
77 76
78 77
79 # This is referenced externally by both the IDE and batch builds 78 # This is referenced externally by both the IDE and batch builds
80 ProjectCreatorOptions= 79 ProjectCreatorOptions=
81 80
82 # This is used externally, but only by the IDE builds, so we can 81 # This is used externally, but only by the IDE builds, so we can
89 -disablePch os_windows_$(Platform_arch).cpp \ 88 -disablePch os_windows_$(Platform_arch).cpp \
90 -disablePch osThread_windows.cpp \ 89 -disablePch osThread_windows.cpp \
91 -disablePch bytecodeInterpreter.cpp \ 90 -disablePch bytecodeInterpreter.cpp \
92 -disablePch bytecodeInterpreterWithChecks.cpp \ 91 -disablePch bytecodeInterpreterWithChecks.cpp \
93 -disablePch getThread_windows_$(Platform_arch).cpp \ 92 -disablePch getThread_windows_$(Platform_arch).cpp \
94 -disablePch_compiler2 opcodes.cpp 93 -disablePch_compiler2 opcodes.cpp
95 94
96 # Common options for the IDE builds for core, c1, and c2 95 # Common options for the IDE builds for core, c1, and c2
97 ProjectCreatorIDEOptions=\ 96 ProjectCreatorIDEOptions=\
98 $(ProjectCreatorIDEOptions) \ 97 $(ProjectCreatorIDEOptions) \
99 -sourceBase $(HOTSPOTWORKSPACE) \ 98 -sourceBase $(HOTSPOTWORKSPACE) \
103 -compiler $(VcVersion) \ 102 -compiler $(VcVersion) \
104 -projectFileName $(HOTSPOTBUILDSPACE)\$(ProjectFile) \ 103 -projectFileName $(HOTSPOTBUILDSPACE)\$(ProjectFile) \
105 -jdkTargetRoot $(HOTSPOTJDKDIST) \ 104 -jdkTargetRoot $(HOTSPOTJDKDIST) \
106 -define ALIGN_STACK_FRAMES \ 105 -define ALIGN_STACK_FRAMES \
107 -define VM_LITTLE_ENDIAN \ 106 -define VM_LITTLE_ENDIAN \
108 -prelink "" "Generating vm.def..." "cd %o set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) set JAVA_HOME=$(HOTSPOTJDKDIST) $(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh $(LD_VER)" \ 107 -prelink "" "Generating vm.def..." "cd $(HOTSPOTBUILDSPACE)\%f\%b set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) set JAVA_HOME=$(HOTSPOTJDKDIST) $(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh $(LD_VER)" \
109 -postbuild "" "Building hotspot.exe..." "cd %o set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) nmake -f $(HOTSPOTWORKSPACE)\make\windows\projectfiles\common\Makefile LOCAL_MAKE=$(HOTSPOTBUILDSPACE)\%f\local.make JAVA_HOME=$(HOTSPOTJDKDIST) launcher" \ 108 -postbuild "" "Building hotspot.exe..." "cd $(HOTSPOTBUILDSPACE)\%f\%b set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) nmake -f $(HOTSPOTWORKSPACE)\make\windows\projectfiles\common\Makefile LOCAL_MAKE=$(HOTSPOTBUILDSPACE)\%f\local.make JAVA_HOME=$(HOTSPOTJDKDIST) launcher" \
110 -ignoreFile jsig.c \ 109 -ignoreFile jsig.c \
111 -ignoreFile jvmtiEnvRecommended.cpp \ 110 -ignoreFile jvmtiEnvRecommended.cpp \
112 -ignoreFile jvmtiEnvStub.cpp \ 111 -ignoreFile jvmtiEnvStub.cpp \
113 -ignoreFile globalDefinitions_gcc.hpp \ 112 -ignoreFile globalDefinitions_gcc.hpp \
114 -ignoreFile globalDefinitions_sparcWorks.hpp \ 113 -ignoreFile globalDefinitions_sparcWorks.hpp \
116 -ignoreFile Xusage.txt \ 115 -ignoreFile Xusage.txt \
117 -define TARGET_ARCH_x86 \ 116 -define TARGET_ARCH_x86 \
118 -define TARGET_OS_ARCH_windows_x86 \ 117 -define TARGET_OS_ARCH_windows_x86 \
119 -define TARGET_OS_FAMILY_windows \ 118 -define TARGET_OS_FAMILY_windows \
120 -define TARGET_COMPILER_visCPP \ 119 -define TARGET_COMPILER_visCPP \
121 -define INCLUDE_TRACE \ 120 -define INCLUDE_TRACE=1 \
122 $(ProjectCreatorIncludesPRIVATE) 121 $(ProjectCreatorIncludesPRIVATE)
123 122
124 # Add in build-specific options 123 # Add in build-specific options
125 !if "$(BUILDARCH)" == "i486" 124 !if "$(BUILDARCH)" == "i486"
126 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ 125 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
223 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ 222 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
224 -additionalFile jvmtiEnv.hpp \ 223 -additionalFile jvmtiEnv.hpp \
225 -additionalFile jvmtiEnter.cpp \ 224 -additionalFile jvmtiEnter.cpp \
226 -additionalFile jvmtiEnterTrace.cpp \ 225 -additionalFile jvmtiEnterTrace.cpp \
227 -additionalFile jvmti.h \ 226 -additionalFile jvmti.h \
228 -additionalFile bytecodeInterpreterWithChecks.cpp 227 -additionalFile bytecodeInterpreterWithChecks.cpp \
228 -additionalFile traceEventClasses.hpp \
229 -additionalFile traceEventIds.hpp \
230 !if "$(OPENJDK)" != "true"
231 -additionalFile traceRequestables.hpp \
232 -additionalFile traceEventControl.hpp \
233 -additionalFile traceProducer.cpp \
234 !endif
235 -additionalFile traceTypes.hpp