diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.properties b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.properties
index 4543d815d..56207ec0c 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.properties
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.properties
@@ -111,6 +111,7 @@ option.optimization.level.most=Optimize most (-O3)
 option.optimization.level.size=Optimize size (-Os)
 option.optimization.level.fast=Optimize fast (-Ofast)
 option.optimization.level.debug=Optimize for debug (-Og)
+option.optimization.level.aggressive=Optimize aggressively for size (-Oz)
 
 optionCategory.warnings=Warnings
 
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml
index 7687b4c15..97b8a5d5b 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml
@@ -206,6 +206,11 @@
 					id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.debug"
 					name="%option.optimization.level.debug">
 				</enumeratedOptionValue>
+				<enumeratedOptionValue
+					command="-Oz"
+					id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.size.aggressive"
+					name="%option.optimization.level.aggressive">
+				</enumeratedOptionValue>
 			</option>
 		</tool>
 		<tool
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.properties b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.properties
index b97330fe9..280071f0a 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.properties
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.properties
@@ -90,6 +90,7 @@ option.optimization.level.most=Optimize most (-O3)
 option.optimization.level.size=Optimize size (-Os)
 option.optimization.level.fast=Optimize fast (-Ofast)
 option.optimization.level.debug=Optimize for debug (-Og)
+option.optimization.level.aggressive=Optimize aggressively for size (-Oz)
 
 optionCategory.warnings=Warnings
 
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml
index ec899a62c..5cb00db5a 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml
@@ -208,6 +208,11 @@
 					id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.optimization.level.debug"
 					name="%option.optimization.level.debug">
 				</enumeratedOptionValue>
+				<enumeratedOptionValue
+					command="-Oz"
+					id="ilg.gnuarmeclipse.managedbuild.cross.riscv.option.optimization.level.size.aggressive"
+					name="%option.optimization.level.aggressive">
+				</enumeratedOptionValue>
 			</option>
 		</tool>
 		<tool