Revert "gn build: Add support for building the standalone ubsan runtime."

As well as followup commits.
Build is still failing on mac. I'll debug it locally.
http://45.33.8.238/macm1/37269/step_4.txt

This reverts commit ee21411107aa18e191a25380b9e4679f3909a0c7.
This reverts commit 6ef9af6386fe7cd9d5d93342c430528baa8d1026.
This reverts commit b49bd8e07faf0f4d04e6cdfe33d901a2cd8b2346.

diff --git a/llvm/utils/gn/secondary/compiler-rt/gen_version_script.gni b/llvm/utils/gn/secondary/compiler-rt/gen_version_script.gni
deleted file mode 100644 (file)
index 5b5ffe3..0000000
--- a/llvm/utils/gn/secondary/compiler-rt/gen_version_script.gni
+++ /dev/null
@@ -1,28 +0,0 @@
-import("//compiler-rt/target.gni")
-
-template("gen_version_script") {
-  if (current_os != "mac" && current_os != "win") {
-    action(target_name) {
-      script = "//compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py"
-      sources = [ invoker.extra ]
-      deps = invoker.libs
-      outputs = [ invoker.output ]
-      args = [
-        "--version-list",
-        "--extra",
-        rebase_path(invoker.extra, root_build_dir),
-      ]
-      foreach(lib_name, invoker.lib_names) {
-        args += [ rebase_path(
-                "$crt_current_out_dir/libclang_rt.$lib_name$crt_current_target_suffix.a",
-                root_build_dir) ]
-      }
-      args += [
-        "--nm-executable",
-        "nm",
-        "-o",
-        rebase_path(invoker.output, root_build_dir),
-      ]
-    }
-  }
-}

diff --git a/llvm/utils/gn/secondary/compiler-rt/lib/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/BUILD.gn
index 92bd37f5495dff2234358ad08df11fa175bd38e0..52c6431f1f67b8aac742985e28efba81029505ee 100644 (file)
--- a/llvm/utils/gn/secondary/compiler-rt/lib/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/BUILD.gn
@@ -21,7 +21,4 @@ group("lib") {
   if (current_os != "baremetal") {
     deps += [ "//compiler-rt/lib/profile" ]
   }
-  if (current_os != "win" && current_os != "mac" && current_os != "baremetal") {
-    deps += [ "//compiler-rt/lib/ubsan:ubsan_shared" ]
-  }
 }

diff --git a/llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn
index f14c41bfc00c41da37ccc81e7befbef0f0a6abb4..f95aec83fe2ccec082afe37ae444495a086ce159 100644 (file)
--- a/llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn
@@ -1,4 +1,3 @@
-import("//compiler-rt/gen_version_script.gni")
 import("//compiler-rt/target.gni")
 
 if (current_cpu == "x64") {
@@ -7,16 +6,28 @@ if (current_cpu == "x64") {
   hwasan_name = "hwasan"
 }
 
-gen_version_script("version_script") {
-  extra = "hwasan.syms.extra"
-  output = "$target_gen_dir/hwasan.vers"
-  libs = [
+action("version_script") {
+  script = "//compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py"
+  sources = [ "hwasan.syms.extra" ]
+  deps = [
     ":hwasan",
     ":hwasan_cxx",
   ]
-  lib_names = [
-    "$hwasan_name",
-    "${hwasan_name}_cxx",
+  outputs = [ "$target_gen_dir/hwasan.vers" ]
+  args = [
+    "--version-list",
+    "--extra",
+    rebase_path(sources[0], root_build_dir),
+    rebase_path(
+        "$crt_current_out_dir/libclang_rt.$hwasan_name$crt_current_target_suffix.a",
+        root_build_dir),
+    rebase_path(
+        "$crt_current_out_dir/libclang_rt.${hwasan_name}_cxx$crt_current_target_suffix.a",
+        root_build_dir),
+    "--nm-executable",
+    "nm",
+    "-o",
+    rebase_path(outputs[0], root_build_dir),
   ]
 }
 

diff --git a/llvm/utils/gn/secondary/compiler-rt/lib/ubsan/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/ubsan/BUILD.gn
index af47149074d55894bc8374c45e591480545d08ed..35b4c20315753a8edb33bbd7031c18082b09dd84 100644 (file)
--- a/llvm/utils/gn/secondary/compiler-rt/lib/ubsan/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/ubsan/BUILD.gn
@@ -1,19 +1,3 @@
-import("//compiler-rt/gen_version_script.gni")
-import("//compiler-rt/target.gni")
-
-gen_version_script("version_script") {
-  extra = "ubsan.syms.extra"
-  output = "$target_gen_dir/ubsan.vers"
-  libs = [
-    ":ubsan",
-    ":ubsan_cxx",
-  ]
-  lib_names = [
-    "ubsan_standalone",
-    "ubsan_standalone_cxx",
-  ]
-}
-
 source_set("sources") {
   configs -= [ "//llvm/utils/gn/build:llvm_code" ]
   configs += [ "//llvm/utils/gn/build:crt_code" ]
@@ -62,6 +46,7 @@ source_set("dynamic_runtime_thunk") {
   sources = [ "ubsan_win_dynamic_runtime_thunk.cpp" ]
 }
 
+# Unreferenced; at the moment exists to make sync_source_lists_from_cmake happy.
 source_set("standalone_sources") {
   configs -= [ "//llvm/utils/gn/build:llvm_code" ]
   configs -= [ "//llvm/utils/gn/build:no_rtti" ]
@@ -87,45 +72,3 @@ source_set("cxx_sources") {
     "ubsan_type_hash_win.cpp",
   ]
 }
-
-static_library("ubsan") {
-  output_dir = crt_current_out_dir
-  output_name = "clang_rt.ubsan_standalone$crt_current_target_suffix"
-  complete_static_lib = true
-  configs -= [
-    "//llvm/utils/gn/build:llvm_code",
-    "//llvm/utils/gn/build:thin_archive",
-  ]
-  configs += [ "//llvm/utils/gn/build:crt_code" ]
-  deps = [
-    ":sources",
-    ":standalone_sources",
-  ]
-}
-
-static_library("ubsan_cxx") {
-  output_dir = crt_current_out_dir
-  output_name = "clang_rt.ubsan_standalone_cxx$crt_current_target_suffix"
-  complete_static_lib = true
-  configs -= [
-    "//llvm/utils/gn/build:llvm_code",
-    "//llvm/utils/gn/build:thin_archive",
-  ]
-  configs += [ "//llvm/utils/gn/build:crt_code" ]
-  deps = [ ":cxx_sources" ]
-}
-
-shared_library("ubsan_shared") {
-  output_dir = crt_current_out_dir
-  output_name = "clang_rt.ubsan_standalone$crt_current_target_suffix"
-  configs -= [ "//llvm/utils/gn/build:llvm_code" ]
-  configs += [ "//llvm/utils/gn/build:crt_code" ]
-  deps = [
-    ":cxx_sources",
-    ":sources",
-    ":standalone_sources",
-    ":version_script",
-  ]
-  inputs = [ "$target_gen_dir/ubsan.vers" ]
-  ldflags = [ "-Wl,--version-script," + rebase_path(inputs[0], root_build_dir) ]
-}