diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-30 16:38:05 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-30 16:38:05 +0200 |
| commit | 932646b1ff6a8f5815a961340a9e1ee4702f5b44 (patch) | |
| tree | 5bc42ace8ae1f7e4d00baffd468bdb7564e851f1 /mysys/my_context.c | |
| parent | 0bb30f3603b519780eaf3fe0527b1c6af285229a (diff) | |
| parent | 33492ec8d4e2077cf8e07d0628a959d8729bd1f9 (diff) | |
| download | mariadb-git-932646b1ff6a8f5815a961340a9e1ee4702f5b44.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysys/my_context.c')
| -rw-r--r-- | mysys/my_context.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_context.c b/mysys/my_context.c index 5faa041361a..fd9415afc94 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 && !defined(__INTEL_COMPILER) +#if (__GNUC__ > 4 || (__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 @@ -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 && !defined(__INTEL_COMPILER) +#if (__GNUC__ > 4 || (__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 |