diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/dex/quick/arm/int_arm.cc | 8 | ||||
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/compiler/dex/quick/arm/int_arm.cc b/compiler/dex/quick/arm/int_arm.cc index e839fe5c5d..d5173b0678 100644 --- a/compiler/dex/quick/arm/int_arm.cc +++ b/compiler/dex/quick/arm/int_arm.cc @@ -760,10 +760,10 @@ void ArmMir2Lir::GenMemBarrier(MemBarrierKind barrier_kind) { int dmb_flavor; // TODO: revisit Arm barrier kinds switch (barrier_kind) { - case kLoadStore: dmb_flavor = kSY; break; - case kLoadLoad: dmb_flavor = kSY; break; - case kStoreStore: dmb_flavor = kST; break; - case kStoreLoad: dmb_flavor = kSY; break; + case kLoadStore: dmb_flavor = kISH; break; + case kLoadLoad: dmb_flavor = kISH; break; + case kStoreStore: dmb_flavor = kISHST; break; + case kStoreLoad: dmb_flavor = kISH; break; default: LOG(FATAL) << "Unexpected MemBarrierKind: " << barrier_kind; dmb_flavor = kSY; // quiet gcc. diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 11245419f7..9cffb3c451 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -1404,7 +1404,7 @@ class ParallelCompilationManager { } size_t NextIndex() { - return index_.fetch_add(1); + return index_.FetchAndAdd(1); } private: |