[Libreoffice-commits] .: icu/icu4c-interlck.patch icu/makefile.mk

[Caolán McNamara]

 icu/icu4c-interlck.patch |   11 +++++++++++
 icu/makefile.mk          |    1 +
 2 files changed, 12 insertions(+)

New commits:
commit 9590650af70bc9cde35e87fc386956c3e7054229
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri May 11 13:40:50 2012 +0100

    gcc atomics only definitely available >= gcc 4.4.4
    
    Change-Id: I77580411eabe4375d86670debb4a5770f7873c14

diff --git a/icu/icu4c-interlck.patch b/icu/icu4c-interlck.patch
new file mode 100644
index 0000000..6426dce
--- /dev/null
+++ b/icu/icu4c-interlck.patch
@@ -0,0 +1,11 @@
+--- misc/icu/source/common/putilimp.h
++++ misc/build/icu/source/common/putilimp.h
+@@ -175,7 +175,7 @@
+  */
+ #ifdef U_HAVE_GCC_ATOMICS
+     /* Use the predefined value. */
+-#elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 401)
++#elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 404)
+ #   define U_HAVE_GCC_ATOMICS 1
+ #else
+ #   define U_HAVE_GCC_ATOMICS 0
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 0253978..4009280 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -53,6 +53,7 @@ PATCH_FILES=\
     icu4c-warnings.patch \
     icu4c.9313.cygwin.patch \
     icu4c-macosx.patch \
+    icu4c-interlck.patch \
 
 .IF "$(OS)"=="ANDROID"
 PATCH_FILES+=\