[PATCH] D106688: [AIX] Pass the -b option to linker on AIX
thakis added a comment. This seems to break tests everywhere, see e.g. https://lab.llvm.org/buildbot/#/builders/109/builds/19680 PTAL. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D106688/new/ https://reviews.llvm.org/D106688 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D106688: [AIX] Pass the -b option to linker on AIX
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG109954410c34: [AIX] Pass the -b option to linker on AIX
(authored by anjankgk).
Changed prior to commit:
https://reviews.llvm.org/D106688?vs=362622=362828#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D106688/new/
https://reviews.llvm.org/D106688
Files:
clang/include/clang/Driver/Options.td
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
@@ -11,10 +11,20 @@
// RUN: -e _start -T a.lds -Xlinker one -Xlinker --no-demangle \
// RUN: -Wl,two,--no-demangle,three -Xlinker four -z five -r %s 2> %t
// RUN: FileCheck -check-prefix=LINUX < %t %s
-//
+
+// RUN: %clang -target powerpc-unknown-aix -### \
+// RUN: -b one %s 2> %t
+// RUN: FileCheck -check-prefix=AIX < %t %s
+
+// RUN: %clang -target powerpc-unknown-linux -### \
+// RUN: -b one %s 2> %t
+// RUN: FileCheck -check-prefix=NOT-AIX < %t %s
+
// 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"
+// NOT-AIX: error: unsupported option '-b one'
// Check that we forward '-Xlinker' and '-Wl,' on Windows.
// RUN: %clang -target i686-pc-win32 -fuse-ld=link -### \
Index: clang/lib/Driver/ToolChains/CommonArgs.cpp
===
--- clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -257,6 +257,16 @@
// Otherwise, this is a linker input argument.
const Arg = II.getInputArg();
+if (A.getOption().matches(options::OPT_b)) {
+ const llvm::Triple = TC.getTriple();
+ if (!T.isOSAIX()) {
+TC.getDriver().Diag(diag::err_drv_unsupported_opt_for_target)
+<< A.getAsString(Args);
+ }
+ // 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);
Index: clang/include/clang/Driver/Options.td
===
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -815,7 +815,9 @@
def bind__at__load : Flag<["-"], "bind_at_load">;
def bundle__loader : Separate<["-"], "bundle_loader">;
def bundle : Flag<["-"], "bundle">;
-def b : JoinedOrSeparate<["-"], "b">, Flags<[Unsupported]>;
+def b : JoinedOrSeparate<["-"], "b">, Flags<[LinkerInput, RenderAsInput]>,
+ HelpText<"Pass -b to the linker on AIX (only).">, MetaVarName<"">,
+ Group;
def cl_opt_disable : Flag<["-"], "cl-opt-disable">, Group,
Flags<[CC1Option]>,
HelpText<"OpenCL only. This option disables all optimizations. By default
optimizations are enabled.">;
def cl_strict_aliasing : Flag<["-"], "cl-strict-aliasing">,
Group, Flags<[CC1Option]>,
Index: clang/test/Driver/Xlinker-args.c
===
--- clang/test/Driver/Xlinker-args.c
+++ clang/test/Driver/Xlinker-args.c
@@ -11,10 +11,20 @@
// RUN: -e _start -T a.lds -Xlinker one -Xlinker --no-demangle \
// RUN: -Wl,two,--no-demangle,three -Xlinker four -z five -r %s 2> %t
// RUN: FileCheck -check-prefix=LINUX < %t %s
-//
+
+// RUN: %clang -target powerpc-unknown-aix -### \
+// RUN: -b one %s 2> %t
+// RUN: FileCheck -check-prefix=AIX < %t %s
+
+// RUN: %clang -target powerpc-unknown-linux -### \
+// RUN: -b one %s 2> %t
+// RUN: FileCheck -check-prefix=NOT-AIX < %t %s
+
// 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"
+// NOT-AIX: error: unsupported option '-b one'
// Check that we forward '-Xlinker' and '-Wl,' on Windows.
// RUN: %clang -target i686-pc-win32 -fuse-ld=link -### \
Index: clang/lib/Driver/ToolChains/CommonArgs.cpp
===
--- clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -257,6 +257,16 @@
// Otherwise, this is a linker input argument.
const Arg = II.getInputArg();
+if (A.getOption().matches(options::OPT_b)) {
+ const llvm::Triple = TC.getTriple();
+ if (!T.isOSAIX()) {
+TC.getDriver().Diag(diag::err_drv_unsupported_opt_for_target)
+<< A.getAsString(Args);
+ }
+ // Pass -b prefix for AIX linker.
+ A.claim();
+ A.render(Args, CmdArgs);
+}
// Handle
[PATCH] D106688: [AIX] Pass the -b option to linker on AIX
anjankgk updated this revision to Diff 362622.
anjankgk marked an inline comment as done.
anjankgk added a comment.
Change the error msg to include target information.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D106688/new/
https://reviews.llvm.org/D106688
Files:
clang/include/clang/Driver/Options.td
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
@@ -11,10 +11,20 @@
// RUN: -e _start -T a.lds -Xlinker one -Xlinker --no-demangle \
// RUN: -Wl,two,--no-demangle,three -Xlinker four -z five -r %s 2> %t
// RUN: FileCheck -check-prefix=LINUX < %t %s
-//
+
+// RUN: %clang -target powerpc-unknown-aix -### \
+// RUN: -b one %s 2> %t
+// RUN: FileCheck -check-prefix=AIX < %t %s
+
+// RUN: %clang -target powerpc-unknown-linux -### \
+// RUN: -b one %s 2> %t
+// RUN: FileCheck -check-prefix=NOT-AIX < %t %s
+
// 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"
+// NOT-AIX: error: unsupported option '-b one'
// Check that we forward '-Xlinker' and '-Wl,' on Windows.
// RUN: %clang -target i686-pc-win32 -fuse-ld=link -### \
Index: clang/lib/Driver/ToolChains/CommonArgs.cpp
===
--- clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -257,6 +257,17 @@
// Otherwise, this is a linker input argument.
const Arg = II.getInputArg();
+if (A.getOption().matches(options::OPT_b)) {
+ const llvm::Triple = TC.getTriple();
+ if (!T.isOSAIX()) {
+TC.getDriver().Diag(diag::err_drv_unsupported_opt_for_target)
+<< A.getAsString(Args);
+ }
+ // 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);
Index: clang/include/clang/Driver/Options.td
===
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -815,7 +815,9 @@
def bind__at__load : Flag<["-"], "bind_at_load">;
def bundle__loader : Separate<["-"], "bundle_loader">;
def bundle : Flag<["-"], "bundle">;
-def b : JoinedOrSeparate<["-"], "b">, Flags<[Unsupported]>;
+def b : JoinedOrSeparate<["-"], "b">, Flags<[LinkerInput, RenderAsInput]>,
+ HelpText<"Pass -b to the linker on AIX (only).">, MetaVarName<"">,
+ Group;
def cl_opt_disable : Flag<["-"], "cl-opt-disable">, Group,
Flags<[CC1Option]>,
HelpText<"OpenCL only. This option disables all optimizations. By default
optimizations are enabled.">;
def cl_strict_aliasing : Flag<["-"], "cl-strict-aliasing">,
Group, Flags<[CC1Option]>,
Index: clang/test/Driver/Xlinker-args.c
===
--- clang/test/Driver/Xlinker-args.c
+++ clang/test/Driver/Xlinker-args.c
@@ -11,10 +11,20 @@
// RUN: -e _start -T a.lds -Xlinker one -Xlinker --no-demangle \
// RUN: -Wl,two,--no-demangle,three -Xlinker four -z five -r %s 2> %t
// RUN: FileCheck -check-prefix=LINUX < %t %s
-//
+
+// RUN: %clang -target powerpc-unknown-aix -### \
+// RUN: -b one %s 2> %t
+// RUN: FileCheck -check-prefix=AIX < %t %s
+
+// RUN: %clang -target powerpc-unknown-linux -### \
+// RUN: -b one %s 2> %t
+// RUN: FileCheck -check-prefix=NOT-AIX < %t %s
+
// 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"
+// NOT-AIX: error: unsupported option '-b one'
// Check that we forward '-Xlinker' and '-Wl,' on Windows.
// RUN: %clang -target i686-pc-win32 -fuse-ld=link -### \
Index: clang/lib/Driver/ToolChains/CommonArgs.cpp
===
--- clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -257,6 +257,17 @@
// Otherwise, this is a linker input argument.
const Arg = II.getInputArg();
+if (A.getOption().matches(options::OPT_b)) {
+ const llvm::Triple = TC.getTriple();
+ if (!T.isOSAIX()) {
+TC.getDriver().Diag(diag::err_drv_unsupported_opt_for_target)
+<< A.getAsString(Args);
+ }
+ // 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);
Index:
[PATCH] D106688: [AIX] Pass the -b option to linker on AIX
anjankgk marked an inline comment as done.
anjankgk added inline comments.
Comment at: clang/lib/Driver/ToolChains/CommonArgs.cpp:263
+ if (!T.isOSAIX()) {
+TC.getDriver().Diag(diag::err_drv_unsupported_opt)
+<< A.getAsString(Args);
ZarkoCA wrote:
> anjankgk wrote:
> > ZarkoCA wrote:
> > > nit, I prefer this error message but it's up to you.
> > I intentionally chose that error msg (without target mention) since that's
> > the one the original option threw (existing '-b' option which was defined
> > as unsupported for all the platforms).
> I see, that makes sense.
>
> But now with your patch this option is supported even if only for the AIX
> target. So we could make the case to use the suggested error message. That
> said, I am still fine with what you choose.
I actually agree on your point. So, eventhough my intention was to leave the
behavior on other (non-AIX) platforms unaffected, the change causes the
behavior of the option to be more target-specific - since it's now
valid/supported option on AIX. So, I am going to change this error message as
suggested. Thanks!
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D106688/new/
https://reviews.llvm.org/D106688
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D106688: [AIX] Pass the -b option to linker on AIX
ZarkoCA added inline comments.
Comment at: clang/lib/Driver/ToolChains/CommonArgs.cpp:263
+ if (!T.isOSAIX()) {
+TC.getDriver().Diag(diag::err_drv_unsupported_opt)
+<< A.getAsString(Args);
anjankgk wrote:
> ZarkoCA wrote:
> > nit, I prefer this error message but it's up to you.
> I intentionally chose that error msg (without target mention) since that's
> the one the original option threw (existing '-b' option which was defined as
> unsupported for all the platforms).
I see, that makes sense.
But now with your patch this option is supported even if only for the AIX
target. So we could make the case to use the suggested error message. That
said, I am still fine with what you choose.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D106688/new/
https://reviews.llvm.org/D106688
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D106688: [AIX] Pass the -b option to linker on AIX
anjankgk added a comment.
Thank you reviewing Zarko!
Comment at: clang/lib/Driver/ToolChains/CommonArgs.cpp:263
+ if (!T.isOSAIX()) {
+TC.getDriver().Diag(diag::err_drv_unsupported_opt)
+<< A.getAsString(Args);
ZarkoCA wrote:
> nit, I prefer this error message but it's up to you.
I intentionally chose that error msg (without target mention) since that's the
one the original option threw (existing '-b' option which was defined as
unsupported for all the platforms).
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D106688/new/
https://reviews.llvm.org/D106688
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D106688: [AIX] Pass the -b option to linker on AIX
ZarkoCA accepted this revision.
ZarkoCA added a comment.
This revision is now accepted and ready to land.
LGTM with small nit, thanks.
Comment at: clang/lib/Driver/ToolChains/CommonArgs.cpp:263
+ if (!T.isOSAIX()) {
+TC.getDriver().Diag(diag::err_drv_unsupported_opt)
+<< A.getAsString(Args);
nit, I prefer this error message but it's up to you.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D106688/new/
https://reviews.llvm.org/D106688
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D106688: [AIX] Pass the -b option to linker on AIX
anjankgk marked an inline comment as done. anjankgk added inline comments. Comment at: clang/test/Driver/Xlinker-args.c:15-16 + +// RUN: %clang -target powerpc-unknown-aix -### \ +// RUN: -b one %s 2> %t +// RUN: FileCheck -check-prefix=AIX < %t %s ZarkoCA wrote: > Does this mean that we need space between `-b` and the linker option when > using clang normally? Or this an artifact of the way we need to write tests? Yes, since the option is defined as "JoinedOrSeparate" in the td file it wouldn't actually need the space. CHANGES SINCE LAST ACTION https://reviews.llvm.org/D106688/new/ https://reviews.llvm.org/D106688 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D106688: [AIX] Pass the -b option to linker on AIX
anjankgk updated this revision to Diff 362412.
anjankgk added a comment.
Addressed review comments
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D106688/new/
https://reviews.llvm.org/D106688
Files:
clang/include/clang/Driver/Options.td
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
@@ -11,10 +11,20 @@
// RUN: -e _start -T a.lds -Xlinker one -Xlinker --no-demangle \
// RUN: -Wl,two,--no-demangle,three -Xlinker four -z five -r %s 2> %t
// RUN: FileCheck -check-prefix=LINUX < %t %s
-//
+
+// RUN: %clang -target powerpc-unknown-aix -### \
+// RUN: -b one %s 2> %t
+// RUN: FileCheck -check-prefix=AIX < %t %s
+
+// RUN: %clang -target powerpc-unknown-linux -### \
+// RUN: -b one %s 2> %t
+// RUN: FileCheck -check-prefix=NOT-AIX < %t %s
+
// 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"
+// NOT-AIX: error: unsupported option '-b one'
// Check that we forward '-Xlinker' and '-Wl,' on Windows.
// RUN: %clang -target i686-pc-win32 -fuse-ld=link -### \
Index: clang/lib/Driver/ToolChains/CommonArgs.cpp
===
--- clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -257,6 +257,17 @@
// Otherwise, this is a linker input argument.
const Arg = II.getInputArg();
+if (A.getOption().matches(options::OPT_b)) {
+ const llvm::Triple = TC.getTriple();
+ if (!T.isOSAIX()) {
+TC.getDriver().Diag(diag::err_drv_unsupported_opt)
+<< A.getAsString(Args);
+ }
+ // 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);
Index: clang/include/clang/Driver/Options.td
===
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -815,7 +815,9 @@
def bind__at__load : Flag<["-"], "bind_at_load">;
def bundle__loader : Separate<["-"], "bundle_loader">;
def bundle : Flag<["-"], "bundle">;
-def b : JoinedOrSeparate<["-"], "b">, Flags<[Unsupported]>;
+def b : JoinedOrSeparate<["-"], "b">, Flags<[LinkerInput, RenderAsInput]>,
+ HelpText<"Pass -b to the linker on AIX (only).">, MetaVarName<"">,
+ Group;
def cl_opt_disable : Flag<["-"], "cl-opt-disable">, Group,
Flags<[CC1Option]>,
HelpText<"OpenCL only. This option disables all optimizations. By default
optimizations are enabled.">;
def cl_strict_aliasing : Flag<["-"], "cl-strict-aliasing">,
Group, Flags<[CC1Option]>,
Index: clang/test/Driver/Xlinker-args.c
===
--- clang/test/Driver/Xlinker-args.c
+++ clang/test/Driver/Xlinker-args.c
@@ -11,10 +11,20 @@
// RUN: -e _start -T a.lds -Xlinker one -Xlinker --no-demangle \
// RUN: -Wl,two,--no-demangle,three -Xlinker four -z five -r %s 2> %t
// RUN: FileCheck -check-prefix=LINUX < %t %s
-//
+
+// RUN: %clang -target powerpc-unknown-aix -### \
+// RUN: -b one %s 2> %t
+// RUN: FileCheck -check-prefix=AIX < %t %s
+
+// RUN: %clang -target powerpc-unknown-linux -### \
+// RUN: -b one %s 2> %t
+// RUN: FileCheck -check-prefix=NOT-AIX < %t %s
+
// 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"
+// NOT-AIX: error: unsupported option '-b one'
// Check that we forward '-Xlinker' and '-Wl,' on Windows.
// RUN: %clang -target i686-pc-win32 -fuse-ld=link -### \
Index: clang/lib/Driver/ToolChains/CommonArgs.cpp
===
--- clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -257,6 +257,17 @@
// Otherwise, this is a linker input argument.
const Arg = II.getInputArg();
+if (A.getOption().matches(options::OPT_b)) {
+ const llvm::Triple = TC.getTriple();
+ if (!T.isOSAIX()) {
+TC.getDriver().Diag(diag::err_drv_unsupported_opt)
+<< A.getAsString(Args);
+ }
+ // 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);
Index: clang/include/clang/Driver/Options.td
===
---
[PATCH] D106688: [AIX] Pass the -b option to linker on AIX
ZarkoCA added inline comments.
Comment at: clang/lib/Driver/ToolChains/CommonArgs.cpp:262-269
+ if (T.isOSAIX()) {
+// Pass -b prefix for AIX linker.
+A.claim();
+A.render(Args, CmdArgs);
+continue;
+ } else {
+TC.getDriver().Diag(diag::err_drv_unsupported_opt)
Can this be reversed so the error check is first for `(!T.isOSAIX())` instead?
Then you don't need the `else`.
Comment at: clang/test/Driver/Xlinker-args.c:15-16
+
+// RUN: %clang -target powerpc-unknown-aix -### \
+// RUN: -b one %s 2> %t
+// RUN: FileCheck -check-prefix=AIX < %t %s
Does this mean that we need space between `-b` and the linker option when using
clang normally? Or this an artifact of the way we need to write tests?
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D106688/new/
https://reviews.llvm.org/D106688
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D106688: [AIX] Pass the -b option to linker on AIX
anjankgk added a comment. Gentle ping.. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D106688/new/ https://reviews.llvm.org/D106688 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D106688: [AIX] Pass the -b option to linker on AIX
anjankgk created this revision.
anjankgk added reviewers: hubert.reinterpretcast, cebowleratibm, Whitney.
Herald added a subscriber: dang.
anjankgk requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
We want to parse the -b option in the driver and pass it to the linker if the
target OS is AIX. This will establish compatibility with the other AIX
compilers.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D106688
Files:
clang/include/clang/Driver/Options.td
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
@@ -11,10 +11,20 @@
// RUN: -e _start -T a.lds -Xlinker one -Xlinker --no-demangle \
// RUN: -Wl,two,--no-demangle,three -Xlinker four -z five -r %s 2> %t
// RUN: FileCheck -check-prefix=LINUX < %t %s
-//
+
+// RUN: %clang -target powerpc-unknown-aix -### \
+// RUN: -b one %s 2> %t
+// RUN: FileCheck -check-prefix=AIX < %t %s
+
+// RUN: %clang -target powerpc-unknown-linux -### \
+// RUN: -b one %s 2> %t
+// RUN: FileCheck -check-prefix=NOT-AIX < %t %s
+
// 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"
+// NOT-AIX: error: unsupported option '-b one'
// Check that we forward '-Xlinker' and '-Wl,' on Windows.
// RUN: %clang -target i686-pc-win32 -fuse-ld=link -### \
Index: clang/lib/Driver/ToolChains/CommonArgs.cpp
===
--- clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -257,6 +257,19 @@
// Otherwise, this is a linker input argument.
const Arg = II.getInputArg();
+if (A.getOption().matches(options::OPT_b)) {
+ const llvm::Triple = TC.getTriple();
+ if (T.isOSAIX()) {
+// Pass -b prefix for AIX linker.
+A.claim();
+A.render(Args, CmdArgs);
+continue;
+ } else {
+TC.getDriver().Diag(diag::err_drv_unsupported_opt)
+<< A.getAsString(Args);
+ }
+}
+
// Handle reserved library options.
if (A.getOption().matches(options::OPT_Z_reserved_lib_stdcxx))
TC.AddCXXStdlibLibArgs(Args, CmdArgs);
Index: clang/include/clang/Driver/Options.td
===
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -815,7 +815,9 @@
def bind__at__load : Flag<["-"], "bind_at_load">;
def bundle__loader : Separate<["-"], "bundle_loader">;
def bundle : Flag<["-"], "bundle">;
-def b : JoinedOrSeparate<["-"], "b">, Flags<[Unsupported]>;
+def b : JoinedOrSeparate<["-"], "b">, Flags<[LinkerInput, RenderAsInput]>,
+ HelpText<"Pass -b to the linker on AIX (only).">, MetaVarName<"">,
+ Group;
def cl_opt_disable : Flag<["-"], "cl-opt-disable">, Group,
Flags<[CC1Option]>,
HelpText<"OpenCL only. This option disables all optimizations. By default
optimizations are enabled.">;
def cl_strict_aliasing : Flag<["-"], "cl-strict-aliasing">,
Group, Flags<[CC1Option]>,
Index: clang/test/Driver/Xlinker-args.c
===
--- clang/test/Driver/Xlinker-args.c
+++ clang/test/Driver/Xlinker-args.c
@@ -11,10 +11,20 @@
// RUN: -e _start -T a.lds -Xlinker one -Xlinker --no-demangle \
// RUN: -Wl,two,--no-demangle,three -Xlinker four -z five -r %s 2> %t
// RUN: FileCheck -check-prefix=LINUX < %t %s
-//
+
+// RUN: %clang -target powerpc-unknown-aix -### \
+// RUN: -b one %s 2> %t
+// RUN: FileCheck -check-prefix=AIX < %t %s
+
+// RUN: %clang -target powerpc-unknown-linux -### \
+// RUN: -b one %s 2> %t
+// RUN: FileCheck -check-prefix=NOT-AIX < %t %s
+
// 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"
+// NOT-AIX: error: unsupported option '-b one'
// Check that we forward '-Xlinker' and '-Wl,' on Windows.
// RUN: %clang -target i686-pc-win32 -fuse-ld=link -### \
Index: clang/lib/Driver/ToolChains/CommonArgs.cpp
===
--- clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -257,6 +257,19 @@
// Otherwise, this is a linker input argument.
const Arg = II.getInputArg();
+if (A.getOption().matches(options::OPT_b)) {
+ const llvm::Triple = TC.getTriple();
+ if (T.isOSAIX()) {
+// Pass -b prefix for AIX linker.
+A.claim();
+A.render(Args, CmdArgs);
+continue;
+ } else {
+
