summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormshawcroft <mshawcroft@138bc75d-0d04-0410-961f-82ee72b054a4>2013-06-28 15:22:48 +0000
committermshawcroft <mshawcroft@138bc75d-0d04-0410-961f-82ee72b054a4>2013-06-28 15:22:48 +0000
commitbeac24f935c5345be886f8743fb54cbe513679ce (patch)
tree17a7fd3c1c70c624afee86ebf55017ef999f42b7
parent586bb065e434d7a95bf6bd38f5e579247d54a373 (diff)
downloadgcc-beac24f935c5345be886f8743fb54cbe513679ce.tar.gz
[AArch64] Fix layout of aarch64_cannot_force_const_mem.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@200532 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/aarch64/aarch64.c7
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,5 +1,10 @@
2013-06-28 Marcus Shawcroft <marcus.shawcroft@arm.com>
+ * config/aarch64/aarch64.c (aarch64_cannot_force_const_mem): Adjust
+ layout.
+
+2013-06-28 Marcus Shawcroft <marcus.shawcroft@arm.com>
+
* config/aarch64/aarch64-protos.h (aarch64_symbol_type):
Update comment w.r.t SYMBOL_TINY_ABSOLUTE.
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);
}