From 4d2df0f4704665c047d84b195a5c1a2ba9b7a28b Mon Sep 17 00:00:00 2001
From: Zhenqiang Chen <zhenqiang.chen@arm.com>
Date: Thu, 14 Aug 2014 04:47:43 +0000
Subject: [PATCH] arm.c (arm_option_override): Set max_insns_skipped to
 MAX_INSN_PER_IT_BLOCK when optimize_size for THUMB2.

ChangeLog:
2014-08-14  Zhenqiang Chen  <zhenqiang.chen@arm.com>

	* config/arm/arm.c (arm_option_override): Set max_insns_skipped
	to MAX_INSN_PER_IT_BLOCK when optimize_size for THUMB2.

testsuite/ChangeLog:
2014-08-14  Zhenqiang Chen  <zhenqiang.chen@arm.com>

	* gcc.target/arm/max-insns-skipped.c: New test.

From-SVN: r213939
---
 gcc/ChangeLog                                 |  5 +++++
 gcc/config/arm/arm.c                          |  4 ++++
 gcc/testsuite/ChangeLog                       |  4 ++++
 .../gcc.target/arm/max-insns-skipped.c        | 21 +++++++++++++++++++
 4 files changed, 34 insertions(+)
 create mode 100644 gcc/testsuite/gcc.target/arm/max-insns-skipped.c

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e58c7e1723a..50b38fb9cac 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-14  Zhenqiang Chen  <zhenqiang.chen@arm.com>
+
+	* config/arm/arm.c (arm_option_override): Set max_insns_skipped
+	to MAX_INSN_PER_IT_BLOCK when optimize_size for THUMB2.
+
 2014-08-13  Chen Gang  gang.chen.5i5j@gmail.com
 
 	* microblaze/microblaze.md: Remove redundant '@' to avoid compiling
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 7f62ca4a034..2f8d3274504 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -2989,6 +2989,10 @@ arm_option_override (void)
       /* If optimizing for size, bump the number of instructions that we
          are prepared to conditionally execute (even on a StrongARM).  */
       max_insns_skipped = 6;
+
+      /* For THUMB2, we limit the conditional sequence to one IT block.  */
+      if (TARGET_THUMB2)
+	max_insns_skipped = MAX_INSN_PER_IT_BLOCK;
     }
   else
     max_insns_skipped = current_tune->max_insns_skipped;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e122b504a5d..ad9cce29706 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-14  Zhenqiang Chen  <zhenqiang.chen@arm.com>
+
+	* gcc.target/arm/max-insns-skipped.c: New test.
+
 2014-08-14  Bin Cheng  <bin.cheng@arm.com>
 
 	* c-c++-common/addrtmp.c: Add bind_pic_locally option.
diff --git a/gcc/testsuite/gcc.target/arm/max-insns-skipped.c b/gcc/testsuite/gcc.target/arm/max-insns-skipped.c
new file mode 100644
index 00000000000..0a11554b52b
--- /dev/null
+++ b/gcc/testsuite/gcc.target/arm/max-insns-skipped.c
@@ -0,0 +1,21 @@
+/* { dg-do assemble { target arm_thumb2 } } */
+/* { dg-options " -Os " } */
+
+int t (int a, int b, int c, int d)
+{
+  int r;
+  if (a > 0) {
+    r = a + b;
+    r += 0x456;
+    r *= 0x1234567;
+    }
+  else {
+    r = b - a;
+    r -= 0x123;
+    r *= 0x12387;
+    r += d;
+   }
+  return r;
+}
+
+/* { dg-final { object-size text <= 40 } } */