HomePhabricator

Merge remote-tracking branch 'llvm.org/master' into upstream-with-swift

Authored by anemet on Apr 8 2016, 10:10 AM.

Description

Merge remote-tracking branch 'llvm.org/master' into upstream-with-swift

Conflicts:
include/clang/Frontend/CompilerInvocation.h

apple-llvm-split-commit: d646c971a1a7a5cf6e541c208dbcc715bf40713a
apple-llvm-split-dir: clang/

Merged Changes

CommitAuthorDetailsCommitted
f7b3d6c55b91compnerd
Move EABIVersion from CodeGenOptions to TargetOptions 
Apr 8 2016
10a4972a8d87compnerd
revert SVN r265702, r265640 
Apr 8 2016