/hg/icedtea6: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 84b9054850f7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=84b9054850f7
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Feb 19 14:19:25 2010 +0000

	Make sure the RHINO_JAR variable always refers to a valid file.

	2010-02-19 Andrew John Hughes <ahughes at redhat.com>

	 * acinclude.m4: (FIND_RHINO_JAR): Clear RHINO_JAR
	variable if it still contains "no" at the end of the
	macro.


changeset 6bac0de50532 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6bac0de50532
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Feb 19 14:20:23 2010 +0000

	Merge


diffstat:

4 files changed, 28 insertions(+), 4 deletions(-)
ChangeLog                                                |   14 ++++++++++++++
acinclude.m4                                             |    4 ++++
ports/hotspot/src/cpu/zero/vm/globals_zero.hpp           |    4 ++--
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp |   10 ++++++++--

diffs (81 lines):

diff -r c597699b4fa6 -r 6bac0de50532 ChangeLog
--- a/ChangeLog	Fri Feb 19 01:16:48 2010 +0000
+++ b/ChangeLog	Fri Feb 19 14:20:23 2010 +0000
@@ -1,3 +1,17 @@ 2010-02-19 Andrew John Hughes  <ahughes@
+2010-02-19 Andrew John Hughes  <ahughes at redhat.com>
+
+	* acinclude.m4:
+	(FIND_RHINO_JAR): Clear RHINO_JAR variable
+	if it still contains "no" at the end of the
+	macro.
+
+2010-02-19  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/globals_zero.hpp:
+	Increase StackShadowPages from 3 to 5 on 32-bit platforms.
+	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
+	(os::atomic_copy64): Added s390 specific implementation.
+
 2010-02-19 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r c597699b4fa6 -r 6bac0de50532 acinclude.m4
--- a/acinclude.m4	Fri Feb 19 01:16:48 2010 +0000
+++ b/acinclude.m4	Fri Feb 19 14:20:23 2010 +0000
@@ -659,6 +659,10 @@ AC_DEFUN([FIND_RHINO_JAR],
   fi
   AC_MSG_RESULT(${RHINO_JAR})
   AM_CONDITIONAL(WITH_RHINO, test x"${RHINO_JAR}" != "xno")
+dnl Clear RHINO_JAR if it doesn't contain a valid filename
+  if test x"${RHINO_JAR}" = "xno"; then
+    RHINO_JAR=
+  fi
   AC_SUBST(RHINO_JAR)
 ])
 
diff -r c597699b4fa6 -r 6bac0de50532 ports/hotspot/src/cpu/zero/vm/globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp	Fri Feb 19 01:16:48 2010 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp	Fri Feb 19 14:20:23 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008, 2009 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@ define_pd_global(intx,  PreInflateSpin, 
 
 define_pd_global(intx,  StackYellowPages,     2);
 define_pd_global(intx,  StackRedPages,        1);
-define_pd_global(intx,  StackShadowPages,     3 LP64_ONLY(+3) DEBUG_ONLY(+3));
+define_pd_global(intx,  StackShadowPages,     5 LP64_ONLY(+1) DEBUG_ONLY(+3));
 
 define_pd_global(bool,  RewriteBytecodes,     true);
 define_pd_global(bool,  RewriteFrequentPairs, true);
diff -r c597699b4fa6 -r 6bac0de50532 ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp	Fri Feb 19 01:16:48 2010 +0000
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp	Fri Feb 19 14:20:23 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008 Red Hat, Inc.
+ * Copyright 2007, 2008, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,13 @@
                   "stfd %0, 0(%2)\n"
                   : "=f"(tmp)
                   : "b"(src), "b"(dst));
+#elif defined(S390) && !defined(_LP64)
+    double tmp;
+    asm volatile ("ld  %0, 0(%1)\n"
+                  "std %0, 0(%2)\n"
+                  : "=r"(tmp)
+                  : "a"(src), "a"(dst));
 #else
     *(jlong *) dst = *(jlong *) src;
-#endif // PPC && !_LP64
+#endif
   }