[PATCH] D90641: [compiler-rt][AIX]: Link compiler-rt profile library when -fprofile-generate is specified

[Ettore Tiotto via Phabricator via cfe-commits]

etiotto created this revision.
etiotto added reviewers: Whitney, daltenty, hubert.reinterpretcast, 
cebowleratibm, phosek.
Herald added subscribers: cfe-commits, dberris.
Herald added a project: clang.
etiotto requested review of this revision.

This patch enhances the clang driver to link the runtime profile library on AIX 
when the -fprofile-generate option is used.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D90641

Files:
  clang/lib/Driver/ToolChains/AIX.cpp


Index: clang/lib/Driver/ToolChains/AIX.cpp
===
--- clang/lib/Driver/ToolChains/AIX.cpp
+++ clang/lib/Driver/ToolChains/AIX.cpp
@@ -151,6 +151,7 @@
   // 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);


Index: clang/lib/Driver/ToolChains/AIX.cpp
===
--- clang/lib/Driver/ToolChains/AIX.cpp
+++ clang/lib/Driver/ToolChains/AIX.cpp
@@ -151,6 +151,7 @@
   // 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);
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D107786: [AIX]: Fix option processing for -b

[Ettore Tiotto via Phabricator via cfe-commits]

etiotto created this revision.
etiotto added reviewers: ZarkoCA, hubert.reinterpretcast, Whitney, 
cebowleratibm.
etiotto added a project: LLVM.
etiotto requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.

Code added by D106688  is incorrect. It pass 
the option `-bxyz` to the system linker as `-b xyz xyz` (duplication of the 
string 'xyz' is incorrect).


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D107786

Files:
  clang/lib/Driver/ToolChains/CommonArgs.cpp


Index: clang/lib/Driver/ToolChains/CommonArgs.cpp
===
--- clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -268,7 +268,7 @@
   A.render(Args, CmdArgs);
 }
 // Handle reserved library options.
-if (A.getOption().matches(options::OPT_Z_reserved_lib_stdcxx))
+else if (A.getOption().matches(options::OPT_Z_reserved_lib_stdcxx))
   TC.AddCXXStdlibLibArgs(Args, CmdArgs);
 else if (A.getOption().matches(options::OPT_Z_reserved_lib_cckext))
   TC.AddCCKextLibArgs(Args, CmdArgs);


Index: clang/lib/Driver/ToolChains/CommonArgs.cpp
===
--- clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -268,7 +268,7 @@
   A.render(Args, CmdArgs);
 }
 // Handle reserved library options.
-if (A.getOption().matches(options::OPT_Z_reserved_lib_stdcxx))
+else if (A.getOption().matches(options::OPT_Z_reserved_lib_stdcxx))
   TC.AddCXXStdlibLibArgs(Args, CmdArgs);
 else if (A.getOption().matches(options::OPT_Z_reserved_lib_cckext))
   TC.AddCCKextLibArgs(Args, CmdArgs);
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D107786: [AIX]: Fix option processing for -b

[Ettore Tiotto via Phabricator via cfe-commits]

etiotto updated this revision to Diff 365311.
etiotto added a comment.

Adapting test for -b option processing on AIX


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D107786/new/

https://reviews.llvm.org/D107786

Files:
  clang/lib/Driver/ToolChains/CommonArgs.cpp
  clang/test/Driver/Xlinker-args.c


Index: clang/test/Driver/Xlinker-args.c
===
--- clang/test/Driver/Xlinker-args.c
+++ clang/test/Driver/Xlinker-args.c
@@ -13,7 +13,7 @@
 // RUN: FileCheck -check-prefix=LINUX < %t %s
 
 // RUN: %clang -target powerpc-unknown-aix -### \
-// RUN:   -b one %s 2> %t
+// RUN:   -b one -b two %s 2> %t
 // RUN: FileCheck -check-prefix=AIX < %t %s
 
 // RUN: %clang -target powerpc-unknown-linux -### \
@@ -23,7 +23,7 @@
 // DARWIN-NOT: --no-demangle
 // DARWIN: "one" "two" "three" "four" "-z" "five" "-r"
 // LINUX: "--no-demangle" "-e" "_start" "one" "two" "three" "four" "-z" "five" 
"-r" {{.*}} "-T" "a.lds"
-// AIX: "-b" "one" 
+// AIX: "-b" "one" "-b" "two"
 // NOT-AIX: error: unsupported option '-b' for target 'powerpc-unknown-linux'
 
 // Check that we forward '-Xlinker' and '-Wl,' on Windows.
Index: clang/lib/Driver/ToolChains/CommonArgs.cpp
===
--- clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -268,7 +268,7 @@
   A.render(Args, CmdArgs);
 }
 // Handle reserved library options.
