Merge pull request ClangBuiltLinux#316 from nathanchance/handle-sframe-mismatch

Avoid .sframe version mismatch errors

Author: nathanchance

tc_build/binutils.py

@@ -3,6 +3,7 @@
 import os
 from pathlib import Path
 import platform
+import subprocess
 from tempfile import TemporaryDirectory
 
 from tc_build.builder import Builder
@@ -52,6 +53,15 @@ def build(self):
         self.configure_vars['CFLAGS'] = ' '.join(self.cflags)
         self.configure_vars['CXXFLAGS'] = ' '.join(self.cflags)
 
+        # Avoid "input SFrame sections with different format versions prevent
+        # .sframe generation" error by discarding .sframe altogether if
+        # possible, as we may be linking against libraries with their own
+        # .sframe sections and versions.
+        ld_help = subprocess.run(['ld', '--help'], capture_output=True, check=True,
+                                 text=True).stdout
+        if '--discard-sframe' in ld_help:
+            self.configure_vars['LDFLAGS'] = '-Wl,--discard-sframe'
+
         self.clean_build_folder()
         self.folders.build.mkdir(exist_ok=True, parents=True)
         tc_build.utils.print_header(f"Building {self.target} binutils")

tc_build/kernel.py

@@ -37,13 +37,16 @@ def __init__(self, arch):
         self.toolchain_version = ()
 
     def build(self):
+        bin_folder = Path(self.toolchain_prefix, 'bin')
         if self.bolt_instrumentation:
-            self.make_variables['CC'] = Path(self.toolchain_prefix, 'bin/clang.inst')
+            self.make_variables['CC'] = Path(bin_folder, 'clang.inst')
         # The user may have configured clang without the host target, in which
         # case we need to use GCC for compiling the host utilities.
         if self.can_use_clang_as_hostcc():
             if 'CC' in self.make_variables:
                 self.make_variables['HOSTCC'] = self.make_variables['CC']
+            if self._test_clang(ld_path := f"--ld-path={bin_folder}/ld.lld"):
+                self.make_variables['HOSTLDFLAGS'] = ld_path
         else:
             self.make_variables['HOSTCC'] = 'gcc'
             self.make_variables['HOSTCXX'] = 'g++'
@@ -54,7 +57,7 @@ def build(self):
                 )
                 return
             self.make_variables['CROSS_COMPILE'] = self.cross_compile
-        self.make_variables['LLVM'] = f"{self.toolchain_prefix}/bin/"
+        self.make_variables['LLVM'] = f"{bin_folder}/"
         if not self.can_use_ias():
             self.make_variables['LLVM_IAS'] = '0'
         self.make_variables['O'] = self.folders.build
@@ -136,18 +139,35 @@ def get_toolchain_version(self):
         return self.toolchain_version
 
     def can_use_clang_as_hostcc(self):
+        return self._test_clang('-c')
+
+    def needs_binutils(self):
+        return not self.can_use_ias()
+
+    def _test_clang(self, args=None):
         clang = Path(self.toolchain_prefix, 'bin/clang')
+
+        clang_args = ['-x', 'c', '-o', '/dev/null', '-']
+        if args:
+            if isinstance(args, str):
+                clang_args.append(args)
+            elif isinstance(args, list):
+                clang_args.extend(args)
+            else:
+                raise ValueError(f"Invalid type for args: {args}")
+
+        prog = 'int main(void) { return 0; }'
+
         try:
-            subprocess.run([clang, '-x', 'c', '-c', '-o', '/dev/null', '/dev/null'],
+            subprocess.run([clang, *clang_args],
                            capture_output=True,
-                           check=True)
+                           check=True,
+                           input=prog,
+                           text=True)
         except subprocess.CalledProcessError:
             return False
         return True
 
-    def needs_binutils(self):
-        return not self.can_use_ias()
-
 
 class ArmKernelBuilder(KernelBuilder):