@@ -15,10 +15,10 @@ index ce9bab692..08263eb86 100644
1515 if HOTSPOT_CHECK_JVM_FEATURE(jvmti) && ! HOTSPOT_CHECK_JVM_FEATURE(services); then
1616 AC_MSG_ERROR([Specified JVM feature 'jvmti' requires feature 'services'])
1717diff --git a/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp b/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
18- index 0c4d0e0fe..2f7044349 100644
18+ index 871944852..1a93874ae 100644
1919--- a/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
2020+++ b/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
21- @@ -775 ,7 +775 ,7 @@ LIR_Opr LIRGenerator::atomic_xchg(BasicType type, LIR_Opr addr, LIRItem& value)
21+ @@ -774 ,7 +774 ,7 @@ LIR_Opr LIRGenerator::atomic_xchg(BasicType type, LIR_Opr addr, LIRItem& value)
2222 bool is_oop = type == T_OBJECT || type == T_ARRAY;
2323 LIR_Opr result = new_register(type);
2424 value.load_item();
@@ -27,7 +27,7 @@ index 0c4d0e0fe..2f7044349 100644
2727 LIR_Opr tmp = (UseCompressedOops && is_oop) ? new_pointer_register() : LIR_OprFact::illegalOpr;
2828 __ xchg(addr, value.result(), result, tmp);
2929 return result;
30- @@ -784 ,7 +784 ,7 @@ LIR_Opr LIRGenerator::atomic_xchg(BasicType type, LIR_Opr addr, LIRItem& value)
30+ @@ -783 ,7 +783 ,7 @@ LIR_Opr LIRGenerator::atomic_xchg(BasicType type, LIR_Opr addr, LIRItem& value)
3131 LIR_Opr LIRGenerator::atomic_add(BasicType type, LIR_Opr addr, LIRItem& value) {
3232 LIR_Opr result = new_register(type);
3333 value.load_item();
@@ -36,7 +36,7 @@ index 0c4d0e0fe..2f7044349 100644
3636 LIR_Opr tmp = new_register(type);
3737 __ xadd(addr, value.result(), result, tmp);
3838 return result;
39- @@ -1311 ,9 +1311 ,14 @@ void LIRGenerator::volatile_field_store(LIR_Opr value, LIR_Address* address,
39+ @@ -1310 ,9 +1310 ,14 @@ void LIRGenerator::volatile_field_store(LIR_Opr value, LIR_Address* address,
4040 CodeEmitInfo* info) {
4141 if (value->is_double_cpu()) {
4242 assert(address->index()->is_illegal(), "should have a constant displacement");
@@ -54,7 +54,7 @@ index 0c4d0e0fe..2f7044349 100644
5454 return;
5555 }
5656 __ store(value, address, info, lir_patch_none);
57- @@ -1323 ,9 +1328 ,14 @@ void LIRGenerator::volatile_field_load(LIR_Address* address, LIR_Opr result,
57+ @@ -1322 ,9 +1327 ,14 @@ void LIRGenerator::volatile_field_load(LIR_Address* address, LIR_Opr result,
5858 CodeEmitInfo* info) {
5959 if (result->is_double_cpu()) {
6060 assert(address->index()->is_illegal(), "should have a constant displacement");
0 commit comments