From: Julian Seward <jseward@acm.org>
Date: Thu, 7 Oct 2010 10:00:04 +0000 (+0000)
Subject: Fix build breakage on Darwin resulting from r11402 (see #243270),
X-Git-Tag: svn/VALGRIND_3_6_0~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db5247b157608a78ffc418fca77af94739b55e8c;p=thirdparty%2Fvalgrind.git

Fix build breakage on Darwin resulting from r11402 (see #243270),
by disabling creation of .cfi directives on Darwin, until such time
as someone can figure out how to do this.


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

diff --git a/include/valgrind.h b/include/valgrind.h
index 8f5c508ae1..794f6675fa 100644
--- a/include/valgrind.h
+++ b/include/valgrind.h
@@ -1220,9 +1220,11 @@ 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.
+   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.
 */
-#if HAVE_BUILTIN_FRAME_ADDRESS
+#if HAVE_BUILTIN_FRAME_ADDRESS && !defined(PLAT_amd64_darwin)
 #  define __FRAME_POINTER                                         \
       ,"r"(__builtin_frame_address(0))
 #  define VALGRIND_CFI_PROLOGUE                                   \