Mercurial > hg > graal-compiler

comparison make/windows/makefiles/sa.make @ 12818:763705f0fec3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8016845: SA is unable to use hsdis on windows Summary: Added sadis.c to the build to provide missing symbols in sawindbg.dll. Added code to use the correct hsdisXXX.dll filename on different windows platforms. Reviewed-by: sla, mgerdin Contributed-by: fredrik.arvidsson@oracle.com
author sla
date Fri, 04 Oct 2013 13:01:07 +0200
parents febab3a8f203
children 1a93f2c5945a
comparison
equal deleted inserted replaced
12817:febab3a8f203 12818:763705f0fec3
100 !endif 100 !endif
101 !endif 101 !endif
102 !if "$(MT)" != "" 102 !if "$(MT)" != ""
103 SA_LD_FLAGS = -manifest $(SA_LD_FLAGS) 103 SA_LD_FLAGS = -manifest $(SA_LD_FLAGS)
104 !endif 104 !endif
105 SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp 105
106 SASRCFILES = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp \
107 $(AGENT_DIR)/src/share/native/sadis.c
108
106 SA_LFLAGS = $(SA_LD_FLAGS) -nologo -subsystem:console -machine:$(MACHINE) 109 SA_LFLAGS = $(SA_LD_FLAGS) -nologo -subsystem:console -machine:$(MACHINE)
107 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" 110 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
108 SA_LFLAGS = $(SA_LFLAGS) -map -debug 111 SA_LFLAGS = $(SA_LFLAGS) -map -debug
109 !endif 112 !endif
110 113
114 # get included in the dumpbin command in build_vm_def.sh 117 # get included in the dumpbin command in build_vm_def.sh
115 118
116 # In VS2005 or VS2008 the link command creates a .manifest file that we want 119 # In VS2005 or VS2008 the link command creates a .manifest file that we want
117 # to insert into the linked artifact so we do not need to track it separately. 120 # to insert into the linked artifact so we do not need to track it separately.
118 # Use ";#2" for .dll and ";#1" for .exe in the MT command below: 121 # Use ";#2" for .dll and ";#1" for .exe in the MT command below:
119 $(SAWINDBG): $(SASRCFILE) 122 $(SAWINDBG): $(SASRCFILES)
120 set INCLUDE=$(SA_INCLUDE)$(INCLUDE) 123 set INCLUDE=$(SA_INCLUDE)$(INCLUDE)
121 $(CXX) @<< 124 $(CXX) @<<
122 -I"$(BootStrapDir)/include" -I"$(BootStrapDir)/include/win32" 125 -I"$(BootStrapDir)/include" -I"$(BootStrapDir)/include/win32"
123 -I"$(GENERATED)" $(SA_CFLAGS) 126 -I"$(GENERATED)" $(SA_CFLAGS)
124 $(SASRCFILE) 127 $(SASRCFILES)
125 -out:$*.obj 128 -out:$*.obj
126 << 129 <<
127 set LIB=$(SA_LIB)$(LIB) 130 set LIB=$(SA_LIB)$(LIB)
128 $(LD) -out:$@ -DLL $*.obj dbgeng.lib $(SA_LFLAGS) 131 $(LD) -out:$@ -DLL sawindbg.obj sadis.obj dbgeng.lib $(SA_LFLAGS)
129 !if "$(MT)" != "" 132 !if "$(MT)" != ""
130 $(MT) -manifest $(@F).manifest -outputresource:$(@F);#2 133 $(MT) -manifest $(@F).manifest -outputresource:$(@F);#2
131 !endif 134 !endif
132 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" 135 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
133 !if "$(ZIP_DEBUGINFO_FILES)" == "1" 136 !if "$(ZIP_DEBUGINFO_FILES)" == "1"