2013-08-30 18:12:58 +02:00
|
|
|
AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include
|
|
|
|
|
|
|
|
|
|
# May be used by toolexeclibdir.
|
2017-01-21 09:47:11 +01:00
|
|
|
gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
|
2013-08-30 18:12:58 +02:00
|
|
|
|
ubsan.c (ubsan_expand_null_ifn): Use _v1 suffixed type mismatch builtins...
* ubsan.c (ubsan_expand_null_ifn): Use _v1 suffixed type mismatch
builtins, store max (log2 (align), 0) into uchar field instead of
align into uptr field.
(ubsan_expand_objsize_ifn): Use _v1 suffixed type mismatch builtins,
store uchar 0 field instead of uptr 0 field.
(instrument_nonnull_return): Use _v1 suffixed nonnull return builtin,
instead of passing one address of struct with 2 locations pass
two addresses of structs with 1 location each.
* sanitizer.def (BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH,
BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH_ABORT,
BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN,
BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN_ABORT): Removed.
(BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH_V1,
BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH_V1_ABORT,
BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN_V1,
BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN_V1_ABORT): New builtins.
* c-c++-common/ubsan/float-cast-overflow-1.c: Drop value keyword
from expected output regexps.
* c-c++-common/ubsan/float-cast-overflow-2.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-3.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-4.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-5.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-6.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-8.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-9.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-10.c: Likewise.
* g++.dg/ubsan/float-cast-overflow-bf.C: Likewise.
* gcc.dg/ubsan/float-cast-overflow-bf.c: Likewise.
* g++.dg/asan/default-options-1.C (__asan_default_options): Add
used attribute.
* g++.dg/asan/asan_test.C: Run with ASAN_OPTIONS=handle_segv=2
in the environment.
* All source files: Merge from upstream 315899.
* asan/Makefile.am (nodist_saninclude_HEADERS): Add
include/sanitizer/tsan_interface.h.
* asan/libtool-version: Bump the libasan SONAME.
* lsan/Makefile.am (sanitizer_lsan_files): Add lsan_common_mac.cc.
(lsan_files): Add lsan_linux.cc, lsan_mac.cc and lsan_malloc_mac.cc.
* sanitizer_common/Makefile.am (sanitizer_common_files): Add
sancov_flags.cc, sanitizer_allocator_checks.cc,
sanitizer_coverage_libcdep_new.cc, sanitizer_errno.cc,
sanitizer_file.cc, sanitizer_mac_libcdep.cc and
sanitizer_stoptheworld_mac.cc. Remove sanitizer_coverage_libcdep.cc
and sanitizer_coverage_mapping_libcdep.cc.
* tsan/Makefile.am (tsan_files): Add tsan_external.cc.
* ubsan/Makefile.am (DEFS): Add -DUBSAN_CAN_USE_CXXABI=1.
(ubsan_files): Add ubsan_init_standalone.cc and
ubsan_signals_standalone.cc.
* ubsan/libtool-version: Bump the libubsan SONAME.
* asan/Makefile.in: Regenerate.
* lsan/Makefile.in: Regenerate.
* sanitizer_common/Makefile.in: Regenerate.
* tsan/Makefile.in: Regenerate.
* ubsan/Makefile.in: Regenerate.
From-SVN: r253887
2017-10-19 13:23:59 +02:00
|
|
|
DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DPIC -DCAN_SANITIZE_UB=1 -DUBSAN_CAN_USE_CXXABI=1
|
2013-11-28 13:20:23 +01:00
|
|
|
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros
|
2013-08-30 18:12:58 +02:00
|
|
|
AM_CXXFLAGS += $(LIBSTDCXX_RAW_CXX_CXXFLAGS)
|
2014-11-14 15:23:51 +01:00
|
|
|
AM_CXXFLAGS += -std=gnu++11
|
2017-11-17 22:34:50 +01:00
|
|
|
AM_CXXFLAGS += $(EXTRA_CXXFLAGS)
|
2013-08-30 18:12:58 +02:00
|
|
|
ACLOCAL_AMFLAGS = -I m4
|
|
|
|
|
|
|
|
|
|
toolexeclib_LTLIBRARIES = libubsan.la
|
2018-07-04 21:49:06 +02:00
|
|
|
noinst_LTLIBRARIES = libsanitizer_ubsan.la
|
2013-08-30 18:12:58 +02:00
|
|
|
|
2015-10-21 09:32:45 +02:00
|
|
|
ubsan_plugin_files = \
|
2013-08-30 18:12:58 +02:00
|
|
|
ubsan_diag.cc \
|
2014-09-23 19:59:53 +02:00
|
|
|
ubsan_flags.cc \
|
2013-08-30 18:12:58 +02:00
|
|
|
ubsan_handlers.cc \
|
|
|
|
|
ubsan_handlers_cxx.cc \
|
2014-09-23 19:59:53 +02:00
|
|
|
ubsan_init.cc \
|
2013-08-30 18:12:58 +02:00
|
|
|
ubsan_type_hash.cc \
|
2015-10-21 09:32:45 +02:00
|
|
|
ubsan_type_hash_itanium.cc \
|
|
|
|
|
ubsan_type_hash_win.cc \
|
2013-08-30 18:12:58 +02:00
|
|
|
ubsan_value.cc
|
|
|
|
|
|
2017-11-08 09:17:02 +01:00
|
|
|
ubsan_files = $(ubsan_plugin_files)
|
2015-10-21 09:32:45 +02:00
|
|
|
|
2018-07-04 21:49:06 +02:00
|
|
|
libsanitizer_ubsan_la_SOURCES = $(ubsan_plugin_files)
|
|
|
|
|
libsanitizer_ubsan_la_LIBADD = $(LIBSTDCXX_RAW_CXX_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
libubsan_la_SOURCES = $(ubsan_files)
|
2013-09-01 14:16:07 +02:00
|
|
|
libubsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la
|
|
|
|
|
if !USING_MAC_INTERPOSE
|
|
|
|
|
libubsan_la_LIBADD += $(top_builddir)/interception/libinterception.la
|
|
|
|
|
endif
|
2014-01-09 19:13:39 +01:00
|
|
|
if LIBBACKTRACE_SUPPORTED
|
|
|
|
|
libubsan_la_LIBADD += $(top_builddir)/libbacktrace/libsanitizer_libbacktrace.la
|
|
|
|
|
endif
|
2013-09-01 14:16:07 +02:00
|
|
|
libubsan_la_LIBADD += $(LIBSTDCXX_RAW_CXX_LDFLAGS)
|
2013-11-29 13:30:36 +01:00
|
|
|
libubsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(link_libubsan)
|
2013-08-30 18:12:58 +02:00
|
|
|
|
2013-11-28 13:20:23 +01:00
|
|
|
# Use special rules for files that require RTTI support.
|
2015-10-21 09:32:45 +02:00
|
|
|
ubsan_handlers_cxx.% ubsan_type_hash.% ubsan_type_hash_itanium.% : AM_CXXFLAGS += -frtti
|
2013-11-28 13:20:23 +01:00
|
|
|
|
2013-08-30 18:12:58 +02:00
|
|
|
# Work around what appears to be a GNU make bug handling MAKEFLAGS
|
|
|
|
|
# values defined in terms of make variables, as is the case for CC and
|
|
|
|
|
# friends when we are called from the top level Makefile.
|
|
|
|
|
AM_MAKEFLAGS = \
|
|
|
|
|
"AR_FLAGS=$(AR_FLAGS)" \
|
|
|
|
|
"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
|
|
|
|
|
"CFLAGS=$(CFLAGS)" \
|
|
|
|
|
"CXXFLAGS=$(CXXFLAGS)" \
|
|
|
|
|
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
|
|
|
|
|
"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
|
|
|
|
|
"INSTALL=$(INSTALL)" \
|
|
|
|
|
"INSTALL_DATA=$(INSTALL_DATA)" \
|
|
|
|
|
"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
|
|
|
|
|
"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
|
|
|
|
|
"JC1FLAGS=$(JC1FLAGS)" \
|
|
|
|
|
"LDFLAGS=$(LDFLAGS)" \
|
|
|
|
|
"LIBCFLAGS=$(LIBCFLAGS)" \
|
|
|
|
|
"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
|
|
|
|
|
"MAKE=$(MAKE)" \
|
|
|
|
|
"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
|
|
|
|
|
"PICFLAG=$(PICFLAG)" \
|
|
|
|
|
"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
|
|
|
|
|
"SHELL=$(SHELL)" \
|
|
|
|
|
"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
|
|
|
|
|
"exec_prefix=$(exec_prefix)" \
|
|
|
|
|
"infodir=$(infodir)" \
|
|
|
|
|
"libdir=$(libdir)" \
|
|
|
|
|
"prefix=$(prefix)" \
|
|
|
|
|
"includedir=$(includedir)" \
|
|
|
|
|
"AR=$(AR)" \
|
|
|
|
|
"AS=$(AS)" \
|
|
|
|
|
"LD=$(LD)" \
|
|
|
|
|
"LIBCFLAGS=$(LIBCFLAGS)" \
|
|
|
|
|
"NM=$(NM)" \
|
|
|
|
|
"PICFLAG=$(PICFLAG)" \
|
|
|
|
|
"RANLIB=$(RANLIB)" \
|
|
|
|
|
"DESTDIR=$(DESTDIR)"
|
|
|
|
|
|
|
|
|
|
MAKEOVERRIDES=
|
|
|
|
|
|
|
|
|
|
## ################################################################
|
|
|
|
|
|