From: Karl Meakin <[email protected]>
gcc/ChangeLog:
* config/aarch64/aarch64-builtins.cc (ENTRY): Rename to ...
(DEF_SIMD_TYPE): Here.
* config/aarch64/aarch64-builtins.h (ENTRY): Likewise.
(DEF_SIMD_TYPE): Likewise.
* config/aarch64/aarch64-simd-builtin-types.def (ENTRY): Likewise.
(DEF_SIMD_TYPE): Likewise.
* config/aarch64/aarch64-sve-builtins.h (ENTRY): Likewise.
(DEF_SIMD_TYPE): Likewise.
---
gcc/config/aarch64/aarch64-builtins.cc | 4 +-
gcc/config/aarch64/aarch64-builtins.h | 3 +-
.../aarch64/aarch64-simd-builtin-types.def | 78 ++++++++++---------
gcc/config/aarch64/aarch64-sve-builtins.h | 3 +-
4 files changed, 45 insertions(+), 43 deletions(-)
diff --git a/gcc/config/aarch64/aarch64-builtins.cc b/gcc/config/aarch64/aarch64-builtins.cc
index 408099a50e8a..30106a576810 100644
--- a/gcc/config/aarch64/aarch64-builtins.cc
+++ b/gcc/config/aarch64/aarch64-builtins.cc
@@ -1003,13 +1003,11 @@ const char *aarch64_scalar_builtin_types[] = {
extern const aarch64_simd_type_info aarch64_simd_types[];
extern GTY(()) aarch64_simd_type_info_trees aarch64_simd_types_trees[];
-#undef ENTRY
-#define ENTRY(E, M, Q, G) \
+#define DEF_SIMD_TYPE(E, M, Q, G) \
{E, "__" #E, #G "__" #E, E_##M##mode, qualifier_##Q},
const struct aarch64_simd_type_info aarch64_simd_types[] = {
#include "aarch64-simd-builtin-types.def"
};
-#undef ENTRY
struct aarch64_simd_type_info_trees
aarch64_simd_types_trees[ARRAY_SIZE (aarch64_simd_types)];
diff --git a/gcc/config/aarch64/aarch64-builtins.h b/gcc/config/aarch64/aarch64-builtins.h
index b96081ab5334..75ddc263721c 100644
--- a/gcc/config/aarch64/aarch64-builtins.h
+++ b/gcc/config/aarch64/aarch64-builtins.h
@@ -60,13 +60,12 @@ enum aarch64_type_qualifiers
qualifier_modal_float = 0x2000,
};
-#define ENTRY(E, M, Q, G) E,
+#define DEF_SIMD_TYPE(E, M, Q, G) E,
enum aarch64_simd_type
{
#include "aarch64-simd-builtin-types.def"
ARM_NEON_H_TYPES_LAST
};
-#undef ENTRY
struct aarch64_simd_type_info
{
diff --git a/gcc/config/aarch64/aarch64-simd-builtin-types.def b/gcc/config/aarch64/aarch64-simd-builtin-types.def
index ec86657e343e..57099993080c 100644
--- a/gcc/config/aarch64/aarch64-simd-builtin-types.def
+++ b/gcc/config/aarch64/aarch64-simd-builtin-types.def
@@ -18,39 +18,45 @@
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
- ENTRY (Int8x8_t, V8QI, none, 10)
- ENTRY (Int8x16_t, V16QI, none, 11)
- ENTRY (Int16x4_t, V4HI, none, 11)
- ENTRY (Int16x8_t, V8HI, none, 11)
- ENTRY (Int32x2_t, V2SI, none, 11)
- ENTRY (Int32x4_t, V4SI, none, 11)
- ENTRY (Int64x1_t, V1DI, none, 11)
- ENTRY (Int64x2_t, V2DI, none, 11)
- ENTRY (Uint8x8_t, V8QI, unsigned, 11)
- ENTRY (Uint8x16_t, V16QI, unsigned, 12)
- ENTRY (Uint16x4_t, V4HI, unsigned, 12)
- ENTRY (Uint16x8_t, V8HI, unsigned, 12)
- ENTRY (Uint32x2_t, V2SI, unsigned, 12)
- ENTRY (Uint32x4_t, V4SI, unsigned, 12)
- ENTRY (Uint64x1_t, V1DI, unsigned, 12)
- ENTRY (Uint64x2_t, V2DI, unsigned, 12)
- ENTRY (Poly8_t, QI, poly, 9)
- ENTRY (Poly16_t, HI, poly, 10)
- ENTRY (Poly64_t, DI, poly, 10)
- ENTRY (Poly128_t, TI, poly, 11)
- ENTRY (Poly8x8_t, V8QI, poly, 11)
- ENTRY (Poly8x16_t, V16QI, poly, 12)
- ENTRY (Poly16x4_t, V4HI, poly, 12)
- ENTRY (Poly16x8_t, V8HI, poly, 12)
- ENTRY (Poly64x1_t, V1DI, poly, 12)
- ENTRY (Poly64x2_t, V2DI, poly, 12)
- ENTRY (Float16x4_t, V4HF, none, 13)
- ENTRY (Float16x8_t, V8HF, none, 13)
- ENTRY (Float32x2_t, V2SF, none, 13)
- ENTRY (Float32x4_t, V4SF, none, 13)
- ENTRY (Float64x1_t, V1DF, none, 13)
- ENTRY (Float64x2_t, V2DF, none, 13)
- ENTRY (Bfloat16x4_t, V4BF, none, 14)
- ENTRY (Bfloat16x8_t, V8BF, none, 14)
- ENTRY (Mfloat8x8_t, V8QI, modal_float, 13)
- ENTRY (Mfloat8x16_t, V16QI, modal_float, 14)
+#ifndef DEF_SIMD_TYPE
+#define DEF_SIMD_TYPE(A, B, C, D)
+#endif
+
+DEF_SIMD_TYPE (Int8x8_t, V8QI, none, 10)
+DEF_SIMD_TYPE (Int8x16_t, V16QI, none, 11)
+DEF_SIMD_TYPE (Int16x4_t, V4HI, none, 11)
+DEF_SIMD_TYPE (Int16x8_t, V8HI, none, 11)
+DEF_SIMD_TYPE (Int32x2_t, V2SI, none, 11)
+DEF_SIMD_TYPE (Int32x4_t, V4SI, none, 11)
+DEF_SIMD_TYPE (Int64x1_t, V1DI, none, 11)
+DEF_SIMD_TYPE (Int64x2_t, V2DI, none, 11)
+DEF_SIMD_TYPE (Uint8x8_t, V8QI, unsigned, 11)
+DEF_SIMD_TYPE (Uint8x16_t, V16QI, unsigned, 12)
+DEF_SIMD_TYPE (Uint16x4_t, V4HI, unsigned, 12)
+DEF_SIMD_TYPE (Uint16x8_t, V8HI, unsigned, 12)
+DEF_SIMD_TYPE (Uint32x2_t, V2SI, unsigned, 12)
+DEF_SIMD_TYPE (Uint32x4_t, V4SI, unsigned, 12)
+DEF_SIMD_TYPE (Uint64x1_t, V1DI, unsigned, 12)
+DEF_SIMD_TYPE (Uint64x2_t, V2DI, unsigned, 12)
+DEF_SIMD_TYPE (Poly8_t, QI, poly, 9)
+DEF_SIMD_TYPE (Poly16_t, HI, poly, 10)
+DEF_SIMD_TYPE (Poly64_t, DI, poly, 10)
+DEF_SIMD_TYPE (Poly128_t, TI, poly, 11)
+DEF_SIMD_TYPE (Poly8x8_t, V8QI, poly, 11)
+DEF_SIMD_TYPE (Poly8x16_t, V16QI, poly, 12)
+DEF_SIMD_TYPE (Poly16x4_t, V4HI, poly, 12)
+DEF_SIMD_TYPE (Poly16x8_t, V8HI, poly, 12)
+DEF_SIMD_TYPE (Poly64x1_t, V1DI, poly, 12)
+DEF_SIMD_TYPE (Poly64x2_t, V2DI, poly, 12)
+DEF_SIMD_TYPE (Float16x4_t, V4HF, none, 13)
+DEF_SIMD_TYPE (Float16x8_t, V8HF, none, 13)
+DEF_SIMD_TYPE (Float32x2_t, V2SF, none, 13)
+DEF_SIMD_TYPE (Float32x4_t, V4SF, none, 13)
+DEF_SIMD_TYPE (Float64x1_t, V1DF, none, 13)
+DEF_SIMD_TYPE (Float64x2_t, V2DF, none, 13)
+DEF_SIMD_TYPE (Bfloat16x4_t, V4BF, none, 14)
+DEF_SIMD_TYPE (Bfloat16x8_t, V8BF, none, 14)
+DEF_SIMD_TYPE (Mfloat8x8_t, V8QI, modal_float, 13)
+DEF_SIMD_TYPE (Mfloat8x16_t, V16QI, modal_float, 14)
+
+#undef DEF_SIMD_TYPE
diff --git a/gcc/config/aarch64/aarch64-sve-builtins.h b/gcc/config/aarch64/aarch64-sve-builtins.h
index 6098d8ff229f..3e5052b2398d 100644
--- a/gcc/config/aarch64/aarch64-sve-builtins.h
+++ b/gcc/config/aarch64/aarch64-sve-builtins.h
@@ -253,13 +253,12 @@ struct mode_suffix_info
units_index displacement_units;
};
-#define ENTRY(E, M, Q, G) E,
+#define DEF_SIMD_TYPE(E, M, Q, G) E,
enum aarch64_simd_type
{
#include "aarch64-simd-builtin-types.def"
ARM_NEON_H_TYPES_LAST
};
-#undef ENTRY
/* Static information about a type suffix. */
struct type_suffix_info
