OSDN Git Service

Merge branch 'upstream' into sliao_d
authorShih-wei Liao <sliao@google.com>
Sat, 24 Mar 2012 11:18:09 +0000 (04:18 -0700)
committerShih-wei Liao <sliao@google.com>
Sat, 24 Mar 2012 11:18:09 +0000 (04:18 -0700)
commitc59a7995d22e2889706810c90a20a51ecfec278b
treeef37472f01d4b6258755680b4561a667bc337dd6
parentd1acd051dd8446a013b6c35b4bfe64ec68417206
parent98a92d199ce9993dca1b65927009013ad3e5297f
Merge branch 'upstream' into sliao_d
include/llvm/Support/ELF.h
lib/CodeGen/AsmPrinter/AsmPrinter.cpp
lib/Target/ARM/ARMJITInfo.cpp
utils/TableGen/CodeEmitterGen.cpp