Remove checks for TARGET_AARCH64_MS_ABI

Author: Blackhex

gcc/config/aarch64/aarch64-builtins.cc

@@ -2485,8 +2485,6 @@ aarch64_general_init_builtins (void)
     handle_arm_acle_h ();
 }
 
-#if defined (TARGET_AARCH64_MS_ABI)
-
 /* Internal method for aarch64_ms_variadic_abi_init_builtins.  */
 
 void
@@ -2517,8 +2515,6 @@ aarch64_ms_variadic_abi_init_builtins (void)
 			BUILT_IN_VA_COPY, BUILT_IN_NORMAL, NULL, fnattr_ms);
 }
 
-#endif
-
 /* Implement TARGET_BUILTIN_DECL for the AARCH64_BUILTIN_GENERAL group.  */
 tree
 aarch64_general_builtin_decl (unsigned code, bool)

gcc/config/aarch64/aarch64-protos.h

@@ -1109,10 +1109,7 @@ void aarch64_override_options_internal (struct gcc_options *);
 
 const char *aarch64_general_mangle_builtin_type (const_tree);
 void aarch64_general_init_builtins (void);
-
-#if defined (TARGET_AARCH64_MS_ABI)
 void aarch64_ms_variadic_abi_init_builtins (void);
-#endif
 
 tree aarch64_general_fold_builtin (unsigned int, tree, unsigned int, tree *);
 gimple *aarch64_general_gimple_fold_builtin (unsigned int, gcall *,

gcc/config/aarch64/aarch64.cc

@@ -2281,8 +2281,6 @@ aarch64_takes_arguments_in_sve_regs_p (const_tree fntype)
   return false;
 }
 
-#if defined(TARGET_AARCH64_MS_ABI)
-
 /* Return true if a function has variadic arguments.  */
 
 static bool
@@ -2301,8 +2299,6 @@ is_variadic_function_type (const_tree fntype) {
   return arg_count > 0;
 }
 
-#endif
-
 /* Implement TARGET_FNTYPE_ABI.  */
 
 static const predefined_function_abi &
@@ -7126,8 +7122,6 @@ aarch64_arg_size (const function_arg_info &arg)
   return ROUND_UP (size, UNITS_PER_WORD);
 }
 
-#if defined (TARGET_AARCH64_MS_ABI)
-
 /* Layout a function argument according to the AAPCS64 rules.  The rule
    numbers refer to the rule numbers in the AAPCS64.  The Microsoft Arm64
    variadic function call ABI uses only C.12-C15 rules.
@@ -7192,8 +7186,6 @@ aarch64_ms_variadic_abi_layout_arg (cumulative_args_t pcum_v,
   pcum->aapcs_arg_processed = true;
 }
 
-#endif
-
 /* Layout a function argument according to the AAPCS64 rules.  The rule
    numbers refer to the rule numbers in the AAPCS64.  ORIG_MODE is the
    mode that was originally given to us by the target hook, whereas the
@@ -7217,12 +7209,10 @@ aarch64_layout_arg (cumulative_args_t pcum_v, const function_arg_info &arg)
   if (pcum->aapcs_arg_processed)
     return;
 
-#if defined (TARGET_AARCH64_MS_ABI)
   if (pcum->pcs_variant == ARM_PCS_MS_VARIADIC) {
     aarch64_ms_variadic_abi_layout_arg (pcum_v, arg);
     return;
   }
-#endif
 
   bool warn_pcs_change
     = (warn_psabi
@@ -7573,8 +7563,6 @@ aarch64_finish_sme_mode_switch_args (CUMULATIVE_ARGS *pcum)
   return gen_rtx_PARALLEL (VOIDmode, argvec);
 }
 
-#if defined (TARGET_AARCH64_MS_ABI)
-
 /* Implement TARGET_ARG_PARTIAL_BYTES. */
 
 static int
@@ -7594,8 +7582,6 @@ aarch64_arg_partial_bytes (cumulative_args_t pcum_v,
   return 0;
 }
 
-#endif
-
 /* Implement TARGET_FUNCTION_ARG.  */
 
 static rtx
@@ -21495,8 +21481,6 @@ aarch64_build_builtin_va_list (void)
   return va_list_type;
 }
 
-#if defined (TARGET_AARCH64_MS_ABI)
-
 /* Setup the builtin va_list data type and for 64-bit the additional
    calling convention specific va_list data types.  */
 
