OSDN Git Service

Merge with LLVM upstream r155090.
authorShih-wei Liao <sliao@google.com>
Tue, 24 Apr 2012 18:26:46 +0000 (11:26 -0700)
committerShih-wei Liao <sliao@google.com>
Tue, 24 Apr 2012 18:26:46 +0000 (11:26 -0700)
commitcf5a1461acaace0f3e7d11fbbcfbf635b8c8ea9d
tree557137810ae9efc96147d672d372e4dabd0a2440
parent4c8fab82874a29dcd2b242533af3ebe7f66bfd74
parentfc728fbdc2631ce8f343cf9b7292d218fde7419f
Merge with LLVM upstream r155090.

Conflicts:
lib/Support/Unix/PathV2.inc

Change-Id: I7b89833849f6cbcfa958a33a971d0f7754c9cb2c
include/llvm/MC/MCAssembler.h
include/llvm/MC/MCSection.h
include/llvm/Support/ELF.h
lib/CodeGen/AsmPrinter/AsmPrinter.cpp
lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp
lib/MC/MCAssembler.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