Skip to content

Commit fc0a6dd

Browse files
committed
Merge branch '5.5' into 10.0
2 parents 74fe0e0 + f65c9f8 commit fc0a6dd

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

mysys/my_context.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,8 @@ my_context_spawn(struct my_context *c, void (*f)(void *), void *d)
206206
(
207207
"movq %%rsp, (%[save])\n\t"
208208
"movq %[stack], %%rsp\n\t"
209-
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && !defined(__INTEL_COMPILER)
209+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) || __clang__) && \
210+
!defined(__INTEL_COMPILER)
210211
/*
211212
This emits a DWARF DW_CFA_undefined directive to make the return address
212213
undefined. This indicates that this is the top of the stack frame, and

0 commit comments

Comments
 (0)