--- a/lib/Basic/Targets/PPC.h
+++ b/lib/Basic/Targets/PPC.h
@@ -408,11 +408,10 @@
       SuitableAlign = 64;
     } else if ((Triple.getArch() == llvm::Triple::ppc64le)) {
       resetDataLayout("e-m:e-i64:64-n32:64");
-      ABI = "elfv2";
     } else {
       resetDataLayout("E-m:e-i64:64-n32:64");
-      ABI = "elfv1";
     }
+    ABI = "elfv2";

     if (Triple.isOSFreeBSD() || Triple.isOSOpenBSD() ||
         Triple.getOS() == llvm::Triple::AIX || Triple.isMusl()) {
--- a/lib/Driver/ToolChains/Clang.cpp
+++ b/lib/Driver/ToolChains/Clang.cpp
@@ -1883,11 +1883,7 @@
         ABIName = "elfv1-qpx";
         break;
       }
-      if ((T.isOSFreeBSD() && T.getOSMajorVersion() >= 13) ||
-          T.isOSOpenBSD() || T.isMusl())
-        ABIName = "elfv2";
-      else
-        ABIName = "elfv1";
+      ABIName = "elfv2";
       break;
     }
     case llvm::Triple::ppc64le: