Add start-group/end-group flags when linking a program with rustc

mesonbuild/arglist.py

@@ -219,6 +219,9 @@ def _can_dedup(cls, arg: str) -> Dedup:
     def _should_prepend(cls, arg: str) -> bool:
         return arg.startswith(cls.prepend_prefixes)
 
+    def to_native_inplace(self) -> None:
+        pass
+
     def to_native(self, copy: bool = False) -> T.List[str]:
         # Check if we need to add --start/end-group for circular dependencies
         # between static libraries, and for recursively searching for symbols
@@ -229,6 +232,7 @@ def to_native(self, copy: bool = False) -> T.List[str]:
             new = self.copy()
         else:
             new = self
+        new.to_native_inplace()
         return self.compiler.unix_args_to_native(new._container)
 
     def append_direct(self, arg: str) -> None:

mesonbuild/compilers/mixins/clike.py

@@ -57,26 +57,17 @@ class CLikeCompilerArgs(arglist.CompilerArgs):
     dedup1_suffixes = ('.lib', '.dll', '.so', '.dylib', '.a')
     dedup1_args = ('-c', '-S', '-E', '-pipe', '-pthread')
 
-    def to_native(self, copy: bool = False) -> T.List[str]:
+    def to_native_inplace(self) -> None:
         # This seems to be allowed, but could never work?
         assert isinstance(self.compiler, compilers.Compiler), 'How did you get here'
 
-        # Check if we need to add --start/end-group for circular dependencies
-        # between static libraries, and for recursively searching for symbols
-        # needed by static libraries that are provided by object files or
-        # shared libraries.
-        self.flush_pre_post()
-        if copy:
-            new = self.copy()
-        else:
-            new = self
         # This covers all ld.bfd, ld.gold, ld.gold, and xild on Linux, which
         # all act like (or are) gnu ld
         # TODO: this could probably be added to the DynamicLinker instead
         if isinstance(self.compiler.linker, (GnuLikeDynamicLinkerMixin, SolarisDynamicLinker, CompCertDynamicLinker)):
             group_start = -1
             group_end = -1
-            for i, each in enumerate(new):
+            for i, each in enumerate(self):
                 if not GROUP_FLAGS.search(each):
                     continue
                 group_end = i
@@ -86,29 +77,28 @@ def to_native(self, copy: bool = False) -> T.List[str]:
             # Only add groups if there are multiple libraries.
             if group_end > group_start >= 0:
                 # Last occurrence of a library
-                new.insert(group_end + 1, '-Wl,--end-group')
-                new.insert(group_start, '-Wl,--start-group')
+                self.insert(group_end + 1, '-Wl,--end-group')
+                self.insert(group_start, '-Wl,--start-group')
         # Remove system/default include paths added with -isystem
         default_dirs = self.compiler.get_default_include_dirs()
         if default_dirs:
             real_default_dirs = [self._cached_realpath(i) for i in default_dirs]
             bad_idx_list: T.List[int] = []
-            for i, each in enumerate(new):
+            for i, each in enumerate(self):
                 if not each.startswith('-isystem'):
                     continue
 
                 # Remove the -isystem and the path if the path is a default path
                 if each == '-isystem':
-                    if i < (len(new) - 1) and self._cached_realpath(new[i + 1]) in real_default_dirs:
+                    if i < (len(self) - 1) and self._cached_realpath(self[i + 1]) in real_default_dirs:
                         bad_idx_list += [i, i + 1]
                 elif each.startswith('-isystem='):
                     if self._cached_realpath(each[9:]) in real_default_dirs:
                         bad_idx_list += [i]
                 elif self._cached_realpath(each[8:]) in real_default_dirs:
                     bad_idx_list += [i]
             for i in reversed(bad_idx_list):
-                new.pop(i)
-        return self.compiler.unix_args_to_native(new._container)
+                self.pop(i)
 
     @staticmethod
     @functools.lru_cache(maxsize=None)

mesonbuild/compilers/rust.py

@@ -9,10 +9,13 @@
 import re
 import typing as T
 
+from .. import arglist
 from .. import options
+from ..linkers.linkers import GnuLikeDynamicLinkerMixin, SolarisDynamicLinker, CompCertDynamicLinker
 from ..mesonlib import EnvironmentException, MesonException, Popen_safe_logged
 from ..options import OptionKey
 from .compilers import Compiler, clike_debug_args