-if (A.getOption().matches(options::OPT_Z_reserved_lib_stdcxx))
+else if (A.getOption().matches(options::OPT_Z_reserved_lib_stdcxx))
   TC.AddCXXStdlibLibArgs(Args, CmdArgs);
 else if (A.getOption().matches(options::OPT_Z_reserved_lib_cckext))
   TC.AddCCKextLibArgs(Args, CmdArgs);


Index: clang/test/Driver/Xlinker-args.c
===
--- clang/test/Driver/Xlinker-args.c
+++ clang/test/Driver/Xlinker-args.c
@@ -13,7 +13,7 @@
 // RUN: FileCheck -check-prefix=LINUX < %t %s
 
 // RUN: %clang -target powerpc-unknown-aix -### \
-// RUN:   -b one %s 2> %t
+// RUN:   -b one -b two %s 2> %t
 // RUN: FileCheck -check-prefix=AIX < %t %s
 
 // RUN: %clang -target powerpc-unknown-linux -### \
@@ -23,7 +23,7 @@
 // DARWIN-NOT: --no-demangle
 // DARWIN: "one" "two" "three" "four" "-z" "five" "-r"
 // LINUX: "--no-demangle" "-e" "_start" "one" "two" "three" "four" "-z" "five" "-r" {{.*}} "-T" "a.lds"
-// AIX: "-b" "one" 
+// AIX: "-b" "one" "-b" "two"
 // NOT-AIX: error: unsupported option '-b' for target 'powerpc-unknown-linux'
 
 // Check that we forward '-Xlinker' and '-Wl,' on Windows.
Index: clang/lib/Driver/ToolChains/CommonArgs.cpp
===
--- clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -268,7 +268,7 @@
   A.render(Args, CmdArgs);
 }
 // Handle reserved library options.
-if (A.getOption().matches(options::OPT_Z_reserved_lib_stdcxx))
+else if (A.getOption().matches(options::OPT_Z_reserved_lib_stdcxx))
   TC.AddCXXStdlibLibArgs(Args, CmdArgs);
 else if (A.getOption().matches(options::OPT_Z_reserved_lib_cckext))
   TC.AddCCKextLibArgs(Args, CmdArgs);
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D107786: [AIX]: Fix option processing for -b

[Ettore Tiotto via Phabricator via cfe-commits]

etiotto updated this revision to Diff 365312.
etiotto added a comment.

Address code review comment.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D107786/new/

https://reviews.llvm.org/D107786

Files:
  clang/lib/Driver/ToolChains/CommonArgs.cpp
  clang/test/Driver/Xlinker-args.c


Index: clang/test/Driver/Xlinker-args.c
===
--- clang/test/Driver/Xlinker-args.c
+++ clang/test/Driver/Xlinker-args.c
@@ -13,7 +13,7 @@
 // RUN: FileCheck -check-prefix=LINUX < %t %s
 
 // RUN: %clang -target powerpc-unknown-aix -### \
-// RUN:   -b one %s 2> %t
+// RUN:   -b one -b two %s 2> %t
 // RUN: FileCheck -check-prefix=AIX < %t %s
 
 // RUN: %clang -target powerpc-unknown-linux -### \
@@ -23,7 +23,7 @@
 // DARWIN-NOT: --no-demangle
 // DARWIN: "one" "two" "three" "four" "-z" "five" "-r"
 // LINUX: "--no-demangle" "-e" "_start" "one" "two" "three" "four" "-z" "five" 
"-r" {{.*}} "-T" "a.lds"
-// AIX: "-b" "one" 
+// AIX: "-b" "one" "-b" "two"
 // NOT-AIX: error: unsupported option '-b' for target 'powerpc-unknown-linux'
 
 // Check that we forward '-Xlinker' and '-Wl,' on Windows.
Index: clang/lib/Driver/ToolChains/CommonArgs.cpp
===
--- clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -257,16 +257,6 @@
 // Otherwise, this is a linker input argument.
 const Arg &A = II.getInputArg();
 
-if (A.getOption().matches(options::OPT_b)) {
-  const llvm::Triple &T = TC.getTriple();
-  if (!T.isOSAIX()) {
-TC.getDriver().Diag(diag::err_drv_unsupported_opt_for_target)
-  << A.getSpelling() << T.str();
-  }
-  // Pass -b prefix for AIX linker.
-  A.claim();
-  A.render(Args, CmdArgs);
-}
 // Handle reserved library options.
 if (A.getOption().matches(options::OPT_Z_reserved_lib_stdcxx))
   TC.AddCXXStdlibLibArgs(Args, CmdArgs);
@@ -276,6 +266,15 @@
   // Pass -z prefix for gcc linker compatibility.
   A.claim();
   A.render(Args, CmdArgs);
