diff --git a/lib/CodeGen/CodeGenAction.cpp b/lib/CodeGen/CodeGenAction.cpp
index 047dc53..f13678d 100644
--- a/lib/CodeGen/CodeGenAction.cpp
+++ b/lib/CodeGen/CodeGenAction.cpp
@@ -419,9 +419,18 @@ void CodeGenAction::ExecuteAction() {
       CI.getDiagnostics().Report(Loc, DiagID);
       return;
     }
+    TargetOptions &TargetOpts = CI.getTargetOpts();
+    if (TheModule->getTargetTriple() != TargetOpts.Triple) {
+      std::string Msg = "Forcing the target triple to " + TargetOpts.Triple;
+      unsigned DiagID =
+          CI.getDiagnostics().getCustomDiagID(DiagnosticsEngine::Warning, Msg);
+
+      CI.getDiagnostics().Report(SourceLocation(), DiagID);
+      TheModule->setTargetTriple(TargetOpts.Triple);
+    }
 
     EmitBackendOutput(CI.getDiagnostics(), CI.getCodeGenOpts(),
-                      CI.getTargetOpts(), CI.getLangOpts(),
+                      TargetOpts, CI.getLangOpts(),
                       TheModule.get(),
                       BA, OS);
     return;
diff --git a/test/Frontend/ir-support-codegen.ll b/test/Frontend/ir-support-codegen.ll
index 7f08061..873ab75 100644
--- a/test/Frontend/ir-support-codegen.ll
+++ b/test/Frontend/ir-support-codegen.ll
@@ -1,9 +1,15 @@
 ; REQUIRES: x86-registered-target
-; RUN: %clang_cc1 -S -o - %s | FileCheck %s
+; RUN: %clang_cc1 -triple x86_64-apple-darwin10 -S -o - %s | FileCheck %s
+
+; RUN: %clang_cc1 -triple x86_64-pc-linux -S -o %t %s 2>&1 | \
+; RUN: FileCheck --check-prefix=WARN %s
+; WARN: warning: Forcing the target triple to x86_64-pc-linux
+; RUN: FileCheck --check-prefix=LINUX %s < %t
 
 target triple = "x86_64-apple-darwin10"
 
 ; CHECK: .globl _f0
+; LINUX: .globl f0
 define i32 @f0() nounwind ssp {
        ret i32 0
 }