2014-06-24 Yvan Roux <yvan.roux@linaro.org>

        Revert:
        2014-05-23  Yvan Roux  <yvan.roux@linaro.org>

        Backport from trunk r209643.
        2014-04-22  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>

        * config/aarch64/aarch64.c (TARGET_FLAGS_REGNUM): Define.

git-svn-id: svn://gcc.gnu.org/svn/gcc/branches/linaro/gcc-4_9-branch@211940 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog.linaro b/gcc/ChangeLog.linaro
index 0898ae3..7a0bfac 100644 (file)
--- a/gcc/ChangeLog.linaro
+++ b/gcc/ChangeLog.linaro
@@ -1,3 +1,13 @@
+2014-06-24  Yvan Roux  <yvan.roux@linaro.org>
+
+       Revert:
+       2014-05-23  Yvan Roux  <yvan.roux@linaro.org>
+
+       Backport from trunk r209643.
+       2014-04-22  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
+
+       * config/aarch64/aarch64.c (TARGET_FLAGS_REGNUM): Define.
+
 2014-06-13  Yvan Roux  <yvan.roux@linaro.org>
 
        Backport from trunk r210493, 210494, 210495, 210496, 210497, 210498,

diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 903cd34..2dcee5a 100644 (file)
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -9513,9 +9513,6 @@ aarch64_modes_tieable_p (enum machine_mode mode1, enum machine_mode mode2)
 #undef TARGET_FIXED_CONDITION_CODE_REGS
 #define TARGET_FIXED_CONDITION_CODE_REGS aarch64_fixed_condition_code_regs
 
-#undef TARGET_FLAGS_REGNUM
-#define TARGET_FLAGS_REGNUM CC_REGNUM
-
 struct gcc_target targetm = TARGET_INITIALIZER;
 
 #include "gt-aarch64.h"