[java-1.6.0-openjdk/f16] added arm patch and disabled pulse audio for arm archi.

[jiri vanek]

commit 5340a397dfdfbe9df32d8e8b68f7c375c055dded
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Wed Feb 1 16:26:15 2012 +0100

    added arm patch and disabled pulse audio for arm archi.

 java-1.6.0-openjdk-arm-asm-int-fix.patch |   21 +++++++++++++++++++++
 java-1.6.0-openjdk.spec                  |   30 +++++++++++++++++++++++-------
 2 files changed, 44 insertions(+), 7 deletions(-)
---
diff --git a/java-1.6.0-openjdk-arm-asm-int-fix.patch b/java-1.6.0-openjdk-arm-asm-int-fix.patch
new file mode 100644
index 0000000..18a3f86
--- /dev/null
+++ b/java-1.6.0-openjdk-arm-asm-int-fix.patch
@@ -0,0 +1,21 @@
+diff -up ./arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S.sav ./arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+--- ./arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S.sav	2012-01-31 12:49:48.091126039 -0500
++++ ./arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	2012-01-31 12:50:17.362657755 -0500
+@@ -3576,6 +3576,7 @@ handle_exception_with_bcp:
+ return_check_monitors:
+ 	stmdb	arm_sp!, {r4, lr}
+ 
++	DECACHE_JPC
+ 	ldr	r2, [istate, #ISTATE_METHOD]
+ 	ldr	r4, [r2, #METHOD_ACCESSFLAGS]
+ 	tst	r4, #1<<5
+diff -U0 ./ChangeLog.sav ./ChangeLog
+--- ./ChangeLog.sav	2012-01-30 22:11:48.011850102 -0500
++++ ./ChangeLog	2012-01-31 12:49:37.226299853 -0500
+@@ -0,0 +1,6 @@
++2012-01-31  Andrew Haley  <aph at redhat.com>
++
++	* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
++	(return_check_monitors): DECACHE_JPC so that the saved bytecode
++	pointer is correct for the GC.
++
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index 3bcafe2..64ae1ec 100644
--- a/java-1.6.0-openjdk.spec
+++ b/java-1.6.0-openjdk.spec
@@ -138,7 +138,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 63.%{icedteaver}%{?dist}
+Release: 64.%{icedteaver}%{?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
@@ -163,7 +163,7 @@ Source5:  mauve-%{mauvedate}.tar.gz
 Source6:  mauve_tests
 Source7:  %{jaxpurl}jaxp144_03.zip
 Source8:  %{jafurl}jdk6-jaf-b20.zip
-Source9: %{jaxwsurl}jdk6-jaxws2_1_6-2011_06_13.zip
+Source9:  %{jaxwsurl}jdk6-jaxws2_1_6-2011_06_13.zip
 # FIXME: This patch needs to be fixed. optflags argument
 # -mtune=generic is being ignored because it breaks several graphical
 # applications.
@@ -173,6 +173,8 @@ 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
 
+Patch100: %{name}-arm-asm-int-fix.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
@@ -214,9 +216,13 @@ BuildRequires: gawk
 BuildRequires: libbonobo-devel
 BuildRequires: pkgconfig >= 0.9.0
 BuildRequires: xorg-x11-utils
+
+%ifnarch %{arm}
 # PulseAudio build requirements.
 BuildRequires: pulseaudio-libs-devel >= 0.9.11
 BuildRequires: pulseaudio >= 0.9.11
+%endif
+
 # Zero-assembler build requirement.
 %ifnarch %{jit_arches}
 BuildRequires: libffi-devel
@@ -225,11 +231,16 @@ BuildRequires: libffi-devel
 #systemtap build requirement.
 BuildRequires: systemtap-sdt-devel
 %endif
+
+%ifnarch %{arm}
 #fixing  648499
 BuildRequires: redhat-lsb
 
+
 #fix for rhbz721033
 Requires: xorg-x11-fonts-Type1
+%endif
+
 Requires: fontconfig
 Requires: rhino
 Requires: libjpeg = 6b
@@ -324,10 +335,6 @@ Group:   Development/Languages
 
 Requires: %{name} = %{epoch}:%{version}-%{release}
 
-# java-1.6.0-openjdk-src replaces java-1.7.0-icedtea-src.
-Provides: java-1.7.0-icedtea-src = 0:1.7.0.0-0.999
-Obsoletes: java-1.7.0-icedtea-src < 0:1.7.0.0-0.999
-
 %description src
 The OpenJDK source bundle.
 
@@ -357,6 +364,7 @@ The OpenJDK API documentation.
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 5
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
 #%patch0
+%patch100
 cp %{SOURCE4} .
 cp %{SOURCE6} .
 
@@ -371,7 +379,10 @@ export CFLAGS="$CFLAGS -mieee"
 
 ./autogen.sh
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
-  --with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
+%ifnarch %{arm}
+  --enable-pulse-java \
+%endif
+  --with-pkgversion=fedora-%{release}-%{_arch} \
   --with-jaf-drop-zip=%{SOURCE8} \
   --with-jaxp-drop-zip=%{SOURCE7} --with-jaxws-drop-zip=%{SOURCE9} \
   --with-abs-install-dir=%{_jvmdir}/%{sdkdir}
@@ -382,6 +393,7 @@ make stamps/patch-ecj.stamp
 make patch
 patch -l -p0 < %{PATCH3}
 patch -l -p0 < %{PATCH4}
+patch -f -l -p0 < %{PATCH5} || true
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -887,6 +899,10 @@ exit 0
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Feb 1 2012 Jiri Vanek <jvanek at redhat.com> 1.6.0.0-0.arm1.64.1.11.fc15
+- Updated for ARM build based on fixes by Andrew Haley (aph at redhat dot com)
+- added atch100: name-arm-asm-int-fix.patch
+
 * Tue Jan 31 2012 Jiri Vanek <jvanek at redhat.com> - 1:1.6.0.0-63.1.11
 - sync with master
 - IcedTea6 bumped to 1.11 release