aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.6
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-08-16 04:20:53 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-08-16 04:20:54 -0700
commitb6c5be63c95da93dcf4e5a6c05d9535ccfc0ac9a (patch)
tree5dd865b41866f39e4ae2b1f06e5a4893125cd740 /gcc-4.6
parent97486fce685bf128a2c4b009e7b717af9521e6a7 (diff)
parent7e597b08eb15a88ef0e309f2e59df18a636b0c40 (diff)
downloadtoolchain_gcc-b6c5be63c95da93dcf4e5a6c05d9535ccfc0ac9a.tar.gz
toolchain_gcc-b6c5be63c95da93dcf4e5a6c05d9535ccfc0ac9a.tar.bz2
toolchain_gcc-b6c5be63c95da93dcf4e5a6c05d9535ccfc0ac9a.zip
Merge "Fix ARM internal compiler error reload1.c:3633 compiling Earth"
Diffstat (limited to 'gcc-4.6')
-rw-r--r--gcc-4.6/gcc/config/arm/arm.md4
-rw-r--r--gcc-4.6/gcc/config/arm/iterators.md8
-rw-r--r--gcc-4.6/gcc/testsuite/gcc.target/arm/pr50099.c10
3 files changed, 18 insertions, 4 deletions
diff --git a/gcc-4.6/gcc/config/arm/arm.md b/gcc-4.6/gcc/config/arm/arm.md
index 90adc2e55..df2e63949 100644
--- a/gcc-4.6/gcc/config/arm/arm.md
+++ b/gcc-4.6/gcc/config/arm/arm.md
@@ -4045,8 +4045,8 @@
(define_insn "zero_extend<mode>di2"
[(set (match_operand:DI 0 "s_register_operand" "=r")
- (zero_extend:DI (match_operand:QHSI 1 "<qhs_extenddi_op>"
- "<qhs_extenddi_cstr>")))]
+ (zero_extend:DI (match_operand:QHSI 1 "<qhs_zextenddi_op>"
+ "<qhs_zextenddi_cstr>")))]
"TARGET_32BIT <qhs_zextenddi_cond>"
"#"
[(set_attr "length" "8")
diff --git a/gcc-4.6/gcc/config/arm/iterators.md b/gcc-4.6/gcc/config/arm/iterators.md
index 887c962ba..38faa59c8 100644
--- a/gcc-4.6/gcc/config/arm/iterators.md
+++ b/gcc-4.6/gcc/config/arm/iterators.md
@@ -381,10 +381,14 @@
(define_mode_attr qhs_zextenddi_cond [(SI "") (HI "&& arm_arch6") (QI "")])
(define_mode_attr qhs_sextenddi_cond [(SI "") (HI "&& arm_arch6")
(QI "&& arm_arch6")])
-(define_mode_attr qhs_extenddi_op [(SI "s_register_operand")
+(define_mode_attr qhs_zextenddi_op [(SI "s_register_operand")
(HI "nonimmediate_operand")
(QI "nonimmediate_operand")])
-(define_mode_attr qhs_extenddi_cstr [(SI "r") (HI "rm") (QI "rm")])
+(define_mode_attr qhs_extenddi_op [(SI "s_register_operand")
+ (HI "nonimmediate_operand")
+ (QI "arm_reg_or_extendqisi_mem_op")])
+(define_mode_attr qhs_extenddi_cstr [(SI "r") (HI "rm") (QI "rUq")])
+(define_mode_attr qhs_zextenddi_cstr [(SI "r") (HI "rm") (QI "rm")])
;;----------------------------------------------------------------------------
;; Code attributes
diff --git a/gcc-4.6/gcc/testsuite/gcc.target/arm/pr50099.c b/gcc-4.6/gcc/testsuite/gcc.target/arm/pr50099.c
new file mode 100644
index 000000000..c0d143dd5
--- /dev/null
+++ b/gcc-4.6/gcc/testsuite/gcc.target/arm/pr50099.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+long long foo (signed char * arg)
+{
+ long long temp_1;
+
+ temp_1 = arg[256];
+ return temp_1;
+}