--- a/lld/ELF/EhFrame.cpp	Mon May 25 11:50:15 2020 +0900
+++ b/lld/ELF/EhFrame.cpp	Mon May 25 11:55:54 2020 +0900
@@ -29,9 +29,9 @@
 using namespace llvm::ELF;
 using namespace llvm::dwarf;
 using namespace llvm::object;
+using namespace lld;
+using namespace lld::elf;
 
-namespace lld {
-namespace elf {
 namespace {
 class EhReader {
 public:
@@ -56,7 +56,7 @@
 };
 }
 
-size_t readEhRecordSize(InputSectionBase *s, size_t off) {
+size_t elf::readEhRecordSize(InputSectionBase *s, size_t off) {
   return EhReader(s, s->data().slice(off)).readEhRecordSize();
 }
 
@@ -148,7 +148,7 @@
   d = d.slice(size);
 }
 
-uint8_t getFdeEncoding(EhSectionPiece *p) {
+uint8_t elf::getFdeEncoding(EhSectionPiece *p) {
   return EhReader(p->sec, p->data()).getFdeEncoding();
 }
 
@@ -194,6 +194,3 @@
   }
   return DW_EH_PE_absptr;
 }
-
-} // namespace elf
-} // namespace lld