[Libreoffice-commits] core.git: external/icu

[Stephan Bergmann]

 external/icu/icu-ubsan.patch.0 |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 89b5423c01ab4e4f05f8d73fe7826f64197abe41
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jan 9 10:20:18 2015 +0100

    external/icu: Work around -fsanitize=shift
    
    Change-Id: I17936ae2e37520abaa7dd31a5bb9aec6300ea021

diff --git a/external/icu/icu-ubsan.patch.0 b/external/icu/icu-ubsan.patch.0
index e5d8ed6..25efb5f 100644
--- a/external/icu/icu-ubsan.patch.0
+++ b/external/icu/icu-ubsan.patch.0
@@ -51,15 +51,17 @@
      if (fRB->fLookAheadHardBreak) {
 --- source/common/ubidiimp.h
 +++ source/common/ubidiimp.h
-@@ -198,7 +198,7 @@
+@@ -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)|=((int32_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)
 --- source/common/ucharstriebuilder.cpp
 +++ source/common/ucharstriebuilder.cpp
 @@ -285,7 +285,7 @@