OSDN Git Service

Merge remote-tracking branch 'upstream/master' into merge-20130502
authorStephen Hines <srhines@google.com>
Thu, 2 May 2013 23:19:29 +0000 (16:19 -0700)
committerStephen Hines <srhines@google.com>
Thu, 2 May 2013 23:19:29 +0000 (16:19 -0700)
commit38578c4919ea18ceb27e29988b2d857afe6215bf
tree6718ee1e6a1a59f46b6c847439ebfcd291c1e393
parentffb69c62ac54b0af5768ae9486b93b39a6c6b94c
parenta7a05ee70cb07f32996a0587a636b406c746b71b
Merge remote-tracking branch 'upstream/master' into merge-20130502

Conflicts:
lib/Support/Unix/Signals.inc
unittests/Transforms/Utils/Cloning.cpp

Change-Id: I027581a4390ec3ce4cd8d33da8b5f4c0c7d372c8
include/llvm/CodeGen/LinkAllAsmWriterComponents.h
include/llvm/MC/MCAssembler.h
include/llvm/MC/MCSection.h
include/llvm/Object/ELF.h
lib/MC/MCAssembler.cpp
lib/Object/COFFObjectFile.cpp
lib/Support/Unix/PathV2.inc
lib/Support/Unix/Signals.inc
lib/Target/ARM/ARMSubtarget.cpp
lib/Target/X86/X86ISelLowering.cpp