Merge commit '100fbdd06be7590b23c4707a98cd605bdb519498' into merge_20130612

2 files changed, 12 insertions, 16 deletions

diff --git a/lib/Archive/Archive.cpp b/lib/Archive/Archive.cpp
index 1f36a00..b909b39 100644
--- a/lib/Archive/Archive.cpp
+++ b/lib/Archive/Archive.cpp
@@ -129,14 +129,12 @@ bool ArchiveMember::replaceWith(const sys::Path& newFile, std::string* ErrMsg) {
   }
 
   // Determine what kind of file it is.
-  switch (sys::IdentifyFileType(signature,4)) {
-    case sys::Bitcode_FileType:
-      flags |= BitcodeFlag;
-      break;
-    default:
-      flags &= ~BitcodeFlag;
-      break;
-  }
+  if (sys::fs::identify_magic(StringRef(signature, 4)) ==
+      sys::fs::file_magic::bitcode)
+    flags |= BitcodeFlag;
+  else
+    flags &= ~BitcodeFlag;
+
   return false;
 }
 
diff --git a/lib/Archive/ArchiveReader.cpp b/lib/Archive/ArchiveReader.cpp
index 2604fdf..4d17ea8 100644
--- a/lib/Archive/ArchiveReader.cpp
+++ b/lib/Archive/ArchiveReader.cpp
@@ -17,6 +17,7 @@
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/Bitcode/ReaderWriter.h"
 #include "llvm/IR/Module.h"
+#include "llvm/Support/FileSystem.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include <cctype>
 #include <cstdio>
@@ -206,14 +207,11 @@ Archive::parseMemberHeader(const char*& At, const char* End, std::string* error)
   }
 
   // Determine if this is a bitcode file
-  switch (sys::IdentifyFileType(At, 4)) {
-    case sys::Bitcode_FileType:
-      flags |= ArchiveMember::BitcodeFlag;
-      break;
-    default:
-      flags &= ~ArchiveMember::BitcodeFlag;
-      break;
-  }
+  if (sys::fs::identify_magic(StringRef(At, 4)) ==
+      sys::fs::file_magic::bitcode)
+    flags |= ArchiveMember::BitcodeFlag;
+  else
+    flags &= ~ArchiveMember::BitcodeFlag;
 
   // Instantiate the ArchiveMember to be filled
   ArchiveMember* member = new ArchiveMember(this);