Add OS/2 support

mesonbuild/backend/backends.py

@@ -582,7 +582,7 @@ def get_executable_serialisation(
         else:
             if exe_cmd[0].endswith('.jar'):
                 exe_cmd = ['java', '-jar'] + exe_cmd
-            elif exe_cmd[0].endswith('.exe') and not (mesonlib.is_windows() or mesonlib.is_cygwin() or mesonlib.is_wsl()):
+            elif exe_cmd[0].endswith('.exe') and not (mesonlib.is_windows() or mesonlib.is_cygwin() or mesonlib.is_wsl() or mesonlib.is_os2()):
                 exe_cmd = ['mono'] + exe_cmd
             exe_wrapper = None
 

mesonbuild/backend/ninjabackend.py

@@ -2387,6 +2387,21 @@ def generate_dynamic_link_rules(self) -> None:
 
                 options = self._rsp_options(compiler)
                 self.add_rule(NinjaRule(rule, command, args, description, **options, extra=pool))
+                if mesonlib.is_os2():
+                    rule = '{}_DLL_LINKER{}'.format(langname, self.get_rule_suffix(for_machine))
+                    command = compiler.get_linker_exelist()
+                    args =  ['$ARGS'] + NinjaCommandArg.list(compiler.get_linker_output_args('$out'), Quoting.none) + ['$in', '$LINK_ARGS']
+                    args += ['&&', 'emximp', '-o', '$IMPLIB', '$out']
+
+                    description = 'Linking target $out'
+                    if num_pools > 0:
+                        pool = 'pool = link_pool'
+                    else:
+                        pool = None
+
+                    options = self._rsp_options(compiler)
+                    self.add_rule(NinjaRule(rule, command, args, description, **options, extra=pool))
+
             if self.environment.machines[for_machine].is_aix() and complist:
                 rule = 'AIX_LINKER{}'.format(self.get_rule_suffix(for_machine))
                 description = 'Archiving AIX shared library'
@@ -3485,6 +3500,8 @@ def generate_link(self, target: build.BuildTarget, outname, obj_list, linker: T.
             linker_base = 'STATIC'
         else:
             linker_base = linker.get_language() # Fixme.
+            if mesonlib.is_os2() and isinstance(target, build.SharedLibrary):
+                linker_base += '_DLL'
         if isinstance(target, build.SharedLibrary):
             self.generate_shsym(target)
         crstr = self.get_rule_suffix(target.for_machine)
@@ -3632,6 +3649,9 @@ def generate_link(self, target: build.BuildTarget, outname, obj_list, linker: T.
             elem.add_item('ARGS', compile_args)
 
         elem.add_item('LINK_ARGS', commands)
+        if mesonlib.is_os2() and isinstance(target, build.SharedLibrary):
+            # The library we will actually link to, which is an import library on OS/2 (not the DLL)
+            elem.add_item('IMPLIB', [self.get_target_filename_for_linking(target)])
         self.create_target_linker_introspection(target, linker, commands)
         return elem
 

mesonbuild/build.py

@@ -112,7 +112,7 @@ class DFeatures(TypedDict):
     cs_kwargs)
 
 known_exe_kwargs = known_build_target_kwargs | {'implib', 'export_dynamic', 'pie', 'vs_module_defs'}
-known_shlib_kwargs = known_build_target_kwargs | {'version', 'soversion', 'vs_module_defs', 'darwin_versions', 'rust_abi'}
+known_shlib_kwargs = known_build_target_kwargs | {'version', 'soversion', 'vs_module_defs', 'darwin_versions', 'rust_abi', 'shortname'}
 known_shmod_kwargs = known_build_target_kwargs | {'vs_module_defs', 'rust_abi'}
 known_stlib_kwargs = known_build_target_kwargs | {'pic', 'prelink', 'rust_abi'}
 known_jar_kwargs = known_exe_kwargs | {'main_class', 'java_resources'}
@@ -2167,14 +2167,16 @@ def post_init(self) -> None:
         # See our FAQ for more detailed rationale:
         # https://mesonbuild.com/FAQ.html#why-does-building-my-project-with-msvc-output-static-libraries-called-libfooa
         if not hasattr(self, 'prefix'):
-            self.prefix = 'lib'
+            self.prefix = '' if self.environment.machines[self.for_machine].is_os2() else 'lib'
         if not hasattr(self, 'suffix'):
             if self.uses_rust():
                 if self.rust_crate_type == 'rlib':
                     # default Rust static library suffix
                     self.suffix = 'rlib'
                 elif self.rust_crate_type == 'staticlib':
                     self.suffix = 'a'
+            elif self.environment.machines[self.for_machine].is_os2() and self.get_option(OptionKey('emxomf')):
+                self.suffix = 'lib'
             else:
                 if 'c' in self.compilers and self.compilers['c'].get_id() == 'tasking':
                     self.suffix = 'ma' if self.options.get_value('b_lto') and not self.prelink else 'a'
@@ -2248,6 +2250,7 @@ def __init__(
         # Max length 2, first element is compatibility_version, second is current_version
         self.darwin_versions: T.Optional[T.Tuple[str, str]] = None
         self.vs_module_defs = None
+        self.shortname = None
         # The import library this target will generate
         self.import_filename = None
         # The debugging information file this target will generate
@@ -2372,6 +2375,15 @@ def determine_filenames(self):
             suffix = 'so'
             # Android doesn't support shared_library versioning
             self.filename_tpl = '{0.prefix}{0.name}.{0.suffix}'
+        elif self.environment.machines[self.for_machine].is_os2():
+            suffix = 'dll'
+            # Import library is called foo_dll.a or foo_dll.lib
+            import_filename_tpl = '{0.name}_dll'
+            import_filename_tpl += '.lib' if self.environment.coredata.get_option(OptionKey('emxomf')) else '.a'
+            self.filename_tpl = '{0.shortname}' if self.shortname else '{0.name}'
+            if self.soversion:
+                self.filename_tpl += '{0.soversion}'
+            self.filename_tpl += '.{0.suffix}'
         else:
             prefix = 'lib'
             suffix = 'so'
@@ -2389,6 +2401,14 @@ def determine_filenames(self):
         if self.suffix is None:
             self.suffix = suffix
         self.filename = self.filename_tpl.format(self)
+        if self.environment.machines[self.for_machine].is_os2():
+            # OS/2 does not allow a longer DLL name than 8 chars
+            name = os.path.splitext(self.filename)[0]
+            if len(name) > 8:
+                name = name[:8]
+                if self.soversion:
+                    name = name[:-len(self.soversion)] + self.soversion
+            self.filename = '{}.{}'.format(name, self.suffix)
         if import_filename_tpl:
             self.import_filename = import_filename_tpl.format(self)
         # There may have been more outputs added by the time we get here, so
@@ -2418,6 +2438,11 @@ def process_kwargs(self, kwargs):
         # Visual Studio module-definitions file
         self.process_vs_module_defs_kw(kwargs)
 
+        # OS/2 uses a 8.3 name for a DLL
+        shortname = kwargs.get('shortname')
+        if shortname:
+            self.shortname = shortname
+
         rust_abi = kwargs.get('rust_abi')
         rust_crate_type = kwargs.get('rust_crate_type')
         if rust_crate_type:

mesonbuild/compilers/compilers.py

@@ -293,6 +293,8 @@ def are_asserts_disabled(options: KeyedOptionDictType) -> bool:
 
 def get_base_compile_args(options: 'KeyedOptionDictType', compiler: 'Compiler', env: 'Environment') -> T.List[str]:
     args: T.List[str] = []
+    if mesonlib.is_os2() and options[OptionKey('emxomf')].value:
+        args += ['-Zomf']
     try:
         if options.get_value(OptionKey('b_lto')):
             args.extend(compiler.get_lto_compile_args(
@@ -342,6 +344,8 @@ def get_base_compile_args(options: 'KeyedOptionDictType', compiler: 'Compiler',
 def get_base_link_args(options: 'KeyedOptionDictType', linker: 'Compiler',
                        is_shared_module: bool, build_dir: str) -> T.List[str]:
     args: T.List[str] = []
+    if mesonlib.is_os2():
+        args += ['-Zomf']
     try:
         if options.get_value('b_lto'):
             if options.get_value('werror'):

mesonbuild/compilers/detect.py

@@ -6,6 +6,7 @@
 from ..mesonlib import (
     MesonException, EnvironmentException, MachineChoice, join_args,
     search_version, is_windows, Popen_safe, Popen_safe_logged, windows_proof_rm,
+    is_os2,
 )
 from ..envconfig import BinaryTable
 from .. import mlog
@@ -78,6 +79,7 @@
 defaults['cuda_static_linker'] = ['nvlink']
 defaults['gcc_static_linker'] = ['gcc-ar']
 defaults['clang_static_linker'] = ['llvm-ar']
+defaults['emxomf_static_linker'] = ['emxomfar']
 defaults['nasm'] = ['nasm', 'yasm']
 
 
@@ -156,6 +158,7 @@ def _handle_exceptions(
 def detect_static_linker(env: 'Environment', compiler: Compiler) -> StaticLinker:
     from . import d
     from ..linkers import linkers
+    from ..options import OptionKey
     linker = env.lookup_binary_entry(compiler.for_machine, 'ar')
     if linker is not None:
         trials = [linker]
@@ -165,6 +168,8 @@ def detect_static_linker(env: 'Environment', compiler: Compiler) -> StaticLinker
             trials = [defaults['cuda_static_linker']] + default_linkers
         elif compiler.get_argument_syntax() == 'msvc':
             trials = [defaults['vs_static_linker'], defaults['clang_cl_static_linker']]
+        elif is_os2() and env.coredata.get_option(OptionKey('emxomf')):
+            trials = [defaults['emxomf_static_linker']] + default_linkers
         elif compiler.id == 'gcc':
             # Use gcc-ar if available; needed for LTO
             trials = [defaults['gcc_static_linker']] + default_linkers
@@ -251,6 +256,8 @@ def detect_static_linker(env: 'Environment', compiler: Compiler) -> StaticLinker
             return linkers.AIXArLinker(linker)
         if p.returncode == 1 and err.startswith('ar: bad option: --'): # Solaris
             return linkers.ArLinker(compiler.for_machine, linker)
+        if p.returncode == 1 and err.startswith('emxomfar'):
+            return linkers.EmxomfArLinker(compiler.for_machine, linker)
     _handle_exceptions(popen_exceptions, trials, 'linker')
     raise EnvironmentException('Unreachable code (exception to make mypy happy)')
 

mesonbuild/compilers/mixins/clike.py

@@ -990,9 +990,24 @@ def symbols_have_underscore_prefix(self, env: 'Environment') -> bool:
 
     def _get_patterns(self, env: 'Environment', prefixes: T.List[str], suffixes: T.List[str], shared: bool = False) -> T.List[str]:
         patterns: T.List[str] = []
-        for p in prefixes:
+        if env.machines[self.for_machine].is_os2():
+            # On OS/2, search order for shared libs is
+            #   1. libfoo_dll.a
+            #   2. foo_dll.a
+            #   3. libfoo.a
+            #   4. foo.a
+            #   5. foo.dll
+            # For static libs, `_s' is used instead of `_dll'.
             for s in suffixes:
-                patterns.append(p + '{}.' + s)
+                for p in prefixes:
+                    if s.startswith('_dll.') or s.startswith('_s.'):
+                        patterns.append(p + '{}' + s)
+                    else:
+                        patterns.append(p + '{}.' + s)
+        else:
+            for p in prefixes:
+                for s in suffixes:
+                    patterns.append(p + '{}.' + s)
         if shared and env.machines[self.for_machine].is_openbsd():
             # Shared libraries on OpenBSD can be named libfoo.so.X.Y:
             # https://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs
@@ -1015,7 +1030,9 @@ def get_library_naming(self, env: 'Environment', libtype: LibType, strict: bool
         # people depend on it. Also, some people use prebuilt `foo.so` instead
         # of `libfoo.so` for unknown reasons, and may also want to create
         # `foo.so` by setting name_prefix to ''
-        if strict and not isinstance(self, VisualStudioLikeCompiler): # lib prefix is not usually used with msvc
+        # lib prefix is not usually used with msvc and OS/2
+        if strict and not isinstance(self, VisualStudioLikeCompiler) \
+          and not env.machines[self.for_machine].is_os2():
             prefixes = ['lib']
         else:
             prefixes = ['lib', '']
@@ -1038,6 +1055,14 @@ def get_library_naming(self, env: 'Environment', libtype: LibType, strict: bool
             # TI C28x compilers can use both extensions for static or dynamic libs.
             stlibext = ['a', 'lib']
             shlibext = ['dll', 'so']
+        elif env.machines[self.for_machine].is_os2():
+            from ...options import OptionKey
+            if env.coredata.get_option(OptionKey('emxomf')):
+                stlibext = ['_s.lib', '_s.a', 'lib', 'a']
+                shlibext = ['_dll.lib', '_dll.a', 'lib', 'a', 'dll']
+            else:
+                stlibext = ['_s.a', 'a']
+                shlibext = ['_dll.a', 'a', 'dll']
         else:
             # Linux/BSDs
             shlibext = ['so']
@@ -1255,6 +1280,8 @@ def thread_flags(self, env: 'Environment') -> T.List[str]:
         host_m = env.machines[self.for_machine]
         if host_m.is_haiku() or host_m.is_darwin():
             return []
+        if host_m.is_os2():
+            return ['-lpthread']
         return ['-pthread']
 
     def linker_to_compiler_args(self, args: T.List[str]) -> T.List[str]:

mesonbuild/compilers/mixins/gnu.py

@@ -373,8 +373,8 @@ def __init__(self) -> None:
         self.can_compile_suffixes.add('sx')
 
     def get_pic_args(self) -> T.List[str]:
-        if self.info.is_windows() or self.info.is_cygwin() or self.info.is_darwin():
-            return [] # On Window and OS X, pic is always on.
+        if self.info.is_windows() or self.info.is_cygwin() or self.info.is_darwin() or self.info.is_os2():
+            return [] # On Window, OS X and OS/2, pic is always on.
         return ['-fPIC']
 
     def get_pie_args(self) -> T.List[str]:

mesonbuild/envconfig.py

@@ -367,11 +367,17 @@ def is_irix(self) -> bool:
         """Machine is IRIX?"""
         return self.system.startswith('irix')
 
+    def is_os2(self) -> bool:
+        """
+        Machine is OS/2?
+        """
+        return self.system == 'os/2'
+
     # Various prefixes and suffixes for import libraries, shared libraries,
     # static libraries, and executables.
     # Versioning is added to these names in the backends as-needed.
     def get_exe_suffix(self) -> str:
-        if self.is_windows() or self.is_cygwin():
+        if self.is_windows() or self.is_cygwin() or self.is_os2():
             return 'exe'
         else:
             return ''

mesonbuild/linkers/detect.py

@@ -27,6 +27,7 @@
 defaults['cuda_static_linker'] = ['nvlink']
 defaults['gcc_static_linker'] = ['gcc-ar']
 defaults['clang_static_linker'] = ['llvm-ar']
+defaults['emxomf_static_linker'] = ['emxomfar']
 
 def __failed_to_detect_linker(compiler: T.List[str], args: T.List[str], stdout: str, stderr: str) -> 'T.NoReturn':
     msg = 'Unable to detect linker for compiler `{}`\nstdout: {}\nstderr: {}'.format(
@@ -242,6 +243,8 @@ def guess_nix_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty
         else:
             __failed_to_detect_linker(compiler, check_args, o, e)
         linker = linkers.AppleDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v)
+    elif 'ld.exe: unrecognized option' in e or 'emxomfld: invalid option' in e:
+        linker = linkers.OS2DynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version='none')
     else:
         __failed_to_detect_linker(compiler, check_args, o, e)
     return linker

mesonbuild/linkers/linkers.py

@@ -387,8 +387,10 @@ def get_std_link_args(self, env: 'Environment', is_thin: bool) -> T.List[str]:
         # on Mac OS X, Solaris, or illumos, so don't build them on those OSes.
         # OS X ld rejects with: "file built for unknown-unsupported file format"
         # illumos/Solaris ld rejects with: "unknown file type"
+        # OS/2 ld rejects with: "malformed input file (not rel or archive)"
         if is_thin and not env.machines[self.for_machine].is_darwin() \
-          and not env.machines[self.for_machine].is_sunos():
+          and not env.machines[self.for_machine].is_sunos() \
+          and not env.machines[self.for_machine].is_os2():
             return self.std_thin_args
         else:
             return self.std_args
@@ -544,6 +546,13 @@ def get_output_args(self, target: str) -> T.List[str]:
     def get_linker_always_args(self) -> T.List[str]:
         return ['-r']
 
+
+class EmxomfArLinker(ArLinker):
+    id = 'emxomfar'
+
+    def get_std_link_args(self, env: 'Environment', is_thin: bool) -> T.List[str]:
+        return ['cr']
+
 def prepare_rpaths(raw_rpaths: T.Tuple[str, ...], build_dir: str, from_dir: str) -> T.List[str]:
     # The rpaths we write must be relative if they point to the build dir,
     # because otherwise they have different length depending on the build
@@ -1734,3 +1743,22 @@ def get_link_whole_for(self, args: T.List[str]) -> T.List[str]:
         for a in args:
             l.extend(self._apply_prefix('-Wl--whole-archive=' + a))
         return l
+
+
+class OS2DynamicLinker(PosixDynamicLinkerMixin, DynamicLinker):
+    """ld and emxomfld"""
+
+    id = 'ld.os2'
+
+    def get_allow_undefined_args(self) -> T.List[str]:
+        return []
+
+    def thread_flags(self, env: 'Environment') -> T.List[str]:
+        return ['-lpthread']
+
+    def get_std_shared_lib_args(self) -> T.List[str]:
+        return ['-Zdll']
+
+    def get_soname_args(self, env: 'Environment', prefix: str, shlib_name: str,
+                        suffix: str, soversion: str, darwin_versions: T.Tuple[str, str]) -> T.List[str]:
+        return []

mesonbuild/options.py

@@ -88,6 +88,7 @@ class ArgparseKWs(TypedDict, total=False):
     'pkg_config_path',
     'cmake_prefix_path',
     'vsenv',
+    'emxomf',
 }
 
 @total_ordering
@@ -647,6 +648,7 @@ def add_to_argparse(self, name: str, parser: argparse.ArgumentParser, help_suffi
     (OptionKey('wrap_mode'),       BuiltinOption(UserComboOption, 'Wrap mode', 'default', choices=['default', 'nofallback', 'nodownload', 'forcefallback', 'nopromote'])),
     (OptionKey('force_fallback_for'), BuiltinOption(UserArrayOption, 'Force fallback for those subprojects', [])),
     (OptionKey('vsenv'),           BuiltinOption(UserBooleanOption, 'Activate Visual Studio environment', False, readonly=True)),
+    (OptionKey('emxomf'),          BuiltinOption(UserBooleanOption, "Whether to use OMF format on OS/2", False)),
 
     # Pkgconfig module
     (OptionKey('pkgconfig.relocatable'),

mesonbuild/programs.py

@@ -322,6 +322,11 @@ def _search(self, name: str, search_dirs: T.List[T.Optional[str]], exclude_paths
             paths = OrderedSet(path.split(os.pathsep)).difference(exclude_paths)
             path = os.pathsep.join(paths)
         command = shutil.which(name, path=path)
+        if not command and mesonlib.is_os2():
+            for ext in ['exe', 'cmd']:
+                command = shutil.which(f'{name}.{ext}', path=path)
+                if command:
+                    return [command]
         if mesonlib.is_windows():
             return self._search_windows_special_cases(name, command, exclude_paths)
         # On UNIX-like platforms, shutil.which() is enough to find

mesonbuild/utils/universal.py

@@ -123,6 +123,7 @@ class _VerPickleLoadable(Protocol):
     'is_linux',
     'is_netbsd',
     'is_openbsd',
+    'is_os2',
     'is_osx',
     'is_qnx',
     'is_sunos',
@@ -691,6 +692,9 @@ def is_qnx() -> bool:
 def is_aix() -> bool:
     return platform.system().lower() == 'aix'
 
+def is_os2() -> bool:
+    return platform.system().lower() == 'os/2'
+
 @lru_cache(maxsize=None)
 def darwin_get_object_archs(objpath: str) -> 'ImmutableListProtocol[str]':
     '''