Add OS/2 support

docs/yaml/functions/shared_library.yaml

@@ -54,3 +54,9 @@ kwargs:
       Set the specific ABI to compile (when compiling rust).
       - 'rust' (default): Create a "dylib" crate.
       - 'c': Create a "cdylib" crate.
+
+  shortname:
+    type: str
+    since: 1.8.0
+    description: |
+      A string specifying a DLL name fitting to 8.3 limit on OS/2 of this shared library.

mesonbuild/backend/backends.py

@@ -587,7 +587,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 machine.is_os2()):
                 exe_cmd = ['mono'] + exe_cmd
             exe_wrapper = None
 

mesonbuild/backend/ninjabackend.py

@@ -2397,6 +2397,13 @@ def generate_dynamic_link_rules(self) -> None:
                 args = []
                 options = {}
                 self.add_rule(NinjaRule(rule, cmdlist, args, description, **options, extra=None))
+            if self.environment.machines[for_machine].is_os2() and complist:
+                rule = 'IMPORTLIB{}'.format(self.get_rule_suffix(for_machine))
+                description = 'Generating import library $out'
+                command = ['emximp']
+                args = ['-o', '$out', '$in']
+                options = {}
+                self.add_rule(NinjaRule(rule, command, args, description, **options, extra=None))
 
         args = self.environment.get_build_command() + \
             ['--internal',
@@ -3295,7 +3302,12 @@ def get_target_shsym_filename(self, target):
         return os.path.join(targetdir, target.get_filename() + '.symbols')
 
     def generate_shsym(self, target) -> None:
-        target_file = self.get_target_filename(target)
+        # On OS/2, an import library is generated after linking a DLL, so
+        # if a DLL is used as a target, import library is not generated.
+        if self.environment.machines[target.for_machine].is_os2():
+            target_file = self.get_target_filename_for_linking(target)
+        else:
+            target_file = self.get_target_filename(target)
         if isinstance(target, build.SharedLibrary) and target.aix_so_archive:
             if self.environment.machines[target.for_machine].is_aix():
                 linker, stdlib_args = target.get_clink_dynamic_linker_and_stdlibs()
@@ -3496,6 +3508,11 @@ def generate_link(self, target: build.BuildTarget, outname, obj_list, linker: T.
             linker_base = linker.get_language() # Fixme.
         if isinstance(target, build.SharedLibrary):
             self.generate_shsym(target)
+            if self.environment.machines[target.for_machine].is_os2():
+                target_file = self.get_target_filename(target)
+                import_name = self.get_import_filename(target)
+                elem = NinjaBuildElement(self.all_outputs, import_name, 'IMPORTLIB', target_file)
+                self.add_build(elem)
         crstr = self.get_rule_suffix(target.for_machine)
         linker_rule = linker_base + '_LINKER' + crstr
         # Create an empty commands list, and start adding link arguments from

mesonbuild/build.py

@@ -113,7 +113,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'}
@@ -2176,6 +2176,8 @@ def post_init(self) -> None:
                     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'
@@ -2253,6 +2255,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
@@ -2377,6 +2380,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'
@@ -2394,6 +2406,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
@@ -2423,6 +2443,9 @@ 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
+        self.shortname = kwargs.get('shortname')
+
         rust_abi = kwargs.get('rust_abi')
         rust_crate_type = kwargs.get('rust_crate_type')
         if rust_crate_type:

mesonbuild/compilers/detect.py

@@ -78,6 +78,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 +157,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 +167,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 env.machines[compiler.for_machine].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 +255,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

@@ -1005,9 +1005,17 @@ 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:
-            for s in suffixes:
-                patterns.append(p + '{}.' + s)
+        # 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:
+            dot = '' if env.machines[self.for_machine].is_os2() and s.startswith(('_dll.', '_s.')) else '.'
+            for p in prefixes:
+                patterns.append(p + '{}' + dot + 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
@@ -1030,7 +1038,8 @@ 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', '']
@@ -1053,6 +1062,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']
@@ -1270,6 +1287,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

@@ -372,8 +372,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]:
@@ -631,6 +631,12 @@ def use_linker_args(cls, linker: str, version: str) -> T.List[str]:
     def get_profile_use_args(self) -> T.List[str]:
         return super().get_profile_use_args() + ['-fprofile-correction']
 
+    def get_always_args(self) -> T.List[str]:
+        args: T.List[str] = []
+        if self.info.is_os2() and self.get_linker_id() == 'emxomfld':
+            args += ['-Zomf']
+        return super().get_always_args() + args
+
 
 class GnuCStds(Compiler):
 

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/interpreter/type_checking.py

@@ -746,6 +746,7 @@ def _convert_darwin_versions(val: T.List[T.Union[str, int]]) -> T.Optional[T.Tup
     _DARWIN_VERSIONS_KW,
     KwargInfo('soversion', (str, int, NoneType), convertor=lambda x: str(x) if x is not None else None),
     KwargInfo('version', (str, NoneType), validator=_validate_shlib_version),
+    KwargInfo('shortname', (str, NoneType), since='1.8'),
 ]
 
 # The total list of arguments used by SharedLibrary

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(
@@ -128,6 +129,7 @@ def guess_nix_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty
     :extra_args: Any additional arguments required (such as a source file)
     """
     from . import linkers
+    from ..options import OptionKey
     env.coredata.add_lang_args(comp_class.language, comp_class, for_machine, env)
     extra_args = extra_args or []
 
@@ -145,6 +147,9 @@ def guess_nix_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty
         override = comp_class.use_linker_args(value[0], comp_version)
         check_args += override
 
+    if env.machines[for_machine].is_os2() and env.coredata.get_option(OptionKey('emxomf')):
+        check_args += ['-Zomf']
+
     mlog.debug('-----')
     p, o, e = Popen_safe_logged(compiler + check_args, msg='Detecting linker via')
 
@@ -242,6 +247,10 @@ 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:
+        linker = linkers.OS2AoutDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version='none')
+    elif 'emxomfld: invalid option' in e:
+        linker = linkers.OS2OmfDynamicLinker(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
@@ -1738,3 +1747,31 @@ 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"""
+
+    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 []
+
+    def get_always_args(self) -> T.List[str]:
+        return ['-Zomf']
+
+
+class OS2AoutDynamicLinker(OS2DynamicLinker):
+    id = 'ld.os2'
+
+
+class OS2OmfDynamicLinker(OS2DynamicLinker):
+    id = 'emxomfld'

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