diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2011-11-29 20:47:22 +0400 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2011-11-29 20:47:22 +0400 |
| commit | d699c383c1d71592cc788abe95f9a7911075970b (patch) | |
| tree | 5a883e7ac910591e9863f85a1b15d90b1e638e0c | |
| parent | d29ec9d4cfbf3f45ddd4b658ced174be444f2970 (diff) | |
| parent | d2663a7c3e2201d32e726b8dbeba81ace17ab002 (diff) | |
| download | libatomic_ops-d699c383c1d71592cc788abe95f9a7911075970b.tar.gz | |
Merge branch 'hotfix-7_2a6-4' into release
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/atomic_ops/sysdeps/gcc/hexagon.h | 3 | ||||
| -rw-r--r-- | src/atomic_ops/sysdeps/gcc/ia64.h | 2 | ||||
| -rw-r--r-- | src/atomic_ops/sysdeps/hpc/ia64.h | 2 |
4 files changed, 14 insertions, 0 deletions
@@ -1,3 +1,10 @@ +2011-11-29 Ivan Maidanski <ivmai@mail.ru> + + * 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 <ivmai@mail.ru> * src/atomic_ops/generalize-small.template 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 |