[internal-fn.c][committed] Convert conditional compilation on WORD_REGISTER_OPERATIONS

	* internal-fn.c (expand_arith_overflow): Convert preprocessor check
	for WORD_REGISTER_OPERATIONS to runtime check.

From-SVN: r235569

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b3dc01096c19fffe55d230db09d50ecf285bee37..b7237c2f7f3b9f67d1a7228003f07a30fa48821e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-28  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+       * internal-fn.c (expand_arith_overflow): Convert preprocessor check
+       for WORD_REGISTER_OPERATIONS to runtime check.
+
 2016-04-28  Claudiu Zissulescu  <claziss@synopsys.com>
 
        * config/arc/arc.h (ASM_SPEC): Pass mfpuda to assembler.

diff --git a/gcc/internal-fn.c b/gcc/internal-fn.c
index c07b53893820e2335451077e3a15f9d8ca76173a..e70c73aba8a7f516626c6ae89add850cec8bfa5c 100644 (file)
--- a/gcc/internal-fn.c
+++ b/gcc/internal-fn.c
@@ -1807,11 +1807,7 @@ expand_arith_overflow (enum tree_code code, gimple *stmt)
       /* For sub-word operations, retry with a wider type first.  */
       if (orig_precres == precres && precop <= BITS_PER_WORD)
        {
-#if WORD_REGISTER_OPERATIONS
-         int p = BITS_PER_WORD;
-#else
-         int p = precop;
-#endif
+         int p = WORD_REGISTER_OPERATIONS ? BITS_PER_WORD : precop;
          enum machine_mode m = smallest_mode_for_size (p, MODE_INT);
          tree optype = build_nonstandard_integer_type (GET_MODE_PRECISION (m),
                                                        uns0_p && uns1_p