Mercurial > hg > graal-jvmci-8
comparison make/windows/makefiles/sa.make @ 12924:1a93f2c5945a
Merge
author | lana |
---|---|
date | Thu, 17 Oct 2013 14:20:57 -0700 |
parents | 7638e35cabc6 763705f0fec3 |
children | eb79bf22508b de6a9e811145 |
comparison
equal
deleted
inserted
replaced
12923:8321dcc18438 | 12924:1a93f2c5945a |
---|---|
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 !if "$(BUILDARCH)" == "i486" | 113 !if "$(BUILDARCH)" == "i486" |
111 SA_LFLAGS = $(SAFESEH_FLAG) $(SA_LFLAGS) | 114 SA_LFLAGS = $(SAFESEH_FLAG) $(SA_LFLAGS) |
112 !endif | 115 !endif |
113 | 116 |
117 SA_CFLAGS = $(SA_CFLAGS) $(MP_FLAG) | |
118 | |
114 # Note that we do not keep sawindbj.obj around as it would then | 119 # Note that we do not keep sawindbj.obj around as it would then |
115 # get included in the dumpbin command in build_vm_def.sh | 120 # get included in the dumpbin command in build_vm_def.sh |
116 | 121 |
117 # In VS2005 or VS2008 the link command creates a .manifest file that we want | 122 # In VS2005 or VS2008 the link command creates a .manifest file that we want |
118 # to insert into the linked artifact so we do not need to track it separately. | 123 # to insert into the linked artifact so we do not need to track it separately. |
119 # Use ";#2" for .dll and ";#1" for .exe in the MT command below: | 124 # Use ";#2" for .dll and ";#1" for .exe in the MT command below: |
120 $(SAWINDBG): $(SASRCFILE) | 125 $(SAWINDBG): $(SASRCFILES) |
121 set INCLUDE=$(SA_INCLUDE)$(INCLUDE) | 126 set INCLUDE=$(SA_INCLUDE)$(INCLUDE) |
122 $(CXX) @<< | 127 $(CXX) @<< |
123 -I"$(BootStrapDir)/include" -I"$(BootStrapDir)/include/win32" | 128 -I"$(BootStrapDir)/include" -I"$(BootStrapDir)/include/win32" |
124 -I"$(GENERATED)" $(SA_CFLAGS) | 129 -I"$(GENERATED)" $(SA_CFLAGS) |
125 $(SASRCFILE) | 130 $(SASRCFILES) |
126 -out:$*.obj | 131 -out:$*.obj |
127 << | 132 << |
128 set LIB=$(SA_LIB)$(LIB) | 133 set LIB=$(SA_LIB)$(LIB) |
129 $(LD) -out:$@ -DLL $*.obj dbgeng.lib $(SA_LFLAGS) | 134 $(LD) -out:$@ -DLL sawindbg.obj sadis.obj dbgeng.lib $(SA_LFLAGS) |
130 !if "$(MT)" != "" | 135 !if "$(MT)" != "" |
131 $(MT) -manifest $(@F).manifest -outputresource:$(@F);#2 | 136 $(MT) -manifest $(@F).manifest -outputresource:$(@F);#2 |
132 !endif | 137 !endif |
133 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" | 138 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" |
134 !if "$(ZIP_DEBUGINFO_FILES)" == "1" | 139 !if "$(ZIP_DEBUGINFO_FILES)" == "1" |