68 lines
2.7 KiB
Diff
68 lines
2.7 KiB
Diff
|
From 811575c105b0a2bc597afda2f84a087199447ae5 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <811575c105b0a2bc597afda2f84a087199447ae5.1531842164.git.erack@redhat.com>
|
||
|
|
From: Stephan Bergmann <sbergman@redhat.com>
|
||
|
|
Date: Wed, 18 Apr 2018 16:35:55 +0200
|
||
|
|
Subject: [PATCH] Keep the still relevant part of
|
||
|
|
external/icu/icu4c-ubsan.patch.1
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
|
||
|
|
|
||
|
|
This is a multi-part message in MIME format.
|
||
|
|
--------------erAck-patch-parts
|
||
|
|
Content-Type: text/plain; charset=UTF-8; format=fixed
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
|
||
|
|
...which f247f08e370626bbb427acd8f4a400fd875350a3 "Upgrade to ICU 61.1" had
|
||
|
|
removed completely, in error.
|
||
|
|
|
||
|
|
Change-Id: I7239011561851333cac58e54e4e7d590b8529dbc
|
||
|
|
---
|
||
|
|
external/icu/UnpackedTarball_icu.mk | 1 +
|
||
|
|
external/icu/icu4c-ubsan.patch.1 | 14 ++++++++++++++
|
||
|
|
2 files changed, 15 insertions(+)
|
||
|
|
create mode 100644 external/icu/icu4c-ubsan.patch.1
|
||
|
|
|
||
|
|
|
||
|
|
--------------erAck-patch-parts
|
||
|
|
Content-Type: text/x-patch; name="0001-Keep-the-still-relevant-part-of-external-icu-icu4c-u.patch"
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
Content-Disposition: attachment; filename="0001-Keep-the-still-relevant-part-of-external-icu-icu4c-u.patch"
|
||
|
|
|
||
|
|
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)
|
||
|
|
|
||
|
|
--------------erAck-patch-parts--
|
||
|
|
|
||
|
|
|