rpms/java-1.6.0-openjdk/F-12 java-1.6.0-openjdk-globals-zero.patch, NONE, 1.1 java-1.6.0-openjdk.spec, 1.146, 1.147

Martin Matejovic mmatejov at fedoraproject.org
Mon Mar 8 12:53:11 UTC 2010


Author: mmatejov

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13488

Modified Files:
	java-1.6.0-openjdk.spec 
Added Files:
	java-1.6.0-openjdk-globals-zero.patch 
Log Message:

* Tue Mar 2 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-35.b17
- Added icedtea6-1.7.1
- Added java-1.6.0-openjdk-globals-zero.patch, fix ppc build failure
- Resolves: rhbz#542586
- Resolves: rhbz#568640
- Resolves: rhbz#567228
- Resolves: rhbz#539971
- Resolves: rhbz#555503
- Resolves: rhbz#523651
- Resolves: rhbz#500077
- Resolves: rhbz#475892


java-1.6.0-openjdk-globals-zero.patch:
 globals_zero.hpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE java-1.6.0-openjdk-globals-zero.patch ---
--- ports/hotspot/src/cpu/zero/vm/globals_zero.hpp2	2010-03-08 13:39:31.112165570 +0100
+++ ports/hotspot/src/cpu/zero/vm/globals_zero.hpp	2010-03-08 13:40:03.573885883 +0100
@@ -50,7 +50,7 @@
 
 define_pd_global(intx,  StackYellowPages,     2);
 define_pd_global(intx,  StackRedPages,        1);
-define_pd_global(intx,  StackShadowPages,     5 LP64_ONLY(+1) DEBUG_ONLY(+3));
+define_pd_global(intx,  StackShadowPages,     3 LP64_ONLY(+3) DEBUG_ONLY(+3));
 
 define_pd_global(bool,  RewriteBytecodes,     true);
 define_pd_global(bool,  RewriteFrequentPairs, true);


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-12/java-1.6.0-openjdk.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- java-1.6.0-openjdk.spec	4 Mar 2010 08:15:19 -0000	1.146
+++ java-1.6.0-openjdk.spec	8 Mar 2010 12:53:11 -0000	1.147
@@ -169,7 +169,7 @@ Patch1:   java-1.6.0-openjdk-java-access
 Patch2:   java-1.6.0-openjdk-java-access-bridge-idlj.patch
 Patch3:	  java-1.6.0-openjdk-java-access-bridge-security.patch
 Patch4:   java-1.6.0-openjdk-accessible-toolkit.patch
-
+Patch5:   java-1.6.0-openjdk-globals-zero.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
@@ -402,6 +402,7 @@ make stamps/patch-ecj.stamp
 make patch
 patch -l -p0 < %{PATCH3}
 patch -l -p0 < %{PATCH4}
+patch -l -p0 < %{PATCH5}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -949,6 +950,7 @@ exit 0
 %changelog
 * Tue Mar 2 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-35.b17
 - Added icedtea6-1.7.1
+- Added java-1.6.0-openjdk-globals-zero.patch, fix ppc build failure
 - Resolves: rhbz#542586
 - Resolves: rhbz#568640
 - Resolves: rhbz#567228



More information about the scm-commits mailing list