diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-23 12:54:38 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-06-23 12:54:38 -0400 |
| commit | ecdb2b6e86d4bef2718eaec61f1edd1c11e41e1a (patch) | |
| tree | 010cc373543ab2e65c63b9e1e56a62252afa3c50 /mysys/my_context.c | |
| parent | 51a32ebeb3653bfed481a3ddbfe5f93aecdf4a35 (diff) | |
| parent | 12ae840375fe30da1c23647facaa0678858d6d92 (diff) | |
| download | mariadb-git-ecdb2b6e86d4bef2718eaec61f1edd1c11e41e1a.tar.gz | |
Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50
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 80156df4495..01d6f404627 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 @@ -456,7 +456,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 |