Rename FreeStanding to Freestanding where appropriate

7 files changed, 19 insertions, 24 deletions

diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index 327f5407..52f4e766 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -85,12 +85,12 @@ foreach (_suffix ${LIB_BC_SUFFIX})
     list(APPEND "LIB_BC_FLAGS_${_suffix}" ${COMMON_CC_FLAGS})
 endforeach ()
 
-add_subdirectory(FreeStanding)
+add_subdirectory(Freestanding)
 add_subdirectory(Intrinsic)
 add_subdirectory(klee-libc)
 
 set(RUNTIME_LIBRARIES
-        RuntimeFreeStanding
+        RuntimeFreestanding
         RuntimeIntrinsic
         RuntimeKLEELibc
         )
diff --git a/runtime/FreeStanding/CMakeLists.txt b/runtime/Freestanding/CMakeLists.txt
index cf558a7d..872a4f05 100644
--- a/runtime/FreeStanding/CMakeLists.txt
+++ b/runtime/Freestanding/CMakeLists.txt
@@ -7,7 +7,7 @@
 #
 #===------------------------------------------------------------------------===#
 
-set(LIB_PREFIX "RuntimeFreeStanding")
+set(LIB_PREFIX "RuntimeFreestanding")
 set(SRC_FILES
         memcmp.c
         memcpy.c
diff --git a/runtime/FreeStanding/memcmp.c b/runtime/Freestanding/memcmp.c
index 566daf48..566daf48 100644
--- a/runtime/FreeStanding/memcmp.c
+++ b/runtime/Freestanding/memcmp.c
diff --git a/runtime/FreeStanding/memcpy.c b/runtime/Freestanding/memcpy.c
index c7c6e6d3..c7c6e6d3 100644
--- a/runtime/FreeStanding/memcpy.c
+++ b/runtime/Freestanding/memcpy.c
diff --git a/runtime/FreeStanding/memmove.c b/runtime/Freestanding/memmove.c
index ee0e53ae..ee0e53ae 100644
--- a/runtime/FreeStanding/memmove.c
+++ b/runtime/Freestanding/memmove.c
diff --git a/runtime/FreeStanding/memset.c b/runtime/Freestanding/memset.c
index b439001e..b439001e 100644
--- a/runtime/FreeStanding/memset.c
+++ b/runtime/Freestanding/memset.c
diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp
index 589cc9a2..d1f588bc 100644
--- a/tools/klee/main.cpp
+++ b/tools/klee/main.cpp
@@ -165,23 +165,18 @@ namespace {
   cl::OptionCategory LinkCat("Linking options",
                              "These options control the libraries being linked.");
 
-  enum class LibcType { FreeStandingLibc, KleeLibc, UcLibc };
-
-  cl::opt<LibcType>
-  Libc("libc",
-       cl::desc("Choose libc version (none by default)."),
-       cl::values(
-                  clEnumValN(LibcType::FreeStandingLibc,
-                             "none",
-                             "Don't link in a libc (only provide freestanding environment)"),
-                  clEnumValN(LibcType::KleeLibc,
-                             "klee",
-                             "Link in KLEE's libc"),
-                  clEnumValN(LibcType::UcLibc, "uclibc",
-                             "Link in uclibc (adapted for KLEE)")
-                  KLEE_LLVM_CL_VAL_END),
-       cl::init(LibcType::FreeStandingLibc),
-       cl::cat(LinkCat));
+  enum class LibcType { FreestandingLibc, KleeLibc, UcLibc };
+
+  cl::opt<LibcType> Libc(
+      "libc", cl::desc("Choose libc version (none by default)."),
+      cl::values(
+          clEnumValN(
+              LibcType::FreestandingLibc, "none",
+              "Don't link in a libc (only provide freestanding environment)"),
+          clEnumValN(LibcType::KleeLibc, "klee", "Link in KLEE's libc"),
+          clEnumValN(LibcType::UcLibc, "uclibc",
+                     "Link in uclibc (adapted for KLEE)") KLEE_LLVM_CL_VAL_END),
+      cl::init(LibcType::FreestandingLibc), cl::cat(LinkCat));
 
   cl::list<std::string>
       LinkLibraries("link-llvm-lib",
@@ -906,7 +901,7 @@ void externalsAndGlobalsCheck(const llvm::Module *m) {
     dontCare.insert(dontCareUclibc,
                     dontCareUclibc+NELEMS(dontCareUclibc));
     break;
-  case LibcType::FreeStandingLibc: /* silence compiler warning */
+  case LibcType::FreestandingLibc: /* silence compiler warning */
     break;
   }
 
@@ -1312,13 +1307,13 @@ int main(int argc, char **argv, char **envp) {
                  errorMsg.c_str());
   }
   /* Falls through. */
-  case LibcType::FreeStandingLibc: {
+  case LibcType::FreestandingLibc: {
     SmallString<128> Path(Opts.LibraryDir);
     llvm::sys::path::append(Path,
-                            "libkleeRuntimeFreeStanding" + opt_suffix + ".bca");
+                            "libkleeRuntimeFreestanding" + opt_suffix + ".bca");
     if (!klee::loadFile(Path.c_str(), mainModule->getContext(), loadedModules,
                         errorMsg))
-      klee_error("error loading free standing support '%s': %s", Path.c_str(),
+      klee_error("error loading freestanding support '%s': %s", Path.c_str(),
                  errorMsg.c_str());
     break;
   }