# HG changeset patch
# User rraghavan
# Date 1497867046 25200
# Node ID 744e7a498dac51a7058308c64a139dfa4c295554
# Parent  e1b926a0b23f3d85e8a5c7907ce1811c90343923
8044829: UseAES warning message generation differs on CPU architecture
Summary: Fixed issue with feature flag setting when AES support disabled explicitly
Reviewed-by: kvn

diff -r e1b926a0b23f -r 744e7a498dac hotspot/src/cpu/x86/vm/vm_version_x86.cpp
--- a/hotspot/src/cpu/x86/vm/vm_version_x86.cpp	Mon Jun 19 01:23:58 2017 -0700
+++ b/hotspot/src/cpu/x86/vm/vm_version_x86.cpp	Mon Jun 19 03:10:46 2017 -0700
@@ -641,9 +641,6 @@
     _features &= ~CPU_VZEROUPPER;
   }
 
-  if (!UseAES && !FLAG_IS_DEFAULT(UseAES))
-    _features &= ~CPU_AES;
-
   if (logical_processors_per_package() == 1) {
     // HT processor could be installed on a system which doesn't support HT.
     _features &= ~CPU_HT;