From 8187e347416eb4f88c187837150cc41c11ae6bf3 Mon Sep 17 00:00:00 2001 From: Cedric Bail Date: Fri, 21 Apr 2017 11:29:38 -0700 Subject: [PATCH] eina: some architecture don't like prefetch on NULL apparently. --- src/lib/eina/eina_types.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/eina/eina_types.h b/src/lib/eina/eina_types.h index 1031a40723..57e7518151 100644 --- a/src/lib/eina/eina_types.h +++ b/src/lib/eina/eina_types.h @@ -194,10 +194,10 @@ # define EINA_LIKELY(exp) __builtin_expect((exp), 1) # define EINA_SENTINEL __attribute__((__sentinel__)) # ifndef __clang__ -# define EINA_PREFETCH(arg) __builtin_prefetch(arg) -# define EINA_PREFETCH_WRITE(arg) __builtin_prefetch(arg, 1) -# define EINA_PREFETCH_NOCACHE(arg) __builtin_prefetch(arg, 0, 0) -# define EINA_PREFETCH_NOCACHE_WRITE(arg) __builtin_prefetch(arg, 1, 0) +# define EINA_PREFETCH(arg) (arg ? __builtin_prefetch(arg) : (void) arg) +# define EINA_PREFETCH_WRITE(arg) (arg ? __builtin_prefetch(arg, 1) : (void) arg) +# define EINA_PREFETCH_NOCACHE(arg) (arg ? __builtin_prefetch(arg, 0, 0) : (void) arg) +# define EINA_PREFETCH_NOCACHE_WRITE(arg) (arg ? __builtin_prefetch(arg, 1, 0) : (void) arg) # else /* LLVM Clang workaround (crash on compilation) */ # define EINA_PREFETCH(arg) ((void) (arg))