diff --git a/lib/DriverTool/autolink_extract_main.cpp b/lib/DriverTool/autolink_extract_main.cpp
index 4008341b02652..3da350845d7ba 100644
--- a/lib/DriverTool/autolink_extract_main.cpp
+++ b/lib/DriverTool/autolink_extract_main.cpp
@@ -217,35 +217,31 @@ int autolink_extract_main(ArrayRef<const char *> Args, const char *Argv0,
   // in most object files
 
   std::vector<std::string> SwiftRuntimeLibsOrdered = {
-      // Common Swift runtime libs
-      "-lswiftSwiftOnoneSupport",
-      "-lswiftCore",
-      "-lswift_Concurrency",
+      "-lFoundationXML",
+      "-lFoundationNetworking",
+      "-lFoundation",
+      "-lswiftDispatch",
+      "-lswiftRegexBuilder",
+      "-lswift_Backtracing",
       "-lswift_StringProcessing",
-      "-lswift_RegexBuilder",
       "-lswift_RegexParser",
-      "-lswift_Backtracing",
+      "-lswift_Concurrency",
       "-lswiftGlibc",
-      "-lBlocksRuntime",
-      // Dispatch-specific Swift runtime libs
+      "-lswiftSwiftOnoneSupport",
+      "-lswiftCore",
+      "-lCoreFoundation",
+      "-licui18nswift",
+      "-licuucswift",
+      "-licudataswift",
       "-ldispatch",
+      "-lBlocksRuntime",
       "-lDispatchStubs",
-      "-lswiftDispatch",
-      // CoreFoundation and Foundation Swift runtime libs
-      "-lCoreFoundation",
-      "-lFoundation",
-      "-lFoundationNetworking",
-      "-lFoundationXML",
-      // Foundation support libs
       "-lcurl",
       "-lxml2",
       "-luuid",
       // XCTest runtime libs (must be first due to http://github.com/apple/swift-corelibs-xctest/issues/432)
       "-lXCTest",
       // ICU Swift runtime libs
-      "-licui18nswift",
-      "-licuucswift",
-      "-licudataswift",
       // Common-use ordering-agnostic Linux system libs
       "-lm",
       "-lpthread",