diff src/cpu/x86/vm/globals_x86.hpp @ 14726:92aa6797d639

Backed out merge changeset: b51e29501f30 Backed out merge revision to its first parent (8f483e200405)
author Doug Simon <doug.simon@oracle.com>
date Mon, 24 Mar 2014 21:30:43 +0100
parents b51e29501f30
children
line wrap: on
line diff
--- a/src/cpu/x86/vm/globals_x86.hpp	Fri Mar 21 16:36:59 2014 -0700
+++ b/src/cpu/x86/vm/globals_x86.hpp	Mon Mar 24 21:30:43 2014 +0100
@@ -136,11 +136,5 @@
                                                                             \
   product(bool, UseCountLeadingZerosInstruction, false,                     \
           "Use count leading zeros instruction")                            \
-                                                                            \
-  product(bool, UseCountTrailingZerosInstruction, false,                    \
-          "Use count trailing zeros instruction")                           \
-                                                                            \
-  product(bool, UseBMI1Instructions, false,                                 \
-          "Use BMI instructions")
 
 #endif // CPU_X86_VM_GLOBALS_X86_HPP