Skip to content

Commit

Permalink
servo: Merge #13116 - Avoid LLVM prepending "_" for msvc32 symbols (f…
Browse files Browse the repository at this point in the history
…rom upsuper:msvc32-atoms); r=emilio

See rust-lang/rust#36097. This patch adds a workaround to that issue, which makes win32 stylo build.

Source-Repo: https://github.com/servo/servo
Source-Revision: c55588d25b6e0390d11b2cb654ccb1f95e16cebb

UltraBlame original commit: 54bc210408658c7d7b27836cd9e04de7e2267381
  • Loading branch information
marco-c committed Oct 1, 2019
1 parent 2c90891 commit f222ce9
Show file tree
Hide file tree
Showing 2 changed files with 2,459 additions and 2,457 deletions.
4 changes: 3 additions & 1 deletion servo/ports/geckolib/binding_tools/regen_atoms.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ def msvc64_symbolify(source, ident):


def msvc32_symbolify(source, ident):
return "?" + ident + "@" + source.CLASS + "@@2PAV" + source.TYPE + "@@A"


return "\\x01?" + ident + "@" + source.CLASS + "@@2PAV" + source.TYPE + "@@A"


class GkAtomSource:
Expand Down
Loading

0 comments on commit f222ce9

Please sign in to comment.