diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-06 20:36:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-06 20:36:03 +0000 |
| commit | e8aae00fa400efbb8f998a5dbf68eb42810889c1 (patch) | |
| tree | f14ec179e84f7b122fadd6e4abaf066d1843634a /runtime/arch | |
| parent | 81aedc7b2f2e8b990d74d6dfa5303ab2447327a1 (diff) | |
| parent | ca71458862be8505330b7fd5649a062f31d143dc (diff) | |
| download | art-e8aae00fa400efbb8f998a5dbf68eb42810889c1.tar.gz art-e8aae00fa400efbb8f998a5dbf68eb42810889c1.tar.bz2 art-e8aae00fa400efbb8f998a5dbf68eb42810889c1.zip | |
Merge "ART: Add Clang's -Wused-but-marked-unused"
Diffstat (limited to 'runtime/arch')
| -rw-r--r-- | runtime/arch/arm64/instruction_set_features_arm64.cc | 2 | ||||
| -rw-r--r-- | runtime/arch/x86/instruction_set_features_x86.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/arch/arm64/instruction_set_features_arm64.cc b/runtime/arch/arm64/instruction_set_features_arm64.cc index f8a9f9d6aa..1f2ce02852 100644 --- a/runtime/arch/arm64/instruction_set_features_arm64.cc +++ b/runtime/arch/arm64/instruction_set_features_arm64.cc @@ -25,7 +25,7 @@ namespace art { const Arm64InstructionSetFeatures* Arm64InstructionSetFeatures::FromVariant( - const std::string& variant ATTRIBUTE_UNUSED, std::string* error_msg ATTRIBUTE_UNUSED) { + const std::string& variant, std::string* error_msg) { const bool smp = true; // Conservative default. // Look for variants that need a fix for a53 erratum 835769. diff --git a/runtime/arch/x86/instruction_set_features_x86.cc b/runtime/arch/x86/instruction_set_features_x86.cc index a12773dc9c..782ee00140 100644 --- a/runtime/arch/x86/instruction_set_features_x86.cc +++ b/runtime/arch/x86/instruction_set_features_x86.cc @@ -26,7 +26,7 @@ namespace art { const X86InstructionSetFeatures* X86InstructionSetFeatures::FromVariant( - const std::string& variant ATTRIBUTE_UNUSED, std::string* error_msg ATTRIBUTE_UNUSED, + const std::string& variant, std::string* error_msg ATTRIBUTE_UNUSED, bool x86_64) { bool known_variant = false; bool smp = true; // Conservative default. |