about summary refs log tree commit diff
path: root/src/libstd/thread
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-07-21 15:42:17 +0000
committerbors <bors@rust-lang.org>2017-07-21 15:42:17 +0000
commit6c949655de6bd2866d7d4bbac0238f35557563fc (patch)
treea2b98bf3f58a11a54c186783e0cead383a38b593 /src/libstd/thread
parentd361efac2639fa9dd7f6195e4276a728b8875d7a (diff)
parent9b8c223407ae726157f43173ec1f3a743830d858 (diff)
downloadrust-6c949655de6bd2866d7d4bbac0238f35557563fc.tar.gz
rust-6c949655de6bd2866d7d4bbac0238f35557563fc.zip
Auto merge of #43313 - pftbest:fix_asm, r=alexcrichton
[LLVM] Fix an assertion when a weak symbol is defined in global_asm.

This change will fix the issue from
https://github.com/japaric/svd2rust/pull/130

cc @japaric
r? @alexcrichton
Diffstat (limited to 'src/libstd/thread')
0 files changed, 0 insertions, 0 deletions