diff options
author | Martin Liska <mliska@suse.cz> | 2018-10-31 12:14:23 +0100 |
---|---|---|
committer | Martin Liska <marxin@gcc.gnu.org> | 2018-10-31 11:14:23 +0000 |
commit | eac975312214dccb9d425b3e8d0b93e85c11ddf4 (patch) | |
tree | 431086825b095506e32d4c0b0e479c62254e2b69 /libsanitizer/asan/asan_interceptors_memintrinsics.cc | |
parent | 95fba530b6f68f336090abb5699ae9f24d1e22e6 (diff) | |
download | gcc-eac975312214dccb9d425b3e8d0b93e85c11ddf4.tar.gz |
backport: All source files: Merge from upstream 345033.
Merge from upstream 345033.
2018-10-31 Martin Liska <mliska@suse.cz>
* All source files: Merge from upstream 345033.
From-SVN: r265665
Diffstat (limited to 'libsanitizer/asan/asan_interceptors_memintrinsics.cc')
-rw-r--r-- | libsanitizer/asan/asan_interceptors_memintrinsics.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libsanitizer/asan/asan_interceptors_memintrinsics.cc b/libsanitizer/asan/asan_interceptors_memintrinsics.cc index 16de54cfeef..b0c06a04cac 100644 --- a/libsanitizer/asan/asan_interceptors_memintrinsics.cc +++ b/libsanitizer/asan/asan_interceptors_memintrinsics.cc @@ -29,14 +29,14 @@ void *__asan_memmove(void *to, const void *from, uptr size) { ASAN_MEMMOVE_IMPL(nullptr, to, from, size); } -#if SANITIZER_FUCHSIA +#if SANITIZER_FUCHSIA || SANITIZER_RTEMS -// Fuchsia doesn't use sanitizer_common_interceptors.inc, but the only -// things there it wants are these three. Just define them as aliases -// here rather than repeating the contents. +// Fuchsia and RTEMS don't use sanitizer_common_interceptors.inc, but +// the only things there it wants are these three. Just define them +// as aliases here rather than repeating the contents. -decltype(memcpy) memcpy[[gnu::alias("__asan_memcpy")]]; -decltype(memmove) memmove[[gnu::alias("__asan_memmove")]]; -decltype(memset) memset[[gnu::alias("__asan_memset")]]; +extern "C" decltype(__asan_memcpy) memcpy[[gnu::alias("__asan_memcpy")]]; +extern "C" decltype(__asan_memmove) memmove[[gnu::alias("__asan_memmove")]]; +extern "C" decltype(__asan_memset) memset[[gnu::alias("__asan_memset")]]; -#endif // SANITIZER_FUCHSIA +#endif // SANITIZER_FUCHSIA || SANITIZER_RTEMS |