diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2016-06-20 15:26:05 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2016-06-20 15:26:05 +0200 |
| commit | f2dded9bac48de391cdd796283769691872ba911 (patch) | |
| tree | f8d7b93968d821c4c93528f299e62a52c357ed32 /mysys | |
| parent | 0a96c9c4aab671ddcd1ac6af2c0bacf84405b0ff (diff) | |
| parent | a80dbe068ca650ef1f4daee2263f0bc6e7aeb0e1 (diff) | |
| download | mariadb-git-f2dded9bac48de391cdd796283769691872ba911.tar.gz | |
Merge branch '10.0' of https://github.com/MariaDB/server into 10.0
Diffstat (limited to 'mysys')
| -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 |