Merge remote-tracking branch 'upstream/master' into lang-enumlang-enum

1 files changed, 14 insertions, 14 deletions

diff --git a/mesonbuild/compilers/mixins/arm.py b/mesonbuild/compilers/mixins/arm.py
index aa5d15d7c..b331d8fae 100644
--- a/mesonbuild/compilers/mixins/arm.py
+++ b/mesonbuild/compilers/mixins/arm.py
@@ -27,10 +27,10 @@ if T.TYPE_CHECKING:
 
 arm_buildtype_args = {
     'plain': [],
-    'debug': ['-O0', '--debug'],
-    'debugoptimized': ['-O1', '--debug'],
-    'release': ['-O3', '-Otime'],
-    'minsize': ['-O3', '-Ospace'],
+    'debug': [],
+    'debugoptimized': [],
+    'release': [],
+    'minsize': [],
     'custom': [],
 }  # type: T.Dict[str, T.List[str]]
 
@@ -38,27 +38,27 @@ arm_optimization_args = {
     '0': ['-O0'],
     'g': ['-g'],
     '1': ['-O1'],
-    '2': ['-O2'],
-    '3': ['-O3'],
-    's': [],
+    '2': [], # Compiler defaults to -O2
+    '3': ['-O3', '-Otime'],
+    's': ['-O3'], # Compiler defaults to -Ospace
 }  # type: T.Dict[str, T.List[str]]
 
 armclang_buildtype_args = {
     'plain': [],
-    'debug': ['-O0', '-g'],
-    'debugoptimized': ['-O1', '-g'],
-    'release': ['-Os'],
-    'minsize': ['-Oz'],
+    'debug': [],
+    'debugoptimized': [],
+    'release': [],
+    'minsize': [],
     'custom': [],
 }  # type: T.Dict[str, T.List[str]]
 
 armclang_optimization_args = {
-    '0': ['-O0'],
+    '0': [], # Compiler defaults to -O0
     'g': ['-g'],
     '1': ['-O1'],
     '2': ['-O2'],
     '3': ['-O3'],
-    's': ['-Os']
+    's': ['-Oz']
 }  # type: T.Dict[str, T.List[str]]
 
 
@@ -181,7 +181,7 @@ class ArmclangCompiler:
 
     # Override CCompiler.get_dependency_gen_args
     def get_dependency_gen_args(self, outtarget: str, outfile: str) -> T.List[str]:
-        return []
+        return ['-MD', '-MT', outtarget, '-MF', outfile]
 
     def get_optimization_args(self, optimization_level: str) -> T.List[str]:
         return armclang_optimization_args[optimization_level]