summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libsanitizer/ChangeLog4
-rw-r--r--libsanitizer/LOCAL_PATCHES7
2 files changed, 5 insertions, 6 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 1de3705fd46..15ebdf6c2c1 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,5 +1,9 @@
2019-08-14 Martin Liska <mliska@suse.cz>
+ * LOCAL_PATCHES: Refresh based on what was committed.
+
+2019-08-14 Martin Liska <mliska@suse.cz>
+
* asan/asan_globals.cpp (CheckODRViolationViaIndicator): Reapply
patch from trunk.
(CheckODRViolationViaPoisoning): Likewise.
diff --git a/libsanitizer/LOCAL_PATCHES b/libsanitizer/LOCAL_PATCHES
index f653712fdda..121df67826b 100644
--- a/libsanitizer/LOCAL_PATCHES
+++ b/libsanitizer/LOCAL_PATCHES
@@ -1,6 +1 @@
-r258525
-r265667
-r265668
-r265669
-r265950
-r270208
+r274427