From 10854be9130a382413d6119d0b1153f5e7d91fa1 Mon Sep 17 00:00:00 2001 From: David Riley Date: Wed, 5 Feb 2020 11:50:56 -0800 Subject: [PATCH] Remove hardcoded "-fsanitize=address" "-fsanitize=address" which pulls in asan does not work with other sanitizers like msan/tsan etc. Based on original change by manojgupta@chromium.org. Signed-off-by: David Riley Reviewed-by: Lepton Wu --- tests/fuzzer/Makefile.am | 1 - tests/fuzzer/meson.build | 4 ++-- vtest/Makefile.am | 1 - vtest/meson.build | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/fuzzer/Makefile.am b/tests/fuzzer/Makefile.am index b9e636b..c3bdeab 100644 --- a/tests/fuzzer/Makefile.am +++ b/tests/fuzzer/Makefile.am @@ -11,7 +11,6 @@ AM_CFLAGS = \ $(EPOXY_CFLAGS) \ $(VISIBILITY_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \ - -fsanitize=address \ -fsanitize=fuzzer if FUZZER diff --git a/tests/fuzzer/meson.build b/tests/fuzzer/meson.build index 6b9da4b..58bb18e 100644 --- a/tests/fuzzer/meson.build +++ b/tests/fuzzer/meson.build @@ -27,7 +27,7 @@ assert(cc.has_argument('-fsanitize=fuzzer'), virgl_fuzzer = executable( 'virgl_fuzzer', 'virgl_fuzzer.c', - c_args : [ '-fsanitize=address', '-fsanitize=fuzzer' ], - link_args : [ '-fsanitize=address', '-fsanitize=fuzzer' ], + c_args : [ '-fsanitize=fuzzer' ], + link_args : [ '-fsanitize=fuzzer' ], dependencies : [libvirglrenderer_dep, gallium_dep, epoxy_dep] ) diff --git a/vtest/Makefile.am b/vtest/Makefile.am index cbbf188..ac1a037 100644 --- a/vtest/Makefile.am +++ b/vtest/Makefile.am @@ -50,7 +50,6 @@ vtest_fuzzer_CFLAGS = \ $(EPOXY_CFLAGS) \ $(VISIBILITY_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \ - -fsanitize=address \ -fsanitize=fuzzer vtest_fuzzer_LDADD = $(top_builddir)/src/gallium/auxiliary/libgallium.la $(top_builddir)/src/libvirglrenderer.la diff --git a/vtest/meson.build b/vtest/meson.build index 754b8d9..d80cd35 100644 --- a/vtest/meson.build +++ b/vtest/meson.build @@ -52,8 +52,8 @@ if with_fuzzer vtest_fuzzer = executable( 'vtest_fuzzer', 'vtest_fuzzer.c', - c_args : [ '-fsanitize=address', '-fsanitize=fuzzer' ], - link_args : [ '-fsanitize=address', '-fsanitize=fuzzer' ], + c_args : [ '-fsanitize=fuzzer' ], + link_args : [ '-fsanitize=fuzzer' ], objects : vtest_obj, dependencies : libvirglrenderer_dep )