diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-12-18 15:01:58 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-12-18 15:01:58 +0100 |
| commit | 701419b02f12688188a7d4183523e0f5ee9ae09a (patch) | |
| tree | 9cad9901bbf188c5ab30aeb31f10c71f61921312 /mysys/my_context.c | |
| parent | 4923d19b7c3c4c034f70ac1411837afa75c4b6ad (diff) | |
| parent | 6c3de76ad5cb8683ab8b049e0bbba670115d304a (diff) | |
| download | mariadb-git-701419b02f12688188a7d4183523e0f5ee9ae09a.tar.gz | |
Merge MariaDB 10.0-base to MariaDB 10.0
Diffstat (limited to 'mysys/my_context.c')
| -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 10382163331..2a710458670 100644 --- a/mysys/my_context.c +++ b/mysys/my_context.c @@ -454,7 +454,7 @@ my_context_spawn(struct my_context *c, void (*f)(void *), void *d) ( "movl %%esp, (%[save])\n\t" "movl %[stack], %%esp\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 |