OSDN Git Service

(root) / android-x86 / external-llvm.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4a05ed7 a94d6e8)
Merge with LLVM upstream r160668 (Jul 24th 2012)
authorShih-wei Liao <sliao@google.com>
Fri, 3 Aug 2012 07:11:18 +0000 (00:11 -0700)
committerShih-wei Liao <sliao@google.com>
Fri, 3 Aug 2012 07:11:18 +0000 (00:11 -0700)
commit7744acd1ab73b3eec6f1449f47083abe3fb1b527
tree17ef28b6d1034fdea7f42a19bebe7ad834901d62tree | snapshot
parent4a05ed708aed4c7a099d924ed3feb604d3e44074commit | diff
parenta94d6e87c4c49f2e81b01d66d8bfb591277f8f96commit | diff
Merge with LLVM upstream r160668 (Jul 24th 2012)

Conflicts:
include/llvm/Support/ELF.h
lib/CodeGen/AsmPrinter/AsmPrinter.cpp
lib/Support/Memory.cpp
lib/Transforms/Instrumentation/AddressSanitizer.cpp

Change-Id: Iddd658cf2eadc7165b2805b446d31af2c5c9917f
13 files changed:
include/llvm/MC/MCAssembler.h diff1 | diff2 | blob | history
include/llvm/Object/ELF.h diff1 | diff2 | blob | history
include/llvm/Support/ELF.h diff1 | diff2 | blob | history
lib/CodeGen/AsmPrinter/AsmPrinter.cpp diff1 | diff2 | blob | history
lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp diff1 | diff2 | blob | history
lib/MC/MCAssembler.cpp diff1 | diff2 | blob | history
lib/Object/COFFObjectFile.cpp diff1 | diff2 | blob | history
lib/Support/Unix/PathV2.inc diff1 | diff2 | blob | history
lib/Support/Unix/Signals.inc diff1 | diff2 | blob | history
lib/Target/ARM/ARMCodeEmitter.cpp diff1 | diff2 | blob | history
lib/Target/ARM/ARMSubtarget.cpp diff1 | diff2 | blob | history
lib/Target/X86/X86ISelLowering.cpp diff1 | diff2 | blob | history
utils/TableGen/CodeEmitterGen.cpp diff1 | diff2 | blob | history
external/llvm
About OSDN
Find Software
Develop Software
Help