From 7eda14e188a00069239b692a13d6cff2ebc4fac9 Mon Sep 17 00:00:00 2001 From: Marcus Shawcroft Date: Fri, 28 Jun 2013 15:22:48 +0000 Subject: [PATCH] [AArch64] Fix layout of aarch64_cannot_force_const_mem. From-SVN: r200532 --- gcc/ChangeLog | 5 +++++ gcc/config/aarch64/aarch64.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b1ccef85923..dbd82a21788 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2013-06-28 Marcus Shawcroft + + * config/aarch64/aarch64.c (aarch64_cannot_force_const_mem): Adjust + layout. + 2013-06-28 Marcus Shawcroft * config/aarch64/aarch64-protos.h (aarch64_symbol_type): diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index dea3bf6f26e..072f5401279 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -1,4 +1,5 @@ -/* Machine description for AArch64 architecture. + +1;3201;0c/* Machine description for AArch64 architecture. Copyright (C) 2009-2013 Free Software Foundation, Inc. Contributed by ARM Ltd. @@ -2687,12 +2688,14 @@ static bool aarch64_cannot_force_const_mem (enum machine_mode mode ATTRIBUTE_UNUSED, rtx x) { rtx base, offset; + if (GET_CODE (x) == HIGH) return true; split_const (x, &base, &offset); if (GET_CODE (base) == SYMBOL_REF || GET_CODE (base) == LABEL_REF) - return (aarch64_classify_symbol (base, SYMBOL_CONTEXT_ADR) != SYMBOL_FORCE_TO_MEM); + return (aarch64_classify_symbol (base, SYMBOL_CONTEXT_ADR) + != SYMBOL_FORCE_TO_MEM); return aarch64_tls_referenced_p (x); } -- 2.30.2