diff --git a/lib/CodeGen/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter.cpp
index 10ced4e24be..6f216b7c998 100644
--- a/lib/CodeGen/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter.cpp
@@ -72,9 +72,10 @@ void AsmPrinter::SwitchSection(const char *NewSection, const GlobalValue *GV) {
 bool AsmPrinter::doInitialization(Module &M) {
   Mang = new Mangler(M, GlobalPrefix);
   
-  if (!M.getInlineAsm().empty())
-    O << CommentString << " Start File Scope Asm Blocks:\n" << M.getInlineAsm()
-      << "\n" << CommentString << " End File Scope Asm Blocks\n";
+  if (!M.getModuleInlineAsm().empty())
+    O << CommentString << " Start of file scope inline assembly\n"
+      << M.getModuleInlineAsm()
+      << "\n" << CommentString << " End of file scope inline assembly\n";
 
   SwitchSection("", 0);   // Reset back to no section.
   return false;
diff --git a/lib/Transforms/Utils/CloneModule.cpp b/lib/Transforms/Utils/CloneModule.cpp
index 1cab1587856..a872551eeae 100644
--- a/lib/Transforms/Utils/CloneModule.cpp
+++ b/lib/Transforms/Utils/CloneModule.cpp
@@ -31,7 +31,7 @@ Module *llvm::CloneModule(const Module *M) {
   New->setEndianness(M->getEndianness());
   New->setPointerSize(M->getPointerSize());
   New->setTargetTriple(M->getTargetTriple());
-  New->setInlineAsm(M->getInlineAsm());
+  New->setModuleInlineAsm(M->getModuleInlineAsm());
 
   // Copy all of the type symbol table entries over.
   const SymbolTable &SymTab = M->getSymbolTable();