--- a/hotspot/src/cpu/sparc/vm/register_definitions_sparc.cpp	Tue Dec 22 11:03:37 2015 +0100
+++ b/hotspot/src/cpu/sparc/vm/register_definitions_sparc.cpp	Tue Dec 22 11:11:29 2015 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -152,18 +152,6 @@
 REGISTER_DEFINITION(Register, G3_method_handle);
 REGISTER_DEFINITION(Register, L7_mh_SP_save);
 
-#ifdef CC_INTERP
-REGISTER_DEFINITION(Register, Lstate);
-REGISTER_DEFINITION(Register, L1_scratch);
-REGISTER_DEFINITION(Register, Lmirror);
-REGISTER_DEFINITION(Register, L2_scratch);
-REGISTER_DEFINITION(Register, L3_scratch);
-REGISTER_DEFINITION(Register, L4_scratch);
-REGISTER_DEFINITION(Register, Lscratch);
-REGISTER_DEFINITION(Register, Lscratch2);
-REGISTER_DEFINITION(Register, L7_scratch);
-REGISTER_DEFINITION(Register, I5_savedSP);
-#else // CC_INTERP
 REGISTER_DEFINITION(Register, Lesp);
 REGISTER_DEFINITION(Register, Lbcp);
 REGISTER_DEFINITION(Register, Lmonitors);
@@ -177,7 +165,6 @@
 REGISTER_DEFINITION(Register, IdispatchAddress);
 REGISTER_DEFINITION(Register, ImethodDataPtr);
 REGISTER_DEFINITION(Register, IdispatchTables);
-#endif // CC_INTERP
 REGISTER_DEFINITION(Register, Lmethod);
 REGISTER_DEFINITION(Register, Llocals);
 REGISTER_DEFINITION(Register, Oexception);