diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-06-08 15:16:39 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-06-08 15:16:39 +0200 |
| commit | 94b47bc5a531c2336b136fcdf226f83e2b2c6bac (patch) | |
| tree | 168459703b9169ca4eb8938b5c36035585eab7da | |
| parent | 9ff93656ae072cb95ad7e9404819f2cfbfbda0bc (diff) | |
| parent | 196d96cc8f19f1ecf337e6e4e933e1eef565f4aa (diff) | |
| download | mariadb-git-94b47bc5a531c2336b136fcdf226f83e2b2c6bac.tar.gz | |
Merge branch 'mdev9991' into mdev9991-10.1MDEV-8947
| -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 60c0014b3b9..e4ca4143baf 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 |