*** 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

*** 70,79 ****
--- 70,80 ----
          $(RUN_JAR) uf $@ -C $(AGENT_SRC_DIR:/=\) META-INF\services\com.sun.jdi.connect.Connector
          $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.windbg.WindbgDebuggerLocal
          $(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
  
  
  
  # This second part is used to build sawindbg.dll
  # We currently build it the same way for product, debug, and fastdebug.

*** 115,126 ****
--- 116,133 ----
            /I"$(BootStrapDir)/include" /I"$(BootStrapDir)/include/win32" 
            /I"$(GENERATED)" $(SA_CFLAGS)
            $(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 sadis.obj dbgeng.lib $(SA_LFLAGS)
  !if "$(MT)" != ""
          $(MT) /manifest $(@F).manifest /outputresource:$(@F);#2
  !endif
          -@rm -f sawindbg.obj