[ToolChains] Linux.cpp: Use the same style across all all multi-arch includes. NFC.

[kristina]

Summary

Currently it seems like a mess in terms of where newlines are used. Cleaning it up so all of them use newlines and are aligned and moving the default switch case to the top. Making a differential to see if anyone has objections to the style used.

[lebedev.ri]

lib/Driver/ToolChains/Linux.cpp

674

This *might* be what clang-format produces.

[kristina]

Yeah but what about the rest of them, most are completely on their own line, some no newlines, mipsel64 was split across two lines while others weren't, and switch is meant to have default as the topmost case IIRC. I mean I'm if you don't think it's more readable that way I'll abandon it. Though IMHO reading wise it's much easier to read as a list down with separators than as a mix of various newline/no-newline styles.

[sammccall]

I don't have an opinion on the style per se, but please use clang-format. If it doesn't produce the formatting you want, then change the code so it does. (e.g. adding a trailing , at the end of an init-list will force one-per-line).

lib/Driver/ToolChains/Linux.cpp

void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
 
   // Implement generic Debian multiarch support.
   const StringRef X86_64MultiarchIncludeDirs[] = {
       "/usr/include/x86_64-linux-gnu",
 
       // FIXME: These are older forms of multiarch. It's not clear that they're
       // in use in any released version of Debian, so we should consider
       // removing them.
-      "/usr/include/i686-linux-gnu/64", "/usr/include/i486-linux-gnu/64"};
+      "/usr/include/i686-linux-gnu/64",
+      "/usr/include/i486-linux-gnu/64"};
   const StringRef X86MultiarchIncludeDirs[] = {
       "/usr/include/i386-linux-gnu",
 
       // FIXME: These are older forms of multiarch. It's not clear that they're
       // in use in any released version of Debian, so we should consider
       // removing them.
-      "/usr/include/x86_64-linux-gnu/32", "/usr/include/i686-linux-gnu",
+      "/usr/include/x86_64-linux-gnu/32",
+      "/usr/include/i686-linux-gnu",
       "/usr/include/i486-linux-gnu"};
   const StringRef AArch64MultiarchIncludeDirs[] = {
       "/usr/include/aarch64-linux-gnu"};
   const StringRef ARMMultiarchIncludeDirs[] = {
       "/usr/include/arm-linux-gnueabi"};
   const StringRef ARMHFMultiarchIncludeDirs[] = {
       "/usr/include/arm-linux-gnueabihf"};
   const StringRef ARMEBMultiarchIncludeDirs[] = {
       "/usr/include/armeb-linux-gnueabi"};
   const StringRef ARMEBHFMultiarchIncludeDirs[] = {
       "/usr/include/armeb-linux-gnueabihf"};
-  const StringRef MIPSMultiarchIncludeDirs[] = {"/usr/include/mips-linux-gnu"};
+  const StringRef MIPSMultiarchIncludeDirs[] = {
+      "/usr/include/mips-linux-gnu"};
   const StringRef MIPSELMultiarchIncludeDirs[] = {
       "/usr/include/mipsel-linux-gnu"};
   const StringRef MIPS64MultiarchIncludeDirs[] = {
-      "/usr/include/mips64-linux-gnu", "/usr/include/mips64-linux-gnuabi64"};
+      "/usr/include/mips64-linux-gnu",
+      "/usr/include/mips64-linux-gnuabi64"};
   const StringRef MIPS64ELMultiarchIncludeDirs[] = {
       "/usr/include/mips64el-linux-gnu",
       "/usr/include/mips64el-linux-gnuabi64"};
   const StringRef PPCMultiarchIncludeDirs[] = {
       "/usr/include/powerpc-linux-gnu",
       "/usr/include/powerpc-linux-gnuspe"};
   const StringRef PPC64MultiarchIncludeDirs[] = {
       "/usr/include/powerpc64-linux-gnu"};
   const StringRef PPC64LEMultiarchIncludeDirs[] = {
       "/usr/include/powerpc64le-linux-gnu"};
   const StringRef SparcMultiarchIncludeDirs[] = {
       "/usr/include/sparc-linux-gnu"};
   const StringRef Sparc64MultiarchIncludeDirs[] = {
       "/usr/include/sparc64-linux-gnu"};
   const StringRef SYSTEMZMultiarchIncludeDirs[] = {
       "/usr/include/s390x-linux-gnu"};
   ArrayRef<StringRef> MultiarchIncludeDirs;
   switch (getTriple().getArch()) {
+  default:
+    break;
   case llvm::Triple::x86_64:
     MultiarchIncludeDirs = X86_64MultiarchIncludeDirs;
     break;
   case llvm::Triple::x86:
     MultiarchIncludeDirs = X86MultiarchIncludeDirs;
     break;
   case llvm::Triple::aarch64:
   case llvm::Triple::aarch64_be:
case llvm::Triple::sparc:
     MultiarchIncludeDirs = SparcMultiarchIncludeDirs;
     break;
   case llvm::Triple::sparcv9:
     MultiarchIncludeDirs = Sparc64MultiarchIncludeDirs;
     break;
   case llvm::Triple::systemz:
     MultiarchIncludeDirs = SYSTEMZMultiarchIncludeDirs;
     break;
-  default:
-    break;
   }
 
   const std::string AndroidMultiarchIncludeDir =
       std::string("/usr/include/") +
       getMultiarchTriple(D, getTriple(), SysRoot);
   const StringRef AndroidMultiarchIncludeDirs[] = {AndroidMultiarchIncludeDir};
   if (getTriple().isAndroid())
     MultiarchIncludeDirs = AndroidMultiarchIncludeDirs;