+} else if (A.getOption().matches(options::OPT_b)) {
+  const llvm::Triple &T = TC.getTriple();
+  if (!T.isOSAIX()) {
+TC.getDriver().Diag(diag::err_drv_unsupported_opt_for_target)
+<< A.getSpelling() << T.str();
+  }
+  // Pass -b prefix for AIX linker.
+  A.claim();
+  A.render(Args, CmdArgs);
 } else {
   A.renderAsInput(Args, CmdArgs);
 }


Index: clang/test/Driver/Xlinker-args.c
===
--- clang/test/Driver/Xlinker-args.c
+++ clang/test/Driver/Xlinker-args.c
@@ -13,7 +13,7 @@
 // RUN: FileCheck -check-prefix=LINUX < %t %s
 
 // RUN: %clang -target powerpc-unknown-aix -### \
-// RUN:   -b one %s 2> %t
+// RUN:   -b one -b two %s 2> %t
 // RUN: FileCheck -check-prefix=AIX < %t %s
 
 // RUN: %clang -target powerpc-unknown-linux -### \
@@ -23,7 +23,7 @@
 // DARWIN-NOT: --no-demangle
 // DARWIN: "one" "two" "three" "four" "-z" "five" "-r"
 // LINUX: "--no-demangle" "-e" "_start" "one" "two" "three" "four" "-z" "five" "-r" {{.*}} "-T" "a.lds"
-// AIX: "-b" "one" 
+// AIX: "-b" "one" "-b" "two"
 // NOT-AIX: error: unsupported option '-b' for target 'powerpc-unknown-linux'
 
 // Check that we forward '-Xlinker' and '-Wl,' on Windows.
Index: clang/lib/Driver/ToolChains/CommonArgs.cpp
===
--- clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -257,16 +257,6 @@
 // Otherwise, this is a linker input argument.
 const Arg &A = II.getInputArg();
 
-if (A.getOption().matches(options::OPT_b)) {
-  const llvm::Triple &T = TC.getTriple();
-  if (!T.isOSAIX()) {
-TC.getDriver().Diag(diag::err_drv_unsupported_opt_for_target)
-  << A.getSpelling() << T.str();
-  }
-  // Pass -b prefix for AIX linker.
-  A.claim();
-  A.render(Args, CmdArgs);
-}
 // Handle reserved library options.
 if (A.getOption().matches(options::OPT_Z_reserved_lib_stdcxx))
   TC.AddCXXStdlibLibArgs(Args, CmdArgs);
@@ -276,6 +266,15 @@
   // Pass -z prefix for gcc linker compatibility.
   A.claim();
   A.render(Args, CmdArgs);
+} else if (A.getOption().matches(options::OPT_b)) {
+  const llvm::Triple &T = TC.getTriple();
+  if (!T.isOSAIX()) {
+TC.getDriver().Diag(diag::err_drv_unsupported_opt_for_target)
+<< A.getSpelling() << T.str();
+  }
+  // Pass -b prefix for AIX linker.
+  A.claim();
+  A.render(Args, CmdArgs);
 } else {
   A.renderAsInput(Args, CmdArgs);
 }
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D107786: [AIX]: Fix option processing for -b

[Ettore Tiotto via Phabricator via cfe-commits]

etiotto added inline comments.



Comment at: clang/test/Driver/Xlinker-args.c:26
 // LINUX: "--no-demangle" "-e" "_start" "one" "two" "three" "four" "-z" "five" 
"-r" {{.*}} "-T" "a.lds"
-// AIX: "-b" "one" 
+// AIX: "-b" "one" "-b" "two"
 // NOT-AIX: error: unsupported option '-b' for target 'powerpc-unknown-linux'

jsji wrote:
> It would be better if we can tested mixing other options like `-z` .
I think the test is adequate as it guarantees options passed via "-b" are not 
going to be duplicated (which is the problem this PR addresses). 


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D107786/new/

https://reviews.llvm.org/D107786

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D107786: [AIX]: Fix option processing for -b

[Ettore Tiotto via Phabricator via cfe-commits]

This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG41e3ac398c3a: [AIX]: Fix option processing for -b (authored 
by etiotto).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D107786/new/

https://reviews.llvm.org/D107786

Files:
  clang/lib/Driver/ToolChains/CommonArgs.cpp
  clang/test/Driver/Xlinker-args.c


Index: clang/test/Driver/Xlinker-args.c
===
--- clang/test/Driver/Xlinker-args.c
+++ clang/test/Driver/Xlinker-args.c
@@ -13,7 +13,7 @@
 // RUN: FileCheck -check-prefix=LINUX < %t %s
 
 // RUN: %clang -target powerpc-unknown-aix -### \
-// RUN:   -b one %s 2> %t
+// RUN:   -b one -b two %s 2> %t
 // RUN: FileCheck -check-prefix=AIX < %t %s
 
 // RUN: %clang -target powerpc-unknown-linux -### \
