File tree Expand file tree Collapse file tree 1 file changed +0
-20
lines changed
Expand file tree Collapse file tree 1 file changed +0
-20
lines changed Original file line number Diff line number Diff line change @@ -199,26 +199,6 @@ index 53d6d17de..c949c6363 100644
199199 };
200200 #endif // __SOFTFP__
201201
202- diff --git a/src/hotspot/cpu/arm/vm_version_arm_32.cpp b/src/hotspot/cpu/arm/vm_version_arm_32.cpp
203- index df0fb2ecf..f15dabd45 100644
204- --- a/src/hotspot/cpu/arm/vm_version_arm_32.cpp
205- +++ b/src/hotspot/cpu/arm/vm_version_arm_32.cpp
206- @@ -303,6 +303,15 @@ void VM_Version::initialize() {
207- FLAG_SET_DEFAULT(UseUnalignedAccesses, false);
208- }
209-
210- + // ARMv5 MP workaround
211- + if (arm_arch() == 5) {
212- + if (FLAG_IS_DEFAULT(AssumeMP)) {
213- + FLAG_SET_DEFAULT(AssumeMP, false);
214- + } else if (AssumeMP) {
215- + warning("AssumeMP can not be true for ARMv5 as there is only uniprocessor support");
216- + FLAG_SET_DEFAULT(AssumeMP, false);
217- + }
218- + }
219- _is_initialized = true;
220- }
221-
222202diff --git a/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp
223203index 9e6bda265..01a4adebf 100644
224204--- a/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp
You can’t perform that action at this time.
0 commit comments