fixup! Some fixes and workaround for aarch64
diff --git a/gcc/config/aarch64/aarch64-builtins.cc b/gcc/config/aarch64/aarch64-builtins.cc
index 13a0c21..408099a 100644
--- a/gcc/config/aarch64/aarch64-builtins.cc
+++ b/gcc/config/aarch64/aarch64-builtins.cc
@@ -1274,8 +1274,6 @@
if (aarch64_simd_types_trees[i].itype == NULL)
{
- // FIXME: problem happens when we execute this a second time.
- // Currently fixed by not initializing builtins more than once in dummy-frontend.cc.
tree type = build_vector_type (eltype, GET_MODE_NUNITS (mode));
type = build_distinct_type_copy (type);
SET_TYPE_STRUCTURAL_EQUALITY (type);
diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
index 5a9000b..031da86 100644
--- a/gcc/config/aarch64/aarch64.cc
+++ b/gcc/config/aarch64/aarch64.cc
@@ -16307,19 +16307,11 @@
static void
aarch64_init_builtins ()
{
- // TODO: find a better fix than this to avoid the failure:
- // SET_TYPE_VECTOR_SUBPARTS, in tree.h:4258
- static bool builtins_initialized = false;
- if (builtins_initialized)
- return;
-
aarch64_general_init_builtins ();
aarch64_sve::init_builtins ();
#ifdef SUBTARGET_INIT_BUILTINS
SUBTARGET_INIT_BUILTINS;
#endif
-
- builtins_initialized = true;
}
/* Implement TARGET_FOLD_BUILTIN. */
diff --git a/gcc/jit/dummy-frontend.cc b/gcc/jit/dummy-frontend.cc
index 773e35a..40d94b0 100644
--- a/gcc/jit/dummy-frontend.cc
+++ b/gcc/jit/dummy-frontend.cc
@@ -1124,16 +1124,7 @@
eventually be controllable by a command line option. */
mpfr_set_default_prec (256);
- // FIXME: This code doesn't work as it erases the `target_builtins` map
- // without checking if it's already filled before. A better check would be
- // `if target_builtins.len() == 0` (or whatever this `hash_map` type method
- // name is).
- //static bool builtins_initialized = false;
- //if (!builtins_initialized)
- //{
targetm.init_builtins ();
- //builtins_initialized = true;
- //}
return true;
}