@@ -23,7 +23,7 @@
 // DARWIN-NOT: --no-demangle
 // DARWIN: "one" "two" "three" "four" "-z" "five" "-r"
 // LINUX: "--no-demangle" "-e" "_start" "one" "two" "three" "four" "-z" "five" 
"-r" {{.*}} "-T" "a.lds"
-// AIX: "-b" "one" 
+// AIX: "-b" "one" "-b" "two"
 // NOT-AIX: error: unsupported option '-b' for target 'powerpc-unknown-linux'
 
 // Check that we forward '-Xlinker' and '-Wl,' on Windows.
Index: clang/lib/Driver/ToolChains/CommonArgs.cpp
===
--- clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -257,16 +257,6 @@
 // Otherwise, this is a linker input argument.
 const Arg &A = II.getInputArg();
 
-if (A.getOption().matches(options::OPT_b)) {
-  const llvm::Triple &T = TC.getTriple();
-  if (!T.isOSAIX()) {
-TC.getDriver().Diag(diag::err_drv_unsupported_opt_for_target)
-  << A.getSpelling() << T.str();
-  }
-  // Pass -b prefix for AIX linker.
-  A.claim();
-  A.render(Args, CmdArgs);
-}
 // Handle reserved library options.
 if (A.getOption().matches(options::OPT_Z_reserved_lib_stdcxx))
   TC.AddCXXStdlibLibArgs(Args, CmdArgs);
@@ -276,6 +266,15 @@
   // Pass -z prefix for gcc linker compatibility.
   A.claim();
   A.render(Args, CmdArgs);
+} else if (A.getOption().matches(options::OPT_b)) {
+  const llvm::Triple &T = TC.getTriple();
+  if (!T.isOSAIX()) {
+TC.getDriver().Diag(diag::err_drv_unsupported_opt_for_target)
+<< A.getSpelling() << T.str();
+  }
+  // Pass -b prefix for AIX linker.
+  A.claim();
+  A.render(Args, CmdArgs);
 } else {
   A.renderAsInput(Args, CmdArgs);
 }


Index: clang/test/Driver/Xlinker-args.c
===
--- clang/test/Driver/Xlinker-args.c
+++ clang/test/Driver/Xlinker-args.c
@@ -13,7 +13,7 @@
 // RUN: FileCheck -check-prefix=LINUX < %t %s
 
 // RUN: %clang -target powerpc-unknown-aix -### \
-// RUN:   -b one %s 2> %t
+// RUN:   -b one -b two %s 2> %t
 // RUN: FileCheck -check-prefix=AIX < %t %s
 
 // RUN: %clang -target powerpc-unknown-linux -### \
@@ -23,7 +23,7 @@
 // DARWIN-NOT: --no-demangle
 // DARWIN: "one" "two" "three" "four" "-z" "five" "-r"
 // LINUX: "--no-demangle" "-e" "_start" "one" "two" "three" "four" "-z" "five" "-r" {{.*}} "-T" "a.lds"
-// AIX: "-b" "one" 
+// AIX: "-b" "one" "-b" "two"
 // NOT-AIX: error: unsupported option '-b' for target 'powerpc-unknown-linux'
 
 // Check that we forward '-Xlinker' and '-Wl,' on Windows.
Index: clang/lib/Driver/ToolChains/CommonArgs.cpp
===
--- clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -257,16 +257,6 @@
 // Otherwise, this is a linker input argument.
 const Arg &A = II.getInputArg();
 
-if (A.getOption().matches(options::OPT_b)) {
-  const llvm::Triple &T = TC.getTriple();
-  if (!T.isOSAIX()) {
-TC.getDriver().Diag(diag::err_drv_unsupported_opt_for_target)
-  << A.getSpelling() << T.str();
-  }
-  // Pass -b prefix for AIX linker.
-  A.claim();
-  A.render(Args, CmdArgs);
-}
 // Handle reserved library options.
 if (A.getOption().matches(options::OPT_Z_reserved_lib_stdcxx))
   TC.AddCXXStdlibLibArgs(Args, CmdArgs);
@@ -276,6 +266,15 @@
   // Pass -z prefix for gcc linker compatibility.
   A.claim();
   A.render(Args, CmdArgs);
+} else if (A.getOption().matches(options::OPT_b)) {
+  const llvm::Triple &T = TC.getTriple();
+  if (!T.isOSAIX()) {
+TC.getDriver().Diag(diag::err_drv_unsupported_opt_for_target)
+<< A.getSpelling() << T.str();
+  }
+  // Pass -b prefix for AIX linker.
+  A.claim();
+  A.render(Args, CmdArgs);
 } else {
   A.renderAsInput(Args, CmdArgs);
 }
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https