Revert r294910 and recommit r294861 and r294862 with a target triple to hopefully appease the bots.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@294911 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit 98a017e0587e918c53184cc9dbb3764a99f9e372)
5 files changed