aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers
diff options
context:
space:
mode:
Diffstat (limited to 'mesonbuild/compilers')
-rw-r--r--mesonbuild/compilers/__init__.py7
-rw-r--r--mesonbuild/compilers/c.py60
-rw-r--r--mesonbuild/compilers/compilers.py129
-rw-r--r--mesonbuild/compilers/cpp.py58
4 files changed, 120 insertions, 134 deletions
diff --git a/mesonbuild/compilers/__init__.py b/mesonbuild/compilers/__init__.py
index e58a604..55276d9 100644
--- a/mesonbuild/compilers/__init__.py
+++ b/mesonbuild/compilers/__init__.py
@@ -41,9 +41,6 @@ __all__ = [
'sanitizer_compile_args',
'sort_clike',
- 'ARMCompiler',
- 'ARMCCompiler',
- 'ARMCPPCompiler',
'CCompiler',
'ClangCCompiler',
'ClangCompiler',
@@ -118,7 +115,7 @@ from .compilers import (
IntelCompiler,
)
from .c import (
- ARMCCompiler,
+ ArmCCompiler,
CCompiler,
ClangCCompiler,
GnuCCompiler,
@@ -126,7 +123,7 @@ from .c import (
VisualStudioCCompiler,
)
from .cpp import (
- ARMCPPCompiler,
+ ArmCPPCompiler,
CPPCompiler,
ClangCPPCompiler,
GnuCPPCompiler,
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
index a77842c..8884548 100644
--- a/mesonbuild/compilers/c.py
+++ b/mesonbuild/compilers/c.py
@@ -31,7 +31,7 @@ from .compilers import (
msvc_winlibs,
vs32_instruction_set_args,
vs64_instruction_set_args,
- ARMCompiler,
+ ArmCompiler,
ClangCompiler,
Compiler,
CompilerArgs,
@@ -889,45 +889,6 @@ class GnuCCompiler(GnuCompiler, CCompiler):
return ['-fpch-preprocess', '-include', os.path.basename(header)]
-class ARMCCompiler(ARMCompiler, CCompiler):
- def __init__(self, exelist, version, is_cross, exe_wrapper=None, defines=None, **kwargs):
- # ARMCC is only a cross compiler
- if not is_cross:
- raise EnvironmentException('armcc supports only cross-compilation.')
- CCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwargs)
- ARMCompiler.__init__(self, defines)
-
- def sanity_check_impl(self, work_dir, environment, sname, code):
- mlog.debug('Sanity testing disabled for armcc compiler')
- return
-
- def get_options(self):
- opts = {'c_std': coredata.UserComboOption('c_std', 'C language standard to use',
- ['none', 'c89', 'c99', 'c11'],
- 'none')}
- return opts
-
- def get_warn_args(self, level):
- # ARMCC doesn't have warning levels
- return []
-
- def get_coverage_args(self):
- return []
-
- def get_coverage_link_args(self):
- return []
-
- def get_option_compile_args(self, options):
- return []
-
- def get_linker_exelist(self):
- args = ['armlink']
- return args
-
- def get_compile_only_args(self):
- return ['-c']
-
-
class IntelCCompiler(IntelCompiler, CCompiler):
def __init__(self, exelist, version, icc_type, is_cross, exe_wrapper=None, **kwargs):
CCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwargs)
@@ -1206,3 +1167,22 @@ class VisualStudioCCompiler(CCompiler):
if 'INCLUDE' not in os.environ:
return []
return os.environ['INCLUDE'].split(os.pathsep)
+
+
+class ArmCCompiler(ArmCompiler, CCompiler):
+ def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwargs):
+ CCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwargs)
+ ArmCompiler.__init__(self)
+
+ def get_options(self):
+ opts = {'c_std': coredata.UserComboOption('c_std', 'C language standard to use',
+ ['none', 'c90', 'c99'],
+ 'none')}
+ return opts
+
+ def get_option_compile_args(self, options):
+ args = []
+ std = options['c_std']
+ if std.value != 'none':
+ args.append('--' + std.value)
+ return args
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 556d881..966e205 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -1095,65 +1095,6 @@ class GnuCompiler:
def get_default_include_dirs(self):
return gnulike_default_include_dirs(self.exelist, self.language)
-class ARMCompiler:
- # Functionality that is common to all ARM family compilers.
- def __init__(self, defines):
- self.id = 'arm'
- self.defines = defines or {}
- self.base_options = ['b_pch', 'b_lto', 'b_pgo', 'b_sanitize', 'b_coverage',
- 'b_colorout', 'b_ndebug', 'b_staticpic']
- # Assembly
- self.can_compile_suffixes.add('s')
-
- def can_linker_accept_rsp(self):
- return False
-
- def get_pic_args(self):
- # FIXME: Add /ropi, /rwpi, /fpic etc. qualifiers to --apcs
- return []
-
- def get_buildtype_args(self, buildtype):
- return arm_buildtype_args[buildtype]
-
- 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
- # onwards on all platforms. Note that ARM Compiler on Windows 8 never supported
- # PCH files."
- return 'pch'
-
- 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):
@@ -1294,3 +1235,73 @@ class IntelCompiler:
def get_default_include_dirs(self):
return gnulike_default_include_dirs(self.exelist, self.language)
+
+
+class ArmCompiler:
+ # Functionality that is common to all ARM family compilers.
+ def __init__(self):
+ if not self.is_cross:
+ raise EnvironmentException('armcc supports only cross-compilation.')
+ self.id = 'arm'
+ default_warn_args = []
+ self.warn_args = {'1': default_warn_args,
+ '2': default_warn_args + [],
+ '3': default_warn_args + []}
+ # Assembly
+ self.can_compile_suffixes.add('s')
+
+ def can_linker_accept_rsp(self):
+ return False
+
+ def get_pic_args(self):
+ # FIXME: Add /ropi, /rwpi, /fpic etc. qualifiers to --apcs
+ return []
+
+ def get_buildtype_args(self, buildtype):
+ return arm_buildtype_args[buildtype]
+
+ 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
+ # onwards on all platforms. Note that ARM Compiler on Windows 8 never supported
+ # PCH files."
+ return 'pch'
+
+ def thread_flags(self, env):
+ return []
+
+ def thread_link_flags(self, env):
+ return []
+
+ def get_linker_exelist(self):
+ args = ['armlink']
+ return args
+
+ def get_coverage_args(self):
+ return []
+
+ def get_coverage_link_args(self):
+ return []
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
index 15e8457..952f7f2 100644
--- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.py
@@ -26,7 +26,7 @@ from .compilers import (
ClangCompiler,
GnuCompiler,
IntelCompiler,
- ARMCompiler,
+ ArmCompiler,
)
class CPPCompiler(CCompiler):
@@ -134,35 +134,6 @@ class GnuCPPCompiler(GnuCompiler, CPPCompiler):
return ['-fpch-preprocess', '-include', os.path.basename(header)]
-class ARMCPPCompiler(ARMCompiler, CPPCompiler):
- def __init__(self, exelist, version, is_cross, exe_wrap=None, defines=None, **kwargs):
- CPPCompiler.__init__(self, exelist, version, is_cross, exe_wrap, **kwargs)
- ARMCompiler.__init__(self, defines)
- default_warn_args = []
- self.warn_args = {'1': default_warn_args,
- '2': default_warn_args + [],
- '3': default_warn_args + []}
-
- def get_options(self):
- opts = {'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use',
- ['none', 'c++11'],
- 'none')}
- return opts
-
- def get_option_compile_args(self, options):
- args = []
- std = options['cpp_std']
- if std.value == 'c++11':
- args.append('--cpp11')
- return args
-
- def get_option_link_args(self, options):
- return []
-
- def get_compiler_check_args(self):
- return []
-
-
class IntelCPPCompiler(IntelCompiler, CPPCompiler):
def __init__(self, exelist, version, icc_type, is_cross, exe_wrap, **kwargs):
CPPCompiler.__init__(self, exelist, version, is_cross, exe_wrap, **kwargs)
@@ -245,3 +216,30 @@ class VisualStudioCPPCompiler(VisualStudioCCompiler, CPPCompiler):
# Visual Studio C++ compiler doesn't support -fpermissive,
# so just use the plain C args.
return super(VisualStudioCCompiler, self).get_compiler_check_args()
+
+
+class ArmCPPCompiler(ArmCompiler, CPPCompiler):
+ def __init__(self, exelist, version, is_cross, exe_wrap=None, defines=None, **kwargs):
+ CPPCompiler.__init__(self, exelist, version, is_cross, exe_wrap, **kwargs)
+ ArmCompiler.__init__(self, defines)
+
+ def get_options(self):
+ opts = {'cpp_std': coredata.UserComboOption('cpp_std', 'C++ language standard to use',
+ ['none', 'c++03', 'c++11'],
+ 'none')}
+ return opts
+
+ def get_option_compile_args(self, options):
+ args = []
+ std = options['cpp_std']
+ if std.value == 'c++11':
+ args.append('--cpp11')
+ elif std.value == 'c++03':
+ args.append('--cpp')
+ return args
+
+ def get_option_link_args(self, options):
+ return []
+
+ def get_compiler_check_args(self):
+ return []