Mercurial > hg > truffle
annotate make/windows/makefiles/rules.make @ 1091:6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
Summary: Introduced a new write_ref_array(HeapWords* start, size_t count) method that does the requisite MemRegion range calculation so (some of the) clients of the erstwhile write_ref_array(MemRegion mr) do not need to worry. This removed all external uses of array_size(), which was also simplified and made private. Asserts were added to catch other possible issues. Further, less essential, fixes stemming from this investigation are deferred to CR 6904516 (to follow shortly in hs17).
Reviewed-by: kvn, coleenp, jmasa
| author | ysr |
|---|---|
| date | Thu, 03 Dec 2009 15:01:57 -0800 |
| parents | 0fc81f0a8ca8 |
| children | c18cbe5936b8 |
| rev | line source |
|---|---|
| 0 | 1 # |
| 844 | 2 # Copyright 2003-2009 Sun Microsystems, Inc. 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 # | |
| 19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | |
| 20 # CA 95054 USA or visit www.sun.com if you need additional information or | |
| 21 # have any questions. | |
| 22 # | |
| 23 # | |
| 24 | |
| 25 # These are the commands used externally to compile and run. | |
| 26 | |
| 27 !ifdef BootStrapDir | |
| 28 RUN_JAVA=$(BootStrapDir)\bin\java | |
| 29 RUN_JAVAP=$(BootStrapDir)\bin\javap | |
| 30 RUN_JAVAH=$(BootStrapDir)\bin\javah | |
| 31 RUN_JAR=$(BootStrapDir)\bin\jar | |
|
971
0fc81f0a8ca8
6873059: Explicitly use -source 6 -target 6 when compiling with the boot jdk
andrew
parents:
844
diff
changeset
|
32 COMPILE_JAVAC=$(BootStrapDir)\bin\javac $(BOOTSTRAP_JAVAC_FLAGS) |
| 0 | 33 COMPILE_RMIC=$(BootStrapDir)\bin\rmic |
| 34 BOOT_JAVA_HOME=$(BootStrapDir) | |
| 35 !else | |
| 36 RUN_JAVA=java | |
| 37 RUN_JAVAP=javap | |
| 38 RUN_JAVAH=javah | |
| 39 RUN_JAR=jar | |
|
971
0fc81f0a8ca8
6873059: Explicitly use -source 6 -target 6 when compiling with the boot jdk
andrew
parents:
844
diff
changeset
|
40 COMPILE_JAVAC=javac $(BOOTSTRAP_JAVAC_FLAGS) |
| 0 | 41 COMPILE_RMIC=rmic |
| 42 BOOT_JAVA_HOME= | |
| 43 !endif | |
| 44 | |
|
971
0fc81f0a8ca8
6873059: Explicitly use -source 6 -target 6 when compiling with the boot jdk
andrew
parents:
844
diff
changeset
|
45 # Settings for javac |
|
0fc81f0a8ca8
6873059: Explicitly use -source 6 -target 6 when compiling with the boot jdk
andrew
parents:
844
diff
changeset
|
46 BOOT_SOURCE_LANGUAGE_VERSION=6 |
|
0fc81f0a8ca8
6873059: Explicitly use -source 6 -target 6 when compiling with the boot jdk
andrew
parents:
844
diff
changeset
|
47 BOOT_TARGET_CLASS_VERSION=6 |
|
0fc81f0a8ca8
6873059: Explicitly use -source 6 -target 6 when compiling with the boot jdk
andrew
parents:
844
diff
changeset
|
48 JAVAC_FLAGS=-g -encoding ascii |
|
0fc81f0a8ca8
6873059: Explicitly use -source 6 -target 6 when compiling with the boot jdk
andrew
parents:
844
diff
changeset
|
49 BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) |
|
0fc81f0a8ca8
6873059: Explicitly use -source 6 -target 6 when compiling with the boot jdk
andrew
parents:
844
diff
changeset
|
50 |
|
659
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
51 ProjectFile=vm.vcproj |
|
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
52 |
| 0 | 53 !if "$(MSC_VER)" == "1200" |
|
659
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
54 |
| 0 | 55 VcVersion=VC6 |
| 56 ProjectFile=vm.dsp | |
|
659
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
57 |
|
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
58 !elseif "$(MSC_VER)" == "1400" |
|
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
59 |
|
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
60 VcVersion=VC8 |
|
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
61 |
|
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
62 !elseif "$(MSC_VER)" == "1500" |
|
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
63 |
|
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
64 VcVersion=VC9 |
|
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
65 |
| 0 | 66 !else |
|
659
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
67 |
| 0 | 68 VcVersion=VC7 |
|
659
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
69 |
| 0 | 70 !endif |