+2016-11-15 Matthias Klose <doko@ubuntu.com>
+
+ * configure: Regenerate.
+
+2016-11-09 Maxim Ostapenko <m.ostapenko@samsung.com>
+
+ * asan/asan_globals.cc (RegisterGlobal): Do not call
+ CheckODRViolationViaPoisoning.
+ (CheckODRViolationViaPoisoning): Remove.
+
+2016-11-09 Maxim Ostapenko <m.ostapenko@samsung.com>
+
+ * sanitizer_common/sanitizer_stacktrace.cc (GetCanonicFrame): Assume we
+ compiled code with GCC when extracting the caller PC for ARM if no
+ valid frame pointer is available.
+
+2016-11-09 Maxim Ostapenko <m.ostapenko@samsung.com>
+
+ PR sanitizer/63958
+ Reapply:
+ 2014-10-14 David S. Miller <davem@davemloft.net>
+
+ * sanitizer_common/sanitizer_platform_limits_linux.cc (time_t):
+ Define at __kernel_time_t, as needed for sparc.
+ (struct __old_kernel_stat): Don't check if __sparc__ is defined.
+ * libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+ (__sanitizer): Define struct___old_kernel_stat_sz,
+ struct_kernel_stat_sz, and struct_kernel_stat64_sz for sparc.
+ (__sanitizer_ipc_perm): Adjust for sparc targets.
+ (__sanitizer_shmid_ds): Likewsie.
+ (__sanitizer_sigaction): Likewise.
+ (IOC_SIZE): Likewsie.
+
+2016-11-09 Maxim Ostapenko <m.ostapenko@samsung.com>
+
+ * All source files: Merge from upstream 285547.
+ * configure.tgt (SANITIZER_COMMON_TARGET_DEPENDENT_OBJECTS): New
+ variable.
+ * configure.ac (SANITIZER_COMMON_TARGET_DEPENDENT_OBJECTS): Handle it.
+ * asan/Makefile.am (asan_files): Add new files.
+ * asan/Makefile.in: Regenerate.
+ * ubsan/Makefile.in: Likewise.
+ * lsan/Makefile.in: Likewise.
+ * tsan/Makefile.am (tsan_files): Add new files.
+ * tsan/Makefile.in: Regenerate.
+ * sanitizer_common/Makefile.am (sanitizer_common_files): Add new files.
+ (EXTRA_libsanitizer_common_la_SOURCES): Define.
+ (libsanitizer_common_la_LIBADD): Likewise.
+ (libsanitizer_common_la_DEPENDENCIES): Likewise.
+ * sanitizer_common/Makefile.in: Regenerate.
+ * interception/Makefile.in: Likewise.
+ * libbacktace/Makefile.in: Likewise.
+ * Makefile.in: Likewise.
+ * configure: Likewise.
+ * merge.sh: Handle builtins/assembly.h merging.
+ * builtins/assembly.h: New file.
+ * asan/libtool-version: Bump the libasan SONAME.
+
+2016-09-21 Jakub Jelinek <jakub@redhat.com>
+
+ PR sanitizer/77567
+ * asan/asan_new_delete.cc: Cherry-pick upstream r282019.
+
+2016-09-05 Jakub Jelinek <jakub@redhat.com>
+
+ PR sanitizer/77396
+ * asan/asan_globals.cc: Cherry-pick upstream r280657.
+
+2016-08-12 Jakub Jelinek <jakub@redhat.com>
+
+ PR sanitizer/71042
+ * tsan/tsan_platform_linux.cc: Cherry-pick upstream r278292.
+ * tsan/tsan_rtl_aarch64.S: Likewise.
+
+2016-07-23 Alan Modra <amodra@gmail.com>
+
+ Revert 2015-11-09 Alan Modra <amodra@gmail.com>
+ * configure.ac: Don't substitute OBSTACK_DEFS.
+ * asan/Makefile.am: Remove OBSTACK_DEFS from DEFS.
+ * tsan/Makefile.am: Likewise.
+ * configure: Regenerate.
+ * Makefile.in: Regenerate.
+ * asan/Makefile.in: Regenerate.
+ * interception/Makefile.in: Regenerate.
+ * libbacktrace/Makefile.in: Regenerate.
+ * lsan/Makefile.in: Regenerate.
+ * sanitizer_common/Makefile.in: Regenerate.
+ * tsan/Makefile.in: Regenerate.
+ * ubsan/Makefile.in: Regenerate.
+
+2016-05-17 Jakub Jelinek <jakub@redhat.com>
+
+ PR sanitizer/71160
+ * asan/asan_malloc_linux.cc: Cherry pick upstream r254395
+ and r269633.
+
+2016-04-21 Maxim Ostapenko <m.ostapenko@samsung.com>
+
+ PR sanitizer/70624
+ * asan/asan_mac.cc: Cherry pick upstream r266868.
+
+2016-01-19 Jakub Jelinek <jakub@redhat.com>
+
+ PR sanitizer/68824
+ * tsan/tsan_interceptors.cc (NEED_TLS_GET_ADDR, __tls_get_addr,
+ InitializeInterceptors): Cherry pick upstream r258119.
+
+2016-01-14 Andreas Tobler <andreast@gcc.gnu.org>
+
+ * configure.ac: Replace the hard-coded -ldl requirement for
+ link_sanitizer_common with a configure time check for -ldl.
+ * configure: Regenerate.
+
+2015-11-24 Maxim Ostapenko <m.ostapenko@partner.samsung.com>
+
+ * include/system/linux/asm/ptrace.h: Move to ...
+ * include/system/asm/ptrace.h: ... this.
+
+2015-11-24 Maxim Ostapenko <m.ostapenko@partner.samsung.com>
+
+ * include/system/linux/asm/ptrace.h: New header.
+
+2015-11-23 Maxim Ostapenko <m.ostapenko@partner.samsung.com>
+
+ * All source files: Merge from upstream r253555.
+ * configure.tgt: Enable LSan on aarch64-*-linux* targets. Add new
+ dependences for TSan for aarch64-*-linux* targets.
+ * tsan/Makefile.am: Add new source files.
+ * configure: Regenerate.
+ * tsan/Makefile.in: Likewise.
+
+2015-11-09 Alan Modra <amodra@gmail.com>
+
+ * sanitizer_common/sanitizer_common_interceptors.inc: Update size
+ params for _obstack_begin_1, _obstack_begin, _obstack_newchunk
+ interceptors.
+ * configure.ac: Substitute OBSTACK_DEFS.
+ * asan/Makefile.am: Add OBSTACK_DEFS to DEFS.
+ * tsan/Makefile.am: Likewise.
+ * configure: Regenerate.
+ * Makefile.in: Regenerate.
+ * asan/Makefile.in: Regenerate.
+ * interception/Makefile.in: Regenerate.
+ * libbacktrace/Makefile.in: Regenerate.
+ * lsan/Makefile.in: Regenerate.
+ * sanitizer_common/Makefile.in: Regenerate.
+ * tsan/Makefile.in: Regenerate.
+ * ubsan/Makefile.in: Regenerate.
+
+2015-10-22 Maxim Ostapenko <m.ostapenko@partner.samsung.com>
+
+ PR bootstrap/68041
+ * configure.ac (link_sanitizer_common): Link against librt only if it
+ contains shm_open, required by sanitizers.
+ (CXX_ABI_NEEDED): Remove variable.
+ * configure: Regenerate.
+ * ubsan/Makefile.am (libubsan_la_LIBADD): Do not add -lc++abi anymore.
+ * ubsan/Makefile.in: Regenerate.
+
+2015-10-21 Maxim Ostapenko <m.ostapenko@partner.samsung.com>
+
+ * HOWTO_MERGE: New file.
+
+2015-10-21 Maxim Ostapenko <m.ostapenko@partner.samsung.com>
+
+ * sanitizer_common/sanitizer_stacktrace.cc (GetCanonicFrame): Assume we
+ compiled code with GCC when extracting the caller PC for ARM if no
+ valid frame pointer is available.
+
+2015-10-21 Maxim Ostapenko <m.ostapenko@partner.samsung.com>
+
+ PR bootstrap/63888
+ Reapply:
+ 2015-02-20 Jakub Jelinek <jakub@redhat.com>
+
+ * asan/asan_globals.cc (RegisterGlobal): Disable detect_odr_violation
+ support until it is rewritten upstream.
+
+ * c-c++-common/asan/pr63888.c: New test.
+
+2015-10-21 Maxim Ostapenko <m.ostapenko@partner.samsung.com>
+
+ PR sanitizer/63958
+ Reapply:
+ 2014-10-14 David S. Miller <davem@davemloft.net>
+
+ * sanitizer_common/sanitizer_platform_limits_linux.cc (time_t):
+ Define at __kernel_time_t, as needed for sparc.
+ (struct __old_kernel_stat): Don't check if __sparc__ is defined.
+ * libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+ (__sanitizer): Define struct___old_kernel_stat_sz,
+ struct_kernel_stat_sz, and struct_kernel_stat64_sz for sparc.
+ (__sanitizer_ipc_perm): Adjust for sparc targets.
+ (__sanitizer_shmid_ds): Likewsie.
+ (__sanitizer_sigaction): Likewise.
+ (IOC_SIZE): Likewsie.
+
+2015-10-21 Maxim Ostapenko <m.ostapenko@partner.samsung.com>
+
+ * All source files: Merge from upstream r250806.
+ * configure.ac (link_sanitizer_common): Add -lrt flag.
+ * configure.tgt: Enable TSAN and LSAN for aarch64-linux targets.
+ Set USE_CXX_ABI_FLAG=true for darwin.
+ * asan/Makefile.am (asan_files): Add new files.
+ (DEFS): Add DCAN_SANITIZE_UB=0 and remove unused and legacy
+ DASAN_FLEXIBLE_MAPPING_AND_OFFSET=0.
+ * asan/Makefile.in: Regenerate.
+ * ubsan/Makefile.am (ubsan_files): Add new files.
+ (DEFS): Add DCAN_SANITIZE_UB=1.
+ (libubsan_la_LIBADD): Add -lc++abi if USE_CXX_ABI_FLAG is true.
+ * ubsan/Makefile.in: Regenerate.
+ * tsan/Makefile.am (tsan_files): Add new files.
+ (DEFS): Add DCAN_SANITIZE_UB=0.
+ * tsan/Makefile.in: Regenerate.
+ * sanitizer_common/Makefile.am (sanitizer_common_files): Add new files.
+ * sanitizer_common/Makefile.in: Regenerate.
+ * asan/libtool-version: Bump the libasan SONAME.
+
+2015-09-09 Markus Trippelsdorf <markus@trippelsdorf.de>
+
+ PR sanitizer/67258
+ * ubsan/ubsan_type_hash.cc: Cherry pick upstream r244101.
+
+2015-07-29 Markus Trippelsdorf <markus@trippelsdorf.de>
+
+ PR sanitizer/63927
+ * sanitizer_common/sanitizer_stacktrace.h: Use fast unwinder
+ for PowerPC.
+
+2015-07-28 Bill Schmidt <wschmidt@linux.vnet.ibm.com>
+
+ PR sanitizer/63927
+ * sanitizer_common/sanitizer_stacktrace.cc
+ (BufferedStackTrace::FastUnwindStack): Fix code for PowerPC to
+ find the link register at an offset of 16 from the base of the
+ caller's stack frame.
+
+2015-05-13 Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
+
+ * Makefile.in: Regenerated with automake-1.11.6.
+ * aclocal.m4: Likewise.
+ * asan/Makefile.in: Likewise.
+ * configure: Likewise.
+ * interception/Makefile.in: Likewise.
+ * libbacktrace/Makefile.in: Likewise.
+ * lsan/Makefile.in: Likewise.
+ * sanitizer_common/Makefile.in: Likewise.
+ * tsan/Makefile.in: Likewise.
+ * ubsan/Makefile.in: Likewise.
+
+2015-04-13 Yury Gribov <y.gribov@samsung.com>
+
+ PR sanitizer/64839
+ * sanitizer_common/sanitizer_platform.h: Cherry pick
+ upstream r234470.
+ * sanitizer_common/sanitizer_platform_limits_posix.cc: Ditto.
+ * configure.ac (RPC_DEFS): Check for precense of RPC headers.
+ * sanitizer_common/Makefile.am (DEFS): Pass info to compiler.
+ * Makefile.in: Regenerate.
+ * asan/Makefile.in: Regenerate.
+ * config.h.in: Regenerate.
+ * configure: Regenerate.
+ * interception/Makefile.in: Regenerate.
+ * libbacktrace/Makefile.in: Regenerate.
+ * lsan/Makefile.in: Regenerate.
+ * sanitizer_common/Makefile.in: Regenerate.
+ * tsan/Makefile.in: Regenerate.
+ * ubsan/Makefile.in: Regenerate.
+
+
+2015-03-23 Christophe Lyon <christophe.lyon@linaro.org>
+
+ PR sanitizer/59009
+ * sanitizer_common/sanitizer_platform_limits_posix.cc: Cherry pick
+ upstream r230324.
+ * sanitizer_common/sanitizer_platform.h: Likewise.
+ * sanitizer_common/sanitizer_common_syscalls.inc: Likewise.
+
+2015-03-11 Bernd Edlinger <bernd.edlinger@hotmail.de>
+
+ * tsan/tsan_rtl_report.cc (ScopedReport::AddThread): Cherry pick
+ upstream 224508 and 224755.
+
+2015-03-09 Jakub Jelinek <jakub@redhat.com>
+
+ PR sanitizer/63958
+ Reapply:
+ 2014-10-14 David S. Miller <davem@davemloft.net>
+
+ * sanitizer_common/sanitizer_platform_limits_linux.cc (time_t):
+ Define at __kernel_time_t, as needed for sparc.
+ (struct __old_kernel_stat): Don't check if __sparc__ is defined.
+ * libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+ (__sanitizer): Define struct___old_kernel_stat_sz,
+ struct_kernel_stat_sz, and struct_kernel_stat64_sz for sparc.
+ (__sanitizer_ipc_perm): Adjust for sparc targets.
+ (__sanitizer_shmid_ds): Likewsie.
+ (__sanitizer_sigaction): Likewise.
+ (IOC_SIZE): Likewsie.
+
+2015-02-27 Peter Bergner <bergner@vnet.ibm.com>
+
+ * configure.tgt: Enable build on powerpc*le-*-linux.
+
2015-02-23 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/63888