From c7186c7f0a70203b77f42b7e6d6997141ab8cf34 Mon Sep 17 00:00:00 2001
From: Badalyan Vyacheslav <v.badalyan@open-bs.ru>
Date: Wed, 10 Feb 2016 02:57:38 +0000
Subject: Build: Fix menuselect USAN conflicts

USAN can be used together with other sanitizers.

Reported by: Badalyan Vyacheslav
Tested by: Badalyan Vyacheslav

Change-Id: I3bffa350d70965c3026651dba3a12414d0aaa45f
---
 build_tools/cflags.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml
index 43f7d5612..557ea39c8 100644
--- a/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@ -88,7 +88,6 @@
 			<support_level>extended</support_level>
 			<conflict>THREAD_SANITIZER</conflict>
 			<conflict>LEAK_SANITIZER</conflict>
-			<conflict>UNDEFINED_SANITIZER</conflict>
 			<conflict>MALLOC_DEBUG</conflict>
 			<conflict>DEBUG_CHAOS</conflict>
 		</member>
@@ -96,21 +95,16 @@
 			<support_level>extended</support_level>
 			<conflict>ADDRESS_SANITIZER</conflict>
 			<conflict>LEAK_SANITIZER</conflict>
-			<conflict>UNDEFINED_SANITIZER</conflict>
 		</member>
 		<member name="LEAK_SANITIZER" displayname="Leak Sanitizer">
 			<support_level>extended</support_level>
 			<conflict>ADDRESS_SANITIZER</conflict>
 			<conflict>THREAD_SANITIZER</conflict>
-			<conflict>UNDEFINED_SANITIZER</conflict>
 			<conflict>MALLOC_DEBUG</conflict>
 			<conflict>DEBUG_CHAOS</conflict>
 		</member>
 		<member name="UNDEFINED_SANITIZER" displayname="Undefined Behavior Sanitizer">
 			<support_level>extended</support_level>
-			<conflict>ADDRESS_SANITIZER</conflict>
-			<conflict>THREAD_SANITIZER</conflict>
-			<conflict>LEAK_SANITIZER</conflict>
 		</member>
 		<member name="BUSYDETECT_TONEONLY" displayname="Enable additional comparision of only the tone duration not the silence part">
 			<conflict>BUSYDETECT_COMPARE_TONE_AND_SILENCE</conflict>
-- 
cgit v1.2.3