diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-11-04 19:32:32 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-11-04 19:32:32 +0400 |
| commit | 5e68c5ce7db95610c2084f9d9c6d01473ae243db (patch) | |
| tree | c553dcf91d5ed7d9677daa44328491454683e3d3 /mysys | |
| parent | be0be7af47fcc75b798fcf7aa98dda9c7d31cc15 (diff) | |
| parent | 39e7072d64f5ff36d61bf81970ec398f8d937cfd (diff) | |
| download | mariadb-git-5e68c5ce7db95610c2084f9d9c6d01473ae243db.tar.gz | |
Merge 5.5 -> 10.0-serg
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_context.c b/mysys/my_context.c index 6b8761e554d..10382163331 100644 --- a/mysys/my_context.c +++ b/mysys/my_context.c @@ -206,7 +206,7 @@ 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_MINOR__ >= 4 +#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 && !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 |