- Updating cpp_std options similar to other compiler classes

- Updating environment.py for selecting '--vsn' option for armcc only.
- Updating build type arguments from GitHub pull request - 3157

Change-Id: Id3151e7715ec1016afdbd65391bb0d414ec7de13

1 files changed, 30 insertions, 4 deletions

diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 47e3daa..556d881 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -114,10 +114,10 @@ gnulike_buildtype_args = {'plain': [],
                           'minsize': ['-Os', '-g']}
 
 arm_buildtype_args = {'plain': [],
-                      'debug': ['-O0', '-g'],
-                      'debugoptimized': ['-O2', '-g'],
-                      'release': ['-O2'],
-                      'minsize': ['-Os', '-g'],
+                      'debug': ['-O0', '--debug'],
+                      'debugoptimized': ['-O1', '--debug'],
+                      'release': ['-O3', '-Otime'],
+                      'minsize': ['-O3', '-Ospace'],
                       }
 
 msvc_buildtype_args = {'plain': [],
@@ -1118,6 +1118,26 @@ class ARMCompiler:
     def get_buildtype_linker_args(self, buildtype):
         return arm_buildtype_linker_args[buildtype]
 
+    # Override CCompiler.get_always_args
+    def get_always_args(self):
+        return []
+
+    # Override CCompiler.get_dependency_gen_args
+    def get_dependency_gen_args(self, outtarget, outfile):
+        return []
+
+    # Override CCompiler.get_std_shared_lib_link_args
+    def get_std_shared_lib_link_args(self):
+        return []
+
+    def get_pch_use_args(self, pch_dir, header):
+        # FIXME: Add required arguments
+        # NOTE from armcc user guide:
+        # "Support for Precompiled Header (PCH) files is deprecated from ARM Compiler 5.05
+        # onwards on all platforms. Note that ARM Compiler on Windows 8 never supported
+        # PCH files."
+        return []
+
     def get_pch_suffix(self):
         # NOTE from armcc user guide:
         # "Support for Precompiled Header (PCH) files is deprecated from ARM Compiler 5.05
@@ -1128,6 +1148,12 @@ class ARMCompiler:
     def split_shlib_to_parts(self, fname):
         return os.path.split(fname)[0], fname
 
+    def thread_flags(self, env):
+        return []
+
+    def thread_link_flags(self, env):
+        return []
+
 
 class ClangCompiler:
     def __init__(self, clang_type):