[AIX][Clang] Respect -r when invoking the linker

On AIX, libraries are still being linked when `-r` is passed to the driver. This patch corrects this error.

Differential Revision: https://reviews.llvm.org/D145899

diff --git a/clang/lib/Driver/ToolChains/AIX.cpp b/clang/lib/Driver/ToolChains/AIX.cpp
index f41fb76..d4d13ce 100644 (file)
--- a/clang/lib/Driver/ToolChains/AIX.cpp
+++ b/clang/lib/Driver/ToolChains/AIX.cpp
@@ -175,7 +175,7 @@ void aix::Linker::ConstructJob(Compilation &C, const JobAction &JA,
   };
 
   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles,
-                   options::OPT_shared)) {
+                   options::OPT_shared, options::OPT_r)) {
     CmdArgs.push_back(
         Args.MakeArgString(ToolChain.GetFilePath(getCrt0Basename())));
 
@@ -235,47 +235,49 @@ void aix::Linker::ConstructJob(Compilation &C, const JobAction &JA,
   // Add directory to library search path.
   Args.AddAllArgs(CmdArgs, options::OPT_L);
   ToolChain.AddFilePathLibArgs(Args, CmdArgs);
-  ToolChain.addProfileRTLibs(Args, CmdArgs);
-
-  if (getToolChain().ShouldLinkCXXStdlib(Args))
-    getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
-
-  if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
-    AddRunTimeLibs(ToolChain, D, CmdArgs, Args);
-
-    // Add OpenMP runtime if -fopenmp is specified.
-    if (Args.hasFlag(options::OPT_fopenmp, options::OPT_fopenmp_EQ,
-                     options::OPT_fno_openmp, false)) {
-      switch (ToolChain.getDriver().getOpenMPRuntime(Args)) {
-      case Driver::OMPRT_OMP:
-        CmdArgs.push_back("-lomp");
-        break;
-      case Driver::OMPRT_IOMP5:
-        CmdArgs.push_back("-liomp5");
-        break;
-      case Driver::OMPRT_GOMP:
-        CmdArgs.push_back("-lgomp");
-        break;
-      case Driver::OMPRT_Unknown:
-        // Already diagnosed.
-        break;
+  if (!Args.hasArg(options::OPT_r)) {
+    ToolChain.addProfileRTLibs(Args, CmdArgs);
+
+    if (getToolChain().ShouldLinkCXXStdlib(Args))
+      getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
+
+    if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
+      AddRunTimeLibs(ToolChain, D, CmdArgs, Args);
+
+      // Add OpenMP runtime if -fopenmp is specified.
+      if (Args.hasFlag(options::OPT_fopenmp, options::OPT_fopenmp_EQ,
+                       options::OPT_fno_openmp, false)) {
+        switch (ToolChain.getDriver().getOpenMPRuntime(Args)) {
+        case Driver::OMPRT_OMP:
+          CmdArgs.push_back("-lomp");
+          break;
+        case Driver::OMPRT_IOMP5:
+          CmdArgs.push_back("-liomp5");
+          break;
+        case Driver::OMPRT_GOMP:
+          CmdArgs.push_back("-lgomp");
+          break;
+        case Driver::OMPRT_Unknown:
+          // Already diagnosed.
+          break;
+        }
       }
-    }
 
-    // Support POSIX threads if "-pthreads" or "-pthread" is present.
-    if (Args.hasArg(options::OPT_pthreads, options::OPT_pthread))
-      CmdArgs.push_back("-lpthreads");
+      // Support POSIX threads if "-pthreads" or "-pthread" is present.
+      if (Args.hasArg(options::OPT_pthreads, options::OPT_pthread))
+        CmdArgs.push_back("-lpthreads");
 
-    if (D.CCCIsCXX())
-      CmdArgs.push_back("-lm");
+      if (D.CCCIsCXX())
+        CmdArgs.push_back("-lm");
 
-    CmdArgs.push_back("-lc");
+      CmdArgs.push_back("-lc");
 
-    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) +
-                                           "/usr/lib/profiled"));
+      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) +
+                                             "/usr/lib/profiled"));
+      }
     }
   }
 

diff --git a/clang/test/Driver/aix-ld.c b/clang/test/Driver/aix-ld.c
index 38ac440..eb2910d 100644 (file)
--- a/clang/test/Driver/aix-ld.c
+++ b/clang/test/Driver/aix-ld.c
@@ -1077,3 +1077,22 @@
 // RUN:        -fopenmp=libfoo \
 // RUN:   | FileCheck --check-prefixes=CHECK-FOPENMP-FOO %s
 // CHECK-FOPENMP-FOO: error: unsupported argument 'libfoo' to option '-fopenmp='
+
+// Check powerpc-ibm-aix7.1.0.0. -r does not link object files or libraries
+// RUN: %clang %s 2>&1 -### \
+// RUN:        --target=powerpc-ibm-aix7.1.0.0 \
+// RUN:        --sysroot %S/Inputs/aix_ppc_tree \
+// RUN:        --unwindlib=libunwind \
+// RUN:        -L/foo/bar \
+// RUN:        -r \
+// RUN:   | FileCheck --check-prefixes=CHECK-RELOCATABLE %s
+
+// CHECK-RELOCATABLE:     "-cc1" "-triple" "powerpc-ibm-aix7.1.0.0"
+// CHECK-RELOCATABLE:     "-isysroot" "[[SYSROOT:[^"]+]]"
+// CHECK-RELOCATABLE:     "{{.*}}ld{{(.exe)?}}"
+// CHECK-RELOCATABLE:     "-r"
+// CHECK-RELOCATABLE:     "-L/foo/bar"
+// CHECK-RELOCATABLE-NOT:     "[[SYSROOT]]/usr/lib{{/|\\\\}}crt0.o"
+// CHECK-RELOCATABLE-NOT:     "[[SYSROOT]]/usr/lib{{/|\\\\}}crti.o"
+// CHECK-RELOCATABLE-NOT:     "-l{{.*}}"
+// CHECK-RELOCATABLE-NOT:     "-L{{.*}}"