- "i686-pld-linux", "i586-pld-linux", "i486-pld-linux", "i386-pld-linux", "athlon-pld-linux",
-@@ -1407,15 +1407,19 @@
- }
- break;
- case llvm::Triple::x86_64:
-- LibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));
-- TripleAliases.append(begin(X86_64Triples), end(X86_64Triples));
-- // x32 is always available when x86_64 is available, so adding it as
-- // secondary arch with x86_64 triples
- if (TargetTriple.getEnvironment() == llvm::Triple::GNUX32) {
-- BiarchLibDirs.append(begin(X32LibDirs), end(X32LibDirs));
-+ LibDirs.append(begin(X32LibDirs), end(X32LibDirs));
-+ TripleAliases.append(begin(X32Triples), end(X32Triples));
-+ BiarchLibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));
+@@ -2352,12 +2353,16 @@
+ LibDirs.append(begin(X32LibDirs), end(X32LibDirs));
+ TripleAliases.append(begin(X32Triples), end(X32Triples));
+ BiarchLibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));