diff options
| author | ruki <[email protected]> | 2021-10-28 00:37:30 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-10-28 00:37:30 +0800 |
| commit | 020ec323df6377390fe144e8af78dd7cc741ec0b (patch) | |
| tree | 92ae67e5301eab91ad4e8fd6d8fa074429811b00 /xmake/modules/core/tools/ml.lua | |
| parent | d527a9213c3ac1651dc7f7bea7a2ea91139ed6ff (diff) | |
improve ml
Diffstat (limited to 'xmake/modules/core/tools/ml.lua')
| -rw-r--r-- | xmake/modules/core/tools/ml.lua | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/xmake/modules/core/tools/ml.lua b/xmake/modules/core/tools/ml.lua index 3550b1a32..6678bec81 100644 --- a/xmake/modules/core/tools/ml.lua +++ b/xmake/modules/core/tools/ml.lua @@ -29,11 +29,7 @@ import("core.base.hashset") function init(self) -- init asflags - if self:program():find("64") then - self:set("asflags", "-nologo") - else - self:set("asflags", "-nologo", "-Gd") - end + self:set("asflags", "-nologo") -- init flags map self:set("mapflags", @@ -111,6 +107,21 @@ end -- make the compile arguments list function compargv(self, sourcefile, objectfile, flags) + -- we need to set the default -Gd option for the x86 architecture, + -- if the other calling convention flags are not set + -- + -- we can't directly remove -Gd. This is not only for backward compatibility, + -- but also to simplify mixed compilation with c programs. + -- + -- although this may affect some performance, + -- it only takes effect under x86 asm, so there will be no major performance issues. + -- + -- @see https://github.com/xmake-io/xmake/issues/1779 + -- + if not self:program():find("64", 1, true) and + not table.contains(flags, "-Gd", "/Gd", "-Gc", "/Gc", "-GZ", "/GZ") then + table.insert(flags, "-Gd") + end return self:program(), table.join("-c", flags, "-Fo" .. objectfile, sourcefile) end |