+from .mixins.clike import GROUP_FLAGS
 
 if T.TYPE_CHECKING:
     from ..coredata import MutableKeyedOptionDictType, KeyedOptionDictType
@@ -62,6 +65,37 @@
     except StopIteration:
         return None
 
+
+class RustcCompilerArgs(arglist.CompilerArgs):
+    def to_native_inplace(self) -> None:
+        assert isinstance(self.compiler, RustCompiler), 'How did you get here'
+
+        # Check if we need to add --start/end-group for circular dependencies
+        # between static libraries, and for recursively searching for symbols
+        # needed by static libraries that are provided by object files or
+        # shared libraries.
+        # This covers all ld.bfd, ld.gold, ld.gold, and xild on Linux, which
+        # all act like (or are) gnu ld
+        if isinstance(self.compiler.linker, (GnuLikeDynamicLinkerMixin, SolarisDynamicLinker, CompCertDynamicLinker)):
+            group_start = -1
+            group_end = -1
+            last_rustc_arg = -1
+            for i, each in enumerate(self):
+                if each in {'--emit', '-o', '--extern'}:
+                    last_rustc_arg = i
+                if last_rustc_arg == i - 1 or not GROUP_FLAGS.search(each):
+                    continue
+                group_end = i
+                if group_start < 0:
+                    # First occurrence of a library
+                    group_start = i
+            # Only add groups if there are multiple libraries.
+            if group_end > group_start >= 0:
+                # Last occurrence of a library
+                self.insert(group_end + 1, '-Clink-arg=-Wl,--end-group')
+                self.insert(group_start, '-Clink-arg=-Wl,--start-group')
+
+
 class RustCompiler(Compiler):
 
     # rustc doesn't invoke the compiler itself, it doesn't need a LINKER_PREFIX
@@ -100,6 +134,10 @@
             self.base_options.add(OptionKey('b_vscrt'))
         self.native_static_libs: T.List[str] = []
 
+    def compiler_args(self, args: T.Optional[T.Iterable[str]] = None) -> RustcCompilerArgs:
+        # This is correct, mypy just doesn't understand co-operative inheritance
+        return RustcCompilerArgs(self, args)
+
     def needs_static_linker(self) -> bool:
         return False
 

test cases/rust/27 staticlib group/lib1.c

@@ -0,0 +1,11 @@
+#include <stdio.h>
+#include "lib1.h"
+#include "lib2.h"
+
+void from_lib2(void) {
+    printf("hello world");
+}
+
+void c_func(void) {
+    from_lib1();
+}

test cases/rust/27 staticlib group/lib1.h

@@ -0,0 +1,4 @@
+#pragma once
+
+void from_lib2(void);
+void c_func(void);

test cases/rust/27 staticlib group/lib2.c

@@ -0,0 +1,8 @@
+#include <stdio.h>
+#include "lib1.h"
+#include "lib2.h"
+
+void from_lib1(void)
+{
+    from_lib2();
+}

test cases/rust/27 staticlib group/lib2.h

@@ -0,0 +1,3 @@
+#pragma once
+
+void from_lib1(void);

test cases/rust/27 staticlib group/main.c

@@ -0,0 +1,6 @@
+#include "lib1.h"
+#include "lib2.h"
+
+void main() {
+    c_func();
+}

test cases/rust/27 staticlib group/main.rs

@@ -0,0 +1,9 @@
+extern "C" {
+    fn c_func();
+}
+
+fn main() {
+    unsafe {
+        c_func();
+    }
+}

test cases/rust/27 staticlib group/meson.build

@@ -0,0 +1,13 @@
+project('staticlib group', 'c', 'rust')
+
+ld_bfd = find_program('ld.bfd')
+if not ld_bfd.found()
+  error('MESON_SKIP_TEST ld.bfd not found')
+endif
+
+lib1 = static_library('lib1', 'lib1.c')
+lib2 = static_library('lib2', 'lib2.c')
+executable('lib1first', 'main.rs', link_with : [lib1, lib2],
+  rust_args: ['-C', 'lto=n', '-C', 'linker-plugin-lto=n', '-Clink-arg=-fuse-ld=bfd'])
+executable('lib2first', 'main.rs', link_with : [lib2, lib1],
+  rust_args: ['-C', 'lto=n', '-C', 'linker-plugin-lto=n', '-Clink-arg=-fuse-ld=bfd'])