--- a/src/hotspot/cpu/x86/vm_version_x86.cpp	Thu Nov 08 10:20:04 2018 +0100
+++ b/src/hotspot/cpu/x86/vm_version_x86.cpp	Wed Dec 06 13:07:21 2017 +0100
@@ -1042,9 +1042,7 @@
     }
   }
 #endif // COMPILER2 && ASSERT
-#endif // COMPILER2_OR_JVMCI
 
-#ifdef COMPILER2
 #ifdef _LP64
   if (FLAG_IS_DEFAULT(UseMultiplyToLenIntrinsic)) {
     UseMultiplyToLenIntrinsic = true;
@@ -1092,8 +1090,8 @@
     }
     FLAG_SET_DEFAULT(UseMulAddIntrinsic, false);
   }
-#endif
-#endif // COMPILER2
+#endif // _LP64
+#endif // COMPILER2_OR_JVMCI
 
   // On new cpus instructions which update whole XMM register should be used
   // to prevent partial register stall due to dependencies on high half.