<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Wed, Apr 20, 2016 at 3:31 PM, Richard Smith <span dir="ltr"><<a href="mailto:richard@metafoo.co.uk" target="_blank">richard@metafoo.co.uk</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div><div class="h5">On Wed, Apr 20, 2016 at 3:18 PM, Saleem Abdulrasool via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: compnerd<br>
Date: Wed Apr 20 17:18:47 2016<br>
New Revision: 266926<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=266926&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=266926&view=rev</a><br>
Log:<br>
unwind: unify the definition of _LIBUNWIND_SUPPORT_FRAME_APIS<br>
<br>
Unify the definition of the _LIBUNWIND_SUPPORT_FRAME_APIS macro. This is in<br>
preparation to remove another instance of -Wexpansion-to-defined. NFC.<br>
<br>
Modified:<br>
libunwind/trunk/src/config.h<br>
<br>
Modified: libunwind/trunk/src/config.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/libunwind/trunk/src/config.h?rev=266926&r1=266925&r2=266926&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libunwind/trunk/src/config.h?rev=266926&r1=266925&r2=266926&view=diff</a><br>
==============================================================================<br>
--- libunwind/trunk/src/config.h (original)<br>
+++ libunwind/trunk/src/config.h Wed Apr 20 17:18:47 2016<br>
@@ -40,8 +40,6 @@<br>
#endif<br>
<br>
#define _LIBUNWIND_BUILD_SJLJ_APIS defined(__arm__)<br>
- #define _LIBUNWIND_SUPPORT_FRAME_APIS (defined(__i386__) || \<br>
- defined(__x86_64__))<br>
#define _LIBUNWIND_EXPORT __attribute__((visibility("default")))<br>
#define _LIBUNWIND_HIDDEN __attribute__((visibility("hidden")))<br>
#define _LIBUNWIND_LOG(msg, ...) fprintf(stderr, "libuwind: " msg, __VA_ARGS__)<br>
@@ -68,8 +66,6 @@<br>
}<br>
<br>
#define _LIBUNWIND_BUILD_SJLJ_APIS 0<br>
- #define _LIBUNWIND_SUPPORT_FRAME_APIS (defined(__i386__) || \<br>
- defined(__x86_64__))<br>
#define _LIBUNWIND_EXPORT __attribute__((visibility("default")))<br>
#define _LIBUNWIND_HIDDEN __attribute__((visibility("hidden")))<br>
#define _LIBUNWIND_LOG(msg, ...) fprintf(stderr, "libuwind: " msg, __VA_ARGS__)<br>
@@ -86,6 +82,8 @@<br>
#endif<br>
#endif<br>
<br>
+#define _LIBUNWIND_SUPPORT_FRAME_APIS (defined(__i386__) || defined(__x86_64__))<br></blockquote><div><br></div></div></div><div>Producing a 'defined' token by macro expansion isn't required to work (Clang will warn on it; some compilers won't handle it as a 'defined' operator at all). Instead, this should be defined by</div><div><br></div><div>#if defined(__i386) || defined(__x86_64__)</div><div>#define _LIBUNWIND_SUPPORT_FRAME_APIS 1</div><div>#endif</div><div><br></div><div>or similar.</div></div></div></div></blockquote><div><br></div><div>Ha, and your commit message clearly points out that this was a step towards fixing this issue I described. Sorry for the noise! :)</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><span class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+<br>
#if defined(__i386__) || defined(__x86_64__) || \<br>
(!defined(__APPLE__) && defined(__arm__)) || \<br>
(defined(__arm64__) || defined(__aarch64__)) || \<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></span></div><br></div></div>
</blockquote></div><br></div></div>