move to compiler-rt

Author: arsnyder16

tools/system_libs.py

@@ -940,9 +940,10 @@ class libcompiler_rt(MTLibrary, SjLjLibrary):
   # restriction soon: https://reviews.llvm.org/D71738
   force_object_files = True
 
-  cflags = ['-fno-builtin', '-DNDEBUG']
+  cflags = ['-fno-builtin', '-DNDEBUG', '-DCOMPILER_RT_HAS_UNAME=1']
   src_dir = 'system/lib/compiler-rt/lib/builtins'
-  includes = ['system/lib/libc']
+  profile_src_dir = 'system/lib/compiler-rt/lib/profile'
+  includes = ['system/lib/libc', 'system/lib/compiler-rt/include']
   excludes = [
     # gcc_personality_v0.c depends on libunwind, which don't include by default.
     'gcc_personality_v0.c',
@@ -970,6 +971,8 @@ class libcompiler_rt(MTLibrary, SjLjLibrary):
     'trunctfxf2.c',
   ]
   src_files = glob_in_path(src_dir, '*.c', excludes=excludes)
+  src_files += glob_in_path(profile_src_dir, '*.c')
+  src_files += glob_in_path(profile_src_dir, '*.cpp')
   src_files += files_in_path(
       path='system/lib/compiler-rt',
       filenames=[
@@ -2082,15 +2085,6 @@ class CompilerRTLibrary(Library):
   # restriction soon: https://reviews.llvm.org/D71738
   force_object_files = True
 
-class libcompiler_rt_profile(Library):
-  name = 'libcompiler_rt_profile'
-
-  cflags = ['-fno-builtin', '-DCOMPILER_RT_HAS_UNAME=1']
-  includes = ['system/lib/libc', 'system/lib/compiler-rt/include']
-  src_dir = 'system/lib/compiler-rt/lib/profile'
-  src_files = glob_in_path(src_dir, '*.c')
-  src_files += glob_in_path(src_dir, '*.cpp')
-
 class libubsan_minimal_rt(CompilerRTLibrary, MTLibrary):
   name = 'libubsan_minimal_rt'
   never_force = True
@@ -2365,7 +2359,6 @@ def add_sanitizer_libs():
 
   if only_forced:
     add_library('libcompiler_rt')
-    add_library('libcompiler_rt_profile')
     add_sanitizer_libs()
     add_forced_libs()
     return libs_to_link
@@ -2403,7 +2396,6 @@ def add_sanitizer_libs():
     elif settings.MALLOC != 'none':
       add_library('libmalloc')
   add_library('libcompiler_rt')
-  add_library('libcompiler_rt_profile')
   if settings.LINK_AS_CXX:
     add_library('libc++')
   if settings.LINK_AS_CXX or sanitize: