-/* NOT AN OP */
-void asm_builtin_monitorenter(java_objectheader *o);
-#define BUILTIN_monitorenter (functionptr) asm_builtin_monitorenter
-void *builtin_monitorexit(java_objectheader *o);
-/* NOT AN OP */
-void *asm_builtin_monitorexit(java_objectheader *o);
-#define BUILTIN_monitorexit (functionptr) asm_builtin_monitorexit
+#define BUILTIN_staticmonitorenter (functionptr) builtin_staticmonitorenter
+void builtin_monitorexit(java_objectheader *o);
+#define BUILTIN_monitorexit (functionptr) builtin_monitorexit