Conflict fixes from previous commits.
authorDavid Carlier <devnexen@gmail.com>
Sat, 8 Dec 2018 00:21:40 +0000 (00:21 +0000)
committerDavid Carlier <devnexen@gmail.com>
Sat, 8 Dec 2018 00:21:40 +0000 (00:21 +0000)
commitcc3be702b0342d127fc4ac908ad41148eae2b039
tree824ef8868a9037fff4630977b1be06fb3e102eb4
parenta0d0202d8923960a4dad1a1e7b5ea36a465bab8a
Conflict fixes from previous commits.

llvm-svn: 348669
compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
compiler-rt/test/sanitizer_common/TestCases/FreeBSD/capsicum.cc