summaryrefslogtreecommitdiff
path: root/icu
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-05-11 13:40:50 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-05-11 13:40:50 +0100
commit9590650af70bc9cde35e87fc386956c3e7054229 (patch)
treea7ec8976b49e2d6f2d6c5391183763d8bcc2aa9f /icu
parentbdbd8d8084d257cb2cb42ad9ba8e14c03a53a28d (diff)
gcc atomics only definitely available >= gcc 4.4.4
Change-Id: I77580411eabe4375d86670debb4a5770f7873c14
Diffstat (limited to 'icu')
-rw-r--r--icu/icu4c-interlck.patch11
-rw-r--r--icu/makefile.mk1
2 files changed, 12 insertions, 0 deletions
diff --git a/icu/icu4c-interlck.patch b/icu/icu4c-interlck.patch
new file mode 100644
index 000000000000..6426dce4dab4
--- /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 0253978dc49a..4009280b9b0f 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+=\