Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authordcubed
Mon, 10 Feb 2014 14:07:11 -0800
changeset 22756 b645b22cdfc1
parent 22753 749328896281 (current diff)
parent 22755 73553fa4d799 (diff)
child 22757 b2cbb3680b4f
Merge
--- a/hotspot/make/bsd/makefiles/optimized.make	Mon Feb 10 12:48:54 2014 -0800
+++ b/hotspot/make/bsd/makefiles/optimized.make	Mon Feb 10 14:07:11 2014 -0800
@@ -22,7 +22,7 @@
 #  
 #
 
-# Sets make macros for making optimized version of Gamma VM
+# Sets make macros for making optimized version of HotSpot VM
 # (This is the "product", not the "release" version.)
 
 # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
--- a/hotspot/make/bsd/makefiles/product.make	Mon Feb 10 12:48:54 2014 -0800
+++ b/hotspot/make/bsd/makefiles/product.make	Mon Feb 10 14:07:11 2014 -0800
@@ -22,7 +22,7 @@
 #  
 #
 
-# Sets make macros for making optimized version of Gamma VM
+# Sets make macros for making optimized version of HotSpot VM
 # (This is the "product", not the "release" version.)
 
 # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
--- a/hotspot/make/bsd/makefiles/top.make	Mon Feb 10 12:48:54 2014 -0800
+++ b/hotspot/make/bsd/makefiles/top.make	Mon Feb 10 14:07:11 2014 -0800
@@ -128,7 +128,7 @@
 	@$(UpdatePCH)
 	@$(MAKE) -f vm.make $(MFLAGS-adjusted)
 
-install gamma: the_vm
+install : the_vm
 	@$(MAKE) -f vm.make $@
 
 # next rules support "make foo.[ois]"
--- a/hotspot/make/linux/makefiles/optimized.make	Mon Feb 10 12:48:54 2014 -0800
+++ b/hotspot/make/linux/makefiles/optimized.make	Mon Feb 10 14:07:11 2014 -0800
@@ -22,7 +22,7 @@
 #  
 #
 
-# Sets make macros for making optimized version of Gamma VM
+# Sets make macros for making optimized version of HotSpot VM
 # (This is the "product", not the "release" version.)
 
 # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
--- a/hotspot/make/linux/makefiles/product.make	Mon Feb 10 12:48:54 2014 -0800
+++ b/hotspot/make/linux/makefiles/product.make	Mon Feb 10 14:07:11 2014 -0800
@@ -22,7 +22,7 @@
 #  
 #
 
-# Sets make macros for making optimized version of Gamma VM
+# Sets make macros for making optimized version of HotSpot VM
 # (This is the "product", not the "release" version.)
 
 # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
--- a/hotspot/make/linux/makefiles/top.make	Mon Feb 10 12:48:54 2014 -0800
+++ b/hotspot/make/linux/makefiles/top.make	Mon Feb 10 14:07:11 2014 -0800
@@ -122,7 +122,7 @@
 	@$(UpdatePCH)
 	@$(MAKE) -f vm.make $(MFLAGS-adjusted)
 
-install gamma: the_vm
+install: the_vm
 	@$(MAKE) -f vm.make $@
 
 # next rules support "make foo.[ois]"
--- a/hotspot/make/solaris/makefiles/optimized.make	Mon Feb 10 12:48:54 2014 -0800
+++ b/hotspot/make/solaris/makefiles/optimized.make	Mon Feb 10 14:07:11 2014 -0800
@@ -22,7 +22,7 @@
 #  
 #
 
-# Sets make macros for making optimized version of Gamma VM
+# Sets make macros for making optimized version of HotSpot VM
 # (This is the "product", not the "release" version.)
 
 # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
--- a/hotspot/make/solaris/makefiles/product.make	Mon Feb 10 12:48:54 2014 -0800
+++ b/hotspot/make/solaris/makefiles/product.make	Mon Feb 10 14:07:11 2014 -0800
@@ -22,7 +22,7 @@
 #  
 #
 
-# Sets make macros for making optimized version of Gamma VM
+# Sets make macros for making optimized version of HotSpot VM
 # (This is the "product", not the "release" version.)
 
 # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
--- a/hotspot/make/solaris/makefiles/top.make	Mon Feb 10 12:48:54 2014 -0800
+++ b/hotspot/make/solaris/makefiles/top.make	Mon Feb 10 14:07:11 2014 -0800
@@ -114,7 +114,7 @@
 the_vm: vm_build_preliminaries $(adjust-mflags)
 	@$(MAKE) -f vm.make $(MFLAGS-adjusted)
 
-install gamma: the_vm
+install: the_vm
 	@$(MAKE) -f vm.make $@
 
 # next rules support "make foo.[oi]"
jdk-sandbox