[icu/f14] Resolves: rhbz#733162 F-14 only arm workaround

[Caolan McNamara]

commit e32d8e62c8f44c6eeef8ff43db04389d603974a9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 25 09:28:33 2011 +0100

    Resolves: rhbz#733162 F-14 only arm workaround

 icu.7664.armasm.patch    |   31 +++++++++++++++++++++++++++++++
 icu.rhbz733162.arm.patch |   16 ++++++++++++++++
 icu.spec                 |    9 ++++++++-
 3 files changed, 55 insertions(+), 1 deletions(-)
---
diff --git a/icu.7664.armasm.patch b/icu.7664.armasm.patch
new file mode 100644
index 0000000..8e03587
--- /dev/null
+++ b/icu.7664.armasm.patch
@@ -0,0 +1,31 @@
+Description: change gcc assembler syntax to use % not @; % works for both x86 and ARM
+Origin: upstream, http://www.icu-project.org/trac/changeset/28107
+Bug: http://bugs.icu-project.org/trac/ticket/7664
+Bug-Debian: http://bugs.debian.org/589076
+
+Index: icu-4.4.1/source/tools/toolutil/pkg_genc.c
+===================================================================
+diff -adNru icu-4.4.1.orig/source/tools/toolutil/pkg_genc.c icu-4.4.1/source/tools/toolutil/pkg_genc.c
+--- icu-4.4.1.orig/source/tools/toolutil/pkg_genc.c     2010-04-28 15:27:46.000000000 +0000
++++ icu-4.4.1/source/tools/toolutil/pkg_genc.c  2010-07-14 18:30:35.000000000 +0000
+@@ -1,5 +1,5 @@
+ /******************************************************************************
+- *   Copyright (C) 2009, International Business Machines
++ *   Copyright (C) 2009-2010, International Business Machines
+  *   Corporation and others.  All Rights Reserved.
+  *******************************************************************************
+  */
+@@ -118,10 +118,10 @@
+ } assemblyHeader[] = {
+     {"gcc",
+         ".globl %s\n"
+-        "\t.section .note.GNU-stack,\"\", at progbits\n"
++        "\t.section .note.GNU-stack,\"\",%%progbits\n"
+         "\t.section .rodata\n"
+         "\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */
+-        "\t.type %s, at object\n"
++        "\t.type %s,%%object\n"
+         "%s:\n\n",
+ 
+         ".long ","",HEX_0X
+
diff --git a/icu.rhbz733162.arm.patch b/icu.rhbz733162.arm.patch
new file mode 100644
index 0000000..fd0c31c
--- /dev/null
+++ b/icu.rhbz733162.arm.patch
@@ -0,0 +1,16 @@
+--- icu/source/common/umutex.c	2011-08-24 18:38:49.000000000 -0400
++++ icu/source/common/umutex.c	2011-08-24 18:41:10.000000000 -0400
+@@ -133,6 +133,13 @@
+ #define PLATFORM_MUTEX_UNLOCK(m) pthread_mutex_unlock(m)
+ #define PLATFORM_MUTEX_DESTROY(m) pthread_mutex_destroy(m)
+ #define PLATFORM_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
++
++#if (U_HAVE_GCC_ATOMICS == 1)
++#ifdef __arm__ /* https://bugzilla.redhat.com/show_bug.cgi?id=733162 */
++#undef U_HAVE_GCC_ATOMICS
++#endif
++#endif
++
+ #if (U_HAVE_GCC_ATOMICS == 1)
+ #define SYNC_COMPARE_AND_SWAP(dest, oldval, newval) \
+             __sync_val_compare_and_swap(dest, oldval, newval)
diff --git a/icu.spec b/icu.spec
index 11ead81..bf88c87 100644
--- a/icu.spec
+++ b/icu.spec
@@ -1,6 +1,6 @@
 Name:      icu
 Version:   4.4.1
-Release:   6%{?dist}
+Release:   7%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT and UCD and Public Domain
@@ -16,6 +16,8 @@ Patch2: icu.6995.kannada.patch
 Patch3: icu.XXXX.buildfix.patch
 Patch4: icu.7932.doublecompare.patch
 Patch5: icu.8198.revert.icu5431.patch
+Patch6: icu.rhbz733162.arm.patch
+Patch7: icu.7664.armasm.patch
 
 %description
 Tools and utilities for developing with icu.
@@ -60,6 +62,8 @@ BuildArch: noarch
 %patch3 -p1 -b .icuXXXX.buildfix.patch
 %patch4 -p1 -b .icu7932.doublecompare.patch
 %patch5 -p2 -R -b .icu8198.revert.icu5431.patch
+%patch6 -p1 -b .rhbz733162.arm.patch
+%patch7 -p1 -b .icu7664.armasm.patch
 
 %build
 cd source
@@ -141,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Thu Aug 25 2010 Caolán McNamara <caolanm at redhat.com> - 4.4.1-7
+- Resolves: rhbz#733162 F-14 only arm workaround
+
 * Mon Nov 29 2010 Caolán McNamara <caolanm at redhat.com> - 4.4.1-6
 - Resolves: rhbz#657964 icu-config bindir returns sbindir