From f39707a293390aac6fdb535ba826780ab3a5b0dc Mon Sep 17 00:00:00 2001
From: John Dallaway <john@dallaway.org.uk>
Date: Fri, 10 Nov 2023 18:20:38 +0000
Subject: [PATCH] Add GNU C++ linker library grouping option to MBS

---
 .../plugin.xml                                | 10 ++++++-
 .../gnu/ui/GnuCLibrariesCommandGenerator.java | 28 +++++++++++++++++++
 .../ui/GnuCppLibrariesCommandGenerator.java   | 28 +++++++++++++++++++
 .../gnu/ui/LibrariesCommandGenerator.java     | 13 +++++++--
 4 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/GnuCLibrariesCommandGenerator.java
 create mode 100644 build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/GnuCppLibrariesCommandGenerator.java

diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
index ffe0f09fbfd..ce11ac1764f 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
@@ -83,7 +83,7 @@
                name="%Option.Posix.Libs"
                category="gnu.c.link.category.libs"
                command="-l"
-               commandGenerator="org.eclipse.cdt.managedbuilder.gnu.ui.LibrariesCommandGenerator"
+               commandGenerator="org.eclipse.cdt.managedbuilder.gnu.ui.GnuCLibrariesCommandGenerator"
                id="gnu.c.link.option.libs"
                browseType="none"
                valueType="libs">
@@ -300,6 +300,7 @@
                name="%Option.Posix.Libs"
                category="gnu.cpp.link.category.libs"
                command="-l"
+               commandGenerator="org.eclipse.cdt.managedbuilder.gnu.ui.GnuCppLibrariesCommandGenerator"
                id="gnu.cpp.link.option.libs"
                browseType="none"
                valueType="libs">
@@ -312,6 +313,13 @@
                browseType="directory"
                valueType="libPaths">
          </option>
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Linker.GroupLibs"
+               category="gnu.cpp.link.category.libs"
+               id="gnu.cpp.link.option.group"
+               valueType="boolean">
+         </option>
          <optionCategory
                owner="cdt.managedbuild.tool.gnu.cpp.linker"
                name="%OptionCategory.Misc"
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/GnuCLibrariesCommandGenerator.java b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/GnuCLibrariesCommandGenerator.java
new file mode 100644
index 00000000000..f0385bc7863
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/GnuCLibrariesCommandGenerator.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2023 John Dallaway and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *    John Dallaway - initial implementation (#608)
+ *******************************************************************************/
+package org.eclipse.cdt.managedbuilder.gnu.ui;
+
+/**
+ * A libraries command generator for GNU C projects.
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ * @since 8.6
+ */
+public class GnuCLibrariesCommandGenerator extends LibrariesCommandGenerator {
+
+	public GnuCLibrariesCommandGenerator() {
+		super("gnu.c.link.option.group"); //$NON-NLS-1$
+	}
+
+}
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/GnuCppLibrariesCommandGenerator.java b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/GnuCppLibrariesCommandGenerator.java
new file mode 100644
index 00000000000..c43883e1dd8
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/GnuCppLibrariesCommandGenerator.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2023 John Dallaway and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *    John Dallaway - initial implementation (#608)
+ *******************************************************************************/
+package org.eclipse.cdt.managedbuilder.gnu.ui;
+
+/**
+ * A libraries command generator for GNU C++ projects.
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ * @since 8.6
+ */
+public class GnuCppLibrariesCommandGenerator extends LibrariesCommandGenerator {
+
+	public GnuCppLibrariesCommandGenerator() {
+		super("gnu.cpp.link.option.group"); //$NON-NLS-1$
+	}
+
+}
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/LibrariesCommandGenerator.java b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/LibrariesCommandGenerator.java
index 84e272be860..9f36d7a1366 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/LibrariesCommandGenerator.java
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/ui/LibrariesCommandGenerator.java
@@ -27,18 +27,25 @@
 
 /**
  * An option command generator to group libraries on the GNU linker command line
- * @noextend This class is not intended to be subclassed by clients.
  * @noinstantiate This class is not intended to be instantiated by clients.
  * @since 8.6
  */
 public class LibrariesCommandGenerator implements IOptionCommandGenerator {
 
 	private static final String GROUP_LIBRARIES_COMMAND_FORMAT = "-Wl,--start-group %s -Wl,--end-group"; //$NON-NLS-1$
-	private static final String GROUP_LIBRARIES_OPTION_ID = "gnu.c.link.option.group"; //$NON-NLS-1$
+
+	private final String fGroupLibrariesOptionId;
+
+	/**
+	 * @param groupLibrariesOptionId the ID of the IOption controlling library grouping
+	 */
+	protected LibrariesCommandGenerator(String groupLibrariesOptionId) {
+		fGroupLibrariesOptionId = groupLibrariesOptionId;
+	}
 
 	@Override
 	public String generateCommand(IOption option, IVariableSubstitutor macroSubstitutor) {
-		IOption groupOption = option.getOptionHolder().getOptionBySuperClassId(GROUP_LIBRARIES_OPTION_ID);
+		IOption groupOption = option.getOptionHolder().getOptionBySuperClassId(fGroupLibrariesOptionId);
 		try {
 			if ((groupOption != null) && groupOption.getBooleanValue()) { // if library grouping enabled
 				String command = option.getCommand();