← Back to team overview

maria-developers team mailing list archive

Re: [Commits] 2709165: MDEV-9128 - Compiling on IBM System Z fails

 

Hi Sergey,

Is this true only for innodb_plugin ?

R: Jan

On Wed, Nov 18, 2015 at 2:07 PM, Sergey Vojtovich <svoj@xxxxxxxxxxx> wrote:

> revision-id: 27091653333caed4691d1203f0b91d22d0e7927b
> (mariadb-10.1.8-67-g2709165)
> parent(s): bff6780806f4afed8faaf4c79b1593964564097e
> committer: Sergey Vojtovich
> timestamp: 2015-11-18 15:51:20 +0400
> message:
>
> MDEV-9128 - Compiling on IBM System Z fails
>
> Provided IBM System Z have outdated compiler version, which supports gcc
> sync
> builtins but not gcc atomic builtins. It also has weak memory model.
>
> InnoDB attempted to verify if __sync_lock_test_and_set() is available by
> checking IB_STRONG_MEMORY_MODEL. This macro has nothing to do with
> availability
> of __sync_lock_test_and_set(), the right one is HAVE_ATOMIC_BUILTINS.
>
> ---
>  storage/innobase/include/os0sync.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/storage/innobase/include/os0sync.h
> b/storage/innobase/include/os0sync.h
> index 8e4b4f4..e192a3a 100644
> --- a/storage/innobase/include/os0sync.h
> +++ b/storage/innobase/include/os0sync.h
> @@ -487,7 +487,7 @@ os_atomic_clear(volatile lock_word_t* ptr)
>         __atomic_clear(ptr, __ATOMIC_RELEASE);
>  }
>
> -# elif defined(IB_STRONG_MEMORY_MODEL)
> +# elif defined(HAVE_ATOMIC_BUILTINS)
>
>  /** Do an atomic test and set.
>  @param[in,out] ptr             Memory location to set to non-zero
> _______________________________________________
> commits mailing list
> commits@xxxxxxxxxxx
> https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits

Follow ups