aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2015-03-03 05:53:14 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-03 05:53:14 +0000
commitdd206fbb184cb6117f98ed1ebff926138fcd9f33 (patch)
tree8cf6fc108f506f21e079059bd379294f39343223
parent9a71aa17a45c1b6e509c9014dff66ad07e658355 (diff)
parent0f9c6516346c0070cd94a17f31746bc0c49cb13d (diff)
downloadndk-dd206fbb184cb6117f98ed1ebff926138fcd9f33.tar.gz
Merge "Fix failing Fix-PR-target-63209.patch"
-rw-r--r--build/tools/toolchain-patches/gcc/0010-Fix-PR-target-63209.patch9
1 files changed, 6 insertions, 3 deletions
diff --git a/build/tools/toolchain-patches/gcc/0010-Fix-PR-target-63209.patch b/build/tools/toolchain-patches/gcc/0010-Fix-PR-target-63209.patch
index 5d04e1e1a..77857f82a 100644
--- a/build/tools/toolchain-patches/gcc/0010-Fix-PR-target-63209.patch
+++ b/build/tools/toolchain-patches/gcc/0010-Fix-PR-target-63209.patch
@@ -13,10 +13,13 @@ Change-Id: I1ff0bdad04222c41e3486121c5580808c364d3b1
create mode 100644 gcc-4.9/gcc/testsuite/gcc.c-torture/execute/pr63209.c
diff --git a/gcc-4.9/gcc/ChangeLog b/gcc-4.9/gcc/ChangeLog
-index 473fceb..1d9248b 100644
+index b97054b..53a2b24 100644
--- a/gcc-4.9/gcc/ChangeLog
+++ b/gcc-4.9/gcc/ChangeLog
-@@ -1,3 +1,10 @@
+@@ -4,6 +4,13 @@
+ * config/i386/i386.c (ix86_option_override_internal): Do not increase
+ PARAM_MAX_COMPLETELY_PEELED_INSNS.
+
+2014-09-10 Xinliang David Li <davidxl@google.com>
+
+ Backport from mainline
@@ -51,7 +54,7 @@ index 467f9ce..13c9b37 100644
operands[6] = gen_rtx_fmt_ee (rc, VOIDmode, operands[6], const0_rtx);
}
diff --git a/gcc-4.9/gcc/testsuite/ChangeLog b/gcc-4.9/gcc/testsuite/ChangeLog
-index 51626c3..1a04681 100644
+index 1881e17..4c69bf4 100644
--- a/gcc-4.9/gcc/testsuite/ChangeLog
+++ b/gcc-4.9/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@