Merge fix

[Andrey Petushkov]

[resent from correct mailbox]

Dear Ed,

Could you please fix the problem caused by race condition happened between preparing and applying patches:
"[PATCH] aarch32: add verification of Use*Intrinsics cmdline parameters” by Alexey Bakhtin
and
“RFR: JDK-8155618 aarch32: implement CRC32 intrinsics” by myself

It’s needed to apply the following changes (since this part of the Alexey’s fix is no longer valid after CRC32 intrinsic was implemented):

diff -r 79bf1547b28d src/cpu/aarch32/vm/vm_version_aarch32.cpp
--- a/src/cpu/aarch32/vm/vm_version_aarch32.cpp	Sat May 14 17:34:57 2016 +0100
+++ b/src/cpu/aarch32/vm/vm_version_aarch32.cpp	Wed Jun 01 18:28:21 2016 +0300
@@ -292,12 +292,6 @@
  UseMembar = false;
  }*/

-  if (UseCRC32Intrinsics) {
-    if (!FLAG_IS_DEFAULT(UseCRC32Intrinsics))
-      warning("CRC32 Intrinsics are not implemented on this CPU");
-    FLAG_SET_DEFAULT(UseCRC32Intrinsics, false);
-  }
-
  if (UseAES) {
    warning("AES instructions are not implemented on this CPU");
    FLAG_SET_DEFAULT(UseAES, false);

Thanks,
Andrey