From b3a971b43a0a6fa4d15decb6d55a192b00723fa8 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 28 Nov 2017 16:46:41 -0800
Subject: Fix ubsan build and remove workaround in favor of ubsan.blacklist
 (#678)

---
 ubsan.blacklist | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'ubsan.blacklist')

diff --git a/ubsan.blacklist b/ubsan.blacklist
index f0aeaea7..5ac9d3c9 100644
--- a/ubsan.blacklist
+++ b/ubsan.blacklist
@@ -1,5 +1,12 @@
 # Work around libstdc++ bug: https://llvm.org/bugs/show_bug.cgi?id=18156
 # Also see: http://lists.llvm.org/pipermail/cfe-dev/2015-January/040945.html
 src:*/ios_base.h
-# Work around another libstdc++ bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60734
+
+# Work around another libstdc++ bug:
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60734
 src:*/stl_tree.h
+
+# Work around for libstdc++ 4.8 bug:
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59829
+src:*/stl_vector.h
+src:*/stl_iterator.h
-- 
cgit v1.2.3