diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-04-18 16:35:55 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-04-18 16:35:55 +0200 |
| commit | 811575c105b0a2bc597afda2f84a087199447ae5 (patch) | |
| tree | fca6dac0486cddb7e35774465caa0c3b4260dc0a /external | |
| parent | b07e8a7e16ba69e822a309ec280d1987f90021a3 (diff) | |
Keep the still relevant part of external/icu/icu4c-ubsan.patch.1
...which f247f08e370626bbb427acd8f4a400fd875350a3 "Upgrade to ICU 61.1" had
removed completely, in error.
Change-Id: I7239011561851333cac58e54e4e7d590b8529dbc
Diffstat (limited to 'external')
| -rw-r--r-- | external/icu/UnpackedTarball_icu.mk | 1 | ||||
| -rw-r--r-- | external/icu/icu4c-ubsan.patch.1 | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk index b81cdaab6242..c789e6eb8d84 100644 --- a/external/icu/UnpackedTarball_icu.mk +++ b/external/icu/UnpackedTarball_icu.mk @@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\ external/icu/icu4c-solarisgcc.patch.1 \ external/icu/icu4c-mkdir.patch.1 \ external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \ + external/icu/icu4c-ubsan.patch.1 \ external/icu/icu4c-icu11100.patch.1 \ external/icu/icu4c-scriptrun.patch.1 \ external/icu/icu4c-rtti.patch.1 \ diff --git a/external/icu/icu4c-ubsan.patch.1 b/external/icu/icu4c-ubsan.patch.1 new file mode 100644 index 000000000000..ea9f13fd85cd --- /dev/null +++ b/external/icu/icu4c-ubsan.patch.1 @@ -0,0 +1,14 @@ +diff -ur icu.org/source/common/ubidiimp.h icu/source/common/ubidiimp.h +--- icu.org/source/common/ubidiimp.h 2017-02-03 19:57:23.000000000 +0100 ++++ icu/source/common/ubidiimp.h 2017-04-21 22:46:25.374651159 +0200 +@@ -198,8 +198,8 @@ + /* in a Run, logicalStart will get this bit set if the run level is odd */ + #define INDEX_ODD_BIT (1UL<<31) + +-#define MAKE_INDEX_ODD_PAIR(index, level) ((index)|((int32_t)(level)<<31)) +-#define ADD_ODD_BIT_FROM_LEVEL(x, level) ((x)|=((int32_t)(level)<<31)) ++#define MAKE_INDEX_ODD_PAIR(index, level) ((index)|((uint32_t)(level)<<31)) ++#define ADD_ODD_BIT_FROM_LEVEL(x, level) ((x)|=((uint32_t)(level)<<31)) + #define REMOVE_ODD_BIT(x) ((x)&=~INDEX_ODD_BIT) + + #define GET_INDEX(x) ((x)&~INDEX_ODD_BIT) |