Skip to content

Commit 7103c89

Browse files
committed
fixup! Some fixes and workaround for aarch64
1 parent eb777cd commit 7103c89

File tree

3 files changed

+0
-19
lines changed

3 files changed

+0
-19
lines changed

gcc/config/aarch64/aarch64-builtins.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,8 +1274,6 @@ aarch64_init_simd_builtin_types (void)
12741274

12751275
if (aarch64_simd_types_trees[i].itype == NULL)
12761276
{
1277-
// FIXME: problem happens when we execute this a second time.
1278-
// Currently fixed by not initializing builtins more than once in dummy-frontend.cc.
12791277
tree type = build_vector_type (eltype, GET_MODE_NUNITS (mode));
12801278
type = build_distinct_type_copy (type);
12811279
SET_TYPE_STRUCTURAL_EQUALITY (type);

gcc/config/aarch64/aarch64.cc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16307,19 +16307,11 @@ aarch64_insn_cost (rtx_insn *insn, bool speed)
1630716307
static void
1630816308
aarch64_init_builtins ()
1630916309
{
16310-
// TODO: find a better fix than this to avoid the failure:
16311-
// SET_TYPE_VECTOR_SUBPARTS, in tree.h:4258
16312-
static bool builtins_initialized = false;
16313-
if (builtins_initialized)
16314-
return;
16315-
1631616310
aarch64_general_init_builtins ();
1631716311
aarch64_sve::init_builtins ();
1631816312
#ifdef SUBTARGET_INIT_BUILTINS
1631916313
SUBTARGET_INIT_BUILTINS;
1632016314
#endif
16321-
16322-
builtins_initialized = true;
1632316315
}
1632416316

1632516317
/* Implement TARGET_FOLD_BUILTIN. */

gcc/jit/dummy-frontend.cc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,16 +1124,7 @@ jit_langhook_init (void)
11241124
eventually be controllable by a command line option. */
11251125
mpfr_set_default_prec (256);
11261126

1127-
// FIXME: This code doesn't work as it erases the `target_builtins` map
1128-
// without checking if it's already filled before. A better check would be
1129-
// `if target_builtins.len() == 0` (or whatever this `hash_map` type method
1130-
// name is).
1131-
//static bool builtins_initialized = false;
1132-
//if (!builtins_initialized)
1133-
//{
11341127
targetm.init_builtins ();
1135-
//builtins_initialized = true;
1136-
//}
11371128

11381129
return true;
11391130
}

0 commit comments

Comments
 (0)