diff options
| -rw-r--r-- | mesonbuild/compilers/c.py | 3 | ||||
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 118 | ||||
| -rw-r--r-- | mesonbuild/compilers/cpp.py | 3 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/arm.py | 117 |
4 files changed, 119 insertions, 122 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index 3d7c7794e..c520a9352 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -20,14 +20,13 @@ from ..mesonlib import MachineChoice, MesonException, mlog, version_compare from .c_function_attributes import C_FUNC_ATTRIBUTES from .mixins.clike import CLikeCompiler from .mixins.ccrx import CcrxCompiler -from .mixins.arm import ArmCompiler +from .mixins.arm import ArmCompiler, ArmclangCompiler from .mixins.visualstudio import VisualStudioLikeCompiler from .mixins.gnu import GnuCompiler from .mixins.intel import IntelGnuLikeCompiler, IntelVisualStudioLikeCompiler from .compilers import ( gnu_winlibs, msvc_winlibs, - ArmclangCompiler, ClangCompiler, Compiler, CompilerType, diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 1dcf9437c..32a405dab 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -137,14 +137,6 @@ def is_library(fname): suffix = fname.split('.')[-1] return suffix in lib_suffixes -armclang_buildtype_args = {'plain': [], - 'debug': ['-O0', '-g'], - 'debugoptimized': ['-O1', '-g'], - 'release': ['-Os'], - 'minsize': ['-Oz'], - 'custom': [], - } - cuda_buildtype_args = {'plain': [], 'debug': [], 'debugoptimized': [], @@ -236,14 +228,6 @@ clang_color_args = {'auto': ['-Xclang', '-fcolor-diagnostics'], 'never': ['-Xclang', '-fno-color-diagnostics'], } -armclang_optimization_args = {'0': ['-O0'], - 'g': ['-g'], - '1': ['-O1'], - '2': ['-O2'], - '3': ['-O3'], - 's': ['-Os'] - } - clike_optimization_args = {'0': [], 'g': [], '1': ['-O1'], @@ -1457,105 +1441,3 @@ class ClangCompiler(GnuLikeCompiler): else: # Shouldn't work, but it'll be checked explicitly in the OpenMP dependency. return [] - - -class ArmclangCompiler: - def __init__(self, compiler_type): - if not self.is_cross: - raise EnvironmentException('armclang supports only cross-compilation.') - # Check whether 'armlink.exe' is available in path - self.linker_exe = 'armlink.exe' - args = '--vsn' - try: - p, stdo, stderr = Popen_safe(self.linker_exe, args) - except OSError as e: - err_msg = 'Unknown linker\nRunning "{0}" gave \n"{1}"'.format(' '.join([self.linker_exe] + [args]), e) - raise EnvironmentException(err_msg) - # Verify the armlink version - ver_str = re.search('.*Component.*', stdo) - if ver_str: - ver_str = ver_str.group(0) - else: - EnvironmentException('armlink version string not found') - # Using the regular expression from environment.search_version, - # which is used for searching compiler version - version_regex = r'(?<!(\d|\.))(\d{1,2}(\.\d+)+(-[a-zA-Z0-9]+)?)' - linker_ver = re.search(version_regex, ver_str) - if linker_ver: - linker_ver = linker_ver.group(0) - if not version_compare(self.version, '==' + linker_ver): - raise EnvironmentException('armlink version does not match with compiler version') - self.id = 'armclang' - self.compiler_type = compiler_type - self.base_options = ['b_pch', 'b_lto', 'b_pgo', 'b_sanitize', 'b_coverage', - 'b_ndebug', 'b_staticpic', 'b_colorout'] - # Assembly - self.can_compile_suffixes.update('s') - - def can_linker_accept_rsp(self): - return False - - def get_pic_args(self): - # PIC support is not enabled by default for ARM, - # if users want to use it, they need to add the required arguments explicitly - return [] - - def get_colorout_args(self, colortype): - return clang_color_args[colortype][:] - - def get_buildtype_args(self, buildtype): - return armclang_buildtype_args[buildtype] - - def get_buildtype_linker_args(self, buildtype): - return arm_buildtype_linker_args[buildtype] - - # Override CCompiler.get_std_shared_lib_link_args - def get_std_shared_lib_link_args(self): - return [] - - def get_pch_suffix(self): - return 'gch' - - def get_pch_use_args(self, pch_dir, header): - # Workaround for Clang bug http://llvm.org/bugs/show_bug.cgi?id=15136 - # This flag is internal to Clang (or at least not documented on the man page) - # so it might change semantics at any time. - return ['-include-pch', os.path.join(pch_dir, self.get_pch_name(header))] - - # Override CCompiler.get_dependency_gen_args - def get_dependency_gen_args(self, outtarget, outfile): - return [] - - # Override CCompiler.build_rpath_args - def build_rpath_args(self, build_dir, from_dir, rpath_paths, build_rpath, install_rpath): - return [] - - def get_linker_exelist(self): - return [self.linker_exe] - - def get_optimization_args(self, optimization_level): - return armclang_optimization_args[optimization_level] - - def get_debug_args(self, is_debug): - return clike_debug_args[is_debug] - - def gen_export_dynamic_link_args(self, env): - """ - The args for export dynamic - """ - return ['--export_dynamic'] - - def gen_import_library_args(self, implibname): - """ - The args of the outputted import library - - ArmLinker's symdefs output can be used as implib - """ - return ['--symdefs=' + implibname] - - def compute_parameters_with_absolute_paths(self, parameter_list, build_dir): - for idx, i in enumerate(parameter_list): - if i[:2] == '-I' or i[:2] == '-L': - parameter_list[idx] = i[:2] + os.path.normpath(os.path.join(build_dir, i[2:])) - - return parameter_list diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index 89d7197d8..15846b10c 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -27,13 +27,12 @@ from .compilers import ( ClangCompiler, ElbrusCompiler, PGICompiler, - ArmclangCompiler, Compiler, ) from .c_function_attributes import CXX_FUNC_ATTRIBUTES, C_FUNC_ATTRIBUTES from .mixins.clike import CLikeCompiler from .mixins.ccrx import CcrxCompiler -from .mixins.arm import ArmCompiler +from .mixins.arm import ArmCompiler, ArmclangCompiler from .mixins.visualstudio import VisualStudioLikeCompiler from .mixins.gnu import GnuCompiler from .mixins.intel import IntelGnuLikeCompiler, IntelVisualStudioLikeCompiler diff --git a/mesonbuild/compilers/mixins/arm.py b/mesonbuild/compilers/mixins/arm.py index ba6e0b139..d7b02ab00 100644 --- a/mesonbuild/compilers/mixins/arm.py +++ b/mesonbuild/compilers/mixins/arm.py @@ -51,6 +51,21 @@ arm_optimization_args = { 's': [], } # type: typing.Dict[str, typing.List[str]] +armclang_buildtype_args = {'plain': [], + 'debug': ['-O0', '-g'], + 'debugoptimized': ['-O1', '-g'], + 'release': ['-Os'], + 'minsize': ['-Oz'], + 'custom': [], + } +armclang_optimization_args = {'0': ['-O0'], + 'g': ['-g'], + '1': ['-O1'], + '2': ['-O2'], + '3': ['-O3'], + 's': ['-Os'] + } + class ArmCompiler: # Functionality that is common to all ARM family compilers. @@ -134,4 +149,106 @@ class ArmCompiler: if i[:2] == '-I' or i[:2] == '-L': parameter_list[idx] = i[:2] + os.path.normpath(os.path.join(build_dir, i[2:])) + return parameter_list + + +class ArmclangCompiler: + def __init__(self, compiler_type): + if not self.is_cross: + raise EnvironmentException('armclang supports only cross-compilation.') + # Check whether 'armlink.exe' is available in path + self.linker_exe = 'armlink.exe' + args = '--vsn' + try: + p, stdo, stderr = Popen_safe(self.linker_exe, args) + except OSError as e: + err_msg = 'Unknown linker\nRunning "{0}" gave \n"{1}"'.format(' '.join([self.linker_exe] + [args]), e) + raise EnvironmentException(err_msg) + # Verify the armlink version + ver_str = re.search('.*Component.*', stdo) + if ver_str: + ver_str = ver_str.group(0) + else: + EnvironmentException('armlink version string not found') + # Using the regular expression from environment.search_version, + # which is used for searching compiler version + version_regex = r'(?<!(\d|\.))(\d{1,2}(\.\d+)+(-[a-zA-Z0-9]+)?)' + linker_ver = re.search(version_regex, ver_str) + if linker_ver: + linker_ver = linker_ver.group(0) + if not version_compare(self.version, '==' + linker_ver): + raise EnvironmentException('armlink version does not match with compiler version') + self.id = 'armclang' + self.compiler_type = compiler_type + self.base_options = ['b_pch', 'b_lto', 'b_pgo', 'b_sanitize', 'b_coverage', + 'b_ndebug', 'b_staticpic', 'b_colorout'] + # Assembly + self.can_compile_suffixes.update('s') + + def can_linker_accept_rsp(self): + return False + + def get_pic_args(self): + # PIC support is not enabled by default for ARM, + # if users want to use it, they need to add the required arguments explicitly + return [] + + def get_colorout_args(self, colortype): + return clang_color_args[colortype][:] + + def get_buildtype_args(self, buildtype): + return armclang_buildtype_args[buildtype] + + def get_buildtype_linker_args(self, buildtype): + return arm_buildtype_linker_args[buildtype] + + # Override CCompiler.get_std_shared_lib_link_args + def get_std_shared_lib_link_args(self): + return [] + + def get_pch_suffix(self): + return 'gch' + + def get_pch_use_args(self, pch_dir, header): + # Workaround for Clang bug http://llvm.org/bugs/show_bug.cgi?id=15136 + # This flag is internal to Clang (or at least not documented on the man page) + # so it might change semantics at any time. + return ['-include-pch', os.path.join(pch_dir, self.get_pch_name(header))] + + # Override CCompiler.get_dependency_gen_args + def get_dependency_gen_args(self, outtarget, outfile): + return [] + + # Override CCompiler.build_rpath_args + def build_rpath_args(self, build_dir, from_dir, rpath_paths, build_rpath, install_rpath): + return [] + + def get_linker_exelist(self): + return [self.linker_exe] + + def get_optimization_args(self, optimization_level): + return armclang_optimization_args[optimization_level] + + def get_debug_args(self, is_debug): + return clike_debug_args[is_debug] + + def gen_export_dynamic_link_args(self, env): + """ + The args for export dynamic + """ + return ['--export_dynamic'] + + def gen_import_library_args(self, implibname): + """ + The args of the outputted import library + + ArmLinker's symdefs output can be used as implib + """ + return ['--symdefs=' + implibname] + + def compute_parameters_with_absolute_paths(self, parameter_list, build_dir): + for idx, i in enumerate(parameter_list): + if i[:2] == '-I' or i[:2] == '-L': + parameter_list[idx] = i[:2] + os.path.normpath(os.path.join(build_dir, i[2:])) + return parameter_list
\ No newline at end of file |