From 8091b4c7448ca467bbfff22283beaa702533f177 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 2 Dec 2019 15:00:16 -0800 Subject: Intel: Dump worthless Xild abstractions This dumps xild on mac and linux. After a lot of reading and banging my head I've discovered we (meson) don't care about xild, xild is only useful if your invoke ld directly (not through icc/icpc) and you want to do ipo/lto/wpo. Instead just make icc report what it's actually doing, invoking ld or ld64 (for linux and mac respectively) directly. This allows us to get -fuse-ld working on linux. --- mesonbuild/linkers.py | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) (limited to 'mesonbuild/linkers.py') diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py index 021134e..1c0dfff 100644 --- a/mesonbuild/linkers.py +++ b/mesonbuild/linkers.py @@ -399,6 +399,11 @@ class DynamicLinker(metaclass=abc.ABCMeta): install_rpath: str) -> typing.List[str]: return [] + def get_soname_args(self, env: 'Environment', prefix: str, shlib_name: str, + suffix: str, soversion: str, darwin_versions: typing.Tuple[str, str], + is_shared_module: bool) -> typing.List[str]: + return [] + class PosixDynamicLinkerMixin: @@ -423,8 +428,8 @@ class GnuLikeDynamicLinkerMixin: """Mixin class for dynamic linkers that provides gnu-like interface. - This acts as a base for the GNU linkers (bfd and gold), the Intel Xild - (which comes with ICC), LLVM's lld, and other linkers like GNU-ld. + This acts as a base for the GNU linkers (bfd and gold), LLVM's lld, and + other linkers like GNU-ld. """ _BUILDTYPE_ARGS = { @@ -660,26 +665,6 @@ class LLVMDynamicLinker(GnuLikeDynamicLinkerMixin, PosixDynamicLinkerMixin, Dyna pass -class XildLinuxDynamicLinker(GnuLikeDynamicLinkerMixin, PosixDynamicLinkerMixin, DynamicLinker): - - """Representation of Intel's Xild linker. - - This is only the linux-like linker which dispatches to Gnu ld. - """ - - pass - - -class XildAppleDynamicLinker(AppleDynamicLinker): - - """Representation of Intel's Xild linker. - - This is the apple linker, which dispatches to Apple's ld. - """ - - pass - - class CcrxDynamicLinker(DynamicLinker): """Linker for Renesis CCrx compiler.""" -- cgit v1.1