[llvm] c052510 - gn build: (manually) Port ae032e27 and 21f83113.

[Peter Collingbourne via llvm-commits]

Author: Peter Collingbourne
Date: 2020-11-10T15:50:40-08:00
New Revision: c052510c0b0d445d2c2b5fd7f6166016275a03a1

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

LOG: gn build: (manually) Port ae032e27 and 21f83113.

__register_frame and __deregister_frame are associated with the
.eh_frame section, which I think is used on all of our platforms
except Windows and 32-bit ARM (which uses the ARM EHABI).

Also add a file that was added to lld/MachO.

Added: 
    

Modified: 
    llvm/utils/gn/secondary/lld/MachO/BUILD.gn
    llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/lld/MachO/BUILD.gn b/llvm/utils/gn/secondary/lld/MachO/BUILD.gn
index 52d54d6b4e57..5e163d1a132d 100644
--- a/llvm/utils/gn/secondary/lld/MachO/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/MachO/BUILD.gn
@@ -28,6 +28,7 @@ static_library("MachO2") {
     "ExportTrie.cpp",
     "InputFiles.cpp",
     "InputSection.cpp",
+    "LTO.cpp",
     "MergedOutputSection.cpp",
     "ObjC.cpp",
     "OutputSection.cpp",

diff  --git a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
index 1ef33cd177a2..8e0f9225e0f5 100644
--- a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
@@ -190,6 +190,18 @@ write_cmake_config("config") {
     ]
   }
 
+  if (current_os == "win" || current_cpu == "arm") {
+    values += [
+      "HAVE_DEREGISTER_FRAME=",
+      "HAVE_REGISTER_FRAME=",
+    ]
+  } else {
+    values += [
+      "HAVE_DEREGISTER_FRAME=1",
+      "HAVE_REGISTER_FRAME=1",
+    ]
+  }
+
   if (current_os == "win") {
     values += [
       "HAVE_DECL_STRERROR_S=1",