From 6c27ebdbe81c13d68c4e590a060fd12e6118feb5 Mon Sep 17 00:00:00 2001
From: Uros Bizjak <uros@gcc.gnu.org>
Date: Tue, 20 Oct 2015 17:31:07 +0200
Subject: [PATCH] alpha.h (HARD_REGNO_NREGS): Use CEIL macro.

	* config/alpha/alpha.h (HARD_REGNO_NREGS): Use CEIL macro.
	(ALPHA_ARG_SIZE): Ditto.  Remove unused NAMED argument.
	* config/alpha/alpha.c (alpha_function_arg_advance): Update
	ALPHA_ARG_SIZE usage.
	(alpha_arg_partial_bytes): Ditto.

From-SVN: r229084
---
 gcc/ChangeLog            | 36 ++++++++++++++++++++++--------------
 gcc/config/alpha/alpha.c |  6 +++---
 gcc/config/alpha/alpha.h | 14 ++++++++------
 3 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 44760d417347..1badb9bdceab 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2015-10-20  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/alpha/alpha.h (HARD_REGNO_NREGS): Use CEIL macro.
+	(ALPHA_ARG_SIZE): Ditto.  Remove unused NAMED argument.
+	* config/alpha/alpha.c (alpha_function_arg_advance): Update
+	ALPHA_ARG_SIZE usage.
+	(alpha_arg_partial_bytes): Ditto.
+
 2015-10-20  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR target/66810
@@ -169,7 +177,7 @@
 	(autopref_multipass_init): Use it.  Handle PARALLEL sets.
 	(autopref_rank_data): New function.
 	(autopref_rank_for_schedule): Use it.
-	(autopref_multipass_dfa_lookahead_guard_1): Likewise. 
+	(autopref_multipass_dfa_lookahead_guard_1): Likewise.
 
 2015-10-18  Mikhail Maltsev  <maltsevm@gmail.com>
 
@@ -179,7 +187,7 @@
 2015-10-18  Iain Sandoe  <iain@codesourcery.com>
 
 	* config/darwin.h (TARGET_SYSTEM_ROOT): Remove this from here,
-	(HAVE_LD_SYSROOT): New.  (SYSROOT_SPEC): New. 
+	(HAVE_LD_SYSROOT): New.  (SYSROOT_SPEC): New.
 	(LINK_SYSROOT_SPEC): Revise to remove the default for target sysroot.
 	(STANDARD_STARTFILE_PREFIX_1): New.
 	(STANDARD_STARTFILE_PREFIX_2): New.
@@ -329,16 +337,17 @@
 
 2015-10-16  Christian Bruel  <christian.bruel@st.com>
 
- 	PR target/67745
- 	* config/arm/arm.h (FUNCTION_BOUNDARY): Use FUNCTION_BOUNDARY_P.
- 	(FUNCTION_BOUNDARY_P): New macro:
- 	* config/arm/arm.c (TARGET_RELAYOUT_FUNCTION, arm_relayout_function): 
- 	New hook.
- 	* doc/tm.texi.in (TARGET_RELAYOUT_FUNCTION): Document.
- 	* doc/tm.texi (TARGET_RELAYOUT_FUNCTION): New hook.
- 	* gcc/target.def (TARGET_RELAYOUT_FUNCTION): Likewise.
- 	* gcc/function.c (allocate_struct_function): Call relayout_function hook.
- 	* gcc/passes.c (rest_of_decl_compilation): Likewise.
+	PR target/67745
+	* config/arm/arm.h (FUNCTION_BOUNDARY): Use FUNCTION_BOUNDARY_P.
+	(FUNCTION_BOUNDARY_P): New macro:
+	* config/arm/arm.c (TARGET_RELAYOUT_FUNCTION, arm_relayout_function):
+	New hook.
+	* doc/tm.texi.in (TARGET_RELAYOUT_FUNCTION): Document.
+	* doc/tm.texi (TARGET_RELAYOUT_FUNCTION): New hook.
+	* gcc/target.def (TARGET_RELAYOUT_FUNCTION): Likewise.
+	* gcc/function.c (allocate_struct_function): Call
+	relayout_function hook.
+	* gcc/passes.c (rest_of_decl_compilation): Likewise.
 
 2015-10-16  Christian Bruel  <christian.bruel@st.com>
 
