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'(?