Merge lp:~linaro-toolchain-dev/gcc-linaro/lp-689887-armel-ice into lp:gcc-linaro/4.5

[Chung-Lin Tang]

This merges the fix for LP:689887 to Linaro 4.5, posted upstream here:
http://gcc.gnu.org/ml/gcc-patches/2011-01/msg00794.html

Per the 'upstream timeout' discussion during the Monday (2011-03-21) meeting, I'm proposing merge of this fix into Linaro first. I'll update later if the upstream patch has more changes or comments by the ARM maintainers.

[Linaro Toolchain Builder (cbuild)]

cbuild has taken a snapshot of this branch at r99490 and queued it for build.

The snapshot is available at:
 http://ex.seabright.co.nz/snapshots/

and named something like gcc-linaro-4.5+bzr99490~cltang~lp-689887-armel-ice.*

You can track the build queue at:
 http://ex.seabright.co.nz/helpers/scheduler

cbuild-snapshot: gcc-linaro-4.5+bzr99490~cltang~lp-689887-armel-ice
cbuild-state: check

[Linaro Toolchain Builder (cbuild)]

cbuild successfully built this on i686-lucid-cbuild93-scorpius-i686r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99490~cltang~lp-689887-armel-ice/logs/i686-lucid-cbuild93-scorpius-i686r1

cbuild-checked: i686-lucid-cbuild93-scorpius-i686r1

[Linaro Toolchain Builder (cbuild)]

cbuild successfully built this on x86_64-maverick-cbuild93-crucis-x86_64r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99490~cltang~lp-689887-armel-ice/logs/x86_64-maverick-cbuild93-crucis-x86_64r1

cbuild-checked: x86_64-maverick-cbuild93-crucis-x86_64r1

[Linaro Toolchain Builder (cbuild)]

cbuild successfully built this on armv7l-maverick-cbuild93-ursa1-cortexa8r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99490~cltang~lp-689887-armel-ice/logs/armv7l-maverick-cbuild93-ursa1-cortexa8r1

cbuild-checked: armv7l-maverick-cbuild93-ursa1-cortexa8r1

[Linaro Toolchain Builder (cbuild)]

cbuild had trouble building this on armv7l-maverick-cbuild93-ursa3-cortexa9r1.
See the following failure logs:
 gcc-build-failed.txt failed.txt

under the build results at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99490~cltang~lp-689887-armel-ice/logs/armv7l-maverick-cbuild93-ursa3-cortexa9r1

cbuild-checked: armv7l-maverick-cbuild93-ursa3-cortexa9r1

review: Needs Fixing

[Linaro Toolchain Builder (cbuild)]

cbuild had trouble building this on armv7l-maverick-cbuild93-ursa2-cortexa9r1.
See the following failure logs:
 gcc-build-failed.txt failed.txt

under the build results at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99490~cltang~lp-689887-armel-ice/logs/armv7l-maverick-cbuild93-ursa2-cortexa9r1

cbuild-checked: armv7l-maverick-cbuild93-ursa2-cortexa9r1

review: Needs Fixing

[Ramana Radhakrishnan (ramana)]

Bootstrap object comparison failures needs investigation.

Ramana

[Ramana Radhakrishnan (ramana)]

From the log above.

