finishing touches of bytecode -> bitcode changes. also unbreak Windows
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@37950 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/llvm/Bitcode/Archive.h b/include/llvm/Bitcode/Archive.h
index 70fc936..980bd07 100644
--- a/include/llvm/Bitcode/Archive.h
+++ b/include/llvm/Bitcode/Archive.h
@@ -51,7 +51,7 @@
SVR4SymbolTableFlag = 2, ///< Member is a SVR4 symbol table
BSD4SymbolTableFlag = 4, ///< Member is a BSD4 symbol table
LLVMSymbolTableFlag = 8, ///< Member is an LLVM symbol table
- BitcodeFlag = 16, ///< Member is uncompressed bytecode
+ BitcodeFlag = 16, ///< Member is bitcode
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
@@ -109,8 +109,7 @@
/// @brief Get the data content of the archive member
const void* getData() const { return data; }
- /// This method determines if the member is a regular compressed file. Note
- /// that compressed bytecode files will yield "false" for this method.
+ /// This method determines if the member is a regular compressed file.
/// @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; }
@@ -131,8 +130,8 @@
/// @brief Determine if this member is the ar(1) string table.
bool isStringTable() const { return flags&StringTableFlag; }
- /// @returns true iff the archive member is an uncompressed bytecode file.
- /// @brief Determine if this member is a bytecode file.
+ /// @returns true iff the archive member is a bitcode file.
+ /// @brief Determine if this member is a bitcode file.
bool isBitcode() const { return flags&BitcodeFlag; }
/// @returns true iff the file name contains a path (directory) component.
diff --git a/lib/Archive/ArchiveReader.cpp b/lib/Archive/ArchiveReader.cpp
index c8ffcd6..529b652 100644
--- a/lib/Archive/ArchiveReader.cpp
+++ b/lib/Archive/ArchiveReader.cpp
@@ -204,7 +204,7 @@
break;
}
- // Determine if this is a bytecode file
+ // Determine if this is a bitcode file
switch (sys::IdentifyFileType(At, 4)) {
case sys::Bitcode_FileType:
flags |= ArchiveMember::BitcodeFlag;
diff --git a/lib/System/Win32/Path.inc b/lib/System/Win32/Path.inc
index 67f16a7..994bc67 100644
--- a/lib/System/Win32/Path.inc
+++ b/lib/System/Win32/Path.inc
@@ -189,7 +189,7 @@
}
void
-Path::GetBytecodeLibraryPaths(std::vector<sys::Path>& Paths) {
+Path::GetBitcodeLibraryPaths(std::vector<sys::Path>& Paths) {
char * env_var = getenv("LLVM_LIB_SEARCH_PATH");
if (env_var != 0) {
getPathList(env_var,Paths);
diff --git a/tools/llvm-stub/llvm-stub.c b/tools/llvm-stub/llvm-stub.c
index 10b0256..809a532 100644
--- a/tools/llvm-stub/llvm-stub.c
+++ b/tools/llvm-stub/llvm-stub.c
@@ -1,4 +1,4 @@
-/*===- llvm-stub.c - Stub executable to run llvm bytecode files -----------===//
+/*===- llvm-stub.c - Stub executable to run llvm bitcode files -----------===//
//
// The LLVM Compiler Infrastructure
//
@@ -8,9 +8,9 @@
//===----------------------------------------------------------------------===//
//
// This tool is used by the gccld program to enable transparent execution of
-// bytecode files by the user. Specifically, gccld outputs two files when asked
+// bitcode files by the user. Specifically, gccld outputs two files when asked
// to compile a <program> file:
-// 1. It outputs the LLVM bytecode file to <program>.bc
+// 1. It outputs the LLVM bitcode file to <program>.bc
// 2. It outputs a stub executable that runs lli on <program>.bc
//
// This allows the end user to just say ./<program> and have the JIT executed