/hg/icedtea6: 2 new changesets

[andrew at icedtea.classpath.org]

changeset c310281529a8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c310281529a8
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Mar 04 19:39:41 2010 +0000

	441: Fix hotspot target on --with-openjdk.

	2010-03-04 Andrew John Hughes <ahughes at redhat.com>

	 PR 441:
		* Makefile.am: Don't unset ICEDTEA_BUILD_TARGET if unused.
	(hotspot): Support the WITH_OPENJDK configuration. Pass
	ICEDTEA_BUILD_TARGET=hotspot to make rather than having an
	additional hotspot-helper target. Don't remove bootstrap-
	directory-symlink-ecj.stamp as this just forces the
	bootstrap classes to be rebuilt. (hotspot-helper): Removed.


changeset b89dcb5b872c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b89dcb5b872c
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Mar 04 19:41:16 2010 +0000

	Merge


diffstat:

3 files changed, 30 insertions(+), 10 deletions(-)
ChangeLog                                          |   17 ++++++++++++++++
Makefile.am                                        |   21 +++++++++++---------
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp |    2 -

diffs (82 lines):

diff -r e1e9efa47cbe -r b89dcb5b872c ChangeLog
--- a/ChangeLog	Mon Mar 01 21:20:35 2010 +0000
+++ b/ChangeLog	Thu Mar 04 19:41:16 2010 +0000
@@ -1,3 +1,20 @@ 2010-03-01  Andrew John Hughes  <ahughes
+2010-03-04  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Don't unset ICEDTEA_BUILD_TARGET if unused.
+	(hotspot): Support the WITH_OPENJDK configuration.
+	Pass ICEDTEA_BUILD_TARGET=hotspot to make rather
+	than having an additional hotspot-helper target.
+	Don't remove bootstrap-directory-symlink-ecj.stamp
+	as this just forces the bootstrap classes to be rebuilt.
+	(hotspot-helper): Removed.
+
+2010-03-04  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+	(sharkCompiler::sharkCompiler): Move mattr define to make its memory
+	valid in the scope where it are used by the args vector.
+
 2010-03-01  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r e1e9efa47cbe -r b89dcb5b872c Makefile.am
--- a/Makefile.am	Mon Mar 01 21:20:35 2010 +0000
+++ b/Makefile.am	Thu Mar 04 19:41:16 2010 +0000
@@ -193,7 +193,6 @@ if WITH_CACAO
   ICEDTEA_BUILD_TARGET=j2se_only
   ICEDTEA_DEBUG_BUILD_TARGET=j2se_fastdebug_only
 else
-  ICEDTEA_BUILD_TARGET=
   ICEDTEA_DEBUG_BUILD_TARGET=debug_build
 endif
 
@@ -1566,21 +1565,25 @@ stamps/icedtea-ecj.stamp: stamps/bootstr
 	touch stamps/icedtea-ecj.stamp
 
 hotspot:
-	rm -f stamps/bootstrap-directory-symlink-ecj.stamp
+if WITH_OPENJDK
+	rm -f stamps/icedtea.stamp
+	rm -f stamps/icedtea-against-icedtea.stamp
+	$(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-against-icedtea
+	mkdir -p \
+	   $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
+	cp $(BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \
+	   $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
+	@echo "Hotspot is served:" $(BUILD_OUTPUT_DIR)/j2sdk-image
+else
 	rm -f stamps/icedtea-ecj.stamp
 	rm -f stamps/icedtea-against-ecj.stamp
-	$(ARCH_PREFIX) $(MAKE) hotspot-helper
+	$(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-against-ecj
 	mkdir -p \
 	   $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
 	cp $(ECJ_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \
 	   $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
 	@echo "Hotspot is served:" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
-
-hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \
-	stamps/plugs.stamp stamps/patch-ecj.stamp
-	$(ARCH_PREFIX) $(MAKE) \
-	  $(ICEDTEA_ENV_ECJ) \
-	  -C openjdk-ecj/ hotspot
+endif
 
 clean-icedtea-ecj: stamps/extract-ecj.stamp
 	rm -f stamps/icedtea-ecj.stamp
diff -r e1e9efa47cbe -r b89dcb5b872c ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Mon Mar 01 21:20:35 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Thu Mar 04 19:41:16 2010 +0000
@@ -71,8 +71,8 @@ SharkCompiler::SharkCompiler()
   args.push_back(""); // program name
   args.push_back(cpu.c_str());
 
+  std::string mattr("-mattr=");
   if(gotCpuFeatures){
-    std::string mattr("-mattr=");
     for(StringMap<bool>::iterator I = Features.begin(),
       E = Features.end(); I != E; ++I){
       if(I->second){