diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-10 14:39:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-11 11:27:18 +0100 |
| commit | 583551810609804b225ab33456f0a2ae04ad16c1 (patch) | |
| tree | a4f84c37fa8f503ef1bb95d9865e74cd3f7d90d5 /icu/icu4c-android.patch | |
| parent | b1c3f00d9b0ef6c91b0209c13531bd1f9d63c1e0 (diff) | |
upgrade to icu 49
Change-Id: I I I I I If403ee07ef8ea654369a8faac57fa8940f90e040
Diffstat (limited to 'icu/icu4c-android.patch')
| -rw-r--r-- | icu/icu4c-android.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/icu/icu4c-android.patch b/icu/icu4c-android.patch index f5b016e6e659..e6befb0d49c9 100644 --- a/icu/icu4c-android.patch +++ b/icu/icu4c-android.patch @@ -9,3 +9,67 @@ #SH# # We can't depend on MIDDLE_SO_TARGET being set. #SH# LD_SONAME= +--- misc/icu/source/configure ++++ misc/build/icu/source/configure +@@ -5053,7 +5053,7 @@ + else + icu_cv_host_frag=mh-linux-va + fi ;; +-*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;; ++*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu|*-*-*-androideabi*) icu_cv_host_frag=mh-linux ;; + *-*-cygwin|*-*-mingw32) + if test "$GCC" = yes; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -6127,6 +6127,9 @@ + # Check to see if genccode can generate simple assembly. + GENCCODE_ASSEMBLY= + case "${host}" in ++*-*-linux-androideabi) ++ GENCCODE_ASSEMBLY="-a gcc-android" ++ ;; + *-linux*|*-kfreebsd*-gnu*|i*86-*-*bsd*|i*86-pc-gnu) + if test "$GCC" = yes; then + # We're using gcc, and the simple -a gcc command line works for genccode +@@ -7200,6 +7203,10 @@ + # wchar_t can be used + CHECK_UTF16_STRING_RESULT="available" + ;; ++*-*-*-androideabi*) ++ # no UTF-16 strings thanks, I think, this is to avoid the -std=c++0x which causes trouble with uint64_t ++ CHECK_UTF16_STRING_RESULT="nope" ++ ;; + *) + ;; + 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" + |