diff --git a/llvm/include/llvm/ADT/Triple.h b/llvm/include/llvm/ADT/Triple.h
--- a/llvm/include/llvm/ADT/Triple.h
+++ b/llvm/include/llvm/ADT/Triple.h
@@ -204,29 +204,29 @@
   enum EnvironmentType {
     UnknownEnvironment,
 
+    Android,
+    CODE16,
+    CoreCLR,
+    Cygnus,
+    EABI,
+    EABIHF,
     GNU,
-    GNUABIN32,
     GNUABI64,
+    GNUABIN32,
     GNUEABI,
     GNUEABIHF,
-    GNUX32,
     GNUILP32,
-    CODE16,
-    EABI,
-    EABIHF,
-    Android,
+    GNUX32,
+    Itanium,
+    LLVMLibc,
+    MacABI, // Mac Catalyst variant of Apple's iOS deployment target.
+    MSVC,
     Musl,
     MuslEABI,
     MuslEABIHF,
     MuslX32,
-
-    MSVC,
-    Itanium,
-    Cygnus,
-    CoreCLR,
     Simulator, // Simulator variants of other systems, e.g., Apple's iOS
-    MacABI, // Mac Catalyst variant of Apple's iOS deployment target.
-    LastEnvironmentType = MacABI
+    LastEnvironmentType = Simulator
   };
   enum ObjectFormatType {
     UnknownObjectFormat,
diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp
--- a/llvm/lib/Support/Triple.cpp
+++ b/llvm/lib/Support/Triple.cpp
@@ -242,11 +242,15 @@
   case GNUABIN32: return "gnuabin32";
   case GNUEABI: return "gnueabi";
   case GNUEABIHF: return "gnueabihf";
-  case GNUX32: return "gnux32";
   case GNUILP32: return "gnu_ilp32";
+  case GNUX32:
+    return "gnux32";
   case Itanium: return "itanium";
-  case MSVC: return "msvc";
+  case LLVMLibc:
+    return "llvmlibc";
   case MacABI: return "macabi";
+  case MSVC:
+    return "msvc";
   case Musl: return "musl";
   case MuslEABI: return "musleabi";
   case MuslEABIHF: return "musleabihf";