diff --git a/llvm/lib/TargetParser/Host.cpp b/llvm/lib/TargetParser/Host.cpp
index e822da11ee85a..e61fcb248faec 100644
--- a/llvm/lib/TargetParser/Host.cpp
+++ b/llvm/lib/TargetParser/Host.cpp
@@ -1536,7 +1536,7 @@ StringRef sys::detail::getHostCPUNameForSPARC(StringRef ProcCpuinfoContent) {
   // Look for cpu line to determine cpu name
   StringRef Cpu;
   for (unsigned I = 0, E = Lines.size(); I != E; ++I) {
-    if (Lines[I].startswith("cpu")) {
+    if (Lines[I].starts_with("cpu")) {
       Cpu = Lines[I].substr(5).ltrim("\t :");
       break;
     }
@@ -1853,7 +1853,7 @@ bool sys::getHostCPUFeatures(StringMap<bool> &Features) {
 
   // Look for the CPU features.
   for (unsigned I = 0, E = Lines.size(); I != E; ++I)
-    if (Lines[I].startswith("Features")) {
+    if (Lines[I].starts_with("Features")) {
       Lines[I].split(CPUFeatures, ' ');
       break;
     }
diff --git a/llvm/unittests/Support/ProgramTest.cpp b/llvm/unittests/Support/ProgramTest.cpp
index 91dbb57fbdeca..2e2b1958b9ac9 100644
--- a/llvm/unittests/Support/ProgramTest.cpp
+++ b/llvm/unittests/Support/ProgramTest.cpp
@@ -130,7 +130,7 @@ TEST_F(ProgramEnvTest, CreateProcessLongPath) {
   // prefix.
   sys::path::native(MyAbsExe, sys::path::Style::windows_backslash);
   std::string MyExe;
-  if (!StringRef(MyAbsExe).startswith("\\\\?\\"))
+  if (!StringRef(MyAbsExe).starts_with("\\\\?\\"))
     MyExe.append("\\\\?\\");
   MyExe.append(std::string(MyAbsExe.begin(), MyAbsExe.end()));
 
diff --git a/llvm/unittests/Support/TypeNameTest.cpp b/llvm/unittests/Support/TypeNameTest.cpp
index e0d9ac5ee7e38..3550c626e9e67 100644
--- a/llvm/unittests/Support/TypeNameTest.cpp
+++ b/llvm/unittests/Support/TypeNameTest.cpp
@@ -35,7 +35,7 @@ TEST(TypeNameTest, Names) {
 #ifdef __clang__
   EXPECT_TRUE(S2Name.ends_with("S2")) << S2Name.str();
 #else
-  EXPECT_TRUE(S2Name.endswith("::S2")) << S2Name.str();
+  EXPECT_TRUE(S2Name.ends_with("::S2")) << S2Name.str();
 #endif
 #else
   EXPECT_EQ("UNKNOWN_TYPE", S1Name);