diff --git a/clang/lib/Driver/ToolChains/AIX.cpp b/clang/lib/Driver/ToolChains/AIX.cpp
--- a/clang/lib/Driver/ToolChains/AIX.cpp
+++ b/clang/lib/Driver/ToolChains/AIX.cpp
@@ -164,11 +164,12 @@
   }
 
   auto getCrt0Basename = [&Args, IsArch32Bit] {
+    Arg *A = Args.getLastArgNoClaim(options::OPT_p, options::OPT_pg);
     // Enable gprofiling when "-pg" is specified.
-    if (Args.hasArg(options::OPT_pg))
+    if (A->getOption().matches(options::OPT_pg))
       return IsArch32Bit ? "gcrt0.o" : "gcrt0_64.o";
     // Enable profiling when "-p" is specified.
-    else if (Args.hasArg(options::OPT_p))
+    else if (A->getOption().matches(options::OPT_p))
       return IsArch32Bit ? "mcrt0.o" : "mcrt0_64.o";
     else
       return IsArch32Bit ? "crt0.o" : "crt0_64.o";
@@ -271,7 +272,7 @@
 
     CmdArgs.push_back("-lc");
 
-    if (Args.hasArg(options::OPT_p, options::OPT_pg)) {
+    if (Args.hasArgNoClaim(options::OPT_p, options::OPT_pg)) {
       CmdArgs.push_back(Args.MakeArgString((llvm::Twine("-L") + D.SysRoot) +
                                            "/lib/profiled"));
       CmdArgs.push_back(Args.MakeArgString((llvm::Twine("-L") + D.SysRoot) +
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
--- a/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -6323,21 +6323,28 @@
         D.Diag(diag::err_drv_unsupported_opt_for_target)
             << A->getAsString(Args) << TripleStr;
     }
-  }
-  if (Arg *A = Args.getLastArgNoClaim(options::OPT_p)) {
-    if (TC.getTriple().isOSAIX()) {
-      CmdArgs.push_back("-pg");
-    } else if (!TC.getTriple().isOSOpenBSD()) {
-      D.Diag(diag::err_drv_unsupported_opt_for_target)
-          << A->getAsString(Args) << TripleStr;
+
+    if (Arg *A = Args.getLastArgNoClaim(options::OPT_pg)) {
+      if (TC.getTriple().isOSzOS()) {
+        D.Diag(diag::err_drv_unsupported_opt_for_target)
+            << A->getAsString(Args) << TripleStr;
+      }
     }
-  }
-  if (Arg *A = Args.getLastArgNoClaim(options::OPT_pg)) {
-    if (TC.getTriple().isOSzOS()) {
-      D.Diag(diag::err_drv_unsupported_opt_for_target)
-          << A->getAsString(Args) << TripleStr;
+    if (Arg *A = Args.getLastArgNoClaim(options::OPT_p)) {
+      if (!(TC.getTriple().isOSAIX() || TC.getTriple().isOSOpenBSD())) {
+        D.Diag(diag::err_drv_unsupported_opt_for_target)
+            << A->getAsString(Args) << TripleStr;
+      }
+    }
+    if (Arg *A = Args.getLastArgNoClaim(options::OPT_p, options::OPT_pg)) {
+      if (A->getOption().matches(options::OPT_p)) {
+        A->claim();
+        if (TC.getTriple().isOSAIX()) {
+          if (!Args.hasArgNoClaim(options::OPT_pg))
+            CmdArgs.push_back("-pg");
+        }
+      }
     }
-  }
 
   if (Args.getLastArg(options::OPT_fapple_kext) ||
       (Args.hasArg(options::OPT_mkernel) && types::isCXX(InputType)))
diff --git a/clang/test/Driver/ibm-profiling.c b/clang/test/Driver/ibm-profiling.c
new file mode 100644
--- /dev/null
+++ b/clang/test/Driver/ibm-profiling.c
@@ -0,0 +1,44 @@
+// RUN: %clang -### 2>&1 \
+// RUN:        --target=s390x-none-zos \
+// RUN:        -S \
+// RUN:        -pg \
+// RUN:        %s \
+// RUN:        | FileCheck -check-prefix=FAIL-PG-NAME %s
+// FAIL-PG-NAME: error: unsupported option '-pg' for target 's390x-none-zos'
+
+// Check precedence: -pg is unused when passed first.
+// RUN: %clang -### 2>&1 \
+// RUN:        --target=powerpc-ibm-aix7.1.0.0 \
+// RUN:        --sysroot %S/Inputs/aix_ppc_tree \
+// RUN:        -pg \
+// RUN:        -p \
+// RUN:        %s \
+// RUN:        | FileCheck --check-prefix=CHECK %s
+// CHECK-NOT: warning: argument unused during compilation: '-p' [-Wunused-command-line-argument]
+// CHECK:     "-isysroot" "[[SYSROOT:[^"]+]]"
+// CHECK:     "[[SYSROOT]]/usr/lib{{/|\\\\}}mcrt0.o"
+// CHECK:     "-L[[SYSROOT]]/lib/profiled"
+// CHECK:     "-L[[SYSROOT]]/usr/lib/profiled"
+
+// Check precedence: -p is unused when passed first.
+// RUN: %clang -### \
+// RUN:        --target=powerpc-ibm-aix7.1.0.0 \
+// RUN:        --sysroot %S/Inputs/aix_ppc_tree \
+// RUN:        -p \
+// RUN:        -pg \
+// RUN:        %s 2>&1 \
+// RUN:        | FileCheck --check-prefix=CHECK2 %s
+// CHECK2: warning: argument unused during compilation: '-p' [-Wunused-command-line-argument]
+// CHECK2:     "-isysroot" "[[SYSROOT:[^"]+]]"
+// CHECK2:     "[[SYSROOT]]/usr/lib{{/|\\\\}}gcrt0.o"
+// CHECK2:     "-L[[SYSROOT]]/lib/profiled"
+// CHECK2:     "-L[[SYSROOT]]/usr/lib/profiled"
+
+// Check that -p is still used when not linking on AIX.
+// RUN: %clang -### 2>&1 \
+// RUN:        --target=powerpc-ibm-aix7.1.0.0 \
+// RUN:        -p \
+// RUN:        -S \
+// RUN:        %s \
+// RUN:   | FileCheck --check-prefix=CHECK3 %s
+// CHECK3-NOT: warning: argument unused during compilation: '-p'
diff --git a/clang/test/Driver/zos-profiling-error.c b/clang/test/Driver/zos-profiling-error.c
deleted file mode 100644
--- a/clang/test/Driver/zos-profiling-error.c
+++ /dev/null
@@ -1,2 +0,0 @@
-// RUN: %clang 2>&1 -### --target=s390x-none-zos -pg -S %s | FileCheck -check-prefix=FAIL-PG-NAME %s
-// FAIL-PG-NAME: error: unsupported option '-pg' for target 's390x-none-zos'