From 04604b3d60e95938e47af6048fa8e723e717ee74 Mon Sep 17 00:00:00 2001 From: William Toohey Date: Mon, 20 Feb 2023 15:57:27 +1000 Subject: [PATCH] Basic support for TI ARM-CLANG toolchain --- docs/markdown/snippets/ti_armclang.md | 3 +++ mesonbuild/linkers/detect.py | 2 +- mesonbuild/linkers/linkers.py | 27 ++++++++++++++++++++++++--- 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 docs/markdown/snippets/ti_armclang.md diff --git a/docs/markdown/snippets/ti_armclang.md b/docs/markdown/snippets/ti_armclang.md new file mode 100644 index 000000000000..7f0f912c0ed8 --- /dev/null +++ b/docs/markdown/snippets/ti_armclang.md @@ -0,0 +1,3 @@ +## Basic support for TI Arm Clang (tiarmclang) + +Support for TI's newer [Clang-based ARM toolchain](https://www.ti.com/tool/ARM-CGT). diff --git a/mesonbuild/linkers/detect.py b/mesonbuild/linkers/detect.py index bb391d171833..65d77f6424c8 100644 --- a/mesonbuild/linkers/detect.py +++ b/mesonbuild/linkers/detect.py @@ -141,7 +141,7 @@ def guess_nix_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty v = search_version(o + e) linker: DynamicLinker - if 'LLD' in o.split('\n', maxsplit=1)[0]: + if 'LLD' in o.split('\n', maxsplit=1)[0] or 'tiarmlnk' in e: if isinstance(comp_class.LINKER_PREFIX, str): cmd = compiler + override + [comp_class.LINKER_PREFIX + '-v'] + extra_args else: diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py index ca3c8547188d..de08e0f443e9 100644 --- a/mesonbuild/linkers/linkers.py +++ b/mesonbuild/linkers/linkers.py @@ -885,15 +885,36 @@ def __init__(self, exelist: T.List[str], super().__init__(exelist, for_machine, prefix_arg, always_args, version=version) # Some targets don't seem to support this argument (windows, wasm, ...) - _, _, e = mesonlib.Popen_safe(self.exelist + always_args + self._apply_prefix('--allow-shlib-undefined')) - # Versions < 9 do not have a quoted argument - self.has_allow_shlib_undefined = ('unknown argument: --allow-shlib-undefined' not in e) and ("unknown argument: '--allow-shlib-undefined'" not in e) + self.has_allow_shlib_undefined = self._supports_flag('--allow-shlib-undefined', always_args) + # These aren't supported by TI Arm Clang + self.has_as_needed = self._supports_flag('--as-needed', always_args) + self.has_no_undefined = self._supports_flag('--no-undefined', always_args) + + def _supports_flag(self, flag: str, always_args: T.List[str]) -> bool: + _, _, e = mesonlib.Popen_safe(self.exelist + always_args + self._apply_prefix(flag)) + return ( + # Versions < 9 do not have a quoted argument + (f'unknown argument: {flag}' not in e) and + (f"unknown argument: '{flag}'" not in e) and + # TI Arm Clang uses a different message + (f'invalid option: {flag}' not in e) + ) def get_allow_undefined_args(self) -> T.List[str]: if self.has_allow_shlib_undefined: return self._apply_prefix('--allow-shlib-undefined') return [] + def get_asneeded_args(self) -> T.List[str]: + if self.has_as_needed: + return self._apply_prefix('--as-needed') + return [] + + def no_undefined_args(self) -> T.List[str]: + if self.has_no_undefined: + return self._apply_prefix('--no-undefined') + return [] + def get_thinlto_cache_args(self, path: str) -> T.List[str]: return ['-Wl,--thinlto-cache-dir=' + path]