@@ -369,8 +378,7 @@
 	(gimple_fold_builtin_stxcpy_chk): Likewise.
 	(rewrite_to_defined_overflow): Likewise.
 	(gimple_convert_to_ptrofftype): New function.
-	* gimple-fold.h (gimple_convert_to_ptrofftype): New overload,
-	declare.
+	* gimple-fold.h (gimple_convert_to_ptrofftype): New overload, declare.
 
 2015-10-16  Richard Biener  <rguenther@suse.de>
 
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index c8cd651e806a..d22bf67e52b5 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -5613,7 +5613,7 @@ alpha_function_arg_advance (cumulative_args_t cum_v, machine_mode mode,
 {
   CUMULATIVE_ARGS *cum = get_cumulative_args (cum_v);
   bool onstack = targetm.calls.must_pass_in_stack (mode, type);
-  int increment = onstack ? 6 : ALPHA_ARG_SIZE (mode, type, named);
+  int increment = onstack ? 6 : ALPHA_ARG_SIZE (mode, type);
 
 #if TARGET_ABI_OSF
   *cum += increment;
@@ -5635,10 +5635,10 @@ alpha_arg_partial_bytes (cumulative_args_t cum_v,
 
 #if TARGET_ABI_OPEN_VMS
   if (cum->num_args < 6
-      && 6 < cum->num_args + ALPHA_ARG_SIZE (mode, type, named))
+      && 6 < cum->num_args + ALPHA_ARG_SIZE (mode, type))
     words = 6 - cum->num_args;
 #elif TARGET_ABI_OSF
-  if (*cum < 6 && 6 < *cum + ALPHA_ARG_SIZE (mode, type, named))
+  if (*cum < 6 && 6 < *cum + ALPHA_ARG_SIZE (mode, type))
     words = 6 - *cum;
 #else
 #error Unhandled ABI
diff --git a/gcc/config/alpha/alpha.h b/gcc/config/alpha/alpha.h
index 668b2620dc33..97f5680a8c20 100644
--- a/gcc/config/alpha/alpha.h
+++ b/gcc/config/alpha/alpha.h
@@ -383,7 +383,7 @@ extern enum alpha_fp_trap_mode alpha_fptm;
    but can be less for certain modes in special long registers.  */
 
 #define HARD_REGNO_NREGS(REGNO, MODE)   \
-  ((GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD)
+  CEIL (GET_MODE_SIZE (MODE), UNITS_PER_WORD)
 
 /* Value is 1 if hard register REGNO can hold a value of machine-mode MODE.
    On Alpha, the integer registers can hold any mode.  The floating-point
@@ -674,13 +674,15 @@ extern int alpha_memory_latency;
 #define INIT_CUMULATIVE_ARGS(CUM, FNTYPE, LIBNAME, INDIRECT, N_NAMED_ARGS) \
   (CUM) = 0
 
-/* Define intermediate macro to compute the size (in registers) of an argument
-   for the Alpha.  */
+/* Define intermediate macro to compute
+   the size (in registers) of an argument.  */
 
-#define ALPHA_ARG_SIZE(MODE, TYPE, NAMED)				\
+#define ALPHA_ARG_SIZE(MODE, TYPE)					\
   ((MODE) == TFmode || (MODE) == TCmode ? 1				\
-   : (((MODE) == BLKmode ? int_size_in_bytes (TYPE) : GET_MODE_SIZE (MODE)) \
-      + (UNITS_PER_WORD - 1)) / UNITS_PER_WORD)
+   : CEIL (((MODE) == BLKmode						\
+	    ? int_size_in_bytes (TYPE)					\
+	    : GET_MODE_SIZE (MODE)),					\
+	   UNITS_PER_WORD))
 
 /* Make (or fake) .linkage entry for function call.
    IS_LOCAL is 0 if name is used in call, 1 if name is used in definition.  */
-- 
GitLab