diff options
| author | Artem Serov <artem.serov@linaro.org> | 2016-08-08 15:11:24 +0100 |
|---|---|---|
| committer | Anton Kirilov <anton.kirilov@linaro.org> | 2016-08-12 13:22:34 +0100 |
| commit | af4e42a0d210aa3aa5d52926536b2ca5c2952934 (patch) | |
| tree | b64d683ba6ac11c0b7730df9a579aead2905dfff /compiler/optimizing/common_arm64.h | |
| parent | dce74be0c49e8a540affc0b5649a9cf8756b809b (diff) | |
| download | art-af4e42a0d210aa3aa5d52926536b2ca5c2952934.tar.gz art-af4e42a0d210aa3aa5d52926536b2ca5c2952934.tar.bz2 art-af4e42a0d210aa3aa5d52926536b2ca5c2952934.zip | |
ARM64: VIXL: Support a newer version of VIXL.
Please note that compiling VIXL with -Wshadow is a known VIXL issue.
This will be resolved in a later version of VIXL, when we can drop
the deprecated API for getters and setters.
For more info take a look at VIXL_DEPRECATED in the VIXL source code.
Change-Id: Iea30b1a7b065f9b16a92c6cc7ebdc50ef068b348
Diffstat (limited to 'compiler/optimizing/common_arm64.h')
| -rw-r--r-- | compiler/optimizing/common_arm64.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/compiler/optimizing/common_arm64.h b/compiler/optimizing/common_arm64.h index af0ee4e197..cc949c5275 100644 --- a/compiler/optimizing/common_arm64.h +++ b/compiler/optimizing/common_arm64.h @@ -22,8 +22,13 @@ #include "nodes.h" #include "utils/arm64/assembler_arm64.h" -#include "a64/disasm-a64.h" -#include "a64/macro-assembler-a64.h" +// TODO(VIXL): Make VIXL compile with -Wshadow. +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow" +#include "aarch64/disasm-aarch64.h" +#include "aarch64/macro-assembler-aarch64.h" +#include "aarch64/simulator-aarch64.h" +#pragma GCC diagnostic pop namespace art { namespace arm64 { |