commit 108757 breaks clang build on os x

[Kai Tetzlaff <kai.tetzlaff@web.de>]

[-- Attachment #1: Type: text/plain, Size: 684 bytes --]


The following lines in alloc.c

  #ifdef __clang__
    /* Do not allow -faddress-sanitizer to check this function, since it
       crosses the function stack boundary, and thus would yield many
       false positives. */
    __attribute__((no_address_safety_analysis))
  #endif

break the build on os x using

  $ clang --version
  Apple clang version 3.0 (tags/Apple/clang-211.10.1) (based on LLVM 3.0svn)
  Target: x86_64-apple-darwin10.8.0
  Thread model: posix

It seems that

  __attribute__((no_address_safety_analysis))

is not supported by all clang versions. The attached patch contains an
improved version of the check which hopefully fixes the problem (it does
so here).


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: alloc.c: fix check for clang feature --]
[-- Type: text/x-patch, Size: 465 bytes --]

=== modified file 'src/alloc.c'
--- src/alloc.c	2012-06-28 19:09:41 +0000
+++ src/alloc.c	2012-06-29 06:53:41 +0000
@@ -4608,7 +4608,7 @@
 
 static void
 mark_memory (void *start, void *end)
-#ifdef __clang__
+#if defined (__clang__) && defined (__has_feature) && __has_feature(address_sanitizer)
   /* Do not allow -faddress-sanitizer to check this function, since it
      crosses the function stack boundary, and thus would yield many
      false positives. */