Merge pull request #287 from nathanchance/6.13.0-kgr-uprev

ClangBuiltLinux · Jan 29, 2025 · 8572c62 · 8572c62
2 parents d2c105c + f1f5998
commit 8572c62
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/build-llvm.py b/build-llvm.py
@@ -14,10 +14,10 @@
 from tc_build.tools import HostTools, StageTools
 
 # This is a known good revision of LLVM for building the kernel
-GOOD_REVISION = '2ab9233f4f393c240c37ef092de09d907fe5c890'
+GOOD_REVISION = '5ce271ef74dd3325993c827f496e460ced41af11'
 
 # The version of the Linux kernel that the script downloads if necessary
-DEFAULT_KERNEL_FOR_PGO = (6, 12, 0)
+DEFAULT_KERNEL_FOR_PGO = (6, 13, 0)
 
 parser = ArgumentParser(formatter_class=RawTextHelpFormatter)
 clone_options = parser.add_mutually_exclusive_group()

diff --git a/tc_build/binutils.py b/tc_build/binutils.py
@@ -18,6 +18,7 @@ def __init__(self):
         self.configure_flags = [
             '--disable-compressed-debug-sections',
             '--disable-gdb',
+            '--disable-gprofng',
             '--disable-nls',
             '--disable-werror',
             '--enable-deterministic-archives',
@@ -27,9 +28,6 @@ def __init__(self):
             '--quiet',
             '--with-system-zlib',
         ]
-        # gprofng uses glibc APIs that might not be available on musl
-        if tc_build.utils.libc_is_musl():
-            self.configure_flags.append('--disable-gprofng')
         self.configure_vars = {
             'CC': 'gcc',
             'CXX': 'g++',