[master] 26f2e6f Refactor SAN_FLAGS a bit
Guillaume Quintard
guillaume at varnish-software.com
Wed Feb 17 18:42:49 CET 2016
commit 26f2e6f34cd975cbb910386142e041351e2f7a5a
Author: Guillaume Quintard <guillaume at varnish-software.com>
Date: Mon Feb 15 11:04:30 2016 +0100
Refactor SAN_FLAGS a bit
diff --git a/bin/varnishadm/Makefile.am b/bin/varnishadm/Makefile.am
index f0bd8ad..d218bc9 100644
--- a/bin/varnishadm/Makefile.am
+++ b/bin/varnishadm/Makefile.am
@@ -14,16 +14,10 @@ varnishadm_SOURCES = \
$(top_srcdir)/lib/libvarnish/vss.c
varnishadm_CFLAGS = @LIBEDIT_CFLAGS@ \
- @ASAN_CFLAGS@ \
- @MSAN_CFLAGS@ \
- @TSAN_CFLAGS@ \
- @UBSAN_CFLAGS@
+ @SAN_CFLAGS@
varnishadm_LDADD = \
$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
${PTHREAD_LIBS} ${RT_LIBS} ${NET_LIBS} @LIBEDIT_LIBS@ ${LIBM} \
- @ASAN_LDFLAGS@ \
- @MSAN_LDFLAGS@ \
- @TSAN_LDFLAGS@ \
- @UBSAN_LDFLAGS@
+ @SAN_LDFLAGS@
diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index 2fb09b8..792e7fa 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -133,10 +133,7 @@ nobase_pkginclude_HEADERS = \
varnishd_CFLAGS = \
@PCRE_CFLAGS@ \
- @ASAN_CFLAGS@ \
- @MSAN_CFLAGS@ \
- @TSAN_CFLAGS@ \
- @UBSAN_CFLAGS@ \
+ @SAN_CFLAGS@ \
-DVARNISHD_IS_NOT_A_VMOD \
-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \
-DVARNISH_VMOD_DIR='"${pkglibdir}/vmods"' \
@@ -149,10 +146,7 @@ varnishd_LDADD = \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
$(top_builddir)/lib/libvcc/libvcc.la \
$(top_builddir)/lib/libvgz/libvgz.la \
- @ASAN_LDFLAGS@ \
- @MSAN_LDFLAGS@ \
- @TSAN_LDFLAGS@ \
- @UBSAN_LDFLAGS@ \
+ @SAN_LDFLAGS@ \
@JEMALLOC_LDADD@ \
@PCRE_LIBS@ \
${DL_LIBS} ${PTHREAD_LIBS} ${NET_LIBS} ${LIBM} ${LIBUMEM}
diff --git a/bin/varnishhist/Makefile.am b/bin/varnishhist/Makefile.am
index b1e8e7b..21d4285 100644
--- a/bin/varnishhist/Makefile.am
+++ b/bin/varnishhist/Makefile.am
@@ -17,19 +17,13 @@ varnishhist_SOURCES = varnishhist.c \
$(top_srcdir)/lib/libvarnishtools/vut.c
varnishhist_CFLAGS = \
- @ASAN_CFLAGS@ \
- @MSAN_CFLAGS@ \
- @TSAN_CFLAGS@ \
- @UBSAN_CFLAGS@
+ @SAN_CFLAGS@
varnishhist_LDADD = \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
-lm \
- @ASAN_LDFLAGS@ \
- @MSAN_LDFLAGS@ \
- @TSAN_LDFLAGS@ \
- @UBSAN_LDFLAGS@ \
+ @SAN_LDFLAGS@ \
@CURSES_LIB@ ${RT_LIBS} ${PTHREAD_LIBS}
noinst_PROGRAMS = varnishhist_opt2rst
diff --git a/bin/varnishlog/Makefile.am b/bin/varnishlog/Makefile.am
index 1416889..9747e49 100644
--- a/bin/varnishlog/Makefile.am
+++ b/bin/varnishlog/Makefile.am
@@ -19,18 +19,12 @@ varnishlog_SOURCES = \
$(top_srcdir)/lib/libvarnish/vtim.c
varnishlog_CFLAGS = \
- @ASAN_CFLAGS@ \
- @MSAN_CFLAGS@ \
- @TSAN_CFLAGS@ \
- @UBSAN_CFLAGS@
+ @SAN_CFLAGS@
varnishlog_LDADD = \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
- @ASAN_LDFLAGS@ \
- @MSAN_LDFLAGS@ \
- @TSAN_LDFLAGS@ \
- @UBSAN_LDFLAGS@ \
+ @SAN_LDFLAGS@ \
${RT_LIBS} ${LIBM} ${PTHREAD_LIBS}
noinst_PROGRAMS = varnishlog_opt2rst
diff --git a/bin/varnishncsa/Makefile.am b/bin/varnishncsa/Makefile.am
index b5d1bff..b51df5f 100644
--- a/bin/varnishncsa/Makefile.am
+++ b/bin/varnishncsa/Makefile.am
@@ -21,18 +21,12 @@ varnishncsa_SOURCES = \
$(top_srcdir)/lib/libvarnish/vsb.c
varnishncsa_CFLAGS = \
- @ASAN_CFLAGS@ \
- @MSAN_CFLAGS@ \
- @TSAN_CFLAGS@ \
- @UBSAN_CFLAGS@
+ @SAN_CFLAGS@
varnishncsa_LDADD = \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
- @ASAN_LDFLAGS@ \
- @MSAN_LDFLAGS@ \
- @TSAN_LDFLAGS@ \
- @UBSAN_LDFLAGS@ \
+ @SAN_LDFLAGS@ \
${RT_LIBS} ${LIBM}
noinst_PROGRAMS = varnishncsa_opt2rst
diff --git a/bin/varnishstat/Makefile.am b/bin/varnishstat/Makefile.am
index 50f8ad0..52fb5d8 100644
--- a/bin/varnishstat/Makefile.am
+++ b/bin/varnishstat/Makefile.am
@@ -16,18 +16,12 @@ varnishstat_SOURCES = \
$(top_srcdir)/lib/libvarnish/vtim.c
varnishstat_CFLAGS = \
- @ASAN_CFLAGS@ \
- @MSAN_CFLAGS@ \
- @TSAN_CFLAGS@ \
- @UBSAN_CFLAGS@
+ @SAN_CFLAGS@
varnishstat_LDADD = \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
- @ASAN_LDFLAGS@ \
- @MSAN_LDFLAGS@ \
- @TSAN_LDFLAGS@ \
- @UBSAN_LDFLAGS@ \
+ @SAN_LDFLAGS@ \
@CURSES_LIB@ ${RT_LIBS} ${LIBM} ${PTHREAD_LIBS}
noinst_PROGRAMS = vsc2rst
diff --git a/bin/varnishtest/Makefile.am b/bin/varnishtest/Makefile.am
index c333968..924f21c 100644
--- a/bin/varnishtest/Makefile.am
+++ b/bin/varnishtest/Makefile.am
@@ -42,17 +42,11 @@ varnishtest_LDADD = \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
$(top_builddir)/lib/libvgz/libvgz.la \
- @ASAN_LDFLAGS@ \
- @MSAN_LDFLAGS@ \
- @TSAN_LDFLAGS@ \
- @UBSAN_LDFLAGS@ \
+ @SAN_LDFLAGS@ \
${LIBM} ${PTHREAD_LIBS}
varnishtest_CFLAGS = \
- @ASAN_CFLAGS@ \
- @MSAN_CFLAGS@ \
- @TSAN_CFLAGS@ \
- @UBSAN_CFLAGS@ \
+ @SAN_CFLAGS@ \
-DTOP_BUILDDIR='"${top_builddir}"'
EXTRA_DIST = $(top_srcdir)/bin/varnishtest/tests/*.vtc \
diff --git a/bin/varnishtop/Makefile.am b/bin/varnishtop/Makefile.am
index 37919e6..f176728 100644
--- a/bin/varnishtop/Makefile.am
+++ b/bin/varnishtop/Makefile.am
@@ -19,18 +19,12 @@ varnishtop_SOURCES = varnishtop.c \
varnishtop_CFLAGS = \
- @ASAN_CFLAGS@ \
- @MSAN_CFLAGS@ \
- @TSAN_CFLAGS@ \
- @UBSAN_CFLAGS@
+ @SAN_CFLAGS@
varnishtop_LDADD = \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
- @ASAN_LDFLAGS@ \
- @MSAN_LDFLAGS@ \
- @TSAN_LDFLAGS@ \
- @UBSAN_LDFLAGS@ \
+ @SAN_LDFLAGS@ \
@CURSES_LIB@ ${RT_LIBS} ${LIBM} ${PTHREAD_LIBS}
noinst_PROGRAMS = varnishtop_opt2rst
diff --git a/configure.ac b/configure.ac
index f211ac7..edec1ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -283,41 +283,30 @@ UBSAN_CFLAGS=
UBSAN_LDFLAGS=
AC_ARG_ENABLE(ubsan,
AS_HELP_STRING([--enable-ubsan],[enable undefined behavior sanitizer (default is NO)]),
- CFLAGS="${CFLAGS} -fPIC"
- UBSAN_CFLAGS="-fsanitize=undefined -fPIE -fno-omit-frame-pointer"
- UBSAN_LDFLAGS="-fsanitize=undefined -pie")
-AC_SUBST(UBSAN_CFLAGS)
-AC_SUBST(UBSAN_LDFLAGS)
+ UBSAN_FLAGS="-fsanitize=undefined")
TSAN_CFLAGS=
TSAN_LDFLAGS=
AC_ARG_ENABLE(tsan,
AS_HELP_STRING([--enable-tsan],[enable thread sanitizer (default is NO)]),
- CFLAGS="${CFLAGS} -fPIC"
- TSAN_CFLAGS="-fsanitize=thread -fPIE -fno-omit-frame-pointer"
- TSAN_LDFLAGS="-fsanitize=thread -pie")
-AC_SUBST(TSAN_CFLAGS)
-AC_SUBST(TSAN_LDFLAGS)
+ TSAN_FLAGS="-fsanitize=thread")
ASAN_CFLAGS=
ASAN_LDFLAGS=
AC_ARG_ENABLE(asan,
AS_HELP_STRING([--enable-asan],[enable address sanitizer (default is NO)]),
- CFLAGS="${CFLAGS} -fPIC"
- ASAN_CFLAGS="-fsanitize=address -fPIE -fno-omit-frame-pointer"
- ASAN_LDFLAGS="-fsanitize=address -pie")
-AC_SUBST(ASAN_CFLAGS)
-AC_SUBST(ASAN_LDFLAGS)
+ ASAN_FLAGS="-fsanitize=address")
MSAN_CFLAGS=
MSAN_LDFLAGS=
AC_ARG_ENABLE(msan,
AS_HELP_STRING([--enable-msan],[enable memory sanitizer (default is NO)]),
- CFLAGS="${CFLAGS} -fPIC"
- MSAN_CFLAGS="-fsanitize=memory -fPIE -fno-omit-frame-pointer"
- MSAN_LDFLAGS="-fsanitize=memory -pie")
-AC_SUBST(MSAN_CFLAGS)
-AC_SUBST(MSAN_LDFLAGS)
+ MSAN_FLAGS="-fsanitize=memory")
+
+SAN_CFLAGS="-fPIC ${UBSAN_FLAGS} ${TSAN_FLAGS} ${ASAN_FLAGS} ${MSAN_FLAGS} -fPIE -fno-omit-frame-pointer"
+AC_SUBST(SAN_CFLAGS)
+SAN_LDFLAGS="${UBSAN_FLAGS} ${TSAN_FLAGS} ${ASAN_FLAGS} ${MSAN_FLAGS} -pie"
+AC_SUBST(SAN_LDFLAGS)
# Use jemalloc on Linux
JEMALLOC_LDADD=
diff --git a/lib/libvarnish/Makefile.am b/lib/libvarnish/Makefile.am
index b8ed85e..967ec9c 100644
--- a/lib/libvarnish/Makefile.am
+++ b/lib/libvarnish/Makefile.am
@@ -38,15 +38,9 @@ libvarnish_la_SOURCES = \
libvarnish_la_CFLAGS = \
-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \
- @ASAN_CFLAGS@ \
- @MSAN_CFLAGS@ \
- @TSAN_CFLAGS@ \
- @UBSAN_CFLAGS@
+ @SAN_CFLAGS@
libvarnish_la_LIBADD = ${RT_LIBS} ${NET_LIBS} ${LIBM} @PCRE_LIBS@ \
- @ASAN_LDFLAGS@ \
- @MSAN_LDFLAGS@ \
- @TSAN_LDFLAGS@ \
- @UBSAN_LDFLAGS@
+ @SAN_LDFLAGS@
if ENABLE_TESTS
TESTS = vnum_c_test
diff --git a/lib/libvarnishapi/Makefile.am b/lib/libvarnishapi/Makefile.am
index dbaece1..b5eb2b0 100644
--- a/lib/libvarnishapi/Makefile.am
+++ b/lib/libvarnishapi/Makefile.am
@@ -45,16 +45,10 @@ libvarnishapi_la_SOURCES = \
libvarnishapi_la_CFLAGS = \
-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \
- @ASAN_CFLAGS@ \
- @MSAN_CFLAGS@ \
- @TSAN_CFLAGS@ \
- @UBSAN_CFLAGS@
+ @SAN_CFLAGS@
libvarnishapi_la_LIBADD = @PCRE_LIBS@ @RT_LIBS@ \
- @ASAN_LDFLAGS@ \
- @MSAN_LDFLAGS@ \
- @TSAN_LDFLAGS@ \
- @UBSAN_LDFLAGS@
+ @SAN_LDFLAGS@
if HAVE_LD_VERSION_SCRIPT
libvarnishapi_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libvarnishapi.map
diff --git a/lib/libvarnishcompat/Makefile.am b/lib/libvarnishcompat/Makefile.am
index 2b4c469..f2c878b 100644
--- a/lib/libvarnishcompat/Makefile.am
+++ b/lib/libvarnishcompat/Makefile.am
@@ -9,16 +9,10 @@ AM_LDFLAGS = $(AM_LT_LDFLAGS)
pkglib_LTLIBRARIES = libvarnishcompat.la
libvarnishcompat_la_CFLAGS = \
- @ASAN_CFLAGS@ \
- @MSAN_CFLAGS@ \
- @TSAN_CFLAGS@ \
- @UBSAN_CFLAGS@
+ @SAN_CFLAGS@
libvarnishcompat_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version \
- @ASAN_LDFLAGS@ \
- @MSAN_LDFLAGS@ \
- @TSAN_LDFLAGS@ \
- @UBSAN_LDFLAGS@
+ @SAN_LDFLAGS@
libvarnishcompat_la_SOURCES = \
daemon.c \
diff --git a/lib/libvcc/Makefile.am b/lib/libvcc/Makefile.am
index 6f55208..6cb09fb 100644
--- a/lib/libvcc/Makefile.am
+++ b/lib/libvcc/Makefile.am
@@ -9,16 +9,10 @@ AM_CPPFLAGS = \
pkglib_LTLIBRARIES = libvcc.la
libvcc_la_CFLAGS = \
- @ASAN_CFLAGS@ \
- @MSAN_CFLAGS@ \
- @TSAN_CFLAGS@ \
- @UBSAN_CFLAGS@
+ @SAN_CFLAGS@
libvcc_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version \
- @ASAN_LDFLAGS@ \
- @MSAN_LDFLAGS@ \
- @TSAN_LDFLAGS@ \
- @UBSAN_LDFLAGS@
+ @SAN_LDFLAGS@
libvcc_la_SOURCES = \
vcc_compile.h \
diff --git a/lib/libvgz/Makefile.am b/lib/libvgz/Makefile.am
index 7bbc9fd..f4aa8e9 100644
--- a/lib/libvgz/Makefile.am
+++ b/lib/libvgz/Makefile.am
@@ -4,15 +4,9 @@ AM_LDFLAGS = $(AM_LT_LDFLAGS)
pkglib_LTLIBRARIES = libvgz.la
libvgz_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version \
- @ASAN_LDFLAGS@ \
- @MSAN_LDFLAGS@ \
- @TSAN_LDFLAGS@ \
- @UBSAN_LDFLAGS@
+ @SAN_LDFLAGS@
libvgz_la_CFLAGS = -D_LARGEFILE64_SOURCE=1 -DZLIB_CONST $(libvgz_extra_cflags) \
- @ASAN_CFLAGS@ \
- @MSAN_CFLAGS@ \
- @TSAN_CFLAGS@ \
- @UBSAN_CFLAGS@
+ @SAN_CFLAGS@
libvgz_la_SOURCES = \
adler32.c \
diff --git a/lib/libvmod_debug/Makefile.am b/lib/libvmod_debug/Makefile.am
index 653e2b4..aeb3e42 100644
--- a/lib/libvmod_debug/Makefile.am
+++ b/lib/libvmod_debug/Makefile.am
@@ -14,16 +14,10 @@ vmodtoolargs = --strict
noinst_LTLIBRARIES = libvmod_debug.la
libvmod_debug_la_CFLAGS = \
- @ASAN_CFLAGS@ \
- @MSAN_CFLAGS@ \
- @TSAN_CFLAGS@ \
- @UBSAN_CFLAGS@
+ @SAN_CFLAGS@
libvmod_debug_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared -rpath /nowhere \
- @ASAN_LDFLAGS@ \
- @MSAN_LDFLAGS@ \
- @TSAN_LDFLAGS@ \
- @UBSAN_LDFLAGS@
+ @SAN_LDFLAGS@
libvmod_debug_la_SOURCES = \
vmod_debug.c \
diff --git a/lib/libvmod_directors/Makefile.am b/lib/libvmod_directors/Makefile.am
index 4d0f8e1..65306a8 100644
--- a/lib/libvmod_directors/Makefile.am
+++ b/lib/libvmod_directors/Makefile.am
@@ -13,16 +13,10 @@ vmodtoolargs = --strict
vmod_LTLIBRARIES = libvmod_directors.la
libvmod_directors_la_CFLAGS = \
- @ASAN_CFLAGS@ \
- @MSAN_CFLAGS@ \
- @TSAN_CFLAGS@ \
- @UBSAN_CFLAGS@
+ @SAN_CFLAGS@
libvmod_directors_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared \
- @ASAN_LDFLAGS@ \
- @MSAN_LDFLAGS@ \
- @TSAN_LDFLAGS@ \
- @UBSAN_LDFLAGS@
+ @SAN_LDFLAGS@
libvmod_directors_la_SOURCES = \
vdir.c \
diff --git a/lib/libvmod_std/Makefile.am b/lib/libvmod_std/Makefile.am
index f895478..650db7d 100644
--- a/lib/libvmod_std/Makefile.am
+++ b/lib/libvmod_std/Makefile.am
@@ -14,16 +14,10 @@ vmodtoolargs = --strict
vmod_LTLIBRARIES = libvmod_std.la
libvmod_std_la_CFLAGS = \
- @ASAN_CFLAGS@ \
- @MSAN_CFLAGS@ \
- @TSAN_CFLAGS@ \
- @UBSAN_CFLAGS@
+ @SAN_CFLAGS@
libvmod_std_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared \
- @ASAN_LDFLAGS@ \
- @MSAN_LDFLAGS@ \
- @TSAN_LDFLAGS@ \
- @UBSAN_LDFLAGS@
+ @SAN_LDFLAGS@
libvmod_std_la_SOURCES = \
vmod_std.c \
More information about the varnish-commit
mailing list