Only enable CFI annotations when __GCC_HAVE_DWARF2_CFI_ASM is defined. This should...

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11415

diff --git a/include/valgrind.h b/include/valgrind.h
index d2d54a98e037b534621f8ea1981754f936bbbf92..4896018ea8000a97b41235c23d098087a53c369f 100644 (file)
--- a/include/valgrind.h
+++ b/include/valgrind.h
@@ -1221,11 +1221,9 @@ typedef
 
    Oh .. and this all needs to be conditionalised so that it is
    unchanged from before this commit, when compiled with older gccs
-   that don't support __builtin_frame_address.  And also, skip
-   it on Darwin (at least for the moment) since I can't figure out
-   how to do the .cfi directives there.
+   that don't support __builtin_frame_address.
 */
-#if defined(__GNUC__) && !defined(PLAT_amd64_darwin)
+#if defined(__GCC_HAVE_DWARF2_CFI_ASM)
 #  define __FRAME_POINTER                                         \
       ,"r"(__builtin_frame_address(0))
 #  define VALGRIND_CFI_PROLOGUE                                   \