Mercurial > hg > truffle
annotate make/windows/projectfiles/common/Makefile @ 20543:e7d0505c8a30
8059758: Footprint regressions with JDK-8038423
Summary: Changes in JDK-8038423 always initialize (zero out) virtual memory used for auxiliary data structures. This causes a footprint regression for G1 in startup benchmarks. This is because they do not touch that memory at all, so the operating system does not actually commit these pages. The fix is to, if the initialization value of the data structures matches the default value of just committed memory (=0), do not do anything.
Reviewed-by: jwilhelm, brutisso
author | tschatzl |
---|---|
date | Fri, 10 Oct 2014 15:51:58 +0200 |
parents | bd0e82136b03 |
children |
rev | line source |
---|---|
0 | 1 # |
10405 | 2 # Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. |
0 | 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # | |
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 | |
7 # published by the Free Software Foundation. | |
8 # | |
9 # This code is distributed in the hope that it will be useful, but WITHOUT | |
10 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
11 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
12 # version 2 for more details (a copy is included in the LICENSE file that | |
13 # accompanied this code). | |
14 # | |
15 # You should have received a copy of the GNU General Public License version | |
16 # 2 along with this work; if not, write to the Free Software Foundation, | |
17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
18 # | |
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
971
diff
changeset
|
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
971
diff
changeset
|
20 # or visit www.oracle.com if you need additional information or have any |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
971
diff
changeset
|
21 # questions. |
0 | 22 # |
23 # | |
24 | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
25 !ifdef LOCAL_MAKE |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
26 !include $(LOCAL_MAKE) |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
27 !endif |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
28 |
1972 | 29 |
0 | 30 WorkSpace=$(HOTSPOTWORKSPACE) |
31 | |
32 !ifdef ALT_BOOTDIR | |
33 BootStrapDir=$(ALT_BOOTDIR) | |
34 !else | |
35 !ifdef BOOTDIR | |
36 BootStrapDir=$(BOOTDIR) | |
37 !else | |
38 !ifdef JAVA_HOME | |
39 BootStrapDir=$(JAVA_HOME) | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
40 !else |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
41 !ifdef HOTSPOTJDKDIST |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
42 BootStrapDir=$(HOTSPOTJDKDIST) |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
43 !endif |
0 | 44 !endif |
45 !endif | |
46 !endif | |
47 | |
10405 | 48 # if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK |
49 !ifndef OPENJDK | |
50 !if !exists($(WorkSpace)\src\closed) | |
51 OPENJDK=true | |
52 !endif | |
53 !endif | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
54 |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
55 |
1972 | 56 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/projectcreator.make |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
57 !include $(WorkSpace)/make/windows/makefiles/compile.make |
0 | 58 |
59 # Pick up rules for building JVMTI (JSR-163) | |
1972 | 60 JvmtiOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\jvmtifiles |
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
61 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/jvmti.make |
0 | 62 |
10405 | 63 # Pick up rules for building trace |
64 TraceOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\tracefiles | |
65 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/trace.make | |
66 | |
0 | 67 !if "$(Variant)" == "compiler2" |
68 # Pick up rules for building adlc | |
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
69 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make |
0 | 70 !endif |
71 | |
72 !if "$(Variant)" == "tiered" | |
73 # Pick up rules for building adlc | |
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
74 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make |
0 | 75 !endif |
76 | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
77 HS_INTERNAL_NAME=jvm |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
78 |
10405 | 79 default:: $(AdditionalTargets) $(JvmtiGeneratedFiles) $(TraceGeneratedFiles) |
0 | 80 |
81 !include $(HOTSPOTWORKSPACE)/make/hotspot_version | |
82 | |
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
83 !if "$(USER_RELEASE_SUFFIX)" != "" |
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
84 HOTSPOT_BUILD_VERSION = internal-$(USER_RELEASE_SUFFIX) |
0 | 85 !else |
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
86 HOTSPOT_BUILD_VERSION = internal |
0 | 87 !endif |
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
88 !if "$(HOTSPOT_RELEASE_VERSION)" != "" |
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
89 HOTSPOT_RELEASE_VERSION="\\\"$(HOTSPOT_RELEASE_VERSION)\\\"" |
1977
c7db7adb83b4
6987107: Add variable to add to but not modify non-fcs version string
ohair
parents:
1552
diff
changeset
|
90 !else |
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
91 HOTSPOT_RELEASE_VERSION="\\\"$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER)-$(HOTSPOT_BUILD_VERSION)\\\"" |
0 | 92 !endif |
93 !if "$(JRE_RELEASE_VERSION)" != "" | |
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
94 JRE_RELEASE_VERSION="\\\"$(JRE_RELEASE_VERSION)\\\"" |
0 | 95 !else |
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
96 JRE_RELEASE_VERSION="\\\"$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER)\\\"" |
0 | 97 !endif |
98 | |
99 # Define HOTSPOT_VM_DISTRO if HOTSPOT_VM_DISTRO is set, | |
100 # and if it is not see if we have the src/closed directory | |
101 !if "$(HOTSPOT_VM_DISTRO)" != "" | |
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
102 HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) |
0 | 103 !else |
104 !if exists($(HOTSPOTWORKSPACE)\src\closed) | |
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
105 HOTSPOT_VM_DISTRO="\\\"Java HotSpot(TM)\\\"" |
0 | 106 !else |
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
107 HOTSPOT_VM_DISTRO="\\\"OpenJDK\\\"" |
0 | 108 !endif |
109 !endif | |
110 | |
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
111 ReleaseOptions = -define HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) -define JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) -define HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) |
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
112 ProjectCreatorIDEOptions = $(ProjectCreatorIDEOptions) $(ReleaseOptions) |
0 | 113 |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
114 $(HOTSPOTBUILDSPACE)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class |
12021 | 115 @if "$(MSC_VER)"=="1500" echo Make sure you have VS2008 SP1 or later, or you may see 'expanded command line too long' |
6606
98625323d3a3
7190512: Fix for 7181175 broke hotspot/make/windows/create.bat builds
tbell
parents:
2233
diff
changeset
|
116 @$(RUN_JAVA) -Djava.class.path="$(HOTSPOTBUILDSPACE)/classes" ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions) |
0 | 117 |
118 clean: | |
1972 | 119 @rm -rf $(HOTSPOTBUILDSPACE)/classes |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
120 @rm -r $(HOTSPOTBUILDSPACE)/$(ProjectFile) |
0 | 121 |
1972 | 122 $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class: $(ProjectCreatorSources) |
0 | 123 @if exist $(HOTSPOTBUILDSPACE)\classes rmdir /s /q $(HOTSPOTBUILDSPACE)\classes |
124 @mkdir $(HOTSPOTBUILDSPACE)\classes | |
1972 | 125 @$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\ProjectCreator -d $(HOTSPOTBUILDSPACE)/classes $(ProjectCreatorSources) |
0 | 126 |
127 FORCE: |