aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2007-01-05 23:04:28 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2007-01-05 23:04:28 +0000
commite990c41790e4a67244908302bce923bd74f803e3 (patch)
tree7539163cd0fbed30b987b0bb4a47f9da682f5f4e
parent40116895ad4f998d85afb13604fd393232f5792e (diff)
svn merge -r113986:113987 svn+ssh://gcc.gnu.org/svn/gcc/trunk/
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/redhat/gcc-4_1-branch@120510 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/i386/i386.c6
-rw-r--r--gcc/testsuite/ChangeLog6
-rw-r--r--gcc/testsuite/gcc.target/i386/pr27266.c14
4 files changed, 32 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8790117fab3..fd3381f28c2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-22 Kazu Hirata <kazu@codesourcery.com>
+
+ PR target/27266
+ * config/i386/i386.c (ix86_expand_branch): Jump to simple if
+ ix86_compare_emitted is non-NULL.
+
2007-01-01 Andreas Schwab <schwab@suse.de>
PR target/29166
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index a58b899dd43..a97a2b1cfaa 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -10040,6 +10040,12 @@ ix86_expand_branch (enum rtx_code code, rtx label)
{
rtx tmp;
+ /* If we have emitted a compare insn, go straight to simple.
+ ix86_expand_compare won't emit anything if ix86_compare_emitted
+ is non NULL. */
+ if (ix86_compare_emitted)
+ goto simple;
+
switch (GET_MODE (ix86_compare_op0))
{
case QImode:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1ee83912e7b..8f5433a0c5c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,9 +1,15 @@
+2006-05-22 Kazu Hirata <kazu@codesourcery.com>
+
+ PR target/27266
+ * gcc.target/i386/pr27266.c: New.
+
2007-01-01 Andreas Schwab <schwab@suse.de>
PR target/29166
* g++.dg/eh/pr29166.C: New test.
2007-01-05 Richard Guenther <rguenther@suse.de>
+
PR middle-end/27826
* g++.dg/opt/pr27826.C: New testcase.
diff --git a/gcc/testsuite/gcc.target/i386/pr27266.c b/gcc/testsuite/gcc.target/i386/pr27266.c
new file mode 100644
index 00000000000..73e7c596f32
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr27266.c
@@ -0,0 +1,14 @@
+/* PR target/27266.
+ The testcase below used to trigger an ICE. */
+
+/* { dg-do compile } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-options "-march=pentium" } */
+
+signed long long sll;
+
+void
+foo (void)
+{
+ __sync_fetch_and_add (&sll, 1);
+}