diff options
| author | 2016-08-15 10:03:32 +0000 | |
|---|---|---|
| committer | 2016-08-15 10:03:32 +0000 | |
| commit | fe74ba9ea6c2c47a02d2ba7436b3a603b459468c (patch) | |
| tree | a3bba08767d44b60a38af6a0ad67dacb260d4daa /compiler/utils/arm64/assembler_arm64.h | |
| parent | 85b1811f0de0cb8fb2a9ae37f53c6056a2de6867 (diff) | |
| parent | af4e42a0d210aa3aa5d52926536b2ca5c2952934 (diff) | |
Merge "ARM64: VIXL: Support a newer version of VIXL."
Diffstat (limited to 'compiler/utils/arm64/assembler_arm64.h')
| -rw-r--r-- | compiler/utils/arm64/assembler_arm64.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/compiler/utils/arm64/assembler_arm64.h b/compiler/utils/arm64/assembler_arm64.h index 4e88e640e5..2847cb86a8 100644 --- a/compiler/utils/arm64/assembler_arm64.h +++ b/compiler/utils/arm64/assembler_arm64.h @@ -27,13 +27,11 @@ #include "utils/assembler.h" #include "offsets.h" -// TODO: make vixl clean wrt -Wshadow, -Wunknown-pragmas, -Wmissing-noreturn +// TODO(VIXL): Make VIXL compile with -Wshadow. #pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunknown-pragmas" #pragma GCC diagnostic ignored "-Wshadow" -#pragma GCC diagnostic ignored "-Wmissing-noreturn" -#include "a64/disasm-a64.h" -#include "a64/macro-assembler-a64.h" +#include "aarch64/disasm-aarch64.h" +#include "aarch64/macro-assembler-aarch64.h" #pragma GCC diagnostic pop namespace art { |