[compiler-rt] r204029 - [sanitizer] make real_pthread_attr_getstack extern "C"

[Alexey Samsonov]

FYI this broke MSan tests:
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux/builds/7988/steps/run%20msan%20unit%20tests/logs/stdio


On Mon, Mar 17, 2014 at 9:00 AM, Kostya Serebryany <kcc at google.com> wrote:

> Author: kcc
> Date: Mon Mar 17 00:00:35 2014
> New Revision: 204029
>
> URL: http://llvm.org/viewvc/llvm-project?rev=204029&view=rev
> Log:
> [sanitizer] make real_pthread_attr_getstack extern "C"
>
> Modified:
>
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
>     compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux_libcdep.cc
>
> Modified:
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
> URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc?rev=204029&r1=204028&r2=204029&view=diff
>
> ==============================================================================
> ---
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
> (original)
> +++
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
> Mon Mar 17 00:00:35 2014
> @@ -2880,9 +2880,11 @@ INTERCEPTOR(int, pthread_attr_getstack,
>  // in sanitizer_common, but we don't want to include the interception
> headers
>  // there. So, just define this function here.
>  namespace __sanitizer {
> +extern "C" {
>  int real_pthread_attr_getstack(void *attr, void **addr, SIZE_T *size) {
>    return REAL(pthread_attr_getstack)(attr, addr, size);
>  }
> +}  // extern "C"
>  }  // namespace __sanitizer
>
>  #define INIT_PTHREAD_ATTR_GET                             \
>
> Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux_libcdep.cc
> URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux_libcdep.cc?rev=204029&r1=204028&r2=204029&view=diff
>
> ==============================================================================
> --- compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux_libcdep.cc
> (original)
> +++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux_libcdep.cc Mon
> Mar 17 00:00:35 2014
> @@ -50,8 +50,10 @@
>  namespace __sanitizer {
>
>  // This function is defined elsewhere if we intercepted
> pthread_attr_getstack.
> +extern "C" {
>  SANITIZER_WEAK_ATTRIBUTE int
>  real_pthread_attr_getstack(void *attr, void **addr, size_t *size);
> +}  // extern "C"
>
>  static int my_pthread_attr_getstack(void *attr, void **addr, size_t
> *size) {
>    if (real_pthread_attr_getstack)
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>



-- 
Alexey Samsonov, MSK
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20140317/be207b92/attachment.html>