diff --git a/1015432.patch b/1015432.patch new file mode 100644 index 0000000..709f0a9 --- /dev/null +++ b/1015432.patch @@ -0,0 +1,23 @@ +--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp Wed Oct 23 15:44:12 2013 -0700 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Thu Dec 19 16:03:33 2013 +0000 +@@ -4797,9 +4797,19 @@ + // size. Add a page for compiler2 recursion in main thread. + // Add in 2*BytesPerWord times page size to account for VM stack during + // class initialization depending on 32 or 64 bit VM. ++ ++ + os::Linux::min_stack_allowed = MAX2(os::Linux::min_stack_allowed, + (size_t)(StackYellowPages+StackRedPages+StackShadowPages) * Linux::page_size() + +- (2*BytesPerWord COMPILER2_PRESENT(+1)) * Linux::vm_default_page_size()); ++ (2*BytesPerWord COMPILER2_PRESENT(+1)) ++ * ++#ifdef PPC ++ NOT_ZERO ( Linux::vm_default_page_size() ) ++ ZERO_ONLY ( Linux::page_size() ) ++#else ++ ( Linux::vm_default_page_size() ) ++#endif ++ ); + + size_t threadStackSizeInBytes = ThreadStackSize * K; + if (threadStackSizeInBytes != 0 && diff --git a/1029588-2.3.patch b/1029588-2.3.patch new file mode 100644 index 0000000..03ee9fa --- /dev/null +++ b/1029588-2.3.patch @@ -0,0 +1,29 @@ + +# HG changeset patch +# User andrew +# Date 1357338114 0 +# Node ID a57f192585241b5e3f004067f77ebffcfc534df5 +# Parent 0685d07e5b432570a695af560f9dc7164a59a931 +Include defs.make in buildtree.make so ZERO_BUILD is recognised and JVM_VARIANT_ZERO set. + +diff -r 0685d07e5b43 -r a57f19258524 openjdk/hotspot/make/linux/makefiles/buildtree.make +--- openjdk/hotspot/make/linux/makefiles/buildtree.make Thu Jan 03 15:32:49 2013 +0000 ++++ openjdk/hotspot/make/linux/makefiles/buildtree.make Fri Jan 04 22:21:54 2013 +0000 +@@ -56,6 +56,8 @@ + # The makefiles are split this way so that "make foo" will run faster by not + # having to read the dependency files for the vm. + ++-include $(SPEC) ++include $(GAMMADIR)/make/defs.make + include $(GAMMADIR)/make/scm.make + include $(GAMMADIR)/make/altsrc.make + +@@ -192,6 +193,7 @@ + $(BUILDTREE_COMMENT); \ + echo; \ + echo "Platform_file = $(PLATFORM_FILE)" | sed 's|$(GAMMADIR)|$$(GAMMADIR)|'; \ ++ echo "JVM_VARIANTS = $(JVM_VARIANTS)"; \ + sed -n '/=/s/^ */Platform_/p' < $(PLATFORM_FILE); \ + echo; \ + echo "GAMMADIR = $(GAMMADIR)"; \ + diff --git a/1029588.patch b/1029588.patch new file mode 100644 index 0000000..6ad965f --- /dev/null +++ b/1029588.patch @@ -0,0 +1,20 @@ + +# HG changeset patch +# User andrew +# Date 1357338114 0 +# Node ID a57f192585241b5e3f004067f77ebffcfc534df5 +# Parent 0685d07e5b432570a695af560f9dc7164a59a931 +Include defs.make in buildtree.make so ZERO_BUILD is recognised and JVM_VARIANT_ZERO set. + +diff -r 0685d07e5b43 -r a57f19258524 openjdk/hotspot/make/linux/makefiles/buildtree.make +--- openjdk/hotspot/make/linux/makefiles/buildtree.make Thu Jan 03 15:32:49 2013 +0000 ++++ openjdk/hotspot/make/linux/makefiles/buildtree.make Fri Jan 04 22:21:54 2013 +0000 +@@ -192,6 +193,7 @@ + $(BUILDTREE_COMMENT); \ + echo; \ + echo "Platform_file = $(PLATFORM_FILE)" | sed 's|$(GAMMADIR)|$$(GAMMADIR)|'; \ ++ echo "JVM_VARIANTS = $(JVM_VARIANTS)"; \ + sed -n '/=/s/^ */Platform_/p' < $(PLATFORM_FILE); \ + echo; \ + echo "GAMMADIR = $(GAMMADIR)"; \ + diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec index d9ea350..ce2256c 100644 --- a/java-1.7.0-openjdk.spec +++ b/java-1.7.0-openjdk.spec @@ -150,7 +150,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.60 -Release: %{icedtea_version}.2%{?dist} +Release: %{icedtea_version}.4%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -276,6 +276,9 @@ Patch401: 657854-openjdk7.patch Patch402: gstackbounds.patch Patch4020: gstackbounds-2.3.patch Patch403: PStack-808293.patch +Patch410: 1015432.patch +Patch411: 1029588.patch +Patch4110: 1029588-2.3.patch # End of tmp patches BuildRequires: autoconf @@ -382,7 +385,7 @@ Provides: jre-%{javaver}-%{origin}-headless = %{epoch}:%{version}-%{release} Provides: jre-%{origin}-headless = %{epoch}:%{version}-%{release} Provides: jre-%{javaver}-headless = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-headless = %{epoch}:%{version}-%{release} -Provides: jre-headless = %{javaver} +Provides: jre-headless = %{epoch}:%{javaver} Provides: java-%{origin}-headless = %{epoch}:%{version}-%{release} Provides: java-headless = %{epoch}:%{javaver} # Standard JPackage extensions provides. @@ -568,6 +571,16 @@ tar xzf %{SOURCE9} %patch403 %endif +%ifnarch %{arm} +%patch410 +%endif + +%ifarch %{arm} +%patch4110 +%else +%patch411 +%endif + %build # How many cpu's do we have? %ifarch aarch64 @@ -1434,6 +1447,17 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Mon Jan 06 2014 Jiri Vanek - 1.7.0.40-2.4.3.4.f19 +- sync with f20 +- added and applied patch411 1029588.patch (for 2.4) +- added and applied patch4110 1029588-2.3.patch (for 2.3) +- resolves rhbz#1029588 +- added and applied for icedtea 2.4 patch410, 1015432.patch +- resolves rhbz#1015432 +- changed Provides: jre-headless = %{javaver} + to Provides: jre-headless = %{epoch}:%{javaver} +- resolves rhbz#1046050 + * Fri Oct 18 2013 Jiri Vanek - 1.7.0.40-2.4.3.1.f20 - arm tarball updated to new CPU sources 2.3.13 - removed upstreamed patch 501 callerclass-01.patch