From f414d5d67dea1662cd2479364e318f6db9a4747e Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Tue, 29 Nov 2011 20:36:56 +0400 Subject: Fix generalization for IA-64, Hexagon (include generalize.h before ao_t_is_int.h to have AO_or, AO_..._read/write and some other int-derived primitives got defined) * src/atomic_ops/sysdeps/gcc/hexagon.h: Include generalize.h file before ao_t_is_int.h one. * src/atomic_ops/sysdeps/gcc/ia64.h: Likewise. * src/atomic_ops/sysdeps/hpc/ia64.h: Likewise. --- src/atomic_ops/sysdeps/gcc/hexagon.h | 3 +++ src/atomic_ops/sysdeps/gcc/ia64.h | 2 ++ src/atomic_ops/sysdeps/hpc/ia64.h | 2 ++ 3 files changed, 7 insertions(+) diff --git a/src/atomic_ops/sysdeps/gcc/hexagon.h b/src/atomic_ops/sysdeps/gcc/hexagon.h index fdc9e56..62ad0da 100644 --- a/src/atomic_ops/sysdeps/gcc/hexagon.h +++ b/src/atomic_ops/sysdeps/gcc/hexagon.h @@ -92,4 +92,7 @@ AO_compare_and_swap(volatile AO_t *addr, AO_t old, AO_t new_val) } #define AO_HAVE_compare_and_swap +/* Generalize first to define more AO_int_... primitives. */ +#include "../../generalize.h" + #include "../ao_t_is_int.h" diff --git a/src/atomic_ops/sysdeps/gcc/ia64.h b/src/atomic_ops/sysdeps/gcc/ia64.h index 60c7a7e..6c5e221 100644 --- a/src/atomic_ops/sysdeps/gcc/ia64.h +++ b/src/atomic_ops/sysdeps/gcc/ia64.h @@ -279,5 +279,7 @@ AO_int_compare_and_swap_release(volatile unsigned int *addr, /* FIXME: Add compare_double_and_swap_double for the _ILP32 case. */ #ifdef _ILP32 + /* Generalize first to define more AO_int_... primitives. */ +# include "../../generalize.h" # include "../ao_t_is_int.h" #endif diff --git a/src/atomic_ops/sysdeps/hpc/ia64.h b/src/atomic_ops/sysdeps/hpc/ia64.h index b793fcb..3c538fd 100644 --- a/src/atomic_ops/sysdeps/hpc/ia64.h +++ b/src/atomic_ops/sysdeps/hpc/ia64.h @@ -160,5 +160,7 @@ AO_short_compare_and_swap_release(volatile unsigned short *addr, #define AO_HAVE_short_compare_and_swap_release #ifndef __LP64__ + /* Generalize first to define more AO_int_... primitives. */ +# include "../../generalize.h" # include "../ao_t_is_int.h" #endif -- cgit v1.2.1 From d2663a7c3e2201d32e726b8dbeba81ace17ab002 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Tue, 29 Nov 2011 20:45:12 +0400 Subject: Update ChangeLog --- ChangeLog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2282077..fbb41e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-11-29 Ivan Maidanski + + * src/atomic_ops/sysdeps/gcc/hexagon.h: Include generalize.h file + before ao_t_is_int.h one. + * src/atomic_ops/sysdeps/gcc/ia64.h: Likewise. + * src/atomic_ops/sysdeps/hpc/ia64.h: Likewise. + 2011-11-03 Ivan Maidanski * src/atomic_ops/generalize-small.template -- cgit v1.2.1