aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/llvm/Bitcode/Archive.h10
-rw-r--r--include/llvm/System/Path.h9
2 files changed, 2 insertions, 17 deletions
diff --git a/include/llvm/Bitcode/Archive.h b/include/llvm/Bitcode/Archive.h
index eee3922f04..70fc936e9d 100644
--- a/include/llvm/Bitcode/Archive.h
+++ b/include/llvm/Bitcode/Archive.h
@@ -51,8 +51,7 @@ class ArchiveMember {
SVR4SymbolTableFlag = 2, ///< Member is a SVR4 symbol table
BSD4SymbolTableFlag = 4, ///< Member is a BSD4 symbol table
LLVMSymbolTableFlag = 8, ///< Member is an LLVM symbol table
- BytecodeFlag = 16, ///< Member is uncompressed bytecode
- CompressedBytecodeFlag = 32, ///< Member is compressed bytecode
+ BitcodeFlag = 16, ///< Member is uncompressed bytecode
HasPathFlag = 64, ///< Member has a full or partial path
HasLongFilenameFlag = 128, ///< Member uses the long filename syntax
StringTableFlag = 256 ///< Member is an ar(1) format string table
@@ -112,7 +111,6 @@ class ArchiveMember {
/// This method determines if the member is a regular compressed file. Note
/// that compressed bytecode files will yield "false" for this method.
- /// @see isCompressedBytecode()
/// @returns true iff the archive member is a compressed regular file.
/// @brief Determine if the member is a compressed regular file.
bool isCompressed() const { return flags&CompressedFlag; }
@@ -135,11 +133,7 @@ class ArchiveMember {
/// @returns true iff the archive member is an uncompressed bytecode file.
/// @brief Determine if this member is a bytecode file.
- bool isBytecode() const { return flags&BytecodeFlag; }
-
- /// @returns true iff the archive member is a compressed bytecode file.
- /// @brief Determine if the member is a compressed bytecode file.
- bool isCompressedBytecode() const { return flags&CompressedBytecodeFlag;}
+ bool isBitcode() const { return flags&BitcodeFlag; }
/// @returns true iff the file name contains a path (directory) component.
/// @brief Determine if the member has a path
diff --git a/include/llvm/System/Path.h b/include/llvm/System/Path.h
index 537a5af5a3..e7aa45bbc2 100644
--- a/include/llvm/System/Path.h
+++ b/include/llvm/System/Path.h
@@ -307,13 +307,6 @@ namespace sys {
bool isArchive() const;
/// This function determines if the path name in the object references an
- /// LLVM Bytecode file by looking at its magic number.
- /// @returns true if the file starts with the magic number for LLVM
- /// bytecode files.
- /// @brief Determine if the path references a bytecode file.
- bool isBytecodeFile() const;
-
- /// This function determines if the path name in the object references an
/// LLVM Bitcode file by looking at its magic number.
/// @returns true if the file starts with the magic number for LLVM
/// bitcode files.
@@ -621,9 +614,7 @@ namespace sys {
/// This enumeration delineates the kinds of files that LLVM knows about.
enum LLVMFileType {
Unknown_FileType = 0, ///< Unrecognized file
- Bytecode_FileType, ///< Uncompressed bytecode file
Bitcode_FileType, ///< Bitcode file
- CompressedBytecode_FileType, ///< Compressed bytecode file
Archive_FileType, ///< ar style archive file
ELF_Relocatable_FileType, ///< ELF Relocatable object file
ELF_Executable_FileType, ///< ELF Executable image