[llvm] f73f367 - [gn build] Move -fno-builtin to crt_code

[Arthur Eubanks via llvm-commits]

Author: Arthur Eubanks
Date: 2022-01-26T18:33:35-08:00
New Revision: f73f367f72665fade97f04fa68b4fa83e7f28dbf

URL: https://github.com/llvm/llvm-project/commit/f73f367f72665fade97f04fa68b4fa83e7f28dbf
DIFF: https://github.com/llvm/llvm-project/commit/f73f367f72665fade97f04fa68b4fa83e7f28dbf.diff

LOG: [gn build] Move -fno-builtin to crt_code

crt_code seems to correspond to SANITIZER_COMMON_CFLAGS which contains -fno-builtin.

Reviewed By: thakis

Differential Revision: https://reviews.llvm.org/D118288

Added: 
    

Modified: 
    llvm/utils/gn/build/BUILD.gn
    llvm/utils/gn/secondary/compiler-rt/lib/asan/BUILD.gn
    llvm/utils/gn/secondary/compiler-rt/lib/msan/BUILD.gn
    llvm/utils/gn/secondary/compiler-rt/lib/tsan/rtl/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/build/BUILD.gn b/llvm/utils/gn/build/BUILD.gn
index ce2c6f9417a65..d97cdcb803fdb 100644
--- a/llvm/utils/gn/build/BUILD.gn
+++ b/llvm/utils/gn/build/BUILD.gn
@@ -444,6 +444,7 @@ config("crt_code") {
     "-funwind-tables",
     "-gline-tables-only",
     "-fvisibility=hidden",
+    "-fno-builtin",
   ]
   if (is_clang) {
     cflags += [

diff  --git a/llvm/utils/gn/secondary/compiler-rt/lib/asan/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/asan/BUILD.gn
index 57374f5ad2ae4..c6a2f9899e050 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/asan/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/asan/BUILD.gn
@@ -102,9 +102,7 @@ target(asan_target_type, "asan") {
     sources += [ "asan_interceptors_vfork.S" ]
   }
 
-  # FIXME: have SANITIZER_COMMON_CFLAGS thingy? should fno-builtin be in
-  # crt_code?
-  cflags = [ "-fno-builtin" ]
+  cflags = []
   if (target_os != "win") {
     cflags += [ "-ftls-model=initial-exec" ]
   }

diff  --git a/llvm/utils/gn/secondary/compiler-rt/lib/msan/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/msan/BUILD.gn
index ea933b30f7932..83539acea3f56 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/msan/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/msan/BUILD.gn
@@ -39,11 +39,7 @@ static_library("msan") {
     "msan_thread.h",
   ]
 
-  # FIXME: have SANITIZER_COMMON_CFLAGS thingy? should fno-builtin be in
-  # crt_code?
-  cflags = [ "-fno-builtin" ]
-
-  cflags += [ "-fPIE" ]
+  cflags = [ "-fPIE" ]
 
   # Prevent clang from generating libc calls.
   cflags += [ "-ffreestanding" ]

diff  --git a/llvm/utils/gn/secondary/compiler-rt/lib/tsan/rtl/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/tsan/rtl/BUILD.gn
index 3f6db757f48ea..a4004bb4c897a 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/tsan/rtl/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/tsan/rtl/BUILD.gn
@@ -128,10 +128,6 @@ target(tsan_target_type, "rtl") {
     sources += [ "tsan_rtl_s390x.S" ]
   }
 
-  # FIXME: have SANITIZER_COMMON_CFLAGS thingy? should fno-builtin be in
-  # crt_code?
-  cflags += [ "-fno-builtin" ]
-
   # FIXME: link rt dl m pthread log
   # FIXME: dep on libcxx-headers?
   # FIXME: add_sanitizer_rt_version_list (cf hwasan)