[llvm] 0ed2170 - [DWARFLinker][dsymutil] followup for 88c2137b6d49f88186d0957a4e2d8030a3967334

[Alexey Lapshin via llvm-commits]

Author: Alexey Lapshin
Date: 2020-04-08T16:46:52+03:00
New Revision: 0ed2170dc47718b0c0f4907d14676839a1210a8a

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

LOG: [DWARFLinker][dsymutil] followup for 88c2137b6d49f88186d0957a4e2d8030a3967334

That patch is a followup for "Move DwarfStreamer into DWARFLinker".
It fixes build with LLVM_LINK_LLVM_DYLIB.

Added: 
    

Modified: 
    llvm/lib/DWARFLinker/DWARFStreamer.cpp
    llvm/tools/dsymutil/DwarfLinkerForBinary.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/DWARFLinker/DWARFStreamer.cpp b/llvm/lib/DWARFLinker/DWARFStreamer.cpp
index 5b38b584dcbe..e900335f24b3 100644
--- a/llvm/lib/DWARFLinker/DWARFStreamer.cpp
+++ b/llvm/lib/DWARFLinker/DWARFStreamer.cpp
@@ -27,8 +27,6 @@
 
 namespace llvm {
 
-static mc::RegisterMCTargetOptionsFlags MOF;
-
 bool DwarfStreamer::init(Triple TheTriple) {
   std::string ErrorStr;
   std::string TripleName;

diff  --git a/llvm/tools/dsymutil/DwarfLinkerForBinary.cpp b/llvm/tools/dsymutil/DwarfLinkerForBinary.cpp
index 4e99e5f8de09..131b705f9434 100644
--- a/llvm/tools/dsymutil/DwarfLinkerForBinary.cpp
+++ b/llvm/tools/dsymutil/DwarfLinkerForBinary.cpp
@@ -83,6 +83,7 @@
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"
+#include "llvm/MC/MCTargetOptionsCommandFlags.h"
 #include <algorithm>
 #include <cassert>
 #include <cinttypes>
@@ -100,6 +101,9 @@
 #include <vector>
 
 namespace llvm {
+
+static mc::RegisterMCTargetOptionsFlags MOF;
+
 namespace dsymutil {
 
 static Error copySwiftInterfaces(