aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.6
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-12-03 19:52:08 -0800
committerGerrit Code Review <noreply-gerritcodereview@google.com>2012-12-03 19:52:09 -0800
commitd1c2eeb6f984053764b039abdb341bba46fb65e6 (patch)
treee0beea3b5f0ce7a2e71b58b4ab651ed7ef0449f3 /gcc-4.6
parent978fb74a5c086cc5572dc2e3f37d207acad969d7 (diff)
parent85e4e292e4b1f9cbd85e9db9310fbcbc59e3ac23 (diff)
downloadtoolchain_gcc-d1c2eeb6f984053764b039abdb341bba46fb65e6.tar.gz
toolchain_gcc-d1c2eeb6f984053764b039abdb341bba46fb65e6.tar.bz2
toolchain_gcc-d1c2eeb6f984053764b039abdb341bba46fb65e6.zip
Merge "Fix GCC 4.6 ARM ICE at reload1.c:1061"
Diffstat (limited to 'gcc-4.6')
-rw-r--r--gcc-4.6/gcc/config/arm/arm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc-4.6/gcc/config/arm/arm.c b/gcc-4.6/gcc/config/arm/arm.c
index 4658e6df3..2f97e5843 100644
--- a/gcc-4.6/gcc/config/arm/arm.c
+++ b/gcc-4.6/gcc/config/arm/arm.c
@@ -20360,7 +20360,7 @@ thumb_far_jump_used_p (void)
/* In reload pass we haven't got the exact jump instruction length,
but we can get a reasonable estimation based on the maximum
possible function length. */
- if (!reload_completed)
+ if (optimize && !reload_completed)
{
int function_length = estimate_function_length();
if (function_length < SHORTEST_FAR_JUMP_LENGTH)