Bootstrap comparison failure!
gcc/lto/lto.o differs
make[6]: *** [compare] Error 1
make[6]: Leaving directory `/scratch/cbuild/slave/slaves/ursa3/gcc-linaro-4.5+bzr99490~cltang~lp-689887-armel-ice/gcc/default/build'
make[5]: *** [stage3-bubble] Error 2
make[5]: Leaving directory `/scratch/cbuild/slave/slaves/ursa3/gcc-linaro-4.5+bzr99490~cltang~lp-689887-armel-ice/gcc/default/build'
make[4]: *** [all] Error 2
make[4]: Leaving directory `/scratch/cbuild/slave/slaves/ursa3/gcc-linaro-4.5+bzr99490~cltang~lp-689887-armel-ice/gcc/default/build'

[Ramana Radhakrishnan (ramana)]

review: Needs Fixing

Unmerged revisions

99490. By Chung-Lin Tang on 2011-03-26

2011-03-26 Chung-Lin Tang <email address hidden>

 LP:689887

 gcc/
 * config/arm/arm.h (enum arm_cond_code): Add ARM_COND_INVALID.
 * config/arm/arm.c (arm_comparison_to_cond_code): Renamed from
 get_arm_condition_code(), change gcc_unreachable()s to return
 ARM_COND_INVALID.
 (get_arm_condition_code): Implement by calling
 arm_comparison_to_cond_code(), with result test by gcc_assert().
 (arm_valid_comparison_p): New function to test for valid ARM
 comparison RTX.
 * config/arm/arm-protos.h (arm_valid_comparison_p): Add prototype.
 * config/arm/predicates.md (arm_comparison_operator): Add
 additional check based on arm_valid_comparison_p().

 gcc/testsuite/
 * gcc.target/arm/20110112-1.c: New test.

=== modified file 'ChangeLog.linaro'
--- ChangeLog.linaro	2011-03-11 17:36:50 +0000
+++ ChangeLog.linaro	2011-03-26 05:41:55 +0000
@@ -1,3 +1,23 @@
[phone]  Chung-Lin Tang  <[e-mail]>
+
+	LP:689887
+
+	gcc/
+	* config/arm/arm.h (enum arm_cond_code): Add ARM_COND_INVALID.
+	* config/arm/arm.c (arm_comparison_to_cond_code): Renamed from
+	get_arm_condition_code(), change gcc_unreachable()s to return
+	ARM_COND_INVALID.
+	(get_arm_condition_code): Implement by calling
+	arm_comparison_to_cond_code(), with result test by gcc_assert().
+	(arm_valid_comparison_p): New function to test for valid ARM
+	comparison RTX.
+	* config/arm/arm-protos.h (arm_valid_comparison_p): Add prototype.
+	* config/arm/predicates.md (arm_comparison_operator): Add
+	additional check based on arm_valid_comparison_p().
+
+	gcc/testsuite/
+	* gcc.target/arm/20110112-1.c: New test.
+
 2011-03-10  Ramana Radhakrishnan  <[e-mail]>
 
 	LP:730440

=== modified file 'gcc/config/arm/arm-protos.h'
--- gcc/config/arm/arm-protos.h	2011-02-08 12:07:29 +0000
+++ gcc/config/arm/arm-protos.h	2011-03-26 05:41:55 +0000
@@ -109,6 +109,7 @@
 extern enum machine_mode arm_select_cc_mode (RTX_CODE, rtx, rtx);
 extern enum machine_mode arm_select_dominance_cc_mode (rtx, rtx,
 						       HOST_WIDE_INT);
+extern bool arm_valid_comparison_p (rtx);
 extern rtx arm_gen_compare_reg (RTX_CODE, rtx, rtx);
 extern rtx arm_gen_return_addr_mask (void);
 extern void arm_reload_in_hi (rtx *);

=== modified file 'gcc/config/arm/arm.c'
--- gcc/config/arm/arm.c	2011-03-02 11:29:06 +0000
+++ gcc/config/arm/arm.c	2011-03-26 05:41:55 +0000
@@ -87,6 +87,7 @@
 static bool arm_assemble_integer (rtx, unsigned int, int);
 static const char *fp_const_from_val (REAL_VALUE_TYPE *);
 static arm_cc get_arm_condition_code (rtx);
+static arm_cc arm_comparison_to_cond_code (rtx);
 static HOST_WIDE_INT int_log2 (HOST_WIDE_INT);
 static rtx is_jump_table (rtx);
 static const char *output_multi_immediate (rtx *, const char *, const char *,
@@ -17149,6 +17150,23 @@
 static enum arm_cond_code
 get_arm_condition_code (rtx comparison)
 {
+  enum arm_cond_code code = arm_comparison_to_cond_code (comparison);
+  gcc_assert (code != ARM_COND_INVALID);
+  return code;
+}
+
+/* Tests if the comparison RTX is valid for ARM.  */
+bool
+arm_valid_comparison_p (rtx comparison)
+{
+  return (arm_comparison_to_cond_code (comparison) != ARM_COND_INVALID);
+}
+
+/* Function that maps the relation between comparison RTX
+   vs. ARM condition codes.  */
+static enum arm_cond_code
+arm_comparison_to_cond_code (rtx comparison)
+{
   enum machine_mode mode = GET_MODE (XEXP (comparison, 0));
   enum arm_cond_code code;
   enum rtx_code comp_code = GET_CODE (comparison);
@@ -17184,7 +17202,7 @@
 	case EQ: return ARM_EQ;
 	case GE: return ARM_PL;
 	case LT: return ARM_MI;
-	default: gcc_unreachable ();
+	default: return ARM_COND_INVALID;
 	}
 
     case CC_Zmode:
@@ -17192,7 +17210,7 @@
 	{
 	case NE: return ARM_NE;
 	case EQ: return ARM_EQ;
-	default: gcc_unreachable ();
+	default: return ARM_COND_INVALID;
 	}
 
     case CC_Nmode:
@@ -17200,7 +17218,7 @@
 	{
 	case NE: return ARM_MI;
 	case EQ: return ARM_PL;
-	default: gcc_unreachable ();
+	default: return ARM_COND_INVALID;
 	}
 
     case CCFPEmode:
@@ -17225,7 +17243,7 @@
 	  /* UNEQ and LTGT do not have a representation.  */
 	case UNEQ: /* Fall through.  */
 	case LTGT: /* Fall through.  */
-	default: gcc_unreachable ();
+	default: return ARM_COND_INVALID;
 	}
 
     case CC_SWPmode:
@@ -17241,7 +17259,7 @@
 	case GTU: return ARM_CC;
 	case LEU: return ARM_CS;
 	case LTU: return ARM_HI;
-	default: gcc_unreachable ();
+	default: return ARM_COND_INVALID;
 	}
 
     case CC_Cmode:
@@ -17249,7 +17267,7 @@
 	{
 	case LTU: return ARM_CS;
 	case GEU: return ARM_CC;
-	default: gcc_unreachable ();
+	default: return ARM_COND_INVALID;
 	}
 
     case CC_CZmode:
@@ -17261,7 +17279,7 @@
 	case GTU: return ARM_HI;
 	case LEU: return ARM_LS;
 	case LTU: return ARM_CC;
-	default: gcc_unreachable ();
+	default: return ARM_COND_INVALID;
 	}
 
     case CC_NCVmode:
@@ -17271,7 +17289,7 @@
 	case LT: return ARM_LT;
 	case GEU: return ARM_CS;
 	case LTU: return ARM_CC;
-	default: gcc_unreachable ();
+	default: return ARM_COND_INVALID;
 	}
 
     case CCmode:
@@ -17287,10 +17305,10 @@
 	case GTU: return ARM_HI;
 	case LEU: return ARM_LS;
 	case LTU: return ARM_CC;
-	default: gcc_unreachable ();
+	default: return ARM_COND_INVALID;
 	}
 
-    default: gcc_unreachable ();
+    default: return ARM_COND_INVALID;
     }
 }
 

=== modified file 'gcc/config/arm/arm.h'
--- gcc/config/arm/arm.h	2011-02-08 12:07:29 +0000
+++ gcc/config/arm/arm.h	2011-03-26 05:41:55 +0000
@@ -149,7 +149,8 @@
 typedef enum arm_cond_code
 {
   ARM_EQ = 0, ARM_NE, ARM_CS, ARM_CC, ARM_MI, ARM_PL, ARM_VS, ARM_VC,
-  ARM_HI, ARM_LS, ARM_GE, ARM_LT, ARM_GT, ARM_LE, ARM_AL, ARM_NV
+  ARM_HI, ARM_LS, ARM_GE, ARM_LT, ARM_GT, ARM_LE, ARM_AL, ARM_NV,
+  ARM_COND_INVALID
 }
 arm_cc;
 

=== modified file 'gcc/config/arm/predicates.md'
--- gcc/config/arm/predicates.md	2011-03-02 12:28:41 +0000
+++ gcc/config/arm/predicates.md	2011-03-26 05:41:55 +0000
@@ -237,10 +237,11 @@
 ;; True for integer comparisons and, if FP is active, for comparisons
 ;; other than LTGT or UNEQ.
 (define_special_predicate "arm_comparison_operator"
-  (ior (match_code "eq,ne,le,lt,ge,gt,geu,gtu,leu,ltu")
-       (and (match_test "TARGET_32BIT && TARGET_HARD_FLOAT
-			 && (TARGET_FPA || TARGET_VFP)")
-            (match_code "unordered,ordered,unlt,unle,unge,ungt"))))
+  (and (ior (match_code "eq,ne,le,lt,ge,gt,geu,gtu,leu,ltu")
+            (and (match_test "TARGET_32BIT && TARGET_HARD_FLOAT
+	    	 	     && (TARGET_FPA || TARGET_VFP)")
+ 		 (match_code "unordered,ordered,unlt,unle,unge,ungt")))
+	(match_test "arm_valid_comparison_p (op)")))
 
 (define_special_predicate "lt_ge_comparison_operator"
   (match_code "lt,ge"))

=== added file 'gcc/testsuite/gcc.target/arm/20110112-1.c'
--- gcc/testsuite/gcc.target/arm/20110112-1.c	1970-01-01 00:00:00 +0000
+++ gcc/testsuite/gcc.target/arm/20110112-1.c	2011-03-26 05:41:55 +0000
@@ -0,0 +1,18 @@
+/* { dg-do compile } */
+/* { dg-options "-O -march=armv7-a -mthumb" } */
+/* { dg-require-effective-target arm_thumb2_ok } */
+
+#include <limits.h>
+
+void small (char *dst)
+{
+  while (1)
+    {
+      long long y = (long long)(*dst) << 8;
+
+      if (y < INT_MIN)
+      *((int *) dst) = 0;
+      else
+      *((int *) dst) = 1;
+    }
+}