--- a/hotspot/src/cpu/x86/vm/templateTable_x86.cpp	Sat Dec 05 05:15:35 2015 -0500
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86.cpp	Sat Dec 05 10:40:22 2015 -0500
@@ -43,8 +43,8 @@
 #define __ _masm->
 
 // Global Register Names
-Register rbcp     = LP64_ONLY(r13) NOT_LP64(rsi);
-Register rlocals  = LP64_ONLY(r14) NOT_LP64(rdi);
+static const Register rbcp     = LP64_ONLY(r13) NOT_LP64(rsi);
+static const Register rlocals  = LP64_ONLY(r14) NOT_LP64(rdi);
 
 // Platform-dependent initialization
 void TemplateTable::pd_initialize() {