diff -r a8f29dfd62b2 -r b75e269c0922 hotspot/src/cpu/x86/vm/interpreter_x86_32.cpp
--- a/hotspot/src/cpu/x86/vm/interpreter_x86_32.cpp	Fri Dec 11 16:57:08 2015 +0100
+++ b/hotspot/src/cpu/x86/vm/interpreter_x86_32.cpp	Mon Jan 11 17:11:57 2016 -0800
@@ -26,9 +26,9 @@
 #include "asm/macroAssembler.hpp"
 #include "interpreter/bytecodeHistogram.hpp"
 #include "interpreter/interpreter.hpp"
-#include "interpreter/interpreterGenerator.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "interpreter/interp_masm.hpp"
+#include "interpreter/templateInterpreterGenerator.hpp"
 #include "interpreter/templateTable.hpp"
 #include "oops/arrayOop.hpp"
 #include "oops/methodData.hpp"
@@ -66,7 +66,7 @@
 }
 
 
-address InterpreterGenerator::generate_math_entry(AbstractInterpreter::MethodKind kind) {
+address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::MethodKind kind) {
 
   // rbx,: Method*
   // rcx: scratrch