OSDN Git Service

Reset to master.
authorDan Albert <danalbert@google.com>
Wed, 10 Dec 2014 18:05:21 +0000 (10:05 -0800)
committerDan Albert <danalbert@google.com>
Wed, 10 Dec 2014 18:05:21 +0000 (10:05 -0800)
commit5a119335f700251983d9c7da31bdfe17532334b2
tree8fb36d3910e3ee4c4e1b7422f4f017108efc52f5
parenta3a36cf628f1b0f3980bdb28c103c0e776288da9
Reset to master.

Various automerger/conflict resolution shenanigans have made this
branch no longer match AOSP. Bring them back into sync.

Change-Id: I4117ea6a323068945f237edc0ce0f51e171d4bae
host/include/llvm/Config/config.h
lib/CodeGen/CriticalAntiDepBreaker.cpp
test/CodeGen/X86/critical-anti-dep-breaker.ll [new file with mode: 0644]