changeset in /hg/icedtea: 2008-03-03 Gary Benson <gbenson at redh...

[Gary Benson]

changeset c4f526a28d0c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c4f526a28d0c
description:
	2008-03-03  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-ppc-stack-hack.patch: Removed.
		* Makefile.am (ICEDTEA_PATCHES): Removed the above.
		* Makefile.in: Regenerated.

		* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
		(current_stack_region): Fudge reported stack size.

diffstat:

5 files changed, 16 insertions(+), 36 deletions(-)
ChangeLog                                                |    9 +++
Makefile.am                                              |    1 
Makefile.in                                              |    1 
patches/icedtea-ppc-stack-hack.patch                     |   32 --------------
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp |    9 +++

diffs (93 lines):

diff -r 448e495b7740 -r c4f526a28d0c ChangeLog
--- a/ChangeLog	Fri Feb 29 11:27:35 2008 -0500
+++ b/ChangeLog	Mon Mar 03 06:45:08 2008 -0500
@@ -1,3 +1,12 @@ 2008-02-29  Gary Benson  <gbenson at redhat
+2008-03-03  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-ppc-stack-hack.patch: Removed.
+	* Makefile.am (ICEDTEA_PATCHES): Removed the above.
+	* Makefile.in: Regenerated.
+
+	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+	(current_stack_region): Fudge reported stack size.
+
 2008-02-29  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-ppc-stack-hack.patch: More.
diff -r 448e495b7740 -r c4f526a28d0c Makefile.am
--- a/Makefile.am	Fri Feb 29 11:27:35 2008 -0500
+++ b/Makefile.am	Mon Mar 03 06:45:08 2008 -0500
@@ -281,7 +281,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-lib64.patch \
 	patches/icedtea-zero.patch \
 	patches/icedtea-freetype.patch \
-	patches/icedtea-ppc-stack-hack.patch \
 	$(GCC_PATCH) \
 	$(FAST_BUILD_PATCH) \
 	$(ZERO_BUILD_PATCH) \
diff -r 448e495b7740 -r c4f526a28d0c Makefile.in
--- a/Makefile.in	Fri Feb 29 11:27:35 2008 -0500
+++ b/Makefile.in	Mon Mar 03 06:45:08 2008 -0500
@@ -376,7 +376,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-lib64.patch \
 	patches/icedtea-zero.patch \
 	patches/icedtea-freetype.patch \
-	patches/icedtea-ppc-stack-hack.patch \
 	$(GCC_PATCH) \
 	$(FAST_BUILD_PATCH) \
 	$(ZERO_BUILD_PATCH) \
diff -r 448e495b7740 -r c4f526a28d0c patches/icedtea-ppc-stack-hack.patch
--- a/patches/icedtea-ppc-stack-hack.patch	Fri Feb 29 11:27:35 2008 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-diff -r 6a85c2ba896a openjdk/hotspot/src/os/linux/vm/os_linux.cpp
---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp	Fri Feb 29 10:10:42 2008 +0000
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	Fri Feb 29 10:17:34 2008 +0000
-@@ -845,7 +845,12 @@ bool os::create_thread(Thread* thread, T
-     }
- 
-     stack_size = MAX2(stack_size, os::Linux::min_stack_allowed);
-+#ifdef PPC
-+    // https://bugzilla.redhat.com/show_bug.cgi?id=435337
-+    pthread_attr_setstacksize(&attr, stack_size + 64*K);
-+#else
-     pthread_attr_setstacksize(&attr, stack_size);
-+#endif // PPC
-   } else {
-     // let pthread_create() pick the default value.
-   }
-diff -r 536e71398adf openjdk/jdk/src/solaris/bin/java_md.c
---- openjdk/jdk/src/solaris/bin/java_md.c	Fri Feb 29 11:03:05 2008 +0000
-+++ openjdk/jdk/src/solaris/bin/java_md.c	Fri Feb 29 16:24:48 2008 +0000
-@@ -1254,7 +1254,12 @@ ContinueInNewThread0(int (JNICALL *conti
-     pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
- 
-     if (stack_size > 0) {
-+#ifdef PPC
-+      // https://bugzilla.redhat.com/show_bug.cgi?id=435337      
-+      pthread_attr_setstacksize(&attr, stack_size + 64*K);
-+#else
-       pthread_attr_setstacksize(&attr, stack_size);
-+#endif // PPC
-     }
- 
-     if (pthread_create(&tid, &attr, (void *(*)(void*))continuation, (void*)args) == 0) {
diff -r 448e495b7740 -r c4f526a28d0c ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Fri Feb 29 11:27:35 2008 -0500
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Mon Mar 03 06:45:08 2008 -0500
@@ -245,8 +245,13 @@ static void current_stack_region(address
      }
 
      pthread_attr_destroy(&attr);
-
-  }
+  }
+
+#ifdef PPC
+  // https://bugzilla.redhat.com/show_bug.cgi?id=435337
+  *size -= 64*K;
+#endif
+
   assert(os::current_stack_pointer() >= *bottom &&
          os::current_stack_pointer() < *bottom + *size, "just checking");
 }