--- a/hotspot/src/cpu/x86/vm/globals_x86.hpp	Thu Jul 06 20:29:02 2017 +0000
+++ b/hotspot/src/cpu/x86/vm/globals_x86.hpp	Mon Jul 10 14:28:40 2017 -0700
@@ -119,7 +119,6 @@
   product(intx, UseAVX, 2,                                                  \
           "Highest supported AVX instructions set on x86/x64")              \
           range(0, 99)                                                      \
-          constraint(UseAVXConstraintFunc, AtParse)                         \
                                                                             \
   product(bool, UseCLMUL, false,                                            \
           "Control whether CLMUL instructions can be used on x86/x64")      \

--- a/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp	Thu Jul 06 20:29:02 2017 +0000
+++ b/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp	Mon Jul 10 14:28:40 2017 -0700
@@ -332,17 +332,6 @@
   }
 }
 
-Flag::Error UseAVXConstraintFunc(intx value, bool verbose) {
-  if (value > 2 && !UnlockExperimentalVMOptions) {
-    CommandLineError::print(verbose,
-                            "UseAVX (" UINTX_FORMAT ") is experimental and must be "
-                            "enabled via -XX:+UnlockExperimentalVMOptions \n", value);
-    return Flag::VIOLATES_CONSTRAINT;
-  } else {
-    return Flag::SUCCESS;
-  }
-}
-
 #ifdef COMPILER2
 Flag::Error InteriorEntryAlignmentConstraintFunc(intx value, bool verbose) {
   if (InteriorEntryAlignment > CodeEntryAlignment) {

--- a/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.hpp	Thu Jul 06 20:29:02 2017 +0000
+++ b/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.hpp	Mon Jul 10 14:28:40 2017 -0700
@@ -64,8 +64,6 @@
 
 Flag::Error InitArrayShortSizeConstraintFunc(intx value, bool verbose);
 
-Flag::Error UseAVXConstraintFunc(intx value, bool verbose);
-
 #ifdef COMPILER2
 Flag::Error InteriorEntryAlignmentConstraintFunc(intx value, bool verbose);