summaryrefslogtreecommitdiff
path: root/icu
diff options
context:
space:
mode:
Diffstat (limited to 'icu')
-rw-r--r--icu/icu4c-android.patch32
-rw-r--r--icu/icu4c-build.patch32
2 files changed, 32 insertions, 32 deletions
diff --git a/icu/icu4c-android.patch b/icu/icu4c-android.patch
index 1056ea49adca..dea0e0a77f5b 100644
--- a/icu/icu4c-android.patch
+++ b/icu/icu4c-android.patch
@@ -41,38 +41,6 @@
*)
;;
esac
---- misc/icu/source/tools/toolutil/pkg_genc.c
-+++ misc/build/icu/source/tools/toolutil/pkg_genc.c
-@@ -145,6 +145,28 @@
-
- ".long ","",HEX_0X
- },
-+ {"gcc-android",
-+ "\t.arch armv5te\n"
-+ "\t.fpu softvfp\n"
-+ "\t.eabi_attribute 20, 1\n"
-+ "\t.eabi_attribute 21, 1\n"
-+ "\t.eabi_attribute 23, 3\n"
-+ "\t.eabi_attribute 24, 1\n"
-+ "\t.eabi_attribute 25, 1\n"
-+ "\t.eabi_attribute 26, 2\n"
-+ "\t.eabi_attribute 30, 6\n"
-+ "\t.eabi_attribute 18, 4\n"
-+ "\t.file \"%s.s\"\n"
-+ "\t.global %s\n"
-+ "\t.section .rodata\n"
-+ "\t.align 2\n"
-+ "\t.type %s, %%object\n"
-+ "%s:\n",
-+
-+ "\t.word ",
-+ "\t.section .note.GNU-stack,\"\",%%progbits\n",
-+ HEX_0X
-+ },
- {"sun",
- "\t.section \".rodata\"\n"
- "\t.align 8\n"
-
--- misc/icu/source/common/putilimp.h
+++ misc/build/icu/source/common/putilimp.h
@@ -86,6 +86,8 @@
diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch
index db2d441e1108..8082fc1ea135 100644
--- a/icu/icu4c-build.patch
+++ b/icu/icu4c-build.patch
@@ -9,6 +9,38 @@
#define SMALL_BUFFER_FLAG_NAMES 32
#define BUFFER_PADDING_SIZE 20
+--- misc/icu/source/tools/toolutil/pkg_genc.c
++++ misc/build/icu/source/tools/toolutil/pkg_genc.c
+@@ -145,6 +145,28 @@
+
+ ".long ","",HEX_0X
+ },
++ {"gcc-android",
++ "\t.arch armv5te\n"
++ "\t.fpu softvfp\n"
++ "\t.eabi_attribute 20, 1\n"
++ "\t.eabi_attribute 21, 1\n"
++ "\t.eabi_attribute 23, 3\n"
++ "\t.eabi_attribute 24, 1\n"
++ "\t.eabi_attribute 25, 1\n"
++ "\t.eabi_attribute 26, 2\n"
++ "\t.eabi_attribute 30, 6\n"
++ "\t.eabi_attribute 18, 4\n"
++ "\t.file \"%s.s\"\n"
++ "\t.global %s\n"
++ "\t.section .rodata\n"
++ "\t.align 2\n"
++ "\t.type %s, %%object\n"
++ "%s:\n",
++
++ "\t.word ",
++ "\t.section .note.GNU-stack,\"\",%%progbits\n",
++ HEX_0X
++ },
+ {"sun",
+ "\t.section \".rodata\"\n"
+ "\t.align 8\n"
+
--- misc/icu/source/common/stringpiece.cpp 2010-09-29 20:37:20.000000000 +0200
+++ misc/build/icu/source/common/stringpiece.cpp 2011-03-15 10:57:24.722045561 +0100
@@ -75,7 +75,7 @@