--- old/make/windows/makefiles/sa.make	Thu Sep 17 16:09:32 2009
+++ new/make/windows/makefiles/sa.make	Thu Sep 17 16:09:32 2009
@@ -72,6 +72,7 @@
 	$(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.x86.X86ThreadContext 
 	$(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.ia64.IA64ThreadContext 
 	$(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext 
+	$(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.asm.Disassembler
 
 
 
@@ -117,8 +118,14 @@
 	  $(SASRCFILE)
 	  /out:sawindbg.obj
 <<
+	$(CPP) @<<
+	  /I"$(BootStrapDir)/include" /I"$(BootStrapDir)/include/win32" 
+	  /I"$(GENERATED)" $(SA_CFLAGS)
+	  $(AGENT_DIR)/src/share/native/sadis.c
+	  /out:sadis.obj
+<<
 	set LIB=$(SA_LIB)$(LIB)
-	$(LINK) /out:$@ /DLL sawindbg.obj dbgeng.lib $(SA_LFLAGS)
+	$(LINK) /out:$@ /DLL sawindbg.obj sadis.obj dbgeng.lib $(SA_LFLAGS)
 !if "$(MT)" != ""
 	$(MT) /manifest $(@F).manifest /outputresource:$(@F);#2
 !endif