@@ -66,15 +66,16 @@ static const struct default_options aarch_option_optimization_table[] =
{ OPT_LEVELS_NONE, 0, NULL, 0 }
};
-/* Set OPTS->x_aarch64_asm_isa_flags to FLAGS and update
- OPTS->x_aarch64_isa_flags accordingly. */
+
+/* Set OPTS->x_aarch64_asm_isa_flags_0 to FLAGS and update
+ OPTS->x_aarch64_isa_flags_0 accordingly. */
void
aarch64_set_asm_isa_flags (gcc_options *opts, aarch64_feature_flags flags)
{
- opts->x_aarch64_asm_isa_flags = flags;
- opts->x_aarch64_isa_flags = flags;
+ opts->x_aarch64_asm_isa_flags_0 = flags;
if (opts->x_target_flags & MASK_GENERAL_REGS_ONLY)
- opts->x_aarch64_isa_flags &= ~feature_deps::get_flags_off (AARCH64_FL_FP);
+ flags &= ~feature_deps::get_flags_off (AARCH64_FL_FP);
+ opts->x_aarch64_isa_flags_0 = flags;
}
/* Implement TARGET_HANDLE_OPTION.
@@ -23,13 +23,18 @@
#define GCC_AARCH64_H
#define aarch64_get_asm_isa_flags(opts) \
- (aarch64_feature_flags ((opts)->x_aarch64_asm_isa_flags))
+ (aarch64_feature_flags ((opts)->x_aarch64_asm_isa_flags_0))
#define aarch64_get_isa_flags(opts) \
- (aarch64_feature_flags ((opts)->x_aarch64_isa_flags))
+ (aarch64_feature_flags ((opts)->x_aarch64_isa_flags_0))
/* Make these flags read-only so that all uses go via
aarch64_set_asm_isa_flags. */
-#ifndef GENERATOR_FILE
+#ifdef GENERATOR_FILE
+#undef aarch64_asm_isa_flags
+#define aarch64_asm_isa_flags (aarch64_feature_flags (aarch64_asm_isa_flags_0))
+#undef aarch64_isa_flags
+#define aarch64_isa_flags (aarch64_feature_flags (aarch64_isa_flags_0))
+#else
#undef aarch64_asm_isa_flags
#define aarch64_asm_isa_flags (aarch64_get_asm_isa_flags (&global_options))
#undef aarch64_isa_flags
@@ -31,10 +31,10 @@ TargetVariable
enum aarch64_arch selected_arch = aarch64_no_arch
TargetVariable
-aarch64_feature_flags aarch64_asm_isa_flags = 0
+uint64_t aarch64_asm_isa_flags_0 = 0
TargetVariable
-aarch64_feature_flags aarch64_isa_flags = 0
+uint64_t aarch64_isa_flags_0 = 0
TargetVariable
unsigned aarch_enable_bti = 2