maria-developers team mailing list archive

Thread
Date

Re: [Commits] Rev 3569: MDEV-3830 - fix build on Intel compiler in file:///H:/bzr/5.5/

To: Vladislav Vaintroub <wlad@xxxxxxxxxxxxxxxx>
From: Kristian Nielsen <knielsen@xxxxxxxxxxxxxxx>
Date: Sat, 03 Nov 2012 23:10:00 +0100
Cc: maria-developers@xxxxxxxxxxxxxxxxxxx
In-reply-to: <20121102233211.E41102C4158@mail.askmonty.org> (Vladislav Vaintroub's message of "Fri, 2 Nov 2012 23:32:11 +0000 (UTC)")
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.4 (gnu/linux)

Vladislav Vaintroub <wlad@xxxxxxxxxxxxxxxx> writes:

> === modified file 'mysys/my_context.c'
> --- a/mysys/my_context.c	2012-10-31 11:47:25 +0000
> +++ b/mysys/my_context.c	2012-11-02 23:31:50 +0000
> @@ -206,7 +206,7 @@
>      (
>       "movq %%rsp, (%[save])\n\t"
>       "movq %[stack], %%rsp\n\t"
> -#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4
> +#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 && !defined(__INTEL_COMPILER)

There are two places this is done (one for 32-bit and one for 64-bit). You
probably need the !defined(__INTEL_COMPILER) on both.

 - Kristian.