[java-1.6.0-openjdk/f15/master] Added patch to fix i686 build

[jiri vanek]

commit 6c810e5f608a823a0b10352882e8dda435d2f658
Author: Jiri Vanek <jvanek at dhcp-2-137.brq.redhat.com>
Date:   Mon Mar 28 13:40:57 2011 +0200

    Added patch to fix i686 build

 java-1.6.0-openjdk-fix-RA.patch |   12 ++++++++++++
 java-1.6.0-openjdk.spec         |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/java-1.6.0-openjdk-fix-RA.patch b/java-1.6.0-openjdk-fix-RA.patch
new file mode 100644
index 0000000..fc3b1ab
--- /dev/null
+++ b/java-1.6.0-openjdk-fix-RA.patch
@@ -0,0 +1,12 @@
+diff -up openjdk/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp.sav openjdk/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp
+--- openjdk/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp	2011-03-25 11:25:25.126400010 -0400
++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp	2011-03-25 11:29:31.778399908 -0400
+@@ -148,7 +148,7 @@ inline void     OrderAccess::store_ptr_f
+ // Must duplicate definitions instead of calling store_fence because we don't want to cast away volatile.
+ inline void     OrderAccess::release_store_fence(volatile jbyte*  p, jbyte  v) {
+   __asm__ volatile (  "xchgb (%2),%0"
+-                    : "=r" (v)
++                    : "=q" (v)
+                     : "0" (v), "r" (p)
+                     : "memory");
+ }
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index c3ae724..eb9437b 100644
--- a/java-1.6.0-openjdk.spec
+++ b/java-1.6.0-openjdk.spec
@@ -175,6 +175,7 @@ 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:   makefile-xalan-deps.patch
+Patch6:   java-1.6.0-openjdk-fix-RA.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -381,7 +382,11 @@ patch -l -p0 < %{PATCH5}
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
 %endif
+
 make patch
+%ifarch i686 i386
+patch -l -p0 < %{PATCH6}
+%endif
 patch -l -p0 < %{PATCH3}
 patch -l -p0 < %{PATCH4}
 make
@@ -890,8 +895,9 @@ exit 0
 -./configure adaptted for icedtea 1.10
 -added newest hotspot 20
 -bumped to openjdk b22
--added  makefile-xalan-deps.patch to sutisfy xalan dependencies.
+-added patch5 makefile-xalan-deps.patch to sutisfy xalan dependencies.
 -fixed patch0
+-added patch6
 
 * Tue Feb 15 2011 Deepak Bhole <dbhole at redhat.com> 1:1.6.0.0-52.1.9.7
 - Updated to IcedTea6 1.9.7