diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-08 12:21:13 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-08 12:21:13 +0200 |
| commit | fc0a6dd57fa81194648278150546899bff603029 (patch) | |
| tree | 54c708fc642a21c0823fcf4b5516426c661b6f73 /mysys/my_context.c | |
| parent | 74fe0e03d554130b60bf734531d1763451e6ceff (diff) | |
| parent | f65c9f825d164cf79dd6d5897ef144abba40ff6d (diff) | |
| download | mariadb-git-fc0a6dd57fa81194648278150546899bff603029.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysys/my_context.c')
| -rw-r--r-- | mysys/my_context.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/my_context.c b/mysys/my_context.c index 017cebdc110..29ba9f79c72 100644 --- 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 |