diff options
| author | 2015-03-26 16:50:57 +0000 | |
|---|---|---|
| committer | 2015-03-31 15:53:57 +0100 | |
| commit | 82e52ce8364e3e1c644d0d3b3b4f61364bf7089a (patch) | |
| tree | d26020cbee67645a46838c57747d2ba1533ba5d1 | |
| parent | ebbb1e322d8c89e69424a543faa03402e5b63673 (diff) | |
ARM64: Update to VIXL 1.9.
Update VIXL's interface to VIXL 1.9.
Change-Id: Iebae947539cbad65488b7195aaf01de284b71cbb
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
| -rw-r--r-- | compiler/optimizing/code_generator_arm64.h | 4 | ||||
| -rw-r--r-- | compiler/optimizing/common_arm64.h | 4 | ||||
| -rw-r--r-- | compiler/optimizing/intrinsics_arm64.cc | 4 | ||||
| -rw-r--r-- | compiler/utils/arm64/assembler_arm64.h | 4 | ||||
| -rw-r--r-- | disassembler/disassembler_arm64.h | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/compiler/optimizing/code_generator_arm64.h b/compiler/optimizing/code_generator_arm64.h index 2c624d2926..f555de50e5 100644 --- a/compiler/optimizing/code_generator_arm64.h +++ b/compiler/optimizing/code_generator_arm64.h @@ -23,8 +23,8 @@ #include "nodes.h" #include "parallel_move_resolver.h" #include "utils/arm64/assembler_arm64.h" -#include "a64/disasm-a64.h" -#include "a64/macro-assembler-a64.h" +#include "vixl/a64/disasm-a64.h" +#include "vixl/a64/macro-assembler-a64.h" #include "arch/arm64/quick_method_frame_info_arm64.h" namespace art { diff --git a/compiler/optimizing/common_arm64.h b/compiler/optimizing/common_arm64.h index fd8c0c6242..966165bf4c 100644 --- a/compiler/optimizing/common_arm64.h +++ b/compiler/optimizing/common_arm64.h @@ -20,8 +20,8 @@ #include "locations.h" #include "nodes.h" #include "utils/arm64/assembler_arm64.h" -#include "a64/disasm-a64.h" -#include "a64/macro-assembler-a64.h" +#include "vixl/a64/disasm-a64.h" +#include "vixl/a64/macro-assembler-a64.h" namespace art { namespace arm64 { diff --git a/compiler/optimizing/intrinsics_arm64.cc b/compiler/optimizing/intrinsics_arm64.cc index 72d303c870..d1176c460f 100644 --- a/compiler/optimizing/intrinsics_arm64.cc +++ b/compiler/optimizing/intrinsics_arm64.cc @@ -28,8 +28,8 @@ #include "utils/arm64/assembler_arm64.h" #include "utils/arm64/constants_arm64.h" -#include "a64/disasm-a64.h" -#include "a64/macro-assembler-a64.h" +#include "vixl/a64/disasm-a64.h" +#include "vixl/a64/macro-assembler-a64.h" using namespace vixl; // NOLINT(build/namespaces) diff --git a/compiler/utils/arm64/assembler_arm64.h b/compiler/utils/arm64/assembler_arm64.h index a69be2599e..2031fe4e57 100644 --- a/compiler/utils/arm64/assembler_arm64.h +++ b/compiler/utils/arm64/assembler_arm64.h @@ -31,8 +31,8 @@ // TODO: make vixl clean wrt -Wshadow. #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wshadow" -#include "a64/macro-assembler-a64.h" -#include "a64/disasm-a64.h" +#include "vixl/a64/macro-assembler-a64.h" +#include "vixl/a64/disasm-a64.h" #pragma GCC diagnostic pop namespace art { diff --git a/disassembler/disassembler_arm64.h b/disassembler/disassembler_arm64.h index 3fb5c7f2c6..44fa53f9f6 100644 --- a/disassembler/disassembler_arm64.h +++ b/disassembler/disassembler_arm64.h @@ -21,8 +21,8 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wshadow" -#include "a64/decoder-a64.h" -#include "a64/disasm-a64.h" +#include "vixl/a64/decoder-a64.h" +#include "vixl/a64/disasm-a64.h" #pragma GCC diagnostic pop namespace art { |