diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-02-03 14:31:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-03 14:31:47 +0000 |
| commit | bb2f65e64844bfca8d05d4c37991d858aa748648 (patch) | |
| tree | 5aac1e37b6a6da7b6de3167f3d6a8e3b696f5b27 | |
| parent | 0b87c47033081d4b86e6611d947d49926df6b577 (diff) | |
| parent | 3d1e788a53cb2eb87a39cf7e1a58be98dc567a67 (diff) | |
| download | art-bb2f65e64844bfca8d05d4c37991d858aa748648.zip art-bb2f65e64844bfca8d05d4c37991d858aa748648.tar.gz art-bb2f65e64844bfca8d05d4c37991d858aa748648.tar.bz2 | |
Merge "Fix build by putting ATTRIBUTE_UNUSUED."
| -rw-r--r-- | compiler/utils/arm/assembler_thumb2.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/utils/arm/assembler_thumb2.cc b/compiler/utils/arm/assembler_thumb2.cc index 895cc26..5383c28 100644 --- a/compiler/utils/arm/assembler_thumb2.cc +++ b/compiler/utils/arm/assembler_thumb2.cc @@ -25,8 +25,8 @@ namespace art { namespace arm { -bool Thumb2Assembler::ShifterOperandCanHold(Register rd, - Register rn, +bool Thumb2Assembler::ShifterOperandCanHold(Register rd ATTRIBUTE_UNUSED, + Register rn ATTRIBUTE_UNUSED, Opcode opcode, uint32_t immediate, ShifterOperand* shifter_op) { |