Skip to content

[Driver] Group together linker options using addAllArgs #68349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 12, 2023

Conversation

brad0
Copy link
Contributor

@brad0 brad0 commented Oct 5, 2023

No description provided.

@llvmbot llvmbot added clang Clang issues not falling into any other category backend:RISC-V clang:driver 'clang' and 'clang++' user-facing binaries. Not 'clang-cl' labels Oct 5, 2023
@github-actions
Copy link

github-actions bot commented Oct 5, 2023

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command:
git-clang-format --diff 1379a7286e156af2d96cb0f3d8aa8e5c7f56bccd c01c08f813264327f1c641b4aa49ea7a20dd45cd -- clang/lib/Driver/ToolChains/FreeBSD.cpp clang/lib/Driver/ToolChains/Fuchsia.cpp clang/lib/Driver/ToolChains/Gnu.cpp clang/lib/Driver/ToolChains/NaCl.cpp clang/lib/Driver/ToolChains/NetBSD.cpp clang/lib/Driver/ToolChains/PS4CPU.cpp clang/lib/Driver/ToolChains/RISCVToolchain.cpp clang/lib/Driver/ToolChains/WebAssembly.cpp clang/lib/Driver/ToolChains/ZOS.cpp
View the diff from clang-format here.
diff --git a/clang/lib/Driver/ToolChains/PS4CPU.cpp b/clang/lib/Driver/ToolChains/PS4CPU.cpp
index 5fd82d1da199..4efd14a16e93 100644
--- a/clang/lib/Driver/ToolChains/PS4CPU.cpp
+++ b/clang/lib/Driver/ToolChains/PS4CPU.cpp
@@ -208,9 +208,8 @@ void tools::PScpu::Linker::ConstructJob(Compilation &C, const JobAction &JA,
       CmdArgs.push_back("--lto=full");
   }
 
-  Args.addAllArgs(CmdArgs,
-                  {options::OPT_L, options::OPT_T_Group, options::OPT_s,
-                   options::OPT_t, options::OPT_r});
+  Args.addAllArgs(CmdArgs, {options::OPT_L, options::OPT_T_Group,
+                            options::OPT_s, options::OPT_t, options::OPT_r});
 
   if (Args.hasArg(options::OPT_Z_Xlinker__no_demangle))
     CmdArgs.push_back("--no-demangle");

@brad0 brad0 force-pushed the clang_driver_addallargs branch 3 times, most recently from 74ad5f7 to c4a8693 Compare October 5, 2023 20:56
@brad0 brad0 requested a review from MaskRay October 5, 2023 21:20
@brad0 brad0 force-pushed the clang_driver_addallargs branch from c4a8693 to c333fbe Compare October 5, 2023 22:51
@MaskRay
Copy link
Member

MaskRay commented Oct 11, 2023

Replace with AddAllArgs with addAllArgs while you are changing these lines. Most *Arg options actually use the proper lower-case but some Add* ones are weird...

@brad0 brad0 force-pushed the clang_driver_addallargs branch from c333fbe to c01c08f Compare October 12, 2023 03:40
@brad0 brad0 changed the title [Driver] Group together usage of AddAllArgs [Driver] Group together linker options using addAllArgs Oct 12, 2023
@brad0 brad0 merged commit 894927b into llvm:main Oct 12, 2023
@brad0 brad0 deleted the clang_driver_addallargs branch October 12, 2023 04:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backend:RISC-V clang:driver 'clang' and 'clang++' user-facing binaries. Not 'clang-cl' clang Clang issues not falling into any other category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants