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 rust-embedded/svd2rust#130 cc @japaric r? @alexcrichton
rust-lang · Jul 21, 2017 · 6c94965 · 6c94965
2 parents d361efa + 9b8c223
commit 6c94965
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/llvm b/src/llvm
diff --git a/src/rustllvm/llvm-rebuild-trigger b/src/rustllvm/llvm-rebuild-trigger
@@ -1,4 +1,4 @@
 # If this file is modified, then llvm will be (optionally) cleaned and then rebuilt.
 # The actual contents of this file do not matter, but to trigger a change on the
 # build bots then the contents should be changed so git updates the mtime.
-2017-07-12
+2017-07-18
+1 −1		include/llvm/MC/MCELFStreamer.h
+1 −1		include/llvm/MC/MCObjectStreamer.h
+1 −1		include/llvm/MC/MCStreamer.h
+1 −1		include/llvm/MC/MCWinCOFFStreamer.h
+3 −4		lib/MC/MCAsmStreamer.cpp
+2 −4		lib/MC/MCELFStreamer.cpp
+3 −5		lib/MC/MCMachOStreamer.cpp
+2 −2		lib/MC/MCObjectStreamer.cpp
+1 −7		lib/MC/MCParser/AsmParser.cpp
+8 −1		lib/MC/MCStreamer.cpp
+2 −3		lib/MC/WinCOFFStreamer.cpp
+1 −1		lib/Object/RecordStreamer.cpp
+1 −1		lib/Object/RecordStreamer.h
+1 −1		lib/Target/Mips/MCTargetDesc/MipsELFStreamer.cpp
+1 −1		lib/Target/Mips/MCTargetDesc/MipsELFStreamer.h
+8 −0		test/CodeGen/XCore/section-name.ll