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.

diff --git a/src/atomic_ops/sysdeps/gcc/hexagon.h b/src/atomic_ops/sysdeps/gcc/hexagon.h
index fdc9e56e9b9551cfad647c4ffa135c791818590b..62ad0da89134da51d5456f0cf81c12f71e60cde7 100644 (file)
--- 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 60c7a7e4c629ac14b8b50aaff18b0eaafc993884..6c5e221c10950654d536e208d7732e86a98b2fa4 100644 (file)
--- 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 b793fcbdfb73534960f253e9997c4dde047ce00f..3c538fde84465301ff9ae3265025ca6aa02869cd 100644 (file)
--- 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