From 8222dbeee792e26a8626faab10bb4a36318839ba Mon Sep 17 00:00:00 2001
From: John Dallaway <john@dallaway.org.uk>
Date: Thu, 7 Mar 2024 19:38:04 +0000
Subject: [PATCH] Add GNU assembler debug level option to MBS

---
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../plugin.xml                                | 46 +++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF
index 20b5c7faba7..3f4d598e9f6 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.gnu.ui; singleton:=true
-Bundle-Version: 8.7.0.qualifier
+Bundle-Version: 8.7.100.qualifier
 Bundle-Activator: org.eclipse.cdt.managedbuilder.gnu.ui.GnuUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
index 370c137b232..09da182e7df 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
+<!--
+Copyright (c) 2005, 2024 Intel Corporation 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:
+    Intel Corporation - initial API and implementation
+    John Dallaway - add assembler debug level option (#727)
+-->
 <plugin>
 
     
@@ -576,6 +589,39 @@
                name="%OptionCategory.General"
                id="gnu.asm.category.general">
          </optionCategory>
+         <option
+               category="gnu.asm.category.general"
+               id="gnu.asm.option.debugging.level"
+               name="%Option.Posix.DebugLevel"
+               valueType="enumerated">
+            <enumeratedOptionValue
+                  name="%Option.Posix.Debug.None"
+                  id="gnu.asm.debugging.level.none"
+                  isDefault="true"/>
+            <enumeratedOptionValue
+                  command="-g"
+                  name="%Option.Posix.Debug.Def"
+                  id="gnu.asm.debugging.level.default"
+                  isDefault="false"/>
+            <enablement 
+                  attribute="defaultValue"
+                  extensionAdjustment="false"
+                  type="CONTAINER_ATTRIBUTE"
+                  value="gnu.asm.debugging.level.none">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildType"
+                     value="org.eclipse.cdt.build.core.buildType.release"/>
+            </enablement>
+            <enablement 
+                  attribute="defaultValue"
+                  extensionAdjustment="false"
+                  type="CONTAINER_ATTRIBUTE"
+                  value="gnu.asm.debugging.level.default">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildType"
+                     value="org.eclipse.cdt.build.core.buildType.debug"/>
+            </enablement>
+         </option>
          <option
                name="%Option.Gnu.Assembler.Flags"
                category="gnu.asm.category.general"