@@ -21512,8 +21496,6 @@ aarch64_ms_variadic_abi_build_builtin_va_list (void)
   return ms_va_list_type_node;
 }
 
-#endif
-
 /* Implement TARGET_EXPAND_BUILTIN_VA_START.  */
 static void
 aarch64_expand_builtin_va_start (tree valist, rtx nextarg ATTRIBUTE_UNUSED)
@@ -21597,8 +21579,6 @@ aarch64_expand_builtin_va_start (tree valist, rtx nextarg ATTRIBUTE_UNUSED)
   expand_expr (t, const0_rtx, VOIDmode, EXPAND_NORMAL);
 }
 
-#if defined (TARGET_AARCH64_MS_ABI)
-
 /* Implement TARGET_EXPAND_BUILTIN_VA_START.  */
 
 static void
@@ -21668,8 +21648,6 @@ aarch64_ms_variadic_abi_canonical_va_list_type (tree type)
   return NULL_TREE;
 }
 
-#endif
-
 /* Implement TARGET_GIMPLIFY_VA_ARG_EXPR.  */
 
 static tree
@@ -22047,11 +22025,9 @@ aarch64_setup_incoming_varargs (cumulative_args_t cum_v,
 
   /* We don't save the size into *PRETEND_SIZE because we want to avoid
      any complication of having crtl->args.pretend_args_size changed.  */
-#if defined (TARGET_AARCH64_MS_ABI)
   cfun->machine->frame.unaligned_saved_varargs_size = gr_saved * UNITS_PER_WORD;
-#endif
   cfun->machine->frame.saved_varargs_size
-    = (ROUND_UP (gr_saved * UNITS_PER_WORD,
+    = (ROUND_UP (cfun->machine->frame.unaligned_saved_varargs_size,
 		 STACK_BOUNDARY / BITS_PER_UNIT)
        + vr_saved * UNITS_PER_VREG);
 }
@@ -25250,8 +25226,6 @@ aarch64_post_cfi_startproc (FILE *f, tree ignored ATTRIBUTE_UNUSED)
 	asm_fprintf (f, "\t.cfi_b_key_frame\n");
 }
 
-#if defined (TARGET_AARCH64_MS_ABI)
-
 /* Implement TARGET_STRICT_ARGUMENT_NAMING.
 
    Return true if the location where a function argument is passed
@@ -25271,8 +25245,6 @@ aarch64_ms_variadic_abi_strict_argument_naming (cumulative_args_t pcum_v)
   return hook_bool_CUMULATIVE_ARGS_true(pcum_v);
 }
 
-#endif
-
 /* Implements TARGET_ASM_FILE_START.  Output the assembly header.  */
 
 static void

gcc/config/aarch64/aarch64.h

@@ -995,10 +995,8 @@ struct GTY (()) aarch64_frame
      STACK_BOUNDARY.  */
   HOST_WIDE_INT saved_varargs_size;
 
-#if defined (TARGET_AARCH64_MS_ABI)
   /* The same as above except it is the original unaligned stack size.  */
   HOST_WIDE_INT unaligned_saved_varargs_size;
-#endif
 
   /* The number of bytes between the bottom of the static frame (the bottom
      of the outgoing arguments) and the bottom of the register save area.

gcc/config/mingw/winnt.cc

@@ -94,8 +94,6 @@ mingw_handle_selectany_attribute (tree *node, tree name, tree, int,
   return NULL_TREE;
 }
 
-#if defined (TARGET_AARCH64_MS_ABI)
-
 /* Handle a "ms_abi" attribute; arguments as in struct
    attribute_spec.handler.  */
 
@@ -118,8 +116,6 @@ aarch64_handle_ms_abi_attribute (tree *node, tree name, tree, int,
   return NULL_TREE;
 }
 
-#endif
-
 
 /* Return the type that we should use to determine if DECL is
    imported or exported.  */

gcc/config/mingw/winnt.h

@@ -21,10 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef USED_FOR_TARGET
 
 extern tree mingw_handle_selectany_attribute (tree *, tree, tree, int, bool *);
-
-#if defined (TARGET_AARCH64_MS_ABI)
 extern tree aarch64_handle_ms_abi_attribute (tree *, tree, tree, int, bool *);
-#endif
 
 extern void mingw_pe_asm_named_section (const char *, unsigned int, tree);
 extern void mingw_pe_asm_lto_start (void);