OSDN Git Service

Merge remote-tracking branch 'upstream/master' into merge-llvm
authorStephen Hines <srhines@google.com>
Mon, 21 Jan 2013 21:15:17 +0000 (13:15 -0800)
committerStephen Hines <srhines@google.com>
Mon, 21 Jan 2013 21:15:17 +0000 (13:15 -0800)
commit059800f9e3fee2852672f846d91a2da14da7783a
treea6ef16b7263252ae1b8069295ea9cbbae0d9467d
parentcbefa15de4821975bb99fc6d74b3bdb42b2df45c
parentb6714227eda5d499f7667fc865f931126a8dc488
Merge remote-tracking branch 'upstream/master' into merge-llvm

Conflicts:
lib/CodeGen/AsmPrinter/AsmPrinter.cpp
lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp
lib/MC/MCAssembler.cpp
lib/Support/Atomic.cpp
lib/Support/Memory.cpp
lib/Target/ARM/ARMJITInfo.cpp

Change-Id: Ib339baf88df5b04870c8df1bedcfe1f877ccab8d
17 files changed:
include/llvm/MC/MCAssembler.h
include/llvm/MC/MCSection.h
include/llvm/Object/ELF.h
include/llvm/Support/ELF.h
lib/CodeGen/AsmPrinter/AsmPrinter.cpp
lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp
lib/MC/MCAssembler.cpp
lib/Object/COFFObjectFile.cpp
lib/Object/ELFObjectFile.cpp
lib/Support/Atomic.cpp
lib/Support/Unix/PathV2.inc
lib/Support/Unix/Signals.inc
lib/Target/ARM/ARMCodeEmitter.cpp
lib/Target/ARM/ARMJITInfo.cpp
lib/Target/ARM/ARMSubtarget.cpp
lib/Target/X86/X86ISelLowering.cpp
utils/TableGen/CodeEmitterGen.cpp