Merge branch '5.5' into 10.0

fc0a6dd5 · Vicențiu Ciorbaru · 74fe0e03 · f65c9f82 · fc0a6dd5
Commit fc0a6dd5 authored Mar 08, 2017 by Vicențiu Ciorbaru
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

mysys/my_context.c mysys/my_context.c +2 -1

No files found.
--- a/mysys/my_context.c
+++ b/mysys/my_context.c
@@ -206,7 +206,8 @@ my_context_spawn(struct my_context *c, void (*f)(void *), void *d)
    (
     "movq %%rsp, (%[save])\n\t"
     "movq %[stack], %%rsp\n\t"
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && !defined(__INTEL_COMPILER)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) || __clang__) && \
+     !defined(__INTEL_COMPILER)
     /*
       This emits a DWARF DW_CFA_undefined directive to make the return address
       undefined. This indicates that this is the top of the stack frame, and