On Mon, Dec 02, 2013 at 03:52:09PM +0400, Konstantin Serebryany wrote: > Expected ChangeLog entries: > =========== libsanitizer/ChangeLog > > 2013-12-0X Kostya Serebryany <k...@google.com> > > * All source files: Merge from upstream r196090. > * tsan/Makefile.am (tsan_files): Added new files. > * tsan/Makefile.in: Regenerate. > * sanitizer_common/Makefile.am (sanitizer_common_files): Added new > fles. > * sanitizer_common/Makefile.in: Regenerate. > * lsan/Makefile.am (lsan_files): Added new files. > * lsan/Makefile.in: Regenerate. > > =========== gcc/testsuite/ChangeLog > > 2013-12-0X Kostya Serebryany <k...@google.com> > > * c-c++-common/asan/null-deref-1.c: Update the test > to match the fresh asan run-time.
Ok. Please do another merge momentarily to bring in the ppc32 and CFI fixes and I'll then start working on some of the portability fixes outside of compiler-rt maintained files. Jakub