From f5f5074b70f0cc4a0b582edfb277b742518ca880 Mon Sep 17 00:00:00 2001 From: Samy Al Bahra Date: Tue, 28 Feb 2012 17:07:32 -0500 Subject: [PATCH] ck_pr: Cast down to void pointer for cmpxchg16b wrapper. --- include/gcc/x86_64/ck_pr.h | 42 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/include/gcc/x86_64/ck_pr.h b/include/gcc/x86_64/ck_pr.h index efd1e41..e7ca93b 100644 --- a/include/gcc/x86_64/ck_pr.h +++ b/include/gcc/x86_64/ck_pr.h @@ -170,12 +170,12 @@ ck_pr_load_ptr_2(void *t, void *v) return; } -#define CK_PR_LOAD_2(S, W, T) \ - CK_CC_INLINE static void \ - ck_pr_load_##S##_##W(T t[2], T v[2]) \ - { \ - ck_pr_load_64_2((uint64_t *)t, (uint64_t *)v); \ - return; \ +#define CK_PR_LOAD_2(S, W, T) \ + CK_CC_INLINE static void \ + ck_pr_load_##S##_##W(T t[2], T v[2]) \ + { \ + ck_pr_load_64_2((uint64_t *)(void *)t, (uint64_t *)(void *)v); \ + return; \ } CK_PR_LOAD_2(char, 16, char) @@ -465,21 +465,21 @@ ck_pr_cas_ptr_2_value(void *t, void *c, void *s, void *v) return ck_pr_cas_64_2_value(t, c, s, v); } -#define CK_PR_CAS_V(S, W, T) \ -CK_CC_INLINE static bool \ -ck_pr_cas_##S##_##W(T t[W], T c[W], T s[W]) \ -{ \ - return ck_pr_cas_64_2((uint64_t *)t, \ - (uint64_t *)c, \ - (uint64_t *)s); \ -} \ -CK_CC_INLINE static bool \ -ck_pr_cas_##S##_##W##_value(T *t, T c[W], T s[W], T *v) \ -{ \ - return ck_pr_cas_64_2_value((uint64_t *)t, \ - (uint64_t *)c, \ - (uint64_t *)s, \ - (uint64_t *)v); \ +#define CK_PR_CAS_V(S, W, T) \ +CK_CC_INLINE static bool \ +ck_pr_cas_##S##_##W(T t[W], T c[W], T s[W]) \ +{ \ + return ck_pr_cas_64_2((uint64_t *)(void *)t, \ + (uint64_t *)(void *)c, \ + (uint64_t *)(void *)s); \ +} \ +CK_CC_INLINE static bool \ +ck_pr_cas_##S##_##W##_value(T *t, T c[W], T s[W], T *v) \ +{ \ + return ck_pr_cas_64_2_value((uint64_t *)(void *)t, \ + (uint64_t *)(void *)c, \ + (uint64_t *)(void *)s, \ + (uint64_t *)(void *)v); \ } CK_PR_CAS_V(double, 2, double)