diff --git a/CMakeLists.txt b/CMakeLists.txt
index 998da172fccdd002da61350ad34314beffce18e3..56df04a0c233121057b02e50994d8202dfa62f26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,6 +88,7 @@ else()
     set(EMBEDDED_LLD_LIB_SOURCES
         "${CMAKE_SOURCE_DIR}/deps/lld/Common/Args.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/Common/ErrorHandler.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/Common/Filesystem.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/Common/Memory.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/Common/Reproduce.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/Common/Strings.cpp"
@@ -148,7 +149,6 @@ else()
         "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Driver.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/ELF/DriverUtils.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/ELF/EhFrame.cpp"
-        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Filesystem.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/ELF/ICF.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/ELF/InputFiles.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/ELF/InputSection.cpp"
@@ -171,6 +171,7 @@ else()
     set(EMBEDDED_LLD_COFF_SOURCES
         "${CMAKE_SOURCE_DIR}/deps/lld/COFF/Chunks.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/COFF/DLL.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/COFF/DebugTypes.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/COFF/Driver.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/COFF/DriverUtils.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/COFF/ICF.cpp"
@@ -194,8 +195,10 @@ else()
         "${CMAKE_SOURCE_DIR}/deps/lld/wasm/LTO.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/wasm/MarkLive.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/wasm/OutputSections.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/wasm/Relocations.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/wasm/SymbolTable.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/wasm/Symbols.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/wasm/SyntheticSections.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/wasm/Writer.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/wasm/WriterUtils.cpp"
     )
diff --git a/deps/lld-prebuilt/COFF/Options.inc b/deps/lld-prebuilt/COFF/Options.inc
index 16044cce7399b7f80c7d3479f038f0f2662e897f..c468991d28d05a92193c0856c4580e97d7ff26fc 100644
--- a/deps/lld-prebuilt/COFF/Options.inc
+++ b/deps/lld-prebuilt/COFF/Options.inc
@@ -13,9 +13,8 @@
 #define COMMA ,
 PREFIX(prefix_0, {nullptr})
 PREFIX(prefix_2, {"--" COMMA nullptr})
-PREFIX(prefix_3, {"/" COMMA "-" COMMA nullptr})
-PREFIX(prefix_1, {"/" COMMA "-" COMMA "-?" COMMA nullptr})
-PREFIX(prefix_4, {"/?" COMMA "-?" COMMA nullptr})
+PREFIX(prefix_1, {"/" COMMA "-" COMMA "/?" COMMA "-?" COMMA nullptr})
+PREFIX(prefix_3, {"/??" COMMA "-??" COMMA "/?" COMMA "-?" COMMA nullptr})
 #undef COMMA
 #endif // PREFIX
 
@@ -61,13 +60,17 @@ OPTION(prefix_1, "debugtype:", debugtype, Joined, INVALID, INVALID, nullptr, 0,
        "Debug Info Options", nullptr, nullptr)
 OPTION(prefix_1, "debug", debug, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Embed a symbol table in the image", nullptr, nullptr)
-OPTION(prefix_3, "def:", deffile, Joined, INVALID, INVALID, nullptr, 0, 0,
+OPTION(prefix_1, "def:", deffile, Joined, INVALID, INVALID, nullptr, 0, 0,
        "Use module-definition file", nullptr, nullptr)
 OPTION(prefix_1, "defaultlib:", defaultlib, Joined, INVALID, INVALID, nullptr, 0, 0,
        "Add the library to the list of input files", nullptr, nullptr)
 OPTION(prefix_1, "delay:", delay, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "delayload:", delayload, Joined, INVALID, INVALID, nullptr, 0, 0,
        "Delay loaded DLL name", nullptr, nullptr)
+OPTION(prefix_1, "demangle:no", demangle_no, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Do not demangle symbols in output", nullptr, nullptr)
+OPTION(prefix_1, "demangle", demangle, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Demangle symbols in output (default)", nullptr, nullptr)
 OPTION(prefix_1, "disallowlib:", disallowlib, Joined, INVALID, nodefaultlib, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "dll", dll, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Create a DLL", nullptr, nullptr)
@@ -83,22 +86,29 @@ OPTION(prefix_1, "entry:", entry, Joined, INVALID, INVALID, nullptr, 0, 0,
 OPTION(prefix_1, "errorlimit:", errorlimit, Joined, INVALID, INVALID, nullptr, 0, 0,
        "Maximum number of errors to emit before stopping (0 = no limit)", nullptr, nullptr)
 OPTION(prefix_1, "errorreport:", errorreport, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_1, "exclude-all-symbols", exclude_all_symbols, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "export-all-symbols", export_all_symbols, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "export:", export, Joined, INVALID, INVALID, nullptr, 0, 0,
        "Export a function", nullptr, nullptr)
 OPTION(prefix_1, "failifmismatch:", failifmismatch, Joined, INVALID, INVALID, nullptr, 0, 0,
        "", nullptr, nullptr)
 OPTION(prefix_1, "fastfail", fastfail, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_1, "filealign:", filealign, Joined, INVALID, INVALID, nullptr, 0, 0,
+       "Section alignment in the output file", nullptr, nullptr)
 OPTION(prefix_1, "fixed:no", fixed_no, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Enable base relocations (default)", nullptr, nullptr)
 OPTION(prefix_1, "fixed", fixed, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Disable base relocations", nullptr, nullptr)
+OPTION(prefix_1, "force:multipleres", force_multipleres, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Allow multiply defined resources when creating executables", nullptr, nullptr)
 OPTION(prefix_1, "force:multiple", force_multiple, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Allow multiply defined symbols when creating executables", nullptr, nullptr)
 OPTION(prefix_1, "force:unresolved", force_unresolved, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Allow undefined symbols when creating executables", nullptr, nullptr)
 OPTION(prefix_1, "force", force, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Allow undefined and multiply defined symbols when creating executables", nullptr, nullptr)
+OPTION(prefix_1, "functionpadmin:", functionpadmin_opt, Joined, INVALID, INVALID, nullptr, 0, 0,
+       "Prepares an image for hotpatching", nullptr, nullptr)
 OPTION(prefix_1, "functionpadmin", functionpadmin, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "guard:", guard, Joined, INVALID, INVALID, nullptr, 0, 0,
        "Control flow guard", nullptr, nullptr)
@@ -116,8 +126,10 @@ OPTION(prefix_1, "ignore:", ignore, Joined, INVALID, INVALID, nullptr, 0, 0,
 OPTION(prefix_1, "ignoreidl", ignoreidl, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "implib:", implib, Joined, INVALID, INVALID, nullptr, 0, 0,
        "Import library name", nullptr, nullptr)
-OPTION(prefix_3, "include:", incl, Joined, INVALID, INVALID, nullptr, 0, 0,
+OPTION(prefix_1, "include:", incl, Joined, INVALID, INVALID, nullptr, 0, 0,
        "Force symbol to be added to symbol table as undefined one", nullptr, nullptr)
+OPTION(prefix_1, "includeoptional:", include_optional, Joined, INVALID, INVALID, nullptr, 0, 0,
+       "Add symbol as undefined, but allow it to remain undefined", nullptr, nullptr)
 OPTION(prefix_1, "incremental:no", incremental_no, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Overwrite import library even if contents are unchanged", nullptr, nullptr)
 OPTION(prefix_1, "incremental", incremental, Flag, INVALID, INVALID, nullptr, 0, 0,
@@ -141,7 +153,7 @@ OPTION(prefix_1, "lldltocache:", lldltocache, Joined, INVALID, INVALID, nullptr,
        "Path to ThinLTO cached object file directory", nullptr, nullptr)
 OPTION(prefix_1, "lldltocachepolicy:", lldltocachepolicy, Joined, INVALID, INVALID, nullptr, 0, 0,
        "Pruning policy for the ThinLTO cache", nullptr, nullptr)
-OPTION(prefix_3, "lldmap:", lldmap_file, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_1, "lldmap:", lldmap_file, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "lldmap", lldmap, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "lldmingw", lldmingw, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "lldsavetemps", lldsavetemps, Flag, INVALID, INVALID, nullptr, 0, 0,
@@ -186,7 +198,7 @@ OPTION(prefix_1, "order:", order, Joined, INVALID, INVALID, nullptr, 0, 0,
        "Put functions in order", nullptr, nullptr)
 OPTION(prefix_1, "out:", out, Joined, INVALID, INVALID, nullptr, 0, 0,
        "Path to file to write output", nullptr, nullptr)
-OPTION(prefix_3, "output-def:", output_def, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_1, "output-def:", output_def, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "pdb:", pdb, Joined, INVALID, INVALID, nullptr, 0, 0,
        "PDB file path", nullptr, nullptr)
 OPTION(prefix_1, "pdbaltpath:", pdbaltpath, Joined, INVALID, INVALID, nullptr, 0, 0,
@@ -208,8 +220,27 @@ OPTION(prefix_1, "stub:", stub, Joined, INVALID, INVALID, nullptr, 0, 0,
        "Specify DOS stub file", nullptr, nullptr)
 OPTION(prefix_1, "subsystem:", subsystem, Joined, INVALID, INVALID, nullptr, 0, 0,
        "Specify subsystem", nullptr, nullptr)
-OPTION(prefix_1, "swaprun:cd", swaprun_cd, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_1, "swaprun:net", swaprun_net, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_1, "summary", summary, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_1, "swaprun:cd", swaprun_cd, Flag, INVALID, swaprun, "cd\0", 0, 0,
+       "Make loader run output binary from swap instead of from CD", nullptr, nullptr)
+OPTION(prefix_1, "swaprun:net", swaprun_net, Flag, INVALID, swaprun, "net\0", 0, 0,
+       "Make loader run output binary from swap instead of from network", nullptr, nullptr)
+OPTION(prefix_1, "swaprun:", swaprun, Joined, INVALID, INVALID, nullptr, 0, 0,
+       "Comma-separated list of 'cd' or 'net'", nullptr, nullptr)
+OPTION(prefix_1, "thinlto-emit-imports-files", thinlto_emit_imports_files, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Emit .imports files with -thinlto-index-only", nullptr, nullptr)
+OPTION(prefix_1, "thinlto-index-only:", thinlto_index_only_arg, Joined, INVALID, INVALID, nullptr, 0, 0,
+       "-thinlto-index-only and also write native module names to file", nullptr, nullptr)
+OPTION(prefix_1, "thinlto-index-only", thinlto_index_only, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Instead of linking, emit ThinLTO index files", nullptr, nullptr)
+OPTION(prefix_1, "thinlto-object-suffix-replace:", thinlto_object_suffix_replace, Joined, INVALID, INVALID, nullptr, 0, 0,
+       "'old;new' replace old suffix with new suffix in ThinLTO index", nullptr, nullptr)
+OPTION(prefix_1, "thinlto-prefix-replace:", thinlto_prefix_replace, Joined, INVALID, INVALID, nullptr, 0, 0,
+       "'old;new' replace old prefix with new prefix in ThinLTO outputs", nullptr, nullptr)
+OPTION(prefix_1, "threads:no", threads_no, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Do not run the linker multi-threaded", nullptr, nullptr)
+OPTION(prefix_1, "threads", threads, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Run the linker multi-threaded (default)", nullptr, nullptr)
 OPTION(prefix_1, "throwingnew", throwingnew, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "timestamp:", timestamp, Joined, INVALID, INVALID, nullptr, 0, 0,
        "Specify the PE header timestamp", nullptr, nullptr)
@@ -233,7 +264,7 @@ OPTION(prefix_1, "WX:no", WX_no, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Don't treat warnings as errors", nullptr, nullptr)
 OPTION(prefix_1, "WX", WX, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Treat warnings as errors", nullptr, nullptr)
-OPTION(prefix_4, "", help_q, Flag, INVALID, help, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_3, "", help_q, Flag, INVALID, help, nullptr, 0, 0, nullptr, nullptr, nullptr)
 #endif // OPTION
 
 #ifdef OPTTABLE_ARG_INIT
diff --git a/deps/lld-prebuilt/ELF/Options.inc b/deps/lld-prebuilt/ELF/Options.inc
index 0c331248ccc0d255883ac11bb06ad9b2501c0e68..5407eb7a18442a52b9f5c219a5563b9d56efe346 100644
--- a/deps/lld-prebuilt/ELF/Options.inc
+++ b/deps/lld-prebuilt/ELF/Options.inc
@@ -29,13 +29,14 @@ PREFIX(prefix_2, {"--" COMMA "-" COMMA nullptr})
 
 OPTION(prefix_0, "<input>", INPUT, Input, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_0, "<unknown>", UNKNOWN, Unknown, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_1, "(", anonymous_30, Flag, INVALID, start_group, nullptr, 0, 0,
+OPTION(prefix_1, "(", anonymous_31, Flag, INVALID, start_group, nullptr, 0, 0,
        "Alias for --start-group", nullptr, nullptr)
 OPTION(prefix_1, ")", anonymous_12, Flag, INVALID, end_group, nullptr, 0, 0,
        "Alias for --end-group", nullptr, nullptr)
 OPTION(prefix_2, "allow-multiple-definition", allow_multiple_definition, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Allow multiple definitions", nullptr, nullptr)
-OPTION(prefix_2, "allow-shlib-undefined", anonymous_47, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "allow-shlib-undefined", allow_shlib_undefined, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Allow unresolved references in shared libraries (default when linking a shared library)", nullptr, nullptr)
 OPTION(prefix_2, "apply-dynamic-relocs", apply_dynamic_relocs, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Apply link-time values for dynamic relocations", nullptr, nullptr)
 OPTION(prefix_2, "as-needed", as_needed, Flag, INVALID, INVALID, nullptr, 0, 0,
@@ -45,7 +46,7 @@ OPTION(prefix_2, "auxiliary=", auxiliary_eq, Joined, INVALID, auxiliary, nullptr
 OPTION(prefix_2, "auxiliary", auxiliary, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "Bdynamic", Bdynamic, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Link against shared libraries (default)", nullptr, nullptr)
-OPTION(prefix_2, "Bshareable", anonymous_28, Flag, INVALID, shared, nullptr, 0, 0,
+OPTION(prefix_2, "Bshareable", anonymous_29, Flag, INVALID, shared, nullptr, 0, 0,
        "Alias for --shared", nullptr, nullptr)
 OPTION(prefix_2, "Bstatic", Bstatic, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Do not link against shared libraries", nullptr, nullptr)
@@ -87,7 +88,9 @@ OPTION(prefix_2, "defsym=", defsym_eq, Joined, INVALID, defsym, nullptr, 0, 0,
 OPTION(prefix_2, "defsym", defsym, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, "<symbol>=<value>", nullptr)
 OPTION(prefix_2, "demangle", demangle, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Demangle symbol names (default)", nullptr, nullptr)
-OPTION(prefix_2, "detect-odr-violations", anonymous_48, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "dependent-libraries", dependent_libraries, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Process dependent library specifiers from input files (default)", nullptr, nullptr)
+OPTION(prefix_2, "detect-odr-violations", anonymous_50, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "disable-new-dtags", disable_new_dtags, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Disable new dynamic tags", nullptr, nullptr)
 OPTION(prefix_2, "disable-verify", disable_verify, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
@@ -111,10 +114,10 @@ OPTION(prefix_2, "dy", anonymous_2, Flag, INVALID, Bdynamic, nullptr, 0, 0,
        "Alias for --Bdynamic", nullptr, nullptr)
 OPTION(prefix_1, "d", anonymous_6, Flag, INVALID, define_common, nullptr, 0, 0,
        "Alias for --define-common", nullptr, nullptr)
-OPTION(prefix_2, "EB", anonymous_65, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "EB", anonymous_69, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "eh-frame-hdr", eh_frame_hdr, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Request creation of .eh_frame_hdr section and PT_GNU_EH_FRAME segment header", nullptr, nullptr)
-OPTION(prefix_2, "EL", anonymous_66, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "EL", anonymous_70, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "emit-relocs", emit_relocs, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Generate relocations in output", nullptr, nullptr)
 OPTION(prefix_2, "enable-new-dtags", enable_new_dtags, Flag, INVALID, INVALID, nullptr, 0, 0,
@@ -155,6 +158,8 @@ OPTION(prefix_2, "fini=", fini_eq, Joined, INVALID, fini, nullptr, 0, 0,
 OPTION(prefix_2, "fini", fini, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, "<symbol>", nullptr)
 OPTION(prefix_2, "fix-cortex-a53-843419", fix_cortex_a53_843419, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Apply fixes for AArch64 Cortex-A53 erratum 843419", nullptr, nullptr)
+OPTION(prefix_2, "force-bti", force_bti, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Force enable AArch64 BTI in PLT, warn if Input ELF file does not have GNU_PROPERTY_AARCH64_FEATURE_1_BTI property", nullptr, nullptr)
 OPTION(prefix_2, "format=", format_eq, Joined, INVALID, format, nullptr, 0, 0,
        "Change the input format of the inputs following this option", "[default,elf,binary]", nullptr)
 OPTION(prefix_2, "format", format, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, "[default,elf,binary]", nullptr)
@@ -168,14 +173,14 @@ OPTION(prefix_2, "gdb-index", gdb_index, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Generate .gdb_index section", nullptr, nullptr)
 OPTION(prefix_2, "gnu-unique", gnu_unique, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Enable STB_GNU_UNIQUE symbol binding (default)", nullptr, nullptr)
-OPTION(prefix_1, "G", anonymous_67, JoinedOrSeparate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_1, "g", anonymous_49, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_1, "G", anonymous_71, JoinedOrSeparate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_1, "g", anonymous_51, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "hash-style=", hash_style_eq, Joined, INVALID, hash_style, nullptr, 0, 0,
        "Specify hash style (sysv, gnu or both)", nullptr, nullptr)
 OPTION(prefix_2, "hash-style", hash_style, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "help", help, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Print option help", nullptr, nullptr)
-OPTION(prefix_1, "h", anonymous_29, JoinedOrSeparate, INVALID, soname, nullptr, 0, 0,
+OPTION(prefix_1, "h", anonymous_30, JoinedOrSeparate, INVALID, soname, nullptr, 0, 0,
        "Alias for --soname", nullptr, nullptr)
 OPTION(prefix_2, "icf=all", icf_all, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Enable identical code folding", nullptr, nullptr)
@@ -205,9 +210,13 @@ OPTION(prefix_2, "library-path", library_path, Separate, INVALID, INVALID, nullp
 OPTION(prefix_2, "library=", library_eq, Joined, INVALID, library, nullptr, 0, 0,
        "Root name of library to use", "<libName>", nullptr)
 OPTION(prefix_2, "library", library, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, "<libName>", nullptr)
-OPTION(prefix_2, "long-plt", anonymous_50, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "long-plt", anonymous_52, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "lto-aa-pipeline=", lto_aa_pipeline, Joined, INVALID, INVALID, nullptr, 0, 0,
        "AA pipeline to run during LTO. Used in conjunction with -lto-newpm-passes", nullptr, nullptr)
+OPTION(prefix_2, "lto-cs-profile-file=", lto_cs_profile_file, Joined, INVALID, INVALID, nullptr, 0, 0,
+       "Context sensitive profile file path", nullptr, nullptr)
+OPTION(prefix_2, "lto-cs-profile-generate", lto_cs_profile_generate, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Perform context senstive PGO instrumentation", nullptr, nullptr)
 OPTION(prefix_2, "lto-debug-pass-manager", lto_debug_pass_manager, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Debug new pass manager", nullptr, nullptr)
 OPTION(prefix_2, "lto-new-pass-manager", lto_new_pass_manager, Flag, INVALID, INVALID, nullptr, 0, 0,
@@ -235,14 +244,17 @@ OPTION(prefix_2, "mips-got-size", mips_got_size, Separate, INVALID, INVALID, nul
 OPTION(prefix_2, "mllvm=", mllvm_eq, Joined, INVALID, mllvm, nullptr, 0, 0,
        "Additional arguments to forward to LLVM's option processing", nullptr, nullptr)
 OPTION(prefix_2, "mllvm", mllvm, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_1, "M", anonymous_24, Flag, INVALID, print_map, nullptr, 0, 0,
+OPTION(prefix_1, "M", anonymous_25, Flag, INVALID, print_map, nullptr, 0, 0,
        "Alias for --print-map", nullptr, nullptr)
 OPTION(prefix_1, "m", m, JoinedOrSeparate, INVALID, INVALID, nullptr, 0, 0,
        "Set target emulation", nullptr, nullptr)
-OPTION(prefix_2, "no-add-needed", anonymous_51, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "nmagic", nmagic, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Do not page align sections, link against static libraries.", "<magic>", nullptr)
+OPTION(prefix_2, "no-add-needed", anonymous_53, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "no-allow-multiple-definition", no_allow_multiple_definition, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Do not allow multiple definitions (default)", nullptr, nullptr)
-OPTION(prefix_2, "no-allow-shlib-undefined", anonymous_52, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "no-allow-shlib-undefined", no_allow_shlib_undefined, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Do not allow unresolved references in shared libraries (default when linking an executable)", nullptr, nullptr)
 OPTION(prefix_2, "no-apply-dynamic-relocs", no_apply_dynamic_relocs, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Do not apply link-time values for dynamic relocations (default)", nullptr, nullptr)
 OPTION(prefix_2, "no-as-needed", no_as_needed, Flag, INVALID, INVALID, nullptr, 0, 0,
@@ -253,14 +265,16 @@ OPTION(prefix_2, "no-check-sections", no_check_sections, Flag, INVALID, INVALID,
        "Do not check section addresses for overlaps", nullptr, nullptr)
 OPTION(prefix_2, "no-color-diagnostics", no_color_diagnostics, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Do not use colors in diagnostics", nullptr, nullptr)
-OPTION(prefix_2, "no-copy-dt-needed-entries", anonymous_53, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "no-copy-dt-needed-entries", anonymous_54, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "no-cref", no_cref, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Do not output cross reference table", nullptr, nullptr)
-OPTION(prefix_2, "no-ctors-in-init-array", anonymous_54, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "no-ctors-in-init-array", anonymous_55, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "no-define-common", no_define_common, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Do not assign space to common symbols", nullptr, nullptr)
 OPTION(prefix_2, "no-demangle", no_demangle, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Do not demangle symbol names", nullptr, nullptr)
+OPTION(prefix_2, "no-dependent-libraries", no_dependent_libraries, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Ignore dependent library specifiers from input files", nullptr, nullptr)
 OPTION(prefix_2, "no-dynamic-linker", no_dynamic_linker, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Inhibit output of .interp section", nullptr, nullptr)
 OPTION(prefix_2, "no-eh-frame-hdr", no_eh_frame_hdr, Flag, INVALID, INVALID, nullptr, 0, 0,
@@ -277,16 +291,19 @@ OPTION(prefix_2, "no-gdb-index", no_gdb_index, Flag, INVALID, INVALID, nullptr,
        "Do not generate .gdb_index section (default)", nullptr, nullptr)
 OPTION(prefix_2, "no-gnu-unique", no_gnu_unique, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Disable STB_GNU_UNIQUE symbol binding", nullptr, nullptr)
-OPTION(prefix_2, "no-keep-memory", anonymous_55, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "no-keep-memory", anonymous_56, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "no-merge-exidx-entries", no_merge_exidx_entries, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Disable merging .ARM.exidx entries", nullptr, nullptr)
-OPTION(prefix_2, "no-mmap-output-file", anonymous_56, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "no-mmap-output-file", anonymous_57, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "no-nmagic", no_nmagic, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Page align sections (default)", "<magic>", nullptr)
 OPTION(prefix_2, "no-omagic", no_omagic, Flag, INVALID, INVALID, nullptr, 0, 0,
-       "Do not set the text data sections to be writable", "<magic>", nullptr)
+       "Do not set the text data sections to be writable, page align sections (default)", "<magic>", nullptr)
 OPTION(prefix_2, "no-pic-executable", anonymous_19, Flag, INVALID, no_pie, nullptr, 0, 0,
        "Alias for --no-pie", nullptr, nullptr)
 OPTION(prefix_2, "no-pie", no_pie, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Do not create a position independent executable (default)", nullptr, nullptr)
+OPTION(prefix_2, "no-pipeline-knowledge", anonymous_58, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "no-print-gc-sections", no_print_gc_sections, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Do not list removed unused sections (default)", nullptr, nullptr)
 OPTION(prefix_2, "no-print-icf-sections", no_print_icf_sections, Flag, INVALID, INVALID, nullptr, 0, 0,
@@ -309,7 +326,7 @@ OPTION(prefix_2, "no-warn-common", no_warn_common, Flag, INVALID, INVALID, nullp
        "Do not warn about duplicate common symbols (default)", nullptr, nullptr)
 OPTION(prefix_2, "no-warn-ifunc-textrel", no_warn_ifunc_textrel, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Do not warn about using ifunc symbols with text relocations (default)", nullptr, nullptr)
-OPTION(prefix_2, "no-warn-mismatch", anonymous_57, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "no-warn-mismatch", anonymous_59, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "no-warn-symbol-ordering", no_warn_symbol_ordering, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Do not warn about problems with the symbol ordering file", nullptr, nullptr)
 OPTION(prefix_2, "no-whole-archive", no_whole_archive, Flag, INVALID, INVALID, nullptr, 0, 0,
@@ -320,31 +337,39 @@ OPTION(prefix_2, "non_shared", anonymous_4, Flag, INVALID, Bstatic, nullptr, 0,
        "Alias for --Bstatic", nullptr, nullptr)
 OPTION(prefix_2, "nostdlib", nostdlib, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Only search directories specified on the command line", nullptr, nullptr)
-OPTION(prefix_1, "N", anonymous_20, Flag, INVALID, omagic, nullptr, 0, 0,
+OPTION(prefix_1, "N", anonymous_21, Flag, INVALID, omagic, nullptr, 0, 0,
        "Alias for --omagic", nullptr, nullptr)
+OPTION(prefix_1, "n", anonymous_20, Flag, INVALID, nmagic, nullptr, 0, 0,
+       "Alias for --nmagic", nullptr, nullptr)
 OPTION(prefix_3, "oformat", oformat, Separate, INVALID, INVALID, nullptr, 0, 0,
        "Specify the binary format for the output object file", "<format>", nullptr)
 OPTION(prefix_3, "omagic", omagic, Flag, INVALID, INVALID, nullptr, 0, 0,
-       "Set the text and data sections to be readable and writable", "<magic>", nullptr)
+       "Set the text and data sections to be readable and writable, do not page align sections, link against static libraries", "<magic>", nullptr)
 OPTION(prefix_3, "opt-remarks-filename", opt_remarks_filename, Separate, INVALID, INVALID, nullptr, 0, 0,
        "YAML output file for optimization remarks", nullptr, nullptr)
+OPTION(prefix_3, "opt-remarks-format", opt_remarks_format, Separate, INVALID, INVALID, nullptr, 0, 0,
+       "The format used for serializing remarks (default: YAML)", nullptr, nullptr)
+OPTION(prefix_3, "opt-remarks-passes", opt_remarks_passes, Separate, INVALID, INVALID, nullptr, 0, 0,
+       "Regex for the passes that need to be serialized to the output file", nullptr, nullptr)
 OPTION(prefix_3, "opt-remarks-with-hotness", opt_remarks_with_hotness, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Include hotness information in the optimization remarks file", nullptr, nullptr)
 OPTION(prefix_2, "orphan-handling=", orphan_handling_eq, Joined, INVALID, orphan_handling, nullptr, 0, 0,
        "Control how orphan sections are handled when linker script used", nullptr, nullptr)
 OPTION(prefix_2, "orphan-handling", orphan_handling, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_3, "output=", anonymous_21, Joined, INVALID, o, nullptr, 0, 0,
+OPTION(prefix_3, "output=", anonymous_22, Joined, INVALID, o, nullptr, 0, 0,
        "Alias for -o", nullptr, nullptr)
-OPTION(prefix_3, "output", anonymous_22, Separate, INVALID, o, nullptr, 0, 0,
+OPTION(prefix_3, "output", anonymous_23, Separate, INVALID, o, nullptr, 0, 0,
        "Alias for -o", nullptr, nullptr)
 OPTION(prefix_1, "O", O, JoinedOrSeparate, INVALID, INVALID, nullptr, 0, 0,
        "Optimize output file size", nullptr, nullptr)
 OPTION(prefix_1, "o", o, JoinedOrSeparate, INVALID, INVALID, nullptr, 0, 0,
        "Path to file to write output", "<path>", nullptr)
+OPTION(prefix_2, "pac-plt", pac_plt, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "AArch64 only, use pointer authentication in PLT", nullptr, nullptr)
 OPTION(prefix_2, "pack-dyn-relocs=", pack_dyn_relocs_eq, Joined, INVALID, pack_dyn_relocs, nullptr, 0, 0,
        "Pack dynamic relocations in the given format", "[none,android,relr,android+relr]", nullptr)
 OPTION(prefix_2, "pack-dyn-relocs", pack_dyn_relocs, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, "[none,android,relr,android+relr]", nullptr)
-OPTION(prefix_2, "pic-executable", anonymous_23, Flag, INVALID, pie, nullptr, 0, 0,
+OPTION(prefix_2, "pic-executable", anonymous_24, Flag, INVALID, pie, nullptr, 0, 0,
        "Alias for --pie", nullptr, nullptr)
 OPTION(prefix_2, "pic-veneer", pic_veneer, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Always generate position independent thunks (veneers)", nullptr, nullptr)
@@ -353,26 +378,30 @@ OPTION(prefix_2, "pie", pie, Flag, INVALID, INVALID, nullptr, 0, 0,
 OPTION(prefix_2, "plugin-opt=-fresolution=", plugin_opt_fresolution_eq, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "plugin-opt=-pass-through=", plugin_opt_pass_through_eq, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "plugin-opt=/", plugin_opt_slash, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_2, "plugin-opt=debug-pass-manager", anonymous_40, Flag, INVALID, lto_debug_pass_manager, nullptr, 0, 0,
+OPTION(prefix_2, "plugin-opt=cs-profile-generate", anonymous_46, Flag, INVALID, lto_cs_profile_generate, nullptr, 0, 0,
+       "Alias for -lto-cs-profile-generate", nullptr, nullptr)
+OPTION(prefix_2, "plugin-opt=cs-profile-path=", anonymous_47, Joined, INVALID, lto_cs_profile_file, nullptr, 0, 0,
+       "Alias for -lto-cs-profile-file", nullptr, nullptr)
+OPTION(prefix_2, "plugin-opt=debug-pass-manager", anonymous_41, Flag, INVALID, lto_debug_pass_manager, nullptr, 0, 0,
        "Alias for -lto-debug-pass-manager", nullptr, nullptr)
-OPTION(prefix_2, "plugin-opt=disable-verify", anonymous_41, Flag, INVALID, disable_verify, nullptr, 0, 0,
+OPTION(prefix_2, "plugin-opt=disable-verify", anonymous_42, Flag, INVALID, disable_verify, nullptr, 0, 0,
        "Alias for -disable-verify", nullptr, nullptr)
 OPTION(prefix_2, "plugin-opt=dwo_dir=", plugin_opt_dwo_dir_eq, Joined, INVALID, INVALID, nullptr, 0, 0,
        "Directory to store .dwo files when LTO and debug fission are used", nullptr, nullptr)
 OPTION(prefix_2, "plugin-opt=emit-llvm", plugin_opt_emit_llvm, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_2, "plugin-opt=jobs=", anonymous_42, Joined, INVALID, thinlto_jobs, nullptr, 0, 0,
+OPTION(prefix_2, "plugin-opt=jobs=", anonymous_43, Joined, INVALID, thinlto_jobs, nullptr, 0, 0,
        "Alias for -thinlto-jobs", nullptr, nullptr)
-OPTION(prefix_2, "plugin-opt=lto-partitions=", anonymous_43, Joined, INVALID, lto_partitions, nullptr, 0, 0,
+OPTION(prefix_2, "plugin-opt=lto-partitions=", anonymous_44, Joined, INVALID, lto_partitions, nullptr, 0, 0,
        "Alias for -lto-partitions", nullptr, nullptr)
 OPTION(prefix_2, "plugin-opt=mcpu=", plugin_opt_mcpu_eq, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_2, "plugin-opt=new-pass-manager", anonymous_44, Flag, INVALID, lto_new_pass_manager, nullptr, 0, 0,
+OPTION(prefix_2, "plugin-opt=new-pass-manager", anonymous_45, Flag, INVALID, lto_new_pass_manager, nullptr, 0, 0,
        "Alias for -lto-new-pass-manager", nullptr, nullptr)
 OPTION(prefix_2, "plugin-opt=obj-path=", plugin_opt_obj_path_eq, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_2, "plugin-opt=O", anonymous_39, Joined, INVALID, lto_O, nullptr, 0, 0,
+OPTION(prefix_2, "plugin-opt=O", anonymous_40, Joined, INVALID, lto_O, nullptr, 0, 0,
        "Alias for -lto-O", nullptr, nullptr)
-OPTION(prefix_2, "plugin-opt=sample-profile=", anonymous_45, Joined, INVALID, lto_sample_profile, nullptr, 0, 0,
+OPTION(prefix_2, "plugin-opt=sample-profile=", anonymous_48, Joined, INVALID, lto_sample_profile, nullptr, 0, 0,
        "Alias for -lto-sample-profile", nullptr, nullptr)
-OPTION(prefix_2, "plugin-opt=save-temps", anonymous_46, Flag, INVALID, save_temps, nullptr, 0, 0,
+OPTION(prefix_2, "plugin-opt=save-temps", anonymous_49, Flag, INVALID, save_temps, nullptr, 0, 0,
        "Alias for -save-temps", nullptr, nullptr)
 OPTION(prefix_2, "plugin-opt=thinlto-emit-imports-files", plugin_opt_thinlto_emit_imports_files, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "plugin-opt=thinlto-index-only=", plugin_opt_thinlto_index_only_eq, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
@@ -394,9 +423,13 @@ OPTION(prefix_2, "print-icf-sections", print_icf_sections, Flag, INVALID, INVALI
        "List identical folded sections", nullptr, nullptr)
 OPTION(prefix_2, "print-map", print_map, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Print a link map to the standard output", nullptr, nullptr)
+OPTION(prefix_2, "print-symbol-order=", print_symbol_order_eq, Joined, INVALID, print_symbol_order, nullptr, 0, 0,
+       "Print a symbol order specified by --call-graph-ordering-file into the speficied file", nullptr, nullptr)
+OPTION(prefix_2, "print-symbol-order", print_symbol_order, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "push-state", push_state, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Save the current state of -as-needed, -static and -whole-archive", nullptr, nullptr)
-OPTION(prefix_2, "Qy", anonymous_68, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_1, "p", anonymous_60, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "Qy", anonymous_72, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "q", anonymous_11, Flag, INVALID, emit_relocs, nullptr, 0, 0,
        "Alias for --emit-relocs", nullptr, nullptr)
 OPTION(prefix_2, "relocatable", relocatable, Flag, INVALID, INVALID, nullptr, 0, 0,
@@ -404,20 +437,21 @@ OPTION(prefix_2, "relocatable", relocatable, Flag, INVALID, INVALID, nullptr, 0,
 OPTION(prefix_2, "reproduce=", reproduce_eq, Joined, INVALID, reproduce, nullptr, 0, 0,
        "Dump linker invocation and input files for debugging", nullptr, nullptr)
 OPTION(prefix_2, "reproduce", reproduce, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "require-cet", require_cet, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "retain-symbols-file=", retain_symbols_file_eq, Joined, INVALID, retain_symbols_file, nullptr, 0, 0,
        "Retain only the symbols listed in the file", "<file>", nullptr)
 OPTION(prefix_2, "retain-symbols-file", retain_symbols_file, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, "<file>", nullptr)
-OPTION(prefix_2, "rpath-link=", anonymous_59, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_2, "rpath-link", anonymous_58, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "rpath-link=", anonymous_62, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "rpath-link", anonymous_61, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "rpath=", rpath_eq, Joined, INVALID, rpath, nullptr, 0, 0,
        "Add a DT_RUNPATH to the output", nullptr, nullptr)
 OPTION(prefix_2, "rpath", rpath, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "rsp-quoting=", rsp_quoting_eq, Joined, INVALID, rsp_quoting, nullptr, 0, 0,
        "Quoting style for response files", "[posix,windows]", nullptr)
 OPTION(prefix_2, "rsp-quoting", rsp_quoting, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, "[posix,windows]", nullptr)
-OPTION(prefix_1, "R", anonymous_26, JoinedOrSeparate, INVALID, rpath, nullptr, 0, 0,
+OPTION(prefix_1, "R", anonymous_27, JoinedOrSeparate, INVALID, rpath, nullptr, 0, 0,
        "Alias for --rpath", nullptr, nullptr)
-OPTION(prefix_1, "r", anonymous_25, Flag, INVALID, relocatable, nullptr, 0, 0,
+OPTION(prefix_1, "r", anonymous_26, Flag, INVALID, relocatable, nullptr, 0, 0,
        "Alias for --relocatable", nullptr, nullptr)
 OPTION(prefix_2, "save-temps", save_temps, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "script=", script_eq, Joined, INVALID, script, nullptr, 0, 0,
@@ -426,12 +460,13 @@ OPTION(prefix_2, "script", script, Separate, INVALID, INVALID, nullptr, 0, 0, nu
 OPTION(prefix_2, "section-start=", section_start_eq, Joined, INVALID, section_start, nullptr, 0, 0,
        "Set address of section", "<address>", nullptr)
 OPTION(prefix_2, "section-start", section_start, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, "<address>", nullptr)
+OPTION(prefix_2, "secure-plt", anonymous_63, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "shared", shared, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Build a shared object", nullptr, nullptr)
 OPTION(prefix_2, "soname=", soname_eq, Joined, INVALID, soname, nullptr, 0, 0,
        "Set DT_SONAME", nullptr, nullptr)
 OPTION(prefix_2, "soname", soname, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_2, "sort-common", anonymous_60, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "sort-common", anonymous_64, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "sort-section=", sort_section_eq, Joined, INVALID, sort_section, nullptr, 0, 0,
        "Specifies sections sorting rule when linkerscript is used", nullptr, nullptr)
 OPTION(prefix_2, "sort-section", sort_section, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
@@ -444,7 +479,7 @@ OPTION(prefix_2, "start-lib", start_lib, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Start a grouping of objects that should be treated as if they were together in an archive", nullptr, nullptr)
 OPTION(prefix_2, "static", anonymous_5, Flag, INVALID, Bstatic, nullptr, 0, 0,
        "Alias for --Bstatic", nullptr, nullptr)
-OPTION(prefix_2, "stats", anonymous_61, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "stats", anonymous_65, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "strip-all", strip_all, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Strip all symbols", nullptr, nullptr)
 OPTION(prefix_2, "strip-debug", strip_debug, Flag, INVALID, INVALID, nullptr, 0, 0,
@@ -455,9 +490,9 @@ OPTION(prefix_2, "symbol-ordering-file", symbol_ordering_file, Separate, INVALID
 OPTION(prefix_2, "sysroot=", sysroot_eq, Joined, INVALID, sysroot, nullptr, 0, 0,
        "Set the system root", nullptr, nullptr)
 OPTION(prefix_2, "sysroot", sysroot, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_1, "S", anonymous_32, Flag, INVALID, strip_debug, nullptr, 0, 0,
+OPTION(prefix_1, "S", anonymous_33, Flag, INVALID, strip_debug, nullptr, 0, 0,
        "Alias for --strip-debug", nullptr, nullptr)
-OPTION(prefix_1, "s", anonymous_31, Flag, INVALID, strip_all, nullptr, 0, 0,
+OPTION(prefix_1, "s", anonymous_32, Flag, INVALID, strip_all, nullptr, 0, 0,
        "Alias for --strip-all", nullptr, nullptr)
 OPTION(prefix_2, "target1-abs", target1_abs, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Interpret R_ARM_TARGET1 as R_ARM_ABS32 (default)", nullptr, nullptr)
@@ -488,17 +523,20 @@ OPTION(prefix_2, "trace-symbol=", trace_symbol_eq, Joined, INVALID, trace_symbol
 OPTION(prefix_2, "trace-symbol", trace_symbol, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "trace", trace, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Print the names of the input files", nullptr, nullptr)
-OPTION(prefix_4, "Ttext-segment=", anonymous_36, Joined, INVALID, Ttext, nullptr, 0, 0,
+OPTION(prefix_4, "Ttext-segment=", anonymous_37, Joined, INVALID, Ttext, nullptr, 0, 0,
        "Alias for --Ttext", nullptr, nullptr)
-OPTION(prefix_4, "Ttext-segment", anonymous_35, Separate, INVALID, Ttext, nullptr, 0, 0,
+OPTION(prefix_4, "Ttext-segment", anonymous_36, Separate, INVALID, Ttext, nullptr, 0, 0,
        "Alias for --Ttext", nullptr, nullptr)
 OPTION(prefix_2, "Ttext=", Ttext_eq, Joined, INVALID, Ttext, nullptr, 0, 0,
        "Same as --section-start with .text as the sectionname", nullptr, nullptr)
 OPTION(prefix_2, "Ttext", Ttext, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_1, "T", anonymous_27, JoinedOrSeparate, INVALID, script, nullptr, 0, 0,
+OPTION(prefix_1, "T", anonymous_28, JoinedOrSeparate, INVALID, script, nullptr, 0, 0,
        "Alias for --script", nullptr, nullptr)
-OPTION(prefix_1, "t", anonymous_33, Flag, INVALID, trace, nullptr, 0, 0,
+OPTION(prefix_1, "t", anonymous_34, Flag, INVALID, trace, nullptr, 0, 0,
        "Alias for --trace", nullptr, nullptr)
+OPTION(prefix_2, "undefined-glob=", undefined_glob_eq, Joined, INVALID, undefined_glob, nullptr, 0, 0,
+       "Force undefined symbol during linking", "<pattern>", nullptr)
+OPTION(prefix_2, "undefined-glob", undefined_glob, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, "<pattern>", nullptr)
 OPTION(prefix_2, "undefined-version", undefined_version, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Allow unused version in version script (default)", nullptr, nullptr)
 OPTION(prefix_2, "undefined=", undefined_eq, Joined, INVALID, undefined, nullptr, 0, 0,
@@ -509,7 +547,7 @@ OPTION(prefix_2, "unresolved-symbols=", unresolved_symbols_eq, Joined, INVALID,
 OPTION(prefix_2, "unresolved-symbols", unresolved_symbols, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "use-android-relr-tags", use_android_relr_tags, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Use SHT_ANDROID_RELR / DT_ANDROID_RELR* tags instead of SHT_RELR / DT_RELR*", nullptr, nullptr)
-OPTION(prefix_1, "u", anonymous_37, JoinedOrSeparate, INVALID, undefined, nullptr, 0, 0,
+OPTION(prefix_1, "u", anonymous_38, JoinedOrSeparate, INVALID, undefined, nullptr, 0, 0,
        "Alias for --undefined", nullptr, nullptr)
 OPTION(prefix_2, "verbose", verbose, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Verbose mode", nullptr, nullptr)
@@ -518,7 +556,9 @@ OPTION(prefix_2, "version-script=", version_script_eq, Joined, INVALID, version_
 OPTION(prefix_2, "version-script", version_script, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "version", version, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Display the version number and exit", nullptr, nullptr)
-OPTION(prefix_1, "V", anonymous_38, Flag, INVALID, version, nullptr, 0, 0,
+OPTION(prefix_2, "vs-diagnostics", visual_studio_diagnostics_format, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Format diagnostics for Visual Studio compatiblity", nullptr, nullptr)
+OPTION(prefix_1, "V", anonymous_39, Flag, INVALID, version, nullptr, 0, 0,
        "Alias for --version", nullptr, nullptr)
 OPTION(prefix_1, "v", v, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Display the version number", nullptr, nullptr)
@@ -526,11 +566,11 @@ OPTION(prefix_2, "warn-backrefs", warn_backrefs, Flag, INVALID, INVALID, nullptr
        "Warn about backward symbol references to fetch archive members", nullptr, nullptr)
 OPTION(prefix_2, "warn-common", warn_common, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Warn about duplicate common symbols", nullptr, nullptr)
-OPTION(prefix_2, "warn-execstack", anonymous_62, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "warn-execstack", anonymous_66, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "warn-ifunc-textrel", warn_ifunc_textrel, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Warn about using ifunc symbols with text relocations", nullptr, nullptr)
-OPTION(prefix_2, "warn-once", anonymous_63, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_2, "warn-shared-textrel", anonymous_64, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "warn-once", anonymous_67, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "warn-shared-textrel", anonymous_68, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "warn-symbol-ordering", warn_symbol_ordering, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Warn about problems with the symbol ordering file (default)", nullptr, nullptr)
 OPTION(prefix_2, "warn-unresolved-symbols", warn_unresolved_symbols, Flag, INVALID, INVALID, nullptr, 0, 0,
@@ -544,7 +584,7 @@ OPTION(prefix_1, "X", anonymous_10, Flag, INVALID, discard_locals, nullptr, 0, 0
        "Alias for --discard-locals", nullptr, nullptr)
 OPTION(prefix_1, "x", anonymous_9, Flag, INVALID, discard_all, nullptr, 0, 0,
        "Alias for --discard-all", nullptr, nullptr)
-OPTION(prefix_1, "y", anonymous_34, JoinedOrSeparate, INVALID, trace_symbol, nullptr, 0, 0,
+OPTION(prefix_1, "y", anonymous_35, JoinedOrSeparate, INVALID, trace_symbol, nullptr, 0, 0,
        "Alias for --trace-symbol", nullptr, nullptr)
 OPTION(prefix_1, "z", z, JoinedOrSeparate, INVALID, INVALID, nullptr, 0, 0,
        "Linker option extensions", "<option>", nullptr)
diff --git a/deps/lld-prebuilt/MinGW/Options.inc b/deps/lld-prebuilt/MinGW/Options.inc
index 00ffd41077968be53227c691913fb777922e9ec5..d32cd994c5e423cf76e37e5cb2fe6dab415b0662 100644
--- a/deps/lld-prebuilt/MinGW/Options.inc
+++ b/deps/lld-prebuilt/MinGW/Options.inc
@@ -30,31 +30,39 @@ OPTION(prefix_0, "<input>", INPUT, Input, INVALID, INVALID, nullptr, 0, 0, nullp
 OPTION(prefix_0, "<unknown>", UNKNOWN, Unknown, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "###", _HASH_HASH_HASH, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Print (but do not run) the commands to run for this compilation", nullptr, nullptr)
+OPTION(prefix_2, "appcontainer", appcontainer, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Set the appcontainer flag in the executable", nullptr, nullptr)
 OPTION(prefix_2, "Bdynamic", Bdynamic, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Link against shared libraries", nullptr, nullptr)
 OPTION(prefix_2, "Bstatic", Bstatic, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Do not link against shared libraries", nullptr, nullptr)
-OPTION(prefix_2, "build-id", build_id, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_2, "disable-auto-image-base", disable_auto_image_base, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "build-id", anonymous_1, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "disable-auto-image-base", anonymous_2, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "dynamicbase", dynamicbase, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Enable ASLR", nullptr, nullptr)
-OPTION(prefix_2, "enable-auto-image-base", enable_auto_image_base, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_2, "enable-auto-import", enable_auto_import, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_2, "end-group", end_group, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "enable-auto-image-base", anonymous_3, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "enable-auto-import", anonymous_4, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Ignored; listed for libtool compatibility", nullptr, nullptr)
+OPTION(prefix_2, "end-group", anonymous_5, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "entry", entry, Separate, INVALID, INVALID, nullptr, 0, 0,
        "Name of entry point symbol", "<entry>", nullptr)
+OPTION(prefix_2, "exclude-all-symbols", exclude_all_symbols, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Don't automatically export any symbols", nullptr, nullptr)
 OPTION(prefix_2, "export-all-symbols", export_all_symbols, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Export all symbols even if a def file or dllexport attributes are used", nullptr, nullptr)
 OPTION(prefix_1, "e", alias_entry_e, JoinedOrSeparate, INVALID, entry, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_3, "full-shutdown", full_shutdown, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_3, "full-shutdown", anonymous_6, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "gc-sections", gc_sections, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Remove unused sections", nullptr, nullptr)
-OPTION(prefix_2, "high-entropy-va", high_entropy_va, Flag, INVALID, INVALID, nullptr, 0, 0,
-       "Enable 64-bit ASLR", nullptr, nullptr)
+OPTION(prefix_2, "help", help, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Print option help", nullptr, nullptr)
+OPTION(prefix_2, "high-entropy-va", anonymous_7, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "icf=", icf, Joined, INVALID, INVALID, nullptr, 0, 0,
        "Identical code folding", nullptr, nullptr)
 OPTION(prefix_2, "image-base", image_base, Separate, INVALID, INVALID, nullptr, 0, 0,
        "Base address of the program", nullptr, nullptr)
+OPTION(prefix_2, "insert-timestamp", insert_timestamp, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Include PE header timestamp", nullptr, nullptr)
 OPTION(prefix_2, "kill-at", kill_at, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Remove @n from exported symbols", nullptr, nullptr)
 OPTION(prefix_3, "large-address-aware", large_address_aware, Flag, INVALID, INVALID, nullptr, 0, 0,
@@ -63,56 +71,72 @@ OPTION(prefix_1, "L", L, JoinedOrSeparate, INVALID, INVALID, nullptr, 0, 0,
        "Add a directory to the library search path", "<dir>", nullptr)
 OPTION(prefix_1, "l", l, JoinedOrSeparate, INVALID, INVALID, nullptr, 0, 0,
        "Root name of library to use", "<libName>", nullptr)
-OPTION(prefix_2, "major-image-version", major_image_version, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "major-image-version", anonymous_8, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_3, "major-os-version=", major_os_version_eq, Joined, INVALID, major_os_version, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_3, "major-os-version", major_os_version, Separate, INVALID, INVALID, nullptr, 0, 0,
+       "Set the OS and subsystem major version", nullptr, nullptr)
+OPTION(prefix_3, "major-subsystem-version=", major_subsystem_version_eq, Joined, INVALID, major_subsystem_version, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_3, "major-subsystem-version", major_subsystem_version, Separate, INVALID, INVALID, nullptr, 0, 0,
+       "Set the OS and subsystem major version", nullptr, nullptr)
 OPTION(prefix_2, "Map=", map_eq, Joined, INVALID, map, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "Map", map, Separate, INVALID, INVALID, nullptr, 0, 0,
        "Output a linker map", nullptr, nullptr)
-OPTION(prefix_2, "minor-image-version", minor_image_version, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "minor-image-version", anonymous_9, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_3, "minor-os-version=", minor_os_version_eq, Joined, INVALID, minor_os_version, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_3, "minor-os-version", minor_os_version, Separate, INVALID, INVALID, nullptr, 0, 0,
+       "Set the OS and subsystem minor version", nullptr, nullptr)
+OPTION(prefix_3, "minor-subsystem-version=", minor_subsystem_version_eq, Joined, INVALID, minor_subsystem_version, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_3, "minor-subsystem-version", minor_subsystem_version, Separate, INVALID, INVALID, nullptr, 0, 0,
+       "Set the OS and subsystem minor version", nullptr, nullptr)
 OPTION(prefix_2, "mllvm", mllvm, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "m", m, JoinedOrSeparate, INVALID, INVALID, nullptr, 0, 0,
        "Set target emulation", nullptr, nullptr)
 OPTION(prefix_2, "no-gc-sections", no_gc_sections, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Don't remove unused sections", nullptr, nullptr)
-OPTION(prefix_2, "no-seh", no_seh, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "no-insert-timestamp", no_insert_timestamp, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Don't include PE header timestamp", nullptr, nullptr)
+OPTION(prefix_2, "no-seh", anonymous_10, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "no-whole-archive", no_whole_archive, Flag, INVALID, INVALID, nullptr, 0, 0,
        "No longer include all object files for following archives", nullptr, nullptr)
-OPTION(prefix_2, "nxcompat", nxcompat, Flag, INVALID, INVALID, nullptr, 0, 0,
-       "Enable data execution prevention", nullptr, nullptr)
+OPTION(prefix_2, "nxcompat", anonymous_11, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_3, "out-implib=", out_implib_eq, Joined, INVALID, out_implib, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_3, "out-implib", out_implib, Separate, INVALID, INVALID, nullptr, 0, 0,
        "Import library name", nullptr, nullptr)
 OPTION(prefix_2, "output-def", output_def, Separate, INVALID, INVALID, nullptr, 0, 0,
        "Output def file", nullptr, nullptr)
-OPTION(prefix_1, "O", O, Joined, INVALID, INVALID, nullptr, 0, 0,
-       "Optimize output file size", nullptr, nullptr)
+OPTION(prefix_1, "O", anonymous_0, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "o", o, JoinedOrSeparate, INVALID, INVALID, nullptr, 0, 0,
        "Path to file to write output", "<path>", nullptr)
+OPTION(prefix_2, "pdb=", pdb_eq, Joined, INVALID, pdb, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "pdb", pdb, Separate, INVALID, INVALID, nullptr, 0, 0,
-       "Specify output PDB debug information file", nullptr, nullptr)
-OPTION(prefix_2, "pic-executable", pic_executable, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_2, "plugin-opt=", anonymous_3, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_2, "plugin-opt", anonymous_2, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_2, "plugin=", anonymous_1, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_2, "plugin", anonymous_0, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+       "Output PDB debug info file, chosen implicitly if the argument is empty", nullptr, nullptr)
+OPTION(prefix_2, "pic-executable", anonymous_12, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "plugin-opt=", anonymous_16, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "plugin-opt", anonymous_15, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "plugin=", anonymous_14, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "plugin", anonymous_13, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "require-defined=", require_defined_eq, Joined, INVALID, require_defined, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "require-defined", require_defined, Separate, INVALID, INVALID, nullptr, 0, 0,
        "Force symbol to be added to symbol table as an undefined one", nullptr, nullptr)
 OPTION(prefix_2, "shared", shared, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Build a shared object", nullptr, nullptr)
 OPTION(prefix_2, "stack", stack, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_2, "start-group", start_group, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "start-group", anonymous_18, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "strip-all", strip_all, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Omit all symbol information from the output binary", nullptr, nullptr)
 OPTION(prefix_2, "strip-debug", strip_debug, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Omit all debug information, but keep symbol information", nullptr, nullptr)
+OPTION(prefix_2, "subsystem=", subs_eq, Joined, INVALID, subs, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "subsystem", subs, Separate, INVALID, INVALID, nullptr, 0, 0,
        "Specify subsystem", nullptr, nullptr)
-OPTION(prefix_2, "sysroot", sysroot, Joined, INVALID, INVALID, nullptr, 0, 0,
-       "Sysroot", nullptr, nullptr)
+OPTION(prefix_2, "sysroot", anonymous_17, Joined, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "S", alias_strip_S, Flag, INVALID, strip_debug, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "s", alias_strip_s, Flag, INVALID, strip_all, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_2, "tsaware", tsaware, Flag, INVALID, INVALID, nullptr, 0, 0,
-       "Create Terminal Server aware executable", nullptr, nullptr)
+OPTION(prefix_2, "tsaware", anonymous_19, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "undefined=", undefined_eq, Joined, INVALID, undefined, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "undefined", undefined_long, Separate, INVALID, undefined, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "u", undefined, Separate, INVALID, INVALID, nullptr, 0, 0,
+       "Include symbol in the link, if available", nullptr, nullptr)
 OPTION(prefix_2, "verbose", verbose, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Verbose mode", nullptr, nullptr)
 OPTION(prefix_2, "version", version, Flag, INVALID, INVALID, nullptr, 0, 0,
diff --git a/deps/lld-prebuilt/lld/Common/Version.inc b/deps/lld-prebuilt/lld/Common/Version.inc
index f8b5f0412f596d4d37796a3818226fa275295c7f..6dd876d0108b53691c13a117688a6374237914c1 100644
--- a/deps/lld-prebuilt/lld/Common/Version.inc
+++ b/deps/lld-prebuilt/lld/Common/Version.inc
@@ -1,6 +1,6 @@
-#define LLD_VERSION 8.0.0
-#define LLD_VERSION_STRING "8.0.0"
-#define LLD_VERSION_MAJOR 8
+#define LLD_VERSION 9.0.0
+#define LLD_VERSION_STRING "9.0.0"
+#define LLD_VERSION_MAJOR 9
 #define LLD_VERSION_MINOR 0
 #define LLD_REVISION_STRING ""
 #define LLD_REPOSITORY_STRING ""
diff --git a/deps/lld-prebuilt/wasm/Options.inc b/deps/lld-prebuilt/wasm/Options.inc
index 780af6b28f4a6b5ca046645511a7b61ad474e486..fa8c853d106079a52f5c51a8d2031bc882599acf 100644
--- a/deps/lld-prebuilt/wasm/Options.inc
+++ b/deps/lld-prebuilt/wasm/Options.inc
@@ -27,11 +27,15 @@ PREFIX(prefix_1, {"--" COMMA "-" COMMA nullptr})
 
 OPTION(prefix_0, "<input>", INPUT, Input, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_0, "<unknown>", UNKNOWN, Unknown, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_1, "active-segments", active_segments, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Force segments to be active (default with unshared memory)", nullptr, nullptr)
 OPTION(prefix_1, "allow-undefined-file=", allow_undefined_file, Joined, INVALID, INVALID, nullptr, 0, 0,
        "Allow symbols listed in <file> to be undefined in linked binary", nullptr, nullptr)
 OPTION(prefix_2, "allow-undefined-file", allow_undefined_file_s, Separate, INVALID, allow_undefined_file, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "allow-undefined", allow_undefined, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Allow undefined symbols in linked binary", nullptr, nullptr)
+OPTION(prefix_1, "check-features", check_features, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Check feature compatibility of linked objects (default)", nullptr, nullptr)
 OPTION(prefix_1, "color-diagnostics=", color_diagnostics_eq, Joined, INVALID, INVALID, nullptr, 0, 0,
        "Use colors in diagnostics; one of 'always', 'never', 'auto'", nullptr, nullptr)
 OPTION(prefix_1, "color-diagnostics", color_diagnostics, Flag, INVALID, INVALID, nullptr, 0, 0,
@@ -41,6 +45,8 @@ OPTION(prefix_1, "compress-relocations", compress_relocations, Flag, INVALID, IN
 OPTION(prefix_1, "demangle", demangle, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Demangle symbol names", nullptr, nullptr)
 OPTION(prefix_1, "disable-verify", disable_verify, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_1, "emit-relocs", emit_relocs, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Generate relocations in output", nullptr, nullptr)
 OPTION(prefix_1, "entry=", anonymous_1, Joined, INVALID, entry, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "entry", entry, Separate, INVALID, INVALID, nullptr, 0, 0,
        "Name of entry point symbol", "<entry>", nullptr)
@@ -60,6 +66,8 @@ OPTION(prefix_2, "E", anonymous_2, Flag, INVALID, export_dynamic, nullptr, 0, 0,
 OPTION(prefix_2, "e", anonymous_0, JoinedOrSeparate, INVALID, entry, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "fatal-warnings", fatal_warnings, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Treat warnings as errors", nullptr, nullptr)
+OPTION(prefix_1, "features=", features, CommaJoined, INVALID, INVALID, nullptr, 0, 0,
+       "Comma-separated used features, inferred from input objects by default.", nullptr, nullptr)
 OPTION(prefix_1, "gc-sections", gc_sections, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Enable garbage collection of unused sections", nullptr, nullptr)
 OPTION(prefix_1, "global-base=", global_base, Joined, INVALID, INVALID, nullptr, 0, 0,
@@ -88,6 +96,8 @@ OPTION(prefix_1, "merge-data-segments", merge_data_segments, Flag, INVALID, INVA
 OPTION(prefix_1, "mllvm", mllvm, Separate, INVALID, INVALID, nullptr, 0, 0,
        "Options to pass to LLVM", nullptr, nullptr)
 OPTION(prefix_2, "m", anonymous_4, Flag, INVALID, max_memory, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_1, "no-check-features", no_check_features, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Ignore feature compatibility of linked objects", nullptr, nullptr)
 OPTION(prefix_1, "no-color-diagnostics", no_color_diagnostics, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Do not use colors in diagnostics", nullptr, nullptr)
 OPTION(prefix_1, "no-demangle", no_demangle, Flag, INVALID, INVALID, nullptr, 0, 0,
@@ -113,12 +123,17 @@ OPTION(prefix_2, "O", O, JoinedOrSeparate, INVALID, INVALID, nullptr, 0, 0,
        "Optimize output file size", nullptr, nullptr)
 OPTION(prefix_2, "o", o, JoinedOrSeparate, INVALID, INVALID, nullptr, 0, 0,
        "Path to file to write output", "<path>", nullptr)
+OPTION(prefix_1, "passive-segments", passive_segments, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Force segments to be passive (default with shared memory)", nullptr, nullptr)
 OPTION(prefix_1, "pie", pie, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Create a position independent executable", nullptr, nullptr)
 OPTION(prefix_1, "print-gc-sections", print_gc_sections, Flag, INVALID, INVALID, nullptr, 0, 0,
        "List removed unused sections", nullptr, nullptr)
 OPTION(prefix_1, "relocatable", relocatable, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Create relocatable object file", nullptr, nullptr)
+OPTION(prefix_1, "reproduce=", reproduce_eq, Joined, INVALID, reproduce, nullptr, 0, 0,
+       "Dump linker invocation and input files for debugging", nullptr, nullptr)
+OPTION(prefix_1, "reproduce", reproduce, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_2, "r", anonymous_5, Flag, INVALID, relocatable, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "save-temps", save_temps, Flag, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "shared-memory", shared_memory, Flag, INVALID, INVALID, nullptr, 0, 0,
@@ -144,10 +159,17 @@ OPTION(prefix_1, "thinlto-jobs=", thinlto_jobs, Joined, INVALID, INVALID, nullpt
        "Number of ThinLTO jobs", nullptr, nullptr)
 OPTION(prefix_1, "threads", threads, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Run the linker multi-threaded", nullptr, nullptr)
+OPTION(prefix_1, "trace-symbol=", trace_symbol_eq, Joined, INVALID, trace_symbol, nullptr, 0, 0,
+       "Trace references to symbols", nullptr, nullptr)
+OPTION(prefix_1, "trace-symbol", trace_symbol, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_1, "trace", trace, Flag, INVALID, INVALID, nullptr, 0, 0,
+       "Print the names of the input files", nullptr, nullptr)
+OPTION(prefix_2, "t", anonymous_8, Flag, INVALID, trace, nullptr, 0, 0,
+       "Alias for --trace", nullptr, nullptr)
 OPTION(prefix_1, "undefined=", undefined_eq, Joined, INVALID, undefined, nullptr, 0, 0,
        "Force undefined symbol during linking", nullptr, nullptr)
 OPTION(prefix_1, "undefined", undefined, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, nullptr, nullptr)
-OPTION(prefix_2, "u", anonymous_8, JoinedOrSeparate, INVALID, undefined, nullptr, 0, 0, nullptr, nullptr, nullptr)
+OPTION(prefix_2, "u", anonymous_10, JoinedOrSeparate, INVALID, undefined, nullptr, 0, 0, nullptr, nullptr, nullptr)
 OPTION(prefix_1, "verbose", verbose, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Verbose mode", nullptr, nullptr)
 OPTION(prefix_1, "version", version, Flag, INVALID, INVALID, nullptr, 0, 0,
@@ -156,6 +178,11 @@ OPTION(prefix_2, "v", v, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Display the version number", nullptr, nullptr)
 OPTION(prefix_1, "whole-archive", whole_archive, Flag, INVALID, INVALID, nullptr, 0, 0,
        "Force load of all members in a static library", nullptr, nullptr)
+OPTION(prefix_1, "wrap=", wrap_eq, Joined, INVALID, wrap, nullptr, 0, 0,
+       "Use wrapper functions for symbol", "<symbol>=<symbol>", nullptr)
+OPTION(prefix_1, "wrap", wrap, Separate, INVALID, INVALID, nullptr, 0, 0, nullptr, "<symbol>=<symbol>", nullptr)
+OPTION(prefix_2, "y", anonymous_9, JoinedOrSeparate, INVALID, trace_symbol, nullptr, 0, 0,
+       "Alias for --trace-symbol", nullptr, nullptr)
 OPTION(prefix_2, "z", z, JoinedOrSeparate, INVALID, INVALID, nullptr, 0, 0,
        "Linker option extensions", "<option>", nullptr)
 #endif // OPTION
diff --git a/deps/lld/COFF/CMakeLists.txt b/deps/lld/COFF/CMakeLists.txt
index bb241e788c19987a68dde31a7b8fe2c1847376d4..c7ef7c47fea17534f6e10c05f2be4e6cb230fc82 100644
--- a/deps/lld/COFF/CMakeLists.txt
+++ b/deps/lld/COFF/CMakeLists.txt
@@ -8,6 +8,7 @@ endif()
 
 add_lld_library(lldCOFF
   Chunks.cpp
+  DebugTypes.cpp
   DLL.cpp
   Driver.cpp
   DriverUtils.cpp
diff --git a/deps/lld/COFF/Chunks.cpp b/deps/lld/COFF/Chunks.cpp
index 2bb9aa01e5399261111d951241d3cab44a4714c0..0e43d2b478b405753ff0180adb834faa5ef25752 100644
--- a/deps/lld/COFF/Chunks.cpp
+++ b/deps/lld/COFF/Chunks.cpp
@@ -1,9 +1,8 @@
 //===- Chunks.cpp ---------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -30,203 +29,201 @@ using llvm::support::ulittle32_t;
 namespace lld {
 namespace coff {
 
-SectionChunk::SectionChunk(ObjFile *F, const coff_section *H)
-    : Chunk(SectionKind), Repl(this), Header(H), File(F),
-      Relocs(File->getCOFFObj()->getRelocations(Header)) {
-  // Initialize SectionName.
-  File->getCOFFObj()->getSectionName(Header, SectionName);
+SectionChunk::SectionChunk(ObjFile *f, const coff_section *h)
+    : Chunk(SectionKind), file(f), header(h), repl(this) {
+  // Initialize relocs.
+  setRelocs(file->getCOFFObj()->getRelocations(header));
 
-  Alignment = Header->getAlignment();
+  // Initialize sectionName.
+  StringRef sectionName;
+  if (Expected<StringRef> e = file->getCOFFObj()->getSectionName(header))
+    sectionName = *e;
+  sectionNameData = sectionName.data();
+  sectionNameSize = sectionName.size();
+
+  setAlignment(header->getAlignment());
+
+  hasData = !(header->Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA);
 
   // If linker GC is disabled, every chunk starts out alive.  If linker GC is
   // enabled, treat non-comdat sections as roots. Generally optimized object
   // files will be built with -ffunction-sections or /Gy, so most things worth
   // stripping will be in a comdat.
-  Live = !Config->DoGC || !isCOMDAT();
+  live = !config->doGC || !isCOMDAT();
 }
 
-// Initialize the RelocTargets vector, to allow redirecting certain relocations
-// to a thunk instead of the actual symbol the relocation's symbol table index
-// indicates.
-void SectionChunk::readRelocTargets() {
-  assert(RelocTargets.empty());
-  RelocTargets.reserve(Relocs.size());
-  for (const coff_relocation &Rel : Relocs)
-    RelocTargets.push_back(File->getSymbol(Rel.SymbolTableIndex));
-}
-
-// Reset RelocTargets to their original targets before thunks were added.
-void SectionChunk::resetRelocTargets() {
-  for (size_t I = 0, E = Relocs.size(); I < E; ++I)
-    RelocTargets[I] = File->getSymbol(Relocs[I].SymbolTableIndex);
-}
+// SectionChunk is one of the most frequently allocated classes, so it is
+// important to keep it as compact as possible. As of this writing, the number
+// below is the size of this class on x64 platforms.
+static_assert(sizeof(SectionChunk) <= 88, "SectionChunk grew unexpectedly");
 
-static void add16(uint8_t *P, int16_t V) { write16le(P, read16le(P) + V); }
-static void add32(uint8_t *P, int32_t V) { write32le(P, read32le(P) + V); }
-static void add64(uint8_t *P, int64_t V) { write64le(P, read64le(P) + V); }
-static void or16(uint8_t *P, uint16_t V) { write16le(P, read16le(P) | V); }
-static void or32(uint8_t *P, uint32_t V) { write32le(P, read32le(P) | V); }
+static void add16(uint8_t *p, int16_t v) { write16le(p, read16le(p) + v); }
+static void add32(uint8_t *p, int32_t v) { write32le(p, read32le(p) + v); }
+static void add64(uint8_t *p, int64_t v) { write64le(p, read64le(p) + v); }
+static void or16(uint8_t *p, uint16_t v) { write16le(p, read16le(p) | v); }
+static void or32(uint8_t *p, uint32_t v) { write32le(p, read32le(p) | v); }
 
 // Verify that given sections are appropriate targets for SECREL
 // relocations. This check is relaxed because unfortunately debug
 // sections have section-relative relocations against absolute symbols.
-static bool checkSecRel(const SectionChunk *Sec, OutputSection *OS) {
-  if (OS)
+static bool checkSecRel(const SectionChunk *sec, OutputSection *os) {
+  if (os)
     return true;
-  if (Sec->isCodeView())
+  if (sec->isCodeView())
     return false;
   error("SECREL relocation cannot be applied to absolute symbols");
   return false;
 }
 
-static void applySecRel(const SectionChunk *Sec, uint8_t *Off,
-                        OutputSection *OS, uint64_t S) {
-  if (!checkSecRel(Sec, OS))
+static void applySecRel(const SectionChunk *sec, uint8_t *off,
+                        OutputSection *os, uint64_t s) {
+  if (!checkSecRel(sec, os))
     return;
-  uint64_t SecRel = S - OS->getRVA();
-  if (SecRel > UINT32_MAX) {
-    error("overflow in SECREL relocation in section: " + Sec->getSectionName());
+  uint64_t secRel = s - os->getRVA();
+  if (secRel > UINT32_MAX) {
+    error("overflow in SECREL relocation in section: " + sec->getSectionName());
     return;
   }
-  add32(Off, SecRel);
+  add32(off, secRel);
 }
 
-static void applySecIdx(uint8_t *Off, OutputSection *OS) {
+static void applySecIdx(uint8_t *off, OutputSection *os) {
   // Absolute symbol doesn't have section index, but section index relocation
   // against absolute symbol should be resolved to one plus the last output
   // section index. This is required for compatibility with MSVC.
-  if (OS)
-    add16(Off, OS->SectionIndex);
+  if (os)
+    add16(off, os->sectionIndex);
   else
-    add16(Off, DefinedAbsolute::NumOutputSections + 1);
+    add16(off, DefinedAbsolute::numOutputSections + 1);
 }
 
-void SectionChunk::applyRelX64(uint8_t *Off, uint16_t Type, OutputSection *OS,
-                               uint64_t S, uint64_t P) const {
-  switch (Type) {
-  case IMAGE_REL_AMD64_ADDR32:   add32(Off, S + Config->ImageBase); break;
-  case IMAGE_REL_AMD64_ADDR64:   add64(Off, S + Config->ImageBase); break;
-  case IMAGE_REL_AMD64_ADDR32NB: add32(Off, S); break;
-  case IMAGE_REL_AMD64_REL32:    add32(Off, S - P - 4); break;
-  case IMAGE_REL_AMD64_REL32_1:  add32(Off, S - P - 5); break;
-  case IMAGE_REL_AMD64_REL32_2:  add32(Off, S - P - 6); break;
-  case IMAGE_REL_AMD64_REL32_3:  add32(Off, S - P - 7); break;
-  case IMAGE_REL_AMD64_REL32_4:  add32(Off, S - P - 8); break;
-  case IMAGE_REL_AMD64_REL32_5:  add32(Off, S - P - 9); break;
-  case IMAGE_REL_AMD64_SECTION:  applySecIdx(Off, OS); break;
-  case IMAGE_REL_AMD64_SECREL:   applySecRel(this, Off, OS, S); break;
+void SectionChunk::applyRelX64(uint8_t *off, uint16_t type, OutputSection *os,
+                               uint64_t s, uint64_t p) const {
+  switch (type) {
+  case IMAGE_REL_AMD64_ADDR32:   add32(off, s + config->imageBase); break;
+  case IMAGE_REL_AMD64_ADDR64:   add64(off, s + config->imageBase); break;
+  case IMAGE_REL_AMD64_ADDR32NB: add32(off, s); break;
+  case IMAGE_REL_AMD64_REL32:    add32(off, s - p - 4); break;
+  case IMAGE_REL_AMD64_REL32_1:  add32(off, s - p - 5); break;
+  case IMAGE_REL_AMD64_REL32_2:  add32(off, s - p - 6); break;
+  case IMAGE_REL_AMD64_REL32_3:  add32(off, s - p - 7); break;
+  case IMAGE_REL_AMD64_REL32_4:  add32(off, s - p - 8); break;
+  case IMAGE_REL_AMD64_REL32_5:  add32(off, s - p - 9); break;
+  case IMAGE_REL_AMD64_SECTION:  applySecIdx(off, os); break;
+  case IMAGE_REL_AMD64_SECREL:   applySecRel(this, off, os, s); break;
   default:
-    error("unsupported relocation type 0x" + Twine::utohexstr(Type) + " in " +
-          toString(File));
+    error("unsupported relocation type 0x" + Twine::utohexstr(type) + " in " +
+          toString(file));
   }
 }
 
-void SectionChunk::applyRelX86(uint8_t *Off, uint16_t Type, OutputSection *OS,
-                               uint64_t S, uint64_t P) const {
-  switch (Type) {
+void SectionChunk::applyRelX86(uint8_t *off, uint16_t type, OutputSection *os,
+                               uint64_t s, uint64_t p) const {
+  switch (type) {
   case IMAGE_REL_I386_ABSOLUTE: break;
-  case IMAGE_REL_I386_DIR32:    add32(Off, S + Config->ImageBase); break;
-  case IMAGE_REL_I386_DIR32NB:  add32(Off, S); break;
-  case IMAGE_REL_I386_REL32:    add32(Off, S - P - 4); break;
-  case IMAGE_REL_I386_SECTION:  applySecIdx(Off, OS); break;
-  case IMAGE_REL_I386_SECREL:   applySecRel(this, Off, OS, S); break;
+  case IMAGE_REL_I386_DIR32:    add32(off, s + config->imageBase); break;
+  case IMAGE_REL_I386_DIR32NB:  add32(off, s); break;
+  case IMAGE_REL_I386_REL32:    add32(off, s - p - 4); break;
+  case IMAGE_REL_I386_SECTION:  applySecIdx(off, os); break;
+  case IMAGE_REL_I386_SECREL:   applySecRel(this, off, os, s); break;
   default:
-    error("unsupported relocation type 0x" + Twine::utohexstr(Type) + " in " +
-          toString(File));
+    error("unsupported relocation type 0x" + Twine::utohexstr(type) + " in " +
+          toString(file));
   }
 }
 
-static void applyMOV(uint8_t *Off, uint16_t V) {
-  write16le(Off, (read16le(Off) & 0xfbf0) | ((V & 0x800) >> 1) | ((V >> 12) & 0xf));
-  write16le(Off + 2, (read16le(Off + 2) & 0x8f00) | ((V & 0x700) << 4) | (V & 0xff));
+static void applyMOV(uint8_t *off, uint16_t v) {
+  write16le(off, (read16le(off) & 0xfbf0) | ((v & 0x800) >> 1) | ((v >> 12) & 0xf));
+  write16le(off + 2, (read16le(off + 2) & 0x8f00) | ((v & 0x700) << 4) | (v & 0xff));
 }
 
-static uint16_t readMOV(uint8_t *Off, bool MOVT) {
-  uint16_t Op1 = read16le(Off);
-  if ((Op1 & 0xfbf0) != (MOVT ? 0xf2c0 : 0xf240))
-    error("unexpected instruction in " + Twine(MOVT ? "MOVT" : "MOVW") +
+static uint16_t readMOV(uint8_t *off, bool movt) {
+  uint16_t op1 = read16le(off);
+  if ((op1 & 0xfbf0) != (movt ? 0xf2c0 : 0xf240))
+    error("unexpected instruction in " + Twine(movt ? "MOVT" : "MOVW") +
           " instruction in MOV32T relocation");
-  uint16_t Op2 = read16le(Off + 2);
-  if ((Op2 & 0x8000) != 0)
-    error("unexpected instruction in " + Twine(MOVT ? "MOVT" : "MOVW") +
+  uint16_t op2 = read16le(off + 2);
+  if ((op2 & 0x8000) != 0)
+    error("unexpected instruction in " + Twine(movt ? "MOVT" : "MOVW") +
           " instruction in MOV32T relocation");
-  return (Op2 & 0x00ff) | ((Op2 >> 4) & 0x0700) | ((Op1 << 1) & 0x0800) |
-         ((Op1 & 0x000f) << 12);
+  return (op2 & 0x00ff) | ((op2 >> 4) & 0x0700) | ((op1 << 1) & 0x0800) |
+         ((op1 & 0x000f) << 12);
 }
 
-void applyMOV32T(uint8_t *Off, uint32_t V) {
-  uint16_t ImmW = readMOV(Off, false);    // read MOVW operand
-  uint16_t ImmT = readMOV(Off + 4, true); // read MOVT operand
-  uint32_t Imm = ImmW | (ImmT << 16);
-  V += Imm;                         // add the immediate offset
-  applyMOV(Off, V);           // set MOVW operand
-  applyMOV(Off + 4, V >> 16); // set MOVT operand
+void applyMOV32T(uint8_t *off, uint32_t v) {
+  uint16_t immW = readMOV(off, false);    // read MOVW operand
+  uint16_t immT = readMOV(off + 4, true); // read MOVT operand
+  uint32_t imm = immW | (immT << 16);
+  v += imm;                         // add the immediate offset
+  applyMOV(off, v);           // set MOVW operand
+  applyMOV(off + 4, v >> 16); // set MOVT operand
 }
 
-static void applyBranch20T(uint8_t *Off, int32_t V) {
-  if (!isInt<21>(V))
+static void applyBranch20T(uint8_t *off, int32_t v) {
+  if (!isInt<21>(v))
     error("relocation out of range");
-  uint32_t S = V < 0 ? 1 : 0;
-  uint32_t J1 = (V >> 19) & 1;
-  uint32_t J2 = (V >> 18) & 1;
-  or16(Off, (S << 10) | ((V >> 12) & 0x3f));
-  or16(Off + 2, (J1 << 13) | (J2 << 11) | ((V >> 1) & 0x7ff));
+  uint32_t s = v < 0 ? 1 : 0;
+  uint32_t j1 = (v >> 19) & 1;
+  uint32_t j2 = (v >> 18) & 1;
+  or16(off, (s << 10) | ((v >> 12) & 0x3f));
+  or16(off + 2, (j1 << 13) | (j2 << 11) | ((v >> 1) & 0x7ff));
 }
 
-void applyBranch24T(uint8_t *Off, int32_t V) {
-  if (!isInt<25>(V))
+void applyBranch24T(uint8_t *off, int32_t v) {
+  if (!isInt<25>(v))
     error("relocation out of range");
-  uint32_t S = V < 0 ? 1 : 0;
-  uint32_t J1 = ((~V >> 23) & 1) ^ S;
-  uint32_t J2 = ((~V >> 22) & 1) ^ S;
-  or16(Off, (S << 10) | ((V >> 12) & 0x3ff));
+  uint32_t s = v < 0 ? 1 : 0;
+  uint32_t j1 = ((~v >> 23) & 1) ^ s;
+  uint32_t j2 = ((~v >> 22) & 1) ^ s;
+  or16(off, (s << 10) | ((v >> 12) & 0x3ff));
   // Clear out the J1 and J2 bits which may be set.
-  write16le(Off + 2, (read16le(Off + 2) & 0xd000) | (J1 << 13) | (J2 << 11) | ((V >> 1) & 0x7ff));
+  write16le(off + 2, (read16le(off + 2) & 0xd000) | (j1 << 13) | (j2 << 11) | ((v >> 1) & 0x7ff));
 }
 
-void SectionChunk::applyRelARM(uint8_t *Off, uint16_t Type, OutputSection *OS,
-                               uint64_t S, uint64_t P) const {
+void SectionChunk::applyRelARM(uint8_t *off, uint16_t type, OutputSection *os,
+                               uint64_t s, uint64_t p) const {
   // Pointer to thumb code must have the LSB set.
-  uint64_t SX = S;
-  if (OS && (OS->Header.Characteristics & IMAGE_SCN_MEM_EXECUTE))
-    SX |= 1;
-  switch (Type) {
-  case IMAGE_REL_ARM_ADDR32:    add32(Off, SX + Config->ImageBase); break;
-  case IMAGE_REL_ARM_ADDR32NB:  add32(Off, SX); break;
-  case IMAGE_REL_ARM_MOV32T:    applyMOV32T(Off, SX + Config->ImageBase); break;
-  case IMAGE_REL_ARM_BRANCH20T: applyBranch20T(Off, SX - P - 4); break;
-  case IMAGE_REL_ARM_BRANCH24T: applyBranch24T(Off, SX - P - 4); break;
-  case IMAGE_REL_ARM_BLX23T:    applyBranch24T(Off, SX - P - 4); break;
-  case IMAGE_REL_ARM_SECTION:   applySecIdx(Off, OS); break;
-  case IMAGE_REL_ARM_SECREL:    applySecRel(this, Off, OS, S); break;
+  uint64_t sx = s;
+  if (os && (os->header.Characteristics & IMAGE_SCN_MEM_EXECUTE))
+    sx |= 1;
+  switch (type) {
+  case IMAGE_REL_ARM_ADDR32:    add32(off, sx + config->imageBase); break;
+  case IMAGE_REL_ARM_ADDR32NB:  add32(off, sx); break;
+  case IMAGE_REL_ARM_MOV32T:    applyMOV32T(off, sx + config->imageBase); break;
+  case IMAGE_REL_ARM_BRANCH20T: applyBranch20T(off, sx - p - 4); break;
+  case IMAGE_REL_ARM_BRANCH24T: applyBranch24T(off, sx - p - 4); break;
+  case IMAGE_REL_ARM_BLX23T:    applyBranch24T(off, sx - p - 4); break;
+  case IMAGE_REL_ARM_SECTION:   applySecIdx(off, os); break;
+  case IMAGE_REL_ARM_SECREL:    applySecRel(this, off, os, s); break;
+  case IMAGE_REL_ARM_REL32:     add32(off, sx - p - 4); break;
   default:
-    error("unsupported relocation type 0x" + Twine::utohexstr(Type) + " in " +
-          toString(File));
+    error("unsupported relocation type 0x" + Twine::utohexstr(type) + " in " +
+          toString(file));
   }
 }
 
 // Interpret the existing immediate value as a byte offset to the
 // target symbol, then update the instruction with the immediate as
 // the page offset from the current instruction to the target.
-void applyArm64Addr(uint8_t *Off, uint64_t S, uint64_t P, int Shift) {
-  uint32_t Orig = read32le(Off);
-  uint64_t Imm = ((Orig >> 29) & 0x3) | ((Orig >> 3) & 0x1FFFFC);
-  S += Imm;
-  Imm = (S >> Shift) - (P >> Shift);
-  uint32_t ImmLo = (Imm & 0x3) << 29;
-  uint32_t ImmHi = (Imm & 0x1FFFFC) << 3;
-  uint64_t Mask = (0x3 << 29) | (0x1FFFFC << 3);
-  write32le(Off, (Orig & ~Mask) | ImmLo | ImmHi);
+void applyArm64Addr(uint8_t *off, uint64_t s, uint64_t p, int shift) {
+  uint32_t orig = read32le(off);
+  uint64_t imm = ((orig >> 29) & 0x3) | ((orig >> 3) & 0x1FFFFC);
+  s += imm;
+  imm = (s >> shift) - (p >> shift);
+  uint32_t immLo = (imm & 0x3) << 29;
+  uint32_t immHi = (imm & 0x1FFFFC) << 3;
+  uint64_t mask = (0x3 << 29) | (0x1FFFFC << 3);
+  write32le(off, (orig & ~mask) | immLo | immHi);
 }
 
 // Update the immediate field in a AARCH64 ldr, str, and add instruction.
 // Optionally limit the range of the written immediate by one or more bits
-// (RangeLimit).
-void applyArm64Imm(uint8_t *Off, uint64_t Imm, uint32_t RangeLimit) {
-  uint32_t Orig = read32le(Off);
-  Imm += (Orig >> 10) & 0xFFF;
-  Orig &= ~(0xFFF << 10);
-  write32le(Off, Orig | ((Imm & (0xFFF >> RangeLimit)) << 10));
+// (rangeLimit).
+void applyArm64Imm(uint8_t *off, uint64_t imm, uint32_t rangeLimit) {
+  uint32_t orig = read32le(off);
+  imm += (orig >> 10) & 0xFFF;
+  orig &= ~(0xFFF << 10);
+  write32le(off, orig | ((imm & (0xFFF >> rangeLimit)) << 10));
 }
 
 // Add the 12 bit page offset to the existing immediate.
@@ -237,171 +234,178 @@ void applyArm64Imm(uint8_t *Off, uint64_t Imm, uint32_t RangeLimit) {
 // Even if larger loads/stores have a larger range, limit the
 // effective offset to 12 bit, since it is intended to be a
 // page offset.
-static void applyArm64Ldr(uint8_t *Off, uint64_t Imm) {
-  uint32_t Orig = read32le(Off);
-  uint32_t Size = Orig >> 30;
+static void applyArm64Ldr(uint8_t *off, uint64_t imm) {
+  uint32_t orig = read32le(off);
+  uint32_t size = orig >> 30;
   // 0x04000000 indicates SIMD/FP registers
   // 0x00800000 indicates 128 bit
-  if ((Orig & 0x4800000) == 0x4800000)
-    Size += 4;
-  if ((Imm & ((1 << Size) - 1)) != 0)
+  if ((orig & 0x4800000) == 0x4800000)
+    size += 4;
+  if ((imm & ((1 << size) - 1)) != 0)
     error("misaligned ldr/str offset");
-  applyArm64Imm(Off, Imm >> Size, Size);
+  applyArm64Imm(off, imm >> size, size);
 }
 
-static void applySecRelLow12A(const SectionChunk *Sec, uint8_t *Off,
-                              OutputSection *OS, uint64_t S) {
-  if (checkSecRel(Sec, OS))
-    applyArm64Imm(Off, (S - OS->getRVA()) & 0xfff, 0);
+static void applySecRelLow12A(const SectionChunk *sec, uint8_t *off,
+                              OutputSection *os, uint64_t s) {
+  if (checkSecRel(sec, os))
+    applyArm64Imm(off, (s - os->getRVA()) & 0xfff, 0);
 }
 
-static void applySecRelHigh12A(const SectionChunk *Sec, uint8_t *Off,
-                               OutputSection *OS, uint64_t S) {
-  if (!checkSecRel(Sec, OS))
+static void applySecRelHigh12A(const SectionChunk *sec, uint8_t *off,
+                               OutputSection *os, uint64_t s) {
+  if (!checkSecRel(sec, os))
     return;
-  uint64_t SecRel = (S - OS->getRVA()) >> 12;
-  if (0xfff < SecRel) {
+  uint64_t secRel = (s - os->getRVA()) >> 12;
+  if (0xfff < secRel) {
     error("overflow in SECREL_HIGH12A relocation in section: " +
-          Sec->getSectionName());
+          sec->getSectionName());
     return;
   }
-  applyArm64Imm(Off, SecRel & 0xfff, 0);
+  applyArm64Imm(off, secRel & 0xfff, 0);
 }
 
-static void applySecRelLdr(const SectionChunk *Sec, uint8_t *Off,
-                           OutputSection *OS, uint64_t S) {
-  if (checkSecRel(Sec, OS))
-    applyArm64Ldr(Off, (S - OS->getRVA()) & 0xfff);
+static void applySecRelLdr(const SectionChunk *sec, uint8_t *off,
+                           OutputSection *os, uint64_t s) {
+  if (checkSecRel(sec, os))
+    applyArm64Ldr(off, (s - os->getRVA()) & 0xfff);
 }
 
-void applyArm64Branch26(uint8_t *Off, int64_t V) {
-  if (!isInt<28>(V))
+void applyArm64Branch26(uint8_t *off, int64_t v) {
+  if (!isInt<28>(v))
     error("relocation out of range");
-  or32(Off, (V & 0x0FFFFFFC) >> 2);
+  or32(off, (v & 0x0FFFFFFC) >> 2);
 }
 
-static void applyArm64Branch19(uint8_t *Off, int64_t V) {
-  if (!isInt<21>(V))
+static void applyArm64Branch19(uint8_t *off, int64_t v) {
+  if (!isInt<21>(v))
     error("relocation out of range");
-  or32(Off, (V & 0x001FFFFC) << 3);
+  or32(off, (v & 0x001FFFFC) << 3);
 }
 
-static void applyArm64Branch14(uint8_t *Off, int64_t V) {
-  if (!isInt<16>(V))
+static void applyArm64Branch14(uint8_t *off, int64_t v) {
+  if (!isInt<16>(v))
     error("relocation out of range");
-  or32(Off, (V & 0x0000FFFC) << 3);
+  or32(off, (v & 0x0000FFFC) << 3);
 }
 
-void SectionChunk::applyRelARM64(uint8_t *Off, uint16_t Type, OutputSection *OS,
-                                 uint64_t S, uint64_t P) const {
-  switch (Type) {
-  case IMAGE_REL_ARM64_PAGEBASE_REL21: applyArm64Addr(Off, S, P, 12); break;
-  case IMAGE_REL_ARM64_REL21:          applyArm64Addr(Off, S, P, 0); break;
-  case IMAGE_REL_ARM64_PAGEOFFSET_12A: applyArm64Imm(Off, S & 0xfff, 0); break;
-  case IMAGE_REL_ARM64_PAGEOFFSET_12L: applyArm64Ldr(Off, S & 0xfff); break;
-  case IMAGE_REL_ARM64_BRANCH26:       applyArm64Branch26(Off, S - P); break;
-  case IMAGE_REL_ARM64_BRANCH19:       applyArm64Branch19(Off, S - P); break;
-  case IMAGE_REL_ARM64_BRANCH14:       applyArm64Branch14(Off, S - P); break;
-  case IMAGE_REL_ARM64_ADDR32:         add32(Off, S + Config->ImageBase); break;
-  case IMAGE_REL_ARM64_ADDR32NB:       add32(Off, S); break;
-  case IMAGE_REL_ARM64_ADDR64:         add64(Off, S + Config->ImageBase); break;
-  case IMAGE_REL_ARM64_SECREL:         applySecRel(this, Off, OS, S); break;
-  case IMAGE_REL_ARM64_SECREL_LOW12A:  applySecRelLow12A(this, Off, OS, S); break;
-  case IMAGE_REL_ARM64_SECREL_HIGH12A: applySecRelHigh12A(this, Off, OS, S); break;
-  case IMAGE_REL_ARM64_SECREL_LOW12L:  applySecRelLdr(this, Off, OS, S); break;
-  case IMAGE_REL_ARM64_SECTION:        applySecIdx(Off, OS); break;
+void SectionChunk::applyRelARM64(uint8_t *off, uint16_t type, OutputSection *os,
+                                 uint64_t s, uint64_t p) const {
+  switch (type) {
+  case IMAGE_REL_ARM64_PAGEBASE_REL21: applyArm64Addr(off, s, p, 12); break;
+  case IMAGE_REL_ARM64_REL21:          applyArm64Addr(off, s, p, 0); break;
+  case IMAGE_REL_ARM64_PAGEOFFSET_12A: applyArm64Imm(off, s & 0xfff, 0); break;
+  case IMAGE_REL_ARM64_PAGEOFFSET_12L: applyArm64Ldr(off, s & 0xfff); break;
+  case IMAGE_REL_ARM64_BRANCH26:       applyArm64Branch26(off, s - p); break;
+  case IMAGE_REL_ARM64_BRANCH19:       applyArm64Branch19(off, s - p); break;
+  case IMAGE_REL_ARM64_BRANCH14:       applyArm64Branch14(off, s - p); break;
+  case IMAGE_REL_ARM64_ADDR32:         add32(off, s + config->imageBase); break;
+  case IMAGE_REL_ARM64_ADDR32NB:       add32(off, s); break;
+  case IMAGE_REL_ARM64_ADDR64:         add64(off, s + config->imageBase); break;
+  case IMAGE_REL_ARM64_SECREL:         applySecRel(this, off, os, s); break;
+  case IMAGE_REL_ARM64_SECREL_LOW12A:  applySecRelLow12A(this, off, os, s); break;
+  case IMAGE_REL_ARM64_SECREL_HIGH12A: applySecRelHigh12A(this, off, os, s); break;
+  case IMAGE_REL_ARM64_SECREL_LOW12L:  applySecRelLdr(this, off, os, s); break;
+  case IMAGE_REL_ARM64_SECTION:        applySecIdx(off, os); break;
+  case IMAGE_REL_ARM64_REL32:          add32(off, s - p - 4); break;
   default:
-    error("unsupported relocation type 0x" + Twine::utohexstr(Type) + " in " +
-          toString(File));
+    error("unsupported relocation type 0x" + Twine::utohexstr(type) + " in " +
+          toString(file));
   }
 }
 
-static void maybeReportRelocationToDiscarded(const SectionChunk *FromChunk,
-                                             Defined *Sym,
-                                             const coff_relocation &Rel) {
+static void maybeReportRelocationToDiscarded(const SectionChunk *fromChunk,
+                                             Defined *sym,
+                                             const coff_relocation &rel) {
   // Don't report these errors when the relocation comes from a debug info
   // section or in mingw mode. MinGW mode object files (built by GCC) can
   // have leftover sections with relocations against discarded comdat
   // sections. Such sections are left as is, with relocations untouched.
-  if (FromChunk->isCodeView() || FromChunk->isDWARF() || Config->MinGW)
+  if (fromChunk->isCodeView() || fromChunk->isDWARF() || config->mingw)
     return;
 
   // Get the name of the symbol. If it's null, it was discarded early, so we
   // have to go back to the object file.
-  ObjFile *File = FromChunk->File;
-  StringRef Name;
-  if (Sym) {
-    Name = Sym->getName();
+  ObjFile *file = fromChunk->file;
+  StringRef name;
+  if (sym) {
+    name = sym->getName();
   } else {
-    COFFSymbolRef COFFSym =
-        check(File->getCOFFObj()->getSymbol(Rel.SymbolTableIndex));
-    File->getCOFFObj()->getSymbolName(COFFSym, Name);
+    COFFSymbolRef coffSym =
+        check(file->getCOFFObj()->getSymbol(rel.SymbolTableIndex));
+    file->getCOFFObj()->getSymbolName(coffSym, name);
   }
 
-  error("relocation against symbol in discarded section: " + Name +
-        getSymbolLocations(File, Rel.SymbolTableIndex));
+  std::vector<std::string> symbolLocations =
+      getSymbolLocations(file, rel.SymbolTableIndex);
+
+  std::string out;
+  llvm::raw_string_ostream os(out);
+  os << "relocation against symbol in discarded section: " + name;
+  for (const std::string &s : symbolLocations)
+    os << s;
+  error(os.str());
 }
 
-void SectionChunk::writeTo(uint8_t *Buf) const {
-  if (!hasData())
+void SectionChunk::writeTo(uint8_t *buf) const {
+  if (!hasData)
     return;
   // Copy section contents from source object file to output file.
-  ArrayRef<uint8_t> A = getContents();
-  if (!A.empty())
-    memcpy(Buf + OutputSectionOff, A.data(), A.size());
+  ArrayRef<uint8_t> a = getContents();
+  if (!a.empty())
+    memcpy(buf, a.data(), a.size());
 
   // Apply relocations.
-  size_t InputSize = getSize();
-  for (size_t I = 0, E = Relocs.size(); I < E; I++) {
-    const coff_relocation &Rel = Relocs[I];
+  size_t inputSize = getSize();
+  for (size_t i = 0, e = relocsSize; i < e; i++) {
+    const coff_relocation &rel = relocsData[i];
 
     // Check for an invalid relocation offset. This check isn't perfect, because
     // we don't have the relocation size, which is only known after checking the
     // machine and relocation type. As a result, a relocation may overwrite the
     // beginning of the following input section.
-    if (Rel.VirtualAddress >= InputSize) {
+    if (rel.VirtualAddress >= inputSize) {
       error("relocation points beyond the end of its parent section");
       continue;
     }
 
-    uint8_t *Off = Buf + OutputSectionOff + Rel.VirtualAddress;
+    uint8_t *off = buf + rel.VirtualAddress;
 
-    // Use the potentially remapped Symbol instead of the one that the
-    // relocation points to.
-    auto *Sym = dyn_cast_or_null<Defined>(RelocTargets[I]);
+    auto *sym =
+        dyn_cast_or_null<Defined>(file->getSymbol(rel.SymbolTableIndex));
 
     // Get the output section of the symbol for this relocation.  The output
     // section is needed to compute SECREL and SECTION relocations used in debug
     // info.
-    Chunk *C = Sym ? Sym->getChunk() : nullptr;
-    OutputSection *OS = C ? C->getOutputSection() : nullptr;
+    Chunk *c = sym ? sym->getChunk() : nullptr;
+    OutputSection *os = c ? c->getOutputSection() : nullptr;
 
     // Skip the relocation if it refers to a discarded section, and diagnose it
     // as an error if appropriate. If a symbol was discarded early, it may be
     // null. If it was discarded late, the output section will be null, unless
     // it was an absolute or synthetic symbol.
-    if (!Sym ||
-        (!OS && !isa<DefinedAbsolute>(Sym) && !isa<DefinedSynthetic>(Sym))) {
-      maybeReportRelocationToDiscarded(this, Sym, Rel);
+    if (!sym ||
+        (!os && !isa<DefinedAbsolute>(sym) && !isa<DefinedSynthetic>(sym))) {
+      maybeReportRelocationToDiscarded(this, sym, rel);
       continue;
     }
 
-    uint64_t S = Sym->getRVA();
+    uint64_t s = sym->getRVA();
 
     // Compute the RVA of the relocation for relative relocations.
-    uint64_t P = RVA + Rel.VirtualAddress;
-    switch (Config->Machine) {
+    uint64_t p = rva + rel.VirtualAddress;
+    switch (config->machine) {
     case AMD64:
-      applyRelX64(Off, Rel.Type, OS, S, P);
+      applyRelX64(off, rel.Type, os, s, p);
       break;
     case I386:
-      applyRelX86(Off, Rel.Type, OS, S, P);
+      applyRelX86(off, rel.Type, os, s, p);
       break;
     case ARMNT:
-      applyRelARM(Off, Rel.Type, OS, S, P);
+      applyRelARM(off, rel.Type, os, s, p);
       break;
     case ARM64:
-      applyRelARM64(Off, Rel.Type, OS, S, P);
+      applyRelARM64(off, rel.Type, os, s, p);
       break;
     default:
       llvm_unreachable("unknown machine type");
@@ -409,28 +413,32 @@ void SectionChunk::writeTo(uint8_t *Buf) const {
   }
 }
 
-void SectionChunk::addAssociative(SectionChunk *Child) {
-  AssocChildren.push_back(Child);
+void SectionChunk::addAssociative(SectionChunk *child) {
+  // Insert this child at the head of the list.
+  assert(child->assocChildren == nullptr &&
+         "associated sections cannot have their own associated children");
+  child->assocChildren = assocChildren;
+  assocChildren = child;
 }
 
-static uint8_t getBaserelType(const coff_relocation &Rel) {
-  switch (Config->Machine) {
+static uint8_t getBaserelType(const coff_relocation &rel) {
+  switch (config->machine) {
   case AMD64:
-    if (Rel.Type == IMAGE_REL_AMD64_ADDR64)
+    if (rel.Type == IMAGE_REL_AMD64_ADDR64)
       return IMAGE_REL_BASED_DIR64;
     return IMAGE_REL_BASED_ABSOLUTE;
   case I386:
-    if (Rel.Type == IMAGE_REL_I386_DIR32)
+    if (rel.Type == IMAGE_REL_I386_DIR32)
       return IMAGE_REL_BASED_HIGHLOW;
     return IMAGE_REL_BASED_ABSOLUTE;
   case ARMNT:
-    if (Rel.Type == IMAGE_REL_ARM_ADDR32)
+    if (rel.Type == IMAGE_REL_ARM_ADDR32)
       return IMAGE_REL_BASED_HIGHLOW;
-    if (Rel.Type == IMAGE_REL_ARM_MOV32T)
+    if (rel.Type == IMAGE_REL_ARM_MOV32T)
       return IMAGE_REL_BASED_ARM_MOV32T;
     return IMAGE_REL_BASED_ABSOLUTE;
   case ARM64:
-    if (Rel.Type == IMAGE_REL_ARM64_ADDR64)
+    if (rel.Type == IMAGE_REL_ARM64_ADDR64)
       return IMAGE_REL_BASED_DIR64;
     return IMAGE_REL_BASED_ABSOLUTE;
   default:
@@ -442,18 +450,16 @@ static uint8_t getBaserelType(const coff_relocation &Rel) {
 // Collect all locations that contain absolute addresses, which need to be
 // fixed by the loader if load-time relocation is needed.
 // Only called when base relocation is enabled.
-void SectionChunk::getBaserels(std::vector<Baserel> *Res) {
-  for (size_t I = 0, E = Relocs.size(); I < E; I++) {
-    const coff_relocation &Rel = Relocs[I];
-    uint8_t Ty = getBaserelType(Rel);
-    if (Ty == IMAGE_REL_BASED_ABSOLUTE)
+void SectionChunk::getBaserels(std::vector<Baserel> *res) {
+  for (size_t i = 0, e = relocsSize; i < e; i++) {
+    const coff_relocation &rel = relocsData[i];
+    uint8_t ty = getBaserelType(rel);
+    if (ty == IMAGE_REL_BASED_ABSOLUTE)
       continue;
-    // Use the potentially remapped Symbol instead of the one that the
-    // relocation points to.
-    Symbol *Target = RelocTargets[I];
-    if (!Target || isa<DefinedAbsolute>(Target))
+    Symbol *target = file->getSymbol(rel.SymbolTableIndex);
+    if (!target || isa<DefinedAbsolute>(target))
       continue;
-    Res->emplace_back(RVA + Rel.VirtualAddress, Ty);
+    res->emplace_back(rva + rel.VirtualAddress, ty);
   }
 }
 
@@ -464,7 +470,7 @@ void SectionChunk::getBaserels(std::vector<Baserel> *Res) {
 // another DLL) This returns the size the relocation is supposed to update,
 // in bits, or 0 if the relocation cannot be handled as a runtime pseudo
 // relocation.
-static int getRuntimePseudoRelocSize(uint16_t Type) {
+static int getRuntimePseudoRelocSize(uint16_t type) {
   // Relocations that either contain an absolute address, or a plain
   // relative offset, since the runtime pseudo reloc implementation
   // adds 8/16/32/64 bit values to a memory address.
@@ -490,9 +496,9 @@ static int getRuntimePseudoRelocSize(uint16_t Type) {
   // the image, or temporarily changed at runtime with VirtualProtect.
   // Since this only operates on direct address values, it doesn't work for
   // ARM/ARM64 relocations, other than the plain ADDR32/ADDR64 relocations.
-  switch (Config->Machine) {
+  switch (config->machine) {
   case AMD64:
-    switch (Type) {
+    switch (type) {
     case IMAGE_REL_AMD64_ADDR64:
       return 64;
     case IMAGE_REL_AMD64_ADDR32:
@@ -507,7 +513,7 @@ static int getRuntimePseudoRelocSize(uint16_t Type) {
       return 0;
     }
   case I386:
-    switch (Type) {
+    switch (type) {
     case IMAGE_REL_I386_DIR32:
     case IMAGE_REL_I386_REL32:
       return 32;
@@ -515,14 +521,14 @@ static int getRuntimePseudoRelocSize(uint16_t Type) {
       return 0;
     }
   case ARMNT:
-    switch (Type) {
+    switch (type) {
     case IMAGE_REL_ARM_ADDR32:
       return 32;
     default:
       return 0;
     }
   case ARM64:
-    switch (Type) {
+    switch (type) {
     case IMAGE_REL_ARM64_ADDR64:
       return 64;
     case IMAGE_REL_ARM64_ADDR32:
@@ -541,75 +547,106 @@ static int getRuntimePseudoRelocSize(uint16_t Type) {
 // to a module local variable, which turned out to actually need to be
 // imported from another DLL).
 void SectionChunk::getRuntimePseudoRelocs(
-    std::vector<RuntimePseudoReloc> &Res) {
-  for (const coff_relocation &Rel : Relocs) {
-    auto *Target =
-        dyn_cast_or_null<Defined>(File->getSymbol(Rel.SymbolTableIndex));
-    if (!Target || !Target->IsRuntimePseudoReloc)
+    std::vector<RuntimePseudoReloc> &res) {
+  for (const coff_relocation &rel : getRelocs()) {
+    auto *target =
+        dyn_cast_or_null<Defined>(file->getSymbol(rel.SymbolTableIndex));
+    if (!target || !target->isRuntimePseudoReloc)
       continue;
-    int SizeInBits = getRuntimePseudoRelocSize(Rel.Type);
-    if (SizeInBits == 0) {
-      error("unable to automatically import from " + Target->getName() +
+    int sizeInBits = getRuntimePseudoRelocSize(rel.Type);
+    if (sizeInBits == 0) {
+      error("unable to automatically import from " + target->getName() +
             " with relocation type " +
-            File->getCOFFObj()->getRelocationTypeName(Rel.Type) + " in " +
-            toString(File));
+            file->getCOFFObj()->getRelocationTypeName(rel.Type) + " in " +
+            toString(file));
       continue;
     }
-    // SizeInBits is used to initialize the Flags field; currently no
+    // sizeInBits is used to initialize the Flags field; currently no
     // other flags are defined.
-    Res.emplace_back(
-        RuntimePseudoReloc(Target, this, Rel.VirtualAddress, SizeInBits));
+    res.emplace_back(
+        RuntimePseudoReloc(target, this, rel.VirtualAddress, sizeInBits));
   }
 }
 
-bool SectionChunk::hasData() const {
-  return !(Header->Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA);
-}
-
-uint32_t SectionChunk::getOutputCharacteristics() const {
-  return Header->Characteristics & (PermMask | TypeMask);
-}
-
 bool SectionChunk::isCOMDAT() const {
-  return Header->Characteristics & IMAGE_SCN_LNK_COMDAT;
+  return header->Characteristics & IMAGE_SCN_LNK_COMDAT;
 }
 
 void SectionChunk::printDiscardedMessage() const {
   // Removed by dead-stripping. If it's removed by ICF, ICF already
   // printed out the name, so don't repeat that here.
-  if (Sym && this == Repl)
-    message("Discarded " + Sym->getName());
+  if (sym && this == repl)
+    message("Discarded " + sym->getName());
 }
 
-StringRef SectionChunk::getDebugName() {
-  if (Sym)
-    return Sym->getName();
+StringRef SectionChunk::getDebugName() const {
+  if (sym)
+    return sym->getName();
   return "";
 }
 
 ArrayRef<uint8_t> SectionChunk::getContents() const {
-  ArrayRef<uint8_t> A;
-  File->getCOFFObj()->getSectionContents(Header, A);
-  return A;
+  ArrayRef<uint8_t> a;
+  cantFail(file->getCOFFObj()->getSectionContents(header, a));
+  return a;
 }
 
-void SectionChunk::replace(SectionChunk *Other) {
-  Alignment = std::max(Alignment, Other->Alignment);
-  Other->Repl = Repl;
-  Other->Live = false;
+ArrayRef<uint8_t> SectionChunk::consumeDebugMagic() {
+  assert(isCodeView());
+  return consumeDebugMagic(getContents(), getSectionName());
+}
+
+ArrayRef<uint8_t> SectionChunk::consumeDebugMagic(ArrayRef<uint8_t> data,
+                                                  StringRef sectionName) {
+  if (data.empty())
+    return {};
+
+  // First 4 bytes are section magic.
+  if (data.size() < 4)
+    fatal("the section is too short: " + sectionName);
+
+  if (!sectionName.startswith(".debug$"))
+    fatal("invalid section: " + sectionName);
+
+  uint32_t magic = support::endian::read32le(data.data());
+  uint32_t expectedMagic = sectionName == ".debug$H"
+                               ? DEBUG_HASHES_SECTION_MAGIC
+                               : DEBUG_SECTION_MAGIC;
+  if (magic != expectedMagic) {
+    warn("ignoring section " + sectionName + " with unrecognized magic 0x" +
+         utohexstr(magic));
+    return {};
+  }
+  return data.slice(4);
+}
+
+SectionChunk *SectionChunk::findByName(ArrayRef<SectionChunk *> sections,
+                                       StringRef name) {
+  for (SectionChunk *c : sections)
+    if (c->getSectionName() == name)
+      return c;
+  return nullptr;
+}
+
+void SectionChunk::replace(SectionChunk *other) {
+  p2Align = std::max(p2Align, other->p2Align);
+  other->repl = repl;
+  other->live = false;
 }
 
 uint32_t SectionChunk::getSectionNumber() const {
-  DataRefImpl R;
-  R.p = reinterpret_cast<uintptr_t>(Header);
-  SectionRef S(R, File->getCOFFObj());
-  return S.getIndex() + 1;
+  DataRefImpl r;
+  r.p = reinterpret_cast<uintptr_t>(header);
+  SectionRef s(r, file->getCOFFObj());
+  return s.getIndex() + 1;
 }
 
-CommonChunk::CommonChunk(const COFFSymbolRef S) : Sym(S) {
-  // Common symbols are aligned on natural boundaries up to 32 bytes.
+CommonChunk::CommonChunk(const COFFSymbolRef s) : sym(s) {
+  // The value of a common symbol is its size. Align all common symbols smaller
+  // than 32 bytes naturally, i.e. round the size up to the next power of two.
   // This is what MSVC link.exe does.
-  Alignment = std::min(uint64_t(32), PowerOf2Ceil(Sym.getValue()));
+  setAlignment(std::min(32U, uint32_t(PowerOf2Ceil(sym.getValue()))));
+  hasData = false;
 }
 
 uint32_t CommonChunk::getOutputCharacteristics() const {
@@ -617,139 +654,139 @@ uint32_t CommonChunk::getOutputCharacteristics() const {
          IMAGE_SCN_MEM_WRITE;
 }
 
-void StringChunk::writeTo(uint8_t *Buf) const {
-  memcpy(Buf + OutputSectionOff, Str.data(), Str.size());
-  Buf[OutputSectionOff + Str.size()] = '\0';
+void StringChunk::writeTo(uint8_t *buf) const {
+  memcpy(buf, str.data(), str.size());
+  buf[str.size()] = '\0';
 }
 
-ImportThunkChunkX64::ImportThunkChunkX64(Defined *S) : ImpSymbol(S) {
+ImportThunkChunkX64::ImportThunkChunkX64(Defined *s) : ImportThunkChunk(s) {
   // Intel Optimization Manual says that all branch targets
   // should be 16-byte aligned. MSVC linker does this too.
-  Alignment = 16;
+  setAlignment(16);
 }
 
-void ImportThunkChunkX64::writeTo(uint8_t *Buf) const {
-  memcpy(Buf + OutputSectionOff, ImportThunkX86, sizeof(ImportThunkX86));
+void ImportThunkChunkX64::writeTo(uint8_t *buf) const {
+  memcpy(buf, importThunkX86, sizeof(importThunkX86));
   // The first two bytes is a JMP instruction. Fill its operand.
-  write32le(Buf + OutputSectionOff + 2, ImpSymbol->getRVA() - RVA - getSize());
+  write32le(buf + 2, impSymbol->getRVA() - rva - getSize());
 }
 
-void ImportThunkChunkX86::getBaserels(std::vector<Baserel> *Res) {
-  Res->emplace_back(getRVA() + 2);
+void ImportThunkChunkX86::getBaserels(std::vector<Baserel> *res) {
+  res->emplace_back(getRVA() + 2);
 }
 
-void ImportThunkChunkX86::writeTo(uint8_t *Buf) const {
-  memcpy(Buf + OutputSectionOff, ImportThunkX86, sizeof(ImportThunkX86));
+void ImportThunkChunkX86::writeTo(uint8_t *buf) const {
+  memcpy(buf, importThunkX86, sizeof(importThunkX86));
   // The first two bytes is a JMP instruction. Fill its operand.
-  write32le(Buf + OutputSectionOff + 2,
-            ImpSymbol->getRVA() + Config->ImageBase);
+  write32le(buf + 2,
+            impSymbol->getRVA() + config->imageBase);
 }
 
-void ImportThunkChunkARM::getBaserels(std::vector<Baserel> *Res) {
-  Res->emplace_back(getRVA(), IMAGE_REL_BASED_ARM_MOV32T);
+void ImportThunkChunkARM::getBaserels(std::vector<Baserel> *res) {
+  res->emplace_back(getRVA(), IMAGE_REL_BASED_ARM_MOV32T);
 }
 
-void ImportThunkChunkARM::writeTo(uint8_t *Buf) const {
-  memcpy(Buf + OutputSectionOff, ImportThunkARM, sizeof(ImportThunkARM));
+void ImportThunkChunkARM::writeTo(uint8_t *buf) const {
+  memcpy(buf, importThunkARM, sizeof(importThunkARM));
   // Fix mov.w and mov.t operands.
-  applyMOV32T(Buf + OutputSectionOff, ImpSymbol->getRVA() + Config->ImageBase);
+  applyMOV32T(buf, impSymbol->getRVA() + config->imageBase);
 }
 
-void ImportThunkChunkARM64::writeTo(uint8_t *Buf) const {
-  int64_t Off = ImpSymbol->getRVA() & 0xfff;
-  memcpy(Buf + OutputSectionOff, ImportThunkARM64, sizeof(ImportThunkARM64));
-  applyArm64Addr(Buf + OutputSectionOff, ImpSymbol->getRVA(), RVA, 12);
-  applyArm64Ldr(Buf + OutputSectionOff + 4, Off);
+void ImportThunkChunkARM64::writeTo(uint8_t *buf) const {
+  int64_t off = impSymbol->getRVA() & 0xfff;
+  memcpy(buf, importThunkARM64, sizeof(importThunkARM64));
+  applyArm64Addr(buf, impSymbol->getRVA(), rva, 12);
+  applyArm64Ldr(buf + 4, off);
 }
 
 // A Thumb2, PIC, non-interworking range extension thunk.
-const uint8_t ArmThunk[] = {
+const uint8_t armThunk[] = {
     0x40, 0xf2, 0x00, 0x0c, // P:  movw ip,:lower16:S - (P + (L1-P) + 4)
     0xc0, 0xf2, 0x00, 0x0c, //     movt ip,:upper16:S - (P + (L1-P) + 4)
     0xe7, 0x44,             // L1: add  pc, ip
 };
 
 size_t RangeExtensionThunkARM::getSize() const {
-  assert(Config->Machine == ARMNT);
-  return sizeof(ArmThunk);
+  assert(config->machine == ARMNT);
+  return sizeof(armThunk);
 }
 
-void RangeExtensionThunkARM::writeTo(uint8_t *Buf) const {
-  assert(Config->Machine == ARMNT);
-  uint64_t Offset = Target->getRVA() - RVA - 12;
-  memcpy(Buf + OutputSectionOff, ArmThunk, sizeof(ArmThunk));
-  applyMOV32T(Buf + OutputSectionOff, uint32_t(Offset));
+void RangeExtensionThunkARM::writeTo(uint8_t *buf) const {
+  assert(config->machine == ARMNT);
+  uint64_t offset = target->getRVA() - rva - 12;
+  memcpy(buf, armThunk, sizeof(armThunk));
+  applyMOV32T(buf, uint32_t(offset));
 }
 
 // A position independent ARM64 adrp+add thunk, with a maximum range of
 // +/- 4 GB, which is enough for any PE-COFF.
-const uint8_t Arm64Thunk[] = {
+const uint8_t arm64Thunk[] = {
     0x10, 0x00, 0x00, 0x90, // adrp x16, Dest
     0x10, 0x02, 0x00, 0x91, // add  x16, x16, :lo12:Dest
     0x00, 0x02, 0x1f, 0xd6, // br   x16
 };
 
 size_t RangeExtensionThunkARM64::getSize() const {
-  assert(Config->Machine == ARM64);
-  return sizeof(Arm64Thunk);
+  assert(config->machine == ARM64);
+  return sizeof(arm64Thunk);
 }
 
-void RangeExtensionThunkARM64::writeTo(uint8_t *Buf) const {
-  assert(Config->Machine == ARM64);
-  memcpy(Buf + OutputSectionOff, Arm64Thunk, sizeof(Arm64Thunk));
-  applyArm64Addr(Buf + OutputSectionOff + 0, Target->getRVA(), RVA, 12);
-  applyArm64Imm(Buf + OutputSectionOff + 4, Target->getRVA() & 0xfff, 0);
+void RangeExtensionThunkARM64::writeTo(uint8_t *buf) const {
+  assert(config->machine == ARM64);
+  memcpy(buf, arm64Thunk, sizeof(arm64Thunk));
+  applyArm64Addr(buf + 0, target->getRVA(), rva, 12);
+  applyArm64Imm(buf + 4, target->getRVA() & 0xfff, 0);
 }
 
-void LocalImportChunk::getBaserels(std::vector<Baserel> *Res) {
-  Res->emplace_back(getRVA());
+void LocalImportChunk::getBaserels(std::vector<Baserel> *res) {
+  res->emplace_back(getRVA());
 }
 
-size_t LocalImportChunk::getSize() const { return Config->Wordsize; }
+size_t LocalImportChunk::getSize() const { return config->wordsize; }
 
-void LocalImportChunk::writeTo(uint8_t *Buf) const {
-  if (Config->is64()) {
-    write64le(Buf + OutputSectionOff, Sym->getRVA() + Config->ImageBase);
+void LocalImportChunk::writeTo(uint8_t *buf) const {
+  if (config->is64()) {
+    write64le(buf, sym->getRVA() + config->imageBase);
   } else {
-    write32le(Buf + OutputSectionOff, Sym->getRVA() + Config->ImageBase);
+    write32le(buf, sym->getRVA() + config->imageBase);
   }
 }
 
-void RVATableChunk::writeTo(uint8_t *Buf) const {
-  ulittle32_t *Begin = reinterpret_cast<ulittle32_t *>(Buf + OutputSectionOff);
-  size_t Cnt = 0;
-  for (const ChunkAndOffset &CO : Syms)
-    Begin[Cnt++] = CO.InputChunk->getRVA() + CO.Offset;
-  std::sort(Begin, Begin + Cnt);
-  assert(std::unique(Begin, Begin + Cnt) == Begin + Cnt &&
+void RVATableChunk::writeTo(uint8_t *buf) const {
+  ulittle32_t *begin = reinterpret_cast<ulittle32_t *>(buf);
+  size_t cnt = 0;
+  for (const ChunkAndOffset &co : syms)
+    begin[cnt++] = co.inputChunk->getRVA() + co.offset;
+  std::sort(begin, begin + cnt);
+  assert(std::unique(begin, begin + cnt) == begin + cnt &&
          "RVA tables should be de-duplicated");
 }
 
 // MinGW specific, for the "automatic import of variables from DLLs" feature.
 size_t PseudoRelocTableChunk::getSize() const {
-  if (Relocs.empty())
+  if (relocs.empty())
     return 0;
-  return 12 + 12 * Relocs.size();
+  return 12 + 12 * relocs.size();
 }
 
 // MinGW specific.
-void PseudoRelocTableChunk::writeTo(uint8_t *Buf) const {
-  if (Relocs.empty())
+void PseudoRelocTableChunk::writeTo(uint8_t *buf) const {
+  if (relocs.empty())
     return;
 
-  ulittle32_t *Table = reinterpret_cast<ulittle32_t *>(Buf + OutputSectionOff);
+  ulittle32_t *table = reinterpret_cast<ulittle32_t *>(buf);
   // This is the list header, to signal the runtime pseudo relocation v2
   // format.
-  Table[0] = 0;
-  Table[1] = 0;
-  Table[2] = 1;
+  table[0] = 0;
+  table[1] = 0;
+  table[2] = 1;
 
-  size_t Idx = 3;
-  for (const RuntimePseudoReloc &RPR : Relocs) {
-    Table[Idx + 0] = RPR.Sym->getRVA();
-    Table[Idx + 1] = RPR.Target->getRVA() + RPR.TargetOffset;
-    Table[Idx + 2] = RPR.Flags;
-    Idx += 3;
+  size_t idx = 3;
+  for (const RuntimePseudoReloc &rpr : relocs) {
+    table[idx + 0] = rpr.sym->getRVA();
+    table[idx + 1] = rpr.target->getRVA() + rpr.targetOffset;
+    table[idx + 2] = rpr.flags;
+    idx += 3;
   }
 }
 
@@ -792,26 +829,26 @@ void PseudoRelocTableChunk::writeTo(uint8_t *Buf) const {
 //
 // Usually we have a lot of relocations for each page, so the number of
 // bytes for one .reloc entry is close to 2 bytes on average.
-BaserelChunk::BaserelChunk(uint32_t Page, Baserel *Begin, Baserel *End) {
+BaserelChunk::BaserelChunk(uint32_t page, Baserel *begin, Baserel *end) {
   // Block header consists of 4 byte page RVA and 4 byte block size.
   // Each entry is 2 byte. Last entry may be padding.
-  Data.resize(alignTo((End - Begin) * 2 + 8, 4));
-  uint8_t *P = Data.data();
-  write32le(P, Page);
-  write32le(P + 4, Data.size());
-  P += 8;
-  for (Baserel *I = Begin; I != End; ++I) {
-    write16le(P, (I->Type << 12) | (I->RVA - Page));
-    P += 2;
+  data.resize(alignTo((end - begin) * 2 + 8, 4));
+  uint8_t *p = data.data();
+  write32le(p, page);
+  write32le(p + 4, data.size());
+  p += 8;
+  for (Baserel *i = begin; i != end; ++i) {
+    write16le(p, (i->type << 12) | (i->rva - page));
+    p += 2;
   }
 }
 
-void BaserelChunk::writeTo(uint8_t *Buf) const {
-  memcpy(Buf + OutputSectionOff, Data.data(), Data.size());
+void BaserelChunk::writeTo(uint8_t *buf) const {
+  memcpy(buf, data.data(), data.size());
 }
 
 uint8_t Baserel::getDefaultType() {
-  switch (Config->Machine) {
+  switch (config->machine) {
   case AMD64:
   case ARM64:
     return IMAGE_REL_BASED_DIR64;
@@ -823,36 +860,38 @@ uint8_t Baserel::getDefaultType() {
   }
 }
 
-std::map<uint32_t, MergeChunk *> MergeChunk::Instances;
+MergeChunk *MergeChunk::instances[Log2MaxSectionAlignment + 1] = {};
 
-MergeChunk::MergeChunk(uint32_t Alignment)
-    : Builder(StringTableBuilder::RAW, Alignment) {
-  this->Alignment = Alignment;
+MergeChunk::MergeChunk(uint32_t alignment)
+    : builder(StringTableBuilder::RAW, alignment) {
+  setAlignment(alignment);
 }
 
-void MergeChunk::addSection(SectionChunk *C) {
-  auto *&MC = Instances[C->Alignment];
-  if (!MC)
-    MC = make<MergeChunk>(C->Alignment);
-  MC->Sections.push_back(C);
+void MergeChunk::addSection(SectionChunk *c) {
+  assert(isPowerOf2_32(c->getAlignment()));
+  uint8_t p2Align = llvm::Log2_32(c->getAlignment());
+  assert(p2Align < array_lengthof(instances));
+  auto *&mc = instances[p2Align];
+  if (!mc)
+    mc = make<MergeChunk>(c->getAlignment());
+  mc->sections.push_back(c);
 }
 
 void MergeChunk::finalizeContents() {
-  if (!Finalized) {
-    for (SectionChunk *C : Sections)
-      if (C->Live)
-        Builder.add(toStringRef(C->getContents()));
-    Builder.finalize();
-    Finalized = true;
-  }
+  assert(!finalized && "should only finalize once");
+  for (SectionChunk *c : sections)
+    if (c->live)
+      builder.add(toStringRef(c->getContents()));
+  builder.finalize();
+  finalized = true;
+}
 
-  for (SectionChunk *C : Sections) {
-    if (!C->Live)
+void MergeChunk::assignSubsectionRVAs() {
+  for (SectionChunk *c : sections) {
+    if (!c->live)
       continue;
-    size_t Off = Builder.getOffset(toStringRef(C->getContents()));
-    C->setOutputSection(Out);
-    C->setRVA(RVA + Off);
-    C->OutputSectionOff = OutputSectionOff + Off;
+    size_t off = builder.getOffset(toStringRef(c->getContents()));
+    c->setRVA(rva + off);
   }
 }
 
@@ -861,21 +900,21 @@ uint32_t MergeChunk::getOutputCharacteristics() const {
 }
 
 size_t MergeChunk::getSize() const {
-  return Builder.getSize();
+  return builder.getSize();
 }
 
-void MergeChunk::writeTo(uint8_t *Buf) const {
-  Builder.write(Buf + OutputSectionOff);
+void MergeChunk::writeTo(uint8_t *buf) const {
+  builder.write(buf);
 }
 
 // MinGW specific.
-size_t AbsolutePointerChunk::getSize() const { return Config->Wordsize; }
+size_t AbsolutePointerChunk::getSize() const { return config->wordsize; }
 
-void AbsolutePointerChunk::writeTo(uint8_t *Buf) const {
-  if (Config->is64()) {
-    write64le(Buf + OutputSectionOff, Value);
+void AbsolutePointerChunk::writeTo(uint8_t *buf) const {
+  if (config->is64()) {
+    write64le(buf, value);
   } else {
-    write32le(Buf + OutputSectionOff, Value);
+    write32le(buf, value);
   }
 }
 
diff --git a/deps/lld/COFF/Chunks.h b/deps/lld/COFF/Chunks.h
index e132fdf8adfafaa0798a6fa58d94cbbe17d811e7..6bb629fe998b36666dfc270f80551dd446f34e60 100644
--- a/deps/lld/COFF/Chunks.h
+++ b/deps/lld/COFF/Chunks.h
@@ -1,9 +1,8 @@
 //===- Chunks.h -------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -14,6 +13,7 @@
 #include "InputFiles.h"
 #include "lld/Common/LLVM.h"
 #include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/PointerIntPair.h"
 #include "llvm/ADT/iterator.h"
 #include "llvm/ADT/iterator_range.h"
 #include "llvm/MC/StringTableBuilder.h"
@@ -40,10 +40,13 @@ class RuntimePseudoReloc;
 class Symbol;
 
 // Mask for permissions (discardable, writable, readable, executable, etc).
-const uint32_t PermMask = 0xFE000000;
+const uint32_t permMask = 0xFE000000;
 
 // Mask for section types (code, data, bss).
-const uint32_t TypeMask = 0x000000E0;
+const uint32_t typeMask = 0x000000E0;
+
+// The log base 2 of the largest section alignment, which is log2(8192), or 13.
+enum : unsigned { Log2MaxSectionAlignment = 13 };
 
 // A Chunk represents a chunk of data that will occupy space in the
 // output (if the resolver chose that). It may or may not be backed by
@@ -51,81 +54,126 @@ const uint32_t TypeMask = 0x000000E0;
 // doesn't even have actual data (if common or bss).
 class Chunk {
 public:
-  enum Kind { SectionKind, OtherKind };
-  Kind kind() const { return ChunkKind; }
-  virtual ~Chunk() = default;
+  enum Kind : uint8_t { SectionKind, OtherKind, ImportThunkKind };
+  Kind kind() const { return chunkKind; }
 
   // Returns the size of this chunk (even if this is a common or BSS.)
-  virtual size_t getSize() const = 0;
+  size_t getSize() const;
+
+  // Returns chunk alignment in power of two form. Value values are powers of
+  // two from 1 to 8192.
+  uint32_t getAlignment() const { return 1U << p2Align; }
+
+  // Update the chunk section alignment measured in bytes. Internally alignment
+  // is stored in log2.
+  void setAlignment(uint32_t align) {
+    // Treat zero byte alignment as 1 byte alignment.
+    align = align ? align : 1;
+    assert(llvm::isPowerOf2_32(align) && "alignment is not a power of 2");
+    p2Align = llvm::Log2_32(align);
+    assert(p2Align <= Log2MaxSectionAlignment &&
+           "impossible requested alignment");
+  }
 
   // Write this chunk to a mmap'ed file, assuming Buf is pointing to
   // beginning of the file. Because this function may use RVA values
   // of other chunks for relocations, you need to set them properly
   // before calling this function.
-  virtual void writeTo(uint8_t *Buf) const {}
+  void writeTo(uint8_t *buf) const;
 
-  // Called by the writer once before assigning addresses and writing
-  // the output.
-  virtual void readRelocTargets() {}
+  // The writer sets and uses the addresses. In practice, PE images cannot be
+  // larger than 2GB. Chunks are always laid as part of the image, so Chunk RVAs
+  // can be stored with 32 bits.
+  uint32_t getRVA() const { return rva; }
+  void setRVA(uint64_t v) {
+    rva = (uint32_t)v;
+    assert(rva == v && "RVA truncated");
+  }
 
-  // Called if restarting thunk addition.
-  virtual void resetRelocTargets() {}
+  // Returns readable/writable/executable bits.
+  uint32_t getOutputCharacteristics() const;
 
-  // Called by the writer after an RVA is assigned, but before calling
-  // getSize().
-  virtual void finalizeContents() {}
+  // Returns the section name if this is a section chunk.
+  // It is illegal to call this function on non-section chunks.
+  StringRef getSectionName() const;
 
-  // The writer sets and uses the addresses.
-  uint64_t getRVA() const { return RVA; }
-  void setRVA(uint64_t V) { RVA = V; }
+  // An output section has pointers to chunks in the section, and each
+  // chunk has a back pointer to an output section.
+  void setOutputSectionIdx(uint16_t o) { osidx = o; }
+  uint16_t getOutputSectionIdx() const { return osidx; }
+  OutputSection *getOutputSection() const;
 
+  // Windows-specific.
+  // Collect all locations that contain absolute addresses for base relocations.
+  void getBaserels(std::vector<Baserel> *res);
+
+  // Returns a human-readable name of this chunk. Chunks are unnamed chunks of
+  // bytes, so this is used only for logging or debugging.
+  StringRef getDebugName() const;
+
+  // Return true if this file has the hotpatch flag set to true in the
+  // S_COMPILE3 record in codeview debug info. Also returns true for some thunks
+  // synthesized by the linker.
+  bool isHotPatchable() const;
+
+protected:
+  Chunk(Kind k = OtherKind) : chunkKind(k), hasData(true), p2Align(0) {}
+
+  const Kind chunkKind;
+
+public:
   // Returns true if this has non-zero data. BSS chunks return
   // false. If false is returned, the space occupied by this chunk
-  // will be filled with zeros.
-  virtual bool hasData() const { return true; }
+  // will be filled with zeros. Corresponds to the
+  // IMAGE_SCN_CNT_UNINITIALIZED_DATA section characteristic bit.
+  uint8_t hasData : 1;
+
+public:
+  // The alignment of this chunk, stored in log2 form. The writer uses the
+  // value.
+  uint8_t p2Align : 7;
+
+  // The output section index for this chunk. The first valid section number is
+  // one.
+  uint16_t osidx = 0;
+
+  // The RVA of this chunk in the output. The writer sets a value.
+  uint32_t rva = 0;
+};
+
+class NonSectionChunk : public Chunk {
+public:
+  virtual ~NonSectionChunk() = default;
+
+  // Returns the size of this chunk (even if this is a common or BSS.)
+  virtual size_t getSize() const = 0;
 
-  // Returns readable/writable/executable bits.
   virtual uint32_t getOutputCharacteristics() const { return 0; }
 
+  // Write this chunk to a mmap'ed file, assuming Buf is pointing to
+  // beginning of the file. Because this function may use RVA values
+  // of other chunks for relocations, you need to set them properly
+  // before calling this function.
+  virtual void writeTo(uint8_t *buf) const {}
+
   // Returns the section name if this is a section chunk.
   // It is illegal to call this function on non-section chunks.
   virtual StringRef getSectionName() const {
     llvm_unreachable("unimplemented getSectionName");
   }
 
-  // An output section has pointers to chunks in the section, and each
-  // chunk has a back pointer to an output section.
-  void setOutputSection(OutputSection *O) { Out = O; }
-  OutputSection *getOutputSection() const { return Out; }
-
   // Windows-specific.
   // Collect all locations that contain absolute addresses for base relocations.
-  virtual void getBaserels(std::vector<Baserel> *Res) {}
+  virtual void getBaserels(std::vector<Baserel> *res) {}
 
   // Returns a human-readable name of this chunk. Chunks are unnamed chunks of
   // bytes, so this is used only for logging or debugging.
-  virtual StringRef getDebugName() { return ""; }
+  virtual StringRef getDebugName() const { return ""; }
 
-  // The alignment of this chunk. The writer uses the value.
-  uint32_t Alignment = 1;
+  static bool classof(const Chunk *c) { return c->kind() != SectionKind; }
 
 protected:
-  Chunk(Kind K = OtherKind) : ChunkKind(K) {}
-  const Kind ChunkKind;
-
-  // The RVA of this chunk in the output. The writer sets a value.
-  uint64_t RVA = 0;
-
-  // The output section for this chunk.
-  OutputSection *Out = nullptr;
-
-public:
-  // The offset from beginning of the output section. The writer sets a value.
-  uint64_t OutputSectionOff = 0;
-
-  // Whether this section needs to be kept distinct from other sections during
-  // ICF. This is set by the driver using address-significance tables.
-  bool KeepUnique = false;
+  NonSectionChunk(Kind k = OtherKind) : Chunk(k) {}
 };
 
 // A chunk corresponding a section of an input file.
@@ -139,39 +187,41 @@ public:
                               std::random_access_iterator_tag, Symbol *> {
     friend SectionChunk;
 
-    ObjFile *File;
+    ObjFile *file;
 
-    symbol_iterator(ObjFile *File, const coff_relocation *I)
-        : symbol_iterator::iterator_adaptor_base(I), File(File) {}
+    symbol_iterator(ObjFile *file, const coff_relocation *i)
+        : symbol_iterator::iterator_adaptor_base(i), file(file) {}
 
   public:
     symbol_iterator() = default;
 
-    Symbol *operator*() const { return File->getSymbol(I->SymbolTableIndex); }
+    Symbol *operator*() const { return file->getSymbol(I->SymbolTableIndex); }
   };
 
-  SectionChunk(ObjFile *File, const coff_section *Header);
-  static bool classof(const Chunk *C) { return C->kind() == SectionKind; }
-  void readRelocTargets() override;
-  void resetRelocTargets() override;
-  size_t getSize() const override { return Header->SizeOfRawData; }
+  SectionChunk(ObjFile *file, const coff_section *header);
+  static bool classof(const Chunk *c) { return c->kind() == SectionKind; }
+  size_t getSize() const { return header->SizeOfRawData; }
   ArrayRef<uint8_t> getContents() const;
-  void writeTo(uint8_t *Buf) const override;
-  bool hasData() const override;
-  uint32_t getOutputCharacteristics() const override;
-  StringRef getSectionName() const override { return SectionName; }
-  void getBaserels(std::vector<Baserel> *Res) override;
+  void writeTo(uint8_t *buf) const;
+
+  uint32_t getOutputCharacteristics() const {
+    return header->Characteristics & (permMask | typeMask);
+  }
+  StringRef getSectionName() const {
+    return StringRef(sectionNameData, sectionNameSize);
+  }
+  void getBaserels(std::vector<Baserel> *res);
   bool isCOMDAT() const;
-  void applyRelX64(uint8_t *Off, uint16_t Type, OutputSection *OS, uint64_t S,
-                   uint64_t P) const;
-  void applyRelX86(uint8_t *Off, uint16_t Type, OutputSection *OS, uint64_t S,
-                   uint64_t P) const;
-  void applyRelARM(uint8_t *Off, uint16_t Type, OutputSection *OS, uint64_t S,
-                   uint64_t P) const;
-  void applyRelARM64(uint8_t *Off, uint16_t Type, OutputSection *OS, uint64_t S,
-                     uint64_t P) const;
+  void applyRelX64(uint8_t *off, uint16_t type, OutputSection *os, uint64_t s,
+                   uint64_t p) const;
+  void applyRelX86(uint8_t *off, uint16_t type, OutputSection *os, uint64_t s,
+                   uint64_t p) const;
+  void applyRelARM(uint8_t *off, uint16_t type, OutputSection *os, uint64_t s,
+                   uint64_t p) const;
+  void applyRelARM64(uint8_t *off, uint16_t type, OutputSection *os, uint64_t s,
+                     uint64_t p) const;
 
-  void getRuntimePseudoRelocs(std::vector<RuntimePseudoReloc> &Res);
+  void getRuntimePseudoRelocs(std::vector<RuntimePseudoReloc> &res);
 
   // Called if the garbage collector decides to not include this chunk
   // in a final output. It's supposed to print out a log message to stdout.
@@ -179,69 +229,169 @@ public:
 
   // Adds COMDAT associative sections to this COMDAT section. A chunk
   // and its children are treated as a group by the garbage collector.
-  void addAssociative(SectionChunk *Child);
+  void addAssociative(SectionChunk *child);
 
-  StringRef getDebugName() override;
+  StringRef getDebugName() const;
 
   // True if this is a codeview debug info chunk. These will not be laid out in
   // the image. Instead they will end up in the PDB, if one is requested.
   bool isCodeView() const {
-    return SectionName == ".debug" || SectionName.startswith(".debug$");
+    return getSectionName() == ".debug" || getSectionName().startswith(".debug$");
   }
 
   // True if this is a DWARF debug info or exception handling chunk.
   bool isDWARF() const {
-    return SectionName.startswith(".debug_") || SectionName == ".eh_frame";
+    return getSectionName().startswith(".debug_") || getSectionName() == ".eh_frame";
   }
 
   // Allow iteration over the bodies of this chunk's relocated symbols.
   llvm::iterator_range<symbol_iterator> symbols() const {
-    return llvm::make_range(symbol_iterator(File, Relocs.begin()),
-                            symbol_iterator(File, Relocs.end()));
+    return llvm::make_range(symbol_iterator(file, relocsData),
+                            symbol_iterator(file, relocsData + relocsSize));
   }
 
+  ArrayRef<coff_relocation> getRelocs() const {
+    return llvm::makeArrayRef(relocsData, relocsSize);
+  }
+
+  // Reloc setter used by ARM range extension thunk insertion.
+  void setRelocs(ArrayRef<coff_relocation> newRelocs) {
+    relocsData = newRelocs.data();
+    relocsSize = newRelocs.size();
+    assert(relocsSize == newRelocs.size() && "reloc size truncation");
+  }
+
+  // Single linked list iterator for associated comdat children.
+  class AssociatedIterator
+      : public llvm::iterator_facade_base<
+            AssociatedIterator, std::forward_iterator_tag, SectionChunk> {
+  public:
+    AssociatedIterator() = default;
+    AssociatedIterator(SectionChunk *head) : cur(head) {}
+    AssociatedIterator &operator=(const AssociatedIterator &r) {
+      cur = r.cur;
+      return *this;
+    }
+    bool operator==(const AssociatedIterator &r) const { return cur == r.cur; }
+    const SectionChunk &operator*() const { return *cur; }
+    SectionChunk &operator*() { return *cur; }
+    AssociatedIterator &operator++() {
+      cur = cur->assocChildren;
+      return *this;
+    }
+
+  private:
+    SectionChunk *cur = nullptr;
+  };
+
   // Allow iteration over the associated child chunks for this section.
-  ArrayRef<SectionChunk *> children() const { return AssocChildren; }
+  llvm::iterator_range<AssociatedIterator> children() const {
+    return llvm::make_range(AssociatedIterator(assocChildren),
+                            AssociatedIterator(nullptr));
+  }
 
   // The section ID this chunk belongs to in its Obj.
   uint32_t getSectionNumber() const;
 
+  ArrayRef<uint8_t> consumeDebugMagic();
+
+  static ArrayRef<uint8_t> consumeDebugMagic(ArrayRef<uint8_t> data,
+                                             StringRef sectionName);
+
+  static SectionChunk *findByName(ArrayRef<SectionChunk *> sections,
+                                  StringRef name);
+
+  // The file that this chunk was created from.
+  ObjFile *file;
+
+  // Pointer to the COFF section header in the input file.
+  const coff_section *header;
+
+  // The COMDAT leader symbol if this is a COMDAT chunk.
+  DefinedRegular *sym = nullptr;
+
+  // The CRC of the contents as described in the COFF spec 4.5.5.
+  // Auxiliary Format 5: Section Definitions. Used for ICF.
+  uint32_t checksum = 0;
+
+  // Used by the garbage collector.
+  bool live;
+
+  // Whether this section needs to be kept distinct from other sections during
+  // ICF. This is set by the driver using address-significance tables.
+  bool keepUnique = false;
+
+  // The COMDAT selection if this is a COMDAT chunk.
+  llvm::COFF::COMDATType selection = (llvm::COFF::COMDATType)0;
+
   // A pointer pointing to a replacement for this chunk.
   // Initially it points to "this" object. If this chunk is merged
   // with other chunk by ICF, it points to another chunk,
   // and this chunk is considered as dead.
-  SectionChunk *Repl;
-
-  // The CRC of the contents as described in the COFF spec 4.5.5.
-  // Auxiliary Format 5: Section Definitions. Used for ICF.
-  uint32_t Checksum = 0;
-
-  const coff_section *Header;
-
-  // The file that this chunk was created from.
-  ObjFile *File;
-
-  // The COMDAT leader symbol if this is a COMDAT chunk.
-  DefinedRegular *Sym = nullptr;
-
-  ArrayRef<coff_relocation> Relocs;
-
-  // Used by the garbage collector.
-  bool Live;
-
-  // When inserting a thunk, we need to adjust a relocation to point to
-  // the thunk instead of the actual original target Symbol.
-  std::vector<Symbol *> RelocTargets;
+  SectionChunk *repl;
 
 private:
-  StringRef SectionName;
-  std::vector<SectionChunk *> AssocChildren;
+  SectionChunk *assocChildren = nullptr;
 
   // Used for ICF (Identical COMDAT Folding)
-  void replace(SectionChunk *Other);
-  uint32_t Class[2] = {0, 0};
+  void replace(SectionChunk *other);
+  uint32_t eqClass[2] = {0, 0};
+
+  // Relocations for this section. Size is stored below.
+  const coff_relocation *relocsData;
+
+  // Section name string. Size is stored below.
+  const char *sectionNameData;
+
+  uint32_t relocsSize = 0;
+  uint32_t sectionNameSize = 0;
 };
 
+// Inline methods to implement faux-virtual dispatch for SectionChunk.
+
+inline size_t Chunk::getSize() const {
+  if (isa<SectionChunk>(this))
+    return static_cast<const SectionChunk *>(this)->getSize();
+  else
+    return static_cast<const NonSectionChunk *>(this)->getSize();
+}
+
+inline uint32_t Chunk::getOutputCharacteristics() const {
+  if (isa<SectionChunk>(this))
+    return static_cast<const SectionChunk *>(this)->getOutputCharacteristics();
+  else
+    return static_cast<const NonSectionChunk *>(this)
+        ->getOutputCharacteristics();
+}
+
+inline void Chunk::writeTo(uint8_t *buf) const {
+  if (isa<SectionChunk>(this))
+    static_cast<const SectionChunk *>(this)->writeTo(buf);
+  else
+    static_cast<const NonSectionChunk *>(this)->writeTo(buf);
+}
+
+inline StringRef Chunk::getSectionName() const {
+  if (isa<SectionChunk>(this))
+    return static_cast<const SectionChunk *>(this)->getSectionName();
+  else
+    return static_cast<const NonSectionChunk *>(this)->getSectionName();
+}
+
+inline void Chunk::getBaserels(std::vector<Baserel> *res) {
+  if (isa<SectionChunk>(this))
+    static_cast<SectionChunk *>(this)->getBaserels(res);
+  else
+    static_cast<NonSectionChunk *>(this)->getBaserels(res);
+}
+
+inline StringRef Chunk::getDebugName() const {
+  if (isa<SectionChunk>(this))
+    return static_cast<const SectionChunk *>(this)->getDebugName();
+  else
+    return static_cast<const NonSectionChunk *>(this)->getDebugName();
+}
+
 // This class is used to implement an lld-specific feature (not implemented in
 // MSVC) that minimizes the output size by finding string literals sharing tail
 // parts and merging them.
@@ -251,60 +401,60 @@ private:
 // The MergeChunk then tail merges the strings using the StringTableBuilder
 // class and assigns RVAs and section offsets to each of the member chunks based
 // on the offsets assigned by the StringTableBuilder.
-class MergeChunk : public Chunk {
+class MergeChunk : public NonSectionChunk {
 public:
-  MergeChunk(uint32_t Alignment);
-  static void addSection(SectionChunk *C);
-  void finalizeContents() override;
+  MergeChunk(uint32_t alignment);
+  static void addSection(SectionChunk *c);
+  void finalizeContents();
+  void assignSubsectionRVAs();
 
   uint32_t getOutputCharacteristics() const override;
   StringRef getSectionName() const override { return ".rdata"; }
   size_t getSize() const override;
-  void writeTo(uint8_t *Buf) const override;
+  void writeTo(uint8_t *buf) const override;
 
-  static std::map<uint32_t, MergeChunk *> Instances;
-  std::vector<SectionChunk *> Sections;
+  static MergeChunk *instances[Log2MaxSectionAlignment + 1];
+  std::vector<SectionChunk *> sections;
 
 private:
-  llvm::StringTableBuilder Builder;
-  bool Finalized = false;
+  llvm::StringTableBuilder builder;
+  bool finalized = false;
 };
 
 // A chunk for common symbols. Common chunks don't have actual data.
-class CommonChunk : public Chunk {
+class CommonChunk : public NonSectionChunk {
 public:
-  CommonChunk(const COFFSymbolRef Sym);
-  size_t getSize() const override { return Sym.getValue(); }
-  bool hasData() const override { return false; }
+  CommonChunk(const COFFSymbolRef sym);
+  size_t getSize() const override { return sym.getValue(); }
   uint32_t getOutputCharacteristics() const override;
   StringRef getSectionName() const override { return ".bss"; }
 
 private:
-  const COFFSymbolRef Sym;
+  const COFFSymbolRef sym;
 };
 
 // A chunk for linker-created strings.
-class StringChunk : public Chunk {
+class StringChunk : public NonSectionChunk {
 public:
-  explicit StringChunk(StringRef S) : Str(S) {}
-  size_t getSize() const override { return Str.size() + 1; }
-  void writeTo(uint8_t *Buf) const override;
+  explicit StringChunk(StringRef s) : str(s) {}
+  size_t getSize() const override { return str.size() + 1; }
+  void writeTo(uint8_t *buf) const override;
 
 private:
-  StringRef Str;
+  StringRef str;
 };
 
-static const uint8_t ImportThunkX86[] = {
+static const uint8_t importThunkX86[] = {
     0xff, 0x25, 0x00, 0x00, 0x00, 0x00, // JMP *0x0
 };
 
-static const uint8_t ImportThunkARM[] = {
+static const uint8_t importThunkARM[] = {
     0x40, 0xf2, 0x00, 0x0c, // mov.w ip, #0
     0xc0, 0xf2, 0x00, 0x0c, // mov.t ip, #0
     0xdc, 0xf8, 0x00, 0xf0, // ldr.w pc, [ip]
 };
 
-static const uint8_t ImportThunkARM64[] = {
+static const uint8_t importThunkARM64[] = {
     0x10, 0x00, 0x00, 0x90, // adrp x16, #0
     0x10, 0x02, 0x40, 0xf9, // ldr  x16, [x16]
     0x00, 0x02, 0x1f, 0xd6, // br   x16
@@ -313,87 +463,85 @@ static const uint8_t ImportThunkARM64[] = {
 // Windows-specific.
 // A chunk for DLL import jump table entry. In a final output, its
 // contents will be a JMP instruction to some __imp_ symbol.
-class ImportThunkChunkX64 : public Chunk {
+class ImportThunkChunk : public NonSectionChunk {
 public:
-  explicit ImportThunkChunkX64(Defined *S);
-  size_t getSize() const override { return sizeof(ImportThunkX86); }
-  void writeTo(uint8_t *Buf) const override;
+  ImportThunkChunk(Defined *s)
+      : NonSectionChunk(ImportThunkKind), impSymbol(s) {}
+  static bool classof(const Chunk *c) { return c->kind() == ImportThunkKind; }
 
-private:
-  Defined *ImpSymbol;
+protected:
+  Defined *impSymbol;
 };
 
-class ImportThunkChunkX86 : public Chunk {
+class ImportThunkChunkX64 : public ImportThunkChunk {
 public:
-  explicit ImportThunkChunkX86(Defined *S) : ImpSymbol(S) {}
-  size_t getSize() const override { return sizeof(ImportThunkX86); }
-  void getBaserels(std::vector<Baserel> *Res) override;
-  void writeTo(uint8_t *Buf) const override;
-
-private:
-  Defined *ImpSymbol;
+  explicit ImportThunkChunkX64(Defined *s);
+  size_t getSize() const override { return sizeof(importThunkX86); }
+  void writeTo(uint8_t *buf) const override;
 };
 
-class ImportThunkChunkARM : public Chunk {
+class ImportThunkChunkX86 : public ImportThunkChunk {
 public:
-  explicit ImportThunkChunkARM(Defined *S) : ImpSymbol(S) {}
-  size_t getSize() const override { return sizeof(ImportThunkARM); }
-  void getBaserels(std::vector<Baserel> *Res) override;
-  void writeTo(uint8_t *Buf) const override;
-
-private:
-  Defined *ImpSymbol;
+  explicit ImportThunkChunkX86(Defined *s) : ImportThunkChunk(s) {}
+  size_t getSize() const override { return sizeof(importThunkX86); }
+  void getBaserels(std::vector<Baserel> *res) override;
+  void writeTo(uint8_t *buf) const override;
 };
 
-class ImportThunkChunkARM64 : public Chunk {
+class ImportThunkChunkARM : public ImportThunkChunk {
 public:
-  explicit ImportThunkChunkARM64(Defined *S) : ImpSymbol(S) {}
-  size_t getSize() const override { return sizeof(ImportThunkARM64); }
-  void writeTo(uint8_t *Buf) const override;
+  explicit ImportThunkChunkARM(Defined *s) : ImportThunkChunk(s) {}
+  size_t getSize() const override { return sizeof(importThunkARM); }
+  void getBaserels(std::vector<Baserel> *res) override;
+  void writeTo(uint8_t *buf) const override;
+};
 
-private:
-  Defined *ImpSymbol;
+class ImportThunkChunkARM64 : public ImportThunkChunk {
+public:
+  explicit ImportThunkChunkARM64(Defined *s) : ImportThunkChunk(s) {}
+  size_t getSize() const override { return sizeof(importThunkARM64); }
+  void writeTo(uint8_t *buf) const override;
 };
 
-class RangeExtensionThunkARM : public Chunk {
+class RangeExtensionThunkARM : public NonSectionChunk {
 public:
-  explicit RangeExtensionThunkARM(Defined *T) : Target(T) {}
+  explicit RangeExtensionThunkARM(Defined *t) : target(t) {}
   size_t getSize() const override;
-  void writeTo(uint8_t *Buf) const override;
+  void writeTo(uint8_t *buf) const override;
 
-  Defined *Target;
+  Defined *target;
 };
 
-class RangeExtensionThunkARM64 : public Chunk {
+class RangeExtensionThunkARM64 : public NonSectionChunk {
 public:
-  explicit RangeExtensionThunkARM64(Defined *T) : Target(T) {}
+  explicit RangeExtensionThunkARM64(Defined *t) : target(t) {}
   size_t getSize() const override;
-  void writeTo(uint8_t *Buf) const override;
+  void writeTo(uint8_t *buf) const override;
 
-  Defined *Target;
+  Defined *target;
 };
 
 // Windows-specific.
 // See comments for DefinedLocalImport class.
-class LocalImportChunk : public Chunk {
+class LocalImportChunk : public NonSectionChunk {
 public:
-  explicit LocalImportChunk(Defined *S) : Sym(S) {
-    Alignment = Config->Wordsize;
+  explicit LocalImportChunk(Defined *s) : sym(s) {
+    setAlignment(config->wordsize);
   }
   size_t getSize() const override;
-  void getBaserels(std::vector<Baserel> *Res) override;
-  void writeTo(uint8_t *Buf) const override;
+  void getBaserels(std::vector<Baserel> *res) override;
+  void writeTo(uint8_t *buf) const override;
 
 private:
-  Defined *Sym;
+  Defined *sym;
 };
 
 // Duplicate RVAs are not allowed in RVA tables, so unique symbols by chunk and
 // offset into the chunk. Order does not matter as the RVA table will be sorted
 // later.
 struct ChunkAndOffset {
-  Chunk *InputChunk;
-  uint32_t Offset;
+  Chunk *inputChunk;
+  uint32_t offset;
 
   struct DenseMapInfo {
     static ChunkAndOffset getEmptyKey() {
@@ -402,12 +550,12 @@ struct ChunkAndOffset {
     static ChunkAndOffset getTombstoneKey() {
       return {llvm::DenseMapInfo<Chunk *>::getTombstoneKey(), 0};
     }
-    static unsigned getHashValue(const ChunkAndOffset &CO) {
+    static unsigned getHashValue(const ChunkAndOffset &co) {
       return llvm::DenseMapInfo<std::pair<Chunk *, uint32_t>>::getHashValue(
-          {CO.InputChunk, CO.Offset});
+          {co.inputChunk, co.offset});
     }
-    static bool isEqual(const ChunkAndOffset &LHS, const ChunkAndOffset &RHS) {
-      return LHS.InputChunk == RHS.InputChunk && LHS.Offset == RHS.Offset;
+    static bool isEqual(const ChunkAndOffset &lhs, const ChunkAndOffset &rhs) {
+      return lhs.inputChunk == rhs.inputChunk && lhs.offset == rhs.offset;
     }
   };
 };
@@ -415,48 +563,48 @@ struct ChunkAndOffset {
 using SymbolRVASet = llvm::DenseSet<ChunkAndOffset>;
 
 // Table which contains symbol RVAs. Used for /safeseh and /guard:cf.
-class RVATableChunk : public Chunk {
+class RVATableChunk : public NonSectionChunk {
 public:
-  explicit RVATableChunk(SymbolRVASet S) : Syms(std::move(S)) {}
-  size_t getSize() const override { return Syms.size() * 4; }
-  void writeTo(uint8_t *Buf) const override;
+  explicit RVATableChunk(SymbolRVASet s) : syms(std::move(s)) {}
+  size_t getSize() const override { return syms.size() * 4; }
+  void writeTo(uint8_t *buf) const override;
 
 private:
-  SymbolRVASet Syms;
+  SymbolRVASet syms;
 };
 
 // Windows-specific.
 // This class represents a block in .reloc section.
 // See the PE/COFF spec 5.6 for details.
-class BaserelChunk : public Chunk {
+class BaserelChunk : public NonSectionChunk {
 public:
-  BaserelChunk(uint32_t Page, Baserel *Begin, Baserel *End);
-  size_t getSize() const override { return Data.size(); }
-  void writeTo(uint8_t *Buf) const override;
+  BaserelChunk(uint32_t page, Baserel *begin, Baserel *end);
+  size_t getSize() const override { return data.size(); }
+  void writeTo(uint8_t *buf) const override;
 
 private:
-  std::vector<uint8_t> Data;
+  std::vector<uint8_t> data;
 };
 
 class Baserel {
 public:
-  Baserel(uint32_t V, uint8_t Ty) : RVA(V), Type(Ty) {}
-  explicit Baserel(uint32_t V) : Baserel(V, getDefaultType()) {}
+  Baserel(uint32_t v, uint8_t ty) : rva(v), type(ty) {}
+  explicit Baserel(uint32_t v) : Baserel(v, getDefaultType()) {}
   uint8_t getDefaultType();
 
-  uint32_t RVA;
-  uint8_t Type;
+  uint32_t rva;
+  uint8_t type;
 };
 
 // This is a placeholder Chunk, to allow attaching a DefinedSynthetic to a
 // specific place in a section, without any data. This is used for the MinGW
 // specific symbol __RUNTIME_PSEUDO_RELOC_LIST_END__, even though the concept
 // of an empty chunk isn't MinGW specific.
-class EmptyChunk : public Chunk {
+class EmptyChunk : public NonSectionChunk {
 public:
   EmptyChunk() {}
   size_t getSize() const override { return 0; }
-  void writeTo(uint8_t *Buf) const override {}
+  void writeTo(uint8_t *buf) const override {}
 };
 
 // MinGW specific, for the "automatic import of variables from DLLs" feature.
@@ -465,17 +613,17 @@ public:
 // the reference didn't use the dllimport attribute. The MinGW runtime will
 // process this table after loading, before handling control over to user
 // code.
-class PseudoRelocTableChunk : public Chunk {
+class PseudoRelocTableChunk : public NonSectionChunk {
 public:
-  PseudoRelocTableChunk(std::vector<RuntimePseudoReloc> &Relocs)
-      : Relocs(std::move(Relocs)) {
-    Alignment = 4;
+  PseudoRelocTableChunk(std::vector<RuntimePseudoReloc> &relocs)
+      : relocs(std::move(relocs)) {
+    setAlignment(4);
   }
   size_t getSize() const override;
-  void writeTo(uint8_t *Buf) const override;
+  void writeTo(uint8_t *buf) const override;
 
 private:
-  std::vector<RuntimePseudoReloc> Relocs;
+  std::vector<RuntimePseudoReloc> relocs;
 };
 
 // MinGW specific; information about one individual location in the image
@@ -483,37 +631,48 @@ private:
 // one individual element in the PseudoRelocTableChunk table.
 class RuntimePseudoReloc {
 public:
-  RuntimePseudoReloc(Defined *Sym, SectionChunk *Target, uint32_t TargetOffset,
-                     int Flags)
-      : Sym(Sym), Target(Target), TargetOffset(TargetOffset), Flags(Flags) {}
+  RuntimePseudoReloc(Defined *sym, SectionChunk *target, uint32_t targetOffset,
+                     int flags)
+      : sym(sym), target(target), targetOffset(targetOffset), flags(flags) {}
 
-  Defined *Sym;
-  SectionChunk *Target;
-  uint32_t TargetOffset;
+  Defined *sym;
+  SectionChunk *target;
+  uint32_t targetOffset;
   // The Flags field contains the size of the relocation, in bits. No other
   // flags are currently defined.
-  int Flags;
+  int flags;
 };
 
 // MinGW specific. A Chunk that contains one pointer-sized absolute value.
-class AbsolutePointerChunk : public Chunk {
+class AbsolutePointerChunk : public NonSectionChunk {
 public:
-  AbsolutePointerChunk(uint64_t Value) : Value(Value) {
-    Alignment = getSize();
+  AbsolutePointerChunk(uint64_t value) : value(value) {
+    setAlignment(getSize());
   }
   size_t getSize() const override;
-  void writeTo(uint8_t *Buf) const override;
+  void writeTo(uint8_t *buf) const override;
 
 private:
-  uint64_t Value;
+  uint64_t value;
 };
 
-void applyMOV32T(uint8_t *Off, uint32_t V);
-void applyBranch24T(uint8_t *Off, int32_t V);
+// Return true if this file has the hotpatch flag set to true in the S_COMPILE3
+// record in codeview debug info. Also returns true for some thunks synthesized
+// by the linker.
+inline bool Chunk::isHotPatchable() const {
+  if (auto *sc = dyn_cast<SectionChunk>(this))
+    return sc->file->hotPatchable;
+  else if (isa<ImportThunkChunk>(this))
+    return true;
+  return false;
+}
 
-void applyArm64Addr(uint8_t *Off, uint64_t S, uint64_t P, int Shift);
-void applyArm64Imm(uint8_t *Off, uint64_t Imm, uint32_t RangeLimit);
-void applyArm64Branch26(uint8_t *Off, int64_t V);
+void applyMOV32T(uint8_t *off, uint32_t v);
+void applyBranch24T(uint8_t *off, int32_t v);
+
+void applyArm64Addr(uint8_t *off, uint64_t s, uint64_t p, int shift);
+void applyArm64Imm(uint8_t *off, uint64_t imm, uint32_t rangeLimit);
+void applyArm64Branch26(uint8_t *off, int64_t v);
 
 } // namespace coff
 } // namespace lld
diff --git a/deps/lld/COFF/Config.h b/deps/lld/COFF/Config.h
index 8915b6a3bdd8c14b4cc7bba34b2820cc3894f2bf..1b0e2404271033849635316d1a300bd1fdebefd1 100644
--- a/deps/lld/COFF/Config.h
+++ b/deps/lld/COFF/Config.h
@@ -1,9 +1,8 @@
 //===- Config.h -------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -29,6 +28,7 @@ class DefinedAbsolute;
 class DefinedRelative;
 class StringChunk;
 class Symbol;
+class InputFile;
 
 // Short aliases.
 static const auto AMD64 = llvm::COFF::IMAGE_FILE_MACHINE_AMD64;
@@ -38,30 +38,30 @@ static const auto I386 = llvm::COFF::IMAGE_FILE_MACHINE_I386;
 
 // Represents an /export option.
 struct Export {
-  StringRef Name;       // N in /export:N or /export:E=N
-  StringRef ExtName;    // E in /export:E=N
-  Symbol *Sym = nullptr;
-  uint16_t Ordinal = 0;
-  bool Noname = false;
-  bool Data = false;
-  bool Private = false;
-  bool Constant = false;
+  StringRef name;       // N in /export:N or /export:E=N
+  StringRef extName;    // E in /export:E=N
+  Symbol *sym = nullptr;
+  uint16_t ordinal = 0;
+  bool noname = false;
+  bool data = false;
+  bool isPrivate = false;
+  bool constant = false;
 
   // If an export is a form of /export:foo=dllname.bar, that means
   // that foo should be exported as an alias to bar in the DLL.
-  // ForwardTo is set to "dllname.bar" part. Usually empty.
-  StringRef ForwardTo;
-  StringChunk *ForwardChunk = nullptr;
+  // forwardTo is set to "dllname.bar" part. Usually empty.
+  StringRef forwardTo;
+  StringChunk *forwardChunk = nullptr;
 
   // True if this /export option was in .drectves section.
-  bool Directives = false;
-  StringRef SymbolName;
-  StringRef ExportName; // Name in DLL
+  bool directives = false;
+  StringRef symbolName;
+  StringRef exportName; // Name in DLL
 
-  bool operator==(const Export &E) {
-    return (Name == E.Name && ExtName == E.ExtName &&
-            Ordinal == E.Ordinal && Noname == E.Noname &&
-            Data == E.Data && Private == E.Private);
+  bool operator==(const Export &e) {
+    return (name == e.name && extName == e.extName &&
+            ordinal == e.ordinal && noname == e.noname &&
+            data == e.data && isPrivate == e.isPrivate);
   }
 };
 
@@ -81,130 +81,149 @@ enum class GuardCFLevel {
 // Global configuration.
 struct Configuration {
   enum ManifestKind { SideBySide, Embed, No };
-  bool is64() { return Machine == AMD64 || Machine == ARM64; }
+  bool is64() { return machine == AMD64 || machine == ARM64; }
 
-  llvm::COFF::MachineTypes Machine = IMAGE_FILE_MACHINE_UNKNOWN;
-  size_t Wordsize;
-  bool Verbose = false;
-  WindowsSubsystem Subsystem = llvm::COFF::IMAGE_SUBSYSTEM_UNKNOWN;
-  Symbol *Entry = nullptr;
-  bool NoEntry = false;
-  std::string OutputFile;
-  std::string ImportName;
-  bool DoGC = true;
-  bool DoICF = true;
-  bool TailMerge;
-  bool Relocatable = true;
-  bool ForceMultiple = false;
-  bool ForceUnresolved = false;
-  bool Debug = false;
-  bool DebugDwarf = false;
-  bool DebugGHashes = false;
-  bool DebugSymtab = false;
-  bool ShowTiming = false;
-  unsigned DebugTypes = static_cast<unsigned>(DebugType::None);
-  std::vector<std::string> NatvisFiles;
-  llvm::SmallString<128> PDBAltPath;
-  llvm::SmallString<128> PDBPath;
-  llvm::SmallString<128> PDBSourcePath;
-  std::vector<llvm::StringRef> Argv;
+  llvm::COFF::MachineTypes machine = IMAGE_FILE_MACHINE_UNKNOWN;
+  size_t wordsize;
+  bool verbose = false;
+  WindowsSubsystem subsystem = llvm::COFF::IMAGE_SUBSYSTEM_UNKNOWN;
+  Symbol *entry = nullptr;
+  bool noEntry = false;
+  std::string outputFile;
+  std::string importName;
+  bool demangle = true;
+  bool doGC = true;
+  bool doICF = true;
+  bool tailMerge;
+  bool relocatable = true;
+  bool forceMultiple = false;
+  bool forceMultipleRes = false;
+  bool forceUnresolved = false;
+  bool debug = false;
+  bool debugDwarf = false;
+  bool debugGHashes = false;
+  bool debugSymtab = false;
+  bool showTiming = false;
+  bool showSummary = false;
+  unsigned debugTypes = static_cast<unsigned>(DebugType::None);
+  std::vector<std::string> natvisFiles;
+  llvm::SmallString<128> pdbAltPath;
+  llvm::SmallString<128> pdbPath;
+  llvm::SmallString<128> pdbSourcePath;
+  std::vector<llvm::StringRef> argv;
 
   // Symbols in this set are considered as live by the garbage collector.
-  std::vector<Symbol *> GCRoot;
+  std::vector<Symbol *> gcroot;
 
-  std::set<StringRef> NoDefaultLibs;
-  bool NoDefaultLibAll = false;
+  std::set<std::string> noDefaultLibs;
+  bool noDefaultLibAll = false;
 
   // True if we are creating a DLL.
-  bool DLL = false;
-  StringRef Implib;
-  std::vector<Export> Exports;
-  std::set<std::string> DelayLoads;
-  std::map<std::string, int> DLLOrder;
-  Symbol *DelayLoadHelper = nullptr;
+  bool dll = false;
+  StringRef implib;
+  std::vector<Export> exports;
+  std::set<std::string> delayLoads;
+  std::map<std::string, int> dllOrder;
+  Symbol *delayLoadHelper = nullptr;
 
-  bool SaveTemps = false;
+  bool saveTemps = false;
 
   // /guard:cf
-  GuardCFLevel GuardCF = GuardCFLevel::Off;
+  GuardCFLevel guardCF = GuardCFLevel::Off;
 
   // Used for SafeSEH.
-  Symbol *SEHTable = nullptr;
-  Symbol *SEHCount = nullptr;
+  bool safeSEH = false;
+  Symbol *sehTable = nullptr;
+  Symbol *sehCount = nullptr;
 
   // Used for /opt:lldlto=N
-  unsigned LTOO = 2;
+  unsigned ltoo = 2;
 
   // Used for /opt:lldltojobs=N
-  unsigned ThinLTOJobs = 0;
+  unsigned thinLTOJobs = 0;
   // Used for /opt:lldltopartitions=N
-  unsigned LTOPartitions = 1;
+  unsigned ltoPartitions = 1;
 
   // Used for /opt:lldltocache=path
-  StringRef LTOCache;
+  StringRef ltoCache;
   // Used for /opt:lldltocachepolicy=policy
-  llvm::CachePruningPolicy LTOCachePolicy;
+  llvm::CachePruningPolicy ltoCachePolicy;
 
   // Used for /merge:from=to (e.g. /merge:.rdata=.text)
-  std::map<StringRef, StringRef> Merge;
+  std::map<StringRef, StringRef> merge;
 
   // Used for /section=.name,{DEKPRSW} to set section attributes.
-  std::map<StringRef, uint32_t> Section;
+  std::map<StringRef, uint32_t> section;
 
   // Options for manifest files.
-  ManifestKind Manifest = No;
-  int ManifestID = 1;
-  StringRef ManifestDependency;
-  bool ManifestUAC = true;
-  std::vector<std::string> ManifestInput;
-  StringRef ManifestLevel = "'asInvoker'";
-  StringRef ManifestUIAccess = "'false'";
-  StringRef ManifestFile;
+  ManifestKind manifest = No;
+  int manifestID = 1;
+  StringRef manifestDependency;
+  bool manifestUAC = true;
+  std::vector<std::string> manifestInput;
+  StringRef manifestLevel = "'asInvoker'";
+  StringRef manifestUIAccess = "'false'";
+  StringRef manifestFile;
 
   // Used for /aligncomm.
-  std::map<std::string, int> AlignComm;
+  std::map<std::string, int> alignComm;
 
   // Used for /failifmismatch.
-  std::map<StringRef, StringRef> MustMatch;
+  std::map<StringRef, std::pair<StringRef, InputFile *>> mustMatch;
 
   // Used for /alternatename.
-  std::map<StringRef, StringRef> AlternateNames;
+  std::map<StringRef, StringRef> alternateNames;
 
   // Used for /order.
-  llvm::StringMap<int> Order;
+  llvm::StringMap<int> order;
 
   // Used for /lldmap.
-  std::string MapFile;
+  std::string mapFile;
 
-  uint64_t ImageBase = -1;
-  uint64_t StackReserve = 1024 * 1024;
-  uint64_t StackCommit = 4096;
-  uint64_t HeapReserve = 1024 * 1024;
-  uint64_t HeapCommit = 4096;
-  uint32_t MajorImageVersion = 0;
-  uint32_t MinorImageVersion = 0;
-  uint32_t MajorOSVersion = 6;
-  uint32_t MinorOSVersion = 0;
-  uint32_t Timestamp = 0;
-  bool DynamicBase = true;
-  bool AllowBind = true;
-  bool NxCompat = true;
-  bool AllowIsolation = true;
-  bool TerminalServerAware = true;
-  bool LargeAddressAware = false;
-  bool HighEntropyVA = false;
-  bool AppContainer = false;
-  bool MinGW = false;
-  bool WarnMissingOrderSymbol = true;
-  bool WarnLocallyDefinedImported = true;
-  bool WarnDebugInfoUnusable = true;
-  bool Incremental = true;
-  bool IntegrityCheck = false;
-  bool KillAt = false;
-  bool Repro = false;
+  // Used for /thinlto-index-only:
+  llvm::StringRef thinLTOIndexOnlyArg;
+
+  // Used for /thinlto-object-prefix-replace:
+  std::pair<llvm::StringRef, llvm::StringRef> thinLTOPrefixReplace;
+
+  // Used for /thinlto-object-suffix-replace:
+  std::pair<llvm::StringRef, llvm::StringRef> thinLTOObjectSuffixReplace;
+
+  uint64_t imageBase = -1;
+  uint64_t fileAlign = 512;
+  uint64_t stackReserve = 1024 * 1024;
+  uint64_t stackCommit = 4096;
+  uint64_t heapReserve = 1024 * 1024;
+  uint64_t heapCommit = 4096;
+  uint32_t majorImageVersion = 0;
+  uint32_t minorImageVersion = 0;
+  uint32_t majorOSVersion = 6;
+  uint32_t minorOSVersion = 0;
+  uint32_t timestamp = 0;
+  uint32_t functionPadMin = 0;
+  bool dynamicBase = true;
+  bool allowBind = true;
+  bool nxCompat = true;
+  bool allowIsolation = true;
+  bool terminalServerAware = true;
+  bool largeAddressAware = false;
+  bool highEntropyVA = false;
+  bool appContainer = false;
+  bool mingw = false;
+  bool warnMissingOrderSymbol = true;
+  bool warnLocallyDefinedImported = true;
+  bool warnDebugInfoUnusable = true;
+  bool incremental = true;
+  bool integrityCheck = false;
+  bool killAt = false;
+  bool repro = false;
+  bool swaprunCD = false;
+  bool swaprunNet = false;
+  bool thinLTOEmitImportsFiles;
+  bool thinLTOIndexOnly;
 };
 
-extern Configuration *Config;
+extern Configuration *config;
 
 } // namespace coff
 } // namespace lld
diff --git a/deps/lld/COFF/DLL.cpp b/deps/lld/COFF/DLL.cpp
index c06027d3e5c34052eda49beaf9e455980cdb3f46..40d1f463aa3fff44cfa48010679582935738040c 100644
--- a/deps/lld/COFF/DLL.cpp
+++ b/deps/lld/COFF/DLL.cpp
@@ -1,9 +1,8 @@
 //===- DLL.cpp ------------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -36,161 +35,167 @@ namespace {
 // Import table
 
 // A chunk for the import descriptor table.
-class HintNameChunk : public Chunk {
+class HintNameChunk : public NonSectionChunk {
 public:
-  HintNameChunk(StringRef N, uint16_t H) : Name(N), Hint(H) {}
+  HintNameChunk(StringRef n, uint16_t h) : name(n), hint(h) {}
 
   size_t getSize() const override {
     // Starts with 2 byte Hint field, followed by a null-terminated string,
     // ends with 0 or 1 byte padding.
-    return alignTo(Name.size() + 3, 2);
+    return alignTo(name.size() + 3, 2);
   }
 
-  void writeTo(uint8_t *Buf) const override {
-    memset(Buf + OutputSectionOff, 0, getSize());
-    write16le(Buf + OutputSectionOff, Hint);
-    memcpy(Buf + OutputSectionOff + 2, Name.data(), Name.size());
+  void writeTo(uint8_t *buf) const override {
+    memset(buf, 0, getSize());
+    write16le(buf, hint);
+    memcpy(buf + 2, name.data(), name.size());
   }
 
 private:
-  StringRef Name;
-  uint16_t Hint;
+  StringRef name;
+  uint16_t hint;
 };
 
 // A chunk for the import descriptor table.
-class LookupChunk : public Chunk {
+class LookupChunk : public NonSectionChunk {
 public:
-  explicit LookupChunk(Chunk *C) : HintName(C) { Alignment = Config->Wordsize; }
-  size_t getSize() const override { return Config->Wordsize; }
+  explicit LookupChunk(Chunk *c) : hintName(c) {
+    setAlignment(config->wordsize);
+  }
+  size_t getSize() const override { return config->wordsize; }
 
-  void writeTo(uint8_t *Buf) const override {
-    if (Config->is64())
-      write64le(Buf + OutputSectionOff, HintName->getRVA());
+  void writeTo(uint8_t *buf) const override {
+    if (config->is64())
+      write64le(buf, hintName->getRVA());
     else
-      write32le(Buf + OutputSectionOff, HintName->getRVA());
+      write32le(buf, hintName->getRVA());
   }
 
-  Chunk *HintName;
+  Chunk *hintName;
 };
 
 // A chunk for the import descriptor table.
 // This chunk represent import-by-ordinal symbols.
 // See Microsoft PE/COFF spec 7.1. Import Header for details.
-class OrdinalOnlyChunk : public Chunk {
+class OrdinalOnlyChunk : public NonSectionChunk {
 public:
-  explicit OrdinalOnlyChunk(uint16_t V) : Ordinal(V) {
-    Alignment = Config->Wordsize;
+  explicit OrdinalOnlyChunk(uint16_t v) : ordinal(v) {
+    setAlignment(config->wordsize);
   }
-  size_t getSize() const override { return Config->Wordsize; }
+  size_t getSize() const override { return config->wordsize; }
 
-  void writeTo(uint8_t *Buf) const override {
+  void writeTo(uint8_t *buf) const override {
     // An import-by-ordinal slot has MSB 1 to indicate that
     // this is import-by-ordinal (and not import-by-name).
-    if (Config->is64()) {
-      write64le(Buf + OutputSectionOff, (1ULL << 63) | Ordinal);
+    if (config->is64()) {
+      write64le(buf, (1ULL << 63) | ordinal);
     } else {
-      write32le(Buf + OutputSectionOff, (1ULL << 31) | Ordinal);
+      write32le(buf, (1ULL << 31) | ordinal);
     }
   }
 
-  uint16_t Ordinal;
+  uint16_t ordinal;
 };
 
 // A chunk for the import descriptor table.
-class ImportDirectoryChunk : public Chunk {
+class ImportDirectoryChunk : public NonSectionChunk {
 public:
-  explicit ImportDirectoryChunk(Chunk *N) : DLLName(N) {}
+  explicit ImportDirectoryChunk(Chunk *n) : dllName(n) {}
   size_t getSize() const override { return sizeof(ImportDirectoryTableEntry); }
 
-  void writeTo(uint8_t *Buf) const override {
-    memset(Buf + OutputSectionOff, 0, getSize());
+  void writeTo(uint8_t *buf) const override {
+    memset(buf, 0, getSize());
 
-    auto *E = (coff_import_directory_table_entry *)(Buf + OutputSectionOff);
-    E->ImportLookupTableRVA = LookupTab->getRVA();
-    E->NameRVA = DLLName->getRVA();
-    E->ImportAddressTableRVA = AddressTab->getRVA();
+    auto *e = (coff_import_directory_table_entry *)(buf);
+    e->ImportLookupTableRVA = lookupTab->getRVA();
+    e->NameRVA = dllName->getRVA();
+    e->ImportAddressTableRVA = addressTab->getRVA();
   }
 
-  Chunk *DLLName;
-  Chunk *LookupTab;
-  Chunk *AddressTab;
+  Chunk *dllName;
+  Chunk *lookupTab;
+  Chunk *addressTab;
 };
 
 // A chunk representing null terminator in the import table.
 // Contents of this chunk is always null bytes.
-class NullChunk : public Chunk {
+class NullChunk : public NonSectionChunk {
 public:
-  explicit NullChunk(size_t N) : Size(N) {}
-  bool hasData() const override { return false; }
-  size_t getSize() const override { return Size; }
+  explicit NullChunk(size_t n) : size(n) { hasData = false; }
+  size_t getSize() const override { return size; }
 
-  void writeTo(uint8_t *Buf) const override {
-    memset(Buf + OutputSectionOff, 0, Size);
+  void writeTo(uint8_t *buf) const override {
+    memset(buf, 0, size);
   }
 
 private:
-  size_t Size;
+  size_t size;
 };
 
 static std::vector<std::vector<DefinedImportData *>>
-binImports(const std::vector<DefinedImportData *> &Imports) {
+binImports(const std::vector<DefinedImportData *> &imports) {
   // Group DLL-imported symbols by DLL name because that's how
   // symbols are layed out in the import descriptor table.
-  auto Less = [](const std::string &A, const std::string &B) {
-    return Config->DLLOrder[A] < Config->DLLOrder[B];
+  auto less = [](const std::string &a, const std::string &b) {
+    return config->dllOrder[a] < config->dllOrder[b];
   };
   std::map<std::string, std::vector<DefinedImportData *>,
-           bool(*)(const std::string &, const std::string &)> M(Less);
-  for (DefinedImportData *Sym : Imports)
-    M[Sym->getDLLName().lower()].push_back(Sym);
+           bool(*)(const std::string &, const std::string &)> m(less);
+  for (DefinedImportData *sym : imports)
+    m[sym->getDLLName().lower()].push_back(sym);
 
-  std::vector<std::vector<DefinedImportData *>> V;
-  for (auto &KV : M) {
+  std::vector<std::vector<DefinedImportData *>> v;
+  for (auto &kv : m) {
     // Sort symbols by name for each group.
-    std::vector<DefinedImportData *> &Syms = KV.second;
-    std::sort(Syms.begin(), Syms.end(),
-              [](DefinedImportData *A, DefinedImportData *B) {
-                return A->getName() < B->getName();
+    std::vector<DefinedImportData *> &syms = kv.second;
+    std::sort(syms.begin(), syms.end(),
+              [](DefinedImportData *a, DefinedImportData *b) {
+                return a->getName() < b->getName();
               });
-    V.push_back(std::move(Syms));
+    v.push_back(std::move(syms));
   }
-  return V;
+  return v;
 }
 
 // Export table
 // See Microsoft PE/COFF spec 4.3 for details.
 
 // A chunk for the delay import descriptor table etnry.
-class DelayDirectoryChunk : public Chunk {
+class DelayDirectoryChunk : public NonSectionChunk {
 public:
-  explicit DelayDirectoryChunk(Chunk *N) : DLLName(N) {}
+  explicit DelayDirectoryChunk(Chunk *n) : dllName(n) {}
 
   size_t getSize() const override {
     return sizeof(delay_import_directory_table_entry);
   }
 
-  void writeTo(uint8_t *Buf) const override {
-    memset(Buf + OutputSectionOff, 0, getSize());
+  void writeTo(uint8_t *buf) const override {
+    memset(buf, 0, getSize());
 
-    auto *E = (delay_import_directory_table_entry *)(Buf + OutputSectionOff);
-    E->Attributes = 1;
-    E->Name = DLLName->getRVA();
-    E->ModuleHandle = ModuleHandle->getRVA();
-    E->DelayImportAddressTable = AddressTab->getRVA();
-    E->DelayImportNameTable = NameTab->getRVA();
+    auto *e = (delay_import_directory_table_entry *)(buf);
+    e->Attributes = 1;
+    e->Name = dllName->getRVA();
+    e->ModuleHandle = moduleHandle->getRVA();
+    e->DelayImportAddressTable = addressTab->getRVA();
+    e->DelayImportNameTable = nameTab->getRVA();
   }
 
-  Chunk *DLLName;
-  Chunk *ModuleHandle;
-  Chunk *AddressTab;
-  Chunk *NameTab;
+  Chunk *dllName;
+  Chunk *moduleHandle;
+  Chunk *addressTab;
+  Chunk *nameTab;
 };
 
 // Initial contents for delay-loaded functions.
 // This code calls __delayLoadHelper2 function to resolve a symbol
 // and then overwrites its jump table slot with the result
 // for subsequent function calls.
-static const uint8_t ThunkX64[] = {
+static const uint8_t thunkX64[] = {
+    0x48, 0x8D, 0x05, 0, 0, 0, 0,       // lea     rax, [__imp_<FUNCNAME>]
+    0xE9, 0, 0, 0, 0,                   // jmp     __tailMerge_<lib>
+};
+
+static const uint8_t tailMergeX64[] = {
     0x51,                               // push    rcx
     0x52,                               // push    rdx
     0x41, 0x50,                         // push    r8
@@ -200,7 +205,7 @@ static const uint8_t ThunkX64[] = {
     0x66, 0x0F, 0x7F, 0x4C, 0x24, 0x10, // movdqa  xmmword ptr [rsp+10h], xmm1
     0x66, 0x0F, 0x7F, 0x54, 0x24, 0x20, // movdqa  xmmword ptr [rsp+20h], xmm2
     0x66, 0x0F, 0x7F, 0x5C, 0x24, 0x30, // movdqa  xmmword ptr [rsp+30h], xmm3
-    0x48, 0x8D, 0x15, 0, 0, 0, 0,       // lea     rdx, [__imp_<FUNCNAME>]
+    0x48, 0x8B, 0xD0,                   // mov     rdx, rax
     0x48, 0x8D, 0x0D, 0, 0, 0, 0,       // lea     rcx, [___DELAY_IMPORT_...]
     0xE8, 0, 0, 0, 0,                   // call    __delayLoadHelper2
     0x66, 0x0F, 0x6F, 0x04, 0x24,       // movdqa  xmm0, xmmword ptr [rsp]
@@ -215,10 +220,15 @@ static const uint8_t ThunkX64[] = {
     0xFF, 0xE0,                         // jmp     rax
 };
 
-static const uint8_t ThunkX86[] = {
+static const uint8_t thunkX86[] = {
+    0xB8, 0, 0, 0, 0,  // mov   eax, offset ___imp__<FUNCNAME>
+    0xE9, 0, 0, 0, 0,  // jmp   __tailMerge_<lib>
+};
+
+static const uint8_t tailMergeX86[] = {
     0x51,              // push  ecx
     0x52,              // push  edx
-    0x68, 0, 0, 0, 0,  // push  offset ___imp__<FUNCNAME>
+    0x50,              // push  eax
     0x68, 0, 0, 0, 0,  // push  offset ___DELAY_IMPORT_DESCRIPTOR_<DLLNAME>_dll
     0xE8, 0, 0, 0, 0,  // call  ___delayLoadHelper2@8
     0x5A,              // pop   edx
@@ -226,9 +236,13 @@ static const uint8_t ThunkX86[] = {
     0xFF, 0xE0,        // jmp   eax
 };
 
-static const uint8_t ThunkARM[] = {
+static const uint8_t thunkARM[] = {
     0x40, 0xf2, 0x00, 0x0c, // mov.w   ip, #0 __imp_<FUNCNAME>
     0xc0, 0xf2, 0x00, 0x0c, // mov.t   ip, #0 __imp_<FUNCNAME>
+    0x00, 0xf0, 0x00, 0xb8, // b.w     __tailMerge_<lib>
+};
+
+static const uint8_t tailMergeARM[] = {
     0x2d, 0xe9, 0x0f, 0x48, // push.w  {r0, r1, r2, r3, r11, lr}
     0x0d, 0xf2, 0x10, 0x0b, // addw    r11, sp, #16
     0x2d, 0xed, 0x10, 0x0b, // vpush   {d0, d1, d2, d3, d4, d5, d6, d7}
@@ -242,9 +256,13 @@ static const uint8_t ThunkARM[] = {
     0x60, 0x47,             // bx      ip
 };
 
-static const uint8_t ThunkARM64[] = {
+static const uint8_t thunkARM64[] = {
     0x11, 0x00, 0x00, 0x90, // adrp    x17, #0      __imp_<FUNCNAME>
     0x31, 0x02, 0x00, 0x91, // add     x17, x17, #0 :lo12:__imp_<FUNCNAME>
+    0x00, 0x00, 0x00, 0x14, // b       __tailMerge_<lib>
+};
+
+static const uint8_t tailMergeARM64[] = {
     0xfd, 0x7b, 0xb3, 0xa9, // stp     x29, x30, [sp, #-208]!
     0xfd, 0x03, 0x00, 0x91, // mov     x29, sp
     0xe0, 0x07, 0x01, 0xa9, // stp     x0, x1, [sp, #16]
@@ -273,372 +291,445 @@ static const uint8_t ThunkARM64[] = {
 };
 
 // A chunk for the delay import thunk.
-class ThunkChunkX64 : public Chunk {
+class ThunkChunkX64 : public NonSectionChunk {
 public:
-  ThunkChunkX64(Defined *I, Chunk *D, Defined *H)
-      : Imp(I), Desc(D), Helper(H) {}
+  ThunkChunkX64(Defined *i, Chunk *tm) : imp(i), tailMerge(tm) {}
 
-  size_t getSize() const override { return sizeof(ThunkX64); }
+  size_t getSize() const override { return sizeof(thunkX64); }
 
-  void writeTo(uint8_t *Buf) const override {
-    memcpy(Buf + OutputSectionOff, ThunkX64, sizeof(ThunkX64));
-    write32le(Buf + OutputSectionOff + 36, Imp->getRVA() - RVA - 40);
-    write32le(Buf + OutputSectionOff + 43, Desc->getRVA() - RVA - 47);
-    write32le(Buf + OutputSectionOff + 48, Helper->getRVA() - RVA - 52);
+  void writeTo(uint8_t *buf) const override {
+    memcpy(buf, thunkX64, sizeof(thunkX64));
+    write32le(buf + 3, imp->getRVA() - rva - 7);
+    write32le(buf + 8, tailMerge->getRVA() - rva - 12);
   }
 
-  Defined *Imp = nullptr;
-  Chunk *Desc = nullptr;
-  Defined *Helper = nullptr;
+  Defined *imp = nullptr;
+  Chunk *tailMerge = nullptr;
 };
 
-class ThunkChunkX86 : public Chunk {
+class TailMergeChunkX64 : public NonSectionChunk {
 public:
-  ThunkChunkX86(Defined *I, Chunk *D, Defined *H)
-      : Imp(I), Desc(D), Helper(H) {}
+  TailMergeChunkX64(Chunk *d, Defined *h) : desc(d), helper(h) {}
 
-  size_t getSize() const override { return sizeof(ThunkX86); }
+  size_t getSize() const override { return sizeof(tailMergeX64); }
 
-  void writeTo(uint8_t *Buf) const override {
-    memcpy(Buf + OutputSectionOff, ThunkX86, sizeof(ThunkX86));
-    write32le(Buf + OutputSectionOff + 3, Imp->getRVA() + Config->ImageBase);
-    write32le(Buf + OutputSectionOff + 8, Desc->getRVA() + Config->ImageBase);
-    write32le(Buf + OutputSectionOff + 13, Helper->getRVA() - RVA - 17);
+  void writeTo(uint8_t *buf) const override {
+    memcpy(buf, tailMergeX64, sizeof(tailMergeX64));
+    write32le(buf + 39, desc->getRVA() - rva - 43);
+    write32le(buf + 44, helper->getRVA() - rva - 48);
   }
 
-  void getBaserels(std::vector<Baserel> *Res) override {
-    Res->emplace_back(RVA + 3);
-    Res->emplace_back(RVA + 8);
+  Chunk *desc = nullptr;
+  Defined *helper = nullptr;
+};
+
+class ThunkChunkX86 : public NonSectionChunk {
+public:
+  ThunkChunkX86(Defined *i, Chunk *tm) : imp(i), tailMerge(tm) {}
+
+  size_t getSize() const override { return sizeof(thunkX86); }
+
+  void writeTo(uint8_t *buf) const override {
+    memcpy(buf, thunkX86, sizeof(thunkX86));
+    write32le(buf + 1, imp->getRVA() + config->imageBase);
+    write32le(buf + 6, tailMerge->getRVA() - rva - 10);
+  }
+
+  void getBaserels(std::vector<Baserel> *res) override {
+    res->emplace_back(rva + 1);
+  }
+
+  Defined *imp = nullptr;
+  Chunk *tailMerge = nullptr;
+};
+
+class TailMergeChunkX86 : public NonSectionChunk {
+public:
+  TailMergeChunkX86(Chunk *d, Defined *h) : desc(d), helper(h) {}
+
+  size_t getSize() const override { return sizeof(tailMergeX86); }
+
+  void writeTo(uint8_t *buf) const override {
+    memcpy(buf, tailMergeX86, sizeof(tailMergeX86));
+    write32le(buf + 4, desc->getRVA() + config->imageBase);
+    write32le(buf + 9, helper->getRVA() - rva - 13);
+  }
+
+  void getBaserels(std::vector<Baserel> *res) override {
+    res->emplace_back(rva + 4);
+  }
+
+  Chunk *desc = nullptr;
+  Defined *helper = nullptr;
+};
+
+class ThunkChunkARM : public NonSectionChunk {
+public:
+  ThunkChunkARM(Defined *i, Chunk *tm) : imp(i), tailMerge(tm) {}
+
+  size_t getSize() const override { return sizeof(thunkARM); }
+
+  void writeTo(uint8_t *buf) const override {
+    memcpy(buf, thunkARM, sizeof(thunkARM));
+    applyMOV32T(buf + 0, imp->getRVA() + config->imageBase);
+    applyBranch24T(buf + 8, tailMerge->getRVA() - rva - 12);
+  }
+
+  void getBaserels(std::vector<Baserel> *res) override {
+    res->emplace_back(rva + 0, IMAGE_REL_BASED_ARM_MOV32T);
   }
 
-  Defined *Imp = nullptr;
-  Chunk *Desc = nullptr;
-  Defined *Helper = nullptr;
+  Defined *imp = nullptr;
+  Chunk *tailMerge = nullptr;
 };
 
-class ThunkChunkARM : public Chunk {
+class TailMergeChunkARM : public NonSectionChunk {
 public:
-  ThunkChunkARM(Defined *I, Chunk *D, Defined *H)
-      : Imp(I), Desc(D), Helper(H) {}
+  TailMergeChunkARM(Chunk *d, Defined *h) : desc(d), helper(h) {}
 
-  size_t getSize() const override { return sizeof(ThunkARM); }
+  size_t getSize() const override { return sizeof(tailMergeARM); }
 
-  void writeTo(uint8_t *Buf) const override {
-    memcpy(Buf + OutputSectionOff, ThunkARM, sizeof(ThunkARM));
-    applyMOV32T(Buf + OutputSectionOff + 0, Imp->getRVA() + Config->ImageBase);
-    applyMOV32T(Buf + OutputSectionOff + 22, Desc->getRVA() + Config->ImageBase);
-    applyBranch24T(Buf + OutputSectionOff + 30, Helper->getRVA() - RVA - 34);
+  void writeTo(uint8_t *buf) const override {
+    memcpy(buf, tailMergeARM, sizeof(tailMergeARM));
+    applyMOV32T(buf + 14, desc->getRVA() + config->imageBase);
+    applyBranch24T(buf + 22, helper->getRVA() - rva - 26);
   }
 
-  void getBaserels(std::vector<Baserel> *Res) override {
-    Res->emplace_back(RVA + 0, IMAGE_REL_BASED_ARM_MOV32T);
-    Res->emplace_back(RVA + 22, IMAGE_REL_BASED_ARM_MOV32T);
+  void getBaserels(std::vector<Baserel> *res) override {
+    res->emplace_back(rva + 14, IMAGE_REL_BASED_ARM_MOV32T);
   }
 
-  Defined *Imp = nullptr;
-  Chunk *Desc = nullptr;
-  Defined *Helper = nullptr;
+  Chunk *desc = nullptr;
+  Defined *helper = nullptr;
 };
 
-class ThunkChunkARM64 : public Chunk {
+class ThunkChunkARM64 : public NonSectionChunk {
 public:
-  ThunkChunkARM64(Defined *I, Chunk *D, Defined *H)
-      : Imp(I), Desc(D), Helper(H) {}
-
-  size_t getSize() const override { return sizeof(ThunkARM64); }
-
-  void writeTo(uint8_t *Buf) const override {
-    memcpy(Buf + OutputSectionOff, ThunkARM64, sizeof(ThunkARM64));
-    applyArm64Addr(Buf + OutputSectionOff + 0, Imp->getRVA(), RVA + 0, 12);
-    applyArm64Imm(Buf + OutputSectionOff + 4, Imp->getRVA() & 0xfff, 0);
-    applyArm64Addr(Buf + OutputSectionOff + 52, Desc->getRVA(), RVA + 52, 12);
-    applyArm64Imm(Buf + OutputSectionOff + 56, Desc->getRVA() & 0xfff, 0);
-    applyArm64Branch26(Buf + OutputSectionOff + 60,
-                       Helper->getRVA() - RVA - 60);
+  ThunkChunkARM64(Defined *i, Chunk *tm) : imp(i), tailMerge(tm) {}
+
+  size_t getSize() const override { return sizeof(thunkARM64); }
+
+  void writeTo(uint8_t *buf) const override {
+    memcpy(buf, thunkARM64, sizeof(thunkARM64));
+    applyArm64Addr(buf + 0, imp->getRVA(), rva + 0, 12);
+    applyArm64Imm(buf + 4, imp->getRVA() & 0xfff, 0);
+    applyArm64Branch26(buf + 8, tailMerge->getRVA() - rva - 8);
+  }
+
+  Defined *imp = nullptr;
+  Chunk *tailMerge = nullptr;
+};
+
+class TailMergeChunkARM64 : public NonSectionChunk {
+public:
+  TailMergeChunkARM64(Chunk *d, Defined *h) : desc(d), helper(h) {}
+
+  size_t getSize() const override { return sizeof(tailMergeARM64); }
+
+  void writeTo(uint8_t *buf) const override {
+    memcpy(buf, tailMergeARM64, sizeof(tailMergeARM64));
+    applyArm64Addr(buf + 44, desc->getRVA(), rva + 44, 12);
+    applyArm64Imm(buf + 48, desc->getRVA() & 0xfff, 0);
+    applyArm64Branch26(buf + 52, helper->getRVA() - rva - 52);
   }
 
-  Defined *Imp = nullptr;
-  Chunk *Desc = nullptr;
-  Defined *Helper = nullptr;
+  Chunk *desc = nullptr;
+  Defined *helper = nullptr;
 };
 
 // A chunk for the import descriptor table.
-class DelayAddressChunk : public Chunk {
+class DelayAddressChunk : public NonSectionChunk {
 public:
-  explicit DelayAddressChunk(Chunk *C) : Thunk(C) {
-    Alignment = Config->Wordsize;
+  explicit DelayAddressChunk(Chunk *c) : thunk(c) {
+    setAlignment(config->wordsize);
   }
-  size_t getSize() const override { return Config->Wordsize; }
+  size_t getSize() const override { return config->wordsize; }
 
-  void writeTo(uint8_t *Buf) const override {
-    if (Config->is64()) {
-      write64le(Buf + OutputSectionOff, Thunk->getRVA() + Config->ImageBase);
+  void writeTo(uint8_t *buf) const override {
+    if (config->is64()) {
+      write64le(buf, thunk->getRVA() + config->imageBase);
     } else {
-      uint32_t Bit = 0;
+      uint32_t bit = 0;
       // Pointer to thumb code must have the LSB set, so adjust it.
-      if (Config->Machine == ARMNT)
-        Bit = 1;
-      write32le(Buf + OutputSectionOff, (Thunk->getRVA() + Config->ImageBase) | Bit);
+      if (config->machine == ARMNT)
+        bit = 1;
+      write32le(buf, (thunk->getRVA() + config->imageBase) | bit);
     }
   }
 
-  void getBaserels(std::vector<Baserel> *Res) override {
-    Res->emplace_back(RVA);
+  void getBaserels(std::vector<Baserel> *res) override {
+    res->emplace_back(rva);
   }
 
-  Chunk *Thunk;
+  Chunk *thunk;
 };
 
 // Export table
 // Read Microsoft PE/COFF spec 5.3 for details.
 
 // A chunk for the export descriptor table.
-class ExportDirectoryChunk : public Chunk {
+class ExportDirectoryChunk : public NonSectionChunk {
 public:
-  ExportDirectoryChunk(int I, int J, Chunk *D, Chunk *A, Chunk *N, Chunk *O)
-      : MaxOrdinal(I), NameTabSize(J), DLLName(D), AddressTab(A), NameTab(N),
-        OrdinalTab(O) {}
+  ExportDirectoryChunk(int i, int j, Chunk *d, Chunk *a, Chunk *n, Chunk *o)
+      : maxOrdinal(i), nameTabSize(j), dllName(d), addressTab(a), nameTab(n),
+        ordinalTab(o) {}
 
   size_t getSize() const override {
     return sizeof(export_directory_table_entry);
   }
 
-  void writeTo(uint8_t *Buf) const override {
-    memset(Buf + OutputSectionOff, 0, getSize());
+  void writeTo(uint8_t *buf) const override {
+    memset(buf, 0, getSize());
 
-    auto *E = (export_directory_table_entry *)(Buf + OutputSectionOff);
-    E->NameRVA = DLLName->getRVA();
-    E->OrdinalBase = 0;
-    E->AddressTableEntries = MaxOrdinal + 1;
-    E->NumberOfNamePointers = NameTabSize;
-    E->ExportAddressTableRVA = AddressTab->getRVA();
-    E->NamePointerRVA = NameTab->getRVA();
-    E->OrdinalTableRVA = OrdinalTab->getRVA();
+    auto *e = (export_directory_table_entry *)(buf);
+    e->NameRVA = dllName->getRVA();
+    e->OrdinalBase = 0;
+    e->AddressTableEntries = maxOrdinal + 1;
+    e->NumberOfNamePointers = nameTabSize;
+    e->ExportAddressTableRVA = addressTab->getRVA();
+    e->NamePointerRVA = nameTab->getRVA();
+    e->OrdinalTableRVA = ordinalTab->getRVA();
   }
 
-  uint16_t MaxOrdinal;
-  uint16_t NameTabSize;
-  Chunk *DLLName;
-  Chunk *AddressTab;
-  Chunk *NameTab;
-  Chunk *OrdinalTab;
+  uint16_t maxOrdinal;
+  uint16_t nameTabSize;
+  Chunk *dllName;
+  Chunk *addressTab;
+  Chunk *nameTab;
+  Chunk *ordinalTab;
 };
 
-class AddressTableChunk : public Chunk {
+class AddressTableChunk : public NonSectionChunk {
 public:
-  explicit AddressTableChunk(size_t MaxOrdinal) : Size(MaxOrdinal + 1) {}
-  size_t getSize() const override { return Size * 4; }
+  explicit AddressTableChunk(size_t maxOrdinal) : size(maxOrdinal + 1) {}
+  size_t getSize() const override { return size * 4; }
 
-  void writeTo(uint8_t *Buf) const override {
-    memset(Buf + OutputSectionOff, 0, getSize());
+  void writeTo(uint8_t *buf) const override {
+    memset(buf, 0, getSize());
 
-    for (const Export &E : Config->Exports) {
-      uint8_t *P = Buf + OutputSectionOff + E.Ordinal * 4;
-      uint32_t Bit = 0;
+    for (const Export &e : config->exports) {
+      uint8_t *p = buf + e.ordinal * 4;
+      uint32_t bit = 0;
       // Pointer to thumb code must have the LSB set, so adjust it.
-      if (Config->Machine == ARMNT && !E.Data)
-        Bit = 1;
-      if (E.ForwardChunk) {
-        write32le(P, E.ForwardChunk->getRVA() | Bit);
+      if (config->machine == ARMNT && !e.data)
+        bit = 1;
+      if (e.forwardChunk) {
+        write32le(p, e.forwardChunk->getRVA() | bit);
       } else {
-        write32le(P, cast<Defined>(E.Sym)->getRVA() | Bit);
+        write32le(p, cast<Defined>(e.sym)->getRVA() | bit);
       }
     }
   }
 
 private:
-  size_t Size;
+  size_t size;
 };
 
-class NamePointersChunk : public Chunk {
+class NamePointersChunk : public NonSectionChunk {
 public:
-  explicit NamePointersChunk(std::vector<Chunk *> &V) : Chunks(V) {}
-  size_t getSize() const override { return Chunks.size() * 4; }
+  explicit NamePointersChunk(std::vector<Chunk *> &v) : chunks(v) {}
+  size_t getSize() const override { return chunks.size() * 4; }
 
-  void writeTo(uint8_t *Buf) const override {
-    uint8_t *P = Buf + OutputSectionOff;
-    for (Chunk *C : Chunks) {
-      write32le(P, C->getRVA());
-      P += 4;
+  void writeTo(uint8_t *buf) const override {
+    for (Chunk *c : chunks) {
+      write32le(buf, c->getRVA());
+      buf += 4;
     }
   }
 
 private:
-  std::vector<Chunk *> Chunks;
+  std::vector<Chunk *> chunks;
 };
 
-class ExportOrdinalChunk : public Chunk {
+class ExportOrdinalChunk : public NonSectionChunk {
 public:
-  explicit ExportOrdinalChunk(size_t I) : Size(I) {}
-  size_t getSize() const override { return Size * 2; }
+  explicit ExportOrdinalChunk(size_t i) : size(i) {}
+  size_t getSize() const override { return size * 2; }
 
-  void writeTo(uint8_t *Buf) const override {
-    uint8_t *P = Buf + OutputSectionOff;
-    for (Export &E : Config->Exports) {
-      if (E.Noname)
+  void writeTo(uint8_t *buf) const override {
+    for (Export &e : config->exports) {
+      if (e.noname)
         continue;
-      write16le(P, E.Ordinal);
-      P += 2;
+      write16le(buf, e.ordinal);
+      buf += 2;
     }
   }
 
 private:
-  size_t Size;
+  size_t size;
 };
 
 } // anonymous namespace
 
 void IdataContents::create() {
-  std::vector<std::vector<DefinedImportData *>> V = binImports(Imports);
+  std::vector<std::vector<DefinedImportData *>> v = binImports(imports);
 
   // Create .idata contents for each DLL.
-  for (std::vector<DefinedImportData *> &Syms : V) {
+  for (std::vector<DefinedImportData *> &syms : v) {
     // Create lookup and address tables. If they have external names,
-    // we need to create HintName chunks to store the names.
+    // we need to create hintName chunks to store the names.
     // If they don't (if they are import-by-ordinals), we store only
     // ordinal values to the table.
-    size_t Base = Lookups.size();
-    for (DefinedImportData *S : Syms) {
-      uint16_t Ord = S->getOrdinal();
-      if (S->getExternalName().empty()) {
-        Lookups.push_back(make<OrdinalOnlyChunk>(Ord));
-        Addresses.push_back(make<OrdinalOnlyChunk>(Ord));
+    size_t base = lookups.size();
+    for (DefinedImportData *s : syms) {
+      uint16_t ord = s->getOrdinal();
+      if (s->getExternalName().empty()) {
+        lookups.push_back(make<OrdinalOnlyChunk>(ord));
+        addresses.push_back(make<OrdinalOnlyChunk>(ord));
         continue;
       }
-      auto *C = make<HintNameChunk>(S->getExternalName(), Ord);
-      Lookups.push_back(make<LookupChunk>(C));
-      Addresses.push_back(make<LookupChunk>(C));
-      Hints.push_back(C);
+      auto *c = make<HintNameChunk>(s->getExternalName(), ord);
+      lookups.push_back(make<LookupChunk>(c));
+      addresses.push_back(make<LookupChunk>(c));
+      hints.push_back(c);
     }
     // Terminate with null values.
-    Lookups.push_back(make<NullChunk>(Config->Wordsize));
-    Addresses.push_back(make<NullChunk>(Config->Wordsize));
+    lookups.push_back(make<NullChunk>(config->wordsize));
+    addresses.push_back(make<NullChunk>(config->wordsize));
 
-    for (int I = 0, E = Syms.size(); I < E; ++I)
-      Syms[I]->setLocation(Addresses[Base + I]);
+    for (int i = 0, e = syms.size(); i < e; ++i)
+      syms[i]->setLocation(addresses[base + i]);
 
     // Create the import table header.
-    DLLNames.push_back(make<StringChunk>(Syms[0]->getDLLName()));
-    auto *Dir = make<ImportDirectoryChunk>(DLLNames.back());
-    Dir->LookupTab = Lookups[Base];
-    Dir->AddressTab = Addresses[Base];
-    Dirs.push_back(Dir);
+    dllNames.push_back(make<StringChunk>(syms[0]->getDLLName()));
+    auto *dir = make<ImportDirectoryChunk>(dllNames.back());
+    dir->lookupTab = lookups[base];
+    dir->addressTab = addresses[base];
+    dirs.push_back(dir);
   }
   // Add null terminator.
-  Dirs.push_back(make<NullChunk>(sizeof(ImportDirectoryTableEntry)));
+  dirs.push_back(make<NullChunk>(sizeof(ImportDirectoryTableEntry)));
 }
 
 std::vector<Chunk *> DelayLoadContents::getChunks() {
-  std::vector<Chunk *> V;
-  V.insert(V.end(), Dirs.begin(), Dirs.end());
-  V.insert(V.end(), Names.begin(), Names.end());
-  V.insert(V.end(), HintNames.begin(), HintNames.end());
-  V.insert(V.end(), DLLNames.begin(), DLLNames.end());
-  return V;
+  std::vector<Chunk *> v;
+  v.insert(v.end(), dirs.begin(), dirs.end());
+  v.insert(v.end(), names.begin(), names.end());
+  v.insert(v.end(), hintNames.begin(), hintNames.end());
+  v.insert(v.end(), dllNames.begin(), dllNames.end());
+  return v;
 }
 
 std::vector<Chunk *> DelayLoadContents::getDataChunks() {
-  std::vector<Chunk *> V;
-  V.insert(V.end(), ModuleHandles.begin(), ModuleHandles.end());
-  V.insert(V.end(), Addresses.begin(), Addresses.end());
-  return V;
+  std::vector<Chunk *> v;
+  v.insert(v.end(), moduleHandles.begin(), moduleHandles.end());
+  v.insert(v.end(), addresses.begin(), addresses.end());
+  return v;
 }
 
 uint64_t DelayLoadContents::getDirSize() {
-  return Dirs.size() * sizeof(delay_import_directory_table_entry);
+  return dirs.size() * sizeof(delay_import_directory_table_entry);
 }
 
-void DelayLoadContents::create(Defined *H) {
-  Helper = H;
-  std::vector<std::vector<DefinedImportData *>> V = binImports(Imports);
+void DelayLoadContents::create(Defined *h) {
+  helper = h;
+  std::vector<std::vector<DefinedImportData *>> v = binImports(imports);
 
   // Create .didat contents for each DLL.
-  for (std::vector<DefinedImportData *> &Syms : V) {
+  for (std::vector<DefinedImportData *> &syms : v) {
     // Create the delay import table header.
-    DLLNames.push_back(make<StringChunk>(Syms[0]->getDLLName()));
-    auto *Dir = make<DelayDirectoryChunk>(DLLNames.back());
+    dllNames.push_back(make<StringChunk>(syms[0]->getDLLName()));
+    auto *dir = make<DelayDirectoryChunk>(dllNames.back());
 
-    size_t Base = Addresses.size();
-    for (DefinedImportData *S : Syms) {
-      Chunk *T = newThunkChunk(S, Dir);
-      auto *A = make<DelayAddressChunk>(T);
-      Addresses.push_back(A);
-      Thunks.push_back(T);
-      StringRef ExtName = S->getExternalName();
-      if (ExtName.empty()) {
-        Names.push_back(make<OrdinalOnlyChunk>(S->getOrdinal()));
+    size_t base = addresses.size();
+    Chunk *tm = newTailMergeChunk(dir);
+    for (DefinedImportData *s : syms) {
+      Chunk *t = newThunkChunk(s, tm);
+      auto *a = make<DelayAddressChunk>(t);
+      addresses.push_back(a);
+      thunks.push_back(t);
+      StringRef extName = s->getExternalName();
+      if (extName.empty()) {
+        names.push_back(make<OrdinalOnlyChunk>(s->getOrdinal()));
       } else {
-        auto *C = make<HintNameChunk>(ExtName, 0);
-        Names.push_back(make<LookupChunk>(C));
-        HintNames.push_back(C);
+        auto *c = make<HintNameChunk>(extName, 0);
+        names.push_back(make<LookupChunk>(c));
+        hintNames.push_back(c);
       }
     }
+    thunks.push_back(tm);
     // Terminate with null values.
-    Addresses.push_back(make<NullChunk>(8));
-    Names.push_back(make<NullChunk>(8));
+    addresses.push_back(make<NullChunk>(8));
+    names.push_back(make<NullChunk>(8));
 
-    for (int I = 0, E = Syms.size(); I < E; ++I)
-      Syms[I]->setLocation(Addresses[Base + I]);
-    auto *MH = make<NullChunk>(8);
-    MH->Alignment = 8;
-    ModuleHandles.push_back(MH);
+    for (int i = 0, e = syms.size(); i < e; ++i)
+      syms[i]->setLocation(addresses[base + i]);
+    auto *mh = make<NullChunk>(8);
+    mh->setAlignment(8);
+    moduleHandles.push_back(mh);
 
     // Fill the delay import table header fields.
-    Dir->ModuleHandle = MH;
-    Dir->AddressTab = Addresses[Base];
-    Dir->NameTab = Names[Base];
-    Dirs.push_back(Dir);
+    dir->moduleHandle = mh;
+    dir->addressTab = addresses[base];
+    dir->nameTab = names[base];
+    dirs.push_back(dir);
   }
   // Add null terminator.
-  Dirs.push_back(make<NullChunk>(sizeof(delay_import_directory_table_entry)));
+  dirs.push_back(make<NullChunk>(sizeof(delay_import_directory_table_entry)));
 }
 
-Chunk *DelayLoadContents::newThunkChunk(DefinedImportData *S, Chunk *Dir) {
-  switch (Config->Machine) {
+Chunk *DelayLoadContents::newTailMergeChunk(Chunk *dir) {
+  switch (config->machine) {
   case AMD64:
-    return make<ThunkChunkX64>(S, Dir, Helper);
+    return make<TailMergeChunkX64>(dir, helper);
   case I386:
-    return make<ThunkChunkX86>(S, Dir, Helper);
+    return make<TailMergeChunkX86>(dir, helper);
   case ARMNT:
-    return make<ThunkChunkARM>(S, Dir, Helper);
+    return make<TailMergeChunkARM>(dir, helper);
   case ARM64:
-    return make<ThunkChunkARM64>(S, Dir, Helper);
+    return make<TailMergeChunkARM64>(dir, helper);
+  default:
+    llvm_unreachable("unsupported machine type");
+  }
+}
+
+Chunk *DelayLoadContents::newThunkChunk(DefinedImportData *s,
+                                        Chunk *tailMerge) {
+  switch (config->machine) {
+  case AMD64:
+    return make<ThunkChunkX64>(s, tailMerge);
+  case I386:
+    return make<ThunkChunkX86>(s, tailMerge);
+  case ARMNT:
+    return make<ThunkChunkARM>(s, tailMerge);
+  case ARM64:
+    return make<ThunkChunkARM64>(s, tailMerge);
   default:
     llvm_unreachable("unsupported machine type");
   }
 }
 
 EdataContents::EdataContents() {
-  uint16_t MaxOrdinal = 0;
-  for (Export &E : Config->Exports)
-    MaxOrdinal = std::max(MaxOrdinal, E.Ordinal);
+  uint16_t maxOrdinal = 0;
+  for (Export &e : config->exports)
+    maxOrdinal = std::max(maxOrdinal, e.ordinal);
 
-  auto *DLLName = make<StringChunk>(sys::path::filename(Config->OutputFile));
-  auto *AddressTab = make<AddressTableChunk>(MaxOrdinal);
-  std::vector<Chunk *> Names;
-  for (Export &E : Config->Exports)
-    if (!E.Noname)
-      Names.push_back(make<StringChunk>(E.ExportName));
+  auto *dllName = make<StringChunk>(sys::path::filename(config->outputFile));
+  auto *addressTab = make<AddressTableChunk>(maxOrdinal);
+  std::vector<Chunk *> names;
+  for (Export &e : config->exports)
+    if (!e.noname)
+      names.push_back(make<StringChunk>(e.exportName));
 
-  std::vector<Chunk *> Forwards;
-  for (Export &E : Config->Exports) {
-    if (E.ForwardTo.empty())
+  std::vector<Chunk *> forwards;
+  for (Export &e : config->exports) {
+    if (e.forwardTo.empty())
       continue;
-    E.ForwardChunk = make<StringChunk>(E.ForwardTo);
-    Forwards.push_back(E.ForwardChunk);
+    e.forwardChunk = make<StringChunk>(e.forwardTo);
+    forwards.push_back(e.forwardChunk);
   }
 
-  auto *NameTab = make<NamePointersChunk>(Names);
-  auto *OrdinalTab = make<ExportOrdinalChunk>(Names.size());
-  auto *Dir = make<ExportDirectoryChunk>(MaxOrdinal, Names.size(), DLLName,
-                                         AddressTab, NameTab, OrdinalTab);
-  Chunks.push_back(Dir);
-  Chunks.push_back(DLLName);
-  Chunks.push_back(AddressTab);
-  Chunks.push_back(NameTab);
-  Chunks.push_back(OrdinalTab);
-  Chunks.insert(Chunks.end(), Names.begin(), Names.end());
-  Chunks.insert(Chunks.end(), Forwards.begin(), Forwards.end());
+  auto *nameTab = make<NamePointersChunk>(names);
+  auto *ordinalTab = make<ExportOrdinalChunk>(names.size());
+  auto *dir = make<ExportDirectoryChunk>(maxOrdinal, names.size(), dllName,
+                                         addressTab, nameTab, ordinalTab);
+  chunks.push_back(dir);
+  chunks.push_back(dllName);
+  chunks.push_back(addressTab);
+  chunks.push_back(nameTab);
+  chunks.push_back(ordinalTab);
+  chunks.insert(chunks.end(), names.begin(), names.end());
+  chunks.insert(chunks.end(), forwards.begin(), forwards.end());
 }
 
 } // namespace coff
diff --git a/deps/lld/COFF/DLL.h b/deps/lld/COFF/DLL.h
index a298271e2c0da600ce602411b269ef8b6cd6ab80..ce0ee01c4a3dfec2c871faf89b2725707ac4fbca 100644
--- a/deps/lld/COFF/DLL.h
+++ b/deps/lld/COFF/DLL.h
@@ -1,9 +1,8 @@
 //===- DLL.h ----------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -22,45 +21,46 @@ namespace coff {
 // call create() to populate the chunk vectors.
 class IdataContents {
 public:
-  void add(DefinedImportData *Sym) { Imports.push_back(Sym); }
-  bool empty() { return Imports.empty(); }
+  void add(DefinedImportData *sym) { imports.push_back(sym); }
+  bool empty() { return imports.empty(); }
 
   void create();
 
-  std::vector<DefinedImportData *> Imports;
-  std::vector<Chunk *> Dirs;
-  std::vector<Chunk *> Lookups;
-  std::vector<Chunk *> Addresses;
-  std::vector<Chunk *> Hints;
-  std::vector<Chunk *> DLLNames;
+  std::vector<DefinedImportData *> imports;
+  std::vector<Chunk *> dirs;
+  std::vector<Chunk *> lookups;
+  std::vector<Chunk *> addresses;
+  std::vector<Chunk *> hints;
+  std::vector<Chunk *> dllNames;
 };
 
 // Windows-specific.
 // DelayLoadContents creates all chunks for the delay-load DLL import table.
 class DelayLoadContents {
 public:
-  void add(DefinedImportData *Sym) { Imports.push_back(Sym); }
-  bool empty() { return Imports.empty(); }
-  void create(Defined *Helper);
+  void add(DefinedImportData *sym) { imports.push_back(sym); }
+  bool empty() { return imports.empty(); }
+  void create(Defined *helper);
   std::vector<Chunk *> getChunks();
   std::vector<Chunk *> getDataChunks();
-  ArrayRef<Chunk *> getCodeChunks() { return Thunks; }
+  ArrayRef<Chunk *> getCodeChunks() { return thunks; }
 
-  uint64_t getDirRVA() { return Dirs[0]->getRVA(); }
+  uint64_t getDirRVA() { return dirs[0]->getRVA(); }
   uint64_t getDirSize();
 
 private:
-  Chunk *newThunkChunk(DefinedImportData *S, Chunk *Dir);
+  Chunk *newThunkChunk(DefinedImportData *s, Chunk *tailMerge);
+  Chunk *newTailMergeChunk(Chunk *dir);
 
-  Defined *Helper;
-  std::vector<DefinedImportData *> Imports;
-  std::vector<Chunk *> Dirs;
-  std::vector<Chunk *> ModuleHandles;
-  std::vector<Chunk *> Addresses;
-  std::vector<Chunk *> Names;
-  std::vector<Chunk *> HintNames;
-  std::vector<Chunk *> Thunks;
-  std::vector<Chunk *> DLLNames;
+  Defined *helper;
+  std::vector<DefinedImportData *> imports;
+  std::vector<Chunk *> dirs;
+  std::vector<Chunk *> moduleHandles;
+  std::vector<Chunk *> addresses;
+  std::vector<Chunk *> names;
+  std::vector<Chunk *> hintNames;
+  std::vector<Chunk *> thunks;
+  std::vector<Chunk *> dllNames;
 };
 
 // Windows-specific.
@@ -68,11 +68,11 @@ private:
 class EdataContents {
 public:
   EdataContents();
-  std::vector<Chunk *> Chunks;
+  std::vector<Chunk *> chunks;
 
-  uint64_t getRVA() { return Chunks[0]->getRVA(); }
+  uint64_t getRVA() { return chunks[0]->getRVA(); }
   uint64_t getSize() {
-    return Chunks.back()->getRVA() + Chunks.back()->getSize() - getRVA();
+    return chunks.back()->getRVA() + chunks.back()->getSize() - getRVA();
   }
 };
 
diff --git a/deps/lld/COFF/DebugTypes.cpp b/deps/lld/COFF/DebugTypes.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..78c1c78b408d15ec0758f95d21749b98c816726d
--- /dev/null
+++ b/deps/lld/COFF/DebugTypes.cpp
@@ -0,0 +1,268 @@
+//===- DebugTypes.cpp -----------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "DebugTypes.h"
+#include "Driver.h"
+#include "InputFiles.h"
+#include "lld/Common/ErrorHandler.h"
+#include "llvm/DebugInfo/CodeView/TypeRecord.h"
+#include "llvm/DebugInfo/PDB/GenericError.h"
+#include "llvm/DebugInfo/PDB/Native/InfoStream.h"
+#include "llvm/DebugInfo/PDB/Native/NativeSession.h"
+#include "llvm/DebugInfo/PDB/Native/PDBFile.h"
+#include "llvm/Support/Path.h"
+
+using namespace lld;
+using namespace lld::coff;
+using namespace llvm;
+using namespace llvm::codeview;
+
+namespace {
+// The TypeServerSource class represents a PDB type server, a file referenced by
+// OBJ files compiled with MSVC /Zi. A single PDB can be shared by several OBJ
+// files, therefore there must be only once instance per OBJ lot. The file path
+// is discovered from the dependent OBJ's debug type stream. The
+// TypeServerSource object is then queued and loaded by the COFF Driver. The
+// debug type stream for such PDB files will be merged first in the final PDB,
+// before any dependent OBJ.
+class TypeServerSource : public TpiSource {
+public:
+  explicit TypeServerSource(MemoryBufferRef m, llvm::pdb::NativeSession *s)
+      : TpiSource(PDB, nullptr), session(s), mb(m) {}
+
+  // Queue a PDB type server for loading in the COFF Driver
+  static void enqueue(const ObjFile *dependentFile,
+                      const TypeServer2Record &ts);
+
+  // Create an instance
+  static Expected<TypeServerSource *> getInstance(MemoryBufferRef m);
+
+  // Fetch the PDB instance loaded for a corresponding dependent OBJ.
+  static Expected<TypeServerSource *>
+  findFromFile(const ObjFile *dependentFile);
+
+  static std::map<std::string, std::pair<std::string, TypeServerSource *>>
+      instances;
+
+  // The interface to the PDB (if it was opened successfully)
+  std::unique_ptr<llvm::pdb::NativeSession> session;
+
+private:
+  MemoryBufferRef mb;
+};
+
+// This class represents the debug type stream of an OBJ file that depends on a
+// PDB type server (see TypeServerSource).
+class UseTypeServerSource : public TpiSource {
+public:
+  UseTypeServerSource(const ObjFile *f, const TypeServer2Record *ts)
+      : TpiSource(UsingPDB, f), typeServerDependency(*ts) {}
+
+  // Information about the PDB type server dependency, that needs to be loaded
+  // in before merging this OBJ.
+  TypeServer2Record typeServerDependency;
+};
+
+// This class represents the debug type stream of a Microsoft precompiled
+// headers OBJ (PCH OBJ). This OBJ kind needs to be merged first in the output
+// PDB, before any other OBJs that depend on this. Note that only MSVC generate
+// such files, clang does not.
+class PrecompSource : public TpiSource {
+public:
+  PrecompSource(const ObjFile *f) : TpiSource(PCH, f) {}
+};
+
+// This class represents the debug type stream of an OBJ file that depends on a
+// Microsoft precompiled headers OBJ (see PrecompSource).
+class UsePrecompSource : public TpiSource {
+public:
+  UsePrecompSource(const ObjFile *f, const PrecompRecord *precomp)
+      : TpiSource(UsingPCH, f), precompDependency(*precomp) {}
+
+  // Information about the Precomp OBJ dependency, that needs to be loaded in
+  // before merging this OBJ.
+  PrecompRecord precompDependency;
+};
+} // namespace
+
+static std::vector<std::unique_ptr<TpiSource>> GC;
+
+TpiSource::TpiSource(TpiKind k, const ObjFile *f) : kind(k), file(f) {
+  GC.push_back(std::unique_ptr<TpiSource>(this));
+}
+
+TpiSource *lld::coff::makeTpiSource(const ObjFile *f) {
+  return new TpiSource(TpiSource::Regular, f);
+}
+
+TpiSource *lld::coff::makeUseTypeServerSource(const ObjFile *f,
+                                              const TypeServer2Record *ts) {
+  TypeServerSource::enqueue(f, *ts);
+  return new UseTypeServerSource(f, ts);
+}
+
+TpiSource *lld::coff::makePrecompSource(const ObjFile *f) {
+  return new PrecompSource(f);
+}
+
+TpiSource *lld::coff::makeUsePrecompSource(const ObjFile *f,
+                                           const PrecompRecord *precomp) {
+  return new UsePrecompSource(f, precomp);
+}
+
+namespace lld {
+namespace coff {
+template <>
+const PrecompRecord &retrieveDependencyInfo(const TpiSource *source) {
+  assert(source->kind == TpiSource::UsingPCH);
+  return ((const UsePrecompSource *)source)->precompDependency;
+}
+
+template <>
+const TypeServer2Record &retrieveDependencyInfo(const TpiSource *source) {
+  assert(source->kind == TpiSource::UsingPDB);
+  return ((const UseTypeServerSource *)source)->typeServerDependency;
+}
+} // namespace coff
+} // namespace lld
+
+std::map<std::string, std::pair<std::string, TypeServerSource *>>
+    TypeServerSource::instances;
+
+// Make a PDB path assuming the PDB is in the same folder as the OBJ
+static std::string getPdbBaseName(const ObjFile *file, StringRef tSPath) {
+  StringRef localPath =
+      !file->parentName.empty() ? file->parentName : file->getName();
+  SmallString<128> path = sys::path::parent_path(localPath);
+
+  // Currently, type server PDBs are only created by MSVC cl, which only runs
+  // on Windows, so we can assume type server paths are Windows style.
+  sys::path::append(path, sys::path::filename(tSPath, sys::path::Style::windows));
+  return path.str();
+}
+
+// The casing of the PDB path stamped in the OBJ can differ from the actual path
+// on disk. With this, we ensure to always use lowercase as a key for the
+// PDBInputFile::Instances map, at least on Windows.
+static std::string normalizePdbPath(StringRef path) {
+#if defined(_WIN32)
+  return path.lower();
+#else // LINUX
+  return path;
+#endif
+}
+
+// If existing, return the actual PDB path on disk.
+static Optional<std::string> findPdbPath(StringRef pdbPath,
+                                         const ObjFile *dependentFile) {
+  // Ensure the file exists before anything else. In some cases, if the path
+  // points to a removable device, Driver::enqueuePath() would fail with an
+  // error (EAGAIN, "resource unavailable try again") which we want to skip
+  // silently.
+  if (llvm::sys::fs::exists(pdbPath))
+    return normalizePdbPath(pdbPath);
+  std::string ret = getPdbBaseName(dependentFile, pdbPath);
+  if (llvm::sys::fs::exists(ret))
+    return normalizePdbPath(ret);
+  return None;
+}
+
+// Fetch the PDB instance that was already loaded by the COFF Driver.
+Expected<TypeServerSource *>
+TypeServerSource::findFromFile(const ObjFile *dependentFile) {
+  const TypeServer2Record &ts =
+      retrieveDependencyInfo<TypeServer2Record>(dependentFile->debugTypesObj);
+
+  Optional<std::string> p = findPdbPath(ts.Name, dependentFile);
+  if (!p)
+    return createFileError(ts.Name, errorCodeToError(std::error_code(
+                                        ENOENT, std::generic_category())));
+
+  auto it = TypeServerSource::instances.find(*p);
+  // The PDB file exists on disk, at this point we expect it to have been
+  // inserted in the map by TypeServerSource::loadPDB()
+  assert(it != TypeServerSource::instances.end());
+
+  std::pair<std::string, TypeServerSource *> &pdb = it->second;
+
+  if (!pdb.second)
+    return createFileError(
+        *p, createStringError(inconvertibleErrorCode(), pdb.first.c_str()));
+
+  pdb::PDBFile &pdbFile = (pdb.second)->session->getPDBFile();
+  pdb::InfoStream &info = cantFail(pdbFile.getPDBInfoStream());
+
+  // Just because a file with a matching name was found doesn't mean it can be
+  // used. The GUID must match between the PDB header and the OBJ
+  // TypeServer2 record. The 'Age' is used by MSVC incremental compilation.
+  if (info.getGuid() != ts.getGuid())
+    return createFileError(
+        ts.Name,
+        make_error<pdb::PDBError>(pdb::pdb_error_code::signature_out_of_date));
+
+  return pdb.second;
+}
+
+// FIXME: Temporary interface until PDBLinker::maybeMergeTypeServerPDB() is
+// moved here.
+Expected<llvm::pdb::NativeSession *>
+lld::coff::findTypeServerSource(const ObjFile *f) {
+  Expected<TypeServerSource *> ts = TypeServerSource::findFromFile(f);
+  if (!ts)
+    return ts.takeError();
+  return ts.get()->session.get();
+}
+
+// Queue a PDB type server for loading in the COFF Driver
+void TypeServerSource::enqueue(const ObjFile *dependentFile,
+                               const TypeServer2Record &ts) {
+  // Start by finding where the PDB is located (either the record path or next
+  // to the OBJ file)
+  Optional<std::string> p = findPdbPath(ts.Name, dependentFile);
+  if (!p)
+    return;
+  auto it = TypeServerSource::instances.emplace(
+      *p, std::pair<std::string, TypeServerSource *>{});
+  if (!it.second)
+    return; // another OBJ already scheduled this PDB for load
+
+  driver->enqueuePath(*p, false);
+}
+
+// Create an instance of TypeServerSource or an error string if the PDB couldn't
+// be loaded. The error message will be displayed later, when the referring OBJ
+// will be merged in. NOTE - a PDB load failure is not a link error: some
+// debug info will simply be missing from the final PDB - that is the default
+// accepted behavior.
+void lld::coff::loadTypeServerSource(llvm::MemoryBufferRef m) {
+  std::string path = normalizePdbPath(m.getBufferIdentifier());
+
+  Expected<TypeServerSource *> ts = TypeServerSource::getInstance(m);
+  if (!ts)
+    TypeServerSource::instances[path] = {toString(ts.takeError()), nullptr};
+  else
+    TypeServerSource::instances[path] = {{}, *ts};
+}
+
+Expected<TypeServerSource *> TypeServerSource::getInstance(MemoryBufferRef m) {
+  std::unique_ptr<llvm::pdb::IPDBSession> iSession;
+  Error err = pdb::NativeSession::createFromPdb(
+      MemoryBuffer::getMemBuffer(m, false), iSession);
+  if (err)
+    return std::move(err);
+
+  std::unique_ptr<llvm::pdb::NativeSession> session(
+      static_cast<pdb::NativeSession *>(iSession.release()));
+
+  pdb::PDBFile &pdbFile = session->getPDBFile();
+  Expected<pdb::InfoStream &> info = pdbFile.getPDBInfoStream();
+  // All PDB Files should have an Info stream.
+  if (!info)
+    return info.takeError();
+  return new TypeServerSource(m, session.release());
+}
diff --git a/deps/lld/COFF/DebugTypes.h b/deps/lld/COFF/DebugTypes.h
new file mode 100644
index 0000000000000000000000000000000000000000..e37c727232d00207aef4fdf37c1ab1ea468daf1f
--- /dev/null
+++ b/deps/lld/COFF/DebugTypes.h
@@ -0,0 +1,60 @@
+//===- DebugTypes.h ---------------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLD_COFF_DEBUGTYPES_H
+#define LLD_COFF_DEBUGTYPES_H
+
+#include "llvm/Support/Error.h"
+#include "llvm/Support/MemoryBuffer.h"
+
+namespace llvm {
+namespace codeview {
+class PrecompRecord;
+class TypeServer2Record;
+} // namespace codeview
+namespace pdb {
+class NativeSession;
+}
+} // namespace llvm
+
+namespace lld {
+namespace coff {
+
+class ObjFile;
+
+class TpiSource {
+public:
+  enum TpiKind { Regular, PCH, UsingPCH, PDB, UsingPDB };
+
+  TpiSource(TpiKind k, const ObjFile *f);
+  virtual ~TpiSource() {}
+
+  const TpiKind kind;
+  const ObjFile *file;
+};
+
+TpiSource *makeTpiSource(const ObjFile *f);
+TpiSource *makeUseTypeServerSource(const ObjFile *f,
+                                   const llvm::codeview::TypeServer2Record *ts);
+TpiSource *makePrecompSource(const ObjFile *f);
+TpiSource *makeUsePrecompSource(const ObjFile *f,
+                                const llvm::codeview::PrecompRecord *precomp);
+
+void loadTypeServerSource(llvm::MemoryBufferRef m);
+
+// Temporary interface to get the dependency
+template <typename T> const T &retrieveDependencyInfo(const TpiSource *source);
+
+// Temporary interface until we move PDBLinker::maybeMergeTypeServerPDB here
+llvm::Expected<llvm::pdb::NativeSession *>
+findTypeServerSource(const ObjFile *f);
+
+} // namespace coff
+} // namespace lld
+
+#endif
\ No newline at end of file
diff --git a/deps/lld/COFF/Driver.cpp b/deps/lld/COFF/Driver.cpp
index 2e4b1e6d3147102312b8403ab08cedce4838bdad..d7af50b9318fc48b218db4c619a9db3c665f07d2 100644
--- a/deps/lld/COFF/Driver.cpp
+++ b/deps/lld/COFF/Driver.cpp
@@ -1,14 +1,14 @@
 //===- Driver.cpp ---------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "Driver.h"
 #include "Config.h"
+#include "DebugTypes.h"
 #include "ICF.h"
 #include "InputFiles.h"
 #include "MarkLive.h"
@@ -19,7 +19,9 @@
 #include "lld/Common/Args.h"
 #include "lld/Common/Driver.h"
 #include "lld/Common/ErrorHandler.h"
+#include "lld/Common/Filesystem.h"
 #include "lld/Common/Memory.h"
+#include "lld/Common/Threads.h"
 #include "lld/Common/Timer.h"
 #include "lld/Common/Version.h"
 #include "llvm/ADT/Optional.h"
@@ -28,6 +30,7 @@
 #include "llvm/Object/ArchiveWriter.h"
 #include "llvm/Object/COFFImportFile.h"
 #include "llvm/Object/COFFModuleDefinition.h"
+#include "llvm/Object/WindowsMachineFlag.h"
 #include "llvm/Option/Arg.h"
 #include "llvm/Option/ArgList.h"
 #include "llvm/Option/Option.h"
@@ -51,43 +54,68 @@ using llvm::sys::Process;
 namespace lld {
 namespace coff {
 
-static Timer InputFileTimer("Input File Reading", Timer::root());
+static Timer inputFileTimer("Input File Reading", Timer::root());
 
-Configuration *Config;
-LinkerDriver *Driver;
+Configuration *config;
+LinkerDriver *driver;
 
-bool link(ArrayRef<const char *> Args, bool CanExitEarly, raw_ostream &Diag) {
-  errorHandler().LogName = args::getFilenameWithoutExe(Args[0]);
-  errorHandler().ErrorOS = &Diag;
-  errorHandler().ColorDiagnostics = Diag.has_colors();
-  errorHandler().ErrorLimitExceededMsg =
+bool link(ArrayRef<const char *> args, bool canExitEarly, raw_ostream &diag) {
+  errorHandler().logName = args::getFilenameWithoutExe(args[0]);
+  errorHandler().errorOS = &diag;
+  errorHandler().colorDiagnostics = diag.has_colors();
+  errorHandler().errorLimitExceededMsg =
       "too many errors emitted, stopping now"
       " (use /errorlimit:0 to see all errors)";
-  errorHandler().ExitEarly = CanExitEarly;
-  Config = make<Configuration>();
+  errorHandler().exitEarly = canExitEarly;
+  config = make<Configuration>();
 
-  Symtab = make<SymbolTable>();
+  symtab = make<SymbolTable>();
 
-  Driver = make<LinkerDriver>();
-  Driver->link(Args);
+  driver = make<LinkerDriver>();
+  driver->link(args);
 
   // Call exit() if we can to avoid calling destructors.
-  if (CanExitEarly)
+  if (canExitEarly)
     exitLld(errorCount() ? 1 : 0);
 
   freeArena();
-  ObjFile::Instances.clear();
-  ImportFile::Instances.clear();
-  BitcodeFile::Instances.clear();
+  ObjFile::instances.clear();
+  ImportFile::instances.clear();
+  BitcodeFile::instances.clear();
+  memset(MergeChunk::instances, 0, sizeof(MergeChunk::instances));
   return !errorCount();
 }
 
+// Parse options of the form "old;new".
+static std::pair<StringRef, StringRef> getOldNewOptions(opt::InputArgList &args,
+                                                        unsigned id) {
+  auto *arg = args.getLastArg(id);
+  if (!arg)
+    return {"", ""};
+
+  StringRef s = arg->getValue();
+  std::pair<StringRef, StringRef> ret = s.split(';');
+  if (ret.second.empty())
+    error(arg->getSpelling() + " expects 'old;new' format, but got " + s);
+  return ret;
+}
+
 // Drop directory components and replace extension with ".exe" or ".dll".
-static std::string getOutputPath(StringRef Path) {
-  auto P = Path.find_last_of("\\/");
-  StringRef S = (P == StringRef::npos) ? Path : Path.substr(P + 1);
-  const char* E = Config->DLL ? ".dll" : ".exe";
-  return (S.substr(0, S.rfind('.')) + E).str();
+static std::string getOutputPath(StringRef path) {
+  auto p = path.find_last_of("\\/");
+  StringRef s = (p == StringRef::npos) ? path : path.substr(p + 1);
+  const char* e = config->dll ? ".dll" : ".exe";
+  return (s.substr(0, s.rfind('.')) + e).str();
+}
+
+// Returns true if S matches /crtend.?\.o$/.
+static bool isCrtend(StringRef s) {
+  if (!s.endswith(".o"))
+    return false;
+  s = s.drop_back(2);
+  if (s.endswith("crtend"))
+    return true;
+  return !s.empty() && s.drop_back().endswith("crtend");
 }
 
 // ErrorOr is not default constructible, so it cannot be used as the type
@@ -95,347 +123,401 @@ static std::string getOutputPath(StringRef Path) {
 // FIXME: We could open the file in createFutureForFile and avoid needing to
 // return an error here, but for the moment that would cost us a file descriptor
 // (a limited resource on Windows) for the duration that the future is pending.
-typedef std::pair<std::unique_ptr<MemoryBuffer>, std::error_code> MBErrPair;
+using MBErrPair = std::pair<std::unique_ptr<MemoryBuffer>, std::error_code>;
 
 // Create a std::future that opens and maps a file using the best strategy for
 // the host platform.
-static std::future<MBErrPair> createFutureForFile(std::string Path) {
+static std::future<MBErrPair> createFutureForFile(std::string path) {
 #if _WIN32
   // On Windows, file I/O is relatively slow so it is best to do this
   // asynchronously.
-  auto Strategy = std::launch::async;
+  auto strategy = std::launch::async;
 #else
-  auto Strategy = std::launch::deferred;
+  auto strategy = std::launch::deferred;
 #endif
-  return std::async(Strategy, [=]() {
-    auto MBOrErr = MemoryBuffer::getFile(Path,
+  return std::async(strategy, [=]() {
+    auto mbOrErr = MemoryBuffer::getFile(path,
                                          /*FileSize*/ -1,
                                          /*RequiresNullTerminator*/ false);
-    if (!MBOrErr)
-      return MBErrPair{nullptr, MBOrErr.getError()};
-    return MBErrPair{std::move(*MBOrErr), std::error_code()};
+    if (!mbOrErr)
+      return MBErrPair{nullptr, mbOrErr.getError()};
+    return MBErrPair{std::move(*mbOrErr), std::error_code()};
   });
 }
 
 // Symbol names are mangled by prepending "_" on x86.
-static StringRef mangle(StringRef Sym) {
-  assert(Config->Machine != IMAGE_FILE_MACHINE_UNKNOWN);
-  if (Config->Machine == I386)
-    return Saver.save("_" + Sym);
-  return Sym;
+static StringRef mangle(StringRef sym) {
+  assert(config->machine != IMAGE_FILE_MACHINE_UNKNOWN);
+  if (config->machine == I386)
+    return saver.save("_" + sym);
+  return sym;
 }
 
-static bool findUnderscoreMangle(StringRef Sym) {
-  StringRef Entry = Symtab->findMangle(mangle(Sym));
-  return !Entry.empty() && !isa<Undefined>(Symtab->find(Entry));
+static bool findUnderscoreMangle(StringRef sym) {
+  Symbol *s = symtab->findMangle(mangle(sym));
+  return s && !isa<Undefined>(s);
 }
 
-MemoryBufferRef LinkerDriver::takeBuffer(std::unique_ptr<MemoryBuffer> MB) {
-  MemoryBufferRef MBRef = *MB;
-  make<std::unique_ptr<MemoryBuffer>>(std::move(MB)); // take ownership
+MemoryBufferRef LinkerDriver::takeBuffer(std::unique_ptr<MemoryBuffer> mb) {
+  MemoryBufferRef mbref = *mb;
+  make<std::unique_ptr<MemoryBuffer>>(std::move(mb)); // take ownership
 
-  if (Driver->Tar)
-    Driver->Tar->append(relativeToRoot(MBRef.getBufferIdentifier()),
-                        MBRef.getBuffer());
-  return MBRef;
+  if (driver->tar)
+    driver->tar->append(relativeToRoot(mbref.getBufferIdentifier()),
+                        mbref.getBuffer());
+  return mbref;
 }
 
-void LinkerDriver::addBuffer(std::unique_ptr<MemoryBuffer> MB,
-                             bool WholeArchive) {
-  StringRef Filename = MB->getBufferIdentifier();
+void LinkerDriver::addBuffer(std::unique_ptr<MemoryBuffer> mb,
+                             bool wholeArchive) {
+  StringRef filename = mb->getBufferIdentifier();
 
-  MemoryBufferRef MBRef = takeBuffer(std::move(MB));
-  FilePaths.push_back(Filename);
+  MemoryBufferRef mbref = takeBuffer(std::move(mb));
+  filePaths.push_back(filename);
 
   // File type is detected by contents, not by file extension.
-  switch (identify_magic(MBRef.getBuffer())) {
+  switch (identify_magic(mbref.getBuffer())) {
   case file_magic::windows_resource:
-    Resources.push_back(MBRef);
+    resources.push_back(mbref);
     break;
   case file_magic::archive:
-    if (WholeArchive) {
-      std::unique_ptr<Archive> File =
-          CHECK(Archive::create(MBRef), Filename + ": failed to parse archive");
+    if (wholeArchive) {
+      std::unique_ptr<Archive> file =
+          CHECK(Archive::create(mbref), filename + ": failed to parse archive");
 
-      for (MemoryBufferRef M : getArchiveMembers(File.get()))
-        addArchiveBuffer(M, "<whole-archive>", Filename);
+      for (MemoryBufferRef m : getArchiveMembers(file.get()))
+        addArchiveBuffer(m, "<whole-archive>", filename, 0);
       return;
     }
-    Symtab->addFile(make<ArchiveFile>(MBRef));
+    symtab->addFile(make<ArchiveFile>(mbref));
     break;
   case file_magic::bitcode:
-    Symtab->addFile(make<BitcodeFile>(MBRef));
+    symtab->addFile(make<BitcodeFile>(mbref, "", 0));
     break;
   case file_magic::coff_object:
   case file_magic::coff_import_library:
-    Symtab->addFile(make<ObjFile>(MBRef));
+    symtab->addFile(make<ObjFile>(mbref));
+    break;
+  case file_magic::pdb:
+    loadTypeServerSource(mbref);
     break;
   case file_magic::coff_cl_gl_object:
-    error(Filename + ": is not a native COFF file. Recompile without /GL");
+    error(filename + ": is not a native COFF file. Recompile without /GL");
     break;
   case file_magic::pecoff_executable:
-    if (Filename.endswith_lower(".dll")) {
-      error(Filename + ": bad file type. Did you specify a DLL instead of an "
+    if (filename.endswith_lower(".dll")) {
+      error(filename + ": bad file type. Did you specify a DLL instead of an "
                        "import library?");
       break;
     }
     LLVM_FALLTHROUGH;
   default:
-    error(MBRef.getBufferIdentifier() + ": unknown file type");
+    error(mbref.getBufferIdentifier() + ": unknown file type");
     break;
   }
 }
 
-void LinkerDriver::enqueuePath(StringRef Path, bool WholeArchive) {
-  auto Future =
-      std::make_shared<std::future<MBErrPair>>(createFutureForFile(Path));
-  std::string PathStr = Path;
+void LinkerDriver::enqueuePath(StringRef path, bool wholeArchive) {
+  auto future =
+      std::make_shared<std::future<MBErrPair>>(createFutureForFile(path));
+  std::string pathStr = path;
   enqueueTask([=]() {
-    auto MBOrErr = Future->get();
-    if (MBOrErr.second)
-      error("could not open " + PathStr + ": " + MBOrErr.second.message());
-    else
-      Driver->addBuffer(std::move(MBOrErr.first), WholeArchive);
+    auto mbOrErr = future->get();
+    if (mbOrErr.second) {
+      std::string msg =
+          "could not open '" + pathStr + "': " + mbOrErr.second.message();
+      // Check if the filename is a typo for an option flag. OptTable thinks
+      // that all args that are not known options and that start with / are
+      // filenames, but e.g. `/nodefaultlibs` is more likely a typo for
+      // the option `/nodefaultlib` than a reference to a file in the root
+      // directory.
+      std::string nearest;
+      if (COFFOptTable().findNearest(pathStr, nearest) > 1)
+        error(msg);
+      else
+        error(msg + "; did you mean '" + nearest + "'");
+    } else
+      driver->addBuffer(std::move(mbOrErr.first), wholeArchive);
   });
 }
 
-void LinkerDriver::addArchiveBuffer(MemoryBufferRef MB, StringRef SymName,
-                                    StringRef ParentName) {
-  file_magic Magic = identify_magic(MB.getBuffer());
-  if (Magic == file_magic::coff_import_library) {
-    Symtab->addFile(make<ImportFile>(MB));
+void LinkerDriver::addArchiveBuffer(MemoryBufferRef mb, StringRef symName,
+                                    StringRef parentName,
+                                    uint64_t offsetInArchive) {
+  file_magic magic = identify_magic(mb.getBuffer());
+  if (magic == file_magic::coff_import_library) {
+    InputFile *imp = make<ImportFile>(mb);
+    imp->parentName = parentName;
+    symtab->addFile(imp);
     return;
   }
 
-  InputFile *Obj;
-  if (Magic == file_magic::coff_object) {
-    Obj = make<ObjFile>(MB);
-  } else if (Magic == file_magic::bitcode) {
-    Obj = make<BitcodeFile>(MB);
+  InputFile *obj;
+  if (magic == file_magic::coff_object) {
+    obj = make<ObjFile>(mb);
+  } else if (magic == file_magic::bitcode) {
+    obj = make<BitcodeFile>(mb, parentName, offsetInArchive);
   } else {
-    error("unknown file type: " + MB.getBufferIdentifier());
+    error("unknown file type: " + mb.getBufferIdentifier());
     return;
   }
 
-  Obj->ParentName = ParentName;
-  Symtab->addFile(Obj);
-  log("Loaded " + toString(Obj) + " for " + SymName);
+  obj->parentName = parentName;
+  symtab->addFile(obj);
+  log("Loaded " + toString(obj) + " for " + symName);
 }
 
-void LinkerDriver::enqueueArchiveMember(const Archive::Child &C,
-                                        StringRef SymName,
-                                        StringRef ParentName) {
-  if (!C.getParent()->isThin()) {
-    MemoryBufferRef MB = CHECK(
-        C.getMemoryBufferRef(),
-        "could not get the buffer for the member defining symbol " + SymName);
-    enqueueTask([=]() { Driver->addArchiveBuffer(MB, SymName, ParentName); });
+void LinkerDriver::enqueueArchiveMember(const Archive::Child &c,
+                                        StringRef symName,
+                                        StringRef parentName) {
+
+  auto reportBufferError = [=](Error &&e,
+                              StringRef childName) {
+    fatal("could not get the buffer for the member defining symbol " +
+          symName + ": " + parentName + "(" + childName + "): " +
+          toString(std::move(e)));
+  };
+
+  if (!c.getParent()->isThin()) {
+    uint64_t offsetInArchive = c.getChildOffset();
+    Expected<MemoryBufferRef> mbOrErr = c.getMemoryBufferRef();
+    if (!mbOrErr)
+      reportBufferError(mbOrErr.takeError(), check(c.getFullName()));
+    MemoryBufferRef mb = mbOrErr.get();
+    enqueueTask([=]() {
+      driver->addArchiveBuffer(mb, symName, parentName, offsetInArchive);
+    });
     return;
   }
 
-  auto Future = std::make_shared<std::future<MBErrPair>>(createFutureForFile(
-      CHECK(C.getFullName(),
-            "could not get the filename for the member defining symbol " +
-                SymName)));
+  std::string childName = CHECK(
+      c.getFullName(),
+      "could not get the filename for the member defining symbol " +
+      symName);
+  auto future = std::make_shared<std::future<MBErrPair>>(
+      createFutureForFile(childName));
   enqueueTask([=]() {
-    auto MBOrErr = Future->get();
-    if (MBOrErr.second)
-      fatal("could not get the buffer for the member defining " + SymName +
-            ": " + MBOrErr.second.message());
-    Driver->addArchiveBuffer(takeBuffer(std::move(MBOrErr.first)), SymName,
-                             ParentName);
+    auto mbOrErr = future->get();
+    if (mbOrErr.second)
+      reportBufferError(errorCodeToError(mbOrErr.second), childName);
+    driver->addArchiveBuffer(takeBuffer(std::move(mbOrErr.first)), symName,
+                             parentName, /* OffsetInArchive */ 0);
   });
 }
 
-static bool isDecorated(StringRef Sym) {
-  return Sym.startswith("@") || Sym.contains("@@") || Sym.startswith("?") ||
-         (!Config->MinGW && Sym.contains('@'));
+static bool isDecorated(StringRef sym) {
+  return sym.startswith("@") || sym.contains("@@") || sym.startswith("?") ||
+         (!config->mingw && sym.contains('@'));
 }
 
 // Parses .drectve section contents and returns a list of files
 // specified by /defaultlib.
-void LinkerDriver::parseDirectives(StringRef S) {
-  ArgParser Parser;
+void LinkerDriver::parseDirectives(InputFile *file) {
+  StringRef s = file->getDirectives();
+  if (s.empty())
+    return;
+
+  log("Directives: " + toString(file) + ": " + s);
+
+  ArgParser parser;
   // .drectve is always tokenized using Windows shell rules.
   // /EXPORT: option can appear too many times, processing in fastpath.
-  opt::InputArgList Args;
-  std::vector<StringRef> Exports;
-  std::tie(Args, Exports) = Parser.parseDirectives(S);
+  opt::InputArgList args;
+  std::vector<StringRef> exports;
+  std::tie(args, exports) = parser.parseDirectives(s);
 
-  for (StringRef E : Exports) {
+  for (StringRef e : exports) {
     // If a common header file contains dllexported function
     // declarations, many object files may end up with having the
     // same /EXPORT options. In order to save cost of parsing them,
     // we dedup them first.
-    if (!DirectivesExports.insert(E).second)
+    if (!directivesExports.insert(e).second)
       continue;
 
-    Export Exp = parseExport(E);
-    if (Config->Machine == I386 && Config->MinGW) {
-      if (!isDecorated(Exp.Name))
-        Exp.Name = Saver.save("_" + Exp.Name);
-      if (!Exp.ExtName.empty() && !isDecorated(Exp.ExtName))
-        Exp.ExtName = Saver.save("_" + Exp.ExtName);
+    Export exp = parseExport(e);
+    if (config->machine == I386 && config->mingw) {
+      if (!isDecorated(exp.name))
+        exp.name = saver.save("_" + exp.name);
+      if (!exp.extName.empty() && !isDecorated(exp.extName))
+        exp.extName = saver.save("_" + exp.extName);
     }
-    Exp.Directives = true;
-    Config->Exports.push_back(Exp);
+    exp.directives = true;
+    config->exports.push_back(exp);
   }
 
-  for (auto *Arg : Args) {
-    switch (Arg->getOption().getUnaliasedOption().getID()) {
+  for (auto *arg : args) {
+    switch (arg->getOption().getID()) {
     case OPT_aligncomm:
-      parseAligncomm(Arg->getValue());
+      parseAligncomm(arg->getValue());
       break;
     case OPT_alternatename:
-      parseAlternateName(Arg->getValue());
+      parseAlternateName(arg->getValue());
       break;
     case OPT_defaultlib:
-      if (Optional<StringRef> Path = findLib(Arg->getValue()))
-        enqueuePath(*Path, false);
+      if (Optional<StringRef> path = findLib(arg->getValue()))
+        enqueuePath(*path, false);
       break;
     case OPT_entry:
-      Config->Entry = addUndefined(mangle(Arg->getValue()));
+      config->entry = addUndefined(mangle(arg->getValue()));
       break;
     case OPT_failifmismatch:
-      checkFailIfMismatch(Arg->getValue());
+      checkFailIfMismatch(arg->getValue(), file);
       break;
     case OPT_incl:
-      addUndefined(Arg->getValue());
+      addUndefined(arg->getValue());
       break;
     case OPT_merge:
-      parseMerge(Arg->getValue());
+      parseMerge(arg->getValue());
       break;
     case OPT_nodefaultlib:
-      Config->NoDefaultLibs.insert(doFindLib(Arg->getValue()));
+      config->noDefaultLibs.insert(doFindLib(arg->getValue()).lower());
       break;
     case OPT_section:
-      parseSection(Arg->getValue());
+      parseSection(arg->getValue());
       break;
     case OPT_subsystem:
-      parseSubsystem(Arg->getValue(), &Config->Subsystem,
-                     &Config->MajorOSVersion, &Config->MinorOSVersion);
+      parseSubsystem(arg->getValue(), &config->subsystem,
+                     &config->majorOSVersion, &config->minorOSVersion);
       break;
+    // Only add flags here that link.exe accepts in
+    // `#pragma comment(linker, "/flag")`-generated sections.
     case OPT_editandcontinue:
-    case OPT_fastfail:
     case OPT_guardsym:
-    case OPT_natvis:
     case OPT_throwingnew:
       break;
     default:
-      error(Arg->getSpelling() + " is not allowed in .drectve");
+      error(arg->getSpelling() + " is not allowed in .drectve");
     }
   }
 }
 
 // Find file from search paths. You can omit ".obj", this function takes
 // care of that. Note that the returned path is not guaranteed to exist.
-StringRef LinkerDriver::doFindFile(StringRef Filename) {
-  bool HasPathSep = (Filename.find_first_of("/\\") != StringRef::npos);
-  if (HasPathSep)
-    return Filename;
-  bool HasExt = Filename.contains('.');
-  for (StringRef Dir : SearchPaths) {
-    SmallString<128> Path = Dir;
-    sys::path::append(Path, Filename);
-    if (sys::fs::exists(Path.str()))
-      return Saver.save(Path.str());
-    if (!HasExt) {
-      Path.append(".obj");
-      if (sys::fs::exists(Path.str()))
-        return Saver.save(Path.str());
+StringRef LinkerDriver::doFindFile(StringRef filename) {
+  bool hasPathSep = (filename.find_first_of("/\\") != StringRef::npos);
+  if (hasPathSep)
+    return filename;
+  bool hasExt = filename.contains('.');
+  for (StringRef dir : searchPaths) {
+    SmallString<128> path = dir;
+    sys::path::append(path, filename);
+    if (sys::fs::exists(path.str()))
+      return saver.save(path.str());
+    if (!hasExt) {
+      path.append(".obj");
+      if (sys::fs::exists(path.str()))
+        return saver.save(path.str());
     }
   }
-  return Filename;
+  return filename;
 }
 
-static Optional<sys::fs::UniqueID> getUniqueID(StringRef Path) {
-  sys::fs::UniqueID Ret;
-  if (sys::fs::getUniqueID(Path, Ret))
+static Optional<sys::fs::UniqueID> getUniqueID(StringRef path) {
+  sys::fs::UniqueID ret;
+  if (sys::fs::getUniqueID(path, ret))
     return None;
-  return Ret;
+  return ret;
 }
 
 // Resolves a file path. This never returns the same path
 // (in that case, it returns None).
-Optional<StringRef> LinkerDriver::findFile(StringRef Filename) {
-  StringRef Path = doFindFile(Filename);
+Optional<StringRef> LinkerDriver::findFile(StringRef filename) {
+  StringRef path = doFindFile(filename);
 
-  if (Optional<sys::fs::UniqueID> ID = getUniqueID(Path)) {
-    bool Seen = !VisitedFiles.insert(*ID).second;
-    if (Seen)
+  if (Optional<sys::fs::UniqueID> id = getUniqueID(path)) {
+    bool seen = !visitedFiles.insert(*id).second;
+    if (seen)
       return None;
   }
 
-  if (Path.endswith_lower(".lib"))
-    VisitedLibs.insert(sys::path::filename(Path));
-  return Path;
+  if (path.endswith_lower(".lib"))
+    visitedLibs.insert(sys::path::filename(path));
+  return path;
 }
 
 // MinGW specific. If an embedded directive specified to link to
 // foo.lib, but it isn't found, try libfoo.a instead.
-StringRef LinkerDriver::doFindLibMinGW(StringRef Filename) {
-  if (Filename.contains('/') || Filename.contains('\\'))
-    return Filename;
+StringRef LinkerDriver::doFindLibMinGW(StringRef filename) {
+  if (filename.contains('/') || filename.contains('\\'))
+    return filename;
 
-  SmallString<128> S = Filename;
-  sys::path::replace_extension(S, ".a");
-  StringRef LibName = Saver.save("lib" + S.str());
-  return doFindFile(LibName);
+  SmallString<128> s = filename;
+  sys::path::replace_extension(s, ".a");
+  StringRef libName = saver.save("lib" + s.str());
+  return doFindFile(libName);
 }
 
 // Find library file from search path.
-StringRef LinkerDriver::doFindLib(StringRef Filename) {
+StringRef LinkerDriver::doFindLib(StringRef filename) {
   // Add ".lib" to Filename if that has no file extension.
-  bool HasExt = Filename.contains('.');
-  if (!HasExt)
-    Filename = Saver.save(Filename + ".lib");
-  StringRef Ret = doFindFile(Filename);
+  bool hasExt = filename.contains('.');
+  if (!hasExt)
+    filename = saver.save(filename + ".lib");
+  StringRef ret = doFindFile(filename);
   // For MinGW, if the find above didn't turn up anything, try
   // looking for a MinGW formatted library name.
-  if (Config->MinGW && Ret == Filename)
-    return doFindLibMinGW(Filename);
-  return Ret;
+  if (config->mingw && ret == filename)
+    return doFindLibMinGW(filename);
+  return ret;
 }
 
 // Resolves a library path. /nodefaultlib options are taken into
 // consideration. This never returns the same path (in that case,
 // it returns None).
-Optional<StringRef> LinkerDriver::findLib(StringRef Filename) {
-  if (Config->NoDefaultLibAll)
+Optional<StringRef> LinkerDriver::findLib(StringRef filename) {
+  if (config->noDefaultLibAll)
     return None;
-  if (!VisitedLibs.insert(Filename.lower()).second)
+  if (!visitedLibs.insert(filename.lower()).second)
     return None;
 
-  StringRef Path = doFindLib(Filename);
-  if (Config->NoDefaultLibs.count(Path))
+  StringRef path = doFindLib(filename);
+  if (config->noDefaultLibs.count(path.lower()))
     return None;
 
-  if (Optional<sys::fs::UniqueID> ID = getUniqueID(Path))
-    if (!VisitedFiles.insert(*ID).second)
+  if (Optional<sys::fs::UniqueID> id = getUniqueID(path))
+    if (!visitedFiles.insert(*id).second)
       return None;
-  return Path;
+  return path;
 }
 
 // Parses LIB environment which contains a list of search paths.
 void LinkerDriver::addLibSearchPaths() {
-  Optional<std::string> EnvOpt = Process::GetEnv("LIB");
-  if (!EnvOpt.hasValue())
+  Optional<std::string> envOpt = Process::GetEnv("LIB");
+  if (!envOpt.hasValue())
     return;
-  StringRef Env = Saver.save(*EnvOpt);
-  while (!Env.empty()) {
-    StringRef Path;
-    std::tie(Path, Env) = Env.split(';');
-    SearchPaths.push_back(Path);
+  StringRef env = saver.save(*envOpt);
+  while (!env.empty()) {
+    StringRef path;
+    std::tie(path, env) = env.split(';');
+    searchPaths.push_back(path);
   }
 }
 
-Symbol *LinkerDriver::addUndefined(StringRef Name) {
-  Symbol *B = Symtab->addUndefined(Name);
-  if (!B->IsGCRoot) {
-    B->IsGCRoot = true;
-    Config->GCRoot.push_back(B);
+Symbol *LinkerDriver::addUndefined(StringRef name) {
+  Symbol *b = symtab->addUndefined(name);
+  if (!b->isGCRoot) {
+    b->isGCRoot = true;
+    config->gcroot.push_back(b);
   }
-  return B;
+  return b;
+}
+
+StringRef LinkerDriver::mangleMaybe(Symbol *s) {
+  // If the plain symbol name has already been resolved, do nothing.
+  Undefined *unmangled = dyn_cast<Undefined>(s);
+  if (!unmangled)
+    return "";
+
+  // Otherwise, see if a similar, mangled symbol exists in the symbol table.
+  Symbol *mangled = symtab->findMangle(unmangled->getName());
+  if (!mangled)
+    return "";
+
+  // If we find a similar mangled symbol, make this an alias to it and return
+  // its name.
+  log(unmangled->getName() + " aliased to " + mangled->getName());
+  unmangled->weakAlias = symtab->addUndefined(mangled->getName());
+  return mangled->getName();
 }
 
 // Windows specific -- find default entry point name.
@@ -444,15 +526,15 @@ Symbol *LinkerDriver::addUndefined(StringRef Name) {
 // each of which corresponds to a user-defined "main" function. This function
 // infers an entry point from a user-defined "main" function.
 StringRef LinkerDriver::findDefaultEntry() {
-  assert(Config->Subsystem != IMAGE_SUBSYSTEM_UNKNOWN &&
+  assert(config->subsystem != IMAGE_SUBSYSTEM_UNKNOWN &&
          "must handle /subsystem before calling this");
 
-  if (Config->MinGW)
-    return mangle(Config->Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI
+  if (config->mingw)
+    return mangle(config->subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI
                       ? "WinMainCRTStartup"
                       : "mainCRTStartup");
 
-  if (Config->Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) {
+  if (config->subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) {
     if (findUnderscoreMangle("wWinMain")) {
       if (!findUnderscoreMangle("WinMain"))
         return mangle("wWinMainCRTStartup");
@@ -469,44 +551,44 @@ StringRef LinkerDriver::findDefaultEntry() {
 }
 
 WindowsSubsystem LinkerDriver::inferSubsystem() {
-  if (Config->DLL)
+  if (config->dll)
     return IMAGE_SUBSYSTEM_WINDOWS_GUI;
-  if (Config->MinGW)
+  if (config->mingw)
     return IMAGE_SUBSYSTEM_WINDOWS_CUI;
   // Note that link.exe infers the subsystem from the presence of these
   // functions even if /entry: or /nodefaultlib are passed which causes them
   // to not be called.
-  bool HaveMain = findUnderscoreMangle("main");
-  bool HaveWMain = findUnderscoreMangle("wmain");
-  bool HaveWinMain = findUnderscoreMangle("WinMain");
-  bool HaveWWinMain = findUnderscoreMangle("wWinMain");
-  if (HaveMain || HaveWMain) {
-    if (HaveWinMain || HaveWWinMain) {
-      warn(std::string("found ") + (HaveMain ? "main" : "wmain") + " and " +
-           (HaveWinMain ? "WinMain" : "wWinMain") +
+  bool haveMain = findUnderscoreMangle("main");
+  bool haveWMain = findUnderscoreMangle("wmain");
+  bool haveWinMain = findUnderscoreMangle("WinMain");
+  bool haveWWinMain = findUnderscoreMangle("wWinMain");
+  if (haveMain || haveWMain) {
+    if (haveWinMain || haveWWinMain) {
+      warn(std::string("found ") + (haveMain ? "main" : "wmain") + " and " +
+           (haveWinMain ? "WinMain" : "wWinMain") +
            "; defaulting to /subsystem:console");
     }
     return IMAGE_SUBSYSTEM_WINDOWS_CUI;
   }
-  if (HaveWinMain || HaveWWinMain)
+  if (haveWinMain || haveWWinMain)
     return IMAGE_SUBSYSTEM_WINDOWS_GUI;
   return IMAGE_SUBSYSTEM_UNKNOWN;
 }
 
 static uint64_t getDefaultImageBase() {
-  if (Config->is64())
-    return Config->DLL ? 0x180000000 : 0x140000000;
-  return Config->DLL ? 0x10000000 : 0x400000;
+  if (config->is64())
+    return config->dll ? 0x180000000 : 0x140000000;
+  return config->dll ? 0x10000000 : 0x400000;
 }
 
-static std::string createResponseFile(const opt::InputArgList &Args,
-                                      ArrayRef<StringRef> FilePaths,
-                                      ArrayRef<StringRef> SearchPaths) {
-  SmallString<0> Data;
-  raw_svector_ostream OS(Data);
+static std::string createResponseFile(const opt::InputArgList &args,
+                                      ArrayRef<StringRef> filePaths,
+                                      ArrayRef<StringRef> searchPaths) {
+  SmallString<0> data;
+  raw_svector_ostream os(data);
 
-  for (auto *Arg : Args) {
-    switch (Arg->getOption().getID()) {
+  for (auto *arg : args) {
+    switch (arg->getOption().getID()) {
     case OPT_linkrepro:
     case OPT_INPUT:
     case OPT_defaultlib:
@@ -518,32 +600,37 @@ static std::string createResponseFile(const opt::InputArgList &Args,
     case OPT_manifestinput:
     case OPT_manifestuac:
       break;
+    case OPT_implib:
+    case OPT_pdb:
+    case OPT_out:
+      os << arg->getSpelling() << sys::path::filename(arg->getValue()) << "\n";
+      break;
     default:
-      OS << toString(*Arg) << "\n";
+      os << toString(*arg) << "\n";
     }
   }
 
-  for (StringRef Path : SearchPaths) {
-    std::string RelPath = relativeToRoot(Path);
-    OS << "/libpath:" << quote(RelPath) << "\n";
+  for (StringRef path : searchPaths) {
+    std::string relPath = relativeToRoot(path);
+    os << "/libpath:" << quote(relPath) << "\n";
   }
 
-  for (StringRef Path : FilePaths)
-    OS << quote(relativeToRoot(Path)) << "\n";
+  for (StringRef path : filePaths)
+    os << quote(relativeToRoot(path)) << "\n";
 
-  return Data.str();
+  return data.str();
 }
 
 enum class DebugKind { Unknown, None, Full, FastLink, GHash, Dwarf, Symtab };
 
-static DebugKind parseDebugKind(const opt::InputArgList &Args) {
-  auto *A = Args.getLastArg(OPT_debug, OPT_debug_opt);
-  if (!A)
+static DebugKind parseDebugKind(const opt::InputArgList &args) {
+  auto *a = args.getLastArg(OPT_debug, OPT_debug_opt);
+  if (!a)
     return DebugKind::None;
-  if (A->getNumValues() == 0)
+  if (a->getNumValues() == 0)
     return DebugKind::Full;
 
-  DebugKind Debug = StringSwitch<DebugKind>(A->getValue())
+  DebugKind debug = StringSwitch<DebugKind>(a->getValue())
                      .CaseLower("none", DebugKind::None)
                      .CaseLower("full", DebugKind::Full)
                      .CaseLower("fastlink", DebugKind::FastLink)
@@ -553,67 +640,68 @@ static DebugKind parseDebugKind(const opt::InputArgList &Args) {
                      .CaseLower("symtab", DebugKind::Symtab)
                      .Default(DebugKind::Unknown);
 
-  if (Debug == DebugKind::FastLink) {
+  if (debug == DebugKind::FastLink) {
     warn("/debug:fastlink unsupported; using /debug:full");
     return DebugKind::Full;
   }
-  if (Debug == DebugKind::Unknown) {
-    error("/debug: unknown option: " + Twine(A->getValue()));
+  if (debug == DebugKind::Unknown) {
+    error("/debug: unknown option: " + Twine(a->getValue()));
     return DebugKind::None;
   }
-  return Debug;
+  return debug;
 }
 
-static unsigned parseDebugTypes(const opt::InputArgList &Args) {
-  unsigned DebugTypes = static_cast<unsigned>(DebugType::None);
+static unsigned parseDebugTypes(const opt::InputArgList &args) {
+  unsigned debugTypes = static_cast<unsigned>(DebugType::None);
 
-  if (auto *A = Args.getLastArg(OPT_debugtype)) {
-    SmallVector<StringRef, 3> Types;
-    A->getSpelling().split(Types, ',', /*KeepEmpty=*/false);
+  if (auto *a = args.getLastArg(OPT_debugtype)) {
+    SmallVector<StringRef, 3> types;
+    StringRef(a->getValue())
+        .split(types, ',', /*MaxSplit=*/-1, /*KeepEmpty=*/false);
 
-    for (StringRef Type : Types) {
-      unsigned V = StringSwitch<unsigned>(Type.lower())
+    for (StringRef type : types) {
+      unsigned v = StringSwitch<unsigned>(type.lower())
                        .Case("cv", static_cast<unsigned>(DebugType::CV))
                        .Case("pdata", static_cast<unsigned>(DebugType::PData))
                        .Case("fixup", static_cast<unsigned>(DebugType::Fixup))
                        .Default(0);
-      if (V == 0) {
-        warn("/debugtype: unknown option: " + Twine(A->getValue()));
+      if (v == 0) {
+        warn("/debugtype: unknown option '" + type + "'");
         continue;
       }
-      DebugTypes |= V;
+      debugTypes |= v;
     }
-    return DebugTypes;
+    return debugTypes;
   }
 
   // Default debug types
-  DebugTypes = static_cast<unsigned>(DebugType::CV);
-  if (Args.hasArg(OPT_driver))
-    DebugTypes |= static_cast<unsigned>(DebugType::PData);
-  if (Args.hasArg(OPT_profile))
-    DebugTypes |= static_cast<unsigned>(DebugType::Fixup);
+  debugTypes = static_cast<unsigned>(DebugType::CV);
+  if (args.hasArg(OPT_driver))
+    debugTypes |= static_cast<unsigned>(DebugType::PData);
+  if (args.hasArg(OPT_profile))
+    debugTypes |= static_cast<unsigned>(DebugType::Fixup);
 
-  return DebugTypes;
+  return debugTypes;
 }
 
-static std::string getMapFile(const opt::InputArgList &Args) {
-  auto *Arg = Args.getLastArg(OPT_lldmap, OPT_lldmap_file);
-  if (!Arg)
+static std::string getMapFile(const opt::InputArgList &args) {
+  auto *arg = args.getLastArg(OPT_lldmap, OPT_lldmap_file);
+  if (!arg)
     return "";
-  if (Arg->getOption().getID() == OPT_lldmap_file)
-    return Arg->getValue();
+  if (arg->getOption().getID() == OPT_lldmap_file)
+    return arg->getValue();
 
-  assert(Arg->getOption().getID() == OPT_lldmap);
-  StringRef OutFile = Config->OutputFile;
-  return (OutFile.substr(0, OutFile.rfind('.')) + ".map").str();
+  assert(arg->getOption().getID() == OPT_lldmap);
+  StringRef outFile = config->outputFile;
+  return (outFile.substr(0, outFile.rfind('.')) + ".map").str();
 }
 
 static std::string getImplibPath() {
-  if (!Config->Implib.empty())
-    return Config->Implib;
-  SmallString<128> Out = StringRef(Config->OutputFile);
-  sys::path::replace_extension(Out, ".lib");
-  return Out.str();
+  if (!config->implib.empty())
+    return config->implib;
+  SmallString<128> out = StringRef(config->outputFile);
+  sys::path::replace_extension(out, ".lib");
+  return out.str();
 }
 
 //
@@ -624,289 +712,346 @@ static std::string getImplibPath() {
 //   LINK | {value}        | {value}.{.dll/.exe} | {output name}
 //    LIB | {value}        | {value}.dll         | {output name}.dll
 //
-static std::string getImportName(bool AsLib) {
-  SmallString<128> Out;
+static std::string getImportName(bool asLib) {
+  SmallString<128> out;
 
-  if (Config->ImportName.empty()) {
-    Out.assign(sys::path::filename(Config->OutputFile));
-    if (AsLib)
-      sys::path::replace_extension(Out, ".dll");
+  if (config->importName.empty()) {
+    out.assign(sys::path::filename(config->outputFile));
+    if (asLib)
+      sys::path::replace_extension(out, ".dll");
   } else {
-    Out.assign(Config->ImportName);
-    if (!sys::path::has_extension(Out))
-      sys::path::replace_extension(Out,
-                                   (Config->DLL || AsLib) ? ".dll" : ".exe");
+    out.assign(config->importName);
+    if (!sys::path::has_extension(out))
+      sys::path::replace_extension(out,
+                                   (config->dll || asLib) ? ".dll" : ".exe");
   }
 
-  return Out.str();
+  return out.str();
 }
 
-static void createImportLibrary(bool AsLib) {
-  std::vector<COFFShortExport> Exports;
-  for (Export &E1 : Config->Exports) {
-    COFFShortExport E2;
-    E2.Name = E1.Name;
-    E2.SymbolName = E1.SymbolName;
-    E2.ExtName = E1.ExtName;
-    E2.Ordinal = E1.Ordinal;
-    E2.Noname = E1.Noname;
-    E2.Data = E1.Data;
-    E2.Private = E1.Private;
-    E2.Constant = E1.Constant;
-    Exports.push_back(E2);
+static void createImportLibrary(bool asLib) {
+  std::vector<COFFShortExport> exports;
+  for (Export &e1 : config->exports) {
+    COFFShortExport e2;
+    e2.Name = e1.name;
+    e2.SymbolName = e1.symbolName;
+    e2.ExtName = e1.extName;
+    e2.Ordinal = e1.ordinal;
+    e2.Noname = e1.noname;
+    e2.Data = e1.data;
+    e2.Private = e1.isPrivate;
+    e2.Constant = e1.constant;
+    exports.push_back(e2);
   }
 
-  auto HandleError = [](Error &&E) {
-    handleAllErrors(std::move(E),
-                    [](ErrorInfoBase &EIB) { error(EIB.message()); });
+  auto handleError = [](Error &&e) {
+    handleAllErrors(std::move(e),
+                    [](ErrorInfoBase &eib) { error(eib.message()); });
   };
-  std::string LibName = getImportName(AsLib);
-  std::string Path = getImplibPath();
+  std::string libName = getImportName(asLib);
+  std::string path = getImplibPath();
 
-  if (!Config->Incremental) {
-    HandleError(writeImportLibrary(LibName, Path, Exports, Config->Machine,
-                                   Config->MinGW));
+  if (!config->incremental) {
+    handleError(writeImportLibrary(libName, path, exports, config->machine,
+                                   config->mingw));
     return;
   }
 
   // If the import library already exists, replace it only if the contents
   // have changed.
-  ErrorOr<std::unique_ptr<MemoryBuffer>> OldBuf = MemoryBuffer::getFile(
-      Path, /*FileSize*/ -1, /*RequiresNullTerminator*/ false);
-  if (!OldBuf) {
-    HandleError(writeImportLibrary(LibName, Path, Exports, Config->Machine,
-                                   Config->MinGW));
+  ErrorOr<std::unique_ptr<MemoryBuffer>> oldBuf = MemoryBuffer::getFile(
+      path, /*FileSize*/ -1, /*RequiresNullTerminator*/ false);
+  if (!oldBuf) {
+    handleError(writeImportLibrary(libName, path, exports, config->machine,
+                                   config->mingw));
     return;
   }
 
-  SmallString<128> TmpName;
-  if (std::error_code EC =
-          sys::fs::createUniqueFile(Path + ".tmp-%%%%%%%%.lib", TmpName))
-    fatal("cannot create temporary file for import library " + Path + ": " +
-          EC.message());
+  SmallString<128> tmpName;
+  if (std::error_code ec =
+          sys::fs::createUniqueFile(path + ".tmp-%%%%%%%%.lib", tmpName))
+    fatal("cannot create temporary file for import library " + path + ": " +
+          ec.message());
 
-  if (Error E = writeImportLibrary(LibName, TmpName, Exports, Config->Machine,
-                                   Config->MinGW)) {
-    HandleError(std::move(E));
+  if (Error e = writeImportLibrary(libName, tmpName, exports, config->machine,
+                                   config->mingw)) {
+    handleError(std::move(e));
     return;
   }
 
-  std::unique_ptr<MemoryBuffer> NewBuf = check(MemoryBuffer::getFile(
-      TmpName, /*FileSize*/ -1, /*RequiresNullTerminator*/ false));
-  if ((*OldBuf)->getBuffer() != NewBuf->getBuffer()) {
-    OldBuf->reset();
-    HandleError(errorCodeToError(sys::fs::rename(TmpName, Path)));
+  std::unique_ptr<MemoryBuffer> newBuf = check(MemoryBuffer::getFile(
+      tmpName, /*FileSize*/ -1, /*RequiresNullTerminator*/ false));
+  if ((*oldBuf)->getBuffer() != newBuf->getBuffer()) {
+    oldBuf->reset();
+    handleError(errorCodeToError(sys::fs::rename(tmpName, path)));
   } else {
-    sys::fs::remove(TmpName);
+    sys::fs::remove(tmpName);
   }
 }
 
-static void parseModuleDefs(StringRef Path) {
-  std::unique_ptr<MemoryBuffer> MB = CHECK(
-      MemoryBuffer::getFile(Path, -1, false, true), "could not open " + Path);
-  COFFModuleDefinition M = check(parseCOFFModuleDefinition(
-      MB->getMemBufferRef(), Config->Machine, Config->MinGW));
+static void parseModuleDefs(StringRef path) {
+  std::unique_ptr<MemoryBuffer> mb = CHECK(
+      MemoryBuffer::getFile(path, -1, false, true), "could not open " + path);
+  COFFModuleDefinition m = check(parseCOFFModuleDefinition(
+      mb->getMemBufferRef(), config->machine, config->mingw));
 
-  if (Config->OutputFile.empty())
-    Config->OutputFile = Saver.save(M.OutputFile);
-  Config->ImportName = Saver.save(M.ImportName);
-  if (M.ImageBase)
-    Config->ImageBase = M.ImageBase;
-  if (M.StackReserve)
-    Config->StackReserve = M.StackReserve;
-  if (M.StackCommit)
-    Config->StackCommit = M.StackCommit;
-  if (M.HeapReserve)
-    Config->HeapReserve = M.HeapReserve;
-  if (M.HeapCommit)
-    Config->HeapCommit = M.HeapCommit;
-  if (M.MajorImageVersion)
-    Config->MajorImageVersion = M.MajorImageVersion;
-  if (M.MinorImageVersion)
-    Config->MinorImageVersion = M.MinorImageVersion;
-  if (M.MajorOSVersion)
-    Config->MajorOSVersion = M.MajorOSVersion;
-  if (M.MinorOSVersion)
-    Config->MinorOSVersion = M.MinorOSVersion;
+  if (config->outputFile.empty())
+    config->outputFile = saver.save(m.OutputFile);
+  config->importName = saver.save(m.ImportName);
+  if (m.ImageBase)
+    config->imageBase = m.ImageBase;
+  if (m.StackReserve)
+    config->stackReserve = m.StackReserve;
+  if (m.StackCommit)
+    config->stackCommit = m.StackCommit;
+  if (m.HeapReserve)
+    config->heapReserve = m.HeapReserve;
+  if (m.HeapCommit)
+    config->heapCommit = m.HeapCommit;
+  if (m.MajorImageVersion)
+    config->majorImageVersion = m.MajorImageVersion;
+  if (m.MinorImageVersion)
+    config->minorImageVersion = m.MinorImageVersion;
+  if (m.MajorOSVersion)
+    config->majorOSVersion = m.MajorOSVersion;
+  if (m.MinorOSVersion)
+    config->minorOSVersion = m.MinorOSVersion;
 
-  for (COFFShortExport E1 : M.Exports) {
-    Export E2;
+  for (COFFShortExport e1 : m.Exports) {
+    Export e2;
     // In simple cases, only Name is set. Renamed exports are parsed
     // and set as "ExtName = Name". If Name has the form "OtherDll.Func",
     // it shouldn't be a normal exported function but a forward to another
     // DLL instead. This is supported by both MS and GNU linkers.
-    if (E1.ExtName != E1.Name && StringRef(E1.Name).contains('.')) {
-      E2.Name = Saver.save(E1.ExtName);
-      E2.ForwardTo = Saver.save(E1.Name);
-      Config->Exports.push_back(E2);
+    if (e1.ExtName != e1.Name && StringRef(e1.Name).contains('.')) {
+      e2.name = saver.save(e1.ExtName);
+      e2.forwardTo = saver.save(e1.Name);
+      config->exports.push_back(e2);
       continue;
     }
-    E2.Name = Saver.save(E1.Name);
-    E2.ExtName = Saver.save(E1.ExtName);
-    E2.Ordinal = E1.Ordinal;
-    E2.Noname = E1.Noname;
-    E2.Data = E1.Data;
-    E2.Private = E1.Private;
-    E2.Constant = E1.Constant;
-    Config->Exports.push_back(E2);
+    e2.name = saver.save(e1.Name);
+    e2.extName = saver.save(e1.ExtName);
+    e2.ordinal = e1.Ordinal;
+    e2.noname = e1.Noname;
+    e2.data = e1.Data;
+    e2.isPrivate = e1.Private;
+    e2.constant = e1.Constant;
+    config->exports.push_back(e2);
   }
 }
 
-void LinkerDriver::enqueueTask(std::function<void()> Task) {
-  TaskQueue.push_back(std::move(Task));
+void LinkerDriver::enqueueTask(std::function<void()> task) {
+  taskQueue.push_back(std::move(task));
 }
 
 bool LinkerDriver::run() {
-  ScopedTimer T(InputFileTimer);
+  ScopedTimer t(inputFileTimer);
 
-  bool DidWork = !TaskQueue.empty();
-  while (!TaskQueue.empty()) {
-    TaskQueue.front()();
-    TaskQueue.pop_front();
+  bool didWork = !taskQueue.empty();
+  while (!taskQueue.empty()) {
+    taskQueue.front()();
+    taskQueue.pop_front();
   }
-  return DidWork;
+  return didWork;
 }
 
 // Parse an /order file. If an option is given, the linker places
 // COMDAT sections in the same order as their names appear in the
 // given file.
-static void parseOrderFile(StringRef Arg) {
+static void parseOrderFile(StringRef arg) {
   // For some reason, the MSVC linker requires a filename to be
   // preceded by "@".
-  if (!Arg.startswith("@")) {
+  if (!arg.startswith("@")) {
     error("malformed /order option: '@' missing");
     return;
   }
 
   // Get a list of all comdat sections for error checking.
-  DenseSet<StringRef> Set;
-  for (Chunk *C : Symtab->getChunks())
-    if (auto *Sec = dyn_cast<SectionChunk>(C))
-      if (Sec->Sym)
-        Set.insert(Sec->Sym->getName());
+  DenseSet<StringRef> set;
+  for (Chunk *c : symtab->getChunks())
+    if (auto *sec = dyn_cast<SectionChunk>(c))
+      if (sec->sym)
+        set.insert(sec->sym->getName());
 
   // Open a file.
-  StringRef Path = Arg.substr(1);
-  std::unique_ptr<MemoryBuffer> MB = CHECK(
-      MemoryBuffer::getFile(Path, -1, false, true), "could not open " + Path);
+  StringRef path = arg.substr(1);
+  std::unique_ptr<MemoryBuffer> mb = CHECK(
+      MemoryBuffer::getFile(path, -1, false, true), "could not open " + path);
 
   // Parse a file. An order file contains one symbol per line.
   // All symbols that were not present in a given order file are
   // considered to have the lowest priority 0 and are placed at
   // end of an output section.
-  for (std::string S : args::getLines(MB->getMemBufferRef())) {
-    if (Config->Machine == I386 && !isDecorated(S))
-      S = "_" + S;
+  for (std::string s : args::getLines(mb->getMemBufferRef())) {
+    if (config->machine == I386 && !isDecorated(s))
+      s = "_" + s;
 
-    if (Set.count(S) == 0) {
-      if (Config->WarnMissingOrderSymbol)
-        warn("/order:" + Arg + ": missing symbol: " + S + " [LNK4037]");
+    if (set.count(s) == 0) {
+      if (config->warnMissingOrderSymbol)
+        warn("/order:" + arg + ": missing symbol: " + s + " [LNK4037]");
     }
     else
-      Config->Order[S] = INT_MIN + Config->Order.size();
+      config->order[s] = INT_MIN + config->order.size();
   }
 }
 
-static void markAddrsig(Symbol *S) {
-  if (auto *D = dyn_cast_or_null<Defined>(S))
-    if (Chunk *C = D->getChunk())
-      C->KeepUnique = true;
+static void markAddrsig(Symbol *s) {
+  if (auto *d = dyn_cast_or_null<Defined>(s))
+    if (SectionChunk *c = dyn_cast_or_null<SectionChunk>(d->getChunk()))
+      c->keepUnique = true;
 }
 
 static void findKeepUniqueSections() {
   // Exported symbols could be address-significant in other executables or DSOs,
   // so we conservatively mark them as address-significant.
-  for (Export &R : Config->Exports)
-    markAddrsig(R.Sym);
+  for (Export &r : config->exports)
+    markAddrsig(r.sym);
 
   // Visit the address-significance table in each object file and mark each
   // referenced symbol as address-significant.
-  for (ObjFile *Obj : ObjFile::Instances) {
-    ArrayRef<Symbol *> Syms = Obj->getSymbols();
-    if (Obj->AddrsigSec) {
-      ArrayRef<uint8_t> Contents;
-      Obj->getCOFFObj()->getSectionContents(Obj->AddrsigSec, Contents);
-      const uint8_t *Cur = Contents.begin();
-      while (Cur != Contents.end()) {
-        unsigned Size;
-        const char *Err;
-        uint64_t SymIndex = decodeULEB128(Cur, &Size, Contents.end(), &Err);
-        if (Err)
-          fatal(toString(Obj) + ": could not decode addrsig section: " + Err);
-        if (SymIndex >= Syms.size())
-          fatal(toString(Obj) + ": invalid symbol index in addrsig section");
-        markAddrsig(Syms[SymIndex]);
-        Cur += Size;
+  for (ObjFile *obj : ObjFile::instances) {
+    ArrayRef<Symbol *> syms = obj->getSymbols();
+    if (obj->addrsigSec) {
+      ArrayRef<uint8_t> contents;
+      cantFail(
+          obj->getCOFFObj()->getSectionContents(obj->addrsigSec, contents));
+      const uint8_t *cur = contents.begin();
+      while (cur != contents.end()) {
+        unsigned size;
+        const char *err;
+        uint64_t symIndex = decodeULEB128(cur, &size, contents.end(), &err);
+        if (err)
+          fatal(toString(obj) + ": could not decode addrsig section: " + err);
+        if (symIndex >= syms.size())
+          fatal(toString(obj) + ": invalid symbol index in addrsig section");
+        markAddrsig(syms[symIndex]);
+        cur += size;
       }
     } else {
       // If an object file does not have an address-significance table,
       // conservatively mark all of its symbols as address-significant.
-      for (Symbol *S : Syms)
-        markAddrsig(S);
+      for (Symbol *s : syms)
+        markAddrsig(s);
     }
   }
 }
 
-// link.exe replaces each %foo% in AltPath with the contents of environment
+// link.exe replaces each %foo% in altPath with the contents of environment
 // variable foo, and adds the two magic env vars _PDB (expands to the basename
 // of pdb's output path) and _EXT (expands to the extension of the output
 // binary).
 // lld only supports %_PDB% and %_EXT% and warns on references to all other env
 // vars.
-static void parsePDBAltPath(StringRef AltPath) {
-  SmallString<128> Buf;
-  StringRef PDBBasename =
-      sys::path::filename(Config->PDBPath, sys::path::Style::windows);
-  StringRef BinaryExtension =
-      sys::path::extension(Config->OutputFile, sys::path::Style::windows);
-  if (!BinaryExtension.empty())
-    BinaryExtension = BinaryExtension.substr(1); // %_EXT% does not include '.'.
+static void parsePDBAltPath(StringRef altPath) {
+  SmallString<128> buf;
+  StringRef pdbBasename =
+      sys::path::filename(config->pdbPath, sys::path::Style::windows);
+  StringRef binaryExtension =
+      sys::path::extension(config->outputFile, sys::path::Style::windows);
+  if (!binaryExtension.empty())
+    binaryExtension = binaryExtension.substr(1); // %_EXT% does not include '.'.
 
   // Invariant:
-  //   +--------- Cursor ('a...' might be the empty string).
-  //   |   +----- FirstMark
-  //   |   |   +- SecondMark
+  //   +--------- cursor ('a...' might be the empty string).
+  //   |   +----- firstMark
+  //   |   |   +- secondMark
   //   v   v   v
   //   a...%...%...
-  size_t Cursor = 0;
-  while (Cursor < AltPath.size()) {
-    size_t FirstMark, SecondMark;
-    if ((FirstMark = AltPath.find('%', Cursor)) == StringRef::npos ||
-        (SecondMark = AltPath.find('%', FirstMark + 1)) == StringRef::npos) {
+  size_t cursor = 0;
+  while (cursor < altPath.size()) {
+    size_t firstMark, secondMark;
+    if ((firstMark = altPath.find('%', cursor)) == StringRef::npos ||
+        (secondMark = altPath.find('%', firstMark + 1)) == StringRef::npos) {
       // Didn't find another full fragment, treat rest of string as literal.
-      Buf.append(AltPath.substr(Cursor));
+      buf.append(altPath.substr(cursor));
       break;
     }
 
     // Found a full fragment. Append text in front of first %, and interpret
     // text between first and second % as variable name.
-    Buf.append(AltPath.substr(Cursor, FirstMark - Cursor));
-    StringRef Var = AltPath.substr(FirstMark, SecondMark - FirstMark + 1);
-    if (Var.equals_lower("%_pdb%"))
-      Buf.append(PDBBasename);
-    else if (Var.equals_lower("%_ext%"))
-      Buf.append(BinaryExtension);
+    buf.append(altPath.substr(cursor, firstMark - cursor));
+    StringRef var = altPath.substr(firstMark, secondMark - firstMark + 1);
+    if (var.equals_lower("%_pdb%"))
+      buf.append(pdbBasename);
+    else if (var.equals_lower("%_ext%"))
+      buf.append(binaryExtension);
     else {
       warn("only %_PDB% and %_EXT% supported in /pdbaltpath:, keeping " +
-           Var + " as literal");
-      Buf.append(Var);
+           var + " as literal");
+      buf.append(var);
     }
 
-    Cursor = SecondMark + 1;
+    cursor = secondMark + 1;
   }
 
-  Config->PDBAltPath = Buf;
+  config->pdbAltPath = buf;
 }
 
-void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
-  // If the first command line argument is "/lib", link.exe acts like lib.exe.
-  // We call our own implementation of lib.exe that understands bitcode files.
-  if (ArgsArr.size() > 1 && StringRef(ArgsArr[1]).equals_lower("/lib")) {
-    if (llvm::libDriverMain(ArgsArr.slice(1)) != 0)
-      fatal("lib failed");
+/// Check that at most one resource obj file was used.
+/// Call after ObjFile::Instances is complete.
+static void diagnoseMultipleResourceObjFiles() {
+  // The .rsrc$01 section in a resource obj file contains a tree description
+  // of resources.  Merging multiple resource obj files would require merging
+  // the trees instead of using usual linker section merging semantics.
+  // Since link.exe disallows linking more than one resource obj file with
+  // LNK4078, mirror that.  The normal use of resource files is to give the
+  // linker many .res files, which are then converted to a single resource obj
+  // file internally, so this is not a big restriction in practice.
+  ObjFile *resourceObjFile = nullptr;
+  for (ObjFile *f : ObjFile::instances) {
+    if (!f->isResourceObjFile)
+      continue;
+
+    if (!resourceObjFile) {
+      resourceObjFile = f;
+      continue;
+    }
+
+    error(toString(f) +
+          ": more than one resource obj file not allowed, already got " +
+          toString(resourceObjFile));
+  }
+}
+
+// In MinGW, if no symbols are chosen to be exported, then all symbols are
+// automatically exported by default. This behavior can be forced by the
+// -export-all-symbols option, so that it happens even when exports are
+// explicitly specified. The automatic behavior can be disabled using the
+// -exclude-all-symbols option, so that lld-link behaves like link.exe rather
+// than MinGW in the case that nothing is explicitly exported.
+void LinkerDriver::maybeExportMinGWSymbols(const opt::InputArgList &args) {
+  if (!config->dll)
     return;
+
+  if (!args.hasArg(OPT_export_all_symbols)) {
+    if (!config->exports.empty())
+      return;
+    if (args.hasArg(OPT_exclude_all_symbols))
+      return;
   }
 
+  AutoExporter exporter;
+
+  for (auto *arg : args.filtered(OPT_wholearchive_file))
+    if (Optional<StringRef> path = doFindFile(arg->getValue()))
+      exporter.addWholeArchive(*path);
+
+  symtab->forEachSymbol([&](Symbol *s) {
+    auto *def = dyn_cast<Defined>(s);
+    if (!exporter.shouldExport(def))
+      return;
+
+    Export e;
+    e.name = def->getName();
+    e.sym = def;
+    if (Chunk *c = def->getChunk())
+      if (!(c->getOutputCharacteristics() & IMAGE_SCN_MEM_EXECUTE))
+        e.data = true;
+    config->exports.push_back(e);
+  });
+}
+
+void LinkerDriver::link(ArrayRef<const char *> argsArr) {
   // Needed for LTO.
   InitializeAllTargetInfos();
   InitializeAllTargets();
@@ -914,279 +1059,308 @@ void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
   InitializeAllAsmParsers();
   InitializeAllAsmPrinters();
 
+  // If the first command line argument is "/lib", link.exe acts like lib.exe.
+  // We call our own implementation of lib.exe that understands bitcode files.
+  if (argsArr.size() > 1 && StringRef(argsArr[1]).equals_lower("/lib")) {
+    if (llvm::libDriverMain(argsArr.slice(1)) != 0)
+      fatal("lib failed");
+    return;
+  }
+
   // Parse command line options.
-  ArgParser Parser;
-  opt::InputArgList Args = Parser.parseLINK(ArgsArr);
+  ArgParser parser;
+  opt::InputArgList args = parser.parseLINK(argsArr);
 
   // Parse and evaluate -mllvm options.
-  std::vector<const char *> V;
-  V.push_back("lld-link (LLVM option parsing)");
-  for (auto *Arg : Args.filtered(OPT_mllvm))
-    V.push_back(Arg->getValue());
-  cl::ParseCommandLineOptions(V.size(), V.data());
+  std::vector<const char *> v;
+  v.push_back("lld-link (LLVM option parsing)");
+  for (auto *arg : args.filtered(OPT_mllvm))
+    v.push_back(arg->getValue());
+  cl::ParseCommandLineOptions(v.size(), v.data());
 
   // Handle /errorlimit early, because error() depends on it.
-  if (auto *Arg = Args.getLastArg(OPT_errorlimit)) {
-    int N = 20;
-    StringRef S = Arg->getValue();
-    if (S.getAsInteger(10, N))
-      error(Arg->getSpelling() + " number expected, but got " + S);
-    errorHandler().ErrorLimit = N;
+  if (auto *arg = args.getLastArg(OPT_errorlimit)) {
+    int n = 20;
+    StringRef s = arg->getValue();
+    if (s.getAsInteger(10, n))
+      error(arg->getSpelling() + " number expected, but got " + s);
+    errorHandler().errorLimit = n;
   }
 
   // Handle /help
-  if (Args.hasArg(OPT_help)) {
-    printHelp(ArgsArr[0]);
+  if (args.hasArg(OPT_help)) {
+    printHelp(argsArr[0]);
     return;
   }
 
-  if (Args.hasArg(OPT_show_timing))
-    Config->ShowTiming = true;
+  lld::threadsEnabled = args.hasFlag(OPT_threads, OPT_threads_no, true);
 
-  ScopedTimer T(Timer::root());
+  if (args.hasArg(OPT_show_timing))
+    config->showTiming = true;
+
+  config->showSummary = args.hasArg(OPT_summary);
+
+  ScopedTimer t(Timer::root());
   // Handle --version, which is an lld extension. This option is a bit odd
   // because it doesn't start with "/", but we deliberately chose "--" to
   // avoid conflict with /version and for compatibility with clang-cl.
-  if (Args.hasArg(OPT_dash_dash_version)) {
+  if (args.hasArg(OPT_dash_dash_version)) {
     outs() << getLLDVersion() << "\n";
     return;
   }
 
   // Handle /lldmingw early, since it can potentially affect how other
   // options are handled.
-  Config->MinGW = Args.hasArg(OPT_lldmingw);
+  config->mingw = args.hasArg(OPT_lldmingw);
 
-  if (auto *Arg = Args.getLastArg(OPT_linkrepro)) {
-    SmallString<64> Path = StringRef(Arg->getValue());
-    sys::path::append(Path, "repro.tar");
+  if (auto *arg = args.getLastArg(OPT_linkrepro)) {
+    SmallString<64> path = StringRef(arg->getValue());
+    sys::path::append(path, "repro.tar");
 
-    Expected<std::unique_ptr<TarWriter>> ErrOrWriter =
-        TarWriter::create(Path, "repro");
+    Expected<std::unique_ptr<TarWriter>> errOrWriter =
+        TarWriter::create(path, "repro");
 
-    if (ErrOrWriter) {
-      Tar = std::move(*ErrOrWriter);
+    if (errOrWriter) {
+      tar = std::move(*errOrWriter);
     } else {
-      error("/linkrepro: failed to open " + Path + ": " +
-            toString(ErrOrWriter.takeError()));
+      error("/linkrepro: failed to open " + path + ": " +
+            toString(errOrWriter.takeError()));
     }
   }
 
-  if (!Args.hasArg(OPT_INPUT)) {
-    if (Args.hasArg(OPT_deffile))
-      Config->NoEntry = true;
+  if (!args.hasArg(OPT_INPUT)) {
+    if (args.hasArg(OPT_deffile))
+      config->noEntry = true;
     else
       fatal("no input files");
   }
 
   // Construct search path list.
-  SearchPaths.push_back("");
-  for (auto *Arg : Args.filtered(OPT_libpath))
-    SearchPaths.push_back(Arg->getValue());
+  searchPaths.push_back("");
+  for (auto *arg : args.filtered(OPT_libpath))
+    searchPaths.push_back(arg->getValue());
   addLibSearchPaths();
 
   // Handle /ignore
-  for (auto *Arg : Args.filtered(OPT_ignore)) {
-    SmallVector<StringRef, 8> Vec;
-    StringRef(Arg->getValue()).split(Vec, ',');
-    for (StringRef S : Vec) {
-      if (S == "4037")
-        Config->WarnMissingOrderSymbol = false;
-      else if (S == "4099")
-        Config->WarnDebugInfoUnusable = false;
-      else if (S == "4217")
-        Config->WarnLocallyDefinedImported = false;
+  for (auto *arg : args.filtered(OPT_ignore)) {
+    SmallVector<StringRef, 8> vec;
+    StringRef(arg->getValue()).split(vec, ',');
+    for (StringRef s : vec) {
+      if (s == "4037")
+        config->warnMissingOrderSymbol = false;
+      else if (s == "4099")
+        config->warnDebugInfoUnusable = false;
+      else if (s == "4217")
+        config->warnLocallyDefinedImported = false;
       // Other warning numbers are ignored.
     }
   }
 
   // Handle /out
-  if (auto *Arg = Args.getLastArg(OPT_out))
-    Config->OutputFile = Arg->getValue();
+  if (auto *arg = args.getLastArg(OPT_out))
+    config->outputFile = arg->getValue();
 
   // Handle /verbose
-  if (Args.hasArg(OPT_verbose))
-    Config->Verbose = true;
-  errorHandler().Verbose = Config->Verbose;
+  if (args.hasArg(OPT_verbose))
+    config->verbose = true;
+  errorHandler().verbose = config->verbose;
 
   // Handle /force or /force:unresolved
-  if (Args.hasArg(OPT_force, OPT_force_unresolved))
-    Config->ForceUnresolved = true;
+  if (args.hasArg(OPT_force, OPT_force_unresolved))
+    config->forceUnresolved = true;
 
   // Handle /force or /force:multiple
-  if (Args.hasArg(OPT_force, OPT_force_multiple))
-    Config->ForceMultiple = true;
+  if (args.hasArg(OPT_force, OPT_force_multiple))
+    config->forceMultiple = true;
+
+  // Handle /force or /force:multipleres
+  if (args.hasArg(OPT_force, OPT_force_multipleres))
+    config->forceMultipleRes = true;
 
   // Handle /debug
-  DebugKind Debug = parseDebugKind(Args);
-  if (Debug == DebugKind::Full || Debug == DebugKind::Dwarf ||
-      Debug == DebugKind::GHash) {
-    Config->Debug = true;
-    Config->Incremental = true;
+  DebugKind debug = parseDebugKind(args);
+  if (debug == DebugKind::Full || debug == DebugKind::Dwarf ||
+      debug == DebugKind::GHash) {
+    config->debug = true;
+    config->incremental = true;
   }
 
+  // Handle /demangle
+  config->demangle = args.hasFlag(OPT_demangle, OPT_demangle_no);
+
   // Handle /debugtype
-  Config->DebugTypes = parseDebugTypes(Args);
+  config->debugTypes = parseDebugTypes(args);
 
   // Handle /pdb
-  bool ShouldCreatePDB =
-      (Debug == DebugKind::Full || Debug == DebugKind::GHash);
-  if (ShouldCreatePDB) {
-    if (auto *Arg = Args.getLastArg(OPT_pdb))
-      Config->PDBPath = Arg->getValue();
-    if (auto *Arg = Args.getLastArg(OPT_pdbaltpath))
-      Config->PDBAltPath = Arg->getValue();
-    if (Args.hasArg(OPT_natvis))
-      Config->NatvisFiles = Args.getAllArgValues(OPT_natvis);
+  bool shouldCreatePDB =
+      (debug == DebugKind::Full || debug == DebugKind::GHash);
+  if (shouldCreatePDB) {
+    if (auto *arg = args.getLastArg(OPT_pdb))
+      config->pdbPath = arg->getValue();
+    if (auto *arg = args.getLastArg(OPT_pdbaltpath))
+      config->pdbAltPath = arg->getValue();
+    if (args.hasArg(OPT_natvis))
+      config->natvisFiles = args.getAllArgValues(OPT_natvis);
 
-    if (auto *Arg = Args.getLastArg(OPT_pdb_source_path))
-      Config->PDBSourcePath = Arg->getValue();
+    if (auto *arg = args.getLastArg(OPT_pdb_source_path))
+      config->pdbSourcePath = arg->getValue();
   }
 
   // Handle /noentry
-  if (Args.hasArg(OPT_noentry)) {
-    if (Args.hasArg(OPT_dll))
-      Config->NoEntry = true;
+  if (args.hasArg(OPT_noentry)) {
+    if (args.hasArg(OPT_dll))
+      config->noEntry = true;
     else
       error("/noentry must be specified with /dll");
   }
 
   // Handle /dll
-  if (Args.hasArg(OPT_dll)) {
-    Config->DLL = true;
-    Config->ManifestID = 2;
+  if (args.hasArg(OPT_dll)) {
+    config->dll = true;
+    config->manifestID = 2;
   }
 
   // Handle /dynamicbase and /fixed. We can't use hasFlag for /dynamicbase
   // because we need to explicitly check whether that option or its inverse was
   // present in the argument list in order to handle /fixed.
-  auto *DynamicBaseArg = Args.getLastArg(OPT_dynamicbase, OPT_dynamicbase_no);
-  if (DynamicBaseArg &&
-      DynamicBaseArg->getOption().getID() == OPT_dynamicbase_no)
-    Config->DynamicBase = false;
+  auto *dynamicBaseArg = args.getLastArg(OPT_dynamicbase, OPT_dynamicbase_no);
+  if (dynamicBaseArg &&
+      dynamicBaseArg->getOption().getID() == OPT_dynamicbase_no)
+    config->dynamicBase = false;
 
   // MSDN claims "/FIXED:NO is the default setting for a DLL, and /FIXED is the
   // default setting for any other project type.", but link.exe defaults to
   // /FIXED:NO for exe outputs as well. Match behavior, not docs.
-  bool Fixed = Args.hasFlag(OPT_fixed, OPT_fixed_no, false);
-  if (Fixed) {
-    if (DynamicBaseArg &&
-        DynamicBaseArg->getOption().getID() == OPT_dynamicbase) {
+  bool fixed = args.hasFlag(OPT_fixed, OPT_fixed_no, false);
+  if (fixed) {
+    if (dynamicBaseArg &&
+        dynamicBaseArg->getOption().getID() == OPT_dynamicbase) {
       error("/fixed must not be specified with /dynamicbase");
     } else {
-      Config->Relocatable = false;
-      Config->DynamicBase = false;
+      config->relocatable = false;
+      config->dynamicBase = false;
     }
   }
 
   // Handle /appcontainer
-  Config->AppContainer =
-      Args.hasFlag(OPT_appcontainer, OPT_appcontainer_no, false);
+  config->appContainer =
+      args.hasFlag(OPT_appcontainer, OPT_appcontainer_no, false);
 
   // Handle /machine
-  if (auto *Arg = Args.getLastArg(OPT_machine))
-    Config->Machine = getMachineType(Arg->getValue());
+  if (auto *arg = args.getLastArg(OPT_machine)) {
+    config->machine = getMachineType(arg->getValue());
+    if (config->machine == IMAGE_FILE_MACHINE_UNKNOWN)
+      fatal(Twine("unknown /machine argument: ") + arg->getValue());
+  }
 
   // Handle /nodefaultlib:<filename>
-  for (auto *Arg : Args.filtered(OPT_nodefaultlib))
-    Config->NoDefaultLibs.insert(doFindLib(Arg->getValue()));
+  for (auto *arg : args.filtered(OPT_nodefaultlib))
+    config->noDefaultLibs.insert(doFindLib(arg->getValue()).lower());
 
   // Handle /nodefaultlib
-  if (Args.hasArg(OPT_nodefaultlib_all))
-    Config->NoDefaultLibAll = true;
+  if (args.hasArg(OPT_nodefaultlib_all))
+    config->noDefaultLibAll = true;
 
   // Handle /base
-  if (auto *Arg = Args.getLastArg(OPT_base))
-    parseNumbers(Arg->getValue(), &Config->ImageBase);
+  if (auto *arg = args.getLastArg(OPT_base))
+    parseNumbers(arg->getValue(), &config->imageBase);
+
+  // Handle /filealign
+  if (auto *arg = args.getLastArg(OPT_filealign)) {
+    parseNumbers(arg->getValue(), &config->fileAlign);
+    if (!isPowerOf2_64(config->fileAlign))
+      error("/filealign: not a power of two: " + Twine(config->fileAlign));
+  }
 
   // Handle /stack
-  if (auto *Arg = Args.getLastArg(OPT_stack))
-    parseNumbers(Arg->getValue(), &Config->StackReserve, &Config->StackCommit);
+  if (auto *arg = args.getLastArg(OPT_stack))
+    parseNumbers(arg->getValue(), &config->stackReserve, &config->stackCommit);
 
   // Handle /guard:cf
-  if (auto *Arg = Args.getLastArg(OPT_guard))
-    parseGuard(Arg->getValue());
+  if (auto *arg = args.getLastArg(OPT_guard))
+    parseGuard(arg->getValue());
 
   // Handle /heap
-  if (auto *Arg = Args.getLastArg(OPT_heap))
-    parseNumbers(Arg->getValue(), &Config->HeapReserve, &Config->HeapCommit);
+  if (auto *arg = args.getLastArg(OPT_heap))
+    parseNumbers(arg->getValue(), &config->heapReserve, &config->heapCommit);
 
   // Handle /version
-  if (auto *Arg = Args.getLastArg(OPT_version))
-    parseVersion(Arg->getValue(), &Config->MajorImageVersion,
-                 &Config->MinorImageVersion);
+  if (auto *arg = args.getLastArg(OPT_version))
+    parseVersion(arg->getValue(), &config->majorImageVersion,
+                 &config->minorImageVersion);
 
   // Handle /subsystem
-  if (auto *Arg = Args.getLastArg(OPT_subsystem))
-    parseSubsystem(Arg->getValue(), &Config->Subsystem, &Config->MajorOSVersion,
-                   &Config->MinorOSVersion);
+  if (auto *arg = args.getLastArg(OPT_subsystem))
+    parseSubsystem(arg->getValue(), &config->subsystem, &config->majorOSVersion,
+                   &config->minorOSVersion);
 
   // Handle /timestamp
-  if (llvm::opt::Arg *Arg = Args.getLastArg(OPT_timestamp, OPT_repro)) {
-    if (Arg->getOption().getID() == OPT_repro) {
-      Config->Timestamp = 0;
-      Config->Repro = true;
+  if (llvm::opt::Arg *arg = args.getLastArg(OPT_timestamp, OPT_repro)) {
+    if (arg->getOption().getID() == OPT_repro) {
+      config->timestamp = 0;
+      config->repro = true;
     } else {
-      Config->Repro = false;
-      StringRef Value(Arg->getValue());
-      if (Value.getAsInteger(0, Config->Timestamp))
-        fatal(Twine("invalid timestamp: ") + Value +
+      config->repro = false;
+      StringRef value(arg->getValue());
+      if (value.getAsInteger(0, config->timestamp))
+        fatal(Twine("invalid timestamp: ") + value +
               ".  Expected 32-bit integer");
     }
   } else {
-    Config->Repro = false;
-    Config->Timestamp = time(nullptr);
+    config->repro = false;
+    config->timestamp = time(nullptr);
   }
 
   // Handle /alternatename
-  for (auto *Arg : Args.filtered(OPT_alternatename))
-    parseAlternateName(Arg->getValue());
+  for (auto *arg : args.filtered(OPT_alternatename))
+    parseAlternateName(arg->getValue());
 
   // Handle /include
-  for (auto *Arg : Args.filtered(OPT_incl))
-    addUndefined(Arg->getValue());
+  for (auto *arg : args.filtered(OPT_incl))
+    addUndefined(arg->getValue());
 
   // Handle /implib
-  if (auto *Arg = Args.getLastArg(OPT_implib))
-    Config->Implib = Arg->getValue();
+  if (auto *arg = args.getLastArg(OPT_implib))
+    config->implib = arg->getValue();
 
   // Handle /opt.
-  bool DoGC = Debug == DebugKind::None || Args.hasArg(OPT_profile);
-  unsigned ICFLevel =
-      Args.hasArg(OPT_profile) ? 0 : 1; // 0: off, 1: limited, 2: on
-  unsigned TailMerge = 1;
-  for (auto *Arg : Args.filtered(OPT_opt)) {
-    std::string Str = StringRef(Arg->getValue()).lower();
-    SmallVector<StringRef, 1> Vec;
-    StringRef(Str).split(Vec, ',');
-    for (StringRef S : Vec) {
-      if (S == "ref") {
-        DoGC = true;
-      } else if (S == "noref") {
-        DoGC = false;
-      } else if (S == "icf" || S.startswith("icf=")) {
-        ICFLevel = 2;
-      } else if (S == "noicf") {
-        ICFLevel = 0;
-      } else if (S == "lldtailmerge") {
-        TailMerge = 2;
-      } else if (S == "nolldtailmerge") {
-        TailMerge = 0;
-      } else if (S.startswith("lldlto=")) {
-        StringRef OptLevel = S.substr(7);
-        if (OptLevel.getAsInteger(10, Config->LTOO) || Config->LTOO > 3)
-          error("/opt:lldlto: invalid optimization level: " + OptLevel);
-      } else if (S.startswith("lldltojobs=")) {
-        StringRef Jobs = S.substr(11);
-        if (Jobs.getAsInteger(10, Config->ThinLTOJobs) ||
-            Config->ThinLTOJobs == 0)
-          error("/opt:lldltojobs: invalid job count: " + Jobs);
-      } else if (S.startswith("lldltopartitions=")) {
-        StringRef N = S.substr(17);
-        if (N.getAsInteger(10, Config->LTOPartitions) ||
-            Config->LTOPartitions == 0)
-          error("/opt:lldltopartitions: invalid partition count: " + N);
-      } else if (S != "lbr" && S != "nolbr")
-        error("/opt: unknown option: " + S);
+  bool doGC = debug == DebugKind::None || args.hasArg(OPT_profile);
+  unsigned icfLevel =
+      args.hasArg(OPT_profile) ? 0 : 1; // 0: off, 1: limited, 2: on
+  unsigned tailMerge = 1;
+  for (auto *arg : args.filtered(OPT_opt)) {
+    std::string str = StringRef(arg->getValue()).lower();
+    SmallVector<StringRef, 1> vec;
+    StringRef(str).split(vec, ',');
+    for (StringRef s : vec) {
+      if (s == "ref") {
+        doGC = true;
+      } else if (s == "noref") {
+        doGC = false;
+      } else if (s == "icf" || s.startswith("icf=")) {
+        icfLevel = 2;
+      } else if (s == "noicf") {
+        icfLevel = 0;
+      } else if (s == "lldtailmerge") {
+        tailMerge = 2;
+      } else if (s == "nolldtailmerge") {
+        tailMerge = 0;
+      } else if (s.startswith("lldlto=")) {
+        StringRef optLevel = s.substr(7);
+        if (optLevel.getAsInteger(10, config->ltoo) || config->ltoo > 3)
+          error("/opt:lldlto: invalid optimization level: " + optLevel);
+      } else if (s.startswith("lldltojobs=")) {
+        StringRef jobs = s.substr(11);
+        if (jobs.getAsInteger(10, config->thinLTOJobs) ||
+            config->thinLTOJobs == 0)
+          error("/opt:lldltojobs: invalid job count: " + jobs);
+      } else if (s.startswith("lldltopartitions=")) {
+        StringRef n = s.substr(17);
+        if (n.getAsInteger(10, config->ltoPartitions) ||
+            config->ltoPartitions == 0)
+          error("/opt:lldltopartitions: invalid partition count: " + n);
+      } else if (s != "lbr" && s != "nolbr")
+        error("/opt: unknown option: " + s);
     }
   }
 
@@ -1195,37 +1369,37 @@ void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
   // FIXME: LLD only implements "limited" ICF, i.e. it only merges identical
   // code. If the user passes /OPT:ICF explicitly, LLD should merge identical
   // comdat readonly data.
-  if (ICFLevel == 1 && !DoGC)
-    ICFLevel = 0;
-  Config->DoGC = DoGC;
-  Config->DoICF = ICFLevel > 0;
-  Config->TailMerge = (TailMerge == 1 && Config->DoICF) || TailMerge == 2;
+  if (icfLevel == 1 && !doGC)
+    icfLevel = 0;
+  config->doGC = doGC;
+  config->doICF = icfLevel > 0;
+  config->tailMerge = (tailMerge == 1 && config->doICF) || tailMerge == 2;
 
   // Handle /lldsavetemps
-  if (Args.hasArg(OPT_lldsavetemps))
-    Config->SaveTemps = true;
+  if (args.hasArg(OPT_lldsavetemps))
+    config->saveTemps = true;
 
   // Handle /kill-at
-  if (Args.hasArg(OPT_kill_at))
-    Config->KillAt = true;
+  if (args.hasArg(OPT_kill_at))
+    config->killAt = true;
 
   // Handle /lldltocache
-  if (auto *Arg = Args.getLastArg(OPT_lldltocache))
-    Config->LTOCache = Arg->getValue();
+  if (auto *arg = args.getLastArg(OPT_lldltocache))
+    config->ltoCache = arg->getValue();
 
   // Handle /lldsavecachepolicy
-  if (auto *Arg = Args.getLastArg(OPT_lldltocachepolicy))
-    Config->LTOCachePolicy = CHECK(
-        parseCachePruningPolicy(Arg->getValue()),
-        Twine("/lldltocachepolicy: invalid cache policy: ") + Arg->getValue());
+  if (auto *arg = args.getLastArg(OPT_lldltocachepolicy))
+    config->ltoCachePolicy = CHECK(
+        parseCachePruningPolicy(arg->getValue()),
+        Twine("/lldltocachepolicy: invalid cache policy: ") + arg->getValue());
 
   // Handle /failifmismatch
-  for (auto *Arg : Args.filtered(OPT_failifmismatch))
-    checkFailIfMismatch(Arg->getValue());
+  for (auto *arg : args.filtered(OPT_failifmismatch))
+    checkFailIfMismatch(arg->getValue(), nullptr);
 
   // Handle /merge
-  for (auto *Arg : Args.filtered(OPT_merge))
-    parseMerge(Arg->getValue());
+  for (auto *arg : args.filtered(OPT_merge))
+    parseMerge(arg->getValue());
 
   // Add default section merging rules after user rules. User rules take
   // precedence, but we will emit a warning if there is a conflict.
@@ -1235,130 +1409,137 @@ void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
   parseMerge(".xdata=.rdata");
   parseMerge(".bss=.data");
 
-  if (Config->MinGW) {
+  if (config->mingw) {
     parseMerge(".ctors=.rdata");
     parseMerge(".dtors=.rdata");
     parseMerge(".CRT=.rdata");
   }
 
   // Handle /section
-  for (auto *Arg : Args.filtered(OPT_section))
-    parseSection(Arg->getValue());
+  for (auto *arg : args.filtered(OPT_section))
+    parseSection(arg->getValue());
 
   // Handle /aligncomm
-  for (auto *Arg : Args.filtered(OPT_aligncomm))
-    parseAligncomm(Arg->getValue());
+  for (auto *arg : args.filtered(OPT_aligncomm))
+    parseAligncomm(arg->getValue());
 
   // Handle /manifestdependency. This enables /manifest unless /manifest:no is
   // also passed.
-  if (auto *Arg = Args.getLastArg(OPT_manifestdependency)) {
-    Config->ManifestDependency = Arg->getValue();
-    Config->Manifest = Configuration::SideBySide;
+  if (auto *arg = args.getLastArg(OPT_manifestdependency)) {
+    config->manifestDependency = arg->getValue();
+    config->manifest = Configuration::SideBySide;
   }
 
   // Handle /manifest and /manifest:
-  if (auto *Arg = Args.getLastArg(OPT_manifest, OPT_manifest_colon)) {
-    if (Arg->getOption().getID() == OPT_manifest)
-      Config->Manifest = Configuration::SideBySide;
+  if (auto *arg = args.getLastArg(OPT_manifest, OPT_manifest_colon)) {
+    if (arg->getOption().getID() == OPT_manifest)
+      config->manifest = Configuration::SideBySide;
     else
-      parseManifest(Arg->getValue());
+      parseManifest(arg->getValue());
   }
 
   // Handle /manifestuac
-  if (auto *Arg = Args.getLastArg(OPT_manifestuac))
-    parseManifestUAC(Arg->getValue());
+  if (auto *arg = args.getLastArg(OPT_manifestuac))
+    parseManifestUAC(arg->getValue());
 
   // Handle /manifestfile
-  if (auto *Arg = Args.getLastArg(OPT_manifestfile))
-    Config->ManifestFile = Arg->getValue();
+  if (auto *arg = args.getLastArg(OPT_manifestfile))
+    config->manifestFile = arg->getValue();
 
   // Handle /manifestinput
-  for (auto *Arg : Args.filtered(OPT_manifestinput))
-    Config->ManifestInput.push_back(Arg->getValue());
+  for (auto *arg : args.filtered(OPT_manifestinput))
+    config->manifestInput.push_back(arg->getValue());
 
-  if (!Config->ManifestInput.empty() &&
-      Config->Manifest != Configuration::Embed) {
+  if (!config->manifestInput.empty() &&
+      config->manifest != Configuration::Embed) {
     fatal("/manifestinput: requires /manifest:embed");
   }
 
+  config->thinLTOEmitImportsFiles = args.hasArg(OPT_thinlto_emit_imports_files);
+  config->thinLTOIndexOnly = args.hasArg(OPT_thinlto_index_only) ||
+                             args.hasArg(OPT_thinlto_index_only_arg);
+  config->thinLTOIndexOnlyArg =
+      args.getLastArgValue(OPT_thinlto_index_only_arg);
+  config->thinLTOPrefixReplace =
+      getOldNewOptions(args, OPT_thinlto_prefix_replace);
+  config->thinLTOObjectSuffixReplace =
+      getOldNewOptions(args, OPT_thinlto_object_suffix_replace);
   // Handle miscellaneous boolean flags.
-  Config->AllowBind = Args.hasFlag(OPT_allowbind, OPT_allowbind_no, true);
-  Config->AllowIsolation =
-      Args.hasFlag(OPT_allowisolation, OPT_allowisolation_no, true);
-  Config->Incremental =
-      Args.hasFlag(OPT_incremental, OPT_incremental_no,
-                   !Config->DoGC && !Config->DoICF && !Args.hasArg(OPT_order) &&
-                       !Args.hasArg(OPT_profile));
-  Config->IntegrityCheck =
-      Args.hasFlag(OPT_integritycheck, OPT_integritycheck_no, false);
-  Config->NxCompat = Args.hasFlag(OPT_nxcompat, OPT_nxcompat_no, true);
-  Config->TerminalServerAware =
-      !Config->DLL && Args.hasFlag(OPT_tsaware, OPT_tsaware_no, true);
-  Config->DebugDwarf = Debug == DebugKind::Dwarf;
-  Config->DebugGHashes = Debug == DebugKind::GHash;
-  Config->DebugSymtab = Debug == DebugKind::Symtab;
+  config->allowBind = args.hasFlag(OPT_allowbind, OPT_allowbind_no, true);
+  config->allowIsolation =
+      args.hasFlag(OPT_allowisolation, OPT_allowisolation_no, true);
+  config->incremental =
+      args.hasFlag(OPT_incremental, OPT_incremental_no,
+                   !config->doGC && !config->doICF && !args.hasArg(OPT_order) &&
+                       !args.hasArg(OPT_profile));
+  config->integrityCheck =
+      args.hasFlag(OPT_integritycheck, OPT_integritycheck_no, false);
+  config->nxCompat = args.hasFlag(OPT_nxcompat, OPT_nxcompat_no, true);
+  for (auto *arg : args.filtered(OPT_swaprun))
+    parseSwaprun(arg->getValue());
+  config->terminalServerAware =
+      !config->dll && args.hasFlag(OPT_tsaware, OPT_tsaware_no, true);
+  config->debugDwarf = debug == DebugKind::Dwarf;
+  config->debugGHashes = debug == DebugKind::GHash;
+  config->debugSymtab = debug == DebugKind::Symtab;
 
-  Config->MapFile = getMapFile(Args);
+  config->mapFile = getMapFile(args);
 
-  if (Config->Incremental && Args.hasArg(OPT_profile)) {
+  if (config->incremental && args.hasArg(OPT_profile)) {
     warn("ignoring '/incremental' due to '/profile' specification");
-    Config->Incremental = false;
+    config->incremental = false;
   }
 
-  if (Config->Incremental && Args.hasArg(OPT_order)) {
+  if (config->incremental && args.hasArg(OPT_order)) {
     warn("ignoring '/incremental' due to '/order' specification");
-    Config->Incremental = false;
+    config->incremental = false;
   }
 
-  if (Config->Incremental && Config->DoGC) {
+  if (config->incremental && config->doGC) {
     warn("ignoring '/incremental' because REF is enabled; use '/opt:noref' to "
          "disable");
-    Config->Incremental = false;
+    config->incremental = false;
   }
 
-  if (Config->Incremental && Config->DoICF) {
+  if (config->incremental && config->doICF) {
     warn("ignoring '/incremental' because ICF is enabled; use '/opt:noicf' to "
          "disable");
-    Config->Incremental = false;
+    config->incremental = false;
   }
 
   if (errorCount())
     return;
 
-  std::set<sys::fs::UniqueID> WholeArchives;
-  AutoExporter Exporter;
-  for (auto *Arg : Args.filtered(OPT_wholearchive_file)) {
-    if (Optional<StringRef> Path = doFindFile(Arg->getValue())) {
-      if (Optional<sys::fs::UniqueID> ID = getUniqueID(*Path))
-        WholeArchives.insert(*ID);
-      Exporter.addWholeArchive(*Path);
-    }
-  }
+  std::set<sys::fs::UniqueID> wholeArchives;
+  for (auto *arg : args.filtered(OPT_wholearchive_file))
+    if (Optional<StringRef> path = doFindFile(arg->getValue()))
+      if (Optional<sys::fs::UniqueID> id = getUniqueID(*path))
+        wholeArchives.insert(*id);
 
   // A predicate returning true if a given path is an argument for
   // /wholearchive:, or /wholearchive is enabled globally.
   // This function is a bit tricky because "foo.obj /wholearchive:././foo.obj"
   // needs to be handled as "/wholearchive:foo.obj foo.obj".
-  auto IsWholeArchive = [&](StringRef Path) -> bool {
-    if (Args.hasArg(OPT_wholearchive_flag))
+  auto isWholeArchive = [&](StringRef path) -> bool {
+    if (args.hasArg(OPT_wholearchive_flag))
       return true;
-    if (Optional<sys::fs::UniqueID> ID = getUniqueID(Path))
-      return WholeArchives.count(*ID);
+    if (Optional<sys::fs::UniqueID> id = getUniqueID(path))
+      return wholeArchives.count(*id);
     return false;
   };
 
   // Create a list of input files. Files can be given as arguments
   // for /defaultlib option.
-  for (auto *Arg : Args.filtered(OPT_INPUT, OPT_wholearchive_file))
-    if (Optional<StringRef> Path = findFile(Arg->getValue()))
-      enqueuePath(*Path, IsWholeArchive(*Path));
+  for (auto *arg : args.filtered(OPT_INPUT, OPT_wholearchive_file))
+    if (Optional<StringRef> path = findFile(arg->getValue()))
+      enqueuePath(*path, isWholeArchive(*path));
 
-  for (auto *Arg : Args.filtered(OPT_defaultlib))
-    if (Optional<StringRef> Path = findLib(Arg->getValue()))
-      enqueuePath(*Path, false);
+  for (auto *arg : args.filtered(OPT_defaultlib))
+    if (Optional<StringRef> path = findLib(arg->getValue()))
+      enqueuePath(*path, false);
 
   // Windows specific -- Create a resource file containing a manifest file.
-  if (Config->Manifest == Configuration::Embed)
+  if (config->manifest == Configuration::Embed)
     addBuffer(createManifestRes(), false);
 
   // Read all input files given via the command line.
@@ -1369,154 +1550,169 @@ void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
 
   // We should have inferred a machine type by now from the input files, but if
   // not we assume x64.
-  if (Config->Machine == IMAGE_FILE_MACHINE_UNKNOWN) {
+  if (config->machine == IMAGE_FILE_MACHINE_UNKNOWN) {
     warn("/machine is not specified. x64 is assumed");
-    Config->Machine = AMD64;
+    config->machine = AMD64;
   }
-  Config->Wordsize = Config->is64() ? 8 : 4;
+  config->wordsize = config->is64() ? 8 : 4;
+
+  // Handle /safeseh, x86 only, on by default, except for mingw.
+  if (config->machine == I386 &&
+      args.hasFlag(OPT_safeseh, OPT_safeseh_no, !config->mingw))
+    config->safeSEH = true;
+
+  // Handle /functionpadmin
+  for (auto *arg : args.filtered(OPT_functionpadmin, OPT_functionpadmin_opt))
+    parseFunctionPadMin(arg, config->machine);
 
   // Input files can be Windows resource files (.res files). We use
   // WindowsResource to convert resource files to a regular COFF file,
   // then link the resulting file normally.
-  if (!Resources.empty())
-    Symtab->addFile(make<ObjFile>(convertResToCOFF(Resources)));
+  if (!resources.empty())
+    symtab->addFile(make<ObjFile>(convertResToCOFF(resources)));
 
-  if (Tar)
-    Tar->append("response.txt",
-                createResponseFile(Args, FilePaths,
-                                   ArrayRef<StringRef>(SearchPaths).slice(1)));
+  if (tar)
+    tar->append("response.txt",
+                createResponseFile(args, filePaths,
+                                   ArrayRef<StringRef>(searchPaths).slice(1)));
 
   // Handle /largeaddressaware
-  Config->LargeAddressAware = Args.hasFlag(
-      OPT_largeaddressaware, OPT_largeaddressaware_no, Config->is64());
+  config->largeAddressAware = args.hasFlag(
+      OPT_largeaddressaware, OPT_largeaddressaware_no, config->is64());
 
   // Handle /highentropyva
-  Config->HighEntropyVA =
-      Config->is64() &&
-      Args.hasFlag(OPT_highentropyva, OPT_highentropyva_no, true);
+  config->highEntropyVA =
+      config->is64() &&
+      args.hasFlag(OPT_highentropyva, OPT_highentropyva_no, true);
 
-  if (!Config->DynamicBase &&
-      (Config->Machine == ARMNT || Config->Machine == ARM64))
+  if (!config->dynamicBase &&
+      (config->machine == ARMNT || config->machine == ARM64))
     error("/dynamicbase:no is not compatible with " +
-          machineToStr(Config->Machine));
+          machineToStr(config->machine));
 
   // Handle /export
-  for (auto *Arg : Args.filtered(OPT_export)) {
-    Export E = parseExport(Arg->getValue());
-    if (Config->Machine == I386) {
-      if (!isDecorated(E.Name))
-        E.Name = Saver.save("_" + E.Name);
-      if (!E.ExtName.empty() && !isDecorated(E.ExtName))
-        E.ExtName = Saver.save("_" + E.ExtName);
+  for (auto *arg : args.filtered(OPT_export)) {
+    Export e = parseExport(arg->getValue());
+    if (config->machine == I386) {
+      if (!isDecorated(e.name))
+        e.name = saver.save("_" + e.name);
+      if (!e.extName.empty() && !isDecorated(e.extName))
+        e.extName = saver.save("_" + e.extName);
     }
-    Config->Exports.push_back(E);
+    config->exports.push_back(e);
   }
 
   // Handle /def
-  if (auto *Arg = Args.getLastArg(OPT_deffile)) {
+  if (auto *arg = args.getLastArg(OPT_deffile)) {
     // parseModuleDefs mutates Config object.
-    parseModuleDefs(Arg->getValue());
+    parseModuleDefs(arg->getValue());
   }
 
   // Handle generation of import library from a def file.
-  if (!Args.hasArg(OPT_INPUT)) {
+  if (!args.hasArg(OPT_INPUT)) {
     fixupExports();
-    createImportLibrary(/*AsLib=*/true);
+    createImportLibrary(/*asLib=*/true);
     return;
   }
 
   // Windows specific -- if no /subsystem is given, we need to infer
   // that from entry point name.  Must happen before /entry handling,
   // and after the early return when just writing an import library.
-  if (Config->Subsystem == IMAGE_SUBSYSTEM_UNKNOWN) {
-    Config->Subsystem = inferSubsystem();
-    if (Config->Subsystem == IMAGE_SUBSYSTEM_UNKNOWN)
+  if (config->subsystem == IMAGE_SUBSYSTEM_UNKNOWN) {
+    config->subsystem = inferSubsystem();
+    if (config->subsystem == IMAGE_SUBSYSTEM_UNKNOWN)
       fatal("subsystem must be defined");
   }
 
   // Handle /entry and /dll
-  if (auto *Arg = Args.getLastArg(OPT_entry)) {
-    Config->Entry = addUndefined(mangle(Arg->getValue()));
-  } else if (!Config->Entry && !Config->NoEntry) {
-    if (Args.hasArg(OPT_dll)) {
-      StringRef S = (Config->Machine == I386) ? "__DllMainCRTStartup@12"
+  if (auto *arg = args.getLastArg(OPT_entry)) {
+    config->entry = addUndefined(mangle(arg->getValue()));
+  } else if (!config->entry && !config->noEntry) {
+    if (args.hasArg(OPT_dll)) {
+      StringRef s = (config->machine == I386) ? "__DllMainCRTStartup@12"
                                               : "_DllMainCRTStartup";
-      Config->Entry = addUndefined(S);
+      config->entry = addUndefined(s);
     } else {
       // Windows specific -- If entry point name is not given, we need to
       // infer that from user-defined entry name.
-      StringRef S = findDefaultEntry();
-      if (S.empty())
+      StringRef s = findDefaultEntry();
+      if (s.empty())
         fatal("entry point must be defined");
-      Config->Entry = addUndefined(S);
-      log("Entry name inferred: " + S);
+      config->entry = addUndefined(s);
+      log("Entry name inferred: " + s);
     }
   }
 
   // Handle /delayload
-  for (auto *Arg : Args.filtered(OPT_delayload)) {
-    Config->DelayLoads.insert(StringRef(Arg->getValue()).lower());
-    if (Config->Machine == I386) {
-      Config->DelayLoadHelper = addUndefined("___delayLoadHelper2@8");
+  for (auto *arg : args.filtered(OPT_delayload)) {
+    config->delayLoads.insert(StringRef(arg->getValue()).lower());
+    if (config->machine == I386) {
+      config->delayLoadHelper = addUndefined("___delayLoadHelper2@8");
     } else {
-      Config->DelayLoadHelper = addUndefined("__delayLoadHelper2");
+      config->delayLoadHelper = addUndefined("__delayLoadHelper2");
     }
   }
 
   // Set default image name if neither /out or /def set it.
-  if (Config->OutputFile.empty()) {
-    Config->OutputFile =
-        getOutputPath((*Args.filtered(OPT_INPUT).begin())->getValue());
+  if (config->outputFile.empty()) {
+    config->outputFile =
+        getOutputPath((*args.filtered(OPT_INPUT).begin())->getValue());
   }
 
-  if (ShouldCreatePDB) {
+  // Fail early if an output file is not writable.
+  if (auto e = tryCreateFile(config->outputFile)) {
+    error("cannot open output file " + config->outputFile + ": " + e.message());
+    return;
+  }
+
+  if (shouldCreatePDB) {
     // Put the PDB next to the image if no /pdb flag was passed.
-    if (Config->PDBPath.empty()) {
-      Config->PDBPath = Config->OutputFile;
-      sys::path::replace_extension(Config->PDBPath, ".pdb");
+    if (config->pdbPath.empty()) {
+      config->pdbPath = config->outputFile;
+      sys::path::replace_extension(config->pdbPath, ".pdb");
     }
 
     // The embedded PDB path should be the absolute path to the PDB if no
     // /pdbaltpath flag was passed.
-    if (Config->PDBAltPath.empty()) {
-      Config->PDBAltPath = Config->PDBPath;
+    if (config->pdbAltPath.empty()) {
+      config->pdbAltPath = config->pdbPath;
 
       // It's important to make the path absolute and remove dots.  This path
       // will eventually be written into the PE header, and certain Microsoft
       // tools won't work correctly if these assumptions are not held.
-      sys::fs::make_absolute(Config->PDBAltPath);
-      sys::path::remove_dots(Config->PDBAltPath);
+      sys::fs::make_absolute(config->pdbAltPath);
+      sys::path::remove_dots(config->pdbAltPath);
     } else {
       // Don't do this earlier, so that Config->OutputFile is ready.
-      parsePDBAltPath(Config->PDBAltPath);
+      parsePDBAltPath(config->pdbAltPath);
     }
   }
 
   // Set default image base if /base is not given.
-  if (Config->ImageBase == uint64_t(-1))
-    Config->ImageBase = getDefaultImageBase();
+  if (config->imageBase == uint64_t(-1))
+    config->imageBase = getDefaultImageBase();
 
-  Symtab->addSynthetic(mangle("__ImageBase"), nullptr);
-  if (Config->Machine == I386) {
-    Symtab->addAbsolute("___safe_se_handler_table", 0);
-    Symtab->addAbsolute("___safe_se_handler_count", 0);
+  symtab->addSynthetic(mangle("__ImageBase"), nullptr);
+  if (config->machine == I386) {
+    symtab->addAbsolute("___safe_se_handler_table", 0);
+    symtab->addAbsolute("___safe_se_handler_count", 0);
   }
 
-  Symtab->addAbsolute(mangle("__guard_fids_count"), 0);
-  Symtab->addAbsolute(mangle("__guard_fids_table"), 0);
-  Symtab->addAbsolute(mangle("__guard_flags"), 0);
-  Symtab->addAbsolute(mangle("__guard_iat_count"), 0);
-  Symtab->addAbsolute(mangle("__guard_iat_table"), 0);
-  Symtab->addAbsolute(mangle("__guard_longjmp_count"), 0);
-  Symtab->addAbsolute(mangle("__guard_longjmp_table"), 0);
+  symtab->addAbsolute(mangle("__guard_fids_count"), 0);
+  symtab->addAbsolute(mangle("__guard_fids_table"), 0);
+  symtab->addAbsolute(mangle("__guard_flags"), 0);
+  symtab->addAbsolute(mangle("__guard_iat_count"), 0);
+  symtab->addAbsolute(mangle("__guard_iat_table"), 0);
+  symtab->addAbsolute(mangle("__guard_longjmp_count"), 0);
+  symtab->addAbsolute(mangle("__guard_longjmp_table"), 0);
   // Needed for MSVC 2017 15.5 CRT.
-  Symtab->addAbsolute(mangle("__enclave_config"), 0);
+  symtab->addAbsolute(mangle("__enclave_config"), 0);
 
-  if (Config->MinGW) {
-    Symtab->addAbsolute(mangle("__RUNTIME_PSEUDO_RELOC_LIST__"), 0);
-    Symtab->addAbsolute(mangle("__RUNTIME_PSEUDO_RELOC_LIST_END__"), 0);
-    Symtab->addAbsolute(mangle("__CTOR_LIST__"), 0);
-    Symtab->addAbsolute(mangle("__DTOR_LIST__"), 0);
+  if (config->mingw) {
+    symtab->addAbsolute(mangle("__RUNTIME_PSEUDO_RELOC_LIST__"), 0);
+    symtab->addAbsolute(mangle("__RUNTIME_PSEUDO_RELOC_LIST_END__"), 0);
+    symtab->addAbsolute(mangle("__CTOR_LIST__"), 0);
+    symtab->addAbsolute(mangle("__DTOR_LIST__"), 0);
   }
 
   // This code may add new undefined symbols to the link, which may enqueue more
@@ -1525,33 +1721,33 @@ void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
   do {
     // Windows specific -- if entry point is not found,
     // search for its mangled names.
-    if (Config->Entry)
-      Symtab->mangleMaybe(Config->Entry);
+    if (config->entry)
+      mangleMaybe(config->entry);
 
     // Windows specific -- Make sure we resolve all dllexported symbols.
-    for (Export &E : Config->Exports) {
-      if (!E.ForwardTo.empty())
+    for (Export &e : config->exports) {
+      if (!e.forwardTo.empty())
         continue;
-      E.Sym = addUndefined(E.Name);
-      if (!E.Directives)
-        Symtab->mangleMaybe(E.Sym);
+      e.sym = addUndefined(e.name);
+      if (!e.directives)
+        e.symbolName = mangleMaybe(e.sym);
     }
 
     // Add weak aliases. Weak aliases is a mechanism to give remaining
     // undefined symbols final chance to be resolved successfully.
-    for (auto Pair : Config->AlternateNames) {
-      StringRef From = Pair.first;
-      StringRef To = Pair.second;
-      Symbol *Sym = Symtab->find(From);
-      if (!Sym)
+    for (auto pair : config->alternateNames) {
+      StringRef from = pair.first;
+      StringRef to = pair.second;
+      Symbol *sym = symtab->find(from);
+      if (!sym)
         continue;
-      if (auto *U = dyn_cast<Undefined>(Sym))
-        if (!U->WeakAlias)
-          U->WeakAlias = Symtab->addUndefined(To);
+      if (auto *u = dyn_cast<Undefined>(sym))
+        if (!u->weakAlias)
+          u->weakAlias = symtab->addUndefined(to);
     }
 
     // Windows specific -- if __load_config_used can be resolved, resolve it.
-    if (Symtab->findUnderscore("_load_config_used"))
+    if (symtab->findUnderscore("_load_config_used"))
       addUndefined(mangle("_load_config_used"));
   } while (run());
 
@@ -1559,11 +1755,29 @@ void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
     return;
 
   // Do LTO by compiling bitcode input files to a set of native COFF files then
-  // link those files.
-  Symtab->addCombinedLTOObjects();
+  // link those files (unless -thinlto-index-only was given, in which case we
+  // resolve symbols and write indices, but don't generate native code or link).
+  symtab->addCombinedLTOObjects();
+
+  // If -thinlto-index-only is given, we should create only "index
+  // files" and not object files. Index file creation is already done
+  // in addCombinedLTOObject, so we are done if that's the case.
+  if (config->thinLTOIndexOnly)
+    return;
+
+  // If we generated native object files from bitcode files, this resolves
+  // references to the symbols we use from them.
   run();
 
-  if (Config->MinGW) {
+  if (args.hasArg(OPT_include_optional)) {
+    // Handle /includeoptional
+    for (auto *arg : args.filtered(OPT_include_optional))
+      if (dyn_cast_or_null<Lazy>(symtab->find(arg->getValue())))
+        addUndefined(arg->getValue());
+    while (run());
+  }
+
+  if (config->mingw) {
     // Load any further object files that might be needed for doing automatic
     // imports.
     //
@@ -1577,95 +1791,91 @@ void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
     // normal object file as well (although that won't be used for the
     // actual autoimport later on). If this pass adds new undefined references,
     // we won't iterate further to resolve them.
-    Symtab->loadMinGWAutomaticImports();
+    symtab->loadMinGWAutomaticImports();
     run();
   }
 
   // Make sure we have resolved all symbols.
-  Symtab->reportRemainingUndefines();
+  symtab->reportRemainingUndefines();
   if (errorCount())
     return;
 
-  // Handle /safeseh.
-  if (Args.hasFlag(OPT_safeseh, OPT_safeseh_no, false)) {
-    for (ObjFile *File : ObjFile::Instances)
-      if (!File->hasSafeSEH())
-        error("/safeseh: " + File->getName() + " is not compatible with SEH");
-    if (errorCount())
-      return;
-  }
+  if (config->mingw) {
+    // In MinGW, all symbols are automatically exported if no symbols
+    // are chosen to be exported.
+    maybeExportMinGWSymbols(args);
 
-  // In MinGW, all symbols are automatically exported if no symbols
-  // are chosen to be exported.
-  if (Config->DLL && ((Config->MinGW && Config->Exports.empty()) ||
-                      Args.hasArg(OPT_export_all_symbols))) {
-    Exporter.initSymbolExcludes();
-
-    Symtab->forEachSymbol([=](Symbol *S) {
-      auto *Def = dyn_cast<Defined>(S);
-      if (!Exporter.shouldExport(Def))
-        return;
-      Export E;
-      E.Name = Def->getName();
-      E.Sym = Def;
-      if (Def->getChunk() &&
-          !(Def->getChunk()->getOutputCharacteristics() & IMAGE_SCN_MEM_EXECUTE))
-        E.Data = true;
-      Config->Exports.push_back(E);
-    });
+    // Make sure the crtend.o object is the last object file. This object
+    // file can contain terminating section chunks that need to be placed
+    // last. GNU ld processes files and static libraries explicitly in the
+    // order provided on the command line, while lld will pull in needed
+    // files from static libraries only after the last object file on the
+    // command line.
+    for (auto i = ObjFile::instances.begin(), e = ObjFile::instances.end();
+         i != e; i++) {
+      ObjFile *file = *i;
+      if (isCrtend(file->getName())) {
+        ObjFile::instances.erase(i);
+        ObjFile::instances.push_back(file);
+        break;
+      }
+    }
   }
 
   // Windows specific -- when we are creating a .dll file, we also
   // need to create a .lib file.
-  if (!Config->Exports.empty() || Config->DLL) {
+  if (!config->exports.empty() || config->dll) {
     fixupExports();
-    createImportLibrary(/*AsLib=*/false);
+    createImportLibrary(/*asLib=*/false);
     assignExportOrdinals();
   }
 
   // Handle /output-def (MinGW specific).
-  if (auto *Arg = Args.getLastArg(OPT_output_def))
-    writeDefFile(Arg->getValue());
+  if (auto *arg = args.getLastArg(OPT_output_def))
+    writeDefFile(arg->getValue());
 
   // Set extra alignment for .comm symbols
-  for (auto Pair : Config->AlignComm) {
-    StringRef Name = Pair.first;
-    uint32_t Alignment = Pair.second;
+  for (auto pair : config->alignComm) {
+    StringRef name = pair.first;
+    uint32_t alignment = pair.second;
 
-    Symbol *Sym = Symtab->find(Name);
-    if (!Sym) {
-      warn("/aligncomm symbol " + Name + " not found");
+    Symbol *sym = symtab->find(name);
+    if (!sym) {
+      warn("/aligncomm symbol " + name + " not found");
       continue;
     }
 
     // If the symbol isn't common, it must have been replaced with a regular
     // symbol, which will carry its own alignment.
-    auto *DC = dyn_cast<DefinedCommon>(Sym);
-    if (!DC)
+    auto *dc = dyn_cast<DefinedCommon>(sym);
+    if (!dc)
       continue;
 
-    CommonChunk *C = DC->getChunk();
-    C->Alignment = std::max(C->Alignment, Alignment);
+    CommonChunk *c = dc->getChunk();
+    c->setAlignment(std::max(c->getAlignment(), alignment));
   }
 
   // Windows specific -- Create a side-by-side manifest file.
-  if (Config->Manifest == Configuration::SideBySide)
+  if (config->manifest == Configuration::SideBySide)
     createSideBySideManifest();
 
   // Handle /order. We want to do this at this moment because we
   // need a complete list of comdat sections to warn on nonexistent
   // functions.
-  if (auto *Arg = Args.getLastArg(OPT_order))
-    parseOrderFile(Arg->getValue());
+  if (auto *arg = args.getLastArg(OPT_order))
+    parseOrderFile(arg->getValue());
 
   // Identify unreferenced COMDAT sections.
-  if (Config->DoGC)
-    markLive(Symtab->getChunks());
+  if (config->doGC)
+    markLive(symtab->getChunks());
+
+  // Needs to happen after the last call to addFile().
+  diagnoseMultipleResourceObjFiles();
 
   // Identify identical COMDAT sections to merge them.
-  if (Config->DoICF) {
+  if (config->doICF) {
     findKeepUniqueSections();
-    doICF(Symtab->getChunks());
+    doICF(symtab->getChunks());
   }
 
   // Write the result.
@@ -1673,7 +1883,7 @@ void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
 
   // Stop early so we can print the results.
   Timer::root().stop();
-  if (Config->ShowTiming)
+  if (config->showTiming)
     Timer::root().print();
 }
 
diff --git a/deps/lld/COFF/Driver.h b/deps/lld/COFF/Driver.h
index e779721ab75d7075c12e06d091c8992f1e2e5a8b..6100c3ca0c9e8e1bb35124b76b917cbaf027b0f6 100644
--- a/deps/lld/COFF/Driver.h
+++ b/deps/lld/COFF/Driver.h
@@ -1,9 +1,8 @@
 //===- Driver.h -------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -31,7 +30,7 @@ namespace lld {
 namespace coff {
 
 class LinkerDriver;
-extern LinkerDriver *Driver;
+extern LinkerDriver *driver;
 
 using llvm::COFF::MachineTypes;
 using llvm::COFF::WindowsSubsystem;
@@ -45,65 +44,71 @@ public:
 class ArgParser {
 public:
   // Concatenate LINK environment variable and given arguments and parse them.
-  llvm::opt::InputArgList parseLINK(std::vector<const char *> Args);
+  llvm::opt::InputArgList parseLINK(std::vector<const char *> args);
 
   // Tokenizes a given string and then parses as command line options.
-  llvm::opt::InputArgList parse(StringRef S) { return parse(tokenize(S)); }
+  llvm::opt::InputArgList parse(StringRef s) { return parse(tokenize(s)); }
 
   // Tokenizes a given string and then parses as command line options in
   // .drectve section. /EXPORT options are returned in second element
   // to be processed in fastpath.
   std::pair<llvm::opt::InputArgList, std::vector<StringRef>>
-  parseDirectives(StringRef S);
+  parseDirectives(StringRef s);
 
 private:
   // Parses command line options.
-  llvm::opt::InputArgList parse(llvm::ArrayRef<const char *> Args);
+  llvm::opt::InputArgList parse(llvm::ArrayRef<const char *> args);
 
-  std::vector<const char *> tokenize(StringRef S);
+  std::vector<const char *> tokenize(StringRef s);
 
-  COFFOptTable Table;
+  COFFOptTable table;
 };
 
 class LinkerDriver {
 public:
-  void link(llvm::ArrayRef<const char *> Args);
+  void link(llvm::ArrayRef<const char *> args);
 
   // Used by the resolver to parse .drectve section contents.
-  void parseDirectives(StringRef S);
+  void parseDirectives(InputFile *file);
 
   // Used by ArchiveFile to enqueue members.
-  void enqueueArchiveMember(const Archive::Child &C, StringRef SymName,
-                            StringRef ParentName);
+  void enqueueArchiveMember(const Archive::Child &c, StringRef symName,
+                            StringRef parentName);
 
-  MemoryBufferRef takeBuffer(std::unique_ptr<MemoryBuffer> MB);
+  MemoryBufferRef takeBuffer(std::unique_ptr<MemoryBuffer> mb);
+
+  void enqueuePath(StringRef path, bool wholeArchive);
 
 private:
-  std::unique_ptr<llvm::TarWriter> Tar; // for /linkrepro
+  std::unique_ptr<llvm::TarWriter> tar; // for /linkrepro
 
   // Opens a file. Path has to be resolved already.
-  MemoryBufferRef openFile(StringRef Path);
+  MemoryBufferRef openFile(StringRef path);
 
   // Searches a file from search paths.
-  Optional<StringRef> findFile(StringRef Filename);
-  Optional<StringRef> findLib(StringRef Filename);
-  StringRef doFindFile(StringRef Filename);
-  StringRef doFindLib(StringRef Filename);
-  StringRef doFindLibMinGW(StringRef Filename);
+  Optional<StringRef> findFile(StringRef filename);
+  Optional<StringRef> findLib(StringRef filename);
+  StringRef doFindFile(StringRef filename);
+  StringRef doFindLib(StringRef filename);
+  StringRef doFindLibMinGW(StringRef filename);
 
   // Parses LIB environment which contains a list of search paths.
   void addLibSearchPaths();
 
   // Library search path. The first element is always "" (current directory).
-  std::vector<StringRef> SearchPaths;
+  std::vector<StringRef> searchPaths;
+
+  void maybeExportMinGWSymbols(const llvm::opt::InputArgList &args);
 
   // We don't want to add the same file more than once.
   // Files are uniquified by their filesystem and file number.
-  std::set<llvm::sys::fs::UniqueID> VisitedFiles;
+  std::set<llvm::sys::fs::UniqueID> visitedFiles;
 
-  std::set<std::string> VisitedLibs;
+  std::set<std::string> visitedLibs;
 
-  Symbol *addUndefined(StringRef Sym);
+  Symbol *addUndefined(StringRef sym);
+
+  StringRef mangleMaybe(Symbol *s);
 
   // Windows specific -- "main" is not the only main function in Windows.
   // You can choose one from these four -- {w,}{WinMain,main}.
@@ -115,60 +120,60 @@ private:
   StringRef findDefaultEntry();
   WindowsSubsystem inferSubsystem();
 
-  void addBuffer(std::unique_ptr<MemoryBuffer> MB, bool WholeArchive);
-  void addArchiveBuffer(MemoryBufferRef MBRef, StringRef SymName,
-                        StringRef ParentName);
+  void addBuffer(std::unique_ptr<MemoryBuffer> mb, bool wholeArchive);
+  void addArchiveBuffer(MemoryBufferRef mbref, StringRef symName,
+                        StringRef parentName, uint64_t offsetInArchive);
 
-  void enqueuePath(StringRef Path, bool WholeArchive);
-
-  void enqueueTask(std::function<void()> Task);
+  void enqueueTask(std::function<void()> task);
   bool run();
 
-  std::list<std::function<void()>> TaskQueue;
-  std::vector<StringRef> FilePaths;
-  std::vector<MemoryBufferRef> Resources;
+  std::list<std::function<void()>> taskQueue;
+  std::vector<StringRef> filePaths;
+  std::vector<MemoryBufferRef> resources;
 
-  llvm::StringSet<> DirectivesExports;
+  llvm::StringSet<> directivesExports;
 };
 
 // Functions below this line are defined in DriverUtils.cpp.
 
-void printHelp(const char *Argv0);
-
-// For /machine option.
-MachineTypes getMachineType(StringRef Arg);
-StringRef machineToStr(MachineTypes MT);
+void printHelp(const char *argv0);
 
 // Parses a string in the form of "<integer>[,<integer>]".
-void parseNumbers(StringRef Arg, uint64_t *Addr, uint64_t *Size = nullptr);
+void parseNumbers(StringRef arg, uint64_t *addr, uint64_t *size = nullptr);
 
-void parseGuard(StringRef Arg);
+void parseGuard(StringRef arg);
 
 // Parses a string in the form of "<integer>[.<integer>]".
 // Minor's default value is 0.
-void parseVersion(StringRef Arg, uint32_t *Major, uint32_t *Minor);
+void parseVersion(StringRef arg, uint32_t *major, uint32_t *minor);
 
 // Parses a string in the form of "<subsystem>[,<integer>[.<integer>]]".
-void parseSubsystem(StringRef Arg, WindowsSubsystem *Sys, uint32_t *Major,
-                    uint32_t *Minor);
+void parseSubsystem(StringRef arg, WindowsSubsystem *sys, uint32_t *major,
+                    uint32_t *minor);
 
 void parseAlternateName(StringRef);
 void parseMerge(StringRef);
 void parseSection(StringRef);
 void parseAligncomm(StringRef);
 
+// Parses a string in the form of "[:<integer>]"
+void parseFunctionPadMin(llvm::opt::Arg *a, llvm::COFF::MachineTypes machine);
+
 // Parses a string in the form of "EMBED[,=<integer>]|NO".
-void parseManifest(StringRef Arg);
+void parseManifest(StringRef arg);
 
 // Parses a string in the form of "level=<string>|uiAccess=<string>"
-void parseManifestUAC(StringRef Arg);
+void parseManifestUAC(StringRef arg);
+
+// Parses a string in the form of "cd|net[,(cd|net)]*"
+void parseSwaprun(StringRef arg);
 
 // Create a resource file containing a manifest XML.
 std::unique_ptr<MemoryBuffer> createManifestRes();
 void createSideBySideManifest();
 
 // Used for dllexported symbols.
-Export parseExport(StringRef Arg);
+Export parseExport(StringRef arg);
 void fixupExports();
 void assignExportOrdinals();
 
@@ -176,12 +181,12 @@ void assignExportOrdinals();
 // if value matches previous values for the key.
 // This feature used in the directive section to reject
 // incompatible objects.
-void checkFailIfMismatch(StringRef Arg);
+void checkFailIfMismatch(StringRef arg, InputFile *source);
 
 // Convert Windows resource files (.res files) to a .obj file.
-MemoryBufferRef convertResToCOFF(ArrayRef<MemoryBufferRef> MBs);
+MemoryBufferRef convertResToCOFF(ArrayRef<MemoryBufferRef> mbs);
 
-void runMSVCLinker(std::string Rsp, ArrayRef<StringRef> Objects);
+void runMSVCLinker(std::string rsp, ArrayRef<StringRef> objects);
 
 // Create enum with OPT_xxx values for each option in Options.td
 enum {
diff --git a/deps/lld/COFF/DriverUtils.cpp b/deps/lld/COFF/DriverUtils.cpp
index 3a11895497a4cf15c548086cb426bbc7d1c818be..4360ac23b26228ce30b4fec196fb117def5ff8f5 100644
--- a/deps/lld/COFF/DriverUtils.cpp
+++ b/deps/lld/COFF/DriverUtils.cpp
@@ -1,9 +1,8 @@
 //===- DriverUtils.cpp ----------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -48,104 +47,78 @@ const uint16_t RT_MANIFEST = 24;
 
 class Executor {
 public:
-  explicit Executor(StringRef S) : Prog(Saver.save(S)) {}
-  void add(StringRef S) { Args.push_back(Saver.save(S)); }
-  void add(std::string &S) { Args.push_back(Saver.save(S)); }
-  void add(Twine S) { Args.push_back(Saver.save(S)); }
-  void add(const char *S) { Args.push_back(Saver.save(S)); }
+  explicit Executor(StringRef s) : prog(saver.save(s)) {}
+  void add(StringRef s) { args.push_back(saver.save(s)); }
+  void add(std::string &s) { args.push_back(saver.save(s)); }
+  void add(Twine s) { args.push_back(saver.save(s)); }
+  void add(const char *s) { args.push_back(saver.save(s)); }
 
   void run() {
-    ErrorOr<std::string> ExeOrErr = sys::findProgramByName(Prog);
-    if (auto EC = ExeOrErr.getError())
-      fatal("unable to find " + Prog + " in PATH: " + EC.message());
-    StringRef Exe = Saver.save(*ExeOrErr);
-    Args.insert(Args.begin(), Exe);
+    ErrorOr<std::string> exeOrErr = sys::findProgramByName(prog);
+    if (auto ec = exeOrErr.getError())
+      fatal("unable to find " + prog + " in PATH: " + ec.message());
+    StringRef exe = saver.save(*exeOrErr);
+    args.insert(args.begin(), exe);
 
-    if (sys::ExecuteAndWait(Args[0], Args) != 0)
+    if (sys::ExecuteAndWait(args[0], args) != 0)
       fatal("ExecuteAndWait failed: " +
-            llvm::join(Args.begin(), Args.end(), " "));
+            llvm::join(args.begin(), args.end(), " "));
   }
 
 private:
-  StringRef Prog;
-  std::vector<StringRef> Args;
+  StringRef prog;
+  std::vector<StringRef> args;
 };
 
 } // anonymous namespace
 
-// Returns /machine's value.
-MachineTypes getMachineType(StringRef S) {
-  MachineTypes MT = StringSwitch<MachineTypes>(S.lower())
-                        .Cases("x64", "amd64", AMD64)
-                        .Cases("x86", "i386", I386)
-                        .Case("arm", ARMNT)
-                        .Case("arm64", ARM64)
-                        .Default(IMAGE_FILE_MACHINE_UNKNOWN);
-  if (MT != IMAGE_FILE_MACHINE_UNKNOWN)
-    return MT;
-  fatal("unknown /machine argument: " + S);
-}
-
-StringRef machineToStr(MachineTypes MT) {
-  switch (MT) {
-  case ARMNT:
-    return "arm";
-  case ARM64:
-    return "arm64";
-  case AMD64:
-    return "x64";
-  case I386:
-    return "x86";
-  default:
-    llvm_unreachable("unknown machine type");
-  }
-}
-
 // Parses a string in the form of "<integer>[,<integer>]".
-void parseNumbers(StringRef Arg, uint64_t *Addr, uint64_t *Size) {
-  StringRef S1, S2;
-  std::tie(S1, S2) = Arg.split(',');
-  if (S1.getAsInteger(0, *Addr))
-    fatal("invalid number: " + S1);
-  if (Size && !S2.empty() && S2.getAsInteger(0, *Size))
-    fatal("invalid number: " + S2);
+void parseNumbers(StringRef arg, uint64_t *addr, uint64_t *size) {
+  StringRef s1, s2;
+  std::tie(s1, s2) = arg.split(',');
+  if (s1.getAsInteger(0, *addr))
+    fatal("invalid number: " + s1);
+  if (size && !s2.empty() && s2.getAsInteger(0, *size))
+    fatal("invalid number: " + s2);
 }
 
 // Parses a string in the form of "<integer>[.<integer>]".
 // If second number is not present, Minor is set to 0.
-void parseVersion(StringRef Arg, uint32_t *Major, uint32_t *Minor) {
-  StringRef S1, S2;
-  std::tie(S1, S2) = Arg.split('.');
-  if (S1.getAsInteger(0, *Major))
-    fatal("invalid number: " + S1);
-  *Minor = 0;
-  if (!S2.empty() && S2.getAsInteger(0, *Minor))
-    fatal("invalid number: " + S2);
+void parseVersion(StringRef arg, uint32_t *major, uint32_t *minor) {
+  StringRef s1, s2;
+  std::tie(s1, s2) = arg.split('.');
+  if (s1.getAsInteger(0, *major))
+    fatal("invalid number: " + s1);
+  *minor = 0;
+  if (!s2.empty() && s2.getAsInteger(0, *minor))
+    fatal("invalid number: " + s2);
 }
 
-void parseGuard(StringRef FullArg) {
-  SmallVector<StringRef, 1> SplitArgs;
-  FullArg.split(SplitArgs, ",");
-  for (StringRef Arg : SplitArgs) {
-    if (Arg.equals_lower("no"))
-      Config->GuardCF = GuardCFLevel::Off;
-    else if (Arg.equals_lower("nolongjmp"))
-      Config->GuardCF = GuardCFLevel::NoLongJmp;
-    else if (Arg.equals_lower("cf") || Arg.equals_lower("longjmp"))
-      Config->GuardCF = GuardCFLevel::Full;
+void parseGuard(StringRef fullArg) {
+  SmallVector<StringRef, 1> splitArgs;
+  fullArg.split(splitArgs, ",");
+  for (StringRef arg : splitArgs) {
+    if (arg.equals_lower("no"))
+      config->guardCF = GuardCFLevel::Off;
+    else if (arg.equals_lower("nolongjmp"))
+      config->guardCF = GuardCFLevel::NoLongJmp;
+    else if (arg.equals_lower("cf") || arg.equals_lower("longjmp"))
+      config->guardCF = GuardCFLevel::Full;
     else
-      fatal("invalid argument to /guard: " + Arg);
+      fatal("invalid argument to /guard: " + arg);
   }
 }
 
 // Parses a string in the form of "<subsystem>[,<integer>[.<integer>]]".
-void parseSubsystem(StringRef Arg, WindowsSubsystem *Sys, uint32_t *Major,
-                    uint32_t *Minor) {
-  StringRef SysStr, Ver;
-  std::tie(SysStr, Ver) = Arg.split(',');
-  *Sys = StringSwitch<WindowsSubsystem>(SysStr.lower())
+void parseSubsystem(StringRef arg, WindowsSubsystem *sys, uint32_t *major,
+                    uint32_t *minor) {
+  StringRef sysStr, ver;
+  std::tie(sysStr, ver) = arg.split(',');
+  std::string sysStrLower = sysStr.lower();
+  *sys = StringSwitch<WindowsSubsystem>(sysStrLower)
     .Case("boot_application", IMAGE_SUBSYSTEM_WINDOWS_BOOT_APPLICATION)
     .Case("console", IMAGE_SUBSYSTEM_WINDOWS_CUI)
+    .Case("default", IMAGE_SUBSYSTEM_UNKNOWN)
     .Case("efi_application", IMAGE_SUBSYSTEM_EFI_APPLICATION)
     .Case("efi_boot_service_driver", IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER)
     .Case("efi_rom", IMAGE_SUBSYSTEM_EFI_ROM)
@@ -154,175 +127,217 @@ void parseSubsystem(StringRef Arg, WindowsSubsystem *Sys, uint32_t *Major,
     .Case("posix", IMAGE_SUBSYSTEM_POSIX_CUI)
     .Case("windows", IMAGE_SUBSYSTEM_WINDOWS_GUI)
     .Default(IMAGE_SUBSYSTEM_UNKNOWN);
-  if (*Sys == IMAGE_SUBSYSTEM_UNKNOWN)
-    fatal("unknown subsystem: " + SysStr);
-  if (!Ver.empty())
-    parseVersion(Ver, Major, Minor);
+  if (*sys == IMAGE_SUBSYSTEM_UNKNOWN && sysStrLower != "default")
+    fatal("unknown subsystem: " + sysStr);
+  if (!ver.empty())
+    parseVersion(ver, major, minor);
 }
 
 // Parse a string of the form of "<from>=<to>".
 // Results are directly written to Config.
-void parseAlternateName(StringRef S) {
-  StringRef From, To;
-  std::tie(From, To) = S.split('=');
-  if (From.empty() || To.empty())
-    fatal("/alternatename: invalid argument: " + S);
-  auto It = Config->AlternateNames.find(From);
-  if (It != Config->AlternateNames.end() && It->second != To)
-    fatal("/alternatename: conflicts: " + S);
-  Config->AlternateNames.insert(It, std::make_pair(From, To));
+void parseAlternateName(StringRef s) {
+  StringRef from, to;
+  std::tie(from, to) = s.split('=');
+  if (from.empty() || to.empty())
+    fatal("/alternatename: invalid argument: " + s);
+  auto it = config->alternateNames.find(from);
+  if (it != config->alternateNames.end() && it->second != to)
+    fatal("/alternatename: conflicts: " + s);
+  config->alternateNames.insert(it, std::make_pair(from, to));
 }
 
 // Parse a string of the form of "<from>=<to>".
 // Results are directly written to Config.
-void parseMerge(StringRef S) {
-  StringRef From, To;
-  std::tie(From, To) = S.split('=');
-  if (From.empty() || To.empty())
-    fatal("/merge: invalid argument: " + S);
-  if (From == ".rsrc" || To == ".rsrc")
+void parseMerge(StringRef s) {
+  StringRef from, to;
+  std::tie(from, to) = s.split('=');
+  if (from.empty() || to.empty())
+    fatal("/merge: invalid argument: " + s);
+  if (from == ".rsrc" || to == ".rsrc")
     fatal("/merge: cannot merge '.rsrc' with any section");
-  if (From == ".reloc" || To == ".reloc")
+  if (from == ".reloc" || to == ".reloc")
     fatal("/merge: cannot merge '.reloc' with any section");
-  auto Pair = Config->Merge.insert(std::make_pair(From, To));
-  bool Inserted = Pair.second;
-  if (!Inserted) {
-    StringRef Existing = Pair.first->second;
-    if (Existing != To)
-      warn(S + ": already merged into " + Existing);
+  auto pair = config->merge.insert(std::make_pair(from, to));
+  bool inserted = pair.second;
+  if (!inserted) {
+    StringRef existing = pair.first->second;
+    if (existing != to)
+      warn(s + ": already merged into " + existing);
   }
 }
 
-static uint32_t parseSectionAttributes(StringRef S) {
-  uint32_t Ret = 0;
-  for (char C : S.lower()) {
-    switch (C) {
+static uint32_t parseSectionAttributes(StringRef s) {
+  uint32_t ret = 0;
+  for (char c : s.lower()) {
+    switch (c) {
     case 'd':
-      Ret |= IMAGE_SCN_MEM_DISCARDABLE;
+      ret |= IMAGE_SCN_MEM_DISCARDABLE;
       break;
     case 'e':
-      Ret |= IMAGE_SCN_MEM_EXECUTE;
+      ret |= IMAGE_SCN_MEM_EXECUTE;
       break;
     case 'k':
-      Ret |= IMAGE_SCN_MEM_NOT_CACHED;
+      ret |= IMAGE_SCN_MEM_NOT_CACHED;
       break;
     case 'p':
-      Ret |= IMAGE_SCN_MEM_NOT_PAGED;
+      ret |= IMAGE_SCN_MEM_NOT_PAGED;
       break;
     case 'r':
-      Ret |= IMAGE_SCN_MEM_READ;
+      ret |= IMAGE_SCN_MEM_READ;
       break;
     case 's':
-      Ret |= IMAGE_SCN_MEM_SHARED;
+      ret |= IMAGE_SCN_MEM_SHARED;
       break;
     case 'w':
-      Ret |= IMAGE_SCN_MEM_WRITE;
+      ret |= IMAGE_SCN_MEM_WRITE;
       break;
     default:
-      fatal("/section: invalid argument: " + S);
+      fatal("/section: invalid argument: " + s);
     }
   }
-  return Ret;
+  return ret;
 }
 
 // Parses /section option argument.
-void parseSection(StringRef S) {
-  StringRef Name, Attrs;
-  std::tie(Name, Attrs) = S.split(',');
-  if (Name.empty() || Attrs.empty())
-    fatal("/section: invalid argument: " + S);
-  Config->Section[Name] = parseSectionAttributes(Attrs);
+void parseSection(StringRef s) {
+  StringRef name, attrs;
+  std::tie(name, attrs) = s.split(',');
+  if (name.empty() || attrs.empty())
+    fatal("/section: invalid argument: " + s);
+  config->section[name] = parseSectionAttributes(attrs);
 }
 
 // Parses /aligncomm option argument.
-void parseAligncomm(StringRef S) {
-  StringRef Name, Align;
-  std::tie(Name, Align) = S.split(',');
-  if (Name.empty() || Align.empty()) {
-    error("/aligncomm: invalid argument: " + S);
+void parseAligncomm(StringRef s) {
+  StringRef name, align;
+  std::tie(name, align) = s.split(',');
+  if (name.empty() || align.empty()) {
+    error("/aligncomm: invalid argument: " + s);
     return;
   }
-  int V;
-  if (Align.getAsInteger(0, V)) {
-    error("/aligncomm: invalid argument: " + S);
+  int v;
+  if (align.getAsInteger(0, v)) {
+    error("/aligncomm: invalid argument: " + s);
     return;
   }
-  Config->AlignComm[Name] = std::max(Config->AlignComm[Name], 1 << V);
+  config->alignComm[name] = std::max(config->alignComm[name], 1 << v);
+}
+
+// Parses /functionpadmin option argument.
+void parseFunctionPadMin(llvm::opt::Arg *a, llvm::COFF::MachineTypes machine) {
+  StringRef arg = a->getNumValues() ? a->getValue() : "";
+  if (!arg.empty()) {
+    // Optional padding in bytes is given.
+    if (arg.getAsInteger(0, config->functionPadMin))
+      error("/functionpadmin: invalid argument: " + arg);
+    return;
+  }
+  // No optional argument given.
+  // Set default padding based on machine, similar to link.exe.
+  // There is no default padding for ARM platforms.
+  if (machine == I386) {
+    config->functionPadMin = 5;
+  } else if (machine == AMD64) {
+    config->functionPadMin = 6;
+  } else {
+    error("/functionpadmin: invalid argument for this machine: " + arg);
+  }
 }
 
 // Parses a string in the form of "EMBED[,=<integer>]|NO".
 // Results are directly written to Config.
-void parseManifest(StringRef Arg) {
-  if (Arg.equals_lower("no")) {
-    Config->Manifest = Configuration::No;
+void parseManifest(StringRef arg) {
+  if (arg.equals_lower("no")) {
+    config->manifest = Configuration::No;
     return;
   }
-  if (!Arg.startswith_lower("embed"))
-    fatal("invalid option " + Arg);
-  Config->Manifest = Configuration::Embed;
-  Arg = Arg.substr(strlen("embed"));
-  if (Arg.empty())
+  if (!arg.startswith_lower("embed"))
+    fatal("invalid option " + arg);
+  config->manifest = Configuration::Embed;
+  arg = arg.substr(strlen("embed"));
+  if (arg.empty())
     return;
-  if (!Arg.startswith_lower(",id="))
-    fatal("invalid option " + Arg);
-  Arg = Arg.substr(strlen(",id="));
-  if (Arg.getAsInteger(0, Config->ManifestID))
-    fatal("invalid option " + Arg);
+  if (!arg.startswith_lower(",id="))
+    fatal("invalid option " + arg);
+  arg = arg.substr(strlen(",id="));
+  if (arg.getAsInteger(0, config->manifestID))
+    fatal("invalid option " + arg);
 }
 
 // Parses a string in the form of "level=<string>|uiAccess=<string>|NO".
 // Results are directly written to Config.
-void parseManifestUAC(StringRef Arg) {
-  if (Arg.equals_lower("no")) {
-    Config->ManifestUAC = false;
+void parseManifestUAC(StringRef arg) {
+  if (arg.equals_lower("no")) {
+    config->manifestUAC = false;
     return;
   }
   for (;;) {
-    Arg = Arg.ltrim();
-    if (Arg.empty())
+    arg = arg.ltrim();
+    if (arg.empty())
       return;
-    if (Arg.startswith_lower("level=")) {
-      Arg = Arg.substr(strlen("level="));
-      std::tie(Config->ManifestLevel, Arg) = Arg.split(" ");
+    if (arg.startswith_lower("level=")) {
+      arg = arg.substr(strlen("level="));
+      std::tie(config->manifestLevel, arg) = arg.split(" ");
       continue;
     }
-    if (Arg.startswith_lower("uiaccess=")) {
-      Arg = Arg.substr(strlen("uiaccess="));
-      std::tie(Config->ManifestUIAccess, Arg) = Arg.split(" ");
+    if (arg.startswith_lower("uiaccess=")) {
+      arg = arg.substr(strlen("uiaccess="));
+      std::tie(config->manifestUIAccess, arg) = arg.split(" ");
       continue;
     }
-    fatal("invalid option " + Arg);
+    fatal("invalid option " + arg);
   }
 }
 
+// Parses a string in the form of "cd|net[,(cd|net)]*"
+// Results are directly written to Config.
+void parseSwaprun(StringRef arg) {
+  do {
+    StringRef swaprun, newArg;
+    std::tie(swaprun, newArg) = arg.split(',');
+    if (swaprun.equals_lower("cd"))
+      config->swaprunCD = true;
+    else if (swaprun.equals_lower("net"))
+      config->swaprunNet = true;
+    else if (swaprun.empty())
+      error("/swaprun: missing argument");
+    else
+      error("/swaprun: invalid argument: " + swaprun);
+    // To catch trailing commas, e.g. `/spawrun:cd,`
+    if (newArg.empty() && arg.endswith(","))
+      error("/swaprun: missing argument");
+    arg = newArg;
+  } while (!arg.empty());
+}
+
 // An RAII temporary file class that automatically removes a temporary file.
 namespace {
 class TemporaryFile {
 public:
-  TemporaryFile(StringRef Prefix, StringRef Extn, StringRef Contents = "") {
-    SmallString<128> S;
-    if (auto EC = sys::fs::createTemporaryFile("lld-" + Prefix, Extn, S))
-      fatal("cannot create a temporary file: " + EC.message());
-    Path = S.str();
+  TemporaryFile(StringRef prefix, StringRef extn, StringRef contents = "") {
+    SmallString<128> s;
+    if (auto ec = sys::fs::createTemporaryFile("lld-" + prefix, extn, s))
+      fatal("cannot create a temporary file: " + ec.message());
+    path = s.str();
 
-    if (!Contents.empty()) {
-      std::error_code EC;
-      raw_fd_ostream OS(Path, EC, sys::fs::F_None);
-      if (EC)
-        fatal("failed to open " + Path + ": " + EC.message());
-      OS << Contents;
+    if (!contents.empty()) {
+      std::error_code ec;
+      raw_fd_ostream os(path, ec, sys::fs::F_None);
+      if (ec)
+        fatal("failed to open " + path + ": " + ec.message());
+      os << contents;
     }
   }
 
-  TemporaryFile(TemporaryFile &&Obj) {
-    std::swap(Path, Obj.Path);
+  TemporaryFile(TemporaryFile &&obj) {
+    std::swap(path, obj.path);
   }
 
   ~TemporaryFile() {
-    if (Path.empty())
+    if (path.empty())
       return;
-    if (sys::fs::remove(Path))
-      fatal("failed to remove " + Path);
+    if (sys::fs::remove(path))
+      fatal("failed to remove " + path);
   }
 
   // Returns a memory buffer of this temporary file.
@@ -330,387 +345,390 @@ public:
   // so it is safe to remove the file immediately after this function
   // is called (you cannot remove an opened file on Windows.)
   std::unique_ptr<MemoryBuffer> getMemoryBuffer() {
-    // IsVolatileSize=true forces MemoryBuffer to not use mmap().
-    return CHECK(MemoryBuffer::getFile(Path, /*FileSize=*/-1,
+    // IsVolatile=true forces MemoryBuffer to not use mmap().
+    return CHECK(MemoryBuffer::getFile(path, /*FileSize=*/-1,
                                        /*RequiresNullTerminator=*/false,
-                                       /*IsVolatileSize=*/true),
-                 "could not open " + Path);
+                                       /*IsVolatile=*/true),
+                 "could not open " + path);
   }
 
-  std::string Path;
+  std::string path;
 };
 }
 
 static std::string createDefaultXml() {
-  std::string Ret;
-  raw_string_ostream OS(Ret);
+  std::string ret;
+  raw_string_ostream os(ret);
 
   // Emit the XML. Note that we do *not* verify that the XML attributes are
   // syntactically correct. This is intentional for link.exe compatibility.
-  OS << "<?xml version=\"1.0\" standalone=\"yes\"?>\n"
+  os << "<?xml version=\"1.0\" standalone=\"yes\"?>\n"
      << "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\"\n"
      << "          manifestVersion=\"1.0\">\n";
-  if (Config->ManifestUAC) {
-    OS << "  <trustInfo>\n"
+  if (config->manifestUAC) {
+    os << "  <trustInfo>\n"
        << "    <security>\n"
        << "      <requestedPrivileges>\n"
-       << "         <requestedExecutionLevel level=" << Config->ManifestLevel
-       << " uiAccess=" << Config->ManifestUIAccess << "/>\n"
+       << "         <requestedExecutionLevel level=" << config->manifestLevel
+       << " uiAccess=" << config->manifestUIAccess << "/>\n"
        << "      </requestedPrivileges>\n"
        << "    </security>\n"
        << "  </trustInfo>\n";
   }
-  if (!Config->ManifestDependency.empty()) {
-    OS << "  <dependency>\n"
+  if (!config->manifestDependency.empty()) {
+    os << "  <dependency>\n"
        << "    <dependentAssembly>\n"
-       << "      <assemblyIdentity " << Config->ManifestDependency << " />\n"
+       << "      <assemblyIdentity " << config->manifestDependency << " />\n"
        << "    </dependentAssembly>\n"
        << "  </dependency>\n";
   }
-  OS << "</assembly>\n";
-  return OS.str();
+  os << "</assembly>\n";
+  return os.str();
 }
 
-static std::string createManifestXmlWithInternalMt(StringRef DefaultXml) {
-  std::unique_ptr<MemoryBuffer> DefaultXmlCopy =
-      MemoryBuffer::getMemBufferCopy(DefaultXml);
+static std::string createManifestXmlWithInternalMt(StringRef defaultXml) {
+  std::unique_ptr<MemoryBuffer> defaultXmlCopy =
+      MemoryBuffer::getMemBufferCopy(defaultXml);
 
-  windows_manifest::WindowsManifestMerger Merger;
-  if (auto E = Merger.merge(*DefaultXmlCopy.get()))
+  windows_manifest::WindowsManifestMerger merger;
+  if (auto e = merger.merge(*defaultXmlCopy.get()))
     fatal("internal manifest tool failed on default xml: " +
-          toString(std::move(E)));
+          toString(std::move(e)));
 
-  for (StringRef Filename : Config->ManifestInput) {
-    std::unique_ptr<MemoryBuffer> Manifest =
-        check(MemoryBuffer::getFile(Filename));
-    if (auto E = Merger.merge(*Manifest.get()))
-      fatal("internal manifest tool failed on file " + Filename + ": " +
-            toString(std::move(E)));
+  for (StringRef filename : config->manifestInput) {
+    std::unique_ptr<MemoryBuffer> manifest =
+        check(MemoryBuffer::getFile(filename));
+    if (auto e = merger.merge(*manifest.get()))
+      fatal("internal manifest tool failed on file " + filename + ": " +
+            toString(std::move(e)));
   }
 
-  return Merger.getMergedManifest().get()->getBuffer();
+  return merger.getMergedManifest().get()->getBuffer();
 }
 
-static std::string createManifestXmlWithExternalMt(StringRef DefaultXml) {
+static std::string createManifestXmlWithExternalMt(StringRef defaultXml) {
   // Create the default manifest file as a temporary file.
   TemporaryFile Default("defaultxml", "manifest");
-  std::error_code EC;
-  raw_fd_ostream OS(Default.Path, EC, sys::fs::F_Text);
-  if (EC)
-    fatal("failed to open " + Default.Path + ": " + EC.message());
-  OS << DefaultXml;
-  OS.close();
+  std::error_code ec;
+  raw_fd_ostream os(Default.path, ec, sys::fs::F_Text);
+  if (ec)
+    fatal("failed to open " + Default.path + ": " + ec.message());
+  os << defaultXml;
+  os.close();
 
   // Merge user-supplied manifests if they are given.  Since libxml2 is not
   // enabled, we must shell out to Microsoft's mt.exe tool.
-  TemporaryFile User("user", "manifest");
+  TemporaryFile user("user", "manifest");
 
-  Executor E("mt.exe");
-  E.add("/manifest");
-  E.add(Default.Path);
-  for (StringRef Filename : Config->ManifestInput) {
-    E.add("/manifest");
-    E.add(Filename);
+  Executor e("mt.exe");
+  e.add("/manifest");
+  e.add(Default.path);
+  for (StringRef filename : config->manifestInput) {
+    e.add("/manifest");
+    e.add(filename);
   }
-  E.add("/nologo");
-  E.add("/out:" + StringRef(User.Path));
-  E.run();
+  e.add("/nologo");
+  e.add("/out:" + StringRef(user.path));
+  e.run();
 
-  return CHECK(MemoryBuffer::getFile(User.Path), "could not open " + User.Path)
+  return CHECK(MemoryBuffer::getFile(user.path), "could not open " + user.path)
       .get()
       ->getBuffer();
 }
 
 static std::string createManifestXml() {
-  std::string DefaultXml = createDefaultXml();
-  if (Config->ManifestInput.empty())
-    return DefaultXml;
+  std::string defaultXml = createDefaultXml();
+  if (config->manifestInput.empty())
+    return defaultXml;
 
   if (windows_manifest::isAvailable())
-    return createManifestXmlWithInternalMt(DefaultXml);
+    return createManifestXmlWithInternalMt(defaultXml);
 
-  return createManifestXmlWithExternalMt(DefaultXml);
+  return createManifestXmlWithExternalMt(defaultXml);
 }
 
 static std::unique_ptr<WritableMemoryBuffer>
-createMemoryBufferForManifestRes(size_t ManifestSize) {
-  size_t ResSize = alignTo(
+createMemoryBufferForManifestRes(size_t manifestSize) {
+  size_t resSize = alignTo(
       object::WIN_RES_MAGIC_SIZE + object::WIN_RES_NULL_ENTRY_SIZE +
           sizeof(object::WinResHeaderPrefix) + sizeof(object::WinResIDs) +
-          sizeof(object::WinResHeaderSuffix) + ManifestSize,
+          sizeof(object::WinResHeaderSuffix) + manifestSize,
       object::WIN_RES_DATA_ALIGNMENT);
-  return WritableMemoryBuffer::getNewMemBuffer(ResSize, Config->OutputFile +
+  return WritableMemoryBuffer::getNewMemBuffer(resSize, config->outputFile +
                                                             ".manifest.res");
 }
 
-static void writeResFileHeader(char *&Buf) {
-  memcpy(Buf, COFF::WinResMagic, sizeof(COFF::WinResMagic));
-  Buf += sizeof(COFF::WinResMagic);
-  memset(Buf, 0, object::WIN_RES_NULL_ENTRY_SIZE);
-  Buf += object::WIN_RES_NULL_ENTRY_SIZE;
+static void writeResFileHeader(char *&buf) {
+  memcpy(buf, COFF::WinResMagic, sizeof(COFF::WinResMagic));
+  buf += sizeof(COFF::WinResMagic);
+  memset(buf, 0, object::WIN_RES_NULL_ENTRY_SIZE);
+  buf += object::WIN_RES_NULL_ENTRY_SIZE;
 }
 
-static void writeResEntryHeader(char *&Buf, size_t ManifestSize) {
+static void writeResEntryHeader(char *&buf, size_t manifestSize) {
   // Write the prefix.
-  auto *Prefix = reinterpret_cast<object::WinResHeaderPrefix *>(Buf);
-  Prefix->DataSize = ManifestSize;
-  Prefix->HeaderSize = sizeof(object::WinResHeaderPrefix) +
+  auto *prefix = reinterpret_cast<object::WinResHeaderPrefix *>(buf);
+  prefix->DataSize = manifestSize;
+  prefix->HeaderSize = sizeof(object::WinResHeaderPrefix) +
                        sizeof(object::WinResIDs) +
                        sizeof(object::WinResHeaderSuffix);
-  Buf += sizeof(object::WinResHeaderPrefix);
+  buf += sizeof(object::WinResHeaderPrefix);
 
   // Write the Type/Name IDs.
-  auto *IDs = reinterpret_cast<object::WinResIDs *>(Buf);
-  IDs->setType(RT_MANIFEST);
-  IDs->setName(Config->ManifestID);
-  Buf += sizeof(object::WinResIDs);
+  auto *iDs = reinterpret_cast<object::WinResIDs *>(buf);
+  iDs->setType(RT_MANIFEST);
+  iDs->setName(config->manifestID);
+  buf += sizeof(object::WinResIDs);
 
   // Write the suffix.
-  auto *Suffix = reinterpret_cast<object::WinResHeaderSuffix *>(Buf);
-  Suffix->DataVersion = 0;
-  Suffix->MemoryFlags = object::WIN_RES_PURE_MOVEABLE;
-  Suffix->Language = SUBLANG_ENGLISH_US;
-  Suffix->Version = 0;
-  Suffix->Characteristics = 0;
-  Buf += sizeof(object::WinResHeaderSuffix);
+  auto *suffix = reinterpret_cast<object::WinResHeaderSuffix *>(buf);
+  suffix->DataVersion = 0;
+  suffix->MemoryFlags = object::WIN_RES_PURE_MOVEABLE;
+  suffix->Language = SUBLANG_ENGLISH_US;
+  suffix->Version = 0;
+  suffix->Characteristics = 0;
+  buf += sizeof(object::WinResHeaderSuffix);
 }
 
 // Create a resource file containing a manifest XML.
 std::unique_ptr<MemoryBuffer> createManifestRes() {
-  std::string Manifest = createManifestXml();
+  std::string manifest = createManifestXml();
 
-  std::unique_ptr<WritableMemoryBuffer> Res =
-      createMemoryBufferForManifestRes(Manifest.size());
+  std::unique_ptr<WritableMemoryBuffer> res =
+      createMemoryBufferForManifestRes(manifest.size());
 
-  char *Buf = Res->getBufferStart();
-  writeResFileHeader(Buf);
-  writeResEntryHeader(Buf, Manifest.size());
+  char *buf = res->getBufferStart();
+  writeResFileHeader(buf);
+  writeResEntryHeader(buf, manifest.size());
 
   // Copy the manifest data into the .res file.
-  std::copy(Manifest.begin(), Manifest.end(), Buf);
-  return std::move(Res);
+  std::copy(manifest.begin(), manifest.end(), buf);
+  return std::move(res);
 }
 
 void createSideBySideManifest() {
-  std::string Path = Config->ManifestFile;
-  if (Path == "")
-    Path = Config->OutputFile + ".manifest";
-  std::error_code EC;
-  raw_fd_ostream Out(Path, EC, sys::fs::F_Text);
-  if (EC)
-    fatal("failed to create manifest: " + EC.message());
-  Out << createManifestXml();
+  std::string path = config->manifestFile;
+  if (path == "")
+    path = config->outputFile + ".manifest";
+  std::error_code ec;
+  raw_fd_ostream out(path, ec, sys::fs::F_Text);
+  if (ec)
+    fatal("failed to create manifest: " + ec.message());
+  out << createManifestXml();
 }
 
 // Parse a string in the form of
 // "<name>[=<internalname>][,@ordinal[,NONAME]][,DATA][,PRIVATE]"
 // or "<name>=<dllname>.<name>".
 // Used for parsing /export arguments.
-Export parseExport(StringRef Arg) {
-  Export E;
-  StringRef Rest;
-  std::tie(E.Name, Rest) = Arg.split(",");
-  if (E.Name.empty())
+Export parseExport(StringRef arg) {
+  Export e;
+  StringRef rest;
+  std::tie(e.name, rest) = arg.split(",");
+  if (e.name.empty())
     goto err;
 
-  if (E.Name.contains('=')) {
-    StringRef X, Y;
-    std::tie(X, Y) = E.Name.split("=");
+  if (e.name.contains('=')) {
+    StringRef x, y;
+    std::tie(x, y) = e.name.split("=");
 
     // If "<name>=<dllname>.<name>".
-    if (Y.contains(".")) {
-      E.Name = X;
-      E.ForwardTo = Y;
-      return E;
+    if (y.contains(".")) {
+      e.name = x;
+      e.forwardTo = y;
+      return e;
     }
 
-    E.ExtName = X;
-    E.Name = Y;
-    if (E.Name.empty())
+    e.extName = x;
+    e.name = y;
+    if (e.name.empty())
       goto err;
   }
 
   // If "<name>=<internalname>[,@ordinal[,NONAME]][,DATA][,PRIVATE]"
-  while (!Rest.empty()) {
-    StringRef Tok;
-    std::tie(Tok, Rest) = Rest.split(",");
-    if (Tok.equals_lower("noname")) {
-      if (E.Ordinal == 0)
+  while (!rest.empty()) {
+    StringRef tok;
+    std::tie(tok, rest) = rest.split(",");
+    if (tok.equals_lower("noname")) {
+      if (e.ordinal == 0)
         goto err;
-      E.Noname = true;
+      e.noname = true;
       continue;
     }
-    if (Tok.equals_lower("data")) {
-      E.Data = true;
+    if (tok.equals_lower("data")) {
+      e.data = true;
       continue;
     }
-    if (Tok.equals_lower("constant")) {
-      E.Constant = true;
+    if (tok.equals_lower("constant")) {
+      e.constant = true;
       continue;
     }
-    if (Tok.equals_lower("private")) {
-      E.Private = true;
+    if (tok.equals_lower("private")) {
+      e.isPrivate = true;
       continue;
     }
-    if (Tok.startswith("@")) {
-      int32_t Ord;
-      if (Tok.substr(1).getAsInteger(0, Ord))
+    if (tok.startswith("@")) {
+      int32_t ord;
+      if (tok.substr(1).getAsInteger(0, ord))
         goto err;
-      if (Ord <= 0 || 65535 < Ord)
+      if (ord <= 0 || 65535 < ord)
         goto err;
-      E.Ordinal = Ord;
+      e.ordinal = ord;
       continue;
     }
     goto err;
   }
-  return E;
+  return e;
 
 err:
-  fatal("invalid /export: " + Arg);
+  fatal("invalid /export: " + arg);
 }
 
-static StringRef undecorate(StringRef Sym) {
-  if (Config->Machine != I386)
-    return Sym;
+static StringRef undecorate(StringRef sym) {
+  if (config->machine != I386)
+    return sym;
   // In MSVC mode, a fully decorated stdcall function is exported
   // as-is with the leading underscore (with type IMPORT_NAME).
   // In MinGW mode, a decorated stdcall function gets the underscore
   // removed, just like normal cdecl functions.
-  if (Sym.startswith("_") && Sym.contains('@') && !Config->MinGW)
-    return Sym;
-  return Sym.startswith("_") ? Sym.substr(1) : Sym;
+  if (sym.startswith("_") && sym.contains('@') && !config->mingw)
+    return sym;
+  return sym.startswith("_") ? sym.substr(1) : sym;
 }
 
 // Convert stdcall/fastcall style symbols into unsuffixed symbols,
 // with or without a leading underscore. (MinGW specific.)
-static StringRef killAt(StringRef Sym, bool Prefix) {
-  if (Sym.empty())
-    return Sym;
+static StringRef killAt(StringRef sym, bool prefix) {
+  if (sym.empty())
+    return sym;
   // Strip any trailing stdcall suffix
-  Sym = Sym.substr(0, Sym.find('@', 1));
-  if (!Sym.startswith("@")) {
-    if (Prefix && !Sym.startswith("_"))
-      return Saver.save("_" + Sym);
-    return Sym;
+  sym = sym.substr(0, sym.find('@', 1));
+  if (!sym.startswith("@")) {
+    if (prefix && !sym.startswith("_"))
+      return saver.save("_" + sym);
+    return sym;
   }
   // For fastcall, remove the leading @ and replace it with an
   // underscore, if prefixes are used.
-  Sym = Sym.substr(1);
-  if (Prefix)
-    Sym = Saver.save("_" + Sym);
-  return Sym;
+  sym = sym.substr(1);
+  if (prefix)
+    sym = saver.save("_" + sym);
+  return sym;
 }
 
 // Performs error checking on all /export arguments.
 // It also sets ordinals.
 void fixupExports() {
   // Symbol ordinals must be unique.
-  std::set<uint16_t> Ords;
-  for (Export &E : Config->Exports) {
-    if (E.Ordinal == 0)
+  std::set<uint16_t> ords;
+  for (Export &e : config->exports) {
+    if (e.ordinal == 0)
       continue;
-    if (!Ords.insert(E.Ordinal).second)
-      fatal("duplicate export ordinal: " + E.Name);
+    if (!ords.insert(e.ordinal).second)
+      fatal("duplicate export ordinal: " + e.name);
   }
 
-  for (Export &E : Config->Exports) {
-    Symbol *Sym = E.Sym;
-    if (!E.ForwardTo.empty() || !Sym) {
-      E.SymbolName = E.Name;
+  for (Export &e : config->exports) {
+    if (!e.forwardTo.empty()) {
+      e.exportName = undecorate(e.name);
     } else {
-      if (auto *U = dyn_cast<Undefined>(Sym))
-        if (U->WeakAlias)
-          Sym = U->WeakAlias;
-      E.SymbolName = Sym->getName();
+      e.exportName = undecorate(e.extName.empty() ? e.name : e.extName);
     }
   }
 
-  for (Export &E : Config->Exports) {
-    if (!E.ForwardTo.empty()) {
-      E.ExportName = undecorate(E.Name);
-    } else {
-      E.ExportName = undecorate(E.ExtName.empty() ? E.Name : E.ExtName);
-    }
-  }
-
-  if (Config->KillAt && Config->Machine == I386) {
-    for (Export &E : Config->Exports) {
-      E.Name = killAt(E.Name, true);
-      E.ExportName = killAt(E.ExportName, false);
-      E.ExtName = killAt(E.ExtName, true);
-      E.SymbolName = killAt(E.SymbolName, true);
+  if (config->killAt && config->machine == I386) {
+    for (Export &e : config->exports) {
+      e.name = killAt(e.name, true);
+      e.exportName = killAt(e.exportName, false);
+      e.extName = killAt(e.extName, true);
+      e.symbolName = killAt(e.symbolName, true);
     }
   }
 
   // Uniquefy by name.
-  DenseMap<StringRef, Export *> Map(Config->Exports.size());
-  std::vector<Export> V;
-  for (Export &E : Config->Exports) {
-    auto Pair = Map.insert(std::make_pair(E.ExportName, &E));
-    bool Inserted = Pair.second;
-    if (Inserted) {
-      V.push_back(E);
+  DenseMap<StringRef, Export *> map(config->exports.size());
+  std::vector<Export> v;
+  for (Export &e : config->exports) {
+    auto pair = map.insert(std::make_pair(e.exportName, &e));
+    bool inserted = pair.second;
+    if (inserted) {
+      v.push_back(e);
       continue;
     }
-    Export *Existing = Pair.first->second;
-    if (E == *Existing || E.Name != Existing->Name)
+    Export *existing = pair.first->second;
+    if (e == *existing || e.name != existing->name)
       continue;
-    warn("duplicate /export option: " + E.Name);
+    warn("duplicate /export option: " + e.name);
   }
-  Config->Exports = std::move(V);
+  config->exports = std::move(v);
 
   // Sort by name.
-  std::sort(Config->Exports.begin(), Config->Exports.end(),
-            [](const Export &A, const Export &B) {
-              return A.ExportName < B.ExportName;
+  std::sort(config->exports.begin(), config->exports.end(),
+            [](const Export &a, const Export &b) {
+              return a.exportName < b.exportName;
             });
 }
 
 void assignExportOrdinals() {
   // Assign unique ordinals if default (= 0).
-  uint16_t Max = 0;
-  for (Export &E : Config->Exports)
-    Max = std::max(Max, E.Ordinal);
-  for (Export &E : Config->Exports)
-    if (E.Ordinal == 0)
-      E.Ordinal = ++Max;
+  uint16_t max = 0;
+  for (Export &e : config->exports)
+    max = std::max(max, e.ordinal);
+  for (Export &e : config->exports)
+    if (e.ordinal == 0)
+      e.ordinal = ++max;
 }
 
 // Parses a string in the form of "key=value" and check
 // if value matches previous values for the same key.
-void checkFailIfMismatch(StringRef Arg) {
-  StringRef K, V;
-  std::tie(K, V) = Arg.split('=');
-  if (K.empty() || V.empty())
-    fatal("/failifmismatch: invalid argument: " + Arg);
-  StringRef Existing = Config->MustMatch[K];
-  if (!Existing.empty() && V != Existing)
-    fatal("/failifmismatch: mismatch detected: " + Existing + " and " + V +
-          " for key " + K);
-  Config->MustMatch[K] = V;
+void checkFailIfMismatch(StringRef arg, InputFile *source) {
+  StringRef k, v;
+  std::tie(k, v) = arg.split('=');
+  if (k.empty() || v.empty())
+    fatal("/failifmismatch: invalid argument: " + arg);
+  std::pair<StringRef, InputFile *> existing = config->mustMatch[k];
+  if (!existing.first.empty() && v != existing.first) {
+    std::string sourceStr = source ? toString(source) : "cmd-line";
+    std::string existingStr =
+        existing.second ? toString(existing.second) : "cmd-line";
+    fatal("/failifmismatch: mismatch detected for '" + k + "':\n>>> " +
+          existingStr + " has value " + existing.first + "\n>>> " + sourceStr +
+          " has value " + v);
+  }
+  config->mustMatch[k] = {v, source};
 }
 
 // Convert Windows resource files (.res files) to a .obj file.
-MemoryBufferRef convertResToCOFF(ArrayRef<MemoryBufferRef> MBs) {
-  object::WindowsResourceParser Parser;
+// Does what cvtres.exe does, but in-process and cross-platform.
+MemoryBufferRef convertResToCOFF(ArrayRef<MemoryBufferRef> mbs) {
+  object::WindowsResourceParser parser;
 
-  for (MemoryBufferRef MB : MBs) {
-    std::unique_ptr<object::Binary> Bin = check(object::createBinary(MB));
-    object::WindowsResource *RF = dyn_cast<object::WindowsResource>(Bin.get());
-    if (!RF)
+  for (MemoryBufferRef mb : mbs) {
+    std::unique_ptr<object::Binary> bin = check(object::createBinary(mb));
+    object::WindowsResource *rf = dyn_cast<object::WindowsResource>(bin.get());
+    if (!rf)
       fatal("cannot compile non-resource file as resource");
-    if (auto EC = Parser.parse(RF))
-      fatal("failed to parse .res file: " + toString(std::move(EC)));
+
+    std::vector<std::string> duplicates;
+    if (auto ec = parser.parse(rf, duplicates))
+      fatal(toString(std::move(ec)));
+
+    for (const auto &dupeDiag : duplicates)
+      if (config->forceMultipleRes)
+        warn(dupeDiag);
+      else
+        error(dupeDiag);
   }
 
-  Expected<std::unique_ptr<MemoryBuffer>> E =
-      llvm::object::writeWindowsResourceCOFF(Config->Machine, Parser);
-  if (!E)
-    fatal("failed to write .res to COFF: " + toString(E.takeError()));
+  Expected<std::unique_ptr<MemoryBuffer>> e =
+      llvm::object::writeWindowsResourceCOFF(config->machine, parser,
+                                             config->timestamp);
+  if (!e)
+    fatal("failed to write .res to COFF: " + toString(e.takeError()));
 
-  MemoryBufferRef MBRef = **E;
-  make<std::unique_ptr<MemoryBuffer>>(std::move(*E)); // take ownership
-  return MBRef;
+  MemoryBufferRef mbref = **e;
+  make<std::unique_ptr<MemoryBuffer>>(std::move(*e)); // take ownership
+  return mbref;
 }
 
 // Create OptTable
@@ -721,7 +739,7 @@ MemoryBufferRef convertResToCOFF(ArrayRef<MemoryBufferRef> MBs) {
 #undef PREFIX
 
 // Create table mapping all options defined in Options.td
-static const llvm::opt::OptTable::Info InfoTable[] = {
+static const llvm::opt::OptTable::Info infoTable[] = {
 #define OPTION(X1, X2, ID, KIND, GROUP, ALIAS, X7, X8, X9, X10, X11, X12)      \
   {X1, X2, X10,         X11,         OPT_##ID, llvm::opt::Option::KIND##Class, \
    X9, X8, OPT_##GROUP, OPT_##ALIAS, X7,       X12},
@@ -729,36 +747,36 @@ static const llvm::opt::OptTable::Info InfoTable[] = {
 #undef OPTION
 };
 
-COFFOptTable::COFFOptTable() : OptTable(InfoTable, true) {}
+COFFOptTable::COFFOptTable() : OptTable(infoTable, true) {}
 
 // Set color diagnostics according to --color-diagnostics={auto,always,never}
 // or --no-color-diagnostics flags.
-static void handleColorDiagnostics(opt::InputArgList &Args) {
-  auto *Arg = Args.getLastArg(OPT_color_diagnostics, OPT_color_diagnostics_eq,
+static void handleColorDiagnostics(opt::InputArgList &args) {
+  auto *arg = args.getLastArg(OPT_color_diagnostics, OPT_color_diagnostics_eq,
                               OPT_no_color_diagnostics);
-  if (!Arg)
+  if (!arg)
     return;
-  if (Arg->getOption().getID() == OPT_color_diagnostics) {
-    errorHandler().ColorDiagnostics = true;
-  } else if (Arg->getOption().getID() == OPT_no_color_diagnostics) {
-    errorHandler().ColorDiagnostics = false;
+  if (arg->getOption().getID() == OPT_color_diagnostics) {
+    errorHandler().colorDiagnostics = true;
+  } else if (arg->getOption().getID() == OPT_no_color_diagnostics) {
+    errorHandler().colorDiagnostics = false;
   } else {
-    StringRef S = Arg->getValue();
-    if (S == "always")
-      errorHandler().ColorDiagnostics = true;
-    else if (S == "never")
-      errorHandler().ColorDiagnostics = false;
-    else if (S != "auto")
-      error("unknown option: --color-diagnostics=" + S);
+    StringRef s = arg->getValue();
+    if (s == "always")
+      errorHandler().colorDiagnostics = true;
+    else if (s == "never")
+      errorHandler().colorDiagnostics = false;
+    else if (s != "auto")
+      error("unknown option: --color-diagnostics=" + s);
   }
 }
 
-static cl::TokenizerCallback getQuotingStyle(opt::InputArgList &Args) {
-  if (auto *Arg = Args.getLastArg(OPT_rsp_quoting)) {
-    StringRef S = Arg->getValue();
-    if (S != "windows" && S != "posix")
-      error("invalid response file quoting: " + S);
-    if (S == "windows")
+static cl::TokenizerCallback getQuotingStyle(opt::InputArgList &args) {
+  if (auto *arg = args.getLastArg(OPT_rsp_quoting)) {
+    StringRef s = arg->getValue();
+    if (s != "windows" && s != "posix")
+      error("invalid response file quoting: " + s);
+    if (s == "windows")
       return cl::TokenizeWindowsCommandLine;
     return cl::TokenizeGNUCommandLine;
   }
@@ -767,104 +785,111 @@ static cl::TokenizerCallback getQuotingStyle(opt::InputArgList &Args) {
 }
 
 // Parses a given list of options.
-opt::InputArgList ArgParser::parse(ArrayRef<const char *> Argv) {
+opt::InputArgList ArgParser::parse(ArrayRef<const char *> argv) {
   // Make InputArgList from string vectors.
-  unsigned MissingIndex;
-  unsigned MissingCount;
+  unsigned missingIndex;
+  unsigned missingCount;
 
   // We need to get the quoting style for response files before parsing all
   // options so we parse here before and ignore all the options but
   // --rsp-quoting.
-  opt::InputArgList Args = Table.ParseArgs(Argv, MissingIndex, MissingCount);
+  opt::InputArgList args = table.ParseArgs(argv, missingIndex, missingCount);
 
   // Expand response files (arguments in the form of @<filename>)
   // and then parse the argument again.
-  SmallVector<const char *, 256> ExpandedArgv(Argv.data(), Argv.data() + Argv.size());
-  cl::ExpandResponseFiles(Saver, getQuotingStyle(Args), ExpandedArgv);
-  Args = Table.ParseArgs(makeArrayRef(ExpandedArgv).drop_front(), MissingIndex,
-                         MissingCount);
+  SmallVector<const char *, 256> expandedArgv(argv.data(),
+                                              argv.data() + argv.size());
+  cl::ExpandResponseFiles(saver, getQuotingStyle(args), expandedArgv);
+  args = table.ParseArgs(makeArrayRef(expandedArgv).drop_front(), missingIndex,
+                         missingCount);
 
   // Print the real command line if response files are expanded.
-  if (Args.hasArg(OPT_verbose) && Argv.size() != ExpandedArgv.size()) {
-    std::string Msg = "Command line:";
-    for (const char *S : ExpandedArgv)
-      Msg += " " + std::string(S);
-    message(Msg);
+  if (args.hasArg(OPT_verbose) && argv.size() != expandedArgv.size()) {
+    std::string msg = "Command line:";
+    for (const char *s : expandedArgv)
+      msg += " " + std::string(s);
+    message(msg);
   }
 
   // Save the command line after response file expansion so we can write it to
   // the PDB if necessary.
-  Config->Argv = {ExpandedArgv.begin(), ExpandedArgv.end()};
+  config->argv = {expandedArgv.begin(), expandedArgv.end()};
 
   // Handle /WX early since it converts missing argument warnings to errors.
-  errorHandler().FatalWarnings = Args.hasFlag(OPT_WX, OPT_WX_no, false);
+  errorHandler().fatalWarnings = args.hasFlag(OPT_WX, OPT_WX_no, false);
 
-  if (MissingCount)
-    fatal(Twine(Args.getArgString(MissingIndex)) + ": missing argument");
+  if (missingCount)
+    fatal(Twine(args.getArgString(missingIndex)) + ": missing argument");
 
-  handleColorDiagnostics(Args);
+  handleColorDiagnostics(args);
 
-  for (auto *Arg : Args.filtered(OPT_UNKNOWN))
-    warn("ignoring unknown argument: " + Arg->getSpelling());
+  for (auto *arg : args.filtered(OPT_UNKNOWN)) {
+    std::string nearest;
+    if (table.findNearest(arg->getAsString(args), nearest) > 1)
+      warn("ignoring unknown argument '" + arg->getAsString(args) + "'");
+    else
+      warn("ignoring unknown argument '" + arg->getAsString(args) +
+           "', did you mean '" + nearest + "'");
+  }
 
-  if (Args.hasArg(OPT_lib))
+  if (args.hasArg(OPT_lib))
     warn("ignoring /lib since it's not the first argument");
 
-  return Args;
+  return args;
 }
 
 // Tokenizes and parses a given string as command line in .drective section.
 // /EXPORT options are processed in fastpath.
 std::pair<opt::InputArgList, std::vector<StringRef>>
-ArgParser::parseDirectives(StringRef S) {
-  std::vector<StringRef> Exports;
-  SmallVector<const char *, 16> Rest;
+ArgParser::parseDirectives(StringRef s) {
+  std::vector<StringRef> exports;
+  SmallVector<const char *, 16> rest;
 
-  for (StringRef Tok : tokenize(S)) {
-    if (Tok.startswith_lower("/export:") || Tok.startswith_lower("-export:"))
-      Exports.push_back(Tok.substr(strlen("/export:")));
+  for (StringRef tok : tokenize(s)) {
+    if (tok.startswith_lower("/export:") || tok.startswith_lower("-export:"))
+      exports.push_back(tok.substr(strlen("/export:")));
     else
-      Rest.push_back(Tok.data());
+      rest.push_back(tok.data());
   }
 
   // Make InputArgList from unparsed string vectors.
-  unsigned MissingIndex;
-  unsigned MissingCount;
+  unsigned missingIndex;
+  unsigned missingCount;
 
-  opt::InputArgList Args = Table.ParseArgs(Rest, MissingIndex, MissingCount);
+  opt::InputArgList args = table.ParseArgs(rest, missingIndex, missingCount);
 
-  if (MissingCount)
-    fatal(Twine(Args.getArgString(MissingIndex)) + ": missing argument");
-  for (auto *Arg : Args.filtered(OPT_UNKNOWN))
-    warn("ignoring unknown argument: " + Arg->getSpelling());
-  return {std::move(Args), std::move(Exports)};
+  if (missingCount)
+    fatal(Twine(args.getArgString(missingIndex)) + ": missing argument");
+  for (auto *arg : args.filtered(OPT_UNKNOWN))
+    warn("ignoring unknown argument: " + arg->getAsString(args));
+  return {std::move(args), std::move(exports)};
 }
 
 // link.exe has an interesting feature. If LINK or _LINK_ environment
 // variables exist, their contents are handled as command line strings.
 // So you can pass extra arguments using them.
-opt::InputArgList ArgParser::parseLINK(std::vector<const char *> Argv) {
+opt::InputArgList ArgParser::parseLINK(std::vector<const char *> argv) {
   // Concatenate LINK env and command line arguments, and then parse them.
-  if (Optional<std::string> S = Process::GetEnv("LINK")) {
-    std::vector<const char *> V = tokenize(*S);
-    Argv.insert(std::next(Argv.begin()), V.begin(), V.end());
+  if (Optional<std::string> s = Process::GetEnv("LINK")) {
+    std::vector<const char *> v = tokenize(*s);
+    argv.insert(std::next(argv.begin()), v.begin(), v.end());
   }
-  if (Optional<std::string> S = Process::GetEnv("_LINK_")) {
-    std::vector<const char *> V = tokenize(*S);
-    Argv.insert(std::next(Argv.begin()), V.begin(), V.end());
+  if (Optional<std::string> s = Process::GetEnv("_LINK_")) {
+    std::vector<const char *> v = tokenize(*s);
+    argv.insert(std::next(argv.begin()), v.begin(), v.end());
   }
-  return parse(Argv);
+  return parse(argv);
 }
 
-std::vector<const char *> ArgParser::tokenize(StringRef S) {
-  SmallVector<const char *, 16> Tokens;
-  cl::TokenizeWindowsCommandLine(S, Saver, Tokens);
-  return std::vector<const char *>(Tokens.begin(), Tokens.end());
+std::vector<const char *> ArgParser::tokenize(StringRef s) {
+  SmallVector<const char *, 16> tokens;
+  cl::TokenizeWindowsCommandLine(s, saver, tokens);
+  return std::vector<const char *>(tokens.begin(), tokens.end());
 }
 
-void printHelp(const char *Argv0) {
+void printHelp(const char *argv0) {
   COFFOptTable().PrintHelp(outs(),
-                           (std::string(Argv0) + " [options] file...").c_str(),
+                           (std::string(argv0) + " [options] file...").c_str(),
                            "LLVM Linker", false);
 }
 
diff --git a/deps/lld/COFF/ICF.cpp b/deps/lld/COFF/ICF.cpp
index f6904eb7d24f263e8029e238a88f14c30f59a2af..2b2818de3889cda1f3cf05eb1bb0a7bbc84c15a1 100644
--- a/deps/lld/COFF/ICF.cpp
+++ b/deps/lld/COFF/ICF.cpp
@@ -1,9 +1,8 @@
 //===- ICF.cpp ------------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -38,33 +37,32 @@ using namespace llvm;
 namespace lld {
 namespace coff {
 
-static Timer ICFTimer("ICF", Timer::root());
+static Timer icfTimer("ICF", Timer::root());
 
 class ICF {
 public:
-  void run(ArrayRef<Chunk *> V);
+  void run(ArrayRef<Chunk *> v);
 
 private:
-  void segregate(size_t Begin, size_t End, bool Constant);
+  void segregate(size_t begin, size_t end, bool constant);
 
-  bool assocEquals(const SectionChunk *A, const SectionChunk *B);
+  bool assocEquals(const SectionChunk *a, const SectionChunk *b);
 
-  bool equalsConstant(const SectionChunk *A, const SectionChunk *B);
-  bool equalsVariable(const SectionChunk *A, const SectionChunk *B);
+  bool equalsConstant(const SectionChunk *a, const SectionChunk *b);
+  bool equalsVariable(const SectionChunk *a, const SectionChunk *b);
 
-  uint32_t getHash(SectionChunk *C);
-  bool isEligible(SectionChunk *C);
+  bool isEligible(SectionChunk *c);
 
-  size_t findBoundary(size_t Begin, size_t End);
+  size_t findBoundary(size_t begin, size_t end);
 
-  void forEachClassRange(size_t Begin, size_t End,
-                         std::function<void(size_t, size_t)> Fn);
+  void forEachClassRange(size_t begin, size_t end,
+                         std::function<void(size_t, size_t)> fn);
 
-  void forEachClass(std::function<void(size_t, size_t)> Fn);
+  void forEachClass(std::function<void(size_t, size_t)> fn);
 
-  std::vector<SectionChunk *> Chunks;
-  int Cnt = 0;
-  std::atomic<bool> Repeat = {false};
+  std::vector<SectionChunk *> chunks;
+  int cnt = 0;
+  std::atomic<bool> repeat = {false};
 };
 
 // Returns true if section S is subject of ICF.
@@ -78,143 +76,144 @@ private:
 // merge read-only sections in a couple of cases where the address of the
 // section is insignificant to the user program and the behaviour matches that
 // of the Visual C++ linker.
-bool ICF::isEligible(SectionChunk *C) {
+bool ICF::isEligible(SectionChunk *c) {
   // Non-comdat chunks, dead chunks, and writable chunks are not elegible.
-  bool Writable = C->getOutputCharacteristics() & llvm::COFF::IMAGE_SCN_MEM_WRITE;
-  if (!C->isCOMDAT() || !C->Live || Writable)
+  bool writable = c->getOutputCharacteristics() & llvm::COFF::IMAGE_SCN_MEM_WRITE;
+  if (!c->isCOMDAT() || !c->live || writable)
     return false;
 
   // Code sections are eligible.
-  if (C->getOutputCharacteristics() & llvm::COFF::IMAGE_SCN_MEM_EXECUTE)
+  if (c->getOutputCharacteristics() & llvm::COFF::IMAGE_SCN_MEM_EXECUTE)
     return true;
 
   // .pdata and .xdata unwind info sections are eligible.
-  StringRef OutSecName = C->getSectionName().split('$').first;
-  if (OutSecName == ".pdata" || OutSecName == ".xdata")
+  StringRef outSecName = c->getSectionName().split('$').first;
+  if (outSecName == ".pdata" || outSecName == ".xdata")
     return true;
 
   // So are vtables.
-  if (C->Sym && C->Sym->getName().startswith("??_7"))
+  if (c->sym && c->sym->getName().startswith("??_7"))
     return true;
 
   // Anything else not in an address-significance table is eligible.
-  return !C->KeepUnique;
+  return !c->keepUnique;
 }
 
 // Split an equivalence class into smaller classes.
-void ICF::segregate(size_t Begin, size_t End, bool Constant) {
-  while (Begin < End) {
+void ICF::segregate(size_t begin, size_t end, bool constant) {
+  while (begin < end) {
     // Divide [Begin, End) into two. Let Mid be the start index of the
     // second group.
-    auto Bound = std::stable_partition(
-        Chunks.begin() + Begin + 1, Chunks.begin() + End, [&](SectionChunk *S) {
-          if (Constant)
-            return equalsConstant(Chunks[Begin], S);
-          return equalsVariable(Chunks[Begin], S);
+    auto bound = std::stable_partition(
+        chunks.begin() + begin + 1, chunks.begin() + end, [&](SectionChunk *s) {
+          if (constant)
+            return equalsConstant(chunks[begin], s);
+          return equalsVariable(chunks[begin], s);
         });
-    size_t Mid = Bound - Chunks.begin();
+    size_t mid = bound - chunks.begin();
 
     // Split [Begin, End) into [Begin, Mid) and [Mid, End). We use Mid as an
     // equivalence class ID because every group ends with a unique index.
-    for (size_t I = Begin; I < Mid; ++I)
-      Chunks[I]->Class[(Cnt + 1) % 2] = Mid;
+    for (size_t i = begin; i < mid; ++i)
+      chunks[i]->eqClass[(cnt + 1) % 2] = mid;
 
     // If we created a group, we need to iterate the main loop again.
-    if (Mid != End)
-      Repeat = true;
+    if (mid != end)
+      repeat = true;
 
-    Begin = Mid;
+    begin = mid;
   }
 }
 
 // Returns true if two sections' associative children are equal.
-bool ICF::assocEquals(const SectionChunk *A, const SectionChunk *B) {
-  auto ChildClasses = [&](const SectionChunk *SC) {
-    std::vector<uint32_t> Classes;
-    for (const SectionChunk *C : SC->children())
-      if (!C->SectionName.startswith(".debug") &&
-          C->SectionName != ".gfids$y" && C->SectionName != ".gljmp$y")
-        Classes.push_back(C->Class[Cnt % 2]);
-    return Classes;
+bool ICF::assocEquals(const SectionChunk *a, const SectionChunk *b) {
+  auto childClasses = [&](const SectionChunk *sc) {
+    std::vector<uint32_t> classes;
+    for (const SectionChunk &c : sc->children())
+      if (!c.getSectionName().startswith(".debug") &&
+          c.getSectionName() != ".gfids$y" && c.getSectionName() != ".gljmp$y")
+        classes.push_back(c.eqClass[cnt % 2]);
+    return classes;
   };
-  return ChildClasses(A) == ChildClasses(B);
+  return childClasses(a) == childClasses(b);
 }
 
 // Compare "non-moving" part of two sections, namely everything
 // except relocation targets.
-bool ICF::equalsConstant(const SectionChunk *A, const SectionChunk *B) {
-  if (A->Relocs.size() != B->Relocs.size())
+bool ICF::equalsConstant(const SectionChunk *a, const SectionChunk *b) {
+  if (a->relocsSize != b->relocsSize)
     return false;
 
   // Compare relocations.
-  auto Eq = [&](const coff_relocation &R1, const coff_relocation &R2) {
-    if (R1.Type != R2.Type ||
-        R1.VirtualAddress != R2.VirtualAddress) {
+  auto eq = [&](const coff_relocation &r1, const coff_relocation &r2) {
+    if (r1.Type != r2.Type ||
+        r1.VirtualAddress != r2.VirtualAddress) {
       return false;
     }
-    Symbol *B1 = A->File->getSymbol(R1.SymbolTableIndex);
-    Symbol *B2 = B->File->getSymbol(R2.SymbolTableIndex);
-    if (B1 == B2)
+    Symbol *b1 = a->file->getSymbol(r1.SymbolTableIndex);
+    Symbol *b2 = b->file->getSymbol(r2.SymbolTableIndex);
+    if (b1 == b2)
       return true;
-    if (auto *D1 = dyn_cast<DefinedRegular>(B1))
-      if (auto *D2 = dyn_cast<DefinedRegular>(B2))
-        return D1->getValue() == D2->getValue() &&
-               D1->getChunk()->Class[Cnt % 2] == D2->getChunk()->Class[Cnt % 2];
+    if (auto *d1 = dyn_cast<DefinedRegular>(b1))
+      if (auto *d2 = dyn_cast<DefinedRegular>(b2))
+        return d1->getValue() == d2->getValue() &&
+               d1->getChunk()->eqClass[cnt % 2] == d2->getChunk()->eqClass[cnt % 2];
     return false;
   };
-  if (!std::equal(A->Relocs.begin(), A->Relocs.end(), B->Relocs.begin(), Eq))
+  if (!std::equal(a->getRelocs().begin(), a->getRelocs().end(),
+                  b->getRelocs().begin(), eq))
     return false;
 
   // Compare section attributes and contents.
-  return A->getOutputCharacteristics() == B->getOutputCharacteristics() &&
-         A->SectionName == B->SectionName &&
-         A->Header->SizeOfRawData == B->Header->SizeOfRawData &&
-         A->Checksum == B->Checksum && A->getContents() == B->getContents() &&
-         assocEquals(A, B);
+  return a->getOutputCharacteristics() == b->getOutputCharacteristics() &&
+         a->getSectionName() == b->getSectionName() &&
+         a->header->SizeOfRawData == b->header->SizeOfRawData &&
+         a->checksum == b->checksum && a->getContents() == b->getContents() &&
+         assocEquals(a, b);
 }
 
 // Compare "moving" part of two sections, namely relocation targets.
-bool ICF::equalsVariable(const SectionChunk *A, const SectionChunk *B) {
+bool ICF::equalsVariable(const SectionChunk *a, const SectionChunk *b) {
   // Compare relocations.
-  auto Eq = [&](const coff_relocation &R1, const coff_relocation &R2) {
-    Symbol *B1 = A->File->getSymbol(R1.SymbolTableIndex);
-    Symbol *B2 = B->File->getSymbol(R2.SymbolTableIndex);
-    if (B1 == B2)
+  auto eq = [&](const coff_relocation &r1, const coff_relocation &r2) {
+    Symbol *b1 = a->file->getSymbol(r1.SymbolTableIndex);
+    Symbol *b2 = b->file->getSymbol(r2.SymbolTableIndex);
+    if (b1 == b2)
       return true;
-    if (auto *D1 = dyn_cast<DefinedRegular>(B1))
-      if (auto *D2 = dyn_cast<DefinedRegular>(B2))
-        return D1->getChunk()->Class[Cnt % 2] == D2->getChunk()->Class[Cnt % 2];
+    if (auto *d1 = dyn_cast<DefinedRegular>(b1))
+      if (auto *d2 = dyn_cast<DefinedRegular>(b2))
+        return d1->getChunk()->eqClass[cnt % 2] == d2->getChunk()->eqClass[cnt % 2];
     return false;
   };
-  return std::equal(A->Relocs.begin(), A->Relocs.end(), B->Relocs.begin(),
-                    Eq) &&
-         assocEquals(A, B);
+  return std::equal(a->getRelocs().begin(), a->getRelocs().end(),
+                    b->getRelocs().begin(), eq) &&
+         assocEquals(a, b);
 }
 
 // Find the first Chunk after Begin that has a different class from Begin.
-size_t ICF::findBoundary(size_t Begin, size_t End) {
-  for (size_t I = Begin + 1; I < End; ++I)
-    if (Chunks[Begin]->Class[Cnt % 2] != Chunks[I]->Class[Cnt % 2])
-      return I;
-  return End;
+size_t ICF::findBoundary(size_t begin, size_t end) {
+  for (size_t i = begin + 1; i < end; ++i)
+    if (chunks[begin]->eqClass[cnt % 2] != chunks[i]->eqClass[cnt % 2])
+      return i;
+  return end;
 }
 
-void ICF::forEachClassRange(size_t Begin, size_t End,
-                            std::function<void(size_t, size_t)> Fn) {
-  while (Begin < End) {
-    size_t Mid = findBoundary(Begin, End);
-    Fn(Begin, Mid);
-    Begin = Mid;
+void ICF::forEachClassRange(size_t begin, size_t end,
+                            std::function<void(size_t, size_t)> fn) {
+  while (begin < end) {
+    size_t mid = findBoundary(begin, end);
+    fn(begin, mid);
+    begin = mid;
   }
 }
 
 // Call Fn on each class group.
-void ICF::forEachClass(std::function<void(size_t, size_t)> Fn) {
+void ICF::forEachClass(std::function<void(size_t, size_t)> fn) {
   // If the number of sections are too small to use threading,
   // call Fn sequentially.
-  if (Chunks.size() < 1024) {
-    forEachClassRange(0, Chunks.size(), Fn);
-    ++Cnt;
+  if (chunks.size() < 1024) {
+    forEachClassRange(0, chunks.size(), fn);
+    ++cnt;
     return;
   }
 
@@ -222,97 +221,97 @@ void ICF::forEachClass(std::function<void(size_t, size_t)> Fn) {
   // The sharding must be completed before any calls to Fn are made
   // so that Fn can modify the Chunks in its shard without causing data
   // races.
-  const size_t NumShards = 256;
-  size_t Step = Chunks.size() / NumShards;
-  size_t Boundaries[NumShards + 1];
-  Boundaries[0] = 0;
-  Boundaries[NumShards] = Chunks.size();
-  parallelForEachN(1, NumShards, [&](size_t I) {
-    Boundaries[I] = findBoundary((I - 1) * Step, Chunks.size());
+  const size_t numShards = 256;
+  size_t step = chunks.size() / numShards;
+  size_t boundaries[numShards + 1];
+  boundaries[0] = 0;
+  boundaries[numShards] = chunks.size();
+  parallelForEachN(1, numShards, [&](size_t i) {
+    boundaries[i] = findBoundary((i - 1) * step, chunks.size());
   });
-  parallelForEachN(1, NumShards + 1, [&](size_t I) {
-    if (Boundaries[I - 1] < Boundaries[I]) {
-      forEachClassRange(Boundaries[I - 1], Boundaries[I], Fn);
+  parallelForEachN(1, numShards + 1, [&](size_t i) {
+    if (boundaries[i - 1] < boundaries[i]) {
+      forEachClassRange(boundaries[i - 1], boundaries[i], fn);
     }
   });
-  ++Cnt;
+  ++cnt;
 }
 
 // Merge identical COMDAT sections.
 // Two sections are considered the same if their section headers,
 // contents and relocations are all the same.
-void ICF::run(ArrayRef<Chunk *> Vec) {
-  ScopedTimer T(ICFTimer);
+void ICF::run(ArrayRef<Chunk *> vec) {
+  ScopedTimer t(icfTimer);
 
   // Collect only mergeable sections and group by hash value.
-  uint32_t NextId = 1;
-  for (Chunk *C : Vec) {
-    if (auto *SC = dyn_cast<SectionChunk>(C)) {
-      if (isEligible(SC))
-        Chunks.push_back(SC);
+  uint32_t nextId = 1;
+  for (Chunk *c : vec) {
+    if (auto *sc = dyn_cast<SectionChunk>(c)) {
+      if (isEligible(sc))
+        chunks.push_back(sc);
       else
-        SC->Class[0] = NextId++;
+        sc->eqClass[0] = nextId++;
     }
   }
 
   // Make sure that ICF doesn't merge sections that are being handled by string
   // tail merging.
-  for (auto &P : MergeChunk::Instances)
-    for (SectionChunk *SC : P.second->Sections)
-      SC->Class[0] = NextId++;
+  for (MergeChunk *mc : MergeChunk::instances)
+    if (mc)
+      for (SectionChunk *sc : mc->sections)
+        sc->eqClass[0] = nextId++;
 
   // Initially, we use hash values to partition sections.
-  parallelForEach(Chunks, [&](SectionChunk *SC) {
-    SC->Class[0] = xxHash64(SC->getContents());
+  parallelForEach(chunks, [&](SectionChunk *sc) {
+    sc->eqClass[0] = xxHash64(sc->getContents());
   });
 
   // Combine the hashes of the sections referenced by each section into its
   // hash.
-  for (unsigned Cnt = 0; Cnt != 2; ++Cnt) {
-    parallelForEach(Chunks, [&](SectionChunk *SC) {
-      uint32_t Hash = SC->Class[Cnt % 2];
-      for (Symbol *B : SC->symbols())
-        if (auto *Sym = dyn_cast_or_null<DefinedRegular>(B))
-          Hash += Sym->getChunk()->Class[Cnt % 2];
+  for (unsigned cnt = 0; cnt != 2; ++cnt) {
+    parallelForEach(chunks, [&](SectionChunk *sc) {
+      uint32_t hash = sc->eqClass[cnt % 2];
+      for (Symbol *b : sc->symbols())
+        if (auto *sym = dyn_cast_or_null<DefinedRegular>(b))
+          hash += sym->getChunk()->eqClass[cnt % 2];
       // Set MSB to 1 to avoid collisions with non-hash classs.
-      SC->Class[(Cnt + 1) % 2] = Hash | (1U << 31);
+      sc->eqClass[(cnt + 1) % 2] = hash | (1U << 31);
     });
   }
 
   // From now on, sections in Chunks are ordered so that sections in
   // the same group are consecutive in the vector.
-  std::stable_sort(Chunks.begin(), Chunks.end(),
-                   [](SectionChunk *A, SectionChunk *B) {
-                     return A->Class[0] < B->Class[0];
-                   });
+  llvm::stable_sort(chunks, [](const SectionChunk *a, const SectionChunk *b) {
+    return a->eqClass[0] < b->eqClass[0];
+  });
 
   // Compare static contents and assign unique IDs for each static content.
-  forEachClass([&](size_t Begin, size_t End) { segregate(Begin, End, true); });
+  forEachClass([&](size_t begin, size_t end) { segregate(begin, end, true); });
 
   // Split groups by comparing relocations until convergence is obtained.
   do {
-    Repeat = false;
+    repeat = false;
     forEachClass(
-        [&](size_t Begin, size_t End) { segregate(Begin, End, false); });
-  } while (Repeat);
+        [&](size_t begin, size_t end) { segregate(begin, end, false); });
+  } while (repeat);
 
-  log("ICF needed " + Twine(Cnt) + " iterations");
+  log("ICF needed " + Twine(cnt) + " iterations");
 
   // Merge sections in the same classs.
-  forEachClass([&](size_t Begin, size_t End) {
-    if (End - Begin == 1)
+  forEachClass([&](size_t begin, size_t end) {
+    if (end - begin == 1)
       return;
 
-    log("Selected " + Chunks[Begin]->getDebugName());
-    for (size_t I = Begin + 1; I < End; ++I) {
-      log("  Removed " + Chunks[I]->getDebugName());
-      Chunks[Begin]->replace(Chunks[I]);
+    log("Selected " + chunks[begin]->getDebugName());
+    for (size_t i = begin + 1; i < end; ++i) {
+      log("  Removed " + chunks[i]->getDebugName());
+      chunks[begin]->replace(chunks[i]);
     }
   });
 }
 
 // Entry point to ICF.
-void doICF(ArrayRef<Chunk *> Chunks) { ICF().run(Chunks); }
+void doICF(ArrayRef<Chunk *> chunks) { ICF().run(chunks); }
 
 } // namespace coff
 } // namespace lld
diff --git a/deps/lld/COFF/ICF.h b/deps/lld/COFF/ICF.h
index 9c54e0c9ec2dc2375f347b44cb1cae72d1500443..0b3c8fa2ff2e03967d723e2b68604c2133c0c642 100644
--- a/deps/lld/COFF/ICF.h
+++ b/deps/lld/COFF/ICF.h
@@ -1,9 +1,8 @@
 //===- ICF.h --------------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -18,7 +17,7 @@ namespace coff {
 
 class Chunk;
 
-void doICF(ArrayRef<Chunk *> Chunks);
+void doICF(ArrayRef<Chunk *> chunks);
 
 } // namespace coff
 } // namespace lld
diff --git a/deps/lld/COFF/InputFiles.cpp b/deps/lld/COFF/InputFiles.cpp
index 236c90ef03884c3fb8d5c7cbf7c52395cddb449a..c00d5c5b494ef99c594e78750ad68e2a60c92011 100644
--- a/deps/lld/COFF/InputFiles.cpp
+++ b/deps/lld/COFF/InputFiles.cpp
@@ -1,15 +1,15 @@
 //===- InputFiles.cpp -----------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "InputFiles.h"
 #include "Chunks.h"
 #include "Config.h"
+#include "DebugTypes.h"
 #include "Driver.h"
 #include "SymbolTable.h"
 #include "Symbols.h"
@@ -20,6 +20,10 @@
 #include "llvm/ADT/Triple.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/BinaryFormat/COFF.h"
+#include "llvm/DebugInfo/CodeView/DebugSubsectionRecord.h"
+#include "llvm/DebugInfo/CodeView/SymbolDeserializer.h"
+#include "llvm/DebugInfo/CodeView/SymbolRecord.h"
+#include "llvm/DebugInfo/CodeView/TypeDeserializer.h"
 #include "llvm/Object/Binary.h"
 #include "llvm/Object/COFF.h"
 #include "llvm/Support/Casting.h"
@@ -35,6 +39,7 @@
 
 using namespace llvm;
 using namespace llvm::COFF;
+using namespace llvm::codeview;
 using namespace llvm::object;
 using namespace llvm::support::endian;
 
@@ -44,80 +49,80 @@ using llvm::support::ulittle32_t;
 namespace lld {
 namespace coff {
 
-std::vector<ObjFile *> ObjFile::Instances;
-std::vector<ImportFile *> ImportFile::Instances;
-std::vector<BitcodeFile *> BitcodeFile::Instances;
+std::vector<ObjFile *> ObjFile::instances;
+std::vector<ImportFile *> ImportFile::instances;
+std::vector<BitcodeFile *> BitcodeFile::instances;
 
 /// Checks that Source is compatible with being a weak alias to Target.
 /// If Source is Undefined and has no weak alias set, makes it a weak
 /// alias to Target.
-static void checkAndSetWeakAlias(SymbolTable *Symtab, InputFile *F,
-                                 Symbol *Source, Symbol *Target) {
-  if (auto *U = dyn_cast<Undefined>(Source)) {
-    if (U->WeakAlias && U->WeakAlias != Target) {
+static void checkAndSetWeakAlias(SymbolTable *symtab, InputFile *f,
+                                 Symbol *source, Symbol *target) {
+  if (auto *u = dyn_cast<Undefined>(source)) {
+    if (u->weakAlias && u->weakAlias != target) {
       // Weak aliases as produced by GCC are named in the form
       // .weak.<weaksymbol>.<othersymbol>, where <othersymbol> is the name
       // of another symbol emitted near the weak symbol.
       // Just use the definition from the first object file that defined
       // this weak symbol.
-      if (Config->MinGW)
+      if (config->mingw)
         return;
-      Symtab->reportDuplicate(Source, F);
+      symtab->reportDuplicate(source, f);
     }
-    U->WeakAlias = Target;
+    u->weakAlias = target;
   }
 }
 
-ArchiveFile::ArchiveFile(MemoryBufferRef M) : InputFile(ArchiveKind, M) {}
+ArchiveFile::ArchiveFile(MemoryBufferRef m) : InputFile(ArchiveKind, m) {}
 
 void ArchiveFile::parse() {
   // Parse a MemoryBufferRef as an archive file.
-  File = CHECK(Archive::create(MB), this);
+  file = CHECK(Archive::create(mb), this);
 
   // Read the symbol table to construct Lazy objects.
-  for (const Archive::Symbol &Sym : File->symbols())
-    Symtab->addLazy(this, Sym);
+  for (const Archive::Symbol &sym : file->symbols())
+    symtab->addLazy(this, sym);
 }
 
 // Returns a buffer pointing to a member file containing a given symbol.
-void ArchiveFile::addMember(const Archive::Symbol *Sym) {
-  const Archive::Child &C =
-      CHECK(Sym->getMember(),
-            "could not get the member for symbol " + Sym->getName());
+void ArchiveFile::addMember(const Archive::Symbol *sym) {
+  const Archive::Child &c =
+      CHECK(sym->getMember(),
+            "could not get the member for symbol " + sym->getName());
 
   // Return an empty buffer if we have already returned the same buffer.
-  if (!Seen.insert(C.getChildOffset()).second)
+  if (!seen.insert(c.getChildOffset()).second)
     return;
 
-  Driver->enqueueArchiveMember(C, Sym->getName(), getName());
+  driver->enqueueArchiveMember(c, sym->getName(), getName());
 }
 
-std::vector<MemoryBufferRef> getArchiveMembers(Archive *File) {
-  std::vector<MemoryBufferRef> V;
-  Error Err = Error::success();
-  for (const ErrorOr<Archive::Child> &COrErr : File->children(Err)) {
-    Archive::Child C =
-        CHECK(COrErr,
-              File->getFileName() + ": could not get the child of the archive");
-    MemoryBufferRef MBRef =
-        CHECK(C.getMemoryBufferRef(),
-              File->getFileName() +
+std::vector<MemoryBufferRef> getArchiveMembers(Archive *file) {
+  std::vector<MemoryBufferRef> v;
+  Error err = Error::success();
+  for (const ErrorOr<Archive::Child> &cOrErr : file->children(err)) {
+    Archive::Child c =
+        CHECK(cOrErr,
+              file->getFileName() + ": could not get the child of the archive");
+    MemoryBufferRef mbref =
+        CHECK(c.getMemoryBufferRef(),
+              file->getFileName() +
                   ": could not get the buffer for a child of the archive");
-    V.push_back(MBRef);
+    v.push_back(mbref);
   }
-  if (Err)
-    fatal(File->getFileName() +
-          ": Archive::children failed: " + toString(std::move(Err)));
-  return V;
+  if (err)
+    fatal(file->getFileName() +
+          ": Archive::children failed: " + toString(std::move(err)));
+  return v;
 }
 
 void ObjFile::parse() {
   // Parse a memory buffer as a COFF file.
-  std::unique_ptr<Binary> Bin = CHECK(createBinary(MB), this);
+  std::unique_ptr<Binary> bin = CHECK(createBinary(mb), this);
 
-  if (auto *Obj = dyn_cast<COFFObjectFile>(Bin.get())) {
-    Bin.release();
-    COFFObj.reset(Obj);
+  if (auto *obj = dyn_cast<COFFObjectFile>(bin.get())) {
+    bin.release();
+    coffObj.reset(obj);
   } else {
     fatal(toString(this) + " is not a COFF file");
   }
@@ -125,6 +130,15 @@ void ObjFile::parse() {
   // Read section and symbol tables.
   initializeChunks();
   initializeSymbols();
+  initializeFlags();
+  initializeDependencies();
+}
+
+const coff_section* ObjFile::getSection(uint32_t i) {
+  const coff_section *sec;
+  if (auto ec = coffObj->getSection(i, sec))
+    fatal("getSection failed: #" + Twine(i) + ": " + ec.message());
+  return sec;
 }
 
 // We set SectionChunk pointers in the SparseChunks vector to this value
@@ -133,45 +147,42 @@ void ObjFile::parse() {
 // an associative section definition together with the parent comdat's leader,
 // we set the pointer to either nullptr (to mark the section as discarded) or a
 // valid SectionChunk for that section.
-static SectionChunk *const PendingComdat = reinterpret_cast<SectionChunk *>(1);
+static SectionChunk *const pendingComdat = reinterpret_cast<SectionChunk *>(1);
 
 void ObjFile::initializeChunks() {
-  uint32_t NumSections = COFFObj->getNumberOfSections();
-  Chunks.reserve(NumSections);
-  SparseChunks.resize(NumSections + 1);
-  for (uint32_t I = 1; I < NumSections + 1; ++I) {
-    const coff_section *Sec;
-    if (auto EC = COFFObj->getSection(I, Sec))
-      fatal("getSection failed: #" + Twine(I) + ": " + EC.message());
-
-    if (Sec->Characteristics & IMAGE_SCN_LNK_COMDAT)
-      SparseChunks[I] = PendingComdat;
+  uint32_t numSections = coffObj->getNumberOfSections();
+  chunks.reserve(numSections);
+  sparseChunks.resize(numSections + 1);
+  for (uint32_t i = 1; i < numSections + 1; ++i) {
+    const coff_section *sec = getSection(i);
+    if (sec->Characteristics & IMAGE_SCN_LNK_COMDAT)
+      sparseChunks[i] = pendingComdat;
     else
-      SparseChunks[I] = readSection(I, nullptr, "");
+      sparseChunks[i] = readSection(i, nullptr, "");
   }
 }
 
-SectionChunk *ObjFile::readSection(uint32_t SectionNumber,
-                                   const coff_aux_section_definition *Def,
-                                   StringRef LeaderName) {
-  const coff_section *Sec;
-  if (auto EC = COFFObj->getSection(SectionNumber, Sec))
-    fatal("getSection failed: #" + Twine(SectionNumber) + ": " + EC.message());
+SectionChunk *ObjFile::readSection(uint32_t sectionNumber,
+                                   const coff_aux_section_definition *def,
+                                   StringRef leaderName) {
+  const coff_section *sec = getSection(sectionNumber);
 
-  StringRef Name;
-  if (auto EC = COFFObj->getSectionName(Sec, Name))
-    fatal("getSectionName failed: #" + Twine(SectionNumber) + ": " +
-          EC.message());
+  StringRef name;
+  if (Expected<StringRef> e = coffObj->getSectionName(sec))
+    name = *e;
+  else
+    fatal("getSectionName failed: #" + Twine(sectionNumber) + ": " +
+          toString(e.takeError()));
 
-  if (Name == ".drectve") {
-    ArrayRef<uint8_t> Data;
-    COFFObj->getSectionContents(Sec, Data);
-    Directives = std::string((const char *)Data.data(), Data.size());
+  if (name == ".drectve") {
+    ArrayRef<uint8_t> data;
+    cantFail(coffObj->getSectionContents(sec, data));
+    directives = StringRef((const char *)data.data(), data.size());
     return nullptr;
   }
 
-  if (Name == ".llvm_addrsig") {
-    AddrsigSec = Sec;
+  if (name == ".llvm_addrsig") {
+    addrsigSec = sec;
     return nullptr;
   }
 
@@ -186,377 +197,648 @@ SectionChunk *ObjFile::readSection(uint32_t SectionNumber,
   // and then write it to a separate .pdb file.
 
   // Ignore DWARF debug info unless /debug is given.
-  if (!Config->Debug && Name.startswith(".debug_"))
+  if (!config->debug && name.startswith(".debug_"))
     return nullptr;
 
-  if (Sec->Characteristics & llvm::COFF::IMAGE_SCN_LNK_REMOVE)
+  if (sec->Characteristics & llvm::COFF::IMAGE_SCN_LNK_REMOVE)
     return nullptr;
-  auto *C = make<SectionChunk>(this, Sec);
-  if (Def)
-    C->Checksum = Def->CheckSum;
+  auto *c = make<SectionChunk>(this, sec);
+  if (def)
+    c->checksum = def->CheckSum;
+
+  // link.exe uses the presence of .rsrc$01 for LNK4078, so match that.
+  if (name == ".rsrc$01")
+    isResourceObjFile = true;
 
   // CodeView sections are stored to a different vector because they are not
   // linked in the regular manner.
-  if (C->isCodeView())
-    DebugChunks.push_back(C);
-  else if (Config->GuardCF != GuardCFLevel::Off && Name == ".gfids$y")
-    GuardFidChunks.push_back(C);
-  else if (Config->GuardCF != GuardCFLevel::Off && Name == ".gljmp$y")
-    GuardLJmpChunks.push_back(C);
-  else if (Name == ".sxdata")
-    SXDataChunks.push_back(C);
-  else if (Config->TailMerge && Sec->NumberOfRelocations == 0 &&
-           Name == ".rdata" && LeaderName.startswith("??_C@"))
+  if (c->isCodeView())
+    debugChunks.push_back(c);
+  else if (name == ".gfids$y")
+    guardFidChunks.push_back(c);
+  else if (name == ".gljmp$y")
+    guardLJmpChunks.push_back(c);
+  else if (name == ".sxdata")
+    sXDataChunks.push_back(c);
+  else if (config->tailMerge && sec->NumberOfRelocations == 0 &&
+           name == ".rdata" && leaderName.startswith("??_C@"))
     // COFF sections that look like string literal sections (i.e. no
     // relocations, in .rdata, leader symbol name matches the MSVC name mangling
     // for string literals) are subject to string tail merging.
-    MergeChunk::addSection(C);
+    MergeChunk::addSection(c);
   else
-    Chunks.push_back(C);
+    chunks.push_back(c);
 
-  return C;
+  return c;
 }
 
 void ObjFile::readAssociativeDefinition(
-    COFFSymbolRef Sym, const coff_aux_section_definition *Def) {
-  readAssociativeDefinition(Sym, Def, Def->getNumber(Sym.isBigObj()));
+    COFFSymbolRef sym, const coff_aux_section_definition *def) {
+  readAssociativeDefinition(sym, def, def->getNumber(sym.isBigObj()));
 }
 
-void ObjFile::readAssociativeDefinition(COFFSymbolRef Sym,
-                                        const coff_aux_section_definition *Def,
-                                        uint32_t ParentSection) {
-  SectionChunk *Parent = SparseChunks[ParentSection];
+void ObjFile::readAssociativeDefinition(COFFSymbolRef sym,
+                                        const coff_aux_section_definition *def,
+                                        uint32_t parentIndex) {
+  SectionChunk *parent = sparseChunks[parentIndex];
+  int32_t sectionNumber = sym.getSectionNumber();
 
-  // If the parent is pending, it probably means that its section definition
-  // appears after us in the symbol table. Leave the associated section as
-  // pending; we will handle it during the second pass in initializeSymbols().
-  if (Parent == PendingComdat)
+  auto diag = [&]() {
+    StringRef name, parentName;
+    coffObj->getSymbolName(sym, name);
+
+    const coff_section *parentSec = getSection(parentIndex);
+    if (Expected<StringRef> e = coffObj->getSectionName(parentSec))
+      parentName = *e;
+    error(toString(this) + ": associative comdat " + name + " (sec " +
+          Twine(sectionNumber) + ") has invalid reference to section " +
+          parentName + " (sec " + Twine(parentIndex) + ")");
+  };
+
+  if (parent == pendingComdat) {
+    // This can happen if an associative comdat refers to another associative
+    // comdat that appears after it (invalid per COFF spec) or to a section
+    // without any symbols.
+    diag();
     return;
+  }
 
   // Check whether the parent is prevailing. If it is, so are we, and we read
   // the section; otherwise mark it as discarded.
-  int32_t SectionNumber = Sym.getSectionNumber();
-  if (Parent) {
-    SparseChunks[SectionNumber] = readSection(SectionNumber, Def, "");
-    if (SparseChunks[SectionNumber])
-      Parent->addAssociative(SparseChunks[SectionNumber]);
+  if (parent) {
+    SectionChunk *c = readSection(sectionNumber, def, "");
+    sparseChunks[sectionNumber] = c;
+    if (c) {
+      c->selection = IMAGE_COMDAT_SELECT_ASSOCIATIVE;
+      parent->addAssociative(c);
+    }
   } else {
-    SparseChunks[SectionNumber] = nullptr;
+    sparseChunks[sectionNumber] = nullptr;
   }
 }
 
 void ObjFile::recordPrevailingSymbolForMingw(
-    COFFSymbolRef Sym, DenseMap<StringRef, uint32_t> &PrevailingSectionMap) {
+    COFFSymbolRef sym, DenseMap<StringRef, uint32_t> &prevailingSectionMap) {
   // For comdat symbols in executable sections, where this is the copy
   // of the section chunk we actually include instead of discarding it,
   // add the symbol to a map to allow using it for implicitly
   // associating .[px]data$<func> sections to it.
-  int32_t SectionNumber = Sym.getSectionNumber();
-  SectionChunk *SC = SparseChunks[SectionNumber];
-  if (SC && SC->getOutputCharacteristics() & IMAGE_SCN_MEM_EXECUTE) {
-    StringRef Name;
-    COFFObj->getSymbolName(Sym, Name);
-    PrevailingSectionMap[Name] = SectionNumber;
+  int32_t sectionNumber = sym.getSectionNumber();
+  SectionChunk *sc = sparseChunks[sectionNumber];
+  if (sc && sc->getOutputCharacteristics() & IMAGE_SCN_MEM_EXECUTE) {
+    StringRef name;
+    coffObj->getSymbolName(sym, name);
+    if (getMachineType() == I386)
+      name.consume_front("_");
+    prevailingSectionMap[name] = sectionNumber;
   }
 }
 
 void ObjFile::maybeAssociateSEHForMingw(
-    COFFSymbolRef Sym, const coff_aux_section_definition *Def,
-    const DenseMap<StringRef, uint32_t> &PrevailingSectionMap) {
-  StringRef Name;
-  COFFObj->getSymbolName(Sym, Name);
-  if (Name.consume_front(".pdata$") || Name.consume_front(".xdata$")) {
-    // For MinGW, treat .[px]data$<func> as implicitly associative to
-    // the symbol <func>.
-    auto ParentSym = PrevailingSectionMap.find(Name);
-    if (ParentSym != PrevailingSectionMap.end())
-      readAssociativeDefinition(Sym, Def, ParentSym->second);
+    COFFSymbolRef sym, const coff_aux_section_definition *def,
+    const DenseMap<StringRef, uint32_t> &prevailingSectionMap) {
+  StringRef name;
+  coffObj->getSymbolName(sym, name);
+  if (name.consume_front(".pdata$") || name.consume_front(".xdata$") ||
+      name.consume_front(".eh_frame$")) {
+    // For MinGW, treat .[px]data$<func> and .eh_frame$<func> as implicitly
+    // associative to the symbol <func>.
+    auto parentSym = prevailingSectionMap.find(name);
+    if (parentSym != prevailingSectionMap.end())
+      readAssociativeDefinition(sym, def, parentSym->second);
   }
 }
 
-Symbol *ObjFile::createRegular(COFFSymbolRef Sym) {
-  SectionChunk *SC = SparseChunks[Sym.getSectionNumber()];
-  if (Sym.isExternal()) {
-    StringRef Name;
-    COFFObj->getSymbolName(Sym, Name);
-    if (SC)
-      return Symtab->addRegular(this, Name, Sym.getGeneric(), SC);
+Symbol *ObjFile::createRegular(COFFSymbolRef sym) {
+  SectionChunk *sc = sparseChunks[sym.getSectionNumber()];
+  if (sym.isExternal()) {
+    StringRef name;
+    coffObj->getSymbolName(sym, name);
+    if (sc)
+      return symtab->addRegular(this, name, sym.getGeneric(), sc);
     // For MinGW symbols named .weak.* that point to a discarded section,
     // don't create an Undefined symbol. If nothing ever refers to the symbol,
     // everything should be fine. If something actually refers to the symbol
     // (e.g. the undefined weak alias), linking will fail due to undefined
     // references at the end.
-    if (Config->MinGW && Name.startswith(".weak."))
+    if (config->mingw && name.startswith(".weak."))
       return nullptr;
-    return Symtab->addUndefined(Name, this, false);
+    return symtab->addUndefined(name, this, false);
   }
-  if (SC)
+  if (sc)
     return make<DefinedRegular>(this, /*Name*/ "", /*IsCOMDAT*/ false,
-                                /*IsExternal*/ false, Sym.getGeneric(), SC);
+                                /*IsExternal*/ false, sym.getGeneric(), sc);
   return nullptr;
 }
 
 void ObjFile::initializeSymbols() {
-  uint32_t NumSymbols = COFFObj->getNumberOfSymbols();
-  Symbols.resize(NumSymbols);
+  uint32_t numSymbols = coffObj->getNumberOfSymbols();
+  symbols.resize(numSymbols);
 
-  SmallVector<std::pair<Symbol *, uint32_t>, 8> WeakAliases;
-  std::vector<uint32_t> PendingIndexes;
-  PendingIndexes.reserve(NumSymbols);
+  SmallVector<std::pair<Symbol *, uint32_t>, 8> weakAliases;
+  std::vector<uint32_t> pendingIndexes;
+  pendingIndexes.reserve(numSymbols);
 
-  DenseMap<StringRef, uint32_t> PrevailingSectionMap;
-  std::vector<const coff_aux_section_definition *> ComdatDefs(
-      COFFObj->getNumberOfSections() + 1);
+  DenseMap<StringRef, uint32_t> prevailingSectionMap;
+  std::vector<const coff_aux_section_definition *> comdatDefs(
+      coffObj->getNumberOfSections() + 1);
 
-  for (uint32_t I = 0; I < NumSymbols; ++I) {
-    COFFSymbolRef COFFSym = check(COFFObj->getSymbol(I));
-    bool PrevailingComdat;
-    if (COFFSym.isUndefined()) {
-      Symbols[I] = createUndefined(COFFSym);
-    } else if (COFFSym.isWeakExternal()) {
-      Symbols[I] = createUndefined(COFFSym);
-      uint32_t TagIndex = COFFSym.getAux<coff_aux_weak_external>()->TagIndex;
-      WeakAliases.emplace_back(Symbols[I], TagIndex);
-    } else if (Optional<Symbol *> OptSym =
-                   createDefined(COFFSym, ComdatDefs, PrevailingComdat)) {
-      Symbols[I] = *OptSym;
-      if (Config->MinGW && PrevailingComdat)
-        recordPrevailingSymbolForMingw(COFFSym, PrevailingSectionMap);
+  for (uint32_t i = 0; i < numSymbols; ++i) {
+    COFFSymbolRef coffSym = check(coffObj->getSymbol(i));
+    bool prevailingComdat;
+    if (coffSym.isUndefined()) {
+      symbols[i] = createUndefined(coffSym);
+    } else if (coffSym.isWeakExternal()) {
+      symbols[i] = createUndefined(coffSym);
+      uint32_t tagIndex = coffSym.getAux<coff_aux_weak_external>()->TagIndex;
+      weakAliases.emplace_back(symbols[i], tagIndex);
+    } else if (Optional<Symbol *> optSym =
+                   createDefined(coffSym, comdatDefs, prevailingComdat)) {
+      symbols[i] = *optSym;
+      if (config->mingw && prevailingComdat)
+        recordPrevailingSymbolForMingw(coffSym, prevailingSectionMap);
     } else {
       // createDefined() returns None if a symbol belongs to a section that
       // was pending at the point when the symbol was read. This can happen in
       // two cases:
       // 1) section definition symbol for a comdat leader;
-      // 2) symbol belongs to a comdat section associated with a section whose
-      //    section definition symbol appears later in the symbol table.
+      // 2) symbol belongs to a comdat section associated with another section.
       // In both of these cases, we can expect the section to be resolved by
       // the time we finish visiting the remaining symbols in the symbol
       // table. So we postpone the handling of this symbol until that time.
-      PendingIndexes.push_back(I);
+      pendingIndexes.push_back(i);
     }
-    I += COFFSym.getNumberOfAuxSymbols();
+    i += coffSym.getNumberOfAuxSymbols();
   }
 
-  for (uint32_t I : PendingIndexes) {
-    COFFSymbolRef Sym = check(COFFObj->getSymbol(I));
-    if (const coff_aux_section_definition *Def = Sym.getSectionDefinition()) {
-      if (Def->Selection == IMAGE_COMDAT_SELECT_ASSOCIATIVE)
-        readAssociativeDefinition(Sym, Def);
-      else if (Config->MinGW)
-        maybeAssociateSEHForMingw(Sym, Def, PrevailingSectionMap);
+  for (uint32_t i : pendingIndexes) {
+    COFFSymbolRef sym = check(coffObj->getSymbol(i));
+    if (const coff_aux_section_definition *def = sym.getSectionDefinition()) {
+      if (def->Selection == IMAGE_COMDAT_SELECT_ASSOCIATIVE)
+        readAssociativeDefinition(sym, def);
+      else if (config->mingw)
+        maybeAssociateSEHForMingw(sym, def, prevailingSectionMap);
     }
-    if (SparseChunks[Sym.getSectionNumber()] == PendingComdat) {
-      StringRef Name;
-      COFFObj->getSymbolName(Sym, Name);
-      log("comdat section " + Name +
+    if (sparseChunks[sym.getSectionNumber()] == pendingComdat) {
+      StringRef name;
+      coffObj->getSymbolName(sym, name);
+      log("comdat section " + name +
           " without leader and unassociated, discarding");
       continue;
     }
-    Symbols[I] = createRegular(Sym);
+    symbols[i] = createRegular(sym);
   }
 
-  for (auto &KV : WeakAliases) {
-    Symbol *Sym = KV.first;
-    uint32_t Idx = KV.second;
-    checkAndSetWeakAlias(Symtab, this, Sym, Symbols[Idx]);
+  for (auto &kv : weakAliases) {
+    Symbol *sym = kv.first;
+    uint32_t idx = kv.second;
+    checkAndSetWeakAlias(symtab, this, sym, symbols[idx]);
   }
 }
 
-Symbol *ObjFile::createUndefined(COFFSymbolRef Sym) {
-  StringRef Name;
-  COFFObj->getSymbolName(Sym, Name);
-  return Symtab->addUndefined(Name, this, Sym.isWeakExternal());
+Symbol *ObjFile::createUndefined(COFFSymbolRef sym) {
+  StringRef name;
+  coffObj->getSymbolName(sym, name);
+  return symtab->addUndefined(name, this, sym.isWeakExternal());
+}
+
+void ObjFile::handleComdatSelection(COFFSymbolRef sym, COMDATType &selection,
+                                    bool &prevailing, DefinedRegular *leader) {
+  if (prevailing)
+    return;
+  // There's already an existing comdat for this symbol: `Leader`.
+  // Use the comdats's selection field to determine if the new
+  // symbol in `Sym` should be discarded, produce a duplicate symbol
+  // error, etc.
+
+  SectionChunk *leaderChunk = nullptr;
+  COMDATType leaderSelection = IMAGE_COMDAT_SELECT_ANY;
+
+  if (leader->data) {
+    leaderChunk = leader->getChunk();
+    leaderSelection = leaderChunk->selection;
+  } else {
+    // FIXME: comdats from LTO files don't know their selection; treat them
+    // as "any".
+    selection = leaderSelection;
+  }
+
+  if ((selection == IMAGE_COMDAT_SELECT_ANY &&
+       leaderSelection == IMAGE_COMDAT_SELECT_LARGEST) ||
+      (selection == IMAGE_COMDAT_SELECT_LARGEST &&
+       leaderSelection == IMAGE_COMDAT_SELECT_ANY)) {
+    // cl.exe picks "any" for vftables when building with /GR- and
+    // "largest" when building with /GR. To be able to link object files
+    // compiled with each flag, "any" and "largest" are merged as "largest".
+    leaderSelection = selection = IMAGE_COMDAT_SELECT_LARGEST;
+  }
+
+  // Other than that, comdat selections must match.  This is a bit more
+  // strict than link.exe which allows merging "any" and "largest" if "any"
+  // is the first symbol the linker sees, and it allows merging "largest"
+  // with everything (!) if "largest" is the first symbol the linker sees.
+  // Making this symmetric independent of which selection is seen first
+  // seems better though.
+  // (This behavior matches ModuleLinker::getComdatResult().)
+  if (selection != leaderSelection) {
+    log(("conflicting comdat type for " + toString(*leader) + ": " +
+         Twine((int)leaderSelection) + " in " + toString(leader->getFile()) +
+         " and " + Twine((int)selection) + " in " + toString(this))
+            .str());
+    symtab->reportDuplicate(leader, this);
+    return;
+  }
+
+  switch (selection) {
+  case IMAGE_COMDAT_SELECT_NODUPLICATES:
+    symtab->reportDuplicate(leader, this);
+    break;
+
+  case IMAGE_COMDAT_SELECT_ANY:
+    // Nothing to do.
+    break;
+
+  case IMAGE_COMDAT_SELECT_SAME_SIZE:
+    if (leaderChunk->getSize() != getSection(sym)->SizeOfRawData)
+      symtab->reportDuplicate(leader, this);
+    break;
+
+  case IMAGE_COMDAT_SELECT_EXACT_MATCH: {
+    SectionChunk newChunk(this, getSection(sym));
+    // link.exe only compares section contents here and doesn't complain
+    // if the two comdat sections have e.g. different alignment.
+    // Match that.
+    if (leaderChunk->getContents() != newChunk.getContents())
+      symtab->reportDuplicate(leader, this);
+    break;
+  }
+
+  case IMAGE_COMDAT_SELECT_ASSOCIATIVE:
+    // createDefined() is never called for IMAGE_COMDAT_SELECT_ASSOCIATIVE.
+    // (This means lld-link doesn't produce duplicate symbol errors for
+    // associative comdats while link.exe does, but associate comdats
+    // are never extern in practice.)
+    llvm_unreachable("createDefined not called for associative comdats");
+
+  case IMAGE_COMDAT_SELECT_LARGEST:
+    if (leaderChunk->getSize() < getSection(sym)->SizeOfRawData) {
+      // Replace the existing comdat symbol with the new one.
+      StringRef name;
+      coffObj->getSymbolName(sym, name);
+      // FIXME: This is incorrect: With /opt:noref, the previous sections
+      // make it into the final executable as well. Correct handling would
+      // be to undo reading of the whole old section that's being replaced,
+      // or doing one pass that determines what the final largest comdat
+      // is for all IMAGE_COMDAT_SELECT_LARGEST comdats and then reading
+      // only the largest one.
+      replaceSymbol<DefinedRegular>(leader, this, name, /*IsCOMDAT*/ true,
+                                    /*IsExternal*/ true, sym.getGeneric(),
+                                    nullptr);
+      prevailing = true;
+    }
+    break;
+
+  case IMAGE_COMDAT_SELECT_NEWEST:
+    llvm_unreachable("should have been rejected earlier");
+  }
 }
 
 Optional<Symbol *> ObjFile::createDefined(
-    COFFSymbolRef Sym,
-    std::vector<const coff_aux_section_definition *> &ComdatDefs,
-    bool &Prevailing) {
-  Prevailing = false;
-  auto GetName = [&]() {
-    StringRef S;
-    COFFObj->getSymbolName(Sym, S);
-    return S;
+    COFFSymbolRef sym,
+    std::vector<const coff_aux_section_definition *> &comdatDefs,
+    bool &prevailing) {
+  prevailing = false;
+  auto getName = [&]() {
+    StringRef s;
+    coffObj->getSymbolName(sym, s);
+    return s;
   };
 
-  if (Sym.isCommon()) {
-    auto *C = make<CommonChunk>(Sym);
-    Chunks.push_back(C);
-    return Symtab->addCommon(this, GetName(), Sym.getValue(), Sym.getGeneric(),
-                             C);
+  if (sym.isCommon()) {
+    auto *c = make<CommonChunk>(sym);
+    chunks.push_back(c);
+    return symtab->addCommon(this, getName(), sym.getValue(), sym.getGeneric(),
+                             c);
   }
 
-  if (Sym.isAbsolute()) {
-    StringRef Name = GetName();
+  if (sym.isAbsolute()) {
+    StringRef name = getName();
 
     // Skip special symbols.
-    if (Name == "@comp.id")
+    if (name == "@comp.id")
       return nullptr;
-    if (Name == "@feat.00") {
-      Feat00Flags = Sym.getValue();
+    if (name == "@feat.00") {
+      feat00Flags = sym.getValue();
       return nullptr;
     }
 
-    if (Sym.isExternal())
-      return Symtab->addAbsolute(Name, Sym);
-    return make<DefinedAbsolute>(Name, Sym);
+    if (sym.isExternal())
+      return symtab->addAbsolute(name, sym);
+    return make<DefinedAbsolute>(name, sym);
   }
 
-  int32_t SectionNumber = Sym.getSectionNumber();
-  if (SectionNumber == llvm::COFF::IMAGE_SYM_DEBUG)
+  int32_t sectionNumber = sym.getSectionNumber();
+  if (sectionNumber == llvm::COFF::IMAGE_SYM_DEBUG)
     return nullptr;
 
-  if (llvm::COFF::isReservedSectionNumber(SectionNumber))
-    fatal(toString(this) + ": " + GetName() +
-          " should not refer to special section " + Twine(SectionNumber));
-
-  if ((uint32_t)SectionNumber >= SparseChunks.size())
-    fatal(toString(this) + ": " + GetName() +
-          " should not refer to non-existent section " + Twine(SectionNumber));
-
-  // Handle comdat leader symbols.
-  if (const coff_aux_section_definition *Def = ComdatDefs[SectionNumber]) {
-    ComdatDefs[SectionNumber] = nullptr;
-    Symbol *Leader;
-    if (Sym.isExternal()) {
-      std::tie(Leader, Prevailing) =
-          Symtab->addComdat(this, GetName(), Sym.getGeneric());
+  if (llvm::COFF::isReservedSectionNumber(sectionNumber))
+    fatal(toString(this) + ": " + getName() +
+          " should not refer to special section " + Twine(sectionNumber));
+
+  if ((uint32_t)sectionNumber >= sparseChunks.size())
+    fatal(toString(this) + ": " + getName() +
+          " should not refer to non-existent section " + Twine(sectionNumber));
+
+  // Comdat handling.
+  // A comdat symbol consists of two symbol table entries.
+  // The first symbol entry has the name of the section (e.g. .text), fixed
+  // values for the other fields, and one auxilliary record.
+  // The second symbol entry has the name of the comdat symbol, called the
+  // "comdat leader".
+  // When this function is called for the first symbol entry of a comdat,
+  // it sets comdatDefs and returns None, and when it's called for the second
+  // symbol entry it reads comdatDefs and then sets it back to nullptr.
+
+  // Handle comdat leader.
+  if (const coff_aux_section_definition *def = comdatDefs[sectionNumber]) {
+    comdatDefs[sectionNumber] = nullptr;
+    DefinedRegular *leader;
+
+    if (sym.isExternal()) {
+      std::tie(leader, prevailing) =
+          symtab->addComdat(this, getName(), sym.getGeneric());
     } else {
-      Leader = make<DefinedRegular>(this, /*Name*/ "", /*IsCOMDAT*/ false,
-                                    /*IsExternal*/ false, Sym.getGeneric());
-      Prevailing = true;
+      leader = make<DefinedRegular>(this, /*Name*/ "", /*IsCOMDAT*/ false,
+                                    /*IsExternal*/ false, sym.getGeneric());
+      prevailing = true;
     }
 
-    if (Prevailing) {
-      SectionChunk *C = readSection(SectionNumber, Def, GetName());
-      SparseChunks[SectionNumber] = C;
-      C->Sym = cast<DefinedRegular>(Leader);
-      cast<DefinedRegular>(Leader)->Data = &C->Repl;
-    } else {
-      SparseChunks[SectionNumber] = nullptr;
+    if (def->Selection < (int)IMAGE_COMDAT_SELECT_NODUPLICATES ||
+        // Intentionally ends at IMAGE_COMDAT_SELECT_LARGEST: link.exe
+        // doesn't understand IMAGE_COMDAT_SELECT_NEWEST either.
+        def->Selection > (int)IMAGE_COMDAT_SELECT_LARGEST) {
+      fatal("unknown comdat type " + std::to_string((int)def->Selection) +
+            " for " + getName() + " in " + toString(this));
     }
-    return Leader;
-  }
+    COMDATType selection = (COMDATType)def->Selection;
+
+    if (leader->isCOMDAT)
+      handleComdatSelection(sym, selection, prevailing, leader);
 
-  // Read associative section definitions and prepare to handle the comdat
-  // leader symbol by setting the section's ComdatDefs pointer if we encounter a
-  // non-associative comdat.
-  if (SparseChunks[SectionNumber] == PendingComdat) {
-    if (const coff_aux_section_definition *Def = Sym.getSectionDefinition()) {
-      if (Def->Selection == IMAGE_COMDAT_SELECT_ASSOCIATIVE)
-        readAssociativeDefinition(Sym, Def);
-      else
-        ComdatDefs[SectionNumber] = Def;
+    if (prevailing) {
+      SectionChunk *c = readSection(sectionNumber, def, getName());
+      sparseChunks[sectionNumber] = c;
+      c->sym = cast<DefinedRegular>(leader);
+      c->selection = selection;
+      cast<DefinedRegular>(leader)->data = &c->repl;
+    } else {
+      sparseChunks[sectionNumber] = nullptr;
     }
+    return leader;
   }
 
-  // readAssociativeDefinition() writes to SparseChunks, so need to check again.
-  if (SparseChunks[SectionNumber] == PendingComdat)
+  // Prepare to handle the comdat leader symbol by setting the section's
+  // ComdatDefs pointer if we encounter a non-associative comdat.
+  if (sparseChunks[sectionNumber] == pendingComdat) {
+    if (const coff_aux_section_definition *def = sym.getSectionDefinition()) {
+      if (def->Selection != IMAGE_COMDAT_SELECT_ASSOCIATIVE)
+        comdatDefs[sectionNumber] = def;
+    }
     return None;
+  }
 
-  return createRegular(Sym);
+  return createRegular(sym);
 }
 
 MachineTypes ObjFile::getMachineType() {
-  if (COFFObj)
-    return static_cast<MachineTypes>(COFFObj->getMachine());
+  if (coffObj)
+    return static_cast<MachineTypes>(coffObj->getMachine());
   return IMAGE_FILE_MACHINE_UNKNOWN;
 }
 
-StringRef ltrim1(StringRef S, const char *Chars) {
-  if (!S.empty() && strchr(Chars, S[0]))
-    return S.substr(1);
-  return S;
+ArrayRef<uint8_t> ObjFile::getDebugSection(StringRef secName) {
+  if (SectionChunk *sec = SectionChunk::findByName(debugChunks, secName))
+    return sec->consumeDebugMagic();
+  return {};
+}
+
+// OBJ files systematically store critical informations in a .debug$S stream,
+// even if the TU was compiled with no debug info. At least two records are
+// always there. S_OBJNAME stores a 32-bit signature, which is loaded into the
+// PCHSignature member. S_COMPILE3 stores compile-time cmd-line flags. This is
+// currently used to initialize the hotPatchable member.
+void ObjFile::initializeFlags() {
+  ArrayRef<uint8_t> data = getDebugSection(".debug$S");
+  if (data.empty())
+    return;
+
+  DebugSubsectionArray subsections;
+
+  BinaryStreamReader reader(data, support::little);
+  ExitOnError exitOnErr;
+  exitOnErr(reader.readArray(subsections, data.size()));
+
+  for (const DebugSubsectionRecord &ss : subsections) {
+    if (ss.kind() != DebugSubsectionKind::Symbols)
+      continue;
+
+    unsigned offset = 0;
+
+    // Only parse the first two records. We are only looking for S_OBJNAME
+    // and S_COMPILE3, and they usually appear at the beginning of the
+    // stream.
+    for (unsigned i = 0; i < 2; ++i) {
+      Expected<CVSymbol> sym = readSymbolFromStream(ss.getRecordData(), offset);
+      if (!sym) {
+        consumeError(sym.takeError());
+        return;
+      }
+      if (sym->kind() == SymbolKind::S_COMPILE3) {
+        auto cs =
+            cantFail(SymbolDeserializer::deserializeAs<Compile3Sym>(sym.get()));
+        hotPatchable =
+            (cs.Flags & CompileSym3Flags::HotPatch) != CompileSym3Flags::None;
+      }
+      if (sym->kind() == SymbolKind::S_OBJNAME) {
+        auto objName = cantFail(SymbolDeserializer::deserializeAs<ObjNameSym>(
+            sym.get()));
+        pchSignature = objName.Signature;
+      }
+      offset += sym->length();
+    }
+  }
+}
+
+// Depending on the compilation flags, OBJs can refer to external files,
+// necessary to merge this OBJ into the final PDB. We currently support two
+// types of external files: Precomp/PCH OBJs, when compiling with /Yc and /Yu.
+// And PDB type servers, when compiling with /Zi. This function extracts these
+// dependencies and makes them available as a TpiSource interface (see
+// DebugTypes.h). Both cases only happen with cl.exe: clang-cl produces regular
+// output even with /Yc and /Yu and with /Zi.
+void ObjFile::initializeDependencies() {
+  if (!config->debug)
+    return;
+
+  bool isPCH = false;
+
+  ArrayRef<uint8_t> data = getDebugSection(".debug$P");
+  if (!data.empty())
+    isPCH = true;
+  else
+    data = getDebugSection(".debug$T");
+
+  if (data.empty())
+    return;
+
+  CVTypeArray types;
+  BinaryStreamReader reader(data, support::little);
+  cantFail(reader.readArray(types, reader.getLength()));
+
+  CVTypeArray::Iterator firstType = types.begin();
+  if (firstType == types.end())
+    return;
+
+  debugTypes.emplace(types);
+
+  if (isPCH) {
+    debugTypesObj = makePrecompSource(this);
+    return;
+  }
+
+  if (firstType->kind() == LF_TYPESERVER2) {
+    TypeServer2Record ts = cantFail(
+        TypeDeserializer::deserializeAs<TypeServer2Record>(firstType->data()));
+    debugTypesObj = makeUseTypeServerSource(this, &ts);
+    return;
+  }
+
+  if (firstType->kind() == LF_PRECOMP) {
+    PrecompRecord precomp = cantFail(
+        TypeDeserializer::deserializeAs<PrecompRecord>(firstType->data()));
+    debugTypesObj = makeUsePrecompSource(this, &precomp);
+    return;
+  }
+
+  debugTypesObj = makeTpiSource(this);
+}
+
+StringRef ltrim1(StringRef s, const char *chars) {
+  if (!s.empty() && strchr(chars, s[0]))
+    return s.substr(1);
+  return s;
 }
 
 void ImportFile::parse() {
-  const char *Buf = MB.getBufferStart();
-  const char *End = MB.getBufferEnd();
-  const auto *Hdr = reinterpret_cast<const coff_import_header *>(Buf);
+  const char *buf = mb.getBufferStart();
+  const auto *hdr = reinterpret_cast<const coff_import_header *>(buf);
 
   // Check if the total size is valid.
-  if ((size_t)(End - Buf) != (sizeof(*Hdr) + Hdr->SizeOfData))
+  if (mb.getBufferSize() != sizeof(*hdr) + hdr->SizeOfData)
     fatal("broken import library");
 
   // Read names and create an __imp_ symbol.
-  StringRef Name = Saver.save(StringRef(Buf + sizeof(*Hdr)));
-  StringRef ImpName = Saver.save("__imp_" + Name);
-  const char *NameStart = Buf + sizeof(coff_import_header) + Name.size() + 1;
-  DLLName = StringRef(NameStart);
-  StringRef ExtName;
-  switch (Hdr->getNameType()) {
+  StringRef name = saver.save(StringRef(buf + sizeof(*hdr)));
+  StringRef impName = saver.save("__imp_" + name);
+  const char *nameStart = buf + sizeof(coff_import_header) + name.size() + 1;
+  dllName = StringRef(nameStart);
+  StringRef extName;
+  switch (hdr->getNameType()) {
   case IMPORT_ORDINAL:
-    ExtName = "";
+    extName = "";
     break;
   case IMPORT_NAME:
-    ExtName = Name;
+    extName = name;
     break;
   case IMPORT_NAME_NOPREFIX:
-    ExtName = ltrim1(Name, "?@_");
+    extName = ltrim1(name, "?@_");
     break;
   case IMPORT_NAME_UNDECORATE:
-    ExtName = ltrim1(Name, "?@_");
-    ExtName = ExtName.substr(0, ExtName.find('@'));
+    extName = ltrim1(name, "?@_");
+    extName = extName.substr(0, extName.find('@'));
     break;
   }
 
-  this->Hdr = Hdr;
-  ExternalName = ExtName;
+  this->hdr = hdr;
+  externalName = extName;
 
-  ImpSym = Symtab->addImportData(ImpName, this);
+  impSym = symtab->addImportData(impName, this);
   // If this was a duplicate, we logged an error but may continue;
-  // in this case, ImpSym is nullptr.
-  if (!ImpSym)
+  // in this case, impSym is nullptr.
+  if (!impSym)
     return;
 
-  if (Hdr->getType() == llvm::COFF::IMPORT_CONST)
-    static_cast<void>(Symtab->addImportData(Name, this));
+  if (hdr->getType() == llvm::COFF::IMPORT_CONST)
+    static_cast<void>(symtab->addImportData(name, this));
 
   // If type is function, we need to create a thunk which jump to an
   // address pointed by the __imp_ symbol. (This allows you to call
   // DLL functions just like regular non-DLL functions.)
-  if (Hdr->getType() == llvm::COFF::IMPORT_CODE)
-    ThunkSym = Symtab->addImportThunk(
-        Name, cast_or_null<DefinedImportData>(ImpSym), Hdr->Machine);
+  if (hdr->getType() == llvm::COFF::IMPORT_CODE)
+    thunkSym = symtab->addImportThunk(
+        name, cast_or_null<DefinedImportData>(impSym), hdr->Machine);
+}
+
+BitcodeFile::BitcodeFile(MemoryBufferRef mb, StringRef archiveName,
+                         uint64_t offsetInArchive)
+    : InputFile(BitcodeKind, mb) {
+  std::string path = mb.getBufferIdentifier().str();
+  if (config->thinLTOIndexOnly)
+    path = replaceThinLTOSuffix(mb.getBufferIdentifier());
+
+  // ThinLTO assumes that all MemoryBufferRefs given to it have a unique
+  // name. If two archives define two members with the same name, this
+  // causes a collision which result in only one of the objects being taken
+  // into consideration at LTO time (which very likely causes undefined
+  // symbols later in the link stage). So we append file offset to make
+  // filename unique.
+  MemoryBufferRef mbref(
+      mb.getBuffer(),
+      saver.save(archiveName + path +
+                 (archiveName.empty() ? "" : utostr(offsetInArchive))));
+
+  obj = check(lto::InputFile::create(mbref));
 }
 
 void BitcodeFile::parse() {
-  Obj = check(lto::InputFile::create(MemoryBufferRef(
-      MB.getBuffer(), Saver.save(ParentName + MB.getBufferIdentifier()))));
-  std::vector<std::pair<Symbol *, bool>> Comdat(Obj->getComdatTable().size());
-  for (size_t I = 0; I != Obj->getComdatTable().size(); ++I)
-    Comdat[I] = Symtab->addComdat(this, Saver.save(Obj->getComdatTable()[I]));
-  for (const lto::InputFile::Symbol &ObjSym : Obj->symbols()) {
-    StringRef SymName = Saver.save(ObjSym.getName());
-    int ComdatIndex = ObjSym.getComdatIndex();
-    Symbol *Sym;
-    if (ObjSym.isUndefined()) {
-      Sym = Symtab->addUndefined(SymName, this, false);
-    } else if (ObjSym.isCommon()) {
-      Sym = Symtab->addCommon(this, SymName, ObjSym.getCommonSize());
-    } else if (ObjSym.isWeak() && ObjSym.isIndirect()) {
+  std::vector<std::pair<Symbol *, bool>> comdat(obj->getComdatTable().size());
+  for (size_t i = 0; i != obj->getComdatTable().size(); ++i)
+    // FIXME: lto::InputFile doesn't keep enough data to do correct comdat
+    // selection handling.
+    comdat[i] = symtab->addComdat(this, saver.save(obj->getComdatTable()[i]));
+  for (const lto::InputFile::Symbol &objSym : obj->symbols()) {
+    StringRef symName = saver.save(objSym.getName());
+    int comdatIndex = objSym.getComdatIndex();
+    Symbol *sym;
+    if (objSym.isUndefined()) {
+      sym = symtab->addUndefined(symName, this, false);
+    } else if (objSym.isCommon()) {
+      sym = symtab->addCommon(this, symName, objSym.getCommonSize());
+    } else if (objSym.isWeak() && objSym.isIndirect()) {
       // Weak external.
-      Sym = Symtab->addUndefined(SymName, this, true);
-      std::string Fallback = ObjSym.getCOFFWeakExternalFallback();
-      Symbol *Alias = Symtab->addUndefined(Saver.save(Fallback));
-      checkAndSetWeakAlias(Symtab, this, Sym, Alias);
-    } else if (ComdatIndex != -1) {
-      if (SymName == Obj->getComdatTable()[ComdatIndex])
-        Sym = Comdat[ComdatIndex].first;
-      else if (Comdat[ComdatIndex].second)
-        Sym = Symtab->addRegular(this, SymName);
+      sym = symtab->addUndefined(symName, this, true);
+      std::string fallback = objSym.getCOFFWeakExternalFallback();
+      Symbol *alias = symtab->addUndefined(saver.save(fallback));
+      checkAndSetWeakAlias(symtab, this, sym, alias);
+    } else if (comdatIndex != -1) {
+      if (symName == obj->getComdatTable()[comdatIndex])
+        sym = comdat[comdatIndex].first;
+      else if (comdat[comdatIndex].second)
+        sym = symtab->addRegular(this, symName);
       else
-        Sym = Symtab->addUndefined(SymName, this, false);
+        sym = symtab->addUndefined(symName, this, false);
     } else {
-      Sym = Symtab->addRegular(this, SymName);
+      sym = symtab->addRegular(this, symName);
     }
-    Symbols.push_back(Sym);
+    symbols.push_back(sym);
+    if (objSym.isUsed())
+      config->gcroot.push_back(sym);
   }
-  Directives = Obj->getCOFFLinkerOpts();
+  directives = obj->getCOFFLinkerOpts();
 }
 
 MachineTypes BitcodeFile::getMachineType() {
-  switch (Triple(Obj->getTargetTriple()).getArch()) {
+  switch (Triple(obj->getTargetTriple()).getArch()) {
   case Triple::x86_64:
     return AMD64;
   case Triple::x86:
@@ -569,22 +851,31 @@ MachineTypes BitcodeFile::getMachineType() {
     return IMAGE_FILE_MACHINE_UNKNOWN;
   }
 }
+
+std::string replaceThinLTOSuffix(StringRef path) {
+  StringRef suffix = config->thinLTOObjectSuffixReplace.first;
+  StringRef repl = config->thinLTOObjectSuffixReplace.second;
+
+  if (path.consume_back(suffix))
+    return (path + repl).str();
+  return path;
+}
 } // namespace coff
 } // namespace lld
 
 // Returns the last element of a path, which is supposed to be a filename.
-static StringRef getBasename(StringRef Path) {
-  return sys::path::filename(Path, sys::path::Style::windows);
+static StringRef getBasename(StringRef path) {
+  return sys::path::filename(path, sys::path::Style::windows);
 }
 
 // Returns a string in the format of "foo.obj" or "foo.obj(bar.lib)".
-std::string lld::toString(const coff::InputFile *File) {
-  if (!File)
+std::string lld::toString(const coff::InputFile *file) {
+  if (!file)
     return "<internal>";
-  if (File->ParentName.empty())
-    return File->getName();
+  if (file->parentName.empty() || file->kind() == coff::InputFile::ImportKind)
+    return file->getName();
 
-  return (getBasename(File->ParentName) + "(" + getBasename(File->getName()) +
+  return (getBasename(file->parentName) + "(" + getBasename(file->getName()) +
           ")")
       .str();
 }
diff --git a/deps/lld/COFF/InputFiles.h b/deps/lld/COFF/InputFiles.h
index ec802f2d03007d167094d0dd117450238f4eccb9..dfad9814a397d839e6001f950b2b04d79b168f4c 100644
--- a/deps/lld/COFF/InputFiles.h
+++ b/deps/lld/COFF/InputFiles.h
@@ -1,9 +1,8 @@
 //===- InputFiles.h ---------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -33,7 +32,7 @@ class DbiModuleDescriptorBuilder;
 namespace lld {
 namespace coff {
 
-std::vector<MemoryBufferRef> getArchiveMembers(llvm::object::Archive *File);
+std::vector<MemoryBufferRef> getArchiveMembers(llvm::object::Archive *file);
 
 using llvm::COFF::IMAGE_FILE_MACHINE_UNKNOWN;
 using llvm::COFF::MachineTypes;
@@ -47,20 +46,22 @@ class Chunk;
 class Defined;
 class DefinedImportData;
 class DefinedImportThunk;
+class DefinedRegular;
 class Lazy;
 class SectionChunk;
 class Symbol;
 class Undefined;
+class TpiSource;
 
 // The root class of input files.
 class InputFile {
 public:
   enum Kind { ArchiveKind, ObjectKind, ImportKind, BitcodeKind };
-  Kind kind() const { return FileKind; }
+  Kind kind() const { return fileKind; }
   virtual ~InputFile() {}
 
   // Returns the filename.
-  StringRef getName() const { return MB.getBufferIdentifier(); }
+  StringRef getName() const { return mb.getBufferIdentifier(); }
 
   // Reads a file (the constructor doesn't do that).
   virtual void parse() = 0;
@@ -68,158 +69,195 @@ public:
   // Returns the CPU type this file was compiled to.
   virtual MachineTypes getMachineType() { return IMAGE_FILE_MACHINE_UNKNOWN; }
 
-  MemoryBufferRef MB;
+  MemoryBufferRef mb;
 
   // An archive file name if this file is created from an archive.
-  StringRef ParentName;
+  StringRef parentName;
 
   // Returns .drectve section contents if exist.
-  StringRef getDirectives() { return StringRef(Directives).trim(); }
+  StringRef getDirectives() { return directives; }
 
 protected:
-  InputFile(Kind K, MemoryBufferRef M) : MB(M), FileKind(K) {}
+  InputFile(Kind k, MemoryBufferRef m) : mb(m), fileKind(k) {}
 
-  std::string Directives;
+  StringRef directives;
 
 private:
-  const Kind FileKind;
+  const Kind fileKind;
 };
 
 // .lib or .a file.
 class ArchiveFile : public InputFile {
 public:
-  explicit ArchiveFile(MemoryBufferRef M);
-  static bool classof(const InputFile *F) { return F->kind() == ArchiveKind; }
+  explicit ArchiveFile(MemoryBufferRef m);
+  static bool classof(const InputFile *f) { return f->kind() == ArchiveKind; }
   void parse() override;
 
   // Enqueues an archive member load for the given symbol. If we've already
   // enqueued a load for the same archive member, this function does nothing,
   // which ensures that we don't load the same member more than once.
-  void addMember(const Archive::Symbol *Sym);
+  void addMember(const Archive::Symbol *sym);
 
 private:
-  std::unique_ptr<Archive> File;
-  std::string Filename;
-  llvm::DenseSet<uint64_t> Seen;
+  std::unique_ptr<Archive> file;
+  llvm::DenseSet<uint64_t> seen;
 };
 
 // .obj or .o file. This may be a member of an archive file.
 class ObjFile : public InputFile {
 public:
-  explicit ObjFile(MemoryBufferRef M) : InputFile(ObjectKind, M) {}
-  static bool classof(const InputFile *F) { return F->kind() == ObjectKind; }
+  explicit ObjFile(MemoryBufferRef m) : InputFile(ObjectKind, m) {}
+  static bool classof(const InputFile *f) { return f->kind() == ObjectKind; }
   void parse() override;
   MachineTypes getMachineType() override;
-  ArrayRef<Chunk *> getChunks() { return Chunks; }
-  ArrayRef<SectionChunk *> getDebugChunks() { return DebugChunks; }
-  ArrayRef<SectionChunk *> getSXDataChunks() { return SXDataChunks; }
-  ArrayRef<SectionChunk *> getGuardFidChunks() { return GuardFidChunks; }
-  ArrayRef<SectionChunk *> getGuardLJmpChunks() { return GuardLJmpChunks; }
-  ArrayRef<Symbol *> getSymbols() { return Symbols; }
+  ArrayRef<Chunk *> getChunks() { return chunks; }
+  ArrayRef<SectionChunk *> getDebugChunks() { return debugChunks; }
+  ArrayRef<SectionChunk *> getSXDataChunks() { return sXDataChunks; }
+  ArrayRef<SectionChunk *> getGuardFidChunks() { return guardFidChunks; }
+  ArrayRef<SectionChunk *> getGuardLJmpChunks() { return guardLJmpChunks; }
+  ArrayRef<Symbol *> getSymbols() { return symbols; }
 
-  // Returns a Symbol object for the SymbolIndex'th symbol in the
+  ArrayRef<uint8_t> getDebugSection(StringRef secName);
+
+  // Returns a Symbol object for the symbolIndex'th symbol in the
   // underlying object file.
-  Symbol *getSymbol(uint32_t SymbolIndex) {
-    return Symbols[SymbolIndex];
+  Symbol *getSymbol(uint32_t symbolIndex) {
+    return symbols[symbolIndex];
   }
 
   // Returns the underlying COFF file.
-  COFFObjectFile *getCOFFObj() { return COFFObj.get(); }
+  COFFObjectFile *getCOFFObj() { return coffObj.get(); }
 
-  // Whether the object was already merged into the final PDB or not
-  bool wasProcessedForPDB() const { return !!ModuleDBI; }
+  // Add a symbol for a range extension thunk. Return the new symbol table
+  // index. This index can be used to modify a relocation.
+  uint32_t addRangeThunkSymbol(Symbol *thunk) {
+    symbols.push_back(thunk);
+    return symbols.size() - 1;
+  }
 
-  static std::vector<ObjFile *> Instances;
+  static std::vector<ObjFile *> instances;
 
   // Flags in the absolute @feat.00 symbol if it is present. These usually
   // indicate if an object was compiled with certain security features enabled
   // like stack guard, safeseh, /guard:cf, or other things.
-  uint32_t Feat00Flags = 0;
+  uint32_t feat00Flags = 0;
 
   // True if this object file is compatible with SEH.  COFF-specific and
   // x86-only. COFF spec 5.10.1. The .sxdata section.
-  bool hasSafeSEH() { return Feat00Flags & 0x1; }
+  bool hasSafeSEH() { return feat00Flags & 0x1; }
 
   // True if this file was compiled with /guard:cf.
-  bool hasGuardCF() { return Feat00Flags & 0x800; }
+  bool hasGuardCF() { return feat00Flags & 0x800; }
 
   // Pointer to the PDB module descriptor builder. Various debug info records
   // will reference object files by "module index", which is here. Things like
   // source files and section contributions are also recorded here. Will be null
   // if we are not producing a PDB.
-  llvm::pdb::DbiModuleDescriptorBuilder *ModuleDBI = nullptr;
+  llvm::pdb::DbiModuleDescriptorBuilder *moduleDBI = nullptr;
 
-  const coff_section *AddrsigSec = nullptr;
+  const coff_section *addrsigSec = nullptr;
 
   // When using Microsoft precompiled headers, this is the PCH's key.
   // The same key is used by both the precompiled object, and objects using the
   // precompiled object. Any difference indicates out-of-date objects.
-  llvm::Optional<uint32_t> PCHSignature;
+  llvm::Optional<uint32_t> pchSignature;
+
+  // Whether this is an object file created from .res files.
+  bool isResourceObjFile = false;
+
+  // Whether this file was compiled with /hotpatch.
+  bool hotPatchable = false;
+
+  // Whether the object was already merged into the final PDB.
+  bool mergedIntoPDB = false;
+
+  // If the OBJ has a .debug$T stream, this tells how it will be handled.
+  TpiSource *debugTypesObj = nullptr;
+
+  // The .debug$T stream if there's one.
+  llvm::Optional<llvm::codeview::CVTypeArray> debugTypes;
 
 private:
+  const coff_section* getSection(uint32_t i);
+  const coff_section *getSection(COFFSymbolRef sym) {
+    return getSection(sym.getSectionNumber());
+  }
+
   void initializeChunks();
   void initializeSymbols();
+  void initializeFlags();
+  void initializeDependencies();
 
   SectionChunk *
-  readSection(uint32_t SectionNumber,
-              const llvm::object::coff_aux_section_definition *Def,
-              StringRef LeaderName);
+  readSection(uint32_t sectionNumber,
+              const llvm::object::coff_aux_section_definition *def,
+              StringRef leaderName);
 
   void readAssociativeDefinition(
-      COFFSymbolRef COFFSym,
-      const llvm::object::coff_aux_section_definition *Def);
+      COFFSymbolRef coffSym,
+      const llvm::object::coff_aux_section_definition *def);
 
   void readAssociativeDefinition(
-      COFFSymbolRef COFFSym,
-      const llvm::object::coff_aux_section_definition *Def,
-      uint32_t ParentSection);
+      COFFSymbolRef coffSym,
+      const llvm::object::coff_aux_section_definition *def,
+      uint32_t parentSection);
 
   void recordPrevailingSymbolForMingw(
-      COFFSymbolRef COFFSym,
-      llvm::DenseMap<StringRef, uint32_t> &PrevailingSectionMap);
+      COFFSymbolRef coffSym,
+      llvm::DenseMap<StringRef, uint32_t> &prevailingSectionMap);
 
   void maybeAssociateSEHForMingw(
-      COFFSymbolRef Sym, const llvm::object::coff_aux_section_definition *Def,
-      const llvm::DenseMap<StringRef, uint32_t> &PrevailingSectionMap);
+      COFFSymbolRef sym, const llvm::object::coff_aux_section_definition *def,
+      const llvm::DenseMap<StringRef, uint32_t> &prevailingSectionMap);
+
+  // Given a new symbol Sym with comdat selection Selection, if the new
+  // symbol is not (yet) Prevailing and the existing comdat leader set to
+  // Leader, emits a diagnostic if the new symbol and its selection doesn't
+  // match the existing symbol and its selection. If either old or new
+  // symbol have selection IMAGE_COMDAT_SELECT_LARGEST, Sym might replace
+  // the existing leader. In that case, Prevailing is set to true.
+  void handleComdatSelection(COFFSymbolRef sym,
+                             llvm::COFF::COMDATType &selection,
+                             bool &prevailing, DefinedRegular *leader);
 
   llvm::Optional<Symbol *>
-  createDefined(COFFSymbolRef Sym,
+  createDefined(COFFSymbolRef sym,
                 std::vector<const llvm::object::coff_aux_section_definition *>
-                    &ComdatDefs,
-                bool &PrevailingComdat);
-  Symbol *createRegular(COFFSymbolRef Sym);
-  Symbol *createUndefined(COFFSymbolRef Sym);
+                    &comdatDefs,
+                bool &prevailingComdat);
+  Symbol *createRegular(COFFSymbolRef sym);
+  Symbol *createUndefined(COFFSymbolRef sym);
 
-  std::unique_ptr<COFFObjectFile> COFFObj;
+  std::unique_ptr<COFFObjectFile> coffObj;
 
   // List of all chunks defined by this file. This includes both section
   // chunks and non-section chunks for common symbols.
-  std::vector<Chunk *> Chunks;
+  std::vector<Chunk *> chunks;
 
   // CodeView debug info sections.
-  std::vector<SectionChunk *> DebugChunks;
+  std::vector<SectionChunk *> debugChunks;
 
   // Chunks containing symbol table indices of exception handlers. Only used for
   // 32-bit x86.
-  std::vector<SectionChunk *> SXDataChunks;
+  std::vector<SectionChunk *> sXDataChunks;
 
   // Chunks containing symbol table indices of address taken symbols and longjmp
   // targets.  These are not linked into the final binary when /guard:cf is set.
-  std::vector<SectionChunk *> GuardFidChunks;
-  std::vector<SectionChunk *> GuardLJmpChunks;
+  std::vector<SectionChunk *> guardFidChunks;
+  std::vector<SectionChunk *> guardLJmpChunks;
 
   // This vector contains the same chunks as Chunks, but they are
   // indexed such that you can get a SectionChunk by section index.
   // Nonexistent section indices are filled with null pointers.
   // (Because section number is 1-based, the first slot is always a
   // null pointer.)
-  std::vector<SectionChunk *> SparseChunks;
+  std::vector<SectionChunk *> sparseChunks;
 
   // This vector contains a list of all symbols defined or referenced by this
   // file. They are indexed such that you can get a Symbol by symbol
   // index. Nonexistent indices (which are occupied by auxiliary
   // symbols in the real symbol table) are filled with null pointers.
-  std::vector<Symbol *> Symbols;
+  std::vector<Symbol *> symbols;
 };
 
 // This type represents import library members that contain DLL names
@@ -227,23 +265,23 @@ private:
 // for details about the format.
 class ImportFile : public InputFile {
 public:
-  explicit ImportFile(MemoryBufferRef M) : InputFile(ImportKind, M) {}
+  explicit ImportFile(MemoryBufferRef m) : InputFile(ImportKind, m) {}
 
-  static bool classof(const InputFile *F) { return F->kind() == ImportKind; }
+  static bool classof(const InputFile *f) { return f->kind() == ImportKind; }
 
-  static std::vector<ImportFile *> Instances;
+  static std::vector<ImportFile *> instances;
 
-  Symbol *ImpSym = nullptr;
-  Symbol *ThunkSym = nullptr;
-  std::string DLLName;
+  Symbol *impSym = nullptr;
+  Symbol *thunkSym = nullptr;
+  std::string dllName;
 
 private:
   void parse() override;
 
 public:
-  StringRef ExternalName;
-  const coff_import_header *Hdr;
-  Chunk *Location = nullptr;
+  StringRef externalName;
+  const coff_import_header *hdr;
+  Chunk *location = nullptr;
 
   // We want to eliminate dllimported symbols if no one actually refers them.
   // These "Live" bits are used to keep track of which import library members
@@ -253,28 +291,31 @@ public:
   // symbols provided by this import library member. We also track whether the
   // imported symbol is used separately from whether the thunk is used in order
   // to avoid creating unnecessary thunks.
-  bool Live = !Config->DoGC;
-  bool ThunkLive = !Config->DoGC;
+  bool live = !config->doGC;
+  bool thunkLive = !config->doGC;
 };
 
 // Used for LTO.
 class BitcodeFile : public InputFile {
 public:
-  explicit BitcodeFile(MemoryBufferRef M) : InputFile(BitcodeKind, M) {}
-  static bool classof(const InputFile *F) { return F->kind() == BitcodeKind; }
-  ArrayRef<Symbol *> getSymbols() { return Symbols; }
+  BitcodeFile(MemoryBufferRef mb, StringRef archiveName,
+              uint64_t offsetInArchive);
+  static bool classof(const InputFile *f) { return f->kind() == BitcodeKind; }
+  ArrayRef<Symbol *> getSymbols() { return symbols; }
   MachineTypes getMachineType() override;
-  static std::vector<BitcodeFile *> Instances;
-  std::unique_ptr<llvm::lto::InputFile> Obj;
+  static std::vector<BitcodeFile *> instances;
+  std::unique_ptr<llvm::lto::InputFile> obj;
 
 private:
   void parse() override;
 
-  std::vector<Symbol *> Symbols;
+  std::vector<Symbol *> symbols;
 };
+
+std::string replaceThinLTOSuffix(StringRef path);
 } // namespace coff
 
-std::string toString(const coff::InputFile *File);
+std::string toString(const coff::InputFile *file);
 } // namespace lld
 
 #endif
diff --git a/deps/lld/COFF/LTO.cpp b/deps/lld/COFF/LTO.cpp
index 92d9ff0937c05d12c1a0939871af5ff67606a88f..eb3c60d66077b462ff4870521dfca867849b5447 100644
--- a/deps/lld/COFF/LTO.cpp
+++ b/deps/lld/COFF/LTO.cpp
@@ -1,9 +1,8 @@
 //===- LTO.cpp ------------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -11,6 +10,7 @@
 #include "Config.h"
 #include "InputFiles.h"
 #include "Symbols.h"
+#include "lld/Common/Args.h"
 #include "lld/Common/ErrorHandler.h"
 #include "lld/Common/Strings.h"
 #include "lld/Common/TargetOptionsCommandFlags.h"
@@ -18,6 +18,7 @@
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Twine.h"
+#include "llvm/Bitcode/BitcodeWriter.h"
 #include "llvm/IR/DiagnosticPrinter.h"
 #include "llvm/LTO/Caching.h"
 #include "llvm/LTO/Config.h"
@@ -41,112 +42,165 @@ using namespace llvm::object;
 using namespace lld;
 using namespace lld::coff;
 
-static std::unique_ptr<lto::LTO> createLTO() {
-  lto::Config C;
-  C.Options = InitTargetOptionsFromCodeGenFlags();
+// Creates an empty file to and returns a raw_fd_ostream to write to it.
+static std::unique_ptr<raw_fd_ostream> openFile(StringRef file) {
+  std::error_code ec;
+  auto ret =
+      llvm::make_unique<raw_fd_ostream>(file, ec, sys::fs::OpenFlags::F_None);
+  if (ec) {
+    error("cannot open " + file + ": " + ec.message());
+    return nullptr;
+  }
+  return ret;
+}
+
+static std::string getThinLTOOutputFile(StringRef path) {
+  return lto::getThinLTOOutputFile(path,
+                                   config->thinLTOPrefixReplace.first,
+                                   config->thinLTOPrefixReplace.second);
+}
+
+static lto::Config createConfig() {
+  lto::Config c;
+  c.Options = initTargetOptionsFromCodeGenFlags();
 
   // Always emit a section per function/datum with LTO. LLVM LTO should get most
   // of the benefit of linker GC, but there are still opportunities for ICF.
-  C.Options.FunctionSections = true;
-  C.Options.DataSections = true;
+  c.Options.FunctionSections = true;
+  c.Options.DataSections = true;
 
   // Use static reloc model on 32-bit x86 because it usually results in more
   // compact code, and because there are also known code generation bugs when
   // using the PIC model (see PR34306).
-  if (Config->Machine == COFF::IMAGE_FILE_MACHINE_I386)
-    C.RelocModel = Reloc::Static;
+  if (config->machine == COFF::IMAGE_FILE_MACHINE_I386)
+    c.RelocModel = Reloc::Static;
   else
-    C.RelocModel = Reloc::PIC_;
-  C.DisableVerify = true;
-  C.DiagHandler = diagnosticHandler;
-  C.OptLevel = Config->LTOO;
-  C.CPU = GetCPUStr();
-  C.MAttrs = GetMAttrs();
+    c.RelocModel = Reloc::PIC_;
+  c.DisableVerify = true;
+  c.DiagHandler = diagnosticHandler;
+  c.OptLevel = config->ltoo;
+  c.CPU = getCPUStr();
+  c.MAttrs = getMAttrs();
+  c.CGOptLevel = args::getCGOptLevel(config->ltoo);
 
-  if (Config->SaveTemps)
-    checkError(C.addSaveTemps(std::string(Config->OutputFile) + ".",
+  if (config->saveTemps)
+    checkError(c.addSaveTemps(std::string(config->outputFile) + ".",
                               /*UseInputModulePath*/ true));
-  lto::ThinBackend Backend;
-  if (Config->ThinLTOJobs != 0)
-    Backend = lto::createInProcessThinBackend(Config->ThinLTOJobs);
-  return llvm::make_unique<lto::LTO>(std::move(C), Backend,
-                                     Config->LTOPartitions);
+  return c;
 }
 
-BitcodeCompiler::BitcodeCompiler() : LTOObj(createLTO()) {}
+BitcodeCompiler::BitcodeCompiler() {
+  // Initialize indexFile.
+  if (!config->thinLTOIndexOnlyArg.empty())
+    indexFile = openFile(config->thinLTOIndexOnlyArg);
+
+  // Initialize ltoObj.
+  lto::ThinBackend backend;
+  if (config->thinLTOIndexOnly) {
+    auto OnIndexWrite = [&](StringRef S) { thinIndices.erase(S); };
+    backend = lto::createWriteIndexesThinBackend(
+        config->thinLTOPrefixReplace.first, config->thinLTOPrefixReplace.second,
+        config->thinLTOEmitImportsFiles, indexFile.get(), OnIndexWrite);
+  } else if (config->thinLTOJobs != 0) {
+    backend = lto::createInProcessThinBackend(config->thinLTOJobs);
+  }
+
+  ltoObj = llvm::make_unique<lto::LTO>(createConfig(), backend,
+                                       config->ltoPartitions);
+}
 
 BitcodeCompiler::~BitcodeCompiler() = default;
 
-static void undefine(Symbol *S) { replaceSymbol<Undefined>(S, S->getName()); }
+static void undefine(Symbol *s) { replaceSymbol<Undefined>(s, s->getName()); }
 
-void BitcodeCompiler::add(BitcodeFile &F) {
-  lto::InputFile &Obj = *F.Obj;
-  unsigned SymNum = 0;
-  std::vector<Symbol *> SymBodies = F.getSymbols();
-  std::vector<lto::SymbolResolution> Resols(SymBodies.size());
+void BitcodeCompiler::add(BitcodeFile &f) {
+  lto::InputFile &obj = *f.obj;
+  unsigned symNum = 0;
+  std::vector<Symbol *> symBodies = f.getSymbols();
+  std::vector<lto::SymbolResolution> resols(symBodies.size());
+
+  if (config->thinLTOIndexOnly)
+    thinIndices.insert(obj.getName());
 
   // Provide a resolution to the LTO API for each symbol.
-  for (const lto::InputFile::Symbol &ObjSym : Obj.symbols()) {
-    Symbol *Sym = SymBodies[SymNum];
-    lto::SymbolResolution &R = Resols[SymNum];
-    ++SymNum;
+  for (const lto::InputFile::Symbol &objSym : obj.symbols()) {
+    Symbol *sym = symBodies[symNum];
+    lto::SymbolResolution &r = resols[symNum];
+    ++symNum;
 
     // Ideally we shouldn't check for SF_Undefined but currently IRObjectFile
     // reports two symbols for module ASM defined. Without this check, lld
     // flags an undefined in IR with a definition in ASM as prevailing.
     // Once IRObjectFile is fixed to report only one symbol this hack can
     // be removed.
-    R.Prevailing = !ObjSym.isUndefined() && Sym->getFile() == &F;
-    R.VisibleToRegularObj = Sym->IsUsedInRegularObj;
-    if (R.Prevailing)
-      undefine(Sym);
+    r.Prevailing = !objSym.isUndefined() && sym->getFile() == &f;
+    r.VisibleToRegularObj = sym->isUsedInRegularObj;
+    if (r.Prevailing)
+      undefine(sym);
   }
-  checkError(LTOObj->add(std::move(F.Obj), Resols));
+  checkError(ltoObj->add(std::move(f.obj), resols));
 }
 
 // Merge all the bitcode files we have seen, codegen the result
 // and return the resulting objects.
 std::vector<StringRef> BitcodeCompiler::compile() {
-  unsigned MaxTasks = LTOObj->getMaxTasks();
-  Buf.resize(MaxTasks);
-  Files.resize(MaxTasks);
+  unsigned maxTasks = ltoObj->getMaxTasks();
+  buf.resize(maxTasks);
+  files.resize(maxTasks);
 
   // The /lldltocache option specifies the path to a directory in which to cache
   // native object files for ThinLTO incremental builds. If a path was
   // specified, configure LTO to use it as the cache directory.
-  lto::NativeObjectCache Cache;
-  if (!Config->LTOCache.empty())
-    Cache = check(lto::localCache(
-        Config->LTOCache, [&](size_t Task, std::unique_ptr<MemoryBuffer> MB) {
-          Files[Task] = std::move(MB);
+  lto::NativeObjectCache cache;
+  if (!config->ltoCache.empty())
+    cache = check(lto::localCache(
+        config->ltoCache, [&](size_t task, std::unique_ptr<MemoryBuffer> mb) {
+          files[task] = std::move(mb);
         }));
 
-  checkError(LTOObj->run(
-      [&](size_t Task) {
+  checkError(ltoObj->run(
+      [&](size_t task) {
         return llvm::make_unique<lto::NativeObjectStream>(
-            llvm::make_unique<raw_svector_ostream>(Buf[Task]));
+            llvm::make_unique<raw_svector_ostream>(buf[task]));
       },
-      Cache));
+      cache));
 
-  if (!Config->LTOCache.empty())
-    pruneCache(Config->LTOCache, Config->LTOCachePolicy);
+  // Emit empty index files for non-indexed files
+  for (StringRef s : thinIndices) {
+    std::string path = getThinLTOOutputFile(s);
+    openFile(path + ".thinlto.bc");
+    if (config->thinLTOEmitImportsFiles)
+      openFile(path + ".imports");
+  }
 
-  std::vector<StringRef> Ret;
-  for (unsigned I = 0; I != MaxTasks; ++I) {
-    if (Buf[I].empty())
+  // ThinLTO with index only option is required to generate only the index
+  // files. After that, we exit from linker and ThinLTO backend runs in a
+  // distributed environment.
+  if (config->thinLTOIndexOnly) {
+    if (indexFile)
+      indexFile->close();
+    return {};
+  }
+
+  if (!config->ltoCache.empty())
+    pruneCache(config->ltoCache, config->ltoCachePolicy);
+
+  std::vector<StringRef> ret;
+  for (unsigned i = 0; i != maxTasks; ++i) {
+    if (buf[i].empty())
       continue;
-    if (Config->SaveTemps) {
-      if (I == 0)
-        saveBuffer(Buf[I], Config->OutputFile + ".lto.obj");
+    if (config->saveTemps) {
+      if (i == 0)
+        saveBuffer(buf[i], config->outputFile + ".lto.obj");
       else
-        saveBuffer(Buf[I], Config->OutputFile + Twine(I) + ".lto.obj");
+        saveBuffer(buf[i], config->outputFile + Twine(i) + ".lto.obj");
     }
-    Ret.emplace_back(Buf[I].data(), Buf[I].size());
+    ret.emplace_back(buf[i].data(), buf[i].size());
   }
 
-  for (std::unique_ptr<MemoryBuffer> &File : Files)
-    if (File)
-      Ret.push_back(File->getBuffer());
+  for (std::unique_ptr<MemoryBuffer> &file : files)
+    if (file)
+      ret.push_back(file->getBuffer());
 
-  return Ret;
+  return ret;
 }
diff --git a/deps/lld/COFF/LTO.h b/deps/lld/COFF/LTO.h
index f009246547807c30f8e518b4f747ec33b00b38b1..2a0cfa061c9516a4d4346e0a0a504b0339cc4bc7 100644
--- a/deps/lld/COFF/LTO.h
+++ b/deps/lld/COFF/LTO.h
@@ -1,9 +1,8 @@
 //===- LTO.h ----------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -22,7 +21,9 @@
 #define LLD_COFF_LTO_H
 
 #include "lld/Common/LLVM.h"
+#include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/SmallString.h"
+#include "llvm/Support/raw_ostream.h"
 #include <memory>
 #include <vector>
 
@@ -43,13 +44,15 @@ public:
   BitcodeCompiler();
   ~BitcodeCompiler();
 
-  void add(BitcodeFile &F);
+  void add(BitcodeFile &f);
   std::vector<StringRef> compile();
 
 private:
-  std::unique_ptr<llvm::lto::LTO> LTOObj;
-  std::vector<SmallString<0>> Buf;
-  std::vector<std::unique_ptr<MemoryBuffer>> Files;
+  std::unique_ptr<llvm::lto::LTO> ltoObj;
+  std::vector<SmallString<0>> buf;
+  std::vector<std::unique_ptr<MemoryBuffer>> files;
+  std::unique_ptr<llvm::raw_fd_ostream> indexFile;
+  llvm::DenseSet<StringRef> thinIndices;
 };
 }
 }
diff --git a/deps/lld/COFF/MapFile.cpp b/deps/lld/COFF/MapFile.cpp
index fd4894250223b649d455f631e4ab01a66cf7d118..f98cf8fa6130ff123992b729d497671ef07f669f 100644
--- a/deps/lld/COFF/MapFile.cpp
+++ b/deps/lld/COFF/MapFile.cpp
@@ -1,9 +1,8 @@
 //===- MapFile.cpp --------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -24,7 +23,7 @@
 #include "Symbols.h"
 #include "Writer.h"
 #include "lld/Common/ErrorHandler.h"
-#include "llvm/Support/Parallel.h"
+#include "lld/Common/Threads.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace llvm;
@@ -33,93 +32,93 @@ using namespace llvm::object;
 using namespace lld;
 using namespace lld::coff;
 
-typedef DenseMap<const SectionChunk *, SmallVector<DefinedRegular *, 4>>
-    SymbolMapTy;
+using SymbolMapTy =
+    DenseMap<const SectionChunk *, SmallVector<DefinedRegular *, 4>>;
 
-static const std::string Indent8 = "        ";          // 8 spaces
-static const std::string Indent16 = "                "; // 16 spaces
+static const std::string indent8 = "        ";          // 8 spaces
+static const std::string indent16 = "                "; // 16 spaces
 
 // Print out the first three columns of a line.
-static void writeHeader(raw_ostream &OS, uint64_t Addr, uint64_t Size,
-                        uint64_t Align) {
-  OS << format("%08llx %08llx %5lld ", Addr, Size, Align);
+static void writeHeader(raw_ostream &os, uint64_t addr, uint64_t size,
+                        uint64_t align) {
+  os << format("%08llx %08llx %5lld ", addr, size, align);
 }
 
 // Returns a list of all symbols that we want to print out.
 static std::vector<DefinedRegular *> getSymbols() {
-  std::vector<DefinedRegular *> V;
-  for (ObjFile *File : ObjFile::Instances)
-    for (Symbol *B : File->getSymbols())
-      if (auto *Sym = dyn_cast_or_null<DefinedRegular>(B))
-        if (Sym && !Sym->getCOFFSymbol().isSectionDefinition())
-          V.push_back(Sym);
-  return V;
+  std::vector<DefinedRegular *> v;
+  for (ObjFile *file : ObjFile::instances)
+    for (Symbol *b : file->getSymbols())
+      if (auto *sym = dyn_cast_or_null<DefinedRegular>(b))
+        if (sym && !sym->getCOFFSymbol().isSectionDefinition())
+          v.push_back(sym);
+  return v;
 }
 
 // Returns a map from sections to their symbols.
-static SymbolMapTy getSectionSyms(ArrayRef<DefinedRegular *> Syms) {
-  SymbolMapTy Ret;
-  for (DefinedRegular *S : Syms)
-    Ret[S->getChunk()].push_back(S);
+static SymbolMapTy getSectionSyms(ArrayRef<DefinedRegular *> syms) {
+  SymbolMapTy ret;
+  for (DefinedRegular *s : syms)
+    ret[s->getChunk()].push_back(s);
 
   // Sort symbols by address.
-  for (auto &It : Ret) {
-    SmallVectorImpl<DefinedRegular *> &V = It.second;
-    std::sort(V.begin(), V.end(), [](DefinedRegular *A, DefinedRegular *B) {
-      return A->getRVA() < B->getRVA();
+  for (auto &it : ret) {
+    SmallVectorImpl<DefinedRegular *> &v = it.second;
+    std::sort(v.begin(), v.end(), [](DefinedRegular *a, DefinedRegular *b) {
+      return a->getRVA() < b->getRVA();
     });
   }
-  return Ret;
+  return ret;
 }
 
 // Construct a map from symbols to their stringified representations.
 static DenseMap<DefinedRegular *, std::string>
-getSymbolStrings(ArrayRef<DefinedRegular *> Syms) {
-  std::vector<std::string> Str(Syms.size());
-  for_each_n(parallel::par, (size_t)0, Syms.size(), [&](size_t I) {
-    raw_string_ostream OS(Str[I]);
-    writeHeader(OS, Syms[I]->getRVA(), 0, 0);
-    OS << Indent16 << toString(*Syms[I]);
+getSymbolStrings(ArrayRef<DefinedRegular *> syms) {
+  std::vector<std::string> str(syms.size());
+  parallelForEachN((size_t)0, syms.size(), [&](size_t i) {
+    raw_string_ostream os(str[i]);
+    writeHeader(os, syms[i]->getRVA(), 0, 0);
+    os << indent16 << toString(*syms[i]);
   });
 
-  DenseMap<DefinedRegular *, std::string> Ret;
-  for (size_t I = 0, E = Syms.size(); I < E; ++I)
-    Ret[Syms[I]] = std::move(Str[I]);
-  return Ret;
+  DenseMap<DefinedRegular *, std::string> ret;
+  for (size_t i = 0, e = syms.size(); i < e; ++i)
+    ret[syms[i]] = std::move(str[i]);
+  return ret;
 }
 
-void coff::writeMapFile(ArrayRef<OutputSection *> OutputSections) {
-  if (Config->MapFile.empty())
+void coff::writeMapFile(ArrayRef<OutputSection *> outputSections) {
+  if (config->mapFile.empty())
     return;
 
-  std::error_code EC;
-  raw_fd_ostream OS(Config->MapFile, EC, sys::fs::F_None);
-  if (EC)
-    fatal("cannot open " + Config->MapFile + ": " + EC.message());
+  std::error_code ec;
+  raw_fd_ostream os(config->mapFile, ec, sys::fs::F_None);
+  if (ec)
+    fatal("cannot open " + config->mapFile + ": " + ec.message());
 
   // Collect symbol info that we want to print out.
-  std::vector<DefinedRegular *> Syms = getSymbols();
-  SymbolMapTy SectionSyms = getSectionSyms(Syms);
-  DenseMap<DefinedRegular *, std::string> SymStr = getSymbolStrings(Syms);
+  std::vector<DefinedRegular *> syms = getSymbols();
+  SymbolMapTy sectionSyms = getSectionSyms(syms);
+  DenseMap<DefinedRegular *, std::string> symStr = getSymbolStrings(syms);
 
   // Print out the header line.
-  OS << "Address  Size     Align Out     In      Symbol\n";
+  os << "Address  Size     Align Out     In      Symbol\n";
 
   // Print out file contents.
-  for (OutputSection *Sec : OutputSections) {
-    writeHeader(OS, Sec->getRVA(), Sec->getVirtualSize(), /*Align=*/PageSize);
-    OS << Sec->Name << '\n';
+  for (OutputSection *sec : outputSections) {
+    writeHeader(os, sec->getRVA(), sec->getVirtualSize(), /*align=*/pageSize);
+    os << sec->name << '\n';
 
-    for (Chunk *C : Sec->Chunks) {
-      auto *SC = dyn_cast<SectionChunk>(C);
-      if (!SC)
+    for (Chunk *c : sec->chunks) {
+      auto *sc = dyn_cast<SectionChunk>(c);
+      if (!sc)
         continue;
 
-      writeHeader(OS, SC->getRVA(), SC->getSize(), SC->Alignment);
-      OS << Indent8 << SC->File->getName() << ":(" << SC->getSectionName()
+      writeHeader(os, sc->getRVA(), sc->getSize(), sc->getAlignment());
+      os << indent8 << sc->file->getName() << ":(" << sc->getSectionName()
          << ")\n";
-      for (DefinedRegular *Sym : SectionSyms[SC])
-        OS << SymStr[Sym] << '\n';
+      for (DefinedRegular *sym : sectionSyms[sc])
+        os << symStr[sym] << '\n';
     }
   }
 }
diff --git a/deps/lld/COFF/MapFile.h b/deps/lld/COFF/MapFile.h
index 0d0d68ce3ead01e6e790d89173976d700a6e2ae2..2bf01bd072856b53018f9419c797484b5fab0ed0 100644
--- a/deps/lld/COFF/MapFile.h
+++ b/deps/lld/COFF/MapFile.h
@@ -1,9 +1,8 @@
 //===- MapFile.h ------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -15,7 +14,7 @@
 namespace lld {
 namespace coff {
 class OutputSection;
-void writeMapFile(llvm::ArrayRef<OutputSection *> OutputSections);
+void writeMapFile(llvm::ArrayRef<OutputSection *> outputSections);
 }
 }
 
diff --git a/deps/lld/COFF/MarkLive.cpp b/deps/lld/COFF/MarkLive.cpp
index 18b1c9c2529fc4f9d1011ca0b83a83d3336e9c29..6d34cb864e3c3f5f6cddf73c63cc03dbd881841e 100644
--- a/deps/lld/COFF/MarkLive.cpp
+++ b/deps/lld/COFF/MarkLive.cpp
@@ -1,9 +1,8 @@
 //===- MarkLive.cpp -------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -16,57 +15,57 @@
 namespace lld {
 namespace coff {
 
-static Timer GCTimer("GC", Timer::root());
+static Timer gctimer("GC", Timer::root());
 
 // Set live bit on for each reachable chunk. Unmarked (unreachable)
 // COMDAT chunks will be ignored by Writer, so they will be excluded
 // from the final output.
-void markLive(ArrayRef<Chunk *> Chunks) {
-  ScopedTimer T(GCTimer);
+void markLive(ArrayRef<Chunk *> chunks) {
+  ScopedTimer t(gctimer);
 
   // We build up a worklist of sections which have been marked as live. We only
   // push into the worklist when we discover an unmarked section, and we mark
   // as we push, so sections never appear twice in the list.
-  SmallVector<SectionChunk *, 256> Worklist;
+  SmallVector<SectionChunk *, 256> worklist;
 
   // COMDAT section chunks are dead by default. Add non-COMDAT chunks.
-  for (Chunk *C : Chunks)
-    if (auto *SC = dyn_cast<SectionChunk>(C))
-      if (SC->Live)
-        Worklist.push_back(SC);
+  for (Chunk *c : chunks)
+    if (auto *sc = dyn_cast<SectionChunk>(c))
+      if (sc->live)
+        worklist.push_back(sc);
 
-  auto Enqueue = [&](SectionChunk *C) {
-    if (C->Live)
+  auto enqueue = [&](SectionChunk *c) {
+    if (c->live)
       return;
-    C->Live = true;
-    Worklist.push_back(C);
+    c->live = true;
+    worklist.push_back(c);
   };
 
-  auto AddSym = [&](Symbol *B) {
-    if (auto *Sym = dyn_cast<DefinedRegular>(B))
-      Enqueue(Sym->getChunk());
-    else if (auto *Sym = dyn_cast<DefinedImportData>(B))
-      Sym->File->Live = true;
-    else if (auto *Sym = dyn_cast<DefinedImportThunk>(B))
-      Sym->WrappedSym->File->Live = Sym->WrappedSym->File->ThunkLive = true;
+  auto addSym = [&](Symbol *b) {
+    if (auto *sym = dyn_cast<DefinedRegular>(b))
+      enqueue(sym->getChunk());
+    else if (auto *sym = dyn_cast<DefinedImportData>(b))
+      sym->file->live = true;
+    else if (auto *sym = dyn_cast<DefinedImportThunk>(b))
+      sym->wrappedSym->file->live = sym->wrappedSym->file->thunkLive = true;
   };
 
   // Add GC root chunks.
-  for (Symbol *B : Config->GCRoot)
-    AddSym(B);
+  for (Symbol *b : config->gcroot)
+    addSym(b);
 
-  while (!Worklist.empty()) {
-    SectionChunk *SC = Worklist.pop_back_val();
-    assert(SC->Live && "We mark as live when pushing onto the worklist!");
+  while (!worklist.empty()) {
+    SectionChunk *sc = worklist.pop_back_val();
+    assert(sc->live && "We mark as live when pushing onto the worklist!");
 
     // Mark all symbols listed in the relocation table for this section.
-    for (Symbol *B : SC->symbols())
-      if (B)
-        AddSym(B);
+    for (Symbol *b : sc->symbols())
+      if (b)
+        addSym(b);
 
     // Mark associative sections if any.
-    for (SectionChunk *C : SC->children())
-      Enqueue(C);
+    for (SectionChunk &c : sc->children())
+      enqueue(&c);
   }
 }
 
diff --git a/deps/lld/COFF/MarkLive.h b/deps/lld/COFF/MarkLive.h
index 5b652dd481966fc593ddba7c85a1bdb8290f991e..e4e4c31c7c796a55a5b9d915f9a088957c1feda2 100644
--- a/deps/lld/COFF/MarkLive.h
+++ b/deps/lld/COFF/MarkLive.h
@@ -1,9 +1,8 @@
 //===- MarkLive.h -----------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -16,7 +15,9 @@
 namespace lld {
 namespace coff {
 
-void markLive(ArrayRef<Chunk *> Chunks);
+class Chunk;
+
+void markLive(ArrayRef<Chunk *> chunks);
 
 } // namespace coff
 } // namespace lld
diff --git a/deps/lld/COFF/MinGW.cpp b/deps/lld/COFF/MinGW.cpp
index b2c8c4eadca445e2ffe94b0276fd2b0062983f6a..2ca8ca0c058c70c66bdc6da70434f6ff4694af5f 100644
--- a/deps/lld/COFF/MinGW.cpp
+++ b/deps/lld/COFF/MinGW.cpp
@@ -1,9 +1,8 @@
 //===- MinGW.cpp ----------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -19,8 +18,35 @@ using namespace lld::coff;
 using namespace llvm;
 using namespace llvm::COFF;
 
-void AutoExporter::initSymbolExcludes() {
-  ExcludeSymbolPrefixes = {
+AutoExporter::AutoExporter() {
+  excludeLibs = {
+      "libgcc",
+      "libgcc_s",
+      "libstdc++",
+      "libmingw32",
+      "libmingwex",
+      "libg2c",
+      "libsupc++",
+      "libobjc",
+      "libgcj",
+      "libclang_rt.builtins",
+      "libclang_rt.builtins-aarch64",
+      "libclang_rt.builtins-arm",
+      "libclang_rt.builtins-i386",
+      "libclang_rt.builtins-x86_64",
+      "libc++",
+      "libc++abi",
+      "libunwind",
+      "libmsvcrt",
+      "libucrtbase",
+  };
+
+  excludeObjects = {
+      "crt0.o",    "crt1.o",  "crt1u.o", "crt2.o",  "crt2u.o",    "dllcrt1.o",
+      "dllcrt2.o", "gcrt0.o", "gcrt1.o", "gcrt2.o", "crtbegin.o", "crtend.o",
+  };
+
+  excludeSymbolPrefixes = {
       // Import symbols
       "__imp_",
       "__IMPORT_DESCRIPTOR_",
@@ -32,12 +58,14 @@ void AutoExporter::initSymbolExcludes() {
       // Artifical symbols such as .refptr
       ".",
   };
-  ExcludeSymbolSuffixes = {
+
+  excludeSymbolSuffixes = {
       "_iname",
       "_NULL_THUNK_DATA",
   };
-  if (Config->Machine == I386) {
-    ExcludeSymbols = {
+
+  if (config->machine == I386) {
+    excludeSymbols = {
         "__NULL_IMPORT_DESCRIPTOR",
         "__pei386_runtime_relocator",
         "_do_pseudo_reloc",
@@ -52,9 +80,9 @@ void AutoExporter::initSymbolExcludes() {
         "_DllEntryPoint@12",
         "_DllMainCRTStartup@12",
     };
-    ExcludeSymbolPrefixes.insert("__head_");
+    excludeSymbolPrefixes.insert("__head_");
   } else {
-    ExcludeSymbols = {
+    excludeSymbols = {
         "__NULL_IMPORT_DESCRIPTOR",
         "_pei386_runtime_relocator",
         "do_pseudo_reloc",
@@ -69,108 +97,70 @@ void AutoExporter::initSymbolExcludes() {
         "DllEntryPoint",
         "DllMainCRTStartup",
     };
-    ExcludeSymbolPrefixes.insert("_head_");
+    excludeSymbolPrefixes.insert("_head_");
   }
 }
 
-AutoExporter::AutoExporter() {
-  ExcludeLibs = {
-      "libgcc",
-      "libgcc_s",
-      "libstdc++",
-      "libmingw32",
-      "libmingwex",
-      "libg2c",
-      "libsupc++",
-      "libobjc",
-      "libgcj",
-      "libclang_rt.builtins",
-      "libclang_rt.builtins-aarch64",
-      "libclang_rt.builtins-arm",
-      "libclang_rt.builtins-i386",
-      "libclang_rt.builtins-x86_64",
-      "libc++",
-      "libc++abi",
-      "libunwind",
-      "libmsvcrt",
-      "libucrtbase",
-  };
-  ExcludeObjects = {
-      "crt0.o",
-      "crt1.o",
-      "crt1u.o",
-      "crt2.o",
-      "crt2u.o",
-      "dllcrt1.o",
-      "dllcrt2.o",
-      "gcrt0.o",
-      "gcrt1.o",
-      "gcrt2.o",
-      "crtbegin.o",
-      "crtend.o",
-  };
-}
-
-void AutoExporter::addWholeArchive(StringRef Path) {
-  StringRef LibName = sys::path::filename(Path);
+void AutoExporter::addWholeArchive(StringRef path) {
+  StringRef libName = sys::path::filename(path);
   // Drop the file extension, to match the processing below.
-  LibName = LibName.substr(0, LibName.rfind('.'));
-  ExcludeLibs.erase(LibName);
+  libName = libName.substr(0, libName.rfind('.'));
+  excludeLibs.erase(libName);
 }
 
-bool AutoExporter::shouldExport(Defined *Sym) const {
-  if (!Sym || !Sym->isLive() || !Sym->getChunk())
+bool AutoExporter::shouldExport(Defined *sym) const {
+  if (!sym || !sym->isLive() || !sym->getChunk())
     return false;
 
   // Only allow the symbol kinds that make sense to export; in particular,
   // disallow import symbols.
-  if (!isa<DefinedRegular>(Sym) && !isa<DefinedCommon>(Sym))
+  if (!isa<DefinedRegular>(sym) && !isa<DefinedCommon>(sym))
     return false;
-  if (ExcludeSymbols.count(Sym->getName()))
+  if (excludeSymbols.count(sym->getName()))
     return false;
 
-  for (StringRef Prefix : ExcludeSymbolPrefixes.keys())
-    if (Sym->getName().startswith(Prefix))
+  for (StringRef prefix : excludeSymbolPrefixes.keys())
+    if (sym->getName().startswith(prefix))
       return false;
-  for (StringRef Suffix : ExcludeSymbolSuffixes.keys())
-    if (Sym->getName().endswith(Suffix))
+  for (StringRef suffix : excludeSymbolSuffixes.keys())
+    if (sym->getName().endswith(suffix))
       return false;
 
   // If a corresponding __imp_ symbol exists and is defined, don't export it.
-  if (Symtab->find(("__imp_" + Sym->getName()).str()))
+  if (symtab->find(("__imp_" + sym->getName()).str()))
     return false;
 
   // Check that file is non-null before dereferencing it, symbols not
   // originating in regular object files probably shouldn't be exported.
-  if (!Sym->getFile())
+  if (!sym->getFile())
     return false;
 
-  StringRef LibName = sys::path::filename(Sym->getFile()->ParentName);
+  StringRef libName = sys::path::filename(sym->getFile()->parentName);
 
   // Drop the file extension.
-  LibName = LibName.substr(0, LibName.rfind('.'));
-  if (!LibName.empty())
-    return !ExcludeLibs.count(LibName);
+  libName = libName.substr(0, libName.rfind('.'));
+  if (!libName.empty())
+    return !excludeLibs.count(libName);
 
-  StringRef FileName = sys::path::filename(Sym->getFile()->getName());
-  return !ExcludeObjects.count(FileName);
+  StringRef fileName = sys::path::filename(sym->getFile()->getName());
+  return !excludeObjects.count(fileName);
 }
 
-void coff::writeDefFile(StringRef Name) {
-  std::error_code EC;
-  raw_fd_ostream OS(Name, EC, sys::fs::F_None);
-  if (EC)
-    fatal("cannot open " + Name + ": " + EC.message());
+void coff::writeDefFile(StringRef name) {
+  std::error_code ec;
+  raw_fd_ostream os(name, ec, sys::fs::F_None);
+  if (ec)
+    fatal("cannot open " + name + ": " + ec.message());
 
-  OS << "EXPORTS\n";
-  for (Export &E : Config->Exports) {
-    OS << "    " << E.ExportName << " "
-       << "@" << E.Ordinal;
-    if (auto *Def = dyn_cast_or_null<Defined>(E.Sym)) {
-      if (Def && Def->getChunk() &&
-          !(Def->getChunk()->getOutputCharacteristics() & IMAGE_SCN_MEM_EXECUTE))
-        OS << " DATA";
+  os << "EXPORTS\n";
+  for (Export &e : config->exports) {
+    os << "    " << e.exportName << " "
+       << "@" << e.ordinal;
+    if (auto *def = dyn_cast_or_null<Defined>(e.sym)) {
+      if (def && def->getChunk() &&
+          !(def->getChunk()->getOutputCharacteristics() & IMAGE_SCN_MEM_EXECUTE))
+        os << " DATA";
     }
-    OS << "\n";
+    os << "\n";
   }
 }
diff --git a/deps/lld/COFF/MinGW.h b/deps/lld/COFF/MinGW.h
index f9c5e3e5c2cc5dfbe4cb1840081cbbe29d013866..578a277561ad9943ba01659861a02f29bc5a77e8 100644
--- a/deps/lld/COFF/MinGW.h
+++ b/deps/lld/COFF/MinGW.h
@@ -1,9 +1,8 @@
 //===- MinGW.h --------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -23,20 +22,18 @@ class AutoExporter {
 public:
   AutoExporter();
 
-  void initSymbolExcludes();
+  void addWholeArchive(StringRef path);
 
-  void addWholeArchive(StringRef Path);
+  llvm::StringSet<> excludeSymbols;
+  llvm::StringSet<> excludeSymbolPrefixes;
+  llvm::StringSet<> excludeSymbolSuffixes;
+  llvm::StringSet<> excludeLibs;
+  llvm::StringSet<> excludeObjects;
 
-  llvm::StringSet<> ExcludeSymbols;
-  llvm::StringSet<> ExcludeSymbolPrefixes;
-  llvm::StringSet<> ExcludeSymbolSuffixes;
-  llvm::StringSet<> ExcludeLibs;
-  llvm::StringSet<> ExcludeObjects;
-
-  bool shouldExport(Defined *Sym) const;
+  bool shouldExport(Defined *sym) const;
 };
 
-void writeDefFile(StringRef Name);
+void writeDefFile(StringRef name);
 
 } // namespace coff
 } // namespace lld
diff --git a/deps/lld/COFF/Options.td b/deps/lld/COFF/Options.td
index acf1bc5c8b1dc9262383abfe882967e9c0037753..024b7be8f78d19f32a7831be93df2484293fb191 100644
--- a/deps/lld/COFF/Options.td
+++ b/deps/lld/COFF/Options.td
@@ -3,11 +3,11 @@ include "llvm/Option/OptParser.td"
 // link.exe accepts options starting with either a dash or a slash.
 
 // Flag that takes no arguments.
-class F<string name> : Flag<["/", "-", "-?"], name>;
+class F<string name> : Flag<["/", "-", "/?", "-?"], name>;
 
 // Flag that takes one argument after ":".
 class P<string name, string help> :
-      Joined<["/", "-", "-?"], name#":">, HelpText<help>;
+      Joined<["/", "-", "/?", "-?"], name#":">, HelpText<help>;
 
 // Boolean flag which can be suffixed by ":no". Using it unsuffixed turns the
 // flag on and using it suffixed by ":no" turns it off.
@@ -32,6 +32,9 @@ def errorlimit : P<"errorlimit",
 def export  : P<"export", "Export a function">;
 // No help text because /failifmismatch is not intended to be used by the user.
 def failifmismatch : P<"failifmismatch", "">;
+def filealign : P<"filealign", "Section alignment in the output file">;
+def functionpadmin : F<"functionpadmin">;
+def functionpadmin_opt : P<"functionpadmin", "Prepares an image for hotpatching">;
 def guard   : P<"guard", "Control flow guard">;
 def heap    : P<"heap", "Size of the heap">;
 def ignore : P<"ignore", "Specify warning codes to ignore">;
@@ -64,7 +67,8 @@ def timestamp : P<"timestamp", "Specify the PE header timestamp">;
 def version : P<"version", "Specify a version number in the PE header">;
 def wholearchive_file : P<"wholearchive", "Include all object files from this archive">;
 
-def disallowlib : Joined<["/", "-", "-?"], "disallowlib:">, Alias<nodefaultlib>;
+def disallowlib : Joined<["/", "-", "/?", "-?"], "disallowlib:">,
+    Alias<nodefaultlib>;
 
 def manifest : F<"manifest">, HelpText<"Create .manifest file">;
 def manifest_colon : P<
@@ -82,11 +86,11 @@ def manifestinput : P<
 // We cannot use multiclass P because class name "incl" is different
 // from its command line option name. We do this because "include" is
 // a reserved keyword in tablegen.
-def incl : Joined<["/", "-"], "include:">,
+def incl : Joined<["/", "-", "/?", "-?"], "include:">,
     HelpText<"Force symbol to be added to symbol table as undefined one">;
 
 // "def" is also a keyword.
-def deffile : Joined<["/", "-"], "def:">,
+def deffile : Joined<["/", "-", "/?", "-?"], "def:">,
     HelpText<"Use module-definition file">;
 
 def debug : F<"debug">, HelpText<"Embed a symbol table in the image">;
@@ -101,8 +105,12 @@ def noentry : F<"noentry">,
 def profile : F<"profile">;
 def repro : F<"Brepro">,
     HelpText<"Use a hash of the executable as the PE header timestamp">;
-def swaprun_cd : F<"swaprun:cd">;
-def swaprun_net : F<"swaprun:net">;
+def swaprun : P<"swaprun",
+  "Comma-separated list of 'cd' or 'net'">;
+def swaprun_cd : F<"swaprun:cd">, Alias<swaprun>, AliasArgs<["cd"]>,
+  HelpText<"Make loader run output binary from swap instead of from CD">;
+def swaprun_net : F<"swaprun:net">, Alias<swaprun>, AliasArgs<["net"]>,
+  HelpText<"Make loader run output binary from swap instead of from network">;
 def verbose : F<"verbose">;
 def wholearchive_flag : F<"wholearchive">;
 
@@ -112,6 +120,8 @@ def force_unresolved : F<"force:unresolved">,
     HelpText<"Allow undefined symbols when creating executables">;
 def force_multiple : F<"force:multiple">,
     HelpText<"Allow multiply defined symbols when creating executables">;
+def force_multipleres : F<"force:multipleres">,
+    HelpText<"Allow multiply defined resources when creating executables">;
 defm WX : B<"WX", "Treat warnings as errors", "Don't treat warnings as errors">;
 
 defm allowbind : B<"allowbind", "Enable DLL binding (default)",
@@ -147,37 +157,58 @@ defm tsaware  : B<"tsaware",
                   "Create non-Terminal Server aware executable">;
 
 def help : F<"help">;
-def help_q : Flag<["/?", "-?"], "">, Alias<help>;
+
+// /?? and -?? must be before /? and -? to not confuse lib/Options.
+def help_q : Flag<["/??", "-??", "/?", "-?"], "">, Alias<help>;
 
 // LLD extensions
+def exclude_all_symbols : F<"exclude-all-symbols">;
 def export_all_symbols : F<"export-all-symbols">;
+defm demangle : B<"demangle",
+    "Demangle symbols in output (default)",
+    "Do not demangle symbols in output">;
+def include_optional : Joined<["/", "-", "/?", "-?"], "includeoptional:">,
+    HelpText<"Add symbol as undefined, but allow it to remain undefined">;
 def kill_at : F<"kill-at">;
 def lldmingw : F<"lldmingw">;
-def output_def : Joined<["/", "-"], "output-def:">;
+def output_def : Joined<["/", "-", "/?", "-?"], "output-def:">;
 def pdb_source_path : P<"pdbsourcepath",
                         "Base path used to make relative source file path absolute in PDB">;
 def rsp_quoting : Joined<["--"], "rsp-quoting=">,
   HelpText<"Quoting style for response files, 'windows' (default) or 'posix'">;
+def thinlto_emit_imports_files :
+    F<"thinlto-emit-imports-files">,
+    HelpText<"Emit .imports files with -thinlto-index-only">;
+def thinlto_index_only :
+    F<"thinlto-index-only">,
+    HelpText<"Instead of linking, emit ThinLTO index files">;
+def thinlto_index_only_arg : P<
+    "thinlto-index-only",
+    "-thinlto-index-only and also write native module names to file">;
+def thinlto_object_suffix_replace : P<
+    "thinlto-object-suffix-replace",
+    "'old;new' replace old suffix with new suffix in ThinLTO index">;
+def thinlto_prefix_replace: P<
+    "thinlto-prefix-replace",
+    "'old;new' replace old prefix with new prefix in ThinLTO outputs">;
 def dash_dash_version : Flag<["--"], "version">,
   HelpText<"Print version information">;
+defm threads: B<"threads",
+    "Run the linker multi-threaded (default)",
+    "Do not run the linker multi-threaded">;
 
 // Flags for debugging
 def lldmap : F<"lldmap">;
-def lldmap_file : Joined<["/", "-"], "lldmap:">;
+def lldmap_file : Joined<["/", "-", "/?", "-?"], "lldmap:">;
 def show_timing : F<"time">;
+def summary : F<"summary">;
 
 //==============================================================================
 // The flags below do nothing. They are defined only for link.exe compatibility.
 //==============================================================================
 
-class QF<string name> : Joined<["/", "-", "-?"], name#":">;
+class QF<string name> : Joined<["/", "-", "/?", "-?"], name#":">;
 
-multiclass QB<string name> {
-  def "" : F<name>;
-  def _no : F<name#":no">;
-}
-
-def functionpadmin : F<"functionpadmin">;
 def ignoreidl : F<"ignoreidl">;
 def nologo : F<"nologo">;
 def throwingnew : F<"throwingnew">;
diff --git a/deps/lld/COFF/PDB.cpp b/deps/lld/COFF/PDB.cpp
index 7757b89e2b36d5e37839eee2048bf82df8284882..a55e5136e040b6df495bbb6ccdbac0c60b237d91 100644
--- a/deps/lld/COFF/PDB.cpp
+++ b/deps/lld/COFF/PDB.cpp
@@ -1,21 +1,23 @@
 //===- PDB.cpp ------------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "PDB.h"
 #include "Chunks.h"
 #include "Config.h"
+#include "DebugTypes.h"
 #include "Driver.h"
 #include "SymbolTable.h"
 #include "Symbols.h"
+#include "TypeMerger.h"
 #include "Writer.h"
 #include "lld/Common/ErrorHandler.h"
 #include "lld/Common/Timer.h"
+#include "lld/Common/Threads.h"
 #include "llvm/DebugInfo/CodeView/DebugFrameDataSubsection.h"
 #include "llvm/DebugInfo/CodeView/DebugSubsectionRecord.h"
 #include "llvm/DebugInfo/CodeView/GlobalTypeTableBuilder.h"
@@ -53,7 +55,6 @@
 #include "llvm/Support/Errc.h"
 #include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/JamCRC.h"
-#include "llvm/Support/Parallel.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/ScopedPrinter.h"
 #include <memory>
@@ -65,44 +66,34 @@ using namespace llvm::codeview;
 
 using llvm::object::coff_section;
 
-static ExitOnError ExitOnErr;
+static ExitOnError exitOnErr;
 
-static Timer TotalPdbLinkTimer("PDB Emission (Cumulative)", Timer::root());
+static Timer totalPdbLinkTimer("PDB Emission (Cumulative)", Timer::root());
 
-static Timer AddObjectsTimer("Add Objects", TotalPdbLinkTimer);
-static Timer TypeMergingTimer("Type Merging", AddObjectsTimer);
-static Timer SymbolMergingTimer("Symbol Merging", AddObjectsTimer);
-static Timer GlobalsLayoutTimer("Globals Stream Layout", TotalPdbLinkTimer);
-static Timer TpiStreamLayoutTimer("TPI Stream Layout", TotalPdbLinkTimer);
-static Timer DiskCommitTimer("Commit to Disk", TotalPdbLinkTimer);
+static Timer addObjectsTimer("Add Objects", totalPdbLinkTimer);
+static Timer typeMergingTimer("Type Merging", addObjectsTimer);
+static Timer symbolMergingTimer("Symbol Merging", addObjectsTimer);
+static Timer globalsLayoutTimer("Globals Stream Layout", totalPdbLinkTimer);
+static Timer tpiStreamLayoutTimer("TPI Stream Layout", totalPdbLinkTimer);
+static Timer diskCommitTimer("Commit to Disk", totalPdbLinkTimer);
 
 namespace {
-/// Map from type index and item index in a type server PDB to the
-/// corresponding index in the destination PDB.
-struct CVIndexMap {
-  SmallVector<TypeIndex, 0> TPIMap;
-  SmallVector<TypeIndex, 0> IPIMap;
-  bool IsTypeServerMap = false;
-  bool IsPrecompiledTypeMap = false;
-};
-
 class DebugSHandler;
 
 class PDBLinker {
   friend DebugSHandler;
 
 public:
-  PDBLinker(SymbolTable *Symtab)
-      : Alloc(), Symtab(Symtab), Builder(Alloc), TypeTable(Alloc),
-        IDTable(Alloc), GlobalTypeTable(Alloc), GlobalIDTable(Alloc) {
+  PDBLinker(SymbolTable *symtab)
+      : alloc(), symtab(symtab), builder(alloc), tMerger(alloc) {
     // This isn't strictly necessary, but link.exe usually puts an empty string
     // as the first "valid" string in the string table, so we do the same in
     // order to maintain as much byte-for-byte compatibility as possible.
-    PDBStrTab.insert("");
+    pdbStrTab.insert("");
   }
 
   /// Emit the basic PDB structure: initial streams, headers, etc.
-  void initialize(llvm::codeview::DebugInfo *BuildId);
+  void initialize(llvm::codeview::DebugInfo *buildId);
 
   /// Add natvis files specified on the command line.
   void addNatvisFiles();
@@ -110,10 +101,13 @@ public:
   /// Link CodeView from each object file in the symbol table into the PDB.
   void addObjectsToPDB();
 
+  /// Link info for each import file in the symbol table into the PDB.
+  void addImportFilesToPDB(ArrayRef<OutputSection *> outputSections);
+
   /// Link CodeView from a single object file into the target (output) PDB.
   /// When a precompiled headers object is linked, its TPI map might be provided
   /// externally.
-  void addObjFile(ObjFile *File, CVIndexMap *ExternIndexMap = nullptr);
+  void addObjFile(ObjFile *file, CVIndexMap *externIndexMap = nullptr);
 
   /// Produce a mapping from the type and item indices used in the object
   /// file to those in the destination PDB.
@@ -125,20 +119,17 @@ public:
   ///
   /// If the object does not use a type server PDB (compiled with /Z7), we merge
   /// all the type and item records from the .debug$S stream and fill in the
-  /// caller-provided ObjectIndexMap.
-  Expected<const CVIndexMap &> mergeDebugT(ObjFile *File,
-                                           CVIndexMap *ObjectIndexMap);
+  /// caller-provided objectIndexMap.
+  Expected<const CVIndexMap &> mergeDebugT(ObjFile *file,
+                                           CVIndexMap *objectIndexMap);
 
   /// Reads and makes available a PDB.
-  Expected<const CVIndexMap &> maybeMergeTypeServerPDB(ObjFile *File,
-                                                       const CVType &FirstType);
+  Expected<const CVIndexMap &> maybeMergeTypeServerPDB(ObjFile *file);
 
   /// Merges a precompiled headers TPI map into the current TPI map. The
   /// precompiled headers object will also be loaded and remapped in the
   /// process.
-  Expected<const CVIndexMap &>
-  mergeInPrecompHeaderObj(ObjFile *File, const CVType &FirstType,
-                          CVIndexMap *ObjectIndexMap);
+  Error mergeInPrecompHeaderObj(ObjFile *file, CVIndexMap *objectIndexMap);
 
   /// Reads and makes available a precompiled headers object.
   ///
@@ -149,109 +140,87 @@ public:
   ///
   /// If the precompiled headers object was already loaded, this function will
   /// simply return its (remapped) TPI map.
-  Expected<const CVIndexMap &> aquirePrecompObj(ObjFile *File,
-                                                PrecompRecord Precomp);
+  Expected<const CVIndexMap &> aquirePrecompObj(ObjFile *file);
 
   /// Adds a precompiled headers object signature -> TPI mapping.
   std::pair<CVIndexMap &, bool /*already there*/>
-  registerPrecompiledHeaders(uint32_t Signature);
+  registerPrecompiledHeaders(uint32_t signature);
 
-  void mergeSymbolRecords(ObjFile *File, const CVIndexMap &IndexMap,
-                          std::vector<ulittle32_t *> &StringTableRefs,
-                          BinaryStreamRef SymData);
+  void mergeSymbolRecords(ObjFile *file, const CVIndexMap &indexMap,
+                          std::vector<ulittle32_t *> &stringTableRefs,
+                          BinaryStreamRef symData);
 
   /// Add the section map and section contributions to the PDB.
-  void addSections(ArrayRef<OutputSection *> OutputSections,
-                   ArrayRef<uint8_t> SectionTable);
-
-  /// Get the type table or the global type table if /DEBUG:GHASH is enabled.
-  TypeCollection &getTypeTable() {
-    if (Config->DebugGHashes)
-      return GlobalTypeTable;
-    return TypeTable;
-  }
-
-  /// Get the ID table or the global ID table if /DEBUG:GHASH is enabled.
-  TypeCollection &getIDTable() {
-    if (Config->DebugGHashes)
-      return GlobalIDTable;
-    return IDTable;
-  }
+  void addSections(ArrayRef<OutputSection *> outputSections,
+                   ArrayRef<uint8_t> sectionTable);
 
   /// Write the PDB to disk and store the Guid generated for it in *Guid.
-  void commit(codeview::GUID *Guid);
+  void commit(codeview::GUID *guid);
+
+  // Print statistics regarding the final PDB
+  void printStats();
 
 private:
-  BumpPtrAllocator Alloc;
+  BumpPtrAllocator alloc;
 
-  SymbolTable *Symtab;
+  SymbolTable *symtab;
 
-  pdb::PDBFileBuilder Builder;
+  pdb::PDBFileBuilder builder;
 
-  /// Type records that will go into the PDB TPI stream.
-  MergingTypeTableBuilder TypeTable;
-
-  /// Item records that will go into the PDB IPI stream.
-  MergingTypeTableBuilder IDTable;
-
-  /// Type records that will go into the PDB TPI stream (for /DEBUG:GHASH)
-  GlobalTypeTableBuilder GlobalTypeTable;
-
-  /// Item records that will go into the PDB IPI stream (for /DEBUG:GHASH)
-  GlobalTypeTableBuilder GlobalIDTable;
+  TypeMerger tMerger;
 
   /// PDBs use a single global string table for filenames in the file checksum
   /// table.
-  DebugStringTableSubsection PDBStrTab;
+  DebugStringTableSubsection pdbStrTab;
 
-  llvm::SmallString<128> NativePath;
+  llvm::SmallString<128> nativePath;
 
-  /// A list of other PDBs which are loaded during the linking process and which
-  /// we need to keep around since the linking operation may reference pointers
-  /// inside of these PDBs.
-  llvm::SmallVector<std::unique_ptr<pdb::NativeSession>, 2> LoadedPDBs;
-
-  std::vector<pdb::SecMapEntry> SectionMap;
+  std::vector<pdb::SecMapEntry> sectionMap;
 
   /// Type index mappings of type server PDBs that we've loaded so far.
-  std::map<codeview::GUID, CVIndexMap> TypeServerIndexMappings;
+  std::map<codeview::GUID, CVIndexMap> typeServerIndexMappings;
 
   /// Type index mappings of precompiled objects type map that we've loaded so
   /// far.
-  std::map<uint32_t, CVIndexMap> PrecompTypeIndexMappings;
+  std::map<uint32_t, CVIndexMap> precompTypeIndexMappings;
 
-  /// List of TypeServer PDBs which cannot be loaded.
-  /// Cached to prevent repeated load attempts.
-  std::map<codeview::GUID, std::string> MissingTypeServerPDBs;
+  // For statistics
+  uint64_t globalSymbols = 0;
+  uint64_t moduleSymbols = 0;
+  uint64_t publicSymbols = 0;
 };
 
 class DebugSHandler {
-  PDBLinker &Linker;
+  PDBLinker &linker;
 
   /// The object file whose .debug$S sections we're processing.
-  ObjFile &File;
+  ObjFile &file;
 
   /// The result of merging type indices.
-  const CVIndexMap &IndexMap;
+  const CVIndexMap &indexMap;
 
   /// The DEBUG_S_STRINGTABLE subsection.  These strings are referred to by
   /// index from other records in the .debug$S section.  All of these strings
   /// need to be added to the global PDB string table, and all references to
   /// these strings need to have their indices re-written to refer to the
   /// global PDB string table.
-  DebugStringTableSubsectionRef CVStrTab;
+  DebugStringTableSubsectionRef cVStrTab;
 
   /// The DEBUG_S_FILECHKSMS subsection.  As above, these are referred to
   /// by other records in the .debug$S section and need to be merged into the
   /// PDB.
-  DebugChecksumsSubsectionRef Checksums;
+  DebugChecksumsSubsectionRef checksums;
+
+  /// The DEBUG_S_INLINEELINES subsection. There can be only one of these per
+  /// object file.
+  DebugInlineeLinesSubsectionRef inlineeLines;
 
   /// The DEBUG_S_FRAMEDATA subsection(s).  There can be more than one of
   /// these and they need not appear in any specific order.  However, they
   /// contain string table references which need to be re-written, so we
   /// collect them all here and re-write them after all subsections have been
   /// discovered and processed.
-  std::vector<DebugFrameDataSubsectionRef> NewFpoFrames;
+  std::vector<DebugFrameDataSubsectionRef> newFpoFrames;
 
   /// Pointers to raw memory that we determine have string table references
   /// that need to be re-written.  We first process all .debug$S subsections
@@ -259,13 +228,17 @@ class DebugSHandler {
   /// up this list as we go.  At the end, we use the string table (which must
   /// have been discovered by now else it is an error) to re-write these
   /// references.
-  std::vector<ulittle32_t *> StringTableReferences;
+  std::vector<ulittle32_t *> stringTableReferences;
 
 public:
-  DebugSHandler(PDBLinker &Linker, ObjFile &File, const CVIndexMap &IndexMap)
-      : Linker(Linker), File(File), IndexMap(IndexMap) {}
+  DebugSHandler(PDBLinker &linker, ObjFile &file, const CVIndexMap &indexMap)
+      : linker(linker), file(file), indexMap(indexMap) {}
+
+  void handleDebugS(lld::coff::SectionChunk &debugS);
+
+  std::shared_ptr<DebugInlineeLinesSubsection>
+  mergeInlineeLines(DebugChecksumsSubsection *newChecksums);
 
-  void handleDebugS(lld::coff::SectionChunk &DebugS);
   void finish();
 };
 }
@@ -273,7 +246,7 @@ public:
 // Visual Studio's debugger requires absolute paths in various places in the
 // PDB to work without additional configuration:
 // https://docs.microsoft.com/en-us/visualstudio/debugger/debug-source-files-common-properties-solution-property-pages-dialog-box
-static void pdbMakeAbsolute(SmallVectorImpl<char> &FileName) {
+static void pdbMakeAbsolute(SmallVectorImpl<char> &fileName) {
   // The default behavior is to produce paths that are valid within the context
   // of the machine that you perform the link on.  If the linker is running on
   // a POSIX system, we will output absolute POSIX paths.  If the linker is
@@ -281,16 +254,16 @@ static void pdbMakeAbsolute(SmallVectorImpl<char> &FileName) {
   // user desires any other kind of behavior, they should explicitly pass
   // /pdbsourcepath, in which case we will treat the exact string the user
   // passed in as the gospel and not normalize, canonicalize it.
-  if (sys::path::is_absolute(FileName, sys::path::Style::windows) ||
-      sys::path::is_absolute(FileName, sys::path::Style::posix))
+  if (sys::path::is_absolute(fileName, sys::path::Style::windows) ||
+      sys::path::is_absolute(fileName, sys::path::Style::posix))
     return;
 
   // It's not absolute in any path syntax.  Relative paths necessarily refer to
   // the local file system, so we can make it native without ending up with a
   // nonsensical path.
-  if (Config->PDBSourcePath.empty()) {
-    sys::path::native(FileName);
-    sys::fs::make_absolute(FileName);
+  if (config->pdbSourcePath.empty()) {
+    sys::path::native(fileName);
+    sys::fs::make_absolute(fileName);
     return;
   }
 
@@ -298,397 +271,239 @@ static void pdbMakeAbsolute(SmallVectorImpl<char> &FileName) {
   // Since PDB's are more of a Windows thing, we make this conservative and only
   // decide that it's a unix path if we're fairly certain.  Specifically, if
   // it starts with a forward slash.
-  SmallString<128> AbsoluteFileName = Config->PDBSourcePath;
-  sys::path::Style GuessedStyle = AbsoluteFileName.startswith("/")
+  SmallString<128> absoluteFileName = config->pdbSourcePath;
+  sys::path::Style guessedStyle = absoluteFileName.startswith("/")
                                       ? sys::path::Style::posix
                                       : sys::path::Style::windows;
-  sys::path::append(AbsoluteFileName, GuessedStyle, FileName);
-  sys::path::native(AbsoluteFileName, GuessedStyle);
-  sys::path::remove_dots(AbsoluteFileName, true, GuessedStyle);
+  sys::path::append(absoluteFileName, guessedStyle, fileName);
+  sys::path::native(absoluteFileName, guessedStyle);
+  sys::path::remove_dots(absoluteFileName, true, guessedStyle);
 
-  FileName = std::move(AbsoluteFileName);
-}
-
-static SectionChunk *findByName(ArrayRef<SectionChunk *> Sections,
-                                StringRef Name) {
-  for (SectionChunk *C : Sections)
-    if (C->getSectionName() == Name)
-      return C;
-  return nullptr;
-}
-
-static ArrayRef<uint8_t> consumeDebugMagic(ArrayRef<uint8_t> Data,
-                                           StringRef SecName) {
-  // First 4 bytes are section magic.
-  if (Data.size() < 4)
-    fatal(SecName + " too short");
-  if (support::endian::read32le(Data.data()) != COFF::DEBUG_SECTION_MAGIC)
-    fatal(SecName + " has an invalid magic");
-  return Data.slice(4);
-}
-
-static ArrayRef<uint8_t> getDebugSection(ObjFile *File, StringRef SecName) {
-  if (SectionChunk *Sec = findByName(File->getDebugChunks(), SecName))
-    return consumeDebugMagic(Sec->getContents(), SecName);
-  return {};
+  fileName = std::move(absoluteFileName);
 }
 
 // A COFF .debug$H section is currently a clang extension.  This function checks
 // if a .debug$H section is in a format that we expect / understand, so that we
 // can ignore any sections which are coincidentally also named .debug$H but do
 // not contain a format we recognize.
-static bool canUseDebugH(ArrayRef<uint8_t> DebugH) {
-  if (DebugH.size() < sizeof(object::debug_h_header))
+static bool canUseDebugH(ArrayRef<uint8_t> debugH) {
+  if (debugH.size() < sizeof(object::debug_h_header))
     return false;
-  auto *Header =
-      reinterpret_cast<const object::debug_h_header *>(DebugH.data());
-  DebugH = DebugH.drop_front(sizeof(object::debug_h_header));
-  return Header->Magic == COFF::DEBUG_HASHES_SECTION_MAGIC &&
-         Header->Version == 0 &&
-         Header->HashAlgorithm == uint16_t(GlobalTypeHashAlg::SHA1_8) &&
-         (DebugH.size() % 8 == 0);
+  auto *header =
+      reinterpret_cast<const object::debug_h_header *>(debugH.data());
+  debugH = debugH.drop_front(sizeof(object::debug_h_header));
+  return header->Magic == COFF::DEBUG_HASHES_SECTION_MAGIC &&
+         header->Version == 0 &&
+         header->HashAlgorithm == uint16_t(GlobalTypeHashAlg::SHA1_8) &&
+         (debugH.size() % 8 == 0);
 }
 
-static Optional<ArrayRef<uint8_t>> getDebugH(ObjFile *File) {
-  SectionChunk *Sec = findByName(File->getDebugChunks(), ".debug$H");
-  if (!Sec)
+static Optional<ArrayRef<uint8_t>> getDebugH(ObjFile *file) {
+  SectionChunk *sec =
+      SectionChunk::findByName(file->getDebugChunks(), ".debug$H");
+  if (!sec)
     return llvm::None;
-  ArrayRef<uint8_t> Contents = Sec->getContents();
-  if (!canUseDebugH(Contents))
+  ArrayRef<uint8_t> contents = sec->getContents();
+  if (!canUseDebugH(contents))
     return None;
-  return Contents;
+  return contents;
 }
 
 static ArrayRef<GloballyHashedType>
-getHashesFromDebugH(ArrayRef<uint8_t> DebugH) {
-  assert(canUseDebugH(DebugH));
+getHashesFromDebugH(ArrayRef<uint8_t> debugH) {
+  assert(canUseDebugH(debugH));
 
-  DebugH = DebugH.drop_front(sizeof(object::debug_h_header));
-  uint32_t Count = DebugH.size() / sizeof(GloballyHashedType);
-  return {reinterpret_cast<const GloballyHashedType *>(DebugH.data()), Count};
+  debugH = debugH.drop_front(sizeof(object::debug_h_header));
+  uint32_t count = debugH.size() / sizeof(GloballyHashedType);
+  return {reinterpret_cast<const GloballyHashedType *>(debugH.data()), count};
 }
 
-static void addTypeInfo(pdb::TpiStreamBuilder &TpiBuilder,
-                        TypeCollection &TypeTable) {
+static void addTypeInfo(pdb::TpiStreamBuilder &tpiBuilder,
+                        TypeCollection &typeTable) {
   // Start the TPI or IPI stream header.
-  TpiBuilder.setVersionHeader(pdb::PdbTpiV80);
+  tpiBuilder.setVersionHeader(pdb::PdbTpiV80);
 
   // Flatten the in memory type table and hash each type.
-  TypeTable.ForEachRecord([&](TypeIndex TI, const CVType &Type) {
-    auto Hash = pdb::hashTypeRecord(Type);
-    if (auto E = Hash.takeError())
+  typeTable.ForEachRecord([&](TypeIndex ti, const CVType &type) {
+    auto hash = pdb::hashTypeRecord(type);
+    if (auto e = hash.takeError())
       fatal("type hashing error");
-    TpiBuilder.addTypeRecord(Type.RecordData, *Hash);
+    tpiBuilder.addTypeRecord(type.RecordData, *hash);
   });
 }
 
-// OBJs usually start their symbol stream with a S_OBJNAME record. This record
-// also contains the signature/key of the current PCH session. The signature
-// must be same for all objects which depend on the precompiled object.
-// Recompiling the precompiled headers will generate a new PCH key and thus
-// invalidate all the dependent objects.
-static uint32_t extractPCHSignature(ObjFile *File) {
-  auto DbgIt = find_if(File->getDebugChunks(), [](SectionChunk *C) {
-    return C->getSectionName() == ".debug$S";
-  });
-  if (!DbgIt)
-    return 0;
-
-  ArrayRef<uint8_t> Contents =
-      consumeDebugMagic((*DbgIt)->getContents(), ".debug$S");
-  DebugSubsectionArray Subsections;
-  BinaryStreamReader Reader(Contents, support::little);
-  ExitOnErr(Reader.readArray(Subsections, Contents.size()));
-
-  for (const DebugSubsectionRecord &SS : Subsections) {
-    if (SS.kind() != DebugSubsectionKind::Symbols)
-      continue;
-
-    // If it's there, the S_OBJNAME record shall come first in the stream.
-    Expected<CVSymbol> Sym = readSymbolFromStream(SS.getRecordData(), 0);
-    if (!Sym) {
-      consumeError(Sym.takeError());
-      continue;
-    }
-    if (auto ObjName = SymbolDeserializer::deserializeAs<ObjNameSym>(Sym.get()))
-      return ObjName->Signature;
-  }
-  return 0;
-}
-
 Expected<const CVIndexMap &>
-PDBLinker::mergeDebugT(ObjFile *File, CVIndexMap *ObjectIndexMap) {
-  ScopedTimer T(TypeMergingTimer);
+PDBLinker::mergeDebugT(ObjFile *file, CVIndexMap *objectIndexMap) {
+  ScopedTimer t(typeMergingTimer);
 
-  bool IsPrecompiledHeader = false;
-
-  ArrayRef<uint8_t> Data = getDebugSection(File, ".debug$T");
-  if (Data.empty()) {
-    // Try again, Microsoft precompiled headers use .debug$P instead of
-    // .debug$T
-    Data = getDebugSection(File, ".debug$P");
-    IsPrecompiledHeader = true;
-  }
-  if (Data.empty())
-    return *ObjectIndexMap; // no debug info
+  if (!file->debugTypesObj)
+    return *objectIndexMap; // no Types stream
 
   // Precompiled headers objects need to save the index map for further
   // reference by other objects which use the precompiled headers.
-  if (IsPrecompiledHeader) {
-    uint32_t PCHSignature = extractPCHSignature(File);
-    if (PCHSignature == 0)
+  if (file->debugTypesObj->kind == TpiSource::PCH) {
+    uint32_t pchSignature = file->pchSignature.getValueOr(0);
+    if (pchSignature == 0)
       fatal("No signature found for the precompiled headers OBJ (" +
-            File->getName() + ")");
+            file->getName() + ")");
 
     // When a precompiled headers object comes first on the command-line, we
     // update the mapping here. Otherwise, if an object referencing the
     // precompiled headers object comes first, the mapping is created in
     // aquirePrecompObj(), thus we would skip this block.
-    if (!ObjectIndexMap->IsPrecompiledTypeMap) {
-      auto R = registerPrecompiledHeaders(PCHSignature);
-      if (R.second)
+    if (!objectIndexMap->isPrecompiledTypeMap) {
+      auto r = registerPrecompiledHeaders(pchSignature);
+      if (r.second)
         fatal(
             "A precompiled headers OBJ with the same signature was already "
             "provided! (" +
-            File->getName() + ")");
+            file->getName() + ")");
 
-      ObjectIndexMap = &R.first;
+      objectIndexMap = &r.first;
     }
   }
 
-  BinaryByteStream Stream(Data, support::little);
-  CVTypeArray Types;
-  BinaryStreamReader Reader(Stream);
-  if (auto EC = Reader.readArray(Types, Reader.getLength()))
-    fatal("Reader::readArray failed: " + toString(std::move(EC)));
-
-  auto FirstType = Types.begin();
-  if (FirstType == Types.end())
-    return *ObjectIndexMap;
-
-  if (FirstType->kind() == LF_TYPESERVER2) {
+  if (file->debugTypesObj->kind == TpiSource::UsingPDB) {
     // Look through type servers. If we've already seen this type server,
     // don't merge any type information.
-    return maybeMergeTypeServerPDB(File, *FirstType);
-  } else if (FirstType->kind() == LF_PRECOMP) {
+    return maybeMergeTypeServerPDB(file);
+  }
+  
+  CVTypeArray &types = *file->debugTypes;
+
+  if (file->debugTypesObj->kind == TpiSource::UsingPCH) {
     // This object was compiled with /Yu, so process the corresponding
     // precompiled headers object (/Yc) first. Some type indices in the current
     // object are referencing data in the precompiled headers object, so we need
     // both to be loaded.
-    auto E = mergeInPrecompHeaderObj(File, *FirstType, ObjectIndexMap);
-    if (!E)
-      return E.takeError();
+    Error e = mergeInPrecompHeaderObj(file, objectIndexMap);
+    if (e)
+      return std::move(e);
 
-    // Drop LF_PRECOMP record from the input stream, as it needs to be replaced
-    // with the precompiled headers object type stream.
-    // Note that we can't just call Types.drop_front(), as we explicitly want to
-    // rebase the stream.
-    Types.setUnderlyingStream(
-        Types.getUnderlyingStream().drop_front(FirstType->RecordData.size()));
+    // Drop LF_PRECOMP record from the input stream, as it has been replaced
+    // with the precompiled headers Type stream in the mergeInPrecompHeaderObj()
+    // call above. Note that we can't just call Types.drop_front(), as we
+    // explicitly want to rebase the stream.
+    CVTypeArray::Iterator firstType = types.begin();
+    types.setUnderlyingStream(
+        types.getUnderlyingStream().drop_front(firstType->RecordData.size()));
   }
 
   // Fill in the temporary, caller-provided ObjectIndexMap.
-  if (Config->DebugGHashes) {
-    ArrayRef<GloballyHashedType> Hashes;
-    std::vector<GloballyHashedType> OwnedHashes;
-    if (Optional<ArrayRef<uint8_t>> DebugH = getDebugH(File))
-      Hashes = getHashesFromDebugH(*DebugH);
+  if (config->debugGHashes) {
+    ArrayRef<GloballyHashedType> hashes;
+    std::vector<GloballyHashedType> ownedHashes;
+    if (Optional<ArrayRef<uint8_t>> debugH = getDebugH(file))
+      hashes = getHashesFromDebugH(*debugH);
     else {
-      OwnedHashes = GloballyHashedType::hashTypes(Types);
-      Hashes = OwnedHashes;
+      ownedHashes = GloballyHashedType::hashTypes(types);
+      hashes = ownedHashes;
     }
 
-    if (auto Err = mergeTypeAndIdRecords(GlobalIDTable, GlobalTypeTable,
-                                         ObjectIndexMap->TPIMap, Types, Hashes,
-                                         File->PCHSignature))
+    if (auto err = mergeTypeAndIdRecords(
+            tMerger.globalIDTable, tMerger.globalTypeTable,
+            objectIndexMap->tpiMap, types, hashes, file->pchSignature))
       fatal("codeview::mergeTypeAndIdRecords failed: " +
-            toString(std::move(Err)));
+            toString(std::move(err)));
   } else {
-    if (auto Err =
-            mergeTypeAndIdRecords(IDTable, TypeTable, ObjectIndexMap->TPIMap,
-                                  Types, File->PCHSignature))
+    if (auto err = mergeTypeAndIdRecords(tMerger.iDTable, tMerger.typeTable,
+                                         objectIndexMap->tpiMap, types,
+                                         file->pchSignature))
       fatal("codeview::mergeTypeAndIdRecords failed: " +
-            toString(std::move(Err)));
+            toString(std::move(err)));
   }
-  return *ObjectIndexMap;
+  return *objectIndexMap;
 }
 
-static Expected<std::unique_ptr<pdb::NativeSession>>
-tryToLoadPDB(const codeview::GUID &GuidFromObj, StringRef TSPath) {
-  // Ensure the file exists before anything else. We want to return ENOENT,
-  // "file not found", even if the path points to a removable device (in which
-  // case the return message would be EAGAIN, "resource unavailable try again")
-  if (!llvm::sys::fs::exists(TSPath))
-    return errorCodeToError(std::error_code(ENOENT, std::generic_category()));
+Expected<const CVIndexMap &> PDBLinker::maybeMergeTypeServerPDB(ObjFile *file) {
+  Expected<llvm::pdb::NativeSession *> pdbSession = findTypeServerSource(file);
+  if (!pdbSession)
+    return pdbSession.takeError();
 
-  ErrorOr<std::unique_ptr<MemoryBuffer>> MBOrErr = MemoryBuffer::getFile(
-      TSPath, /*FileSize=*/-1, /*RequiresNullTerminator=*/false);
-  if (!MBOrErr)
-    return errorCodeToError(MBOrErr.getError());
+  pdb::PDBFile &pdbFile = pdbSession.get()->getPDBFile();
+  pdb::InfoStream &info = cantFail(pdbFile.getPDBInfoStream());
 
-  std::unique_ptr<pdb::IPDBSession> ThisSession;
-  if (auto EC = pdb::NativeSession::createFromPdb(
-          MemoryBuffer::getMemBuffer(Driver->takeBuffer(std::move(*MBOrErr)),
-                                     /*RequiresNullTerminator=*/false),
-          ThisSession))
-    return std::move(EC);
-
-  std::unique_ptr<pdb::NativeSession> NS(
-      static_cast<pdb::NativeSession *>(ThisSession.release()));
-  pdb::PDBFile &File = NS->getPDBFile();
-  auto ExpectedInfo = File.getPDBInfoStream();
-  // All PDB Files should have an Info stream.
-  if (!ExpectedInfo)
-    return ExpectedInfo.takeError();
-
-  // Just because a file with a matching name was found and it was an actual
-  // PDB file doesn't mean it matches.  For it to match the InfoStream's GUID
-  // must match the GUID specified in the TypeServer2 record.
-  if (ExpectedInfo->getGuid() != GuidFromObj)
-    return make_error<pdb::PDBError>(pdb::pdb_error_code::signature_out_of_date);
-
-  return std::move(NS);
-}
-
-Expected<const CVIndexMap &>
-PDBLinker::maybeMergeTypeServerPDB(ObjFile *File, const CVType &FirstType) {
-  TypeServer2Record TS;
-  if (auto EC =
-          TypeDeserializer::deserializeAs(const_cast<CVType &>(FirstType), TS))
-    fatal("error reading record: " + toString(std::move(EC)));
-
-  const codeview::GUID &TSId = TS.getGuid();
-  StringRef TSPath = TS.getName();
-
-  // First, check if the PDB has previously failed to load.
-  auto PrevErr = MissingTypeServerPDBs.find(TSId);
-  if (PrevErr != MissingTypeServerPDBs.end())
-    return createFileError(
-        TSPath,
-        make_error<StringError>(PrevErr->second, inconvertibleErrorCode()));
-
-  // Second, check if we already loaded a PDB with this GUID. Return the type
-  // index mapping if we have it.
-  auto Insertion = TypeServerIndexMappings.insert({TSId, CVIndexMap()});
-  CVIndexMap &IndexMap = Insertion.first->second;
-  if (!Insertion.second)
-    return IndexMap;
+  auto it = typeServerIndexMappings.emplace(info.getGuid(), CVIndexMap());
+  CVIndexMap &indexMap = it.first->second;
+  if (!it.second)
+    return indexMap; // already merged
 
   // Mark this map as a type server map.
-  IndexMap.IsTypeServerMap = true;
-
-  // Check for a PDB at:
-  // 1. The given file path
-  // 2. Next to the object file or archive file
-  auto ExpectedSession = handleExpected(
-      tryToLoadPDB(TSId, TSPath),
-      [&]() {
-        StringRef LocalPath =
-            !File->ParentName.empty() ? File->ParentName : File->getName();
-        SmallString<128> Path = sys::path::parent_path(LocalPath);
-        // Currently, type server PDBs are only created by cl, which only runs
-        // on Windows, so we can assume type server paths are Windows style.
-        sys::path::append(
-            Path, sys::path::filename(TSPath, sys::path::Style::windows));
-        return tryToLoadPDB(TSId, Path);
-      },
-      [&](std::unique_ptr<ECError> EC) -> Error {
-        auto SysErr = EC->convertToErrorCode();
-        // Only re-try loading if the previous error was "No such file or
-        // directory"
-        if (SysErr.category() == std::generic_category() &&
-            SysErr.value() == ENOENT)
-          return Error::success();
-        return Error(std::move(EC));
-      });
-
-  if (auto E = ExpectedSession.takeError()) {
-    TypeServerIndexMappings.erase(TSId);
-
-    // Flatten the error to a string, for later display, if the error occurs
-    // again on the same PDB.
-    std::string ErrMsg;
-    raw_string_ostream S(ErrMsg);
-    S << E;
-    MissingTypeServerPDBs.emplace(TSId, S.str());
-
-    return createFileError(TSPath, std::move(E));
+  indexMap.isTypeServerMap = true;
+
+  Expected<pdb::TpiStream &> expectedTpi = pdbFile.getPDBTpiStream();
+  if (auto e = expectedTpi.takeError())
+    fatal("Type server does not have TPI stream: " + toString(std::move(e)));
+  pdb::TpiStream *maybeIpi = nullptr;
+  if (pdbFile.hasPDBIpiStream()) {
+    Expected<pdb::TpiStream &> expectedIpi = pdbFile.getPDBIpiStream();
+    if (auto e = expectedIpi.takeError())
+      fatal("Error getting type server IPI stream: " + toString(std::move(e)));
+    maybeIpi = &*expectedIpi;
   }
 
-  pdb::NativeSession *Session = ExpectedSession->get();
-
-  // Keep a strong reference to this PDB, so that it's safe to hold pointers
-  // into the file.
-  LoadedPDBs.push_back(std::move(*ExpectedSession));
-
-  auto ExpectedTpi = Session->getPDBFile().getPDBTpiStream();
-  if (auto E = ExpectedTpi.takeError())
-    fatal("Type server does not have TPI stream: " + toString(std::move(E)));
-  auto ExpectedIpi = Session->getPDBFile().getPDBIpiStream();
-  if (auto E = ExpectedIpi.takeError())
-    fatal("Type server does not have TPI stream: " + toString(std::move(E)));
-
-  if (Config->DebugGHashes) {
+  if (config->debugGHashes) {
     // PDBs do not actually store global hashes, so when merging a type server
     // PDB we have to synthesize global hashes.  To do this, we first synthesize
     // global hashes for the TPI stream, since it is independent, then we
     // synthesize hashes for the IPI stream, using the hashes for the TPI stream
     // as inputs.
-    auto TpiHashes = GloballyHashedType::hashTypes(ExpectedTpi->typeArray());
-    auto IpiHashes =
-        GloballyHashedType::hashIds(ExpectedIpi->typeArray(), TpiHashes);
-
-    Optional<uint32_t> EndPrecomp;
+    auto tpiHashes = GloballyHashedType::hashTypes(expectedTpi->typeArray());
+    Optional<uint32_t> endPrecomp;
     // Merge TPI first, because the IPI stream will reference type indices.
-    if (auto Err = mergeTypeRecords(GlobalTypeTable, IndexMap.TPIMap,
-                                    ExpectedTpi->typeArray(), TpiHashes, EndPrecomp))
-      fatal("codeview::mergeTypeRecords failed: " + toString(std::move(Err)));
+    if (auto err =
+            mergeTypeRecords(tMerger.globalTypeTable, indexMap.tpiMap,
+                             expectedTpi->typeArray(), tpiHashes, endPrecomp))
+      fatal("codeview::mergeTypeRecords failed: " + toString(std::move(err)));
 
     // Merge IPI.
-    if (auto Err =
-            mergeIdRecords(GlobalIDTable, IndexMap.TPIMap, IndexMap.IPIMap,
-                           ExpectedIpi->typeArray(), IpiHashes))
-      fatal("codeview::mergeIdRecords failed: " + toString(std::move(Err)));
+    if (maybeIpi) {
+      auto ipiHashes =
+          GloballyHashedType::hashIds(maybeIpi->typeArray(), tpiHashes);
+      if (auto err =
+              mergeIdRecords(tMerger.globalIDTable, indexMap.tpiMap,
+                             indexMap.ipiMap, maybeIpi->typeArray(), ipiHashes))
+        fatal("codeview::mergeIdRecords failed: " + toString(std::move(err)));
+    }
   } else {
     // Merge TPI first, because the IPI stream will reference type indices.
-    if (auto Err = mergeTypeRecords(TypeTable, IndexMap.TPIMap,
-                                    ExpectedTpi->typeArray()))
-      fatal("codeview::mergeTypeRecords failed: " + toString(std::move(Err)));
+    if (auto err = mergeTypeRecords(tMerger.typeTable, indexMap.tpiMap,
+                                    expectedTpi->typeArray()))
+      fatal("codeview::mergeTypeRecords failed: " + toString(std::move(err)));
 
     // Merge IPI.
-    if (auto Err = mergeIdRecords(IDTable, IndexMap.TPIMap, IndexMap.IPIMap,
-                                  ExpectedIpi->typeArray()))
-      fatal("codeview::mergeIdRecords failed: " + toString(std::move(Err)));
+    if (maybeIpi) {
+      if (auto err = mergeIdRecords(tMerger.iDTable, indexMap.tpiMap,
+                                    indexMap.ipiMap, maybeIpi->typeArray()))
+        fatal("codeview::mergeIdRecords failed: " + toString(std::move(err)));
+    }
   }
 
-  return IndexMap;
+  return indexMap;
 }
 
-Expected<const CVIndexMap &>
-PDBLinker::mergeInPrecompHeaderObj(ObjFile *File, const CVType &FirstType,
-                                   CVIndexMap *ObjectIndexMap) {
-  PrecompRecord Precomp;
-  if (auto EC = TypeDeserializer::deserializeAs(const_cast<CVType &>(FirstType),
-                                                Precomp))
-    fatal("error reading record: " + toString(std::move(EC)));
+Error PDBLinker::mergeInPrecompHeaderObj(ObjFile *file,
+                                         CVIndexMap *objectIndexMap) {
+  const PrecompRecord &precomp =
+      retrieveDependencyInfo<PrecompRecord>(file->debugTypesObj);
 
-  auto E = aquirePrecompObj(File, Precomp);
-  if (!E)
-    return E.takeError();
+  Expected<const CVIndexMap &> e = aquirePrecompObj(file);
+  if (!e)
+    return e.takeError();
 
-  const CVIndexMap &PrecompIndexMap = *E;
-  assert(PrecompIndexMap.IsPrecompiledTypeMap);
+  const CVIndexMap &precompIndexMap = *e;
+  assert(precompIndexMap.isPrecompiledTypeMap);
 
-  if (PrecompIndexMap.TPIMap.empty())
-    return PrecompIndexMap;
+  if (precompIndexMap.tpiMap.empty())
+    return Error::success();
 
-  assert(Precomp.getStartTypeIndex() == TypeIndex::FirstNonSimpleIndex);
-  assert(Precomp.getTypesCount() <= PrecompIndexMap.TPIMap.size());
+  assert(precomp.getStartTypeIndex() == TypeIndex::FirstNonSimpleIndex);
+  assert(precomp.getTypesCount() <= precompIndexMap.tpiMap.size());
   // Use the previously remapped index map from the precompiled headers.
-  ObjectIndexMap->TPIMap.append(PrecompIndexMap.TPIMap.begin(),
-                                PrecompIndexMap.TPIMap.begin() +
-                                    Precomp.getTypesCount());
-  return *ObjectIndexMap;
+  objectIndexMap->tpiMap.append(precompIndexMap.tpiMap.begin(),
+                                precompIndexMap.tpiMap.begin() +
+                                    precomp.getTypesCount());
+  return Error::success();
 }
 
 static bool equals_path(StringRef path1, StringRef path2) {
@@ -700,101 +515,103 @@ static bool equals_path(StringRef path1, StringRef path2) {
 }
 
 // Find by name an OBJ provided on the command line
-static ObjFile *findObjByName(StringRef FileNameOnly) {
-  SmallString<128> CurrentPath;
+static ObjFile *findObjByName(StringRef fileNameOnly) {
+  SmallString<128> currentPath;
 
-  for (ObjFile *F : ObjFile::Instances) {
-    StringRef CurrentFileName = sys::path::filename(F->getName());
+  for (ObjFile *f : ObjFile::instances) {
+    StringRef currentFileName = sys::path::filename(f->getName());
 
     // Compare based solely on the file name (link.exe behavior)
-    if (equals_path(CurrentFileName, FileNameOnly))
-      return F;
+    if (equals_path(currentFileName, fileNameOnly))
+      return f;
   }
   return nullptr;
 }
 
 std::pair<CVIndexMap &, bool /*already there*/>
-PDBLinker::registerPrecompiledHeaders(uint32_t Signature) {
-  auto Insertion = PrecompTypeIndexMappings.insert({Signature, CVIndexMap()});
-  CVIndexMap &IndexMap = Insertion.first->second;
-  if (!Insertion.second)
-    return {IndexMap, true};
+PDBLinker::registerPrecompiledHeaders(uint32_t signature) {
+  auto insertion = precompTypeIndexMappings.insert({signature, CVIndexMap()});
+  CVIndexMap &indexMap = insertion.first->second;
+  if (!insertion.second)
+    return {indexMap, true};
   // Mark this map as a precompiled types map.
-  IndexMap.IsPrecompiledTypeMap = true;
-  return {IndexMap, false};
+  indexMap.isPrecompiledTypeMap = true;
+  return {indexMap, false};
 }
 
-Expected<const CVIndexMap &>
-PDBLinker::aquirePrecompObj(ObjFile *File, PrecompRecord Precomp) {
+Expected<const CVIndexMap &> PDBLinker::aquirePrecompObj(ObjFile *file) {
+  const PrecompRecord &precomp =
+      retrieveDependencyInfo<PrecompRecord>(file->debugTypesObj);
+
   // First, check if we already loaded the precompiled headers object with this
   // signature. Return the type index mapping if we've already seen it.
-  auto R = registerPrecompiledHeaders(Precomp.getSignature());
-  if (R.second)
-    return R.first;
+  auto r = registerPrecompiledHeaders(precomp.getSignature());
+  if (r.second)
+    return r.first;
 
-  CVIndexMap &IndexMap = R.first;
+  CVIndexMap &indexMap = r.first;
 
   // Cross-compile warning: given that Clang doesn't generate LF_PRECOMP
   // records, we assume the OBJ comes from a Windows build of cl.exe. Thusly,
   // the paths embedded in the OBJs are in the Windows format.
-  SmallString<128> PrecompFileName = sys::path::filename(
-      Precomp.getPrecompFilePath(), sys::path::Style::windows);
+  SmallString<128> precompFileName = sys::path::filename(
+      precomp.getPrecompFilePath(), sys::path::Style::windows);
 
   // link.exe requires that a precompiled headers object must always be provided
   // on the command-line, even if that's not necessary.
-  auto PrecompFile = findObjByName(PrecompFileName);
-  if (!PrecompFile)
+  auto precompFile = findObjByName(precompFileName);
+  if (!precompFile)
     return createFileError(
-        PrecompFileName.str(),
+        precompFileName.str(),
         make_error<pdb::PDBError>(pdb::pdb_error_code::external_cmdline_ref));
 
-  addObjFile(PrecompFile, &IndexMap);
+  addObjFile(precompFile, &indexMap);
 
-  if (!PrecompFile->PCHSignature)
-    fatal(PrecompFile->getName() + " is not a precompiled headers object");
+  if (!precompFile->pchSignature)
+    fatal(precompFile->getName() + " is not a precompiled headers object");
 
-  if (Precomp.getSignature() != PrecompFile->PCHSignature.getValueOr(0))
+  if (precomp.getSignature() != precompFile->pchSignature.getValueOr(0))
     return createFileError(
-        Precomp.getPrecompFilePath().str(),
+        precomp.getPrecompFilePath().str(),
         make_error<pdb::PDBError>(pdb::pdb_error_code::signature_out_of_date));
 
-  return IndexMap;
+  return indexMap;
 }
 
-static bool remapTypeIndex(TypeIndex &TI, ArrayRef<TypeIndex> TypeIndexMap) {
-  if (TI.isSimple())
+static bool remapTypeIndex(TypeIndex &ti, ArrayRef<TypeIndex> typeIndexMap) {
+  if (ti.isSimple())
     return true;
-  if (TI.toArrayIndex() >= TypeIndexMap.size())
+  if (ti.toArrayIndex() >= typeIndexMap.size())
     return false;
-  TI = TypeIndexMap[TI.toArrayIndex()];
+  ti = typeIndexMap[ti.toArrayIndex()];
   return true;
 }
 
-static void remapTypesInSymbolRecord(ObjFile *File, SymbolKind SymKind,
-                                     MutableArrayRef<uint8_t> RecordBytes,
-                                     const CVIndexMap &IndexMap,
-                                     ArrayRef<TiReference> TypeRefs) {
-  MutableArrayRef<uint8_t> Contents =
-      RecordBytes.drop_front(sizeof(RecordPrefix));
-  for (const TiReference &Ref : TypeRefs) {
-    unsigned ByteSize = Ref.Count * sizeof(TypeIndex);
-    if (Contents.size() < Ref.Offset + ByteSize)
+static void remapTypesInSymbolRecord(ObjFile *file, SymbolKind symKind,
+                                     MutableArrayRef<uint8_t> recordBytes,
+                                     const CVIndexMap &indexMap,
+                                     ArrayRef<TiReference> typeRefs) {
+  MutableArrayRef<uint8_t> contents =
+      recordBytes.drop_front(sizeof(RecordPrefix));
+  for (const TiReference &ref : typeRefs) {
+    unsigned byteSize = ref.Count * sizeof(TypeIndex);
+    if (contents.size() < ref.Offset + byteSize)
       fatal("symbol record too short");
 
     // This can be an item index or a type index. Choose the appropriate map.
-    ArrayRef<TypeIndex> TypeOrItemMap = IndexMap.TPIMap;
-    bool IsItemIndex = Ref.Kind == TiRefKind::IndexRef;
-    if (IsItemIndex && IndexMap.IsTypeServerMap)
-      TypeOrItemMap = IndexMap.IPIMap;
+    ArrayRef<TypeIndex> typeOrItemMap = indexMap.tpiMap;
+    bool isItemIndex = ref.Kind == TiRefKind::IndexRef;
+    if (isItemIndex && indexMap.isTypeServerMap)
+      typeOrItemMap = indexMap.ipiMap;
 
-    MutableArrayRef<TypeIndex> TIs(
-        reinterpret_cast<TypeIndex *>(Contents.data() + Ref.Offset), Ref.Count);
-    for (TypeIndex &TI : TIs) {
-      if (!remapTypeIndex(TI, TypeOrItemMap)) {
-        log("ignoring symbol record of kind 0x" + utohexstr(SymKind) + " in " +
-            File->getName() + " with bad " + (IsItemIndex ? "item" : "type") +
-            " index 0x" + utohexstr(TI.getIndex()));
-        TI = TypeIndex(SimpleTypeKind::NotTranslated);
+    MutableArrayRef<TypeIndex> tIs(
+        reinterpret_cast<TypeIndex *>(contents.data() + ref.Offset), ref.Count);
+    for (TypeIndex &ti : tIs) {
+      if (!remapTypeIndex(ti, typeOrItemMap)) {
+        log("ignoring symbol record of kind 0x" + utohexstr(symKind) + " in " +
+            file->getName() + " with bad " + (isItemIndex ? "item" : "type") +
+            " index 0x" + utohexstr(ti.getIndex()));
+        ti = TypeIndex(SimpleTypeKind::NotTranslated);
         continue;
       }
     }
@@ -802,26 +619,26 @@ static void remapTypesInSymbolRecord(ObjFile *File, SymbolKind SymKind,
 }
 
 static void
-recordStringTableReferenceAtOffset(MutableArrayRef<uint8_t> Contents,
-                                   uint32_t Offset,
-                                   std::vector<ulittle32_t *> &StrTableRefs) {
-  Contents =
-      Contents.drop_front(Offset).take_front(sizeof(support::ulittle32_t));
-  ulittle32_t *Index = reinterpret_cast<ulittle32_t *>(Contents.data());
-  StrTableRefs.push_back(Index);
+recordStringTableReferenceAtOffset(MutableArrayRef<uint8_t> contents,
+                                   uint32_t offset,
+                                   std::vector<ulittle32_t *> &strTableRefs) {
+  contents =
+      contents.drop_front(offset).take_front(sizeof(support::ulittle32_t));
+  ulittle32_t *index = reinterpret_cast<ulittle32_t *>(contents.data());
+  strTableRefs.push_back(index);
 }
 
 static void
-recordStringTableReferences(SymbolKind Kind, MutableArrayRef<uint8_t> Contents,
-                            std::vector<ulittle32_t *> &StrTableRefs) {
+recordStringTableReferences(SymbolKind kind, MutableArrayRef<uint8_t> contents,
+                            std::vector<ulittle32_t *> &strTableRefs) {
   // For now we only handle S_FILESTATIC, but we may need the same logic for
   // S_DEFRANGE and S_DEFRANGE_SUBFIELD.  However, I cannot seem to generate any
   // PDBs that contain these types of records, so because of the uncertainty
   // they are omitted here until we can prove that it's necessary.
-  switch (Kind) {
+  switch (kind) {
   case SymbolKind::S_FILESTATIC:
     // FileStaticSym::ModFileOffset
-    recordStringTableReferenceAtOffset(Contents, 8, StrTableRefs);
+    recordStringTableReferenceAtOffset(contents, 8, strTableRefs);
     break;
   case SymbolKind::S_DEFRANGE:
   case SymbolKind::S_DEFRANGE_SUBFIELD:
@@ -833,21 +650,21 @@ recordStringTableReferences(SymbolKind Kind, MutableArrayRef<uint8_t> Contents,
   }
 }
 
-static SymbolKind symbolKind(ArrayRef<uint8_t> RecordData) {
-  const RecordPrefix *Prefix =
-      reinterpret_cast<const RecordPrefix *>(RecordData.data());
-  return static_cast<SymbolKind>(uint16_t(Prefix->RecordKind));
+static SymbolKind symbolKind(ArrayRef<uint8_t> recordData) {
+  const RecordPrefix *prefix =
+      reinterpret_cast<const RecordPrefix *>(recordData.data());
+  return static_cast<SymbolKind>(uint16_t(prefix->RecordKind));
 }
 
 /// MSVC translates S_PROC_ID_END to S_END, and S_[LG]PROC32_ID to S_[LG]PROC32
-static void translateIdSymbols(MutableArrayRef<uint8_t> &RecordData,
-                               TypeCollection &IDTable) {
-  RecordPrefix *Prefix = reinterpret_cast<RecordPrefix *>(RecordData.data());
+static void translateIdSymbols(MutableArrayRef<uint8_t> &recordData,
+                               TypeCollection &iDTable) {
+  RecordPrefix *prefix = reinterpret_cast<RecordPrefix *>(recordData.data());
 
-  SymbolKind Kind = symbolKind(RecordData);
+  SymbolKind kind = symbolKind(recordData);
 
-  if (Kind == SymbolKind::S_PROC_ID_END) {
-    Prefix->RecordKind = SymbolKind::S_END;
+  if (kind == SymbolKind::S_PROC_ID_END) {
+    prefix->RecordKind = SymbolKind::S_END;
     return;
   }
 
@@ -856,89 +673,89 @@ static void translateIdSymbols(MutableArrayRef<uint8_t> &RecordData,
   // to the PDB file's ID stream index space, but we need to convert this to a
   // symbol that refers to the type stream index space.  So we remap again from
   // ID index space to type index space.
-  if (Kind == SymbolKind::S_GPROC32_ID || Kind == SymbolKind::S_LPROC32_ID) {
-    SmallVector<TiReference, 1> Refs;
-    auto Content = RecordData.drop_front(sizeof(RecordPrefix));
-    CVSymbol Sym(Kind, RecordData);
-    discoverTypeIndicesInSymbol(Sym, Refs);
-    assert(Refs.size() == 1);
-    assert(Refs.front().Count == 1);
+  if (kind == SymbolKind::S_GPROC32_ID || kind == SymbolKind::S_LPROC32_ID) {
+    SmallVector<TiReference, 1> refs;
+    auto content = recordData.drop_front(sizeof(RecordPrefix));
+    CVSymbol sym(recordData);
+    discoverTypeIndicesInSymbol(sym, refs);
+    assert(refs.size() == 1);
+    assert(refs.front().Count == 1);
 
-    TypeIndex *TI =
-        reinterpret_cast<TypeIndex *>(Content.data() + Refs[0].Offset);
-    // `TI` is the index of a FuncIdRecord or MemberFuncIdRecord which lives in
+    TypeIndex *ti =
+        reinterpret_cast<TypeIndex *>(content.data() + refs[0].Offset);
+    // `ti` is the index of a FuncIdRecord or MemberFuncIdRecord which lives in
     // the IPI stream, whose `FunctionType` member refers to the TPI stream.
     // Note that LF_FUNC_ID and LF_MEMFUNC_ID have the same record layout, and
     // in both cases we just need the second type index.
-    if (!TI->isSimple() && !TI->isNoneType()) {
-      CVType FuncIdData = IDTable.getType(*TI);
-      SmallVector<TypeIndex, 2> Indices;
-      discoverTypeIndices(FuncIdData, Indices);
-      assert(Indices.size() == 2);
-      *TI = Indices[1];
+    if (!ti->isSimple() && !ti->isNoneType()) {
+      CVType funcIdData = iDTable.getType(*ti);
+      SmallVector<TypeIndex, 2> indices;
+      discoverTypeIndices(funcIdData, indices);
+      assert(indices.size() == 2);
+      *ti = indices[1];
     }
 
-    Kind = (Kind == SymbolKind::S_GPROC32_ID) ? SymbolKind::S_GPROC32
+    kind = (kind == SymbolKind::S_GPROC32_ID) ? SymbolKind::S_GPROC32
                                               : SymbolKind::S_LPROC32;
-    Prefix->RecordKind = uint16_t(Kind);
+    prefix->RecordKind = uint16_t(kind);
   }
 }
 
 /// Copy the symbol record. In a PDB, symbol records must be 4 byte aligned.
 /// The object file may not be aligned.
 static MutableArrayRef<uint8_t>
-copyAndAlignSymbol(const CVSymbol &Sym, MutableArrayRef<uint8_t> &AlignedMem) {
-  size_t Size = alignTo(Sym.length(), alignOf(CodeViewContainer::Pdb));
-  assert(Size >= 4 && "record too short");
-  assert(Size <= MaxRecordLength && "record too long");
-  assert(AlignedMem.size() >= Size && "didn't preallocate enough");
+copyAndAlignSymbol(const CVSymbol &sym, MutableArrayRef<uint8_t> &alignedMem) {
+  size_t size = alignTo(sym.length(), alignOf(CodeViewContainer::Pdb));
+  assert(size >= 4 && "record too short");
+  assert(size <= MaxRecordLength && "record too long");
+  assert(alignedMem.size() >= size && "didn't preallocate enough");
 
   // Copy the symbol record and zero out any padding bytes.
-  MutableArrayRef<uint8_t> NewData = AlignedMem.take_front(Size);
-  AlignedMem = AlignedMem.drop_front(Size);
-  memcpy(NewData.data(), Sym.data().data(), Sym.length());
-  memset(NewData.data() + Sym.length(), 0, Size - Sym.length());
+  MutableArrayRef<uint8_t> newData = alignedMem.take_front(size);
+  alignedMem = alignedMem.drop_front(size);
+  memcpy(newData.data(), sym.data().data(), sym.length());
+  memset(newData.data() + sym.length(), 0, size - sym.length());
 
   // Update the record prefix length. It should point to the beginning of the
   // next record.
-  auto *Prefix = reinterpret_cast<RecordPrefix *>(NewData.data());
-  Prefix->RecordLen = Size - 2;
-  return NewData;
+  auto *prefix = reinterpret_cast<RecordPrefix *>(newData.data());
+  prefix->RecordLen = size - 2;
+  return newData;
 }
 
 struct ScopeRecord {
-  ulittle32_t PtrParent;
-  ulittle32_t PtrEnd;
+  ulittle32_t ptrParent;
+  ulittle32_t ptrEnd;
 };
 
 struct SymbolScope {
-  ScopeRecord *OpeningRecord;
-  uint32_t ScopeOffset;
+  ScopeRecord *openingRecord;
+  uint32_t scopeOffset;
 };
 
-static void scopeStackOpen(SmallVectorImpl<SymbolScope> &Stack,
-                           uint32_t CurOffset, CVSymbol &Sym) {
-  assert(symbolOpensScope(Sym.kind()));
-  SymbolScope S;
-  S.ScopeOffset = CurOffset;
-  S.OpeningRecord = const_cast<ScopeRecord *>(
-      reinterpret_cast<const ScopeRecord *>(Sym.content().data()));
-  S.OpeningRecord->PtrParent = Stack.empty() ? 0 : Stack.back().ScopeOffset;
-  Stack.push_back(S);
+static void scopeStackOpen(SmallVectorImpl<SymbolScope> &stack,
+                           uint32_t curOffset, CVSymbol &sym) {
+  assert(symbolOpensScope(sym.kind()));
+  SymbolScope s;
+  s.scopeOffset = curOffset;
+  s.openingRecord = const_cast<ScopeRecord *>(
+      reinterpret_cast<const ScopeRecord *>(sym.content().data()));
+  s.openingRecord->ptrParent = stack.empty() ? 0 : stack.back().scopeOffset;
+  stack.push_back(s);
 }
 
-static void scopeStackClose(SmallVectorImpl<SymbolScope> &Stack,
-                            uint32_t CurOffset, ObjFile *File) {
-  if (Stack.empty()) {
-    warn("symbol scopes are not balanced in " + File->getName());
+static void scopeStackClose(SmallVectorImpl<SymbolScope> &stack,
+                            uint32_t curOffset, InputFile *file) {
+  if (stack.empty()) {
+    warn("symbol scopes are not balanced in " + file->getName());
     return;
   }
-  SymbolScope S = Stack.pop_back_val();
-  S.OpeningRecord->PtrEnd = CurOffset;
+  SymbolScope s = stack.pop_back_val();
+  s.openingRecord->ptrEnd = curOffset;
 }
 
-static bool symbolGoesInModuleStream(const CVSymbol &Sym, bool IsGlobalScope) {
-  switch (Sym.kind()) {
+static bool symbolGoesInModuleStream(const CVSymbol &sym, bool isGlobalScope) {
+  switch (sym.kind()) {
   case SymbolKind::S_GDATA32:
   case SymbolKind::S_CONSTANT:
   // We really should not be seeing S_PROCREF and S_LPROCREF in the first place
@@ -950,7 +767,7 @@ static bool symbolGoesInModuleStream(const CVSymbol &Sym, bool IsGlobalScope) {
     return false;
   // S_UDT records go in the module stream if it is not a global S_UDT.
   case SymbolKind::S_UDT:
-    return !IsGlobalScope;
+    return !isGlobalScope;
   // S_GDATA32 does not go in the module stream, but S_LDATA32 does.
   case SymbolKind::S_LDATA32:
   default:
@@ -958,8 +775,8 @@ static bool symbolGoesInModuleStream(const CVSymbol &Sym, bool IsGlobalScope) {
   }
 }
 
-static bool symbolGoesInGlobalsStream(const CVSymbol &Sym, bool IsGlobalScope) {
-  switch (Sym.kind()) {
+static bool symbolGoesInGlobalsStream(const CVSymbol &sym, bool isGlobalScope) {
+  switch (sym.kind()) {
   case SymbolKind::S_CONSTANT:
   case SymbolKind::S_GDATA32:
   // S_LDATA32 goes in both the module stream and the globals stream.
@@ -974,36 +791,36 @@ static bool symbolGoesInGlobalsStream(const CVSymbol &Sym, bool IsGlobalScope) {
     return true;
   // S_UDT records go in the globals stream if it is a global S_UDT.
   case SymbolKind::S_UDT:
-    return IsGlobalScope;
+    return isGlobalScope;
   default:
     return false;
   }
 }
 
-static void addGlobalSymbol(pdb::GSIStreamBuilder &Builder, uint16_t ModIndex,
-                            unsigned SymOffset, const CVSymbol &Sym) {
-  switch (Sym.kind()) {
+static void addGlobalSymbol(pdb::GSIStreamBuilder &builder, uint16_t modIndex,
+                            unsigned symOffset, const CVSymbol &sym) {
+  switch (sym.kind()) {
   case SymbolKind::S_CONSTANT:
   case SymbolKind::S_UDT:
   case SymbolKind::S_GDATA32:
   case SymbolKind::S_LDATA32:
   case SymbolKind::S_PROCREF:
   case SymbolKind::S_LPROCREF:
-    Builder.addGlobalSymbol(Sym);
+    builder.addGlobalSymbol(sym);
     break;
   case SymbolKind::S_GPROC32:
   case SymbolKind::S_LPROC32: {
-    SymbolRecordKind K = SymbolRecordKind::ProcRefSym;
-    if (Sym.kind() == SymbolKind::S_LPROC32)
-      K = SymbolRecordKind::LocalProcRef;
-    ProcRefSym PS(K);
-    PS.Module = ModIndex;
+    SymbolRecordKind k = SymbolRecordKind::ProcRefSym;
+    if (sym.kind() == SymbolKind::S_LPROC32)
+      k = SymbolRecordKind::LocalProcRef;
+    ProcRefSym ps(k);
+    ps.Module = modIndex;
     // For some reason, MSVC seems to add one to this value.
-    ++PS.Module;
-    PS.Name = getSymbolName(Sym);
-    PS.SumName = 0;
-    PS.SymOffset = SymOffset;
-    Builder.addGlobalSymbol(PS);
+    ++ps.Module;
+    ps.Name = getSymbolName(sym);
+    ps.SumName = 0;
+    ps.SymOffset = symOffset;
+    builder.addGlobalSymbol(ps);
     break;
   }
   default:
@@ -1011,229 +828,304 @@ static void addGlobalSymbol(pdb::GSIStreamBuilder &Builder, uint16_t ModIndex,
   }
 }
 
-void PDBLinker::mergeSymbolRecords(ObjFile *File, const CVIndexMap &IndexMap,
-                                   std::vector<ulittle32_t *> &StringTableRefs,
-                                   BinaryStreamRef SymData) {
-  ArrayRef<uint8_t> SymsBuffer;
-  cantFail(SymData.readBytes(0, SymData.getLength(), SymsBuffer));
-  SmallVector<SymbolScope, 4> Scopes;
+void PDBLinker::mergeSymbolRecords(ObjFile *file, const CVIndexMap &indexMap,
+                                   std::vector<ulittle32_t *> &stringTableRefs,
+                                   BinaryStreamRef symData) {
+  ArrayRef<uint8_t> symsBuffer;
+  cantFail(symData.readBytes(0, symData.getLength(), symsBuffer));
+  SmallVector<SymbolScope, 4> scopes;
 
   // Iterate every symbol to check if any need to be realigned, and if so, how
   // much space we need to allocate for them.
-  bool NeedsRealignment = false;
-  unsigned TotalRealignedSize = 0;
-  auto EC = forEachCodeViewRecord<CVSymbol>(
-      SymsBuffer, [&](CVSymbol Sym) -> llvm::Error {
-        unsigned RealignedSize =
-            alignTo(Sym.length(), alignOf(CodeViewContainer::Pdb));
-        NeedsRealignment |= RealignedSize != Sym.length();
-        TotalRealignedSize += RealignedSize;
+  bool needsRealignment = false;
+  unsigned totalRealignedSize = 0;
+  auto ec = forEachCodeViewRecord<CVSymbol>(
+      symsBuffer, [&](CVSymbol sym) -> llvm::Error {
+        unsigned realignedSize =
+            alignTo(sym.length(), alignOf(CodeViewContainer::Pdb));
+        needsRealignment |= realignedSize != sym.length();
+        totalRealignedSize += realignedSize;
         return Error::success();
       });
 
   // If any of the symbol record lengths was corrupt, ignore them all, warn
   // about it, and move on.
-  if (EC) {
-    warn("corrupt symbol records in " + File->getName());
-    consumeError(std::move(EC));
+  if (ec) {
+    warn("corrupt symbol records in " + file->getName());
+    consumeError(std::move(ec));
     return;
   }
 
   // If any symbol needed realignment, allocate enough contiguous memory for
   // them all. Typically symbol subsections are small enough that this will not
   // cause fragmentation.
-  MutableArrayRef<uint8_t> AlignedSymbolMem;
-  if (NeedsRealignment) {
-    void *AlignedData =
-        Alloc.Allocate(TotalRealignedSize, alignOf(CodeViewContainer::Pdb));
-    AlignedSymbolMem = makeMutableArrayRef(
-        reinterpret_cast<uint8_t *>(AlignedData), TotalRealignedSize);
+  MutableArrayRef<uint8_t> alignedSymbolMem;
+  if (needsRealignment) {
+    void *alignedData =
+        alloc.Allocate(totalRealignedSize, alignOf(CodeViewContainer::Pdb));
+    alignedSymbolMem = makeMutableArrayRef(
+        reinterpret_cast<uint8_t *>(alignedData), totalRealignedSize);
   }
 
   // Iterate again, this time doing the real work.
-  unsigned CurSymOffset = File->ModuleDBI->getNextSymbolOffset();
-  ArrayRef<uint8_t> BulkSymbols;
+  unsigned curSymOffset = file->moduleDBI->getNextSymbolOffset();
+  ArrayRef<uint8_t> bulkSymbols;
   cantFail(forEachCodeViewRecord<CVSymbol>(
-      SymsBuffer, [&](CVSymbol Sym) -> llvm::Error {
+      symsBuffer, [&](CVSymbol sym) -> llvm::Error {
         // Align the record if required.
-        MutableArrayRef<uint8_t> RecordBytes;
-        if (NeedsRealignment) {
-          RecordBytes = copyAndAlignSymbol(Sym, AlignedSymbolMem);
-          Sym = CVSymbol(Sym.kind(), RecordBytes);
+        MutableArrayRef<uint8_t> recordBytes;
+        if (needsRealignment) {
+          recordBytes = copyAndAlignSymbol(sym, alignedSymbolMem);
+          sym = CVSymbol(recordBytes);
         } else {
           // Otherwise, we can actually mutate the symbol directly, since we
           // copied it to apply relocations.
-          RecordBytes = makeMutableArrayRef(
-              const_cast<uint8_t *>(Sym.data().data()), Sym.length());
+          recordBytes = makeMutableArrayRef(
+              const_cast<uint8_t *>(sym.data().data()), sym.length());
         }
 
         // Discover type index references in the record. Skip it if we don't
         // know where they are.
-        SmallVector<TiReference, 32> TypeRefs;
-        if (!discoverTypeIndicesInSymbol(Sym, TypeRefs)) {
+        SmallVector<TiReference, 32> typeRefs;
+        if (!discoverTypeIndicesInSymbol(sym, typeRefs)) {
           log("ignoring unknown symbol record with kind 0x" +
-              utohexstr(Sym.kind()));
+              utohexstr(sym.kind()));
           return Error::success();
         }
 
         // Re-map all the type index references.
-        remapTypesInSymbolRecord(File, Sym.kind(), RecordBytes, IndexMap,
-                                 TypeRefs);
+        remapTypesInSymbolRecord(file, sym.kind(), recordBytes, indexMap,
+                                 typeRefs);
 
         // An object file may have S_xxx_ID symbols, but these get converted to
         // "real" symbols in a PDB.
-        translateIdSymbols(RecordBytes, getIDTable());
-        Sym = CVSymbol(symbolKind(RecordBytes), RecordBytes);
+        translateIdSymbols(recordBytes, tMerger.getIDTable());
+        sym = CVSymbol(recordBytes);
 
         // If this record refers to an offset in the object file's string table,
         // add that item to the global PDB string table and re-write the index.
-        recordStringTableReferences(Sym.kind(), RecordBytes, StringTableRefs);
+        recordStringTableReferences(sym.kind(), recordBytes, stringTableRefs);
 
         // Fill in "Parent" and "End" fields by maintaining a stack of scopes.
-        if (symbolOpensScope(Sym.kind()))
-          scopeStackOpen(Scopes, CurSymOffset, Sym);
-        else if (symbolEndsScope(Sym.kind()))
-          scopeStackClose(Scopes, CurSymOffset, File);
+        if (symbolOpensScope(sym.kind()))
+          scopeStackOpen(scopes, curSymOffset, sym);
+        else if (symbolEndsScope(sym.kind()))
+          scopeStackClose(scopes, curSymOffset, file);
 
         // Add the symbol to the globals stream if necessary.  Do this before
         // adding the symbol to the module since we may need to get the next
         // symbol offset, and writing to the module's symbol stream will update
         // that offset.
-        if (symbolGoesInGlobalsStream(Sym, Scopes.empty()))
-          addGlobalSymbol(Builder.getGsiBuilder(),
-                          File->ModuleDBI->getModuleIndex(), CurSymOffset, Sym);
+        if (symbolGoesInGlobalsStream(sym, scopes.empty())) {
+          addGlobalSymbol(builder.getGsiBuilder(),
+                          file->moduleDBI->getModuleIndex(), curSymOffset, sym);
+          ++globalSymbols;
+        }
 
-        if (symbolGoesInModuleStream(Sym, Scopes.empty())) {
+        if (symbolGoesInModuleStream(sym, scopes.empty())) {
           // Add symbols to the module in bulk. If this symbol is contiguous
           // with the previous run of symbols to add, combine the ranges. If
           // not, close the previous range of symbols and start a new one.
-          if (Sym.data().data() == BulkSymbols.end()) {
-            BulkSymbols = makeArrayRef(BulkSymbols.data(),
-                                       BulkSymbols.size() + Sym.length());
+          if (sym.data().data() == bulkSymbols.end()) {
+            bulkSymbols = makeArrayRef(bulkSymbols.data(),
+                                       bulkSymbols.size() + sym.length());
           } else {
-            File->ModuleDBI->addSymbolsInBulk(BulkSymbols);
-            BulkSymbols = RecordBytes;
+            file->moduleDBI->addSymbolsInBulk(bulkSymbols);
+            bulkSymbols = recordBytes;
           }
-          CurSymOffset += Sym.length();
+          curSymOffset += sym.length();
+          ++moduleSymbols;
         }
         return Error::success();
       }));
 
   // Add any remaining symbols we've accumulated.
-  File->ModuleDBI->addSymbolsInBulk(BulkSymbols);
+  file->moduleDBI->addSymbolsInBulk(bulkSymbols);
 }
 
 // Allocate memory for a .debug$S / .debug$F section and relocate it.
-static ArrayRef<uint8_t> relocateDebugChunk(BumpPtrAllocator &Alloc,
-                                            SectionChunk &DebugChunk) {
-  uint8_t *Buffer = Alloc.Allocate<uint8_t>(DebugChunk.getSize());
-  assert(DebugChunk.OutputSectionOff == 0 &&
+static ArrayRef<uint8_t> relocateDebugChunk(BumpPtrAllocator &alloc,
+                                            SectionChunk &debugChunk) {
+  uint8_t *buffer = alloc.Allocate<uint8_t>(debugChunk.getSize());
+  assert(debugChunk.getOutputSectionIdx() == 0 &&
          "debug sections should not be in output sections");
-  DebugChunk.readRelocTargets();
-  DebugChunk.writeTo(Buffer);
-  return makeArrayRef(Buffer, DebugChunk.getSize());
+  debugChunk.writeTo(buffer);
+  return makeArrayRef(buffer, debugChunk.getSize());
 }
 
-static pdb::SectionContrib createSectionContrib(const Chunk *C, uint32_t Modi) {
-  OutputSection *OS = C->getOutputSection();
-  pdb::SectionContrib SC;
-  memset(&SC, 0, sizeof(SC));
-  SC.ISect = OS->SectionIndex;
-  SC.Off = C->getRVA() - OS->getRVA();
-  SC.Size = C->getSize();
-  if (auto *SecChunk = dyn_cast<SectionChunk>(C)) {
-    SC.Characteristics = SecChunk->Header->Characteristics;
-    SC.Imod = SecChunk->File->ModuleDBI->getModuleIndex();
-    ArrayRef<uint8_t> Contents = SecChunk->getContents();
-    JamCRC CRC(0);
-    ArrayRef<char> CharContents = makeArrayRef(
-        reinterpret_cast<const char *>(Contents.data()), Contents.size());
-    CRC.update(CharContents);
-    SC.DataCrc = CRC.getCRC();
+static pdb::SectionContrib createSectionContrib(const Chunk *c, uint32_t modi) {
+  OutputSection *os = c ? c->getOutputSection() : nullptr;
+  pdb::SectionContrib sc;
+  memset(&sc, 0, sizeof(sc));
+  sc.ISect = os ? os->sectionIndex : llvm::pdb::kInvalidStreamIndex;
+  sc.Off = c && os ? c->getRVA() - os->getRVA() : 0;
+  sc.Size = c ? c->getSize() : -1;
+  if (auto *secChunk = dyn_cast_or_null<SectionChunk>(c)) {
+    sc.Characteristics = secChunk->header->Characteristics;
+    sc.Imod = secChunk->file->moduleDBI->getModuleIndex();
+    ArrayRef<uint8_t> contents = secChunk->getContents();
+    JamCRC crc(0);
+    ArrayRef<char> charContents = makeArrayRef(
+        reinterpret_cast<const char *>(contents.data()), contents.size());
+    crc.update(charContents);
+    sc.DataCrc = crc.getCRC();
   } else {
-    SC.Characteristics = OS->Header.Characteristics;
-    // FIXME: When we start creating DBI for import libraries, use those here.
-    SC.Imod = Modi;
+    sc.Characteristics = os ? os->header.Characteristics : 0;
+    sc.Imod = modi;
   }
-  SC.RelocCrc = 0; // FIXME
+  sc.RelocCrc = 0; // FIXME
 
-  return SC;
+  return sc;
 }
 
 static uint32_t
-translateStringTableIndex(uint32_t ObjIndex,
-                          const DebugStringTableSubsectionRef &ObjStrTable,
-                          DebugStringTableSubsection &PdbStrTable) {
-  auto ExpectedString = ObjStrTable.getString(ObjIndex);
-  if (!ExpectedString) {
+translateStringTableIndex(uint32_t objIndex,
+                          const DebugStringTableSubsectionRef &objStrTable,
+                          DebugStringTableSubsection &pdbStrTable) {
+  auto expectedString = objStrTable.getString(objIndex);
+  if (!expectedString) {
     warn("Invalid string table reference");
-    consumeError(ExpectedString.takeError());
+    consumeError(expectedString.takeError());
     return 0;
   }
 
-  return PdbStrTable.insert(*ExpectedString);
+  return pdbStrTable.insert(*expectedString);
 }
 
-void DebugSHandler::handleDebugS(lld::coff::SectionChunk &DebugS) {
-  DebugSubsectionArray Subsections;
+void DebugSHandler::handleDebugS(lld::coff::SectionChunk &debugS) {
+  DebugSubsectionArray subsections;
 
-  ArrayRef<uint8_t> RelocatedDebugContents = consumeDebugMagic(
-      relocateDebugChunk(Linker.Alloc, DebugS), DebugS.getSectionName());
+  ArrayRef<uint8_t> relocatedDebugContents = SectionChunk::consumeDebugMagic(
+      relocateDebugChunk(linker.alloc, debugS), debugS.getSectionName());
 
-  BinaryStreamReader Reader(RelocatedDebugContents, support::little);
-  ExitOnErr(Reader.readArray(Subsections, RelocatedDebugContents.size()));
+  BinaryStreamReader reader(relocatedDebugContents, support::little);
+  exitOnErr(reader.readArray(subsections, relocatedDebugContents.size()));
 
-  for (const DebugSubsectionRecord &SS : Subsections) {
-    switch (SS.kind()) {
+  for (const DebugSubsectionRecord &ss : subsections) {
+    // Ignore subsections with the 'ignore' bit. Some versions of the Visual C++
+    // runtime have subsections with this bit set.
+    if (uint32_t(ss.kind()) & codeview::SubsectionIgnoreFlag)
+      continue;
+
+    switch (ss.kind()) {
     case DebugSubsectionKind::StringTable: {
-      assert(!CVStrTab.valid() &&
+      assert(!cVStrTab.valid() &&
              "Encountered multiple string table subsections!");
-      ExitOnErr(CVStrTab.initialize(SS.getRecordData()));
+      exitOnErr(cVStrTab.initialize(ss.getRecordData()));
       break;
     }
     case DebugSubsectionKind::FileChecksums:
-      assert(!Checksums.valid() &&
+      assert(!checksums.valid() &&
              "Encountered multiple checksum subsections!");
-      ExitOnErr(Checksums.initialize(SS.getRecordData()));
+      exitOnErr(checksums.initialize(ss.getRecordData()));
       break;
     case DebugSubsectionKind::Lines:
       // We can add the relocated line table directly to the PDB without
       // modification because the file checksum offsets will stay the same.
-      File.ModuleDBI->addDebugSubsection(SS);
+      file.moduleDBI->addDebugSubsection(ss);
+      break;
+    case DebugSubsectionKind::InlineeLines:
+      assert(!inlineeLines.valid() &&
+             "Encountered multiple inlinee lines subsections!");
+      exitOnErr(inlineeLines.initialize(ss.getRecordData()));
       break;
     case DebugSubsectionKind::FrameData: {
       // We need to re-write string table indices here, so save off all
       // frame data subsections until we've processed the entire list of
       // subsections so that we can be sure we have the string table.
-      DebugFrameDataSubsectionRef FDS;
-      ExitOnErr(FDS.initialize(SS.getRecordData()));
-      NewFpoFrames.push_back(std::move(FDS));
+      DebugFrameDataSubsectionRef fds;
+      exitOnErr(fds.initialize(ss.getRecordData()));
+      newFpoFrames.push_back(std::move(fds));
       break;
     }
     case DebugSubsectionKind::Symbols: {
-      Linker.mergeSymbolRecords(&File, IndexMap, StringTableReferences,
-                                SS.getRecordData());
+      linker.mergeSymbolRecords(&file, indexMap, stringTableReferences,
+                                ss.getRecordData());
       break;
     }
+
+    case DebugSubsectionKind::CrossScopeImports:
+    case DebugSubsectionKind::CrossScopeExports:
+      // These appear to relate to cross-module optimization, so we might use
+      // these for ThinLTO.
+      break;
+
+    case DebugSubsectionKind::ILLines:
+    case DebugSubsectionKind::FuncMDTokenMap:
+    case DebugSubsectionKind::TypeMDTokenMap:
+    case DebugSubsectionKind::MergedAssemblyInput:
+      // These appear to relate to .Net assembly info.
+      break;
+
+    case DebugSubsectionKind::CoffSymbolRVA:
+      // Unclear what this is for.
+      break;
+
     default:
-      // FIXME: Process the rest of the subsections.
+      warn("ignoring unknown debug$S subsection kind 0x" +
+           utohexstr(uint32_t(ss.kind())) + " in file " + toString(&file));
       break;
     }
   }
 }
 
+static Expected<StringRef>
+getFileName(const DebugStringTableSubsectionRef &strings,
+            const DebugChecksumsSubsectionRef &checksums, uint32_t fileID) {
+  auto iter = checksums.getArray().at(fileID);
+  if (iter == checksums.getArray().end())
+    return make_error<CodeViewError>(cv_error_code::no_records);
+  uint32_t offset = iter->FileNameOffset;
+  return strings.getString(offset);
+}
+
+std::shared_ptr<DebugInlineeLinesSubsection>
+DebugSHandler::mergeInlineeLines(DebugChecksumsSubsection *newChecksums) {
+  auto newInlineeLines = std::make_shared<DebugInlineeLinesSubsection>(
+      *newChecksums, inlineeLines.hasExtraFiles());
+
+  for (const InlineeSourceLine &line : inlineeLines) {
+    TypeIndex inlinee = line.Header->Inlinee;
+    uint32_t fileID = line.Header->FileID;
+    uint32_t sourceLine = line.Header->SourceLineNum;
+
+    ArrayRef<TypeIndex> typeOrItemMap =
+        indexMap.isTypeServerMap ? indexMap.ipiMap : indexMap.tpiMap;
+    if (!remapTypeIndex(inlinee, typeOrItemMap)) {
+      log("ignoring inlinee line record in " + file.getName() +
+          " with bad inlinee index 0x" + utohexstr(inlinee.getIndex()));
+      continue;
+    }
+
+    SmallString<128> filename =
+        exitOnErr(getFileName(cVStrTab, checksums, fileID));
+    pdbMakeAbsolute(filename);
+    newInlineeLines->addInlineSite(inlinee, filename, sourceLine);
+
+    if (inlineeLines.hasExtraFiles()) {
+      for (uint32_t extraFileId : line.ExtraFiles) {
+        filename = exitOnErr(getFileName(cVStrTab, checksums, extraFileId));
+        pdbMakeAbsolute(filename);
+        newInlineeLines->addExtraFile(filename);
+      }
+    }
+  }
+
+  return newInlineeLines;
+}
+
 void DebugSHandler::finish() {
-  pdb::DbiStreamBuilder &DbiBuilder = Linker.Builder.getDbiBuilder();
+  pdb::DbiStreamBuilder &dbiBuilder = linker.builder.getDbiBuilder();
 
   // We should have seen all debug subsections across the entire object file now
   // which means that if a StringTable subsection and Checksums subsection were
   // present, now is the time to handle them.
-  if (!CVStrTab.valid()) {
-    if (Checksums.valid())
+  if (!cVStrTab.valid()) {
+    if (checksums.valid())
       fatal(".debug$S sections with a checksums subsection must also contain a "
             "string table subsection");
 
-    if (!StringTableReferences.empty())
+    if (!stringTableReferences.empty())
       warn("No StringTable subsection was encountered, but there are string "
            "table references");
     return;
@@ -1241,186 +1133,231 @@ void DebugSHandler::finish() {
 
   // Rewrite string table indices in the Fpo Data and symbol records to refer to
   // the global PDB string table instead of the object file string table.
-  for (DebugFrameDataSubsectionRef &FDS : NewFpoFrames) {
-    const ulittle32_t *Reloc = FDS.getRelocPtr();
-    for (codeview::FrameData FD : FDS) {
-      FD.RvaStart += *Reloc;
-      FD.FrameFunc =
-          translateStringTableIndex(FD.FrameFunc, CVStrTab, Linker.PDBStrTab);
-      DbiBuilder.addNewFpoData(FD);
+  for (DebugFrameDataSubsectionRef &fds : newFpoFrames) {
+    const ulittle32_t *reloc = fds.getRelocPtr();
+    for (codeview::FrameData fd : fds) {
+      fd.RvaStart += *reloc;
+      fd.FrameFunc =
+          translateStringTableIndex(fd.FrameFunc, cVStrTab, linker.pdbStrTab);
+      dbiBuilder.addNewFpoData(fd);
     }
   }
 
-  for (ulittle32_t *Ref : StringTableReferences)
-    *Ref = translateStringTableIndex(*Ref, CVStrTab, Linker.PDBStrTab);
+  for (ulittle32_t *ref : stringTableReferences)
+    *ref = translateStringTableIndex(*ref, cVStrTab, linker.pdbStrTab);
 
   // Make a new file checksum table that refers to offsets in the PDB-wide
   // string table. Generally the string table subsection appears after the
   // checksum table, so we have to do this after looping over all the
   // subsections.
-  auto NewChecksums = make_unique<DebugChecksumsSubsection>(Linker.PDBStrTab);
-  for (FileChecksumEntry &FC : Checksums) {
-    SmallString<128> FileName =
-        ExitOnErr(CVStrTab.getString(FC.FileNameOffset));
-    pdbMakeAbsolute(FileName);
-    ExitOnErr(Linker.Builder.getDbiBuilder().addModuleSourceFile(
-        *File.ModuleDBI, FileName));
-    NewChecksums->addChecksum(FileName, FC.Kind, FC.Checksum);
+  auto newChecksums = make_unique<DebugChecksumsSubsection>(linker.pdbStrTab);
+  for (FileChecksumEntry &fc : checksums) {
+    SmallString<128> filename =
+        exitOnErr(cVStrTab.getString(fc.FileNameOffset));
+    pdbMakeAbsolute(filename);
+    exitOnErr(dbiBuilder.addModuleSourceFile(*file.moduleDBI, filename));
+    newChecksums->addChecksum(filename, fc.Kind, fc.Checksum);
   }
-  File.ModuleDBI->addDebugSubsection(std::move(NewChecksums));
+
+  // Rewrite inlinee item indices if present.
+  if (inlineeLines.valid())
+    file.moduleDBI->addDebugSubsection(mergeInlineeLines(newChecksums.get()));
+
+  file.moduleDBI->addDebugSubsection(std::move(newChecksums));
 }
 
-void PDBLinker::addObjFile(ObjFile *File, CVIndexMap *ExternIndexMap) {
-  if (File->wasProcessedForPDB())
+void PDBLinker::addObjFile(ObjFile *file, CVIndexMap *externIndexMap) {
+  if (file->mergedIntoPDB)
     return;
-  // Add a module descriptor for every object file. We need to put an absolute
-  // path to the object into the PDB. If this is a plain object, we make its
-  // path absolute. If it's an object in an archive, we make the archive path
-  // absolute.
-  bool InArchive = !File->ParentName.empty();
-  SmallString<128> Path = InArchive ? File->ParentName : File->getName();
-  pdbMakeAbsolute(Path);
-  StringRef Name = InArchive ? File->getName() : StringRef(Path);
-
-  pdb::DbiStreamBuilder &DbiBuilder = Builder.getDbiBuilder();
-  File->ModuleDBI = &ExitOnErr(DbiBuilder.addModuleInfo(Name));
-  File->ModuleDBI->setObjFileName(Path);
-
-  auto Chunks = File->getChunks();
-  uint32_t Modi = File->ModuleDBI->getModuleIndex();
-  for (Chunk *C : Chunks) {
-    auto *SecChunk = dyn_cast<SectionChunk>(C);
-    if (!SecChunk || !SecChunk->Live)
-      continue;
-    pdb::SectionContrib SC = createSectionContrib(SecChunk, Modi);
-    File->ModuleDBI->setFirstSectionContrib(SC);
-    break;
-  }
+  file->mergedIntoPDB = true;
 
   // Before we can process symbol substreams from .debug$S, we need to process
   // type information, file checksums, and the string table.  Add type info to
   // the PDB first, so that we can get the map from object file type and item
   // indices to PDB type and item indices.
-  CVIndexMap ObjectIndexMap;
-  auto IndexMapResult =
-      mergeDebugT(File, ExternIndexMap ? ExternIndexMap : &ObjectIndexMap);
+  CVIndexMap objectIndexMap;
+  auto indexMapResult =
+      mergeDebugT(file, externIndexMap ? externIndexMap : &objectIndexMap);
 
   // If the .debug$T sections fail to merge, assume there is no debug info.
-  if (!IndexMapResult) {
-    if (!Config->WarnDebugInfoUnusable) {
-      consumeError(IndexMapResult.takeError());
+  if (!indexMapResult) {
+    if (!config->warnDebugInfoUnusable) {
+      consumeError(indexMapResult.takeError());
       return;
     }
-    StringRef FileName = sys::path::filename(Path);
-    warn("Cannot use debug info for '" + FileName + "' [LNK4099]\n" +
+    warn("Cannot use debug info for '" + toString(file) + "' [LNK4099]\n" +
          ">>> failed to load reference " +
-         StringRef(toString(IndexMapResult.takeError())));
+         StringRef(toString(indexMapResult.takeError())));
     return;
   }
 
-  ScopedTimer T(SymbolMergingTimer);
+  ScopedTimer t(symbolMergingTimer);
 
-  DebugSHandler DSH(*this, *File, *IndexMapResult);
+  pdb::DbiStreamBuilder &dbiBuilder = builder.getDbiBuilder();
+  DebugSHandler dsh(*this, *file, *indexMapResult);
   // Now do all live .debug$S and .debug$F sections.
-  for (SectionChunk *DebugChunk : File->getDebugChunks()) {
-    if (!DebugChunk->Live || DebugChunk->getSize() == 0)
+  for (SectionChunk *debugChunk : file->getDebugChunks()) {
+    if (!debugChunk->live || debugChunk->getSize() == 0)
       continue;
 
-    if (DebugChunk->getSectionName() == ".debug$S") {
-      DSH.handleDebugS(*DebugChunk);
+    if (debugChunk->getSectionName() == ".debug$S") {
+      dsh.handleDebugS(*debugChunk);
       continue;
     }
 
-    if (DebugChunk->getSectionName() == ".debug$F") {
-      ArrayRef<uint8_t> RelocatedDebugContents =
-          relocateDebugChunk(Alloc, *DebugChunk);
+    if (debugChunk->getSectionName() == ".debug$F") {
+      ArrayRef<uint8_t> relocatedDebugContents =
+          relocateDebugChunk(alloc, *debugChunk);
 
-      FixedStreamArray<object::FpoData> FpoRecords;
-      BinaryStreamReader Reader(RelocatedDebugContents, support::little);
-      uint32_t Count = RelocatedDebugContents.size() / sizeof(object::FpoData);
-      ExitOnErr(Reader.readArray(FpoRecords, Count));
+      FixedStreamArray<object::FpoData> fpoRecords;
+      BinaryStreamReader reader(relocatedDebugContents, support::little);
+      uint32_t count = relocatedDebugContents.size() / sizeof(object::FpoData);
+      exitOnErr(reader.readArray(fpoRecords, count));
 
       // These are already relocated and don't refer to the string table, so we
       // can just copy it.
-      for (const object::FpoData &FD : FpoRecords)
-        DbiBuilder.addOldFpoData(FD);
+      for (const object::FpoData &fd : fpoRecords)
+        dbiBuilder.addOldFpoData(fd);
       continue;
     }
   }
 
   // Do any post-processing now that all .debug$S sections have been processed.
-  DSH.finish();
+  dsh.finish();
 }
 
-static PublicSym32 createPublic(Defined *Def) {
-  PublicSym32 Pub(SymbolKind::S_PUB32);
-  Pub.Name = Def->getName();
-  if (auto *D = dyn_cast<DefinedCOFF>(Def)) {
-    if (D->getCOFFSymbol().isFunctionDefinition())
-      Pub.Flags = PublicSymFlags::Function;
-  } else if (isa<DefinedImportThunk>(Def)) {
-    Pub.Flags = PublicSymFlags::Function;
+// Add a module descriptor for every object file. We need to put an absolute
+// path to the object into the PDB. If this is a plain object, we make its
+// path absolute. If it's an object in an archive, we make the archive path
+// absolute.
+static void createModuleDBI(pdb::PDBFileBuilder &builder) {
+  pdb::DbiStreamBuilder &dbiBuilder = builder.getDbiBuilder();
+  SmallString<128> objName;
+
+  for (ObjFile *file : ObjFile::instances) {
+
+    bool inArchive = !file->parentName.empty();
+    objName = inArchive ? file->parentName : file->getName();
+    pdbMakeAbsolute(objName);
+    StringRef modName = inArchive ? file->getName() : StringRef(objName);
+
+    file->moduleDBI = &exitOnErr(dbiBuilder.addModuleInfo(modName));
+    file->moduleDBI->setObjFileName(objName);
+
+    ArrayRef<Chunk *> chunks = file->getChunks();
+    uint32_t modi = file->moduleDBI->getModuleIndex();
+
+    for (Chunk *c : chunks) {
+      auto *secChunk = dyn_cast<SectionChunk>(c);
+      if (!secChunk || !secChunk->live)
+        continue;
+      pdb::SectionContrib sc = createSectionContrib(secChunk, modi);
+      file->moduleDBI->setFirstSectionContrib(sc);
+      break;
+    }
+  }
+}
+
+static PublicSym32 createPublic(Defined *def) {
+  PublicSym32 pub(SymbolKind::S_PUB32);
+  pub.Name = def->getName();
+  if (auto *d = dyn_cast<DefinedCOFF>(def)) {
+    if (d->getCOFFSymbol().isFunctionDefinition())
+      pub.Flags = PublicSymFlags::Function;
+  } else if (isa<DefinedImportThunk>(def)) {
+    pub.Flags = PublicSymFlags::Function;
   }
 
-  OutputSection *OS = Def->getChunk()->getOutputSection();
-  assert(OS && "all publics should be in final image");
-  Pub.Offset = Def->getRVA() - OS->getRVA();
-  Pub.Segment = OS->SectionIndex;
-  return Pub;
+  OutputSection *os = def->getChunk()->getOutputSection();
+  assert(os && "all publics should be in final image");
+  pub.Offset = def->getRVA() - os->getRVA();
+  pub.Segment = os->sectionIndex;
+  return pub;
 }
 
 // Add all object files to the PDB. Merge .debug$T sections into IpiData and
 // TpiData.
 void PDBLinker::addObjectsToPDB() {
-  ScopedTimer T1(AddObjectsTimer);
-  for (ObjFile *File : ObjFile::Instances)
-    addObjFile(File);
+  ScopedTimer t1(addObjectsTimer);
 
-  Builder.getStringTableBuilder().setStrings(PDBStrTab);
-  T1.stop();
+  createModuleDBI(builder);
+
+  for (ObjFile *file : ObjFile::instances)
+    addObjFile(file);
+
+  builder.getStringTableBuilder().setStrings(pdbStrTab);
+  t1.stop();
 
   // Construct TPI and IPI stream contents.
-  ScopedTimer T2(TpiStreamLayoutTimer);
-  addTypeInfo(Builder.getTpiBuilder(), getTypeTable());
-  addTypeInfo(Builder.getIpiBuilder(), getIDTable());
-  T2.stop();
+  ScopedTimer t2(tpiStreamLayoutTimer);
+  addTypeInfo(builder.getTpiBuilder(), tMerger.getTypeTable());
+  addTypeInfo(builder.getIpiBuilder(), tMerger.getIDTable());
+  t2.stop();
 
-  ScopedTimer T3(GlobalsLayoutTimer);
+  ScopedTimer t3(globalsLayoutTimer);
   // Compute the public and global symbols.
-  auto &GsiBuilder = Builder.getGsiBuilder();
-  std::vector<PublicSym32> Publics;
-  Symtab->forEachSymbol([&Publics](Symbol *S) {
+  auto &gsiBuilder = builder.getGsiBuilder();
+  std::vector<PublicSym32> publics;
+  symtab->forEachSymbol([&publics](Symbol *s) {
     // Only emit defined, live symbols that have a chunk.
-    auto *Def = dyn_cast<Defined>(S);
-    if (Def && Def->isLive() && Def->getChunk())
-      Publics.push_back(createPublic(Def));
+    auto *def = dyn_cast<Defined>(s);
+    if (def && def->isLive() && def->getChunk())
+      publics.push_back(createPublic(def));
   });
 
-  if (!Publics.empty()) {
+  if (!publics.empty()) {
+    publicSymbols = publics.size();
     // Sort the public symbols and add them to the stream.
-    sort(parallel::par, Publics.begin(), Publics.end(),
-         [](const PublicSym32 &L, const PublicSym32 &R) {
-           return L.Name < R.Name;
-         });
-    for (const PublicSym32 &Pub : Publics)
-      GsiBuilder.addPublicSymbol(Pub);
+    parallelSort(publics, [](const PublicSym32 &l, const PublicSym32 &r) {
+      return l.Name < r.Name;
+    });
+    for (const PublicSym32 &pub : publics)
+      gsiBuilder.addPublicSymbol(pub);
   }
 }
 
+void PDBLinker::printStats() {
+  if (!config->showSummary)
+    return;
+
+  SmallString<256> buffer;
+  raw_svector_ostream stream(buffer);
+
+  stream << center_justify("Summary", 80) << '\n'
+         << std::string(80, '-') << '\n';
+
+  auto print = [&](uint64_t v, StringRef s) {
+    stream << format_decimal(v, 15) << " " << s << '\n';
+  };
+
+  print(ObjFile::instances.size(),
+        "Input OBJ files (expanded from all cmd-line inputs)");
+  print(typeServerIndexMappings.size(), "PDB type server dependencies");
+  print(precompTypeIndexMappings.size(), "Precomp OBJ dependencies");
+  print(tMerger.getTypeTable().size() + tMerger.getIDTable().size(),
+        "Merged TPI records");
+  print(pdbStrTab.size(), "Output PDB strings");
+  print(globalSymbols, "Global symbol records");
+  print(moduleSymbols, "Module symbol records");
+  print(publicSymbols, "Public symbol records");
+
+  message(buffer);
+}
+
 void PDBLinker::addNatvisFiles() {
-  for (StringRef File : Config->NatvisFiles) {
-    ErrorOr<std::unique_ptr<MemoryBuffer>> DataOrErr =
-        MemoryBuffer::getFile(File);
-    if (!DataOrErr) {
-      warn("Cannot open input file: " + File);
+  for (StringRef file : config->natvisFiles) {
+    ErrorOr<std::unique_ptr<MemoryBuffer>> dataOrErr =
+        MemoryBuffer::getFile(file);
+    if (!dataOrErr) {
+      warn("Cannot open input file: " + file);
       continue;
     }
-    Builder.addInjectedSource(File, std::move(*DataOrErr));
+    builder.addInjectedSource(file, std::move(*dataOrErr));
   }
 }
 
-static codeview::CPUType toCodeViewMachine(COFF::MachineTypes Machine) {
-  switch (Machine) {
+static codeview::CPUType toCodeViewMachine(COFF::MachineTypes machine) {
+  switch (machine) {
   case COFF::IMAGE_FILE_MACHINE_AMD64:
     return codeview::CPUType::X64;
   case COFF::IMAGE_FILE_MACHINE_ARM:
@@ -1439,201 +1376,329 @@ static codeview::CPUType toCodeViewMachine(COFF::MachineTypes Machine) {
 // Mimic MSVC which surrounds arguments containing whitespace with quotes.
 // Double double-quotes are handled, so that the resulting string can be
 // executed again on the cmd-line.
-static std::string quote(ArrayRef<StringRef> Args) {
-  std::string R;
-  R.reserve(256);
-  for (StringRef A : Args) {
-    if (!R.empty())
-      R.push_back(' ');
-    bool HasWS = A.find(' ') != StringRef::npos;
-    bool HasQ = A.find('"') != StringRef::npos;
-    if (HasWS || HasQ)
-      R.push_back('"');
-    if (HasQ) {
-      SmallVector<StringRef, 4> S;
-      A.split(S, '"');
-      R.append(join(S, "\"\""));
+static std::string quote(ArrayRef<StringRef> args) {
+  std::string r;
+  r.reserve(256);
+  for (StringRef a : args) {
+    if (!r.empty())
+      r.push_back(' ');
+    bool hasWS = a.find(' ') != StringRef::npos;
+    bool hasQ = a.find('"') != StringRef::npos;
+    if (hasWS || hasQ)
+      r.push_back('"');
+    if (hasQ) {
+      SmallVector<StringRef, 4> s;
+      a.split(s, '"');
+      r.append(join(s, "\"\""));
     } else {
-      R.append(A);
+      r.append(a);
     }
-    if (HasWS || HasQ)
-      R.push_back('"');
+    if (hasWS || hasQ)
+      r.push_back('"');
   }
-  return R;
+  return r;
 }
 
-static void addCommonLinkerModuleSymbols(StringRef Path,
-                                         pdb::DbiModuleDescriptorBuilder &Mod,
-                                         BumpPtrAllocator &Allocator) {
-  ObjNameSym ONS(SymbolRecordKind::ObjNameSym);
-  Compile3Sym CS(SymbolRecordKind::Compile3Sym);
-  EnvBlockSym EBS(SymbolRecordKind::EnvBlockSym);
-
-  ONS.Name = "* Linker *";
-  ONS.Signature = 0;
-
-  CS.Machine = toCodeViewMachine(Config->Machine);
+static void fillLinkerVerRecord(Compile3Sym &cs) {
+  cs.Machine = toCodeViewMachine(config->machine);
   // Interestingly, if we set the string to 0.0.0.0, then when trying to view
   // local variables WinDbg emits an error that private symbols are not present.
   // By setting this to a valid MSVC linker version string, local variables are
   // displayed properly.   As such, even though it is not representative of
   // LLVM's version information, we need this for compatibility.
-  CS.Flags = CompileSym3Flags::None;
-  CS.VersionBackendBuild = 25019;
-  CS.VersionBackendMajor = 14;
-  CS.VersionBackendMinor = 10;
-  CS.VersionBackendQFE = 0;
+  cs.Flags = CompileSym3Flags::None;
+  cs.VersionBackendBuild = 25019;
+  cs.VersionBackendMajor = 14;
+  cs.VersionBackendMinor = 10;
+  cs.VersionBackendQFE = 0;
 
   // MSVC also sets the frontend to 0.0.0.0 since this is specifically for the
   // linker module (which is by definition a backend), so we don't need to do
   // anything here.  Also, it seems we can use "LLVM Linker" for the linker name
   // without any problems.  Only the backend version has to be hardcoded to a
   // magic number.
-  CS.VersionFrontendBuild = 0;
-  CS.VersionFrontendMajor = 0;
-  CS.VersionFrontendMinor = 0;
-  CS.VersionFrontendQFE = 0;
-  CS.Version = "LLVM Linker";
-  CS.setLanguage(SourceLanguage::Link);
+  cs.VersionFrontendBuild = 0;
+  cs.VersionFrontendMajor = 0;
+  cs.VersionFrontendMinor = 0;
+  cs.VersionFrontendQFE = 0;
+  cs.Version = "LLVM Linker";
+  cs.setLanguage(SourceLanguage::Link);
+}
 
-  ArrayRef<StringRef> Args = makeArrayRef(Config->Argv).drop_front();
-  std::string ArgStr = quote(Args);
-  EBS.Fields.push_back("cwd");
+static void addCommonLinkerModuleSymbols(StringRef path,
+                                         pdb::DbiModuleDescriptorBuilder &mod,
+                                         BumpPtrAllocator &allocator) {
+  ObjNameSym ons(SymbolRecordKind::ObjNameSym);
+  EnvBlockSym ebs(SymbolRecordKind::EnvBlockSym);
+  Compile3Sym cs(SymbolRecordKind::Compile3Sym);
+  fillLinkerVerRecord(cs);
+
+  ons.Name = "* Linker *";
+  ons.Signature = 0;
+
+  ArrayRef<StringRef> args = makeArrayRef(config->argv).drop_front();
+  std::string argStr = quote(args);
+  ebs.Fields.push_back("cwd");
   SmallString<64> cwd;
-  if (Config->PDBSourcePath.empty())
+  if (config->pdbSourcePath.empty())
     sys::fs::current_path(cwd);
   else
-    cwd = Config->PDBSourcePath;
-  EBS.Fields.push_back(cwd);
-  EBS.Fields.push_back("exe");
-  SmallString<64> exe = Config->Argv[0];
+    cwd = config->pdbSourcePath;
+  ebs.Fields.push_back(cwd);
+  ebs.Fields.push_back("exe");
+  SmallString<64> exe = config->argv[0];
   pdbMakeAbsolute(exe);
-  EBS.Fields.push_back(exe);
-  EBS.Fields.push_back("pdb");
-  EBS.Fields.push_back(Path);
-  EBS.Fields.push_back("cmd");
-  EBS.Fields.push_back(ArgStr);
-  Mod.addSymbol(codeview::SymbolSerializer::writeOneSymbol(
-      ONS, Allocator, CodeViewContainer::Pdb));
-  Mod.addSymbol(codeview::SymbolSerializer::writeOneSymbol(
-      CS, Allocator, CodeViewContainer::Pdb));
-  Mod.addSymbol(codeview::SymbolSerializer::writeOneSymbol(
-      EBS, Allocator, CodeViewContainer::Pdb));
+  ebs.Fields.push_back(exe);
+  ebs.Fields.push_back("pdb");
+  ebs.Fields.push_back(path);
+  ebs.Fields.push_back("cmd");
+  ebs.Fields.push_back(argStr);
+  mod.addSymbol(codeview::SymbolSerializer::writeOneSymbol(
+      ons, allocator, CodeViewContainer::Pdb));
+  mod.addSymbol(codeview::SymbolSerializer::writeOneSymbol(
+      cs, allocator, CodeViewContainer::Pdb));
+  mod.addSymbol(codeview::SymbolSerializer::writeOneSymbol(
+      ebs, allocator, CodeViewContainer::Pdb));
 }
 
-static void addLinkerModuleSectionSymbol(pdb::DbiModuleDescriptorBuilder &Mod,
-                                         OutputSection &OS,
-                                         BumpPtrAllocator &Allocator) {
-  SectionSym Sym(SymbolRecordKind::SectionSym);
-  Sym.Alignment = 12; // 2^12 = 4KB
-  Sym.Characteristics = OS.Header.Characteristics;
-  Sym.Length = OS.getVirtualSize();
-  Sym.Name = OS.Name;
-  Sym.Rva = OS.getRVA();
-  Sym.SectionNumber = OS.SectionIndex;
-  Mod.addSymbol(codeview::SymbolSerializer::writeOneSymbol(
-      Sym, Allocator, CodeViewContainer::Pdb));
+static void addLinkerModuleCoffGroup(PartialSection *sec,
+                                     pdb::DbiModuleDescriptorBuilder &mod,
+                                     OutputSection &os,
+                                     BumpPtrAllocator &allocator) {
+  // If there's a section, there's at least one chunk
+  assert(!sec->chunks.empty());
+  const Chunk *firstChunk = *sec->chunks.begin();
+  const Chunk *lastChunk = *sec->chunks.rbegin();
+
+  // Emit COFF group
+  CoffGroupSym cgs(SymbolRecordKind::CoffGroupSym);
+  cgs.Name = sec->name;
+  cgs.Segment = os.sectionIndex;
+  cgs.Offset = firstChunk->getRVA() - os.getRVA();
+  cgs.Size = lastChunk->getRVA() + lastChunk->getSize() - firstChunk->getRVA();
+  cgs.Characteristics = sec->characteristics;
+
+  // Somehow .idata sections & sections groups in the debug symbol stream have
+  // the "write" flag set. However the section header for the corresponding
+  // .idata section doesn't have it.
+  if (cgs.Name.startswith(".idata"))
+    cgs.Characteristics |= llvm::COFF::IMAGE_SCN_MEM_WRITE;
+
+  mod.addSymbol(codeview::SymbolSerializer::writeOneSymbol(
+      cgs, allocator, CodeViewContainer::Pdb));
+}
+
+static void addLinkerModuleSectionSymbol(pdb::DbiModuleDescriptorBuilder &mod,
+                                         OutputSection &os,
+                                         BumpPtrAllocator &allocator) {
+  SectionSym sym(SymbolRecordKind::SectionSym);
+  sym.Alignment = 12; // 2^12 = 4KB
+  sym.Characteristics = os.header.Characteristics;
+  sym.Length = os.getVirtualSize();
+  sym.Name = os.name;
+  sym.Rva = os.getRVA();
+  sym.SectionNumber = os.sectionIndex;
+  mod.addSymbol(codeview::SymbolSerializer::writeOneSymbol(
+      sym, allocator, CodeViewContainer::Pdb));
+
+  // Skip COFF groups in MinGW because it adds a significant footprint to the
+  // PDB, due to each function being in its own section
+  if (config->mingw)
+    return;
+
+  // Output COFF groups for individual chunks of this section.
+  for (PartialSection *sec : os.contribSections) {
+    addLinkerModuleCoffGroup(sec, mod, os, allocator);
+  }
+}
+
+// Add all import files as modules to the PDB.
+void PDBLinker::addImportFilesToPDB(ArrayRef<OutputSection *> outputSections) {
+  if (ImportFile::instances.empty())
+    return;
+
+  std::map<std::string, llvm::pdb::DbiModuleDescriptorBuilder *> dllToModuleDbi;
+
+  for (ImportFile *file : ImportFile::instances) {
+    if (!file->live)
+      continue;
+
+    if (!file->thunkSym)
+      continue;
+
+    if (!file->thunkLive)
+        continue;
+
+    std::string dll = StringRef(file->dllName).lower();
+    llvm::pdb::DbiModuleDescriptorBuilder *&mod = dllToModuleDbi[dll];
+    if (!mod) {
+      pdb::DbiStreamBuilder &dbiBuilder = builder.getDbiBuilder();
+      SmallString<128> libPath = file->parentName;
+      pdbMakeAbsolute(libPath);
+      sys::path::native(libPath);
+
+      // Name modules similar to MSVC's link.exe.
+      // The first module is the simple dll filename
+      llvm::pdb::DbiModuleDescriptorBuilder &firstMod =
+          exitOnErr(dbiBuilder.addModuleInfo(file->dllName));
+      firstMod.setObjFileName(libPath);
+      pdb::SectionContrib sc =
+          createSectionContrib(nullptr, llvm::pdb::kInvalidStreamIndex);
+      firstMod.setFirstSectionContrib(sc);
+
+      // The second module is where the import stream goes.
+      mod = &exitOnErr(dbiBuilder.addModuleInfo("Import:" + file->dllName));
+      mod->setObjFileName(libPath);
+    }
+
+    DefinedImportThunk *thunk = cast<DefinedImportThunk>(file->thunkSym);
+    Chunk *thunkChunk = thunk->getChunk();
+    OutputSection *thunkOS = thunkChunk->getOutputSection();
+
+    ObjNameSym ons(SymbolRecordKind::ObjNameSym);
+    Compile3Sym cs(SymbolRecordKind::Compile3Sym);
+    Thunk32Sym ts(SymbolRecordKind::Thunk32Sym);
+    ScopeEndSym es(SymbolRecordKind::ScopeEndSym);
+
+    ons.Name = file->dllName;
+    ons.Signature = 0;
+
+    fillLinkerVerRecord(cs);
+
+    ts.Name = thunk->getName();
+    ts.Parent = 0;
+    ts.End = 0;
+    ts.Next = 0;
+    ts.Thunk = ThunkOrdinal::Standard;
+    ts.Length = thunkChunk->getSize();
+    ts.Segment = thunkOS->sectionIndex;
+    ts.Offset = thunkChunk->getRVA() - thunkOS->getRVA();
+
+    mod->addSymbol(codeview::SymbolSerializer::writeOneSymbol(
+        ons, alloc, CodeViewContainer::Pdb));
+    mod->addSymbol(codeview::SymbolSerializer::writeOneSymbol(
+        cs, alloc, CodeViewContainer::Pdb));
+
+    SmallVector<SymbolScope, 4> scopes;
+    CVSymbol newSym = codeview::SymbolSerializer::writeOneSymbol(
+        ts, alloc, CodeViewContainer::Pdb);
+    scopeStackOpen(scopes, mod->getNextSymbolOffset(), newSym);
+
+    mod->addSymbol(newSym);
+
+    newSym = codeview::SymbolSerializer::writeOneSymbol(es, alloc,
+                                                        CodeViewContainer::Pdb);
+    scopeStackClose(scopes, mod->getNextSymbolOffset(), file);
+
+    mod->addSymbol(newSym);
+
+    pdb::SectionContrib sc =
+        createSectionContrib(thunk->getChunk(), mod->getModuleIndex());
+    mod->setFirstSectionContrib(sc);
+  }
 }
 
 // Creates a PDB file.
-void coff::createPDB(SymbolTable *Symtab,
-                     ArrayRef<OutputSection *> OutputSections,
-                     ArrayRef<uint8_t> SectionTable,
-                     llvm::codeview::DebugInfo *BuildId) {
-  ScopedTimer T1(TotalPdbLinkTimer);
-  PDBLinker PDB(Symtab);
+void coff::createPDB(SymbolTable *symtab,
+                     ArrayRef<OutputSection *> outputSections,
+                     ArrayRef<uint8_t> sectionTable,
+                     llvm::codeview::DebugInfo *buildId) {
+  ScopedTimer t1(totalPdbLinkTimer);
+  PDBLinker pdb(symtab);
 
-  PDB.initialize(BuildId);
-  PDB.addObjectsToPDB();
-  PDB.addSections(OutputSections, SectionTable);
-  PDB.addNatvisFiles();
+  pdb.initialize(buildId);
+  pdb.addObjectsToPDB();
+  pdb.addImportFilesToPDB(outputSections);
+  pdb.addSections(outputSections, sectionTable);
+  pdb.addNatvisFiles();
 
-  ScopedTimer T2(DiskCommitTimer);
-  codeview::GUID Guid;
-  PDB.commit(&Guid);
-  memcpy(&BuildId->PDB70.Signature, &Guid, 16);
+  ScopedTimer t2(diskCommitTimer);
+  codeview::GUID guid;
+  pdb.commit(&guid);
+  memcpy(&buildId->PDB70.Signature, &guid, 16);
+
+  t2.stop();
+  t1.stop();
+  pdb.printStats();
 }
 
-void PDBLinker::initialize(llvm::codeview::DebugInfo *BuildId) {
-  ExitOnErr(Builder.initialize(4096)); // 4096 is blocksize
+void PDBLinker::initialize(llvm::codeview::DebugInfo *buildId) {
+  exitOnErr(builder.initialize(4096)); // 4096 is blocksize
 
-  BuildId->Signature.CVSignature = OMF::Signature::PDB70;
+  buildId->Signature.CVSignature = OMF::Signature::PDB70;
   // Signature is set to a hash of the PDB contents when the PDB is done.
-  memset(BuildId->PDB70.Signature, 0, 16);
-  BuildId->PDB70.Age = 1;
+  memset(buildId->PDB70.Signature, 0, 16);
+  buildId->PDB70.Age = 1;
 
   // Create streams in MSF for predefined streams, namely
   // PDB, TPI, DBI and IPI.
-  for (int I = 0; I < (int)pdb::kSpecialStreamCount; ++I)
-    ExitOnErr(Builder.getMsfBuilder().addStream(0));
+  for (int i = 0; i < (int)pdb::kSpecialStreamCount; ++i)
+    exitOnErr(builder.getMsfBuilder().addStream(0));
 
   // Add an Info stream.
-  auto &InfoBuilder = Builder.getInfoBuilder();
-  InfoBuilder.setVersion(pdb::PdbRaw_ImplVer::PdbImplVC70);
-  InfoBuilder.setHashPDBContentsToGUID(true);
+  auto &infoBuilder = builder.getInfoBuilder();
+  infoBuilder.setVersion(pdb::PdbRaw_ImplVer::PdbImplVC70);
+  infoBuilder.setHashPDBContentsToGUID(true);
 
   // Add an empty DBI stream.
-  pdb::DbiStreamBuilder &DbiBuilder = Builder.getDbiBuilder();
-  DbiBuilder.setAge(BuildId->PDB70.Age);
-  DbiBuilder.setVersionHeader(pdb::PdbDbiV70);
-  DbiBuilder.setMachineType(Config->Machine);
+  pdb::DbiStreamBuilder &dbiBuilder = builder.getDbiBuilder();
+  dbiBuilder.setAge(buildId->PDB70.Age);
+  dbiBuilder.setVersionHeader(pdb::PdbDbiV70);
+  dbiBuilder.setMachineType(config->machine);
   // Technically we are not link.exe 14.11, but there are known cases where
   // debugging tools on Windows expect Microsoft-specific version numbers or
   // they fail to work at all.  Since we know we produce PDBs that are
   // compatible with LINK 14.11, we set that version number here.
-  DbiBuilder.setBuildNumber(14, 11);
+  dbiBuilder.setBuildNumber(14, 11);
 }
 
-void PDBLinker::addSections(ArrayRef<OutputSection *> OutputSections,
-                            ArrayRef<uint8_t> SectionTable) {
+void PDBLinker::addSections(ArrayRef<OutputSection *> outputSections,
+                            ArrayRef<uint8_t> sectionTable) {
   // It's not entirely clear what this is, but the * Linker * module uses it.
-  pdb::DbiStreamBuilder &DbiBuilder = Builder.getDbiBuilder();
-  NativePath = Config->PDBPath;
-  pdbMakeAbsolute(NativePath);
-  uint32_t PdbFilePathNI = DbiBuilder.addECName(NativePath);
-  auto &LinkerModule = ExitOnErr(DbiBuilder.addModuleInfo("* Linker *"));
-  LinkerModule.setPdbFilePathNI(PdbFilePathNI);
-  addCommonLinkerModuleSymbols(NativePath, LinkerModule, Alloc);
+  pdb::DbiStreamBuilder &dbiBuilder = builder.getDbiBuilder();
+  nativePath = config->pdbPath;
+  pdbMakeAbsolute(nativePath);
+  uint32_t pdbFilePathNI = dbiBuilder.addECName(nativePath);
+  auto &linkerModule = exitOnErr(dbiBuilder.addModuleInfo("* Linker *"));
+  linkerModule.setPdbFilePathNI(pdbFilePathNI);
+  addCommonLinkerModuleSymbols(nativePath, linkerModule, alloc);
 
   // Add section contributions. They must be ordered by ascending RVA.
-  for (OutputSection *OS : OutputSections) {
-    addLinkerModuleSectionSymbol(LinkerModule, *OS, Alloc);
-    for (Chunk *C : OS->Chunks) {
-      pdb::SectionContrib SC =
-          createSectionContrib(C, LinkerModule.getModuleIndex());
-      Builder.getDbiBuilder().addSectionContrib(SC);
+  for (OutputSection *os : outputSections) {
+    addLinkerModuleSectionSymbol(linkerModule, *os, alloc);
+    for (Chunk *c : os->chunks) {
+      pdb::SectionContrib sc =
+          createSectionContrib(c, linkerModule.getModuleIndex());
+      builder.getDbiBuilder().addSectionContrib(sc);
     }
   }
 
+  // The * Linker * first section contrib is only used along with /INCREMENTAL,
+  // to provide trampolines thunks for incremental function patching. Set this
+  // as "unused" because LLD doesn't support /INCREMENTAL link.
+  pdb::SectionContrib sc =
+      createSectionContrib(nullptr, llvm::pdb::kInvalidStreamIndex);
+  linkerModule.setFirstSectionContrib(sc);
+
   // Add Section Map stream.
-  ArrayRef<object::coff_section> Sections = {
-      (const object::coff_section *)SectionTable.data(),
-      SectionTable.size() / sizeof(object::coff_section)};
-  SectionMap = pdb::DbiStreamBuilder::createSectionMap(Sections);
-  DbiBuilder.setSectionMap(SectionMap);
+  ArrayRef<object::coff_section> sections = {
+      (const object::coff_section *)sectionTable.data(),
+      sectionTable.size() / sizeof(object::coff_section)};
+  sectionMap = pdb::DbiStreamBuilder::createSectionMap(sections);
+  dbiBuilder.setSectionMap(sectionMap);
 
   // Add COFF section header stream.
-  ExitOnErr(
-      DbiBuilder.addDbgStream(pdb::DbgHeaderType::SectionHdr, SectionTable));
+  exitOnErr(
+      dbiBuilder.addDbgStream(pdb::DbgHeaderType::SectionHdr, sectionTable));
 }
 
-void PDBLinker::commit(codeview::GUID *Guid) {
+void PDBLinker::commit(codeview::GUID *guid) {
   // Write to a file.
-  ExitOnErr(Builder.commit(Config->PDBPath, Guid));
-}
-
-static Expected<StringRef>
-getFileName(const DebugStringTableSubsectionRef &Strings,
-            const DebugChecksumsSubsectionRef &Checksums, uint32_t FileID) {
-  auto Iter = Checksums.getArray().at(FileID);
-  if (Iter == Checksums.getArray().end())
-    return make_error<CodeViewError>(cv_error_code::no_records);
-  uint32_t Offset = Iter->FileNameOffset;
-  return Strings.getString(Offset);
+  exitOnErr(builder.commit(config->pdbPath, guid));
 }
 
 static uint32_t getSecrelReloc() {
-  switch (Config->Machine) {
+  switch (config->machine) {
   case AMD64:
     return COFF::IMAGE_REL_AMD64_SECREL;
   case I386:
@@ -1652,78 +1717,78 @@ static uint32_t getSecrelReloc() {
 // that are used to interpret the line table, and the offset of Addr in the line
 // table are stored in the output arguments. Returns whether a line table was
 // found.
-static bool findLineTable(const SectionChunk *C, uint32_t Addr,
-                          DebugStringTableSubsectionRef &CVStrTab,
-                          DebugChecksumsSubsectionRef &Checksums,
-                          DebugLinesSubsectionRef &Lines,
-                          uint32_t &OffsetInLinetable) {
-  ExitOnError ExitOnErr;
-  uint32_t SecrelReloc = getSecrelReloc();
+static bool findLineTable(const SectionChunk *c, uint32_t addr,
+                          DebugStringTableSubsectionRef &cVStrTab,
+                          DebugChecksumsSubsectionRef &checksums,
+                          DebugLinesSubsectionRef &lines,
+                          uint32_t &offsetInLinetable) {
+  ExitOnError exitOnErr;
+  uint32_t secrelReloc = getSecrelReloc();
 
-  for (SectionChunk *DbgC : C->File->getDebugChunks()) {
-    if (DbgC->getSectionName() != ".debug$S")
+  for (SectionChunk *dbgC : c->file->getDebugChunks()) {
+    if (dbgC->getSectionName() != ".debug$S")
       continue;
 
-    // Build a mapping of SECREL relocations in DbgC that refer to C.
-    DenseMap<uint32_t, uint32_t> Secrels;
-    for (const coff_relocation &R : DbgC->Relocs) {
-      if (R.Type != SecrelReloc)
+    // Build a mapping of SECREL relocations in dbgC that refer to `c`.
+    DenseMap<uint32_t, uint32_t> secrels;
+    for (const coff_relocation &r : dbgC->getRelocs()) {
+      if (r.Type != secrelReloc)
         continue;
 
-      if (auto *S = dyn_cast_or_null<DefinedRegular>(
-              C->File->getSymbols()[R.SymbolTableIndex]))
-        if (S->getChunk() == C)
-          Secrels[R.VirtualAddress] = S->getValue();
+      if (auto *s = dyn_cast_or_null<DefinedRegular>(
+              c->file->getSymbols()[r.SymbolTableIndex]))
+        if (s->getChunk() == c)
+          secrels[r.VirtualAddress] = s->getValue();
     }
 
-    ArrayRef<uint8_t> Contents =
-        consumeDebugMagic(DbgC->getContents(), ".debug$S");
-    DebugSubsectionArray Subsections;
-    BinaryStreamReader Reader(Contents, support::little);
-    ExitOnErr(Reader.readArray(Subsections, Contents.size()));
+    ArrayRef<uint8_t> contents =
+        SectionChunk::consumeDebugMagic(dbgC->getContents(), ".debug$S");
+    DebugSubsectionArray subsections;
+    BinaryStreamReader reader(contents, support::little);
+    exitOnErr(reader.readArray(subsections, contents.size()));
 
-    for (const DebugSubsectionRecord &SS : Subsections) {
-      switch (SS.kind()) {
+    for (const DebugSubsectionRecord &ss : subsections) {
+      switch (ss.kind()) {
       case DebugSubsectionKind::StringTable: {
-        assert(!CVStrTab.valid() &&
+        assert(!cVStrTab.valid() &&
                "Encountered multiple string table subsections!");
-        ExitOnErr(CVStrTab.initialize(SS.getRecordData()));
+        exitOnErr(cVStrTab.initialize(ss.getRecordData()));
         break;
       }
       case DebugSubsectionKind::FileChecksums:
-        assert(!Checksums.valid() &&
+        assert(!checksums.valid() &&
                "Encountered multiple checksum subsections!");
-        ExitOnErr(Checksums.initialize(SS.getRecordData()));
+        exitOnErr(checksums.initialize(ss.getRecordData()));
         break;
       case DebugSubsectionKind::Lines: {
-        ArrayRef<uint8_t> Bytes;
-        auto Ref = SS.getRecordData();
-        ExitOnErr(Ref.readLongestContiguousChunk(0, Bytes));
-        size_t OffsetInDbgC = Bytes.data() - DbgC->getContents().data();
+        ArrayRef<uint8_t> bytes;
+        auto ref = ss.getRecordData();
+        exitOnErr(ref.readLongestContiguousChunk(0, bytes));
+        size_t offsetInDbgC = bytes.data() - dbgC->getContents().data();
 
         // Check whether this line table refers to C.
-        auto I = Secrels.find(OffsetInDbgC);
-        if (I == Secrels.end())
+        auto i = secrels.find(offsetInDbgC);
+        if (i == secrels.end())
           break;
 
         // Check whether this line table covers Addr in C.
-        DebugLinesSubsectionRef LinesTmp;
-        ExitOnErr(LinesTmp.initialize(BinaryStreamReader(Ref)));
-        uint32_t OffsetInC = I->second + LinesTmp.header()->RelocOffset;
-        if (Addr < OffsetInC || Addr >= OffsetInC + LinesTmp.header()->CodeSize)
+        DebugLinesSubsectionRef linesTmp;
+        exitOnErr(linesTmp.initialize(BinaryStreamReader(ref)));
+        uint32_t offsetInC = i->second + linesTmp.header()->RelocOffset;
+        if (addr < offsetInC || addr >= offsetInC + linesTmp.header()->CodeSize)
           break;
 
-        assert(!Lines.header() &&
+        assert(!lines.header() &&
                "Encountered multiple line tables for function!");
-        ExitOnErr(Lines.initialize(BinaryStreamReader(Ref)));
-        OffsetInLinetable = Addr - OffsetInC;
+        exitOnErr(lines.initialize(BinaryStreamReader(ref)));
+        offsetInLinetable = addr - offsetInC;
         break;
       }
       default:
         break;
       }
 
-      if (CVStrTab.valid() && Checksums.valid() && Lines.header())
+      if (cVStrTab.valid() && checksums.valid() && lines.header())
         return true;
     }
   }
@@ -1734,38 +1799,38 @@ static bool findLineTable(const SectionChunk *C, uint32_t Addr,
 // Use CodeView line tables to resolve a file and line number for the given
 // offset into the given chunk and return them, or {"", 0} if a line table was
 // not found.
-std::pair<StringRef, uint32_t> coff::getFileLine(const SectionChunk *C,
-                                                 uint32_t Addr) {
-  ExitOnError ExitOnErr;
+std::pair<StringRef, uint32_t> coff::getFileLine(const SectionChunk *c,
+                                                 uint32_t addr) {
+  ExitOnError exitOnErr;
 
-  DebugStringTableSubsectionRef CVStrTab;
-  DebugChecksumsSubsectionRef Checksums;
-  DebugLinesSubsectionRef Lines;
-  uint32_t OffsetInLinetable;
+  DebugStringTableSubsectionRef cVStrTab;
+  DebugChecksumsSubsectionRef checksums;
+  DebugLinesSubsectionRef lines;
+  uint32_t offsetInLinetable;
 
-  if (!findLineTable(C, Addr, CVStrTab, Checksums, Lines, OffsetInLinetable))
+  if (!findLineTable(c, addr, cVStrTab, checksums, lines, offsetInLinetable))
     return {"", 0};
 
-  Optional<uint32_t> NameIndex;
-  Optional<uint32_t> LineNumber;
-  for (LineColumnEntry &Entry : Lines) {
-    for (const LineNumberEntry &LN : Entry.LineNumbers) {
-      LineInfo LI(LN.Flags);
-      if (LN.Offset > OffsetInLinetable) {
-        if (!NameIndex) {
-          NameIndex = Entry.NameIndex;
-          LineNumber = LI.getStartLine();
+  Optional<uint32_t> nameIndex;
+  Optional<uint32_t> lineNumber;
+  for (LineColumnEntry &entry : lines) {
+    for (const LineNumberEntry &ln : entry.LineNumbers) {
+      LineInfo li(ln.Flags);
+      if (ln.Offset > offsetInLinetable) {
+        if (!nameIndex) {
+          nameIndex = entry.NameIndex;
+          lineNumber = li.getStartLine();
         }
-        StringRef Filename =
-            ExitOnErr(getFileName(CVStrTab, Checksums, *NameIndex));
-        return {Filename, *LineNumber};
+        StringRef filename =
+            exitOnErr(getFileName(cVStrTab, checksums, *nameIndex));
+        return {filename, *lineNumber};
       }
-      NameIndex = Entry.NameIndex;
-      LineNumber = LI.getStartLine();
+      nameIndex = entry.NameIndex;
+      lineNumber = li.getStartLine();
     }
   }
-  if (!NameIndex)
+  if (!nameIndex)
     return {"", 0};
-  StringRef Filename = ExitOnErr(getFileName(CVStrTab, Checksums, *NameIndex));
-  return {Filename, *LineNumber};
+  StringRef filename = exitOnErr(getFileName(cVStrTab, checksums, *nameIndex));
+  return {filename, *lineNumber};
 }
diff --git a/deps/lld/COFF/PDB.h b/deps/lld/COFF/PDB.h
index ea7a9996f415a833448d51bd0b286550d932cd52..3ac1adc85c5d0518fa49eb0fbeff97079536507c 100644
--- a/deps/lld/COFF/PDB.h
+++ b/deps/lld/COFF/PDB.h
@@ -1,9 +1,8 @@
 //===- PDB.h ----------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -25,13 +24,13 @@ class OutputSection;
 class SectionChunk;
 class SymbolTable;
 
-void createPDB(SymbolTable *Symtab,
-               llvm::ArrayRef<OutputSection *> OutputSections,
-               llvm::ArrayRef<uint8_t> SectionTable,
-               llvm::codeview::DebugInfo *BuildId);
+void createPDB(SymbolTable *symtab,
+               llvm::ArrayRef<OutputSection *> outputSections,
+               llvm::ArrayRef<uint8_t> sectionTable,
+               llvm::codeview::DebugInfo *buildId);
 
-std::pair<llvm::StringRef, uint32_t> getFileLine(const SectionChunk *C,
-                                                 uint32_t Addr);
+std::pair<llvm::StringRef, uint32_t> getFileLine(const SectionChunk *c,
+                                                 uint32_t addr);
 }
 }
 
diff --git a/deps/lld/COFF/SymbolTable.cpp b/deps/lld/COFF/SymbolTable.cpp
index 1a9e0455dc1dce85f60b5a1af7ff17f48d8a9ddd..0aff164ee567787b80eec767122cb030700abba2 100644
--- a/deps/lld/COFF/SymbolTable.cpp
+++ b/deps/lld/COFF/SymbolTable.cpp
@@ -1,9 +1,8 @@
 //===- SymbolTable.cpp ----------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -17,6 +16,7 @@
 #include "lld/Common/Memory.h"
 #include "lld/Common/Timer.h"
 #include "llvm/IR/LLVMContext.h"
+#include "llvm/Object/WindowsMachineFlag.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
 #include <utility>
@@ -26,521 +26,576 @@ using namespace llvm;
 namespace lld {
 namespace coff {
 
-static Timer LTOTimer("LTO", Timer::root());
+static Timer ltoTimer("LTO", Timer::root());
 
-SymbolTable *Symtab;
+SymbolTable *symtab;
 
-void SymbolTable::addFile(InputFile *File) {
-  log("Reading " + toString(File));
-  File->parse();
+void SymbolTable::addFile(InputFile *file) {
+  log("Reading " + toString(file));
+  file->parse();
 
-  MachineTypes MT = File->getMachineType();
-  if (Config->Machine == IMAGE_FILE_MACHINE_UNKNOWN) {
-    Config->Machine = MT;
-  } else if (MT != IMAGE_FILE_MACHINE_UNKNOWN && Config->Machine != MT) {
-    error(toString(File) + ": machine type " + machineToStr(MT) +
-          " conflicts with " + machineToStr(Config->Machine));
+  MachineTypes mt = file->getMachineType();
+  if (config->machine == IMAGE_FILE_MACHINE_UNKNOWN) {
+    config->machine = mt;
+  } else if (mt != IMAGE_FILE_MACHINE_UNKNOWN && config->machine != mt) {
+    error(toString(file) + ": machine type " + machineToStr(mt) +
+          " conflicts with " + machineToStr(config->machine));
     return;
   }
 
-  if (auto *F = dyn_cast<ObjFile>(File)) {
-    ObjFile::Instances.push_back(F);
-  } else if (auto *F = dyn_cast<BitcodeFile>(File)) {
-    BitcodeFile::Instances.push_back(F);
-  } else if (auto *F = dyn_cast<ImportFile>(File)) {
-    ImportFile::Instances.push_back(F);
+  if (auto *f = dyn_cast<ObjFile>(file)) {
+    ObjFile::instances.push_back(f);
+  } else if (auto *f = dyn_cast<BitcodeFile>(file)) {
+    BitcodeFile::instances.push_back(f);
+  } else if (auto *f = dyn_cast<ImportFile>(file)) {
+    ImportFile::instances.push_back(f);
   }
 
-  StringRef S = File->getDirectives();
-  if (S.empty())
-    return;
-
-  log("Directives: " + toString(File) + ": " + S);
-  Driver->parseDirectives(S);
+  driver->parseDirectives(file);
 }
 
-static void errorOrWarn(const Twine &S) {
-  if (Config->ForceUnresolved)
-    warn(S);
+static void errorOrWarn(const Twine &s) {
+  if (config->forceUnresolved)
+    warn(s);
   else
-    error(S);
+    error(s);
 }
 
 // Returns the symbol in SC whose value is <= Addr that is closest to Addr.
 // This is generally the global variable or function whose definition contains
 // Addr.
-static Symbol *getSymbol(SectionChunk *SC, uint32_t Addr) {
-  DefinedRegular *Candidate = nullptr;
+static Symbol *getSymbol(SectionChunk *sc, uint32_t addr) {
+  DefinedRegular *candidate = nullptr;
 
-  for (Symbol *S : SC->File->getSymbols()) {
-    auto *D = dyn_cast_or_null<DefinedRegular>(S);
-    if (!D || D->getChunk() != SC || D->getValue() > Addr ||
-        (Candidate && D->getValue() < Candidate->getValue()))
+  for (Symbol *s : sc->file->getSymbols()) {
+    auto *d = dyn_cast_or_null<DefinedRegular>(s);
+    if (!d || !d->data || d->getChunk() != sc || d->getValue() > addr ||
+        (candidate && d->getValue() < candidate->getValue()))
       continue;
 
-    Candidate = D;
+    candidate = d;
   }
 
-  return Candidate;
+  return candidate;
 }
 
-std::string getSymbolLocations(ObjFile *File, uint32_t SymIndex) {
+// Given a file and the index of a symbol in that file, returns a description
+// of all references to that symbol from that file. If no debug information is
+// available, returns just the name of the file, else one string per actual
+// reference as described in the debug info.
+std::vector<std::string> getSymbolLocations(ObjFile *file, uint32_t symIndex) {
   struct Location {
-    Symbol *Sym;
-    std::pair<StringRef, uint32_t> FileLine;
+    Symbol *sym;
+    std::pair<StringRef, uint32_t> fileLine;
   };
-  std::vector<Location> Locations;
+  std::vector<Location> locations;
 
-  for (Chunk *C : File->getChunks()) {
-    auto *SC = dyn_cast<SectionChunk>(C);
-    if (!SC)
+  for (Chunk *c : file->getChunks()) {
+    auto *sc = dyn_cast<SectionChunk>(c);
+    if (!sc)
       continue;
-    for (const coff_relocation &R : SC->Relocs) {
-      if (R.SymbolTableIndex != SymIndex)
+    for (const coff_relocation &r : sc->getRelocs()) {
+      if (r.SymbolTableIndex != symIndex)
         continue;
-      std::pair<StringRef, uint32_t> FileLine =
-          getFileLine(SC, R.VirtualAddress);
-      Symbol *Sym = getSymbol(SC, R.VirtualAddress);
-      if (!FileLine.first.empty() || Sym)
-        Locations.push_back({Sym, FileLine});
+      std::pair<StringRef, uint32_t> fileLine =
+          getFileLine(sc, r.VirtualAddress);
+      Symbol *sym = getSymbol(sc, r.VirtualAddress);
+      if (!fileLine.first.empty() || sym)
+        locations.push_back({sym, fileLine});
     }
   }
 
-  if (Locations.empty())
-    return "\n>>> referenced by " + toString(File);
+  if (locations.empty())
+    return std::vector<std::string>({"\n>>> referenced by " + toString(file)});
 
-  std::string Out;
-  llvm::raw_string_ostream OS(Out);
-  for (Location Loc : Locations) {
-    OS << "\n>>> referenced by ";
-    if (!Loc.FileLine.first.empty())
-      OS << Loc.FileLine.first << ":" << Loc.FileLine.second
+  std::vector<std::string> symbolLocations(locations.size());
+  size_t i = 0;
+  for (Location loc : locations) {
+    llvm::raw_string_ostream os(symbolLocations[i++]);
+    os << "\n>>> referenced by ";
+    if (!loc.fileLine.first.empty())
+      os << loc.fileLine.first << ":" << loc.fileLine.second
          << "\n>>>               ";
-    OS << toString(File);
-    if (Loc.Sym)
-      OS << ":(" << toString(*Loc.Sym) << ')';
+    os << toString(file);
+    if (loc.sym)
+      os << ":(" << toString(*loc.sym) << ')';
   }
-  return OS.str();
+  return symbolLocations;
+}
+
+// For an undefined symbol, stores all files referencing it and the index of
+// the undefined symbol in each file.
+struct UndefinedDiag {
+  Symbol *sym;
+  struct File {
+    ObjFile *oFile;
+    uint64_t symIndex;
+  };
+  std::vector<File> files;
+};
+
+static void reportUndefinedSymbol(const UndefinedDiag &undefDiag) {
+  std::string out;
+  llvm::raw_string_ostream os(out);
+  os << "undefined symbol: " << toString(*undefDiag.sym);
+
+  const size_t maxUndefReferences = 10;
+  size_t i = 0, numRefs = 0;
+  for (const UndefinedDiag::File &ref : undefDiag.files) {
+    std::vector<std::string> symbolLocations =
+        getSymbolLocations(ref.oFile, ref.symIndex);
+    numRefs += symbolLocations.size();
+    for (const std::string &s : symbolLocations) {
+      if (i >= maxUndefReferences)
+        break;
+      os << s;
+      i++;
+    }
+  }
+  if (i < numRefs)
+    os << "\n>>> referenced " << numRefs - i << " more times";
+  errorOrWarn(os.str());
 }
 
 void SymbolTable::loadMinGWAutomaticImports() {
-  for (auto &I : SymMap) {
-    Symbol *Sym = I.second;
-    auto *Undef = dyn_cast<Undefined>(Sym);
-    if (!Undef)
+  for (auto &i : symMap) {
+    Symbol *sym = i.second;
+    auto *undef = dyn_cast<Undefined>(sym);
+    if (!undef)
       continue;
-    if (!Sym->IsUsedInRegularObj)
+    if (!sym->isUsedInRegularObj)
       continue;
 
-    StringRef Name = Undef->getName();
+    StringRef name = undef->getName();
 
-    if (Name.startswith("__imp_"))
+    if (name.startswith("__imp_"))
       continue;
     // If we have an undefined symbol, but we have a Lazy representing a
     // symbol we could load from file, make sure to load that.
-    Lazy *L = dyn_cast_or_null<Lazy>(find(("__imp_" + Name).str()));
-    if (!L || L->PendingArchiveLoad)
+    Lazy *l = dyn_cast_or_null<Lazy>(find(("__imp_" + name).str()));
+    if (!l || l->pendingArchiveLoad)
       continue;
 
-    log("Loading lazy " + L->getName() + " from " + L->File->getName() +
+    log("Loading lazy " + l->getName() + " from " + l->file->getName() +
         " for automatic import");
-    L->PendingArchiveLoad = true;
-    L->File->addMember(&L->Sym);
+    l->pendingArchiveLoad = true;
+    l->file->addMember(&l->sym);
   }
 }
 
-bool SymbolTable::handleMinGWAutomaticImport(Symbol *Sym, StringRef Name) {
-  if (Name.startswith("__imp_"))
+bool SymbolTable::handleMinGWAutomaticImport(Symbol *sym, StringRef name) {
+  if (name.startswith("__imp_"))
     return false;
-  Defined *Imp = dyn_cast_or_null<Defined>(find(("__imp_" + Name).str()));
-  if (!Imp)
+  Defined *imp = dyn_cast_or_null<Defined>(find(("__imp_" + name).str()));
+  if (!imp)
     return false;
 
   // Replace the reference directly to a variable with a reference
   // to the import address table instead. This obviously isn't right,
-  // but we mark the symbol as IsRuntimePseudoReloc, and a later pass
+  // but we mark the symbol as isRuntimePseudoReloc, and a later pass
   // will add runtime pseudo relocations for every relocation against
   // this Symbol. The runtime pseudo relocation framework expects the
   // reference itself to point at the IAT entry.
-  size_t ImpSize = 0;
-  if (isa<DefinedImportData>(Imp)) {
-    log("Automatically importing " + Name + " from " +
-        cast<DefinedImportData>(Imp)->getDLLName());
-    ImpSize = sizeof(DefinedImportData);
-  } else if (isa<DefinedRegular>(Imp)) {
-    log("Automatically importing " + Name + " from " +
-        toString(cast<DefinedRegular>(Imp)->File));
-    ImpSize = sizeof(DefinedRegular);
+  size_t impSize = 0;
+  if (isa<DefinedImportData>(imp)) {
+    log("Automatically importing " + name + " from " +
+        cast<DefinedImportData>(imp)->getDLLName());
+    impSize = sizeof(DefinedImportData);
+  } else if (isa<DefinedRegular>(imp)) {
+    log("Automatically importing " + name + " from " +
+        toString(cast<DefinedRegular>(imp)->file));
+    impSize = sizeof(DefinedRegular);
   } else {
-    warn("unable to automatically import " + Name + " from " + Imp->getName() +
-         " from " + toString(cast<DefinedRegular>(Imp)->File) +
+    warn("unable to automatically import " + name + " from " + imp->getName() +
+         " from " + toString(cast<DefinedRegular>(imp)->file) +
          "; unexpected symbol type");
     return false;
   }
-  Sym->replaceKeepingName(Imp, ImpSize);
-  Sym->IsRuntimePseudoReloc = true;
+  sym->replaceKeepingName(imp, impSize);
+  sym->isRuntimePseudoReloc = true;
 
   // There may exist symbols named .refptr.<name> which only consist
   // of a single pointer to <name>. If it turns out <name> is
   // automatically imported, we don't need to keep the .refptr.<name>
   // pointer at all, but redirect all accesses to it to the IAT entry
   // for __imp_<name> instead, and drop the whole .refptr.<name> chunk.
-  DefinedRegular *Refptr =
-      dyn_cast_or_null<DefinedRegular>(find((".refptr." + Name).str()));
-  if (Refptr && Refptr->getChunk()->getSize() == Config->Wordsize) {
-    SectionChunk *SC = dyn_cast_or_null<SectionChunk>(Refptr->getChunk());
-    if (SC && SC->Relocs.size() == 1 && *SC->symbols().begin() == Sym) {
-      log("Replacing .refptr." + Name + " with " + Imp->getName());
-      Refptr->getChunk()->Live = false;
-      Refptr->replaceKeepingName(Imp, ImpSize);
+  DefinedRegular *refptr =
+      dyn_cast_or_null<DefinedRegular>(find((".refptr." + name).str()));
+  if (refptr && refptr->getChunk()->getSize() == config->wordsize) {
+    SectionChunk *sc = dyn_cast_or_null<SectionChunk>(refptr->getChunk());
+    if (sc && sc->getRelocs().size() == 1 && *sc->symbols().begin() == sym) {
+      log("Replacing .refptr." + name + " with " + imp->getName());
+      refptr->getChunk()->live = false;
+      refptr->replaceKeepingName(imp, impSize);
     }
   }
   return true;
 }
 
 void SymbolTable::reportRemainingUndefines() {
-  SmallPtrSet<Symbol *, 8> Undefs;
-  DenseMap<Symbol *, Symbol *> LocalImports;
+  SmallPtrSet<Symbol *, 8> undefs;
+  DenseMap<Symbol *, Symbol *> localImports;
 
-  for (auto &I : SymMap) {
-    Symbol *Sym = I.second;
-    auto *Undef = dyn_cast<Undefined>(Sym);
-    if (!Undef)
+  for (auto &i : symMap) {
+    Symbol *sym = i.second;
+    auto *undef = dyn_cast<Undefined>(sym);
+    if (!undef)
       continue;
-    if (!Sym->IsUsedInRegularObj)
+    if (!sym->isUsedInRegularObj)
       continue;
 
-    StringRef Name = Undef->getName();
+    StringRef name = undef->getName();
 
     // A weak alias may have been resolved, so check for that.
-    if (Defined *D = Undef->getWeakAlias()) {
+    if (Defined *d = undef->getWeakAlias()) {
       // We want to replace Sym with D. However, we can't just blindly
       // copy sizeof(SymbolUnion) bytes from D to Sym because D may be an
       // internal symbol, and internal symbols are stored as "unparented"
       // Symbols. For that reason we need to check which type of symbol we
       // are dealing with and copy the correct number of bytes.
-      if (isa<DefinedRegular>(D))
-        memcpy(Sym, D, sizeof(DefinedRegular));
-      else if (isa<DefinedAbsolute>(D))
-        memcpy(Sym, D, sizeof(DefinedAbsolute));
+      if (isa<DefinedRegular>(d))
+        memcpy(sym, d, sizeof(DefinedRegular));
+      else if (isa<DefinedAbsolute>(d))
+        memcpy(sym, d, sizeof(DefinedAbsolute));
       else
-        memcpy(Sym, D, sizeof(SymbolUnion));
+        memcpy(sym, d, sizeof(SymbolUnion));
       continue;
     }
 
     // If we can resolve a symbol by removing __imp_ prefix, do that.
     // This odd rule is for compatibility with MSVC linker.
-    if (Name.startswith("__imp_")) {
-      Symbol *Imp = find(Name.substr(strlen("__imp_")));
-      if (Imp && isa<Defined>(Imp)) {
-        auto *D = cast<Defined>(Imp);
-        replaceSymbol<DefinedLocalImport>(Sym, Name, D);
-        LocalImportChunks.push_back(cast<DefinedLocalImport>(Sym)->getChunk());
-        LocalImports[Sym] = D;
+    if (name.startswith("__imp_")) {
+      Symbol *imp = find(name.substr(strlen("__imp_")));
+      if (imp && isa<Defined>(imp)) {
+        auto *d = cast<Defined>(imp);
+        replaceSymbol<DefinedLocalImport>(sym, name, d);
+        localImportChunks.push_back(cast<DefinedLocalImport>(sym)->getChunk());
+        localImports[sym] = d;
         continue;
       }
     }
 
     // We don't want to report missing Microsoft precompiled headers symbols.
     // A proper message will be emitted instead in PDBLinker::aquirePrecompObj
-    if (Name.contains("_PchSym_"))
+    if (name.contains("_PchSym_"))
       continue;
 
-    if (Config->MinGW && handleMinGWAutomaticImport(Sym, Name))
+    if (config->mingw && handleMinGWAutomaticImport(sym, name))
       continue;
 
     // Remaining undefined symbols are not fatal if /force is specified.
     // They are replaced with dummy defined symbols.
-    if (Config->ForceUnresolved)
-      replaceSymbol<DefinedAbsolute>(Sym, Name, 0);
-    Undefs.insert(Sym);
+    if (config->forceUnresolved)
+      replaceSymbol<DefinedAbsolute>(sym, name, 0);
+    undefs.insert(sym);
   }
 
-  if (Undefs.empty() && LocalImports.empty())
+  if (undefs.empty() && localImports.empty())
     return;
 
-  for (Symbol *B : Config->GCRoot) {
-    if (Undefs.count(B))
-      errorOrWarn("<root>: undefined symbol: " + toString(*B));
-    if (Config->WarnLocallyDefinedImported)
-      if (Symbol *Imp = LocalImports.lookup(B))
-        warn("<root>: locally defined symbol imported: " + toString(*Imp) +
-             " (defined in " + toString(Imp->getFile()) + ") [LNK4217]");
+  for (Symbol *b : config->gcroot) {
+    if (undefs.count(b))
+      errorOrWarn("<root>: undefined symbol: " + toString(*b));
+    if (config->warnLocallyDefinedImported)
+      if (Symbol *imp = localImports.lookup(b))
+        warn("<root>: locally defined symbol imported: " + toString(*imp) +
+             " (defined in " + toString(imp->getFile()) + ") [LNK4217]");
   }
 
-  for (ObjFile *File : ObjFile::Instances) {
-    size_t SymIndex = (size_t)-1;
-    for (Symbol *Sym : File->getSymbols()) {
-      ++SymIndex;
-      if (!Sym)
+  std::vector<UndefinedDiag> undefDiags;
+  DenseMap<Symbol *, int> firstDiag;
+
+  for (ObjFile *file : ObjFile::instances) {
+    size_t symIndex = (size_t)-1;
+    for (Symbol *sym : file->getSymbols()) {
+      ++symIndex;
+      if (!sym)
         continue;
-      if (Undefs.count(Sym))
-        errorOrWarn("undefined symbol: " + toString(*Sym) +
-                    getSymbolLocations(File, SymIndex));
-      if (Config->WarnLocallyDefinedImported)
-        if (Symbol *Imp = LocalImports.lookup(Sym))
-          warn(toString(File) +
-               ": locally defined symbol imported: " + toString(*Imp) +
-               " (defined in " + toString(Imp->getFile()) + ") [LNK4217]");
+      if (undefs.count(sym)) {
+        auto it = firstDiag.find(sym);
+        if (it == firstDiag.end()) {
+          firstDiag[sym] = undefDiags.size();
+          undefDiags.push_back({sym, {{file, symIndex}}});
+        } else {
+          undefDiags[it->second].files.push_back({file, symIndex});
+        }
+      }
+      if (config->warnLocallyDefinedImported)
+        if (Symbol *imp = localImports.lookup(sym))
+          warn(toString(file) +
+               ": locally defined symbol imported: " + toString(*imp) +
+               " (defined in " + toString(imp->getFile()) + ") [LNK4217]");
     }
   }
+
+  for (const UndefinedDiag& undefDiag : undefDiags)
+    reportUndefinedSymbol(undefDiag);
 }
 
-std::pair<Symbol *, bool> SymbolTable::insert(StringRef Name) {
-  bool Inserted = false;
-  Symbol *&Sym = SymMap[CachedHashStringRef(Name)];
-  if (!Sym) {
-    Sym = reinterpret_cast<Symbol *>(make<SymbolUnion>());
-    Sym->IsUsedInRegularObj = false;
-    Sym->PendingArchiveLoad = false;
-    Inserted = true;
+std::pair<Symbol *, bool> SymbolTable::insert(StringRef name) {
+  bool inserted = false;
+  Symbol *&sym = symMap[CachedHashStringRef(name)];
+  if (!sym) {
+    sym = reinterpret_cast<Symbol *>(make<SymbolUnion>());
+    sym->isUsedInRegularObj = false;
+    sym->pendingArchiveLoad = false;
+    inserted = true;
   }
-  return {Sym, Inserted};
+  return {sym, inserted};
 }
 
-std::pair<Symbol *, bool> SymbolTable::insert(StringRef Name, InputFile *File) {
-  std::pair<Symbol *, bool> Result = insert(Name);
-  if (!File || !isa<BitcodeFile>(File))
-    Result.first->IsUsedInRegularObj = true;
-  return Result;
+std::pair<Symbol *, bool> SymbolTable::insert(StringRef name, InputFile *file) {
+  std::pair<Symbol *, bool> result = insert(name);
+  if (!file || !isa<BitcodeFile>(file))
+    result.first->isUsedInRegularObj = true;
+  return result;
 }
 
-Symbol *SymbolTable::addUndefined(StringRef Name, InputFile *F,
-                                  bool IsWeakAlias) {
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(Name, F);
-  if (WasInserted || (isa<Lazy>(S) && IsWeakAlias)) {
-    replaceSymbol<Undefined>(S, Name);
-    return S;
+Symbol *SymbolTable::addUndefined(StringRef name, InputFile *f,
+                                  bool isWeakAlias) {
+  Symbol *s;
+  bool wasInserted;
+  std::tie(s, wasInserted) = insert(name, f);
+  if (wasInserted || (isa<Lazy>(s) && isWeakAlias)) {
+    replaceSymbol<Undefined>(s, name);
+    return s;
   }
-  if (auto *L = dyn_cast<Lazy>(S)) {
-    if (!S->PendingArchiveLoad) {
-      S->PendingArchiveLoad = true;
-      L->File->addMember(&L->Sym);
+  if (auto *l = dyn_cast<Lazy>(s)) {
+    if (!s->pendingArchiveLoad) {
+      s->pendingArchiveLoad = true;
+      l->file->addMember(&l->sym);
     }
   }
-  return S;
+  return s;
 }
 
-void SymbolTable::addLazy(ArchiveFile *F, const Archive::Symbol Sym) {
-  StringRef Name = Sym.getName();
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(Name);
-  if (WasInserted) {
-    replaceSymbol<Lazy>(S, F, Sym);
+void SymbolTable::addLazy(ArchiveFile *f, const Archive::Symbol sym) {
+  StringRef name = sym.getName();
+  Symbol *s;
+  bool wasInserted;
+  std::tie(s, wasInserted) = insert(name);
+  if (wasInserted) {
+    replaceSymbol<Lazy>(s, f, sym);
     return;
   }
-  auto *U = dyn_cast<Undefined>(S);
-  if (!U || U->WeakAlias || S->PendingArchiveLoad)
+  auto *u = dyn_cast<Undefined>(s);
+  if (!u || u->weakAlias || s->pendingArchiveLoad)
     return;
-  S->PendingArchiveLoad = true;
-  F->addMember(&Sym);
+  s->pendingArchiveLoad = true;
+  f->addMember(&sym);
 }
 
-void SymbolTable::reportDuplicate(Symbol *Existing, InputFile *NewFile) {
-  std::string Msg = "duplicate symbol: " + toString(*Existing) + " in " +
-                    toString(Existing->getFile()) + " and in " +
-                    toString(NewFile);
+void SymbolTable::reportDuplicate(Symbol *existing, InputFile *newFile) {
+  std::string msg = "duplicate symbol: " + toString(*existing) + " in " +
+                    toString(existing->getFile()) + " and in " +
+                    toString(newFile);
 
-  if (Config->ForceMultiple)
-    warn(Msg);
+  if (config->forceMultiple)
+    warn(msg);
   else
-    error(Msg);
+    error(msg);
 }
 
-Symbol *SymbolTable::addAbsolute(StringRef N, COFFSymbolRef Sym) {
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(N, nullptr);
-  S->IsUsedInRegularObj = true;
-  if (WasInserted || isa<Undefined>(S) || isa<Lazy>(S))
-    replaceSymbol<DefinedAbsolute>(S, N, Sym);
-  else if (!isa<DefinedCOFF>(S))
-    reportDuplicate(S, nullptr);
-  return S;
+Symbol *SymbolTable::addAbsolute(StringRef n, COFFSymbolRef sym) {
+  Symbol *s;
+  bool wasInserted;
+  std::tie(s, wasInserted) = insert(n, nullptr);
+  s->isUsedInRegularObj = true;
+  if (wasInserted || isa<Undefined>(s) || isa<Lazy>(s))
+    replaceSymbol<DefinedAbsolute>(s, n, sym);
+  else if (!isa<DefinedCOFF>(s))
+    reportDuplicate(s, nullptr);
+  return s;
 }
 
-Symbol *SymbolTable::addAbsolute(StringRef N, uint64_t VA) {
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(N, nullptr);
-  S->IsUsedInRegularObj = true;
-  if (WasInserted || isa<Undefined>(S) || isa<Lazy>(S))
-    replaceSymbol<DefinedAbsolute>(S, N, VA);
-  else if (!isa<DefinedCOFF>(S))
-    reportDuplicate(S, nullptr);
-  return S;
+Symbol *SymbolTable::addAbsolute(StringRef n, uint64_t va) {
+  Symbol *s;
+  bool wasInserted;
+  std::tie(s, wasInserted) = insert(n, nullptr);
+  s->isUsedInRegularObj = true;
+  if (wasInserted || isa<Undefined>(s) || isa<Lazy>(s))
+    replaceSymbol<DefinedAbsolute>(s, n, va);
+  else if (!isa<DefinedCOFF>(s))
+    reportDuplicate(s, nullptr);
+  return s;
 }
 
-Symbol *SymbolTable::addSynthetic(StringRef N, Chunk *C) {
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(N, nullptr);
-  S->IsUsedInRegularObj = true;
-  if (WasInserted || isa<Undefined>(S) || isa<Lazy>(S))
-    replaceSymbol<DefinedSynthetic>(S, N, C);
-  else if (!isa<DefinedCOFF>(S))
-    reportDuplicate(S, nullptr);
-  return S;
+Symbol *SymbolTable::addSynthetic(StringRef n, Chunk *c) {
+  Symbol *s;
+  bool wasInserted;
+  std::tie(s, wasInserted) = insert(n, nullptr);
+  s->isUsedInRegularObj = true;
+  if (wasInserted || isa<Undefined>(s) || isa<Lazy>(s))
+    replaceSymbol<DefinedSynthetic>(s, n, c);
+  else if (!isa<DefinedCOFF>(s))
+    reportDuplicate(s, nullptr);
+  return s;
 }
 
-Symbol *SymbolTable::addRegular(InputFile *F, StringRef N,
-                                const coff_symbol_generic *Sym,
-                                SectionChunk *C) {
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(N, F);
-  if (WasInserted || !isa<DefinedRegular>(S))
-    replaceSymbol<DefinedRegular>(S, F, N, /*IsCOMDAT*/ false,
-                                  /*IsExternal*/ true, Sym, C);
+Symbol *SymbolTable::addRegular(InputFile *f, StringRef n,
+                                const coff_symbol_generic *sym,
+                                SectionChunk *c) {
+  Symbol *s;
+  bool wasInserted;
+  std::tie(s, wasInserted) = insert(n, f);
+  if (wasInserted || !isa<DefinedRegular>(s))
+    replaceSymbol<DefinedRegular>(s, f, n, /*IsCOMDAT*/ false,
+                                  /*IsExternal*/ true, sym, c);
   else
-    reportDuplicate(S, F);
-  return S;
+    reportDuplicate(s, f);
+  return s;
 }
 
-std::pair<Symbol *, bool>
-SymbolTable::addComdat(InputFile *F, StringRef N,
-                       const coff_symbol_generic *Sym) {
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(N, F);
-  if (WasInserted || !isa<DefinedRegular>(S)) {
-    replaceSymbol<DefinedRegular>(S, F, N, /*IsCOMDAT*/ true,
-                                  /*IsExternal*/ true, Sym, nullptr);
-    return {S, true};
+std::pair<DefinedRegular *, bool>
+SymbolTable::addComdat(InputFile *f, StringRef n,
+                       const coff_symbol_generic *sym) {
+  Symbol *s;
+  bool wasInserted;
+  std::tie(s, wasInserted) = insert(n, f);
+  if (wasInserted || !isa<DefinedRegular>(s)) {
+    replaceSymbol<DefinedRegular>(s, f, n, /*IsCOMDAT*/ true,
+                                  /*IsExternal*/ true, sym, nullptr);
+    return {cast<DefinedRegular>(s), true};
   }
-  if (!cast<DefinedRegular>(S)->isCOMDAT())
-    reportDuplicate(S, F);
-  return {S, false};
+  auto *existingSymbol = cast<DefinedRegular>(s);
+  if (!existingSymbol->isCOMDAT)
+    reportDuplicate(s, f);
+  return {existingSymbol, false};
 }
 
-Symbol *SymbolTable::addCommon(InputFile *F, StringRef N, uint64_t Size,
-                               const coff_symbol_generic *Sym, CommonChunk *C) {
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(N, F);
-  if (WasInserted || !isa<DefinedCOFF>(S))
-    replaceSymbol<DefinedCommon>(S, F, N, Size, Sym, C);
-  else if (auto *DC = dyn_cast<DefinedCommon>(S))
-    if (Size > DC->getSize())
-      replaceSymbol<DefinedCommon>(S, F, N, Size, Sym, C);
-  return S;
+Symbol *SymbolTable::addCommon(InputFile *f, StringRef n, uint64_t size,
+                               const coff_symbol_generic *sym, CommonChunk *c) {
+  Symbol *s;
+  bool wasInserted;
+  std::tie(s, wasInserted) = insert(n, f);
+  if (wasInserted || !isa<DefinedCOFF>(s))
+    replaceSymbol<DefinedCommon>(s, f, n, size, sym, c);
+  else if (auto *dc = dyn_cast<DefinedCommon>(s))
+    if (size > dc->getSize())
+      replaceSymbol<DefinedCommon>(s, f, n, size, sym, c);
+  return s;
 }
 
-Symbol *SymbolTable::addImportData(StringRef N, ImportFile *F) {
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(N, nullptr);
-  S->IsUsedInRegularObj = true;
-  if (WasInserted || isa<Undefined>(S) || isa<Lazy>(S)) {
-    replaceSymbol<DefinedImportData>(S, N, F);
-    return S;
+Symbol *SymbolTable::addImportData(StringRef n, ImportFile *f) {
+  Symbol *s;
+  bool wasInserted;
+  std::tie(s, wasInserted) = insert(n, nullptr);
+  s->isUsedInRegularObj = true;
+  if (wasInserted || isa<Undefined>(s) || isa<Lazy>(s)) {
+    replaceSymbol<DefinedImportData>(s, n, f);
+    return s;
   }
 
-  reportDuplicate(S, F);
+  reportDuplicate(s, f);
   return nullptr;
 }
 
-Symbol *SymbolTable::addImportThunk(StringRef Name, DefinedImportData *ID,
-                                    uint16_t Machine) {
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(Name, nullptr);
-  S->IsUsedInRegularObj = true;
-  if (WasInserted || isa<Undefined>(S) || isa<Lazy>(S)) {
-    replaceSymbol<DefinedImportThunk>(S, Name, ID, Machine);
-    return S;
+Symbol *SymbolTable::addImportThunk(StringRef name, DefinedImportData *id,
+                                    uint16_t machine) {
+  Symbol *s;
+  bool wasInserted;
+  std::tie(s, wasInserted) = insert(name, nullptr);
+  s->isUsedInRegularObj = true;
+  if (wasInserted || isa<Undefined>(s) || isa<Lazy>(s)) {
+    replaceSymbol<DefinedImportThunk>(s, name, id, machine);
+    return s;
   }
 
-  reportDuplicate(S, ID->File);
+  reportDuplicate(s, id->file);
   return nullptr;
 }
 
 std::vector<Chunk *> SymbolTable::getChunks() {
-  std::vector<Chunk *> Res;
-  for (ObjFile *File : ObjFile::Instances) {
-    ArrayRef<Chunk *> V = File->getChunks();
-    Res.insert(Res.end(), V.begin(), V.end());
+  std::vector<Chunk *> res;
+  for (ObjFile *file : ObjFile::instances) {
+    ArrayRef<Chunk *> v = file->getChunks();
+    res.insert(res.end(), v.begin(), v.end());
   }
-  return Res;
+  return res;
 }
 
-Symbol *SymbolTable::find(StringRef Name) {
-  return SymMap.lookup(CachedHashStringRef(Name));
+Symbol *SymbolTable::find(StringRef name) {
+  return symMap.lookup(CachedHashStringRef(name));
 }
 
-Symbol *SymbolTable::findUnderscore(StringRef Name) {
-  if (Config->Machine == I386)
-    return find(("_" + Name).str());
-  return find(Name);
+Symbol *SymbolTable::findUnderscore(StringRef name) {
+  if (config->machine == I386)
+    return find(("_" + name).str());
+  return find(name);
 }
 
-StringRef SymbolTable::findByPrefix(StringRef Prefix) {
-  for (auto Pair : SymMap) {
-    StringRef Name = Pair.first.val();
-    if (Name.startswith(Prefix))
-      return Name;
+// Return all symbols that start with Prefix, possibly ignoring the first
+// character of Prefix or the first character symbol.
+std::vector<Symbol *> SymbolTable::getSymsWithPrefix(StringRef prefix) {
+  std::vector<Symbol *> syms;
+  for (auto pair : symMap) {
+    StringRef name = pair.first.val();
+    if (name.startswith(prefix) || name.startswith(prefix.drop_front()) ||
+        name.drop_front().startswith(prefix) ||
+        name.drop_front().startswith(prefix.drop_front())) {
+      syms.push_back(pair.second);
+    }
   }
-  return "";
+  return syms;
 }
 
-StringRef SymbolTable::findMangle(StringRef Name) {
-  if (Symbol *Sym = find(Name))
-    if (!isa<Undefined>(Sym))
-      return Name;
-  if (Config->Machine != I386)
-    return findByPrefix(("?" + Name + "@@Y").str());
-  if (!Name.startswith("_"))
-    return "";
+Symbol *SymbolTable::findMangle(StringRef name) {
+  if (Symbol *sym = find(name))
+    if (!isa<Undefined>(sym))
+      return sym;
+
+  // Efficient fuzzy string lookup is impossible with a hash table, so iterate
+  // the symbol table once and collect all possibly matching symbols into this
+  // vector. Then compare each possibly matching symbol with each possible
+  // mangling.
+  std::vector<Symbol *> syms = getSymsWithPrefix(name);
+  auto findByPrefix = [&syms](const Twine &t) -> Symbol * {
+    std::string prefix = t.str();
+    for (auto *s : syms)
+      if (s->getName().startswith(prefix))
+        return s;
+    return nullptr;
+  };
+
+  // For non-x86, just look for C++ functions.
+  if (config->machine != I386)
+    return findByPrefix("?" + name + "@@Y");
+
+  if (!name.startswith("_"))
+    return nullptr;
   // Search for x86 stdcall function.
-  StringRef S = findByPrefix((Name + "@").str());
-  if (!S.empty())
-    return S;
+  if (Symbol *s = findByPrefix(name + "@"))
+    return s;
   // Search for x86 fastcall function.
-  S = findByPrefix(("@" + Name.substr(1) + "@").str());
-  if (!S.empty())
-    return S;
+  if (Symbol *s = findByPrefix("@" + name.substr(1) + "@"))
+    return s;
   // Search for x86 vectorcall function.
-  S = findByPrefix((Name.substr(1) + "@@").str());
-  if (!S.empty())
-    return S;
+  if (Symbol *s = findByPrefix(name.substr(1) + "@@"))
+    return s;
   // Search for x86 C++ non-member function.
-  return findByPrefix(("?" + Name.substr(1) + "@@Y").str());
+  return findByPrefix("?" + name.substr(1) + "@@Y");
 }
 
-void SymbolTable::mangleMaybe(Symbol *B) {
-  auto *U = dyn_cast<Undefined>(B);
-  if (!U || U->WeakAlias)
-    return;
-  StringRef Alias = findMangle(U->getName());
-  if (!Alias.empty()) {
-    log(U->getName() + " aliased to " + Alias);
-    U->WeakAlias = addUndefined(Alias);
-  }
-}
-
-Symbol *SymbolTable::addUndefined(StringRef Name) {
-  return addUndefined(Name, nullptr, false);
+Symbol *SymbolTable::addUndefined(StringRef name) {
+  return addUndefined(name, nullptr, false);
 }
 
 std::vector<StringRef> SymbolTable::compileBitcodeFiles() {
-  LTO.reset(new BitcodeCompiler);
-  for (BitcodeFile *F : BitcodeFile::Instances)
-    LTO->add(*F);
-  return LTO->compile();
+  lto.reset(new BitcodeCompiler);
+  for (BitcodeFile *f : BitcodeFile::instances)
+    lto->add(*f);
+  return lto->compile();
 }
 
 void SymbolTable::addCombinedLTOObjects() {
-  if (BitcodeFile::Instances.empty())
+  if (BitcodeFile::instances.empty())
     return;
 
-  ScopedTimer T(LTOTimer);
-  for (StringRef Object : compileBitcodeFiles()) {
-    auto *Obj = make<ObjFile>(MemoryBufferRef(Object, "lto.tmp"));
-    Obj->parse();
-    ObjFile::Instances.push_back(Obj);
+  ScopedTimer t(ltoTimer);
+  for (StringRef object : compileBitcodeFiles()) {
+    auto *obj = make<ObjFile>(MemoryBufferRef(object, "lto.tmp"));
+    obj->parse();
+    ObjFile::instances.push_back(obj);
   }
 }
 
diff --git a/deps/lld/COFF/SymbolTable.h b/deps/lld/COFF/SymbolTable.h
index 00e55dbb7a02ce18a69d67f0fda698bd4580eb2a..88f47cbe9e78a86c6033ef8d7c29d0b7045a62b8 100644
--- a/deps/lld/COFF/SymbolTable.h
+++ b/deps/lld/COFF/SymbolTable.h
@@ -1,9 +1,8 @@
 //===- SymbolTable.h --------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -28,6 +27,7 @@ class Chunk;
 class CommonChunk;
 class Defined;
 class DefinedAbsolute;
+class DefinedRegular;
 class DefinedRelative;
 class Lazy;
 class SectionChunk;
@@ -47,7 +47,7 @@ class Symbol;
 // There is one add* function per symbol type.
 class SymbolTable {
 public:
-  void addFile(InputFile *File);
+  void addFile(InputFile *file);
 
   // Try to resolve any undefined symbols and update the symbol table
   // accordingly, then print an error message for any remaining undefined
@@ -55,21 +55,20 @@ public:
   void reportRemainingUndefines();
 
   void loadMinGWAutomaticImports();
-  bool handleMinGWAutomaticImport(Symbol *Sym, StringRef Name);
+  bool handleMinGWAutomaticImport(Symbol *sym, StringRef name);
 
   // Returns a list of chunks of selected symbols.
   std::vector<Chunk *> getChunks();
 
   // Returns a symbol for a given name. Returns a nullptr if not found.
-  Symbol *find(StringRef Name);
-  Symbol *findUnderscore(StringRef Name);
+  Symbol *find(StringRef name);
+  Symbol *findUnderscore(StringRef name);
 
   // Occasionally we have to resolve an undefined symbol to its
   // mangled symbol. This function tries to find a mangled name
   // for U from the symbol table, and if found, set the symbol as
   // a weak alias for U.
-  void mangleMaybe(Symbol *B);
-  StringRef findMangle(StringRef Name);
+  Symbol *findMangle(StringRef name);
 
   // Build a set of COFF objects representing the combined contents of
   // BitcodeFiles and add them to the symbol table. Called after all files are
@@ -78,52 +77,53 @@ public:
   std::vector<StringRef> compileBitcodeFiles();
 
   // Creates an Undefined symbol for a given name.
-  Symbol *addUndefined(StringRef Name);
+  Symbol *addUndefined(StringRef name);
 
-  Symbol *addSynthetic(StringRef N, Chunk *C);
-  Symbol *addAbsolute(StringRef N, uint64_t VA);
+  Symbol *addSynthetic(StringRef n, Chunk *c);
+  Symbol *addAbsolute(StringRef n, uint64_t va);
 
-  Symbol *addUndefined(StringRef Name, InputFile *F, bool IsWeakAlias);
-  void addLazy(ArchiveFile *F, const Archive::Symbol Sym);
-  Symbol *addAbsolute(StringRef N, COFFSymbolRef S);
-  Symbol *addRegular(InputFile *F, StringRef N,
-                     const llvm::object::coff_symbol_generic *S = nullptr,
-                     SectionChunk *C = nullptr);
-  std::pair<Symbol *, bool>
-  addComdat(InputFile *F, StringRef N,
-            const llvm::object::coff_symbol_generic *S = nullptr);
-  Symbol *addCommon(InputFile *F, StringRef N, uint64_t Size,
-                    const llvm::object::coff_symbol_generic *S = nullptr,
-                    CommonChunk *C = nullptr);
-  Symbol *addImportData(StringRef N, ImportFile *F);
-  Symbol *addImportThunk(StringRef Name, DefinedImportData *S,
-                         uint16_t Machine);
+  Symbol *addUndefined(StringRef name, InputFile *f, bool isWeakAlias);
+  void addLazy(ArchiveFile *f, const Archive::Symbol sym);
+  Symbol *addAbsolute(StringRef n, COFFSymbolRef s);
+  Symbol *addRegular(InputFile *f, StringRef n,
+                     const llvm::object::coff_symbol_generic *s = nullptr,
+                     SectionChunk *c = nullptr);
+  std::pair<DefinedRegular *, bool>
+  addComdat(InputFile *f, StringRef n,
+            const llvm::object::coff_symbol_generic *s = nullptr);
+  Symbol *addCommon(InputFile *f, StringRef n, uint64_t size,
+                    const llvm::object::coff_symbol_generic *s = nullptr,
+                    CommonChunk *c = nullptr);
+  Symbol *addImportData(StringRef n, ImportFile *f);
+  Symbol *addImportThunk(StringRef name, DefinedImportData *s,
+                         uint16_t machine);
 
-  void reportDuplicate(Symbol *Existing, InputFile *NewFile);
+  void reportDuplicate(Symbol *existing, InputFile *newFile);
 
   // A list of chunks which to be added to .rdata.
-  std::vector<Chunk *> LocalImportChunks;
+  std::vector<Chunk *> localImportChunks;
 
   // Iterates symbols in non-determinstic hash table order.
-  template <typename T> void forEachSymbol(T Callback) {
-    for (auto &Pair : SymMap)
-      Callback(Pair.second);
+  template <typename T> void forEachSymbol(T callback) {
+    for (auto &pair : symMap)
+      callback(pair.second);
   }
 
 private:
   /// Inserts symbol if not already present.
-  std::pair<Symbol *, bool> insert(StringRef Name);
-  /// Same as insert(Name), but also sets IsUsedInRegularObj.
-  std::pair<Symbol *, bool> insert(StringRef Name, InputFile *F);
-  StringRef findByPrefix(StringRef Prefix);
+  std::pair<Symbol *, bool> insert(StringRef name);
+  /// Same as insert(Name), but also sets isUsedInRegularObj.
+  std::pair<Symbol *, bool> insert(StringRef name, InputFile *f);
 
-  llvm::DenseMap<llvm::CachedHashStringRef, Symbol *> SymMap;
-  std::unique_ptr<BitcodeCompiler> LTO;
+  std::vector<Symbol *> getSymsWithPrefix(StringRef prefix);
+
+  llvm::DenseMap<llvm::CachedHashStringRef, Symbol *> symMap;
+  std::unique_ptr<BitcodeCompiler> lto;
 };
 
-extern SymbolTable *Symtab;
+extern SymbolTable *symtab;
 
-std::string getSymbolLocations(ObjFile *File, uint32_t SymIndex);
+std::vector<std::string> getSymbolLocations(ObjFile *file, uint32_t symIndex);
 
 } // namespace coff
 } // namespace lld
diff --git a/deps/lld/COFF/Symbols.cpp b/deps/lld/COFF/Symbols.cpp
index ccaf86417f10c7de9a96a69681dace041bb023e5..3583d4cb28c1609b05dd9553872194e74fb94c7d 100644
--- a/deps/lld/COFF/Symbols.cpp
+++ b/deps/lld/COFF/Symbols.cpp
@@ -1,9 +1,8 @@
 //===- Symbols.cpp --------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -19,11 +18,17 @@
 using namespace llvm;
 using namespace llvm::object;
 
+using namespace lld::coff;
+
+static_assert(sizeof(SymbolUnion) <= 48,
+              "symbols should be optimized for memory usage");
+
 // Returns a symbol name for an error message.
-std::string lld::toString(coff::Symbol &B) {
-  if (Optional<std::string> S = lld::demangleMSVC(B.getName()))
-    return ("\"" + *S + "\" (" + B.getName() + ")").str();
-  return B.getName();
+std::string lld::toString(coff::Symbol &b) {
+  if (config->demangle)
+    if (Optional<std::string> s = lld::demangleMSVC(b.getName()))
+      return *s;
+  return b.getName();
 }
 
 namespace lld {
@@ -37,70 +42,75 @@ StringRef Symbol::getName() {
   // name. Object files contain lots of non-external symbols, and creating
   // StringRefs for them (which involves lots of strlen() on the string table)
   // is a waste of time.
-  if (Name.empty()) {
-    auto *D = cast<DefinedCOFF>(this);
-    cast<ObjFile>(D->File)->getCOFFObj()->getSymbolName(D->Sym, Name);
+  if (nameData == nullptr) {
+    auto *d = cast<DefinedCOFF>(this);
+    StringRef nameStr;
+    cast<ObjFile>(d->file)->getCOFFObj()->getSymbolName(d->sym, nameStr);
+    nameData = nameStr.data();
+    nameSize = nameStr.size();
+    assert(nameSize == nameStr.size() && "name length truncated");
   }
-  return Name;
+  return StringRef(nameData, nameSize);
 }
 
 InputFile *Symbol::getFile() {
-  if (auto *Sym = dyn_cast<DefinedCOFF>(this))
-    return Sym->File;
-  if (auto *Sym = dyn_cast<Lazy>(this))
-    return Sym->File;
+  if (auto *sym = dyn_cast<DefinedCOFF>(this))
+    return sym->file;
+  if (auto *sym = dyn_cast<Lazy>(this))
+    return sym->file;
   return nullptr;
 }
 
 bool Symbol::isLive() const {
-  if (auto *R = dyn_cast<DefinedRegular>(this))
-    return R->getChunk()->Live;
-  if (auto *Imp = dyn_cast<DefinedImportData>(this))
-    return Imp->File->Live;
-  if (auto *Imp = dyn_cast<DefinedImportThunk>(this))
-    return Imp->WrappedSym->File->ThunkLive;
+  if (auto *r = dyn_cast<DefinedRegular>(this))
+    return r->getChunk()->live;
+  if (auto *imp = dyn_cast<DefinedImportData>(this))
+    return imp->file->live;
+  if (auto *imp = dyn_cast<DefinedImportThunk>(this))
+    return imp->wrappedSym->file->thunkLive;
   // Assume any other kind of symbol is live.
   return true;
 }
 
 // MinGW specific.
-void Symbol::replaceKeepingName(Symbol *Other, size_t Size) {
-  StringRef OrigName = Name;
-  memcpy(this, Other, Size);
-  Name = OrigName;
+void Symbol::replaceKeepingName(Symbol *other, size_t size) {
+  StringRef origName = getName();
+  memcpy(this, other, size);
+  nameData = origName.data();
+  nameSize = origName.size();
 }
 
 COFFSymbolRef DefinedCOFF::getCOFFSymbol() {
-  size_t SymSize = cast<ObjFile>(File)->getCOFFObj()->getSymbolTableEntrySize();
-  if (SymSize == sizeof(coff_symbol16))
-    return COFFSymbolRef(reinterpret_cast<const coff_symbol16 *>(Sym));
-  assert(SymSize == sizeof(coff_symbol32));
-  return COFFSymbolRef(reinterpret_cast<const coff_symbol32 *>(Sym));
+  size_t symSize = cast<ObjFile>(file)->getCOFFObj()->getSymbolTableEntrySize();
+  if (symSize == sizeof(coff_symbol16))
+    return COFFSymbolRef(reinterpret_cast<const coff_symbol16 *>(sym));
+  assert(symSize == sizeof(coff_symbol32));
+  return COFFSymbolRef(reinterpret_cast<const coff_symbol32 *>(sym));
 }
 
-uint16_t DefinedAbsolute::NumOutputSections;
+uint16_t DefinedAbsolute::numOutputSections;
 
-static Chunk *makeImportThunk(DefinedImportData *S, uint16_t Machine) {
-  if (Machine == AMD64)
-    return make<ImportThunkChunkX64>(S);
-  if (Machine == I386)
-    return make<ImportThunkChunkX86>(S);
-  if (Machine == ARM64)
-    return make<ImportThunkChunkARM64>(S);
-  assert(Machine == ARMNT);
-  return make<ImportThunkChunkARM>(S);
+static Chunk *makeImportThunk(DefinedImportData *s, uint16_t machine) {
+  if (machine == AMD64)
+    return make<ImportThunkChunkX64>(s);
+  if (machine == I386)
+    return make<ImportThunkChunkX86>(s);
+  if (machine == ARM64)
+    return make<ImportThunkChunkARM64>(s);
+  assert(machine == ARMNT);
+  return make<ImportThunkChunkARM>(s);
 }
 
-DefinedImportThunk::DefinedImportThunk(StringRef Name, DefinedImportData *S,
-                                       uint16_t Machine)
-    : Defined(DefinedImportThunkKind, Name), WrappedSym(S),
-      Data(makeImportThunk(S, Machine)) {}
+DefinedImportThunk::DefinedImportThunk(StringRef name, DefinedImportData *s,
+                                       uint16_t machine)
+    : Defined(DefinedImportThunkKind, name), wrappedSym(s),
+      data(makeImportThunk(s, machine)) {}
 
 Defined *Undefined::getWeakAlias() {
   // A weak alias may be a weak alias to another symbol, so check recursively.
-  for (Symbol *A = WeakAlias; A; A = cast<Undefined>(A)->WeakAlias)
-    if (auto *D = dyn_cast<Defined>(A))
-      return D;
+  for (Symbol *a = weakAlias; a; a = cast<Undefined>(a)->weakAlias)
+    if (auto *d = dyn_cast<Defined>(a))
+      return d;
   return nullptr;
 }
 } // namespace coff
diff --git a/deps/lld/COFF/Symbols.h b/deps/lld/COFF/Symbols.h
index 4a8693e22e3c79171c0dc93d2551dbbf71535230..86cd4f585e50771e29ebd9f2845a55d60d06f4db 100644
--- a/deps/lld/COFF/Symbols.h
+++ b/deps/lld/COFF/Symbols.h
@@ -1,9 +1,8 @@
 //===- Symbols.h ------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -58,15 +57,12 @@ public:
     LastDefinedKind = DefinedSyntheticKind,
   };
 
-  Kind kind() const { return static_cast<Kind>(SymbolKind); }
-
-  // Returns true if this is an external symbol.
-  bool isExternal() { return IsExternal; }
+  Kind kind() const { return static_cast<Kind>(symbolKind); }
 
   // Returns the symbol name.
   StringRef getName();
 
-  void replaceKeepingName(Symbol *Other, size_t Size);
+  void replaceKeepingName(Symbol *other, size_t size);
 
   // Returns the file from which this symbol was created.
   InputFile *getFile();
@@ -77,46 +73,50 @@ public:
 
 protected:
   friend SymbolTable;
-  explicit Symbol(Kind K, StringRef N = "")
-      : SymbolKind(K), IsExternal(true), IsCOMDAT(false),
-        WrittenToSymtab(false), PendingArchiveLoad(false), IsGCRoot(false),
-        IsRuntimePseudoReloc(false), Name(N) {}
+  explicit Symbol(Kind k, StringRef n = "")
+      : symbolKind(k), isExternal(true), isCOMDAT(false),
+        writtenToSymtab(false), pendingArchiveLoad(false), isGCRoot(false),
+        isRuntimePseudoReloc(false), nameSize(n.size()),
+        nameData(n.empty() ? nullptr : n.data()) {}
 
-  const unsigned SymbolKind : 8;
-  unsigned IsExternal : 1;
+  const unsigned symbolKind : 8;
+  unsigned isExternal : 1;
 
+public:
   // This bit is used by the \c DefinedRegular subclass.
-  unsigned IsCOMDAT : 1;
+  unsigned isCOMDAT : 1;
 
-public:
   // This bit is used by Writer::createSymbolAndStringTable() to prevent
   // symbols from being written to the symbol table more than once.
-  unsigned WrittenToSymtab : 1;
+  unsigned writtenToSymtab : 1;
 
   // True if this symbol was referenced by a regular (non-bitcode) object.
-  unsigned IsUsedInRegularObj : 1;
+  unsigned isUsedInRegularObj : 1;
 
   // True if we've seen both a lazy and an undefined symbol with this symbol
   // name, which means that we have enqueued an archive member load and should
   // not load any more archive members to resolve the same symbol.
-  unsigned PendingArchiveLoad : 1;
+  unsigned pendingArchiveLoad : 1;
 
   /// True if we've already added this symbol to the list of GC roots.
-  unsigned IsGCRoot : 1;
+  unsigned isGCRoot : 1;
 
-  unsigned IsRuntimePseudoReloc : 1;
+  unsigned isRuntimePseudoReloc : 1;
 
 protected:
-  StringRef Name;
+  // Symbol name length. Assume symbol lengths fit in a 32-bit integer.
+  uint32_t nameSize;
+
+  const char *nameData;
 };
 
 // The base class for any defined symbols, including absolute symbols,
 // etc.
 class Defined : public Symbol {
 public:
-  Defined(Kind K, StringRef N) : Symbol(K, N) {}
+  Defined(Kind k, StringRef n) : Symbol(k, n) {}
 
-  static bool classof(const Symbol *S) { return S->kind() <= LastDefinedKind; }
+  static bool classof(const Symbol *s) { return s->kind() <= LastDefinedKind; }
 
   // Returns the RVA (relative virtual address) of this symbol. The
   // writer sets and uses RVAs.
@@ -130,120 +130,119 @@ public:
 // Symbols defined via a COFF object file or bitcode file.  For COFF files, this
 // stores a coff_symbol_generic*, and names of internal symbols are lazily
 // loaded through that. For bitcode files, Sym is nullptr and the name is stored
-// as a StringRef.
+// as a decomposed StringRef.
 class DefinedCOFF : public Defined {
   friend Symbol;
 
 public:
-  DefinedCOFF(Kind K, InputFile *F, StringRef N, const coff_symbol_generic *S)
-      : Defined(K, N), File(F), Sym(S) {}
+  DefinedCOFF(Kind k, InputFile *f, StringRef n, const coff_symbol_generic *s)
+      : Defined(k, n), file(f), sym(s) {}
 
-  static bool classof(const Symbol *S) {
-    return S->kind() <= LastDefinedCOFFKind;
+  static bool classof(const Symbol *s) {
+    return s->kind() <= LastDefinedCOFFKind;
   }
 
-  InputFile *getFile() { return File; }
+  InputFile *getFile() { return file; }
 
   COFFSymbolRef getCOFFSymbol();
 
-  InputFile *File;
+  InputFile *file;
 
 protected:
-  const coff_symbol_generic *Sym;
+  const coff_symbol_generic *sym;
 };
 
 // Regular defined symbols read from object file symbol tables.
 class DefinedRegular : public DefinedCOFF {
 public:
-  DefinedRegular(InputFile *F, StringRef N, bool IsCOMDAT,
-                 bool IsExternal = false,
-                 const coff_symbol_generic *S = nullptr,
-                 SectionChunk *C = nullptr)
-      : DefinedCOFF(DefinedRegularKind, F, N, S), Data(C ? &C->Repl : nullptr) {
-    this->IsExternal = IsExternal;
-    this->IsCOMDAT = IsCOMDAT;
+  DefinedRegular(InputFile *f, StringRef n, bool isCOMDAT,
+                 bool isExternal = false,
+                 const coff_symbol_generic *s = nullptr,
+                 SectionChunk *c = nullptr)
+      : DefinedCOFF(DefinedRegularKind, f, n, s), data(c ? &c->repl : nullptr) {
+    this->isExternal = isExternal;
+    this->isCOMDAT = isCOMDAT;
   }
 
-  static bool classof(const Symbol *S) {
-    return S->kind() == DefinedRegularKind;
+  static bool classof(const Symbol *s) {
+    return s->kind() == DefinedRegularKind;
   }
 
-  uint64_t getRVA() const { return (*Data)->getRVA() + Sym->Value; }
-  bool isCOMDAT() const { return IsCOMDAT; }
-  SectionChunk *getChunk() const { return *Data; }
-  uint32_t getValue() const { return Sym->Value; }
+  uint64_t getRVA() const { return (*data)->getRVA() + sym->Value; }
+  SectionChunk *getChunk() const { return *data; }
+  uint32_t getValue() const { return sym->Value; }
 
-  SectionChunk **Data;
+  SectionChunk **data;
 };
 
 class DefinedCommon : public DefinedCOFF {
 public:
-  DefinedCommon(InputFile *F, StringRef N, uint64_t Size,
-                const coff_symbol_generic *S = nullptr,
-                CommonChunk *C = nullptr)
-      : DefinedCOFF(DefinedCommonKind, F, N, S), Data(C), Size(Size) {
-    this->IsExternal = true;
+  DefinedCommon(InputFile *f, StringRef n, uint64_t size,
+                const coff_symbol_generic *s = nullptr,
+                CommonChunk *c = nullptr)
+      : DefinedCOFF(DefinedCommonKind, f, n, s), data(c), size(size) {
+    this->isExternal = true;
   }
 
-  static bool classof(const Symbol *S) {
-    return S->kind() == DefinedCommonKind;
+  static bool classof(const Symbol *s) {
+    return s->kind() == DefinedCommonKind;
   }
 
-  uint64_t getRVA() { return Data->getRVA(); }
-  CommonChunk *getChunk() { return Data; }
+  uint64_t getRVA() { return data->getRVA(); }
+  CommonChunk *getChunk() { return data; }
 
 private:
   friend SymbolTable;
-  uint64_t getSize() const { return Size; }
-  CommonChunk *Data;
-  uint64_t Size;
+  uint64_t getSize() const { return size; }
+  CommonChunk *data;
+  uint64_t size;
 };
 
 // Absolute symbols.
 class DefinedAbsolute : public Defined {
 public:
-  DefinedAbsolute(StringRef N, COFFSymbolRef S)
-      : Defined(DefinedAbsoluteKind, N), VA(S.getValue()) {
-    IsExternal = S.isExternal();
+  DefinedAbsolute(StringRef n, COFFSymbolRef s)
+      : Defined(DefinedAbsoluteKind, n), va(s.getValue()) {
+    isExternal = s.isExternal();
   }
 
-  DefinedAbsolute(StringRef N, uint64_t V)
-      : Defined(DefinedAbsoluteKind, N), VA(V) {}
+  DefinedAbsolute(StringRef n, uint64_t v)
+      : Defined(DefinedAbsoluteKind, n), va(v) {}
 
-  static bool classof(const Symbol *S) {
-    return S->kind() == DefinedAbsoluteKind;
+  static bool classof(const Symbol *s) {
+    return s->kind() == DefinedAbsoluteKind;
   }
 
-  uint64_t getRVA() { return VA - Config->ImageBase; }
-  void setVA(uint64_t V) { VA = V; }
+  uint64_t getRVA() { return va - config->imageBase; }
+  void setVA(uint64_t v) { va = v; }
 
   // Section index relocations against absolute symbols resolve to
   // this 16 bit number, and it is the largest valid section index
   // plus one. This variable keeps it.
-  static uint16_t NumOutputSections;
+  static uint16_t numOutputSections;
 
 private:
-  uint64_t VA;
+  uint64_t va;
 };
 
 // This symbol is used for linker-synthesized symbols like __ImageBase and
 // __safe_se_handler_table.
 class DefinedSynthetic : public Defined {
 public:
-  explicit DefinedSynthetic(StringRef Name, Chunk *C)
-      : Defined(DefinedSyntheticKind, Name), C(C) {}
+  explicit DefinedSynthetic(StringRef name, Chunk *c)
+      : Defined(DefinedSyntheticKind, name), c(c) {}
 
-  static bool classof(const Symbol *S) {
-    return S->kind() == DefinedSyntheticKind;
+  static bool classof(const Symbol *s) {
+    return s->kind() == DefinedSyntheticKind;
   }
 
   // A null chunk indicates that this is __ImageBase. Otherwise, this is some
   // other synthesized chunk, like SEHTableChunk.
-  uint32_t getRVA() { return C ? C->getRVA() : 0; }
-  Chunk *getChunk() { return C; }
+  uint32_t getRVA() { return c ? c->getRVA() : 0; }
+  Chunk *getChunk() { return c; }
 
 private:
-  Chunk *C;
+  Chunk *c;
 };
 
 // This class represents a symbol defined in an archive file. It is
@@ -253,32 +252,32 @@ private:
 // the same name, it will ask the Lazy to load a file.
 class Lazy : public Symbol {
 public:
-  Lazy(ArchiveFile *F, const Archive::Symbol S)
-      : Symbol(LazyKind, S.getName()), File(F), Sym(S) {}
+  Lazy(ArchiveFile *f, const Archive::Symbol s)
+      : Symbol(LazyKind, s.getName()), file(f), sym(s) {}
 
-  static bool classof(const Symbol *S) { return S->kind() == LazyKind; }
+  static bool classof(const Symbol *s) { return s->kind() == LazyKind; }
 
-  ArchiveFile *File;
+  ArchiveFile *file;
 
 private:
   friend SymbolTable;
 
 private:
-  const Archive::Symbol Sym;
+  const Archive::Symbol sym;
 };
 
 // Undefined symbols.
 class Undefined : public Symbol {
 public:
-  explicit Undefined(StringRef N) : Symbol(UndefinedKind, N) {}
+  explicit Undefined(StringRef n) : Symbol(UndefinedKind, n) {}
 
-  static bool classof(const Symbol *S) { return S->kind() == UndefinedKind; }
+  static bool classof(const Symbol *s) { return s->kind() == UndefinedKind; }
 
   // An undefined symbol can have a fallback symbol which gives an
   // undefined symbol a second chance if it would remain undefined.
   // If it remains undefined, it'll be replaced with whatever the
   // Alias pointer points to.
-  Symbol *WeakAlias = nullptr;
+  Symbol *weakAlias = nullptr;
 
   // If this symbol is external weak, try to resolve it to a defined
   // symbol by searching the chain of fallback symbols. Returns the symbol if
@@ -294,23 +293,23 @@ public:
 // table in an output. The former has "__imp_" prefix.
 class DefinedImportData : public Defined {
 public:
-  DefinedImportData(StringRef N, ImportFile *F)
-      : Defined(DefinedImportDataKind, N), File(F) {
+  DefinedImportData(StringRef n, ImportFile *f)
+      : Defined(DefinedImportDataKind, n), file(f) {
   }
 
-  static bool classof(const Symbol *S) {
-    return S->kind() == DefinedImportDataKind;
+  static bool classof(const Symbol *s) {
+    return s->kind() == DefinedImportDataKind;
   }
 
-  uint64_t getRVA() { return File->Location->getRVA(); }
-  Chunk *getChunk() { return File->Location; }
-  void setLocation(Chunk *AddressTable) { File->Location = AddressTable; }
+  uint64_t getRVA() { return file->location->getRVA(); }
+  Chunk *getChunk() { return file->location; }
+  void setLocation(Chunk *addressTable) { file->location = addressTable; }
 
-  StringRef getDLLName() { return File->DLLName; }
-  StringRef getExternalName() { return File->ExternalName; }
-  uint16_t getOrdinal() { return File->Hdr->OrdinalHint; }
+  StringRef getDLLName() { return file->dllName; }
+  StringRef getExternalName() { return file->externalName; }
+  uint16_t getOrdinal() { return file->hdr->OrdinalHint; }
 
-  ImportFile *File;
+  ImportFile *file;
 };
 
 // This class represents a symbol for a jump table entry which jumps
@@ -320,19 +319,19 @@ public:
 // a regular name. A function pointer is given as a DefinedImportData.
 class DefinedImportThunk : public Defined {
 public:
-  DefinedImportThunk(StringRef Name, DefinedImportData *S, uint16_t Machine);
+  DefinedImportThunk(StringRef name, DefinedImportData *s, uint16_t machine);
 
-  static bool classof(const Symbol *S) {
-    return S->kind() == DefinedImportThunkKind;
+  static bool classof(const Symbol *s) {
+    return s->kind() == DefinedImportThunkKind;
   }
 
-  uint64_t getRVA() { return Data->getRVA(); }
-  Chunk *getChunk() { return Data; }
+  uint64_t getRVA() { return data->getRVA(); }
+  Chunk *getChunk() { return data; }
 
-  DefinedImportData *WrappedSym;
+  DefinedImportData *wrappedSym;
 
 private:
-  Chunk *Data;
+  Chunk *data;
 };
 
 // If you have a symbol "foo" in your object file, a symbol name
@@ -342,18 +341,18 @@ private:
 // This is here just for compatibility with MSVC.
 class DefinedLocalImport : public Defined {
 public:
-  DefinedLocalImport(StringRef N, Defined *S)
-      : Defined(DefinedLocalImportKind, N), Data(make<LocalImportChunk>(S)) {}
+  DefinedLocalImport(StringRef n, Defined *s)
+      : Defined(DefinedLocalImportKind, n), data(make<LocalImportChunk>(s)) {}
 
-  static bool classof(const Symbol *S) {
-    return S->kind() == DefinedLocalImportKind;
+  static bool classof(const Symbol *s) {
+    return s->kind() == DefinedLocalImportKind;
   }
 
-  uint64_t getRVA() { return Data->getRVA(); }
-  Chunk *getChunk() { return Data; }
+  uint64_t getRVA() { return data->getRVA(); }
+  Chunk *getChunk() { return data; }
 
 private:
-  LocalImportChunk *Data;
+  LocalImportChunk *data;
 };
 
 inline uint64_t Defined::getRVA() {
@@ -406,19 +405,19 @@ inline Chunk *Defined::getChunk() {
 // object. We allocate memory using this class and instantiate a symbol
 // using the placement new.
 union SymbolUnion {
-  alignas(DefinedRegular) char A[sizeof(DefinedRegular)];
-  alignas(DefinedCommon) char B[sizeof(DefinedCommon)];
-  alignas(DefinedAbsolute) char C[sizeof(DefinedAbsolute)];
-  alignas(DefinedSynthetic) char D[sizeof(DefinedSynthetic)];
-  alignas(Lazy) char E[sizeof(Lazy)];
-  alignas(Undefined) char F[sizeof(Undefined)];
-  alignas(DefinedImportData) char G[sizeof(DefinedImportData)];
-  alignas(DefinedImportThunk) char H[sizeof(DefinedImportThunk)];
-  alignas(DefinedLocalImport) char I[sizeof(DefinedLocalImport)];
+  alignas(DefinedRegular) char a[sizeof(DefinedRegular)];
+  alignas(DefinedCommon) char b[sizeof(DefinedCommon)];
+  alignas(DefinedAbsolute) char c[sizeof(DefinedAbsolute)];
+  alignas(DefinedSynthetic) char d[sizeof(DefinedSynthetic)];
+  alignas(Lazy) char e[sizeof(Lazy)];
+  alignas(Undefined) char f[sizeof(Undefined)];
+  alignas(DefinedImportData) char g[sizeof(DefinedImportData)];
+  alignas(DefinedImportThunk) char h[sizeof(DefinedImportThunk)];
+  alignas(DefinedLocalImport) char i[sizeof(DefinedLocalImport)];
 };
 
 template <typename T, typename... ArgT>
-void replaceSymbol(Symbol *S, ArgT &&... Arg) {
+void replaceSymbol(Symbol *s, ArgT &&... arg) {
   static_assert(std::is_trivially_destructible<T>(),
                 "Symbol types must be trivially destructible");
   static_assert(sizeof(T) <= sizeof(SymbolUnion), "Symbol too small");
@@ -426,11 +425,11 @@ void replaceSymbol(Symbol *S, ArgT &&... Arg) {
                 "SymbolUnion not aligned enough");
   assert(static_cast<Symbol *>(static_cast<T *>(nullptr)) == nullptr &&
          "Not a Symbol");
-  new (S) T(std::forward<ArgT>(Arg)...);
+  new (s) T(std::forward<ArgT>(arg)...);
 }
 } // namespace coff
 
-std::string toString(coff::Symbol &B);
+std::string toString(coff::Symbol &b);
 } // namespace lld
 
 #endif
diff --git a/deps/lld/COFF/TypeMerger.h b/deps/lld/COFF/TypeMerger.h
new file mode 100644
index 0000000000000000000000000000000000000000..e2cfe668cfa591ad288e0e16840ff77823603090
--- /dev/null
+++ b/deps/lld/COFF/TypeMerger.h
@@ -0,0 +1,65 @@
+//===- TypeMerger.h ---------------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLD_COFF_TYPEMERGER_H
+#define LLD_COFF_TYPEMERGER_H
+
+#include "Config.h"
+#include "llvm/DebugInfo/CodeView/GlobalTypeTableBuilder.h"
+#include "llvm/DebugInfo/CodeView/MergingTypeTableBuilder.h"
+#include "llvm/Support/Allocator.h"
+
+namespace lld {
+namespace coff {
+
+class TypeMerger {
+public:
+  TypeMerger(llvm::BumpPtrAllocator &alloc)
+      : typeTable(alloc), iDTable(alloc), globalTypeTable(alloc),
+        globalIDTable(alloc) {}
+
+  /// Get the type table or the global type table if /DEBUG:GHASH is enabled.
+  inline llvm::codeview::TypeCollection &getTypeTable() {
+    if (config->debugGHashes)
+      return globalTypeTable;
+    return typeTable;
+  }
+
+  /// Get the ID table or the global ID table if /DEBUG:GHASH is enabled.
+  inline llvm::codeview::TypeCollection &getIDTable() {
+    if (config->debugGHashes)
+      return globalIDTable;
+    return iDTable;
+  }
+
+  /// Type records that will go into the PDB TPI stream.
+  llvm::codeview::MergingTypeTableBuilder typeTable;
+
+  /// Item records that will go into the PDB IPI stream.
+  llvm::codeview::MergingTypeTableBuilder iDTable;
+
+  /// Type records that will go into the PDB TPI stream (for /DEBUG:GHASH)
+  llvm::codeview::GlobalTypeTableBuilder globalTypeTable;
+
+  /// Item records that will go into the PDB IPI stream (for /DEBUG:GHASH)
+  llvm::codeview::GlobalTypeTableBuilder globalIDTable;
+};
+
+/// Map from type index and item index in a type server PDB to the
+/// corresponding index in the destination PDB.
+struct CVIndexMap {
+  llvm::SmallVector<llvm::codeview::TypeIndex, 0> tpiMap;
+  llvm::SmallVector<llvm::codeview::TypeIndex, 0> ipiMap;
+  bool isTypeServerMap = false;
+  bool isPrecompiledTypeMap = false;
+};
+
+} // namespace coff
+} // namespace lld
+
+#endif
\ No newline at end of file
diff --git a/deps/lld/COFF/Writer.cpp b/deps/lld/COFF/Writer.cpp
index 6acfaf9a44545f5febb7d65e6bb67f69e478b71c..3da8b98d3d22248635f88ea02f9fb88e4010558a 100644
--- a/deps/lld/COFF/Writer.cpp
+++ b/deps/lld/COFF/Writer.cpp
@@ -1,9 +1,8 @@
 //===- Writer.cpp ---------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -17,6 +16,7 @@
 #include "Symbols.h"
 #include "lld/Common/ErrorHandler.h"
 #include "lld/Common/Memory.h"
+#include "lld/Common/Threads.h"
 #include "lld/Common/Timer.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/STLExtras.h"
@@ -63,104 +63,129 @@ align 8, db 0
 $ nasm -fbin /tmp/DOSProgram.asm -o /tmp/DOSProgram.bin
 $ xxd -i /tmp/DOSProgram.bin
 */
-static unsigned char DOSProgram[] = {
+static unsigned char dosProgram[] = {
   0x0e, 0x1f, 0xba, 0x0e, 0x00, 0xb4, 0x09, 0xcd, 0x21, 0xb8, 0x01, 0x4c,
   0xcd, 0x21, 0x54, 0x68, 0x69, 0x73, 0x20, 0x70, 0x72, 0x6f, 0x67, 0x72,
   0x61, 0x6d, 0x20, 0x63, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x20, 0x62, 0x65,
   0x20, 0x72, 0x75, 0x6e, 0x20, 0x69, 0x6e, 0x20, 0x44, 0x4f, 0x53, 0x20,
   0x6d, 0x6f, 0x64, 0x65, 0x2e, 0x24, 0x00, 0x00
 };
-static_assert(sizeof(DOSProgram) % 8 == 0,
+static_assert(sizeof(dosProgram) % 8 == 0,
               "DOSProgram size must be multiple of 8");
 
-static const int SectorSize = 512;
-static const int DOSStubSize = sizeof(dos_header) + sizeof(DOSProgram);
-static_assert(DOSStubSize % 8 == 0, "DOSStub size must be multiple of 8");
+static const int dosStubSize = sizeof(dos_header) + sizeof(dosProgram);
+static_assert(dosStubSize % 8 == 0, "DOSStub size must be multiple of 8");
 
-static const int NumberOfDataDirectory = 16;
+static const int numberOfDataDirectory = 16;
+
+// Global vector of all output sections. After output sections are finalized,
+// this can be indexed by Chunk::getOutputSection.
+static std::vector<OutputSection *> outputSections;
+
+OutputSection *Chunk::getOutputSection() const {
+  return osidx == 0 ? nullptr : outputSections[osidx - 1];
+}
 
 namespace {
 
-class DebugDirectoryChunk : public Chunk {
+class DebugDirectoryChunk : public NonSectionChunk {
 public:
-  DebugDirectoryChunk(const std::vector<Chunk *> &R, bool WriteRepro)
-      : Records(R), WriteRepro(WriteRepro) {}
+  DebugDirectoryChunk(const std::vector<Chunk *> &r, bool writeRepro)
+      : records(r), writeRepro(writeRepro) {}
 
   size_t getSize() const override {
-    return (Records.size() + int(WriteRepro)) * sizeof(debug_directory);
+    return (records.size() + int(writeRepro)) * sizeof(debug_directory);
   }
 
-  void writeTo(uint8_t *B) const override {
-    auto *D = reinterpret_cast<debug_directory *>(B + OutputSectionOff);
+  void writeTo(uint8_t *b) const override {
+    auto *d = reinterpret_cast<debug_directory *>(b);
 
-    for (const Chunk *Record : Records) {
-      OutputSection *OS = Record->getOutputSection();
-      uint64_t Offs = OS->getFileOff() + (Record->getRVA() - OS->getRVA());
-      fillEntry(D, COFF::IMAGE_DEBUG_TYPE_CODEVIEW, Record->getSize(),
-                Record->getRVA(), Offs);
-      ++D;
+    for (const Chunk *record : records) {
+      OutputSection *os = record->getOutputSection();
+      uint64_t offs = os->getFileOff() + (record->getRVA() - os->getRVA());
+      fillEntry(d, COFF::IMAGE_DEBUG_TYPE_CODEVIEW, record->getSize(),
+                record->getRVA(), offs);
+      ++d;
     }
 
-    if (WriteRepro) {
+    if (writeRepro) {
       // FIXME: The COFF spec allows either a 0-sized entry to just say
       // "the timestamp field is really a hash", or a 4-byte size field
       // followed by that many bytes containing a longer hash (with the
       // lowest 4 bytes usually being the timestamp in little-endian order).
       // Consider storing the full 8 bytes computed by xxHash64 here.
-      fillEntry(D, COFF::IMAGE_DEBUG_TYPE_REPRO, 0, 0, 0);
+      fillEntry(d, COFF::IMAGE_DEBUG_TYPE_REPRO, 0, 0, 0);
     }
   }
 
-  void setTimeDateStamp(uint32_t TimeDateStamp) {
-    for (support::ulittle32_t *TDS : TimeDateStamps)
-      *TDS = TimeDateStamp;
+  void setTimeDateStamp(uint32_t timeDateStamp) {
+    for (support::ulittle32_t *tds : timeDateStamps)
+      *tds = timeDateStamp;
   }
 
 private:
-  void fillEntry(debug_directory *D, COFF::DebugType DebugType, size_t Size,
-                 uint64_t RVA, uint64_t Offs) const {
-    D->Characteristics = 0;
-    D->TimeDateStamp = 0;
-    D->MajorVersion = 0;
-    D->MinorVersion = 0;
-    D->Type = DebugType;
-    D->SizeOfData = Size;
-    D->AddressOfRawData = RVA;
-    D->PointerToRawData = Offs;
+  void fillEntry(debug_directory *d, COFF::DebugType debugType, size_t size,
+                 uint64_t rva, uint64_t offs) const {
+    d->Characteristics = 0;
+    d->TimeDateStamp = 0;
+    d->MajorVersion = 0;
+    d->MinorVersion = 0;
+    d->Type = debugType;
+    d->SizeOfData = size;
+    d->AddressOfRawData = rva;
+    d->PointerToRawData = offs;
 
-    TimeDateStamps.push_back(&D->TimeDateStamp);
+    timeDateStamps.push_back(&d->TimeDateStamp);
   }
 
-  mutable std::vector<support::ulittle32_t *> TimeDateStamps;
-  const std::vector<Chunk *> &Records;
-  bool WriteRepro;
+  mutable std::vector<support::ulittle32_t *> timeDateStamps;
+  const std::vector<Chunk *> &records;
+  bool writeRepro;
 };
 
-class CVDebugRecordChunk : public Chunk {
+class CVDebugRecordChunk : public NonSectionChunk {
 public:
   size_t getSize() const override {
-    return sizeof(codeview::DebugInfo) + Config->PDBAltPath.size() + 1;
+    return sizeof(codeview::DebugInfo) + config->pdbAltPath.size() + 1;
   }
 
-  void writeTo(uint8_t *B) const override {
+  void writeTo(uint8_t *b) const override {
     // Save off the DebugInfo entry to backfill the file signature (build id)
     // in Writer::writeBuildId
-    BuildId = reinterpret_cast<codeview::DebugInfo *>(B + OutputSectionOff);
+    buildId = reinterpret_cast<codeview::DebugInfo *>(b);
 
     // variable sized field (PDB Path)
-    char *P = reinterpret_cast<char *>(B + OutputSectionOff + sizeof(*BuildId));
-    if (!Config->PDBAltPath.empty())
-      memcpy(P, Config->PDBAltPath.data(), Config->PDBAltPath.size());
-    P[Config->PDBAltPath.size()] = '\0';
+    char *p = reinterpret_cast<char *>(b + sizeof(*buildId));
+    if (!config->pdbAltPath.empty())
+      memcpy(p, config->pdbAltPath.data(), config->pdbAltPath.size());
+    p[config->pdbAltPath.size()] = '\0';
   }
 
-  mutable codeview::DebugInfo *BuildId = nullptr;
+  mutable codeview::DebugInfo *buildId = nullptr;
+};
+
+// PartialSection represents a group of chunks that contribute to an
+// OutputSection. Collating a collection of PartialSections of same name and
+// characteristics constitutes the OutputSection.
+class PartialSectionKey {
+public:
+  StringRef name;
+  unsigned characteristics;
+
+  bool operator<(const PartialSectionKey &other) const {
+    int c = name.compare(other.name);
+    if (c == 1)
+      return false;
+    if (c == 0)
+      return characteristics < other.characteristics;
+    return true;
+  }
 };
 
 // The writer writes a SymbolTable result to a file.
 class Writer {
 public:
-  Writer() : Buffer(errorHandler().OutputBuffer) {}
+  Writer() : buffer(errorHandler().outputBuffer) {}
   void run();
 
 private:
@@ -168,78 +193,81 @@ private:
   void createMiscChunks();
   void createImportTables();
   void appendImportThunks();
-  void locateImportTables(
-      std::map<std::pair<StringRef, uint32_t>, std::vector<Chunk *>> &Map);
+  void locateImportTables();
   void createExportTable();
   void mergeSections();
-  void readRelocTargets();
   void removeUnusedSections();
   void assignAddresses();
   void finalizeAddresses();
   void removeEmptySections();
+  void assignOutputSectionIndices();
   void createSymbolAndStringTable();
-  void openFile(StringRef OutputPath);
+  void openFile(StringRef outputPath);
   template <typename PEHeaderTy> void writeHeader();
   void createSEHTable();
   void createRuntimePseudoRelocs();
   void insertCtorDtorSymbols();
   void createGuardCFTables();
-  void markSymbolsForRVATable(ObjFile *File,
-                              ArrayRef<SectionChunk *> SymIdxChunks,
-                              SymbolRVASet &TableSymbols);
-  void maybeAddRVATable(SymbolRVASet TableSymbols, StringRef TableSym,
-                        StringRef CountSym);
+  void markSymbolsForRVATable(ObjFile *file,
+                              ArrayRef<SectionChunk *> symIdxChunks,
+                              SymbolRVASet &tableSymbols);
+  void maybeAddRVATable(SymbolRVASet tableSymbols, StringRef tableSym,
+                        StringRef countSym);
   void setSectionPermissions();
   void writeSections();
   void writeBuildId();
   void sortExceptionTable();
-  void sortCRTSectionChunks(std::vector<Chunk *> &Chunks);
+  void sortCRTSectionChunks(std::vector<Chunk *> &chunks);
+  void addSyntheticIdata();
+  void fixPartialSectionChars(StringRef name, uint32_t chars);
+  bool fixGnuImportChunks();
+  PartialSection *createPartialSection(StringRef name, uint32_t outChars);
+  PartialSection *findPartialSection(StringRef name, uint32_t outChars);
 
-  llvm::Optional<coff_symbol16> createSymbol(Defined *D);
-  size_t addEntryToStringTable(StringRef Str);
+  llvm::Optional<coff_symbol16> createSymbol(Defined *d);
+  size_t addEntryToStringTable(StringRef str);
 
-  OutputSection *findSection(StringRef Name);
+  OutputSection *findSection(StringRef name);
   void addBaserels();
-  void addBaserelBlocks(std::vector<Baserel> &V);
+  void addBaserelBlocks(std::vector<Baserel> &v);
 
   uint32_t getSizeOfInitializedData();
-  std::map<StringRef, std::vector<DefinedImportData *>> binImports();
 
-  std::unique_ptr<FileOutputBuffer> &Buffer;
-  std::vector<OutputSection *> OutputSections;
-  std::vector<char> Strtab;
-  std::vector<llvm::object::coff_symbol16> OutputSymtab;
-  IdataContents Idata;
-  Chunk *ImportTableStart = nullptr;
-  uint64_t ImportTableSize = 0;
-  Chunk *IATStart = nullptr;
-  uint64_t IATSize = 0;
-  DelayLoadContents DelayIdata;
-  EdataContents Edata;
-  bool SetNoSEHCharacteristic = false;
+  std::unique_ptr<FileOutputBuffer> &buffer;
+  std::map<PartialSectionKey, PartialSection *> partialSections;
+  std::vector<char> strtab;
+  std::vector<llvm::object::coff_symbol16> outputSymtab;
+  IdataContents idata;
+  Chunk *importTableStart = nullptr;
+  uint64_t importTableSize = 0;
+  Chunk *iatStart = nullptr;
+  uint64_t iatSize = 0;
+  DelayLoadContents delayIdata;
+  EdataContents edata;
+  bool setNoSEHCharacteristic = false;
 
-  DebugDirectoryChunk *DebugDirectory = nullptr;
-  std::vector<Chunk *> DebugRecords;
-  CVDebugRecordChunk *BuildId = nullptr;
-  ArrayRef<uint8_t> SectionTable;
+  DebugDirectoryChunk *debugDirectory = nullptr;
+  std::vector<Chunk *> debugRecords;
+  CVDebugRecordChunk *buildId = nullptr;
+  ArrayRef<uint8_t> sectionTable;
 
-  uint64_t FileSize;
-  uint32_t PointerToSymbolTable = 0;
-  uint64_t SizeOfImage;
-  uint64_t SizeOfHeaders;
+  uint64_t fileSize;
+  uint32_t pointerToSymbolTable = 0;
+  uint64_t sizeOfImage;
+  uint64_t sizeOfHeaders;
 
-  OutputSection *TextSec;
-  OutputSection *RdataSec;
-  OutputSection *BuildidSec;
-  OutputSection *DataSec;
-  OutputSection *PdataSec;
-  OutputSection *IdataSec;
-  OutputSection *EdataSec;
-  OutputSection *DidatSec;
-  OutputSection *RsrcSec;
-  OutputSection *RelocSec;
-  OutputSection *CtorsSec;
-  OutputSection *DtorsSec;
+  OutputSection *textSec;
+  OutputSection *rdataSec;
+  OutputSection *buildidSec;
+  OutputSection *dataSec;
+  OutputSection *pdataSec;
+  OutputSection *idataSec;
+  OutputSection *edataSec;
+  OutputSection *didatSec;
+  OutputSection *rsrcSec;
+  OutputSection *relocSec;
+  OutputSection *ctorsSec;
+  OutputSection *dtorsSec;
 
   // The first and last .pdata sections in the output file.
   //
@@ -250,82 +278,85 @@ private:
   // are entirely linker-generated we can keep track of their locations using
   // the chunks that the linker creates. All .pdata chunks come from input
   // files, so we need to keep track of them separately.
-  Chunk *FirstPdata = nullptr;
-  Chunk *LastPdata;
+  Chunk *firstPdata = nullptr;
+  Chunk *lastPdata;
 };
 } // anonymous namespace
 
 namespace lld {
 namespace coff {
 
-static Timer CodeLayoutTimer("Code Layout", Timer::root());
-static Timer DiskCommitTimer("Commit Output File", Timer::root());
+static Timer codeLayoutTimer("Code Layout", Timer::root());
+static Timer diskCommitTimer("Commit Output File", Timer::root());
 
 void writeResult() { Writer().run(); }
 
-void OutputSection::addChunk(Chunk *C) {
-  Chunks.push_back(C);
-  C->setOutputSection(this);
+void OutputSection::addChunk(Chunk *c) {
+  chunks.push_back(c);
 }
 
-void OutputSection::insertChunkAtStart(Chunk *C) {
-  Chunks.insert(Chunks.begin(), C);
-  C->setOutputSection(this);
+void OutputSection::insertChunkAtStart(Chunk *c) {
+  chunks.insert(chunks.begin(), c);
 }
 
-void OutputSection::setPermissions(uint32_t C) {
-  Header.Characteristics &= ~PermMask;
-  Header.Characteristics |= C;
+void OutputSection::setPermissions(uint32_t c) {
+  header.Characteristics &= ~permMask;
+  header.Characteristics |= c;
 }
 
-void OutputSection::merge(OutputSection *Other) {
-  for (Chunk *C : Other->Chunks)
-    C->setOutputSection(this);
-  Chunks.insert(Chunks.end(), Other->Chunks.begin(), Other->Chunks.end());
-  Other->Chunks.clear();
+void OutputSection::merge(OutputSection *other) {
+  chunks.insert(chunks.end(), other->chunks.begin(), other->chunks.end());
+  other->chunks.clear();
+  contribSections.insert(contribSections.end(), other->contribSections.begin(),
+                         other->contribSections.end());
+  other->contribSections.clear();
 }
 
 // Write the section header to a given buffer.
-void OutputSection::writeHeaderTo(uint8_t *Buf) {
-  auto *Hdr = reinterpret_cast<coff_section *>(Buf);
-  *Hdr = Header;
-  if (StringTableOff) {
+void OutputSection::writeHeaderTo(uint8_t *buf) {
+  auto *hdr = reinterpret_cast<coff_section *>(buf);
+  *hdr = header;
+  if (stringTableOff) {
     // If name is too long, write offset into the string table as a name.
-    sprintf(Hdr->Name, "/%d", StringTableOff);
+    sprintf(hdr->Name, "/%d", stringTableOff);
   } else {
-    assert(!Config->Debug || Name.size() <= COFF::NameSize ||
-           (Hdr->Characteristics & IMAGE_SCN_MEM_DISCARDABLE) == 0);
-    strncpy(Hdr->Name, Name.data(),
-            std::min(Name.size(), (size_t)COFF::NameSize));
+    assert(!config->debug || name.size() <= COFF::NameSize ||
+           (hdr->Characteristics & IMAGE_SCN_MEM_DISCARDABLE) == 0);
+    strncpy(hdr->Name, name.data(),
+            std::min(name.size(), (size_t)COFF::NameSize));
   }
 }
 
+void OutputSection::addContributingPartialSection(PartialSection *sec) {
+  contribSections.push_back(sec);
+}
+
 } // namespace coff
 } // namespace lld
 
 // Check whether the target address S is in range from a relocation
-// of type RelType at address P.
-static bool isInRange(uint16_t RelType, uint64_t S, uint64_t P, int Margin) {
-  if (Config->Machine == ARMNT) {
-    int64_t Diff = AbsoluteDifference(S, P + 4) + Margin;
-    switch (RelType) {
+// of type relType at address P.
+static bool isInRange(uint16_t relType, uint64_t s, uint64_t p, int margin) {
+  if (config->machine == ARMNT) {
+    int64_t diff = AbsoluteDifference(s, p + 4) + margin;
+    switch (relType) {
     case IMAGE_REL_ARM_BRANCH20T:
-      return isInt<21>(Diff);
+      return isInt<21>(diff);
     case IMAGE_REL_ARM_BRANCH24T:
     case IMAGE_REL_ARM_BLX23T:
-      return isInt<25>(Diff);
+      return isInt<25>(diff);
     default:
       return true;
     }
-  } else if (Config->Machine == ARM64) {
-    int64_t Diff = AbsoluteDifference(S, P) + Margin;
-    switch (RelType) {
+  } else if (config->machine == ARM64) {
+    int64_t diff = AbsoluteDifference(s, p) + margin;
+    switch (relType) {
     case IMAGE_REL_ARM64_BRANCH26:
-      return isInt<28>(Diff);
+      return isInt<28>(diff);
     case IMAGE_REL_ARM64_BRANCH19:
-      return isInt<21>(Diff);
+      return isInt<21>(diff);
     case IMAGE_REL_ARM64_BRANCH14:
-      return isInt<16>(Diff);
+      return isInt<16>(diff);
     default:
       return true;
     }
@@ -337,25 +368,25 @@ static bool isInRange(uint16_t RelType, uint64_t S, uint64_t P, int Margin) {
 // Return the last thunk for the given target if it is in range,
 // or create a new one.
 static std::pair<Defined *, bool>
-getThunk(DenseMap<uint64_t, Defined *> &LastThunks, Defined *Target, uint64_t P,
-         uint16_t Type, int Margin) {
-  Defined *&LastThunk = LastThunks[Target->getRVA()];
-  if (LastThunk && isInRange(Type, LastThunk->getRVA(), P, Margin))
-    return {LastThunk, false};
-  Chunk *C;
-  switch (Config->Machine) {
+getThunk(DenseMap<uint64_t, Defined *> &lastThunks, Defined *target, uint64_t p,
+         uint16_t type, int margin) {
+  Defined *&lastThunk = lastThunks[target->getRVA()];
+  if (lastThunk && isInRange(type, lastThunk->getRVA(), p, margin))
+    return {lastThunk, false};
+  Chunk *c;
+  switch (config->machine) {
   case ARMNT:
-    C = make<RangeExtensionThunkARM>(Target);
+    c = make<RangeExtensionThunkARM>(target);
     break;
   case ARM64:
-    C = make<RangeExtensionThunkARM64>(Target);
+    c = make<RangeExtensionThunkARM64>(target);
     break;
   default:
     llvm_unreachable("Unexpected architecture");
   }
-  Defined *D = make<DefinedSynthetic>("", C);
-  LastThunk = D;
-  return {D, true};
+  Defined *d = make<DefinedSynthetic>("", c);
+  lastThunk = d;
+  return {d, true};
 }
 
 // This checks all relocations, and for any relocation which isn't in range
@@ -369,82 +400,124 @@ getThunk(DenseMap<uint64_t, Defined *> &LastThunks, Defined *Target, uint64_t P,
 // After adding thunks, we verify that all relocations are in range (with
 // no extra margin requirements). If this failed, we restart (throwing away
 // the previously created thunks) and retry with a wider margin.
-static bool createThunks(OutputSection *OS, int Margin) {
-  bool AddressesChanged = false;
-  DenseMap<uint64_t, Defined *> LastThunks;
-  size_t ThunksSize = 0;
+static bool createThunks(OutputSection *os, int margin) {
+  bool addressesChanged = false;
+  DenseMap<uint64_t, Defined *> lastThunks;
+  DenseMap<std::pair<ObjFile *, Defined *>, uint32_t> thunkSymtabIndices;
+  size_t thunksSize = 0;
   // Recheck Chunks.size() each iteration, since we can insert more
   // elements into it.
-  for (size_t I = 0; I != OS->Chunks.size(); ++I) {
-    SectionChunk *SC = dyn_cast_or_null<SectionChunk>(OS->Chunks[I]);
-    if (!SC)
+  for (size_t i = 0; i != os->chunks.size(); ++i) {
+    SectionChunk *sc = dyn_cast_or_null<SectionChunk>(os->chunks[i]);
+    if (!sc)
       continue;
-    size_t ThunkInsertionSpot = I + 1;
+    size_t thunkInsertionSpot = i + 1;
 
     // Try to get a good enough estimate of where new thunks will be placed.
     // Offset this by the size of the new thunks added so far, to make the
     // estimate slightly better.
-    size_t ThunkInsertionRVA = SC->getRVA() + SC->getSize() + ThunksSize;
-    for (size_t J = 0, E = SC->Relocs.size(); J < E; ++J) {
-      const coff_relocation &Rel = SC->Relocs[J];
-      Symbol *&RelocTarget = SC->RelocTargets[J];
+    size_t thunkInsertionRVA = sc->getRVA() + sc->getSize() + thunksSize;
+    ObjFile *file = sc->file;
+    std::vector<std::pair<uint32_t, uint32_t>> relocReplacements;
+    ArrayRef<coff_relocation> originalRelocs =
+        file->getCOFFObj()->getRelocations(sc->header);
+    for (size_t j = 0, e = originalRelocs.size(); j < e; ++j) {
+      const coff_relocation &rel = originalRelocs[j];
+      Symbol *relocTarget = file->getSymbol(rel.SymbolTableIndex);
 
       // The estimate of the source address P should be pretty accurate,
       // but we don't know whether the target Symbol address should be
-      // offset by ThunkSize or not (or by some of ThunksSize but not all of
+      // offset by thunksSize or not (or by some of thunksSize but not all of
       // it), giving us some uncertainty once we have added one thunk.
-      uint64_t P = SC->getRVA() + Rel.VirtualAddress + ThunksSize;
+      uint64_t p = sc->getRVA() + rel.VirtualAddress + thunksSize;
 
-      Defined *Sym = dyn_cast_or_null<Defined>(RelocTarget);
-      if (!Sym)
+      Defined *sym = dyn_cast_or_null<Defined>(relocTarget);
+      if (!sym)
         continue;
 
-      uint64_t S = Sym->getRVA();
+      uint64_t s = sym->getRVA();
 
-      if (isInRange(Rel.Type, S, P, Margin))
+      if (isInRange(rel.Type, s, p, margin))
         continue;
 
       // If the target isn't in range, hook it up to an existing or new
       // thunk.
-      Defined *Thunk;
-      bool WasNew;
-      std::tie(Thunk, WasNew) = getThunk(LastThunks, Sym, P, Rel.Type, Margin);
-      if (WasNew) {
-        Chunk *ThunkChunk = Thunk->getChunk();
-        ThunkChunk->setRVA(
-            ThunkInsertionRVA); // Estimate of where it will be located.
-        ThunkChunk->setOutputSection(OS);
-        OS->Chunks.insert(OS->Chunks.begin() + ThunkInsertionSpot, ThunkChunk);
-        ThunkInsertionSpot++;
-        ThunksSize += ThunkChunk->getSize();
-        ThunkInsertionRVA += ThunkChunk->getSize();
-        AddressesChanged = true;
+      Defined *thunk;
+      bool wasNew;
+      std::tie(thunk, wasNew) = getThunk(lastThunks, sym, p, rel.Type, margin);
+      if (wasNew) {
+        Chunk *thunkChunk = thunk->getChunk();
+        thunkChunk->setRVA(
+            thunkInsertionRVA); // Estimate of where it will be located.
+        os->chunks.insert(os->chunks.begin() + thunkInsertionSpot, thunkChunk);
+        thunkInsertionSpot++;
+        thunksSize += thunkChunk->getSize();
+        thunkInsertionRVA += thunkChunk->getSize();
+        addressesChanged = true;
       }
-      RelocTarget = Thunk;
+
+      // To redirect the relocation, add a symbol to the parent object file's
+      // symbol table, and replace the relocation symbol table index with the
+      // new index.
+      auto insertion = thunkSymtabIndices.insert({{file, thunk}, ~0U});
+      uint32_t &thunkSymbolIndex = insertion.first->second;
+      if (insertion.second)
+        thunkSymbolIndex = file->addRangeThunkSymbol(thunk);
+      relocReplacements.push_back({j, thunkSymbolIndex});
     }
+
+    // Get a writable copy of this section's relocations so they can be
+    // modified. If the relocations point into the object file, allocate new
+    // memory. Otherwise, this must be previously allocated memory that can be
+    // modified in place.
+    ArrayRef<coff_relocation> curRelocs = sc->getRelocs();
+    MutableArrayRef<coff_relocation> newRelocs;
+    if (originalRelocs.data() == curRelocs.data()) {
+      newRelocs = makeMutableArrayRef(
+          bAlloc.Allocate<coff_relocation>(originalRelocs.size()),
+          originalRelocs.size());
+    } else {
+      newRelocs = makeMutableArrayRef(
+          const_cast<coff_relocation *>(curRelocs.data()), curRelocs.size());
+    }
+
+    // Copy each relocation, but replace the symbol table indices which need
+    // thunks.
+    auto nextReplacement = relocReplacements.begin();
+    auto endReplacement = relocReplacements.end();
+    for (size_t i = 0, e = originalRelocs.size(); i != e; ++i) {
+      newRelocs[i] = originalRelocs[i];
+      if (nextReplacement != endReplacement && nextReplacement->first == i) {
+        newRelocs[i].SymbolTableIndex = nextReplacement->second;
+        ++nextReplacement;
+      }
+    }
+
+    sc->setRelocs(newRelocs);
   }
-  return AddressesChanged;
+  return addressesChanged;
 }
 
 // Verify that all relocations are in range, with no extra margin requirements.
-static bool verifyRanges(const std::vector<Chunk *> Chunks) {
-  for (Chunk *C : Chunks) {
-    SectionChunk *SC = dyn_cast_or_null<SectionChunk>(C);
-    if (!SC)
+static bool verifyRanges(const std::vector<Chunk *> chunks) {
+  for (Chunk *c : chunks) {
+    SectionChunk *sc = dyn_cast_or_null<SectionChunk>(c);
+    if (!sc)
       continue;
 
-    for (size_t J = 0, E = SC->Relocs.size(); J < E; ++J) {
-      const coff_relocation &Rel = SC->Relocs[J];
-      Symbol *RelocTarget = SC->RelocTargets[J];
+    ArrayRef<coff_relocation> relocs = sc->getRelocs();
+    for (size_t j = 0, e = relocs.size(); j < e; ++j) {
+      const coff_relocation &rel = relocs[j];
+      Symbol *relocTarget = sc->file->getSymbol(rel.SymbolTableIndex);
 
-      Defined *Sym = dyn_cast_or_null<Defined>(RelocTarget);
-      if (!Sym)
+      Defined *sym = dyn_cast_or_null<Defined>(relocTarget);
+      if (!sym)
         continue;
 
-      uint64_t P = SC->getRVA() + Rel.VirtualAddress;
-      uint64_t S = Sym->getRVA();
+      uint64_t p = sc->getRVA() + rel.VirtualAddress;
+      uint64_t s = sym->getRVA();
 
-      if (!isInRange(Rel.Type, S, P, 0))
+      if (!isInRange(rel.Type, s, p, 0))
         return false;
     }
   }
@@ -454,71 +527,68 @@ static bool verifyRanges(const std::vector<Chunk *> Chunks) {
 // Assign addresses and add thunks if necessary.
 void Writer::finalizeAddresses() {
   assignAddresses();
-  if (Config->Machine != ARMNT && Config->Machine != ARM64)
+  if (config->machine != ARMNT && config->machine != ARM64)
     return;
 
-  size_t OrigNumChunks = 0;
-  for (OutputSection *Sec : OutputSections) {
-    Sec->OrigChunks = Sec->Chunks;
-    OrigNumChunks += Sec->Chunks.size();
+  size_t origNumChunks = 0;
+  for (OutputSection *sec : outputSections) {
+    sec->origChunks = sec->chunks;
+    origNumChunks += sec->chunks.size();
   }
 
-  int Pass = 0;
-  int Margin = 1024 * 100;
+  int pass = 0;
+  int margin = 1024 * 100;
   while (true) {
     // First check whether we need thunks at all, or if the previous pass of
     // adding them turned out ok.
-    bool RangesOk = true;
-    size_t NumChunks = 0;
-    for (OutputSection *Sec : OutputSections) {
-      if (!verifyRanges(Sec->Chunks)) {
-        RangesOk = false;
+    bool rangesOk = true;
+    size_t numChunks = 0;
+    for (OutputSection *sec : outputSections) {
+      if (!verifyRanges(sec->chunks)) {
+        rangesOk = false;
         break;
       }
-      NumChunks += Sec->Chunks.size();
+      numChunks += sec->chunks.size();
     }
-    if (RangesOk) {
-      if (Pass > 0)
-        log("Added " + Twine(NumChunks - OrigNumChunks) + " thunks with " +
-            "margin " + Twine(Margin) + " in " + Twine(Pass) + " passes");
+    if (rangesOk) {
+      if (pass > 0)
+        log("Added " + Twine(numChunks - origNumChunks) + " thunks with " +
+            "margin " + Twine(margin) + " in " + Twine(pass) + " passes");
       return;
     }
 
-    if (Pass >= 10)
-      fatal("adding thunks hasn't converged after " + Twine(Pass) + " passes");
+    if (pass >= 10)
+      fatal("adding thunks hasn't converged after " + Twine(pass) + " passes");
 
-    if (Pass > 0) {
+    if (pass > 0) {
       // If the previous pass didn't work out, reset everything back to the
       // original conditions before retrying with a wider margin. This should
       // ideally never happen under real circumstances.
-      for (OutputSection *Sec : OutputSections) {
-        Sec->Chunks = Sec->OrigChunks;
-        for (Chunk *C : Sec->Chunks)
-          C->resetRelocTargets();
-      }
-      Margin *= 2;
+      for (OutputSection *sec : outputSections)
+        sec->chunks = sec->origChunks;
+      margin *= 2;
     }
 
     // Try adding thunks everywhere where it is needed, with a margin
     // to avoid things going out of range due to the added thunks.
-    bool AddressesChanged = false;
-    for (OutputSection *Sec : OutputSections)
-      AddressesChanged |= createThunks(Sec, Margin);
+    bool addressesChanged = false;
+    for (OutputSection *sec : outputSections)
+      addressesChanged |= createThunks(sec, margin);
     // If the verification above thought we needed thunks, we should have
     // added some.
-    assert(AddressesChanged);
+    assert(addressesChanged);
 
     // Recalculate the layout for the whole image (and verify the ranges at
     // the start of the next round).
     assignAddresses();
 
-    Pass++;
+    pass++;
   }
 }
 
 // The main function of the writer.
 void Writer::run() {
-  ScopedTimer T1(CodeLayoutTimer);
+  ScopedTimer t1(codeLayoutTimer);
 
   createImportTables();
   createSections();
@@ -526,19 +596,19 @@ void Writer::run() {
   appendImportThunks();
   createExportTable();
   mergeSections();
-  readRelocTargets();
   removeUnusedSections();
   finalizeAddresses();
   removeEmptySections();
+  assignOutputSectionIndices();
   setSectionPermissions();
   createSymbolAndStringTable();
 
-  if (FileSize > UINT32_MAX)
-    fatal("image size (" + Twine(FileSize) + ") " +
+  if (fileSize > UINT32_MAX)
+    fatal("image size (" + Twine(fileSize) + ") " +
         "exceeds maximum allowable size (" + Twine(UINT32_MAX) + ")");
 
-  openFile(Config->OutputFile);
-  if (Config->is64()) {
+  openFile(config->outputFile);
+  if (config->is64()) {
     writeHeader<pe32plus_header>();
   } else {
     writeHeader<pe32_header>();
@@ -546,42 +616,59 @@ void Writer::run() {
   writeSections();
   sortExceptionTable();
 
-  T1.stop();
+  t1.stop();
 
-  if (!Config->PDBPath.empty() && Config->Debug) {
-    assert(BuildId);
-    createPDB(Symtab, OutputSections, SectionTable, BuildId->BuildId);
+  if (!config->pdbPath.empty() && config->debug) {
+    assert(buildId);
+    createPDB(symtab, outputSections, sectionTable, buildId->buildId);
   }
   writeBuildId();
 
-  writeMapFile(OutputSections);
+  writeMapFile(outputSections);
 
-  ScopedTimer T2(DiskCommitTimer);
-  if (auto E = Buffer->commit())
-    fatal("failed to write the output file: " + toString(std::move(E)));
+  ScopedTimer t2(diskCommitTimer);
+  if (auto e = buffer->commit())
+    fatal("failed to write the output file: " + toString(std::move(e)));
 }
 
-static StringRef getOutputSectionName(StringRef Name) {
-  StringRef S = Name.split('$').first;
+static StringRef getOutputSectionName(StringRef name) {
+  StringRef s = name.split('$').first;
 
   // Treat a later period as a separator for MinGW, for sections like
   // ".ctors.01234".
-  return S.substr(0, S.find('.', 1));
+  return s.substr(0, s.find('.', 1));
 }
 
 // For /order.
-static void sortBySectionOrder(std::vector<Chunk *> &Chunks) {
-  auto GetPriority = [](const Chunk *C) {
-    if (auto *Sec = dyn_cast<SectionChunk>(C))
-      if (Sec->Sym)
-        return Config->Order.lookup(Sec->Sym->getName());
+static void sortBySectionOrder(std::vector<Chunk *> &chunks) {
+  auto getPriority = [](const Chunk *c) {
+    if (auto *sec = dyn_cast<SectionChunk>(c))
+      if (sec->sym)
+        return config->order.lookup(sec->sym->getName());
     return 0;
   };
 
-  std::stable_sort(Chunks.begin(), Chunks.end(),
-                   [=](const Chunk *A, const Chunk *B) {
-                     return GetPriority(A) < GetPriority(B);
-                   });
+  llvm::stable_sort(chunks, [=](const Chunk *a, const Chunk *b) {
+    return getPriority(a) < getPriority(b);
+  });
+}
+
+// Change the characteristics of existing PartialSections that belong to the
+// section Name to Chars.
+void Writer::fixPartialSectionChars(StringRef name, uint32_t chars) {
+  for (auto it : partialSections) {
+    PartialSection *pSec = it.second;
+    StringRef curName = pSec->name;
+    if (!curName.consume_front(name) ||
+        (!curName.empty() && !curName.startswith("$")))
+      continue;
+    if (pSec->characteristics == chars)
+      continue;
+    PartialSection *destSec = createPartialSection(pSec->name, chars);
+    destSec->chunks.insert(destSec->chunks.end(), pSec->chunks.begin(),
+                           pSec->chunks.end());
+    pSec->chunks.clear();
+  }
 }
 
 // Sort concrete section chunks from GNU import libraries.
@@ -594,249 +681,269 @@ static void sortBySectionOrder(std::vector<Chunk *> &Chunks) {
 // be formed correctly, the section chunks within each .idata$* section need
 // to be grouped by library, and sorted alphabetically within each library
 // (which makes sure the header comes first and the trailer last).
-static bool fixGnuImportChunks(
-    std::map<std::pair<StringRef, uint32_t>, std::vector<Chunk *>> &Map) {
-  uint32_t RDATA = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ;
+bool Writer::fixGnuImportChunks() {
+  uint32_t rdata = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ;
 
   // Make sure all .idata$* section chunks are mapped as RDATA in order to
   // be sorted into the same sections as our own synthesized .idata chunks.
-  for (auto &Pair : Map) {
-    StringRef SectionName = Pair.first.first;
-    uint32_t OutChars = Pair.first.second;
-    if (!SectionName.startswith(".idata"))
-      continue;
-    if (OutChars == RDATA)
-      continue;
-    std::vector<Chunk *> &SrcVect = Pair.second;
-    std::vector<Chunk *> &DestVect = Map[{SectionName, RDATA}];
-    DestVect.insert(DestVect.end(), SrcVect.begin(), SrcVect.end());
-    SrcVect.clear();
-  }
+  fixPartialSectionChars(".idata", rdata);
 
-  bool HasIdata = false;
+  bool hasIdata = false;
   // Sort all .idata$* chunks, grouping chunks from the same library,
   // with alphabetical ordering of the object fils within a library.
-  for (auto &Pair : Map) {
-    StringRef SectionName = Pair.first.first;
-    if (!SectionName.startswith(".idata"))
+  for (auto it : partialSections) {
+    PartialSection *pSec = it.second;
+    if (!pSec->name.startswith(".idata"))
       continue;
 
-    std::vector<Chunk *> &Chunks = Pair.second;
-    if (!Chunks.empty())
-      HasIdata = true;
-    std::stable_sort(Chunks.begin(), Chunks.end(), [&](Chunk *S, Chunk *T) {
-      SectionChunk *SC1 = dyn_cast_or_null<SectionChunk>(S);
-      SectionChunk *SC2 = dyn_cast_or_null<SectionChunk>(T);
-      if (!SC1 || !SC2) {
+    if (!pSec->chunks.empty())
+      hasIdata = true;
+    llvm::stable_sort(pSec->chunks, [&](Chunk *s, Chunk *t) {
+      SectionChunk *sc1 = dyn_cast_or_null<SectionChunk>(s);
+      SectionChunk *sc2 = dyn_cast_or_null<SectionChunk>(t);
+      if (!sc1 || !sc2) {
         // if SC1, order them ascending. If SC2 or both null,
         // S is not less than T.
-        return SC1 != nullptr;
+        return sc1 != nullptr;
       }
       // Make a string with "libraryname/objectfile" for sorting, achieving
       // both grouping by library and sorting of objects within a library,
       // at once.
-      std::string Key1 =
-          (SC1->File->ParentName + "/" + SC1->File->getName()).str();
-      std::string Key2 =
-          (SC2->File->ParentName + "/" + SC2->File->getName()).str();
-      return Key1 < Key2;
+      std::string key1 =
+          (sc1->file->parentName + "/" + sc1->file->getName()).str();
+      std::string key2 =
+          (sc2->file->parentName + "/" + sc2->file->getName()).str();
+      return key1 < key2;
     });
   }
-  return HasIdata;
+  return hasIdata;
 }
 
 // Add generated idata chunks, for imported symbols and DLLs, and a
 // terminator in .idata$2.
-static void addSyntheticIdata(
-    IdataContents &Idata,
-    std::map<std::pair<StringRef, uint32_t>, std::vector<Chunk *>> &Map) {
-  uint32_t RDATA = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ;
-  Idata.create();
+void Writer::addSyntheticIdata() {
+  uint32_t rdata = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ;
+  idata.create();
 
   // Add the .idata content in the right section groups, to allow
   // chunks from other linked in object files to be grouped together.
   // See Microsoft PE/COFF spec 5.4 for details.
-  auto Add = [&](StringRef N, std::vector<Chunk *> &V) {
-    std::vector<Chunk *> &DestVect = Map[{N, RDATA}];
-    DestVect.insert(DestVect.end(), V.begin(), V.end());
+  auto add = [&](StringRef n, std::vector<Chunk *> &v) {
+    PartialSection *pSec = createPartialSection(n, rdata);
+    pSec->chunks.insert(pSec->chunks.end(), v.begin(), v.end());
   };
 
   // The loader assumes a specific order of data.
   // Add each type in the correct order.
-  Add(".idata$2", Idata.Dirs);
-  Add(".idata$4", Idata.Lookups);
-  Add(".idata$5", Idata.Addresses);
-  Add(".idata$6", Idata.Hints);
-  Add(".idata$7", Idata.DLLNames);
+  add(".idata$2", idata.dirs);
+  add(".idata$4", idata.lookups);
+  add(".idata$5", idata.addresses);
+  add(".idata$6", idata.hints);
+  add(".idata$7", idata.dllNames);
 }
 
 // Locate the first Chunk and size of the import directory list and the
 // IAT.
-void Writer::locateImportTables(
-    std::map<std::pair<StringRef, uint32_t>, std::vector<Chunk *>> &Map) {
-  uint32_t RDATA = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ;
-  std::vector<Chunk *> &ImportTables = Map[{".idata$2", RDATA}];
-  if (!ImportTables.empty())
-    ImportTableStart = ImportTables.front();
-  for (Chunk *C : ImportTables)
-    ImportTableSize += C->getSize();
+void Writer::locateImportTables() {
+  uint32_t rdata = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ;
 
-  std::vector<Chunk *> &IAT = Map[{".idata$5", RDATA}];
-  if (!IAT.empty())
-    IATStart = IAT.front();
-  for (Chunk *C : IAT)
-    IATSize += C->getSize();
+  if (PartialSection *importDirs = findPartialSection(".idata$2", rdata)) {
+    if (!importDirs->chunks.empty())
+      importTableStart = importDirs->chunks.front();
+    for (Chunk *c : importDirs->chunks)
+      importTableSize += c->getSize();
+  }
+
+  if (PartialSection *importAddresses = findPartialSection(".idata$5", rdata)) {
+    if (!importAddresses->chunks.empty())
+      iatStart = importAddresses->chunks.front();
+    for (Chunk *c : importAddresses->chunks)
+      iatSize += c->getSize();
+  }
+}
+
+// Return whether a SectionChunk's suffix (the dollar and any trailing
+// suffix) should be removed and sorted into the main suffixless
+// PartialSection.
+static bool shouldStripSectionSuffix(SectionChunk *sc, StringRef name) {
+  // On MinGW, comdat groups are formed by putting the comdat group name
+  // after the '$' in the section name. For .eh_frame$<symbol>, that must
+  // still be sorted before the .eh_frame trailer from crtend.o, thus just
+  // strip the section name trailer. For other sections, such as
+  // .tls$$<symbol> (where non-comdat .tls symbols are otherwise stored in
+  // ".tls$"), they must be strictly sorted after .tls. And for the
+  // hypothetical case of comdat .CRT$XCU, we definitely need to keep the
+  // suffix for sorting. Thus, to play it safe, only strip the suffix for
+  // the standard sections.
+  if (!config->mingw)
+    return false;
+  if (!sc || !sc->isCOMDAT())
+    return false;
+  return name.startswith(".text$") || name.startswith(".data$") ||
+         name.startswith(".rdata$") || name.startswith(".pdata$") ||
+         name.startswith(".xdata$") || name.startswith(".eh_frame$");
 }
 
 // Create output section objects and add them to OutputSections.
 void Writer::createSections() {
   // First, create the builtin sections.
-  const uint32_t DATA = IMAGE_SCN_CNT_INITIALIZED_DATA;
-  const uint32_t BSS = IMAGE_SCN_CNT_UNINITIALIZED_DATA;
-  const uint32_t CODE = IMAGE_SCN_CNT_CODE;
-  const uint32_t DISCARDABLE = IMAGE_SCN_MEM_DISCARDABLE;
-  const uint32_t R = IMAGE_SCN_MEM_READ;
-  const uint32_t W = IMAGE_SCN_MEM_WRITE;
-  const uint32_t X = IMAGE_SCN_MEM_EXECUTE;
+  const uint32_t data = IMAGE_SCN_CNT_INITIALIZED_DATA;
+  const uint32_t bss = IMAGE_SCN_CNT_UNINITIALIZED_DATA;
+  const uint32_t code = IMAGE_SCN_CNT_CODE;
+  const uint32_t discardable = IMAGE_SCN_MEM_DISCARDABLE;
+  const uint32_t r = IMAGE_SCN_MEM_READ;
+  const uint32_t w = IMAGE_SCN_MEM_WRITE;
+  const uint32_t x = IMAGE_SCN_MEM_EXECUTE;
 
-  SmallDenseMap<std::pair<StringRef, uint32_t>, OutputSection *> Sections;
-  auto CreateSection = [&](StringRef Name, uint32_t OutChars) {
-    OutputSection *&Sec = Sections[{Name, OutChars}];
-    if (!Sec) {
-      Sec = make<OutputSection>(Name, OutChars);
-      OutputSections.push_back(Sec);
+  SmallDenseMap<std::pair<StringRef, uint32_t>, OutputSection *> sections;
+  auto createSection = [&](StringRef name, uint32_t outChars) {
+    OutputSection *&sec = sections[{name, outChars}];
+    if (!sec) {
+      sec = make<OutputSection>(name, outChars);
+      outputSections.push_back(sec);
     }
-    return Sec;
+    return sec;
   };
 
   // Try to match the section order used by link.exe.
-  TextSec = CreateSection(".text", CODE | R | X);
-  CreateSection(".bss", BSS | R | W);
-  RdataSec = CreateSection(".rdata", DATA | R);
-  BuildidSec = CreateSection(".buildid", DATA | R);
-  DataSec = CreateSection(".data", DATA | R | W);
-  PdataSec = CreateSection(".pdata", DATA | R);
-  IdataSec = CreateSection(".idata", DATA | R);
-  EdataSec = CreateSection(".edata", DATA | R);
-  DidatSec = CreateSection(".didat", DATA | R);
-  RsrcSec = CreateSection(".rsrc", DATA | R);
-  RelocSec = CreateSection(".reloc", DATA | DISCARDABLE | R);
-  CtorsSec = CreateSection(".ctors", DATA | R | W);
-  DtorsSec = CreateSection(".dtors", DATA | R | W);
+  textSec = createSection(".text", code | r | x);
+  createSection(".bss", bss | r | w);
+  rdataSec = createSection(".rdata", data | r);
+  buildidSec = createSection(".buildid", data | r);
+  dataSec = createSection(".data", data | r | w);
+  pdataSec = createSection(".pdata", data | r);
+  idataSec = createSection(".idata", data | r);
+  edataSec = createSection(".edata", data | r);
+  didatSec = createSection(".didat", data | r);
+  rsrcSec = createSection(".rsrc", data | r);
+  relocSec = createSection(".reloc", data | discardable | r);
+  ctorsSec = createSection(".ctors", data | r | w);
+  dtorsSec = createSection(".dtors", data | r | w);
 
   // Then bin chunks by name and output characteristics.
-  std::map<std::pair<StringRef, uint32_t>, std::vector<Chunk *>> Map;
-  for (Chunk *C : Symtab->getChunks()) {
-    auto *SC = dyn_cast<SectionChunk>(C);
-    if (SC && !SC->Live) {
-      if (Config->Verbose)
-        SC->printDiscardedMessage();
+  for (Chunk *c : symtab->getChunks()) {
+    auto *sc = dyn_cast<SectionChunk>(c);
+    if (sc && !sc->live) {
+      if (config->verbose)
+        sc->printDiscardedMessage();
       continue;
     }
-    Map[{C->getSectionName(), C->getOutputCharacteristics()}].push_back(C);
+    StringRef name = c->getSectionName();
+    if (shouldStripSectionSuffix(sc, name))
+      name = name.split('$').first;
+    PartialSection *pSec = createPartialSection(name,
+                                                c->getOutputCharacteristics());
+    pSec->chunks.push_back(c);
   }
 
+  fixPartialSectionChars(".rsrc", data | r);
   // Even in non MinGW cases, we might need to link against GNU import
   // libraries.
-  bool HasIdata = fixGnuImportChunks(Map);
-  if (!Idata.empty())
-    HasIdata = true;
+  bool hasIdata = fixGnuImportChunks();
+  if (!idata.empty())
+    hasIdata = true;
 
-  if (HasIdata)
-    addSyntheticIdata(Idata, Map);
+  if (hasIdata)
+    addSyntheticIdata();
 
   // Process an /order option.
-  if (!Config->Order.empty())
-    for (auto &Pair : Map)
-      sortBySectionOrder(Pair.second);
+  if (!config->order.empty())
+    for (auto it : partialSections)
+      sortBySectionOrder(it.second->chunks);
 
-  if (HasIdata)
-    locateImportTables(Map);
+  if (hasIdata)
+    locateImportTables();
 
   // Then create an OutputSection for each section.
   // '$' and all following characters in input section names are
   // discarded when determining output section. So, .text$foo
   // contributes to .text, for example. See PE/COFF spec 3.2.
-  for (auto &Pair : Map) {
-    StringRef Name = getOutputSectionName(Pair.first.first);
-    uint32_t OutChars = Pair.first.second;
+  for (auto it : partialSections) {
+    PartialSection *pSec = it.second;
+    StringRef name = getOutputSectionName(pSec->name);
+    uint32_t outChars = pSec->characteristics;
 
-    if (Name == ".CRT") {
+    if (name == ".CRT") {
       // In link.exe, there is a special case for the I386 target where .CRT
       // sections are treated as if they have output characteristics DATA | R if
       // their characteristics are DATA | R | W. This implements the same
       // special case for all architectures.
-      OutChars = DATA | R;
+      outChars = data | r;
 
-      log("Processing section " + Pair.first.first + " -> " + Name);
+      log("Processing section " + pSec->name + " -> " + name);
 
-      sortCRTSectionChunks(Pair.second);
+      sortCRTSectionChunks(pSec->chunks);
     }
 
-    OutputSection *Sec = CreateSection(Name, OutChars);
-    std::vector<Chunk *> &Chunks = Pair.second;
-    for (Chunk *C : Chunks)
-      Sec->addChunk(C);
+    OutputSection *sec = createSection(name, outChars);
+    for (Chunk *c : pSec->chunks)
+      sec->addChunk(c);
+
+    sec->addContributingPartialSection(pSec);
   }
 
   // Finally, move some output sections to the end.
-  auto SectionOrder = [&](OutputSection *S) {
-    // Move DISCARDABLE (or non-memory-mapped) sections to the end of file because
-    // the loader cannot handle holes. Stripping can remove other discardable ones
-    // than .reloc, which is first of them (created early).
-    if (S->Header.Characteristics & IMAGE_SCN_MEM_DISCARDABLE)
+  auto sectionOrder = [&](const OutputSection *s) {
+    // Move DISCARDABLE (or non-memory-mapped) sections to the end of file
+    // because the loader cannot handle holes. Stripping can remove other
+    // discardable ones than .reloc, which is first of them (created early).
+    if (s->header.Characteristics & IMAGE_SCN_MEM_DISCARDABLE)
       return 2;
     // .rsrc should come at the end of the non-discardable sections because its
     // size may change by the Win32 UpdateResources() function, causing
     // subsequent sections to move (see https://crbug.com/827082).
-    if (S == RsrcSec)
+    if (s == rsrcSec)
       return 1;
     return 0;
   };
-  std::stable_sort(OutputSections.begin(), OutputSections.end(),
-                   [&](OutputSection *S, OutputSection *T) {
-                     return SectionOrder(S) < SectionOrder(T);
-                   });
+  llvm::stable_sort(outputSections,
+                    [&](const OutputSection *s, const OutputSection *t) {
+                      return sectionOrder(s) < sectionOrder(t);
+                    });
 }
 
 void Writer::createMiscChunks() {
-  for (auto &P : MergeChunk::Instances)
-    RdataSec->addChunk(P.second);
+  for (MergeChunk *p : MergeChunk::instances) {
+    if (p) {
+      p->finalizeContents();
+      rdataSec->addChunk(p);
+    }
+  }
 
   // Create thunks for locally-dllimported symbols.
-  if (!Symtab->LocalImportChunks.empty()) {
-    for (Chunk *C : Symtab->LocalImportChunks)
-      RdataSec->addChunk(C);
+  if (!symtab->localImportChunks.empty()) {
+    for (Chunk *c : symtab->localImportChunks)
+      rdataSec->addChunk(c);
   }
 
   // Create Debug Information Chunks
-  OutputSection *DebugInfoSec = Config->MinGW ? BuildidSec : RdataSec;
-  if (Config->Debug || Config->Repro) {
-    DebugDirectory = make<DebugDirectoryChunk>(DebugRecords, Config->Repro);
-    DebugInfoSec->addChunk(DebugDirectory);
+  OutputSection *debugInfoSec = config->mingw ? buildidSec : rdataSec;
+  if (config->debug || config->repro) {
+    debugDirectory = make<DebugDirectoryChunk>(debugRecords, config->repro);
+    debugInfoSec->addChunk(debugDirectory);
   }
 
-  if (Config->Debug) {
+  if (config->debug) {
     // Make a CVDebugRecordChunk even when /DEBUG:CV is not specified.  We
     // output a PDB no matter what, and this chunk provides the only means of
     // allowing a debugger to match a PDB and an executable.  So we need it even
     // if we're ultimately not going to write CodeView data to the PDB.
-    BuildId = make<CVDebugRecordChunk>();
-    DebugRecords.push_back(BuildId);
+    buildId = make<CVDebugRecordChunk>();
+    debugRecords.push_back(buildId);
 
-    for (Chunk *C : DebugRecords)
-      DebugInfoSec->addChunk(C);
+    for (Chunk *c : debugRecords)
+      debugInfoSec->addChunk(c);
   }
 
   // Create SEH table. x86-only.
-  if (Config->Machine == I386)
+  if (config->safeSEH)
     createSEHTable();
 
   // Create /guard:cf tables if requested.
-  if (Config->GuardCF != GuardCFLevel::Off)
+  if (config->guardCF != GuardCFLevel::Off)
     createGuardCFTables();
 
-  if (Config->MinGW) {
+  if (config->mingw) {
     createRuntimePseudoRelocs();
 
     insertCtorDtorSymbols();
@@ -851,106 +958,123 @@ void Writer::createImportTables() {
   // Initialize DLLOrder so that import entries are ordered in
   // the same order as in the command line. (That affects DLL
   // initialization order, and this ordering is MSVC-compatible.)
-  for (ImportFile *File : ImportFile::Instances) {
-    if (!File->Live)
+  for (ImportFile *file : ImportFile::instances) {
+    if (!file->live)
       continue;
 
-    std::string DLL = StringRef(File->DLLName).lower();
-    if (Config->DLLOrder.count(DLL) == 0)
-      Config->DLLOrder[DLL] = Config->DLLOrder.size();
+    std::string dll = StringRef(file->dllName).lower();
+    if (config->dllOrder.count(dll) == 0)
+      config->dllOrder[dll] = config->dllOrder.size();
 
-    if (File->ImpSym && !isa<DefinedImportData>(File->ImpSym))
-      fatal(toString(*File->ImpSym) + " was replaced");
-    DefinedImportData *ImpSym = cast_or_null<DefinedImportData>(File->ImpSym);
-    if (Config->DelayLoads.count(StringRef(File->DLLName).lower())) {
-      if (!File->ThunkSym)
-        fatal("cannot delay-load " + toString(File) +
-              " due to import of data: " + toString(*ImpSym));
-      DelayIdata.add(ImpSym);
+    if (file->impSym && !isa<DefinedImportData>(file->impSym))
+      fatal(toString(*file->impSym) + " was replaced");
+    DefinedImportData *impSym = cast_or_null<DefinedImportData>(file->impSym);
+    if (config->delayLoads.count(StringRef(file->dllName).lower())) {
+      if (!file->thunkSym)
+        fatal("cannot delay-load " + toString(file) +
+              " due to import of data: " + toString(*impSym));
+      delayIdata.add(impSym);
     } else {
-      Idata.add(ImpSym);
+      idata.add(impSym);
     }
   }
 }
 
 void Writer::appendImportThunks() {
-  if (ImportFile::Instances.empty())
+  if (ImportFile::instances.empty())
     return;
 
-  for (ImportFile *File : ImportFile::Instances) {
-    if (!File->Live)
+  for (ImportFile *file : ImportFile::instances) {
+    if (!file->live)
       continue;
 
-    if (!File->ThunkSym)
+    if (!file->thunkSym)
       continue;
 
-    if (!isa<DefinedImportThunk>(File->ThunkSym))
-      fatal(toString(*File->ThunkSym) + " was replaced");
-    DefinedImportThunk *Thunk = cast<DefinedImportThunk>(File->ThunkSym);
-    if (File->ThunkLive)
-      TextSec->addChunk(Thunk->getChunk());
+    if (!isa<DefinedImportThunk>(file->thunkSym))
+      fatal(toString(*file->thunkSym) + " was replaced");
+    DefinedImportThunk *thunk = cast<DefinedImportThunk>(file->thunkSym);
+    if (file->thunkLive)
+      textSec->addChunk(thunk->getChunk());
   }
 
-  if (!DelayIdata.empty()) {
-    Defined *Helper = cast<Defined>(Config->DelayLoadHelper);
-    DelayIdata.create(Helper);
-    for (Chunk *C : DelayIdata.getChunks())
-      DidatSec->addChunk(C);
-    for (Chunk *C : DelayIdata.getDataChunks())
-      DataSec->addChunk(C);
-    for (Chunk *C : DelayIdata.getCodeChunks())
-      TextSec->addChunk(C);
+  if (!delayIdata.empty()) {
+    Defined *helper = cast<Defined>(config->delayLoadHelper);
+    delayIdata.create(helper);
+    for (Chunk *c : delayIdata.getChunks())
+      didatSec->addChunk(c);
+    for (Chunk *c : delayIdata.getDataChunks())
+      dataSec->addChunk(c);
+    for (Chunk *c : delayIdata.getCodeChunks())
+      textSec->addChunk(c);
   }
 }
 
 void Writer::createExportTable() {
-  if (Config->Exports.empty())
+  if (config->exports.empty())
     return;
-  for (Chunk *C : Edata.Chunks)
-    EdataSec->addChunk(C);
+  for (Chunk *c : edata.chunks)
+    edataSec->addChunk(c);
 }
 
 void Writer::removeUnusedSections() {
   // Remove sections that we can be sure won't get content, to avoid
   // allocating space for their section headers.
-  auto IsUnused = [this](OutputSection *S) {
-    if (S == RelocSec)
+  auto isUnused = [this](OutputSection *s) {
+    if (s == relocSec)
       return false; // This section is populated later.
     // MergeChunks have zero size at this point, as their size is finalized
     // later. Only remove sections that have no Chunks at all.
-    return S->Chunks.empty();
+    return s->chunks.empty();
   };
-  OutputSections.erase(
-      std::remove_if(OutputSections.begin(), OutputSections.end(), IsUnused),
-      OutputSections.end());
+  outputSections.erase(
+      std::remove_if(outputSections.begin(), outputSections.end(), isUnused),
+      outputSections.end());
 }
 
 // The Windows loader doesn't seem to like empty sections,
 // so we remove them if any.
 void Writer::removeEmptySections() {
-  auto IsEmpty = [](OutputSection *S) { return S->getVirtualSize() == 0; };
-  OutputSections.erase(
-      std::remove_if(OutputSections.begin(), OutputSections.end(), IsEmpty),
-      OutputSections.end());
-  uint32_t Idx = 1;
-  for (OutputSection *Sec : OutputSections)
-    Sec->SectionIndex = Idx++;
+  auto isEmpty = [](OutputSection *s) { return s->getVirtualSize() == 0; };
+  outputSections.erase(
+      std::remove_if(outputSections.begin(), outputSections.end(), isEmpty),
+      outputSections.end());
 }
 
-size_t Writer::addEntryToStringTable(StringRef Str) {
-  assert(Str.size() > COFF::NameSize);
-  size_t OffsetOfEntry = Strtab.size() + 4; // +4 for the size field
-  Strtab.insert(Strtab.end(), Str.begin(), Str.end());
-  Strtab.push_back('\0');
-  return OffsetOfEntry;
+void Writer::assignOutputSectionIndices() {
+  // Assign final output section indices, and assign each chunk to its output
+  // section.
+  uint32_t idx = 1;
+  for (OutputSection *os : outputSections) {
+    os->sectionIndex = idx;
+    for (Chunk *c : os->chunks)
+      c->setOutputSectionIdx(idx);
+    ++idx;
+  }
+
+  // Merge chunks are containers of chunks, so assign those an output section
+  // too.
+  for (MergeChunk *mc : MergeChunk::instances)
+    if (mc)
+      for (SectionChunk *sc : mc->sections)
+        if (sc && sc->live)
+          sc->setOutputSectionIdx(mc->getOutputSectionIdx());
+}
+
+size_t Writer::addEntryToStringTable(StringRef str) {
+  assert(str.size() > COFF::NameSize);
+  size_t offsetOfEntry = strtab.size() + 4; // +4 for the size field
+  strtab.insert(strtab.end(), str.begin(), str.end());
+  strtab.push_back('\0');
+  return offsetOfEntry;
 }
 
-Optional<coff_symbol16> Writer::createSymbol(Defined *Def) {
-  coff_symbol16 Sym;
-  switch (Def->kind()) {
+Optional<coff_symbol16> Writer::createSymbol(Defined *def) {
+  coff_symbol16 sym;
+  switch (def->kind()) {
   case Symbol::DefinedAbsoluteKind:
-    Sym.Value = Def->getRVA();
-    Sym.SectionNumber = IMAGE_SYM_ABSOLUTE;
+    sym.Value = def->getRVA();
+    sym.SectionNumber = IMAGE_SYM_ABSOLUTE;
     break;
   case Symbol::DefinedSyntheticKind:
     // Relative symbols are unrepresentable in a COFF symbol table.
@@ -958,38 +1082,38 @@ Optional<coff_symbol16> Writer::createSymbol(Defined *Def) {
   default: {
     // Don't write symbols that won't be written to the output to the symbol
     // table.
-    Chunk *C = Def->getChunk();
-    if (!C)
+    Chunk *c = def->getChunk();
+    if (!c)
       return None;
-    OutputSection *OS = C->getOutputSection();
-    if (!OS)
+    OutputSection *os = c->getOutputSection();
+    if (!os)
       return None;
 
-    Sym.Value = Def->getRVA() - OS->getRVA();
-    Sym.SectionNumber = OS->SectionIndex;
+    sym.Value = def->getRVA() - os->getRVA();
+    sym.SectionNumber = os->sectionIndex;
     break;
   }
   }
 
-  StringRef Name = Def->getName();
-  if (Name.size() > COFF::NameSize) {
-    Sym.Name.Offset.Zeroes = 0;
-    Sym.Name.Offset.Offset = addEntryToStringTable(Name);
+  StringRef name = def->getName();
+  if (name.size() > COFF::NameSize) {
+    sym.Name.Offset.Zeroes = 0;
+    sym.Name.Offset.Offset = addEntryToStringTable(name);
   } else {
-    memset(Sym.Name.ShortName, 0, COFF::NameSize);
-    memcpy(Sym.Name.ShortName, Name.data(), Name.size());
+    memset(sym.Name.ShortName, 0, COFF::NameSize);
+    memcpy(sym.Name.ShortName, name.data(), name.size());
   }
 
-  if (auto *D = dyn_cast<DefinedCOFF>(Def)) {
-    COFFSymbolRef Ref = D->getCOFFSymbol();
-    Sym.Type = Ref.getType();
-    Sym.StorageClass = Ref.getStorageClass();
+  if (auto *d = dyn_cast<DefinedCOFF>(def)) {
+    COFFSymbolRef ref = d->getCOFFSymbol();
+    sym.Type = ref.getType();
+    sym.StorageClass = ref.getStorageClass();
   } else {
-    Sym.Type = IMAGE_SYM_TYPE_NULL;
-    Sym.StorageClass = IMAGE_SYM_CLASS_EXTERNAL;
+    sym.Type = IMAGE_SYM_TYPE_NULL;
+    sym.StorageClass = IMAGE_SYM_CLASS_EXTERNAL;
   }
-  Sym.NumberOfAuxSymbols = 0;
-  return Sym;
+  sym.NumberOfAuxSymbols = 0;
+  return sym;
 }
 
 void Writer::createSymbolAndStringTable() {
@@ -1001,113 +1125,120 @@ void Writer::createSymbolAndStringTable() {
   // solution where discardable sections have long names preserved and
   // non-discardable sections have their names truncated, to ensure that any
   // section which is mapped at runtime also has its name mapped at runtime.
-  for (OutputSection *Sec : OutputSections) {
-    if (Sec->Name.size() <= COFF::NameSize)
+  for (OutputSection *sec : outputSections) {
+    if (sec->name.size() <= COFF::NameSize)
       continue;
-    if ((Sec->Header.Characteristics & IMAGE_SCN_MEM_DISCARDABLE) == 0)
+    if ((sec->header.Characteristics & IMAGE_SCN_MEM_DISCARDABLE) == 0)
       continue;
-    Sec->setStringTableOff(addEntryToStringTable(Sec->Name));
+    sec->setStringTableOff(addEntryToStringTable(sec->name));
   }
 
-  if (Config->DebugDwarf || Config->DebugSymtab) {
-    for (ObjFile *File : ObjFile::Instances) {
-      for (Symbol *B : File->getSymbols()) {
-        auto *D = dyn_cast_or_null<Defined>(B);
-        if (!D || D->WrittenToSymtab)
+  if (config->debugDwarf || config->debugSymtab) {
+    for (ObjFile *file : ObjFile::instances) {
+      for (Symbol *b : file->getSymbols()) {
+        auto *d = dyn_cast_or_null<Defined>(b);
+        if (!d || d->writtenToSymtab)
           continue;
-        D->WrittenToSymtab = true;
+        d->writtenToSymtab = true;
 
-        if (Optional<coff_symbol16> Sym = createSymbol(D))
-          OutputSymtab.push_back(*Sym);
+        if (Optional<coff_symbol16> sym = createSymbol(d))
+          outputSymtab.push_back(*sym);
       }
     }
   }
 
-  if (OutputSymtab.empty() && Strtab.empty())
+  if (outputSymtab.empty() && strtab.empty())
     return;
 
   // We position the symbol table to be adjacent to the end of the last section.
-  uint64_t FileOff = FileSize;
-  PointerToSymbolTable = FileOff;
-  FileOff += OutputSymtab.size() * sizeof(coff_symbol16);
-  FileOff += 4 + Strtab.size();
-  FileSize = alignTo(FileOff, SectorSize);
+  uint64_t fileOff = fileSize;
+  pointerToSymbolTable = fileOff;
+  fileOff += outputSymtab.size() * sizeof(coff_symbol16);
+  fileOff += 4 + strtab.size();
+  fileSize = alignTo(fileOff, config->fileAlign);
 }
 
 void Writer::mergeSections() {
-  if (!PdataSec->Chunks.empty()) {
-    FirstPdata = PdataSec->Chunks.front();
-    LastPdata = PdataSec->Chunks.back();
+  if (!pdataSec->chunks.empty()) {
+    firstPdata = pdataSec->chunks.front();
+    lastPdata = pdataSec->chunks.back();
   }
 
-  for (auto &P : Config->Merge) {
-    StringRef ToName = P.second;
-    if (P.first == ToName)
+  for (auto &p : config->merge) {
+    StringRef toName = p.second;
+    if (p.first == toName)
       continue;
-    StringSet<> Names;
+    StringSet<> names;
     while (1) {
-      if (!Names.insert(ToName).second)
-        fatal("/merge: cycle found for section '" + P.first + "'");
-      auto I = Config->Merge.find(ToName);
-      if (I == Config->Merge.end())
+      if (!names.insert(toName).second)
+        fatal("/merge: cycle found for section '" + p.first + "'");
+      auto i = config->merge.find(toName);
+      if (i == config->merge.end())
         break;
-      ToName = I->second;
+      toName = i->second;
     }
-    OutputSection *From = findSection(P.first);
-    OutputSection *To = findSection(ToName);
-    if (!From)
+    OutputSection *from = findSection(p.first);
+    OutputSection *to = findSection(toName);
+    if (!from)
       continue;
-    if (!To) {
-      From->Name = ToName;
+    if (!to) {
+      from->name = toName;
       continue;
     }
-    To->merge(From);
+    to->merge(from);
   }
 }
 
-// Visits all sections to initialize their relocation targets.
-void Writer::readRelocTargets() {
-  for (OutputSection *Sec : OutputSections)
-    for_each(parallel::par, Sec->Chunks.begin(), Sec->Chunks.end(),
-             [&](Chunk *C) { C->readRelocTargets(); });
-}
-
 // Visits all sections to assign incremental, non-overlapping RVAs and
 // file offsets.
 void Writer::assignAddresses() {
-  SizeOfHeaders = DOSStubSize + sizeof(PEMagic) + sizeof(coff_file_header) +
-                  sizeof(data_directory) * NumberOfDataDirectory +
-                  sizeof(coff_section) * OutputSections.size();
-  SizeOfHeaders +=
-      Config->is64() ? sizeof(pe32plus_header) : sizeof(pe32_header);
-  SizeOfHeaders = alignTo(SizeOfHeaders, SectorSize);
-  uint64_t RVA = PageSize; // The first page is kept unmapped.
-  FileSize = SizeOfHeaders;
+  sizeOfHeaders = dosStubSize + sizeof(PEMagic) + sizeof(coff_file_header) +
+                  sizeof(data_directory) * numberOfDataDirectory +
+                  sizeof(coff_section) * outputSections.size();
+  sizeOfHeaders +=
+      config->is64() ? sizeof(pe32plus_header) : sizeof(pe32_header);
+  sizeOfHeaders = alignTo(sizeOfHeaders, config->fileAlign);
+  uint64_t rva = pageSize; // The first page is kept unmapped.
+  fileSize = sizeOfHeaders;
 
-  for (OutputSection *Sec : OutputSections) {
-    if (Sec == RelocSec)
+  for (OutputSection *sec : outputSections) {
+    if (sec == relocSec)
       addBaserels();
-    uint64_t RawSize = 0, VirtualSize = 0;
-    Sec->Header.VirtualAddress = RVA;
-    for (Chunk *C : Sec->Chunks) {
-      VirtualSize = alignTo(VirtualSize, C->Alignment);
-      C->setRVA(RVA + VirtualSize);
-      C->OutputSectionOff = VirtualSize;
-      C->finalizeContents();
-      VirtualSize += C->getSize();
-      if (C->hasData())
-        RawSize = alignTo(VirtualSize, SectorSize);
+    uint64_t rawSize = 0, virtualSize = 0;
+    sec->header.VirtualAddress = rva;
+
+    // If /FUNCTIONPADMIN is used, functions are padded in order to create a
+    // hotpatchable image.
+    const bool isCodeSection =
+        (sec->header.Characteristics & IMAGE_SCN_CNT_CODE) &&
+        (sec->header.Characteristics & IMAGE_SCN_MEM_READ) &&
+        (sec->header.Characteristics & IMAGE_SCN_MEM_EXECUTE);
+    uint32_t padding = isCodeSection ? config->functionPadMin : 0;
+
+    for (Chunk *c : sec->chunks) {
+      if (padding && c->isHotPatchable())
+        virtualSize += padding;
+      virtualSize = alignTo(virtualSize, c->getAlignment());
+      c->setRVA(rva + virtualSize);
+      virtualSize += c->getSize();
+      if (c->hasData)
+        rawSize = alignTo(virtualSize, config->fileAlign);
     }
-    if (VirtualSize > UINT32_MAX)
-      error("section larger than 4 GiB: " + Sec->Name);
-    Sec->Header.VirtualSize = VirtualSize;
-    Sec->Header.SizeOfRawData = RawSize;
-    if (RawSize != 0)
-      Sec->Header.PointerToRawData = FileSize;
-    RVA += alignTo(VirtualSize, PageSize);
-    FileSize += alignTo(RawSize, SectorSize);
+    if (virtualSize > UINT32_MAX)
+      error("section larger than 4 GiB: " + sec->name);
+    sec->header.VirtualSize = virtualSize;
+    sec->header.SizeOfRawData = rawSize;
+    if (rawSize != 0)
+      sec->header.PointerToRawData = fileSize;
+    rva += alignTo(virtualSize, pageSize);
+    fileSize += alignTo(rawSize, config->fileAlign);
   }
-  SizeOfImage = alignTo(RVA, PageSize);
+  sizeOfImage = alignTo(rva, pageSize);
+
+  // Assign addresses to sections in MergeChunks.
+  for (MergeChunk *mc : MergeChunk::instances)
+    if (mc)
+      mc->assignSubsectionRVAs();
 }
 
 template <typename PEHeaderTy> void Writer::writeHeader() {
@@ -1116,275 +1247,299 @@ template <typename PEHeaderTy> void Writer::writeHeader() {
   // under DOS, that program gets run (usually to just print an error message).
   // When run under Windows, the loader looks at AddressOfNewExeHeader and uses
   // the PE header instead.
-  uint8_t *Buf = Buffer->getBufferStart();
-  auto *DOS = reinterpret_cast<dos_header *>(Buf);
-  Buf += sizeof(dos_header);
-  DOS->Magic[0] = 'M';
-  DOS->Magic[1] = 'Z';
-  DOS->UsedBytesInTheLastPage = DOSStubSize % 512;
-  DOS->FileSizeInPages = divideCeil(DOSStubSize, 512);
-  DOS->HeaderSizeInParagraphs = sizeof(dos_header) / 16;
+  uint8_t *buf = buffer->getBufferStart();
+  auto *dos = reinterpret_cast<dos_header *>(buf);
+  buf += sizeof(dos_header);
+  dos->Magic[0] = 'M';
+  dos->Magic[1] = 'Z';
+  dos->UsedBytesInTheLastPage = dosStubSize % 512;
+  dos->FileSizeInPages = divideCeil(dosStubSize, 512);
+  dos->HeaderSizeInParagraphs = sizeof(dos_header) / 16;
 
-  DOS->AddressOfRelocationTable = sizeof(dos_header);
-  DOS->AddressOfNewExeHeader = DOSStubSize;
+  dos->AddressOfRelocationTable = sizeof(dos_header);
+  dos->AddressOfNewExeHeader = dosStubSize;
 
   // Write DOS program.
-  memcpy(Buf, DOSProgram, sizeof(DOSProgram));
-  Buf += sizeof(DOSProgram);
+  memcpy(buf, dosProgram, sizeof(dosProgram));
+  buf += sizeof(dosProgram);
 
   // Write PE magic
-  memcpy(Buf, PEMagic, sizeof(PEMagic));
-  Buf += sizeof(PEMagic);
+  memcpy(buf, PEMagic, sizeof(PEMagic));
+  buf += sizeof(PEMagic);
 
   // Write COFF header
-  auto *COFF = reinterpret_cast<coff_file_header *>(Buf);
-  Buf += sizeof(*COFF);
-  COFF->Machine = Config->Machine;
-  COFF->NumberOfSections = OutputSections.size();
-  COFF->Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE;
-  if (Config->LargeAddressAware)
-    COFF->Characteristics |= IMAGE_FILE_LARGE_ADDRESS_AWARE;
-  if (!Config->is64())
-    COFF->Characteristics |= IMAGE_FILE_32BIT_MACHINE;
-  if (Config->DLL)
-    COFF->Characteristics |= IMAGE_FILE_DLL;
-  if (!Config->Relocatable)
-    COFF->Characteristics |= IMAGE_FILE_RELOCS_STRIPPED;
-  COFF->SizeOfOptionalHeader =
-      sizeof(PEHeaderTy) + sizeof(data_directory) * NumberOfDataDirectory;
+  auto *coff = reinterpret_cast<coff_file_header *>(buf);
+  buf += sizeof(*coff);
+  coff->Machine = config->machine;
+  coff->NumberOfSections = outputSections.size();
+  coff->Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE;
+  if (config->largeAddressAware)
+    coff->Characteristics |= IMAGE_FILE_LARGE_ADDRESS_AWARE;
+  if (!config->is64())
+    coff->Characteristics |= IMAGE_FILE_32BIT_MACHINE;
+  if (config->dll)
+    coff->Characteristics |= IMAGE_FILE_DLL;
+  if (!config->relocatable)
+    coff->Characteristics |= IMAGE_FILE_RELOCS_STRIPPED;
+  if (config->swaprunCD)
+    coff->Characteristics |= IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP;
+  if (config->swaprunNet)
+    coff->Characteristics |= IMAGE_FILE_NET_RUN_FROM_SWAP;
+  coff->SizeOfOptionalHeader =
+      sizeof(PEHeaderTy) + sizeof(data_directory) * numberOfDataDirectory;
 
   // Write PE header
-  auto *PE = reinterpret_cast<PEHeaderTy *>(Buf);
-  Buf += sizeof(*PE);
-  PE->Magic = Config->is64() ? PE32Header::PE32_PLUS : PE32Header::PE32;
+  auto *pe = reinterpret_cast<PEHeaderTy *>(buf);
+  buf += sizeof(*pe);
+  pe->Magic = config->is64() ? PE32Header::PE32_PLUS : PE32Header::PE32;
 
   // If {Major,Minor}LinkerVersion is left at 0.0, then for some
   // reason signing the resulting PE file with Authenticode produces a
   // signature that fails to validate on Windows 7 (but is OK on 10).
   // Set it to 14.0, which is what VS2015 outputs, and which avoids
   // that problem.
-  PE->MajorLinkerVersion = 14;
-  PE->MinorLinkerVersion = 0;
+  pe->MajorLinkerVersion = 14;
+  pe->MinorLinkerVersion = 0;
 
-  PE->ImageBase = Config->ImageBase;
-  PE->SectionAlignment = PageSize;
-  PE->FileAlignment = SectorSize;
-  PE->MajorImageVersion = Config->MajorImageVersion;
-  PE->MinorImageVersion = Config->MinorImageVersion;
-  PE->MajorOperatingSystemVersion = Config->MajorOSVersion;
-  PE->MinorOperatingSystemVersion = Config->MinorOSVersion;
-  PE->MajorSubsystemVersion = Config->MajorOSVersion;
-  PE->MinorSubsystemVersion = Config->MinorOSVersion;
-  PE->Subsystem = Config->Subsystem;
-  PE->SizeOfImage = SizeOfImage;
-  PE->SizeOfHeaders = SizeOfHeaders;
-  if (!Config->NoEntry) {
-    Defined *Entry = cast<Defined>(Config->Entry);
-    PE->AddressOfEntryPoint = Entry->getRVA();
+  pe->ImageBase = config->imageBase;
+  pe->SectionAlignment = pageSize;
+  pe->FileAlignment = config->fileAlign;
+  pe->MajorImageVersion = config->majorImageVersion;
+  pe->MinorImageVersion = config->minorImageVersion;
+  pe->MajorOperatingSystemVersion = config->majorOSVersion;
+  pe->MinorOperatingSystemVersion = config->minorOSVersion;
+  pe->MajorSubsystemVersion = config->majorOSVersion;
+  pe->MinorSubsystemVersion = config->minorOSVersion;
+  pe->Subsystem = config->subsystem;
+  pe->SizeOfImage = sizeOfImage;
+  pe->SizeOfHeaders = sizeOfHeaders;
+  if (!config->noEntry) {
+    Defined *entry = cast<Defined>(config->entry);
+    pe->AddressOfEntryPoint = entry->getRVA();
     // Pointer to thumb code must have the LSB set, so adjust it.
-    if (Config->Machine == ARMNT)
-      PE->AddressOfEntryPoint |= 1;
+    if (config->machine == ARMNT)
+      pe->AddressOfEntryPoint |= 1;
   }
-  PE->SizeOfStackReserve = Config->StackReserve;
-  PE->SizeOfStackCommit = Config->StackCommit;
-  PE->SizeOfHeapReserve = Config->HeapReserve;
-  PE->SizeOfHeapCommit = Config->HeapCommit;
-  if (Config->AppContainer)
-    PE->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_APPCONTAINER;
-  if (Config->DynamicBase)
-    PE->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE;
-  if (Config->HighEntropyVA)
-    PE->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA;
-  if (!Config->AllowBind)
-    PE->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_NO_BIND;
-  if (Config->NxCompat)
-    PE->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_NX_COMPAT;
-  if (!Config->AllowIsolation)
-    PE->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_NO_ISOLATION;
-  if (Config->GuardCF != GuardCFLevel::Off)
-    PE->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_GUARD_CF;
-  if (Config->IntegrityCheck)
-    PE->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY;
-  if (SetNoSEHCharacteristic)
-    PE->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_NO_SEH;
-  if (Config->TerminalServerAware)
-    PE->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE;
-  PE->NumberOfRvaAndSize = NumberOfDataDirectory;
-  if (TextSec->getVirtualSize()) {
-    PE->BaseOfCode = TextSec->getRVA();
-    PE->SizeOfCode = TextSec->getRawSize();
+  pe->SizeOfStackReserve = config->stackReserve;
+  pe->SizeOfStackCommit = config->stackCommit;
+  pe->SizeOfHeapReserve = config->heapReserve;
+  pe->SizeOfHeapCommit = config->heapCommit;
+  if (config->appContainer)
+    pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_APPCONTAINER;
+  if (config->dynamicBase)
+    pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE;
+  if (config->highEntropyVA)
+    pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA;
+  if (!config->allowBind)
+    pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_NO_BIND;
+  if (config->nxCompat)
+    pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_NX_COMPAT;
+  if (!config->allowIsolation)
+    pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_NO_ISOLATION;
+  if (config->guardCF != GuardCFLevel::Off)
+    pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_GUARD_CF;
+  if (config->integrityCheck)
+    pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY;
+  if (setNoSEHCharacteristic)
+    pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_NO_SEH;
+  if (config->terminalServerAware)
+    pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE;
+  pe->NumberOfRvaAndSize = numberOfDataDirectory;
+  if (textSec->getVirtualSize()) {
+    pe->BaseOfCode = textSec->getRVA();
+    pe->SizeOfCode = textSec->getRawSize();
   }
-  PE->SizeOfInitializedData = getSizeOfInitializedData();
+  pe->SizeOfInitializedData = getSizeOfInitializedData();
 
   // Write data directory
-  auto *Dir = reinterpret_cast<data_directory *>(Buf);
-  Buf += sizeof(*Dir) * NumberOfDataDirectory;
-  if (!Config->Exports.empty()) {
-    Dir[EXPORT_TABLE].RelativeVirtualAddress = Edata.getRVA();
-    Dir[EXPORT_TABLE].Size = Edata.getSize();
+  auto *dir = reinterpret_cast<data_directory *>(buf);
+  buf += sizeof(*dir) * numberOfDataDirectory;
+  if (!config->exports.empty()) {
+    dir[EXPORT_TABLE].RelativeVirtualAddress = edata.getRVA();
+    dir[EXPORT_TABLE].Size = edata.getSize();
   }
-  if (ImportTableStart) {
-    Dir[IMPORT_TABLE].RelativeVirtualAddress = ImportTableStart->getRVA();
-    Dir[IMPORT_TABLE].Size = ImportTableSize;
+  if (importTableStart) {
+    dir[IMPORT_TABLE].RelativeVirtualAddress = importTableStart->getRVA();
+    dir[IMPORT_TABLE].Size = importTableSize;
   }
-  if (IATStart) {
-    Dir[IAT].RelativeVirtualAddress = IATStart->getRVA();
-    Dir[IAT].Size = IATSize;
+  if (iatStart) {
+    dir[IAT].RelativeVirtualAddress = iatStart->getRVA();
+    dir[IAT].Size = iatSize;
   }
-  if (RsrcSec->getVirtualSize()) {
-    Dir[RESOURCE_TABLE].RelativeVirtualAddress = RsrcSec->getRVA();
-    Dir[RESOURCE_TABLE].Size = RsrcSec->getVirtualSize();
+  if (rsrcSec->getVirtualSize()) {
+    dir[RESOURCE_TABLE].RelativeVirtualAddress = rsrcSec->getRVA();
+    dir[RESOURCE_TABLE].Size = rsrcSec->getVirtualSize();
   }
-  if (FirstPdata) {
-    Dir[EXCEPTION_TABLE].RelativeVirtualAddress = FirstPdata->getRVA();
-    Dir[EXCEPTION_TABLE].Size =
-        LastPdata->getRVA() + LastPdata->getSize() - FirstPdata->getRVA();
+  if (firstPdata) {
+    dir[EXCEPTION_TABLE].RelativeVirtualAddress = firstPdata->getRVA();
+    dir[EXCEPTION_TABLE].Size =
+        lastPdata->getRVA() + lastPdata->getSize() - firstPdata->getRVA();
   }
-  if (RelocSec->getVirtualSize()) {
-    Dir[BASE_RELOCATION_TABLE].RelativeVirtualAddress = RelocSec->getRVA();
-    Dir[BASE_RELOCATION_TABLE].Size = RelocSec->getVirtualSize();
+  if (relocSec->getVirtualSize()) {
+    dir[BASE_RELOCATION_TABLE].RelativeVirtualAddress = relocSec->getRVA();
+    dir[BASE_RELOCATION_TABLE].Size = relocSec->getVirtualSize();
   }
-  if (Symbol *Sym = Symtab->findUnderscore("_tls_used")) {
-    if (Defined *B = dyn_cast<Defined>(Sym)) {
-      Dir[TLS_TABLE].RelativeVirtualAddress = B->getRVA();
-      Dir[TLS_TABLE].Size = Config->is64()
+  if (Symbol *sym = symtab->findUnderscore("_tls_used")) {
+    if (Defined *b = dyn_cast<Defined>(sym)) {
+      dir[TLS_TABLE].RelativeVirtualAddress = b->getRVA();
+      dir[TLS_TABLE].Size = config->is64()
                                 ? sizeof(object::coff_tls_directory64)
                                 : sizeof(object::coff_tls_directory32);
     }
   }
-  if (DebugDirectory) {
-    Dir[DEBUG_DIRECTORY].RelativeVirtualAddress = DebugDirectory->getRVA();
-    Dir[DEBUG_DIRECTORY].Size = DebugDirectory->getSize();
+  if (debugDirectory) {
+    dir[DEBUG_DIRECTORY].RelativeVirtualAddress = debugDirectory->getRVA();
+    dir[DEBUG_DIRECTORY].Size = debugDirectory->getSize();
   }
-  if (Symbol *Sym = Symtab->findUnderscore("_load_config_used")) {
-    if (auto *B = dyn_cast<DefinedRegular>(Sym)) {
-      SectionChunk *SC = B->getChunk();
-      assert(B->getRVA() >= SC->getRVA());
-      uint64_t OffsetInChunk = B->getRVA() - SC->getRVA();
-      if (!SC->hasData() || OffsetInChunk + 4 > SC->getSize())
+  if (Symbol *sym = symtab->findUnderscore("_load_config_used")) {
+    if (auto *b = dyn_cast<DefinedRegular>(sym)) {
+      SectionChunk *sc = b->getChunk();
+      assert(b->getRVA() >= sc->getRVA());
+      uint64_t offsetInChunk = b->getRVA() - sc->getRVA();
+      if (!sc->hasData || offsetInChunk + 4 > sc->getSize())
         fatal("_load_config_used is malformed");
 
-      ArrayRef<uint8_t> SecContents = SC->getContents();
-      uint32_t LoadConfigSize =
-          *reinterpret_cast<const ulittle32_t *>(&SecContents[OffsetInChunk]);
-      if (OffsetInChunk + LoadConfigSize > SC->getSize())
+      ArrayRef<uint8_t> secContents = sc->getContents();
+      uint32_t loadConfigSize =
+          *reinterpret_cast<const ulittle32_t *>(&secContents[offsetInChunk]);
+      if (offsetInChunk + loadConfigSize > sc->getSize())
         fatal("_load_config_used is too large");
-      Dir[LOAD_CONFIG_TABLE].RelativeVirtualAddress = B->getRVA();
-      Dir[LOAD_CONFIG_TABLE].Size = LoadConfigSize;
+      dir[LOAD_CONFIG_TABLE].RelativeVirtualAddress = b->getRVA();
+      dir[LOAD_CONFIG_TABLE].Size = loadConfigSize;
     }
   }
-  if (!DelayIdata.empty()) {
-    Dir[DELAY_IMPORT_DESCRIPTOR].RelativeVirtualAddress =
-        DelayIdata.getDirRVA();
-    Dir[DELAY_IMPORT_DESCRIPTOR].Size = DelayIdata.getDirSize();
+  if (!delayIdata.empty()) {
+    dir[DELAY_IMPORT_DESCRIPTOR].RelativeVirtualAddress =
+        delayIdata.getDirRVA();
+    dir[DELAY_IMPORT_DESCRIPTOR].Size = delayIdata.getDirSize();
   }
 
   // Write section table
-  for (OutputSection *Sec : OutputSections) {
-    Sec->writeHeaderTo(Buf);
-    Buf += sizeof(coff_section);
+  for (OutputSection *sec : outputSections) {
+    sec->writeHeaderTo(buf);
+    buf += sizeof(coff_section);
   }
-  SectionTable = ArrayRef<uint8_t>(
-      Buf - OutputSections.size() * sizeof(coff_section), Buf);
+  sectionTable = ArrayRef<uint8_t>(
+      buf - outputSections.size() * sizeof(coff_section), buf);
 
-  if (OutputSymtab.empty() && Strtab.empty())
+  if (outputSymtab.empty() && strtab.empty())
     return;
 
-  COFF->PointerToSymbolTable = PointerToSymbolTable;
-  uint32_t NumberOfSymbols = OutputSymtab.size();
-  COFF->NumberOfSymbols = NumberOfSymbols;
-  auto *SymbolTable = reinterpret_cast<coff_symbol16 *>(
-      Buffer->getBufferStart() + COFF->PointerToSymbolTable);
-  for (size_t I = 0; I != NumberOfSymbols; ++I)
-    SymbolTable[I] = OutputSymtab[I];
+  coff->PointerToSymbolTable = pointerToSymbolTable;
+  uint32_t numberOfSymbols = outputSymtab.size();
+  coff->NumberOfSymbols = numberOfSymbols;
+  auto *symbolTable = reinterpret_cast<coff_symbol16 *>(
+      buffer->getBufferStart() + coff->PointerToSymbolTable);
+  for (size_t i = 0; i != numberOfSymbols; ++i)
+    symbolTable[i] = outputSymtab[i];
   // Create the string table, it follows immediately after the symbol table.
   // The first 4 bytes is length including itself.
-  Buf = reinterpret_cast<uint8_t *>(&SymbolTable[NumberOfSymbols]);
-  write32le(Buf, Strtab.size() + 4);
-  if (!Strtab.empty())
-    memcpy(Buf + 4, Strtab.data(), Strtab.size());
+  buf = reinterpret_cast<uint8_t *>(&symbolTable[numberOfSymbols]);
+  write32le(buf, strtab.size() + 4);
+  if (!strtab.empty())
+    memcpy(buf + 4, strtab.data(), strtab.size());
 }
 
-void Writer::openFile(StringRef Path) {
-  Buffer = CHECK(
-      FileOutputBuffer::create(Path, FileSize, FileOutputBuffer::F_executable),
-      "failed to open " + Path);
+void Writer::openFile(StringRef path) {
+  buffer = CHECK(
+      FileOutputBuffer::create(path, fileSize, FileOutputBuffer::F_executable),
+      "failed to open " + path);
 }
 
 void Writer::createSEHTable() {
-  // Set the no SEH characteristic on x86 binaries unless we find exception
-  // handlers.
-  SetNoSEHCharacteristic = true;
-
-  SymbolRVASet Handlers;
-  for (ObjFile *File : ObjFile::Instances) {
-    // FIXME: We should error here instead of earlier unless /safeseh:no was
-    // passed.
-    if (!File->hasSafeSEH())
-      return;
-
-    markSymbolsForRVATable(File, File->getSXDataChunks(), Handlers);
+  SymbolRVASet handlers;
+  for (ObjFile *file : ObjFile::instances) {
+    if (!file->hasSafeSEH())
+      error("/safeseh: " + file->getName() + " is not compatible with SEH");
+    markSymbolsForRVATable(file, file->getSXDataChunks(), handlers);
   }
 
-  // Remove the "no SEH" characteristic if all object files were built with
-  // safeseh, we found some exception handlers, and there is a load config in
-  // the object.
-  SetNoSEHCharacteristic =
-      Handlers.empty() || !Symtab->findUnderscore("_load_config_used");
+  // Set the "no SEH" characteristic if there really were no handlers, or if
+  // there is no load config object to point to the table of handlers.
+  setNoSEHCharacteristic =
+      handlers.empty() || !symtab->findUnderscore("_load_config_used");
 
-  maybeAddRVATable(std::move(Handlers), "__safe_se_handler_table",
+  maybeAddRVATable(std::move(handlers), "__safe_se_handler_table",
                    "__safe_se_handler_count");
 }
 
 // Add a symbol to an RVA set. Two symbols may have the same RVA, but an RVA set
 // cannot contain duplicates. Therefore, the set is uniqued by Chunk and the
 // symbol's offset into that Chunk.
-static void addSymbolToRVASet(SymbolRVASet &RVASet, Defined *S) {
-  Chunk *C = S->getChunk();
-  if (auto *SC = dyn_cast<SectionChunk>(C))
-    C = SC->Repl; // Look through ICF replacement.
-  uint32_t Off = S->getRVA() - (C ? C->getRVA() : 0);
-  RVASet.insert({C, Off});
+static void addSymbolToRVASet(SymbolRVASet &rvaSet, Defined *s) {
+  Chunk *c = s->getChunk();
+  if (auto *sc = dyn_cast<SectionChunk>(c))
+    c = sc->repl; // Look through ICF replacement.
+  uint32_t off = s->getRVA() - (c ? c->getRVA() : 0);
+  rvaSet.insert({c, off});
 }
 
 // Given a symbol, add it to the GFIDs table if it is a live, defined, function
 // symbol in an executable section.
-static void maybeAddAddressTakenFunction(SymbolRVASet &AddressTakenSyms,
-                                         Symbol *S) {
-  auto *D = dyn_cast_or_null<DefinedCOFF>(S);
-
-  // Ignore undefined symbols and references to non-functions (e.g. globals and
-  // labels).
-  if (!D ||
-      D->getCOFFSymbol().getComplexType() != COFF::IMAGE_SYM_DTYPE_FUNCTION)
+static void maybeAddAddressTakenFunction(SymbolRVASet &addressTakenSyms,
+                                         Symbol *s) {
+  if (!s)
     return;
 
-  // Mark the symbol as address taken if it's in an executable section.
-  Chunk *RefChunk = D->getChunk();
-  OutputSection *OS = RefChunk ? RefChunk->getOutputSection() : nullptr;
-  if (OS && OS->Header.Characteristics & IMAGE_SCN_MEM_EXECUTE)
-    addSymbolToRVASet(AddressTakenSyms, D);
+  switch (s->kind()) {
+  case Symbol::DefinedLocalImportKind:
+  case Symbol::DefinedImportDataKind:
+    // Defines an __imp_ pointer, so it is data, so it is ignored.
+    break;
+  case Symbol::DefinedCommonKind:
+    // Common is always data, so it is ignored.
+    break;
+  case Symbol::DefinedAbsoluteKind:
+  case Symbol::DefinedSyntheticKind:
+    // Absolute is never code, synthetic generally isn't and usually isn't
+    // determinable.
+    break;
+  case Symbol::LazyKind:
+  case Symbol::UndefinedKind:
+    // Undefined symbols resolve to zero, so they don't have an RVA. Lazy
+    // symbols shouldn't have relocations.
+    break;
+
+  case Symbol::DefinedImportThunkKind:
+    // Thunks are always code, include them.
+    addSymbolToRVASet(addressTakenSyms, cast<Defined>(s));
+    break;
+
+  case Symbol::DefinedRegularKind: {
+    // This is a regular, defined, symbol from a COFF file. Mark the symbol as
+    // address taken if the symbol type is function and it's in an executable
+    // section.
+    auto *d = cast<DefinedRegular>(s);
+    if (d->getCOFFSymbol().getComplexType() == COFF::IMAGE_SYM_DTYPE_FUNCTION) {
+      SectionChunk *sc = dyn_cast<SectionChunk>(d->getChunk());
+      if (sc && sc->live &&
+          sc->getOutputCharacteristics() & IMAGE_SCN_MEM_EXECUTE)
+        addSymbolToRVASet(addressTakenSyms, d);
+    }
+    break;
+  }
+  }
 }
 
 // Visit all relocations from all section contributions of this object file and
 // mark the relocation target as address-taken.
-static void markSymbolsWithRelocations(ObjFile *File,
-                                       SymbolRVASet &UsedSymbols) {
-  for (Chunk *C : File->getChunks()) {
+static void markSymbolsWithRelocations(ObjFile *file,
+                                       SymbolRVASet &usedSymbols) {
+  for (Chunk *c : file->getChunks()) {
     // We only care about live section chunks. Common chunks and other chunks
     // don't generally contain relocations.
-    SectionChunk *SC = dyn_cast<SectionChunk>(C);
-    if (!SC || !SC->Live)
+    SectionChunk *sc = dyn_cast<SectionChunk>(c);
+    if (!sc || !sc->live)
       continue;
 
-    for (const coff_relocation &Reloc : SC->Relocs) {
-      if (Config->Machine == I386 && Reloc.Type == COFF::IMAGE_REL_I386_REL32)
+    for (const coff_relocation &reloc : sc->getRelocs()) {
+      if (config->machine == I386 && reloc.Type == COFF::IMAGE_REL_I386_REL32)
         // Ignore relative relocations on x86. On x86_64 they can't be ignored
         // since they're also used to compute absolute addresses.
         continue;
 
-      Symbol *Ref = SC->File->getSymbol(Reloc.SymbolTableIndex);
-      maybeAddAddressTakenFunction(UsedSymbols, Ref);
+      Symbol *ref = sc->file->getSymbol(reloc.SymbolTableIndex);
+      maybeAddAddressTakenFunction(usedSymbols, ref);
     }
   }
 }
@@ -1393,109 +1548,109 @@ static void markSymbolsWithRelocations(ObjFile *File,
 // address-taken functions. It is sorted and uniqued, just like the safe SEH
 // table.
 void Writer::createGuardCFTables() {
-  SymbolRVASet AddressTakenSyms;
-  SymbolRVASet LongJmpTargets;
-  for (ObjFile *File : ObjFile::Instances) {
+  SymbolRVASet addressTakenSyms;
+  SymbolRVASet longJmpTargets;
+  for (ObjFile *file : ObjFile::instances) {
     // If the object was compiled with /guard:cf, the address taken symbols
     // are in .gfids$y sections, and the longjmp targets are in .gljmp$y
     // sections. If the object was not compiled with /guard:cf, we assume there
     // were no setjmp targets, and that all code symbols with relocations are
     // possibly address-taken.
-    if (File->hasGuardCF()) {
-      markSymbolsForRVATable(File, File->getGuardFidChunks(), AddressTakenSyms);
-      markSymbolsForRVATable(File, File->getGuardLJmpChunks(), LongJmpTargets);
+    if (file->hasGuardCF()) {
+      markSymbolsForRVATable(file, file->getGuardFidChunks(), addressTakenSyms);
+      markSymbolsForRVATable(file, file->getGuardLJmpChunks(), longJmpTargets);
     } else {
-      markSymbolsWithRelocations(File, AddressTakenSyms);
+      markSymbolsWithRelocations(file, addressTakenSyms);
     }
   }
 
   // Mark the image entry as address-taken.
-  if (Config->Entry)
-    maybeAddAddressTakenFunction(AddressTakenSyms, Config->Entry);
+  if (config->entry)
+    maybeAddAddressTakenFunction(addressTakenSyms, config->entry);
 
   // Mark exported symbols in executable sections as address-taken.
-  for (Export &E : Config->Exports)
-    maybeAddAddressTakenFunction(AddressTakenSyms, E.Sym);
+  for (Export &e : config->exports)
+    maybeAddAddressTakenFunction(addressTakenSyms, e.sym);
 
   // Ensure sections referenced in the gfid table are 16-byte aligned.
-  for (const ChunkAndOffset &C : AddressTakenSyms)
-    if (C.InputChunk->Alignment < 16)
-      C.InputChunk->Alignment = 16;
+  for (const ChunkAndOffset &c : addressTakenSyms)
+    if (c.inputChunk->getAlignment() < 16)
+      c.inputChunk->setAlignment(16);
 
-  maybeAddRVATable(std::move(AddressTakenSyms), "__guard_fids_table",
+  maybeAddRVATable(std::move(addressTakenSyms), "__guard_fids_table",
                    "__guard_fids_count");
 
   // Add the longjmp target table unless the user told us not to.
-  if (Config->GuardCF == GuardCFLevel::Full)
-    maybeAddRVATable(std::move(LongJmpTargets), "__guard_longjmp_table",
+  if (config->guardCF == GuardCFLevel::Full)
+    maybeAddRVATable(std::move(longJmpTargets), "__guard_longjmp_table",
                      "__guard_longjmp_count");
 
   // Set __guard_flags, which will be used in the load config to indicate that
   // /guard:cf was enabled.
-  uint32_t GuardFlags = uint32_t(coff_guard_flags::CFInstrumented) |
+  uint32_t guardFlags = uint32_t(coff_guard_flags::CFInstrumented) |
                         uint32_t(coff_guard_flags::HasFidTable);
-  if (Config->GuardCF == GuardCFLevel::Full)
-    GuardFlags |= uint32_t(coff_guard_flags::HasLongJmpTable);
-  Symbol *FlagSym = Symtab->findUnderscore("__guard_flags");
-  cast<DefinedAbsolute>(FlagSym)->setVA(GuardFlags);
+  if (config->guardCF == GuardCFLevel::Full)
+    guardFlags |= uint32_t(coff_guard_flags::HasLongJmpTable);
+  Symbol *flagSym = symtab->findUnderscore("__guard_flags");
+  cast<DefinedAbsolute>(flagSym)->setVA(guardFlags);
 }
 
 // Take a list of input sections containing symbol table indices and add those
 // symbols to an RVA table. The challenge is that symbol RVAs are not known and
 // depend on the table size, so we can't directly build a set of integers.
-void Writer::markSymbolsForRVATable(ObjFile *File,
-                                    ArrayRef<SectionChunk *> SymIdxChunks,
-                                    SymbolRVASet &TableSymbols) {
-  for (SectionChunk *C : SymIdxChunks) {
+void Writer::markSymbolsForRVATable(ObjFile *file,
+                                    ArrayRef<SectionChunk *> symIdxChunks,
+                                    SymbolRVASet &tableSymbols) {
+  for (SectionChunk *c : symIdxChunks) {
     // Skip sections discarded by linker GC. This comes up when a .gfids section
     // is associated with something like a vtable and the vtable is discarded.
     // In this case, the associated gfids section is discarded, and we don't
     // mark the virtual member functions as address-taken by the vtable.
-    if (!C->Live)
+    if (!c->live)
       continue;
 
     // Validate that the contents look like symbol table indices.
-    ArrayRef<uint8_t> Data = C->getContents();
-    if (Data.size() % 4 != 0) {
-      warn("ignoring " + C->getSectionName() +
-           " symbol table index section in object " + toString(File));
+    ArrayRef<uint8_t> data = c->getContents();
+    if (data.size() % 4 != 0) {
+      warn("ignoring " + c->getSectionName() +
+           " symbol table index section in object " + toString(file));
       continue;
     }
 
     // Read each symbol table index and check if that symbol was included in the
     // final link. If so, add it to the table symbol set.
-    ArrayRef<ulittle32_t> SymIndices(
-        reinterpret_cast<const ulittle32_t *>(Data.data()), Data.size() / 4);
-    ArrayRef<Symbol *> ObjSymbols = File->getSymbols();
-    for (uint32_t SymIndex : SymIndices) {
-      if (SymIndex >= ObjSymbols.size()) {
+    ArrayRef<ulittle32_t> symIndices(
+        reinterpret_cast<const ulittle32_t *>(data.data()), data.size() / 4);
+    ArrayRef<Symbol *> objSymbols = file->getSymbols();
+    for (uint32_t symIndex : symIndices) {
+      if (symIndex >= objSymbols.size()) {
         warn("ignoring invalid symbol table index in section " +
-             C->getSectionName() + " in object " + toString(File));
+             c->getSectionName() + " in object " + toString(file));
         continue;
       }
-      if (Symbol *S = ObjSymbols[SymIndex]) {
-        if (S->isLive())
-          addSymbolToRVASet(TableSymbols, cast<Defined>(S));
+      if (Symbol *s = objSymbols[symIndex]) {
+        if (s->isLive())
+          addSymbolToRVASet(tableSymbols, cast<Defined>(s));
       }
     }
   }
 }
 
 // Replace the absolute table symbol with a synthetic symbol pointing to
-// TableChunk so that we can emit base relocations for it and resolve section
+// tableChunk so that we can emit base relocations for it and resolve section
 // relative relocations.
-void Writer::maybeAddRVATable(SymbolRVASet TableSymbols, StringRef TableSym,
-                              StringRef CountSym) {
-  if (TableSymbols.empty())
+void Writer::maybeAddRVATable(SymbolRVASet tableSymbols, StringRef tableSym,
+                              StringRef countSym) {
+  if (tableSymbols.empty())
     return;
 
-  RVATableChunk *TableChunk = make<RVATableChunk>(std::move(TableSymbols));
-  RdataSec->addChunk(TableChunk);
+  RVATableChunk *tableChunk = make<RVATableChunk>(std::move(tableSymbols));
+  rdataSec->addChunk(tableChunk);
 
-  Symbol *T = Symtab->findUnderscore(TableSym);
-  Symbol *C = Symtab->findUnderscore(CountSym);
-  replaceSymbol<DefinedSynthetic>(T, T->getName(), TableChunk);
-  cast<DefinedAbsolute>(C)->setVA(TableChunk->getSize() / 4);
+  Symbol *t = symtab->findUnderscore(tableSym);
+  Symbol *c = symtab->findUnderscore(countSym);
+  replaceSymbol<DefinedSynthetic>(t, t->getName(), tableChunk);
+  cast<DefinedAbsolute>(c)->setVA(tableChunk->getSize() / 4);
 }
 
 // MinGW specific. Gather all relocations that are imported from a DLL even
@@ -1503,26 +1658,26 @@ void Writer::maybeAddRVATable(SymbolRVASet TableSymbols, StringRef TableSym,
 // uses for fixing them up, and provide the synthetic symbols that the
 // runtime uses for finding the table.
 void Writer::createRuntimePseudoRelocs() {
-  std::vector<RuntimePseudoReloc> Rels;
+  std::vector<RuntimePseudoReloc> rels;
 
-  for (Chunk *C : Symtab->getChunks()) {
-    auto *SC = dyn_cast<SectionChunk>(C);
-    if (!SC || !SC->Live)
+  for (Chunk *c : symtab->getChunks()) {
+    auto *sc = dyn_cast<SectionChunk>(c);
+    if (!sc || !sc->live)
       continue;
-    SC->getRuntimePseudoRelocs(Rels);
+    sc->getRuntimePseudoRelocs(rels);
   }
 
-  if (!Rels.empty())
-    log("Writing " + Twine(Rels.size()) + " runtime pseudo relocations");
-  PseudoRelocTableChunk *Table = make<PseudoRelocTableChunk>(Rels);
-  RdataSec->addChunk(Table);
-  EmptyChunk *EndOfList = make<EmptyChunk>();
-  RdataSec->addChunk(EndOfList);
+  if (!rels.empty())
+    log("Writing " + Twine(rels.size()) + " runtime pseudo relocations");
+  PseudoRelocTableChunk *table = make<PseudoRelocTableChunk>(rels);
+  rdataSec->addChunk(table);
+  EmptyChunk *endOfList = make<EmptyChunk>();
+  rdataSec->addChunk(endOfList);
 
-  Symbol *HeadSym = Symtab->findUnderscore("__RUNTIME_PSEUDO_RELOC_LIST__");
-  Symbol *EndSym = Symtab->findUnderscore("__RUNTIME_PSEUDO_RELOC_LIST_END__");
-  replaceSymbol<DefinedSynthetic>(HeadSym, HeadSym->getName(), Table);
-  replaceSymbol<DefinedSynthetic>(EndSym, EndSym->getName(), EndOfList);
+  Symbol *headSym = symtab->findUnderscore("__RUNTIME_PSEUDO_RELOC_LIST__");
+  Symbol *endSym = symtab->findUnderscore("__RUNTIME_PSEUDO_RELOC_LIST_END__");
+  replaceSymbol<DefinedSynthetic>(headSym, headSym->getName(), table);
+  replaceSymbol<DefinedSynthetic>(endSym, endSym->getName(), endOfList);
 }
 
 // MinGW specific.
@@ -1531,32 +1686,32 @@ void Writer::createRuntimePseudoRelocs() {
 // There's a symbol pointing to the start sentinel pointer, __CTOR_LIST__
 // and __DTOR_LIST__ respectively.
 void Writer::insertCtorDtorSymbols() {
-  AbsolutePointerChunk *CtorListHead = make<AbsolutePointerChunk>(-1);
-  AbsolutePointerChunk *CtorListEnd = make<AbsolutePointerChunk>(0);
-  AbsolutePointerChunk *DtorListHead = make<AbsolutePointerChunk>(-1);
-  AbsolutePointerChunk *DtorListEnd = make<AbsolutePointerChunk>(0);
-  CtorsSec->insertChunkAtStart(CtorListHead);
-  CtorsSec->addChunk(CtorListEnd);
-  DtorsSec->insertChunkAtStart(DtorListHead);
-  DtorsSec->addChunk(DtorListEnd);
+  AbsolutePointerChunk *ctorListHead = make<AbsolutePointerChunk>(-1);
+  AbsolutePointerChunk *ctorListEnd = make<AbsolutePointerChunk>(0);
+  AbsolutePointerChunk *dtorListHead = make<AbsolutePointerChunk>(-1);
+  AbsolutePointerChunk *dtorListEnd = make<AbsolutePointerChunk>(0);
+  ctorsSec->insertChunkAtStart(ctorListHead);
+  ctorsSec->addChunk(ctorListEnd);
+  dtorsSec->insertChunkAtStart(dtorListHead);
+  dtorsSec->addChunk(dtorListEnd);
 
-  Symbol *CtorListSym = Symtab->findUnderscore("__CTOR_LIST__");
-  Symbol *DtorListSym = Symtab->findUnderscore("__DTOR_LIST__");
-  replaceSymbol<DefinedSynthetic>(CtorListSym, CtorListSym->getName(),
-                                  CtorListHead);
-  replaceSymbol<DefinedSynthetic>(DtorListSym, DtorListSym->getName(),
-                                  DtorListHead);
+  Symbol *ctorListSym = symtab->findUnderscore("__CTOR_LIST__");
+  Symbol *dtorListSym = symtab->findUnderscore("__DTOR_LIST__");
+  replaceSymbol<DefinedSynthetic>(ctorListSym, ctorListSym->getName(),
+                                  ctorListHead);
+  replaceSymbol<DefinedSynthetic>(dtorListSym, dtorListSym->getName(),
+                                  dtorListHead);
 }
 
 // Handles /section options to allow users to overwrite
 // section attributes.
 void Writer::setSectionPermissions() {
-  for (auto &P : Config->Section) {
-    StringRef Name = P.first;
-    uint32_t Perm = P.second;
-    for (OutputSection *Sec : OutputSections)
-      if (Sec->Name == Name)
-        Sec->setPermissions(Perm);
+  for (auto &p : config->section) {
+    StringRef name = p.first;
+    uint32_t perm = p.second;
+    for (OutputSection *sec : outputSections)
+      if (sec->name == name)
+        sec->setPermissions(perm);
   }
 }
 
@@ -1564,18 +1719,19 @@ void Writer::setSectionPermissions() {
 void Writer::writeSections() {
   // Record the number of sections to apply section index relocations
   // against absolute symbols. See applySecIdx in Chunks.cpp..
-  DefinedAbsolute::NumOutputSections = OutputSections.size();
+  DefinedAbsolute::numOutputSections = outputSections.size();
 
-  uint8_t *Buf = Buffer->getBufferStart();
-  for (OutputSection *Sec : OutputSections) {
-    uint8_t *SecBuf = Buf + Sec->getFileOff();
+  uint8_t *buf = buffer->getBufferStart();
+  for (OutputSection *sec : outputSections) {
+    uint8_t *secBuf = buf + sec->getFileOff();
     // Fill gaps between functions in .text with INT3 instructions
     // instead of leaving as NUL bytes (which can be interpreted as
     // ADD instructions).
-    if (Sec->Header.Characteristics & IMAGE_SCN_CNT_CODE)
-      memset(SecBuf, 0xCC, Sec->getRawSize());
-    for_each(parallel::par, Sec->Chunks.begin(), Sec->Chunks.end(),
-             [&](Chunk *C) { C->writeTo(SecBuf); });
+    if (sec->header.Characteristics & IMAGE_SCN_CNT_CODE)
+      memset(secBuf, 0xCC, sec->getRawSize());
+    parallelForEach(sec->chunks, [&](Chunk *c) {
+      c->writeTo(secBuf + c->getRVA() - sec->getRVA());
+    });
   }
 }
 
@@ -1586,8 +1742,8 @@ void Writer::writeBuildId() {
   // 2) In all cases, the PE COFF file header also contains a timestamp.
   // For reproducibility, instead of a timestamp we want to use a hash of the
   // PE contents.
-  if (Config->Debug) {
-    assert(BuildId && "BuildId is not set!");
+  if (config->debug) {
+    assert(buildId && "BuildId is not set!");
     // BuildId->BuildId was filled in when the PDB was written.
   }
 
@@ -1595,62 +1751,65 @@ void Writer::writeBuildId() {
   // "timestamp" in the COFF file header, and the ones in the coff debug
   // directory.  Now we can hash the file and write that hash to the various
   // timestamp fields in the file.
-  StringRef OutputFileData(
-      reinterpret_cast<const char *>(Buffer->getBufferStart()),
-      Buffer->getBufferSize());
+  StringRef outputFileData(
+      reinterpret_cast<const char *>(buffer->getBufferStart()),
+      buffer->getBufferSize());
 
-  uint32_t Timestamp = Config->Timestamp;
-  uint64_t Hash = 0;
-  bool GenerateSyntheticBuildId =
-      Config->MinGW && Config->Debug && Config->PDBPath.empty();
+  uint32_t timestamp = config->timestamp;
+  uint64_t hash = 0;
+  bool generateSyntheticBuildId =
+      config->mingw && config->debug && config->pdbPath.empty();
 
-  if (Config->Repro || GenerateSyntheticBuildId)
-    Hash = xxHash64(OutputFileData);
+  if (config->repro || generateSyntheticBuildId)
+    hash = xxHash64(outputFileData);
 
-  if (Config->Repro)
-    Timestamp = static_cast<uint32_t>(Hash);
+  if (config->repro)
+    timestamp = static_cast<uint32_t>(hash);
 
-  if (GenerateSyntheticBuildId) {
+  if (generateSyntheticBuildId) {
     // For MinGW builds without a PDB file, we still generate a build id
     // to allow associating a crash dump to the executable.
-    BuildId->BuildId->PDB70.CVSignature = OMF::Signature::PDB70;
-    BuildId->BuildId->PDB70.Age = 1;
-    memcpy(BuildId->BuildId->PDB70.Signature, &Hash, 8);
+    buildId->buildId->PDB70.CVSignature = OMF::Signature::PDB70;
+    buildId->buildId->PDB70.Age = 1;
+    memcpy(buildId->buildId->PDB70.Signature, &hash, 8);
     // xxhash only gives us 8 bytes, so put some fixed data in the other half.
-    memcpy(&BuildId->BuildId->PDB70.Signature[8], "LLD PDB.", 8);
+    memcpy(&buildId->buildId->PDB70.Signature[8], "LLD PDB.", 8);
   }
 
-  if (DebugDirectory)
-    DebugDirectory->setTimeDateStamp(Timestamp);
+  if (debugDirectory)
+    debugDirectory->setTimeDateStamp(timestamp);
 
-  uint8_t *Buf = Buffer->getBufferStart();
-  Buf += DOSStubSize + sizeof(PEMagic);
-  object::coff_file_header *CoffHeader =
-      reinterpret_cast<coff_file_header *>(Buf);
-  CoffHeader->TimeDateStamp = Timestamp;
+  uint8_t *buf = buffer->getBufferStart();
+  buf += dosStubSize + sizeof(PEMagic);
+  object::coff_file_header *coffHeader =
+      reinterpret_cast<coff_file_header *>(buf);
+  coffHeader->TimeDateStamp = timestamp;
 }
 
 // Sort .pdata section contents according to PE/COFF spec 5.5.
 void Writer::sortExceptionTable() {
-  if (!FirstPdata)
+  if (!firstPdata)
     return;
   // We assume .pdata contains function table entries only.
-  auto BufAddr = [&](Chunk *C) {
-    return Buffer->getBufferStart() + C->getOutputSection()->getFileOff() +
-           C->getRVA() - C->getOutputSection()->getRVA();
+  auto bufAddr = [&](Chunk *c) {
+    OutputSection *os = c->getOutputSection();
+    return buffer->getBufferStart() + os->getFileOff() + c->getRVA() -
+           os->getRVA();
   };
-  uint8_t *Begin = BufAddr(FirstPdata);
-  uint8_t *End = BufAddr(LastPdata) + LastPdata->getSize();
-  if (Config->Machine == AMD64) {
-    struct Entry { ulittle32_t Begin, End, Unwind; };
-    sort(parallel::par, (Entry *)Begin, (Entry *)End,
-         [](const Entry &A, const Entry &B) { return A.Begin < B.Begin; });
+  uint8_t *begin = bufAddr(firstPdata);
+  uint8_t *end = bufAddr(lastPdata) + lastPdata->getSize();
+  if (config->machine == AMD64) {
+    struct Entry { ulittle32_t begin, end, unwind; };
+    parallelSort(
+        MutableArrayRef<Entry>((Entry *)begin, (Entry *)end),
+        [](const Entry &a, const Entry &b) { return a.begin < b.begin; });
     return;
   }
-  if (Config->Machine == ARMNT || Config->Machine == ARM64) {
-    struct Entry { ulittle32_t Begin, Unwind; };
-    sort(parallel::par, (Entry *)Begin, (Entry *)End,
-         [](const Entry &A, const Entry &B) { return A.Begin < B.Begin; });
+  if (config->machine == ARMNT || config->machine == ARM64) {
+    struct Entry { ulittle32_t begin, unwind; };
+    parallelSort(
+        MutableArrayRef<Entry>((Entry *)begin, (Entry *)end),
+        [](const Entry &a, const Entry &b) { return a.begin < b.begin; });
     return;
   }
   errs() << "warning: don't know how to handle .pdata.\n";
@@ -1670,76 +1829,92 @@ void Writer::sortExceptionTable() {
 // pointers in the order that they are listed in the object file (top to
 // bottom), otherwise global objects might not be initialized in the
 // correct order.
-void Writer::sortCRTSectionChunks(std::vector<Chunk *> &Chunks) {
-  auto SectionChunkOrder = [](const Chunk *A, const Chunk *B) {
-    auto SA = dyn_cast<SectionChunk>(A);
-    auto SB = dyn_cast<SectionChunk>(B);
-    assert(SA && SB && "Non-section chunks in CRT section!");
+void Writer::sortCRTSectionChunks(std::vector<Chunk *> &chunks) {
+  auto sectionChunkOrder = [](const Chunk *a, const Chunk *b) {
+    auto sa = dyn_cast<SectionChunk>(a);
+    auto sb = dyn_cast<SectionChunk>(b);
+    assert(sa && sb && "Non-section chunks in CRT section!");
 
-    StringRef SAObj = SA->File->MB.getBufferIdentifier();
-    StringRef SBObj = SB->File->MB.getBufferIdentifier();
+    StringRef sAObj = sa->file->mb.getBufferIdentifier();
+    StringRef sBObj = sb->file->mb.getBufferIdentifier();
 
-    return SAObj == SBObj && SA->getSectionNumber() < SB->getSectionNumber();
+    return sAObj == sBObj && sa->getSectionNumber() < sb->getSectionNumber();
   };
-  std::stable_sort(Chunks.begin(), Chunks.end(), SectionChunkOrder);
+  llvm::stable_sort(chunks, sectionChunkOrder);
 
-  if (Config->Verbose) {
-    for (auto &C : Chunks) {
-      auto SC = dyn_cast<SectionChunk>(C);
-      log("  " + SC->File->MB.getBufferIdentifier().str() +
-          ", SectionID: " + Twine(SC->getSectionNumber()));
+  if (config->verbose) {
+    for (auto &c : chunks) {
+      auto sc = dyn_cast<SectionChunk>(c);
+      log("  " + sc->file->mb.getBufferIdentifier().str() +
+          ", SectionID: " + Twine(sc->getSectionNumber()));
     }
   }
 }
 
-OutputSection *Writer::findSection(StringRef Name) {
-  for (OutputSection *Sec : OutputSections)
-    if (Sec->Name == Name)
-      return Sec;
+OutputSection *Writer::findSection(StringRef name) {
+  for (OutputSection *sec : outputSections)
+    if (sec->name == name)
+      return sec;
   return nullptr;
 }
 
 uint32_t Writer::getSizeOfInitializedData() {
-  uint32_t Res = 0;
-  for (OutputSection *S : OutputSections)
-    if (S->Header.Characteristics & IMAGE_SCN_CNT_INITIALIZED_DATA)
-      Res += S->getRawSize();
-  return Res;
+  uint32_t res = 0;
+  for (OutputSection *s : outputSections)
+    if (s->header.Characteristics & IMAGE_SCN_CNT_INITIALIZED_DATA)
+      res += s->getRawSize();
+  return res;
 }
 
 // Add base relocations to .reloc section.
 void Writer::addBaserels() {
-  if (!Config->Relocatable)
+  if (!config->relocatable)
     return;
-  RelocSec->Chunks.clear();
-  std::vector<Baserel> V;
-  for (OutputSection *Sec : OutputSections) {
-    if (Sec->Header.Characteristics & IMAGE_SCN_MEM_DISCARDABLE)
+  relocSec->chunks.clear();
+  std::vector<Baserel> v;
+  for (OutputSection *sec : outputSections) {
+    if (sec->header.Characteristics & IMAGE_SCN_MEM_DISCARDABLE)
       continue;
     // Collect all locations for base relocations.
-    for (Chunk *C : Sec->Chunks)
-      C->getBaserels(&V);
+    for (Chunk *c : sec->chunks)
+      c->getBaserels(&v);
     // Add the addresses to .reloc section.
-    if (!V.empty())
-      addBaserelBlocks(V);
-    V.clear();
+    if (!v.empty())
+      addBaserelBlocks(v);
+    v.clear();
   }
 }
 
 // Add addresses to .reloc section. Note that addresses are grouped by page.
-void Writer::addBaserelBlocks(std::vector<Baserel> &V) {
-  const uint32_t Mask = ~uint32_t(PageSize - 1);
-  uint32_t Page = V[0].RVA & Mask;
-  size_t I = 0, J = 1;
-  for (size_t E = V.size(); J < E; ++J) {
-    uint32_t P = V[J].RVA & Mask;
-    if (P == Page)
+void Writer::addBaserelBlocks(std::vector<Baserel> &v) {
+  const uint32_t mask = ~uint32_t(pageSize - 1);
+  uint32_t page = v[0].rva & mask;
+  size_t i = 0, j = 1;
+  for (size_t e = v.size(); j < e; ++j) {
+    uint32_t p = v[j].rva & mask;
+    if (p == page)
       continue;
-    RelocSec->addChunk(make<BaserelChunk>(Page, &V[I], &V[0] + J));
-    I = J;
-    Page = P;
+    relocSec->addChunk(make<BaserelChunk>(page, &v[i], &v[0] + j));
+    i = j;
+    page = p;
   }
-  if (I == J)
+  if (i == j)
     return;
-  RelocSec->addChunk(make<BaserelChunk>(Page, &V[I], &V[0] + J));
+  relocSec->addChunk(make<BaserelChunk>(page, &v[i], &v[0] + j));
+}
+
+PartialSection *Writer::createPartialSection(StringRef name,
+                                             uint32_t outChars) {
+  PartialSection *&pSec = partialSections[{name, outChars}];
+  if (pSec)
+    return pSec;
+  pSec = make<PartialSection>(name, outChars);
+  return pSec;
+}
+
+PartialSection *Writer::findPartialSection(StringRef name, uint32_t outChars) {
+  auto it = partialSections.find({name, outChars});
+  if (it != partialSections.end())
+    return it->second;
+  return nullptr;
 }
diff --git a/deps/lld/COFF/Writer.h b/deps/lld/COFF/Writer.h
index 727582480c9143b80d02b6e6d0de6a1888f20118..96389df2ac0ae1e305ef1818a76bd9ece6ccb190 100644
--- a/deps/lld/COFF/Writer.h
+++ b/deps/lld/COFF/Writer.h
@@ -1,9 +1,8 @@
 //===- Writer.h -------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -19,10 +18,19 @@
 
 namespace lld {
 namespace coff {
-static const int PageSize = 4096;
+static const int pageSize = 4096;
 
 void writeResult();
 
+class PartialSection {
+public:
+  PartialSection(StringRef n, uint32_t chars)
+      : name(n), characteristics(chars) {}
+  StringRef name;
+  unsigned characteristics;
+  std::vector<Chunk *> chunks;
+};
+
 // OutputSection represents a section in an output file. It's a
 // container of chunks. OutputSection and Chunk are 1:N relationship.
 // Chunks cannot belong to more than one OutputSections. The writer
@@ -30,46 +38,48 @@ void writeResult();
 // non-overlapping file offsets and RVAs.
 class OutputSection {
 public:
-  OutputSection(llvm::StringRef N, uint32_t Chars) : Name(N) {
-    Header.Characteristics = Chars;
+  OutputSection(llvm::StringRef n, uint32_t chars) : name(n) {
+    header.Characteristics = chars;
   }
-  void addChunk(Chunk *C);
-  void insertChunkAtStart(Chunk *C);
-  void merge(OutputSection *Other);
-  void addPermissions(uint32_t C);
-  void setPermissions(uint32_t C);
-  uint64_t getRVA() { return Header.VirtualAddress; }
-  uint64_t getFileOff() { return Header.PointerToRawData; }
-  void writeHeaderTo(uint8_t *Buf);
+  void addChunk(Chunk *c);
+  void insertChunkAtStart(Chunk *c);
+  void merge(OutputSection *other);
+  void setPermissions(uint32_t c);
+  uint64_t getRVA() { return header.VirtualAddress; }
+  uint64_t getFileOff() { return header.PointerToRawData; }
+  void writeHeaderTo(uint8_t *buf);
+  void addContributingPartialSection(PartialSection *sec);
 
   // Returns the size of this section in an executable memory image.
   // This may be smaller than the raw size (the raw size is multiple
   // of disk sector size, so there may be padding at end), or may be
   // larger (if that's the case, the loader reserves spaces after end
   // of raw data).
-  uint64_t getVirtualSize() { return Header.VirtualSize; }
+  uint64_t getVirtualSize() { return header.VirtualSize; }
 
   // Returns the size of the section in the output file.
-  uint64_t getRawSize() { return Header.SizeOfRawData; }
+  uint64_t getRawSize() { return header.SizeOfRawData; }
 
   // Set offset into the string table storing this section name.
   // Used only when the name is longer than 8 bytes.
-  void setStringTableOff(uint32_t V) { StringTableOff = V; }
+  void setStringTableOff(uint32_t v) { stringTableOff = v; }
 
   // N.B. The section index is one based.
-  uint32_t SectionIndex = 0;
+  uint32_t sectionIndex = 0;
 
-  llvm::StringRef Name;
-  llvm::object::coff_section Header = {};
+  llvm::StringRef name;
+  llvm::object::coff_section header = {};
 
-  std::vector<Chunk *> Chunks;
-  std::vector<Chunk *> OrigChunks;
+  std::vector<Chunk *> chunks;
+  std::vector<Chunk *> origChunks;
+
+  std::vector<PartialSection *> contribSections;
 
 private:
-  uint32_t StringTableOff = 0;
+  uint32_t stringTableOff = 0;
 };
 
-}
-}
+} // namespace coff
+} // namespace lld
 
 #endif
diff --git a/deps/lld/Common/Args.cpp b/deps/lld/Common/Args.cpp
index 3f0671d72a6666e528068b16d7db9dbfd4abaf8d..4ea3a435c7ae04f866c29ed3514455803047ede8 100644
--- a/deps/lld/Common/Args.cpp
+++ b/deps/lld/Common/Args.cpp
@@ -1,9 +1,8 @@
 //===- Args.cpp -----------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -18,56 +17,66 @@
 using namespace llvm;
 using namespace lld;
 
-int lld::args::getInteger(opt::InputArgList &Args, unsigned Key, int Default) {
-  auto *A = Args.getLastArg(Key);
-  if (!A)
+// TODO(sbc): Remove this once CGOptLevel can be set completely based on bitcode
+// function metadata.
+CodeGenOpt::Level lld::args::getCGOptLevel(int optLevelLTO) {
+  if (optLevelLTO == 3)
+    return CodeGenOpt::Aggressive;
+  assert(optLevelLTO < 3);
+  return CodeGenOpt::Default;
+}
+
+int64_t lld::args::getInteger(opt::InputArgList &args, unsigned key,
+                              int64_t Default) {
+  auto *a = args.getLastArg(key);
+  if (!a)
     return Default;
 
-  int V;
-  if (to_integer(A->getValue(), V, 10))
-    return V;
+  int64_t v;
+  if (to_integer(a->getValue(), v, 10))
+    return v;
 
-  StringRef Spelling = Args.getArgString(A->getIndex());
-  error(Spelling + ": number expected, but got '" + A->getValue() + "'");
+  StringRef spelling = args.getArgString(a->getIndex());
+  error(spelling + ": number expected, but got '" + a->getValue() + "'");
   return 0;
 }
 
-std::vector<StringRef> lld::args::getStrings(opt::InputArgList &Args, int Id) {
-  std::vector<StringRef> V;
-  for (auto *Arg : Args.filtered(Id))
-    V.push_back(Arg->getValue());
-  return V;
+std::vector<StringRef> lld::args::getStrings(opt::InputArgList &args, int id) {
+  std::vector<StringRef> v;
+  for (auto *arg : args.filtered(id))
+    v.push_back(arg->getValue());
+  return v;
 }
 
-uint64_t lld::args::getZOptionValue(opt::InputArgList &Args, int Id,
-                                    StringRef Key, uint64_t Default) {
-  for (auto *Arg : Args.filtered_reverse(Id)) {
-    std::pair<StringRef, StringRef> KV = StringRef(Arg->getValue()).split('=');
-    if (KV.first == Key) {
-      uint64_t Result = Default;
-      if (!to_integer(KV.second, Result))
-        error("invalid " + Key + ": " + KV.second);
-      return Result;
+uint64_t lld::args::getZOptionValue(opt::InputArgList &args, int id,
+                                    StringRef key, uint64_t Default) {
+  for (auto *arg : args.filtered_reverse(id)) {
+    std::pair<StringRef, StringRef> kv = StringRef(arg->getValue()).split('=');
+    if (kv.first == key) {
+      uint64_t result = Default;
+      if (!to_integer(kv.second, result))
+        error("invalid " + key + ": " + kv.second);
+      return result;
     }
   }
   return Default;
 }
 
-std::vector<StringRef> lld::args::getLines(MemoryBufferRef MB) {
-  SmallVector<StringRef, 0> Arr;
-  MB.getBuffer().split(Arr, '\n');
+std::vector<StringRef> lld::args::getLines(MemoryBufferRef mb) {
+  SmallVector<StringRef, 0> arr;
+  mb.getBuffer().split(arr, '\n');
 
-  std::vector<StringRef> Ret;
-  for (StringRef S : Arr) {
-    S = S.trim();
-    if (!S.empty() && S[0] != '#')
-      Ret.push_back(S);
+  std::vector<StringRef> ret;
+  for (StringRef s : arr) {
+    s = s.trim();
+    if (!s.empty() && s[0] != '#')
+      ret.push_back(s);
   }
-  return Ret;
+  return ret;
 }
 
-StringRef lld::args::getFilenameWithoutExe(StringRef Path) {
-  if (Path.endswith_lower(".exe"))
-    return sys::path::stem(Path);
-  return sys::path::filename(Path);
+StringRef lld::args::getFilenameWithoutExe(StringRef path) {
+  if (path.endswith_lower(".exe"))
+    return sys::path::stem(path);
+  return sys::path::filename(path);
 }
diff --git a/deps/lld/Common/CMakeLists.txt b/deps/lld/Common/CMakeLists.txt
index a45fe209f06f3df702b920e329c811634b347338..70849cc7b94b200e88cbca5d84cb026b5fbe460c 100644
--- a/deps/lld/Common/CMakeLists.txt
+++ b/deps/lld/Common/CMakeLists.txt
@@ -2,15 +2,42 @@ if(NOT LLD_BUILT_STANDALONE)
   set(tablegen_deps intrinsics_gen)
 endif()
 
+find_first_existing_vc_file("${LLVM_MAIN_SRC_DIR}" llvm_vc)
+find_first_existing_vc_file("${LLD_SOURCE_DIR}" lld_vc)
+
+set(version_inc "${CMAKE_CURRENT_BINARY_DIR}/VCSVersion.inc")
+set(generate_vcs_version_script "${LLVM_CMAKE_PATH}/GenerateVersionFromVCS.cmake")
+
+if(lld_vc)
+  set(lld_source_dir ${LLD_SOURCE_DIR})
+endif()
+
+add_custom_command(OUTPUT "${version_inc}"
+  DEPENDS "${lld_vc}" "${generate_vcs_version_script}"
+  COMMAND ${CMAKE_COMMAND} "-DNAMES=LLD"
+  "-DLLD_SOURCE_DIR=${LLD_SOURCE_DIR}"
+  "-DHEADER_FILE=${version_inc}"
+  -P "${generate_vcs_version_script}")
+
+# Mark the generated header as being generated.
+set_source_files_properties("${version_inc}"
+  PROPERTIES GENERATED TRUE
+  HEADER_FILE_ONLY TRUE)
+
+set_property(SOURCE Version.cpp APPEND PROPERTY
+  COMPILE_DEFINITIONS "HAVE_VCS_VERSION_INC")
+
 add_lld_library(lldCommon
   Args.cpp
   ErrorHandler.cpp
+  Filesystem.cpp
   Memory.cpp
   Reproduce.cpp
   Strings.cpp
   TargetOptionsCommandFlags.cpp
   Threads.cpp
   Timer.cpp
+  VCSVersion.inc
   Version.cpp
 
   ADDITIONAL_HEADER_DIRS
diff --git a/deps/lld/Common/ErrorHandler.cpp b/deps/lld/Common/ErrorHandler.cpp
index c059516daf94d8471d21185dfa8d4255f64eff94..c87c0609b2601838a485f8588bbfee9d605e2c4e 100644
--- a/deps/lld/Common/ErrorHandler.cpp
+++ b/deps/lld/Common/ErrorHandler.cpp
@@ -1,9 +1,8 @@
 //===- ErrorHandler.cpp ---------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -17,6 +16,7 @@
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/raw_ostream.h"
 #include <mutex>
+#include <regex>
 
 #if !defined(_MSC_VER) && !defined(__MINGW32__)
 #include <unistd.h>
@@ -27,29 +27,29 @@ using namespace lld;
 
 // The functions defined in this file can be called from multiple threads,
 // but outs() or errs() are not thread-safe. We protect them using a mutex.
-static std::mutex Mu;
+static std::mutex mu;
 
 // Prints "\n" or does nothing, depending on Msg contents of
 // the previous call of this function.
-static void newline(raw_ostream *ErrorOS, const Twine &Msg) {
+static void newline(raw_ostream *errorOS, const Twine &msg) {
   // True if the previous error message contained "\n".
   // We want to separate multi-line error messages with a newline.
-  static bool Flag;
+  static bool flag;
 
-  if (Flag)
-    *ErrorOS << "\n";
-  Flag = StringRef(Msg.str()).contains('\n');
+  if (flag)
+    *errorOS << "\n";
+  flag = StringRef(msg.str()).contains('\n');
 }
 
 ErrorHandler &lld::errorHandler() {
-  static ErrorHandler Handler;
-  return Handler;
+  static ErrorHandler handler;
+  return handler;
 }
 
-void lld::exitLld(int Val) {
+void lld::exitLld(int val) {
   // Delete any temporary file, while keeping the memory mapping open.
-  if (errorHandler().OutputBuffer)
-    errorHandler().OutputBuffer->discard();
+  if (errorHandler().outputBuffer)
+    errorHandler().outputBuffer->discard();
 
   // Dealloc/destroy ManagedStatic variables before calling
   // _exit(). In a non-LTO build, this is a nop. In an LTO
@@ -58,87 +58,121 @@ void lld::exitLld(int Val) {
 
   outs().flush();
   errs().flush();
-  _exit(Val);
+  _exit(val);
 }
 
-void lld::diagnosticHandler(const DiagnosticInfo &DI) {
-  SmallString<128> S;
-  raw_svector_ostream OS(S);
-  DiagnosticPrinterRawOStream DP(OS);
-  DI.print(DP);
-  switch (DI.getSeverity()) {
+void lld::diagnosticHandler(const DiagnosticInfo &di) {
+  SmallString<128> s;
+  raw_svector_ostream os(s);
+  DiagnosticPrinterRawOStream dp(os);
+  di.print(dp);
+  switch (di.getSeverity()) {
   case DS_Error:
-    error(S);
+    error(s);
     break;
   case DS_Warning:
-    warn(S);
+    warn(s);
     break;
   case DS_Remark:
   case DS_Note:
-    message(S);
+    message(s);
     break;
   }
 }
 
-void lld::checkError(Error E) {
-  handleAllErrors(std::move(E),
-                  [&](ErrorInfoBase &EIB) { error(EIB.message()); });
+void lld::checkError(Error e) {
+  handleAllErrors(std::move(e),
+                  [&](ErrorInfoBase &eib) { error(eib.message()); });
 }
 
-void ErrorHandler::print(StringRef S, raw_ostream::Colors C) {
-  *ErrorOS << LogName << ": ";
-  if (ColorDiagnostics) {
-    ErrorOS->changeColor(C, true);
-    *ErrorOS << S;
-    ErrorOS->resetColor();
+static std::string getLocation(std::string msg, std::string defaultMsg) {
+  static std::vector<std::regex> Regexes{
+      std::regex(R"(^undefined symbol:.*\n>>> referenced by (\S+):(\d+)\n.*)"),
+      std::regex(R"(^undefined symbol:.*\n>>> referenced by (.*):)"),
+      std::regex(
+          R"(^duplicate symbol: .*\n>>> defined in (\S+)\n>>> defined in.*)"),
+      std::regex(
+          R"(^duplicate symbol: .*\n>>> defined at (\S+):(\d+).*)"),
+      std::regex(
+          R"(.*\n>>> defined in .*\n>>> referenced by (\S+):(\d+))"),
+      std::regex(
+          R"(^undefined (internal|hidden|protected) symbol: .*\n>>> referenced by (\S+):(\d+)\n.*)"),
+      std::regex(R"((\S+):(\d+): unclosed quote)"),
+  };
+
+  std::smatch Match;
+  for (std::regex &Re : Regexes) {
+    if (std::regex_search(msg, Match, Re)) {
+      return Match.size() > 2 ? Match.str(1) + "(" + Match.str(2) + ")"
+                              : Match.str(1);
+    }
+  }
+  return defaultMsg;
+}
+
+void ErrorHandler::printHeader(StringRef s, raw_ostream::Colors c,
+                               const Twine &msg) {
+
+  if (vsDiagnostics) {
+    // A Visual Studio-style error message starts with an error location.
+    // If a location cannot be extracted then we default to LogName.
+    *errorOS << getLocation(msg.str(), logName) << ": ";
+  } else {
+    *errorOS << logName << ": ";
+  }
+
+  if (colorDiagnostics) {
+    errorOS->changeColor(c, true);
+    *errorOS << s;
+    errorOS->resetColor();
   } else {
-    *ErrorOS << S;
+    *errorOS << s;
   }
 }
 
-void ErrorHandler::log(const Twine &Msg) {
-  if (Verbose) {
-    std::lock_guard<std::mutex> Lock(Mu);
-    *ErrorOS << LogName << ": " << Msg << "\n";
+void ErrorHandler::log(const Twine &msg) {
+  if (verbose) {
+    std::lock_guard<std::mutex> lock(mu);
+    *errorOS << logName << ": " << msg << "\n";
   }
 }
 
-void ErrorHandler::message(const Twine &Msg) {
-  std::lock_guard<std::mutex> Lock(Mu);
-  outs() << Msg << "\n";
+void ErrorHandler::message(const Twine &msg) {
+  std::lock_guard<std::mutex> lock(mu);
+  outs() << msg << "\n";
   outs().flush();
 }
 
-void ErrorHandler::warn(const Twine &Msg) {
-  if (FatalWarnings) {
-    error(Msg);
+void ErrorHandler::warn(const Twine &msg) {
+  if (fatalWarnings) {
+    error(msg);
     return;
   }
 
-  std::lock_guard<std::mutex> Lock(Mu);
-  newline(ErrorOS, Msg);
-  print("warning: ", raw_ostream::MAGENTA);
-  *ErrorOS << Msg << "\n";
+  std::lock_guard<std::mutex> lock(mu);
+  newline(errorOS, msg);
+  printHeader("warning: ", raw_ostream::MAGENTA, msg);
+  *errorOS << msg << "\n";
 }
 
-void ErrorHandler::error(const Twine &Msg) {
-  std::lock_guard<std::mutex> Lock(Mu);
-  newline(ErrorOS, Msg);
+void ErrorHandler::error(const Twine &msg) {
+  std::lock_guard<std::mutex> lock(mu);
+  newline(errorOS, msg);
 
-  if (ErrorLimit == 0 || ErrorCount < ErrorLimit) {
-    print("error: ", raw_ostream::RED);
-    *ErrorOS << Msg << "\n";
-  } else if (ErrorCount == ErrorLimit) {
-    print("error: ", raw_ostream::RED);
-    *ErrorOS << ErrorLimitExceededMsg << "\n";
-    if (ExitEarly)
+  if (errorLimit == 0 || errorCount < errorLimit) {
+    printHeader("error: ", raw_ostream::RED, msg);
+    *errorOS << msg << "\n";
+  } else if (errorCount == errorLimit) {
+    printHeader("error: ", raw_ostream::RED, msg);
+    *errorOS << errorLimitExceededMsg << "\n";
+    if (exitEarly)
       exitLld(1);
   }
 
-  ++ErrorCount;
+  ++errorCount;
 }
 
-void ErrorHandler::fatal(const Twine &Msg) {
-  error(Msg);
+void ErrorHandler::fatal(const Twine &msg) {
+  error(msg);
   exitLld(1);
 }
diff --git a/deps/lld/Common/Filesystem.cpp b/deps/lld/Common/Filesystem.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..c3d3f998f03b756d8c41499ec8f44c85114329ff
--- /dev/null
+++ b/deps/lld/Common/Filesystem.cpp
@@ -0,0 +1,99 @@
+//===- Filesystem.cpp -----------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file contains a few utility functions to handle files.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lld/Common/Filesystem.h"
+#include "lld/Common/Threads.h"
+#include "llvm/Config/llvm-config.h"
+#include "llvm/Support/FileOutputBuffer.h"
+#include "llvm/Support/FileSystem.h"
+#if LLVM_ON_UNIX
+#include <unistd.h>
+#endif
+#include <thread>
+
+using namespace llvm;
+using namespace lld;
+
+// Removes a given file asynchronously. This is a performance hack,
+// so remove this when operating systems are improved.
+//
+// On Linux (and probably on other Unix-like systems), unlink(2) is a
+// noticeably slow system call. As of 2016, unlink takes 250
+// milliseconds to remove a 1 GB file on ext4 filesystem on my machine.
+//
+// To create a new result file, we first remove existing file. So, if
+// you repeatedly link a 1 GB program in a regular compile-link-debug
+// cycle, every cycle wastes 250 milliseconds only to remove a file.
+// Since LLD can link a 1 GB binary in about 5 seconds, that waste
+// actually counts.
+//
+// This function spawns a background thread to remove the file.
+// The calling thread returns almost immediately.
+void lld::unlinkAsync(StringRef path) {
+// Removing a file is async on windows.
+#if defined(_WIN32)
+  sys::fs::remove(path);
+#else
+  if (!threadsEnabled || !sys::fs::exists(path) ||
+      !sys::fs::is_regular_file(path))
+    return;
+
+  // We cannot just remove path from a different thread because we are now going
+  // to create path as a new file.
+  // Instead we open the file and unlink it on this thread. The unlink is fast
+  // since the open fd guarantees that it is not removing the last reference.
+  int fd;
+  std::error_code ec = sys::fs::openFileForRead(path, fd);
+  sys::fs::remove(path);
+
+  if (ec)
+    return;
+
+  // close and therefore remove TempPath in background.
+  std::mutex m;
+  std::condition_variable cv;
+  bool started = false;
+  std::thread([&, fd] {
+    {
+      std::lock_guard<std::mutex> l(m);
+      started = true;
+      cv.notify_all();
+    }
+    ::close(fd);
+  }).detach();
+
+  // GLIBC 2.26 and earlier have race condition that crashes an entire process
+  // if the main thread calls exit(2) while other thread is starting up.
+  std::unique_lock<std::mutex> l(m);
+  cv.wait(l, [&] { return started; });
+#endif
+}
+
+// Simulate file creation to see if Path is writable.
+//
+// Determining whether a file is writable or not is amazingly hard,
+// and after all the only reliable way of doing that is to actually
+// create a file. But we don't want to do that in this function
+// because LLD shouldn't update any file if it will end in a failure.
+// We also don't want to reimplement heuristics to determine if a
+// file is writable. So we'll let FileOutputBuffer do the work.
+//
+// FileOutputBuffer doesn't touch a desitnation file until commit()
+// is called. We use that class without calling commit() to predict
+// if the given file is writable.
+std::error_code lld::tryCreateFile(StringRef path) {
+  if (path.empty())
+    return std::error_code();
+  if (path == "-")
+    return std::error_code();
+  return errorToErrorCode(FileOutputBuffer::create(path, 1).takeError());
+}
diff --git a/deps/lld/Common/Memory.cpp b/deps/lld/Common/Memory.cpp
index efc5bcc2218b43edb61ffa9c0ae3ebe7b7e1fcb6..c53e1d3e6cfc76e66f05334c86fbae7d3fab575f 100644
--- a/deps/lld/Common/Memory.cpp
+++ b/deps/lld/Common/Memory.cpp
@@ -1,9 +1,8 @@
 //===- Memory.cpp ---------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -12,12 +11,12 @@
 using namespace llvm;
 using namespace lld;
 
-BumpPtrAllocator lld::BAlloc;
-StringSaver lld::Saver{BAlloc};
-std::vector<SpecificAllocBase *> lld::SpecificAllocBase::Instances;
+BumpPtrAllocator lld::bAlloc;
+StringSaver lld::saver{bAlloc};
+std::vector<SpecificAllocBase *> lld::SpecificAllocBase::instances;
 
 void lld::freeArena() {
-  for (SpecificAllocBase *Alloc : SpecificAllocBase::Instances)
-    Alloc->reset();
-  BAlloc.Reset();
+  for (SpecificAllocBase *alloc : SpecificAllocBase::instances)
+    alloc->reset();
+  bAlloc.Reset();
 }
diff --git a/deps/lld/Common/Reproduce.cpp b/deps/lld/Common/Reproduce.cpp
index 7be4ea6bb98b550fa54bce707187ae4e897557dd..24210c420418c8a34d014cfca6f9aa38bec0dba7 100644
--- a/deps/lld/Common/Reproduce.cpp
+++ b/deps/lld/Common/Reproduce.cpp
@@ -1,9 +1,8 @@
 //===- Reproduce.cpp - Utilities for creating reproducers -----------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -22,45 +21,41 @@ using namespace llvm::sys;
 // assuming that the current directory is "/home/john/bar".
 // Returned string is a forward slash separated path even on Windows to avoid
 // a mess with backslash-as-escape and backslash-as-path-separator.
-std::string lld::relativeToRoot(StringRef Path) {
-  SmallString<128> Abs = Path;
-  if (fs::make_absolute(Abs))
-    return Path;
-  path::remove_dots(Abs, /*remove_dot_dot=*/true);
+std::string lld::relativeToRoot(StringRef path) {
+  SmallString<128> abs = path;
+  if (fs::make_absolute(abs))
+    return path;
+  path::remove_dots(abs, /*remove_dot_dot=*/true);
 
   // This is Windows specific. root_name() returns a drive letter
   // (e.g. "c:") or a UNC name (//net). We want to keep it as part
   // of the result.
-  SmallString<128> Res;
-  StringRef Root = path::root_name(Abs);
-  if (Root.endswith(":"))
-    Res = Root.drop_back();
-  else if (Root.startswith("//"))
-    Res = Root.substr(2);
+  SmallString<128> res;
+  StringRef root = path::root_name(abs);
+  if (root.endswith(":"))
+    res = root.drop_back();
+  else if (root.startswith("//"))
+    res = root.substr(2);
 
-  path::append(Res, path::relative_path(Abs));
-  return path::convert_to_slash(Res);
+  path::append(res, path::relative_path(abs));
+  return path::convert_to_slash(res);
 }
 
 // Quote a given string if it contains a space character.
-std::string lld::quote(StringRef S) {
-  if (S.contains(' '))
-    return ("\"" + S + "\"").str();
-  return S;
+std::string lld::quote(StringRef s) {
+  if (s.contains(' '))
+    return ("\"" + s + "\"").str();
+  return s;
 }
 
-std::string lld::rewritePath(StringRef S) {
-  if (fs::exists(S))
-    return relativeToRoot(S);
-  return S;
-}
-
-std::string lld::toString(const opt::Arg &Arg) {
-  std::string K = Arg.getSpelling();
-  if (Arg.getNumValues() == 0)
-    return K;
-  std::string V = quote(Arg.getValue());
-  if (Arg.getOption().getRenderStyle() == opt::Option::RenderJoinedStyle)
-    return K + V;
-  return K + " " + V;
+// Converts an Arg to a string representation suitable for a response file.
+// To show an Arg in a diagnostic, use Arg::getAsString() instead.
+std::string lld::toString(const opt::Arg &arg) {
+  std::string k = arg.getSpelling();
+  if (arg.getNumValues() == 0)
+    return k;
+  std::string v = quote(arg.getValue());
+  if (arg.getOption().getRenderStyle() == opt::Option::RenderJoinedStyle)
+    return k + v;
+  return k + " " + v;
 }
diff --git a/deps/lld/Common/Strings.cpp b/deps/lld/Common/Strings.cpp
index 6f74865b7f42d383091a99c7108af74173172ce0..0bf06626cc7a9bbca27ed71e865f64c1aae504d9 100644
--- a/deps/lld/Common/Strings.cpp
+++ b/deps/lld/Common/Strings.cpp
@@ -1,9 +1,8 @@
 //===- Strings.cpp -------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -20,85 +19,85 @@ using namespace llvm;
 using namespace lld;
 
 // Returns the demangled C++ symbol name for Name.
-Optional<std::string> lld::demangleItanium(StringRef Name) {
+Optional<std::string> lld::demangleItanium(StringRef name) {
   // itaniumDemangle can be used to demangle strings other than symbol
   // names which do not necessarily start with "_Z". Name can be
   // either a C or C++ symbol. Don't call itaniumDemangle if the name
   // does not look like a C++ symbol name to avoid getting unexpected
   // result for a C symbol that happens to match a mangled type name.
-  if (!Name.startswith("_Z"))
+  if (!name.startswith("_Z"))
     return None;
 
-  char *Buf = itaniumDemangle(Name.str().c_str(), nullptr, nullptr, nullptr);
-  if (!Buf)
+  char *buf = itaniumDemangle(name.str().c_str(), nullptr, nullptr, nullptr);
+  if (!buf)
     return None;
-  std::string S(Buf);
-  free(Buf);
-  return S;
+  std::string s(buf);
+  free(buf);
+  return s;
 }
 
-Optional<std::string> lld::demangleMSVC(StringRef Name) {
-  std::string Prefix;
-  if (Name.consume_front("__imp_"))
-    Prefix = "__declspec(dllimport) ";
+Optional<std::string> lld::demangleMSVC(StringRef name) {
+  std::string prefix;
+  if (name.consume_front("__imp_"))
+    prefix = "__declspec(dllimport) ";
 
   // Demangle only C++ names.
-  if (!Name.startswith("?"))
+  if (!name.startswith("?"))
     return None;
 
-  char *Buf = microsoftDemangle(Name.str().c_str(), nullptr, nullptr, nullptr);
-  if (!Buf)
+  char *buf = microsoftDemangle(name.str().c_str(), nullptr, nullptr, nullptr);
+  if (!buf)
     return None;
-  std::string S(Buf);
-  free(Buf);
-  return Prefix + S;
+  std::string s(buf);
+  free(buf);
+  return prefix + s;
 }
 
-StringMatcher::StringMatcher(ArrayRef<StringRef> Pat) {
-  for (StringRef S : Pat) {
-    Expected<GlobPattern> Pat = GlobPattern::create(S);
-    if (!Pat)
-      error(toString(Pat.takeError()));
+StringMatcher::StringMatcher(ArrayRef<StringRef> pat) {
+  for (StringRef s : pat) {
+    Expected<GlobPattern> pat = GlobPattern::create(s);
+    if (!pat)
+      error(toString(pat.takeError()));
     else
-      Patterns.push_back(*Pat);
+      patterns.push_back(*pat);
   }
 }
 
-bool StringMatcher::match(StringRef S) const {
-  for (const GlobPattern &Pat : Patterns)
-    if (Pat.match(S))
+bool StringMatcher::match(StringRef s) const {
+  for (const GlobPattern &pat : patterns)
+    if (pat.match(s))
       return true;
   return false;
 }
 
 // Converts a hex string (e.g. "deadbeef") to a vector.
-std::vector<uint8_t> lld::parseHex(StringRef S) {
-  std::vector<uint8_t> Hex;
-  while (!S.empty()) {
-    StringRef B = S.substr(0, 2);
-    S = S.substr(2);
-    uint8_t H;
-    if (!to_integer(B, H, 16)) {
-      error("not a hexadecimal value: " + B);
+std::vector<uint8_t> lld::parseHex(StringRef s) {
+  std::vector<uint8_t> hex;
+  while (!s.empty()) {
+    StringRef b = s.substr(0, 2);
+    s = s.substr(2);
+    uint8_t h;
+    if (!to_integer(b, h, 16)) {
+      error("not a hexadecimal value: " + b);
       return {};
     }
-    Hex.push_back(H);
+    hex.push_back(h);
   }
-  return Hex;
+  return hex;
 }
 
 // Returns true if S is valid as a C language identifier.
-bool lld::isValidCIdentifier(StringRef S) {
-  return !S.empty() && (isAlpha(S[0]) || S[0] == '_') &&
-         std::all_of(S.begin() + 1, S.end(),
-                     [](char C) { return C == '_' || isAlnum(C); });
+bool lld::isValidCIdentifier(StringRef s) {
+  return !s.empty() && (isAlpha(s[0]) || s[0] == '_') &&
+         std::all_of(s.begin() + 1, s.end(),
+                     [](char c) { return c == '_' || isAlnum(c); });
 }
 
 // Write the contents of the a buffer to a file
-void lld::saveBuffer(StringRef Buffer, const Twine &Path) {
-  std::error_code EC;
-  raw_fd_ostream OS(Path.str(), EC, sys::fs::OpenFlags::F_None);
-  if (EC)
-    error("cannot create " + Path + ": " + EC.message());
-  OS << Buffer;
+void lld::saveBuffer(StringRef buffer, const Twine &path) {
+  std::error_code ec;
+  raw_fd_ostream os(path.str(), ec, sys::fs::OpenFlags::F_None);
+  if (ec)
+    error("cannot create " + path + ": " + ec.message());
+  os << buffer;
 }
diff --git a/deps/lld/Common/TargetOptionsCommandFlags.cpp b/deps/lld/Common/TargetOptionsCommandFlags.cpp
index 7a3fc510704f570157edfb3c9341a10849339eaf..d4c29d7f88b80d0c46d7c1caaa3da06f6efe65ce 100644
--- a/deps/lld/Common/TargetOptionsCommandFlags.cpp
+++ b/deps/lld/Common/TargetOptionsCommandFlags.cpp
@@ -1,9 +1,8 @@
 //===-- TargetOptionsCommandFlags.cpp ---------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -20,16 +19,17 @@
 #include "llvm/Target/TargetOptions.h"
 
 // Define an externally visible version of
-// InitTargetOptionsFromCodeGenFlags, so that its functionality can be
+// initTargetOptionsFromCodeGenFlags, so that its functionality can be
 // used without having to include llvm/CodeGen/CommandFlags.inc, which
 // would lead to multiple definitions of the command line flags.
-llvm::TargetOptions lld::InitTargetOptionsFromCodeGenFlags() {
+llvm::TargetOptions lld::initTargetOptionsFromCodeGenFlags() {
   return ::InitTargetOptionsFromCodeGenFlags();
 }
 
-llvm::Optional<llvm::CodeModel::Model> lld::GetCodeModelFromCMModel() {
+llvm::Optional<llvm::CodeModel::Model> lld::getCodeModelFromCMModel() {
   return getCodeModel();
 }
 
-std::string lld::GetCPUStr() { return ::getCPUStr(); }
-std::vector<std::string> lld::GetMAttrs() { return ::MAttrs; }
+std::string lld::getCPUStr() { return ::getCPUStr(); }
+
+std::vector<std::string> lld::getMAttrs() { return ::MAttrs; }
diff --git a/deps/lld/Common/Threads.cpp b/deps/lld/Common/Threads.cpp
index c64b8c38b90918bd7608559286d44626969e4fcf..af04972a37602c2b0150eb3f20c099c44df39402 100644
--- a/deps/lld/Common/Threads.cpp
+++ b/deps/lld/Common/Threads.cpp
@@ -1,12 +1,11 @@
 //===- Threads.cpp --------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "lld/Common/Threads.h"
 
-bool lld::ThreadsEnabled = true;
+bool lld::threadsEnabled = true;
diff --git a/deps/lld/Common/Timer.cpp b/deps/lld/Common/Timer.cpp
index 89f9829b47cf202e2a608b90cd0ee123f4eaff99..4b7d11003b2cbb1b9e75f27f16284319796033e7 100644
--- a/deps/lld/Common/Timer.cpp
+++ b/deps/lld/Common/Timer.cpp
@@ -1,9 +1,8 @@
 //===- Timer.cpp ----------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -14,43 +13,43 @@
 using namespace lld;
 using namespace llvm;
 
-ScopedTimer::ScopedTimer(Timer &T) : T(&T) { T.start(); }
+ScopedTimer::ScopedTimer(Timer &t) : t(&t) { t.start(); }
 
 void ScopedTimer::stop() {
-  if (!T)
+  if (!t)
     return;
-  T->stop();
-  T = nullptr;
+  t->stop();
+  t = nullptr;
 }
 
 ScopedTimer::~ScopedTimer() { stop(); }
 
-Timer::Timer(llvm::StringRef Name) : Name(Name), Parent(nullptr) {}
-Timer::Timer(llvm::StringRef Name, Timer &Parent)
-    : Name(Name), Parent(&Parent) {}
+Timer::Timer(llvm::StringRef name) : name(name), parent(nullptr) {}
+Timer::Timer(llvm::StringRef name, Timer &parent)
+    : name(name), parent(&parent) {}
 
 void Timer::start() {
-  if (Parent && Total.count() == 0)
-    Parent->Children.push_back(this);
-  StartTime = std::chrono::high_resolution_clock::now();
+  if (parent && total.count() == 0)
+    parent->children.push_back(this);
+  startTime = std::chrono::high_resolution_clock::now();
 }
 
 void Timer::stop() {
-  Total += (std::chrono::high_resolution_clock::now() - StartTime);
+  total += (std::chrono::high_resolution_clock::now() - startTime);
 }
 
 Timer &Timer::root() {
-  static Timer RootTimer("Total Link Time");
-  return RootTimer;
+  static Timer rootTimer("Total Link Time");
+  return rootTimer;
 }
 
 void Timer::print() {
-  double TotalDuration = static_cast<double>(root().millis());
+  double totalDuration = static_cast<double>(root().millis());
 
   // We want to print the grand total under all the intermediate phases, so we
   // print all children first, then print the total under that.
-  for (const auto &Child : Children)
-    Child->print(1, TotalDuration);
+  for (const auto &child : children)
+    child->print(1, totalDuration);
 
   message(std::string(49, '-'));
 
@@ -59,22 +58,22 @@ void Timer::print() {
 
 double Timer::millis() const {
   return std::chrono::duration_cast<std::chrono::duration<double, std::milli>>(
-             Total)
+             total)
       .count();
 }
 
-void Timer::print(int Depth, double TotalDuration, bool Recurse) const {
-  double P = 100.0 * millis() / TotalDuration;
+void Timer::print(int depth, double totalDuration, bool recurse) const {
+  double p = 100.0 * millis() / totalDuration;
 
-  SmallString<32> Str;
-  llvm::raw_svector_ostream Stream(Str);
-  std::string S = std::string(Depth * 2, ' ') + Name + std::string(":");
-  Stream << format("%-30s%5d ms (%5.1f%%)", S.c_str(), (int)millis(), P);
+  SmallString<32> str;
+  llvm::raw_svector_ostream stream(str);
+  std::string s = std::string(depth * 2, ' ') + name + std::string(":");
+  stream << format("%-30s%5d ms (%5.1f%%)", s.c_str(), (int)millis(), p);
 
-  message(Str);
+  message(str);
 
-  if (Recurse) {
-    for (const auto &Child : Children)
-      Child->print(Depth + 1, TotalDuration);
+  if (recurse) {
+    for (const auto &child : children)
+      child->print(depth + 1, totalDuration);
   }
 }
diff --git a/deps/lld/Common/Version.cpp b/deps/lld/Common/Version.cpp
index 6226c9a2fac69f4b2703a0f1a352f70926d42f85..ae10f2f28b2296bda6e64cdc6008817a50af6730 100644
--- a/deps/lld/Common/Version.cpp
+++ b/deps/lld/Common/Version.cpp
@@ -1,9 +1,8 @@
 //===- lib/Common/Version.cpp - LLD Version Number ---------------*- C++-=====//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -13,31 +12,16 @@
 
 #include "lld/Common/Version.h"
 
-using namespace llvm;
+#ifdef HAVE_VCS_VERSION_INC
+#include "VCSVersion.inc"
+#endif
 
-// Returns an SVN repository path, which is usually "trunk".
-static std::string getRepositoryPath() {
-  StringRef S = LLD_REPOSITORY_STRING;
-  size_t Pos = S.find("lld/");
-  if (Pos != StringRef::npos)
-    return S.substr(Pos + 4);
-  return S;
-}
-
-// Returns an SVN repository name, e.g., " (trunk 284614)"
-// or an empty string if no repository info is available.
-static std::string getRepository() {
-  std::string Repo = getRepositoryPath();
-  std::string Rev = LLD_REVISION_STRING;
-
-  if (Repo.empty() && Rev.empty())
-    return "";
-  if (!Repo.empty() && !Rev.empty())
-    return " (" + Repo + " " + Rev + ")";
-  return " (" + Repo + Rev + ")";
-}
-
-// Returns a version string, e.g., "LLD 4.0 (lld/trunk 284614)".
+// Returns a version string, e.g.:
+// lld 9.0.0 (https://github.com/llvm/llvm-project.git 9efdd7ac5e914d3c9fa1ef)
 std::string lld::getLLDVersion() {
-  return "LLD " + std::string(LLD_VERSION_STRING) + getRepository();
+#if defined(LLD_REPOSITORY) && defined(LLD_REVISION)
+  return "LLD " LLD_VERSION_STRING " (" LLD_REPOSITORY " " LLD_REVISION ")";
+#else
+  return "LLD " LLD_VERSION_STRING;
+#endif
 }
diff --git a/deps/lld/ELF/AArch64ErrataFix.cpp b/deps/lld/ELF/AArch64ErrataFix.cpp
index ac753cb582653e3cbfb37dda53b498fa2065970f..b2eda4dcbc4e986f2e016a7f152ac75ce79bb031 100644
--- a/deps/lld/ELF/AArch64ErrataFix.cpp
+++ b/deps/lld/ELF/AArch64ErrataFix.cpp
@@ -1,9 +1,8 @@
 //===- AArch64ErrataFix.cpp -----------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 // This file implements Section Patching for the purpose of working around
@@ -57,8 +56,8 @@ using namespace lld::elf;
 
 // ADRP
 // | 1 | immlo (2) | 1 | 0 0 0 0 | immhi (19) | Rd (5) |
-static bool isADRP(uint32_t Instr) {
-  return (Instr & 0x9f000000) == 0x90000000;
+static bool isADRP(uint32_t instr) {
+  return (instr & 0x9f000000) == 0x90000000;
 }
 
 // Load and store bit patterns from ARMv8-A ARM ARM.
@@ -67,8 +66,8 @@ static bool isADRP(uint32_t Instr) {
 
 // All loads and stores have 1 (at bit postion 27), (0 at bit position 25).
 // | op0 x op1 (2) | 1 op2 0 op3 (2) | x | op4 (5) | xxxx | op5 (2) | x (10) |
-static bool isLoadStoreClass(uint32_t Instr) {
-  return (Instr & 0x0a000000) == 0x08000000;
+static bool isLoadStoreClass(uint32_t instr) {
+  return (instr & 0x0a000000) == 0x08000000;
 }
 
 // LDN/STN multiple no offset
@@ -83,20 +82,20 @@ static bool isLoadStoreClass(uint32_t Instr) {
 // opcode == 0110 ST1 3 registers.
 // opcode == 0111 ST1 1 register.
 // opcode == 1010 ST1 2 registers.
-static bool isST1MultipleOpcode(uint32_t Instr) {
-  return (Instr & 0x0000f000) == 0x00002000 ||
-         (Instr & 0x0000f000) == 0x00006000 ||
-         (Instr & 0x0000f000) == 0x00007000 ||
-         (Instr & 0x0000f000) == 0x0000a000;
+static bool isST1MultipleOpcode(uint32_t instr) {
+  return (instr & 0x0000f000) == 0x00002000 ||
+         (instr & 0x0000f000) == 0x00006000 ||
+         (instr & 0x0000f000) == 0x00007000 ||
+         (instr & 0x0000f000) == 0x0000a000;
 }
 
-static bool isST1Multiple(uint32_t Instr) {
-  return (Instr & 0xbfff0000) == 0x0c000000 && isST1MultipleOpcode(Instr);
+static bool isST1Multiple(uint32_t instr) {
+  return (instr & 0xbfff0000) == 0x0c000000 && isST1MultipleOpcode(instr);
 }
 
 // Writes to Rn (writeback).
-static bool isST1MultiplePost(uint32_t Instr) {
-  return (Instr & 0xbfe00000) == 0x0c800000 && isST1MultipleOpcode(Instr);
+static bool isST1MultiplePost(uint32_t instr) {
+  return (instr & 0xbfe00000) == 0x0c800000 && isST1MultipleOpcode(instr);
 }
 
 // LDN/STN single no offset
@@ -111,41 +110,41 @@ static bool isST1MultiplePost(uint32_t Instr) {
 // opcode == 000 ST1 8-bit.
 // opcode == 010 ST1 16-bit.
 // opcode == 100 ST1 32 or 64-bit (Size determines which).
-static bool isST1SingleOpcode(uint32_t Instr) {
-  return (Instr & 0x0040e000) == 0x00000000 ||
-         (Instr & 0x0040e000) == 0x00004000 ||
-         (Instr & 0x0040e000) == 0x00008000;
+static bool isST1SingleOpcode(uint32_t instr) {
+  return (instr & 0x0040e000) == 0x00000000 ||
+         (instr & 0x0040e000) == 0x00004000 ||
+         (instr & 0x0040e000) == 0x00008000;
 }
 
-static bool isST1Single(uint32_t Instr) {
-  return (Instr & 0xbfff0000) == 0x0d000000 && isST1SingleOpcode(Instr);
+static bool isST1Single(uint32_t instr) {
+  return (instr & 0xbfff0000) == 0x0d000000 && isST1SingleOpcode(instr);
 }
 
 // Writes to Rn (writeback).
-static bool isST1SinglePost(uint32_t Instr) {
-  return (Instr & 0xbfe00000) == 0x0d800000 && isST1SingleOpcode(Instr);
+static bool isST1SinglePost(uint32_t instr) {
+  return (instr & 0xbfe00000) == 0x0d800000 && isST1SingleOpcode(instr);
 }
 
-static bool isST1(uint32_t Instr) {
-  return isST1Multiple(Instr) || isST1MultiplePost(Instr) ||
-         isST1Single(Instr) || isST1SinglePost(Instr);
+static bool isST1(uint32_t instr) {
+  return isST1Multiple(instr) || isST1MultiplePost(instr) ||
+         isST1Single(instr) || isST1SinglePost(instr);
 }
 
 // Load/store exclusive
 // | size (2) 00 | 1000 | o2 L o1 | Rs (5) | o0 | Rt2 (5) | Rn (5) | Rt (5) |
 // L == 0 for Stores.
-static bool isLoadStoreExclusive(uint32_t Instr) {
-  return (Instr & 0x3f000000) == 0x08000000;
+static bool isLoadStoreExclusive(uint32_t instr) {
+  return (instr & 0x3f000000) == 0x08000000;
 }
 
-static bool isLoadExclusive(uint32_t Instr) {
-  return (Instr & 0x3f400000) == 0x08400000;
+static bool isLoadExclusive(uint32_t instr) {
+  return (instr & 0x3f400000) == 0x08400000;
 }
 
 // Load register literal
 // | opc (2) 01 | 1 V 00 | imm19 | Rt (5) |
-static bool isLoadLiteral(uint32_t Instr) {
-  return (Instr & 0x3b000000) == 0x18000000;
+static bool isLoadLiteral(uint32_t instr) {
+  return (instr & 0x3b000000) == 0x18000000;
 }
 
 // Load/store no-allocate pair
@@ -153,8 +152,8 @@ static bool isLoadLiteral(uint32_t Instr) {
 // | opc (2) 10 | 1 V 00 | 0 L | imm7 | Rt2 (5) | Rn (5) | Rt (5) |
 // L == 0 for stores.
 // Never writes to register
-static bool isSTNP(uint32_t Instr) {
-  return (Instr & 0x3bc00000) == 0x28000000;
+static bool isSTNP(uint32_t instr) {
+  return (instr & 0x3bc00000) == 0x28000000;
 }
 
 // Load/store register pair
@@ -162,69 +161,69 @@ static bool isSTNP(uint32_t Instr) {
 // | opc (2) 10 | 1 V 00 | 1 L | imm7 | Rt2 (5) | Rn (5) | Rt (5) |
 // L == 0 for stores, V == 0 for Scalar, V == 1 for Simd/FP
 // Writes to Rn.
-static bool isSTPPost(uint32_t Instr) {
-  return (Instr & 0x3bc00000) == 0x28800000;
+static bool isSTPPost(uint32_t instr) {
+  return (instr & 0x3bc00000) == 0x28800000;
 }
 
 // (offset)
 // | opc (2) 10 | 1 V 01 | 0 L | imm7 | Rt2 (5) | Rn (5) | Rt (5) |
-static bool isSTPOffset(uint32_t Instr) {
-  return (Instr & 0x3bc00000) == 0x29000000;
+static bool isSTPOffset(uint32_t instr) {
+  return (instr & 0x3bc00000) == 0x29000000;
 }
 
 // (pre-index)
 // | opc (2) 10 | 1 V 01 | 1 L | imm7 | Rt2 (5) | Rn (5) | Rt (5) |
 // Writes to Rn.
-static bool isSTPPre(uint32_t Instr) {
-  return (Instr & 0x3bc00000) == 0x29800000;
+static bool isSTPPre(uint32_t instr) {
+  return (instr & 0x3bc00000) == 0x29800000;
 }
 
-static bool isSTP(uint32_t Instr) {
-  return isSTPPost(Instr) || isSTPOffset(Instr) || isSTPPre(Instr);
+static bool isSTP(uint32_t instr) {
+  return isSTPPost(instr) || isSTPOffset(instr) || isSTPPre(instr);
 }
 
 // Load/store register (unscaled immediate)
 // | size (2) 11 | 1 V 00 | opc (2) 0 | imm9 | 00 | Rn (5) | Rt (5) |
 // V == 0 for Scalar, V == 1 for Simd/FP.
-static bool isLoadStoreUnscaled(uint32_t Instr) {
-  return (Instr & 0x3b000c00) == 0x38000000;
+static bool isLoadStoreUnscaled(uint32_t instr) {
+  return (instr & 0x3b000c00) == 0x38000000;
 }
 
 // Load/store register (immediate post-indexed)
 // | size (2) 11 | 1 V 00 | opc (2) 0 | imm9 | 01 | Rn (5) | Rt (5) |
-static bool isLoadStoreImmediatePost(uint32_t Instr) {
-  return (Instr & 0x3b200c00) == 0x38000400;
+static bool isLoadStoreImmediatePost(uint32_t instr) {
+  return (instr & 0x3b200c00) == 0x38000400;
 }
 
 // Load/store register (unprivileged)
 // | size (2) 11 | 1 V 00 | opc (2) 0 | imm9 | 10 | Rn (5) | Rt (5) |
-static bool isLoadStoreUnpriv(uint32_t Instr) {
-  return (Instr & 0x3b200c00) == 0x38000800;
+static bool isLoadStoreUnpriv(uint32_t instr) {
+  return (instr & 0x3b200c00) == 0x38000800;
 }
 
 // Load/store register (immediate pre-indexed)
 // | size (2) 11 | 1 V 00 | opc (2) 0 | imm9 | 11 | Rn (5) | Rt (5) |
-static bool isLoadStoreImmediatePre(uint32_t Instr) {
-  return (Instr & 0x3b200c00) == 0x38000c00;
+static bool isLoadStoreImmediatePre(uint32_t instr) {
+  return (instr & 0x3b200c00) == 0x38000c00;
 }
 
 // Load/store register (register offset)
 // | size (2) 11 | 1 V 00 | opc (2) 1 | Rm (5) | option (3) S | 10 | Rn | Rt |
-static bool isLoadStoreRegisterOff(uint32_t Instr) {
-  return (Instr & 0x3b200c00) == 0x38200800;
+static bool isLoadStoreRegisterOff(uint32_t instr) {
+  return (instr & 0x3b200c00) == 0x38200800;
 }
 
 // Load/store register (unsigned immediate)
 // | size (2) 11 | 1 V 01 | opc (2) | imm12 | Rn (5) | Rt (5) |
-static bool isLoadStoreRegisterUnsigned(uint32_t Instr) {
-  return (Instr & 0x3b000000) == 0x39000000;
+static bool isLoadStoreRegisterUnsigned(uint32_t instr) {
+  return (instr & 0x3b000000) == 0x39000000;
 }
 
 // Rt is always in bit position 0 - 4.
-static uint32_t getRt(uint32_t Instr) { return (Instr & 0x1f); }
+static uint32_t getRt(uint32_t instr) { return (instr & 0x1f); }
 
 // Rn is always in bit position 5 - 9.
-static uint32_t getRn(uint32_t Instr) { return (Instr >> 5) & 0x1f; }
+static uint32_t getRn(uint32_t instr) { return (instr >> 5) & 0x1f; }
 
 // C4.1.2 Branches, Exception Generating and System instructions
 // | op0 (3) 1 | 01 op1 (4) | x (22) |
@@ -233,41 +232,41 @@ static uint32_t getRn(uint32_t Instr) { return (Instr >> 5) & 0x1f; }
 // op0 == x00 101 op1 == xxxx Unconditional Branch immediate.
 // op0 == x01 101 op1 == 0xxx Compare and branch immediate.
 // op0 == x01 101 op1 == 1xxx Test and branch immediate.
-static bool isBranch(uint32_t Instr) {
-  return ((Instr & 0xfe000000) == 0xd6000000) || // Cond branch.
-         ((Instr & 0xfe000000) == 0x54000000) || // Uncond branch reg.
-         ((Instr & 0x7c000000) == 0x14000000) || // Uncond branch imm.
-         ((Instr & 0x7c000000) == 0x34000000);   // Compare and test branch.
+static bool isBranch(uint32_t instr) {
+  return ((instr & 0xfe000000) == 0xd6000000) || // Cond branch.
+         ((instr & 0xfe000000) == 0x54000000) || // Uncond branch reg.
+         ((instr & 0x7c000000) == 0x14000000) || // Uncond branch imm.
+         ((instr & 0x7c000000) == 0x34000000);   // Compare and test branch.
 }
 
-static bool isV8SingleRegisterNonStructureLoadStore(uint32_t Instr) {
-  return isLoadStoreUnscaled(Instr) || isLoadStoreImmediatePost(Instr) ||
-         isLoadStoreUnpriv(Instr) || isLoadStoreImmediatePre(Instr) ||
-         isLoadStoreRegisterOff(Instr) || isLoadStoreRegisterUnsigned(Instr);
+static bool isV8SingleRegisterNonStructureLoadStore(uint32_t instr) {
+  return isLoadStoreUnscaled(instr) || isLoadStoreImmediatePost(instr) ||
+         isLoadStoreUnpriv(instr) || isLoadStoreImmediatePre(instr) ||
+         isLoadStoreRegisterOff(instr) || isLoadStoreRegisterUnsigned(instr);
 }
 
 // Note that this function refers to v8.0 only and does not include the
 // additional load and store instructions added for in later revisions of
 // the architecture such as the Atomic memory operations introduced
 // in v8.1.
-static bool isV8NonStructureLoad(uint32_t Instr) {
-  if (isLoadExclusive(Instr))
+static bool isV8NonStructureLoad(uint32_t instr) {
+  if (isLoadExclusive(instr))
     return true;
-  if (isLoadLiteral(Instr))
+  if (isLoadLiteral(instr))
     return true;
-  else if (isV8SingleRegisterNonStructureLoadStore(Instr)) {
+  else if (isV8SingleRegisterNonStructureLoadStore(instr)) {
     // For Load and Store single register, Loads are derived from a
     // combination of the Size, V and Opc fields.
-    uint32_t Size = (Instr >> 30) & 0xff;
-    uint32_t V = (Instr >> 26) & 0x1;
-    uint32_t Opc = (Instr >> 22) & 0x3;
+    uint32_t size = (instr >> 30) & 0xff;
+    uint32_t v = (instr >> 26) & 0x1;
+    uint32_t opc = (instr >> 22) & 0x3;
     // For the load and store instructions that we are decoding.
     // Opc == 0 are all stores.
     // Opc == 1 with a couple of exceptions are loads. The exceptions are:
     // Size == 00 (0), V == 1, Opc == 10 (2) which is a store and
     // Size == 11 (3), V == 0, Opc == 10 (2) which is a prefetch.
-    return Opc != 0 && !(Size == 0 && V == 1 && Opc == 2) &&
-           !(Size == 3 && V == 0 && Opc == 2);
+    return opc != 0 && !(size == 0 && v == 1 && opc == 2) &&
+           !(size == 3 && v == 0 && opc == 2);
   }
   return false;
 }
@@ -276,18 +275,18 @@ static bool isV8NonStructureLoad(uint32_t Instr) {
 // needed for errata 843419.
 
 // Instruction with writeback updates the index register after the load/store.
-static bool hasWriteback(uint32_t Instr) {
-  return isLoadStoreImmediatePre(Instr) || isLoadStoreImmediatePost(Instr) ||
-         isSTPPre(Instr) || isSTPPost(Instr) || isST1SinglePost(Instr) ||
-         isST1MultiplePost(Instr);
+static bool hasWriteback(uint32_t instr) {
+  return isLoadStoreImmediatePre(instr) || isLoadStoreImmediatePost(instr) ||
+         isSTPPre(instr) || isSTPPost(instr) || isST1SinglePost(instr) ||
+         isST1MultiplePost(instr);
 }
 
 // For the load and store class of instructions, a load can write to the
 // destination register, a load and a store can write to the base register when
 // the instruction has writeback.
-static bool doesLoadStoreWriteToReg(uint32_t Instr, uint32_t Reg) {
-  return (isV8NonStructureLoad(Instr) && getRt(Instr) == Reg) ||
-         (hasWriteback(Instr) && getRn(Instr) == Reg);
+static bool doesLoadStoreWriteToReg(uint32_t instr, uint32_t reg) {
+  return (isV8NonStructureLoad(instr) && getRt(instr) == reg) ||
+         (hasWriteback(instr) && getRn(instr) == reg);
 }
 
 // Scanner for Cortex-A53 errata 843419
@@ -319,18 +318,18 @@ static bool doesLoadStoreWriteToReg(uint32_t Instr, uint32_t Reg) {
 // Return true if the Instruction sequence Adrp, Instr2, and Instr4 match
 // the erratum sequence. The Adrp, Instr2 and Instr4 correspond to 1.), 2.),
 // and 4.) in the Scanner for Cortex-A53 errata comment above.
-static bool is843419ErratumSequence(uint32_t Instr1, uint32_t Instr2,
-                                    uint32_t Instr4) {
-  if (!isADRP(Instr1))
+static bool is843419ErratumSequence(uint32_t instr1, uint32_t instr2,
+                                    uint32_t instr4) {
+  if (!isADRP(instr1))
     return false;
 
-  uint32_t Rn = getRt(Instr1);
-  return isLoadStoreClass(Instr2) &&
-         (isLoadStoreExclusive(Instr2) || isLoadLiteral(Instr2) ||
-          isV8SingleRegisterNonStructureLoadStore(Instr2) || isSTP(Instr2) ||
-          isSTNP(Instr2) || isST1(Instr2)) &&
-         !doesLoadStoreWriteToReg(Instr2, Rn) &&
-         isLoadStoreRegisterUnsigned(Instr4) && getRn(Instr4) == Rn;
+  uint32_t rn = getRt(instr1);
+  return isLoadStoreClass(instr2) &&
+         (isLoadStoreExclusive(instr2) || isLoadLiteral(instr2) ||
+          isV8SingleRegisterNonStructureLoadStore(instr2) || isSTP(instr2) ||
+          isSTNP(instr2) || isST1(instr2)) &&
+         !doesLoadStoreWriteToReg(instr2, rn) &&
+         isLoadStoreRegisterUnsigned(instr4) && getRn(instr4) == rn;
 }
 
 // Scan the instruction sequence starting at Offset Off from the base of
@@ -339,143 +338,143 @@ static bool is843419ErratumSequence(uint32_t Instr1, uint32_t Instr2,
 // instructions we've scanned.
 // Return the offset of the load or store instruction in IS that we want to
 // patch or 0 if no patch required.
-static uint64_t scanCortexA53Errata843419(InputSection *IS, uint64_t &Off,
-                                          uint64_t Limit) {
-  uint64_t ISAddr = IS->getVA(0);
+static uint64_t scanCortexA53Errata843419(InputSection *isec, uint64_t &off,
+                                          uint64_t limit) {
+  uint64_t isecAddr = isec->getVA(0);
 
   // Advance Off so that (ISAddr + Off) modulo 0x1000 is at least 0xff8.
-  uint64_t InitialPageOff = (ISAddr + Off) & 0xfff;
-  if (InitialPageOff < 0xff8)
-    Off += 0xff8 - InitialPageOff;
+  uint64_t initialPageOff = (isecAddr + off) & 0xfff;
+  if (initialPageOff < 0xff8)
+    off += 0xff8 - initialPageOff;
 
-  bool OptionalAllowed = Limit - Off > 12;
-  if (Off >= Limit || Limit - Off < 12) {
+  bool optionalAllowed = limit - off > 12;
+  if (off >= limit || limit - off < 12) {
     // Need at least 3 4-byte sized instructions to trigger erratum.
-    Off = Limit;
+    off = limit;
     return 0;
   }
 
-  uint64_t PatchOff = 0;
-  const uint8_t *Buf = IS->data().begin();
-  const ulittle32_t *InstBuf = reinterpret_cast<const ulittle32_t *>(Buf + Off);
-  uint32_t Instr1 = *InstBuf++;
-  uint32_t Instr2 = *InstBuf++;
-  uint32_t Instr3 = *InstBuf++;
-  if (is843419ErratumSequence(Instr1, Instr2, Instr3)) {
-    PatchOff = Off + 8;
-  } else if (OptionalAllowed && !isBranch(Instr3)) {
-    uint32_t Instr4 = *InstBuf++;
-    if (is843419ErratumSequence(Instr1, Instr2, Instr4))
-      PatchOff = Off + 12;
+  uint64_t patchOff = 0;
+  const uint8_t *buf = isec->data().begin();
+  const ulittle32_t *instBuf = reinterpret_cast<const ulittle32_t *>(buf + off);
+  uint32_t instr1 = *instBuf++;
+  uint32_t instr2 = *instBuf++;
+  uint32_t instr3 = *instBuf++;
+  if (is843419ErratumSequence(instr1, instr2, instr3)) {
+    patchOff = off + 8;
+  } else if (optionalAllowed && !isBranch(instr3)) {
+    uint32_t instr4 = *instBuf++;
+    if (is843419ErratumSequence(instr1, instr2, instr4))
+      patchOff = off + 12;
   }
-  if (((ISAddr + Off) & 0xfff) == 0xff8)
-    Off += 4;
+  if (((isecAddr + off) & 0xfff) == 0xff8)
+    off += 4;
   else
-    Off += 0xffc;
-  return PatchOff;
+    off += 0xffc;
+  return patchOff;
 }
 
 class lld::elf::Patch843419Section : public SyntheticSection {
 public:
-  Patch843419Section(InputSection *P, uint64_t Off);
+  Patch843419Section(InputSection *p, uint64_t off);
 
-  void writeTo(uint8_t *Buf) override;
+  void writeTo(uint8_t *buf) override;
 
   size_t getSize() const override { return 8; }
 
   uint64_t getLDSTAddr() const;
 
   // The Section we are patching.
-  const InputSection *Patchee;
+  const InputSection *patchee;
   // The offset of the instruction in the Patchee section we are patching.
-  uint64_t PatcheeOffset;
+  uint64_t patcheeOffset;
   // A label for the start of the Patch that we can use as a relocation target.
-  Symbol *PatchSym;
+  Symbol *patchSym;
 };
 
-lld::elf::Patch843419Section::Patch843419Section(InputSection *P, uint64_t Off)
+lld::elf::Patch843419Section::Patch843419Section(InputSection *p, uint64_t off)
     : SyntheticSection(SHF_ALLOC | SHF_EXECINSTR, SHT_PROGBITS, 4,
                        ".text.patch"),
-      Patchee(P), PatcheeOffset(Off) {
-  this->Parent = P->getParent();
-  PatchSym = addSyntheticLocal(
-      Saver.save("__CortexA53843419_" + utohexstr(getLDSTAddr())), STT_FUNC, 0,
+      patchee(p), patcheeOffset(off) {
+  this->parent = p->getParent();
+  patchSym = addSyntheticLocal(
+      saver.save("__CortexA53843419_" + utohexstr(getLDSTAddr())), STT_FUNC, 0,
       getSize(), *this);
-  addSyntheticLocal(Saver.save("$x"), STT_NOTYPE, 0, 0, *this);
+  addSyntheticLocal(saver.save("$x"), STT_NOTYPE, 0, 0, *this);
 }
 
 uint64_t lld::elf::Patch843419Section::getLDSTAddr() const {
-  return Patchee->getVA(PatcheeOffset);
+  return patchee->getVA(patcheeOffset);
 }
 
-void lld::elf::Patch843419Section::writeTo(uint8_t *Buf) {
+void lld::elf::Patch843419Section::writeTo(uint8_t *buf) {
   // Copy the instruction that we will be replacing with a branch in the
   // Patchee Section.
-  write32le(Buf, read32le(Patchee->data().begin() + PatcheeOffset));
+  write32le(buf, read32le(patchee->data().begin() + patcheeOffset));
 
   // Apply any relocation transferred from the original PatcheeSection.
-  // For a SyntheticSection Buf already has OutSecOff added, but relocateAlloc
-  // also adds OutSecOff so we need to subtract to avoid double counting.
-  this->relocateAlloc(Buf - OutSecOff, Buf - OutSecOff + getSize());
+  // For a SyntheticSection Buf already has outSecOff added, but relocateAlloc
+  // also adds outSecOff so we need to subtract to avoid double counting.
+  this->relocateAlloc(buf - outSecOff, buf - outSecOff + getSize());
 
   // Return address is the next instruction after the one we have just copied.
-  uint64_t S = getLDSTAddr() + 4;
-  uint64_t P = PatchSym->getVA() + 4;
-  Target->relocateOne(Buf + 4, R_AARCH64_JUMP26, S - P);
+  uint64_t s = getLDSTAddr() + 4;
+  uint64_t p = patchSym->getVA() + 4;
+  target->relocateOne(buf + 4, R_AARCH64_JUMP26, s - p);
 }
 
 void AArch64Err843419Patcher::init() {
   // The AArch64 ABI permits data in executable sections. We must avoid scanning
   // this data as if it were instructions to avoid false matches. We use the
   // mapping symbols in the InputObjects to identify this data, caching the
-  // results in SectionMap so we don't have to recalculate it each pass.
+  // results in sectionMap so we don't have to recalculate it each pass.
 
   // The ABI Section 4.5.4 Mapping symbols; defines local symbols that describe
   // half open intervals [Symbol Value, Next Symbol Value) of code and data
   // within sections. If there is no next symbol then the half open interval is
   // [Symbol Value, End of section). The type, code or data, is determined by
   // the mapping symbol name, $x for code, $d for data.
-  auto IsCodeMapSymbol = [](const Symbol *B) {
-    return B->getName() == "$x" || B->getName().startswith("$x.");
+  auto isCodeMapSymbol = [](const Symbol *b) {
+    return b->getName() == "$x" || b->getName().startswith("$x.");
   };
-  auto IsDataMapSymbol = [](const Symbol *B) {
-    return B->getName() == "$d" || B->getName().startswith("$d.");
+  auto isDataMapSymbol = [](const Symbol *b) {
+    return b->getName() == "$d" || b->getName().startswith("$d.");
   };
 
   // Collect mapping symbols for every executable InputSection.
-  for (InputFile *File : ObjectFiles) {
-    auto *F = cast<ObjFile<ELF64LE>>(File);
-    for (Symbol *B : F->getLocalSymbols()) {
-      auto *Def = dyn_cast<Defined>(B);
-      if (!Def)
+  for (InputFile *file : objectFiles) {
+    auto *f = cast<ObjFile<ELF64LE>>(file);
+    for (Symbol *b : f->getLocalSymbols()) {
+      auto *def = dyn_cast<Defined>(b);
+      if (!def)
         continue;
-      if (!IsCodeMapSymbol(Def) && !IsDataMapSymbol(Def))
+      if (!isCodeMapSymbol(def) && !isDataMapSymbol(def))
         continue;
-      if (auto *Sec = dyn_cast_or_null<InputSection>(Def->Section))
-        if (Sec->Flags & SHF_EXECINSTR)
-          SectionMap[Sec].push_back(Def);
+      if (auto *sec = dyn_cast_or_null<InputSection>(def->section))
+        if (sec->flags & SHF_EXECINSTR)
+          sectionMap[sec].push_back(def);
     }
   }
   // For each InputSection make sure the mapping symbols are in sorted in
   // ascending order and free from consecutive runs of mapping symbols with
   // the same type. For example we must remove the redundant $d.1 from $x.0
   // $d.0 $d.1 $x.1.
-  for (auto &KV : SectionMap) {
-    std::vector<const Defined *> &MapSyms = KV.second;
-    if (MapSyms.size() <= 1)
+  for (auto &kv : sectionMap) {
+    std::vector<const Defined *> &mapSyms = kv.second;
+    if (mapSyms.size() <= 1)
       continue;
-    std::stable_sort(
-        MapSyms.begin(), MapSyms.end(),
-        [](const Defined *A, const Defined *B) { return A->Value < B->Value; });
-    MapSyms.erase(
-        std::unique(MapSyms.begin(), MapSyms.end(),
-                    [=](const Defined *A, const Defined *B) {
-                      return (IsCodeMapSymbol(A) && IsCodeMapSymbol(B)) ||
-                             (IsDataMapSymbol(A) && IsDataMapSymbol(B));
+    llvm::stable_sort(mapSyms, [](const Defined *a, const Defined *b) {
+      return a->value < b->value;
+    });
+    mapSyms.erase(
+        std::unique(mapSyms.begin(), mapSyms.end(),
+                    [=](const Defined *a, const Defined *b) {
+                      return (isCodeMapSymbol(a) && isCodeMapSymbol(b)) ||
+                             (isDataMapSymbol(a) && isDataMapSymbol(b));
                     }),
-        MapSyms.end());
+        mapSyms.end());
   }
-  Initialized = true;
+  initialized = true;
 }
 
 // Insert the PatchSections we have created back into the
@@ -484,60 +483,60 @@ void AArch64Err843419Patcher::init() {
 // executable sections, although we may need to insert them earlier if the
 // InputSectionDescription is larger than the maximum branch range.
 void AArch64Err843419Patcher::insertPatches(
-    InputSectionDescription &ISD, std::vector<Patch843419Section *> &Patches) {
-  uint64_t ISLimit;
-  uint64_t PrevISLimit = ISD.Sections.front()->OutSecOff;
-  uint64_t PatchUpperBound = PrevISLimit + Target->getThunkSectionSpacing();
-  uint64_t OutSecAddr = ISD.Sections.front()->getParent()->Addr;
+    InputSectionDescription &isd, std::vector<Patch843419Section *> &patches) {
+  uint64_t isecLimit;
+  uint64_t prevIsecLimit = isd.sections.front()->outSecOff;
+  uint64_t patchUpperBound = prevIsecLimit + target->getThunkSectionSpacing();
+  uint64_t outSecAddr = isd.sections.front()->getParent()->addr;
 
-  // Set the OutSecOff of patches to the place where we want to insert them.
+  // Set the outSecOff of patches to the place where we want to insert them.
   // We use a similar strategy to Thunk placement. Place patches roughly
   // every multiple of maximum branch range.
-  auto PatchIt = Patches.begin();
-  auto PatchEnd = Patches.end();
-  for (const InputSection *IS : ISD.Sections) {
-    ISLimit = IS->OutSecOff + IS->getSize();
-    if (ISLimit > PatchUpperBound) {
-      while (PatchIt != PatchEnd) {
-        if ((*PatchIt)->getLDSTAddr() - OutSecAddr >= PrevISLimit)
+  auto patchIt = patches.begin();
+  auto patchEnd = patches.end();
+  for (const InputSection *isec : isd.sections) {
+    isecLimit = isec->outSecOff + isec->getSize();
+    if (isecLimit > patchUpperBound) {
+      while (patchIt != patchEnd) {
+        if ((*patchIt)->getLDSTAddr() - outSecAddr >= prevIsecLimit)
           break;
-        (*PatchIt)->OutSecOff = PrevISLimit;
-        ++PatchIt;
+        (*patchIt)->outSecOff = prevIsecLimit;
+        ++patchIt;
       }
-      PatchUpperBound = PrevISLimit + Target->getThunkSectionSpacing();
+      patchUpperBound = prevIsecLimit + target->getThunkSectionSpacing();
     }
-    PrevISLimit = ISLimit;
+    prevIsecLimit = isecLimit;
   }
-  for (; PatchIt != PatchEnd; ++PatchIt) {
-    (*PatchIt)->OutSecOff = ISLimit;
+  for (; patchIt != patchEnd; ++patchIt) {
+    (*patchIt)->outSecOff = isecLimit;
   }
 
-  // merge all patch sections. We use the OutSecOff assigned above to
+  // merge all patch sections. We use the outSecOff assigned above to
   // determine the insertion point. This is ok as we only merge into an
   // InputSectionDescription once per pass, and at the end of the pass
-  // assignAddresses() will recalculate all the OutSecOff values.
-  std::vector<InputSection *> Tmp;
-  Tmp.reserve(ISD.Sections.size() + Patches.size());
-  auto MergeCmp = [](const InputSection *A, const InputSection *B) {
-    if (A->OutSecOff < B->OutSecOff)
+  // assignAddresses() will recalculate all the outSecOff values.
+  std::vector<InputSection *> tmp;
+  tmp.reserve(isd.sections.size() + patches.size());
+  auto mergeCmp = [](const InputSection *a, const InputSection *b) {
+    if (a->outSecOff < b->outSecOff)
       return true;
-    if (A->OutSecOff == B->OutSecOff && isa<Patch843419Section>(A) &&
-        !isa<Patch843419Section>(B))
+    if (a->outSecOff == b->outSecOff && isa<Patch843419Section>(a) &&
+        !isa<Patch843419Section>(b))
       return true;
     return false;
   };
-  std::merge(ISD.Sections.begin(), ISD.Sections.end(), Patches.begin(),
-             Patches.end(), std::back_inserter(Tmp), MergeCmp);
-  ISD.Sections = std::move(Tmp);
+  std::merge(isd.sections.begin(), isd.sections.end(), patches.begin(),
+             patches.end(), std::back_inserter(tmp), mergeCmp);
+  isd.sections = std::move(tmp);
 }
 
-// Given an erratum sequence that starts at address AdrpAddr, with an
-// instruction that we need to patch at PatcheeOffset from the start of
+// Given an erratum sequence that starts at address adrpAddr, with an
+// instruction that we need to patch at patcheeOffset from the start of
 // InputSection IS, create a Patch843419 Section and add it to the
 // Patches that we need to insert.
-static void implementPatch(uint64_t AdrpAddr, uint64_t PatcheeOffset,
-                           InputSection *IS,
-                           std::vector<Patch843419Section *> &Patches) {
+static void implementPatch(uint64_t adrpAddr, uint64_t patcheeOffset,
+                           InputSection *isec,
+                           std::vector<Patch843419Section *> &patches) {
   // There may be a relocation at the same offset that we are patching. There
   // are four cases that we need to consider.
   // Case 1: R_AARCH64_JUMP26 branch relocation. We have already patched this
@@ -552,29 +551,29 @@ static void implementPatch(uint64_t AdrpAddr, uint64_t PatcheeOffset,
   // and replace the relocation with a R_AARCH_JUMP26 branch relocation.
   // Case 4: No relocation. We must create a new R_AARCH64_JUMP26 branch
   // relocation at the offset.
-  auto RelIt = std::find_if(
-      IS->Relocations.begin(), IS->Relocations.end(),
-      [=](const Relocation &R) { return R.Offset == PatcheeOffset; });
-  if (RelIt != IS->Relocations.end() &&
-      (RelIt->Type == R_AARCH64_JUMP26 || RelIt->Expr == R_RELAX_TLS_IE_TO_LE))
+  auto relIt = llvm::find_if(isec->relocations, [=](const Relocation &r) {
+    return r.offset == patcheeOffset;
+  });
+  if (relIt != isec->relocations.end() &&
+      (relIt->type == R_AARCH64_JUMP26 || relIt->expr == R_RELAX_TLS_IE_TO_LE))
     return;
 
   log("detected cortex-a53-843419 erratum sequence starting at " +
-      utohexstr(AdrpAddr) + " in unpatched output.");
+      utohexstr(adrpAddr) + " in unpatched output.");
 
-  auto *PS = make<Patch843419Section>(IS, PatcheeOffset);
-  Patches.push_back(PS);
+  auto *ps = make<Patch843419Section>(isec, patcheeOffset);
+  patches.push_back(ps);
 
-  auto MakeRelToPatch = [](uint64_t Offset, Symbol *PatchSym) {
-    return Relocation{R_PC, R_AARCH64_JUMP26, Offset, 0, PatchSym};
+  auto makeRelToPatch = [](uint64_t offset, Symbol *patchSym) {
+    return Relocation{R_PC, R_AARCH64_JUMP26, offset, 0, patchSym};
   };
 
-  if (RelIt != IS->Relocations.end()) {
-    PS->Relocations.push_back(
-        {RelIt->Expr, RelIt->Type, 0, RelIt->Addend, RelIt->Sym});
-    *RelIt = MakeRelToPatch(PatcheeOffset, PS->PatchSym);
+  if (relIt != isec->relocations.end()) {
+    ps->relocations.push_back(
+        {relIt->expr, relIt->type, 0, relIt->addend, relIt->sym});
+    *relIt = makeRelToPatch(patcheeOffset, ps->patchSym);
   } else
-    IS->Relocations.push_back(MakeRelToPatch(PatcheeOffset, PS->PatchSym));
+    isec->relocations.push_back(makeRelToPatch(patcheeOffset, ps->patchSym));
 }
 
 // Scan all the instructions in InputSectionDescription, for each instance of
@@ -582,40 +581,40 @@ static void implementPatch(uint64_t AdrpAddr, uint64_t PatcheeOffset,
 // Patch843419Sections that need to be applied to ISD.
 std::vector<Patch843419Section *>
 AArch64Err843419Patcher::patchInputSectionDescription(
-    InputSectionDescription &ISD) {
-  std::vector<Patch843419Section *> Patches;
-  for (InputSection *IS : ISD.Sections) {
+    InputSectionDescription &isd) {
+  std::vector<Patch843419Section *> patches;
+  for (InputSection *isec : isd.sections) {
     //  LLD doesn't use the erratum sequence in SyntheticSections.
-    if (isa<SyntheticSection>(IS))
+    if (isa<SyntheticSection>(isec))
       continue;
-    // Use SectionMap to make sure we only scan code and not inline data.
+    // Use sectionMap to make sure we only scan code and not inline data.
     // We have already sorted MapSyms in ascending order and removed consecutive
     // mapping symbols of the same type. Our range of executable instructions to
-    // scan is therefore [CodeSym->Value, DataSym->Value) or [CodeSym->Value,
+    // scan is therefore [codeSym->value, dataSym->value) or [codeSym->value,
     // section size).
-    std::vector<const Defined *> &MapSyms = SectionMap[IS];
+    std::vector<const Defined *> &mapSyms = sectionMap[isec];
 
-    auto CodeSym = llvm::find_if(MapSyms, [&](const Defined *MS) {
-      return MS->getName().startswith("$x");
+    auto codeSym = llvm::find_if(mapSyms, [&](const Defined *ms) {
+      return ms->getName().startswith("$x");
     });
 
-    while (CodeSym != MapSyms.end()) {
-      auto DataSym = std::next(CodeSym);
-      uint64_t Off = (*CodeSym)->Value;
-      uint64_t Limit =
-          (DataSym == MapSyms.end()) ? IS->data().size() : (*DataSym)->Value;
+    while (codeSym != mapSyms.end()) {
+      auto dataSym = std::next(codeSym);
+      uint64_t off = (*codeSym)->value;
+      uint64_t limit =
+          (dataSym == mapSyms.end()) ? isec->data().size() : (*dataSym)->value;
 
-      while (Off < Limit) {
-        uint64_t StartAddr = IS->getVA(Off);
-        if (uint64_t PatcheeOffset = scanCortexA53Errata843419(IS, Off, Limit))
-          implementPatch(StartAddr, PatcheeOffset, IS, Patches);
+      while (off < limit) {
+        uint64_t startAddr = isec->getVA(off);
+        if (uint64_t patcheeOffset = scanCortexA53Errata843419(isec, off, limit))
+          implementPatch(startAddr, patcheeOffset, isec, patches);
       }
-      if (DataSym == MapSyms.end())
+      if (dataSym == mapSyms.end())
         break;
-      CodeSym = std::next(DataSym);
+      codeSym = std::next(dataSym);
     }
   }
-  return Patches;
+  return patches;
 }
 
 // For each InputSectionDescription make one pass over the executable sections
@@ -631,22 +630,22 @@ AArch64Err843419Patcher::patchInputSectionDescription(
 // Ouptut and Input Sections may have been changed.
 // Returns false if no patches were required and no changes were made.
 bool AArch64Err843419Patcher::createFixes() {
-  if (Initialized == false)
+  if (initialized == false)
     init();
 
-  bool AddressesChanged = false;
-  for (OutputSection *OS : OutputSections) {
-    if (!(OS->Flags & SHF_ALLOC) || !(OS->Flags & SHF_EXECINSTR))
+  bool addressesChanged = false;
+  for (OutputSection *os : outputSections) {
+    if (!(os->flags & SHF_ALLOC) || !(os->flags & SHF_EXECINSTR))
       continue;
-    for (BaseCommand *BC : OS->SectionCommands)
-      if (auto *ISD = dyn_cast<InputSectionDescription>(BC)) {
-        std::vector<Patch843419Section *> Patches =
-            patchInputSectionDescription(*ISD);
-        if (!Patches.empty()) {
-          insertPatches(*ISD, Patches);
-          AddressesChanged = true;
+    for (BaseCommand *bc : os->sectionCommands)
+      if (auto *isd = dyn_cast<InputSectionDescription>(bc)) {
+        std::vector<Patch843419Section *> patches =
+            patchInputSectionDescription(*isd);
+        if (!patches.empty()) {
+          insertPatches(*isd, patches);
+          addressesChanged = true;
         }
       }
   }
-  return AddressesChanged;
+  return addressesChanged;
 }
diff --git a/deps/lld/ELF/AArch64ErrataFix.h b/deps/lld/ELF/AArch64ErrataFix.h
index edd154d4cab3305b022bf71134d3b3e31995f761..0548b58751ff94bfd99aff4ca2b9649946c6c088 100644
--- a/deps/lld/ELF/AArch64ErrataFix.h
+++ b/deps/lld/ELF/AArch64ErrataFix.h
@@ -1,9 +1,8 @@
 //===- AArch64ErrataFix.h ---------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -30,19 +29,19 @@ public:
 
 private:
   std::vector<Patch843419Section *>
-  patchInputSectionDescription(InputSectionDescription &ISD);
+  patchInputSectionDescription(InputSectionDescription &isd);
 
-  void insertPatches(InputSectionDescription &ISD,
-                     std::vector<Patch843419Section *> &Patches);
+  void insertPatches(InputSectionDescription &isd,
+                     std::vector<Patch843419Section *> &patches);
 
   void init();
 
-  // A cache of the mapping symbols defined by the InputSecion sorted in order
+  // A cache of the mapping symbols defined by the InputSection sorted in order
   // of ascending value with redundant symbols removed. These describe
   // the ranges of code and data in an executable InputSection.
-  std::map<InputSection *, std::vector<const Defined *>> SectionMap;
+  std::map<InputSection *, std::vector<const Defined *>> sectionMap;
 
-  bool Initialized = false;
+  bool initialized = false;
 };
 
 } // namespace elf
diff --git a/deps/lld/ELF/Arch/AArch64.cpp b/deps/lld/ELF/Arch/AArch64.cpp
index 08ffe2a08c0fd7c956f6544fb82a693dbad7c2fd..4d4789702f03d32af9aee7ce77e1337b8ccd2619 100644
--- a/deps/lld/ELF/Arch/AArch64.cpp
+++ b/deps/lld/ELF/Arch/AArch64.cpp
@@ -1,9 +1,8 @@
 //===- AArch64.cpp --------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -24,60 +23,59 @@ using namespace lld::elf;
 // Page(Expr) is the page address of the expression Expr, defined
 // as (Expr & ~0xFFF). (This applies even if the machine page size
 // supported by the platform has a different value.)
-uint64_t elf::getAArch64Page(uint64_t Expr) {
-  return Expr & ~static_cast<uint64_t>(0xFFF);
+uint64_t elf::getAArch64Page(uint64_t expr) {
+  return expr & ~static_cast<uint64_t>(0xFFF);
 }
 
 namespace {
-class AArch64 final : public TargetInfo {
+class AArch64 : public TargetInfo {
 public:
   AArch64();
-  RelExpr getRelExpr(RelType Type, const Symbol &S,
-                     const uint8_t *Loc) const override;
-  RelType getDynRel(RelType Type) const override;
-  void writeGotPlt(uint8_t *Buf, const Symbol &S) const override;
-  void writePltHeader(uint8_t *Buf) const override;
-  void writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr, uint64_t PltEntryAddr,
-                int32_t Index, unsigned RelOff) const override;
-  bool needsThunk(RelExpr Expr, RelType Type, const InputFile *File,
-                  uint64_t BranchAddr, const Symbol &S) const override;
+  RelExpr getRelExpr(RelType type, const Symbol &s,
+                     const uint8_t *loc) const override;
+  RelType getDynRel(RelType type) const override;
+  void writeGotPlt(uint8_t *buf, const Symbol &s) const override;
+  void writePltHeader(uint8_t *buf) const override;
+  void writePlt(uint8_t *buf, uint64_t gotPltEntryAddr, uint64_t pltEntryAddr,
+                int32_t index, unsigned relOff) const override;
+  bool needsThunk(RelExpr expr, RelType type, const InputFile *file,
+                  uint64_t branchAddr, const Symbol &s) const override;
   uint32_t getThunkSectionSpacing() const override;
-  bool inBranchRange(RelType Type, uint64_t Src, uint64_t Dst) const override;
-  bool usesOnlyLowPageBits(RelType Type) const override;
-  void relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const override;
-  RelExpr adjustRelaxExpr(RelType Type, const uint8_t *Data,
-                          RelExpr Expr) const override;
-  void relaxTlsGdToLe(uint8_t *Loc, RelType Type, uint64_t Val) const override;
-  void relaxTlsGdToIe(uint8_t *Loc, RelType Type, uint64_t Val) const override;
-  void relaxTlsIeToLe(uint8_t *Loc, RelType Type, uint64_t Val) const override;
+  bool inBranchRange(RelType type, uint64_t src, uint64_t dst) const override;
+  bool usesOnlyLowPageBits(RelType type) const override;
+  void relocateOne(uint8_t *loc, RelType type, uint64_t val) const override;
+  RelExpr adjustRelaxExpr(RelType type, const uint8_t *data,
+                          RelExpr expr) const override;
+  void relaxTlsGdToLe(uint8_t *loc, RelType type, uint64_t val) const override;
+  void relaxTlsGdToIe(uint8_t *loc, RelType type, uint64_t val) const override;
+  void relaxTlsIeToLe(uint8_t *loc, RelType type, uint64_t val) const override;
 };
 } // namespace
 
 AArch64::AArch64() {
-  CopyRel = R_AARCH64_COPY;
-  RelativeRel = R_AARCH64_RELATIVE;
-  IRelativeRel = R_AARCH64_IRELATIVE;
-  GotRel = R_AARCH64_GLOB_DAT;
-  NoneRel = R_AARCH64_NONE;
-  PltRel = R_AARCH64_JUMP_SLOT;
-  TlsDescRel = R_AARCH64_TLSDESC;
-  TlsGotRel = R_AARCH64_TLS_TPREL64;
-  GotEntrySize = 8;
-  GotPltEntrySize = 8;
-  PltEntrySize = 16;
-  PltHeaderSize = 32;
-  DefaultMaxPageSize = 65536;
+  copyRel = R_AARCH64_COPY;
+  relativeRel = R_AARCH64_RELATIVE;
+  iRelativeRel = R_AARCH64_IRELATIVE;
+  gotRel = R_AARCH64_GLOB_DAT;
+  noneRel = R_AARCH64_NONE;
+  pltRel = R_AARCH64_JUMP_SLOT;
+  symbolicRel = R_AARCH64_ABS64;
+  tlsDescRel = R_AARCH64_TLSDESC;
+  tlsGotRel = R_AARCH64_TLS_TPREL64;
+  pltEntrySize = 16;
+  pltHeaderSize = 32;
+  defaultMaxPageSize = 65536;
 
   // Align to the 2 MiB page size (known as a superpage or huge page).
   // FreeBSD automatically promotes 2 MiB-aligned allocations.
-  DefaultImageBase = 0x200000;
+  defaultImageBase = 0x200000;
 
-  NeedsThunks = true;
+  needsThunks = true;
 }
 
-RelExpr AArch64::getRelExpr(RelType Type, const Symbol &S,
-                            const uint8_t *Loc) const {
-  switch (Type) {
+RelExpr AArch64::getRelExpr(RelType type, const Symbol &s,
+                            const uint8_t *loc) const {
+  switch (type) {
   case R_AARCH64_TLSDESC_ADR_PAGE21:
     return R_AARCH64_TLSDESC_PAGE;
   case R_AARCH64_TLSDESC_LD64_LO12:
@@ -105,6 +103,7 @@ RelExpr AArch64::getRelExpr(RelType Type, const Symbol &S,
   case R_AARCH64_LD_PREL_LO19:
     return R_PC;
   case R_AARCH64_ADR_PREL_PG_HI21:
+  case R_AARCH64_ADR_PREL_PG_HI21_NC:
     return R_AARCH64_PAGE_PC;
   case R_AARCH64_LD64_GOT_LO12_NC:
   case R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC:
@@ -119,18 +118,18 @@ RelExpr AArch64::getRelExpr(RelType Type, const Symbol &S,
   }
 }
 
-RelExpr AArch64::adjustRelaxExpr(RelType Type, const uint8_t *Data,
-                                 RelExpr Expr) const {
-  if (Expr == R_RELAX_TLS_GD_TO_IE) {
-    if (Type == R_AARCH64_TLSDESC_ADR_PAGE21)
+RelExpr AArch64::adjustRelaxExpr(RelType type, const uint8_t *data,
+                                 RelExpr expr) const {
+  if (expr == R_RELAX_TLS_GD_TO_IE) {
+    if (type == R_AARCH64_TLSDESC_ADR_PAGE21)
       return R_AARCH64_RELAX_TLS_GD_TO_IE_PAGE_PC;
     return R_RELAX_TLS_GD_TO_IE_ABS;
   }
-  return Expr;
+  return expr;
 }
 
-bool AArch64::usesOnlyLowPageBits(RelType Type) const {
-  switch (Type) {
+bool AArch64::usesOnlyLowPageBits(RelType type) const {
+  switch (type) {
   default:
     return false;
   case R_AARCH64_ADD_ABS_LO12_NC:
@@ -147,18 +146,18 @@ bool AArch64::usesOnlyLowPageBits(RelType Type) const {
   }
 }
 
-RelType AArch64::getDynRel(RelType Type) const {
-  if (Type == R_AARCH64_ABS32 || Type == R_AARCH64_ABS64)
-    return Type;
+RelType AArch64::getDynRel(RelType type) const {
+  if (type == R_AARCH64_ABS64)
+    return type;
   return R_AARCH64_NONE;
 }
 
-void AArch64::writeGotPlt(uint8_t *Buf, const Symbol &) const {
-  write64le(Buf, In.Plt->getVA());
+void AArch64::writeGotPlt(uint8_t *buf, const Symbol &) const {
+  write64le(buf, in.plt->getVA());
 }
 
-void AArch64::writePltHeader(uint8_t *Buf) const {
-  const uint8_t PltData[] = {
+void AArch64::writePltHeader(uint8_t *buf) const {
+  const uint8_t pltData[] = {
       0xf0, 0x7b, 0xbf, 0xa9, // stp    x16, x30, [sp,#-16]!
       0x10, 0x00, 0x00, 0x90, // adrp   x16, Page(&(.plt.got[2]))
       0x11, 0x02, 0x40, 0xf9, // ldr    x17, [x16, Offset(&(.plt.got[2]))]
@@ -168,42 +167,42 @@ void AArch64::writePltHeader(uint8_t *Buf) const {
       0x1f, 0x20, 0x03, 0xd5, // nop
       0x1f, 0x20, 0x03, 0xd5  // nop
   };
-  memcpy(Buf, PltData, sizeof(PltData));
+  memcpy(buf, pltData, sizeof(pltData));
 
-  uint64_t Got = In.GotPlt->getVA();
-  uint64_t Plt = In.Plt->getVA();
-  relocateOne(Buf + 4, R_AARCH64_ADR_PREL_PG_HI21,
-              getAArch64Page(Got + 16) - getAArch64Page(Plt + 4));
-  relocateOne(Buf + 8, R_AARCH64_LDST64_ABS_LO12_NC, Got + 16);
-  relocateOne(Buf + 12, R_AARCH64_ADD_ABS_LO12_NC, Got + 16);
+  uint64_t got = in.gotPlt->getVA();
+  uint64_t plt = in.plt->getVA();
+  relocateOne(buf + 4, R_AARCH64_ADR_PREL_PG_HI21,
+              getAArch64Page(got + 16) - getAArch64Page(plt + 4));
+  relocateOne(buf + 8, R_AARCH64_LDST64_ABS_LO12_NC, got + 16);
+  relocateOne(buf + 12, R_AARCH64_ADD_ABS_LO12_NC, got + 16);
 }
 
-void AArch64::writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr,
-                       uint64_t PltEntryAddr, int32_t Index,
-                       unsigned RelOff) const {
-  const uint8_t Inst[] = {
+void AArch64::writePlt(uint8_t *buf, uint64_t gotPltEntryAddr,
+                       uint64_t pltEntryAddr, int32_t index,
+                       unsigned relOff) const {
+  const uint8_t inst[] = {
       0x10, 0x00, 0x00, 0x90, // adrp x16, Page(&(.plt.got[n]))
       0x11, 0x02, 0x40, 0xf9, // ldr  x17, [x16, Offset(&(.plt.got[n]))]
       0x10, 0x02, 0x00, 0x91, // add  x16, x16, Offset(&(.plt.got[n]))
       0x20, 0x02, 0x1f, 0xd6  // br   x17
   };
-  memcpy(Buf, Inst, sizeof(Inst));
+  memcpy(buf, inst, sizeof(inst));
 
-  relocateOne(Buf, R_AARCH64_ADR_PREL_PG_HI21,
-              getAArch64Page(GotPltEntryAddr) - getAArch64Page(PltEntryAddr));
-  relocateOne(Buf + 4, R_AARCH64_LDST64_ABS_LO12_NC, GotPltEntryAddr);
-  relocateOne(Buf + 8, R_AARCH64_ADD_ABS_LO12_NC, GotPltEntryAddr);
+  relocateOne(buf, R_AARCH64_ADR_PREL_PG_HI21,
+              getAArch64Page(gotPltEntryAddr) - getAArch64Page(pltEntryAddr));
+  relocateOne(buf + 4, R_AARCH64_LDST64_ABS_LO12_NC, gotPltEntryAddr);
+  relocateOne(buf + 8, R_AARCH64_ADD_ABS_LO12_NC, gotPltEntryAddr);
 }
 
-bool AArch64::needsThunk(RelExpr Expr, RelType Type, const InputFile *File,
-                         uint64_t BranchAddr, const Symbol &S) const {
+bool AArch64::needsThunk(RelExpr expr, RelType type, const InputFile *file,
+                         uint64_t branchAddr, const Symbol &s) const {
   // ELF for the ARM 64-bit architecture, section Call and Jump relocations
   // only permits range extension thunks for R_AARCH64_CALL26 and
   // R_AARCH64_JUMP26 relocation types.
-  if (Type != R_AARCH64_CALL26 && Type != R_AARCH64_JUMP26)
+  if (type != R_AARCH64_CALL26 && type != R_AARCH64_JUMP26)
     return false;
-  uint64_t Dst = (Expr == R_PLT_PC) ? S.getPltVA() : S.getVA();
-  return !inBranchRange(Type, BranchAddr, Dst);
+  uint64_t dst = (expr == R_PLT_PC) ? s.getPltVA() : s.getVA();
+  return !inBranchRange(type, branchAddr, dst);
 }
 
 uint32_t AArch64::getThunkSectionSpacing() const {
@@ -213,71 +212,72 @@ uint32_t AArch64::getThunkSectionSpacing() const {
   return (128 * 1024 * 1024) - 0x30000;
 }
 
-bool AArch64::inBranchRange(RelType Type, uint64_t Src, uint64_t Dst) const {
-  if (Type != R_AARCH64_CALL26 && Type != R_AARCH64_JUMP26)
+bool AArch64::inBranchRange(RelType type, uint64_t src, uint64_t dst) const {
+  if (type != R_AARCH64_CALL26 && type != R_AARCH64_JUMP26)
     return true;
   // The AArch64 call and unconditional branch instructions have a range of
   // +/- 128 MiB.
-  uint64_t Range = 128 * 1024 * 1024;
-  if (Dst > Src) {
+  uint64_t range = 128 * 1024 * 1024;
+  if (dst > src) {
     // Immediate of branch is signed.
-    Range -= 4;
-    return Dst - Src <= Range;
+    range -= 4;
+    return dst - src <= range;
   }
-  return Src - Dst <= Range;
+  return src - dst <= range;
 }
 
-static void write32AArch64Addr(uint8_t *L, uint64_t Imm) {
-  uint32_t ImmLo = (Imm & 0x3) << 29;
-  uint32_t ImmHi = (Imm & 0x1FFFFC) << 3;
-  uint64_t Mask = (0x3 << 29) | (0x1FFFFC << 3);
-  write32le(L, (read32le(L) & ~Mask) | ImmLo | ImmHi);
+static void write32AArch64Addr(uint8_t *l, uint64_t imm) {
+  uint32_t immLo = (imm & 0x3) << 29;
+  uint32_t immHi = (imm & 0x1FFFFC) << 3;
+  uint64_t mask = (0x3 << 29) | (0x1FFFFC << 3);
+  write32le(l, (read32le(l) & ~mask) | immLo | immHi);
 }
 
 // Return the bits [Start, End] from Val shifted Start bits.
 // For instance, getBits(0xF0, 4, 8) returns 0xF.
-static uint64_t getBits(uint64_t Val, int Start, int End) {
-  uint64_t Mask = ((uint64_t)1 << (End + 1 - Start)) - 1;
-  return (Val >> Start) & Mask;
+static uint64_t getBits(uint64_t val, int start, int end) {
+  uint64_t mask = ((uint64_t)1 << (end + 1 - start)) - 1;
+  return (val >> start) & mask;
 }
 
-static void or32le(uint8_t *P, int32_t V) { write32le(P, read32le(P) | V); }
+static void or32le(uint8_t *p, int32_t v) { write32le(p, read32le(p) | v); }
 
 // Update the immediate field in a AARCH64 ldr, str, and add instruction.
-static void or32AArch64Imm(uint8_t *L, uint64_t Imm) {
-  or32le(L, (Imm & 0xFFF) << 10);
+static void or32AArch64Imm(uint8_t *l, uint64_t imm) {
+  or32le(l, (imm & 0xFFF) << 10);
 }
 
-void AArch64::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
-  switch (Type) {
+void AArch64::relocateOne(uint8_t *loc, RelType type, uint64_t val) const {
+  switch (type) {
   case R_AARCH64_ABS16:
   case R_AARCH64_PREL16:
-    checkIntUInt(Loc, Val, 16, Type);
-    write16le(Loc, Val);
+    checkIntUInt(loc, val, 16, type);
+    write16le(loc, val);
     break;
   case R_AARCH64_ABS32:
   case R_AARCH64_PREL32:
-    checkIntUInt(Loc, Val, 32, Type);
-    write32le(Loc, Val);
+    checkIntUInt(loc, val, 32, type);
+    write32le(loc, val);
     break;
   case R_AARCH64_ABS64:
-  case R_AARCH64_GLOB_DAT:
   case R_AARCH64_PREL64:
-    write64le(Loc, Val);
+    write64le(loc, val);
     break;
   case R_AARCH64_ADD_ABS_LO12_NC:
-    or32AArch64Imm(Loc, Val);
+    or32AArch64Imm(loc, val);
     break;
   case R_AARCH64_ADR_GOT_PAGE:
   case R_AARCH64_ADR_PREL_PG_HI21:
   case R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21:
   case R_AARCH64_TLSDESC_ADR_PAGE21:
-    checkInt(Loc, Val, 33, Type);
-    write32AArch64Addr(Loc, Val >> 12);
+    checkInt(loc, val, 33, type);
+    LLVM_FALLTHROUGH;
+  case R_AARCH64_ADR_PREL_PG_HI21_NC:
+    write32AArch64Addr(loc, val >> 12);
     break;
   case R_AARCH64_ADR_PREL_LO21:
-    checkInt(Loc, Val, 21, Type);
-    write32AArch64Addr(Loc, Val);
+    checkInt(loc, val, 21, type);
+    write32AArch64Addr(loc, val);
     break;
   case R_AARCH64_JUMP26:
     // Normally we would just write the bits of the immediate field, however
@@ -287,75 +287,75 @@ void AArch64::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
     // opcode and the immediate (0 001 | 01 imm26) we can do this
     // transformation by placing a R_AARCH64_JUMP26 relocation at the offset of
     // the instruction we want to patch.
-    write32le(Loc, 0x14000000);
+    write32le(loc, 0x14000000);
     LLVM_FALLTHROUGH;
   case R_AARCH64_CALL26:
-    checkInt(Loc, Val, 28, Type);
-    or32le(Loc, (Val & 0x0FFFFFFC) >> 2);
+    checkInt(loc, val, 28, type);
+    or32le(loc, (val & 0x0FFFFFFC) >> 2);
     break;
   case R_AARCH64_CONDBR19:
   case R_AARCH64_LD_PREL_LO19:
-    checkAlignment(Loc, Val, 4, Type);
-    checkInt(Loc, Val, 21, Type);
-    or32le(Loc, (Val & 0x1FFFFC) << 3);
+    checkAlignment(loc, val, 4, type);
+    checkInt(loc, val, 21, type);
+    or32le(loc, (val & 0x1FFFFC) << 3);
     break;
   case R_AARCH64_LDST8_ABS_LO12_NC:
   case R_AARCH64_TLSLE_LDST8_TPREL_LO12_NC:
-    or32AArch64Imm(Loc, getBits(Val, 0, 11));
+    or32AArch64Imm(loc, getBits(val, 0, 11));
     break;
   case R_AARCH64_LDST16_ABS_LO12_NC:
   case R_AARCH64_TLSLE_LDST16_TPREL_LO12_NC:
-    checkAlignment(Loc, Val, 2, Type);
-    or32AArch64Imm(Loc, getBits(Val, 1, 11));
+    checkAlignment(loc, val, 2, type);
+    or32AArch64Imm(loc, getBits(val, 1, 11));
     break;
   case R_AARCH64_LDST32_ABS_LO12_NC:
   case R_AARCH64_TLSLE_LDST32_TPREL_LO12_NC:
-    checkAlignment(Loc, Val, 4, Type);
-    or32AArch64Imm(Loc, getBits(Val, 2, 11));
+    checkAlignment(loc, val, 4, type);
+    or32AArch64Imm(loc, getBits(val, 2, 11));
     break;
   case R_AARCH64_LDST64_ABS_LO12_NC:
   case R_AARCH64_LD64_GOT_LO12_NC:
   case R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC:
   case R_AARCH64_TLSLE_LDST64_TPREL_LO12_NC:
   case R_AARCH64_TLSDESC_LD64_LO12:
-    checkAlignment(Loc, Val, 8, Type);
-    or32AArch64Imm(Loc, getBits(Val, 3, 11));
+    checkAlignment(loc, val, 8, type);
+    or32AArch64Imm(loc, getBits(val, 3, 11));
     break;
   case R_AARCH64_LDST128_ABS_LO12_NC:
   case R_AARCH64_TLSLE_LDST128_TPREL_LO12_NC:
-    checkAlignment(Loc, Val, 16, Type);
-    or32AArch64Imm(Loc, getBits(Val, 4, 11));
+    checkAlignment(loc, val, 16, type);
+    or32AArch64Imm(loc, getBits(val, 4, 11));
     break;
   case R_AARCH64_MOVW_UABS_G0_NC:
-    or32le(Loc, (Val & 0xFFFF) << 5);
+    or32le(loc, (val & 0xFFFF) << 5);
     break;
   case R_AARCH64_MOVW_UABS_G1_NC:
-    or32le(Loc, (Val & 0xFFFF0000) >> 11);
+    or32le(loc, (val & 0xFFFF0000) >> 11);
     break;
   case R_AARCH64_MOVW_UABS_G2_NC:
-    or32le(Loc, (Val & 0xFFFF00000000) >> 27);
+    or32le(loc, (val & 0xFFFF00000000) >> 27);
     break;
   case R_AARCH64_MOVW_UABS_G3:
-    or32le(Loc, (Val & 0xFFFF000000000000) >> 43);
+    or32le(loc, (val & 0xFFFF000000000000) >> 43);
     break;
   case R_AARCH64_TSTBR14:
-    checkInt(Loc, Val, 16, Type);
-    or32le(Loc, (Val & 0xFFFC) << 3);
+    checkInt(loc, val, 16, type);
+    or32le(loc, (val & 0xFFFC) << 3);
     break;
   case R_AARCH64_TLSLE_ADD_TPREL_HI12:
-    checkUInt(Loc, Val, 24, Type);
-    or32AArch64Imm(Loc, Val >> 12);
+    checkUInt(loc, val, 24, type);
+    or32AArch64Imm(loc, val >> 12);
     break;
   case R_AARCH64_TLSLE_ADD_TPREL_LO12_NC:
   case R_AARCH64_TLSDESC_ADD_LO12:
-    or32AArch64Imm(Loc, Val);
+    or32AArch64Imm(loc, val);
     break;
   default:
-    error(getErrorLocation(Loc) + "unrecognized reloc " + Twine(Type));
+    error(getErrorLocation(loc) + "unrecognized relocation " + toString(type));
   }
 }
 
-void AArch64::relaxTlsGdToLe(uint8_t *Loc, RelType Type, uint64_t Val) const {
+void AArch64::relaxTlsGdToLe(uint8_t *loc, RelType type, uint64_t val) const {
   // TLSDESC Global-Dynamic relocation are in the form:
   //   adrp    x0, :tlsdesc:v             [R_AARCH64_TLSDESC_ADR_PAGE21]
   //   ldr     x1, [x0, #:tlsdesc_lo12:v  [R_AARCH64_TLSDESC_LD64_LO12]
@@ -367,25 +367,25 @@ void AArch64::relaxTlsGdToLe(uint8_t *Loc, RelType Type, uint64_t Val) const {
   //   movk    x0, #0x10
   //   nop
   //   nop
-  checkUInt(Loc, Val, 32, Type);
+  checkUInt(loc, val, 32, type);
 
-  switch (Type) {
+  switch (type) {
   case R_AARCH64_TLSDESC_ADD_LO12:
   case R_AARCH64_TLSDESC_CALL:
-    write32le(Loc, 0xd503201f); // nop
+    write32le(loc, 0xd503201f); // nop
     return;
   case R_AARCH64_TLSDESC_ADR_PAGE21:
-    write32le(Loc, 0xd2a00000 | (((Val >> 16) & 0xffff) << 5)); // movz
+    write32le(loc, 0xd2a00000 | (((val >> 16) & 0xffff) << 5)); // movz
     return;
   case R_AARCH64_TLSDESC_LD64_LO12:
-    write32le(Loc, 0xf2800000 | ((Val & 0xffff) << 5)); // movk
+    write32le(loc, 0xf2800000 | ((val & 0xffff) << 5)); // movk
     return;
   default:
     llvm_unreachable("unsupported relocation for TLS GD to LE relaxation");
   }
 }
 
-void AArch64::relaxTlsGdToIe(uint8_t *Loc, RelType Type, uint64_t Val) const {
+void AArch64::relaxTlsGdToIe(uint8_t *loc, RelType type, uint64_t val) const {
   // TLSDESC Global-Dynamic relocation are in the form:
   //   adrp    x0, :tlsdesc:v             [R_AARCH64_TLSDESC_ADR_PAGE21]
   //   ldr     x1, [x0, #:tlsdesc_lo12:v  [R_AARCH64_TLSDESC_LD64_LO12]
@@ -398,43 +398,193 @@ void AArch64::relaxTlsGdToIe(uint8_t *Loc, RelType Type, uint64_t Val) const {
   //   nop
   //   nop
 
-  switch (Type) {
+  switch (type) {
   case R_AARCH64_TLSDESC_ADD_LO12:
   case R_AARCH64_TLSDESC_CALL:
-    write32le(Loc, 0xd503201f); // nop
+    write32le(loc, 0xd503201f); // nop
     break;
   case R_AARCH64_TLSDESC_ADR_PAGE21:
-    write32le(Loc, 0x90000000); // adrp
-    relocateOne(Loc, R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21, Val);
+    write32le(loc, 0x90000000); // adrp
+    relocateOne(loc, R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21, val);
     break;
   case R_AARCH64_TLSDESC_LD64_LO12:
-    write32le(Loc, 0xf9400000); // ldr
-    relocateOne(Loc, R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC, Val);
+    write32le(loc, 0xf9400000); // ldr
+    relocateOne(loc, R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC, val);
     break;
   default:
     llvm_unreachable("unsupported relocation for TLS GD to LE relaxation");
   }
 }
 
-void AArch64::relaxTlsIeToLe(uint8_t *Loc, RelType Type, uint64_t Val) const {
-  checkUInt(Loc, Val, 32, Type);
+void AArch64::relaxTlsIeToLe(uint8_t *loc, RelType type, uint64_t val) const {
+  checkUInt(loc, val, 32, type);
 
-  if (Type == R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21) {
+  if (type == R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21) {
     // Generate MOVZ.
-    uint32_t RegNo = read32le(Loc) & 0x1f;
-    write32le(Loc, (0xd2a00000 | RegNo) | (((Val >> 16) & 0xffff) << 5));
+    uint32_t regNo = read32le(loc) & 0x1f;
+    write32le(loc, (0xd2a00000 | regNo) | (((val >> 16) & 0xffff) << 5));
     return;
   }
-  if (Type == R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC) {
+  if (type == R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC) {
     // Generate MOVK.
-    uint32_t RegNo = read32le(Loc) & 0x1f;
-    write32le(Loc, (0xf2800000 | RegNo) | ((Val & 0xffff) << 5));
+    uint32_t regNo = read32le(loc) & 0x1f;
+    write32le(loc, (0xf2800000 | regNo) | ((val & 0xffff) << 5));
     return;
   }
   llvm_unreachable("invalid relocation for TLS IE to LE relaxation");
 }
 
-TargetInfo *elf::getAArch64TargetInfo() {
-  static AArch64 Target;
-  return &Target;
+// AArch64 may use security features in variant PLT sequences. These are:
+// Pointer Authentication (PAC), introduced in armv8.3-a and Branch Target
+// Indicator (BTI) introduced in armv8.5-a. The additional instructions used
+// in the variant Plt sequences are encoded in the Hint space so they can be
+// deployed on older architectures, which treat the instructions as a nop.
+// PAC and BTI can be combined leading to the following combinations:
+// writePltHeader
+// writePltHeaderBti (no PAC Header needed)
+// writePlt
+// writePltBti (BTI only)
+// writePltPac (PAC only)
+// writePltBtiPac (BTI and PAC)
+//
+// When PAC is enabled the dynamic loader encrypts the address that it places
+// in the .got.plt using the pacia1716 instruction which encrypts the value in
+// x17 using the modifier in x16. The static linker places autia1716 before the
+// indirect branch to x17 to authenticate the address in x17 with the modifier
+// in x16. This makes it more difficult for an attacker to modify the value in
+// the .got.plt.
+//
+// When BTI is enabled all indirect branches must land on a bti instruction.
+// The static linker must place a bti instruction at the start of any PLT entry
+// that may be the target of an indirect branch. As the PLT entries call the
+// lazy resolver indirectly this must have a bti instruction at start. In
+// general a bti instruction is not needed for a PLT entry as indirect calls
+// are resolved to the function address and not the PLT entry for the function.
+// There are a small number of cases where the PLT address can escape, such as
+// taking the address of a function or ifunc via a non got-generating
+// relocation, and a shared library refers to that symbol.
+//
+// We use the bti c variant of the instruction which permits indirect branches
+// (br) via x16/x17 and indirect function calls (blr) via any register. The ABI
+// guarantees that all indirect branches from code requiring BTI protection
+// will go via x16/x17
+
+namespace {
+class AArch64BtiPac final : public AArch64 {
+public:
+  AArch64BtiPac();
+  void writePltHeader(uint8_t *buf) const override;
+  void writePlt(uint8_t *buf, uint64_t gotPltEntryAddr, uint64_t pltEntryAddr,
+                int32_t index, unsigned relOff) const override;
+
+private:
+  bool btiHeader; // bti instruction needed in PLT Header
+  bool btiEntry;  // bti instruction needed in PLT Entry
+  bool pacEntry;  // autia1716 instruction needed in PLT Entry
+};
+} // namespace
+
+AArch64BtiPac::AArch64BtiPac() {
+  btiHeader = (config->andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_BTI);
+  // A BTI (Branch Target Indicator) Plt Entry is only required if the
+  // address of the PLT entry can be taken by the program, which permits an
+  // indirect jump to the PLT entry. This can happen when the address
+  // of the PLT entry for a function is canonicalised due to the address of
+  // the function in an executable being taken by a shared library.
+  // FIXME: There is a potential optimization to omit the BTI if we detect
+  // that the address of the PLT entry isn't taken.
+  btiEntry = btiHeader && !config->shared;
+  pacEntry = (config->andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_PAC);
+
+  if (btiEntry || pacEntry)
+    pltEntrySize = 24;
 }
+
+void AArch64BtiPac::writePltHeader(uint8_t *buf) const {
+  const uint8_t btiData[] = { 0x5f, 0x24, 0x03, 0xd5 }; // bti c
+  const uint8_t pltData[] = {
+      0xf0, 0x7b, 0xbf, 0xa9, // stp    x16, x30, [sp,#-16]!
+      0x10, 0x00, 0x00, 0x90, // adrp   x16, Page(&(.plt.got[2]))
+      0x11, 0x02, 0x40, 0xf9, // ldr    x17, [x16, Offset(&(.plt.got[2]))]
+      0x10, 0x02, 0x00, 0x91, // add    x16, x16, Offset(&(.plt.got[2]))
+      0x20, 0x02, 0x1f, 0xd6, // br     x17
+      0x1f, 0x20, 0x03, 0xd5, // nop
+      0x1f, 0x20, 0x03, 0xd5  // nop
+  };
+  const uint8_t nopData[] = { 0x1f, 0x20, 0x03, 0xd5 }; // nop
+
+  uint64_t got = in.gotPlt->getVA();
+  uint64_t plt = in.plt->getVA();
+
+  if (btiHeader) {
+    // PltHeader is called indirectly by plt[N]. Prefix pltData with a BTI C
+    // instruction.
+    memcpy(buf, btiData, sizeof(btiData));
+    buf += sizeof(btiData);
+    plt += sizeof(btiData);
+  }
+  memcpy(buf, pltData, sizeof(pltData));
+
+  relocateOne(buf + 4, R_AARCH64_ADR_PREL_PG_HI21,
+              getAArch64Page(got + 16) - getAArch64Page(plt + 8));
+  relocateOne(buf + 8, R_AARCH64_LDST64_ABS_LO12_NC, got + 16);
+  relocateOne(buf + 12, R_AARCH64_ADD_ABS_LO12_NC, got + 16);
+  if (!btiHeader)
+    // We didn't add the BTI c instruction so round out size with NOP.
+    memcpy(buf + sizeof(pltData), nopData, sizeof(nopData));
+}
+
+void AArch64BtiPac::writePlt(uint8_t *buf, uint64_t gotPltEntryAddr,
+                             uint64_t pltEntryAddr, int32_t index,
+                             unsigned relOff) const {
+  // The PLT entry is of the form:
+  // [btiData] addrInst (pacBr | stdBr) [nopData]
+  const uint8_t btiData[] = { 0x5f, 0x24, 0x03, 0xd5 }; // bti c
+  const uint8_t addrInst[] = {
+      0x10, 0x00, 0x00, 0x90,  // adrp x16, Page(&(.plt.got[n]))
+      0x11, 0x02, 0x40, 0xf9,  // ldr  x17, [x16, Offset(&(.plt.got[n]))]
+      0x10, 0x02, 0x00, 0x91   // add  x16, x16, Offset(&(.plt.got[n]))
+  };
+  const uint8_t pacBr[] = {
+      0x9f, 0x21, 0x03, 0xd5,  // autia1716
+      0x20, 0x02, 0x1f, 0xd6   // br   x17
+  };
+  const uint8_t stdBr[] = {
+      0x20, 0x02, 0x1f, 0xd6,  // br   x17
+      0x1f, 0x20, 0x03, 0xd5   // nop
+  };
+  const uint8_t nopData[] = { 0x1f, 0x20, 0x03, 0xd5 }; // nop
+
+  if (btiEntry) {
+    memcpy(buf, btiData, sizeof(btiData));
+    buf += sizeof(btiData);
+    pltEntryAddr += sizeof(btiData);
+  }
+
+  memcpy(buf, addrInst, sizeof(addrInst));
+  relocateOne(buf, R_AARCH64_ADR_PREL_PG_HI21,
+              getAArch64Page(gotPltEntryAddr) -
+                  getAArch64Page(pltEntryAddr));
+  relocateOne(buf + 4, R_AARCH64_LDST64_ABS_LO12_NC, gotPltEntryAddr);
+  relocateOne(buf + 8, R_AARCH64_ADD_ABS_LO12_NC, gotPltEntryAddr);
+
+  if (pacEntry)
+    memcpy(buf + sizeof(addrInst), pacBr, sizeof(pacBr));
+  else
+    memcpy(buf + sizeof(addrInst), stdBr, sizeof(stdBr));
+  if (!btiEntry)
+    // We didn't add the BTI c instruction so round out size with NOP.
+    memcpy(buf + sizeof(addrInst) + sizeof(stdBr), nopData, sizeof(nopData));
+}
+
+static TargetInfo *getTargetInfo() {
+  if (config->andFeatures & (GNU_PROPERTY_AARCH64_FEATURE_1_BTI |
+                             GNU_PROPERTY_AARCH64_FEATURE_1_PAC)) {
+    static AArch64BtiPac t;
+    return &t;
+  }
+  static AArch64 t;
+  return &t;
+}
+
+TargetInfo *elf::getAArch64TargetInfo() { return getTargetInfo(); }
diff --git a/deps/lld/ELF/Arch/AMDGPU.cpp b/deps/lld/ELF/Arch/AMDGPU.cpp
index a7c6c84ceecd48299ae0b62cfb4327b703dcb51a..f2e32ca0996d561fb9b6bfd9fe77353f31b61752 100644
--- a/deps/lld/ELF/Arch/AMDGPU.cpp
+++ b/deps/lld/ELF/Arch/AMDGPU.cpp
@@ -1,9 +1,8 @@
 //===- AMDGPU.cpp ---------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -26,62 +25,63 @@ class AMDGPU final : public TargetInfo {
 public:
   AMDGPU();
   uint32_t calcEFlags() const override;
-  void relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const override;
-  RelExpr getRelExpr(RelType Type, const Symbol &S,
-                     const uint8_t *Loc) const override;
+  void relocateOne(uint8_t *loc, RelType type, uint64_t val) const override;
+  RelExpr getRelExpr(RelType type, const Symbol &s,
+                     const uint8_t *loc) const override;
+  RelType getDynRel(RelType type) const override;
 };
 } // namespace
 
 AMDGPU::AMDGPU() {
-  RelativeRel = R_AMDGPU_RELATIVE64;
-  GotRel = R_AMDGPU_ABS64;
-  NoneRel = R_AMDGPU_NONE;
-  GotEntrySize = 8;
+  relativeRel = R_AMDGPU_RELATIVE64;
+  gotRel = R_AMDGPU_ABS64;
+  noneRel = R_AMDGPU_NONE;
+  symbolicRel = R_AMDGPU_ABS64;
 }
 
-static uint32_t getEFlags(InputFile *File) {
-  return cast<ObjFile<ELF64LE>>(File)->getObj().getHeader()->e_flags;
+static uint32_t getEFlags(InputFile *file) {
+  return cast<ObjFile<ELF64LE>>(file)->getObj().getHeader()->e_flags;
 }
 
 uint32_t AMDGPU::calcEFlags() const {
-  assert(!ObjectFiles.empty());
-  uint32_t Ret = getEFlags(ObjectFiles[0]);
+  assert(!objectFiles.empty());
+  uint32_t ret = getEFlags(objectFiles[0]);
 
   // Verify that all input files have the same e_flags.
-  for (InputFile *F : makeArrayRef(ObjectFiles).slice(1)) {
-    if (Ret == getEFlags(F))
+  for (InputFile *f : makeArrayRef(objectFiles).slice(1)) {
+    if (ret == getEFlags(f))
       continue;
-    error("incompatible e_flags: " + toString(F));
+    error("incompatible e_flags: " + toString(f));
     return 0;
   }
-  return Ret;
+  return ret;
 }
 
-void AMDGPU::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
-  switch (Type) {
+void AMDGPU::relocateOne(uint8_t *loc, RelType type, uint64_t val) const {
+  switch (type) {
   case R_AMDGPU_ABS32:
   case R_AMDGPU_GOTPCREL:
   case R_AMDGPU_GOTPCREL32_LO:
   case R_AMDGPU_REL32:
   case R_AMDGPU_REL32_LO:
-    write32le(Loc, Val);
+    write32le(loc, val);
     break;
   case R_AMDGPU_ABS64:
   case R_AMDGPU_REL64:
-    write64le(Loc, Val);
+    write64le(loc, val);
     break;
   case R_AMDGPU_GOTPCREL32_HI:
   case R_AMDGPU_REL32_HI:
-    write32le(Loc, Val >> 32);
+    write32le(loc, val >> 32);
     break;
   default:
-    error(getErrorLocation(Loc) + "unrecognized reloc " + Twine(Type));
+    llvm_unreachable("unknown relocation");
   }
 }
 
-RelExpr AMDGPU::getRelExpr(RelType Type, const Symbol &S,
-                           const uint8_t *Loc) const {
-  switch (Type) {
+RelExpr AMDGPU::getRelExpr(RelType type, const Symbol &s,
+                           const uint8_t *loc) const {
+  switch (type) {
   case R_AMDGPU_ABS32:
   case R_AMDGPU_ABS64:
     return R_ABS;
@@ -95,11 +95,19 @@ RelExpr AMDGPU::getRelExpr(RelType Type, const Symbol &S,
   case R_AMDGPU_GOTPCREL32_HI:
     return R_GOT_PC;
   default:
-    return R_INVALID;
+    error(getErrorLocation(loc) + "unknown relocation (" + Twine(type) +
+          ") against symbol " + toString(s));
+    return R_NONE;
   }
 }
 
+RelType AMDGPU::getDynRel(RelType type) const {
+  if (type == R_AMDGPU_ABS64)
+    return type;
+  return R_AMDGPU_NONE;
+}
+
 TargetInfo *elf::getAMDGPUTargetInfo() {
-  static AMDGPU Target;
-  return &Target;
+  static AMDGPU target;
+  return &target;
 }
diff --git a/deps/lld/ELF/Arch/ARM.cpp b/deps/lld/ELF/Arch/ARM.cpp
index 120caca671afe4291a789e85fe9ff642c999f3ed..64adc33c07ae282ff0b9fcb76a88c121c1fcaf7c 100644
--- a/deps/lld/ELF/Arch/ARM.cpp
+++ b/deps/lld/ELF/Arch/ARM.cpp
@@ -1,9 +1,8 @@
 //===- ARM.cpp ------------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -27,63 +26,62 @@ class ARM final : public TargetInfo {
 public:
   ARM();
   uint32_t calcEFlags() const override;
-  RelExpr getRelExpr(RelType Type, const Symbol &S,
-                     const uint8_t *Loc) const override;
-  RelType getDynRel(RelType Type) const override;
-  int64_t getImplicitAddend(const uint8_t *Buf, RelType Type) const override;
-  void writeGotPlt(uint8_t *Buf, const Symbol &S) const override;
-  void writeIgotPlt(uint8_t *Buf, const Symbol &S) const override;
-  void writePltHeader(uint8_t *Buf) const override;
-  void writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr, uint64_t PltEntryAddr,
-                int32_t Index, unsigned RelOff) const override;
-  void addPltSymbols(InputSection &IS, uint64_t Off) const override;
-  void addPltHeaderSymbols(InputSection &ISD) const override;
-  bool needsThunk(RelExpr Expr, RelType Type, const InputFile *File,
-                  uint64_t BranchAddr, const Symbol &S) const override;
+  RelExpr getRelExpr(RelType type, const Symbol &s,
+                     const uint8_t *loc) const override;
+  RelType getDynRel(RelType type) const override;
+  int64_t getImplicitAddend(const uint8_t *buf, RelType type) const override;
+  void writeGotPlt(uint8_t *buf, const Symbol &s) const override;
+  void writeIgotPlt(uint8_t *buf, const Symbol &s) const override;
+  void writePltHeader(uint8_t *buf) const override;
+  void writePlt(uint8_t *buf, uint64_t gotPltEntryAddr, uint64_t pltEntryAddr,
+                int32_t index, unsigned relOff) const override;
+  void addPltSymbols(InputSection &isec, uint64_t off) const override;
+  void addPltHeaderSymbols(InputSection &isd) const override;
+  bool needsThunk(RelExpr expr, RelType type, const InputFile *file,
+                  uint64_t branchAddr, const Symbol &s) const override;
   uint32_t getThunkSectionSpacing() const override;
-  bool inBranchRange(RelType Type, uint64_t Src, uint64_t Dst) const override;
-  void relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const override;
+  bool inBranchRange(RelType type, uint64_t src, uint64_t dst) const override;
+  void relocateOne(uint8_t *loc, RelType type, uint64_t val) const override;
 };
 } // namespace
 
 ARM::ARM() {
-  CopyRel = R_ARM_COPY;
-  RelativeRel = R_ARM_RELATIVE;
-  IRelativeRel = R_ARM_IRELATIVE;
-  GotRel = R_ARM_GLOB_DAT;
-  NoneRel = R_ARM_NONE;
-  PltRel = R_ARM_JUMP_SLOT;
-  TlsGotRel = R_ARM_TLS_TPOFF32;
-  TlsModuleIndexRel = R_ARM_TLS_DTPMOD32;
-  TlsOffsetRel = R_ARM_TLS_DTPOFF32;
-  GotBaseSymInGotPlt = false;
-  GotEntrySize = 4;
-  GotPltEntrySize = 4;
-  PltEntrySize = 16;
-  PltHeaderSize = 32;
-  TrapInstr = {0xd4, 0xd4, 0xd4, 0xd4};
-  NeedsThunks = true;
+  copyRel = R_ARM_COPY;
+  relativeRel = R_ARM_RELATIVE;
+  iRelativeRel = R_ARM_IRELATIVE;
+  gotRel = R_ARM_GLOB_DAT;
+  noneRel = R_ARM_NONE;
+  pltRel = R_ARM_JUMP_SLOT;
+  symbolicRel = R_ARM_ABS32;
+  tlsGotRel = R_ARM_TLS_TPOFF32;
+  tlsModuleIndexRel = R_ARM_TLS_DTPMOD32;
+  tlsOffsetRel = R_ARM_TLS_DTPOFF32;
+  gotBaseSymInGotPlt = false;
+  pltEntrySize = 16;
+  pltHeaderSize = 32;
+  trapInstr = {0xd4, 0xd4, 0xd4, 0xd4};
+  needsThunks = true;
 }
 
 uint32_t ARM::calcEFlags() const {
   // The ABIFloatType is used by loaders to detect the floating point calling
   // convention.
-  uint32_t ABIFloatType = 0;
-  if (Config->ARMVFPArgs == ARMVFPArgKind::Base ||
-      Config->ARMVFPArgs == ARMVFPArgKind::Default)
-    ABIFloatType = EF_ARM_ABI_FLOAT_SOFT;
-  else if (Config->ARMVFPArgs == ARMVFPArgKind::VFP)
-    ABIFloatType = EF_ARM_ABI_FLOAT_HARD;
+  uint32_t abiFloatType = 0;
+  if (config->armVFPArgs == ARMVFPArgKind::Base ||
+      config->armVFPArgs == ARMVFPArgKind::Default)
+    abiFloatType = EF_ARM_ABI_FLOAT_SOFT;
+  else if (config->armVFPArgs == ARMVFPArgKind::VFP)
+    abiFloatType = EF_ARM_ABI_FLOAT_HARD;
 
   // We don't currently use any features incompatible with EF_ARM_EABI_VER5,
   // but we don't have any firm guarantees of conformance. Linux AArch64
   // kernels (as of 2016) require an EABI version to be set.
-  return EF_ARM_EABI_VER5 | ABIFloatType;
+  return EF_ARM_EABI_VER5 | abiFloatType;
 }
 
-RelExpr ARM::getRelExpr(RelType Type, const Symbol &S,
-                        const uint8_t *Loc) const {
-  switch (Type) {
+RelExpr ARM::getRelExpr(RelType type, const Symbol &s,
+                        const uint8_t *loc) const {
+  switch (type) {
   case R_ARM_THM_JUMP11:
     return R_PC;
   case R_ARM_CALL:
@@ -108,11 +106,11 @@ RelExpr ARM::getRelExpr(RelType Type, const Symbol &S,
   case R_ARM_SBREL32:
     return R_ARM_SBREL;
   case R_ARM_TARGET1:
-    return Config->Target1Rel ? R_PC : R_ABS;
+    return config->target1Rel ? R_PC : R_ABS;
   case R_ARM_TARGET2:
-    if (Config->Target2 == Target2Policy::Rel)
+    if (config->target2 == Target2Policy::Rel)
       return R_PC;
-    if (Config->Target2 == Target2Policy::Abs)
+    if (config->target2 == Target2Policy::Abs)
       return R_ABS;
     return R_GOT_PC;
   case R_ARM_TLS_GD32:
@@ -145,25 +143,25 @@ RelExpr ARM::getRelExpr(RelType Type, const Symbol &S,
   }
 }
 
-RelType ARM::getDynRel(RelType Type) const {
-  if ((Type == R_ARM_ABS32) || (Type == R_ARM_TARGET1 && !Config->Target1Rel))
+RelType ARM::getDynRel(RelType type) const {
+  if ((type == R_ARM_ABS32) || (type == R_ARM_TARGET1 && !config->target1Rel))
     return R_ARM_ABS32;
   return R_ARM_NONE;
 }
 
-void ARM::writeGotPlt(uint8_t *Buf, const Symbol &) const {
-  write32le(Buf, In.Plt->getVA());
+void ARM::writeGotPlt(uint8_t *buf, const Symbol &) const {
+  write32le(buf, in.plt->getVA());
 }
 
-void ARM::writeIgotPlt(uint8_t *Buf, const Symbol &S) const {
+void ARM::writeIgotPlt(uint8_t *buf, const Symbol &s) const {
   // An ARM entry is the address of the ifunc resolver function.
-  write32le(Buf, S.getVA());
+  write32le(buf, s.getVA());
 }
 
 // Long form PLT Header that does not have any restrictions on the displacement
 // of the .plt from the .plt.got.
-static void writePltHeaderLong(uint8_t *Buf) {
-  const uint8_t PltData[] = {
+static void writePltHeaderLong(uint8_t *buf) {
+  const uint8_t pltData[] = {
       0x04, 0xe0, 0x2d, 0xe5, //     str lr, [sp,#-4]!
       0x04, 0xe0, 0x9f, 0xe5, //     ldr lr, L2
       0x0e, 0xe0, 0x8f, 0xe0, // L1: add lr, pc, lr
@@ -172,128 +170,128 @@ static void writePltHeaderLong(uint8_t *Buf) {
       0xd4, 0xd4, 0xd4, 0xd4, //     Pad to 32-byte boundary
       0xd4, 0xd4, 0xd4, 0xd4, //     Pad to 32-byte boundary
       0xd4, 0xd4, 0xd4, 0xd4};
-  memcpy(Buf, PltData, sizeof(PltData));
-  uint64_t GotPlt = In.GotPlt->getVA();
-  uint64_t L1 = In.Plt->getVA() + 8;
-  write32le(Buf + 16, GotPlt - L1 - 8);
+  memcpy(buf, pltData, sizeof(pltData));
+  uint64_t gotPlt = in.gotPlt->getVA();
+  uint64_t l1 = in.plt->getVA() + 8;
+  write32le(buf + 16, gotPlt - l1 - 8);
 }
 
 // The default PLT header requires the .plt.got to be within 128 Mb of the
 // .plt in the positive direction.
-void ARM::writePltHeader(uint8_t *Buf) const {
+void ARM::writePltHeader(uint8_t *buf) const {
   // Use a similar sequence to that in writePlt(), the difference is the calling
   // conventions mean we use lr instead of ip. The PLT entry is responsible for
   // saving lr on the stack, the dynamic loader is responsible for reloading
   // it.
-  const uint32_t PltData[] = {
+  const uint32_t pltData[] = {
       0xe52de004, // L1: str lr, [sp,#-4]!
       0xe28fe600, //     add lr, pc,  #0x0NN00000 &(.got.plt - L1 - 4)
       0xe28eea00, //     add lr, lr,  #0x000NN000 &(.got.plt - L1 - 4)
       0xe5bef000, //     ldr pc, [lr, #0x00000NNN] &(.got.plt -L1 - 4)
   };
 
-  uint64_t Offset = In.GotPlt->getVA() - In.Plt->getVA() - 4;
-  if (!llvm::isUInt<27>(Offset)) {
+  uint64_t offset = in.gotPlt->getVA() - in.plt->getVA() - 4;
+  if (!llvm::isUInt<27>(offset)) {
     // We cannot encode the Offset, use the long form.
-    writePltHeaderLong(Buf);
+    writePltHeaderLong(buf);
     return;
   }
-  write32le(Buf + 0, PltData[0]);
-  write32le(Buf + 4, PltData[1] | ((Offset >> 20) & 0xff));
-  write32le(Buf + 8, PltData[2] | ((Offset >> 12) & 0xff));
-  write32le(Buf + 12, PltData[3] | (Offset & 0xfff));
-  memcpy(Buf + 16, TrapInstr.data(), 4); // Pad to 32-byte boundary
-  memcpy(Buf + 20, TrapInstr.data(), 4);
-  memcpy(Buf + 24, TrapInstr.data(), 4);
-  memcpy(Buf + 28, TrapInstr.data(), 4);
+  write32le(buf + 0, pltData[0]);
+  write32le(buf + 4, pltData[1] | ((offset >> 20) & 0xff));
+  write32le(buf + 8, pltData[2] | ((offset >> 12) & 0xff));
+  write32le(buf + 12, pltData[3] | (offset & 0xfff));
+  memcpy(buf + 16, trapInstr.data(), 4); // Pad to 32-byte boundary
+  memcpy(buf + 20, trapInstr.data(), 4);
+  memcpy(buf + 24, trapInstr.data(), 4);
+  memcpy(buf + 28, trapInstr.data(), 4);
 }
 
-void ARM::addPltHeaderSymbols(InputSection &IS) const {
-  addSyntheticLocal("$a", STT_NOTYPE, 0, 0, IS);
-  addSyntheticLocal("$d", STT_NOTYPE, 16, 0, IS);
+void ARM::addPltHeaderSymbols(InputSection &isec) const {
+  addSyntheticLocal("$a", STT_NOTYPE, 0, 0, isec);
+  addSyntheticLocal("$d", STT_NOTYPE, 16, 0, isec);
 }
 
 // Long form PLT entries that do not have any restrictions on the displacement
 // of the .plt from the .plt.got.
-static void writePltLong(uint8_t *Buf, uint64_t GotPltEntryAddr,
-                         uint64_t PltEntryAddr, int32_t Index,
-                         unsigned RelOff) {
-  const uint8_t PltData[] = {
+static void writePltLong(uint8_t *buf, uint64_t gotPltEntryAddr,
+                         uint64_t pltEntryAddr, int32_t index,
+                         unsigned relOff) {
+  const uint8_t pltData[] = {
       0x04, 0xc0, 0x9f, 0xe5, //     ldr ip, L2
       0x0f, 0xc0, 0x8c, 0xe0, // L1: add ip, ip, pc
       0x00, 0xf0, 0x9c, 0xe5, //     ldr pc, [ip]
       0x00, 0x00, 0x00, 0x00, // L2: .word   Offset(&(.plt.got) - L1 - 8
   };
-  memcpy(Buf, PltData, sizeof(PltData));
-  uint64_t L1 = PltEntryAddr + 4;
-  write32le(Buf + 12, GotPltEntryAddr - L1 - 8);
+  memcpy(buf, pltData, sizeof(pltData));
+  uint64_t l1 = pltEntryAddr + 4;
+  write32le(buf + 12, gotPltEntryAddr - l1 - 8);
 }
 
 // The default PLT entries require the .plt.got to be within 128 Mb of the
 // .plt in the positive direction.
-void ARM::writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr,
-                   uint64_t PltEntryAddr, int32_t Index,
-                   unsigned RelOff) const {
+void ARM::writePlt(uint8_t *buf, uint64_t gotPltEntryAddr,
+                   uint64_t pltEntryAddr, int32_t index,
+                   unsigned relOff) const {
   // The PLT entry is similar to the example given in Appendix A of ELF for
   // the Arm Architecture. Instead of using the Group Relocations to find the
   // optimal rotation for the 8-bit immediate used in the add instructions we
   // hard code the most compact rotations for simplicity. This saves a load
   // instruction over the long plt sequences.
-  const uint32_t PltData[] = {
+  const uint32_t pltData[] = {
       0xe28fc600, // L1: add ip, pc,  #0x0NN00000  Offset(&(.plt.got) - L1 - 8
       0xe28cca00, //     add ip, ip,  #0x000NN000  Offset(&(.plt.got) - L1 - 8
       0xe5bcf000, //     ldr pc, [ip, #0x00000NNN] Offset(&(.plt.got) - L1 - 8
   };
 
-  uint64_t Offset = GotPltEntryAddr - PltEntryAddr - 8;
-  if (!llvm::isUInt<27>(Offset)) {
+  uint64_t offset = gotPltEntryAddr - pltEntryAddr - 8;
+  if (!llvm::isUInt<27>(offset)) {
     // We cannot encode the Offset, use the long form.
-    writePltLong(Buf, GotPltEntryAddr, PltEntryAddr, Index, RelOff);
+    writePltLong(buf, gotPltEntryAddr, pltEntryAddr, index, relOff);
     return;
   }
-  write32le(Buf + 0, PltData[0] | ((Offset >> 20) & 0xff));
-  write32le(Buf + 4, PltData[1] | ((Offset >> 12) & 0xff));
-  write32le(Buf + 8, PltData[2] | (Offset & 0xfff));
-  memcpy(Buf + 12, TrapInstr.data(), 4); // Pad to 16-byte boundary
+  write32le(buf + 0, pltData[0] | ((offset >> 20) & 0xff));
+  write32le(buf + 4, pltData[1] | ((offset >> 12) & 0xff));
+  write32le(buf + 8, pltData[2] | (offset & 0xfff));
+  memcpy(buf + 12, trapInstr.data(), 4); // Pad to 16-byte boundary
 }
 
-void ARM::addPltSymbols(InputSection &IS, uint64_t Off) const {
-  addSyntheticLocal("$a", STT_NOTYPE, Off, 0, IS);
-  addSyntheticLocal("$d", STT_NOTYPE, Off + 12, 0, IS);
+void ARM::addPltSymbols(InputSection &isec, uint64_t off) const {
+  addSyntheticLocal("$a", STT_NOTYPE, off, 0, isec);
+  addSyntheticLocal("$d", STT_NOTYPE, off + 12, 0, isec);
 }
 
-bool ARM::needsThunk(RelExpr Expr, RelType Type, const InputFile *File,
-                     uint64_t BranchAddr, const Symbol &S) const {
+bool ARM::needsThunk(RelExpr expr, RelType type, const InputFile *file,
+                     uint64_t branchAddr, const Symbol &s) const {
   // If S is an undefined weak symbol and does not have a PLT entry then it
   // will be resolved as a branch to the next instruction.
-  if (S.isUndefWeak() && !S.isInPlt())
+  if (s.isUndefWeak() && !s.isInPlt())
     return false;
   // A state change from ARM to Thumb and vice versa must go through an
   // interworking thunk if the relocation type is not R_ARM_CALL or
   // R_ARM_THM_CALL.
-  switch (Type) {
+  switch (type) {
   case R_ARM_PC24:
   case R_ARM_PLT32:
   case R_ARM_JUMP24:
     // Source is ARM, all PLT entries are ARM so no interworking required.
     // Otherwise we need to interwork if Symbol has bit 0 set (Thumb).
-    if (Expr == R_PC && ((S.getVA() & 1) == 1))
+    if (expr == R_PC && ((s.getVA() & 1) == 1))
       return true;
     LLVM_FALLTHROUGH;
   case R_ARM_CALL: {
-    uint64_t Dst = (Expr == R_PLT_PC) ? S.getPltVA() : S.getVA();
-    return !inBranchRange(Type, BranchAddr, Dst);
+    uint64_t dst = (expr == R_PLT_PC) ? s.getPltVA() : s.getVA();
+    return !inBranchRange(type, branchAddr, dst);
   }
   case R_ARM_THM_JUMP19:
   case R_ARM_THM_JUMP24:
     // Source is Thumb, all PLT entries are ARM so interworking is required.
     // Otherwise we need to interwork if Symbol has bit 0 clear (ARM).
-    if (Expr == R_PLT_PC || ((S.getVA() & 1) == 0))
+    if (expr == R_PLT_PC || ((s.getVA() & 1) == 0))
       return true;
     LLVM_FALLTHROUGH;
   case R_ARM_THM_CALL: {
-    uint64_t Dst = (Expr == R_PLT_PC) ? S.getPltVA() : S.getVA();
-    return !inBranchRange(Type, BranchAddr, Dst);
+    uint64_t dst = (expr == R_PLT_PC) ? s.getPltVA() : s.getVA();
+    return !inBranchRange(type, branchAddr, dst);
   }
   }
   return false;
@@ -301,13 +299,13 @@ bool ARM::needsThunk(RelExpr Expr, RelType Type, const InputFile *File,
 
 uint32_t ARM::getThunkSectionSpacing() const {
   // The placing of pre-created ThunkSections is controlled by the value
-  // ThunkSectionSpacing returned by getThunkSectionSpacing(). The aim is to
+  // thunkSectionSpacing returned by getThunkSectionSpacing(). The aim is to
   // place the ThunkSection such that all branches from the InputSections
   // prior to the ThunkSection can reach a Thunk placed at the end of the
   // ThunkSection. Graphically:
-  // | up to ThunkSectionSpacing .text input sections |
+  // | up to thunkSectionSpacing .text input sections |
   // | ThunkSection                                   |
-  // | up to ThunkSectionSpacing .text input sections |
+  // | up to thunkSectionSpacing .text input sections |
   // | ThunkSection                                   |
 
   // Pre-created ThunkSections are spaced roughly 16MiB apart on ARMv7. This
@@ -318,69 +316,68 @@ uint32_t ARM::getThunkSectionSpacing() const {
   // Thumb B<cc>.W range +/- 1MiB
   // If a branch cannot reach a pre-created ThunkSection a new one will be
   // created so we can handle the rare cases of a Thumb 2 conditional branch.
-  // We intentionally use a lower size for ThunkSectionSpacing than the maximum
+  // We intentionally use a lower size for thunkSectionSpacing than the maximum
   // branch range so the end of the ThunkSection is more likely to be within
   // range of the branch instruction that is furthest away. The value we shorten
-  // ThunkSectionSpacing by is set conservatively to allow us to create 16,384
+  // thunkSectionSpacing by is set conservatively to allow us to create 16,384
   // 12 byte Thunks at any offset in a ThunkSection without risk of a branch to
   // one of the Thunks going out of range.
 
-  // On Arm the ThunkSectionSpacing depends on the range of the Thumb Branch
+  // On Arm the thunkSectionSpacing depends on the range of the Thumb Branch
   // range. On earlier Architectures such as ARMv4, ARMv5 and ARMv6 (except
   // ARMv6T2) the range is +/- 4MiB.
 
-  return (Config->ARMJ1J2BranchEncoding) ? 0x1000000 - 0x30000
+  return (config->armJ1J2BranchEncoding) ? 0x1000000 - 0x30000
                                          : 0x400000 - 0x7500;
 }
 
-bool ARM::inBranchRange(RelType Type, uint64_t Src, uint64_t Dst) const {
-  uint64_t Range;
-  uint64_t InstrSize;
+bool ARM::inBranchRange(RelType type, uint64_t src, uint64_t dst) const {
+  uint64_t range;
+  uint64_t instrSize;
 
-  switch (Type) {
+  switch (type) {
   case R_ARM_PC24:
   case R_ARM_PLT32:
   case R_ARM_JUMP24:
   case R_ARM_CALL:
-    Range = 0x2000000;
-    InstrSize = 4;
+    range = 0x2000000;
+    instrSize = 4;
     break;
   case R_ARM_THM_JUMP19:
-    Range = 0x100000;
-    InstrSize = 2;
+    range = 0x100000;
+    instrSize = 2;
     break;
   case R_ARM_THM_JUMP24:
   case R_ARM_THM_CALL:
-    Range = Config->ARMJ1J2BranchEncoding ? 0x1000000 : 0x400000;
-    InstrSize = 2;
+    range = config->armJ1J2BranchEncoding ? 0x1000000 : 0x400000;
+    instrSize = 2;
     break;
   default:
     return true;
   }
   // PC at Src is 2 instructions ahead, immediate of branch is signed
-  if (Src > Dst)
-    Range -= 2 * InstrSize;
+  if (src > dst)
+    range -= 2 * instrSize;
   else
-    Range += InstrSize;
+    range += instrSize;
 
-  if ((Dst & 0x1) == 0)
+  if ((dst & 0x1) == 0)
     // Destination is ARM, if ARM caller then Src is already 4-byte aligned.
     // If Thumb Caller (BLX) the Src address has bottom 2 bits cleared to ensure
     // destination will be 4 byte aligned.
-    Src &= ~0x3;
+    src &= ~0x3;
   else
     // Bit 0 == 1 denotes Thumb state, it is not part of the range
-    Dst &= ~0x1;
+    dst &= ~0x1;
 
-  uint64_t Distance = (Src > Dst) ? Src - Dst : Dst - Src;
-  return Distance <= Range;
+  uint64_t distance = (src > dst) ? src - dst : dst - src;
+  return distance <= range;
 }
 
-void ARM::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
-  switch (Type) {
+void ARM::relocateOne(uint8_t *loc, RelType type, uint64_t val) const {
+  switch (type) {
   case R_ARM_ABS32:
   case R_ARM_BASE_PREL:
-  case R_ARM_GLOB_DAT:
   case R_ARM_GOTOFF32:
   case R_ARM_GOT_BREL:
   case R_ARM_GOT_PREL:
@@ -396,135 +393,132 @@ void ARM::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
   case R_ARM_TLS_LE32:
   case R_ARM_TLS_TPOFF32:
   case R_ARM_TLS_DTPOFF32:
-    write32le(Loc, Val);
-    break;
-  case R_ARM_TLS_DTPMOD32:
-    write32le(Loc, 1);
+    write32le(loc, val);
     break;
   case R_ARM_PREL31:
-    checkInt(Loc, Val, 31, Type);
-    write32le(Loc, (read32le(Loc) & 0x80000000) | (Val & ~0x80000000));
+    checkInt(loc, val, 31, type);
+    write32le(loc, (read32le(loc) & 0x80000000) | (val & ~0x80000000));
     break;
   case R_ARM_CALL:
     // R_ARM_CALL is used for BL and BLX instructions, depending on the
     // value of bit 0 of Val, we must select a BL or BLX instruction
-    if (Val & 1) {
+    if (val & 1) {
       // If bit 0 of Val is 1 the target is Thumb, we must select a BLX.
       // The BLX encoding is 0xfa:H:imm24 where Val = imm24:H:'1'
-      checkInt(Loc, Val, 26, Type);
-      write32le(Loc, 0xfa000000 |                    // opcode
-                         ((Val & 2) << 23) |         // H
-                         ((Val >> 2) & 0x00ffffff)); // imm24
+      checkInt(loc, val, 26, type);
+      write32le(loc, 0xfa000000 |                    // opcode
+                         ((val & 2) << 23) |         // H
+                         ((val >> 2) & 0x00ffffff)); // imm24
       break;
     }
-    if ((read32le(Loc) & 0xfe000000) == 0xfa000000)
+    if ((read32le(loc) & 0xfe000000) == 0xfa000000)
       // BLX (always unconditional) instruction to an ARM Target, select an
       // unconditional BL.
-      write32le(Loc, 0xeb000000 | (read32le(Loc) & 0x00ffffff));
+      write32le(loc, 0xeb000000 | (read32le(loc) & 0x00ffffff));
     // fall through as BL encoding is shared with B
     LLVM_FALLTHROUGH;
   case R_ARM_JUMP24:
   case R_ARM_PC24:
   case R_ARM_PLT32:
-    checkInt(Loc, Val, 26, Type);
-    write32le(Loc, (read32le(Loc) & ~0x00ffffff) | ((Val >> 2) & 0x00ffffff));
+    checkInt(loc, val, 26, type);
+    write32le(loc, (read32le(loc) & ~0x00ffffff) | ((val >> 2) & 0x00ffffff));
     break;
   case R_ARM_THM_JUMP11:
-    checkInt(Loc, Val, 12, Type);
-    write16le(Loc, (read32le(Loc) & 0xf800) | ((Val >> 1) & 0x07ff));
+    checkInt(loc, val, 12, type);
+    write16le(loc, (read32le(loc) & 0xf800) | ((val >> 1) & 0x07ff));
     break;
   case R_ARM_THM_JUMP19:
     // Encoding T3: Val = S:J2:J1:imm6:imm11:0
-    checkInt(Loc, Val, 21, Type);
-    write16le(Loc,
-              (read16le(Loc) & 0xfbc0) |   // opcode cond
-                  ((Val >> 10) & 0x0400) | // S
-                  ((Val >> 12) & 0x003f)); // imm6
-    write16le(Loc + 2,
+    checkInt(loc, val, 21, type);
+    write16le(loc,
+              (read16le(loc) & 0xfbc0) |   // opcode cond
+                  ((val >> 10) & 0x0400) | // S
+                  ((val >> 12) & 0x003f)); // imm6
+    write16le(loc + 2,
               0x8000 |                    // opcode
-                  ((Val >> 8) & 0x0800) | // J2
-                  ((Val >> 5) & 0x2000) | // J1
-                  ((Val >> 1) & 0x07ff)); // imm11
+                  ((val >> 8) & 0x0800) | // J2
+                  ((val >> 5) & 0x2000) | // J1
+                  ((val >> 1) & 0x07ff)); // imm11
     break;
   case R_ARM_THM_CALL:
     // R_ARM_THM_CALL is used for BL and BLX instructions, depending on the
     // value of bit 0 of Val, we must select a BL or BLX instruction
-    if ((Val & 1) == 0) {
+    if ((val & 1) == 0) {
       // Ensure BLX destination is 4-byte aligned. As BLX instruction may
       // only be two byte aligned. This must be done before overflow check
-      Val = alignTo(Val, 4);
+      val = alignTo(val, 4);
     }
     // Bit 12 is 0 for BLX, 1 for BL
-    write16le(Loc + 2, (read16le(Loc + 2) & ~0x1000) | (Val & 1) << 12);
-    if (!Config->ARMJ1J2BranchEncoding) {
+    write16le(loc + 2, (read16le(loc + 2) & ~0x1000) | (val & 1) << 12);
+    if (!config->armJ1J2BranchEncoding) {
       // Older Arm architectures do not support R_ARM_THM_JUMP24 and have
       // different encoding rules and range due to J1 and J2 always being 1.
-      checkInt(Loc, Val, 23, Type);
-      write16le(Loc,
+      checkInt(loc, val, 23, type);
+      write16le(loc,
                 0xf000 |                     // opcode
-                    ((Val >> 12) & 0x07ff)); // imm11
-      write16le(Loc + 2,
-                (read16le(Loc + 2) & 0xd000) | // opcode
+                    ((val >> 12) & 0x07ff)); // imm11
+      write16le(loc + 2,
+                (read16le(loc + 2) & 0xd000) | // opcode
                     0x2800 |                   // J1 == J2 == 1
-                    ((Val >> 1) & 0x07ff));    // imm11
+                    ((val >> 1) & 0x07ff));    // imm11
       break;
     }
     // Fall through as rest of encoding is the same as B.W
     LLVM_FALLTHROUGH;
   case R_ARM_THM_JUMP24:
     // Encoding B  T4, BL T1, BLX T2: Val = S:I1:I2:imm10:imm11:0
-    checkInt(Loc, Val, 25, Type);
-    write16le(Loc,
+    checkInt(loc, val, 25, type);
+    write16le(loc,
               0xf000 |                     // opcode
-                  ((Val >> 14) & 0x0400) | // S
-                  ((Val >> 12) & 0x03ff)); // imm10
-    write16le(Loc + 2,
-              (read16le(Loc + 2) & 0xd000) |                  // opcode
-                  (((~(Val >> 10)) ^ (Val >> 11)) & 0x2000) | // J1
-                  (((~(Val >> 11)) ^ (Val >> 13)) & 0x0800) | // J2
-                  ((Val >> 1) & 0x07ff));                     // imm11
+                  ((val >> 14) & 0x0400) | // S
+                  ((val >> 12) & 0x03ff)); // imm10
+    write16le(loc + 2,
+              (read16le(loc + 2) & 0xd000) |                  // opcode
+                  (((~(val >> 10)) ^ (val >> 11)) & 0x2000) | // J1
+                  (((~(val >> 11)) ^ (val >> 13)) & 0x0800) | // J2
+                  ((val >> 1) & 0x07ff));                     // imm11
     break;
   case R_ARM_MOVW_ABS_NC:
   case R_ARM_MOVW_PREL_NC:
-    write32le(Loc, (read32le(Loc) & ~0x000f0fff) | ((Val & 0xf000) << 4) |
-                       (Val & 0x0fff));
+    write32le(loc, (read32le(loc) & ~0x000f0fff) | ((val & 0xf000) << 4) |
+                       (val & 0x0fff));
     break;
   case R_ARM_MOVT_ABS:
   case R_ARM_MOVT_PREL:
-    write32le(Loc, (read32le(Loc) & ~0x000f0fff) |
-                       (((Val >> 16) & 0xf000) << 4) | ((Val >> 16) & 0xfff));
+    write32le(loc, (read32le(loc) & ~0x000f0fff) |
+                       (((val >> 16) & 0xf000) << 4) | ((val >> 16) & 0xfff));
     break;
   case R_ARM_THM_MOVT_ABS:
   case R_ARM_THM_MOVT_PREL:
     // Encoding T1: A = imm4:i:imm3:imm8
-    write16le(Loc,
+    write16le(loc,
               0xf2c0 |                     // opcode
-                  ((Val >> 17) & 0x0400) | // i
-                  ((Val >> 28) & 0x000f)); // imm4
-    write16le(Loc + 2,
-              (read16le(Loc + 2) & 0x8f00) | // opcode
-                  ((Val >> 12) & 0x7000) |   // imm3
-                  ((Val >> 16) & 0x00ff));   // imm8
+                  ((val >> 17) & 0x0400) | // i
+                  ((val >> 28) & 0x000f)); // imm4
+    write16le(loc + 2,
+              (read16le(loc + 2) & 0x8f00) | // opcode
+                  ((val >> 12) & 0x7000) |   // imm3
+                  ((val >> 16) & 0x00ff));   // imm8
     break;
   case R_ARM_THM_MOVW_ABS_NC:
   case R_ARM_THM_MOVW_PREL_NC:
     // Encoding T3: A = imm4:i:imm3:imm8
-    write16le(Loc,
+    write16le(loc,
               0xf240 |                     // opcode
-                  ((Val >> 1) & 0x0400) |  // i
-                  ((Val >> 12) & 0x000f)); // imm4
-    write16le(Loc + 2,
-              (read16le(Loc + 2) & 0x8f00) | // opcode
-                  ((Val << 4) & 0x7000) |    // imm3
-                  (Val & 0x00ff));           // imm8
+                  ((val >> 1) & 0x0400) |  // i
+                  ((val >> 12) & 0x000f)); // imm4
+    write16le(loc + 2,
+              (read16le(loc + 2) & 0x8f00) | // opcode
+                  ((val << 4) & 0x7000) |    // imm3
+                  (val & 0x00ff));           // imm8
     break;
   default:
-    error(getErrorLocation(Loc) + "unrecognized reloc " + Twine(Type));
+    error(getErrorLocation(loc) + "unrecognized relocation " + toString(type));
   }
 }
 
-int64_t ARM::getImplicitAddend(const uint8_t *Buf, RelType Type) const {
-  switch (Type) {
+int64_t ARM::getImplicitAddend(const uint8_t *buf, RelType type) const {
+  switch (type) {
   default:
     return 0;
   case R_ARM_ABS32:
@@ -540,47 +534,47 @@ int64_t ARM::getImplicitAddend(const uint8_t *Buf, RelType Type) const {
   case R_ARM_TLS_LDO32:
   case R_ARM_TLS_IE32:
   case R_ARM_TLS_LE32:
-    return SignExtend64<32>(read32le(Buf));
+    return SignExtend64<32>(read32le(buf));
   case R_ARM_PREL31:
-    return SignExtend64<31>(read32le(Buf));
+    return SignExtend64<31>(read32le(buf));
   case R_ARM_CALL:
   case R_ARM_JUMP24:
   case R_ARM_PC24:
   case R_ARM_PLT32:
-    return SignExtend64<26>(read32le(Buf) << 2);
+    return SignExtend64<26>(read32le(buf) << 2);
   case R_ARM_THM_JUMP11:
-    return SignExtend64<12>(read16le(Buf) << 1);
+    return SignExtend64<12>(read16le(buf) << 1);
   case R_ARM_THM_JUMP19: {
     // Encoding T3: A = S:J2:J1:imm10:imm6:0
-    uint16_t Hi = read16le(Buf);
-    uint16_t Lo = read16le(Buf + 2);
-    return SignExtend64<20>(((Hi & 0x0400) << 10) | // S
-                            ((Lo & 0x0800) << 8) |  // J2
-                            ((Lo & 0x2000) << 5) |  // J1
-                            ((Hi & 0x003f) << 12) | // imm6
-                            ((Lo & 0x07ff) << 1));  // imm11:0
+    uint16_t hi = read16le(buf);
+    uint16_t lo = read16le(buf + 2);
+    return SignExtend64<20>(((hi & 0x0400) << 10) | // S
+                            ((lo & 0x0800) << 8) |  // J2
+                            ((lo & 0x2000) << 5) |  // J1
+                            ((hi & 0x003f) << 12) | // imm6
+                            ((lo & 0x07ff) << 1));  // imm11:0
   }
   case R_ARM_THM_CALL:
-    if (!Config->ARMJ1J2BranchEncoding) {
+    if (!config->armJ1J2BranchEncoding) {
       // Older Arm architectures do not support R_ARM_THM_JUMP24 and have
       // different encoding rules and range due to J1 and J2 always being 1.
-      uint16_t Hi = read16le(Buf);
-      uint16_t Lo = read16le(Buf + 2);
-      return SignExtend64<22>(((Hi & 0x7ff) << 12) | // imm11
-                              ((Lo & 0x7ff) << 1));  // imm11:0
+      uint16_t hi = read16le(buf);
+      uint16_t lo = read16le(buf + 2);
+      return SignExtend64<22>(((hi & 0x7ff) << 12) | // imm11
+                              ((lo & 0x7ff) << 1));  // imm11:0
       break;
     }
     LLVM_FALLTHROUGH;
   case R_ARM_THM_JUMP24: {
     // Encoding B T4, BL T1, BLX T2: A = S:I1:I2:imm10:imm11:0
     // I1 = NOT(J1 EOR S), I2 = NOT(J2 EOR S)
-    uint16_t Hi = read16le(Buf);
-    uint16_t Lo = read16le(Buf + 2);
-    return SignExtend64<24>(((Hi & 0x0400) << 14) |                    // S
-                            (~((Lo ^ (Hi << 3)) << 10) & 0x00800000) | // I1
-                            (~((Lo ^ (Hi << 1)) << 11) & 0x00400000) | // I2
-                            ((Hi & 0x003ff) << 12) |                   // imm0
-                            ((Lo & 0x007ff) << 1)); // imm11:0
+    uint16_t hi = read16le(buf);
+    uint16_t lo = read16le(buf + 2);
+    return SignExtend64<24>(((hi & 0x0400) << 14) |                    // S
+                            (~((lo ^ (hi << 3)) << 10) & 0x00800000) | // I1
+                            (~((lo ^ (hi << 1)) << 11) & 0x00400000) | // I2
+                            ((hi & 0x003ff) << 12) |                   // imm0
+                            ((lo & 0x007ff) << 1)); // imm11:0
   }
   // ELF for the ARM Architecture 4.6.1.1 the implicit addend for MOVW and
   // MOVT is in the range -32768 <= A < 32768
@@ -588,25 +582,25 @@ int64_t ARM::getImplicitAddend(const uint8_t *Buf, RelType Type) const {
   case R_ARM_MOVT_ABS:
   case R_ARM_MOVW_PREL_NC:
   case R_ARM_MOVT_PREL: {
-    uint64_t Val = read32le(Buf) & 0x000f0fff;
-    return SignExtend64<16>(((Val & 0x000f0000) >> 4) | (Val & 0x00fff));
+    uint64_t val = read32le(buf) & 0x000f0fff;
+    return SignExtend64<16>(((val & 0x000f0000) >> 4) | (val & 0x00fff));
   }
   case R_ARM_THM_MOVW_ABS_NC:
   case R_ARM_THM_MOVT_ABS:
   case R_ARM_THM_MOVW_PREL_NC:
   case R_ARM_THM_MOVT_PREL: {
     // Encoding T3: A = imm4:i:imm3:imm8
-    uint16_t Hi = read16le(Buf);
-    uint16_t Lo = read16le(Buf + 2);
-    return SignExtend64<16>(((Hi & 0x000f) << 12) | // imm4
-                            ((Hi & 0x0400) << 1) |  // i
-                            ((Lo & 0x7000) >> 4) |  // imm3
-                            (Lo & 0x00ff));         // imm8
+    uint16_t hi = read16le(buf);
+    uint16_t lo = read16le(buf + 2);
+    return SignExtend64<16>(((hi & 0x000f) << 12) | // imm4
+                            ((hi & 0x0400) << 1) |  // i
+                            ((lo & 0x7000) >> 4) |  // imm3
+                            (lo & 0x00ff));         // imm8
   }
   }
 }
 
 TargetInfo *elf::getARMTargetInfo() {
-  static ARM Target;
-  return &Target;
+  static ARM target;
+  return &target;
 }
diff --git a/deps/lld/ELF/Arch/AVR.cpp b/deps/lld/ELF/Arch/AVR.cpp
index 637da3778bd20964917631571c66f1c0ee5d953f..869f0fe0c52579e95867d6b568a79798e8daabbc 100644
--- a/deps/lld/ELF/Arch/AVR.cpp
+++ b/deps/lld/ELF/Arch/AVR.cpp
@@ -1,9 +1,8 @@
 //===- AVR.cpp ------------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -44,34 +43,34 @@ namespace {
 class AVR final : public TargetInfo {
 public:
   AVR();
-  RelExpr getRelExpr(RelType Type, const Symbol &S,
-                     const uint8_t *Loc) const override;
-  void relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const override;
+  RelExpr getRelExpr(RelType type, const Symbol &s,
+                     const uint8_t *loc) const override;
+  void relocateOne(uint8_t *loc, RelType type, uint64_t val) const override;
 };
 } // namespace
 
-AVR::AVR() { NoneRel = R_AVR_NONE; }
+AVR::AVR() { noneRel = R_AVR_NONE; }
 
-RelExpr AVR::getRelExpr(RelType Type, const Symbol &S,
-                        const uint8_t *Loc) const {
+RelExpr AVR::getRelExpr(RelType type, const Symbol &s,
+                        const uint8_t *loc) const {
   return R_ABS;
 }
 
-void AVR::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
-  switch (Type) {
+void AVR::relocateOne(uint8_t *loc, RelType type, uint64_t val) const {
+  switch (type) {
   case R_AVR_CALL: {
-    uint16_t Hi = Val >> 17;
-    uint16_t Lo = Val >> 1;
-    write16le(Loc, read16le(Loc) | ((Hi >> 1) << 4) | (Hi & 1));
-    write16le(Loc + 2, Lo);
+    uint16_t hi = val >> 17;
+    uint16_t lo = val >> 1;
+    write16le(loc, read16le(loc) | ((hi >> 1) << 4) | (hi & 1));
+    write16le(loc + 2, lo);
     break;
   }
   default:
-    error(getErrorLocation(Loc) + "unrecognized reloc " + toString(Type));
+    error(getErrorLocation(loc) + "unrecognized relocation " + toString(type));
   }
 }
 
 TargetInfo *elf::getAVRTargetInfo() {
-  static AVR Target;
-  return &Target;
+  static AVR target;
+  return &target;
 }
diff --git a/deps/lld/ELF/Arch/Hexagon.cpp b/deps/lld/ELF/Arch/Hexagon.cpp
index b4d33be2ad39bc1a4198e6342159520069d7facd..c497a6df79873d8fd69630c2931cfec739250b5f 100644
--- a/deps/lld/ELF/Arch/Hexagon.cpp
+++ b/deps/lld/ELF/Arch/Hexagon.cpp
@@ -1,9 +1,8 @@
 //===-- Hexagon.cpp -------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -28,65 +27,65 @@ class Hexagon final : public TargetInfo {
 public:
   Hexagon();
   uint32_t calcEFlags() const override;
-  RelExpr getRelExpr(RelType Type, const Symbol &S,
-                     const uint8_t *Loc) const override;
-  void relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const override;
-  void writePltHeader(uint8_t *Buf) const override;
-  void writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr, uint64_t PltEntryAddr,
-                int32_t Index, unsigned RelOff) const override;
+  RelExpr getRelExpr(RelType type, const Symbol &s,
+                     const uint8_t *loc) const override;
+  void relocateOne(uint8_t *loc, RelType type, uint64_t val) const override;
+  void writePltHeader(uint8_t *buf) const override;
+  void writePlt(uint8_t *buf, uint64_t gotPltEntryAddr, uint64_t pltEntryAddr,
+                int32_t index, unsigned relOff) const override;
 };
 } // namespace
 
 Hexagon::Hexagon() {
-  PltRel = R_HEX_JMP_SLOT;
-  RelativeRel = R_HEX_RELATIVE;
-  GotRel = R_HEX_GLOB_DAT;
-  GotEntrySize = 4;
+  pltRel = R_HEX_JMP_SLOT;
+  relativeRel = R_HEX_RELATIVE;
+  gotRel = R_HEX_GLOB_DAT;
+  symbolicRel = R_HEX_32;
+
   // The zero'th GOT entry is reserved for the address of _DYNAMIC.  The
   // next 3 are reserved for the dynamic loader.
-  GotPltHeaderEntriesNum = 4;
-  GotPltEntrySize = 4;
+  gotPltHeaderEntriesNum = 4;
 
-  PltEntrySize = 16;
-  PltHeaderSize = 32;
+  pltEntrySize = 16;
+  pltHeaderSize = 32;
 
   // Hexagon Linux uses 64K pages by default.
-  DefaultMaxPageSize = 0x10000;
-  NoneRel = R_HEX_NONE;
+  defaultMaxPageSize = 0x10000;
+  noneRel = R_HEX_NONE;
 }
 
 uint32_t Hexagon::calcEFlags() const {
-  assert(!ObjectFiles.empty());
+  assert(!objectFiles.empty());
 
   // The architecture revision must always be equal to or greater than
   // greatest revision in the list of inputs.
-  uint32_t Ret = 0;
-  for (InputFile *F : ObjectFiles) {
-    uint32_t EFlags = cast<ObjFile<ELF32LE>>(F)->getObj().getHeader()->e_flags;
-    if (EFlags > Ret)
-      Ret = EFlags;
+  uint32_t ret = 0;
+  for (InputFile *f : objectFiles) {
+    uint32_t eflags = cast<ObjFile<ELF32LE>>(f)->getObj().getHeader()->e_flags;
+    if (eflags > ret)
+      ret = eflags;
   }
-  return Ret;
+  return ret;
 }
 
-static uint32_t applyMask(uint32_t Mask, uint32_t Data) {
-  uint32_t Result = 0;
-  size_t Off = 0;
+static uint32_t applyMask(uint32_t mask, uint32_t data) {
+  uint32_t result = 0;
+  size_t off = 0;
 
-  for (size_t Bit = 0; Bit != 32; ++Bit) {
-    uint32_t ValBit = (Data >> Off) & 1;
-    uint32_t MaskBit = (Mask >> Bit) & 1;
-    if (MaskBit) {
-      Result |= (ValBit << Bit);
-      ++Off;
+  for (size_t bit = 0; bit != 32; ++bit) {
+    uint32_t valBit = (data >> off) & 1;
+    uint32_t maskBit = (mask >> bit) & 1;
+    if (maskBit) {
+      result |= (valBit << bit);
+      ++off;
     }
   }
-  return Result;
+  return result;
 }
 
-RelExpr Hexagon::getRelExpr(RelType Type, const Symbol &S,
-                            const uint8_t *Loc) const {
-  switch (Type) {
+RelExpr Hexagon::getRelExpr(RelType type, const Symbol &s,
+                            const uint8_t *loc) const {
+  switch (type) {
   case R_HEX_B9_PCREL:
   case R_HEX_B9_PCREL_X:
   case R_HEX_B13_PCREL:
@@ -109,16 +108,16 @@ RelExpr Hexagon::getRelExpr(RelType Type, const Symbol &S,
   }
 }
 
-static uint32_t findMaskR6(uint32_t Insn) {
+static uint32_t findMaskR6(uint32_t insn) {
   // There are (arguably too) many relocation masks for the DSP's
   // R_HEX_6_X type.  The table below is used to select the correct mask
   // for the given instruction.
   struct InstructionMask {
-    uint32_t CmpMask;
-    uint32_t RelocMask;
+    uint32_t cmpMask;
+    uint32_t relocMask;
   };
 
-  static const InstructionMask R6[] = {
+  static const InstructionMask r6[] = {
       {0x38000000, 0x0000201f}, {0x39000000, 0x0000201f},
       {0x3e000000, 0x00001f80}, {0x3f000000, 0x00001f80},
       {0x40000000, 0x000020f8}, {0x41000000, 0x000007e0},
@@ -136,124 +135,124 @@ static uint32_t findMaskR6(uint32_t Insn) {
   // Duplex forms have a fixed mask and parse bits 15:14 are always
   // zero.  Non-duplex insns will always have at least one bit set in the
   // parse field.
-  if ((0xC000 & Insn) == 0x0)
+  if ((0xC000 & insn) == 0x0)
     return 0x03f00000;
 
-  for (InstructionMask I : R6)
-    if ((0xff000000 & Insn) == I.CmpMask)
-      return I.RelocMask;
+  for (InstructionMask i : r6)
+    if ((0xff000000 & insn) == i.cmpMask)
+      return i.relocMask;
 
   error("unrecognized instruction for R_HEX_6 relocation: 0x" +
-        utohexstr(Insn));
+        utohexstr(insn));
   return 0;
 }
 
-static uint32_t findMaskR8(uint32_t Insn) {
-  if ((0xff000000 & Insn) == 0xde000000)
+static uint32_t findMaskR8(uint32_t insn) {
+  if ((0xff000000 & insn) == 0xde000000)
     return 0x00e020e8;
-  if ((0xff000000 & Insn) == 0x3c000000)
+  if ((0xff000000 & insn) == 0x3c000000)
     return 0x0000207f;
   return 0x00001fe0;
 }
 
-static uint32_t findMaskR11(uint32_t Insn) {
-  if ((0xff000000 & Insn) == 0xa1000000)
+static uint32_t findMaskR11(uint32_t insn) {
+  if ((0xff000000 & insn) == 0xa1000000)
     return 0x060020ff;
   return 0x06003fe0;
 }
 
-static uint32_t findMaskR16(uint32_t Insn) {
-  if ((0xff000000 & Insn) == 0x48000000)
+static uint32_t findMaskR16(uint32_t insn) {
+  if ((0xff000000 & insn) == 0x48000000)
     return 0x061f20ff;
-  if ((0xff000000 & Insn) == 0x49000000)
+  if ((0xff000000 & insn) == 0x49000000)
     return 0x061f3fe0;
-  if ((0xff000000 & Insn) == 0x78000000)
+  if ((0xff000000 & insn) == 0x78000000)
     return 0x00df3fe0;
-  if ((0xff000000 & Insn) == 0xb0000000)
+  if ((0xff000000 & insn) == 0xb0000000)
     return 0x0fe03fe0;
 
   error("unrecognized instruction for R_HEX_16_X relocation: 0x" +
-        utohexstr(Insn));
+        utohexstr(insn));
   return 0;
 }
 
-static void or32le(uint8_t *P, int32_t V) { write32le(P, read32le(P) | V); }
+static void or32le(uint8_t *p, int32_t v) { write32le(p, read32le(p) | v); }
 
-void Hexagon::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
-  switch (Type) {
+void Hexagon::relocateOne(uint8_t *loc, RelType type, uint64_t val) const {
+  switch (type) {
   case R_HEX_NONE:
     break;
   case R_HEX_6_PCREL_X:
   case R_HEX_6_X:
-    or32le(Loc, applyMask(findMaskR6(read32le(Loc)), Val));
+    or32le(loc, applyMask(findMaskR6(read32le(loc)), val));
     break;
   case R_HEX_8_X:
-    or32le(Loc, applyMask(findMaskR8(read32le(Loc)), Val));
+    or32le(loc, applyMask(findMaskR8(read32le(loc)), val));
     break;
   case R_HEX_9_X:
-    or32le(Loc, applyMask(0x00003fe0, Val & 0x3f));
+    or32le(loc, applyMask(0x00003fe0, val & 0x3f));
     break;
   case R_HEX_10_X:
-    or32le(Loc, applyMask(0x00203fe0, Val & 0x3f));
+    or32le(loc, applyMask(0x00203fe0, val & 0x3f));
     break;
   case R_HEX_11_X:
   case R_HEX_GOT_11_X:
-    or32le(Loc, applyMask(findMaskR11(read32le(Loc)), Val & 0x3f));
+    or32le(loc, applyMask(findMaskR11(read32le(loc)), val & 0x3f));
     break;
   case R_HEX_12_X:
-    or32le(Loc, applyMask(0x000007e0, Val));
+    or32le(loc, applyMask(0x000007e0, val));
     break;
   case R_HEX_16_X: // These relocs only have 6 effective bits.
   case R_HEX_GOT_16_X:
-    or32le(Loc, applyMask(findMaskR16(read32le(Loc)), Val & 0x3f));
+    or32le(loc, applyMask(findMaskR16(read32le(loc)), val & 0x3f));
     break;
   case R_HEX_32:
   case R_HEX_32_PCREL:
-    or32le(Loc, Val);
+    or32le(loc, val);
     break;
   case R_HEX_32_6_X:
   case R_HEX_GOT_32_6_X:
-    or32le(Loc, applyMask(0x0fff3fff, Val >> 6));
+    or32le(loc, applyMask(0x0fff3fff, val >> 6));
     break;
   case R_HEX_B9_PCREL:
-    or32le(Loc, applyMask(0x003000fe, Val >> 2));
+    or32le(loc, applyMask(0x003000fe, val >> 2));
     break;
   case R_HEX_B9_PCREL_X:
-    or32le(Loc, applyMask(0x003000fe, Val & 0x3f));
+    or32le(loc, applyMask(0x003000fe, val & 0x3f));
     break;
   case R_HEX_B13_PCREL:
-    or32le(Loc, applyMask(0x00202ffe, Val >> 2));
+    or32le(loc, applyMask(0x00202ffe, val >> 2));
     break;
   case R_HEX_B15_PCREL:
-    or32le(Loc, applyMask(0x00df20fe, Val >> 2));
+    or32le(loc, applyMask(0x00df20fe, val >> 2));
     break;
   case R_HEX_B15_PCREL_X:
-    or32le(Loc, applyMask(0x00df20fe, Val & 0x3f));
+    or32le(loc, applyMask(0x00df20fe, val & 0x3f));
     break;
   case R_HEX_B22_PCREL:
   case R_HEX_PLT_B22_PCREL:
-    or32le(Loc, applyMask(0x1ff3ffe, Val >> 2));
+    or32le(loc, applyMask(0x1ff3ffe, val >> 2));
     break;
   case R_HEX_B22_PCREL_X:
-    or32le(Loc, applyMask(0x1ff3ffe, Val & 0x3f));
+    or32le(loc, applyMask(0x1ff3ffe, val & 0x3f));
     break;
   case R_HEX_B32_PCREL_X:
-    or32le(Loc, applyMask(0x0fff3fff, Val >> 6));
+    or32le(loc, applyMask(0x0fff3fff, val >> 6));
     break;
   case R_HEX_HI16:
-    or32le(Loc, applyMask(0x00c03fff, Val >> 16));
+    or32le(loc, applyMask(0x00c03fff, val >> 16));
     break;
   case R_HEX_LO16:
-    or32le(Loc, applyMask(0x00c03fff, Val));
+    or32le(loc, applyMask(0x00c03fff, val));
     break;
   default:
-    error(getErrorLocation(Loc) + "unrecognized reloc " + toString(Type));
+    error(getErrorLocation(loc) + "unrecognized relocation " + toString(type));
     break;
   }
 }
 
-void Hexagon::writePltHeader(uint8_t *Buf) const {
-  const uint8_t PltData[] = {
+void Hexagon::writePltHeader(uint8_t *buf) const {
+  const uint8_t pltData[] = {
       0x00, 0x40, 0x00, 0x00, // { immext (#0)
       0x1c, 0xc0, 0x49, 0x6a, //   r28 = add (pc, ##GOT0@PCREL) } # @GOT0
       0x0e, 0x42, 0x9c, 0xe2, // { r14 -= add (r28, #16)  # offset of GOTn
@@ -263,30 +262,30 @@ void Hexagon::writePltHeader(uint8_t *Buf) const {
       0x00, 0xc0, 0x9c, 0x52, //   jumpr r28 }            # call dynamic linker
       0x0c, 0xdb, 0x00, 0x54, // trap0(#0xdb) # bring plt0 into 16byte alignment
   };
-  memcpy(Buf, PltData, sizeof(PltData));
+  memcpy(buf, pltData, sizeof(pltData));
 
   // Offset from PLT0 to the GOT.
-  uint64_t Off = In.GotPlt->getVA() - In.Plt->getVA();
-  relocateOne(Buf, R_HEX_B32_PCREL_X, Off);
-  relocateOne(Buf + 4, R_HEX_6_PCREL_X, Off);
+  uint64_t off = in.gotPlt->getVA() - in.plt->getVA();
+  relocateOne(buf, R_HEX_B32_PCREL_X, off);
+  relocateOne(buf + 4, R_HEX_6_PCREL_X, off);
 }
 
-void Hexagon::writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr,
-                       uint64_t PltEntryAddr, int32_t Index,
-                       unsigned RelOff) const {
-  const uint8_t Inst[] = {
+void Hexagon::writePlt(uint8_t *buf, uint64_t gotPltEntryAddr,
+                       uint64_t pltEntryAddr, int32_t index,
+                       unsigned relOff) const {
+  const uint8_t inst[] = {
       0x00, 0x40, 0x00, 0x00, // { immext (#0)
       0x0e, 0xc0, 0x49, 0x6a, //   r14 = add (pc, ##GOTn@PCREL) }
       0x1c, 0xc0, 0x8e, 0x91, // r28 = memw (r14)
       0x00, 0xc0, 0x9c, 0x52, // jumpr r28
   };
-  memcpy(Buf, Inst, sizeof(Inst));
+  memcpy(buf, inst, sizeof(inst));
 
-  relocateOne(Buf, R_HEX_B32_PCREL_X, GotPltEntryAddr - PltEntryAddr);
-  relocateOne(Buf + 4, R_HEX_6_PCREL_X, GotPltEntryAddr - PltEntryAddr);
+  relocateOne(buf, R_HEX_B32_PCREL_X, gotPltEntryAddr - pltEntryAddr);
+  relocateOne(buf + 4, R_HEX_6_PCREL_X, gotPltEntryAddr - pltEntryAddr);
 }
 
 TargetInfo *elf::getHexagonTargetInfo() {
-  static Hexagon Target;
-  return &Target;
+  static Hexagon target;
+  return &target;
 }
diff --git a/deps/lld/ELF/Arch/MSP430.cpp b/deps/lld/ELF/Arch/MSP430.cpp
index fe0c0fe64daf0e55d3545a7467d1c648aaf1c9ab..90664396c85ea0895efeeb6dbf1aa935e2af1af4 100644
--- a/deps/lld/ELF/Arch/MSP430.cpp
+++ b/deps/lld/ELF/Arch/MSP430.cpp
@@ -1,9 +1,8 @@
 //===- MSP430.cpp ---------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -34,20 +33,20 @@ namespace {
 class MSP430 final : public TargetInfo {
 public:
   MSP430();
-  RelExpr getRelExpr(RelType Type, const Symbol &S,
-                     const uint8_t *Loc) const override;
-  void relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const override;
+  RelExpr getRelExpr(RelType type, const Symbol &s,
+                     const uint8_t *loc) const override;
+  void relocateOne(uint8_t *loc, RelType type, uint64_t val) const override;
 };
 } // namespace
 
 MSP430::MSP430() {
   // mov.b #0, r3
-  TrapInstr = {0x43, 0x43, 0x43, 0x43};
+  trapInstr = {0x43, 0x43, 0x43, 0x43};
 }
 
-RelExpr MSP430::getRelExpr(RelType Type, const Symbol &S,
-                           const uint8_t *Loc) const {
-  switch (Type) {
+RelExpr MSP430::getRelExpr(RelType type, const Symbol &s,
+                           const uint8_t *loc) const {
+  switch (type) {
   case R_MSP430_10_PCREL:
   case R_MSP430_16_PCREL:
   case R_MSP430_16_PCREL_BYTE:
@@ -60,35 +59,35 @@ RelExpr MSP430::getRelExpr(RelType Type, const Symbol &S,
   }
 }
 
-void MSP430::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
-  switch (Type) {
+void MSP430::relocateOne(uint8_t *loc, RelType type, uint64_t val) const {
+  switch (type) {
   case R_MSP430_8:
-    checkIntUInt(Loc, Val, 8, Type);
-    *Loc = Val;
+    checkIntUInt(loc, val, 8, type);
+    *loc = val;
     break;
   case R_MSP430_16:
   case R_MSP430_16_PCREL:
   case R_MSP430_16_BYTE:
   case R_MSP430_16_PCREL_BYTE:
-    checkIntUInt(Loc, Val, 16, Type);
-    write16le(Loc, Val);
+    checkIntUInt(loc, val, 16, type);
+    write16le(loc, val);
     break;
   case R_MSP430_32:
-    checkIntUInt(Loc, Val, 32, Type);
-    write32le(Loc, Val);
+    checkIntUInt(loc, val, 32, type);
+    write32le(loc, val);
     break;
   case R_MSP430_10_PCREL: {
-    int16_t Offset = ((int16_t)Val >> 1) - 1;
-    checkInt(Loc, Offset, 10, Type);
-    write16le(Loc, (read16le(Loc) & 0xFC00) | (Offset & 0x3FF));
+    int16_t offset = ((int16_t)val >> 1) - 1;
+    checkInt(loc, offset, 10, type);
+    write16le(loc, (read16le(loc) & 0xFC00) | (offset & 0x3FF));
     break;
   }
   default:
-    error(getErrorLocation(Loc) + "unrecognized reloc " + toString(Type));
+    error(getErrorLocation(loc) + "unrecognized relocation " + toString(type));
   }
 }
 
 TargetInfo *elf::getMSP430TargetInfo() {
-  static MSP430 Target;
-  return &Target;
+  static MSP430 target;
+  return &target;
 }
diff --git a/deps/lld/ELF/Arch/Mips.cpp b/deps/lld/ELF/Arch/Mips.cpp
index 23b0c1dd8a2d1dd4a4d56a470e03cf446ba37754..24b3957acd99012083e720b471ddd02c619e850f 100644
--- a/deps/lld/ELF/Arch/Mips.cpp
+++ b/deps/lld/ELF/Arch/Mips.cpp
@@ -1,9 +1,8 @@
 //===- MIPS.cpp -----------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -29,47 +28,47 @@ template <class ELFT> class MIPS final : public TargetInfo {
 public:
   MIPS();
   uint32_t calcEFlags() const override;
-  RelExpr getRelExpr(RelType Type, const Symbol &S,
-                     const uint8_t *Loc) const override;
-  int64_t getImplicitAddend(const uint8_t *Buf, RelType Type) const override;
-  RelType getDynRel(RelType Type) const override;
-  void writeGotPlt(uint8_t *Buf, const Symbol &S) const override;
-  void writePltHeader(uint8_t *Buf) const override;
-  void writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr, uint64_t PltEntryAddr,
-                int32_t Index, unsigned RelOff) const override;
-  bool needsThunk(RelExpr Expr, RelType Type, const InputFile *File,
-                  uint64_t BranchAddr, const Symbol &S) const override;
-  void relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const override;
-  bool usesOnlyLowPageBits(RelType Type) const override;
+  RelExpr getRelExpr(RelType type, const Symbol &s,
+                     const uint8_t *loc) const override;
+  int64_t getImplicitAddend(const uint8_t *buf, RelType type) const override;
+  RelType getDynRel(RelType type) const override;
+  void writeGotPlt(uint8_t *buf, const Symbol &s) const override;
+  void writePltHeader(uint8_t *buf) const override;
+  void writePlt(uint8_t *buf, uint64_t gotPltEntryAddr, uint64_t pltEntryAddr,
+                int32_t index, unsigned relOff) const override;
+  bool needsThunk(RelExpr expr, RelType type, const InputFile *file,
+                  uint64_t branchAddr, const Symbol &s) const override;
+  void relocateOne(uint8_t *loc, RelType type, uint64_t val) const override;
+  bool usesOnlyLowPageBits(RelType type) const override;
 };
 } // namespace
 
 template <class ELFT> MIPS<ELFT>::MIPS() {
-  GotPltHeaderEntriesNum = 2;
-  DefaultMaxPageSize = 65536;
-  GotEntrySize = sizeof(typename ELFT::uint);
-  GotPltEntrySize = sizeof(typename ELFT::uint);
-  GotBaseSymInGotPlt = false;
-  PltEntrySize = 16;
-  PltHeaderSize = 32;
-  CopyRel = R_MIPS_COPY;
-  NoneRel = R_MIPS_NONE;
-  PltRel = R_MIPS_JUMP_SLOT;
-  NeedsThunks = true;
+  gotPltHeaderEntriesNum = 2;
+  defaultMaxPageSize = 65536;
+  gotBaseSymInGotPlt = false;
+  pltEntrySize = 16;
+  pltHeaderSize = 32;
+  copyRel = R_MIPS_COPY;
+  noneRel = R_MIPS_NONE;
+  pltRel = R_MIPS_JUMP_SLOT;
+  needsThunks = true;
 
   // Set `sigrie 1` as a trap instruction.
-  write32(TrapInstr.data(), 0x04170001);
+  write32(trapInstr.data(), 0x04170001);
 
   if (ELFT::Is64Bits) {
-    RelativeRel = (R_MIPS_64 << 8) | R_MIPS_REL32;
-    TlsGotRel = R_MIPS_TLS_TPREL64;
-    TlsModuleIndexRel = R_MIPS_TLS_DTPMOD64;
-    TlsOffsetRel = R_MIPS_TLS_DTPREL64;
+    relativeRel = (R_MIPS_64 << 8) | R_MIPS_REL32;
+    symbolicRel = R_MIPS_64;
+    tlsGotRel = R_MIPS_TLS_TPREL64;
+    tlsModuleIndexRel = R_MIPS_TLS_DTPMOD64;
+    tlsOffsetRel = R_MIPS_TLS_DTPREL64;
   } else {
-    RelativeRel = R_MIPS_REL32;
-    TlsGotRel = R_MIPS_TLS_TPREL32;
-    TlsModuleIndexRel = R_MIPS_TLS_DTPMOD32;
-    TlsOffsetRel = R_MIPS_TLS_DTPREL32;
+    relativeRel = R_MIPS_REL32;
+    symbolicRel = R_MIPS_32;
+    tlsGotRel = R_MIPS_TLS_TPREL32;
+    tlsModuleIndexRel = R_MIPS_TLS_DTPMOD32;
+    tlsOffsetRel = R_MIPS_TLS_DTPREL32;
   }
 }
 
@@ -78,13 +77,13 @@ template <class ELFT> uint32_t MIPS<ELFT>::calcEFlags() const {
 }
 
 template <class ELFT>
-RelExpr MIPS<ELFT>::getRelExpr(RelType Type, const Symbol &S,
-                               const uint8_t *Loc) const {
+RelExpr MIPS<ELFT>::getRelExpr(RelType type, const Symbol &s,
+                               const uint8_t *loc) const {
   // See comment in the calculateMipsRelChain.
-  if (ELFT::Is64Bits || Config->MipsN32Abi)
-    Type &= 0xff;
+  if (ELFT::Is64Bits || config->mipsN32Abi)
+    type &= 0xff;
 
-  switch (Type) {
+  switch (type) {
   case R_MIPS_JALR:
   case R_MICROMIPS_JALR:
     return R_HINT;
@@ -108,9 +107,9 @@ RelExpr MIPS<ELFT>::getRelExpr(RelType Type, const Symbol &S,
     // offset between start of function and 'gp' value which by default
     // equal to the start of .got section. In that case we consider these
     // relocations as relative.
-    if (&S == ElfSym::MipsGpDisp)
+    if (&s == ElfSym::mipsGpDisp)
       return R_MIPS_GOT_GP_PC;
-    if (&S == ElfSym::MipsLocalGp)
+    if (&s == ElfSym::mipsLocalGp)
       return R_MIPS_GOT_GP;
     LLVM_FALLTHROUGH;
   case R_MIPS_32:
@@ -147,7 +146,7 @@ RelExpr MIPS<ELFT>::getRelExpr(RelType Type, const Symbol &S,
     return R_PC;
   case R_MIPS_GOT16:
   case R_MICROMIPS_GOT16:
-    if (S.isLocal())
+    if (s.isLocal())
       return R_MIPS_GOT_LOCAL_PAGE;
     LLVM_FALLTHROUGH;
   case R_MIPS_CALL16:
@@ -176,209 +175,213 @@ RelExpr MIPS<ELFT>::getRelExpr(RelType Type, const Symbol &S,
   case R_MIPS_NONE:
     return R_NONE;
   default:
-    return R_INVALID;
+    error(getErrorLocation(loc) + "unknown relocation (" + Twine(type) +
+          ") against symbol " + toString(s));
+    return R_NONE;
   }
 }
 
-template <class ELFT> RelType MIPS<ELFT>::getDynRel(RelType Type) const {
-  if (Type == R_MIPS_32 || Type == R_MIPS_64)
-    return RelativeRel;
+template <class ELFT> RelType MIPS<ELFT>::getDynRel(RelType type) const {
+  if (type == symbolicRel)
+    return type;
   return R_MIPS_NONE;
 }
 
 template <class ELFT>
-void MIPS<ELFT>::writeGotPlt(uint8_t *Buf, const Symbol &) const {
-  uint64_t VA = In.Plt->getVA();
+void MIPS<ELFT>::writeGotPlt(uint8_t *buf, const Symbol &) const {
+  uint64_t va = in.plt->getVA();
   if (isMicroMips())
-    VA |= 1;
-  write32<ELFT::TargetEndianness>(Buf, VA);
+    va |= 1;
+  write32<ELFT::TargetEndianness>(buf, va);
 }
 
-template <endianness E> static uint32_t readShuffle(const uint8_t *Loc) {
+template <endianness E> static uint32_t readShuffle(const uint8_t *loc) {
   // The major opcode of a microMIPS instruction needs to appear
   // in the first 16-bit word (lowest address) for efficient hardware
   // decode so that it knows if the instruction is 16-bit or 32-bit
   // as early as possible. To do so, little-endian binaries keep 16-bit
   // words in a big-endian order. That is why we have to swap these
   // words to get a correct value.
-  uint32_t V = read32<E>(Loc);
+  uint32_t v = read32<E>(loc);
   if (E == support::little)
-    return (V << 16) | (V >> 16);
-  return V;
+    return (v << 16) | (v >> 16);
+  return v;
 }
 
 template <endianness E>
-static void writeValue(uint8_t *Loc, uint64_t V, uint8_t BitsSize,
-                       uint8_t Shift) {
-  uint32_t Instr = read32<E>(Loc);
-  uint32_t Mask = 0xffffffff >> (32 - BitsSize);
-  uint32_t Data = (Instr & ~Mask) | ((V >> Shift) & Mask);
-  write32<E>(Loc, Data);
+static void writeValue(uint8_t *loc, uint64_t v, uint8_t bitsSize,
+                       uint8_t shift) {
+  uint32_t instr = read32<E>(loc);
+  uint32_t mask = 0xffffffff >> (32 - bitsSize);
+  uint32_t data = (instr & ~mask) | ((v >> shift) & mask);
+  write32<E>(loc, data);
 }
 
 template <endianness E>
-static void writeShuffleValue(uint8_t *Loc, uint64_t V, uint8_t BitsSize,
-                              uint8_t Shift) {
+static void writeShuffleValue(uint8_t *loc, uint64_t v, uint8_t bitsSize,
+                              uint8_t shift) {
   // See comments in readShuffle for purpose of this code.
-  uint16_t *Words = (uint16_t *)Loc;
+  uint16_t *words = (uint16_t *)loc;
   if (E == support::little)
-    std::swap(Words[0], Words[1]);
+    std::swap(words[0], words[1]);
 
-  writeValue<E>(Loc, V, BitsSize, Shift);
+  writeValue<E>(loc, v, bitsSize, shift);
 
   if (E == support::little)
-    std::swap(Words[0], Words[1]);
+    std::swap(words[0], words[1]);
 }
 
 template <endianness E>
-static void writeMicroRelocation16(uint8_t *Loc, uint64_t V, uint8_t BitsSize,
-                                   uint8_t Shift) {
-  uint16_t Instr = read16<E>(Loc);
-  uint16_t Mask = 0xffff >> (16 - BitsSize);
-  uint16_t Data = (Instr & ~Mask) | ((V >> Shift) & Mask);
-  write16<E>(Loc, Data);
+static void writeMicroRelocation16(uint8_t *loc, uint64_t v, uint8_t bitsSize,
+                                   uint8_t shift) {
+  uint16_t instr = read16<E>(loc);
+  uint16_t mask = 0xffff >> (16 - bitsSize);
+  uint16_t data = (instr & ~mask) | ((v >> shift) & mask);
+  write16<E>(loc, data);
 }
 
-template <class ELFT> void MIPS<ELFT>::writePltHeader(uint8_t *Buf) const {
-  const endianness E = ELFT::TargetEndianness;
+template <class ELFT> void MIPS<ELFT>::writePltHeader(uint8_t *buf) const {
+  const endianness e = ELFT::TargetEndianness;
   if (isMicroMips()) {
-    uint64_t GotPlt = In.GotPlt->getVA();
-    uint64_t Plt = In.Plt->getVA();
+    uint64_t gotPlt = in.gotPlt->getVA();
+    uint64_t plt = in.plt->getVA();
     // Overwrite trap instructions written by Writer::writeTrapInstr.
-    memset(Buf, 0, PltHeaderSize);
+    memset(buf, 0, pltHeaderSize);
 
-    write16<E>(Buf, isMipsR6() ? 0x7860 : 0x7980);  // addiupc v1, (GOTPLT) - .
-    write16<E>(Buf + 4, 0xff23);    // lw      $25, 0($3)
-    write16<E>(Buf + 8, 0x0535);    // subu16  $2,  $2, $3
-    write16<E>(Buf + 10, 0x2525);   // srl16   $2,  $2, 2
-    write16<E>(Buf + 12, 0x3302);   // addiu   $24, $2, -2
-    write16<E>(Buf + 14, 0xfffe);
-    write16<E>(Buf + 16, 0x0dff);   // move    $15, $31
+    write16<e>(buf, isMipsR6() ? 0x7860 : 0x7980);  // addiupc v1, (GOTPLT) - .
+    write16<e>(buf + 4, 0xff23);    // lw      $25, 0($3)
+    write16<e>(buf + 8, 0x0535);    // subu16  $2,  $2, $3
+    write16<e>(buf + 10, 0x2525);   // srl16   $2,  $2, 2
+    write16<e>(buf + 12, 0x3302);   // addiu   $24, $2, -2
+    write16<e>(buf + 14, 0xfffe);
+    write16<e>(buf + 16, 0x0dff);   // move    $15, $31
     if (isMipsR6()) {
-      write16<E>(Buf + 18, 0x0f83); // move    $28, $3
-      write16<E>(Buf + 20, 0x472b); // jalrc   $25
-      write16<E>(Buf + 22, 0x0c00); // nop
-      relocateOne(Buf, R_MICROMIPS_PC19_S2, GotPlt - Plt);
+      write16<e>(buf + 18, 0x0f83); // move    $28, $3
+      write16<e>(buf + 20, 0x472b); // jalrc   $25
+      write16<e>(buf + 22, 0x0c00); // nop
+      relocateOne(buf, R_MICROMIPS_PC19_S2, gotPlt - plt);
     } else {
-      write16<E>(Buf + 18, 0x45f9); // jalrc   $25
-      write16<E>(Buf + 20, 0x0f83); // move    $28, $3
-      write16<E>(Buf + 22, 0x0c00); // nop
-      relocateOne(Buf, R_MICROMIPS_PC23_S2, GotPlt - Plt);
+      write16<e>(buf + 18, 0x45f9); // jalrc   $25
+      write16<e>(buf + 20, 0x0f83); // move    $28, $3
+      write16<e>(buf + 22, 0x0c00); // nop
+      relocateOne(buf, R_MICROMIPS_PC23_S2, gotPlt - plt);
     }
     return;
   }
 
-  if (Config->MipsN32Abi) {
-    write32<E>(Buf, 0x3c0e0000);      // lui   $14, %hi(&GOTPLT[0])
-    write32<E>(Buf + 4, 0x8dd90000);  // lw    $25, %lo(&GOTPLT[0])($14)
-    write32<E>(Buf + 8, 0x25ce0000);  // addiu $14, $14, %lo(&GOTPLT[0])
-    write32<E>(Buf + 12, 0x030ec023); // subu  $24, $24, $14
-    write32<E>(Buf + 16, 0x03e07825); // move  $15, $31
-    write32<E>(Buf + 20, 0x0018c082); // srl   $24, $24, 2
+  if (config->mipsN32Abi) {
+    write32<e>(buf, 0x3c0e0000);      // lui   $14, %hi(&GOTPLT[0])
+    write32<e>(buf + 4, 0x8dd90000);  // lw    $25, %lo(&GOTPLT[0])($14)
+    write32<e>(buf + 8, 0x25ce0000);  // addiu $14, $14, %lo(&GOTPLT[0])
+    write32<e>(buf + 12, 0x030ec023); // subu  $24, $24, $14
+    write32<e>(buf + 16, 0x03e07825); // move  $15, $31
+    write32<e>(buf + 20, 0x0018c082); // srl   $24, $24, 2
   } else if (ELFT::Is64Bits) {
-    write32<E>(Buf, 0x3c0e0000);      // lui   $14, %hi(&GOTPLT[0])
-    write32<E>(Buf + 4, 0xddd90000);  // ld    $25, %lo(&GOTPLT[0])($14)
-    write32<E>(Buf + 8, 0x25ce0000);  // addiu $14, $14, %lo(&GOTPLT[0])
-    write32<E>(Buf + 12, 0x030ec023); // subu  $24, $24, $14
-    write32<E>(Buf + 16, 0x03e07825); // move  $15, $31
-    write32<E>(Buf + 20, 0x0018c0c2); // srl   $24, $24, 3
+    write32<e>(buf, 0x3c0e0000);      // lui   $14, %hi(&GOTPLT[0])
+    write32<e>(buf + 4, 0xddd90000);  // ld    $25, %lo(&GOTPLT[0])($14)
+    write32<e>(buf + 8, 0x25ce0000);  // addiu $14, $14, %lo(&GOTPLT[0])
+    write32<e>(buf + 12, 0x030ec023); // subu  $24, $24, $14
+    write32<e>(buf + 16, 0x03e07825); // move  $15, $31
+    write32<e>(buf + 20, 0x0018c0c2); // srl   $24, $24, 3
   } else {
-    write32<E>(Buf, 0x3c1c0000);      // lui   $28, %hi(&GOTPLT[0])
-    write32<E>(Buf + 4, 0x8f990000);  // lw    $25, %lo(&GOTPLT[0])($28)
-    write32<E>(Buf + 8, 0x279c0000);  // addiu $28, $28, %lo(&GOTPLT[0])
-    write32<E>(Buf + 12, 0x031cc023); // subu  $24, $24, $28
-    write32<E>(Buf + 16, 0x03e07825); // move  $15, $31
-    write32<E>(Buf + 20, 0x0018c082); // srl   $24, $24, 2
+    write32<e>(buf, 0x3c1c0000);      // lui   $28, %hi(&GOTPLT[0])
+    write32<e>(buf + 4, 0x8f990000);  // lw    $25, %lo(&GOTPLT[0])($28)
+    write32<e>(buf + 8, 0x279c0000);  // addiu $28, $28, %lo(&GOTPLT[0])
+    write32<e>(buf + 12, 0x031cc023); // subu  $24, $24, $28
+    write32<e>(buf + 16, 0x03e07825); // move  $15, $31
+    write32<e>(buf + 20, 0x0018c082); // srl   $24, $24, 2
   }
 
-  uint32_t JalrInst = Config->ZHazardplt ? 0x0320fc09 : 0x0320f809;
-  write32<E>(Buf + 24, JalrInst); // jalr.hb $25 or jalr $25
-  write32<E>(Buf + 28, 0x2718fffe); // subu  $24, $24, 2
+  uint32_t jalrInst = config->zHazardplt ? 0x0320fc09 : 0x0320f809;
+  write32<e>(buf + 24, jalrInst); // jalr.hb $25 or jalr $25
+  write32<e>(buf + 28, 0x2718fffe); // subu  $24, $24, 2
 
-  uint64_t GotPlt = In.GotPlt->getVA();
-  writeValue<E>(Buf, GotPlt + 0x8000, 16, 16);
-  writeValue<E>(Buf + 4, GotPlt, 16, 0);
-  writeValue<E>(Buf + 8, GotPlt, 16, 0);
+  uint64_t gotPlt = in.gotPlt->getVA();
+  writeValue<e>(buf, gotPlt + 0x8000, 16, 16);
+  writeValue<e>(buf + 4, gotPlt, 16, 0);
+  writeValue<e>(buf + 8, gotPlt, 16, 0);
 }
 
 template <class ELFT>
-void MIPS<ELFT>::writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr,
-                          uint64_t PltEntryAddr, int32_t Index,
-                          unsigned RelOff) const {
-  const endianness E = ELFT::TargetEndianness;
+void MIPS<ELFT>::writePlt(uint8_t *buf, uint64_t gotPltEntryAddr,
+                          uint64_t pltEntryAddr, int32_t index,
+                          unsigned relOff) const {
+  const endianness e = ELFT::TargetEndianness;
   if (isMicroMips()) {
     // Overwrite trap instructions written by Writer::writeTrapInstr.
-    memset(Buf, 0, PltEntrySize);
+    memset(buf, 0, pltEntrySize);
 
     if (isMipsR6()) {
-      write16<E>(Buf, 0x7840);      // addiupc $2, (GOTPLT) - .
-      write16<E>(Buf + 4, 0xff22);  // lw $25, 0($2)
-      write16<E>(Buf + 8, 0x0f02);  // move $24, $2
-      write16<E>(Buf + 10, 0x4723); // jrc $25 / jr16 $25
-      relocateOne(Buf, R_MICROMIPS_PC19_S2, GotPltEntryAddr - PltEntryAddr);
+      write16<e>(buf, 0x7840);      // addiupc $2, (GOTPLT) - .
+      write16<e>(buf + 4, 0xff22);  // lw $25, 0($2)
+      write16<e>(buf + 8, 0x0f02);  // move $24, $2
+      write16<e>(buf + 10, 0x4723); // jrc $25 / jr16 $25
+      relocateOne(buf, R_MICROMIPS_PC19_S2, gotPltEntryAddr - pltEntryAddr);
     } else {
-      write16<E>(Buf, 0x7900);      // addiupc $2, (GOTPLT) - .
-      write16<E>(Buf + 4, 0xff22);  // lw $25, 0($2)
-      write16<E>(Buf + 8, 0x4599);  // jrc $25 / jr16 $25
-      write16<E>(Buf + 10, 0x0f02); // move $24, $2
-      relocateOne(Buf, R_MICROMIPS_PC23_S2, GotPltEntryAddr - PltEntryAddr);
+      write16<e>(buf, 0x7900);      // addiupc $2, (GOTPLT) - .
+      write16<e>(buf + 4, 0xff22);  // lw $25, 0($2)
+      write16<e>(buf + 8, 0x4599);  // jrc $25 / jr16 $25
+      write16<e>(buf + 10, 0x0f02); // move $24, $2
+      relocateOne(buf, R_MICROMIPS_PC23_S2, gotPltEntryAddr - pltEntryAddr);
     }
     return;
   }
 
-  uint32_t JrInst = isMipsR6() ? (Config->ZHazardplt ? 0x03200409 : 0x03200009)
-                               : (Config->ZHazardplt ? 0x03200408 : 0x03200008);
+  uint32_t loadInst = ELFT::Is64Bits ? 0xddf90000 : 0x8df90000;
+  uint32_t jrInst = isMipsR6() ? (config->zHazardplt ? 0x03200409 : 0x03200009)
+                               : (config->zHazardplt ? 0x03200408 : 0x03200008);
+  uint32_t addInst = ELFT::Is64Bits ? 0x65f80000 : 0x25f80000;
 
-  write32<E>(Buf, 0x3c0f0000);     // lui   $15, %hi(.got.plt entry)
-  write32<E>(Buf + 4, 0x8df90000); // l[wd] $25, %lo(.got.plt entry)($15)
-  write32<E>(Buf + 8, JrInst);     // jr  $25 / jr.hb $25
-  write32<E>(Buf + 12, 0x25f80000); // addiu $24, $15, %lo(.got.plt entry)
-  writeValue<E>(Buf, GotPltEntryAddr + 0x8000, 16, 16);
-  writeValue<E>(Buf + 4, GotPltEntryAddr, 16, 0);
-  writeValue<E>(Buf + 12, GotPltEntryAddr, 16, 0);
+  write32<e>(buf, 0x3c0f0000);     // lui   $15, %hi(.got.plt entry)
+  write32<e>(buf + 4, loadInst);   // l[wd] $25, %lo(.got.plt entry)($15)
+  write32<e>(buf + 8, jrInst);     // jr  $25 / jr.hb $25
+  write32<e>(buf + 12, addInst);   // [d]addiu $24, $15, %lo(.got.plt entry)
+  writeValue<e>(buf, gotPltEntryAddr + 0x8000, 16, 16);
+  writeValue<e>(buf + 4, gotPltEntryAddr, 16, 0);
+  writeValue<e>(buf + 12, gotPltEntryAddr, 16, 0);
 }
 
 template <class ELFT>
-bool MIPS<ELFT>::needsThunk(RelExpr Expr, RelType Type, const InputFile *File,
-                            uint64_t BranchAddr, const Symbol &S) const {
+bool MIPS<ELFT>::needsThunk(RelExpr expr, RelType type, const InputFile *file,
+                            uint64_t branchAddr, const Symbol &s) const {
   // Any MIPS PIC code function is invoked with its address in register $t9.
   // So if we have a branch instruction from non-PIC code to the PIC one
   // we cannot make the jump directly and need to create a small stubs
   // to save the target function address.
   // See page 3-38 ftp://www.linux-mips.org/pub/linux/mips/doc/ABI/mipsabi.pdf
-  if (Type != R_MIPS_26 && Type != R_MICROMIPS_26_S1 &&
-      Type != R_MICROMIPS_PC26_S1)
+  if (type != R_MIPS_26 && type != R_MIPS_PC26_S2 &&
+      type != R_MICROMIPS_26_S1 && type != R_MICROMIPS_PC26_S1)
     return false;
-  auto *F = dyn_cast_or_null<ELFFileBase<ELFT>>(File);
-  if (!F)
+  auto *f = dyn_cast_or_null<ObjFile<ELFT>>(file);
+  if (!f)
     return false;
   // If current file has PIC code, LA25 stub is not required.
-  if (F->getObj().getHeader()->e_flags & EF_MIPS_PIC)
+  if (f->getObj().getHeader()->e_flags & EF_MIPS_PIC)
     return false;
-  auto *D = dyn_cast<Defined>(&S);
+  auto *d = dyn_cast<Defined>(&s);
   // LA25 is required if target file has PIC code
   // or target symbol is a PIC symbol.
-  return D && isMipsPIC<ELFT>(D);
+  return d && isMipsPIC<ELFT>(d);
 }
 
 template <class ELFT>
-int64_t MIPS<ELFT>::getImplicitAddend(const uint8_t *Buf, RelType Type) const {
-  const endianness E = ELFT::TargetEndianness;
-  switch (Type) {
+int64_t MIPS<ELFT>::getImplicitAddend(const uint8_t *buf, RelType type) const {
+  const endianness e = ELFT::TargetEndianness;
+  switch (type) {
   case R_MIPS_32:
   case R_MIPS_GPREL32:
   case R_MIPS_TLS_DTPREL32:
   case R_MIPS_TLS_TPREL32:
-    return SignExtend64<32>(read32<E>(Buf));
+    return SignExtend64<32>(read32<e>(buf));
   case R_MIPS_26:
     // FIXME (simon): If the relocation target symbol is not a PLT entry
     // we should use another expression for calculation:
     // ((A << 2) | (P & 0xf0000000)) >> 2
-    return SignExtend64<28>(read32<E>(Buf) << 2);
+    return SignExtend64<28>(read32<e>(buf) << 2);
   case R_MIPS_GOT16:
   case R_MIPS_HI16:
   case R_MIPS_PCHI16:
-    return SignExtend64<16>(read32<E>(Buf)) << 16;
+    return SignExtend64<16>(read32<e>(buf)) << 16;
   case R_MIPS_GPREL16:
   case R_MIPS_LO16:
   case R_MIPS_PCLO16:
@@ -386,54 +389,54 @@ int64_t MIPS<ELFT>::getImplicitAddend(const uint8_t *Buf, RelType Type) const {
   case R_MIPS_TLS_DTPREL_LO16:
   case R_MIPS_TLS_TPREL_HI16:
   case R_MIPS_TLS_TPREL_LO16:
-    return SignExtend64<16>(read32<E>(Buf));
+    return SignExtend64<16>(read32<e>(buf));
   case R_MICROMIPS_GOT16:
   case R_MICROMIPS_HI16:
-    return SignExtend64<16>(readShuffle<E>(Buf)) << 16;
+    return SignExtend64<16>(readShuffle<e>(buf)) << 16;
   case R_MICROMIPS_GPREL16:
   case R_MICROMIPS_LO16:
   case R_MICROMIPS_TLS_DTPREL_HI16:
   case R_MICROMIPS_TLS_DTPREL_LO16:
   case R_MICROMIPS_TLS_TPREL_HI16:
   case R_MICROMIPS_TLS_TPREL_LO16:
-    return SignExtend64<16>(readShuffle<E>(Buf));
+    return SignExtend64<16>(readShuffle<e>(buf));
   case R_MICROMIPS_GPREL7_S2:
-    return SignExtend64<9>(readShuffle<E>(Buf) << 2);
+    return SignExtend64<9>(readShuffle<e>(buf) << 2);
   case R_MIPS_PC16:
-    return SignExtend64<18>(read32<E>(Buf) << 2);
+    return SignExtend64<18>(read32<e>(buf) << 2);
   case R_MIPS_PC19_S2:
-    return SignExtend64<21>(read32<E>(Buf) << 2);
+    return SignExtend64<21>(read32<e>(buf) << 2);
   case R_MIPS_PC21_S2:
-    return SignExtend64<23>(read32<E>(Buf) << 2);
+    return SignExtend64<23>(read32<e>(buf) << 2);
   case R_MIPS_PC26_S2:
-    return SignExtend64<28>(read32<E>(Buf) << 2);
+    return SignExtend64<28>(read32<e>(buf) << 2);
   case R_MIPS_PC32:
-    return SignExtend64<32>(read32<E>(Buf));
+    return SignExtend64<32>(read32<e>(buf));
   case R_MICROMIPS_26_S1:
-    return SignExtend64<27>(readShuffle<E>(Buf) << 1);
+    return SignExtend64<27>(readShuffle<e>(buf) << 1);
   case R_MICROMIPS_PC7_S1:
-    return SignExtend64<8>(read16<E>(Buf) << 1);
+    return SignExtend64<8>(read16<e>(buf) << 1);
   case R_MICROMIPS_PC10_S1:
-    return SignExtend64<11>(read16<E>(Buf) << 1);
+    return SignExtend64<11>(read16<e>(buf) << 1);
   case R_MICROMIPS_PC16_S1:
-    return SignExtend64<17>(readShuffle<E>(Buf) << 1);
+    return SignExtend64<17>(readShuffle<e>(buf) << 1);
   case R_MICROMIPS_PC18_S3:
-    return SignExtend64<21>(readShuffle<E>(Buf) << 3);
+    return SignExtend64<21>(readShuffle<e>(buf) << 3);
   case R_MICROMIPS_PC19_S2:
-    return SignExtend64<21>(readShuffle<E>(Buf) << 2);
+    return SignExtend64<21>(readShuffle<e>(buf) << 2);
   case R_MICROMIPS_PC21_S1:
-    return SignExtend64<22>(readShuffle<E>(Buf) << 1);
+    return SignExtend64<22>(readShuffle<e>(buf) << 1);
   case R_MICROMIPS_PC23_S2:
-    return SignExtend64<25>(readShuffle<E>(Buf) << 2);
+    return SignExtend64<25>(readShuffle<e>(buf) << 2);
   case R_MICROMIPS_PC26_S1:
-    return SignExtend64<27>(readShuffle<E>(Buf) << 1);
+    return SignExtend64<27>(readShuffle<e>(buf) << 1);
   default:
     return 0;
   }
 }
 
 static std::pair<uint32_t, uint64_t>
-calculateMipsRelChain(uint8_t *Loc, RelType Type, uint64_t Val) {
+calculateMipsRelChain(uint8_t *loc, RelType type, uint64_t val) {
   // MIPS N64 ABI packs multiple relocations into the single relocation
   // record. In general, all up to three relocations can have arbitrary
   // types. In fact, Clang and GCC uses only a few combinations. For now,
@@ -446,72 +449,134 @@ calculateMipsRelChain(uint8_t *Loc, RelType Type, uint64_t Val) {
   // relocations used to modify result of the first one: extend it to
   // 64-bit, extract high or low part etc. For details, see part 2.9 Relocation
   // at the https://dmz-portal.mips.com/mw/images/8/82/007-4658-001.pdf
-  RelType Type2 = (Type >> 8) & 0xff;
-  RelType Type3 = (Type >> 16) & 0xff;
-  if (Type2 == R_MIPS_NONE && Type3 == R_MIPS_NONE)
-    return std::make_pair(Type, Val);
-  if (Type2 == R_MIPS_64 && Type3 == R_MIPS_NONE)
-    return std::make_pair(Type2, Val);
-  if (Type2 == R_MIPS_SUB && (Type3 == R_MIPS_HI16 || Type3 == R_MIPS_LO16))
-    return std::make_pair(Type3, -Val);
-  error(getErrorLocation(Loc) + "unsupported relocations combination " +
-        Twine(Type));
-  return std::make_pair(Type & 0xff, Val);
+  RelType type2 = (type >> 8) & 0xff;
+  RelType type3 = (type >> 16) & 0xff;
+  if (type2 == R_MIPS_NONE && type3 == R_MIPS_NONE)
+    return std::make_pair(type, val);
+  if (type2 == R_MIPS_64 && type3 == R_MIPS_NONE)
+    return std::make_pair(type2, val);
+  if (type2 == R_MIPS_SUB && (type3 == R_MIPS_HI16 || type3 == R_MIPS_LO16))
+    return std::make_pair(type3, -val);
+  error(getErrorLocation(loc) + "unsupported relocations combination " +
+        Twine(type));
+  return std::make_pair(type & 0xff, val);
+}
+
+static bool isBranchReloc(RelType type) {
+  return type == R_MIPS_26 || type == R_MIPS_PC26_S2 ||
+         type == R_MIPS_PC21_S2 || type == R_MIPS_PC16;
+}
+
+static bool isMicroBranchReloc(RelType type) {
+  return type == R_MICROMIPS_26_S1 || type == R_MICROMIPS_PC16_S1 ||
+         type == R_MICROMIPS_PC10_S1 || type == R_MICROMIPS_PC7_S1;
+}
+
+template <class ELFT>
+static uint64_t fixupCrossModeJump(uint8_t *loc, RelType type, uint64_t val) {
+  // Here we need to detect jump/branch from regular MIPS code
+  // to a microMIPS target and vice versa. In that cases jump
+  // instructions need to be replaced by their "cross-mode"
+  // equivalents.
+  const endianness e = ELFT::TargetEndianness;
+  bool isMicroTgt = val & 0x1;
+  bool isCrossJump = (isMicroTgt && isBranchReloc(type)) ||
+                     (!isMicroTgt && isMicroBranchReloc(type));
+  if (!isCrossJump)
+    return val;
+
+  switch (type) {
+  case R_MIPS_26: {
+    uint32_t inst = read32<e>(loc) >> 26;
+    if (inst == 0x3 || inst == 0x1d) { // JAL or JALX
+      writeValue<e>(loc, 0x1d << 26, 32, 0);
+      return val;
+    }
+    break;
+  }
+  case R_MICROMIPS_26_S1: {
+    uint32_t inst = readShuffle<e>(loc) >> 26;
+    if (inst == 0x3d || inst == 0x3c) { // JAL32 or JALX32
+      val >>= 1;
+      writeShuffleValue<e>(loc, 0x3c << 26, 32, 0);
+      return val;
+    }
+    break;
+  }
+  case R_MIPS_PC26_S2:
+  case R_MIPS_PC21_S2:
+  case R_MIPS_PC16:
+  case R_MICROMIPS_PC16_S1:
+  case R_MICROMIPS_PC10_S1:
+  case R_MICROMIPS_PC7_S1:
+    // FIXME (simon): Support valid branch relocations.
+    break;
+  default:
+    llvm_unreachable("unexpected jump/branch relocation");
+  }
+
+  error(getErrorLocation(loc) +
+        "unsupported jump/branch instruction between ISA modes referenced by " +
+        toString(type) + " relocation");
+  return val;
 }
 
 template <class ELFT>
-void MIPS<ELFT>::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
-  const endianness E = ELFT::TargetEndianness;
+void MIPS<ELFT>::relocateOne(uint8_t *loc, RelType type, uint64_t val) const {
+  const endianness e = ELFT::TargetEndianness;
+
+  if (ELFT::Is64Bits || config->mipsN32Abi)
+    std::tie(type, val) = calculateMipsRelChain(loc, type, val);
 
-  if (ELFT::Is64Bits || Config->MipsN32Abi)
-    std::tie(Type, Val) = calculateMipsRelChain(Loc, Type, Val);
+  // Detect cross-mode jump/branch and fix instruction.
+  val = fixupCrossModeJump<ELFT>(loc, type, val);
 
   // Thread pointer and DRP offsets from the start of TLS data area.
   // https://www.linux-mips.org/wiki/NPTL
-  if (Type == R_MIPS_TLS_DTPREL_HI16 || Type == R_MIPS_TLS_DTPREL_LO16 ||
-      Type == R_MIPS_TLS_DTPREL32 || Type == R_MIPS_TLS_DTPREL64 ||
-      Type == R_MICROMIPS_TLS_DTPREL_HI16 ||
-      Type == R_MICROMIPS_TLS_DTPREL_LO16) {
-    Val -= 0x8000;
-  } else if (Type == R_MIPS_TLS_TPREL_HI16 || Type == R_MIPS_TLS_TPREL_LO16 ||
-             Type == R_MIPS_TLS_TPREL32 || Type == R_MIPS_TLS_TPREL64 ||
-             Type == R_MICROMIPS_TLS_TPREL_HI16 ||
-             Type == R_MICROMIPS_TLS_TPREL_LO16) {
-    Val -= 0x7000;
+  if (type == R_MIPS_TLS_DTPREL_HI16 || type == R_MIPS_TLS_DTPREL_LO16 ||
+      type == R_MIPS_TLS_DTPREL32 || type == R_MIPS_TLS_DTPREL64 ||
+      type == R_MICROMIPS_TLS_DTPREL_HI16 ||
+      type == R_MICROMIPS_TLS_DTPREL_LO16) {
+    val -= 0x8000;
+  } else if (type == R_MIPS_TLS_TPREL_HI16 || type == R_MIPS_TLS_TPREL_LO16 ||
+             type == R_MIPS_TLS_TPREL32 || type == R_MIPS_TLS_TPREL64 ||
+             type == R_MICROMIPS_TLS_TPREL_HI16 ||
+             type == R_MICROMIPS_TLS_TPREL_LO16) {
+    val -= 0x7000;
   }
 
-  switch (Type) {
+  switch (type) {
   case R_MIPS_32:
   case R_MIPS_GPREL32:
   case R_MIPS_TLS_DTPREL32:
   case R_MIPS_TLS_TPREL32:
-    write32<E>(Loc, Val);
+    write32<e>(loc, val);
     break;
   case R_MIPS_64:
   case R_MIPS_TLS_DTPREL64:
   case R_MIPS_TLS_TPREL64:
-    write64<E>(Loc, Val);
+    write64<e>(loc, val);
     break;
   case R_MIPS_26:
-    writeValue<E>(Loc, Val, 26, 2);
+    writeValue<e>(loc, val, 26, 2);
     break;
   case R_MIPS_GOT16:
     // The R_MIPS_GOT16 relocation's value in "relocatable" linking mode
     // is updated addend (not a GOT index). In that case write high 16 bits
     // to store a correct addend value.
-    if (Config->Relocatable) {
-      writeValue<E>(Loc, Val + 0x8000, 16, 16);
+    if (config->relocatable) {
+      writeValue<e>(loc, val + 0x8000, 16, 16);
     } else {
-      checkInt(Loc, Val, 16, Type);
-      writeValue<E>(Loc, Val, 16, 0);
+      checkInt(loc, val, 16, type);
+      writeValue<e>(loc, val, 16, 0);
     }
     break;
   case R_MICROMIPS_GOT16:
-    if (Config->Relocatable) {
-      writeShuffleValue<E>(Loc, Val + 0x8000, 16, 16);
+    if (config->relocatable) {
+      writeShuffleValue<e>(loc, val + 0x8000, 16, 16);
     } else {
-      checkInt(Loc, Val, 16, Type);
-      writeShuffleValue<E>(Loc, Val, 16, 0);
+      checkInt(loc, val, 16, type);
+      writeShuffleValue<e>(loc, val, 16, 0);
     }
     break;
   case R_MIPS_CALL16:
@@ -521,7 +586,7 @@ void MIPS<ELFT>::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
   case R_MIPS_TLS_GD:
   case R_MIPS_TLS_GOTTPREL:
   case R_MIPS_TLS_LDM:
-    checkInt(Loc, Val, 16, Type);
+    checkInt(loc, val, 16, type);
     LLVM_FALLTHROUGH;
   case R_MIPS_CALL_LO16:
   case R_MIPS_GOT_LO16:
@@ -530,13 +595,13 @@ void MIPS<ELFT>::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
   case R_MIPS_PCLO16:
   case R_MIPS_TLS_DTPREL_LO16:
   case R_MIPS_TLS_TPREL_LO16:
-    writeValue<E>(Loc, Val, 16, 0);
+    writeValue<e>(loc, val, 16, 0);
     break;
   case R_MICROMIPS_GPREL16:
   case R_MICROMIPS_TLS_GD:
   case R_MICROMIPS_TLS_LDM:
-    checkInt(Loc, Val, 16, Type);
-    writeShuffleValue<E>(Loc, Val, 16, 0);
+    checkInt(loc, val, 16, type);
+    writeShuffleValue<e>(loc, val, 16, 0);
     break;
   case R_MICROMIPS_CALL16:
   case R_MICROMIPS_CALL_LO16:
@@ -544,11 +609,11 @@ void MIPS<ELFT>::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
   case R_MICROMIPS_TLS_DTPREL_LO16:
   case R_MICROMIPS_TLS_GOTTPREL:
   case R_MICROMIPS_TLS_TPREL_LO16:
-    writeShuffleValue<E>(Loc, Val, 16, 0);
+    writeShuffleValue<e>(loc, val, 16, 0);
     break;
   case R_MICROMIPS_GPREL7_S2:
-    checkInt(Loc, Val, 7, Type);
-    writeShuffleValue<E>(Loc, Val, 7, 2);
+    checkInt(loc, val, 7, type);
+    writeShuffleValue<e>(loc, val, 7, 2);
     break;
   case R_MIPS_CALL_HI16:
   case R_MIPS_GOT_HI16:
@@ -556,113 +621,113 @@ void MIPS<ELFT>::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
   case R_MIPS_PCHI16:
   case R_MIPS_TLS_DTPREL_HI16:
   case R_MIPS_TLS_TPREL_HI16:
-    writeValue<E>(Loc, Val + 0x8000, 16, 16);
+    writeValue<e>(loc, val + 0x8000, 16, 16);
     break;
   case R_MICROMIPS_CALL_HI16:
   case R_MICROMIPS_GOT_HI16:
   case R_MICROMIPS_HI16:
   case R_MICROMIPS_TLS_DTPREL_HI16:
   case R_MICROMIPS_TLS_TPREL_HI16:
-    writeShuffleValue<E>(Loc, Val + 0x8000, 16, 16);
+    writeShuffleValue<e>(loc, val + 0x8000, 16, 16);
     break;
   case R_MIPS_HIGHER:
-    writeValue<E>(Loc, Val + 0x80008000, 16, 32);
+    writeValue<e>(loc, val + 0x80008000, 16, 32);
     break;
   case R_MIPS_HIGHEST:
-    writeValue<E>(Loc, Val + 0x800080008000, 16, 48);
+    writeValue<e>(loc, val + 0x800080008000, 16, 48);
     break;
   case R_MIPS_JALR:
   case R_MICROMIPS_JALR:
     // Ignore this optimization relocation for now
     break;
   case R_MIPS_PC16:
-    checkAlignment(Loc, Val, 4, Type);
-    checkInt(Loc, Val, 18, Type);
-    writeValue<E>(Loc, Val, 16, 2);
+    checkAlignment(loc, val, 4, type);
+    checkInt(loc, val, 18, type);
+    writeValue<e>(loc, val, 16, 2);
     break;
   case R_MIPS_PC19_S2:
-    checkAlignment(Loc, Val, 4, Type);
-    checkInt(Loc, Val, 21, Type);
-    writeValue<E>(Loc, Val, 19, 2);
+    checkAlignment(loc, val, 4, type);
+    checkInt(loc, val, 21, type);
+    writeValue<e>(loc, val, 19, 2);
     break;
   case R_MIPS_PC21_S2:
-    checkAlignment(Loc, Val, 4, Type);
-    checkInt(Loc, Val, 23, Type);
-    writeValue<E>(Loc, Val, 21, 2);
+    checkAlignment(loc, val, 4, type);
+    checkInt(loc, val, 23, type);
+    writeValue<e>(loc, val, 21, 2);
     break;
   case R_MIPS_PC26_S2:
-    checkAlignment(Loc, Val, 4, Type);
-    checkInt(Loc, Val, 28, Type);
-    writeValue<E>(Loc, Val, 26, 2);
+    checkAlignment(loc, val, 4, type);
+    checkInt(loc, val, 28, type);
+    writeValue<e>(loc, val, 26, 2);
     break;
   case R_MIPS_PC32:
-    writeValue<E>(Loc, Val, 32, 0);
+    writeValue<e>(loc, val, 32, 0);
     break;
   case R_MICROMIPS_26_S1:
   case R_MICROMIPS_PC26_S1:
-    checkInt(Loc, Val, 27, Type);
-    writeShuffleValue<E>(Loc, Val, 26, 1);
+    checkInt(loc, val, 27, type);
+    writeShuffleValue<e>(loc, val, 26, 1);
     break;
   case R_MICROMIPS_PC7_S1:
-    checkInt(Loc, Val, 8, Type);
-    writeMicroRelocation16<E>(Loc, Val, 7, 1);
+    checkInt(loc, val, 8, type);
+    writeMicroRelocation16<e>(loc, val, 7, 1);
     break;
   case R_MICROMIPS_PC10_S1:
-    checkInt(Loc, Val, 11, Type);
-    writeMicroRelocation16<E>(Loc, Val, 10, 1);
+    checkInt(loc, val, 11, type);
+    writeMicroRelocation16<e>(loc, val, 10, 1);
     break;
   case R_MICROMIPS_PC16_S1:
-    checkInt(Loc, Val, 17, Type);
-    writeShuffleValue<E>(Loc, Val, 16, 1);
+    checkInt(loc, val, 17, type);
+    writeShuffleValue<e>(loc, val, 16, 1);
     break;
   case R_MICROMIPS_PC18_S3:
-    checkInt(Loc, Val, 21, Type);
-    writeShuffleValue<E>(Loc, Val, 18, 3);
+    checkInt(loc, val, 21, type);
+    writeShuffleValue<e>(loc, val, 18, 3);
     break;
   case R_MICROMIPS_PC19_S2:
-    checkInt(Loc, Val, 21, Type);
-    writeShuffleValue<E>(Loc, Val, 19, 2);
+    checkInt(loc, val, 21, type);
+    writeShuffleValue<e>(loc, val, 19, 2);
     break;
   case R_MICROMIPS_PC21_S1:
-    checkInt(Loc, Val, 22, Type);
-    writeShuffleValue<E>(Loc, Val, 21, 1);
+    checkInt(loc, val, 22, type);
+    writeShuffleValue<e>(loc, val, 21, 1);
     break;
   case R_MICROMIPS_PC23_S2:
-    checkInt(Loc, Val, 25, Type);
-    writeShuffleValue<E>(Loc, Val, 23, 2);
+    checkInt(loc, val, 25, type);
+    writeShuffleValue<e>(loc, val, 23, 2);
     break;
   default:
-    error(getErrorLocation(Loc) + "unrecognized reloc " + Twine(Type));
+    llvm_unreachable("unknown relocation");
   }
 }
 
-template <class ELFT> bool MIPS<ELFT>::usesOnlyLowPageBits(RelType Type) const {
-  return Type == R_MIPS_LO16 || Type == R_MIPS_GOT_OFST ||
-         Type == R_MICROMIPS_LO16;
+template <class ELFT> bool MIPS<ELFT>::usesOnlyLowPageBits(RelType type) const {
+  return type == R_MIPS_LO16 || type == R_MIPS_GOT_OFST ||
+         type == R_MICROMIPS_LO16;
 }
 
 // Return true if the symbol is a PIC function.
-template <class ELFT> bool elf::isMipsPIC(const Defined *Sym) {
-  if (!Sym->isFunc())
+template <class ELFT> bool elf::isMipsPIC(const Defined *sym) {
+  if (!sym->isFunc())
     return false;
 
-  if (Sym->StOther & STO_MIPS_PIC)
+  if (sym->stOther & STO_MIPS_PIC)
     return true;
 
-  if (!Sym->Section)
+  if (!sym->section)
     return false;
 
-  ObjFile<ELFT> *File =
-      cast<InputSectionBase>(Sym->Section)->template getFile<ELFT>();
-  if (!File)
+  ObjFile<ELFT> *file =
+      cast<InputSectionBase>(sym->section)->template getFile<ELFT>();
+  if (!file)
     return false;
 
-  return File->getObj().getHeader()->e_flags & EF_MIPS_PIC;
+  return file->getObj().getHeader()->e_flags & EF_MIPS_PIC;
 }
 
 template <class ELFT> TargetInfo *elf::getMipsTargetInfo() {
-  static MIPS<ELFT> Target;
-  return &Target;
+  static MIPS<ELFT> target;
+  return &target;
 }
 
 template TargetInfo *elf::getMipsTargetInfo<ELF32LE>();
diff --git a/deps/lld/ELF/Arch/MipsArchTree.cpp b/deps/lld/ELF/Arch/MipsArchTree.cpp
index 98ceac3075e0cdcb873f9507fc1ebd8a76784728..f64d03756457d8d5573de9567e0d4dd4cf07ef46 100644
--- a/deps/lld/ELF/Arch/MipsArchTree.cpp
+++ b/deps/lld/ELF/Arch/MipsArchTree.cpp
@@ -1,9 +1,8 @@
 //===- MipsArchTree.cpp --------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===---------------------------------------------------------------------===//
 //
@@ -29,18 +28,18 @@ using namespace lld::elf;
 
 namespace {
 struct ArchTreeEdge {
-  uint32_t Child;
-  uint32_t Parent;
+  uint32_t child;
+  uint32_t parent;
 };
 
 struct FileFlags {
-  InputFile *File;
-  uint32_t Flags;
+  InputFile *file;
+  uint32_t flags;
 };
 } // namespace
 
-static StringRef getAbiName(uint32_t Flags) {
-  switch (Flags) {
+static StringRef getAbiName(uint32_t flags) {
+  switch (flags) {
   case 0:
     return "n64";
   case EF_MIPS_ABI2:
@@ -58,76 +57,76 @@ static StringRef getAbiName(uint32_t Flags) {
   }
 }
 
-static StringRef getNanName(bool IsNan2008) {
-  return IsNan2008 ? "2008" : "legacy";
+static StringRef getNanName(bool isNan2008) {
+  return isNan2008 ? "2008" : "legacy";
 }
 
-static StringRef getFpName(bool IsFp64) { return IsFp64 ? "64" : "32"; }
+static StringRef getFpName(bool isFp64) { return isFp64 ? "64" : "32"; }
 
-static void checkFlags(ArrayRef<FileFlags> Files) {
-  assert(!Files.empty() && "expected non-empty file list");
+static void checkFlags(ArrayRef<FileFlags> files) {
+  assert(!files.empty() && "expected non-empty file list");
 
-  uint32_t ABI = Files[0].Flags & (EF_MIPS_ABI | EF_MIPS_ABI2);
-  bool Nan = Files[0].Flags & EF_MIPS_NAN2008;
-  bool Fp = Files[0].Flags & EF_MIPS_FP64;
+  uint32_t abi = files[0].flags & (EF_MIPS_ABI | EF_MIPS_ABI2);
+  bool nan = files[0].flags & EF_MIPS_NAN2008;
+  bool fp = files[0].flags & EF_MIPS_FP64;
 
-  for (const FileFlags &F : Files) {
-    if (Config->Is64 && F.Flags & EF_MIPS_MICROMIPS)
-      error(toString(F.File) + ": microMIPS 64-bit is not supported");
+  for (const FileFlags &f : files) {
+    if (config->is64 && f.flags & EF_MIPS_MICROMIPS)
+      error(toString(f.file) + ": microMIPS 64-bit is not supported");
 
-    uint32_t ABI2 = F.Flags & (EF_MIPS_ABI | EF_MIPS_ABI2);
-    if (ABI != ABI2)
-      error(toString(F.File) + ": ABI '" + getAbiName(ABI2) +
-            "' is incompatible with target ABI '" + getAbiName(ABI) + "'");
+    uint32_t abi2 = f.flags & (EF_MIPS_ABI | EF_MIPS_ABI2);
+    if (abi != abi2)
+      error(toString(f.file) + ": ABI '" + getAbiName(abi2) +
+            "' is incompatible with target ABI '" + getAbiName(abi) + "'");
 
-    bool Nan2 = F.Flags & EF_MIPS_NAN2008;
-    if (Nan != Nan2)
-      error(toString(F.File) + ": -mnan=" + getNanName(Nan2) +
-            " is incompatible with target -mnan=" + getNanName(Nan));
+    bool nan2 = f.flags & EF_MIPS_NAN2008;
+    if (nan != nan2)
+      error(toString(f.file) + ": -mnan=" + getNanName(nan2) +
+            " is incompatible with target -mnan=" + getNanName(nan));
 
-    bool Fp2 = F.Flags & EF_MIPS_FP64;
-    if (Fp != Fp2)
-      error(toString(F.File) + ": -mfp" + getFpName(Fp2) +
-            " is incompatible with target -mfp" + getFpName(Fp));
+    bool fp2 = f.flags & EF_MIPS_FP64;
+    if (fp != fp2)
+      error(toString(f.file) + ": -mfp" + getFpName(fp2) +
+            " is incompatible with target -mfp" + getFpName(fp));
   }
 }
 
-static uint32_t getMiscFlags(ArrayRef<FileFlags> Files) {
-  uint32_t Ret = 0;
-  for (const FileFlags &F : Files)
-    Ret |= F.Flags &
+static uint32_t getMiscFlags(ArrayRef<FileFlags> files) {
+  uint32_t ret = 0;
+  for (const FileFlags &f : files)
+    ret |= f.flags &
            (EF_MIPS_ABI | EF_MIPS_ABI2 | EF_MIPS_ARCH_ASE | EF_MIPS_NOREORDER |
             EF_MIPS_MICROMIPS | EF_MIPS_NAN2008 | EF_MIPS_32BITMODE);
-  return Ret;
+  return ret;
 }
 
-static uint32_t getPicFlags(ArrayRef<FileFlags> Files) {
+static uint32_t getPicFlags(ArrayRef<FileFlags> files) {
   // Check PIC/non-PIC compatibility.
-  bool IsPic = Files[0].Flags & (EF_MIPS_PIC | EF_MIPS_CPIC);
-  for (const FileFlags &F : Files.slice(1)) {
-    bool IsPic2 = F.Flags & (EF_MIPS_PIC | EF_MIPS_CPIC);
-    if (IsPic && !IsPic2)
-      warn(toString(F.File) +
+  bool isPic = files[0].flags & (EF_MIPS_PIC | EF_MIPS_CPIC);
+  for (const FileFlags &f : files.slice(1)) {
+    bool isPic2 = f.flags & (EF_MIPS_PIC | EF_MIPS_CPIC);
+    if (isPic && !isPic2)
+      warn(toString(f.file) +
            ": linking non-abicalls code with abicalls code " +
-           toString(Files[0].File));
-    if (!IsPic && IsPic2)
-      warn(toString(F.File) +
+           toString(files[0].file));
+    if (!isPic && isPic2)
+      warn(toString(f.file) +
            ": linking abicalls code with non-abicalls code " +
-           toString(Files[0].File));
+           toString(files[0].file));
   }
 
   // Compute the result PIC/non-PIC flag.
-  uint32_t Ret = Files[0].Flags & (EF_MIPS_PIC | EF_MIPS_CPIC);
-  for (const FileFlags &F : Files.slice(1))
-    Ret &= F.Flags & (EF_MIPS_PIC | EF_MIPS_CPIC);
+  uint32_t ret = files[0].flags & (EF_MIPS_PIC | EF_MIPS_CPIC);
+  for (const FileFlags &f : files.slice(1))
+    ret &= f.flags & (EF_MIPS_PIC | EF_MIPS_CPIC);
 
   // PIC code is inherently CPIC and may not set CPIC flag explicitly.
-  if (Ret & EF_MIPS_PIC)
-    Ret |= EF_MIPS_CPIC;
-  return Ret;
+  if (ret & EF_MIPS_PIC)
+    ret |= EF_MIPS_CPIC;
+  return ret;
 }
 
-static ArchTreeEdge ArchTree[] = {
+static ArchTreeEdge archTree[] = {
     // MIPS32R6 and MIPS64R6 are not compatible with other extensions
     // MIPS64R2 extensions.
     {EF_MIPS_ARCH_64R2 | EF_MIPS_MACH_OCTEON3, EF_MIPS_ARCH_64R2},
@@ -167,25 +166,25 @@ static ArchTreeEdge ArchTree[] = {
     {EF_MIPS_ARCH_2, EF_MIPS_ARCH_1},
 };
 
-static bool isArchMatched(uint32_t New, uint32_t Res) {
-  if (New == Res)
+static bool isArchMatched(uint32_t New, uint32_t res) {
+  if (New == res)
     return true;
-  if (New == EF_MIPS_ARCH_32 && isArchMatched(EF_MIPS_ARCH_64, Res))
+  if (New == EF_MIPS_ARCH_32 && isArchMatched(EF_MIPS_ARCH_64, res))
     return true;
-  if (New == EF_MIPS_ARCH_32R2 && isArchMatched(EF_MIPS_ARCH_64R2, Res))
+  if (New == EF_MIPS_ARCH_32R2 && isArchMatched(EF_MIPS_ARCH_64R2, res))
     return true;
-  for (const auto &Edge : ArchTree) {
-    if (Res == Edge.Child) {
-      Res = Edge.Parent;
-      if (Res == New)
+  for (const auto &edge : archTree) {
+    if (res == edge.child) {
+      res = edge.parent;
+      if (res == New)
         return true;
     }
   }
   return false;
 }
 
-static StringRef getMachName(uint32_t Flags) {
-  switch (Flags & EF_MIPS_MACH) {
+static StringRef getMachName(uint32_t flags) {
+  switch (flags & EF_MIPS_MACH) {
   case EF_MIPS_MACH_NONE:
     return "";
   case EF_MIPS_MACH_3900:
@@ -229,8 +228,8 @@ static StringRef getMachName(uint32_t Flags) {
   }
 }
 
-static StringRef getArchName(uint32_t Flags) {
-  switch (Flags & EF_MIPS_ARCH) {
+static StringRef getArchName(uint32_t flags) {
+  switch (flags & EF_MIPS_ARCH) {
   case EF_MIPS_ARCH_1:
     return "mips1";
   case EF_MIPS_ARCH_2:
@@ -258,12 +257,12 @@ static StringRef getArchName(uint32_t Flags) {
   }
 }
 
-static std::string getFullArchName(uint32_t Flags) {
-  StringRef Arch = getArchName(Flags);
-  StringRef Mach = getMachName(Flags);
-  if (Mach.empty())
-    return Arch.str();
-  return (Arch + " (" + Mach + ")").str();
+static std::string getFullArchName(uint32_t flags) {
+  StringRef arch = getArchName(flags);
+  StringRef mach = getMachName(flags);
+  if (mach.empty())
+    return arch.str();
+  return (arch + " (" + mach + ")").str();
 }
 
 // There are (arguably too) many MIPS ISAs out there. Their relationships
@@ -275,55 +274,55 @@ static std::string getFullArchName(uint32_t Flags) {
 // Output file gets EF_MIPS_ARCH_2 flag. From the other side mips3 and mips32
 // are incompatible because nor mips3 is a parent for misp32, nor mips32
 // is a parent for mips3.
-static uint32_t getArchFlags(ArrayRef<FileFlags> Files) {
-  uint32_t Ret = Files[0].Flags & (EF_MIPS_ARCH | EF_MIPS_MACH);
+static uint32_t getArchFlags(ArrayRef<FileFlags> files) {
+  uint32_t ret = files[0].flags & (EF_MIPS_ARCH | EF_MIPS_MACH);
 
-  for (const FileFlags &F : Files.slice(1)) {
-    uint32_t New = F.Flags & (EF_MIPS_ARCH | EF_MIPS_MACH);
+  for (const FileFlags &f : files.slice(1)) {
+    uint32_t New = f.flags & (EF_MIPS_ARCH | EF_MIPS_MACH);
 
     // Check ISA compatibility.
-    if (isArchMatched(New, Ret))
+    if (isArchMatched(New, ret))
       continue;
-    if (!isArchMatched(Ret, New)) {
-      error("incompatible target ISA:\n>>> " + toString(Files[0].File) + ": " +
-            getFullArchName(Ret) + "\n>>> " + toString(F.File) + ": " +
+    if (!isArchMatched(ret, New)) {
+      error("incompatible target ISA:\n>>> " + toString(files[0].file) + ": " +
+            getFullArchName(ret) + "\n>>> " + toString(f.file) + ": " +
             getFullArchName(New));
       return 0;
     }
-    Ret = New;
+    ret = New;
   }
-  return Ret;
+  return ret;
 }
 
 template <class ELFT> uint32_t elf::calcMipsEFlags() {
-  std::vector<FileFlags> V;
-  for (InputFile *F : ObjectFiles)
-    V.push_back({F, cast<ObjFile<ELFT>>(F)->getObj().getHeader()->e_flags});
-  if (V.empty())
+  std::vector<FileFlags> v;
+  for (InputFile *f : objectFiles)
+    v.push_back({f, cast<ObjFile<ELFT>>(f)->getObj().getHeader()->e_flags});
+  if (v.empty())
     return 0;
-  checkFlags(V);
-  return getMiscFlags(V) | getPicFlags(V) | getArchFlags(V);
+  checkFlags(v);
+  return getMiscFlags(v) | getPicFlags(v) | getArchFlags(v);
 }
 
-static int compareMipsFpAbi(uint8_t FpA, uint8_t FpB) {
-  if (FpA == FpB)
+static int compareMipsFpAbi(uint8_t fpA, uint8_t fpB) {
+  if (fpA == fpB)
     return 0;
-  if (FpB == Mips::Val_GNU_MIPS_ABI_FP_ANY)
+  if (fpB == Mips::Val_GNU_MIPS_ABI_FP_ANY)
     return 1;
-  if (FpB == Mips::Val_GNU_MIPS_ABI_FP_64A &&
-      FpA == Mips::Val_GNU_MIPS_ABI_FP_64)
+  if (fpB == Mips::Val_GNU_MIPS_ABI_FP_64A &&
+      fpA == Mips::Val_GNU_MIPS_ABI_FP_64)
     return 1;
-  if (FpB != Mips::Val_GNU_MIPS_ABI_FP_XX)
+  if (fpB != Mips::Val_GNU_MIPS_ABI_FP_XX)
     return -1;
-  if (FpA == Mips::Val_GNU_MIPS_ABI_FP_DOUBLE ||
-      FpA == Mips::Val_GNU_MIPS_ABI_FP_64 ||
-      FpA == Mips::Val_GNU_MIPS_ABI_FP_64A)
+  if (fpA == Mips::Val_GNU_MIPS_ABI_FP_DOUBLE ||
+      fpA == Mips::Val_GNU_MIPS_ABI_FP_64 ||
+      fpA == Mips::Val_GNU_MIPS_ABI_FP_64A)
     return 1;
   return -1;
 }
 
-static StringRef getMipsFpAbiName(uint8_t FpAbi) {
-  switch (FpAbi) {
+static StringRef getMipsFpAbiName(uint8_t fpAbi) {
+  switch (fpAbi) {
   case Mips::Val_GNU_MIPS_ABI_FP_ANY:
     return "any";
   case Mips::Val_GNU_MIPS_ABI_FP_DOUBLE:
@@ -345,43 +344,43 @@ static StringRef getMipsFpAbiName(uint8_t FpAbi) {
   }
 }
 
-uint8_t elf::getMipsFpAbiFlag(uint8_t OldFlag, uint8_t NewFlag,
-                              StringRef FileName) {
-  if (compareMipsFpAbi(NewFlag, OldFlag) >= 0)
-    return NewFlag;
-  if (compareMipsFpAbi(OldFlag, NewFlag) < 0)
-    error(FileName + ": floating point ABI '" + getMipsFpAbiName(NewFlag) +
+uint8_t elf::getMipsFpAbiFlag(uint8_t oldFlag, uint8_t newFlag,
+                              StringRef fileName) {
+  if (compareMipsFpAbi(newFlag, oldFlag) >= 0)
+    return newFlag;
+  if (compareMipsFpAbi(oldFlag, newFlag) < 0)
+    error(fileName + ": floating point ABI '" + getMipsFpAbiName(newFlag) +
           "' is incompatible with target floating point ABI '" +
-          getMipsFpAbiName(OldFlag) + "'");
-  return OldFlag;
+          getMipsFpAbiName(oldFlag) + "'");
+  return oldFlag;
 }
 
-template <class ELFT> static bool isN32Abi(const InputFile *F) {
-  if (auto *EF = dyn_cast<ELFFileBase<ELFT>>(F))
-    return EF->getObj().getHeader()->e_flags & EF_MIPS_ABI2;
+template <class ELFT> static bool isN32Abi(const InputFile *f) {
+  if (auto *ef = dyn_cast<ELFFileBase>(f))
+    return ef->template getObj<ELFT>().getHeader()->e_flags & EF_MIPS_ABI2;
   return false;
 }
 
-bool elf::isMipsN32Abi(const InputFile *F) {
-  switch (Config->EKind) {
+bool elf::isMipsN32Abi(const InputFile *f) {
+  switch (config->ekind) {
   case ELF32LEKind:
-    return isN32Abi<ELF32LE>(F);
+    return isN32Abi<ELF32LE>(f);
   case ELF32BEKind:
-    return isN32Abi<ELF32BE>(F);
+    return isN32Abi<ELF32BE>(f);
   case ELF64LEKind:
-    return isN32Abi<ELF64LE>(F);
+    return isN32Abi<ELF64LE>(f);
   case ELF64BEKind:
-    return isN32Abi<ELF64BE>(F);
+    return isN32Abi<ELF64BE>(f);
   default:
     llvm_unreachable("unknown Config->EKind");
   }
 }
 
-bool elf::isMicroMips() { return Config->EFlags & EF_MIPS_MICROMIPS; }
+bool elf::isMicroMips() { return config->eflags & EF_MIPS_MICROMIPS; }
 
 bool elf::isMipsR6() {
-  uint32_t Arch = Config->EFlags & EF_MIPS_ARCH;
-  return Arch == EF_MIPS_ARCH_32R6 || Arch == EF_MIPS_ARCH_64R6;
+  uint32_t arch = config->eflags & EF_MIPS_ARCH;
+  return arch == EF_MIPS_ARCH_32R6 || arch == EF_MIPS_ARCH_64R6;
 }
 
 template uint32_t elf::calcMipsEFlags<ELF32LE>();
diff --git a/deps/lld/ELF/Arch/PPC.cpp b/deps/lld/ELF/Arch/PPC.cpp
index 76737806734132b0ebd9737693ec3d3fcb34b52e..46c5891e4f8a762b02f1d35637d592141e502e3e 100644
--- a/deps/lld/ELF/Arch/PPC.cpp
+++ b/deps/lld/ELF/Arch/PPC.cpp
@@ -1,13 +1,14 @@
 //===- PPC.cpp ------------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
+#include "OutputSections.h"
 #include "Symbols.h"
+#include "SyntheticSections.h"
 #include "Target.h"
 #include "lld/Common/ErrorHandler.h"
 #include "llvm/Support/Endian.h"
@@ -22,60 +23,410 @@ namespace {
 class PPC final : public TargetInfo {
 public:
   PPC();
-  void relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const override;
-  RelExpr getRelExpr(RelType Type, const Symbol &S,
-                     const uint8_t *Loc) const override;
+  RelExpr getRelExpr(RelType type, const Symbol &s,
+                     const uint8_t *loc) const override;
+  RelType getDynRel(RelType type) const override;
+  void writeGotHeader(uint8_t *buf) const override;
+  void writePltHeader(uint8_t *buf) const override {
+    llvm_unreachable("should call writePPC32GlinkSection() instead");
+  }
+  void writePlt(uint8_t *buf, uint64_t gotPltEntryAddr, uint64_t pltEntryAddr,
+    int32_t index, unsigned relOff) const override {
+    llvm_unreachable("should call writePPC32GlinkSection() instead");
+  }
+  void writeGotPlt(uint8_t *buf, const Symbol &s) const override;
+  bool needsThunk(RelExpr expr, RelType relocType, const InputFile *file,
+                  uint64_t branchAddr, const Symbol &s) const override;
+  uint32_t getThunkSectionSpacing() const override;
+  bool inBranchRange(RelType type, uint64_t src, uint64_t dst) const override;
+  void relocateOne(uint8_t *loc, RelType type, uint64_t val) const override;
+  RelExpr adjustRelaxExpr(RelType type, const uint8_t *data,
+                          RelExpr expr) const override;
+  int getTlsGdRelaxSkip(RelType type) const override;
+  void relaxTlsGdToIe(uint8_t *loc, RelType type, uint64_t val) const override;
+  void relaxTlsGdToLe(uint8_t *loc, RelType type, uint64_t val) const override;
+  void relaxTlsLdToLe(uint8_t *loc, RelType type, uint64_t val) const override;
+  void relaxTlsIeToLe(uint8_t *loc, RelType type, uint64_t val) const override;
 };
 } // namespace
 
+static uint16_t lo(uint32_t v) { return v; }
+static uint16_t ha(uint32_t v) { return (v + 0x8000) >> 16; }
+
+static uint32_t readFromHalf16(const uint8_t *loc) {
+  return read32(config->isLE ? loc : loc - 2);
+}
+
+static void writeFromHalf16(uint8_t *loc, uint32_t insn) {
+  write32(config->isLE ? loc : loc - 2, insn);
+}
+
+void elf::writePPC32GlinkSection(uint8_t *buf, size_t numEntries) {
+  // On PPC Secure PLT ABI, bl foo@plt jumps to a call stub, which loads an
+  // absolute address from a specific .plt slot (usually called .got.plt on
+  // other targets) and jumps there.
+  //
+  // a) With immediate binding (BIND_NOW), the .plt entry is resolved at load
+  // time. The .glink section is not used.
+  // b) With lazy binding, the .plt entry points to a `b PLTresolve`
+  // instruction in .glink, filled in by PPC::writeGotPlt().
+
+  // Write N `b PLTresolve` first.
+  for (size_t i = 0; i != numEntries; ++i)
+    write32(buf + 4 * i, 0x48000000 | 4 * (numEntries - i));
+  buf += 4 * numEntries;
+
+  // Then write PLTresolve(), which has two forms: PIC and non-PIC. PLTresolve()
+  // computes the PLT index (by computing the distance from the landing b to
+  // itself) and calls _dl_runtime_resolve() (in glibc).
+  uint32_t got = in.got->getVA();
+  uint32_t glink = in.plt->getVA(); // VA of .glink
+  const uint8_t *end = buf + 64;
+  if (config->isPic) {
+    uint32_t afterBcl = in.plt->getSize() - target->pltHeaderSize + 12;
+    uint32_t gotBcl = got + 4 - (glink + afterBcl);
+    write32(buf + 0, 0x3d6b0000 | ha(afterBcl));  // addis r11,r11,1f-glink@ha
+    write32(buf + 4, 0x7c0802a6);                 // mflr r0
+    write32(buf + 8, 0x429f0005);                 // bcl 20,30,.+4
+    write32(buf + 12, 0x396b0000 | lo(afterBcl)); // 1: addi r11,r11,1b-.glink@l
+    write32(buf + 16, 0x7d8802a6);                // mflr r12
+    write32(buf + 20, 0x7c0803a6);                // mtlr r0
+    write32(buf + 24, 0x7d6c5850);                // sub r11,r11,r12
+    write32(buf + 28, 0x3d8c0000 | ha(gotBcl));   // addis 12,12,GOT+4-1b@ha
+    if (ha(gotBcl) == ha(gotBcl + 4)) {
+      write32(buf + 32, 0x800c0000 | lo(gotBcl)); // lwz r0,r12,GOT+4-1b@l(r12)
+      write32(buf + 36,
+              0x818c0000 | lo(gotBcl + 4));       // lwz r12,r12,GOT+8-1b@l(r12)
+    } else {
+      write32(buf + 32, 0x840c0000 | lo(gotBcl)); // lwzu r0,r12,GOT+4-1b@l(r12)
+      write32(buf + 36, 0x818c0000 | 4);          // lwz r12,r12,4(r12)
+    }
+    write32(buf + 40, 0x7c0903a6);                // mtctr 0
+    write32(buf + 44, 0x7c0b5a14);                // add r0,11,11
+    write32(buf + 48, 0x7d605a14);                // add r11,0,11
+    write32(buf + 52, 0x4e800420);                // bctr
+    buf += 56;
+  } else {
+    write32(buf + 0, 0x3d800000 | ha(got + 4));   // lis     r12,GOT+4@ha
+    write32(buf + 4, 0x3d6b0000 | ha(-glink));    // addis   r11,r11,-Glink@ha
+    if (ha(got + 4) == ha(got + 8))
+      write32(buf + 8, 0x800c0000 | lo(got + 4)); // lwz r0,GOT+4@l(r12)
+    else
+      write32(buf + 8, 0x840c0000 | lo(got + 4)); // lwzu r0,GOT+4@l(r12)
+    write32(buf + 12, 0x396b0000 | lo(-glink));   // addi    r11,r11,-Glink@l
+    write32(buf + 16, 0x7c0903a6);                // mtctr   r0
+    write32(buf + 20, 0x7c0b5a14);                // add     r0,r11,r11
+    if (ha(got + 4) == ha(got + 8))
+      write32(buf + 24, 0x818c0000 | lo(got + 8)); // lwz r12,GOT+8@ha(r12)
+    else
+      write32(buf + 24, 0x818c0000 | 4);          // lwz r12,4(r12)
+    write32(buf + 28, 0x7d605a14);                // add     r11,r0,r11
+    write32(buf + 32, 0x4e800420);                // bctr
+    buf += 36;
+  }
+
+  // Pad with nop. They should not be executed.
+  for (; buf < end; buf += 4)
+    write32(buf, 0x60000000);
+}
+
 PPC::PPC() {
-  NoneRel = R_PPC_NONE;
-  GotBaseSymOff = 0x8000;
-  GotBaseSymInGotPlt = false;
+  gotRel = R_PPC_GLOB_DAT;
+  noneRel = R_PPC_NONE;
+  pltRel = R_PPC_JMP_SLOT;
+  relativeRel = R_PPC_RELATIVE;
+  iRelativeRel = R_PPC_IRELATIVE;
+  symbolicRel = R_PPC_ADDR32;
+  gotBaseSymInGotPlt = false;
+  gotHeaderEntriesNum = 3;
+  gotPltHeaderEntriesNum = 0;
+  pltHeaderSize = 64; // size of PLTresolve in .glink
+  pltEntrySize = 4;
+
+  needsThunks = true;
+
+  tlsModuleIndexRel = R_PPC_DTPMOD32;
+  tlsOffsetRel = R_PPC_DTPREL32;
+  tlsGotRel = R_PPC_TPREL32;
+
+  defaultMaxPageSize = 65536;
+  defaultImageBase = 0x10000000;
+
+  write32(trapInstr.data(), 0x7fe00008);
+}
+
+void PPC::writeGotHeader(uint8_t *buf) const {
+  // _GLOBAL_OFFSET_TABLE_[0] = _DYNAMIC
+  // glibc stores _dl_runtime_resolve in _GLOBAL_OFFSET_TABLE_[1],
+  // link_map in _GLOBAL_OFFSET_TABLE_[2].
+  write32(buf, mainPart->dynamic->getVA());
+}
+
+void PPC::writeGotPlt(uint8_t *buf, const Symbol &s) const {
+  // Address of the symbol resolver stub in .glink .
+  write32(buf, in.plt->getVA() + 4 * s.pltIndex);
+}
+
+bool PPC::needsThunk(RelExpr expr, RelType type, const InputFile *file,
+                     uint64_t branchAddr, const Symbol &s) const {
+  if (type != R_PPC_REL24 && type != R_PPC_PLTREL24)
+    return false;
+  if (s.isInPlt())
+    return true;
+  if (s.isUndefWeak())
+    return false;
+  return !(expr == R_PC && PPC::inBranchRange(type, branchAddr, s.getVA()));
+}
+
+uint32_t PPC::getThunkSectionSpacing() const { return 0x2000000; }
+
+bool PPC::inBranchRange(RelType type, uint64_t src, uint64_t dst) const {
+  uint64_t offset = dst - src;
+  if (type == R_PPC_REL24 || type == R_PPC_PLTREL24)
+    return isInt<26>(offset);
+  llvm_unreachable("unsupported relocation type used in branch");
 }
 
-RelExpr PPC::getRelExpr(RelType Type, const Symbol &S,
-                        const uint8_t *Loc) const {
-  switch (Type) {
+RelExpr PPC::getRelExpr(RelType type, const Symbol &s,
+                        const uint8_t *loc) const {
+  switch (type) {
+  case R_PPC_DTPREL16:
+  case R_PPC_DTPREL16_HA:
+  case R_PPC_DTPREL16_HI:
+  case R_PPC_DTPREL16_LO:
+  case R_PPC_DTPREL32:
+    return R_DTPREL;
   case R_PPC_REL14:
-  case R_PPC_REL24:
   case R_PPC_REL32:
+  case R_PPC_LOCAL24PC:
+  case R_PPC_REL16_LO:
+  case R_PPC_REL16_HI:
+  case R_PPC_REL16_HA:
     return R_PC;
-  case R_PPC_PLTREL24:
+  case R_PPC_GOT16:
+    return R_GOT_OFF;
+  case R_PPC_REL24:
     return R_PLT_PC;
+  case R_PPC_PLTREL24:
+    return R_PPC32_PLTREL;
+  case R_PPC_GOT_TLSGD16:
+    return R_TLSGD_GOT;
+  case R_PPC_GOT_TLSLD16:
+    return R_TLSLD_GOT;
+  case R_PPC_GOT_TPREL16:
+    return R_GOT_OFF;
+  case R_PPC_TLS:
+    return R_TLSIE_HINT;
+  case R_PPC_TLSGD:
+    return R_TLSDESC_CALL;
+  case R_PPC_TLSLD:
+    return R_TLSLD_HINT;
+  case R_PPC_TPREL16:
+  case R_PPC_TPREL16_HA:
+  case R_PPC_TPREL16_LO:
+  case R_PPC_TPREL16_HI:
+    return R_TLS;
   default:
     return R_ABS;
   }
 }
 
-void PPC::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
-  switch (Type) {
+RelType PPC::getDynRel(RelType type) const {
+  if (type == R_PPC_ADDR32)
+    return type;
+  return R_PPC_NONE;
+}
+
+static std::pair<RelType, uint64_t> fromDTPREL(RelType type, uint64_t val) {
+  uint64_t dtpBiasedVal = val - 0x8000;
+  switch (type) {
+  case R_PPC_DTPREL16:
+    return {R_PPC64_ADDR16, dtpBiasedVal};
+  case R_PPC_DTPREL16_HA:
+    return {R_PPC_ADDR16_HA, dtpBiasedVal};
+  case R_PPC_DTPREL16_HI:
+    return {R_PPC_ADDR16_HI, dtpBiasedVal};
+  case R_PPC_DTPREL16_LO:
+    return {R_PPC_ADDR16_LO, dtpBiasedVal};
+  case R_PPC_DTPREL32:
+    return {R_PPC_ADDR32, dtpBiasedVal};
+  default:
+    return {type, val};
+  }
+}
+
+void PPC::relocateOne(uint8_t *loc, RelType type, uint64_t val) const {
+  RelType newType;
+  std::tie(newType, val) = fromDTPREL(type, val);
+  switch (newType) {
+  case R_PPC_ADDR16:
+    checkIntUInt(loc, val, 16, type);
+    write16(loc, val);
+    break;
+  case R_PPC_GOT16:
+  case R_PPC_GOT_TLSGD16:
+  case R_PPC_GOT_TLSLD16:
+  case R_PPC_GOT_TPREL16:
+  case R_PPC_TPREL16:
+    checkInt(loc, val, 16, type);
+    write16(loc, val);
+    break;
   case R_PPC_ADDR16_HA:
-    write16be(Loc, (Val + 0x8000) >> 16);
+  case R_PPC_DTPREL16_HA:
+  case R_PPC_GOT_TLSGD16_HA:
+  case R_PPC_GOT_TLSLD16_HA:
+  case R_PPC_GOT_TPREL16_HA:
+  case R_PPC_REL16_HA:
+  case R_PPC_TPREL16_HA:
+    write16(loc, ha(val));
     break;
   case R_PPC_ADDR16_HI:
-    write16be(Loc, Val >> 16);
+  case R_PPC_DTPREL16_HI:
+  case R_PPC_GOT_TLSGD16_HI:
+  case R_PPC_GOT_TLSLD16_HI:
+  case R_PPC_GOT_TPREL16_HI:
+  case R_PPC_REL16_HI:
+  case R_PPC_TPREL16_HI:
+    write16(loc, val >> 16);
     break;
   case R_PPC_ADDR16_LO:
-    write16be(Loc, Val);
+  case R_PPC_DTPREL16_LO:
+  case R_PPC_GOT_TLSGD16_LO:
+  case R_PPC_GOT_TLSLD16_LO:
+  case R_PPC_GOT_TPREL16_LO:
+  case R_PPC_REL16_LO:
+  case R_PPC_TPREL16_LO:
+    write16(loc, val);
     break;
   case R_PPC_ADDR32:
   case R_PPC_REL32:
-    write32be(Loc, Val);
+    write32(loc, val);
     break;
-  case R_PPC_REL14:
-    write32be(Loc, read32be(Loc) | (Val & 0xFFFC));
+  case R_PPC_REL14: {
+    uint32_t mask = 0x0000FFFC;
+    checkInt(loc, val, 16, type);
+    checkAlignment(loc, val, 4, type);
+    write32(loc, (read32(loc) & ~mask) | (val & mask));
     break;
-  case R_PPC_PLTREL24:
+  }
   case R_PPC_REL24:
-    write32be(Loc, read32be(Loc) | (Val & 0x3FFFFFC));
+  case R_PPC_LOCAL24PC:
+  case R_PPC_PLTREL24: {
+    uint32_t mask = 0x03FFFFFC;
+    checkInt(loc, val, 26, type);
+    checkAlignment(loc, val, 4, type);
+    write32(loc, (read32(loc) & ~mask) | (val & mask));
     break;
+  }
   default:
-    error(getErrorLocation(Loc) + "unrecognized reloc " + Twine(Type));
+    error(getErrorLocation(loc) + "unrecognized relocation " + toString(type));
+  }
+}
+
+RelExpr PPC::adjustRelaxExpr(RelType type, const uint8_t *data,
+                             RelExpr expr) const {
+  if (expr == R_RELAX_TLS_GD_TO_IE)
+    return R_RELAX_TLS_GD_TO_IE_GOT_OFF;
+  if (expr == R_RELAX_TLS_LD_TO_LE)
+    return R_RELAX_TLS_LD_TO_LE_ABS;
+  return expr;
+}
+
+int PPC::getTlsGdRelaxSkip(RelType type) const {
+  // A __tls_get_addr call instruction is marked with 2 relocations:
+  //
+  //   R_PPC_TLSGD / R_PPC_TLSLD: marker relocation
+  //   R_PPC_REL24: __tls_get_addr
+  //
+  // After the relaxation we no longer call __tls_get_addr and should skip both
+  // relocations to not create a false dependence on __tls_get_addr being
+  // defined.
+  if (type == R_PPC_TLSGD || type == R_PPC_TLSLD)
+    return 2;
+  return 1;
+}
+
+void PPC::relaxTlsGdToIe(uint8_t *loc, RelType type, uint64_t val) const {
+  switch (type) {
+  case R_PPC_GOT_TLSGD16: {
+    // addi rT, rA, x@got@tlsgd --> lwz rT, x@got@tprel(rA)
+    uint32_t insn = readFromHalf16(loc);
+    writeFromHalf16(loc, 0x80000000 | (insn & 0x03ff0000));
+    relocateOne(loc, R_PPC_GOT_TPREL16, val);
+    break;
+  }
+  case R_PPC_TLSGD:
+    // bl __tls_get_addr(x@tldgd) --> add r3, r3, r2
+    write32(loc, 0x7c631214);
+    break;
+  default:
+    llvm_unreachable("unsupported relocation for TLS GD to IE relaxation");
+  }
+}
+
+void PPC::relaxTlsGdToLe(uint8_t *loc, RelType type, uint64_t val) const {
+  switch (type) {
+  case R_PPC_GOT_TLSGD16:
+    // addi r3, r31, x@got@tlsgd --> addis r3, r2, x@tprel@ha
+    writeFromHalf16(loc, 0x3c620000 | ha(val));
+    break;
+  case R_PPC_TLSGD:
+    // bl __tls_get_addr(x@tldgd) --> add r3, r3, x@tprel@l
+    write32(loc, 0x38630000 | lo(val));
+    break;
+  default:
+    llvm_unreachable("unsupported relocation for TLS GD to LE relaxation");
+  }
+}
+
+void PPC::relaxTlsLdToLe(uint8_t *loc, RelType type, uint64_t val) const {
+  switch (type) {
+  case R_PPC_GOT_TLSLD16:
+    // addi r3, rA, x@got@tlsgd --> addis r3, r2, 0
+    writeFromHalf16(loc, 0x3c620000);
+    break;
+  case R_PPC_TLSLD:
+    // r3+x@dtprel computes r3+x-0x8000, while we want it to compute r3+x@tprel
+    // = r3+x-0x7000, so add 4096 to r3.
+    // bl __tls_get_addr(x@tlsld) --> addi r3, r3, 4096
+    write32(loc, 0x38631000);
+    break;
+  case R_PPC_DTPREL16:
+  case R_PPC_DTPREL16_HA:
+  case R_PPC_DTPREL16_HI:
+  case R_PPC_DTPREL16_LO:
+    relocateOne(loc, type, val);
+    break;
+  default:
+    llvm_unreachable("unsupported relocation for TLS LD to LE relaxation");
+  }
+}
+
+void PPC::relaxTlsIeToLe(uint8_t *loc, RelType type, uint64_t val) const {
+  switch (type) {
+  case R_PPC_GOT_TPREL16: {
+    // lwz rT, x@got@tprel(rA) --> addis rT, r2, x@tprel@ha
+    uint32_t rt = readFromHalf16(loc) & 0x03e00000;
+    writeFromHalf16(loc, 0x3c020000 | rt | ha(val));
+    break;
+  }
+  case R_PPC_TLS: {
+    uint32_t insn = read32(loc);
+    if (insn >> 26 != 31)
+      error("unrecognized instruction for IE to LE R_PPC_TLS");
+    // addi rT, rT, x@tls --> addi rT, rT, x@tprel@l
+    uint32_t dFormOp = getPPCDFormOp((read32(loc) & 0x000007fe) >> 1);
+    if (dFormOp == 0)
+      error("unrecognized instruction for IE to LE R_PPC_TLS");
+    write32(loc, (dFormOp << 26) | (insn & 0x03ff0000) | lo(val));
+    break;
+  }
+  default:
+    llvm_unreachable("unsupported relocation for TLS IE to LE relaxation");
   }
 }
 
 TargetInfo *elf::getPPCTargetInfo() {
-  static PPC Target;
-  return &Target;
+  static PPC target;
+  return &target;
 }
diff --git a/deps/lld/ELF/Arch/PPC64.cpp b/deps/lld/ELF/Arch/PPC64.cpp
index 8a320c9a4e9ef4be0a88aaff80de5e9f5a6291d6..70d284cfad713165aae836fa4d83705fb1f2b23d 100644
--- a/deps/lld/ELF/Arch/PPC64.cpp
+++ b/deps/lld/ELF/Arch/PPC64.cpp
@@ -1,9 +1,8 @@
 //===- PPC64.cpp ----------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -20,8 +19,8 @@ using namespace llvm::ELF;
 using namespace lld;
 using namespace lld::elf;
 
-static uint64_t PPC64TocOffset = 0x8000;
-static uint64_t DynamicThreadPointerOffset = 0x8000;
+static uint64_t ppc64TocOffset = 0x8000;
+static uint64_t dynamicThreadPointerOffset = 0x8000;
 
 // The instruction encoding of bits 21-30 from the ISA for the Xform and Dform
 // instructions that can be used as part of the initial exec TLS sequence.
@@ -65,16 +64,16 @@ uint64_t elf::getPPC64TocBase() {
   // TOC starts where the first of these sections starts. We always create a
   // .got when we see a relocation that uses it, so for us the start is always
   // the .got.
-  uint64_t TocVA = In.Got->getVA();
+  uint64_t tocVA = in.got->getVA();
 
   // Per the ppc64-elf-linux ABI, The TOC base is TOC value plus 0x8000
   // thus permitting a full 64 Kbytes segment. Note that the glibc startup
   // code (crt1.o) assumes that you can get from the TOC base to the
   // start of the .toc section with only a single (signed) 16-bit relocation.
-  return TocVA + PPC64TocOffset;
+  return tocVA + ppc64TocOffset;
 }
 
-unsigned elf::getPPC64GlobalEntryToLocalEntryOffset(uint8_t StOther) {
+unsigned elf::getPPC64GlobalEntryToLocalEntryOffset(uint8_t stOther) {
   // The offset is encoded into the 3 most significant bits of the st_other
   // field, with some special values described in section 3.4.1 of the ABI:
   // 0   --> Zero offset between the GEP and LEP, and the function does NOT use
@@ -86,43 +85,134 @@ unsigned elf::getPPC64GlobalEntryToLocalEntryOffset(uint8_t StOther) {
   //         2 --> 2^2 = 4 bytes -->  1 instruction.
   //         6 --> 2^6 = 64 bytes --> 16 instructions.
   // 7   --> Reserved.
-  uint8_t GepToLep = (StOther >> 5) & 7;
-  if (GepToLep < 2)
+  uint8_t gepToLep = (stOther >> 5) & 7;
+  if (gepToLep < 2)
     return 0;
 
   // The value encoded in the st_other bits is the
   // log-base-2(offset).
-  if (GepToLep < 7)
-    return 1 << GepToLep;
+  if (gepToLep < 7)
+    return 1 << gepToLep;
 
   error("reserved value of 7 in the 3 most-significant-bits of st_other");
   return 0;
 }
 
+bool elf::isPPC64SmallCodeModelTocReloc(RelType type) {
+  // The only small code model relocations that access the .toc section.
+  return type == R_PPC64_TOC16 || type == R_PPC64_TOC16_DS;
+}
+
+// Find the R_PPC64_ADDR64 in .rela.toc with matching offset.
+template <typename ELFT>
+static std::pair<Defined *, int64_t>
+getRelaTocSymAndAddend(InputSectionBase *tocSec, uint64_t offset) {
+  if (tocSec->numRelocations == 0)
+    return {};
+
+  // .rela.toc contains exclusively R_PPC64_ADDR64 relocations sorted by
+  // r_offset: 0, 8, 16, etc. For a given Offset, Offset / 8 gives us the
+  // relocation index in most cases.
+  //
+  // In rare cases a TOC entry may store a constant that doesn't need an
+  // R_PPC64_ADDR64, the corresponding r_offset is therefore missing. Offset / 8
+  // points to a relocation with larger r_offset. Do a linear probe then.
+  // Constants are extremely uncommon in .toc and the extra number of array
+  // accesses can be seen as a small constant.
+  ArrayRef<typename ELFT::Rela> relas = tocSec->template relas<ELFT>();
+  uint64_t index = std::min<uint64_t>(offset / 8, relas.size() - 1);
+  for (;;) {
+    if (relas[index].r_offset == offset) {
+      Symbol &sym = tocSec->getFile<ELFT>()->getRelocTargetSym(relas[index]);
+      return {dyn_cast<Defined>(&sym), getAddend<ELFT>(relas[index])};
+    }
+    if (relas[index].r_offset < offset || index == 0)
+      break;
+    --index;
+  }
+  return {};
+}
+
+// When accessing a symbol defined in another translation unit, compilers
+// reserve a .toc entry, allocate a local label and generate toc-indirect
+// instuctions:
+//
+//   addis 3, 2, .LC0@toc@ha  # R_PPC64_TOC16_HA
+//   ld    3, .LC0@toc@l(3)   # R_PPC64_TOC16_LO_DS, load the address from a .toc entry
+//   ld/lwa 3, 0(3)           # load the value from the address
+//
+//   .section .toc,"aw",@progbits
+//   .LC0: .tc var[TC],var
+//
+// If var is defined, non-preemptable and addressable with a 32-bit signed
+// offset from the toc base, the address of var can be computed by adding an
+// offset to the toc base, saving a load.
+//
+//   addis 3,2,var@toc@ha     # this may be relaxed to a nop,
+//   addi  3,3,var@toc@l      # then this becomes addi 3,2,var@toc
+//   ld/lwa 3, 0(3)           # load the value from the address
+//
+// Returns true if the relaxation is performed.
+bool elf::tryRelaxPPC64TocIndirection(RelType type, const Relocation &rel,
+                                      uint8_t *bufLoc) {
+  assert(config->tocOptimize);
+  if (rel.addend < 0)
+    return false;
+
+  // If the symbol is not the .toc section, this isn't a toc-indirection.
+  Defined *defSym = dyn_cast<Defined>(rel.sym);
+  if (!defSym || !defSym->isSection() || defSym->section->name != ".toc")
+    return false;
+
+  Defined *d;
+  int64_t addend;
+  auto *tocISB = cast<InputSectionBase>(defSym->section);
+  std::tie(d, addend) =
+      config->isLE ? getRelaTocSymAndAddend<ELF64LE>(tocISB, rel.addend)
+                   : getRelaTocSymAndAddend<ELF64BE>(tocISB, rel.addend);
+
+  // Only non-preemptable defined symbols can be relaxed.
+  if (!d || d->isPreemptible)
+    return false;
+
+  // Two instructions can materialize a 32-bit signed offset from the toc base.
+  uint64_t tocRelative = d->getVA(addend) - getPPC64TocBase();
+  if (!isInt<32>(tocRelative))
+    return false;
+
+  // Add PPC64TocOffset that will be subtracted by relocateOne().
+  target->relaxGot(bufLoc, type, tocRelative + ppc64TocOffset);
+  return true;
+}
+
 namespace {
 class PPC64 final : public TargetInfo {
 public:
   PPC64();
+  int getTlsGdRelaxSkip(RelType type) const override;
   uint32_t calcEFlags() const override;
-  RelExpr getRelExpr(RelType Type, const Symbol &S,
-                     const uint8_t *Loc) const override;
-  void writePltHeader(uint8_t *Buf) const override;
-  void writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr, uint64_t PltEntryAddr,
-                int32_t Index, unsigned RelOff) const override;
-  void relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const override;
-  void writeGotHeader(uint8_t *Buf) const override;
-  bool needsThunk(RelExpr Expr, RelType Type, const InputFile *File,
-                  uint64_t BranchAddr, const Symbol &S) const override;
-  bool inBranchRange(RelType Type, uint64_t Src, uint64_t Dst) const override;
-  RelExpr adjustRelaxExpr(RelType Type, const uint8_t *Data,
-                          RelExpr Expr) const override;
-  void relaxTlsGdToIe(uint8_t *Loc, RelType Type, uint64_t Val) const override;
-  void relaxTlsGdToLe(uint8_t *Loc, RelType Type, uint64_t Val) const override;
-  void relaxTlsLdToLe(uint8_t *Loc, RelType Type, uint64_t Val) const override;
-  void relaxTlsIeToLe(uint8_t *Loc, RelType Type, uint64_t Val) const override;
+  RelExpr getRelExpr(RelType type, const Symbol &s,
+                     const uint8_t *loc) const override;
+  RelType getDynRel(RelType type) const override;
+  void writePltHeader(uint8_t *buf) const override;
+  void writePlt(uint8_t *buf, uint64_t gotPltEntryAddr, uint64_t pltEntryAddr,
+                int32_t index, unsigned relOff) const override;
+  void relocateOne(uint8_t *loc, RelType type, uint64_t val) const override;
+  void writeGotHeader(uint8_t *buf) const override;
+  bool needsThunk(RelExpr expr, RelType type, const InputFile *file,
+                  uint64_t branchAddr, const Symbol &s) const override;
+  uint32_t getThunkSectionSpacing() const override;
+  bool inBranchRange(RelType type, uint64_t src, uint64_t dst) const override;
+  RelExpr adjustRelaxExpr(RelType type, const uint8_t *data,
+                          RelExpr expr) const override;
+  void relaxGot(uint8_t *loc, RelType type, uint64_t val) const override;
+  void relaxTlsGdToIe(uint8_t *loc, RelType type, uint64_t val) const override;
+  void relaxTlsGdToLe(uint8_t *loc, RelType type, uint64_t val) const override;
+  void relaxTlsLdToLe(uint8_t *loc, RelType type, uint64_t val) const override;
+  void relaxTlsIeToLe(uint8_t *loc, RelType type, uint64_t val) const override;
 
-  bool adjustPrologueForCrossSplitStack(uint8_t *Loc, uint8_t *End,
-                                        uint8_t StOther) const override;
+  bool adjustPrologueForCrossSplitStack(uint8_t *loc, uint8_t *end,
+                                        uint8_t stOther) const override;
 };
 } // namespace
 
@@ -130,19 +220,19 @@ public:
 // #higher(value), #highera(value), #highest(value), and #highesta(value)
 // macros defined in section 4.5.1. Relocation Types of the PPC-elf64abi
 // document.
-static uint16_t lo(uint64_t V) { return V; }
-static uint16_t hi(uint64_t V) { return V >> 16; }
-static uint16_t ha(uint64_t V) { return (V + 0x8000) >> 16; }
-static uint16_t higher(uint64_t V) { return V >> 32; }
-static uint16_t highera(uint64_t V) { return (V + 0x8000) >> 32; }
-static uint16_t highest(uint64_t V) { return V >> 48; }
-static uint16_t highesta(uint64_t V) { return (V + 0x8000) >> 48; }
+static uint16_t lo(uint64_t v) { return v; }
+static uint16_t hi(uint64_t v) { return v >> 16; }
+static uint16_t ha(uint64_t v) { return (v + 0x8000) >> 16; }
+static uint16_t higher(uint64_t v) { return v >> 32; }
+static uint16_t highera(uint64_t v) { return (v + 0x8000) >> 32; }
+static uint16_t highest(uint64_t v) { return v >> 48; }
+static uint16_t highesta(uint64_t v) { return (v + 0x8000) >> 48; }
 
 // Extracts the 'PO' field of an instruction encoding.
-static uint8_t getPrimaryOpCode(uint32_t Encoding) { return (Encoding >> 26); }
+static uint8_t getPrimaryOpCode(uint32_t encoding) { return (encoding >> 26); }
 
-static bool isDQFormInstruction(uint32_t Encoding) {
-  switch (getPrimaryOpCode(Encoding)) {
+static bool isDQFormInstruction(uint32_t encoding) {
+  switch (getPrimaryOpCode(encoding)) {
   default:
     return false;
   case 56:
@@ -152,12 +242,12 @@ static bool isDQFormInstruction(uint32_t Encoding) {
     // There are both DS and DQ instruction forms with this primary opcode.
     // Namely `lxv` and `stxv` are the DQ-forms that use it.
     // The DS 'XO' bits being set to 01 is restricted to DQ form.
-    return (Encoding & 3) == 0x1;
+    return (encoding & 3) == 0x1;
   }
 }
 
-static bool isInstructionUpdateForm(uint32_t Encoding) {
-  switch (getPrimaryOpCode(Encoding)) {
+static bool isInstructionUpdateForm(uint32_t encoding) {
+  switch (getPrimaryOpCode(encoding)) {
   default:
     return false;
   case LBZU:
@@ -176,7 +266,7 @@ static bool isInstructionUpdateForm(uint32_t Encoding) {
     // between LD/LDU/LWA
   case LD:
   case STD:
-    return (Encoding & 3) == 1;
+    return (encoding & 3) == 1;
   }
 }
 
@@ -185,40 +275,38 @@ static bool isInstructionUpdateForm(uint32_t Encoding) {
 // pointer is pointing into the middle of the word we want to extract, and on
 // little-endian it is pointing to the start of the word. These 2 helpers are to
 // simplify reading and writing in that context.
-static void writeInstrFromHalf16(uint8_t *Loc, uint32_t Instr) {
-  write32(Loc - (Config->EKind == ELF64BEKind ? 2 : 0), Instr);
+static void writeFromHalf16(uint8_t *loc, uint32_t insn) {
+  write32(config->isLE ? loc : loc - 2, insn);
 }
 
-static uint32_t readInstrFromHalf16(const uint8_t *Loc) {
-  return read32(Loc - (Config->EKind == ELF64BEKind ? 2 : 0));
+static uint32_t readFromHalf16(const uint8_t *loc) {
+  return read32(config->isLE ? loc : loc - 2);
 }
 
 PPC64::PPC64() {
-  GotRel = R_PPC64_GLOB_DAT;
-  NoneRel = R_PPC64_NONE;
-  PltRel = R_PPC64_JMP_SLOT;
-  RelativeRel = R_PPC64_RELATIVE;
-  IRelativeRel = R_PPC64_IRELATIVE;
-  GotEntrySize = 8;
-  PltEntrySize = 4;
-  GotPltEntrySize = 8;
-  GotBaseSymInGotPlt = false;
-  GotBaseSymOff = 0x8000;
-  GotHeaderEntriesNum = 1;
-  GotPltHeaderEntriesNum = 2;
-  PltHeaderSize = 60;
-  NeedsThunks = true;
+  gotRel = R_PPC64_GLOB_DAT;
+  noneRel = R_PPC64_NONE;
+  pltRel = R_PPC64_JMP_SLOT;
+  relativeRel = R_PPC64_RELATIVE;
+  iRelativeRel = R_PPC64_IRELATIVE;
+  symbolicRel = R_PPC64_ADDR64;
+  pltEntrySize = 4;
+  gotBaseSymInGotPlt = false;
+  gotHeaderEntriesNum = 1;
+  gotPltHeaderEntriesNum = 2;
+  pltHeaderSize = 60;
+  needsThunks = true;
 
-  TlsModuleIndexRel = R_PPC64_DTPMOD64;
-  TlsOffsetRel = R_PPC64_DTPREL64;
+  tlsModuleIndexRel = R_PPC64_DTPMOD64;
+  tlsOffsetRel = R_PPC64_DTPREL64;
 
-  TlsGotRel = R_PPC64_TPREL64;
+  tlsGotRel = R_PPC64_TPREL64;
 
-  NeedsMoreStackNonSplit = false;
+  needsMoreStackNonSplit = false;
 
   // We need 64K pages (at least under glibc/Linux, the loader won't
   // set different permissions on a finer granularity than that).
-  DefaultMaxPageSize = 65536;
+  defaultMaxPageSize = 65536;
 
   // The PPC64 ELF ABI v1 spec, says:
   //
@@ -228,31 +316,66 @@ PPC64::PPC64() {
   //
   // And because the lowest non-zero 256M boundary is 0x10000000, PPC64 linkers
   // use 0x10000000 as the starting address.
-  DefaultImageBase = 0x10000000;
+  defaultImageBase = 0x10000000;
 
-  write32(TrapInstr.data(), 0x7fe00008);
+  write32(trapInstr.data(), 0x7fe00008);
 }
 
-static uint32_t getEFlags(InputFile *File) {
-  if (Config->EKind == ELF64BEKind)
-    return cast<ObjFile<ELF64BE>>(File)->getObj().getHeader()->e_flags;
-  return cast<ObjFile<ELF64LE>>(File)->getObj().getHeader()->e_flags;
+int PPC64::getTlsGdRelaxSkip(RelType type) const {
+  // A __tls_get_addr call instruction is marked with 2 relocations:
+  //
+  //   R_PPC64_TLSGD / R_PPC64_TLSLD: marker relocation
+  //   R_PPC64_REL24: __tls_get_addr
+  //
+  // After the relaxation we no longer call __tls_get_addr and should skip both
+  // relocations to not create a false dependence on __tls_get_addr being
+  // defined.
+  if (type == R_PPC64_TLSGD || type == R_PPC64_TLSLD)
+    return 2;
+  return 1;
+}
+
+static uint32_t getEFlags(InputFile *file) {
+  if (config->ekind == ELF64BEKind)
+    return cast<ObjFile<ELF64BE>>(file)->getObj().getHeader()->e_flags;
+  return cast<ObjFile<ELF64LE>>(file)->getObj().getHeader()->e_flags;
 }
 
 // This file implements v2 ABI. This function makes sure that all
 // object files have v2 or an unspecified version as an ABI version.
 uint32_t PPC64::calcEFlags() const {
-  for (InputFile *F : ObjectFiles) {
-    uint32_t Flag = getEFlags(F);
-    if (Flag == 1)
-      error(toString(F) + ": ABI version 1 is not supported");
-    else if (Flag > 2)
-      error(toString(F) + ": unrecognized e_flags: " + Twine(Flag));
+  for (InputFile *f : objectFiles) {
+    uint32_t flag = getEFlags(f);
+    if (flag == 1)
+      error(toString(f) + ": ABI version 1 is not supported");
+    else if (flag > 2)
+      error(toString(f) + ": unrecognized e_flags: " + Twine(flag));
   }
   return 2;
 }
 
-void PPC64::relaxTlsGdToLe(uint8_t *Loc, RelType Type, uint64_t Val) const {
+void PPC64::relaxGot(uint8_t *loc, RelType type, uint64_t val) const {
+  switch (type) {
+  case R_PPC64_TOC16_HA:
+    // Convert "addis reg, 2, .LC0@toc@h" to "addis reg, 2, var@toc@h" or "nop".
+    relocateOne(loc, type, val);
+    break;
+  case R_PPC64_TOC16_LO_DS: {
+    // Convert "ld reg, .LC0@toc@l(reg)" to "addi reg, reg, var@toc@l" or
+    // "addi reg, 2, var@toc".
+    uint32_t insn = readFromHalf16(loc);
+    if (getPrimaryOpCode(insn) != LD)
+      error("expected a 'ld' for got-indirect to toc-relative relaxing");
+    writeFromHalf16(loc, (insn & 0x03ffffff) | 0x38000000);
+    relocateOne(loc, R_PPC64_TOC16_LO, val);
+    break;
+  }
+  default:
+    llvm_unreachable("unexpected relocation type");
+  }
+}
+
+void PPC64::relaxTlsGdToLe(uint8_t *loc, RelType type, uint64_t val) const {
   // Reference: 3.7.4.2 of the 64-bit ELF V2 abi supplement.
   // The general dynamic code sequence for a global `x` will look like:
   // Instruction                    Relocation                Symbol
@@ -268,30 +391,30 @@ void PPC64::relaxTlsGdToLe(uint8_t *Loc, RelType Type, uint64_t Val) const {
   // bl __tls_get_addr(x@tlsgd)      into      nop
   // nop                             into      addi r3, r3, x@tprel@l
 
-  switch (Type) {
+  switch (type) {
   case R_PPC64_GOT_TLSGD16_HA:
-    writeInstrFromHalf16(Loc, 0x60000000); // nop
+    writeFromHalf16(loc, 0x60000000); // nop
     break;
   case R_PPC64_GOT_TLSGD16:
   case R_PPC64_GOT_TLSGD16_LO:
-    writeInstrFromHalf16(Loc, 0x3c6d0000); // addis r3, r13
-    relocateOne(Loc, R_PPC64_TPREL16_HA, Val);
+    writeFromHalf16(loc, 0x3c6d0000); // addis r3, r13
+    relocateOne(loc, R_PPC64_TPREL16_HA, val);
     break;
   case R_PPC64_TLSGD:
-    write32(Loc, 0x60000000);     // nop
-    write32(Loc + 4, 0x38630000); // addi r3, r3
+    write32(loc, 0x60000000);     // nop
+    write32(loc + 4, 0x38630000); // addi r3, r3
     // Since we are relocating a half16 type relocation and Loc + 4 points to
     // the start of an instruction we need to advance the buffer by an extra
     // 2 bytes on BE.
-    relocateOne(Loc + 4 + (Config->EKind == ELF64BEKind ? 2 : 0),
-                R_PPC64_TPREL16_LO, Val);
+    relocateOne(loc + 4 + (config->ekind == ELF64BEKind ? 2 : 0),
+                R_PPC64_TPREL16_LO, val);
     break;
   default:
     llvm_unreachable("unsupported relocation for TLS GD to LE relaxation");
   }
 }
 
-void PPC64::relaxTlsLdToLe(uint8_t *Loc, RelType Type, uint64_t Val) const {
+void PPC64::relaxTlsLdToLe(uint8_t *loc, RelType type, uint64_t val) const {
   // Reference: 3.7.4.3 of the 64-bit ELF V2 abi supplement.
   // The local dynamic code sequence for a global `x` will look like:
   // Instruction                    Relocation                Symbol
@@ -307,16 +430,16 @@ void PPC64::relaxTlsLdToLe(uint8_t *Loc, RelType Type, uint64_t Val) const {
   // bl __tls_get_addr(x@tlsgd)     into      nop
   // nop                            into      addi r3, r3, 4096
 
-  switch (Type) {
+  switch (type) {
   case R_PPC64_GOT_TLSLD16_HA:
-    writeInstrFromHalf16(Loc, 0x60000000); // nop
+    writeFromHalf16(loc, 0x60000000); // nop
     break;
   case R_PPC64_GOT_TLSLD16_LO:
-    writeInstrFromHalf16(Loc, 0x3c6d0000); // addis r3, r13, 0
+    writeFromHalf16(loc, 0x3c6d0000); // addis r3, r13, 0
     break;
   case R_PPC64_TLSLD:
-    write32(Loc, 0x60000000);     // nop
-    write32(Loc + 4, 0x38631000); // addi r3, r3, 4096
+    write32(loc, 0x60000000);     // nop
+    write32(loc + 4, 0x38631000); // addi r3, r3, 4096
     break;
   case R_PPC64_DTPREL16:
   case R_PPC64_DTPREL16_HA:
@@ -324,19 +447,15 @@ void PPC64::relaxTlsLdToLe(uint8_t *Loc, RelType Type, uint64_t Val) const {
   case R_PPC64_DTPREL16_DS:
   case R_PPC64_DTPREL16_LO:
   case R_PPC64_DTPREL16_LO_DS:
-  case R_PPC64_GOT_DTPREL16_HA:
-  case R_PPC64_GOT_DTPREL16_LO_DS:
-  case R_PPC64_GOT_DTPREL16_DS:
-  case R_PPC64_GOT_DTPREL16_HI:
-    relocateOne(Loc, Type, Val);
+    relocateOne(loc, type, val);
     break;
   default:
     llvm_unreachable("unsupported relocation for TLS LD to LE relaxation");
   }
 }
 
-static unsigned getDFormOp(unsigned SecondaryOp) {
-  switch (SecondaryOp) {
+unsigned elf::getPPCDFormOp(unsigned secondaryOp) {
+  switch (secondaryOp) {
   case LBZX:
     return LBZ;
   case LHZX:
@@ -356,12 +475,11 @@ static unsigned getDFormOp(unsigned SecondaryOp) {
   case ADD:
     return ADDI;
   default:
-    error("unrecognized instruction for IE to LE R_PPC64_TLS");
     return 0;
   }
 }
 
-void PPC64::relaxTlsIeToLe(uint8_t *Loc, RelType Type, uint64_t Val) const {
+void PPC64::relaxTlsIeToLe(uint8_t *loc, RelType type, uint64_t val) const {
   // The initial exec code sequence for a global `x` will look like:
   // Instruction                    Relocation                Symbol
   // addis r9, r2, x@got@tprel@ha   R_PPC64_GOT_TPREL16_HA      x
@@ -381,26 +499,28 @@ void PPC64::relaxTlsIeToLe(uint8_t *Loc, RelType Type, uint64_t Val) const {
   // instruction, if we are accessing memory it will use any of the X-form
   // indexed load or store instructions.
 
-  unsigned Offset = (Config->EKind == ELF64BEKind) ? 2 : 0;
-  switch (Type) {
+  unsigned offset = (config->ekind == ELF64BEKind) ? 2 : 0;
+  switch (type) {
   case R_PPC64_GOT_TPREL16_HA:
-    write32(Loc - Offset, 0x60000000); // nop
+    write32(loc - offset, 0x60000000); // nop
     break;
   case R_PPC64_GOT_TPREL16_LO_DS:
   case R_PPC64_GOT_TPREL16_DS: {
-    uint32_t RegNo = read32(Loc - Offset) & 0x03E00000; // bits 6-10
-    write32(Loc - Offset, 0x3C0D0000 | RegNo);          // addis RegNo, r13
-    relocateOne(Loc, R_PPC64_TPREL16_HA, Val);
+    uint32_t regNo = read32(loc - offset) & 0x03E00000; // bits 6-10
+    write32(loc - offset, 0x3C0D0000 | regNo);          // addis RegNo, r13
+    relocateOne(loc, R_PPC64_TPREL16_HA, val);
     break;
   }
   case R_PPC64_TLS: {
-    uint32_t PrimaryOp = getPrimaryOpCode(read32(Loc));
-    if (PrimaryOp != 31)
+    uint32_t primaryOp = getPrimaryOpCode(read32(loc));
+    if (primaryOp != 31)
       error("unrecognized instruction for IE to LE R_PPC64_TLS");
-    uint32_t SecondaryOp = (read32(Loc) & 0x000007FE) >> 1; // bits 21-30
-    uint32_t DFormOp = getDFormOp(SecondaryOp);
-    write32(Loc, ((DFormOp << 26) | (read32(Loc) & 0x03FFFFFF)));
-    relocateOne(Loc + Offset, R_PPC64_TPREL16_LO, Val);
+    uint32_t secondaryOp = (read32(loc) & 0x000007FE) >> 1; // bits 21-30
+    uint32_t dFormOp = getPPCDFormOp(secondaryOp);
+    if (dFormOp == 0)
+      error("unrecognized instruction for IE to LE R_PPC64_TLS");
+    write32(loc, ((dFormOp << 26) | (read32(loc) & 0x03FFFFFF)));
+    relocateOne(loc + offset, R_PPC64_TPREL16_LO, val);
     break;
   }
   default:
@@ -409,9 +529,9 @@ void PPC64::relaxTlsIeToLe(uint8_t *Loc, RelType Type, uint64_t Val) const {
   }
 }
 
-RelExpr PPC64::getRelExpr(RelType Type, const Symbol &S,
-                          const uint8_t *Loc) const {
-  switch (Type) {
+RelExpr PPC64::getRelExpr(RelType type, const Symbol &s,
+                          const uint8_t *loc) const {
+  switch (type) {
   case R_PPC64_GOT16:
   case R_PPC64_GOT16_DS:
   case R_PPC64_GOT16_HA:
@@ -421,16 +541,17 @@ RelExpr PPC64::getRelExpr(RelType Type, const Symbol &S,
     return R_GOT_OFF;
   case R_PPC64_TOC16:
   case R_PPC64_TOC16_DS:
-  case R_PPC64_TOC16_HA:
   case R_PPC64_TOC16_HI:
   case R_PPC64_TOC16_LO:
-  case R_PPC64_TOC16_LO_DS:
     return R_GOTREL;
+  case R_PPC64_TOC16_HA:
+  case R_PPC64_TOC16_LO_DS:
+    return config->tocOptimize ? R_PPC64_RELAX_TOC : R_GOTREL;
   case R_PPC64_TOC:
-    return R_PPC_TOC;
+    return R_PPC64_TOCBASE;
   case R_PPC64_REL14:
   case R_PPC64_REL24:
-    return R_PPC_CALL_PLT;
+    return R_PPC64_CALL_PLT;
   case R_PPC64_REL16_LO:
   case R_PPC64_REL16_HA:
   case R_PPC64_REL32:
@@ -478,7 +599,7 @@ RelExpr PPC64::getRelExpr(RelType Type, const Symbol &S,
   case R_PPC64_DTPREL16_LO:
   case R_PPC64_DTPREL16_LO_DS:
   case R_PPC64_DTPREL64:
-    return R_ABS;
+    return R_DTPREL;
   case R_PPC64_TLSGD:
     return R_TLSDESC_CALL;
   case R_PPC64_TLSLD:
@@ -490,115 +611,121 @@ RelExpr PPC64::getRelExpr(RelType Type, const Symbol &S,
   }
 }
 
-void PPC64::writeGotHeader(uint8_t *Buf) const {
-  write64(Buf, getPPC64TocBase());
+RelType PPC64::getDynRel(RelType type) const {
+  if (type == R_PPC64_ADDR64 || type == R_PPC64_TOC)
+    return R_PPC64_ADDR64;
+  return R_PPC64_NONE;
 }
 
-void PPC64::writePltHeader(uint8_t *Buf) const {
+void PPC64::writeGotHeader(uint8_t *buf) const {
+  write64(buf, getPPC64TocBase());
+}
+
+void PPC64::writePltHeader(uint8_t *buf) const {
   // The generic resolver stub goes first.
-  write32(Buf +  0, 0x7c0802a6); // mflr r0
-  write32(Buf +  4, 0x429f0005); // bcl  20,4*cr7+so,8 <_glink+0x8>
-  write32(Buf +  8, 0x7d6802a6); // mflr r11
-  write32(Buf + 12, 0x7c0803a6); // mtlr r0
-  write32(Buf + 16, 0x7d8b6050); // subf r12, r11, r12
-  write32(Buf + 20, 0x380cffcc); // subi r0,r12,52
-  write32(Buf + 24, 0x7800f082); // srdi r0,r0,62,2
-  write32(Buf + 28, 0xe98b002c); // ld   r12,44(r11)
-  write32(Buf + 32, 0x7d6c5a14); // add  r11,r12,r11
-  write32(Buf + 36, 0xe98b0000); // ld   r12,0(r11)
-  write32(Buf + 40, 0xe96b0008); // ld   r11,8(r11)
-  write32(Buf + 44, 0x7d8903a6); // mtctr   r12
-  write32(Buf + 48, 0x4e800420); // bctr
+  write32(buf +  0, 0x7c0802a6); // mflr r0
+  write32(buf +  4, 0x429f0005); // bcl  20,4*cr7+so,8 <_glink+0x8>
+  write32(buf +  8, 0x7d6802a6); // mflr r11
+  write32(buf + 12, 0x7c0803a6); // mtlr r0
+  write32(buf + 16, 0x7d8b6050); // subf r12, r11, r12
+  write32(buf + 20, 0x380cffcc); // subi r0,r12,52
+  write32(buf + 24, 0x7800f082); // srdi r0,r0,62,2
+  write32(buf + 28, 0xe98b002c); // ld   r12,44(r11)
+  write32(buf + 32, 0x7d6c5a14); // add  r11,r12,r11
+  write32(buf + 36, 0xe98b0000); // ld   r12,0(r11)
+  write32(buf + 40, 0xe96b0008); // ld   r11,8(r11)
+  write32(buf + 44, 0x7d8903a6); // mtctr   r12
+  write32(buf + 48, 0x4e800420); // bctr
 
   // The 'bcl' instruction will set the link register to the address of the
   // following instruction ('mflr r11'). Here we store the offset from that
   // instruction  to the first entry in the GotPlt section.
-  int64_t GotPltOffset = In.GotPlt->getVA() - (In.Plt->getVA() + 8);
-  write64(Buf + 52, GotPltOffset);
+  int64_t gotPltOffset = in.gotPlt->getVA() - (in.plt->getVA() + 8);
+  write64(buf + 52, gotPltOffset);
 }
 
-void PPC64::writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr,
-                     uint64_t PltEntryAddr, int32_t Index,
-                     unsigned RelOff) const {
-  int32_t Offset = PltHeaderSize + Index * PltEntrySize;
+void PPC64::writePlt(uint8_t *buf, uint64_t gotPltEntryAddr,
+                     uint64_t pltEntryAddr, int32_t index,
+                     unsigned relOff) const {
+  int32_t offset = pltHeaderSize + index * pltEntrySize;
   // bl __glink_PLTresolve
-  write32(Buf, 0x48000000 | ((-Offset) & 0x03FFFFFc));
+  write32(buf, 0x48000000 | ((-offset) & 0x03FFFFFc));
 }
 
-static std::pair<RelType, uint64_t> toAddr16Rel(RelType Type, uint64_t Val) {
+static std::pair<RelType, uint64_t> toAddr16Rel(RelType type, uint64_t val) {
   // Relocations relative to the toc-base need to be adjusted by the Toc offset.
-  uint64_t TocBiasedVal = Val - PPC64TocOffset;
+  uint64_t tocBiasedVal = val - ppc64TocOffset;
   // Relocations relative to dtv[dtpmod] need to be adjusted by the DTP offset.
-  uint64_t DTPBiasedVal = Val - DynamicThreadPointerOffset;
+  uint64_t dtpBiasedVal = val - dynamicThreadPointerOffset;
 
-  switch (Type) {
+  switch (type) {
   // TOC biased relocation.
   case R_PPC64_GOT16:
   case R_PPC64_GOT_TLSGD16:
   case R_PPC64_GOT_TLSLD16:
   case R_PPC64_TOC16:
-    return {R_PPC64_ADDR16, TocBiasedVal};
+    return {R_PPC64_ADDR16, tocBiasedVal};
   case R_PPC64_GOT16_DS:
   case R_PPC64_TOC16_DS:
   case R_PPC64_GOT_TPREL16_DS:
   case R_PPC64_GOT_DTPREL16_DS:
-    return {R_PPC64_ADDR16_DS, TocBiasedVal};
+    return {R_PPC64_ADDR16_DS, tocBiasedVal};
   case R_PPC64_GOT16_HA:
   case R_PPC64_GOT_TLSGD16_HA:
   case R_PPC64_GOT_TLSLD16_HA:
   case R_PPC64_GOT_TPREL16_HA:
   case R_PPC64_GOT_DTPREL16_HA:
   case R_PPC64_TOC16_HA:
-    return {R_PPC64_ADDR16_HA, TocBiasedVal};
+    return {R_PPC64_ADDR16_HA, tocBiasedVal};
   case R_PPC64_GOT16_HI:
   case R_PPC64_GOT_TLSGD16_HI:
   case R_PPC64_GOT_TLSLD16_HI:
   case R_PPC64_GOT_TPREL16_HI:
   case R_PPC64_GOT_DTPREL16_HI:
   case R_PPC64_TOC16_HI:
-    return {R_PPC64_ADDR16_HI, TocBiasedVal};
+    return {R_PPC64_ADDR16_HI, tocBiasedVal};
   case R_PPC64_GOT16_LO:
   case R_PPC64_GOT_TLSGD16_LO:
   case R_PPC64_GOT_TLSLD16_LO:
   case R_PPC64_TOC16_LO:
-    return {R_PPC64_ADDR16_LO, TocBiasedVal};
+    return {R_PPC64_ADDR16_LO, tocBiasedVal};
   case R_PPC64_GOT16_LO_DS:
   case R_PPC64_TOC16_LO_DS:
   case R_PPC64_GOT_TPREL16_LO_DS:
   case R_PPC64_GOT_DTPREL16_LO_DS:
-    return {R_PPC64_ADDR16_LO_DS, TocBiasedVal};
+    return {R_PPC64_ADDR16_LO_DS, tocBiasedVal};
 
   // Dynamic Thread pointer biased relocation types.
   case R_PPC64_DTPREL16:
-    return {R_PPC64_ADDR16, DTPBiasedVal};
+    return {R_PPC64_ADDR16, dtpBiasedVal};
   case R_PPC64_DTPREL16_DS:
-    return {R_PPC64_ADDR16_DS, DTPBiasedVal};
+    return {R_PPC64_ADDR16_DS, dtpBiasedVal};
   case R_PPC64_DTPREL16_HA:
-    return {R_PPC64_ADDR16_HA, DTPBiasedVal};
+    return {R_PPC64_ADDR16_HA, dtpBiasedVal};
   case R_PPC64_DTPREL16_HI:
-    return {R_PPC64_ADDR16_HI, DTPBiasedVal};
+    return {R_PPC64_ADDR16_HI, dtpBiasedVal};
   case R_PPC64_DTPREL16_HIGHER:
-    return {R_PPC64_ADDR16_HIGHER, DTPBiasedVal};
+    return {R_PPC64_ADDR16_HIGHER, dtpBiasedVal};
   case R_PPC64_DTPREL16_HIGHERA:
-    return {R_PPC64_ADDR16_HIGHERA, DTPBiasedVal};
+    return {R_PPC64_ADDR16_HIGHERA, dtpBiasedVal};
   case R_PPC64_DTPREL16_HIGHEST:
-    return {R_PPC64_ADDR16_HIGHEST, DTPBiasedVal};
+    return {R_PPC64_ADDR16_HIGHEST, dtpBiasedVal};
   case R_PPC64_DTPREL16_HIGHESTA:
-    return {R_PPC64_ADDR16_HIGHESTA, DTPBiasedVal};
+    return {R_PPC64_ADDR16_HIGHESTA, dtpBiasedVal};
   case R_PPC64_DTPREL16_LO:
-    return {R_PPC64_ADDR16_LO, DTPBiasedVal};
+    return {R_PPC64_ADDR16_LO, dtpBiasedVal};
   case R_PPC64_DTPREL16_LO_DS:
-    return {R_PPC64_ADDR16_LO_DS, DTPBiasedVal};
+    return {R_PPC64_ADDR16_LO_DS, dtpBiasedVal};
   case R_PPC64_DTPREL64:
-    return {R_PPC64_ADDR64, DTPBiasedVal};
+    return {R_PPC64_ADDR64, dtpBiasedVal};
 
   default:
-    return {Type, Val};
+    return {type, val};
   }
 }
 
-static bool isTocOptType(RelType Type) {
-  switch (Type) {
+static bool isTocOptType(RelType type) {
+  switch (type) {
   case R_PPC64_GOT16_HA:
   case R_PPC64_GOT16_LO_DS:
   case R_PPC64_TOC16_HA:
@@ -610,66 +737,69 @@ static bool isTocOptType(RelType Type) {
   }
 }
 
-void PPC64::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
+void PPC64::relocateOne(uint8_t *loc, RelType type, uint64_t val) const {
   // We need to save the original relocation type to use in diagnostics, and
   // use the original type to determine if we should toc-optimize the
   // instructions being relocated.
-  RelType OriginalType = Type;
-  bool ShouldTocOptimize =  isTocOptType(Type);
+  RelType originalType = type;
+  bool shouldTocOptimize =  isTocOptType(type);
   // For dynamic thread pointer relative, toc-relative, and got-indirect
   // relocations, proceed in terms of the corresponding ADDR16 relocation type.
-  std::tie(Type, Val) = toAddr16Rel(Type, Val);
+  std::tie(type, val) = toAddr16Rel(type, val);
 
-  switch (Type) {
+  switch (type) {
   case R_PPC64_ADDR14: {
-    checkAlignment(Loc, Val, 4, Type);
+    checkAlignment(loc, val, 4, type);
     // Preserve the AA/LK bits in the branch instruction
-    uint8_t AALK = Loc[3];
-    write16(Loc + 2, (AALK & 3) | (Val & 0xfffc));
+    uint8_t aalk = loc[3];
+    write16(loc + 2, (aalk & 3) | (val & 0xfffc));
     break;
   }
   case R_PPC64_ADDR16:
-  case R_PPC64_TPREL16:
-    checkInt(Loc, Val, 16, OriginalType);
-    write16(Loc, Val);
+    checkIntUInt(loc, val, 16, originalType);
+    write16(loc, val);
+    break;
+  case R_PPC64_ADDR32:
+    checkIntUInt(loc, val, 32, originalType);
+    write32(loc, val);
     break;
   case R_PPC64_ADDR16_DS:
   case R_PPC64_TPREL16_DS: {
-    checkInt(Loc, Val, 16, OriginalType);
+    checkInt(loc, val, 16, originalType);
     // DQ-form instructions use bits 28-31 as part of the instruction encoding
     // DS-form instructions only use bits 30-31.
-    uint16_t Mask = isDQFormInstruction(readInstrFromHalf16(Loc)) ? 0xF : 0x3;
-    checkAlignment(Loc, lo(Val), Mask + 1, OriginalType);
-    write16(Loc, (read16(Loc) & Mask) | lo(Val));
+    uint16_t mask = isDQFormInstruction(readFromHalf16(loc)) ? 0xf : 0x3;
+    checkAlignment(loc, lo(val), mask + 1, originalType);
+    write16(loc, (read16(loc) & mask) | lo(val));
   } break;
   case R_PPC64_ADDR16_HA:
   case R_PPC64_REL16_HA:
   case R_PPC64_TPREL16_HA:
-    if (Config->TocOptimize && ShouldTocOptimize && ha(Val) == 0)
-      writeInstrFromHalf16(Loc, 0x60000000);
+    if (config->tocOptimize && shouldTocOptimize && ha(val) == 0)
+      writeFromHalf16(loc, 0x60000000);
     else
-      write16(Loc, ha(Val));
+      write16(loc, ha(val));
     break;
   case R_PPC64_ADDR16_HI:
   case R_PPC64_REL16_HI:
   case R_PPC64_TPREL16_HI:
-    write16(Loc, hi(Val));
+    write16(loc, hi(val));
     break;
   case R_PPC64_ADDR16_HIGHER:
   case R_PPC64_TPREL16_HIGHER:
-    write16(Loc, higher(Val));
+    write16(loc, higher(val));
     break;
   case R_PPC64_ADDR16_HIGHERA:
   case R_PPC64_TPREL16_HIGHERA:
-    write16(Loc, highera(Val));
+    write16(loc, highera(val));
     break;
   case R_PPC64_ADDR16_HIGHEST:
   case R_PPC64_TPREL16_HIGHEST:
-    write16(Loc, highest(Val));
+    write16(loc, highest(val));
     break;
   case R_PPC64_ADDR16_HIGHESTA:
   case R_PPC64_TPREL16_HIGHESTA:
-    write16(Loc, highesta(Val));
+    write16(loc, highesta(val));
     break;
   case R_PPC64_ADDR16_LO:
   case R_PPC64_REL16_LO:
@@ -677,104 +807,119 @@ void PPC64::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
     // When the high-adjusted part of a toc relocation evalutes to 0, it is
     // changed into a nop. The lo part then needs to be updated to use the
     // toc-pointer register r2, as the base register.
-    if (Config->TocOptimize && ShouldTocOptimize && ha(Val) == 0) {
-      uint32_t Instr = readInstrFromHalf16(Loc);
-      if (isInstructionUpdateForm(Instr))
-        error(getErrorLocation(Loc) +
+    if (config->tocOptimize && shouldTocOptimize && ha(val) == 0) {
+      uint32_t insn = readFromHalf16(loc);
+      if (isInstructionUpdateForm(insn))
+        error(getErrorLocation(loc) +
               "can't toc-optimize an update instruction: 0x" +
-              utohexstr(Instr));
-      Instr = (Instr & 0xFFE00000) | 0x00020000;
-      writeInstrFromHalf16(Loc, Instr);
+              utohexstr(insn));
+      writeFromHalf16(loc, (insn & 0xffe00000) | 0x00020000 | lo(val));
+    } else {
+      write16(loc, lo(val));
     }
-    write16(Loc, lo(Val));
     break;
   case R_PPC64_ADDR16_LO_DS:
   case R_PPC64_TPREL16_LO_DS: {
     // DQ-form instructions use bits 28-31 as part of the instruction encoding
     // DS-form instructions only use bits 30-31.
-    uint32_t Inst = readInstrFromHalf16(Loc);
-    uint16_t Mask = isDQFormInstruction(Inst) ? 0xF : 0x3;
-    checkAlignment(Loc, lo(Val), Mask + 1, OriginalType);
-    if (Config->TocOptimize && ShouldTocOptimize && ha(Val) == 0) {
+    uint32_t insn = readFromHalf16(loc);
+    uint16_t mask = isDQFormInstruction(insn) ? 0xf : 0x3;
+    checkAlignment(loc, lo(val), mask + 1, originalType);
+    if (config->tocOptimize && shouldTocOptimize && ha(val) == 0) {
       // When the high-adjusted part of a toc relocation evalutes to 0, it is
       // changed into a nop. The lo part then needs to be updated to use the toc
       // pointer register r2, as the base register.
-      if (isInstructionUpdateForm(Inst))
-        error(getErrorLocation(Loc) +
+      if (isInstructionUpdateForm(insn))
+        error(getErrorLocation(loc) +
               "Can't toc-optimize an update instruction: 0x" +
-              Twine::utohexstr(Inst));
-      Inst = (Inst & 0xFFE0000F) | 0x00020000;
-      writeInstrFromHalf16(Loc, Inst);
+              Twine::utohexstr(insn));
+      insn &= 0xffe00000 | mask;
+      writeFromHalf16(loc, insn | 0x00020000 | lo(val));
+    } else {
+      write16(loc, (read16(loc) & mask) | lo(val));
     }
-    write16(Loc, (read16(Loc) & Mask) | lo(Val));
   } break;
-  case R_PPC64_ADDR32:
+  case R_PPC64_TPREL16:
+    checkInt(loc, val, 16, originalType);
+    write16(loc, val);
+    break;
   case R_PPC64_REL32:
-    checkInt(Loc, Val, 32, Type);
-    write32(Loc, Val);
+    checkInt(loc, val, 32, type);
+    write32(loc, val);
     break;
   case R_PPC64_ADDR64:
   case R_PPC64_REL64:
   case R_PPC64_TOC:
-    write64(Loc, Val);
+    write64(loc, val);
     break;
   case R_PPC64_REL14: {
-    uint32_t Mask = 0x0000FFFC;
-    checkInt(Loc, Val, 16, Type);
-    checkAlignment(Loc, Val, 4, Type);
-    write32(Loc, (read32(Loc) & ~Mask) | (Val & Mask));
+    uint32_t mask = 0x0000FFFC;
+    checkInt(loc, val, 16, type);
+    checkAlignment(loc, val, 4, type);
+    write32(loc, (read32(loc) & ~mask) | (val & mask));
     break;
   }
   case R_PPC64_REL24: {
-    uint32_t Mask = 0x03FFFFFC;
-    checkInt(Loc, Val, 26, Type);
-    checkAlignment(Loc, Val, 4, Type);
-    write32(Loc, (read32(Loc) & ~Mask) | (Val & Mask));
+    uint32_t mask = 0x03FFFFFC;
+    checkInt(loc, val, 26, type);
+    checkAlignment(loc, val, 4, type);
+    write32(loc, (read32(loc) & ~mask) | (val & mask));
     break;
   }
   case R_PPC64_DTPREL64:
-    write64(Loc, Val - DynamicThreadPointerOffset);
+    write64(loc, val - dynamicThreadPointerOffset);
     break;
   default:
-    error(getErrorLocation(Loc) + "unrecognized reloc " + Twine(Type));
+    error(getErrorLocation(loc) + "unrecognized relocation " + toString(type));
   }
 }
 
-bool PPC64::needsThunk(RelExpr Expr, RelType Type, const InputFile *File,
-                       uint64_t BranchAddr, const Symbol &S) const {
-  if (Type != R_PPC64_REL14 && Type != R_PPC64_REL24)
+bool PPC64::needsThunk(RelExpr expr, RelType type, const InputFile *file,
+                       uint64_t branchAddr, const Symbol &s) const {
+  if (type != R_PPC64_REL14 && type != R_PPC64_REL24)
     return false;
 
   // If a function is in the Plt it needs to be called with a call-stub.
-  if (S.isInPlt())
+  if (s.isInPlt())
     return true;
 
   // If a symbol is a weak undefined and we are compiling an executable
   // it doesn't need a range-extending thunk since it can't be called.
-  if (S.isUndefWeak() && !Config->Shared)
+  if (s.isUndefWeak() && !config->shared)
     return false;
 
   // If the offset exceeds the range of the branch type then it will need
   // a range-extending thunk.
-  return !inBranchRange(Type, BranchAddr, S.getVA());
+  // See the comment in getRelocTargetVA() about R_PPC64_CALL.
+  return !inBranchRange(type, branchAddr,
+                        s.getVA() +
+                            getPPC64GlobalEntryToLocalEntryOffset(s.stOther));
 }
 
-bool PPC64::inBranchRange(RelType Type, uint64_t Src, uint64_t Dst) const {
-  int64_t Offset = Dst - Src;
-  if (Type == R_PPC64_REL14)
-    return isInt<16>(Offset);
-  if (Type == R_PPC64_REL24)
-    return isInt<26>(Offset);
+uint32_t PPC64::getThunkSectionSpacing() const {
+  // See comment in Arch/ARM.cpp for a more detailed explanation of
+  // getThunkSectionSpacing(). For PPC64 we pick the constant here based on
+  // R_PPC64_REL24, which is used by unconditional branch instructions.
+  // 0x2000000 = (1 << 24-1) * 4
+  return 0x2000000;
+}
+
+bool PPC64::inBranchRange(RelType type, uint64_t src, uint64_t dst) const {
+  int64_t offset = dst - src;
+  if (type == R_PPC64_REL14)
+    return isInt<16>(offset);
+  if (type == R_PPC64_REL24)
+    return isInt<26>(offset);
   llvm_unreachable("unsupported relocation type used in branch");
 }
 
-RelExpr PPC64::adjustRelaxExpr(RelType Type, const uint8_t *Data,
-                               RelExpr Expr) const {
-  if (Expr == R_RELAX_TLS_GD_TO_IE)
+RelExpr PPC64::adjustRelaxExpr(RelType type, const uint8_t *data,
+                               RelExpr expr) const {
+  if (expr == R_RELAX_TLS_GD_TO_IE)
     return R_RELAX_TLS_GD_TO_IE_GOT_OFF;
-  if (Expr == R_RELAX_TLS_LD_TO_LE)
+  if (expr == R_RELAX_TLS_LD_TO_LE)
     return R_RELAX_TLS_LD_TO_LE_ABS;
-  return Expr;
+  return expr;
 }
 
 // Reference: 3.7.4.1 of the 64-bit ELF V2 abi supplement.
@@ -794,24 +939,25 @@ RelExpr PPC64::adjustRelaxExpr(RelType Type, const uint8_t *Data,
 //    thread pointer.
 // Since the nop must directly follow the call, the R_PPC64_TLSGD relocation is
 // used as the relaxation hint for both steps 2 and 3.
-void PPC64::relaxTlsGdToIe(uint8_t *Loc, RelType Type, uint64_t Val) const {
-  switch (Type) {
+void PPC64::relaxTlsGdToIe(uint8_t *loc, RelType type, uint64_t val) const {
+  switch (type) {
   case R_PPC64_GOT_TLSGD16_HA:
     // This is relaxed from addis rT, r2, sym@got@tlsgd@ha to
     //                      addis rT, r2, sym@got@tprel@ha.
-    relocateOne(Loc, R_PPC64_GOT_TPREL16_HA, Val);
+    relocateOne(loc, R_PPC64_GOT_TPREL16_HA, val);
     return;
+  case R_PPC64_GOT_TLSGD16:
   case R_PPC64_GOT_TLSGD16_LO: {
     // Relax from addi  r3, rA, sym@got@tlsgd@l to
     //            ld r3, sym@got@tprel@l(rA)
-    uint32_t InputRegister = (readInstrFromHalf16(Loc) & (0x1f << 16));
-    writeInstrFromHalf16(Loc, 0xE8600000 | InputRegister);
-    relocateOne(Loc, R_PPC64_GOT_TPREL16_LO_DS, Val);
+    uint32_t ra = (readFromHalf16(loc) & (0x1f << 16));
+    writeFromHalf16(loc, 0xe8600000 | ra);
+    relocateOne(loc, R_PPC64_GOT_TPREL16_LO_DS, val);
     return;
   }
   case R_PPC64_TLSGD:
-    write32(Loc, 0x60000000);     // bl __tls_get_addr(sym@tlsgd) --> nop
-    write32(Loc + 4, 0x7c636A14); // nop --> add r3, r3, r13
+    write32(loc, 0x60000000);     // bl __tls_get_addr(sym@tlsgd) --> nop
+    write32(loc + 4, 0x7c636A14); // nop --> add r3, r3, r13
     return;
   default:
     llvm_unreachable("unsupported relocation for TLS GD to IE relaxation");
@@ -846,86 +992,86 @@ void PPC64::relaxTlsGdToIe(uint8_t *Loc, RelType Type, uint64_t Val) const {
 // pair by split-stack-size-adjust.
 // addis r12, r1, ha(-stack-frame size - split-stack-adjust-size)
 // addi  r12, r12, l(-stack-frame size - split-stack-adjust-size)
-bool PPC64::adjustPrologueForCrossSplitStack(uint8_t *Loc, uint8_t *End,
-                                             uint8_t StOther) const {
+bool PPC64::adjustPrologueForCrossSplitStack(uint8_t *loc, uint8_t *end,
+                                             uint8_t stOther) const {
   // If the caller has a global entry point adjust the buffer past it. The start
   // of the split-stack prologue will be at the local entry point.
-  Loc += getPPC64GlobalEntryToLocalEntryOffset(StOther);
+  loc += getPPC64GlobalEntryToLocalEntryOffset(stOther);
 
   // At the very least we expect to see a load of some split-stack data from the
   // tcb, and 2 instructions that calculate the ending stack address this
   // function will require. If there is not enough room for at least 3
   // instructions it can't be a split-stack prologue.
-  if (Loc + 12 >= End)
+  if (loc + 12 >= end)
     return false;
 
   // First instruction must be `ld r0, -0x7000-64(r13)`
-  if (read32(Loc) != 0xe80d8fc0)
+  if (read32(loc) != 0xe80d8fc0)
     return false;
 
-  int16_t HiImm = 0;
-  int16_t LoImm = 0;
+  int16_t hiImm = 0;
+  int16_t loImm = 0;
   // First instruction can be either an addis if the frame size is larger then
   // 32K, or an addi if the size is less then 32K.
-  int32_t FirstInstr = read32(Loc + 4);
-  if (getPrimaryOpCode(FirstInstr) == 15) {
-    HiImm = FirstInstr & 0xFFFF;
-  } else if (getPrimaryOpCode(FirstInstr) == 14) {
-    LoImm = FirstInstr & 0xFFFF;
+  int32_t firstInstr = read32(loc + 4);
+  if (getPrimaryOpCode(firstInstr) == 15) {
+    hiImm = firstInstr & 0xFFFF;
+  } else if (getPrimaryOpCode(firstInstr) == 14) {
+    loImm = firstInstr & 0xFFFF;
   } else {
     return false;
   }
 
   // Second instruction is either an addi or a nop. If the first instruction was
   // an addi then LoImm is set and the second instruction must be a nop.
-  uint32_t SecondInstr = read32(Loc + 8);
-  if (!LoImm && getPrimaryOpCode(SecondInstr) == 14) {
-    LoImm = SecondInstr & 0xFFFF;
-  } else if (SecondInstr != 0x60000000) {
+  uint32_t secondInstr = read32(loc + 8);
+  if (!loImm && getPrimaryOpCode(secondInstr) == 14) {
+    loImm = secondInstr & 0xFFFF;
+  } else if (secondInstr != 0x60000000) {
     return false;
   }
 
   // The register operands of the first instruction should be the stack-pointer
   // (r1) as the input (RA) and r12 as the output (RT). If the second
   // instruction is not a nop, then it should use r12 as both input and output.
-  auto CheckRegOperands = [](uint32_t Instr, uint8_t ExpectedRT,
-                             uint8_t ExpectedRA) {
-    return ((Instr & 0x3E00000) >> 21 == ExpectedRT) &&
-           ((Instr & 0x1F0000) >> 16 == ExpectedRA);
+  auto checkRegOperands = [](uint32_t instr, uint8_t expectedRT,
+                             uint8_t expectedRA) {
+    return ((instr & 0x3E00000) >> 21 == expectedRT) &&
+           ((instr & 0x1F0000) >> 16 == expectedRA);
   };
-  if (!CheckRegOperands(FirstInstr, 12, 1))
+  if (!checkRegOperands(firstInstr, 12, 1))
     return false;
-  if (SecondInstr != 0x60000000 && !CheckRegOperands(SecondInstr, 12, 12))
+  if (secondInstr != 0x60000000 && !checkRegOperands(secondInstr, 12, 12))
     return false;
 
-  int32_t StackFrameSize = (HiImm * 65536) + LoImm;
+  int32_t stackFrameSize = (hiImm * 65536) + loImm;
   // Check that the adjusted size doesn't overflow what we can represent with 2
   // instructions.
-  if (StackFrameSize < Config->SplitStackAdjustSize + INT32_MIN) {
-    error(getErrorLocation(Loc) + "split-stack prologue adjustment overflows");
+  if (stackFrameSize < config->splitStackAdjustSize + INT32_MIN) {
+    error(getErrorLocation(loc) + "split-stack prologue adjustment overflows");
     return false;
   }
 
-  int32_t AdjustedStackFrameSize =
-      StackFrameSize - Config->SplitStackAdjustSize;
+  int32_t adjustedStackFrameSize =
+      stackFrameSize - config->splitStackAdjustSize;
 
-  LoImm = AdjustedStackFrameSize & 0xFFFF;
-  HiImm = (AdjustedStackFrameSize + 0x8000) >> 16;
-  if (HiImm) {
-    write32(Loc + 4, 0x3D810000 | (uint16_t)HiImm);
+  loImm = adjustedStackFrameSize & 0xFFFF;
+  hiImm = (adjustedStackFrameSize + 0x8000) >> 16;
+  if (hiImm) {
+    write32(loc + 4, 0x3D810000 | (uint16_t)hiImm);
     // If the low immediate is zero the second instruction will be a nop.
-    SecondInstr = LoImm ? 0x398C0000 | (uint16_t)LoImm : 0x60000000;
-    write32(Loc + 8, SecondInstr);
+    secondInstr = loImm ? 0x398C0000 | (uint16_t)loImm : 0x60000000;
+    write32(loc + 8, secondInstr);
   } else {
     // addi r12, r1, imm
-    write32(Loc + 4, (0x39810000) | (uint16_t)LoImm);
-    write32(Loc + 8, 0x60000000);
+    write32(loc + 4, (0x39810000) | (uint16_t)loImm);
+    write32(loc + 8, 0x60000000);
   }
 
   return true;
 }
 
 TargetInfo *elf::getPPC64TargetInfo() {
-  static PPC64 Target;
-  return &Target;
+  static PPC64 target;
+  return &target;
 }
diff --git a/deps/lld/ELF/Arch/RISCV.cpp b/deps/lld/ELF/Arch/RISCV.cpp
index 461e8d35c3e6c11d4ae1045b06598cf4140cf125..6f16ade57177314a3a877cfa91b706fbf96d139e 100644
--- a/deps/lld/ELF/Arch/RISCV.cpp
+++ b/deps/lld/ELF/Arch/RISCV.cpp
@@ -1,13 +1,13 @@
 //===- RISCV.cpp ----------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "InputFiles.h"
+#include "SyntheticSections.h"
 #include "Target.h"
 
 using namespace llvm;
@@ -23,59 +23,207 @@ class RISCV final : public TargetInfo {
 public:
   RISCV();
   uint32_t calcEFlags() const override;
-  RelExpr getRelExpr(RelType Type, const Symbol &S,
-                     const uint8_t *Loc) const override;
-  void relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const override;
+  void writeGotHeader(uint8_t *buf) const override;
+  void writeGotPlt(uint8_t *buf, const Symbol &s) const override;
+  void writePltHeader(uint8_t *buf) const override;
+  void writePlt(uint8_t *buf, uint64_t gotPltEntryAddr, uint64_t pltEntryAddr,
+                int32_t index, unsigned relOff) const override;
+  RelType getDynRel(RelType type) const override;
+  RelExpr getRelExpr(RelType type, const Symbol &s,
+                     const uint8_t *loc) const override;
+  void relocateOne(uint8_t *loc, RelType type, uint64_t val) const override;
 };
 
 } // end anonymous namespace
 
-RISCV::RISCV() { NoneRel = R_RISCV_NONE; }
+const uint64_t dtpOffset = 0x800;
 
-static uint32_t getEFlags(InputFile *F) {
-  if (Config->Is64)
-    return cast<ObjFile<ELF64LE>>(F)->getObj().getHeader()->e_flags;
-  return cast<ObjFile<ELF32LE>>(F)->getObj().getHeader()->e_flags;
+enum Op {
+  ADDI = 0x13,
+  AUIPC = 0x17,
+  JALR = 0x67,
+  LD = 0x3003,
+  LW = 0x2003,
+  SRLI = 0x5013,
+  SUB = 0x40000033,
+};
+
+enum Reg {
+  X_RA = 1,
+  X_T0 = 5,
+  X_T1 = 6,
+  X_T2 = 7,
+  X_T3 = 28,
+};
+
+static uint32_t hi20(uint32_t val) { return (val + 0x800) >> 12; }
+static uint32_t lo12(uint32_t val) { return val & 4095; }
+
+static uint32_t itype(uint32_t op, uint32_t rd, uint32_t rs1, uint32_t imm) {
+  return op | (rd << 7) | (rs1 << 15) | (imm << 20);
+}
+static uint32_t rtype(uint32_t op, uint32_t rd, uint32_t rs1, uint32_t rs2) {
+  return op | (rd << 7) | (rs1 << 15) | (rs2 << 20);
+}
+static uint32_t utype(uint32_t op, uint32_t rd, uint32_t imm) {
+  return op | (rd << 7) | (imm << 12);
+}
+
+RISCV::RISCV() {
+  copyRel = R_RISCV_COPY;
+  noneRel = R_RISCV_NONE;
+  pltRel = R_RISCV_JUMP_SLOT;
+  relativeRel = R_RISCV_RELATIVE;
+  if (config->is64) {
+    symbolicRel = R_RISCV_64;
+    tlsModuleIndexRel = R_RISCV_TLS_DTPMOD64;
+    tlsOffsetRel = R_RISCV_TLS_DTPREL64;
+    tlsGotRel = R_RISCV_TLS_TPREL64;
+  } else {
+    symbolicRel = R_RISCV_32;
+    tlsModuleIndexRel = R_RISCV_TLS_DTPMOD32;
+    tlsOffsetRel = R_RISCV_TLS_DTPREL32;
+    tlsGotRel = R_RISCV_TLS_TPREL32;
+  }
+  gotRel = symbolicRel;
+
+  // .got[0] = _DYNAMIC
+  gotBaseSymInGotPlt = false;
+  gotHeaderEntriesNum = 1;
+
+  // .got.plt[0] = _dl_runtime_resolve, .got.plt[1] = link_map
+  gotPltHeaderEntriesNum = 2;
+
+  pltEntrySize = 16;
+  pltHeaderSize = 32;
+}
+
+static uint32_t getEFlags(InputFile *f) {
+  if (config->is64)
+    return cast<ObjFile<ELF64LE>>(f)->getObj().getHeader()->e_flags;
+  return cast<ObjFile<ELF32LE>>(f)->getObj().getHeader()->e_flags;
 }
 
 uint32_t RISCV::calcEFlags() const {
-  assert(!ObjectFiles.empty());
+  assert(!objectFiles.empty());
 
-  uint32_t Target = getEFlags(ObjectFiles.front());
+  uint32_t target = getEFlags(objectFiles.front());
 
-  for (InputFile *F : ObjectFiles) {
-    uint32_t EFlags = getEFlags(F);
-    if (EFlags & EF_RISCV_RVC)
-      Target |= EF_RISCV_RVC;
+  for (InputFile *f : objectFiles) {
+    uint32_t eflags = getEFlags(f);
+    if (eflags & EF_RISCV_RVC)
+      target |= EF_RISCV_RVC;
 
-    if ((EFlags & EF_RISCV_FLOAT_ABI) != (Target & EF_RISCV_FLOAT_ABI))
-      error(toString(F) +
+    if ((eflags & EF_RISCV_FLOAT_ABI) != (target & EF_RISCV_FLOAT_ABI))
+      error(toString(f) +
             ": cannot link object files with different floating-point ABI");
 
-    if ((EFlags & EF_RISCV_RVE) != (Target & EF_RISCV_RVE))
-      error(toString(F) +
+    if ((eflags & EF_RISCV_RVE) != (target & EF_RISCV_RVE))
+      error(toString(f) +
             ": cannot link object files with different EF_RISCV_RVE");
   }
 
-  return Target;
+  return target;
 }
 
-RelExpr RISCV::getRelExpr(const RelType Type, const Symbol &S,
-                          const uint8_t *Loc) const {
-  switch (Type) {
+void RISCV::writeGotHeader(uint8_t *buf) const {
+  if (config->is64)
+    write64le(buf, mainPart->dynamic->getVA());
+  else
+    write32le(buf, mainPart->dynamic->getVA());
+}
+
+void RISCV::writeGotPlt(uint8_t *buf, const Symbol &s) const {
+  if (config->is64)
+    write64le(buf, in.plt->getVA());
+  else
+    write32le(buf, in.plt->getVA());
+}
+
+void RISCV::writePltHeader(uint8_t *buf) const {
+  // 1: auipc t2, %pcrel_hi(.got.plt)
+  // sub t1, t1, t3
+  // l[wd] t3, %pcrel_lo(1b)(t2); t3 = _dl_runtime_resolve
+  // addi t1, t1, -pltHeaderSize-12; t1 = &.plt[i] - &.plt[0]
+  // addi t0, t2, %pcrel_lo(1b)
+  // srli t1, t1, (rv64?1:2); t1 = &.got.plt[i] - &.got.plt[0]
+  // l[wd] t0, Wordsize(t0); t0 = link_map
+  // jr t3
+  uint32_t offset = in.gotPlt->getVA() - in.plt->getVA();
+  uint32_t load = config->is64 ? LD : LW;
+  write32le(buf + 0, utype(AUIPC, X_T2, hi20(offset)));
+  write32le(buf + 4, rtype(SUB, X_T1, X_T1, X_T3));
+  write32le(buf + 8, itype(load, X_T3, X_T2, lo12(offset)));
+  write32le(buf + 12, itype(ADDI, X_T1, X_T1, -target->pltHeaderSize - 12));
+  write32le(buf + 16, itype(ADDI, X_T0, X_T2, lo12(offset)));
+  write32le(buf + 20, itype(SRLI, X_T1, X_T1, config->is64 ? 1 : 2));
+  write32le(buf + 24, itype(load, X_T0, X_T0, config->wordsize));
+  write32le(buf + 28, itype(JALR, 0, X_T3, 0));
+}
+
+void RISCV::writePlt(uint8_t *buf, uint64_t gotPltEntryAddr,
+                     uint64_t pltEntryAddr, int32_t index,
+                     unsigned relOff) const {
+  // 1: auipc t3, %pcrel_hi(f@.got.plt)
+  // l[wd] t3, %pcrel_lo(1b)(t3)
+  // jalr t1, t3
+  // nop
+  uint32_t offset = gotPltEntryAddr - pltEntryAddr;
+  write32le(buf + 0, utype(AUIPC, X_T3, hi20(offset)));
+  write32le(buf + 4, itype(config->is64 ? LD : LW, X_T3, X_T3, lo12(offset)));
+  write32le(buf + 8, itype(JALR, X_T1, X_T3, 0));
+  write32le(buf + 12, itype(ADDI, 0, 0, 0));
+}
+
+RelType RISCV::getDynRel(RelType type) const {
+  return type == target->symbolicRel ? type
+                                     : static_cast<RelType>(R_RISCV_NONE);
+}
+
+RelExpr RISCV::getRelExpr(const RelType type, const Symbol &s,
+                          const uint8_t *loc) const {
+  switch (type) {
+  case R_RISCV_ADD8:
+  case R_RISCV_ADD16:
+  case R_RISCV_ADD32:
+  case R_RISCV_ADD64:
+  case R_RISCV_SET6:
+  case R_RISCV_SET8:
+  case R_RISCV_SET16:
+  case R_RISCV_SET32:
+  case R_RISCV_SUB6:
+  case R_RISCV_SUB8:
+  case R_RISCV_SUB16:
+  case R_RISCV_SUB32:
+  case R_RISCV_SUB64:
+    return R_RISCV_ADD;
   case R_RISCV_JAL:
   case R_RISCV_BRANCH:
-  case R_RISCV_CALL:
   case R_RISCV_PCREL_HI20:
   case R_RISCV_RVC_BRANCH:
   case R_RISCV_RVC_JUMP:
   case R_RISCV_32_PCREL:
     return R_PC;
+  case R_RISCV_CALL:
+  case R_RISCV_CALL_PLT:
+    return R_PLT_PC;
+  case R_RISCV_GOT_HI20:
+    return R_GOT_PC;
   case R_RISCV_PCREL_LO12_I:
   case R_RISCV_PCREL_LO12_S:
     return R_RISCV_PC_INDIRECT;
+  case R_RISCV_TLS_GD_HI20:
+    return R_TLSGD_PC;
+  case R_RISCV_TLS_GOT_HI20:
+    config->hasStaticTlsModel = true;
+    return R_GOT_PC;
+  case R_RISCV_TPREL_HI20:
+  case R_RISCV_TPREL_LO12_I:
+  case R_RISCV_TPREL_LO12_S:
+    return R_TLS;
   case R_RISCV_RELAX:
   case R_RISCV_ALIGN:
+  case R_RISCV_TPREL_ADD:
     return R_HINT;
   default:
     return R_ABS;
@@ -83,175 +231,190 @@ RelExpr RISCV::getRelExpr(const RelType Type, const Symbol &S,
 }
 
 // Extract bits V[Begin:End], where range is inclusive, and Begin must be < 63.
-static uint32_t extractBits(uint64_t V, uint32_t Begin, uint32_t End) {
-  return (V & ((1ULL << (Begin + 1)) - 1)) >> End;
+static uint32_t extractBits(uint64_t v, uint32_t begin, uint32_t end) {
+  return (v & ((1ULL << (begin + 1)) - 1)) >> end;
 }
 
-void RISCV::relocateOne(uint8_t *Loc, const RelType Type,
-                        const uint64_t Val) const {
-  switch (Type) {
+void RISCV::relocateOne(uint8_t *loc, const RelType type,
+                        const uint64_t val) const {
+  const unsigned bits = config->wordsize * 8;
+
+  switch (type) {
   case R_RISCV_32:
-    write32le(Loc, Val);
+    write32le(loc, val);
     return;
   case R_RISCV_64:
-    write64le(Loc, Val);
+    write64le(loc, val);
     return;
 
   case R_RISCV_RVC_BRANCH: {
-    checkInt(Loc, static_cast<int64_t>(Val) >> 1, 8, Type);
-    checkAlignment(Loc, Val, 2, Type);
-    uint16_t Insn = read16le(Loc) & 0xE383;
-    uint16_t Imm8 = extractBits(Val, 8, 8) << 12;
-    uint16_t Imm4_3 = extractBits(Val, 4, 3) << 10;
-    uint16_t Imm7_6 = extractBits(Val, 7, 6) << 5;
-    uint16_t Imm2_1 = extractBits(Val, 2, 1) << 3;
-    uint16_t Imm5 = extractBits(Val, 5, 5) << 2;
-    Insn |= Imm8 | Imm4_3 | Imm7_6 | Imm2_1 | Imm5;
+    checkInt(loc, static_cast<int64_t>(val) >> 1, 8, type);
+    checkAlignment(loc, val, 2, type);
+    uint16_t insn = read16le(loc) & 0xE383;
+    uint16_t imm8 = extractBits(val, 8, 8) << 12;
+    uint16_t imm4_3 = extractBits(val, 4, 3) << 10;
+    uint16_t imm7_6 = extractBits(val, 7, 6) << 5;
+    uint16_t imm2_1 = extractBits(val, 2, 1) << 3;
+    uint16_t imm5 = extractBits(val, 5, 5) << 2;
+    insn |= imm8 | imm4_3 | imm7_6 | imm2_1 | imm5;
 
-    write16le(Loc, Insn);
+    write16le(loc, insn);
     return;
   }
 
   case R_RISCV_RVC_JUMP: {
-    checkInt(Loc, static_cast<int64_t>(Val) >> 1, 11, Type);
-    checkAlignment(Loc, Val, 2, Type);
-    uint16_t Insn = read16le(Loc) & 0xE003;
-    uint16_t Imm11 = extractBits(Val, 11, 11) << 12;
-    uint16_t Imm4 = extractBits(Val, 4, 4) << 11;
-    uint16_t Imm9_8 = extractBits(Val, 9, 8) << 9;
-    uint16_t Imm10 = extractBits(Val, 10, 10) << 8;
-    uint16_t Imm6 = extractBits(Val, 6, 6) << 7;
-    uint16_t Imm7 = extractBits(Val, 7, 7) << 6;
-    uint16_t Imm3_1 = extractBits(Val, 3, 1) << 3;
-    uint16_t Imm5 = extractBits(Val, 5, 5) << 2;
-    Insn |= Imm11 | Imm4 | Imm9_8 | Imm10 | Imm6 | Imm7 | Imm3_1 | Imm5;
+    checkInt(loc, static_cast<int64_t>(val) >> 1, 11, type);
+    checkAlignment(loc, val, 2, type);
+    uint16_t insn = read16le(loc) & 0xE003;
+    uint16_t imm11 = extractBits(val, 11, 11) << 12;
+    uint16_t imm4 = extractBits(val, 4, 4) << 11;
+    uint16_t imm9_8 = extractBits(val, 9, 8) << 9;
+    uint16_t imm10 = extractBits(val, 10, 10) << 8;
+    uint16_t imm6 = extractBits(val, 6, 6) << 7;
+    uint16_t imm7 = extractBits(val, 7, 7) << 6;
+    uint16_t imm3_1 = extractBits(val, 3, 1) << 3;
+    uint16_t imm5 = extractBits(val, 5, 5) << 2;
+    insn |= imm11 | imm4 | imm9_8 | imm10 | imm6 | imm7 | imm3_1 | imm5;
 
-    write16le(Loc, Insn);
+    write16le(loc, insn);
     return;
   }
 
   case R_RISCV_RVC_LUI: {
-    int32_t Imm = ((Val + 0x800) >> 12);
-    checkUInt(Loc, Imm, 6, Type);
-    if (Imm == 0) { // `c.lui rd, 0` is illegal, convert to `c.li rd, 0`
-      write16le(Loc, (read16le(Loc) & 0x0F83) | 0x4000);
+    int64_t imm = SignExtend64(val + 0x800, bits) >> 12;
+    checkInt(loc, imm, 6, type);
+    if (imm == 0) { // `c.lui rd, 0` is illegal, convert to `c.li rd, 0`
+      write16le(loc, (read16le(loc) & 0x0F83) | 0x4000);
     } else {
-      uint16_t Imm17 = extractBits(Val + 0x800, 17, 17) << 12;
-      uint16_t Imm16_12 = extractBits(Val + 0x800, 16, 12) << 2;
-      write16le(Loc, (read16le(Loc) & 0xEF83) | Imm17 | Imm16_12);
+      uint16_t imm17 = extractBits(val + 0x800, 17, 17) << 12;
+      uint16_t imm16_12 = extractBits(val + 0x800, 16, 12) << 2;
+      write16le(loc, (read16le(loc) & 0xEF83) | imm17 | imm16_12);
     }
     return;
   }
 
   case R_RISCV_JAL: {
-    checkInt(Loc, static_cast<int64_t>(Val) >> 1, 20, Type);
-    checkAlignment(Loc, Val, 2, Type);
+    checkInt(loc, static_cast<int64_t>(val) >> 1, 20, type);
+    checkAlignment(loc, val, 2, type);
 
-    uint32_t Insn = read32le(Loc) & 0xFFF;
-    uint32_t Imm20 = extractBits(Val, 20, 20) << 31;
-    uint32_t Imm10_1 = extractBits(Val, 10, 1) << 21;
-    uint32_t Imm11 = extractBits(Val, 11, 11) << 20;
-    uint32_t Imm19_12 = extractBits(Val, 19, 12) << 12;
-    Insn |= Imm20 | Imm10_1 | Imm11 | Imm19_12;
+    uint32_t insn = read32le(loc) & 0xFFF;
+    uint32_t imm20 = extractBits(val, 20, 20) << 31;
+    uint32_t imm10_1 = extractBits(val, 10, 1) << 21;
+    uint32_t imm11 = extractBits(val, 11, 11) << 20;
+    uint32_t imm19_12 = extractBits(val, 19, 12) << 12;
+    insn |= imm20 | imm10_1 | imm11 | imm19_12;
 
-    write32le(Loc, Insn);
+    write32le(loc, insn);
     return;
   }
 
   case R_RISCV_BRANCH: {
-    checkInt(Loc, static_cast<int64_t>(Val) >> 1, 12, Type);
-    checkAlignment(Loc, Val, 2, Type);
+    checkInt(loc, static_cast<int64_t>(val) >> 1, 12, type);
+    checkAlignment(loc, val, 2, type);
 
-    uint32_t Insn = read32le(Loc) & 0x1FFF07F;
-    uint32_t Imm12 = extractBits(Val, 12, 12) << 31;
-    uint32_t Imm10_5 = extractBits(Val, 10, 5) << 25;
-    uint32_t Imm4_1 = extractBits(Val, 4, 1) << 8;
-    uint32_t Imm11 = extractBits(Val, 11, 11) << 7;
-    Insn |= Imm12 | Imm10_5 | Imm4_1 | Imm11;
+    uint32_t insn = read32le(loc) & 0x1FFF07F;
+    uint32_t imm12 = extractBits(val, 12, 12) << 31;
+    uint32_t imm10_5 = extractBits(val, 10, 5) << 25;
+    uint32_t imm4_1 = extractBits(val, 4, 1) << 8;
+    uint32_t imm11 = extractBits(val, 11, 11) << 7;
+    insn |= imm12 | imm10_5 | imm4_1 | imm11;
 
-    write32le(Loc, Insn);
+    write32le(loc, insn);
     return;
   }
 
   // auipc + jalr pair
-  case R_RISCV_CALL: {
-    checkInt(Loc, Val, 32, Type);
-    if (isInt<32>(Val)) {
-      relocateOne(Loc, R_RISCV_PCREL_HI20, Val);
-      relocateOne(Loc + 4, R_RISCV_PCREL_LO12_I, Val);
+  case R_RISCV_CALL:
+  case R_RISCV_CALL_PLT: {
+    int64_t hi = SignExtend64(val + 0x800, bits) >> 12;
+    checkInt(loc, hi, 20, type);
+    if (isInt<20>(hi)) {
+      relocateOne(loc, R_RISCV_PCREL_HI20, val);
+      relocateOne(loc + 4, R_RISCV_PCREL_LO12_I, val);
     }
     return;
   }
 
+  case R_RISCV_GOT_HI20:
   case R_RISCV_PCREL_HI20:
+  case R_RISCV_TLS_GD_HI20:
+  case R_RISCV_TLS_GOT_HI20:
+  case R_RISCV_TPREL_HI20:
   case R_RISCV_HI20: {
-    checkInt(Loc, Val, 32, Type);
-    uint32_t Hi = Val + 0x800;
-    write32le(Loc, (read32le(Loc) & 0xFFF) | (Hi & 0xFFFFF000));
+    uint64_t hi = val + 0x800;
+    checkInt(loc, SignExtend64(hi, bits) >> 12, 20, type);
+    write32le(loc, (read32le(loc) & 0xFFF) | (hi & 0xFFFFF000));
     return;
   }
 
   case R_RISCV_PCREL_LO12_I:
+  case R_RISCV_TPREL_LO12_I:
   case R_RISCV_LO12_I: {
-    checkInt(Loc, Val, 32, Type);
-    uint32_t Hi = Val + 0x800;
-    uint32_t Lo = Val - (Hi & 0xFFFFF000);
-    write32le(Loc, (read32le(Loc) & 0xFFFFF) | ((Lo & 0xFFF) << 20));
+    uint64_t hi = (val + 0x800) >> 12;
+    uint64_t lo = val - (hi << 12);
+    write32le(loc, (read32le(loc) & 0xFFFFF) | ((lo & 0xFFF) << 20));
     return;
   }
 
   case R_RISCV_PCREL_LO12_S:
+  case R_RISCV_TPREL_LO12_S:
   case R_RISCV_LO12_S: {
-    checkInt(Loc, Val, 32, Type);
-    uint32_t Hi = Val + 0x800;
-    uint32_t Lo = Val - (Hi & 0xFFFFF000);
-    uint32_t Imm11_5 = extractBits(Lo, 11, 5) << 25;
-    uint32_t Imm4_0 = extractBits(Lo, 4, 0) << 7;
-    write32le(Loc, (read32le(Loc) & 0x1FFF07F) | Imm11_5 | Imm4_0);
+    uint64_t hi = (val + 0x800) >> 12;
+    uint64_t lo = val - (hi << 12);
+    uint32_t imm11_5 = extractBits(lo, 11, 5) << 25;
+    uint32_t imm4_0 = extractBits(lo, 4, 0) << 7;
+    write32le(loc, (read32le(loc) & 0x1FFF07F) | imm11_5 | imm4_0);
     return;
   }
 
   case R_RISCV_ADD8:
-    *Loc += Val;
+    *loc += val;
     return;
   case R_RISCV_ADD16:
-    write16le(Loc, read16le(Loc) + Val);
+    write16le(loc, read16le(loc) + val);
     return;
   case R_RISCV_ADD32:
-    write32le(Loc, read32le(Loc) + Val);
+    write32le(loc, read32le(loc) + val);
     return;
   case R_RISCV_ADD64:
-    write64le(Loc, read64le(Loc) + Val);
+    write64le(loc, read64le(loc) + val);
     return;
   case R_RISCV_SUB6:
-    *Loc = (*Loc & 0xc0) | (((*Loc & 0x3f) - Val) & 0x3f);
+    *loc = (*loc & 0xc0) | (((*loc & 0x3f) - val) & 0x3f);
     return;
   case R_RISCV_SUB8:
-    *Loc -= Val;
+    *loc -= val;
     return;
   case R_RISCV_SUB16:
-    write16le(Loc, read16le(Loc) - Val);
+    write16le(loc, read16le(loc) - val);
     return;
   case R_RISCV_SUB32:
-    write32le(Loc, read32le(Loc) - Val);
+    write32le(loc, read32le(loc) - val);
     return;
   case R_RISCV_SUB64:
-    write64le(Loc, read64le(Loc) - Val);
+    write64le(loc, read64le(loc) - val);
     return;
   case R_RISCV_SET6:
-    *Loc = (*Loc & 0xc0) | (Val & 0x3f);
+    *loc = (*loc & 0xc0) | (val & 0x3f);
     return;
   case R_RISCV_SET8:
-    *Loc = Val;
+    *loc = val;
     return;
   case R_RISCV_SET16:
-    write16le(Loc, Val);
+    write16le(loc, val);
     return;
   case R_RISCV_SET32:
   case R_RISCV_32_PCREL:
-    write32le(Loc, Val);
+    write32le(loc, val);
     return;
 
+  case R_RISCV_TLS_DTPREL32:
+    write32le(loc, val - dtpOffset);
+    break;
+  case R_RISCV_TLS_DTPREL64:
+    write64le(loc, val - dtpOffset);
+    break;
+
   case R_RISCV_ALIGN:
   case R_RISCV_RELAX:
     return; // Ignored (for now)
@@ -267,13 +430,13 @@ void RISCV::relocateOne(uint8_t *Loc, const RelType Type,
   case R_RISCV_GPREL_I:
   case R_RISCV_GPREL_S:
   default:
-    error(getErrorLocation(Loc) +
-          "unimplemented relocation: " + toString(Type));
+    error(getErrorLocation(loc) +
+          "unimplemented relocation: " + toString(type));
     return;
   }
 }
 
 TargetInfo *elf::getRISCVTargetInfo() {
-  static RISCV Target;
-  return &Target;
+  static RISCV target;
+  return &target;
 }
diff --git a/deps/lld/ELF/Arch/SPARCV9.cpp b/deps/lld/ELF/Arch/SPARCV9.cpp
index 831aa2028e7fdd99005eeae5a75f287f96509207..5299206dd919f3bad484c754ad6c97c14f15812a 100644
--- a/deps/lld/ELF/Arch/SPARCV9.cpp
+++ b/deps/lld/ELF/Arch/SPARCV9.cpp
@@ -1,9 +1,8 @@
 //===- SPARCV9.cpp --------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -24,32 +23,32 @@ namespace {
 class SPARCV9 final : public TargetInfo {
 public:
   SPARCV9();
-  RelExpr getRelExpr(RelType Type, const Symbol &S,
-                     const uint8_t *Loc) const override;
-  void writePlt(uint8_t *Buf, uint64_t GotEntryAddr, uint64_t PltEntryAddr,
-                int32_t Index, unsigned RelOff) const override;
-  void relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const override;
+  RelExpr getRelExpr(RelType type, const Symbol &s,
+                     const uint8_t *loc) const override;
+  void writePlt(uint8_t *buf, uint64_t gotEntryAddr, uint64_t pltEntryAddr,
+                int32_t index, unsigned relOff) const override;
+  void relocateOne(uint8_t *loc, RelType type, uint64_t val) const override;
 };
 } // namespace
 
 SPARCV9::SPARCV9() {
-  CopyRel = R_SPARC_COPY;
-  GotRel = R_SPARC_GLOB_DAT;
-  NoneRel = R_SPARC_NONE;
-  PltRel = R_SPARC_JMP_SLOT;
-  RelativeRel = R_SPARC_RELATIVE;
-  GotEntrySize = 8;
-  PltEntrySize = 32;
-  PltHeaderSize = 4 * PltEntrySize;
+  copyRel = R_SPARC_COPY;
+  gotRel = R_SPARC_GLOB_DAT;
+  noneRel = R_SPARC_NONE;
+  pltRel = R_SPARC_JMP_SLOT;
+  relativeRel = R_SPARC_RELATIVE;
+  symbolicRel = R_SPARC_64;
+  pltEntrySize = 32;
+  pltHeaderSize = 4 * pltEntrySize;
 
-  PageSize = 8192;
-  DefaultMaxPageSize = 0x100000;
-  DefaultImageBase = 0x100000;
+  defaultCommonPageSize = 8192;
+  defaultMaxPageSize = 0x100000;
+  defaultImageBase = 0x100000;
 }
 
-RelExpr SPARCV9::getRelExpr(RelType Type, const Symbol &S,
-                            const uint8_t *Loc) const {
-  switch (Type) {
+RelExpr SPARCV9::getRelExpr(RelType type, const Symbol &s,
+                            const uint8_t *loc) const {
+  switch (type) {
   case R_SPARC_32:
   case R_SPARC_UA32:
   case R_SPARC_64:
@@ -69,64 +68,65 @@ RelExpr SPARCV9::getRelExpr(RelType Type, const Symbol &S,
   case R_SPARC_NONE:
     return R_NONE;
   default:
-    return R_INVALID;
+    error(getErrorLocation(loc) + "unknown relocation (" + Twine(type) +
+          ") against symbol " + toString(s));
+    return R_NONE;
   }
 }
 
-void SPARCV9::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
-  switch (Type) {
+void SPARCV9::relocateOne(uint8_t *loc, RelType type, uint64_t val) const {
+  switch (type) {
   case R_SPARC_32:
   case R_SPARC_UA32:
     // V-word32
-    checkUInt(Loc, Val, 32, Type);
-    write32be(Loc, Val);
+    checkUInt(loc, val, 32, type);
+    write32be(loc, val);
     break;
   case R_SPARC_DISP32:
     // V-disp32
-    checkInt(Loc, Val, 32, Type);
-    write32be(Loc, Val);
+    checkInt(loc, val, 32, type);
+    write32be(loc, val);
     break;
   case R_SPARC_WDISP30:
   case R_SPARC_WPLT30:
     // V-disp30
-    checkInt(Loc, Val, 32, Type);
-    write32be(Loc, (read32be(Loc) & ~0x3fffffff) | ((Val >> 2) & 0x3fffffff));
+    checkInt(loc, val, 32, type);
+    write32be(loc, (read32be(loc) & ~0x3fffffff) | ((val >> 2) & 0x3fffffff));
     break;
   case R_SPARC_22:
     // V-imm22
-    checkUInt(Loc, Val, 22, Type);
-    write32be(Loc, (read32be(Loc) & ~0x003fffff) | (Val & 0x003fffff));
+    checkUInt(loc, val, 22, type);
+    write32be(loc, (read32be(loc) & ~0x003fffff) | (val & 0x003fffff));
     break;
   case R_SPARC_GOT22:
   case R_SPARC_PC22:
     // T-imm22
-    write32be(Loc, (read32be(Loc) & ~0x003fffff) | ((Val >> 10) & 0x003fffff));
+    write32be(loc, (read32be(loc) & ~0x003fffff) | ((val >> 10) & 0x003fffff));
     break;
   case R_SPARC_WDISP19:
     // V-disp19
-    checkInt(Loc, Val, 21, Type);
-    write32be(Loc, (read32be(Loc) & ~0x0007ffff) | ((Val >> 2) & 0x0007ffff));
+    checkInt(loc, val, 21, type);
+    write32be(loc, (read32be(loc) & ~0x0007ffff) | ((val >> 2) & 0x0007ffff));
     break;
   case R_SPARC_GOT10:
   case R_SPARC_PC10:
     // T-simm10
-    write32be(Loc, (read32be(Loc) & ~0x000003ff) | (Val & 0x000003ff));
+    write32be(loc, (read32be(loc) & ~0x000003ff) | (val & 0x000003ff));
     break;
   case R_SPARC_64:
   case R_SPARC_UA64:
-  case R_SPARC_GLOB_DAT:
     // V-xword64
-    write64be(Loc, Val);
+    write64be(loc, val);
     break;
   default:
-    error(getErrorLocation(Loc) + "unrecognized reloc " + Twine(Type));
+    llvm_unreachable("unknown relocation");
   }
 }
 
-void SPARCV9::writePlt(uint8_t *Buf, uint64_t GotEntryAddr,
-                       uint64_t PltEntryAddr, int32_t Index,
-                       unsigned RelOff) const {
-  const uint8_t PltData[] = {
+void SPARCV9::writePlt(uint8_t *buf, uint64_t gotEntryAddr,
+                       uint64_t pltEntryAddr, int32_t index,
+                       unsigned relOff) const {
+  const uint8_t pltData[] = {
       0x03, 0x00, 0x00, 0x00, // sethi   (. - .PLT0), %g1
       0x30, 0x68, 0x00, 0x00, // ba,a    %xcc, .PLT1
       0x01, 0x00, 0x00, 0x00, // nop
@@ -136,14 +136,14 @@ void SPARCV9::writePlt(uint8_t *Buf, uint64_t GotEntryAddr,
       0x01, 0x00, 0x00, 0x00, // nop
       0x01, 0x00, 0x00, 0x00  // nop
   };
-  memcpy(Buf, PltData, sizeof(PltData));
+  memcpy(buf, pltData, sizeof(pltData));
 
-  uint64_t Off = getPltEntryOffset(Index);
-  relocateOne(Buf, R_SPARC_22, Off);
-  relocateOne(Buf + 4, R_SPARC_WDISP19, -(Off + 4 - PltEntrySize));
+  uint64_t off = pltHeaderSize + pltEntrySize * index;
+  relocateOne(buf, R_SPARC_22, off);
+  relocateOne(buf + 4, R_SPARC_WDISP19, -(off + 4 - pltEntrySize));
 }
 
 TargetInfo *elf::getSPARCV9TargetInfo() {
-  static SPARCV9 Target;
-  return &Target;
+  static SPARCV9 target;
+  return &target;
 }
diff --git a/deps/lld/ELF/Arch/X86.cpp b/deps/lld/ELF/Arch/X86.cpp
index e910375d2fc75b8269ae93223a67a679a42f0a29..e1dd231e8e8d4658021fdeae119ca9e3c24da4c3 100644
--- a/deps/lld/ELF/Arch/X86.cpp
+++ b/deps/lld/ELF/Arch/X86.cpp
@@ -1,9 +1,8 @@
 //===- X86.cpp ------------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -24,63 +23,73 @@ namespace {
 class X86 : public TargetInfo {
 public:
   X86();
-  RelExpr getRelExpr(RelType Type, const Symbol &S,
-                     const uint8_t *Loc) const override;
-  int64_t getImplicitAddend(const uint8_t *Buf, RelType Type) const override;
-  void writeGotPltHeader(uint8_t *Buf) const override;
-  RelType getDynRel(RelType Type) const override;
-  void writeGotPlt(uint8_t *Buf, const Symbol &S) const override;
-  void writeIgotPlt(uint8_t *Buf, const Symbol &S) const override;
-  void writePltHeader(uint8_t *Buf) const override;
-  void writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr, uint64_t PltEntryAddr,
-                int32_t Index, unsigned RelOff) const override;
-  void relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const override;
+  int getTlsGdRelaxSkip(RelType type) const override;
+  RelExpr getRelExpr(RelType type, const Symbol &s,
+                     const uint8_t *loc) const override;
+  int64_t getImplicitAddend(const uint8_t *buf, RelType type) const override;
+  void writeGotPltHeader(uint8_t *buf) const override;
+  RelType getDynRel(RelType type) const override;
+  void writeGotPlt(uint8_t *buf, const Symbol &s) const override;
+  void writeIgotPlt(uint8_t *buf, const Symbol &s) const override;
+  void writePltHeader(uint8_t *buf) const override;
+  void writePlt(uint8_t *buf, uint64_t gotPltEntryAddr, uint64_t pltEntryAddr,
+                int32_t index, unsigned relOff) const override;
+  void relocateOne(uint8_t *loc, RelType type, uint64_t val) const override;
 
-  RelExpr adjustRelaxExpr(RelType Type, const uint8_t *Data,
-                          RelExpr Expr) const override;
-  void relaxTlsGdToIe(uint8_t *Loc, RelType Type, uint64_t Val) const override;
-  void relaxTlsGdToLe(uint8_t *Loc, RelType Type, uint64_t Val) const override;
-  void relaxTlsIeToLe(uint8_t *Loc, RelType Type, uint64_t Val) const override;
-  void relaxTlsLdToLe(uint8_t *Loc, RelType Type, uint64_t Val) const override;
+  RelExpr adjustRelaxExpr(RelType type, const uint8_t *data,
+                          RelExpr expr) const override;
+  void relaxTlsGdToIe(uint8_t *loc, RelType type, uint64_t val) const override;
+  void relaxTlsGdToLe(uint8_t *loc, RelType type, uint64_t val) const override;
+  void relaxTlsIeToLe(uint8_t *loc, RelType type, uint64_t val) const override;
+  void relaxTlsLdToLe(uint8_t *loc, RelType type, uint64_t val) const override;
 };
 } // namespace
 
 X86::X86() {
-  CopyRel = R_386_COPY;
-  GotRel = R_386_GLOB_DAT;
-  NoneRel = R_386_NONE;
-  PltRel = R_386_JUMP_SLOT;
-  IRelativeRel = R_386_IRELATIVE;
-  RelativeRel = R_386_RELATIVE;
-  TlsGotRel = R_386_TLS_TPOFF;
-  TlsModuleIndexRel = R_386_TLS_DTPMOD32;
-  TlsOffsetRel = R_386_TLS_DTPOFF32;
-  GotEntrySize = 4;
-  GotPltEntrySize = 4;
-  PltEntrySize = 16;
-  PltHeaderSize = 16;
-  TlsGdRelaxSkip = 2;
-  TrapInstr = {0xcc, 0xcc, 0xcc, 0xcc}; // 0xcc = INT3
+  copyRel = R_386_COPY;
+  gotRel = R_386_GLOB_DAT;
+  noneRel = R_386_NONE;
+  pltRel = R_386_JUMP_SLOT;
+  iRelativeRel = R_386_IRELATIVE;
+  relativeRel = R_386_RELATIVE;
+  symbolicRel = R_386_32;
+  tlsGotRel = R_386_TLS_TPOFF;
+  tlsModuleIndexRel = R_386_TLS_DTPMOD32;
+  tlsOffsetRel = R_386_TLS_DTPOFF32;
+  pltEntrySize = 16;
+  pltHeaderSize = 16;
+  trapInstr = {0xcc, 0xcc, 0xcc, 0xcc}; // 0xcc = INT3
 
   // Align to the non-PAE large page size (known as a superpage or huge page).
   // FreeBSD automatically promotes large, superpage-aligned allocations.
-  DefaultImageBase = 0x400000;
+  defaultImageBase = 0x400000;
 }
 
-static bool hasBaseReg(uint8_t ModRM) { return (ModRM & 0xc7) != 0x5; }
+int X86::getTlsGdRelaxSkip(RelType type) const {
+  return 2;
+}
+
+RelExpr X86::getRelExpr(RelType type, const Symbol &s,
+                        const uint8_t *loc) const {
+  // There are 4 different TLS variable models with varying degrees of
+  // flexibility and performance. LocalExec and InitialExec models are fast but
+  // less-flexible models. If they are in use, we set DF_STATIC_TLS flag in the
+  // dynamic section to let runtime know about that.
+  if (type == R_386_TLS_LE || type == R_386_TLS_LE_32 || type == R_386_TLS_IE ||
+      type == R_386_TLS_GOTIE)
+    config->hasStaticTlsModel = true;
 
-RelExpr X86::getRelExpr(RelType Type, const Symbol &S,
-                        const uint8_t *Loc) const {
-  switch (Type) {
+  switch (type) {
   case R_386_8:
   case R_386_16:
   case R_386_32:
-  case R_386_TLS_LDO_32:
     return R_ABS;
+  case R_386_TLS_LDO_32:
+    return R_DTPREL;
   case R_386_TLS_GD:
-    return R_TLSGD_GOT_FROM_END;
+    return R_TLSGD_GOTPLT;
   case R_386_TLS_LDM:
-    return R_TLSLD_GOT_FROM_END;
+    return R_TLSLD_GOTPLT;
   case R_386_PLT32:
     return R_PLT_PC;
   case R_386_PC8:
@@ -88,7 +97,7 @@ RelExpr X86::getRelExpr(RelType Type, const Symbol &S,
   case R_386_PC32:
     return R_PC;
   case R_386_GOTPC:
-    return R_GOTONLY_PC_FROM_END;
+    return R_GOTPLTONLY_PC;
   case R_386_TLS_IE:
     return R_GOT;
   case R_386_GOT32:
@@ -108,14 +117,14 @@ RelExpr X86::getRelExpr(RelType Type, const Symbol &S,
     // load an GOT address to a register, which is usually %ebx.
     //
     // So, there are two ways to refer to symbol foo's GOT entry: foo@GOT or
-    // foo@GOT(%reg).
+    // foo@GOT(%ebx).
     //
     // foo@GOT is not usable in PIC. If we are creating a PIC output and if we
     // find such relocation, we should report an error. foo@GOT is resolved to
     // an *absolute* address of foo's GOT entry, because both GOT address and
     // foo's offset are known. In other words, it's G + A.
     //
-    // foo@GOT(%reg) needs to be resolved to a *relative* offset from a GOT to
+    // foo@GOT(%ebx) needs to be resolved to a *relative* offset from a GOT to
     // foo's GOT entry in the table, because GOT address is not known but foo's
     // offset in the table is known. It's G + A - GOT.
     //
@@ -123,16 +132,16 @@ RelExpr X86::getRelExpr(RelType Type, const Symbol &S,
     // different use cases. In order to distinguish them, we have to read a
     // machine instruction.
     //
-    // The following code implements it. We assume that Loc[0] is the first
-    // byte of a displacement or an immediate field of a valid machine
+    // The following code implements it. We assume that Loc[0] is the first byte
+    // of a displacement or an immediate field of a valid machine
     // instruction. That means a ModRM byte is at Loc[-1]. By taking a look at
-    // the byte, we can determine whether the instruction is register-relative
-    // (i.e. it was generated for foo@GOT(%reg)) or absolute (i.e. foo@GOT).
-    return hasBaseReg(Loc[-1]) ? R_GOT_FROM_END : R_GOT;
+    // the byte, we can determine whether the instruction uses the operand as an
+    // absolute address (R_GOT) or a register-relative address (R_GOTPLT).
+    return (loc[-1] & 0xc7) == 0x5 ? R_GOT : R_GOTPLT;
   case R_386_TLS_GOTIE:
-    return R_GOT_FROM_END;
+    return R_GOTPLT;
   case R_386_GOTOFF:
-    return R_GOTREL_FROM_END;
+    return R_GOTPLTREL;
   case R_386_TLS_LE:
     return R_TLS;
   case R_386_TLS_LE_32:
@@ -140,105 +149,102 @@ RelExpr X86::getRelExpr(RelType Type, const Symbol &S,
   case R_386_NONE:
     return R_NONE;
   default:
-    return R_INVALID;
+    error(getErrorLocation(loc) + "unknown relocation (" + Twine(type) +
+          ") against symbol " + toString(s));
+    return R_NONE;
   }
 }
 
-RelExpr X86::adjustRelaxExpr(RelType Type, const uint8_t *Data,
-                             RelExpr Expr) const {
-  switch (Expr) {
+RelExpr X86::adjustRelaxExpr(RelType type, const uint8_t *data,
+                             RelExpr expr) const {
+  switch (expr) {
   default:
-    return Expr;
+    return expr;
   case R_RELAX_TLS_GD_TO_IE:
-    return R_RELAX_TLS_GD_TO_IE_END;
+    return R_RELAX_TLS_GD_TO_IE_GOTPLT;
   case R_RELAX_TLS_GD_TO_LE:
     return R_RELAX_TLS_GD_TO_LE_NEG;
   }
 }
 
-void X86::writeGotPltHeader(uint8_t *Buf) const {
-  write32le(Buf, In.Dynamic->getVA());
+void X86::writeGotPltHeader(uint8_t *buf) const {
+  write32le(buf, mainPart->dynamic->getVA());
 }
 
-void X86::writeGotPlt(uint8_t *Buf, const Symbol &S) const {
+void X86::writeGotPlt(uint8_t *buf, const Symbol &s) const {
   // Entries in .got.plt initially points back to the corresponding
   // PLT entries with a fixed offset to skip the first instruction.
-  write32le(Buf, S.getPltVA() + 6);
+  write32le(buf, s.getPltVA() + 6);
 }
 
-void X86::writeIgotPlt(uint8_t *Buf, const Symbol &S) const {
+void X86::writeIgotPlt(uint8_t *buf, const Symbol &s) const {
   // An x86 entry is the address of the ifunc resolver function.
-  write32le(Buf, S.getVA());
+  write32le(buf, s.getVA());
 }
 
-RelType X86::getDynRel(RelType Type) const {
-  if (Type == R_386_TLS_LE)
+RelType X86::getDynRel(RelType type) const {
+  if (type == R_386_TLS_LE)
     return R_386_TLS_TPOFF;
-  if (Type == R_386_TLS_LE_32)
+  if (type == R_386_TLS_LE_32)
     return R_386_TLS_TPOFF32;
-  return Type;
+  return type;
 }
 
-void X86::writePltHeader(uint8_t *Buf) const {
-  if (Config->Pic) {
-    const uint8_t V[] = {
-        0xff, 0xb3, 0x04, 0x00, 0x00, 0x00, // pushl GOTPLT+4(%ebx)
-        0xff, 0xa3, 0x08, 0x00, 0x00, 0x00, // jmp *GOTPLT+8(%ebx)
+void X86::writePltHeader(uint8_t *buf) const {
+  if (config->isPic) {
+    const uint8_t v[] = {
+        0xff, 0xb3, 0x04, 0x00, 0x00, 0x00, // pushl 4(%ebx)
+        0xff, 0xa3, 0x08, 0x00, 0x00, 0x00, // jmp *8(%ebx)
         0x90, 0x90, 0x90, 0x90              // nop
     };
-    memcpy(Buf, V, sizeof(V));
-
-    uint32_t Ebx = In.Got->getVA() + In.Got->getSize();
-    uint32_t GotPlt = In.GotPlt->getVA() - Ebx;
-    write32le(Buf + 2, GotPlt + 4);
-    write32le(Buf + 8, GotPlt + 8);
+    memcpy(buf, v, sizeof(v));
     return;
   }
 
-  const uint8_t PltData[] = {
+  const uint8_t pltData[] = {
       0xff, 0x35, 0, 0, 0, 0, // pushl (GOTPLT+4)
       0xff, 0x25, 0, 0, 0, 0, // jmp *(GOTPLT+8)
       0x90, 0x90, 0x90, 0x90, // nop
   };
-  memcpy(Buf, PltData, sizeof(PltData));
-  uint32_t GotPlt = In.GotPlt->getVA();
-  write32le(Buf + 2, GotPlt + 4);
-  write32le(Buf + 8, GotPlt + 8);
+  memcpy(buf, pltData, sizeof(pltData));
+  uint32_t gotPlt = in.gotPlt->getVA();
+  write32le(buf + 2, gotPlt + 4);
+  write32le(buf + 8, gotPlt + 8);
 }
 
-void X86::writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr,
-                   uint64_t PltEntryAddr, int32_t Index,
-                   unsigned RelOff) const {
-  const uint8_t Inst[] = {
-      0xff, 0x00, 0, 0, 0, 0, // jmp *foo_in_GOT or jmp *foo@GOT(%ebx)
-      0x68, 0, 0, 0, 0,       // pushl $reloc_offset
-      0xe9, 0, 0, 0, 0,       // jmp .PLT0@PC
-  };
-  memcpy(Buf, Inst, sizeof(Inst));
-
-  if (Config->Pic) {
-    // jmp *foo@GOT(%ebx)
-    uint32_t Ebx = In.Got->getVA() + In.Got->getSize();
-    Buf[1] = 0xa3;
-    write32le(Buf + 2, GotPltEntryAddr - Ebx);
+void X86::writePlt(uint8_t *buf, uint64_t gotPltEntryAddr,
+                   uint64_t pltEntryAddr, int32_t index,
+                   unsigned relOff) const {
+  if (config->isPic) {
+    const uint8_t inst[] = {
+        0xff, 0xa3, 0, 0, 0, 0, // jmp *foo@GOT(%ebx)
+        0x68, 0,    0, 0, 0,    // pushl $reloc_offset
+        0xe9, 0,    0, 0, 0,    // jmp .PLT0@PC
+    };
+    memcpy(buf, inst, sizeof(inst));
+    write32le(buf + 2, gotPltEntryAddr - in.gotPlt->getVA());
   } else {
-    // jmp *foo_in_GOT
-    Buf[1] = 0x25;
-    write32le(Buf + 2, GotPltEntryAddr);
+    const uint8_t inst[] = {
+        0xff, 0x25, 0, 0, 0, 0, // jmp *foo@GOT
+        0x68, 0,    0, 0, 0,    // pushl $reloc_offset
+        0xe9, 0,    0, 0, 0,    // jmp .PLT0@PC
+    };
+    memcpy(buf, inst, sizeof(inst));
+    write32le(buf + 2, gotPltEntryAddr);
   }
 
-  write32le(Buf + 7, RelOff);
-  write32le(Buf + 12, -getPltEntryOffset(Index) - 16);
+  write32le(buf + 7, relOff);
+  write32le(buf + 12, -pltHeaderSize - pltEntrySize * index - 16);
 }
 
-int64_t X86::getImplicitAddend(const uint8_t *Buf, RelType Type) const {
-  switch (Type) {
+int64_t X86::getImplicitAddend(const uint8_t *buf, RelType type) const {
+  switch (type) {
   case R_386_8:
   case R_386_PC8:
-    return SignExtend64<8>(*Buf);
+    return SignExtend64<8>(*buf);
   case R_386_16:
   case R_386_PC16:
-    return SignExtend64<16>(read16le(Buf));
+    return SignExtend64<16>(read16le(buf));
   case R_386_32:
   case R_386_GOT32:
   case R_386_GOT32X:
@@ -248,28 +254,28 @@ int64_t X86::getImplicitAddend(const uint8_t *Buf, RelType Type) const {
   case R_386_PLT32:
   case R_386_TLS_LDO_32:
   case R_386_TLS_LE:
-    return SignExtend64<32>(read32le(Buf));
+    return SignExtend64<32>(read32le(buf));
   default:
     return 0;
   }
 }
 
-void X86::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
-  switch (Type) {
+void X86::relocateOne(uint8_t *loc, RelType type, uint64_t val) const {
+  switch (type) {
   case R_386_8:
     // R_386_{PC,}{8,16} are not part of the i386 psABI, but they are
     // being used for some 16-bit programs such as boot loaders, so
     // we want to support them.
-    checkIntUInt(Loc, Val, 8, Type);
-    *Loc = Val;
+    checkIntUInt(loc, val, 8, type);
+    *loc = val;
     break;
   case R_386_PC8:
-    checkInt(Loc, Val, 8, Type);
-    *Loc = Val;
+    checkInt(loc, val, 8, type);
+    *loc = val;
     break;
   case R_386_16:
-    checkIntUInt(Loc, Val, 16, Type);
-    write16le(Loc, Val);
+    checkIntUInt(loc, val, 16, type);
+    write16le(loc, val);
     break;
   case R_386_PC16:
     // R_386_PC16 is normally used with 16 bit code. In that situation
@@ -282,11 +288,10 @@ void X86::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
     // current location subtracted from it.
     // We just check that Val fits in 17 bits. This misses some cases, but
     // should have no false positives.
-    checkInt(Loc, Val, 17, Type);
-    write16le(Loc, Val);
+    checkInt(loc, val, 17, type);
+    write16le(loc, val);
     break;
   case R_386_32:
-  case R_386_GLOB_DAT:
   case R_386_GOT32:
   case R_386_GOT32X:
   case R_386_GOTOFF:
@@ -305,86 +310,86 @@ void X86::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
   case R_386_TLS_LE_32:
   case R_386_TLS_TPOFF:
   case R_386_TLS_TPOFF32:
-    checkInt(Loc, Val, 32, Type);
-    write32le(Loc, Val);
+    checkInt(loc, val, 32, type);
+    write32le(loc, val);
     break;
   default:
-    error(getErrorLocation(Loc) + "unrecognized reloc " + Twine(Type));
+    llvm_unreachable("unknown relocation");
   }
 }
 
-void X86::relaxTlsGdToLe(uint8_t *Loc, RelType Type, uint64_t Val) const {
+void X86::relaxTlsGdToLe(uint8_t *loc, RelType type, uint64_t val) const {
   // Convert
   //   leal x@tlsgd(, %ebx, 1),
   //   call __tls_get_addr@plt
   // to
   //   movl %gs:0,%eax
   //   subl $x@ntpoff,%eax
-  const uint8_t Inst[] = {
+  const uint8_t inst[] = {
       0x65, 0xa1, 0x00, 0x00, 0x00, 0x00, // movl %gs:0, %eax
       0x81, 0xe8, 0, 0, 0, 0,             // subl Val(%ebx), %eax
   };
-  memcpy(Loc - 3, Inst, sizeof(Inst));
-  write32le(Loc + 5, Val);
+  memcpy(loc - 3, inst, sizeof(inst));
+  write32le(loc + 5, val);
 }
 
-void X86::relaxTlsGdToIe(uint8_t *Loc, RelType Type, uint64_t Val) const {
+void X86::relaxTlsGdToIe(uint8_t *loc, RelType type, uint64_t val) const {
   // Convert
   //   leal x@tlsgd(, %ebx, 1),
   //   call __tls_get_addr@plt
   // to
   //   movl %gs:0, %eax
   //   addl x@gotntpoff(%ebx), %eax
-  const uint8_t Inst[] = {
+  const uint8_t inst[] = {
       0x65, 0xa1, 0x00, 0x00, 0x00, 0x00, // movl %gs:0, %eax
       0x03, 0x83, 0, 0, 0, 0,             // addl Val(%ebx), %eax
   };
-  memcpy(Loc - 3, Inst, sizeof(Inst));
-  write32le(Loc + 5, Val);
+  memcpy(loc - 3, inst, sizeof(inst));
+  write32le(loc + 5, val);
 }
 
 // In some conditions, relocations can be optimized to avoid using GOT.
 // This function does that for Initial Exec to Local Exec case.
-void X86::relaxTlsIeToLe(uint8_t *Loc, RelType Type, uint64_t Val) const {
+void X86::relaxTlsIeToLe(uint8_t *loc, RelType type, uint64_t val) const {
   // Ulrich's document section 6.2 says that @gotntpoff can
   // be used with MOVL or ADDL instructions.
   // @indntpoff is similar to @gotntpoff, but for use in
   // position dependent code.
-  uint8_t Reg = (Loc[-1] >> 3) & 7;
+  uint8_t reg = (loc[-1] >> 3) & 7;
 
-  if (Type == R_386_TLS_IE) {
-    if (Loc[-1] == 0xa1) {
+  if (type == R_386_TLS_IE) {
+    if (loc[-1] == 0xa1) {
       // "movl foo@indntpoff,%eax" -> "movl $foo,%eax"
       // This case is different from the generic case below because
       // this is a 5 byte instruction while below is 6 bytes.
-      Loc[-1] = 0xb8;
-    } else if (Loc[-2] == 0x8b) {
+      loc[-1] = 0xb8;
+    } else if (loc[-2] == 0x8b) {
       // "movl foo@indntpoff,%reg" -> "movl $foo,%reg"
-      Loc[-2] = 0xc7;
-      Loc[-1] = 0xc0 | Reg;
+      loc[-2] = 0xc7;
+      loc[-1] = 0xc0 | reg;
     } else {
       // "addl foo@indntpoff,%reg" -> "addl $foo,%reg"
-      Loc[-2] = 0x81;
-      Loc[-1] = 0xc0 | Reg;
+      loc[-2] = 0x81;
+      loc[-1] = 0xc0 | reg;
     }
   } else {
-    assert(Type == R_386_TLS_GOTIE);
-    if (Loc[-2] == 0x8b) {
+    assert(type == R_386_TLS_GOTIE);
+    if (loc[-2] == 0x8b) {
       // "movl foo@gottpoff(%rip),%reg" -> "movl $foo,%reg"
-      Loc[-2] = 0xc7;
-      Loc[-1] = 0xc0 | Reg;
+      loc[-2] = 0xc7;
+      loc[-1] = 0xc0 | reg;
     } else {
       // "addl foo@gotntpoff(%rip),%reg" -> "leal foo(%reg),%reg"
-      Loc[-2] = 0x8d;
-      Loc[-1] = 0x80 | (Reg << 3) | Reg;
+      loc[-2] = 0x8d;
+      loc[-1] = 0x80 | (reg << 3) | reg;
     }
   }
-  write32le(Loc, Val);
+  write32le(loc, val);
 }
 
-void X86::relaxTlsLdToLe(uint8_t *Loc, RelType Type, uint64_t Val) const {
-  if (Type == R_386_TLS_LDO_32) {
-    write32le(Loc, Val);
+void X86::relaxTlsLdToLe(uint8_t *loc, RelType type, uint64_t val) const {
+  if (type == R_386_TLS_LDO_32) {
+    write32le(loc, val);
     return;
   }
 
@@ -395,48 +400,48 @@ void X86::relaxTlsLdToLe(uint8_t *Loc, RelType Type, uint64_t Val) const {
   //   movl %gs:0,%eax
   //   nop
   //   leal 0(%esi,1),%esi
-  const uint8_t Inst[] = {
+  const uint8_t inst[] = {
       0x65, 0xa1, 0x00, 0x00, 0x00, 0x00, // movl %gs:0,%eax
       0x90,                               // nop
       0x8d, 0x74, 0x26, 0x00,             // leal 0(%esi,1),%esi
   };
-  memcpy(Loc - 2, Inst, sizeof(Inst));
+  memcpy(loc - 2, inst, sizeof(inst));
 }
 
 namespace {
 class RetpolinePic : public X86 {
 public:
   RetpolinePic();
-  void writeGotPlt(uint8_t *Buf, const Symbol &S) const override;
-  void writePltHeader(uint8_t *Buf) const override;
-  void writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr, uint64_t PltEntryAddr,
-                int32_t Index, unsigned RelOff) const override;
+  void writeGotPlt(uint8_t *buf, const Symbol &s) const override;
+  void writePltHeader(uint8_t *buf) const override;
+  void writePlt(uint8_t *buf, uint64_t gotPltEntryAddr, uint64_t pltEntryAddr,
+                int32_t index, unsigned relOff) const override;
 };
 
 class RetpolineNoPic : public X86 {
 public:
   RetpolineNoPic();
-  void writeGotPlt(uint8_t *Buf, const Symbol &S) const override;
-  void writePltHeader(uint8_t *Buf) const override;
-  void writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr, uint64_t PltEntryAddr,
-                int32_t Index, unsigned RelOff) const override;
+  void writeGotPlt(uint8_t *buf, const Symbol &s) const override;
+  void writePltHeader(uint8_t *buf) const override;
+  void writePlt(uint8_t *buf, uint64_t gotPltEntryAddr, uint64_t pltEntryAddr,
+                int32_t index, unsigned relOff) const override;
 };
 } // namespace
 
 RetpolinePic::RetpolinePic() {
-  PltHeaderSize = 48;
-  PltEntrySize = 32;
+  pltHeaderSize = 48;
+  pltEntrySize = 32;
 }
 
-void RetpolinePic::writeGotPlt(uint8_t *Buf, const Symbol &S) const {
-  write32le(Buf, S.getPltVA() + 17);
+void RetpolinePic::writeGotPlt(uint8_t *buf, const Symbol &s) const {
+  write32le(buf, s.getPltVA() + 17);
 }
 
-void RetpolinePic::writePltHeader(uint8_t *Buf) const {
-  const uint8_t Insn[] = {
-      0xff, 0xb3, 0,    0,    0,    0,          // 0:    pushl GOTPLT+4(%ebx)
+void RetpolinePic::writePltHeader(uint8_t *buf) const {
+  const uint8_t insn[] = {
+      0xff, 0xb3, 4,    0,    0,    0,          // 0:    pushl 4(%ebx)
       0x50,                                     // 6:    pushl %eax
-      0x8b, 0x83, 0,    0,    0,    0,          // 7:    mov GOTPLT+8(%ebx), %eax
+      0x8b, 0x83, 8,    0,    0,    0,          // 7:    mov 8(%ebx), %eax
       0xe8, 0x0e, 0x00, 0x00, 0x00,             // d:    call next
       0xf3, 0x90,                               // 12: loop: pause
       0x0f, 0xae, 0xe8,                         // 14:   lfence
@@ -450,18 +455,13 @@ void RetpolinePic::writePltHeader(uint8_t *Buf) const {
       0xc3,                                     // 2e:   ret
       0xcc,                                     // 2f:   int3; padding
   };
-  memcpy(Buf, Insn, sizeof(Insn));
-
-  uint32_t Ebx = In.Got->getVA() + In.Got->getSize();
-  uint32_t GotPlt = In.GotPlt->getVA() - Ebx;
-  write32le(Buf + 2, GotPlt + 4);
-  write32le(Buf + 9, GotPlt + 8);
+  memcpy(buf, insn, sizeof(insn));
 }
 
-void RetpolinePic::writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr,
-                            uint64_t PltEntryAddr, int32_t Index,
-                            unsigned RelOff) const {
-  const uint8_t Insn[] = {
+void RetpolinePic::writePlt(uint8_t *buf, uint64_t gotPltEntryAddr,
+                            uint64_t pltEntryAddr, int32_t index,
+                            unsigned relOff) const {
+  const uint8_t insn[] = {
       0x50,                            // pushl %eax
       0x8b, 0x83, 0,    0,    0,    0, // mov foo@GOT(%ebx), %eax
       0xe8, 0,    0,    0,    0,       // call plt+0x20
@@ -470,28 +470,28 @@ void RetpolinePic::writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr,
       0xe9, 0,    0,    0,    0,       // jmp plt+0
       0xcc, 0xcc, 0xcc, 0xcc, 0xcc,    // int3; padding
   };
-  memcpy(Buf, Insn, sizeof(Insn));
+  memcpy(buf, insn, sizeof(insn));
 
-  uint32_t Ebx = In.Got->getVA() + In.Got->getSize();
-  unsigned Off = getPltEntryOffset(Index);
-  write32le(Buf + 3, GotPltEntryAddr - Ebx);
-  write32le(Buf + 8, -Off - 12 + 32);
-  write32le(Buf + 13, -Off - 17 + 18);
-  write32le(Buf + 18, RelOff);
-  write32le(Buf + 23, -Off - 27);
+  uint32_t ebx = in.gotPlt->getVA();
+  unsigned off = pltHeaderSize + pltEntrySize * index;
+  write32le(buf + 3, gotPltEntryAddr - ebx);
+  write32le(buf + 8, -off - 12 + 32);
+  write32le(buf + 13, -off - 17 + 18);
+  write32le(buf + 18, relOff);
+  write32le(buf + 23, -off - 27);
 }
 
 RetpolineNoPic::RetpolineNoPic() {
-  PltHeaderSize = 48;
-  PltEntrySize = 32;
+  pltHeaderSize = 48;
+  pltEntrySize = 32;
 }
 
-void RetpolineNoPic::writeGotPlt(uint8_t *Buf, const Symbol &S) const {
-  write32le(Buf, S.getPltVA() + 16);
+void RetpolineNoPic::writeGotPlt(uint8_t *buf, const Symbol &s) const {
+  write32le(buf, s.getPltVA() + 16);
 }
 
-void RetpolineNoPic::writePltHeader(uint8_t *Buf) const {
-  const uint8_t Insn[] = {
+void RetpolineNoPic::writePltHeader(uint8_t *buf) const {
+  const uint8_t insn[] = {
       0xff, 0x35, 0,    0,    0,    0, // 0:    pushl GOTPLT+4
       0x50,                            // 6:    pushl %eax
       0xa1, 0,    0,    0,    0,       // 7:    mov GOTPLT+8, %eax
@@ -509,17 +509,17 @@ void RetpolineNoPic::writePltHeader(uint8_t *Buf) const {
       0xc3,                            // 2e:   ret
       0xcc,                            // 2f:   int3; padding
   };
-  memcpy(Buf, Insn, sizeof(Insn));
+  memcpy(buf, insn, sizeof(insn));
 
-  uint32_t GotPlt = In.GotPlt->getVA();
-  write32le(Buf + 2, GotPlt + 4);
-  write32le(Buf + 8, GotPlt + 8);
+  uint32_t gotPlt = in.gotPlt->getVA();
+  write32le(buf + 2, gotPlt + 4);
+  write32le(buf + 8, gotPlt + 8);
 }
 
-void RetpolineNoPic::writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr,
-                              uint64_t PltEntryAddr, int32_t Index,
-                              unsigned RelOff) const {
-  const uint8_t Insn[] = {
+void RetpolineNoPic::writePlt(uint8_t *buf, uint64_t gotPltEntryAddr,
+                              uint64_t pltEntryAddr, int32_t index,
+                              unsigned relOff) const {
+  const uint8_t insn[] = {
       0x50,                         // 0:  pushl %eax
       0xa1, 0,    0,    0,    0,    // 1:  mov foo_in_GOT, %eax
       0xe8, 0,    0,    0,    0,    // 6:  call plt+0x20
@@ -529,26 +529,26 @@ void RetpolineNoPic::writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr,
       0xcc, 0xcc, 0xcc, 0xcc, 0xcc, // 1a: int3; padding
       0xcc,                         // 1f: int3; padding
   };
-  memcpy(Buf, Insn, sizeof(Insn));
+  memcpy(buf, insn, sizeof(insn));
 
-  unsigned Off = getPltEntryOffset(Index);
-  write32le(Buf + 2, GotPltEntryAddr);
-  write32le(Buf + 7, -Off - 11 + 32);
-  write32le(Buf + 12, -Off - 16 + 17);
-  write32le(Buf + 17, RelOff);
-  write32le(Buf + 22, -Off - 26);
+  unsigned off = pltHeaderSize + pltEntrySize * index;
+  write32le(buf + 2, gotPltEntryAddr);
+  write32le(buf + 7, -off - 11 + 32);
+  write32le(buf + 12, -off - 16 + 17);
+  write32le(buf + 17, relOff);
+  write32le(buf + 22, -off - 26);
 }
 
 TargetInfo *elf::getX86TargetInfo() {
-  if (Config->ZRetpolineplt) {
-    if (Config->Pic) {
-      static RetpolinePic T;
-      return &T;
+  if (config->zRetpolineplt) {
+    if (config->isPic) {
+      static RetpolinePic t;
+      return &t;
     }
-    static RetpolineNoPic T;
-    return &T;
+    static RetpolineNoPic t;
+    return &t;
   }
 
-  static X86 T;
-  return &T;
+  static X86 t;
+  return &t;
 }
diff --git a/deps/lld/ELF/Arch/X86_64.cpp b/deps/lld/ELF/Arch/X86_64.cpp
index a000eeb079d9ef98e6831b49ed913b049baa5030..de67aa5c33dc4c13e80f68afa7292cef5321f2a8 100644
--- a/deps/lld/ELF/Arch/X86_64.cpp
+++ b/deps/lld/ELF/Arch/X86_64.cpp
@@ -1,9 +1,8 @@
 //===- X86_64.cpp ---------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -23,71 +22,74 @@ using namespace lld;
 using namespace lld::elf;
 
 namespace {
-template <class ELFT> class X86_64 : public TargetInfo {
+class X86_64 : public TargetInfo {
 public:
   X86_64();
-  RelExpr getRelExpr(RelType Type, const Symbol &S,
-                     const uint8_t *Loc) const override;
-  RelType getDynRel(RelType Type) const override;
-  void writeGotPltHeader(uint8_t *Buf) const override;
-  void writeGotPlt(uint8_t *Buf, const Symbol &S) const override;
-  void writePltHeader(uint8_t *Buf) const override;
-  void writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr, uint64_t PltEntryAddr,
-                int32_t Index, unsigned RelOff) const override;
-  void relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const override;
+  int getTlsGdRelaxSkip(RelType type) const override;
+  RelExpr getRelExpr(RelType type, const Symbol &s,
+                     const uint8_t *loc) const override;
+  RelType getDynRel(RelType type) const override;
+  void writeGotPltHeader(uint8_t *buf) const override;
+  void writeGotPlt(uint8_t *buf, const Symbol &s) const override;
+  void writePltHeader(uint8_t *buf) const override;
+  void writePlt(uint8_t *buf, uint64_t gotPltEntryAddr, uint64_t pltEntryAddr,
+                int32_t index, unsigned relOff) const override;
+  void relocateOne(uint8_t *loc, RelType type, uint64_t val) const override;
 
-  RelExpr adjustRelaxExpr(RelType Type, const uint8_t *Data,
-                          RelExpr Expr) const override;
-  void relaxGot(uint8_t *Loc, uint64_t Val) const override;
-  void relaxTlsGdToIe(uint8_t *Loc, RelType Type, uint64_t Val) const override;
-  void relaxTlsGdToLe(uint8_t *Loc, RelType Type, uint64_t Val) const override;
-  void relaxTlsIeToLe(uint8_t *Loc, RelType Type, uint64_t Val) const override;
-  void relaxTlsLdToLe(uint8_t *Loc, RelType Type, uint64_t Val) const override;
-  bool adjustPrologueForCrossSplitStack(uint8_t *Loc, uint8_t *End,
-                                        uint8_t StOther) const override;
-
-private:
-  void relaxGotNoPic(uint8_t *Loc, uint64_t Val, uint8_t Op,
-                     uint8_t ModRm) const;
+  RelExpr adjustRelaxExpr(RelType type, const uint8_t *data,
+                          RelExpr expr) const override;
+  void relaxGot(uint8_t *loc, RelType type, uint64_t val) const override;
+  void relaxTlsGdToIe(uint8_t *loc, RelType type, uint64_t val) const override;
+  void relaxTlsGdToLe(uint8_t *loc, RelType type, uint64_t val) const override;
+  void relaxTlsIeToLe(uint8_t *loc, RelType type, uint64_t val) const override;
+  void relaxTlsLdToLe(uint8_t *loc, RelType type, uint64_t val) const override;
+  bool adjustPrologueForCrossSplitStack(uint8_t *loc, uint8_t *end,
+                                        uint8_t stOther) const override;
 };
 } // namespace
 
-template <class ELFT> X86_64<ELFT>::X86_64() {
-  CopyRel = R_X86_64_COPY;
-  GotRel = R_X86_64_GLOB_DAT;
-  NoneRel = R_X86_64_NONE;
-  PltRel = R_X86_64_JUMP_SLOT;
-  RelativeRel = R_X86_64_RELATIVE;
-  IRelativeRel = R_X86_64_IRELATIVE;
-  TlsGotRel = R_X86_64_TPOFF64;
-  TlsModuleIndexRel = R_X86_64_DTPMOD64;
-  TlsOffsetRel = R_X86_64_DTPOFF64;
-  GotEntrySize = 8;
-  GotPltEntrySize = 8;
-  PltEntrySize = 16;
-  PltHeaderSize = 16;
-  TlsGdRelaxSkip = 2;
-  TrapInstr = {0xcc, 0xcc, 0xcc, 0xcc}; // 0xcc = INT3
+X86_64::X86_64() {
+  copyRel = R_X86_64_COPY;
+  gotRel = R_X86_64_GLOB_DAT;
+  noneRel = R_X86_64_NONE;
+  pltRel = R_X86_64_JUMP_SLOT;
+  relativeRel = R_X86_64_RELATIVE;
+  iRelativeRel = R_X86_64_IRELATIVE;
+  symbolicRel = R_X86_64_64;
+  tlsDescRel = R_X86_64_TLSDESC;
+  tlsGotRel = R_X86_64_TPOFF64;
+  tlsModuleIndexRel = R_X86_64_DTPMOD64;
+  tlsOffsetRel = R_X86_64_DTPOFF64;
+  pltEntrySize = 16;
+  pltHeaderSize = 16;
+  trapInstr = {0xcc, 0xcc, 0xcc, 0xcc}; // 0xcc = INT3
 
   // Align to the large page size (known as a superpage or huge page).
   // FreeBSD automatically promotes large, superpage-aligned allocations.
-  DefaultImageBase = 0x200000;
+  defaultImageBase = 0x200000;
 }
 
-template <class ELFT>
-RelExpr X86_64<ELFT>::getRelExpr(RelType Type, const Symbol &S,
-                                 const uint8_t *Loc) const {
-  switch (Type) {
+int X86_64::getTlsGdRelaxSkip(RelType type) const { return 2; }
+
+RelExpr X86_64::getRelExpr(RelType type, const Symbol &s,
+                           const uint8_t *loc) const {
+  if (type == R_X86_64_GOTTPOFF)
+    config->hasStaticTlsModel = true;
+
+  switch (type) {
   case R_X86_64_8:
   case R_X86_64_16:
   case R_X86_64_32:
   case R_X86_64_32S:
   case R_X86_64_64:
-  case R_X86_64_DTPOFF32:
-  case R_X86_64_DTPOFF64:
     return R_ABS;
+  case R_X86_64_DTPOFF32:
+  case R_X86_64_DTPOFF64:
+    return R_DTPREL;
   case R_X86_64_TPOFF32:
     return R_TLS;
+  case R_X86_64_TLSDESC_CALL:
+    return R_TLSDESC_CALL;
   case R_X86_64_TLSLD:
     return R_TLSLD_PC;
   case R_X86_64_TLSGD:
@@ -97,189 +99,222 @@ RelExpr X86_64<ELFT>::getRelExpr(RelType Type, const Symbol &S,
     return R_SIZE;
   case R_X86_64_PLT32:
     return R_PLT_PC;
+  case R_X86_64_PC8:
+  case R_X86_64_PC16:
   case R_X86_64_PC32:
   case R_X86_64_PC64:
     return R_PC;
   case R_X86_64_GOT32:
   case R_X86_64_GOT64:
-    return R_GOT_FROM_END;
+    return R_GOTPLT;
+  case R_X86_64_GOTPC32_TLSDESC:
+    return R_TLSDESC_PC;
   case R_X86_64_GOTPCREL:
   case R_X86_64_GOTPCRELX:
   case R_X86_64_REX_GOTPCRELX:
   case R_X86_64_GOTTPOFF:
     return R_GOT_PC;
   case R_X86_64_GOTOFF64:
-    return R_GOTREL_FROM_END;
+    return R_GOTPLTREL;
   case R_X86_64_GOTPC32:
   case R_X86_64_GOTPC64:
-    return R_GOTONLY_PC_FROM_END;
+    return R_GOTPLTONLY_PC;
   case R_X86_64_NONE:
     return R_NONE;
   default:
-    return R_INVALID;
+    error(getErrorLocation(loc) + "unknown relocation (" + Twine(type) +
+          ") against symbol " + toString(s));
+    return R_NONE;
   }
 }
 
-template <class ELFT> void X86_64<ELFT>::writeGotPltHeader(uint8_t *Buf) const {
+void X86_64::writeGotPltHeader(uint8_t *buf) const {
   // The first entry holds the value of _DYNAMIC. It is not clear why that is
   // required, but it is documented in the psabi and the glibc dynamic linker
   // seems to use it (note that this is relevant for linking ld.so, not any
   // other program).
-  write64le(Buf, In.Dynamic->getVA());
+  write64le(buf, mainPart->dynamic->getVA());
 }
 
-template <class ELFT>
-void X86_64<ELFT>::writeGotPlt(uint8_t *Buf, const Symbol &S) const {
+void X86_64::writeGotPlt(uint8_t *buf, const Symbol &s) const {
   // See comments in X86::writeGotPlt.
-  write64le(Buf, S.getPltVA() + 6);
+  write64le(buf, s.getPltVA() + 6);
 }
 
-template <class ELFT> void X86_64<ELFT>::writePltHeader(uint8_t *Buf) const {
-  const uint8_t PltData[] = {
+void X86_64::writePltHeader(uint8_t *buf) const {
+  const uint8_t pltData[] = {
       0xff, 0x35, 0, 0, 0, 0, // pushq GOTPLT+8(%rip)
       0xff, 0x25, 0, 0, 0, 0, // jmp *GOTPLT+16(%rip)
       0x0f, 0x1f, 0x40, 0x00, // nop
   };
-  memcpy(Buf, PltData, sizeof(PltData));
-  uint64_t GotPlt = In.GotPlt->getVA();
-  uint64_t Plt = In.Plt->getVA();
-  write32le(Buf + 2, GotPlt - Plt + 2); // GOTPLT+8
-  write32le(Buf + 8, GotPlt - Plt + 4); // GOTPLT+16
+  memcpy(buf, pltData, sizeof(pltData));
+  uint64_t gotPlt = in.gotPlt->getVA();
+  uint64_t plt = in.plt->getVA();
+  write32le(buf + 2, gotPlt - plt + 2); // GOTPLT+8
+  write32le(buf + 8, gotPlt - plt + 4); // GOTPLT+16
 }
 
-template <class ELFT>
-void X86_64<ELFT>::writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr,
-                            uint64_t PltEntryAddr, int32_t Index,
-                            unsigned RelOff) const {
-  const uint8_t Inst[] = {
+void X86_64::writePlt(uint8_t *buf, uint64_t gotPltEntryAddr,
+                      uint64_t pltEntryAddr, int32_t index,
+                      unsigned relOff) const {
+  const uint8_t inst[] = {
       0xff, 0x25, 0, 0, 0, 0, // jmpq *got(%rip)
       0x68, 0, 0, 0, 0,       // pushq <relocation index>
       0xe9, 0, 0, 0, 0,       // jmpq plt[0]
   };
-  memcpy(Buf, Inst, sizeof(Inst));
+  memcpy(buf, inst, sizeof(inst));
 
-  write32le(Buf + 2, GotPltEntryAddr - PltEntryAddr - 6);
-  write32le(Buf + 7, Index);
-  write32le(Buf + 12, -getPltEntryOffset(Index) - 16);
+  write32le(buf + 2, gotPltEntryAddr - pltEntryAddr - 6);
+  write32le(buf + 7, index);
+  write32le(buf + 12, -pltHeaderSize - pltEntrySize * index - 16);
 }
 
-template <class ELFT> RelType X86_64<ELFT>::getDynRel(RelType Type) const {
-  if (Type == R_X86_64_64 || Type == R_X86_64_PC64 || Type == R_X86_64_SIZE32 ||
-      Type == R_X86_64_SIZE64)
-    return Type;
+RelType X86_64::getDynRel(RelType type) const {
+  if (type == R_X86_64_64 || type == R_X86_64_PC64 || type == R_X86_64_SIZE32 ||
+      type == R_X86_64_SIZE64)
+    return type;
   return R_X86_64_NONE;
 }
 
-template <class ELFT>
-void X86_64<ELFT>::relaxTlsGdToLe(uint8_t *Loc, RelType Type,
-                                  uint64_t Val) const {
-  // Convert
-  //   .byte 0x66
-  //   leaq x@tlsgd(%rip), %rdi
-  //   .word 0x6666
-  //   rex64
-  //   call __tls_get_addr@plt
-  // to
-  //   mov %fs:0x0,%rax
-  //   lea x@tpoff,%rax
-  const uint8_t Inst[] = {
-      0x64, 0x48, 0x8b, 0x04, 0x25, 0x00, 0x00, 0x00, 0x00, // mov %fs:0x0,%rax
-      0x48, 0x8d, 0x80, 0, 0, 0, 0,                         // lea x@tpoff,%rax
-  };
-  memcpy(Loc - 4, Inst, sizeof(Inst));
+void X86_64::relaxTlsGdToLe(uint8_t *loc, RelType type, uint64_t val) const {
+  if (type == R_X86_64_TLSGD) {
+    // Convert
+    //   .byte 0x66
+    //   leaq x@tlsgd(%rip), %rdi
+    //   .word 0x6666
+    //   rex64
+    //   call __tls_get_addr@plt
+    // to the following two instructions.
+    const uint8_t inst[] = {
+        0x64, 0x48, 0x8b, 0x04, 0x25, 0x00, 0x00,
+        0x00, 0x00,                            // mov %fs:0x0,%rax
+        0x48, 0x8d, 0x80, 0,    0,    0,    0, // lea x@tpoff,%rax
+    };
+    memcpy(loc - 4, inst, sizeof(inst));
 
-  // The original code used a pc relative relocation and so we have to
-  // compensate for the -4 in had in the addend.
-  write32le(Loc + 8, Val + 4);
+    // The original code used a pc relative relocation and so we have to
+    // compensate for the -4 in had in the addend.
+    write32le(loc + 8, val + 4);
+  } else {
+    // Convert
+    //   lea x@tlsgd(%rip), %rax
+    //   call *(%rax)
+    // to the following two instructions.
+    assert(type == R_X86_64_GOTPC32_TLSDESC);
+    if (memcmp(loc - 3, "\x48\x8d\x05", 3)) {
+      error(getErrorLocation(loc - 3) + "R_X86_64_GOTPC32_TLSDESC must be used "
+                                        "in callq *x@tlsdesc(%rip), %rax");
+      return;
+    }
+    // movq $x@tpoff(%rip),%rax
+    loc[-2] = 0xc7;
+    loc[-1] = 0xc0;
+    write32le(loc, val + 4);
+    // xchg ax,ax
+    loc[4] = 0x66;
+    loc[5] = 0x90;
+  }
 }
 
-template <class ELFT>
-void X86_64<ELFT>::relaxTlsGdToIe(uint8_t *Loc, RelType Type,
-                                  uint64_t Val) const {
-  // Convert
-  //   .byte 0x66
-  //   leaq x@tlsgd(%rip), %rdi
-  //   .word 0x6666
-  //   rex64
-  //   call __tls_get_addr@plt
-  // to
-  //   mov %fs:0x0,%rax
-  //   addq x@tpoff,%rax
-  const uint8_t Inst[] = {
-      0x64, 0x48, 0x8b, 0x04, 0x25, 0x00, 0x00, 0x00, 0x00, // mov %fs:0x0,%rax
-      0x48, 0x03, 0x05, 0, 0, 0, 0,                         // addq x@tpoff,%rax
-  };
-  memcpy(Loc - 4, Inst, sizeof(Inst));
+void X86_64::relaxTlsGdToIe(uint8_t *loc, RelType type, uint64_t val) const {
+  if (type == R_X86_64_TLSGD) {
+    // Convert
+    //   .byte 0x66
+    //   leaq x@tlsgd(%rip), %rdi
+    //   .word 0x6666
+    //   rex64
+    //   call __tls_get_addr@plt
+    // to the following two instructions.
+    const uint8_t inst[] = {
+        0x64, 0x48, 0x8b, 0x04, 0x25, 0x00, 0x00,
+        0x00, 0x00,                            // mov %fs:0x0,%rax
+        0x48, 0x03, 0x05, 0,    0,    0,    0, // addq x@gottpoff(%rip),%rax
+    };
+    memcpy(loc - 4, inst, sizeof(inst));
 
-  // Both code sequences are PC relatives, but since we are moving the constant
-  // forward by 8 bytes we have to subtract the value by 8.
-  write32le(Loc + 8, Val - 8);
+    // Both code sequences are PC relatives, but since we are moving the
+    // constant forward by 8 bytes we have to subtract the value by 8.
+    write32le(loc + 8, val - 8);
+  } else {
+    // Convert
+    //   lea x@tlsgd(%rip), %rax
+    //   call *(%rax)
+    // to the following two instructions.
+    assert(type == R_X86_64_GOTPC32_TLSDESC);
+    if (memcmp(loc - 3, "\x48\x8d\x05", 3)) {
+      error(getErrorLocation(loc - 3) + "R_X86_64_GOTPC32_TLSDESC must be used "
+                                        "in callq *x@tlsdesc(%rip), %rax");
+      return;
+    }
+    // movq x@gottpoff(%rip),%rax
+    loc[-2] = 0x8b;
+    write32le(loc, val);
+    // xchg ax,ax
+    loc[4] = 0x66;
+    loc[5] = 0x90;
+  }
 }
 
 // In some conditions, R_X86_64_GOTTPOFF relocation can be optimized to
 // R_X86_64_TPOFF32 so that it does not use GOT.
-template <class ELFT>
-void X86_64<ELFT>::relaxTlsIeToLe(uint8_t *Loc, RelType Type,
-                                  uint64_t Val) const {
-  uint8_t *Inst = Loc - 3;
-  uint8_t Reg = Loc[-1] >> 3;
-  uint8_t *RegSlot = Loc - 1;
+void X86_64::relaxTlsIeToLe(uint8_t *loc, RelType type, uint64_t val) const {
+  uint8_t *inst = loc - 3;
+  uint8_t reg = loc[-1] >> 3;
+  uint8_t *regSlot = loc - 1;
 
   // Note that ADD with RSP or R12 is converted to ADD instead of LEA
   // because LEA with these registers needs 4 bytes to encode and thus
   // wouldn't fit the space.
 
-  if (memcmp(Inst, "\x48\x03\x25", 3) == 0) {
+  if (memcmp(inst, "\x48\x03\x25", 3) == 0) {
     // "addq foo@gottpoff(%rip),%rsp" -> "addq $foo,%rsp"
-    memcpy(Inst, "\x48\x81\xc4", 3);
-  } else if (memcmp(Inst, "\x4c\x03\x25", 3) == 0) {
+    memcpy(inst, "\x48\x81\xc4", 3);
+  } else if (memcmp(inst, "\x4c\x03\x25", 3) == 0) {
     // "addq foo@gottpoff(%rip),%r12" -> "addq $foo,%r12"
-    memcpy(Inst, "\x49\x81\xc4", 3);
-  } else if (memcmp(Inst, "\x4c\x03", 2) == 0) {
+    memcpy(inst, "\x49\x81\xc4", 3);
+  } else if (memcmp(inst, "\x4c\x03", 2) == 0) {
     // "addq foo@gottpoff(%rip),%r[8-15]" -> "leaq foo(%r[8-15]),%r[8-15]"
-    memcpy(Inst, "\x4d\x8d", 2);
-    *RegSlot = 0x80 | (Reg << 3) | Reg;
-  } else if (memcmp(Inst, "\x48\x03", 2) == 0) {
+    memcpy(inst, "\x4d\x8d", 2);
+    *regSlot = 0x80 | (reg << 3) | reg;
+  } else if (memcmp(inst, "\x48\x03", 2) == 0) {
     // "addq foo@gottpoff(%rip),%reg -> "leaq foo(%reg),%reg"
-    memcpy(Inst, "\x48\x8d", 2);
-    *RegSlot = 0x80 | (Reg << 3) | Reg;
-  } else if (memcmp(Inst, "\x4c\x8b", 2) == 0) {
+    memcpy(inst, "\x48\x8d", 2);
+    *regSlot = 0x80 | (reg << 3) | reg;
+  } else if (memcmp(inst, "\x4c\x8b", 2) == 0) {
     // "movq foo@gottpoff(%rip),%r[8-15]" -> "movq $foo,%r[8-15]"
-    memcpy(Inst, "\x49\xc7", 2);
-    *RegSlot = 0xc0 | Reg;
-  } else if (memcmp(Inst, "\x48\x8b", 2) == 0) {
+    memcpy(inst, "\x49\xc7", 2);
+    *regSlot = 0xc0 | reg;
+  } else if (memcmp(inst, "\x48\x8b", 2) == 0) {
     // "movq foo@gottpoff(%rip),%reg" -> "movq $foo,%reg"
-    memcpy(Inst, "\x48\xc7", 2);
-    *RegSlot = 0xc0 | Reg;
+    memcpy(inst, "\x48\xc7", 2);
+    *regSlot = 0xc0 | reg;
   } else {
-    error(getErrorLocation(Loc - 3) +
+    error(getErrorLocation(loc - 3) +
           "R_X86_64_GOTTPOFF must be used in MOVQ or ADDQ instructions only");
   }
 
   // The original code used a PC relative relocation.
   // Need to compensate for the -4 it had in the addend.
-  write32le(Loc, Val + 4);
+  write32le(loc, val + 4);
 }
 
-template <class ELFT>
-void X86_64<ELFT>::relaxTlsLdToLe(uint8_t *Loc, RelType Type,
-                                  uint64_t Val) const {
-  if (Type == R_X86_64_DTPOFF64) {
-    write64le(Loc, Val);
+void X86_64::relaxTlsLdToLe(uint8_t *loc, RelType type, uint64_t val) const {
+  if (type == R_X86_64_DTPOFF64) {
+    write64le(loc, val);
     return;
   }
-  if (Type == R_X86_64_DTPOFF32) {
-    write32le(Loc, Val);
+  if (type == R_X86_64_DTPOFF32) {
+    write32le(loc, val);
     return;
   }
 
-  const uint8_t Inst[] = {
+  const uint8_t inst[] = {
       0x66, 0x66,                                           // .word 0x6666
       0x66,                                                 // .byte 0x66
       0x64, 0x48, 0x8b, 0x04, 0x25, 0x00, 0x00, 0x00, 0x00, // mov %fs:0,%rax
   };
 
-  if (Loc[4] == 0xe8) {
+  if (loc[4] == 0xe8) {
     // Convert
     //   leaq bar@tlsld(%rip), %rdi           # 48 8d 3d <Loc>
     //   callq __tls_get_addr@PLT             # e8 <disp32>
@@ -289,11 +324,11 @@ void X86_64<ELFT>::relaxTlsLdToLe(uint8_t *Loc, RelType Type,
     //   .byte 0x66
     //   mov %fs:0,%rax
     //   leaq bar@tpoff(%rax), %rcx
-    memcpy(Loc - 3, Inst, sizeof(Inst));
+    memcpy(loc - 3, inst, sizeof(inst));
     return;
   }
 
-  if (Loc[4] == 0xff && Loc[5] == 0x15) {
+  if (loc[4] == 0xff && loc[5] == 0x15) {
     // Convert
     //   leaq  x@tlsld(%rip),%rdi               # 48 8d 3d <Loc>
     //   call *__tls_get_addr@GOTPCREL(%rip)    # ff 15 <disp32>
@@ -302,34 +337,42 @@ void X86_64<ELFT>::relaxTlsLdToLe(uint8_t *Loc, RelType Type,
     //   movq   %fs:0,%rax
     // See "Table 11.9: LD -> LE Code Transition (LP64)" in
     // https://raw.githubusercontent.com/wiki/hjl-tools/x86-psABI/x86-64-psABI-1.0.pdf
-    Loc[-3] = 0x66;
-    memcpy(Loc - 2, Inst, sizeof(Inst));
+    loc[-3] = 0x66;
+    memcpy(loc - 2, inst, sizeof(inst));
     return;
   }
 
-  error(getErrorLocation(Loc - 3) +
+  error(getErrorLocation(loc - 3) +
         "expected R_X86_64_PLT32 or R_X86_64_GOTPCRELX after R_X86_64_TLSLD");
 }
 
-template <class ELFT>
-void X86_64<ELFT>::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
-  switch (Type) {
+void X86_64::relocateOne(uint8_t *loc, RelType type, uint64_t val) const {
+  switch (type) {
   case R_X86_64_8:
-    checkUInt(Loc, Val, 8, Type);
-    *Loc = Val;
+    checkIntUInt(loc, val, 8, type);
+    *loc = val;
+    break;
+  case R_X86_64_PC8:
+    checkInt(loc, val, 8, type);
+    *loc = val;
     break;
   case R_X86_64_16:
-    checkUInt(Loc, Val, 16, Type);
-    write16le(Loc, Val);
+    checkIntUInt(loc, val, 16, type);
+    write16le(loc, val);
+    break;
+  case R_X86_64_PC16:
+    checkInt(loc, val, 16, type);
+    write16le(loc, val);
     break;
   case R_X86_64_32:
-    checkUInt(Loc, Val, 32, Type);
-    write32le(Loc, Val);
+    checkUInt(loc, val, 32, type);
+    write32le(loc, val);
     break;
   case R_X86_64_32S:
   case R_X86_64_TPOFF32:
   case R_X86_64_GOT32:
   case R_X86_64_GOTPC32:
+  case R_X86_64_GOTPC32_TLSDESC:
   case R_X86_64_GOTPCREL:
   case R_X86_64_GOTPCRELX:
   case R_X86_64_REX_GOTPCRELX:
@@ -340,49 +383,47 @@ void X86_64<ELFT>::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
   case R_X86_64_TLSLD:
   case R_X86_64_DTPOFF32:
   case R_X86_64_SIZE32:
-    checkInt(Loc, Val, 32, Type);
-    write32le(Loc, Val);
+    checkInt(loc, val, 32, type);
+    write32le(loc, val);
     break;
   case R_X86_64_64:
   case R_X86_64_DTPOFF64:
-  case R_X86_64_GLOB_DAT:
   case R_X86_64_PC64:
   case R_X86_64_SIZE64:
   case R_X86_64_GOT64:
   case R_X86_64_GOTOFF64:
   case R_X86_64_GOTPC64:
-    write64le(Loc, Val);
+    write64le(loc, val);
     break;
   default:
-    error(getErrorLocation(Loc) + "unrecognized reloc " + Twine(Type));
+    llvm_unreachable("unknown relocation");
   }
 }
 
-template <class ELFT>
-RelExpr X86_64<ELFT>::adjustRelaxExpr(RelType Type, const uint8_t *Data,
-                                      RelExpr RelExpr) const {
-  if (Type != R_X86_64_GOTPCRELX && Type != R_X86_64_REX_GOTPCRELX)
-    return RelExpr;
-  const uint8_t Op = Data[-2];
-  const uint8_t ModRm = Data[-1];
+RelExpr X86_64::adjustRelaxExpr(RelType type, const uint8_t *data,
+                                RelExpr relExpr) const {
+  if (type != R_X86_64_GOTPCRELX && type != R_X86_64_REX_GOTPCRELX)
+    return relExpr;
+  const uint8_t op = data[-2];
+  const uint8_t modRm = data[-1];
 
   // FIXME: When PIC is disabled and foo is defined locally in the
   // lower 32 bit address space, memory operand in mov can be converted into
   // immediate operand. Otherwise, mov must be changed to lea. We support only
   // latter relaxation at this moment.
-  if (Op == 0x8b)
+  if (op == 0x8b)
     return R_RELAX_GOT_PC;
 
   // Relax call and jmp.
-  if (Op == 0xff && (ModRm == 0x15 || ModRm == 0x25))
+  if (op == 0xff && (modRm == 0x15 || modRm == 0x25))
     return R_RELAX_GOT_PC;
 
   // Relaxation of test, adc, add, and, cmp, or, sbb, sub, xor.
   // If PIC then no relaxation is available.
   // We also don't relax test/binop instructions without REX byte,
   // they are 32bit operations and not common to have.
-  assert(Type == R_X86_64_REX_GOTPCRELX);
-  return Config->Pic ? RelExpr : R_RELAX_GOT_PC_NOPIC;
+  assert(type == R_X86_64_REX_GOTPCRELX);
+  return config->isPic ? relExpr : R_RELAX_GOT_PC_NOPIC;
 }
 
 // A subset of relaxations can only be applied for no-PIC. This method
@@ -390,12 +431,11 @@ RelExpr X86_64<ELFT>::adjustRelaxExpr(RelType Type, const uint8_t *Data,
 // "Intel 64 and IA-32 Architectures Software Developer's Manual V2"
 // (http://www.intel.com/content/dam/www/public/us/en/documents/manuals/
 //    64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf)
-template <class ELFT>
-void X86_64<ELFT>::relaxGotNoPic(uint8_t *Loc, uint64_t Val, uint8_t Op,
-                                 uint8_t ModRm) const {
-  const uint8_t Rex = Loc[-3];
+static void relaxGotNoPic(uint8_t *loc, uint64_t val, uint8_t op,
+                          uint8_t modRm) {
+  const uint8_t rex = loc[-3];
   // Convert "test %reg, foo@GOTPCREL(%rip)" to "test $foo, %reg".
-  if (Op == 0x85) {
+  if (op == 0x85) {
     // See "TEST-Logical Compare" (4-428 Vol. 2B),
     // TEST r/m64, r64 uses "full" ModR / M byte (no opcode extension).
 
@@ -412,11 +452,11 @@ void X86_64<ELFT>::relaxGotNoPic(uint8_t *Loc, uint64_t Val, uint8_t Op,
     // 0x38 == 00 111 000 binary.
     // We transfer reg2 to reg1 here as operand.
     // See "2.1.3 ModR/M and SIB Bytes" (Vol. 2A 2-3).
-    Loc[-1] = 0xc0 | (ModRm & 0x38) >> 3; // ModR/M byte.
+    loc[-1] = 0xc0 | (modRm & 0x38) >> 3; // ModR/M byte.
 
     // Change opcode from TEST r/m64, r64 to TEST r/m64, imm32
     // See "TEST-Logical Compare" (4-428 Vol. 2B).
-    Loc[-2] = 0xf7;
+    loc[-2] = 0xf7;
 
     // Move R bit to the B bit in REX byte.
     // REX byte is encoded as 0100WRXB, where
@@ -429,8 +469,8 @@ void X86_64<ELFT>::relaxGotNoPic(uint8_t *Loc, uint64_t Val, uint8_t Op,
     // REX.B This 1-bit value is an extension to the MODRM.rm field or the
     // SIB.base field.
     // See "2.2.1.2 More on REX Prefix Fields " (2-8 Vol. 2A).
-    Loc[-3] = (Rex & ~0x4) | (Rex & 0x4) >> 2;
-    write32le(Loc, Val);
+    loc[-3] = (rex & ~0x4) | (rex & 0x4) >> 2;
+    write32le(loc, val);
     return;
   }
 
@@ -440,7 +480,7 @@ void X86_64<ELFT>::relaxGotNoPic(uint8_t *Loc, uint64_t Val, uint8_t Op,
   // Convert "binop foo@GOTPCREL(%rip), %reg" to "binop $foo, %reg".
   // Logic is close to one for test instruction above, but we also
   // write opcode extension here, see below for details.
-  Loc[-1] = 0xc0 | (ModRm & 0x38) >> 3 | (Op & 0x3c); // ModR/M byte.
+  loc[-1] = 0xc0 | (modRm & 0x38) >> 3 | (op & 0x3c); // ModR/M byte.
 
   // Primary opcode is 0x81, opcode extension is one of:
   // 000b = ADD, 001b is OR, 010b is ADC, 011b is SBB,
@@ -449,69 +489,67 @@ void X86_64<ELFT>::relaxGotNoPic(uint8_t *Loc, uint64_t Val, uint8_t Op,
   // See "3.2 INSTRUCTIONS (A-M)" (Vol. 2A 3-15),
   // "INSTRUCTION SET REFERENCE, N-Z" (Vol. 2B 4-1) for
   // descriptions about each operation.
-  Loc[-2] = 0x81;
-  Loc[-3] = (Rex & ~0x4) | (Rex & 0x4) >> 2;
-  write32le(Loc, Val);
+  loc[-2] = 0x81;
+  loc[-3] = (rex & ~0x4) | (rex & 0x4) >> 2;
+  write32le(loc, val);
 }
 
-template <class ELFT>
-void X86_64<ELFT>::relaxGot(uint8_t *Loc, uint64_t Val) const {
-  const uint8_t Op = Loc[-2];
-  const uint8_t ModRm = Loc[-1];
+void X86_64::relaxGot(uint8_t *loc, RelType type, uint64_t val) const {
+  const uint8_t op = loc[-2];
+  const uint8_t modRm = loc[-1];
 
   // Convert "mov foo@GOTPCREL(%rip),%reg" to "lea foo(%rip),%reg".
-  if (Op == 0x8b) {
-    Loc[-2] = 0x8d;
-    write32le(Loc, Val);
+  if (op == 0x8b) {
+    loc[-2] = 0x8d;
+    write32le(loc, val);
     return;
   }
 
-  if (Op != 0xff) {
+  if (op != 0xff) {
     // We are relaxing a rip relative to an absolute, so compensate
     // for the old -4 addend.
-    assert(!Config->Pic);
-    relaxGotNoPic(Loc, Val + 4, Op, ModRm);
+    assert(!config->isPic);
+    relaxGotNoPic(loc, val + 4, op, modRm);
     return;
   }
 
   // Convert call/jmp instructions.
-  if (ModRm == 0x15) {
+  if (modRm == 0x15) {
     // ABI says we can convert "call *foo@GOTPCREL(%rip)" to "nop; call foo".
     // Instead we convert to "addr32 call foo" where addr32 is an instruction
     // prefix. That makes result expression to be a single instruction.
-    Loc[-2] = 0x67; // addr32 prefix
-    Loc[-1] = 0xe8; // call
-    write32le(Loc, Val);
+    loc[-2] = 0x67; // addr32 prefix
+    loc[-1] = 0xe8; // call
+    write32le(loc, val);
     return;
   }
 
   // Convert "jmp *foo@GOTPCREL(%rip)" to "jmp foo; nop".
   // jmp doesn't return, so it is fine to use nop here, it is just a stub.
-  assert(ModRm == 0x25);
-  Loc[-2] = 0xe9; // jmp
-  Loc[3] = 0x90;  // nop
-  write32le(Loc - 1, Val + 1);
+  assert(modRm == 0x25);
+  loc[-2] = 0xe9; // jmp
+  loc[3] = 0x90;  // nop
+  write32le(loc - 1, val + 1);
 }
 
-// This anonymous namespace works around a warning bug in
-// old versions of gcc. See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480
-namespace {
-
 // A split-stack prologue starts by checking the amount of stack remaining
 // in one of two ways:
 // A) Comparing of the stack pointer to a field in the tcb.
 // B) Or a load of a stack pointer offset with an lea to r10 or r11.
-template <>
-bool X86_64<ELF64LE>::adjustPrologueForCrossSplitStack(uint8_t *Loc,
-                                                       uint8_t *End,
-                                                       uint8_t StOther) const {
-  if (Loc + 8 >= End)
+bool X86_64::adjustPrologueForCrossSplitStack(uint8_t *loc, uint8_t *end,
+                                              uint8_t stOther) const {
+  if (!config->is64) {
+    error("Target doesn't support split stacks.");
+    return false;
+  }
+
+  if (loc + 8 >= end)
     return false;
 
   // Replace "cmp %fs:0x70,%rsp" and subsequent branch
   // with "stc, nopl 0x0(%rax,%rax,1)"
-  if (memcmp(Loc, "\x64\x48\x3b\x24\x25", 5) == 0) {
-    memcpy(Loc, "\xf9\x0f\x1f\x84\x00\x00\x00\x00", 8);
+  if (memcmp(loc, "\x64\x48\x3b\x24\x25", 5) == 0) {
+    memcpy(loc, "\xf9\x0f\x1f\x84\x00\x00\x00\x00", 8);
     return true;
   }
 
@@ -519,25 +557,16 @@ bool X86_64<ELF64LE>::adjustPrologueForCrossSplitStack(uint8_t *Loc,
   // be r10 or r11. The lea instruction feeds a subsequent compare which checks
   // if there is X available stack space. Making X larger effectively reserves
   // that much additional space. The stack grows downward so subtract the value.
-  if (memcmp(Loc, "\x4c\x8d\x94\x24", 4) == 0 ||
-      memcmp(Loc, "\x4c\x8d\x9c\x24", 4) == 0) {
+  if (memcmp(loc, "\x4c\x8d\x94\x24", 4) == 0 ||
+      memcmp(loc, "\x4c\x8d\x9c\x24", 4) == 0) {
     // The offset bytes are encoded four bytes after the start of the
     // instruction.
-    write32le(Loc + 4, read32le(Loc + 4) - 0x4000);
+    write32le(loc + 4, read32le(loc + 4) - 0x4000);
     return true;
   }
   return false;
 }
 
-template <>
-bool X86_64<ELF32LE>::adjustPrologueForCrossSplitStack(uint8_t *Loc,
-                                                       uint8_t *End,
-                                                       uint8_t StOther) const {
-  llvm_unreachable("Target doesn't support split stacks.");
-}
-
-} // namespace
-
 // These nonstandard PLT entries are to migtigate Spectre v2 security
 // vulnerability. In order to mitigate Spectre v2, we want to avoid indirect
 // branch instructions such as `jmp *GOTPLT(%rip)`. So, in the following PLT
@@ -548,37 +577,36 @@ bool X86_64<ELF32LE>::adjustPrologueForCrossSplitStack(uint8_t *Loc,
 // is specified, all dynamic symbols are resolved at load-time. Thus, when
 // that option is given, we can omit code for symbol lazy resolution.
 namespace {
-template <class ELFT> class Retpoline : public X86_64<ELFT> {
+class Retpoline : public X86_64 {
 public:
   Retpoline();
-  void writeGotPlt(uint8_t *Buf, const Symbol &S) const override;
-  void writePltHeader(uint8_t *Buf) const override;
-  void writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr, uint64_t PltEntryAddr,
-                int32_t Index, unsigned RelOff) const override;
+  void writeGotPlt(uint8_t *buf, const Symbol &s) const override;
+  void writePltHeader(uint8_t *buf) const override;
+  void writePlt(uint8_t *buf, uint64_t gotPltEntryAddr, uint64_t pltEntryAddr,
+                int32_t index, unsigned relOff) const override;
 };
 
-template <class ELFT> class RetpolineZNow : public X86_64<ELFT> {
+class RetpolineZNow : public X86_64 {
 public:
   RetpolineZNow();
-  void writeGotPlt(uint8_t *Buf, const Symbol &S) const override {}
-  void writePltHeader(uint8_t *Buf) const override;
-  void writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr, uint64_t PltEntryAddr,
-                int32_t Index, unsigned RelOff) const override;
+  void writeGotPlt(uint8_t *buf, const Symbol &s) const override {}
+  void writePltHeader(uint8_t *buf) const override;
+  void writePlt(uint8_t *buf, uint64_t gotPltEntryAddr, uint64_t pltEntryAddr,
+                int32_t index, unsigned relOff) const override;
 };
 } // namespace
 
-template <class ELFT> Retpoline<ELFT>::Retpoline() {
-  TargetInfo::PltHeaderSize = 48;
-  TargetInfo::PltEntrySize = 32;
+Retpoline::Retpoline() {
+  pltHeaderSize = 48;
+  pltEntrySize = 32;
 }
 
-template <class ELFT>
-void Retpoline<ELFT>::writeGotPlt(uint8_t *Buf, const Symbol &S) const {
-  write64le(Buf, S.getPltVA() + 17);
+void Retpoline::writeGotPlt(uint8_t *buf, const Symbol &s) const {
+  write64le(buf, s.getPltVA() + 17);
 }
 
-template <class ELFT> void Retpoline<ELFT>::writePltHeader(uint8_t *Buf) const {
-  const uint8_t Insn[] = {
+void Retpoline::writePltHeader(uint8_t *buf) const {
+  const uint8_t insn[] = {
       0xff, 0x35, 0,    0,    0,    0,          // 0:    pushq GOTPLT+8(%rip)
       0x4c, 0x8b, 0x1d, 0,    0,    0,    0,    // 6:    mov GOTPLT+16(%rip), %r11
       0xe8, 0x0e, 0x00, 0x00, 0x00,             // d:    callq next
@@ -591,19 +619,18 @@ template <class ELFT> void Retpoline<ELFT>::writePltHeader(uint8_t *Buf) const {
       0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, // 25:   int3; padding
       0xcc, 0xcc, 0xcc, 0xcc,                   // 2c:   int3; padding
   };
-  memcpy(Buf, Insn, sizeof(Insn));
+  memcpy(buf, insn, sizeof(insn));
 
-  uint64_t GotPlt = In.GotPlt->getVA();
-  uint64_t Plt = In.Plt->getVA();
-  write32le(Buf + 2, GotPlt - Plt - 6 + 8);
-  write32le(Buf + 9, GotPlt - Plt - 13 + 16);
+  uint64_t gotPlt = in.gotPlt->getVA();
+  uint64_t plt = in.plt->getVA();
+  write32le(buf + 2, gotPlt - plt - 6 + 8);
+  write32le(buf + 9, gotPlt - plt - 13 + 16);
 }
 
-template <class ELFT>
-void Retpoline<ELFT>::writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr,
-                               uint64_t PltEntryAddr, int32_t Index,
-                               unsigned RelOff) const {
-  const uint8_t Insn[] = {
+void Retpoline::writePlt(uint8_t *buf, uint64_t gotPltEntryAddr,
+                         uint64_t pltEntryAddr, int32_t index,
+                         unsigned relOff) const {
+  const uint8_t insn[] = {
       0x4c, 0x8b, 0x1d, 0, 0, 0, 0, // 0:  mov foo@GOTPLT(%rip), %r11
       0xe8, 0,    0,    0,    0,    // 7:  callq plt+0x20
       0xe9, 0,    0,    0,    0,    // c:  jmp plt+0x12
@@ -611,25 +638,24 @@ void Retpoline<ELFT>::writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr,
       0xe9, 0,    0,    0,    0,    // 16: jmp plt+0
       0xcc, 0xcc, 0xcc, 0xcc, 0xcc, // 1b: int3; padding
   };
-  memcpy(Buf, Insn, sizeof(Insn));
+  memcpy(buf, insn, sizeof(insn));
 
-  uint64_t Off = getPltEntryOffset(Index);
+  uint64_t off = pltHeaderSize + pltEntrySize * index;
 
-  write32le(Buf + 3, GotPltEntryAddr - PltEntryAddr - 7);
-  write32le(Buf + 8, -Off - 12 + 32);
-  write32le(Buf + 13, -Off - 17 + 18);
-  write32le(Buf + 18, Index);
-  write32le(Buf + 23, -Off - 27);
+  write32le(buf + 3, gotPltEntryAddr - pltEntryAddr - 7);
+  write32le(buf + 8, -off - 12 + 32);
+  write32le(buf + 13, -off - 17 + 18);
+  write32le(buf + 18, index);
+  write32le(buf + 23, -off - 27);
 }
 
-template <class ELFT> RetpolineZNow<ELFT>::RetpolineZNow() {
-  TargetInfo::PltHeaderSize = 32;
-  TargetInfo::PltEntrySize = 16;
+RetpolineZNow::RetpolineZNow() {
+  pltHeaderSize = 32;
+  pltEntrySize = 16;
 }
 
-template <class ELFT>
-void RetpolineZNow<ELFT>::writePltHeader(uint8_t *Buf) const {
-  const uint8_t Insn[] = {
+void RetpolineZNow::writePltHeader(uint8_t *buf) const {
+  const uint8_t insn[] = {
       0xe8, 0x0b, 0x00, 0x00, 0x00, // 0:    call next
       0xf3, 0x90,                   // 5:  loop: pause
       0x0f, 0xae, 0xe8,             // 7:    lfence
@@ -641,37 +667,35 @@ void RetpolineZNow<ELFT>::writePltHeader(uint8_t *Buf) const {
       0xcc, 0xcc, 0xcc, 0xcc, 0xcc, // 1a:   int3; padding
       0xcc,                         // 1f:   int3; padding
   };
-  memcpy(Buf, Insn, sizeof(Insn));
+  memcpy(buf, insn, sizeof(insn));
 }
 
-template <class ELFT>
-void RetpolineZNow<ELFT>::writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr,
-                                   uint64_t PltEntryAddr, int32_t Index,
-                                   unsigned RelOff) const {
-  const uint8_t Insn[] = {
+void RetpolineZNow::writePlt(uint8_t *buf, uint64_t gotPltEntryAddr,
+                             uint64_t pltEntryAddr, int32_t index,
+                             unsigned relOff) const {
+  const uint8_t insn[] = {
       0x4c, 0x8b, 0x1d, 0,    0, 0, 0, // mov foo@GOTPLT(%rip), %r11
       0xe9, 0,    0,    0,    0,       // jmp plt+0
       0xcc, 0xcc, 0xcc, 0xcc,          // int3; padding
   };
-  memcpy(Buf, Insn, sizeof(Insn));
+  memcpy(buf, insn, sizeof(insn));
 
-  write32le(Buf + 3, GotPltEntryAddr - PltEntryAddr - 7);
-  write32le(Buf + 8, -getPltEntryOffset(Index) - 12);
+  write32le(buf + 3, gotPltEntryAddr - pltEntryAddr - 7);
+  write32le(buf + 8, -pltHeaderSize - pltEntrySize * index - 12);
 }
 
-template <class ELFT> static TargetInfo *getTargetInfo() {
-  if (Config->ZRetpolineplt) {
-    if (Config->ZNow) {
-      static RetpolineZNow<ELFT> T;
-      return &T;
+static TargetInfo *getTargetInfo() {
+  if (config->zRetpolineplt) {
+    if (config->zNow) {
+      static RetpolineZNow t;
+      return &t;
     }
-    static Retpoline<ELFT> T;
-    return &T;
+    static Retpoline t;
+    return &t;
   }
 
-  static X86_64<ELFT> T;
-  return &T;
+  static X86_64 t;
+  return &t;
 }
 
-TargetInfo *elf::getX32TargetInfo() { return getTargetInfo<ELF32LE>(); }
-TargetInfo *elf::getX86_64TargetInfo() { return getTargetInfo<ELF64LE>(); }
+TargetInfo *elf::getX86_64TargetInfo() { return getTargetInfo(); }
diff --git a/deps/lld/ELF/Bits.h b/deps/lld/ELF/Bits.h
deleted file mode 100644
index 13d40322265ea121cfa764e85d85af16361ab09b..0000000000000000000000000000000000000000
--- a/deps/lld/ELF/Bits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//===- Bits.h ---------------------------------------------------*- C++ -*-===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_ELF_BITS_H
-#define LLD_ELF_BITS_H
-
-#include "Config.h"
-#include "llvm/Support/Endian.h"
-
-namespace lld {
-namespace elf {
-
-inline uint64_t readUint(uint8_t *Buf) {
-  if (Config->Is64)
-    return llvm::support::endian::read64(Buf, Config->Endianness);
-  return llvm::support::endian::read32(Buf, Config->Endianness);
-}
-
-inline void writeUint(uint8_t *Buf, uint64_t Val) {
-  if (Config->Is64)
-    llvm::support::endian::write64(Buf, Val, Config->Endianness);
-  else
-    llvm::support::endian::write32(Buf, Val, Config->Endianness);
-}
-
-} // namespace elf
-} // namespace lld
-
-#endif
diff --git a/deps/lld/ELF/CMakeLists.txt b/deps/lld/ELF/CMakeLists.txt
index a1c23b0d49ac7fb8a19fd7e6b50464da440ec1fe..70578746483df805265fb59b2764abfdacb4c3ea 100644
--- a/deps/lld/ELF/CMakeLists.txt
+++ b/deps/lld/ELF/CMakeLists.txt
@@ -27,7 +27,6 @@ add_lld_library(lldELF
   Driver.cpp
   DriverUtils.cpp
   EhFrame.cpp
-  Filesystem.cpp
   ICF.cpp
   InputFiles.cpp
   InputSection.cpp
diff --git a/deps/lld/ELF/CallGraphSort.cpp b/deps/lld/ELF/CallGraphSort.cpp
index 2a7d78664b8e4368c70cace1871b029d47bfe283..9aaadd4818336b4e3905dcfbc5d8321a3f5f3a3c 100644
--- a/deps/lld/ELF/CallGraphSort.cpp
+++ b/deps/lld/ELF/CallGraphSort.cpp
@@ -1,9 +1,8 @@
 //===- CallGraphSort.cpp --------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 ///
@@ -52,24 +51,24 @@ using namespace lld::elf;
 
 namespace {
 struct Edge {
-  int From;
-  uint64_t Weight;
+  int from;
+  uint64_t weight;
 };
 
 struct Cluster {
-  Cluster(int Sec, size_t S) : Sections{Sec}, Size(S) {}
+  Cluster(int sec, size_t s) : sections{sec}, size(s) {}
 
   double getDensity() const {
-    if (Size == 0)
+    if (size == 0)
       return 0;
-    return double(Weight) / double(Size);
+    return double(weight) / double(size);
   }
 
-  std::vector<int> Sections;
-  size_t Size = 0;
-  uint64_t Weight = 0;
-  uint64_t InitialWeight = 0;
-  Edge BestPred = {-1, 0};
+  std::vector<int> sections;
+  size_t size = 0;
+  uint64_t weight = 0;
+  uint64_t initialWeight = 0;
+  Edge bestPred = {-1, 0};
 };
 
 class CallGraphSort {
@@ -79,8 +78,8 @@ public:
   DenseMap<const InputSectionBase *, int> run();
 
 private:
-  std::vector<Cluster> Clusters;
-  std::vector<const InputSectionBase *> Sections;
+  std::vector<Cluster> clusters;
+  std::vector<const InputSectionBase *> sections;
 
   void groupClusters();
 };
@@ -93,30 +92,30 @@ constexpr int MAX_DENSITY_DEGRADATION = 8;
 constexpr uint64_t MAX_CLUSTER_SIZE = 1024 * 1024;
 } // end anonymous namespace
 
-typedef std::pair<const InputSectionBase *, const InputSectionBase *>
-    SectionPair;
+using SectionPair =
+    std::pair<const InputSectionBase *, const InputSectionBase *>;
 
 // Take the edge list in Config->CallGraphProfile, resolve symbol names to
 // Symbols, and generate a graph between InputSections with the provided
 // weights.
 CallGraphSort::CallGraphSort() {
-  MapVector<SectionPair, uint64_t> &Profile = Config->CallGraphProfile;
-  DenseMap<const InputSectionBase *, int> SecToCluster;
+  MapVector<SectionPair, uint64_t> &profile = config->callGraphProfile;
+  DenseMap<const InputSectionBase *, int> secToCluster;
 
-  auto GetOrCreateNode = [&](const InputSectionBase *IS) -> int {
-    auto Res = SecToCluster.insert(std::make_pair(IS, Clusters.size()));
-    if (Res.second) {
-      Sections.push_back(IS);
-      Clusters.emplace_back(Clusters.size(), IS->getSize());
+  auto getOrCreateNode = [&](const InputSectionBase *isec) -> int {
+    auto res = secToCluster.insert(std::make_pair(isec, clusters.size()));
+    if (res.second) {
+      sections.push_back(isec);
+      clusters.emplace_back(clusters.size(), isec->getSize());
     }
-    return Res.first->second;
+    return res.first->second;
   };
 
   // Create the graph.
-  for (std::pair<SectionPair, uint64_t> &C : Profile) {
-    const auto *FromSB = cast<InputSectionBase>(C.first.first->Repl);
-    const auto *ToSB = cast<InputSectionBase>(C.first.second->Repl);
-    uint64_t Weight = C.second;
+  for (std::pair<SectionPair, uint64_t> &c : profile) {
+    const auto *fromSB = cast<InputSectionBase>(c.first.first->repl);
+    const auto *toSB = cast<InputSectionBase>(c.first.second->repl);
+    uint64_t weight = c.second;
 
     // Ignore edges between input sections belonging to different output
     // sections.  This is done because otherwise we would end up with clusters
@@ -124,110 +123,130 @@ CallGraphSort::CallGraphSort() {
     // output.  This messes with the cluster size and density calculations.  We
     // would also end up moving input sections in other output sections without
     // moving them closer to what calls them.
-    if (FromSB->getOutputSection() != ToSB->getOutputSection())
+    if (fromSB->getOutputSection() != toSB->getOutputSection())
       continue;
 
-    int From = GetOrCreateNode(FromSB);
-    int To = GetOrCreateNode(ToSB);
+    int from = getOrCreateNode(fromSB);
+    int to = getOrCreateNode(toSB);
 
-    Clusters[To].Weight += Weight;
+    clusters[to].weight += weight;
 
-    if (From == To)
+    if (from == to)
       continue;
 
     // Remember the best edge.
-    Cluster &ToC = Clusters[To];
-    if (ToC.BestPred.From == -1 || ToC.BestPred.Weight < Weight) {
-      ToC.BestPred.From = From;
-      ToC.BestPred.Weight = Weight;
+    Cluster &toC = clusters[to];
+    if (toC.bestPred.from == -1 || toC.bestPred.weight < weight) {
+      toC.bestPred.from = from;
+      toC.bestPred.weight = weight;
     }
   }
-  for (Cluster &C : Clusters)
-    C.InitialWeight = C.Weight;
+  for (Cluster &c : clusters)
+    c.initialWeight = c.weight;
 }
 
 // It's bad to merge clusters which would degrade the density too much.
-static bool isNewDensityBad(Cluster &A, Cluster &B) {
-  double NewDensity = double(A.Weight + B.Weight) / double(A.Size + B.Size);
-  return NewDensity < A.getDensity() / MAX_DENSITY_DEGRADATION;
+static bool isNewDensityBad(Cluster &a, Cluster &b) {
+  double newDensity = double(a.weight + b.weight) / double(a.size + b.size);
+  return newDensity < a.getDensity() / MAX_DENSITY_DEGRADATION;
 }
 
-static void mergeClusters(Cluster &Into, Cluster &From) {
-  Into.Sections.insert(Into.Sections.end(), From.Sections.begin(),
-                       From.Sections.end());
-  Into.Size += From.Size;
-  Into.Weight += From.Weight;
-  From.Sections.clear();
-  From.Size = 0;
-  From.Weight = 0;
+static void mergeClusters(Cluster &into, Cluster &from) {
+  into.sections.insert(into.sections.end(), from.sections.begin(),
+                       from.sections.end());
+  into.size += from.size;
+  into.weight += from.weight;
+  from.sections.clear();
+  from.size = 0;
+  from.weight = 0;
 }
 
 // Group InputSections into clusters using the Call-Chain Clustering heuristic
 // then sort the clusters by density.
 void CallGraphSort::groupClusters() {
-  std::vector<int> SortedSecs(Clusters.size());
-  std::vector<Cluster *> SecToCluster(Clusters.size());
+  std::vector<int> sortedSecs(clusters.size());
+  std::vector<Cluster *> secToCluster(clusters.size());
 
-  for (size_t I = 0; I < Clusters.size(); ++I) {
-    SortedSecs[I] = I;
-    SecToCluster[I] = &Clusters[I];
+  for (size_t i = 0; i < clusters.size(); ++i) {
+    sortedSecs[i] = i;
+    secToCluster[i] = &clusters[i];
   }
 
-  std::stable_sort(SortedSecs.begin(), SortedSecs.end(), [&](int A, int B) {
-    return Clusters[B].getDensity() < Clusters[A].getDensity();
+  llvm::stable_sort(sortedSecs, [&](int a, int b) {
+    return clusters[a].getDensity() > clusters[b].getDensity();
   });
 
-  for (int SI : SortedSecs) {
-    // Clusters[SI] is the same as SecToClusters[SI] here because it has not
+  for (int si : sortedSecs) {
+    // clusters[si] is the same as secToClusters[si] here because it has not
     // been merged into another cluster yet.
-    Cluster &C = Clusters[SI];
+    Cluster &c = clusters[si];
 
     // Don't consider merging if the edge is unlikely.
-    if (C.BestPred.From == -1 || C.BestPred.Weight * 10 <= C.InitialWeight)
+    if (c.bestPred.from == -1 || c.bestPred.weight * 10 <= c.initialWeight)
       continue;
 
-    Cluster *PredC = SecToCluster[C.BestPred.From];
-    if (PredC == &C)
+    Cluster *predC = secToCluster[c.bestPred.from];
+    if (predC == &c)
       continue;
 
-    if (C.Size + PredC->Size > MAX_CLUSTER_SIZE)
+    if (c.size + predC->size > MAX_CLUSTER_SIZE)
       continue;
 
-    if (isNewDensityBad(*PredC, C))
+    if (isNewDensityBad(*predC, c))
       continue;
 
     // NOTE: Consider using a disjoint-set to track section -> cluster mapping
     // if this is ever slow.
-    for (int SI : C.Sections)
-      SecToCluster[SI] = PredC;
+    for (int si : c.sections)
+      secToCluster[si] = predC;
 
-    mergeClusters(*PredC, C);
+    mergeClusters(*predC, c);
   }
 
   // Remove empty or dead nodes. Invalidates all cluster indices.
-  llvm::erase_if(Clusters, [](const Cluster &C) {
-    return C.Size == 0 || C.Sections.empty();
+  llvm::erase_if(clusters, [](const Cluster &c) {
+    return c.size == 0 || c.sections.empty();
   });
 
   // Sort by density.
-  std::stable_sort(Clusters.begin(), Clusters.end(),
-                   [](const Cluster &A, const Cluster &B) {
-                     return A.getDensity() > B.getDensity();
-                   });
+  llvm::stable_sort(clusters, [](const Cluster &a, const Cluster &b) {
+    return a.getDensity() > b.getDensity();
+  });
 }
 
 DenseMap<const InputSectionBase *, int> CallGraphSort::run() {
   groupClusters();
 
   // Generate order.
-  DenseMap<const InputSectionBase *, int> OrderMap;
-  ssize_t CurOrder = 1;
+  DenseMap<const InputSectionBase *, int> orderMap;
+  ssize_t curOrder = 1;
 
-  for (const Cluster &C : Clusters)
-    for (int SecIndex : C.Sections)
-      OrderMap[Sections[SecIndex]] = CurOrder++;
+  for (const Cluster &c : clusters)
+    for (int secIndex : c.sections)
+      orderMap[sections[secIndex]] = curOrder++;
 
-  return OrderMap;
+  if (!config->printSymbolOrder.empty()) {
+    std::error_code ec;
+    raw_fd_ostream os(config->printSymbolOrder, ec, sys::fs::F_None);
+    if (ec) {
+      error("cannot open " + config->printSymbolOrder + ": " + ec.message());
+      return orderMap;
+    }
+
+    // Print the symbols ordered by C3, in the order of increasing curOrder
+    // Instead of sorting all the orderMap, just repeat the loops above.
+    for (const Cluster &c : clusters)
+      for (int secIndex : c.sections)
+        // Search all the symbols in the file of the section
+        // and find out a Defined symbol with name that is within the section.
+        for (Symbol *sym: sections[secIndex]->file->getSymbols())
+          if (!sym->isSection()) // Filter out section-type symbols here.
+            if (auto *d = dyn_cast<Defined>(sym))
+              if (sections[secIndex] == d->section)
+                os << sym->getName() << "\n";
+  }
+
+  return orderMap;
 }
 
 // Sort sections by the profile data provided by -callgraph-profile-file
diff --git a/deps/lld/ELF/CallGraphSort.h b/deps/lld/ELF/CallGraphSort.h
index 3f96dc88f435b7176c9eff2657637cd6d86e114b..5a092278a41640b8cbbcb4c3032f5eea2f8b16dd 100644
--- a/deps/lld/ELF/CallGraphSort.h
+++ b/deps/lld/ELF/CallGraphSort.h
@@ -1,9 +1,8 @@
 //===- CallGraphSort.h ------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/ELF/Config.h b/deps/lld/ELF/Config.h
index 60555f188fed3e751fc81b00be4bb6b023338178..ff9d3dc0933c0b396ce6298e17ba0b5939b56f28 100644
--- a/deps/lld/ELF/Config.h
+++ b/deps/lld/ELF/Config.h
@@ -1,9 +1,8 @@
 //===- Config.h -------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -18,6 +17,7 @@
 #include "llvm/Support/CachePruning.h"
 #include "llvm/Support/CodeGen.h"
 #include "llvm/Support/Endian.h"
+#include <atomic>
 #include <vector>
 
 namespace lld {
@@ -62,18 +62,17 @@ enum class Target2Policy { Abs, Rel, GotRel };
 enum class ARMVFPArgKind { Default, Base, VFP, ToolChain };
 
 struct SymbolVersion {
-  llvm::StringRef Name;
-  bool IsExternCpp;
-  bool HasWildcard;
+  llvm::StringRef name;
+  bool isExternCpp;
+  bool hasWildcard;
 };
 
 // This struct contains symbols version definition that
 // can be found in version script if it is used for link.
 struct VersionDefinition {
-  llvm::StringRef Name;
-  uint16_t Id = 0;
-  std::vector<SymbolVersion> Globals;
-  size_t NameOff = 0; // Offset in the string table
+  llvm::StringRef name;
+  uint16_t id = 0;
+  std::vector<SymbolVersion> globals;
 };
 
 // This struct contains the global configuration for the linker.
@@ -81,163 +80,177 @@ struct VersionDefinition {
 // and such fields have the same name as the corresponding options.
 // Most fields are initialized by the driver.
 struct Configuration {
-  uint8_t OSABI = 0;
-  llvm::CachePruningPolicy ThinLTOCachePolicy;
-  llvm::StringMap<uint64_t> SectionStartMap;
-  llvm::StringRef Chroot;
-  llvm::StringRef DynamicLinker;
-  llvm::StringRef DwoDir;
-  llvm::StringRef Entry;
-  llvm::StringRef Emulation;
-  llvm::StringRef Fini;
-  llvm::StringRef Init;
-  llvm::StringRef LTOAAPipeline;
-  llvm::StringRef LTONewPmPasses;
-  llvm::StringRef LTOObjPath;
-  llvm::StringRef LTOSampleProfile;
-  llvm::StringRef MapFile;
-  llvm::StringRef OutputFile;
-  llvm::StringRef OptRemarksFilename;
-  llvm::StringRef ProgName;
-  llvm::StringRef SoName;
-  llvm::StringRef Sysroot;
-  llvm::StringRef ThinLTOCacheDir;
-  llvm::StringRef ThinLTOIndexOnlyArg;
-  std::pair<llvm::StringRef, llvm::StringRef> ThinLTOObjectSuffixReplace;
-  std::pair<llvm::StringRef, llvm::StringRef> ThinLTOPrefixReplace;
-  std::string Rpath;
-  std::vector<VersionDefinition> VersionDefinitions;
-  std::vector<llvm::StringRef> AuxiliaryList;
-  std::vector<llvm::StringRef> FilterList;
-  std::vector<llvm::StringRef> SearchPaths;
-  std::vector<llvm::StringRef> SymbolOrderingFile;
-  std::vector<llvm::StringRef> Undefined;
-  std::vector<SymbolVersion> DynamicList;
-  std::vector<SymbolVersion> VersionScriptGlobals;
-  std::vector<SymbolVersion> VersionScriptLocals;
-  std::vector<uint8_t> BuildIdVector;
+  uint8_t osabi = 0;
+  uint32_t andFeatures = 0;
+  llvm::CachePruningPolicy thinLTOCachePolicy;
+  llvm::StringMap<uint64_t> sectionStartMap;
+  llvm::StringRef chroot;
+  llvm::StringRef dynamicLinker;
+  llvm::StringRef dwoDir;
+  llvm::StringRef entry;
+  llvm::StringRef emulation;
+  llvm::StringRef fini;
+  llvm::StringRef init;
+  llvm::StringRef ltoAAPipeline;
+  llvm::StringRef ltoCSProfileFile;
+  llvm::StringRef ltoNewPmPasses;
+  llvm::StringRef ltoObjPath;
+  llvm::StringRef ltoSampleProfile;
+  llvm::StringRef mapFile;
+  llvm::StringRef outputFile;
+  llvm::StringRef optRemarksFilename;
+  llvm::StringRef optRemarksPasses;
+  llvm::StringRef optRemarksFormat;
+  llvm::StringRef progName;
+  llvm::StringRef printSymbolOrder;
+  llvm::StringRef soName;
+  llvm::StringRef sysroot;
+  llvm::StringRef thinLTOCacheDir;
+  llvm::StringRef thinLTOIndexOnlyArg;
+  std::pair<llvm::StringRef, llvm::StringRef> thinLTOObjectSuffixReplace;
+  std::pair<llvm::StringRef, llvm::StringRef> thinLTOPrefixReplace;
+  std::string rpath;
+  std::vector<VersionDefinition> versionDefinitions;
+  std::vector<llvm::StringRef> auxiliaryList;
+  std::vector<llvm::StringRef> filterList;
+  std::vector<llvm::StringRef> searchPaths;
+  std::vector<llvm::StringRef> symbolOrderingFile;
+  std::vector<llvm::StringRef> undefined;
+  std::vector<SymbolVersion> dynamicList;
+  std::vector<SymbolVersion> versionScriptGlobals;
+  std::vector<SymbolVersion> versionScriptLocals;
+  std::vector<uint8_t> buildIdVector;
   llvm::MapVector<std::pair<const InputSectionBase *, const InputSectionBase *>,
                   uint64_t>
-      CallGraphProfile;
-  bool AllowMultipleDefinition;
-  bool AndroidPackDynRelocs;
-  bool ARMHasBlx = false;
-  bool ARMHasMovtMovw = false;
-  bool ARMJ1J2BranchEncoding = false;
-  bool AsNeeded = false;
-  bool Bsymbolic;
-  bool BsymbolicFunctions;
-  bool CallGraphProfileSort;
-  bool CheckSections;
-  bool CompressDebugSections;
-  bool Cref;
-  bool DefineCommon;
-  bool Demangle = true;
-  bool DisableVerify;
-  bool EhFrameHdr;
-  bool EmitLLVM;
-  bool EmitRelocs;
-  bool EnableNewDtags;
-  bool ExecuteOnly;
-  bool ExportDynamic;
-  bool FixCortexA53Errata843419;
-  bool FormatBinary = false;
-  bool GcSections;
-  bool GdbIndex;
-  bool GnuHash = false;
-  bool GnuUnique;
-  bool HasDynamicList = false;
-  bool HasDynSymTab;
-  bool IgnoreDataAddressEquality;
-  bool IgnoreFunctionAddressEquality;
-  bool LTODebugPassManager;
-  bool LTONewPassManager;
-  bool MergeArmExidx;
-  bool MipsN32Abi = false;
-  bool NoinhibitExec;
-  bool Nostdlib;
-  bool OFormatBinary;
-  bool Omagic;
-  bool OptRemarksWithHotness;
-  bool PicThunk;
-  bool Pie;
-  bool PrintGcSections;
-  bool PrintIcfSections;
-  bool Relocatable;
-  bool RelrPackDynRelocs;
-  bool SaveTemps;
-  bool SingleRoRx;
-  bool Shared;
-  bool Static = false;
-  bool SysvHash = false;
-  bool Target1Rel;
-  bool Trace;
-  bool ThinLTOEmitImportsFiles;
-  bool ThinLTOIndexOnly;
-  bool TocOptimize;
-  bool UndefinedVersion;
-  bool UseAndroidRelrTags = false;
-  bool WarnBackrefs;
-  bool WarnCommon;
-  bool WarnIfuncTextrel;
-  bool WarnMissingEntry;
-  bool WarnSymbolOrdering;
-  bool WriteAddends;
-  bool ZCombreloc;
-  bool ZCopyreloc;
-  bool ZExecstack;
-  bool ZGlobal;
-  bool ZHazardplt;
-  bool ZInitfirst;
-  bool ZInterpose;
-  bool ZKeepTextSectionPrefix;
-  bool ZNodefaultlib;
-  bool ZNodelete;
-  bool ZNodlopen;
-  bool ZNow;
-  bool ZOrigin;
-  bool ZRelro;
-  bool ZRodynamic;
-  bool ZText;
-  bool ZRetpolineplt;
-  bool ZWxneeded;
-  DiscardPolicy Discard;
-  ICFLevel ICF;
-  OrphanHandlingPolicy OrphanHandling;
-  SortSectionPolicy SortSection;
-  StripPolicy Strip;
-  UnresolvedPolicy UnresolvedSymbols;
-  Target2Policy Target2;
-  ARMVFPArgKind ARMVFPArgs = ARMVFPArgKind::Default;
-  BuildIdKind BuildId = BuildIdKind::None;
-  ELFKind EKind = ELFNoneKind;
-  uint16_t DefaultSymbolVersion = llvm::ELF::VER_NDX_GLOBAL;
-  uint16_t EMachine = llvm::ELF::EM_NONE;
-  llvm::Optional<uint64_t> ImageBase;
-  uint64_t MaxPageSize;
-  uint64_t MipsGotSize;
-  uint64_t ZStackSize;
-  unsigned LTOPartitions;
-  unsigned LTOO;
-  unsigned Optimize;
-  unsigned ThinLTOJobs;
-  int32_t SplitStackAdjustSize;
+      callGraphProfile;
+  bool allowMultipleDefinition;
+  bool allowShlibUndefined;
+  bool androidPackDynRelocs;
+  bool armHasBlx = false;
+  bool armHasMovtMovw = false;
+  bool armJ1J2BranchEncoding = false;
+  bool asNeeded = false;
+  bool bsymbolic;
+  bool bsymbolicFunctions;
+  bool callGraphProfileSort;
+  bool checkSections;
+  bool compressDebugSections;
+  bool cref;
+  bool defineCommon;
+  bool demangle = true;
+  bool dependentLibraries;
+  bool disableVerify;
+  bool ehFrameHdr;
+  bool emitLLVM;
+  bool emitRelocs;
+  bool enableNewDtags;
+  bool executeOnly;
+  bool exportDynamic;
+  bool fixCortexA53Errata843419;
+  bool forceBTI;
+  bool formatBinary = false;
+  bool requireCET;
+  bool gcSections;
+  bool gdbIndex;
+  bool gnuHash = false;
+  bool gnuUnique;
+  bool hasDynamicList = false;
+  bool hasDynSymTab;
+  bool ignoreDataAddressEquality;
+  bool ignoreFunctionAddressEquality;
+  bool ltoCSProfileGenerate;
+  bool ltoDebugPassManager;
+  bool ltoNewPassManager;
+  bool mergeArmExidx;
+  bool mipsN32Abi = false;
+  bool nmagic;
+  bool noinhibitExec;
+  bool nostdlib;
+  bool oFormatBinary;
+  bool omagic;
+  bool optRemarksWithHotness;
+  bool pacPlt;
+  bool picThunk;
+  bool pie;
+  bool printGcSections;
+  bool printIcfSections;
+  bool relocatable;
+  bool relrPackDynRelocs;
+  bool saveTemps;
+  bool singleRoRx;
+  bool shared;
+  bool isStatic = false;
+  bool sysvHash = false;
+  bool target1Rel;
+  bool trace;
+  bool thinLTOEmitImportsFiles;
+  bool thinLTOIndexOnly;
+  bool tocOptimize;
+  bool undefinedVersion;
+  bool useAndroidRelrTags = false;
+  bool warnBackrefs;
+  bool warnCommon;
+  bool warnIfuncTextrel;
+  bool warnMissingEntry;
+  bool warnSymbolOrdering;
+  bool writeAddends;
+  bool zCombreloc;
+  bool zCopyreloc;
+  bool zExecstack;
+  bool zGlobal;
+  bool zHazardplt;
+  bool zIfuncNoplt;
+  bool zInitfirst;
+  bool zInterpose;
+  bool zKeepTextSectionPrefix;
+  bool zNodefaultlib;
+  bool zNodelete;
+  bool zNodlopen;
+  bool zNow;
+  bool zOrigin;
+  bool zRelro;
+  bool zRodynamic;
+  bool zText;
+  bool zRetpolineplt;
+  bool zWxneeded;
+  DiscardPolicy discard;
+  ICFLevel icf;
+  OrphanHandlingPolicy orphanHandling;
+  SortSectionPolicy sortSection;
+  StripPolicy strip;
+  UnresolvedPolicy unresolvedSymbols;
+  Target2Policy target2;
+  ARMVFPArgKind armVFPArgs = ARMVFPArgKind::Default;
+  BuildIdKind buildId = BuildIdKind::None;
+  ELFKind ekind = ELFNoneKind;
+  uint16_t defaultSymbolVersion = llvm::ELF::VER_NDX_GLOBAL;
+  uint16_t emachine = llvm::ELF::EM_NONE;
+  llvm::Optional<uint64_t> imageBase;
+  uint64_t commonPageSize;
+  uint64_t maxPageSize;
+  uint64_t mipsGotSize;
+  uint64_t zStackSize;
+  unsigned ltoPartitions;
+  unsigned ltoo;
+  unsigned optimize;
+  unsigned thinLTOJobs;
+  int32_t splitStackAdjustSize;
 
   // The following config options do not directly correspond to any
   // particualr command line options.
 
   // True if we need to pass through relocations in input files to the
   // output file. Usually false because we consume relocations.
-  bool CopyRelocs;
+  bool copyRelocs;
 
   // True if the target is ELF64. False if ELF32.
-  bool Is64;
+  bool is64;
 
   // True if the target is little-endian. False if big-endian.
-  bool IsLE;
+  bool isLE;
 
-  // endianness::little if IsLE is true. endianness::big otherwise.
-  llvm::support::endianness Endianness;
+  // endianness::little if isLE is true. endianness::big otherwise.
+  llvm::support::endianness endianness;
 
   // True if the target is the little-endian MIPS64.
   //
@@ -251,10 +264,24 @@ struct Configuration {
   // name whatever that means. A fun hypothesis is that "EL" is short for
   // little-endian written in the little-endian order, but I don't know
   // if that's true.)
-  bool IsMips64EL;
+  bool isMips64EL;
+
+  // True if we need to set the DF_STATIC_TLS flag to an output file,
+  // which works as a hint to the dynamic loader that the file contains
+  // code compiled with the static TLS model. The thread-local variable
+  // compiled with the static TLS model is faster but less flexible, and
+  // it may not be loaded using dlopen().
+  //
+  // We set this flag to true when we see a relocation for the static TLS
+  // model. Once this becomes true, it will never become false.
+  //
+  // Since the flag is updated by multi-threaded code, we use std::atomic.
+  // (Writing to a variable is not considered thread-safe even if the
+  // variable is boolean and we always set the same value from all threads.)
+  std::atomic<bool> hasStaticTlsModel{false};
 
   // Holds set of ELF header flags for the target.
-  uint32_t EFlags = 0;
+  uint32_t eflags = 0;
 
   // The ELF spec defines two types of relocation table entries, RELA and
   // REL. RELA is a triplet of (offset, info, addend) while REL is a
@@ -270,23 +297,23 @@ struct Configuration {
   // Each ABI defines its relocation type. IsRela is true if target
   // uses RELA. As far as we know, all 64-bit ABIs are using RELA. A
   // few 32-bit ABIs are using RELA too.
-  bool IsRela;
+  bool isRela;
 
   // True if we are creating position-independent code.
-  bool Pic;
+  bool isPic;
 
   // 4 for ELF32, 8 for ELF64.
-  int Wordsize;
+  int wordsize;
 };
 
 // The only instance of Configuration struct.
-extern Configuration *Config;
+extern Configuration *config;
 
-static inline void errorOrWarn(const Twine &Msg) {
-  if (!Config->NoinhibitExec)
-    error(Msg);
+static inline void errorOrWarn(const Twine &msg) {
+  if (!config->noinhibitExec)
+    error(msg);
   else
-    warn(Msg);
+    warn(msg);
 }
 } // namespace elf
 } // namespace lld
diff --git a/deps/lld/ELF/DWARF.cpp b/deps/lld/ELF/DWARF.cpp
index 17e1a4d600eb561279662d421f978e41f7817920..1e4b36f71b54062ea7a0e6003e65e8edf9dab52e 100644
--- a/deps/lld/ELF/DWARF.cpp
+++ b/deps/lld/ELF/DWARF.cpp
@@ -1,9 +1,8 @@
 //===- DWARF.cpp ----------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -26,81 +25,102 @@ using namespace llvm::object;
 using namespace lld;
 using namespace lld::elf;
 
-template <class ELFT> LLDDwarfObj<ELFT>::LLDDwarfObj(ObjFile<ELFT> *Obj) {
-  for (InputSectionBase *Sec : Obj->getSections()) {
-    if (!Sec)
+template <class ELFT> LLDDwarfObj<ELFT>::LLDDwarfObj(ObjFile<ELFT> *obj) {
+  for (InputSectionBase *sec : obj->getSections()) {
+    if (!sec)
       continue;
 
-    if (LLDDWARFSection *M =
-            StringSwitch<LLDDWARFSection *>(Sec->Name)
-                .Case(".debug_addr", &AddrSection)
-                .Case(".debug_gnu_pubnames", &GnuPubNamesSection)
-                .Case(".debug_gnu_pubtypes", &GnuPubTypesSection)
-                .Case(".debug_info", &InfoSection)
-                .Case(".debug_ranges", &RangeSection)
-                .Case(".debug_rnglists", &RngListsSection)
-                .Case(".debug_line", &LineSection)
+    if (LLDDWARFSection *m =
+            StringSwitch<LLDDWARFSection *>(sec->name)
+                .Case(".debug_addr", &addrSection)
+                .Case(".debug_gnu_pubnames", &gnuPubNamesSection)
+                .Case(".debug_gnu_pubtypes", &gnuPubTypesSection)
+                .Case(".debug_info", &infoSection)
+                .Case(".debug_ranges", &rangeSection)
+                .Case(".debug_rnglists", &rngListsSection)
+                .Case(".debug_line", &lineSection)
                 .Default(nullptr)) {
-      M->Data = toStringRef(Sec->data());
-      M->Sec = Sec;
+      m->Data = toStringRef(sec->data());
+      m->sec = sec;
       continue;
     }
 
-    if (Sec->Name == ".debug_abbrev")
-      AbbrevSection = toStringRef(Sec->data());
-    else if (Sec->Name == ".debug_str")
-      StrSection = toStringRef(Sec->data());
-    else if (Sec->Name == ".debug_line_str")
-      LineStringSection = toStringRef(Sec->data());
+    if (sec->name == ".debug_abbrev")
+      abbrevSection = toStringRef(sec->data());
+    else if (sec->name == ".debug_str")
+      strSection = toStringRef(sec->data());
+    else if (sec->name == ".debug_line_str")
+      lineStringSection = toStringRef(sec->data());
   }
 }
 
+namespace {
+template <class RelTy> struct LLDRelocationResolver {
+  // In the ELF ABIs, S sepresents the value of the symbol in the relocation
+  // entry. For Rela, the addend is stored as part of the relocation entry.
+  static uint64_t resolve(object::RelocationRef ref, uint64_t s,
+                          uint64_t /* A */) {
+    return s + ref.getRawDataRefImpl().p;
+  }
+};
+
+template <class ELFT> struct LLDRelocationResolver<Elf_Rel_Impl<ELFT, false>> {
+  // For Rel, the addend A is supplied by the caller.
+  static uint64_t resolve(object::RelocationRef /*Ref*/, uint64_t s,
+                          uint64_t a) {
+    return s + a;
+  }
+};
+} // namespace
+
 // Find if there is a relocation at Pos in Sec.  The code is a bit
 // more complicated than usual because we need to pass a section index
 // to llvm since it has no idea about InputSection.
 template <class ELFT>
 template <class RelTy>
 Optional<RelocAddrEntry>
-LLDDwarfObj<ELFT>::findAux(const InputSectionBase &Sec, uint64_t Pos,
-                           ArrayRef<RelTy> Rels) const {
-  auto It = std::lower_bound(
-      Rels.begin(), Rels.end(), Pos,
-      [](const RelTy &A, uint64_t B) { return A.r_offset < B; });
-  if (It == Rels.end() || It->r_offset != Pos)
+LLDDwarfObj<ELFT>::findAux(const InputSectionBase &sec, uint64_t pos,
+                           ArrayRef<RelTy> rels) const {
+  auto it =
+      partition_point(rels, [=](const RelTy &a) { return a.r_offset < pos; });
+  if (it == rels.end() || it->r_offset != pos)
     return None;
-  const RelTy &Rel = *It;
+  const RelTy &rel = *it;
 
-  const ObjFile<ELFT> *File = Sec.getFile<ELFT>();
-  uint32_t SymIndex = Rel.getSymbol(Config->IsMips64EL);
-  const typename ELFT::Sym &Sym = File->getELFSyms()[SymIndex];
-  uint32_t SecIndex = File->getSectionIndex(Sym);
+  const ObjFile<ELFT> *file = sec.getFile<ELFT>();
+  uint32_t symIndex = rel.getSymbol(config->isMips64EL);
+  const typename ELFT::Sym &sym = file->template getELFSyms<ELFT>()[symIndex];
+  uint32_t secIndex = file->getSectionIndex(sym);
 
-  // Broken debug info can point to a non-Defined symbol.
-  auto *DR = dyn_cast<Defined>(&File->getRelocTargetSym(Rel));
-  if (!DR) {
-    RelType Type = Rel.getType(Config->IsMips64EL);
-    if (Type != Target->NoneRel)
-      error(toString(File) + ": relocation " + lld::toString(Type) + " at 0x" +
-            llvm::utohexstr(Rel.r_offset) + " has unsupported target");
-    return None;
+  // An undefined symbol may be a symbol defined in a discarded section. We
+  // shall still resolve it. This is important for --gdb-index: the end address
+  // offset of an entry in .debug_ranges is relocated. If it is not resolved,
+  // its zero value will terminate the decoding of .debug_ranges prematurely.
+  Symbol &s = file->getRelocTargetSym(rel);
+  uint64_t val = 0;
+  if (auto *dr = dyn_cast<Defined>(&s)) {
+    val = dr->value;
+
+    // FIXME: We should be consistent about always adding the file
+    // offset or not.
+    if (dr->section->flags & ELF::SHF_ALLOC)
+      val += cast<InputSection>(dr->section)->getOffsetInFile();
   }
-  uint64_t Val = DR->Value + getAddend<ELFT>(Rel);
 
-  // FIXME: We should be consistent about always adding the file
-  // offset or not.
-  if (DR->Section->Flags & ELF::SHF_ALLOC)
-    Val += cast<InputSection>(DR->Section)->getOffsetInFile();
-
-  return RelocAddrEntry{SecIndex, Val};
+  DataRefImpl d;
+  d.p = getAddend<ELFT>(rel);
+  return RelocAddrEntry{secIndex, RelocationRef(d, nullptr),
+                        val,      Optional<object::RelocationRef>(),
+                        0,        LLDRelocationResolver<RelTy>::resolve};
 }
 
 template <class ELFT>
-Optional<RelocAddrEntry> LLDDwarfObj<ELFT>::find(const llvm::DWARFSection &S,
-                                                 uint64_t Pos) const {
-  auto &Sec = static_cast<const LLDDWARFSection &>(S);
-  if (Sec.Sec->AreRelocsRela)
-    return findAux(*Sec.Sec, Pos, Sec.Sec->template relas<ELFT>());
-  return findAux(*Sec.Sec, Pos, Sec.Sec->template rels<ELFT>());
+Optional<RelocAddrEntry> LLDDwarfObj<ELFT>::find(const llvm::DWARFSection &s,
+                                                 uint64_t pos) const {
+  auto &sec = static_cast<const LLDDWARFSection &>(s);
+  if (sec.sec->areRelocsRela)
+    return findAux(*sec.sec, pos, sec.sec->template relas<ELFT>());
+  return findAux(*sec.sec, pos, sec.sec->template rels<ELFT>());
 }
 
 template class elf::LLDDwarfObj<ELF32LE>;
diff --git a/deps/lld/ELF/DWARF.h b/deps/lld/ELF/DWARF.h
index 8ecf02c77fb4193cf884e32fb3bb5e5607eda4a6..426022945007e1902530d48785b291bbbba5182a 100644
--- a/deps/lld/ELF/DWARF.h
+++ b/deps/lld/ELF/DWARF.h
@@ -1,9 +1,8 @@
 //===- DWARF.h -----------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===-------------------------------------------------------------------===//
 
@@ -21,70 +20,70 @@ namespace elf {
 class InputSection;
 
 struct LLDDWARFSection final : public llvm::DWARFSection {
-  InputSectionBase *Sec = nullptr;
+  InputSectionBase *sec = nullptr;
 };
 
 template <class ELFT> class LLDDwarfObj final : public llvm::DWARFObject {
 public:
-  explicit LLDDwarfObj(ObjFile<ELFT> *Obj);
+  explicit LLDDwarfObj(ObjFile<ELFT> *obj);
 
   void forEachInfoSections(
-      llvm::function_ref<void(const llvm::DWARFSection &)> F) const override {
-    F(InfoSection);
+      llvm::function_ref<void(const llvm::DWARFSection &)> f) const override {
+    f(infoSection);
   }
 
   const llvm::DWARFSection &getRangeSection() const override {
-    return RangeSection;
+    return rangeSection;
   }
 
   const llvm::DWARFSection &getRnglistsSection() const override {
-    return RngListsSection;
+    return rngListsSection;
   }
 
   const llvm::DWARFSection &getLineSection() const override {
-    return LineSection;
+    return lineSection;
   }
 
   const llvm::DWARFSection &getAddrSection() const override {
-    return AddrSection;
+    return addrSection;
   }
 
   const llvm::DWARFSection &getGnuPubNamesSection() const override {
-    return GnuPubNamesSection;
+    return gnuPubNamesSection;
   }
 
   const llvm::DWARFSection &getGnuPubTypesSection() const override {
-    return GnuPubTypesSection;
+    return gnuPubTypesSection;
   }
 
   StringRef getFileName() const override { return ""; }
-  StringRef getAbbrevSection() const override { return AbbrevSection; }
-  StringRef getStringSection() const override { return StrSection; }
-  StringRef getLineStringSection() const override { return LineStringSection; }
+  StringRef getAbbrevSection() const override { return abbrevSection; }
+  StringRef getStringSection() const override { return strSection; }
+  StringRef getLineStringSection() const override { return lineStringSection; }
 
   bool isLittleEndian() const override {
     return ELFT::TargetEndianness == llvm::support::little;
   }
 
-  llvm::Optional<llvm::RelocAddrEntry> find(const llvm::DWARFSection &Sec,
-                                            uint64_t Pos) const override;
+  llvm::Optional<llvm::RelocAddrEntry> find(const llvm::DWARFSection &sec,
+                                            uint64_t pos) const override;
 
 private:
   template <class RelTy>
-  llvm::Optional<llvm::RelocAddrEntry> findAux(const InputSectionBase &Sec,
-                                               uint64_t Pos,
-                                               ArrayRef<RelTy> Rels) const;
+  llvm::Optional<llvm::RelocAddrEntry> findAux(const InputSectionBase &sec,
+                                               uint64_t pos,
+                                               ArrayRef<RelTy> rels) const;
 
-  LLDDWARFSection GnuPubNamesSection;
-  LLDDWARFSection GnuPubTypesSection;
-  LLDDWARFSection InfoSection;
-  LLDDWARFSection RangeSection;
-  LLDDWARFSection RngListsSection;
-  LLDDWARFSection LineSection;
-  LLDDWARFSection AddrSection;
-  StringRef AbbrevSection;
-  StringRef StrSection;
-  StringRef LineStringSection;
+  LLDDWARFSection gnuPubNamesSection;
+  LLDDWARFSection gnuPubTypesSection;
+  LLDDWARFSection infoSection;
+  LLDDWARFSection rangeSection;
+  LLDDWARFSection rngListsSection;
+  LLDDWARFSection lineSection;
+  LLDDWARFSection addrSection;
+  StringRef abbrevSection;
+  StringRef strSection;
+  StringRef lineStringSection;
 };
 
 } // namespace elf
diff --git a/deps/lld/ELF/Driver.cpp b/deps/lld/ELF/Driver.cpp
index bce9d944a4a64fb1c8d1d9f7117ba3c6cefacbf7..fbfc71d22b7e5fda94ae842e658bd2d8e8b791b5 100644
--- a/deps/lld/ELF/Driver.cpp
+++ b/deps/lld/ELF/Driver.cpp
@@ -1,9 +1,8 @@
 //===- Driver.cpp ---------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -25,7 +24,6 @@
 
 #include "Driver.h"
 #include "Config.h"
-#include "Filesystem.h"
 #include "ICF.h"
 #include "InputFiles.h"
 #include "InputSection.h"
@@ -41,6 +39,7 @@
 #include "lld/Common/Args.h"
 #include "lld/Common/Driver.h"
 #include "lld/Common/ErrorHandler.h"
+#include "lld/Common/Filesystem.h"
 #include "lld/Common/Memory.h"
 #include "lld/Common/Strings.h"
 #include "lld/Common/TargetOptionsCommandFlags.h"
@@ -51,6 +50,7 @@
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Compression.h"
+#include "llvm/Support/GlobPattern.h"
 #include "llvm/Support/LEB128.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/TarWriter.h"
@@ -68,44 +68,49 @@ using namespace llvm::support;
 using namespace lld;
 using namespace lld::elf;
 
-Configuration *elf::Config;
-LinkerDriver *elf::Driver;
+Configuration *elf::config;
+LinkerDriver *elf::driver;
 
-static void setConfigs(opt::InputArgList &Args);
+static void setConfigs(opt::InputArgList &args);
+static void readConfigs(opt::InputArgList &args);
 
-bool elf::link(ArrayRef<const char *> Args, bool CanExitEarly,
-               raw_ostream &Error) {
-  errorHandler().LogName = args::getFilenameWithoutExe(Args[0]);
-  errorHandler().ErrorLimitExceededMsg =
+bool elf::link(ArrayRef<const char *> args, bool canExitEarly,
+               raw_ostream &error) {
+  errorHandler().logName = args::getFilenameWithoutExe(args[0]);
+  errorHandler().errorLimitExceededMsg =
       "too many errors emitted, stopping now (use "
       "-error-limit=0 to see all errors)";
-  errorHandler().ErrorOS = &Error;
-  errorHandler().ExitEarly = CanExitEarly;
-  errorHandler().ColorDiagnostics = Error.has_colors();
+  errorHandler().errorOS = &error;
+  errorHandler().exitEarly = canExitEarly;
+  errorHandler().colorDiagnostics = error.has_colors();
 
-  InputSections.clear();
-  OutputSections.clear();
-  BinaryFiles.clear();
-  BitcodeFiles.clear();
-  ObjectFiles.clear();
-  SharedFiles.clear();
+  inputSections.clear();
+  outputSections.clear();
+  binaryFiles.clear();
+  bitcodeFiles.clear();
+  objectFiles.clear();
+  sharedFiles.clear();
 
-  Config = make<Configuration>();
-  Driver = make<LinkerDriver>();
-  Script = make<LinkerScript>();
-  Symtab = make<SymbolTable>();
+  config = make<Configuration>();
+  driver = make<LinkerDriver>();
+  script = make<LinkerScript>();
+  symtab = make<SymbolTable>();
 
-  Tar = nullptr;
-  memset(&In, 0, sizeof(In));
+  tar = nullptr;
+  memset(&in, 0, sizeof(in));
 
-  Config->ProgName = Args[0];
+  partitions = {Partition()};
 
-  Driver->main(Args);
+  SharedFile::vernauxNum = 0;
+
+  config->progName = args[0];
+
+  driver->main(args);
 
   // Exit immediately if we don't need to return to the caller.
   // This saves time because the overhead of calling destructors
   // for all globally-allocated objects is not negligible.
-  if (CanExitEarly)
+  if (canExitEarly)
     exitLld(errorCount() ? 1 : 0);
 
   freeArena();
@@ -113,16 +118,16 @@ bool elf::link(ArrayRef<const char *> Args, bool CanExitEarly,
 }
 
 // Parses a linker -m option.
-static std::tuple<ELFKind, uint16_t, uint8_t> parseEmulation(StringRef Emul) {
-  uint8_t OSABI = 0;
-  StringRef S = Emul;
-  if (S.endswith("_fbsd")) {
-    S = S.drop_back(5);
-    OSABI = ELFOSABI_FREEBSD;
+static std::tuple<ELFKind, uint16_t, uint8_t> parseEmulation(StringRef emul) {
+  uint8_t osabi = 0;
+  StringRef s = emul;
+  if (s.endswith("_fbsd")) {
+    s = s.drop_back(5);
+    osabi = ELFOSABI_FREEBSD;
   }
 
-  std::pair<ELFKind, uint16_t> Ret =
-      StringSwitch<std::pair<ELFKind, uint16_t>>(S)
+  std::pair<ELFKind, uint16_t> ret =
+      StringSwitch<std::pair<ELFKind, uint16_t>>(s)
           .Cases("aarch64elf", "aarch64linux", "aarch64_elf64_le_vec",
                  {ELF64LEKind, EM_AARCH64})
           .Cases("armelf", "armelf_linux_eabi", {ELF32LEKind, EM_ARM})
@@ -141,91 +146,101 @@ static std::tuple<ELFKind, uint16_t, uint8_t> parseEmulation(StringRef Emul) {
           .Case("elf_iamcu", {ELF32LEKind, EM_IAMCU})
           .Default({ELFNoneKind, EM_NONE});
 
-  if (Ret.first == ELFNoneKind)
-    error("unknown emulation: " + Emul);
-  return std::make_tuple(Ret.first, Ret.second, OSABI);
+  if (ret.first == ELFNoneKind)
+    error("unknown emulation: " + emul);
+  return std::make_tuple(ret.first, ret.second, osabi);
 }
 
 // Returns slices of MB by parsing MB as an archive file.
 // Each slice consists of a member file in the archive.
 std::vector<std::pair<MemoryBufferRef, uint64_t>> static getArchiveMembers(
-    MemoryBufferRef MB) {
-  std::unique_ptr<Archive> File =
-      CHECK(Archive::create(MB),
-            MB.getBufferIdentifier() + ": failed to parse archive");
+    MemoryBufferRef mb) {
+  std::unique_ptr<Archive> file =
+      CHECK(Archive::create(mb),
+            mb.getBufferIdentifier() + ": failed to parse archive");
 
-  std::vector<std::pair<MemoryBufferRef, uint64_t>> V;
-  Error Err = Error::success();
-  bool AddToTar = File->isThin() && Tar;
-  for (const ErrorOr<Archive::Child> &COrErr : File->children(Err)) {
-    Archive::Child C =
-        CHECK(COrErr, MB.getBufferIdentifier() +
+  std::vector<std::pair<MemoryBufferRef, uint64_t>> v;
+  Error err = Error::success();
+  bool addToTar = file->isThin() && tar;
+  for (const ErrorOr<Archive::Child> &cOrErr : file->children(err)) {
+    Archive::Child c =
+        CHECK(cOrErr, mb.getBufferIdentifier() +
                           ": could not get the child of the archive");
-    MemoryBufferRef MBRef =
-        CHECK(C.getMemoryBufferRef(),
-              MB.getBufferIdentifier() +
+    MemoryBufferRef mbref =
+        CHECK(c.getMemoryBufferRef(),
+              mb.getBufferIdentifier() +
                   ": could not get the buffer for a child of the archive");
-    if (AddToTar)
-      Tar->append(relativeToRoot(check(C.getFullName())), MBRef.getBuffer());
-    V.push_back(std::make_pair(MBRef, C.getChildOffset()));
+    if (addToTar)
+      tar->append(relativeToRoot(check(c.getFullName())), mbref.getBuffer());
+    v.push_back(std::make_pair(mbref, c.getChildOffset()));
   }
-  if (Err)
-    fatal(MB.getBufferIdentifier() + ": Archive::children failed: " +
-          toString(std::move(Err)));
+  if (err)
+    fatal(mb.getBufferIdentifier() + ": Archive::children failed: " +
+          toString(std::move(err)));
 
   // Take ownership of memory buffers created for members of thin archives.
-  for (std::unique_ptr<MemoryBuffer> &MB : File->takeThinBuffers())
-    make<std::unique_ptr<MemoryBuffer>>(std::move(MB));
+  for (std::unique_ptr<MemoryBuffer> &mb : file->takeThinBuffers())
+    make<std::unique_ptr<MemoryBuffer>>(std::move(mb));
 
-  return V;
+  return v;
 }
 
 // Opens a file and create a file object. Path has to be resolved already.
-void LinkerDriver::addFile(StringRef Path, bool WithLOption) {
+void LinkerDriver::addFile(StringRef path, bool withLOption) {
   using namespace sys::fs;
 
-  Optional<MemoryBufferRef> Buffer = readFile(Path);
-  if (!Buffer.hasValue())
+  Optional<MemoryBufferRef> buffer = readFile(path);
+  if (!buffer.hasValue())
     return;
-  MemoryBufferRef MBRef = *Buffer;
+  MemoryBufferRef mbref = *buffer;
 
-  if (Config->FormatBinary) {
-    Files.push_back(make<BinaryFile>(MBRef));
+  if (config->formatBinary) {
+    files.push_back(make<BinaryFile>(mbref));
     return;
   }
 
-  switch (identify_magic(MBRef.getBuffer())) {
+  switch (identify_magic(mbref.getBuffer())) {
   case file_magic::unknown:
-    readLinkerScript(MBRef);
+    readLinkerScript(mbref);
     return;
   case file_magic::archive: {
     // Handle -whole-archive.
-    if (InWholeArchive) {
-      for (const auto &P : getArchiveMembers(MBRef))
-        Files.push_back(createObjectFile(P.first, Path, P.second));
+    if (inWholeArchive) {
+      for (const auto &p : getArchiveMembers(mbref))
+        files.push_back(createObjectFile(p.first, path, p.second));
       return;
     }
 
-    std::unique_ptr<Archive> File =
-        CHECK(Archive::create(MBRef), Path + ": failed to parse archive");
+    std::unique_ptr<Archive> file =
+        CHECK(Archive::create(mbref), path + ": failed to parse archive");
 
     // If an archive file has no symbol table, it is likely that a user
     // is attempting LTO and using a default ar command that doesn't
     // understand the LLVM bitcode file. It is a pretty common error, so
     // we'll handle it as if it had a symbol table.
-    if (!File->isEmpty() && !File->hasSymbolTable()) {
-      for (const auto &P : getArchiveMembers(MBRef))
-        Files.push_back(make<LazyObjFile>(P.first, Path, P.second));
+    if (!file->isEmpty() && !file->hasSymbolTable()) {
+      // Check if all members are bitcode files. If not, ignore, which is the
+      // default action without the LTO hack described above.
+      for (const std::pair<MemoryBufferRef, uint64_t> &p :
+           getArchiveMembers(mbref))
+        if (identify_magic(p.first.getBuffer()) != file_magic::bitcode) {
+          error(path + ": archive has no index; run ranlib to add one");
+          return;
+        }
+
+      for (const std::pair<MemoryBufferRef, uint64_t> &p :
+           getArchiveMembers(mbref))
+        files.push_back(make<LazyObjFile>(p.first, path, p.second));
       return;
     }
 
     // Handle the regular case.
-    Files.push_back(make<ArchiveFile>(std::move(File)));
+    files.push_back(make<ArchiveFile>(std::move(file)));
     return;
   }
   case file_magic::elf_shared_object:
-    if (Config->Static || Config->Relocatable) {
-      error("attempted static link of dynamic object " + Path);
+    if (config->isStatic || config->relocatable) {
+      error("attempted static link of dynamic object " + path);
       return;
     }
 
@@ -239,27 +254,27 @@ void LinkerDriver::addFile(StringRef Path, bool WithLOption) {
     // If a file was specified by -lfoo, the directory part is not
     // significant, as a user did not specify it. This behavior is
     // compatible with GNU.
-    Files.push_back(
-        createSharedFile(MBRef, WithLOption ? path::filename(Path) : Path));
+    files.push_back(
+        make<SharedFile>(mbref, withLOption ? path::filename(path) : path));
     return;
   case file_magic::bitcode:
   case file_magic::elf_relocatable:
-    if (InLib)
-      Files.push_back(make<LazyObjFile>(MBRef, "", 0));
+    if (inLib)
+      files.push_back(make<LazyObjFile>(mbref, "", 0));
     else
-      Files.push_back(createObjectFile(MBRef));
+      files.push_back(createObjectFile(mbref));
     break;
   default:
-    error(Path + ": unknown file type");
+    error(path + ": unknown file type");
   }
 }
 
 // Add a given library by searching it from input search paths.
-void LinkerDriver::addLibrary(StringRef Name) {
-  if (Optional<std::string> Path = searchLibrary(Name))
-    addFile(*Path, /*WithLOption=*/true);
+void LinkerDriver::addLibrary(StringRef name) {
+  if (Optional<std::string> path = searchLibrary(name))
+    addFile(*path, /*withLOption=*/true);
   else
-    error("unable to find library -l" + Name);
+    error("unable to find library -l" + name);
 }
 
 // This function is called on startup. We need this for LTO since
@@ -278,102 +293,117 @@ static void initLLVM() {
 static void checkOptions() {
   // The MIPS ABI as of 2016 does not support the GNU-style symbol lookup
   // table which is a relatively new feature.
-  if (Config->EMachine == EM_MIPS && Config->GnuHash)
+  if (config->emachine == EM_MIPS && config->gnuHash)
     error("the .gnu.hash section is not compatible with the MIPS target");
 
-  if (Config->FixCortexA53Errata843419 && Config->EMachine != EM_AARCH64)
+  if (config->fixCortexA53Errata843419 && config->emachine != EM_AARCH64)
     error("--fix-cortex-a53-843419 is only supported on AArch64 targets");
 
-  if (Config->TocOptimize && Config->EMachine != EM_PPC64)
+  if (config->tocOptimize && config->emachine != EM_PPC64)
     error("--toc-optimize is only supported on the PowerPC64 target");
 
-  if (Config->Pie && Config->Shared)
+  if (config->pie && config->shared)
     error("-shared and -pie may not be used together");
 
-  if (!Config->Shared && !Config->FilterList.empty())
+  if (!config->shared && !config->filterList.empty())
     error("-F may not be used without -shared");
 
-  if (!Config->Shared && !Config->AuxiliaryList.empty())
+  if (!config->shared && !config->auxiliaryList.empty())
     error("-f may not be used without -shared");
 
-  if (!Config->Relocatable && !Config->DefineCommon)
+  if (!config->relocatable && !config->defineCommon)
     error("-no-define-common not supported in non relocatable output");
 
-  if (Config->Relocatable) {
-    if (Config->Shared)
+  if (config->zText && config->zIfuncNoplt)
+    error("-z text and -z ifunc-noplt may not be used together");
+
+  if (config->relocatable) {
+    if (config->shared)
       error("-r and -shared may not be used together");
-    if (Config->GcSections)
+    if (config->gcSections)
       error("-r and --gc-sections may not be used together");
-    if (Config->GdbIndex)
+    if (config->gdbIndex)
       error("-r and --gdb-index may not be used together");
-    if (Config->ICF != ICFLevel::None)
+    if (config->icf != ICFLevel::None)
       error("-r and --icf may not be used together");
-    if (Config->Pie)
+    if (config->pie)
       error("-r and -pie may not be used together");
   }
 
-  if (Config->ExecuteOnly) {
-    if (Config->EMachine != EM_AARCH64)
+  if (config->executeOnly) {
+    if (config->emachine != EM_AARCH64)
       error("-execute-only is only supported on AArch64 targets");
 
-    if (Config->SingleRoRx && !Script->HasSectionsCommand)
+    if (config->singleRoRx && !script->hasSectionsCommand)
       error("-execute-only and -no-rosegment cannot be used together");
   }
+
+  if (config->zRetpolineplt && config->requireCET)
+    error("--require-cet may not be used with -z retpolineplt");
+
+  if (config->emachine != EM_AARCH64) {
+    if (config->pacPlt)
+      error("--pac-plt only supported on AArch64");
+    if (config->forceBTI)
+      error("--force-bti only supported on AArch64");
+  }
 }
 
-static const char *getReproduceOption(opt::InputArgList &Args) {
-  if (auto *Arg = Args.getLastArg(OPT_reproduce))
-    return Arg->getValue();
+static const char *getReproduceOption(opt::InputArgList &args) {
+  if (auto *arg = args.getLastArg(OPT_reproduce))
+    return arg->getValue();
   return getenv("LLD_REPRODUCE");
 }
 
-static bool hasZOption(opt::InputArgList &Args, StringRef Key) {
-  for (auto *Arg : Args.filtered(OPT_z))
-    if (Key == Arg->getValue())
+static bool hasZOption(opt::InputArgList &args, StringRef key) {
+  for (auto *arg : args.filtered(OPT_z))
+    if (key == arg->getValue())
       return true;
   return false;
 }
 
-static bool getZFlag(opt::InputArgList &Args, StringRef K1, StringRef K2,
+static bool getZFlag(opt::InputArgList &args, StringRef k1, StringRef k2,
                      bool Default) {
-  for (auto *Arg : Args.filtered_reverse(OPT_z)) {
-    if (K1 == Arg->getValue())
+  for (auto *arg : args.filtered_reverse(OPT_z)) {
+    if (k1 == arg->getValue())
       return true;
-    if (K2 == Arg->getValue())
+    if (k2 == arg->getValue())
       return false;
   }
   return Default;
 }
 
-static bool isKnownZFlag(StringRef S) {
-  return S == "combreloc" || S == "copyreloc" || S == "defs" ||
-         S == "execstack" || S == "global" || S == "hazardplt" ||
-         S == "initfirst" || S == "interpose" ||
-         S == "keep-text-section-prefix" || S == "lazy" || S == "muldefs" ||
-         S == "nocombreloc" || S == "nocopyreloc" || S == "nodefaultlib" ||
-         S == "nodelete" || S == "nodlopen" || S == "noexecstack" ||
-         S == "nokeep-text-section-prefix" || S == "norelro" || S == "notext" ||
-         S == "now" || S == "origin" || S == "relro" || S == "retpolineplt" ||
-         S == "rodynamic" || S == "text" || S == "wxneeded" ||
-         S.startswith("max-page-size=") || S.startswith("stack-size=");
+static bool isKnownZFlag(StringRef s) {
+  return s == "combreloc" || s == "copyreloc" || s == "defs" ||
+         s == "execstack" || s == "global" || s == "hazardplt" ||
+         s == "ifunc-noplt" || s == "initfirst" || s == "interpose" ||
+         s == "keep-text-section-prefix" || s == "lazy" || s == "muldefs" ||
+         s == "nocombreloc" || s == "nocopyreloc" || s == "nodefaultlib" ||
+         s == "nodelete" || s == "nodlopen" || s == "noexecstack" ||
+         s == "nokeep-text-section-prefix" || s == "norelro" || s == "notext" ||
+         s == "now" || s == "origin" || s == "relro" || s == "retpolineplt" ||
+         s == "rodynamic" || s == "text" || s == "wxneeded" ||
+         s.startswith("common-page-size") || s.startswith("max-page-size=") ||
+         s.startswith("stack-size=");
 }
 
 // Report an error for an unknown -z option.
-static void checkZOptions(opt::InputArgList &Args) {
-  for (auto *Arg : Args.filtered(OPT_z))
-    if (!isKnownZFlag(Arg->getValue()))
-      error("unknown -z value: " + StringRef(Arg->getValue()));
+static void checkZOptions(opt::InputArgList &args) {
+  for (auto *arg : args.filtered(OPT_z))
+    if (!isKnownZFlag(arg->getValue()))
+      error("unknown -z value: " + StringRef(arg->getValue()));
 }
 
-void LinkerDriver::main(ArrayRef<const char *> ArgsArr) {
-  ELFOptTable Parser;
-  opt::InputArgList Args = Parser.parse(ArgsArr.slice(1));
+void LinkerDriver::main(ArrayRef<const char *> argsArr) {
+  ELFOptTable parser;
+  opt::InputArgList args = parser.parse(argsArr.slice(1));
 
   // Interpret this flag early because error() depends on them.
-  errorHandler().ErrorLimit = args::getInteger(Args, OPT_error_limit, 20);
+  errorHandler().errorLimit = args::getInteger(args, OPT_error_limit, 20);
+  checkZOptions(args);
 
   // Handle -help
-  if (Args.hasArg(OPT_help)) {
+  if (args.hasArg(OPT_help)) {
     printHelp();
     return;
   }
@@ -393,213 +423,218 @@ void LinkerDriver::main(ArrayRef<const char *> ArgsArr) {
   // lot of "configure" scripts out there that are generated by old version
   // of Libtool. We cannot convince every software developer to migrate to
   // the latest version and re-generate scripts. So we have this hack.
-  if (Args.hasArg(OPT_v) || Args.hasArg(OPT_version))
+  if (args.hasArg(OPT_v) || args.hasArg(OPT_version))
     message(getLLDVersion() + " (compatible with GNU linkers)");
 
-  if (const char *Path = getReproduceOption(Args)) {
+  if (const char *path = getReproduceOption(args)) {
     // Note that --reproduce is a debug option so you can ignore it
     // if you are trying to understand the whole picture of the code.
-    Expected<std::unique_ptr<TarWriter>> ErrOrWriter =
-        TarWriter::create(Path, path::stem(Path));
-    if (ErrOrWriter) {
-      Tar = std::move(*ErrOrWriter);
-      Tar->append("response.txt", createResponseFile(Args));
-      Tar->append("version.txt", getLLDVersion() + "\n");
+    Expected<std::unique_ptr<TarWriter>> errOrWriter =
+        TarWriter::create(path, path::stem(path));
+    if (errOrWriter) {
+      tar = std::move(*errOrWriter);
+      tar->append("response.txt", createResponseFile(args));
+      tar->append("version.txt", getLLDVersion() + "\n");
     } else {
-      error("--reproduce: " + toString(ErrOrWriter.takeError()));
+      error("--reproduce: " + toString(errOrWriter.takeError()));
     }
   }
 
-  readConfigs(Args);
-  checkZOptions(Args);
+  readConfigs(args);
 
   // The behavior of -v or --version is a bit strange, but this is
   // needed for compatibility with GNU linkers.
-  if (Args.hasArg(OPT_v) && !Args.hasArg(OPT_INPUT))
+  if (args.hasArg(OPT_v) && !args.hasArg(OPT_INPUT))
     return;
-  if (Args.hasArg(OPT_version))
+  if (args.hasArg(OPT_version))
     return;
 
   initLLVM();
-  createFiles(Args);
+  createFiles(args);
   if (errorCount())
     return;
 
   inferMachineType();
-  setConfigs(Args);
+  setConfigs(args);
   checkOptions();
   if (errorCount())
     return;
 
-  switch (Config->EKind) {
+  // The Target instance handles target-specific stuff, such as applying
+  // relocations or writing a PLT section. It also contains target-dependent
+  // values such as a default image base address.
+  target = getTarget();
+
+  switch (config->ekind) {
   case ELF32LEKind:
-    link<ELF32LE>(Args);
+    link<ELF32LE>(args);
     return;
   case ELF32BEKind:
-    link<ELF32BE>(Args);
+    link<ELF32BE>(args);
     return;
   case ELF64LEKind:
-    link<ELF64LE>(Args);
+    link<ELF64LE>(args);
     return;
   case ELF64BEKind:
-    link<ELF64BE>(Args);
+    link<ELF64BE>(args);
     return;
   default:
     llvm_unreachable("unknown Config->EKind");
   }
 }
 
-static std::string getRpath(opt::InputArgList &Args) {
-  std::vector<StringRef> V = args::getStrings(Args, OPT_rpath);
-  return llvm::join(V.begin(), V.end(), ":");
+static std::string getRpath(opt::InputArgList &args) {
+  std::vector<StringRef> v = args::getStrings(args, OPT_rpath);
+  return llvm::join(v.begin(), v.end(), ":");
 }
 
 // Determines what we should do if there are remaining unresolved
 // symbols after the name resolution.
-static UnresolvedPolicy getUnresolvedSymbolPolicy(opt::InputArgList &Args) {
-  UnresolvedPolicy ErrorOrWarn = Args.hasFlag(OPT_error_unresolved_symbols,
+static UnresolvedPolicy getUnresolvedSymbolPolicy(opt::InputArgList &args) {
+  UnresolvedPolicy errorOrWarn = args.hasFlag(OPT_error_unresolved_symbols,
                                               OPT_warn_unresolved_symbols, true)
                                      ? UnresolvedPolicy::ReportError
                                      : UnresolvedPolicy::Warn;
 
   // Process the last of -unresolved-symbols, -no-undefined or -z defs.
-  for (auto *Arg : llvm::reverse(Args)) {
-    switch (Arg->getOption().getID()) {
+  for (auto *arg : llvm::reverse(args)) {
+    switch (arg->getOption().getID()) {
     case OPT_unresolved_symbols: {
-      StringRef S = Arg->getValue();
-      if (S == "ignore-all" || S == "ignore-in-object-files")
+      StringRef s = arg->getValue();
+      if (s == "ignore-all" || s == "ignore-in-object-files")
         return UnresolvedPolicy::Ignore;
-      if (S == "ignore-in-shared-libs" || S == "report-all")
-        return ErrorOrWarn;
-      error("unknown --unresolved-symbols value: " + S);
+      if (s == "ignore-in-shared-libs" || s == "report-all")
+        return errorOrWarn;
+      error("unknown --unresolved-symbols value: " + s);
       continue;
     }
     case OPT_no_undefined:
-      return ErrorOrWarn;
+      return errorOrWarn;
     case OPT_z:
-      if (StringRef(Arg->getValue()) == "defs")
-        return ErrorOrWarn;
+      if (StringRef(arg->getValue()) == "defs")
+        return errorOrWarn;
       continue;
     }
   }
 
   // -shared implies -unresolved-symbols=ignore-all because missing
   // symbols are likely to be resolved at runtime using other DSOs.
-  if (Config->Shared)
+  if (config->shared)
     return UnresolvedPolicy::Ignore;
-  return ErrorOrWarn;
+  return errorOrWarn;
 }
 
-static Target2Policy getTarget2(opt::InputArgList &Args) {
-  StringRef S = Args.getLastArgValue(OPT_target2, "got-rel");
-  if (S == "rel")
+static Target2Policy getTarget2(opt::InputArgList &args) {
+  StringRef s = args.getLastArgValue(OPT_target2, "got-rel");
+  if (s == "rel")
     return Target2Policy::Rel;
-  if (S == "abs")
+  if (s == "abs")
     return Target2Policy::Abs;
-  if (S == "got-rel")
+  if (s == "got-rel")
     return Target2Policy::GotRel;
-  error("unknown --target2 option: " + S);
+  error("unknown --target2 option: " + s);
   return Target2Policy::GotRel;
 }
 
-static bool isOutputFormatBinary(opt::InputArgList &Args) {
-  StringRef S = Args.getLastArgValue(OPT_oformat, "elf");
-  if (S == "binary")
+static bool isOutputFormatBinary(opt::InputArgList &args) {
+  StringRef s = args.getLastArgValue(OPT_oformat, "elf");
+  if (s == "binary")
     return true;
-  if (!S.startswith("elf"))
-    error("unknown --oformat value: " + S);
+  if (!s.startswith("elf"))
+    error("unknown --oformat value: " + s);
   return false;
 }
 
-static DiscardPolicy getDiscard(opt::InputArgList &Args) {
-  if (Args.hasArg(OPT_relocatable))
+static DiscardPolicy getDiscard(opt::InputArgList &args) {
+  if (args.hasArg(OPT_relocatable))
     return DiscardPolicy::None;
 
-  auto *Arg =
-      Args.getLastArg(OPT_discard_all, OPT_discard_locals, OPT_discard_none);
-  if (!Arg)
+  auto *arg =
+      args.getLastArg(OPT_discard_all, OPT_discard_locals, OPT_discard_none);
+  if (!arg)
     return DiscardPolicy::Default;
-  if (Arg->getOption().getID() == OPT_discard_all)
+  if (arg->getOption().getID() == OPT_discard_all)
     return DiscardPolicy::All;
-  if (Arg->getOption().getID() == OPT_discard_locals)
+  if (arg->getOption().getID() == OPT_discard_locals)
     return DiscardPolicy::Locals;
   return DiscardPolicy::None;
 }
 
-static StringRef getDynamicLinker(opt::InputArgList &Args) {
-  auto *Arg = Args.getLastArg(OPT_dynamic_linker, OPT_no_dynamic_linker);
-  if (!Arg || Arg->getOption().getID() == OPT_no_dynamic_linker)
+static StringRef getDynamicLinker(opt::InputArgList &args) {
+  auto *arg = args.getLastArg(OPT_dynamic_linker, OPT_no_dynamic_linker);
+  if (!arg || arg->getOption().getID() == OPT_no_dynamic_linker)
     return "";
-  return Arg->getValue();
+  return arg->getValue();
 }
 
-static ICFLevel getICF(opt::InputArgList &Args) {
-  auto *Arg = Args.getLastArg(OPT_icf_none, OPT_icf_safe, OPT_icf_all);
-  if (!Arg || Arg->getOption().getID() == OPT_icf_none)
+static ICFLevel getICF(opt::InputArgList &args) {
+  auto *arg = args.getLastArg(OPT_icf_none, OPT_icf_safe, OPT_icf_all);
+  if (!arg || arg->getOption().getID() == OPT_icf_none)
     return ICFLevel::None;
-  if (Arg->getOption().getID() == OPT_icf_safe)
+  if (arg->getOption().getID() == OPT_icf_safe)
     return ICFLevel::Safe;
   return ICFLevel::All;
 }
 
-static StripPolicy getStrip(opt::InputArgList &Args) {
-  if (Args.hasArg(OPT_relocatable))
+static StripPolicy getStrip(opt::InputArgList &args) {
+  if (args.hasArg(OPT_relocatable))
     return StripPolicy::None;
 
-  auto *Arg = Args.getLastArg(OPT_strip_all, OPT_strip_debug);
-  if (!Arg)
+  auto *arg = args.getLastArg(OPT_strip_all, OPT_strip_debug);
+  if (!arg)
     return StripPolicy::None;
-  if (Arg->getOption().getID() == OPT_strip_all)
+  if (arg->getOption().getID() == OPT_strip_all)
     return StripPolicy::All;
   return StripPolicy::Debug;
 }
 
-static uint64_t parseSectionAddress(StringRef S, const opt::Arg &Arg) {
-  uint64_t VA = 0;
-  if (S.startswith("0x"))
-    S = S.drop_front(2);
-  if (!to_integer(S, VA, 16))
-    error("invalid argument: " + toString(Arg));
-  return VA;
+static uint64_t parseSectionAddress(StringRef s, opt::InputArgList &args,
+                                    const opt::Arg &arg) {
+  uint64_t va = 0;
+  if (s.startswith("0x"))
+    s = s.drop_front(2);
+  if (!to_integer(s, va, 16))
+    error("invalid argument: " + arg.getAsString(args));
+  return va;
 }
 
-static StringMap<uint64_t> getSectionStartMap(opt::InputArgList &Args) {
-  StringMap<uint64_t> Ret;
-  for (auto *Arg : Args.filtered(OPT_section_start)) {
-    StringRef Name;
-    StringRef Addr;
-    std::tie(Name, Addr) = StringRef(Arg->getValue()).split('=');
-    Ret[Name] = parseSectionAddress(Addr, *Arg);
+static StringMap<uint64_t> getSectionStartMap(opt::InputArgList &args) {
+  StringMap<uint64_t> ret;
+  for (auto *arg : args.filtered(OPT_section_start)) {
+    StringRef name;
+    StringRef addr;
+    std::tie(name, addr) = StringRef(arg->getValue()).split('=');
+    ret[name] = parseSectionAddress(addr, args, *arg);
   }
 
-  if (auto *Arg = Args.getLastArg(OPT_Ttext))
-    Ret[".text"] = parseSectionAddress(Arg->getValue(), *Arg);
-  if (auto *Arg = Args.getLastArg(OPT_Tdata))
-    Ret[".data"] = parseSectionAddress(Arg->getValue(), *Arg);
-  if (auto *Arg = Args.getLastArg(OPT_Tbss))
-    Ret[".bss"] = parseSectionAddress(Arg->getValue(), *Arg);
-  return Ret;
+  if (auto *arg = args.getLastArg(OPT_Ttext))
+    ret[".text"] = parseSectionAddress(arg->getValue(), args, *arg);
+  if (auto *arg = args.getLastArg(OPT_Tdata))
+    ret[".data"] = parseSectionAddress(arg->getValue(), args, *arg);
+  if (auto *arg = args.getLastArg(OPT_Tbss))
+    ret[".bss"] = parseSectionAddress(arg->getValue(), args, *arg);
+  return ret;
 }
 
-static SortSectionPolicy getSortSection(opt::InputArgList &Args) {
-  StringRef S = Args.getLastArgValue(OPT_sort_section);
-  if (S == "alignment")
+static SortSectionPolicy getSortSection(opt::InputArgList &args) {
+  StringRef s = args.getLastArgValue(OPT_sort_section);
+  if (s == "alignment")
     return SortSectionPolicy::Alignment;
-  if (S == "name")
+  if (s == "name")
     return SortSectionPolicy::Name;
-  if (!S.empty())
-    error("unknown --sort-section rule: " + S);
+  if (!s.empty())
+    error("unknown --sort-section rule: " + s);
   return SortSectionPolicy::Default;
 }
 
-static OrphanHandlingPolicy getOrphanHandling(opt::InputArgList &Args) {
-  StringRef S = Args.getLastArgValue(OPT_orphan_handling, "place");
-  if (S == "warn")
+static OrphanHandlingPolicy getOrphanHandling(opt::InputArgList &args) {
+  StringRef s = args.getLastArgValue(OPT_orphan_handling, "place");
+  if (s == "warn")
     return OrphanHandlingPolicy::Warn;
-  if (S == "error")
+  if (s == "error")
     return OrphanHandlingPolicy::Error;
-  if (S != "place")
-    error("unknown --orphan-handling mode: " + S);
+  if (s != "place")
+    error("unknown --orphan-handling mode: " + s);
   return OrphanHandlingPolicy::Place;
 }
 
@@ -607,388 +642,412 @@ static OrphanHandlingPolicy getOrphanHandling(opt::InputArgList &Args) {
 // synonym for "sha1" because all our hash functions including
 // -build-id=sha1 are actually tree hashes for performance reasons.
 static std::pair<BuildIdKind, std::vector<uint8_t>>
-getBuildId(opt::InputArgList &Args) {
-  auto *Arg = Args.getLastArg(OPT_build_id, OPT_build_id_eq);
-  if (!Arg)
+getBuildId(opt::InputArgList &args) {
+  auto *arg = args.getLastArg(OPT_build_id, OPT_build_id_eq);
+  if (!arg)
     return {BuildIdKind::None, {}};
 
-  if (Arg->getOption().getID() == OPT_build_id)
+  if (arg->getOption().getID() == OPT_build_id)
     return {BuildIdKind::Fast, {}};
 
-  StringRef S = Arg->getValue();
-  if (S == "fast")
+  StringRef s = arg->getValue();
+  if (s == "fast")
     return {BuildIdKind::Fast, {}};
-  if (S == "md5")
+  if (s == "md5")
     return {BuildIdKind::Md5, {}};
-  if (S == "sha1" || S == "tree")
+  if (s == "sha1" || s == "tree")
     return {BuildIdKind::Sha1, {}};
-  if (S == "uuid")
+  if (s == "uuid")
     return {BuildIdKind::Uuid, {}};
-  if (S.startswith("0x"))
-    return {BuildIdKind::Hexstring, parseHex(S.substr(2))};
+  if (s.startswith("0x"))
+    return {BuildIdKind::Hexstring, parseHex(s.substr(2))};
 
-  if (S != "none")
-    error("unknown --build-id style: " + S);
+  if (s != "none")
+    error("unknown --build-id style: " + s);
   return {BuildIdKind::None, {}};
 }
 
-static std::pair<bool, bool> getPackDynRelocs(opt::InputArgList &Args) {
-  StringRef S = Args.getLastArgValue(OPT_pack_dyn_relocs, "none");
-  if (S == "android")
+static std::pair<bool, bool> getPackDynRelocs(opt::InputArgList &args) {
+  StringRef s = args.getLastArgValue(OPT_pack_dyn_relocs, "none");
+  if (s == "android")
     return {true, false};
-  if (S == "relr")
+  if (s == "relr")
     return {false, true};
-  if (S == "android+relr")
+  if (s == "android+relr")
     return {true, true};
 
-  if (S != "none")
-    error("unknown -pack-dyn-relocs format: " + S);
+  if (s != "none")
+    error("unknown -pack-dyn-relocs format: " + s);
   return {false, false};
 }
 
-static void readCallGraph(MemoryBufferRef MB) {
+static void readCallGraph(MemoryBufferRef mb) {
   // Build a map from symbol name to section
-  DenseMap<StringRef, Symbol *> Map;
-  for (InputFile *File : ObjectFiles)
-    for (Symbol *Sym : File->getSymbols())
-      Map[Sym->getName()] = Sym;
+  DenseMap<StringRef, Symbol *> map;
+  for (InputFile *file : objectFiles)
+    for (Symbol *sym : file->getSymbols())
+      map[sym->getName()] = sym;
 
-  auto FindSection = [&](StringRef Name) -> InputSectionBase * {
-    Symbol *Sym = Map.lookup(Name);
-    if (!Sym) {
-      if (Config->WarnSymbolOrdering)
-        warn(MB.getBufferIdentifier() + ": no such symbol: " + Name);
+  auto findSection = [&](StringRef name) -> InputSectionBase * {
+    Symbol *sym = map.lookup(name);
+    if (!sym) {
+      if (config->warnSymbolOrdering)
+        warn(mb.getBufferIdentifier() + ": no such symbol: " + name);
       return nullptr;
     }
-    maybeWarnUnorderableSymbol(Sym);
+    maybeWarnUnorderableSymbol(sym);
 
-    if (Defined *DR = dyn_cast_or_null<Defined>(Sym))
-      return dyn_cast_or_null<InputSectionBase>(DR->Section);
+    if (Defined *dr = dyn_cast_or_null<Defined>(sym))
+      return dyn_cast_or_null<InputSectionBase>(dr->section);
     return nullptr;
   };
 
-  for (StringRef Line : args::getLines(MB)) {
-    SmallVector<StringRef, 3> Fields;
-    Line.split(Fields, ' ');
-    uint64_t Count;
+  for (StringRef line : args::getLines(mb)) {
+    SmallVector<StringRef, 3> fields;
+    line.split(fields, ' ');
+    uint64_t count;
 
-    if (Fields.size() != 3 || !to_integer(Fields[2], Count)) {
-      error(MB.getBufferIdentifier() + ": parse error");
+    if (fields.size() != 3 || !to_integer(fields[2], count)) {
+      error(mb.getBufferIdentifier() + ": parse error");
       return;
     }
 
-    if (InputSectionBase *From = FindSection(Fields[0]))
-      if (InputSectionBase *To = FindSection(Fields[1]))
-        Config->CallGraphProfile[std::make_pair(From, To)] += Count;
+    if (InputSectionBase *from = findSection(fields[0]))
+      if (InputSectionBase *to = findSection(fields[1]))
+        config->callGraphProfile[std::make_pair(from, to)] += count;
   }
 }
 
 template <class ELFT> static void readCallGraphsFromObjectFiles() {
-  for (auto File : ObjectFiles) {
-    auto *Obj = cast<ObjFile<ELFT>>(File);
+  for (auto file : objectFiles) {
+    auto *obj = cast<ObjFile<ELFT>>(file);
 
-    for (const Elf_CGProfile_Impl<ELFT> &CGPE : Obj->CGProfile) {
-      auto *FromSym = dyn_cast<Defined>(&Obj->getSymbol(CGPE.cgp_from));
-      auto *ToSym = dyn_cast<Defined>(&Obj->getSymbol(CGPE.cgp_to));
-      if (!FromSym || !ToSym)
+    for (const Elf_CGProfile_Impl<ELFT> &cgpe : obj->cgProfile) {
+      auto *fromSym = dyn_cast<Defined>(&obj->getSymbol(cgpe.cgp_from));
+      auto *toSym = dyn_cast<Defined>(&obj->getSymbol(cgpe.cgp_to));
+      if (!fromSym || !toSym)
         continue;
 
-      auto *From = dyn_cast_or_null<InputSectionBase>(FromSym->Section);
-      auto *To = dyn_cast_or_null<InputSectionBase>(ToSym->Section);
-      if (From && To)
-        Config->CallGraphProfile[{From, To}] += CGPE.cgp_weight;
+      auto *from = dyn_cast_or_null<InputSectionBase>(fromSym->section);
+      auto *to = dyn_cast_or_null<InputSectionBase>(toSym->section);
+      if (from && to)
+        config->callGraphProfile[{from, to}] += cgpe.cgp_weight;
     }
   }
 }
 
-static bool getCompressDebugSections(opt::InputArgList &Args) {
-  StringRef S = Args.getLastArgValue(OPT_compress_debug_sections, "none");
-  if (S == "none")
+static bool getCompressDebugSections(opt::InputArgList &args) {
+  StringRef s = args.getLastArgValue(OPT_compress_debug_sections, "none");
+  if (s == "none")
     return false;
-  if (S != "zlib")
-    error("unknown --compress-debug-sections value: " + S);
+  if (s != "zlib")
+    error("unknown --compress-debug-sections value: " + s);
   if (!zlib::isAvailable())
     error("--compress-debug-sections: zlib is not available");
   return true;
 }
 
-static std::pair<StringRef, StringRef> getOldNewOptions(opt::InputArgList &Args,
-                                                        unsigned Id) {
-  auto *Arg = Args.getLastArg(Id);
-  if (!Arg)
+static std::pair<StringRef, StringRef> getOldNewOptions(opt::InputArgList &args,
+                                                        unsigned id) {
+  auto *arg = args.getLastArg(id);
+  if (!arg)
     return {"", ""};
 
-  StringRef S = Arg->getValue();
-  std::pair<StringRef, StringRef> Ret = S.split(';');
-  if (Ret.second.empty())
-    error(Arg->getSpelling() + " expects 'old;new' format, but got " + S);
-  return Ret;
+  StringRef s = arg->getValue();
+  std::pair<StringRef, StringRef> ret = s.split(';');
+  if (ret.second.empty())
+    error(arg->getSpelling() + " expects 'old;new' format, but got " + s);
+  return ret;
 }
 
 // Parse the symbol ordering file and warn for any duplicate entries.
-static std::vector<StringRef> getSymbolOrderingFile(MemoryBufferRef MB) {
-  SetVector<StringRef> Names;
-  for (StringRef S : args::getLines(MB))
-    if (!Names.insert(S) && Config->WarnSymbolOrdering)
-      warn(MB.getBufferIdentifier() + ": duplicate ordered symbol: " + S);
+static std::vector<StringRef> getSymbolOrderingFile(MemoryBufferRef mb) {
+  SetVector<StringRef> names;
+  for (StringRef s : args::getLines(mb))
+    if (!names.insert(s) && config->warnSymbolOrdering)
+      warn(mb.getBufferIdentifier() + ": duplicate ordered symbol: " + s);
 
-  return Names.takeVector();
+  return names.takeVector();
 }
 
-static void parseClangOption(StringRef Opt, const Twine &Msg) {
-  std::string Err;
-  raw_string_ostream OS(Err);
+static void parseClangOption(StringRef opt, const Twine &msg) {
+  std::string err;
+  raw_string_ostream os(err);
 
-  const char *Argv[] = {Config->ProgName.data(), Opt.data()};
-  if (cl::ParseCommandLineOptions(2, Argv, "", &OS))
+  const char *argv[] = {config->progName.data(), opt.data()};
+  if (cl::ParseCommandLineOptions(2, argv, "", &os))
     return;
-  OS.flush();
-  error(Msg + ": " + StringRef(Err).trim());
+  os.flush();
+  error(msg + ": " + StringRef(err).trim());
 }
 
 // Initializes Config members by the command line options.
-void LinkerDriver::readConfigs(opt::InputArgList &Args) {
-  errorHandler().Verbose = Args.hasArg(OPT_verbose);
-  errorHandler().FatalWarnings =
-      Args.hasFlag(OPT_fatal_warnings, OPT_no_fatal_warnings, false);
-  ThreadsEnabled = Args.hasFlag(OPT_threads, OPT_no_threads, true);
+static void readConfigs(opt::InputArgList &args) {
+  errorHandler().verbose = args.hasArg(OPT_verbose);
+  errorHandler().fatalWarnings =
+      args.hasFlag(OPT_fatal_warnings, OPT_no_fatal_warnings, false);
+  errorHandler().vsDiagnostics =
+      args.hasArg(OPT_visual_studio_diagnostics_format, false);
+  threadsEnabled = args.hasFlag(OPT_threads, OPT_no_threads, true);
 
-  Config->AllowMultipleDefinition =
-      Args.hasFlag(OPT_allow_multiple_definition,
+  config->allowMultipleDefinition =
+      args.hasFlag(OPT_allow_multiple_definition,
                    OPT_no_allow_multiple_definition, false) ||
-      hasZOption(Args, "muldefs");
-  Config->AuxiliaryList = args::getStrings(Args, OPT_auxiliary);
-  Config->Bsymbolic = Args.hasArg(OPT_Bsymbolic);
-  Config->BsymbolicFunctions = Args.hasArg(OPT_Bsymbolic_functions);
-  Config->CheckSections =
-      Args.hasFlag(OPT_check_sections, OPT_no_check_sections, true);
-  Config->Chroot = Args.getLastArgValue(OPT_chroot);
-  Config->CompressDebugSections = getCompressDebugSections(Args);
-  Config->Cref = Args.hasFlag(OPT_cref, OPT_no_cref, false);
-  Config->DefineCommon = Args.hasFlag(OPT_define_common, OPT_no_define_common,
-                                      !Args.hasArg(OPT_relocatable));
-  Config->Demangle = Args.hasFlag(OPT_demangle, OPT_no_demangle, true);
-  Config->DisableVerify = Args.hasArg(OPT_disable_verify);
-  Config->Discard = getDiscard(Args);
-  Config->DwoDir = Args.getLastArgValue(OPT_plugin_opt_dwo_dir_eq);
-  Config->DynamicLinker = getDynamicLinker(Args);
-  Config->EhFrameHdr =
-      Args.hasFlag(OPT_eh_frame_hdr, OPT_no_eh_frame_hdr, false);
-  Config->EmitLLVM = Args.hasArg(OPT_plugin_opt_emit_llvm, false);
-  Config->EmitRelocs = Args.hasArg(OPT_emit_relocs);
-  Config->CallGraphProfileSort = Args.hasFlag(
+      hasZOption(args, "muldefs");
+  config->allowShlibUndefined =
+      args.hasFlag(OPT_allow_shlib_undefined, OPT_no_allow_shlib_undefined,
+                   args.hasArg(OPT_shared));
+  config->auxiliaryList = args::getStrings(args, OPT_auxiliary);
+  config->bsymbolic = args.hasArg(OPT_Bsymbolic);
+  config->bsymbolicFunctions = args.hasArg(OPT_Bsymbolic_functions);
+  config->checkSections =
+      args.hasFlag(OPT_check_sections, OPT_no_check_sections, true);
+  config->chroot = args.getLastArgValue(OPT_chroot);
+  config->compressDebugSections = getCompressDebugSections(args);
+  config->cref = args.hasFlag(OPT_cref, OPT_no_cref, false);
+  config->defineCommon = args.hasFlag(OPT_define_common, OPT_no_define_common,
+                                      !args.hasArg(OPT_relocatable));
+  config->demangle = args.hasFlag(OPT_demangle, OPT_no_demangle, true);
+  config->dependentLibraries = args.hasFlag(OPT_dependent_libraries, OPT_no_dependent_libraries, true);
+  config->disableVerify = args.hasArg(OPT_disable_verify);
+  config->discard = getDiscard(args);
+  config->dwoDir = args.getLastArgValue(OPT_plugin_opt_dwo_dir_eq);
+  config->dynamicLinker = getDynamicLinker(args);
+  config->ehFrameHdr =
+      args.hasFlag(OPT_eh_frame_hdr, OPT_no_eh_frame_hdr, false);
+  config->emitLLVM = args.hasArg(OPT_plugin_opt_emit_llvm, false);
+  config->emitRelocs = args.hasArg(OPT_emit_relocs);
+  config->callGraphProfileSort = args.hasFlag(
       OPT_call_graph_profile_sort, OPT_no_call_graph_profile_sort, true);
-  Config->EnableNewDtags =
-      Args.hasFlag(OPT_enable_new_dtags, OPT_disable_new_dtags, true);
-  Config->Entry = Args.getLastArgValue(OPT_entry);
-  Config->ExecuteOnly =
-      Args.hasFlag(OPT_execute_only, OPT_no_execute_only, false);
-  Config->ExportDynamic =
-      Args.hasFlag(OPT_export_dynamic, OPT_no_export_dynamic, false);
-  Config->FilterList = args::getStrings(Args, OPT_filter);
-  Config->Fini = Args.getLastArgValue(OPT_fini, "_fini");
-  Config->FixCortexA53Errata843419 = Args.hasArg(OPT_fix_cortex_a53_843419);
-  Config->GcSections = Args.hasFlag(OPT_gc_sections, OPT_no_gc_sections, false);
-  Config->GnuUnique = Args.hasFlag(OPT_gnu_unique, OPT_no_gnu_unique, true);
-  Config->GdbIndex = Args.hasFlag(OPT_gdb_index, OPT_no_gdb_index, false);
-  Config->ICF = getICF(Args);
-  Config->IgnoreDataAddressEquality =
-      Args.hasArg(OPT_ignore_data_address_equality);
-  Config->IgnoreFunctionAddressEquality =
-      Args.hasArg(OPT_ignore_function_address_equality);
-  Config->Init = Args.getLastArgValue(OPT_init, "_init");
-  Config->LTOAAPipeline = Args.getLastArgValue(OPT_lto_aa_pipeline);
-  Config->LTODebugPassManager = Args.hasArg(OPT_lto_debug_pass_manager);
-  Config->LTONewPassManager = Args.hasArg(OPT_lto_new_pass_manager);
-  Config->LTONewPmPasses = Args.getLastArgValue(OPT_lto_newpm_passes);
-  Config->LTOO = args::getInteger(Args, OPT_lto_O, 2);
-  Config->LTOObjPath = Args.getLastArgValue(OPT_plugin_opt_obj_path_eq);
-  Config->LTOPartitions = args::getInteger(Args, OPT_lto_partitions, 1);
-  Config->LTOSampleProfile = Args.getLastArgValue(OPT_lto_sample_profile);
-  Config->MapFile = Args.getLastArgValue(OPT_Map);
-  Config->MipsGotSize = args::getInteger(Args, OPT_mips_got_size, 0xfff0);
-  Config->MergeArmExidx =
-      Args.hasFlag(OPT_merge_exidx_entries, OPT_no_merge_exidx_entries, true);
-  Config->NoinhibitExec = Args.hasArg(OPT_noinhibit_exec);
-  Config->Nostdlib = Args.hasArg(OPT_nostdlib);
-  Config->OFormatBinary = isOutputFormatBinary(Args);
-  Config->Omagic = Args.hasFlag(OPT_omagic, OPT_no_omagic, false);
-  Config->OptRemarksFilename = Args.getLastArgValue(OPT_opt_remarks_filename);
-  Config->OptRemarksWithHotness = Args.hasArg(OPT_opt_remarks_with_hotness);
-  Config->Optimize = args::getInteger(Args, OPT_O, 1);
-  Config->OrphanHandling = getOrphanHandling(Args);
-  Config->OutputFile = Args.getLastArgValue(OPT_o);
-  Config->Pie = Args.hasFlag(OPT_pie, OPT_no_pie, false);
-  Config->PrintIcfSections =
-      Args.hasFlag(OPT_print_icf_sections, OPT_no_print_icf_sections, false);
-  Config->PrintGcSections =
-      Args.hasFlag(OPT_print_gc_sections, OPT_no_print_gc_sections, false);
-  Config->Rpath = getRpath(Args);
-  Config->Relocatable = Args.hasArg(OPT_relocatable);
-  Config->SaveTemps = Args.hasArg(OPT_save_temps);
-  Config->SearchPaths = args::getStrings(Args, OPT_library_path);
-  Config->SectionStartMap = getSectionStartMap(Args);
-  Config->Shared = Args.hasArg(OPT_shared);
-  Config->SingleRoRx = Args.hasArg(OPT_no_rosegment);
-  Config->SoName = Args.getLastArgValue(OPT_soname);
-  Config->SortSection = getSortSection(Args);
-  Config->SplitStackAdjustSize = args::getInteger(Args, OPT_split_stack_adjust_size, 16384);
-  Config->Strip = getStrip(Args);
-  Config->Sysroot = Args.getLastArgValue(OPT_sysroot);
-  Config->Target1Rel = Args.hasFlag(OPT_target1_rel, OPT_target1_abs, false);
-  Config->Target2 = getTarget2(Args);
-  Config->ThinLTOCacheDir = Args.getLastArgValue(OPT_thinlto_cache_dir);
-  Config->ThinLTOCachePolicy = CHECK(
-      parseCachePruningPolicy(Args.getLastArgValue(OPT_thinlto_cache_policy)),
+  config->enableNewDtags =
+      args.hasFlag(OPT_enable_new_dtags, OPT_disable_new_dtags, true);
+  config->entry = args.getLastArgValue(OPT_entry);
+  config->executeOnly =
+      args.hasFlag(OPT_execute_only, OPT_no_execute_only, false);
+  config->exportDynamic =
+      args.hasFlag(OPT_export_dynamic, OPT_no_export_dynamic, false);
+  config->filterList = args::getStrings(args, OPT_filter);
+  config->fini = args.getLastArgValue(OPT_fini, "_fini");
+  config->fixCortexA53Errata843419 = args.hasArg(OPT_fix_cortex_a53_843419);
+  config->forceBTI = args.hasArg(OPT_force_bti);
+  config->requireCET = args.hasArg(OPT_require_cet);
+  config->gcSections = args.hasFlag(OPT_gc_sections, OPT_no_gc_sections, false);
+  config->gnuUnique = args.hasFlag(OPT_gnu_unique, OPT_no_gnu_unique, true);
+  config->gdbIndex = args.hasFlag(OPT_gdb_index, OPT_no_gdb_index, false);
+  config->icf = getICF(args);
+  config->ignoreDataAddressEquality =
+      args.hasArg(OPT_ignore_data_address_equality);
+  config->ignoreFunctionAddressEquality =
+      args.hasArg(OPT_ignore_function_address_equality);
+  config->init = args.getLastArgValue(OPT_init, "_init");
+  config->ltoAAPipeline = args.getLastArgValue(OPT_lto_aa_pipeline);
+  config->ltoCSProfileGenerate = args.hasArg(OPT_lto_cs_profile_generate);
+  config->ltoCSProfileFile = args.getLastArgValue(OPT_lto_cs_profile_file);
+  config->ltoDebugPassManager = args.hasArg(OPT_lto_debug_pass_manager);
+  config->ltoNewPassManager = args.hasArg(OPT_lto_new_pass_manager);
+  config->ltoNewPmPasses = args.getLastArgValue(OPT_lto_newpm_passes);
+  config->ltoo = args::getInteger(args, OPT_lto_O, 2);
+  config->ltoObjPath = args.getLastArgValue(OPT_plugin_opt_obj_path_eq);
+  config->ltoPartitions = args::getInteger(args, OPT_lto_partitions, 1);
+  config->ltoSampleProfile = args.getLastArgValue(OPT_lto_sample_profile);
+  config->mapFile = args.getLastArgValue(OPT_Map);
+  config->mipsGotSize = args::getInteger(args, OPT_mips_got_size, 0xfff0);
+  config->mergeArmExidx =
+      args.hasFlag(OPT_merge_exidx_entries, OPT_no_merge_exidx_entries, true);
+  config->nmagic = args.hasFlag(OPT_nmagic, OPT_no_nmagic, false);
+  config->noinhibitExec = args.hasArg(OPT_noinhibit_exec);
+  config->nostdlib = args.hasArg(OPT_nostdlib);
+  config->oFormatBinary = isOutputFormatBinary(args);
+  config->omagic = args.hasFlag(OPT_omagic, OPT_no_omagic, false);
+  config->optRemarksFilename = args.getLastArgValue(OPT_opt_remarks_filename);
+  config->optRemarksPasses = args.getLastArgValue(OPT_opt_remarks_passes);
+  config->optRemarksWithHotness = args.hasArg(OPT_opt_remarks_with_hotness);
+  config->optRemarksFormat = args.getLastArgValue(OPT_opt_remarks_format);
+  config->optimize = args::getInteger(args, OPT_O, 1);
+  config->orphanHandling = getOrphanHandling(args);
+  config->outputFile = args.getLastArgValue(OPT_o);
+  config->pacPlt = args.hasArg(OPT_pac_plt);
+  config->pie = args.hasFlag(OPT_pie, OPT_no_pie, false);
+  config->printIcfSections =
+      args.hasFlag(OPT_print_icf_sections, OPT_no_print_icf_sections, false);
+  config->printGcSections =
+      args.hasFlag(OPT_print_gc_sections, OPT_no_print_gc_sections, false);
+  config->printSymbolOrder =
+      args.getLastArgValue(OPT_print_symbol_order);
+  config->rpath = getRpath(args);
+  config->relocatable = args.hasArg(OPT_relocatable);
+  config->saveTemps = args.hasArg(OPT_save_temps);
+  config->searchPaths = args::getStrings(args, OPT_library_path);
+  config->sectionStartMap = getSectionStartMap(args);
+  config->shared = args.hasArg(OPT_shared);
+  config->singleRoRx = args.hasArg(OPT_no_rosegment);
+  config->soName = args.getLastArgValue(OPT_soname);
+  config->sortSection = getSortSection(args);
+  config->splitStackAdjustSize = args::getInteger(args, OPT_split_stack_adjust_size, 16384);
+  config->strip = getStrip(args);
+  config->sysroot = args.getLastArgValue(OPT_sysroot);
+  config->target1Rel = args.hasFlag(OPT_target1_rel, OPT_target1_abs, false);
+  config->target2 = getTarget2(args);
+  config->thinLTOCacheDir = args.getLastArgValue(OPT_thinlto_cache_dir);
+  config->thinLTOCachePolicy = CHECK(
+      parseCachePruningPolicy(args.getLastArgValue(OPT_thinlto_cache_policy)),
       "--thinlto-cache-policy: invalid cache policy");
-  Config->ThinLTOEmitImportsFiles =
-      Args.hasArg(OPT_plugin_opt_thinlto_emit_imports_files);
-  Config->ThinLTOIndexOnly = Args.hasArg(OPT_plugin_opt_thinlto_index_only) ||
-                             Args.hasArg(OPT_plugin_opt_thinlto_index_only_eq);
-  Config->ThinLTOIndexOnlyArg =
-      Args.getLastArgValue(OPT_plugin_opt_thinlto_index_only_eq);
-  Config->ThinLTOJobs = args::getInteger(Args, OPT_thinlto_jobs, -1u);
-  Config->ThinLTOObjectSuffixReplace =
-      getOldNewOptions(Args, OPT_plugin_opt_thinlto_object_suffix_replace_eq);
-  Config->ThinLTOPrefixReplace =
-      getOldNewOptions(Args, OPT_plugin_opt_thinlto_prefix_replace_eq);
-  Config->Trace = Args.hasArg(OPT_trace);
-  Config->Undefined = args::getStrings(Args, OPT_undefined);
-  Config->UndefinedVersion =
-      Args.hasFlag(OPT_undefined_version, OPT_no_undefined_version, true);
-  Config->UseAndroidRelrTags = Args.hasFlag(
+  config->thinLTOEmitImportsFiles =
+      args.hasArg(OPT_plugin_opt_thinlto_emit_imports_files);
+  config->thinLTOIndexOnly = args.hasArg(OPT_plugin_opt_thinlto_index_only) ||
+                             args.hasArg(OPT_plugin_opt_thinlto_index_only_eq);
+  config->thinLTOIndexOnlyArg =
+      args.getLastArgValue(OPT_plugin_opt_thinlto_index_only_eq);
+  config->thinLTOJobs = args::getInteger(args, OPT_thinlto_jobs, -1u);
+  config->thinLTOObjectSuffixReplace =
+      getOldNewOptions(args, OPT_plugin_opt_thinlto_object_suffix_replace_eq);
+  config->thinLTOPrefixReplace =
+      getOldNewOptions(args, OPT_plugin_opt_thinlto_prefix_replace_eq);
+  config->trace = args.hasArg(OPT_trace);
+  config->undefined = args::getStrings(args, OPT_undefined);
+  config->undefinedVersion =
+      args.hasFlag(OPT_undefined_version, OPT_no_undefined_version, true);
+  config->useAndroidRelrTags = args.hasFlag(
       OPT_use_android_relr_tags, OPT_no_use_android_relr_tags, false);
-  Config->UnresolvedSymbols = getUnresolvedSymbolPolicy(Args);
-  Config->WarnBackrefs =
-      Args.hasFlag(OPT_warn_backrefs, OPT_no_warn_backrefs, false);
-  Config->WarnCommon = Args.hasFlag(OPT_warn_common, OPT_no_warn_common, false);
-  Config->WarnIfuncTextrel =
-      Args.hasFlag(OPT_warn_ifunc_textrel, OPT_no_warn_ifunc_textrel, false);
-  Config->WarnSymbolOrdering =
-      Args.hasFlag(OPT_warn_symbol_ordering, OPT_no_warn_symbol_ordering, true);
-  Config->ZCombreloc = getZFlag(Args, "combreloc", "nocombreloc", true);
-  Config->ZCopyreloc = getZFlag(Args, "copyreloc", "nocopyreloc", true);
-  Config->ZExecstack = getZFlag(Args, "execstack", "noexecstack", false);
-  Config->ZGlobal = hasZOption(Args, "global");
-  Config->ZHazardplt = hasZOption(Args, "hazardplt");
-  Config->ZInitfirst = hasZOption(Args, "initfirst");
-  Config->ZInterpose = hasZOption(Args, "interpose");
-  Config->ZKeepTextSectionPrefix = getZFlag(
-      Args, "keep-text-section-prefix", "nokeep-text-section-prefix", false);
-  Config->ZNodefaultlib = hasZOption(Args, "nodefaultlib");
-  Config->ZNodelete = hasZOption(Args, "nodelete");
-  Config->ZNodlopen = hasZOption(Args, "nodlopen");
-  Config->ZNow = getZFlag(Args, "now", "lazy", false);
-  Config->ZOrigin = hasZOption(Args, "origin");
-  Config->ZRelro = getZFlag(Args, "relro", "norelro", true);
-  Config->ZRetpolineplt = hasZOption(Args, "retpolineplt");
-  Config->ZRodynamic = hasZOption(Args, "rodynamic");
-  Config->ZStackSize = args::getZOptionValue(Args, OPT_z, "stack-size", 0);
-  Config->ZText = getZFlag(Args, "text", "notext", true);
-  Config->ZWxneeded = hasZOption(Args, "wxneeded");
+  config->unresolvedSymbols = getUnresolvedSymbolPolicy(args);
+  config->warnBackrefs =
+      args.hasFlag(OPT_warn_backrefs, OPT_no_warn_backrefs, false);
+  config->warnCommon = args.hasFlag(OPT_warn_common, OPT_no_warn_common, false);
+  config->warnIfuncTextrel =
+      args.hasFlag(OPT_warn_ifunc_textrel, OPT_no_warn_ifunc_textrel, false);
+  config->warnSymbolOrdering =
+      args.hasFlag(OPT_warn_symbol_ordering, OPT_no_warn_symbol_ordering, true);
+  config->zCombreloc = getZFlag(args, "combreloc", "nocombreloc", true);
+  config->zCopyreloc = getZFlag(args, "copyreloc", "nocopyreloc", true);
+  config->zExecstack = getZFlag(args, "execstack", "noexecstack", false);
+  config->zGlobal = hasZOption(args, "global");
+  config->zHazardplt = hasZOption(args, "hazardplt");
+  config->zIfuncNoplt = hasZOption(args, "ifunc-noplt");
+  config->zInitfirst = hasZOption(args, "initfirst");
+  config->zInterpose = hasZOption(args, "interpose");
+  config->zKeepTextSectionPrefix = getZFlag(
+      args, "keep-text-section-prefix", "nokeep-text-section-prefix", false);
+  config->zNodefaultlib = hasZOption(args, "nodefaultlib");
+  config->zNodelete = hasZOption(args, "nodelete");
+  config->zNodlopen = hasZOption(args, "nodlopen");
+  config->zNow = getZFlag(args, "now", "lazy", false);
+  config->zOrigin = hasZOption(args, "origin");
+  config->zRelro = getZFlag(args, "relro", "norelro", true);
+  config->zRetpolineplt = hasZOption(args, "retpolineplt");
+  config->zRodynamic = hasZOption(args, "rodynamic");
+  config->zStackSize = args::getZOptionValue(args, OPT_z, "stack-size", 0);
+  config->zText = getZFlag(args, "text", "notext", true);
+  config->zWxneeded = hasZOption(args, "wxneeded");
 
   // Parse LTO options.
-  if (auto *Arg = Args.getLastArg(OPT_plugin_opt_mcpu_eq))
-    parseClangOption(Saver.save("-mcpu=" + StringRef(Arg->getValue())),
-                     Arg->getSpelling());
+  if (auto *arg = args.getLastArg(OPT_plugin_opt_mcpu_eq))
+    parseClangOption(saver.save("-mcpu=" + StringRef(arg->getValue())),
+                     arg->getSpelling());
 
-  for (auto *Arg : Args.filtered(OPT_plugin_opt))
-    parseClangOption(Arg->getValue(), Arg->getSpelling());
+  for (auto *arg : args.filtered(OPT_plugin_opt))
+    parseClangOption(arg->getValue(), arg->getSpelling());
 
   // Parse -mllvm options.
-  for (auto *Arg : Args.filtered(OPT_mllvm))
-    parseClangOption(Arg->getValue(), Arg->getSpelling());
+  for (auto *arg : args.filtered(OPT_mllvm))
+    parseClangOption(arg->getValue(), arg->getSpelling());
 
-  if (Config->LTOO > 3)
-    error("invalid optimization level for LTO: " + Twine(Config->LTOO));
-  if (Config->LTOPartitions == 0)
+  if (config->ltoo > 3)
+    error("invalid optimization level for LTO: " + Twine(config->ltoo));
+  if (config->ltoPartitions == 0)
     error("--lto-partitions: number of threads must be > 0");
-  if (Config->ThinLTOJobs == 0)
+  if (config->thinLTOJobs == 0)
     error("--thinlto-jobs: number of threads must be > 0");
 
-  if (Config->SplitStackAdjustSize < 0)
+  if (config->splitStackAdjustSize < 0)
     error("--split-stack-adjust-size: size must be >= 0");
 
   // Parse ELF{32,64}{LE,BE} and CPU type.
-  if (auto *Arg = Args.getLastArg(OPT_m)) {
-    StringRef S = Arg->getValue();
-    std::tie(Config->EKind, Config->EMachine, Config->OSABI) =
-        parseEmulation(S);
-    Config->MipsN32Abi = (S == "elf32btsmipn32" || S == "elf32ltsmipn32");
-    Config->Emulation = S;
+  if (auto *arg = args.getLastArg(OPT_m)) {
+    StringRef s = arg->getValue();
+    std::tie(config->ekind, config->emachine, config->osabi) =
+        parseEmulation(s);
+    config->mipsN32Abi = (s == "elf32btsmipn32" || s == "elf32ltsmipn32");
+    config->emulation = s;
   }
 
   // Parse -hash-style={sysv,gnu,both}.
-  if (auto *Arg = Args.getLastArg(OPT_hash_style)) {
-    StringRef S = Arg->getValue();
-    if (S == "sysv")
-      Config->SysvHash = true;
-    else if (S == "gnu")
-      Config->GnuHash = true;
-    else if (S == "both")
-      Config->SysvHash = Config->GnuHash = true;
+  if (auto *arg = args.getLastArg(OPT_hash_style)) {
+    StringRef s = arg->getValue();
+    if (s == "sysv")
+      config->sysvHash = true;
+    else if (s == "gnu")
+      config->gnuHash = true;
+    else if (s == "both")
+      config->sysvHash = config->gnuHash = true;
     else
-      error("unknown -hash-style: " + S);
+      error("unknown -hash-style: " + s);
   }
 
-  if (Args.hasArg(OPT_print_map))
-    Config->MapFile = "-";
+  if (args.hasArg(OPT_print_map))
+    config->mapFile = "-";
 
-  // --omagic is an option to create old-fashioned executables in which
-  // .text segments are writable. Today, the option is still in use to
-  // create special-purpose programs such as boot loaders. It doesn't
-  // make sense to create PT_GNU_RELRO for such executables.
-  if (Config->Omagic)
-    Config->ZRelro = false;
+  // Page alignment can be disabled by the -n (--nmagic) and -N (--omagic).
+  // As PT_GNU_RELRO relies on Paging, do not create it when we have disabled
+  // it.
+  if (config->nmagic || config->omagic)
+    config->zRelro = false;
 
-  std::tie(Config->BuildId, Config->BuildIdVector) = getBuildId(Args);
+  std::tie(config->buildId, config->buildIdVector) = getBuildId(args);
 
-  std::tie(Config->AndroidPackDynRelocs, Config->RelrPackDynRelocs) =
-      getPackDynRelocs(Args);
+  std::tie(config->androidPackDynRelocs, config->relrPackDynRelocs) =
+      getPackDynRelocs(args);
 
-  if (auto *Arg = Args.getLastArg(OPT_symbol_ordering_file))
-    if (Optional<MemoryBufferRef> Buffer = readFile(Arg->getValue()))
-      Config->SymbolOrderingFile = getSymbolOrderingFile(*Buffer);
+  if (auto *arg = args.getLastArg(OPT_symbol_ordering_file)){
+    if (args.hasArg(OPT_call_graph_ordering_file))
+      error("--symbol-ordering-file and --call-graph-order-file "
+            "may not be used together");
+    if (Optional<MemoryBufferRef> buffer = readFile(arg->getValue())){
+      config->symbolOrderingFile = getSymbolOrderingFile(*buffer);
+      // Also need to disable CallGraphProfileSort to prevent
+      // LLD order symbols with CGProfile
+      config->callGraphProfileSort = false;
+    }
+  }
 
   // If --retain-symbol-file is used, we'll keep only the symbols listed in
   // the file and discard all others.
-  if (auto *Arg = Args.getLastArg(OPT_retain_symbols_file)) {
-    Config->DefaultSymbolVersion = VER_NDX_LOCAL;
-    if (Optional<MemoryBufferRef> Buffer = readFile(Arg->getValue()))
-      for (StringRef S : args::getLines(*Buffer))
-        Config->VersionScriptGlobals.push_back(
-            {S, /*IsExternCpp*/ false, /*HasWildcard*/ false});
+  if (auto *arg = args.getLastArg(OPT_retain_symbols_file)) {
+    config->defaultSymbolVersion = VER_NDX_LOCAL;
+    if (Optional<MemoryBufferRef> buffer = readFile(arg->getValue()))
+      for (StringRef s : args::getLines(*buffer))
+        config->versionScriptGlobals.push_back(
+            {s, /*IsExternCpp*/ false, /*HasWildcard*/ false});
   }
 
-  bool HasExportDynamic =
-      Args.hasFlag(OPT_export_dynamic, OPT_no_export_dynamic, false);
+  bool hasExportDynamic =
+      args.hasFlag(OPT_export_dynamic, OPT_no_export_dynamic, false);
 
   // Parses -dynamic-list and -export-dynamic-symbol. They make some
   // symbols private. Note that -export-dynamic takes precedence over them
   // as it says all symbols should be exported.
-  if (!HasExportDynamic) {
-    for (auto *Arg : Args.filtered(OPT_dynamic_list))
-      if (Optional<MemoryBufferRef> Buffer = readFile(Arg->getValue()))
-        readDynamicList(*Buffer);
+  if (!hasExportDynamic) {
+    for (auto *arg : args.filtered(OPT_dynamic_list))
+      if (Optional<MemoryBufferRef> buffer = readFile(arg->getValue()))
+        readDynamicList(*buffer);
 
-    for (auto *Arg : Args.filtered(OPT_export_dynamic_symbol))
-      Config->DynamicList.push_back(
-          {Arg->getValue(), /*IsExternCpp*/ false, /*HasWildcard*/ false});
+    for (auto *arg : args.filtered(OPT_export_dynamic_symbol))
+      config->dynamicList.push_back(
+          {arg->getValue(), /*IsExternCpp*/ false, /*HasWildcard*/ false});
   }
 
   // If --export-dynamic-symbol=foo is given and symbol foo is defined in
   // an object file in an archive file, that object file should be pulled
   // out and linked. (It doesn't have to behave like that from technical
   // point of view, but this is needed for compatibility with GNU.)
-  for (auto *Arg : Args.filtered(OPT_export_dynamic_symbol))
-    Config->Undefined.push_back(Arg->getValue());
+  for (auto *arg : args.filtered(OPT_export_dynamic_symbol))
+    config->undefined.push_back(arg->getValue());
 
-  for (auto *Arg : Args.filtered(OPT_version_script))
-    if (Optional<std::string> Path = searchScript(Arg->getValue())) {
-      if (Optional<MemoryBufferRef> Buffer = readFile(*Path))
-        readVersionScript(*Buffer);
+  for (auto *arg : args.filtered(OPT_version_script))
+    if (Optional<std::string> path = searchScript(arg->getValue())) {
+      if (Optional<MemoryBufferRef> buffer = readFile(*path))
+        readVersionScript(*buffer);
     } else {
-      error(Twine("cannot find version script ") + Arg->getValue());
+      error(Twine("cannot find version script ") + arg->getValue());
     }
 }
 
@@ -996,18 +1055,18 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args) {
 // command line options, but computed based on other Config values.
 // This function initialize such members. See Config.h for the details
 // of these values.
-static void setConfigs(opt::InputArgList &Args) {
-  ELFKind K = Config->EKind;
-  uint16_t M = Config->EMachine;
+static void setConfigs(opt::InputArgList &args) {
+  ELFKind k = config->ekind;
+  uint16_t m = config->emachine;
 
-  Config->CopyRelocs = (Config->Relocatable || Config->EmitRelocs);
-  Config->Is64 = (K == ELF64LEKind || K == ELF64BEKind);
-  Config->IsLE = (K == ELF32LEKind || K == ELF64LEKind);
-  Config->Endianness = Config->IsLE ? endianness::little : endianness::big;
-  Config->IsMips64EL = (K == ELF64LEKind && M == EM_MIPS);
-  Config->Pic = Config->Pie || Config->Shared;
-  Config->PicThunk = Args.hasArg(OPT_pic_veneer, Config->Pic);
-  Config->Wordsize = Config->Is64 ? 8 : 4;
+  config->copyRelocs = (config->relocatable || config->emitRelocs);
+  config->is64 = (k == ELF64LEKind || k == ELF64BEKind);
+  config->isLE = (k == ELF32LEKind || k == ELF64LEKind);
+  config->endianness = config->isLE ? endianness::little : endianness::big;
+  config->isMips64EL = (k == ELF64LEKind && m == EM_MIPS);
+  config->isPic = config->pie || config->shared;
+  config->picThunk = args.hasArg(OPT_pic_veneer, config->isPic);
+  config->wordsize = config->is64 ? 8 : 4;
 
   // ELF defines two different ways to store relocation addends as shown below:
   //
@@ -1022,148 +1081,150 @@ static void setConfigs(opt::InputArgList &Args) {
   // You cannot choose which one, Rel or Rela, you want to use. Instead each
   // ABI defines which one you need to use. The following expression expresses
   // that.
-  Config->IsRela = M == EM_AARCH64 || M == EM_AMDGPU || M == EM_HEXAGON ||
-                   M == EM_PPC || M == EM_PPC64 || M == EM_RISCV ||
-                   M == EM_X86_64;
+  config->isRela = m == EM_AARCH64 || m == EM_AMDGPU || m == EM_HEXAGON ||
+                   m == EM_PPC || m == EM_PPC64 || m == EM_RISCV ||
+                   m == EM_X86_64;
 
   // If the output uses REL relocations we must store the dynamic relocation
   // addends to the output sections. We also store addends for RELA relocations
   // if --apply-dynamic-relocs is used.
   // We default to not writing the addends when using RELA relocations since
   // any standard conforming tool can find it in r_addend.
-  Config->WriteAddends = Args.hasFlag(OPT_apply_dynamic_relocs,
+  config->writeAddends = args.hasFlag(OPT_apply_dynamic_relocs,
                                       OPT_no_apply_dynamic_relocs, false) ||
-                         !Config->IsRela;
+                         !config->isRela;
 
-  Config->TocOptimize =
-      Args.hasFlag(OPT_toc_optimize, OPT_no_toc_optimize, M == EM_PPC64);
+  config->tocOptimize =
+      args.hasFlag(OPT_toc_optimize, OPT_no_toc_optimize, m == EM_PPC64);
 }
 
 // Returns a value of "-format" option.
-static bool isFormatBinary(StringRef S) {
-  if (S == "binary")
+static bool isFormatBinary(StringRef s) {
+  if (s == "binary")
     return true;
-  if (S == "elf" || S == "default")
+  if (s == "elf" || s == "default")
     return false;
-  error("unknown -format value: " + S +
+  error("unknown -format value: " + s +
         " (supported formats: elf, default, binary)");
   return false;
 }
 
-void LinkerDriver::createFiles(opt::InputArgList &Args) {
+void LinkerDriver::createFiles(opt::InputArgList &args) {
   // For --{push,pop}-state.
-  std::vector<std::tuple<bool, bool, bool>> Stack;
+  std::vector<std::tuple<bool, bool, bool>> stack;
 
   // Iterate over argv to process input files and positional arguments.
-  for (auto *Arg : Args) {
-    switch (Arg->getOption().getUnaliasedOption().getID()) {
+  for (auto *arg : args) {
+    switch (arg->getOption().getID()) {
     case OPT_library:
-      addLibrary(Arg->getValue());
+      addLibrary(arg->getValue());
       break;
     case OPT_INPUT:
-      addFile(Arg->getValue(), /*WithLOption=*/false);
+      addFile(arg->getValue(), /*withLOption=*/false);
       break;
     case OPT_defsym: {
-      StringRef From;
-      StringRef To;
-      std::tie(From, To) = StringRef(Arg->getValue()).split('=');
-      if (From.empty() || To.empty())
-        error("-defsym: syntax error: " + StringRef(Arg->getValue()));
+      StringRef from;
+      StringRef to;
+      std::tie(from, to) = StringRef(arg->getValue()).split('=');
+      if (from.empty() || to.empty())
+        error("-defsym: syntax error: " + StringRef(arg->getValue()));
       else
-        readDefsym(From, MemoryBufferRef(To, "-defsym"));
+        readDefsym(from, MemoryBufferRef(to, "-defsym"));
       break;
     }
     case OPT_script:
-      if (Optional<std::string> Path = searchScript(Arg->getValue())) {
-        if (Optional<MemoryBufferRef> MB = readFile(*Path))
-          readLinkerScript(*MB);
+      if (Optional<std::string> path = searchScript(arg->getValue())) {
+        if (Optional<MemoryBufferRef> mb = readFile(*path))
+          readLinkerScript(*mb);
         break;
       }
-      error(Twine("cannot find linker script ") + Arg->getValue());
+      error(Twine("cannot find linker script ") + arg->getValue());
       break;
     case OPT_as_needed:
-      Config->AsNeeded = true;
+      config->asNeeded = true;
       break;
     case OPT_format:
-      Config->FormatBinary = isFormatBinary(Arg->getValue());
+      config->formatBinary = isFormatBinary(arg->getValue());
       break;
     case OPT_no_as_needed:
-      Config->AsNeeded = false;
+      config->asNeeded = false;
       break;
     case OPT_Bstatic:
-      Config->Static = true;
+    case OPT_omagic:
+    case OPT_nmagic:
+      config->isStatic = true;
       break;
     case OPT_Bdynamic:
-      Config->Static = false;
+      config->isStatic = false;
       break;
     case OPT_whole_archive:
-      InWholeArchive = true;
+      inWholeArchive = true;
       break;
     case OPT_no_whole_archive:
-      InWholeArchive = false;
+      inWholeArchive = false;
       break;
     case OPT_just_symbols:
-      if (Optional<MemoryBufferRef> MB = readFile(Arg->getValue())) {
-        Files.push_back(createObjectFile(*MB));
-        Files.back()->JustSymbols = true;
+      if (Optional<MemoryBufferRef> mb = readFile(arg->getValue())) {
+        files.push_back(createObjectFile(*mb));
+        files.back()->justSymbols = true;
       }
       break;
     case OPT_start_group:
-      if (InputFile::IsInGroup)
+      if (InputFile::isInGroup)
         error("nested --start-group");
-      InputFile::IsInGroup = true;
+      InputFile::isInGroup = true;
       break;
     case OPT_end_group:
-      if (!InputFile::IsInGroup)
+      if (!InputFile::isInGroup)
         error("stray --end-group");
-      InputFile::IsInGroup = false;
-      ++InputFile::NextGroupId;
+      InputFile::isInGroup = false;
+      ++InputFile::nextGroupId;
       break;
     case OPT_start_lib:
-      if (InLib)
+      if (inLib)
         error("nested --start-lib");
-      if (InputFile::IsInGroup)
+      if (InputFile::isInGroup)
         error("may not nest --start-lib in --start-group");
-      InLib = true;
-      InputFile::IsInGroup = true;
+      inLib = true;
+      InputFile::isInGroup = true;
       break;
     case OPT_end_lib:
-      if (!InLib)
+      if (!inLib)
         error("stray --end-lib");
-      InLib = false;
-      InputFile::IsInGroup = false;
-      ++InputFile::NextGroupId;
+      inLib = false;
+      InputFile::isInGroup = false;
+      ++InputFile::nextGroupId;
       break;
     case OPT_push_state:
-      Stack.emplace_back(Config->AsNeeded, Config->Static, InWholeArchive);
+      stack.emplace_back(config->asNeeded, config->isStatic, inWholeArchive);
       break;
     case OPT_pop_state:
-      if (Stack.empty()) {
+      if (stack.empty()) {
         error("unbalanced --push-state/--pop-state");
         break;
       }
-      std::tie(Config->AsNeeded, Config->Static, InWholeArchive) = Stack.back();
-      Stack.pop_back();
+      std::tie(config->asNeeded, config->isStatic, inWholeArchive) = stack.back();
+      stack.pop_back();
       break;
     }
   }
 
-  if (Files.empty() && errorCount() == 0)
+  if (files.empty() && errorCount() == 0)
     error("no input files");
 }
 
 // If -m <machine_type> was not given, infer it from object files.
 void LinkerDriver::inferMachineType() {
-  if (Config->EKind != ELFNoneKind)
+  if (config->ekind != ELFNoneKind)
     return;
 
-  for (InputFile *F : Files) {
-    if (F->EKind == ELFNoneKind)
+  for (InputFile *f : files) {
+    if (f->ekind == ELFNoneKind)
       continue;
-    Config->EKind = F->EKind;
-    Config->EMachine = F->EMachine;
-    Config->OSABI = F->OSABI;
-    Config->MipsN32Abi = Config->EMachine == EM_MIPS && isMipsN32Abi(F);
+    config->ekind = f->ekind;
+    config->emachine = f->emachine;
+    config->osabi = f->osabi;
+    config->mipsN32Abi = config->emachine == EM_MIPS && isMipsN32Abi(f);
     return;
   }
   error("target emulation unknown: -m or at least one .o file required");
@@ -1171,49 +1232,72 @@ void LinkerDriver::inferMachineType() {
 
 // Parse -z max-page-size=<value>. The default value is defined by
 // each target.
-static uint64_t getMaxPageSize(opt::InputArgList &Args) {
-  uint64_t Val = args::getZOptionValue(Args, OPT_z, "max-page-size",
-                                       Target->DefaultMaxPageSize);
-  if (!isPowerOf2_64(Val))
+static uint64_t getMaxPageSize(opt::InputArgList &args) {
+  uint64_t val = args::getZOptionValue(args, OPT_z, "max-page-size",
+                                       target->defaultMaxPageSize);
+  if (!isPowerOf2_64(val))
     error("max-page-size: value isn't a power of 2");
-  return Val;
+  if (config->nmagic || config->omagic) {
+    if (val != target->defaultMaxPageSize)
+      warn("-z max-page-size set, but paging disabled by omagic or nmagic");
+    return 1;
+  }
+  return val;
+}
+
+// Parse -z common-page-size=<value>. The default value is defined by
+// each target.
+static uint64_t getCommonPageSize(opt::InputArgList &args) {
+  uint64_t val = args::getZOptionValue(args, OPT_z, "common-page-size",
+                                       target->defaultCommonPageSize);
+  if (!isPowerOf2_64(val))
+    error("common-page-size: value isn't a power of 2");
+  if (config->nmagic || config->omagic) {
+    if (val != target->defaultCommonPageSize)
+      warn("-z common-page-size set, but paging disabled by omagic or nmagic");
+    return 1;
+  }
+  // commonPageSize can't be larger than maxPageSize.
+  if (val > config->maxPageSize)
+    val = config->maxPageSize;
+  return val;
 }
 
 // Parses -image-base option.
-static Optional<uint64_t> getImageBase(opt::InputArgList &Args) {
-  // Because we are using "Config->MaxPageSize" here, this function has to be
+static Optional<uint64_t> getImageBase(opt::InputArgList &args) {
+  // Because we are using "Config->maxPageSize" here, this function has to be
   // called after the variable is initialized.
-  auto *Arg = Args.getLastArg(OPT_image_base);
-  if (!Arg)
+  auto *arg = args.getLastArg(OPT_image_base);
+  if (!arg)
     return None;
 
-  StringRef S = Arg->getValue();
-  uint64_t V;
-  if (!to_integer(S, V)) {
-    error("-image-base: number expected, but got " + S);
+  StringRef s = arg->getValue();
+  uint64_t v;
+  if (!to_integer(s, v)) {
+    error("-image-base: number expected, but got " + s);
     return 0;
   }
-  if ((V % Config->MaxPageSize) != 0)
-    warn("-image-base: address isn't multiple of page size: " + S);
-  return V;
+  if ((v % config->maxPageSize) != 0)
+    warn("-image-base: address isn't multiple of page size: " + s);
+  return v;
 }
 
 // Parses `--exclude-libs=lib,lib,...`.
 // The library names may be delimited by commas or colons.
-static DenseSet<StringRef> getExcludeLibs(opt::InputArgList &Args) {
-  DenseSet<StringRef> Ret;
-  for (auto *Arg : Args.filtered(OPT_exclude_libs)) {
-    StringRef S = Arg->getValue();
+static DenseSet<StringRef> getExcludeLibs(opt::InputArgList &args) {
+  DenseSet<StringRef> ret;
+  for (auto *arg : args.filtered(OPT_exclude_libs)) {
+    StringRef s = arg->getValue();
     for (;;) {
-      size_t Pos = S.find_first_of(",:");
-      if (Pos == StringRef::npos)
+      size_t pos = s.find_first_of(",:");
+      if (pos == StringRef::npos)
         break;
-      Ret.insert(S.substr(0, Pos));
-      S = S.substr(Pos + 1);
+      ret.insert(s.substr(0, pos));
+      s = s.substr(pos + 1);
     }
-    Ret.insert(S);
+    ret.insert(s);
   }
-  return Ret;
+  return ret;
 }
 
 // Handles the -exclude-libs option. If a static library file is specified
@@ -1222,139 +1306,247 @@ static DenseSet<StringRef> getExcludeLibs(opt::InputArgList &Args) {
 // A special library name "ALL" means all archive files.
 //
 // This is not a popular option, but some programs such as bionic libc use it.
-template <class ELFT>
-static void excludeLibs(opt::InputArgList &Args) {
-  DenseSet<StringRef> Libs = getExcludeLibs(Args);
-  bool All = Libs.count("ALL");
+static void excludeLibs(opt::InputArgList &args) {
+  DenseSet<StringRef> libs = getExcludeLibs(args);
+  bool all = libs.count("ALL");
 
-  auto Visit = [&](InputFile *File) {
-    if (!File->ArchiveName.empty())
-      if (All || Libs.count(path::filename(File->ArchiveName)))
-        for (Symbol *Sym : File->getSymbols())
-          if (!Sym->isLocal() && Sym->File == File)
-            Sym->VersionId = VER_NDX_LOCAL;
+  auto visit = [&](InputFile *file) {
+    if (!file->archiveName.empty())
+      if (all || libs.count(path::filename(file->archiveName)))
+        for (Symbol *sym : file->getSymbols())
+          if (!sym->isLocal() && sym->file == file)
+            sym->versionId = VER_NDX_LOCAL;
   };
 
-  for (InputFile *File : ObjectFiles)
-    Visit(File);
+  for (InputFile *file : objectFiles)
+    visit(file);
 
-  for (BitcodeFile *File : BitcodeFiles)
-    Visit(File);
+  for (BitcodeFile *file : bitcodeFiles)
+    visit(file);
 }
 
 // Force Sym to be entered in the output. Used for -u or equivalent.
-template <class ELFT> static void handleUndefined(StringRef Name) {
-  Symbol *Sym = Symtab->find(Name);
-  if (!Sym)
-    return;
-
-  // Since symbol S may not be used inside the program, LTO may
+static void handleUndefined(Symbol *sym) {
+  // Since a symbol may not be used inside the program, LTO may
   // eliminate it. Mark the symbol as "used" to prevent it.
-  Sym->IsUsedInRegularObj = true;
+  sym->isUsedInRegularObj = true;
 
-  if (Sym->isLazy())
-    Symtab->fetchLazy<ELFT>(Sym);
+  if (sym->isLazy())
+    sym->fetch();
 }
 
-template <class ELFT> static void handleLibcall(StringRef Name) {
-  Symbol *Sym = Symtab->find(Name);
-  if (!Sym || !Sym->isLazy())
+// As an extention to GNU linkers, lld supports a variant of `-u`
+// which accepts wildcard patterns. All symbols that match a given
+// pattern are handled as if they were given by `-u`.
+static void handleUndefinedGlob(StringRef arg) {
+  Expected<GlobPattern> pat = GlobPattern::create(arg);
+  if (!pat) {
+    error("--undefined-glob: " + toString(pat.takeError()));
     return;
+  }
 
-  MemoryBufferRef MB;
-  if (auto *LO = dyn_cast<LazyObject>(Sym))
-    MB = LO->File->MB;
+  std::vector<Symbol *> syms;
+  symtab->forEachSymbol([&](Symbol *sym) {
+    // Calling Sym->fetch() from here is not safe because it may
+    // add new symbols to the symbol table, invalidating the
+    // current iterator. So we just keep a note.
+    if (pat->match(sym->getName()))
+      syms.push_back(sym);
+  });
+
+  for (Symbol *sym : syms)
+    handleUndefined(sym);
+}
+
+static void handleLibcall(StringRef name) {
+  Symbol *sym = symtab->find(name);
+  if (!sym || !sym->isLazy())
+    return;
+
+  MemoryBufferRef mb;
+  if (auto *lo = dyn_cast<LazyObject>(sym))
+    mb = lo->file->mb;
   else
-    MB = cast<LazyArchive>(Sym)->getMemberBuffer();
+    mb = cast<LazyArchive>(sym)->getMemberBuffer();
 
-  if (isBitcode(MB))
-    Symtab->fetchLazy<ELFT>(Sym);
+  if (isBitcode(mb))
+    sym->fetch();
+}
+
+// Replaces common symbols with defined symbols reside in .bss sections.
+// This function is called after all symbol names are resolved. As a
+// result, the passes after the symbol resolution won't see any
+// symbols of type CommonSymbol.
+static void replaceCommonSymbols() {
+  symtab->forEachSymbol([](Symbol *sym) {
+    auto *s = dyn_cast<CommonSymbol>(sym);
+    if (!s)
+      return;
+
+    auto *bss = make<BssSection>("COMMON", s->size, s->alignment);
+    bss->file = s->file;
+    bss->markDead();
+    inputSections.push_back(bss);
+    s->replace(Defined{s->file, s->getName(), s->binding, s->stOther, s->type,
+                       /*value=*/0, s->size, bss});
+  });
 }
 
 // If all references to a DSO happen to be weak, the DSO is not added
 // to DT_NEEDED. If that happens, we need to eliminate shared symbols
 // created from the DSO. Otherwise, they become dangling references
 // that point to a non-existent DSO.
-template <class ELFT> static void demoteSharedSymbols() {
-  for (Symbol *Sym : Symtab->getSymbols()) {
-    if (auto *S = dyn_cast<SharedSymbol>(Sym)) {
-      if (!S->getFile<ELFT>().IsNeeded) {
-        bool Used = S->Used;
-        replaceSymbol<Undefined>(S, nullptr, S->getName(), STB_WEAK, S->StOther,
-                                 S->Type);
-        S->Used = Used;
-      }
-    }
-  }
+static void demoteSharedSymbols() {
+  symtab->forEachSymbol([](Symbol *sym) {
+    auto *s = dyn_cast<SharedSymbol>(sym);
+    if (!s || s->getFile().isNeeded)
+      return;
+
+    bool used = s->used;
+    s->replace(Undefined{nullptr, s->getName(), STB_WEAK, s->stOther, s->type});
+    s->used = used;
+  });
 }
 
-// The section referred to by S is considered address-significant. Set the
-// KeepUnique flag on the section if appropriate.
-static void markAddrsig(Symbol *S) {
-  if (auto *D = dyn_cast_or_null<Defined>(S))
-    if (D->Section)
+// The section referred to by `s` is considered address-significant. Set the
+// keepUnique flag on the section if appropriate.
+static void markAddrsig(Symbol *s) {
+  if (auto *d = dyn_cast_or_null<Defined>(s))
+    if (d->section)
       // We don't need to keep text sections unique under --icf=all even if they
       // are address-significant.
-      if (Config->ICF == ICFLevel::Safe || !(D->Section->Flags & SHF_EXECINSTR))
-        D->Section->KeepUnique = true;
+      if (config->icf == ICFLevel::Safe || !(d->section->flags & SHF_EXECINSTR))
+        d->section->keepUnique = true;
 }
 
 // Record sections that define symbols mentioned in --keep-unique <symbol>
 // and symbols referred to by address-significance tables. These sections are
 // ineligible for ICF.
 template <class ELFT>
-static void findKeepUniqueSections(opt::InputArgList &Args) {
-  for (auto *Arg : Args.filtered(OPT_keep_unique)) {
-    StringRef Name = Arg->getValue();
-    auto *D = dyn_cast_or_null<Defined>(Symtab->find(Name));
-    if (!D || !D->Section) {
-      warn("could not find symbol " + Name + " to keep unique");
+static void findKeepUniqueSections(opt::InputArgList &args) {
+  for (auto *arg : args.filtered(OPT_keep_unique)) {
+    StringRef name = arg->getValue();
+    auto *d = dyn_cast_or_null<Defined>(symtab->find(name));
+    if (!d || !d->section) {
+      warn("could not find symbol " + name + " to keep unique");
       continue;
     }
-    D->Section->KeepUnique = true;
+    d->section->keepUnique = true;
   }
 
   // --icf=all --ignore-data-address-equality means that we can ignore
   // the dynsym and address-significance tables entirely.
-  if (Config->ICF == ICFLevel::All && Config->IgnoreDataAddressEquality)
+  if (config->icf == ICFLevel::All && config->ignoreDataAddressEquality)
     return;
 
   // Symbols in the dynsym could be address-significant in other executables
   // or DSOs, so we conservatively mark them as address-significant.
-  for (Symbol *S : Symtab->getSymbols())
-    if (S->includeInDynsym())
-      markAddrsig(S);
+  symtab->forEachSymbol([&](Symbol *sym) {
+    if (sym->includeInDynsym())
+      markAddrsig(sym);
+  });
 
   // Visit the address-significance table in each object file and mark each
   // referenced symbol as address-significant.
-  for (InputFile *F : ObjectFiles) {
-    auto *Obj = cast<ObjFile<ELFT>>(F);
-    ArrayRef<Symbol *> Syms = Obj->getSymbols();
-    if (Obj->AddrsigSec) {
-      ArrayRef<uint8_t> Contents =
-          check(Obj->getObj().getSectionContents(Obj->AddrsigSec));
-      const uint8_t *Cur = Contents.begin();
-      while (Cur != Contents.end()) {
-        unsigned Size;
-        const char *Err;
-        uint64_t SymIndex = decodeULEB128(Cur, &Size, Contents.end(), &Err);
-        if (Err)
-          fatal(toString(F) + ": could not decode addrsig section: " + Err);
-        markAddrsig(Syms[SymIndex]);
-        Cur += Size;
+  for (InputFile *f : objectFiles) {
+    auto *obj = cast<ObjFile<ELFT>>(f);
+    ArrayRef<Symbol *> syms = obj->getSymbols();
+    if (obj->addrsigSec) {
+      ArrayRef<uint8_t> contents =
+          check(obj->getObj().getSectionContents(obj->addrsigSec));
+      const uint8_t *cur = contents.begin();
+      while (cur != contents.end()) {
+        unsigned size;
+        const char *err;
+        uint64_t symIndex = decodeULEB128(cur, &size, contents.end(), &err);
+        if (err)
+          fatal(toString(f) + ": could not decode addrsig section: " + err);
+        markAddrsig(syms[symIndex]);
+        cur += size;
       }
     } else {
       // If an object file does not have an address-significance table,
       // conservatively mark all of its symbols as address-significant.
-      for (Symbol *S : Syms)
-        markAddrsig(S);
+      for (Symbol *s : syms)
+        markAddrsig(s);
     }
   }
 }
 
-template <class ELFT> static Symbol *addUndefined(StringRef Name) {
-  return Symtab->addUndefined<ELFT>(Name, STB_GLOBAL, STV_DEFAULT, 0, false,
-                                    nullptr);
+// This function reads a symbol partition specification section. These sections
+// are used to control which partition a symbol is allocated to. See
+// https://lld.llvm.org/Partitions.html for more details on partitions.
+template <typename ELFT>
+static void readSymbolPartitionSection(InputSectionBase *s) {
+  // Read the relocation that refers to the partition's entry point symbol.
+  Symbol *sym;
+  if (s->areRelocsRela)
+    sym = &s->getFile<ELFT>()->getRelocTargetSym(s->template relas<ELFT>()[0]);
+  else
+    sym = &s->getFile<ELFT>()->getRelocTargetSym(s->template rels<ELFT>()[0]);
+  if (!isa<Defined>(sym) || !sym->includeInDynsym())
+    return;
+
+  StringRef partName = reinterpret_cast<const char *>(s->data().data());
+  for (Partition &part : partitions) {
+    if (part.name == partName) {
+      sym->partition = part.getNumber();
+      return;
+    }
+  }
+
+  // Forbid partitions from being used on incompatible targets, and forbid them
+  // from being used together with various linker features that assume a single
+  // set of output sections.
+  if (script->hasSectionsCommand)
+    error(toString(s->file) +
+          ": partitions cannot be used with the SECTIONS command");
+  if (script->hasPhdrsCommands())
+    error(toString(s->file) +
+          ": partitions cannot be used with the PHDRS command");
+  if (!config->sectionStartMap.empty())
+    error(toString(s->file) + ": partitions cannot be used with "
+                              "--section-start, -Ttext, -Tdata or -Tbss");
+  if (config->emachine == EM_MIPS)
+    error(toString(s->file) + ": partitions cannot be used on this target");
+
+  // Impose a limit of no more than 254 partitions. This limit comes from the
+  // sizes of the Partition fields in InputSectionBase and Symbol, as well as
+  // the amount of space devoted to the partition number in RankFlags.
+  if (partitions.size() == 254)
+    fatal("may not have more than 254 partitions");
+
+  partitions.emplace_back();
+  Partition &newPart = partitions.back();
+  newPart.name = partName;
+  sym->partition = newPart.getNumber();
+}
+
+static Symbol *addUndefined(StringRef name) {
+  return symtab->addSymbol(
+      Undefined{nullptr, name, STB_GLOBAL, STV_DEFAULT, 0});
+}
+
+// This function is where all the optimizations of link-time
+// optimization takes place. When LTO is in use, some input files are
+// not in native object file format but in the LLVM bitcode format.
+// This function compiles bitcode files into a few big native files
+// using LLVM functions and replaces bitcode symbols with the results.
+// Because all bitcode files that the program consists of are passed to
+// the compiler at once, it can do a whole-program optimization.
+template <class ELFT> void LinkerDriver::compileBitcodeFiles() {
+  // Compile bitcode files and replace bitcode symbols.
+  lto.reset(new BitcodeCompiler);
+  for (BitcodeFile *file : bitcodeFiles)
+    lto->add(*file);
+
+  for (InputFile *file : lto->compile()) {
+    auto *obj = cast<ObjFile<ELFT>>(file);
+    obj->parse(/*ignoreComdats=*/true);
+    for (Symbol *sym : obj->getGlobalSymbols())
+      sym->parseSymbolVersion();
+    objectFiles.push_back(file);
+  }
 }
 
 // The --wrap option is a feature to rename symbols so that you can write
@@ -1366,9 +1558,9 @@ template <class ELFT> static Symbol *addUndefined(StringRef Name) {
 //
 // This data structure is instantiated for each -wrap option.
 struct WrappedSymbol {
-  Symbol *Sym;
-  Symbol *Real;
-  Symbol *Wrap;
+  Symbol *sym;
+  Symbol *real;
+  Symbol *wrap;
 };
 
 // Handles -wrap option.
@@ -1376,34 +1568,33 @@ struct WrappedSymbol {
 // This function instantiates wrapper symbols. At this point, they seem
 // like they are not being used at all, so we explicitly set some flags so
 // that LTO won't eliminate them.
-template <class ELFT>
-static std::vector<WrappedSymbol> addWrappedSymbols(opt::InputArgList &Args) {
-  std::vector<WrappedSymbol> V;
-  DenseSet<StringRef> Seen;
+static std::vector<WrappedSymbol> addWrappedSymbols(opt::InputArgList &args) {
+  std::vector<WrappedSymbol> v;
+  DenseSet<StringRef> seen;
 
-  for (auto *Arg : Args.filtered(OPT_wrap)) {
-    StringRef Name = Arg->getValue();
-    if (!Seen.insert(Name).second)
+  for (auto *arg : args.filtered(OPT_wrap)) {
+    StringRef name = arg->getValue();
+    if (!seen.insert(name).second)
       continue;
 
-    Symbol *Sym = Symtab->find(Name);
-    if (!Sym)
+    Symbol *sym = symtab->find(name);
+    if (!sym)
       continue;
 
-    Symbol *Real = addUndefined<ELFT>(Saver.save("__real_" + Name));
-    Symbol *Wrap = addUndefined<ELFT>(Saver.save("__wrap_" + Name));
-    V.push_back({Sym, Real, Wrap});
+    Symbol *real = addUndefined(saver.save("__real_" + name));
+    Symbol *wrap = addUndefined(saver.save("__wrap_" + name));
+    v.push_back({sym, real, wrap});
 
     // We want to tell LTO not to inline symbols to be overwritten
     // because LTO doesn't know the final symbol contents after renaming.
-    Real->CanInline = false;
-    Sym->CanInline = false;
+    real->canInline = false;
+    sym->canInline = false;
 
     // Tell LTO not to eliminate these symbols.
-    Sym->IsUsedInRegularObj = true;
-    Wrap->IsUsedInRegularObj = true;
+    sym->isUsedInRegularObj = true;
+    wrap->isUsedInRegularObj = true;
   }
-  return V;
+  return v;
 }
 
 // Do renaming for -wrap by updating pointers to symbols.
@@ -1411,27 +1602,63 @@ static std::vector<WrappedSymbol> addWrappedSymbols(opt::InputArgList &Args) {
 // When this function is executed, only InputFiles and symbol table
 // contain pointers to symbol objects. We visit them to replace pointers,
 // so that wrapped symbols are swapped as instructed by the command line.
-template <class ELFT> static void wrapSymbols(ArrayRef<WrappedSymbol> Wrapped) {
-  DenseMap<Symbol *, Symbol *> Map;
-  for (const WrappedSymbol &W : Wrapped) {
-    Map[W.Sym] = W.Wrap;
-    Map[W.Real] = W.Sym;
+static void wrapSymbols(ArrayRef<WrappedSymbol> wrapped) {
+  DenseMap<Symbol *, Symbol *> map;
+  for (const WrappedSymbol &w : wrapped) {
+    map[w.sym] = w.wrap;
+    map[w.real] = w.sym;
   }
 
   // Update pointers in input files.
-  parallelForEach(ObjectFiles, [&](InputFile *File) {
-    std::vector<Symbol *> &Syms = File->getMutableSymbols();
-    for (size_t I = 0, E = Syms.size(); I != E; ++I)
-      if (Symbol *S = Map.lookup(Syms[I]))
-        Syms[I] = S;
+  parallelForEach(objectFiles, [&](InputFile *file) {
+    MutableArrayRef<Symbol *> syms = file->getMutableSymbols();
+    for (size_t i = 0, e = syms.size(); i != e; ++i)
+      if (Symbol *s = map.lookup(syms[i]))
+        syms[i] = s;
   });
 
   // Update pointers in the symbol table.
-  for (const WrappedSymbol &W : Wrapped)
-    Symtab->wrap(W.Sym, W.Real, W.Wrap);
+  for (const WrappedSymbol &w : wrapped)
+    symtab->wrap(w.sym, w.real, w.wrap);
 }
 
-static const char *LibcallRoutineNames[] = {
+// To enable CET (x86's hardware-assited control flow enforcement), each
+// source file must be compiled with -fcf-protection. Object files compiled
+// with the flag contain feature flags indicating that they are compatible
+// with CET. We enable the feature only when all object files are compatible
+// with CET.
+//
+// This function returns the merged feature flags. If 0, we cannot enable CET.
+// This is also the case with AARCH64's BTI and PAC which use the similar
+// GNU_PROPERTY_AARCH64_FEATURE_1_AND mechanism.
+//
+// Note that the CET-aware PLT is not implemented yet. We do error
+// check only.
+template <class ELFT> static uint32_t getAndFeatures() {
+  if (config->emachine != EM_386 && config->emachine != EM_X86_64 &&
+      config->emachine != EM_AARCH64)
+    return 0;
+
+  uint32_t ret = -1;
+  for (InputFile *f : objectFiles) {
+    uint32_t features = cast<ObjFile<ELFT>>(f)->andFeatures;
+    if (config->forceBTI && !(features & GNU_PROPERTY_AARCH64_FEATURE_1_BTI)) {
+      warn(toString(f) + ": --force-bti: file does not have BTI property");
+      features |= GNU_PROPERTY_AARCH64_FEATURE_1_BTI;
+    } else if (!features && config->requireCET)
+      error(toString(f) + ": --require-cet: file is not compatible with CET");
+    ret &= features;
+  }
+
+  // Force enable pointer authentication Plt, we don't warn in this case as
+  // this does not require support in the object for correctness.
+  if (config->pacPlt)
+    ret |= GNU_PROPERTY_AARCH64_FEATURE_1_PAC;
+
+  return ret;
+}
+
+static const char *libcallRoutineNames[] = {
 #define HANDLE_LIBCALL(code, name) name,
 #include "llvm/IR/RuntimeLibcalls.def"
 #undef HANDLE_LIBCALL
@@ -1439,53 +1666,48 @@ static const char *LibcallRoutineNames[] = {
 
 // Do actual linking. Note that when this function is called,
 // all linker scripts have already been parsed.
-template <class ELFT> void LinkerDriver::link(opt::InputArgList &Args) {
-  Target = getTarget();
-  InX<ELFT>::VerSym = nullptr;
-  InX<ELFT>::VerNeed = nullptr;
-
-  Config->MaxPageSize = getMaxPageSize(Args);
-  Config->ImageBase = getImageBase(Args);
-
+template <class ELFT> void LinkerDriver::link(opt::InputArgList &args) {
   // If a -hash-style option was not given, set to a default value,
   // which varies depending on the target.
-  if (!Args.hasArg(OPT_hash_style)) {
-    if (Config->EMachine == EM_MIPS)
-      Config->SysvHash = true;
+  if (!args.hasArg(OPT_hash_style)) {
+    if (config->emachine == EM_MIPS)
+      config->sysvHash = true;
     else
-      Config->SysvHash = Config->GnuHash = true;
+      config->sysvHash = config->gnuHash = true;
   }
 
   // Default output filename is "a.out" by the Unix tradition.
-  if (Config->OutputFile.empty())
-    Config->OutputFile = "a.out";
+  if (config->outputFile.empty())
+    config->outputFile = "a.out";
 
   // Fail early if the output file or map file is not writable. If a user has a
   // long link, e.g. due to a large LTO link, they do not wish to run it and
   // find that it failed because there was a mistake in their command-line.
-  if (auto E = tryCreateFile(Config->OutputFile))
-    error("cannot open output file " + Config->OutputFile + ": " + E.message());
-  if (auto E = tryCreateFile(Config->MapFile))
-    error("cannot open map file " + Config->MapFile + ": " + E.message());
+  if (auto e = tryCreateFile(config->outputFile))
+    error("cannot open output file " + config->outputFile + ": " + e.message());
+  if (auto e = tryCreateFile(config->mapFile))
+    error("cannot open map file " + config->mapFile + ": " + e.message());
   if (errorCount())
     return;
 
   // Use default entry point name if no name was given via the command
   // line nor linker scripts. For some reason, MIPS entry point name is
   // different from others.
-  Config->WarnMissingEntry =
-      (!Config->Entry.empty() || (!Config->Shared && !Config->Relocatable));
-  if (Config->Entry.empty() && !Config->Relocatable)
-    Config->Entry = (Config->EMachine == EM_MIPS) ? "__start" : "_start";
+  config->warnMissingEntry =
+      (!config->entry.empty() || (!config->shared && !config->relocatable));
+  if (config->entry.empty() && !config->relocatable)
+    config->entry = (config->emachine == EM_MIPS) ? "__start" : "_start";
 
   // Handle --trace-symbol.
-  for (auto *Arg : Args.filtered(OPT_trace_symbol))
-    Symtab->trace(Arg->getValue());
+  for (auto *arg : args.filtered(OPT_trace_symbol))
+    symtab->insert(arg->getValue())->traced = true;
 
   // Add all files to the symbol table. This will add almost all
-  // symbols that we need to the symbol table.
-  for (InputFile *F : Files)
-    Symtab->addFile<ELFT>(F);
+  // symbols that we need to the symbol table. This process might
+  // add files to the link, via autolinking, these files are always
+  // appended to the Files vector.
+  for (size_t i = 0; i < files.size(); ++i)
+    parseFile(files[i]);
 
   // Now that we have every file, we can decide if we will need a
   // dynamic symbol table.
@@ -1493,20 +1715,26 @@ template <class ELFT> void LinkerDriver::link(opt::InputArgList &Args) {
   // producing a shared library.
   // We also need one if any shared libraries are used and for pie executables
   // (probably because the dynamic linker needs it).
-  Config->HasDynSymTab =
-      !SharedFiles.empty() || Config->Pic || Config->ExportDynamic;
+  config->hasDynSymTab =
+      !sharedFiles.empty() || config->isPic || config->exportDynamic;
 
   // Some symbols (such as __ehdr_start) are defined lazily only when there
   // are undefined symbols for them, so we add these to trigger that logic.
-  for (StringRef Name : Script->ReferencedSymbols)
-    addUndefined<ELFT>(Name);
+  for (StringRef name : script->referencedSymbols)
+    addUndefined(name);
 
   // Handle the `--undefined <sym>` options.
-  for (StringRef S : Config->Undefined)
-    handleUndefined<ELFT>(S);
+  for (StringRef arg : config->undefined)
+    if (Symbol *sym = symtab->find(arg))
+      handleUndefined(sym);
 
   // If an entry symbol is in a static archive, pull out that file now.
-  handleUndefined<ELFT>(Config->Entry);
+  if (Symbol *sym = symtab->find(config->entry))
+    handleUndefined(sym);
+
+  // Handle the `--undefined-glob <pattern>` options.
+  for (StringRef pat : args::getStrings(args, OPT_undefined_glob))
+    handleUndefinedGlob(pat);
 
   // If any of our inputs are bitcode files, the LTO code generator may create
   // references to certain library functions that might not be explicit in the
@@ -1525,9 +1753,9 @@ template <class ELFT> void LinkerDriver::link(opt::InputArgList &Args) {
   // to, i.e. if the symbol's definition is in bitcode. Any other required
   // libcall symbols will be added to the link after LTO when we add the LTO
   // object file to the link.
-  if (!BitcodeFiles.empty())
-    for (const char *S : LibcallRoutineNames)
-      handleLibcall<ELFT>(S);
+  if (!bitcodeFiles.empty())
+    for (const char *s : libcallRoutineNames)
+      handleLibcall(s);
 
   // Return if there were name resolution errors.
   if (errorCount())
@@ -1535,27 +1763,27 @@ template <class ELFT> void LinkerDriver::link(opt::InputArgList &Args) {
 
   // Now when we read all script files, we want to finalize order of linker
   // script commands, which can be not yet final because of INSERT commands.
-  Script->processInsertCommands();
+  script->processInsertCommands();
 
   // We want to declare linker script's symbols early,
   // so that we can version them.
   // They also might be exported if referenced by DSOs.
-  Script->declareSymbols();
+  script->declareSymbols();
 
   // Handle the -exclude-libs option.
-  if (Args.hasArg(OPT_exclude_libs))
-    excludeLibs<ELFT>(Args);
+  if (args.hasArg(OPT_exclude_libs))
+    excludeLibs(args);
 
-  // Create ElfHeader early. We need a dummy section in
+  // Create elfHeader early. We need a dummy section in
   // addReservedSymbols to mark the created symbols as not absolute.
-  Out::ElfHeader = make<OutputSection>("", 0, SHF_ALLOC);
-  Out::ElfHeader->Size = sizeof(typename ELFT::Ehdr);
+  Out::elfHeader = make<OutputSection>("", 0, SHF_ALLOC);
+  Out::elfHeader->size = sizeof(typename ELFT::Ehdr);
 
   // Create wrapped symbols for -wrap option.
-  std::vector<WrappedSymbol> Wrapped = addWrappedSymbols<ELFT>(Args);
+  std::vector<WrappedSymbol> wrapped = addWrappedSymbols(args);
 
   // We need to create some reserved symbols such as _end. Create them.
-  if (!Config->Relocatable)
+  if (!config->relocatable)
     addReservedSymbols();
 
   // Apply version scripts.
@@ -1563,84 +1791,118 @@ template <class ELFT> void LinkerDriver::link(opt::InputArgList &Args) {
   // For a relocatable output, version scripts don't make sense, and
   // parsing a symbol version string (e.g. dropping "@ver1" from a symbol
   // name "foo@ver1") rather do harm, so we don't call this if -r is given.
-  if (!Config->Relocatable)
-    Symtab->scanVersionScript();
+  if (!config->relocatable)
+    symtab->scanVersionScript();
 
   // Do link-time optimization if given files are LLVM bitcode files.
   // This compiles bitcode files into real object files.
   //
   // With this the symbol table should be complete. After this, no new names
   // except a few linker-synthesized ones will be added to the symbol table.
-  Symtab->addCombinedLTOObject<ELFT>();
+  compileBitcodeFiles<ELFT>();
   if (errorCount())
     return;
 
   // If -thinlto-index-only is given, we should create only "index
   // files" and not object files. Index file creation is already done
   // in addCombinedLTOObject, so we are done if that's the case.
-  if (Config->ThinLTOIndexOnly)
+  if (config->thinLTOIndexOnly)
     return;
 
   // Likewise, --plugin-opt=emit-llvm is an option to make LTO create
   // an output file in bitcode and exit, so that you can just get a
   // combined bitcode file.
-  if (Config->EmitLLVM)
+  if (config->emitLLVM)
     return;
 
   // Apply symbol renames for -wrap.
-  if (!Wrapped.empty())
-    wrapSymbols<ELFT>(Wrapped);
+  if (!wrapped.empty())
+    wrapSymbols(wrapped);
 
   // Now that we have a complete list of input files.
   // Beyond this point, no new files are added.
   // Aggregate all input sections into one place.
-  for (InputFile *F : ObjectFiles)
-    for (InputSectionBase *S : F->getSections())
-      if (S && S != &InputSection::Discarded)
-        InputSections.push_back(S);
-  for (BinaryFile *F : BinaryFiles)
-    for (InputSectionBase *S : F->getSections())
-      InputSections.push_back(cast<InputSection>(S));
-
-  // We do not want to emit debug sections if --strip-all
-  // or -strip-debug are given.
-  if (Config->Strip != StripPolicy::None)
-    llvm::erase_if(InputSections, [](InputSectionBase *S) {
-      return S->Name.startswith(".debug") || S->Name.startswith(".zdebug");
-    });
-
-  Config->EFlags = Target->calcEFlags();
-
-  if (Config->EMachine == EM_ARM) {
+  for (InputFile *f : objectFiles)
+    for (InputSectionBase *s : f->getSections())
+      if (s && s != &InputSection::discarded)
+        inputSections.push_back(s);
+  for (BinaryFile *f : binaryFiles)
+    for (InputSectionBase *s : f->getSections())
+      inputSections.push_back(cast<InputSection>(s));
+
+  llvm::erase_if(inputSections, [](InputSectionBase *s) {
+    if (s->type == SHT_LLVM_SYMPART) {
+      readSymbolPartitionSection<ELFT>(s);
+      return true;
+    }
+
+    // We do not want to emit debug sections if --strip-all
+    // or -strip-debug are given.
+    return config->strip != StripPolicy::None &&
+           (s->name.startswith(".debug") || s->name.startswith(".zdebug"));
+  });
+
+  // Now that the number of partitions is fixed, save a pointer to the main
+  // partition.
+  mainPart = &partitions[0];
+
+  // Read .note.gnu.property sections from input object files which
+  // contain a hint to tweak linker's and loader's behaviors.
+  config->andFeatures = getAndFeatures<ELFT>();
+
+  // The Target instance handles target-specific stuff, such as applying
+  // relocations or writing a PLT section. It also contains target-dependent
+  // values such as a default image base address.
+  target = getTarget();
+
+  config->eflags = target->calcEFlags();
+  // maxPageSize (sometimes called abi page size) is the maximum page size that
+  // the output can be run on. For example if the OS can use 4k or 64k page
+  // sizes then maxPageSize must be 64k for the output to be useable on both.
+  // All important alignment decisions must use this value.
+  config->maxPageSize = getMaxPageSize(args);
+  // commonPageSize is the most common page size that the output will be run on.
+  // For example if an OS can use 4k or 64k page sizes and 4k is more common
+  // than 64k then commonPageSize is set to 4k. commonPageSize can be used for
+  // optimizations such as DATA_SEGMENT_ALIGN in linker scripts. LLD's use of it
+  // is limited to writing trap instructions on the last executable segment.
+  config->commonPageSize = getCommonPageSize(args);
+
+  config->imageBase = getImageBase(args);
+
+  if (config->emachine == EM_ARM) {
     // FIXME: These warnings can be removed when lld only uses these features
     // when the input objects have been compiled with an architecture that
     // supports them.
-    if (Config->ARMHasBlx == false)
+    if (config->armHasBlx == false)
       warn("lld uses blx instruction, no object with architecture supporting "
            "feature detected");
   }
 
   // This adds a .comment section containing a version string. We have to add it
   // before mergeSections because the .comment section is a mergeable section.
-  if (!Config->Relocatable)
-    InputSections.push_back(createCommentSection());
+  if (!config->relocatable)
+    inputSections.push_back(createCommentSection());
+
+  // Replace common symbols with regular symbols.
+  replaceCommonSymbols();
 
   // Do size optimizations: garbage collection, merging of SHF_MERGE sections
   // and identical code folding.
   splitSections<ELFT>();
   markLive<ELFT>();
-  demoteSharedSymbols<ELFT>();
+  demoteSharedSymbols();
   mergeSections();
-  if (Config->ICF != ICFLevel::None) {
-    findKeepUniqueSections<ELFT>(Args);
+  if (config->icf != ICFLevel::None) {
+    findKeepUniqueSections<ELFT>(args);
     doIcf<ELFT>();
   }
 
   // Read the callgraph now that we know what was gced or icfed
-  if (Config->CallGraphProfileSort) {
-    if (auto *Arg = Args.getLastArg(OPT_call_graph_ordering_file))
-      if (Optional<MemoryBufferRef> Buffer = readFile(Arg->getValue()))
-        readCallGraph(*Buffer);
+  if (config->callGraphProfileSort) {
+    if (auto *arg = args.getLastArg(OPT_call_graph_ordering_file))
+      if (Optional<MemoryBufferRef> buffer = readFile(arg->getValue()))
+        readCallGraph(*buffer);
     readCallGraphsFromObjectFiles<ELFT>();
   }
 
diff --git a/deps/lld/ELF/Driver.h b/deps/lld/ELF/Driver.h
index 81d7f608e588f3eaf9f5c17f6d9f77358d5b8ee4..3115e28d16698b7473f93f2380c3172569bd7a19 100644
--- a/deps/lld/ELF/Driver.h
+++ b/deps/lld/ELF/Driver.h
@@ -1,15 +1,15 @@
 //===- Driver.h -------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLD_ELF_DRIVER_H
 #define LLD_ELF_DRIVER_H
 
+#include "LTO.h"
 #include "SymbolTable.h"
 #include "lld/Common/LLVM.h"
 #include "lld/Common/Reproduce.h"
@@ -22,34 +22,37 @@
 namespace lld {
 namespace elf {
 
-extern class LinkerDriver *Driver;
+extern class LinkerDriver *driver;
 
 class LinkerDriver {
 public:
-  void main(ArrayRef<const char *> Args);
-  void addFile(StringRef Path, bool WithLOption);
-  void addLibrary(StringRef Name);
+  void main(ArrayRef<const char *> args);
+  void addFile(StringRef path, bool withLOption);
+  void addLibrary(StringRef name);
 
 private:
-  void readConfigs(llvm::opt::InputArgList &Args);
-  void createFiles(llvm::opt::InputArgList &Args);
+  void createFiles(llvm::opt::InputArgList &args);
   void inferMachineType();
-  template <class ELFT> void link(llvm::opt::InputArgList &Args);
+  template <class ELFT> void link(llvm::opt::InputArgList &args);
+  template <class ELFT> void compileBitcodeFiles();
 
   // True if we are in --whole-archive and --no-whole-archive.
-  bool InWholeArchive = false;
+  bool inWholeArchive = false;
 
   // True if we are in --start-lib and --end-lib.
-  bool InLib = false;
+  bool inLib = false;
 
-  std::vector<InputFile *> Files;
+  // For LTO.
+  std::unique_ptr<BitcodeCompiler> lto;
+
+  std::vector<InputFile *> files;
 };
 
 // Parses command line options.
 class ELFOptTable : public llvm::opt::OptTable {
 public:
   ELFOptTable();
-  llvm::opt::InputArgList parse(ArrayRef<const char *> Argv);
+  llvm::opt::InputArgList parse(ArrayRef<const char *> argv);
 };
 
 // Create enum with OPT_xxx values for each option in Options.td
@@ -61,11 +64,12 @@ enum {
 };
 
 void printHelp();
-std::string createResponseFile(const llvm::opt::InputArgList &Args);
+std::string createResponseFile(const llvm::opt::InputArgList &args);
 
-llvm::Optional<std::string> findFromSearchPaths(StringRef Path);
-llvm::Optional<std::string> searchScript(StringRef Path);
-llvm::Optional<std::string> searchLibrary(StringRef Path);
+llvm::Optional<std::string> findFromSearchPaths(StringRef path);
+llvm::Optional<std::string> searchScript(StringRef path);
+llvm::Optional<std::string> searchLibraryBaseName(StringRef path);
+llvm::Optional<std::string> searchLibrary(StringRef path);
 
 } // namespace elf
 } // namespace lld
diff --git a/deps/lld/ELF/DriverUtils.cpp b/deps/lld/ELF/DriverUtils.cpp
index e51d02e38da1e65688cfbfe6bf03d9757e496713..87f0aa2a9827b84a9746080b69bce1ab7b6de4d8 100644
--- a/deps/lld/ELF/DriverUtils.cpp
+++ b/deps/lld/ELF/DriverUtils.cpp
@@ -1,9 +1,8 @@
 //===- DriverUtils.cpp ----------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -42,7 +41,7 @@ using namespace lld::elf;
 #undef PREFIX
 
 // Create table mapping all options defined in Options.td
-static const opt::OptTable::Info OptInfo[] = {
+static const opt::OptTable::Info optInfo[] = {
 #define OPTION(X1, X2, ID, KIND, GROUP, ALIAS, X7, X8, X9, X10, X11, X12)      \
   {X1, X2, X10,         X11,         OPT_##ID, opt::Option::KIND##Class,       \
    X9, X8, OPT_##GROUP, OPT_##ALIAS, X7,       X12},
@@ -50,36 +49,36 @@ static const opt::OptTable::Info OptInfo[] = {
 #undef OPTION
 };
 
-ELFOptTable::ELFOptTable() : OptTable(OptInfo) {}
+ELFOptTable::ELFOptTable() : OptTable(optInfo) {}
 
 // Set color diagnostics according to -color-diagnostics={auto,always,never}
 // or -no-color-diagnostics flags.
-static void handleColorDiagnostics(opt::InputArgList &Args) {
-  auto *Arg = Args.getLastArg(OPT_color_diagnostics, OPT_color_diagnostics_eq,
+static void handleColorDiagnostics(opt::InputArgList &args) {
+  auto *arg = args.getLastArg(OPT_color_diagnostics, OPT_color_diagnostics_eq,
                               OPT_no_color_diagnostics);
-  if (!Arg)
+  if (!arg)
     return;
-  if (Arg->getOption().getID() == OPT_color_diagnostics) {
-    errorHandler().ColorDiagnostics = true;
-  } else if (Arg->getOption().getID() == OPT_no_color_diagnostics) {
-    errorHandler().ColorDiagnostics = false;
+  if (arg->getOption().getID() == OPT_color_diagnostics) {
+    errorHandler().colorDiagnostics = true;
+  } else if (arg->getOption().getID() == OPT_no_color_diagnostics) {
+    errorHandler().colorDiagnostics = false;
   } else {
-    StringRef S = Arg->getValue();
-    if (S == "always")
-      errorHandler().ColorDiagnostics = true;
-    else if (S == "never")
-      errorHandler().ColorDiagnostics = false;
-    else if (S != "auto")
-      error("unknown option: --color-diagnostics=" + S);
+    StringRef s = arg->getValue();
+    if (s == "always")
+      errorHandler().colorDiagnostics = true;
+    else if (s == "never")
+      errorHandler().colorDiagnostics = false;
+    else if (s != "auto")
+      error("unknown option: --color-diagnostics=" + s);
   }
 }
 
-static cl::TokenizerCallback getQuotingStyle(opt::InputArgList &Args) {
-  if (auto *Arg = Args.getLastArg(OPT_rsp_quoting)) {
-    StringRef S = Arg->getValue();
-    if (S != "windows" && S != "posix")
-      error("invalid response file quoting: " + S);
-    if (S == "windows")
+static cl::TokenizerCallback getQuotingStyle(opt::InputArgList &args) {
+  if (auto *arg = args.getLastArg(OPT_rsp_quoting)) {
+    StringRef s = arg->getValue();
+    if (s != "windows" && s != "posix")
+      error("invalid response file quoting: " + s);
+    if (s == "windows")
       return cl::TokenizeWindowsCommandLine;
     return cl::TokenizeGNUCommandLine;
   }
@@ -97,50 +96,56 @@ static cl::TokenizerCallback getQuotingStyle(opt::InputArgList &Args) {
 // `--plugin-opt <foo>` is converted to `--plugin-opt=<foo>`. This is a
 // bit hacky, but looks like it is still better than handling --plugin-opt
 // options by hand.
-static void concatLTOPluginOptions(SmallVectorImpl<const char *> &Args) {
-  SmallVector<const char *, 256> V;
-  for (size_t I = 0, E = Args.size(); I != E; ++I) {
-    StringRef S = Args[I];
-    if ((S == "-plugin-opt" || S == "--plugin-opt") && I + 1 != E) {
-      V.push_back(Saver.save(S + "=" + Args[I + 1]).data());
-      ++I;
+static void concatLTOPluginOptions(SmallVectorImpl<const char *> &args) {
+  SmallVector<const char *, 256> v;
+  for (size_t i = 0, e = args.size(); i != e; ++i) {
+    StringRef s = args[i];
+    if ((s == "-plugin-opt" || s == "--plugin-opt") && i + 1 != e) {
+      v.push_back(saver.save(s + "=" + args[i + 1]).data());
+      ++i;
     } else {
-      V.push_back(Args[I]);
+      v.push_back(args[i]);
     }
   }
-  Args = std::move(V);
+  args = std::move(v);
 }
 
 // Parses a given list of options.
-opt::InputArgList ELFOptTable::parse(ArrayRef<const char *> Argv) {
+opt::InputArgList ELFOptTable::parse(ArrayRef<const char *> argv) {
   // Make InputArgList from string vectors.
-  unsigned MissingIndex;
-  unsigned MissingCount;
-  SmallVector<const char *, 256> Vec(Argv.data(), Argv.data() + Argv.size());
+  unsigned missingIndex;
+  unsigned missingCount;
+  SmallVector<const char *, 256> vec(argv.data(), argv.data() + argv.size());
 
   // We need to get the quoting style for response files before parsing all
   // options so we parse here before and ignore all the options but
   // --rsp-quoting.
-  opt::InputArgList Args = this->ParseArgs(Vec, MissingIndex, MissingCount);
+  opt::InputArgList args = this->ParseArgs(vec, missingIndex, missingCount);
 
   // Expand response files (arguments in the form of @<filename>)
   // and then parse the argument again.
-  cl::ExpandResponseFiles(Saver, getQuotingStyle(Args), Vec);
-  concatLTOPluginOptions(Vec);
-  Args = this->ParseArgs(Vec, MissingIndex, MissingCount);
+  cl::ExpandResponseFiles(saver, getQuotingStyle(args), vec);
+  concatLTOPluginOptions(vec);
+  args = this->ParseArgs(vec, missingIndex, missingCount);
 
-  handleColorDiagnostics(Args);
-  if (MissingCount)
-    error(Twine(Args.getArgString(MissingIndex)) + ": missing argument");
+  handleColorDiagnostics(args);
+  if (missingCount)
+    error(Twine(args.getArgString(missingIndex)) + ": missing argument");
 
-  for (auto *Arg : Args.filtered(OPT_UNKNOWN))
-    error("unknown argument: " + Arg->getSpelling());
-  return Args;
+  for (auto *arg : args.filtered(OPT_UNKNOWN)) {
+    std::string nearest;
+    if (findNearest(arg->getAsString(args), nearest) > 1)
+      error("unknown argument '" + arg->getAsString(args) + "'");
+    else
+      error("unknown argument '" + arg->getAsString(args) +
+            "', did you mean '" + nearest + "'");
+  }
+  return args;
 }
 
 void elf::printHelp() {
   ELFOptTable().PrintHelp(
-      outs(), (Config->ProgName + " [options] file...").str().c_str(), "lld",
+      outs(), (config->progName + " [options] file...").str().c_str(), "lld",
       false /*ShowHidden*/, true /*ShowAllAliases*/);
   outs() << "\n";
 
@@ -149,30 +154,36 @@ void elf::printHelp() {
   // in a message for the -help option. If it doesn't match, the scripts
   // assume that the linker doesn't support very basic features such as
   // shared libraries. Therefore, we need to print out at least "elf".
-  outs() << Config->ProgName << ": supported targets: elf\n";
+  outs() << config->progName << ": supported targets: elf\n";
+}
+
+static std::string rewritePath(StringRef s) {
+  if (fs::exists(s))
+    return relativeToRoot(s);
+  return s;
 }
 
 // Reconstructs command line arguments so that so that you can re-run
 // the same command with the same inputs. This is for --reproduce.
-std::string elf::createResponseFile(const opt::InputArgList &Args) {
-  SmallString<0> Data;
-  raw_svector_ostream OS(Data);
-  OS << "--chroot .\n";
+std::string elf::createResponseFile(const opt::InputArgList &args) {
+  SmallString<0> data;
+  raw_svector_ostream os(data);
+  os << "--chroot .\n";
 
   // Copy the command line to the output while rewriting paths.
-  for (auto *Arg : Args) {
-    switch (Arg->getOption().getUnaliasedOption().getID()) {
+  for (auto *arg : args) {
+    switch (arg->getOption().getID()) {
     case OPT_reproduce:
       break;
     case OPT_INPUT:
-      OS << quote(rewritePath(Arg->getValue())) << "\n";
+      os << quote(rewritePath(arg->getValue())) << "\n";
       break;
     case OPT_o:
       // If -o path contains directories, "lld @response.txt" will likely
       // fail because the archive we are creating doesn't contain empty
       // directories for the output path (-o doesn't create directories).
       // Strip directories to prevent the issue.
-      OS << "-o " << quote(sys::path::filename(Arg->getValue())) << "\n";
+      os << "-o " << quote(sys::path::filename(arg->getValue())) << "\n";
       break;
     case OPT_dynamic_list:
     case OPT_library_path:
@@ -181,58 +192,62 @@ std::string elf::createResponseFile(const opt::InputArgList &Args) {
     case OPT_symbol_ordering_file:
     case OPT_sysroot:
     case OPT_version_script:
-      OS << Arg->getSpelling() << " " << quote(rewritePath(Arg->getValue()))
+      os << arg->getSpelling() << " " << quote(rewritePath(arg->getValue()))
          << "\n";
       break;
     default:
-      OS << toString(*Arg) << "\n";
+      os << toString(*arg) << "\n";
     }
   }
-  return Data.str();
+  return data.str();
 }
 
 // Find a file by concatenating given paths. If a resulting path
 // starts with "=", the character is replaced with a --sysroot value.
-static Optional<std::string> findFile(StringRef Path1, const Twine &Path2) {
-  SmallString<128> S;
-  if (Path1.startswith("="))
-    path::append(S, Config->Sysroot, Path1.substr(1), Path2);
+static Optional<std::string> findFile(StringRef path1, const Twine &path2) {
+  SmallString<128> s;
+  if (path1.startswith("="))
+    path::append(s, config->sysroot, path1.substr(1), path2);
   else
-    path::append(S, Path1, Path2);
+    path::append(s, path1, path2);
 
-  if (fs::exists(S))
-    return S.str().str();
+  if (fs::exists(s))
+    return s.str().str();
   return None;
 }
 
-Optional<std::string> elf::findFromSearchPaths(StringRef Path) {
-  for (StringRef Dir : Config->SearchPaths)
-    if (Optional<std::string> S = findFile(Dir, Path))
-      return S;
+Optional<std::string> elf::findFromSearchPaths(StringRef path) {
+  for (StringRef dir : config->searchPaths)
+    if (Optional<std::string> s = findFile(dir, path))
+      return s;
   return None;
 }
 
-// This is for -lfoo. We'll look for libfoo.so or libfoo.a from
+// This is for -l<basename>. We'll look for lib<basename>.so or lib<basename>.a from
 // search paths.
-Optional<std::string> elf::searchLibrary(StringRef Name) {
-  if (Name.startswith(":"))
-    return findFromSearchPaths(Name.substr(1));
-
-  for (StringRef Dir : Config->SearchPaths) {
-    if (!Config->Static)
-      if (Optional<std::string> S = findFile(Dir, "lib" + Name + ".so"))
-        return S;
-    if (Optional<std::string> S = findFile(Dir, "lib" + Name + ".a"))
-      return S;
+Optional<std::string> elf::searchLibraryBaseName(StringRef name) {
+  for (StringRef dir : config->searchPaths) {
+    if (!config->isStatic)
+      if (Optional<std::string> s = findFile(dir, "lib" + name + ".so"))
+        return s;
+    if (Optional<std::string> s = findFile(dir, "lib" + name + ".a"))
+      return s;
   }
   return None;
 }
 
+// This is for -l<namespec>.
+Optional<std::string> elf::searchLibrary(StringRef name) {
+    if (name.startswith(":"))
+        return findFromSearchPaths(name.substr(1));
+    return searchLibraryBaseName (name);
+}
+
 // If a linker/version script doesn't exist in the current directory, we also
 // look for the script in the '-L' search paths. This matches the behaviour of
 // '-T', --version-script=, and linker script INPUT() command in ld.bfd.
-Optional<std::string> elf::searchScript(StringRef Name) {
-  if (fs::exists(Name))
-    return Name.str();
-  return findFromSearchPaths(Name);
+Optional<std::string> elf::searchScript(StringRef name) {
+  if (fs::exists(name))
+    return name.str();
+  return findFromSearchPaths(name);
 }
diff --git a/deps/lld/ELF/EhFrame.cpp b/deps/lld/ELF/EhFrame.cpp
index 95d444bdc2a1fc413041cd7c3c253e0685f7d18f..b3245dd01669ef7cf05663d361b0b754afbd9bef 100644
--- a/deps/lld/ELF/EhFrame.cpp
+++ b/deps/lld/ELF/EhFrame.cpp
@@ -1,9 +1,8 @@
 //===- EhFrame.cpp -------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -37,72 +36,72 @@ using namespace lld::elf;
 namespace {
 class EhReader {
 public:
-  EhReader(InputSectionBase *S, ArrayRef<uint8_t> D) : IS(S), D(D) {}
+  EhReader(InputSectionBase *s, ArrayRef<uint8_t> d) : isec(s), d(d) {}
   size_t readEhRecordSize();
   uint8_t getFdeEncoding();
 
 private:
-  template <class P> void failOn(const P *Loc, const Twine &Msg) {
-    fatal("corrupted .eh_frame: " + Msg + "\n>>> defined in " +
-          IS->getObjMsg((const uint8_t *)Loc - IS->data().data()));
+  template <class P> void failOn(const P *loc, const Twine &msg) {
+    fatal("corrupted .eh_frame: " + msg + "\n>>> defined in " +
+          isec->getObjMsg((const uint8_t *)loc - isec->data().data()));
   }
 
   uint8_t readByte();
-  void skipBytes(size_t Count);
+  void skipBytes(size_t count);
   StringRef readString();
   void skipLeb128();
   void skipAugP();
 
-  InputSectionBase *IS;
-  ArrayRef<uint8_t> D;
+  InputSectionBase *isec;
+  ArrayRef<uint8_t> d;
 };
 }
 
-size_t elf::readEhRecordSize(InputSectionBase *S, size_t Off) {
-  return EhReader(S, S->data().slice(Off)).readEhRecordSize();
+size_t elf::readEhRecordSize(InputSectionBase *s, size_t off) {
+  return EhReader(s, s->data().slice(off)).readEhRecordSize();
 }
 
 // .eh_frame section is a sequence of records. Each record starts with
 // a 4 byte length field. This function reads the length.
 size_t EhReader::readEhRecordSize() {
-  if (D.size() < 4)
-    failOn(D.data(), "CIE/FDE too small");
+  if (d.size() < 4)
+    failOn(d.data(), "CIE/FDE too small");
 
   // First 4 bytes of CIE/FDE is the size of the record.
   // If it is 0xFFFFFFFF, the next 8 bytes contain the size instead,
   // but we do not support that format yet.
-  uint64_t V = read32(D.data());
-  if (V == UINT32_MAX)
-    failOn(D.data(), "CIE/FDE too large");
-  uint64_t Size = V + 4;
-  if (Size > D.size())
-    failOn(D.data(), "CIE/FDE ends past the end of the section");
-  return Size;
+  uint64_t v = read32(d.data());
+  if (v == UINT32_MAX)
+    failOn(d.data(), "CIE/FDE too large");
+  uint64_t size = v + 4;
+  if (size > d.size())
+    failOn(d.data(), "CIE/FDE ends past the end of the section");
+  return size;
 }
 
 // Read a byte and advance D by one byte.
 uint8_t EhReader::readByte() {
-  if (D.empty())
-    failOn(D.data(), "unexpected end of CIE");
-  uint8_t B = D.front();
-  D = D.slice(1);
-  return B;
+  if (d.empty())
+    failOn(d.data(), "unexpected end of CIE");
+  uint8_t b = d.front();
+  d = d.slice(1);
+  return b;
 }
 
-void EhReader::skipBytes(size_t Count) {
-  if (D.size() < Count)
-    failOn(D.data(), "CIE is too small");
-  D = D.slice(Count);
+void EhReader::skipBytes(size_t count) {
+  if (d.size() < count)
+    failOn(d.data(), "CIE is too small");
+  d = d.slice(count);
 }
 
 // Read a null-terminated string.
 StringRef EhReader::readString() {
-  const uint8_t *End = std::find(D.begin(), D.end(), '\0');
-  if (End == D.end())
-    failOn(D.data(), "corrupted CIE (failed to read string)");
-  StringRef S = toStringRef(D.slice(0, End - D.begin()));
-  D = D.slice(S.size() + 1);
-  return S;
+  const uint8_t *end = llvm::find(d, '\0');
+  if (end == d.end())
+    failOn(d.data(), "corrupted CIE (failed to read string)");
+  StringRef s = toStringRef(d.slice(0, end - d.begin()));
+  d = d.slice(s.size() + 1);
+  return s;
 }
 
 // Skip an integer encoded in the LEB128 format.
@@ -110,21 +109,21 @@ StringRef EhReader::readString() {
 // But we need to be at least able to skip it so that we can read
 // the field that follows a LEB128 number.
 void EhReader::skipLeb128() {
-  const uint8_t *ErrPos = D.data();
-  while (!D.empty()) {
-    uint8_t Val = D.front();
-    D = D.slice(1);
-    if ((Val & 0x80) == 0)
+  const uint8_t *errPos = d.data();
+  while (!d.empty()) {
+    uint8_t val = d.front();
+    d = d.slice(1);
+    if ((val & 0x80) == 0)
       return;
   }
-  failOn(ErrPos, "corrupted CIE (failed to read LEB128)");
+  failOn(errPos, "corrupted CIE (failed to read LEB128)");
 }
 
-static size_t getAugPSize(unsigned Enc) {
-  switch (Enc & 0x0f) {
+static size_t getAugPSize(unsigned enc) {
+  switch (enc & 0x0f) {
   case DW_EH_PE_absptr:
   case DW_EH_PE_signed:
-    return Config->Wordsize;
+    return config->wordsize;
   case DW_EH_PE_udata2:
   case DW_EH_PE_sdata2:
     return 2;
@@ -139,29 +138,29 @@ static size_t getAugPSize(unsigned Enc) {
 }
 
 void EhReader::skipAugP() {
-  uint8_t Enc = readByte();
-  if ((Enc & 0xf0) == DW_EH_PE_aligned)
-    failOn(D.data() - 1, "DW_EH_PE_aligned encoding is not supported");
-  size_t Size = getAugPSize(Enc);
-  if (Size == 0)
-    failOn(D.data() - 1, "unknown FDE encoding");
-  if (Size >= D.size())
-    failOn(D.data() - 1, "corrupted CIE");
-  D = D.slice(Size);
+  uint8_t enc = readByte();
+  if ((enc & 0xf0) == DW_EH_PE_aligned)
+    failOn(d.data() - 1, "DW_EH_PE_aligned encoding is not supported");
+  size_t size = getAugPSize(enc);
+  if (size == 0)
+    failOn(d.data() - 1, "unknown FDE encoding");
+  if (size >= d.size())
+    failOn(d.data() - 1, "corrupted CIE");
+  d = d.slice(size);
 }
 
-uint8_t elf::getFdeEncoding(EhSectionPiece *P) {
-  return EhReader(P->Sec, P->data()).getFdeEncoding();
+uint8_t elf::getFdeEncoding(EhSectionPiece *p) {
+  return EhReader(p->sec, p->data()).getFdeEncoding();
 }
 
 uint8_t EhReader::getFdeEncoding() {
   skipBytes(8);
-  int Version = readByte();
-  if (Version != 1 && Version != 3)
-    failOn(D.data() - 1,
-           "FDE version 1 or 3 expected, but got " + Twine(Version));
+  int version = readByte();
+  if (version != 1 && version != 3)
+    failOn(d.data() - 1,
+           "FDE version 1 or 3 expected, but got " + Twine(version));
 
-  StringRef Aug = readString();
+  StringRef aug = readString();
 
   // Skip code and data alignment factors.
   skipLeb128();
@@ -169,7 +168,7 @@ uint8_t EhReader::getFdeEncoding() {
 
   // Skip the return address register. In CIE version 1 this is a single
   // byte. In CIE version 3 this is an unsigned LEB128.
-  if (Version == 1)
+  if (version == 1)
     readByte();
   else
     skipLeb128();
@@ -177,22 +176,22 @@ uint8_t EhReader::getFdeEncoding() {
   // We only care about an 'R' value, but other records may precede an 'R'
   // record. Unfortunately records are not in TLV (type-length-value) format,
   // so we need to teach the linker how to skip records for each type.
-  for (char C : Aug) {
-    if (C == 'R')
+  for (char c : aug) {
+    if (c == 'R')
       return readByte();
-    if (C == 'z') {
+    if (c == 'z') {
       skipLeb128();
       continue;
     }
-    if (C == 'P') {
+    if (c == 'P') {
       skipAugP();
       continue;
     }
-    if (C == 'L') {
+    if (c == 'L') {
       readByte();
       continue;
     }
-    failOn(Aug.data(), "unknown .eh_frame augmentation string: " + Aug);
+    failOn(aug.data(), "unknown .eh_frame augmentation string: " + aug);
   }
   return DW_EH_PE_absptr;
 }
diff --git a/deps/lld/ELF/EhFrame.h b/deps/lld/ELF/EhFrame.h
index 5112891a911eeb816453f74e0c0419b9db301491..20dd6126ec8e3eb28eb0db4db8b8e11d8e6dd3f2 100644
--- a/deps/lld/ELF/EhFrame.h
+++ b/deps/lld/ELF/EhFrame.h
@@ -1,9 +1,8 @@
 //===- EhFrame.h ------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -17,8 +16,8 @@ namespace elf {
 class InputSectionBase;
 struct EhSectionPiece;
 
-size_t readEhRecordSize(InputSectionBase *S, size_t Off);
-uint8_t getFdeEncoding(EhSectionPiece *P);
+size_t readEhRecordSize(InputSectionBase *s, size_t off);
+uint8_t getFdeEncoding(EhSectionPiece *p);
 } // namespace elf
 } // namespace lld
 
diff --git a/deps/lld/ELF/Filesystem.cpp b/deps/lld/ELF/Filesystem.cpp
deleted file mode 100644
index 5cf240eeca567dba8a0c77898e92954e2fd27716..0000000000000000000000000000000000000000
--- a/deps/lld/ELF/Filesystem.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-//===- Filesystem.cpp -----------------------------------------------------===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains a few utility functions to handle files.
-//
-//===----------------------------------------------------------------------===//
-
-#include "Filesystem.h"
-#include "Config.h"
-#include "lld/Common/Threads.h"
-#include "llvm/Config/llvm-config.h"
-#include "llvm/Support/FileOutputBuffer.h"
-#include "llvm/Support/FileSystem.h"
-#if LLVM_ON_UNIX
-#include <unistd.h>
-#endif
-#include <thread>
-
-using namespace llvm;
-
-using namespace lld;
-using namespace lld::elf;
-
-// Removes a given file asynchronously. This is a performance hack,
-// so remove this when operating systems are improved.
-//
-// On Linux (and probably on other Unix-like systems), unlink(2) is a
-// noticeably slow system call. As of 2016, unlink takes 250
-// milliseconds to remove a 1 GB file on ext4 filesystem on my machine.
-//
-// To create a new result file, we first remove existing file. So, if
-// you repeatedly link a 1 GB program in a regular compile-link-debug
-// cycle, every cycle wastes 250 milliseconds only to remove a file.
-// Since LLD can link a 1 GB binary in about 5 seconds, that waste
-// actually counts.
-//
-// This function spawns a background thread to remove the file.
-// The calling thread returns almost immediately.
-void elf::unlinkAsync(StringRef Path) {
-// Removing a file is async on windows.
-#if defined(_WIN32)
-  sys::fs::remove(Path);
-#else
-  if (!ThreadsEnabled || !sys::fs::exists(Path) ||
-      !sys::fs::is_regular_file(Path))
-    return;
-
-  // We cannot just remove path from a different thread because we are now going
-  // to create path as a new file.
-  // Instead we open the file and unlink it on this thread. The unlink is fast
-  // since the open fd guarantees that it is not removing the last reference.
-  int FD;
-  std::error_code EC = sys::fs::openFileForRead(Path, FD);
-  sys::fs::remove(Path);
-
-  // close and therefore remove TempPath in background.
-  if (!EC)
-    std::thread([=] { ::close(FD); }).detach();
-#endif
-}
-
-// Simulate file creation to see if Path is writable.
-//
-// Determining whether a file is writable or not is amazingly hard,
-// and after all the only reliable way of doing that is to actually
-// create a file. But we don't want to do that in this function
-// because LLD shouldn't update any file if it will end in a failure.
-// We also don't want to reimplement heuristics to determine if a
-// file is writable. So we'll let FileOutputBuffer do the work.
-//
-// FileOutputBuffer doesn't touch a desitnation file until commit()
-// is called. We use that class without calling commit() to predict
-// if the given file is writable.
-std::error_code elf::tryCreateFile(StringRef Path) {
-  if (Path.empty())
-    return std::error_code();
-  if (Path == "-")
-    return std::error_code();
-  return errorToErrorCode(FileOutputBuffer::create(Path, 1).takeError());
-}
diff --git a/deps/lld/ELF/Filesystem.h b/deps/lld/ELF/Filesystem.h
deleted file mode 100644
index 987a74a6bcb6f91ae7a477d665a59253e92d1fd3..0000000000000000000000000000000000000000
--- a/deps/lld/ELF/Filesystem.h
+++ /dev/null
@@ -1,23 +0,0 @@
-//===- Filesystem.h ---------------------------------------------*- C++ -*-===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_ELF_FILESYSTEM_H
-#define LLD_ELF_FILESYSTEM_H
-
-#include "lld/Common/LLVM.h"
-#include <system_error>
-
-namespace lld {
-namespace elf {
-void unlinkAsync(StringRef Path);
-std::error_code tryCreateFile(StringRef Path);
-} // namespace elf
-} // namespace lld
-
-#endif
diff --git a/deps/lld/ELF/ICF.cpp b/deps/lld/ELF/ICF.cpp
index d08ac73ded80e81a3052090d44d5198ee2ad7a6e..8b01d06b02480ad6a82922dc64faf9c58df7d446 100644
--- a/deps/lld/ELF/ICF.cpp
+++ b/deps/lld/ELF/ICF.cpp
@@ -1,9 +1,8 @@
 //===- ICF.cpp ------------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -99,33 +98,33 @@ public:
   void run();
 
 private:
-  void segregate(size_t Begin, size_t End, bool Constant);
+  void segregate(size_t begin, size_t end, bool constant);
 
   template <class RelTy>
-  bool constantEq(const InputSection *A, ArrayRef<RelTy> RelsA,
-                  const InputSection *B, ArrayRef<RelTy> RelsB);
+  bool constantEq(const InputSection *a, ArrayRef<RelTy> relsA,
+                  const InputSection *b, ArrayRef<RelTy> relsB);
 
   template <class RelTy>
-  bool variableEq(const InputSection *A, ArrayRef<RelTy> RelsA,
-                  const InputSection *B, ArrayRef<RelTy> RelsB);
+  bool variableEq(const InputSection *a, ArrayRef<RelTy> relsA,
+                  const InputSection *b, ArrayRef<RelTy> relsB);
 
-  bool equalsConstant(const InputSection *A, const InputSection *B);
-  bool equalsVariable(const InputSection *A, const InputSection *B);
+  bool equalsConstant(const InputSection *a, const InputSection *b);
+  bool equalsVariable(const InputSection *a, const InputSection *b);
 
-  size_t findBoundary(size_t Begin, size_t End);
+  size_t findBoundary(size_t begin, size_t end);
 
-  void forEachClassRange(size_t Begin, size_t End,
-                         llvm::function_ref<void(size_t, size_t)> Fn);
+  void forEachClassRange(size_t begin, size_t end,
+                         llvm::function_ref<void(size_t, size_t)> fn);
 
-  void forEachClass(llvm::function_ref<void(size_t, size_t)> Fn);
+  void forEachClass(llvm::function_ref<void(size_t, size_t)> fn);
 
-  std::vector<InputSection *> Sections;
+  std::vector<InputSection *> sections;
 
   // We repeat the main loop while `Repeat` is true.
-  std::atomic<bool> Repeat;
+  std::atomic<bool> repeat;
 
   // The main loop counter.
-  int Cnt = 0;
+  int cnt = 0;
 
   // We have two locations for equivalence classes. On the first iteration
   // of the main loop, Class[0] has a valid value, and Class[1] contains
@@ -151,42 +150,42 @@ private:
   // because we can safely read the next class without worrying about race
   // conditions. Using the same location makes this algorithm converge
   // faster because it uses results of the same iteration earlier.
-  int Current = 0;
-  int Next = 0;
+  int current = 0;
+  int next = 0;
 };
 }
 
 // Returns true if section S is subject of ICF.
-static bool isEligible(InputSection *S) {
-  if (!S->Live || S->KeepUnique || !(S->Flags & SHF_ALLOC))
+static bool isEligible(InputSection *s) {
+  if (!s->isLive() || s->keepUnique || !(s->flags & SHF_ALLOC))
     return false;
 
   // Don't merge writable sections. .data.rel.ro sections are marked as writable
   // but are semantically read-only.
-  if ((S->Flags & SHF_WRITE) && S->Name != ".data.rel.ro" &&
-      !S->Name.startswith(".data.rel.ro."))
+  if ((s->flags & SHF_WRITE) && s->name != ".data.rel.ro" &&
+      !s->name.startswith(".data.rel.ro."))
     return false;
 
   // SHF_LINK_ORDER sections are ICF'd as a unit with their dependent sections,
   // so we don't consider them for ICF individually.
-  if (S->Flags & SHF_LINK_ORDER)
+  if (s->flags & SHF_LINK_ORDER)
     return false;
 
   // Don't merge synthetic sections as their Data member is not valid and empty.
   // The Data member needs to be valid for ICF as it is used by ICF to determine
   // the equality of section contents.
-  if (isa<SyntheticSection>(S))
+  if (isa<SyntheticSection>(s))
     return false;
 
   // .init and .fini contains instructions that must be executed to initialize
   // and finalize the process. They cannot and should not be merged.
-  if (S->Name == ".init" || S->Name == ".fini")
+  if (s->name == ".init" || s->name == ".fini")
     return false;
 
   // A user program may enumerate sections named with a C identifier using
   // __start_* and __stop_* symbols. We cannot ICF any such sections because
   // that could change program semantics.
-  if (isValidCIdentifier(S->Name))
+  if (isValidCIdentifier(s->name))
     return false;
 
   return true;
@@ -194,7 +193,7 @@ static bool isEligible(InputSection *S) {
 
 // Split an equivalence class into smaller classes.
 template <class ELFT>
-void ICF<ELFT>::segregate(size_t Begin, size_t End, bool Constant) {
+void ICF<ELFT>::segregate(size_t begin, size_t end, bool constant) {
   // This loop rearranges sections in [Begin, End) so that all sections
   // that are equal in terms of equals{Constant,Variable} are contiguous
   // in [Begin, End).
@@ -203,93 +202,93 @@ void ICF<ELFT>::segregate(size_t Begin, size_t End, bool Constant) {
   // issue in practice because the number of the distinct sections in
   // each range is usually very small.
 
-  while (Begin < End) {
+  while (begin < end) {
     // Divide [Begin, End) into two. Let Mid be the start index of the
     // second group.
-    auto Bound =
-        std::stable_partition(Sections.begin() + Begin + 1,
-                              Sections.begin() + End, [&](InputSection *S) {
-                                if (Constant)
-                                  return equalsConstant(Sections[Begin], S);
-                                return equalsVariable(Sections[Begin], S);
+    auto bound =
+        std::stable_partition(sections.begin() + begin + 1,
+                              sections.begin() + end, [&](InputSection *s) {
+                                if (constant)
+                                  return equalsConstant(sections[begin], s);
+                                return equalsVariable(sections[begin], s);
                               });
-    size_t Mid = Bound - Sections.begin();
+    size_t mid = bound - sections.begin();
 
     // Now we split [Begin, End) into [Begin, Mid) and [Mid, End) by
     // updating the sections in [Begin, Mid). We use Mid as an equivalence
     // class ID because every group ends with a unique index.
-    for (size_t I = Begin; I < Mid; ++I)
-      Sections[I]->Class[Next] = Mid;
+    for (size_t i = begin; i < mid; ++i)
+      sections[i]->eqClass[next] = mid;
 
     // If we created a group, we need to iterate the main loop again.
-    if (Mid != End)
-      Repeat = true;
+    if (mid != end)
+      repeat = true;
 
-    Begin = Mid;
+    begin = mid;
   }
 }
 
 // Compare two lists of relocations.
 template <class ELFT>
 template <class RelTy>
-bool ICF<ELFT>::constantEq(const InputSection *SecA, ArrayRef<RelTy> RA,
-                           const InputSection *SecB, ArrayRef<RelTy> RB) {
-  for (size_t I = 0; I < RA.size(); ++I) {
-    if (RA[I].r_offset != RB[I].r_offset ||
-        RA[I].getType(Config->IsMips64EL) != RB[I].getType(Config->IsMips64EL))
+bool ICF<ELFT>::constantEq(const InputSection *secA, ArrayRef<RelTy> ra,
+                           const InputSection *secB, ArrayRef<RelTy> rb) {
+  for (size_t i = 0; i < ra.size(); ++i) {
+    if (ra[i].r_offset != rb[i].r_offset ||
+        ra[i].getType(config->isMips64EL) != rb[i].getType(config->isMips64EL))
       return false;
 
-    uint64_t AddA = getAddend<ELFT>(RA[I]);
-    uint64_t AddB = getAddend<ELFT>(RB[I]);
+    uint64_t addA = getAddend<ELFT>(ra[i]);
+    uint64_t addB = getAddend<ELFT>(rb[i]);
 
-    Symbol &SA = SecA->template getFile<ELFT>()->getRelocTargetSym(RA[I]);
-    Symbol &SB = SecB->template getFile<ELFT>()->getRelocTargetSym(RB[I]);
-    if (&SA == &SB) {
-      if (AddA == AddB)
+    Symbol &sa = secA->template getFile<ELFT>()->getRelocTargetSym(ra[i]);
+    Symbol &sb = secB->template getFile<ELFT>()->getRelocTargetSym(rb[i]);
+    if (&sa == &sb) {
+      if (addA == addB)
         continue;
       return false;
     }
 
-    auto *DA = dyn_cast<Defined>(&SA);
-    auto *DB = dyn_cast<Defined>(&SB);
+    auto *da = dyn_cast<Defined>(&sa);
+    auto *db = dyn_cast<Defined>(&sb);
 
     // Placeholder symbols generated by linker scripts look the same now but
     // may have different values later.
-    if (!DA || !DB || DA->ScriptDefined || DB->ScriptDefined)
+    if (!da || !db || da->scriptDefined || db->scriptDefined)
       return false;
 
     // Relocations referring to absolute symbols are constant-equal if their
     // values are equal.
-    if (!DA->Section && !DB->Section && DA->Value + AddA == DB->Value + AddB)
+    if (!da->section && !db->section && da->value + addA == db->value + addB)
       continue;
-    if (!DA->Section || !DB->Section)
+    if (!da->section || !db->section)
       return false;
 
-    if (DA->Section->kind() != DB->Section->kind())
+    if (da->section->kind() != db->section->kind())
       return false;
 
     // Relocations referring to InputSections are constant-equal if their
     // section offsets are equal.
-    if (isa<InputSection>(DA->Section)) {
-      if (DA->Value + AddA == DB->Value + AddB)
+    if (isa<InputSection>(da->section)) {
+      if (da->value + addA == db->value + addB)
         continue;
       return false;
     }
 
     // Relocations referring to MergeInputSections are constant-equal if their
     // offsets in the output section are equal.
-    auto *X = dyn_cast<MergeInputSection>(DA->Section);
-    if (!X)
+    auto *x = dyn_cast<MergeInputSection>(da->section);
+    if (!x)
       return false;
-    auto *Y = cast<MergeInputSection>(DB->Section);
-    if (X->getParent() != Y->getParent())
+    auto *y = cast<MergeInputSection>(db->section);
+    if (x->getParent() != y->getParent())
       return false;
 
-    uint64_t OffsetA =
-        SA.isSection() ? X->getOffset(AddA) : X->getOffset(DA->Value) + AddA;
-    uint64_t OffsetB =
-        SB.isSection() ? Y->getOffset(AddB) : Y->getOffset(DB->Value) + AddB;
-    if (OffsetA != OffsetB)
+    uint64_t offsetA =
+        sa.isSection() ? x->getOffset(addA) : x->getOffset(da->value) + addA;
+    uint64_t offsetB =
+        sb.isSection() ? y->getOffset(addB) : y->getOffset(db->value) + addB;
+    if (offsetA != offsetB)
       return false;
   }
 
@@ -299,57 +298,57 @@ bool ICF<ELFT>::constantEq(const InputSection *SecA, ArrayRef<RelTy> RA,
 // Compare "non-moving" part of two InputSections, namely everything
 // except relocation targets.
 template <class ELFT>
-bool ICF<ELFT>::equalsConstant(const InputSection *A, const InputSection *B) {
-  if (A->NumRelocations != B->NumRelocations || A->Flags != B->Flags ||
-      A->getSize() != B->getSize() || A->data() != B->data())
+bool ICF<ELFT>::equalsConstant(const InputSection *a, const InputSection *b) {
+  if (a->numRelocations != b->numRelocations || a->flags != b->flags ||
+      a->getSize() != b->getSize() || a->data() != b->data())
     return false;
 
   // If two sections have different output sections, we cannot merge them.
   // FIXME: This doesn't do the right thing in the case where there is a linker
   // script. We probably need to move output section assignment before ICF to
   // get the correct behaviour here.
-  if (getOutputSectionName(A) != getOutputSectionName(B))
+  if (getOutputSectionName(a) != getOutputSectionName(b))
     return false;
 
-  if (A->AreRelocsRela)
-    return constantEq(A, A->template relas<ELFT>(), B,
-                      B->template relas<ELFT>());
-  return constantEq(A, A->template rels<ELFT>(), B, B->template rels<ELFT>());
+  if (a->areRelocsRela)
+    return constantEq(a, a->template relas<ELFT>(), b,
+                      b->template relas<ELFT>());
+  return constantEq(a, a->template rels<ELFT>(), b, b->template rels<ELFT>());
 }
 
 // Compare two lists of relocations. Returns true if all pairs of
 // relocations point to the same section in terms of ICF.
 template <class ELFT>
 template <class RelTy>
-bool ICF<ELFT>::variableEq(const InputSection *SecA, ArrayRef<RelTy> RA,
-                           const InputSection *SecB, ArrayRef<RelTy> RB) {
-  assert(RA.size() == RB.size());
+bool ICF<ELFT>::variableEq(const InputSection *secA, ArrayRef<RelTy> ra,
+                           const InputSection *secB, ArrayRef<RelTy> rb) {
+  assert(ra.size() == rb.size());
 
-  for (size_t I = 0; I < RA.size(); ++I) {
+  for (size_t i = 0; i < ra.size(); ++i) {
     // The two sections must be identical.
-    Symbol &SA = SecA->template getFile<ELFT>()->getRelocTargetSym(RA[I]);
-    Symbol &SB = SecB->template getFile<ELFT>()->getRelocTargetSym(RB[I]);
-    if (&SA == &SB)
+    Symbol &sa = secA->template getFile<ELFT>()->getRelocTargetSym(ra[i]);
+    Symbol &sb = secB->template getFile<ELFT>()->getRelocTargetSym(rb[i]);
+    if (&sa == &sb)
       continue;
 
-    auto *DA = cast<Defined>(&SA);
-    auto *DB = cast<Defined>(&SB);
+    auto *da = cast<Defined>(&sa);
+    auto *db = cast<Defined>(&sb);
 
     // We already dealt with absolute and non-InputSection symbols in
     // constantEq, and for InputSections we have already checked everything
     // except the equivalence class.
-    if (!DA->Section)
+    if (!da->section)
       continue;
-    auto *X = dyn_cast<InputSection>(DA->Section);
-    if (!X)
+    auto *x = dyn_cast<InputSection>(da->section);
+    if (!x)
       continue;
-    auto *Y = cast<InputSection>(DB->Section);
+    auto *y = cast<InputSection>(db->section);
 
     // Ineligible sections are in the special equivalence class 0.
     // They can never be the same in terms of the equivalence class.
-    if (X->Class[Current] == 0)
+    if (x->eqClass[current] == 0)
       return false;
-    if (X->Class[Current] != Y->Class[Current])
+    if (x->eqClass[current] != y->eqClass[current])
       return false;
   };
 
@@ -358,19 +357,19 @@ bool ICF<ELFT>::variableEq(const InputSection *SecA, ArrayRef<RelTy> RA,
 
 // Compare "moving" part of two InputSections, namely relocation targets.
 template <class ELFT>
-bool ICF<ELFT>::equalsVariable(const InputSection *A, const InputSection *B) {
-  if (A->AreRelocsRela)
-    return variableEq(A, A->template relas<ELFT>(), B,
-                      B->template relas<ELFT>());
-  return variableEq(A, A->template rels<ELFT>(), B, B->template rels<ELFT>());
+bool ICF<ELFT>::equalsVariable(const InputSection *a, const InputSection *b) {
+  if (a->areRelocsRela)
+    return variableEq(a, a->template relas<ELFT>(), b,
+                      b->template relas<ELFT>());
+  return variableEq(a, a->template rels<ELFT>(), b, b->template rels<ELFT>());
 }
 
-template <class ELFT> size_t ICF<ELFT>::findBoundary(size_t Begin, size_t End) {
-  uint32_t Class = Sections[Begin]->Class[Current];
-  for (size_t I = Begin + 1; I < End; ++I)
-    if (Class != Sections[I]->Class[Current])
-      return I;
-  return End;
+template <class ELFT> size_t ICF<ELFT>::findBoundary(size_t begin, size_t end) {
+  uint32_t eqClass = sections[begin]->eqClass[current];
+  for (size_t i = begin + 1; i < end; ++i)
+    if (eqClass != sections[i]->eqClass[current])
+      return i;
+  return end;
 }
 
 // Sections in the same equivalence class are contiguous in Sections
@@ -379,126 +378,125 @@ template <class ELFT> size_t ICF<ELFT>::findBoundary(size_t Begin, size_t End) {
 //
 // This function calls Fn on every group within [Begin, End).
 template <class ELFT>
-void ICF<ELFT>::forEachClassRange(size_t Begin, size_t End,
-                                  llvm::function_ref<void(size_t, size_t)> Fn) {
-  while (Begin < End) {
-    size_t Mid = findBoundary(Begin, End);
-    Fn(Begin, Mid);
-    Begin = Mid;
+void ICF<ELFT>::forEachClassRange(size_t begin, size_t end,
+                                  llvm::function_ref<void(size_t, size_t)> fn) {
+  while (begin < end) {
+    size_t mid = findBoundary(begin, end);
+    fn(begin, mid);
+    begin = mid;
   }
 }
 
 // Call Fn on each equivalence class.
 template <class ELFT>
-void ICF<ELFT>::forEachClass(llvm::function_ref<void(size_t, size_t)> Fn) {
+void ICF<ELFT>::forEachClass(llvm::function_ref<void(size_t, size_t)> fn) {
   // If threading is disabled or the number of sections are
   // too small to use threading, call Fn sequentially.
-  if (!ThreadsEnabled || Sections.size() < 1024) {
-    forEachClassRange(0, Sections.size(), Fn);
-    ++Cnt;
+  if (!threadsEnabled || sections.size() < 1024) {
+    forEachClassRange(0, sections.size(), fn);
+    ++cnt;
     return;
   }
 
-  Current = Cnt % 2;
-  Next = (Cnt + 1) % 2;
+  current = cnt % 2;
+  next = (cnt + 1) % 2;
 
   // Shard into non-overlapping intervals, and call Fn in parallel.
   // The sharding must be completed before any calls to Fn are made
   // so that Fn can modify the Chunks in its shard without causing data
   // races.
-  const size_t NumShards = 256;
-  size_t Step = Sections.size() / NumShards;
-  size_t Boundaries[NumShards + 1];
-  Boundaries[0] = 0;
-  Boundaries[NumShards] = Sections.size();
+  const size_t numShards = 256;
+  size_t step = sections.size() / numShards;
+  size_t boundaries[numShards + 1];
+  boundaries[0] = 0;
+  boundaries[numShards] = sections.size();
 
-  parallelForEachN(1, NumShards, [&](size_t I) {
-    Boundaries[I] = findBoundary((I - 1) * Step, Sections.size());
+  parallelForEachN(1, numShards, [&](size_t i) {
+    boundaries[i] = findBoundary((i - 1) * step, sections.size());
   });
 
-  parallelForEachN(1, NumShards + 1, [&](size_t I) {
-    if (Boundaries[I - 1] < Boundaries[I])
-      forEachClassRange(Boundaries[I - 1], Boundaries[I], Fn);
+  parallelForEachN(1, numShards + 1, [&](size_t i) {
+    if (boundaries[i - 1] < boundaries[i])
+      forEachClassRange(boundaries[i - 1], boundaries[i], fn);
   });
-  ++Cnt;
+  ++cnt;
 }
 
 // Combine the hashes of the sections referenced by the given section into its
 // hash.
 template <class ELFT, class RelTy>
-static void combineRelocHashes(unsigned Cnt, InputSection *IS,
-                               ArrayRef<RelTy> Rels) {
-  uint32_t Hash = IS->Class[Cnt % 2];
-  for (RelTy Rel : Rels) {
-    Symbol &S = IS->template getFile<ELFT>()->getRelocTargetSym(Rel);
-    if (auto *D = dyn_cast<Defined>(&S))
-      if (auto *RelSec = dyn_cast_or_null<InputSection>(D->Section))
-        Hash += RelSec->Class[Cnt % 2];
+static void combineRelocHashes(unsigned cnt, InputSection *isec,
+                               ArrayRef<RelTy> rels) {
+  uint32_t hash = isec->eqClass[cnt % 2];
+  for (RelTy rel : rels) {
+    Symbol &s = isec->template getFile<ELFT>()->getRelocTargetSym(rel);
+    if (auto *d = dyn_cast<Defined>(&s))
+      if (auto *relSec = dyn_cast_or_null<InputSection>(d->section))
+        hash += relSec->eqClass[cnt % 2];
   }
   // Set MSB to 1 to avoid collisions with non-hash IDs.
-  IS->Class[(Cnt + 1) % 2] = Hash | (1U << 31);
+  isec->eqClass[(cnt + 1) % 2] = hash | (1U << 31);
 }
 
-static void print(const Twine &S) {
-  if (Config->PrintIcfSections)
-    message(S);
+static void print(const Twine &s) {
+  if (config->printIcfSections)
+    message(s);
 }
 
 // The main function of ICF.
 template <class ELFT> void ICF<ELFT>::run() {
   // Collect sections to merge.
-  for (InputSectionBase *Sec : InputSections)
-    if (auto *S = dyn_cast<InputSection>(Sec))
-      if (isEligible(S))
-        Sections.push_back(S);
+  for (InputSectionBase *sec : inputSections)
+    if (auto *s = dyn_cast<InputSection>(sec))
+      if (isEligible(s))
+        sections.push_back(s);
 
   // Initially, we use hash values to partition sections.
-  parallelForEach(Sections, [&](InputSection *S) {
-    S->Class[0] = xxHash64(S->data());
+  parallelForEach(sections, [&](InputSection *s) {
+    s->eqClass[0] = xxHash64(s->data());
   });
 
-  for (unsigned Cnt = 0; Cnt != 2; ++Cnt) {
-    parallelForEach(Sections, [&](InputSection *S) {
-      if (S->AreRelocsRela)
-        combineRelocHashes<ELFT>(Cnt, S, S->template relas<ELFT>());
+  for (unsigned cnt = 0; cnt != 2; ++cnt) {
+    parallelForEach(sections, [&](InputSection *s) {
+      if (s->areRelocsRela)
+        combineRelocHashes<ELFT>(cnt, s, s->template relas<ELFT>());
       else
-        combineRelocHashes<ELFT>(Cnt, S, S->template rels<ELFT>());
+        combineRelocHashes<ELFT>(cnt, s, s->template rels<ELFT>());
     });
   }
 
   // From now on, sections in Sections vector are ordered so that sections
   // in the same equivalence class are consecutive in the vector.
-  std::stable_sort(Sections.begin(), Sections.end(),
-                   [](InputSection *A, InputSection *B) {
-                     return A->Class[0] < B->Class[0];
-                   });
+  llvm::stable_sort(sections, [](const InputSection *a, const InputSection *b) {
+    return a->eqClass[0] < b->eqClass[0];
+  });
 
   // Compare static contents and assign unique IDs for each static content.
-  forEachClass([&](size_t Begin, size_t End) { segregate(Begin, End, true); });
+  forEachClass([&](size_t begin, size_t end) { segregate(begin, end, true); });
 
   // Split groups by comparing relocations until convergence is obtained.
   do {
-    Repeat = false;
+    repeat = false;
     forEachClass(
-        [&](size_t Begin, size_t End) { segregate(Begin, End, false); });
-  } while (Repeat);
+        [&](size_t begin, size_t end) { segregate(begin, end, false); });
+  } while (repeat);
 
-  log("ICF needed " + Twine(Cnt) + " iterations");
+  log("ICF needed " + Twine(cnt) + " iterations");
 
   // Merge sections by the equivalence class.
-  forEachClassRange(0, Sections.size(), [&](size_t Begin, size_t End) {
-    if (End - Begin == 1)
+  forEachClassRange(0, sections.size(), [&](size_t begin, size_t end) {
+    if (end - begin == 1)
       return;
-    print("selected section " + toString(Sections[Begin]));
-    for (size_t I = Begin + 1; I < End; ++I) {
-      print("  removing identical section " + toString(Sections[I]));
-      Sections[Begin]->replace(Sections[I]);
+    print("selected section " + toString(sections[begin]));
+    for (size_t i = begin + 1; i < end; ++i) {
+      print("  removing identical section " + toString(sections[i]));
+      sections[begin]->replace(sections[i]);
 
       // At this point we know sections merged are fully identical and hence
       // we want to remove duplicate implicit dependencies such as link order
       // and relocation sections.
-      for (InputSection *IS : Sections[I]->DependentSections)
-        IS->Live = false;
+      for (InputSection *isec : sections[i]->dependentSections)
+        isec->markDead();
     }
   });
 }
diff --git a/deps/lld/ELF/ICF.h b/deps/lld/ELF/ICF.h
index a6c8636ead6d513d20d4b4a1cc640e8868d56bc2..ed828fc4a94992c3fe90cecf4e42573a19be8483 100644
--- a/deps/lld/ELF/ICF.h
+++ b/deps/lld/ELF/ICF.h
@@ -1,9 +1,8 @@
 //===- ICF.h --------------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/ELF/InputFiles.cpp b/deps/lld/ELF/InputFiles.cpp
index bc7e61072e64227456a1696be5b032f78935c2f8..98b88283cf09309be620ba45027f170b4578c805 100644
--- a/deps/lld/ELF/InputFiles.cpp
+++ b/deps/lld/ELF/InputFiles.cpp
@@ -1,13 +1,13 @@
 //===- InputFiles.cpp -----------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "InputFiles.h"
+#include "Driver.h"
 #include "InputSection.h"
 #include "LinkerScript.h"
 #include "SymbolTable.h"
@@ -25,6 +25,7 @@
 #include "llvm/Object/ELFObjectFile.h"
 #include "llvm/Support/ARMAttributeParser.h"
 #include "llvm/Support/ARMBuildAttributes.h"
+#include "llvm/Support/Endian.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/TarWriter.h"
 #include "llvm/Support/raw_ostream.h"
@@ -34,145 +35,272 @@ using namespace llvm::ELF;
 using namespace llvm::object;
 using namespace llvm::sys;
 using namespace llvm::sys::fs;
+using namespace llvm::support::endian;
 
 using namespace lld;
 using namespace lld::elf;
 
-bool InputFile::IsInGroup;
-uint32_t InputFile::NextGroupId;
-std::vector<BinaryFile *> elf::BinaryFiles;
-std::vector<BitcodeFile *> elf::BitcodeFiles;
-std::vector<LazyObjFile *> elf::LazyObjFiles;
-std::vector<InputFile *> elf::ObjectFiles;
-std::vector<InputFile *> elf::SharedFiles;
-
-std::unique_ptr<TarWriter> elf::Tar;
-
-InputFile::InputFile(Kind K, MemoryBufferRef M)
-    : MB(M), GroupId(NextGroupId), FileKind(K) {
+bool InputFile::isInGroup;
+uint32_t InputFile::nextGroupId;
+std::vector<BinaryFile *> elf::binaryFiles;
+std::vector<BitcodeFile *> elf::bitcodeFiles;
+std::vector<LazyObjFile *> elf::lazyObjFiles;
+std::vector<InputFile *> elf::objectFiles;
+std::vector<SharedFile *> elf::sharedFiles;
+
+std::unique_ptr<TarWriter> elf::tar;
+
+static ELFKind getELFKind(MemoryBufferRef mb, StringRef archiveName) {
+  unsigned char size;
+  unsigned char endian;
+  std::tie(size, endian) = getElfArchType(mb.getBuffer());
+
+  auto report = [&](StringRef msg) {
+    StringRef filename = mb.getBufferIdentifier();
+    if (archiveName.empty())
+      fatal(filename + ": " + msg);
+    else
+      fatal(archiveName + "(" + filename + "): " + msg);
+  };
+
+  if (!mb.getBuffer().startswith(ElfMagic))
+    report("not an ELF file");
+  if (endian != ELFDATA2LSB && endian != ELFDATA2MSB)
+    report("corrupted ELF file: invalid data encoding");
+  if (size != ELFCLASS32 && size != ELFCLASS64)
+    report("corrupted ELF file: invalid file class");
+
+  size_t bufSize = mb.getBuffer().size();
+  if ((size == ELFCLASS32 && bufSize < sizeof(Elf32_Ehdr)) ||
+      (size == ELFCLASS64 && bufSize < sizeof(Elf64_Ehdr)))
+    report("corrupted ELF file: file is too short");
+
+  if (size == ELFCLASS32)
+    return (endian == ELFDATA2LSB) ? ELF32LEKind : ELF32BEKind;
+  return (endian == ELFDATA2LSB) ? ELF64LEKind : ELF64BEKind;
+}
+
+InputFile::InputFile(Kind k, MemoryBufferRef m)
+    : mb(m), groupId(nextGroupId), fileKind(k) {
   // All files within the same --{start,end}-group get the same group ID.
   // Otherwise, a new file will get a new group ID.
-  if (!IsInGroup)
-    ++NextGroupId;
+  if (!isInGroup)
+    ++nextGroupId;
 }
 
-Optional<MemoryBufferRef> elf::readFile(StringRef Path) {
+Optional<MemoryBufferRef> elf::readFile(StringRef path) {
   // The --chroot option changes our virtual root directory.
   // This is useful when you are dealing with files created by --reproduce.
-  if (!Config->Chroot.empty() && Path.startswith("/"))
-    Path = Saver.save(Config->Chroot + Path);
+  if (!config->chroot.empty() && path.startswith("/"))
+    path = saver.save(config->chroot + path);
 
-  log(Path);
+  log(path);
 
-  auto MBOrErr = MemoryBuffer::getFile(Path, -1, false);
-  if (auto EC = MBOrErr.getError()) {
-    error("cannot open " + Path + ": " + EC.message());
+  auto mbOrErr = MemoryBuffer::getFile(path, -1, false);
+  if (auto ec = mbOrErr.getError()) {
+    error("cannot open " + path + ": " + ec.message());
     return None;
   }
 
-  std::unique_ptr<MemoryBuffer> &MB = *MBOrErr;
-  MemoryBufferRef MBRef = MB->getMemBufferRef();
-  make<std::unique_ptr<MemoryBuffer>>(std::move(MB)); // take MB ownership
+  std::unique_ptr<MemoryBuffer> &mb = *mbOrErr;
+  MemoryBufferRef mbref = mb->getMemBufferRef();
+  make<std::unique_ptr<MemoryBuffer>>(std::move(mb)); // take MB ownership
 
-  if (Tar)
-    Tar->append(relativeToRoot(Path), MBRef.getBuffer());
-  return MBRef;
+  if (tar)
+    tar->append(relativeToRoot(path), mbref.getBuffer());
+  return mbref;
+}
+
+// All input object files must be for the same architecture
+// (e.g. it does not make sense to link x86 object files with
+// MIPS object files.) This function checks for that error.
+static bool isCompatible(InputFile *file) {
+  if (!file->isElf() && !isa<BitcodeFile>(file))
+    return true;
+
+  if (file->ekind == config->ekind && file->emachine == config->emachine) {
+    if (config->emachine != EM_MIPS)
+      return true;
+    if (isMipsN32Abi(file) == config->mipsN32Abi)
+      return true;
+  }
+
+  if (!config->emulation.empty()) {
+    error(toString(file) + " is incompatible with " + config->emulation);
+  } else {
+    InputFile *existing;
+    if (!objectFiles.empty())
+      existing = objectFiles[0];
+    else if (!sharedFiles.empty())
+      existing = sharedFiles[0];
+    else
+      existing = bitcodeFiles[0];
+
+    error(toString(file) + " is incompatible with " + toString(existing));
+  }
+
+  return false;
+}
+
+template <class ELFT> static void doParseFile(InputFile *file) {
+  if (!isCompatible(file))
+    return;
+
+  // Binary file
+  if (auto *f = dyn_cast<BinaryFile>(file)) {
+    binaryFiles.push_back(f);
+    f->parse();
+    return;
+  }
+
+  // .a file
+  if (auto *f = dyn_cast<ArchiveFile>(file)) {
+    f->parse();
+    return;
+  }
+
+  // Lazy object file
+  if (auto *f = dyn_cast<LazyObjFile>(file)) {
+    lazyObjFiles.push_back(f);
+    f->parse<ELFT>();
+    return;
+  }
+
+  if (config->trace)
+    message(toString(file));
+
+  // .so file
+  if (auto *f = dyn_cast<SharedFile>(file)) {
+    f->parse<ELFT>();
+    return;
+  }
+
+  // LLVM bitcode file
+  if (auto *f = dyn_cast<BitcodeFile>(file)) {
+    bitcodeFiles.push_back(f);
+    f->parse<ELFT>();
+    return;
+  }
+
+  // Regular object file
+  objectFiles.push_back(file);
+  cast<ObjFile<ELFT>>(file)->parse();
+}
+
+// Add symbols in File to the symbol table.
+void elf::parseFile(InputFile *file) {
+  switch (config->ekind) {
+  case ELF32LEKind:
+    doParseFile<ELF32LE>(file);
+    return;
+  case ELF32BEKind:
+    doParseFile<ELF32BE>(file);
+    return;
+  case ELF64LEKind:
+    doParseFile<ELF64LE>(file);
+    return;
+  case ELF64BEKind:
+    doParseFile<ELF64BE>(file);
+    return;
+  default:
+    llvm_unreachable("unknown ELFT");
+  }
 }
 
 // Concatenates arguments to construct a string representing an error location.
-static std::string createFileLineMsg(StringRef Path, unsigned Line) {
-  std::string Filename = path::filename(Path);
-  std::string Lineno = ":" + std::to_string(Line);
-  if (Filename == Path)
-    return Filename + Lineno;
-  return Filename + Lineno + " (" + Path.str() + Lineno + ")";
+static std::string createFileLineMsg(StringRef path, unsigned line) {
+  std::string filename = path::filename(path);
+  std::string lineno = ":" + std::to_string(line);
+  if (filename == path)
+    return filename + lineno;
+  return filename + lineno + " (" + path.str() + lineno + ")";
 }
 
 template <class ELFT>
-static std::string getSrcMsgAux(ObjFile<ELFT> &File, const Symbol &Sym,
-                                InputSectionBase &Sec, uint64_t Offset) {
+static std::string getSrcMsgAux(ObjFile<ELFT> &file, const Symbol &sym,
+                                InputSectionBase &sec, uint64_t offset) {
   // In DWARF, functions and variables are stored to different places.
   // First, lookup a function for a given offset.
-  if (Optional<DILineInfo> Info = File.getDILineInfo(&Sec, Offset))
-    return createFileLineMsg(Info->FileName, Info->Line);
+  if (Optional<DILineInfo> info = file.getDILineInfo(&sec, offset))
+    return createFileLineMsg(info->FileName, info->Line);
 
   // If it failed, lookup again as a variable.
-  if (Optional<std::pair<std::string, unsigned>> FileLine =
-          File.getVariableLoc(Sym.getName()))
-    return createFileLineMsg(FileLine->first, FileLine->second);
+  if (Optional<std::pair<std::string, unsigned>> fileLine =
+          file.getVariableLoc(sym.getName()))
+    return createFileLineMsg(fileLine->first, fileLine->second);
 
-  // File.SourceFile contains STT_FILE symbol, and that is a last resort.
-  return File.SourceFile;
+  // File.sourceFile contains STT_FILE symbol, and that is a last resort.
+  return file.sourceFile;
 }
 
-std::string InputFile::getSrcMsg(const Symbol &Sym, InputSectionBase &Sec,
-                                 uint64_t Offset) {
+std::string InputFile::getSrcMsg(const Symbol &sym, InputSectionBase &sec,
+                                 uint64_t offset) {
   if (kind() != ObjKind)
     return "";
-  switch (Config->EKind) {
+  switch (config->ekind) {
   default:
     llvm_unreachable("Invalid kind");
   case ELF32LEKind:
-    return getSrcMsgAux(cast<ObjFile<ELF32LE>>(*this), Sym, Sec, Offset);
+    return getSrcMsgAux(cast<ObjFile<ELF32LE>>(*this), sym, sec, offset);
   case ELF32BEKind:
-    return getSrcMsgAux(cast<ObjFile<ELF32BE>>(*this), Sym, Sec, Offset);
+    return getSrcMsgAux(cast<ObjFile<ELF32BE>>(*this), sym, sec, offset);
   case ELF64LEKind:
-    return getSrcMsgAux(cast<ObjFile<ELF64LE>>(*this), Sym, Sec, Offset);
+    return getSrcMsgAux(cast<ObjFile<ELF64LE>>(*this), sym, sec, offset);
   case ELF64BEKind:
-    return getSrcMsgAux(cast<ObjFile<ELF64BE>>(*this), Sym, Sec, Offset);
+    return getSrcMsgAux(cast<ObjFile<ELF64BE>>(*this), sym, sec, offset);
   }
 }
 
 template <class ELFT> void ObjFile<ELFT>::initializeDwarf() {
-  Dwarf = llvm::make_unique<DWARFContext>(make_unique<LLDDwarfObj<ELFT>>(this));
-  for (std::unique_ptr<DWARFUnit> &CU : Dwarf->compile_units()) {
-    auto Report = [](Error Err) {
-      handleAllErrors(std::move(Err),
-                      [](ErrorInfoBase &Info) { warn(Info.message()); });
+  dwarf = llvm::make_unique<DWARFContext>(make_unique<LLDDwarfObj<ELFT>>(this));
+  for (std::unique_ptr<DWARFUnit> &cu : dwarf->compile_units()) {
+    auto report = [](Error err) {
+      handleAllErrors(std::move(err),
+                      [](ErrorInfoBase &info) { warn(info.message()); });
     };
-    Expected<const DWARFDebugLine::LineTable *> ExpectedLT =
-        Dwarf->getLineTableForUnit(CU.get(), Report);
-    const DWARFDebugLine::LineTable *LT = nullptr;
-    if (ExpectedLT)
-      LT = *ExpectedLT;
+    Expected<const DWARFDebugLine::LineTable *> expectedLT =
+        dwarf->getLineTableForUnit(cu.get(), report);
+    const DWARFDebugLine::LineTable *lt = nullptr;
+    if (expectedLT)
+      lt = *expectedLT;
     else
-      Report(ExpectedLT.takeError());
-    if (!LT)
+      report(expectedLT.takeError());
+    if (!lt)
       continue;
-    LineTables.push_back(LT);
+    lineTables.push_back(lt);
 
-    // Loop over variable records and insert them to VariableLoc.
-    for (const auto &Entry : CU->dies()) {
-      DWARFDie Die(CU.get(), &Entry);
+    // Loop over variable records and insert them to variableLoc.
+    for (const auto &entry : cu->dies()) {
+      DWARFDie die(cu.get(), &entry);
       // Skip all tags that are not variables.
-      if (Die.getTag() != dwarf::DW_TAG_variable)
+      if (die.getTag() != dwarf::DW_TAG_variable)
         continue;
 
       // Skip if a local variable because we don't need them for generating
       // error messages. In general, only non-local symbols can fail to be
       // linked.
-      if (!dwarf::toUnsigned(Die.find(dwarf::DW_AT_external), 0))
+      if (!dwarf::toUnsigned(die.find(dwarf::DW_AT_external), 0))
         continue;
 
       // Get the source filename index for the variable.
-      unsigned File = dwarf::toUnsigned(Die.find(dwarf::DW_AT_decl_file), 0);
-      if (!LT->hasFileAtIndex(File))
+      unsigned file = dwarf::toUnsigned(die.find(dwarf::DW_AT_decl_file), 0);
+      if (!lt->hasFileAtIndex(file))
         continue;
 
       // Get the line number on which the variable is declared.
-      unsigned Line = dwarf::toUnsigned(Die.find(dwarf::DW_AT_decl_line), 0);
+      unsigned line = dwarf::toUnsigned(die.find(dwarf::DW_AT_decl_line), 0);
 
-      // Here we want to take the variable name to add it into VariableLoc.
+      // Here we want to take the variable name to add it into variableLoc.
       // Variable can have regular and linkage name associated. At first, we try
       // to get linkage name as it can be different, for example when we have
       // two variables in different namespaces of the same object. Use common
       // name otherwise, but handle the case when it also absent in case if the
       // input object file lacks some debug info.
-      StringRef Name =
-          dwarf::toString(Die.find(dwarf::DW_AT_linkage_name),
-                          dwarf::toString(Die.find(dwarf::DW_AT_name), ""));
-      if (!Name.empty())
-        VariableLoc.insert({Name, {LT, File, Line}});
+      StringRef name =
+          dwarf::toString(die.find(dwarf::DW_AT_linkage_name),
+                          dwarf::toString(die.find(dwarf::DW_AT_name), ""));
+      if (!name.empty())
+        variableLoc.insert({name, {lt, file, line}});
     }
   }
 }
@@ -181,112 +309,152 @@ template <class ELFT> void ObjFile<ELFT>::initializeDwarf() {
 // object (variable, array, etc) definition.
 template <class ELFT>
 Optional<std::pair<std::string, unsigned>>
-ObjFile<ELFT>::getVariableLoc(StringRef Name) {
-  llvm::call_once(InitDwarfLine, [this]() { initializeDwarf(); });
+ObjFile<ELFT>::getVariableLoc(StringRef name) {
+  llvm::call_once(initDwarfLine, [this]() { initializeDwarf(); });
 
   // Return if we have no debug information about data object.
-  auto It = VariableLoc.find(Name);
-  if (It == VariableLoc.end())
+  auto it = variableLoc.find(name);
+  if (it == variableLoc.end())
     return None;
 
   // Take file name string from line table.
-  std::string FileName;
-  if (!It->second.LT->getFileNameByIndex(
-          It->second.File, nullptr,
-          DILineInfoSpecifier::FileLineInfoKind::AbsoluteFilePath, FileName))
+  std::string fileName;
+  if (!it->second.lt->getFileNameByIndex(
+          it->second.file, {},
+          DILineInfoSpecifier::FileLineInfoKind::AbsoluteFilePath, fileName))
     return None;
 
-  return std::make_pair(FileName, It->second.Line);
+  return std::make_pair(fileName, it->second.line);
 }
 
 // Returns source line information for a given offset
 // using DWARF debug info.
 template <class ELFT>
-Optional<DILineInfo> ObjFile<ELFT>::getDILineInfo(InputSectionBase *S,
-                                                  uint64_t Offset) {
-  llvm::call_once(InitDwarfLine, [this]() { initializeDwarf(); });
+Optional<DILineInfo> ObjFile<ELFT>::getDILineInfo(InputSectionBase *s,
+                                                  uint64_t offset) {
+  llvm::call_once(initDwarfLine, [this]() { initializeDwarf(); });
+
+  // Detect SectionIndex for specified section.
+  uint64_t sectionIndex = object::SectionedAddress::UndefSection;
+  ArrayRef<InputSectionBase *> sections = s->file->getSections();
+  for (uint64_t curIndex = 0; curIndex < sections.size(); ++curIndex) {
+    if (s == sections[curIndex]) {
+      sectionIndex = curIndex;
+      break;
+    }
+  }
 
   // Use fake address calcuated by adding section file offset and offset in
   // section. See comments for ObjectInfo class.
-  DILineInfo Info;
-  for (const llvm::DWARFDebugLine::LineTable *LT : LineTables)
-    if (LT->getFileLineInfoForAddress(
-            S->getOffsetInFile() + Offset, nullptr,
-            DILineInfoSpecifier::FileLineInfoKind::AbsoluteFilePath, Info))
-      return Info;
+  DILineInfo info;
+  for (const llvm::DWARFDebugLine::LineTable *lt : lineTables) {
+    if (lt->getFileLineInfoForAddress(
+            {s->getOffsetInFile() + offset, sectionIndex}, nullptr,
+            DILineInfoSpecifier::FileLineInfoKind::AbsoluteFilePath, info))
+      return info;
+  }
   return None;
 }
 
 // Returns "<internal>", "foo.a(bar.o)" or "baz.o".
-std::string lld::toString(const InputFile *F) {
-  if (!F)
+std::string lld::toString(const InputFile *f) {
+  if (!f)
     return "<internal>";
 
-  if (F->ToStringCache.empty()) {
-    if (F->ArchiveName.empty())
-      F->ToStringCache = F->getName();
+  if (f->toStringCache.empty()) {
+    if (f->archiveName.empty())
+      f->toStringCache = f->getName();
     else
-      F->ToStringCache = (F->ArchiveName + "(" + F->getName() + ")").str();
+      f->toStringCache = (f->archiveName + "(" + f->getName() + ")").str();
   }
-  return F->ToStringCache;
+  return f->toStringCache;
 }
 
-template <class ELFT>
-ELFFileBase<ELFT>::ELFFileBase(Kind K, MemoryBufferRef MB) : InputFile(K, MB) {
-  if (ELFT::TargetEndianness == support::little)
-    EKind = ELFT::Is64Bits ? ELF64LEKind : ELF32LEKind;
-  else
-    EKind = ELFT::Is64Bits ? ELF64BEKind : ELF32BEKind;
+ELFFileBase::ELFFileBase(Kind k, MemoryBufferRef mb) : InputFile(k, mb) {
+  ekind = getELFKind(mb, "");
 
-  EMachine = getObj().getHeader()->e_machine;
-  OSABI = getObj().getHeader()->e_ident[llvm::ELF::EI_OSABI];
+  switch (ekind) {
+  case ELF32LEKind:
+    init<ELF32LE>();
+    break;
+  case ELF32BEKind:
+    init<ELF32BE>();
+    break;
+  case ELF64LEKind:
+    init<ELF64LE>();
+    break;
+  case ELF64BEKind:
+    init<ELF64BE>();
+    break;
+  default:
+    llvm_unreachable("getELFKind");
+  }
 }
 
-template <class ELFT>
-typename ELFT::SymRange ELFFileBase<ELFT>::getGlobalELFSyms() {
-  return makeArrayRef(ELFSyms.begin() + FirstGlobal, ELFSyms.end());
+template <typename Elf_Shdr>
+static const Elf_Shdr *findSection(ArrayRef<Elf_Shdr> sections, uint32_t type) {
+  for (const Elf_Shdr &sec : sections)
+    if (sec.sh_type == type)
+      return &sec;
+  return nullptr;
 }
 
-template <class ELFT>
-uint32_t ELFFileBase<ELFT>::getSectionIndex(const Elf_Sym &Sym) const {
-  return CHECK(getObj().getSectionIndex(&Sym, ELFSyms, SymtabSHNDX), this);
-}
+template <class ELFT> void ELFFileBase::init() {
+  using Elf_Shdr = typename ELFT::Shdr;
+  using Elf_Sym = typename ELFT::Sym;
+
+  // Initialize trivial attributes.
+  const ELFFile<ELFT> &obj = getObj<ELFT>();
+  emachine = obj.getHeader()->e_machine;
+  osabi = obj.getHeader()->e_ident[llvm::ELF::EI_OSABI];
+  abiVersion = obj.getHeader()->e_ident[llvm::ELF::EI_ABIVERSION];
+
+  ArrayRef<Elf_Shdr> sections = CHECK(obj.sections(), this);
+
+  // Find a symbol table.
+  bool isDSO =
+      (identify_magic(mb.getBuffer()) == file_magic::elf_shared_object);
+  const Elf_Shdr *symtabSec =
+      findSection(sections, isDSO ? SHT_DYNSYM : SHT_SYMTAB);
+
+  if (!symtabSec)
+    return;
+
+  // Initialize members corresponding to a symbol table.
+  firstGlobal = symtabSec->sh_info;
 
-template <class ELFT>
-void ELFFileBase<ELFT>::initSymtab(ArrayRef<Elf_Shdr> Sections,
-                                   const Elf_Shdr *Symtab) {
-  FirstGlobal = Symtab->sh_info;
-  ELFSyms = CHECK(getObj().symbols(Symtab), this);
-  if (FirstGlobal == 0 || FirstGlobal > ELFSyms.size())
+  ArrayRef<Elf_Sym> eSyms = CHECK(obj.symbols(symtabSec), this);
+  if (firstGlobal == 0 || firstGlobal > eSyms.size())
     fatal(toString(this) + ": invalid sh_info in symbol table");
 
-  StringTable =
-      CHECK(getObj().getStringTableForSymtab(*Symtab, Sections), this);
+  elfSyms = reinterpret_cast<const void *>(eSyms.data());
+  numELFSyms = eSyms.size();
+  stringTable = CHECK(obj.getStringTableForSymtab(*symtabSec, sections), this);
 }
 
 template <class ELFT>
-ObjFile<ELFT>::ObjFile(MemoryBufferRef M, StringRef ArchiveName)
-    : ELFFileBase<ELFT>(Base::ObjKind, M) {
-  this->ArchiveName = ArchiveName;
+uint32_t ObjFile<ELFT>::getSectionIndex(const Elf_Sym &sym) const {
+  return CHECK(
+      this->getObj().getSectionIndex(&sym, getELFSyms<ELFT>(), shndxTable),
+      this);
 }
 
 template <class ELFT> ArrayRef<Symbol *> ObjFile<ELFT>::getLocalSymbols() {
-  if (this->Symbols.empty())
+  if (this->symbols.empty())
     return {};
-  return makeArrayRef(this->Symbols).slice(1, this->FirstGlobal - 1);
+  return makeArrayRef(this->symbols).slice(1, this->firstGlobal - 1);
 }
 
 template <class ELFT> ArrayRef<Symbol *> ObjFile<ELFT>::getGlobalSymbols() {
-  return makeArrayRef(this->Symbols).slice(this->FirstGlobal);
+  return makeArrayRef(this->symbols).slice(this->firstGlobal);
 }
 
-template <class ELFT>
-void ObjFile<ELFT>::parse(DenseSet<CachedHashStringRef> &ComdatGroups) {
-  // Read a section table. JustSymbols is usually false.
-  if (this->JustSymbols)
+template <class ELFT> void ObjFile<ELFT>::parse(bool ignoreComdats) {
+  // Read a section table. justSymbols is usually false.
+  if (this->justSymbols)
     initializeJustSymbols();
   else
-    initializeSections(ComdatGroups);
+    initializeSections(ignoreComdats);
 
   // Read a symbol table.
   initializeSymbols();
@@ -296,17 +464,13 @@ void ObjFile<ELFT>::parse(DenseSet<CachedHashStringRef> &ComdatGroups) {
 // They are identified and deduplicated by group name. This function
 // returns a group name.
 template <class ELFT>
-StringRef ObjFile<ELFT>::getShtGroupSignature(ArrayRef<Elf_Shdr> Sections,
-                                              const Elf_Shdr &Sec) {
-  // Group signatures are stored as symbol names in object files.
-  // sh_info contains a symbol index, so we fetch a symbol and read its name.
-  if (this->ELFSyms.empty())
-    this->initSymtab(
-        Sections, CHECK(object::getSection<ELFT>(Sections, Sec.sh_link), this));
-
-  const Elf_Sym *Sym =
-      CHECK(object::getSymbol<ELFT>(this->ELFSyms, Sec.sh_info), this);
-  StringRef Signature = CHECK(Sym->getName(this->StringTable), this);
+StringRef ObjFile<ELFT>::getShtGroupSignature(ArrayRef<Elf_Shdr> sections,
+                                              const Elf_Shdr &sec) {
+  typename ELFT::SymRange symbols = this->getELFSyms<ELFT>();
+  if (sec.sh_info >= symbols.size())
+    fatal(toString(this) + ": invalid symbol index");
+  const typename ELFT::Sym &sym = symbols[sec.sh_info];
+  StringRef signature = CHECK(sym.getName(this->stringTable), this);
 
   // As a special case, if a symbol is a section symbol and has no name,
   // we use a section name as a signature.
@@ -315,12 +479,12 @@ StringRef ObjFile<ELFT>::getShtGroupSignature(ArrayRef<Elf_Shdr> Sections,
   // standard, but GNU gold 1.14 (the newest version as of July 2017) or
   // older produce such sections as outputs for the -r option, so we need
   // a bug-compatibility.
-  if (Signature.empty() && Sym->getType() == STT_SECTION)
-    return getSectionName(Sec);
-  return Signature;
+  if (signature.empty() && sym.getType() == STT_SECTION)
+    return getSectionName(sec);
+  return signature;
 }
 
-template <class ELFT> bool ObjFile<ELFT>::shouldMerge(const Elf_Shdr &Sec) {
+template <class ELFT> bool ObjFile<ELFT>::shouldMerge(const Elf_Shdr &sec) {
   // On a regular link we don't merge sections if -O0 (default is -O1). This
   // sometimes makes the linker significantly faster, although the output will
   // be bigger.
@@ -333,14 +497,14 @@ template <class ELFT> bool ObjFile<ELFT>::shouldMerge(const Elf_Shdr &Sec) {
   // SHF_MERGE sections based both on their name and sh_entsize, but that seems
   // to be more trouble than it is worth. Instead, we just use the regular (-O1)
   // logic for -r.
-  if (Config->Optimize == 0 && !Config->Relocatable)
+  if (config->optimize == 0 && !config->relocatable)
     return false;
 
   // A mergeable section with size 0 is useless because they don't have
   // any data to merge. A mergeable string section with size 0 can be
   // argued as invalid because it doesn't end with a null character.
   // We'll avoid a mess by handling them as if they were non-mergeable.
-  if (Sec.sh_size == 0)
+  if (sec.sh_size == 0)
     return false;
 
   // Check for sh_entsize. The ELF spec is not clear about the zero
@@ -348,17 +512,17 @@ template <class ELFT> bool ObjFile<ELFT>::shouldMerge(const Elf_Shdr &Sec) {
   // the section does not hold a table of fixed-size entries". We know
   // that Rust 1.13 produces a string mergeable section with a zero
   // sh_entsize. Here we just accept it rather than being picky about it.
-  uint64_t EntSize = Sec.sh_entsize;
-  if (EntSize == 0)
+  uint64_t entSize = sec.sh_entsize;
+  if (entSize == 0)
     return false;
-  if (Sec.sh_size % EntSize)
+  if (sec.sh_size % entSize)
     fatal(toString(this) +
           ": SHF_MERGE section size must be a multiple of sh_entsize");
 
-  uint64_t Flags = Sec.sh_flags;
-  if (!(Flags & SHF_MERGE))
+  uint64_t flags = sec.sh_flags;
+  if (!(flags & SHF_MERGE))
     return false;
-  if (Flags & SHF_WRITE)
+  if (flags & SHF_WRITE)
     fatal(toString(this) + ": writable SHF_MERGE section is not supported");
 
   return true;
@@ -374,126 +538,138 @@ template <class ELFT> bool ObjFile<ELFT>::shouldMerge(const Elf_Shdr &Sec) {
 // When the option is given, we link "just symbols". The section table is
 // initialized with null pointers.
 template <class ELFT> void ObjFile<ELFT>::initializeJustSymbols() {
-  ArrayRef<Elf_Shdr> ObjSections = CHECK(this->getObj().sections(), this);
-  this->Sections.resize(ObjSections.size());
+  ArrayRef<Elf_Shdr> sections = CHECK(this->getObj().sections(), this);
+  this->sections.resize(sections.size());
+}
 
-  for (const Elf_Shdr &Sec : ObjSections) {
-    if (Sec.sh_type != SHT_SYMTAB)
-      continue;
-    this->initSymtab(ObjSections, &Sec);
+// An ELF object file may contain a `.deplibs` section. If it exists, the
+// section contains a list of library specifiers such as `m` for libm. This
+// function resolves a given name by finding the first matching library checking
+// the various ways that a library can be specified to LLD. This ELF extension
+// is a form of autolinking and is called `dependent libraries`. It is currently
+// unique to LLVM and lld.
+static void addDependentLibrary(StringRef specifier, const InputFile *f) {
+  if (!config->dependentLibraries)
     return;
-  }
+  if (fs::exists(specifier))
+    driver->addFile(specifier, /*withLOption=*/false);
+  else if (Optional<std::string> s = findFromSearchPaths(specifier))
+    driver->addFile(*s, /*withLOption=*/true);
+  else if (Optional<std::string> s = searchLibraryBaseName(specifier))
+    driver->addFile(*s, /*withLOption=*/true);
+  else
+    error(toString(f) +
+          ": unable to find library from dependent library specifier: " +
+          specifier);
 }
 
 template <class ELFT>
-void ObjFile<ELFT>::initializeSections(
-    DenseSet<CachedHashStringRef> &ComdatGroups) {
-  const ELFFile<ELFT> &Obj = this->getObj();
+void ObjFile<ELFT>::initializeSections(bool ignoreComdats) {
+  const ELFFile<ELFT> &obj = this->getObj();
 
-  ArrayRef<Elf_Shdr> ObjSections = CHECK(Obj.sections(), this);
-  uint64_t Size = ObjSections.size();
-  this->Sections.resize(Size);
-  this->SectionStringTable =
-      CHECK(Obj.getSectionStringTable(ObjSections), this);
+  ArrayRef<Elf_Shdr> objSections = CHECK(obj.sections(), this);
+  uint64_t size = objSections.size();
+  this->sections.resize(size);
+  this->sectionStringTable =
+      CHECK(obj.getSectionStringTable(objSections), this);
 
-  for (size_t I = 0, E = ObjSections.size(); I < E; I++) {
-    if (this->Sections[I] == &InputSection::Discarded)
+  for (size_t i = 0, e = objSections.size(); i < e; i++) {
+    if (this->sections[i] == &InputSection::discarded)
       continue;
-    const Elf_Shdr &Sec = ObjSections[I];
+    const Elf_Shdr &sec = objSections[i];
 
-    if (Sec.sh_type == ELF::SHT_LLVM_CALL_GRAPH_PROFILE)
-      CGProfile = check(
-          this->getObj().template getSectionContentsAsArray<Elf_CGProfile>(
-              &Sec));
+    if (sec.sh_type == ELF::SHT_LLVM_CALL_GRAPH_PROFILE)
+      cgProfile =
+          check(obj.template getSectionContentsAsArray<Elf_CGProfile>(&sec));
 
     // SHF_EXCLUDE'ed sections are discarded by the linker. However,
     // if -r is given, we'll let the final link discard such sections.
     // This is compatible with GNU.
-    if ((Sec.sh_flags & SHF_EXCLUDE) && !Config->Relocatable) {
-      if (Sec.sh_type == SHT_LLVM_ADDRSIG) {
+    if ((sec.sh_flags & SHF_EXCLUDE) && !config->relocatable) {
+      if (sec.sh_type == SHT_LLVM_ADDRSIG) {
         // We ignore the address-significance table if we know that the object
         // file was created by objcopy or ld -r. This is because these tools
         // will reorder the symbols in the symbol table, invalidating the data
         // in the address-significance table, which refers to symbols by index.
-        if (Sec.sh_link != 0)
-          this->AddrsigSec = &Sec;
-        else if (Config->ICF == ICFLevel::Safe)
+        if (sec.sh_link != 0)
+          this->addrsigSec = &sec;
+        else if (config->icf == ICFLevel::Safe)
           warn(toString(this) + ": --icf=safe is incompatible with object "
                                 "files created using objcopy or ld -r");
       }
-      this->Sections[I] = &InputSection::Discarded;
+      this->sections[i] = &InputSection::discarded;
       continue;
     }
 
-    switch (Sec.sh_type) {
+    switch (sec.sh_type) {
     case SHT_GROUP: {
       // De-duplicate section groups by their signatures.
-      StringRef Signature = getShtGroupSignature(ObjSections, Sec);
-      this->Sections[I] = &InputSection::Discarded;
+      StringRef signature = getShtGroupSignature(objSections, sec);
+      this->sections[i] = &InputSection::discarded;
 
 
-      ArrayRef<Elf_Word> Entries =
-          CHECK(Obj.template getSectionContentsAsArray<Elf_Word>(&Sec), this);
-      if (Entries.empty())
+      ArrayRef<Elf_Word> entries =
+          CHECK(obj.template getSectionContentsAsArray<Elf_Word>(&sec), this);
+      if (entries.empty())
         fatal(toString(this) + ": empty SHT_GROUP");
 
       // The first word of a SHT_GROUP section contains flags. Currently,
       // the standard defines only "GRP_COMDAT" flag for the COMDAT group.
       // An group with the empty flag doesn't define anything; such sections
       // are just skipped.
-      if (Entries[0] == 0)
+      if (entries[0] == 0)
         continue;
 
-      if (Entries[0] != GRP_COMDAT)
+      if (entries[0] != GRP_COMDAT)
         fatal(toString(this) + ": unsupported SHT_GROUP format");
 
-      bool IsNew = ComdatGroups.insert(CachedHashStringRef(Signature)).second;
-      if (IsNew) {
-        if (Config->Relocatable)
-          this->Sections[I] = createInputSection(Sec);
-	continue;
+      bool isNew =
+          ignoreComdats ||
+          symtab->comdatGroups.try_emplace(CachedHashStringRef(signature), this)
+              .second;
+      if (isNew) {
+        if (config->relocatable)
+          this->sections[i] = createInputSection(sec);
+        continue;
       }
 
-
       // Otherwise, discard group members.
-      for (uint32_t SecIndex : Entries.slice(1)) {
-        if (SecIndex >= Size)
+      for (uint32_t secIndex : entries.slice(1)) {
+        if (secIndex >= size)
           fatal(toString(this) +
-                ": invalid section index in group: " + Twine(SecIndex));
-        this->Sections[SecIndex] = &InputSection::Discarded;
+                ": invalid section index in group: " + Twine(secIndex));
+        this->sections[secIndex] = &InputSection::discarded;
       }
       break;
     }
+    case SHT_SYMTAB_SHNDX:
+      shndxTable = CHECK(obj.getSHNDXTable(sec, objSections), this);
+      break;
     case SHT_SYMTAB:
-      this->initSymtab(ObjSections, &Sec);
-      break;
-    case SHT_SYMTAB_SHNDX:
-      this->SymtabSHNDX = CHECK(Obj.getSHNDXTable(Sec, ObjSections), this);
-      break;
     case SHT_STRTAB:
     case SHT_NULL:
       break;
     default:
-      this->Sections[I] = createInputSection(Sec);
+      this->sections[i] = createInputSection(sec);
     }
 
     // .ARM.exidx sections have a reverse dependency on the InputSection they
     // have a SHF_LINK_ORDER dependency, this is identified by the sh_link.
-    if (Sec.sh_flags & SHF_LINK_ORDER) {
-      InputSectionBase *LinkSec = nullptr;
-      if (Sec.sh_link < this->Sections.size())
-        LinkSec = this->Sections[Sec.sh_link];
-      if (!LinkSec)
+    if (sec.sh_flags & SHF_LINK_ORDER) {
+      InputSectionBase *linkSec = nullptr;
+      if (sec.sh_link < this->sections.size())
+        linkSec = this->sections[sec.sh_link];
+      if (!linkSec)
         fatal(toString(this) +
-              ": invalid sh_link index: " + Twine(Sec.sh_link));
+              ": invalid sh_link index: " + Twine(sec.sh_link));
 
-      InputSection *IS = cast<InputSection>(this->Sections[I]);
-      LinkSec->DependentSections.push_back(IS);
-      if (!isa<InputSection>(LinkSec))
-        error("a section " + IS->Name +
+      InputSection *isec = cast<InputSection>(this->sections[i]);
+      linkSec->dependentSections.push_back(isec);
+      if (!isa<InputSection>(linkSec))
+        error("a section " + isec->name +
               " with SHF_LINK_ORDER should not refer a non-regular "
               "section: " +
-              toString(LinkSec));
+              toString(linkSec));
     }
   }
 }
@@ -501,9 +677,9 @@ void ObjFile<ELFT>::initializeSections(
 // For ARM only, to set the EF_ARM_ABI_FLOAT_SOFT or EF_ARM_ABI_FLOAT_HARD
 // flag in the ELF Header we need to look at Tag_ABI_VFP_args to find out how
 // the input objects have been compiled.
-static void updateARMVFPArgs(const ARMAttributeParser &Attributes,
-                             const InputFile *F) {
-  if (!Attributes.hasAttribute(ARMBuildAttrs::ABI_VFP_args))
+static void updateARMVFPArgs(const ARMAttributeParser &attributes,
+                             const InputFile *f) {
+  if (!attributes.hasAttribute(ARMBuildAttrs::ABI_VFP_args))
     // If an ABI tag isn't present then it is implicitly given the value of 0
     // which maps to ARMBuildAttrs::BaseAAPCS. However many assembler files,
     // including some in glibc that don't use FP args (and should have value 3)
@@ -511,31 +687,31 @@ static void updateARMVFPArgs(const ARMAttributeParser &Attributes,
     // as a clash.
     return;
 
-  unsigned VFPArgs = Attributes.getAttributeValue(ARMBuildAttrs::ABI_VFP_args);
-  ARMVFPArgKind Arg;
-  switch (VFPArgs) {
+  unsigned vfpArgs = attributes.getAttributeValue(ARMBuildAttrs::ABI_VFP_args);
+  ARMVFPArgKind arg;
+  switch (vfpArgs) {
   case ARMBuildAttrs::BaseAAPCS:
-    Arg = ARMVFPArgKind::Base;
+    arg = ARMVFPArgKind::Base;
     break;
   case ARMBuildAttrs::HardFPAAPCS:
-    Arg = ARMVFPArgKind::VFP;
+    arg = ARMVFPArgKind::VFP;
     break;
   case ARMBuildAttrs::ToolChainFPPCS:
     // Tool chain specific convention that conforms to neither AAPCS variant.
-    Arg = ARMVFPArgKind::ToolChain;
+    arg = ARMVFPArgKind::ToolChain;
     break;
   case ARMBuildAttrs::CompatibleFPAAPCS:
     // Object compatible with all conventions.
     return;
   default:
-    error(toString(F) + ": unknown Tag_ABI_VFP_args value: " + Twine(VFPArgs));
+    error(toString(f) + ": unknown Tag_ABI_VFP_args value: " + Twine(vfpArgs));
     return;
   }
   // Follow ld.bfd and error if there is a mix of calling conventions.
-  if (Config->ARMVFPArgs != Arg && Config->ARMVFPArgs != ARMVFPArgKind::Default)
-    error(toString(F) + ": incompatible Tag_ABI_VFP_args");
+  if (config->armVFPArgs != arg && config->armVFPArgs != ARMVFPArgKind::Default)
+    error(toString(f) + ": incompatible Tag_ABI_VFP_args");
   else
-    Config->ARMVFPArgs = Arg;
+    config->armVFPArgs = arg;
 }
 
 // The ARM support in lld makes some use of instructions that are not available
@@ -547,11 +723,11 @@ static void updateARMVFPArgs(const ARMAttributeParser &Attributes,
 // at compile time. We follow the convention that if at least one input object
 // is compiled with an architecture that supports these features then lld is
 // permitted to use them.
-static void updateSupportedARMFeatures(const ARMAttributeParser &Attributes) {
-  if (!Attributes.hasAttribute(ARMBuildAttrs::CPU_arch))
+static void updateSupportedARMFeatures(const ARMAttributeParser &attributes) {
+  if (!attributes.hasAttribute(ARMBuildAttrs::CPU_arch))
     return;
-  auto Arch = Attributes.getAttributeValue(ARMBuildAttrs::CPU_arch);
-  switch (Arch) {
+  auto arch = attributes.getAttributeValue(ARMBuildAttrs::CPU_arch);
+  switch (arch) {
   case ARMBuildAttrs::Pre_v4:
   case ARMBuildAttrs::v4:
   case ARMBuildAttrs::v4T:
@@ -563,70 +739,156 @@ static void updateSupportedARMFeatures(const ARMAttributeParser &Attributes) {
   case ARMBuildAttrs::v6:
   case ARMBuildAttrs::v6KZ:
   case ARMBuildAttrs::v6K:
-    Config->ARMHasBlx = true;
+    config->armHasBlx = true;
     // Architectures used in pre-Cortex processors do not support
     // The J1 = 1 J2 = 1 Thumb branch range extension, with the exception
     // of Architecture v6T2 (arm1156t2-s and arm1156t2f-s) that do.
     break;
   default:
     // All other Architectures have BLX and extended branch encoding
-    Config->ARMHasBlx = true;
-    Config->ARMJ1J2BranchEncoding = true;
-    if (Arch != ARMBuildAttrs::v6_M && Arch != ARMBuildAttrs::v6S_M)
+    config->armHasBlx = true;
+    config->armJ1J2BranchEncoding = true;
+    if (arch != ARMBuildAttrs::v6_M && arch != ARMBuildAttrs::v6S_M)
       // All Architectures used in Cortex processors with the exception
       // of v6-M and v6S-M have the MOVT and MOVW instructions.
-      Config->ARMHasMovtMovw = true;
+      config->armHasMovtMovw = true;
     break;
   }
 }
 
+// If a source file is compiled with x86 hardware-assisted call flow control
+// enabled, the generated object file contains feature flags indicating that
+// fact. This function reads the feature flags and returns it.
+//
+// Essentially we want to read a single 32-bit value in this function, but this
+// function is rather complicated because the value is buried deep inside a
+// .note.gnu.property section.
+//
+// The section consists of one or more NOTE records. Each NOTE record consists
+// of zero or more type-length-value fields. We want to find a field of a
+// certain type. It seems a bit too much to just store a 32-bit value, perhaps
+// the ABI is unnecessarily complicated.
 template <class ELFT>
-InputSectionBase *ObjFile<ELFT>::getRelocTarget(const Elf_Shdr &Sec) {
-  uint32_t Idx = Sec.sh_info;
-  if (Idx >= this->Sections.size())
-    fatal(toString(this) + ": invalid relocated section index: " + Twine(Idx));
-  InputSectionBase *Target = this->Sections[Idx];
+static uint32_t readAndFeatures(ObjFile<ELFT> *obj, ArrayRef<uint8_t> data) {
+  using Elf_Nhdr = typename ELFT::Nhdr;
+  using Elf_Note = typename ELFT::Note;
+
+  uint32_t featuresSet = 0;
+  while (!data.empty()) {
+    // Read one NOTE record.
+    if (data.size() < sizeof(Elf_Nhdr))
+      fatal(toString(obj) + ": .note.gnu.property: section too short");
+
+    auto *nhdr = reinterpret_cast<const Elf_Nhdr *>(data.data());
+    if (data.size() < nhdr->getSize())
+      fatal(toString(obj) + ": .note.gnu.property: section too short");
+
+    Elf_Note note(*nhdr);
+    if (nhdr->n_type != NT_GNU_PROPERTY_TYPE_0 || note.getName() != "GNU") {
+      data = data.slice(nhdr->getSize());
+      continue;
+    }
+
+    uint32_t featureAndType = config->emachine == EM_AARCH64
+                                  ? GNU_PROPERTY_AARCH64_FEATURE_1_AND
+                                  : GNU_PROPERTY_X86_FEATURE_1_AND;
+
+    // Read a body of a NOTE record, which consists of type-length-value fields.
+    ArrayRef<uint8_t> desc = note.getDesc();
+    while (!desc.empty()) {
+      if (desc.size() < 8)
+        fatal(toString(obj) + ": .note.gnu.property: section too short");
+
+      uint32_t type = read32le(desc.data());
+      uint32_t size = read32le(desc.data() + 4);
+
+      if (type == featureAndType) {
+        // We found a FEATURE_1_AND field. There may be more than one of these
+        // in a .note.gnu.propery section, for a relocatable object we
+        // accumulate the bits set.
+        featuresSet |= read32le(desc.data() + 8);
+      }
+
+      // On 64-bit, a payload may be followed by a 4-byte padding to make its
+      // size a multiple of 8.
+      if (ELFT::Is64Bits)
+        size = alignTo(size, 8);
+
+      desc = desc.slice(size + 8); // +8 for Type and Size
+    }
+
+    // Go to next NOTE record to look for more FEATURE_1_AND descriptions.
+    data = data.slice(nhdr->getSize());
+  }
+
+  return featuresSet;
+}
+
+template <class ELFT>
+InputSectionBase *ObjFile<ELFT>::getRelocTarget(const Elf_Shdr &sec) {
+  uint32_t idx = sec.sh_info;
+  if (idx >= this->sections.size())
+    fatal(toString(this) + ": invalid relocated section index: " + Twine(idx));
+  InputSectionBase *target = this->sections[idx];
 
   // Strictly speaking, a relocation section must be included in the
   // group of the section it relocates. However, LLVM 3.3 and earlier
   // would fail to do so, so we gracefully handle that case.
-  if (Target == &InputSection::Discarded)
+  if (target == &InputSection::discarded)
     return nullptr;
 
-  if (!Target)
+  if (!target)
     fatal(toString(this) + ": unsupported relocation reference");
-  return Target;
+  return target;
 }
 
 // Create a regular InputSection class that has the same contents
 // as a given section.
-static InputSection *toRegularSection(MergeInputSection *Sec) {
-  return make<InputSection>(Sec->File, Sec->Flags, Sec->Type, Sec->Alignment,
-                            Sec->data(), Sec->Name);
+static InputSection *toRegularSection(MergeInputSection *sec) {
+  return make<InputSection>(sec->file, sec->flags, sec->type, sec->alignment,
+                            sec->data(), sec->name);
 }
 
 template <class ELFT>
-InputSectionBase *ObjFile<ELFT>::createInputSection(const Elf_Shdr &Sec) {
-  StringRef Name = getSectionName(Sec);
+InputSectionBase *ObjFile<ELFT>::createInputSection(const Elf_Shdr &sec) {
+  StringRef name = getSectionName(sec);
 
-  switch (Sec.sh_type) {
+  switch (sec.sh_type) {
   case SHT_ARM_ATTRIBUTES: {
-    if (Config->EMachine != EM_ARM)
+    if (config->emachine != EM_ARM)
       break;
-    ARMAttributeParser Attributes;
-    ArrayRef<uint8_t> Contents = check(this->getObj().getSectionContents(&Sec));
-    Attributes.Parse(Contents, /*isLittle*/ Config->EKind == ELF32LEKind);
-    updateSupportedARMFeatures(Attributes);
-    updateARMVFPArgs(Attributes, this);
+    ARMAttributeParser attributes;
+    ArrayRef<uint8_t> contents = check(this->getObj().getSectionContents(&sec));
+    attributes.Parse(contents, /*isLittle*/ config->ekind == ELF32LEKind);
+    updateSupportedARMFeatures(attributes);
+    updateARMVFPArgs(attributes, this);
 
     // FIXME: Retain the first attribute section we see. The eglibc ARM
     // dynamic loaders require the presence of an attribute section for dlopen
     // to work. In a full implementation we would merge all attribute sections.
-    if (In.ARMAttributes == nullptr) {
-      In.ARMAttributes = make<InputSection>(*this, Sec, Name);
-      return In.ARMAttributes;
+    if (in.armAttributes == nullptr) {
+      in.armAttributes = make<InputSection>(*this, sec, name);
+      return in.armAttributes;
     }
-    return &InputSection::Discarded;
+    return &InputSection::discarded;
+  }
+  case SHT_LLVM_DEPENDENT_LIBRARIES: {
+    if (config->relocatable)
+      break;
+    ArrayRef<char> data =
+        CHECK(this->getObj().template getSectionContentsAsArray<char>(&sec), this);
+    if (!data.empty() && data.back() != '\0') {
+      error(toString(this) +
+            ": corrupted dependent libraries section (unterminated string): " +
+            name);
+      return &InputSection::discarded;
+    }
+    for (const char *d = data.begin(), *e = data.end(); d < e;) {
+      StringRef s(d);
+      addDependentLibrary(s, this);
+      d += s.size() + 1;
+    }
+    return &InputSection::discarded;
   }
   case SHT_RELA:
   case SHT_REL: {
@@ -635,25 +897,25 @@ InputSectionBase *ObjFile<ELFT>::createInputSection(const Elf_Shdr &Sec) {
     // and the group is discarded, even though it's a violation of the
     // spec. We handle that situation gracefully by discarding dangling
     // relocation sections.
-    InputSectionBase *Target = getRelocTarget(Sec);
-    if (!Target)
+    InputSectionBase *target = getRelocTarget(sec);
+    if (!target)
       return nullptr;
 
     // This section contains relocation information.
     // If -r is given, we do not interpret or apply relocation
     // but just copy relocation sections to output.
-    if (Config->Relocatable) {
-      InputSection *RelocSec = make<InputSection>(*this, Sec, Name);
+    if (config->relocatable) {
+      InputSection *relocSec = make<InputSection>(*this, sec, name);
       // We want to add a dependency to target, similar like we do for
       // -emit-relocs below. This is useful for the case when linker script
       // contains the "/DISCARD/". It is perhaps uncommon to use a script with
       // -r, but we faced it in the Linux kernel and have to handle such case
       // and not to crash.
-      Target->DependentSections.push_back(RelocSec);
-      return RelocSec;
+      target->dependentSections.push_back(relocSec);
+      return relocSec;
     }
 
-    if (Target->FirstRelocation)
+    if (target->firstRelocation)
       fatal(toString(this) +
             ": multiple relocation sections to one section are not supported");
 
@@ -662,33 +924,33 @@ InputSectionBase *ObjFile<ELFT>::createInputSection(const Elf_Shdr &Sec) {
     // because applying relocations at end of linking changes section
     // contents. So, we simply handle such sections as non-mergeable ones.
     // Degrading like this is acceptable because section merging is optional.
-    if (auto *MS = dyn_cast<MergeInputSection>(Target)) {
-      Target = toRegularSection(MS);
-      this->Sections[Sec.sh_info] = Target;
+    if (auto *ms = dyn_cast<MergeInputSection>(target)) {
+      target = toRegularSection(ms);
+      this->sections[sec.sh_info] = target;
     }
 
-    if (Sec.sh_type == SHT_RELA) {
-      ArrayRef<Elf_Rela> Rels = CHECK(this->getObj().relas(&Sec), this);
-      Target->FirstRelocation = Rels.begin();
-      Target->NumRelocations = Rels.size();
-      Target->AreRelocsRela = true;
+    if (sec.sh_type == SHT_RELA) {
+      ArrayRef<Elf_Rela> rels = CHECK(getObj().relas(&sec), this);
+      target->firstRelocation = rels.begin();
+      target->numRelocations = rels.size();
+      target->areRelocsRela = true;
     } else {
-      ArrayRef<Elf_Rel> Rels = CHECK(this->getObj().rels(&Sec), this);
-      Target->FirstRelocation = Rels.begin();
-      Target->NumRelocations = Rels.size();
-      Target->AreRelocsRela = false;
+      ArrayRef<Elf_Rel> rels = CHECK(getObj().rels(&sec), this);
+      target->firstRelocation = rels.begin();
+      target->numRelocations = rels.size();
+      target->areRelocsRela = false;
     }
-    assert(isUInt<31>(Target->NumRelocations));
+    assert(isUInt<31>(target->numRelocations));
 
     // Relocation sections processed by the linker are usually removed
     // from the output, so returning `nullptr` for the normal case.
     // However, if -emit-relocs is given, we need to leave them in the output.
     // (Some post link analysis tools need this information.)
-    if (Config->EmitRelocs) {
-      InputSection *RelocSec = make<InputSection>(*this, Sec, Name);
+    if (config->emitRelocs) {
+      InputSection *relocSec = make<InputSection>(*this, sec, name);
       // We will not emit relocation section if target was discarded.
-      Target->DependentSections.push_back(RelocSec);
-      return RelocSec;
+      target->dependentSections.push_back(relocSec);
+      return relocSec;
     }
     return nullptr;
   }
@@ -707,28 +969,42 @@ InputSectionBase *ObjFile<ELFT>::createInputSection(const Elf_Shdr &Sec) {
   // explicitly told to do otherwise (by -z execstack). Because the stack
   // executable-ness is controlled solely by command line options,
   // .note.GNU-stack sections are simply ignored.
-  if (Name == ".note.GNU-stack")
-    return &InputSection::Discarded;
+  if (name == ".note.GNU-stack")
+    return &InputSection::discarded;
+
+  // Object files that use processor features such as Intel Control-Flow
+  // Enforcement (CET) or AArch64 Branch Target Identification BTI, use a
+  // .note.gnu.property section containing a bitfield of feature bits like the
+  // GNU_PROPERTY_X86_FEATURE_1_IBT flag. Read a bitmap containing the flag.
+  //
+  // Since we merge bitmaps from multiple object files to create a new
+  // .note.gnu.property containing a single AND'ed bitmap, we discard an input
+  // file's .note.gnu.property section.
+  if (name == ".note.gnu.property") {
+    ArrayRef<uint8_t> contents = check(this->getObj().getSectionContents(&sec));
+    this->andFeatures = readAndFeatures(this, contents);
+    return &InputSection::discarded;
+  }
 
   // Split stacks is a feature to support a discontiguous stack,
   // commonly used in the programming language Go. For the details,
   // see https://gcc.gnu.org/wiki/SplitStacks. An object file compiled
   // for split stack will include a .note.GNU-split-stack section.
-  if (Name == ".note.GNU-split-stack") {
-    if (Config->Relocatable) {
+  if (name == ".note.GNU-split-stack") {
+    if (config->relocatable) {
       error("cannot mix split-stack and non-split-stack in a relocatable link");
-      return &InputSection::Discarded;
+      return &InputSection::discarded;
     }
-    this->SplitStack = true;
-    return &InputSection::Discarded;
+    this->splitStack = true;
+    return &InputSection::discarded;
   }
 
   // An object file cmpiled for split stack, but where some of the
   // functions were compiled with the no_split_stack_attribute will
   // include a .note.GNU-no-split-stack section.
-  if (Name == ".note.GNU-no-split-stack") {
-    this->SomeNoSplitStack = true;
-    return &InputSection::Discarded;
+  if (name == ".note.GNU-no-split-stack") {
+    this->someNoSplitStack = true;
+    return &InputSection::discarded;
   }
 
   // The linkonce feature is a sort of proto-comdat. Some glibc i386 object
@@ -736,246 +1012,205 @@ InputSectionBase *ObjFile<ELFT>::createInputSection(const Elf_Shdr &Sec) {
   // sections. Drop those sections to avoid duplicate symbol errors.
   // FIXME: This is glibc PR20543, we should remove this hack once that has been
   // fixed for a while.
-  if (Name == ".gnu.linkonce.t.__x86.get_pc_thunk.bx" ||
-      Name == ".gnu.linkonce.t.__i686.get_pc_thunk.bx")
-    return &InputSection::Discarded;
+  if (name == ".gnu.linkonce.t.__x86.get_pc_thunk.bx" ||
+      name == ".gnu.linkonce.t.__i686.get_pc_thunk.bx")
+    return &InputSection::discarded;
 
   // If we are creating a new .build-id section, strip existing .build-id
   // sections so that the output won't have more than one .build-id.
   // This is not usually a problem because input object files normally don't
   // have .build-id sections, but you can create such files by
   // "ld.{bfd,gold,lld} -r --build-id", and we want to guard against it.
-  if (Name == ".note.gnu.build-id" && Config->BuildId != BuildIdKind::None)
-    return &InputSection::Discarded;
+  if (name == ".note.gnu.build-id" && config->buildId != BuildIdKind::None)
+    return &InputSection::discarded;
 
   // The linker merges EH (exception handling) frames and creates a
   // .eh_frame_hdr section for runtime. So we handle them with a special
   // class. For relocatable outputs, they are just passed through.
-  if (Name == ".eh_frame" && !Config->Relocatable)
-    return make<EhInputSection>(*this, Sec, Name);
+  if (name == ".eh_frame" && !config->relocatable)
+    return make<EhInputSection>(*this, sec, name);
 
-  if (shouldMerge(Sec))
-    return make<MergeInputSection>(*this, Sec, Name);
-  return make<InputSection>(*this, Sec, Name);
+  if (shouldMerge(sec))
+    return make<MergeInputSection>(*this, sec, name);
+  return make<InputSection>(*this, sec, name);
 }
 
 template <class ELFT>
-StringRef ObjFile<ELFT>::getSectionName(const Elf_Shdr &Sec) {
-  return CHECK(this->getObj().getSectionName(&Sec, SectionStringTable), this);
+StringRef ObjFile<ELFT>::getSectionName(const Elf_Shdr &sec) {
+  return CHECK(getObj().getSectionName(&sec, sectionStringTable), this);
 }
 
+// Initialize this->Symbols. this->Symbols is a parallel array as
+// its corresponding ELF symbol table.
 template <class ELFT> void ObjFile<ELFT>::initializeSymbols() {
-  this->Symbols.reserve(this->ELFSyms.size());
-  for (const Elf_Sym &Sym : this->ELFSyms)
-    this->Symbols.push_back(createSymbol(&Sym));
-}
+  ArrayRef<Elf_Sym> eSyms = this->getELFSyms<ELFT>();
+  this->symbols.resize(eSyms.size());
 
-template <class ELFT> Symbol *ObjFile<ELFT>::createSymbol(const Elf_Sym *Sym) {
-  int Binding = Sym->getBinding();
+  // Our symbol table may have already been partially initialized
+  // because of LazyObjFile.
+  for (size_t i = 0, end = eSyms.size(); i != end; ++i)
+    if (!this->symbols[i] && eSyms[i].getBinding() != STB_LOCAL)
+      this->symbols[i] =
+          symtab->insert(CHECK(eSyms[i].getName(this->stringTable), this));
 
-  uint32_t SecIdx = this->getSectionIndex(*Sym);
-  if (SecIdx >= this->Sections.size())
-    fatal(toString(this) + ": invalid section index: " + Twine(SecIdx));
+  // Fill this->Symbols. A symbol is either local or global.
+  for (size_t i = 0, end = eSyms.size(); i != end; ++i) {
+    const Elf_Sym &eSym = eSyms[i];
 
-  InputSectionBase *Sec = this->Sections[SecIdx];
-  uint8_t StOther = Sym->st_other;
-  uint8_t Type = Sym->getType();
-  uint64_t Value = Sym->st_value;
-  uint64_t Size = Sym->st_size;
+    // Read symbol attributes.
+    uint32_t secIdx = getSectionIndex(eSym);
+    if (secIdx >= this->sections.size())
+      fatal(toString(this) + ": invalid section index: " + Twine(secIdx));
 
-  if (Binding == STB_LOCAL) {
-    if (Sym->getType() == STT_FILE)
-      SourceFile = CHECK(Sym->getName(this->StringTable), this);
+    InputSectionBase *sec = this->sections[secIdx];
+    uint8_t binding = eSym.getBinding();
+    uint8_t stOther = eSym.st_other;
+    uint8_t type = eSym.getType();
+    uint64_t value = eSym.st_value;
+    uint64_t size = eSym.st_size;
+    StringRefZ name = this->stringTable.data() + eSym.st_name;
 
-    if (this->StringTable.size() <= Sym->st_name)
-      fatal(toString(this) + ": invalid symbol name offset");
+    // Handle local symbols. Local symbols are not added to the symbol
+    // table because they are not visible from other object files. We
+    // allocate symbol instances and add their pointers to Symbols.
+    if (binding == STB_LOCAL) {
+      if (eSym.getType() == STT_FILE)
+        sourceFile = CHECK(eSym.getName(this->stringTable), this);
 
-    StringRefZ Name = this->StringTable.data() + Sym->st_name;
-    if (Sym->st_shndx == SHN_UNDEF)
-      return make<Undefined>(this, Name, Binding, StOther, Type);
+      if (this->stringTable.size() <= eSym.st_name)
+        fatal(toString(this) + ": invalid symbol name offset");
 
-    return make<Defined>(this, Name, Binding, StOther, Type, Value, Size, Sec);
-  }
+      if (eSym.st_shndx == SHN_UNDEF)
+        this->symbols[i] = make<Undefined>(this, name, binding, stOther, type);
+      else if (sec == &InputSection::discarded)
+        this->symbols[i] = make<Undefined>(this, name, binding, stOther, type,
+                                           /*DiscardedSecIdx=*/secIdx);
+      else
+        this->symbols[i] =
+            make<Defined>(this, name, binding, stOther, type, value, size, sec);
+      continue;
+    }
 
-  StringRef Name = CHECK(Sym->getName(this->StringTable), this);
+    // Handle global undefined symbols.
+    if (eSym.st_shndx == SHN_UNDEF) {
+      this->symbols[i]->resolve(Undefined{this, name, binding, stOther, type});
+      continue;
+    }
 
-  switch (Sym->st_shndx) {
-  case SHN_UNDEF:
-    return Symtab->addUndefined<ELFT>(Name, Binding, StOther, Type,
-                                      /*CanOmitFromDynSym=*/false, this);
-  case SHN_COMMON:
-    if (Value == 0 || Value >= UINT32_MAX)
-      fatal(toString(this) + ": common symbol '" + Name +
-            "' has invalid alignment: " + Twine(Value));
-    return Symtab->addCommon(Name, Size, Value, Binding, StOther, Type, *this);
-  }
+    // Handle global common symbols.
+    if (eSym.st_shndx == SHN_COMMON) {
+      if (value == 0 || value >= UINT32_MAX)
+        fatal(toString(this) + ": common symbol '" + StringRef(name.data) +
+              "' has invalid alignment: " + Twine(value));
+      this->symbols[i]->resolve(
+          CommonSymbol{this, name, binding, stOther, type, value, size});
+      continue;
+    }
+
+    // If a defined symbol is in a discarded section, handle it as if it
+    // were an undefined symbol. Such symbol doesn't comply with the
+    // standard, but in practice, a .eh_frame often directly refer
+    // COMDAT member sections, and if a comdat group is discarded, some
+    // defined symbol in a .eh_frame becomes dangling symbols.
+    if (sec == &InputSection::discarded) {
+      this->symbols[i]->resolve(
+          Undefined{this, name, binding, stOther, type, secIdx});
+      continue;
+    }
+
+    // Handle global defined symbols.
+    if (binding == STB_GLOBAL || binding == STB_WEAK ||
+        binding == STB_GNU_UNIQUE) {
+      this->symbols[i]->resolve(
+          Defined{this, name, binding, stOther, type, value, size, sec});
+      continue;
+    }
 
-  switch (Binding) {
-  default:
-    fatal(toString(this) + ": unexpected binding: " + Twine(Binding));
-  case STB_GLOBAL:
-  case STB_WEAK:
-  case STB_GNU_UNIQUE:
-    if (Sec == &InputSection::Discarded)
-      return Symtab->addUndefined<ELFT>(Name, Binding, StOther, Type,
-                                        /*CanOmitFromDynSym=*/false, this);
-    return Symtab->addDefined(Name, StOther, Type, Value, Size, Binding, Sec,
-                              this);
+    fatal(toString(this) + ": unexpected binding: " + Twine((int)binding));
   }
 }
 
-ArchiveFile::ArchiveFile(std::unique_ptr<Archive> &&File)
-    : InputFile(ArchiveKind, File->getMemoryBufferRef()),
-      File(std::move(File)) {}
+ArchiveFile::ArchiveFile(std::unique_ptr<Archive> &&file)
+    : InputFile(ArchiveKind, file->getMemoryBufferRef()),
+      file(std::move(file)) {}
 
-template <class ELFT> void ArchiveFile::parse() {
-  for (const Archive::Symbol &Sym : File->symbols())
-    Symtab->addLazyArchive<ELFT>(Sym.getName(), *this, Sym);
+void ArchiveFile::parse() {
+  for (const Archive::Symbol &sym : file->symbols())
+    symtab->addSymbol(LazyArchive{*this, sym});
 }
 
 // Returns a buffer pointing to a member file containing a given symbol.
-InputFile *ArchiveFile::fetch(const Archive::Symbol &Sym) {
-  Archive::Child C =
-      CHECK(Sym.getMember(), toString(this) +
+void ArchiveFile::fetch(const Archive::Symbol &sym) {
+  Archive::Child c =
+      CHECK(sym.getMember(), toString(this) +
                                  ": could not get the member for symbol " +
-                                 Sym.getName());
+                                 sym.getName());
 
-  if (!Seen.insert(C.getChildOffset()).second)
-    return nullptr;
+  if (!seen.insert(c.getChildOffset()).second)
+    return;
 
-  MemoryBufferRef MB =
-      CHECK(C.getMemoryBufferRef(),
+  MemoryBufferRef mb =
+      CHECK(c.getMemoryBufferRef(),
             toString(this) +
                 ": could not get the buffer for the member defining symbol " +
-                Sym.getName());
+                sym.getName());
 
-  if (Tar && C.getParent()->isThin())
-    Tar->append(relativeToRoot(CHECK(C.getFullName(), this)), MB.getBuffer());
+  if (tar && c.getParent()->isThin())
+    tar->append(relativeToRoot(CHECK(c.getFullName(), this)), mb.getBuffer());
 
-  InputFile *File = createObjectFile(
-      MB, getName(), C.getParent()->isThin() ? 0 : C.getChildOffset());
-  File->GroupId = GroupId;
-  return File;
+  InputFile *file = createObjectFile(
+      mb, getName(), c.getParent()->isThin() ? 0 : c.getChildOffset());
+  file->groupId = groupId;
+  parseFile(file);
 }
 
-template <class ELFT>
-SharedFile<ELFT>::SharedFile(MemoryBufferRef M, StringRef DefaultSoName)
-    : ELFFileBase<ELFT>(Base::SharedKind, M), SoName(DefaultSoName),
-      IsNeeded(!Config->AsNeeded) {}
+unsigned SharedFile::vernauxNum;
 
-// Partially parse the shared object file so that we can call
-// getSoName on this object.
-template <class ELFT> void SharedFile<ELFT>::parseSoName() {
-  const Elf_Shdr *DynamicSec = nullptr;
-  const ELFFile<ELFT> Obj = this->getObj();
-  ArrayRef<Elf_Shdr> Sections = CHECK(Obj.sections(), this);
-
-  // Search for .dynsym, .dynamic, .symtab, .gnu.version and .gnu.version_d.
-  for (const Elf_Shdr &Sec : Sections) {
-    switch (Sec.sh_type) {
-    default:
-      continue;
-    case SHT_DYNSYM:
-      this->initSymtab(Sections, &Sec);
-      break;
-    case SHT_DYNAMIC:
-      DynamicSec = &Sec;
-      break;
-    case SHT_SYMTAB_SHNDX:
-      this->SymtabSHNDX = CHECK(Obj.getSHNDXTable(Sec, Sections), this);
-      break;
-    case SHT_GNU_versym:
-      this->VersymSec = &Sec;
-      break;
-    case SHT_GNU_verdef:
-      this->VerdefSec = &Sec;
-      break;
-    }
-  }
-
-  if (this->VersymSec && this->ELFSyms.empty())
-    error("SHT_GNU_versym should be associated with symbol table");
-
-  // Search for a DT_SONAME tag to initialize this->SoName.
-  if (!DynamicSec)
-    return;
-  ArrayRef<Elf_Dyn> Arr =
-      CHECK(Obj.template getSectionContentsAsArray<Elf_Dyn>(DynamicSec), this);
-  for (const Elf_Dyn &Dyn : Arr) {
-    if (Dyn.d_tag == DT_SONAME) {
-      uint64_t Val = Dyn.getVal();
-      if (Val >= this->StringTable.size())
-        fatal(toString(this) + ": invalid DT_SONAME entry");
-      SoName = this->StringTable.data() + Val;
-      return;
-    }
-  }
-}
-
-// Parses ".gnu.version" section which is a parallel array for the symbol table.
-// If a given file doesn't have ".gnu.version" section, returns VER_NDX_GLOBAL.
-template <class ELFT> std::vector<uint32_t> SharedFile<ELFT>::parseVersyms() {
-  size_t Size = this->ELFSyms.size() - this->FirstGlobal;
-  if (!VersymSec)
-    return std::vector<uint32_t>(Size, VER_NDX_GLOBAL);
-
-  const char *Base = this->MB.getBuffer().data();
-  const Elf_Versym *Versym =
-      reinterpret_cast<const Elf_Versym *>(Base + VersymSec->sh_offset) +
-      this->FirstGlobal;
-
-  std::vector<uint32_t> Ret(Size);
-  for (size_t I = 0; I < Size; ++I)
-    Ret[I] = Versym[I].vs_index;
-  return Ret;
-}
-
-// Parse the version definitions in the object file if present. Returns a vector
-// whose nth element contains a pointer to the Elf_Verdef for version identifier
-// n. Version identifiers that are not definitions map to nullptr.
-template <class ELFT>
-std::vector<const typename ELFT::Verdef *> SharedFile<ELFT>::parseVerdefs() {
-  if (!VerdefSec)
+// Parse the version definitions in the object file if present, and return a
+// vector whose nth element contains a pointer to the Elf_Verdef for version
+// identifier n. Version identifiers that are not definitions map to nullptr.
+template <typename ELFT>
+static std::vector<const void *> parseVerdefs(const uint8_t *base,
+                                              const typename ELFT::Shdr *sec) {
+  if (!sec)
     return {};
 
   // We cannot determine the largest verdef identifier without inspecting
   // every Elf_Verdef, but both bfd and gold assign verdef identifiers
   // sequentially starting from 1, so we predict that the largest identifier
-  // will be VerdefCount.
-  unsigned VerdefCount = VerdefSec->sh_info;
-  std::vector<const Elf_Verdef *> Verdefs(VerdefCount + 1);
+  // will be verdefCount.
+  unsigned verdefCount = sec->sh_info;
+  std::vector<const void *> verdefs(verdefCount + 1);
 
   // Build the Verdefs array by following the chain of Elf_Verdef objects
   // from the start of the .gnu.version_d section.
-  const char *Base = this->MB.getBuffer().data();
-  const char *Verdef = Base + VerdefSec->sh_offset;
-  for (unsigned I = 0; I != VerdefCount; ++I) {
-    auto *CurVerdef = reinterpret_cast<const Elf_Verdef *>(Verdef);
-    Verdef += CurVerdef->vd_next;
-    unsigned VerdefIndex = CurVerdef->vd_ndx;
-    Verdefs.resize(VerdefIndex + 1);
-    Verdefs[VerdefIndex] = CurVerdef;
+  const uint8_t *verdef = base + sec->sh_offset;
+  for (unsigned i = 0; i != verdefCount; ++i) {
+    auto *curVerdef = reinterpret_cast<const typename ELFT::Verdef *>(verdef);
+    verdef += curVerdef->vd_next;
+    unsigned verdefIndex = curVerdef->vd_ndx;
+    verdefs.resize(verdefIndex + 1);
+    verdefs[verdefIndex] = curVerdef;
   }
-
-  return Verdefs;
+  return verdefs;
 }
 
 // We do not usually care about alignments of data in shared object
 // files because the loader takes care of it. However, if we promote a
 // DSO symbol to point to .bss due to copy relocation, we need to keep
 // the original alignment requirements. We infer it in this function.
-template <class ELFT>
-uint32_t SharedFile<ELFT>::getAlignment(ArrayRef<Elf_Shdr> Sections,
-                                        const Elf_Sym &Sym) {
-  uint64_t Ret = UINT64_MAX;
-  if (Sym.st_value)
-    Ret = 1ULL << countTrailingZeros((uint64_t)Sym.st_value);
-  if (0 < Sym.st_shndx && Sym.st_shndx < Sections.size())
-    Ret = std::min<uint64_t>(Ret, Sections[Sym.st_shndx].sh_addralign);
-  return (Ret > UINT32_MAX) ? 0 : Ret;
+template <typename ELFT>
+static uint64_t getAlignment(ArrayRef<typename ELFT::Shdr> sections,
+                             const typename ELFT::Sym &sym) {
+  uint64_t ret = UINT64_MAX;
+  if (sym.st_value)
+    ret = 1ULL << countTrailingZeros((uint64_t)sym.st_value);
+  if (0 < sym.st_shndx && sym.st_shndx < sections.size())
+    ret = std::min<uint64_t>(ret, sections[sym.st_shndx].sh_addralign);
+  return (ret > UINT32_MAX) ? 0 : ret;
 }
 
-// Fully parse the shared object file. This must be called after parseSoName().
+// Fully parse the shared object file.
 //
 // This function parses symbol versions. If a DSO has version information,
 // the file has a ".gnu.version_d" section which contains symbol version
@@ -990,80 +1225,163 @@ uint32_t SharedFile<ELFT>::getAlignment(ArrayRef<Elf_Shdr> Sections,
 // The file format for symbol versioning is perhaps a bit more complicated
 // than necessary, but you can easily understand the code if you wrap your
 // head around the data structure described above.
-template <class ELFT> void SharedFile<ELFT>::parseRest() {
-  Verdefs = parseVerdefs();                       // parse .gnu.version_d
-  std::vector<uint32_t> Versyms = parseVersyms(); // parse .gnu.version
-  ArrayRef<Elf_Shdr> Sections = CHECK(this->getObj().sections(), this);
+template <class ELFT> void SharedFile::parse() {
+  using Elf_Dyn = typename ELFT::Dyn;
+  using Elf_Shdr = typename ELFT::Shdr;
+  using Elf_Sym = typename ELFT::Sym;
+  using Elf_Verdef = typename ELFT::Verdef;
+  using Elf_Versym = typename ELFT::Versym;
+
+  ArrayRef<Elf_Dyn> dynamicTags;
+  const ELFFile<ELFT> obj = this->getObj<ELFT>();
+  ArrayRef<Elf_Shdr> sections = CHECK(obj.sections(), this);
+
+  const Elf_Shdr *versymSec = nullptr;
+  const Elf_Shdr *verdefSec = nullptr;
+
+  // Search for .dynsym, .dynamic, .symtab, .gnu.version and .gnu.version_d.
+  for (const Elf_Shdr &sec : sections) {
+    switch (sec.sh_type) {
+    default:
+      continue;
+    case SHT_DYNAMIC:
+      dynamicTags =
+          CHECK(obj.template getSectionContentsAsArray<Elf_Dyn>(&sec), this);
+      break;
+    case SHT_GNU_versym:
+      versymSec = &sec;
+      break;
+    case SHT_GNU_verdef:
+      verdefSec = &sec;
+      break;
+    }
+  }
+
+  if (versymSec && numELFSyms == 0) {
+    error("SHT_GNU_versym should be associated with symbol table");
+    return;
+  }
+
+  // Search for a DT_SONAME tag to initialize this->soName.
+  for (const Elf_Dyn &dyn : dynamicTags) {
+    if (dyn.d_tag == DT_NEEDED) {
+      uint64_t val = dyn.getVal();
+      if (val >= this->stringTable.size())
+        fatal(toString(this) + ": invalid DT_NEEDED entry");
+      dtNeeded.push_back(this->stringTable.data() + val);
+    } else if (dyn.d_tag == DT_SONAME) {
+      uint64_t val = dyn.getVal();
+      if (val >= this->stringTable.size())
+        fatal(toString(this) + ": invalid DT_SONAME entry");
+      soName = this->stringTable.data() + val;
+    }
+  }
+
+  // DSOs are uniquified not by filename but by soname.
+  DenseMap<StringRef, SharedFile *>::iterator it;
+  bool wasInserted;
+  std::tie(it, wasInserted) = symtab->soNames.try_emplace(soName, this);
+
+  // If a DSO appears more than once on the command line with and without
+  // --as-needed, --no-as-needed takes precedence over --as-needed because a
+  // user can add an extra DSO with --no-as-needed to force it to be added to
+  // the dependency list.
+  it->second->isNeeded |= isNeeded;
+  if (!wasInserted)
+    return;
+
+  sharedFiles.push_back(this);
+
+  verdefs = parseVerdefs<ELFT>(obj.base(), verdefSec);
+
+  // Parse ".gnu.version" section which is a parallel array for the symbol
+  // table. If a given file doesn't have a ".gnu.version" section, we use
+  // VER_NDX_GLOBAL.
+  size_t size = numELFSyms - firstGlobal;
+  std::vector<uint32_t> versyms(size, VER_NDX_GLOBAL);
+  if (versymSec) {
+    ArrayRef<Elf_Versym> versym =
+        CHECK(obj.template getSectionContentsAsArray<Elf_Versym>(versymSec),
+              this)
+            .slice(firstGlobal);
+    for (size_t i = 0; i < size; ++i)
+      versyms[i] = versym[i].vs_index;
+  }
 
   // System libraries can have a lot of symbols with versions. Using a
   // fixed buffer for computing the versions name (foo@ver) can save a
   // lot of allocations.
-  SmallString<0> VersionedNameBuffer;
+  SmallString<0> versionedNameBuffer;
 
   // Add symbols to the symbol table.
-  ArrayRef<Elf_Sym> Syms = this->getGlobalELFSyms();
-  for (size_t I = 0; I < Syms.size(); ++I) {
-    const Elf_Sym &Sym = Syms[I];
+  ArrayRef<Elf_Sym> syms = this->getGlobalELFSyms<ELFT>();
+  for (size_t i = 0; i < syms.size(); ++i) {
+    const Elf_Sym &sym = syms[i];
 
     // ELF spec requires that all local symbols precede weak or global
     // symbols in each symbol table, and the index of first non-local symbol
     // is stored to sh_info. If a local symbol appears after some non-local
     // symbol, that's a violation of the spec.
-    StringRef Name = CHECK(Sym.getName(this->StringTable), this);
-    if (Sym.getBinding() == STB_LOCAL) {
-      warn("found local symbol '" + Name +
+    StringRef name = CHECK(sym.getName(this->stringTable), this);
+    if (sym.getBinding() == STB_LOCAL) {
+      warn("found local symbol '" + name +
            "' in global part of symbol table in file " + toString(this));
       continue;
     }
 
-    if (Sym.isUndefined()) {
-      Symbol *S = Symtab->addUndefined<ELFT>(Name, Sym.getBinding(),
-                                             Sym.st_other, Sym.getType(),
-                                             /*CanOmitFromDynSym=*/false, this);
-      S->ExportDynamic = true;
+    if (sym.isUndefined()) {
+      Symbol *s = symtab->addSymbol(
+          Undefined{this, name, sym.getBinding(), sym.st_other, sym.getType()});
+      s->exportDynamic = true;
       continue;
     }
 
     // MIPS BFD linker puts _gp_disp symbol into DSO files and incorrectly
     // assigns VER_NDX_LOCAL to this section global symbol. Here is a
     // workaround for this bug.
-    uint32_t Idx = Versyms[I] & ~VERSYM_HIDDEN;
-    if (Config->EMachine == EM_MIPS && Idx == VER_NDX_LOCAL &&
-        Name == "_gp_disp")
+    uint32_t idx = versyms[i] & ~VERSYM_HIDDEN;
+    if (config->emachine == EM_MIPS && idx == VER_NDX_LOCAL &&
+        name == "_gp_disp")
       continue;
 
-    uint64_t Alignment = getAlignment(Sections, Sym);
-    if (!(Versyms[I] & VERSYM_HIDDEN))
-      Symtab->addShared(Name, *this, Sym, Alignment, Idx);
+    uint32_t alignment = getAlignment<ELFT>(sections, sym);
+    if (!(versyms[i] & VERSYM_HIDDEN)) {
+      symtab->addSymbol(SharedSymbol{*this, name, sym.getBinding(),
+                                     sym.st_other, sym.getType(), sym.st_value,
+                                     sym.st_size, alignment, idx});
+    }
 
     // Also add the symbol with the versioned name to handle undefined symbols
     // with explicit versions.
-    if (Idx == VER_NDX_GLOBAL)
+    if (idx == VER_NDX_GLOBAL)
       continue;
 
-    if (Idx >= Verdefs.size() || Idx == VER_NDX_LOCAL) {
-      error("corrupt input file: version definition index " + Twine(Idx) +
-            " for symbol " + Name + " is out of bounds\n>>> defined in " +
+    if (idx >= verdefs.size() || idx == VER_NDX_LOCAL) {
+      error("corrupt input file: version definition index " + Twine(idx) +
+            " for symbol " + name + " is out of bounds\n>>> defined in " +
             toString(this));
       continue;
     }
 
-    StringRef VerName =
-        this->StringTable.data() + Verdefs[Idx]->getAux()->vda_name;
-    VersionedNameBuffer.clear();
-    Name = (Name + "@" + VerName).toStringRef(VersionedNameBuffer);
-    Symtab->addShared(Saver.save(Name), *this, Sym, Alignment, Idx);
+    StringRef verName =
+        this->stringTable.data() +
+        reinterpret_cast<const Elf_Verdef *>(verdefs[idx])->getAux()->vda_name;
+    versionedNameBuffer.clear();
+    name = (name + "@" + verName).toStringRef(versionedNameBuffer);
+    symtab->addSymbol(SharedSymbol{*this, saver.save(name), sym.getBinding(),
+                                   sym.st_other, sym.getType(), sym.st_value,
+                                   sym.st_size, alignment, idx});
   }
 }
 
-static ELFKind getBitcodeELFKind(const Triple &T) {
-  if (T.isLittleEndian())
-    return T.isArch64Bit() ? ELF64LEKind : ELF32LEKind;
-  return T.isArch64Bit() ? ELF64BEKind : ELF32BEKind;
+static ELFKind getBitcodeELFKind(const Triple &t) {
+  if (t.isLittleEndian())
+    return t.isArch64Bit() ? ELF64LEKind : ELF32LEKind;
+  return t.isArch64Bit() ? ELF64BEKind : ELF32BEKind;
 }
 
-static uint8_t getBitcodeMachineKind(StringRef Path, const Triple &T) {
-  switch (T.getArch()) {
+static uint8_t getBitcodeMachineKind(StringRef path, const Triple &t) {
+  switch (t.getArch()) {
   case Triple::aarch64:
     return EM_AARCH64;
   case Triple::amdgcn:
@@ -1086,25 +1404,28 @@ static uint8_t getBitcodeMachineKind(StringRef Path, const Triple &T) {
   case Triple::ppc64:
   case Triple::ppc64le:
     return EM_PPC64;
+  case Triple::riscv32:
+  case Triple::riscv64:
+    return EM_RISCV;
   case Triple::x86:
-    return T.isOSIAMCU() ? EM_IAMCU : EM_386;
+    return t.isOSIAMCU() ? EM_IAMCU : EM_386;
   case Triple::x86_64:
     return EM_X86_64;
   default:
-    error(Path + ": could not infer e_machine from bitcode target triple " +
-          T.str());
+    error(path + ": could not infer e_machine from bitcode target triple " +
+          t.str());
     return EM_NONE;
   }
 }
 
-BitcodeFile::BitcodeFile(MemoryBufferRef MB, StringRef ArchiveName,
-                         uint64_t OffsetInArchive)
-    : InputFile(BitcodeKind, MB) {
-  this->ArchiveName = ArchiveName;
+BitcodeFile::BitcodeFile(MemoryBufferRef mb, StringRef archiveName,
+                         uint64_t offsetInArchive)
+    : InputFile(BitcodeKind, mb) {
+  this->archiveName = archiveName;
 
-  std::string Path = MB.getBufferIdentifier().str();
-  if (Config->ThinLTOIndexOnly)
-    Path = replaceThinLTOSuffix(MB.getBufferIdentifier());
+  std::string path = mb.getBufferIdentifier().str();
+  if (config->thinLTOIndexOnly)
+    path = replaceThinLTOSuffix(mb.getBufferIdentifier());
 
   // ThinLTO assumes that all MemoryBufferRefs given to it have a unique
   // name. If two archives define two members with the same name, this
@@ -1112,20 +1433,21 @@ BitcodeFile::BitcodeFile(MemoryBufferRef MB, StringRef ArchiveName,
   // into consideration at LTO time (which very likely causes undefined
   // symbols later in the link stage). So we append file offset to make
   // filename unique.
-  MemoryBufferRef MBRef(
-      MB.getBuffer(),
-      Saver.save(ArchiveName + Path +
-                 (ArchiveName.empty() ? "" : utostr(OffsetInArchive))));
+  StringRef name = archiveName.empty()
+                       ? saver.save(path)
+                       : saver.save(archiveName + "(" + path + " at " +
+                                    utostr(offsetInArchive) + ")");
+  MemoryBufferRef mbref(mb.getBuffer(), name);
 
-  Obj = CHECK(lto::InputFile::create(MBRef), this);
+  obj = CHECK(lto::InputFile::create(mbref), this);
 
-  Triple T(Obj->getTargetTriple());
-  EKind = getBitcodeELFKind(T);
-  EMachine = getBitcodeMachineKind(MB.getBufferIdentifier(), T);
+  Triple t(obj->getTargetTriple());
+  ekind = getBitcodeELFKind(t);
+  emachine = getBitcodeMachineKind(mb.getBufferIdentifier(), t);
 }
 
-static uint8_t mapVisibility(GlobalValue::VisibilityTypes GvVisibility) {
-  switch (GvVisibility) {
+static uint8_t mapVisibility(GlobalValue::VisibilityTypes gvVisibility) {
+  switch (gvVisibility) {
   case GlobalValue::DefaultVisibility:
     return STV_DEFAULT;
   case GlobalValue::HiddenVisibility:
@@ -1137,209 +1459,187 @@ static uint8_t mapVisibility(GlobalValue::VisibilityTypes GvVisibility) {
 }
 
 template <class ELFT>
-static Symbol *createBitcodeSymbol(const std::vector<bool> &KeptComdats,
-                                   const lto::InputFile::Symbol &ObjSym,
-                                   BitcodeFile &F) {
-  StringRef Name = Saver.save(ObjSym.getName());
-  uint32_t Binding = ObjSym.isWeak() ? STB_WEAK : STB_GLOBAL;
-
-  uint8_t Type = ObjSym.isTLS() ? STT_TLS : STT_NOTYPE;
-  uint8_t Visibility = mapVisibility(ObjSym.getVisibility());
-  bool CanOmitFromDynSym = ObjSym.canBeOmittedFromSymbolTable();
-
-  int C = ObjSym.getComdatIndex();
-  if (C != -1 && !KeptComdats[C])
-    return Symtab->addUndefined<ELFT>(Name, Binding, Visibility, Type,
-                                      CanOmitFromDynSym, &F);
-
-  if (ObjSym.isUndefined())
-    return Symtab->addUndefined<ELFT>(Name, Binding, Visibility, Type,
-                                      CanOmitFromDynSym, &F);
-
-  if (ObjSym.isCommon())
-    return Symtab->addCommon(Name, ObjSym.getCommonSize(),
-                             ObjSym.getCommonAlignment(), Binding, Visibility,
-                             STT_OBJECT, F);
-
-  return Symtab->addBitcode(Name, Binding, Visibility, Type, CanOmitFromDynSym,
-                            F);
+static Symbol *createBitcodeSymbol(const std::vector<bool> &keptComdats,
+                                   const lto::InputFile::Symbol &objSym,
+                                   BitcodeFile &f) {
+  StringRef name = saver.save(objSym.getName());
+  uint8_t binding = objSym.isWeak() ? STB_WEAK : STB_GLOBAL;
+  uint8_t type = objSym.isTLS() ? STT_TLS : STT_NOTYPE;
+  uint8_t visibility = mapVisibility(objSym.getVisibility());
+  bool canOmitFromDynSym = objSym.canBeOmittedFromSymbolTable();
+
+  int c = objSym.getComdatIndex();
+  if (objSym.isUndefined() || (c != -1 && !keptComdats[c])) {
+    Undefined New(&f, name, binding, visibility, type);
+    if (canOmitFromDynSym)
+      New.exportDynamic = false;
+    return symtab->addSymbol(New);
+  }
+
+  if (objSym.isCommon())
+    return symtab->addSymbol(
+        CommonSymbol{&f, name, binding, visibility, STT_OBJECT,
+                     objSym.getCommonAlignment(), objSym.getCommonSize()});
+
+  Defined New(&f, name, binding, visibility, type, 0, 0, nullptr);
+  if (canOmitFromDynSym)
+    New.exportDynamic = false;
+  return symtab->addSymbol(New);
 }
 
-template <class ELFT>
-void BitcodeFile::parse(DenseSet<CachedHashStringRef> &ComdatGroups) {
-  std::vector<bool> KeptComdats;
-  for (StringRef S : Obj->getComdatTable())
-    KeptComdats.push_back(ComdatGroups.insert(CachedHashStringRef(S)).second);
-
-  for (const lto::InputFile::Symbol &ObjSym : Obj->symbols())
-    Symbols.push_back(createBitcodeSymbol<ELFT>(KeptComdats, ObjSym, *this));
-}
-
-static ELFKind getELFKind(MemoryBufferRef MB) {
-  unsigned char Size;
-  unsigned char Endian;
-  std::tie(Size, Endian) = getElfArchType(MB.getBuffer());
-
-  if (Endian != ELFDATA2LSB && Endian != ELFDATA2MSB)
-    fatal(MB.getBufferIdentifier() + ": invalid data encoding");
-  if (Size != ELFCLASS32 && Size != ELFCLASS64)
-    fatal(MB.getBufferIdentifier() + ": invalid file class");
+template <class ELFT> void BitcodeFile::parse() {
+  std::vector<bool> keptComdats;
+  for (StringRef s : obj->getComdatTable())
+    keptComdats.push_back(
+        symtab->comdatGroups.try_emplace(CachedHashStringRef(s), this).second);
 
-  size_t BufSize = MB.getBuffer().size();
-  if ((Size == ELFCLASS32 && BufSize < sizeof(Elf32_Ehdr)) ||
-      (Size == ELFCLASS64 && BufSize < sizeof(Elf64_Ehdr)))
-    fatal(MB.getBufferIdentifier() + ": file is too short");
+  for (const lto::InputFile::Symbol &objSym : obj->symbols())
+    symbols.push_back(createBitcodeSymbol<ELFT>(keptComdats, objSym, *this));
 
-  if (Size == ELFCLASS32)
-    return (Endian == ELFDATA2LSB) ? ELF32LEKind : ELF32BEKind;
-  return (Endian == ELFDATA2LSB) ? ELF64LEKind : ELF64BEKind;
+  for (auto l : obj->getDependentLibraries())
+    addDependentLibrary(l, this);
 }
 
 void BinaryFile::parse() {
-  ArrayRef<uint8_t> Data = arrayRefFromStringRef(MB.getBuffer());
-  auto *Section = make<InputSection>(this, SHF_ALLOC | SHF_WRITE, SHT_PROGBITS,
-                                     8, Data, ".data");
-  Sections.push_back(Section);
+  ArrayRef<uint8_t> data = arrayRefFromStringRef(mb.getBuffer());
+  auto *section = make<InputSection>(this, SHF_ALLOC | SHF_WRITE, SHT_PROGBITS,
+                                     8, data, ".data");
+  sections.push_back(section);
 
   // For each input file foo that is embedded to a result as a binary
   // blob, we define _binary_foo_{start,end,size} symbols, so that
   // user programs can access blobs by name. Non-alphanumeric
   // characters in a filename are replaced with underscore.
-  std::string S = "_binary_" + MB.getBufferIdentifier().str();
-  for (size_t I = 0; I < S.size(); ++I)
-    if (!isAlnum(S[I]))
-      S[I] = '_';
-
-  Symtab->addDefined(Saver.save(S + "_start"), STV_DEFAULT, STT_OBJECT, 0, 0,
-                     STB_GLOBAL, Section, nullptr);
-  Symtab->addDefined(Saver.save(S + "_end"), STV_DEFAULT, STT_OBJECT,
-                     Data.size(), 0, STB_GLOBAL, Section, nullptr);
-  Symtab->addDefined(Saver.save(S + "_size"), STV_DEFAULT, STT_OBJECT,
-                     Data.size(), 0, STB_GLOBAL, nullptr, nullptr);
+  std::string s = "_binary_" + mb.getBufferIdentifier().str();
+  for (size_t i = 0; i < s.size(); ++i)
+    if (!isAlnum(s[i]))
+      s[i] = '_';
+
+  symtab->addSymbol(Defined{nullptr, saver.save(s + "_start"), STB_GLOBAL,
+                            STV_DEFAULT, STT_OBJECT, 0, 0, section});
+  symtab->addSymbol(Defined{nullptr, saver.save(s + "_end"), STB_GLOBAL,
+                            STV_DEFAULT, STT_OBJECT, data.size(), 0, section});
+  symtab->addSymbol(Defined{nullptr, saver.save(s + "_size"), STB_GLOBAL,
+                            STV_DEFAULT, STT_OBJECT, data.size(), 0, nullptr});
 }
 
-InputFile *elf::createObjectFile(MemoryBufferRef MB, StringRef ArchiveName,
-                                 uint64_t OffsetInArchive) {
-  if (isBitcode(MB))
-    return make<BitcodeFile>(MB, ArchiveName, OffsetInArchive);
+InputFile *elf::createObjectFile(MemoryBufferRef mb, StringRef archiveName,
+                                 uint64_t offsetInArchive) {
+  if (isBitcode(mb))
+    return make<BitcodeFile>(mb, archiveName, offsetInArchive);
 
-  switch (getELFKind(MB)) {
+  switch (getELFKind(mb, archiveName)) {
   case ELF32LEKind:
-    return make<ObjFile<ELF32LE>>(MB, ArchiveName);
+    return make<ObjFile<ELF32LE>>(mb, archiveName);
   case ELF32BEKind:
-    return make<ObjFile<ELF32BE>>(MB, ArchiveName);
+    return make<ObjFile<ELF32BE>>(mb, archiveName);
   case ELF64LEKind:
-    return make<ObjFile<ELF64LE>>(MB, ArchiveName);
+    return make<ObjFile<ELF64LE>>(mb, archiveName);
   case ELF64BEKind:
-    return make<ObjFile<ELF64BE>>(MB, ArchiveName);
+    return make<ObjFile<ELF64BE>>(mb, archiveName);
   default:
     llvm_unreachable("getELFKind");
   }
 }
 
-InputFile *elf::createSharedFile(MemoryBufferRef MB, StringRef DefaultSoName) {
-  switch (getELFKind(MB)) {
-  case ELF32LEKind:
-    return make<SharedFile<ELF32LE>>(MB, DefaultSoName);
-  case ELF32BEKind:
-    return make<SharedFile<ELF32BE>>(MB, DefaultSoName);
-  case ELF64LEKind:
-    return make<SharedFile<ELF64LE>>(MB, DefaultSoName);
-  case ELF64BEKind:
-    return make<SharedFile<ELF64BE>>(MB, DefaultSoName);
-  default:
-    llvm_unreachable("getELFKind");
-  }
-}
+void LazyObjFile::fetch() {
+  if (mb.getBuffer().empty())
+    return;
 
-MemoryBufferRef LazyObjFile::getBuffer() {
-  if (AddedToLink)
-    return MemoryBufferRef();
-  AddedToLink = true;
-  return MB;
-}
+  InputFile *file = createObjectFile(mb, archiveName, offsetInArchive);
+  file->groupId = groupId;
+
+  mb = {};
 
-InputFile *LazyObjFile::fetch() {
-  MemoryBufferRef MBRef = getBuffer();
-  if (MBRef.getBuffer().empty())
-    return nullptr;
+  // Copy symbol vector so that the new InputFile doesn't have to
+  // insert the same defined symbols to the symbol table again.
+  file->symbols = std::move(symbols);
 
-  InputFile *File = createObjectFile(MBRef, ArchiveName, OffsetInArchive);
-  File->GroupId = GroupId;
-  return File;
+  parseFile(file);
 }
 
 template <class ELFT> void LazyObjFile::parse() {
+  using Elf_Sym = typename ELFT::Sym;
+
   // A lazy object file wraps either a bitcode file or an ELF file.
-  if (isBitcode(this->MB)) {
-    std::unique_ptr<lto::InputFile> Obj =
-        CHECK(lto::InputFile::create(this->MB), this);
-    for (const lto::InputFile::Symbol &Sym : Obj->symbols())
-      if (!Sym.isUndefined())
-        Symtab->addLazyObject<ELFT>(Saver.save(Sym.getName()), *this);
+  if (isBitcode(this->mb)) {
+    std::unique_ptr<lto::InputFile> obj =
+        CHECK(lto::InputFile::create(this->mb), this);
+    for (const lto::InputFile::Symbol &sym : obj->symbols()) {
+      if (sym.isUndefined())
+        continue;
+      symtab->addSymbol(LazyObject{*this, saver.save(sym.getName())});
+    }
     return;
   }
 
-  if (getELFKind(this->MB) != Config->EKind) {
-    error("incompatible file: " + this->MB.getBufferIdentifier());
+  if (getELFKind(this->mb, archiveName) != config->ekind) {
+    error("incompatible file: " + this->mb.getBufferIdentifier());
     return;
   }
 
-  ELFFile<ELFT> Obj = check(ELFFile<ELFT>::create(MB.getBuffer()));
-  ArrayRef<typename ELFT::Shdr> Sections = CHECK(Obj.sections(), this);
+  // Find a symbol table.
+  ELFFile<ELFT> obj = check(ELFFile<ELFT>::create(mb.getBuffer()));
+  ArrayRef<typename ELFT::Shdr> sections = CHECK(obj.sections(), this);
 
-  for (const typename ELFT::Shdr &Sec : Sections) {
-    if (Sec.sh_type != SHT_SYMTAB)
+  for (const typename ELFT::Shdr &sec : sections) {
+    if (sec.sh_type != SHT_SYMTAB)
       continue;
 
-    typename ELFT::SymRange Syms = CHECK(Obj.symbols(&Sec), this);
-    uint32_t FirstGlobal = Sec.sh_info;
-    StringRef StringTable =
-        CHECK(Obj.getStringTableForSymtab(Sec, Sections), this);
+    // A symbol table is found.
+    ArrayRef<Elf_Sym> eSyms = CHECK(obj.symbols(&sec), this);
+    uint32_t firstGlobal = sec.sh_info;
+    StringRef strtab = CHECK(obj.getStringTableForSymtab(sec, sections), this);
+    this->symbols.resize(eSyms.size());
 
-    for (const typename ELFT::Sym &Sym : Syms.slice(FirstGlobal))
-      if (Sym.st_shndx != SHN_UNDEF)
-        Symtab->addLazyObject<ELFT>(CHECK(Sym.getName(StringTable), this),
-                                    *this);
+    // Get existing symbols or insert placeholder symbols.
+    for (size_t i = firstGlobal, end = eSyms.size(); i != end; ++i)
+      if (eSyms[i].st_shndx != SHN_UNDEF)
+        this->symbols[i] = symtab->insert(CHECK(eSyms[i].getName(strtab), this));
+
+    // Replace existing symbols with LazyObject symbols.
+    //
+    // resolve() may trigger this->fetch() if an existing symbol is an
+    // undefined symbol. If that happens, this LazyObjFile has served
+    // its purpose, and we can exit from the loop early.
+    for (Symbol *sym : this->symbols) {
+      if (!sym)
+        continue;
+      sym->resolve(LazyObject{*this, sym->getName()});
+
+      // MemoryBuffer is emptied if this file is instantiated as ObjFile.
+      if (mb.getBuffer().empty())
+        return;
+    }
     return;
   }
 }
 
-std::string elf::replaceThinLTOSuffix(StringRef Path) {
-  StringRef Suffix = Config->ThinLTOObjectSuffixReplace.first;
-  StringRef Repl = Config->ThinLTOObjectSuffixReplace.second;
+std::string elf::replaceThinLTOSuffix(StringRef path) {
+  StringRef suffix = config->thinLTOObjectSuffixReplace.first;
+  StringRef repl = config->thinLTOObjectSuffixReplace.second;
 
-  if (Path.consume_back(Suffix))
-    return (Path + Repl).str();
-  return Path;
+  if (path.consume_back(suffix))
+    return (path + repl).str();
+  return path;
 }
 
-template void ArchiveFile::parse<ELF32LE>();
-template void ArchiveFile::parse<ELF32BE>();
-template void ArchiveFile::parse<ELF64LE>();
-template void ArchiveFile::parse<ELF64BE>();
-
-template void BitcodeFile::parse<ELF32LE>(DenseSet<CachedHashStringRef> &);
-template void BitcodeFile::parse<ELF32BE>(DenseSet<CachedHashStringRef> &);
-template void BitcodeFile::parse<ELF64LE>(DenseSet<CachedHashStringRef> &);
-template void BitcodeFile::parse<ELF64BE>(DenseSet<CachedHashStringRef> &);
+template void BitcodeFile::parse<ELF32LE>();
+template void BitcodeFile::parse<ELF32BE>();
+template void BitcodeFile::parse<ELF64LE>();
+template void BitcodeFile::parse<ELF64BE>();
 
 template void LazyObjFile::parse<ELF32LE>();
 template void LazyObjFile::parse<ELF32BE>();
 template void LazyObjFile::parse<ELF64LE>();
 template void LazyObjFile::parse<ELF64BE>();
 
-template class elf::ELFFileBase<ELF32LE>;
-template class elf::ELFFileBase<ELF32BE>;
-template class elf::ELFFileBase<ELF64LE>;
-template class elf::ELFFileBase<ELF64BE>;
-
 template class elf::ObjFile<ELF32LE>;
 template class elf::ObjFile<ELF32BE>;
 template class elf::ObjFile<ELF64LE>;
 template class elf::ObjFile<ELF64BE>;
 
-template class elf::SharedFile<ELF32LE>;
-template class elf::SharedFile<ELF32BE>;
-template class elf::SharedFile<ELF64LE>;
-template class elf::SharedFile<ELF64BE>;
+template void SharedFile::parse<ELF32LE>();
+template void SharedFile::parse<ELF32BE>();
+template void SharedFile::parse<ELF64LE>();
+template void SharedFile::parse<ELF64BE>();
diff --git a/deps/lld/ELF/InputFiles.h b/deps/lld/ELF/InputFiles.h
index d7cbbc67a36562f19e2387f723105cfce603e32a..5ccc3d402b376125f1838f75308cf22d9e69b3a4 100644
--- a/deps/lld/ELF/InputFiles.h
+++ b/deps/lld/ELF/InputFiles.h
@@ -1,9 +1,8 @@
 //===- InputFiles.h ---------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -40,7 +39,7 @@ class InputSectionBase;
 }
 
 // Returns "<internal>", "foo.a(bar.o)" or "baz.o".
-std::string toString(const elf::InputFile *F);
+std::string toString(const elf::InputFile *f);
 
 namespace elf {
 
@@ -50,10 +49,13 @@ class Symbol;
 
 // If -reproduce option is given, all input files are written
 // to this tar archive.
-extern std::unique_ptr<llvm::TarWriter> Tar;
+extern std::unique_ptr<llvm::TarWriter> tar;
 
 // Opens a given file.
-llvm::Optional<MemoryBufferRef> readFile(StringRef Path);
+llvm::Optional<MemoryBufferRef> readFile(StringRef path);
+
+// Add symbols in File to the symbol table.
+void parseFile(InputFile *file);
 
 // The root class of input files.
 class InputFile {
@@ -67,191 +69,230 @@ public:
     BinaryKind,
   };
 
-  Kind kind() const { return FileKind; }
+  Kind kind() const { return fileKind; }
 
   bool isElf() const {
-    Kind K = kind();
-    return K == ObjKind || K == SharedKind;
+    Kind k = kind();
+    return k == ObjKind || k == SharedKind;
   }
 
-  StringRef getName() const { return MB.getBufferIdentifier(); }
-  MemoryBufferRef MB;
+  StringRef getName() const { return mb.getBufferIdentifier(); }
+  MemoryBufferRef mb;
 
   // Returns sections. It is a runtime error to call this function
   // on files that don't have the notion of sections.
   ArrayRef<InputSectionBase *> getSections() const {
-    assert(FileKind == ObjKind || FileKind == BinaryKind);
-    return Sections;
+    assert(fileKind == ObjKind || fileKind == BinaryKind);
+    return sections;
   }
 
   // Returns object file symbols. It is a runtime error to call this
   // function on files of other types.
   ArrayRef<Symbol *> getSymbols() { return getMutableSymbols(); }
 
-  std::vector<Symbol *> &getMutableSymbols() {
-    assert(FileKind == BinaryKind || FileKind == ObjKind ||
-           FileKind == BitcodeKind);
-    return Symbols;
+  MutableArrayRef<Symbol *> getMutableSymbols() {
+    assert(fileKind == BinaryKind || fileKind == ObjKind ||
+           fileKind == BitcodeKind);
+    return symbols;
   }
 
   // Filename of .a which contained this file. If this file was
   // not in an archive file, it is the empty string. We use this
   // string for creating error messages.
-  std::string ArchiveName;
+  std::string archiveName;
 
   // If this is an architecture-specific file, the following members
   // have ELF type (i.e. ELF{32,64}{LE,BE}) and target machine type.
-  ELFKind EKind = ELFNoneKind;
-  uint16_t EMachine = llvm::ELF::EM_NONE;
-  uint8_t OSABI = 0;
+  ELFKind ekind = ELFNoneKind;
+  uint16_t emachine = llvm::ELF::EM_NONE;
+  uint8_t osabi = 0;
+  uint8_t abiVersion = 0;
 
   // Cache for toString(). Only toString() should use this member.
-  mutable std::string ToStringCache;
+  mutable std::string toStringCache;
 
-  std::string getSrcMsg(const Symbol &Sym, InputSectionBase &Sec,
-                        uint64_t Offset);
+  std::string getSrcMsg(const Symbol &sym, InputSectionBase &sec,
+                        uint64_t offset);
 
   // True if this is an argument for --just-symbols. Usually false.
-  bool JustSymbols = false;
+  bool justSymbols = false;
 
-  // GroupId is used for --warn-backrefs which is an optional error
+  // outSecOff of .got2 in the current file. This is used by PPC32 -fPIC/-fPIE
+  // to compute offsets in PLT call stubs.
+  uint32_t ppc32Got2OutSecOff = 0;
+
+  // On PPC64 we need to keep track of which files contain small code model
+  // relocations that access the .toc section. To minimize the chance of a
+  // relocation overflow, files that do contain said relocations should have
+  // their .toc sections sorted closer to the .got section than files that do
+  // not contain any small code model relocations. Thats because the toc-pointer
+  // is defined to point at .got + 0x8000 and the instructions used with small
+  // code model relocations support immediates in the range [-0x8000, 0x7FFC],
+  // making the addressable range relative to the toc pointer
+  // [.got, .got + 0xFFFC].
+  bool ppc64SmallCodeModelTocRelocs = false;
+
+  // groupId is used for --warn-backrefs which is an optional error
   // checking feature. All files within the same --{start,end}-group or
   // --{start,end}-lib get the same group ID. Otherwise, each file gets a new
   // group ID. For more info, see checkDependency() in SymbolTable.cpp.
-  uint32_t GroupId;
-  static bool IsInGroup;
-  static uint32_t NextGroupId;
+  uint32_t groupId;
+  static bool isInGroup;
+  static uint32_t nextGroupId;
 
   // Index of MIPS GOT built for this file.
-  llvm::Optional<size_t> MipsGotIndex;
+  llvm::Optional<size_t> mipsGotIndex;
+
+  std::vector<Symbol *> symbols;
 
 protected:
-  InputFile(Kind K, MemoryBufferRef M);
-  std::vector<InputSectionBase *> Sections;
-  std::vector<Symbol *> Symbols;
+  InputFile(Kind k, MemoryBufferRef m);
+  std::vector<InputSectionBase *> sections;
 
 private:
-  const Kind FileKind;
+  const Kind fileKind;
 };
 
-template <typename ELFT> class ELFFileBase : public InputFile {
+class ELFFileBase : public InputFile {
 public:
-  typedef typename ELFT::Shdr Elf_Shdr;
-  typedef typename ELFT::Sym Elf_Sym;
-  typedef typename ELFT::Word Elf_Word;
-  typedef typename ELFT::SymRange Elf_Sym_Range;
+  ELFFileBase(Kind k, MemoryBufferRef m);
+  static bool classof(const InputFile *f) { return f->isElf(); }
 
-  ELFFileBase(Kind K, MemoryBufferRef M);
-  static bool classof(const InputFile *F) { return F->isElf(); }
-
-  llvm::object::ELFFile<ELFT> getObj() const {
-    return check(llvm::object::ELFFile<ELFT>::create(MB.getBuffer()));
+  template <typename ELFT> llvm::object::ELFFile<ELFT> getObj() const {
+    return check(llvm::object::ELFFile<ELFT>::create(mb.getBuffer()));
   }
 
-  StringRef getStringTable() const { return StringTable; }
-
-  uint32_t getSectionIndex(const Elf_Sym &Sym) const;
+  StringRef getStringTable() const { return stringTable; }
 
-  Elf_Sym_Range getGlobalELFSyms();
-  Elf_Sym_Range getELFSyms() const { return ELFSyms; }
+  template <typename ELFT> typename ELFT::SymRange getELFSyms() const {
+    return typename ELFT::SymRange(
+        reinterpret_cast<const typename ELFT::Sym *>(elfSyms), numELFSyms);
+  }
+  template <typename ELFT> typename ELFT::SymRange getGlobalELFSyms() const {
+    return getELFSyms<ELFT>().slice(firstGlobal);
+  }
 
 protected:
-  ArrayRef<Elf_Sym> ELFSyms;
-  uint32_t FirstGlobal = 0;
-  ArrayRef<Elf_Word> SymtabSHNDX;
-  StringRef StringTable;
-  void initSymtab(ArrayRef<Elf_Shdr> Sections, const Elf_Shdr *Symtab);
+  // Initializes this class's member variables.
+  template <typename ELFT> void init();
+
+  const void *elfSyms = nullptr;
+  size_t numELFSyms = 0;
+  uint32_t firstGlobal = 0;
+  StringRef stringTable;
 };
 
 // .o file.
-template <class ELFT> class ObjFile : public ELFFileBase<ELFT> {
-  typedef ELFFileBase<ELFT> Base;
-  typedef typename ELFT::Rel Elf_Rel;
-  typedef typename ELFT::Rela Elf_Rela;
-  typedef typename ELFT::Sym Elf_Sym;
-  typedef typename ELFT::Shdr Elf_Shdr;
-  typedef typename ELFT::Word Elf_Word;
-  typedef typename ELFT::CGProfile Elf_CGProfile;
-
-  StringRef getShtGroupSignature(ArrayRef<Elf_Shdr> Sections,
-                                 const Elf_Shdr &Sec);
+template <class ELFT> class ObjFile : public ELFFileBase {
+  using Elf_Rel = typename ELFT::Rel;
+  using Elf_Rela = typename ELFT::Rela;
+  using Elf_Sym = typename ELFT::Sym;
+  using Elf_Shdr = typename ELFT::Shdr;
+  using Elf_Word = typename ELFT::Word;
+  using Elf_CGProfile = typename ELFT::CGProfile;
 
 public:
-  static bool classof(const InputFile *F) { return F->kind() == Base::ObjKind; }
+  static bool classof(const InputFile *f) { return f->kind() == ObjKind; }
+
+  llvm::object::ELFFile<ELFT> getObj() const {
+    return this->ELFFileBase::getObj<ELFT>();
+  }
 
   ArrayRef<Symbol *> getLocalSymbols();
   ArrayRef<Symbol *> getGlobalSymbols();
 
-  ObjFile(MemoryBufferRef M, StringRef ArchiveName);
-  void parse(llvm::DenseSet<llvm::CachedHashStringRef> &ComdatGroups);
+  ObjFile(MemoryBufferRef m, StringRef archiveName) : ELFFileBase(ObjKind, m) {
+    this->archiveName = archiveName;
+  }
 
-  Symbol &getSymbol(uint32_t SymbolIndex) const {
-    if (SymbolIndex >= this->Symbols.size())
+  void parse(bool ignoreComdats = false);
+
+  StringRef getShtGroupSignature(ArrayRef<Elf_Shdr> sections,
+                                 const Elf_Shdr &sec);
+
+  Symbol &getSymbol(uint32_t symbolIndex) const {
+    if (symbolIndex >= this->symbols.size())
       fatal(toString(this) + ": invalid symbol index");
-    return *this->Symbols[SymbolIndex];
+    return *this->symbols[symbolIndex];
   }
 
-  template <typename RelT> Symbol &getRelocTargetSym(const RelT &Rel) const {
-    uint32_t SymIndex = Rel.getSymbol(Config->IsMips64EL);
-    return getSymbol(SymIndex);
+  uint32_t getSectionIndex(const Elf_Sym &sym) const;
+
+  template <typename RelT> Symbol &getRelocTargetSym(const RelT &rel) const {
+    uint32_t symIndex = rel.getSymbol(config->isMips64EL);
+    return getSymbol(symIndex);
   }
 
   llvm::Optional<llvm::DILineInfo> getDILineInfo(InputSectionBase *, uint64_t);
-  llvm::Optional<std::pair<std::string, unsigned>> getVariableLoc(StringRef Name);
+  llvm::Optional<std::pair<std::string, unsigned>> getVariableLoc(StringRef name);
 
   // MIPS GP0 value defined by this file. This value represents the gp value
   // used to create the relocatable object and required to support
   // R_MIPS_GPREL16 / R_MIPS_GPREL32 relocations.
-  uint32_t MipsGp0 = 0;
+  uint32_t mipsGp0 = 0;
+
+  uint32_t andFeatures = 0;
 
   // Name of source file obtained from STT_FILE symbol value,
   // or empty string if there is no such symbol in object file
   // symbol table.
-  StringRef SourceFile;
+  StringRef sourceFile;
 
   // True if the file defines functions compiled with
   // -fsplit-stack. Usually false.
-  bool SplitStack = false;
+  bool splitStack = false;
 
   // True if the file defines functions compiled with -fsplit-stack,
   // but had one or more functions with the no_split_stack attribute.
-  bool SomeNoSplitStack = false;
+  bool someNoSplitStack = false;
 
   // Pointer to this input file's .llvm_addrsig section, if it has one.
-  const Elf_Shdr *AddrsigSec = nullptr;
+  const Elf_Shdr *addrsigSec = nullptr;
 
   // SHT_LLVM_CALL_GRAPH_PROFILE table
-  ArrayRef<Elf_CGProfile> CGProfile;
+  ArrayRef<Elf_CGProfile> cgProfile;
 
 private:
-  void
-  initializeSections(llvm::DenseSet<llvm::CachedHashStringRef> &ComdatGroups);
+  void initializeSections(bool ignoreComdats);
   void initializeSymbols();
   void initializeJustSymbols();
   void initializeDwarf();
-  InputSectionBase *getRelocTarget(const Elf_Shdr &Sec);
-  InputSectionBase *createInputSection(const Elf_Shdr &Sec);
-  StringRef getSectionName(const Elf_Shdr &Sec);
+  InputSectionBase *getRelocTarget(const Elf_Shdr &sec);
+  InputSectionBase *createInputSection(const Elf_Shdr &sec);
+  StringRef getSectionName(const Elf_Shdr &sec);
 
-  bool shouldMerge(const Elf_Shdr &Sec);
-  Symbol *createSymbol(const Elf_Sym *Sym);
+  bool shouldMerge(const Elf_Shdr &sec);
+
+  // Each ELF symbol contains a section index which the symbol belongs to.
+  // However, because the number of bits dedicated for that is limited, a
+  // symbol can directly point to a section only when the section index is
+  // equal to or smaller than 65280.
+  //
+  // If an object file contains more than 65280 sections, the file must
+  // contain .symtab_shndx section. The section contains an array of
+  // 32-bit integers whose size is the same as the number of symbols.
+  // Nth symbol's section index is in the Nth entry of .symtab_shndx.
+  //
+  // The following variable contains the contents of .symtab_shndx.
+  // If the section does not exist (which is common), the array is empty.
+  ArrayRef<Elf_Word> shndxTable;
 
   // .shstrtab contents.
-  StringRef SectionStringTable;
+  StringRef sectionStringTable;
 
   // Debugging information to retrieve source file and line for error
   // reporting. Linker may find reasonable number of errors in a
   // single object file, so we cache debugging information in order to
   // parse it only once for each object file we link.
-  std::unique_ptr<llvm::DWARFContext> Dwarf;
-  std::vector<const llvm::DWARFDebugLine::LineTable *> LineTables;
+  std::unique_ptr<llvm::DWARFContext> dwarf;
+  std::vector<const llvm::DWARFDebugLine::LineTable *> lineTables;
   struct VarLoc {
-    const llvm::DWARFDebugLine::LineTable *LT;
-    unsigned File;
-    unsigned Line;
+    const llvm::DWARFDebugLine::LineTable *lt;
+    unsigned file;
+    unsigned line;
   };
-  llvm::DenseMap<StringRef, VarLoc> VariableLoc;
-  llvm::once_flag InitDwarfLine;
+  llvm::DenseMap<StringRef, VarLoc> variableLoc;
+  llvm::once_flag initDwarfLine;
 };
 
 // LazyObjFile is analogous to ArchiveFile in the sense that
@@ -263,118 +304,100 @@ private:
 // archive file semantics.
 class LazyObjFile : public InputFile {
 public:
-  LazyObjFile(MemoryBufferRef M, StringRef ArchiveName,
-              uint64_t OffsetInArchive)
-      : InputFile(LazyObjKind, M), OffsetInArchive(OffsetInArchive) {
-    this->ArchiveName = ArchiveName;
+  LazyObjFile(MemoryBufferRef m, StringRef archiveName,
+              uint64_t offsetInArchive)
+      : InputFile(LazyObjKind, m), offsetInArchive(offsetInArchive) {
+    this->archiveName = archiveName;
   }
 
-  static bool classof(const InputFile *F) { return F->kind() == LazyObjKind; }
+  static bool classof(const InputFile *f) { return f->kind() == LazyObjKind; }
 
   template <class ELFT> void parse();
-  MemoryBufferRef getBuffer();
-  InputFile *fetch();
-  bool AddedToLink = false;
+  void fetch();
 
 private:
-  uint64_t OffsetInArchive;
+  uint64_t offsetInArchive;
 };
 
 // An ArchiveFile object represents a .a file.
 class ArchiveFile : public InputFile {
 public:
-  explicit ArchiveFile(std::unique_ptr<Archive> &&File);
-  static bool classof(const InputFile *F) { return F->kind() == ArchiveKind; }
-  template <class ELFT> void parse();
+  explicit ArchiveFile(std::unique_ptr<Archive> &&file);
+  static bool classof(const InputFile *f) { return f->kind() == ArchiveKind; }
+  void parse();
 
   // Pulls out an object file that contains a definition for Sym and
   // returns it. If the same file was instantiated before, this
-  // function returns a nullptr (so we don't instantiate the same file
+  // function does nothing (so we don't instantiate the same file
   // more than once.)
-  InputFile *fetch(const Archive::Symbol &Sym);
+  void fetch(const Archive::Symbol &sym);
 
 private:
-  std::unique_ptr<Archive> File;
-  llvm::DenseSet<uint64_t> Seen;
+  std::unique_ptr<Archive> file;
+  llvm::DenseSet<uint64_t> seen;
 };
 
 class BitcodeFile : public InputFile {
 public:
-  BitcodeFile(MemoryBufferRef M, StringRef ArchiveName,
-              uint64_t OffsetInArchive);
-  static bool classof(const InputFile *F) { return F->kind() == BitcodeKind; }
-  template <class ELFT>
-  void parse(llvm::DenseSet<llvm::CachedHashStringRef> &ComdatGroups);
-  std::unique_ptr<llvm::lto::InputFile> Obj;
+  BitcodeFile(MemoryBufferRef m, StringRef archiveName,
+              uint64_t offsetInArchive);
+  static bool classof(const InputFile *f) { return f->kind() == BitcodeKind; }
+  template <class ELFT> void parse();
+  std::unique_ptr<llvm::lto::InputFile> obj;
 };
 
 // .so file.
-template <class ELFT> class SharedFile : public ELFFileBase<ELFT> {
-  typedef ELFFileBase<ELFT> Base;
-  typedef typename ELFT::Dyn Elf_Dyn;
-  typedef typename ELFT::Shdr Elf_Shdr;
-  typedef typename ELFT::Sym Elf_Sym;
-  typedef typename ELFT::SymRange Elf_Sym_Range;
-  typedef typename ELFT::Verdef Elf_Verdef;
-  typedef typename ELFT::Versym Elf_Versym;
-
-  const Elf_Shdr *VersymSec = nullptr;
-  const Elf_Shdr *VerdefSec = nullptr;
-
+class SharedFile : public ELFFileBase {
 public:
-  std::vector<const Elf_Verdef *> Verdefs;
-  std::string SoName;
+  SharedFile(MemoryBufferRef m, StringRef defaultSoName)
+      : ELFFileBase(SharedKind, m), soName(defaultSoName),
+        isNeeded(!config->asNeeded) {}
 
-  static bool classof(const InputFile *F) {
-    return F->kind() == Base::SharedKind;
-  }
+  // This is actually a vector of Elf_Verdef pointers.
+  std::vector<const void *> verdefs;
 
-  SharedFile(MemoryBufferRef M, StringRef DefaultSoName);
+  // If the output file needs Elf_Verneed data structures for this file, this is
+  // a vector of Elf_Vernaux version identifiers that map onto the entries in
+  // Verdefs, otherwise it is empty.
+  std::vector<unsigned> vernauxs;
 
-  void parseSoName();
-  void parseRest();
-  uint32_t getAlignment(ArrayRef<Elf_Shdr> Sections, const Elf_Sym &Sym);
-  std::vector<const Elf_Verdef *> parseVerdefs();
-  std::vector<uint32_t> parseVersyms();
+  static unsigned vernauxNum;
 
-  struct NeededVer {
-    // The string table offset of the version name in the output file.
-    size_t StrTab;
+  std::vector<StringRef> dtNeeded;
+  std::string soName;
 
-    // The version identifier for this version name.
-    uint16_t Index;
-  };
+  static bool classof(const InputFile *f) { return f->kind() == SharedKind; }
 
-  // Mapping from Elf_Verdef data structures to information about Elf_Vernaux
-  // data structures in the output file.
-  std::map<const Elf_Verdef *, NeededVer> VerdefMap;
+  template <typename ELFT> void parse();
+
+  // Used for --no-allow-shlib-undefined.
+  bool allNeededIsKnown;
 
   // Used for --as-needed
-  bool IsNeeded;
+  bool isNeeded;
 };
 
 class BinaryFile : public InputFile {
 public:
-  explicit BinaryFile(MemoryBufferRef M) : InputFile(BinaryKind, M) {}
-  static bool classof(const InputFile *F) { return F->kind() == BinaryKind; }
+  explicit BinaryFile(MemoryBufferRef m) : InputFile(BinaryKind, m) {}
+  static bool classof(const InputFile *f) { return f->kind() == BinaryKind; }
   void parse();
 };
 
-InputFile *createObjectFile(MemoryBufferRef MB, StringRef ArchiveName = "",
-                            uint64_t OffsetInArchive = 0);
-InputFile *createSharedFile(MemoryBufferRef MB, StringRef DefaultSoName);
+InputFile *createObjectFile(MemoryBufferRef mb, StringRef archiveName = "",
+                            uint64_t offsetInArchive = 0);
 
-inline bool isBitcode(MemoryBufferRef MB) {
-  return identify_magic(MB.getBuffer()) == llvm::file_magic::bitcode;
+inline bool isBitcode(MemoryBufferRef mb) {
+  return identify_magic(mb.getBuffer()) == llvm::file_magic::bitcode;
 }
 
-std::string replaceThinLTOSuffix(StringRef Path);
+std::string replaceThinLTOSuffix(StringRef path);
 
-extern std::vector<BinaryFile *> BinaryFiles;
-extern std::vector<BitcodeFile *> BitcodeFiles;
-extern std::vector<LazyObjFile *> LazyObjFiles;
-extern std::vector<InputFile *> ObjectFiles;
-extern std::vector<InputFile *> SharedFiles;
+extern std::vector<BinaryFile *> binaryFiles;
+extern std::vector<BitcodeFile *> bitcodeFiles;
+extern std::vector<LazyObjFile *> lazyObjFiles;
+extern std::vector<InputFile *> objectFiles;
+extern std::vector<SharedFile *> sharedFiles;
 
 } // namespace elf
 } // namespace lld
diff --git a/deps/lld/ELF/InputSection.cpp b/deps/lld/ELF/InputSection.cpp
index 839bff7011eb8b28d4e3d3e482693f07f7880230..a024ac307b0a946ad889dda4127fa47263ca4c11 100644
--- a/deps/lld/ELF/InputSection.cpp
+++ b/deps/lld/ELF/InputSection.cpp
@@ -1,9 +1,8 @@
 //===- InputSection.cpp ---------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -41,52 +40,52 @@ using namespace llvm::sys;
 using namespace lld;
 using namespace lld::elf;
 
-std::vector<InputSectionBase *> elf::InputSections;
+std::vector<InputSectionBase *> elf::inputSections;
 
 // Returns a string to construct an error message.
-std::string lld::toString(const InputSectionBase *Sec) {
-  return (toString(Sec->File) + ":(" + Sec->Name + ")").str();
+std::string lld::toString(const InputSectionBase *sec) {
+  return (toString(sec->file) + ":(" + sec->name + ")").str();
 }
 
 template <class ELFT>
-static ArrayRef<uint8_t> getSectionContents(ObjFile<ELFT> &File,
-                                            const typename ELFT::Shdr &Hdr) {
-  if (Hdr.sh_type == SHT_NOBITS)
-    return makeArrayRef<uint8_t>(nullptr, Hdr.sh_size);
-  return check(File.getObj().getSectionContents(&Hdr));
+static ArrayRef<uint8_t> getSectionContents(ObjFile<ELFT> &file,
+                                            const typename ELFT::Shdr &hdr) {
+  if (hdr.sh_type == SHT_NOBITS)
+    return makeArrayRef<uint8_t>(nullptr, hdr.sh_size);
+  return check(file.getObj().getSectionContents(&hdr));
 }
 
-InputSectionBase::InputSectionBase(InputFile *File, uint64_t Flags,
-                                   uint32_t Type, uint64_t Entsize,
-                                   uint32_t Link, uint32_t Info,
-                                   uint32_t Alignment, ArrayRef<uint8_t> Data,
-                                   StringRef Name, Kind SectionKind)
-    : SectionBase(SectionKind, Name, Flags, Entsize, Alignment, Type, Info,
-                  Link),
-      File(File), RawData(Data) {
+InputSectionBase::InputSectionBase(InputFile *file, uint64_t flags,
+                                   uint32_t type, uint64_t entsize,
+                                   uint32_t link, uint32_t info,
+                                   uint32_t alignment, ArrayRef<uint8_t> data,
+                                   StringRef name, Kind sectionKind)
+    : SectionBase(sectionKind, name, flags, entsize, alignment, type, info,
+                  link),
+      file(file), rawData(data) {
   // In order to reduce memory allocation, we assume that mergeable
   // sections are smaller than 4 GiB, which is not an unreasonable
   // assumption as of 2017.
-  if (SectionKind == SectionBase::Merge && RawData.size() > UINT32_MAX)
+  if (sectionKind == SectionBase::Merge && rawData.size() > UINT32_MAX)
     error(toString(this) + ": section too large");
 
-  NumRelocations = 0;
-  AreRelocsRela = false;
+  numRelocations = 0;
+  areRelocsRela = false;
 
   // The ELF spec states that a value of 0 means the section has
   // no alignment constraits.
-  uint32_t V = std::max<uint64_t>(Alignment, 1);
-  if (!isPowerOf2_64(V))
-    fatal(toString(File) + ": section sh_addralign is not a power of 2");
-  this->Alignment = V;
+  uint32_t v = std::max<uint32_t>(alignment, 1);
+  if (!isPowerOf2_64(v))
+    fatal(toString(this) + ": sh_addralign is not a power of 2");
+  this->alignment = v;
 
   // In ELF, each section can be compressed by zlib, and if compressed,
   // section name may be mangled by appending "z" (e.g. ".zdebug_info").
   // If that's the case, demangle section name so that we can handle a
   // section as if it weren't compressed.
-  if ((Flags & SHF_COMPRESSED) || Name.startswith(".zdebug")) {
+  if ((flags & SHF_COMPRESSED) || name.startswith(".zdebug")) {
     if (!zlib::isAvailable())
-      error(toString(File) + ": contains a compressed section, " +
+      error(toString(file) + ": contains a compressed section, " +
             "but zlib is not available");
     parseCompressedHeader();
   }
@@ -95,11 +94,11 @@ InputSectionBase::InputSectionBase(InputFile *File, uint64_t Flags,
 // Drop SHF_GROUP bit unless we are producing a re-linkable object file.
 // SHF_GROUP is a marker that a section belongs to some comdat group.
 // That flag doesn't make sense in an executable.
-static uint64_t getFlags(uint64_t Flags) {
-  Flags &= ~(uint64_t)SHF_INFO_LINK;
-  if (!Config->Relocatable)
-    Flags &= ~(uint64_t)SHF_GROUP;
-  return Flags;
+static uint64_t getFlags(uint64_t flags) {
+  flags &= ~(uint64_t)SHF_INFO_LINK;
+  if (!config->relocatable)
+    flags &= ~(uint64_t)SHF_GROUP;
+  return flags;
 }
 
 // GNU assembler 2.24 and LLVM 4.0.0's MC (the newest release as of
@@ -112,205 +111,212 @@ static uint64_t getFlags(uint64_t Flags) {
 //
 // This function forces SHT_{INIT,FINI}_ARRAY so that we can handle
 // incorrect inputs as if they were correct from the beginning.
-static uint64_t getType(uint64_t Type, StringRef Name) {
-  if (Type == SHT_PROGBITS && Name.startswith(".init_array."))
+static uint64_t getType(uint64_t type, StringRef name) {
+  if (type == SHT_PROGBITS && name.startswith(".init_array."))
     return SHT_INIT_ARRAY;
-  if (Type == SHT_PROGBITS && Name.startswith(".fini_array."))
+  if (type == SHT_PROGBITS && name.startswith(".fini_array."))
     return SHT_FINI_ARRAY;
-  return Type;
+  return type;
 }
 
 template <class ELFT>
-InputSectionBase::InputSectionBase(ObjFile<ELFT> &File,
-                                   const typename ELFT::Shdr &Hdr,
-                                   StringRef Name, Kind SectionKind)
-    : InputSectionBase(&File, getFlags(Hdr.sh_flags),
-                       getType(Hdr.sh_type, Name), Hdr.sh_entsize, Hdr.sh_link,
-                       Hdr.sh_info, Hdr.sh_addralign,
-                       getSectionContents(File, Hdr), Name, SectionKind) {
+InputSectionBase::InputSectionBase(ObjFile<ELFT> &file,
+                                   const typename ELFT::Shdr &hdr,
+                                   StringRef name, Kind sectionKind)
+    : InputSectionBase(&file, getFlags(hdr.sh_flags),
+                       getType(hdr.sh_type, name), hdr.sh_entsize, hdr.sh_link,
+                       hdr.sh_info, hdr.sh_addralign,
+                       getSectionContents(file, hdr), name, sectionKind) {
   // We reject object files having insanely large alignments even though
   // they are allowed by the spec. I think 4GB is a reasonable limitation.
   // We might want to relax this in the future.
-  if (Hdr.sh_addralign > UINT32_MAX)
-    fatal(toString(&File) + ": section sh_addralign is too large");
+  if (hdr.sh_addralign > UINT32_MAX)
+    fatal(toString(&file) + ": section sh_addralign is too large");
 }
 
 size_t InputSectionBase::getSize() const {
-  if (auto *S = dyn_cast<SyntheticSection>(this))
-    return S->getSize();
-  if (UncompressedSize >= 0)
-    return UncompressedSize;
-  return RawData.size();
+  if (auto *s = dyn_cast<SyntheticSection>(this))
+    return s->getSize();
+  if (uncompressedSize >= 0)
+    return uncompressedSize;
+  return rawData.size();
 }
 
 void InputSectionBase::uncompress() const {
-  size_t Size = UncompressedSize;
-  UncompressedBuf.reset(new char[Size]);
+  size_t size = uncompressedSize;
+  char *uncompressedBuf;
+  {
+    static std::mutex mu;
+    std::lock_guard<std::mutex> lock(mu);
+    uncompressedBuf = bAlloc.Allocate<char>(size);
+  }
 
-  if (Error E =
-          zlib::uncompress(toStringRef(RawData), UncompressedBuf.get(), Size))
+  if (Error e = zlib::uncompress(toStringRef(rawData), uncompressedBuf, size))
     fatal(toString(this) +
-          ": uncompress failed: " + llvm::toString(std::move(E)));
-  RawData = makeArrayRef((uint8_t *)UncompressedBuf.get(), Size);
+          ": uncompress failed: " + llvm::toString(std::move(e)));
+  rawData = makeArrayRef((uint8_t *)uncompressedBuf, size);
+  uncompressedSize = -1;
 }
 
 uint64_t InputSectionBase::getOffsetInFile() const {
-  const uint8_t *FileStart = (const uint8_t *)File->MB.getBufferStart();
-  const uint8_t *SecStart = data().begin();
-  return SecStart - FileStart;
+  const uint8_t *fileStart = (const uint8_t *)file->mb.getBufferStart();
+  const uint8_t *secStart = data().begin();
+  return secStart - fileStart;
 }
 
-uint64_t SectionBase::getOffset(uint64_t Offset) const {
+uint64_t SectionBase::getOffset(uint64_t offset) const {
   switch (kind()) {
   case Output: {
-    auto *OS = cast<OutputSection>(this);
+    auto *os = cast<OutputSection>(this);
     // For output sections we treat offset -1 as the end of the section.
-    return Offset == uint64_t(-1) ? OS->Size : Offset;
+    return offset == uint64_t(-1) ? os->size : offset;
   }
   case Regular:
   case Synthetic:
-    return cast<InputSection>(this)->getOffset(Offset);
+    return cast<InputSection>(this)->getOffset(offset);
   case EHFrame:
     // The file crtbeginT.o has relocations pointing to the start of an empty
     // .eh_frame that is known to be the first in the link. It does that to
     // identify the start of the output .eh_frame.
-    return Offset;
+    return offset;
   case Merge:
-    const MergeInputSection *MS = cast<MergeInputSection>(this);
-    if (InputSection *IS = MS->getParent())
-      return IS->getOffset(MS->getParentOffset(Offset));
-    return MS->getParentOffset(Offset);
+    const MergeInputSection *ms = cast<MergeInputSection>(this);
+    if (InputSection *isec = ms->getParent())
+      return isec->getOffset(ms->getParentOffset(offset));
+    return ms->getParentOffset(offset);
   }
   llvm_unreachable("invalid section kind");
 }
 
-uint64_t SectionBase::getVA(uint64_t Offset) const {
-  const OutputSection *Out = getOutputSection();
-  return (Out ? Out->Addr : 0) + getOffset(Offset);
+uint64_t SectionBase::getVA(uint64_t offset) const {
+  const OutputSection *out = getOutputSection();
+  return (out ? out->addr : 0) + getOffset(offset);
 }
 
 OutputSection *SectionBase::getOutputSection() {
-  InputSection *Sec;
-  if (auto *IS = dyn_cast<InputSection>(this))
-    Sec = IS;
-  else if (auto *MS = dyn_cast<MergeInputSection>(this))
-    Sec = MS->getParent();
-  else if (auto *EH = dyn_cast<EhInputSection>(this))
-    Sec = EH->getParent();
+  InputSection *sec;
+  if (auto *isec = dyn_cast<InputSection>(this))
+    sec = isec;
+  else if (auto *ms = dyn_cast<MergeInputSection>(this))
+    sec = ms->getParent();
+  else if (auto *eh = dyn_cast<EhInputSection>(this))
+    sec = eh->getParent();
   else
     return cast<OutputSection>(this);
-  return Sec ? Sec->getParent() : nullptr;
+  return sec ? sec->getParent() : nullptr;
 }
 
-// When a section is compressed, `RawData` consists with a header followed
+// When a section is compressed, `rawData` consists with a header followed
 // by zlib-compressed data. This function parses a header to initialize
-// `UncompressedSize` member and remove the header from `RawData`.
+// `uncompressedSize` member and remove the header from `rawData`.
 void InputSectionBase::parseCompressedHeader() {
-  typedef typename ELF64LE::Chdr Chdr64;
-  typedef typename ELF32LE::Chdr Chdr32;
+  using Chdr64 = typename ELF64LE::Chdr;
+  using Chdr32 = typename ELF32LE::Chdr;
 
   // Old-style header
-  if (Name.startswith(".zdebug")) {
-    if (!toStringRef(RawData).startswith("ZLIB")) {
+  if (name.startswith(".zdebug")) {
+    if (!toStringRef(rawData).startswith("ZLIB")) {
       error(toString(this) + ": corrupted compressed section header");
       return;
     }
-    RawData = RawData.slice(4);
+    rawData = rawData.slice(4);
 
-    if (RawData.size() < 8) {
+    if (rawData.size() < 8) {
       error(toString(this) + ": corrupted compressed section header");
       return;
     }
 
-    UncompressedSize = read64be(RawData.data());
-    RawData = RawData.slice(8);
+    uncompressedSize = read64be(rawData.data());
+    rawData = rawData.slice(8);
 
     // Restore the original section name.
     // (e.g. ".zdebug_info" -> ".debug_info")
-    Name = Saver.save("." + Name.substr(2));
+    name = saver.save("." + name.substr(2));
     return;
   }
 
-  assert(Flags & SHF_COMPRESSED);
-  Flags &= ~(uint64_t)SHF_COMPRESSED;
+  assert(flags & SHF_COMPRESSED);
+  flags &= ~(uint64_t)SHF_COMPRESSED;
 
   // New-style 64-bit header
-  if (Config->Is64) {
-    if (RawData.size() < sizeof(Chdr64)) {
+  if (config->is64) {
+    if (rawData.size() < sizeof(Chdr64)) {
       error(toString(this) + ": corrupted compressed section");
       return;
     }
 
-    auto *Hdr = reinterpret_cast<const Chdr64 *>(RawData.data());
-    if (Hdr->ch_type != ELFCOMPRESS_ZLIB) {
+    auto *hdr = reinterpret_cast<const Chdr64 *>(rawData.data());
+    if (hdr->ch_type != ELFCOMPRESS_ZLIB) {
       error(toString(this) + ": unsupported compression type");
       return;
     }
 
-    UncompressedSize = Hdr->ch_size;
-    RawData = RawData.slice(sizeof(*Hdr));
+    uncompressedSize = hdr->ch_size;
+    alignment = std::max<uint32_t>(hdr->ch_addralign, 1);
+    rawData = rawData.slice(sizeof(*hdr));
     return;
   }
 
   // New-style 32-bit header
-  if (RawData.size() < sizeof(Chdr32)) {
+  if (rawData.size() < sizeof(Chdr32)) {
     error(toString(this) + ": corrupted compressed section");
     return;
   }
 
-  auto *Hdr = reinterpret_cast<const Chdr32 *>(RawData.data());
-  if (Hdr->ch_type != ELFCOMPRESS_ZLIB) {
+  auto *hdr = reinterpret_cast<const Chdr32 *>(rawData.data());
+  if (hdr->ch_type != ELFCOMPRESS_ZLIB) {
     error(toString(this) + ": unsupported compression type");
     return;
   }
 
-  UncompressedSize = Hdr->ch_size;
-  RawData = RawData.slice(sizeof(*Hdr));
+  uncompressedSize = hdr->ch_size;
+  alignment = std::max<uint32_t>(hdr->ch_addralign, 1);
+  rawData = rawData.slice(sizeof(*hdr));
 }
 
 InputSection *InputSectionBase::getLinkOrderDep() const {
-  assert(Link);
-  assert(Flags & SHF_LINK_ORDER);
-  return cast<InputSection>(File->getSections()[Link]);
+  assert(link);
+  assert(flags & SHF_LINK_ORDER);
+  return cast<InputSection>(file->getSections()[link]);
 }
 
 // Find a function symbol that encloses a given location.
 template <class ELFT>
-Defined *InputSectionBase::getEnclosingFunction(uint64_t Offset) {
-  for (Symbol *B : File->getSymbols())
-    if (Defined *D = dyn_cast<Defined>(B))
-      if (D->Section == this && D->Type == STT_FUNC && D->Value <= Offset &&
-          Offset < D->Value + D->Size)
-        return D;
+Defined *InputSectionBase::getEnclosingFunction(uint64_t offset) {
+  for (Symbol *b : file->getSymbols())
+    if (Defined *d = dyn_cast<Defined>(b))
+      if (d->section == this && d->type == STT_FUNC && d->value <= offset &&
+          offset < d->value + d->size)
+        return d;
   return nullptr;
 }
 
 // Returns a source location string. Used to construct an error message.
 template <class ELFT>
-std::string InputSectionBase::getLocation(uint64_t Offset) {
-  std::string SecAndOffset = (Name + "+0x" + utohexstr(Offset)).str();
+std::string InputSectionBase::getLocation(uint64_t offset) {
+  std::string secAndOffset = (name + "+0x" + utohexstr(offset)).str();
 
   // We don't have file for synthetic sections.
   if (getFile<ELFT>() == nullptr)
-    return (Config->OutputFile + ":(" + SecAndOffset + ")")
+    return (config->outputFile + ":(" + secAndOffset + ")")
         .str();
 
   // First check if we can get desired values from debugging information.
-  if (Optional<DILineInfo> Info = getFile<ELFT>()->getDILineInfo(this, Offset))
-    return Info->FileName + ":" + std::to_string(Info->Line) + ":(" +
-           SecAndOffset + ")";
+  if (Optional<DILineInfo> info = getFile<ELFT>()->getDILineInfo(this, offset))
+    return info->FileName + ":" + std::to_string(info->Line) + ":(" +
+           secAndOffset + ")";
 
-  // File->SourceFile contains STT_FILE symbol that contains a
+  // File->sourceFile contains STT_FILE symbol that contains a
   // source file name. If it's missing, we use an object file name.
-  std::string SrcFile = getFile<ELFT>()->SourceFile;
-  if (SrcFile.empty())
-    SrcFile = toString(File);
+  std::string srcFile = getFile<ELFT>()->sourceFile;
+  if (srcFile.empty())
+    srcFile = toString(file);
 
-  if (Defined *D = getEnclosingFunction<ELFT>(Offset))
-    return SrcFile + ":(function " + toString(*D) + ": " + SecAndOffset + ")";
+  if (Defined *d = getEnclosingFunction<ELFT>(offset))
+    return srcFile + ":(function " + toString(*d) + ": " + secAndOffset + ")";
 
   // If there's no symbol, print out the offset in the section.
-  return (SrcFile + ":(" + SecAndOffset + ")");
+  return (srcFile + ":(" + secAndOffset + ")");
 }
 
 // This function is intended to be used for constructing an error message.
@@ -319,8 +325,8 @@ std::string InputSectionBase::getLocation(uint64_t Offset) {
 //   foo.c:42 (/home/alice/possibly/very/long/path/foo.c:42)
 //
 //  Returns an empty string if there's no way to get line info.
-std::string InputSectionBase::getSrcMsg(const Symbol &Sym, uint64_t Offset) {
-  return File->getSrcMsg(Sym, *this, Offset);
+std::string InputSectionBase::getSrcMsg(const Symbol &sym, uint64_t offset) {
+  return file->getSrcMsg(sym, *this, offset);
 }
 
 // Returns a filename string along with an optional section name. This
@@ -332,95 +338,96 @@ std::string InputSectionBase::getSrcMsg(const Symbol &Sym, uint64_t Offset) {
 // or
 //
 //   path/to/foo.o:(function bar) in archive path/to/bar.a
-std::string InputSectionBase::getObjMsg(uint64_t Off) {
-  std::string Filename = File->getName();
+std::string InputSectionBase::getObjMsg(uint64_t off) {
+  std::string filename = file->getName();
 
-  std::string Archive;
-  if (!File->ArchiveName.empty())
-    Archive = " in archive " + File->ArchiveName;
+  std::string archive;
+  if (!file->archiveName.empty())
+    archive = " in archive " + file->archiveName;
 
   // Find a symbol that encloses a given location.
-  for (Symbol *B : File->getSymbols())
-    if (auto *D = dyn_cast<Defined>(B))
-      if (D->Section == this && D->Value <= Off && Off < D->Value + D->Size)
-        return Filename + ":(" + toString(*D) + ")" + Archive;
+  for (Symbol *b : file->getSymbols())
+    if (auto *d = dyn_cast<Defined>(b))
+      if (d->section == this && d->value <= off && off < d->value + d->size)
+        return filename + ":(" + toString(*d) + ")" + archive;
 
   // If there's no symbol, print out the offset in the section.
-  return (Filename + ":(" + Name + "+0x" + utohexstr(Off) + ")" + Archive)
+  return (filename + ":(" + name + "+0x" + utohexstr(off) + ")" + archive)
       .str();
 }
 
-InputSection InputSection::Discarded(nullptr, 0, 0, 0, ArrayRef<uint8_t>(), "");
+InputSection InputSection::discarded(nullptr, 0, 0, 0, ArrayRef<uint8_t>(), "");
 
-InputSection::InputSection(InputFile *F, uint64_t Flags, uint32_t Type,
-                           uint32_t Alignment, ArrayRef<uint8_t> Data,
-                           StringRef Name, Kind K)
-    : InputSectionBase(F, Flags, Type,
-                       /*Entsize*/ 0, /*Link*/ 0, /*Info*/ 0, Alignment, Data,
-                       Name, K) {}
+InputSection::InputSection(InputFile *f, uint64_t flags, uint32_t type,
+                           uint32_t alignment, ArrayRef<uint8_t> data,
+                           StringRef name, Kind k)
+    : InputSectionBase(f, flags, type,
+                       /*Entsize*/ 0, /*Link*/ 0, /*Info*/ 0, alignment, data,
+                       name, k) {}
 
 template <class ELFT>
-InputSection::InputSection(ObjFile<ELFT> &F, const typename ELFT::Shdr &Header,
-                           StringRef Name)
-    : InputSectionBase(F, Header, Name, InputSectionBase::Regular) {}
+InputSection::InputSection(ObjFile<ELFT> &f, const typename ELFT::Shdr &header,
+                           StringRef name)
+    : InputSectionBase(f, header, name, InputSectionBase::Regular) {}
 
-bool InputSection::classof(const SectionBase *S) {
-  return S->kind() == SectionBase::Regular ||
-         S->kind() == SectionBase::Synthetic;
+bool InputSection::classof(const SectionBase *s) {
+  return s->kind() == SectionBase::Regular ||
+         s->kind() == SectionBase::Synthetic;
 }
 
 OutputSection *InputSection::getParent() const {
-  return cast_or_null<OutputSection>(Parent);
+  return cast_or_null<OutputSection>(parent);
 }
 
 // Copy SHT_GROUP section contents. Used only for the -r option.
-template <class ELFT> void InputSection::copyShtGroup(uint8_t *Buf) {
+template <class ELFT> void InputSection::copyShtGroup(uint8_t *buf) {
   // ELFT::Word is the 32-bit integral type in the target endianness.
-  typedef typename ELFT::Word u32;
-  ArrayRef<u32> From = getDataAs<u32>();
-  auto *To = reinterpret_cast<u32 *>(Buf);
+  using u32 = typename ELFT::Word;
+  ArrayRef<u32> from = getDataAs<u32>();
+  auto *to = reinterpret_cast<u32 *>(buf);
 
   // The first entry is not a section number but a flag.
-  *To++ = From[0];
+  *to++ = from[0];
 
   // Adjust section numbers because section numbers in an input object
   // files are different in the output.
-  ArrayRef<InputSectionBase *> Sections = File->getSections();
-  for (uint32_t Idx : From.slice(1))
-    *To++ = Sections[Idx]->getOutputSection()->SectionIndex;
+  ArrayRef<InputSectionBase *> sections = file->getSections();
+  for (uint32_t idx : from.slice(1))
+    *to++ = sections[idx]->getOutputSection()->sectionIndex;
 }
 
 InputSectionBase *InputSection::getRelocatedSection() const {
-  if (!File || (Type != SHT_RELA && Type != SHT_REL))
+  if (!file || (type != SHT_RELA && type != SHT_REL))
     return nullptr;
-  ArrayRef<InputSectionBase *> Sections = File->getSections();
-  return Sections[Info];
+  ArrayRef<InputSectionBase *> sections = file->getSections();
+  return sections[info];
 }
 
 // This is used for -r and --emit-relocs. We can't use memcpy to copy
 // relocations because we need to update symbol table offset and section index
 // for each relocation. So we copy relocations one by one.
 template <class ELFT, class RelTy>
-void InputSection::copyRelocations(uint8_t *Buf, ArrayRef<RelTy> Rels) {
-  InputSectionBase *Sec = getRelocatedSection();
+void InputSection::copyRelocations(uint8_t *buf, ArrayRef<RelTy> rels) {
+  InputSectionBase *sec = getRelocatedSection();
 
-  for (const RelTy &Rel : Rels) {
-    RelType Type = Rel.getType(Config->IsMips64EL);
-    Symbol &Sym = getFile<ELFT>()->getRelocTargetSym(Rel);
+  for (const RelTy &rel : rels) {
+    RelType type = rel.getType(config->isMips64EL);
+    const ObjFile<ELFT> *file = getFile<ELFT>();
+    Symbol &sym = file->getRelocTargetSym(rel);
 
-    auto *P = reinterpret_cast<typename ELFT::Rela *>(Buf);
-    Buf += sizeof(RelTy);
+    auto *p = reinterpret_cast<typename ELFT::Rela *>(buf);
+    buf += sizeof(RelTy);
 
     if (RelTy::IsRela)
-      P->r_addend = getAddend<ELFT>(Rel);
+      p->r_addend = getAddend<ELFT>(rel);
 
     // Output section VA is zero for -r, so r_offset is an offset within the
     // section, but for --emit-relocs it is an virtual address.
-    P->r_offset = Sec->getVA(Rel.r_offset);
-    P->setSymbolAndType(In.SymTab->getSymbolIndex(&Sym), Type,
-                        Config->IsMips64EL);
+    p->r_offset = sec->getVA(rel.r_offset);
+    p->setSymbolAndType(in.symTab->getSymbolIndex(&sym), type,
+                        config->isMips64EL);
 
-    if (Sym.Type == STT_SECTION) {
+    if (sym.type == STT_SECTION) {
       // We combine multiple section symbols into only one per
       // section. This means we have to update the addend. That is
       // trivial for Elf_Rela, but for Elf_Rel we have to write to the
@@ -429,25 +436,38 @@ void InputSection::copyRelocations(uint8_t *Buf, ArrayRef<RelTy> Rels) {
       // .eh_frame is horribly special and can reference discarded sections. To
       // avoid having to parse and recreate .eh_frame, we just replace any
       // relocation in it pointing to discarded sections with R_*_NONE, which
-      // hopefully creates a frame that is ignored at runtime.
-      auto *D = dyn_cast<Defined>(&Sym);
-      if (!D) {
-        error("STT_SECTION symbol should be defined");
+      // hopefully creates a frame that is ignored at runtime. Also, don't warn
+      // on .gcc_except_table and debug sections.
+      //
+      // See the comment in maybeReportUndefined for PPC64 .toc .
+      auto *d = dyn_cast<Defined>(&sym);
+      if (!d) {
+        if (!sec->name.startswith(".debug") &&
+            !sec->name.startswith(".zdebug") && sec->name != ".eh_frame" &&
+            sec->name != ".gcc_except_table" && sec->name != ".toc") {
+          uint32_t secIdx = cast<Undefined>(sym).discardedSecIdx;
+          Elf_Shdr_Impl<ELFT> sec =
+              CHECK(file->getObj().sections(), file)[secIdx];
+          warn("relocation refers to a discarded section: " +
+               CHECK(file->getObj().getSectionName(&sec), file) +
+               "\n>>> referenced by " + getObjMsg(p->r_offset));
+        }
+        p->setSymbolAndType(0, 0, false);
         continue;
       }
-      SectionBase *Section = D->Section->Repl;
-      if (!Section->Live) {
-        P->setSymbolAndType(0, 0, false);
+      SectionBase *section = d->section->repl;
+      if (!section->isLive()) {
+        p->setSymbolAndType(0, 0, false);
         continue;
       }
 
-      int64_t Addend = getAddend<ELFT>(Rel);
-      const uint8_t *BufLoc = Sec->data().begin() + Rel.r_offset;
+      int64_t addend = getAddend<ELFT>(rel);
+      const uint8_t *bufLoc = sec->data().begin() + rel.r_offset;
       if (!RelTy::IsRela)
-        Addend = Target->getImplicitAddend(BufLoc, Type);
+        addend = target->getImplicitAddend(bufLoc, type);
 
-      if (Config->EMachine == EM_MIPS && Config->Relocatable &&
-          Target->getRelExpr(Type, Sym, BufLoc) == R_MIPS_GOTREL) {
+      if (config->emachine == EM_MIPS && config->relocatable &&
+          target->getRelExpr(type, sym, bufLoc) == R_MIPS_GOTREL) {
         // Some MIPS relocations depend on "gp" value. By default,
         // this value has 0x7ff0 offset from a .got section. But
         // relocatable files produced by a complier or a linker
@@ -459,13 +479,13 @@ void InputSection::copyRelocations(uint8_t *Buf, ArrayRef<RelTy> Rels) {
         // individual "gp" values used by each input object file.
         // As a workaround we add the "gp" value to the relocation
         // addend and save it back to the file.
-        Addend += Sec->getFile<ELFT>()->MipsGp0;
+        addend += sec->getFile<ELFT>()->mipsGp0;
       }
 
       if (RelTy::IsRela)
-        P->r_addend = Sym.getVA(Addend) - Section->getOutputSection()->Addr;
-      else if (Config->Relocatable)
-        Sec->Relocations.push_back({R_ABS, Type, Rel.r_offset, Addend, &Sym});
+        p->r_addend = sym.getVA(addend) - section->getOutputSection()->addr;
+      else if (config->relocatable && type != target->noneRel)
+        sec->relocations.push_back({R_ABS, type, rel.r_offset, addend, &sym});
     }
   }
 }
@@ -475,13 +495,13 @@ void InputSection::copyRelocations(uint8_t *Buf, ArrayRef<RelTy> Rels) {
 // this context is the address of the place P. A further special case is that
 // branch relocations to an undefined weak reference resolve to the next
 // instruction.
-static uint32_t getARMUndefinedRelativeWeakVA(RelType Type, uint32_t A,
-                                              uint32_t P) {
-  switch (Type) {
+static uint32_t getARMUndefinedRelativeWeakVA(RelType type, uint32_t a,
+                                              uint32_t p) {
+  switch (type) {
   // Unresolved branch relocations to weak references resolve to next
   // instruction, this will be either 2 or 4 bytes on from P.
   case R_ARM_THM_JUMP11:
-    return P + 2 + A;
+    return p + 2 + a;
   case R_ARM_CALL:
   case R_ARM_JUMP24:
   case R_ARM_PC24:
@@ -489,10 +509,10 @@ static uint32_t getARMUndefinedRelativeWeakVA(RelType Type, uint32_t A,
   case R_ARM_PREL31:
   case R_ARM_THM_JUMP19:
   case R_ARM_THM_JUMP24:
-    return P + 4 + A;
+    return p + 4 + a;
   case R_ARM_THM_CALL:
     // We don't want an interworking BLX to ARM
-    return P + 5 + A;
+    return p + 5 + a;
   // Unresolved non branch pc-relative relocations
   // R_ARM_TARGET2 which can be resolved relatively is not present as it never
   // targets a weak-reference.
@@ -501,29 +521,29 @@ static uint32_t getARMUndefinedRelativeWeakVA(RelType Type, uint32_t A,
   case R_ARM_REL32:
   case R_ARM_THM_MOVW_PREL_NC:
   case R_ARM_THM_MOVT_PREL:
-    return P + A;
+    return p + a;
   }
   llvm_unreachable("ARM pc-relative relocation expected\n");
 }
 
 // The comment above getARMUndefinedRelativeWeakVA applies to this function.
-static uint64_t getAArch64UndefinedRelativeWeakVA(uint64_t Type, uint64_t A,
-                                                  uint64_t P) {
-  switch (Type) {
+static uint64_t getAArch64UndefinedRelativeWeakVA(uint64_t type, uint64_t a,
+                                                  uint64_t p) {
+  switch (type) {
   // Unresolved branch relocations to weak references resolve to next
   // instruction, this is 4 bytes on from P.
   case R_AARCH64_CALL26:
   case R_AARCH64_CONDBR19:
   case R_AARCH64_JUMP26:
   case R_AARCH64_TSTBR14:
-    return P + 4 + A;
+    return p + 4 + a;
   // Unresolved non branch pc-relative relocations
   case R_AARCH64_PREL16:
   case R_AARCH64_PREL32:
   case R_AARCH64_PREL64:
   case R_AARCH64_ADR_PREL_LO21:
   case R_AARCH64_LD_PREL_LO19:
-    return P + A;
+    return p + a;
   }
   llvm_unreachable("AArch64 pc-relative relocation expected\n");
 }
@@ -535,11 +555,11 @@ static uint64_t getAArch64UndefinedRelativeWeakVA(uint64_t Type, uint64_t A,
 // The procedure call standard only defines a Read Write Position Independent
 // RWPI variant so in practice we should expect the static base to be the base
 // of the RW segment.
-static uint64_t getARMStaticBase(const Symbol &Sym) {
-  OutputSection *OS = Sym.getOutputSection();
-  if (!OS || !OS->PtLoad || !OS->PtLoad->FirstSec)
-    fatal("SBREL relocation to " + Sym.getName() + " without static base");
-  return OS->PtLoad->FirstSec->Addr;
+static uint64_t getARMStaticBase(const Symbol &sym) {
+  OutputSection *os = sym.getOutputSection();
+  if (!os || !os->ptLoad || !os->ptLoad->firstSec)
+    fatal("SBREL relocation to " + sym.getName() + " without static base");
+  return os->ptLoad->firstSec->addr;
 }
 
 // For R_RISCV_PC_INDIRECT (R_RISCV_PCREL_LO12_{I,S}), the symbol actually
@@ -548,101 +568,115 @@ static uint64_t getARMStaticBase(const Symbol &Sym) {
 //
 // This function returns the R_RISCV_PCREL_HI20 relocation from
 // R_RISCV_PCREL_LO12's symbol and addend.
-static Relocation *getRISCVPCRelHi20(const Symbol *Sym, uint64_t Addend) {
-  const Defined *D = cast<Defined>(Sym);
-  InputSection *IS = cast<InputSection>(D->Section);
+static Relocation *getRISCVPCRelHi20(const Symbol *sym, uint64_t addend) {
+  const Defined *d = cast<Defined>(sym);
+  if (!d->section) {
+    error("R_RISCV_PCREL_LO12 relocation points to an absolute symbol: " +
+          sym->getName());
+    return nullptr;
+  }
+  InputSection *isec = cast<InputSection>(d->section);
 
-  if (Addend != 0)
+  if (addend != 0)
     warn("Non-zero addend in R_RISCV_PCREL_LO12 relocation to " +
-         IS->getObjMsg(D->Value) + " is ignored");
+         isec->getObjMsg(d->value) + " is ignored");
 
   // Relocations are sorted by offset, so we can use std::equal_range to do
   // binary search.
-  auto Range = std::equal_range(IS->Relocations.begin(), IS->Relocations.end(),
-                                D->Value, RelocationOffsetComparator{});
-  for (auto It = std::get<0>(Range); It != std::get<1>(Range); ++It)
-    if (isRelExprOneOf<R_PC>(It->Expr))
-      return &*It;
+  Relocation r;
+  r.offset = d->value;
+  auto range =
+      std::equal_range(isec->relocations.begin(), isec->relocations.end(), r,
+                       [](const Relocation &lhs, const Relocation &rhs) {
+                         return lhs.offset < rhs.offset;
+                       });
 
-  error("R_RISCV_PCREL_LO12 relocation points to " + IS->getObjMsg(D->Value) +
+  for (auto it = range.first; it != range.second; ++it)
+    if (it->type == R_RISCV_PCREL_HI20 || it->type == R_RISCV_GOT_HI20 ||
+        it->type == R_RISCV_TLS_GD_HI20 || it->type == R_RISCV_TLS_GOT_HI20)
+      return &*it;
+
+  error("R_RISCV_PCREL_LO12 relocation points to " + isec->getObjMsg(d->value) +
         " without an associated R_RISCV_PCREL_HI20 relocation");
   return nullptr;
 }
 
 // A TLS symbol's virtual address is relative to the TLS segment. Add a
 // target-specific adjustment to produce a thread-pointer-relative offset.
-static int64_t getTlsTpOffset() {
-  switch (Config->EMachine) {
+static int64_t getTlsTpOffset(const Symbol &s) {
+  // On targets that support TLSDESC, _TLS_MODULE_BASE_@tpoff = 0.
+  if (&s == ElfSym::tlsModuleBase)
+    return 0;
+
+  switch (config->emachine) {
   case EM_ARM:
   case EM_AARCH64:
     // Variant 1. The thread pointer points to a TCB with a fixed 2-word size,
     // followed by a variable amount of alignment padding, followed by the TLS
     // segment.
-    //
-    // NB: While the ARM/AArch64 ABI formally has a 2-word TCB size, lld
-    // effectively increases the TCB size to 8 words for Android compatibility.
-    // It accomplishes this by increasing the segment's alignment.
-    return alignTo(Config->Wordsize * 2, Out::TlsPhdr->p_align);
+    return s.getVA(0) + alignTo(config->wordsize * 2, Out::tlsPhdr->p_align);
   case EM_386:
   case EM_X86_64:
     // Variant 2. The TLS segment is located just before the thread pointer.
-    return -Out::TlsPhdr->p_memsz;
+    return s.getVA(0) - alignTo(Out::tlsPhdr->p_memsz, Out::tlsPhdr->p_align);
+  case EM_PPC:
   case EM_PPC64:
     // The thread pointer points to a fixed offset from the start of the
     // executable's TLS segment. An offset of 0x7000 allows a signed 16-bit
     // offset to reach 0x1000 of TCB/thread-library data and 0xf000 of the
     // program's TLS segment.
-    return -0x7000;
+    return s.getVA(0) - 0x7000;
+  case EM_RISCV:
+    return s.getVA(0);
   default:
     llvm_unreachable("unhandled Config->EMachine");
   }
 }
 
-static uint64_t getRelocTargetVA(const InputFile *File, RelType Type, int64_t A,
-                                 uint64_t P, const Symbol &Sym, RelExpr Expr) {
-  switch (Expr) {
-  case R_INVALID:
-    return 0;
+static uint64_t getRelocTargetVA(const InputFile *file, RelType type, int64_t a,
+                                 uint64_t p, const Symbol &sym, RelExpr expr) {
+  switch (expr) {
   case R_ABS:
+  case R_DTPREL:
   case R_RELAX_TLS_LD_TO_LE_ABS:
   case R_RELAX_GOT_PC_NOPIC:
-    return Sym.getVA(A);
+  case R_RISCV_ADD:
+    return sym.getVA(a);
   case R_ADDEND:
-    return A;
+    return a;
   case R_ARM_SBREL:
-    return Sym.getVA(A) - getARMStaticBase(Sym);
+    return sym.getVA(a) - getARMStaticBase(sym);
   case R_GOT:
-  case R_GOT_PLT:
   case R_RELAX_TLS_GD_TO_IE_ABS:
-    return Sym.getGotVA() + A;
+    return sym.getGotVA() + a;
   case R_GOTONLY_PC:
-    return In.Got->getVA() + A - P;
-  case R_GOTONLY_PC_FROM_END:
-    return In.Got->getVA() + A - P + In.Got->getSize();
+    return in.got->getVA() + a - p;
+  case R_GOTPLTONLY_PC:
+    return in.gotPlt->getVA() + a - p;
   case R_GOTREL:
-    return Sym.getVA(A) - In.Got->getVA();
-  case R_GOTREL_FROM_END:
-    return Sym.getVA(A) - In.Got->getVA() - In.Got->getSize();
-  case R_GOT_FROM_END:
-  case R_RELAX_TLS_GD_TO_IE_END:
-    return Sym.getGotOffset() + A - In.Got->getSize();
+  case R_PPC64_RELAX_TOC:
+    return sym.getVA(a) - in.got->getVA();
+  case R_GOTPLTREL:
+    return sym.getVA(a) - in.gotPlt->getVA();
+  case R_GOTPLT:
+  case R_RELAX_TLS_GD_TO_IE_GOTPLT:
+    return sym.getGotVA() + a - in.gotPlt->getVA();
   case R_TLSLD_GOT_OFF:
   case R_GOT_OFF:
   case R_RELAX_TLS_GD_TO_IE_GOT_OFF:
-    return Sym.getGotOffset() + A;
+    return sym.getGotOffset() + a;
   case R_AARCH64_GOT_PAGE_PC:
-  case R_AARCH64_GOT_PAGE_PC_PLT:
   case R_AARCH64_RELAX_TLS_GD_TO_IE_PAGE_PC:
-    return getAArch64Page(Sym.getGotVA() + A) - getAArch64Page(P);
+    return getAArch64Page(sym.getGotVA() + a) - getAArch64Page(p);
   case R_GOT_PC:
   case R_RELAX_TLS_GD_TO_IE:
-    return Sym.getGotVA() + A - P;
+    return sym.getGotVA() + a - p;
   case R_HEXAGON_GOT:
-    return Sym.getGotVA() - In.GotPlt->getVA();
+    return sym.getGotVA() - in.gotPlt->getVA();
   case R_MIPS_GOTREL:
-    return Sym.getVA(A) - In.MipsGot->getGp(File);
+    return sym.getVA(a) - in.mipsGot->getGp(file);
   case R_MIPS_GOT_GP:
-    return In.MipsGot->getGp(File) + A;
+    return in.mipsGot->getGp(file) + a;
   case R_MIPS_GOT_GP_PC: {
     // R_MIPS_LO16 expression has R_MIPS_GOT_GP_PC type iif the target
     // is _gp_disp symbol. In that case we should use the following
@@ -651,73 +685,76 @@ static uint64_t getRelocTargetVA(const InputFile *File, RelType Type, int64_t A,
     // microMIPS variants of these relocations use slightly different
     // expressions: AHL + GP - P + 3 for %lo() and AHL + GP - P - 1 for %hi()
     // to correctly handle less-sugnificant bit of the microMIPS symbol.
-    uint64_t V = In.MipsGot->getGp(File) + A - P;
-    if (Type == R_MIPS_LO16 || Type == R_MICROMIPS_LO16)
-      V += 4;
-    if (Type == R_MICROMIPS_LO16 || Type == R_MICROMIPS_HI16)
-      V -= 1;
-    return V;
+    uint64_t v = in.mipsGot->getGp(file) + a - p;
+    if (type == R_MIPS_LO16 || type == R_MICROMIPS_LO16)
+      v += 4;
+    if (type == R_MICROMIPS_LO16 || type == R_MICROMIPS_HI16)
+      v -= 1;
+    return v;
   }
   case R_MIPS_GOT_LOCAL_PAGE:
     // If relocation against MIPS local symbol requires GOT entry, this entry
     // should be initialized by 'page address'. This address is high 16-bits
     // of sum the symbol's value and the addend.
-    return In.MipsGot->getVA() + In.MipsGot->getPageEntryOffset(File, Sym, A) -
-           In.MipsGot->getGp(File);
+    return in.mipsGot->getVA() + in.mipsGot->getPageEntryOffset(file, sym, a) -
+           in.mipsGot->getGp(file);
   case R_MIPS_GOT_OFF:
   case R_MIPS_GOT_OFF32:
     // In case of MIPS if a GOT relocation has non-zero addend this addend
     // should be applied to the GOT entry content not to the GOT entry offset.
     // That is why we use separate expression type.
-    return In.MipsGot->getVA() + In.MipsGot->getSymEntryOffset(File, Sym, A) -
-           In.MipsGot->getGp(File);
+    return in.mipsGot->getVA() + in.mipsGot->getSymEntryOffset(file, sym, a) -
+           in.mipsGot->getGp(file);
   case R_MIPS_TLSGD:
-    return In.MipsGot->getVA() + In.MipsGot->getGlobalDynOffset(File, Sym) -
-           In.MipsGot->getGp(File);
+    return in.mipsGot->getVA() + in.mipsGot->getGlobalDynOffset(file, sym) -
+           in.mipsGot->getGp(file);
   case R_MIPS_TLSLD:
-    return In.MipsGot->getVA() + In.MipsGot->getTlsIndexOffset(File) -
-           In.MipsGot->getGp(File);
+    return in.mipsGot->getVA() + in.mipsGot->getTlsIndexOffset(file) -
+           in.mipsGot->getGp(file);
   case R_AARCH64_PAGE_PC: {
-    uint64_t Val = Sym.isUndefWeak() ? P + A : Sym.getVA(A);
-    return getAArch64Page(Val) - getAArch64Page(P);
-  }
-  case R_AARCH64_PLT_PAGE_PC: {
-    uint64_t Val = Sym.isUndefWeak() ? P + A : Sym.getPltVA() + A;
-    return getAArch64Page(Val) - getAArch64Page(P);
+    uint64_t val = sym.isUndefWeak() ? p + a : sym.getVA(a);
+    return getAArch64Page(val) - getAArch64Page(p);
   }
   case R_RISCV_PC_INDIRECT: {
-    if (const Relocation *HiRel = getRISCVPCRelHi20(&Sym, A))
-      return getRelocTargetVA(File, HiRel->Type, HiRel->Addend, Sym.getVA(),
-                              *HiRel->Sym, HiRel->Expr);
+    if (const Relocation *hiRel = getRISCVPCRelHi20(&sym, a))
+      return getRelocTargetVA(file, hiRel->type, hiRel->addend, sym.getVA(),
+                              *hiRel->sym, hiRel->expr);
     return 0;
   }
   case R_PC: {
-    uint64_t Dest;
-    if (Sym.isUndefWeak()) {
+    uint64_t dest;
+    if (sym.isUndefWeak()) {
       // On ARM and AArch64 a branch to an undefined weak resolves to the
       // next instruction, otherwise the place.
-      if (Config->EMachine == EM_ARM)
-        Dest = getARMUndefinedRelativeWeakVA(Type, A, P);
-      else if (Config->EMachine == EM_AARCH64)
-        Dest = getAArch64UndefinedRelativeWeakVA(Type, A, P);
+      if (config->emachine == EM_ARM)
+        dest = getARMUndefinedRelativeWeakVA(type, a, p);
+      else if (config->emachine == EM_AARCH64)
+        dest = getAArch64UndefinedRelativeWeakVA(type, a, p);
+      else if (config->emachine == EM_PPC)
+        dest = p;
       else
-        Dest = Sym.getVA(A);
+        dest = sym.getVA(a);
     } else {
-      Dest = Sym.getVA(A);
+      dest = sym.getVA(a);
     }
-    return Dest - P;
+    return dest - p;
   }
   case R_PLT:
-    return Sym.getPltVA() + A;
+    return sym.getPltVA() + a;
   case R_PLT_PC:
-  case R_PPC_CALL_PLT:
-    return Sym.getPltVA() + A - P;
-  case R_PPC_CALL: {
-    uint64_t SymVA = Sym.getVA(A);
+  case R_PPC64_CALL_PLT:
+    return sym.getPltVA() + a - p;
+  case R_PPC32_PLTREL:
+    // R_PPC_PLTREL24 uses the addend (usually 0 or 0x8000) to indicate r30
+    // stores _GLOBAL_OFFSET_TABLE_ or .got2+0x8000. The addend is ignored for
+    // target VA compuation.
+    return sym.getPltVA() - p;
+  case R_PPC64_CALL: {
+    uint64_t symVA = sym.getVA(a);
     // If we have an undefined weak symbol, we might get here with a symbol
     // address of zero. That could overflow, but the code must be unreachable,
     // so don't bother doing anything at all.
-    if (!SymVA)
+    if (!symVA)
       return 0;
 
     // PPC64 V2 ABI describes two entry points to a function. The global entry
@@ -726,46 +763,49 @@ static uint64_t getRelocTargetVA(const InputFile *File, RelType Type, int64_t A,
     // the callee. For local calls the caller and callee share the same
     // TOC base and so the TOC pointer initialization code should be skipped by
     // branching to the local entry point.
-    return SymVA - P + getPPC64GlobalEntryToLocalEntryOffset(Sym.StOther);
+    return symVA - p + getPPC64GlobalEntryToLocalEntryOffset(sym.stOther);
   }
-  case R_PPC_TOC:
-    return getPPC64TocBase() + A;
+  case R_PPC64_TOCBASE:
+    return getPPC64TocBase() + a;
   case R_RELAX_GOT_PC:
-    return Sym.getVA(A) - P;
+    return sym.getVA(a) - p;
   case R_RELAX_TLS_GD_TO_LE:
   case R_RELAX_TLS_IE_TO_LE:
   case R_RELAX_TLS_LD_TO_LE:
   case R_TLS:
-    // A weak undefined TLS symbol resolves to the base of the TLS
-    // block, i.e. gets a value of zero. If we pass --gc-sections to
-    // lld and .tbss is not referenced, it gets reclaimed and we don't
-    // create a TLS program header. Therefore, we resolve this
-    // statically to zero.
-    if (Sym.isTls() && Sym.isUndefWeak())
-      return 0;
-    return Sym.getVA(A) + getTlsTpOffset();
+    // It is not very clear what to return if the symbol is undefined. With
+    // --noinhibit-exec, even a non-weak undefined reference may reach here.
+    // Just return A, which matches R_ABS, and the behavior of some dynamic
+    // loaders.
+    if (sym.isUndefined())
+      return a;
+    return getTlsTpOffset(sym) + a;
   case R_RELAX_TLS_GD_TO_LE_NEG:
   case R_NEG_TLS:
-    return Out::TlsPhdr->p_memsz - Sym.getVA(A);
+    if (sym.isUndefined())
+      return a;
+    return -getTlsTpOffset(sym) + a;
   case R_SIZE:
-    return Sym.getSize() + A;
+    return sym.getSize() + a;
   case R_TLSDESC:
-    return In.Got->getGlobalDynAddr(Sym) + A;
+    return in.got->getGlobalDynAddr(sym) + a;
+  case R_TLSDESC_PC:
+    return in.got->getGlobalDynAddr(sym) + a - p;
   case R_AARCH64_TLSDESC_PAGE:
-    return getAArch64Page(In.Got->getGlobalDynAddr(Sym) + A) -
-           getAArch64Page(P);
+    return getAArch64Page(in.got->getGlobalDynAddr(sym) + a) -
+           getAArch64Page(p);
   case R_TLSGD_GOT:
-    return In.Got->getGlobalDynOffset(Sym) + A;
-  case R_TLSGD_GOT_FROM_END:
-    return In.Got->getGlobalDynOffset(Sym) + A - In.Got->getSize();
+    return in.got->getGlobalDynOffset(sym) + a;
+  case R_TLSGD_GOTPLT:
+    return in.got->getVA() + in.got->getGlobalDynOffset(sym) + a - in.gotPlt->getVA();
   case R_TLSGD_PC:
-    return In.Got->getGlobalDynAddr(Sym) + A - P;
-  case R_TLSLD_GOT_FROM_END:
-    return In.Got->getTlsIndexOff() + A - In.Got->getSize();
+    return in.got->getGlobalDynAddr(sym) + a - p;
+  case R_TLSLD_GOTPLT:
+    return in.got->getVA() + in.got->getTlsIndexOff() + a - in.gotPlt->getVA();
   case R_TLSLD_GOT:
-    return In.Got->getTlsIndexOff() + A;
+    return in.got->getTlsIndexOff() + a;
   case R_TLSLD_PC:
-    return In.Got->getTlsIndexVA() + A - P;
+    return in.got->getTlsIndexVA() + a - p;
   default:
     llvm_unreachable("invalid expression");
   }
@@ -779,36 +819,36 @@ static uint64_t getRelocTargetVA(const InputFile *File, RelType Type, int64_t A,
 // So, we handle relocations for non-alloc sections directly in this
 // function as a performance optimization.
 template <class ELFT, class RelTy>
-void InputSection::relocateNonAlloc(uint8_t *Buf, ArrayRef<RelTy> Rels) {
-  const unsigned Bits = sizeof(typename ELFT::uint) * 8;
+void InputSection::relocateNonAlloc(uint8_t *buf, ArrayRef<RelTy> rels) {
+  const unsigned bits = sizeof(typename ELFT::uint) * 8;
 
-  for (const RelTy &Rel : Rels) {
-    RelType Type = Rel.getType(Config->IsMips64EL);
+  for (const RelTy &rel : rels) {
+    RelType type = rel.getType(config->isMips64EL);
 
     // GCC 8.0 or earlier have a bug that they emit R_386_GOTPC relocations
     // against _GLOBAL_OFFSET_TABLE_ for .debug_info. The bug has been fixed
     // in 2017 (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82630), but we
     // need to keep this bug-compatible code for a while.
-    if (Config->EMachine == EM_386 && Type == R_386_GOTPC)
+    if (config->emachine == EM_386 && type == R_386_GOTPC)
       continue;
 
-    uint64_t Offset = getOffset(Rel.r_offset);
-    uint8_t *BufLoc = Buf + Offset;
-    int64_t Addend = getAddend<ELFT>(Rel);
+    uint64_t offset = getOffset(rel.r_offset);
+    uint8_t *bufLoc = buf + offset;
+    int64_t addend = getAddend<ELFT>(rel);
     if (!RelTy::IsRela)
-      Addend += Target->getImplicitAddend(BufLoc, Type);
+      addend += target->getImplicitAddend(bufLoc, type);
 
-    Symbol &Sym = getFile<ELFT>()->getRelocTargetSym(Rel);
-    RelExpr Expr = Target->getRelExpr(Type, Sym, BufLoc);
-    if (Expr == R_NONE)
+    Symbol &sym = getFile<ELFT>()->getRelocTargetSym(rel);
+    RelExpr expr = target->getRelExpr(type, sym, bufLoc);
+    if (expr == R_NONE)
       continue;
 
-    if (Expr != R_ABS) {
-      std::string Msg = getLocation<ELFT>(Offset) +
-                        ": has non-ABS relocation " + toString(Type) +
-                        " against symbol '" + toString(Sym) + "'";
-      if (Expr != R_PC) {
-        error(Msg);
+    if (expr != R_ABS && expr != R_DTPREL && expr != R_RISCV_ADD) {
+      std::string msg = getLocation<ELFT>(offset) +
+                        ": has non-ABS relocation " + toString(type) +
+                        " against symbol '" + toString(sym) + "'";
+      if (expr != R_PC) {
+        error(msg);
         return;
       }
 
@@ -819,16 +859,16 @@ void InputSection::relocateNonAlloc(uint8_t *Buf, ArrayRef<RelTy> Rels) {
       // relocations without any errors and relocate them as if they were at
       // address 0. For bug-compatibilty, we accept them with warnings. We
       // know Steel Bank Common Lisp as of 2018 have this bug.
-      warn(Msg);
-      Target->relocateOne(BufLoc, Type,
-                          SignExtend64<Bits>(Sym.getVA(Addend - Offset)));
+      warn(msg);
+      target->relocateOne(bufLoc, type,
+                          SignExtend64<bits>(sym.getVA(addend - offset)));
       continue;
     }
 
-    if (Sym.isTls() && !Out::TlsPhdr)
-      Target->relocateOne(BufLoc, Type, 0);
+    if (sym.isTls() && !Out::tlsPhdr)
+      target->relocateOne(bufLoc, type, 0);
     else
-      Target->relocateOne(BufLoc, Type, SignExtend64<Bits>(Sym.getVA(Addend)));
+      target->relocateOne(bufLoc, type, SignExtend64<bits>(sym.getVA(addend)));
   }
 }
 
@@ -837,96 +877,100 @@ void InputSection::relocateNonAlloc(uint8_t *Buf, ArrayRef<RelTy> Rels) {
 // relocations aimed to update addends. They are handled in relocateAlloc()
 // for allocatable sections, and this function does the same for
 // non-allocatable sections, such as sections with debug information.
-static void relocateNonAllocForRelocatable(InputSection *Sec, uint8_t *Buf) {
-  const unsigned Bits = Config->Is64 ? 64 : 32;
+static void relocateNonAllocForRelocatable(InputSection *sec, uint8_t *buf) {
+  const unsigned bits = config->is64 ? 64 : 32;
 
-  for (const Relocation &Rel : Sec->Relocations) {
+  for (const Relocation &rel : sec->relocations) {
     // InputSection::copyRelocations() adds only R_ABS relocations.
-    assert(Rel.Expr == R_ABS);
-    uint8_t *BufLoc = Buf + Rel.Offset + Sec->OutSecOff;
-    uint64_t TargetVA = SignExtend64(Rel.Sym->getVA(Rel.Addend), Bits);
-    Target->relocateOne(BufLoc, Rel.Type, TargetVA);
+    assert(rel.expr == R_ABS);
+    uint8_t *bufLoc = buf + rel.offset + sec->outSecOff;
+    uint64_t targetVA = SignExtend64(rel.sym->getVA(rel.addend), bits);
+    target->relocateOne(bufLoc, rel.type, targetVA);
   }
 }
 
 template <class ELFT>
-void InputSectionBase::relocate(uint8_t *Buf, uint8_t *BufEnd) {
-  if (Flags & SHF_EXECINSTR)
-    adjustSplitStackFunctionPrologues<ELFT>(Buf, BufEnd);
+void InputSectionBase::relocate(uint8_t *buf, uint8_t *bufEnd) {
+  if (flags & SHF_EXECINSTR)
+    adjustSplitStackFunctionPrologues<ELFT>(buf, bufEnd);
 
-  if (Flags & SHF_ALLOC) {
-    relocateAlloc(Buf, BufEnd);
+  if (flags & SHF_ALLOC) {
+    relocateAlloc(buf, bufEnd);
     return;
   }
 
-  auto *Sec = cast<InputSection>(this);
-  if (Config->Relocatable)
-    relocateNonAllocForRelocatable(Sec, Buf);
-  else if (Sec->AreRelocsRela)
-    Sec->relocateNonAlloc<ELFT>(Buf, Sec->template relas<ELFT>());
+  auto *sec = cast<InputSection>(this);
+  if (config->relocatable)
+    relocateNonAllocForRelocatable(sec, buf);
+  else if (sec->areRelocsRela)
+    sec->relocateNonAlloc<ELFT>(buf, sec->template relas<ELFT>());
   else
-    Sec->relocateNonAlloc<ELFT>(Buf, Sec->template rels<ELFT>());
+    sec->relocateNonAlloc<ELFT>(buf, sec->template rels<ELFT>());
 }
 
-void InputSectionBase::relocateAlloc(uint8_t *Buf, uint8_t *BufEnd) {
-  assert(Flags & SHF_ALLOC);
-  const unsigned Bits = Config->Wordsize * 8;
+void InputSectionBase::relocateAlloc(uint8_t *buf, uint8_t *bufEnd) {
+  assert(flags & SHF_ALLOC);
+  const unsigned bits = config->wordsize * 8;
 
-  for (const Relocation &Rel : Relocations) {
-    uint64_t Offset = Rel.Offset;
-    if (auto *Sec = dyn_cast<InputSection>(this))
-      Offset += Sec->OutSecOff;
-    uint8_t *BufLoc = Buf + Offset;
-    RelType Type = Rel.Type;
+  for (const Relocation &rel : relocations) {
+    uint64_t offset = rel.offset;
+    if (auto *sec = dyn_cast<InputSection>(this))
+      offset += sec->outSecOff;
+    uint8_t *bufLoc = buf + offset;
+    RelType type = rel.type;
 
-    uint64_t AddrLoc = getOutputSection()->Addr + Offset;
-    RelExpr Expr = Rel.Expr;
-    uint64_t TargetVA = SignExtend64(
-        getRelocTargetVA(File, Type, Rel.Addend, AddrLoc, *Rel.Sym, Expr),
-        Bits);
+    uint64_t addrLoc = getOutputSection()->addr + offset;
+    RelExpr expr = rel.expr;
+    uint64_t targetVA = SignExtend64(
+        getRelocTargetVA(file, type, rel.addend, addrLoc, *rel.sym, expr),
+        bits);
 
-    switch (Expr) {
+    switch (expr) {
     case R_RELAX_GOT_PC:
     case R_RELAX_GOT_PC_NOPIC:
-      Target->relaxGot(BufLoc, TargetVA);
+      target->relaxGot(bufLoc, type, targetVA);
+      break;
+    case R_PPC64_RELAX_TOC:
+      if (!tryRelaxPPC64TocIndirection(type, rel, bufLoc))
+        target->relocateOne(bufLoc, type, targetVA);
       break;
     case R_RELAX_TLS_IE_TO_LE:
-      Target->relaxTlsIeToLe(BufLoc, Type, TargetVA);
+      target->relaxTlsIeToLe(bufLoc, type, targetVA);
       break;
     case R_RELAX_TLS_LD_TO_LE:
     case R_RELAX_TLS_LD_TO_LE_ABS:
-      Target->relaxTlsLdToLe(BufLoc, Type, TargetVA);
+      target->relaxTlsLdToLe(bufLoc, type, targetVA);
       break;
     case R_RELAX_TLS_GD_TO_LE:
     case R_RELAX_TLS_GD_TO_LE_NEG:
-      Target->relaxTlsGdToLe(BufLoc, Type, TargetVA);
+      target->relaxTlsGdToLe(bufLoc, type, targetVA);
       break;
     case R_AARCH64_RELAX_TLS_GD_TO_IE_PAGE_PC:
     case R_RELAX_TLS_GD_TO_IE:
     case R_RELAX_TLS_GD_TO_IE_ABS:
     case R_RELAX_TLS_GD_TO_IE_GOT_OFF:
-    case R_RELAX_TLS_GD_TO_IE_END:
-      Target->relaxTlsGdToIe(BufLoc, Type, TargetVA);
+    case R_RELAX_TLS_GD_TO_IE_GOTPLT:
+      target->relaxTlsGdToIe(bufLoc, type, targetVA);
       break;
-    case R_PPC_CALL:
+    case R_PPC64_CALL:
       // If this is a call to __tls_get_addr, it may be part of a TLS
       // sequence that has been relaxed and turned into a nop. In this
       // case, we don't want to handle it as a call.
-      if (read32(BufLoc) == 0x60000000) // nop
+      if (read32(bufLoc) == 0x60000000) // nop
         break;
 
       // Patch a nop (0x60000000) to a ld.
-      if (Rel.Sym->NeedsTocRestore) {
-        if (BufLoc + 8 > BufEnd || read32(BufLoc + 4) != 0x60000000) {
-          error(getErrorLocation(BufLoc) + "call lacks nop, can't restore toc");
+      if (rel.sym->needsTocRestore) {
+        if (bufLoc + 8 > bufEnd || read32(bufLoc + 4) != 0x60000000) {
+          error(getErrorLocation(bufLoc) + "call lacks nop, can't restore toc");
           break;
         }
-        write32(BufLoc + 4, 0xe8410018); // ld %r2, 24(%r1)
+        write32(bufLoc + 4, 0xe8410018); // ld %r2, 24(%r1)
       }
-      Target->relocateOne(BufLoc, Type, TargetVA);
+      target->relocateOne(bufLoc, type, targetVA);
       break;
     default:
-      Target->relocateOne(BufLoc, Type, TargetVA);
+      target->relocateOne(bufLoc, type, targetVA);
       break;
     }
   }
@@ -935,44 +979,44 @@ void InputSectionBase::relocateAlloc(uint8_t *Buf, uint8_t *BufEnd) {
 // For each function-defining prologue, find any calls to __morestack,
 // and replace them with calls to __morestack_non_split.
 static void switchMorestackCallsToMorestackNonSplit(
-    DenseSet<Defined *> &Prologues, std::vector<Relocation *> &MorestackCalls) {
+    DenseSet<Defined *> &prologues, std::vector<Relocation *> &morestackCalls) {
 
   // If the target adjusted a function's prologue, all calls to
   // __morestack inside that function should be switched to
   // __morestack_non_split.
-  Symbol *MoreStackNonSplit = Symtab->find("__morestack_non_split");
-  if (!MoreStackNonSplit) {
+  Symbol *moreStackNonSplit = symtab->find("__morestack_non_split");
+  if (!moreStackNonSplit) {
     error("Mixing split-stack objects requires a definition of "
           "__morestack_non_split");
     return;
   }
 
   // Sort both collections to compare addresses efficiently.
-  llvm::sort(MorestackCalls, [](const Relocation *L, const Relocation *R) {
-    return L->Offset < R->Offset;
+  llvm::sort(morestackCalls, [](const Relocation *l, const Relocation *r) {
+    return l->offset < r->offset;
   });
-  std::vector<Defined *> Functions(Prologues.begin(), Prologues.end());
-  llvm::sort(Functions, [](const Defined *L, const Defined *R) {
-    return L->Value < R->Value;
+  std::vector<Defined *> functions(prologues.begin(), prologues.end());
+  llvm::sort(functions, [](const Defined *l, const Defined *r) {
+    return l->value < r->value;
   });
 
-  auto It = MorestackCalls.begin();
-  for (Defined *F : Functions) {
+  auto it = morestackCalls.begin();
+  for (Defined *f : functions) {
     // Find the first call to __morestack within the function.
-    while (It != MorestackCalls.end() && (*It)->Offset < F->Value)
-      ++It;
+    while (it != morestackCalls.end() && (*it)->offset < f->value)
+      ++it;
     // Adjust all calls inside the function.
-    while (It != MorestackCalls.end() && (*It)->Offset < F->Value + F->Size) {
-      (*It)->Sym = MoreStackNonSplit;
-      ++It;
+    while (it != morestackCalls.end() && (*it)->offset < f->value + f->size) {
+      (*it)->sym = moreStackNonSplit;
+      ++it;
     }
   }
 }
 
-static bool enclosingPrologueAttempted(uint64_t Offset,
-                                       const DenseSet<Defined *> &Prologues) {
-  for (Defined *F : Prologues)
-    if (F->Value <= Offset && Offset < F->Value + F->Size)
+static bool enclosingPrologueAttempted(uint64_t offset,
+                                       const DenseSet<Defined *> &prologues) {
+  for (Defined *f : prologues)
+    if (f->value <= offset && offset < f->value + f->size)
       return true;
   return false;
 }
@@ -982,30 +1026,30 @@ static bool enclosingPrologueAttempted(uint64_t Offset,
 // adjusted to ensure that the called function will have enough stack
 // available. Find those functions, and adjust their prologues.
 template <class ELFT>
-void InputSectionBase::adjustSplitStackFunctionPrologues(uint8_t *Buf,
-                                                         uint8_t *End) {
-  if (!getFile<ELFT>()->SplitStack)
+void InputSectionBase::adjustSplitStackFunctionPrologues(uint8_t *buf,
+                                                         uint8_t *end) {
+  if (!getFile<ELFT>()->splitStack)
     return;
-  DenseSet<Defined *> Prologues;
-  std::vector<Relocation *> MorestackCalls;
+  DenseSet<Defined *> prologues;
+  std::vector<Relocation *> morestackCalls;
 
-  for (Relocation &Rel : Relocations) {
+  for (Relocation &rel : relocations) {
     // Local symbols can't possibly be cross-calls, and should have been
     // resolved long before this line.
-    if (Rel.Sym->isLocal())
+    if (rel.sym->isLocal())
       continue;
 
     // Ignore calls into the split-stack api.
-    if (Rel.Sym->getName().startswith("__morestack")) {
-      if (Rel.Sym->getName().equals("__morestack"))
-        MorestackCalls.push_back(&Rel);
+    if (rel.sym->getName().startswith("__morestack")) {
+      if (rel.sym->getName().equals("__morestack"))
+        morestackCalls.push_back(&rel);
       continue;
     }
 
     // A relocation to non-function isn't relevant. Sometimes
     // __morestack is not marked as a function, so this check comes
     // after the name check.
-    if (Rel.Sym->Type != STT_FUNC)
+    if (rel.sym->type != STT_FUNC)
       continue;
 
     // If the callee's-file was compiled with split stack, nothing to do.  In
@@ -1013,106 +1057,117 @@ void InputSectionBase::adjustSplitStackFunctionPrologues(uint8_t *Buf,
     // being produced". So an "undefined" symbol might be provided by a shared
     // library. It is not possible to tell how such symbols were compiled, so be
     // conservative.
-    if (Defined *D = dyn_cast<Defined>(Rel.Sym))
-      if (InputSection *IS = cast_or_null<InputSection>(D->Section))
-        if (!IS || !IS->getFile<ELFT>() || IS->getFile<ELFT>()->SplitStack)
+    if (Defined *d = dyn_cast<Defined>(rel.sym))
+      if (InputSection *isec = cast_or_null<InputSection>(d->section))
+        if (!isec || !isec->getFile<ELFT>() || isec->getFile<ELFT>()->splitStack)
           continue;
 
-    if (enclosingPrologueAttempted(Rel.Offset, Prologues))
+    if (enclosingPrologueAttempted(rel.offset, prologues))
       continue;
 
-    if (Defined *F = getEnclosingFunction<ELFT>(Rel.Offset)) {
-      Prologues.insert(F);
-      if (Target->adjustPrologueForCrossSplitStack(Buf + getOffset(F->Value),
-                                                   End, F->StOther))
+    if (Defined *f = getEnclosingFunction<ELFT>(rel.offset)) {
+      prologues.insert(f);
+      if (target->adjustPrologueForCrossSplitStack(buf + getOffset(f->value),
+                                                   end, f->stOther))
         continue;
-      if (!getFile<ELFT>()->SomeNoSplitStack)
-        error(lld::toString(this) + ": " + F->getName() +
-              " (with -fsplit-stack) calls " + Rel.Sym->getName() +
+      if (!getFile<ELFT>()->someNoSplitStack)
+        error(lld::toString(this) + ": " + f->getName() +
+              " (with -fsplit-stack) calls " + rel.sym->getName() +
               " (without -fsplit-stack), but couldn't adjust its prologue");
     }
   }
 
-  if (Target->NeedsMoreStackNonSplit)
-    switchMorestackCallsToMorestackNonSplit(Prologues, MorestackCalls);
+  if (target->needsMoreStackNonSplit)
+    switchMorestackCallsToMorestackNonSplit(prologues, morestackCalls);
 }
 
-template <class ELFT> void InputSection::writeTo(uint8_t *Buf) {
-  if (Type == SHT_NOBITS)
+template <class ELFT> void InputSection::writeTo(uint8_t *buf) {
+  if (type == SHT_NOBITS)
     return;
 
-  if (auto *S = dyn_cast<SyntheticSection>(this)) {
-    S->writeTo(Buf + OutSecOff);
+  if (auto *s = dyn_cast<SyntheticSection>(this)) {
+    s->writeTo(buf + outSecOff);
     return;
   }
 
   // If -r or --emit-relocs is given, then an InputSection
   // may be a relocation section.
-  if (Type == SHT_RELA) {
-    copyRelocations<ELFT>(Buf + OutSecOff, getDataAs<typename ELFT::Rela>());
+  if (type == SHT_RELA) {
+    copyRelocations<ELFT>(buf + outSecOff, getDataAs<typename ELFT::Rela>());
     return;
   }
-  if (Type == SHT_REL) {
-    copyRelocations<ELFT>(Buf + OutSecOff, getDataAs<typename ELFT::Rel>());
+  if (type == SHT_REL) {
+    copyRelocations<ELFT>(buf + outSecOff, getDataAs<typename ELFT::Rel>());
     return;
   }
 
   // If -r is given, we may have a SHT_GROUP section.
-  if (Type == SHT_GROUP) {
-    copyShtGroup<ELFT>(Buf + OutSecOff);
+  if (type == SHT_GROUP) {
+    copyShtGroup<ELFT>(buf + outSecOff);
     return;
   }
 
   // If this is a compressed section, uncompress section contents directly
   // to the buffer.
-  if (UncompressedSize >= 0 && !UncompressedBuf) {
-    size_t Size = UncompressedSize;
-    if (Error E = zlib::uncompress(toStringRef(RawData),
-                                   (char *)(Buf + OutSecOff), Size))
+  if (uncompressedSize >= 0) {
+    size_t size = uncompressedSize;
+    if (Error e = zlib::uncompress(toStringRef(rawData),
+                                   (char *)(buf + outSecOff), size))
       fatal(toString(this) +
-            ": uncompress failed: " + llvm::toString(std::move(E)));
-    uint8_t *BufEnd = Buf + OutSecOff + Size;
-    relocate<ELFT>(Buf, BufEnd);
+            ": uncompress failed: " + llvm::toString(std::move(e)));
+    uint8_t *bufEnd = buf + outSecOff + size;
+    relocate<ELFT>(buf, bufEnd);
     return;
   }
 
   // Copy section contents from source object file to output file
   // and then apply relocations.
-  memcpy(Buf + OutSecOff, data().data(), data().size());
-  uint8_t *BufEnd = Buf + OutSecOff + data().size();
-  relocate<ELFT>(Buf, BufEnd);
+  memcpy(buf + outSecOff, data().data(), data().size());
+  uint8_t *bufEnd = buf + outSecOff + data().size();
+  relocate<ELFT>(buf, bufEnd);
 }
 
-void InputSection::replace(InputSection *Other) {
-  Alignment = std::max(Alignment, Other->Alignment);
-  Other->Repl = Repl;
-  Other->Live = false;
+void InputSection::replace(InputSection *other) {
+  alignment = std::max(alignment, other->alignment);
+
+  // When a section is replaced with another section that was allocated to
+  // another partition, the replacement section (and its associated sections)
+  // need to be placed in the main partition so that both partitions will be
+  // able to access it.
+  if (partition != other->partition) {
+    partition = 1;
+    for (InputSection *isec : dependentSections)
+      isec->partition = 1;
+  }
+
+  other->repl = repl;
+  other->markDead();
 }
 
 template <class ELFT>
-EhInputSection::EhInputSection(ObjFile<ELFT> &F,
-                               const typename ELFT::Shdr &Header,
-                               StringRef Name)
-    : InputSectionBase(F, Header, Name, InputSectionBase::EHFrame) {}
+EhInputSection::EhInputSection(ObjFile<ELFT> &f,
+                               const typename ELFT::Shdr &header,
+                               StringRef name)
+    : InputSectionBase(f, header, name, InputSectionBase::EHFrame) {}
 
 SyntheticSection *EhInputSection::getParent() const {
-  return cast_or_null<SyntheticSection>(Parent);
+  return cast_or_null<SyntheticSection>(parent);
 }
 
 // Returns the index of the first relocation that points to a region between
 // Begin and Begin+Size.
 template <class IntTy, class RelTy>
-static unsigned getReloc(IntTy Begin, IntTy Size, const ArrayRef<RelTy> &Rels,
-                         unsigned &RelocI) {
+static unsigned getReloc(IntTy begin, IntTy size, const ArrayRef<RelTy> &rels,
+                         unsigned &relocI) {
   // Start search from RelocI for fast access. That works because the
   // relocations are sorted in .eh_frame.
-  for (unsigned N = Rels.size(); RelocI < N; ++RelocI) {
-    const RelTy &Rel = Rels[RelocI];
-    if (Rel.r_offset < Begin)
+  for (unsigned n = rels.size(); relocI < n; ++relocI) {
+    const RelTy &rel = rels[relocI];
+    if (rel.r_offset < begin)
       continue;
 
-    if (Rel.r_offset < Begin + Size)
-      return RelocI;
+    if (rel.r_offset < begin + size)
+      return relocI;
     return -1;
   }
   return -1;
@@ -1121,84 +1176,84 @@ static unsigned getReloc(IntTy Begin, IntTy Size, const ArrayRef<RelTy> &Rels,
 // .eh_frame is a sequence of CIE or FDE records.
 // This function splits an input section into records and returns them.
 template <class ELFT> void EhInputSection::split() {
-  if (AreRelocsRela)
+  if (areRelocsRela)
     split<ELFT>(relas<ELFT>());
   else
     split<ELFT>(rels<ELFT>());
 }
 
 template <class ELFT, class RelTy>
-void EhInputSection::split(ArrayRef<RelTy> Rels) {
-  unsigned RelI = 0;
-  for (size_t Off = 0, End = data().size(); Off != End;) {
-    size_t Size = readEhRecordSize(this, Off);
-    Pieces.emplace_back(Off, this, Size, getReloc(Off, Size, Rels, RelI));
+void EhInputSection::split(ArrayRef<RelTy> rels) {
+  unsigned relI = 0;
+  for (size_t off = 0, end = data().size(); off != end;) {
+    size_t size = readEhRecordSize(this, off);
+    pieces.emplace_back(off, this, size, getReloc(off, size, rels, relI));
     // The empty record is the end marker.
-    if (Size == 4)
+    if (size == 4)
       break;
-    Off += Size;
+    off += size;
   }
 }
 
-static size_t findNull(StringRef S, size_t EntSize) {
+static size_t findNull(StringRef s, size_t entSize) {
   // Optimize the common case.
-  if (EntSize == 1)
-    return S.find(0);
+  if (entSize == 1)
+    return s.find(0);
 
-  for (unsigned I = 0, N = S.size(); I != N; I += EntSize) {
-    const char *B = S.begin() + I;
-    if (std::all_of(B, B + EntSize, [](char C) { return C == 0; }))
-      return I;
+  for (unsigned i = 0, n = s.size(); i != n; i += entSize) {
+    const char *b = s.begin() + i;
+    if (std::all_of(b, b + entSize, [](char c) { return c == 0; }))
+      return i;
   }
   return StringRef::npos;
 }
 
 SyntheticSection *MergeInputSection::getParent() const {
-  return cast_or_null<SyntheticSection>(Parent);
+  return cast_or_null<SyntheticSection>(parent);
 }
 
 // Split SHF_STRINGS section. Such section is a sequence of
 // null-terminated strings.
-void MergeInputSection::splitStrings(ArrayRef<uint8_t> Data, size_t EntSize) {
-  size_t Off = 0;
-  bool IsAlloc = Flags & SHF_ALLOC;
-  StringRef S = toStringRef(Data);
+void MergeInputSection::splitStrings(ArrayRef<uint8_t> data, size_t entSize) {
+  size_t off = 0;
+  bool isAlloc = flags & SHF_ALLOC;
+  StringRef s = toStringRef(data);
 
-  while (!S.empty()) {
-    size_t End = findNull(S, EntSize);
-    if (End == StringRef::npos)
+  while (!s.empty()) {
+    size_t end = findNull(s, entSize);
+    if (end == StringRef::npos)
       fatal(toString(this) + ": string is not null terminated");
-    size_t Size = End + EntSize;
+    size_t size = end + entSize;
 
-    Pieces.emplace_back(Off, xxHash64(S.substr(0, Size)), !IsAlloc);
-    S = S.substr(Size);
-    Off += Size;
+    pieces.emplace_back(off, xxHash64(s.substr(0, size)), !isAlloc);
+    s = s.substr(size);
+    off += size;
   }
 }
 
 // Split non-SHF_STRINGS section. Such section is a sequence of
 // fixed size records.
-void MergeInputSection::splitNonStrings(ArrayRef<uint8_t> Data,
-                                        size_t EntSize) {
-  size_t Size = Data.size();
-  assert((Size % EntSize) == 0);
-  bool IsAlloc = Flags & SHF_ALLOC;
+void MergeInputSection::splitNonStrings(ArrayRef<uint8_t> data,
+                                        size_t entSize) {
+  size_t size = data.size();
+  assert((size % entSize) == 0);
+  bool isAlloc = flags & SHF_ALLOC;
 
-  for (size_t I = 0; I != Size; I += EntSize)
-    Pieces.emplace_back(I, xxHash64(Data.slice(I, EntSize)), !IsAlloc);
+  for (size_t i = 0; i != size; i += entSize)
+    pieces.emplace_back(i, xxHash64(data.slice(i, entSize)), !isAlloc);
 }
 
 template <class ELFT>
-MergeInputSection::MergeInputSection(ObjFile<ELFT> &F,
-                                     const typename ELFT::Shdr &Header,
-                                     StringRef Name)
-    : InputSectionBase(F, Header, Name, InputSectionBase::Merge) {}
+MergeInputSection::MergeInputSection(ObjFile<ELFT> &f,
+                                     const typename ELFT::Shdr &header,
+                                     StringRef name)
+    : InputSectionBase(f, header, name, InputSectionBase::Merge) {}
 
-MergeInputSection::MergeInputSection(uint64_t Flags, uint32_t Type,
-                                     uint64_t Entsize, ArrayRef<uint8_t> Data,
-                                     StringRef Name)
-    : InputSectionBase(nullptr, Flags, Type, Entsize, /*Link*/ 0, /*Info*/ 0,
-                       /*Alignment*/ Entsize, Data, Name, SectionBase::Merge) {}
+MergeInputSection::MergeInputSection(uint64_t flags, uint32_t type,
+                                     uint64_t entsize, ArrayRef<uint8_t> data,
+                                     StringRef name)
+    : InputSectionBase(nullptr, flags, type, entsize, /*Link*/ 0, /*Info*/ 0,
+                       /*Alignment*/ entsize, data, name, SectionBase::Merge) {}
 
 // This function is called after we obtain a complete list of input sections
 // that need to be linked. This is responsible to split section contents
@@ -1207,37 +1262,35 @@ MergeInputSection::MergeInputSection(uint64_t Flags, uint32_t Type,
 // Note that this function is called from parallelForEach. This must be
 // thread-safe (i.e. no memory allocation from the pools).
 void MergeInputSection::splitIntoPieces() {
-  assert(Pieces.empty());
+  assert(pieces.empty());
 
-  if (Flags & SHF_STRINGS)
-    splitStrings(data(), Entsize);
+  if (flags & SHF_STRINGS)
+    splitStrings(data(), entsize);
   else
-    splitNonStrings(data(), Entsize);
+    splitNonStrings(data(), entsize);
 }
 
-SectionPiece *MergeInputSection::getSectionPiece(uint64_t Offset) {
-  if (this->data().size() <= Offset)
+SectionPiece *MergeInputSection::getSectionPiece(uint64_t offset) {
+  if (this->data().size() <= offset)
     fatal(toString(this) + ": offset is outside the section");
 
   // If Offset is not at beginning of a section piece, it is not in the map.
   // In that case we need to  do a binary search of the original section piece vector.
-  auto It2 =
-      llvm::upper_bound(Pieces, Offset, [](uint64_t Offset, SectionPiece P) {
-        return Offset < P.InputOff;
-      });
-  return &It2[-1];
+  auto it = partition_point(
+      pieces, [=](SectionPiece p) { return p.inputOff <= offset; });
+  return &it[-1];
 }
 
 // Returns the offset in an output section for a given input offset.
 // Because contents of a mergeable section is not contiguous in output,
 // it is not just an addition to a base output offset.
-uint64_t MergeInputSection::getParentOffset(uint64_t Offset) const {
+uint64_t MergeInputSection::getParentOffset(uint64_t offset) const {
   // If Offset is not at beginning of a section piece, it is not in the map.
   // In that case we need to search from the original section piece vector.
-  const SectionPiece &Piece =
-      *(const_cast<MergeInputSection *>(this)->getSectionPiece (Offset));
-  uint64_t Addend = Offset - Piece.InputOff;
-  return Piece.OutputOff + Addend;
+  const SectionPiece &piece =
+      *(const_cast<MergeInputSection *>(this)->getSectionPiece (offset));
+  uint64_t addend = offset - piece.inputOff;
+  return piece.outputOff + addend;
 }
 
 template InputSection::InputSection(ObjFile<ELF32LE> &, const ELF32LE::Shdr &,
diff --git a/deps/lld/ELF/InputSection.h b/deps/lld/ELF/InputSection.h
index 34f411e87200d53fa19e5f9b3ba18144d9d609c2..3a974074e0e51a5cc9330460f5630fff3b1f2ee8 100644
--- a/deps/lld/ELF/InputSection.h
+++ b/deps/lld/ELF/InputSection.h
@@ -1,9 +1,8 @@
 //===- InputSection.h -------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -26,11 +25,14 @@ class Symbol;
 struct SectionPiece;
 
 class Defined;
+struct Partition;
 class SyntheticSection;
 class MergeSyntheticSection;
 template <class ELFT> class ObjFile;
 class OutputSection;
 
+extern std::vector<Partition> partitions;
+
 // This is the base class of all sections that lld handles. Some are sections in
 // input files, some are sections in the produced output file and some exist
 // just as a convenience for implementing special ways of combining some
@@ -39,38 +41,53 @@ class SectionBase {
 public:
   enum Kind { Regular, EHFrame, Merge, Synthetic, Output };
 
-  Kind kind() const { return (Kind)SectionKind; }
+  Kind kind() const { return (Kind)sectionKind; }
 
-  StringRef Name;
+  StringRef name;
 
   // This pointer points to the "real" instance of this instance.
   // Usually Repl == this. However, if ICF merges two sections,
   // Repl pointer of one section points to another section. So,
   // if you need to get a pointer to this instance, do not use
   // this but instead this->Repl.
-  SectionBase *Repl;
+  SectionBase *repl;
 
-  unsigned SectionKind : 3;
+  unsigned sectionKind : 3;
 
-  // The next two bit fields are only used by InputSectionBase, but we
+  // The next three bit fields are only used by InputSectionBase, but we
   // put them here so the struct packs better.
 
-  // The garbage collector sets sections' Live bits.
-  // If GC is disabled, all sections are considered live by default.
-  unsigned Live : 1;
+  // True if this section has already been placed to a linker script
+  // output section. This is needed because, in a linker script, you
+  // can refer to the same section more than once. For example, in
+  // the following linker script,
+  //
+  //   .foo : { *(.text) }
+  //   .bar : { *(.text) }
+  //
+  // .foo takes all .text sections, and .bar becomes empty. To achieve
+  // this, we need to memorize whether a section has been placed or
+  // not for each input section.
+  unsigned assigned : 1;
 
-  unsigned Bss : 1;
+  unsigned bss : 1;
 
   // Set for sections that should not be folded by ICF.
-  unsigned KeepUnique : 1;
+  unsigned keepUnique : 1;
+
+  // The 1-indexed partition that this section is assigned to by the garbage
+  // collector, or 0 if this section is dead. Normally there is only one
+  // partition, so this will either be 0 or 1.
+  uint8_t partition;
+  elf::Partition &getPartition() const;
 
   // These corresponds to the fields in Elf_Shdr.
-  uint32_t Alignment;
-  uint64_t Flags;
-  uint64_t Entsize;
-  uint32_t Type;
-  uint32_t Link;
-  uint32_t Info;
+  uint32_t alignment;
+  uint64_t flags;
+  uint64_t entsize;
+  uint32_t type;
+  uint32_t link;
+  uint32_t info;
 
   OutputSection *getOutputSection();
   const OutputSection *getOutputSection() const {
@@ -79,90 +96,81 @@ public:
 
   // Translate an offset in the input section to an offset in the output
   // section.
-  uint64_t getOffset(uint64_t Offset) const;
+  uint64_t getOffset(uint64_t offset) const;
 
-  uint64_t getVA(uint64_t Offset = 0) const;
+  uint64_t getVA(uint64_t offset = 0) const;
+
+  bool isLive() const { return partition != 0; }
+  void markLive() { partition = 1; }
+  void markDead() { partition = 0; }
 
 protected:
-  SectionBase(Kind SectionKind, StringRef Name, uint64_t Flags,
-              uint64_t Entsize, uint64_t Alignment, uint32_t Type,
-              uint32_t Info, uint32_t Link)
-      : Name(Name), Repl(this), SectionKind(SectionKind), Live(false),
-        Bss(false), KeepUnique(false), Alignment(Alignment), Flags(Flags),
-        Entsize(Entsize), Type(Type), Link(Link), Info(Info) {}
+  SectionBase(Kind sectionKind, StringRef name, uint64_t flags,
+              uint64_t entsize, uint64_t alignment, uint32_t type,
+              uint32_t info, uint32_t link)
+      : name(name), repl(this), sectionKind(sectionKind), assigned(false),
+        bss(false), keepUnique(false), partition(0), alignment(alignment),
+        flags(flags), entsize(entsize), type(type), link(link), info(info) {}
 };
 
 // This corresponds to a section of an input file.
 class InputSectionBase : public SectionBase {
 public:
   template <class ELFT>
-  InputSectionBase(ObjFile<ELFT> &File, const typename ELFT::Shdr &Header,
-                   StringRef Name, Kind SectionKind);
+  InputSectionBase(ObjFile<ELFT> &file, const typename ELFT::Shdr &header,
+                   StringRef name, Kind sectionKind);
 
-  InputSectionBase(InputFile *File, uint64_t Flags, uint32_t Type,
-                   uint64_t Entsize, uint32_t Link, uint32_t Info,
-                   uint32_t Alignment, ArrayRef<uint8_t> Data, StringRef Name,
-                   Kind SectionKind);
+  InputSectionBase(InputFile *file, uint64_t flags, uint32_t type,
+                   uint64_t entsize, uint32_t link, uint32_t info,
+                   uint32_t alignment, ArrayRef<uint8_t> data, StringRef name,
+                   Kind sectionKind);
 
-  static bool classof(const SectionBase *S) { return S->kind() != Output; }
+  static bool classof(const SectionBase *s) { return s->kind() != Output; }
+
+  // Relocations that refer to this section.
+  unsigned numRelocations : 31;
+  unsigned areRelocsRela : 1;
+  const void *firstRelocation = nullptr;
 
   // The file which contains this section. Its dynamic type is always
   // ObjFile<ELFT>, but in order to avoid ELFT, we use InputFile as
   // its static type.
-  InputFile *File;
+  InputFile *file;
 
   template <class ELFT> ObjFile<ELFT> *getFile() const {
-    return cast_or_null<ObjFile<ELFT>>(File);
+    return cast_or_null<ObjFile<ELFT>>(file);
   }
 
   ArrayRef<uint8_t> data() const {
-    if (UncompressedSize >= 0 && !UncompressedBuf)
+    if (uncompressedSize >= 0)
       uncompress();
-    return RawData;
+    return rawData;
   }
 
   uint64_t getOffsetInFile() const;
 
-  // True if this section has already been placed to a linker script
-  // output section. This is needed because, in a linker script, you
-  // can refer to the same section more than once. For example, in
-  // the following linker script,
-  //
-  //   .foo : { *(.text) }
-  //   .bar : { *(.text) }
-  //
-  // .foo takes all .text sections, and .bar becomes empty. To achieve
-  // this, we need to memorize whether a section has been placed or
-  // not for each input section.
-  bool Assigned = false;
-
   // Input sections are part of an output section. Special sections
   // like .eh_frame and merge sections are first combined into a
   // synthetic section that is then added to an output section. In all
   // cases this points one level up.
-  SectionBase *Parent = nullptr;
-
-  // Relocations that refer to this section.
-  const void *FirstRelocation = nullptr;
-  unsigned NumRelocations : 31;
-  unsigned AreRelocsRela : 1;
+  SectionBase *parent = nullptr;
 
   template <class ELFT> ArrayRef<typename ELFT::Rel> rels() const {
-    assert(!AreRelocsRela);
+    assert(!areRelocsRela);
     return llvm::makeArrayRef(
-        static_cast<const typename ELFT::Rel *>(FirstRelocation),
-        NumRelocations);
+        static_cast<const typename ELFT::Rel *>(firstRelocation),
+        numRelocations);
   }
 
   template <class ELFT> ArrayRef<typename ELFT::Rela> relas() const {
-    assert(AreRelocsRela);
+    assert(areRelocsRela);
     return llvm::makeArrayRef(
-        static_cast<const typename ELFT::Rela *>(FirstRelocation),
-        NumRelocations);
+        static_cast<const typename ELFT::Rela *>(firstRelocation),
+        numRelocations);
   }
 
   // InputSections that are dependent on us (reverse dependency for GC)
-  llvm::TinyPtrVector<InputSection *> DependentSections;
+  llvm::TinyPtrVector<InputSection *> dependentSections;
 
   // Returns the size of this section (even if this is a common or BSS.)
   size_t getSize() const;
@@ -172,23 +180,23 @@ public:
   // Get the function symbol that encloses this offset from within the
   // section.
   template <class ELFT>
-  Defined *getEnclosingFunction(uint64_t Offset);
+  Defined *getEnclosingFunction(uint64_t offset);
 
   // Returns a source location string. Used to construct an error message.
-  template <class ELFT> std::string getLocation(uint64_t Offset);
-  std::string getSrcMsg(const Symbol &Sym, uint64_t Offset);
-  std::string getObjMsg(uint64_t Offset);
+  template <class ELFT> std::string getLocation(uint64_t offset);
+  std::string getSrcMsg(const Symbol &sym, uint64_t offset);
+  std::string getObjMsg(uint64_t offset);
 
   // Each section knows how to relocate itself. These functions apply
   // relocations, assuming that Buf points to this section's copy in
   // the mmap'ed output buffer.
-  template <class ELFT> void relocate(uint8_t *Buf, uint8_t *BufEnd);
-  void relocateAlloc(uint8_t *Buf, uint8_t *BufEnd);
+  template <class ELFT> void relocate(uint8_t *buf, uint8_t *bufEnd);
+  void relocateAlloc(uint8_t *buf, uint8_t *bufEnd);
 
   // The native ELF reloc data type is not very convenient to handle.
   // So we convert ELF reloc records to our own records in Relocations.cpp.
   // This vector contains such "cooked" relocations.
-  std::vector<Relocation> Relocations;
+  std::vector<Relocation> relocations;
 
   // A function compiled with -fsplit-stack calling a function
   // compiled without -fsplit-stack needs its prologue adjusted. Find
@@ -196,25 +204,26 @@ public:
   // to relocation. See https://gcc.gnu.org/wiki/SplitStacks for more
   // information.
   template <typename ELFT>
-  void adjustSplitStackFunctionPrologues(uint8_t *Buf, uint8_t *End);
+  void adjustSplitStackFunctionPrologues(uint8_t *buf, uint8_t *end);
 
 
   template <typename T> llvm::ArrayRef<T> getDataAs() const {
-    size_t S = data().size();
-    assert(S % sizeof(T) == 0);
-    return llvm::makeArrayRef<T>((const T *)data().data(), S / sizeof(T));
+    size_t s = data().size();
+    assert(s % sizeof(T) == 0);
+    return llvm::makeArrayRef<T>((const T *)data().data(), s / sizeof(T));
   }
 
 protected:
   void parseCompressedHeader();
   void uncompress() const;
 
-  mutable ArrayRef<uint8_t> RawData;
+  mutable ArrayRef<uint8_t> rawData;
 
-  // A pointer that owns uncompressed data if a section is compressed by zlib.
-  // Since the feature is not used often, this is usually a nullptr.
-  mutable std::unique_ptr<char[]> UncompressedBuf;
-  int64_t UncompressedSize = -1;
+  // This field stores the uncompressed size of the compressed data in rawData,
+  // or -1 if rawData is not compressed (either because the section wasn't
+  // compressed in the first place, or because we ended up uncompressing it).
+  // Since the feature is not used often, this is usually -1.
+  mutable int64_t uncompressedSize = -1;
 };
 
 // SectionPiece represents a piece of splittable section contents.
@@ -222,14 +231,13 @@ protected:
 // have to be as compact as possible, which is why we don't store the size (can
 // be found by looking at the next one).
 struct SectionPiece {
-  SectionPiece(size_t Off, uint32_t Hash, bool Live)
-      : InputOff(Off), Hash(Hash), OutputOff(0),
-        Live(Live || !Config->GcSections) {}
+  SectionPiece(size_t off, uint32_t hash, bool live)
+      : inputOff(off), live(live || !config->gcSections), hash(hash >> 1) {}
 
-  uint32_t InputOff;
-  uint32_t Hash;
-  int64_t OutputOff : 63;
-  uint64_t Live : 1;
+  uint32_t inputOff;
+  uint32_t live : 1;
+  uint32_t hash : 31;
+  uint64_t outputOff = 0;
 };
 
 static_assert(sizeof(SectionPiece) == 16, "SectionPiece is too big");
@@ -238,74 +246,74 @@ static_assert(sizeof(SectionPiece) == 16, "SectionPiece is too big");
 class MergeInputSection : public InputSectionBase {
 public:
   template <class ELFT>
-  MergeInputSection(ObjFile<ELFT> &F, const typename ELFT::Shdr &Header,
-                    StringRef Name);
-  MergeInputSection(uint64_t Flags, uint32_t Type, uint64_t Entsize,
-                    ArrayRef<uint8_t> Data, StringRef Name);
+  MergeInputSection(ObjFile<ELFT> &f, const typename ELFT::Shdr &header,
+                    StringRef name);
+  MergeInputSection(uint64_t flags, uint32_t type, uint64_t entsize,
+                    ArrayRef<uint8_t> data, StringRef name);
 
-  static bool classof(const SectionBase *S) { return S->kind() == Merge; }
+  static bool classof(const SectionBase *s) { return s->kind() == Merge; }
   void splitIntoPieces();
 
   // Translate an offset in the input section to an offset in the parent
   // MergeSyntheticSection.
-  uint64_t getParentOffset(uint64_t Offset) const;
+  uint64_t getParentOffset(uint64_t offset) const;
 
   // Splittable sections are handled as a sequence of data
   // rather than a single large blob of data.
-  std::vector<SectionPiece> Pieces;
+  std::vector<SectionPiece> pieces;
 
   // Returns I'th piece's data. This function is very hot when
   // string merging is enabled, so we want to inline.
   LLVM_ATTRIBUTE_ALWAYS_INLINE
-  llvm::CachedHashStringRef getData(size_t I) const {
-    size_t Begin = Pieces[I].InputOff;
-    size_t End =
-        (Pieces.size() - 1 == I) ? data().size() : Pieces[I + 1].InputOff;
-    return {toStringRef(data().slice(Begin, End - Begin)), Pieces[I].Hash};
+  llvm::CachedHashStringRef getData(size_t i) const {
+    size_t begin = pieces[i].inputOff;
+    size_t end =
+        (pieces.size() - 1 == i) ? data().size() : pieces[i + 1].inputOff;
+    return {toStringRef(data().slice(begin, end - begin)), pieces[i].hash};
   }
 
   // Returns the SectionPiece at a given input section offset.
-  SectionPiece *getSectionPiece(uint64_t Offset);
-  const SectionPiece *getSectionPiece(uint64_t Offset) const {
-    return const_cast<MergeInputSection *>(this)->getSectionPiece(Offset);
+  SectionPiece *getSectionPiece(uint64_t offset);
+  const SectionPiece *getSectionPiece(uint64_t offset) const {
+    return const_cast<MergeInputSection *>(this)->getSectionPiece(offset);
   }
 
   SyntheticSection *getParent() const;
 
 private:
-  void splitStrings(ArrayRef<uint8_t> A, size_t Size);
-  void splitNonStrings(ArrayRef<uint8_t> A, size_t Size);
+  void splitStrings(ArrayRef<uint8_t> a, size_t size);
+  void splitNonStrings(ArrayRef<uint8_t> a, size_t size);
 };
 
 struct EhSectionPiece {
-  EhSectionPiece(size_t Off, InputSectionBase *Sec, uint32_t Size,
-                 unsigned FirstRelocation)
-      : InputOff(Off), Sec(Sec), Size(Size), FirstRelocation(FirstRelocation) {}
+  EhSectionPiece(size_t off, InputSectionBase *sec, uint32_t size,
+                 unsigned firstRelocation)
+      : inputOff(off), sec(sec), size(size), firstRelocation(firstRelocation) {}
 
   ArrayRef<uint8_t> data() {
-    return {Sec->data().data() + this->InputOff, Size};
+    return {sec->data().data() + this->inputOff, size};
   }
 
-  size_t InputOff;
-  ssize_t OutputOff = -1;
-  InputSectionBase *Sec;
-  uint32_t Size;
-  unsigned FirstRelocation;
+  size_t inputOff;
+  ssize_t outputOff = -1;
+  InputSectionBase *sec;
+  uint32_t size;
+  unsigned firstRelocation;
 };
 
 // This corresponds to a .eh_frame section of an input file.
 class EhInputSection : public InputSectionBase {
 public:
   template <class ELFT>
-  EhInputSection(ObjFile<ELFT> &F, const typename ELFT::Shdr &Header,
-                 StringRef Name);
-  static bool classof(const SectionBase *S) { return S->kind() == EHFrame; }
+  EhInputSection(ObjFile<ELFT> &f, const typename ELFT::Shdr &header,
+                 StringRef name);
+  static bool classof(const SectionBase *s) { return s->kind() == EHFrame; }
   template <class ELFT> void split();
-  template <class ELFT, class RelTy> void split(ArrayRef<RelTy> Rels);
+  template <class ELFT, class RelTy> void split(ArrayRef<RelTy> rels);
 
   // Splittable sections are handled as a sequence of data
   // rather than a single large blob of data.
-  std::vector<EhSectionPiece> Pieces;
+  std::vector<EhSectionPiece> pieces;
 
   SyntheticSection *getParent() const;
 };
@@ -316,17 +324,17 @@ public:
 // .eh_frame. It also includes the synthetic sections themselves.
 class InputSection : public InputSectionBase {
 public:
-  InputSection(InputFile *F, uint64_t Flags, uint32_t Type, uint32_t Alignment,
-               ArrayRef<uint8_t> Data, StringRef Name, Kind K = Regular);
+  InputSection(InputFile *f, uint64_t flags, uint32_t type, uint32_t alignment,
+               ArrayRef<uint8_t> data, StringRef name, Kind k = Regular);
   template <class ELFT>
-  InputSection(ObjFile<ELFT> &F, const typename ELFT::Shdr &Header,
-               StringRef Name);
+  InputSection(ObjFile<ELFT> &f, const typename ELFT::Shdr &header,
+               StringRef name);
 
   // Write this section to a mmap'ed file, assuming Buf is pointing to
   // beginning of the output section.
-  template <class ELFT> void writeTo(uint8_t *Buf);
+  template <class ELFT> void writeTo(uint8_t *buf);
 
-  uint64_t getOffset(uint64_t Offset) const { return OutSecOff + Offset; }
+  uint64_t getOffset(uint64_t offset) const { return outSecOff + offset; }
 
   OutputSection *getParent() const;
 
@@ -334,32 +342,32 @@ public:
   // OutputSection's InputSection list, and is used when ordering SHF_LINK_ORDER
   // sections. After assignAddresses is called, it represents the offset from
   // the beginning of the output section this section was assigned to.
-  uint64_t OutSecOff = 0;
+  uint64_t outSecOff = 0;
 
-  static bool classof(const SectionBase *S);
+  static bool classof(const SectionBase *s);
 
   InputSectionBase *getRelocatedSection() const;
 
   template <class ELFT, class RelTy>
-  void relocateNonAlloc(uint8_t *Buf, llvm::ArrayRef<RelTy> Rels);
+  void relocateNonAlloc(uint8_t *buf, llvm::ArrayRef<RelTy> rels);
 
   // Used by ICF.
-  uint32_t Class[2] = {0, 0};
+  uint32_t eqClass[2] = {0, 0};
 
   // Called by ICF to merge two input sections.
-  void replace(InputSection *Other);
+  void replace(InputSection *other);
 
-  static InputSection Discarded;
+  static InputSection discarded;
 
 private:
   template <class ELFT, class RelTy>
-  void copyRelocations(uint8_t *Buf, llvm::ArrayRef<RelTy> Rels);
+  void copyRelocations(uint8_t *buf, llvm::ArrayRef<RelTy> rels);
 
-  template <class ELFT> void copyShtGroup(uint8_t *Buf);
+  template <class ELFT> void copyShtGroup(uint8_t *buf);
 };
 
 // The list of all input sections.
-extern std::vector<InputSectionBase *> InputSections;
+extern std::vector<InputSectionBase *> inputSections;
 
 } // namespace elf
 
diff --git a/deps/lld/ELF/LTO.cpp b/deps/lld/ELF/LTO.cpp
index ca44581780e47ae50259ffd97a4217b38f012910..28d4bfe77c5d428aa48ad976dfcc31d3d47238e7 100644
--- a/deps/lld/ELF/LTO.cpp
+++ b/deps/lld/ELF/LTO.cpp
@@ -1,9 +1,8 @@
 //===- LTO.cpp ------------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -13,6 +12,7 @@
 #include "LinkerScript.h"
 #include "SymbolTable.h"
 #include "Symbols.h"
+#include "lld/Common/Args.h"
 #include "lld/Common/ErrorHandler.h"
 #include "lld/Common/TargetOptionsCommandFlags.h"
 #include "llvm/ADT/STLExtras.h"
@@ -47,134 +47,135 @@ using namespace lld::elf;
 
 // Creates an empty file to store a list of object files for final
 // linking of distributed ThinLTO.
-static std::unique_ptr<raw_fd_ostream> openFile(StringRef File) {
-  std::error_code EC;
-  auto Ret =
-      llvm::make_unique<raw_fd_ostream>(File, EC, sys::fs::OpenFlags::F_None);
-  if (EC) {
-    error("cannot open " + File + ": " + EC.message());
+static std::unique_ptr<raw_fd_ostream> openFile(StringRef file) {
+  std::error_code ec;
+  auto ret =
+      llvm::make_unique<raw_fd_ostream>(file, ec, sys::fs::OpenFlags::F_None);
+  if (ec) {
+    error("cannot open " + file + ": " + ec.message());
     return nullptr;
   }
-  return Ret;
+  return ret;
 }
 
-static std::string getThinLTOOutputFile(StringRef ModulePath) {
-  return lto::getThinLTOOutputFile(ModulePath,
-                                   Config->ThinLTOPrefixReplace.first,
-                                   Config->ThinLTOPrefixReplace.second);
+static std::string getThinLTOOutputFile(StringRef modulePath) {
+  return lto::getThinLTOOutputFile(modulePath,
+                                   config->thinLTOPrefixReplace.first,
+                                   config->thinLTOPrefixReplace.second);
 }
 
 static lto::Config createConfig() {
-  lto::Config C;
+  lto::Config c;
 
   // LLD supports the new relocations and address-significance tables.
-  C.Options = InitTargetOptionsFromCodeGenFlags();
-  C.Options.RelaxELFRelocations = true;
-  C.Options.EmitAddrsig = true;
+  c.Options = initTargetOptionsFromCodeGenFlags();
+  c.Options.RelaxELFRelocations = true;
+  c.Options.EmitAddrsig = true;
 
   // Always emit a section per function/datum with LTO.
-  C.Options.FunctionSections = true;
-  C.Options.DataSections = true;
+  c.Options.FunctionSections = true;
+  c.Options.DataSections = true;
 
-  if (Config->Relocatable)
-    C.RelocModel = None;
-  else if (Config->Pic)
-    C.RelocModel = Reloc::PIC_;
+  if (config->relocatable)
+    c.RelocModel = None;
+  else if (config->isPic)
+    c.RelocModel = Reloc::PIC_;
   else
-    C.RelocModel = Reloc::Static;
+    c.RelocModel = Reloc::Static;
 
-  C.CodeModel = GetCodeModelFromCMModel();
-  C.DisableVerify = Config->DisableVerify;
-  C.DiagHandler = diagnosticHandler;
-  C.OptLevel = Config->LTOO;
-  C.CPU = GetCPUStr();
-  C.MAttrs = GetMAttrs();
+  c.CodeModel = getCodeModelFromCMModel();
+  c.DisableVerify = config->disableVerify;
+  c.DiagHandler = diagnosticHandler;
+  c.OptLevel = config->ltoo;
+  c.CPU = getCPUStr();
+  c.MAttrs = getMAttrs();
+  c.CGOptLevel = args::getCGOptLevel(config->ltoo);
 
   // Set up a custom pipeline if we've been asked to.
-  C.OptPipeline = Config->LTONewPmPasses;
-  C.AAPipeline = Config->LTOAAPipeline;
+  c.OptPipeline = config->ltoNewPmPasses;
+  c.AAPipeline = config->ltoAAPipeline;
 
   // Set up optimization remarks if we've been asked to.
-  C.RemarksFilename = Config->OptRemarksFilename;
-  C.RemarksWithHotness = Config->OptRemarksWithHotness;
+  c.RemarksFilename = config->optRemarksFilename;
+  c.RemarksPasses = config->optRemarksPasses;
+  c.RemarksWithHotness = config->optRemarksWithHotness;
+  c.RemarksFormat = config->optRemarksFormat;
 
-  C.SampleProfile = Config->LTOSampleProfile;
-  C.UseNewPM = Config->LTONewPassManager;
-  C.DebugPassManager = Config->LTODebugPassManager;
-  C.DwoDir = Config->DwoDir;
+  c.SampleProfile = config->ltoSampleProfile;
+  c.UseNewPM = config->ltoNewPassManager;
+  c.DebugPassManager = config->ltoDebugPassManager;
+  c.DwoDir = config->dwoDir;
 
-  if (Config->EmitLLVM) {
-    C.PostInternalizeModuleHook = [](size_t Task, const Module &M) {
-      if (std::unique_ptr<raw_fd_ostream> OS = openFile(Config->OutputFile))
-        WriteBitcodeToFile(M, *OS, false);
+  c.CSIRProfile = config->ltoCSProfileFile;
+  c.RunCSIRInstr = config->ltoCSProfileGenerate;
+
+  if (config->emitLLVM) {
+    c.PostInternalizeModuleHook = [](size_t task, const Module &m) {
+      if (std::unique_ptr<raw_fd_ostream> os = openFile(config->outputFile))
+        WriteBitcodeToFile(m, *os, false);
       return false;
     };
   }
 
-  if (Config->SaveTemps)
-    checkError(C.addSaveTemps(Config->OutputFile.str() + ".",
+  if (config->saveTemps)
+    checkError(c.addSaveTemps(config->outputFile.str() + ".",
                               /*UseInputModulePath*/ true));
-  return C;
+  return c;
 }
 
 BitcodeCompiler::BitcodeCompiler() {
-  // Initialize IndexFile.
-  if (!Config->ThinLTOIndexOnlyArg.empty())
-    IndexFile = openFile(Config->ThinLTOIndexOnlyArg);
+  // Initialize indexFile.
+  if (!config->thinLTOIndexOnlyArg.empty())
+    indexFile = openFile(config->thinLTOIndexOnlyArg);
 
-  // Initialize LTOObj.
-  lto::ThinBackend Backend;
-  if (Config->ThinLTOIndexOnly) {
-    auto OnIndexWrite = [&](StringRef S) { ThinIndices.erase(S); };
-    Backend = lto::createWriteIndexesThinBackend(
-        Config->ThinLTOPrefixReplace.first, Config->ThinLTOPrefixReplace.second,
-        Config->ThinLTOEmitImportsFiles, IndexFile.get(), OnIndexWrite);
-  } else if (Config->ThinLTOJobs != -1U) {
-    Backend = lto::createInProcessThinBackend(Config->ThinLTOJobs);
+  // Initialize ltoObj.
+  lto::ThinBackend backend;
+  if (config->thinLTOIndexOnly) {
+    auto onIndexWrite = [&](StringRef s) { thinIndices.erase(s); };
+    backend = lto::createWriteIndexesThinBackend(
+        config->thinLTOPrefixReplace.first, config->thinLTOPrefixReplace.second,
+        config->thinLTOEmitImportsFiles, indexFile.get(), onIndexWrite);
+  } else if (config->thinLTOJobs != -1U) {
+    backend = lto::createInProcessThinBackend(config->thinLTOJobs);
   }
 
-  LTOObj = llvm::make_unique<lto::LTO>(createConfig(), Backend,
-                                       Config->LTOPartitions);
+  ltoObj = llvm::make_unique<lto::LTO>(createConfig(), backend,
+                                       config->ltoPartitions);
 
-  // Initialize UsedStartStop.
-  for (Symbol *Sym : Symtab->getSymbols()) {
-    StringRef S = Sym->getName();
-    for (StringRef Prefix : {"__start_", "__stop_"})
-      if (S.startswith(Prefix))
-        UsedStartStop.insert(S.substr(Prefix.size()));
-  }
+  // Initialize usedStartStop.
+  symtab->forEachSymbol([&](Symbol *sym) {
+    StringRef s = sym->getName();
+    for (StringRef prefix : {"__start_", "__stop_"})
+      if (s.startswith(prefix))
+        usedStartStop.insert(s.substr(prefix.size()));
+  });
 }
 
 BitcodeCompiler::~BitcodeCompiler() = default;
 
-static void undefine(Symbol *S) {
-  replaceSymbol<Undefined>(S, nullptr, S->getName(), STB_GLOBAL, STV_DEFAULT,
-                           S->Type);
-}
+void BitcodeCompiler::add(BitcodeFile &f) {
+  lto::InputFile &obj = *f.obj;
+  bool isExec = !config->shared && !config->relocatable;
 
-void BitcodeCompiler::add(BitcodeFile &F) {
-  lto::InputFile &Obj = *F.Obj;
-  bool IsExec = !Config->Shared && !Config->Relocatable;
+  if (config->thinLTOIndexOnly)
+    thinIndices.insert(obj.getName());
 
-  if (Config->ThinLTOIndexOnly)
-    ThinIndices.insert(Obj.getName());
-
-  ArrayRef<Symbol *> Syms = F.getSymbols();
-  ArrayRef<lto::InputFile::Symbol> ObjSyms = Obj.symbols();
-  std::vector<lto::SymbolResolution> Resols(Syms.size());
+  ArrayRef<Symbol *> syms = f.getSymbols();
+  ArrayRef<lto::InputFile::Symbol> objSyms = obj.symbols();
+  std::vector<lto::SymbolResolution> resols(syms.size());
 
   // Provide a resolution to the LTO API for each symbol.
-  for (size_t I = 0, E = Syms.size(); I != E; ++I) {
-    Symbol *Sym = Syms[I];
-    const lto::InputFile::Symbol &ObjSym = ObjSyms[I];
-    lto::SymbolResolution &R = Resols[I];
+  for (size_t i = 0, e = syms.size(); i != e; ++i) {
+    Symbol *sym = syms[i];
+    const lto::InputFile::Symbol &objSym = objSyms[i];
+    lto::SymbolResolution &r = resols[i];
 
     // Ideally we shouldn't check for SF_Undefined but currently IRObjectFile
     // reports two symbols for module ASM defined. Without this check, lld
     // flags an undefined in IR with a definition in ASM as prevailing.
     // Once IRObjectFile is fixed to report only one symbol this hack can
     // be removed.
-    R.Prevailing = !ObjSym.isUndefined() && Sym->File == &F;
+    r.Prevailing = !objSym.isUndefined() && sym->file == &f;
 
     // We ask LTO to preserve following global symbols:
     // 1) All symbols when doing relocatable link, so that them can be used
@@ -182,115 +183,121 @@ void BitcodeCompiler::add(BitcodeFile &F) {
     // 2) Symbols that are used in regular objects.
     // 3) C named sections if we have corresponding __start_/__stop_ symbol.
     // 4) Symbols that are defined in bitcode files and used for dynamic linking.
-    R.VisibleToRegularObj = Config->Relocatable || Sym->IsUsedInRegularObj ||
-                            (R.Prevailing && Sym->includeInDynsym()) ||
-                            UsedStartStop.count(ObjSym.getSectionName());
-    const auto *DR = dyn_cast<Defined>(Sym);
-    R.FinalDefinitionInLinkageUnit =
-        (IsExec || Sym->Visibility != STV_DEFAULT) && DR &&
+    r.VisibleToRegularObj = config->relocatable || sym->isUsedInRegularObj ||
+                            (r.Prevailing && sym->includeInDynsym()) ||
+                            usedStartStop.count(objSym.getSectionName());
+    const auto *dr = dyn_cast<Defined>(sym);
+    r.FinalDefinitionInLinkageUnit =
+        (isExec || sym->visibility != STV_DEFAULT) && dr &&
         // Skip absolute symbols from ELF objects, otherwise PC-rel relocations
         // will be generated by for them, triggering linker errors.
         // Symbol section is always null for bitcode symbols, hence the check
         // for isElf(). Skip linker script defined symbols as well: they have
         // no File defined.
-        !(DR->Section == nullptr && (!Sym->File || Sym->File->isElf()));
+        !(dr->section == nullptr && (!sym->file || sym->file->isElf()));
 
-    if (R.Prevailing)
-      undefine(Sym);
+    if (r.Prevailing)
+      sym->replace(Undefined{nullptr, sym->getName(), STB_GLOBAL, STV_DEFAULT,
+                             sym->type});
 
     // We tell LTO to not apply interprocedural optimization for wrapped
     // (with --wrap) symbols because otherwise LTO would inline them while
     // their values are still not final.
-    R.LinkerRedefined = !Sym->CanInline;
+    r.LinkerRedefined = !sym->canInline;
   }
-  checkError(LTOObj->add(std::move(F.Obj), Resols));
+  checkError(ltoObj->add(std::move(f.obj), resols));
 }
 
-static void createEmptyIndex(StringRef ModulePath) {
-  std::string Path = replaceThinLTOSuffix(getThinLTOOutputFile(ModulePath));
-  std::unique_ptr<raw_fd_ostream> OS = openFile(Path + ".thinlto.bc");
-  if (!OS)
-    return;
+// If LazyObjFile has not been added to link, emit empty index files.
+// This is needed because this is what GNU gold plugin does and we have a
+// distributed build system that depends on that behavior.
+static void thinLTOCreateEmptyIndexFiles() {
+  for (LazyObjFile *f : lazyObjFiles) {
+    if (!isBitcode(f->mb))
+      continue;
+    std::string path = replaceThinLTOSuffix(getThinLTOOutputFile(f->getName()));
+    std::unique_ptr<raw_fd_ostream> os = openFile(path + ".thinlto.bc");
+    if (!os)
+      continue;
 
-  ModuleSummaryIndex M(/*HaveGVs*/ false);
-  M.setSkipModuleByDistributedBackend();
-  WriteIndexToFile(M, *OS);
-
-  if (Config->ThinLTOEmitImportsFiles)
-    openFile(Path + ".imports");
+    ModuleSummaryIndex m(/*HaveGVs*/ false);
+    m.setSkipModuleByDistributedBackend();
+    WriteIndexToFile(m, *os);
+    if (config->thinLTOEmitImportsFiles)
+      openFile(path + ".imports");
+  }
 }
 
 // Merge all the bitcode files we have seen, codegen the result
 // and return the resulting ObjectFile(s).
 std::vector<InputFile *> BitcodeCompiler::compile() {
-  unsigned MaxTasks = LTOObj->getMaxTasks();
-  Buf.resize(MaxTasks);
-  Files.resize(MaxTasks);
+  unsigned maxTasks = ltoObj->getMaxTasks();
+  buf.resize(maxTasks);
+  files.resize(maxTasks);
 
   // The --thinlto-cache-dir option specifies the path to a directory in which
   // to cache native object files for ThinLTO incremental builds. If a path was
   // specified, configure LTO to use it as the cache directory.
-  lto::NativeObjectCache Cache;
-  if (!Config->ThinLTOCacheDir.empty())
-    Cache = check(
-        lto::localCache(Config->ThinLTOCacheDir,
-                        [&](size_t Task, std::unique_ptr<MemoryBuffer> MB) {
-                          Files[Task] = std::move(MB);
+  lto::NativeObjectCache cache;
+  if (!config->thinLTOCacheDir.empty())
+    cache = check(
+        lto::localCache(config->thinLTOCacheDir,
+                        [&](size_t task, std::unique_ptr<MemoryBuffer> mb) {
+                          files[task] = std::move(mb);
                         }));
 
-  checkError(LTOObj->run(
-      [&](size_t Task) {
-        return llvm::make_unique<lto::NativeObjectStream>(
-            llvm::make_unique<raw_svector_ostream>(Buf[Task]));
-      },
-      Cache));
+  if (!bitcodeFiles.empty())
+    checkError(ltoObj->run(
+        [&](size_t task) {
+          return llvm::make_unique<lto::NativeObjectStream>(
+              llvm::make_unique<raw_svector_ostream>(buf[task]));
+        },
+        cache));
 
   // Emit empty index files for non-indexed files
-  for (StringRef S : ThinIndices) {
-    std::string Path = getThinLTOOutputFile(S);
-    openFile(Path + ".thinlto.bc");
-    if (Config->ThinLTOEmitImportsFiles)
-      openFile(Path + ".imports");
+  for (StringRef s : thinIndices) {
+    std::string path = getThinLTOOutputFile(s);
+    openFile(path + ".thinlto.bc");
+    if (config->thinLTOEmitImportsFiles)
+      openFile(path + ".imports");
   }
 
-  // If LazyObjFile has not been added to link, emit empty index files.
-  // This is needed because this is what GNU gold plugin does and we have a
-  // distributed build system that depends on that behavior.
-  if (Config->ThinLTOIndexOnly) {
-    for (LazyObjFile *F : LazyObjFiles)
-      if (!F->AddedToLink && isBitcode(F->MB))
-        createEmptyIndex(F->getName());
+  if (config->thinLTOIndexOnly) {
+    thinLTOCreateEmptyIndexFiles();
 
-    if (!Config->LTOObjPath.empty())
-      saveBuffer(Buf[0], Config->LTOObjPath);
+    if (!config->ltoObjPath.empty())
+      saveBuffer(buf[0], config->ltoObjPath);
 
     // ThinLTO with index only option is required to generate only the index
     // files. After that, we exit from linker and ThinLTO backend runs in a
     // distributed environment.
-    if (IndexFile)
-      IndexFile->close();
+    if (indexFile)
+      indexFile->close();
     return {};
   }
 
-  if (!Config->ThinLTOCacheDir.empty())
-    pruneCache(Config->ThinLTOCacheDir, Config->ThinLTOCachePolicy);
+  if (!config->thinLTOCacheDir.empty())
+    pruneCache(config->thinLTOCacheDir, config->thinLTOCachePolicy);
 
-  std::vector<InputFile *> Ret;
-  for (unsigned I = 0; I != MaxTasks; ++I) {
-    if (Buf[I].empty())
-      continue;
-    if (Config->SaveTemps) {
-      if (I == 0)
-        saveBuffer(Buf[I], Config->OutputFile + ".lto.o");
-      else
-        saveBuffer(Buf[I], Config->OutputFile + Twine(I) + ".lto.o");
-    }
-    InputFile *Obj = createObjectFile(MemoryBufferRef(Buf[I], "lto.tmp"));
-    Ret.push_back(Obj);
+  if (!config->ltoObjPath.empty()) {
+    saveBuffer(buf[0], config->ltoObjPath);
+    for (unsigned i = 1; i != maxTasks; ++i)
+      saveBuffer(buf[i], config->ltoObjPath + Twine(i));
   }
 
-  for (std::unique_ptr<MemoryBuffer> &File : Files)
-    if (File)
-      Ret.push_back(createObjectFile(*File));
-  return Ret;
+  if (config->saveTemps) {
+    saveBuffer(buf[0], config->outputFile + ".lto.o");
+    for (unsigned i = 1; i != maxTasks; ++i)
+      saveBuffer(buf[i], config->outputFile + Twine(i) + ".lto.o");
+  }
+
+  std::vector<InputFile *> ret;
+  for (unsigned i = 0; i != maxTasks; ++i)
+    if (!buf[i].empty())
+      ret.push_back(createObjectFile(MemoryBufferRef(buf[i], "lto.tmp")));
+
+  for (std::unique_ptr<MemoryBuffer> &file : files)
+    if (file)
+      ret.push_back(createObjectFile(*file));
+  return ret;
 }
diff --git a/deps/lld/ELF/LTO.h b/deps/lld/ELF/LTO.h
index a190da3e5996e04d6cbc36bae10f14a2c7a20a1f..4cb42d84d919f80c11b01ea4328b15f832315ce8 100644
--- a/deps/lld/ELF/LTO.h
+++ b/deps/lld/ELF/LTO.h
@@ -1,9 +1,8 @@
 //===- LTO.h ----------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -46,16 +45,16 @@ public:
   BitcodeCompiler();
   ~BitcodeCompiler();
 
-  void add(BitcodeFile &F);
+  void add(BitcodeFile &f);
   std::vector<InputFile *> compile();
 
 private:
-  std::unique_ptr<llvm::lto::LTO> LTOObj;
-  std::vector<SmallString<0>> Buf;
-  std::vector<std::unique_ptr<MemoryBuffer>> Files;
-  llvm::DenseSet<StringRef> UsedStartStop;
-  std::unique_ptr<llvm::raw_fd_ostream> IndexFile;
-  llvm::DenseSet<StringRef> ThinIndices;
+  std::unique_ptr<llvm::lto::LTO> ltoObj;
+  std::vector<SmallString<0>> buf;
+  std::vector<std::unique_ptr<MemoryBuffer>> files;
+  llvm::DenseSet<StringRef> usedStartStop;
+  std::unique_ptr<llvm::raw_fd_ostream> indexFile;
+  llvm::DenseSet<StringRef> thinIndices;
 };
 } // namespace elf
 } // namespace lld
diff --git a/deps/lld/ELF/LinkerScript.cpp b/deps/lld/ELF/LinkerScript.cpp
index fbc02541620591abdbee9e2c6fe669edea078322..49e44d7804761a27977b1ae94528a3acd239bfcd 100644
--- a/deps/lld/ELF/LinkerScript.cpp
+++ b/deps/lld/ELF/LinkerScript.cpp
@@ -1,9 +1,8 @@
 //===- LinkerScript.cpp ---------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -47,26 +46,26 @@ using namespace llvm::support::endian;
 using namespace lld;
 using namespace lld::elf;
 
-LinkerScript *elf::Script;
+LinkerScript *elf::script;
 
-static uint64_t getOutputSectionVA(SectionBase *InputSec, StringRef Loc) {
-  if (OutputSection *OS = InputSec->getOutputSection())
-    return OS->Addr;
-  error(Loc + ": unable to evaluate expression: input section " +
-        InputSec->Name + " has no output section assigned");
+static uint64_t getOutputSectionVA(SectionBase *inputSec, StringRef loc) {
+  if (OutputSection *os = inputSec->getOutputSection())
+    return os->addr;
+  error(loc + ": unable to evaluate expression: input section " +
+        inputSec->name + " has no output section assigned");
   return 0;
 }
 
 uint64_t ExprValue::getValue() const {
-  if (Sec)
-    return alignTo(Sec->getOffset(Val) + getOutputSectionVA(Sec, Loc),
-                   Alignment);
-  return alignTo(Val, Alignment);
+  if (sec)
+    return alignTo(sec->getOffset(val) + getOutputSectionVA(sec, loc),
+                   alignment);
+  return alignTo(val, alignment);
 }
 
 uint64_t ExprValue::getSecAddr() const {
-  if (Sec)
-    return Sec->getOffset(0) + getOutputSectionVA(Sec, Loc);
+  if (sec)
+    return sec->getOffset(0) + getOutputSectionVA(sec, loc);
   return 0;
 }
 
@@ -74,106 +73,100 @@ uint64_t ExprValue::getSectionOffset() const {
   // If the alignment is trivial, we don't have to compute the full
   // value to know the offset. This allows this function to succeed in
   // cases where the output section is not yet known.
-  if (Alignment == 1 && (!Sec || !Sec->getOutputSection()))
-    return Val;
+  if (alignment == 1 && (!sec || !sec->getOutputSection()))
+    return val;
   return getValue() - getSecAddr();
 }
 
-OutputSection *LinkerScript::createOutputSection(StringRef Name,
-                                                 StringRef Location) {
-  OutputSection *&SecRef = NameToOutputSection[Name];
-  OutputSection *Sec;
-  if (SecRef && SecRef->Location.empty()) {
+OutputSection *LinkerScript::createOutputSection(StringRef name,
+                                                 StringRef location) {
+  OutputSection *&secRef = nameToOutputSection[name];
+  OutputSection *sec;
+  if (secRef && secRef->location.empty()) {
     // There was a forward reference.
-    Sec = SecRef;
+    sec = secRef;
   } else {
-    Sec = make<OutputSection>(Name, SHT_NOBITS, 0);
-    if (!SecRef)
-      SecRef = Sec;
+    sec = make<OutputSection>(name, SHT_PROGBITS, 0);
+    if (!secRef)
+      secRef = sec;
   }
-  Sec->Location = Location;
-  return Sec;
+  sec->location = location;
+  return sec;
 }
 
-OutputSection *LinkerScript::getOrCreateOutputSection(StringRef Name) {
-  OutputSection *&CmdRef = NameToOutputSection[Name];
-  if (!CmdRef)
-    CmdRef = make<OutputSection>(Name, SHT_PROGBITS, 0);
-  return CmdRef;
+OutputSection *LinkerScript::getOrCreateOutputSection(StringRef name) {
+  OutputSection *&cmdRef = nameToOutputSection[name];
+  if (!cmdRef)
+    cmdRef = make<OutputSection>(name, SHT_PROGBITS, 0);
+  return cmdRef;
 }
 
 // Expands the memory region by the specified size.
-static void expandMemoryRegion(MemoryRegion *MemRegion, uint64_t Size,
-                               StringRef RegionName, StringRef SecName) {
-  MemRegion->CurPos += Size;
-  uint64_t NewSize = MemRegion->CurPos - MemRegion->Origin;
-  if (NewSize > MemRegion->Length)
-    error("section '" + SecName + "' will not fit in region '" + RegionName +
-          "': overflowed by " + Twine(NewSize - MemRegion->Length) + " bytes");
+static void expandMemoryRegion(MemoryRegion *memRegion, uint64_t size,
+                               StringRef regionName, StringRef secName) {
+  memRegion->curPos += size;
+  uint64_t newSize = memRegion->curPos - memRegion->origin;
+  if (newSize > memRegion->length)
+    error("section '" + secName + "' will not fit in region '" + regionName +
+          "': overflowed by " + Twine(newSize - memRegion->length) + " bytes");
 }
 
-void LinkerScript::expandMemoryRegions(uint64_t Size) {
-  if (Ctx->MemRegion)
-    expandMemoryRegion(Ctx->MemRegion, Size, Ctx->MemRegion->Name,
-                       Ctx->OutSec->Name);
-  // Only expand the LMARegion if it is different from MemRegion.
-  if (Ctx->LMARegion && Ctx->MemRegion != Ctx->LMARegion)
-    expandMemoryRegion(Ctx->LMARegion, Size, Ctx->LMARegion->Name,
-                       Ctx->OutSec->Name);
+void LinkerScript::expandMemoryRegions(uint64_t size) {
+  if (ctx->memRegion)
+    expandMemoryRegion(ctx->memRegion, size, ctx->memRegion->name,
+                       ctx->outSec->name);
+  // Only expand the LMARegion if it is different from memRegion.
+  if (ctx->lmaRegion && ctx->memRegion != ctx->lmaRegion)
+    expandMemoryRegion(ctx->lmaRegion, size, ctx->lmaRegion->name,
+                       ctx->outSec->name);
 }
 
-void LinkerScript::expandOutputSection(uint64_t Size) {
-  Ctx->OutSec->Size += Size;
-  expandMemoryRegions(Size);
+void LinkerScript::expandOutputSection(uint64_t size) {
+  ctx->outSec->size += size;
+  expandMemoryRegions(size);
 }
 
-void LinkerScript::setDot(Expr E, const Twine &Loc, bool InSec) {
-  uint64_t Val = E().getValue();
-  if (Val < Dot && InSec)
-    error(Loc + ": unable to move location counter backward for: " +
-          Ctx->OutSec->Name);
+void LinkerScript::setDot(Expr e, const Twine &loc, bool inSec) {
+  uint64_t val = e().getValue();
+  if (val < dot && inSec)
+    error(loc + ": unable to move location counter backward for: " +
+          ctx->outSec->name);
 
   // Update to location counter means update to section size.
-  if (InSec)
-    expandOutputSection(Val - Dot);
-  else
-    expandMemoryRegions(Val - Dot);
+  if (inSec)
+    expandOutputSection(val - dot);
 
-  Dot = Val;
+  dot = val;
 }
 
 // Used for handling linker symbol assignments, for both finalizing
 // their values and doing early declarations. Returns true if symbol
 // should be defined from linker script.
-static bool shouldDefineSym(SymbolAssignment *Cmd) {
-  if (Cmd->Name == ".")
+static bool shouldDefineSym(SymbolAssignment *cmd) {
+  if (cmd->name == ".")
     return false;
 
-  if (!Cmd->Provide)
+  if (!cmd->provide)
     return true;
 
   // If a symbol was in PROVIDE(), we need to define it only
   // when it is a referenced undefined symbol.
-  Symbol *B = Symtab->find(Cmd->Name);
-  if (B && !B->isDefined())
+  Symbol *b = symtab->find(cmd->name);
+  if (b && !b->isDefined())
     return true;
   return false;
 }
 
 // This function is called from processSectionCommands,
 // while we are fixing the output section layout.
-void LinkerScript::addSymbol(SymbolAssignment *Cmd) {
-  if (!shouldDefineSym(Cmd))
+void LinkerScript::addSymbol(SymbolAssignment *cmd) {
+  if (!shouldDefineSym(cmd))
     return;
 
   // Define a symbol.
-  Symbol *Sym;
-  uint8_t Visibility = Cmd->Hidden ? STV_HIDDEN : STV_DEFAULT;
-  std::tie(Sym, std::ignore) = Symtab->insert(Cmd->Name, Visibility,
-                                              /*CanOmitFromDynSym*/ false,
-                                              /*File*/ nullptr);
-  ExprValue Value = Cmd->Expression();
-  SectionBase *Sec = Value.isAbsolute() ? nullptr : Value.Sec;
+  ExprValue value = cmd->expression();
+  SectionBase *sec = value.isAbsolute() ? nullptr : value.sec;
+  uint8_t visibility = cmd->hidden ? STV_HIDDEN : STV_DEFAULT;
 
   // When this function is called, section addresses have not been
   // fixed yet. So, we may or may not know the value of the RHS
@@ -186,68 +179,73 @@ void LinkerScript::addSymbol(SymbolAssignment *Cmd) {
   // We want to set symbol values early if we can. This allows us to
   // use symbols as variables in linker scripts. Doing so allows us to
   // write expressions like this: `alignment = 16; . = ALIGN(., alignment)`.
-  uint64_t SymValue = Value.Sec ? 0 : Value.getValue();
+  uint64_t symValue = value.sec ? 0 : value.getValue();
 
-  replaceSymbol<Defined>(Sym, nullptr, Cmd->Name, STB_GLOBAL, Visibility,
-                         STT_NOTYPE, SymValue, 0, Sec);
-  Cmd->Sym = cast<Defined>(Sym);
+  Defined New(nullptr, cmd->name, STB_GLOBAL, visibility, STT_NOTYPE, symValue,
+              0, sec);
+
+  Symbol *sym = symtab->insert(cmd->name);
+  sym->mergeProperties(New);
+  sym->replace(New);
+  cmd->sym = cast<Defined>(sym);
 }
 
 // This function is called from LinkerScript::declareSymbols.
 // It creates a placeholder symbol if needed.
-static void declareSymbol(SymbolAssignment *Cmd) {
-  if (!shouldDefineSym(Cmd))
+static void declareSymbol(SymbolAssignment *cmd) {
+  if (!shouldDefineSym(cmd))
     return;
 
+  uint8_t visibility = cmd->hidden ? STV_HIDDEN : STV_DEFAULT;
+  Defined New(nullptr, cmd->name, STB_GLOBAL, visibility, STT_NOTYPE, 0, 0,
+              nullptr);
+
   // We can't calculate final value right now.
-  Symbol *Sym;
-  uint8_t Visibility = Cmd->Hidden ? STV_HIDDEN : STV_DEFAULT;
-  std::tie(Sym, std::ignore) = Symtab->insert(Cmd->Name, Visibility,
-                                              /*CanOmitFromDynSym*/ false,
-                                              /*File*/ nullptr);
-  replaceSymbol<Defined>(Sym, nullptr, Cmd->Name, STB_GLOBAL, Visibility,
-                         STT_NOTYPE, 0, 0, nullptr);
-  Cmd->Sym = cast<Defined>(Sym);
-  Cmd->Provide = false;
-  Sym->ScriptDefined = true;
+  Symbol *sym = symtab->insert(cmd->name);
+  sym->mergeProperties(New);
+  sym->replace(New);
+
+  cmd->sym = cast<Defined>(sym);
+  cmd->provide = false;
+  sym->scriptDefined = true;
 }
 
 // This method is used to handle INSERT AFTER statement. Here we rebuild
 // the list of script commands to mix sections inserted into.
 void LinkerScript::processInsertCommands() {
-  std::vector<BaseCommand *> V;
-  auto Insert = [&](std::vector<BaseCommand *> &From) {
-    V.insert(V.end(), From.begin(), From.end());
-    From.clear();
+  std::vector<BaseCommand *> v;
+  auto insert = [&](std::vector<BaseCommand *> &from) {
+    v.insert(v.end(), from.begin(), from.end());
+    from.clear();
   };
 
-  for (BaseCommand *Base : SectionCommands) {
-    if (auto *OS = dyn_cast<OutputSection>(Base)) {
-      Insert(InsertBeforeCommands[OS->Name]);
-      V.push_back(Base);
-      Insert(InsertAfterCommands[OS->Name]);
+  for (BaseCommand *base : sectionCommands) {
+    if (auto *os = dyn_cast<OutputSection>(base)) {
+      insert(insertBeforeCommands[os->name]);
+      v.push_back(base);
+      insert(insertAfterCommands[os->name]);
       continue;
     }
-    V.push_back(Base);
+    v.push_back(base);
   }
 
-  for (auto &Cmds : {InsertBeforeCommands, InsertAfterCommands})
-    for (const std::pair<StringRef, std::vector<BaseCommand *>> &P : Cmds)
-      if (!P.second.empty())
-        error("unable to INSERT AFTER/BEFORE " + P.first +
+  for (auto &cmds : {insertBeforeCommands, insertAfterCommands})
+    for (const std::pair<StringRef, std::vector<BaseCommand *>> &p : cmds)
+      if (!p.second.empty())
+        error("unable to INSERT AFTER/BEFORE " + p.first +
               ": section not defined");
 
-  SectionCommands = std::move(V);
+  sectionCommands = std::move(v);
 }
 
 // Symbols defined in script should not be inlined by LTO. At the same time
 // we don't know their final values until late stages of link. Here we scan
 // over symbol assignment commands and create placeholder symbols if needed.
 void LinkerScript::declareSymbols() {
-  assert(!Ctx);
-  for (BaseCommand *Base : SectionCommands) {
-    if (auto *Cmd = dyn_cast<SymbolAssignment>(Base)) {
-      declareSymbol(Cmd);
+  assert(!ctx);
+  for (BaseCommand *base : sectionCommands) {
+    if (auto *cmd = dyn_cast<SymbolAssignment>(base)) {
+      declareSymbol(cmd);
       continue;
     }
 
@@ -255,75 +253,75 @@ void LinkerScript::declareSymbols() {
     // we can't say for sure if it is going to be included or not.
     // Skip such sections for now. Improve the checks if we ever
     // need symbols from that sections to be declared early.
-    auto *Sec = cast<OutputSection>(Base);
-    if (Sec->Constraint != ConstraintKind::NoConstraint)
+    auto *sec = cast<OutputSection>(base);
+    if (sec->constraint != ConstraintKind::NoConstraint)
       continue;
-    for (BaseCommand *Base2 : Sec->SectionCommands)
-      if (auto *Cmd = dyn_cast<SymbolAssignment>(Base2))
-        declareSymbol(Cmd);
+    for (BaseCommand *base2 : sec->sectionCommands)
+      if (auto *cmd = dyn_cast<SymbolAssignment>(base2))
+        declareSymbol(cmd);
   }
 }
 
 // This function is called from assignAddresses, while we are
 // fixing the output section addresses. This function is supposed
 // to set the final value for a given symbol assignment.
-void LinkerScript::assignSymbol(SymbolAssignment *Cmd, bool InSec) {
-  if (Cmd->Name == ".") {
-    setDot(Cmd->Expression, Cmd->Location, InSec);
+void LinkerScript::assignSymbol(SymbolAssignment *cmd, bool inSec) {
+  if (cmd->name == ".") {
+    setDot(cmd->expression, cmd->location, inSec);
     return;
   }
 
-  if (!Cmd->Sym)
+  if (!cmd->sym)
     return;
 
-  ExprValue V = Cmd->Expression();
-  if (V.isAbsolute()) {
-    Cmd->Sym->Section = nullptr;
-    Cmd->Sym->Value = V.getValue();
+  ExprValue v = cmd->expression();
+  if (v.isAbsolute()) {
+    cmd->sym->section = nullptr;
+    cmd->sym->value = v.getValue();
   } else {
-    Cmd->Sym->Section = V.Sec;
-    Cmd->Sym->Value = V.getSectionOffset();
+    cmd->sym->section = v.sec;
+    cmd->sym->value = v.getSectionOffset();
   }
 }
 
-static std::string getFilename(InputFile *File) {
-  if (!File)
+static std::string getFilename(InputFile *file) {
+  if (!file)
     return "";
-  if (File->ArchiveName.empty())
-    return File->getName();
-  return (File->ArchiveName + "(" + File->getName() + ")").str();
+  if (file->archiveName.empty())
+    return file->getName();
+  return (file->archiveName + "(" + file->getName() + ")").str();
 }
 
-bool LinkerScript::shouldKeep(InputSectionBase *S) {
-  if (KeptSections.empty())
+bool LinkerScript::shouldKeep(InputSectionBase *s) {
+  if (keptSections.empty())
     return false;
-  std::string Filename = getFilename(S->File);
-  for (InputSectionDescription *ID : KeptSections)
-    if (ID->FilePat.match(Filename))
-      for (SectionPattern &P : ID->SectionPatterns)
-        if (P.SectionPat.match(S->Name))
+  std::string filename = getFilename(s->file);
+  for (InputSectionDescription *id : keptSections)
+    if (id->filePat.match(filename))
+      for (SectionPattern &p : id->sectionPatterns)
+        if (p.sectionPat.match(s->name))
           return true;
   return false;
 }
 
 // A helper function for the SORT() command.
 static std::function<bool(InputSectionBase *, InputSectionBase *)>
-getComparator(SortSectionPolicy K) {
-  switch (K) {
+getComparator(SortSectionPolicy k) {
+  switch (k) {
   case SortSectionPolicy::Alignment:
-    return [](InputSectionBase *A, InputSectionBase *B) {
+    return [](InputSectionBase *a, InputSectionBase *b) {
       // ">" is not a mistake. Sections with larger alignments are placed
       // before sections with smaller alignments in order to reduce the
       // amount of padding necessary. This is compatible with GNU.
-      return A->Alignment > B->Alignment;
+      return a->alignment > b->alignment;
     };
   case SortSectionPolicy::Name:
-    return [](InputSectionBase *A, InputSectionBase *B) {
-      return A->Name < B->Name;
+    return [](InputSectionBase *a, InputSectionBase *b) {
+      return a->name < b->name;
     };
   case SortSectionPolicy::Priority:
-    return [](InputSectionBase *A, InputSectionBase *B) {
-      return getPriority(A->Name) < getPriority(B->Name);
+    return [](InputSectionBase *a, InputSectionBase *b) {
+      return getPriority(a->name) < getPriority(b->name);
     };
   default:
     llvm_unreachable("unknown sort policy");
@@ -331,22 +329,22 @@ getComparator(SortSectionPolicy K) {
 }
 
 // A helper function for the SORT() command.
-static bool matchConstraints(ArrayRef<InputSection *> Sections,
-                             ConstraintKind Kind) {
-  if (Kind == ConstraintKind::NoConstraint)
+static bool matchConstraints(ArrayRef<InputSection *> sections,
+                             ConstraintKind kind) {
+  if (kind == ConstraintKind::NoConstraint)
     return true;
 
-  bool IsRW = llvm::any_of(
-      Sections, [](InputSection *Sec) { return Sec->Flags & SHF_WRITE; });
+  bool isRW = llvm::any_of(
+      sections, [](InputSection *sec) { return sec->flags & SHF_WRITE; });
 
-  return (IsRW && Kind == ConstraintKind::ReadWrite) ||
-         (!IsRW && Kind == ConstraintKind::ReadOnly);
+  return (isRW && kind == ConstraintKind::ReadWrite) ||
+         (!isRW && kind == ConstraintKind::ReadOnly);
 }
 
-static void sortSections(MutableArrayRef<InputSection *> Vec,
-                         SortSectionPolicy K) {
-  if (K != SortSectionPolicy::Default && K != SortSectionPolicy::None)
-    std::stable_sort(Vec.begin(), Vec.end(), getComparator(K));
+static void sortSections(MutableArrayRef<InputSection *> vec,
+                         SortSectionPolicy k) {
+  if (k != SortSectionPolicy::Default && k != SortSectionPolicy::None)
+    llvm::stable_sort(vec, getComparator(k));
 }
 
 // Sort sections as instructed by SORT-family commands and --sort-section
@@ -360,29 +358,29 @@ static void sortSections(MutableArrayRef<InputSection *> Vec,
 //    --sort-section is handled as an inner SORT command.
 // 3. If one SORT command is given, and if it is SORT_NONE, don't sort.
 // 4. If no SORT command is given, sort according to --sort-section.
-static void sortInputSections(MutableArrayRef<InputSection *> Vec,
-                              const SectionPattern &Pat) {
-  if (Pat.SortOuter == SortSectionPolicy::None)
+static void sortInputSections(MutableArrayRef<InputSection *> vec,
+                              const SectionPattern &pat) {
+  if (pat.sortOuter == SortSectionPolicy::None)
     return;
 
-  if (Pat.SortInner == SortSectionPolicy::Default)
-    sortSections(Vec, Config->SortSection);
+  if (pat.sortInner == SortSectionPolicy::Default)
+    sortSections(vec, config->sortSection);
   else
-    sortSections(Vec, Pat.SortInner);
-  sortSections(Vec, Pat.SortOuter);
+    sortSections(vec, pat.sortInner);
+  sortSections(vec, pat.sortOuter);
 }
 
 // Compute and remember which sections the InputSectionDescription matches.
 std::vector<InputSection *>
-LinkerScript::computeInputSections(const InputSectionDescription *Cmd) {
-  std::vector<InputSection *> Ret;
+LinkerScript::computeInputSections(const InputSectionDescription *cmd) {
+  std::vector<InputSection *> ret;
 
   // Collects all sections that satisfy constraints of Cmd.
-  for (const SectionPattern &Pat : Cmd->SectionPatterns) {
-    size_t SizeBefore = Ret.size();
+  for (const SectionPattern &pat : cmd->sectionPatterns) {
+    size_t sizeBefore = ret.size();
 
-    for (InputSectionBase *Sec : InputSections) {
-      if (!Sec->Live || Sec->Assigned)
+    for (InputSectionBase *sec : inputSections) {
+      if (!sec->isLive() || sec->assigned)
         continue;
 
       // For -emit-relocs we have to ignore entries like
@@ -390,59 +388,59 @@ LinkerScript::computeInputSections(const InputSectionDescription *Cmd) {
       // which are common because they are in the default bfd script.
       // We do not ignore SHT_REL[A] linker-synthesized sections here because
       // want to support scripts that do custom layout for them.
-      if (auto *IS = dyn_cast<InputSection>(Sec))
-        if (IS->getRelocatedSection())
+      if (auto *isec = dyn_cast<InputSection>(sec))
+        if (isec->getRelocatedSection())
           continue;
 
-      std::string Filename = getFilename(Sec->File);
-      if (!Cmd->FilePat.match(Filename) ||
-          Pat.ExcludedFilePat.match(Filename) ||
-          !Pat.SectionPat.match(Sec->Name))
+      std::string filename = getFilename(sec->file);
+      if (!cmd->filePat.match(filename) ||
+          pat.excludedFilePat.match(filename) ||
+          !pat.sectionPat.match(sec->name))
         continue;
 
       // It is safe to assume that Sec is an InputSection
       // because mergeable or EH input sections have already been
       // handled and eliminated.
-      Ret.push_back(cast<InputSection>(Sec));
-      Sec->Assigned = true;
+      ret.push_back(cast<InputSection>(sec));
+      sec->assigned = true;
     }
 
-    sortInputSections(MutableArrayRef<InputSection *>(Ret).slice(SizeBefore),
-                      Pat);
+    sortInputSections(MutableArrayRef<InputSection *>(ret).slice(sizeBefore),
+                      pat);
   }
-  return Ret;
+  return ret;
 }
 
-void LinkerScript::discard(ArrayRef<InputSection *> V) {
-  for (InputSection *S : V) {
-    if (S == In.ShStrTab || S == In.RelaDyn || S == In.RelrDyn)
-      error("discarding " + S->Name + " section is not allowed");
+void LinkerScript::discard(ArrayRef<InputSection *> v) {
+  for (InputSection *s : v) {
+    if (s == in.shStrTab || s == mainPart->relaDyn || s == mainPart->relrDyn)
+      error("discarding " + s->name + " section is not allowed");
 
     // You can discard .hash and .gnu.hash sections by linker scripts. Since
     // they are synthesized sections, we need to handle them differently than
     // other regular sections.
-    if (S == In.GnuHashTab)
-      In.GnuHashTab = nullptr;
-    if (S == In.HashTab)
-      In.HashTab = nullptr;
+    if (s == mainPart->gnuHashTab)
+      mainPart->gnuHashTab = nullptr;
+    if (s == mainPart->hashTab)
+      mainPart->hashTab = nullptr;
 
-    S->Assigned = false;
-    S->Live = false;
-    discard(S->DependentSections);
+    s->assigned = false;
+    s->markDead();
+    discard(s->dependentSections);
   }
 }
 
 std::vector<InputSection *>
-LinkerScript::createInputSectionList(OutputSection &OutCmd) {
-  std::vector<InputSection *> Ret;
+LinkerScript::createInputSectionList(OutputSection &outCmd) {
+  std::vector<InputSection *> ret;
 
-  for (BaseCommand *Base : OutCmd.SectionCommands) {
-    if (auto *Cmd = dyn_cast<InputSectionDescription>(Base)) {
-      Cmd->Sections = computeInputSections(Cmd);
-      Ret.insert(Ret.end(), Cmd->Sections.begin(), Cmd->Sections.end());
+  for (BaseCommand *base : outCmd.sectionCommands) {
+    if (auto *cmd = dyn_cast<InputSectionDescription>(base)) {
+      cmd->sections = computeInputSections(cmd);
+      ret.insert(ret.end(), cmd->sections.begin(), cmd->sections.end());
     }
   }
-  return Ret;
+  return ret;
 }
 
 void LinkerScript::processSectionCommands() {
@@ -455,34 +453,34 @@ void LinkerScript::processSectionCommands() {
   // To handle that, create a dummy aether section that fills the void before
   // the linker scripts switches to another section. It has an index of one
   // which will map to whatever the first actual section is.
-  Aether = make<OutputSection>("", 0, SHF_ALLOC);
-  Aether->SectionIndex = 1;
+  aether = make<OutputSection>("", 0, SHF_ALLOC);
+  aether->sectionIndex = 1;
 
   // Ctx captures the local AddressState and makes it accessible deliberately.
   // This is needed as there are some cases where we cannot just
   // thread the current state through to a lambda function created by the
   // script parser.
-  auto Deleter = make_unique<AddressState>();
-  Ctx = Deleter.get();
-  Ctx->OutSec = Aether;
+  auto deleter = make_unique<AddressState>();
+  ctx = deleter.get();
+  ctx->outSec = aether;
 
-  size_t I = 0;
+  size_t i = 0;
   // Add input sections to output sections.
-  for (BaseCommand *Base : SectionCommands) {
+  for (BaseCommand *base : sectionCommands) {
     // Handle symbol assignments outside of any output section.
-    if (auto *Cmd = dyn_cast<SymbolAssignment>(Base)) {
-      addSymbol(Cmd);
+    if (auto *cmd = dyn_cast<SymbolAssignment>(base)) {
+      addSymbol(cmd);
       continue;
     }
 
-    if (auto *Sec = dyn_cast<OutputSection>(Base)) {
-      std::vector<InputSection *> V = createInputSectionList(*Sec);
+    if (auto *sec = dyn_cast<OutputSection>(base)) {
+      std::vector<InputSection *> v = createInputSectionList(*sec);
 
       // The output section name `/DISCARD/' is special.
       // Any input section assigned to it is discarded.
-      if (Sec->Name == "/DISCARD/") {
-        discard(V);
-        Sec->SectionCommands.clear();
+      if (sec->name == "/DISCARD/") {
+        discard(v);
+        sec->sectionCommands.clear();
         continue;
       }
 
@@ -493,60 +491,61 @@ void LinkerScript::processSectionCommands() {
       //
       // Because we'll iterate over SectionCommands many more times, the easy
       // way to "make it as if it wasn't present" is to make it empty.
-      if (!matchConstraints(V, Sec->Constraint)) {
-        for (InputSectionBase *S : V)
-          S->Assigned = false;
-        Sec->SectionCommands.clear();
+      if (!matchConstraints(v, sec->constraint)) {
+        for (InputSectionBase *s : v)
+          s->assigned = false;
+        sec->sectionCommands.clear();
         continue;
       }
 
       // A directive may contain symbol definitions like this:
       // ".foo : { ...; bar = .; }". Handle them.
-      for (BaseCommand *Base : Sec->SectionCommands)
-        if (auto *OutCmd = dyn_cast<SymbolAssignment>(Base))
-          addSymbol(OutCmd);
+      for (BaseCommand *base : sec->sectionCommands)
+        if (auto *outCmd = dyn_cast<SymbolAssignment>(base))
+          addSymbol(outCmd);
 
       // Handle subalign (e.g. ".foo : SUBALIGN(32) { ... }"). If subalign
       // is given, input sections are aligned to that value, whether the
       // given value is larger or smaller than the original section alignment.
-      if (Sec->SubalignExpr) {
-        uint32_t Subalign = Sec->SubalignExpr().getValue();
-        for (InputSectionBase *S : V)
-          S->Alignment = Subalign;
+      if (sec->subalignExpr) {
+        uint32_t subalign = sec->subalignExpr().getValue();
+        for (InputSectionBase *s : v)
+          s->alignment = subalign;
       }
 
       // Add input sections to an output section.
-      for (InputSection *S : V)
-        Sec->addSection(S);
+      for (InputSection *s : v)
+        sec->addSection(s);
 
-      Sec->SectionIndex = I++;
-      if (Sec->Noload)
-        Sec->Type = SHT_NOBITS;
-      if (Sec->NonAlloc)
-        Sec->Flags &= ~(uint64_t)SHF_ALLOC;
+      sec->sectionIndex = i++;
+      if (sec->noload)
+        sec->type = SHT_NOBITS;
+      if (sec->nonAlloc)
+        sec->flags &= ~(uint64_t)SHF_ALLOC;
     }
   }
-  Ctx = nullptr;
+  ctx = nullptr;
 }
 
-static OutputSection *findByName(ArrayRef<BaseCommand *> Vec,
-                                 StringRef Name) {
-  for (BaseCommand *Base : Vec)
-    if (auto *Sec = dyn_cast<OutputSection>(Base))
-      if (Sec->Name == Name)
-        return Sec;
+static OutputSection *findByName(ArrayRef<BaseCommand *> vec,
+                                 StringRef name) {
+  for (BaseCommand *base : vec)
+    if (auto *sec = dyn_cast<OutputSection>(base))
+      if (sec->name == name)
+        return sec;
   return nullptr;
 }
 
-static OutputSection *createSection(InputSectionBase *IS,
-                                    StringRef OutsecName) {
-  OutputSection *Sec = Script->createOutputSection(OutsecName, "<internal>");
-  Sec->addSection(cast<InputSection>(IS));
-  return Sec;
+static OutputSection *createSection(InputSectionBase *isec,
+                                    StringRef outsecName) {
+  OutputSection *sec = script->createOutputSection(outsecName, "<internal>");
+  sec->addSection(cast<InputSection>(isec));
+  return sec;
 }
 
-static OutputSection *addInputSec(StringMap<OutputSection *> &Map,
-                                  InputSectionBase *IS, StringRef OutsecName) {
+static OutputSection *
+addInputSec(StringMap<TinyPtrVector<OutputSection *>> &map,
+            InputSectionBase *isec, StringRef outsecName) {
   // Sections with SHT_GROUP or SHF_GROUP attributes reach here only when the -r
   // option is given. A section with SHT_GROUP defines a "section group", and
   // its members have SHF_GROUP attribute. Usually these flags have already been
@@ -554,8 +553,8 @@ static OutputSection *addInputSec(StringMap<OutputSection *> &Map,
   // However, for the -r option, we want to pass through all section groups
   // as-is because adding/removing members or merging them with other groups
   // change their semantics.
-  if (IS->Type == SHT_GROUP || (IS->Flags & SHF_GROUP))
-    return createSection(IS, OutsecName);
+  if (isec->type == SHT_GROUP || (isec->flags & SHF_GROUP))
+    return createSection(isec, outsecName);
 
   // Imagine .zed : { *(.foo) *(.bar) } script. Both foo and bar may have
   // relocation sections .rela.foo and .rela.bar for example. Most tools do
@@ -563,25 +562,25 @@ static OutputSection *addInputSec(StringMap<OutputSection *> &Map,
   // should combine these relocation sections into single output.
   // We skip synthetic sections because it can be .rela.dyn/.rela.plt or any
   // other REL[A] sections created by linker itself.
-  if (!isa<SyntheticSection>(IS) &&
-      (IS->Type == SHT_REL || IS->Type == SHT_RELA)) {
-    auto *Sec = cast<InputSection>(IS);
-    OutputSection *Out = Sec->getRelocatedSection()->getOutputSection();
+  if (!isa<SyntheticSection>(isec) &&
+      (isec->type == SHT_REL || isec->type == SHT_RELA)) {
+    auto *sec = cast<InputSection>(isec);
+    OutputSection *out = sec->getRelocatedSection()->getOutputSection();
 
-    if (Out->RelocationSection) {
-      Out->RelocationSection->addSection(Sec);
+    if (out->relocationSection) {
+      out->relocationSection->addSection(sec);
       return nullptr;
     }
 
-    Out->RelocationSection = createSection(IS, OutsecName);
-    return Out->RelocationSection;
+    out->relocationSection = createSection(isec, outsecName);
+    return out->relocationSection;
   }
 
   // When control reaches here, mergeable sections have already been merged into
   // synthetic sections. For relocatable case we want to create one output
   // section per syntetic section so that they have a valid sh_entsize.
-  if (Config->Relocatable && (IS->Flags & SHF_MERGE))
-    return createSection(IS, OutsecName);
+  if (config->relocatable && (isec->flags & SHF_MERGE))
+    return createSection(isec, outsecName);
 
   //  The ELF spec just says
   // ----------------------------------------------------------------
@@ -625,159 +624,161 @@ static OutputSection *addInputSec(StringMap<OutputSection *> &Map,
   //
   // Given the above issues, we instead merge sections by name and error on
   // incompatible types and flags.
-  OutputSection *&Sec = Map[OutsecName];
-  if (Sec) {
-    Sec->addSection(cast<InputSection>(IS));
+  TinyPtrVector<OutputSection *> &v = map[outsecName];
+  for (OutputSection *sec : v) {
+    if (sec->partition != isec->partition)
+      continue;
+    sec->addSection(cast<InputSection>(isec));
     return nullptr;
   }
 
-  Sec = createSection(IS, OutsecName);
-  return Sec;
+  OutputSection *sec = createSection(isec, outsecName);
+  v.push_back(sec);
+  return sec;
 }
 
 // Add sections that didn't match any sections command.
 void LinkerScript::addOrphanSections() {
-  unsigned End = SectionCommands.size();
-  StringMap<OutputSection *> Map;
-  std::vector<OutputSection *> V;
+  StringMap<TinyPtrVector<OutputSection *>> map;
+  std::vector<OutputSection *> v;
 
-  auto Add = [&](InputSectionBase *S) {
-    if (!S->Live || S->Parent)
+  auto add = [&](InputSectionBase *s) {
+    if (!s->isLive() || s->parent)
       return;
 
-    StringRef Name = getOutputSectionName(S);
+    StringRef name = getOutputSectionName(s);
 
-    if (Config->OrphanHandling == OrphanHandlingPolicy::Error)
-      error(toString(S) + " is being placed in '" + Name + "'");
-    else if (Config->OrphanHandling == OrphanHandlingPolicy::Warn)
-      warn(toString(S) + " is being placed in '" + Name + "'");
+    if (config->orphanHandling == OrphanHandlingPolicy::Error)
+      error(toString(s) + " is being placed in '" + name + "'");
+    else if (config->orphanHandling == OrphanHandlingPolicy::Warn)
+      warn(toString(s) + " is being placed in '" + name + "'");
 
-    if (OutputSection *Sec =
-            findByName(makeArrayRef(SectionCommands).slice(0, End), Name)) {
-      Sec->addSection(cast<InputSection>(S));
+    if (OutputSection *sec = findByName(sectionCommands, name)) {
+      sec->addSection(cast<InputSection>(s));
       return;
     }
 
-    if (OutputSection *OS = addInputSec(Map, S, Name))
-      V.push_back(OS);
-    assert(S->getOutputSection()->SectionIndex == UINT32_MAX);
+    if (OutputSection *os = addInputSec(map, s, name))
+      v.push_back(os);
+    assert(s->getOutputSection()->sectionIndex == UINT32_MAX);
   };
 
   // For futher --emit-reloc handling code we need target output section
   // to be created before we create relocation output section, so we want
   // to create target sections first. We do not want priority handling
   // for synthetic sections because them are special.
-  for (InputSectionBase *IS : InputSections) {
-    if (auto *Sec = dyn_cast<InputSection>(IS))
-      if (InputSectionBase *Rel = Sec->getRelocatedSection())
-        if (auto *RelIS = dyn_cast_or_null<InputSectionBase>(Rel->Parent))
-          Add(RelIS);
-    Add(IS);
+  for (InputSectionBase *isec : inputSections) {
+    if (auto *sec = dyn_cast<InputSection>(isec))
+      if (InputSectionBase *rel = sec->getRelocatedSection())
+        if (auto *relIS = dyn_cast_or_null<InputSectionBase>(rel->parent))
+          add(relIS);
+    add(isec);
   }
 
   // If no SECTIONS command was given, we should insert sections commands
   // before others, so that we can handle scripts which refers them,
   // for example: "foo = ABSOLUTE(ADDR(.text)));".
   // When SECTIONS command is present we just add all orphans to the end.
-  if (HasSectionsCommand)
-    SectionCommands.insert(SectionCommands.end(), V.begin(), V.end());
+  if (hasSectionsCommand)
+    sectionCommands.insert(sectionCommands.end(), v.begin(), v.end());
   else
-    SectionCommands.insert(SectionCommands.begin(), V.begin(), V.end());
+    sectionCommands.insert(sectionCommands.begin(), v.begin(), v.end());
 }
 
-uint64_t LinkerScript::advance(uint64_t Size, unsigned Alignment) {
-  bool IsTbss =
-      (Ctx->OutSec->Flags & SHF_TLS) && Ctx->OutSec->Type == SHT_NOBITS;
-  uint64_t Start = IsTbss ? Dot + Ctx->ThreadBssOffset : Dot;
-  Start = alignTo(Start, Alignment);
-  uint64_t End = Start + Size;
+uint64_t LinkerScript::advance(uint64_t size, unsigned alignment) {
+  bool isTbss =
+      (ctx->outSec->flags & SHF_TLS) && ctx->outSec->type == SHT_NOBITS;
+  uint64_t start = isTbss ? dot + ctx->threadBssOffset : dot;
+  start = alignTo(start, alignment);
+  uint64_t end = start + size;
 
-  if (IsTbss)
-    Ctx->ThreadBssOffset = End - Dot;
+  if (isTbss)
+    ctx->threadBssOffset = end - dot;
   else
-    Dot = End;
-  return End;
+    dot = end;
+  return end;
 }
 
-void LinkerScript::output(InputSection *S) {
-  assert(Ctx->OutSec == S->getParent());
-  uint64_t Before = advance(0, 1);
-  uint64_t Pos = advance(S->getSize(), S->Alignment);
-  S->OutSecOff = Pos - S->getSize() - Ctx->OutSec->Addr;
+void LinkerScript::output(InputSection *s) {
+  assert(ctx->outSec == s->getParent());
+  uint64_t before = advance(0, 1);
+  uint64_t pos = advance(s->getSize(), s->alignment);
+  s->outSecOff = pos - s->getSize() - ctx->outSec->addr;
 
   // Update output section size after adding each section. This is so that
   // SIZEOF works correctly in the case below:
   // .foo { *(.aaa) a = SIZEOF(.foo); *(.bbb) }
-  expandOutputSection(Pos - Before);
+  expandOutputSection(pos - before);
 }
 
-void LinkerScript::switchTo(OutputSection *Sec) {
-  Ctx->OutSec = Sec;
+void LinkerScript::switchTo(OutputSection *sec) {
+  ctx->outSec = sec;
 
-  uint64_t Before = advance(0, 1);
-  Ctx->OutSec->Addr = advance(0, Ctx->OutSec->Alignment);
-  expandMemoryRegions(Ctx->OutSec->Addr - Before);
+  uint64_t before = advance(0, 1);
+  ctx->outSec->addr = advance(0, ctx->outSec->alignment);
+  expandMemoryRegions(ctx->outSec->addr - before);
 }
 
 // This function searches for a memory region to place the given output
 // section in. If found, a pointer to the appropriate memory region is
 // returned. Otherwise, a nullptr is returned.
-MemoryRegion *LinkerScript::findMemoryRegion(OutputSection *Sec) {
+MemoryRegion *LinkerScript::findMemoryRegion(OutputSection *sec) {
   // If a memory region name was specified in the output section command,
   // then try to find that region first.
-  if (!Sec->MemoryRegionName.empty()) {
-    if (MemoryRegion *M = MemoryRegions.lookup(Sec->MemoryRegionName))
-      return M;
-    error("memory region '" + Sec->MemoryRegionName + "' not declared");
+  if (!sec->memoryRegionName.empty()) {
+    if (MemoryRegion *m = memoryRegions.lookup(sec->memoryRegionName))
+      return m;
+    error("memory region '" + sec->memoryRegionName + "' not declared");
     return nullptr;
   }
 
   // If at least one memory region is defined, all sections must
   // belong to some memory region. Otherwise, we don't need to do
   // anything for memory regions.
-  if (MemoryRegions.empty())
+  if (memoryRegions.empty())
     return nullptr;
 
   // See if a region can be found by matching section flags.
-  for (auto &Pair : MemoryRegions) {
-    MemoryRegion *M = Pair.second;
-    if ((M->Flags & Sec->Flags) && (M->NegFlags & Sec->Flags) == 0)
-      return M;
+  for (auto &pair : memoryRegions) {
+    MemoryRegion *m = pair.second;
+    if ((m->flags & sec->flags) && (m->negFlags & sec->flags) == 0)
+      return m;
   }
 
   // Otherwise, no suitable region was found.
-  if (Sec->Flags & SHF_ALLOC)
-    error("no memory region specified for section '" + Sec->Name + "'");
+  if (sec->flags & SHF_ALLOC)
+    error("no memory region specified for section '" + sec->name + "'");
   return nullptr;
 }
 
-static OutputSection *findFirstSection(PhdrEntry *Load) {
-  for (OutputSection *Sec : OutputSections)
-    if (Sec->PtLoad == Load)
-      return Sec;
+static OutputSection *findFirstSection(PhdrEntry *load) {
+  for (OutputSection *sec : outputSections)
+    if (sec->ptLoad == load)
+      return sec;
   return nullptr;
 }
 
 // This function assigns offsets to input sections and an output section
 // for a single sections command (e.g. ".text { *(.text); }").
-void LinkerScript::assignOffsets(OutputSection *Sec) {
-  if (!(Sec->Flags & SHF_ALLOC))
-    Dot = 0;
-  else if (Sec->AddrExpr)
-    setDot(Sec->AddrExpr, Sec->Location, false);
+void LinkerScript::assignOffsets(OutputSection *sec) {
+  if (!(sec->flags & SHF_ALLOC))
+    dot = 0;
 
-  Ctx->MemRegion = Sec->MemRegion;
-  Ctx->LMARegion = Sec->LMARegion;
-  if (Ctx->MemRegion)
-    Dot = Ctx->MemRegion->CurPos;
+  ctx->memRegion = sec->memRegion;
+  ctx->lmaRegion = sec->lmaRegion;
+  if (ctx->memRegion)
+    dot = ctx->memRegion->curPos;
 
-  switchTo(Sec);
+  if ((sec->flags & SHF_ALLOC) && sec->addrExpr)
+    setDot(sec->addrExpr, sec->location, false);
 
-  if (Sec->LMAExpr)
-    Ctx->LMAOffset = Sec->LMAExpr().getValue() - Dot;
+  switchTo(sec);
 
-  if (MemoryRegion *MR = Sec->LMARegion)
-    Ctx->LMAOffset = MR->CurPos - Dot;
+  if (sec->lmaExpr)
+    ctx->lmaOffset = sec->lmaExpr().getValue() - dot;
+
+  if (MemoryRegion *mr = sec->lmaRegion)
+    ctx->lmaOffset = mr->curPos - dot;
 
   // If neither AT nor AT> is specified for an allocatable section, the linker
   // will set the LMA such that the difference between VMA and LMA for the
@@ -785,62 +786,71 @@ void LinkerScript::assignOffsets(OutputSection *Sec) {
   // https://sourceware.org/binutils/docs-2.20/ld/Output-Section-LMA.html
   // This, however, should only be done by the first "non-header" section
   // in the segment.
-  if (PhdrEntry *L = Ctx->OutSec->PtLoad)
-    if (Sec == findFirstSection(L))
-      L->LMAOffset = Ctx->LMAOffset;
+  if (PhdrEntry *l = ctx->outSec->ptLoad)
+    if (sec == findFirstSection(l))
+      l->lmaOffset = ctx->lmaOffset;
 
   // We can call this method multiple times during the creation of
   // thunks and want to start over calculation each time.
-  Sec->Size = 0;
+  sec->size = 0;
 
   // We visited SectionsCommands from processSectionCommands to
   // layout sections. Now, we visit SectionsCommands again to fix
   // section offsets.
-  for (BaseCommand *Base : Sec->SectionCommands) {
+  for (BaseCommand *base : sec->sectionCommands) {
     // This handles the assignments to symbol or to the dot.
-    if (auto *Cmd = dyn_cast<SymbolAssignment>(Base)) {
-      Cmd->Addr = Dot;
-      assignSymbol(Cmd, true);
-      Cmd->Size = Dot - Cmd->Addr;
+    if (auto *cmd = dyn_cast<SymbolAssignment>(base)) {
+      cmd->addr = dot;
+      assignSymbol(cmd, true);
+      cmd->size = dot - cmd->addr;
       continue;
     }
 
     // Handle BYTE(), SHORT(), LONG(), or QUAD().
-    if (auto *Cmd = dyn_cast<ByteCommand>(Base)) {
-      Cmd->Offset = Dot - Ctx->OutSec->Addr;
-      Dot += Cmd->Size;
-      expandOutputSection(Cmd->Size);
+    if (auto *cmd = dyn_cast<ByteCommand>(base)) {
+      cmd->offset = dot - ctx->outSec->addr;
+      dot += cmd->size;
+      expandOutputSection(cmd->size);
       continue;
     }
 
     // Handle a single input section description command.
     // It calculates and assigns the offsets for each section and also
     // updates the output section size.
-    for (InputSection *Sec : cast<InputSectionDescription>(Base)->Sections)
-      output(Sec);
+    for (InputSection *sec : cast<InputSectionDescription>(base)->sections)
+      output(sec);
   }
 }
 
-static bool isDiscardable(OutputSection &Sec) {
+static bool isDiscardable(OutputSection &sec) {
+  if (sec.name == "/DISCARD/")
+    return true;
+
   // We do not remove empty sections that are explicitly
   // assigned to any segment.
-  if (!Sec.Phdrs.empty())
+  if (!sec.phdrs.empty())
     return false;
 
-  // We do not want to remove sections that reference symbols in address and
-  // other expressions. We add script symbols as undefined, and want to ensure
-  // all of them are defined in the output, hence have to keep them.
-  if (Sec.ExpressionsUseSymbols)
+  // We do not want to remove OutputSections with expressions that reference
+  // symbols even if the OutputSection is empty. We want to ensure that the
+  // expressions can be evaluated and report an error if they cannot.
+  if (sec.expressionsUseSymbols)
     return false;
 
-  for (BaseCommand *Base : Sec.SectionCommands) {
-    if (auto Cmd = dyn_cast<SymbolAssignment>(Base))
+  // OutputSections may be referenced by name in ADDR and LOADADDR expressions,
+  // as an empty Section can has a valid VMA and LMA we keep the OutputSection
+  // to maintain the integrity of the other Expression.
+  if (sec.usedInExpression)
+    return false;
+
+  for (BaseCommand *base : sec.sectionCommands) {
+    if (auto cmd = dyn_cast<SymbolAssignment>(base))
       // Don't create empty output sections just for unreferenced PROVIDE
       // symbols.
-      if (Cmd->Name != "." && !Cmd->Sym)
+      if (cmd->name != "." && !cmd->sym)
         continue;
 
-    if (!isa<InputSectionDescription>(*Base))
+    if (!isa<InputSectionDescription>(*base))
       return false;
   }
   return true;
@@ -867,33 +877,35 @@ void LinkerScript::adjustSectionsBeforeSorting() {
   // The other option is to pick flags that minimize the impact the section
   // will have on the rest of the linker. That is why we copy the flags from
   // the previous sections. Only a few flags are needed to keep the impact low.
-  uint64_t Flags = SHF_ALLOC;
+  uint64_t flags = SHF_ALLOC;
 
-  for (BaseCommand *&Cmd : SectionCommands) {
-    auto *Sec = dyn_cast<OutputSection>(Cmd);
-    if (!Sec)
+  for (BaseCommand *&cmd : sectionCommands) {
+    auto *sec = dyn_cast<OutputSection>(cmd);
+    if (!sec)
       continue;
 
     // Handle align (e.g. ".foo : ALIGN(16) { ... }").
-    if (Sec->AlignExpr)
-      Sec->Alignment =
-          std::max<uint32_t>(Sec->Alignment, Sec->AlignExpr().getValue());
+    if (sec->alignExpr)
+      sec->alignment =
+          std::max<uint32_t>(sec->alignment, sec->alignExpr().getValue());
 
-    // A live output section means that some input section was added to it. It
-    // might have been removed (if it was empty synthetic section), but we at
-    // least know the flags.
-    if (Sec->Live)
-      Flags = Sec->Flags;
+    // The input section might have been removed (if it was an empty synthetic
+    // section), but we at least know the flags.
+    if (sec->hasInputSections)
+      flags = sec->flags;
 
     // We do not want to keep any special flags for output section
     // in case it is empty.
-    bool IsEmpty = getInputSections(Sec).empty();
-    if (IsEmpty)
-      Sec->Flags = Flags & (SHF_ALLOC | SHF_WRITE | SHF_EXECINSTR);
+    bool isEmpty = getInputSections(sec).empty();
+    if (isEmpty)
+      sec->flags = flags & ((sec->nonAlloc ? 0 : (uint64_t)SHF_ALLOC) |
+                            SHF_WRITE | SHF_EXECINSTR);
 
-    if (IsEmpty && isDiscardable(*Sec)) {
-      Sec->Live = false;
-      Cmd = nullptr;
+    if (isEmpty && isDiscardable(*sec)) {
+      sec->markDead();
+      cmd = nullptr;
+    } else if (!sec->isLive()) {
+      sec->markLive();
     }
   }
 
@@ -903,20 +915,20 @@ void LinkerScript::adjustSectionsBeforeSorting() {
   // clutter the output.
   // We instead remove trivially empty sections. The bfd linker seems even
   // more aggressive at removing them.
-  llvm::erase_if(SectionCommands, [&](BaseCommand *Base) { return !Base; });
+  llvm::erase_if(sectionCommands, [&](BaseCommand *base) { return !base; });
 }
 
 void LinkerScript::adjustSectionsAfterSorting() {
   // Try and find an appropriate memory region to assign offsets in.
-  for (BaseCommand *Base : SectionCommands) {
-    if (auto *Sec = dyn_cast<OutputSection>(Base)) {
-      if (!Sec->LMARegionName.empty()) {
-        if (MemoryRegion *M = MemoryRegions.lookup(Sec->LMARegionName))
-          Sec->LMARegion = M;
+  for (BaseCommand *base : sectionCommands) {
+    if (auto *sec = dyn_cast<OutputSection>(base)) {
+      if (!sec->lmaRegionName.empty()) {
+        if (MemoryRegion *m = memoryRegions.lookup(sec->lmaRegionName))
+          sec->lmaRegion = m;
         else
-          error("memory region '" + Sec->LMARegionName + "' not declared");
+          error("memory region '" + sec->lmaRegionName + "' not declared");
       }
-      Sec->MemRegion = findMemoryRegion(Sec);
+      sec->memRegion = findMemoryRegion(sec);
     }
   }
 
@@ -926,38 +938,38 @@ void LinkerScript::adjustSectionsAfterSorting() {
   // Below is an example of such linker script:
   // PHDRS { seg PT_LOAD; }
   // SECTIONS { .aaa : { *(.aaa) } }
-  std::vector<StringRef> DefPhdrs;
-  auto FirstPtLoad = llvm::find_if(PhdrsCommands, [](const PhdrsCommand &Cmd) {
-    return Cmd.Type == PT_LOAD;
+  std::vector<StringRef> defPhdrs;
+  auto firstPtLoad = llvm::find_if(phdrsCommands, [](const PhdrsCommand &cmd) {
+    return cmd.type == PT_LOAD;
   });
-  if (FirstPtLoad != PhdrsCommands.end())
-    DefPhdrs.push_back(FirstPtLoad->Name);
+  if (firstPtLoad != phdrsCommands.end())
+    defPhdrs.push_back(firstPtLoad->name);
 
   // Walk the commands and propagate the program headers to commands that don't
   // explicitly specify them.
-  for (BaseCommand *Base : SectionCommands) {
-    auto *Sec = dyn_cast<OutputSection>(Base);
-    if (!Sec)
+  for (BaseCommand *base : sectionCommands) {
+    auto *sec = dyn_cast<OutputSection>(base);
+    if (!sec)
       continue;
 
-    if (Sec->Phdrs.empty()) {
+    if (sec->phdrs.empty()) {
       // To match the bfd linker script behaviour, only propagate program
       // headers to sections that are allocated.
-      if (Sec->Flags & SHF_ALLOC)
-        Sec->Phdrs = DefPhdrs;
+      if (sec->flags & SHF_ALLOC)
+        sec->phdrs = defPhdrs;
     } else {
-      DefPhdrs = Sec->Phdrs;
+      defPhdrs = sec->phdrs;
     }
   }
 }
 
-static uint64_t computeBase(uint64_t Min, bool AllocateHeaders) {
+static uint64_t computeBase(uint64_t min, bool allocateHeaders) {
   // If there is no SECTIONS or if the linkerscript is explicit about program
   // headers, do our best to allocate them.
-  if (!Script->HasSectionsCommand || AllocateHeaders)
+  if (!script->hasSectionsCommand || allocateHeaders)
     return 0;
   // Otherwise only allocate program headers if that would not add a page.
-  return alignDown(Min, Config->MaxPageSize);
+  return alignDown(min, config->maxPageSize);
 }
 
 // Try to find an address for the file and program headers output sections,
@@ -971,118 +983,120 @@ static uint64_t computeBase(uint64_t Min, bool AllocateHeaders) {
 //
 // If there isn't enough space for these sections, we'll remove them from the
 // PT_LOAD segment, and we'll also remove the PT_PHDR segment.
-void LinkerScript::allocateHeaders(std::vector<PhdrEntry *> &Phdrs) {
-  uint64_t Min = std::numeric_limits<uint64_t>::max();
-  for (OutputSection *Sec : OutputSections)
-    if (Sec->Flags & SHF_ALLOC)
-      Min = std::min<uint64_t>(Min, Sec->Addr);
+void LinkerScript::allocateHeaders(std::vector<PhdrEntry *> &phdrs) {
+  uint64_t min = std::numeric_limits<uint64_t>::max();
+  for (OutputSection *sec : outputSections)
+    if (sec->flags & SHF_ALLOC)
+      min = std::min<uint64_t>(min, sec->addr);
 
-  auto It = llvm::find_if(
-      Phdrs, [](const PhdrEntry *E) { return E->p_type == PT_LOAD; });
-  if (It == Phdrs.end())
+  auto it = llvm::find_if(
+      phdrs, [](const PhdrEntry *e) { return e->p_type == PT_LOAD; });
+  if (it == phdrs.end())
     return;
-  PhdrEntry *FirstPTLoad = *It;
+  PhdrEntry *firstPTLoad = *it;
 
-  bool HasExplicitHeaders =
-      llvm::any_of(PhdrsCommands, [](const PhdrsCommand &Cmd) {
-        return Cmd.HasPhdrs || Cmd.HasFilehdr;
+  bool hasExplicitHeaders =
+      llvm::any_of(phdrsCommands, [](const PhdrsCommand &cmd) {
+        return cmd.hasPhdrs || cmd.hasFilehdr;
       });
-  uint64_t HeaderSize = getHeaderSize();
-  if (HeaderSize <= Min - computeBase(Min, HasExplicitHeaders)) {
-    Min = alignDown(Min - HeaderSize, Config->MaxPageSize);
-    Out::ElfHeader->Addr = Min;
-    Out::ProgramHeaders->Addr = Min + Out::ElfHeader->Size;
+  bool paged = !config->omagic && !config->nmagic;
+  uint64_t headerSize = getHeaderSize();
+  if ((paged || hasExplicitHeaders) &&
+      headerSize <= min - computeBase(min, hasExplicitHeaders)) {
+    min = alignDown(min - headerSize, config->maxPageSize);
+    Out::elfHeader->addr = min;
+    Out::programHeaders->addr = min + Out::elfHeader->size;
     return;
   }
 
   // Error if we were explicitly asked to allocate headers.
-  if (HasExplicitHeaders)
+  if (hasExplicitHeaders)
     error("could not allocate headers");
 
-  Out::ElfHeader->PtLoad = nullptr;
-  Out::ProgramHeaders->PtLoad = nullptr;
-  FirstPTLoad->FirstSec = findFirstSection(FirstPTLoad);
+  Out::elfHeader->ptLoad = nullptr;
+  Out::programHeaders->ptLoad = nullptr;
+  firstPTLoad->firstSec = findFirstSection(firstPTLoad);
 
-  llvm::erase_if(Phdrs,
-                 [](const PhdrEntry *E) { return E->p_type == PT_PHDR; });
+  llvm::erase_if(phdrs,
+                 [](const PhdrEntry *e) { return e->p_type == PT_PHDR; });
 }
 
 LinkerScript::AddressState::AddressState() {
-  for (auto &MRI : Script->MemoryRegions) {
-    MemoryRegion *MR = MRI.second;
-    MR->CurPos = MR->Origin;
+  for (auto &mri : script->memoryRegions) {
+    MemoryRegion *mr = mri.second;
+    mr->curPos = mr->origin;
   }
 }
 
 static uint64_t getInitialDot() {
   // By default linker scripts use an initial value of 0 for '.',
   // but prefer -image-base if set.
-  if (Script->HasSectionsCommand)
-    return Config->ImageBase ? *Config->ImageBase : 0;
+  if (script->hasSectionsCommand)
+    return config->imageBase ? *config->imageBase : 0;
 
-  uint64_t StartAddr = UINT64_MAX;
-  // The Sections with -T<section> have been sorted in order of ascending
-  // address. We must lower StartAddr if the lowest -T<section address> as
+  uint64_t startAddr = UINT64_MAX;
+  // The sections with -T<section> have been sorted in order of ascending
+  // address. We must lower startAddr if the lowest -T<section address> as
   // calls to setDot() must be monotonically increasing.
-  for (auto &KV : Config->SectionStartMap)
-    StartAddr = std::min(StartAddr, KV.second);
-  return std::min(StartAddr, Target->getImageBase() + elf::getHeaderSize());
+  for (auto &kv : config->sectionStartMap)
+    startAddr = std::min(startAddr, kv.second);
+  return std::min(startAddr, target->getImageBase() + elf::getHeaderSize());
 }
 
 // Here we assign addresses as instructed by linker script SECTIONS
 // sub-commands. Doing that allows us to use final VA values, so here
 // we also handle rest commands like symbol assignments and ASSERTs.
 void LinkerScript::assignAddresses() {
-  Dot = getInitialDot();
+  dot = getInitialDot();
 
-  auto Deleter = make_unique<AddressState>();
-  Ctx = Deleter.get();
-  ErrorOnMissingSection = true;
-  switchTo(Aether);
+  auto deleter = make_unique<AddressState>();
+  ctx = deleter.get();
+  errorOnMissingSection = true;
+  switchTo(aether);
 
-  for (BaseCommand *Base : SectionCommands) {
-    if (auto *Cmd = dyn_cast<SymbolAssignment>(Base)) {
-      Cmd->Addr = Dot;
-      assignSymbol(Cmd, false);
-      Cmd->Size = Dot - Cmd->Addr;
+  for (BaseCommand *base : sectionCommands) {
+    if (auto *cmd = dyn_cast<SymbolAssignment>(base)) {
+      cmd->addr = dot;
+      assignSymbol(cmd, false);
+      cmd->size = dot - cmd->addr;
       continue;
     }
-    assignOffsets(cast<OutputSection>(Base));
+    assignOffsets(cast<OutputSection>(base));
   }
-  Ctx = nullptr;
+  ctx = nullptr;
 }
 
 // Creates program headers as instructed by PHDRS linker script command.
 std::vector<PhdrEntry *> LinkerScript::createPhdrs() {
-  std::vector<PhdrEntry *> Ret;
+  std::vector<PhdrEntry *> ret;
 
   // Process PHDRS and FILEHDR keywords because they are not
   // real output sections and cannot be added in the following loop.
-  for (const PhdrsCommand &Cmd : PhdrsCommands) {
-    PhdrEntry *Phdr = make<PhdrEntry>(Cmd.Type, Cmd.Flags ? *Cmd.Flags : PF_R);
+  for (const PhdrsCommand &cmd : phdrsCommands) {
+    PhdrEntry *phdr = make<PhdrEntry>(cmd.type, cmd.flags ? *cmd.flags : PF_R);
 
-    if (Cmd.HasFilehdr)
-      Phdr->add(Out::ElfHeader);
-    if (Cmd.HasPhdrs)
-      Phdr->add(Out::ProgramHeaders);
+    if (cmd.hasFilehdr)
+      phdr->add(Out::elfHeader);
+    if (cmd.hasPhdrs)
+      phdr->add(Out::programHeaders);
 
-    if (Cmd.LMAExpr) {
-      Phdr->p_paddr = Cmd.LMAExpr().getValue();
-      Phdr->HasLMA = true;
+    if (cmd.lmaExpr) {
+      phdr->p_paddr = cmd.lmaExpr().getValue();
+      phdr->hasLMA = true;
     }
-    Ret.push_back(Phdr);
+    ret.push_back(phdr);
   }
 
   // Add output sections to program headers.
-  for (OutputSection *Sec : OutputSections) {
+  for (OutputSection *sec : outputSections) {
     // Assign headers specified by linker script
-    for (size_t Id : getPhdrIndices(Sec)) {
-      Ret[Id]->add(Sec);
-      if (!PhdrsCommands[Id].Flags.hasValue())
-        Ret[Id]->p_flags |= Sec->getPhdrFlags();
+    for (size_t id : getPhdrIndices(sec)) {
+      ret[id]->add(sec);
+      if (!phdrsCommands[id].flags.hasValue())
+        ret[id]->p_flags |= sec->getPhdrFlags();
     }
   }
-  return Ret;
+  return ret;
 }
 
 // Returns true if we should emit an .interp section.
@@ -1091,54 +1105,54 @@ std::vector<PhdrEntry *> LinkerScript::createPhdrs() {
 // no PT_INTERP is there, there's no place to emit an
 // .interp, so we don't do that in that case.
 bool LinkerScript::needsInterpSection() {
-  if (PhdrsCommands.empty())
+  if (phdrsCommands.empty())
     return true;
-  for (PhdrsCommand &Cmd : PhdrsCommands)
-    if (Cmd.Type == PT_INTERP)
+  for (PhdrsCommand &cmd : phdrsCommands)
+    if (cmd.type == PT_INTERP)
       return true;
   return false;
 }
 
-ExprValue LinkerScript::getSymbolValue(StringRef Name, const Twine &Loc) {
-  if (Name == ".") {
-    if (Ctx)
-      return {Ctx->OutSec, false, Dot - Ctx->OutSec->Addr, Loc};
-    error(Loc + ": unable to get location counter value");
+ExprValue LinkerScript::getSymbolValue(StringRef name, const Twine &loc) {
+  if (name == ".") {
+    if (ctx)
+      return {ctx->outSec, false, dot - ctx->outSec->addr, loc};
+    error(loc + ": unable to get location counter value");
     return 0;
   }
 
-  if (Symbol *Sym = Symtab->find(Name)) {
-    if (auto *DS = dyn_cast<Defined>(Sym))
-      return {DS->Section, false, DS->Value, Loc};
-    if (isa<SharedSymbol>(Sym))
-      if (!ErrorOnMissingSection)
-        return {nullptr, false, 0, Loc};
+  if (Symbol *sym = symtab->find(name)) {
+    if (auto *ds = dyn_cast<Defined>(sym))
+      return {ds->section, false, ds->value, loc};
+    if (isa<SharedSymbol>(sym))
+      if (!errorOnMissingSection)
+        return {nullptr, false, 0, loc};
   }
 
-  error(Loc + ": symbol not found: " + Name);
+  error(loc + ": symbol not found: " + name);
   return 0;
 }
 
 // Returns the index of the segment named Name.
-static Optional<size_t> getPhdrIndex(ArrayRef<PhdrsCommand> Vec,
-                                     StringRef Name) {
-  for (size_t I = 0; I < Vec.size(); ++I)
-    if (Vec[I].Name == Name)
-      return I;
+static Optional<size_t> getPhdrIndex(ArrayRef<PhdrsCommand> vec,
+                                     StringRef name) {
+  for (size_t i = 0; i < vec.size(); ++i)
+    if (vec[i].name == name)
+      return i;
   return None;
 }
 
 // Returns indices of ELF headers containing specific section. Each index is a
 // zero based number of ELF header listed within PHDRS {} script block.
-std::vector<size_t> LinkerScript::getPhdrIndices(OutputSection *Cmd) {
-  std::vector<size_t> Ret;
+std::vector<size_t> LinkerScript::getPhdrIndices(OutputSection *cmd) {
+  std::vector<size_t> ret;
 
-  for (StringRef S : Cmd->Phdrs) {
-    if (Optional<size_t> Idx = getPhdrIndex(PhdrsCommands, S))
-      Ret.push_back(*Idx);
-    else if (S != "NONE")
-      error(Cmd->Location + ": section header '" + S +
+  for (StringRef s : cmd->phdrs) {
+    if (Optional<size_t> idx = getPhdrIndex(phdrsCommands, s))
+      ret.push_back(*idx);
+    else if (s != "NONE")
+      error(cmd->location + ": section header '" + s +
             "' is not listed in PHDRS");
   }
-  return Ret;
+  return ret;
 }
diff --git a/deps/lld/ELF/LinkerScript.h b/deps/lld/ELF/LinkerScript.h
index 51161981efc804c644d5e32c73c12b454759a1a5..9e9c08ef10ba500e13c13b3f7963feb3b3d1fd11 100644
--- a/deps/lld/ELF/LinkerScript.h
+++ b/deps/lld/ELF/LinkerScript.h
@@ -1,9 +1,8 @@
 //===- LinkerScript.h -------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -32,7 +31,6 @@ namespace elf {
 class Defined;
 class InputSection;
 class InputSectionBase;
-class InputSectionBase;
 class OutputSection;
 class SectionBase;
 class Symbol;
@@ -40,35 +38,35 @@ class ThunkSection;
 
 // This represents an r-value in the linker script.
 struct ExprValue {
-  ExprValue(SectionBase *Sec, bool ForceAbsolute, uint64_t Val,
-            const Twine &Loc)
-      : Sec(Sec), ForceAbsolute(ForceAbsolute), Val(Val), Loc(Loc.str()) {}
+  ExprValue(SectionBase *sec, bool forceAbsolute, uint64_t val,
+            const Twine &loc)
+      : sec(sec), forceAbsolute(forceAbsolute), val(val), loc(loc.str()) {}
 
-  ExprValue(uint64_t Val) : ExprValue(nullptr, false, Val, "") {}
+  ExprValue(uint64_t val) : ExprValue(nullptr, false, val, "") {}
 
-  bool isAbsolute() const { return ForceAbsolute || Sec == nullptr; }
+  bool isAbsolute() const { return forceAbsolute || sec == nullptr; }
   uint64_t getValue() const;
   uint64_t getSecAddr() const;
   uint64_t getSectionOffset() const;
 
   // If a value is relative to a section, it has a non-null Sec.
-  SectionBase *Sec;
+  SectionBase *sec;
 
   // True if this expression is enclosed in ABSOLUTE().
   // This flag affects the return value of getValue().
-  bool ForceAbsolute;
+  bool forceAbsolute;
 
-  uint64_t Val;
-  uint64_t Alignment = 1;
+  uint64_t val;
+  uint64_t alignment = 1;
 
   // Original source location. Used for error messages.
-  std::string Loc;
+  std::string loc;
 };
 
 // This represents an expression in the linker script.
 // ScriptParser::readExpr reads an expression and returns an Expr.
 // Later, we evaluate the expression by calling the function.
-typedef std::function<ExprValue()> Expr;
+using Expr = std::function<ExprValue()>;
 
 // This enum is used to implement linker script SECTIONS command.
 // https://sourceware.org/binutils/docs/ld/SECTIONS.html#SECTIONS
@@ -80,42 +78,42 @@ enum SectionsCommandKind {
 };
 
 struct BaseCommand {
-  BaseCommand(int K) : Kind(K) {}
-  int Kind;
+  BaseCommand(int k) : kind(k) {}
+  int kind;
 };
 
 // This represents ". = <expr>" or "<symbol> = <expr>".
 struct SymbolAssignment : BaseCommand {
-  SymbolAssignment(StringRef Name, Expr E, std::string Loc)
-      : BaseCommand(AssignmentKind), Name(Name), Expression(E), Location(Loc) {}
+  SymbolAssignment(StringRef name, Expr e, std::string loc)
+      : BaseCommand(AssignmentKind), name(name), expression(e), location(loc) {}
 
-  static bool classof(const BaseCommand *C) {
-    return C->Kind == AssignmentKind;
+  static bool classof(const BaseCommand *c) {
+    return c->kind == AssignmentKind;
   }
 
   // The LHS of an expression. Name is either a symbol name or ".".
-  StringRef Name;
-  Defined *Sym = nullptr;
+  StringRef name;
+  Defined *sym = nullptr;
 
   // The RHS of an expression.
-  Expr Expression;
+  Expr expression;
 
   // Command attributes for PROVIDE, HIDDEN and PROVIDE_HIDDEN.
-  bool Provide = false;
-  bool Hidden = false;
+  bool provide = false;
+  bool hidden = false;
 
   // Holds file name and line number for error reporting.
-  std::string Location;
+  std::string location;
 
   // A string representation of this command. We use this for -Map.
-  std::string CommandString;
+  std::string commandString;
 
   // Address of this assignment command.
-  unsigned Addr;
+  unsigned addr;
 
   // Size of this assignment command. This is usually 0, but if
   // you move '.' this may be greater than 0.
-  unsigned Size;
+  unsigned size;
 };
 
 // Linker scripts allow additional constraints to be put on ouput sections.
@@ -128,83 +126,83 @@ enum class ConstraintKind { NoConstraint, ReadOnly, ReadWrite };
 // target memory. Instances of the struct are created by parsing the
 // MEMORY command.
 struct MemoryRegion {
-  MemoryRegion(StringRef Name, uint64_t Origin, uint64_t Length, uint32_t Flags,
-               uint32_t NegFlags)
-      : Name(Name), Origin(Origin), Length(Length), Flags(Flags),
-        NegFlags(NegFlags) {}
+  MemoryRegion(StringRef name, uint64_t origin, uint64_t length, uint32_t flags,
+               uint32_t negFlags)
+      : name(name), origin(origin), length(length), flags(flags),
+        negFlags(negFlags) {}
 
-  std::string Name;
-  uint64_t Origin;
-  uint64_t Length;
-  uint32_t Flags;
-  uint32_t NegFlags;
-  uint64_t CurPos = 0;
+  std::string name;
+  uint64_t origin;
+  uint64_t length;
+  uint32_t flags;
+  uint32_t negFlags;
+  uint64_t curPos = 0;
 };
 
 // This struct represents one section match pattern in SECTIONS() command.
 // It can optionally have negative match pattern for EXCLUDED_FILE command.
 // Also it may be surrounded with SORT() command, so contains sorting rules.
 struct SectionPattern {
-  SectionPattern(StringMatcher &&Pat1, StringMatcher &&Pat2)
-      : ExcludedFilePat(Pat1), SectionPat(Pat2),
-        SortOuter(SortSectionPolicy::Default),
-        SortInner(SortSectionPolicy::Default) {}
+  SectionPattern(StringMatcher &&pat1, StringMatcher &&pat2)
+      : excludedFilePat(pat1), sectionPat(pat2),
+        sortOuter(SortSectionPolicy::Default),
+        sortInner(SortSectionPolicy::Default) {}
 
-  StringMatcher ExcludedFilePat;
-  StringMatcher SectionPat;
-  SortSectionPolicy SortOuter;
-  SortSectionPolicy SortInner;
+  StringMatcher excludedFilePat;
+  StringMatcher sectionPat;
+  SortSectionPolicy sortOuter;
+  SortSectionPolicy sortInner;
 };
 
 struct InputSectionDescription : BaseCommand {
-  InputSectionDescription(StringRef FilePattern)
-      : BaseCommand(InputSectionKind), FilePat(FilePattern) {}
+  InputSectionDescription(StringRef filePattern)
+      : BaseCommand(InputSectionKind), filePat(filePattern) {}
 
-  static bool classof(const BaseCommand *C) {
-    return C->Kind == InputSectionKind;
+  static bool classof(const BaseCommand *c) {
+    return c->kind == InputSectionKind;
   }
 
-  StringMatcher FilePat;
+  StringMatcher filePat;
 
   // Input sections that matches at least one of SectionPatterns
   // will be associated with this InputSectionDescription.
-  std::vector<SectionPattern> SectionPatterns;
+  std::vector<SectionPattern> sectionPatterns;
 
-  std::vector<InputSection *> Sections;
+  std::vector<InputSection *> sections;
 
   // Temporary record of synthetic ThunkSection instances and the pass that
   // they were created in. This is used to insert newly created ThunkSections
   // into Sections at the end of a createThunks() pass.
-  std::vector<std::pair<ThunkSection *, uint32_t>> ThunkSections;
+  std::vector<std::pair<ThunkSection *, uint32_t>> thunkSections;
 };
 
 // Represents BYTE(), SHORT(), LONG(), or QUAD().
 struct ByteCommand : BaseCommand {
-  ByteCommand(Expr E, unsigned Size, std::string CommandString)
-      : BaseCommand(ByteKind), CommandString(CommandString), Expression(E),
-        Size(Size) {}
+  ByteCommand(Expr e, unsigned size, std::string commandString)
+      : BaseCommand(ByteKind), commandString(commandString), expression(e),
+        size(size) {}
 
-  static bool classof(const BaseCommand *C) { return C->Kind == ByteKind; }
+  static bool classof(const BaseCommand *c) { return c->kind == ByteKind; }
 
   // Keeps string representing the command. Used for -Map" is perhaps better.
-  std::string CommandString;
+  std::string commandString;
 
-  Expr Expression;
+  Expr expression;
 
   // This is just an offset of this assignment command in the output section.
-  unsigned Offset;
+  unsigned offset;
 
   // Size of this data command.
-  unsigned Size;
+  unsigned size;
 };
 
 struct PhdrsCommand {
-  StringRef Name;
-  unsigned Type = llvm::ELF::PT_NULL;
-  bool HasFilehdr = false;
-  bool HasPhdrs = false;
-  llvm::Optional<unsigned> Flags;
-  Expr LMAExpr = nullptr;
+  StringRef name;
+  unsigned type = llvm::ELF::PT_NULL;
+  bool hasFilehdr = false;
+  bool hasPhdrs = false;
+  llvm::Optional<unsigned> flags;
+  Expr lmaExpr = nullptr;
 };
 
 class LinkerScript final {
@@ -213,35 +211,35 @@ class LinkerScript final {
   // not be used outside of the scope of a call to the above functions.
   struct AddressState {
     AddressState();
-    uint64_t ThreadBssOffset = 0;
-    OutputSection *OutSec = nullptr;
-    MemoryRegion *MemRegion = nullptr;
-    MemoryRegion *LMARegion = nullptr;
-    uint64_t LMAOffset = 0;
+    uint64_t threadBssOffset = 0;
+    OutputSection *outSec = nullptr;
+    MemoryRegion *memRegion = nullptr;
+    MemoryRegion *lmaRegion = nullptr;
+    uint64_t lmaOffset = 0;
   };
 
-  llvm::DenseMap<StringRef, OutputSection *> NameToOutputSection;
+  llvm::DenseMap<StringRef, OutputSection *> nameToOutputSection;
 
-  void addSymbol(SymbolAssignment *Cmd);
-  void assignSymbol(SymbolAssignment *Cmd, bool InSec);
-  void setDot(Expr E, const Twine &Loc, bool InSec);
-  void expandOutputSection(uint64_t Size);
-  void expandMemoryRegions(uint64_t Size);
+  void addSymbol(SymbolAssignment *cmd);
+  void assignSymbol(SymbolAssignment *cmd, bool inSec);
+  void setDot(Expr e, const Twine &loc, bool inSec);
+  void expandOutputSection(uint64_t size);
+  void expandMemoryRegions(uint64_t size);
 
   std::vector<InputSection *>
   computeInputSections(const InputSectionDescription *);
 
-  std::vector<InputSection *> createInputSectionList(OutputSection &Cmd);
+  std::vector<InputSection *> createInputSectionList(OutputSection &cmd);
 
-  std::vector<size_t> getPhdrIndices(OutputSection *Sec);
+  std::vector<size_t> getPhdrIndices(OutputSection *sec);
 
-  MemoryRegion *findMemoryRegion(OutputSection *Sec);
+  MemoryRegion *findMemoryRegion(OutputSection *sec);
 
-  void switchTo(OutputSection *Sec);
-  uint64_t advance(uint64_t Size, unsigned Align);
-  void output(InputSection *Sec);
+  void switchTo(OutputSection *sec);
+  uint64_t advance(uint64_t size, unsigned align);
+  void output(InputSection *sec);
 
-  void assignOffsets(OutputSection *Sec);
+  void assignOffsets(OutputSection *sec);
 
   // Ctx captures the local AddressState and makes it accessible
   // deliberately. This is needed as there are some cases where we cannot just
@@ -249,21 +247,21 @@ class LinkerScript final {
   // script parser.
   // This should remain a plain pointer as its lifetime is smaller than
   // LinkerScript.
-  AddressState *Ctx = nullptr;
+  AddressState *ctx = nullptr;
 
-  OutputSection *Aether;
+  OutputSection *aether;
 
-  uint64_t Dot;
+  uint64_t dot;
 
 public:
-  OutputSection *createOutputSection(StringRef Name, StringRef Location);
-  OutputSection *getOrCreateOutputSection(StringRef Name);
+  OutputSection *createOutputSection(StringRef name, StringRef location);
+  OutputSection *getOrCreateOutputSection(StringRef name);
 
-  bool hasPhdrsCommands() { return !PhdrsCommands.empty(); }
-  uint64_t getDot() { return Dot; }
-  void discard(ArrayRef<InputSection *> V);
+  bool hasPhdrsCommands() { return !phdrsCommands.empty(); }
+  uint64_t getDot() { return dot; }
+  void discard(ArrayRef<InputSection *> v);
 
-  ExprValue getSymbolValue(StringRef Name, const Twine &Loc);
+  ExprValue getSymbolValue(StringRef name, const Twine &loc);
 
   void addOrphanSections();
   void adjustSectionsBeforeSorting();
@@ -272,9 +270,9 @@ public:
   std::vector<PhdrEntry *> createPhdrs();
   bool needsInterpSection();
 
-  bool shouldKeep(InputSectionBase *S);
+  bool shouldKeep(InputSectionBase *s);
   void assignAddresses();
-  void allocateHeaders(std::vector<PhdrEntry *> &Phdrs);
+  void allocateHeaders(std::vector<PhdrEntry *> &phdrs);
   void processSectionCommands();
   void declareSymbols();
 
@@ -282,31 +280,31 @@ public:
   void processInsertCommands();
 
   // SECTIONS command list.
-  std::vector<BaseCommand *> SectionCommands;
+  std::vector<BaseCommand *> sectionCommands;
 
   // PHDRS command list.
-  std::vector<PhdrsCommand> PhdrsCommands;
+  std::vector<PhdrsCommand> phdrsCommands;
 
-  bool HasSectionsCommand = false;
-  bool ErrorOnMissingSection = false;
+  bool hasSectionsCommand = false;
+  bool errorOnMissingSection = false;
 
   // List of section patterns specified with KEEP commands. They will
   // be kept even if they are unused and --gc-sections is specified.
-  std::vector<InputSectionDescription *> KeptSections;
+  std::vector<InputSectionDescription *> keptSections;
 
   // A map from memory region name to a memory region descriptor.
-  llvm::MapVector<llvm::StringRef, MemoryRegion *> MemoryRegions;
+  llvm::MapVector<llvm::StringRef, MemoryRegion *> memoryRegions;
 
   // A list of symbols referenced by the script.
-  std::vector<llvm::StringRef> ReferencedSymbols;
+  std::vector<llvm::StringRef> referencedSymbols;
 
   // Used to implement INSERT [AFTER|BEFORE]. Contains commands that need
   // to be inserted into SECTIONS commands list.
-  llvm::DenseMap<StringRef, std::vector<BaseCommand *>> InsertAfterCommands;
-  llvm::DenseMap<StringRef, std::vector<BaseCommand *>> InsertBeforeCommands;
+  llvm::DenseMap<StringRef, std::vector<BaseCommand *>> insertAfterCommands;
+  llvm::DenseMap<StringRef, std::vector<BaseCommand *>> insertBeforeCommands;
 };
 
-extern LinkerScript *Script;
+extern LinkerScript *script;
 
 } // end namespace elf
 } // end namespace lld
diff --git a/deps/lld/ELF/MapFile.cpp b/deps/lld/ELF/MapFile.cpp
index b0dc6203008d842f2a284f5dab5864b68c37de80..a4a6238fc65576805ba83793bd57295bdad3e9fc 100644
--- a/deps/lld/ELF/MapFile.cpp
+++ b/deps/lld/ELF/MapFile.cpp
@@ -1,9 +1,8 @@
 //===- MapFile.cpp --------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -38,69 +37,67 @@ using namespace llvm::object;
 using namespace lld;
 using namespace lld::elf;
 
-typedef DenseMap<const SectionBase *, SmallVector<Defined *, 4>> SymbolMapTy;
+using SymbolMapTy = DenseMap<const SectionBase *, SmallVector<Defined *, 4>>;
 
-static const std::string Indent8 = "        ";          // 8 spaces
-static const std::string Indent16 = "                "; // 16 spaces
+static const std::string indent8 = "        ";          // 8 spaces
+static const std::string indent16 = "                "; // 16 spaces
 
 // Print out the first three columns of a line.
-static void writeHeader(raw_ostream &OS, uint64_t VMA, uint64_t LMA,
-                        uint64_t Size, uint64_t Align) {
-  if (Config->Is64)
-    OS << format("%16llx %16llx %8llx %5lld ", VMA, LMA, Size, Align);
+static void writeHeader(raw_ostream &os, uint64_t vma, uint64_t lma,
+                        uint64_t size, uint64_t align) {
+  if (config->is64)
+    os << format("%16llx %16llx %8llx %5lld ", vma, lma, size, align);
   else
-    OS << format("%8llx %8llx %8llx %5lld ", VMA, LMA, Size, Align);
+    os << format("%8llx %8llx %8llx %5lld ", vma, lma, size, align);
 }
 
 // Returns a list of all symbols that we want to print out.
 static std::vector<Defined *> getSymbols() {
-  std::vector<Defined *> V;
-  for (InputFile *File : ObjectFiles)
-    for (Symbol *B : File->getSymbols())
-      if (auto *DR = dyn_cast<Defined>(B))
-        if (!DR->isSection() && DR->Section && DR->Section->Live &&
-            (DR->File == File || DR->NeedsPltAddr || DR->Section->Bss))
-          V.push_back(DR);
-  return V;
+  std::vector<Defined *> v;
+  for (InputFile *file : objectFiles)
+    for (Symbol *b : file->getSymbols())
+      if (auto *dr = dyn_cast<Defined>(b))
+        if (!dr->isSection() && dr->section && dr->section->isLive() &&
+            (dr->file == file || dr->needsPltAddr || dr->section->bss))
+          v.push_back(dr);
+  return v;
 }
 
 // Returns a map from sections to their symbols.
-static SymbolMapTy getSectionSyms(ArrayRef<Defined *> Syms) {
-  SymbolMapTy Ret;
-  for (Defined *DR : Syms)
-    Ret[DR->Section].push_back(DR);
+static SymbolMapTy getSectionSyms(ArrayRef<Defined *> syms) {
+  SymbolMapTy ret;
+  for (Defined *dr : syms)
+    ret[dr->section].push_back(dr);
 
   // Sort symbols by address. We want to print out symbols in the
   // order in the output file rather than the order they appeared
   // in the input files.
-  for (auto &It : Ret) {
-    SmallVectorImpl<Defined *> &V = It.second;
-    std::stable_sort(V.begin(), V.end(), [](Defined *A, Defined *B) {
-      return A->getVA() < B->getVA();
+  for (auto &it : ret)
+    llvm::stable_sort(it.second, [](Defined *a, Defined *b) {
+      return a->getVA() < b->getVA();
     });
-  }
-  return Ret;
+  return ret;
 }
 
 // Construct a map from symbols to their stringified representations.
 // Demangling symbols (which is what toString() does) is slow, so
 // we do that in batch using parallel-for.
 static DenseMap<Symbol *, std::string>
-getSymbolStrings(ArrayRef<Defined *> Syms) {
-  std::vector<std::string> Str(Syms.size());
-  parallelForEachN(0, Syms.size(), [&](size_t I) {
-    raw_string_ostream OS(Str[I]);
-    OutputSection *OSec = Syms[I]->getOutputSection();
-    uint64_t VMA = Syms[I]->getVA();
-    uint64_t LMA = OSec ? OSec->getLMA() + VMA - OSec->getVA(0) : 0;
-    writeHeader(OS, VMA, LMA, Syms[I]->getSize(), 1);
-    OS << Indent16 << toString(*Syms[I]);
+getSymbolStrings(ArrayRef<Defined *> syms) {
+  std::vector<std::string> str(syms.size());
+  parallelForEachN(0, syms.size(), [&](size_t i) {
+    raw_string_ostream os(str[i]);
+    OutputSection *osec = syms[i]->getOutputSection();
+    uint64_t vma = syms[i]->getVA();
+    uint64_t lma = osec ? osec->getLMA() + vma - osec->getVA(0) : 0;
+    writeHeader(os, vma, lma, syms[i]->getSize(), 1);
+    os << indent16 << toString(*syms[i]);
   });
 
-  DenseMap<Symbol *, std::string> Ret;
-  for (size_t I = 0, E = Syms.size(); I < E; ++I)
-    Ret[Syms[I]] = std::move(Str[I]);
-  return Ret;
+  DenseMap<Symbol *, std::string> ret;
+  for (size_t i = 0, e = syms.size(); i < e; ++i)
+    ret[syms[i]] = std::move(str[i]);
+  return ret;
 }
 
 // Print .eh_frame contents. Since the section consists of EhSectionPieces,
@@ -109,114 +106,115 @@ getSymbolStrings(ArrayRef<Defined *> Syms) {
 // .eh_frame tend to contain a lot of section pieces that are contiguous
 // both in input file and output file. Such pieces are squashed before
 // being displayed to make output compact.
-static void printEhFrame(raw_ostream &OS, OutputSection *OSec) {
-  std::vector<EhSectionPiece> Pieces;
+static void printEhFrame(raw_ostream &os, const EhFrameSection *sec) {
+  std::vector<EhSectionPiece> pieces;
 
-  auto Add = [&](const EhSectionPiece &P) {
+  auto add = [&](const EhSectionPiece &p) {
     // If P is adjacent to Last, squash the two.
-    if (!Pieces.empty()) {
-      EhSectionPiece &Last = Pieces.back();
-      if (Last.Sec == P.Sec && Last.InputOff + Last.Size == P.InputOff &&
-          Last.OutputOff + Last.Size == P.OutputOff) {
-        Last.Size += P.Size;
+    if (!pieces.empty()) {
+      EhSectionPiece &last = pieces.back();
+      if (last.sec == p.sec && last.inputOff + last.size == p.inputOff &&
+          last.outputOff + last.size == p.outputOff) {
+        last.size += p.size;
         return;
       }
     }
-    Pieces.push_back(P);
+    pieces.push_back(p);
   };
 
   // Gather section pieces.
-  for (const CieRecord *Rec : In.EhFrame->getCieRecords()) {
-    Add(*Rec->Cie);
-    for (const EhSectionPiece *Fde : Rec->Fdes)
-      Add(*Fde);
+  for (const CieRecord *rec : sec->getCieRecords()) {
+    add(*rec->cie);
+    for (const EhSectionPiece *fde : rec->fdes)
+      add(*fde);
   }
 
   // Print out section pieces.
-  for (EhSectionPiece &P : Pieces) {
-    writeHeader(OS, OSec->Addr + P.OutputOff, OSec->getLMA() + P.OutputOff,
-                P.Size, 1);
-    OS << Indent8 << toString(P.Sec->File) << ":(" << P.Sec->Name << "+0x"
-       << Twine::utohexstr(P.InputOff) + ")\n";
+  const OutputSection *osec = sec->getOutputSection();
+  for (EhSectionPiece &p : pieces) {
+    writeHeader(os, osec->addr + p.outputOff, osec->getLMA() + p.outputOff,
+                p.size, 1);
+    os << indent8 << toString(p.sec->file) << ":(" << p.sec->name << "+0x"
+       << Twine::utohexstr(p.inputOff) + ")\n";
   }
 }
 
 void elf::writeMapFile() {
-  if (Config->MapFile.empty())
+  if (config->mapFile.empty())
     return;
 
   // Open a map file for writing.
-  std::error_code EC;
-  raw_fd_ostream OS(Config->MapFile, EC, sys::fs::F_None);
-  if (EC) {
-    error("cannot open " + Config->MapFile + ": " + EC.message());
+  std::error_code ec;
+  raw_fd_ostream os(config->mapFile, ec, sys::fs::F_None);
+  if (ec) {
+    error("cannot open " + config->mapFile + ": " + ec.message());
     return;
   }
 
   // Collect symbol info that we want to print out.
-  std::vector<Defined *> Syms = getSymbols();
-  SymbolMapTy SectionSyms = getSectionSyms(Syms);
-  DenseMap<Symbol *, std::string> SymStr = getSymbolStrings(Syms);
+  std::vector<Defined *> syms = getSymbols();
+  SymbolMapTy sectionSyms = getSectionSyms(syms);
+  DenseMap<Symbol *, std::string> symStr = getSymbolStrings(syms);
 
   // Print out the header line.
-  int W = Config->Is64 ? 16 : 8;
-  OS << right_justify("VMA", W) << ' ' << right_justify("LMA", W)
+  int w = config->is64 ? 16 : 8;
+  os << right_justify("VMA", w) << ' ' << right_justify("LMA", w)
      << "     Size Align Out     In      Symbol\n";
 
-  OutputSection* OSec = nullptr;
-  for (BaseCommand *Base : Script->SectionCommands) {
-    if (auto *Cmd = dyn_cast<SymbolAssignment>(Base)) {
-      if (Cmd->Provide && !Cmd->Sym)
+  OutputSection* osec = nullptr;
+  for (BaseCommand *base : script->sectionCommands) {
+    if (auto *cmd = dyn_cast<SymbolAssignment>(base)) {
+      if (cmd->provide && !cmd->sym)
         continue;
-      uint64_t LMA = OSec ? OSec->getLMA() + Cmd->Addr - OSec->getVA(0) : 0;
-      writeHeader(OS, Cmd->Addr, LMA, Cmd->Size, 1);
-      OS << Cmd->CommandString << '\n';
+      uint64_t lma = osec ? osec->getLMA() + cmd->addr - osec->getVA(0) : 0;
+      writeHeader(os, cmd->addr, lma, cmd->size, 1);
+      os << cmd->commandString << '\n';
       continue;
     }
 
-    OSec = cast<OutputSection>(Base);
-    writeHeader(OS, OSec->Addr, OSec->getLMA(), OSec->Size, OSec->Alignment);
-    OS << OSec->Name << '\n';
+    osec = cast<OutputSection>(base);
+    writeHeader(os, osec->addr, osec->getLMA(), osec->size, osec->alignment);
+    os << osec->name << '\n';
 
     // Dump symbols for each input section.
-    for (BaseCommand *Base : OSec->SectionCommands) {
-      if (auto *ISD = dyn_cast<InputSectionDescription>(Base)) {
-        for (InputSection *IS : ISD->Sections) {
-          if (IS == In.EhFrame) {
-            printEhFrame(OS, OSec);
+    for (BaseCommand *base : osec->sectionCommands) {
+      if (auto *isd = dyn_cast<InputSectionDescription>(base)) {
+        for (InputSection *isec : isd->sections) {
+          if (auto *ehSec = dyn_cast<EhFrameSection>(isec)) {
+            printEhFrame(os, ehSec);
             continue;
           }
 
-          writeHeader(OS, IS->getVA(0), OSec->getLMA() + IS->getOffset(0),
-                      IS->getSize(), IS->Alignment);
-          OS << Indent8 << toString(IS) << '\n';
-          for (Symbol *Sym : SectionSyms[IS])
-            OS << SymStr[Sym] << '\n';
+          writeHeader(os, isec->getVA(0), osec->getLMA() + isec->getOffset(0),
+                      isec->getSize(), isec->alignment);
+          os << indent8 << toString(isec) << '\n';
+          for (Symbol *sym : sectionSyms[isec])
+            os << symStr[sym] << '\n';
         }
         continue;
       }
 
-      if (auto *Cmd = dyn_cast<ByteCommand>(Base)) {
-        writeHeader(OS, OSec->Addr + Cmd->Offset, OSec->getLMA() + Cmd->Offset,
-                    Cmd->Size, 1);
-        OS << Indent8 << Cmd->CommandString << '\n';
+      if (auto *cmd = dyn_cast<ByteCommand>(base)) {
+        writeHeader(os, osec->addr + cmd->offset, osec->getLMA() + cmd->offset,
+                    cmd->size, 1);
+        os << indent8 << cmd->commandString << '\n';
         continue;
       }
 
-      if (auto *Cmd = dyn_cast<SymbolAssignment>(Base)) {
-        if (Cmd->Provide && !Cmd->Sym)
+      if (auto *cmd = dyn_cast<SymbolAssignment>(base)) {
+        if (cmd->provide && !cmd->sym)
           continue;
-        writeHeader(OS, Cmd->Addr, OSec->getLMA() + Cmd->Addr - OSec->getVA(0),
-                    Cmd->Size, 1);
-        OS << Indent8 << Cmd->CommandString << '\n';
+        writeHeader(os, cmd->addr, osec->getLMA() + cmd->addr - osec->getVA(0),
+                    cmd->size, 1);
+        os << indent8 << cmd->commandString << '\n';
         continue;
       }
     }
   }
 }
 
-static void print(StringRef A, StringRef B) {
-  outs() << left_justify(A, 49) << " " << B << "\n";
+static void print(StringRef a, StringRef b) {
+  outs() << left_justify(a, 49) << " " << b << "\n";
 }
 
 // Output a cross reference table to stdout. This is for --cref.
@@ -231,18 +229,18 @@ static void print(StringRef A, StringRef B) {
 // In this case, strlen is defined by libc.so.6 and used by other two
 // files.
 void elf::writeCrossReferenceTable() {
-  if (!Config->Cref)
+  if (!config->cref)
     return;
 
   // Collect symbols and files.
-  MapVector<Symbol *, SetVector<InputFile *>> Map;
-  for (InputFile *File : ObjectFiles) {
-    for (Symbol *Sym : File->getSymbols()) {
-      if (isa<SharedSymbol>(Sym))
-        Map[Sym].insert(File);
-      if (auto *D = dyn_cast<Defined>(Sym))
-        if (!D->isLocal() && (!D->Section || D->Section->Live))
-          Map[D].insert(File);
+  MapVector<Symbol *, SetVector<InputFile *>> map;
+  for (InputFile *file : objectFiles) {
+    for (Symbol *sym : file->getSymbols()) {
+      if (isa<SharedSymbol>(sym))
+        map[sym].insert(file);
+      if (auto *d = dyn_cast<Defined>(sym))
+        if (!d->isLocal() && (!d->section || d->section->isLive()))
+          map[d].insert(file);
     }
   }
 
@@ -251,13 +249,13 @@ void elf::writeCrossReferenceTable() {
   print("Symbol", "File");
 
   // Print out a table.
-  for (auto KV : Map) {
-    Symbol *Sym = KV.first;
-    SetVector<InputFile *> &Files = KV.second;
+  for (auto kv : map) {
+    Symbol *sym = kv.first;
+    SetVector<InputFile *> &files = kv.second;
 
-    print(toString(*Sym), toString(Sym->File));
-    for (InputFile *File : Files)
-      if (File != Sym->File)
-        print("", toString(File));
+    print(toString(*sym), toString(sym->file));
+    for (InputFile *file : files)
+      if (file != sym->file)
+        print("", toString(file));
   }
 }
diff --git a/deps/lld/ELF/MapFile.h b/deps/lld/ELF/MapFile.h
index 0282425888b72b89717d494298d8ffde404bbb29..7e7938919edfbe630f3a4390bfcd7b22712974f7 100644
--- a/deps/lld/ELF/MapFile.h
+++ b/deps/lld/ELF/MapFile.h
@@ -1,9 +1,8 @@
 //===- MapFile.h ------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/ELF/MarkLive.cpp b/deps/lld/ELF/MarkLive.cpp
index 8d0ec091c3278ab020c122ec44c861fe9c86e96e..36b847f725b87baae18dd171a769197c3a8a776d 100644
--- a/deps/lld/ELF/MarkLive.cpp
+++ b/deps/lld/ELF/MarkLive.cpp
@@ -1,9 +1,8 @@
 //===- MarkLive.cpp -------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -26,6 +25,7 @@
 #include "OutputSections.h"
 #include "SymbolTable.h"
 #include "Symbols.h"
+#include "SyntheticSections.h"
 #include "Target.h"
 #include "lld/Common/Memory.h"
 #include "lld/Common/Strings.h"
@@ -42,66 +42,79 @@ using namespace llvm::support::endian;
 using namespace lld;
 using namespace lld::elf;
 
+namespace {
+template <class ELFT> class MarkLive {
+public:
+  MarkLive(unsigned partition) : partition(partition) {}
+
+  void run();
+  void moveToMain();
+
+private:
+  void enqueue(InputSectionBase *sec, uint64_t offset);
+  void markSymbol(Symbol *sym);
+  void mark();
+
+  template <class RelTy>
+  void resolveReloc(InputSectionBase &sec, RelTy &rel, bool isLSDA);
+
+  template <class RelTy>
+  void scanEhFrameSection(EhInputSection &eh, ArrayRef<RelTy> rels);
+
+  // The index of the partition that we are currently processing.
+  unsigned partition;
+
+  // A list of sections to visit.
+  SmallVector<InputSection *, 256> queue;
+
+  // There are normally few input sections whose names are valid C
+  // identifiers, so we just store a std::vector instead of a multimap.
+  DenseMap<StringRef, std::vector<InputSectionBase *>> cNamedSections;
+};
+} // namespace
+
 template <class ELFT>
-static typename ELFT::uint getAddend(InputSectionBase &Sec,
-                                     const typename ELFT::Rel &Rel) {
-  return Target->getImplicitAddend(Sec.data().begin() + Rel.r_offset,
-                                   Rel.getType(Config->IsMips64EL));
+static uint64_t getAddend(InputSectionBase &sec,
+                          const typename ELFT::Rel &rel) {
+  return target->getImplicitAddend(sec.data().begin() + rel.r_offset,
+                                   rel.getType(config->isMips64EL));
 }
 
 template <class ELFT>
-static typename ELFT::uint getAddend(InputSectionBase &Sec,
-                                     const typename ELFT::Rela &Rel) {
-  return Rel.r_addend;
+static uint64_t getAddend(InputSectionBase &sec,
+                          const typename ELFT::Rela &rel) {
+  return rel.r_addend;
 }
 
-// There are normally few input sections whose names are valid C
-// identifiers, so we just store a std::vector instead of a multimap.
-static DenseMap<StringRef, std::vector<InputSectionBase *>> CNamedSections;
-
-template <class ELFT, class RelT>
-static void
-resolveReloc(InputSectionBase &Sec, RelT &Rel,
-             llvm::function_ref<void(InputSectionBase *, uint64_t)> Fn) {
-  Symbol &B = Sec.getFile<ELFT>()->getRelocTargetSym(Rel);
+template <class ELFT>
+template <class RelTy>
+void MarkLive<ELFT>::resolveReloc(InputSectionBase &sec, RelTy &rel,
+                                  bool isLSDA) {
+  Symbol &sym = sec.getFile<ELFT>()->getRelocTargetSym(rel);
 
   // If a symbol is referenced in a live section, it is used.
-  B.Used = true;
-  if (auto *SS = dyn_cast<SharedSymbol>(&B))
-    if (!SS->isWeak())
-      SS->getFile<ELFT>().IsNeeded = true;
+  sym.used = true;
 
-  if (auto *D = dyn_cast<Defined>(&B)) {
-    auto *RelSec = dyn_cast_or_null<InputSectionBase>(D->Section);
-    if (!RelSec)
+  if (auto *d = dyn_cast<Defined>(&sym)) {
+    auto *relSec = dyn_cast_or_null<InputSectionBase>(d->section);
+    if (!relSec)
       return;
-    uint64_t Offset = D->Value;
-    if (D->isSection())
-      Offset += getAddend<ELFT>(Sec, Rel);
-    Fn(RelSec, Offset);
+
+    uint64_t offset = d->value;
+    if (d->isSection())
+      offset += getAddend<ELFT>(sec, rel);
+
+    if (!isLSDA || !(relSec->flags & SHF_EXECINSTR))
+      enqueue(relSec, offset);
     return;
   }
 
-  if (!B.isDefined())
-    for (InputSectionBase *Sec : CNamedSections.lookup(B.getName()))
-      Fn(Sec, 0);
-}
+  if (auto *ss = dyn_cast<SharedSymbol>(&sym))
+    if (!ss->isWeak())
+      ss->getFile().isNeeded = true;
 
-// Calls Fn for each section that Sec refers to via relocations.
-template <class ELFT>
-static void
-forEachSuccessor(InputSection &Sec,
-                 llvm::function_ref<void(InputSectionBase *, uint64_t)> Fn) {
-  if (Sec.AreRelocsRela) {
-    for (const typename ELFT::Rela &Rel : Sec.template relas<ELFT>())
-      resolveReloc<ELFT>(Sec, Rel, Fn);
-  } else {
-    for (const typename ELFT::Rel &Rel : Sec.template rels<ELFT>())
-      resolveReloc<ELFT>(Sec, Rel, Fn);
-  }
-
-  for (InputSectionBase *IS : Sec.DependentSections)
-    Fn(IS, 0);
+  for (InputSectionBase *sec : cNamedSections.lookup(sym.getName()))
+    enqueue(sec, 0);
 }
 
 // The .eh_frame section is an unfortunate special case.
@@ -118,175 +131,203 @@ forEachSuccessor(InputSection &Sec,
 // A possible improvement would be to fully process .eh_frame in the middle of
 // the gc pass. With that we would be able to also gc some sections holding
 // LSDAs and personality functions if we found that they were unused.
-template <class ELFT, class RelTy>
-static void
-scanEhFrameSection(EhInputSection &EH, ArrayRef<RelTy> Rels,
-                   llvm::function_ref<void(InputSectionBase *, uint64_t)> Fn) {
-  const endianness E = ELFT::TargetEndianness;
-
-  for (unsigned I = 0, N = EH.Pieces.size(); I < N; ++I) {
-    EhSectionPiece &Piece = EH.Pieces[I];
-    unsigned FirstRelI = Piece.FirstRelocation;
-    if (FirstRelI == (unsigned)-1)
+template <class ELFT>
+template <class RelTy>
+void MarkLive<ELFT>::scanEhFrameSection(EhInputSection &eh,
+                                        ArrayRef<RelTy> rels) {
+  for (size_t i = 0, end = eh.pieces.size(); i < end; ++i) {
+    EhSectionPiece &piece = eh.pieces[i];
+    size_t firstRelI = piece.firstRelocation;
+    if (firstRelI == (unsigned)-1)
       continue;
-    if (read32<E>(Piece.data().data() + 4) == 0) {
+
+    if (read32<ELFT::TargetEndianness>(piece.data().data() + 4) == 0) {
       // This is a CIE, we only need to worry about the first relocation. It is
       // known to point to the personality function.
-      resolveReloc<ELFT>(EH, Rels[FirstRelI], Fn);
+      resolveReloc(eh, rels[firstRelI], false);
       continue;
     }
+
     // This is a FDE. The relocations point to the described function or to
     // a LSDA. We only need to keep the LSDA alive, so ignore anything that
     // points to executable sections.
-    typename ELFT::uint PieceEnd = Piece.InputOff + Piece.Size;
-    for (unsigned I2 = FirstRelI, N2 = Rels.size(); I2 < N2; ++I2) {
-      const RelTy &Rel = Rels[I2];
-      if (Rel.r_offset >= PieceEnd)
-        break;
-      resolveReloc<ELFT>(EH, Rels[I2],
-                         [&](InputSectionBase *Sec, uint64_t Offset) {
-                           if (Sec && Sec != &InputSection::Discarded &&
-                               !(Sec->Flags & SHF_EXECINSTR))
-                             Fn(Sec, 0);
-                         });
-    }
+    uint64_t pieceEnd = piece.inputOff + piece.size;
+    for (size_t j = firstRelI, end2 = rels.size(); j < end2; ++j)
+      if (rels[j].r_offset < pieceEnd)
+        resolveReloc(eh, rels[j], true);
   }
 }
 
-template <class ELFT>
-static void
-scanEhFrameSection(EhInputSection &EH,
-                   llvm::function_ref<void(InputSectionBase *, uint64_t)> Fn) {
-  if (!EH.NumRelocations)
-    return;
-
-  if (EH.AreRelocsRela)
-    scanEhFrameSection<ELFT>(EH, EH.template relas<ELFT>(), Fn);
-  else
-    scanEhFrameSection<ELFT>(EH, EH.template rels<ELFT>(), Fn);
-}
-
 // Some sections are used directly by the loader, so they should never be
 // garbage-collected. This function returns true if a given section is such
 // section.
-template <class ELFT> static bool isReserved(InputSectionBase *Sec) {
-  switch (Sec->Type) {
+static bool isReserved(InputSectionBase *sec) {
+  switch (sec->type) {
   case SHT_FINI_ARRAY:
   case SHT_INIT_ARRAY:
   case SHT_NOTE:
   case SHT_PREINIT_ARRAY:
     return true;
   default:
-    StringRef S = Sec->Name;
-    return S.startswith(".ctors") || S.startswith(".dtors") ||
-           S.startswith(".init") || S.startswith(".fini") ||
-           S.startswith(".jcr");
+    StringRef s = sec->name;
+    return s.startswith(".ctors") || s.startswith(".dtors") ||
+           s.startswith(".init") || s.startswith(".fini") ||
+           s.startswith(".jcr");
   }
 }
 
+template <class ELFT>
+void MarkLive<ELFT>::enqueue(InputSectionBase *sec, uint64_t offset) {
+  // Skip over discarded sections. This in theory shouldn't happen, because
+  // the ELF spec doesn't allow a relocation to point to a deduplicated
+  // COMDAT section directly. Unfortunately this happens in practice (e.g.
+  // .eh_frame) so we need to add a check.
+  if (sec == &InputSection::discarded)
+    return;
+
+  // Usually, a whole section is marked as live or dead, but in mergeable
+  // (splittable) sections, each piece of data has independent liveness bit.
+  // So we explicitly tell it which offset is in use.
+  if (auto *ms = dyn_cast<MergeInputSection>(sec))
+    ms->getSectionPiece(offset)->live = true;
+
+  // Set Sec->Partition to the meet (i.e. the "minimum") of Partition and
+  // Sec->Partition in the following lattice: 1 < other < 0. If Sec->Partition
+  // doesn't change, we don't need to do anything.
+  if (sec->partition == 1 || sec->partition == partition)
+    return;
+  sec->partition = sec->partition ? 1 : partition;
+
+  // Add input section to the queue.
+  if (InputSection *s = dyn_cast<InputSection>(sec))
+    queue.push_back(s);
+}
+
+template <class ELFT> void MarkLive<ELFT>::markSymbol(Symbol *sym) {
+  if (auto *d = dyn_cast_or_null<Defined>(sym))
+    if (auto *isec = dyn_cast_or_null<InputSectionBase>(d->section))
+      enqueue(isec, d->value);
+}
+
 // This is the main function of the garbage collector.
 // Starting from GC-root sections, this function visits all reachable
 // sections to set their "Live" bits.
-template <class ELFT> static void doGcSections() {
-  SmallVector<InputSection *, 256> Q;
-  CNamedSections.clear();
-
-  auto Enqueue = [&](InputSectionBase *Sec, uint64_t Offset) {
-    // Skip over discarded sections. This in theory shouldn't happen, because
-    // the ELF spec doesn't allow a relocation to point to a deduplicated
-    // COMDAT section directly. Unfortunately this happens in practice (e.g.
-    // .eh_frame) so we need to add a check.
-    if (Sec == &InputSection::Discarded)
-      return;
-
-
-    // Usually, a whole section is marked as live or dead, but in mergeable
-    // (splittable) sections, each piece of data has independent liveness bit.
-    // So we explicitly tell it which offset is in use.
-    if (auto *MS = dyn_cast<MergeInputSection>(Sec))
-      MS->getSectionPiece(Offset)->Live = true;
-
-    if (Sec->Live)
-      return;
-    Sec->Live = true;
-
-    // Add input section to the queue.
-    if (InputSection *S = dyn_cast<InputSection>(Sec))
-      Q.push_back(S);
-  };
-
-  auto MarkSymbol = [&](Symbol *Sym) {
-    if (auto *D = dyn_cast_or_null<Defined>(Sym))
-      if (auto *IS = dyn_cast_or_null<InputSectionBase>(D->Section))
-        Enqueue(IS, D->Value);
-  };
-
+template <class ELFT> void MarkLive<ELFT>::run() {
   // Add GC root symbols.
-  MarkSymbol(Symtab->find(Config->Entry));
-  MarkSymbol(Symtab->find(Config->Init));
-  MarkSymbol(Symtab->find(Config->Fini));
-  for (StringRef S : Config->Undefined)
-    MarkSymbol(Symtab->find(S));
-  for (StringRef S : Script->ReferencedSymbols)
-    MarkSymbol(Symtab->find(S));
 
   // Preserve externally-visible symbols if the symbols defined by this
   // file can interrupt other ELF file's symbols at runtime.
-  for (Symbol *S : Symtab->getSymbols())
-    if (S->includeInDynsym())
-      MarkSymbol(S);
+  symtab->forEachSymbol([&](Symbol *sym) {
+    if (sym->includeInDynsym() && sym->partition == partition)
+      markSymbol(sym);
+  });
+
+  // If this isn't the main partition, that's all that we need to preserve.
+  if (partition != 1) {
+    mark();
+    return;
+  }
+
+  markSymbol(symtab->find(config->entry));
+  markSymbol(symtab->find(config->init));
+  markSymbol(symtab->find(config->fini));
+  for (StringRef s : config->undefined)
+    markSymbol(symtab->find(s));
+  for (StringRef s : script->referencedSymbols)
+    markSymbol(symtab->find(s));
 
   // Preserve special sections and those which are specified in linker
   // script KEEP command.
-  for (InputSectionBase *Sec : InputSections) {
+  for (InputSectionBase *sec : inputSections) {
     // Mark .eh_frame sections as live because there are usually no relocations
     // that point to .eh_frames. Otherwise, the garbage collector would drop
     // all of them. We also want to preserve personality routines and LSDA
     // referenced by .eh_frame sections, so we scan them for that here.
-    if (auto *EH = dyn_cast<EhInputSection>(Sec)) {
-      EH->Live = true;
-      scanEhFrameSection<ELFT>(*EH, Enqueue);
+    if (auto *eh = dyn_cast<EhInputSection>(sec)) {
+      eh->markLive();
+      if (!eh->numRelocations)
+        continue;
+
+      if (eh->areRelocsRela)
+        scanEhFrameSection(*eh, eh->template relas<ELFT>());
+      else
+        scanEhFrameSection(*eh, eh->template rels<ELFT>());
     }
 
-    if (Sec->Flags & SHF_LINK_ORDER)
+    if (sec->flags & SHF_LINK_ORDER)
       continue;
 
-    if (isReserved<ELFT>(Sec) || Script->shouldKeep(Sec)) {
-      Enqueue(Sec, 0);
-    } else if (isValidCIdentifier(Sec->Name)) {
-      CNamedSections[Saver.save("__start_" + Sec->Name)].push_back(Sec);
-      CNamedSections[Saver.save("__stop_" + Sec->Name)].push_back(Sec);
+    if (isReserved(sec) || script->shouldKeep(sec)) {
+      enqueue(sec, 0);
+    } else if (isValidCIdentifier(sec->name)) {
+      cNamedSections[saver.save("__start_" + sec->name)].push_back(sec);
+      cNamedSections[saver.save("__stop_" + sec->name)].push_back(sec);
     }
   }
 
+  mark();
+}
+
+template <class ELFT> void MarkLive<ELFT>::mark() {
   // Mark all reachable sections.
-  while (!Q.empty())
-    forEachSuccessor<ELFT>(*Q.pop_back_val(), Enqueue);
+  while (!queue.empty()) {
+    InputSectionBase &sec = *queue.pop_back_val();
+
+    if (sec.areRelocsRela) {
+      for (const typename ELFT::Rela &rel : sec.template relas<ELFT>())
+        resolveReloc(sec, rel, false);
+    } else {
+      for (const typename ELFT::Rel &rel : sec.template rels<ELFT>())
+        resolveReloc(sec, rel, false);
+    }
+
+    for (InputSectionBase *isec : sec.dependentSections)
+      enqueue(isec, 0);
+  }
+}
+
+// Move the sections for some symbols to the main partition, specifically ifuncs
+// (because they can result in an IRELATIVE being added to the main partition's
+// GOT, which means that the ifunc must be available when the main partition is
+// loaded) and TLS symbols (because we only know how to correctly process TLS
+// relocations for the main partition).
+template <class ELFT> void MarkLive<ELFT>::moveToMain() {
+  for (InputFile *file : objectFiles)
+    for (Symbol *s : file->getSymbols())
+      if (auto *d = dyn_cast<Defined>(s))
+        if ((d->type == STT_GNU_IFUNC || d->type == STT_TLS) && d->section &&
+            d->section->isLive())
+          markSymbol(s);
+
+  mark();
 }
 
 // Before calling this function, Live bits are off for all
 // input sections. This function make some or all of them on
 // so that they are emitted to the output file.
 template <class ELFT> void elf::markLive() {
-  if (!Config->GcSections) {
-    // If -gc-sections is missing, no sections are removed.
-    for (InputSectionBase *Sec : InputSections)
-      Sec->Live = true;
+  // If -gc-sections is not given, no sections are removed.
+  if (!config->gcSections) {
+    for (InputSectionBase *sec : inputSections)
+      sec->markLive();
 
     // If a DSO defines a symbol referenced in a regular object, it is needed.
-    for (Symbol *Sym : Symtab->getSymbols())
-      if (auto *S = dyn_cast<SharedSymbol>(Sym))
-        if (S->IsUsedInRegularObj && !S->isWeak())
-          S->getFile<ELFT>().IsNeeded = true;
+    symtab->forEachSymbol([](Symbol *sym) {
+      if (auto *s = dyn_cast<SharedSymbol>(sym))
+        if (s->isUsedInRegularObj && !s->isWeak())
+          s->getFile().isNeeded = true;
+    });
     return;
   }
 
+  // Otheriwse, do mark-sweep GC.
+  //
   // The -gc-sections option works only for SHF_ALLOC sections
   // (sections that are memory-mapped at runtime). So we can
   // unconditionally make non-SHF_ALLOC sections alive except
   // SHF_LINK_ORDER and SHT_REL/SHT_RELA sections.
   //
-  // Usually, SHF_ALLOC sections are not removed even if they are
+  // Usually, non-SHF_ALLOC sections are not removed even if they are
   // unreachable through relocations because reachability is not
   // a good signal whether they are garbage or not (e.g. there is
   // usually no section referring to a .comment section, but we
@@ -300,22 +341,30 @@ template <class ELFT> void elf::markLive() {
   // or -emit-reloc were given. And they are subject of garbage
   // collection because, if we remove a text section, we also
   // remove its relocation section.
-  for (InputSectionBase *Sec : InputSections) {
-    bool IsAlloc = (Sec->Flags & SHF_ALLOC);
-    bool IsLinkOrder = (Sec->Flags & SHF_LINK_ORDER);
-    bool IsRel = (Sec->Type == SHT_REL || Sec->Type == SHT_RELA);
-    if (!IsAlloc && !IsLinkOrder && !IsRel)
-      Sec->Live = true;
+  for (InputSectionBase *sec : inputSections) {
+    bool isAlloc = (sec->flags & SHF_ALLOC);
+    bool isLinkOrder = (sec->flags & SHF_LINK_ORDER);
+    bool isRel = (sec->type == SHT_REL || sec->type == SHT_RELA);
+
+    if (!isAlloc && !isLinkOrder && !isRel)
+      sec->markLive();
   }
 
   // Follow the graph to mark all live sections.
-  doGcSections<ELFT>();
+  for (unsigned curPart = 1; curPart <= partitions.size(); ++curPart)
+    MarkLive<ELFT>(curPart).run();
+
+  // If we have multiple partitions, some sections need to live in the main
+  // partition even if they were allocated to a loadable partition. Move them
+  // there now.
+  if (partitions.size() != 1)
+    MarkLive<ELFT>(1).moveToMain();
 
   // Report garbage-collected sections.
-  if (Config->PrintGcSections)
-    for (InputSectionBase *Sec : InputSections)
-      if (!Sec->Live)
-        message("removing unused section " + toString(Sec));
+  if (config->printGcSections)
+    for (InputSectionBase *sec : inputSections)
+      if (!sec->isLive())
+        message("removing unused section " + toString(sec));
 }
 
 template void elf::markLive<ELF32LE>();
diff --git a/deps/lld/ELF/MarkLive.h b/deps/lld/ELF/MarkLive.h
index c9b99add34de045fdc257c0d793b9077eda5480a..63b5b266914686db11badad8ac12ff9e9d2df2ed 100644
--- a/deps/lld/ELF/MarkLive.h
+++ b/deps/lld/ELF/MarkLive.h
@@ -1,9 +1,8 @@
 //===- MarkLive.h -----------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/ELF/Options.td b/deps/lld/ELF/Options.td
index 439fe341644c81b67252cad6b10b6c534f43a955..3ebb46f2e1b2dcee56d97fa61448ace1dfa19c1f 100644
--- a/deps/lld/ELF/Options.td
+++ b/deps/lld/ELF/Options.td
@@ -63,10 +63,18 @@ defm allow_multiple_definition: B<"allow-multiple-definition",
     "Allow multiple definitions",
     "Do not allow multiple definitions (default)">;
 
+defm allow_shlib_undefined: B<"allow-shlib-undefined",
+    "Allow unresolved references in shared libraries (default when linking a shared library)",
+    "Do not allow unresolved references in shared libraries (default when linking an executable)">;
+
 defm apply_dynamic_relocs: B<"apply-dynamic-relocs",
     "Apply link-time values for dynamic relocations",
     "Do not apply link-time values for dynamic relocations (default)">;
 
+defm dependent_libraries: B<"dependent-libraries",
+    "Process dependent library specifiers from input files (default)",
+    "Ignore dependent library specifiers from input files">;
+
 defm as_needed: B<"as-needed",
     "Only set DT_NEEDED for shared libraries if used",
     "Always set DT_NEEDED for shared libraries (default)">;
@@ -163,6 +171,13 @@ defm fini: Eq<"fini", "Specify a finalizer function">, MetaVarName<"<symbol>">;
 def fix_cortex_a53_843419: F<"fix-cortex-a53-843419">,
   HelpText<"Apply fixes for AArch64 Cortex-A53 erratum 843419">;
 
+// This option is intentionally hidden from the user as the implementation
+// is not complete.
+def require_cet: F<"require-cet">;
+
+def force_bti: F<"force-bti">,
+  HelpText<"Force enable AArch64 BTI in PLT, warn if Input ELF file does not have GNU_PROPERTY_AARCH64_FEATURE_1_BTI property">;
+
 defm format: Eq<"format", "Change the input format of the inputs following this option">,
   MetaVarName<"[default,elf,binary]">;
 
@@ -214,6 +229,9 @@ defm merge_exidx_entries: B<"merge-exidx-entries",
     "Enable merging .ARM.exidx entries (default)",
     "Disable merging .ARM.exidx entries">;
 
+def nmagic: F<"nmagic">, MetaVarName<"<magic>">,
+  HelpText<"Do not page align sections, link against static libraries.">;
+
 def nostdlib: F<"nostdlib">,
   HelpText<"Only search directories specified on the command line">;
 
@@ -226,8 +244,11 @@ def no_dynamic_linker: F<"no-dynamic-linker">,
 def noinhibit_exec: F<"noinhibit-exec">,
   HelpText<"Retain the executable output file whenever it is still usable">;
 
+def no_nmagic: F<"no-nmagic">, MetaVarName<"<magic>">,
+  HelpText<"Page align sections (default)">;
+
 def no_omagic: F<"no-omagic">, MetaVarName<"<magic>">,
-  HelpText<"Do not set the text data sections to be writable">;
+  HelpText<"Do not set the text data sections to be writable, page align sections (default)">;
 
 def no_rosegment: F<"no-rosegment">,
   HelpText<"Do not put read-only non-executable sections in their own segment">;
@@ -242,7 +263,7 @@ def oformat: Separate<["--"], "oformat">, MetaVarName<"<format>">,
   HelpText<"Specify the binary format for the output object file">;
 
 def omagic: Flag<["--"], "omagic">, MetaVarName<"<magic>">,
-  HelpText<"Set the text and data sections to be readable and writable">;
+  HelpText<"Set the text and data sections to be readable and writable, do not page align sections, link against static libraries">;
 
 defm orphan_handling:
   Eq<"orphan-handling", "Control how orphan sections are handled when linker script used">;
@@ -251,6 +272,9 @@ defm pack_dyn_relocs:
   Eq<"pack-dyn-relocs", "Pack dynamic relocations in the given format">,
   MetaVarName<"[none,android,relr,android+relr]">;
 
+def pac_plt: F<"pac-plt">,
+  HelpText<"AArch64 only, use pointer authentication in PLT">;
+
 defm use_android_relr_tags: B<"use-android-relr-tags",
     "Use SHT_ANDROID_RELR / DT_ANDROID_RELR* tags instead of SHT_RELR / DT_RELR*",
     "Use SHT_RELR / DT_RELR* tags (default)">;
@@ -270,6 +294,9 @@ defm print_icf_sections: B<"print-icf-sections",
     "List identical folded sections",
     "Do not list identical folded sections (default)">;
 
+defm print_symbol_order: Eq<"print-symbol-order",
+  "Print a symbol order specified by --call-graph-ordering-file into the speficied file">;
+
 def pop_state: F<"pop-state">,
   HelpText<"Undo the effect of -push-state">;
 
@@ -339,6 +366,9 @@ defm trace_symbol: Eq<"trace-symbol", "Trace references to symbols">;
 defm undefined: Eq<"undefined", "Force undefined symbol during linking">,
   MetaVarName<"<symbol>">;
 
+defm undefined_glob: Eq<"undefined-glob", "Force undefined symbol during linking">,
+  MetaVarName<"<pattern>">;
+
 defm unresolved_symbols:
   Eq<"unresolved-symbols", "Determine how to handle unresolved symbols">;
 
@@ -386,6 +416,9 @@ defm wrap: Eq<"wrap", "Use wrapper functions for symbol">,
 def z: JoinedOrSeparate<["-"], "z">, MetaVarName<"<option>">,
   HelpText<"Linker option extensions">;
 
+def visual_studio_diagnostics_format : F<"vs-diagnostics">,
+HelpText<"Format diagnostics for Visual Studio compatiblity">;
+
 // Aliases
 def: Separate<["-"], "f">, Alias<auxiliary>, HelpText<"Alias for --auxiliary">;
 def: F<"call_shared">, Alias<Bdynamic>, HelpText<"Alias for --Bdynamic">;
@@ -407,6 +440,7 @@ def: Separate<["-"], "b">, Alias<format>, HelpText<"Alias for --format">;
 def: JoinedOrSeparate<["-"], "l">, Alias<library>, HelpText<"Alias for --library">;
 def: JoinedOrSeparate<["-"], "L">, Alias<library_path>, HelpText<"Alias for --library-path">;
 def: F<"no-pic-executable">, Alias<no_pie>, HelpText<"Alias for --no-pie">;
+def: Flag<["-"], "n">, Alias<nmagic>, HelpText<"Alias for --nmagic">;
 def: Flag<["-"], "N">, Alias<omagic>, HelpText<"Alias for --omagic">;
 def: Joined<["--"], "output=">, Alias<o>, HelpText<"Alias for -o">;
 def: Separate<["--"], "output">, Alias<o>, HelpText<"Alias for -o">;
@@ -440,14 +474,22 @@ def lto_O: J<"lto-O">, MetaVarName<"<opt-level>">,
   HelpText<"Optimization level for LTO">;
 def lto_partitions: J<"lto-partitions=">,
   HelpText<"Number of LTO codegen partitions">;
+def lto_cs_profile_generate: F<"lto-cs-profile-generate">,
+  HelpText<"Perform context senstive PGO instrumentation">;
+def lto_cs_profile_file: J<"lto-cs-profile-file=">,
+  HelpText<"Context sensitive profile file path">;
 def lto_sample_profile: J<"lto-sample-profile=">,
   HelpText<"Sample profile file path">;
 def disable_verify: F<"disable-verify">;
 defm mllvm: Eq<"mllvm", "Additional arguments to forward to LLVM's option processing">;
 def opt_remarks_filename: Separate<["--"], "opt-remarks-filename">,
   HelpText<"YAML output file for optimization remarks">;
+def opt_remarks_passes: Separate<["--"], "opt-remarks-passes">,
+  HelpText<"Regex for the passes that need to be serialized to the output file">;
 def opt_remarks_with_hotness: Flag<["--"], "opt-remarks-with-hotness">,
   HelpText<"Include hotness information in the optimization remarks file">;
+def opt_remarks_format: Separate<["--"], "opt-remarks-format">,
+  HelpText<"The format used for serializing remarks (default: YAML)">;
 defm plugin_opt: Eq<"plugin-opt", "specifies LTO options for compatibility with GNU linkers">;
 def save_temps: F<"save-temps">;
 def thinlto_cache_dir: J<"thinlto-cache-dir=">,
@@ -468,6 +510,10 @@ def plugin_opt_mcpu_eq: J<"plugin-opt=mcpu=">;
 def: F<"plugin-opt=new-pass-manager">,
   Alias<lto_new_pass_manager>, HelpText<"Alias for -lto-new-pass-manager">;
 def plugin_opt_obj_path_eq: J<"plugin-opt=obj-path=">;
+def: F<"plugin-opt=cs-profile-generate">,
+  Alias<lto_cs_profile_generate>, HelpText<"Alias for -lto-cs-profile-generate">;
+def: J<"plugin-opt=cs-profile-path=">,
+  Alias<lto_cs_profile_file>, HelpText<"Alias for -lto-cs-profile-file">;
 def: J<"plugin-opt=sample-profile=">,
   Alias<lto_sample_profile>, HelpText<"Alias for -lto-sample-profile">;
 def: F<"plugin-opt=save-temps">, Alias<save_temps>, HelpText<"Alias for -save-temps">;
@@ -492,19 +538,20 @@ def plugin_opt_thinlto: J<"plugin-opt=thinlto">;
 def plugin_opt_slash: J<"plugin-opt=/">;
 
 // Options listed below are silently ignored for now for compatibility.
-def: F<"allow-shlib-undefined">;
 def: F<"detect-odr-violations">;
 def: Flag<["-"], "g">;
 def: F<"long-plt">;
 def: F<"no-add-needed">;
-def: F<"no-allow-shlib-undefined">;
 def: F<"no-copy-dt-needed-entries">;
 def: F<"no-ctors-in-init-array">;
 def: F<"no-keep-memory">;
 def: F<"no-mmap-output-file">;
+def: F<"no-pipeline-knowledge">;
 def: F<"no-warn-mismatch">;
+def: Flag<["-"], "p">;
 def: Separate<["--", "-"], "rpath-link">;
 def: J<"rpath-link=">;
+def: F<"secure-plt">;
 def: F<"sort-common">;
 def: F<"stats">;
 def: F<"warn-execstack">;
diff --git a/deps/lld/ELF/OutputSections.cpp b/deps/lld/ELF/OutputSections.cpp
index c1442c0787361396f8543d4010980b7e3f9bab1e..a89bd509bc96d5dcbbf007d594a2af448be75fc0 100644
--- a/deps/lld/ELF/OutputSections.cpp
+++ b/deps/lld/ELF/OutputSections.cpp
@@ -1,9 +1,8 @@
 //===- OutputSections.cpp -------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -31,47 +30,46 @@ using namespace llvm::ELF;
 using namespace lld;
 using namespace lld::elf;
 
-uint8_t Out::First;
-PhdrEntry *Out::TlsPhdr;
-OutputSection *Out::ElfHeader;
-OutputSection *Out::ProgramHeaders;
-OutputSection *Out::PreinitArray;
-OutputSection *Out::InitArray;
-OutputSection *Out::FiniArray;
+uint8_t *Out::bufferStart;
+uint8_t Out::first;
+PhdrEntry *Out::tlsPhdr;
+OutputSection *Out::elfHeader;
+OutputSection *Out::programHeaders;
+OutputSection *Out::preinitArray;
+OutputSection *Out::initArray;
+OutputSection *Out::finiArray;
 
-std::vector<OutputSection *> elf::OutputSections;
+std::vector<OutputSection *> elf::outputSections;
 
 uint32_t OutputSection::getPhdrFlags() const {
-  uint32_t Ret = 0;
-  if (Config->EMachine != EM_ARM || !(Flags & SHF_ARM_PURECODE))
-    Ret |= PF_R;
-  if (Flags & SHF_WRITE)
-    Ret |= PF_W;
-  if (Flags & SHF_EXECINSTR)
-    Ret |= PF_X;
-  return Ret;
+  uint32_t ret = 0;
+  if (config->emachine != EM_ARM || !(flags & SHF_ARM_PURECODE))
+    ret |= PF_R;
+  if (flags & SHF_WRITE)
+    ret |= PF_W;
+  if (flags & SHF_EXECINSTR)
+    ret |= PF_X;
+  return ret;
 }
 
 template <class ELFT>
-void OutputSection::writeHeaderTo(typename ELFT::Shdr *Shdr) {
-  Shdr->sh_entsize = Entsize;
-  Shdr->sh_addralign = Alignment;
-  Shdr->sh_type = Type;
-  Shdr->sh_offset = Offset;
-  Shdr->sh_flags = Flags;
-  Shdr->sh_info = Info;
-  Shdr->sh_link = Link;
-  Shdr->sh_addr = Addr;
-  Shdr->sh_size = Size;
-  Shdr->sh_name = ShName;
+void OutputSection::writeHeaderTo(typename ELFT::Shdr *shdr) {
+  shdr->sh_entsize = entsize;
+  shdr->sh_addralign = alignment;
+  shdr->sh_type = type;
+  shdr->sh_offset = offset;
+  shdr->sh_flags = flags;
+  shdr->sh_info = info;
+  shdr->sh_link = link;
+  shdr->sh_addr = addr;
+  shdr->sh_size = size;
+  shdr->sh_name = shName;
 }
 
-OutputSection::OutputSection(StringRef Name, uint32_t Type, uint64_t Flags)
+OutputSection::OutputSection(StringRef name, uint32_t type, uint64_t flags)
     : BaseCommand(OutputSectionKind),
-      SectionBase(Output, Name, Flags, /*Entsize*/ 0, /*Alignment*/ 1, Type,
-                  /*Info*/ 0, /*Link*/ 0) {
-  Live = false;
-}
+      SectionBase(Output, name, flags, /*Entsize*/ 0, /*Alignment*/ 1, type,
+                  /*Info*/ 0, /*Link*/ 0) {}
 
 // We allow sections of types listed below to merged into a
 // single progbits section. This is typically done by linker
@@ -79,257 +77,248 @@ OutputSection::OutputSection(StringRef Name, uint32_t Type, uint64_t Flags)
 // to be allocated for nobits sections. Other ones don't require
 // any special treatment on top of progbits, so there doesn't
 // seem to be a harm in merging them.
-static bool canMergeToProgbits(unsigned Type) {
-  return Type == SHT_NOBITS || Type == SHT_PROGBITS || Type == SHT_INIT_ARRAY ||
-         Type == SHT_PREINIT_ARRAY || Type == SHT_FINI_ARRAY ||
-         Type == SHT_NOTE;
+static bool canMergeToProgbits(unsigned type) {
+  return type == SHT_NOBITS || type == SHT_PROGBITS || type == SHT_INIT_ARRAY ||
+         type == SHT_PREINIT_ARRAY || type == SHT_FINI_ARRAY ||
+         type == SHT_NOTE;
 }
 
-void OutputSection::addSection(InputSection *IS) {
-  if (!Live) {
+void OutputSection::addSection(InputSection *isec) {
+  if (!hasInputSections) {
     // If IS is the first section to be added to this section,
-    // initialize Type, Entsize and flags from IS.
-    Live = true;
-    Type = IS->Type;
-    Entsize = IS->Entsize;
-    Flags = IS->Flags;
+    // initialize Partition, Type, Entsize and flags from IS.
+    hasInputSections = true;
+    partition = isec->partition;
+    type = isec->type;
+    entsize = isec->entsize;
+    flags = isec->flags;
   } else {
     // Otherwise, check if new type or flags are compatible with existing ones.
-    unsigned Mask = SHF_TLS | SHF_LINK_ORDER;
-    if ((Flags & Mask) != (IS->Flags & Mask))
-      error("incompatible section flags for " + Name + "\n>>> " + toString(IS) +
-            ": 0x" + utohexstr(IS->Flags) + "\n>>> output section " + Name +
-            ": 0x" + utohexstr(Flags));
+    unsigned mask = SHF_TLS | SHF_LINK_ORDER;
+    if ((flags & mask) != (isec->flags & mask))
+      error("incompatible section flags for " + name + "\n>>> " + toString(isec) +
+            ": 0x" + utohexstr(isec->flags) + "\n>>> output section " + name +
+            ": 0x" + utohexstr(flags));
 
-    if (Type != IS->Type) {
-      if (!canMergeToProgbits(Type) || !canMergeToProgbits(IS->Type))
-        error("section type mismatch for " + IS->Name + "\n>>> " +
-              toString(IS) + ": " +
-              getELFSectionTypeName(Config->EMachine, IS->Type) +
-              "\n>>> output section " + Name + ": " +
-              getELFSectionTypeName(Config->EMachine, Type));
-      Type = SHT_PROGBITS;
+    if (type != isec->type) {
+      if (!canMergeToProgbits(type) || !canMergeToProgbits(isec->type))
+        error("section type mismatch for " + isec->name + "\n>>> " +
+              toString(isec) + ": " +
+              getELFSectionTypeName(config->emachine, isec->type) +
+              "\n>>> output section " + name + ": " +
+              getELFSectionTypeName(config->emachine, type));
+      type = SHT_PROGBITS;
     }
   }
 
-  IS->Parent = this;
-  uint64_t AndMask =
-      Config->EMachine == EM_ARM ? (uint64_t)SHF_ARM_PURECODE : 0;
-  uint64_t OrMask = ~AndMask;
-  uint64_t AndFlags = (Flags & IS->Flags) & AndMask;
-  uint64_t OrFlags = (Flags | IS->Flags) & OrMask;
-  Flags = AndFlags | OrFlags;
+  isec->parent = this;
+  uint64_t andMask =
+      config->emachine == EM_ARM ? (uint64_t)SHF_ARM_PURECODE : 0;
+  uint64_t orMask = ~andMask;
+  uint64_t andFlags = (flags & isec->flags) & andMask;
+  uint64_t orFlags = (flags | isec->flags) & orMask;
+  flags = andFlags | orFlags;
 
-  Alignment = std::max(Alignment, IS->Alignment);
+  alignment = std::max(alignment, isec->alignment);
 
   // If this section contains a table of fixed-size entries, sh_entsize
   // holds the element size. If it contains elements of different size we
   // set sh_entsize to 0.
-  if (Entsize != IS->Entsize)
-    Entsize = 0;
+  if (entsize != isec->entsize)
+    entsize = 0;
 
-  if (!IS->Assigned) {
-    IS->Assigned = true;
-    if (SectionCommands.empty() ||
-        !isa<InputSectionDescription>(SectionCommands.back()))
-      SectionCommands.push_back(make<InputSectionDescription>(""));
-    auto *ISD = cast<InputSectionDescription>(SectionCommands.back());
-    ISD->Sections.push_back(IS);
+  if (!isec->assigned) {
+    isec->assigned = true;
+    if (sectionCommands.empty() ||
+        !isa<InputSectionDescription>(sectionCommands.back()))
+      sectionCommands.push_back(make<InputSectionDescription>(""));
+    auto *isd = cast<InputSectionDescription>(sectionCommands.back());
+    isd->sections.push_back(isec);
   }
 }
 
-static void sortByOrder(MutableArrayRef<InputSection *> In,
-                        llvm::function_ref<int(InputSectionBase *S)> Order) {
-  typedef std::pair<int, InputSection *> Pair;
-  auto Comp = [](const Pair &A, const Pair &B) { return A.first < B.first; };
+static void sortByOrder(MutableArrayRef<InputSection *> in,
+                        llvm::function_ref<int(InputSectionBase *s)> order) {
+  std::vector<std::pair<int, InputSection *>> v;
+  for (InputSection *s : in)
+    v.push_back({order(s), s});
+  llvm::stable_sort(v, less_first());
 
-  std::vector<Pair> V;
-  for (InputSection *S : In)
-    V.push_back({Order(S), S});
-  std::stable_sort(V.begin(), V.end(), Comp);
-
-  for (size_t I = 0; I < V.size(); ++I)
-    In[I] = V[I].second;
+  for (size_t i = 0; i < v.size(); ++i)
+    in[i] = v[i].second;
 }
 
 uint64_t elf::getHeaderSize() {
-  if (Config->OFormatBinary)
+  if (config->oFormatBinary)
     return 0;
-  return Out::ElfHeader->Size + Out::ProgramHeaders->Size;
+  return Out::elfHeader->size + Out::programHeaders->size;
 }
 
-bool OutputSection::classof(const BaseCommand *C) {
-  return C->Kind == OutputSectionKind;
+bool OutputSection::classof(const BaseCommand *c) {
+  return c->kind == OutputSectionKind;
 }
 
-void OutputSection::sort(llvm::function_ref<int(InputSectionBase *S)> Order) {
-  assert(Live);
-  for (BaseCommand *B : SectionCommands)
-    if (auto *ISD = dyn_cast<InputSectionDescription>(B))
-      sortByOrder(ISD->Sections, Order);
+void OutputSection::sort(llvm::function_ref<int(InputSectionBase *s)> order) {
+  assert(isLive());
+  for (BaseCommand *b : sectionCommands)
+    if (auto *isd = dyn_cast<InputSectionDescription>(b))
+      sortByOrder(isd->sections, order);
 }
 
 // Fill [Buf, Buf + Size) with Filler.
 // This is used for linker script "=fillexp" command.
-static void fill(uint8_t *Buf, size_t Size,
-                 const std::array<uint8_t, 4> &Filler) {
-  size_t I = 0;
-  for (; I + 4 < Size; I += 4)
-    memcpy(Buf + I, Filler.data(), 4);
-  memcpy(Buf + I, Filler.data(), Size - I);
+static void fill(uint8_t *buf, size_t size,
+                 const std::array<uint8_t, 4> &filler) {
+  size_t i = 0;
+  for (; i + 4 < size; i += 4)
+    memcpy(buf + i, filler.data(), 4);
+  memcpy(buf + i, filler.data(), size - i);
 }
 
 // Compress section contents if this section contains debug info.
 template <class ELFT> void OutputSection::maybeCompress() {
-  typedef typename ELFT::Chdr Elf_Chdr;
+  using Elf_Chdr = typename ELFT::Chdr;
 
   // Compress only DWARF debug sections.
-  if (!Config->CompressDebugSections || (Flags & SHF_ALLOC) ||
-      !Name.startswith(".debug_"))
+  if (!config->compressDebugSections || (flags & SHF_ALLOC) ||
+      !name.startswith(".debug_"))
     return;
 
   // Create a section header.
-  ZDebugHeader.resize(sizeof(Elf_Chdr));
-  auto *Hdr = reinterpret_cast<Elf_Chdr *>(ZDebugHeader.data());
-  Hdr->ch_type = ELFCOMPRESS_ZLIB;
-  Hdr->ch_size = Size;
-  Hdr->ch_addralign = Alignment;
+  zDebugHeader.resize(sizeof(Elf_Chdr));
+  auto *hdr = reinterpret_cast<Elf_Chdr *>(zDebugHeader.data());
+  hdr->ch_type = ELFCOMPRESS_ZLIB;
+  hdr->ch_size = size;
+  hdr->ch_addralign = alignment;
 
   // Write section contents to a temporary buffer and compress it.
-  std::vector<uint8_t> Buf(Size);
-  writeTo<ELFT>(Buf.data());
-  if (Error E = zlib::compress(toStringRef(Buf), CompressedData))
-    fatal("compress failed: " + llvm::toString(std::move(E)));
+  std::vector<uint8_t> buf(size);
+  writeTo<ELFT>(buf.data());
+  if (Error e = zlib::compress(toStringRef(buf), compressedData))
+    fatal("compress failed: " + llvm::toString(std::move(e)));
 
   // Update section headers.
-  Size = sizeof(Elf_Chdr) + CompressedData.size();
-  Flags |= SHF_COMPRESSED;
+  size = sizeof(Elf_Chdr) + compressedData.size();
+  flags |= SHF_COMPRESSED;
 }
 
-static void writeInt(uint8_t *Buf, uint64_t Data, uint64_t Size) {
-  if (Size == 1)
-    *Buf = Data;
-  else if (Size == 2)
-    write16(Buf, Data);
-  else if (Size == 4)
-    write32(Buf, Data);
-  else if (Size == 8)
-    write64(Buf, Data);
+static void writeInt(uint8_t *buf, uint64_t data, uint64_t size) {
+  if (size == 1)
+    *buf = data;
+  else if (size == 2)
+    write16(buf, data);
+  else if (size == 4)
+    write32(buf, data);
+  else if (size == 8)
+    write64(buf, data);
   else
     llvm_unreachable("unsupported Size argument");
 }
 
-template <class ELFT> void OutputSection::writeTo(uint8_t *Buf) {
-  if (Type == SHT_NOBITS)
+template <class ELFT> void OutputSection::writeTo(uint8_t *buf) {
+  if (type == SHT_NOBITS)
     return;
 
-  Loc = Buf;
-
   // If -compress-debug-section is specified and if this is a debug seciton,
   // we've already compressed section contents. If that's the case,
   // just write it down.
-  if (!CompressedData.empty()) {
-    memcpy(Buf, ZDebugHeader.data(), ZDebugHeader.size());
-    memcpy(Buf + ZDebugHeader.size(), CompressedData.data(),
-           CompressedData.size());
+  if (!compressedData.empty()) {
+    memcpy(buf, zDebugHeader.data(), zDebugHeader.size());
+    memcpy(buf + zDebugHeader.size(), compressedData.data(),
+           compressedData.size());
     return;
   }
 
   // Write leading padding.
-  std::vector<InputSection *> Sections = getInputSections(this);
-  std::array<uint8_t, 4> Filler = getFiller();
-  bool NonZeroFiller = read32(Filler.data()) != 0;
-  if (NonZeroFiller)
-    fill(Buf, Sections.empty() ? Size : Sections[0]->OutSecOff, Filler);
+  std::vector<InputSection *> sections = getInputSections(this);
+  std::array<uint8_t, 4> filler = getFiller();
+  bool nonZeroFiller = read32(filler.data()) != 0;
+  if (nonZeroFiller)
+    fill(buf, sections.empty() ? size : sections[0]->outSecOff, filler);
 
-  parallelForEachN(0, Sections.size(), [&](size_t I) {
-    InputSection *IS = Sections[I];
-    IS->writeTo<ELFT>(Buf);
+  parallelForEachN(0, sections.size(), [&](size_t i) {
+    InputSection *isec = sections[i];
+    isec->writeTo<ELFT>(buf);
 
     // Fill gaps between sections.
-    if (NonZeroFiller) {
-      uint8_t *Start = Buf + IS->OutSecOff + IS->getSize();
-      uint8_t *End;
-      if (I + 1 == Sections.size())
-        End = Buf + Size;
+    if (nonZeroFiller) {
+      uint8_t *start = buf + isec->outSecOff + isec->getSize();
+      uint8_t *end;
+      if (i + 1 == sections.size())
+        end = buf + size;
       else
-        End = Buf + Sections[I + 1]->OutSecOff;
-      fill(Start, End - Start, Filler);
+        end = buf + sections[i + 1]->outSecOff;
+      fill(start, end - start, filler);
     }
   });
 
   // Linker scripts may have BYTE()-family commands with which you
   // can write arbitrary bytes to the output. Process them if any.
-  for (BaseCommand *Base : SectionCommands)
-    if (auto *Data = dyn_cast<ByteCommand>(Base))
-      writeInt(Buf + Data->Offset, Data->Expression().getValue(), Data->Size);
+  for (BaseCommand *base : sectionCommands)
+    if (auto *data = dyn_cast<ByteCommand>(base))
+      writeInt(buf + data->offset, data->expression().getValue(), data->size);
 }
 
-template <class ELFT>
-static void finalizeShtGroup(OutputSection *OS,
-                             InputSection *Section) {
-  assert(Config->Relocatable);
+static void finalizeShtGroup(OutputSection *os,
+                             InputSection *section) {
+  assert(config->relocatable);
 
   // sh_link field for SHT_GROUP sections should contain the section index of
   // the symbol table.
-  OS->Link = In.SymTab->getParent()->SectionIndex;
+  os->link = in.symTab->getParent()->sectionIndex;
 
   // sh_info then contain index of an entry in symbol table section which
   // provides signature of the section group.
-  ObjFile<ELFT> *Obj = Section->getFile<ELFT>();
-  ArrayRef<Symbol *> Symbols = Obj->getSymbols();
-  OS->Info = In.SymTab->getSymbolIndex(Symbols[Section->Info]);
+  ArrayRef<Symbol *> symbols = section->file->getSymbols();
+  os->info = in.symTab->getSymbolIndex(symbols[section->info]);
 }
 
-template <class ELFT> void OutputSection::finalize() {
-  if (Type == SHT_NOBITS)
-    for (BaseCommand *Base : SectionCommands)
-      if (isa<ByteCommand>(Base))
-        Type = SHT_PROGBITS;
+void OutputSection::finalize() {
+  std::vector<InputSection *> v = getInputSections(this);
+  InputSection *first = v.empty() ? nullptr : v[0];
 
-  std::vector<InputSection *> V = getInputSections(this);
-  InputSection *First = V.empty() ? nullptr : V[0];
-
-  if (Flags & SHF_LINK_ORDER) {
+  if (flags & SHF_LINK_ORDER) {
     // We must preserve the link order dependency of sections with the
     // SHF_LINK_ORDER flag. The dependency is indicated by the sh_link field. We
     // need to translate the InputSection sh_link to the OutputSection sh_link,
     // all InputSections in the OutputSection have the same dependency.
-    if (auto *D = First->getLinkOrderDep())
-      Link = D->getParent()->SectionIndex;
+    if (auto *ex = dyn_cast<ARMExidxSyntheticSection>(first))
+      link = ex->getLinkOrderDep()->getParent()->sectionIndex;
+    else if (auto *d = first->getLinkOrderDep())
+      link = d->getParent()->sectionIndex;
   }
 
-  if (Type == SHT_GROUP) {
-    finalizeShtGroup<ELFT>(this, First);
+  if (type == SHT_GROUP) {
+    finalizeShtGroup(this, first);
     return;
   }
 
-  if (!Config->CopyRelocs || (Type != SHT_RELA && Type != SHT_REL))
+  if (!config->copyRelocs || (type != SHT_RELA && type != SHT_REL))
     return;
 
-  if (isa<SyntheticSection>(First))
+  if (isa<SyntheticSection>(first))
     return;
 
-  Link = In.SymTab->getParent()->SectionIndex;
+  link = in.symTab->getParent()->sectionIndex;
   // sh_info for SHT_REL[A] sections should contain the section header index of
   // the section to which the relocation applies.
-  InputSectionBase *S = First->getRelocatedSection();
-  Info = S->getOutputSection()->SectionIndex;
-  Flags |= SHF_INFO_LINK;
+  InputSectionBase *s = first->getRelocatedSection();
+  info = s->getOutputSection()->sectionIndex;
+  flags |= SHF_INFO_LINK;
 }
 
 // Returns true if S matches /Filename.?\.o$/.
-static bool isCrtBeginEnd(StringRef S, StringRef Filename) {
-  if (!S.endswith(".o"))
+static bool isCrtBeginEnd(StringRef s, StringRef filename) {
+  if (!s.endswith(".o"))
     return false;
-  S = S.drop_back(2);
-  if (S.endswith(Filename))
+  s = s.drop_back(2);
+  if (s.endswith(filename))
     return true;
-  return !S.empty() && S.drop_back().endswith(Filename);
+  return !s.empty() && s.drop_back().endswith(filename);
 }
 
-static bool isCrtbegin(StringRef S) { return isCrtBeginEnd(S, "crtbegin"); }
-static bool isCrtend(StringRef S) { return isCrtBeginEnd(S, "crtend"); }
+static bool isCrtbegin(StringRef s) { return isCrtBeginEnd(s, "crtbegin"); }
+static bool isCrtend(StringRef s) { return isCrtBeginEnd(s, "crtend"); }
 
 // .ctors and .dtors are sorted by this priority from highest to lowest.
 //
@@ -349,52 +338,52 @@ static bool isCrtend(StringRef S) { return isCrtBeginEnd(S, "crtend"); }
 // .ctors are duplicate features (and .init_array is newer.) However, there
 // are too many real-world use cases of .ctors, so we had no choice to
 // support that with this rather ad-hoc semantics.
-static bool compCtors(const InputSection *A, const InputSection *B) {
-  bool BeginA = isCrtbegin(A->File->getName());
-  bool BeginB = isCrtbegin(B->File->getName());
-  if (BeginA != BeginB)
-    return BeginA;
-  bool EndA = isCrtend(A->File->getName());
-  bool EndB = isCrtend(B->File->getName());
-  if (EndA != EndB)
-    return EndB;
-  StringRef X = A->Name;
-  StringRef Y = B->Name;
-  assert(X.startswith(".ctors") || X.startswith(".dtors"));
-  assert(Y.startswith(".ctors") || Y.startswith(".dtors"));
-  X = X.substr(6);
-  Y = Y.substr(6);
-  return X < Y;
+static bool compCtors(const InputSection *a, const InputSection *b) {
+  bool beginA = isCrtbegin(a->file->getName());
+  bool beginB = isCrtbegin(b->file->getName());
+  if (beginA != beginB)
+    return beginA;
+  bool endA = isCrtend(a->file->getName());
+  bool endB = isCrtend(b->file->getName());
+  if (endA != endB)
+    return endB;
+  StringRef x = a->name;
+  StringRef y = b->name;
+  assert(x.startswith(".ctors") || x.startswith(".dtors"));
+  assert(y.startswith(".ctors") || y.startswith(".dtors"));
+  x = x.substr(6);
+  y = y.substr(6);
+  return x < y;
 }
 
 // Sorts input sections by the special rules for .ctors and .dtors.
 // Unfortunately, the rules are different from the one for .{init,fini}_array.
 // Read the comment above.
 void OutputSection::sortCtorsDtors() {
-  assert(SectionCommands.size() == 1);
-  auto *ISD = cast<InputSectionDescription>(SectionCommands[0]);
-  std::stable_sort(ISD->Sections.begin(), ISD->Sections.end(), compCtors);
+  assert(sectionCommands.size() == 1);
+  auto *isd = cast<InputSectionDescription>(sectionCommands[0]);
+  llvm::stable_sort(isd->sections, compCtors);
 }
 
 // If an input string is in the form of "foo.N" where N is a number,
 // return N. Otherwise, returns 65536, which is one greater than the
 // lowest priority.
-int elf::getPriority(StringRef S) {
-  size_t Pos = S.rfind('.');
-  if (Pos == StringRef::npos)
+int elf::getPriority(StringRef s) {
+  size_t pos = s.rfind('.');
+  if (pos == StringRef::npos)
     return 65536;
-  int V;
-  if (!to_integer(S.substr(Pos + 1), V, 10))
+  int v;
+  if (!to_integer(s.substr(pos + 1), v, 10))
     return 65536;
-  return V;
+  return v;
 }
 
-std::vector<InputSection *> elf::getInputSections(OutputSection *OS) {
-  std::vector<InputSection *> Ret;
-  for (BaseCommand *Base : OS->SectionCommands)
-    if (auto *ISD = dyn_cast<InputSectionDescription>(Base))
-      Ret.insert(Ret.end(), ISD->Sections.begin(), ISD->Sections.end());
-  return Ret;
+std::vector<InputSection *> elf::getInputSections(OutputSection *os) {
+  std::vector<InputSection *> ret;
+  for (BaseCommand *base : os->sectionCommands)
+    if (auto *isd = dyn_cast<InputSectionDescription>(base))
+      ret.insert(ret.end(), isd->sections.begin(), isd->sections.end());
+  return ret;
 }
 
 // Sorts input sections by section name suffixes, so that .foo.N comes
@@ -405,14 +394,14 @@ std::vector<InputSection *> elf::getInputSections(OutputSection *OS) {
 // For more detail, read the section of the GCC's manual about init_priority.
 void OutputSection::sortInitFini() {
   // Sort sections by priority.
-  sort([](InputSectionBase *S) { return getPriority(S->Name); });
+  sort([](InputSectionBase *s) { return getPriority(s->name); });
 }
 
 std::array<uint8_t, 4> OutputSection::getFiller() {
-  if (Filler)
-    return *Filler;
-  if (Flags & SHF_EXECINSTR)
-    return Target->TrapInstr;
+  if (filler)
+    return *filler;
+  if (flags & SHF_EXECINSTR)
+    return target->trapInstr;
   return {0, 0, 0, 0};
 }
 
@@ -430,8 +419,3 @@ template void OutputSection::maybeCompress<ELF32LE>();
 template void OutputSection::maybeCompress<ELF32BE>();
 template void OutputSection::maybeCompress<ELF64LE>();
 template void OutputSection::maybeCompress<ELF64BE>();
-
-template void OutputSection::finalize<ELF32LE>();
-template void OutputSection::finalize<ELF32BE>();
-template void OutputSection::finalize<ELF64LE>();
-template void OutputSection::finalize<ELF64BE>();
diff --git a/deps/lld/ELF/OutputSections.h b/deps/lld/ELF/OutputSections.h
index 113bf6836926d5d1794aac5a4d650fe7ed25789a..fff8327ea376c9c398c3d884a431f19feb294c92 100644
--- a/deps/lld/ELF/OutputSections.h
+++ b/deps/lld/ELF/OutputSections.h
@@ -1,9 +1,8 @@
 //===- OutputSections.h -----------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -23,17 +22,8 @@ namespace lld {
 namespace elf {
 
 struct PhdrEntry;
-class Symbol;
-struct EhSectionPiece;
-class EhInputSection;
 class InputSection;
 class InputSectionBase;
-class MergeInputSection;
-class OutputSection;
-template <class ELFT> class ObjFile;
-template <class ELFT> class SharedFile;
-class SharedSymbol;
-class Defined;
 
 // This represents a section in an output file.
 // It is composed of multiple InputSections.
@@ -41,19 +31,19 @@ class Defined;
 // non-overlapping file offsets and VAs.
 class OutputSection final : public BaseCommand, public SectionBase {
 public:
-  OutputSection(StringRef Name, uint32_t Type, uint64_t Flags);
+  OutputSection(StringRef name, uint32_t type, uint64_t flags);
 
-  static bool classof(const SectionBase *S) {
-    return S->kind() == SectionBase::Output;
+  static bool classof(const SectionBase *s) {
+    return s->kind() == SectionBase::Output;
   }
 
-  static bool classof(const BaseCommand *C);
+  static bool classof(const BaseCommand *c);
 
-  uint64_t getLMA() const { return PtLoad ? Addr + PtLoad->LMAOffset : Addr; }
-  template <typename ELFT> void writeHeaderTo(typename ELFT::Shdr *SHdr);
+  uint64_t getLMA() const { return ptLoad ? addr + ptLoad->lmaOffset : addr; }
+  template <typename ELFT> void writeHeaderTo(typename ELFT::Shdr *sHdr);
 
-  uint32_t SectionIndex = UINT32_MAX;
-  unsigned SortRank;
+  uint32_t sectionIndex = UINT32_MAX;
+  unsigned sortRank;
 
   uint32_t getPhdrFlags() const;
 
@@ -64,78 +54,82 @@ public:
   // section offset we use the following formula: Off = Off_first + VA -
   // VA_first, where Off_first and VA_first is file offset and VA of first
   // section in PT_LOAD.
-  PhdrEntry *PtLoad = nullptr;
+  PhdrEntry *ptLoad = nullptr;
 
   // Pointer to a relocation section for this section. Usually nullptr because
   // we consume relocations, but if --emit-relocs is specified (which is rare),
   // it may have a non-null value.
-  OutputSection *RelocationSection = nullptr;
+  OutputSection *relocationSection = nullptr;
 
   // Initially this field is the number of InputSections that have been added to
   // the OutputSection so far. Later on, after a call to assignAddresses, it
   // corresponds to the Elf_Shdr member.
-  uint64_t Size = 0;
+  uint64_t size = 0;
 
   // The following fields correspond to Elf_Shdr members.
-  uint64_t Offset = 0;
-  uint64_t Addr = 0;
-  uint32_t ShName = 0;
+  uint64_t offset = 0;
+  uint64_t addr = 0;
+  uint32_t shName = 0;
 
-  void addSection(InputSection *IS);
-
-  // Location in the output buffer.
-  uint8_t *Loc = nullptr;
+  void addSection(InputSection *isec);
 
   // The following members are normally only used in linker scripts.
-  MemoryRegion *MemRegion = nullptr;
-  MemoryRegion *LMARegion = nullptr;
-  Expr AddrExpr;
-  Expr AlignExpr;
-  Expr LMAExpr;
-  Expr SubalignExpr;
-  std::vector<BaseCommand *> SectionCommands;
-  std::vector<StringRef> Phdrs;
-  llvm::Optional<std::array<uint8_t, 4>> Filler;
-  ConstraintKind Constraint = ConstraintKind::NoConstraint;
-  std::string Location;
-  std::string MemoryRegionName;
-  std::string LMARegionName;
-  bool NonAlloc = false;
-  bool Noload = false;
-  bool ExpressionsUseSymbols = false;
-  bool InOverlay = false;
+  MemoryRegion *memRegion = nullptr;
+  MemoryRegion *lmaRegion = nullptr;
+  Expr addrExpr;
+  Expr alignExpr;
+  Expr lmaExpr;
+  Expr subalignExpr;
+  std::vector<BaseCommand *> sectionCommands;
+  std::vector<StringRef> phdrs;
+  llvm::Optional<std::array<uint8_t, 4>> filler;
+  ConstraintKind constraint = ConstraintKind::NoConstraint;
+  std::string location;
+  std::string memoryRegionName;
+  std::string lmaRegionName;
+  bool nonAlloc = false;
+  bool noload = false;
+  bool expressionsUseSymbols = false;
+  bool usedInExpression = false;
+  bool inOverlay = false;
 
-  template <class ELFT> void finalize();
-  template <class ELFT> void writeTo(uint8_t *Buf);
+  // Tracks whether the section has ever had an input section added to it, even
+  // if the section was later removed (e.g. because it is a synthetic section
+  // that wasn't needed). This is needed for orphan placement.
+  bool hasInputSections = false;
+
+  void finalize();
+  template <class ELFT> void writeTo(uint8_t *buf);
   template <class ELFT> void maybeCompress();
 
-  void sort(llvm::function_ref<int(InputSectionBase *S)> Order);
+  void sort(llvm::function_ref<int(InputSectionBase *s)> order);
   void sortInitFini();
   void sortCtorsDtors();
 
 private:
   // Used for implementation of --compress-debug-sections option.
-  std::vector<uint8_t> ZDebugHeader;
-  llvm::SmallVector<char, 1> CompressedData;
+  std::vector<uint8_t> zDebugHeader;
+  llvm::SmallVector<char, 1> compressedData;
 
   std::array<uint8_t, 4> getFiller();
 };
 
-int getPriority(StringRef S);
+int getPriority(StringRef s);
 
-std::vector<InputSection *> getInputSections(OutputSection* OS);
+std::vector<InputSection *> getInputSections(OutputSection* os);
 
 // All output sections that are handled by the linker specially are
 // globally accessible. Writer initializes them, so don't use them
 // until Writer is initialized.
 struct Out {
-  static uint8_t First;
-  static PhdrEntry *TlsPhdr;
-  static OutputSection *ElfHeader;
-  static OutputSection *ProgramHeaders;
-  static OutputSection *PreinitArray;
-  static OutputSection *InitArray;
-  static OutputSection *FiniArray;
+  static uint8_t *bufferStart;
+  static uint8_t first;
+  static PhdrEntry *tlsPhdr;
+  static OutputSection *elfHeader;
+  static OutputSection *programHeaders;
+  static OutputSection *preinitArray;
+  static OutputSection *initArray;
+  static OutputSection *finiArray;
 };
 
 } // namespace elf
@@ -146,7 +140,7 @@ namespace elf {
 
 uint64_t getHeaderSize();
 
-extern std::vector<OutputSection *> OutputSections;
+extern std::vector<OutputSection *> outputSections;
 } // namespace elf
 } // namespace lld
 
diff --git a/deps/lld/ELF/Relocations.cpp b/deps/lld/ELF/Relocations.cpp
index 9ffe8a9cc72e77e9979ad5f8ba8dfe2d26c35892..ee48f4808136089b74dc929327c4536e64bb2892 100644
--- a/deps/lld/ELF/Relocations.cpp
+++ b/deps/lld/ELF/Relocations.cpp
@@ -1,9 +1,8 @@
 //===- Relocations.cpp ----------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -66,11 +65,11 @@ using namespace llvm::support::endian;
 using namespace lld;
 using namespace lld::elf;
 
-static Optional<std::string> getLinkerScriptLocation(const Symbol &Sym) {
-  for (BaseCommand *Base : Script->SectionCommands)
-    if (auto *Cmd = dyn_cast<SymbolAssignment>(Base))
-      if (Cmd->Sym == &Sym)
-        return Cmd->Location;
+static Optional<std::string> getLinkerScriptLocation(const Symbol &sym) {
+  for (BaseCommand *base : script->sectionCommands)
+    if (auto *cmd = dyn_cast<SymbolAssignment>(base))
+      if (cmd->sym == &sym)
+        return cmd->location;
   return None;
 }
 
@@ -79,19 +78,51 @@ static Optional<std::string> getLinkerScriptLocation(const Symbol &Sym) {
 // >>> defined in /home/alice/src/foo.o
 // >>> referenced by bar.c:12 (/home/alice/src/bar.c:12)
 // >>>               /home/alice/src/bar.o:(.text+0x1)
-static std::string getLocation(InputSectionBase &S, const Symbol &Sym,
-                               uint64_t Off) {
-  std::string Msg = "\n>>> defined in ";
-  if (Sym.File)
-    Msg += toString(Sym.File);
-  else if (Optional<std::string> Loc = getLinkerScriptLocation(Sym))
-    Msg += *Loc;
-
-  Msg += "\n>>> referenced by ";
-  std::string Src = S.getSrcMsg(Sym, Off);
-  if (!Src.empty())
-    Msg += Src + "\n>>>               ";
-  return Msg + S.getObjMsg(Off);
+static std::string getLocation(InputSectionBase &s, const Symbol &sym,
+                               uint64_t off) {
+  std::string msg = "\n>>> defined in ";
+  if (sym.file)
+    msg += toString(sym.file);
+  else if (Optional<std::string> loc = getLinkerScriptLocation(sym))
+    msg += *loc;
+
+  msg += "\n>>> referenced by ";
+  std::string src = s.getSrcMsg(sym, off);
+  if (!src.empty())
+    msg += src + "\n>>>               ";
+  return msg + s.getObjMsg(off);
+}
+
+namespace {
+// Build a bitmask with one bit set for each RelExpr.
+//
+// Constexpr function arguments can't be used in static asserts, so we
+// use template arguments to build the mask.
+// But function template partial specializations don't exist (needed
+// for base case of the recursion), so we need a dummy struct.
+template <RelExpr... Exprs> struct RelExprMaskBuilder {
+  static inline uint64_t build() { return 0; }
+};
+
+// Specialization for recursive case.
+template <RelExpr Head, RelExpr... Tail>
+struct RelExprMaskBuilder<Head, Tail...> {
+  static inline uint64_t build() {
+    static_assert(0 <= Head && Head < 64,
+                  "RelExpr is too large for 64-bit mask!");
+    return (uint64_t(1) << Head) | RelExprMaskBuilder<Tail...>::build();
+  }
+};
+} // namespace
+
+// Return true if `Expr` is one of `Exprs`.
+// There are fewer than 64 RelExpr's, so we can represent any set of
+// RelExpr's as a constant bit mask and test for membership with a
+// couple cheap bitwise operations.
+template <RelExpr... Exprs> bool oneof(RelExpr expr) {
+  assert(0 <= expr && (int)expr < 64 &&
+         "RelExpr is too large for 64-bit mask!");
+  return (uint64_t(1) << expr) & RelExprMaskBuilder<Exprs...>::build();
 }
 
 // This function is similar to the `handleTlsRelocation`. MIPS does not
@@ -100,204 +131,173 @@ static std::string getLocation(InputSectionBase &S, const Symbol &Sym,
 // pollute other `handleTlsRelocation` by MIPS `ifs` statements.
 // Mips has a custom MipsGotSection that handles the writing of GOT entries
 // without dynamic relocations.
-static unsigned handleMipsTlsRelocation(RelType Type, Symbol &Sym,
-                                        InputSectionBase &C, uint64_t Offset,
-                                        int64_t Addend, RelExpr Expr) {
-  if (Expr == R_MIPS_TLSLD) {
-    In.MipsGot->addTlsIndex(*C.File);
-    C.Relocations.push_back({Expr, Type, Offset, Addend, &Sym});
+static unsigned handleMipsTlsRelocation(RelType type, Symbol &sym,
+                                        InputSectionBase &c, uint64_t offset,
+                                        int64_t addend, RelExpr expr) {
+  if (expr == R_MIPS_TLSLD) {
+    in.mipsGot->addTlsIndex(*c.file);
+    c.relocations.push_back({expr, type, offset, addend, &sym});
     return 1;
   }
-  if (Expr == R_MIPS_TLSGD) {
-    In.MipsGot->addDynTlsEntry(*C.File, Sym);
-    C.Relocations.push_back({Expr, Type, Offset, Addend, &Sym});
+  if (expr == R_MIPS_TLSGD) {
+    in.mipsGot->addDynTlsEntry(*c.file, sym);
+    c.relocations.push_back({expr, type, offset, addend, &sym});
     return 1;
   }
   return 0;
 }
 
-// This function is similar to the `handleMipsTlsRelocation`. ARM also does not
-// support any relaxations for TLS relocations. ARM is logically similar to Mips
-// in how it handles TLS, but Mips uses its own custom GOT which handles some
-// of the cases that ARM uses GOT relocations for.
+// Notes about General Dynamic and Local Dynamic TLS models below. They may
+// require the generation of a pair of GOT entries that have associated dynamic
+// relocations. The pair of GOT entries created are of the form GOT[e0] Module
+// Index (Used to find pointer to TLS block at run-time) GOT[e1] Offset of
+// symbol in TLS block.
 //
-// We look for TLS global dynamic and local dynamic relocations, these may
-// require the generation of a pair of GOT entries that have associated
-// dynamic relocations. When the results of the dynamic relocations can be
-// resolved at static link time we do so. This is necessary for static linking
-// as there will be no dynamic loader to resolve them at load-time.
-//
-// The pair of GOT entries created are of the form
-// GOT[e0] Module Index (Used to find pointer to TLS block at run-time)
-// GOT[e1] Offset of symbol in TLS block
-template <class ELFT>
-static unsigned handleARMTlsRelocation(RelType Type, Symbol &Sym,
-                                       InputSectionBase &C, uint64_t Offset,
-                                       int64_t Addend, RelExpr Expr) {
-  // The Dynamic TLS Module Index Relocation for a symbol defined in an
-  // executable is always 1. If the target Symbol is not preemptible then
-  // we know the offset into the TLS block at static link time.
-  bool NeedDynId = Sym.IsPreemptible || Config->Shared;
-  bool NeedDynOff = Sym.IsPreemptible;
-
-  auto AddTlsReloc = [&](uint64_t Off, RelType Type, Symbol *Dest, bool Dyn) {
-    if (Dyn)
-      In.RelaDyn->addReloc(Type, In.Got, Off, Dest);
-    else
-      In.Got->Relocations.push_back({R_ABS, Type, Off, 0, Dest});
-  };
-
-  // Local Dynamic is for access to module local TLS variables, while still
-  // being suitable for being dynamically loaded via dlopen.
-  // GOT[e0] is the module index, with a special value of 0 for the current
-  // module. GOT[e1] is unused. There only needs to be one module index entry.
-  if (Expr == R_TLSLD_PC && In.Got->addTlsIndex()) {
-    AddTlsReloc(In.Got->getTlsIndexOff(), Target->TlsModuleIndexRel,
-                NeedDynId ? nullptr : &Sym, NeedDynId);
-    C.Relocations.push_back({Expr, Type, Offset, Addend, &Sym});
-    return 1;
-  }
-
-  // Global Dynamic is the most general purpose access model. When we know
-  // the module index and offset of symbol in TLS block we can fill these in
-  // using static GOT relocations.
-  if (Expr == R_TLSGD_PC) {
-    if (In.Got->addDynTlsEntry(Sym)) {
-      uint64_t Off = In.Got->getGlobalDynOffset(Sym);
-      AddTlsReloc(Off, Target->TlsModuleIndexRel, &Sym, NeedDynId);
-      AddTlsReloc(Off + Config->Wordsize, Target->TlsOffsetRel, &Sym,
-                  NeedDynOff);
-    }
-    C.Relocations.push_back({Expr, Type, Offset, Addend, &Sym});
-    return 1;
-  }
-  return 0;
-}
-
 // Returns the number of relocations processed.
 template <class ELFT>
 static unsigned
-handleTlsRelocation(RelType Type, Symbol &Sym, InputSectionBase &C,
-                    typename ELFT::uint Offset, int64_t Addend, RelExpr Expr) {
-  if (!Sym.isTls())
+handleTlsRelocation(RelType type, Symbol &sym, InputSectionBase &c,
+                    typename ELFT::uint offset, int64_t addend, RelExpr expr) {
+  if (!sym.isTls())
     return 0;
 
-  if (Config->EMachine == EM_ARM)
-    return handleARMTlsRelocation<ELFT>(Type, Sym, C, Offset, Addend, Expr);
-  if (Config->EMachine == EM_MIPS)
-    return handleMipsTlsRelocation(Type, Sym, C, Offset, Addend, Expr);
+  if (config->emachine == EM_MIPS)
+    return handleMipsTlsRelocation(type, sym, c, offset, addend, expr);
 
-  if (isRelExprOneOf<R_TLSDESC, R_AARCH64_TLSDESC_PAGE, R_TLSDESC_CALL>(Expr) &&
-      Config->Shared) {
-    if (In.Got->addDynTlsEntry(Sym)) {
-      uint64_t Off = In.Got->getGlobalDynOffset(Sym);
-      In.RelaDyn->addReloc(
-          {Target->TlsDescRel, In.Got, Off, !Sym.IsPreemptible, &Sym, 0});
+  if (oneof<R_AARCH64_TLSDESC_PAGE, R_TLSDESC, R_TLSDESC_CALL, R_TLSDESC_PC>(
+          expr) &&
+      config->shared) {
+    if (in.got->addDynTlsEntry(sym)) {
+      uint64_t off = in.got->getGlobalDynOffset(sym);
+      mainPart->relaDyn->addReloc(
+          {target->tlsDescRel, in.got, off, !sym.isPreemptible, &sym, 0});
     }
-    if (Expr != R_TLSDESC_CALL)
-      C.Relocations.push_back({Expr, Type, Offset, Addend, &Sym});
+    if (expr != R_TLSDESC_CALL)
+      c.relocations.push_back({expr, type, offset, addend, &sym});
     return 1;
   }
 
-  if (isRelExprOneOf<R_TLSLD_GOT, R_TLSLD_GOT_FROM_END, R_TLSLD_PC,
-                     R_TLSLD_HINT>(Expr)) {
+  bool canRelax = config->emachine != EM_ARM && config->emachine != EM_RISCV;
+
+  // If we are producing an executable and the symbol is non-preemptable, it
+  // must be defined and the code sequence can be relaxed to use Local-Exec.
+  //
+  // ARM and RISC-V do not support any relaxations for TLS relocations, however,
+  // we can omit the DTPMOD dynamic relocations and resolve them at link time
+  // because them are always 1. This may be necessary for static linking as
+  // DTPMOD may not be expected at load time.
+  bool isLocalInExecutable = !sym.isPreemptible && !config->shared;
+
+  // Local Dynamic is for access to module local TLS variables, while still
+  // being suitable for being dynamically loaded via dlopen. GOT[e0] is the
+  // module index, with a special value of 0 for the current module. GOT[e1] is
+  // unused. There only needs to be one module index entry.
+  if (oneof<R_TLSLD_GOT, R_TLSLD_GOTPLT, R_TLSLD_PC, R_TLSLD_HINT>(
+          expr)) {
     // Local-Dynamic relocs can be relaxed to Local-Exec.
-    if (!Config->Shared) {
-      C.Relocations.push_back(
-          {Target->adjustRelaxExpr(Type, nullptr, R_RELAX_TLS_LD_TO_LE), Type,
-           Offset, Addend, &Sym});
-      return Target->TlsGdRelaxSkip;
+    if (canRelax && !config->shared) {
+      c.relocations.push_back(
+          {target->adjustRelaxExpr(type, nullptr, R_RELAX_TLS_LD_TO_LE), type,
+           offset, addend, &sym});
+      return target->getTlsGdRelaxSkip(type);
     }
-    if (Expr == R_TLSLD_HINT)
+    if (expr == R_TLSLD_HINT)
       return 1;
-    if (In.Got->addTlsIndex())
-      In.RelaDyn->addReloc(Target->TlsModuleIndexRel, In.Got,
-                           In.Got->getTlsIndexOff(), nullptr);
-    C.Relocations.push_back({Expr, Type, Offset, Addend, &Sym});
+    if (in.got->addTlsIndex()) {
+      if (isLocalInExecutable)
+        in.got->relocations.push_back(
+            {R_ADDEND, target->symbolicRel, in.got->getTlsIndexOff(), 1, &sym});
+      else
+        mainPart->relaDyn->addReloc(target->tlsModuleIndexRel, in.got,
+                                in.got->getTlsIndexOff(), nullptr);
+    }
+    c.relocations.push_back({expr, type, offset, addend, &sym});
     return 1;
   }
 
   // Local-Dynamic relocs can be relaxed to Local-Exec.
-  if (Expr == R_ABS && !Config->Shared) {
-    C.Relocations.push_back(
-        {Target->adjustRelaxExpr(Type, nullptr, R_RELAX_TLS_LD_TO_LE), Type,
-         Offset, Addend, &Sym});
+  if (expr == R_DTPREL && !config->shared) {
+    c.relocations.push_back(
+        {target->adjustRelaxExpr(type, nullptr, R_RELAX_TLS_LD_TO_LE), type,
+         offset, addend, &sym});
     return 1;
   }
 
   // Local-Dynamic sequence where offset of tls variable relative to dynamic
-  // thread pointer is stored in the got.
-  if (Expr == R_TLSLD_GOT_OFF) {
-    // Local-Dynamic relocs can be relaxed to local-exec
-    if (!Config->Shared) {
-      C.Relocations.push_back({R_RELAX_TLS_LD_TO_LE, Type, Offset, Addend, &Sym});
-      return 1;
+  // thread pointer is stored in the got. This cannot be relaxed to Local-Exec.
+  if (expr == R_TLSLD_GOT_OFF) {
+    if (!sym.isInGot()) {
+      in.got->addEntry(sym);
+      uint64_t off = sym.getGotOffset();
+      in.got->relocations.push_back(
+          {R_ABS, target->tlsOffsetRel, off, 0, &sym});
     }
-    if (!Sym.isInGot()) {
-      In.Got->addEntry(Sym);
-      uint64_t Off = Sym.getGotOffset();
-      In.Got->Relocations.push_back(
-          {R_ABS, Target->TlsOffsetRel, Off, 0, &Sym});
-    }
-    C.Relocations.push_back({Expr, Type, Offset, Addend, &Sym});
+    c.relocations.push_back({expr, type, offset, addend, &sym});
     return 1;
   }
 
-  if (isRelExprOneOf<R_TLSDESC, R_AARCH64_TLSDESC_PAGE, R_TLSDESC_CALL,
-                     R_TLSGD_GOT, R_TLSGD_GOT_FROM_END, R_TLSGD_PC>(Expr)) {
-    if (Config->Shared) {
-      if (In.Got->addDynTlsEntry(Sym)) {
-        uint64_t Off = In.Got->getGlobalDynOffset(Sym);
-        In.RelaDyn->addReloc(Target->TlsModuleIndexRel, In.Got, Off, &Sym);
+  if (oneof<R_AARCH64_TLSDESC_PAGE, R_TLSDESC, R_TLSDESC_CALL, R_TLSDESC_PC,
+            R_TLSGD_GOT, R_TLSGD_GOTPLT, R_TLSGD_PC>(expr)) {
+    if (!canRelax || config->shared) {
+      if (in.got->addDynTlsEntry(sym)) {
+        uint64_t off = in.got->getGlobalDynOffset(sym);
+
+        if (isLocalInExecutable)
+          // Write one to the GOT slot.
+          in.got->relocations.push_back(
+              {R_ADDEND, target->symbolicRel, off, 1, &sym});
+        else
+          mainPart->relaDyn->addReloc(target->tlsModuleIndexRel, in.got, off, &sym);
 
         // If the symbol is preemptible we need the dynamic linker to write
         // the offset too.
-        uint64_t OffsetOff = Off + Config->Wordsize;
-        if (Sym.IsPreemptible)
-          In.RelaDyn->addReloc(Target->TlsOffsetRel, In.Got, OffsetOff, &Sym);
+        uint64_t offsetOff = off + config->wordsize;
+        if (sym.isPreemptible)
+          mainPart->relaDyn->addReloc(target->tlsOffsetRel, in.got, offsetOff,
+                                  &sym);
         else
-          In.Got->Relocations.push_back(
-              {R_ABS, Target->TlsOffsetRel, OffsetOff, 0, &Sym});
+          in.got->relocations.push_back(
+              {R_ABS, target->tlsOffsetRel, offsetOff, 0, &sym});
       }
-      C.Relocations.push_back({Expr, Type, Offset, Addend, &Sym});
+      c.relocations.push_back({expr, type, offset, addend, &sym});
       return 1;
     }
 
     // Global-Dynamic relocs can be relaxed to Initial-Exec or Local-Exec
     // depending on the symbol being locally defined or not.
-    if (Sym.IsPreemptible) {
-      C.Relocations.push_back(
-          {Target->adjustRelaxExpr(Type, nullptr, R_RELAX_TLS_GD_TO_IE), Type,
-           Offset, Addend, &Sym});
-      if (!Sym.isInGot()) {
-        In.Got->addEntry(Sym);
-        In.RelaDyn->addReloc(Target->TlsGotRel, In.Got, Sym.getGotOffset(),
-                             &Sym);
+    if (sym.isPreemptible) {
+      c.relocations.push_back(
+          {target->adjustRelaxExpr(type, nullptr, R_RELAX_TLS_GD_TO_IE), type,
+           offset, addend, &sym});
+      if (!sym.isInGot()) {
+        in.got->addEntry(sym);
+        mainPart->relaDyn->addReloc(target->tlsGotRel, in.got, sym.getGotOffset(),
+                                &sym);
       }
     } else {
-      C.Relocations.push_back(
-          {Target->adjustRelaxExpr(Type, nullptr, R_RELAX_TLS_GD_TO_LE), Type,
-           Offset, Addend, &Sym});
+      c.relocations.push_back(
+          {target->adjustRelaxExpr(type, nullptr, R_RELAX_TLS_GD_TO_LE), type,
+           offset, addend, &sym});
     }
-    return Target->TlsGdRelaxSkip;
+    return target->getTlsGdRelaxSkip(type);
   }
 
   // Initial-Exec relocs can be relaxed to Local-Exec if the symbol is locally
   // defined.
-  if (isRelExprOneOf<R_GOT, R_GOT_FROM_END, R_GOT_PC, R_AARCH64_GOT_PAGE_PC,
-                     R_GOT_OFF, R_TLSIE_HINT>(Expr) &&
-      !Config->Shared && !Sym.IsPreemptible) {
-    C.Relocations.push_back({R_RELAX_TLS_IE_TO_LE, Type, Offset, Addend, &Sym});
+  if (oneof<R_GOT, R_GOTPLT, R_GOT_PC, R_AARCH64_GOT_PAGE_PC, R_GOT_OFF,
+            R_TLSIE_HINT>(expr) &&
+      canRelax && isLocalInExecutable) {
+    c.relocations.push_back({R_RELAX_TLS_IE_TO_LE, type, offset, addend, &sym});
     return 1;
   }
 
-  if (Expr == R_TLSIE_HINT)
+  if (expr == R_TLSIE_HINT)
     return 1;
   return 0;
 }
 
-static RelType getMipsPairType(RelType Type, bool IsLocal) {
-  switch (Type) {
+static RelType getMipsPairType(RelType type, bool isLocal) {
+  switch (type) {
   case R_MIPS_HI16:
     return R_MIPS_LO16;
   case R_MIPS_GOT16:
@@ -309,9 +309,9 @@ static RelType getMipsPairType(RelType Type, bool IsLocal) {
     // the high 16 bits of the symbol's value. A paired R_MIPS_LO16
     // relocations handle low 16 bits of the address. That allows
     // to allocate only one GOT entry for every 64 KBytes of local data.
-    return IsLocal ? R_MIPS_LO16 : R_MIPS_NONE;
+    return isLocal ? R_MIPS_LO16 : R_MIPS_NONE;
   case R_MICROMIPS_GOT16:
-    return IsLocal ? R_MICROMIPS_LO16 : R_MIPS_NONE;
+    return isLocal ? R_MICROMIPS_LO16 : R_MIPS_NONE;
   case R_MIPS_PCHI16:
     return R_MIPS_PCLO16;
   case R_MICROMIPS_HI16:
@@ -323,40 +323,38 @@ static RelType getMipsPairType(RelType Type, bool IsLocal) {
 
 // True if non-preemptable symbol always has the same value regardless of where
 // the DSO is loaded.
-static bool isAbsolute(const Symbol &Sym) {
-  if (Sym.isUndefWeak())
+static bool isAbsolute(const Symbol &sym) {
+  if (sym.isUndefWeak())
     return true;
-  if (const auto *DR = dyn_cast<Defined>(&Sym))
-    return DR->Section == nullptr; // Absolute symbol.
+  if (const auto *dr = dyn_cast<Defined>(&sym))
+    return dr->section == nullptr; // Absolute symbol.
   return false;
 }
 
-static bool isAbsoluteValue(const Symbol &Sym) {
-  return isAbsolute(Sym) || Sym.isTls();
+static bool isAbsoluteValue(const Symbol &sym) {
+  return isAbsolute(sym) || sym.isTls();
 }
 
 // Returns true if Expr refers a PLT entry.
-static bool needsPlt(RelExpr Expr) {
-  return isRelExprOneOf<R_PLT_PC, R_PPC_CALL_PLT, R_PLT, R_AARCH64_PLT_PAGE_PC,
-                        R_GOT_PLT, R_AARCH64_GOT_PAGE_PC_PLT>(Expr);
+static bool needsPlt(RelExpr expr) {
+  return oneof<R_PLT_PC, R_PPC32_PLTREL, R_PPC64_CALL_PLT, R_PLT>(expr);
 }
 
 // Returns true if Expr refers a GOT entry. Note that this function
 // returns false for TLS variables even though they need GOT, because
 // TLS variables uses GOT differently than the regular variables.
-static bool needsGot(RelExpr Expr) {
-  return isRelExprOneOf<R_GOT, R_GOT_OFF, R_HEXAGON_GOT, R_MIPS_GOT_LOCAL_PAGE,
-                        R_MIPS_GOT_OFF, R_MIPS_GOT_OFF32, R_AARCH64_GOT_PAGE_PC,
-                        R_AARCH64_GOT_PAGE_PC_PLT, R_GOT_PC, R_GOT_FROM_END,
-                        R_GOT_PLT>(Expr);
+static bool needsGot(RelExpr expr) {
+  return oneof<R_GOT, R_GOT_OFF, R_HEXAGON_GOT, R_MIPS_GOT_LOCAL_PAGE,
+               R_MIPS_GOT_OFF, R_MIPS_GOT_OFF32, R_AARCH64_GOT_PAGE_PC,
+               R_GOT_PC, R_GOTPLT>(expr);
 }
 
 // True if this expression is of the form Sym - X, where X is a position in the
 // file (PC, or GOT for example).
-static bool isRelExpr(RelExpr Expr) {
-  return isRelExprOneOf<R_PC, R_GOTREL, R_GOTREL_FROM_END, R_MIPS_GOTREL,
-                        R_PPC_CALL, R_PPC_CALL_PLT, R_AARCH64_PAGE_PC,
-                        R_AARCH64_PLT_PAGE_PC, R_RELAX_GOT_PC>(Expr);
+static bool isRelExpr(RelExpr expr) {
+  return oneof<R_PC, R_GOTREL, R_GOTPLTREL, R_MIPS_GOTREL, R_PPC64_CALL,
+               R_PPC64_RELAX_TOC, R_AARCH64_PAGE_PC, R_RELAX_GOT_PC,
+               R_RISCV_PC_INDIRECT>(expr);
 }
 
 // Returns true if a given relocation can be computed at link-time.
@@ -368,43 +366,43 @@ static bool isRelExpr(RelExpr Expr) {
 //
 // If this function returns false, that means we need to emit a
 // dynamic relocation so that the relocation will be fixed at load-time.
-static bool isStaticLinkTimeConstant(RelExpr E, RelType Type, const Symbol &Sym,
-                                     InputSectionBase &S, uint64_t RelOff) {
+static bool isStaticLinkTimeConstant(RelExpr e, RelType type, const Symbol &sym,
+                                     InputSectionBase &s, uint64_t relOff) {
   // These expressions always compute a constant
-  if (isRelExprOneOf<R_GOT_FROM_END, R_GOT_OFF, R_HEXAGON_GOT, R_TLSLD_GOT_OFF,
-                     R_MIPS_GOT_LOCAL_PAGE, R_MIPS_GOTREL, R_MIPS_GOT_OFF,
-                     R_MIPS_GOT_OFF32, R_MIPS_GOT_GP_PC, R_MIPS_TLSGD,
-                     R_AARCH64_GOT_PAGE_PC, R_AARCH64_GOT_PAGE_PC_PLT, R_GOT_PC,
-                     R_GOTONLY_PC, R_GOTONLY_PC_FROM_END, R_PLT_PC, R_TLSGD_GOT,
-                     R_TLSGD_GOT_FROM_END, R_TLSGD_PC, R_PPC_CALL_PLT,
-                     R_TLSDESC_CALL, R_AARCH64_TLSDESC_PAGE, R_HINT,
-                     R_TLSLD_HINT, R_TLSIE_HINT>(E))
+  if (oneof<R_DTPREL, R_GOTPLT, R_GOT_OFF, R_HEXAGON_GOT, R_TLSLD_GOT_OFF,
+            R_MIPS_GOT_LOCAL_PAGE, R_MIPS_GOTREL, R_MIPS_GOT_OFF,
+            R_MIPS_GOT_OFF32, R_MIPS_GOT_GP_PC, R_MIPS_TLSGD,
+            R_AARCH64_GOT_PAGE_PC, R_GOT_PC, R_GOTONLY_PC, R_GOTPLTONLY_PC,
+            R_PLT_PC, R_TLSGD_GOT, R_TLSGD_GOTPLT, R_TLSGD_PC, R_PPC32_PLTREL,
+            R_PPC64_CALL_PLT, R_PPC64_RELAX_TOC, R_RISCV_ADD, R_TLSDESC_CALL,
+            R_TLSDESC_PC, R_AARCH64_TLSDESC_PAGE, R_HINT, R_TLSLD_HINT,
+            R_TLSIE_HINT>(e))
     return true;
 
   // These never do, except if the entire file is position dependent or if
   // only the low bits are used.
-  if (E == R_GOT || E == R_GOT_PLT || E == R_PLT || E == R_TLSDESC)
-    return Target->usesOnlyLowPageBits(Type) || !Config->Pic;
+  if (e == R_GOT || e == R_PLT || e == R_TLSDESC)
+    return target->usesOnlyLowPageBits(type) || !config->isPic;
 
-  if (Sym.IsPreemptible)
+  if (sym.isPreemptible)
     return false;
-  if (!Config->Pic)
+  if (!config->isPic)
     return true;
 
   // The size of a non preemptible symbol is a constant.
-  if (E == R_SIZE)
+  if (e == R_SIZE)
     return true;
 
   // For the target and the relocation, we want to know if they are
   // absolute or relative.
-  bool AbsVal = isAbsoluteValue(Sym);
-  bool RelE = isRelExpr(E);
-  if (AbsVal && !RelE)
+  bool absVal = isAbsoluteValue(sym);
+  bool relE = isRelExpr(e);
+  if (absVal && !relE)
     return true;
-  if (!AbsVal && RelE)
+  if (!absVal && relE)
     return true;
-  if (!AbsVal && !RelE)
-    return Target->usesOnlyLowPageBits(Type);
+  if (!absVal && !relE)
+    return target->usesOnlyLowPageBits(type);
 
   // Relative relocation to an absolute value. This is normally unrepresentable,
   // but if the relocation refers to a weak undefined symbol, we allow it to
@@ -414,59 +412,60 @@ static bool isStaticLinkTimeConstant(RelExpr E, RelType Type, const Symbol &Sym,
   // Another special case is MIPS _gp_disp symbol which represents offset
   // between start of a function and '_gp' value and defined as absolute just
   // to simplify the code.
-  assert(AbsVal && RelE);
-  if (Sym.isUndefWeak())
+  assert(absVal && relE);
+  if (sym.isUndefWeak())
     return true;
 
-  error("relocation " + toString(Type) + " cannot refer to absolute symbol: " +
-        toString(Sym) + getLocation(S, Sym, RelOff));
+  // We set the final symbols values for linker script defined symbols later.
+  // They always can be computed as a link time constant.
+  if (sym.scriptDefined)
+      return true;
+
+  error("relocation " + toString(type) + " cannot refer to absolute symbol: " +
+        toString(sym) + getLocation(s, sym, relOff));
   return true;
 }
 
-static RelExpr toPlt(RelExpr Expr) {
-  switch (Expr) {
-  case R_PPC_CALL:
-    return R_PPC_CALL_PLT;
+static RelExpr toPlt(RelExpr expr) {
+  switch (expr) {
+  case R_PPC64_CALL:
+    return R_PPC64_CALL_PLT;
   case R_PC:
     return R_PLT_PC;
-  case R_AARCH64_PAGE_PC:
-    return R_AARCH64_PLT_PAGE_PC;
-  case R_AARCH64_GOT_PAGE_PC:
-    return R_AARCH64_GOT_PAGE_PC_PLT;
   case R_ABS:
     return R_PLT;
-  case R_GOT:
-    return R_GOT_PLT;
   default:
-    return Expr;
+    return expr;
   }
 }
 
-static RelExpr fromPlt(RelExpr Expr) {
+static RelExpr fromPlt(RelExpr expr) {
   // We decided not to use a plt. Optimize a reference to the plt to a
   // reference to the symbol itself.
-  switch (Expr) {
+  switch (expr) {
   case R_PLT_PC:
+  case R_PPC32_PLTREL:
     return R_PC;
-  case R_PPC_CALL_PLT:
-    return R_PPC_CALL;
+  case R_PPC64_CALL_PLT:
+    return R_PPC64_CALL;
   case R_PLT:
     return R_ABS;
   default:
-    return Expr;
+    return expr;
   }
 }
 
 // Returns true if a given shared symbol is in a read-only segment in a DSO.
-template <class ELFT> static bool isReadOnly(SharedSymbol &SS) {
-  typedef typename ELFT::Phdr Elf_Phdr;
+template <class ELFT> static bool isReadOnly(SharedSymbol &ss) {
+  using Elf_Phdr = typename ELFT::Phdr;
 
   // Determine if the symbol is read-only by scanning the DSO's program headers.
-  const SharedFile<ELFT> &File = SS.getFile<ELFT>();
-  for (const Elf_Phdr &Phdr : check(File.getObj().program_headers()))
-    if ((Phdr.p_type == ELF::PT_LOAD || Phdr.p_type == ELF::PT_GNU_RELRO) &&
-        !(Phdr.p_flags & ELF::PF_W) && SS.Value >= Phdr.p_vaddr &&
-        SS.Value < Phdr.p_vaddr + Phdr.p_memsz)
+  const SharedFile &file = ss.getFile();
+  for (const Elf_Phdr &phdr :
+       check(file.template getObj<ELFT>().program_headers()))
+    if ((phdr.p_type == ELF::PT_LOAD || phdr.p_type == ELF::PT_GNU_RELRO) &&
+        !(phdr.p_flags & ELF::PF_W) && ss.value >= phdr.p_vaddr &&
+        ss.value < phdr.p_vaddr + phdr.p_memsz)
       return true;
   return false;
 }
@@ -477,22 +476,22 @@ template <class ELFT> static bool isReadOnly(SharedSymbol &SS) {
 // them are copied by a copy relocation, all of them need to be copied.
 // Otherwise, they would refer to different places at runtime.
 template <class ELFT>
-static SmallSet<SharedSymbol *, 4> getSymbolsAt(SharedSymbol &SS) {
-  typedef typename ELFT::Sym Elf_Sym;
+static SmallSet<SharedSymbol *, 4> getSymbolsAt(SharedSymbol &ss) {
+  using Elf_Sym = typename ELFT::Sym;
 
-  SharedFile<ELFT> &File = SS.getFile<ELFT>();
+  SharedFile &file = ss.getFile();
 
-  SmallSet<SharedSymbol *, 4> Ret;
-  for (const Elf_Sym &S : File.getGlobalELFSyms()) {
-    if (S.st_shndx == SHN_UNDEF || S.st_shndx == SHN_ABS ||
-        S.getType() == STT_TLS || S.st_value != SS.Value)
+  SmallSet<SharedSymbol *, 4> ret;
+  for (const Elf_Sym &s : file.template getGlobalELFSyms<ELFT>()) {
+    if (s.st_shndx == SHN_UNDEF || s.st_shndx == SHN_ABS ||
+        s.getType() == STT_TLS || s.st_value != ss.value)
       continue;
-    StringRef Name = check(S.getName(File.getStringTable()));
-    Symbol *Sym = Symtab->find(Name);
-    if (auto *Alias = dyn_cast_or_null<SharedSymbol>(Sym))
-      Ret.insert(Alias);
+    StringRef name = check(s.getName(file.getStringTable()));
+    Symbol *sym = symtab->find(name);
+    if (auto *alias = dyn_cast_or_null<SharedSymbol>(sym))
+      ret.insert(alias);
   }
-  return Ret;
+  return ret;
 }
 
 // When a symbol is copy relocated or we create a canonical plt entry, it is
@@ -500,19 +499,21 @@ static SmallSet<SharedSymbol *, 4> getSymbolsAt(SharedSymbol &SS) {
 // in .bss and in the case of a canonical plt entry it is in .plt. This function
 // replaces the existing symbol with a Defined pointing to the appropriate
 // location.
-static void replaceWithDefined(Symbol &Sym, SectionBase *Sec, uint64_t Value,
-                               uint64_t Size) {
-  Symbol Old = Sym;
-  replaceSymbol<Defined>(&Sym, Sym.File, Sym.getName(), Sym.Binding,
-                         Sym.StOther, Sym.Type, Value, Size, Sec);
-  Sym.PltIndex = Old.PltIndex;
-  Sym.GotIndex = Old.GotIndex;
-  Sym.VerdefIndex = Old.VerdefIndex;
-  Sym.PPC64BranchltIndex = Old.PPC64BranchltIndex;
-  Sym.IsPreemptible = true;
-  Sym.ExportDynamic = true;
-  Sym.IsUsedInRegularObj = true;
-  Sym.Used = true;
+static void replaceWithDefined(Symbol &sym, SectionBase *sec, uint64_t value,
+                               uint64_t size) {
+  Symbol old = sym;
+
+  sym.replace(Defined{sym.file, sym.getName(), sym.binding, sym.stOther,
+                      sym.type, value, size, sec});
+
+  sym.pltIndex = old.pltIndex;
+  sym.gotIndex = old.gotIndex;
+  sym.verdefIndex = old.verdefIndex;
+  sym.ppc64BranchltIndex = old.ppc64BranchltIndex;
+  sym.isPreemptible = true;
+  sym.exportDynamic = true;
+  sym.isUsedInRegularObj = true;
+  sym.used = true;
 }
 
 // Reserve space in .bss or .bss.rel.ro for copy relocation.
@@ -557,29 +558,29 @@ static void replaceWithDefined(Symbol &Sym, SectionBase *Sec, uint64_t Value,
 // to the variable in .bss. This kind of issue is sometimes very hard to
 // debug. What's a solution? Instead of exporting a varaible V from a DSO,
 // define an accessor getV().
-template <class ELFT> static void addCopyRelSymbol(SharedSymbol &SS) {
+template <class ELFT> static void addCopyRelSymbol(SharedSymbol &ss) {
   // Copy relocation against zero-sized symbol doesn't make sense.
-  uint64_t SymSize = SS.getSize();
-  if (SymSize == 0 || SS.Alignment == 0)
-    fatal("cannot create a copy relocation for symbol " + toString(SS));
+  uint64_t symSize = ss.getSize();
+  if (symSize == 0 || ss.alignment == 0)
+    fatal("cannot create a copy relocation for symbol " + toString(ss));
 
   // See if this symbol is in a read-only segment. If so, preserve the symbol's
   // memory protection by reserving space in the .bss.rel.ro section.
-  bool IsReadOnly = isReadOnly<ELFT>(SS);
-  BssSection *Sec = make<BssSection>(IsReadOnly ? ".bss.rel.ro" : ".bss",
-                                     SymSize, SS.Alignment);
-  if (IsReadOnly)
-    In.BssRelRo->getParent()->addSection(Sec);
+  bool isRO = isReadOnly<ELFT>(ss);
+  BssSection *sec =
+      make<BssSection>(isRO ? ".bss.rel.ro" : ".bss", symSize, ss.alignment);
+  if (isRO)
+    in.bssRelRo->getParent()->addSection(sec);
   else
-    In.Bss->getParent()->addSection(Sec);
+    in.bss->getParent()->addSection(sec);
 
   // Look through the DSO's dynamic symbol table for aliases and create a
   // dynamic symbol for each one. This causes the copy relocation to correctly
   // interpose any aliases.
-  for (SharedSymbol *Sym : getSymbolsAt<ELFT>(SS))
-    replaceWithDefined(*Sym, Sec, 0, Sym->Size);
+  for (SharedSymbol *sym : getSymbolsAt<ELFT>(ss))
+    replaceWithDefined(*sym, sec, 0, sym->size);
 
-  In.RelaDyn->addReloc(Target->CopyRel, Sec, 0, &SS);
+  mainPart->relaDyn->addReloc(target->copyRel, sec, 0, &ss);
 }
 
 // MIPS has an odd notion of "paired" relocations to calculate addends.
@@ -587,34 +588,34 @@ template <class ELFT> static void addCopyRelSymbol(SharedSymbol &SS) {
 // R_MIPS_LO16 relocation after that, and an addend is calculated using
 // the two relocations.
 template <class ELFT, class RelTy>
-static int64_t computeMipsAddend(const RelTy &Rel, const RelTy *End,
-                                 InputSectionBase &Sec, RelExpr Expr,
-                                 bool IsLocal) {
-  if (Expr == R_MIPS_GOTREL && IsLocal)
-    return Sec.getFile<ELFT>()->MipsGp0;
+static int64_t computeMipsAddend(const RelTy &rel, const RelTy *end,
+                                 InputSectionBase &sec, RelExpr expr,
+                                 bool isLocal) {
+  if (expr == R_MIPS_GOTREL && isLocal)
+    return sec.getFile<ELFT>()->mipsGp0;
 
   // The ABI says that the paired relocation is used only for REL.
   // See p. 4-17 at ftp://www.linux-mips.org/pub/linux/mips/doc/ABI/mipsabi.pdf
   if (RelTy::IsRela)
     return 0;
 
-  RelType Type = Rel.getType(Config->IsMips64EL);
-  uint32_t PairTy = getMipsPairType(Type, IsLocal);
-  if (PairTy == R_MIPS_NONE)
+  RelType type = rel.getType(config->isMips64EL);
+  uint32_t pairTy = getMipsPairType(type, isLocal);
+  if (pairTy == R_MIPS_NONE)
     return 0;
 
-  const uint8_t *Buf = Sec.data().data();
-  uint32_t SymIndex = Rel.getSymbol(Config->IsMips64EL);
+  const uint8_t *buf = sec.data().data();
+  uint32_t symIndex = rel.getSymbol(config->isMips64EL);
 
   // To make things worse, paired relocations might not be contiguous in
   // the relocation table, so we need to do linear search. *sigh*
-  for (const RelTy *RI = &Rel; RI != End; ++RI)
-    if (RI->getType(Config->IsMips64EL) == PairTy &&
-        RI->getSymbol(Config->IsMips64EL) == SymIndex)
-      return Target->getImplicitAddend(Buf + RI->r_offset, PairTy);
+  for (const RelTy *ri = &rel; ri != end; ++ri)
+    if (ri->getType(config->isMips64EL) == pairTy &&
+        ri->getSymbol(config->isMips64EL) == symIndex)
+      return target->getImplicitAddend(buf + ri->r_offset, pairTy);
 
-  warn("can't find matching " + toString(PairTy) + " relocation for " +
-       toString(Type));
+  warn("can't find matching " + toString(pairTy) + " relocation for " +
+       toString(type));
   return 0;
 }
 
@@ -622,59 +623,174 @@ static int64_t computeMipsAddend(const RelTy &Rel, const RelTy *End,
 // is in a relocation itself. If it is REL, we need to read it from an
 // input section.
 template <class ELFT, class RelTy>
-static int64_t computeAddend(const RelTy &Rel, const RelTy *End,
-                             InputSectionBase &Sec, RelExpr Expr,
-                             bool IsLocal) {
-  int64_t Addend;
-  RelType Type = Rel.getType(Config->IsMips64EL);
+static int64_t computeAddend(const RelTy &rel, const RelTy *end,
+                             InputSectionBase &sec, RelExpr expr,
+                             bool isLocal) {
+  int64_t addend;
+  RelType type = rel.getType(config->isMips64EL);
 
   if (RelTy::IsRela) {
-    Addend = getAddend<ELFT>(Rel);
+    addend = getAddend<ELFT>(rel);
   } else {
-    const uint8_t *Buf = Sec.data().data();
-    Addend = Target->getImplicitAddend(Buf + Rel.r_offset, Type);
+    const uint8_t *buf = sec.data().data();
+    addend = target->getImplicitAddend(buf + rel.r_offset, type);
   }
 
-  if (Config->EMachine == EM_PPC64 && Config->Pic && Type == R_PPC64_TOC)
-    Addend += getPPC64TocBase();
-  if (Config->EMachine == EM_MIPS)
-    Addend += computeMipsAddend<ELFT>(Rel, End, Sec, Expr, IsLocal);
+  if (config->emachine == EM_PPC64 && config->isPic && type == R_PPC64_TOC)
+    addend += getPPC64TocBase();
+  if (config->emachine == EM_MIPS)
+    addend += computeMipsAddend<ELFT>(rel, end, sec, expr, isLocal);
 
-  return Addend;
+  return addend;
 }
 
-// Report an undefined symbol if necessary.
-// Returns true if this function printed out an error message.
-static bool maybeReportUndefined(Symbol &Sym, InputSectionBase &Sec,
-                                 uint64_t Offset) {
-  if (Sym.isLocal() || !Sym.isUndefined() || Sym.isWeak())
-    return false;
+// Custom error message if Sym is defined in a discarded section.
+template <class ELFT>
+static std::string maybeReportDiscarded(Undefined &sym) {
+  auto *file = dyn_cast_or_null<ObjFile<ELFT>>(sym.file);
+  if (!file || !sym.discardedSecIdx ||
+      file->getSections()[sym.discardedSecIdx] != &InputSection::discarded)
+    return "";
+  ArrayRef<Elf_Shdr_Impl<ELFT>> objSections =
+      CHECK(file->getObj().sections(), file);
 
-  bool CanBeExternal =
-      Sym.computeBinding() != STB_LOCAL && Sym.Visibility == STV_DEFAULT;
-  if (Config->UnresolvedSymbols == UnresolvedPolicy::Ignore && CanBeExternal)
-    return false;
+  std::string msg;
+  if (sym.type == ELF::STT_SECTION) {
+    msg = "relocation refers to a discarded section: ";
+    msg += CHECK(
+        file->getObj().getSectionName(&objSections[sym.discardedSecIdx]), file);
+  } else {
+    msg = "relocation refers to a symbol in a discarded section: " +
+          toString(sym);
+  }
+  msg += "\n>>> defined in " + toString(file);
+
+  Elf_Shdr_Impl<ELFT> elfSec = objSections[sym.discardedSecIdx - 1];
+  if (elfSec.sh_type != SHT_GROUP)
+    return msg;
+
+  // If the discarded section is a COMDAT.
+  StringRef signature = file->getShtGroupSignature(objSections, elfSec);
+  if (const InputFile *prevailing =
+          symtab->comdatGroups.lookup(CachedHashStringRef(signature)))
+    msg += "\n>>> section group signature: " + signature.str() +
+           "\n>>> prevailing definition is in " + toString(prevailing);
+  return msg;
+}
+
+// Undefined diagnostics are collected in a vector and emitted once all of
+// them are known, so that some postprocessing on the list of undefined symbols
+// can happen before lld emits diagnostics.
+struct UndefinedDiag {
+  Symbol *sym;
+  struct Loc {
+    InputSectionBase *sec;
+    uint64_t offset;
+  };
+  std::vector<Loc> locs;
+  bool isWarning;
+};
 
-  std::string Msg =
-      "undefined symbol: " + toString(Sym) + "\n>>> referenced by ";
+static std::vector<UndefinedDiag> undefs;
+
+template <class ELFT>
+static void reportUndefinedSymbol(const UndefinedDiag &undef) {
+  Symbol &sym = *undef.sym;
+
+  auto visibility = [&]() -> std::string {
+    switch (sym.visibility) {
+    case STV_INTERNAL:
+      return "internal ";
+    case STV_HIDDEN:
+      return "hidden ";
+    case STV_PROTECTED:
+      return "protected ";
+    default:
+      return "";
+    }
+  };
+
+  std::string msg = maybeReportDiscarded<ELFT>(cast<Undefined>(sym));
+  if (msg.empty())
+    msg = "undefined " + visibility() + "symbol: " + toString(sym);
+
+  const size_t maxUndefReferences = 10;
+  size_t i = 0;
+  for (UndefinedDiag::Loc l : undef.locs) {
+    if (i >= maxUndefReferences)
+      break;
+    InputSectionBase &sec = *l.sec;
+    uint64_t offset = l.offset;
+
+    msg += "\n>>> referenced by ";
+    std::string src = sec.getSrcMsg(sym, offset);
+    if (!src.empty())
+      msg += src + "\n>>>               ";
+    msg += sec.getObjMsg(offset);
+    i++;
+  }
 
-  std::string Src = Sec.getSrcMsg(Sym, Offset);
-  if (!Src.empty())
-    Msg += Src + "\n>>>               ";
-  Msg += Sec.getObjMsg(Offset);
+  if (i < undef.locs.size())
+    msg += ("\n>>> referenced " + Twine(undef.locs.size() - i) + " more times")
+               .str();
 
-  if (Sym.getName().startswith("_ZTV"))
-    Msg += "\nthe vtable symbol may be undefined because the class is missing "
+  if (sym.getName().startswith("_ZTV"))
+    msg += "\nthe vtable symbol may be undefined because the class is missing "
            "its key function (see https://lld.llvm.org/missingkeyfunction)";
 
-  if ((Config->UnresolvedSymbols == UnresolvedPolicy::Warn && CanBeExternal) ||
-      Config->NoinhibitExec) {
-    warn(Msg);
-    return false;
+  if (undef.isWarning)
+    warn(msg);
+  else
+    error(msg);
+}
+
+template <class ELFT> void elf::reportUndefinedSymbols() {
+  // Find the first "undefined symbol" diagnostic for each diagnostic, and
+  // collect all "referenced from" lines at the first diagnostic.
+  DenseMap<Symbol *, UndefinedDiag *> firstRef;
+  for (UndefinedDiag &undef : undefs) {
+    assert(undef.locs.size() == 1);
+    if (UndefinedDiag *canon = firstRef.lookup(undef.sym)) {
+      canon->locs.push_back(undef.locs[0]);
+      undef.locs.clear();
+    } else
+      firstRef[undef.sym] = &undef;
   }
 
-  error(Msg);
-  return true;
+  for (const UndefinedDiag &undef : undefs) {
+    if (!undef.locs.empty())
+      reportUndefinedSymbol<ELFT>(undef);
+  }
+  undefs.clear();
+}
+
+// Report an undefined symbol if necessary.
+// Returns true if the undefined symbol will produce an error message.
+template <class ELFT>
+static bool maybeReportUndefined(Symbol &sym, InputSectionBase &sec,
+                                 uint64_t offset) {
+  if (!sym.isUndefined() || sym.isWeak())
+    return false;
+
+  bool canBeExternal = !sym.isLocal() && sym.computeBinding() != STB_LOCAL &&
+                       sym.visibility == STV_DEFAULT;
+  if (config->unresolvedSymbols == UnresolvedPolicy::Ignore && canBeExternal)
+    return false;
+
+  // clang (as of 2019-06-12) / gcc (as of 8.2.1) PPC64 may emit a .rela.toc
+  // which references a switch table in a discarded .rodata/.text section. The
+  // .toc and the .rela.toc are incorrectly not placed in the comdat. The ELF
+  // spec says references from outside the group to a STB_LOCAL symbol are not
+  // allowed. Work around the bug.
+  if (config->emachine == EM_PPC64 &&
+      cast<Undefined>(sym).discardedSecIdx != 0 && sec.name == ".toc")
+    return false;
+
+  bool isWarning =
+      (config->unresolvedSymbols == UnresolvedPolicy::Warn && canBeExternal) ||
+      config->noinhibitExec;
+  undefs.push_back({&sym, {{&sec, offset}}, isWarning});
+  return !isWarning;
 }
 
 // MIPS N32 ABI treats series of successive relocations with the same offset
@@ -682,14 +798,14 @@ static bool maybeReportUndefined(Symbol &Sym, InputSectionBase &Sec,
 // packs all relocations into the single relocation record. Here we emulate
 // this for the N32 ABI. Iterate over relocation with the same offset and put
 // theirs types into the single bit-set.
-template <class RelTy> static RelType getMipsN32RelType(RelTy *&Rel, RelTy *End) {
-  RelType Type = 0;
-  uint64_t Offset = Rel->r_offset;
+template <class RelTy> static RelType getMipsN32RelType(RelTy *&rel, RelTy *end) {
+  RelType type = 0;
+  uint64_t offset = rel->r_offset;
 
-  int N = 0;
-  while (Rel != End && Rel->r_offset == Offset)
-    Type |= (Rel++)->getType(Config->IsMips64EL) << (8 * N++);
-  return Type;
+  int n = 0;
+  while (rel != end && rel->r_offset == offset)
+    type |= (rel++)->getType(config->isMips64EL) << (8 * n++);
+  return type;
 }
 
 // .eh_frame sections are mergeable input sections, so their input
@@ -706,77 +822,72 @@ template <class RelTy> static RelType getMipsN32RelType(RelTy *&Rel, RelTy *End)
 namespace {
 class OffsetGetter {
 public:
-  explicit OffsetGetter(InputSectionBase &Sec) {
-    if (auto *Eh = dyn_cast<EhInputSection>(&Sec))
-      Pieces = Eh->Pieces;
+  explicit OffsetGetter(InputSectionBase &sec) {
+    if (auto *eh = dyn_cast<EhInputSection>(&sec))
+      pieces = eh->pieces;
   }
 
   // Translates offsets in input sections to offsets in output sections.
   // Given offset must increase monotonically. We assume that Piece is
-  // sorted by InputOff.
-  uint64_t get(uint64_t Off) {
-    if (Pieces.empty())
-      return Off;
+  // sorted by inputOff.
+  uint64_t get(uint64_t off) {
+    if (pieces.empty())
+      return off;
 
-    while (I != Pieces.size() && Pieces[I].InputOff + Pieces[I].Size <= Off)
-      ++I;
-    if (I == Pieces.size())
+    while (i != pieces.size() && pieces[i].inputOff + pieces[i].size <= off)
+      ++i;
+    if (i == pieces.size())
       fatal(".eh_frame: relocation is not in any piece");
 
     // Pieces must be contiguous, so there must be no holes in between.
-    assert(Pieces[I].InputOff <= Off && "Relocation not in any piece");
+    assert(pieces[i].inputOff <= off && "Relocation not in any piece");
 
     // Offset -1 means that the piece is dead (i.e. garbage collected).
-    if (Pieces[I].OutputOff == -1)
+    if (pieces[i].outputOff == -1)
       return -1;
-    return Pieces[I].OutputOff + Off - Pieces[I].InputOff;
+    return pieces[i].outputOff + off - pieces[i].inputOff;
   }
 
 private:
-  ArrayRef<EhSectionPiece> Pieces;
-  size_t I = 0;
+  ArrayRef<EhSectionPiece> pieces;
+  size_t i = 0;
 };
 } // namespace
 
-static void addRelativeReloc(InputSectionBase *IS, uint64_t OffsetInSec,
-                             Symbol *Sym, int64_t Addend, RelExpr Expr,
-                             RelType Type) {
-  // Add a relative relocation. If RelrDyn section is enabled, and the
+static void addRelativeReloc(InputSectionBase *isec, uint64_t offsetInSec,
+                             Symbol *sym, int64_t addend, RelExpr expr,
+                             RelType type) {
+  Partition &part = isec->getPartition();
+
+  // Add a relative relocation. If relrDyn section is enabled, and the
   // relocation offset is guaranteed to be even, add the relocation to
-  // the RelrDyn section, otherwise add it to the RelaDyn section.
-  // RelrDyn sections don't support odd offsets. Also, RelrDyn sections
+  // the relrDyn section, otherwise add it to the relaDyn section.
+  // relrDyn sections don't support odd offsets. Also, relrDyn sections
   // don't store the addend values, so we must write it to the relocated
   // address.
-  if (In.RelrDyn && IS->Alignment >= 2 && OffsetInSec % 2 == 0) {
-    IS->Relocations.push_back({Expr, Type, OffsetInSec, Addend, Sym});
-    In.RelrDyn->Relocs.push_back({IS, OffsetInSec});
+  if (part.relrDyn && isec->alignment >= 2 && offsetInSec % 2 == 0) {
+    isec->relocations.push_back({expr, type, offsetInSec, addend, sym});
+    part.relrDyn->relocs.push_back({isec, offsetInSec});
     return;
   }
-  In.RelaDyn->addReloc(Target->RelativeRel, IS, OffsetInSec, Sym, Addend, Expr,
-                       Type);
+  part.relaDyn->addReloc(target->relativeRel, isec, offsetInSec, sym, addend,
+                         expr, type);
 }
 
 template <class ELFT, class GotPltSection>
-static void addPltEntry(PltSection *Plt, GotPltSection *GotPlt,
-                        RelocationBaseSection *Rel, RelType Type, Symbol &Sym) {
-  Plt->addEntry<ELFT>(Sym);
-  GotPlt->addEntry(Sym);
-  Rel->addReloc(
-      {Type, GotPlt, Sym.getGotPltOffset(), !Sym.IsPreemptible, &Sym, 0});
+static void addPltEntry(PltSection *plt, GotPltSection *gotPlt,
+                        RelocationBaseSection *rel, RelType type, Symbol &sym) {
+  plt->addEntry<ELFT>(sym);
+  gotPlt->addEntry(sym);
+  rel->addReloc(
+      {type, gotPlt, sym.getGotPltOffset(), !sym.isPreemptible, &sym, 0});
 }
 
-template <class ELFT> static void addGotEntry(Symbol &Sym) {
-  In.Got->addEntry(Sym);
+static void addGotEntry(Symbol &sym) {
+  in.got->addEntry(sym);
 
-  RelExpr Expr;
-  if (Sym.isTls())
-    Expr = R_TLS;
-  else if (Sym.isGnuIFunc())
-    Expr = R_PLT;
-  else
-    Expr = R_ABS;
-
-  uint64_t Off = Sym.getGotOffset();
+  RelExpr expr = sym.isTls() ? R_TLS : R_ABS;
+  uint64_t off = sym.getGotOffset();
 
   // If a GOT slot value can be calculated at link-time, which is now,
   // we can just fill that out.
@@ -785,42 +896,42 @@ template <class ELFT> static void addGotEntry(Symbol &Sym) {
   // add a static relocation to a Relocations vector so that
   // InputSection::relocate will do the work for us. We may be able
   // to just write a value now, but it is a TODO.)
-  bool IsLinkTimeConstant =
-      !Sym.IsPreemptible && (!Config->Pic || isAbsolute(Sym));
-  if (IsLinkTimeConstant) {
-    In.Got->Relocations.push_back({Expr, Target->GotRel, Off, 0, &Sym});
+  bool isLinkTimeConstant =
+      !sym.isPreemptible && (!config->isPic || isAbsolute(sym));
+  if (isLinkTimeConstant) {
+    in.got->relocations.push_back({expr, target->symbolicRel, off, 0, &sym});
     return;
   }
 
   // Otherwise, we emit a dynamic relocation to .rel[a].dyn so that
   // the GOT slot will be fixed at load-time.
-  if (!Sym.isTls() && !Sym.IsPreemptible && Config->Pic && !isAbsolute(Sym)) {
-    addRelativeReloc(In.Got, Off, &Sym, 0, R_ABS, Target->GotRel);
+  if (!sym.isTls() && !sym.isPreemptible && config->isPic && !isAbsolute(sym)) {
+    addRelativeReloc(in.got, off, &sym, 0, R_ABS, target->symbolicRel);
     return;
   }
-  In.RelaDyn->addReloc(Sym.isTls() ? Target->TlsGotRel : Target->GotRel, In.Got,
-                       Off, &Sym, 0, Sym.IsPreemptible ? R_ADDEND : R_ABS,
-                       Target->GotRel);
+  mainPart->relaDyn->addReloc(
+      sym.isTls() ? target->tlsGotRel : target->gotRel, in.got, off, &sym, 0,
+      sym.isPreemptible ? R_ADDEND : R_ABS, target->symbolicRel);
 }
 
 // Return true if we can define a symbol in the executable that
 // contains the value/function of a symbol defined in a shared
 // library.
-static bool canDefineSymbolInExecutable(Symbol &Sym) {
+static bool canDefineSymbolInExecutable(Symbol &sym) {
   // If the symbol has default visibility the symbol defined in the
   // executable will preempt it.
   // Note that we want the visibility of the shared symbol itself, not
   // the visibility of the symbol in the output file we are producing. That is
-  // why we use Sym.StOther.
-  if ((Sym.StOther & 0x3) == STV_DEFAULT)
+  // why we use Sym.stOther.
+  if ((sym.stOther & 0x3) == STV_DEFAULT)
     return true;
 
   // If we are allowed to break address equality of functions, defining
   // a plt entry will allow the program to call the function in the
   // .so, but the .so and the executable will no agree on the address
   // of the function. Similar logic for objects.
-  return ((Sym.isFunc() && Config->IgnoreFunctionAddressEquality) ||
-          (Sym.isObject() && Config->IgnoreDataAddressEquality));
+  return ((sym.isFunc() && config->ignoreFunctionAddressEquality) ||
+          (sym.isObject() && config->ignoreDataAddressEquality));
 }
 
 // The reason we have to do this early scan is as follows
@@ -837,23 +948,33 @@ static bool canDefineSymbolInExecutable(Symbol &Sym) {
 // complicates things for the dynamic linker and means we would have to reserve
 // space for the extra PT_LOAD even if we end up not using it.
 template <class ELFT, class RelTy>
-static void processRelocAux(InputSectionBase &Sec, RelExpr Expr, RelType Type,
-                            uint64_t Offset, Symbol &Sym, const RelTy &Rel,
-                            int64_t Addend) {
-  if (isStaticLinkTimeConstant(Expr, Type, Sym, Sec, Offset)) {
-    Sec.Relocations.push_back({Expr, Type, Offset, Addend, &Sym});
+static void processRelocAux(InputSectionBase &sec, RelExpr expr, RelType type,
+                            uint64_t offset, Symbol &sym, const RelTy &rel,
+                            int64_t addend) {
+  // If the relocation is known to be a link-time constant, we know no dynamic
+  // relocation will be created, pass the control to relocateAlloc() or
+  // relocateNonAlloc() to resolve it.
+  //
+  // The behavior of an undefined weak reference is implementation defined. If
+  // the relocation is to a weak undef, and we are producing an executable, let
+  // relocate{,Non}Alloc() resolve it.
+  if (isStaticLinkTimeConstant(expr, type, sym, sec, offset) ||
+      (!config->shared && sym.isUndefWeak())) {
+    sec.relocations.push_back({expr, type, offset, addend, &sym});
     return;
   }
-  bool CanWrite = (Sec.Flags & SHF_WRITE) || !Config->ZText;
-  if (CanWrite) {
-    // R_GOT refers to a position in the got, even if the symbol is preemptible.
-    bool IsPreemptibleValue = Sym.IsPreemptible && Expr != R_GOT;
 
-    if (!IsPreemptibleValue) {
-      addRelativeReloc(&Sec, Offset, &Sym, Addend, Expr, Type);
+  bool canWrite = (sec.flags & SHF_WRITE) || !config->zText;
+  if (canWrite) {
+    RelType rel = target->getDynRel(type);
+    if (expr == R_GOT || (rel == target->symbolicRel && !sym.isPreemptible)) {
+      addRelativeReloc(&sec, offset, &sym, addend, expr, type);
       return;
-    } else if (RelType Rel = Target->getDynRel(Type)) {
-      In.RelaDyn->addReloc(Rel, &Sec, Offset, &Sym, Addend, R_ADDEND, Type);
+    } else if (rel != 0) {
+      if (config->emachine == EM_MIPS && rel == target->symbolicRel)
+        rel = target->relativeRel;
+      sec.getPartition().relaDyn->addReloc(rel, &sec, offset, &sym, addend,
+                                           R_ADDEND, type);
 
       // MIPS ABI turns using of GOT and dynamic relocations inside out.
       // While regular ABI uses dynamic relocations to fill up GOT entries
@@ -870,62 +991,62 @@ static void processRelocAux(InputSectionBase &Sec, RelExpr Expr, RelType Type,
       // to the GOT entry and reads the GOT entry when it needs to perform
       // a dynamic relocation.
       // ftp://www.linux-mips.org/pub/linux/mips/doc/ABI/mipsabi.pdf p.4-19
-      if (Config->EMachine == EM_MIPS)
-        In.MipsGot->addEntry(*Sec.File, Sym, Addend, Expr);
+      if (config->emachine == EM_MIPS)
+        in.mipsGot->addEntry(*sec.file, sym, addend, expr);
       return;
     }
   }
 
-  // If the relocation is to a weak undef, and we are producing
-  // executable, give up on it and produce a non preemptible 0.
-  if (!Config->Shared && Sym.isUndefWeak()) {
-    Sec.Relocations.push_back({Expr, Type, Offset, Addend, &Sym});
-    return;
-  }
-
-  if (!CanWrite && (Config->Pic && !isRelExpr(Expr))) {
+  if (!canWrite && (config->isPic && !isRelExpr(expr))) {
     error(
-        "can't create dynamic relocation " + toString(Type) + " against " +
-        (Sym.getName().empty() ? "local symbol" : "symbol: " + toString(Sym)) +
+        "can't create dynamic relocation " + toString(type) + " against " +
+        (sym.getName().empty() ? "local symbol" : "symbol: " + toString(sym)) +
         " in readonly segment; recompile object files with -fPIC "
         "or pass '-Wl,-z,notext' to allow text relocations in the output" +
-        getLocation(Sec, Sym, Offset));
+        getLocation(sec, sym, offset));
     return;
   }
 
-  // Copy relocations are only possible if we are creating an executable.
-  if (Config->Shared) {
-    errorOrWarn("relocation " + toString(Type) +
-                " cannot be used against symbol " + toString(Sym) +
-                "; recompile with -fPIC" + getLocation(Sec, Sym, Offset));
+  // Copy relocations (for STT_OBJECT) and canonical PLT (for STT_FUNC) are only
+  // possible in an executable.
+  //
+  // Among R_ABS relocatoin types, symbolicRel has the same size as the word
+  // size. Others have fewer bits and may cause runtime overflow in -pie/-shared
+  // mode. Disallow them.
+  if (config->shared ||
+      (config->pie && expr == R_ABS && type != target->symbolicRel)) {
+    errorOrWarn(
+        "relocation " + toString(type) + " cannot be used against " +
+        (sym.getName().empty() ? "local symbol" : "symbol " + toString(sym)) +
+        "; recompile with -fPIC" + getLocation(sec, sym, offset));
     return;
   }
 
   // If the symbol is undefined we already reported any relevant errors.
-  if (Sym.isUndefined())
+  if (sym.isUndefined())
     return;
 
-  if (!canDefineSymbolInExecutable(Sym)) {
-    error("cannot preempt symbol: " + toString(Sym) +
-          getLocation(Sec, Sym, Offset));
+  if (!canDefineSymbolInExecutable(sym)) {
+    error("cannot preempt symbol: " + toString(sym) +
+          getLocation(sec, sym, offset));
     return;
   }
 
-  if (Sym.isObject()) {
+  if (sym.isObject()) {
     // Produce a copy relocation.
-    if (auto *SS = dyn_cast<SharedSymbol>(&Sym)) {
-      if (!Config->ZCopyreloc)
-        error("unresolvable relocation " + toString(Type) +
-              " against symbol '" + toString(*SS) +
+    if (auto *ss = dyn_cast<SharedSymbol>(&sym)) {
+      if (!config->zCopyreloc)
+        error("unresolvable relocation " + toString(type) +
+              " against symbol '" + toString(*ss) +
               "'; recompile with -fPIC or remove '-z nocopyreloc'" +
-              getLocation(Sec, Sym, Offset));
-      addCopyRelSymbol<ELFT>(*SS);
+              getLocation(sec, sym, offset));
+      addCopyRelSymbol<ELFT>(*ss);
     }
-    Sec.Relocations.push_back({Expr, Type, Offset, Addend, &Sym});
+    sec.relocations.push_back({expr, type, offset, addend, &sym});
     return;
   }
 
-  if (Sym.isFunc()) {
+  if (sym.isFunc()) {
     // This handles a non PIC program call to function in a shared library. In
     // an ideal world, we could just report an error saying the relocation can
     // overflow at runtime. In the real world with glibc, crt1.o has a
@@ -953,167 +1074,333 @@ static void processRelocAux(InputSectionBase &Sec, RelExpr Expr, RelType Type,
     //   compiled without -fPIE/-fPIC and doesn't maintain ebx.
     // * If a library definition gets preempted to the executable, it will have
     //   the wrong ebx value.
-    if (Config->Pie && Config->EMachine == EM_386)
-      errorOrWarn("symbol '" + toString(Sym) +
+    if (config->pie && config->emachine == EM_386)
+      errorOrWarn("symbol '" + toString(sym) +
                   "' cannot be preempted; recompile with -fPIE" +
-                  getLocation(Sec, Sym, Offset));
-    if (!Sym.isInPlt())
-      addPltEntry<ELFT>(In.Plt, In.GotPlt, In.RelaPlt, Target->PltRel, Sym);
-    if (!Sym.isDefined())
-      replaceWithDefined(Sym, In.Plt, getPltEntryOffset(Sym.PltIndex), 0);
-    Sym.NeedsPltAddr = true;
-    Sec.Relocations.push_back({Expr, Type, Offset, Addend, &Sym});
+                  getLocation(sec, sym, offset));
+    if (!sym.isInPlt())
+      addPltEntry<ELFT>(in.plt, in.gotPlt, in.relaPlt, target->pltRel, sym);
+    if (!sym.isDefined())
+      replaceWithDefined(
+          sym, in.plt,
+          target->pltHeaderSize + target->pltEntrySize * sym.pltIndex, 0);
+    sym.needsPltAddr = true;
+    sec.relocations.push_back({expr, type, offset, addend, &sym});
     return;
   }
 
-  errorOrWarn("symbol '" + toString(Sym) + "' has no type" +
-              getLocation(Sec, Sym, Offset));
+  errorOrWarn("symbol '" + toString(sym) + "' has no type" +
+              getLocation(sec, sym, offset));
 }
 
+struct IRelativeReloc {
+  RelType type;
+  InputSectionBase *sec;
+  uint64_t offset;
+  Symbol *sym;
+};
+
+static std::vector<IRelativeReloc> iRelativeRelocs;
+
 template <class ELFT, class RelTy>
-static void scanReloc(InputSectionBase &Sec, OffsetGetter &GetOffset, RelTy *&I,
-                      RelTy *End) {
-  const RelTy &Rel = *I;
-  Symbol &Sym = Sec.getFile<ELFT>()->getRelocTargetSym(Rel);
-  RelType Type;
+static void scanReloc(InputSectionBase &sec, OffsetGetter &getOffset, RelTy *&i,
+                      RelTy *end) {
+  const RelTy &rel = *i;
+  uint32_t symIndex = rel.getSymbol(config->isMips64EL);
+  Symbol &sym = sec.getFile<ELFT>()->getSymbol(symIndex);
+  RelType type;
 
   // Deal with MIPS oddity.
-  if (Config->MipsN32Abi) {
-    Type = getMipsN32RelType(I, End);
+  if (config->mipsN32Abi) {
+    type = getMipsN32RelType(i, end);
   } else {
-    Type = Rel.getType(Config->IsMips64EL);
-    ++I;
+    type = rel.getType(config->isMips64EL);
+    ++i;
   }
 
   // Get an offset in an output section this relocation is applied to.
-  uint64_t Offset = GetOffset.get(Rel.r_offset);
-  if (Offset == uint64_t(-1))
+  uint64_t offset = getOffset.get(rel.r_offset);
+  if (offset == uint64_t(-1))
     return;
 
-  // Skip if the target symbol is an erroneous undefined symbol.
-  if (maybeReportUndefined(Sym, Sec, Rel.r_offset))
+  // Error if the target symbol is undefined. Symbol index 0 may be used by
+  // marker relocations, e.g. R_*_NONE and R_ARM_V4BX. Don't error on them.
+  if (symIndex != 0 && maybeReportUndefined<ELFT>(sym, sec, rel.r_offset))
     return;
 
-  const uint8_t *RelocatedAddr = Sec.data().begin() + Rel.r_offset;
-  RelExpr Expr = Target->getRelExpr(Type, Sym, RelocatedAddr);
+  const uint8_t *relocatedAddr = sec.data().begin() + rel.r_offset;
+  RelExpr expr = target->getRelExpr(type, sym, relocatedAddr);
 
   // Ignore "hint" relocations because they are only markers for relaxation.
-  if (isRelExprOneOf<R_HINT, R_NONE>(Expr))
+  if (oneof<R_HINT, R_NONE>(expr))
     return;
 
-  // Strenghten or relax relocations.
-  //
-  // GNU ifunc symbols must be accessed via PLT because their addresses
-  // are determined by runtime.
-  //
-  // On the other hand, if we know that a PLT entry will be resolved within
-  // the same ELF module, we can skip PLT access and directly jump to the
-  // destination function. For example, if we are linking a main exectuable,
-  // all dynamic symbols that can be resolved within the executable will
-  // actually be resolved that way at runtime, because the main exectuable
-  // is always at the beginning of a search list. We can leverage that fact.
-  if (Sym.isGnuIFunc()) {
-    if (!Config->ZText && Config->WarnIfuncTextrel) {
-      warn("using ifunc symbols when text relocations are allowed may produce "
-           "a binary that will segfault, if the object file is linked with "
-           "old version of glibc (glibc 2.28 and earlier). If this applies to "
-           "you, consider recompiling the object files without -fPIC and "
-           "without -Wl,-z,notext option. Use -no-warn-ifunc-textrel to "
-           "turn off this warning." +
-           getLocation(Sec, Sym, Offset));
-    }
-    Expr = toPlt(Expr);
-  } else if (!Sym.IsPreemptible && Expr == R_GOT_PC && !isAbsoluteValue(Sym)) {
-    Expr = Target->adjustRelaxExpr(Type, RelocatedAddr, Expr);
-  } else if (!Sym.IsPreemptible) {
-    Expr = fromPlt(Expr);
+  // We can separate the small code model relocations into 2 categories:
+  // 1) Those that access the compiler generated .toc sections.
+  // 2) Those that access the linker allocated got entries.
+  // lld allocates got entries to symbols on demand. Since we don't try to sort
+  // the got entries in any way, we don't have to track which objects have
+  // got-based small code model relocs. The .toc sections get placed after the
+  // end of the linker allocated .got section and we do sort those so sections
+  // addressed with small code model relocations come first.
+  if (config->emachine == EM_PPC64 && isPPC64SmallCodeModelTocReloc(type))
+    sec.file->ppc64SmallCodeModelTocRelocs = true;
+
+  if (sym.isGnuIFunc() && !config->zText && config->warnIfuncTextrel) {
+    warn("using ifunc symbols when text relocations are allowed may produce "
+         "a binary that will segfault, if the object file is linked with "
+         "old version of glibc (glibc 2.28 and earlier). If this applies to "
+         "you, consider recompiling the object files without -fPIC and "
+         "without -Wl,-z,notext option. Use -no-warn-ifunc-textrel to "
+         "turn off this warning." +
+         getLocation(sec, sym, offset));
   }
 
-  // This relocation does not require got entry, but it is relative to got and
-  // needs it to be created. Here we request for that.
-  if (isRelExprOneOf<R_GOTONLY_PC, R_GOTONLY_PC_FROM_END, R_GOTREL,
-                     R_GOTREL_FROM_END, R_PPC_TOC>(Expr))
-    In.Got->HasGotOffRel = true;
-
   // Read an addend.
-  int64_t Addend = computeAddend<ELFT>(Rel, End, Sec, Expr, Sym.isLocal());
+  int64_t addend = computeAddend<ELFT>(rel, end, sec, expr, sym.isLocal());
+
+  // Relax relocations.
+  //
+  // If we know that a PLT entry will be resolved within the same ELF module, we
+  // can skip PLT access and directly jump to the destination function. For
+  // example, if we are linking a main exectuable, all dynamic symbols that can
+  // be resolved within the executable will actually be resolved that way at
+  // runtime, because the main exectuable is always at the beginning of a search
+  // list. We can leverage that fact.
+  if (!sym.isPreemptible && (!sym.isGnuIFunc() || config->zIfuncNoplt)) {
+    if (expr == R_GOT_PC && !isAbsoluteValue(sym)) {
+      expr = target->adjustRelaxExpr(type, relocatedAddr, expr);
+    } else {
+      // Addend of R_PPC_PLTREL24 is used to choose call stub type. It should be
+      // ignored if optimized to R_PC.
+      if (config->emachine == EM_PPC && expr == R_PPC32_PLTREL)
+        addend = 0;
+      expr = fromPlt(expr);
+    }
+  }
+
+  // If the relocation does not emit a GOT or GOTPLT entry but its computation
+  // uses their addresses, we need GOT or GOTPLT to be created.
+  //
+  // The 4 types that relative GOTPLT are all x86 and x86-64 specific.
+  if (oneof<R_GOTPLTONLY_PC, R_GOTPLTREL, R_GOTPLT, R_TLSGD_GOTPLT>(expr)) {
+    in.gotPlt->hasGotPltOffRel = true;
+  } else if (oneof<R_GOTONLY_PC, R_GOTREL, R_PPC64_TOCBASE, R_PPC64_RELAX_TOC>(
+                 expr)) {
+    in.got->hasGotOffRel = true;
+  }
 
   // Process some TLS relocations, including relaxing TLS relocations.
   // Note that this function does not handle all TLS relocations.
-  if (unsigned Processed =
-          handleTlsRelocation<ELFT>(Type, Sym, Sec, Offset, Addend, Expr)) {
-    I += (Processed - 1);
+  if (unsigned processed =
+          handleTlsRelocation<ELFT>(type, sym, sec, offset, addend, expr)) {
+    i += (processed - 1);
     return;
   }
 
-  // If a relocation needs PLT, we create PLT and GOTPLT slots for the symbol.
-  if (needsPlt(Expr) && !Sym.isInPlt()) {
-    if (Sym.isGnuIFunc() && !Sym.IsPreemptible)
-      addPltEntry<ELFT>(In.Iplt, In.IgotPlt, In.RelaIplt, Target->IRelativeRel,
-                        Sym);
-    else
-      addPltEntry<ELFT>(In.Plt, In.GotPlt, In.RelaPlt, Target->PltRel, Sym);
+  // We were asked not to generate PLT entries for ifuncs. Instead, pass the
+  // direct relocation on through.
+  if (sym.isGnuIFunc() && config->zIfuncNoplt) {
+    sym.exportDynamic = true;
+    mainPart->relaDyn->addReloc(type, &sec, offset, &sym, addend, R_ADDEND, type);
+    return;
   }
 
-  // Create a GOT slot if a relocation needs GOT.
-  if (needsGot(Expr)) {
-    if (Config->EMachine == EM_MIPS) {
-      // MIPS ABI has special rules to process GOT entries and doesn't
-      // require relocation entries for them. A special case is TLS
-      // relocations. In that case dynamic loader applies dynamic
-      // relocations to initialize TLS GOT entries.
-      // See "Global Offset Table" in Chapter 5 in the following document
-      // for detailed description:
-      // ftp://www.linux-mips.org/pub/linux/mips/doc/ABI/mipsabi.pdf
-      In.MipsGot->addEntry(*Sec.File, Sym, Addend, Expr);
-    } else if (!Sym.isInGot()) {
-      addGotEntry<ELFT>(Sym);
+  // Non-preemptible ifuncs require special handling. First, handle the usual
+  // case where the symbol isn't one of these.
+  if (!sym.isGnuIFunc() || sym.isPreemptible) {
+    // If a relocation needs PLT, we create PLT and GOTPLT slots for the symbol.
+    if (needsPlt(expr) && !sym.isInPlt())
+      addPltEntry<ELFT>(in.plt, in.gotPlt, in.relaPlt, target->pltRel, sym);
+
+    // Create a GOT slot if a relocation needs GOT.
+    if (needsGot(expr)) {
+      if (config->emachine == EM_MIPS) {
+        // MIPS ABI has special rules to process GOT entries and doesn't
+        // require relocation entries for them. A special case is TLS
+        // relocations. In that case dynamic loader applies dynamic
+        // relocations to initialize TLS GOT entries.
+        // See "Global Offset Table" in Chapter 5 in the following document
+        // for detailed description:
+        // ftp://www.linux-mips.org/pub/linux/mips/doc/ABI/mipsabi.pdf
+        in.mipsGot->addEntry(*sec.file, sym, addend, expr);
+      } else if (!sym.isInGot()) {
+        addGotEntry(sym);
+      }
+    }
+  } else {
+    // Handle a reference to a non-preemptible ifunc. These are special in a
+    // few ways:
+    //
+    // - Unlike most non-preemptible symbols, non-preemptible ifuncs do not have
+    //   a fixed value. But assuming that all references to the ifunc are
+    //   GOT-generating or PLT-generating, the handling of an ifunc is
+    //   relatively straightforward. We create a PLT entry in Iplt, which is
+    //   usually at the end of .plt, which makes an indirect call using a
+    //   matching GOT entry in igotPlt, which is usually at the end of .got.plt.
+    //   The GOT entry is relocated using an IRELATIVE relocation in relaIplt,
+    //   which is usually at the end of .rela.plt. Unlike most relocations in
+    //   .rela.plt, which may be evaluated lazily without -z now, dynamic
+    //   loaders evaluate IRELATIVE relocs eagerly, which means that for
+    //   IRELATIVE relocs only, GOT-generating relocations can point directly to
+    //   .got.plt without requiring a separate GOT entry.
+    //
+    // - Despite the fact that an ifunc does not have a fixed value, compilers
+    //   that are not passed -fPIC will assume that they do, and will emit
+    //   direct (non-GOT-generating, non-PLT-generating) relocations to the
+    //   symbol. This means that if a direct relocation to the symbol is
+    //   seen, the linker must set a value for the symbol, and this value must
+    //   be consistent no matter what type of reference is made to the symbol.
+    //   This can be done by creating a PLT entry for the symbol in the way
+    //   described above and making it canonical, that is, making all references
+    //   point to the PLT entry instead of the resolver. In lld we also store
+    //   the address of the PLT entry in the dynamic symbol table, which means
+    //   that the symbol will also have the same value in other modules.
+    //   Because the value loaded from the GOT needs to be consistent with
+    //   the value computed using a direct relocation, a non-preemptible ifunc
+    //   may end up with two GOT entries, one in .got.plt that points to the
+    //   address returned by the resolver and is used only by the PLT entry,
+    //   and another in .got that points to the PLT entry and is used by
+    //   GOT-generating relocations.
+    //
+    // - The fact that these symbols do not have a fixed value makes them an
+    //   exception to the general rule that a statically linked executable does
+    //   not require any form of dynamic relocation. To handle these relocations
+    //   correctly, the IRELATIVE relocations are stored in an array which a
+    //   statically linked executable's startup code must enumerate using the
+    //   linker-defined symbols __rela?_iplt_{start,end}.
+    //
+    // - An absolute relocation to a non-preemptible ifunc (such as a global
+    //   variable containing a pointer to the ifunc) needs to be relocated in
+    //   the exact same way as a GOT entry, so we can avoid needing to make the
+    //   PLT entry canonical by translating such relocations into IRELATIVE
+    //   relocations in the relaIplt.
+    if (!sym.isInPlt()) {
+      // Create PLT and GOTPLT slots for the symbol.
+      sym.isInIplt = true;
+
+      // Create a copy of the symbol to use as the target of the IRELATIVE
+      // relocation in the igotPlt. This is in case we make the PLT canonical
+      // later, which would overwrite the original symbol.
+      //
+      // FIXME: Creating a copy of the symbol here is a bit of a hack. All
+      // that's really needed to create the IRELATIVE is the section and value,
+      // so ideally we should just need to copy those.
+      auto *directSym = make<Defined>(cast<Defined>(sym));
+      addPltEntry<ELFT>(in.iplt, in.igotPlt, in.relaIplt, target->iRelativeRel,
+                        *directSym);
+      sym.pltIndex = directSym->pltIndex;
+    }
+    if (expr == R_ABS && addend == 0 && (sec.flags & SHF_WRITE)) {
+      // We might be able to represent this as an IRELATIVE. But we don't know
+      // yet whether some later relocation will make the symbol point to a
+      // canonical PLT, which would make this either a dynamic RELATIVE (PIC) or
+      // static (non-PIC) relocation. So we keep a record of the information
+      // required to process the relocation, and after scanRelocs() has been
+      // called on all relocations, the relocation is resolved by
+      // addIRelativeRelocs().
+      iRelativeRelocs.push_back({type, &sec, offset, &sym});
+      return;
+    }
+    if (needsGot(expr)) {
+      // Redirect GOT accesses to point to the Igot.
+      //
+      // This field is also used to keep track of whether we ever needed a GOT
+      // entry. If we did and we make the PLT canonical later, we'll need to
+      // create a GOT entry pointing to the PLT entry for Sym.
+      sym.gotInIgot = true;
+    } else if (!needsPlt(expr)) {
+      // Make the ifunc's PLT entry canonical by changing the value of its
+      // symbol to redirect all references to point to it.
+      unsigned entryOffset = sym.pltIndex * target->pltEntrySize;
+      if (config->zRetpolineplt)
+        entryOffset += target->pltHeaderSize;
+
+      auto &d = cast<Defined>(sym);
+      d.section = in.iplt;
+      d.value = entryOffset;
+      d.size = 0;
+      // It's important to set the symbol type here so that dynamic loaders
+      // don't try to call the PLT as if it were an ifunc resolver.
+      d.type = STT_FUNC;
+
+      if (sym.gotInIgot) {
+        // We previously encountered a GOT generating reference that we
+        // redirected to the Igot. Now that the PLT entry is canonical we must
+        // clear the redirection to the Igot and add a GOT entry. As we've
+        // changed the symbol type to STT_FUNC future GOT generating references
+        // will naturally use this GOT entry.
+        //
+        // We don't need to worry about creating a MIPS GOT here because ifuncs
+        // aren't a thing on MIPS.
+        sym.gotInIgot = false;
+        addGotEntry(sym);
+      }
     }
   }
 
-  processRelocAux<ELFT>(Sec, Expr, Type, Offset, Sym, Rel, Addend);
+  processRelocAux<ELFT>(sec, expr, type, offset, sym, rel, addend);
 }
 
 template <class ELFT, class RelTy>
-static void scanRelocs(InputSectionBase &Sec, ArrayRef<RelTy> Rels) {
-  OffsetGetter GetOffset(Sec);
+static void scanRelocs(InputSectionBase &sec, ArrayRef<RelTy> rels) {
+  OffsetGetter getOffset(sec);
 
   // Not all relocations end up in Sec.Relocations, but a lot do.
-  Sec.Relocations.reserve(Rels.size());
+  sec.relocations.reserve(rels.size());
 
-  for (auto I = Rels.begin(), End = Rels.end(); I != End;)
-    scanReloc<ELFT>(Sec, GetOffset, I, End);
+  for (auto i = rels.begin(), end = rels.end(); i != end;)
+    scanReloc<ELFT>(sec, getOffset, i, end);
 
-  // Sort relocations by offset to binary search for R_RISCV_PCREL_HI20
-  if (Config->EMachine == EM_RISCV)
-    std::stable_sort(Sec.Relocations.begin(), Sec.Relocations.end(),
-                     RelocationOffsetComparator{});
+  // Sort relocations by offset for more efficient searching for
+  // R_RISCV_PCREL_HI20 and R_PPC64_ADDR64.
+  if (config->emachine == EM_RISCV ||
+      (config->emachine == EM_PPC64 && sec.name == ".toc"))
+    llvm::stable_sort(sec.relocations,
+                      [](const Relocation &lhs, const Relocation &rhs) {
+                        return lhs.offset < rhs.offset;
+                      });
 }
 
-template <class ELFT> void elf::scanRelocations(InputSectionBase &S) {
-  if (S.AreRelocsRela)
-    scanRelocs<ELFT>(S, S.relas<ELFT>());
+template <class ELFT> void elf::scanRelocations(InputSectionBase &s) {
+  if (s.areRelocsRela)
+    scanRelocs<ELFT>(s, s.relas<ELFT>());
   else
-    scanRelocs<ELFT>(S, S.rels<ELFT>());
+    scanRelocs<ELFT>(s, s.rels<ELFT>());
 }
 
-static bool mergeCmp(const InputSection *A, const InputSection *B) {
+// Figure out which representation to use for any absolute relocs to
+// non-preemptible ifuncs that we visited during scanRelocs().
+void elf::addIRelativeRelocs() {
+  for (IRelativeReloc &r : iRelativeRelocs) {
+    if (r.sym->type == STT_GNU_IFUNC)
+      in.relaIplt->addReloc(
+          {target->iRelativeRel, r.sec, r.offset, true, r.sym, 0});
+    else if (config->isPic)
+      addRelativeReloc(r.sec, r.offset, r.sym, 0, R_ABS, r.type);
+    else
+      r.sec->relocations.push_back({R_ABS, r.type, r.offset, 0, r.sym});
+  }
+  iRelativeRelocs.clear();
+}
+
+static bool mergeCmp(const InputSection *a, const InputSection *b) {
   // std::merge requires a strict weak ordering.
-  if (A->OutSecOff < B->OutSecOff)
+  if (a->outSecOff < b->outSecOff)
     return true;
 
-  if (A->OutSecOff == B->OutSecOff) {
-    auto *TA = dyn_cast<ThunkSection>(A);
-    auto *TB = dyn_cast<ThunkSection>(B);
+  if (a->outSecOff == b->outSecOff) {
+    auto *ta = dyn_cast<ThunkSection>(a);
+    auto *tb = dyn_cast<ThunkSection>(b);
 
     // Check if Thunk is immediately before any specific Target
     // InputSection for example Mips LA25 Thunks.
-    if (TA && TA->getTargetInputSection() == B)
+    if (ta && ta->getTargetInputSection() == b)
       return true;
 
     // Place Thunk Sections without specific targets before
     // non-Thunk Sections.
-    if (TA && !TB && !TA->getTargetInputSection())
+    if (ta && !tb && !ta->getTargetInputSection())
       return true;
   }
 
@@ -1123,14 +1410,14 @@ static bool mergeCmp(const InputSection *A, const InputSection *B) {
 // Call Fn on every executable InputSection accessed via the linker script
 // InputSectionDescription::Sections.
 static void forEachInputSectionDescription(
-    ArrayRef<OutputSection *> OutputSections,
-    llvm::function_ref<void(OutputSection *, InputSectionDescription *)> Fn) {
-  for (OutputSection *OS : OutputSections) {
-    if (!(OS->Flags & SHF_ALLOC) || !(OS->Flags & SHF_EXECINSTR))
+    ArrayRef<OutputSection *> outputSections,
+    llvm::function_ref<void(OutputSection *, InputSectionDescription *)> fn) {
+  for (OutputSection *os : outputSections) {
+    if (!(os->flags & SHF_ALLOC) || !(os->flags & SHF_EXECINSTR))
       continue;
-    for (BaseCommand *BC : OS->SectionCommands)
-      if (auto *ISD = dyn_cast<InputSectionDescription>(BC))
-        Fn(OS, ISD);
+    for (BaseCommand *bc : os->sectionCommands)
+      if (auto *isd = dyn_cast<InputSectionDescription>(bc))
+        fn(os, isd);
   }
 }
 
@@ -1225,54 +1512,54 @@ static void forEachInputSectionDescription(
 // in the Sections vector, and recalculate the InputSection output section
 // offsets.
 // This may invalidate any output section offsets stored outside of InputSection
-void ThunkCreator::mergeThunks(ArrayRef<OutputSection *> OutputSections) {
+void ThunkCreator::mergeThunks(ArrayRef<OutputSection *> outputSections) {
   forEachInputSectionDescription(
-      OutputSections, [&](OutputSection *OS, InputSectionDescription *ISD) {
-        if (ISD->ThunkSections.empty())
+      outputSections, [&](OutputSection *os, InputSectionDescription *isd) {
+        if (isd->thunkSections.empty())
           return;
 
         // Remove any zero sized precreated Thunks.
-        llvm::erase_if(ISD->ThunkSections,
-                       [](const std::pair<ThunkSection *, uint32_t> &TS) {
-                         return TS.first->getSize() == 0;
+        llvm::erase_if(isd->thunkSections,
+                       [](const std::pair<ThunkSection *, uint32_t> &ts) {
+                         return ts.first->getSize() == 0;
                        });
 
         // ISD->ThunkSections contains all created ThunkSections, including
         // those inserted in previous passes. Extract the Thunks created this
-        // pass and order them in ascending OutSecOff.
-        std::vector<ThunkSection *> NewThunks;
-        for (const std::pair<ThunkSection *, uint32_t> TS : ISD->ThunkSections)
-          if (TS.second == Pass)
-            NewThunks.push_back(TS.first);
-        std::stable_sort(NewThunks.begin(), NewThunks.end(),
-                         [](const ThunkSection *A, const ThunkSection *B) {
-                           return A->OutSecOff < B->OutSecOff;
-                         });
+        // pass and order them in ascending outSecOff.
+        std::vector<ThunkSection *> newThunks;
+        for (const std::pair<ThunkSection *, uint32_t> ts : isd->thunkSections)
+          if (ts.second == pass)
+            newThunks.push_back(ts.first);
+        llvm::stable_sort(newThunks,
+                          [](const ThunkSection *a, const ThunkSection *b) {
+                            return a->outSecOff < b->outSecOff;
+                          });
 
-        // Merge sorted vectors of Thunks and InputSections by OutSecOff
-        std::vector<InputSection *> Tmp;
-        Tmp.reserve(ISD->Sections.size() + NewThunks.size());
+        // Merge sorted vectors of Thunks and InputSections by outSecOff
+        std::vector<InputSection *> tmp;
+        tmp.reserve(isd->sections.size() + newThunks.size());
 
-        std::merge(ISD->Sections.begin(), ISD->Sections.end(),
-                   NewThunks.begin(), NewThunks.end(), std::back_inserter(Tmp),
+        std::merge(isd->sections.begin(), isd->sections.end(),
+                   newThunks.begin(), newThunks.end(), std::back_inserter(tmp),
                    mergeCmp);
 
-        ISD->Sections = std::move(Tmp);
+        isd->sections = std::move(tmp);
       });
 }
 
 // Find or create a ThunkSection within the InputSectionDescription (ISD) that
 // is in range of Src. An ISD maps to a range of InputSections described by a
 // linker script section pattern such as { .text .text.* }.
-ThunkSection *ThunkCreator::getISDThunkSec(OutputSection *OS, InputSection *IS,
-                                           InputSectionDescription *ISD,
-                                           uint32_t Type, uint64_t Src) {
-  for (std::pair<ThunkSection *, uint32_t> TP : ISD->ThunkSections) {
-    ThunkSection *TS = TP.first;
-    uint64_t TSBase = OS->Addr + TS->OutSecOff;
-    uint64_t TSLimit = TSBase + TS->getSize();
-    if (Target->inBranchRange(Type, Src, (Src > TSLimit) ? TSBase : TSLimit))
-      return TS;
+ThunkSection *ThunkCreator::getISDThunkSec(OutputSection *os, InputSection *isec,
+                                           InputSectionDescription *isd,
+                                           uint32_t type, uint64_t src) {
+  for (std::pair<ThunkSection *, uint32_t> tp : isd->thunkSections) {
+    ThunkSection *ts = tp.first;
+    uint64_t tsBase = os->addr + ts->outSecOff;
+    uint64_t tsLimit = tsBase + ts->getSize();
+    if (target->inBranchRange(type, src, (src > tsLimit) ? tsBase : tsLimit))
+      return ts;
   }
 
   // No suitable ThunkSection exists. This can happen when there is a branch
@@ -1280,40 +1567,40 @@ ThunkSection *ThunkCreator::getISDThunkSec(OutputSection *OS, InputSection *IS,
   // many Thunks. Create a new ThunkSection as close to the InputSection as
   // possible. Error if InputSection is so large we cannot place ThunkSection
   // anywhere in Range.
-  uint64_t ThunkSecOff = IS->OutSecOff;
-  if (!Target->inBranchRange(Type, Src, OS->Addr + ThunkSecOff)) {
-    ThunkSecOff = IS->OutSecOff + IS->getSize();
-    if (!Target->inBranchRange(Type, Src, OS->Addr + ThunkSecOff))
+  uint64_t thunkSecOff = isec->outSecOff;
+  if (!target->inBranchRange(type, src, os->addr + thunkSecOff)) {
+    thunkSecOff = isec->outSecOff + isec->getSize();
+    if (!target->inBranchRange(type, src, os->addr + thunkSecOff))
       fatal("InputSection too large for range extension thunk " +
-            IS->getObjMsg(Src - (OS->Addr + IS->OutSecOff)));
+            isec->getObjMsg(src - (os->addr + isec->outSecOff)));
   }
-  return addThunkSection(OS, ISD, ThunkSecOff);
+  return addThunkSection(os, isd, thunkSecOff);
 }
 
 // Add a Thunk that needs to be placed in a ThunkSection that immediately
 // precedes its Target.
-ThunkSection *ThunkCreator::getISThunkSec(InputSection *IS) {
-  ThunkSection *TS = ThunkedSections.lookup(IS);
-  if (TS)
-    return TS;
+ThunkSection *ThunkCreator::getISThunkSec(InputSection *isec) {
+  ThunkSection *ts = thunkedSections.lookup(isec);
+  if (ts)
+    return ts;
 
   // Find InputSectionRange within Target Output Section (TOS) that the
   // InputSection (IS) that we need to precede is in.
-  OutputSection *TOS = IS->getParent();
-  for (BaseCommand *BC : TOS->SectionCommands) {
-    auto *ISD = dyn_cast<InputSectionDescription>(BC);
-    if (!ISD || ISD->Sections.empty())
+  OutputSection *tos = isec->getParent();
+  for (BaseCommand *bc : tos->sectionCommands) {
+    auto *isd = dyn_cast<InputSectionDescription>(bc);
+    if (!isd || isd->sections.empty())
       continue;
 
-    InputSection *First = ISD->Sections.front();
-    InputSection *Last = ISD->Sections.back();
+    InputSection *first = isd->sections.front();
+    InputSection *last = isd->sections.back();
 
-    if (IS->OutSecOff < First->OutSecOff || Last->OutSecOff < IS->OutSecOff)
+    if (isec->outSecOff < first->outSecOff || last->outSecOff < isec->outSecOff)
       continue;
 
-    TS = addThunkSection(TOS, ISD, IS->OutSecOff);
-    ThunkedSections[IS] = TS;
-    return TS;
+    ts = addThunkSection(tos, isd, isec->outSecOff);
+    thunkedSections[isec] = ts;
+    return ts;
   }
 
   return nullptr;
@@ -1336,82 +1623,93 @@ ThunkSection *ThunkCreator::getISThunkSec(InputSection *IS) {
 // distance from a thunk to its target will be sufficiently small to
 // allow for the creation of a short thunk.
 void ThunkCreator::createInitialThunkSections(
-    ArrayRef<OutputSection *> OutputSections) {
-  uint32_t ThunkSectionSpacing = Target->getThunkSectionSpacing();
+    ArrayRef<OutputSection *> outputSections) {
+  uint32_t thunkSectionSpacing = target->getThunkSectionSpacing();
 
   forEachInputSectionDescription(
-      OutputSections, [&](OutputSection *OS, InputSectionDescription *ISD) {
-        if (ISD->Sections.empty())
+      outputSections, [&](OutputSection *os, InputSectionDescription *isd) {
+        if (isd->sections.empty())
           return;
 
-        uint32_t ISDBegin = ISD->Sections.front()->OutSecOff;
-        uint32_t ISDEnd =
-            ISD->Sections.back()->OutSecOff + ISD->Sections.back()->getSize();
-        uint32_t LastThunkLowerBound = -1;
-        if (ISDEnd - ISDBegin > ThunkSectionSpacing * 2)
-          LastThunkLowerBound = ISDEnd - ThunkSectionSpacing;
+        uint32_t isdBegin = isd->sections.front()->outSecOff;
+        uint32_t isdEnd =
+            isd->sections.back()->outSecOff + isd->sections.back()->getSize();
+        uint32_t lastThunkLowerBound = -1;
+        if (isdEnd - isdBegin > thunkSectionSpacing * 2)
+          lastThunkLowerBound = isdEnd - thunkSectionSpacing;
 
-        uint32_t ISLimit;
-        uint32_t PrevISLimit = ISDBegin;
-        uint32_t ThunkUpperBound = ISDBegin + ThunkSectionSpacing;
+        uint32_t isecLimit;
+        uint32_t prevIsecLimit = isdBegin;
+        uint32_t thunkUpperBound = isdBegin + thunkSectionSpacing;
 
-        for (const InputSection *IS : ISD->Sections) {
-          ISLimit = IS->OutSecOff + IS->getSize();
-          if (ISLimit > ThunkUpperBound) {
-            addThunkSection(OS, ISD, PrevISLimit);
-            ThunkUpperBound = PrevISLimit + ThunkSectionSpacing;
+        for (const InputSection *isec : isd->sections) {
+          isecLimit = isec->outSecOff + isec->getSize();
+          if (isecLimit > thunkUpperBound) {
+            addThunkSection(os, isd, prevIsecLimit);
+            thunkUpperBound = prevIsecLimit + thunkSectionSpacing;
           }
-          if (ISLimit > LastThunkLowerBound)
+          if (isecLimit > lastThunkLowerBound)
             break;
-          PrevISLimit = ISLimit;
+          prevIsecLimit = isecLimit;
         }
-        addThunkSection(OS, ISD, ISLimit);
+        addThunkSection(os, isd, isecLimit);
       });
 }
 
-ThunkSection *ThunkCreator::addThunkSection(OutputSection *OS,
-                                            InputSectionDescription *ISD,
-                                            uint64_t Off) {
-  auto *TS = make<ThunkSection>(OS, Off);
-  ISD->ThunkSections.push_back({TS, Pass});
-  return TS;
+ThunkSection *ThunkCreator::addThunkSection(OutputSection *os,
+                                            InputSectionDescription *isd,
+                                            uint64_t off) {
+  auto *ts = make<ThunkSection>(os, off);
+  ts->partition = os->partition;
+  isd->thunkSections.push_back({ts, pass});
+  return ts;
 }
 
-std::pair<Thunk *, bool> ThunkCreator::getThunk(Symbol &Sym, RelType Type,
-                                                uint64_t Src) {
-  std::vector<Thunk *> *ThunkVec = nullptr;
+static bool isThunkSectionCompatible(InputSection *source,
+                                     SectionBase *target) {
+  // We can't reuse thunks in different loadable partitions because they might
+  // not be loaded. But partition 1 (the main partition) will always be loaded.
+  if (source->partition != target->partition)
+    return target->partition == 1;
+  return true;
+}
+
+std::pair<Thunk *, bool> ThunkCreator::getThunk(InputSection *isec,
+                                                Relocation &rel, uint64_t src) {
+  std::vector<Thunk *> *thunkVec = nullptr;
 
   // We use (section, offset) pair to find the thunk position if possible so
   // that we create only one thunk for aliased symbols or ICFed sections.
-  if (auto *D = dyn_cast<Defined>(&Sym))
-    if (!D->isInPlt() && D->Section)
-      ThunkVec = &ThunkedSymbolsBySection[{D->Section->Repl, D->Value}];
-  if (!ThunkVec)
-    ThunkVec = &ThunkedSymbols[&Sym];
+  if (auto *d = dyn_cast<Defined>(rel.sym))
+    if (!d->isInPlt() && d->section)
+      thunkVec = &thunkedSymbolsBySection[{d->section->repl, d->value}];
+  if (!thunkVec)
+    thunkVec = &thunkedSymbols[rel.sym];
 
   // Check existing Thunks for Sym to see if they can be reused
-  for (Thunk *T : *ThunkVec)
-    if (T->isCompatibleWith(Type) &&
-        Target->inBranchRange(Type, Src, T->getThunkTargetSym()->getVA()))
-      return std::make_pair(T, false);
+  for (Thunk *t : *thunkVec)
+    if (isThunkSectionCompatible(isec, t->getThunkTargetSym()->section) &&
+        t->isCompatibleWith(*isec, rel) &&
+        target->inBranchRange(rel.type, src, t->getThunkTargetSym()->getVA()))
+      return std::make_pair(t, false);
 
   // No existing compatible Thunk in range, create a new one
-  Thunk *T = addThunk(Type, Sym);
-  ThunkVec->push_back(T);
-  return std::make_pair(T, true);
+  Thunk *t = addThunk(*isec, rel);
+  thunkVec->push_back(t);
+  return std::make_pair(t, true);
 }
 
 // Return true if the relocation target is an in range Thunk.
 // Return false if the relocation is not to a Thunk. If the relocation target
 // was originally to a Thunk, but is no longer in range we revert the
 // relocation back to its original non-Thunk target.
-bool ThunkCreator::normalizeExistingThunk(Relocation &Rel, uint64_t Src) {
-  if (Thunk *T = Thunks.lookup(Rel.Sym)) {
-    if (Target->inBranchRange(Rel.Type, Src, Rel.Sym->getVA()))
+bool ThunkCreator::normalizeExistingThunk(Relocation &rel, uint64_t src) {
+  if (Thunk *t = thunks.lookup(rel.sym)) {
+    if (target->inBranchRange(rel.type, src, rel.sym->getVA()))
       return true;
-    Rel.Sym = &T->Destination;
-    if (Rel.Sym->isInPlt())
-      Rel.Expr = toPlt(Rel.Expr);
+    rel.sym = &t->destination;
+    if (rel.sym->isInPlt())
+      rel.expr = toPlt(rel.expr);
   }
   return false;
 }
@@ -1441,15 +1739,15 @@ bool ThunkCreator::normalizeExistingThunk(Relocation &Rel, uint64_t Src) {
 // made no changes. If the target requires range extension thunks, currently
 // ARM, then any future change in offset between caller and callee risks a
 // relocation out of range error.
-bool ThunkCreator::createThunks(ArrayRef<OutputSection *> OutputSections) {
-  bool AddressesChanged = false;
+bool ThunkCreator::createThunks(ArrayRef<OutputSection *> outputSections) {
+  bool addressesChanged = false;
 
-  if (Pass == 0 && Target->getThunkSectionSpacing())
-    createInitialThunkSections(OutputSections);
+  if (pass == 0 && target->getThunkSectionSpacing())
+    createInitialThunkSections(outputSections);
 
   // With Thunk Size much smaller than branch range we expect to
   // converge quickly; if we get to 10 something has gone wrong.
-  if (Pass == 10)
+  if (pass == 10)
     fatal("thunk creation not converged");
 
   // Create all the Thunks and insert them into synthetic ThunkSections. The
@@ -1458,55 +1756,64 @@ bool ThunkCreator::createThunks(ArrayRef<OutputSection *> OutputSections) {
   // ThunkSections as ThunkSections are not always inserted into the same
   // InputSectionDescription as the caller.
   forEachInputSectionDescription(
-      OutputSections, [&](OutputSection *OS, InputSectionDescription *ISD) {
-        for (InputSection *IS : ISD->Sections)
-          for (Relocation &Rel : IS->Relocations) {
-            uint64_t Src = IS->getVA(Rel.Offset);
+      outputSections, [&](OutputSection *os, InputSectionDescription *isd) {
+        for (InputSection *isec : isd->sections)
+          for (Relocation &rel : isec->relocations) {
+            uint64_t src = isec->getVA(rel.offset);
 
             // If we are a relocation to an existing Thunk, check if it is
             // still in range. If not then Rel will be altered to point to its
             // original target so another Thunk can be generated.
-            if (Pass > 0 && normalizeExistingThunk(Rel, Src))
+            if (pass > 0 && normalizeExistingThunk(rel, src))
               continue;
 
-            if (!Target->needsThunk(Rel.Expr, Rel.Type, IS->File, Src,
-                                    *Rel.Sym))
+            if (!target->needsThunk(rel.expr, rel.type, isec->file, src,
+                                    *rel.sym))
               continue;
 
-            Thunk *T;
-            bool IsNew;
-            std::tie(T, IsNew) = getThunk(*Rel.Sym, Rel.Type, Src);
+            Thunk *t;
+            bool isNew;
+            std::tie(t, isNew) = getThunk(isec, rel, src);
 
-            if (IsNew) {
+            if (isNew) {
               // Find or create a ThunkSection for the new Thunk
-              ThunkSection *TS;
-              if (auto *TIS = T->getTargetInputSection())
-                TS = getISThunkSec(TIS);
+              ThunkSection *ts;
+              if (auto *tis = t->getTargetInputSection())
+                ts = getISThunkSec(tis);
               else
-                TS = getISDThunkSec(OS, IS, ISD, Rel.Type, Src);
-              TS->addThunk(T);
-              Thunks[T->getThunkTargetSym()] = T;
+                ts = getISDThunkSec(os, isec, isd, rel.type, src);
+              ts->addThunk(t);
+              thunks[t->getThunkTargetSym()] = t;
             }
 
             // Redirect relocation to Thunk, we never go via the PLT to a Thunk
-            Rel.Sym = T->getThunkTargetSym();
-            Rel.Expr = fromPlt(Rel.Expr);
+            rel.sym = t->getThunkTargetSym();
+            rel.expr = fromPlt(rel.expr);
+
+            // The addend of R_PPC_PLTREL24 should be ignored after changing to
+            // R_PC.
+            if (config->emachine == EM_PPC && rel.type == R_PPC_PLTREL24)
+              rel.addend = 0;
           }
 
-        for (auto &P : ISD->ThunkSections)
-          AddressesChanged |= P.first->assignOffsets();
+        for (auto &p : isd->thunkSections)
+          addressesChanged |= p.first->assignOffsets();
       });
 
-  for (auto &P : ThunkedSections)
-    AddressesChanged |= P.second->assignOffsets();
+  for (auto &p : thunkedSections)
+    addressesChanged |= p.second->assignOffsets();
 
   // Merge all created synthetic ThunkSections back into OutputSection
-  mergeThunks(OutputSections);
-  ++Pass;
-  return AddressesChanged;
+  mergeThunks(outputSections);
+  ++pass;
+  return addressesChanged;
 }
 
 template void elf::scanRelocations<ELF32LE>(InputSectionBase &);
 template void elf::scanRelocations<ELF32BE>(InputSectionBase &);
 template void elf::scanRelocations<ELF64LE>(InputSectionBase &);
 template void elf::scanRelocations<ELF64BE>(InputSectionBase &);
+template void elf::reportUndefinedSymbols<ELF32LE>();
+template void elf::reportUndefinedSymbols<ELF32BE>();
+template void elf::reportUndefinedSymbols<ELF64LE>();
+template void elf::reportUndefinedSymbols<ELF64BE>();
diff --git a/deps/lld/ELF/Relocations.h b/deps/lld/ELF/Relocations.h
index d00e68bd36e6917a77fa591fb3e0d1bec409cf21..d74d7b9b458e8d1004f80626a9bbeed51a7ac077 100644
--- a/deps/lld/ELF/Relocations.h
+++ b/deps/lld/ELF/Relocations.h
@@ -1,9 +1,8 @@
 //===- Relocations.h -------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -24,137 +23,101 @@ class OutputSection;
 class SectionBase;
 
 // Represents a relocation type, such as R_X86_64_PC32 or R_ARM_THM_CALL.
-typedef uint32_t RelType;
+using RelType = uint32_t;
 
 // List of target-independent relocation types. Relocations read
 // from files are converted to these types so that the main code
 // doesn't have to know about architecture-specific details.
 enum RelExpr {
-  R_INVALID,
   R_ABS,
   R_ADDEND,
-  R_AARCH64_GOT_PAGE_PC,
-  // The expression is used for IFUNC support. Describes PC-relative
-  // address of the memory page of GOT entry. This entry is used for
-  // a redirection to IPLT.
-  R_AARCH64_GOT_PAGE_PC_PLT,
-  R_AARCH64_RELAX_TLS_GD_TO_IE_PAGE_PC,
-  R_AARCH64_PAGE_PC,
-  R_AARCH64_PLT_PAGE_PC,
-  R_AARCH64_TLSDESC_PAGE,
-  R_ARM_SBREL,
+  R_DTPREL,
   R_GOT,
-  // The expression is used for IFUNC support. Evaluates to GOT entry,
-  // containing redirection to the IPLT.
-  R_GOT_PLT,
-  R_GOTONLY_PC,
-  R_GOTONLY_PC_FROM_END,
-  R_GOTREL,
-  R_GOTREL_FROM_END,
-  R_GOT_FROM_END,
   R_GOT_OFF,
   R_GOT_PC,
-  R_HEXAGON_GOT,
+  R_GOTONLY_PC,
+  R_GOTPLTONLY_PC,
+  R_GOTPLT,
+  R_GOTPLTREL,
+  R_GOTREL,
   R_HINT,
-  R_MIPS_GOTREL,
-  R_MIPS_GOT_GP,
-  R_MIPS_GOT_GP_PC,
-  R_MIPS_GOT_LOCAL_PAGE,
-  R_MIPS_GOT_OFF,
-  R_MIPS_GOT_OFF32,
-  R_MIPS_TLSGD,
-  R_MIPS_TLSLD,
   R_NEG_TLS,
   R_NONE,
   R_PC,
   R_PLT,
   R_PLT_PC,
-  R_PPC_CALL,
-  R_PPC_CALL_PLT,
-  R_PPC_TOC,
   R_RELAX_GOT_PC,
   R_RELAX_GOT_PC_NOPIC,
   R_RELAX_TLS_GD_TO_IE,
   R_RELAX_TLS_GD_TO_IE_ABS,
-  R_RELAX_TLS_GD_TO_IE_END,
   R_RELAX_TLS_GD_TO_IE_GOT_OFF,
+  R_RELAX_TLS_GD_TO_IE_GOTPLT,
   R_RELAX_TLS_GD_TO_LE,
   R_RELAX_TLS_GD_TO_LE_NEG,
   R_RELAX_TLS_IE_TO_LE,
   R_RELAX_TLS_LD_TO_LE,
   R_RELAX_TLS_LD_TO_LE_ABS,
-  R_RISCV_PC_INDIRECT,
   R_SIZE,
   R_TLS,
   R_TLSDESC,
   R_TLSDESC_CALL,
+  R_TLSDESC_PC,
   R_TLSGD_GOT,
-  R_TLSGD_GOT_FROM_END,
+  R_TLSGD_GOTPLT,
   R_TLSGD_PC,
   R_TLSIE_HINT,
   R_TLSLD_GOT,
-  R_TLSLD_GOT_FROM_END,
+  R_TLSLD_GOTPLT,
   R_TLSLD_GOT_OFF,
   R_TLSLD_HINT,
   R_TLSLD_PC,
-};
-
-// Build a bitmask with one bit set for each RelExpr.
-//
-// Constexpr function arguments can't be used in static asserts, so we
-// use template arguments to build the mask.
-// But function template partial specializations don't exist (needed
-// for base case of the recursion), so we need a dummy struct.
-template <RelExpr... Exprs> struct RelExprMaskBuilder {
-  static inline uint64_t build() { return 0; }
-};
 
-// Specialization for recursive case.
-template <RelExpr Head, RelExpr... Tail>
-struct RelExprMaskBuilder<Head, Tail...> {
-  static inline uint64_t build() {
-    static_assert(0 <= Head && Head < 64,
-                  "RelExpr is too large for 64-bit mask!");
-    return (uint64_t(1) << Head) | RelExprMaskBuilder<Tail...>::build();
-  }
+  // The following is abstract relocation types used for only one target.
+  //
+  // Even though RelExpr is intended to be a target-neutral representation
+  // of a relocation type, there are some relocations whose semantics are
+  // unique to a target. Such relocation are marked with R_<TARGET_NAME>.
+  R_AARCH64_GOT_PAGE_PC,
+  R_AARCH64_PAGE_PC,
+  R_AARCH64_RELAX_TLS_GD_TO_IE_PAGE_PC,
+  R_AARCH64_TLSDESC_PAGE,
+  R_ARM_SBREL,
+  R_HEXAGON_GOT,
+  R_MIPS_GOTREL,
+  R_MIPS_GOT_GP,
+  R_MIPS_GOT_GP_PC,
+  R_MIPS_GOT_LOCAL_PAGE,
+  R_MIPS_GOT_OFF,
+  R_MIPS_GOT_OFF32,
+  R_MIPS_TLSGD,
+  R_MIPS_TLSLD,
+  R_PPC32_PLTREL,
+  R_PPC64_CALL,
+  R_PPC64_CALL_PLT,
+  R_PPC64_RELAX_TOC,
+  R_PPC64_TOCBASE,
+  R_RISCV_ADD,
+  R_RISCV_PC_INDIRECT,
 };
 
-// Return true if `Expr` is one of `Exprs`.
-// There are fewer than 64 RelExpr's, so we can represent any set of
-// RelExpr's as a constant bit mask and test for membership with a
-// couple cheap bitwise operations.
-template <RelExpr... Exprs> bool isRelExprOneOf(RelExpr Expr) {
-  assert(0 <= Expr && (int)Expr < 64 &&
-         "RelExpr is too large for 64-bit mask!");
-  return (uint64_t(1) << Expr) & RelExprMaskBuilder<Exprs...>::build();
-}
-
 // Architecture-neutral representation of relocation.
 struct Relocation {
-  RelExpr Expr;
-  RelType Type;
-  uint64_t Offset;
-  int64_t Addend;
-  Symbol *Sym;
-};
-
-struct RelocationOffsetComparator {
-  bool operator()(const Relocation &Lhs, const Relocation &Rhs) {
-    return Lhs.Offset < Rhs.Offset;
-  }
-
-  // For std::lower_bound, std::upper_bound, std::equal_range.
-  bool operator()(const Relocation &Rel, uint64_t Val) {
-    return Rel.Offset < Val;
-  }
-
-  bool operator()(uint64_t Val, const Relocation &Rel) {
-    return Val < Rel.Offset;
-  }
+  RelExpr expr;
+  RelType type;
+  uint64_t offset;
+  int64_t addend;
+  Symbol *sym;
 };
 
+// This function writes undefined symbol diagnostics to an internal buffer.
+// Call reportUndefinedSymbols() after calling scanRelocations() to emit
+// the diagnostics.
 template <class ELFT> void scanRelocations(InputSectionBase &);
 
+template <class ELFT> void reportUndefinedSymbols();
+
+void addIRelativeRelocs();
+
 class ThunkSection;
 class Thunk;
 struct InputSectionDescription;
@@ -162,56 +125,57 @@ struct InputSectionDescription;
 class ThunkCreator {
 public:
   // Return true if Thunks have been added to OutputSections
-  bool createThunks(ArrayRef<OutputSection *> OutputSections);
+  bool createThunks(ArrayRef<OutputSection *> outputSections);
 
   // The number of completed passes of createThunks this permits us
   // to do one time initialization on Pass 0 and put a limit on the
   // number of times it can be called to prevent infinite loops.
-  uint32_t Pass = 0;
+  uint32_t pass = 0;
 
 private:
-  void mergeThunks(ArrayRef<OutputSection *> OutputSections);
+  void mergeThunks(ArrayRef<OutputSection *> outputSections);
 
-  ThunkSection *getISDThunkSec(OutputSection *OS, InputSection *IS,
-                               InputSectionDescription *ISD, uint32_t Type,
-                               uint64_t Src);
+  ThunkSection *getISDThunkSec(OutputSection *os, InputSection *isec,
+                               InputSectionDescription *isd, uint32_t type,
+                               uint64_t src);
 
-  ThunkSection *getISThunkSec(InputSection *IS);
+  ThunkSection *getISThunkSec(InputSection *isec);
 
-  void createInitialThunkSections(ArrayRef<OutputSection *> OutputSections);
+  void createInitialThunkSections(ArrayRef<OutputSection *> outputSections);
 
-  std::pair<Thunk *, bool> getThunk(Symbol &Sym, RelType Type, uint64_t Src);
+  std::pair<Thunk *, bool> getThunk(InputSection *isec, Relocation &rel,
+                                    uint64_t src);
 
-  ThunkSection *addThunkSection(OutputSection *OS, InputSectionDescription *,
-                                uint64_t Off);
+  ThunkSection *addThunkSection(OutputSection *os, InputSectionDescription *,
+                                uint64_t off);
 
-  bool normalizeExistingThunk(Relocation &Rel, uint64_t Src);
+  bool normalizeExistingThunk(Relocation &rel, uint64_t src);
 
   // Record all the available Thunks for a Symbol
   llvm::DenseMap<std::pair<SectionBase *, uint64_t>, std::vector<Thunk *>>
-      ThunkedSymbolsBySection;
-  llvm::DenseMap<Symbol *, std::vector<Thunk *>> ThunkedSymbols;
+      thunkedSymbolsBySection;
+  llvm::DenseMap<Symbol *, std::vector<Thunk *>> thunkedSymbols;
 
   // Find a Thunk from the Thunks symbol definition, we can use this to find
   // the Thunk from a relocation to the Thunks symbol definition.
-  llvm::DenseMap<Symbol *, Thunk *> Thunks;
+  llvm::DenseMap<Symbol *, Thunk *> thunks;
 
   // Track InputSections that have an inline ThunkSection placed in front
   // an inline ThunkSection may have control fall through to the section below
   // so we need to make sure that there is only one of them.
   // The Mips LA25 Thunk is an example of an inline ThunkSection.
-  llvm::DenseMap<InputSection *, ThunkSection *> ThunkedSections;
+  llvm::DenseMap<InputSection *, ThunkSection *> thunkedSections;
 };
 
 // Return a int64_t to make sure we get the sign extension out of the way as
 // early as possible.
 template <class ELFT>
-static inline int64_t getAddend(const typename ELFT::Rel &Rel) {
+static inline int64_t getAddend(const typename ELFT::Rel &rel) {
   return 0;
 }
 template <class ELFT>
-static inline int64_t getAddend(const typename ELFT::Rela &Rel) {
-  return Rel.r_addend;
+static inline int64_t getAddend(const typename ELFT::Rela &rel) {
+  return rel.r_addend;
 }
 } // namespace elf
 } // namespace lld
diff --git a/deps/lld/ELF/ScriptLexer.cpp b/deps/lld/ELF/ScriptLexer.cpp
index 9a372c6d1c6f1debc2becaa29cb16b6726304f40..953a3df8a31c6a0fec8840eee2e55c50f27c14f8 100644
--- a/deps/lld/ELF/ScriptLexer.cpp
+++ b/deps/lld/ELF/ScriptLexer.cpp
@@ -1,9 +1,8 @@
 //===- ScriptLexer.cpp ----------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -42,166 +41,169 @@ using namespace lld::elf;
 
 // Returns a whole line containing the current token.
 StringRef ScriptLexer::getLine() {
-  StringRef S = getCurrentMB().getBuffer();
-  StringRef Tok = Tokens[Pos - 1];
+  StringRef s = getCurrentMB().getBuffer();
+  StringRef tok = tokens[pos - 1];
 
-  size_t Pos = S.rfind('\n', Tok.data() - S.data());
-  if (Pos != StringRef::npos)
-    S = S.substr(Pos + 1);
-  return S.substr(0, S.find_first_of("\r\n"));
+  size_t pos = s.rfind('\n', tok.data() - s.data());
+  if (pos != StringRef::npos)
+    s = s.substr(pos + 1);
+  return s.substr(0, s.find_first_of("\r\n"));
 }
 
 // Returns 1-based line number of the current token.
 size_t ScriptLexer::getLineNumber() {
-  StringRef S = getCurrentMB().getBuffer();
-  StringRef Tok = Tokens[Pos - 1];
-  return S.substr(0, Tok.data() - S.data()).count('\n') + 1;
+  StringRef s = getCurrentMB().getBuffer();
+  StringRef tok = tokens[pos - 1];
+  return s.substr(0, tok.data() - s.data()).count('\n') + 1;
 }
 
 // Returns 0-based column number of the current token.
 size_t ScriptLexer::getColumnNumber() {
-  StringRef Tok = Tokens[Pos - 1];
-  return Tok.data() - getLine().data();
+  StringRef tok = tokens[pos - 1];
+  return tok.data() - getLine().data();
 }
 
 std::string ScriptLexer::getCurrentLocation() {
-  std::string Filename = getCurrentMB().getBufferIdentifier();
-  return (Filename + ":" + Twine(getLineNumber())).str();
+  std::string filename = getCurrentMB().getBufferIdentifier();
+  return (filename + ":" + Twine(getLineNumber())).str();
 }
 
-ScriptLexer::ScriptLexer(MemoryBufferRef MB) { tokenize(MB); }
+ScriptLexer::ScriptLexer(MemoryBufferRef mb) { tokenize(mb); }
 
 // We don't want to record cascading errors. Keep only the first one.
-void ScriptLexer::setError(const Twine &Msg) {
+void ScriptLexer::setError(const Twine &msg) {
   if (errorCount())
     return;
 
-  std::string S = (getCurrentLocation() + ": " + Msg).str();
-  if (Pos)
-    S += "\n>>> " + getLine().str() + "\n>>> " +
+  std::string s = (getCurrentLocation() + ": " + msg).str();
+  if (pos)
+    s += "\n>>> " + getLine().str() + "\n>>> " +
          std::string(getColumnNumber(), ' ') + "^";
-  error(S);
+  error(s);
 }
 
 // Split S into linker script tokens.
-void ScriptLexer::tokenize(MemoryBufferRef MB) {
-  std::vector<StringRef> Vec;
-  MBs.push_back(MB);
-  StringRef S = MB.getBuffer();
-  StringRef Begin = S;
+void ScriptLexer::tokenize(MemoryBufferRef mb) {
+  std::vector<StringRef> vec;
+  mbs.push_back(mb);
+  StringRef s = mb.getBuffer();
+  StringRef begin = s;
 
   for (;;) {
-    S = skipSpace(S);
-    if (S.empty())
+    s = skipSpace(s);
+    if (s.empty())
       break;
 
     // Quoted token. Note that double-quote characters are parts of a token
     // because, in a glob match context, only unquoted tokens are interpreted
     // as glob patterns. Double-quoted tokens are literal patterns in that
     // context.
-    if (S.startswith("\"")) {
-      size_t E = S.find("\"", 1);
-      if (E == StringRef::npos) {
-        StringRef Filename = MB.getBufferIdentifier();
-        size_t Lineno = Begin.substr(0, S.data() - Begin.data()).count('\n');
-        error(Filename + ":" + Twine(Lineno + 1) + ": unclosed quote");
+    if (s.startswith("\"")) {
+      size_t e = s.find("\"", 1);
+      if (e == StringRef::npos) {
+        StringRef filename = mb.getBufferIdentifier();
+        size_t lineno = begin.substr(0, s.data() - begin.data()).count('\n');
+        error(filename + ":" + Twine(lineno + 1) + ": unclosed quote");
         return;
       }
 
-      Vec.push_back(S.take_front(E + 1));
-      S = S.substr(E + 1);
+      vec.push_back(s.take_front(e + 1));
+      s = s.substr(e + 1);
       continue;
     }
 
     // ">foo" is parsed to ">" and "foo", but ">>" is parsed to ">>".
     // "|", "||", "&" and "&&" are different operators.
-    if (S.startswith("<<") || S.startswith("<=") || S.startswith(">>") ||
-        S.startswith(">=") || S.startswith("||") || S.startswith("&&")) {
-      Vec.push_back(S.substr(0, 2));
-      S = S.substr(2);
+    if (s.startswith("<<") || s.startswith("<=") || s.startswith(">>") ||
+        s.startswith(">=") || s.startswith("||") || s.startswith("&&")) {
+      vec.push_back(s.substr(0, 2));
+      s = s.substr(2);
       continue;
     }
 
     // Unquoted token. This is more relaxed than tokens in C-like language,
     // so that you can write "file-name.cpp" as one bare token, for example.
-    size_t Pos = S.find_first_not_of(
+    size_t pos = s.find_first_not_of(
         "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
         "0123456789_.$/\\~=+[]*?-!^:");
 
     // A character that cannot start a word (which is usually a
     // punctuation) forms a single character token.
-    if (Pos == 0)
-      Pos = 1;
-    Vec.push_back(S.substr(0, Pos));
-    S = S.substr(Pos);
+    if (pos == 0)
+      pos = 1;
+    vec.push_back(s.substr(0, pos));
+    s = s.substr(pos);
   }
 
-  Tokens.insert(Tokens.begin() + Pos, Vec.begin(), Vec.end());
+  tokens.insert(tokens.begin() + pos, vec.begin(), vec.end());
 }
 
 // Skip leading whitespace characters or comments.
-StringRef ScriptLexer::skipSpace(StringRef S) {
+StringRef ScriptLexer::skipSpace(StringRef s) {
   for (;;) {
-    if (S.startswith("/*")) {
-      size_t E = S.find("*/", 2);
-      if (E == StringRef::npos) {
+    if (s.startswith("/*")) {
+      size_t e = s.find("*/", 2);
+      if (e == StringRef::npos) {
         error("unclosed comment in a linker script");
         return "";
       }
-      S = S.substr(E + 2);
+      s = s.substr(e + 2);
       continue;
     }
-    if (S.startswith("#")) {
-      size_t E = S.find('\n', 1);
-      if (E == StringRef::npos)
-        E = S.size() - 1;
-      S = S.substr(E + 1);
+    if (s.startswith("#")) {
+      size_t e = s.find('\n', 1);
+      if (e == StringRef::npos)
+        e = s.size() - 1;
+      s = s.substr(e + 1);
       continue;
     }
-    size_t Size = S.size();
-    S = S.ltrim();
-    if (S.size() == Size)
-      return S;
+    size_t size = s.size();
+    s = s.ltrim();
+    if (s.size() == size)
+      return s;
   }
 }
 
 // An erroneous token is handled as if it were the last token before EOF.
-bool ScriptLexer::atEOF() { return errorCount() || Tokens.size() == Pos; }
+bool ScriptLexer::atEOF() { return errorCount() || tokens.size() == pos; }
 
 // Split a given string as an expression.
 // This function returns "3", "*" and "5" for "3*5" for example.
-static std::vector<StringRef> tokenizeExpr(StringRef S) {
-  StringRef Ops = "+-*/:!~"; // List of operators
+static std::vector<StringRef> tokenizeExpr(StringRef s) {
+  StringRef ops = "+-*/:!~=<>"; // List of operators
 
   // Quoted strings are literal strings, so we don't want to split it.
-  if (S.startswith("\""))
-    return {S};
+  if (s.startswith("\""))
+    return {s};
 
   // Split S with operators as separators.
-  std::vector<StringRef> Ret;
-  while (!S.empty()) {
-    size_t E = S.find_first_of(Ops);
+  std::vector<StringRef> ret;
+  while (!s.empty()) {
+    size_t e = s.find_first_of(ops);
 
     // No need to split if there is no operator.
-    if (E == StringRef::npos) {
-      Ret.push_back(S);
+    if (e == StringRef::npos) {
+      ret.push_back(s);
       break;
     }
 
     // Get a token before the opreator.
-    if (E != 0)
-      Ret.push_back(S.substr(0, E));
+    if (e != 0)
+      ret.push_back(s.substr(0, e));
 
-    // Get the operator as a token. Keep != as one token.
-    if (S.substr(E).startswith("!=")) {
-      Ret.push_back(S.substr(E, 2));
-      S = S.substr(E + 2);
+    // Get the operator as a token.
+    // Keep !=, ==, >=, <=, << and >> operators as a single tokens.
+    if (s.substr(e).startswith("!=") || s.substr(e).startswith("==") ||
+        s.substr(e).startswith(">=") || s.substr(e).startswith("<=") ||
+        s.substr(e).startswith("<<") || s.substr(e).startswith(">>")) {
+      ret.push_back(s.substr(e, 2));
+      s = s.substr(e + 2);
     } else {
-      Ret.push_back(S.substr(E, 1));
-      S = S.substr(E + 1);
+      ret.push_back(s.substr(e, 1));
+      s = s.substr(e + 1);
     }
   }
-  return Ret;
+  return ret;
 }
 
 // In contexts where expressions are expected, the lexer should apply
@@ -214,14 +216,14 @@ static std::vector<StringRef> tokenizeExpr(StringRef S) {
 //
 // This function may split the current token into multiple tokens.
 void ScriptLexer::maybeSplitExpr() {
-  if (!InExpr || errorCount() || atEOF())
+  if (!inExpr || errorCount() || atEOF())
     return;
 
-  std::vector<StringRef> V = tokenizeExpr(Tokens[Pos]);
-  if (V.size() == 1)
+  std::vector<StringRef> v = tokenizeExpr(tokens[pos]);
+  if (v.size() == 1)
     return;
-  Tokens.erase(Tokens.begin() + Pos);
-  Tokens.insert(Tokens.begin() + Pos, V.begin(), V.end());
+  tokens.erase(tokens.begin() + pos);
+  tokens.insert(tokens.begin() + pos, v.begin(), v.end());
 }
 
 StringRef ScriptLexer::next() {
@@ -233,28 +235,28 @@ StringRef ScriptLexer::next() {
     setError("unexpected EOF");
     return "";
   }
-  return Tokens[Pos++];
+  return tokens[pos++];
 }
 
 StringRef ScriptLexer::peek() {
-  StringRef Tok = next();
+  StringRef tok = next();
   if (errorCount())
     return "";
-  Pos = Pos - 1;
-  return Tok;
+  pos = pos - 1;
+  return tok;
 }
 
 StringRef ScriptLexer::peek2() {
   skip();
-  StringRef Tok = next();
+  StringRef tok = next();
   if (errorCount())
     return "";
-  Pos = Pos - 2;
-  return Tok;
+  pos = pos - 2;
+  return tok;
 }
 
-bool ScriptLexer::consume(StringRef Tok) {
-  if (peek() == Tok) {
+bool ScriptLexer::consume(StringRef tok) {
+  if (peek() == tok) {
     skip();
     return true;
   }
@@ -262,12 +264,12 @@ bool ScriptLexer::consume(StringRef Tok) {
 }
 
 // Consumes Tok followed by ":". Space is allowed between Tok and ":".
-bool ScriptLexer::consumeLabel(StringRef Tok) {
-  if (consume((Tok + ":").str()))
+bool ScriptLexer::consumeLabel(StringRef tok) {
+  if (consume((tok + ":").str()))
     return true;
-  if (Tokens.size() >= Pos + 2 && Tokens[Pos] == Tok &&
-      Tokens[Pos + 1] == ":") {
-    Pos += 2;
+  if (tokens.size() >= pos + 2 && tokens[pos] == tok &&
+      tokens[pos + 1] == ":") {
+    pos += 2;
     return true;
   }
   return false;
@@ -275,24 +277,24 @@ bool ScriptLexer::consumeLabel(StringRef Tok) {
 
 void ScriptLexer::skip() { (void)next(); }
 
-void ScriptLexer::expect(StringRef Expect) {
+void ScriptLexer::expect(StringRef expect) {
   if (errorCount())
     return;
-  StringRef Tok = next();
-  if (Tok != Expect)
-    setError(Expect + " expected, but got " + Tok);
+  StringRef tok = next();
+  if (tok != expect)
+    setError(expect + " expected, but got " + tok);
 }
 
 // Returns true if S encloses T.
-static bool encloses(StringRef S, StringRef T) {
-  return S.bytes_begin() <= T.bytes_begin() && T.bytes_end() <= S.bytes_end();
+static bool encloses(StringRef s, StringRef t) {
+  return s.bytes_begin() <= t.bytes_begin() && t.bytes_end() <= s.bytes_end();
 }
 
 MemoryBufferRef ScriptLexer::getCurrentMB() {
   // Find input buffer containing the current token.
-  assert(!MBs.empty() && Pos > 0);
-  for (MemoryBufferRef MB : MBs)
-    if (encloses(MB.getBuffer(), Tokens[Pos - 1]))
-      return MB;
+  assert(!mbs.empty() && pos > 0);
+  for (MemoryBufferRef mb : mbs)
+    if (encloses(mb.getBuffer(), tokens[pos - 1]))
+      return mb;
   llvm_unreachable("getCurrentMB: failed to find a token");
 }
diff --git a/deps/lld/ELF/ScriptLexer.h b/deps/lld/ELF/ScriptLexer.h
index fc6b5b1008a72ddda363072e6f6c7581aba9bbf0..98e4cac95a73ebbde325c283b411732c09cbef8f 100644
--- a/deps/lld/ELF/ScriptLexer.h
+++ b/deps/lld/ELF/ScriptLexer.h
@@ -1,9 +1,8 @@
 //===- ScriptLexer.h --------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -21,25 +20,25 @@ namespace elf {
 
 class ScriptLexer {
 public:
-  explicit ScriptLexer(MemoryBufferRef MB);
+  explicit ScriptLexer(MemoryBufferRef mb);
 
-  void setError(const Twine &Msg);
-  void tokenize(MemoryBufferRef MB);
-  static StringRef skipSpace(StringRef S);
+  void setError(const Twine &msg);
+  void tokenize(MemoryBufferRef mb);
+  static StringRef skipSpace(StringRef s);
   bool atEOF();
   StringRef next();
   StringRef peek();
   StringRef peek2();
   void skip();
-  bool consume(StringRef Tok);
-  void expect(StringRef Expect);
-  bool consumeLabel(StringRef Tok);
+  bool consume(StringRef tok);
+  void expect(StringRef expect);
+  bool consumeLabel(StringRef tok);
   std::string getCurrentLocation();
 
-  std::vector<MemoryBufferRef> MBs;
-  std::vector<StringRef> Tokens;
-  bool InExpr = false;
-  size_t Pos = 0;
+  std::vector<MemoryBufferRef> mbs;
+  std::vector<StringRef> tokens;
+  bool inExpr = false;
+  size_t pos = 0;
 
 private:
   void maybeSplitExpr();
diff --git a/deps/lld/ELF/ScriptParser.cpp b/deps/lld/ELF/ScriptParser.cpp
index 7dbe1641622b6ff0f0c402f49a8b7b1c5e75c6ef..8f0aa660145a4ebe8beeded1e18dc39246e6f88c 100644
--- a/deps/lld/ELF/ScriptParser.cpp
+++ b/deps/lld/ELF/ScriptParser.cpp
@@ -1,9 +1,8 @@
 //===- ScriptParser.cpp ---------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -41,22 +40,29 @@ using namespace llvm::support::endian;
 using namespace lld;
 using namespace lld::elf;
 
-static bool isUnderSysroot(StringRef Path);
-
 namespace {
 class ScriptParser final : ScriptLexer {
 public:
-  ScriptParser(MemoryBufferRef MB)
-      : ScriptLexer(MB),
-        IsUnderSysroot(isUnderSysroot(MB.getBufferIdentifier())) {}
+  ScriptParser(MemoryBufferRef mb) : ScriptLexer(mb) {
+    // Initialize IsUnderSysroot
+    if (config->sysroot == "")
+      return;
+    StringRef path = mb.getBufferIdentifier();
+    for (; !path.empty(); path = sys::path::parent_path(path)) {
+      if (!sys::fs::equivalent(config->sysroot, path))
+        continue;
+      isUnderSysroot = true;
+      return;
+    }
+  }
 
   void readLinkerScript();
   void readVersionScript();
   void readDynamicList();
-  void readDefsym(StringRef Name);
+  void readDefsym(StringRef name);
 
 private:
-  void addFile(StringRef Path);
+  void addFile(StringRef path);
 
   void readAsNeeded();
   void readEntry();
@@ -76,24 +82,23 @@ private:
   void readVersion();
   void readVersionScriptCommand();
 
-  SymbolAssignment *readSymbolAssignment(StringRef Name);
-  ByteCommand *readByteCommand(StringRef Tok);
+  SymbolAssignment *readSymbolAssignment(StringRef name);
+  ByteCommand *readByteCommand(StringRef tok);
   std::array<uint8_t, 4> readFill();
-  std::array<uint8_t, 4> parseFill(StringRef Tok);
-  bool readSectionDirective(OutputSection *Cmd, StringRef Tok1, StringRef Tok2);
-  void readSectionAddressType(OutputSection *Cmd);
+  bool readSectionDirective(OutputSection *cmd, StringRef tok1, StringRef tok2);
+  void readSectionAddressType(OutputSection *cmd);
   OutputSection *readOverlaySectionDescription();
-  OutputSection *readOutputSectionDescription(StringRef OutSec);
+  OutputSection *readOutputSectionDescription(StringRef outSec);
   std::vector<BaseCommand *> readOverlay();
   std::vector<StringRef> readOutputSectionPhdrs();
-  InputSectionDescription *readInputSectionDescription(StringRef Tok);
+  InputSectionDescription *readInputSectionDescription(StringRef tok);
   StringMatcher readFilePatterns();
   std::vector<SectionPattern> readInputSectionsList();
-  InputSectionDescription *readInputSectionRules(StringRef FilePattern);
+  InputSectionDescription *readInputSectionRules(StringRef filePattern);
   unsigned readPhdrType();
   SortSectionPolicy readSortKind();
-  SymbolAssignment *readProvideHidden(bool Provide, bool Hidden);
-  SymbolAssignment *readAssignment(StringRef Tok);
+  SymbolAssignment *readProvideHidden(bool provide, bool hidden);
+  SymbolAssignment *readAssignment(StringRef tok);
   void readSort();
   Expr readAssert();
   Expr readConstant();
@@ -102,97 +107,88 @@ private:
   uint64_t readMemoryAssignment(StringRef, StringRef, StringRef);
   std::pair<uint32_t, uint32_t> readMemoryAttributes();
 
-  Expr combine(StringRef Op, Expr L, Expr R);
+  Expr combine(StringRef op, Expr l, Expr r);
   Expr readExpr();
-  Expr readExpr1(Expr Lhs, int MinPrec);
+  Expr readExpr1(Expr lhs, int minPrec);
   StringRef readParenLiteral();
   Expr readPrimary();
-  Expr readTernary(Expr Cond);
+  Expr readTernary(Expr cond);
   Expr readParenExpr();
 
   // For parsing version script.
   std::vector<SymbolVersion> readVersionExtern();
   void readAnonymousDeclaration();
-  void readVersionDeclaration(StringRef VerStr);
+  void readVersionDeclaration(StringRef verStr);
 
   std::pair<std::vector<SymbolVersion>, std::vector<SymbolVersion>>
   readSymbols();
 
   // True if a script being read is in a subdirectory specified by -sysroot.
-  bool IsUnderSysroot;
+  bool isUnderSysroot = false;
 
   // A set to detect an INCLUDE() cycle.
-  StringSet<> Seen;
+  StringSet<> seen;
 };
 } // namespace
 
-static StringRef unquote(StringRef S) {
-  if (S.startswith("\""))
-    return S.substr(1, S.size() - 2);
-  return S;
-}
-
-static bool isUnderSysroot(StringRef Path) {
-  if (Config->Sysroot == "")
-    return false;
-  for (; !Path.empty(); Path = sys::path::parent_path(Path))
-    if (sys::fs::equivalent(Config->Sysroot, Path))
-      return true;
-  return false;
+static StringRef unquote(StringRef s) {
+  if (s.startswith("\""))
+    return s.substr(1, s.size() - 2);
+  return s;
 }
 
 // Some operations only support one non absolute value. Move the
 // absolute one to the right hand side for convenience.
-static void moveAbsRight(ExprValue &A, ExprValue &B) {
-  if (A.Sec == nullptr || (A.ForceAbsolute && !B.isAbsolute()))
-    std::swap(A, B);
-  if (!B.isAbsolute())
-    error(A.Loc + ": at least one side of the expression must be absolute");
+static void moveAbsRight(ExprValue &a, ExprValue &b) {
+  if (a.sec == nullptr || (a.forceAbsolute && !b.isAbsolute()))
+    std::swap(a, b);
+  if (!b.isAbsolute())
+    error(a.loc + ": at least one side of the expression must be absolute");
 }
 
-static ExprValue add(ExprValue A, ExprValue B) {
-  moveAbsRight(A, B);
-  return {A.Sec, A.ForceAbsolute, A.getSectionOffset() + B.getValue(), A.Loc};
+static ExprValue add(ExprValue a, ExprValue b) {
+  moveAbsRight(a, b);
+  return {a.sec, a.forceAbsolute, a.getSectionOffset() + b.getValue(), a.loc};
 }
 
-static ExprValue sub(ExprValue A, ExprValue B) {
+static ExprValue sub(ExprValue a, ExprValue b) {
   // The distance between two symbols in sections is absolute.
-  if (!A.isAbsolute() && !B.isAbsolute())
-    return A.getValue() - B.getValue();
-  return {A.Sec, false, A.getSectionOffset() - B.getValue(), A.Loc};
+  if (!a.isAbsolute() && !b.isAbsolute())
+    return a.getValue() - b.getValue();
+  return {a.sec, false, a.getSectionOffset() - b.getValue(), a.loc};
 }
 
-static ExprValue bitAnd(ExprValue A, ExprValue B) {
-  moveAbsRight(A, B);
-  return {A.Sec, A.ForceAbsolute,
-          (A.getValue() & B.getValue()) - A.getSecAddr(), A.Loc};
+static ExprValue bitAnd(ExprValue a, ExprValue b) {
+  moveAbsRight(a, b);
+  return {a.sec, a.forceAbsolute,
+          (a.getValue() & b.getValue()) - a.getSecAddr(), a.loc};
 }
 
-static ExprValue bitOr(ExprValue A, ExprValue B) {
-  moveAbsRight(A, B);
-  return {A.Sec, A.ForceAbsolute,
-          (A.getValue() | B.getValue()) - A.getSecAddr(), A.Loc};
+static ExprValue bitOr(ExprValue a, ExprValue b) {
+  moveAbsRight(a, b);
+  return {a.sec, a.forceAbsolute,
+          (a.getValue() | b.getValue()) - a.getSecAddr(), a.loc};
 }
 
 void ScriptParser::readDynamicList() {
-  Config->HasDynamicList = true;
+  config->hasDynamicList = true;
   expect("{");
-  std::vector<SymbolVersion> Locals;
-  std::vector<SymbolVersion> Globals;
-  std::tie(Locals, Globals) = readSymbols();
+  std::vector<SymbolVersion> locals;
+  std::vector<SymbolVersion> globals;
+  std::tie(locals, globals) = readSymbols();
   expect(";");
 
   if (!atEOF()) {
     setError("EOF expected, but got " + next());
     return;
   }
-  if (!Locals.empty()) {
+  if (!locals.empty()) {
     setError("\"local:\" scope not supported in --dynamic-list");
     return;
   }
 
-  for (SymbolVersion V : Globals)
-    Config->DynamicList.push_back(V);
+  for (SymbolVersion v : globals)
+    config->dynamicList.push_back(v);
 }
 
 void ScriptParser::readVersionScript() {
@@ -208,14 +204,14 @@ void ScriptParser::readVersionScriptCommand() {
   }
 
   while (!atEOF() && !errorCount() && peek() != "}") {
-    StringRef VerStr = next();
-    if (VerStr == "{") {
+    StringRef verStr = next();
+    if (verStr == "{") {
       setError("anonymous version definition is used in "
                "combination with other version definitions");
       return;
     }
     expect("{");
-    readVersionDeclaration(VerStr);
+    readVersionDeclaration(verStr);
   }
 }
 
@@ -227,135 +223,135 @@ void ScriptParser::readVersion() {
 
 void ScriptParser::readLinkerScript() {
   while (!atEOF()) {
-    StringRef Tok = next();
-    if (Tok == ";")
+    StringRef tok = next();
+    if (tok == ";")
       continue;
 
-    if (Tok == "ENTRY") {
+    if (tok == "ENTRY") {
       readEntry();
-    } else if (Tok == "EXTERN") {
+    } else if (tok == "EXTERN") {
       readExtern();
-    } else if (Tok == "GROUP") {
+    } else if (tok == "GROUP") {
       readGroup();
-    } else if (Tok == "INCLUDE") {
+    } else if (tok == "INCLUDE") {
       readInclude();
-    } else if (Tok == "INPUT") {
+    } else if (tok == "INPUT") {
       readInput();
-    } else if (Tok == "MEMORY") {
+    } else if (tok == "MEMORY") {
       readMemory();
-    } else if (Tok == "OUTPUT") {
+    } else if (tok == "OUTPUT") {
       readOutput();
-    } else if (Tok == "OUTPUT_ARCH") {
+    } else if (tok == "OUTPUT_ARCH") {
       readOutputArch();
-    } else if (Tok == "OUTPUT_FORMAT") {
+    } else if (tok == "OUTPUT_FORMAT") {
       readOutputFormat();
-    } else if (Tok == "PHDRS") {
+    } else if (tok == "PHDRS") {
       readPhdrs();
-    } else if (Tok == "REGION_ALIAS") {
+    } else if (tok == "REGION_ALIAS") {
       readRegionAlias();
-    } else if (Tok == "SEARCH_DIR") {
+    } else if (tok == "SEARCH_DIR") {
       readSearchDir();
-    } else if (Tok == "SECTIONS") {
+    } else if (tok == "SECTIONS") {
       readSections();
-    } else if (Tok == "TARGET") {
+    } else if (tok == "TARGET") {
       readTarget();
-    } else if (Tok == "VERSION") {
+    } else if (tok == "VERSION") {
       readVersion();
-    } else if (SymbolAssignment *Cmd = readAssignment(Tok)) {
-      Script->SectionCommands.push_back(Cmd);
+    } else if (SymbolAssignment *cmd = readAssignment(tok)) {
+      script->sectionCommands.push_back(cmd);
     } else {
-      setError("unknown directive: " + Tok);
+      setError("unknown directive: " + tok);
     }
   }
 }
 
-void ScriptParser::readDefsym(StringRef Name) {
+void ScriptParser::readDefsym(StringRef name) {
   if (errorCount())
     return;
-  Expr E = readExpr();
+  Expr e = readExpr();
   if (!atEOF())
     setError("EOF expected, but got " + next());
-  SymbolAssignment *Cmd = make<SymbolAssignment>(Name, E, getCurrentLocation());
-  Script->SectionCommands.push_back(Cmd);
+  SymbolAssignment *cmd = make<SymbolAssignment>(name, e, getCurrentLocation());
+  script->sectionCommands.push_back(cmd);
 }
 
-void ScriptParser::addFile(StringRef S) {
-  if (IsUnderSysroot && S.startswith("/")) {
-    SmallString<128> PathData;
-    StringRef Path = (Config->Sysroot + S).toStringRef(PathData);
-    if (sys::fs::exists(Path)) {
-      Driver->addFile(Saver.save(Path), /*WithLOption=*/false);
+void ScriptParser::addFile(StringRef s) {
+  if (isUnderSysroot && s.startswith("/")) {
+    SmallString<128> pathData;
+    StringRef path = (config->sysroot + s).toStringRef(pathData);
+    if (sys::fs::exists(path)) {
+      driver->addFile(saver.save(path), /*withLOption=*/false);
       return;
     }
   }
 
-  if (S.startswith("/")) {
-    Driver->addFile(S, /*WithLOption=*/false);
-  } else if (S.startswith("=")) {
-    if (Config->Sysroot.empty())
-      Driver->addFile(S.substr(1), /*WithLOption=*/false);
+  if (s.startswith("/")) {
+    driver->addFile(s, /*withLOption=*/false);
+  } else if (s.startswith("=")) {
+    if (config->sysroot.empty())
+      driver->addFile(s.substr(1), /*withLOption=*/false);
     else
-      Driver->addFile(Saver.save(Config->Sysroot + "/" + S.substr(1)),
-                      /*WithLOption=*/false);
-  } else if (S.startswith("-l")) {
-    Driver->addLibrary(S.substr(2));
-  } else if (sys::fs::exists(S)) {
-    Driver->addFile(S, /*WithLOption=*/false);
+      driver->addFile(saver.save(config->sysroot + "/" + s.substr(1)),
+                      /*withLOption=*/false);
+  } else if (s.startswith("-l")) {
+    driver->addLibrary(s.substr(2));
+  } else if (sys::fs::exists(s)) {
+    driver->addFile(s, /*withLOption=*/false);
   } else {
-    if (Optional<std::string> Path = findFromSearchPaths(S))
-      Driver->addFile(Saver.save(*Path), /*WithLOption=*/true);
+    if (Optional<std::string> path = findFromSearchPaths(s))
+      driver->addFile(saver.save(*path), /*withLOption=*/true);
     else
-      setError("unable to find " + S);
+      setError("unable to find " + s);
   }
 }
 
 void ScriptParser::readAsNeeded() {
   expect("(");
-  bool Orig = Config->AsNeeded;
-  Config->AsNeeded = true;
+  bool orig = config->asNeeded;
+  config->asNeeded = true;
   while (!errorCount() && !consume(")"))
     addFile(unquote(next()));
-  Config->AsNeeded = Orig;
+  config->asNeeded = orig;
 }
 
 void ScriptParser::readEntry() {
   // -e <symbol> takes predecence over ENTRY(<symbol>).
   expect("(");
-  StringRef Tok = next();
-  if (Config->Entry.empty())
-    Config->Entry = Tok;
+  StringRef tok = next();
+  if (config->entry.empty())
+    config->entry = tok;
   expect(")");
 }
 
 void ScriptParser::readExtern() {
   expect("(");
   while (!errorCount() && !consume(")"))
-    Config->Undefined.push_back(next());
+    config->undefined.push_back(unquote(next()));
 }
 
 void ScriptParser::readGroup() {
-  bool Orig = InputFile::IsInGroup;
-  InputFile::IsInGroup = true;
+  bool orig = InputFile::isInGroup;
+  InputFile::isInGroup = true;
   readInput();
-  InputFile::IsInGroup = Orig;
-  if (!Orig)
-    ++InputFile::NextGroupId;
+  InputFile::isInGroup = orig;
+  if (!orig)
+    ++InputFile::nextGroupId;
 }
 
 void ScriptParser::readInclude() {
-  StringRef Tok = unquote(next());
+  StringRef tok = unquote(next());
 
-  if (!Seen.insert(Tok).second) {
+  if (!seen.insert(tok).second) {
     setError("there is a cycle in linker script INCLUDEs");
     return;
   }
 
-  if (Optional<std::string> Path = searchScript(Tok)) {
-    if (Optional<MemoryBufferRef> MB = readFile(*Path))
-      tokenize(*MB);
+  if (Optional<std::string> path = searchScript(tok)) {
+    if (Optional<MemoryBufferRef> mb = readFile(*path))
+      tokenize(*mb);
     return;
   }
-  setError("cannot find linker script " + Tok);
+  setError("cannot find linker script " + tok);
 }
 
 void ScriptParser::readInput() {
@@ -371,9 +367,9 @@ void ScriptParser::readInput() {
 void ScriptParser::readOutput() {
   // -o <file> takes predecence over OUTPUT(<file>).
   expect("(");
-  StringRef Tok = next();
-  if (Config->OutputFile.empty())
-    Config->OutputFile = unquote(Tok);
+  StringRef tok = next();
+  if (config->outputFile.empty())
+    config->outputFile = unquote(tok);
   expect(")");
 }
 
@@ -384,8 +380,8 @@ void ScriptParser::readOutputArch() {
     skip();
 }
 
-static std::pair<ELFKind, uint16_t> parseBfdName(StringRef S) {
-  return StringSwitch<std::pair<ELFKind, uint16_t>>(S)
+static std::pair<ELFKind, uint16_t> parseBfdName(StringRef s) {
+  return StringSwitch<std::pair<ELFKind, uint16_t>>(s)
       .Case("elf32-i386", {ELF32LEKind, EM_386})
       .Case("elf32-iamcu", {ELF32LEKind, EM_IAMCU})
       .Case("elf32-littlearm", {ELF32LEKind, EM_ARM})
@@ -402,6 +398,8 @@ static std::pair<ELFKind, uint16_t> parseBfdName(StringRef S) {
       .Case("elf32-ntradlittlemips", {ELF32LEKind, EM_MIPS})
       .Case("elf64-tradbigmips", {ELF64BEKind, EM_MIPS})
       .Case("elf64-tradlittlemips", {ELF64LEKind, EM_MIPS})
+      .Case("elf32-littleriscv", {ELF32LEKind, EM_RISCV})
+      .Case("elf64-littleriscv", {ELF64LEKind, EM_RISCV})
       .Default({ELFNoneKind, EM_NONE});
 }
 
@@ -410,16 +408,16 @@ static std::pair<ELFKind, uint16_t> parseBfdName(StringRef S) {
 void ScriptParser::readOutputFormat() {
   expect("(");
 
-  StringRef Name = unquote(next());
-  StringRef S = Name;
-  if (S.consume_back("-freebsd"))
-    Config->OSABI = ELFOSABI_FREEBSD;
+  StringRef name = unquote(next());
+  StringRef s = name;
+  if (s.consume_back("-freebsd"))
+    config->osabi = ELFOSABI_FREEBSD;
 
-  std::tie(Config->EKind, Config->EMachine) = parseBfdName(S);
-  if (Config->EMachine == EM_NONE)
-    setError("unknown output format name: " + Name);
-  if (S == "elf32-ntradlittlemips" || S == "elf32-ntradbigmips")
-    Config->MipsN32Abi = true;
+  std::tie(config->ekind, config->emachine) = parseBfdName(s);
+  if (config->emachine == EM_NONE)
+    setError("unknown output format name: " + name);
+  if (s == "elf32-ntradlittlemips" || s == "elf32-ntradbigmips")
+    config->mipsN32Abi = true;
 
   if (consume(")"))
     return;
@@ -434,46 +432,46 @@ void ScriptParser::readPhdrs() {
   expect("{");
 
   while (!errorCount() && !consume("}")) {
-    PhdrsCommand Cmd;
-    Cmd.Name = next();
-    Cmd.Type = readPhdrType();
+    PhdrsCommand cmd;
+    cmd.name = next();
+    cmd.type = readPhdrType();
 
     while (!errorCount() && !consume(";")) {
       if (consume("FILEHDR"))
-        Cmd.HasFilehdr = true;
+        cmd.hasFilehdr = true;
       else if (consume("PHDRS"))
-        Cmd.HasPhdrs = true;
+        cmd.hasPhdrs = true;
       else if (consume("AT"))
-        Cmd.LMAExpr = readParenExpr();
+        cmd.lmaExpr = readParenExpr();
       else if (consume("FLAGS"))
-        Cmd.Flags = readParenExpr()().getValue();
+        cmd.flags = readParenExpr()().getValue();
       else
         setError("unexpected header attribute: " + next());
     }
 
-    Script->PhdrsCommands.push_back(Cmd);
+    script->phdrsCommands.push_back(cmd);
   }
 }
 
 void ScriptParser::readRegionAlias() {
   expect("(");
-  StringRef Alias = unquote(next());
+  StringRef alias = unquote(next());
   expect(",");
-  StringRef Name = next();
+  StringRef name = next();
   expect(")");
 
-  if (Script->MemoryRegions.count(Alias))
-    setError("redefinition of memory region '" + Alias + "'");
-  if (!Script->MemoryRegions.count(Name))
-    setError("memory region '" + Name + "' is not defined");
-  Script->MemoryRegions.insert({Alias, Script->MemoryRegions[Name]});
+  if (script->memoryRegions.count(alias))
+    setError("redefinition of memory region '" + alias + "'");
+  if (!script->memoryRegions.count(name))
+    setError("memory region '" + name + "' is not defined");
+  script->memoryRegions.insert({alias, script->memoryRegions[name]});
 }
 
 void ScriptParser::readSearchDir() {
   expect("(");
-  StringRef Tok = next();
-  if (!Config->Nostdlib)
-    Config->SearchPaths.push_back(unquote(Tok));
+  StringRef tok = next();
+  if (!config->nostdlib)
+    config->searchPaths.push_back(unquote(tok));
   expect(")");
 }
 
@@ -485,83 +483,83 @@ std::vector<BaseCommand *> ScriptParser::readOverlay() {
   // VA and LMA expressions are optional, though for simplicity of
   // implementation we assume they are not. That is what OVERLAY was designed
   // for first of all: to allow sections with overlapping VAs at different LMAs.
-  Expr AddrExpr = readExpr();
+  Expr addrExpr = readExpr();
   expect(":");
   expect("AT");
-  Expr LMAExpr = readParenExpr();
+  Expr lmaExpr = readParenExpr();
   expect("{");
 
-  std::vector<BaseCommand *> V;
-  OutputSection *Prev = nullptr;
+  std::vector<BaseCommand *> v;
+  OutputSection *prev = nullptr;
   while (!errorCount() && !consume("}")) {
     // VA is the same for all sections. The LMAs are consecutive in memory
     // starting from the base load address specified.
-    OutputSection *OS = readOverlaySectionDescription();
-    OS->AddrExpr = AddrExpr;
-    if (Prev)
-      OS->LMAExpr = [=] { return Prev->getLMA() + Prev->Size; };
+    OutputSection *os = readOverlaySectionDescription();
+    os->addrExpr = addrExpr;
+    if (prev)
+      os->lmaExpr = [=] { return prev->getLMA() + prev->size; };
     else
-      OS->LMAExpr = LMAExpr;
-    V.push_back(OS);
-    Prev = OS;
+      os->lmaExpr = lmaExpr;
+    v.push_back(os);
+    prev = os;
   }
 
   // According to the specification, at the end of the overlay, the location
   // counter should be equal to the overlay base address plus size of the
   // largest section seen in the overlay.
   // Here we want to create the Dot assignment command to achieve that.
-  Expr MoveDot = [=] {
-    uint64_t Max = 0;
-    for (BaseCommand *Cmd : V)
-      Max = std::max(Max, cast<OutputSection>(Cmd)->Size);
-    return AddrExpr().getValue() + Max;
+  Expr moveDot = [=] {
+    uint64_t max = 0;
+    for (BaseCommand *cmd : v)
+      max = std::max(max, cast<OutputSection>(cmd)->size);
+    return addrExpr().getValue() + max;
   };
-  V.push_back(make<SymbolAssignment>(".", MoveDot, getCurrentLocation()));
-  return V;
+  v.push_back(make<SymbolAssignment>(".", moveDot, getCurrentLocation()));
+  return v;
 }
 
 void ScriptParser::readSections() {
-  Script->HasSectionsCommand = true;
+  script->hasSectionsCommand = true;
 
   // -no-rosegment is used to avoid placing read only non-executable sections in
   // their own segment. We do the same if SECTIONS command is present in linker
   // script. See comment for computeFlags().
-  Config->SingleRoRx = true;
+  config->singleRoRx = true;
 
   expect("{");
-  std::vector<BaseCommand *> V;
+  std::vector<BaseCommand *> v;
   while (!errorCount() && !consume("}")) {
-    StringRef Tok = next();
-    if (Tok == "OVERLAY") {
-      for (BaseCommand *Cmd : readOverlay())
-        V.push_back(Cmd);
+    StringRef tok = next();
+    if (tok == "OVERLAY") {
+      for (BaseCommand *cmd : readOverlay())
+        v.push_back(cmd);
       continue;
-    } else if (Tok == "INCLUDE") {
+    } else if (tok == "INCLUDE") {
       readInclude();
       continue;
     }
 
-    if (BaseCommand *Cmd = readAssignment(Tok))
-      V.push_back(Cmd);
+    if (BaseCommand *cmd = readAssignment(tok))
+      v.push_back(cmd);
     else
-      V.push_back(readOutputSectionDescription(Tok));
+      v.push_back(readOutputSectionDescription(tok));
   }
 
   if (!atEOF() && consume("INSERT")) {
-    std::vector<BaseCommand *> *Dest = nullptr;
+    std::vector<BaseCommand *> *dest = nullptr;
     if (consume("AFTER"))
-      Dest = &Script->InsertAfterCommands[next()];
+      dest = &script->insertAfterCommands[next()];
     else if (consume("BEFORE"))
-      Dest = &Script->InsertBeforeCommands[next()];
+      dest = &script->insertBeforeCommands[next()];
     else
       setError("expected AFTER/BEFORE, but got '" + next() + "'");
-    if (Dest)
-      Dest->insert(Dest->end(), V.begin(), V.end());
+    if (dest)
+      dest->insert(dest->end(), v.begin(), v.end());
     return;
   }
 
-  Script->SectionCommands.insert(Script->SectionCommands.end(), V.begin(),
-                                 V.end());
+  script->sectionCommands.insert(script->sectionCommands.end(), v.begin(),
+                                 v.end());
 }
 
 void ScriptParser::readTarget() {
@@ -570,19 +568,19 @@ void ScriptParser::readTarget() {
   // for --format. We recognize only /^elf/ and "binary" in the linker
   // script as well.
   expect("(");
-  StringRef Tok = next();
+  StringRef tok = next();
   expect(")");
 
-  if (Tok.startswith("elf"))
-    Config->FormatBinary = false;
-  else if (Tok == "binary")
-    Config->FormatBinary = true;
+  if (tok.startswith("elf"))
+    config->formatBinary = false;
+  else if (tok == "binary")
+    config->formatBinary = true;
   else
-    setError("unknown target: " + Tok);
+    setError("unknown target: " + tok);
 }
 
-static int precedence(StringRef Op) {
-  return StringSwitch<int>(Op)
+static int precedence(StringRef op) {
+  return StringSwitch<int>(op)
       .Cases("*", "/", "%", 8)
       .Cases("+", "-", 7)
       .Cases("<<", ">>", 6)
@@ -595,10 +593,10 @@ static int precedence(StringRef Op) {
 }
 
 StringMatcher ScriptParser::readFilePatterns() {
-  std::vector<StringRef> V;
+  std::vector<StringRef> v;
   while (!errorCount() && !consume(")"))
-    V.push_back(next());
-  return StringMatcher(V);
+    v.push_back(next());
+  return StringMatcher(v);
 }
 
 SortSectionPolicy ScriptParser::readSortKind() {
@@ -627,24 +625,24 @@ SortSectionPolicy ScriptParser::readSortKind() {
 // The semantics of that is section .foo in any file, section .bar in
 // any file but a.o, and section .baz in any file but b.o.
 std::vector<SectionPattern> ScriptParser::readInputSectionsList() {
-  std::vector<SectionPattern> Ret;
+  std::vector<SectionPattern> ret;
   while (!errorCount() && peek() != ")") {
-    StringMatcher ExcludeFilePat;
+    StringMatcher excludeFilePat;
     if (consume("EXCLUDE_FILE")) {
       expect("(");
-      ExcludeFilePat = readFilePatterns();
+      excludeFilePat = readFilePatterns();
     }
 
-    std::vector<StringRef> V;
+    std::vector<StringRef> v;
     while (!errorCount() && peek() != ")" && peek() != "EXCLUDE_FILE")
-      V.push_back(next());
+      v.push_back(unquote(next()));
 
-    if (!V.empty())
-      Ret.push_back({std::move(ExcludeFilePat), StringMatcher(V)});
+    if (!v.empty())
+      ret.push_back({std::move(excludeFilePat), StringMatcher(v)});
     else
       setError("section pattern is expected");
   }
-  return Ret;
+  return ret;
 }
 
 // Reads contents of "SECTIONS" directive. That directive contains a
@@ -659,52 +657,52 @@ std::vector<SectionPattern> ScriptParser::readInputSectionsList() {
 //
 // <section-list> is parsed by readInputSectionsList().
 InputSectionDescription *
-ScriptParser::readInputSectionRules(StringRef FilePattern) {
-  auto *Cmd = make<InputSectionDescription>(FilePattern);
+ScriptParser::readInputSectionRules(StringRef filePattern) {
+  auto *cmd = make<InputSectionDescription>(filePattern);
   expect("(");
 
   while (!errorCount() && !consume(")")) {
-    SortSectionPolicy Outer = readSortKind();
-    SortSectionPolicy Inner = SortSectionPolicy::Default;
-    std::vector<SectionPattern> V;
-    if (Outer != SortSectionPolicy::Default) {
+    SortSectionPolicy outer = readSortKind();
+    SortSectionPolicy inner = SortSectionPolicy::Default;
+    std::vector<SectionPattern> v;
+    if (outer != SortSectionPolicy::Default) {
       expect("(");
-      Inner = readSortKind();
-      if (Inner != SortSectionPolicy::Default) {
+      inner = readSortKind();
+      if (inner != SortSectionPolicy::Default) {
         expect("(");
-        V = readInputSectionsList();
+        v = readInputSectionsList();
         expect(")");
       } else {
-        V = readInputSectionsList();
+        v = readInputSectionsList();
       }
       expect(")");
     } else {
-      V = readInputSectionsList();
+      v = readInputSectionsList();
     }
 
-    for (SectionPattern &Pat : V) {
-      Pat.SortInner = Inner;
-      Pat.SortOuter = Outer;
+    for (SectionPattern &pat : v) {
+      pat.sortInner = inner;
+      pat.sortOuter = outer;
     }
 
-    std::move(V.begin(), V.end(), std::back_inserter(Cmd->SectionPatterns));
+    std::move(v.begin(), v.end(), std::back_inserter(cmd->sectionPatterns));
   }
-  return Cmd;
+  return cmd;
 }
 
 InputSectionDescription *
-ScriptParser::readInputSectionDescription(StringRef Tok) {
+ScriptParser::readInputSectionDescription(StringRef tok) {
   // Input section wildcard can be surrounded by KEEP.
   // https://sourceware.org/binutils/docs/ld/Input-Section-Keep.html#Input-Section-Keep
-  if (Tok == "KEEP") {
+  if (tok == "KEEP") {
     expect("(");
-    StringRef FilePattern = next();
-    InputSectionDescription *Cmd = readInputSectionRules(FilePattern);
+    StringRef filePattern = next();
+    InputSectionDescription *cmd = readInputSectionRules(filePattern);
     expect(")");
-    Script->KeptSections.push_back(Cmd);
-    return Cmd;
+    script->keptSections.push_back(cmd);
+    return cmd;
   }
-  return readInputSectionRules(Tok);
+  return readInputSectionRules(tok);
 }
 
 void ScriptParser::readSort() {
@@ -715,44 +713,33 @@ void ScriptParser::readSort() {
 
 Expr ScriptParser::readAssert() {
   expect("(");
-  Expr E = readExpr();
+  Expr e = readExpr();
   expect(",");
-  StringRef Msg = unquote(next());
+  StringRef msg = unquote(next());
   expect(")");
 
   return [=] {
-    if (!E().getValue())
-      error(Msg);
-    return Script->getDot();
+    if (!e().getValue())
+      error(msg);
+    return script->getDot();
   };
 }
 
-// Reads a FILL(expr) command. We handle the FILL command as an
-// alias for =fillexp section attribute, which is different from
-// what GNU linkers do.
-// https://sourceware.org/binutils/docs/ld/Output-Section-Data.html
-std::array<uint8_t, 4> ScriptParser::readFill() {
-  expect("(");
-  std::array<uint8_t, 4> V = parseFill(next());
-  expect(")");
-  return V;
-}
-
 // Tries to read the special directive for an output section definition which
 // can be one of following: "(NOLOAD)", "(COPY)", "(INFO)" or "(OVERLAY)".
 // Tok1 and Tok2 are next 2 tokens peeked. See comment for readSectionAddressType below.
-bool ScriptParser::readSectionDirective(OutputSection *Cmd, StringRef Tok1, StringRef Tok2) {
-  if (Tok1 != "(")
+bool ScriptParser::readSectionDirective(OutputSection *cmd, StringRef tok1, StringRef tok2) {
+  if (tok1 != "(")
     return false;
-  if (Tok2 != "NOLOAD" && Tok2 != "COPY" && Tok2 != "INFO" && Tok2 != "OVERLAY")
+  if (tok2 != "NOLOAD" && tok2 != "COPY" && tok2 != "INFO" && tok2 != "OVERLAY")
     return false;
 
   expect("(");
   if (consume("NOLOAD")) {
-    Cmd->Noload = true;
+    cmd->noload = true;
   } else {
     skip(); // This is "COPY", "INFO" or "OVERLAY".
-    Cmd->NonAlloc = true;
+    cmd->nonAlloc = true;
   }
   expect(")");
   return true;
@@ -769,178 +756,186 @@ bool ScriptParser::readSectionDirective(OutputSection *Cmd, StringRef Tok1, Stri
 //
 // https://sourceware.org/binutils/docs/ld/Output-Section-Address.html
 // https://sourceware.org/binutils/docs/ld/Output-Section-Type.html
-void ScriptParser::readSectionAddressType(OutputSection *Cmd) {
-  if (readSectionDirective(Cmd, peek(), peek2()))
+void ScriptParser::readSectionAddressType(OutputSection *cmd) {
+  if (readSectionDirective(cmd, peek(), peek2()))
     return;
 
-  Cmd->AddrExpr = readExpr();
-  if (peek() == "(" && !readSectionDirective(Cmd, "(", peek2()))
+  cmd->addrExpr = readExpr();
+  if (peek() == "(" && !readSectionDirective(cmd, "(", peek2()))
     setError("unknown section directive: " + peek2());
 }
 
-static Expr checkAlignment(Expr E, std::string &Loc) {
+static Expr checkAlignment(Expr e, std::string &loc) {
   return [=] {
-    uint64_t Alignment = std::max((uint64_t)1, E().getValue());
-    if (!isPowerOf2_64(Alignment)) {
-      error(Loc + ": alignment must be power of 2");
+    uint64_t alignment = std::max((uint64_t)1, e().getValue());
+    if (!isPowerOf2_64(alignment)) {
+      error(loc + ": alignment must be power of 2");
       return (uint64_t)1; // Return a dummy value.
     }
-    return Alignment;
+    return alignment;
   };
 }
 
 OutputSection *ScriptParser::readOverlaySectionDescription() {
-  OutputSection *Cmd =
-      Script->createOutputSection(next(), getCurrentLocation());
-  Cmd->InOverlay = true;
+  OutputSection *cmd =
+      script->createOutputSection(next(), getCurrentLocation());
+  cmd->inOverlay = true;
   expect("{");
   while (!errorCount() && !consume("}"))
-    Cmd->SectionCommands.push_back(readInputSectionRules(next()));
-  Cmd->Phdrs = readOutputSectionPhdrs();
-  return Cmd;
+    cmd->sectionCommands.push_back(readInputSectionRules(next()));
+  cmd->phdrs = readOutputSectionPhdrs();
+  return cmd;
 }
 
-OutputSection *ScriptParser::readOutputSectionDescription(StringRef OutSec) {
-  OutputSection *Cmd =
-      Script->createOutputSection(OutSec, getCurrentLocation());
+OutputSection *ScriptParser::readOutputSectionDescription(StringRef outSec) {
+  OutputSection *cmd =
+      script->createOutputSection(outSec, getCurrentLocation());
 
-  size_t SymbolsReferenced = Script->ReferencedSymbols.size();
+  size_t symbolsReferenced = script->referencedSymbols.size();
 
   if (peek() != ":")
-    readSectionAddressType(Cmd);
+    readSectionAddressType(cmd);
   expect(":");
 
-  std::string Location = getCurrentLocation();
+  std::string location = getCurrentLocation();
   if (consume("AT"))
-    Cmd->LMAExpr = readParenExpr();
+    cmd->lmaExpr = readParenExpr();
   if (consume("ALIGN"))
-    Cmd->AlignExpr = checkAlignment(readParenExpr(), Location);
+    cmd->alignExpr = checkAlignment(readParenExpr(), location);
   if (consume("SUBALIGN"))
-    Cmd->SubalignExpr = checkAlignment(readParenExpr(), Location);
+    cmd->subalignExpr = checkAlignment(readParenExpr(), location);
 
   // Parse constraints.
   if (consume("ONLY_IF_RO"))
-    Cmd->Constraint = ConstraintKind::ReadOnly;
+    cmd->constraint = ConstraintKind::ReadOnly;
   if (consume("ONLY_IF_RW"))
-    Cmd->Constraint = ConstraintKind::ReadWrite;
+    cmd->constraint = ConstraintKind::ReadWrite;
   expect("{");
 
   while (!errorCount() && !consume("}")) {
-    StringRef Tok = next();
-    if (Tok == ";") {
+    StringRef tok = next();
+    if (tok == ";") {
       // Empty commands are allowed. Do nothing here.
-    } else if (SymbolAssignment *Assign = readAssignment(Tok)) {
-      Cmd->SectionCommands.push_back(Assign);
-    } else if (ByteCommand *Data = readByteCommand(Tok)) {
-      Cmd->SectionCommands.push_back(Data);
-    } else if (Tok == "CONSTRUCTORS") {
+    } else if (SymbolAssignment *assign = readAssignment(tok)) {
+      cmd->sectionCommands.push_back(assign);
+    } else if (ByteCommand *data = readByteCommand(tok)) {
+      cmd->sectionCommands.push_back(data);
+    } else if (tok == "CONSTRUCTORS") {
       // CONSTRUCTORS is a keyword to make the linker recognize C++ ctors/dtors
       // by name. This is for very old file formats such as ECOFF/XCOFF.
       // For ELF, we should ignore.
-    } else if (Tok == "FILL") {
-      Cmd->Filler = readFill();
-    } else if (Tok == "SORT") {
+    } else if (tok == "FILL") {
+      // We handle the FILL command as an alias for =fillexp section attribute,
+      // which is different from what GNU linkers do.
+      // https://sourceware.org/binutils/docs/ld/Output-Section-Data.html
+      expect("(");
+      cmd->filler = readFill();
+      expect(")");
+    } else if (tok == "SORT") {
       readSort();
-    } else if (Tok == "INCLUDE") {
+    } else if (tok == "INCLUDE") {
       readInclude();
     } else if (peek() == "(") {
-      Cmd->SectionCommands.push_back(readInputSectionDescription(Tok));
+      cmd->sectionCommands.push_back(readInputSectionDescription(tok));
     } else {
       // We have a file name and no input sections description. It is not a
       // commonly used syntax, but still acceptable. In that case, all sections
       // from the file will be included.
-      auto *ISD = make<InputSectionDescription>(Tok);
-      ISD->SectionPatterns.push_back({{}, StringMatcher({"*"})});
-      Cmd->SectionCommands.push_back(ISD);
+      auto *isd = make<InputSectionDescription>(tok);
+      isd->sectionPatterns.push_back({{}, StringMatcher({"*"})});
+      cmd->sectionCommands.push_back(isd);
     }
   }
 
   if (consume(">"))
-    Cmd->MemoryRegionName = next();
+    cmd->memoryRegionName = next();
 
   if (consume("AT")) {
     expect(">");
-    Cmd->LMARegionName = next();
+    cmd->lmaRegionName = next();
   }
 
-  if (Cmd->LMAExpr && !Cmd->LMARegionName.empty())
+  if (cmd->lmaExpr && !cmd->lmaRegionName.empty())
     error("section can't have both LMA and a load region");
 
-  Cmd->Phdrs = readOutputSectionPhdrs();
+  cmd->phdrs = readOutputSectionPhdrs();
 
-  if (consume("="))
-    Cmd->Filler = parseFill(next());
-  else if (peek().startswith("="))
-    Cmd->Filler = parseFill(next().drop_front());
+  if (peek() == "=" || peek().startswith("=")) {
+    inExpr = true;
+    consume("=");
+    cmd->filler = readFill();
+    inExpr = false;
+  }
 
   // Consume optional comma following output section command.
   consume(",");
 
-  if (Script->ReferencedSymbols.size() > SymbolsReferenced)
-    Cmd->ExpressionsUseSymbols = true;
-  return Cmd;
+  if (script->referencedSymbols.size() > symbolsReferenced)
+    cmd->expressionsUseSymbols = true;
+  return cmd;
 }
 
-// Parses a given string as a octal/decimal/hexadecimal number and
-// returns it as a big-endian number. Used for `=<fillexp>`.
+// Reads a `=<fillexp>` expression and returns its value as a big-endian number.
 // https://sourceware.org/binutils/docs/ld/Output-Section-Fill.html
+// We do not support using symbols in such expressions.
 //
 // When reading a hexstring, ld.bfd handles it as a blob of arbitrary
 // size, while ld.gold always handles it as a 32-bit big-endian number.
 // We are compatible with ld.gold because it's easier to implement.
-std::array<uint8_t, 4> ScriptParser::parseFill(StringRef Tok) {
-  uint32_t V = 0;
-  if (!to_integer(Tok, V))
-    setError("invalid filler expression: " + Tok);
+std::array<uint8_t, 4> ScriptParser::readFill() {
+  uint64_t value = readExpr()().val;
+  if (value > UINT32_MAX)
+    setError("filler expression result does not fit 32-bit: 0x" +
+             Twine::utohexstr(value));
 
-  std::array<uint8_t, 4> Buf;
-  write32be(Buf.data(), V);
-  return Buf;
+  std::array<uint8_t, 4> buf;
+  write32be(buf.data(), (uint32_t)value);
+  return buf;
 }
 
-SymbolAssignment *ScriptParser::readProvideHidden(bool Provide, bool Hidden) {
+SymbolAssignment *ScriptParser::readProvideHidden(bool provide, bool hidden) {
   expect("(");
-  SymbolAssignment *Cmd = readSymbolAssignment(next());
-  Cmd->Provide = Provide;
-  Cmd->Hidden = Hidden;
+  SymbolAssignment *cmd = readSymbolAssignment(next());
+  cmd->provide = provide;
+  cmd->hidden = hidden;
   expect(")");
-  return Cmd;
+  return cmd;
 }
 
-SymbolAssignment *ScriptParser::readAssignment(StringRef Tok) {
+SymbolAssignment *ScriptParser::readAssignment(StringRef tok) {
   // Assert expression returns Dot, so this is equal to ".=."
-  if (Tok == "ASSERT")
+  if (tok == "ASSERT")
     return make<SymbolAssignment>(".", readAssert(), getCurrentLocation());
 
-  size_t OldPos = Pos;
-  SymbolAssignment *Cmd = nullptr;
+  size_t oldPos = pos;
+  SymbolAssignment *cmd = nullptr;
   if (peek() == "=" || peek() == "+=")
-    Cmd = readSymbolAssignment(Tok);
-  else if (Tok == "PROVIDE")
-    Cmd = readProvideHidden(true, false);
-  else if (Tok == "HIDDEN")
-    Cmd = readProvideHidden(false, true);
-  else if (Tok == "PROVIDE_HIDDEN")
-    Cmd = readProvideHidden(true, true);
+    cmd = readSymbolAssignment(tok);
+  else if (tok == "PROVIDE")
+    cmd = readProvideHidden(true, false);
+  else if (tok == "HIDDEN")
+    cmd = readProvideHidden(false, true);
+  else if (tok == "PROVIDE_HIDDEN")
+    cmd = readProvideHidden(true, true);
 
-  if (Cmd) {
-    Cmd->CommandString =
-        Tok.str() + " " +
-        llvm::join(Tokens.begin() + OldPos, Tokens.begin() + Pos, " ");
+  if (cmd) {
+    cmd->commandString =
+        tok.str() + " " +
+        llvm::join(tokens.begin() + oldPos, tokens.begin() + pos, " ");
     expect(";");
   }
-  return Cmd;
+  return cmd;
 }
 
-SymbolAssignment *ScriptParser::readSymbolAssignment(StringRef Name) {
-  StringRef Op = next();
-  assert(Op == "=" || Op == "+=");
-  Expr E = readExpr();
-  if (Op == "+=") {
-    std::string Loc = getCurrentLocation();
-    E = [=] { return add(Script->getSymbolValue(Name, Loc), E()); };
+SymbolAssignment *ScriptParser::readSymbolAssignment(StringRef name) {
+  StringRef op = next();
+  assert(op == "=" || op == "+=");
+  Expr e = readExpr();
+  if (op == "+=") {
+    std::string loc = getCurrentLocation();
+    e = [=] { return add(script->getSymbolValue(name, loc), e()); };
   }
-  return make<SymbolAssignment>(Name, E, getCurrentLocation());
+  return make<SymbolAssignment>(name, e, getCurrentLocation());
 }
 
 // This is an operator-precedence parser to parse a linker
@@ -948,178 +943,178 @@ SymbolAssignment *ScriptParser::readSymbolAssignment(StringRef Name) {
 Expr ScriptParser::readExpr() {
   // Our lexer is context-aware. Set the in-expression bit so that
   // they apply different tokenization rules.
-  bool Orig = InExpr;
-  InExpr = true;
-  Expr E = readExpr1(readPrimary(), 0);
-  InExpr = Orig;
-  return E;
+  bool orig = inExpr;
+  inExpr = true;
+  Expr e = readExpr1(readPrimary(), 0);
+  inExpr = orig;
+  return e;
 }
 
-Expr ScriptParser::combine(StringRef Op, Expr L, Expr R) {
-  if (Op == "+")
-    return [=] { return add(L(), R()); };
-  if (Op == "-")
-    return [=] { return sub(L(), R()); };
-  if (Op == "*")
-    return [=] { return L().getValue() * R().getValue(); };
-  if (Op == "/") {
-    std::string Loc = getCurrentLocation();
+Expr ScriptParser::combine(StringRef op, Expr l, Expr r) {
+  if (op == "+")
+    return [=] { return add(l(), r()); };
+  if (op == "-")
+    return [=] { return sub(l(), r()); };
+  if (op == "*")
+    return [=] { return l().getValue() * r().getValue(); };
+  if (op == "/") {
+    std::string loc = getCurrentLocation();
     return [=]() -> uint64_t {
-      if (uint64_t RV = R().getValue())
-        return L().getValue() / RV;
-      error(Loc + ": division by zero");
+      if (uint64_t rv = r().getValue())
+        return l().getValue() / rv;
+      error(loc + ": division by zero");
       return 0;
     };
   }
-  if (Op == "%") {
-    std::string Loc = getCurrentLocation();
+  if (op == "%") {
+    std::string loc = getCurrentLocation();
     return [=]() -> uint64_t {
-      if (uint64_t RV = R().getValue())
-        return L().getValue() % RV;
-      error(Loc + ": modulo by zero");
+      if (uint64_t rv = r().getValue())
+        return l().getValue() % rv;
+      error(loc + ": modulo by zero");
       return 0;
     };
   }
-  if (Op == "<<")
-    return [=] { return L().getValue() << R().getValue(); };
-  if (Op == ">>")
-    return [=] { return L().getValue() >> R().getValue(); };
-  if (Op == "<")
-    return [=] { return L().getValue() < R().getValue(); };
-  if (Op == ">")
-    return [=] { return L().getValue() > R().getValue(); };
-  if (Op == ">=")
-    return [=] { return L().getValue() >= R().getValue(); };
-  if (Op == "<=")
-    return [=] { return L().getValue() <= R().getValue(); };
-  if (Op == "==")
-    return [=] { return L().getValue() == R().getValue(); };
-  if (Op == "!=")
-    return [=] { return L().getValue() != R().getValue(); };
-  if (Op == "||")
-    return [=] { return L().getValue() || R().getValue(); };
-  if (Op == "&&")
-    return [=] { return L().getValue() && R().getValue(); };
-  if (Op == "&")
-    return [=] { return bitAnd(L(), R()); };
-  if (Op == "|")
-    return [=] { return bitOr(L(), R()); };
+  if (op == "<<")
+    return [=] { return l().getValue() << r().getValue(); };
+  if (op == ">>")
+    return [=] { return l().getValue() >> r().getValue(); };
+  if (op == "<")
+    return [=] { return l().getValue() < r().getValue(); };
+  if (op == ">")
+    return [=] { return l().getValue() > r().getValue(); };
+  if (op == ">=")
+    return [=] { return l().getValue() >= r().getValue(); };
+  if (op == "<=")
+    return [=] { return l().getValue() <= r().getValue(); };
+  if (op == "==")
+    return [=] { return l().getValue() == r().getValue(); };
+  if (op == "!=")
+    return [=] { return l().getValue() != r().getValue(); };
+  if (op == "||")
+    return [=] { return l().getValue() || r().getValue(); };
+  if (op == "&&")
+    return [=] { return l().getValue() && r().getValue(); };
+  if (op == "&")
+    return [=] { return bitAnd(l(), r()); };
+  if (op == "|")
+    return [=] { return bitOr(l(), r()); };
   llvm_unreachable("invalid operator");
 }
 
 // This is a part of the operator-precedence parser. This function
 // assumes that the remaining token stream starts with an operator.
-Expr ScriptParser::readExpr1(Expr Lhs, int MinPrec) {
+Expr ScriptParser::readExpr1(Expr lhs, int minPrec) {
   while (!atEOF() && !errorCount()) {
     // Read an operator and an expression.
     if (consume("?"))
-      return readTernary(Lhs);
-    StringRef Op1 = peek();
-    if (precedence(Op1) < MinPrec)
+      return readTernary(lhs);
+    StringRef op1 = peek();
+    if (precedence(op1) < minPrec)
       break;
     skip();
-    Expr Rhs = readPrimary();
+    Expr rhs = readPrimary();
 
     // Evaluate the remaining part of the expression first if the
     // next operator has greater precedence than the previous one.
     // For example, if we have read "+" and "3", and if the next
     // operator is "*", then we'll evaluate 3 * ... part first.
     while (!atEOF()) {
-      StringRef Op2 = peek();
-      if (precedence(Op2) <= precedence(Op1))
+      StringRef op2 = peek();
+      if (precedence(op2) <= precedence(op1))
         break;
-      Rhs = readExpr1(Rhs, precedence(Op2));
+      rhs = readExpr1(rhs, precedence(op2));
     }
 
-    Lhs = combine(Op1, Lhs, Rhs);
+    lhs = combine(op1, lhs, rhs);
   }
-  return Lhs;
+  return lhs;
 }
 
 Expr ScriptParser::getPageSize() {
-  std::string Location = getCurrentLocation();
+  std::string location = getCurrentLocation();
   return [=]() -> uint64_t {
-    if (Target)
-      return Target->PageSize;
-    error(Location + ": unable to calculate page size");
+    if (target)
+      return config->commonPageSize;
+    error(location + ": unable to calculate page size");
     return 4096; // Return a dummy value.
   };
 }
 
 Expr ScriptParser::readConstant() {
-  StringRef S = readParenLiteral();
-  if (S == "COMMONPAGESIZE")
+  StringRef s = readParenLiteral();
+  if (s == "COMMONPAGESIZE")
     return getPageSize();
-  if (S == "MAXPAGESIZE")
-    return [] { return Config->MaxPageSize; };
-  setError("unknown constant: " + S);
+  if (s == "MAXPAGESIZE")
+    return [] { return config->maxPageSize; };
+  setError("unknown constant: " + s);
   return [] { return 0; };
 }
 
 // Parses Tok as an integer. It recognizes hexadecimal (prefixed with
 // "0x" or suffixed with "H") and decimal numbers. Decimal numbers may
 // have "K" (Ki) or "M" (Mi) suffixes.
-static Optional<uint64_t> parseInt(StringRef Tok) {
+static Optional<uint64_t> parseInt(StringRef tok) {
   // Hexadecimal
-  uint64_t Val;
-  if (Tok.startswith_lower("0x")) {
-    if (!to_integer(Tok.substr(2), Val, 16))
+  uint64_t val;
+  if (tok.startswith_lower("0x")) {
+    if (!to_integer(tok.substr(2), val, 16))
       return None;
-    return Val;
+    return val;
   }
-  if (Tok.endswith_lower("H")) {
-    if (!to_integer(Tok.drop_back(), Val, 16))
+  if (tok.endswith_lower("H")) {
+    if (!to_integer(tok.drop_back(), val, 16))
       return None;
-    return Val;
+    return val;
   }
 
   // Decimal
-  if (Tok.endswith_lower("K")) {
-    if (!to_integer(Tok.drop_back(), Val, 10))
+  if (tok.endswith_lower("K")) {
+    if (!to_integer(tok.drop_back(), val, 10))
       return None;
-    return Val * 1024;
+    return val * 1024;
   }
-  if (Tok.endswith_lower("M")) {
-    if (!to_integer(Tok.drop_back(), Val, 10))
+  if (tok.endswith_lower("M")) {
+    if (!to_integer(tok.drop_back(), val, 10))
       return None;
-    return Val * 1024 * 1024;
+    return val * 1024 * 1024;
   }
-  if (!to_integer(Tok, Val, 10))
+  if (!to_integer(tok, val, 10))
     return None;
-  return Val;
+  return val;
 }
 
-ByteCommand *ScriptParser::readByteCommand(StringRef Tok) {
-  int Size = StringSwitch<int>(Tok)
+ByteCommand *ScriptParser::readByteCommand(StringRef tok) {
+  int size = StringSwitch<int>(tok)
                  .Case("BYTE", 1)
                  .Case("SHORT", 2)
                  .Case("LONG", 4)
                  .Case("QUAD", 8)
                  .Default(-1);
-  if (Size == -1)
+  if (size == -1)
     return nullptr;
 
-  size_t OldPos = Pos;
-  Expr E = readParenExpr();
-  std::string CommandString =
-      Tok.str() + " " +
-      llvm::join(Tokens.begin() + OldPos, Tokens.begin() + Pos, " ");
-  return make<ByteCommand>(E, Size, CommandString);
+  size_t oldPos = pos;
+  Expr e = readParenExpr();
+  std::string commandString =
+      tok.str() + " " +
+      llvm::join(tokens.begin() + oldPos, tokens.begin() + pos, " ");
+  return make<ByteCommand>(e, size, commandString);
 }
 
 StringRef ScriptParser::readParenLiteral() {
   expect("(");
-  bool Orig = InExpr;
-  InExpr = false;
-  StringRef Tok = next();
-  InExpr = Orig;
+  bool orig = inExpr;
+  inExpr = false;
+  StringRef tok = next();
+  inExpr = orig;
   expect(")");
-  return Tok;
+  return tok;
 }
 
-static void checkIfExists(OutputSection *Cmd, StringRef Location) {
-  if (Cmd->Location.empty() && Script->ErrorOnMissingSection)
-    error(Location + ": undefined section " + Cmd->Name);
+static void checkIfExists(OutputSection *cmd, StringRef location) {
+  if (cmd->location.empty() && script->errorOnMissingSection)
+    error(location + ": undefined section " + cmd->name);
 }
 
 Expr ScriptParser::readPrimary() {
@@ -1127,84 +1122,85 @@ Expr ScriptParser::readPrimary() {
     return readParenExpr();
 
   if (consume("~")) {
-    Expr E = readPrimary();
-    return [=] { return ~E().getValue(); };
+    Expr e = readPrimary();
+    return [=] { return ~e().getValue(); };
   }
   if (consume("!")) {
-    Expr E = readPrimary();
-    return [=] { return !E().getValue(); };
+    Expr e = readPrimary();
+    return [=] { return !e().getValue(); };
   }
   if (consume("-")) {
-    Expr E = readPrimary();
-    return [=] { return -E().getValue(); };
+    Expr e = readPrimary();
+    return [=] { return -e().getValue(); };
   }
 
-  StringRef Tok = next();
-  std::string Location = getCurrentLocation();
+  StringRef tok = next();
+  std::string location = getCurrentLocation();
 
   // Built-in functions are parsed here.
   // https://sourceware.org/binutils/docs/ld/Builtin-Functions.html.
-  if (Tok == "ABSOLUTE") {
-    Expr Inner = readParenExpr();
+  if (tok == "ABSOLUTE") {
+    Expr inner = readParenExpr();
     return [=] {
-      ExprValue I = Inner();
-      I.ForceAbsolute = true;
-      return I;
+      ExprValue i = inner();
+      i.forceAbsolute = true;
+      return i;
     };
   }
-  if (Tok == "ADDR") {
-    StringRef Name = readParenLiteral();
-    OutputSection *Sec = Script->getOrCreateOutputSection(Name);
+  if (tok == "ADDR") {
+    StringRef name = readParenLiteral();
+    OutputSection *sec = script->getOrCreateOutputSection(name);
+    sec->usedInExpression = true;
     return [=]() -> ExprValue {
-      checkIfExists(Sec, Location);
-      return {Sec, false, 0, Location};
+      checkIfExists(sec, location);
+      return {sec, false, 0, location};
     };
   }
-  if (Tok == "ALIGN") {
+  if (tok == "ALIGN") {
     expect("(");
-    Expr E = readExpr();
+    Expr e = readExpr();
     if (consume(")")) {
-      E = checkAlignment(E, Location);
-      return [=] { return alignTo(Script->getDot(), E().getValue()); };
+      e = checkAlignment(e, location);
+      return [=] { return alignTo(script->getDot(), e().getValue()); };
     }
     expect(",");
-    Expr E2 = checkAlignment(readExpr(), Location);
+    Expr e2 = checkAlignment(readExpr(), location);
     expect(")");
     return [=] {
-      ExprValue V = E();
-      V.Alignment = E2().getValue();
-      return V;
+      ExprValue v = e();
+      v.alignment = e2().getValue();
+      return v;
     };
   }
-  if (Tok == "ALIGNOF") {
-    StringRef Name = readParenLiteral();
-    OutputSection *Cmd = Script->getOrCreateOutputSection(Name);
+  if (tok == "ALIGNOF") {
+    StringRef name = readParenLiteral();
+    OutputSection *cmd = script->getOrCreateOutputSection(name);
     return [=] {
-      checkIfExists(Cmd, Location);
-      return Cmd->Alignment;
+      checkIfExists(cmd, location);
+      return cmd->alignment;
     };
   }
-  if (Tok == "ASSERT")
+  if (tok == "ASSERT")
     return readAssert();
-  if (Tok == "CONSTANT")
+  if (tok == "CONSTANT")
     return readConstant();
-  if (Tok == "DATA_SEGMENT_ALIGN") {
+  if (tok == "DATA_SEGMENT_ALIGN") {
     expect("(");
-    Expr E = readExpr();
+    Expr e = readExpr();
     expect(",");
     readExpr();
     expect(")");
     return [=] {
-      return alignTo(Script->getDot(), std::max((uint64_t)1, E().getValue()));
+      return alignTo(script->getDot(), std::max((uint64_t)1, e().getValue()));
     };
   }
-  if (Tok == "DATA_SEGMENT_END") {
+  if (tok == "DATA_SEGMENT_END") {
     expect("(");
     expect(".");
     expect(")");
-    return [] { return Script->getDot(); };
+    return [] { return script->getDot(); };
   }
-  if (Tok == "DATA_SEGMENT_RELRO_END") {
+  if (tok == "DATA_SEGMENT_RELRO_END") {
     // GNU linkers implements more complicated logic to handle
     // DATA_SEGMENT_RELRO_END. We instead ignore the arguments and
     // just align to the next page boundary for simplicity.
@@ -1213,112 +1209,113 @@ Expr ScriptParser::readPrimary() {
     expect(",");
     readExpr();
     expect(")");
-    Expr E = getPageSize();
-    return [=] { return alignTo(Script->getDot(), E().getValue()); };
+    Expr e = getPageSize();
+    return [=] { return alignTo(script->getDot(), e().getValue()); };
   }
-  if (Tok == "DEFINED") {
-    StringRef Name = readParenLiteral();
-    return [=] { return Symtab->find(Name) ? 1 : 0; };
+  if (tok == "DEFINED") {
+    StringRef name = readParenLiteral();
+    return [=] { return symtab->find(name) ? 1 : 0; };
   }
-  if (Tok == "LENGTH") {
-    StringRef Name = readParenLiteral();
-    if (Script->MemoryRegions.count(Name) == 0) {
-      setError("memory region not defined: " + Name);
+  if (tok == "LENGTH") {
+    StringRef name = readParenLiteral();
+    if (script->memoryRegions.count(name) == 0) {
+      setError("memory region not defined: " + name);
       return [] { return 0; };
     }
-    return [=] { return Script->MemoryRegions[Name]->Length; };
+    return [=] { return script->memoryRegions[name]->length; };
   }
-  if (Tok == "LOADADDR") {
-    StringRef Name = readParenLiteral();
-    OutputSection *Cmd = Script->getOrCreateOutputSection(Name);
+  if (tok == "LOADADDR") {
+    StringRef name = readParenLiteral();
+    OutputSection *cmd = script->getOrCreateOutputSection(name);
+    cmd->usedInExpression = true;
     return [=] {
-      checkIfExists(Cmd, Location);
-      return Cmd->getLMA();
+      checkIfExists(cmd, location);
+      return cmd->getLMA();
     };
   }
-  if (Tok == "MAX" || Tok == "MIN") {
+  if (tok == "MAX" || tok == "MIN") {
     expect("(");
-    Expr A = readExpr();
+    Expr a = readExpr();
     expect(",");
-    Expr B = readExpr();
+    Expr b = readExpr();
     expect(")");
-    if (Tok == "MIN")
-      return [=] { return std::min(A().getValue(), B().getValue()); };
-    return [=] { return std::max(A().getValue(), B().getValue()); };
+    if (tok == "MIN")
+      return [=] { return std::min(a().getValue(), b().getValue()); };
+    return [=] { return std::max(a().getValue(), b().getValue()); };
   }
-  if (Tok == "ORIGIN") {
-    StringRef Name = readParenLiteral();
-    if (Script->MemoryRegions.count(Name) == 0) {
-      setError("memory region not defined: " + Name);
+  if (tok == "ORIGIN") {
+    StringRef name = readParenLiteral();
+    if (script->memoryRegions.count(name) == 0) {
+      setError("memory region not defined: " + name);
       return [] { return 0; };
     }
-    return [=] { return Script->MemoryRegions[Name]->Origin; };
+    return [=] { return script->memoryRegions[name]->origin; };
   }
-  if (Tok == "SEGMENT_START") {
+  if (tok == "SEGMENT_START") {
     expect("(");
     skip();
     expect(",");
-    Expr E = readExpr();
+    Expr e = readExpr();
     expect(")");
-    return [=] { return E(); };
+    return [=] { return e(); };
   }
-  if (Tok == "SIZEOF") {
-    StringRef Name = readParenLiteral();
-    OutputSection *Cmd = Script->getOrCreateOutputSection(Name);
+  if (tok == "SIZEOF") {
+    StringRef name = readParenLiteral();
+    OutputSection *cmd = script->getOrCreateOutputSection(name);
     // Linker script does not create an output section if its content is empty.
     // We want to allow SIZEOF(.foo) where .foo is a section which happened to
     // be empty.
-    return [=] { return Cmd->Size; };
+    return [=] { return cmd->size; };
   }
-  if (Tok == "SIZEOF_HEADERS")
+  if (tok == "SIZEOF_HEADERS")
     return [=] { return elf::getHeaderSize(); };
 
   // Tok is the dot.
-  if (Tok == ".")
-    return [=] { return Script->getSymbolValue(Tok, Location); };
+  if (tok == ".")
+    return [=] { return script->getSymbolValue(tok, location); };
 
   // Tok is a literal number.
-  if (Optional<uint64_t> Val = parseInt(Tok))
-    return [=] { return *Val; };
+  if (Optional<uint64_t> val = parseInt(tok))
+    return [=] { return *val; };
 
   // Tok is a symbol name.
-  if (!isValidCIdentifier(Tok))
-    setError("malformed number: " + Tok);
-  Script->ReferencedSymbols.push_back(Tok);
-  return [=] { return Script->getSymbolValue(Tok, Location); };
+  if (!isValidCIdentifier(tok))
+    setError("malformed number: " + tok);
+  script->referencedSymbols.push_back(tok);
+  return [=] { return script->getSymbolValue(tok, location); };
 }
 
-Expr ScriptParser::readTernary(Expr Cond) {
-  Expr L = readExpr();
+Expr ScriptParser::readTernary(Expr cond) {
+  Expr l = readExpr();
   expect(":");
-  Expr R = readExpr();
-  return [=] { return Cond().getValue() ? L() : R(); };
+  Expr r = readExpr();
+  return [=] { return cond().getValue() ? l() : r(); };
 }
 
 Expr ScriptParser::readParenExpr() {
   expect("(");
-  Expr E = readExpr();
+  Expr e = readExpr();
   expect(")");
-  return E;
+  return e;
 }
 
 std::vector<StringRef> ScriptParser::readOutputSectionPhdrs() {
-  std::vector<StringRef> Phdrs;
+  std::vector<StringRef> phdrs;
   while (!errorCount() && peek().startswith(":")) {
-    StringRef Tok = next();
-    Phdrs.push_back((Tok.size() == 1) ? next() : Tok.substr(1));
+    StringRef tok = next();
+    phdrs.push_back((tok.size() == 1) ? next() : tok.substr(1));
   }
-  return Phdrs;
+  return phdrs;
 }
 
 // Read a program header type name. The next token must be a
 // name of a program header type or a constant (e.g. "0x3").
 unsigned ScriptParser::readPhdrType() {
-  StringRef Tok = next();
-  if (Optional<uint64_t> Val = parseInt(Tok))
-    return *Val;
+  StringRef tok = next();
+  if (Optional<uint64_t> val = parseInt(tok))
+    return *val;
 
-  unsigned Ret = StringSwitch<unsigned>(Tok)
+  unsigned ret = StringSwitch<unsigned>(tok)
                      .Case("PT_NULL", PT_NULL)
                      .Case("PT_LOAD", PT_LOAD)
                      .Case("PT_DYNAMIC", PT_DYNAMIC)
@@ -1335,56 +1332,56 @@ unsigned ScriptParser::readPhdrType() {
                      .Case("PT_OPENBSD_BOOTDATA", PT_OPENBSD_BOOTDATA)
                      .Default(-1);
 
-  if (Ret == (unsigned)-1) {
-    setError("invalid program header type: " + Tok);
+  if (ret == (unsigned)-1) {
+    setError("invalid program header type: " + tok);
     return PT_NULL;
   }
-  return Ret;
+  return ret;
 }
 
 // Reads an anonymous version declaration.
 void ScriptParser::readAnonymousDeclaration() {
-  std::vector<SymbolVersion> Locals;
-  std::vector<SymbolVersion> Globals;
-  std::tie(Locals, Globals) = readSymbols();
+  std::vector<SymbolVersion> locals;
+  std::vector<SymbolVersion> globals;
+  std::tie(locals, globals) = readSymbols();
 
-  for (SymbolVersion V : Locals) {
-    if (V.Name == "*")
-      Config->DefaultSymbolVersion = VER_NDX_LOCAL;
+  for (SymbolVersion v : locals) {
+    if (v.name == "*")
+      config->defaultSymbolVersion = VER_NDX_LOCAL;
     else
-      Config->VersionScriptLocals.push_back(V);
+      config->versionScriptLocals.push_back(v);
   }
 
-  for (SymbolVersion V : Globals)
-    Config->VersionScriptGlobals.push_back(V);
+  for (SymbolVersion v : globals)
+    config->versionScriptGlobals.push_back(v);
 
   expect(";");
 }
 
 // Reads a non-anonymous version definition,
 // e.g. "VerStr { global: foo; bar; local: *; };".
-void ScriptParser::readVersionDeclaration(StringRef VerStr) {
+void ScriptParser::readVersionDeclaration(StringRef verStr) {
   // Read a symbol list.
-  std::vector<SymbolVersion> Locals;
-  std::vector<SymbolVersion> Globals;
-  std::tie(Locals, Globals) = readSymbols();
+  std::vector<SymbolVersion> locals;
+  std::vector<SymbolVersion> globals;
+  std::tie(locals, globals) = readSymbols();
 
-  for (SymbolVersion V : Locals) {
-    if (V.Name == "*")
-      Config->DefaultSymbolVersion = VER_NDX_LOCAL;
+  for (SymbolVersion v : locals) {
+    if (v.name == "*")
+      config->defaultSymbolVersion = VER_NDX_LOCAL;
     else
-      Config->VersionScriptLocals.push_back(V);
+      config->versionScriptLocals.push_back(v);
   }
 
   // Create a new version definition and add that to the global symbols.
-  VersionDefinition Ver;
-  Ver.Name = VerStr;
-  Ver.Globals = Globals;
+  VersionDefinition ver;
+  ver.name = verStr;
+  ver.globals = globals;
 
   // User-defined version number starts from 2 because 0 and 1 are
   // reserved for VER_NDX_LOCAL and VER_NDX_GLOBAL, respectively.
-  Ver.Id = Config->VersionDefinitions.size() + 2;
-  Config->VersionDefinitions.push_back(Ver);
+  ver.id = config->versionDefinitions.size() + 2;
+  config->versionDefinitions.push_back(ver);
 
   // Each version may have a parent version. For example, "Ver2"
   // defined as "Ver2 { global: foo; local: *; } Ver1;" has "Ver1"
@@ -1396,39 +1393,39 @@ void ScriptParser::readVersionDeclaration(StringRef VerStr) {
   expect(";");
 }
 
-static bool hasWildcard(StringRef S) {
-  return S.find_first_of("?*[") != StringRef::npos;
+static bool hasWildcard(StringRef s) {
+  return s.find_first_of("?*[") != StringRef::npos;
 }
 
 // Reads a list of symbols, e.g. "{ global: foo; bar; local: *; };".
 std::pair<std::vector<SymbolVersion>, std::vector<SymbolVersion>>
 ScriptParser::readSymbols() {
-  std::vector<SymbolVersion> Locals;
-  std::vector<SymbolVersion> Globals;
-  std::vector<SymbolVersion> *V = &Globals;
+  std::vector<SymbolVersion> locals;
+  std::vector<SymbolVersion> globals;
+  std::vector<SymbolVersion> *v = &globals;
 
   while (!errorCount()) {
     if (consume("}"))
       break;
     if (consumeLabel("local")) {
-      V = &Locals;
+      v = &locals;
       continue;
     }
     if (consumeLabel("global")) {
-      V = &Globals;
+      v = &globals;
       continue;
     }
 
     if (consume("extern")) {
-      std::vector<SymbolVersion> Ext = readVersionExtern();
-      V->insert(V->end(), Ext.begin(), Ext.end());
+      std::vector<SymbolVersion> ext = readVersionExtern();
+      v->insert(v->end(), ext.begin(), ext.end());
     } else {
-      StringRef Tok = next();
-      V->push_back({unquote(Tok), false, hasWildcard(Tok)});
+      StringRef tok = next();
+      v->push_back({unquote(tok), false, hasWildcard(tok)});
     }
     expect(";");
   }
-  return {Locals, Globals};
+  return {locals, globals};
 }
 
 // Reads an "extern C++" directive, e.g.,
@@ -1437,30 +1434,30 @@ ScriptParser::readSymbols() {
 // The last semicolon is optional. E.g. this is OK:
 // "extern "C++" { ns::*; "f(int, double)" };"
 std::vector<SymbolVersion> ScriptParser::readVersionExtern() {
-  StringRef Tok = next();
-  bool IsCXX = Tok == "\"C++\"";
-  if (!IsCXX && Tok != "\"C\"")
+  StringRef tok = next();
+  bool isCXX = tok == "\"C++\"";
+  if (!isCXX && tok != "\"C\"")
     setError("Unknown language");
   expect("{");
 
-  std::vector<SymbolVersion> Ret;
+  std::vector<SymbolVersion> ret;
   while (!errorCount() && peek() != "}") {
-    StringRef Tok = next();
-    bool HasWildcard = !Tok.startswith("\"") && hasWildcard(Tok);
-    Ret.push_back({unquote(Tok), IsCXX, HasWildcard});
+    StringRef tok = next();
+    ret.push_back(
+        {unquote(tok), isCXX, !tok.startswith("\"") && hasWildcard(tok)});
     if (consume("}"))
-      return Ret;
+      return ret;
     expect(";");
   }
 
   expect("}");
-  return Ret;
+  return ret;
 }
 
-uint64_t ScriptParser::readMemoryAssignment(StringRef S1, StringRef S2,
-                                            StringRef S3) {
-  if (!consume(S1) && !consume(S2) && !consume(S3)) {
-    setError("expected one of: " + S1 + ", " + S2 + ", or " + S3);
+uint64_t ScriptParser::readMemoryAssignment(StringRef s1, StringRef s2,
+                                            StringRef s3) {
+  if (!consume(s1) && !consume(s2) && !consume(s3)) {
+    setError("expected one of: " + s1 + ", " + s2 + ", or " + s3);
     return 0;
   }
   expect("=");
@@ -1474,28 +1471,28 @@ uint64_t ScriptParser::readMemoryAssignment(StringRef S1, StringRef S2,
 void ScriptParser::readMemory() {
   expect("{");
   while (!errorCount() && !consume("}")) {
-    StringRef Tok = next();
-    if (Tok == "INCLUDE") {
+    StringRef tok = next();
+    if (tok == "INCLUDE") {
       readInclude();
       continue;
     }
 
-    uint32_t Flags = 0;
-    uint32_t NegFlags = 0;
+    uint32_t flags = 0;
+    uint32_t negFlags = 0;
     if (consume("(")) {
-      std::tie(Flags, NegFlags) = readMemoryAttributes();
+      std::tie(flags, negFlags) = readMemoryAttributes();
       expect(")");
     }
     expect(":");
 
-    uint64_t Origin = readMemoryAssignment("ORIGIN", "org", "o");
+    uint64_t origin = readMemoryAssignment("ORIGIN", "org", "o");
     expect(",");
-    uint64_t Length = readMemoryAssignment("LENGTH", "len", "l");
+    uint64_t length = readMemoryAssignment("LENGTH", "len", "l");
 
     // Add the memory region to the region map.
-    MemoryRegion *MR = make<MemoryRegion>(Tok, Origin, Length, Flags, NegFlags);
-    if (!Script->MemoryRegions.insert({Tok, MR}).second)
-      setError("region '" + Tok + "' already defined");
+    MemoryRegion *mr = make<MemoryRegion>(tok, origin, length, flags, negFlags);
+    if (!script->memoryRegions.insert({tok, mr}).second)
+      setError("region '" + tok + "' already defined");
   }
 }
 
@@ -1503,43 +1500,43 @@ void ScriptParser::readMemory() {
 // flags when placing output sections in a memory region. These flags
 // are only used when an explicit memory region name is not used.
 std::pair<uint32_t, uint32_t> ScriptParser::readMemoryAttributes() {
-  uint32_t Flags = 0;
-  uint32_t NegFlags = 0;
-  bool Invert = false;
+  uint32_t flags = 0;
+  uint32_t negFlags = 0;
+  bool invert = false;
 
-  for (char C : next().lower()) {
-    uint32_t Flag = 0;
-    if (C == '!')
-      Invert = !Invert;
-    else if (C == 'w')
-      Flag = SHF_WRITE;
-    else if (C == 'x')
-      Flag = SHF_EXECINSTR;
-    else if (C == 'a')
-      Flag = SHF_ALLOC;
-    else if (C != 'r')
+  for (char c : next().lower()) {
+    uint32_t flag = 0;
+    if (c == '!')
+      invert = !invert;
+    else if (c == 'w')
+      flag = SHF_WRITE;
+    else if (c == 'x')
+      flag = SHF_EXECINSTR;
+    else if (c == 'a')
+      flag = SHF_ALLOC;
+    else if (c != 'r')
       setError("invalid memory region attribute");
 
-    if (Invert)
-      NegFlags |= Flag;
+    if (invert)
+      negFlags |= flag;
     else
-      Flags |= Flag;
+      flags |= flag;
   }
-  return {Flags, NegFlags};
+  return {flags, negFlags};
 }
 
-void elf::readLinkerScript(MemoryBufferRef MB) {
-  ScriptParser(MB).readLinkerScript();
+void elf::readLinkerScript(MemoryBufferRef mb) {
+  ScriptParser(mb).readLinkerScript();
 }
 
-void elf::readVersionScript(MemoryBufferRef MB) {
-  ScriptParser(MB).readVersionScript();
+void elf::readVersionScript(MemoryBufferRef mb) {
+  ScriptParser(mb).readVersionScript();
 }
 
-void elf::readDynamicList(MemoryBufferRef MB) {
-  ScriptParser(MB).readDynamicList();
+void elf::readDynamicList(MemoryBufferRef mb) {
+  ScriptParser(mb).readDynamicList();
 }
 
-void elf::readDefsym(StringRef Name, MemoryBufferRef MB) {
-  ScriptParser(MB).readDefsym(Name);
+void elf::readDefsym(StringRef name, MemoryBufferRef mb) {
+  ScriptParser(mb).readDefsym(name);
 }
diff --git a/deps/lld/ELF/ScriptParser.h b/deps/lld/ELF/ScriptParser.h
index d48d5aa2115e3879b9647aadf47fd755da9e7675..c953fb302b9a77351957bc73b6e977c6df7e336c 100644
--- a/deps/lld/ELF/ScriptParser.h
+++ b/deps/lld/ELF/ScriptParser.h
@@ -1,9 +1,8 @@
 //===- ScriptParser.h -------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -17,16 +16,16 @@ namespace lld {
 namespace elf {
 
 // Parses a linker script. Calling this function updates
-// Config and ScriptConfig.
-void readLinkerScript(MemoryBufferRef MB);
+// lld::elf::config and lld::elf::script.
+void readLinkerScript(MemoryBufferRef mb);
 
 // Parses a version script.
-void readVersionScript(MemoryBufferRef MB);
+void readVersionScript(MemoryBufferRef mb);
 
-void readDynamicList(MemoryBufferRef MB);
+void readDynamicList(MemoryBufferRef mb);
 
 // Parses the defsym expression.
-void readDefsym(StringRef Name, MemoryBufferRef MB);
+void readDefsym(StringRef name, MemoryBufferRef mb);
 
 } // namespace elf
 } // namespace lld
diff --git a/deps/lld/ELF/SymbolTable.cpp b/deps/lld/ELF/SymbolTable.cpp
index 7615e12199faf248a60fb7e172248c88879cb744..3faeed8c2bdc3e041f0ec4afeb4ec35c03a15e35 100644
--- a/deps/lld/ELF/SymbolTable.cpp
+++ b/deps/lld/ELF/SymbolTable.cpp
@@ -1,9 +1,8 @@
 //===- SymbolTable.cpp ----------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -31,576 +30,76 @@ using namespace llvm::ELF;
 using namespace lld;
 using namespace lld::elf;
 
-SymbolTable *elf::Symtab;
+SymbolTable *elf::symtab;
 
-static InputFile *getFirstElf() {
-  if (!ObjectFiles.empty())
-    return ObjectFiles[0];
-  if (!SharedFiles.empty())
-    return SharedFiles[0];
-  return BitcodeFiles[0];
-}
-
-// All input object files must be for the same architecture
-// (e.g. it does not make sense to link x86 object files with
-// MIPS object files.) This function checks for that error.
-static bool isCompatible(InputFile *F) {
-  if (!F->isElf() && !isa<BitcodeFile>(F))
-    return true;
-
-  if (F->EKind == Config->EKind && F->EMachine == Config->EMachine) {
-    if (Config->EMachine != EM_MIPS)
-      return true;
-    if (isMipsN32Abi(F) == Config->MipsN32Abi)
-      return true;
-  }
-
-  if (!Config->Emulation.empty())
-    error(toString(F) + " is incompatible with " + Config->Emulation);
-  else
-    error(toString(F) + " is incompatible with " + toString(getFirstElf()));
-  return false;
-}
-
-// Add symbols in File to the symbol table.
-template <class ELFT> void SymbolTable::addFile(InputFile *File) {
-  if (!isCompatible(File))
-    return;
-
-  // Binary file
-  if (auto *F = dyn_cast<BinaryFile>(File)) {
-    BinaryFiles.push_back(F);
-    F->parse();
-    return;
-  }
-
-  // .a file
-  if (auto *F = dyn_cast<ArchiveFile>(File)) {
-    F->parse<ELFT>();
-    return;
-  }
-
-  // Lazy object file
-  if (auto *F = dyn_cast<LazyObjFile>(File)) {
-    LazyObjFiles.push_back(F);
-    F->parse<ELFT>();
-    return;
-  }
-
-  if (Config->Trace)
-    message(toString(File));
-
-  // .so file
-  if (auto *F = dyn_cast<SharedFile<ELFT>>(File)) {
-    // DSOs are uniquified not by filename but by soname.
-    F->parseSoName();
-    if (errorCount())
-      return;
-
-    // If a DSO appears more than once on the command line with and without
-    // --as-needed, --no-as-needed takes precedence over --as-needed because a
-    // user can add an extra DSO with --no-as-needed to force it to be added to
-    // the dependency list.
-    DenseMap<StringRef, InputFile *>::iterator It;
-    bool WasInserted;
-    std::tie(It, WasInserted) = SoNames.try_emplace(F->SoName, F);
-    cast<SharedFile<ELFT>>(It->second)->IsNeeded |= F->IsNeeded;
-    if (!WasInserted)
-      return;
-
-    SharedFiles.push_back(F);
-    F->parseRest();
-    return;
-  }
-
-  // LLVM bitcode file
-  if (auto *F = dyn_cast<BitcodeFile>(File)) {
-    BitcodeFiles.push_back(F);
-    F->parse<ELFT>(ComdatGroups);
-    return;
-  }
-
-  // Regular object file
-  ObjectFiles.push_back(File);
-  cast<ObjFile<ELFT>>(File)->parse(ComdatGroups);
-}
-
-// This function is where all the optimizations of link-time
-// optimization happens. When LTO is in use, some input files are
-// not in native object file format but in the LLVM bitcode format.
-// This function compiles bitcode files into a few big native files
-// using LLVM functions and replaces bitcode symbols with the results.
-// Because all bitcode files that the program consists of are passed
-// to the compiler at once, it can do whole-program optimization.
-template <class ELFT> void SymbolTable::addCombinedLTOObject() {
-  if (BitcodeFiles.empty())
-    return;
-
-  // Compile bitcode files and replace bitcode symbols.
-  LTO.reset(new BitcodeCompiler);
-  for (BitcodeFile *F : BitcodeFiles)
-    LTO->add(*F);
-
-  for (InputFile *File : LTO->compile()) {
-    DenseSet<CachedHashStringRef> DummyGroups;
-    auto *Obj = cast<ObjFile<ELFT>>(File);
-    Obj->parse(DummyGroups);
-    for (Symbol *Sym : Obj->getGlobalSymbols())
-      Sym->parseSymbolVersion();
-    ObjectFiles.push_back(File);
-  }
-}
-
-// Set a flag for --trace-symbol so that we can print out a log message
-// if a new symbol with the same name is inserted into the symbol table.
-void SymbolTable::trace(StringRef Name) {
-  SymMap.insert({CachedHashStringRef(Name), -1});
-}
-
-void SymbolTable::wrap(Symbol *Sym, Symbol *Real, Symbol *Wrap) {
+void SymbolTable::wrap(Symbol *sym, Symbol *real, Symbol *wrap) {
   // Swap symbols as instructed by -wrap.
-  int &Idx1 = SymMap[CachedHashStringRef(Sym->getName())];
-  int &Idx2 = SymMap[CachedHashStringRef(Real->getName())];
-  int &Idx3 = SymMap[CachedHashStringRef(Wrap->getName())];
+  int &idx1 = symMap[CachedHashStringRef(sym->getName())];
+  int &idx2 = symMap[CachedHashStringRef(real->getName())];
+  int &idx3 = symMap[CachedHashStringRef(wrap->getName())];
 
-  Idx2 = Idx1;
-  Idx1 = Idx3;
+  idx2 = idx1;
+  idx1 = idx3;
 
   // Now renaming is complete. No one refers Real symbol. We could leave
   // Real as-is, but if Real is written to the symbol table, that may
   // contain irrelevant values. So, we copy all values from Sym to Real.
-  StringRef S = Real->getName();
-  memcpy(Real, Sym, sizeof(SymbolUnion));
-  Real->setName(S);
+  StringRef s = real->getName();
+  memcpy(real, sym, sizeof(SymbolUnion));
+  real->setName(s);
 }
 
-static uint8_t getMinVisibility(uint8_t VA, uint8_t VB) {
-  if (VA == STV_DEFAULT)
-    return VB;
-  if (VB == STV_DEFAULT)
-    return VA;
-  return std::min(VA, VB);
-}
-
-// Find an existing symbol or create and insert a new one.
-std::pair<Symbol *, bool> SymbolTable::insertName(StringRef Name) {
+// Find an existing symbol or create a new one.
+Symbol *SymbolTable::insert(StringRef name) {
   // <name>@@<version> means the symbol is the default version. In that
   // case <name>@@<version> will be used to resolve references to <name>.
   //
   // Since this is a hot path, the following string search code is
   // optimized for speed. StringRef::find(char) is much faster than
   // StringRef::find(StringRef).
-  size_t Pos = Name.find('@');
-  if (Pos != StringRef::npos && Pos + 1 < Name.size() && Name[Pos + 1] == '@')
-    Name = Name.take_front(Pos);
+  size_t pos = name.find('@');
+  if (pos != StringRef::npos && pos + 1 < name.size() && name[pos + 1] == '@')
+    name = name.take_front(pos);
 
-  auto P = SymMap.insert({CachedHashStringRef(Name), (int)SymVector.size()});
-  int &SymIndex = P.first->second;
-  bool IsNew = P.second;
-  bool Traced = false;
+  auto p = symMap.insert({CachedHashStringRef(name), (int)symVector.size()});
+  int &symIndex = p.first->second;
+  bool isNew = p.second;
 
-  if (SymIndex == -1) {
-    SymIndex = SymVector.size();
-    IsNew = true;
-    Traced = true;
-  }
+  if (!isNew)
+    return symVector[symIndex];
 
-  if (!IsNew)
-    return {SymVector[SymIndex], false};
+  Symbol *sym = reinterpret_cast<Symbol *>(make<SymbolUnion>());
+  symVector.push_back(sym);
 
-  auto *Sym = reinterpret_cast<Symbol *>(make<SymbolUnion>());
-  Sym->SymbolKind = Symbol::PlaceholderKind;
-  Sym->Visibility = STV_DEFAULT;
-  Sym->IsUsedInRegularObj = false;
-  Sym->ExportDynamic = false;
-  Sym->CanInline = true;
-  Sym->Traced = Traced;
-  Sym->VersionId = Config->DefaultSymbolVersion;
-  SymVector.push_back(Sym);
-  return {Sym, true};
+  sym->setName(name);
+  sym->symbolKind = Symbol::PlaceholderKind;
+  sym->versionId = config->defaultSymbolVersion;
+  sym->visibility = STV_DEFAULT;
+  sym->isUsedInRegularObj = false;
+  sym->exportDynamic = false;
+  sym->canInline = true;
+  sym->scriptDefined = false;
+  sym->partition = 1;
+  return sym;
 }
 
-// Find an existing symbol or create and insert a new one, then apply the given
-// attributes.
-std::pair<Symbol *, bool> SymbolTable::insert(StringRef Name,
-                                              uint8_t Visibility,
-                                              bool CanOmitFromDynSym,
-                                              InputFile *File) {
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insertName(Name);
-
-  // Merge in the new symbol's visibility.
-  S->Visibility = getMinVisibility(S->Visibility, Visibility);
-
-  if (!CanOmitFromDynSym && (Config->Shared || Config->ExportDynamic))
-    S->ExportDynamic = true;
-
-  if (!File || File->kind() == InputFile::ObjKind)
-    S->IsUsedInRegularObj = true;
-
-  return {S, WasInserted};
-}
-
-static uint8_t getVisibility(uint8_t StOther) { return StOther & 3; }
-
-template <class ELFT>
-Symbol *SymbolTable::addUndefined(StringRef Name, uint8_t Binding,
-                                  uint8_t StOther, uint8_t Type,
-                                  bool CanOmitFromDynSym, InputFile *File) {
-  Symbol *S;
-  bool WasInserted;
-  uint8_t Visibility = getVisibility(StOther);
-  std::tie(S, WasInserted) = insert(Name, Visibility, CanOmitFromDynSym, File);
-
-  // An undefined symbol with non default visibility must be satisfied
-  // in the same DSO.
-  if (WasInserted || (isa<SharedSymbol>(S) && Visibility != STV_DEFAULT)) {
-    replaceSymbol<Undefined>(S, File, Name, Binding, StOther, Type);
-    return S;
-  }
-
-  if (S->isShared() || S->isLazy() || (S->isUndefined() && Binding != STB_WEAK))
-    S->Binding = Binding;
-
-  if (S->isLazy()) {
-    // An undefined weak will not fetch archive members. See comment on Lazy in
-    // Symbols.h for the details.
-    if (Binding == STB_WEAK) {
-      S->Type = Type;
-      return S;
-    }
-
-    // Do extra check for --warn-backrefs.
-    //
-    // --warn-backrefs is an option to prevent an undefined reference from
-    // fetching an archive member written earlier in the command line. It can be
-    // used to keep compatibility with GNU linkers to some degree.
-    // I'll explain the feature and why you may find it useful in this comment.
-    //
-    // lld's symbol resolution semantics is more relaxed than traditional Unix
-    // linkers. For example,
-    //
-    //   ld.lld foo.a bar.o
-    //
-    // succeeds even if bar.o contains an undefined symbol that has to be
-    // resolved by some object file in foo.a. Traditional Unix linkers don't
-    // allow this kind of backward reference, as they visit each file only once
-    // from left to right in the command line while resolving all undefined
-    // symbols at the moment of visiting.
-    //
-    // In the above case, since there's no undefined symbol when a linker visits
-    // foo.a, no files are pulled out from foo.a, and because the linker forgets
-    // about foo.a after visiting, it can't resolve undefined symbols in bar.o
-    // that could have been resolved otherwise.
-    //
-    // That lld accepts more relaxed form means that (besides it'd make more
-    // sense) you can accidentally write a command line or a build file that
-    // works only with lld, even if you have a plan to distribute it to wider
-    // users who may be using GNU linkers. With --warn-backrefs, you can detect
-    // a library order that doesn't work with other Unix linkers.
-    //
-    // The option is also useful to detect cyclic dependencies between static
-    // archives. Again, lld accepts
-    //
-    //   ld.lld foo.a bar.a
-    //
-    // even if foo.a and bar.a depend on each other. With --warn-backrefs, it is
-    // handled as an error.
-    //
-    // Here is how the option works. We assign a group ID to each file. A file
-    // with a smaller group ID can pull out object files from an archive file
-    // with an equal or greater group ID. Otherwise, it is a reverse dependency
-    // and an error.
-    //
-    // A file outside --{start,end}-group gets a fresh ID when instantiated. All
-    // files within the same --{start,end}-group get the same group ID. E.g.
-    //
-    //   ld.lld A B --start-group C D --end-group E
-    //
-    // A forms group 0. B form group 1. C and D (including their member object
-    // files) form group 2. E forms group 3. I think that you can see how this
-    // group assignment rule simulates the traditional linker's semantics.
-    bool Backref =
-        Config->WarnBackrefs && File && S->File->GroupId < File->GroupId;
-    fetchLazy<ELFT>(S);
-
-    // We don't report backward references to weak symbols as they can be
-    // overridden later.
-    if (Backref && S->Binding != STB_WEAK)
-      warn("backward reference detected: " + Name + " in " + toString(File) +
-           " refers to " + toString(S->File));
-  }
-  return S;
-}
-
-// Using .symver foo,foo@@VER unfortunately creates two symbols: foo and
-// foo@@VER. We want to effectively ignore foo, so give precedence to
-// foo@@VER.
-// FIXME: If users can transition to using
-// .symver foo,foo@@@VER
-// we can delete this hack.
-static int compareVersion(Symbol *S, StringRef Name) {
-  bool A = Name.contains("@@");
-  bool B = S->getName().contains("@@");
-  if (A && !B)
-    return 1;
-  if (!A && B)
-    return -1;
-  return 0;
-}
-
-// We have a new defined symbol with the specified binding. Return 1 if the new
-// symbol should win, -1 if the new symbol should lose, or 0 if both symbols are
-// strong defined symbols.
-static int compareDefined(Symbol *S, bool WasInserted, uint8_t Binding,
-                          StringRef Name) {
-  if (WasInserted)
-    return 1;
-  if (!S->isDefined())
-    return 1;
-  if (int R = compareVersion(S, Name))
-    return R;
-  if (Binding == STB_WEAK)
-    return -1;
-  if (S->isWeak())
-    return 1;
-  return 0;
-}
-
-// We have a new non-common defined symbol with the specified binding. Return 1
-// if the new symbol should win, -1 if the new symbol should lose, or 0 if there
-// is a conflict. If the new symbol wins, also update the binding.
-static int compareDefinedNonCommon(Symbol *S, bool WasInserted, uint8_t Binding,
-                                   bool IsAbsolute, uint64_t Value,
-                                   StringRef Name) {
-  if (int Cmp = compareDefined(S, WasInserted, Binding, Name))
-    return Cmp;
-  if (auto *R = dyn_cast<Defined>(S)) {
-    if (R->Section && isa<BssSection>(R->Section)) {
-      // Non-common symbols take precedence over common symbols.
-      if (Config->WarnCommon)
-        warn("common " + S->getName() + " is overridden");
-      return 1;
-    }
-    if (R->Section == nullptr && Binding == STB_GLOBAL && IsAbsolute &&
-        R->Value == Value)
-      return -1;
-  }
-  return 0;
-}
-
-Symbol *SymbolTable::addCommon(StringRef N, uint64_t Size, uint32_t Alignment,
-                               uint8_t Binding, uint8_t StOther, uint8_t Type,
-                               InputFile &File) {
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(N, getVisibility(StOther),
-                                    /*CanOmitFromDynSym*/ false, &File);
-
-  int Cmp = compareDefined(S, WasInserted, Binding, N);
-  if (Cmp < 0)
-    return S;
-
-  if (Cmp > 0) {
-    auto *Bss = make<BssSection>("COMMON", Size, Alignment);
-    Bss->File = &File;
-    Bss->Live = !Config->GcSections;
-    InputSections.push_back(Bss);
-
-    replaceSymbol<Defined>(S, &File, N, Binding, StOther, Type, 0, Size, Bss);
-    return S;
-  }
-
-  auto *D = cast<Defined>(S);
-  auto *Bss = dyn_cast_or_null<BssSection>(D->Section);
-  if (!Bss) {
-    // Non-common symbols take precedence over common symbols.
-    if (Config->WarnCommon)
-      warn("common " + S->getName() + " is overridden");
-    return S;
-  }
-
-  if (Config->WarnCommon)
-    warn("multiple common of " + D->getName());
-
-  Bss->Alignment = std::max(Bss->Alignment, Alignment);
-  if (Size > Bss->Size) {
-    D->File = Bss->File = &File;
-    D->Size = Bss->Size = Size;
-  }
-  return S;
+Symbol *SymbolTable::addSymbol(const Symbol &New) {
+  Symbol *sym = symtab->insert(New.getName());
+  sym->resolve(New);
+  return sym;
 }
 
-static void reportDuplicate(Symbol *Sym, InputFile *NewFile,
-                            InputSectionBase *ErrSec, uint64_t ErrOffset) {
-  if (Config->AllowMultipleDefinition)
-    return;
-
-  Defined *D = cast<Defined>(Sym);
-  if (!D->Section || !ErrSec) {
-    error("duplicate symbol: " + toString(*Sym) + "\n>>> defined in " +
-          toString(Sym->File) + "\n>>> defined in " + toString(NewFile));
-    return;
-  }
-
-  // Construct and print an error message in the form of:
-  //
-  //   ld.lld: error: duplicate symbol: foo
-  //   >>> defined at bar.c:30
-  //   >>>            bar.o (/home/alice/src/bar.o)
-  //   >>> defined at baz.c:563
-  //   >>>            baz.o in archive libbaz.a
-  auto *Sec1 = cast<InputSectionBase>(D->Section);
-  std::string Src1 = Sec1->getSrcMsg(*Sym, D->Value);
-  std::string Obj1 = Sec1->getObjMsg(D->Value);
-  std::string Src2 = ErrSec->getSrcMsg(*Sym, ErrOffset);
-  std::string Obj2 = ErrSec->getObjMsg(ErrOffset);
-
-  std::string Msg = "duplicate symbol: " + toString(*Sym) + "\n>>> defined at ";
-  if (!Src1.empty())
-    Msg += Src1 + "\n>>>            ";
-  Msg += Obj1 + "\n>>> defined at ";
-  if (!Src2.empty())
-    Msg += Src2 + "\n>>>            ";
-  Msg += Obj2;
-  error(Msg);
-}
-
-Defined *SymbolTable::addDefined(StringRef Name, uint8_t StOther, uint8_t Type,
-                                 uint64_t Value, uint64_t Size, uint8_t Binding,
-                                 SectionBase *Section, InputFile *File) {
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(Name, getVisibility(StOther),
-                                    /*CanOmitFromDynSym*/ false, File);
-  int Cmp = compareDefinedNonCommon(S, WasInserted, Binding, Section == nullptr,
-                                    Value, Name);
-  if (Cmp > 0)
-    replaceSymbol<Defined>(S, File, Name, Binding, StOther, Type, Value, Size,
-                           Section);
-  else if (Cmp == 0)
-    reportDuplicate(S, File, dyn_cast_or_null<InputSectionBase>(Section),
-                    Value);
-  return cast<Defined>(S);
-}
-
-template <typename ELFT>
-void SymbolTable::addShared(StringRef Name, SharedFile<ELFT> &File,
-                            const typename ELFT::Sym &Sym, uint32_t Alignment,
-                            uint32_t VerdefIndex) {
-  // DSO symbols do not affect visibility in the output, so we pass STV_DEFAULT
-  // as the visibility, which will leave the visibility in the symbol table
-  // unchanged.
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(Name, STV_DEFAULT,
-                                    /*CanOmitFromDynSym*/ true, &File);
-  // Make sure we preempt DSO symbols with default visibility.
-  if (Sym.getVisibility() == STV_DEFAULT)
-    S->ExportDynamic = true;
-
-  // An undefined symbol with non default visibility must be satisfied
-  // in the same DSO.
-  auto Replace = [&](uint8_t Binding) {
-    replaceSymbol<SharedSymbol>(S, File, Name, Binding, Sym.st_other,
-                                Sym.getType(), Sym.st_value, Sym.st_size,
-                                Alignment, VerdefIndex);
-  };
-
-  if (WasInserted)
-    Replace(Sym.getBinding());
-  else if (S->Visibility == STV_DEFAULT && (S->isUndefined() || S->isLazy()))
-    Replace(S->Binding);
-}
-
-Symbol *SymbolTable::addBitcode(StringRef Name, uint8_t Binding,
-                                uint8_t StOther, uint8_t Type,
-                                bool CanOmitFromDynSym, BitcodeFile &F) {
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) =
-      insert(Name, getVisibility(StOther), CanOmitFromDynSym, &F);
-  int Cmp = compareDefinedNonCommon(S, WasInserted, Binding,
-                                    /*IsAbs*/ false, /*Value*/ 0, Name);
-  if (Cmp > 0)
-    replaceSymbol<Defined>(S, &F, Name, Binding, StOther, Type, 0, 0, nullptr);
-  else if (Cmp == 0)
-    reportDuplicate(S, &F, nullptr, 0);
-  return S;
-}
-
-Symbol *SymbolTable::find(StringRef Name) {
-  auto It = SymMap.find(CachedHashStringRef(Name));
-  if (It == SymMap.end())
+Symbol *SymbolTable::find(StringRef name) {
+  auto it = symMap.find(CachedHashStringRef(name));
+  if (it == symMap.end())
     return nullptr;
-  if (It->second == -1)
+  Symbol *sym = symVector[it->second];
+  if (sym->isPlaceholder())
     return nullptr;
-  return SymVector[It->second];
-}
-
-template <class ELFT>
-void SymbolTable::addLazyArchive(StringRef Name, ArchiveFile &File,
-                                 const object::Archive::Symbol Sym) {
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insertName(Name);
-  if (WasInserted) {
-    replaceSymbol<LazyArchive>(S, File, STT_NOTYPE, Sym);
-    return;
-  }
-  if (!S->isUndefined())
-    return;
-
-  // An undefined weak will not fetch archive members. See comment on Lazy in
-  // Symbols.h for the details.
-  if (S->isWeak()) {
-    replaceSymbol<LazyArchive>(S, File, S->Type, Sym);
-    S->Binding = STB_WEAK;
-    return;
-  }
-
-  if (InputFile *F = File.fetch(Sym))
-    addFile<ELFT>(F);
-}
-
-template <class ELFT>
-void SymbolTable::addLazyObject(StringRef Name, LazyObjFile &File) {
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insertName(Name);
-  if (WasInserted) {
-    replaceSymbol<LazyObject>(S, File, STT_NOTYPE, Name);
-    return;
-  }
-  if (!S->isUndefined())
-    return;
-
-  // An undefined weak will not fetch archive members. See comment on Lazy in
-  // Symbols.h for the details.
-  if (S->isWeak()) {
-    replaceSymbol<LazyObject>(S, File, S->Type, Name);
-    S->Binding = STB_WEAK;
-    return;
-  }
-
-  if (InputFile *F = File.fetch())
-    addFile<ELFT>(F);
-}
-
-template <class ELFT> void SymbolTable::fetchLazy(Symbol *Sym) {
-  if (auto *S = dyn_cast<LazyArchive>(Sym)) {
-    if (InputFile *File = S->fetch())
-      addFile<ELFT>(File);
-    return;
-  }
-
-  auto *S = cast<LazyObject>(Sym);
-  if (InputFile *File = cast<LazyObjFile>(S->File)->fetch())
-    addFile<ELFT>(File);
+  return sym;
 }
 
-// Initialize DemangledSyms with a map from demangled symbols to symbol
+// Initialize demangledSyms with a map from demangled symbols to symbol
 // objects. Used to handle "extern C++" directive in version scripts.
 //
 // The map will contain all demangled symbols. That can be very large,
@@ -614,204 +113,156 @@ template <class ELFT> void SymbolTable::fetchLazy(Symbol *Sym) {
 // So, if "extern C++" feature is used, we need to demangle all known
 // symbols.
 StringMap<std::vector<Symbol *>> &SymbolTable::getDemangledSyms() {
-  if (!DemangledSyms) {
-    DemangledSyms.emplace();
-    for (Symbol *Sym : SymVector) {
-      if (!Sym->isDefined())
+  if (!demangledSyms) {
+    demangledSyms.emplace();
+    for (Symbol *sym : symVector) {
+      if (!sym->isDefined() && !sym->isCommon())
         continue;
-      if (Optional<std::string> S = demangleItanium(Sym->getName()))
-        (*DemangledSyms)[*S].push_back(Sym);
+      if (Optional<std::string> s = demangleItanium(sym->getName()))
+        (*demangledSyms)[*s].push_back(sym);
       else
-        (*DemangledSyms)[Sym->getName()].push_back(Sym);
+        (*demangledSyms)[sym->getName()].push_back(sym);
     }
   }
-  return *DemangledSyms;
+  return *demangledSyms;
 }
 
-std::vector<Symbol *> SymbolTable::findByVersion(SymbolVersion Ver) {
-  if (Ver.IsExternCpp)
-    return getDemangledSyms().lookup(Ver.Name);
-  if (Symbol *B = find(Ver.Name))
-    if (B->isDefined())
-      return {B};
+std::vector<Symbol *> SymbolTable::findByVersion(SymbolVersion ver) {
+  if (ver.isExternCpp)
+    return getDemangledSyms().lookup(ver.name);
+  if (Symbol *b = find(ver.name))
+    if (b->isDefined() || b->isCommon())
+      return {b};
   return {};
 }
 
-std::vector<Symbol *> SymbolTable::findAllByVersion(SymbolVersion Ver) {
-  std::vector<Symbol *> Res;
-  StringMatcher M(Ver.Name);
+std::vector<Symbol *> SymbolTable::findAllByVersion(SymbolVersion ver) {
+  std::vector<Symbol *> res;
+  StringMatcher m(ver.name);
 
-  if (Ver.IsExternCpp) {
-    for (auto &P : getDemangledSyms())
-      if (M.match(P.first()))
-        Res.insert(Res.end(), P.second.begin(), P.second.end());
-    return Res;
+  if (ver.isExternCpp) {
+    for (auto &p : getDemangledSyms())
+      if (m.match(p.first()))
+        res.insert(res.end(), p.second.begin(), p.second.end());
+    return res;
   }
 
-  for (Symbol *Sym : SymVector)
-    if (Sym->isDefined() && M.match(Sym->getName()))
-      Res.push_back(Sym);
-  return Res;
-}
-
-// If there's only one anonymous version definition in a version
-// script file, the script does not actually define any symbol version,
-// but just specifies symbols visibilities.
-void SymbolTable::handleAnonymousVersion() {
-  for (SymbolVersion &Ver : Config->VersionScriptGlobals)
-    assignExactVersion(Ver, VER_NDX_GLOBAL, "global");
-  for (SymbolVersion &Ver : Config->VersionScriptGlobals)
-    assignWildcardVersion(Ver, VER_NDX_GLOBAL);
-  for (SymbolVersion &Ver : Config->VersionScriptLocals)
-    assignExactVersion(Ver, VER_NDX_LOCAL, "local");
-  for (SymbolVersion &Ver : Config->VersionScriptLocals)
-    assignWildcardVersion(Ver, VER_NDX_LOCAL);
+  for (Symbol *sym : symVector)
+    if ((sym->isDefined() || sym->isCommon()) && m.match(sym->getName()))
+      res.push_back(sym);
+  return res;
 }
 
 // Handles -dynamic-list.
 void SymbolTable::handleDynamicList() {
-  for (SymbolVersion &Ver : Config->DynamicList) {
-    std::vector<Symbol *> Syms;
-    if (Ver.HasWildcard)
-      Syms = findAllByVersion(Ver);
+  for (SymbolVersion &ver : config->dynamicList) {
+    std::vector<Symbol *> syms;
+    if (ver.hasWildcard)
+      syms = findAllByVersion(ver);
     else
-      Syms = findByVersion(Ver);
+      syms = findByVersion(ver);
 
-    for (Symbol *B : Syms) {
-      if (!Config->Shared)
-        B->ExportDynamic = true;
-      else if (B->includeInDynsym())
-        B->IsPreemptible = true;
+    for (Symbol *b : syms) {
+      if (!config->shared)
+        b->exportDynamic = true;
+      else if (b->includeInDynsym())
+        b->isPreemptible = true;
     }
   }
 }
 
 // Set symbol versions to symbols. This function handles patterns
 // containing no wildcard characters.
-void SymbolTable::assignExactVersion(SymbolVersion Ver, uint16_t VersionId,
-                                     StringRef VersionName) {
-  if (Ver.HasWildcard)
+void SymbolTable::assignExactVersion(SymbolVersion ver, uint16_t versionId,
+                                     StringRef versionName) {
+  if (ver.hasWildcard)
     return;
 
   // Get a list of symbols which we need to assign the version to.
-  std::vector<Symbol *> Syms = findByVersion(Ver);
-  if (Syms.empty()) {
-    if (!Config->UndefinedVersion)
-      error("version script assignment of '" + VersionName + "' to symbol '" +
-            Ver.Name + "' failed: symbol not defined");
+  std::vector<Symbol *> syms = findByVersion(ver);
+  if (syms.empty()) {
+    if (!config->undefinedVersion)
+      error("version script assignment of '" + versionName + "' to symbol '" +
+            ver.name + "' failed: symbol not defined");
     return;
   }
 
+  auto getName = [](uint16_t ver) -> std::string {
+    if (ver == VER_NDX_LOCAL)
+      return "VER_NDX_LOCAL";
+    if (ver == VER_NDX_GLOBAL)
+      return "VER_NDX_GLOBAL";
+    return ("version '" + config->versionDefinitions[ver - 2].name + "'").str();
+  };
+
   // Assign the version.
-  for (Symbol *Sym : Syms) {
+  for (Symbol *sym : syms) {
     // Skip symbols containing version info because symbol versions
     // specified by symbol names take precedence over version scripts.
     // See parseSymbolVersion().
-    if (Sym->getName().contains('@'))
+    if (sym->getName().contains('@'))
       continue;
 
-    if (Sym->VersionId != Config->DefaultSymbolVersion &&
-        Sym->VersionId != VersionId)
-      error("duplicate symbol '" + Ver.Name + "' in version script");
-    Sym->VersionId = VersionId;
+    if (sym->versionId == config->defaultSymbolVersion)
+      sym->versionId = versionId;
+    if (sym->versionId == versionId)
+      continue;
+
+    warn("attempt to reassign symbol '" + ver.name + "' of " +
+         getName(sym->versionId) + " to " + getName(versionId));
   }
 }
 
-void SymbolTable::assignWildcardVersion(SymbolVersion Ver, uint16_t VersionId) {
-  if (!Ver.HasWildcard)
+void SymbolTable::assignWildcardVersion(SymbolVersion ver, uint16_t versionId) {
+  if (!ver.hasWildcard)
     return;
 
   // Exact matching takes precendence over fuzzy matching,
   // so we set a version to a symbol only if no version has been assigned
   // to the symbol. This behavior is compatible with GNU.
-  for (Symbol *B : findAllByVersion(Ver))
-    if (B->VersionId == Config->DefaultSymbolVersion)
-      B->VersionId = VersionId;
+  for (Symbol *b : findAllByVersion(ver))
+    if (b->versionId == config->defaultSymbolVersion)
+      b->versionId = versionId;
 }
 
-// This function processes version scripts by updating VersionId
+// This function processes version scripts by updating the versionId
 // member of symbols.
+// If there's only one anonymous version definition in a version
+// script file, the script does not actually define any symbol version,
+// but just specifies symbols visibilities.
 void SymbolTable::scanVersionScript() {
-  // Handle edge cases first.
-  handleAnonymousVersion();
-  handleDynamicList();
-
-  // Now we have version definitions, so we need to set version ids to symbols.
-  // Each version definition has a glob pattern, and all symbols that match
-  // with the pattern get that version.
-
   // First, we assign versions to exact matching symbols,
   // i.e. version definitions not containing any glob meta-characters.
-  for (VersionDefinition &V : Config->VersionDefinitions)
-    for (SymbolVersion &Ver : V.Globals)
-      assignExactVersion(Ver, V.Id, V.Name);
+  for (SymbolVersion &ver : config->versionScriptGlobals)
+    assignExactVersion(ver, VER_NDX_GLOBAL, "global");
+  for (SymbolVersion &ver : config->versionScriptLocals)
+    assignExactVersion(ver, VER_NDX_LOCAL, "local");
+  for (VersionDefinition &v : config->versionDefinitions)
+    for (SymbolVersion &ver : v.globals)
+      assignExactVersion(ver, v.id, v.name);
 
   // Next, we assign versions to fuzzy matching symbols,
   // i.e. version definitions containing glob meta-characters.
+  for (SymbolVersion &ver : config->versionScriptGlobals)
+    assignWildcardVersion(ver, VER_NDX_GLOBAL);
+  for (SymbolVersion &ver : config->versionScriptLocals)
+    assignWildcardVersion(ver, VER_NDX_LOCAL);
+
   // Note that because the last match takes precedence over previous matches,
   // we iterate over the definitions in the reverse order.
-  for (VersionDefinition &V : llvm::reverse(Config->VersionDefinitions))
-    for (SymbolVersion &Ver : V.Globals)
-      assignWildcardVersion(Ver, V.Id);
+  for (VersionDefinition &v : llvm::reverse(config->versionDefinitions))
+    for (SymbolVersion &ver : v.globals)
+      assignWildcardVersion(ver, v.id);
 
   // Symbol themselves might know their versions because symbols
   // can contain versions in the form of <name>@<version>.
   // Let them parse and update their names to exclude version suffix.
-  for (Symbol *Sym : SymVector)
-    Sym->parseSymbolVersion();
+  for (Symbol *sym : symVector)
+    sym->parseSymbolVersion();
+
+  // isPreemptible is false at this point. To correctly compute the binding of a
+  // Defined (which is used by includeInDynsym()), we need to know if it is
+  // VER_NDX_LOCAL or not. If defaultSymbolVersion is VER_NDX_LOCAL, we should
+  // compute symbol versions before handling --dynamic-list.
+  handleDynamicList();
 }
-
-template void SymbolTable::addFile<ELF32LE>(InputFile *);
-template void SymbolTable::addFile<ELF32BE>(InputFile *);
-template void SymbolTable::addFile<ELF64LE>(InputFile *);
-template void SymbolTable::addFile<ELF64BE>(InputFile *);
-
-template Symbol *SymbolTable::addUndefined<ELF32LE>(StringRef, uint8_t, uint8_t,
-                                                    uint8_t, bool, InputFile *);
-template Symbol *SymbolTable::addUndefined<ELF32BE>(StringRef, uint8_t, uint8_t,
-                                                    uint8_t, bool, InputFile *);
-template Symbol *SymbolTable::addUndefined<ELF64LE>(StringRef, uint8_t, uint8_t,
-                                                    uint8_t, bool, InputFile *);
-template Symbol *SymbolTable::addUndefined<ELF64BE>(StringRef, uint8_t, uint8_t,
-                                                    uint8_t, bool, InputFile *);
-
-template void SymbolTable::addCombinedLTOObject<ELF32LE>();
-template void SymbolTable::addCombinedLTOObject<ELF32BE>();
-template void SymbolTable::addCombinedLTOObject<ELF64LE>();
-template void SymbolTable::addCombinedLTOObject<ELF64BE>();
-
-template void
-SymbolTable::addLazyArchive<ELF32LE>(StringRef, ArchiveFile &,
-                                     const object::Archive::Symbol);
-template void
-SymbolTable::addLazyArchive<ELF32BE>(StringRef, ArchiveFile &,
-                                     const object::Archive::Symbol);
-template void
-SymbolTable::addLazyArchive<ELF64LE>(StringRef, ArchiveFile &,
-                                     const object::Archive::Symbol);
-template void
-SymbolTable::addLazyArchive<ELF64BE>(StringRef, ArchiveFile &,
-                                     const object::Archive::Symbol);
-
-template void SymbolTable::addLazyObject<ELF32LE>(StringRef, LazyObjFile &);
-template void SymbolTable::addLazyObject<ELF32BE>(StringRef, LazyObjFile &);
-template void SymbolTable::addLazyObject<ELF64LE>(StringRef, LazyObjFile &);
-template void SymbolTable::addLazyObject<ELF64BE>(StringRef, LazyObjFile &);
-
-template void SymbolTable::fetchLazy<ELF32LE>(Symbol *);
-template void SymbolTable::fetchLazy<ELF32BE>(Symbol *);
-template void SymbolTable::fetchLazy<ELF64LE>(Symbol *);
-template void SymbolTable::fetchLazy<ELF64BE>(Symbol *);
-
-template void SymbolTable::addShared<ELF32LE>(StringRef, SharedFile<ELF32LE> &,
-                                              const typename ELF32LE::Sym &,
-                                              uint32_t Alignment, uint32_t);
-template void SymbolTable::addShared<ELF32BE>(StringRef, SharedFile<ELF32BE> &,
-                                              const typename ELF32BE::Sym &,
-                                              uint32_t Alignment, uint32_t);
-template void SymbolTable::addShared<ELF64LE>(StringRef, SharedFile<ELF64LE> &,
-                                              const typename ELF64LE::Sym &,
-                                              uint32_t Alignment, uint32_t);
-template void SymbolTable::addShared<ELF64BE>(StringRef, SharedFile<ELF64BE> &,
-                                              const typename ELF64BE::Sym &,
-                                              uint32_t Alignment, uint32_t);
diff --git a/deps/lld/ELF/SymbolTable.h b/deps/lld/ELF/SymbolTable.h
index 898185fc96126ceb048e326aecafc14e43431b58..b64707f4ab02cd7d5aa2093574a844b8708f507d 100644
--- a/deps/lld/ELF/SymbolTable.h
+++ b/deps/lld/ELF/SymbolTable.h
@@ -1,9 +1,8 @@
 //===- SymbolTable.h --------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -11,15 +10,14 @@
 #define LLD_ELF_SYMBOL_TABLE_H
 
 #include "InputFiles.h"
-#include "LTO.h"
+#include "Symbols.h"
 #include "lld/Common/Strings.h"
 #include "llvm/ADT/CachedHashString.h"
 #include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/STLExtras.h"
 
 namespace lld {
 namespace elf {
-class Defined;
-class SectionBase;
 
 // SymbolTable is a bucket of all known symbols, including defined,
 // undefined, or lazy symbols (the last one is symbols in archive
@@ -35,62 +33,40 @@ class SectionBase;
 // is one add* function per symbol type.
 class SymbolTable {
 public:
-  template <class ELFT> void addFile(InputFile *File);
-  template <class ELFT> void addCombinedLTOObject();
-  void wrap(Symbol *Sym, Symbol *Real, Symbol *Wrap);
+  void wrap(Symbol *sym, Symbol *real, Symbol *wrap);
 
-  ArrayRef<Symbol *> getSymbols() const { return SymVector; }
+  void forEachSymbol(llvm::function_ref<void(Symbol *)> fn) {
+    for (Symbol *sym : symVector)
+      if (!sym->isPlaceholder())
+        fn(sym);
+  }
 
-  template <class ELFT>
-  Symbol *addUndefined(StringRef Name, uint8_t Binding, uint8_t StOther,
-                       uint8_t Type, bool CanOmitFromDynSym, InputFile *File);
+  Symbol *insert(StringRef name);
 
-  Defined *addDefined(StringRef Name, uint8_t StOther, uint8_t Type,
-                      uint64_t Value, uint64_t Size, uint8_t Binding,
-                      SectionBase *Section, InputFile *File);
-
-  template <class ELFT>
-  void addShared(StringRef Name, SharedFile<ELFT> &F,
-                 const typename ELFT::Sym &Sym, uint32_t Alignment,
-                 uint32_t VerdefIndex);
-
-  template <class ELFT>
-  void addLazyArchive(StringRef Name, ArchiveFile &F,
-                      const llvm::object::Archive::Symbol S);
-
-  template <class ELFT> void addLazyObject(StringRef Name, LazyObjFile &Obj);
-
-  Symbol *addBitcode(StringRef Name, uint8_t Binding, uint8_t StOther,
-                     uint8_t Type, bool CanOmitFromDynSym, BitcodeFile &File);
-
-  Symbol *addCommon(StringRef Name, uint64_t Size, uint32_t Alignment,
-                    uint8_t Binding, uint8_t StOther, uint8_t Type,
-                    InputFile &File);
-
-  std::pair<Symbol *, bool> insert(StringRef Name, uint8_t Visibility,
-                                   bool CanOmitFromDynSym, InputFile *File);
-
-  template <class ELFT> void fetchLazy(Symbol *Sym);
+  Symbol *addSymbol(const Symbol &New);
 
   void scanVersionScript();
 
-  Symbol *find(StringRef Name);
-
-  void trace(StringRef Name);
+  Symbol *find(StringRef name);
 
   void handleDynamicList();
 
+  // Set of .so files to not link the same shared object file more than once.
+  llvm::DenseMap<StringRef, SharedFile *> soNames;
+
+  // Comdat groups define "link once" sections. If two comdat groups have the
+  // same name, only one of them is linked, and the other is ignored. This map
+  // is used to uniquify them.
+  llvm::DenseMap<llvm::CachedHashStringRef, const InputFile *> comdatGroups;
+
 private:
-  std::pair<Symbol *, bool> insertName(StringRef Name);
-
-  std::vector<Symbol *> findByVersion(SymbolVersion Ver);
-  std::vector<Symbol *> findAllByVersion(SymbolVersion Ver);
+  std::vector<Symbol *> findByVersion(SymbolVersion ver);
+  std::vector<Symbol *> findAllByVersion(SymbolVersion ver);
 
   llvm::StringMap<std::vector<Symbol *>> &getDemangledSyms();
-  void handleAnonymousVersion();
-  void assignExactVersion(SymbolVersion Ver, uint16_t VersionId,
-                          StringRef VersionName);
-  void assignWildcardVersion(SymbolVersion Ver, uint16_t VersionId);
+  void assignExactVersion(SymbolVersion ver, uint16_t versionId,
+                          StringRef versionName);
+  void assignWildcardVersion(SymbolVersion ver, uint16_t versionId);
 
   // The order the global symbols are in is not defined. We can use an arbitrary
   // order, but it has to be reproducible. That is true even when cross linking.
@@ -99,28 +75,18 @@ private:
   // but a bit inefficient.
   // FIXME: Experiment with passing in a custom hashing or sorting the symbols
   // once symbol resolution is finished.
-  llvm::DenseMap<llvm::CachedHashStringRef, int> SymMap;
-  std::vector<Symbol *> SymVector;
-
-  // Comdat groups define "link once" sections. If two comdat groups have the
-  // same name, only one of them is linked, and the other is ignored. This set
-  // is used to uniquify them.
-  llvm::DenseSet<llvm::CachedHashStringRef> ComdatGroups;
-
-  // Set of .so files to not link the same shared object file more than once.
-  llvm::DenseMap<StringRef, InputFile *> SoNames;
+  llvm::DenseMap<llvm::CachedHashStringRef, int> symMap;
+  std::vector<Symbol *> symVector;
 
   // A map from demangled symbol names to their symbol objects.
   // This mapping is 1:N because two symbols with different versions
   // can have the same name. We use this map to handle "extern C++ {}"
   // directive in version scripts.
-  llvm::Optional<llvm::StringMap<std::vector<Symbol *>>> DemangledSyms;
-
-  // For LTO.
-  std::unique_ptr<BitcodeCompiler> LTO;
+  llvm::Optional<llvm::StringMap<std::vector<Symbol *>>> demangledSyms;
 };
 
-extern SymbolTable *Symtab;
+extern SymbolTable *symtab;
+
 } // namespace elf
 } // namespace lld
 
diff --git a/deps/lld/ELF/Symbols.cpp b/deps/lld/ELF/Symbols.cpp
index a713ec539d82607716c22f2d568268a72fe55687..62c552e048287d010d23ff56cf8dc7b663fba4a9 100644
--- a/deps/lld/ELF/Symbols.cpp
+++ b/deps/lld/ELF/Symbols.cpp
@@ -1,9 +1,8 @@
 //===- Symbols.cpp --------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -27,40 +26,36 @@ using namespace llvm::ELF;
 using namespace lld;
 using namespace lld::elf;
 
-Defined *ElfSym::Bss;
-Defined *ElfSym::Etext1;
-Defined *ElfSym::Etext2;
-Defined *ElfSym::Edata1;
-Defined *ElfSym::Edata2;
-Defined *ElfSym::End1;
-Defined *ElfSym::End2;
-Defined *ElfSym::GlobalOffsetTable;
-Defined *ElfSym::MipsGp;
-Defined *ElfSym::MipsGpDisp;
-Defined *ElfSym::MipsLocalGp;
-Defined *ElfSym::RelaIpltStart;
-Defined *ElfSym::RelaIpltEnd;
+Defined *ElfSym::bss;
+Defined *ElfSym::etext1;
+Defined *ElfSym::etext2;
+Defined *ElfSym::edata1;
+Defined *ElfSym::edata2;
+Defined *ElfSym::end1;
+Defined *ElfSym::end2;
+Defined *ElfSym::globalOffsetTable;
+Defined *ElfSym::mipsGp;
+Defined *ElfSym::mipsGpDisp;
+Defined *ElfSym::mipsLocalGp;
+Defined *ElfSym::relaIpltStart;
+Defined *ElfSym::relaIpltEnd;
+Defined *ElfSym::riscvGlobalPointer;
+Defined *ElfSym::tlsModuleBase;
 
-static uint64_t getSymVA(const Symbol &Sym, int64_t &Addend) {
-  switch (Sym.kind()) {
+static uint64_t getSymVA(const Symbol &sym, int64_t &addend) {
+  switch (sym.kind()) {
   case Symbol::DefinedKind: {
-    auto &D = cast<Defined>(Sym);
-    SectionBase *IS = D.Section;
-
-    // According to the ELF spec reference to a local symbol from outside
-    // the group are not allowed. Unfortunately .eh_frame breaks that rule
-    // and must be treated specially. For now we just replace the symbol with
-    // 0.
-    if (IS == &InputSection::Discarded)
-      return 0;
+    auto &d = cast<Defined>(sym);
+    SectionBase *isec = d.section;
 
     // This is an absolute symbol.
-    if (!IS)
-      return D.Value;
+    if (!isec)
+      return d.value;
 
-    IS = IS->Repl;
+    assert(isec != &InputSection::discarded);
+    isec = isec->repl;
 
-    uint64_t Offset = D.Value;
+    uint64_t offset = d.value;
 
     // An object in an SHF_MERGE section might be referenced via a
     // section symbol (as a hack for reducing the number of local
@@ -73,9 +68,9 @@ static uint64_t getSymVA(const Symbol &Sym, int64_t &Addend) {
     // To make this work, we incorporate the addend into the section
     // offset (and zero out the addend for later processing) so that
     // we find the right object in the section.
-    if (D.isSection()) {
-      Offset += Addend;
-      Addend = 0;
+    if (d.isSection()) {
+      offset += addend;
+      addend = 0;
     }
 
     // In the typical case, this is actually very simple and boils
@@ -88,83 +83,107 @@ static uint64_t getSymVA(const Symbol &Sym, int64_t &Addend) {
     // If you understand the data structures involved with this next
     // line (and how they get built), then you have a pretty good
     // understanding of the linker.
-    uint64_t VA = IS->getVA(Offset);
+    uint64_t va = isec->getVA(offset);
 
-    if (D.isTls() && !Config->Relocatable) {
+    // MIPS relocatable files can mix regular and microMIPS code.
+    // Linker needs to distinguish such code. To do so microMIPS
+    // symbols has the `STO_MIPS_MICROMIPS` flag in the `st_other`
+    // field. Unfortunately, the `MIPS::relocateOne()` method has
+    // a symbol value only. To pass type of the symbol (regular/microMIPS)
+    // to that routine as well as other places where we write
+    // a symbol value as-is (.dynamic section, `Elf_Ehdr::e_entry`
+    // field etc) do the same trick as compiler uses to mark microMIPS
+    // for CPU - set the less-significant bit.
+    if (config->emachine == EM_MIPS && isMicroMips() &&
+        ((sym.stOther & STO_MIPS_MICROMIPS) || sym.needsPltAddr))
+      va |= 1;
+
+    if (d.isTls() && !config->relocatable) {
       // Use the address of the TLS segment's first section rather than the
       // segment's address, because segment addresses aren't initialized until
       // after sections are finalized. (e.g. Measuring the size of .rela.dyn
       // for Android relocation packing requires knowing TLS symbol addresses
       // during section finalization.)
-      if (!Out::TlsPhdr || !Out::TlsPhdr->FirstSec)
-        fatal(toString(D.File) +
+      if (!Out::tlsPhdr || !Out::tlsPhdr->firstSec)
+        fatal(toString(d.file) +
               " has an STT_TLS symbol but doesn't have an SHF_TLS section");
-      return VA - Out::TlsPhdr->FirstSec->Addr;
+      return va - Out::tlsPhdr->firstSec->addr;
     }
-    return VA;
+    return va;
   }
   case Symbol::SharedKind:
   case Symbol::UndefinedKind:
     return 0;
   case Symbol::LazyArchiveKind:
   case Symbol::LazyObjectKind:
-    assert(Sym.IsUsedInRegularObj && "lazy symbol reached writer");
+    assert(sym.isUsedInRegularObj && "lazy symbol reached writer");
     return 0;
+  case Symbol::CommonKind:
+    llvm_unreachable("common symbol reached writer");
   case Symbol::PlaceholderKind:
     llvm_unreachable("placeholder symbol reached writer");
   }
   llvm_unreachable("invalid symbol kind");
 }
 
-uint64_t Symbol::getVA(int64_t Addend) const {
-  uint64_t OutVA = getSymVA(*this, Addend);
-  return OutVA + Addend;
+uint64_t Symbol::getVA(int64_t addend) const {
+  uint64_t outVA = getSymVA(*this, addend);
+  return outVA + addend;
 }
 
-uint64_t Symbol::getGotVA() const { return In.Got->getVA() + getGotOffset(); }
-
-uint64_t Symbol::getGotOffset() const {
-  return GotIndex * Target->GotEntrySize;
+uint64_t Symbol::getGotVA() const {
+  if (gotInIgot)
+    return in.igotPlt->getVA() + getGotPltOffset();
+  return in.got->getVA() + getGotOffset();
 }
 
+uint64_t Symbol::getGotOffset() const { return gotIndex * config->wordsize; }
+
 uint64_t Symbol::getGotPltVA() const {
-  if (this->IsInIgot)
-    return In.IgotPlt->getVA() + getGotPltOffset();
-  return In.GotPlt->getVA() + getGotPltOffset();
+  if (isInIplt)
+    return in.igotPlt->getVA() + getGotPltOffset();
+  return in.gotPlt->getVA() + getGotPltOffset();
 }
 
 uint64_t Symbol::getGotPltOffset() const {
-  if (IsInIgot)
-    return PltIndex * Target->GotPltEntrySize;
-  return (PltIndex + Target->GotPltHeaderEntriesNum) * Target->GotPltEntrySize;
+  if (isInIplt)
+    return pltIndex * config->wordsize;
+  return (pltIndex + target->gotPltHeaderEntriesNum) * config->wordsize;
 }
 
 uint64_t Symbol::getPPC64LongBranchOffset() const {
-  assert(PPC64BranchltIndex != 0xffff);
-  return PPC64BranchltIndex * Target->GotPltEntrySize;
+  assert(ppc64BranchltIndex != 0xffff);
+  return ppc64BranchltIndex * config->wordsize;
 }
 
 uint64_t Symbol::getPltVA() const {
-  PltSection *Plt = IsInIplt ? In.Iplt : In.Plt;
-  return Plt->getVA() + Plt->HeaderSize + PltIndex * Target->PltEntrySize;
+  PltSection *plt = isInIplt ? in.iplt : in.plt;
+  uint64_t outVA =
+      plt->getVA() + plt->headerSize + pltIndex * target->pltEntrySize;
+  // While linking microMIPS code PLT code are always microMIPS
+  // code. Set the less-significant bit to track that fact.
+  // See detailed comment in the `getSymVA` function.
+  if (config->emachine == EM_MIPS && isMicroMips())
+    outVA |= 1;
+  return outVA;
 }
 
 uint64_t Symbol::getPPC64LongBranchTableVA() const {
-  assert(PPC64BranchltIndex != 0xffff);
-  return In.PPC64LongBranchTarget->getVA() +
-         PPC64BranchltIndex * Target->GotPltEntrySize;
+  assert(ppc64BranchltIndex != 0xffff);
+  return in.ppc64LongBranchTarget->getVA() +
+         ppc64BranchltIndex * config->wordsize;
 }
 
 uint64_t Symbol::getSize() const {
-  if (const auto *DR = dyn_cast<Defined>(this))
-    return DR->Size;
-  return cast<SharedSymbol>(this)->Size;
+  if (const auto *dr = dyn_cast<Defined>(this))
+    return dr->size;
+  return cast<SharedSymbol>(this)->size;
 }
 
 OutputSection *Symbol::getOutputSection() const {
-  if (auto *S = dyn_cast<Defined>(this)) {
-    if (auto *Sec = S->Section)
-      return Sec->Repl->getOutputSection();
+  if (auto *s = dyn_cast<Defined>(this)) {
+    if (auto *sec = s->section)
+      return sec->repl->getOutputSection();
     return nullptr;
   }
   return nullptr;
@@ -173,16 +192,16 @@ OutputSection *Symbol::getOutputSection() const {
 // If a symbol name contains '@', the characters after that is
 // a symbol version name. This function parses that.
 void Symbol::parseSymbolVersion() {
-  StringRef S = getName();
-  size_t Pos = S.find('@');
-  if (Pos == 0 || Pos == StringRef::npos)
+  StringRef s = getName();
+  size_t pos = s.find('@');
+  if (pos == 0 || pos == StringRef::npos)
     return;
-  StringRef Verstr = S.substr(Pos + 1);
-  if (Verstr.empty())
+  StringRef verstr = s.substr(pos + 1);
+  if (verstr.empty())
     return;
 
   // Truncate the symbol name so that it doesn't include the version string.
-  NameSize = Pos;
+  nameSize = pos;
 
   // If this is not in this DSO, it is not a definition.
   if (!isDefined())
@@ -190,18 +209,18 @@ void Symbol::parseSymbolVersion() {
 
   // '@@' in a symbol name means the default version.
   // It is usually the most recent one.
-  bool IsDefault = (Verstr[0] == '@');
-  if (IsDefault)
-    Verstr = Verstr.substr(1);
+  bool isDefault = (verstr[0] == '@');
+  if (isDefault)
+    verstr = verstr.substr(1);
 
-  for (VersionDefinition &Ver : Config->VersionDefinitions) {
-    if (Ver.Name != Verstr)
+  for (VersionDefinition &ver : config->versionDefinitions) {
+    if (ver.name != verstr)
       continue;
 
-    if (IsDefault)
-      VersionId = Ver.Id;
+    if (isDefault)
+      versionId = ver.id;
     else
-      VersionId = Ver.Id | VERSYM_HIDDEN;
+      versionId = ver.id | VERSYM_HIDDEN;
     return;
   }
 
@@ -211,63 +230,79 @@ void Symbol::parseSymbolVersion() {
   // so we do not report error in this case. We also do not error
   // if the symbol has a local version as it won't be in the dynamic
   // symbol table.
-  if (Config->Shared && VersionId != VER_NDX_LOCAL)
-    error(toString(File) + ": symbol " + S + " has undefined version " +
-          Verstr);
+  if (config->shared && versionId != VER_NDX_LOCAL)
+    error(toString(file) + ": symbol " + s + " has undefined version " +
+          verstr);
 }
 
-InputFile *LazyArchive::fetch() { return cast<ArchiveFile>(File)->fetch(Sym); }
+void Symbol::fetch() const {
+  if (auto *sym = dyn_cast<LazyArchive>(this)) {
+    cast<ArchiveFile>(sym->file)->fetch(sym->sym);
+    return;
+  }
+
+  if (auto *sym = dyn_cast<LazyObject>(this)) {
+    dyn_cast<LazyObjFile>(sym->file)->fetch();
+    return;
+  }
+
+  llvm_unreachable("Symbol::fetch() is called on a non-lazy symbol");
+}
 
 MemoryBufferRef LazyArchive::getMemberBuffer() {
-  Archive::Child C = CHECK(
-      Sym.getMember(), "could not get the member for symbol " + Sym.getName());
+  Archive::Child c = CHECK(
+      sym.getMember(), "could not get the member for symbol " + sym.getName());
 
-  return CHECK(C.getMemoryBufferRef(),
+  return CHECK(c.getMemoryBufferRef(),
                "could not get the buffer for the member defining symbol " +
-                   Sym.getName());
+                   sym.getName());
 }
 
 uint8_t Symbol::computeBinding() const {
-  if (Config->Relocatable)
-    return Binding;
-  if (Visibility != STV_DEFAULT && Visibility != STV_PROTECTED)
+  if (config->relocatable)
+    return binding;
+  if (visibility != STV_DEFAULT && visibility != STV_PROTECTED)
     return STB_LOCAL;
-  if (VersionId == VER_NDX_LOCAL && isDefined() && !IsPreemptible)
+  if (versionId == VER_NDX_LOCAL && isDefined() && !isPreemptible)
     return STB_LOCAL;
-  if (!Config->GnuUnique && Binding == STB_GNU_UNIQUE)
+  if (!config->gnuUnique && binding == STB_GNU_UNIQUE)
     return STB_GLOBAL;
-  return Binding;
+  return binding;
 }
 
 bool Symbol::includeInDynsym() const {
-  if (!Config->HasDynSymTab)
+  if (!config->hasDynSymTab)
     return false;
   if (computeBinding() == STB_LOCAL)
     return false;
-  if (!isDefined())
-    return true;
-  return ExportDynamic;
+
+  // If a PIE binary was not linked against any shared libraries, then we can
+  // safely drop weak undef symbols from .dynsym.
+  if (isUndefWeak() && config->pie && sharedFiles.empty())
+    return false;
+
+  return isUndefined() || isShared() || exportDynamic;
 }
 
 // Print out a log message for --trace-symbol.
-void elf::printTraceSymbol(Symbol *Sym) {
-  std::string S;
-  if (Sym->isUndefined())
-    S = ": reference to ";
-  else if (Sym->isLazy())
-    S = ": lazy definition of ";
-  else if (Sym->isShared())
-    S = ": shared definition of ";
-  else if (dyn_cast_or_null<BssSection>(cast<Defined>(Sym)->Section))
-    S = ": common definition of ";
+void elf::printTraceSymbol(const Symbol *sym) {
+  std::string s;
+  if (sym->isUndefined())
+    s = ": reference to ";
+  else if (sym->isLazy())
+    s = ": lazy definition of ";
+  else if (sym->isShared())
+    s = ": shared definition of ";
+  else if (sym->isCommon())
+    s = ": common definition of ";
   else
-    S = ": definition of ";
+    s = ": definition of ";
 
-  message(toString(Sym->File) + S + Sym->getName());
+  message(toString(sym->file) + s + sym->getName());
 }
 
-void elf::maybeWarnUnorderableSymbol(const Symbol *Sym) {
-  if (!Config->WarnSymbolOrdering)
+void elf::maybeWarnUnorderableSymbol(const Symbol *sym) {
+  if (!config->warnSymbolOrdering)
     return;
 
   // If UnresolvedPolicy::Ignore is used, no "undefined symbol" error/warning
@@ -275,31 +310,347 @@ void elf::maybeWarnUnorderableSymbol(const Symbol *Sym) {
   //
   // Note, ld.bfd --symbol-ordering-file= does not warn on undefined symbols,
   // but we don't have to be compatible here.
-  if (Sym->isUndefined() &&
-      Config->UnresolvedSymbols == UnresolvedPolicy::Ignore)
+  if (sym->isUndefined() &&
+      config->unresolvedSymbols == UnresolvedPolicy::Ignore)
     return;
 
-  const InputFile *File = Sym->File;
-  auto *D = dyn_cast<Defined>(Sym);
+  const InputFile *file = sym->file;
+  auto *d = dyn_cast<Defined>(sym);
 
-  auto Warn = [&](StringRef S) { warn(toString(File) + S + Sym->getName()); };
+  auto report = [&](StringRef s) { warn(toString(file) + s + sym->getName()); };
 
-  if (Sym->isUndefined())
-    Warn(": unable to order undefined symbol: ");
-  else if (Sym->isShared())
-    Warn(": unable to order shared symbol: ");
-  else if (D && !D->Section)
-    Warn(": unable to order absolute symbol: ");
-  else if (D && isa<OutputSection>(D->Section))
-    Warn(": unable to order synthetic symbol: ");
-  else if (D && !D->Section->Repl->Live)
-    Warn(": unable to order discarded symbol: ");
+  if (sym->isUndefined())
+    report(": unable to order undefined symbol: ");
+  else if (sym->isShared())
+    report(": unable to order shared symbol: ");
+  else if (d && !d->section)
+    report(": unable to order absolute symbol: ");
+  else if (d && isa<OutputSection>(d->section))
+    report(": unable to order synthetic symbol: ");
+  else if (d && !d->section->repl->isLive())
+    report(": unable to order discarded symbol: ");
 }
 
 // Returns a symbol for an error message.
-std::string lld::toString(const Symbol &B) {
-  if (Config->Demangle)
-    if (Optional<std::string> S = demangleItanium(B.getName()))
-      return *S;
-  return B.getName();
+std::string lld::toString(const Symbol &b) {
+  if (config->demangle)
+    if (Optional<std::string> s = demangleItanium(b.getName()))
+      return *s;
+  return b.getName();
+}
+
+static uint8_t getMinVisibility(uint8_t va, uint8_t vb) {
+  if (va == STV_DEFAULT)
+    return vb;
+  if (vb == STV_DEFAULT)
+    return va;
+  return std::min(va, vb);
+}
+
+// Merge symbol properties.
+//
+// When we have many symbols of the same name, we choose one of them,
+// and that's the result of symbol resolution. However, symbols that
+// were not chosen still affect some symbol properties.
+void Symbol::mergeProperties(const Symbol &other) {
+  if (other.exportDynamic)
+    exportDynamic = true;
+  if (other.isUsedInRegularObj)
+    isUsedInRegularObj = true;
+
+  // DSO symbols do not affect visibility in the output.
+  if (!other.isShared())
+    visibility = getMinVisibility(visibility, other.visibility);
+}
+
+void Symbol::resolve(const Symbol &other) {
+  mergeProperties(other);
+
+  if (isPlaceholder()) {
+    replace(other);
+    return;
+  }
+
+  switch (other.kind()) {
+  case Symbol::UndefinedKind:
+    resolveUndefined(cast<Undefined>(other));
+    break;
+  case Symbol::CommonKind:
+    resolveCommon(cast<CommonSymbol>(other));
+    break;
+  case Symbol::DefinedKind:
+    resolveDefined(cast<Defined>(other));
+    break;
+  case Symbol::LazyArchiveKind:
+    resolveLazy(cast<LazyArchive>(other));
+    break;
+  case Symbol::LazyObjectKind:
+    resolveLazy(cast<LazyObject>(other));
+    break;
+  case Symbol::SharedKind:
+    resolveShared(cast<SharedSymbol>(other));
+    break;
+  case Symbol::PlaceholderKind:
+    llvm_unreachable("bad symbol kind");
+  }
+}
+
+void Symbol::resolveUndefined(const Undefined &other) {
+  // An undefined symbol with non default visibility must be satisfied
+  // in the same DSO.
+  //
+  // If this is a non-weak defined symbol in a discarded section, override the
+  // existing undefined symbol for better error message later.
+  if ((isShared() && other.visibility != STV_DEFAULT) ||
+      (isUndefined() && other.binding != STB_WEAK && other.discardedSecIdx)) {
+    replace(other);
+    return;
+  }
+
+  if (traced)
+    printTraceSymbol(&other);
+
+  if (isLazy()) {
+    // An undefined weak will not fetch archive members. See comment on Lazy in
+    // Symbols.h for the details.
+    if (other.binding == STB_WEAK) {
+      binding = STB_WEAK;
+      type = other.type;
+      return;
+    }
+
+    // Do extra check for --warn-backrefs.
+    //
+    // --warn-backrefs is an option to prevent an undefined reference from
+    // fetching an archive member written earlier in the command line. It can be
+    // used to keep compatibility with GNU linkers to some degree.
+    // I'll explain the feature and why you may find it useful in this comment.
+    //
+    // lld's symbol resolution semantics is more relaxed than traditional Unix
+    // linkers. For example,
+    //
+    //   ld.lld foo.a bar.o
+    //
+    // succeeds even if bar.o contains an undefined symbol that has to be
+    // resolved by some object file in foo.a. Traditional Unix linkers don't
+    // allow this kind of backward reference, as they visit each file only once
+    // from left to right in the command line while resolving all undefined
+    // symbols at the moment of visiting.
+    //
+    // In the above case, since there's no undefined symbol when a linker visits
+    // foo.a, no files are pulled out from foo.a, and because the linker forgets
+    // about foo.a after visiting, it can't resolve undefined symbols in bar.o
+    // that could have been resolved otherwise.
+    //
+    // That lld accepts more relaxed form means that (besides it'd make more
+    // sense) you can accidentally write a command line or a build file that
+    // works only with lld, even if you have a plan to distribute it to wider
+    // users who may be using GNU linkers. With --warn-backrefs, you can detect
+    // a library order that doesn't work with other Unix linkers.
+    //
+    // The option is also useful to detect cyclic dependencies between static
+    // archives. Again, lld accepts
+    //
+    //   ld.lld foo.a bar.a
+    //
+    // even if foo.a and bar.a depend on each other. With --warn-backrefs, it is
+    // handled as an error.
+    //
+    // Here is how the option works. We assign a group ID to each file. A file
+    // with a smaller group ID can pull out object files from an archive file
+    // with an equal or greater group ID. Otherwise, it is a reverse dependency
+    // and an error.
+    //
+    // A file outside --{start,end}-group gets a fresh ID when instantiated. All
+    // files within the same --{start,end}-group get the same group ID. E.g.
+    //
+    //   ld.lld A B --start-group C D --end-group E
+    //
+    // A forms group 0. B form group 1. C and D (including their member object
+    // files) form group 2. E forms group 3. I think that you can see how this
+    // group assignment rule simulates the traditional linker's semantics.
+    bool backref = config->warnBackrefs && other.file &&
+                   file->groupId < other.file->groupId;
+    fetch();
+
+    // We don't report backward references to weak symbols as they can be
+    // overridden later.
+    if (backref && !isWeak())
+      warn("backward reference detected: " + other.getName() + " in " +
+           toString(other.file) + " refers to " + toString(file));
+    return;
+  }
+
+  // Undefined symbols in a SharedFile do not change the binding.
+  if (dyn_cast_or_null<SharedFile>(other.file))
+    return;
+
+  if (isUndefined()) {
+    // The binding may "upgrade" from weak to non-weak.
+    if (other.binding != STB_WEAK)
+      binding = other.binding;
+  } else if (auto *s = dyn_cast<SharedSymbol>(this)) {
+    // The binding of a SharedSymbol will be weak if there is at least one
+    // reference and all are weak. The binding has one opportunity to change to
+    // weak: if the first reference is weak.
+    if (other.binding != STB_WEAK || !s->referenced)
+      binding = other.binding;
+    s->referenced = true;
+  }
+}
+
+// Using .symver foo,foo@@VER unfortunately creates two symbols: foo and
+// foo@@VER. We want to effectively ignore foo, so give precedence to
+// foo@@VER.
+// FIXME: If users can transition to using
+// .symver foo,foo@@@VER
+// we can delete this hack.
+static int compareVersion(StringRef a, StringRef b) {
+  bool x = a.contains("@@");
+  bool y = b.contains("@@");
+  if (!x && y)
+    return 1;
+  if (x && !y)
+    return -1;
+  return 0;
+}
+
+// Compare two symbols. Return 1 if the new symbol should win, -1 if
+// the new symbol should lose, or 0 if there is a conflict.
+int Symbol::compare(const Symbol *other) const {
+  assert(other->isDefined() || other->isCommon());
+
+  if (!isDefined() && !isCommon())
+    return 1;
+
+  if (int cmp = compareVersion(getName(), other->getName()))
+    return cmp;
+
+  if (other->isWeak())
+    return -1;
+
+  if (isWeak())
+    return 1;
+
+  if (isCommon() && other->isCommon()) {
+    if (config->warnCommon)
+      warn("multiple common of " + getName());
+    return 0;
+  }
+
+  if (isCommon()) {
+    if (config->warnCommon)
+      warn("common " + getName() + " is overridden");
+    return 1;
+  }
+
+  if (other->isCommon()) {
+    if (config->warnCommon)
+      warn("common " + getName() + " is overridden");
+    return -1;
+  }
+
+  auto *oldSym = cast<Defined>(this);
+  auto *newSym = cast<Defined>(other);
+
+  if (other->file && isa<BitcodeFile>(other->file))
+    return 0;
+
+  if (!oldSym->section && !newSym->section && oldSym->value == newSym->value &&
+      newSym->binding == STB_GLOBAL)
+    return -1;
+
+  return 0;
+}
+
+static void reportDuplicate(Symbol *sym, InputFile *newFile,
+                            InputSectionBase *errSec, uint64_t errOffset) {
+  if (config->allowMultipleDefinition)
+    return;
+
+  Defined *d = cast<Defined>(sym);
+  if (!d->section || !errSec) {
+    error("duplicate symbol: " + toString(*sym) + "\n>>> defined in " +
+          toString(sym->file) + "\n>>> defined in " + toString(newFile));
+    return;
+  }
+
+  // Construct and print an error message in the form of:
+  //
+  //   ld.lld: error: duplicate symbol: foo
+  //   >>> defined at bar.c:30
+  //   >>>            bar.o (/home/alice/src/bar.o)
+  //   >>> defined at baz.c:563
+  //   >>>            baz.o in archive libbaz.a
+  auto *sec1 = cast<InputSectionBase>(d->section);
+  std::string src1 = sec1->getSrcMsg(*sym, d->value);
+  std::string obj1 = sec1->getObjMsg(d->value);
+  std::string src2 = errSec->getSrcMsg(*sym, errOffset);
+  std::string obj2 = errSec->getObjMsg(errOffset);
+
+  std::string msg = "duplicate symbol: " + toString(*sym) + "\n>>> defined at ";
+  if (!src1.empty())
+    msg += src1 + "\n>>>            ";
+  msg += obj1 + "\n>>> defined at ";
+  if (!src2.empty())
+    msg += src2 + "\n>>>            ";
+  msg += obj2;
+  error(msg);
+}
+
+void Symbol::resolveCommon(const CommonSymbol &other) {
+  int cmp = compare(&other);
+  if (cmp < 0)
+    return;
+
+  if (cmp > 0) {
+    replace(other);
+    return;
+  }
+
+  CommonSymbol *oldSym = cast<CommonSymbol>(this);
+
+  oldSym->alignment = std::max(oldSym->alignment, other.alignment);
+  if (oldSym->size < other.size) {
+    oldSym->file = other.file;
+    oldSym->size = other.size;
+  }
+}
+
+void Symbol::resolveDefined(const Defined &other) {
+  int cmp = compare(&other);
+  if (cmp > 0)
+    replace(other);
+  else if (cmp == 0)
+    reportDuplicate(this, other.file,
+                    dyn_cast_or_null<InputSectionBase>(other.section),
+                    other.value);
+}
+
+template <class LazyT> void Symbol::resolveLazy(const LazyT &other) {
+  if (!isUndefined())
+    return;
+
+  // An undefined weak will not fetch archive members. See comment on Lazy in
+  // Symbols.h for the details.
+  if (isWeak()) {
+    uint8_t ty = type;
+    replace(other);
+    type = ty;
+    binding = STB_WEAK;
+    return;
+  }
+
+  other.fetch();
+}
+
+void Symbol::resolveShared(const SharedSymbol &other) {
+  if (visibility == STV_DEFAULT && (isUndefined() || isLazy())) {
+    // An undefined symbol with non default visibility must be satisfied
+    // in the same DSO.
+    uint8_t bind = binding;
+    replace(other);
+    binding = bind;
+    cast<SharedSymbol>(this)->referenced = true;
+  }
 }
diff --git a/deps/lld/ELF/Symbols.h b/deps/lld/ELF/Symbols.h
index 4d55405d8936d3997a8df97367da113afbfb69e7..d640495b0e011b0762091bb5087306634d2de32a 100644
--- a/deps/lld/ELF/Symbols.h
+++ b/deps/lld/ELF/Symbols.h
@@ -1,9 +1,8 @@
 //===- Symbols.h ------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -14,6 +13,7 @@
 #ifndef LLD_ELF_SYMBOLS_H
 #define LLD_ELF_SYMBOLS_H
 
+#include "InputFiles.h"
 #include "InputSection.h"
 #include "lld/Common/LLVM.h"
 #include "lld/Common/Strings.h"
@@ -22,8 +22,14 @@
 
 namespace lld {
 namespace elf {
+class CommonSymbol;
+class Defined;
+class InputFile;
+class LazyArchive;
+class LazyObject;
+class SharedSymbol;
 class Symbol;
-class InputFile;
+class Undefined;
 } // namespace elf
 
 std::string toString(const elf::Symbol &);
@@ -31,15 +37,6 @@ std::string toString(const elf::InputFile *);
 
 namespace elf {
 
-class ArchiveFile;
-class BitcodeFile;
-class BssSection;
-class InputFile;
-class LazyObjFile;
-template <class ELFT> class ObjFile;
-class OutputSection;
-template <class ELFT> class SharedFile;
-
 // This is a StringRef-like container that doesn't run strlen().
 //
 // ELF string tables contain a lot of null-terminated strings. Most of them
@@ -47,11 +44,11 @@ template <class ELFT> class SharedFile;
 // and the linker doesn't use local symbol names for name resolution. So, we
 // use this class to represents strings read from string tables.
 struct StringRefZ {
-  StringRefZ(const char *S) : Data(S), Size(-1) {}
-  StringRefZ(StringRef S) : Data(S.data()), Size(S.size()) {}
+  StringRefZ(const char *s) : data(s), size(-1) {}
+  StringRefZ(StringRef s) : data(s.data()), size(s.size()) {}
 
-  const char *Data;
-  const uint32_t Size;
+  const char *data;
+  const uint32_t size;
 };
 
 // The base class for real symbol classes.
@@ -60,85 +57,91 @@ public:
   enum Kind {
     PlaceholderKind,
     DefinedKind,
+    CommonKind,
     SharedKind,
     UndefinedKind,
     LazyArchiveKind,
     LazyObjectKind,
   };
 
-  Kind kind() const { return static_cast<Kind>(SymbolKind); }
+  Kind kind() const { return static_cast<Kind>(symbolKind); }
 
   // The file from which this symbol was created.
-  InputFile *File;
+  InputFile *file;
 
 protected:
-  const char *NameData;
-  mutable uint32_t NameSize;
+  const char *nameData;
+  mutable uint32_t nameSize;
 
 public:
-  uint32_t DynsymIndex = 0;
-  uint32_t GotIndex = -1;
-  uint32_t PltIndex = -1;
+  uint32_t dynsymIndex = 0;
+  uint32_t gotIndex = -1;
+  uint32_t pltIndex = -1;
 
-  uint32_t GlobalDynIndex = -1;
+  uint32_t globalDynIndex = -1;
 
   // This field is a index to the symbol's version definition.
-  uint32_t VerdefIndex = -1;
+  uint32_t verdefIndex = -1;
 
   // Version definition index.
-  uint16_t VersionId;
+  uint16_t versionId;
 
   // An index into the .branch_lt section on PPC64.
-  uint16_t PPC64BranchltIndex = -1;
+  uint16_t ppc64BranchltIndex = -1;
 
-  // Symbol binding. This is not overwritten by replaceSymbol to track
+  // Symbol binding. This is not overwritten by replace() to track
   // changes during resolution. In particular:
   //  - An undefined weak is still weak when it resolves to a shared library.
   //  - An undefined weak will not fetch archive members, but we have to
   //    remember it is weak.
-  uint8_t Binding;
+  uint8_t binding;
 
   // The following fields have the same meaning as the ELF symbol attributes.
-  uint8_t Type;    // symbol type
-  uint8_t StOther; // st_other field value
+  uint8_t type;    // symbol type
+  uint8_t stOther; // st_other field value
 
-  uint8_t SymbolKind;
+  uint8_t symbolKind;
 
   // Symbol visibility. This is the computed minimum visibility of all
   // observed non-DSO symbols.
-  unsigned Visibility : 2;
+  unsigned visibility : 2;
 
   // True if the symbol was used for linking and thus need to be added to the
   // output file's symbol table. This is true for all symbols except for
-  // unreferenced DSO symbols and bitcode symbols that are unreferenced except
-  // by other bitcode objects.
-  unsigned IsUsedInRegularObj : 1;
+  // unreferenced DSO symbols, lazy (archive) symbols, and bitcode symbols that
+  // are unreferenced except by other bitcode objects.
+  unsigned isUsedInRegularObj : 1;
 
   // If this flag is true and the symbol has protected or default visibility, it
   // will appear in .dynsym. This flag is set by interposable DSO symbols in
   // executables, by most symbols in DSOs and executables built with
   // --export-dynamic, and by dynamic lists.
-  unsigned ExportDynamic : 1;
+  unsigned exportDynamic : 1;
 
   // False if LTO shouldn't inline whatever this symbol points to. If a symbol
   // is overwritten after LTO, LTO shouldn't inline the symbol because it
   // doesn't know the final contents of the symbol.
-  unsigned CanInline : 1;
+  unsigned canInline : 1;
 
   // True if this symbol is specified by --trace-symbol option.
-  unsigned Traced : 1;
+  unsigned traced : 1;
+
+  inline void replace(const Symbol &New);
 
   bool includeInDynsym() const;
   uint8_t computeBinding() const;
-  bool isWeak() const { return Binding == llvm::ELF::STB_WEAK; }
+  bool isWeak() const { return binding == llvm::ELF::STB_WEAK; }
 
-  bool isUndefined() const { return SymbolKind == UndefinedKind; }
-  bool isDefined() const { return SymbolKind == DefinedKind; }
-  bool isShared() const { return SymbolKind == SharedKind; }
-  bool isLocal() const { return Binding == llvm::ELF::STB_LOCAL; }
+  bool isUndefined() const { return symbolKind == UndefinedKind; }
+  bool isCommon() const { return symbolKind == CommonKind; }
+  bool isDefined() const { return symbolKind == DefinedKind; }
+  bool isShared() const { return symbolKind == SharedKind; }
+  bool isPlaceholder() const { return symbolKind == PlaceholderKind; }
+
+  bool isLocal() const { return binding == llvm::ELF::STB_LOCAL; }
 
   bool isLazy() const {
-    return SymbolKind == LazyArchiveKind || SymbolKind == LazyObjectKind;
+    return symbolKind == LazyArchiveKind || symbolKind == LazyObjectKind;
   }
 
   // True if this is an undefined weak symbol. This only works once
@@ -149,23 +152,23 @@ public:
   }
 
   StringRef getName() const {
-    if (NameSize == (uint32_t)-1)
-      NameSize = strlen(NameData);
-    return {NameData, NameSize};
+    if (nameSize == (uint32_t)-1)
+      nameSize = strlen(nameData);
+    return {nameData, nameSize};
   }
 
-  void setName(StringRef S) {
-    NameData = S.data();
-    NameSize = S.size();
+  void setName(StringRef s) {
+    nameData = s.data();
+    nameSize = s.size();
   }
 
   void parseSymbolVersion();
 
-  bool isInGot() const { return GotIndex != -1U; }
-  bool isInPlt() const { return PltIndex != -1U; }
-  bool isInPPC64Branchlt() const { return PPC64BranchltIndex != 0xffff; }
+  bool isInGot() const { return gotIndex != -1U; }
+  bool isInPlt() const { return pltIndex != -1U; }
+  bool isInPPC64Branchlt() const { return ppc64BranchltIndex != 0xffff; }
 
-  uint64_t getVA(int64_t Addend = 0) const;
+  uint64_t getVA(int64_t addend = 0) const;
 
   uint64_t getGotOffset() const;
   uint64_t getGotVA() const;
@@ -177,81 +180,164 @@ public:
   uint64_t getSize() const;
   OutputSection *getOutputSection() const;
 
+  // The following two functions are used for symbol resolution.
+  //
+  // You are expected to call mergeProperties for all symbols in input
+  // files so that attributes that are attached to names rather than
+  // indivisual symbol (such as visibility) are merged together.
+  //
+  // Every time you read a new symbol from an input, you are supposed
+  // to call resolve() with the new symbol. That function replaces
+  // "this" object as a result of name resolution if the new symbol is
+  // more appropriate to be included in the output.
+  //
+  // For example, if "this" is an undefined symbol and a new symbol is
+  // a defined symbol, "this" is replaced with the new symbol.
+  void mergeProperties(const Symbol &other);
+  void resolve(const Symbol &other);
+
+  // If this is a lazy symbol, fetch an input file and add the symbol
+  // in the file to the symbol table. Calling this function on
+  // non-lazy object causes a runtime error.
+  void fetch() const;
+
+private:
+  static bool isExportDynamic(Kind k, uint8_t visibility) {
+    if (k == SharedKind)
+      return visibility == llvm::ELF::STV_DEFAULT;
+    return config->shared || config->exportDynamic;
+  }
+
+  void resolveUndefined(const Undefined &other);
+  void resolveCommon(const CommonSymbol &other);
+  void resolveDefined(const Defined &other);
+  template <class LazyT> void resolveLazy(const LazyT &other);
+  void resolveShared(const SharedSymbol &other);
+
+  int compare(const Symbol *other) const;
+
+  inline size_t getSymbolSize() const;
+
 protected:
-  Symbol(Kind K, InputFile *File, StringRefZ Name, uint8_t Binding,
-         uint8_t StOther, uint8_t Type)
-      : File(File), NameData(Name.Data), NameSize(Name.Size), Binding(Binding),
-        Type(Type), StOther(StOther), SymbolKind(K), NeedsPltAddr(false),
-        IsInIplt(false), IsInIgot(false), IsPreemptible(false),
-        Used(!Config->GcSections), NeedsTocRestore(false),
-        ScriptDefined(false) {}
+  Symbol(Kind k, InputFile *file, StringRefZ name, uint8_t binding,
+         uint8_t stOther, uint8_t type)
+      : file(file), nameData(name.data), nameSize(name.size), binding(binding),
+        type(type), stOther(stOther), symbolKind(k), visibility(stOther & 3),
+        isUsedInRegularObj(!file || file->kind() == InputFile::ObjKind),
+        exportDynamic(isExportDynamic(k, visibility)), canInline(false),
+        traced(false), needsPltAddr(false), isInIplt(false), gotInIgot(false),
+        isPreemptible(false), used(!config->gcSections), needsTocRestore(false),
+        scriptDefined(false) {}
 
 public:
   // True the symbol should point to its PLT entry.
   // For SharedSymbol only.
-  unsigned NeedsPltAddr : 1;
+  unsigned needsPltAddr : 1;
 
-  // True if this symbol is in the Iplt sub-section of the Plt.
-  unsigned IsInIplt : 1;
+  // True if this symbol is in the Iplt sub-section of the Plt and the Igot
+  // sub-section of the .got.plt or .got.
+  unsigned isInIplt : 1;
 
-  // True if this symbol is in the Igot sub-section of the .got.plt or .got.
-  unsigned IsInIgot : 1;
+  // True if this symbol needs a GOT entry and its GOT entry is actually in
+  // Igot. This will be true only for certain non-preemptible ifuncs.
+  unsigned gotInIgot : 1;
 
   // True if this symbol is preemptible at load time.
-  unsigned IsPreemptible : 1;
+  unsigned isPreemptible : 1;
 
   // True if an undefined or shared symbol is used from a live section.
-  unsigned Used : 1;
+  unsigned used : 1;
 
   // True if a call to this symbol needs to be followed by a restore of the
   // PPC64 toc pointer.
-  unsigned NeedsTocRestore : 1;
+  unsigned needsTocRestore : 1;
 
   // True if this symbol is defined by a linker script.
-  unsigned ScriptDefined : 1;
+  unsigned scriptDefined : 1;
 
-  bool isSection() const { return Type == llvm::ELF::STT_SECTION; }
-  bool isTls() const { return Type == llvm::ELF::STT_TLS; }
-  bool isFunc() const { return Type == llvm::ELF::STT_FUNC; }
-  bool isGnuIFunc() const { return Type == llvm::ELF::STT_GNU_IFUNC; }
-  bool isObject() const { return Type == llvm::ELF::STT_OBJECT; }
-  bool isFile() const { return Type == llvm::ELF::STT_FILE; }
+  // The partition whose dynamic symbol table contains this symbol's definition.
+  uint8_t partition = 1;
+
+  bool isSection() const { return type == llvm::ELF::STT_SECTION; }
+  bool isTls() const { return type == llvm::ELF::STT_TLS; }
+  bool isFunc() const { return type == llvm::ELF::STT_FUNC; }
+  bool isGnuIFunc() const { return type == llvm::ELF::STT_GNU_IFUNC; }
+  bool isObject() const { return type == llvm::ELF::STT_OBJECT; }
+  bool isFile() const { return type == llvm::ELF::STT_FILE; }
 };
 
 // Represents a symbol that is defined in the current output file.
 class Defined : public Symbol {
 public:
-  Defined(InputFile *File, StringRefZ Name, uint8_t Binding, uint8_t StOther,
-          uint8_t Type, uint64_t Value, uint64_t Size, SectionBase *Section)
-      : Symbol(DefinedKind, File, Name, Binding, StOther, Type), Value(Value),
-        Size(Size), Section(Section) {}
+  Defined(InputFile *file, StringRefZ name, uint8_t binding, uint8_t stOther,
+          uint8_t type, uint64_t value, uint64_t size, SectionBase *section)
+      : Symbol(DefinedKind, file, name, binding, stOther, type), value(value),
+        size(size), section(section) {}
 
-  static bool classof(const Symbol *S) { return S->isDefined(); }
+  static bool classof(const Symbol *s) { return s->isDefined(); }
 
-  uint64_t Value;
-  uint64_t Size;
-  SectionBase *Section;
+  uint64_t value;
+  uint64_t size;
+  SectionBase *section;
+};
+
+// Represents a common symbol.
+//
+// On Unix, it is traditionally allowed to write variable definitions
+// without initialization expressions (such as "int foo;") to header
+// files. Such definition is called "tentative definition".
+//
+// Using tentative definition is usually considered a bad practice
+// because you should write only declarations (such as "extern int
+// foo;") to header files. Nevertheless, the linker and the compiler
+// have to do something to support bad code by allowing duplicate
+// definitions for this particular case.
+//
+// Common symbols represent variable definitions without initializations.
+// The compiler creates common symbols when it sees varaible definitions
+// without initialization (you can suppress this behavior and let the
+// compiler create a regular defined symbol by -fno-common).
+//
+// The linker allows common symbols to be replaced by regular defined
+// symbols. If there are remaining common symbols after name resolution is
+// complete, they are converted to regular defined symbols in a .bss
+// section. (Therefore, the later passes don't see any CommonSymbols.)
+class CommonSymbol : public Symbol {
+public:
+  CommonSymbol(InputFile *file, StringRefZ name, uint8_t binding,
+               uint8_t stOther, uint8_t type, uint64_t alignment, uint64_t size)
+      : Symbol(CommonKind, file, name, binding, stOther, type),
+        alignment(alignment), size(size) {}
+
+  static bool classof(const Symbol *s) { return s->isCommon(); }
+
+  uint32_t alignment;
+  uint64_t size;
 };
 
 class Undefined : public Symbol {
 public:
-  Undefined(InputFile *File, StringRefZ Name, uint8_t Binding, uint8_t StOther,
-            uint8_t Type)
-      : Symbol(UndefinedKind, File, Name, Binding, StOther, Type) {}
+  Undefined(InputFile *file, StringRefZ name, uint8_t binding, uint8_t stOther,
+            uint8_t type, uint32_t discardedSecIdx = 0)
+      : Symbol(UndefinedKind, file, name, binding, stOther, type),
+        discardedSecIdx(discardedSecIdx) {}
 
-  static bool classof(const Symbol *S) { return S->kind() == UndefinedKind; }
+  static bool classof(const Symbol *s) { return s->kind() == UndefinedKind; }
+
+  // The section index if in a discarded section, 0 otherwise.
+  uint32_t discardedSecIdx;
 };
 
 class SharedSymbol : public Symbol {
 public:
-  static bool classof(const Symbol *S) { return S->kind() == SharedKind; }
+  static bool classof(const Symbol *s) { return s->kind() == SharedKind; }
 
-  SharedSymbol(InputFile &File, StringRef Name, uint8_t Binding,
-               uint8_t StOther, uint8_t Type, uint64_t Value, uint64_t Size,
-               uint32_t Alignment, uint32_t VerdefIndex)
-      : Symbol(SharedKind, &File, Name, Binding, StOther, Type),
-        Alignment(Alignment), Value(Value), Size(Size) {
-    this->VerdefIndex = VerdefIndex;
+  SharedSymbol(InputFile &file, StringRef name, uint8_t binding,
+               uint8_t stOther, uint8_t type, uint64_t value, uint64_t size,
+               uint32_t alignment, uint32_t verdefIndex)
+      : Symbol(SharedKind, &file, name, binding, stOther, type), value(value),
+        size(size), alignment(alignment) {
+    this->verdefIndex = verdefIndex;
     // GNU ifunc is a mechanism to allow user-supplied functions to
     // resolve PLT slot values at load-time. This is contrary to the
     // regular symbol resolution scheme in which symbols are resolved just
@@ -268,18 +354,20 @@ public:
     // For DSO symbols, we always call them through PLT slots anyway.
     // So there's no difference between GNU ifunc and regular function
     // symbols if they are in DSOs. So we can handle GNU_IFUNC as FUNC.
-    if (this->Type == llvm::ELF::STT_GNU_IFUNC)
-      this->Type = llvm::ELF::STT_FUNC;
+    if (this->type == llvm::ELF::STT_GNU_IFUNC)
+      this->type = llvm::ELF::STT_FUNC;
   }
 
-  template <class ELFT> SharedFile<ELFT> &getFile() const {
-    return *cast<SharedFile<ELFT>>(File);
-  }
+  SharedFile &getFile() const { return *cast<SharedFile>(file); }
 
-  uint32_t Alignment;
+  uint64_t value; // st_value
+  uint64_t size;  // st_size
+  uint32_t alignment;
 
-  uint64_t Value; // st_value
-  uint64_t Size;  // st_size
+  // This is true if there has been at least one undefined reference to the
+  // symbol. The binding may change to STB_WEAK if the first undefined reference
+  // is weak.
+  bool referenced = false;
 };
 
 // LazyArchive and LazyObject represent a symbols that is not yet in the link,
@@ -298,121 +386,168 @@ public:
 // symbol.
 class LazyArchive : public Symbol {
 public:
-  LazyArchive(InputFile &File, uint8_t Type,
-              const llvm::object::Archive::Symbol S)
-      : Symbol(LazyArchiveKind, &File, S.getName(), llvm::ELF::STB_GLOBAL,
-               llvm::ELF::STV_DEFAULT, Type),
-        Sym(S) {}
+  LazyArchive(InputFile &file, const llvm::object::Archive::Symbol s)
+      : Symbol(LazyArchiveKind, &file, s.getName(), llvm::ELF::STB_GLOBAL,
+               llvm::ELF::STV_DEFAULT, llvm::ELF::STT_NOTYPE),
+        sym(s) {}
 
-  static bool classof(const Symbol *S) { return S->kind() == LazyArchiveKind; }
+  static bool classof(const Symbol *s) { return s->kind() == LazyArchiveKind; }
 
-  InputFile *fetch();
   MemoryBufferRef getMemberBuffer();
 
-private:
-  const llvm::object::Archive::Symbol Sym;
+  const llvm::object::Archive::Symbol sym;
 };
 
 // LazyObject symbols represents symbols in object files between
 // --start-lib and --end-lib options.
 class LazyObject : public Symbol {
 public:
-  LazyObject(InputFile &File, uint8_t Type, StringRef Name)
-      : Symbol(LazyObjectKind, &File, Name, llvm::ELF::STB_GLOBAL,
-               llvm::ELF::STV_DEFAULT, Type) {}
+  LazyObject(InputFile &file, StringRef name)
+      : Symbol(LazyObjectKind, &file, name, llvm::ELF::STB_GLOBAL,
+               llvm::ELF::STV_DEFAULT, llvm::ELF::STT_NOTYPE) {}
 
-  static bool classof(const Symbol *S) { return S->kind() == LazyObjectKind; }
+  static bool classof(const Symbol *s) { return s->kind() == LazyObjectKind; }
 };
 
 // Some linker-generated symbols need to be created as
 // Defined symbols.
 struct ElfSym {
   // __bss_start
-  static Defined *Bss;
+  static Defined *bss;
 
   // etext and _etext
-  static Defined *Etext1;
-  static Defined *Etext2;
+  static Defined *etext1;
+  static Defined *etext2;
 
   // edata and _edata
-  static Defined *Edata1;
-  static Defined *Edata2;
+  static Defined *edata1;
+  static Defined *edata2;
 
   // end and _end
-  static Defined *End1;
-  static Defined *End2;
+  static Defined *end1;
+  static Defined *end2;
 
   // The _GLOBAL_OFFSET_TABLE_ symbol is defined by target convention to
   // be at some offset from the base of the .got section, usually 0 or
   // the end of the .got.
-  static Defined *GlobalOffsetTable;
+  static Defined *globalOffsetTable;
 
   // _gp, _gp_disp and __gnu_local_gp symbols. Only for MIPS.
-  static Defined *MipsGp;
-  static Defined *MipsGpDisp;
-  static Defined *MipsLocalGp;
+  static Defined *mipsGp;
+  static Defined *mipsGpDisp;
+  static Defined *mipsLocalGp;
 
   // __rel{,a}_iplt_{start,end} symbols.
-  static Defined *RelaIpltStart;
-  static Defined *RelaIpltEnd;
+  static Defined *relaIpltStart;
+  static Defined *relaIpltEnd;
+
+  // __global_pointer$ for RISC-V.
+  static Defined *riscvGlobalPointer;
+
+  // _TLS_MODULE_BASE_ on targets that support TLSDESC.
+  static Defined *tlsModuleBase;
 };
 
 // A buffer class that is large enough to hold any Symbol-derived
 // object. We allocate memory using this class and instantiate a symbol
 // using the placement new.
 union SymbolUnion {
-  alignas(Defined) char A[sizeof(Defined)];
-  alignas(Undefined) char C[sizeof(Undefined)];
-  alignas(SharedSymbol) char D[sizeof(SharedSymbol)];
-  alignas(LazyArchive) char E[sizeof(LazyArchive)];
-  alignas(LazyObject) char F[sizeof(LazyObject)];
+  alignas(Defined) char a[sizeof(Defined)];
+  alignas(CommonSymbol) char b[sizeof(CommonSymbol)];
+  alignas(Undefined) char c[sizeof(Undefined)];
+  alignas(SharedSymbol) char d[sizeof(SharedSymbol)];
+  alignas(LazyArchive) char e[sizeof(LazyArchive)];
+  alignas(LazyObject) char f[sizeof(LazyObject)];
 };
 
-void printTraceSymbol(Symbol *Sym);
-
-template <typename T, typename... ArgT>
-void replaceSymbol(Symbol *S, ArgT &&... Arg) {
-  using llvm::ELF::STT_TLS;
+// It is important to keep the size of SymbolUnion small for performance and
+// memory usage reasons. 80 bytes is a soft limit based on the size of Defined
+// on a 64-bit system.
+static_assert(sizeof(SymbolUnion) <= 80, "SymbolUnion too large");
 
+template <typename T> struct AssertSymbol {
   static_assert(std::is_trivially_destructible<T>(),
                 "Symbol types must be trivially destructible");
   static_assert(sizeof(T) <= sizeof(SymbolUnion), "SymbolUnion too small");
   static_assert(alignof(T) <= alignof(SymbolUnion),
                 "SymbolUnion not aligned enough");
-  assert(static_cast<Symbol *>(static_cast<T *>(nullptr)) == nullptr &&
-         "Not a Symbol");
+};
 
-  Symbol Sym = *S;
+static inline void assertSymbols() {
+  AssertSymbol<Defined>();
+  AssertSymbol<CommonSymbol>();
+  AssertSymbol<Undefined>();
+  AssertSymbol<SharedSymbol>();
+  AssertSymbol<LazyArchive>();
+  AssertSymbol<LazyObject>();
+}
 
-  new (S) T(std::forward<ArgT>(Arg)...);
+void printTraceSymbol(const Symbol *sym);
 
-  S->VersionId = Sym.VersionId;
-  S->Visibility = Sym.Visibility;
-  S->IsUsedInRegularObj = Sym.IsUsedInRegularObj;
-  S->ExportDynamic = Sym.ExportDynamic;
-  S->CanInline = Sym.CanInline;
-  S->Traced = Sym.Traced;
-  S->ScriptDefined = Sym.ScriptDefined;
+size_t Symbol::getSymbolSize() const {
+  switch (kind()) {
+  case CommonKind:
+    return sizeof(CommonSymbol);
+  case DefinedKind:
+    return sizeof(Defined);
+  case LazyArchiveKind:
+    return sizeof(LazyArchive);
+  case LazyObjectKind:
+    return sizeof(LazyObject);
+  case SharedKind:
+    return sizeof(SharedSymbol);
+  case UndefinedKind:
+    return sizeof(Undefined);
+  case PlaceholderKind:
+    return sizeof(Symbol);
+  }
+  llvm_unreachable("unknown symbol kind");
+}
+
+// replace() replaces "this" object with a given symbol by memcpy'ing
+// it over to "this". This function is called as a result of name
+// resolution, e.g. to replace an undefind symbol with a defined symbol.
+void Symbol::replace(const Symbol &New) {
+  using llvm::ELF::STT_TLS;
 
   // Symbols representing thread-local variables must be referenced by
   // TLS-aware relocations, and non-TLS symbols must be reference by
   // non-TLS relocations, so there's a clear distinction between TLS
   // and non-TLS symbols. It is an error if the same symbol is defined
   // as a TLS symbol in one file and as a non-TLS symbol in other file.
-  bool TlsMismatch = (Sym.Type == STT_TLS && S->Type != STT_TLS) ||
-                     (Sym.Type != STT_TLS && S->Type == STT_TLS);
+  if (symbolKind != PlaceholderKind && !isLazy() && !New.isLazy()) {
+    bool tlsMismatch = (type == STT_TLS && New.type != STT_TLS) ||
+                       (type != STT_TLS && New.type == STT_TLS);
+    if (tlsMismatch)
+      error("TLS attribute mismatch: " + toString(*this) + "\n>>> defined in " +
+            toString(New.file) + "\n>>> defined in " + toString(file));
+  }
 
-  if (Sym.SymbolKind != Symbol::PlaceholderKind && TlsMismatch && !Sym.isLazy())
-    error("TLS attribute mismatch: " + toString(Sym) + "\n>>> defined in " +
-          toString(Sym.File) + "\n>>> defined in " + toString(S->File));
+  Symbol old = *this;
+  memcpy(this, &New, New.getSymbolSize());
+
+  versionId = old.versionId;
+  visibility = old.visibility;
+  isUsedInRegularObj = old.isUsedInRegularObj;
+  exportDynamic = old.exportDynamic;
+  canInline = old.canInline;
+  traced = old.traced;
+  isPreemptible = old.isPreemptible;
+  scriptDefined = old.scriptDefined;
+  partition = old.partition;
+
+  // Symbol length is computed lazily. If we already know a symbol length,
+  // propagate it.
+  if (nameData == old.nameData && nameSize == 0 && old.nameSize != 0)
+    nameSize = old.nameSize;
 
   // Print out a log message if --trace-symbol was specified.
   // This is for debugging.
-  if (S->Traced)
-    printTraceSymbol(S);
+  if (traced)
+    printTraceSymbol(this);
 }
 
-void maybeWarnUnorderableSymbol(const Symbol *Sym);
+void maybeWarnUnorderableSymbol(const Symbol *sym);
 } // namespace elf
 } // namespace lld
 
diff --git a/deps/lld/ELF/SyntheticSections.cpp b/deps/lld/ELF/SyntheticSections.cpp
index b1a3f8bc70aec7f89365295dc688af635e20167c..f6d0f190d84d07711ae2aae83b592c236092aa5e 100644
--- a/deps/lld/ELF/SyntheticSections.cpp
+++ b/deps/lld/ELF/SyntheticSections.cpp
@@ -1,9 +1,8 @@
 //===- SyntheticSections.cpp ----------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -15,7 +14,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "SyntheticSections.h"
-#include "Bits.h"
 #include "Config.h"
 #include "InputFiles.h"
 #include "LinkerScript.h"
@@ -38,9 +36,6 @@
 #include "llvm/Support/Endian.h"
 #include "llvm/Support/LEB128.h"
 #include "llvm/Support/MD5.h"
-#include "llvm/Support/RandomNumberGenerator.h"
-#include "llvm/Support/SHA1.h"
-#include "llvm/Support/xxhash.h"
 #include <cstdlib>
 #include <thread>
 
@@ -57,19 +52,30 @@ using llvm::support::endian::read32le;
 using llvm::support::endian::write32le;
 using llvm::support::endian::write64le;
 
-constexpr size_t MergeNoTailSection::NumShards;
+constexpr size_t MergeNoTailSection::numShards;
+
+static uint64_t readUint(uint8_t *buf) {
+  return config->is64 ? read64(buf) : read32(buf);
+}
+
+static void writeUint(uint8_t *buf, uint64_t val) {
+  if (config->is64)
+    write64(buf, val);
+  else
+    write32(buf, val);
+}
 
 // Returns an LLD version string.
 static ArrayRef<uint8_t> getVersion() {
   // Check LLD_VERSION first for ease of testing.
   // You can get consistent output by using the environment variable.
   // This is only for testing.
-  StringRef S = getenv("LLD_VERSION");
-  if (S.empty())
-    S = Saver.save(Twine("Linker: ") + getLLDVersion());
+  StringRef s = getenv("LLD_VERSION");
+  if (s.empty())
+    s = saver.save(Twine("Linker: ") + getLLDVersion());
 
   // +1 to include the terminating '\0'.
-  return {(const uint8_t *)S.data(), S.size() + 1};
+  return {(const uint8_t *)s.data(), s.size() + 1};
 }
 
 // Creates a .comment section containing LLD version info.
@@ -83,79 +89,79 @@ MergeInputSection *elf::createCommentSection() {
 
 // .MIPS.abiflags section.
 template <class ELFT>
-MipsAbiFlagsSection<ELFT>::MipsAbiFlagsSection(Elf_Mips_ABIFlags Flags)
+MipsAbiFlagsSection<ELFT>::MipsAbiFlagsSection(Elf_Mips_ABIFlags flags)
     : SyntheticSection(SHF_ALLOC, SHT_MIPS_ABIFLAGS, 8, ".MIPS.abiflags"),
-      Flags(Flags) {
-  this->Entsize = sizeof(Elf_Mips_ABIFlags);
+      flags(flags) {
+  this->entsize = sizeof(Elf_Mips_ABIFlags);
 }
 
-template <class ELFT> void MipsAbiFlagsSection<ELFT>::writeTo(uint8_t *Buf) {
-  memcpy(Buf, &Flags, sizeof(Flags));
+template <class ELFT> void MipsAbiFlagsSection<ELFT>::writeTo(uint8_t *buf) {
+  memcpy(buf, &flags, sizeof(flags));
 }
 
 template <class ELFT>
 MipsAbiFlagsSection<ELFT> *MipsAbiFlagsSection<ELFT>::create() {
-  Elf_Mips_ABIFlags Flags = {};
-  bool Create = false;
+  Elf_Mips_ABIFlags flags = {};
+  bool create = false;
 
-  for (InputSectionBase *Sec : InputSections) {
-    if (Sec->Type != SHT_MIPS_ABIFLAGS)
+  for (InputSectionBase *sec : inputSections) {
+    if (sec->type != SHT_MIPS_ABIFLAGS)
       continue;
-    Sec->Live = false;
-    Create = true;
+    sec->markDead();
+    create = true;
 
-    std::string Filename = toString(Sec->File);
-    const size_t Size = Sec->data().size();
+    std::string filename = toString(sec->file);
+    const size_t size = sec->data().size();
     // Older version of BFD (such as the default FreeBSD linker) concatenate
     // .MIPS.abiflags instead of merging. To allow for this case (or potential
     // zero padding) we ignore everything after the first Elf_Mips_ABIFlags
-    if (Size < sizeof(Elf_Mips_ABIFlags)) {
-      error(Filename + ": invalid size of .MIPS.abiflags section: got " +
-            Twine(Size) + " instead of " + Twine(sizeof(Elf_Mips_ABIFlags)));
+    if (size < sizeof(Elf_Mips_ABIFlags)) {
+      error(filename + ": invalid size of .MIPS.abiflags section: got " +
+            Twine(size) + " instead of " + Twine(sizeof(Elf_Mips_ABIFlags)));
       return nullptr;
     }
-    auto *S = reinterpret_cast<const Elf_Mips_ABIFlags *>(Sec->data().data());
-    if (S->version != 0) {
-      error(Filename + ": unexpected .MIPS.abiflags version " +
-            Twine(S->version));
+    auto *s = reinterpret_cast<const Elf_Mips_ABIFlags *>(sec->data().data());
+    if (s->version != 0) {
+      error(filename + ": unexpected .MIPS.abiflags version " +
+            Twine(s->version));
       return nullptr;
     }
 
     // LLD checks ISA compatibility in calcMipsEFlags(). Here we just
     // select the highest number of ISA/Rev/Ext.
-    Flags.isa_level = std::max(Flags.isa_level, S->isa_level);
-    Flags.isa_rev = std::max(Flags.isa_rev, S->isa_rev);
-    Flags.isa_ext = std::max(Flags.isa_ext, S->isa_ext);
-    Flags.gpr_size = std::max(Flags.gpr_size, S->gpr_size);
-    Flags.cpr1_size = std::max(Flags.cpr1_size, S->cpr1_size);
-    Flags.cpr2_size = std::max(Flags.cpr2_size, S->cpr2_size);
-    Flags.ases |= S->ases;
-    Flags.flags1 |= S->flags1;
-    Flags.flags2 |= S->flags2;
-    Flags.fp_abi = elf::getMipsFpAbiFlag(Flags.fp_abi, S->fp_abi, Filename);
+    flags.isa_level = std::max(flags.isa_level, s->isa_level);
+    flags.isa_rev = std::max(flags.isa_rev, s->isa_rev);
+    flags.isa_ext = std::max(flags.isa_ext, s->isa_ext);
+    flags.gpr_size = std::max(flags.gpr_size, s->gpr_size);
+    flags.cpr1_size = std::max(flags.cpr1_size, s->cpr1_size);
+    flags.cpr2_size = std::max(flags.cpr2_size, s->cpr2_size);
+    flags.ases |= s->ases;
+    flags.flags1 |= s->flags1;
+    flags.flags2 |= s->flags2;
+    flags.fp_abi = elf::getMipsFpAbiFlag(flags.fp_abi, s->fp_abi, filename);
   };
 
-  if (Create)
-    return make<MipsAbiFlagsSection<ELFT>>(Flags);
+  if (create)
+    return make<MipsAbiFlagsSection<ELFT>>(flags);
   return nullptr;
 }
 
 // .MIPS.options section.
 template <class ELFT>
-MipsOptionsSection<ELFT>::MipsOptionsSection(Elf_Mips_RegInfo Reginfo)
+MipsOptionsSection<ELFT>::MipsOptionsSection(Elf_Mips_RegInfo reginfo)
     : SyntheticSection(SHF_ALLOC, SHT_MIPS_OPTIONS, 8, ".MIPS.options"),
-      Reginfo(Reginfo) {
-  this->Entsize = sizeof(Elf_Mips_Options) + sizeof(Elf_Mips_RegInfo);
+      reginfo(reginfo) {
+  this->entsize = sizeof(Elf_Mips_Options) + sizeof(Elf_Mips_RegInfo);
 }
 
-template <class ELFT> void MipsOptionsSection<ELFT>::writeTo(uint8_t *Buf) {
-  auto *Options = reinterpret_cast<Elf_Mips_Options *>(Buf);
-  Options->kind = ODK_REGINFO;
-  Options->size = getSize();
+template <class ELFT> void MipsOptionsSection<ELFT>::writeTo(uint8_t *buf) {
+  auto *options = reinterpret_cast<Elf_Mips_Options *>(buf);
+  options->kind = ODK_REGINFO;
+  options->size = getSize();
 
-  if (!Config->Relocatable)
-    Reginfo.ri_gp_value = In.MipsGot->getGp();
-  memcpy(Buf + sizeof(Elf_Mips_Options), &Reginfo, sizeof(Reginfo));
+  if (!config->relocatable)
+    reginfo.ri_gp_value = in.mipsGot->getGp();
+  memcpy(buf + sizeof(Elf_Mips_Options), &reginfo, sizeof(reginfo));
 }
 
 template <class ELFT>
@@ -164,55 +170,55 @@ MipsOptionsSection<ELFT> *MipsOptionsSection<ELFT>::create() {
   if (!ELFT::Is64Bits)
     return nullptr;
 
-  std::vector<InputSectionBase *> Sections;
-  for (InputSectionBase *Sec : InputSections)
-    if (Sec->Type == SHT_MIPS_OPTIONS)
-      Sections.push_back(Sec);
+  std::vector<InputSectionBase *> sections;
+  for (InputSectionBase *sec : inputSections)
+    if (sec->type == SHT_MIPS_OPTIONS)
+      sections.push_back(sec);
 
-  if (Sections.empty())
+  if (sections.empty())
     return nullptr;
 
-  Elf_Mips_RegInfo Reginfo = {};
-  for (InputSectionBase *Sec : Sections) {
-    Sec->Live = false;
+  Elf_Mips_RegInfo reginfo = {};
+  for (InputSectionBase *sec : sections) {
+    sec->markDead();
 
-    std::string Filename = toString(Sec->File);
-    ArrayRef<uint8_t> D = Sec->data();
+    std::string filename = toString(sec->file);
+    ArrayRef<uint8_t> d = sec->data();
 
-    while (!D.empty()) {
-      if (D.size() < sizeof(Elf_Mips_Options)) {
-        error(Filename + ": invalid size of .MIPS.options section");
+    while (!d.empty()) {
+      if (d.size() < sizeof(Elf_Mips_Options)) {
+        error(filename + ": invalid size of .MIPS.options section");
         break;
       }
 
-      auto *Opt = reinterpret_cast<const Elf_Mips_Options *>(D.data());
-      if (Opt->kind == ODK_REGINFO) {
-        Reginfo.ri_gprmask |= Opt->getRegInfo().ri_gprmask;
-        Sec->getFile<ELFT>()->MipsGp0 = Opt->getRegInfo().ri_gp_value;
+      auto *opt = reinterpret_cast<const Elf_Mips_Options *>(d.data());
+      if (opt->kind == ODK_REGINFO) {
+        reginfo.ri_gprmask |= opt->getRegInfo().ri_gprmask;
+        sec->getFile<ELFT>()->mipsGp0 = opt->getRegInfo().ri_gp_value;
         break;
       }
 
-      if (!Opt->size)
-        fatal(Filename + ": zero option descriptor size");
-      D = D.slice(Opt->size);
+      if (!opt->size)
+        fatal(filename + ": zero option descriptor size");
+      d = d.slice(opt->size);
     }
   };
 
-  return make<MipsOptionsSection<ELFT>>(Reginfo);
+  return make<MipsOptionsSection<ELFT>>(reginfo);
 }
 
 // MIPS .reginfo section.
 template <class ELFT>
-MipsReginfoSection<ELFT>::MipsReginfoSection(Elf_Mips_RegInfo Reginfo)
+MipsReginfoSection<ELFT>::MipsReginfoSection(Elf_Mips_RegInfo reginfo)
     : SyntheticSection(SHF_ALLOC, SHT_MIPS_REGINFO, 4, ".reginfo"),
-      Reginfo(Reginfo) {
-  this->Entsize = sizeof(Elf_Mips_RegInfo);
+      reginfo(reginfo) {
+  this->entsize = sizeof(Elf_Mips_RegInfo);
 }
 
-template <class ELFT> void MipsReginfoSection<ELFT>::writeTo(uint8_t *Buf) {
-  if (!Config->Relocatable)
-    Reginfo.ri_gp_value = In.MipsGot->getGp();
-  memcpy(Buf, &Reginfo, sizeof(Reginfo));
+template <class ELFT> void MipsReginfoSection<ELFT>::writeTo(uint8_t *buf) {
+  if (!config->relocatable)
+    reginfo.ri_gp_value = in.mipsGot->getGp();
+  memcpy(buf, &reginfo, sizeof(reginfo));
 }
 
 template <class ELFT>
@@ -221,53 +227,53 @@ MipsReginfoSection<ELFT> *MipsReginfoSection<ELFT>::create() {
   if (ELFT::Is64Bits)
     return nullptr;
 
-  std::vector<InputSectionBase *> Sections;
-  for (InputSectionBase *Sec : InputSections)
-    if (Sec->Type == SHT_MIPS_REGINFO)
-      Sections.push_back(Sec);
+  std::vector<InputSectionBase *> sections;
+  for (InputSectionBase *sec : inputSections)
+    if (sec->type == SHT_MIPS_REGINFO)
+      sections.push_back(sec);
 
-  if (Sections.empty())
+  if (sections.empty())
     return nullptr;
 
-  Elf_Mips_RegInfo Reginfo = {};
-  for (InputSectionBase *Sec : Sections) {
-    Sec->Live = false;
+  Elf_Mips_RegInfo reginfo = {};
+  for (InputSectionBase *sec : sections) {
+    sec->markDead();
 
-    if (Sec->data().size() != sizeof(Elf_Mips_RegInfo)) {
-      error(toString(Sec->File) + ": invalid size of .reginfo section");
+    if (sec->data().size() != sizeof(Elf_Mips_RegInfo)) {
+      error(toString(sec->file) + ": invalid size of .reginfo section");
       return nullptr;
     }
 
-    auto *R = reinterpret_cast<const Elf_Mips_RegInfo *>(Sec->data().data());
-    Reginfo.ri_gprmask |= R->ri_gprmask;
-    Sec->getFile<ELFT>()->MipsGp0 = R->ri_gp_value;
+    auto *r = reinterpret_cast<const Elf_Mips_RegInfo *>(sec->data().data());
+    reginfo.ri_gprmask |= r->ri_gprmask;
+    sec->getFile<ELFT>()->mipsGp0 = r->ri_gp_value;
   };
 
-  return make<MipsReginfoSection<ELFT>>(Reginfo);
+  return make<MipsReginfoSection<ELFT>>(reginfo);
 }
 
 InputSection *elf::createInterpSection() {
   // StringSaver guarantees that the returned string ends with '\0'.
-  StringRef S = Saver.save(Config->DynamicLinker);
-  ArrayRef<uint8_t> Contents = {(const uint8_t *)S.data(), S.size() + 1};
+  StringRef s = saver.save(config->dynamicLinker);
+  ArrayRef<uint8_t> contents = {(const uint8_t *)s.data(), s.size() + 1};
 
-  auto *Sec = make<InputSection>(nullptr, SHF_ALLOC, SHT_PROGBITS, 1, Contents,
+  auto *sec = make<InputSection>(nullptr, SHF_ALLOC, SHT_PROGBITS, 1, contents,
                                  ".interp");
-  Sec->Live = true;
-  return Sec;
+  sec->markLive();
+  return sec;
 }
 
-Defined *elf::addSyntheticLocal(StringRef Name, uint8_t Type, uint64_t Value,
-                                uint64_t Size, InputSectionBase &Section) {
-  auto *S = make<Defined>(Section.File, Name, STB_LOCAL, STV_DEFAULT, Type,
-                          Value, Size, &Section);
-  if (In.SymTab)
-    In.SymTab->addSymbol(S);
-  return S;
+Defined *elf::addSyntheticLocal(StringRef name, uint8_t type, uint64_t value,
+                                uint64_t size, InputSectionBase &section) {
+  auto *s = make<Defined>(section.file, name, STB_LOCAL, STV_DEFAULT, type,
+                          value, size, &section);
+  if (in.symTab)
+    in.symTab->addSymbol(s);
+  return s;
 }
 
 static size_t getHashSize() {
-  switch (Config->BuildId) {
+  switch (config->buildId) {
   case BuildIdKind::Fast:
     return 8;
   case BuildIdKind::Md5:
@@ -276,89 +282,67 @@ static size_t getHashSize() {
   case BuildIdKind::Sha1:
     return 20;
   case BuildIdKind::Hexstring:
-    return Config->BuildIdVector.size();
+    return config->buildIdVector.size();
   default:
     llvm_unreachable("unknown BuildIdKind");
   }
 }
 
+// This class represents a linker-synthesized .note.gnu.property section.
+//
+// In x86 and AArch64, object files may contain feature flags indicating the
+// features that they have used. The flags are stored in a .note.gnu.property
+// section.
+//
+// lld reads the sections from input files and merges them by computing AND of
+// the flags. The result is written as a new .note.gnu.property section.
+//
+// If the flag is zero (which indicates that the intersection of the feature
+// sets is empty, or some input files didn't have .note.gnu.property sections),
+// we don't create this section.
+GnuPropertySection::GnuPropertySection()
+    : SyntheticSection(llvm::ELF::SHF_ALLOC, llvm::ELF::SHT_NOTE, 4,
+                       ".note.gnu.property") {}
+
+void GnuPropertySection::writeTo(uint8_t *buf) {
+  uint32_t featureAndType = config->emachine == EM_AARCH64
+                                ? GNU_PROPERTY_AARCH64_FEATURE_1_AND
+                                : GNU_PROPERTY_X86_FEATURE_1_AND;
+
+  write32(buf, 4);                                   // Name size
+  write32(buf + 4, config->is64 ? 16 : 12);          // Content size
+  write32(buf + 8, NT_GNU_PROPERTY_TYPE_0);          // Type
+  memcpy(buf + 12, "GNU", 4);                        // Name string
+  write32(buf + 16, featureAndType);                 // Feature type
+  write32(buf + 20, 4);                              // Feature size
+  write32(buf + 24, config->andFeatures);            // Feature flags
+  if (config->is64)
+    write32(buf + 28, 0); // Padding
+}
+
+size_t GnuPropertySection::getSize() const { return config->is64 ? 32 : 28; }
+
 BuildIdSection::BuildIdSection()
     : SyntheticSection(SHF_ALLOC, SHT_NOTE, 4, ".note.gnu.build-id"),
-      HashSize(getHashSize()) {}
+      hashSize(getHashSize()) {}
 
-void BuildIdSection::writeTo(uint8_t *Buf) {
-  write32(Buf, 4);                      // Name size
-  write32(Buf + 4, HashSize);           // Content size
-  write32(Buf + 8, NT_GNU_BUILD_ID);    // Type
-  memcpy(Buf + 12, "GNU", 4);           // Name string
-  HashBuf = Buf + 16;
+void BuildIdSection::writeTo(uint8_t *buf) {
+  write32(buf, 4);                      // Name size
+  write32(buf + 4, hashSize);           // Content size
+  write32(buf + 8, NT_GNU_BUILD_ID);    // Type
+  memcpy(buf + 12, "GNU", 4);           // Name string
+  hashBuf = buf + 16;
 }
 
-// Split one uint8 array into small pieces of uint8 arrays.
-static std::vector<ArrayRef<uint8_t>> split(ArrayRef<uint8_t> Arr,
-                                            size_t ChunkSize) {
-  std::vector<ArrayRef<uint8_t>> Ret;
-  while (Arr.size() > ChunkSize) {
-    Ret.push_back(Arr.take_front(ChunkSize));
-    Arr = Arr.drop_front(ChunkSize);
-  }
-  if (!Arr.empty())
-    Ret.push_back(Arr);
-  return Ret;
+void BuildIdSection::writeBuildId(ArrayRef<uint8_t> buf) {
+  assert(buf.size() == hashSize);
+  memcpy(hashBuf, buf.data(), hashSize);
 }
 
-// Computes a hash value of Data using a given hash function.
-// In order to utilize multiple cores, we first split data into 1MB
-// chunks, compute a hash for each chunk, and then compute a hash value
-// of the hash values.
-void BuildIdSection::computeHash(
-    llvm::ArrayRef<uint8_t> Data,
-    std::function<void(uint8_t *Dest, ArrayRef<uint8_t> Arr)> HashFn) {
-  std::vector<ArrayRef<uint8_t>> Chunks = split(Data, 1024 * 1024);
-  std::vector<uint8_t> Hashes(Chunks.size() * HashSize);
-
-  // Compute hash values.
-  parallelForEachN(0, Chunks.size(), [&](size_t I) {
-    HashFn(Hashes.data() + I * HashSize, Chunks[I]);
-  });
-
-  // Write to the final output buffer.
-  HashFn(HashBuf, Hashes);
-}
-
-BssSection::BssSection(StringRef Name, uint64_t Size, uint32_t Alignment)
-    : SyntheticSection(SHF_ALLOC | SHF_WRITE, SHT_NOBITS, Alignment, Name) {
-  this->Bss = true;
-  this->Size = Size;
-}
-
-void BuildIdSection::writeBuildId(ArrayRef<uint8_t> Buf) {
-  switch (Config->BuildId) {
-  case BuildIdKind::Fast:
-    computeHash(Buf, [](uint8_t *Dest, ArrayRef<uint8_t> Arr) {
-      write64le(Dest, xxHash64(Arr));
-    });
-    break;
-  case BuildIdKind::Md5:
-    computeHash(Buf, [](uint8_t *Dest, ArrayRef<uint8_t> Arr) {
-      memcpy(Dest, MD5::hash(Arr).data(), 16);
-    });
-    break;
-  case BuildIdKind::Sha1:
-    computeHash(Buf, [](uint8_t *Dest, ArrayRef<uint8_t> Arr) {
-      memcpy(Dest, SHA1::hash(Arr).data(), 20);
-    });
-    break;
-  case BuildIdKind::Uuid:
-    if (auto EC = getRandomBytes(HashBuf, HashSize))
-      error("entropy source failure: " + EC.message());
-    break;
-  case BuildIdKind::Hexstring:
-    memcpy(HashBuf, Config->BuildIdVector.data(), Config->BuildIdVector.size());
-    break;
-  default:
-    llvm_unreachable("unknown BuildIdKind");
-  }
+BssSection::BssSection(StringRef name, uint64_t size, uint32_t alignment)
+    : SyntheticSection(SHF_ALLOC | SHF_WRITE, SHT_NOBITS, alignment, name) {
+  this->bss = true;
+  this->size = size;
 }
 
 EhFrameSection::EhFrameSection()
@@ -368,47 +352,48 @@ EhFrameSection::EhFrameSection()
 // CIE records from input object files are uniquified by their contents
 // and where their relocations point to.
 template <class ELFT, class RelTy>
-CieRecord *EhFrameSection::addCie(EhSectionPiece &Cie, ArrayRef<RelTy> Rels) {
-  Symbol *Personality = nullptr;
-  unsigned FirstRelI = Cie.FirstRelocation;
-  if (FirstRelI != (unsigned)-1)
-    Personality =
-        &Cie.Sec->template getFile<ELFT>()->getRelocTargetSym(Rels[FirstRelI]);
+CieRecord *EhFrameSection::addCie(EhSectionPiece &cie, ArrayRef<RelTy> rels) {
+  Symbol *personality = nullptr;
+  unsigned firstRelI = cie.firstRelocation;
+  if (firstRelI != (unsigned)-1)
+    personality =
+        &cie.sec->template getFile<ELFT>()->getRelocTargetSym(rels[firstRelI]);
 
   // Search for an existing CIE by CIE contents/relocation target pair.
-  CieRecord *&Rec = CieMap[{Cie.data(), Personality}];
+  CieRecord *&rec = cieMap[{cie.data(), personality}];
 
   // If not found, create a new one.
-  if (!Rec) {
-    Rec = make<CieRecord>();
-    Rec->Cie = &Cie;
-    CieRecords.push_back(Rec);
+  if (!rec) {
+    rec = make<CieRecord>();
+    rec->cie = &cie;
+    cieRecords.push_back(rec);
   }
-  return Rec;
+  return rec;
 }
 
 // There is one FDE per function. Returns true if a given FDE
 // points to a live function.
 template <class ELFT, class RelTy>
-bool EhFrameSection::isFdeLive(EhSectionPiece &Fde, ArrayRef<RelTy> Rels) {
-  auto *Sec = cast<EhInputSection>(Fde.Sec);
-  unsigned FirstRelI = Fde.FirstRelocation;
+bool EhFrameSection::isFdeLive(EhSectionPiece &fde, ArrayRef<RelTy> rels) {
+  auto *sec = cast<EhInputSection>(fde.sec);
+  unsigned firstRelI = fde.firstRelocation;
 
   // An FDE should point to some function because FDEs are to describe
   // functions. That's however not always the case due to an issue of
   // ld.gold with -r. ld.gold may discard only functions and leave their
   // corresponding FDEs, which results in creating bad .eh_frame sections.
   // To deal with that, we ignore such FDEs.
-  if (FirstRelI == (unsigned)-1)
+  if (firstRelI == (unsigned)-1)
     return false;
 
-  const RelTy &Rel = Rels[FirstRelI];
-  Symbol &B = Sec->template getFile<ELFT>()->getRelocTargetSym(Rel);
+  const RelTy &rel = rels[firstRelI];
+  Symbol &b = sec->template getFile<ELFT>()->getRelocTargetSym(rel);
 
-  // FDEs for garbage-collected or merged-by-ICF sections are dead.
-  if (auto *D = dyn_cast<Defined>(&B))
-    if (SectionBase *Sec = D->Section)
-      return Sec->Live;
+  // FDEs for garbage-collected or merged-by-ICF sections, or sections in
+  // another partition, are dead.
+  if (auto *d = dyn_cast<Defined>(&b))
+    if (SectionBase *sec = d->section)
+      return sec->partition == partition;
   return false;
 }
 
@@ -417,73 +402,73 @@ bool EhFrameSection::isFdeLive(EhSectionPiece &Fde, ArrayRef<RelTy> Rels) {
 // a list of FDEs. This function searches an existing CIE or create a new
 // one and associates FDEs to the CIE.
 template <class ELFT, class RelTy>
-void EhFrameSection::addSectionAux(EhInputSection *Sec, ArrayRef<RelTy> Rels) {
-  OffsetToCie.clear();
-  for (EhSectionPiece &Piece : Sec->Pieces) {
+void EhFrameSection::addSectionAux(EhInputSection *sec, ArrayRef<RelTy> rels) {
+  offsetToCie.clear();
+  for (EhSectionPiece &piece : sec->pieces) {
     // The empty record is the end marker.
-    if (Piece.Size == 4)
+    if (piece.size == 4)
       return;
 
-    size_t Offset = Piece.InputOff;
-    uint32_t ID = read32(Piece.data().data() + 4);
-    if (ID == 0) {
-      OffsetToCie[Offset] = addCie<ELFT>(Piece, Rels);
+    size_t offset = piece.inputOff;
+    uint32_t id = read32(piece.data().data() + 4);
+    if (id == 0) {
+      offsetToCie[offset] = addCie<ELFT>(piece, rels);
       continue;
     }
 
-    uint32_t CieOffset = Offset + 4 - ID;
-    CieRecord *Rec = OffsetToCie[CieOffset];
-    if (!Rec)
-      fatal(toString(Sec) + ": invalid CIE reference");
+    uint32_t cieOffset = offset + 4 - id;
+    CieRecord *rec = offsetToCie[cieOffset];
+    if (!rec)
+      fatal(toString(sec) + ": invalid CIE reference");
 
-    if (!isFdeLive<ELFT>(Piece, Rels))
+    if (!isFdeLive<ELFT>(piece, rels))
       continue;
-    Rec->Fdes.push_back(&Piece);
-    NumFdes++;
+    rec->fdes.push_back(&piece);
+    numFdes++;
   }
 }
 
-template <class ELFT> void EhFrameSection::addSection(InputSectionBase *C) {
-  auto *Sec = cast<EhInputSection>(C);
-  Sec->Parent = this;
+template <class ELFT> void EhFrameSection::addSection(InputSectionBase *c) {
+  auto *sec = cast<EhInputSection>(c);
+  sec->parent = this;
 
-  Alignment = std::max(Alignment, Sec->Alignment);
-  Sections.push_back(Sec);
+  alignment = std::max(alignment, sec->alignment);
+  sections.push_back(sec);
 
-  for (auto *DS : Sec->DependentSections)
-    DependentSections.push_back(DS);
+  for (auto *ds : sec->dependentSections)
+    dependentSections.push_back(ds);
 
-  if (Sec->Pieces.empty())
+  if (sec->pieces.empty())
     return;
 
-  if (Sec->AreRelocsRela)
-    addSectionAux<ELFT>(Sec, Sec->template relas<ELFT>());
+  if (sec->areRelocsRela)
+    addSectionAux<ELFT>(sec, sec->template relas<ELFT>());
   else
-    addSectionAux<ELFT>(Sec, Sec->template rels<ELFT>());
+    addSectionAux<ELFT>(sec, sec->template rels<ELFT>());
 }
 
-static void writeCieFde(uint8_t *Buf, ArrayRef<uint8_t> D) {
-  memcpy(Buf, D.data(), D.size());
+static void writeCieFde(uint8_t *buf, ArrayRef<uint8_t> d) {
+  memcpy(buf, d.data(), d.size());
 
-  size_t Aligned = alignTo(D.size(), Config->Wordsize);
+  size_t aligned = alignTo(d.size(), config->wordsize);
 
   // Zero-clear trailing padding if it exists.
-  memset(Buf + D.size(), 0, Aligned - D.size());
+  memset(buf + d.size(), 0, aligned - d.size());
 
   // Fix the size field. -4 since size does not include the size field itself.
-  write32(Buf, Aligned - 4);
+  write32(buf, aligned - 4);
 }
 
 void EhFrameSection::finalizeContents() {
-  assert(!this->Size); // Not finalized.
-  size_t Off = 0;
-  for (CieRecord *Rec : CieRecords) {
-    Rec->Cie->OutputOff = Off;
-    Off += alignTo(Rec->Cie->Size, Config->Wordsize);
+  assert(!this->size); // Not finalized.
+  size_t off = 0;
+  for (CieRecord *rec : cieRecords) {
+    rec->cie->outputOff = off;
+    off += alignTo(rec->cie->size, config->wordsize);
 
-    for (EhSectionPiece *Fde : Rec->Fdes) {
-      Fde->OutputOff = Off;
-      Off += alignTo(Fde->Size, Config->Wordsize);
+    for (EhSectionPiece *fde : rec->fdes) {
+      fde->outputOff = off;
+      off += alignTo(fde->size, config->wordsize);
     }
   }
 
@@ -491,375 +476,374 @@ void EhFrameSection::finalizeContents() {
   // Call Frame Information records. glibc unwind-dw2-fde.c
   // classify_object_over_fdes expects there is a CIE record length 0 as a
   // terminator. Thus we add one unconditionally.
-  Off += 4;
+  off += 4;
 
-  this->Size = Off;
+  this->size = off;
 }
 
 // Returns data for .eh_frame_hdr. .eh_frame_hdr is a binary search table
 // to get an FDE from an address to which FDE is applied. This function
 // returns a list of such pairs.
 std::vector<EhFrameSection::FdeData> EhFrameSection::getFdeData() const {
-  uint8_t *Buf = getParent()->Loc + OutSecOff;
-  std::vector<FdeData> Ret;
+  uint8_t *buf = Out::bufferStart + getParent()->offset + outSecOff;
+  std::vector<FdeData> ret;
 
-  uint64_t VA = In.EhFrameHdr->getVA();
-  for (CieRecord *Rec : CieRecords) {
-    uint8_t Enc = getFdeEncoding(Rec->Cie);
-    for (EhSectionPiece *Fde : Rec->Fdes) {
-      uint64_t Pc = getFdePc(Buf, Fde->OutputOff, Enc);
-      uint64_t FdeVA = getParent()->Addr + Fde->OutputOff;
-      if (!isInt<32>(Pc - VA))
-        fatal(toString(Fde->Sec) + ": PC offset is too large: 0x" +
-              Twine::utohexstr(Pc - VA));
-      Ret.push_back({uint32_t(Pc - VA), uint32_t(FdeVA - VA)});
+  uint64_t va = getPartition().ehFrameHdr->getVA();
+  for (CieRecord *rec : cieRecords) {
+    uint8_t enc = getFdeEncoding(rec->cie);
+    for (EhSectionPiece *fde : rec->fdes) {
+      uint64_t pc = getFdePc(buf, fde->outputOff, enc);
+      uint64_t fdeVA = getParent()->addr + fde->outputOff;
+      if (!isInt<32>(pc - va))
+        fatal(toString(fde->sec) + ": PC offset is too large: 0x" +
+              Twine::utohexstr(pc - va));
+      ret.push_back({uint32_t(pc - va), uint32_t(fdeVA - va)});
     }
   }
 
   // Sort the FDE list by their PC and uniqueify. Usually there is only
   // one FDE for a PC (i.e. function), but if ICF merges two functions
   // into one, there can be more than one FDEs pointing to the address.
-  auto Less = [](const FdeData &A, const FdeData &B) {
-    return A.PcRel < B.PcRel;
+  auto less = [](const FdeData &a, const FdeData &b) {
+    return a.pcRel < b.pcRel;
   };
-  std::stable_sort(Ret.begin(), Ret.end(), Less);
-  auto Eq = [](const FdeData &A, const FdeData &B) {
-    return A.PcRel == B.PcRel;
+  llvm::stable_sort(ret, less);
+  auto eq = [](const FdeData &a, const FdeData &b) {
+    return a.pcRel == b.pcRel;
   };
-  Ret.erase(std::unique(Ret.begin(), Ret.end(), Eq), Ret.end());
+  ret.erase(std::unique(ret.begin(), ret.end(), eq), ret.end());
 
-  return Ret;
+  return ret;
 }
 
-static uint64_t readFdeAddr(uint8_t *Buf, int Size) {
-  switch (Size) {
+static uint64_t readFdeAddr(uint8_t *buf, int size) {
+  switch (size) {
   case DW_EH_PE_udata2:
-    return read16(Buf);
+    return read16(buf);
   case DW_EH_PE_sdata2:
-    return (int16_t)read16(Buf);
+    return (int16_t)read16(buf);
   case DW_EH_PE_udata4:
-    return read32(Buf);
+    return read32(buf);
   case DW_EH_PE_sdata4:
-    return (int32_t)read32(Buf);
+    return (int32_t)read32(buf);
   case DW_EH_PE_udata8:
   case DW_EH_PE_sdata8:
-    return read64(Buf);
+    return read64(buf);
   case DW_EH_PE_absptr:
-    return readUint(Buf);
+    return readUint(buf);
   }
   fatal("unknown FDE size encoding");
 }
 
 // Returns the VA to which a given FDE (on a mmap'ed buffer) is applied to.
 // We need it to create .eh_frame_hdr section.
-uint64_t EhFrameSection::getFdePc(uint8_t *Buf, size_t FdeOff,
-                                  uint8_t Enc) const {
+uint64_t EhFrameSection::getFdePc(uint8_t *buf, size_t fdeOff,
+                                  uint8_t enc) const {
   // The starting address to which this FDE applies is
   // stored at FDE + 8 byte.
-  size_t Off = FdeOff + 8;
-  uint64_t Addr = readFdeAddr(Buf + Off, Enc & 0xf);
-  if ((Enc & 0x70) == DW_EH_PE_absptr)
-    return Addr;
-  if ((Enc & 0x70) == DW_EH_PE_pcrel)
-    return Addr + getParent()->Addr + Off;
+  size_t off = fdeOff + 8;
+  uint64_t addr = readFdeAddr(buf + off, enc & 0xf);
+  if ((enc & 0x70) == DW_EH_PE_absptr)
+    return addr;
+  if ((enc & 0x70) == DW_EH_PE_pcrel)
+    return addr + getParent()->addr + off;
   fatal("unknown FDE size relative encoding");
 }
 
-void EhFrameSection::writeTo(uint8_t *Buf) {
+void EhFrameSection::writeTo(uint8_t *buf) {
   // Write CIE and FDE records.
-  for (CieRecord *Rec : CieRecords) {
-    size_t CieOffset = Rec->Cie->OutputOff;
-    writeCieFde(Buf + CieOffset, Rec->Cie->data());
+  for (CieRecord *rec : cieRecords) {
+    size_t cieOffset = rec->cie->outputOff;
+    writeCieFde(buf + cieOffset, rec->cie->data());
 
-    for (EhSectionPiece *Fde : Rec->Fdes) {
-      size_t Off = Fde->OutputOff;
-      writeCieFde(Buf + Off, Fde->data());
+    for (EhSectionPiece *fde : rec->fdes) {
+      size_t off = fde->outputOff;
+      writeCieFde(buf + off, fde->data());
 
       // FDE's second word should have the offset to an associated CIE.
       // Write it.
-      write32(Buf + Off + 4, Off + 4 - CieOffset);
+      write32(buf + off + 4, off + 4 - cieOffset);
     }
   }
 
   // Apply relocations. .eh_frame section contents are not contiguous
   // in the output buffer, but relocateAlloc() still works because
   // getOffset() takes care of discontiguous section pieces.
-  for (EhInputSection *S : Sections)
-    S->relocateAlloc(Buf, nullptr);
+  for (EhInputSection *s : sections)
+    s->relocateAlloc(buf, nullptr);
+
+  if (getPartition().ehFrameHdr && getPartition().ehFrameHdr->getParent())
+    getPartition().ehFrameHdr->write();
 }
 
 GotSection::GotSection()
-    : SyntheticSection(SHF_ALLOC | SHF_WRITE, SHT_PROGBITS,
-                       Target->GotEntrySize, ".got") {
-  // PPC64 saves the ElfSym::GlobalOffsetTable .TOC. as the first entry in the
-  // .got. If there are no references to .TOC. in the symbol table,
-  // ElfSym::GlobalOffsetTable will not be defined and we won't need to save
-  // .TOC. in the .got. When it is defined, we increase NumEntries by the number
-  // of entries used to emit ElfSym::GlobalOffsetTable.
-  if (ElfSym::GlobalOffsetTable && !Target->GotBaseSymInGotPlt)
-    NumEntries += Target->GotHeaderEntriesNum;
+    : SyntheticSection(SHF_ALLOC | SHF_WRITE, SHT_PROGBITS, config->wordsize,
+                       ".got") {
+  // If ElfSym::globalOffsetTable is relative to .got and is referenced,
+  // increase numEntries by the number of entries used to emit
+  // ElfSym::globalOffsetTable.
+  if (ElfSym::globalOffsetTable && !target->gotBaseSymInGotPlt)
+    numEntries += target->gotHeaderEntriesNum;
 }
 
-void GotSection::addEntry(Symbol &Sym) {
-  Sym.GotIndex = NumEntries;
-  ++NumEntries;
+void GotSection::addEntry(Symbol &sym) {
+  sym.gotIndex = numEntries;
+  ++numEntries;
 }
 
-bool GotSection::addDynTlsEntry(Symbol &Sym) {
-  if (Sym.GlobalDynIndex != -1U)
+bool GotSection::addDynTlsEntry(Symbol &sym) {
+  if (sym.globalDynIndex != -1U)
     return false;
-  Sym.GlobalDynIndex = NumEntries;
+  sym.globalDynIndex = numEntries;
   // Global Dynamic TLS entries take two GOT slots.
-  NumEntries += 2;
+  numEntries += 2;
   return true;
 }
 
 // Reserves TLS entries for a TLS module ID and a TLS block offset.
 // In total it takes two GOT slots.
 bool GotSection::addTlsIndex() {
-  if (TlsIndexOff != uint32_t(-1))
+  if (tlsIndexOff != uint32_t(-1))
     return false;
-  TlsIndexOff = NumEntries * Config->Wordsize;
-  NumEntries += 2;
+  tlsIndexOff = numEntries * config->wordsize;
+  numEntries += 2;
   return true;
 }
 
-uint64_t GotSection::getGlobalDynAddr(const Symbol &B) const {
-  return this->getVA() + B.GlobalDynIndex * Config->Wordsize;
+uint64_t GotSection::getGlobalDynAddr(const Symbol &b) const {
+  return this->getVA() + b.globalDynIndex * config->wordsize;
 }
 
-uint64_t GotSection::getGlobalDynOffset(const Symbol &B) const {
-  return B.GlobalDynIndex * Config->Wordsize;
+uint64_t GotSection::getGlobalDynOffset(const Symbol &b) const {
+  return b.globalDynIndex * config->wordsize;
 }
 
 void GotSection::finalizeContents() {
-  Size = NumEntries * Config->Wordsize;
+  size = numEntries * config->wordsize;
 }
 
-bool GotSection::empty() const {
+bool GotSection::isNeeded() const {
   // We need to emit a GOT even if it's empty if there's a relocation that is
-  // relative to GOT(such as GOTOFFREL) or there's a symbol that points to a GOT
-  // (i.e. _GLOBAL_OFFSET_TABLE_) that the target defines relative to the .got.
-  return NumEntries == 0 && !HasGotOffRel &&
-         !(ElfSym::GlobalOffsetTable && !Target->GotBaseSymInGotPlt);
+  // relative to GOT(such as GOTOFFREL).
+  return numEntries || hasGotOffRel;
 }
 
-void GotSection::writeTo(uint8_t *Buf) {
+void GotSection::writeTo(uint8_t *buf) {
   // Buf points to the start of this section's buffer,
   // whereas InputSectionBase::relocateAlloc() expects its argument
   // to point to the start of the output section.
-  Target->writeGotHeader(Buf);
-  relocateAlloc(Buf - OutSecOff, Buf - OutSecOff + Size);
+  target->writeGotHeader(buf);
+  relocateAlloc(buf - outSecOff, buf - outSecOff + size);
 }
 
-static uint64_t getMipsPageAddr(uint64_t Addr) {
-  return (Addr + 0x8000) & ~0xffff;
+static uint64_t getMipsPageAddr(uint64_t addr) {
+  return (addr + 0x8000) & ~0xffff;
 }
 
-static uint64_t getMipsPageCount(uint64_t Size) {
-  return (Size + 0xfffe) / 0xffff + 1;
+static uint64_t getMipsPageCount(uint64_t size) {
+  return (size + 0xfffe) / 0xffff + 1;
 }
 
 MipsGotSection::MipsGotSection()
     : SyntheticSection(SHF_ALLOC | SHF_WRITE | SHF_MIPS_GPREL, SHT_PROGBITS, 16,
                        ".got") {}
 
-void MipsGotSection::addEntry(InputFile &File, Symbol &Sym, int64_t Addend,
-                              RelExpr Expr) {
-  FileGot &G = getGot(File);
-  if (Expr == R_MIPS_GOT_LOCAL_PAGE) {
-    if (const OutputSection *OS = Sym.getOutputSection())
-      G.PagesMap.insert({OS, {}});
+void MipsGotSection::addEntry(InputFile &file, Symbol &sym, int64_t addend,
+                              RelExpr expr) {
+  FileGot &g = getGot(file);
+  if (expr == R_MIPS_GOT_LOCAL_PAGE) {
+    if (const OutputSection *os = sym.getOutputSection())
+      g.pagesMap.insert({os, {}});
     else
-      G.Local16.insert({{nullptr, getMipsPageAddr(Sym.getVA(Addend))}, 0});
-  } else if (Sym.isTls())
-    G.Tls.insert({&Sym, 0});
-  else if (Sym.IsPreemptible && Expr == R_ABS)
-    G.Relocs.insert({&Sym, 0});
-  else if (Sym.IsPreemptible)
-    G.Global.insert({&Sym, 0});
-  else if (Expr == R_MIPS_GOT_OFF32)
-    G.Local32.insert({{&Sym, Addend}, 0});
+      g.local16.insert({{nullptr, getMipsPageAddr(sym.getVA(addend))}, 0});
+  } else if (sym.isTls())
+    g.tls.insert({&sym, 0});
+  else if (sym.isPreemptible && expr == R_ABS)
+    g.relocs.insert({&sym, 0});
+  else if (sym.isPreemptible)
+    g.global.insert({&sym, 0});
+  else if (expr == R_MIPS_GOT_OFF32)
+    g.local32.insert({{&sym, addend}, 0});
   else
-    G.Local16.insert({{&Sym, Addend}, 0});
+    g.local16.insert({{&sym, addend}, 0});
 }
 
-void MipsGotSection::addDynTlsEntry(InputFile &File, Symbol &Sym) {
-  getGot(File).DynTlsSymbols.insert({&Sym, 0});
+void MipsGotSection::addDynTlsEntry(InputFile &file, Symbol &sym) {
+  getGot(file).dynTlsSymbols.insert({&sym, 0});
 }
 
-void MipsGotSection::addTlsIndex(InputFile &File) {
-  getGot(File).DynTlsSymbols.insert({nullptr, 0});
+void MipsGotSection::addTlsIndex(InputFile &file) {
+  getGot(file).dynTlsSymbols.insert({nullptr, 0});
 }
 
 size_t MipsGotSection::FileGot::getEntriesNum() const {
-  return getPageEntriesNum() + Local16.size() + Global.size() + Relocs.size() +
-         Tls.size() + DynTlsSymbols.size() * 2;
+  return getPageEntriesNum() + local16.size() + global.size() + relocs.size() +
+         tls.size() + dynTlsSymbols.size() * 2;
 }
 
 size_t MipsGotSection::FileGot::getPageEntriesNum() const {
-  size_t Num = 0;
-  for (const std::pair<const OutputSection *, FileGot::PageBlock> &P : PagesMap)
-    Num += P.second.Count;
-  return Num;
+  size_t num = 0;
+  for (const std::pair<const OutputSection *, FileGot::PageBlock> &p : pagesMap)
+    num += p.second.count;
+  return num;
 }
 
 size_t MipsGotSection::FileGot::getIndexedEntriesNum() const {
-  size_t Count = getPageEntriesNum() + Local16.size() + Global.size();
+  size_t count = getPageEntriesNum() + local16.size() + global.size();
   // If there are relocation-only entries in the GOT, TLS entries
   // are allocated after them. TLS entries should be addressable
   // by 16-bit index so count both reloc-only and TLS entries.
-  if (!Tls.empty() || !DynTlsSymbols.empty())
-    Count += Relocs.size() + Tls.size() + DynTlsSymbols.size() * 2;
-  return Count;
+  if (!tls.empty() || !dynTlsSymbols.empty())
+    count += relocs.size() + tls.size() + dynTlsSymbols.size() * 2;
+  return count;
 }
 
-MipsGotSection::FileGot &MipsGotSection::getGot(InputFile &F) {
-  if (!F.MipsGotIndex.hasValue()) {
-    Gots.emplace_back();
-    Gots.back().File = &F;
-    F.MipsGotIndex = Gots.size() - 1;
+MipsGotSection::FileGot &MipsGotSection::getGot(InputFile &f) {
+  if (!f.mipsGotIndex.hasValue()) {
+    gots.emplace_back();
+    gots.back().file = &f;
+    f.mipsGotIndex = gots.size() - 1;
   }
-  return Gots[*F.MipsGotIndex];
+  return gots[*f.mipsGotIndex];
 }
 
-uint64_t MipsGotSection::getPageEntryOffset(const InputFile *F,
-                                            const Symbol &Sym,
-                                            int64_t Addend) const {
-  const FileGot &G = Gots[*F->MipsGotIndex];
-  uint64_t Index = 0;
-  if (const OutputSection *OutSec = Sym.getOutputSection()) {
-    uint64_t SecAddr = getMipsPageAddr(OutSec->Addr);
-    uint64_t SymAddr = getMipsPageAddr(Sym.getVA(Addend));
-    Index = G.PagesMap.lookup(OutSec).FirstIndex + (SymAddr - SecAddr) / 0xffff;
+uint64_t MipsGotSection::getPageEntryOffset(const InputFile *f,
+                                            const Symbol &sym,
+                                            int64_t addend) const {
+  const FileGot &g = gots[*f->mipsGotIndex];
+  uint64_t index = 0;
+  if (const OutputSection *outSec = sym.getOutputSection()) {
+    uint64_t secAddr = getMipsPageAddr(outSec->addr);
+    uint64_t symAddr = getMipsPageAddr(sym.getVA(addend));
+    index = g.pagesMap.lookup(outSec).firstIndex + (symAddr - secAddr) / 0xffff;
   } else {
-    Index = G.Local16.lookup({nullptr, getMipsPageAddr(Sym.getVA(Addend))});
+    index = g.local16.lookup({nullptr, getMipsPageAddr(sym.getVA(addend))});
   }
-  return Index * Config->Wordsize;
+  return index * config->wordsize;
 }
 
-uint64_t MipsGotSection::getSymEntryOffset(const InputFile *F, const Symbol &S,
-                                           int64_t Addend) const {
-  const FileGot &G = Gots[*F->MipsGotIndex];
-  Symbol *Sym = const_cast<Symbol *>(&S);
-  if (Sym->isTls())
-    return G.Tls.lookup(Sym) * Config->Wordsize;
-  if (Sym->IsPreemptible)
-    return G.Global.lookup(Sym) * Config->Wordsize;
-  return G.Local16.lookup({Sym, Addend}) * Config->Wordsize;
+uint64_t MipsGotSection::getSymEntryOffset(const InputFile *f, const Symbol &s,
+                                           int64_t addend) const {
+  const FileGot &g = gots[*f->mipsGotIndex];
+  Symbol *sym = const_cast<Symbol *>(&s);
+  if (sym->isTls())
+    return g.tls.lookup(sym) * config->wordsize;
+  if (sym->isPreemptible)
+    return g.global.lookup(sym) * config->wordsize;
+  return g.local16.lookup({sym, addend}) * config->wordsize;
 }
 
-uint64_t MipsGotSection::getTlsIndexOffset(const InputFile *F) const {
-  const FileGot &G = Gots[*F->MipsGotIndex];
-  return G.DynTlsSymbols.lookup(nullptr) * Config->Wordsize;
+uint64_t MipsGotSection::getTlsIndexOffset(const InputFile *f) const {
+  const FileGot &g = gots[*f->mipsGotIndex];
+  return g.dynTlsSymbols.lookup(nullptr) * config->wordsize;
 }
 
-uint64_t MipsGotSection::getGlobalDynOffset(const InputFile *F,
-                                            const Symbol &S) const {
-  const FileGot &G = Gots[*F->MipsGotIndex];
-  Symbol *Sym = const_cast<Symbol *>(&S);
-  return G.DynTlsSymbols.lookup(Sym) * Config->Wordsize;
+uint64_t MipsGotSection::getGlobalDynOffset(const InputFile *f,
+                                            const Symbol &s) const {
+  const FileGot &g = gots[*f->mipsGotIndex];
+  Symbol *sym = const_cast<Symbol *>(&s);
+  return g.dynTlsSymbols.lookup(sym) * config->wordsize;
 }
 
 const Symbol *MipsGotSection::getFirstGlobalEntry() const {
-  if (Gots.empty())
+  if (gots.empty())
     return nullptr;
-  const FileGot &PrimGot = Gots.front();
-  if (!PrimGot.Global.empty())
-    return PrimGot.Global.front().first;
-  if (!PrimGot.Relocs.empty())
-    return PrimGot.Relocs.front().first;
+  const FileGot &primGot = gots.front();
+  if (!primGot.global.empty())
+    return primGot.global.front().first;
+  if (!primGot.relocs.empty())
+    return primGot.relocs.front().first;
   return nullptr;
 }
 
 unsigned MipsGotSection::getLocalEntriesNum() const {
-  if (Gots.empty())
-    return HeaderEntriesNum;
-  return HeaderEntriesNum + Gots.front().getPageEntriesNum() +
-         Gots.front().Local16.size();
+  if (gots.empty())
+    return headerEntriesNum;
+  return headerEntriesNum + gots.front().getPageEntriesNum() +
+         gots.front().local16.size();
 }
 
-bool MipsGotSection::tryMergeGots(FileGot &Dst, FileGot &Src, bool IsPrimary) {
-  FileGot Tmp = Dst;
-  set_union(Tmp.PagesMap, Src.PagesMap);
-  set_union(Tmp.Local16, Src.Local16);
-  set_union(Tmp.Global, Src.Global);
-  set_union(Tmp.Relocs, Src.Relocs);
-  set_union(Tmp.Tls, Src.Tls);
-  set_union(Tmp.DynTlsSymbols, Src.DynTlsSymbols);
+bool MipsGotSection::tryMergeGots(FileGot &dst, FileGot &src, bool isPrimary) {
+  FileGot tmp = dst;
+  set_union(tmp.pagesMap, src.pagesMap);
+  set_union(tmp.local16, src.local16);
+  set_union(tmp.global, src.global);
+  set_union(tmp.relocs, src.relocs);
+  set_union(tmp.tls, src.tls);
+  set_union(tmp.dynTlsSymbols, src.dynTlsSymbols);
 
-  size_t Count = IsPrimary ? HeaderEntriesNum : 0;
-  Count += Tmp.getIndexedEntriesNum();
+  size_t count = isPrimary ? headerEntriesNum : 0;
+  count += tmp.getIndexedEntriesNum();
 
-  if (Count * Config->Wordsize > Config->MipsGotSize)
+  if (count * config->wordsize > config->mipsGotSize)
     return false;
 
-  std::swap(Tmp, Dst);
+  std::swap(tmp, dst);
   return true;
 }
 
 void MipsGotSection::finalizeContents() { updateAllocSize(); }
 
 bool MipsGotSection::updateAllocSize() {
-  Size = HeaderEntriesNum * Config->Wordsize;
-  for (const FileGot &G : Gots)
-    Size += G.getEntriesNum() * Config->Wordsize;
+  size = headerEntriesNum * config->wordsize;
+  for (const FileGot &g : gots)
+    size += g.getEntriesNum() * config->wordsize;
   return false;
 }
 
-template <class ELFT> void MipsGotSection::build() {
-  if (Gots.empty())
+void MipsGotSection::build() {
+  if (gots.empty())
     return;
 
-  std::vector<FileGot> MergedGots(1);
+  std::vector<FileGot> mergedGots(1);
 
   // For each GOT move non-preemptible symbols from the `Global`
   // to `Local16` list. Preemptible symbol might become non-preemptible
   // one if, for example, it gets a related copy relocation.
-  for (FileGot &Got : Gots) {
-    for (auto &P: Got.Global)
-      if (!P.first->IsPreemptible)
-        Got.Local16.insert({{P.first, 0}, 0});
-    Got.Global.remove_if([&](const std::pair<Symbol *, size_t> &P) {
-      return !P.first->IsPreemptible;
+  for (FileGot &got : gots) {
+    for (auto &p: got.global)
+      if (!p.first->isPreemptible)
+        got.local16.insert({{p.first, 0}, 0});
+    got.global.remove_if([&](const std::pair<Symbol *, size_t> &p) {
+      return !p.first->isPreemptible;
     });
   }
 
   // For each GOT remove "reloc-only" entry if there is "global"
   // entry for the same symbol. And add local entries which indexed
   // using 32-bit value at the end of 16-bit entries.
-  for (FileGot &Got : Gots) {
-    Got.Relocs.remove_if([&](const std::pair<Symbol *, size_t> &P) {
-      return Got.Global.count(P.first);
+  for (FileGot &got : gots) {
+    got.relocs.remove_if([&](const std::pair<Symbol *, size_t> &p) {
+      return got.global.count(p.first);
     });
-    set_union(Got.Local16, Got.Local32);
-    Got.Local32.clear();
+    set_union(got.local16, got.local32);
+    got.local32.clear();
   }
 
   // Evaluate number of "reloc-only" entries in the resulting GOT.
   // To do that put all unique "reloc-only" and "global" entries
   // from all GOTs to the future primary GOT.
-  FileGot *PrimGot = &MergedGots.front();
-  for (FileGot &Got : Gots) {
-    set_union(PrimGot->Relocs, Got.Global);
-    set_union(PrimGot->Relocs, Got.Relocs);
-    Got.Relocs.clear();
+  FileGot *primGot = &mergedGots.front();
+  for (FileGot &got : gots) {
+    set_union(primGot->relocs, got.global);
+    set_union(primGot->relocs, got.relocs);
+    got.relocs.clear();
   }
 
   // Evaluate number of "page" entries in each GOT.
-  for (FileGot &Got : Gots) {
-    for (std::pair<const OutputSection *, FileGot::PageBlock> &P :
-         Got.PagesMap) {
-      const OutputSection *OS = P.first;
-      uint64_t SecSize = 0;
-      for (BaseCommand *Cmd : OS->SectionCommands) {
-        if (auto *ISD = dyn_cast<InputSectionDescription>(Cmd))
-          for (InputSection *IS : ISD->Sections) {
-            uint64_t Off = alignTo(SecSize, IS->Alignment);
-            SecSize = Off + IS->getSize();
+  for (FileGot &got : gots) {
+    for (std::pair<const OutputSection *, FileGot::PageBlock> &p :
+         got.pagesMap) {
+      const OutputSection *os = p.first;
+      uint64_t secSize = 0;
+      for (BaseCommand *cmd : os->sectionCommands) {
+        if (auto *isd = dyn_cast<InputSectionDescription>(cmd))
+          for (InputSection *isec : isd->sections) {
+            uint64_t off = alignTo(secSize, isec->alignment);
+            secSize = off + isec->getSize();
           }
       }
-      P.second.Count = getMipsPageCount(SecSize);
+      p.second.count = getMipsPageCount(secSize);
     }
   }
 
@@ -868,149 +852,149 @@ template <class ELFT> void MipsGotSection::build() {
   // the primary GOT can be accessed in the most effective way. If it
   // is not possible, try to fill the last GOT in the list, and finally
   // create a new GOT if both attempts failed.
-  for (FileGot &SrcGot : Gots) {
-    InputFile *File = SrcGot.File;
-    if (tryMergeGots(MergedGots.front(), SrcGot, true)) {
-      File->MipsGotIndex = 0;
+  for (FileGot &srcGot : gots) {
+    InputFile *file = srcGot.file;
+    if (tryMergeGots(mergedGots.front(), srcGot, true)) {
+      file->mipsGotIndex = 0;
     } else {
       // If this is the first time we failed to merge with the primary GOT,
       // MergedGots.back() will also be the primary GOT. We must make sure not
-      // to try to merge again with IsPrimary=false, as otherwise, if the
+      // to try to merge again with isPrimary=false, as otherwise, if the
       // inputs are just right, we could allow the primary GOT to become 1 or 2
-      // words too big due to ignoring the header size.
-      if (MergedGots.size() == 1 ||
-          !tryMergeGots(MergedGots.back(), SrcGot, false)) {
-        MergedGots.emplace_back();
-        std::swap(MergedGots.back(), SrcGot);
+      // words bigger due to ignoring the header size.
+      if (mergedGots.size() == 1 ||
+          !tryMergeGots(mergedGots.back(), srcGot, false)) {
+        mergedGots.emplace_back();
+        std::swap(mergedGots.back(), srcGot);
       }
-      File->MipsGotIndex = MergedGots.size() - 1;
+      file->mipsGotIndex = mergedGots.size() - 1;
     }
   }
-  std::swap(Gots, MergedGots);
+  std::swap(gots, mergedGots);
 
   // Reduce number of "reloc-only" entries in the primary GOT
   // by substracting "global" entries exist in the primary GOT.
-  PrimGot = &Gots.front();
-  PrimGot->Relocs.remove_if([&](const std::pair<Symbol *, size_t> &P) {
-    return PrimGot->Global.count(P.first);
+  primGot = &gots.front();
+  primGot->relocs.remove_if([&](const std::pair<Symbol *, size_t> &p) {
+    return primGot->global.count(p.first);
   });
 
   // Calculate indexes for each GOT entry.
-  size_t Index = HeaderEntriesNum;
-  for (FileGot &Got : Gots) {
-    Got.StartIndex = &Got == PrimGot ? 0 : Index;
-    for (std::pair<const OutputSection *, FileGot::PageBlock> &P :
-         Got.PagesMap) {
+  size_t index = headerEntriesNum;
+  for (FileGot &got : gots) {
+    got.startIndex = &got == primGot ? 0 : index;
+    for (std::pair<const OutputSection *, FileGot::PageBlock> &p :
+         got.pagesMap) {
       // For each output section referenced by GOT page relocations calculate
-      // and save into PagesMap an upper bound of MIPS GOT entries required
+      // and save into pagesMap an upper bound of MIPS GOT entries required
       // to store page addresses of local symbols. We assume the worst case -
       // each 64kb page of the output section has at least one GOT relocation
       // against it. And take in account the case when the section intersects
       // page boundaries.
-      P.second.FirstIndex = Index;
-      Index += P.second.Count;
+      p.second.firstIndex = index;
+      index += p.second.count;
     }
-    for (auto &P: Got.Local16)
-      P.second = Index++;
-    for (auto &P: Got.Global)
-      P.second = Index++;
-    for (auto &P: Got.Relocs)
-      P.second = Index++;
-    for (auto &P: Got.Tls)
-      P.second = Index++;
-    for (auto &P: Got.DynTlsSymbols) {
-      P.second = Index;
-      Index += 2;
+    for (auto &p: got.local16)
+      p.second = index++;
+    for (auto &p: got.global)
+      p.second = index++;
+    for (auto &p: got.relocs)
+      p.second = index++;
+    for (auto &p: got.tls)
+      p.second = index++;
+    for (auto &p: got.dynTlsSymbols) {
+      p.second = index;
+      index += 2;
     }
   }
 
-  // Update Symbol::GotIndex field to use this
+  // Update Symbol::gotIndex field to use this
   // value later in the `sortMipsSymbols` function.
-  for (auto &P : PrimGot->Global)
-    P.first->GotIndex = P.second;
-  for (auto &P : PrimGot->Relocs)
-    P.first->GotIndex = P.second;
+  for (auto &p : primGot->global)
+    p.first->gotIndex = p.second;
+  for (auto &p : primGot->relocs)
+    p.first->gotIndex = p.second;
 
   // Create dynamic relocations.
-  for (FileGot &Got : Gots) {
+  for (FileGot &got : gots) {
     // Create dynamic relocations for TLS entries.
-    for (std::pair<Symbol *, size_t> &P : Got.Tls) {
-      Symbol *S = P.first;
-      uint64_t Offset = P.second * Config->Wordsize;
-      if (S->IsPreemptible)
-        In.RelaDyn->addReloc(Target->TlsGotRel, this, Offset, S);
+    for (std::pair<Symbol *, size_t> &p : got.tls) {
+      Symbol *s = p.first;
+      uint64_t offset = p.second * config->wordsize;
+      if (s->isPreemptible)
+        mainPart->relaDyn->addReloc(target->tlsGotRel, this, offset, s);
     }
-    for (std::pair<Symbol *, size_t> &P : Got.DynTlsSymbols) {
-      Symbol *S = P.first;
-      uint64_t Offset = P.second * Config->Wordsize;
-      if (S == nullptr) {
-        if (!Config->Pic)
+    for (std::pair<Symbol *, size_t> &p : got.dynTlsSymbols) {
+      Symbol *s = p.first;
+      uint64_t offset = p.second * config->wordsize;
+      if (s == nullptr) {
+        if (!config->isPic)
           continue;
-        In.RelaDyn->addReloc(Target->TlsModuleIndexRel, this, Offset, S);
+        mainPart->relaDyn->addReloc(target->tlsModuleIndexRel, this, offset, s);
       } else {
         // When building a shared library we still need a dynamic relocation
         // for the module index. Therefore only checking for
-        // S->IsPreemptible is not sufficient (this happens e.g. for
+        // S->isPreemptible is not sufficient (this happens e.g. for
         // thread-locals that have been marked as local through a linker script)
-        if (!S->IsPreemptible && !Config->Pic)
+        if (!s->isPreemptible && !config->isPic)
           continue;
-        In.RelaDyn->addReloc(Target->TlsModuleIndexRel, this, Offset, S);
+        mainPart->relaDyn->addReloc(target->tlsModuleIndexRel, this, offset, s);
         // However, we can skip writing the TLS offset reloc for non-preemptible
         // symbols since it is known even in shared libraries
-        if (!S->IsPreemptible)
+        if (!s->isPreemptible)
           continue;
-        Offset += Config->Wordsize;
-        In.RelaDyn->addReloc(Target->TlsOffsetRel, this, Offset, S);
+        offset += config->wordsize;
+        mainPart->relaDyn->addReloc(target->tlsOffsetRel, this, offset, s);
       }
     }
 
     // Do not create dynamic relocations for non-TLS
     // entries in the primary GOT.
-    if (&Got == PrimGot)
+    if (&got == primGot)
       continue;
 
     // Dynamic relocations for "global" entries.
-    for (const std::pair<Symbol *, size_t> &P : Got.Global) {
-      uint64_t Offset = P.second * Config->Wordsize;
-      In.RelaDyn->addReloc(Target->RelativeRel, this, Offset, P.first);
+    for (const std::pair<Symbol *, size_t> &p : got.global) {
+      uint64_t offset = p.second * config->wordsize;
+      mainPart->relaDyn->addReloc(target->relativeRel, this, offset, p.first);
     }
-    if (!Config->Pic)
+    if (!config->isPic)
       continue;
     // Dynamic relocations for "local" entries in case of PIC.
-    for (const std::pair<const OutputSection *, FileGot::PageBlock> &L :
-         Got.PagesMap) {
-      size_t PageCount = L.second.Count;
-      for (size_t PI = 0; PI < PageCount; ++PI) {
-        uint64_t Offset = (L.second.FirstIndex + PI) * Config->Wordsize;
-        In.RelaDyn->addReloc({Target->RelativeRel, this, Offset, L.first,
-                              int64_t(PI * 0x10000)});
+    for (const std::pair<const OutputSection *, FileGot::PageBlock> &l :
+         got.pagesMap) {
+      size_t pageCount = l.second.count;
+      for (size_t pi = 0; pi < pageCount; ++pi) {
+        uint64_t offset = (l.second.firstIndex + pi) * config->wordsize;
+        mainPart->relaDyn->addReloc({target->relativeRel, this, offset, l.first,
+                                 int64_t(pi * 0x10000)});
       }
     }
-    for (const std::pair<GotEntry, size_t> &P : Got.Local16) {
-      uint64_t Offset = P.second * Config->Wordsize;
-      In.RelaDyn->addReloc({Target->RelativeRel, this, Offset, true,
-                            P.first.first, P.first.second});
+    for (const std::pair<GotEntry, size_t> &p : got.local16) {
+      uint64_t offset = p.second * config->wordsize;
+      mainPart->relaDyn->addReloc({target->relativeRel, this, offset, true,
+                               p.first.first, p.first.second});
     }
   }
 }
 
-bool MipsGotSection::empty() const {
+bool MipsGotSection::isNeeded() const {
   // We add the .got section to the result for dynamic MIPS target because
   // its address and properties are mentioned in the .dynamic section.
-  return Config->Relocatable;
+  return !config->relocatable;
 }
 
-uint64_t MipsGotSection::getGp(const InputFile *F) const {
+uint64_t MipsGotSection::getGp(const InputFile *f) const {
   // For files without related GOT or files refer a primary GOT
   // returns "common" _gp value. For secondary GOTs calculate
   // individual _gp values.
-  if (!F || !F->MipsGotIndex.hasValue() || *F->MipsGotIndex == 0)
-    return ElfSym::MipsGp->getVA(0);
-  return getVA() + Gots[*F->MipsGotIndex].StartIndex * Config->Wordsize +
+  if (!f || !f->mipsGotIndex.hasValue() || *f->mipsGotIndex == 0)
+    return ElfSym::mipsGp->getVA(0);
+  return getVA() + gots[*f->mipsGotIndex].startIndex * config->wordsize +
          0x7ff0;
 }
 
-void MipsGotSection::writeTo(uint8_t *Buf) {
+void MipsGotSection::writeTo(uint8_t *buf) {
   // Set the MSB of the second GOT slot. This is not required by any
   // MIPS ABI documentation, though.
   //
@@ -1025,51 +1009,48 @@ void MipsGotSection::writeTo(uint8_t *Buf) {
   // we've been doing this for years, it is probably a safe bet to
   // keep doing this for now. We really need to revisit this to see
   // if we had to do this.
-  writeUint(Buf + Config->Wordsize, (uint64_t)1 << (Config->Wordsize * 8 - 1));
-  for (const FileGot &G : Gots) {
-    auto Write = [&](size_t I, const Symbol *S, int64_t A) {
-      uint64_t VA = A;
-      if (S) {
-        VA = S->getVA(A);
-        if (S->StOther & STO_MIPS_MICROMIPS)
-          VA |= 1;
-      }
-      writeUint(Buf + I * Config->Wordsize, VA);
+  writeUint(buf + config->wordsize, (uint64_t)1 << (config->wordsize * 8 - 1));
+  for (const FileGot &g : gots) {
+    auto write = [&](size_t i, const Symbol *s, int64_t a) {
+      uint64_t va = a;
+      if (s)
+        va = s->getVA(a);
+      writeUint(buf + i * config->wordsize, va);
     };
     // Write 'page address' entries to the local part of the GOT.
-    for (const std::pair<const OutputSection *, FileGot::PageBlock> &L :
-         G.PagesMap) {
-      size_t PageCount = L.second.Count;
-      uint64_t FirstPageAddr = getMipsPageAddr(L.first->Addr);
-      for (size_t PI = 0; PI < PageCount; ++PI)
-        Write(L.second.FirstIndex + PI, nullptr, FirstPageAddr + PI * 0x10000);
+    for (const std::pair<const OutputSection *, FileGot::PageBlock> &l :
+         g.pagesMap) {
+      size_t pageCount = l.second.count;
+      uint64_t firstPageAddr = getMipsPageAddr(l.first->addr);
+      for (size_t pi = 0; pi < pageCount; ++pi)
+        write(l.second.firstIndex + pi, nullptr, firstPageAddr + pi * 0x10000);
     }
     // Local, global, TLS, reloc-only  entries.
     // If TLS entry has a corresponding dynamic relocations, leave it
     // initialized by zero. Write down adjusted TLS symbol's values otherwise.
     // To calculate the adjustments use offsets for thread-local storage.
     // https://www.linux-mips.org/wiki/NPTL
-    for (const std::pair<GotEntry, size_t> &P : G.Local16)
-      Write(P.second, P.first.first, P.first.second);
+    for (const std::pair<GotEntry, size_t> &p : g.local16)
+      write(p.second, p.first.first, p.first.second);
     // Write VA to the primary GOT only. For secondary GOTs that
     // will be done by REL32 dynamic relocations.
-    if (&G == &Gots.front())
-      for (const std::pair<const Symbol *, size_t> &P : G.Global)
-        Write(P.second, P.first, 0);
-    for (const std::pair<Symbol *, size_t> &P : G.Relocs)
-      Write(P.second, P.first, 0);
-    for (const std::pair<Symbol *, size_t> &P : G.Tls)
-      Write(P.second, P.first, P.first->IsPreemptible ? 0 : -0x7000);
-    for (const std::pair<Symbol *, size_t> &P : G.DynTlsSymbols) {
-      if (P.first == nullptr && !Config->Pic)
-        Write(P.second, nullptr, 1);
-      else if (P.first && !P.first->IsPreemptible) {
+    if (&g == &gots.front())
+      for (const std::pair<const Symbol *, size_t> &p : g.global)
+        write(p.second, p.first, 0);
+    for (const std::pair<Symbol *, size_t> &p : g.relocs)
+      write(p.second, p.first, 0);
+    for (const std::pair<Symbol *, size_t> &p : g.tls)
+      write(p.second, p.first, p.first->isPreemptible ? 0 : -0x7000);
+    for (const std::pair<Symbol *, size_t> &p : g.dynTlsSymbols) {
+      if (p.first == nullptr && !config->isPic)
+        write(p.second, nullptr, 1);
+      else if (p.first && !p.first->isPreemptible) {
         // If we are emitting PIC code with relocations we mustn't write
         // anything to the GOT here. When using Elf_Rel relocations the value
         // one will be treated as an addend and will cause crashes at runtime
-        if (!Config->Pic)
-          Write(P.second, nullptr, 1);
-        Write(P.second + 1, P.first, -0x8000);
+        if (!config->isPic)
+          write(p.second, nullptr, 1);
+        write(p.second + 1, p.first, -0x8000);
       }
     }
   }
@@ -1080,46 +1061,48 @@ void MipsGotSection::writeTo(uint8_t *Buf) {
 // section. I don't know why we have a BSS style type for the section but it is
 // consitent across both 64-bit PowerPC ABIs as well as the 32-bit PowerPC ABI.
 GotPltSection::GotPltSection()
-    : SyntheticSection(SHF_ALLOC | SHF_WRITE,
-                       Config->EMachine == EM_PPC64 ? SHT_NOBITS : SHT_PROGBITS,
-                       Target->GotPltEntrySize,
-                       Config->EMachine == EM_PPC64 ? ".plt" : ".got.plt") {}
+    : SyntheticSection(SHF_ALLOC | SHF_WRITE, SHT_PROGBITS, config->wordsize,
+                       ".got.plt") {
+  if (config->emachine == EM_PPC) {
+    name = ".plt";
+  } else if (config->emachine == EM_PPC64) {
+    type = SHT_NOBITS;
+    name = ".plt";
+  }
+}
 
-void GotPltSection::addEntry(Symbol &Sym) {
-  assert(Sym.PltIndex == Entries.size());
-  Entries.push_back(&Sym);
+void GotPltSection::addEntry(Symbol &sym) {
+  assert(sym.pltIndex == entries.size());
+  entries.push_back(&sym);
 }
 
 size_t GotPltSection::getSize() const {
-  return (Target->GotPltHeaderEntriesNum + Entries.size()) *
-         Target->GotPltEntrySize;
+  return (target->gotPltHeaderEntriesNum + entries.size()) * config->wordsize;
 }
 
-void GotPltSection::writeTo(uint8_t *Buf) {
-  Target->writeGotPltHeader(Buf);
-  Buf += Target->GotPltHeaderEntriesNum * Target->GotPltEntrySize;
-  for (const Symbol *B : Entries) {
-    Target->writeGotPlt(Buf, *B);
-    Buf += Config->Wordsize;
+void GotPltSection::writeTo(uint8_t *buf) {
+  target->writeGotPltHeader(buf);
+  buf += target->gotPltHeaderEntriesNum * config->wordsize;
+  for (const Symbol *b : entries) {
+    target->writeGotPlt(buf, *b);
+    buf += config->wordsize;
   }
 }
 
-bool GotPltSection::empty() const {
-  // We need to emit a GOT.PLT even if it's empty if there's a symbol that
-  // references the _GLOBAL_OFFSET_TABLE_ and the Target defines the symbol
-  // relative to the .got.plt section.
-  return Entries.empty() &&
-         !(ElfSym::GlobalOffsetTable && Target->GotBaseSymInGotPlt);
+bool GotPltSection::isNeeded() const {
+  // We need to emit GOTPLT even if it's empty if there's a relocation relative
+  // to it.
+  return !entries.empty() || hasGotPltOffRel;
 }
 
 static StringRef getIgotPltName() {
   // On ARM the IgotPltSection is part of the GotSection.
-  if (Config->EMachine == EM_ARM)
+  if (config->emachine == EM_ARM)
     return ".got";
 
   // On PowerPC64 the GotPltSection is renamed to '.plt' so the IgotPltSection
   // needs to be named the same.
-  if (Config->EMachine == EM_PPC64)
+  if (config->emachine == EM_PPC64)
     return ".plt";
 
   return ".got.plt";
@@ -1129,130 +1112,110 @@ static StringRef getIgotPltName() {
 // with the IgotPltSection.
 IgotPltSection::IgotPltSection()
     : SyntheticSection(SHF_ALLOC | SHF_WRITE,
-                       Config->EMachine == EM_PPC64 ? SHT_NOBITS : SHT_PROGBITS,
-                       Target->GotPltEntrySize, getIgotPltName()) {}
+                       config->emachine == EM_PPC64 ? SHT_NOBITS : SHT_PROGBITS,
+                       config->wordsize, getIgotPltName()) {}
 
-void IgotPltSection::addEntry(Symbol &Sym) {
-  Sym.IsInIgot = true;
-  assert(Sym.PltIndex == Entries.size());
-  Entries.push_back(&Sym);
+void IgotPltSection::addEntry(Symbol &sym) {
+  assert(sym.pltIndex == entries.size());
+  entries.push_back(&sym);
 }
 
 size_t IgotPltSection::getSize() const {
-  return Entries.size() * Target->GotPltEntrySize;
+  return entries.size() * config->wordsize;
 }
 
-void IgotPltSection::writeTo(uint8_t *Buf) {
-  for (const Symbol *B : Entries) {
-    Target->writeIgotPlt(Buf, *B);
-    Buf += Config->Wordsize;
+void IgotPltSection::writeTo(uint8_t *buf) {
+  for (const Symbol *b : entries) {
+    target->writeIgotPlt(buf, *b);
+    buf += config->wordsize;
   }
 }
 
-StringTableSection::StringTableSection(StringRef Name, bool Dynamic)
-    : SyntheticSection(Dynamic ? (uint64_t)SHF_ALLOC : 0, SHT_STRTAB, 1, Name),
-      Dynamic(Dynamic) {
+StringTableSection::StringTableSection(StringRef name, bool dynamic)
+    : SyntheticSection(dynamic ? (uint64_t)SHF_ALLOC : 0, SHT_STRTAB, 1, name),
+      dynamic(dynamic) {
   // ELF string tables start with a NUL byte.
   addString("");
 }
 
-// Adds a string to the string table. If HashIt is true we hash and check for
+// Adds a string to the string table. If `hashIt` is true we hash and check for
 // duplicates. It is optional because the name of global symbols are already
 // uniqued and hashing them again has a big cost for a small value: uniquing
 // them with some other string that happens to be the same.
-unsigned StringTableSection::addString(StringRef S, bool HashIt) {
-  if (HashIt) {
-    auto R = StringMap.insert(std::make_pair(S, this->Size));
-    if (!R.second)
-      return R.first->second;
+unsigned StringTableSection::addString(StringRef s, bool hashIt) {
+  if (hashIt) {
+    auto r = stringMap.insert(std::make_pair(s, this->size));
+    if (!r.second)
+      return r.first->second;
   }
-  unsigned Ret = this->Size;
-  this->Size = this->Size + S.size() + 1;
-  Strings.push_back(S);
-  return Ret;
+  unsigned ret = this->size;
+  this->size = this->size + s.size() + 1;
+  strings.push_back(s);
+  return ret;
 }
 
-void StringTableSection::writeTo(uint8_t *Buf) {
-  for (StringRef S : Strings) {
-    memcpy(Buf, S.data(), S.size());
-    Buf[S.size()] = '\0';
-    Buf += S.size() + 1;
+void StringTableSection::writeTo(uint8_t *buf) {
+  for (StringRef s : strings) {
+    memcpy(buf, s.data(), s.size());
+    buf[s.size()] = '\0';
+    buf += s.size() + 1;
   }
 }
 
 // Returns the number of version definition entries. Because the first entry
 // is for the version definition itself, it is the number of versioned symbols
 // plus one. Note that we don't support multiple versions yet.
-static unsigned getVerDefNum() { return Config->VersionDefinitions.size() + 1; }
+static unsigned getVerDefNum() { return config->versionDefinitions.size() + 1; }
 
 template <class ELFT>
 DynamicSection<ELFT>::DynamicSection()
-    : SyntheticSection(SHF_ALLOC | SHF_WRITE, SHT_DYNAMIC, Config->Wordsize,
+    : SyntheticSection(SHF_ALLOC | SHF_WRITE, SHT_DYNAMIC, config->wordsize,
                        ".dynamic") {
-  this->Entsize = ELFT::Is64Bits ? 16 : 8;
+  this->entsize = ELFT::Is64Bits ? 16 : 8;
 
   // .dynamic section is not writable on MIPS and on Fuchsia OS
   // which passes -z rodynamic.
   // See "Special Section" in Chapter 4 in the following document:
   // ftp://www.linux-mips.org/pub/linux/mips/doc/ABI/mipsabi.pdf
-  if (Config->EMachine == EM_MIPS || Config->ZRodynamic)
-    this->Flags = SHF_ALLOC;
-
-  // Add strings to .dynstr early so that .dynstr's size will be
-  // fixed early.
-  for (StringRef S : Config->FilterList)
-    addInt(DT_FILTER, In.DynStrTab->addString(S));
-  for (StringRef S : Config->AuxiliaryList)
-    addInt(DT_AUXILIARY, In.DynStrTab->addString(S));
-
-  if (!Config->Rpath.empty())
-    addInt(Config->EnableNewDtags ? DT_RUNPATH : DT_RPATH,
-           In.DynStrTab->addString(Config->Rpath));
-
-  for (InputFile *File : SharedFiles) {
-    SharedFile<ELFT> *F = cast<SharedFile<ELFT>>(File);
-    if (F->IsNeeded)
-      addInt(DT_NEEDED, In.DynStrTab->addString(F->SoName));
-  }
-  if (!Config->SoName.empty())
-    addInt(DT_SONAME, In.DynStrTab->addString(Config->SoName));
+  if (config->emachine == EM_MIPS || config->zRodynamic)
+    this->flags = SHF_ALLOC;
 }
 
 template <class ELFT>
-void DynamicSection<ELFT>::add(int32_t Tag, std::function<uint64_t()> Fn) {
-  Entries.push_back({Tag, Fn});
+void DynamicSection<ELFT>::add(int32_t tag, std::function<uint64_t()> fn) {
+  entries.push_back({tag, fn});
 }
 
 template <class ELFT>
-void DynamicSection<ELFT>::addInt(int32_t Tag, uint64_t Val) {
-  Entries.push_back({Tag, [=] { return Val; }});
+void DynamicSection<ELFT>::addInt(int32_t tag, uint64_t val) {
+  entries.push_back({tag, [=] { return val; }});
 }
 
 template <class ELFT>
-void DynamicSection<ELFT>::addInSec(int32_t Tag, InputSection *Sec) {
-  Entries.push_back({Tag, [=] { return Sec->getVA(0); }});
+void DynamicSection<ELFT>::addInSec(int32_t tag, InputSection *sec) {
+  entries.push_back({tag, [=] { return sec->getVA(0); }});
 }
 
 template <class ELFT>
-void DynamicSection<ELFT>::addInSecRelative(int32_t Tag, InputSection *Sec) {
-  size_t TagOffset = Entries.size() * Entsize;
-  Entries.push_back(
-      {Tag, [=] { return Sec->getVA(0) - (getVA() + TagOffset); }});
+void DynamicSection<ELFT>::addInSecRelative(int32_t tag, InputSection *sec) {
+  size_t tagOffset = entries.size() * entsize;
+  entries.push_back(
+      {tag, [=] { return sec->getVA(0) - (getVA() + tagOffset); }});
 }
 
 template <class ELFT>
-void DynamicSection<ELFT>::addOutSec(int32_t Tag, OutputSection *Sec) {
-  Entries.push_back({Tag, [=] { return Sec->Addr; }});
+void DynamicSection<ELFT>::addOutSec(int32_t tag, OutputSection *sec) {
+  entries.push_back({tag, [=] { return sec->addr; }});
 }
 
 template <class ELFT>
-void DynamicSection<ELFT>::addSize(int32_t Tag, OutputSection *Sec) {
-  Entries.push_back({Tag, [=] { return Sec->Size; }});
+void DynamicSection<ELFT>::addSize(int32_t tag, OutputSection *sec) {
+  entries.push_back({tag, [=] { return sec->size; }});
 }
 
 template <class ELFT>
-void DynamicSection<ELFT>::addSym(int32_t Tag, Symbol *Sym) {
-  Entries.push_back({Tag, [=] { return Sym->getVA(); }});
+void DynamicSection<ELFT>::addSym(int32_t tag, Symbol *sym) {
+  entries.push_back({tag, [=] { return sym->getVA(); }});
 }
 
 // A Linker script may assign the RELA relocation sections to the same
@@ -1260,47 +1223,74 @@ void DynamicSection<ELFT>::addSym(int32_t Tag, Symbol *Sym) {
 // Size. Moreover the [DT_JMPREL, DT_JMPREL + DT_PLTRELSZ) is permitted to
 // overlap with the [DT_RELA, DT_RELA + DT_RELASZ).
 static uint64_t addPltRelSz() {
-  size_t Size = In.RelaPlt->getSize();
-  if (In.RelaIplt->getParent() == In.RelaPlt->getParent() &&
-      In.RelaIplt->Name == In.RelaPlt->Name)
-    Size += In.RelaIplt->getSize();
-  return Size;
+  size_t size = in.relaPlt->getSize();
+  if (in.relaIplt->getParent() == in.relaPlt->getParent() &&
+      in.relaIplt->name == in.relaPlt->name)
+    size += in.relaIplt->getSize();
+  return size;
 }
 
 // Add remaining entries to complete .dynamic contents.
 template <class ELFT> void DynamicSection<ELFT>::finalizeContents() {
+  elf::Partition &part = getPartition();
+  bool isMain = part.name.empty();
+
+  for (StringRef s : config->filterList)
+    addInt(DT_FILTER, part.dynStrTab->addString(s));
+  for (StringRef s : config->auxiliaryList)
+    addInt(DT_AUXILIARY, part.dynStrTab->addString(s));
+
+  if (!config->rpath.empty())
+    addInt(config->enableNewDtags ? DT_RUNPATH : DT_RPATH,
+           part.dynStrTab->addString(config->rpath));
+
+  for (SharedFile *file : sharedFiles)
+    if (file->isNeeded)
+      addInt(DT_NEEDED, part.dynStrTab->addString(file->soName));
+
+  if (isMain) {
+    if (!config->soName.empty())
+      addInt(DT_SONAME, part.dynStrTab->addString(config->soName));
+  } else {
+    if (!config->soName.empty())
+      addInt(DT_NEEDED, part.dynStrTab->addString(config->soName));
+    addInt(DT_SONAME, part.dynStrTab->addString(part.name));
+  }
+
   // Set DT_FLAGS and DT_FLAGS_1.
-  uint32_t DtFlags = 0;
-  uint32_t DtFlags1 = 0;
-  if (Config->Bsymbolic)
-    DtFlags |= DF_SYMBOLIC;
-  if (Config->ZGlobal)
-    DtFlags1 |= DF_1_GLOBAL;
-  if (Config->ZInitfirst)
-    DtFlags1 |= DF_1_INITFIRST;
-  if (Config->ZInterpose)
-    DtFlags1 |= DF_1_INTERPOSE;
-  if (Config->ZNodefaultlib)
-    DtFlags1 |= DF_1_NODEFLIB;
-  if (Config->ZNodelete)
-    DtFlags1 |= DF_1_NODELETE;
-  if (Config->ZNodlopen)
-    DtFlags1 |= DF_1_NOOPEN;
-  if (Config->ZNow) {
-    DtFlags |= DF_BIND_NOW;
-    DtFlags1 |= DF_1_NOW;
+  uint32_t dtFlags = 0;
+  uint32_t dtFlags1 = 0;
+  if (config->bsymbolic)
+    dtFlags |= DF_SYMBOLIC;
+  if (config->zGlobal)
+    dtFlags1 |= DF_1_GLOBAL;
+  if (config->zInitfirst)
+    dtFlags1 |= DF_1_INITFIRST;
+  if (config->zInterpose)
+    dtFlags1 |= DF_1_INTERPOSE;
+  if (config->zNodefaultlib)
+    dtFlags1 |= DF_1_NODEFLIB;
+  if (config->zNodelete)
+    dtFlags1 |= DF_1_NODELETE;
+  if (config->zNodlopen)
+    dtFlags1 |= DF_1_NOOPEN;
+  if (config->zNow) {
+    dtFlags |= DF_BIND_NOW;
+    dtFlags1 |= DF_1_NOW;
   }
-  if (Config->ZOrigin) {
-    DtFlags |= DF_ORIGIN;
-    DtFlags1 |= DF_1_ORIGIN;
+  if (config->zOrigin) {
+    dtFlags |= DF_ORIGIN;
+    dtFlags1 |= DF_1_ORIGIN;
   }
-  if (!Config->ZText)
-    DtFlags |= DF_TEXTREL;
+  if (!config->zText)
+    dtFlags |= DF_TEXTREL;
+  if (config->hasStaticTlsModel)
+    dtFlags |= DF_STATIC_TLS;
 
-  if (DtFlags)
-    addInt(DT_FLAGS, DtFlags);
-  if (DtFlags1)
-    addInt(DT_FLAGS_1, DtFlags1);
+  if (dtFlags)
+    addInt(DT_FLAGS, dtFlags);
+  if (dtFlags1)
+    addInt(DT_FLAGS_1, dtFlags1);
 
   // DT_DEBUG is a pointer to debug informaion used by debuggers at runtime. We
   // need it for each process, so we don't write it for DSOs. The loader writes
@@ -1310,268 +1300,287 @@ template <class ELFT> void DynamicSection<ELFT>::finalizeContents() {
   // systems (currently only Fuchsia OS) provide other means to give the
   // debugger this information. Such systems may choose make .dynamic read-only.
   // If the target is such a system (used -z rodynamic) don't write DT_DEBUG.
-  if (!Config->Shared && !Config->Relocatable && !Config->ZRodynamic)
+  if (!config->shared && !config->relocatable && !config->zRodynamic)
     addInt(DT_DEBUG, 0);
 
-  if (OutputSection *Sec = In.DynStrTab->getParent())
-    this->Link = Sec->SectionIndex;
+  if (OutputSection *sec = part.dynStrTab->getParent())
+    this->link = sec->sectionIndex;
 
-  if (!In.RelaDyn->empty()) {
-    addInSec(In.RelaDyn->DynamicTag, In.RelaDyn);
-    addSize(In.RelaDyn->SizeDynamicTag, In.RelaDyn->getParent());
+  if (part.relaDyn->isNeeded()) {
+    addInSec(part.relaDyn->dynamicTag, part.relaDyn);
+    addSize(part.relaDyn->sizeDynamicTag, part.relaDyn->getParent());
 
-    bool IsRela = Config->IsRela;
-    addInt(IsRela ? DT_RELAENT : DT_RELENT,
-           IsRela ? sizeof(Elf_Rela) : sizeof(Elf_Rel));
+    bool isRela = config->isRela;
+    addInt(isRela ? DT_RELAENT : DT_RELENT,
+           isRela ? sizeof(Elf_Rela) : sizeof(Elf_Rel));
 
     // MIPS dynamic loader does not support RELCOUNT tag.
     // The problem is in the tight relation between dynamic
     // relocations and GOT. So do not emit this tag on MIPS.
-    if (Config->EMachine != EM_MIPS) {
-      size_t NumRelativeRels = In.RelaDyn->getRelativeRelocCount();
-      if (Config->ZCombreloc && NumRelativeRels)
-        addInt(IsRela ? DT_RELACOUNT : DT_RELCOUNT, NumRelativeRels);
+    if (config->emachine != EM_MIPS) {
+      size_t numRelativeRels = part.relaDyn->getRelativeRelocCount();
+      if (config->zCombreloc && numRelativeRels)
+        addInt(isRela ? DT_RELACOUNT : DT_RELCOUNT, numRelativeRels);
     }
   }
-  if (In.RelrDyn && !In.RelrDyn->Relocs.empty()) {
-    addInSec(Config->UseAndroidRelrTags ? DT_ANDROID_RELR : DT_RELR,
-             In.RelrDyn);
-    addSize(Config->UseAndroidRelrTags ? DT_ANDROID_RELRSZ : DT_RELRSZ,
-            In.RelrDyn->getParent());
-    addInt(Config->UseAndroidRelrTags ? DT_ANDROID_RELRENT : DT_RELRENT,
+  if (part.relrDyn && !part.relrDyn->relocs.empty()) {
+    addInSec(config->useAndroidRelrTags ? DT_ANDROID_RELR : DT_RELR,
+             part.relrDyn);
+    addSize(config->useAndroidRelrTags ? DT_ANDROID_RELRSZ : DT_RELRSZ,
+            part.relrDyn->getParent());
+    addInt(config->useAndroidRelrTags ? DT_ANDROID_RELRENT : DT_RELRENT,
            sizeof(Elf_Relr));
   }
   // .rel[a].plt section usually consists of two parts, containing plt and
   // iplt relocations. It is possible to have only iplt relocations in the
-  // output. In that case RelaPlt is empty and have zero offset, the same offset
-  // as RelaIplt have. And we still want to emit proper dynamic tags for that
-  // case, so here we always use RelaPlt as marker for the begining of
+  // output. In that case relaPlt is empty and have zero offset, the same offset
+  // as relaIplt has. And we still want to emit proper dynamic tags for that
+  // case, so here we always use relaPlt as marker for the begining of
   // .rel[a].plt section.
-  if (In.RelaPlt->getParent()->Live) {
-    addInSec(DT_JMPREL, In.RelaPlt);
-    Entries.push_back({DT_PLTRELSZ, addPltRelSz});
-    switch (Config->EMachine) {
+  if (isMain && (in.relaPlt->isNeeded() || in.relaIplt->isNeeded())) {
+    addInSec(DT_JMPREL, in.relaPlt);
+    entries.push_back({DT_PLTRELSZ, addPltRelSz});
+    switch (config->emachine) {
     case EM_MIPS:
-      addInSec(DT_MIPS_PLTGOT, In.GotPlt);
+      addInSec(DT_MIPS_PLTGOT, in.gotPlt);
       break;
     case EM_SPARCV9:
-      addInSec(DT_PLTGOT, In.Plt);
+      addInSec(DT_PLTGOT, in.plt);
       break;
     default:
-      addInSec(DT_PLTGOT, In.GotPlt);
+      addInSec(DT_PLTGOT, in.gotPlt);
       break;
     }
-    addInt(DT_PLTREL, Config->IsRela ? DT_RELA : DT_REL);
+    addInt(DT_PLTREL, config->isRela ? DT_RELA : DT_REL);
   }
 
-  addInSec(DT_SYMTAB, In.DynSymTab);
+  if (config->emachine == EM_AARCH64) {
+    if (config->andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_BTI)
+      addInt(DT_AARCH64_BTI_PLT, 0);
+    if (config->andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_PAC)
+      addInt(DT_AARCH64_PAC_PLT, 0);
+  }
+
+  addInSec(DT_SYMTAB, part.dynSymTab);
   addInt(DT_SYMENT, sizeof(Elf_Sym));
-  addInSec(DT_STRTAB, In.DynStrTab);
-  addInt(DT_STRSZ, In.DynStrTab->getSize());
-  if (!Config->ZText)
+  addInSec(DT_STRTAB, part.dynStrTab);
+  addInt(DT_STRSZ, part.dynStrTab->getSize());
+  if (!config->zText)
     addInt(DT_TEXTREL, 0);
-  if (In.GnuHashTab)
-    addInSec(DT_GNU_HASH, In.GnuHashTab);
-  if (In.HashTab)
-    addInSec(DT_HASH, In.HashTab);
+  if (part.gnuHashTab)
+    addInSec(DT_GNU_HASH, part.gnuHashTab);
+  if (part.hashTab)
+    addInSec(DT_HASH, part.hashTab);
 
-  if (Out::PreinitArray) {
-    addOutSec(DT_PREINIT_ARRAY, Out::PreinitArray);
-    addSize(DT_PREINIT_ARRAYSZ, Out::PreinitArray);
-  }
-  if (Out::InitArray) {
-    addOutSec(DT_INIT_ARRAY, Out::InitArray);
-    addSize(DT_INIT_ARRAYSZ, Out::InitArray);
-  }
-  if (Out::FiniArray) {
-    addOutSec(DT_FINI_ARRAY, Out::FiniArray);
-    addSize(DT_FINI_ARRAYSZ, Out::FiniArray);
-  }
+  if (isMain) {
+    if (Out::preinitArray) {
+      addOutSec(DT_PREINIT_ARRAY, Out::preinitArray);
+      addSize(DT_PREINIT_ARRAYSZ, Out::preinitArray);
+    }
+    if (Out::initArray) {
+      addOutSec(DT_INIT_ARRAY, Out::initArray);
+      addSize(DT_INIT_ARRAYSZ, Out::initArray);
+    }
+    if (Out::finiArray) {
+      addOutSec(DT_FINI_ARRAY, Out::finiArray);
+      addSize(DT_FINI_ARRAYSZ, Out::finiArray);
+    }
 
-  if (Symbol *B = Symtab->find(Config->Init))
-    if (B->isDefined())
-      addSym(DT_INIT, B);
-  if (Symbol *B = Symtab->find(Config->Fini))
-    if (B->isDefined())
-      addSym(DT_FINI, B);
+    if (Symbol *b = symtab->find(config->init))
+      if (b->isDefined())
+        addSym(DT_INIT, b);
+    if (Symbol *b = symtab->find(config->fini))
+      if (b->isDefined())
+        addSym(DT_FINI, b);
+  }
 
-  bool HasVerNeed = InX<ELFT>::VerNeed->getNeedNum() != 0;
-  if (HasVerNeed || In.VerDef)
-    addInSec(DT_VERSYM, InX<ELFT>::VerSym);
-  if (In.VerDef) {
-    addInSec(DT_VERDEF, In.VerDef);
+  bool hasVerNeed = SharedFile::vernauxNum != 0;
+  if (hasVerNeed || part.verDef)
+    addInSec(DT_VERSYM, part.verSym);
+  if (part.verDef) {
+    addInSec(DT_VERDEF, part.verDef);
     addInt(DT_VERDEFNUM, getVerDefNum());
   }
-  if (HasVerNeed) {
-    addInSec(DT_VERNEED, InX<ELFT>::VerNeed);
-    addInt(DT_VERNEEDNUM, InX<ELFT>::VerNeed->getNeedNum());
+  if (hasVerNeed) {
+    addInSec(DT_VERNEED, part.verNeed);
+    unsigned needNum = 0;
+    for (SharedFile *f : sharedFiles)
+      if (!f->vernauxs.empty())
+        ++needNum;
+    addInt(DT_VERNEEDNUM, needNum);
   }
 
-  if (Config->EMachine == EM_MIPS) {
+  if (config->emachine == EM_MIPS) {
     addInt(DT_MIPS_RLD_VERSION, 1);
     addInt(DT_MIPS_FLAGS, RHF_NOTPOT);
-    addInt(DT_MIPS_BASE_ADDRESS, Target->getImageBase());
-    addInt(DT_MIPS_SYMTABNO, In.DynSymTab->getNumSymbols());
+    addInt(DT_MIPS_BASE_ADDRESS, target->getImageBase());
+    addInt(DT_MIPS_SYMTABNO, part.dynSymTab->getNumSymbols());
 
-    add(DT_MIPS_LOCAL_GOTNO, [] { return In.MipsGot->getLocalEntriesNum(); });
+    add(DT_MIPS_LOCAL_GOTNO, [] { return in.mipsGot->getLocalEntriesNum(); });
 
-    if (const Symbol *B = In.MipsGot->getFirstGlobalEntry())
-      addInt(DT_MIPS_GOTSYM, B->DynsymIndex);
+    if (const Symbol *b = in.mipsGot->getFirstGlobalEntry())
+      addInt(DT_MIPS_GOTSYM, b->dynsymIndex);
     else
-      addInt(DT_MIPS_GOTSYM, In.DynSymTab->getNumSymbols());
-    addInSec(DT_PLTGOT, In.MipsGot);
-    if (In.MipsRldMap) {
-      if (!Config->Pie)
-        addInSec(DT_MIPS_RLD_MAP, In.MipsRldMap);
+      addInt(DT_MIPS_GOTSYM, part.dynSymTab->getNumSymbols());
+    addInSec(DT_PLTGOT, in.mipsGot);
+    if (in.mipsRldMap) {
+      if (!config->pie)
+        addInSec(DT_MIPS_RLD_MAP, in.mipsRldMap);
       // Store the offset to the .rld_map section
       // relative to the address of the tag.
-      addInSecRelative(DT_MIPS_RLD_MAP_REL, In.MipsRldMap);
+      addInSecRelative(DT_MIPS_RLD_MAP_REL, in.mipsRldMap);
     }
   }
 
+  // DT_PPC_GOT indicates to glibc Secure PLT is used. If DT_PPC_GOT is absent,
+  // glibc assumes the old-style BSS PLT layout which we don't support.
+  if (config->emachine == EM_PPC)
+    add(DT_PPC_GOT, [] { return in.got->getVA(); });
+
   // Glink dynamic tag is required by the V2 abi if the plt section isn't empty.
-  if (Config->EMachine == EM_PPC64 && !In.Plt->empty()) {
+  if (config->emachine == EM_PPC64 && in.plt->isNeeded()) {
     // The Glink tag points to 32 bytes before the first lazy symbol resolution
     // stub, which starts directly after the header.
-    Entries.push_back({DT_PPC64_GLINK, [=] {
-                         unsigned Offset = Target->PltHeaderSize - 32;
-                         return In.Plt->getVA(0) + Offset;
+    entries.push_back({DT_PPC64_GLINK, [=] {
+                         unsigned offset = target->pltHeaderSize - 32;
+                         return in.plt->getVA(0) + offset;
                        }});
   }
 
   addInt(DT_NULL, 0);
 
-  getParent()->Link = this->Link;
-  this->Size = Entries.size() * this->Entsize;
+  getParent()->link = this->link;
+  this->size = entries.size() * this->entsize;
 }
 
-template <class ELFT> void DynamicSection<ELFT>::writeTo(uint8_t *Buf) {
-  auto *P = reinterpret_cast<Elf_Dyn *>(Buf);
+template <class ELFT> void DynamicSection<ELFT>::writeTo(uint8_t *buf) {
+  auto *p = reinterpret_cast<Elf_Dyn *>(buf);
 
-  for (std::pair<int32_t, std::function<uint64_t()>> &KV : Entries) {
-    P->d_tag = KV.first;
-    P->d_un.d_val = KV.second();
-    ++P;
+  for (std::pair<int32_t, std::function<uint64_t()>> &kv : entries) {
+    p->d_tag = kv.first;
+    p->d_un.d_val = kv.second();
+    ++p;
   }
 }
 
 uint64_t DynamicReloc::getOffset() const {
-  return InputSec->getVA(OffsetInSec);
+  return inputSec->getVA(offsetInSec);
 }
 
 int64_t DynamicReloc::computeAddend() const {
-  if (UseSymVA)
-    return Sym->getVA(Addend);
-  if (!OutputSec)
-    return Addend;
+  if (useSymVA)
+    return sym->getVA(addend);
+  if (!outputSec)
+    return addend;
   // See the comment in the DynamicReloc ctor.
-  return getMipsPageAddr(OutputSec->Addr) + Addend;
+  return getMipsPageAddr(outputSec->addr) + addend;
 }
 
-uint32_t DynamicReloc::getSymIndex() const {
-  if (Sym && !UseSymVA)
-    return Sym->DynsymIndex;
+uint32_t DynamicReloc::getSymIndex(SymbolTableBaseSection *symTab) const {
+  if (sym && !useSymVA)
+    return symTab->getSymbolIndex(sym);
   return 0;
 }
 
-RelocationBaseSection::RelocationBaseSection(StringRef Name, uint32_t Type,
-                                             int32_t DynamicTag,
-                                             int32_t SizeDynamicTag)
-    : SyntheticSection(SHF_ALLOC, Type, Config->Wordsize, Name),
-      DynamicTag(DynamicTag), SizeDynamicTag(SizeDynamicTag) {}
+RelocationBaseSection::RelocationBaseSection(StringRef name, uint32_t type,
+                                             int32_t dynamicTag,
+                                             int32_t sizeDynamicTag)
+    : SyntheticSection(SHF_ALLOC, type, config->wordsize, name),
+      dynamicTag(dynamicTag), sizeDynamicTag(sizeDynamicTag) {}
 
-void RelocationBaseSection::addReloc(RelType DynType, InputSectionBase *IS,
-                                     uint64_t OffsetInSec, Symbol *Sym) {
-  addReloc({DynType, IS, OffsetInSec, false, Sym, 0});
+void RelocationBaseSection::addReloc(RelType dynType, InputSectionBase *isec,
+                                     uint64_t offsetInSec, Symbol *sym) {
+  addReloc({dynType, isec, offsetInSec, false, sym, 0});
 }
 
-void RelocationBaseSection::addReloc(RelType DynType,
-                                     InputSectionBase *InputSec,
-                                     uint64_t OffsetInSec, Symbol *Sym,
-                                     int64_t Addend, RelExpr Expr,
-                                     RelType Type) {
+void RelocationBaseSection::addReloc(RelType dynType,
+                                     InputSectionBase *inputSec,
+                                     uint64_t offsetInSec, Symbol *sym,
+                                     int64_t addend, RelExpr expr,
+                                     RelType type) {
   // Write the addends to the relocated address if required. We skip
   // it if the written value would be zero.
-  if (Config->WriteAddends && (Expr != R_ADDEND || Addend != 0))
-    InputSec->Relocations.push_back({Expr, Type, OffsetInSec, Addend, Sym});
-  addReloc({DynType, InputSec, OffsetInSec, Expr != R_ADDEND, Sym, Addend});
+  if (config->writeAddends && (expr != R_ADDEND || addend != 0))
+    inputSec->relocations.push_back({expr, type, offsetInSec, addend, sym});
+  addReloc({dynType, inputSec, offsetInSec, expr != R_ADDEND, sym, addend});
 }
 
-void RelocationBaseSection::addReloc(const DynamicReloc &Reloc) {
-  if (Reloc.Type == Target->RelativeRel)
-    ++NumRelativeRelocs;
-  Relocs.push_back(Reloc);
+void RelocationBaseSection::addReloc(const DynamicReloc &reloc) {
+  if (reloc.type == target->relativeRel)
+    ++numRelativeRelocs;
+  relocs.push_back(reloc);
 }
 
 void RelocationBaseSection::finalizeContents() {
+  SymbolTableBaseSection *symTab = getPartition().dynSymTab;
+
   // When linking glibc statically, .rel{,a}.plt contains R_*_IRELATIVE
   // relocations due to IFUNC (e.g. strcpy). sh_link will be set to 0 in that
   // case.
-  InputSection *SymTab = Config->Relocatable ? In.SymTab : In.DynSymTab;
-  if (SymTab && SymTab->getParent())
-    getParent()->Link = SymTab->getParent()->SectionIndex;
+  if (symTab && symTab->getParent())
+    getParent()->link = symTab->getParent()->sectionIndex;
   else
-    getParent()->Link = 0;
+    getParent()->link = 0;
 
-  if (In.RelaPlt == this)
-    getParent()->Info = In.GotPlt->getParent()->SectionIndex;
-  if (In.RelaIplt == this)
-    getParent()->Info = In.IgotPlt->getParent()->SectionIndex;
+  if (in.relaPlt == this)
+    getParent()->info = in.gotPlt->getParent()->sectionIndex;
+  if (in.relaIplt == this)
+    getParent()->info = in.igotPlt->getParent()->sectionIndex;
 }
 
 RelrBaseSection::RelrBaseSection()
     : SyntheticSection(SHF_ALLOC,
-                       Config->UseAndroidRelrTags ? SHT_ANDROID_RELR : SHT_RELR,
-                       Config->Wordsize, ".relr.dyn") {}
+                       config->useAndroidRelrTags ? SHT_ANDROID_RELR : SHT_RELR,
+                       config->wordsize, ".relr.dyn") {}
 
 template <class ELFT>
-static void encodeDynamicReloc(typename ELFT::Rela *P,
-                               const DynamicReloc &Rel) {
-  if (Config->IsRela)
-    P->r_addend = Rel.computeAddend();
-  P->r_offset = Rel.getOffset();
-  P->setSymbolAndType(Rel.getSymIndex(), Rel.Type, Config->IsMips64EL);
+static void encodeDynamicReloc(SymbolTableBaseSection *symTab,
+                               typename ELFT::Rela *p,
+                               const DynamicReloc &rel) {
+  if (config->isRela)
+    p->r_addend = rel.computeAddend();
+  p->r_offset = rel.getOffset();
+  p->setSymbolAndType(rel.getSymIndex(symTab), rel.type, config->isMips64EL);
 }
 
 template <class ELFT>
-RelocationSection<ELFT>::RelocationSection(StringRef Name, bool Sort)
-    : RelocationBaseSection(Name, Config->IsRela ? SHT_RELA : SHT_REL,
-                            Config->IsRela ? DT_RELA : DT_REL,
-                            Config->IsRela ? DT_RELASZ : DT_RELSZ),
-      Sort(Sort) {
-  this->Entsize = Config->IsRela ? sizeof(Elf_Rela) : sizeof(Elf_Rel);
+RelocationSection<ELFT>::RelocationSection(StringRef name, bool sort)
+    : RelocationBaseSection(name, config->isRela ? SHT_RELA : SHT_REL,
+                            config->isRela ? DT_RELA : DT_REL,
+                            config->isRela ? DT_RELASZ : DT_RELSZ),
+      sort(sort) {
+  this->entsize = config->isRela ? sizeof(Elf_Rela) : sizeof(Elf_Rel);
 }
 
-static bool compRelocations(const DynamicReloc &A, const DynamicReloc &B) {
-  bool AIsRel = A.Type == Target->RelativeRel;
-  bool BIsRel = B.Type == Target->RelativeRel;
-  if (AIsRel != BIsRel)
-    return AIsRel;
-  return A.getSymIndex() < B.getSymIndex();
-}
+template <class ELFT> void RelocationSection<ELFT>::writeTo(uint8_t *buf) {
+  SymbolTableBaseSection *symTab = getPartition().dynSymTab;
 
-template <class ELFT> void RelocationSection<ELFT>::writeTo(uint8_t *Buf) {
-  if (Sort)
-    std::stable_sort(Relocs.begin(), Relocs.end(), compRelocations);
+  // Sort by (!IsRelative,SymIndex,r_offset). DT_REL[A]COUNT requires us to
+  // place R_*_RELATIVE first. SymIndex is to improve locality, while r_offset
+  // is to make results easier to read.
+  if (sort)
+    llvm::stable_sort(
+        relocs, [&](const DynamicReloc &a, const DynamicReloc &b) {
+          return std::make_tuple(a.type != target->relativeRel,
+                                 a.getSymIndex(symTab), a.getOffset()) <
+                 std::make_tuple(b.type != target->relativeRel,
+                                 b.getSymIndex(symTab), b.getOffset());
+        });
 
-  for (const DynamicReloc &Rel : Relocs) {
-    encodeDynamicReloc<ELFT>(reinterpret_cast<Elf_Rela *>(Buf), Rel);
-    Buf += Config->IsRela ? sizeof(Elf_Rela) : sizeof(Elf_Rel);
+  for (const DynamicReloc &rel : relocs) {
+    encodeDynamicReloc<ELFT>(symTab, reinterpret_cast<Elf_Rela *>(buf), rel);
+    buf += config->isRela ? sizeof(Elf_Rela) : sizeof(Elf_Rel);
   }
 }
 
-template <class ELFT> unsigned RelocationSection<ELFT>::getRelocOffset() {
-  return this->Entsize * Relocs.size();
-}
-
 template <class ELFT>
 AndroidPackedRelocationSection<ELFT>::AndroidPackedRelocationSection(
-    StringRef Name)
+    StringRef name)
     : RelocationBaseSection(
-          Name, Config->IsRela ? SHT_ANDROID_RELA : SHT_ANDROID_REL,
-          Config->IsRela ? DT_ANDROID_RELA : DT_ANDROID_REL,
-          Config->IsRela ? DT_ANDROID_RELASZ : DT_ANDROID_RELSZ) {
-  this->Entsize = 1;
+          name, config->isRela ? SHT_ANDROID_RELA : SHT_ANDROID_REL,
+          config->isRela ? DT_ANDROID_RELA : DT_ANDROID_REL,
+          config->isRela ? DT_ANDROID_RELASZ : DT_ANDROID_RELSZ) {
+  this->entsize = 1;
 }
 
 template <class ELFT>
@@ -1621,32 +1630,32 @@ bool AndroidPackedRelocationSection<ELFT>::updateAllocSize() {
   //   RELOCATION_GROUPED_BY_ADDEND_FLAG is not set) the r_addend delta for
   //   this relocation.
 
-  size_t OldSize = RelocData.size();
+  size_t oldSize = relocData.size();
 
-  RelocData = {'A', 'P', 'S', '2'};
-  raw_svector_ostream OS(RelocData);
-  auto Add = [&](int64_t V) { encodeSLEB128(V, OS); };
+  relocData = {'A', 'P', 'S', '2'};
+  raw_svector_ostream os(relocData);
+  auto add = [&](int64_t v) { encodeSLEB128(v, os); };
 
   // The format header includes the number of relocations and the initial
   // offset (we set this to zero because the first relocation group will
   // perform the initial adjustment).
-  Add(Relocs.size());
-  Add(0);
+  add(relocs.size());
+  add(0);
 
-  std::vector<Elf_Rela> Relatives, NonRelatives;
+  std::vector<Elf_Rela> relatives, nonRelatives;
 
-  for (const DynamicReloc &Rel : Relocs) {
-    Elf_Rela R;
-    encodeDynamicReloc<ELFT>(&R, Rel);
+  for (const DynamicReloc &rel : relocs) {
+    Elf_Rela r;
+    encodeDynamicReloc<ELFT>(getPartition().dynSymTab, &r, rel);
 
-    if (R.getType(Config->IsMips64EL) == Target->RelativeRel)
-      Relatives.push_back(R);
+    if (r.getType(config->isMips64EL) == target->relativeRel)
+      relatives.push_back(r);
     else
-      NonRelatives.push_back(R);
+      nonRelatives.push_back(r);
   }
 
-  llvm::sort(Relatives, [](const Elf_Rel &A, const Elf_Rel &B) {
-    return A.r_offset < B.r_offset;
+  llvm::sort(relatives, [](const Elf_Rel &a, const Elf_Rel &b) {
+    return a.r_offset < b.r_offset;
   });
 
   // Try to find groups of relative relocations which are spaced one word
@@ -1655,108 +1664,108 @@ bool AndroidPackedRelocationSection<ELFT>::updateAllocSize() {
   // encoding, but each group will cost 7 bytes in addition to the offset from
   // the previous group, so it is only profitable to do this for groups of
   // size 8 or larger.
-  std::vector<Elf_Rela> UngroupedRelatives;
-  std::vector<std::vector<Elf_Rela>> RelativeGroups;
-  for (auto I = Relatives.begin(), E = Relatives.end(); I != E;) {
-    std::vector<Elf_Rela> Group;
+  std::vector<Elf_Rela> ungroupedRelatives;
+  std::vector<std::vector<Elf_Rela>> relativeGroups;
+  for (auto i = relatives.begin(), e = relatives.end(); i != e;) {
+    std::vector<Elf_Rela> group;
     do {
-      Group.push_back(*I++);
-    } while (I != E && (I - 1)->r_offset + Config->Wordsize == I->r_offset);
+      group.push_back(*i++);
+    } while (i != e && (i - 1)->r_offset + config->wordsize == i->r_offset);
 
-    if (Group.size() < 8)
-      UngroupedRelatives.insert(UngroupedRelatives.end(), Group.begin(),
-                                Group.end());
+    if (group.size() < 8)
+      ungroupedRelatives.insert(ungroupedRelatives.end(), group.begin(),
+                                group.end());
     else
-      RelativeGroups.emplace_back(std::move(Group));
+      relativeGroups.emplace_back(std::move(group));
   }
 
-  unsigned HasAddendIfRela =
-      Config->IsRela ? RELOCATION_GROUP_HAS_ADDEND_FLAG : 0;
+  unsigned hasAddendIfRela =
+      config->isRela ? RELOCATION_GROUP_HAS_ADDEND_FLAG : 0;
 
-  uint64_t Offset = 0;
-  uint64_t Addend = 0;
+  uint64_t offset = 0;
+  uint64_t addend = 0;
 
   // Emit the run-length encoding for the groups of adjacent relative
   // relocations. Each group is represented using two groups in the packed
   // format. The first is used to set the current offset to the start of the
   // group (and also encodes the first relocation), and the second encodes the
   // remaining relocations.
-  for (std::vector<Elf_Rela> &G : RelativeGroups) {
+  for (std::vector<Elf_Rela> &g : relativeGroups) {
     // The first relocation in the group.
-    Add(1);
-    Add(RELOCATION_GROUPED_BY_OFFSET_DELTA_FLAG |
-        RELOCATION_GROUPED_BY_INFO_FLAG | HasAddendIfRela);
-    Add(G[0].r_offset - Offset);
-    Add(Target->RelativeRel);
-    if (Config->IsRela) {
-      Add(G[0].r_addend - Addend);
-      Addend = G[0].r_addend;
+    add(1);
+    add(RELOCATION_GROUPED_BY_OFFSET_DELTA_FLAG |
+        RELOCATION_GROUPED_BY_INFO_FLAG | hasAddendIfRela);
+    add(g[0].r_offset - offset);
+    add(target->relativeRel);
+    if (config->isRela) {
+      add(g[0].r_addend - addend);
+      addend = g[0].r_addend;
     }
 
     // The remaining relocations.
-    Add(G.size() - 1);
-    Add(RELOCATION_GROUPED_BY_OFFSET_DELTA_FLAG |
-        RELOCATION_GROUPED_BY_INFO_FLAG | HasAddendIfRela);
-    Add(Config->Wordsize);
-    Add(Target->RelativeRel);
-    if (Config->IsRela) {
-      for (auto I = G.begin() + 1, E = G.end(); I != E; ++I) {
-        Add(I->r_addend - Addend);
-        Addend = I->r_addend;
+    add(g.size() - 1);
+    add(RELOCATION_GROUPED_BY_OFFSET_DELTA_FLAG |
+        RELOCATION_GROUPED_BY_INFO_FLAG | hasAddendIfRela);
+    add(config->wordsize);
+    add(target->relativeRel);
+    if (config->isRela) {
+      for (auto i = g.begin() + 1, e = g.end(); i != e; ++i) {
+        add(i->r_addend - addend);
+        addend = i->r_addend;
       }
     }
 
-    Offset = G.back().r_offset;
+    offset = g.back().r_offset;
   }
 
   // Now the ungrouped relatives.
-  if (!UngroupedRelatives.empty()) {
-    Add(UngroupedRelatives.size());
-    Add(RELOCATION_GROUPED_BY_INFO_FLAG | HasAddendIfRela);
-    Add(Target->RelativeRel);
-    for (Elf_Rela &R : UngroupedRelatives) {
-      Add(R.r_offset - Offset);
-      Offset = R.r_offset;
-      if (Config->IsRela) {
-        Add(R.r_addend - Addend);
-        Addend = R.r_addend;
+  if (!ungroupedRelatives.empty()) {
+    add(ungroupedRelatives.size());
+    add(RELOCATION_GROUPED_BY_INFO_FLAG | hasAddendIfRela);
+    add(target->relativeRel);
+    for (Elf_Rela &r : ungroupedRelatives) {
+      add(r.r_offset - offset);
+      offset = r.r_offset;
+      if (config->isRela) {
+        add(r.r_addend - addend);
+        addend = r.r_addend;
       }
     }
   }
 
   // Finally the non-relative relocations.
-  llvm::sort(NonRelatives, [](const Elf_Rela &A, const Elf_Rela &B) {
-    return A.r_offset < B.r_offset;
+  llvm::sort(nonRelatives, [](const Elf_Rela &a, const Elf_Rela &b) {
+    return a.r_offset < b.r_offset;
   });
-  if (!NonRelatives.empty()) {
-    Add(NonRelatives.size());
-    Add(HasAddendIfRela);
-    for (Elf_Rela &R : NonRelatives) {
-      Add(R.r_offset - Offset);
-      Offset = R.r_offset;
-      Add(R.r_info);
-      if (Config->IsRela) {
-        Add(R.r_addend - Addend);
-        Addend = R.r_addend;
+  if (!nonRelatives.empty()) {
+    add(nonRelatives.size());
+    add(hasAddendIfRela);
+    for (Elf_Rela &r : nonRelatives) {
+      add(r.r_offset - offset);
+      offset = r.r_offset;
+      add(r.r_info);
+      if (config->isRela) {
+        add(r.r_addend - addend);
+        addend = r.r_addend;
       }
     }
   }
 
   // Don't allow the section to shrink; otherwise the size of the section can
   // oscillate infinitely.
-  if (RelocData.size() < OldSize)
-    RelocData.append(OldSize - RelocData.size(), 0);
+  if (relocData.size() < oldSize)
+    relocData.append(oldSize - relocData.size(), 0);
 
   // Returns whether the section size changed. We need to keep recomputing both
   // section layout and the contents of this section until the size converges
   // because changing this section's size can affect section layout, which in
   // turn can affect the sizes of the LEB-encoded integers stored in this
   // section.
-  return RelocData.size() != OldSize;
+  return relocData.size() != oldSize;
 }
 
 template <class ELFT> RelrSection<ELFT>::RelrSection() {
-  this->Entsize = Config->Wordsize;
+  this->entsize = config->wordsize;
 }
 
 template <class ELFT> bool RelrSection<ELFT>::updateAllocSize() {
@@ -1790,90 +1799,90 @@ template <class ELFT> bool RelrSection<ELFT>::updateAllocSize() {
   //    even means address, odd means bitmap.
   // 2. Just a simple list of addresses is a valid encoding.
 
-  size_t OldSize = RelrRelocs.size();
-  RelrRelocs.clear();
+  size_t oldSize = relrRelocs.size();
+  relrRelocs.clear();
 
   // Same as Config->Wordsize but faster because this is a compile-time
   // constant.
-  const size_t Wordsize = sizeof(typename ELFT::uint);
+  const size_t wordsize = sizeof(typename ELFT::uint);
 
   // Number of bits to use for the relocation offsets bitmap.
   // Must be either 63 or 31.
-  const size_t NBits = Wordsize * 8 - 1;
+  const size_t nBits = wordsize * 8 - 1;
 
   // Get offsets for all relative relocations and sort them.
-  std::vector<uint64_t> Offsets;
-  for (const RelativeReloc &Rel : Relocs)
-    Offsets.push_back(Rel.getOffset());
-  llvm::sort(Offsets.begin(), Offsets.end());
+  std::vector<uint64_t> offsets;
+  for (const RelativeReloc &rel : relocs)
+    offsets.push_back(rel.getOffset());
+  llvm::sort(offsets);
 
   // For each leading relocation, find following ones that can be folded
   // as a bitmap and fold them.
-  for (size_t I = 0, E = Offsets.size(); I < E;) {
+  for (size_t i = 0, e = offsets.size(); i < e;) {
     // Add a leading relocation.
-    RelrRelocs.push_back(Elf_Relr(Offsets[I]));
-    uint64_t Base = Offsets[I] + Wordsize;
-    ++I;
+    relrRelocs.push_back(Elf_Relr(offsets[i]));
+    uint64_t base = offsets[i] + wordsize;
+    ++i;
 
     // Find foldable relocations to construct bitmaps.
-    while (I < E) {
-      uint64_t Bitmap = 0;
+    while (i < e) {
+      uint64_t bitmap = 0;
 
-      while (I < E) {
-        uint64_t Delta = Offsets[I] - Base;
+      while (i < e) {
+        uint64_t delta = offsets[i] - base;
 
         // If it is too far, it cannot be folded.
-        if (Delta >= NBits * Wordsize)
+        if (delta >= nBits * wordsize)
           break;
 
         // If it is not a multiple of wordsize away, it cannot be folded.
-        if (Delta % Wordsize)
+        if (delta % wordsize)
           break;
 
         // Fold it.
-        Bitmap |= 1ULL << (Delta / Wordsize);
-        ++I;
+        bitmap |= 1ULL << (delta / wordsize);
+        ++i;
       }
 
-      if (!Bitmap)
+      if (!bitmap)
         break;
 
-      RelrRelocs.push_back(Elf_Relr((Bitmap << 1) | 1));
-      Base += NBits * Wordsize;
+      relrRelocs.push_back(Elf_Relr((bitmap << 1) | 1));
+      base += nBits * wordsize;
     }
   }
 
-  return RelrRelocs.size() != OldSize;
+  return relrRelocs.size() != oldSize;
 }
 
-SymbolTableBaseSection::SymbolTableBaseSection(StringTableSection &StrTabSec)
-    : SyntheticSection(StrTabSec.isDynamic() ? (uint64_t)SHF_ALLOC : 0,
-                       StrTabSec.isDynamic() ? SHT_DYNSYM : SHT_SYMTAB,
-                       Config->Wordsize,
-                       StrTabSec.isDynamic() ? ".dynsym" : ".symtab"),
-      StrTabSec(StrTabSec) {}
+SymbolTableBaseSection::SymbolTableBaseSection(StringTableSection &strTabSec)
+    : SyntheticSection(strTabSec.isDynamic() ? (uint64_t)SHF_ALLOC : 0,
+                       strTabSec.isDynamic() ? SHT_DYNSYM : SHT_SYMTAB,
+                       config->wordsize,
+                       strTabSec.isDynamic() ? ".dynsym" : ".symtab"),
+      strTabSec(strTabSec) {}
 
 // Orders symbols according to their positions in the GOT,
 // in compliance with MIPS ABI rules.
 // See "Global Offset Table" in Chapter 5 in the following document
 // for detailed description:
 // ftp://www.linux-mips.org/pub/linux/mips/doc/ABI/mipsabi.pdf
-static bool sortMipsSymbols(const SymbolTableEntry &L,
-                            const SymbolTableEntry &R) {
+static bool sortMipsSymbols(const SymbolTableEntry &l,
+                            const SymbolTableEntry &r) {
   // Sort entries related to non-local preemptible symbols by GOT indexes.
   // All other entries go to the beginning of a dynsym in arbitrary order.
-  if (L.Sym->isInGot() && R.Sym->isInGot())
-    return L.Sym->GotIndex < R.Sym->GotIndex;
-  if (!L.Sym->isInGot() && !R.Sym->isInGot())
+  if (l.sym->isInGot() && r.sym->isInGot())
+    return l.sym->gotIndex < r.sym->gotIndex;
+  if (!l.sym->isInGot() && !r.sym->isInGot())
     return false;
-  return !L.Sym->isInGot();
+  return !l.sym->isInGot();
 }
 
 void SymbolTableBaseSection::finalizeContents() {
-  if (OutputSection *Sec = StrTabSec.getParent())
-    getParent()->Link = Sec->SectionIndex;
+  if (OutputSection *sec = strTabSec.getParent())
+    getParent()->link = sec->sectionIndex;
 
-  if (this->Type != SHT_DYNSYM) {
+  if (this->type != SHT_DYNSYM) {
     sortSymTabSymbols();
     return;
   }
@@ -1883,18 +1892,22 @@ void SymbolTableBaseSection::finalizeContents() {
 
   // Section's Info field has the index of the first non-local symbol.
   // Because the first symbol entry is a null entry, 1 is the first.
-  getParent()->Info = 1;
+  getParent()->info = 1;
 
-  if (In.GnuHashTab) {
+  if (getPartition().gnuHashTab) {
     // NB: It also sorts Symbols to meet the GNU hash table requirements.
-    In.GnuHashTab->addSymbols(Symbols);
-  } else if (Config->EMachine == EM_MIPS) {
-    std::stable_sort(Symbols.begin(), Symbols.end(), sortMipsSymbols);
+    getPartition().gnuHashTab->addSymbols(symbols);
+  } else if (config->emachine == EM_MIPS) {
+    llvm::stable_sort(symbols, sortMipsSymbols);
   }
 
-  size_t I = 0;
-  for (const SymbolTableEntry &S : Symbols)
-    S.Sym->DynsymIndex = ++I;
+  // Only the main partition's dynsym indexes are stored in the symbols
+  // themselves. All other partitions use a lookup table.
+  if (this == mainPart->dynSymTab) {
+    size_t i = 0;
+    for (const SymbolTableEntry &s : symbols)
+      s.sym->dynsymIndex = ++i;
+  }
 }
 
 // The ELF spec requires that all local symbols precede global symbols, so we
@@ -1906,193 +1919,210 @@ void SymbolTableBaseSection::finalizeContents() {
 // coming from.
 void SymbolTableBaseSection::sortSymTabSymbols() {
   // Move all local symbols before global symbols.
-  auto E = std::stable_partition(
-      Symbols.begin(), Symbols.end(), [](const SymbolTableEntry &S) {
-        return S.Sym->isLocal() || S.Sym->computeBinding() == STB_LOCAL;
+  auto e = std::stable_partition(
+      symbols.begin(), symbols.end(), [](const SymbolTableEntry &s) {
+        return s.sym->isLocal() || s.sym->computeBinding() == STB_LOCAL;
       });
-  size_t NumLocals = E - Symbols.begin();
-  getParent()->Info = NumLocals + 1;
+  size_t numLocals = e - symbols.begin();
+  getParent()->info = numLocals + 1;
 
   // We want to group the local symbols by file. For that we rebuild the local
   // part of the symbols vector. We do not need to care about the STT_FILE
   // symbols, they are already naturally placed first in each group. That
   // happens because STT_FILE is always the first symbol in the object and hence
   // precede all other local symbols we add for a file.
-  MapVector<InputFile *, std::vector<SymbolTableEntry>> Arr;
-  for (const SymbolTableEntry &S : llvm::make_range(Symbols.begin(), E))
-    Arr[S.Sym->File].push_back(S);
+  MapVector<InputFile *, std::vector<SymbolTableEntry>> arr;
+  for (const SymbolTableEntry &s : llvm::make_range(symbols.begin(), e))
+    arr[s.sym->file].push_back(s);
 
-  auto I = Symbols.begin();
-  for (std::pair<InputFile *, std::vector<SymbolTableEntry>> &P : Arr)
-    for (SymbolTableEntry &Entry : P.second)
-      *I++ = Entry;
+  auto i = symbols.begin();
+  for (std::pair<InputFile *, std::vector<SymbolTableEntry>> &p : arr)
+    for (SymbolTableEntry &entry : p.second)
+      *i++ = entry;
 }
 
-void SymbolTableBaseSection::addSymbol(Symbol *B) {
+void SymbolTableBaseSection::addSymbol(Symbol *b) {
   // Adding a local symbol to a .dynsym is a bug.
-  assert(this->Type != SHT_DYNSYM || !B->isLocal());
+  assert(this->type != SHT_DYNSYM || !b->isLocal());
 
-  bool HashIt = B->isLocal();
-  Symbols.push_back({B, StrTabSec.addString(B->getName(), HashIt)});
+  bool hashIt = b->isLocal();
+  symbols.push_back({b, strTabSec.addString(b->getName(), hashIt)});
 }
 
-size_t SymbolTableBaseSection::getSymbolIndex(Symbol *Sym) {
-  // Initializes symbol lookup tables lazily. This is used only
-  // for -r or -emit-relocs.
-  llvm::call_once(OnceFlag, [&] {
-    SymbolIndexMap.reserve(Symbols.size());
-    size_t I = 0;
-    for (const SymbolTableEntry &E : Symbols) {
-      if (E.Sym->Type == STT_SECTION)
-        SectionIndexMap[E.Sym->getOutputSection()] = ++I;
+size_t SymbolTableBaseSection::getSymbolIndex(Symbol *sym) {
+  if (this == mainPart->dynSymTab)
+    return sym->dynsymIndex;
+
+  // Initializes symbol lookup tables lazily. This is used only for -r,
+  // -emit-relocs and dynsyms in partitions other than the main one.
+  llvm::call_once(onceFlag, [&] {
+    symbolIndexMap.reserve(symbols.size());
+    size_t i = 0;
+    for (const SymbolTableEntry &e : symbols) {
+      if (e.sym->type == STT_SECTION)
+        sectionIndexMap[e.sym->getOutputSection()] = ++i;
       else
-        SymbolIndexMap[E.Sym] = ++I;
+        symbolIndexMap[e.sym] = ++i;
     }
   });
 
   // Section symbols are mapped based on their output sections
   // to maintain their semantics.
-  if (Sym->Type == STT_SECTION)
-    return SectionIndexMap.lookup(Sym->getOutputSection());
-  return SymbolIndexMap.lookup(Sym);
+  if (sym->type == STT_SECTION)
+    return sectionIndexMap.lookup(sym->getOutputSection());
+  return symbolIndexMap.lookup(sym);
 }
 
 template <class ELFT>
-SymbolTableSection<ELFT>::SymbolTableSection(StringTableSection &StrTabSec)
-    : SymbolTableBaseSection(StrTabSec) {
-  this->Entsize = sizeof(Elf_Sym);
+SymbolTableSection<ELFT>::SymbolTableSection(StringTableSection &strTabSec)
+    : SymbolTableBaseSection(strTabSec) {
+  this->entsize = sizeof(Elf_Sym);
 }
 
-static BssSection *getCommonSec(Symbol *Sym) {
-  if (!Config->DefineCommon)
-    if (auto *D = dyn_cast<Defined>(Sym))
-      return dyn_cast_or_null<BssSection>(D->Section);
+static BssSection *getCommonSec(Symbol *sym) {
+  if (!config->defineCommon)
+    if (auto *d = dyn_cast<Defined>(sym))
+      return dyn_cast_or_null<BssSection>(d->section);
   return nullptr;
 }
 
-static uint32_t getSymSectionIndex(Symbol *Sym) {
-  if (getCommonSec(Sym))
+static uint32_t getSymSectionIndex(Symbol *sym) {
+  if (getCommonSec(sym))
     return SHN_COMMON;
-  if (!isa<Defined>(Sym) || Sym->NeedsPltAddr)
+  if (!isa<Defined>(sym) || sym->needsPltAddr)
     return SHN_UNDEF;
-  if (const OutputSection *OS = Sym->getOutputSection())
-    return OS->SectionIndex >= SHN_LORESERVE ? (uint32_t)SHN_XINDEX
-                                             : OS->SectionIndex;
+  if (const OutputSection *os = sym->getOutputSection())
+    return os->sectionIndex >= SHN_LORESERVE ? (uint32_t)SHN_XINDEX
+                                             : os->sectionIndex;
   return SHN_ABS;
 }
 
 // Write the internal symbol table contents to the output symbol table.
-template <class ELFT> void SymbolTableSection<ELFT>::writeTo(uint8_t *Buf) {
+template <class ELFT> void SymbolTableSection<ELFT>::writeTo(uint8_t *buf) {
   // The first entry is a null entry as per the ELF spec.
-  memset(Buf, 0, sizeof(Elf_Sym));
-  Buf += sizeof(Elf_Sym);
+  memset(buf, 0, sizeof(Elf_Sym));
+  buf += sizeof(Elf_Sym);
 
-  auto *ESym = reinterpret_cast<Elf_Sym *>(Buf);
+  auto *eSym = reinterpret_cast<Elf_Sym *>(buf);
 
-  for (SymbolTableEntry &Ent : Symbols) {
-    Symbol *Sym = Ent.Sym;
+  for (SymbolTableEntry &ent : symbols) {
+    Symbol *sym = ent.sym;
+    bool isDefinedHere = type == SHT_SYMTAB || sym->partition == partition;
 
     // Set st_info and st_other.
-    ESym->st_other = 0;
-    if (Sym->isLocal()) {
-      ESym->setBindingAndType(STB_LOCAL, Sym->Type);
+    eSym->st_other = 0;
+    if (sym->isLocal()) {
+      eSym->setBindingAndType(STB_LOCAL, sym->type);
     } else {
-      ESym->setBindingAndType(Sym->computeBinding(), Sym->Type);
-      ESym->setVisibility(Sym->Visibility);
+      eSym->setBindingAndType(sym->computeBinding(), sym->type);
+      eSym->setVisibility(sym->visibility);
     }
 
-    ESym->st_name = Ent.StrTabOffset;
-    ESym->st_shndx = getSymSectionIndex(Ent.Sym);
+    // The 3 most significant bits of st_other are used by OpenPOWER ABI.
+    // See getPPC64GlobalEntryToLocalEntryOffset() for more details.
+    if (config->emachine == EM_PPC64)
+      eSym->st_other |= sym->stOther & 0xe0;
+
+    eSym->st_name = ent.strTabOffset;
+    if (isDefinedHere)
+      eSym->st_shndx = getSymSectionIndex(ent.sym);
+    else
+      eSym->st_shndx = 0;
 
     // Copy symbol size if it is a defined symbol. st_size is not significant
     // for undefined symbols, so whether copying it or not is up to us if that's
     // the case. We'll leave it as zero because by not setting a value, we can
     // get the exact same outputs for two sets of input files that differ only
     // in undefined symbol size in DSOs.
-    if (ESym->st_shndx == SHN_UNDEF)
-      ESym->st_size = 0;
+    if (eSym->st_shndx == SHN_UNDEF || !isDefinedHere)
+      eSym->st_size = 0;
     else
-      ESym->st_size = Sym->getSize();
+      eSym->st_size = sym->getSize();
 
     // st_value is usually an address of a symbol, but that has a
     // special meaining for uninstantiated common symbols (this can
     // occur if -r is given).
-    if (BssSection *CommonSec = getCommonSec(Ent.Sym))
-      ESym->st_value = CommonSec->Alignment;
+    if (BssSection *commonSec = getCommonSec(ent.sym))
+      eSym->st_value = commonSec->alignment;
+    else if (isDefinedHere)
+      eSym->st_value = sym->getVA();
     else
-      ESym->st_value = Sym->getVA();
+      eSym->st_value = 0;
 
-    ++ESym;
+    ++eSym;
   }
 
   // On MIPS we need to mark symbol which has a PLT entry and requires
   // pointer equality by STO_MIPS_PLT flag. That is necessary to help
   // dynamic linker distinguish such symbols and MIPS lazy-binding stubs.
   // https://sourceware.org/ml/binutils/2008-07/txt00000.txt
-  if (Config->EMachine == EM_MIPS) {
-    auto *ESym = reinterpret_cast<Elf_Sym *>(Buf);
+  if (config->emachine == EM_MIPS) {
+    auto *eSym = reinterpret_cast<Elf_Sym *>(buf);
 
-    for (SymbolTableEntry &Ent : Symbols) {
-      Symbol *Sym = Ent.Sym;
-      if (Sym->isInPlt() && Sym->NeedsPltAddr)
-        ESym->st_other |= STO_MIPS_PLT;
+    for (SymbolTableEntry &ent : symbols) {
+      Symbol *sym = ent.sym;
+      if (sym->isInPlt() && sym->needsPltAddr)
+        eSym->st_other |= STO_MIPS_PLT;
       if (isMicroMips()) {
-        // Set STO_MIPS_MICROMIPS flag and less-significant bit for
-        // a defined microMIPS symbol and symbol should point to its
-        // PLT entry (in case of microMIPS, PLT entries always contain
-        // microMIPS code).
-        if (Sym->isDefined() &&
-            ((Sym->StOther & STO_MIPS_MICROMIPS) || Sym->NeedsPltAddr)) {
-          if (StrTabSec.isDynamic())
-            ESym->st_value |= 1;
-          ESym->st_other |= STO_MIPS_MICROMIPS;
+        // We already set the less-significant bit for symbols
+        // marked by the `STO_MIPS_MICROMIPS` flag and for microMIPS PLT
+        // records. That allows us to distinguish such symbols in
+        // the `MIPS<ELFT>::relocateOne()` routine. Now we should
+        // clear that bit for non-dynamic symbol table, so tools
+        // like `objdump` will be able to deal with a correct
+        // symbol position.
+        if (sym->isDefined() &&
+            ((sym->stOther & STO_MIPS_MICROMIPS) || sym->needsPltAddr)) {
+          if (!strTabSec.isDynamic())
+            eSym->st_value &= ~1;
+          eSym->st_other |= STO_MIPS_MICROMIPS;
         }
       }
-      if (Config->Relocatable)
-        if (auto *D = dyn_cast<Defined>(Sym))
-          if (isMipsPIC<ELFT>(D))
-            ESym->st_other |= STO_MIPS_PIC;
-      ++ESym;
+      if (config->relocatable)
+        if (auto *d = dyn_cast<Defined>(sym))
+          if (isMipsPIC<ELFT>(d))
+            eSym->st_other |= STO_MIPS_PIC;
+      ++eSym;
     }
   }
 }
 
 SymtabShndxSection::SymtabShndxSection()
-    : SyntheticSection(0, SHT_SYMTAB_SHNDX, 4, ".symtab_shndxr") {
-  this->Entsize = 4;
+    : SyntheticSection(0, SHT_SYMTAB_SHNDX, 4, ".symtab_shndx") {
+  this->entsize = 4;
 }
 
-void SymtabShndxSection::writeTo(uint8_t *Buf) {
+void SymtabShndxSection::writeTo(uint8_t *buf) {
   // We write an array of 32 bit values, where each value has 1:1 association
   // with an entry in .symtab. If the corresponding entry contains SHN_XINDEX,
   // we need to write actual index, otherwise, we must write SHN_UNDEF(0).
-  Buf += 4; // Ignore .symtab[0] entry.
-  for (const SymbolTableEntry &Entry : In.SymTab->getSymbols()) {
-    if (getSymSectionIndex(Entry.Sym) == SHN_XINDEX)
-      write32(Buf, Entry.Sym->getOutputSection()->SectionIndex);
-    Buf += 4;
+  buf += 4; // Ignore .symtab[0] entry.
+  for (const SymbolTableEntry &entry : in.symTab->getSymbols()) {
+    if (getSymSectionIndex(entry.sym) == SHN_XINDEX)
+      write32(buf, entry.sym->getOutputSection()->sectionIndex);
+    buf += 4;
   }
 }
 
-bool SymtabShndxSection::empty() const {
+bool SymtabShndxSection::isNeeded() const {
   // SHT_SYMTAB can hold symbols with section indices values up to
   // SHN_LORESERVE. If we need more, we want to use extension SHT_SYMTAB_SHNDX
   // section. Problem is that we reveal the final section indices a bit too
   // late, and we do not know them here. For simplicity, we just always create
-  // a .symtab_shndxr section when the amount of output sections is huge.
-  size_t Size = 0;
-  for (BaseCommand *Base : Script->SectionCommands)
-    if (isa<OutputSection>(Base))
-      ++Size;
-  return Size < SHN_LORESERVE;
+  // a .symtab_shndx section when the amount of output sections is huge.
+  size_t size = 0;
+  for (BaseCommand *base : script->sectionCommands)
+    if (isa<OutputSection>(base))
+      ++size;
+  return size >= SHN_LORESERVE;
 }
 
 void SymtabShndxSection::finalizeContents() {
-  getParent()->Link = In.SymTab->getParent()->SectionIndex;
+  getParent()->link = in.symTab->getParent()->sectionIndex;
 }
 
 size_t SymtabShndxSection::getSize() const {
-  return In.SymTab->getNumSymbols() * 4;
+  return in.symTab->getNumSymbols() * 4;
 }
 
 // .hash and .gnu.hash sections contain on-disk hash tables that map
@@ -2127,45 +2157,45 @@ size_t SymtabShndxSection::getSize() const {
 // about .gnu.hash, you want to specify -hash-style=gnu. Otherwise, a
 // safe bet is to specify -hash-style=both for backward compatibilty.
 GnuHashTableSection::GnuHashTableSection()
-    : SyntheticSection(SHF_ALLOC, SHT_GNU_HASH, Config->Wordsize, ".gnu.hash") {
+    : SyntheticSection(SHF_ALLOC, SHT_GNU_HASH, config->wordsize, ".gnu.hash") {
 }
 
 void GnuHashTableSection::finalizeContents() {
-  if (OutputSection *Sec = In.DynSymTab->getParent())
-    getParent()->Link = Sec->SectionIndex;
+  if (OutputSection *sec = getPartition().dynSymTab->getParent())
+    getParent()->link = sec->sectionIndex;
 
   // Computes bloom filter size in word size. We want to allocate 12
   // bits for each symbol. It must be a power of two.
-  if (Symbols.empty()) {
-    MaskWords = 1;
+  if (symbols.empty()) {
+    maskWords = 1;
   } else {
-    uint64_t NumBits = Symbols.size() * 12;
-    MaskWords = NextPowerOf2(NumBits / (Config->Wordsize * 8));
+    uint64_t numBits = symbols.size() * 12;
+    maskWords = NextPowerOf2(numBits / (config->wordsize * 8));
   }
 
-  Size = 16;                            // Header
-  Size += Config->Wordsize * MaskWords; // Bloom filter
-  Size += NBuckets * 4;                 // Hash buckets
-  Size += Symbols.size() * 4;           // Hash values
+  size = 16;                            // Header
+  size += config->wordsize * maskWords; // Bloom filter
+  size += nBuckets * 4;                 // Hash buckets
+  size += symbols.size() * 4;           // Hash values
 }
 
-void GnuHashTableSection::writeTo(uint8_t *Buf) {
+void GnuHashTableSection::writeTo(uint8_t *buf) {
   // The output buffer is not guaranteed to be zero-cleared because we pre-
   // fill executable sections with trap instructions. This is a precaution
   // for that case, which happens only when -no-rosegment is given.
-  memset(Buf, 0, Size);
+  memset(buf, 0, size);
 
   // Write a header.
-  write32(Buf, NBuckets);
-  write32(Buf + 4, In.DynSymTab->getNumSymbols() - Symbols.size());
-  write32(Buf + 8, MaskWords);
-  write32(Buf + 12, Shift2);
-  Buf += 16;
+  write32(buf, nBuckets);
+  write32(buf + 4, getPartition().dynSymTab->getNumSymbols() - symbols.size());
+  write32(buf + 8, maskWords);
+  write32(buf + 12, Shift2);
+  buf += 16;
 
   // Write a bloom filter and a hash table.
-  writeBloomFilter(Buf);
-  Buf += Config->Wordsize * MaskWords;
-  writeHashTable(Buf);
+  writeBloomFilter(buf);
+  buf += config->wordsize * maskWords;
+  writeHashTable(buf);
 }
 
 // This function writes a 2-bit bloom filter. This bloom filter alone
@@ -2175,57 +2205,58 @@ void GnuHashTableSection::writeTo(uint8_t *Buf) {
 //
 // [1] Ulrich Drepper (2011), "How To Write Shared Libraries" (Ver. 4.1.2),
 //     p.9, https://www.akkadia.org/drepper/dsohowto.pdf
-void GnuHashTableSection::writeBloomFilter(uint8_t *Buf) {
-  unsigned C = Config->Is64 ? 64 : 32;
-  for (const Entry &Sym : Symbols) {
+void GnuHashTableSection::writeBloomFilter(uint8_t *buf) {
+  unsigned c = config->is64 ? 64 : 32;
+  for (const Entry &sym : symbols) {
     // When C = 64, we choose a word with bits [6:...] and set 1 to two bits in
     // the word using bits [0:5] and [26:31].
-    size_t I = (Sym.Hash / C) & (MaskWords - 1);
-    uint64_t Val = readUint(Buf + I * Config->Wordsize);
-    Val |= uint64_t(1) << (Sym.Hash % C);
-    Val |= uint64_t(1) << ((Sym.Hash >> Shift2) % C);
-    writeUint(Buf + I * Config->Wordsize, Val);
+    size_t i = (sym.hash / c) & (maskWords - 1);
+    uint64_t val = readUint(buf + i * config->wordsize);
+    val |= uint64_t(1) << (sym.hash % c);
+    val |= uint64_t(1) << ((sym.hash >> Shift2) % c);
+    writeUint(buf + i * config->wordsize, val);
   }
 }
 
-void GnuHashTableSection::writeHashTable(uint8_t *Buf) {
-  uint32_t *Buckets = reinterpret_cast<uint32_t *>(Buf);
-  uint32_t OldBucket = -1;
-  uint32_t *Values = Buckets + NBuckets;
-  for (auto I = Symbols.begin(), E = Symbols.end(); I != E; ++I) {
+void GnuHashTableSection::writeHashTable(uint8_t *buf) {
+  uint32_t *buckets = reinterpret_cast<uint32_t *>(buf);
+  uint32_t oldBucket = -1;
+  uint32_t *values = buckets + nBuckets;
+  for (auto i = symbols.begin(), e = symbols.end(); i != e; ++i) {
     // Write a hash value. It represents a sequence of chains that share the
     // same hash modulo value. The last element of each chain is terminated by
     // LSB 1.
-    uint32_t Hash = I->Hash;
-    bool IsLastInChain = (I + 1) == E || I->BucketIdx != (I + 1)->BucketIdx;
-    Hash = IsLastInChain ? Hash | 1 : Hash & ~1;
-    write32(Values++, Hash);
+    uint32_t hash = i->hash;
+    bool isLastInChain = (i + 1) == e || i->bucketIdx != (i + 1)->bucketIdx;
+    hash = isLastInChain ? hash | 1 : hash & ~1;
+    write32(values++, hash);
 
-    if (I->BucketIdx == OldBucket)
+    if (i->bucketIdx == oldBucket)
       continue;
     // Write a hash bucket. Hash buckets contain indices in the following hash
     // value table.
-    write32(Buckets + I->BucketIdx, I->Sym->DynsymIndex);
-    OldBucket = I->BucketIdx;
+    write32(buckets + i->bucketIdx,
+            getPartition().dynSymTab->getSymbolIndex(i->sym));
+    oldBucket = i->bucketIdx;
   }
 }
 
-static uint32_t hashGnu(StringRef Name) {
-  uint32_t H = 5381;
-  for (uint8_t C : Name)
-    H = (H << 5) + H + C;
-  return H;
+static uint32_t hashGnu(StringRef name) {
+  uint32_t h = 5381;
+  for (uint8_t c : name)
+    h = (h << 5) + h + c;
+  return h;
 }
 
 // Add symbols to this symbol hash table. Note that this function
 // destructively sort a given vector -- which is needed because
 // GNU-style hash table places some sorting requirements.
-void GnuHashTableSection::addSymbols(std::vector<SymbolTableEntry> &V) {
+void GnuHashTableSection::addSymbols(std::vector<SymbolTableEntry> &v) {
   // We cannot use 'auto' for Mid because GCC 6.1 cannot deduce
   // its type correctly.
-  std::vector<SymbolTableEntry>::iterator Mid =
-      std::stable_partition(V.begin(), V.end(), [](const SymbolTableEntry &S) {
-        return !S.Sym->isDefined();
+  std::vector<SymbolTableEntry>::iterator mid =
+      std::stable_partition(v.begin(), v.end(), [&](const SymbolTableEntry &s) {
+        return !s.sym->isDefined() || s.sym->partition != partition;
       });
 
   // We chose load factor 4 for the on-disk hash table. For each hash
@@ -2237,138 +2268,143 @@ void GnuHashTableSection::addSymbols(std::vector<SymbolTableEntry> &V) {
   // Android loader as of 2018 doesn't like a .gnu.hash containing such
   // table. If that's the case, we create a hash table with one unused
   // dummy slot.
-  NBuckets = std::max<size_t>((V.end() - Mid) / 4, 1);
+  nBuckets = std::max<size_t>((v.end() - mid) / 4, 1);
 
-  if (Mid == V.end())
+  if (mid == v.end())
     return;
 
-  for (SymbolTableEntry &Ent : llvm::make_range(Mid, V.end())) {
-    Symbol *B = Ent.Sym;
-    uint32_t Hash = hashGnu(B->getName());
-    uint32_t BucketIdx = Hash % NBuckets;
-    Symbols.push_back({B, Ent.StrTabOffset, Hash, BucketIdx});
+  for (SymbolTableEntry &ent : llvm::make_range(mid, v.end())) {
+    Symbol *b = ent.sym;
+    uint32_t hash = hashGnu(b->getName());
+    uint32_t bucketIdx = hash % nBuckets;
+    symbols.push_back({b, ent.strTabOffset, hash, bucketIdx});
   }
 
-  std::stable_sort(
-      Symbols.begin(), Symbols.end(),
-      [](const Entry &L, const Entry &R) { return L.BucketIdx < R.BucketIdx; });
+  llvm::stable_sort(symbols, [](const Entry &l, const Entry &r) {
+    return l.bucketIdx < r.bucketIdx;
+  });
 
-  V.erase(Mid, V.end());
-  for (const Entry &Ent : Symbols)
-    V.push_back({Ent.Sym, Ent.StrTabOffset});
+  v.erase(mid, v.end());
+  for (const Entry &ent : symbols)
+    v.push_back({ent.sym, ent.strTabOffset});
 }
 
 HashTableSection::HashTableSection()
     : SyntheticSection(SHF_ALLOC, SHT_HASH, 4, ".hash") {
-  this->Entsize = 4;
+  this->entsize = 4;
 }
 
 void HashTableSection::finalizeContents() {
-  if (OutputSection *Sec = In.DynSymTab->getParent())
-    getParent()->Link = Sec->SectionIndex;
+  SymbolTableBaseSection *symTab = getPartition().dynSymTab;
 
-  unsigned NumEntries = 2;                       // nbucket and nchain.
-  NumEntries += In.DynSymTab->getNumSymbols();   // The chain entries.
+  if (OutputSection *sec = symTab->getParent())
+    getParent()->link = sec->sectionIndex;
+
+  unsigned numEntries = 2;               // nbucket and nchain.
+  numEntries += symTab->getNumSymbols(); // The chain entries.
 
   // Create as many buckets as there are symbols.
-  NumEntries += In.DynSymTab->getNumSymbols();
-  this->Size = NumEntries * 4;
+  numEntries += symTab->getNumSymbols();
+  this->size = numEntries * 4;
 }
 
-void HashTableSection::writeTo(uint8_t *Buf) {
+void HashTableSection::writeTo(uint8_t *buf) {
+  SymbolTableBaseSection *symTab = getPartition().dynSymTab;
+
   // See comment in GnuHashTableSection::writeTo.
-  memset(Buf, 0, Size);
+  memset(buf, 0, size);
 
-  unsigned NumSymbols = In.DynSymTab->getNumSymbols();
+  unsigned numSymbols = symTab->getNumSymbols();
 
-  uint32_t *P = reinterpret_cast<uint32_t *>(Buf);
-  write32(P++, NumSymbols); // nbucket
-  write32(P++, NumSymbols); // nchain
+  uint32_t *p = reinterpret_cast<uint32_t *>(buf);
+  write32(p++, numSymbols); // nbucket
+  write32(p++, numSymbols); // nchain
 
-  uint32_t *Buckets = P;
-  uint32_t *Chains = P + NumSymbols;
+  uint32_t *buckets = p;
+  uint32_t *chains = p + numSymbols;
 
-  for (const SymbolTableEntry &S : In.DynSymTab->getSymbols()) {
-    Symbol *Sym = S.Sym;
-    StringRef Name = Sym->getName();
-    unsigned I = Sym->DynsymIndex;
-    uint32_t Hash = hashSysV(Name) % NumSymbols;
-    Chains[I] = Buckets[Hash];
-    write32(Buckets + Hash, I);
+  for (const SymbolTableEntry &s : symTab->getSymbols()) {
+    Symbol *sym = s.sym;
+    StringRef name = sym->getName();
+    unsigned i = sym->dynsymIndex;
+    uint32_t hash = hashSysV(name) % numSymbols;
+    chains[i] = buckets[hash];
+    write32(buckets + hash, i);
   }
 }
 
 // On PowerPC64 the lazy symbol resolvers go into the `global linkage table`
 // in the .glink section, rather then the typical .plt section.
-PltSection::PltSection(bool IsIplt)
-    : SyntheticSection(SHF_ALLOC | SHF_EXECINSTR, SHT_PROGBITS, 16,
-                       Config->EMachine == EM_PPC64 ? ".glink" : ".plt"),
-      HeaderSize(!IsIplt || Config->ZRetpolineplt ? Target->PltHeaderSize : 0),
-      IsIplt(IsIplt) {
+PltSection::PltSection(bool isIplt)
+    : SyntheticSection(
+          SHF_ALLOC | SHF_EXECINSTR, SHT_PROGBITS, 16,
+          (config->emachine == EM_PPC || config->emachine == EM_PPC64)
+              ? ".glink"
+              : ".plt"),
+      headerSize(!isIplt || config->zRetpolineplt ? target->pltHeaderSize : 0),
+      isIplt(isIplt) {
   // The PLT needs to be writable on SPARC as the dynamic linker will
   // modify the instructions in the PLT entries.
-  if (Config->EMachine == EM_SPARCV9)
-    this->Flags |= SHF_WRITE;
+  if (config->emachine == EM_SPARCV9)
+    this->flags |= SHF_WRITE;
 }
 
-void PltSection::writeTo(uint8_t *Buf) {
+void PltSection::writeTo(uint8_t *buf) {
+  if (config->emachine == EM_PPC) {
+    writePPC32GlinkSection(buf, entries.size());
+    return;
+  }
+
   // At beginning of PLT or retpoline IPLT, we have code to call the dynamic
   // linker to resolve dynsyms at runtime. Write such code.
-  if (HeaderSize > 0)
-    Target->writePltHeader(Buf);
-  size_t Off = HeaderSize;
-  // The IPlt is immediately after the Plt, account for this in RelOff
-  unsigned PltOff = getPltRelocOff();
+  if (headerSize)
+    target->writePltHeader(buf);
+  size_t off = headerSize;
 
-  for (auto &I : Entries) {
-    const Symbol *B = I.first;
-    unsigned RelOff = I.second + PltOff;
-    uint64_t Got = B->getGotPltVA();
-    uint64_t Plt = this->getVA() + Off;
-    Target->writePlt(Buf + Off, Got, Plt, B->PltIndex, RelOff);
-    Off += Target->PltEntrySize;
+  RelocationBaseSection *relSec = isIplt ? in.relaIplt : in.relaPlt;
+
+  // The IPlt is immediately after the Plt, account for this in relOff
+  size_t pltOff = isIplt ? in.plt->getSize() : 0;
+
+  for (size_t i = 0, e = entries.size(); i != e; ++i) {
+    const Symbol *b = entries[i];
+    unsigned relOff = relSec->entsize * i + pltOff;
+    uint64_t got = b->getGotPltVA();
+    uint64_t plt = this->getVA() + off;
+    target->writePlt(buf + off, got, plt, b->pltIndex, relOff);
+    off += target->pltEntrySize;
   }
 }
 
-template <class ELFT> void PltSection::addEntry(Symbol &Sym) {
-  Sym.PltIndex = Entries.size();
-  RelocationBaseSection *PltRelocSection = In.RelaPlt;
-  if (IsIplt) {
-    PltRelocSection = In.RelaIplt;
-    Sym.IsInIplt = true;
-  }
-  unsigned RelOff =
-      static_cast<RelocationSection<ELFT> *>(PltRelocSection)->getRelocOffset();
-  Entries.push_back(std::make_pair(&Sym, RelOff));
+template <class ELFT> void PltSection::addEntry(Symbol &sym) {
+  sym.pltIndex = entries.size();
+  entries.push_back(&sym);
 }
 
 size_t PltSection::getSize() const {
-  return HeaderSize + Entries.size() * Target->PltEntrySize;
+  return headerSize + entries.size() * target->pltEntrySize;
 }
 
 // Some architectures such as additional symbols in the PLT section. For
 // example ARM uses mapping symbols to aid disassembly
 void PltSection::addSymbols() {
   // The PLT may have symbols defined for the Header, the IPLT has no header
-  if (!IsIplt)
-    Target->addPltHeaderSymbols(*this);
-  size_t Off = HeaderSize;
-  for (size_t I = 0; I < Entries.size(); ++I) {
-    Target->addPltSymbols(*this, Off);
-    Off += Target->PltEntrySize;
-  }
-}
+  if (!isIplt)
+    target->addPltHeaderSymbols(*this);
 
-unsigned PltSection::getPltRelocOff() const {
-  return IsIplt ? In.Plt->getSize() : 0;
+  size_t off = headerSize;
+  for (size_t i = 0; i < entries.size(); ++i) {
+    target->addPltSymbols(*this, off);
+    off += target->pltEntrySize;
+  }
 }
 
 // The string hash function for .gdb_index.
-static uint32_t computeGdbHash(StringRef S) {
-  uint32_t H = 0;
-  for (uint8_t C : S)
-    H = H * 67 + toLower(C) - 113;
-  return H;
+static uint32_t computeGdbHash(StringRef s) {
+  uint32_t h = 0;
+  for (uint8_t c : s)
+    h = h * 67 + toLower(c) - 113;
+  return h;
 }
 
 GdbIndexSection::GdbIndexSection()
@@ -2377,367 +2413,384 @@ GdbIndexSection::GdbIndexSection()
 // Returns the desired size of an on-disk hash table for a .gdb_index section.
 // There's a tradeoff between size and collision rate. We aim 75% utilization.
 size_t GdbIndexSection::computeSymtabSize() const {
-  return std::max<size_t>(NextPowerOf2(Symbols.size() * 4 / 3), 1024);
+  return std::max<size_t>(NextPowerOf2(symbols.size() * 4 / 3), 1024);
 }
 
 // Compute the output section size.
 void GdbIndexSection::initOutputSize() {
-  Size = sizeof(GdbIndexHeader) + computeSymtabSize() * 8;
+  size = sizeof(GdbIndexHeader) + computeSymtabSize() * 8;
 
-  for (GdbChunk &Chunk : Chunks)
-    Size += Chunk.CompilationUnits.size() * 16 + Chunk.AddressAreas.size() * 20;
+  for (GdbChunk &chunk : chunks)
+    size += chunk.compilationUnits.size() * 16 + chunk.addressAreas.size() * 20;
 
   // Add the constant pool size if exists.
-  if (!Symbols.empty()) {
-    GdbSymbol &Sym = Symbols.back();
-    Size += Sym.NameOff + Sym.Name.size() + 1;
+  if (!symbols.empty()) {
+    GdbSymbol &sym = symbols.back();
+    size += sym.nameOff + sym.name.size() + 1;
   }
 }
 
 static std::vector<InputSection *> getDebugInfoSections() {
-  std::vector<InputSection *> Ret;
-  for (InputSectionBase *S : InputSections)
-    if (InputSection *IS = dyn_cast<InputSection>(S))
-      if (IS->Name == ".debug_info")
-        Ret.push_back(IS);
-  return Ret;
+  std::vector<InputSection *> ret;
+  for (InputSectionBase *s : inputSections)
+    if (InputSection *isec = dyn_cast<InputSection>(s))
+      if (isec->name == ".debug_info")
+        ret.push_back(isec);
+  return ret;
 }
 
-static std::vector<GdbIndexSection::CuEntry> readCuList(DWARFContext &Dwarf) {
-  std::vector<GdbIndexSection::CuEntry> Ret;
-  for (std::unique_ptr<DWARFUnit> &Cu : Dwarf.compile_units())
-    Ret.push_back({Cu->getOffset(), Cu->getLength() + 4});
-  return Ret;
+static std::vector<GdbIndexSection::CuEntry> readCuList(DWARFContext &dwarf) {
+  std::vector<GdbIndexSection::CuEntry> ret;
+  for (std::unique_ptr<DWARFUnit> &cu : dwarf.compile_units())
+    ret.push_back({cu->getOffset(), cu->getLength() + 4});
+  return ret;
 }
 
 static std::vector<GdbIndexSection::AddressEntry>
-readAddressAreas(DWARFContext &Dwarf, InputSection *Sec) {
-  std::vector<GdbIndexSection::AddressEntry> Ret;
+readAddressAreas(DWARFContext &dwarf, InputSection *sec) {
+  std::vector<GdbIndexSection::AddressEntry> ret;
 
-  uint32_t CuIdx = 0;
-  for (std::unique_ptr<DWARFUnit> &Cu : Dwarf.compile_units()) {
-    Expected<DWARFAddressRangesVector> Ranges = Cu->collectAddressRanges();
-    if (!Ranges) {
-      error(toString(Sec) + ": " + toString(Ranges.takeError()));
+  uint32_t cuIdx = 0;
+  for (std::unique_ptr<DWARFUnit> &cu : dwarf.compile_units()) {
+    Expected<DWARFAddressRangesVector> ranges = cu->collectAddressRanges();
+    if (!ranges) {
+      error(toString(sec) + ": " + toString(ranges.takeError()));
       return {};
     }
 
-    ArrayRef<InputSectionBase *> Sections = Sec->File->getSections();
-    for (DWARFAddressRange &R : *Ranges) {
-      InputSectionBase *S = Sections[R.SectionIndex];
-      if (!S || S == &InputSection::Discarded || !S->Live)
+    ArrayRef<InputSectionBase *> sections = sec->file->getSections();
+    for (DWARFAddressRange &r : *ranges) {
+      if (r.SectionIndex == -1ULL)
+        continue;
+      InputSectionBase *s = sections[r.SectionIndex];
+      if (!s || s == &InputSection::discarded || !s->isLive())
         continue;
       // Range list with zero size has no effect.
-      if (R.LowPC == R.HighPC)
+      if (r.LowPC == r.HighPC)
         continue;
-      auto *IS = cast<InputSection>(S);
-      uint64_t Offset = IS->getOffsetInFile();
-      Ret.push_back({IS, R.LowPC - Offset, R.HighPC - Offset, CuIdx});
+      auto *isec = cast<InputSection>(s);
+      uint64_t offset = isec->getOffsetInFile();
+      ret.push_back({isec, r.LowPC - offset, r.HighPC - offset, cuIdx});
     }
-    ++CuIdx;
+    ++cuIdx;
   }
 
-  return Ret;
+  return ret;
 }
 
 template <class ELFT>
 static std::vector<GdbIndexSection::NameAttrEntry>
-readPubNamesAndTypes(const LLDDwarfObj<ELFT> &Obj,
-                     const std::vector<GdbIndexSection::CuEntry> &CUs) {
-  const DWARFSection &PubNames = Obj.getGnuPubNamesSection();
-  const DWARFSection &PubTypes = Obj.getGnuPubTypesSection();
+readPubNamesAndTypes(const LLDDwarfObj<ELFT> &obj,
+                     const std::vector<GdbIndexSection::CuEntry> &cUs) {
+  const DWARFSection &pubNames = obj.getGnuPubNamesSection();
+  const DWARFSection &pubTypes = obj.getGnuPubTypesSection();
 
-  std::vector<GdbIndexSection::NameAttrEntry> Ret;
-  for (const DWARFSection *Pub : {&PubNames, &PubTypes}) {
-    DWARFDebugPubTable Table(Obj, *Pub, Config->IsLE, true);
-    for (const DWARFDebugPubTable::Set &Set : Table.getData()) {
-      // The value written into the constant pool is Kind << 24 | CuIndex. As we
+  std::vector<GdbIndexSection::NameAttrEntry> ret;
+  for (const DWARFSection *pub : {&pubNames, &pubTypes}) {
+    DWARFDebugPubTable table(obj, *pub, config->isLE, true);
+    for (const DWARFDebugPubTable::Set &set : table.getData()) {
+      // The value written into the constant pool is kind << 24 | cuIndex. As we
       // don't know how many compilation units precede this object to compute
-      // CuIndex, we compute (Kind << 24 | CuIndexInThisObject) instead, and add
+      // cuIndex, we compute (kind << 24 | cuIndexInThisObject) instead, and add
       // the number of preceding compilation units later.
-      uint32_t I =
-          lower_bound(CUs, Set.Offset,
-                      [](GdbIndexSection::CuEntry CU, uint32_t Offset) {
-                        return CU.CuOffset < Offset;
+      uint32_t i =
+          lower_bound(cUs, set.Offset,
+                      [](GdbIndexSection::CuEntry cu, uint32_t offset) {
+                        return cu.cuOffset < offset;
                       }) -
-          CUs.begin();
-      for (const DWARFDebugPubTable::Entry &Ent : Set.Entries)
-        Ret.push_back({{Ent.Name, computeGdbHash(Ent.Name)},
-                       (Ent.Descriptor.toBits() << 24) | I});
+          cUs.begin();
+      for (const DWARFDebugPubTable::Entry &ent : set.Entries)
+        ret.push_back({{ent.Name, computeGdbHash(ent.Name)},
+                       (ent.Descriptor.toBits() << 24) | i});
     }
   }
-  return Ret;
+  return ret;
 }
 
 // Create a list of symbols from a given list of symbol names and types
 // by uniquifying them by name.
 static std::vector<GdbIndexSection::GdbSymbol>
-createSymbols(ArrayRef<std::vector<GdbIndexSection::NameAttrEntry>> NameAttrs,
-              const std::vector<GdbIndexSection::GdbChunk> &Chunks) {
-  typedef GdbIndexSection::GdbSymbol GdbSymbol;
-  typedef GdbIndexSection::NameAttrEntry NameAttrEntry;
+createSymbols(ArrayRef<std::vector<GdbIndexSection::NameAttrEntry>> nameAttrs,
+              const std::vector<GdbIndexSection::GdbChunk> &chunks) {
+  using GdbSymbol = GdbIndexSection::GdbSymbol;
+  using NameAttrEntry = GdbIndexSection::NameAttrEntry;
 
   // For each chunk, compute the number of compilation units preceding it.
-  uint32_t CuIdx = 0;
-  std::vector<uint32_t> CuIdxs(Chunks.size());
-  for (uint32_t I = 0, E = Chunks.size(); I != E; ++I) {
-    CuIdxs[I] = CuIdx;
-    CuIdx += Chunks[I].CompilationUnits.size();
+  uint32_t cuIdx = 0;
+  std::vector<uint32_t> cuIdxs(chunks.size());
+  for (uint32_t i = 0, e = chunks.size(); i != e; ++i) {
+    cuIdxs[i] = cuIdx;
+    cuIdx += chunks[i].compilationUnits.size();
   }
 
   // The number of symbols we will handle in this function is of the order
   // of millions for very large executables, so we use multi-threading to
   // speed it up.
-  size_t NumShards = 32;
-  size_t Concurrency = 1;
-  if (ThreadsEnabled)
-    Concurrency =
-        std::min<size_t>(PowerOf2Floor(hardware_concurrency()), NumShards);
+  size_t numShards = 32;
+  size_t concurrency = 1;
+  if (threadsEnabled)
+    concurrency =
+        std::min<size_t>(PowerOf2Floor(hardware_concurrency()), numShards);
 
   // A sharded map to uniquify symbols by name.
-  std::vector<DenseMap<CachedHashStringRef, size_t>> Map(NumShards);
-  size_t Shift = 32 - countTrailingZeros(NumShards);
+  std::vector<DenseMap<CachedHashStringRef, size_t>> map(numShards);
+  size_t shift = 32 - countTrailingZeros(numShards);
 
   // Instantiate GdbSymbols while uniqufying them by name.
-  std::vector<std::vector<GdbSymbol>> Symbols(NumShards);
-  parallelForEachN(0, Concurrency, [&](size_t ThreadId) {
-    uint32_t I = 0;
-    for (ArrayRef<NameAttrEntry> Entries : NameAttrs) {
-      for (const NameAttrEntry &Ent : Entries) {
-        size_t ShardId = Ent.Name.hash() >> Shift;
-        if ((ShardId & (Concurrency - 1)) != ThreadId)
+  std::vector<std::vector<GdbSymbol>> symbols(numShards);
+  parallelForEachN(0, concurrency, [&](size_t threadId) {
+    uint32_t i = 0;
+    for (ArrayRef<NameAttrEntry> entries : nameAttrs) {
+      for (const NameAttrEntry &ent : entries) {
+        size_t shardId = ent.name.hash() >> shift;
+        if ((shardId & (concurrency - 1)) != threadId)
           continue;
 
-        uint32_t V = Ent.CuIndexAndAttrs + CuIdxs[I];
-        size_t &Idx = Map[ShardId][Ent.Name];
-        if (Idx) {
-          Symbols[ShardId][Idx - 1].CuVector.push_back(V);
+        uint32_t v = ent.cuIndexAndAttrs + cuIdxs[i];
+        size_t &idx = map[shardId][ent.name];
+        if (idx) {
+          symbols[shardId][idx - 1].cuVector.push_back(v);
           continue;
         }
 
-        Idx = Symbols[ShardId].size() + 1;
-        Symbols[ShardId].push_back({Ent.Name, {V}, 0, 0});
+        idx = symbols[shardId].size() + 1;
+        symbols[shardId].push_back({ent.name, {v}, 0, 0});
       }
-      ++I;
+      ++i;
     }
   });
 
-  size_t NumSymbols = 0;
-  for (ArrayRef<GdbSymbol> V : Symbols)
-    NumSymbols += V.size();
+  size_t numSymbols = 0;
+  for (ArrayRef<GdbSymbol> v : symbols)
+    numSymbols += v.size();
 
   // The return type is a flattened vector, so we'll copy each vector
   // contents to Ret.
-  std::vector<GdbSymbol> Ret;
-  Ret.reserve(NumSymbols);
-  for (std::vector<GdbSymbol> &Vec : Symbols)
-    for (GdbSymbol &Sym : Vec)
-      Ret.push_back(std::move(Sym));
+  std::vector<GdbSymbol> ret;
+  ret.reserve(numSymbols);
+  for (std::vector<GdbSymbol> &vec : symbols)
+    for (GdbSymbol &sym : vec)
+      ret.push_back(std::move(sym));
 
   // CU vectors and symbol names are adjacent in the output file.
   // We can compute their offsets in the output file now.
-  size_t Off = 0;
-  for (GdbSymbol &Sym : Ret) {
-    Sym.CuVectorOff = Off;
-    Off += (Sym.CuVector.size() + 1) * 4;
+  size_t off = 0;
+  for (GdbSymbol &sym : ret) {
+    sym.cuVectorOff = off;
+    off += (sym.cuVector.size() + 1) * 4;
   }
-  for (GdbSymbol &Sym : Ret) {
-    Sym.NameOff = Off;
-    Off += Sym.Name.size() + 1;
+  for (GdbSymbol &sym : ret) {
+    sym.nameOff = off;
+    off += sym.name.size() + 1;
   }
 
-  return Ret;
+  return ret;
 }
 
 // Returns a newly-created .gdb_index section.
 template <class ELFT> GdbIndexSection *GdbIndexSection::create() {
-  std::vector<InputSection *> Sections = getDebugInfoSections();
+  std::vector<InputSection *> sections = getDebugInfoSections();
 
   // .debug_gnu_pub{names,types} are useless in executables.
   // They are present in input object files solely for creating
   // a .gdb_index. So we can remove them from the output.
-  for (InputSectionBase *S : InputSections)
-    if (S->Name == ".debug_gnu_pubnames" || S->Name == ".debug_gnu_pubtypes")
-      S->Live = false;
+  for (InputSectionBase *s : inputSections)
+    if (s->name == ".debug_gnu_pubnames" || s->name == ".debug_gnu_pubtypes")
+      s->markDead();
 
-  std::vector<GdbChunk> Chunks(Sections.size());
-  std::vector<std::vector<NameAttrEntry>> NameAttrs(Sections.size());
+  std::vector<GdbChunk> chunks(sections.size());
+  std::vector<std::vector<NameAttrEntry>> nameAttrs(sections.size());
 
-  parallelForEachN(0, Sections.size(), [&](size_t I) {
-    ObjFile<ELFT> *File = Sections[I]->getFile<ELFT>();
-    DWARFContext Dwarf(make_unique<LLDDwarfObj<ELFT>>(File));
+  parallelForEachN(0, sections.size(), [&](size_t i) {
+    ObjFile<ELFT> *file = sections[i]->getFile<ELFT>();
+    DWARFContext dwarf(make_unique<LLDDwarfObj<ELFT>>(file));
 
-    Chunks[I].Sec = Sections[I];
-    Chunks[I].CompilationUnits = readCuList(Dwarf);
-    Chunks[I].AddressAreas = readAddressAreas(Dwarf, Sections[I]);
-    NameAttrs[I] = readPubNamesAndTypes<ELFT>(
-        static_cast<const LLDDwarfObj<ELFT> &>(Dwarf.getDWARFObj()),
-        Chunks[I].CompilationUnits);
+    chunks[i].sec = sections[i];
+    chunks[i].compilationUnits = readCuList(dwarf);
+    chunks[i].addressAreas = readAddressAreas(dwarf, sections[i]);
+    nameAttrs[i] = readPubNamesAndTypes<ELFT>(
+        static_cast<const LLDDwarfObj<ELFT> &>(dwarf.getDWARFObj()),
+        chunks[i].compilationUnits);
   });
 
-  auto *Ret = make<GdbIndexSection>();
-  Ret->Chunks = std::move(Chunks);
-  Ret->Symbols = createSymbols(NameAttrs, Ret->Chunks);
-  Ret->initOutputSize();
-  return Ret;
+  auto *ret = make<GdbIndexSection>();
+  ret->chunks = std::move(chunks);
+  ret->symbols = createSymbols(nameAttrs, ret->chunks);
+  ret->initOutputSize();
+  return ret;
 }
 
-void GdbIndexSection::writeTo(uint8_t *Buf) {
+void GdbIndexSection::writeTo(uint8_t *buf) {
   // Write the header.
-  auto *Hdr = reinterpret_cast<GdbIndexHeader *>(Buf);
-  uint8_t *Start = Buf;
-  Hdr->Version = 7;
-  Buf += sizeof(*Hdr);
+  auto *hdr = reinterpret_cast<GdbIndexHeader *>(buf);
+  uint8_t *start = buf;
+  hdr->version = 7;
+  buf += sizeof(*hdr);
 
   // Write the CU list.
-  Hdr->CuListOff = Buf - Start;
-  for (GdbChunk &Chunk : Chunks) {
-    for (CuEntry &Cu : Chunk.CompilationUnits) {
-      write64le(Buf, Chunk.Sec->OutSecOff + Cu.CuOffset);
-      write64le(Buf + 8, Cu.CuLength);
-      Buf += 16;
+  hdr->cuListOff = buf - start;
+  for (GdbChunk &chunk : chunks) {
+    for (CuEntry &cu : chunk.compilationUnits) {
+      write64le(buf, chunk.sec->outSecOff + cu.cuOffset);
+      write64le(buf + 8, cu.cuLength);
+      buf += 16;
     }
   }
 
   // Write the address area.
-  Hdr->CuTypesOff = Buf - Start;
-  Hdr->AddressAreaOff = Buf - Start;
-  uint32_t CuOff = 0;
-  for (GdbChunk &Chunk : Chunks) {
-    for (AddressEntry &E : Chunk.AddressAreas) {
-      uint64_t BaseAddr = E.Section->getVA(0);
-      write64le(Buf, BaseAddr + E.LowAddress);
-      write64le(Buf + 8, BaseAddr + E.HighAddress);
-      write32le(Buf + 16, E.CuIndex + CuOff);
-      Buf += 20;
+  hdr->cuTypesOff = buf - start;
+  hdr->addressAreaOff = buf - start;
+  uint32_t cuOff = 0;
+  for (GdbChunk &chunk : chunks) {
+    for (AddressEntry &e : chunk.addressAreas) {
+      uint64_t baseAddr = e.section->getVA(0);
+      write64le(buf, baseAddr + e.lowAddress);
+      write64le(buf + 8, baseAddr + e.highAddress);
+      write32le(buf + 16, e.cuIndex + cuOff);
+      buf += 20;
     }
-    CuOff += Chunk.CompilationUnits.size();
+    cuOff += chunk.compilationUnits.size();
   }
 
   // Write the on-disk open-addressing hash table containing symbols.
-  Hdr->SymtabOff = Buf - Start;
-  size_t SymtabSize = computeSymtabSize();
-  uint32_t Mask = SymtabSize - 1;
+  hdr->symtabOff = buf - start;
+  size_t symtabSize = computeSymtabSize();
+  uint32_t mask = symtabSize - 1;
 
-  for (GdbSymbol &Sym : Symbols) {
-    uint32_t H = Sym.Name.hash();
-    uint32_t I = H & Mask;
-    uint32_t Step = ((H * 17) & Mask) | 1;
+  for (GdbSymbol &sym : symbols) {
+    uint32_t h = sym.name.hash();
+    uint32_t i = h & mask;
+    uint32_t step = ((h * 17) & mask) | 1;
 
-    while (read32le(Buf + I * 8))
-      I = (I + Step) & Mask;
+    while (read32le(buf + i * 8))
+      i = (i + step) & mask;
 
-    write32le(Buf + I * 8, Sym.NameOff);
-    write32le(Buf + I * 8 + 4, Sym.CuVectorOff);
+    write32le(buf + i * 8, sym.nameOff);
+    write32le(buf + i * 8 + 4, sym.cuVectorOff);
   }
 
-  Buf += SymtabSize * 8;
+  buf += symtabSize * 8;
 
   // Write the string pool.
-  Hdr->ConstantPoolOff = Buf - Start;
-  parallelForEach(Symbols, [&](GdbSymbol &Sym) {
-    memcpy(Buf + Sym.NameOff, Sym.Name.data(), Sym.Name.size());
+  hdr->constantPoolOff = buf - start;
+  parallelForEach(symbols, [&](GdbSymbol &sym) {
+    memcpy(buf + sym.nameOff, sym.name.data(), sym.name.size());
   });
 
   // Write the CU vectors.
-  for (GdbSymbol &Sym : Symbols) {
-    write32le(Buf, Sym.CuVector.size());
-    Buf += 4;
-    for (uint32_t Val : Sym.CuVector) {
-      write32le(Buf, Val);
-      Buf += 4;
+  for (GdbSymbol &sym : symbols) {
+    write32le(buf, sym.cuVector.size());
+    buf += 4;
+    for (uint32_t val : sym.cuVector) {
+      write32le(buf, val);
+      buf += 4;
     }
   }
 }
 
-bool GdbIndexSection::empty() const { return Chunks.empty(); }
+bool GdbIndexSection::isNeeded() const { return !chunks.empty(); }
 
 EhFrameHeader::EhFrameHeader()
     : SyntheticSection(SHF_ALLOC, SHT_PROGBITS, 4, ".eh_frame_hdr") {}
 
+void EhFrameHeader::writeTo(uint8_t *buf) {
+  // Unlike most sections, the EhFrameHeader section is written while writing
+  // another section, namely EhFrameSection, which calls the write() function
+  // below from its writeTo() function. This is necessary because the contents
+  // of EhFrameHeader depend on the relocated contents of EhFrameSection and we
+  // don't know which order the sections will be written in.
+}
+
 // .eh_frame_hdr contains a binary search table of pointers to FDEs.
 // Each entry of the search table consists of two values,
 // the starting PC from where FDEs covers, and the FDE's address.
 // It is sorted by PC.
-void EhFrameHeader::writeTo(uint8_t *Buf) {
-  typedef EhFrameSection::FdeData FdeData;
+void EhFrameHeader::write() {
+  uint8_t *buf = Out::bufferStart + getParent()->offset + outSecOff;
+  using FdeData = EhFrameSection::FdeData;
 
-  std::vector<FdeData> Fdes = In.EhFrame->getFdeData();
+  std::vector<FdeData> fdes = getPartition().ehFrame->getFdeData();
 
-  Buf[0] = 1;
-  Buf[1] = DW_EH_PE_pcrel | DW_EH_PE_sdata4;
-  Buf[2] = DW_EH_PE_udata4;
-  Buf[3] = DW_EH_PE_datarel | DW_EH_PE_sdata4;
-  write32(Buf + 4, In.EhFrame->getParent()->Addr - this->getVA() - 4);
-  write32(Buf + 8, Fdes.size());
-  Buf += 12;
+  buf[0] = 1;
+  buf[1] = DW_EH_PE_pcrel | DW_EH_PE_sdata4;
+  buf[2] = DW_EH_PE_udata4;
+  buf[3] = DW_EH_PE_datarel | DW_EH_PE_sdata4;
+  write32(buf + 4,
+          getPartition().ehFrame->getParent()->addr - this->getVA() - 4);
+  write32(buf + 8, fdes.size());
+  buf += 12;
 
-  for (FdeData &Fde : Fdes) {
-    write32(Buf, Fde.PcRel);
-    write32(Buf + 4, Fde.FdeVARel);
-    Buf += 8;
+  for (FdeData &fde : fdes) {
+    write32(buf, fde.pcRel);
+    write32(buf + 4, fde.fdeVARel);
+    buf += 8;
   }
 }
 
 size_t EhFrameHeader::getSize() const {
   // .eh_frame_hdr has a 12 bytes header followed by an array of FDEs.
-  return 12 + In.EhFrame->NumFdes * 8;
+  return 12 + getPartition().ehFrame->numFdes * 8;
 }
 
-bool EhFrameHeader::empty() const { return In.EhFrame->empty(); }
+bool EhFrameHeader::isNeeded() const {
+  return isLive() && getPartition().ehFrame->isNeeded();
+}
 
 VersionDefinitionSection::VersionDefinitionSection()
     : SyntheticSection(SHF_ALLOC, SHT_GNU_verdef, sizeof(uint32_t),
                        ".gnu.version_d") {}
 
-static StringRef getFileDefName() {
-  if (!Config->SoName.empty())
-    return Config->SoName;
-  return Config->OutputFile;
+StringRef VersionDefinitionSection::getFileDefName() {
+  if (!getPartition().name.empty())
+    return getPartition().name;
+  if (!config->soName.empty())
+    return config->soName;
+  return config->outputFile;
 }
 
 void VersionDefinitionSection::finalizeContents() {
-  FileDefNameOff = In.DynStrTab->addString(getFileDefName());
-  for (VersionDefinition &V : Config->VersionDefinitions)
-    V.NameOff = In.DynStrTab->addString(V.Name);
+  fileDefNameOff = getPartition().dynStrTab->addString(getFileDefName());
+  for (VersionDefinition &v : config->versionDefinitions)
+    verDefNameOffs.push_back(getPartition().dynStrTab->addString(v.name));
 
-  if (OutputSection *Sec = In.DynStrTab->getParent())
-    getParent()->Link = Sec->SectionIndex;
+  if (OutputSection *sec = getPartition().dynStrTab->getParent())
+    getParent()->link = sec->sectionIndex;
 
   // sh_info should be set to the number of definitions. This fact is missed in
   // documentation, but confirmed by binutils community:
   // https://sourceware.org/ml/binutils/2014-11/msg00355.html
-  getParent()->Info = getVerDefNum();
+  getParent()->info = getVerDefNum();
 }
 
-void VersionDefinitionSection::writeOne(uint8_t *Buf, uint32_t Index,
-                                        StringRef Name, size_t NameOff) {
-  uint16_t Flags = Index == 1 ? VER_FLG_BASE : 0;
+void VersionDefinitionSection::writeOne(uint8_t *buf, uint32_t index,
+                                        StringRef name, size_t nameOff) {
+  uint16_t flags = index == 1 ? VER_FLG_BASE : 0;
 
   // Write a verdef.
-  write16(Buf, 1);                  // vd_version
-  write16(Buf + 2, Flags);          // vd_flags
-  write16(Buf + 4, Index);          // vd_ndx
-  write16(Buf + 6, 1);              // vd_cnt
-  write32(Buf + 8, hashSysV(Name)); // vd_hash
-  write32(Buf + 12, 20);            // vd_aux
-  write32(Buf + 16, 28);            // vd_next
+  write16(buf, 1);                  // vd_version
+  write16(buf + 2, flags);          // vd_flags
+  write16(buf + 4, index);          // vd_ndx
+  write16(buf + 6, 1);              // vd_cnt
+  write32(buf + 8, hashSysV(name)); // vd_hash
+  write32(buf + 12, 20);            // vd_aux
+  write32(buf + 16, 28);            // vd_next
 
   // Write a veraux.
-  write32(Buf + 20, NameOff); // vda_name
-  write32(Buf + 24, 0);       // vda_next
+  write32(buf + 20, nameOff); // vda_name
+  write32(buf + 24, 0);       // vda_next
 }
 
-void VersionDefinitionSection::writeTo(uint8_t *Buf) {
-  writeOne(Buf, 1, getFileDefName(), FileDefNameOff);
+void VersionDefinitionSection::writeTo(uint8_t *buf) {
+  writeOne(buf, 1, getFileDefName(), fileDefNameOff);
 
-  for (VersionDefinition &V : Config->VersionDefinitions) {
-    Buf += EntrySize;
-    writeOne(Buf, V.Id, V.Name, V.NameOff);
+  auto nameOffIt = verDefNameOffs.begin();
+  for (VersionDefinition &v : config->versionDefinitions) {
+    buf += EntrySize;
+    writeOne(buf, v.id, v.name, *nameOffIt++);
   }
 
   // Need to terminate the last version definition.
-  write32(Buf + 16, 0); // vd_next
+  write32(buf + 16, 0); // vd_next
 }
 
 size_t VersionDefinitionSection::getSize() const {
@@ -2745,160 +2798,161 @@ size_t VersionDefinitionSection::getSize() const {
 }
 
 // .gnu.version is a table where each entry is 2 byte long.
-template <class ELFT>
-VersionTableSection<ELFT>::VersionTableSection()
+VersionTableSection::VersionTableSection()
     : SyntheticSection(SHF_ALLOC, SHT_GNU_versym, sizeof(uint16_t),
                        ".gnu.version") {
-  this->Entsize = 2;
+  this->entsize = 2;
 }
 
-template <class ELFT> void VersionTableSection<ELFT>::finalizeContents() {
+void VersionTableSection::finalizeContents() {
   // At the moment of june 2016 GNU docs does not mention that sh_link field
   // should be set, but Sun docs do. Also readelf relies on this field.
-  getParent()->Link = In.DynSymTab->getParent()->SectionIndex;
+  getParent()->link = getPartition().dynSymTab->getParent()->sectionIndex;
 }
 
-template <class ELFT> size_t VersionTableSection<ELFT>::getSize() const {
-  return (In.DynSymTab->getSymbols().size() + 1) * 2;
+size_t VersionTableSection::getSize() const {
+  return (getPartition().dynSymTab->getSymbols().size() + 1) * 2;
 }
 
-template <class ELFT> void VersionTableSection<ELFT>::writeTo(uint8_t *Buf) {
-  Buf += 2;
-  for (const SymbolTableEntry &S : In.DynSymTab->getSymbols()) {
-    write16(Buf, S.Sym->VersionId);
-    Buf += 2;
+void VersionTableSection::writeTo(uint8_t *buf) {
+  buf += 2;
+  for (const SymbolTableEntry &s : getPartition().dynSymTab->getSymbols()) {
+    write16(buf, s.sym->versionId);
+    buf += 2;
   }
 }
 
-template <class ELFT> bool VersionTableSection<ELFT>::empty() const {
-  return !In.VerDef && InX<ELFT>::VerNeed->empty();
+bool VersionTableSection::isNeeded() const {
+  return getPartition().verDef || getPartition().verNeed->isNeeded();
+}
+
+void elf::addVerneed(Symbol *ss) {
+  auto &file = cast<SharedFile>(*ss->file);
+  if (ss->verdefIndex == VER_NDX_GLOBAL) {
+    ss->versionId = VER_NDX_GLOBAL;
+    return;
+  }
+
+  if (file.vernauxs.empty())
+    file.vernauxs.resize(file.verdefs.size());
+
+  // Select a version identifier for the vernaux data structure, if we haven't
+  // already allocated one. The verdef identifiers cover the range
+  // [1..getVerDefNum()]; this causes the vernaux identifiers to start from
+  // getVerDefNum()+1.
+  if (file.vernauxs[ss->verdefIndex] == 0)
+    file.vernauxs[ss->verdefIndex] = ++SharedFile::vernauxNum + getVerDefNum();
+
+  ss->versionId = file.vernauxs[ss->verdefIndex];
 }
 
 template <class ELFT>
 VersionNeedSection<ELFT>::VersionNeedSection()
     : SyntheticSection(SHF_ALLOC, SHT_GNU_verneed, sizeof(uint32_t),
-                       ".gnu.version_r") {
-  // Identifiers in verneed section start at 2 because 0 and 1 are reserved
-  // for VER_NDX_LOCAL and VER_NDX_GLOBAL.
-  // First identifiers are reserved by verdef section if it exist.
-  NextIndex = getVerDefNum() + 1;
-}
+                       ".gnu.version_r") {}
 
-template <class ELFT> void VersionNeedSection<ELFT>::addSymbol(Symbol *SS) {
-  auto &File = cast<SharedFile<ELFT>>(*SS->File);
-  if (SS->VerdefIndex == VER_NDX_GLOBAL) {
-    SS->VersionId = VER_NDX_GLOBAL;
-    return;
+template <class ELFT> void VersionNeedSection<ELFT>::finalizeContents() {
+  for (SharedFile *f : sharedFiles) {
+    if (f->vernauxs.empty())
+      continue;
+    verneeds.emplace_back();
+    Verneed &vn = verneeds.back();
+    vn.nameStrTab = getPartition().dynStrTab->addString(f->soName);
+    for (unsigned i = 0; i != f->vernauxs.size(); ++i) {
+      if (f->vernauxs[i] == 0)
+        continue;
+      auto *verdef =
+          reinterpret_cast<const typename ELFT::Verdef *>(f->verdefs[i]);
+      vn.vernauxs.push_back(
+          {verdef->vd_hash, f->vernauxs[i],
+           getPartition().dynStrTab->addString(f->getStringTable().data() +
+                                               verdef->getAux()->vda_name)});
+    }
   }
 
-  // If we don't already know that we need an Elf_Verneed for this DSO, prepare
-  // to create one by adding it to our needed list and creating a dynstr entry
-  // for the soname.
-  if (File.VerdefMap.empty())
-    Needed.push_back({&File, In.DynStrTab->addString(File.SoName)});
-  const typename ELFT::Verdef *Ver = File.Verdefs[SS->VerdefIndex];
-  typename SharedFile<ELFT>::NeededVer &NV = File.VerdefMap[Ver];
-
-  // If we don't already know that we need an Elf_Vernaux for this Elf_Verdef,
-  // prepare to create one by allocating a version identifier and creating a
-  // dynstr entry for the version name.
-  if (NV.Index == 0) {
-    NV.StrTab = In.DynStrTab->addString(File.getStringTable().data() +
-                                        Ver->getAux()->vda_name);
-    NV.Index = NextIndex++;
-  }
-  SS->VersionId = NV.Index;
+  if (OutputSection *sec = getPartition().dynStrTab->getParent())
+    getParent()->link = sec->sectionIndex;
+  getParent()->info = verneeds.size();
 }
 
-template <class ELFT> void VersionNeedSection<ELFT>::writeTo(uint8_t *Buf) {
+template <class ELFT> void VersionNeedSection<ELFT>::writeTo(uint8_t *buf) {
   // The Elf_Verneeds need to appear first, followed by the Elf_Vernauxs.
-  auto *Verneed = reinterpret_cast<Elf_Verneed *>(Buf);
-  auto *Vernaux = reinterpret_cast<Elf_Vernaux *>(Verneed + Needed.size());
+  auto *verneed = reinterpret_cast<Elf_Verneed *>(buf);
+  auto *vernaux = reinterpret_cast<Elf_Vernaux *>(verneed + verneeds.size());
 
-  for (std::pair<SharedFile<ELFT> *, size_t> &P : Needed) {
+  for (auto &vn : verneeds) {
     // Create an Elf_Verneed for this DSO.
-    Verneed->vn_version = 1;
-    Verneed->vn_cnt = P.first->VerdefMap.size();
-    Verneed->vn_file = P.second;
-    Verneed->vn_aux =
-        reinterpret_cast<char *>(Vernaux) - reinterpret_cast<char *>(Verneed);
-    Verneed->vn_next = sizeof(Elf_Verneed);
-    ++Verneed;
+    verneed->vn_version = 1;
+    verneed->vn_cnt = vn.vernauxs.size();
+    verneed->vn_file = vn.nameStrTab;
+    verneed->vn_aux =
+        reinterpret_cast<char *>(vernaux) - reinterpret_cast<char *>(verneed);
+    verneed->vn_next = sizeof(Elf_Verneed);
+    ++verneed;
 
-    // Create the Elf_Vernauxs for this Elf_Verneed. The loop iterates over
-    // VerdefMap, which will only contain references to needed version
-    // definitions. Each Elf_Vernaux is based on the information contained in
-    // the Elf_Verdef in the source DSO. This loop iterates over a std::map of
-    // pointers, but is deterministic because the pointers refer to Elf_Verdef
-    // data structures within a single input file.
-    for (auto &NV : P.first->VerdefMap) {
-      Vernaux->vna_hash = NV.first->vd_hash;
-      Vernaux->vna_flags = 0;
-      Vernaux->vna_other = NV.second.Index;
-      Vernaux->vna_name = NV.second.StrTab;
-      Vernaux->vna_next = sizeof(Elf_Vernaux);
-      ++Vernaux;
+    // Create the Elf_Vernauxs for this Elf_Verneed.
+    for (auto &vna : vn.vernauxs) {
+      vernaux->vna_hash = vna.hash;
+      vernaux->vna_flags = 0;
+      vernaux->vna_other = vna.verneedIndex;
+      vernaux->vna_name = vna.nameStrTab;
+      vernaux->vna_next = sizeof(Elf_Vernaux);
+      ++vernaux;
     }
 
-    Vernaux[-1].vna_next = 0;
+    vernaux[-1].vna_next = 0;
   }
-  Verneed[-1].vn_next = 0;
-}
-
-template <class ELFT> void VersionNeedSection<ELFT>::finalizeContents() {
-  if (OutputSection *Sec = In.DynStrTab->getParent())
-    getParent()->Link = Sec->SectionIndex;
-  getParent()->Info = Needed.size();
+  verneed[-1].vn_next = 0;
 }
 
 template <class ELFT> size_t VersionNeedSection<ELFT>::getSize() const {
-  unsigned Size = Needed.size() * sizeof(Elf_Verneed);
-  for (const std::pair<SharedFile<ELFT> *, size_t> &P : Needed)
-    Size += P.first->VerdefMap.size() * sizeof(Elf_Vernaux);
-  return Size;
+  return verneeds.size() * sizeof(Elf_Verneed) +
+         SharedFile::vernauxNum * sizeof(Elf_Vernaux);
 }
 
-template <class ELFT> bool VersionNeedSection<ELFT>::empty() const {
-  return getNeedNum() == 0;
+template <class ELFT> bool VersionNeedSection<ELFT>::isNeeded() const {
+  return SharedFile::vernauxNum != 0;
 }
 
-void MergeSyntheticSection::addSection(MergeInputSection *MS) {
-  MS->Parent = this;
-  Sections.push_back(MS);
+void MergeSyntheticSection::addSection(MergeInputSection *ms) {
+  ms->parent = this;
+  sections.push_back(ms);
+  assert(alignment == ms->alignment || !(ms->flags & SHF_STRINGS));
+  alignment = std::max(alignment, ms->alignment);
 }
 
-MergeTailSection::MergeTailSection(StringRef Name, uint32_t Type,
-                                   uint64_t Flags, uint32_t Alignment)
-    : MergeSyntheticSection(Name, Type, Flags, Alignment),
-      Builder(StringTableBuilder::RAW, Alignment) {}
+MergeTailSection::MergeTailSection(StringRef name, uint32_t type,
+                                   uint64_t flags, uint32_t alignment)
+    : MergeSyntheticSection(name, type, flags, alignment),
+      builder(StringTableBuilder::RAW, alignment) {}
 
-size_t MergeTailSection::getSize() const { return Builder.getSize(); }
+size_t MergeTailSection::getSize() const { return builder.getSize(); }
 
-void MergeTailSection::writeTo(uint8_t *Buf) { Builder.write(Buf); }
+void MergeTailSection::writeTo(uint8_t *buf) { builder.write(buf); }
 
 void MergeTailSection::finalizeContents() {
   // Add all string pieces to the string table builder to create section
   // contents.
-  for (MergeInputSection *Sec : Sections)
-    for (size_t I = 0, E = Sec->Pieces.size(); I != E; ++I)
-      if (Sec->Pieces[I].Live)
-        Builder.add(Sec->getData(I));
+  for (MergeInputSection *sec : sections)
+    for (size_t i = 0, e = sec->pieces.size(); i != e; ++i)
+      if (sec->pieces[i].live)
+        builder.add(sec->getData(i));
 
   // Fix the string table content. After this, the contents will never change.
-  Builder.finalize();
+  builder.finalize();
 
   // finalize() fixed tail-optimized strings, so we can now get
   // offsets of strings. Get an offset for each string and save it
-  // to a corresponding StringPiece for easy access.
-  for (MergeInputSection *Sec : Sections)
-    for (size_t I = 0, E = Sec->Pieces.size(); I != E; ++I)
-      if (Sec->Pieces[I].Live)
-        Sec->Pieces[I].OutputOff = Builder.getOffset(Sec->getData(I));
+  // to a corresponding SectionPiece for easy access.
+  for (MergeInputSection *sec : sections)
+    for (size_t i = 0, e = sec->pieces.size(); i != e; ++i)
+      if (sec->pieces[i].live)
+        sec->pieces[i].outputOff = builder.getOffset(sec->getData(i));
 }
 
-void MergeNoTailSection::writeTo(uint8_t *Buf) {
-  for (size_t I = 0; I < NumShards; ++I)
-    Shards[I].write(Buf + ShardOffsets[I]);
+void MergeNoTailSection::writeTo(uint8_t *buf) {
+  for (size_t i = 0; i < numShards; ++i)
+    shards[i].write(buf + shardOffsets[i]);
 }
 
 // This function is very hot (i.e. it can take several seconds to finish)
@@ -2911,66 +2965,68 @@ void MergeNoTailSection::writeTo(uint8_t *Buf) {
 // We do it in parallel.
 void MergeNoTailSection::finalizeContents() {
   // Initializes string table builders.
-  for (size_t I = 0; I < NumShards; ++I)
-    Shards.emplace_back(StringTableBuilder::RAW, Alignment);
+  for (size_t i = 0; i < numShards; ++i)
+    shards.emplace_back(StringTableBuilder::RAW, alignment);
 
   // Concurrency level. Must be a power of 2 to avoid expensive modulo
   // operations in the following tight loop.
-  size_t Concurrency = 1;
-  if (ThreadsEnabled)
-    Concurrency =
-        std::min<size_t>(PowerOf2Floor(hardware_concurrency()), NumShards);
+  size_t concurrency = 1;
+  if (threadsEnabled)
+    concurrency =
+        std::min<size_t>(PowerOf2Floor(hardware_concurrency()), numShards);
 
   // Add section pieces to the builders.
-  parallelForEachN(0, Concurrency, [&](size_t ThreadId) {
-    for (MergeInputSection *Sec : Sections) {
-      for (size_t I = 0, E = Sec->Pieces.size(); I != E; ++I) {
-        size_t ShardId = getShardId(Sec->Pieces[I].Hash);
-        if ((ShardId & (Concurrency - 1)) == ThreadId && Sec->Pieces[I].Live)
-          Sec->Pieces[I].OutputOff = Shards[ShardId].add(Sec->getData(I));
+  parallelForEachN(0, concurrency, [&](size_t threadId) {
+    for (MergeInputSection *sec : sections) {
+      for (size_t i = 0, e = sec->pieces.size(); i != e; ++i) {
+        if (!sec->pieces[i].live)
+          continue;
+        size_t shardId = getShardId(sec->pieces[i].hash);
+        if ((shardId & (concurrency - 1)) == threadId)
+          sec->pieces[i].outputOff = shards[shardId].add(sec->getData(i));
       }
     }
   });
 
   // Compute an in-section offset for each shard.
-  size_t Off = 0;
-  for (size_t I = 0; I < NumShards; ++I) {
-    Shards[I].finalizeInOrder();
-    if (Shards[I].getSize() > 0)
-      Off = alignTo(Off, Alignment);
-    ShardOffsets[I] = Off;
-    Off += Shards[I].getSize();
+  size_t off = 0;
+  for (size_t i = 0; i < numShards; ++i) {
+    shards[i].finalizeInOrder();
+    if (shards[i].getSize() > 0)
+      off = alignTo(off, alignment);
+    shardOffsets[i] = off;
+    off += shards[i].getSize();
   }
-  Size = Off;
+  size = off;
 
   // So far, section pieces have offsets from beginning of shards, but
   // we want offsets from beginning of the whole section. Fix them.
-  parallelForEach(Sections, [&](MergeInputSection *Sec) {
-    for (size_t I = 0, E = Sec->Pieces.size(); I != E; ++I)
-      if (Sec->Pieces[I].Live)
-        Sec->Pieces[I].OutputOff +=
-            ShardOffsets[getShardId(Sec->Pieces[I].Hash)];
+  parallelForEach(sections, [&](MergeInputSection *sec) {
+    for (size_t i = 0, e = sec->pieces.size(); i != e; ++i)
+      if (sec->pieces[i].live)
+        sec->pieces[i].outputOff +=
+            shardOffsets[getShardId(sec->pieces[i].hash)];
   });
 }
 
-static MergeSyntheticSection *createMergeSynthetic(StringRef Name,
-                                                   uint32_t Type,
-                                                   uint64_t Flags,
-                                                   uint32_t Alignment) {
-  bool ShouldTailMerge = (Flags & SHF_STRINGS) && Config->Optimize >= 2;
-  if (ShouldTailMerge)
-    return make<MergeTailSection>(Name, Type, Flags, Alignment);
-  return make<MergeNoTailSection>(Name, Type, Flags, Alignment);
+static MergeSyntheticSection *createMergeSynthetic(StringRef name,
+                                                   uint32_t type,
+                                                   uint64_t flags,
+                                                   uint32_t alignment) {
+  bool shouldTailMerge = (flags & SHF_STRINGS) && config->optimize >= 2;
+  if (shouldTailMerge)
+    return make<MergeTailSection>(name, type, flags, alignment);
+  return make<MergeNoTailSection>(name, type, flags, alignment);
 }
 
 template <class ELFT> void elf::splitSections() {
   // splitIntoPieces needs to be called on each MergeInputSection
   // before calling finalizeContents().
-  parallelForEach(InputSections, [](InputSectionBase *Sec) {
-    if (auto *S = dyn_cast<MergeInputSection>(Sec))
-      S->splitIntoPieces();
-    else if (auto *Eh = dyn_cast<EhInputSection>(Sec))
-      Eh->split<ELFT>();
+  parallelForEach(inputSections, [](InputSectionBase *sec) {
+    if (auto *s = dyn_cast<MergeInputSection>(sec))
+      s->splitIntoPieces();
+    else if (auto *eh = dyn_cast<EhInputSection>(sec))
+      eh->split<ELFT>();
   });
 }
 
@@ -2982,23 +3038,22 @@ template <class ELFT> void elf::splitSections() {
 // that it replaces. It then finalizes each synthetic section in order
 // to compute an output offset for each piece of each input section.
 void elf::mergeSections() {
-  std::vector<MergeSyntheticSection *> MergeSections;
-  for (InputSectionBase *&S : InputSections) {
-    MergeInputSection *MS = dyn_cast<MergeInputSection>(S);
-    if (!MS)
+  std::vector<MergeSyntheticSection *> mergeSections;
+  for (InputSectionBase *&s : inputSections) {
+    MergeInputSection *ms = dyn_cast<MergeInputSection>(s);
+    if (!ms)
       continue;
 
     // We do not want to handle sections that are not alive, so just remove
     // them instead of trying to merge.
-    if (!MS->Live) {
-      S = nullptr;
+    if (!ms->isLive()) {
+      s = nullptr;
       continue;
     }
 
-    StringRef OutsecName = getOutputSectionName(MS);
-    uint32_t Alignment = std::max<uint32_t>(MS->Alignment, MS->Entsize);
+    StringRef outsecName = getOutputSectionName(ms);
 
-    auto I = llvm::find_if(MergeSections, [=](MergeSyntheticSection *Sec) {
+    auto i = llvm::find_if(mergeSections, [=](MergeSyntheticSection *sec) {
       // While we could create a single synthetic section for two different
       // values of Entsize, it is better to take Entsize into consideration.
       //
@@ -3007,98 +3062,285 @@ void elf::mergeSections() {
       //
       // Using Entsize in here also allows us to propagate it to the synthetic
       // section.
-      return Sec->Name == OutsecName && Sec->Flags == MS->Flags &&
-             Sec->Entsize == MS->Entsize && Sec->Alignment == Alignment;
+      //
+      // SHF_STRINGS section with different alignments should not be merged.
+      return sec->name == outsecName && sec->flags == ms->flags &&
+             sec->entsize == ms->entsize &&
+             (sec->alignment == ms->alignment || !(sec->flags & SHF_STRINGS));
     });
-    if (I == MergeSections.end()) {
-      MergeSyntheticSection *Syn =
-          createMergeSynthetic(OutsecName, MS->Type, MS->Flags, Alignment);
-      MergeSections.push_back(Syn);
-      I = std::prev(MergeSections.end());
-      S = Syn;
-      Syn->Entsize = MS->Entsize;
+    if (i == mergeSections.end()) {
+      MergeSyntheticSection *syn =
+          createMergeSynthetic(outsecName, ms->type, ms->flags, ms->alignment);
+      mergeSections.push_back(syn);
+      i = std::prev(mergeSections.end());
+      s = syn;
+      syn->entsize = ms->entsize;
     } else {
-      S = nullptr;
+      s = nullptr;
     }
-    (*I)->addSection(MS);
+    (*i)->addSection(ms);
   }
-  for (auto *MS : MergeSections)
-    MS->finalizeContents();
+  for (auto *ms : mergeSections)
+    ms->finalizeContents();
 
-  std::vector<InputSectionBase *> &V = InputSections;
-  V.erase(std::remove(V.begin(), V.end(), nullptr), V.end());
+  std::vector<InputSectionBase *> &v = inputSections;
+  v.erase(std::remove(v.begin(), v.end(), nullptr), v.end());
 }
 
 MipsRldMapSection::MipsRldMapSection()
-    : SyntheticSection(SHF_ALLOC | SHF_WRITE, SHT_PROGBITS, Config->Wordsize,
+    : SyntheticSection(SHF_ALLOC | SHF_WRITE, SHT_PROGBITS, config->wordsize,
                        ".rld_map") {}
 
-ARMExidxSentinelSection::ARMExidxSentinelSection()
+ARMExidxSyntheticSection::ARMExidxSyntheticSection()
     : SyntheticSection(SHF_ALLOC | SHF_LINK_ORDER, SHT_ARM_EXIDX,
-                       Config->Wordsize, ".ARM.exidx") {}
-
-// Write a terminating sentinel entry to the end of the .ARM.exidx table.
-// This section will have been sorted last in the .ARM.exidx table.
-// This table entry will have the form:
-// | PREL31 upper bound of code that has exception tables | EXIDX_CANTUNWIND |
-// The sentinel must have the PREL31 value of an address higher than any
-// address described by any other table entry.
-void ARMExidxSentinelSection::writeTo(uint8_t *Buf) {
-  assert(Highest);
-  uint64_t S = Highest->getVA(Highest->getSize());
-  uint64_t P = getVA();
-  Target->relocateOne(Buf, R_ARM_PREL31, S - P);
-  write32le(Buf + 4, 1);
+                       config->wordsize, ".ARM.exidx") {}
+
+static InputSection *findExidxSection(InputSection *isec) {
+  for (InputSection *d : isec->dependentSections)
+    if (d->type == SHT_ARM_EXIDX)
+      return d;
+  return nullptr;
+}
+
+bool ARMExidxSyntheticSection::addSection(InputSection *isec) {
+  if (isec->type == SHT_ARM_EXIDX) {
+    exidxSections.push_back(isec);
+    return true;
+  }
+
+  if ((isec->flags & SHF_ALLOC) && (isec->flags & SHF_EXECINSTR) &&
+      isec->getSize() > 0) {
+    executableSections.push_back(isec);
+    if (empty && findExidxSection(isec))
+      empty = false;
+    return false;
+  }
+
+  // FIXME: we do not output a relocation section when --emit-relocs is used
+  // as we do not have relocation sections for linker generated table entries
+  // and we would have to erase at a late stage relocations from merged entries.
+  // Given that exception tables are already position independent and a binary
+  // analyzer could derive the relocations we choose to erase the relocations.
+  if (config->emitRelocs && isec->type == SHT_REL)
+    if (InputSectionBase *ex = isec->getRelocatedSection())
+      if (isa<InputSection>(ex) && ex->type == SHT_ARM_EXIDX)
+        return true;
+
+  return false;
 }
 
-// The sentinel has to be removed if there are no other .ARM.exidx entries.
-bool ARMExidxSentinelSection::empty() const {
-  for (InputSection *IS : getInputSections(getParent()))
-    if (!isa<ARMExidxSentinelSection>(IS))
+// References to .ARM.Extab Sections have bit 31 clear and are not the
+// special EXIDX_CANTUNWIND bit-pattern.
+static bool isExtabRef(uint32_t unwind) {
+  return (unwind & 0x80000000) == 0 && unwind != 0x1;
+}
+
+// Return true if the .ARM.exidx section Cur can be merged into the .ARM.exidx
+// section Prev, where Cur follows Prev in the table. This can be done if the
+// unwinding instructions in Cur are identical to Prev. Linker generated
+// EXIDX_CANTUNWIND entries are represented by nullptr as they do not have an
+// InputSection.
+static bool isDuplicateArmExidxSec(InputSection *prev, InputSection *cur) {
+
+  struct ExidxEntry {
+    ulittle32_t fn;
+    ulittle32_t unwind;
+  };
+  // Get the last table Entry from the previous .ARM.exidx section. If Prev is
+  // nullptr then it will be a synthesized EXIDX_CANTUNWIND entry.
+  ExidxEntry prevEntry = {ulittle32_t(0), ulittle32_t(1)};
+  if (prev)
+    prevEntry = prev->getDataAs<ExidxEntry>().back();
+  if (isExtabRef(prevEntry.unwind))
+    return false;
+
+  // We consider the unwind instructions of an .ARM.exidx table entry
+  // a duplicate if the previous unwind instructions if:
+  // - Both are the special EXIDX_CANTUNWIND.
+  // - Both are the same inline unwind instructions.
+  // We do not attempt to follow and check links into .ARM.extab tables as
+  // consecutive identical entries are rare and the effort to check that they
+  // are identical is high.
+
+  // If Cur is nullptr then this is synthesized EXIDX_CANTUNWIND entry.
+  if (cur == nullptr)
+    return prevEntry.unwind == 1;
+
+  for (const ExidxEntry entry : cur->getDataAs<ExidxEntry>())
+    if (isExtabRef(entry.unwind) || entry.unwind != prevEntry.unwind)
       return false;
+
+  // All table entries in this .ARM.exidx Section can be merged into the
+  // previous Section.
   return true;
 }
 
-bool ARMExidxSentinelSection::classof(const SectionBase *D) {
-  return D->kind() == InputSectionBase::Synthetic && D->Type == SHT_ARM_EXIDX;
+// The .ARM.exidx table must be sorted in ascending order of the address of the
+// functions the table describes. Optionally duplicate adjacent table entries
+// can be removed. At the end of the function the ExecutableSections must be
+// sorted in ascending order of address, Sentinel is set to the InputSection
+// with the highest address and any InputSections that have mergeable
+// .ARM.exidx table entries are removed from it.
+void ARMExidxSyntheticSection::finalizeContents() {
+  // Sort the executable sections that may or may not have associated
+  // .ARM.exidx sections by order of ascending address. This requires the
+  // relative positions of InputSections to be known.
+  auto compareByFilePosition = [](const InputSection *a,
+                                  const InputSection *b) {
+    OutputSection *aOut = a->getParent();
+    OutputSection *bOut = b->getParent();
+
+    if (aOut != bOut)
+      return aOut->sectionIndex < bOut->sectionIndex;
+    return a->outSecOff < b->outSecOff;
+  };
+  llvm::stable_sort(executableSections, compareByFilePosition);
+  sentinel = executableSections.back();
+  // Optionally merge adjacent duplicate entries.
+  if (config->mergeArmExidx) {
+    std::vector<InputSection *> selectedSections;
+    selectedSections.reserve(executableSections.size());
+    selectedSections.push_back(executableSections[0]);
+    size_t prev = 0;
+    for (size_t i = 1; i < executableSections.size(); ++i) {
+      InputSection *ex1 = findExidxSection(executableSections[prev]);
+      InputSection *ex2 = findExidxSection(executableSections[i]);
+      if (!isDuplicateArmExidxSec(ex1, ex2)) {
+        selectedSections.push_back(executableSections[i]);
+        prev = i;
+      }
+    }
+    executableSections = std::move(selectedSections);
+  }
+
+  size_t offset = 0;
+  size = 0;
+  for (InputSection *isec : executableSections) {
+    if (InputSection *d = findExidxSection(isec)) {
+      d->outSecOff = offset;
+      d->parent = getParent();
+      offset += d->getSize();
+    } else {
+      offset += 8;
+    }
+  }
+  // Size includes Sentinel.
+  size = offset + 8;
+}
+
+InputSection *ARMExidxSyntheticSection::getLinkOrderDep() const {
+  return executableSections.front();
+}
+
+// To write the .ARM.exidx table from the ExecutableSections we have three cases
+// 1.) The InputSection has a .ARM.exidx InputSection in its dependent sections.
+//     We write the .ARM.exidx section contents and apply its relocations.
+// 2.) The InputSection does not have a dependent .ARM.exidx InputSection. We
+//     must write the contents of an EXIDX_CANTUNWIND directly. We use the
+//     start of the InputSection as the purpose of the linker generated
+//     section is to terminate the address range of the previous entry.
+// 3.) A trailing EXIDX_CANTUNWIND sentinel section is required at the end of
+//     the table to terminate the address range of the final entry.
+void ARMExidxSyntheticSection::writeTo(uint8_t *buf) {
+
+  const uint8_t cantUnwindData[8] = {0, 0, 0, 0,  // PREL31 to target
+                                     1, 0, 0, 0}; // EXIDX_CANTUNWIND
+
+  uint64_t offset = 0;
+  for (InputSection *isec : executableSections) {
+    assert(isec->getParent() != nullptr);
+    if (InputSection *d = findExidxSection(isec)) {
+      memcpy(buf + offset, d->data().data(), d->data().size());
+      d->relocateAlloc(buf, buf + d->getSize());
+      offset += d->getSize();
+    } else {
+      // A Linker generated CANTUNWIND section.
+      memcpy(buf + offset, cantUnwindData, sizeof(cantUnwindData));
+      uint64_t s = isec->getVA();
+      uint64_t p = getVA() + offset;
+      target->relocateOne(buf + offset, R_ARM_PREL31, s - p);
+      offset += 8;
+    }
+  }
+  // Write Sentinel.
+  memcpy(buf + offset, cantUnwindData, sizeof(cantUnwindData));
+  uint64_t s = sentinel->getVA(sentinel->getSize());
+  uint64_t p = getVA() + offset;
+  target->relocateOne(buf + offset, R_ARM_PREL31, s - p);
+  assert(size == offset + 8);
+}
+
+bool ARMExidxSyntheticSection::classof(const SectionBase *d) {
+  return d->kind() == InputSectionBase::Synthetic && d->type == SHT_ARM_EXIDX;
 }
 
-ThunkSection::ThunkSection(OutputSection *OS, uint64_t Off)
+ThunkSection::ThunkSection(OutputSection *os, uint64_t off)
     : SyntheticSection(SHF_ALLOC | SHF_EXECINSTR, SHT_PROGBITS,
-                       Config->Wordsize, ".text.thunk") {
-  this->Parent = OS;
-  this->OutSecOff = Off;
+                       config->wordsize, ".text.thunk") {
+  this->parent = os;
+  this->outSecOff = off;
 }
 
-void ThunkSection::addThunk(Thunk *T) {
-  Thunks.push_back(T);
-  T->addSymbols(*this);
+void ThunkSection::addThunk(Thunk *t) {
+  thunks.push_back(t);
+  t->addSymbols(*this);
 }
 
-void ThunkSection::writeTo(uint8_t *Buf) {
-  for (Thunk *T : Thunks)
-    T->writeTo(Buf + T->Offset);
+void ThunkSection::writeTo(uint8_t *buf) {
+  for (Thunk *t : thunks)
+    t->writeTo(buf + t->offset);
 }
 
 InputSection *ThunkSection::getTargetInputSection() const {
-  if (Thunks.empty())
+  if (thunks.empty())
     return nullptr;
-  const Thunk *T = Thunks.front();
-  return T->getTargetInputSection();
+  const Thunk *t = thunks.front();
+  return t->getTargetInputSection();
 }
 
 bool ThunkSection::assignOffsets() {
-  uint64_t Off = 0;
-  for (Thunk *T : Thunks) {
-    Off = alignTo(Off, T->Alignment);
-    T->setOffset(Off);
-    uint32_t Size = T->size();
-    T->getThunkTargetSym()->Size = Size;
-    Off += Size;
+  uint64_t off = 0;
+  for (Thunk *t : thunks) {
+    off = alignTo(off, t->alignment);
+    t->setOffset(off);
+    uint32_t size = t->size();
+    t->getThunkTargetSym()->size = size;
+    off += size;
   }
-  bool Changed = Off != Size;
-  Size = Off;
-  return Changed;
+  bool changed = off != size;
+  size = off;
+  return changed;
+}
+
+PPC32Got2Section::PPC32Got2Section()
+    : SyntheticSection(SHF_ALLOC | SHF_WRITE, SHT_PROGBITS, 4, ".got2") {}
+
+bool PPC32Got2Section::isNeeded() const {
+  // See the comment below. This is not needed if there is no other
+  // InputSection.
+  for (BaseCommand *base : getParent()->sectionCommands)
+    if (auto *isd = dyn_cast<InputSectionDescription>(base))
+      for (InputSection *isec : isd->sections)
+        if (isec != this)
+          return true;
+  return false;
+}
+
+void PPC32Got2Section::finalizeContents() {
+  // PPC32 may create multiple GOT sections for -fPIC/-fPIE, one per file in
+  // .got2 . This function computes outSecOff of each .got2 to be used in
+  // PPC32PltCallStub::writeTo(). The purpose of this empty synthetic section is
+  // to collect input sections named ".got2".
+  uint32_t offset = 0;
+  for (BaseCommand *base : getParent()->sectionCommands)
+    if (auto *isd = dyn_cast<InputSectionDescription>(base)) {
+      for (InputSection *isec : isd->sections) {
+        if (isec == this)
+          continue;
+        isec->file->ppc32Got2OutSecOff = offset;
+        offset += (uint32_t)isec->getSize();
+      }
+    }
 }
 
 // If linking position-dependent code then the table will store the addresses
@@ -3107,48 +3349,188 @@ bool ThunkSection::assignOffsets() {
 // allocated and filled in by the dynamic linker.
 PPC64LongBranchTargetSection::PPC64LongBranchTargetSection()
     : SyntheticSection(SHF_ALLOC | SHF_WRITE,
-                       Config->Pic ? SHT_NOBITS : SHT_PROGBITS, 8,
+                       config->isPic ? SHT_NOBITS : SHT_PROGBITS, 8,
                        ".branch_lt") {}
 
-void PPC64LongBranchTargetSection::addEntry(Symbol &Sym) {
-  assert(Sym.PPC64BranchltIndex == 0xffff);
-  Sym.PPC64BranchltIndex = Entries.size();
-  Entries.push_back(&Sym);
+void PPC64LongBranchTargetSection::addEntry(Symbol &sym) {
+  assert(sym.ppc64BranchltIndex == 0xffff);
+  sym.ppc64BranchltIndex = entries.size();
+  entries.push_back(&sym);
 }
 
 size_t PPC64LongBranchTargetSection::getSize() const {
-  return Entries.size() * 8;
+  return entries.size() * 8;
 }
 
-void PPC64LongBranchTargetSection::writeTo(uint8_t *Buf) {
-  assert(Target->GotPltEntrySize == 8);
+void PPC64LongBranchTargetSection::writeTo(uint8_t *buf) {
   // If linking non-pic we have the final addresses of the targets and they get
   // written to the table directly. For pic the dynamic linker will allocate
   // the section and fill it it.
-  if (Config->Pic)
+  if (config->isPic)
     return;
 
-  for (const Symbol *Sym : Entries) {
-    assert(Sym->getVA());
+  for (const Symbol *sym : entries) {
+    assert(sym->getVA());
     // Need calls to branch to the local entry-point since a long-branch
     // must be a local-call.
-    write64(Buf,
-            Sym->getVA() + getPPC64GlobalEntryToLocalEntryOffset(Sym->StOther));
-    Buf += Target->GotPltEntrySize;
+    write64(buf,
+            sym->getVA() + getPPC64GlobalEntryToLocalEntryOffset(sym->stOther));
+    buf += 8;
   }
 }
 
-bool PPC64LongBranchTargetSection::empty() const {
+bool PPC64LongBranchTargetSection::isNeeded() const {
   // `removeUnusedSyntheticSections()` is called before thunk allocation which
   // is too early to determine if this section will be empty or not. We need
   // Finalized to keep the section alive until after thunk creation. Finalized
   // only gets set to true once `finalizeSections()` is called after thunk
   // creation. Becuase of this, if we don't create any long-branch thunks we end
   // up with an empty .branch_lt section in the binary.
-  return Finalized && Entries.empty();
+  return !finalized || !entries.empty();
 }
 
-InStruct elf::In;
+RISCVSdataSection::RISCVSdataSection()
+    : SyntheticSection(SHF_ALLOC | SHF_WRITE, SHT_PROGBITS, 1, ".sdata") {}
+
+bool RISCVSdataSection::isNeeded() const {
+  if (!ElfSym::riscvGlobalPointer)
+    return false;
+
+  // __global_pointer$ is defined relative to .sdata . If the section does not
+  // exist, create a dummy one.
+  for (BaseCommand *base : getParent()->sectionCommands)
+    if (auto *isd = dyn_cast<InputSectionDescription>(base))
+      for (InputSection *isec : isd->sections)
+        if (isec != this)
+          return false;
+  return true;
+}
+
+static uint8_t getAbiVersion() {
+  // MIPS non-PIC executable gets ABI version 1.
+  if (config->emachine == EM_MIPS) {
+    if (!config->isPic && !config->relocatable &&
+        (config->eflags & (EF_MIPS_PIC | EF_MIPS_CPIC)) == EF_MIPS_CPIC)
+      return 1;
+    return 0;
+  }
+
+  if (config->emachine == EM_AMDGPU) {
+    uint8_t ver = objectFiles[0]->abiVersion;
+    for (InputFile *file : makeArrayRef(objectFiles).slice(1))
+      if (file->abiVersion != ver)
+        error("incompatible ABI version: " + toString(file));
+    return ver;
+  }
+
+  return 0;
+}
+
+template <typename ELFT> void elf::writeEhdr(uint8_t *buf, Partition &part) {
+  // For executable segments, the trap instructions are written before writing
+  // the header. Setting Elf header bytes to zero ensures that any unused bytes
+  // in header are zero-cleared, instead of having trap instructions.
+  memset(buf, 0, sizeof(typename ELFT::Ehdr));
+  memcpy(buf, "\177ELF", 4);
+
+  auto *eHdr = reinterpret_cast<typename ELFT::Ehdr *>(buf);
+  eHdr->e_ident[EI_CLASS] = config->is64 ? ELFCLASS64 : ELFCLASS32;
+  eHdr->e_ident[EI_DATA] = config->isLE ? ELFDATA2LSB : ELFDATA2MSB;
+  eHdr->e_ident[EI_VERSION] = EV_CURRENT;
+  eHdr->e_ident[EI_OSABI] = config->osabi;
+  eHdr->e_ident[EI_ABIVERSION] = getAbiVersion();
+  eHdr->e_machine = config->emachine;
+  eHdr->e_version = EV_CURRENT;
+  eHdr->e_flags = config->eflags;
+  eHdr->e_ehsize = sizeof(typename ELFT::Ehdr);
+  eHdr->e_phnum = part.phdrs.size();
+  eHdr->e_shentsize = sizeof(typename ELFT::Shdr);
+
+  if (!config->relocatable) {
+    eHdr->e_phoff = sizeof(typename ELFT::Ehdr);
+    eHdr->e_phentsize = sizeof(typename ELFT::Phdr);
+  }
+}
+
+template <typename ELFT> void elf::writePhdrs(uint8_t *buf, Partition &part) {
+  // Write the program header table.
+  auto *hBuf = reinterpret_cast<typename ELFT::Phdr *>(buf);
+  for (PhdrEntry *p : part.phdrs) {
+    hBuf->p_type = p->p_type;
+    hBuf->p_flags = p->p_flags;
+    hBuf->p_offset = p->p_offset;
+    hBuf->p_vaddr = p->p_vaddr;
+    hBuf->p_paddr = p->p_paddr;
+    hBuf->p_filesz = p->p_filesz;
+    hBuf->p_memsz = p->p_memsz;
+    hBuf->p_align = p->p_align;
+    ++hBuf;
+  }
+}
+
+template <typename ELFT>
+PartitionElfHeaderSection<ELFT>::PartitionElfHeaderSection()
+    : SyntheticSection(SHF_ALLOC, SHT_LLVM_PART_EHDR, 1, "") {}
+
+template <typename ELFT>
+size_t PartitionElfHeaderSection<ELFT>::getSize() const {
+  return sizeof(typename ELFT::Ehdr);
+}
+
+template <typename ELFT>
+void PartitionElfHeaderSection<ELFT>::writeTo(uint8_t *buf) {
+  writeEhdr<ELFT>(buf, getPartition());
+
+  // Loadable partitions are always ET_DYN.
+  auto *eHdr = reinterpret_cast<typename ELFT::Ehdr *>(buf);
+  eHdr->e_type = ET_DYN;
+}
+
+template <typename ELFT>
+PartitionProgramHeadersSection<ELFT>::PartitionProgramHeadersSection()
+    : SyntheticSection(SHF_ALLOC, SHT_LLVM_PART_PHDR, 1, ".phdrs") {}
+
+template <typename ELFT>
+size_t PartitionProgramHeadersSection<ELFT>::getSize() const {
+  return sizeof(typename ELFT::Phdr) * getPartition().phdrs.size();
+}
+
+template <typename ELFT>
+void PartitionProgramHeadersSection<ELFT>::writeTo(uint8_t *buf) {
+  writePhdrs<ELFT>(buf, getPartition());
+}
+
+PartitionIndexSection::PartitionIndexSection()
+    : SyntheticSection(SHF_ALLOC, SHT_PROGBITS, 4, ".rodata") {}
+
+size_t PartitionIndexSection::getSize() const {
+  return 12 * (partitions.size() - 1);
+}
+
+void PartitionIndexSection::finalizeContents() {
+  for (size_t i = 1; i != partitions.size(); ++i)
+    partitions[i].nameStrTab = mainPart->dynStrTab->addString(partitions[i].name);
+}
+
+void PartitionIndexSection::writeTo(uint8_t *buf) {
+  uint64_t va = getVA();
+  for (size_t i = 1; i != partitions.size(); ++i) {
+    write32(buf, mainPart->dynStrTab->getVA() + partitions[i].nameStrTab - va);
+    write32(buf + 4, partitions[i].elfHeader->getVA() - (va + 4));
+
+    SyntheticSection *next =
+        i == partitions.size() - 1 ? in.partEnd : partitions[i + 1].elfHeader;
+    write32(buf + 8, next->getVA() - partitions[i].elfHeader->getVA());
+
+    va += 12;
+    buf += 12;
+  }
+}
+
+InStruct elf::in;
+
+std::vector<Partition> elf::partitions;
+Partition *elf::mainPart;
 
 template GdbIndexSection *GdbIndexSection::create<ELF32LE>();
 template GdbIndexSection *GdbIndexSection::create<ELF32BE>();
@@ -3170,11 +3552,6 @@ template void PltSection::addEntry<ELF32BE>(Symbol &Sym);
 template void PltSection::addEntry<ELF64LE>(Symbol &Sym);
 template void PltSection::addEntry<ELF64BE>(Symbol &Sym);
 
-template void MipsGotSection::build<ELF32LE>();
-template void MipsGotSection::build<ELF32BE>();
-template void MipsGotSection::build<ELF64LE>();
-template void MipsGotSection::build<ELF64BE>();
-
 template class elf::MipsAbiFlagsSection<ELF32LE>;
 template class elf::MipsAbiFlagsSection<ELF32BE>;
 template class elf::MipsAbiFlagsSection<ELF64LE>;
@@ -3215,12 +3592,27 @@ template class elf::SymbolTableSection<ELF32BE>;
 template class elf::SymbolTableSection<ELF64LE>;
 template class elf::SymbolTableSection<ELF64BE>;
 
-template class elf::VersionTableSection<ELF32LE>;
-template class elf::VersionTableSection<ELF32BE>;
-template class elf::VersionTableSection<ELF64LE>;
-template class elf::VersionTableSection<ELF64BE>;
-
 template class elf::VersionNeedSection<ELF32LE>;
 template class elf::VersionNeedSection<ELF32BE>;
 template class elf::VersionNeedSection<ELF64LE>;
 template class elf::VersionNeedSection<ELF64BE>;
+
+template void elf::writeEhdr<ELF32LE>(uint8_t *Buf, Partition &Part);
+template void elf::writeEhdr<ELF32BE>(uint8_t *Buf, Partition &Part);
+template void elf::writeEhdr<ELF64LE>(uint8_t *Buf, Partition &Part);
+template void elf::writeEhdr<ELF64BE>(uint8_t *Buf, Partition &Part);
+
+template void elf::writePhdrs<ELF32LE>(uint8_t *Buf, Partition &Part);
+template void elf::writePhdrs<ELF32BE>(uint8_t *Buf, Partition &Part);
+template void elf::writePhdrs<ELF64LE>(uint8_t *Buf, Partition &Part);
+template void elf::writePhdrs<ELF64BE>(uint8_t *Buf, Partition &Part);
+
+template class elf::PartitionElfHeaderSection<ELF32LE>;
+template class elf::PartitionElfHeaderSection<ELF32BE>;
+template class elf::PartitionElfHeaderSection<ELF64LE>;
+template class elf::PartitionElfHeaderSection<ELF64BE>;
+
+template class elf::PartitionProgramHeadersSection<ELF32LE>;
+template class elf::PartitionProgramHeadersSection<ELF32BE>;
+template class elf::PartitionProgramHeadersSection<ELF64LE>;
+template class elf::PartitionProgramHeadersSection<ELF64BE>;
diff --git a/deps/lld/ELF/SyntheticSections.h b/deps/lld/ELF/SyntheticSections.h
index 6fc40d355d5e28df65ca8ae96e30775382da14ac..1c4dd06e027768d199bbdc54db6712ed73fb09a7 100644
--- a/deps/lld/ELF/SyntheticSections.h
+++ b/deps/lld/ELF/SyntheticSections.h
@@ -1,9 +1,8 @@
 //===- SyntheticSection.h ---------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -18,8 +17,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_ELF_SYNTHETIC_SECTION_H
-#define LLD_ELF_SYNTHETIC_SECTION_H
+#ifndef LLD_ELF_SYNTHETIC_SECTIONS_H
+#define LLD_ELF_SYNTHETIC_SECTIONS_H
 
 #include "DWARF.h"
 #include "EhFrame.h"
@@ -32,107 +31,113 @@
 namespace lld {
 namespace elf {
 class Defined;
-class SharedSymbol;
+struct PhdrEntry;
+class SymbolTableBaseSection;
+class VersionNeedBaseSection;
 
 class SyntheticSection : public InputSection {
 public:
-  SyntheticSection(uint64_t Flags, uint32_t Type, uint32_t Alignment,
-                   StringRef Name)
-      : InputSection(nullptr, Flags, Type, Alignment, {}, Name,
+  SyntheticSection(uint64_t flags, uint32_t type, uint32_t alignment,
+                   StringRef name)
+      : InputSection(nullptr, flags, type, alignment, {}, name,
                      InputSectionBase::Synthetic) {
-    this->Live = true;
+    markLive();
   }
 
   virtual ~SyntheticSection() = default;
-  virtual void writeTo(uint8_t *Buf) = 0;
+  virtual void writeTo(uint8_t *buf) = 0;
   virtual size_t getSize() const = 0;
   virtual void finalizeContents() {}
   // If the section has the SHF_ALLOC flag and the size may be changed if
   // thunks are added, update the section size.
   virtual bool updateAllocSize() { return false; }
-  virtual bool empty() const { return false; }
+  virtual bool isNeeded() const { return true; }
 
-  static bool classof(const SectionBase *D) {
-    return D->kind() == InputSectionBase::Synthetic;
+  static bool classof(const SectionBase *d) {
+    return d->kind() == InputSectionBase::Synthetic;
   }
 };
 
 struct CieRecord {
-  EhSectionPiece *Cie = nullptr;
-  std::vector<EhSectionPiece *> Fdes;
+  EhSectionPiece *cie = nullptr;
+  std::vector<EhSectionPiece *> fdes;
 };
 
 // Section for .eh_frame.
 class EhFrameSection final : public SyntheticSection {
 public:
   EhFrameSection();
-  void writeTo(uint8_t *Buf) override;
+  void writeTo(uint8_t *buf) override;
   void finalizeContents() override;
-  bool empty() const override { return Sections.empty(); }
-  size_t getSize() const override { return Size; }
+  bool isNeeded() const override { return !sections.empty(); }
+  size_t getSize() const override { return size; }
 
-  template <class ELFT> void addSection(InputSectionBase *S);
+  static bool classof(const SectionBase *d) {
+    return SyntheticSection::classof(d) && d->name == ".eh_frame";
+  }
 
-  std::vector<EhInputSection *> Sections;
-  size_t NumFdes = 0;
+  template <class ELFT> void addSection(InputSectionBase *s);
+
+  std::vector<EhInputSection *> sections;
+  size_t numFdes = 0;
 
   struct FdeData {
-    uint32_t PcRel;
-    uint32_t FdeVARel;
+    uint32_t pcRel;
+    uint32_t fdeVARel;
   };
 
   std::vector<FdeData> getFdeData() const;
-  ArrayRef<CieRecord *> getCieRecords() const { return CieRecords; }
+  ArrayRef<CieRecord *> getCieRecords() const { return cieRecords; }
 
 private:
   // This is used only when parsing EhInputSection. We keep it here to avoid
   // allocating one for each EhInputSection.
-  llvm::DenseMap<size_t, CieRecord *> OffsetToCie;
+  llvm::DenseMap<size_t, CieRecord *> offsetToCie;
 
-  uint64_t Size = 0;
+  uint64_t size = 0;
 
   template <class ELFT, class RelTy>
-  void addSectionAux(EhInputSection *S, llvm::ArrayRef<RelTy> Rels);
+  void addSectionAux(EhInputSection *s, llvm::ArrayRef<RelTy> rels);
 
   template <class ELFT, class RelTy>
-  CieRecord *addCie(EhSectionPiece &Piece, ArrayRef<RelTy> Rels);
+  CieRecord *addCie(EhSectionPiece &piece, ArrayRef<RelTy> rels);
 
   template <class ELFT, class RelTy>
-  bool isFdeLive(EhSectionPiece &Piece, ArrayRef<RelTy> Rels);
+  bool isFdeLive(EhSectionPiece &piece, ArrayRef<RelTy> rels);
 
-  uint64_t getFdePc(uint8_t *Buf, size_t Off, uint8_t Enc) const;
+  uint64_t getFdePc(uint8_t *buf, size_t off, uint8_t enc) const;
 
-  std::vector<CieRecord *> CieRecords;
+  std::vector<CieRecord *> cieRecords;
 
   // CIE records are uniquified by their contents and personality functions.
-  llvm::DenseMap<std::pair<ArrayRef<uint8_t>, Symbol *>, CieRecord *> CieMap;
+  llvm::DenseMap<std::pair<ArrayRef<uint8_t>, Symbol *>, CieRecord *> cieMap;
 };
 
 class GotSection : public SyntheticSection {
 public:
   GotSection();
-  size_t getSize() const override { return Size; }
+  size_t getSize() const override { return size; }
   void finalizeContents() override;
-  bool empty() const override;
-  void writeTo(uint8_t *Buf) override;
+  bool isNeeded() const override;
+  void writeTo(uint8_t *buf) override;
 
-  void addEntry(Symbol &Sym);
-  bool addDynTlsEntry(Symbol &Sym);
+  void addEntry(Symbol &sym);
+  bool addDynTlsEntry(Symbol &sym);
   bool addTlsIndex();
-  uint64_t getGlobalDynAddr(const Symbol &B) const;
-  uint64_t getGlobalDynOffset(const Symbol &B) const;
+  uint64_t getGlobalDynAddr(const Symbol &b) const;
+  uint64_t getGlobalDynOffset(const Symbol &b) const;
 
-  uint64_t getTlsIndexVA() { return this->getVA() + TlsIndexOff; }
-  uint32_t getTlsIndexOff() const { return TlsIndexOff; }
+  uint64_t getTlsIndexVA() { return this->getVA() + tlsIndexOff; }
+  uint32_t getTlsIndexOff() const { return tlsIndexOff; }
 
   // Flag to force GOT to be in output if we have relocations
   // that relies on its address.
-  bool HasGotOffRel = false;
+  bool hasGotOffRel = false;
 
 protected:
-  size_t NumEntries = 0;
-  uint32_t TlsIndexOff = -1;
-  uint64_t Size = 0;
+  size_t numEntries = 0;
+  uint32_t tlsIndexOff = -1;
+  uint64_t size = 0;
 };
 
 // .note.GNU-stack section.
@@ -140,27 +145,31 @@ class GnuStackSection : public SyntheticSection {
 public:
   GnuStackSection()
       : SyntheticSection(0, llvm::ELF::SHT_PROGBITS, 1, ".note.GNU-stack") {}
-  void writeTo(uint8_t *Buf) override {}
+  void writeTo(uint8_t *buf) override {}
   size_t getSize() const override { return 0; }
 };
 
+class GnuPropertySection : public SyntheticSection {
+public:
+  GnuPropertySection();
+  void writeTo(uint8_t *buf) override;
+  size_t getSize() const override;
+};
+
 // .note.gnu.build-id section.
 class BuildIdSection : public SyntheticSection {
   // First 16 bytes are a header.
-  static const unsigned HeaderSize = 16;
+  static const unsigned headerSize = 16;
 
 public:
+  const size_t hashSize;
   BuildIdSection();
-  void writeTo(uint8_t *Buf) override;
-  size_t getSize() const override { return HeaderSize + HashSize; }
-  void writeBuildId(llvm::ArrayRef<uint8_t> Buf);
+  void writeTo(uint8_t *buf) override;
+  size_t getSize() const override { return headerSize + hashSize; }
+  void writeBuildId(llvm::ArrayRef<uint8_t> buf);
 
 private:
-  void computeHash(llvm::ArrayRef<uint8_t> Buf,
-                   std::function<void(uint8_t *, ArrayRef<uint8_t>)> Hash);
-
-  size_t HashSize;
-  uint8_t *HashBuf;
+  uint8_t *hashBuf;
 };
 
 // BssSection is used to reserve space for copy relocations and common symbols.
@@ -169,40 +178,40 @@ private:
 // respectively.
 class BssSection final : public SyntheticSection {
 public:
-  BssSection(StringRef Name, uint64_t Size, uint32_t Alignment);
+  BssSection(StringRef name, uint64_t size, uint32_t alignment);
   void writeTo(uint8_t *) override {
     llvm_unreachable("unexpected writeTo() call for SHT_NOBITS section");
   }
-  bool empty() const override { return getSize() == 0; }
-  size_t getSize() const override { return Size; }
+  bool isNeeded() const override { return size != 0; }
+  size_t getSize() const override { return size; }
 
-  static bool classof(const SectionBase *S) { return S->Bss; }
-  uint64_t Size;
+  static bool classof(const SectionBase *s) { return s->bss; }
+  uint64_t size;
 };
 
 class MipsGotSection final : public SyntheticSection {
 public:
   MipsGotSection();
-  void writeTo(uint8_t *Buf) override;
-  size_t getSize() const override { return Size; }
+  void writeTo(uint8_t *buf) override;
+  size_t getSize() const override { return size; }
   bool updateAllocSize() override;
   void finalizeContents() override;
-  bool empty() const override;
+  bool isNeeded() const override;
 
   // Join separate GOTs built for each input file to generate
   // primary and optional multiple secondary GOTs.
-  template <class ELFT> void build();
+  void build();
 
-  void addEntry(InputFile &File, Symbol &Sym, int64_t Addend, RelExpr Expr);
-  void addDynTlsEntry(InputFile &File, Symbol &Sym);
-  void addTlsIndex(InputFile &File);
+  void addEntry(InputFile &file, Symbol &sym, int64_t addend, RelExpr expr);
+  void addDynTlsEntry(InputFile &file, Symbol &sym);
+  void addTlsIndex(InputFile &file);
 
-  uint64_t getPageEntryOffset(const InputFile *F, const Symbol &S,
-                              int64_t Addend) const;
-  uint64_t getSymEntryOffset(const InputFile *F, const Symbol &S,
-                             int64_t Addend) const;
-  uint64_t getGlobalDynOffset(const InputFile *F, const Symbol &S) const;
-  uint64_t getTlsIndexOffset(const InputFile *F) const;
+  uint64_t getPageEntryOffset(const InputFile *f, const Symbol &s,
+                              int64_t addend) const;
+  uint64_t getSymEntryOffset(const InputFile *f, const Symbol &s,
+                             int64_t addend) const;
+  uint64_t getGlobalDynOffset(const InputFile *f, const Symbol &s) const;
+  uint64_t getTlsIndexOffset(const InputFile *f) const;
 
   // Returns the symbol which corresponds to the first entry of the global part
   // of GOT on MIPS platform. It is required to fill up MIPS-specific dynamic
@@ -215,7 +224,7 @@ public:
   unsigned getLocalEntriesNum() const;
 
   // Return _gp value for primary GOT (nullptr) or particular input file.
-  uint64_t getGp(const InputFile *F = nullptr) const;
+  uint64_t getGp(const InputFile *f = nullptr) const;
 
 private:
   // MIPS GOT consists of three parts: local, global and tls. Each part
@@ -305,34 +314,35 @@ private:
   // https://dmz-portal.mips.com/wiki/MIPS_Multi_GOT
 
   // Number of "Header" entries.
-  static const unsigned HeaderEntriesNum = 2;
+  static const unsigned headerEntriesNum = 2;
 
-  uint64_t Size = 0;
+  uint64_t size = 0;
 
   // Symbol and addend.
-  typedef std::pair<Symbol *, int64_t> GotEntry;
+  using GotEntry = std::pair<Symbol *, int64_t>;
 
   struct FileGot {
-    InputFile *File = nullptr;
-    size_t StartIndex = 0;
+    InputFile *file = nullptr;
+    size_t startIndex = 0;
 
     struct PageBlock {
-      size_t FirstIndex = 0;
-      size_t Count = 0;
+      size_t firstIndex;
+      size_t count;
+      PageBlock() : firstIndex(0), count(0) {}
     };
 
     // Map output sections referenced by MIPS GOT relocations
     // to the description (index/count) "page" entries allocated
     // for this section.
-    llvm::SmallMapVector<const OutputSection *, PageBlock, 16> PagesMap;
+    llvm::SmallMapVector<const OutputSection *, PageBlock, 16> pagesMap;
     // Maps from Symbol+Addend pair or just Symbol to the GOT entry index.
-    llvm::MapVector<GotEntry, size_t> Local16;
-    llvm::MapVector<GotEntry, size_t> Local32;
-    llvm::MapVector<Symbol *, size_t> Global;
-    llvm::MapVector<Symbol *, size_t> Relocs;
-    llvm::MapVector<Symbol *, size_t> Tls;
+    llvm::MapVector<GotEntry, size_t> local16;
+    llvm::MapVector<GotEntry, size_t> local32;
+    llvm::MapVector<Symbol *, size_t> global;
+    llvm::MapVector<Symbol *, size_t> relocs;
+    llvm::MapVector<Symbol *, size_t> tls;
     // Set of symbols referenced by dynamic TLS relocations.
-    llvm::MapVector<Symbol *, size_t> DynTlsSymbols;
+    llvm::MapVector<Symbol *, size_t> dynTlsSymbols;
 
     // Total number of all entries.
     size_t getEntriesNum() const;
@@ -345,27 +355,31 @@ private:
   // Container of GOT created for each input file.
   // After building a final series of GOTs this container
   // holds primary and secondary GOT's.
-  std::vector<FileGot> Gots;
+  std::vector<FileGot> gots;
 
   // Return (and create if necessary) `FileGot`.
-  FileGot &getGot(InputFile &F);
+  FileGot &getGot(InputFile &f);
 
   // Try to merge two GOTs. In case of success the `Dst` contains
   // result of merging and the function returns true. In case of
   // ovwerflow the `Dst` is unchanged and the function returns false.
-  bool tryMergeGots(FileGot & Dst, FileGot & Src, bool IsPrimary);
+  bool tryMergeGots(FileGot & dst, FileGot & src, bool isPrimary);
 };
 
 class GotPltSection final : public SyntheticSection {
 public:
   GotPltSection();
-  void addEntry(Symbol &Sym);
+  void addEntry(Symbol &sym);
   size_t getSize() const override;
-  void writeTo(uint8_t *Buf) override;
-  bool empty() const override;
+  void writeTo(uint8_t *buf) override;
+  bool isNeeded() const override;
+
+  // Flag to force GotPlt to be in output if we have relocations
+  // that relies on its address.
+  bool hasGotPltOffRel = false;
 
 private:
-  std::vector<const Symbol *> Entries;
+  std::vector<const Symbol *> entries;
 };
 
 // The IgotPltSection is a Got associated with the PltSection for GNU Ifunc
@@ -375,167 +389,164 @@ private:
 class IgotPltSection final : public SyntheticSection {
 public:
   IgotPltSection();
-  void addEntry(Symbol &Sym);
+  void addEntry(Symbol &sym);
   size_t getSize() const override;
-  void writeTo(uint8_t *Buf) override;
-  bool empty() const override { return Entries.empty(); }
+  void writeTo(uint8_t *buf) override;
+  bool isNeeded() const override { return !entries.empty(); }
 
 private:
-  std::vector<const Symbol *> Entries;
+  std::vector<const Symbol *> entries;
 };
 
 class StringTableSection final : public SyntheticSection {
 public:
-  StringTableSection(StringRef Name, bool Dynamic);
-  unsigned addString(StringRef S, bool HashIt = true);
-  void writeTo(uint8_t *Buf) override;
-  size_t getSize() const override { return Size; }
-  bool isDynamic() const { return Dynamic; }
+  StringTableSection(StringRef name, bool dynamic);
+  unsigned addString(StringRef s, bool hashIt = true);
+  void writeTo(uint8_t *buf) override;
+  size_t getSize() const override { return size; }
+  bool isDynamic() const { return dynamic; }
 
 private:
-  const bool Dynamic;
+  const bool dynamic;
 
-  uint64_t Size = 0;
+  uint64_t size = 0;
 
-  llvm::DenseMap<StringRef, unsigned> StringMap;
-  std::vector<StringRef> Strings;
+  llvm::DenseMap<StringRef, unsigned> stringMap;
+  std::vector<StringRef> strings;
 };
 
 class DynamicReloc {
 public:
-  DynamicReloc(RelType Type, const InputSectionBase *InputSec,
-               uint64_t OffsetInSec, bool UseSymVA, Symbol *Sym, int64_t Addend)
-      : Type(Type), Sym(Sym), InputSec(InputSec), OffsetInSec(OffsetInSec),
-        UseSymVA(UseSymVA), Addend(Addend), OutputSec(nullptr) {}
+  DynamicReloc(RelType type, const InputSectionBase *inputSec,
+               uint64_t offsetInSec, bool useSymVA, Symbol *sym, int64_t addend)
+      : type(type), sym(sym), inputSec(inputSec), offsetInSec(offsetInSec),
+        useSymVA(useSymVA), addend(addend), outputSec(nullptr) {}
   // This constructor records dynamic relocation settings used by MIPS
   // multi-GOT implementation. It's to relocate addresses of 64kb pages
   // lie inside the output section.
-  DynamicReloc(RelType Type, const InputSectionBase *InputSec,
-               uint64_t OffsetInSec, const OutputSection *OutputSec,
-               int64_t Addend)
-      : Type(Type), Sym(nullptr), InputSec(InputSec), OffsetInSec(OffsetInSec),
-        UseSymVA(false), Addend(Addend), OutputSec(OutputSec) {}
+  DynamicReloc(RelType type, const InputSectionBase *inputSec,
+               uint64_t offsetInSec, const OutputSection *outputSec,
+               int64_t addend)
+      : type(type), sym(nullptr), inputSec(inputSec), offsetInSec(offsetInSec),
+        useSymVA(false), addend(addend), outputSec(outputSec) {}
 
   uint64_t getOffset() const;
-  uint32_t getSymIndex() const;
-  const InputSectionBase *getInputSec() const { return InputSec; }
+  uint32_t getSymIndex(SymbolTableBaseSection *symTab) const;
 
   // Computes the addend of the dynamic relocation. Note that this is not the
-  // same as the Addend member variable as it also includes the symbol address
-  // if UseSymVA is true.
+  // same as the addend member variable as it also includes the symbol address
+  // if useSymVA is true.
   int64_t computeAddend() const;
 
-  RelType Type;
+  RelType type;
 
-private:
-  Symbol *Sym;
-  const InputSectionBase *InputSec = nullptr;
-  uint64_t OffsetInSec;
+  Symbol *sym;
+  const InputSectionBase *inputSec = nullptr;
+  uint64_t offsetInSec;
   // If this member is true, the dynamic relocation will not be against the
   // symbol but will instead be a relative relocation that simply adds the
   // load address. This means we need to write the symbol virtual address
   // plus the original addend as the final relocation addend.
-  bool UseSymVA;
-  int64_t Addend;
-  const OutputSection *OutputSec;
+  bool useSymVA;
+  int64_t addend;
+  const OutputSection *outputSec;
 };
 
 template <class ELFT> class DynamicSection final : public SyntheticSection {
-  typedef typename ELFT::Dyn Elf_Dyn;
-  typedef typename ELFT::Rel Elf_Rel;
-  typedef typename ELFT::Rela Elf_Rela;
-  typedef typename ELFT::Relr Elf_Relr;
-  typedef typename ELFT::Shdr Elf_Shdr;
-  typedef typename ELFT::Sym Elf_Sym;
+  using Elf_Dyn = typename ELFT::Dyn;
+  using Elf_Rel = typename ELFT::Rel;
+  using Elf_Rela = typename ELFT::Rela;
+  using Elf_Relr = typename ELFT::Relr;
+  using Elf_Shdr = typename ELFT::Shdr;
+  using Elf_Sym = typename ELFT::Sym;
 
   // finalizeContents() fills this vector with the section contents.
-  std::vector<std::pair<int32_t, std::function<uint64_t()>>> Entries;
+  std::vector<std::pair<int32_t, std::function<uint64_t()>>> entries;
 
 public:
   DynamicSection();
   void finalizeContents() override;
-  void writeTo(uint8_t *Buf) override;
-  size_t getSize() const override { return Size; }
+  void writeTo(uint8_t *buf) override;
+  size_t getSize() const override { return size; }
 
 private:
-  void add(int32_t Tag, std::function<uint64_t()> Fn);
-  void addInt(int32_t Tag, uint64_t Val);
-  void addInSec(int32_t Tag, InputSection *Sec);
-  void addInSecRelative(int32_t Tag, InputSection *Sec);
-  void addOutSec(int32_t Tag, OutputSection *Sec);
-  void addSize(int32_t Tag, OutputSection *Sec);
-  void addSym(int32_t Tag, Symbol *Sym);
+  void add(int32_t tag, std::function<uint64_t()> fn);
+  void addInt(int32_t tag, uint64_t val);
+  void addInSec(int32_t tag, InputSection *sec);
+  void addInSecRelative(int32_t tag, InputSection *sec);
+  void addOutSec(int32_t tag, OutputSection *sec);
+  void addSize(int32_t tag, OutputSection *sec);
+  void addSym(int32_t tag, Symbol *sym);
 
-  uint64_t Size = 0;
+  uint64_t size = 0;
 };
 
 class RelocationBaseSection : public SyntheticSection {
 public:
-  RelocationBaseSection(StringRef Name, uint32_t Type, int32_t DynamicTag,
-                        int32_t SizeDynamicTag);
-  void addReloc(RelType DynType, InputSectionBase *IS, uint64_t OffsetInSec,
-                Symbol *Sym);
+  RelocationBaseSection(StringRef name, uint32_t type, int32_t dynamicTag,
+                        int32_t sizeDynamicTag);
+  void addReloc(RelType dynType, InputSectionBase *isec, uint64_t offsetInSec,
+                Symbol *sym);
   // Add a dynamic relocation that might need an addend. This takes care of
   // writing the addend to the output section if needed.
-  void addReloc(RelType DynType, InputSectionBase *InputSec,
-                uint64_t OffsetInSec, Symbol *Sym, int64_t Addend, RelExpr Expr,
-                RelType Type);
-  void addReloc(const DynamicReloc &Reloc);
-  bool empty() const override { return Relocs.empty(); }
-  size_t getSize() const override { return Relocs.size() * this->Entsize; }
-  size_t getRelativeRelocCount() const { return NumRelativeRelocs; }
+  void addReloc(RelType dynType, InputSectionBase *inputSec,
+                uint64_t offsetInSec, Symbol *sym, int64_t addend, RelExpr expr,
+                RelType type);
+  void addReloc(const DynamicReloc &reloc);
+  bool isNeeded() const override { return !relocs.empty(); }
+  size_t getSize() const override { return relocs.size() * this->entsize; }
+  size_t getRelativeRelocCount() const { return numRelativeRelocs; }
   void finalizeContents() override;
-  int32_t DynamicTag, SizeDynamicTag;
+  int32_t dynamicTag, sizeDynamicTag;
+  std::vector<DynamicReloc> relocs;
 
 protected:
-  std::vector<DynamicReloc> Relocs;
-  size_t NumRelativeRelocs = 0;
+  size_t numRelativeRelocs = 0;
 };
 
 template <class ELFT>
 class RelocationSection final : public RelocationBaseSection {
-  typedef typename ELFT::Rel Elf_Rel;
-  typedef typename ELFT::Rela Elf_Rela;
+  using Elf_Rel = typename ELFT::Rel;
+  using Elf_Rela = typename ELFT::Rela;
 
 public:
-  RelocationSection(StringRef Name, bool Sort);
-  unsigned getRelocOffset();
-  void writeTo(uint8_t *Buf) override;
+  RelocationSection(StringRef name, bool sort);
+  void writeTo(uint8_t *buf) override;
 
 private:
-  bool Sort;
+  bool sort;
 };
 
 template <class ELFT>
 class AndroidPackedRelocationSection final : public RelocationBaseSection {
-  typedef typename ELFT::Rel Elf_Rel;
-  typedef typename ELFT::Rela Elf_Rela;
+  using Elf_Rel = typename ELFT::Rel;
+  using Elf_Rela = typename ELFT::Rela;
 
 public:
-  AndroidPackedRelocationSection(StringRef Name);
+  AndroidPackedRelocationSection(StringRef name);
 
   bool updateAllocSize() override;
-  size_t getSize() const override { return RelocData.size(); }
-  void writeTo(uint8_t *Buf) override {
-    memcpy(Buf, RelocData.data(), RelocData.size());
+  size_t getSize() const override { return relocData.size(); }
+  void writeTo(uint8_t *buf) override {
+    memcpy(buf, relocData.data(), relocData.size());
   }
 
 private:
-  SmallVector<char, 0> RelocData;
+  SmallVector<char, 0> relocData;
 };
 
 struct RelativeReloc {
-  uint64_t getOffset() const { return InputSec->getVA(OffsetInSec); }
+  uint64_t getOffset() const { return inputSec->getVA(offsetInSec); }
 
-  const InputSectionBase *InputSec;
-  uint64_t OffsetInSec;
+  const InputSectionBase *inputSec;
+  uint64_t offsetInSec;
 };
 
 class RelrBaseSection : public SyntheticSection {
 public:
   RelrBaseSection();
-  bool empty() const override { return Relocs.empty(); }
-  std::vector<RelativeReloc> Relocs;
+  bool isNeeded() const override { return !relocs.empty(); }
+  std::vector<RelativeReloc> relocs;
 };
 
 // RelrSection is used to encode offsets for relative relocations.
@@ -543,65 +554,65 @@ public:
 //   https://groups.google.com/forum/#!topic/generic-abi/bX460iggiKg
 // For more details, see the comment in RelrSection::updateAllocSize().
 template <class ELFT> class RelrSection final : public RelrBaseSection {
-  typedef typename ELFT::Relr Elf_Relr;
+  using Elf_Relr = typename ELFT::Relr;
 
 public:
   RelrSection();
 
   bool updateAllocSize() override;
-  size_t getSize() const override { return RelrRelocs.size() * this->Entsize; }
-  void writeTo(uint8_t *Buf) override {
-    memcpy(Buf, RelrRelocs.data(), getSize());
+  size_t getSize() const override { return relrRelocs.size() * this->entsize; }
+  void writeTo(uint8_t *buf) override {
+    memcpy(buf, relrRelocs.data(), getSize());
   }
 
 private:
-  std::vector<Elf_Relr> RelrRelocs;
+  std::vector<Elf_Relr> relrRelocs;
 };
 
 struct SymbolTableEntry {
-  Symbol *Sym;
-  size_t StrTabOffset;
+  Symbol *sym;
+  size_t strTabOffset;
 };
 
 class SymbolTableBaseSection : public SyntheticSection {
 public:
-  SymbolTableBaseSection(StringTableSection &StrTabSec);
+  SymbolTableBaseSection(StringTableSection &strTabSec);
   void finalizeContents() override;
-  size_t getSize() const override { return getNumSymbols() * Entsize; }
-  void addSymbol(Symbol *Sym);
-  unsigned getNumSymbols() const { return Symbols.size() + 1; }
-  size_t getSymbolIndex(Symbol *Sym);
-  ArrayRef<SymbolTableEntry> getSymbols() const { return Symbols; }
+  size_t getSize() const override { return getNumSymbols() * entsize; }
+  void addSymbol(Symbol *sym);
+  unsigned getNumSymbols() const { return symbols.size() + 1; }
+  size_t getSymbolIndex(Symbol *sym);
+  ArrayRef<SymbolTableEntry> getSymbols() const { return symbols; }
 
 protected:
   void sortSymTabSymbols();
 
   // A vector of symbols and their string table offsets.
-  std::vector<SymbolTableEntry> Symbols;
+  std::vector<SymbolTableEntry> symbols;
 
-  StringTableSection &StrTabSec;
+  StringTableSection &strTabSec;
 
-  llvm::once_flag OnceFlag;
-  llvm::DenseMap<Symbol *, size_t> SymbolIndexMap;
-  llvm::DenseMap<OutputSection *, size_t> SectionIndexMap;
+  llvm::once_flag onceFlag;
+  llvm::DenseMap<Symbol *, size_t> symbolIndexMap;
+  llvm::DenseMap<OutputSection *, size_t> sectionIndexMap;
 };
 
 template <class ELFT>
 class SymbolTableSection final : public SymbolTableBaseSection {
-  typedef typename ELFT::Sym Elf_Sym;
+  using Elf_Sym = typename ELFT::Sym;
 
 public:
-  SymbolTableSection(StringTableSection &StrTabSec);
-  void writeTo(uint8_t *Buf) override;
+  SymbolTableSection(StringTableSection &strTabSec);
+  void writeTo(uint8_t *buf) override;
 };
 
 class SymtabShndxSection final : public SyntheticSection {
 public:
   SymtabShndxSection();
 
-  void writeTo(uint8_t *Buf) override;
+  void writeTo(uint8_t *buf) override;
   size_t getSize() const override;
-  bool empty() const override;
+  bool isNeeded() const override;
   void finalizeContents() override;
 };
 
@@ -611,42 +622,42 @@ class GnuHashTableSection final : public SyntheticSection {
 public:
   GnuHashTableSection();
   void finalizeContents() override;
-  void writeTo(uint8_t *Buf) override;
-  size_t getSize() const override { return Size; }
+  void writeTo(uint8_t *buf) override;
+  size_t getSize() const override { return size; }
 
   // Adds symbols to the hash table.
   // Sorts the input to satisfy GNU hash section requirements.
-  void addSymbols(std::vector<SymbolTableEntry> &Symbols);
+  void addSymbols(std::vector<SymbolTableEntry> &symbols);
 
 private:
   // See the comment in writeBloomFilter.
   enum { Shift2 = 26 };
 
-  void writeBloomFilter(uint8_t *Buf);
-  void writeHashTable(uint8_t *Buf);
+  void writeBloomFilter(uint8_t *buf);
+  void writeHashTable(uint8_t *buf);
 
   struct Entry {
-    Symbol *Sym;
-    size_t StrTabOffset;
-    uint32_t Hash;
-    uint32_t BucketIdx;
+    Symbol *sym;
+    size_t strTabOffset;
+    uint32_t hash;
+    uint32_t bucketIdx;
   };
 
-  std::vector<Entry> Symbols;
-  size_t MaskWords;
-  size_t NBuckets = 0;
-  size_t Size = 0;
+  std::vector<Entry> symbols;
+  size_t maskWords;
+  size_t nBuckets = 0;
+  size_t size = 0;
 };
 
 class HashTableSection final : public SyntheticSection {
 public:
   HashTableSection();
   void finalizeContents() override;
-  void writeTo(uint8_t *Buf) override;
-  size_t getSize() const override { return Size; }
+  void writeTo(uint8_t *buf) override;
+  size_t getSize() const override { return size; }
 
 private:
-  size_t Size = 0;
+  size_t size = 0;
 };
 
 // The PltSection is used for both the Plt and Iplt. The former usually has a
@@ -655,67 +666,66 @@ private:
 // Target->IRelativeRel.
 class PltSection : public SyntheticSection {
 public:
-  PltSection(bool IsIplt);
-  void writeTo(uint8_t *Buf) override;
+  PltSection(bool isIplt);
+  void writeTo(uint8_t *buf) override;
   size_t getSize() const override;
-  bool empty() const override { return Entries.empty(); }
+  bool isNeeded() const override { return !entries.empty(); }
   void addSymbols();
-  template <class ELFT> void addEntry(Symbol &Sym);
+  template <class ELFT> void addEntry(Symbol &sym);
 
-  size_t HeaderSize;
+  size_t headerSize;
 
 private:
-  unsigned getPltRelocOff() const;
-  std::vector<std::pair<const Symbol *, unsigned>> Entries;
-  bool IsIplt;
+  std::vector<const Symbol *> entries;
+  bool isIplt;
 };
 
 class GdbIndexSection final : public SyntheticSection {
 public:
   struct AddressEntry {
-    InputSection *Section;
-    uint64_t LowAddress;
-    uint64_t HighAddress;
-    uint32_t CuIndex;
+    InputSection *section;
+    uint64_t lowAddress;
+    uint64_t highAddress;
+    uint32_t cuIndex;
   };
 
   struct CuEntry {
-    uint64_t CuOffset;
-    uint64_t CuLength;
+    uint64_t cuOffset;
+    uint64_t cuLength;
   };
 
   struct NameAttrEntry {
-    llvm::CachedHashStringRef Name;
-    uint32_t CuIndexAndAttrs;
+    llvm::CachedHashStringRef name;
+    uint32_t cuIndexAndAttrs;
   };
 
   struct GdbChunk {
-    InputSection *Sec;
-    std::vector<AddressEntry> AddressAreas;
-    std::vector<CuEntry> CompilationUnits;
+    InputSection *sec;
+    std::vector<AddressEntry> addressAreas;
+    std::vector<CuEntry> compilationUnits;
   };
 
   struct GdbSymbol {
-    llvm::CachedHashStringRef Name;
-    std::vector<uint32_t> CuVector;
-    uint32_t NameOff;
-    uint32_t CuVectorOff;
+    llvm::CachedHashStringRef name;
+    std::vector<uint32_t> cuVector;
+    uint32_t nameOff;
+    uint32_t cuVectorOff;
   };
 
   GdbIndexSection();
   template <typename ELFT> static GdbIndexSection *create();
-  void writeTo(uint8_t *Buf) override;
-  size_t getSize() const override { return Size; }
-  bool empty() const override;
+  void writeTo(uint8_t *buf) override;
+  size_t getSize() const override { return size; }
+  bool isNeeded() const override;
 
 private:
   struct GdbIndexHeader {
-    llvm::support::ulittle32_t Version;
-    llvm::support::ulittle32_t CuListOff;
-    llvm::support::ulittle32_t CuTypesOff;
-    llvm::support::ulittle32_t AddressAreaOff;
-    llvm::support::ulittle32_t SymtabOff;
-    llvm::support::ulittle32_t ConstantPoolOff;
+    llvm::support::ulittle32_t version;
+    llvm::support::ulittle32_t cuListOff;
+    llvm::support::ulittle32_t cuTypesOff;
+    llvm::support::ulittle32_t addressAreaOff;
+    llvm::support::ulittle32_t symtabOff;
+    llvm::support::ulittle32_t constantPoolOff;
   };
 
   void initOutputSize();
@@ -723,12 +733,12 @@ private:
 
   // Each chunk contains information gathered from debug sections of a
   // single object file.
-  std::vector<GdbChunk> Chunks;
+  std::vector<GdbChunk> chunks;
 
   // A symbol table for this .gdb_index section.
-  std::vector<GdbSymbol> Symbols;
+  std::vector<GdbSymbol> symbols;
 
-  size_t Size;
+  size_t size;
 };
 
 // --eh-frame-hdr option tells linker to construct a header for all the
@@ -743,9 +753,10 @@ private:
 class EhFrameHeader final : public SyntheticSection {
 public:
   EhFrameHeader();
-  void writeTo(uint8_t *Buf) override;
+  void write();
+  void writeTo(uint8_t *buf) override;
   size_t getSize() const override;
-  bool empty() const override;
+  bool isNeeded() const override;
 };
 
 // For more information about .gnu.version and .gnu.version_r see:
@@ -761,13 +772,15 @@ public:
   VersionDefinitionSection();
   void finalizeContents() override;
   size_t getSize() const override;
-  void writeTo(uint8_t *Buf) override;
+  void writeTo(uint8_t *buf) override;
 
 private:
   enum { EntrySize = 28 };
-  void writeOne(uint8_t *Buf, uint32_t Index, StringRef Name, size_t NameOff);
+  void writeOne(uint8_t *buf, uint32_t index, StringRef name, size_t nameOff);
+  StringRef getFileDefName();
 
-  unsigned FileDefNameOff;
+  unsigned fileDefNameOff;
+  std::vector<unsigned> verDefNameOffs;
 };
 
 // The .gnu.version section specifies the required version of each symbol in the
@@ -776,14 +789,13 @@ private:
 // identifier defined in the either .gnu.version_r or .gnu.version_d section.
 // The values 0 and 1 are reserved. All other values are used for versions in
 // the own object or in any of the dependencies.
-template <class ELFT>
 class VersionTableSection final : public SyntheticSection {
 public:
   VersionTableSection();
   void finalizeContents() override;
   size_t getSize() const override;
-  void writeTo(uint8_t *Buf) override;
-  bool empty() const override;
+  void writeTo(uint8_t *buf) override;
+  bool isNeeded() const override;
 };
 
 // The .gnu.version_r section defines the version identifiers used by
@@ -791,25 +803,30 @@ public:
 // Elf_Verneed specifies the version requirements for a single DSO, and contains
 // a reference to a linked list of Elf_Vernaux data structures which define the
 // mapping from version identifiers to version names.
-template <class ELFT> class VersionNeedSection final : public SyntheticSection {
-  typedef typename ELFT::Verneed Elf_Verneed;
-  typedef typename ELFT::Vernaux Elf_Vernaux;
+template <class ELFT>
+class VersionNeedSection final : public SyntheticSection {
+  using Elf_Verneed = typename ELFT::Verneed;
+  using Elf_Vernaux = typename ELFT::Vernaux;
 
-  // A vector of shared files that need Elf_Verneed data structures and the
-  // string table offsets of their sonames.
-  std::vector<std::pair<SharedFile<ELFT> *, size_t>> Needed;
+  struct Vernaux {
+    uint64_t hash;
+    uint32_t verneedIndex;
+    uint64_t nameStrTab;
+  };
 
-  // The next available version identifier.
-  unsigned NextIndex;
+  struct Verneed {
+    uint64_t nameStrTab;
+    std::vector<Vernaux> vernauxs;
+  };
+
+  std::vector<Verneed> verneeds;
 
 public:
   VersionNeedSection();
-  void addSymbol(Symbol *Sym);
   void finalizeContents() override;
-  void writeTo(uint8_t *Buf) override;
+  void writeTo(uint8_t *buf) override;
   size_t getSize() const override;
-  size_t getNeedNum() const { return Needed.size(); }
-  bool empty() const override;
+  bool isNeeded() const override;
 };
 
 // MergeSyntheticSection is a class that allows us to put mergeable sections
@@ -818,36 +835,36 @@ public:
 // attached to regular output sections.
 class MergeSyntheticSection : public SyntheticSection {
 public:
-  void addSection(MergeInputSection *MS);
-  std::vector<MergeInputSection *> Sections;
+  void addSection(MergeInputSection *ms);
+  std::vector<MergeInputSection *> sections;
 
 protected:
-  MergeSyntheticSection(StringRef Name, uint32_t Type, uint64_t Flags,
-                        uint32_t Alignment)
-      : SyntheticSection(Flags, Type, Alignment, Name) {}
+  MergeSyntheticSection(StringRef name, uint32_t type, uint64_t flags,
+                        uint32_t alignment)
+      : SyntheticSection(flags, type, alignment, name) {}
 };
 
 class MergeTailSection final : public MergeSyntheticSection {
 public:
-  MergeTailSection(StringRef Name, uint32_t Type, uint64_t Flags,
-                   uint32_t Alignment);
+  MergeTailSection(StringRef name, uint32_t type, uint64_t flags,
+                   uint32_t alignment);
 
   size_t getSize() const override;
-  void writeTo(uint8_t *Buf) override;
+  void writeTo(uint8_t *buf) override;
   void finalizeContents() override;
 
 private:
-  llvm::StringTableBuilder Builder;
+  llvm::StringTableBuilder builder;
 };
 
 class MergeNoTailSection final : public MergeSyntheticSection {
 public:
-  MergeNoTailSection(StringRef Name, uint32_t Type, uint64_t Flags,
-                     uint32_t Alignment)
-      : MergeSyntheticSection(Name, Type, Flags, Alignment) {}
+  MergeNoTailSection(StringRef name, uint32_t type, uint64_t flags,
+                     uint32_t alignment)
+      : MergeSyntheticSection(name, type, flags, alignment) {}
 
-  size_t getSize() const override { return Size; }
-  void writeTo(uint8_t *Buf) override;
+  size_t getSize() const override { return size; }
+  void writeTo(uint8_t *buf) override;
   void finalizeContents() override;
 
 private:
@@ -856,67 +873,68 @@ private:
   // because DenseMap also uses lower bits to determine a bucket ID.
   // If we use lower bits, it significantly increases the probability of
   // hash collisons.
-  size_t getShardId(uint32_t Hash) {
-    return Hash >> (32 - llvm::countTrailingZeros(NumShards));
+  size_t getShardId(uint32_t hash) {
+    assert((hash >> 31) == 0);
+    return hash >> (31 - llvm::countTrailingZeros(numShards));
   }
 
   // Section size
-  size_t Size;
+  size_t size;
 
   // String table contents
-  constexpr static size_t NumShards = 32;
-  std::vector<llvm::StringTableBuilder> Shards;
-  size_t ShardOffsets[NumShards];
+  constexpr static size_t numShards = 32;
+  std::vector<llvm::StringTableBuilder> shards;
+  size_t shardOffsets[numShards];
 };
 
 // .MIPS.abiflags section.
 template <class ELFT>
 class MipsAbiFlagsSection final : public SyntheticSection {
-  typedef llvm::object::Elf_Mips_ABIFlags<ELFT> Elf_Mips_ABIFlags;
+  using Elf_Mips_ABIFlags = llvm::object::Elf_Mips_ABIFlags<ELFT>;
 
 public:
   static MipsAbiFlagsSection *create();
 
-  MipsAbiFlagsSection(Elf_Mips_ABIFlags Flags);
+  MipsAbiFlagsSection(Elf_Mips_ABIFlags flags);
   size_t getSize() const override { return sizeof(Elf_Mips_ABIFlags); }
-  void writeTo(uint8_t *Buf) override;
+  void writeTo(uint8_t *buf) override;
 
 private:
-  Elf_Mips_ABIFlags Flags;
+  Elf_Mips_ABIFlags flags;
 };
 
 // .MIPS.options section.
 template <class ELFT> class MipsOptionsSection final : public SyntheticSection {
-  typedef llvm::object::Elf_Mips_Options<ELFT> Elf_Mips_Options;
-  typedef llvm::object::Elf_Mips_RegInfo<ELFT> Elf_Mips_RegInfo;
+  using Elf_Mips_Options = llvm::object::Elf_Mips_Options<ELFT>;
+  using Elf_Mips_RegInfo = llvm::object::Elf_Mips_RegInfo<ELFT>;
 
 public:
   static MipsOptionsSection *create();
 
-  MipsOptionsSection(Elf_Mips_RegInfo Reginfo);
-  void writeTo(uint8_t *Buf) override;
+  MipsOptionsSection(Elf_Mips_RegInfo reginfo);
+  void writeTo(uint8_t *buf) override;
 
   size_t getSize() const override {
     return sizeof(Elf_Mips_Options) + sizeof(Elf_Mips_RegInfo);
   }
 
 private:
-  Elf_Mips_RegInfo Reginfo;
+  Elf_Mips_RegInfo reginfo;
 };
 
 // MIPS .reginfo section.
 template <class ELFT> class MipsReginfoSection final : public SyntheticSection {
-  typedef llvm::object::Elf_Mips_RegInfo<ELFT> Elf_Mips_RegInfo;
+  using Elf_Mips_RegInfo = llvm::object::Elf_Mips_RegInfo<ELFT>;
 
 public:
   static MipsReginfoSection *create();
 
-  MipsReginfoSection(Elf_Mips_RegInfo Reginfo);
+  MipsReginfoSection(Elf_Mips_RegInfo reginfo);
   size_t getSize() const override { return sizeof(Elf_Mips_RegInfo); }
-  void writeTo(uint8_t *Buf) override;
+  void writeTo(uint8_t *buf) override;
 
 private:
-  Elf_Mips_RegInfo Reginfo;
+  Elf_Mips_RegInfo reginfo;
 };
 
 // This is a MIPS specific section to hold a space within the data segment
@@ -926,45 +944,115 @@ private:
 class MipsRldMapSection : public SyntheticSection {
 public:
   MipsRldMapSection();
-  size_t getSize() const override { return Config->Wordsize; }
-  void writeTo(uint8_t *Buf) override {}
+  size_t getSize() const override { return config->wordsize; }
+  void writeTo(uint8_t *buf) override {}
 };
 
-class ARMExidxSentinelSection : public SyntheticSection {
+// Representation of the combined .ARM.Exidx input sections. We process these
+// as a SyntheticSection like .eh_frame as we need to merge duplicate entries
+// and add terminating sentinel entries.
+//
+// The .ARM.exidx input sections after SHF_LINK_ORDER processing is done form
+// a table that the unwinder can derive (Addresses are encoded as offsets from
+// table):
+// | Address of function | Unwind instructions for function |
+// where the unwind instructions are either a small number of unwind or the
+// special EXIDX_CANTUNWIND entry representing no unwinding information.
+// When an exception is thrown from an address A, the unwinder searches the
+// table for the closest table entry with Address of function <= A. This means
+// that for two consecutive table entries:
+// | A1 | U1 |
+// | A2 | U2 |
+// The range of addresses described by U1 is [A1, A2)
+//
+// There are two cases where we need a linker generated table entry to fixup
+// the address ranges in the table
+// Case 1:
+// - A sentinel entry added with an address higher than all
+// executable sections. This was needed to work around libunwind bug pr31091.
+// - After address assignment we need to find the highest addressed executable
+// section and use the limit of that section so that the unwinder never
+// matches it.
+// Case 2:
+// - InputSections without a .ARM.exidx section (usually from Assembly)
+// need a table entry so that they terminate the range of the previously
+// function. This is pr40277.
+//
+// Instead of storing pointers to the .ARM.exidx InputSections from
+// InputObjects, we store pointers to the executable sections that need
+// .ARM.exidx sections. We can then use the dependentSections of these to
+// either find the .ARM.exidx section or know that we need to generate one.
+class ARMExidxSyntheticSection : public SyntheticSection {
 public:
-  ARMExidxSentinelSection();
-  size_t getSize() const override { return 8; }
-  void writeTo(uint8_t *Buf) override;
-  bool empty() const override;
+  ARMExidxSyntheticSection();
 
-  static bool classof(const SectionBase *D);
+  // Add an input section to the ARMExidxSyntheticSection. Returns whether the
+  // section needs to be removed from the main input section list.
+  bool addSection(InputSection *isec);
 
-  // The last section referenced by a regular .ARM.exidx section.
-  // It is found and filled in Writer<ELFT>::resolveShfLinkOrder().
-  // The sentinel points at the end of that section.
-  InputSection *Highest = nullptr;
+  size_t getSize() const override { return size; }
+  void writeTo(uint8_t *buf) override;
+  bool isNeeded() const override { return !empty; }
+  // Sort and remove duplicate entries.
+  void finalizeContents() override;
+  InputSection *getLinkOrderDep() const;
+
+  static bool classof(const SectionBase *d);
+
+  // Links to the ARMExidxSections so we can transfer the relocations once the
+  // layout is known.
+  std::vector<InputSection *> exidxSections;
+
+private:
+  size_t size;
+
+  // Empty if ExecutableSections contains no dependent .ARM.exidx sections.
+  bool empty = true;
+
+  // Instead of storing pointers to the .ARM.exidx InputSections from
+  // InputObjects, we store pointers to the executable sections that need
+  // .ARM.exidx sections. We can then use the dependentSections of these to
+  // either find the .ARM.exidx section or know that we need to generate one.
+  std::vector<InputSection *> executableSections;
+
+  // The executable InputSection with the highest address to use for the
+  // sentinel. We store separately from ExecutableSections as merging of
+  // duplicate entries may mean this InputSection is removed from
+  // ExecutableSections.
+  InputSection *sentinel = nullptr;
 };
 
 // A container for one or more linker generated thunks. Instances of these
 // thunks including ARM interworking and Mips LA25 PI to non-PI thunks.
 class ThunkSection : public SyntheticSection {
 public:
-  // ThunkSection in OS, with desired OutSecOff of Off
-  ThunkSection(OutputSection *OS, uint64_t Off);
+  // ThunkSection in OS, with desired outSecOff of Off
+  ThunkSection(OutputSection *os, uint64_t off);
 
   // Add a newly created Thunk to this container:
   // Thunk is given offset from start of this InputSection
   // Thunk defines a symbol in this InputSection that can be used as target
   // of a relocation
-  void addThunk(Thunk *T);
-  size_t getSize() const override { return Size; }
-  void writeTo(uint8_t *Buf) override;
+  void addThunk(Thunk *t);
+  size_t getSize() const override { return size; }
+  void writeTo(uint8_t *buf) override;
   InputSection *getTargetInputSection() const;
   bool assignOffsets();
 
 private:
-  std::vector<Thunk *> Thunks;
-  size_t Size = 0;
+  std::vector<Thunk *> thunks;
+  size_t size = 0;
+};
+
+// Used to compute outSecOff of .got2 in each object file. This is needed to
+// synthesize PLT entries for PPC32 Secure PLT ABI.
+class PPC32Got2Section final : public SyntheticSection {
+public:
+  PPC32Got2Section();
+  size_t getSize() const override { return 0; }
+  bool isNeeded() const override;
+  void finalizeContents() override;
+  void writeTo(uint8_t *buf) override {}
 };
 
 // This section is used to store the addresses of functions that are called
@@ -975,15 +1063,48 @@ private:
 class PPC64LongBranchTargetSection final : public SyntheticSection {
 public:
   PPC64LongBranchTargetSection();
-  void addEntry(Symbol &Sym);
+  void addEntry(Symbol &sym);
   size_t getSize() const override;
-  void writeTo(uint8_t *Buf) override;
-  bool empty() const override;
-  void finalizeContents() override { Finalized = true; }
+  void writeTo(uint8_t *buf) override;
+  bool isNeeded() const override;
+  void finalizeContents() override { finalized = true; }
 
 private:
-  std::vector<const Symbol *> Entries;
-  bool Finalized = false;
+  std::vector<const Symbol *> entries;
+  bool finalized = false;
+};
+
+template <typename ELFT>
+class PartitionElfHeaderSection : public SyntheticSection {
+public:
+  PartitionElfHeaderSection();
+  size_t getSize() const override;
+  void writeTo(uint8_t *buf) override;
+};
+
+template <typename ELFT>
+class PartitionProgramHeadersSection : public SyntheticSection {
+public:
+  PartitionProgramHeadersSection();
+  size_t getSize() const override;
+  void writeTo(uint8_t *buf) override;
+};
+
+class PartitionIndexSection : public SyntheticSection {
+public:
+  PartitionIndexSection();
+  size_t getSize() const override;
+  void finalizeContents() override;
+  void writeTo(uint8_t *buf) override;
+};
+
+// Create a dummy .sdata for __global_pointer$ if .sdata does not exist.
+class RISCVSdataSection final : public SyntheticSection {
+public:
+  RISCVSdataSection();
+  size_t getSize() const override { return 0; }
+  bool isNeeded() const override;
+  void writeTo(uint8_t *buf) override {}
 };
 
 InputSection *createInterpSection();
@@ -991,52 +1112,76 @@ MergeInputSection *createCommentSection();
 template <class ELFT> void splitSections();
 void mergeSections();
 
-Defined *addSyntheticLocal(StringRef Name, uint8_t Type, uint64_t Value,
-                           uint64_t Size, InputSectionBase &Section);
+template <typename ELFT> void writeEhdr(uint8_t *buf, Partition &part);
+template <typename ELFT> void writePhdrs(uint8_t *buf, Partition &part);
 
-// Linker generated sections which can be used as inputs.
+Defined *addSyntheticLocal(StringRef name, uint8_t type, uint64_t value,
+                           uint64_t size, InputSectionBase &section);
+
+void addVerneed(Symbol *ss);
+
+// Linker generated per-partition sections.
+struct Partition {
+  StringRef name;
+  uint64_t nameStrTab;
+
+  SyntheticSection *elfHeader;
+  SyntheticSection *programHeaders;
+  std::vector<PhdrEntry *> phdrs;
+
+  ARMExidxSyntheticSection *armExidx;
+  BuildIdSection *buildId;
+  SyntheticSection *dynamic;
+  StringTableSection *dynStrTab;
+  SymbolTableBaseSection *dynSymTab;
+  EhFrameHeader *ehFrameHdr;
+  EhFrameSection *ehFrame;
+  GnuHashTableSection *gnuHashTab;
+  HashTableSection *hashTab;
+  RelocationBaseSection *relaDyn;
+  RelrBaseSection *relrDyn;
+  VersionDefinitionSection *verDef;
+  SyntheticSection *verNeed;
+  VersionTableSection *verSym;
+
+  unsigned getNumber() const { return this - &partitions[0] + 1; }
+};
+
+extern Partition *mainPart;
+
+inline Partition &SectionBase::getPartition() const {
+  assert(isLive());
+  return partitions[partition - 1];
+}
+
+// Linker generated sections which can be used as inputs and are not specific to
+// a partition.
 struct InStruct {
-  InputSection *ARMAttributes;
-  BssSection *Bss;
-  BssSection *BssRelRo;
-  BuildIdSection *BuildId;
-  EhFrameHeader *EhFrameHdr;
-  EhFrameSection *EhFrame;
-  SyntheticSection *Dynamic;
-  StringTableSection *DynStrTab;
-  SymbolTableBaseSection *DynSymTab;
-  GnuHashTableSection *GnuHashTab;
-  HashTableSection *HashTab;
-  InputSection *Interp;
-  GdbIndexSection *GdbIndex;
-  GotSection *Got;
-  GotPltSection *GotPlt;
-  IgotPltSection *IgotPlt;
-  PPC64LongBranchTargetSection *PPC64LongBranchTarget;
-  MipsGotSection *MipsGot;
-  MipsRldMapSection *MipsRldMap;
-  PltSection *Plt;
-  PltSection *Iplt;
-  RelocationBaseSection *RelaDyn;
-  RelrBaseSection *RelrDyn;
-  RelocationBaseSection *RelaPlt;
-  RelocationBaseSection *RelaIplt;
-  StringTableSection *ShStrTab;
-  StringTableSection *StrTab;
-  SymbolTableBaseSection *SymTab;
-  SymtabShndxSection *SymTabShndx;
-  VersionDefinitionSection *VerDef;
+  InputSection *armAttributes;
+  BssSection *bss;
+  BssSection *bssRelRo;
+  GotSection *got;
+  GotPltSection *gotPlt;
+  IgotPltSection *igotPlt;
+  PPC64LongBranchTargetSection *ppc64LongBranchTarget;
+  MipsGotSection *mipsGot;
+  MipsRldMapSection *mipsRldMap;
+  SyntheticSection *partEnd;
+  SyntheticSection *partIndex;
+  PltSection *plt;
+  PltSection *iplt;
+  PPC32Got2Section *ppc32Got2;
+  RISCVSdataSection *riscvSdata;
+  RelocationBaseSection *relaPlt;
+  RelocationBaseSection *relaIplt;
+  StringTableSection *shStrTab;
+  StringTableSection *strTab;
+  SymbolTableBaseSection *symTab;
+  SymtabShndxSection *symTabShndx;
 };
 
-extern InStruct In;
+extern InStruct in;
 
-template <class ELFT> struct InX {
-  static VersionTableSection<ELFT> *VerSym;
-  static VersionNeedSection<ELFT> *VerNeed;
-};
-
-template <class ELFT> VersionTableSection<ELFT> *InX<ELFT>::VerSym;
-template <class ELFT> VersionNeedSection<ELFT> *InX<ELFT>::VerNeed;
 } // namespace elf
 } // namespace lld
 
diff --git a/deps/lld/ELF/Target.cpp b/deps/lld/ELF/Target.cpp
index 01073a62cfd6a1f4151eb9530e6c04c61d2302da..d07478a5178c3463f805af1fd7a5ddcf8c4e8188 100644
--- a/deps/lld/ELF/Target.cpp
+++ b/deps/lld/ELF/Target.cpp
@@ -1,9 +1,8 @@
 //===- Target.cpp ---------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -38,17 +37,17 @@ using namespace llvm::ELF;
 using namespace lld;
 using namespace lld::elf;
 
-TargetInfo *elf::Target;
+const TargetInfo *elf::target;
 
-std::string lld::toString(RelType Type) {
-  StringRef S = getELFRelocationTypeName(elf::Config->EMachine, Type);
-  if (S == "Unknown")
-    return ("Unknown (" + Twine(Type) + ")").str();
-  return S;
+std::string lld::toString(RelType type) {
+  StringRef s = getELFRelocationTypeName(elf::config->emachine, type);
+  if (s == "Unknown")
+    return ("Unknown (" + Twine(type) + ")").str();
+  return s;
 }
 
 TargetInfo *elf::getTarget() {
-  switch (Config->EMachine) {
+  switch (config->emachine) {
   case EM_386:
   case EM_IAMCU:
     return getX86TargetInfo();
@@ -63,7 +62,7 @@ TargetInfo *elf::getTarget() {
   case EM_HEXAGON:
     return getHexagonTargetInfo();
   case EM_MIPS:
-    switch (Config->EKind) {
+    switch (config->ekind) {
     case ELF32LEKind:
       return getMipsTargetInfo<ELF32LE>();
     case ELF32BEKind:
@@ -86,36 +85,34 @@ TargetInfo *elf::getTarget() {
   case EM_SPARCV9:
     return getSPARCV9TargetInfo();
   case EM_X86_64:
-    if (Config->EKind == ELF32LEKind)
-      return getX32TargetInfo();
     return getX86_64TargetInfo();
   }
   llvm_unreachable("unknown target machine");
 }
 
-template <class ELFT> static ErrorPlace getErrPlace(const uint8_t *Loc) {
-  for (InputSectionBase *D : InputSections) {
-    auto *IS = cast<InputSection>(D);
-    if (!IS->getParent())
+template <class ELFT> static ErrorPlace getErrPlace(const uint8_t *loc) {
+  for (InputSectionBase *d : inputSections) {
+    auto *isec = cast<InputSection>(d);
+    if (!isec->getParent())
       continue;
 
-    uint8_t *ISLoc = IS->getParent()->Loc + IS->OutSecOff;
-    if (ISLoc <= Loc && Loc < ISLoc + IS->getSize())
-      return {IS, IS->template getLocation<ELFT>(Loc - ISLoc) + ": "};
+    uint8_t *isecLoc = Out::bufferStart + isec->getParent()->offset + isec->outSecOff;
+    if (isecLoc <= loc && loc < isecLoc + isec->getSize())
+      return {isec, isec->template getLocation<ELFT>(loc - isecLoc) + ": "};
   }
   return {};
 }
 
-ErrorPlace elf::getErrorPlace(const uint8_t *Loc) {
-  switch (Config->EKind) {
+ErrorPlace elf::getErrorPlace(const uint8_t *loc) {
+  switch (config->ekind) {
   case ELF32LEKind:
-    return getErrPlace<ELF32LE>(Loc);
+    return getErrPlace<ELF32LE>(loc);
   case ELF32BEKind:
-    return getErrPlace<ELF32BE>(Loc);
+    return getErrPlace<ELF32BE>(loc);
   case ELF64LEKind:
-    return getErrPlace<ELF64LE>(Loc);
+    return getErrPlace<ELF64LE>(loc);
   case ELF64BEKind:
-    return getErrPlace<ELF64BE>(Loc);
+    return getErrPlace<ELF64BE>(loc);
   default:
     llvm_unreachable("unknown ELF type");
   }
@@ -123,62 +120,62 @@ ErrorPlace elf::getErrorPlace(const uint8_t *Loc) {
 
 TargetInfo::~TargetInfo() {}
 
-int64_t TargetInfo::getImplicitAddend(const uint8_t *Buf, RelType Type) const {
+int64_t TargetInfo::getImplicitAddend(const uint8_t *buf, RelType type) const {
   return 0;
 }
 
-bool TargetInfo::usesOnlyLowPageBits(RelType Type) const { return false; }
+bool TargetInfo::usesOnlyLowPageBits(RelType type) const { return false; }
 
-bool TargetInfo::needsThunk(RelExpr Expr, RelType Type, const InputFile *File,
-                            uint64_t BranchAddr, const Symbol &S) const {
+bool TargetInfo::needsThunk(RelExpr expr, RelType type, const InputFile *file,
+                            uint64_t branchAddr, const Symbol &s) const {
   return false;
 }
 
-bool TargetInfo::adjustPrologueForCrossSplitStack(uint8_t *Loc, uint8_t *End,
-                                                  uint8_t StOther) const {
+bool TargetInfo::adjustPrologueForCrossSplitStack(uint8_t *loc, uint8_t *end,
+                                                  uint8_t stOther) const {
   llvm_unreachable("Target doesn't support split stacks.");
 }
 
-bool TargetInfo::inBranchRange(RelType Type, uint64_t Src, uint64_t Dst) const {
+bool TargetInfo::inBranchRange(RelType type, uint64_t src, uint64_t dst) const {
   return true;
 }
 
-void TargetInfo::writeIgotPlt(uint8_t *Buf, const Symbol &S) const {
-  writeGotPlt(Buf, S);
+void TargetInfo::writeIgotPlt(uint8_t *buf, const Symbol &s) const {
+  writeGotPlt(buf, s);
 }
 
-RelExpr TargetInfo::adjustRelaxExpr(RelType Type, const uint8_t *Data,
-                                    RelExpr Expr) const {
-  return Expr;
+RelExpr TargetInfo::adjustRelaxExpr(RelType type, const uint8_t *data,
+                                    RelExpr expr) const {
+  return expr;
 }
 
-void TargetInfo::relaxGot(uint8_t *Loc, uint64_t Val) const {
+void TargetInfo::relaxGot(uint8_t *loc, RelType type, uint64_t val) const {
   llvm_unreachable("Should not have claimed to be relaxable");
 }
 
-void TargetInfo::relaxTlsGdToLe(uint8_t *Loc, RelType Type,
-                                uint64_t Val) const {
+void TargetInfo::relaxTlsGdToLe(uint8_t *loc, RelType type,
+                                uint64_t val) const {
   llvm_unreachable("Should not have claimed to be relaxable");
 }
 
-void TargetInfo::relaxTlsGdToIe(uint8_t *Loc, RelType Type,
-                                uint64_t Val) const {
+void TargetInfo::relaxTlsGdToIe(uint8_t *loc, RelType type,
+                                uint64_t val) const {
   llvm_unreachable("Should not have claimed to be relaxable");
 }
 
-void TargetInfo::relaxTlsIeToLe(uint8_t *Loc, RelType Type,
-                                uint64_t Val) const {
+void TargetInfo::relaxTlsIeToLe(uint8_t *loc, RelType type,
+                                uint64_t val) const {
   llvm_unreachable("Should not have claimed to be relaxable");
 }
 
-void TargetInfo::relaxTlsLdToLe(uint8_t *Loc, RelType Type,
-                                uint64_t Val) const {
+void TargetInfo::relaxTlsLdToLe(uint8_t *loc, RelType type,
+                                uint64_t val) const {
   llvm_unreachable("Should not have claimed to be relaxable");
 }
 
-uint64_t TargetInfo::getImageBase() {
+uint64_t TargetInfo::getImageBase() const {
   // Use -image-base if set. Fall back to the target default if not.
-  if (Config->ImageBase)
-    return *Config->ImageBase;
-  return Config->Pic ? 0 : DefaultImageBase;
+  if (config->imageBase)
+    return *config->imageBase;
+  return config->isPic ? 0 : defaultImageBase;
 }
diff --git a/deps/lld/ELF/Target.h b/deps/lld/ELF/Target.h
index 685ad05ecd6642b5a7ade79024f2759c2577985f..effa6001f6d96535538aa0d4ae9b140bd290cff5 100644
--- a/deps/lld/ELF/Target.h
+++ b/deps/lld/ELF/Target.h
@@ -1,9 +1,8 @@
 //===- Target.h -------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -17,7 +16,7 @@
 #include <array>
 
 namespace lld {
-std::string toString(elf::RelType Type);
+std::string toString(elf::RelType type);
 
 namespace elf {
 class Defined;
@@ -27,36 +26,39 @@ class Symbol;
 class TargetInfo {
 public:
   virtual uint32_t calcEFlags() const { return 0; }
-  virtual RelType getDynRel(RelType Type) const { return Type; }
-  virtual void writeGotPltHeader(uint8_t *Buf) const {}
-  virtual void writeGotHeader(uint8_t *Buf) const {}
-  virtual void writeGotPlt(uint8_t *Buf, const Symbol &S) const {};
-  virtual void writeIgotPlt(uint8_t *Buf, const Symbol &S) const;
-  virtual int64_t getImplicitAddend(const uint8_t *Buf, RelType Type) const;
+  virtual RelExpr getRelExpr(RelType type, const Symbol &s,
+                             const uint8_t *loc) const = 0;
+  virtual RelType getDynRel(RelType type) const { return 0; }
+  virtual void writeGotPltHeader(uint8_t *buf) const {}
+  virtual void writeGotHeader(uint8_t *buf) const {}
+  virtual void writeGotPlt(uint8_t *buf, const Symbol &s) const {};
+  virtual void writeIgotPlt(uint8_t *buf, const Symbol &s) const;
+  virtual int64_t getImplicitAddend(const uint8_t *buf, RelType type) const;
+  virtual int getTlsGdRelaxSkip(RelType type) const { return 1; }
 
   // If lazy binding is supported, the first entry of the PLT has code
   // to call the dynamic linker to resolve PLT entries the first time
   // they are called. This function writes that code.
-  virtual void writePltHeader(uint8_t *Buf) const {}
+  virtual void writePltHeader(uint8_t *buf) const {}
 
-  virtual void writePlt(uint8_t *Buf, uint64_t GotEntryAddr,
-                        uint64_t PltEntryAddr, int32_t Index,
-                        unsigned RelOff) const {}
-  virtual void addPltHeaderSymbols(InputSection &IS) const {}
-  virtual void addPltSymbols(InputSection &IS, uint64_t Off) const {}
+  virtual void writePlt(uint8_t *buf, uint64_t gotEntryAddr,
+                        uint64_t pltEntryAddr, int32_t index,
+                        unsigned relOff) const {}
+  virtual void addPltHeaderSymbols(InputSection &isec) const {}
+  virtual void addPltSymbols(InputSection &isec, uint64_t off) const {}
 
   // Returns true if a relocation only uses the low bits of a value such that
   // all those bits are in the same page. For example, if the relocation
   // only uses the low 12 bits in a system with 4k pages. If this is true, the
   // bits will always have the same value at runtime and we don't have to emit
   // a dynamic relocation.
-  virtual bool usesOnlyLowPageBits(RelType Type) const;
+  virtual bool usesOnlyLowPageBits(RelType type) const;
 
   // Decide whether a Thunk is needed for the relocation from File
   // targeting S.
-  virtual bool needsThunk(RelExpr Expr, RelType RelocType,
-                          const InputFile *File, uint64_t BranchAddr,
-                          const Symbol &S) const;
+  virtual bool needsThunk(RelExpr expr, RelType relocType,
+                          const InputFile *file, uint64_t branchAddr,
+                          const Symbol &s) const;
 
   // On systems with range extensions we place collections of Thunks at
   // regular spacings that enable the majority of branches reach the Thunks.
@@ -68,77 +70,71 @@ public:
   // to do the right thing. See https://gcc.gnu.org/wiki/SplitStacks.
   // The symbols st_other flags are needed on PowerPC64 for determining the
   // offset to the split-stack prologue.
-  virtual bool adjustPrologueForCrossSplitStack(uint8_t *Loc, uint8_t *End,
-                                                uint8_t StOther) const;
+  virtual bool adjustPrologueForCrossSplitStack(uint8_t *loc, uint8_t *end,
+                                                uint8_t stOther) const;
 
-  // Return true if we can reach Dst from Src with Relocation RelocType
-  virtual bool inBranchRange(RelType Type, uint64_t Src,
-                             uint64_t Dst) const;
-  virtual RelExpr getRelExpr(RelType Type, const Symbol &S,
-                             const uint8_t *Loc) const = 0;
+  // Return true if we can reach dst from src with RelType type.
+  virtual bool inBranchRange(RelType type, uint64_t src,
+                             uint64_t dst) const;
 
-  virtual void relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const = 0;
+  virtual void relocateOne(uint8_t *loc, RelType type, uint64_t val) const = 0;
 
   virtual ~TargetInfo();
 
-  unsigned TlsGdRelaxSkip = 1;
-  unsigned PageSize = 4096;
-  unsigned DefaultMaxPageSize = 4096;
+  unsigned defaultCommonPageSize = 4096;
+  unsigned defaultMaxPageSize = 4096;
 
-  uint64_t getImageBase();
+  uint64_t getImageBase() const;
 
-  // Offset of _GLOBAL_OFFSET_TABLE_ from base of .got or .got.plt section.
-  uint64_t GotBaseSymOff = 0;
   // True if _GLOBAL_OFFSET_TABLE_ is relative to .got.plt, false if .got.
-  bool GotBaseSymInGotPlt = true;
+  bool gotBaseSymInGotPlt = true;
 
-  RelType CopyRel;
-  RelType GotRel;
-  RelType NoneRel;
-  RelType PltRel;
-  RelType RelativeRel;
-  RelType IRelativeRel;
-  RelType TlsDescRel;
-  RelType TlsGotRel;
-  RelType TlsModuleIndexRel;
-  RelType TlsOffsetRel;
-  unsigned GotEntrySize = 0;
-  unsigned GotPltEntrySize = 0;
-  unsigned PltEntrySize;
-  unsigned PltHeaderSize;
+  RelType copyRel;
+  RelType gotRel;
+  RelType noneRel;
+  RelType pltRel;
+  RelType relativeRel;
+  RelType iRelativeRel;
+  RelType symbolicRel;
+  RelType tlsDescRel;
+  RelType tlsGotRel;
+  RelType tlsModuleIndexRel;
+  RelType tlsOffsetRel;
+  unsigned pltEntrySize;
+  unsigned pltHeaderSize;
 
   // At least on x86_64 positions 1 and 2 are used by the first plt entry
   // to support lazy loading.
-  unsigned GotPltHeaderEntriesNum = 3;
+  unsigned gotPltHeaderEntriesNum = 3;
 
   // On PPC ELF V2 abi, the first entry in the .got is the .TOC.
-  unsigned GotHeaderEntriesNum = 0;
+  unsigned gotHeaderEntriesNum = 0;
 
-  bool NeedsThunks = false;
+  bool needsThunks = false;
 
   // A 4-byte field corresponding to one or more trap instructions, used to pad
   // executable OutputSections.
-  std::array<uint8_t, 4> TrapInstr;
+  std::array<uint8_t, 4> trapInstr;
 
   // If a target needs to rewrite calls to __morestack to instead call
   // __morestack_non_split when a split-stack enabled caller calls a
   // non-split-stack callee this will return true. Otherwise returns false.
-  bool NeedsMoreStackNonSplit = true;
+  bool needsMoreStackNonSplit = true;
 
-  virtual RelExpr adjustRelaxExpr(RelType Type, const uint8_t *Data,
-                                  RelExpr Expr) const;
-  virtual void relaxGot(uint8_t *Loc, uint64_t Val) const;
-  virtual void relaxTlsGdToIe(uint8_t *Loc, RelType Type, uint64_t Val) const;
-  virtual void relaxTlsGdToLe(uint8_t *Loc, RelType Type, uint64_t Val) const;
-  virtual void relaxTlsIeToLe(uint8_t *Loc, RelType Type, uint64_t Val) const;
-  virtual void relaxTlsLdToLe(uint8_t *Loc, RelType Type, uint64_t Val) const;
+  virtual RelExpr adjustRelaxExpr(RelType type, const uint8_t *data,
+                                  RelExpr expr) const;
+  virtual void relaxGot(uint8_t *loc, RelType type, uint64_t val) const;
+  virtual void relaxTlsGdToIe(uint8_t *loc, RelType type, uint64_t val) const;
+  virtual void relaxTlsGdToLe(uint8_t *loc, RelType type, uint64_t val) const;
+  virtual void relaxTlsIeToLe(uint8_t *loc, RelType type, uint64_t val) const;
+  virtual void relaxTlsLdToLe(uint8_t *loc, RelType type, uint64_t val) const;
 
 protected:
   // On FreeBSD x86_64 the first page cannot be mmaped.
   // On Linux that is controled by vm.mmap_min_addr. At least on some x86_64
   // installs that is 65536, so the first 15 pages cannot be used.
   // Given that, the smallest value that can be used in here is 0x10000.
-  uint64_t DefaultImageBase = 0x10000;
+  uint64_t defaultImageBase = 0x10000;
 };
 
 TargetInfo *getAArch64TargetInfo();
@@ -151,108 +147,113 @@ TargetInfo *getPPC64TargetInfo();
 TargetInfo *getPPCTargetInfo();
 TargetInfo *getRISCVTargetInfo();
 TargetInfo *getSPARCV9TargetInfo();
-TargetInfo *getX32TargetInfo();
 TargetInfo *getX86TargetInfo();
 TargetInfo *getX86_64TargetInfo();
 template <class ELFT> TargetInfo *getMipsTargetInfo();
 
 struct ErrorPlace {
-  InputSectionBase *IS;
-  std::string Loc;
+  InputSectionBase *isec;
+  std::string loc;
 };
 
 // Returns input section and corresponding source string for the given location.
-ErrorPlace getErrorPlace(const uint8_t *Loc);
+ErrorPlace getErrorPlace(const uint8_t *loc);
 
-static inline std::string getErrorLocation(const uint8_t *Loc) {
-  return getErrorPlace(Loc).Loc;
+static inline std::string getErrorLocation(const uint8_t *loc) {
+  return getErrorPlace(loc).loc;
 }
 
-// In the PowerPC64 Elf V2 abi a function can have 2 entry points.  The first is
-// a global entry point (GEP) which typically is used to intiailzie the TOC
+void writePPC32GlinkSection(uint8_t *buf, size_t numEntries);
+
+bool tryRelaxPPC64TocIndirection(RelType type, const Relocation &rel,
+                                 uint8_t *bufLoc);
+unsigned getPPCDFormOp(unsigned secondaryOp);
+
+// In the PowerPC64 Elf V2 abi a function can have 2 entry points.  The first
+// is a global entry point (GEP) which typically is used to initialize the TOC
 // pointer in general purpose register 2.  The second is a local entry
 // point (LEP) which bypasses the TOC pointer initialization code. The
 // offset between GEP and LEP is encoded in a function's st_other flags.
 // This function will return the offset (in bytes) from the global entry-point
 // to the local entry-point.
-unsigned getPPC64GlobalEntryToLocalEntryOffset(uint8_t StOther);
+unsigned getPPC64GlobalEntryToLocalEntryOffset(uint8_t stOther);
+
+// Returns true if a relocation is a small code model relocation that accesses
+// the .toc section.
+bool isPPC64SmallCodeModelTocReloc(RelType type);
 
 uint64_t getPPC64TocBase();
-uint64_t getAArch64Page(uint64_t Expr);
+uint64_t getAArch64Page(uint64_t expr);
 
-extern TargetInfo *Target;
+extern const TargetInfo *target;
 TargetInfo *getTarget();
 
-template <class ELFT> bool isMipsPIC(const Defined *Sym);
+template <class ELFT> bool isMipsPIC(const Defined *sym);
 
-static inline void reportRangeError(uint8_t *Loc, RelType Type, const Twine &V,
-                                    int64_t Min, uint64_t Max) {
-  ErrorPlace ErrPlace = getErrorPlace(Loc);
-  StringRef Hint;
-  if (ErrPlace.IS && ErrPlace.IS->Name.startswith(".debug"))
-    Hint = "; consider recompiling with -fdebug-types-section to reduce size "
+static inline void reportRangeError(uint8_t *loc, RelType type, const Twine &v,
+                                    int64_t min, uint64_t max) {
+  ErrorPlace errPlace = getErrorPlace(loc);
+  StringRef hint;
+  if (errPlace.isec && errPlace.isec->name.startswith(".debug"))
+    hint = "; consider recompiling with -fdebug-types-section to reduce size "
            "of debug sections";
 
-  errorOrWarn(ErrPlace.Loc + "relocation " + lld::toString(Type) +
-              " out of range: " + V.str() + " is not in [" + Twine(Min).str() +
-              ", " + Twine(Max).str() + "]" + Hint);
-}
-
-inline unsigned getPltEntryOffset(unsigned Idx) {
-  return Target->PltHeaderSize + Target->PltEntrySize * Idx;
+  errorOrWarn(errPlace.loc + "relocation " + lld::toString(type) +
+              " out of range: " + v.str() + " is not in [" + Twine(min).str() +
+              ", " + Twine(max).str() + "]" + hint);
 }
 
 // Make sure that V can be represented as an N bit signed integer.
-inline void checkInt(uint8_t *Loc, int64_t V, int N, RelType Type) {
-  if (V != llvm::SignExtend64(V, N))
-    reportRangeError(Loc, Type, Twine(V), llvm::minIntN(N), llvm::maxIntN(N));
+inline void checkInt(uint8_t *loc, int64_t v, int n, RelType type) {
+  if (v != llvm::SignExtend64(v, n))
+    reportRangeError(loc, type, Twine(v), llvm::minIntN(n), llvm::maxIntN(n));
 }
 
 // Make sure that V can be represented as an N bit unsigned integer.
-inline void checkUInt(uint8_t *Loc, uint64_t V, int N, RelType Type) {
-  if ((V >> N) != 0)
-    reportRangeError(Loc, Type, Twine(V), 0, llvm::maxUIntN(N));
+inline void checkUInt(uint8_t *loc, uint64_t v, int n, RelType type) {
+  if ((v >> n) != 0)
+    reportRangeError(loc, type, Twine(v), 0, llvm::maxUIntN(n));
 }
 
 // Make sure that V can be represented as an N bit signed or unsigned integer.
-inline void checkIntUInt(uint8_t *Loc, uint64_t V, int N, RelType Type) {
+inline void checkIntUInt(uint8_t *loc, uint64_t v, int n, RelType type) {
   // For the error message we should cast V to a signed integer so that error
   // messages show a small negative value rather than an extremely large one
-  if (V != (uint64_t)llvm::SignExtend64(V, N) && (V >> N) != 0)
-    reportRangeError(Loc, Type, Twine((int64_t)V), llvm::minIntN(N),
-                     llvm::maxIntN(N));
+  if (v != (uint64_t)llvm::SignExtend64(v, n) && (v >> n) != 0)
+    reportRangeError(loc, type, Twine((int64_t)v), llvm::minIntN(n),
+                     llvm::maxUIntN(n));
 }
 
-inline void checkAlignment(uint8_t *Loc, uint64_t V, int N, RelType Type) {
-  if ((V & (N - 1)) != 0)
-    error(getErrorLocation(Loc) + "improper alignment for relocation " +
-          lld::toString(Type) + ": 0x" + llvm::utohexstr(V) +
-          " is not aligned to " + Twine(N) + " bytes");
+inline void checkAlignment(uint8_t *loc, uint64_t v, int n, RelType type) {
+  if ((v & (n - 1)) != 0)
+    error(getErrorLocation(loc) + "improper alignment for relocation " +
+          lld::toString(type) + ": 0x" + llvm::utohexstr(v) +
+          " is not aligned to " + Twine(n) + " bytes");
 }
 
 // Endianness-aware read/write.
-inline uint16_t read16(const void *P) {
-  return llvm::support::endian::read16(P, Config->Endianness);
+inline uint16_t read16(const void *p) {
+  return llvm::support::endian::read16(p, config->endianness);
 }
 
-inline uint32_t read32(const void *P) {
-  return llvm::support::endian::read32(P, Config->Endianness);
+inline uint32_t read32(const void *p) {
+  return llvm::support::endian::read32(p, config->endianness);
 }
 
-inline uint64_t read64(const void *P) {
-  return llvm::support::endian::read64(P, Config->Endianness);
+inline uint64_t read64(const void *p) {
+  return llvm::support::endian::read64(p, config->endianness);
 }
 
-inline void write16(void *P, uint16_t V) {
-  llvm::support::endian::write16(P, V, Config->Endianness);
+inline void write16(void *p, uint16_t v) {
+  llvm::support::endian::write16(p, v, config->endianness);
 }
 
-inline void write32(void *P, uint32_t V) {
-  llvm::support::endian::write32(P, V, Config->Endianness);
+inline void write32(void *p, uint32_t v) {
+  llvm::support::endian::write32(p, v, config->endianness);
 }
 
-inline void write64(void *P, uint64_t V) {
-  llvm::support::endian::write64(P, V, Config->Endianness);
+inline void write64(void *p, uint64_t v) {
+  llvm::support::endian::write64(p, v, config->endianness);
 }
 } // namespace elf
 } // namespace lld
diff --git a/deps/lld/ELF/Thunks.cpp b/deps/lld/ELF/Thunks.cpp
index 7a31d36b0e9025222e82109555a7beba31cfb730..73208f932031dfee03e37824046086f835052620 100644
--- a/deps/lld/ELF/Thunks.cpp
+++ b/deps/lld/ELF/Thunks.cpp
@@ -1,9 +1,8 @@
 //===- Thunks.cpp --------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===---------------------------------------------------------------------===//
 //
@@ -50,18 +49,18 @@ namespace {
 // AArch64 long range Thunks
 class AArch64ABSLongThunk final : public Thunk {
 public:
-  AArch64ABSLongThunk(Symbol &Dest) : Thunk(Dest) {}
+  AArch64ABSLongThunk(Symbol &dest) : Thunk(dest) {}
   uint32_t size() override { return 16; }
-  void writeTo(uint8_t *Buf) override;
-  void addSymbols(ThunkSection &IS) override;
+  void writeTo(uint8_t *buf) override;
+  void addSymbols(ThunkSection &isec) override;
 };
 
 class AArch64ADRPThunk final : public Thunk {
 public:
-  AArch64ADRPThunk(Symbol &Dest) : Thunk(Dest) {}
+  AArch64ADRPThunk(Symbol &dest) : Thunk(dest) {}
   uint32_t size() override { return 12; }
-  void writeTo(uint8_t *Buf) override;
-  void addSymbols(ThunkSection &IS) override;
+  void writeTo(uint8_t *buf) override;
+  void addSymbols(ThunkSection &isec) override;
 };
 
 // Base class for ARM thunks.
@@ -74,18 +73,19 @@ public:
 // if the target is in range, otherwise it creates a long thunk.
 class ARMThunk : public Thunk {
 public:
-  ARMThunk(Symbol &Dest) : Thunk(Dest) {}
+  ARMThunk(Symbol &dest) : Thunk(dest) {}
 
-  bool mayUseShortThunk();
-  uint32_t size() override { return mayUseShortThunk() ? 4 : sizeLong(); }
-  void writeTo(uint8_t *Buf) override;
-  bool isCompatibleWith(RelType Type) const override;
+  bool getMayUseShortThunk();
+  uint32_t size() override { return getMayUseShortThunk() ? 4 : sizeLong(); }
+  void writeTo(uint8_t *buf) override;
+  bool isCompatibleWith(const InputSection &isec,
+                        const Relocation &rel) const override;
 
   // Returns the size of a long thunk.
   virtual uint32_t sizeLong() = 0;
 
   // Writes a long thunk to Buf.
-  virtual void writeLong(uint8_t *Buf) = 0;
+  virtual void writeLong(uint8_t *buf) = 0;
 
 private:
   // This field tracks whether all previously considered layouts would allow
@@ -94,7 +94,7 @@ private:
   // distance to the target. We do this because transitioning from long to short
   // can create layout oscillations in certain corner cases which would prevent
   // the layout from converging.
-  bool MayUseShortThunk = true;
+  bool mayUseShortThunk = true;
 };
 
 // Base class for Thumb-2 thunks.
@@ -103,60 +103,61 @@ private:
 // which has a range of 16MB.
 class ThumbThunk : public Thunk {
 public:
-  ThumbThunk(Symbol &Dest) : Thunk(Dest) { Alignment = 2; }
+  ThumbThunk(Symbol &dest) : Thunk(dest) { alignment = 2; }
 
-  bool mayUseShortThunk();
-  uint32_t size() override { return mayUseShortThunk() ? 4 : sizeLong(); }
-  void writeTo(uint8_t *Buf) override;
-  bool isCompatibleWith(RelType Type) const override;
+  bool getMayUseShortThunk();
+  uint32_t size() override { return getMayUseShortThunk() ? 4 : sizeLong(); }
+  void writeTo(uint8_t *buf) override;
+  bool isCompatibleWith(const InputSection &isec,
+                        const Relocation &rel) const override;
 
   // Returns the size of a long thunk.
   virtual uint32_t sizeLong() = 0;
 
   // Writes a long thunk to Buf.
-  virtual void writeLong(uint8_t *Buf) = 0;
+  virtual void writeLong(uint8_t *buf) = 0;
 
 private:
   // See comment in ARMThunk above.
-  bool MayUseShortThunk = true;
+  bool mayUseShortThunk = true;
 };
 
 // Specific ARM Thunk implementations. The naming convention is:
 // Source State, TargetState, Target Requirement, ABS or PI, Range
 class ARMV7ABSLongThunk final : public ARMThunk {
 public:
-  ARMV7ABSLongThunk(Symbol &Dest) : ARMThunk(Dest) {}
+  ARMV7ABSLongThunk(Symbol &dest) : ARMThunk(dest) {}
 
   uint32_t sizeLong() override { return 12; }
-  void writeLong(uint8_t *Buf) override;
-  void addSymbols(ThunkSection &IS) override;
+  void writeLong(uint8_t *buf) override;
+  void addSymbols(ThunkSection &isec) override;
 };
 
 class ARMV7PILongThunk final : public ARMThunk {
 public:
-  ARMV7PILongThunk(Symbol &Dest) : ARMThunk(Dest) {}
+  ARMV7PILongThunk(Symbol &dest) : ARMThunk(dest) {}
 
   uint32_t sizeLong() override { return 16; }
-  void writeLong(uint8_t *Buf) override;
-  void addSymbols(ThunkSection &IS) override;
+  void writeLong(uint8_t *buf) override;
+  void addSymbols(ThunkSection &isec) override;
 };
 
 class ThumbV7ABSLongThunk final : public ThumbThunk {
 public:
-  ThumbV7ABSLongThunk(Symbol &Dest) : ThumbThunk(Dest) {}
+  ThumbV7ABSLongThunk(Symbol &dest) : ThumbThunk(dest) {}
 
   uint32_t sizeLong() override { return 10; }
-  void writeLong(uint8_t *Buf) override;
-  void addSymbols(ThunkSection &IS) override;
+  void writeLong(uint8_t *buf) override;
+  void addSymbols(ThunkSection &isec) override;
 };
 
 class ThumbV7PILongThunk final : public ThumbThunk {
 public:
-  ThumbV7PILongThunk(Symbol &Dest) : ThumbThunk(Dest) {}
+  ThumbV7PILongThunk(Symbol &dest) : ThumbThunk(dest) {}
 
   uint32_t sizeLong() override { return 12; }
-  void writeLong(uint8_t *Buf) override;
-  void addSymbols(ThunkSection &IS) override;
+  void writeLong(uint8_t *buf) override;
+  void addSymbols(ThunkSection &isec) override;
 };
 
 // Implementations of Thunks for older Arm architectures that do not support
@@ -166,76 +167,96 @@ public:
 // can result in a thunk
 class ARMV5ABSLongThunk final : public ARMThunk {
 public:
-  ARMV5ABSLongThunk(Symbol &Dest) : ARMThunk(Dest) {}
+  ARMV5ABSLongThunk(Symbol &dest) : ARMThunk(dest) {}
 
   uint32_t sizeLong() override { return 8; }
-  void writeLong(uint8_t *Buf) override;
-  void addSymbols(ThunkSection &IS) override;
-  bool isCompatibleWith(uint32_t RelocType) const override;
+  void writeLong(uint8_t *buf) override;
+  void addSymbols(ThunkSection &isec) override;
+  bool isCompatibleWith(const InputSection &isec,
+                        const Relocation &rel) const override;
 };
 
 class ARMV5PILongThunk final : public ARMThunk {
 public:
-  ARMV5PILongThunk(Symbol &Dest) : ARMThunk(Dest) {}
+  ARMV5PILongThunk(Symbol &dest) : ARMThunk(dest) {}
 
   uint32_t sizeLong() override { return 16; }
-  void writeLong(uint8_t *Buf) override;
-  void addSymbols(ThunkSection &IS) override;
-  bool isCompatibleWith(uint32_t RelocType) const override;
+  void writeLong(uint8_t *buf) override;
+  void addSymbols(ThunkSection &isec) override;
+  bool isCompatibleWith(const InputSection &isec,
+                        const Relocation &rel) const override;
 };
 
 // Implementations of Thunks for Arm v6-M. Only Thumb instructions are permitted
 class ThumbV6MABSLongThunk final : public ThumbThunk {
 public:
-  ThumbV6MABSLongThunk(Symbol &Dest) : ThumbThunk(Dest) {}
+  ThumbV6MABSLongThunk(Symbol &dest) : ThumbThunk(dest) {}
 
   uint32_t sizeLong() override { return 12; }
-  void writeLong(uint8_t *Buf) override;
-  void addSymbols(ThunkSection &IS) override;
+  void writeLong(uint8_t *buf) override;
+  void addSymbols(ThunkSection &isec) override;
 };
 
 class ThumbV6MPILongThunk final : public ThumbThunk {
 public:
-  ThumbV6MPILongThunk(Symbol &Dest) : ThumbThunk(Dest) {}
+  ThumbV6MPILongThunk(Symbol &dest) : ThumbThunk(dest) {}
 
   uint32_t sizeLong() override { return 16; }
-  void writeLong(uint8_t *Buf) override;
-  void addSymbols(ThunkSection &IS) override;
+  void writeLong(uint8_t *buf) override;
+  void addSymbols(ThunkSection &isec) override;
 };
 
 // MIPS LA25 thunk
 class MipsThunk final : public Thunk {
 public:
-  MipsThunk(Symbol &Dest) : Thunk(Dest) {}
+  MipsThunk(Symbol &dest) : Thunk(dest) {}
 
   uint32_t size() override { return 16; }
-  void writeTo(uint8_t *Buf) override;
-  void addSymbols(ThunkSection &IS) override;
+  void writeTo(uint8_t *buf) override;
+  void addSymbols(ThunkSection &isec) override;
   InputSection *getTargetInputSection() const override;
 };
 
 // microMIPS R2-R5 LA25 thunk
 class MicroMipsThunk final : public Thunk {
 public:
-  MicroMipsThunk(Symbol &Dest) : Thunk(Dest) {}
+  MicroMipsThunk(Symbol &dest) : Thunk(dest) {}
 
   uint32_t size() override { return 14; }
-  void writeTo(uint8_t *Buf) override;
-  void addSymbols(ThunkSection &IS) override;
+  void writeTo(uint8_t *buf) override;
+  void addSymbols(ThunkSection &isec) override;
   InputSection *getTargetInputSection() const override;
 };
 
 // microMIPS R6 LA25 thunk
 class MicroMipsR6Thunk final : public Thunk {
 public:
-  MicroMipsR6Thunk(Symbol &Dest) : Thunk(Dest) {}
+  MicroMipsR6Thunk(Symbol &dest) : Thunk(dest) {}
 
   uint32_t size() override { return 12; }
-  void writeTo(uint8_t *Buf) override;
-  void addSymbols(ThunkSection &IS) override;
+  void writeTo(uint8_t *buf) override;
+  void addSymbols(ThunkSection &isec) override;
   InputSection *getTargetInputSection() const override;
 };
 
+class PPC32PltCallStub final : public Thunk {
+public:
+  PPC32PltCallStub(const InputSection &isec, const Relocation &rel, Symbol &dest)
+      : Thunk(dest), addend(rel.type == R_PPC_PLTREL24 ? rel.addend : 0),
+        file(isec.file) {}
+  uint32_t size() override { return 16; }
+  void writeTo(uint8_t *buf) override;
+  void addSymbols(ThunkSection &isec) override;
+  bool isCompatibleWith(const InputSection &isec, const Relocation &rel) const override;
+
+private:
+  // For R_PPC_PLTREL24, this records the addend, which will be used to decide
+  // the offsets in the call stub.
+  uint32_t addend;
+
+  // Records the call site of the call stub.
+  const InputFile *file;
+};
 
 // PPC64 Plt call stubs.
 // Any call site that needs to call through a plt entry needs a call stub in
@@ -247,10 +268,10 @@ public:
 // 3) Transfering control to the target function through an indirect branch.
 class PPC64PltCallStub final : public Thunk {
 public:
-  PPC64PltCallStub(Symbol &Dest) : Thunk(Dest) {}
+  PPC64PltCallStub(Symbol &dest) : Thunk(dest) {}
   uint32_t size() override { return 20; }
-  void writeTo(uint8_t *Buf) override;
-  void addSymbols(ThunkSection &IS) override;
+  void writeTo(uint8_t *buf) override;
+  void addSymbols(ThunkSection &isec) override;
 };
 
 // A bl instruction uses a signed 24 bit offset, with an implicit 4 byte
@@ -264,74 +285,75 @@ public:
 class PPC64LongBranchThunk : public Thunk {
 public:
   uint32_t size() override { return 16; }
-  void writeTo(uint8_t *Buf) override;
-  void addSymbols(ThunkSection &IS) override;
+  void writeTo(uint8_t *buf) override;
+  void addSymbols(ThunkSection &isec) override;
 
 protected:
-  PPC64LongBranchThunk(Symbol &Dest) : Thunk(Dest) {}
+  PPC64LongBranchThunk(Symbol &dest) : Thunk(dest) {}
 };
 
 class PPC64PILongBranchThunk final : public PPC64LongBranchThunk {
 public:
-  PPC64PILongBranchThunk(Symbol &Dest) : PPC64LongBranchThunk(Dest) {
-    assert(!Dest.IsPreemptible);
-    if (Dest.isInPPC64Branchlt())
+  PPC64PILongBranchThunk(Symbol &dest) : PPC64LongBranchThunk(dest) {
+    assert(!dest.isPreemptible);
+    if (dest.isInPPC64Branchlt())
       return;
 
-    In.PPC64LongBranchTarget->addEntry(Dest);
-    In.RelaDyn->addReloc({Target->RelativeRel, In.PPC64LongBranchTarget,
-                          Dest.getPPC64LongBranchOffset(), true, &Dest,
-                          getPPC64GlobalEntryToLocalEntryOffset(Dest.StOther)});
+    in.ppc64LongBranchTarget->addEntry(dest);
+    mainPart->relaDyn->addReloc(
+        {target->relativeRel, in.ppc64LongBranchTarget,
+         dest.getPPC64LongBranchOffset(), true, &dest,
+         getPPC64GlobalEntryToLocalEntryOffset(dest.stOther)});
   }
 };
 
 class PPC64PDLongBranchThunk final : public PPC64LongBranchThunk {
 public:
-  PPC64PDLongBranchThunk(Symbol &Dest) : PPC64LongBranchThunk(Dest) {
-    if (!Dest.isInPPC64Branchlt())
-      In.PPC64LongBranchTarget->addEntry(Dest);
+  PPC64PDLongBranchThunk(Symbol &dest) : PPC64LongBranchThunk(dest) {
+    if (!dest.isInPPC64Branchlt())
+      in.ppc64LongBranchTarget->addEntry(dest);
   }
 };
 
 } // end anonymous namespace
 
-Defined *Thunk::addSymbol(StringRef Name, uint8_t Type, uint64_t Value,
-                          InputSectionBase &Section) {
-  Defined *D = addSyntheticLocal(Name, Type, Value, /*Size=*/0, Section);
-  Syms.push_back(D);
-  return D;
+Defined *Thunk::addSymbol(StringRef name, uint8_t type, uint64_t value,
+                          InputSectionBase &section) {
+  Defined *d = addSyntheticLocal(name, type, value, /*size=*/0, section);
+  syms.push_back(d);
+  return d;
 }
 
-void Thunk::setOffset(uint64_t NewOffset) {
-  for (Defined *D : Syms)
-    D->Value = D->Value - Offset + NewOffset;
-  Offset = NewOffset;
+void Thunk::setOffset(uint64_t newOffset) {
+  for (Defined *d : syms)
+    d->value = d->value - offset + newOffset;
+  offset = newOffset;
 }
 
 // AArch64 long range Thunks
 
-static uint64_t getAArch64ThunkDestVA(const Symbol &S) {
-  uint64_t V = S.isInPlt() ? S.getPltVA() : S.getVA();
-  return V;
+static uint64_t getAArch64ThunkDestVA(const Symbol &s) {
+  uint64_t v = s.isInPlt() ? s.getPltVA() : s.getVA();
+  return v;
 }
 
-void AArch64ABSLongThunk::writeTo(uint8_t *Buf) {
-  const uint8_t Data[] = {
+void AArch64ABSLongThunk::writeTo(uint8_t *buf) {
+  const uint8_t data[] = {
     0x50, 0x00, 0x00, 0x58, //     ldr x16, L0
     0x00, 0x02, 0x1f, 0xd6, //     br  x16
     0x00, 0x00, 0x00, 0x00, // L0: .xword S
     0x00, 0x00, 0x00, 0x00,
   };
-  uint64_t S = getAArch64ThunkDestVA(Destination);
-  memcpy(Buf, Data, sizeof(Data));
-  Target->relocateOne(Buf + 8, R_AARCH64_ABS64, S);
+  uint64_t s = getAArch64ThunkDestVA(destination);
+  memcpy(buf, data, sizeof(data));
+  target->relocateOne(buf + 8, R_AARCH64_ABS64, s);
 }
 
-void AArch64ABSLongThunk::addSymbols(ThunkSection &IS) {
-  addSymbol(Saver.save("__AArch64AbsLongThunk_" + Destination.getName()),
-            STT_FUNC, 0, IS);
-  addSymbol("$x", STT_NOTYPE, 0, IS);
-  addSymbol("$d", STT_NOTYPE, 8, IS);
+void AArch64ABSLongThunk::addSymbols(ThunkSection &isec) {
+  addSymbol(saver.save("__AArch64AbsLongThunk_" + destination.getName()),
+            STT_FUNC, 0, isec);
+  addSymbol("$x", STT_NOTYPE, 0, isec);
+  addSymbol("$d", STT_NOTYPE, 8, isec);
 }
 
 // This Thunk has a maximum range of 4Gb, this is sufficient for all programs
@@ -339,259 +361,263 @@ void AArch64ABSLongThunk::addSymbols(ThunkSection &IS) {
 // clang and gcc do not support the large code model for position independent
 // code so it is safe to use this for position independent thunks without
 // worrying about the destination being more than 4Gb away.
-void AArch64ADRPThunk::writeTo(uint8_t *Buf) {
-  const uint8_t Data[] = {
+void AArch64ADRPThunk::writeTo(uint8_t *buf) {
+  const uint8_t data[] = {
       0x10, 0x00, 0x00, 0x90, // adrp x16, Dest R_AARCH64_ADR_PREL_PG_HI21(Dest)
       0x10, 0x02, 0x00, 0x91, // add  x16, x16, R_AARCH64_ADD_ABS_LO12_NC(Dest)
       0x00, 0x02, 0x1f, 0xd6, // br   x16
   };
-  uint64_t S = getAArch64ThunkDestVA(Destination);
-  uint64_t P = getThunkTargetSym()->getVA();
-  memcpy(Buf, Data, sizeof(Data));
-  Target->relocateOne(Buf, R_AARCH64_ADR_PREL_PG_HI21,
-                      getAArch64Page(S) - getAArch64Page(P));
-  Target->relocateOne(Buf + 4, R_AARCH64_ADD_ABS_LO12_NC, S);
+  uint64_t s = getAArch64ThunkDestVA(destination);
+  uint64_t p = getThunkTargetSym()->getVA();
+  memcpy(buf, data, sizeof(data));
+  target->relocateOne(buf, R_AARCH64_ADR_PREL_PG_HI21,
+                      getAArch64Page(s) - getAArch64Page(p));
+  target->relocateOne(buf + 4, R_AARCH64_ADD_ABS_LO12_NC, s);
 }
 
-void AArch64ADRPThunk::addSymbols(ThunkSection &IS) {
-  addSymbol(Saver.save("__AArch64ADRPThunk_" + Destination.getName()), STT_FUNC,
-            0, IS);
-  addSymbol("$x", STT_NOTYPE, 0, IS);
+void AArch64ADRPThunk::addSymbols(ThunkSection &isec) {
+  addSymbol(saver.save("__AArch64ADRPThunk_" + destination.getName()), STT_FUNC,
+            0, isec);
+  addSymbol("$x", STT_NOTYPE, 0, isec);
 }
 
 // ARM Target Thunks
-static uint64_t getARMThunkDestVA(const Symbol &S) {
-  uint64_t V = S.isInPlt() ? S.getPltVA() : S.getVA();
-  return SignExtend64<32>(V);
+static uint64_t getARMThunkDestVA(const Symbol &s) {
+  uint64_t v = s.isInPlt() ? s.getPltVA() : s.getVA();
+  return SignExtend64<32>(v);
 }
 
 // This function returns true if the target is not Thumb and is within 2^26, and
-// it has not previously returned false (see comment for MayUseShortThunk).
-bool ARMThunk::mayUseShortThunk() {
-  if (!MayUseShortThunk)
+// it has not previously returned false (see comment for mayUseShortThunk).
+bool ARMThunk::getMayUseShortThunk() {
+  if (!mayUseShortThunk)
     return false;
-  uint64_t S = getARMThunkDestVA(Destination);
-  if (S & 1) {
-    MayUseShortThunk = false;
+  uint64_t s = getARMThunkDestVA(destination);
+  if (s & 1) {
+    mayUseShortThunk = false;
     return false;
   }
-  uint64_t P = getThunkTargetSym()->getVA();
-  int64_t Offset = S - P - 8;
-  MayUseShortThunk = llvm::isInt<26>(Offset);
-  return MayUseShortThunk;
+  uint64_t p = getThunkTargetSym()->getVA();
+  int64_t offset = s - p - 8;
+  mayUseShortThunk = llvm::isInt<26>(offset);
+  return mayUseShortThunk;
 }
 
-void ARMThunk::writeTo(uint8_t *Buf) {
-  if (!mayUseShortThunk()) {
-    writeLong(Buf);
+void ARMThunk::writeTo(uint8_t *buf) {
+  if (!getMayUseShortThunk()) {
+    writeLong(buf);
     return;
   }
 
-  uint64_t S = getARMThunkDestVA(Destination);
-  uint64_t P = getThunkTargetSym()->getVA();
-  int64_t Offset = S - P - 8;
-  const uint8_t Data[] = {
+  uint64_t s = getARMThunkDestVA(destination);
+  uint64_t p = getThunkTargetSym()->getVA();
+  int64_t offset = s - p - 8;
+  const uint8_t data[] = {
     0x00, 0x00, 0x00, 0xea, // b S
   };
-  memcpy(Buf, Data, sizeof(Data));
-  Target->relocateOne(Buf, R_ARM_JUMP24, Offset);
+  memcpy(buf, data, sizeof(data));
+  target->relocateOne(buf, R_ARM_JUMP24, offset);
 }
 
-bool ARMThunk::isCompatibleWith(RelType Type) const {
+bool ARMThunk::isCompatibleWith(const InputSection &isec,
+                                const Relocation &rel) const {
   // Thumb branch relocations can't use BLX
-  return Type != R_ARM_THM_JUMP19 && Type != R_ARM_THM_JUMP24;
+  return rel.type != R_ARM_THM_JUMP19 && rel.type != R_ARM_THM_JUMP24;
 }
 
 // This function returns true if the target is Thumb and is within 2^25, and
-// it has not previously returned false (see comment for MayUseShortThunk).
-bool ThumbThunk::mayUseShortThunk() {
-  if (!MayUseShortThunk)
+// it has not previously returned false (see comment for mayUseShortThunk).
+bool ThumbThunk::getMayUseShortThunk() {
+  if (!mayUseShortThunk)
     return false;
-  uint64_t S = getARMThunkDestVA(Destination);
-  if ((S & 1) == 0) {
-    MayUseShortThunk = false;
+  uint64_t s = getARMThunkDestVA(destination);
+  if ((s & 1) == 0) {
+    mayUseShortThunk = false;
     return false;
   }
-  uint64_t P = getThunkTargetSym()->getVA() & ~1;
-  int64_t Offset = S - P - 4;
-  MayUseShortThunk = llvm::isInt<25>(Offset);
-  return MayUseShortThunk;
+  uint64_t p = getThunkTargetSym()->getVA() & ~1;
+  int64_t offset = s - p - 4;
+  mayUseShortThunk = llvm::isInt<25>(offset);
+  return mayUseShortThunk;
 }
 
-void ThumbThunk::writeTo(uint8_t *Buf) {
-  if (!mayUseShortThunk()) {
-    writeLong(Buf);
+void ThumbThunk::writeTo(uint8_t *buf) {
+  if (!getMayUseShortThunk()) {
+    writeLong(buf);
     return;
   }
 
-  uint64_t S = getARMThunkDestVA(Destination);
-  uint64_t P = getThunkTargetSym()->getVA();
-  int64_t Offset = S - P - 4;
-  const uint8_t Data[] = {
+  uint64_t s = getARMThunkDestVA(destination);
+  uint64_t p = getThunkTargetSym()->getVA();
+  int64_t offset = s - p - 4;
+  const uint8_t data[] = {
       0x00, 0xf0, 0x00, 0xb0, // b.w S
   };
-  memcpy(Buf, Data, sizeof(Data));
-  Target->relocateOne(Buf, R_ARM_THM_JUMP24, Offset);
+  memcpy(buf, data, sizeof(data));
+  target->relocateOne(buf, R_ARM_THM_JUMP24, offset);
 }
 
-bool ThumbThunk::isCompatibleWith(RelType Type) const {
+bool ThumbThunk::isCompatibleWith(const InputSection &isec,
+                                  const Relocation &rel) const {
   // ARM branch relocations can't use BLX
-  return Type != R_ARM_JUMP24 && Type != R_ARM_PC24 && Type != R_ARM_PLT32;
+  return rel.type != R_ARM_JUMP24 && rel.type != R_ARM_PC24 && rel.type != R_ARM_PLT32;
 }
 
-void ARMV7ABSLongThunk::writeLong(uint8_t *Buf) {
-  const uint8_t Data[] = {
+void ARMV7ABSLongThunk::writeLong(uint8_t *buf) {
+  const uint8_t data[] = {
       0x00, 0xc0, 0x00, 0xe3, // movw         ip,:lower16:S
       0x00, 0xc0, 0x40, 0xe3, // movt         ip,:upper16:S
       0x1c, 0xff, 0x2f, 0xe1, // bx   ip
   };
-  uint64_t S = getARMThunkDestVA(Destination);
-  memcpy(Buf, Data, sizeof(Data));
-  Target->relocateOne(Buf, R_ARM_MOVW_ABS_NC, S);
-  Target->relocateOne(Buf + 4, R_ARM_MOVT_ABS, S);
+  uint64_t s = getARMThunkDestVA(destination);
+  memcpy(buf, data, sizeof(data));
+  target->relocateOne(buf, R_ARM_MOVW_ABS_NC, s);
+  target->relocateOne(buf + 4, R_ARM_MOVT_ABS, s);
 }
 
-void ARMV7ABSLongThunk::addSymbols(ThunkSection &IS) {
-  addSymbol(Saver.save("__ARMv7ABSLongThunk_" + Destination.getName()),
-            STT_FUNC, 0, IS);
-  addSymbol("$a", STT_NOTYPE, 0, IS);
+void ARMV7ABSLongThunk::addSymbols(ThunkSection &isec) {
+  addSymbol(saver.save("__ARMv7ABSLongThunk_" + destination.getName()),
+            STT_FUNC, 0, isec);
+  addSymbol("$a", STT_NOTYPE, 0, isec);
 }
 
-void ThumbV7ABSLongThunk::writeLong(uint8_t *Buf) {
-  const uint8_t Data[] = {
+void ThumbV7ABSLongThunk::writeLong(uint8_t *buf) {
+  const uint8_t data[] = {
       0x40, 0xf2, 0x00, 0x0c, // movw         ip, :lower16:S
       0xc0, 0xf2, 0x00, 0x0c, // movt         ip, :upper16:S
       0x60, 0x47,             // bx   ip
   };
-  uint64_t S = getARMThunkDestVA(Destination);
-  memcpy(Buf, Data, sizeof(Data));
-  Target->relocateOne(Buf, R_ARM_THM_MOVW_ABS_NC, S);
-  Target->relocateOne(Buf + 4, R_ARM_THM_MOVT_ABS, S);
+  uint64_t s = getARMThunkDestVA(destination);
+  memcpy(buf, data, sizeof(data));
+  target->relocateOne(buf, R_ARM_THM_MOVW_ABS_NC, s);
+  target->relocateOne(buf + 4, R_ARM_THM_MOVT_ABS, s);
 }
 
-void ThumbV7ABSLongThunk::addSymbols(ThunkSection &IS) {
-  addSymbol(Saver.save("__Thumbv7ABSLongThunk_" + Destination.getName()),
-            STT_FUNC, 1, IS);
-  addSymbol("$t", STT_NOTYPE, 0, IS);
+void ThumbV7ABSLongThunk::addSymbols(ThunkSection &isec) {
+  addSymbol(saver.save("__Thumbv7ABSLongThunk_" + destination.getName()),
+            STT_FUNC, 1, isec);
+  addSymbol("$t", STT_NOTYPE, 0, isec);
 }
 
-void ARMV7PILongThunk::writeLong(uint8_t *Buf) {
-  const uint8_t Data[] = {
+void ARMV7PILongThunk::writeLong(uint8_t *buf) {
+  const uint8_t data[] = {
       0xf0, 0xcf, 0x0f, 0xe3, // P:  movw ip,:lower16:S - (P + (L1-P) + 8)
       0x00, 0xc0, 0x40, 0xe3, //     movt ip,:upper16:S - (P + (L1-P) + 8)
       0x0f, 0xc0, 0x8c, 0xe0, // L1: add  ip, ip, pc
       0x1c, 0xff, 0x2f, 0xe1, //     bx   ip
   };
-  uint64_t S = getARMThunkDestVA(Destination);
-  uint64_t P = getThunkTargetSym()->getVA();
-  int64_t Offset = S - P - 16;
-  memcpy(Buf, Data, sizeof(Data));
-  Target->relocateOne(Buf, R_ARM_MOVW_PREL_NC, Offset);
-  Target->relocateOne(Buf + 4, R_ARM_MOVT_PREL, Offset);
+  uint64_t s = getARMThunkDestVA(destination);
+  uint64_t p = getThunkTargetSym()->getVA();
+  int64_t offset = s - p - 16;
+  memcpy(buf, data, sizeof(data));
+  target->relocateOne(buf, R_ARM_MOVW_PREL_NC, offset);
+  target->relocateOne(buf + 4, R_ARM_MOVT_PREL, offset);
 }
 
-void ARMV7PILongThunk::addSymbols(ThunkSection &IS) {
-  addSymbol(Saver.save("__ARMV7PILongThunk_" + Destination.getName()), STT_FUNC,
-            0, IS);
-  addSymbol("$a", STT_NOTYPE, 0, IS);
+void ARMV7PILongThunk::addSymbols(ThunkSection &isec) {
+  addSymbol(saver.save("__ARMV7PILongThunk_" + destination.getName()), STT_FUNC,
+            0, isec);
+  addSymbol("$a", STT_NOTYPE, 0, isec);
 }
 
-void ThumbV7PILongThunk::writeLong(uint8_t *Buf) {
-  const uint8_t Data[] = {
+void ThumbV7PILongThunk::writeLong(uint8_t *buf) {
+  const uint8_t data[] = {
       0x4f, 0xf6, 0xf4, 0x7c, // P:  movw ip,:lower16:S - (P + (L1-P) + 4)
       0xc0, 0xf2, 0x00, 0x0c, //     movt ip,:upper16:S - (P + (L1-P) + 4)
       0xfc, 0x44,             // L1: add  ip, pc
       0x60, 0x47,             //     bx   ip
   };
-  uint64_t S = getARMThunkDestVA(Destination);
-  uint64_t P = getThunkTargetSym()->getVA() & ~0x1;
-  int64_t Offset = S - P - 12;
-  memcpy(Buf, Data, sizeof(Data));
-  Target->relocateOne(Buf, R_ARM_THM_MOVW_PREL_NC, Offset);
-  Target->relocateOne(Buf + 4, R_ARM_THM_MOVT_PREL, Offset);
+  uint64_t s = getARMThunkDestVA(destination);
+  uint64_t p = getThunkTargetSym()->getVA() & ~0x1;
+  int64_t offset = s - p - 12;
+  memcpy(buf, data, sizeof(data));
+  target->relocateOne(buf, R_ARM_THM_MOVW_PREL_NC, offset);
+  target->relocateOne(buf + 4, R_ARM_THM_MOVT_PREL, offset);
 }
 
-void ThumbV7PILongThunk::addSymbols(ThunkSection &IS) {
-  addSymbol(Saver.save("__ThumbV7PILongThunk_" + Destination.getName()),
-            STT_FUNC, 1, IS);
-  addSymbol("$t", STT_NOTYPE, 0, IS);
+void ThumbV7PILongThunk::addSymbols(ThunkSection &isec) {
+  addSymbol(saver.save("__ThumbV7PILongThunk_" + destination.getName()),
+            STT_FUNC, 1, isec);
+  addSymbol("$t", STT_NOTYPE, 0, isec);
 }
 
-void ARMV5ABSLongThunk::writeLong(uint8_t *Buf) {
-  const uint8_t Data[] = {
+void ARMV5ABSLongThunk::writeLong(uint8_t *buf) {
+  const uint8_t data[] = {
       0x04, 0xf0, 0x1f, 0xe5, //     ldr pc, [pc,#-4] ; L1
       0x00, 0x00, 0x00, 0x00, // L1: .word S
   };
-  memcpy(Buf, Data, sizeof(Data));
-  Target->relocateOne(Buf + 4, R_ARM_ABS32, getARMThunkDestVA(Destination));
+  memcpy(buf, data, sizeof(data));
+  target->relocateOne(buf + 4, R_ARM_ABS32, getARMThunkDestVA(destination));
 }
 
-void ARMV5ABSLongThunk::addSymbols(ThunkSection &IS) {
-  addSymbol(Saver.save("__ARMv5ABSLongThunk_" + Destination.getName()),
-            STT_FUNC, 0, IS);
-  addSymbol("$a", STT_NOTYPE, 0, IS);
-  addSymbol("$d", STT_NOTYPE, 4, IS);
+void ARMV5ABSLongThunk::addSymbols(ThunkSection &isec) {
+  addSymbol(saver.save("__ARMv5ABSLongThunk_" + destination.getName()),
+            STT_FUNC, 0, isec);
+  addSymbol("$a", STT_NOTYPE, 0, isec);
+  addSymbol("$d", STT_NOTYPE, 4, isec);
 }
 
-bool ARMV5ABSLongThunk::isCompatibleWith(uint32_t RelocType) const {
+bool ARMV5ABSLongThunk::isCompatibleWith(const InputSection &isec,
+                                         const Relocation &rel) const {
   // Thumb branch relocations can't use BLX
-  return RelocType != R_ARM_THM_JUMP19 && RelocType != R_ARM_THM_JUMP24;
+  return rel.type != R_ARM_THM_JUMP19 && rel.type != R_ARM_THM_JUMP24;
 }
 
-void ARMV5PILongThunk::writeLong(uint8_t *Buf) {
-  const uint8_t Data[] = {
+void ARMV5PILongThunk::writeLong(uint8_t *buf) {
+  const uint8_t data[] = {
       0x04, 0xc0, 0x9f, 0xe5, // P:  ldr ip, [pc,#4] ; L2
       0x0c, 0xc0, 0x8f, 0xe0, // L1: add ip, pc, ip
       0x1c, 0xff, 0x2f, 0xe1, //     bx ip
       0x00, 0x00, 0x00, 0x00, // L2: .word S - (P + (L1 - P) + 8)
   };
-  uint64_t S = getARMThunkDestVA(Destination);
-  uint64_t P = getThunkTargetSym()->getVA() & ~0x1;
-  memcpy(Buf, Data, sizeof(Data));
-  Target->relocateOne(Buf + 12, R_ARM_REL32, S - P - 12);
+  uint64_t s = getARMThunkDestVA(destination);
+  uint64_t p = getThunkTargetSym()->getVA() & ~0x1;
+  memcpy(buf, data, sizeof(data));
+  target->relocateOne(buf + 12, R_ARM_REL32, s - p - 12);
 }
 
-void ARMV5PILongThunk::addSymbols(ThunkSection &IS) {
-  addSymbol(Saver.save("__ARMV5PILongThunk_" + Destination.getName()), STT_FUNC,
-            0, IS);
-  addSymbol("$a", STT_NOTYPE, 0, IS);
-  addSymbol("$d", STT_NOTYPE, 12, IS);
+void ARMV5PILongThunk::addSymbols(ThunkSection &isec) {
+  addSymbol(saver.save("__ARMV5PILongThunk_" + destination.getName()), STT_FUNC,
+            0, isec);
+  addSymbol("$a", STT_NOTYPE, 0, isec);
+  addSymbol("$d", STT_NOTYPE, 12, isec);
 }
 
-bool ARMV5PILongThunk::isCompatibleWith(uint32_t RelocType) const {
+bool ARMV5PILongThunk::isCompatibleWith(const InputSection &isec,
+                                        const Relocation &rel) const {
   // Thumb branch relocations can't use BLX
-  return RelocType != R_ARM_THM_JUMP19 && RelocType != R_ARM_THM_JUMP24;
+  return rel.type != R_ARM_THM_JUMP19 && rel.type != R_ARM_THM_JUMP24;
 }
 
-void ThumbV6MABSLongThunk::writeLong(uint8_t *Buf) {
+void ThumbV6MABSLongThunk::writeLong(uint8_t *buf) {
   // Most Thumb instructions cannot access the high registers r8 - r15. As the
   // only register we can corrupt is r12 we must instead spill a low register
   // to the stack to use as a scratch register. We push r1 even though we
   // don't need to get some space to use for the return address.
-  const uint8_t Data[] = {
+  const uint8_t data[] = {
       0x03, 0xb4,            // push {r0, r1} ; Obtain scratch registers
       0x01, 0x48,            // ldr r0, [pc, #4] ; L1
       0x01, 0x90,            // str r0, [sp, #4] ; SP + 4 = S
       0x01, 0xbd,            // pop {r0, pc} ; restore r0 and branch to dest
       0x00, 0x00, 0x00, 0x00 // L1: .word S
   };
-  uint64_t S = getARMThunkDestVA(Destination);
-  memcpy(Buf, Data, sizeof(Data));
-  Target->relocateOne(Buf + 8, R_ARM_ABS32, S);
+  uint64_t s = getARMThunkDestVA(destination);
+  memcpy(buf, data, sizeof(data));
+  target->relocateOne(buf + 8, R_ARM_ABS32, s);
 }
 
-void ThumbV6MABSLongThunk::addSymbols(ThunkSection &IS) {
-  addSymbol(Saver.save("__Thumbv6MABSLongThunk_" + Destination.getName()),
-            STT_FUNC, 1, IS);
-  addSymbol("$t", STT_NOTYPE, 0, IS);
-  addSymbol("$d", STT_NOTYPE, 8, IS);
+void ThumbV6MABSLongThunk::addSymbols(ThunkSection &isec) {
+  addSymbol(saver.save("__Thumbv6MABSLongThunk_" + destination.getName()),
+            STT_FUNC, 1, isec);
+  addSymbol("$t", STT_NOTYPE, 0, isec);
+  addSymbol("$d", STT_NOTYPE, 8, isec);
 }
 
-void ThumbV6MPILongThunk::writeLong(uint8_t *Buf) {
+void ThumbV6MPILongThunk::writeLong(uint8_t *buf) {
   // Most Thumb instructions cannot access the high registers r8 - r15. As the
   // only register we can corrupt is ip (r12) we must instead spill a low
   // register to the stack to use as a scratch register.
-  const uint8_t Data[] = {
+  const uint8_t data[] = {
       0x01, 0xb4,             // P:  push {r0}        ; Obtain scratch register
       0x02, 0x48,             //     ldr r0, [pc, #8] ; L2
       0x84, 0x46,             //     mov ip, r0       ; high to low register
@@ -600,131 +626,185 @@ void ThumbV6MPILongThunk::writeLong(uint8_t *Buf) {
       0xc0, 0x46,             //     nop              ; pad to 4-byte boundary
       0x00, 0x00, 0x00, 0x00, // L2: .word S - (P + (L1 - P) + 4)
   };
-  uint64_t S = getARMThunkDestVA(Destination);
-  uint64_t P = getThunkTargetSym()->getVA() & ~0x1;
-  memcpy(Buf, Data, sizeof(Data));
-  Target->relocateOne(Buf + 12, R_ARM_REL32, S - P - 12);
+  uint64_t s = getARMThunkDestVA(destination);
+  uint64_t p = getThunkTargetSym()->getVA() & ~0x1;
+  memcpy(buf, data, sizeof(data));
+  target->relocateOne(buf + 12, R_ARM_REL32, s - p - 12);
 }
 
-void ThumbV6MPILongThunk::addSymbols(ThunkSection &IS) {
-  addSymbol(Saver.save("__Thumbv6MPILongThunk_" + Destination.getName()),
-            STT_FUNC, 1, IS);
-  addSymbol("$t", STT_NOTYPE, 0, IS);
-  addSymbol("$d", STT_NOTYPE, 12, IS);
+void ThumbV6MPILongThunk::addSymbols(ThunkSection &isec) {
+  addSymbol(saver.save("__Thumbv6MPILongThunk_" + destination.getName()),
+            STT_FUNC, 1, isec);
+  addSymbol("$t", STT_NOTYPE, 0, isec);
+  addSymbol("$d", STT_NOTYPE, 12, isec);
 }
 
 // Write MIPS LA25 thunk code to call PIC function from the non-PIC one.
-void MipsThunk::writeTo(uint8_t *Buf) {
-  uint64_t S = Destination.getVA();
-  write32(Buf, 0x3c190000); // lui   $25, %hi(func)
-  write32(Buf + 4, 0x08000000 | (S >> 2)); // j     func
-  write32(Buf + 8, 0x27390000); // addiu $25, $25, %lo(func)
-  write32(Buf + 12, 0x00000000); // nop
-  Target->relocateOne(Buf, R_MIPS_HI16, S);
-  Target->relocateOne(Buf + 8, R_MIPS_LO16, S);
+void MipsThunk::writeTo(uint8_t *buf) {
+  uint64_t s = destination.getVA();
+  write32(buf, 0x3c190000); // lui   $25, %hi(func)
+  write32(buf + 4, 0x08000000 | (s >> 2)); // j     func
+  write32(buf + 8, 0x27390000); // addiu $25, $25, %lo(func)
+  write32(buf + 12, 0x00000000); // nop
+  target->relocateOne(buf, R_MIPS_HI16, s);
+  target->relocateOne(buf + 8, R_MIPS_LO16, s);
 }
 
-void MipsThunk::addSymbols(ThunkSection &IS) {
-  addSymbol(Saver.save("__LA25Thunk_" + Destination.getName()), STT_FUNC, 0,
-            IS);
+void MipsThunk::addSymbols(ThunkSection &isec) {
+  addSymbol(saver.save("__LA25Thunk_" + destination.getName()), STT_FUNC, 0,
+            isec);
 }
 
 InputSection *MipsThunk::getTargetInputSection() const {
-  auto &DR = cast<Defined>(Destination);
-  return dyn_cast<InputSection>(DR.Section);
+  auto &dr = cast<Defined>(destination);
+  return dyn_cast<InputSection>(dr.section);
 }
 
 // Write microMIPS R2-R5 LA25 thunk code
 // to call PIC function from the non-PIC one.
-void MicroMipsThunk::writeTo(uint8_t *Buf) {
-  uint64_t S = Destination.getVA() | 1;
-  write16(Buf, 0x41b9);       // lui   $25, %hi(func)
-  write16(Buf + 4, 0xd400);   // j     func
-  write16(Buf + 8, 0x3339);   // addiu $25, $25, %lo(func)
-  write16(Buf + 12, 0x0c00);  // nop
-  Target->relocateOne(Buf, R_MICROMIPS_HI16, S);
-  Target->relocateOne(Buf + 4, R_MICROMIPS_26_S1, S);
-  Target->relocateOne(Buf + 8, R_MICROMIPS_LO16, S);
+void MicroMipsThunk::writeTo(uint8_t *buf) {
+  uint64_t s = destination.getVA();
+  write16(buf, 0x41b9);       // lui   $25, %hi(func)
+  write16(buf + 4, 0xd400);   // j     func
+  write16(buf + 8, 0x3339);   // addiu $25, $25, %lo(func)
+  write16(buf + 12, 0x0c00);  // nop
+  target->relocateOne(buf, R_MICROMIPS_HI16, s);
+  target->relocateOne(buf + 4, R_MICROMIPS_26_S1, s);
+  target->relocateOne(buf + 8, R_MICROMIPS_LO16, s);
 }
 
-void MicroMipsThunk::addSymbols(ThunkSection &IS) {
-  Defined *D = addSymbol(
-      Saver.save("__microLA25Thunk_" + Destination.getName()), STT_FUNC, 0, IS);
-  D->StOther |= STO_MIPS_MICROMIPS;
+void MicroMipsThunk::addSymbols(ThunkSection &isec) {
+  Defined *d = addSymbol(
+      saver.save("__microLA25Thunk_" + destination.getName()), STT_FUNC, 0, isec);
+  d->stOther |= STO_MIPS_MICROMIPS;
 }
 
 InputSection *MicroMipsThunk::getTargetInputSection() const {
-  auto &DR = cast<Defined>(Destination);
-  return dyn_cast<InputSection>(DR.Section);
+  auto &dr = cast<Defined>(destination);
+  return dyn_cast<InputSection>(dr.section);
 }
 
 // Write microMIPS R6 LA25 thunk code
 // to call PIC function from the non-PIC one.
-void MicroMipsR6Thunk::writeTo(uint8_t *Buf) {
-  uint64_t S = Destination.getVA() | 1;
-  uint64_t P = getThunkTargetSym()->getVA();
-  write16(Buf, 0x1320);       // lui   $25, %hi(func)
-  write16(Buf + 4, 0x3339);   // addiu $25, $25, %lo(func)
-  write16(Buf + 8, 0x9400);   // bc    func
-  Target->relocateOne(Buf, R_MICROMIPS_HI16, S);
-  Target->relocateOne(Buf + 4, R_MICROMIPS_LO16, S);
-  Target->relocateOne(Buf + 8, R_MICROMIPS_PC26_S1, S - P - 12);
+void MicroMipsR6Thunk::writeTo(uint8_t *buf) {
+  uint64_t s = destination.getVA();
+  uint64_t p = getThunkTargetSym()->getVA();
+  write16(buf, 0x1320);       // lui   $25, %hi(func)
+  write16(buf + 4, 0x3339);   // addiu $25, $25, %lo(func)
+  write16(buf + 8, 0x9400);   // bc    func
+  target->relocateOne(buf, R_MICROMIPS_HI16, s);
+  target->relocateOne(buf + 4, R_MICROMIPS_LO16, s);
+  target->relocateOne(buf + 8, R_MICROMIPS_PC26_S1, s - p - 12);
 }
 
-void MicroMipsR6Thunk::addSymbols(ThunkSection &IS) {
-  Defined *D = addSymbol(
-      Saver.save("__microLA25Thunk_" + Destination.getName()), STT_FUNC, 0, IS);
-  D->StOther |= STO_MIPS_MICROMIPS;
+void MicroMipsR6Thunk::addSymbols(ThunkSection &isec) {
+  Defined *d = addSymbol(
+      saver.save("__microLA25Thunk_" + destination.getName()), STT_FUNC, 0, isec);
+  d->stOther |= STO_MIPS_MICROMIPS;
 }
 
 InputSection *MicroMipsR6Thunk::getTargetInputSection() const {
-  auto &DR = cast<Defined>(Destination);
-  return dyn_cast<InputSection>(DR.Section);
+  auto &dr = cast<Defined>(destination);
+  return dyn_cast<InputSection>(dr.section);
 }
 
-static void writePPCLoadAndBranch(uint8_t *Buf, int64_t Offset) {
-  uint16_t OffHa = (Offset + 0x8000) >> 16;
-  uint16_t OffLo = Offset & 0xffff;
+void PPC32PltCallStub::writeTo(uint8_t *buf) {
+  if (!config->isPic) {
+    uint64_t va = destination.getGotPltVA();
+    write32(buf + 0, 0x3d600000 | (va + 0x8000) >> 16); // lis r11,ha
+    write32(buf + 4, 0x816b0000 | (uint16_t)va);        // lwz r11,l(r11)
+    write32(buf + 8, 0x7d6903a6);                       // mtctr r11
+    write32(buf + 12, 0x4e800420);                      // bctr
+    return;
+  }
+  uint32_t offset;
+  if (addend >= 0x8000) {
+    // The stub loads an address relative to r30 (.got2+Addend). Addend is
+    // almost always 0x8000. The address of .got2 is different in another object
+    // file, so a stub cannot be shared.
+    offset = destination.getGotPltVA() - (in.ppc32Got2->getParent()->getVA() +
+                                          file->ppc32Got2OutSecOff + addend);
+  } else {
+    // The stub loads an address relative to _GLOBAL_OFFSET_TABLE_ (which is
+    // currently the address of .got).
+    offset = destination.getGotPltVA() - in.got->getVA();
+  }
+  uint16_t ha = (offset + 0x8000) >> 16, l = (uint16_t)offset;
+  if (ha == 0) {
+    write32(buf + 0, 0x817e0000 | l); // lwz r11,l(r30)
+    write32(buf + 4, 0x7d6903a6);     // mtctr r11
+    write32(buf + 8, 0x4e800420);     // bctr
+    write32(buf + 12, 0x60000000);    // nop
+  } else {
+    write32(buf + 0, 0x3d7e0000 | ha); // addis r11,r30,ha
+    write32(buf + 4, 0x816b0000 | l);  // lwz r11,l(r11)
+    write32(buf + 8, 0x7d6903a6);      // mtctr r11
+    write32(buf + 12, 0x4e800420);     // bctr
+  }
+}
+
+void PPC32PltCallStub::addSymbols(ThunkSection &isec) {
+  std::string buf;
+  raw_string_ostream os(buf);
+  os << format_hex_no_prefix(addend, 8);
+  if (!config->isPic)
+    os << ".plt_call32.";
+  else if (addend >= 0x8000)
+    os << ".got2.plt_pic32.";
+  else
+    os << ".plt_pic32.";
+  os << destination.getName();
+  addSymbol(saver.save(os.str()), STT_FUNC, 0, isec);
+}
+
+bool PPC32PltCallStub::isCompatibleWith(const InputSection &isec,
+                                        const Relocation &rel) const {
+  return !config->isPic || (isec.file == file && rel.addend == addend);
+}
+
+static void writePPCLoadAndBranch(uint8_t *buf, int64_t offset) {
+  uint16_t offHa = (offset + 0x8000) >> 16;
+  uint16_t offLo = offset & 0xffff;
 
-  write32(Buf + 0, 0x3d820000 | OffHa); // addis r12, r2, OffHa
-  write32(Buf + 4, 0xe98c0000 | OffLo); // ld    r12, OffLo(r12)
-  write32(Buf + 8, 0x7d8903a6);         // mtctr r12
-  write32(Buf + 12, 0x4e800420);        // bctr
+  write32(buf + 0, 0x3d820000 | offHa); // addis r12, r2, OffHa
+  write32(buf + 4, 0xe98c0000 | offLo); // ld    r12, OffLo(r12)
+  write32(buf + 8, 0x7d8903a6);         // mtctr r12
+  write32(buf + 12, 0x4e800420);        // bctr
 }
 
-void PPC64PltCallStub::writeTo(uint8_t *Buf) {
-  int64_t Offset = Destination.getGotPltVA() - getPPC64TocBase();
+void PPC64PltCallStub::writeTo(uint8_t *buf) {
+  int64_t offset = destination.getGotPltVA() - getPPC64TocBase();
   // Save the TOC pointer to the save-slot reserved in the call frame.
-  write32(Buf + 0, 0xf8410018); // std     r2,24(r1)
-  writePPCLoadAndBranch(Buf + 4, Offset);
+  write32(buf + 0, 0xf8410018); // std     r2,24(r1)
+  writePPCLoadAndBranch(buf + 4, offset);
 }
 
-void PPC64PltCallStub::addSymbols(ThunkSection &IS) {
-  Defined *S = addSymbol(Saver.save("__plt_" + Destination.getName()), STT_FUNC,
-                         0, IS);
-  S->NeedsTocRestore = true;
+void PPC64PltCallStub::addSymbols(ThunkSection &isec) {
+  Defined *s = addSymbol(saver.save("__plt_" + destination.getName()), STT_FUNC,
+                         0, isec);
+  s->needsTocRestore = true;
 }
 
-void PPC64LongBranchThunk::writeTo(uint8_t *Buf) {
-  int64_t Offset = Destination.getPPC64LongBranchTableVA() - getPPC64TocBase();
-  writePPCLoadAndBranch(Buf, Offset);
+void PPC64LongBranchThunk::writeTo(uint8_t *buf) {
+  int64_t offset = destination.getPPC64LongBranchTableVA() - getPPC64TocBase();
+  writePPCLoadAndBranch(buf, offset);
 }
 
-void PPC64LongBranchThunk::addSymbols(ThunkSection &IS) {
-  addSymbol(Saver.save("__long_branch_" + Destination.getName()), STT_FUNC, 0,
-            IS);
+void PPC64LongBranchThunk::addSymbols(ThunkSection &isec) {
+  addSymbol(saver.save("__long_branch_" + destination.getName()), STT_FUNC, 0,
+            isec);
 }
 
-Thunk::Thunk(Symbol &D) : Destination(D), Offset(0) {}
+Thunk::Thunk(Symbol &d) : destination(d), offset(0) {}
 
 Thunk::~Thunk() = default;
 
-static Thunk *addThunkAArch64(RelType Type, Symbol &S) {
-  if (Type != R_AARCH64_CALL26 && Type != R_AARCH64_JUMP26)
+static Thunk *addThunkAArch64(RelType type, Symbol &s) {
+  if (type != R_AARCH64_CALL26 && type != R_AARCH64_JUMP26)
     fatal("unrecognized relocation type");
-  if (Config->PicThunk)
-    return make<AArch64ADRPThunk>(S);
-  return make<AArch64ABSLongThunk>(S);
+  if (config->picThunk)
+    return make<AArch64ADRPThunk>(s);
+  return make<AArch64ABSLongThunk>(s);
 }
 
 // Creates a thunk for Thumb-ARM interworking.
@@ -732,18 +812,18 @@ static Thunk *addThunkAArch64(RelType Type, Symbol &S) {
 // - MOVT and MOVW instructions cannot be used
 // - Only Thumb relocation that can generate a Thunk is a BL, this can always
 //   be transformed into a BLX
-static Thunk *addThunkPreArmv7(RelType Reloc, Symbol &S) {
-  switch (Reloc) {
+static Thunk *addThunkPreArmv7(RelType reloc, Symbol &s) {
+  switch (reloc) {
   case R_ARM_PC24:
   case R_ARM_PLT32:
   case R_ARM_JUMP24:
   case R_ARM_CALL:
   case R_ARM_THM_CALL:
-    if (Config->PicThunk)
-      return make<ARMV5PILongThunk>(S);
-    return make<ARMV5ABSLongThunk>(S);
+    if (config->picThunk)
+      return make<ARMV5PILongThunk>(s);
+    return make<ARMV5ABSLongThunk>(s);
   }
-  fatal("relocation " + toString(Reloc) + " to " + toString(S) +
+  fatal("relocation " + toString(reloc) + " to " + toString(s) +
         " not supported for Armv5 or Armv6 targets");
 }
 
@@ -752,21 +832,21 @@ static Thunk *addThunkPreArmv7(RelType Reloc, Symbol &S) {
 // - MOVT and MOVW instructions cannot be used.
 // - Only a limited number of instructions can access registers r8 and above
 // - No interworking support is needed (all Thumb).
-static Thunk *addThunkV6M(RelType Reloc, Symbol &S) {
-  switch (Reloc) {
+static Thunk *addThunkV6M(RelType reloc, Symbol &s) {
+  switch (reloc) {
   case R_ARM_THM_JUMP19:
   case R_ARM_THM_JUMP24:
   case R_ARM_THM_CALL:
-    if (Config->Pic)
-      return make<ThumbV6MPILongThunk>(S);
-    return make<ThumbV6MABSLongThunk>(S);
+    if (config->isPic)
+      return make<ThumbV6MPILongThunk>(s);
+    return make<ThumbV6MABSLongThunk>(s);
   }
-  fatal("relocation " + toString(Reloc) + " to " + toString(S) +
+  fatal("relocation " + toString(reloc) + " to " + toString(s) +
         " not supported for Armv6-M targets");
 }
 
 // Creates a thunk for Thumb-ARM interworking or branch range extension.
-static Thunk *addThunkArm(RelType Reloc, Symbol &S) {
+static Thunk *addThunkArm(RelType reloc, Symbol &s) {
   // Decide which Thunk is needed based on:
   // Available instruction set
   // - An Arm Thunk can only be used if Arm state is available.
@@ -783,61 +863,72 @@ static Thunk *addThunkArm(RelType Reloc, Symbol &S) {
   // can use in Thunks. The flags below are set by reading the BuildAttributes
   // of the input objects. InputFiles.cpp contains the mapping from ARM
   // architecture to flag.
-  if (!Config->ARMHasMovtMovw) {
-    if (!Config->ARMJ1J2BranchEncoding)
-      return addThunkPreArmv7(Reloc, S);
-    return addThunkV6M(Reloc, S);
+  if (!config->armHasMovtMovw) {
+    if (!config->armJ1J2BranchEncoding)
+      return addThunkPreArmv7(reloc, s);
+    return addThunkV6M(reloc, s);
   }
 
-  switch (Reloc) {
+  switch (reloc) {
   case R_ARM_PC24:
   case R_ARM_PLT32:
   case R_ARM_JUMP24:
   case R_ARM_CALL:
-    if (Config->PicThunk)
-      return make<ARMV7PILongThunk>(S);
-    return make<ARMV7ABSLongThunk>(S);
+    if (config->picThunk)
+      return make<ARMV7PILongThunk>(s);
+    return make<ARMV7ABSLongThunk>(s);
   case R_ARM_THM_JUMP19:
   case R_ARM_THM_JUMP24:
   case R_ARM_THM_CALL:
-    if (Config->PicThunk)
-      return make<ThumbV7PILongThunk>(S);
-    return make<ThumbV7ABSLongThunk>(S);
+    if (config->picThunk)
+      return make<ThumbV7PILongThunk>(s);
+    return make<ThumbV7ABSLongThunk>(s);
   }
   fatal("unrecognized relocation type");
 }
 
-static Thunk *addThunkMips(RelType Type, Symbol &S) {
-  if ((S.StOther & STO_MIPS_MICROMIPS) && isMipsR6())
-    return make<MicroMipsR6Thunk>(S);
-  if (S.StOther & STO_MIPS_MICROMIPS)
-    return make<MicroMipsThunk>(S);
-  return make<MipsThunk>(S);
+static Thunk *addThunkMips(RelType type, Symbol &s) {
+  if ((s.stOther & STO_MIPS_MICROMIPS) && isMipsR6())
+    return make<MicroMipsR6Thunk>(s);
+  if (s.stOther & STO_MIPS_MICROMIPS)
+    return make<MicroMipsThunk>(s);
+  return make<MipsThunk>(s);
 }
 
-static Thunk *addThunkPPC64(RelType Type, Symbol &S) {
-  assert(Type == R_PPC64_REL24 && "unexpected relocation type for thunk");
-  if (S.isInPlt())
-    return make<PPC64PltCallStub>(S);
+static Thunk *addThunkPPC32(const InputSection &isec, const Relocation &rel, Symbol &s) {
+  assert((rel.type == R_PPC_REL24 || rel.type == R_PPC_PLTREL24) &&
+         "unexpected relocation type for thunk");
+  return make<PPC32PltCallStub>(isec, rel, s);
+}
+
+static Thunk *addThunkPPC64(RelType type, Symbol &s) {
+  assert(type == R_PPC64_REL24 && "unexpected relocation type for thunk");
+  if (s.isInPlt())
+    return make<PPC64PltCallStub>(s);
 
-  if (Config->PicThunk)
-    return make<PPC64PILongBranchThunk>(S);
+  if (config->picThunk)
+    return make<PPC64PILongBranchThunk>(s);
 
-  return make<PPC64PDLongBranchThunk>(S);
+  return make<PPC64PDLongBranchThunk>(s);
 }
 
-Thunk *addThunk(RelType Type, Symbol &S) {
-  if (Config->EMachine == EM_AARCH64)
-    return addThunkAArch64(Type, S);
+Thunk *addThunk(const InputSection &isec, Relocation &rel) {
+  Symbol &s = *rel.sym;
+
+  if (config->emachine == EM_AARCH64)
+    return addThunkAArch64(rel.type, s);
+
+  if (config->emachine == EM_ARM)
+    return addThunkArm(rel.type, s);
 
-  if (Config->EMachine == EM_ARM)
-    return addThunkArm(Type, S);
+  if (config->emachine == EM_MIPS)
+    return addThunkMips(rel.type, s);
 
-  if (Config->EMachine == EM_MIPS)
-    return addThunkMips(Type, S);
+  if (config->emachine == EM_PPC)
+    return addThunkPPC32(isec, rel, s);
 
-  if (Config->EMachine == EM_PPC64)
-    return addThunkPPC64(Type, S);
+  if (config->emachine == EM_PPC64)
+    return addThunkPPC64(rel.type, s);
 
   llvm_unreachable("add Thunk only supported for ARM, Mips and PowerPC");
 }
diff --git a/deps/lld/ELF/Thunks.h b/deps/lld/ELF/Thunks.h
index ed82b4d946ac281e488f0e56a996185d12106b67..2d27ee5f6c38e1037744d14590ba54e15efb3daa 100644
--- a/deps/lld/ELF/Thunks.h
+++ b/deps/lld/ELF/Thunks.h
@@ -1,9 +1,8 @@
 //===- Thunks.h --------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -28,42 +27,45 @@ class ThunkSection;
 // Thunks are assigned to synthetic ThunkSections
 class Thunk {
 public:
-  Thunk(Symbol &Destination);
+  Thunk(Symbol &destination);
   virtual ~Thunk();
 
   virtual uint32_t size() = 0;
-  virtual void writeTo(uint8_t *Buf) = 0;
+  virtual void writeTo(uint8_t *buf) = 0;
 
   // All Thunks must define at least one symbol, known as the thunk target
   // symbol, so that we can redirect relocations to it. The thunk may define
   // additional symbols, but these are never targets for relocations.
-  virtual void addSymbols(ThunkSection &IS) = 0;
+  virtual void addSymbols(ThunkSection &isec) = 0;
 
-  void setOffset(uint64_t Offset);
-  Defined *addSymbol(StringRef Name, uint8_t Type, uint64_t Value,
-                     InputSectionBase &Section);
+  void setOffset(uint64_t offset);
+  Defined *addSymbol(StringRef name, uint8_t type, uint64_t value,
+                     InputSectionBase &section);
 
   // Some Thunks must be placed immediately before their Target as they elide
   // a branch and fall through to the first Symbol in the Target.
   virtual InputSection *getTargetInputSection() const { return nullptr; }
 
-  // To reuse a Thunk the caller as identified by the Type must be
-  // compatible with it.
-  virtual bool isCompatibleWith(RelType Type) const { return true; }
+  // To reuse a Thunk the InputSection and the relocation must be compatible
+  // with it.
+  virtual bool isCompatibleWith(const InputSection &,
+                                const Relocation &) const {
+    return true;
+  }
 
-  Defined *getThunkTargetSym() const { return Syms[0]; }
+  Defined *getThunkTargetSym() const { return syms[0]; }
 
   // The alignment requirement for this Thunk, defaults to the size of the
   // typical code section alignment.
-  Symbol &Destination;
-  llvm::SmallVector<Defined *, 3> Syms;
-  uint64_t Offset = 0;
-  uint32_t Alignment = 4;
+  Symbol &destination;
+  llvm::SmallVector<Defined *, 3> syms;
+  uint64_t offset = 0;
+  uint32_t alignment = 4;
 };
 
 // For a Relocation to symbol S create a Thunk to be added to a synthetic
-// ThunkSection. At present there are implementations for ARM and Mips Thunks.
-Thunk *addThunk(RelType Type, Symbol &S);
+// ThunkSection.
+Thunk *addThunk(const InputSection &isec, Relocation &rel);
 
 } // namespace elf
 } // namespace lld
diff --git a/deps/lld/ELF/Writer.cpp b/deps/lld/ELF/Writer.cpp
index 17f4c7961d30e488d3dd046ef5718225fb765b20..b8c8891648a469408508bd467d4a6b21e4b4cd43 100644
--- a/deps/lld/ELF/Writer.cpp
+++ b/deps/lld/ELF/Writer.cpp
@@ -1,9 +1,8 @@
 //===- Writer.cpp ---------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -11,7 +10,6 @@
 #include "AArch64ErrataFix.h"
 #include "CallGraphSort.h"
 #include "Config.h"
-#include "Filesystem.h"
 #include "LinkerScript.h"
 #include "MapFile.h"
 #include "OutputSections.h"
@@ -20,11 +18,15 @@
 #include "Symbols.h"
 #include "SyntheticSections.h"
 #include "Target.h"
+#include "lld/Common/Filesystem.h"
 #include "lld/Common/Memory.h"
 #include "lld/Common/Strings.h"
 #include "lld/Common/Threads.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringSwitch.h"
+#include "llvm/Support/RandomNumberGenerator.h"
+#include "llvm/Support/SHA1.h"
+#include "llvm/Support/xxhash.h"
 #include <climits>
 
 using namespace llvm;
@@ -40,31 +42,32 @@ namespace {
 // The writer writes a SymbolTable result to a file.
 template <class ELFT> class Writer {
 public:
-  Writer() : Buffer(errorHandler().OutputBuffer) {}
-  typedef typename ELFT::Shdr Elf_Shdr;
-  typedef typename ELFT::Ehdr Elf_Ehdr;
-  typedef typename ELFT::Phdr Elf_Phdr;
+  Writer() : buffer(errorHandler().outputBuffer) {}
+  using Elf_Shdr = typename ELFT::Shdr;
+  using Elf_Ehdr = typename ELFT::Ehdr;
+  using Elf_Phdr = typename ELFT::Phdr;
 
   void run();
 
 private:
   void copyLocalSymbols();
   void addSectionSymbols();
-  void forEachRelSec(llvm::function_ref<void(InputSectionBase &)> Fn);
+  void forEachRelSec(llvm::function_ref<void(InputSectionBase &)> fn);
   void sortSections();
   void resolveShfLinkOrder();
-  void maybeAddThunks();
+  void finalizeAddressDependentContent();
   void sortInputSections();
   void finalizeSections();
   void checkExecuteOnly();
   void setReservedSymbolSections();
 
-  std::vector<PhdrEntry *> createPhdrs();
-  void removeEmptyPTLoad();
-  void addPtArmExid(std::vector<PhdrEntry *> &Phdrs);
+  std::vector<PhdrEntry *> createPhdrs(Partition &part);
+  void removeEmptyPTLoad(std::vector<PhdrEntry *> &phdrEntry);
+  void addPhdrForSection(Partition &part, unsigned shType, unsigned pType,
+                         unsigned pFlags);
   void assignFileOffsets();
   void assignFileOffsetsBinary();
-  void setPhdrs();
+  void setPhdrs(Partition &part);
   void checkSections();
   void fixSectionAlignments();
   void openFile();
@@ -74,36 +77,34 @@ private:
   void writeSectionsBinary();
   void writeBuildId();
 
-  std::unique_ptr<FileOutputBuffer> &Buffer;
+  std::unique_ptr<FileOutputBuffer> &buffer;
 
   void addRelIpltSymbols();
   void addStartEndSymbols();
-  void addStartStopSymbols(OutputSection *Sec);
+  void addStartStopSymbols(OutputSection *sec);
 
-  std::vector<PhdrEntry *> Phdrs;
-
-  uint64_t FileSize;
-  uint64_t SectionHeaderOff;
+  uint64_t fileSize;
+  uint64_t sectionHeaderOff;
 };
 } // anonymous namespace
 
-static bool isSectionPrefix(StringRef Prefix, StringRef Name) {
-  return Name.startswith(Prefix) || Name == Prefix.drop_back();
+static bool isSectionPrefix(StringRef prefix, StringRef name) {
+  return name.startswith(prefix) || name == prefix.drop_back();
 }
 
-StringRef elf::getOutputSectionName(const InputSectionBase *S) {
-  if (Config->Relocatable)
-    return S->Name;
+StringRef elf::getOutputSectionName(const InputSectionBase *s) {
+  if (config->relocatable)
+    return s->name;
 
   // This is for --emit-relocs. If .text.foo is emitted as .text.bar, we want
   // to emit .rela.text.foo as .rela.text.bar for consistency (this is not
   // technically required, but not doing it is odd). This code guarantees that.
-  if (auto *IS = dyn_cast<InputSection>(S)) {
-    if (InputSectionBase *Rel = IS->getRelocatedSection()) {
-      OutputSection *Out = Rel->getOutputSection();
-      if (S->Type == SHT_RELA)
-        return Saver.save(".rela" + Out->Name);
-      return Saver.save(".rel" + Out->Name);
+  if (auto *isec = dyn_cast<InputSection>(s)) {
+    if (InputSectionBase *rel = isec->getRelocatedSection()) {
+      OutputSection *out = rel->getOutputSection();
+      if (s->type == SHT_RELA)
+        return saver.save(".rela" + out->name);
+      return saver.save(".rel" + out->name);
     }
   }
 
@@ -113,97 +114,133 @@ StringRef elf::getOutputSectionName(const InputSectionBase *S) {
   // When enabled, this allows identifying the hot code region (.text.hot) in
   // the final binary which can be selectively mapped to huge pages or mlocked,
   // for instance.
-  if (Config->ZKeepTextSectionPrefix)
-    for (StringRef V :
+  if (config->zKeepTextSectionPrefix)
+    for (StringRef v :
          {".text.hot.", ".text.unlikely.", ".text.startup.", ".text.exit."})
-      if (isSectionPrefix(V, S->Name))
-        return V.drop_back();
+      if (isSectionPrefix(v, s->name))
+        return v.drop_back();
 
-  for (StringRef V :
+  for (StringRef v :
        {".text.", ".rodata.", ".data.rel.ro.", ".data.", ".bss.rel.ro.",
         ".bss.", ".init_array.", ".fini_array.", ".ctors.", ".dtors.", ".tbss.",
         ".gcc_except_table.", ".tdata.", ".ARM.exidx.", ".ARM.extab."})
-    if (isSectionPrefix(V, S->Name))
-      return V.drop_back();
+    if (isSectionPrefix(v, s->name))
+      return v.drop_back();
 
   // CommonSection is identified as "COMMON" in linker scripts.
   // By default, it should go to .bss section.
-  if (S->Name == "COMMON")
+  if (s->name == "COMMON")
     return ".bss";
 
-  return S->Name;
+  return s->name;
 }
 
 static bool needsInterpSection() {
-  return !SharedFiles.empty() && !Config->DynamicLinker.empty() &&
-         Script->needsInterpSection();
+  return !sharedFiles.empty() && !config->dynamicLinker.empty() &&
+         script->needsInterpSection();
 }
 
 template <class ELFT> void elf::writeResult() { Writer<ELFT>().run(); }
 
-template <class ELFT> void Writer<ELFT>::removeEmptyPTLoad() {
-  llvm::erase_if(Phdrs, [&](const PhdrEntry *P) {
-    if (P->p_type != PT_LOAD)
+template <class ELFT>
+void Writer<ELFT>::removeEmptyPTLoad(std::vector<PhdrEntry *> &phdrs) {
+  llvm::erase_if(phdrs, [&](const PhdrEntry *p) {
+    if (p->p_type != PT_LOAD)
       return false;
-    if (!P->FirstSec)
+    if (!p->firstSec)
       return true;
-    uint64_t Size = P->LastSec->Addr + P->LastSec->Size - P->FirstSec->Addr;
-    return Size == 0;
+    uint64_t size = p->lastSec->addr + p->lastSec->size - p->firstSec->addr;
+    return size == 0;
   });
 }
 
-template <class ELFT> static void combineEhFrameSections() {
-  for (InputSectionBase *&S : InputSections) {
-    EhInputSection *ES = dyn_cast<EhInputSection>(S);
-    if (!ES || !ES->Live)
+template <class ELFT> static void copySectionsIntoPartitions() {
+  std::vector<InputSectionBase *> newSections;
+  for (unsigned part = 2; part != partitions.size() + 1; ++part) {
+    for (InputSectionBase *s : inputSections) {
+      if (!(s->flags & SHF_ALLOC) || !s->isLive())
+        continue;
+      InputSectionBase *copy;
+      if (s->type == SHT_NOTE)
+        copy = make<InputSection>(cast<InputSection>(*s));
+      else if (auto *es = dyn_cast<EhInputSection>(s))
+        copy = make<EhInputSection>(*es);
+      else
+        continue;
+      copy->partition = part;
+      newSections.push_back(copy);
+    }
+  }
+
+  inputSections.insert(inputSections.end(), newSections.begin(),
+                       newSections.end());
+}
+
+template <class ELFT> static void combineEhSections() {
+  for (InputSectionBase *&s : inputSections) {
+    // Ignore dead sections and the partition end marker (.part.end),
+    // whose partition number is out of bounds.
+    if (!s->isLive() || s->partition == 255)
       continue;
 
-    In.EhFrame->addSection<ELFT>(ES);
-    S = nullptr;
+    Partition &part = s->getPartition();
+    if (auto *es = dyn_cast<EhInputSection>(s)) {
+      part.ehFrame->addSection<ELFT>(es);
+      s = nullptr;
+    } else if (s->kind() == SectionBase::Regular && part.armExidx &&
+               part.armExidx->addSection(cast<InputSection>(s))) {
+      s = nullptr;
+    }
   }
 
-  std::vector<InputSectionBase *> &V = InputSections;
-  V.erase(std::remove(V.begin(), V.end(), nullptr), V.end());
+  std::vector<InputSectionBase *> &v = inputSections;
+  v.erase(std::remove(v.begin(), v.end(), nullptr), v.end());
 }
 
-static Defined *addOptionalRegular(StringRef Name, SectionBase *Sec,
-                                   uint64_t Val, uint8_t StOther = STV_HIDDEN,
-                                   uint8_t Binding = STB_GLOBAL) {
-  Symbol *S = Symtab->find(Name);
-  if (!S || S->isDefined())
+static Defined *addOptionalRegular(StringRef name, SectionBase *sec,
+                                   uint64_t val, uint8_t stOther = STV_HIDDEN,
+                                   uint8_t binding = STB_GLOBAL) {
+  Symbol *s = symtab->find(name);
+  if (!s || s->isDefined())
     return nullptr;
-  return Symtab->addDefined(Name, StOther, STT_NOTYPE, Val,
-                            /*Size=*/0, Binding, Sec,
-                            /*File=*/nullptr);
+
+  s->resolve(Defined{/*file=*/nullptr, name, binding, stOther, STT_NOTYPE, val,
+                     /*size=*/0, sec});
+  return cast<Defined>(s);
 }
 
-static Defined *addAbsolute(StringRef Name) {
-  return Symtab->addDefined(Name, STV_HIDDEN, STT_NOTYPE, 0, 0, STB_GLOBAL,
-                            nullptr, nullptr);
+static Defined *addAbsolute(StringRef name) {
+  Symbol *sym = symtab->addSymbol(Defined{nullptr, name, STB_GLOBAL, STV_HIDDEN,
+                                          STT_NOTYPE, 0, 0, nullptr});
+  return cast<Defined>(sym);
 }
 
 // The linker is expected to define some symbols depending on
 // the linking result. This function defines such symbols.
 void elf::addReservedSymbols() {
-  if (Config->EMachine == EM_MIPS) {
+  if (config->emachine == EM_MIPS) {
     // Define _gp for MIPS. st_value of _gp symbol will be updated by Writer
     // so that it points to an absolute address which by default is relative
     // to GOT. Default offset is 0x7ff0.
     // See "Global Data Symbols" in Chapter 6 in the following document:
     // ftp://www.linux-mips.org/pub/linux/mips/doc/ABI/mipsabi.pdf
-    ElfSym::MipsGp = addAbsolute("_gp");
+    ElfSym::mipsGp = addAbsolute("_gp");
 
     // On MIPS O32 ABI, _gp_disp is a magic symbol designates offset between
     // start of function and 'gp' pointer into GOT.
-    if (Symtab->find("_gp_disp"))
-      ElfSym::MipsGpDisp = addAbsolute("_gp_disp");
+    if (symtab->find("_gp_disp"))
+      ElfSym::mipsGpDisp = addAbsolute("_gp_disp");
 
     // The __gnu_local_gp is a magic symbol equal to the current value of 'gp'
     // pointer. This symbol is used in the code generated by .cpload pseudo-op
     // in case of using -mno-shared option.
     // https://sourceware.org/ml/binutils/2004-12/msg00094.html
-    if (Symtab->find("__gnu_local_gp"))
-      ElfSym::MipsLocalGp = addAbsolute("__gnu_local_gp");
+    if (symtab->find("__gnu_local_gp"))
+      ElfSym::mipsLocalGp = addAbsolute("__gnu_local_gp");
+  } else if (config->emachine == EM_PPC) {
+    // glibc *crt1.o has a undefined reference to _SDA_BASE_. Since we don't
+    // support Small Data Area, define it arbitrarily as 0.
+    addOptionalRegular("_SDA_BASE_", nullptr, 0, STV_HIDDEN);
   }
 
   // The Power Architecture 64-bit v2 ABI defines a TableOfContents (TOC) which
@@ -214,56 +251,62 @@ void elf::addReservedSymbols() {
   // the .got section.
   // We do not allow _GLOBAL_OFFSET_TABLE_ to be defined by input objects as the
   // correctness of some relocations depends on its value.
-  StringRef GotTableSymName =
-      (Config->EMachine == EM_PPC64) ? ".TOC." : "_GLOBAL_OFFSET_TABLE_";
-  if (Symbol *S = Symtab->find(GotTableSymName)) {
-    if (S->isDefined())
-      error(toString(S->File) + " cannot redefine linker defined symbol '" +
-            GotTableSymName + "'");
-    else
-      ElfSym::GlobalOffsetTable = Symtab->addDefined(
-          GotTableSymName, STV_HIDDEN, STT_NOTYPE, Target->GotBaseSymOff,
-          /*Size=*/0, STB_GLOBAL, Out::ElfHeader,
-          /*File=*/nullptr);
+  StringRef gotSymName =
+      (config->emachine == EM_PPC64) ? ".TOC." : "_GLOBAL_OFFSET_TABLE_";
+
+  if (Symbol *s = symtab->find(gotSymName)) {
+    if (s->isDefined()) {
+      error(toString(s->file) + " cannot redefine linker defined symbol '" +
+            gotSymName + "'");
+      return;
+    }
+
+    uint64_t gotOff = 0;
+    if (config->emachine == EM_PPC64)
+      gotOff = 0x8000;
+
+    s->resolve(Defined{/*file=*/nullptr, gotSymName, STB_GLOBAL, STV_HIDDEN,
+                       STT_NOTYPE, gotOff, /*size=*/0, Out::elfHeader});
+    ElfSym::globalOffsetTable = cast<Defined>(s);
   }
 
   // __ehdr_start is the location of ELF file headers. Note that we define
   // this symbol unconditionally even when using a linker script, which
   // differs from the behavior implemented by GNU linker which only define
   // this symbol if ELF headers are in the memory mapped segment.
-  addOptionalRegular("__ehdr_start", Out::ElfHeader, 0, STV_HIDDEN);
+  addOptionalRegular("__ehdr_start", Out::elfHeader, 0, STV_HIDDEN);
 
   // __executable_start is not documented, but the expectation of at
   // least the Android libc is that it points to the ELF header.
-  addOptionalRegular("__executable_start", Out::ElfHeader, 0, STV_HIDDEN);
+  addOptionalRegular("__executable_start", Out::elfHeader, 0, STV_HIDDEN);
 
   // __dso_handle symbol is passed to cxa_finalize as a marker to identify
   // each DSO. The address of the symbol doesn't matter as long as they are
   // different in different DSOs, so we chose the start address of the DSO.
-  addOptionalRegular("__dso_handle", Out::ElfHeader, 0, STV_HIDDEN);
+  addOptionalRegular("__dso_handle", Out::elfHeader, 0, STV_HIDDEN);
 
   // If linker script do layout we do not need to create any standart symbols.
-  if (Script->HasSectionsCommand)
+  if (script->hasSectionsCommand)
     return;
 
-  auto Add = [](StringRef S, int64_t Pos) {
-    return addOptionalRegular(S, Out::ElfHeader, Pos, STV_DEFAULT);
+  auto add = [](StringRef s, int64_t pos) {
+    return addOptionalRegular(s, Out::elfHeader, pos, STV_DEFAULT);
   };
 
-  ElfSym::Bss = Add("__bss_start", 0);
-  ElfSym::End1 = Add("end", -1);
-  ElfSym::End2 = Add("_end", -1);
-  ElfSym::Etext1 = Add("etext", -1);
-  ElfSym::Etext2 = Add("_etext", -1);
-  ElfSym::Edata1 = Add("edata", -1);
-  ElfSym::Edata2 = Add("_edata", -1);
+  ElfSym::bss = add("__bss_start", 0);
+  ElfSym::end1 = add("end", -1);
+  ElfSym::end2 = add("_end", -1);
+  ElfSym::etext1 = add("etext", -1);
+  ElfSym::etext2 = add("_etext", -1);
+  ElfSym::edata1 = add("edata", -1);
+  ElfSym::edata2 = add("_edata", -1);
 }
 
-static OutputSection *findSection(StringRef Name) {
-  for (BaseCommand *Base : Script->SectionCommands)
-    if (auto *Sec = dyn_cast<OutputSection>(Base))
-      if (Sec->Name == Name)
-        return Sec;
+static OutputSection *findSection(StringRef name, unsigned partition = 1) {
+  for (BaseCommand *base : script->sectionCommands)
+    if (auto *sec = dyn_cast<OutputSection>(base))
+      if (sec->name == name && sec->partition == partition)
+        return sec;
   return nullptr;
 }
 
@@ -271,202 +314,263 @@ static OutputSection *findSection(StringRef Name) {
 template <class ELFT> static void createSyntheticSections() {
   // Initialize all pointers with NULL. This is needed because
   // you can call lld::elf::main more than once as a library.
-  memset(&Out::First, 0, sizeof(Out));
+  memset(&Out::first, 0, sizeof(Out));
 
-  auto Add = [](InputSectionBase *Sec) { InputSections.push_back(Sec); };
+  auto add = [](InputSectionBase *sec) { inputSections.push_back(sec); };
 
-  In.DynStrTab = make<StringTableSection>(".dynstr", true);
-  In.Dynamic = make<DynamicSection<ELFT>>();
-  if (Config->AndroidPackDynRelocs) {
-    In.RelaDyn = make<AndroidPackedRelocationSection<ELFT>>(
-        Config->IsRela ? ".rela.dyn" : ".rel.dyn");
-  } else {
-    In.RelaDyn = make<RelocationSection<ELFT>>(
-        Config->IsRela ? ".rela.dyn" : ".rel.dyn", Config->ZCombreloc);
-  }
-  In.ShStrTab = make<StringTableSection>(".shstrtab", false);
-
-  Out::ProgramHeaders = make<OutputSection>("", 0, SHF_ALLOC);
-  Out::ProgramHeaders->Alignment = Config->Wordsize;
+  in.shStrTab = make<StringTableSection>(".shstrtab", false);
 
-  if (needsInterpSection()) {
-    In.Interp = createInterpSection();
-    Add(In.Interp);
-  }
-
-  if (Config->Strip != StripPolicy::All) {
-    In.StrTab = make<StringTableSection>(".strtab", false);
-    In.SymTab = make<SymbolTableSection<ELFT>>(*In.StrTab);
-    In.SymTabShndx = make<SymtabShndxSection>();
-  }
+  Out::programHeaders = make<OutputSection>("", 0, SHF_ALLOC);
+  Out::programHeaders->alignment = config->wordsize;
 
-  if (Config->BuildId != BuildIdKind::None) {
-    In.BuildId = make<BuildIdSection>();
-    Add(In.BuildId);
+  if (config->strip != StripPolicy::All) {
+    in.strTab = make<StringTableSection>(".strtab", false);
+    in.symTab = make<SymbolTableSection<ELFT>>(*in.strTab);
+    in.symTabShndx = make<SymtabShndxSection>();
   }
 
-  In.Bss = make<BssSection>(".bss", 0, 1);
-  Add(In.Bss);
+  in.bss = make<BssSection>(".bss", 0, 1);
+  add(in.bss);
 
   // If there is a SECTIONS command and a .data.rel.ro section name use name
   // .data.rel.ro.bss so that we match in the .data.rel.ro output section.
   // This makes sure our relro is contiguous.
-  bool HasDataRelRo = Script->HasSectionsCommand && findSection(".data.rel.ro");
-  In.BssRelRo =
-      make<BssSection>(HasDataRelRo ? ".data.rel.ro.bss" : ".bss.rel.ro", 0, 1);
-  Add(In.BssRelRo);
+  bool hasDataRelRo =
+      script->hasSectionsCommand && findSection(".data.rel.ro", 0);
+  in.bssRelRo =
+      make<BssSection>(hasDataRelRo ? ".data.rel.ro.bss" : ".bss.rel.ro", 0, 1);
+  add(in.bssRelRo);
 
   // Add MIPS-specific sections.
-  if (Config->EMachine == EM_MIPS) {
-    if (!Config->Shared && Config->HasDynSymTab) {
-      In.MipsRldMap = make<MipsRldMapSection>();
-      Add(In.MipsRldMap);
-    }
-    if (auto *Sec = MipsAbiFlagsSection<ELFT>::create())
-      Add(Sec);
-    if (auto *Sec = MipsOptionsSection<ELFT>::create())
-      Add(Sec);
-    if (auto *Sec = MipsReginfoSection<ELFT>::create())
-      Add(Sec);
+  if (config->emachine == EM_MIPS) {
+    if (!config->shared && config->hasDynSymTab) {
+      in.mipsRldMap = make<MipsRldMapSection>();
+      add(in.mipsRldMap);
+    }
+    if (auto *sec = MipsAbiFlagsSection<ELFT>::create())
+      add(sec);
+    if (auto *sec = MipsOptionsSection<ELFT>::create())
+      add(sec);
+    if (auto *sec = MipsReginfoSection<ELFT>::create())
+      add(sec);
   }
 
-  if (Config->HasDynSymTab) {
-    In.DynSymTab = make<SymbolTableSection<ELFT>>(*In.DynStrTab);
-    Add(In.DynSymTab);
+  for (Partition &part : partitions) {
+    auto add = [&](InputSectionBase *sec) {
+      sec->partition = part.getNumber();
+      inputSections.push_back(sec);
+    };
 
-    InX<ELFT>::VerSym = make<VersionTableSection<ELFT>>();
-    Add(InX<ELFT>::VerSym);
+    if (!part.name.empty()) {
+      part.elfHeader = make<PartitionElfHeaderSection<ELFT>>();
+      part.elfHeader->name = part.name;
+      add(part.elfHeader);
 
-    if (!Config->VersionDefinitions.empty()) {
-      In.VerDef = make<VersionDefinitionSection>();
-      Add(In.VerDef);
+      part.programHeaders = make<PartitionProgramHeadersSection<ELFT>>();
+      add(part.programHeaders);
     }
 
-    InX<ELFT>::VerNeed = make<VersionNeedSection<ELFT>>();
-    Add(InX<ELFT>::VerNeed);
+    if (config->buildId != BuildIdKind::None) {
+      part.buildId = make<BuildIdSection>();
+      add(part.buildId);
+    }
 
-    if (Config->GnuHash) {
-      In.GnuHashTab = make<GnuHashTableSection>();
-      Add(In.GnuHashTab);
+    part.dynStrTab = make<StringTableSection>(".dynstr", true);
+    part.dynSymTab = make<SymbolTableSection<ELFT>>(*part.dynStrTab);
+    part.dynamic = make<DynamicSection<ELFT>>();
+    if (config->androidPackDynRelocs) {
+      part.relaDyn = make<AndroidPackedRelocationSection<ELFT>>(
+          config->isRela ? ".rela.dyn" : ".rel.dyn");
+    } else {
+      part.relaDyn = make<RelocationSection<ELFT>>(
+          config->isRela ? ".rela.dyn" : ".rel.dyn", config->zCombreloc);
     }
 
-    if (Config->SysvHash) {
-      In.HashTab = make<HashTableSection>();
-      Add(In.HashTab);
+    if (needsInterpSection())
+      add(createInterpSection());
+
+    if (config->hasDynSymTab) {
+      part.dynSymTab = make<SymbolTableSection<ELFT>>(*part.dynStrTab);
+      add(part.dynSymTab);
+
+      part.verSym = make<VersionTableSection>();
+      add(part.verSym);
+
+      if (!config->versionDefinitions.empty()) {
+        part.verDef = make<VersionDefinitionSection>();
+        add(part.verDef);
+      }
+
+      part.verNeed = make<VersionNeedSection<ELFT>>();
+      add(part.verNeed);
+
+      if (config->gnuHash) {
+        part.gnuHashTab = make<GnuHashTableSection>();
+        add(part.gnuHashTab);
+      }
+
+      if (config->sysvHash) {
+        part.hashTab = make<HashTableSection>();
+        add(part.hashTab);
+      }
+
+      add(part.dynamic);
+      add(part.dynStrTab);
+      add(part.relaDyn);
+    }
+
+    if (config->relrPackDynRelocs) {
+      part.relrDyn = make<RelrSection<ELFT>>();
+      add(part.relrDyn);
     }
 
-    Add(In.Dynamic);
-    Add(In.DynStrTab);
-    Add(In.RelaDyn);
+    if (!config->relocatable) {
+      if (config->ehFrameHdr) {
+        part.ehFrameHdr = make<EhFrameHeader>();
+        add(part.ehFrameHdr);
+      }
+      part.ehFrame = make<EhFrameSection>();
+      add(part.ehFrame);
+    }
+
+    if (config->emachine == EM_ARM && !config->relocatable) {
+      // The ARMExidxsyntheticsection replaces all the individual .ARM.exidx
+      // InputSections.
+      part.armExidx = make<ARMExidxSyntheticSection>();
+      add(part.armExidx);
+    }
   }
 
-  if (Config->RelrPackDynRelocs) {
-    In.RelrDyn = make<RelrSection<ELFT>>();
-    Add(In.RelrDyn);
+  if (partitions.size() != 1) {
+    // Create the partition end marker. This needs to be in partition number 255
+    // so that it is sorted after all other partitions. It also has other
+    // special handling (see createPhdrs() and combineEhSections()).
+    in.partEnd = make<BssSection>(".part.end", config->maxPageSize, 1);
+    in.partEnd->partition = 255;
+    add(in.partEnd);
+
+    in.partIndex = make<PartitionIndexSection>();
+    addOptionalRegular("__part_index_begin", in.partIndex, 0);
+    addOptionalRegular("__part_index_end", in.partIndex,
+                       in.partIndex->getSize());
+    add(in.partIndex);
   }
 
   // Add .got. MIPS' .got is so different from the other archs,
   // it has its own class.
-  if (Config->EMachine == EM_MIPS) {
-    In.MipsGot = make<MipsGotSection>();
-    Add(In.MipsGot);
+  if (config->emachine == EM_MIPS) {
+    in.mipsGot = make<MipsGotSection>();
+    add(in.mipsGot);
   } else {
-    In.Got = make<GotSection>();
-    Add(In.Got);
+    in.got = make<GotSection>();
+    add(in.got);
   }
 
-  if (Config->EMachine == EM_PPC64) {
-    In.PPC64LongBranchTarget = make<PPC64LongBranchTargetSection>();
-    Add(In.PPC64LongBranchTarget);
+  if (config->emachine == EM_PPC) {
+    in.ppc32Got2 = make<PPC32Got2Section>();
+    add(in.ppc32Got2);
   }
 
-  In.GotPlt = make<GotPltSection>();
-  Add(In.GotPlt);
-  In.IgotPlt = make<IgotPltSection>();
-  Add(In.IgotPlt);
+  if (config->emachine == EM_PPC64) {
+    in.ppc64LongBranchTarget = make<PPC64LongBranchTargetSection>();
+    add(in.ppc64LongBranchTarget);
+  }
 
-  if (Config->GdbIndex) {
-    In.GdbIndex = GdbIndexSection::create<ELFT>();
-    Add(In.GdbIndex);
+  if (config->emachine == EM_RISCV) {
+    in.riscvSdata = make<RISCVSdataSection>();
+    add(in.riscvSdata);
   }
 
+  in.gotPlt = make<GotPltSection>();
+  add(in.gotPlt);
+  in.igotPlt = make<IgotPltSection>();
+  add(in.igotPlt);
+
+  // _GLOBAL_OFFSET_TABLE_ is defined relative to either .got.plt or .got. Treat
+  // it as a relocation and ensure the referenced section is created.
+  if (ElfSym::globalOffsetTable && config->emachine != EM_MIPS) {
+    if (target->gotBaseSymInGotPlt)
+      in.gotPlt->hasGotPltOffRel = true;
+    else
+      in.got->hasGotOffRel = true;
+  }
+
+  if (config->gdbIndex)
+    add(GdbIndexSection::create<ELFT>());
+
   // We always need to add rel[a].plt to output if it has entries.
   // Even for static linking it can contain R_[*]_IRELATIVE relocations.
-  In.RelaPlt = make<RelocationSection<ELFT>>(
-      Config->IsRela ? ".rela.plt" : ".rel.plt", false /*Sort*/);
-  Add(In.RelaPlt);
+  in.relaPlt = make<RelocationSection<ELFT>>(
+      config->isRela ? ".rela.plt" : ".rel.plt", /*sort=*/false);
+  add(in.relaPlt);
 
-  // The RelaIplt immediately follows .rel.plt (.rel.dyn for ARM) to ensure
+  // The relaIplt immediately follows .rel.plt (.rel.dyn for ARM) to ensure
   // that the IRelative relocations are processed last by the dynamic loader.
   // We cannot place the iplt section in .rel.dyn when Android relocation
   // packing is enabled because that would cause a section type mismatch.
   // However, because the Android dynamic loader reads .rel.plt after .rel.dyn,
   // we can get the desired behaviour by placing the iplt section in .rel.plt.
-  In.RelaIplt = make<RelocationSection<ELFT>>(
-      (Config->EMachine == EM_ARM && !Config->AndroidPackDynRelocs)
+  in.relaIplt = make<RelocationSection<ELFT>>(
+      (config->emachine == EM_ARM && !config->androidPackDynRelocs)
           ? ".rel.dyn"
-          : In.RelaPlt->Name,
-      false /*Sort*/);
-  Add(In.RelaIplt);
+          : in.relaPlt->name,
+      /*sort=*/false);
+  add(in.relaIplt);
 
-  In.Plt = make<PltSection>(false);
-  Add(In.Plt);
-  In.Iplt = make<PltSection>(true);
-  Add(In.Iplt);
+  in.plt = make<PltSection>(false);
+  add(in.plt);
+  in.iplt = make<PltSection>(true);
+  add(in.iplt);
+
+  if (config->andFeatures)
+    add(make<GnuPropertySection>());
 
   // .note.GNU-stack is always added when we are creating a re-linkable
   // object file. Other linkers are using the presence of this marker
   // section to control the executable-ness of the stack area, but that
   // is irrelevant these days. Stack area should always be non-executable
   // by default. So we emit this section unconditionally.
-  if (Config->Relocatable)
-    Add(make<GnuStackSection>());
+  if (config->relocatable)
+    add(make<GnuStackSection>());
 
-  if (!Config->Relocatable) {
-    if (Config->EhFrameHdr) {
-      In.EhFrameHdr = make<EhFrameHeader>();
-      Add(In.EhFrameHdr);
-    }
-    In.EhFrame = make<EhFrameSection>();
-    Add(In.EhFrame);
-  }
-
-  if (In.SymTab)
-    Add(In.SymTab);
-  if (In.SymTabShndx)
-    Add(In.SymTabShndx);
-  Add(In.ShStrTab);
-  if (In.StrTab)
-    Add(In.StrTab);
-
-  if (Config->EMachine == EM_ARM && !Config->Relocatable)
-    // Add a sentinel to terminate .ARM.exidx. It helps an unwinder
-    // to find the exact address range of the last entry.
-    Add(make<ARMExidxSentinelSection>());
+  if (in.symTab)
+    add(in.symTab);
+  if (in.symTabShndx)
+    add(in.symTabShndx);
+  add(in.shStrTab);
+  if (in.strTab)
+    add(in.strTab);
 }
 
 // The main function of the writer.
 template <class ELFT> void Writer<ELFT>::run() {
+  // Make copies of any input sections that need to be copied into each
+  // partition.
+  copySectionsIntoPartitions<ELFT>();
+
   // Create linker-synthesized sections such as .got or .plt.
   // Such sections are of type input section.
   createSyntheticSections<ELFT>();
 
-  if (!Config->Relocatable)
-    combineEhFrameSections<ELFT>();
+  // Some input sections that are used for exception handling need to be moved
+  // into synthetic sections. Do that now so that they aren't assigned to
+  // output sections in the usual way.
+  if (!config->relocatable)
+    combineEhSections<ELFT>();
 
   // We want to process linker script commands. When SECTIONS command
   // is given we let it create sections.
-  Script->processSectionCommands();
+  script->processSectionCommands();
 
   // Linker scripts controls how input sections are assigned to output sections.
   // Input sections that were not handled by scripts are called "orphans", and
   // they are assigned to output sections by the default rule. Process that.
-  Script->addOrphanSections();
+  script->addOrphanSections();
 
-  if (Config->Discard != DiscardPolicy::All)
+  if (config->discard != DiscardPolicy::All)
     copyLocalSymbols();
 
-  if (Config->CopyRelocs)
+  if (config->copyRelocs)
     addSectionSymbols();
 
   // Now that we have a complete set of output sections. This function
@@ -478,33 +582,35 @@ template <class ELFT> void Writer<ELFT>::run() {
   if (errorCount())
     return;
 
-  Script->assignAddresses();
+  script->assignAddresses();
 
   // If -compressed-debug-sections is specified, we need to compress
   // .debug_* sections. Do it right now because it changes the size of
   // output sections.
-  for (OutputSection *Sec : OutputSections)
-    Sec->maybeCompress<ELFT>();
+  for (OutputSection *sec : outputSections)
+    sec->maybeCompress<ELFT>();
 
-  Script->allocateHeaders(Phdrs);
+  script->allocateHeaders(mainPart->phdrs);
 
   // Remove empty PT_LOAD to avoid causing the dynamic linker to try to mmap a
   // 0 sized region. This has to be done late since only after assignAddresses
   // we know the size of the sections.
-  removeEmptyPTLoad();
+  for (Partition &part : partitions)
+    removeEmptyPTLoad(part.phdrs);
 
-  if (!Config->OFormatBinary)
+  if (!config->oFormatBinary)
     assignFileOffsets();
   else
     assignFileOffsetsBinary();
 
-  setPhdrs();
+  for (Partition &part : partitions)
+    setPhdrs(part);
 
-  if (Config->Relocatable)
-    for (OutputSection *Sec : OutputSections)
-      Sec->Addr = 0;
+  if (config->relocatable)
+    for (OutputSection *sec : outputSections)
+      sec->addr = 0;
 
-  if (Config->CheckSections)
+  if (config->checkSections)
     checkSections();
 
   // It does not make sense try to open the file if we have error already.
@@ -515,7 +621,7 @@ template <class ELFT> void Writer<ELFT>::run() {
   if (errorCount())
     return;
 
-  if (!Config->OFormatBinary) {
+  if (!config->oFormatBinary) {
     writeTrapInstr();
     writeHeader();
     writeSections();
@@ -535,16 +641,20 @@ template <class ELFT> void Writer<ELFT>::run() {
   if (errorCount())
     return;
 
-  if (auto E = Buffer->commit())
-    error("failed to write to the output file: " + toString(std::move(E)));
+  if (auto e = buffer->commit())
+    error("failed to write to the output file: " + toString(std::move(e)));
 }
 
-static bool shouldKeepInSymtab(SectionBase *Sec, StringRef SymName,
-                               const Symbol &B) {
-  if (B.isSection())
+static bool shouldKeepInSymtab(const Defined &sym) {
+  if (sym.isSection())
     return false;
 
-  if (Config->Discard == DiscardPolicy::None)
+  if (config->discard == DiscardPolicy::None)
+    return true;
+
+  // If -emit-reloc is given, all symbols including local ones need to be
+  // copied because they may be referenced by relocations.
+  if (config->emitRelocs)
     return true;
 
   // In ELF assembly .L symbols are normally discarded by the assembler.
@@ -552,61 +662,62 @@ static bool shouldKeepInSymtab(SectionBase *Sec, StringRef SymName,
   // * --discard-locals is used.
   // * The symbol is in a SHF_MERGE section, which is normally the reason for
   //   the assembler keeping the .L symbol.
-  if (!SymName.startswith(".L") && !SymName.empty())
+  StringRef name = sym.getName();
+  bool isLocal = name.startswith(".L") || name.empty();
+  if (!isLocal)
     return true;
 
-  if (Config->Discard == DiscardPolicy::Locals)
+  if (config->discard == DiscardPolicy::Locals)
     return false;
 
-  return !Sec || !(Sec->Flags & SHF_MERGE);
+  SectionBase *sec = sym.section;
+  return !sec || !(sec->flags & SHF_MERGE);
 }
 
-static bool includeInSymtab(const Symbol &B) {
-  if (!B.isLocal() && !B.IsUsedInRegularObj)
+static bool includeInSymtab(const Symbol &b) {
+  if (!b.isLocal() && !b.isUsedInRegularObj)
     return false;
 
-  if (auto *D = dyn_cast<Defined>(&B)) {
+  if (auto *d = dyn_cast<Defined>(&b)) {
     // Always include absolute symbols.
-    SectionBase *Sec = D->Section;
-    if (!Sec)
+    SectionBase *sec = d->section;
+    if (!sec)
       return true;
-    Sec = Sec->Repl;
+    sec = sec->repl;
 
     // Exclude symbols pointing to garbage-collected sections.
-    if (isa<InputSectionBase>(Sec) && !Sec->Live)
+    if (isa<InputSectionBase>(sec) && !sec->isLive())
       return false;
 
-    if (auto *S = dyn_cast<MergeInputSection>(Sec))
-      if (!S->getSectionPiece(D->Value)->Live)
+    if (auto *s = dyn_cast<MergeInputSection>(sec))
+      if (!s->getSectionPiece(d->value)->live)
         return false;
     return true;
   }
-  return B.Used;
+  return b.used;
 }
 
 // Local symbols are not in the linker's symbol table. This function scans
 // each object file's symbol table to copy local symbols to the output.
 template <class ELFT> void Writer<ELFT>::copyLocalSymbols() {
-  if (!In.SymTab)
+  if (!in.symTab)
     return;
-  for (InputFile *File : ObjectFiles) {
-    ObjFile<ELFT> *F = cast<ObjFile<ELFT>>(File);
-    for (Symbol *B : F->getLocalSymbols()) {
-      if (!B->isLocal())
-        fatal(toString(F) +
+  for (InputFile *file : objectFiles) {
+    ObjFile<ELFT> *f = cast<ObjFile<ELFT>>(file);
+    for (Symbol *b : f->getLocalSymbols()) {
+      if (!b->isLocal())
+        fatal(toString(f) +
               ": broken object: getLocalSymbols returns a non-local symbol");
-      auto *DR = dyn_cast<Defined>(B);
+      auto *dr = dyn_cast<Defined>(b);
 
       // No reason to keep local undefined symbol in symtab.
-      if (!DR)
+      if (!dr)
         continue;
-      if (!includeInSymtab(*B))
+      if (!includeInSymtab(*b))
         continue;
-
-      SectionBase *Sec = DR->Section;
-      if (!shouldKeepInSymtab(Sec, B->getName(), *B))
+      if (!shouldKeepInSymtab(*dr))
         continue;
-      In.SymTab->addSymbol(B);
+      in.symTab->addSymbol(b);
     }
   }
 }
@@ -616,33 +727,33 @@ template <class ELFT> void Writer<ELFT>::copyLocalSymbols() {
 // referring to a section (that happens if the section is a synthetic one), we
 // don't create a section symbol for that section.
 template <class ELFT> void Writer<ELFT>::addSectionSymbols() {
-  for (BaseCommand *Base : Script->SectionCommands) {
-    auto *Sec = dyn_cast<OutputSection>(Base);
-    if (!Sec)
+  for (BaseCommand *base : script->sectionCommands) {
+    auto *sec = dyn_cast<OutputSection>(base);
+    if (!sec)
       continue;
-    auto I = llvm::find_if(Sec->SectionCommands, [](BaseCommand *Base) {
-      if (auto *ISD = dyn_cast<InputSectionDescription>(Base))
-        return !ISD->Sections.empty();
+    auto i = llvm::find_if(sec->sectionCommands, [](BaseCommand *base) {
+      if (auto *isd = dyn_cast<InputSectionDescription>(base))
+        return !isd->sections.empty();
       return false;
     });
-    if (I == Sec->SectionCommands.end())
+    if (i == sec->sectionCommands.end())
       continue;
-    InputSection *IS = cast<InputSectionDescription>(*I)->Sections[0];
+    InputSection *isec = cast<InputSectionDescription>(*i)->sections[0];
 
     // Relocations are not using REL[A] section symbols.
-    if (IS->Type == SHT_REL || IS->Type == SHT_RELA)
+    if (isec->type == SHT_REL || isec->type == SHT_RELA)
       continue;
 
     // Unlike other synthetic sections, mergeable output sections contain data
     // copied from input sections, and there may be a relocation pointing to its
     // contents if -r or -emit-reloc are given.
-    if (isa<SyntheticSection>(IS) && !(IS->Flags & SHF_MERGE))
+    if (isa<SyntheticSection>(isec) && !(isec->flags & SHF_MERGE))
       continue;
 
-    auto *Sym =
-        make<Defined>(IS->File, "", STB_LOCAL, /*StOther=*/0, STT_SECTION,
-                      /*Value=*/0, /*Size=*/0, IS);
-    In.SymTab->addSymbol(Sym);
+    auto *sym =
+        make<Defined>(isec->file, "", STB_LOCAL, /*stOther=*/0, STT_SECTION,
+                      /*value=*/0, /*size=*/0, isec);
+    in.symTab->addSymbol(sym);
   }
 }
 
@@ -652,25 +763,25 @@ template <class ELFT> void Writer<ELFT>::addSectionSymbols() {
 //
 // This function returns true if a section needs to be put into a
 // PT_GNU_RELRO segment.
-static bool isRelroSection(const OutputSection *Sec) {
-  if (!Config->ZRelro)
+static bool isRelroSection(const OutputSection *sec) {
+  if (!config->zRelro)
     return false;
 
-  uint64_t Flags = Sec->Flags;
+  uint64_t flags = sec->flags;
 
   // Non-allocatable or non-writable sections don't need RELRO because
   // they are not writable or not even mapped to memory in the first place.
   // RELRO is for sections that are essentially read-only but need to
   // be writable only at process startup to allow dynamic linker to
   // apply relocations.
-  if (!(Flags & SHF_ALLOC) || !(Flags & SHF_WRITE))
+  if (!(flags & SHF_ALLOC) || !(flags & SHF_WRITE))
     return false;
 
   // Once initialized, TLS data segments are used as data templates
   // for a thread-local storage. For each new thread, runtime
   // allocates memory for a TLS and copy templates there. No thread
   // are supposed to use templates directly. Thus, it can be in RELRO.
-  if (Flags & SHF_TLS)
+  if (flags & SHF_TLS)
     return true;
 
   // .init_array, .preinit_array and .fini_array contain pointers to
@@ -679,15 +790,15 @@ static bool isRelroSection(const OutputSection *Sec) {
   // to change at runtime. But if you are an attacker, you could do
   // interesting things by manipulating pointers in .fini_array, for
   // example. So they are put into RELRO.
-  uint32_t Type = Sec->Type;
-  if (Type == SHT_INIT_ARRAY || Type == SHT_FINI_ARRAY ||
-      Type == SHT_PREINIT_ARRAY)
+  uint32_t type = sec->type;
+  if (type == SHT_INIT_ARRAY || type == SHT_FINI_ARRAY ||
+      type == SHT_PREINIT_ARRAY)
     return true;
 
   // .got contains pointers to external symbols. They are resolved by
   // the dynamic linker when a module is loaded into memory, and after
   // that they are not expected to change. So, it can be in RELRO.
-  if (In.Got && Sec == In.Got->getParent())
+  if (in.got && sec == in.got->getParent())
     return true;
 
   // .toc is a GOT-ish section for PowerPC64. Their contents are accessed
@@ -695,30 +806,30 @@ static bool isRelroSection(const OutputSection *Sec) {
   // for accessing .got as well, .got and .toc need to be close enough in the
   // virtual address space. Usually, .toc comes just after .got. Since we place
   // .got into RELRO, .toc needs to be placed into RELRO too.
-  if (Sec->Name.equals(".toc"))
+  if (sec->name.equals(".toc"))
     return true;
 
   // .got.plt contains pointers to external function symbols. They are
   // by default resolved lazily, so we usually cannot put it into RELRO.
   // However, if "-z now" is given, the lazy symbol resolution is
   // disabled, which enables us to put it into RELRO.
-  if (Sec == In.GotPlt->getParent())
-    return Config->ZNow;
+  if (sec == in.gotPlt->getParent())
+    return config->zNow;
 
   // .dynamic section contains data for the dynamic linker, and
   // there's no need to write to it at runtime, so it's better to put
   // it into RELRO.
-  if (Sec == In.Dynamic->getParent())
+  if (sec->name == ".dynamic")
     return true;
 
   // Sections with some special names are put into RELRO. This is a
   // bit unfortunate because section names shouldn't be significant in
   // ELF in spirit. But in reality many linker features depend on
   // magic section names.
-  StringRef S = Sec->Name;
-  return S == ".data.rel.ro" || S == ".bss.rel.ro" || S == ".ctors" ||
-         S == ".dtors" || S == ".jcr" || S == ".eh_frame" ||
-         S == ".openbsd.randomdata";
+  StringRef s = sec->name;
+  return s == ".data.rel.ro" || s == ".bss.rel.ro" || s == ".ctors" ||
+         s == ".dtors" || s == ".jcr" || s == ".eh_frame" ||
+         s == ".openbsd.randomdata";
 }
 
 // We compute a rank for each section. The rank indicates where the
@@ -729,16 +840,18 @@ static bool isRelroSection(const OutputSection *Sec) {
 // * It is easy to check if a give branch was taken.
 // * It is easy two see how similar two ranks are (see getRankProximity).
 enum RankFlags {
-  RF_NOT_ADDR_SET = 1 << 18,
-  RF_NOT_ALLOC = 1 << 17,
-  RF_NOT_INTERP = 1 << 16,
-  RF_NOT_NOTE = 1 << 15,
-  RF_WRITE = 1 << 14,
-  RF_EXEC_WRITE = 1 << 13,
-  RF_EXEC = 1 << 12,
-  RF_RODATA = 1 << 11,
-  RF_NON_TLS_BSS = 1 << 10,
-  RF_NON_TLS_BSS_RO = 1 << 9,
+  RF_NOT_ADDR_SET = 1 << 27,
+  RF_NOT_ALLOC = 1 << 26,
+  RF_PARTITION = 1 << 18, // Partition number (8 bits)
+  RF_NOT_PART_EHDR = 1 << 17,
+  RF_NOT_PART_PHDR = 1 << 16,
+  RF_NOT_INTERP = 1 << 15,
+  RF_NOT_NOTE = 1 << 14,
+  RF_WRITE = 1 << 13,
+  RF_EXEC_WRITE = 1 << 12,
+  RF_EXEC = 1 << 11,
+  RF_RODATA = 1 << 10,
+  RF_NOT_RELRO = 1 << 9,
   RF_NOT_TLS = 1 << 8,
   RF_BSS = 1 << 7,
   RF_PPC_NOT_TOCBSS = 1 << 6,
@@ -750,33 +863,41 @@ enum RankFlags {
   RF_MIPS_NOT_GOT = 1 << 0
 };
 
-static unsigned getSectionRank(const OutputSection *Sec) {
-  unsigned Rank = 0;
+static unsigned getSectionRank(const OutputSection *sec) {
+  unsigned rank = sec->partition * RF_PARTITION;
 
   // We want to put section specified by -T option first, so we
   // can start assigning VA starting from them later.
-  if (Config->SectionStartMap.count(Sec->Name))
-    return Rank;
-  Rank |= RF_NOT_ADDR_SET;
+  if (config->sectionStartMap.count(sec->name))
+    return rank;
+  rank |= RF_NOT_ADDR_SET;
 
   // Allocatable sections go first to reduce the total PT_LOAD size and
   // so debug info doesn't change addresses in actual code.
-  if (!(Sec->Flags & SHF_ALLOC))
-    return Rank | RF_NOT_ALLOC;
+  if (!(sec->flags & SHF_ALLOC))
+    return rank | RF_NOT_ALLOC;
+
+  if (sec->type == SHT_LLVM_PART_EHDR)
+    return rank;
+  rank |= RF_NOT_PART_EHDR;
+
+  if (sec->type == SHT_LLVM_PART_PHDR)
+    return rank;
+  rank |= RF_NOT_PART_PHDR;
 
   // Put .interp first because some loaders want to see that section
   // on the first page of the executable file when loaded into memory.
-  if (Sec->Name == ".interp")
-    return Rank;
-  Rank |= RF_NOT_INTERP;
+  if (sec->name == ".interp")
+    return rank;
+  rank |= RF_NOT_INTERP;
 
   // Put .note sections (which make up one PT_NOTE) at the beginning so that
   // they are likely to be included in a core file even if core file size is
   // limited. In particular, we want a .note.gnu.build-id and a .note.tag to be
   // included in a core to match core files with executables.
-  if (Sec->Type == SHT_NOTE)
-    return Rank;
-  Rank |= RF_NOT_NOTE;
+  if (sec->type == SHT_NOTE)
+    return rank;
+  rank |= RF_NOT_NOTE;
 
   // Sort sections based on their access permission in the following
   // order: R, RX, RWX, RW.  This order is based on the following
@@ -789,116 +910,105 @@ static unsigned getSectionRank(const OutputSection *Sec) {
   //   between .text and .data.
   // * Writable sections come last, such that .bss lands at the very
   //   end of the last PT_LOAD.
-  bool IsExec = Sec->Flags & SHF_EXECINSTR;
-  bool IsWrite = Sec->Flags & SHF_WRITE;
+  bool isExec = sec->flags & SHF_EXECINSTR;
+  bool isWrite = sec->flags & SHF_WRITE;
 
-  if (IsExec) {
-    if (IsWrite)
-      Rank |= RF_EXEC_WRITE;
+  if (isExec) {
+    if (isWrite)
+      rank |= RF_EXEC_WRITE;
     else
-      Rank |= RF_EXEC;
-  } else if (IsWrite) {
-    Rank |= RF_WRITE;
-  } else if (Sec->Type == SHT_PROGBITS) {
+      rank |= RF_EXEC;
+  } else if (isWrite) {
+    rank |= RF_WRITE;
+  } else if (sec->type == SHT_PROGBITS) {
     // Make non-executable and non-writable PROGBITS sections (e.g .rodata
     // .eh_frame) closer to .text. They likely contain PC or GOT relative
     // relocations and there could be relocation overflow if other huge sections
     // (.dynstr .dynsym) were placed in between.
-    Rank |= RF_RODATA;
+    rank |= RF_RODATA;
   }
 
+  // Place RelRo sections first. After considering SHT_NOBITS below, the
+  // ordering is PT_LOAD(PT_GNU_RELRO(.data.rel.ro .bss.rel.ro) | .data .bss),
+  // where | marks where page alignment happens. An alternative ordering is
+  // PT_LOAD(.data | PT_GNU_RELRO( .data.rel.ro .bss.rel.ro) | .bss), but it may
+  // waste more bytes due to 2 alignment places.
+  if (!isRelroSection(sec))
+    rank |= RF_NOT_RELRO;
+
   // If we got here we know that both A and B are in the same PT_LOAD.
 
-  bool IsTls = Sec->Flags & SHF_TLS;
-  bool IsNoBits = Sec->Type == SHT_NOBITS;
-
-  // The first requirement we have is to put (non-TLS) nobits sections last. The
-  // reason is that the only thing the dynamic linker will see about them is a
-  // p_memsz that is larger than p_filesz. Seeing that it zeros the end of the
-  // PT_LOAD, so that has to correspond to the nobits sections.
-  bool IsNonTlsNoBits = IsNoBits && !IsTls;
-  if (IsNonTlsNoBits)
-    Rank |= RF_NON_TLS_BSS;
-
-  // We place nobits RelRo sections before plain r/w ones, and non-nobits RelRo
-  // sections after r/w ones, so that the RelRo sections are contiguous.
-  bool IsRelRo = isRelroSection(Sec);
-  if (IsNonTlsNoBits && !IsRelRo)
-    Rank |= RF_NON_TLS_BSS_RO;
-  if (!IsNonTlsNoBits && IsRelRo)
-    Rank |= RF_NON_TLS_BSS_RO;
-
   // The TLS initialization block needs to be a single contiguous block in a R/W
   // PT_LOAD, so stick TLS sections directly before the other RelRo R/W
-  // sections. The TLS NOBITS sections are placed here as they don't take up
-  // virtual address space in the PT_LOAD.
-  if (!IsTls)
-    Rank |= RF_NOT_TLS;
+  // sections. Since p_filesz can be less than p_memsz, place NOBITS sections
+  // after PROGBITS.
+  if (!(sec->flags & SHF_TLS))
+    rank |= RF_NOT_TLS;
 
-  // Within the TLS initialization block, the non-nobits sections need to appear
-  // first.
-  if (IsNoBits)
-    Rank |= RF_BSS;
+  // Within TLS sections, or within other RelRo sections, or within non-RelRo
+  // sections, place non-NOBITS sections first.
+  if (sec->type == SHT_NOBITS)
+    rank |= RF_BSS;
 
   // Some architectures have additional ordering restrictions for sections
   // within the same PT_LOAD.
-  if (Config->EMachine == EM_PPC64) {
+  if (config->emachine == EM_PPC64) {
     // PPC64 has a number of special SHT_PROGBITS+SHF_ALLOC+SHF_WRITE sections
     // that we would like to make sure appear is a specific order to maximize
     // their coverage by a single signed 16-bit offset from the TOC base
     // pointer. Conversely, the special .tocbss section should be first among
     // all SHT_NOBITS sections. This will put it next to the loaded special
     // PPC64 sections (and, thus, within reach of the TOC base pointer).
-    StringRef Name = Sec->Name;
-    if (Name != ".tocbss")
-      Rank |= RF_PPC_NOT_TOCBSS;
+    StringRef name = sec->name;
+    if (name != ".tocbss")
+      rank |= RF_PPC_NOT_TOCBSS;
 
-    if (Name == ".toc1")
-      Rank |= RF_PPC_TOCL;
+    if (name == ".toc1")
+      rank |= RF_PPC_TOCL;
 
-    if (Name == ".toc")
-      Rank |= RF_PPC_TOC;
+    if (name == ".toc")
+      rank |= RF_PPC_TOC;
 
-    if (Name == ".got")
-      Rank |= RF_PPC_GOT;
+    if (name == ".got")
+      rank |= RF_PPC_GOT;
 
-    if (Name == ".branch_lt")
-      Rank |= RF_PPC_BRANCH_LT;
+    if (name == ".branch_lt")
+      rank |= RF_PPC_BRANCH_LT;
   }
 
-  if (Config->EMachine == EM_MIPS) {
+  if (config->emachine == EM_MIPS) {
     // All sections with SHF_MIPS_GPREL flag should be grouped together
     // because data in these sections is addressable with a gp relative address.
-    if (Sec->Flags & SHF_MIPS_GPREL)
-      Rank |= RF_MIPS_GPREL;
+    if (sec->flags & SHF_MIPS_GPREL)
+      rank |= RF_MIPS_GPREL;
 
-    if (Sec->Name != ".got")
-      Rank |= RF_MIPS_NOT_GOT;
+    if (sec->name != ".got")
+      rank |= RF_MIPS_NOT_GOT;
   }
 
-  return Rank;
+  return rank;
 }
 
-static bool compareSections(const BaseCommand *ACmd, const BaseCommand *BCmd) {
-  const OutputSection *A = cast<OutputSection>(ACmd);
-  const OutputSection *B = cast<OutputSection>(BCmd);
+static bool compareSections(const BaseCommand *aCmd, const BaseCommand *bCmd) {
+  const OutputSection *a = cast<OutputSection>(aCmd);
+  const OutputSection *b = cast<OutputSection>(bCmd);
 
-  if (A->SortRank != B->SortRank)
-    return A->SortRank < B->SortRank;
+  if (a->sortRank != b->sortRank)
+    return a->sortRank < b->sortRank;
 
-  if (!(A->SortRank & RF_NOT_ADDR_SET))
-    return Config->SectionStartMap.lookup(A->Name) <
-           Config->SectionStartMap.lookup(B->Name);
+  if (!(a->sortRank & RF_NOT_ADDR_SET))
+    return config->sectionStartMap.lookup(a->name) <
+           config->sectionStartMap.lookup(b->name);
   return false;
 }
 
-void PhdrEntry::add(OutputSection *Sec) {
-  LastSec = Sec;
-  if (!FirstSec)
-    FirstSec = Sec;
-  p_align = std::max(p_align, Sec->Alignment);
+void PhdrEntry::add(OutputSection *sec) {
+  lastSec = sec;
+  if (!firstSec)
+    firstSec = sec;
+  p_align = std::max(p_align, sec->alignment);
   if (p_type == PT_LOAD)
-    Sec->PtLoad = this;
+    sec->ptLoad = this;
 }
 
 // The beginning and the ending of .rel[a].plt section are marked
@@ -908,35 +1018,40 @@ void PhdrEntry::add(OutputSection *Sec) {
 // need these symbols, since IRELATIVE relocs are resolved through GOT
 // and PLT. For details, see http://www.airs.com/blog/archives/403.
 template <class ELFT> void Writer<ELFT>::addRelIpltSymbols() {
-  if (Config->Relocatable || needsInterpSection())
+  if (config->relocatable || needsInterpSection())
     return;
 
   // By default, __rela_iplt_{start,end} belong to a dummy section 0
   // because .rela.plt might be empty and thus removed from output.
-  // We'll override Out::ElfHeader with In.RelaIplt later when we are
+  // We'll override Out::elfHeader with In.relaIplt later when we are
   // sure that .rela.plt exists in output.
-  ElfSym::RelaIpltStart = addOptionalRegular(
-      Config->IsRela ? "__rela_iplt_start" : "__rel_iplt_start",
-      Out::ElfHeader, 0, STV_HIDDEN, STB_WEAK);
+  ElfSym::relaIpltStart = addOptionalRegular(
+      config->isRela ? "__rela_iplt_start" : "__rel_iplt_start",
+      Out::elfHeader, 0, STV_HIDDEN, STB_WEAK);
 
-  ElfSym::RelaIpltEnd = addOptionalRegular(
-      Config->IsRela ? "__rela_iplt_end" : "__rel_iplt_end",
-      Out::ElfHeader, 0, STV_HIDDEN, STB_WEAK);
+  ElfSym::relaIpltEnd = addOptionalRegular(
+      config->isRela ? "__rela_iplt_end" : "__rel_iplt_end",
+      Out::elfHeader, 0, STV_HIDDEN, STB_WEAK);
 }
 
 template <class ELFT>
 void Writer<ELFT>::forEachRelSec(
-    llvm::function_ref<void(InputSectionBase &)> Fn) {
+    llvm::function_ref<void(InputSectionBase &)> fn) {
   // Scan all relocations. Each relocation goes through a series
   // of tests to determine if it needs special treatment, such as
   // creating GOT, PLT, copy relocations, etc.
   // Note that relocations for non-alloc sections are directly
   // processed by InputSection::relocateNonAlloc.
-  for (InputSectionBase *IS : InputSections)
-    if (IS->Live && isa<InputSection>(IS) && (IS->Flags & SHF_ALLOC))
-      Fn(*IS);
-  for (EhInputSection *ES : In.EhFrame->Sections)
-    Fn(*ES);
+  for (InputSectionBase *isec : inputSections)
+    if (isec->isLive() && isa<InputSection>(isec) && (isec->flags & SHF_ALLOC))
+      fn(*isec);
+  for (Partition &part : partitions) {
+    for (EhInputSection *es : part.ehFrame->sections)
+      fn(*es);
+    if (part.armExidx && part.armExidx->isLive())
+      for (InputSection *ex : part.armExidx->exidxSections)
+        fn(*ex);
+  }
 }
 
 // This function generates assignments for predefined symbols (e.g. _end or
@@ -945,76 +1060,78 @@ void Writer<ELFT>::forEachRelSec(
 // time any references to these symbols are processed and is equivalent to
 // defining these symbols explicitly in the linker script.
 template <class ELFT> void Writer<ELFT>::setReservedSymbolSections() {
-  if (ElfSym::GlobalOffsetTable) {
+  if (ElfSym::globalOffsetTable) {
     // The _GLOBAL_OFFSET_TABLE_ symbol is defined by target convention usually
     // to the start of the .got or .got.plt section.
-    InputSection *GotSection = In.GotPlt;
-    if (!Target->GotBaseSymInGotPlt)
-      GotSection = In.MipsGot ? cast<InputSection>(In.MipsGot)
-                              : cast<InputSection>(In.Got);
-    ElfSym::GlobalOffsetTable->Section = GotSection;
+    InputSection *gotSection = in.gotPlt;
+    if (!target->gotBaseSymInGotPlt)
+      gotSection = in.mipsGot ? cast<InputSection>(in.mipsGot)
+                              : cast<InputSection>(in.got);
+    ElfSym::globalOffsetTable->section = gotSection;
   }
 
   // .rela_iplt_{start,end} mark the start and the end of .rela.plt section.
-  if (ElfSym::RelaIpltStart && !In.RelaIplt->empty()) {
-    ElfSym::RelaIpltStart->Section = In.RelaIplt;
-    ElfSym::RelaIpltEnd->Section = In.RelaIplt;
-    ElfSym::RelaIpltEnd->Value = In.RelaIplt->getSize();
+  if (ElfSym::relaIpltStart && in.relaIplt->isNeeded()) {
+    ElfSym::relaIpltStart->section = in.relaIplt;
+    ElfSym::relaIpltEnd->section = in.relaIplt;
+    ElfSym::relaIpltEnd->value = in.relaIplt->getSize();
   }
 
-  PhdrEntry *Last = nullptr;
-  PhdrEntry *LastRO = nullptr;
+  PhdrEntry *last = nullptr;
+  PhdrEntry *lastRO = nullptr;
 
-  for (PhdrEntry *P : Phdrs) {
-    if (P->p_type != PT_LOAD)
-      continue;
-    Last = P;
-    if (!(P->p_flags & PF_W))
-      LastRO = P;
+  for (Partition &part : partitions) {
+    for (PhdrEntry *p : part.phdrs) {
+      if (p->p_type != PT_LOAD)
+        continue;
+      last = p;
+      if (!(p->p_flags & PF_W))
+        lastRO = p;
+    }
   }
 
-  if (LastRO) {
+  if (lastRO) {
     // _etext is the first location after the last read-only loadable segment.
-    if (ElfSym::Etext1)
-      ElfSym::Etext1->Section = LastRO->LastSec;
-    if (ElfSym::Etext2)
-      ElfSym::Etext2->Section = LastRO->LastSec;
+    if (ElfSym::etext1)
+      ElfSym::etext1->section = lastRO->lastSec;
+    if (ElfSym::etext2)
+      ElfSym::etext2->section = lastRO->lastSec;
   }
 
-  if (Last) {
+  if (last) {
     // _edata points to the end of the last mapped initialized section.
-    OutputSection *Edata = nullptr;
-    for (OutputSection *OS : OutputSections) {
-      if (OS->Type != SHT_NOBITS)
-        Edata = OS;
-      if (OS == Last->LastSec)
+    OutputSection *edata = nullptr;
+    for (OutputSection *os : outputSections) {
+      if (os->type != SHT_NOBITS)
+        edata = os;
+      if (os == last->lastSec)
         break;
     }
 
-    if (ElfSym::Edata1)
-      ElfSym::Edata1->Section = Edata;
-    if (ElfSym::Edata2)
-      ElfSym::Edata2->Section = Edata;
+    if (ElfSym::edata1)
+      ElfSym::edata1->section = edata;
+    if (ElfSym::edata2)
+      ElfSym::edata2->section = edata;
 
     // _end is the first location after the uninitialized data region.
-    if (ElfSym::End1)
-      ElfSym::End1->Section = Last->LastSec;
-    if (ElfSym::End2)
-      ElfSym::End2->Section = Last->LastSec;
+    if (ElfSym::end1)
+      ElfSym::end1->section = last->lastSec;
+    if (ElfSym::end2)
+      ElfSym::end2->section = last->lastSec;
   }
 
-  if (ElfSym::Bss)
-    ElfSym::Bss->Section = findSection(".bss");
+  if (ElfSym::bss)
+    ElfSym::bss->section = findSection(".bss");
 
   // Setup MIPS _gp_disp/__gnu_local_gp symbols which should
   // be equal to the _gp symbol's value.
-  if (ElfSym::MipsGp) {
+  if (ElfSym::mipsGp) {
     // Find GP-relative section with the lowest address
     // and use this address to calculate default _gp value.
-    for (OutputSection *OS : OutputSections) {
-      if (OS->Flags & SHF_MIPS_GPREL) {
-        ElfSym::MipsGp->Section = OS;
-        ElfSym::MipsGp->Value = 0x7ff0;
+    for (OutputSection *os : outputSections) {
+      if (os->flags & SHF_MIPS_GPREL) {
+        ElfSym::mipsGp->section = os;
+        ElfSym::mipsGp->value = 0x7ff0;
         break;
       }
     }
@@ -1025,14 +1142,13 @@ template <class ELFT> void Writer<ELFT>::setReservedSymbolSections() {
 // The more branches in getSectionRank that match, the more similar they are.
 // Since each branch corresponds to a bit flag, we can just use
 // countLeadingZeros.
-static int getRankProximityAux(OutputSection *A, OutputSection *B) {
-  return countLeadingZeros(A->SortRank ^ B->SortRank);
+static int getRankProximityAux(OutputSection *a, OutputSection *b) {
+  return countLeadingZeros(a->sortRank ^ b->sortRank);
 }
 
-static int getRankProximity(OutputSection *A, BaseCommand *B) {
-  if (auto *Sec = dyn_cast<OutputSection>(B))
-    return getRankProximityAux(A, Sec);
-  return -1;
+static int getRankProximity(OutputSection *a, BaseCommand *b) {
+  auto *sec = dyn_cast<OutputSection>(b);
+  return (sec && sec->hasInputSections) ? getRankProximityAux(a, sec) : -1;
 }
 
 // When placing orphan sections, we want to place them after symbol assignments
@@ -1049,137 +1165,142 @@ static int getRankProximity(OutputSection *A, BaseCommand *B) {
 //  /* The RW PT_LOAD starts here*/
 //  rw_sec : { *(rw_sec) }
 // would mean that the RW PT_LOAD would become unaligned.
-static bool shouldSkip(BaseCommand *Cmd) {
-  if (auto *Assign = dyn_cast<SymbolAssignment>(Cmd))
-    return Assign->Name != ".";
+static bool shouldSkip(BaseCommand *cmd) {
+  if (auto *assign = dyn_cast<SymbolAssignment>(cmd))
+    return assign->name != ".";
   return false;
 }
 
 // We want to place orphan sections so that they share as much
 // characteristics with their neighbors as possible. For example, if
 // both are rw, or both are tls.
-template <typename ELFT>
 static std::vector<BaseCommand *>::iterator
-findOrphanPos(std::vector<BaseCommand *>::iterator B,
-              std::vector<BaseCommand *>::iterator E) {
-  OutputSection *Sec = cast<OutputSection>(*E);
+findOrphanPos(std::vector<BaseCommand *>::iterator b,
+              std::vector<BaseCommand *>::iterator e) {
+  OutputSection *sec = cast<OutputSection>(*e);
 
   // Find the first element that has as close a rank as possible.
-  auto I = std::max_element(B, E, [=](BaseCommand *A, BaseCommand *B) {
-    return getRankProximity(Sec, A) < getRankProximity(Sec, B);
+  auto i = std::max_element(b, e, [=](BaseCommand *a, BaseCommand *b) {
+    return getRankProximity(sec, a) < getRankProximity(sec, b);
   });
-  if (I == E)
-    return E;
+  if (i == e)
+    return e;
 
   // Consider all existing sections with the same proximity.
-  int Proximity = getRankProximity(Sec, *I);
-  for (; I != E; ++I) {
-    auto *CurSec = dyn_cast<OutputSection>(*I);
-    if (!CurSec)
+  int proximity = getRankProximity(sec, *i);
+  for (; i != e; ++i) {
+    auto *curSec = dyn_cast<OutputSection>(*i);
+    if (!curSec || !curSec->hasInputSections)
       continue;
-    if (getRankProximity(Sec, CurSec) != Proximity ||
-        Sec->SortRank < CurSec->SortRank)
+    if (getRankProximity(sec, curSec) != proximity ||
+        sec->sortRank < curSec->sortRank)
       break;
   }
 
-  auto IsOutputSec = [](BaseCommand *Cmd) { return isa<OutputSection>(Cmd); };
-  auto J = std::find_if(llvm::make_reverse_iterator(I),
-                        llvm::make_reverse_iterator(B), IsOutputSec);
-  I = J.base();
+  auto isOutputSecWithInputSections = [](BaseCommand *cmd) {
+    auto *os = dyn_cast<OutputSection>(cmd);
+    return os && os->hasInputSections;
+  };
+  auto j = std::find_if(llvm::make_reverse_iterator(i),
+                        llvm::make_reverse_iterator(b),
+                        isOutputSecWithInputSections);
+  i = j.base();
 
   // As a special case, if the orphan section is the last section, put
   // it at the very end, past any other commands.
   // This matches bfd's behavior and is convenient when the linker script fully
   // specifies the start of the file, but doesn't care about the end (the non
   // alloc sections for example).
-  auto NextSec = std::find_if(I, E, IsOutputSec);
-  if (NextSec == E)
-    return E;
+  auto nextSec = std::find_if(i, e, isOutputSecWithInputSections);
+  if (nextSec == e)
+    return e;
 
-  while (I != E && shouldSkip(*I))
-    ++I;
-  return I;
+  while (i != e && shouldSkip(*i))
+    ++i;
+  return i;
 }
 
 // Builds section order for handling --symbol-ordering-file.
 static DenseMap<const InputSectionBase *, int> buildSectionOrder() {
-  DenseMap<const InputSectionBase *, int> SectionOrder;
+  DenseMap<const InputSectionBase *, int> sectionOrder;
   // Use the rarely used option -call-graph-ordering-file to sort sections.
-  if (!Config->CallGraphProfile.empty())
+  if (!config->callGraphProfile.empty())
     return computeCallGraphProfileOrder();
 
-  if (Config->SymbolOrderingFile.empty())
-    return SectionOrder;
+  if (config->symbolOrderingFile.empty())
+    return sectionOrder;
 
   struct SymbolOrderEntry {
-    int Priority;
-    bool Present;
+    int priority;
+    bool present;
   };
 
   // Build a map from symbols to their priorities. Symbols that didn't
   // appear in the symbol ordering file have the lowest priority 0.
   // All explicitly mentioned symbols have negative (higher) priorities.
-  DenseMap<StringRef, SymbolOrderEntry> SymbolOrder;
-  int Priority = -Config->SymbolOrderingFile.size();
-  for (StringRef S : Config->SymbolOrderingFile)
-    SymbolOrder.insert({S, {Priority++, false}});
+  DenseMap<StringRef, SymbolOrderEntry> symbolOrder;
+  int priority = -config->symbolOrderingFile.size();
+  for (StringRef s : config->symbolOrderingFile)
+    symbolOrder.insert({s, {priority++, false}});
 
   // Build a map from sections to their priorities.
-  auto AddSym = [&](Symbol &Sym) {
-    auto It = SymbolOrder.find(Sym.getName());
-    if (It == SymbolOrder.end())
+  auto addSym = [&](Symbol &sym) {
+    auto it = symbolOrder.find(sym.getName());
+    if (it == symbolOrder.end())
       return;
-    SymbolOrderEntry &Ent = It->second;
-    Ent.Present = true;
+    SymbolOrderEntry &ent = it->second;
+    ent.present = true;
 
-    maybeWarnUnorderableSymbol(&Sym);
+    maybeWarnUnorderableSymbol(&sym);
 
-    if (auto *D = dyn_cast<Defined>(&Sym)) {
-      if (auto *Sec = dyn_cast_or_null<InputSectionBase>(D->Section)) {
-        int &Priority = SectionOrder[cast<InputSectionBase>(Sec->Repl)];
-        Priority = std::min(Priority, Ent.Priority);
+    if (auto *d = dyn_cast<Defined>(&sym)) {
+      if (auto *sec = dyn_cast_or_null<InputSectionBase>(d->section)) {
+        int &priority = sectionOrder[cast<InputSectionBase>(sec->repl)];
+        priority = std::min(priority, ent.priority);
       }
     }
   };
 
   // We want both global and local symbols. We get the global ones from the
   // symbol table and iterate the object files for the local ones.
-  for (Symbol *Sym : Symtab->getSymbols())
-    if (!Sym->isLazy())
-      AddSym(*Sym);
-  for (InputFile *File : ObjectFiles)
-    for (Symbol *Sym : File->getSymbols())
-      if (Sym->isLocal())
-        AddSym(*Sym);
+  symtab->forEachSymbol([&](Symbol *sym) {
+    if (!sym->isLazy())
+      addSym(*sym);
+  });
 
-  if (Config->WarnSymbolOrdering)
-    for (auto OrderEntry : SymbolOrder)
-      if (!OrderEntry.second.Present)
-        warn("symbol ordering file: no such symbol: " + OrderEntry.first);
+  for (InputFile *file : objectFiles)
+    for (Symbol *sym : file->getSymbols())
+      if (sym->isLocal())
+        addSym(*sym);
 
-  return SectionOrder;
+  if (config->warnSymbolOrdering)
+    for (auto orderEntry : symbolOrder)
+      if (!orderEntry.second.present)
+        warn("symbol ordering file: no such symbol: " + orderEntry.first);
+
+  return sectionOrder;
 }
 
 // Sorts the sections in ISD according to the provided section order.
 static void
-sortISDBySectionOrder(InputSectionDescription *ISD,
-                      const DenseMap<const InputSectionBase *, int> &Order) {
-  std::vector<InputSection *> UnorderedSections;
-  std::vector<std::pair<InputSection *, int>> OrderedSections;
-  uint64_t UnorderedSize = 0;
+sortISDBySectionOrder(InputSectionDescription *isd,
+                      const DenseMap<const InputSectionBase *, int> &order) {
+  std::vector<InputSection *> unorderedSections;
+  std::vector<std::pair<InputSection *, int>> orderedSections;
+  uint64_t unorderedSize = 0;
 
-  for (InputSection *IS : ISD->Sections) {
-    auto I = Order.find(IS);
-    if (I == Order.end()) {
-      UnorderedSections.push_back(IS);
-      UnorderedSize += IS->getSize();
+  for (InputSection *isec : isd->sections) {
+    auto i = order.find(isec);
+    if (i == order.end()) {
+      unorderedSections.push_back(isec);
+      unorderedSize += isec->getSize();
       continue;
     }
-    OrderedSections.push_back({IS, I->second});
+    orderedSections.push_back({isec, i->second});
   }
-  llvm::sort(OrderedSections, [&](std::pair<InputSection *, int> A,
-                                  std::pair<InputSection *, int> B) {
-    return A.second < B.second;
+  llvm::sort(orderedSections, [&](std::pair<InputSection *, int> a,
+                                  std::pair<InputSection *, int> b) {
+    return a.second < b.second;
   });
 
   // Find an insertion point for the ordered section list in the unordered
@@ -1209,96 +1330,114 @@ sortISDBySectionOrder(InputSectionDescription *ISD,
   // of the second block of cold code can call the hot code without a thunk. So
   // we effectively double the amount of code that could potentially call into
   // the hot code without a thunk.
-  size_t InsPt = 0;
-  if (Target->getThunkSectionSpacing() && !OrderedSections.empty()) {
-    uint64_t UnorderedPos = 0;
-    for (; InsPt != UnorderedSections.size(); ++InsPt) {
-      UnorderedPos += UnorderedSections[InsPt]->getSize();
-      if (UnorderedPos > UnorderedSize / 2)
+  size_t insPt = 0;
+  if (target->getThunkSectionSpacing() && !orderedSections.empty()) {
+    uint64_t unorderedPos = 0;
+    for (; insPt != unorderedSections.size(); ++insPt) {
+      unorderedPos += unorderedSections[insPt]->getSize();
+      if (unorderedPos > unorderedSize / 2)
         break;
     }
   }
 
-  ISD->Sections.clear();
-  for (InputSection *IS : makeArrayRef(UnorderedSections).slice(0, InsPt))
-    ISD->Sections.push_back(IS);
-  for (std::pair<InputSection *, int> P : OrderedSections)
-    ISD->Sections.push_back(P.first);
-  for (InputSection *IS : makeArrayRef(UnorderedSections).slice(InsPt))
-    ISD->Sections.push_back(IS);
+  isd->sections.clear();
+  for (InputSection *isec : makeArrayRef(unorderedSections).slice(0, insPt))
+    isd->sections.push_back(isec);
+  for (std::pair<InputSection *, int> p : orderedSections)
+    isd->sections.push_back(p.first);
+  for (InputSection *isec : makeArrayRef(unorderedSections).slice(insPt))
+    isd->sections.push_back(isec);
 }
 
-static void sortSection(OutputSection *Sec,
-                        const DenseMap<const InputSectionBase *, int> &Order) {
-  StringRef Name = Sec->Name;
+static void sortSection(OutputSection *sec,
+                        const DenseMap<const InputSectionBase *, int> &order) {
+  StringRef name = sec->name;
 
   // Sort input sections by section name suffixes for
   // __attribute__((init_priority(N))).
-  if (Name == ".init_array" || Name == ".fini_array") {
-    if (!Script->HasSectionsCommand)
-      Sec->sortInitFini();
+  if (name == ".init_array" || name == ".fini_array") {
+    if (!script->hasSectionsCommand)
+      sec->sortInitFini();
     return;
   }
 
   // Sort input sections by the special rule for .ctors and .dtors.
-  if (Name == ".ctors" || Name == ".dtors") {
-    if (!Script->HasSectionsCommand)
-      Sec->sortCtorsDtors();
+  if (name == ".ctors" || name == ".dtors") {
+    if (!script->hasSectionsCommand)
+      sec->sortCtorsDtors();
     return;
   }
 
   // Never sort these.
-  if (Name == ".init" || Name == ".fini")
+  if (name == ".init" || name == ".fini")
     return;
 
+  // .toc is allocated just after .got and is accessed using GOT-relative
+  // relocations. Object files compiled with small code model have an
+  // addressable range of [.got, .got + 0xFFFC] for GOT-relative relocations.
+  // To reduce the risk of relocation overflow, .toc contents are sorted so that
+  // sections having smaller relocation offsets are at beginning of .toc
+  if (config->emachine == EM_PPC64 && name == ".toc") {
+    if (script->hasSectionsCommand)
+      return;
+    assert(sec->sectionCommands.size() == 1);
+    auto *isd = cast<InputSectionDescription>(sec->sectionCommands[0]);
+    llvm::stable_sort(isd->sections,
+                      [](const InputSection *a, const InputSection *b) -> bool {
+                        return a->file->ppc64SmallCodeModelTocRelocs &&
+                               !b->file->ppc64SmallCodeModelTocRelocs;
+                      });
+    return;
+  }
+
   // Sort input sections by priority using the list provided
   // by --symbol-ordering-file.
-  if (!Order.empty())
-    for (BaseCommand *B : Sec->SectionCommands)
-      if (auto *ISD = dyn_cast<InputSectionDescription>(B))
-        sortISDBySectionOrder(ISD, Order);
+  if (!order.empty())
+    for (BaseCommand *b : sec->sectionCommands)
+      if (auto *isd = dyn_cast<InputSectionDescription>(b))
+        sortISDBySectionOrder(isd, order);
 }
 
 // If no layout was provided by linker script, we want to apply default
 // sorting for special input sections. This also handles --symbol-ordering-file.
 template <class ELFT> void Writer<ELFT>::sortInputSections() {
   // Build the order once since it is expensive.
-  DenseMap<const InputSectionBase *, int> Order = buildSectionOrder();
-  for (BaseCommand *Base : Script->SectionCommands)
-    if (auto *Sec = dyn_cast<OutputSection>(Base))
-      sortSection(Sec, Order);
+  DenseMap<const InputSectionBase *, int> order = buildSectionOrder();
+  for (BaseCommand *base : script->sectionCommands)
+    if (auto *sec = dyn_cast<OutputSection>(base))
+      sortSection(sec, order);
 }
 
 template <class ELFT> void Writer<ELFT>::sortSections() {
-  Script->adjustSectionsBeforeSorting();
+  script->adjustSectionsBeforeSorting();
 
   // Don't sort if using -r. It is not necessary and we want to preserve the
   // relative order for SHF_LINK_ORDER sections.
-  if (Config->Relocatable)
+  if (config->relocatable)
     return;
 
   sortInputSections();
 
-  for (BaseCommand *Base : Script->SectionCommands) {
-    auto *OS = dyn_cast<OutputSection>(Base);
-    if (!OS)
+  for (BaseCommand *base : script->sectionCommands) {
+    auto *os = dyn_cast<OutputSection>(base);
+    if (!os)
       continue;
-    OS->SortRank = getSectionRank(OS);
+    os->sortRank = getSectionRank(os);
 
-    // We want to assign rude approximation values to OutSecOff fields
+    // We want to assign rude approximation values to outSecOff fields
     // to know the relative order of the input sections. We use it for
     // sorting SHF_LINK_ORDER sections. See resolveShfLinkOrder().
-    uint64_t I = 0;
-    for (InputSection *Sec : getInputSections(OS))
-      Sec->OutSecOff = I++;
+    uint64_t i = 0;
+    for (InputSection *sec : getInputSections(os))
+      sec->outSecOff = i++;
   }
 
-  if (!Script->HasSectionsCommand) {
+  if (!script->hasSectionsCommand) {
     // We know that all the OutputSections are contiguous in this case.
-    auto IsSection = [](BaseCommand *Base) { return isa<OutputSection>(Base); };
+    auto isSection = [](BaseCommand *base) { return isa<OutputSection>(base); };
     std::stable_sort(
-        llvm::find_if(Script->SectionCommands, IsSection),
-        llvm::find_if(llvm::reverse(Script->SectionCommands), IsSection).base(),
+        llvm::find_if(script->sectionCommands, isSection),
+        llvm::find_if(llvm::reverse(script->sectionCommands), isSection).base(),
         compareSections);
     return;
   }
@@ -1342,211 +1481,127 @@ template <class ELFT> void Writer<ELFT>::sortSections() {
   // after another commands. For the details, look at shouldSkip
   // function.
 
-  auto I = Script->SectionCommands.begin();
-  auto E = Script->SectionCommands.end();
-  auto NonScriptI = std::find_if(I, E, [](BaseCommand *Base) {
-    if (auto *Sec = dyn_cast<OutputSection>(Base))
-      return Sec->SectionIndex == UINT32_MAX;
+  auto i = script->sectionCommands.begin();
+  auto e = script->sectionCommands.end();
+  auto nonScriptI = std::find_if(i, e, [](BaseCommand *base) {
+    if (auto *sec = dyn_cast<OutputSection>(base))
+      return sec->sectionIndex == UINT32_MAX;
     return false;
   });
 
   // Sort the orphan sections.
-  std::stable_sort(NonScriptI, E, compareSections);
+  std::stable_sort(nonScriptI, e, compareSections);
 
   // As a horrible special case, skip the first . assignment if it is before any
   // section. We do this because it is common to set a load address by starting
   // the script with ". = 0xabcd" and the expectation is that every section is
   // after that.
-  auto FirstSectionOrDotAssignment =
-      std::find_if(I, E, [](BaseCommand *Cmd) { return !shouldSkip(Cmd); });
-  if (FirstSectionOrDotAssignment != E &&
-      isa<SymbolAssignment>(**FirstSectionOrDotAssignment))
-    ++FirstSectionOrDotAssignment;
-  I = FirstSectionOrDotAssignment;
+  auto firstSectionOrDotAssignment =
+      std::find_if(i, e, [](BaseCommand *cmd) { return !shouldSkip(cmd); });
+  if (firstSectionOrDotAssignment != e &&
+      isa<SymbolAssignment>(**firstSectionOrDotAssignment))
+    ++firstSectionOrDotAssignment;
+  i = firstSectionOrDotAssignment;
 
-  while (NonScriptI != E) {
-    auto Pos = findOrphanPos<ELFT>(I, NonScriptI);
-    OutputSection *Orphan = cast<OutputSection>(*NonScriptI);
+  while (nonScriptI != e) {
+    auto pos = findOrphanPos(i, nonScriptI);
+    OutputSection *orphan = cast<OutputSection>(*nonScriptI);
 
     // As an optimization, find all sections with the same sort rank
     // and insert them with one rotate.
-    unsigned Rank = Orphan->SortRank;
-    auto End = std::find_if(NonScriptI + 1, E, [=](BaseCommand *Cmd) {
-      return cast<OutputSection>(Cmd)->SortRank != Rank;
+    unsigned rank = orphan->sortRank;
+    auto end = std::find_if(nonScriptI + 1, e, [=](BaseCommand *cmd) {
+      return cast<OutputSection>(cmd)->sortRank != rank;
     });
-    std::rotate(Pos, NonScriptI, End);
-    NonScriptI = End;
+    std::rotate(pos, nonScriptI, end);
+    nonScriptI = end;
   }
 
-  Script->adjustSectionsAfterSorting();
+  script->adjustSectionsAfterSorting();
 }
 
-static bool compareByFilePosition(InputSection *A, InputSection *B) {
-  // Synthetic, i. e. a sentinel section, should go last.
-  if (A->kind() == InputSectionBase::Synthetic ||
-      B->kind() == InputSectionBase::Synthetic)
-    return A->kind() != InputSectionBase::Synthetic;
+static bool compareByFilePosition(InputSection *a, InputSection *b) {
+  InputSection *la = a->getLinkOrderDep();
+  InputSection *lb = b->getLinkOrderDep();
+  OutputSection *aOut = la->getParent();
+  OutputSection *bOut = lb->getParent();
 
-  InputSection *LA = A->getLinkOrderDep();
-  InputSection *LB = B->getLinkOrderDep();
-  OutputSection *AOut = LA->getParent();
-  OutputSection *BOut = LB->getParent();
-
-  if (AOut != BOut)
-    return AOut->SectionIndex < BOut->SectionIndex;
-  return LA->OutSecOff < LB->OutSecOff;
-}
-
-// This function is used by the --merge-exidx-entries to detect duplicate
-// .ARM.exidx sections. It is Arm only.
-//
-// The .ARM.exidx section is of the form:
-// | PREL31 offset to function | Unwind instructions for function |
-// where the unwind instructions are either a small number of unwind
-// instructions inlined into the table entry, the special CANT_UNWIND value of
-// 0x1 or a PREL31 offset into a .ARM.extab Section that contains unwind
-// instructions.
-//
-// We return true if all the unwind instructions in the .ARM.exidx entries of
-// Cur can be merged into the last entry of Prev.
-static bool isDuplicateArmExidxSec(InputSection *Prev, InputSection *Cur) {
-
-  // References to .ARM.Extab Sections have bit 31 clear and are not the
-  // special EXIDX_CANTUNWIND bit-pattern.
-  auto IsExtabRef = [](uint32_t Unwind) {
-    return (Unwind & 0x80000000) == 0 && Unwind != 0x1;
-  };
-
-  struct ExidxEntry {
-    ulittle32_t Fn;
-    ulittle32_t Unwind;
-  };
-
-  // Get the last table Entry from the previous .ARM.exidx section.
-  const ExidxEntry &PrevEntry = Prev->getDataAs<ExidxEntry>().back();
-  if (IsExtabRef(PrevEntry.Unwind))
-    return false;
-
-  // We consider the unwind instructions of an .ARM.exidx table entry
-  // a duplicate if the previous unwind instructions if:
-  // - Both are the special EXIDX_CANTUNWIND.
-  // - Both are the same inline unwind instructions.
-  // We do not attempt to follow and check links into .ARM.extab tables as
-  // consecutive identical entries are rare and the effort to check that they
-  // are identical is high.
-
-  for (const ExidxEntry Entry : Cur->getDataAs<ExidxEntry>())
-    if (IsExtabRef(Entry.Unwind) || Entry.Unwind != PrevEntry.Unwind)
-      return false;
-
-  // All table entries in this .ARM.exidx Section can be merged into the
-  // previous Section.
-  return true;
+  if (aOut != bOut)
+    return aOut->sectionIndex < bOut->sectionIndex;
+  return la->outSecOff < lb->outSecOff;
 }
 
 template <class ELFT> void Writer<ELFT>::resolveShfLinkOrder() {
-  for (OutputSection *Sec : OutputSections) {
-    if (!(Sec->Flags & SHF_LINK_ORDER))
+  for (OutputSection *sec : outputSections) {
+    if (!(sec->flags & SHF_LINK_ORDER))
       continue;
 
     // Link order may be distributed across several InputSectionDescriptions
     // but sort must consider them all at once.
-    std::vector<InputSection **> ScriptSections;
-    std::vector<InputSection *> Sections;
-    for (BaseCommand *Base : Sec->SectionCommands) {
-      if (auto *ISD = dyn_cast<InputSectionDescription>(Base)) {
-        for (InputSection *&IS : ISD->Sections) {
-          ScriptSections.push_back(&IS);
-          Sections.push_back(IS);
+    std::vector<InputSection **> scriptSections;
+    std::vector<InputSection *> sections;
+    for (BaseCommand *base : sec->sectionCommands) {
+      if (auto *isd = dyn_cast<InputSectionDescription>(base)) {
+        for (InputSection *&isec : isd->sections) {
+          scriptSections.push_back(&isec);
+          sections.push_back(isec);
         }
       }
     }
-    std::stable_sort(Sections.begin(), Sections.end(), compareByFilePosition);
 
-    if (!Config->Relocatable && Config->EMachine == EM_ARM &&
-        Sec->Type == SHT_ARM_EXIDX) {
+    // The ARM.exidx section use SHF_LINK_ORDER, but we have consolidated
+    // this processing inside the ARMExidxsyntheticsection::finalizeContents().
+    if (!config->relocatable && config->emachine == EM_ARM &&
+        sec->type == SHT_ARM_EXIDX)
+      continue;
 
-      if (auto *Sentinel = dyn_cast<ARMExidxSentinelSection>(Sections.back())) {
-        assert(Sections.size() >= 2 &&
-               "We should create a sentinel section only if there are "
-               "alive regular exidx sections.");
+    llvm::stable_sort(sections, compareByFilePosition);
 
-        // The last executable section is required to fill the sentinel.
-        // Remember it here so that we don't have to find it again.
-        Sentinel->Highest = Sections[Sections.size() - 2]->getLinkOrderDep();
-      }
-
-      // The EHABI for the Arm Architecture permits consecutive identical
-      // table entries to be merged. We use a simple implementation that
-      // removes a .ARM.exidx Input Section if it can be merged into the
-      // previous one. This does not require any rewriting of InputSection
-      // contents but misses opportunities for fine grained deduplication
-      // where only a subset of the InputSection contents can be merged.
-      if (Config->MergeArmExidx) {
-        size_t Prev = 0;
-        // The last one is a sentinel entry which should not be removed.
-        for (size_t I = 1; I < Sections.size() - 1; ++I) {
-          if (isDuplicateArmExidxSec(Sections[Prev], Sections[I]))
-            Sections[I] = nullptr;
-          else
-            Prev = I;
-        }
-      }
-    }
-
-    for (int I = 0, N = Sections.size(); I < N; ++I)
-      *ScriptSections[I] = Sections[I];
-
-    // Remove the Sections we marked as duplicate earlier.
-    for (BaseCommand *Base : Sec->SectionCommands)
-      if (auto *ISD = dyn_cast<InputSectionDescription>(Base))
-        llvm::erase_if(ISD->Sections, [](InputSection *IS) { return !IS; });
+    for (int i = 0, n = sections.size(); i < n; ++i)
+      *scriptSections[i] = sections[i];
   }
 }
 
-// For most RISC ISAs, we need to generate content that depends on the address
-// of InputSections. For example some architectures such as AArch64 use small
-// displacements for jump instructions that is the linker's responsibility for
-// creating range extension thunks for. As the generation of the content may
-// also alter InputSection addresses we must converge to a fixed point.
-template <class ELFT> void Writer<ELFT>::maybeAddThunks() {
-  if (!Target->NeedsThunks && !Config->AndroidPackDynRelocs &&
-      !Config->RelrPackDynRelocs)
-    return;
-
-  ThunkCreator TC;
-  AArch64Err843419Patcher A64P;
+// We need to generate and finalize the content that depends on the address of
+// InputSections. As the generation of the content may also alter InputSection
+// addresses we must converge to a fixed point. We do that here. See the comment
+// in Writer<ELFT>::finalizeSections().
+template <class ELFT> void Writer<ELFT>::finalizeAddressDependentContent() {
+  ThunkCreator tc;
+  AArch64Err843419Patcher a64p;
 
+  // For some targets, like x86, this loop iterates only once.
   for (;;) {
-    bool Changed = false;
+    bool changed = false;
 
-    Script->assignAddresses();
+    script->assignAddresses();
 
-    if (Target->NeedsThunks)
-      Changed |= TC.createThunks(OutputSections);
+    if (target->needsThunks)
+      changed |= tc.createThunks(outputSections);
 
-    if (Config->FixCortexA53Errata843419) {
-      if (Changed)
-        Script->assignAddresses();
-      Changed |= A64P.createFixes();
+    if (config->fixCortexA53Errata843419) {
+      if (changed)
+        script->assignAddresses();
+      changed |= a64p.createFixes();
     }
 
-    if (In.MipsGot)
-      In.MipsGot->updateAllocSize();
+    if (in.mipsGot)
+      in.mipsGot->updateAllocSize();
 
-    Changed |= In.RelaDyn->updateAllocSize();
-
-    if (In.RelrDyn)
-      Changed |= In.RelrDyn->updateAllocSize();
+    for (Partition &part : partitions) {
+      changed |= part.relaDyn->updateAllocSize();
+      if (part.relrDyn)
+        changed |= part.relrDyn->updateAllocSize();
+    }
 
-    if (!Changed)
+    if (!changed)
       return;
   }
 }
 
-static void finalizeSynthetic(SyntheticSection *Sec) {
-  if (Sec && !Sec->empty() && Sec->getParent())
-    Sec->finalizeContents();
+static void finalizeSynthetic(SyntheticSection *sec) {
+  if (sec && sec->isNeeded() && sec->getParent())
+    sec->finalizeContents();
 }
 
 // In order to allow users to manipulate linker-synthesized sections,
@@ -1565,128 +1620,190 @@ static void removeUnusedSyntheticSections() {
   // All input synthetic sections that can be empty are placed after
   // all regular ones. We iterate over them all and exit at first
   // non-synthetic.
-  for (InputSectionBase *S : llvm::reverse(InputSections)) {
-    SyntheticSection *SS = dyn_cast<SyntheticSection>(S);
-    if (!SS)
+  for (InputSectionBase *s : llvm::reverse(inputSections)) {
+    SyntheticSection *ss = dyn_cast<SyntheticSection>(s);
+    if (!ss)
       return;
-    OutputSection *OS = SS->getParent();
-    if (!OS || !SS->empty())
+    OutputSection *os = ss->getParent();
+    if (!os || ss->isNeeded())
       continue;
 
     // If we reach here, then SS is an unused synthetic section and we want to
     // remove it from corresponding input section description of output section.
-    for (BaseCommand *B : OS->SectionCommands)
-      if (auto *ISD = dyn_cast<InputSectionDescription>(B))
-        llvm::erase_if(ISD->Sections,
-                       [=](InputSection *IS) { return IS == SS; });
+    for (BaseCommand *b : os->sectionCommands)
+      if (auto *isd = dyn_cast<InputSectionDescription>(b))
+        llvm::erase_if(isd->sections,
+                       [=](InputSection *isec) { return isec == ss; });
   }
 }
 
 // Returns true if a symbol can be replaced at load-time by a symbol
 // with the same name defined in other ELF executable or DSO.
-static bool computeIsPreemptible(const Symbol &B) {
-  assert(!B.isLocal());
+static bool computeIsPreemptible(const Symbol &b) {
+  assert(!b.isLocal());
 
   // Only symbols that appear in dynsym can be preempted.
-  if (!B.includeInDynsym())
+  if (!b.includeInDynsym())
     return false;
 
   // Only default visibility symbols can be preempted.
-  if (B.Visibility != STV_DEFAULT)
+  if (b.visibility != STV_DEFAULT)
     return false;
 
   // At this point copy relocations have not been created yet, so any
   // symbol that is not defined locally is preemptible.
-  if (!B.isDefined())
+  if (!b.isDefined())
     return true;
 
   // If we have a dynamic list it specifies which local symbols are preemptible.
-  if (Config->HasDynamicList)
+  if (config->hasDynamicList)
     return false;
 
-  if (!Config->Shared)
+  if (!config->shared)
     return false;
 
   // -Bsymbolic means that definitions are not preempted.
-  if (Config->Bsymbolic || (Config->BsymbolicFunctions && B.isFunc()))
+  if (config->bsymbolic || (config->bsymbolicFunctions && b.isFunc()))
     return false;
   return true;
 }
 
 // Create output section objects and add them to OutputSections.
 template <class ELFT> void Writer<ELFT>::finalizeSections() {
-  Out::PreinitArray = findSection(".preinit_array");
-  Out::InitArray = findSection(".init_array");
-  Out::FiniArray = findSection(".fini_array");
+  Out::preinitArray = findSection(".preinit_array");
+  Out::initArray = findSection(".init_array");
+  Out::finiArray = findSection(".fini_array");
 
   // The linker needs to define SECNAME_start, SECNAME_end and SECNAME_stop
   // symbols for sections, so that the runtime can get the start and end
   // addresses of each section by section name. Add such symbols.
-  if (!Config->Relocatable) {
+  if (!config->relocatable) {
     addStartEndSymbols();
-    for (BaseCommand *Base : Script->SectionCommands)
-      if (auto *Sec = dyn_cast<OutputSection>(Base))
-        addStartStopSymbols(Sec);
+    for (BaseCommand *base : script->sectionCommands)
+      if (auto *sec = dyn_cast<OutputSection>(base))
+        addStartStopSymbols(sec);
   }
 
   // Add _DYNAMIC symbol. Unlike GNU gold, our _DYNAMIC symbol has no type.
   // It should be okay as no one seems to care about the type.
   // Even the author of gold doesn't remember why gold behaves that way.
   // https://sourceware.org/ml/binutils/2002-03/msg00360.html
-  if (In.Dynamic->Parent)
-    Symtab->addDefined("_DYNAMIC", STV_HIDDEN, STT_NOTYPE, 0 /*Value*/,
-                       /*Size=*/0, STB_WEAK, In.Dynamic,
-                       /*File=*/nullptr);
+  if (mainPart->dynamic->parent)
+    symtab->addSymbol(Defined{/*file=*/nullptr, "_DYNAMIC", STB_WEAK,
+                              STV_HIDDEN, STT_NOTYPE,
+                              /*value=*/0, /*size=*/0, mainPart->dynamic});
 
   // Define __rel[a]_iplt_{start,end} symbols if needed.
   addRelIpltSymbols();
 
   // RISC-V's gp can address +/- 2 KiB, set it to .sdata + 0x800 if not defined.
-  if (Config->EMachine == EM_RISCV)
-    if (!dyn_cast_or_null<Defined>(Symtab->find("__global_pointer$")))
-      addOptionalRegular("__global_pointer$", findSection(".sdata"), 0x800);
+  // This symbol should only be defined in an executable.
+  if (config->emachine == EM_RISCV && !config->shared)
+    ElfSym::riscvGlobalPointer =
+        addOptionalRegular("__global_pointer$", findSection(".sdata"), 0x800,
+                           STV_DEFAULT, STB_GLOBAL);
+
+  if (config->emachine == EM_X86_64) {
+    // On targets that support TLSDESC, _TLS_MODULE_BASE_ is defined in such a
+    // way that:
+    //
+    // 1) Without relaxation: it produces a dynamic TLSDESC relocation that
+    // computes 0.
+    // 2) With LD->LE relaxation: _TLS_MODULE_BASE_@tpoff = 0 (lowest address in
+    // the TLS block).
+    //
+    // 2) is special cased in @tpoff computation. To satisfy 1), we define it as
+    // an absolute symbol of zero. This is different from GNU linkers which
+    // define _TLS_MODULE_BASE_ relative to the first TLS section.
+    Symbol *s = symtab->find("_TLS_MODULE_BASE_");
+    if (s && s->isUndefined()) {
+      s->resolve(Defined{/*file=*/nullptr, s->getName(), STB_GLOBAL, STV_HIDDEN,
+                         STT_TLS, /*value=*/0, 0,
+                         /*section=*/nullptr});
+      ElfSym::tlsModuleBase = cast<Defined>(s);
+    }
+  }
 
   // This responsible for splitting up .eh_frame section into
   // pieces. The relocation scan uses those pieces, so this has to be
   // earlier.
-  finalizeSynthetic(In.EhFrame);
+  for (Partition &part : partitions)
+    finalizeSynthetic(part.ehFrame);
 
-  for (Symbol *S : Symtab->getSymbols())
-    if (!S->IsPreemptible)
-      S->IsPreemptible = computeIsPreemptible(*S);
+  symtab->forEachSymbol([](Symbol *s) {
+    if (!s->isPreemptible)
+      s->isPreemptible = computeIsPreemptible(*s);
+  });
 
   // Scan relocations. This must be done after every symbol is declared so that
   // we can correctly decide if a dynamic relocation is needed.
-  if (!Config->Relocatable)
+  if (!config->relocatable) {
     forEachRelSec(scanRelocations<ELFT>);
+    reportUndefinedSymbols<ELFT>();
+  }
 
-  if (In.Plt && !In.Plt->empty())
-    In.Plt->addSymbols();
-  if (In.Iplt && !In.Iplt->empty())
-    In.Iplt->addSymbols();
+  addIRelativeRelocs();
+
+  if (in.plt && in.plt->isNeeded())
+    in.plt->addSymbols();
+  if (in.iplt && in.iplt->isNeeded())
+    in.iplt->addSymbols();
+
+  if (!config->allowShlibUndefined) {
+    // Error on undefined symbols in a shared object, if all of its DT_NEEDED
+    // entires are seen. These cases would otherwise lead to runtime errors
+    // reported by the dynamic linker.
+    //
+    // ld.bfd traces all DT_NEEDED to emulate the logic of the dynamic linker to
+    // catch more cases. That is too much for us. Our approach resembles the one
+    // used in ld.gold, achieves a good balance to be useful but not too smart.
+    for (SharedFile *file : sharedFiles)
+      file->allNeededIsKnown =
+          llvm::all_of(file->dtNeeded, [&](StringRef needed) {
+            return symtab->soNames.count(needed);
+          });
+
+    symtab->forEachSymbol([](Symbol *sym) {
+      if (sym->isUndefined() && !sym->isWeak())
+        if (auto *f = dyn_cast_or_null<SharedFile>(sym->file))
+          if (f->allNeededIsKnown)
+            error(toString(f) + ": undefined reference to " + toString(*sym));
+    });
+  }
 
   // Now that we have defined all possible global symbols including linker-
   // synthesized ones. Visit all symbols to give the finishing touches.
-  for (Symbol *Sym : Symtab->getSymbols()) {
-    if (!includeInSymtab(*Sym))
-      continue;
-    if (In.SymTab)
-      In.SymTab->addSymbol(Sym);
+  symtab->forEachSymbol([](Symbol *sym) {
+    if (!includeInSymtab(*sym))
+      return;
+    if (in.symTab)
+      in.symTab->addSymbol(sym);
 
-    if (Sym->includeInDynsym()) {
-      In.DynSymTab->addSymbol(Sym);
-      if (auto *File = dyn_cast_or_null<SharedFile<ELFT>>(Sym->File))
-        if (File->IsNeeded && !Sym->isUndefined())
-          InX<ELFT>::VerNeed->addSymbol(Sym);
+    if (sym->includeInDynsym()) {
+      partitions[sym->partition - 1].dynSymTab->addSymbol(sym);
+      if (auto *file = dyn_cast_or_null<SharedFile>(sym->file))
+        if (file->isNeeded && !sym->isUndefined())
+          addVerneed(sym);
     }
+  });
+
+  // We also need to scan the dynamic relocation tables of the other partitions
+  // and add any referenced symbols to the partition's dynsym.
+  for (Partition &part : MutableArrayRef<Partition>(partitions).slice(1)) {
+    DenseSet<Symbol *> syms;
+    for (const SymbolTableEntry &e : part.dynSymTab->getSymbols())
+      syms.insert(e.sym);
+    for (DynamicReloc &reloc : part.relaDyn->relocs)
+      if (reloc.sym && !reloc.useSymVA && syms.insert(reloc.sym).second)
+        part.dynSymTab->addSymbol(reloc.sym);
   }
 
   // Do not proceed if there was an undefined symbol.
   if (errorCount())
     return;
 
-  if (In.MipsGot)
-    In.MipsGot->build<ELFT>();
+  if (in.mipsGot)
+    in.mipsGot->build();
 
   removeUnusedSyntheticSections();
 
@@ -1694,116 +1811,147 @@ template <class ELFT> void Writer<ELFT>::finalizeSections() {
 
   // Now that we have the final list, create a list of all the
   // OutputSections for convenience.
-  for (BaseCommand *Base : Script->SectionCommands)
-    if (auto *Sec = dyn_cast<OutputSection>(Base))
-      OutputSections.push_back(Sec);
+  for (BaseCommand *base : script->sectionCommands)
+    if (auto *sec = dyn_cast<OutputSection>(base))
+      outputSections.push_back(sec);
 
   // Prefer command line supplied address over other constraints.
-  for (OutputSection *Sec : OutputSections) {
-    auto I = Config->SectionStartMap.find(Sec->Name);
-    if (I != Config->SectionStartMap.end())
-      Sec->AddrExpr = [=] { return I->second; };
+  for (OutputSection *sec : outputSections) {
+    auto i = config->sectionStartMap.find(sec->name);
+    if (i != config->sectionStartMap.end())
+      sec->addrExpr = [=] { return i->second; };
   }
 
   // This is a bit of a hack. A value of 0 means undef, so we set it
   // to 1 to make __ehdr_start defined. The section number is not
   // particularly relevant.
-  Out::ElfHeader->SectionIndex = 1;
+  Out::elfHeader->sectionIndex = 1;
 
-  for (size_t I = 0, E = OutputSections.size(); I != E; ++I) {
-    OutputSection *Sec = OutputSections[I];
-    Sec->SectionIndex = I + 1;
-    Sec->ShName = In.ShStrTab->addString(Sec->Name);
+  for (size_t i = 0, e = outputSections.size(); i != e; ++i) {
+    OutputSection *sec = outputSections[i];
+    sec->sectionIndex = i + 1;
+    sec->shName = in.shStrTab->addString(sec->name);
   }
 
   // Binary and relocatable output does not have PHDRS.
   // The headers have to be created before finalize as that can influence the
   // image base and the dynamic section on mips includes the image base.
-  if (!Config->Relocatable && !Config->OFormatBinary) {
-    Phdrs = Script->hasPhdrsCommands() ? Script->createPhdrs() : createPhdrs();
-    addPtArmExid(Phdrs);
-    Out::ProgramHeaders->Size = sizeof(Elf_Phdr) * Phdrs.size();
+  if (!config->relocatable && !config->oFormatBinary) {
+    for (Partition &part : partitions) {
+      part.phdrs = script->hasPhdrsCommands() ? script->createPhdrs()
+                                              : createPhdrs(part);
+      if (config->emachine == EM_ARM) {
+        // PT_ARM_EXIDX is the ARM EHABI equivalent of PT_GNU_EH_FRAME
+        addPhdrForSection(part, SHT_ARM_EXIDX, PT_ARM_EXIDX, PF_R);
+      }
+      if (config->emachine == EM_MIPS) {
+        // Add separate segments for MIPS-specific sections.
+        addPhdrForSection(part, SHT_MIPS_REGINFO, PT_MIPS_REGINFO, PF_R);
+        addPhdrForSection(part, SHT_MIPS_OPTIONS, PT_MIPS_OPTIONS, PF_R);
+        addPhdrForSection(part, SHT_MIPS_ABIFLAGS, PT_MIPS_ABIFLAGS, PF_R);
+      }
+    }
+    Out::programHeaders->size = sizeof(Elf_Phdr) * mainPart->phdrs.size();
 
     // Find the TLS segment. This happens before the section layout loop so that
-    // Android relocation packing can look up TLS symbol addresses.
-    for (PhdrEntry *P : Phdrs)
-      if (P->p_type == PT_TLS)
-        Out::TlsPhdr = P;
+    // Android relocation packing can look up TLS symbol addresses. We only need
+    // to care about the main partition here because all TLS symbols were moved
+    // to the main partition (see MarkLive.cpp).
+    for (PhdrEntry *p : mainPart->phdrs)
+      if (p->p_type == PT_TLS)
+        Out::tlsPhdr = p;
   }
 
   // Some symbols are defined in term of program headers. Now that we
   // have the headers, we can find out which sections they point to.
   setReservedSymbolSections();
 
+  finalizeSynthetic(in.bss);
+  finalizeSynthetic(in.bssRelRo);
+  finalizeSynthetic(in.symTabShndx);
+  finalizeSynthetic(in.shStrTab);
+  finalizeSynthetic(in.strTab);
+  finalizeSynthetic(in.got);
+  finalizeSynthetic(in.mipsGot);
+  finalizeSynthetic(in.igotPlt);
+  finalizeSynthetic(in.gotPlt);
+  finalizeSynthetic(in.relaIplt);
+  finalizeSynthetic(in.relaPlt);
+  finalizeSynthetic(in.plt);
+  finalizeSynthetic(in.iplt);
+  finalizeSynthetic(in.ppc32Got2);
+  finalizeSynthetic(in.riscvSdata);
+  finalizeSynthetic(in.partIndex);
+
   // Dynamic section must be the last one in this list and dynamic
-  // symbol table section (DynSymTab) must be the first one.
-  finalizeSynthetic(In.DynSymTab);
-  finalizeSynthetic(In.Bss);
-  finalizeSynthetic(In.BssRelRo);
-  finalizeSynthetic(In.GnuHashTab);
-  finalizeSynthetic(In.HashTab);
-  finalizeSynthetic(In.SymTabShndx);
-  finalizeSynthetic(In.ShStrTab);
-  finalizeSynthetic(In.StrTab);
-  finalizeSynthetic(In.VerDef);
-  finalizeSynthetic(In.DynStrTab);
-  finalizeSynthetic(In.Got);
-  finalizeSynthetic(In.MipsGot);
-  finalizeSynthetic(In.IgotPlt);
-  finalizeSynthetic(In.GotPlt);
-  finalizeSynthetic(In.RelaDyn);
-  finalizeSynthetic(In.RelrDyn);
-  finalizeSynthetic(In.RelaIplt);
-  finalizeSynthetic(In.RelaPlt);
-  finalizeSynthetic(In.Plt);
-  finalizeSynthetic(In.Iplt);
-  finalizeSynthetic(In.EhFrameHdr);
-  finalizeSynthetic(InX<ELFT>::VerSym);
-  finalizeSynthetic(InX<ELFT>::VerNeed);
-  finalizeSynthetic(In.Dynamic);
+  // symbol table section (dynSymTab) must be the first one.
+  for (Partition &part : partitions) {
+    finalizeSynthetic(part.armExidx);
+    finalizeSynthetic(part.dynSymTab);
+    finalizeSynthetic(part.gnuHashTab);
+    finalizeSynthetic(part.hashTab);
+    finalizeSynthetic(part.verDef);
+    finalizeSynthetic(part.relaDyn);
+    finalizeSynthetic(part.relrDyn);
+    finalizeSynthetic(part.ehFrameHdr);
+    finalizeSynthetic(part.verSym);
+    finalizeSynthetic(part.verNeed);
+    finalizeSynthetic(part.dynamic);
+  }
 
-  if (!Script->HasSectionsCommand && !Config->Relocatable)
+  if (!script->hasSectionsCommand && !config->relocatable)
     fixSectionAlignments();
 
-  // After link order processing .ARM.exidx sections can be deduplicated, which
-  // needs to be resolved before any other address dependent operation.
+  // SHFLinkOrder processing must be processed after relative section placements are
+  // known but before addresses are allocated.
   resolveShfLinkOrder();
 
-  // Jump instructions in many ISAs have small displacements, and therefore they
-  // cannot jump to arbitrary addresses in memory. For example, RISC-V JAL
-  // instruction can target only +-1 MiB from PC. It is a linker's
-  // responsibility to create and insert small pieces of code between sections
-  // to extend the ranges if jump targets are out of range. Such code pieces are
-  // called "thunks".
+  // This is used to:
+  // 1) Create "thunks":
+  //    Jump instructions in many ISAs have small displacements, and therefore
+  //    they cannot jump to arbitrary addresses in memory. For example, RISC-V
+  //    JAL instruction can target only +-1 MiB from PC. It is a linker's
+  //    responsibility to create and insert small pieces of code between
+  //    sections to extend the ranges if jump targets are out of range. Such
+  //    code pieces are called "thunks".
   //
-  // We add thunks at this stage. We couldn't do this before this point because
-  // this is the earliest point where we know sizes of sections and their
-  // layouts (that are needed to determine if jump targets are in range).
-  maybeAddThunks();
+  //    We add thunks at this stage. We couldn't do this before this point
+  //    because this is the earliest point where we know sizes of sections and
+  //    their layouts (that are needed to determine if jump targets are in
+  //    range).
+  //
+  // 2) Update the sections. We need to generate content that depends on the
+  //    address of InputSections. For example, MIPS GOT section content or
+  //    android packed relocations sections content.
+  //
+  // 3) Assign the final values for the linker script symbols. Linker scripts
+  //    sometimes using forward symbol declarations. We want to set the correct
+  //    values. They also might change after adding the thunks.
+  finalizeAddressDependentContent();
 
-  // maybeAddThunks may have added local symbols to the static symbol table.
-  finalizeSynthetic(In.SymTab);
-  finalizeSynthetic(In.PPC64LongBranchTarget);
+  // finalizeAddressDependentContent may have added local symbols to the static symbol table.
+  finalizeSynthetic(in.symTab);
+  finalizeSynthetic(in.ppc64LongBranchTarget);
 
   // Fill other section headers. The dynamic table is finalized
   // at the end because some tags like RELSZ depend on result
   // of finalizing other sections.
-  for (OutputSection *Sec : OutputSections)
-    Sec->finalize<ELFT>();
+  for (OutputSection *sec : outputSections)
+    sec->finalize();
 }
 
 // Ensure data sections are not mixed with executable sections when
 // -execute-only is used. -execute-only is a feature to make pages executable
 // but not readable, and the feature is currently supported only on AArch64.
 template <class ELFT> void Writer<ELFT>::checkExecuteOnly() {
-  if (!Config->ExecuteOnly)
+  if (!config->executeOnly)
     return;
 
-  for (OutputSection *OS : OutputSections)
-    if (OS->Flags & SHF_EXECINSTR)
-      for (InputSection *IS : getInputSections(OS))
-        if (!(IS->Flags & SHF_EXECINSTR))
-          error("cannot place " + toString(IS) + " into " + toString(OS->Name) +
+  for (OutputSection *os : outputSections)
+    if (os->flags & SHF_EXECINSTR)
+      for (InputSection *isec : getInputSections(os))
+        if (!(isec->flags & SHF_EXECINSTR))
+          error("cannot place " + toString(isec) + " into " + toString(os->name) +
                 ": -execute-only does not support intermingling data and code");
 }
 
@@ -1828,24 +1976,24 @@ template <class ELFT> void Writer<ELFT>::addStartEndSymbols() {
   // case, use the image base address as a last resort.
   OutputSection *Default = findSection(".text");
   if (!Default)
-    Default = Out::ElfHeader;
+    Default = Out::elfHeader;
 
-  auto Define = [=](StringRef Start, StringRef End, OutputSection *OS) {
-    if (OS) {
-      addOptionalRegular(Start, OS, 0);
-      addOptionalRegular(End, OS, -1);
+  auto define = [=](StringRef start, StringRef end, OutputSection *os) {
+    if (os) {
+      addOptionalRegular(start, os, 0);
+      addOptionalRegular(end, os, -1);
     } else {
-      addOptionalRegular(Start, Default, 0);
-      addOptionalRegular(End, Default, 0);
+      addOptionalRegular(start, Default, 0);
+      addOptionalRegular(end, Default, 0);
     }
   };
 
-  Define("__preinit_array_start", "__preinit_array_end", Out::PreinitArray);
-  Define("__init_array_start", "__init_array_end", Out::InitArray);
-  Define("__fini_array_start", "__fini_array_end", Out::FiniArray);
+  define("__preinit_array_start", "__preinit_array_end", Out::preinitArray);
+  define("__init_array_start", "__init_array_end", Out::initArray);
+  define("__fini_array_start", "__fini_array_end", Out::finiArray);
 
-  if (OutputSection *Sec = findSection(".ARM.exidx"))
-    Define("__exidx_start", "__exidx_end", Sec);
+  if (OutputSection *sec = findSection(".ARM.exidx"))
+    define("__exidx_start", "__exidx_end", sec);
 }
 
 // If a section name is valid as a C identifier (which is rare because of
@@ -1854,22 +2002,22 @@ template <class ELFT> void Writer<ELFT>::addStartEndSymbols() {
 // respectively. This is not requested by the ELF standard, but GNU ld and
 // gold provide the feature, and used by many programs.
 template <class ELFT>
-void Writer<ELFT>::addStartStopSymbols(OutputSection *Sec) {
-  StringRef S = Sec->Name;
-  if (!isValidCIdentifier(S))
+void Writer<ELFT>::addStartStopSymbols(OutputSection *sec) {
+  StringRef s = sec->name;
+  if (!isValidCIdentifier(s))
     return;
-  addOptionalRegular(Saver.save("__start_" + S), Sec, 0, STV_PROTECTED);
-  addOptionalRegular(Saver.save("__stop_" + S), Sec, -1, STV_PROTECTED);
+  addOptionalRegular(saver.save("__start_" + s), sec, 0, STV_PROTECTED);
+  addOptionalRegular(saver.save("__stop_" + s), sec, -1, STV_PROTECTED);
 }
 
-static bool needsPtLoad(OutputSection *Sec) {
-  if (!(Sec->Flags & SHF_ALLOC) || Sec->Noload)
+static bool needsPtLoad(OutputSection *sec) {
+  if (!(sec->flags & SHF_ALLOC) || sec->noload)
     return false;
 
   // Don't allocate VA space for TLS NOBITS sections. The PT_TLS PHDR is
   // responsible for allocating space for them, not the PT_LOAD that
   // contains the TLS initialization image.
-  if ((Sec->Flags & SHF_TLS) && Sec->Type == SHT_NOBITS)
+  if ((sec->flags & SHF_TLS) && sec->type == SHT_NOBITS)
     return false;
   return true;
 }
@@ -1878,46 +2026,93 @@ static bool needsPtLoad(OutputSection *Sec) {
 // linker scripts are designed for creating two PT_LOADs only, one RX and one
 // RW. This means that there is no alignment in the RO to RX transition and we
 // cannot create a PT_LOAD there.
-static uint64_t computeFlags(uint64_t Flags) {
-  if (Config->Omagic)
+static uint64_t computeFlags(uint64_t flags) {
+  if (config->omagic)
     return PF_R | PF_W | PF_X;
-  if (Config->ExecuteOnly && (Flags & PF_X))
-    return Flags & ~PF_R;
-  if (Config->SingleRoRx && !(Flags & PF_W))
-    return Flags | PF_X;
-  return Flags;
+  if (config->executeOnly && (flags & PF_X))
+    return flags & ~PF_R;
+  if (config->singleRoRx && !(flags & PF_W))
+    return flags | PF_X;
+  return flags;
 }
 
 // Decide which program headers to create and which sections to include in each
 // one.
-template <class ELFT> std::vector<PhdrEntry *> Writer<ELFT>::createPhdrs() {
-  std::vector<PhdrEntry *> Ret;
-  auto AddHdr = [&](unsigned Type, unsigned Flags) -> PhdrEntry * {
-    Ret.push_back(make<PhdrEntry>(Type, Flags));
-    return Ret.back();
+template <class ELFT>
+std::vector<PhdrEntry *> Writer<ELFT>::createPhdrs(Partition &part) {
+  std::vector<PhdrEntry *> ret;
+  auto addHdr = [&](unsigned type, unsigned flags) -> PhdrEntry * {
+    ret.push_back(make<PhdrEntry>(type, flags));
+    return ret.back();
   };
 
+  unsigned partNo = part.getNumber();
+  bool isMain = partNo == 1;
+
   // The first phdr entry is PT_PHDR which describes the program header itself.
-  AddHdr(PT_PHDR, PF_R)->add(Out::ProgramHeaders);
+  if (isMain)
+    addHdr(PT_PHDR, PF_R)->add(Out::programHeaders);
+  else
+    addHdr(PT_PHDR, PF_R)->add(part.programHeaders->getParent());
 
   // PT_INTERP must be the second entry if exists.
-  if (OutputSection *Cmd = findSection(".interp"))
-    AddHdr(PT_INTERP, Cmd->getPhdrFlags())->add(Cmd);
+  if (OutputSection *cmd = findSection(".interp", partNo))
+    addHdr(PT_INTERP, cmd->getPhdrFlags())->add(cmd);
 
   // Add the first PT_LOAD segment for regular output sections.
-  uint64_t Flags = computeFlags(PF_R);
-  PhdrEntry *Load = AddHdr(PT_LOAD, Flags);
+  uint64_t flags = computeFlags(PF_R);
+  PhdrEntry *load = nullptr;
 
   // Add the headers. We will remove them if they don't fit.
-  Load->add(Out::ElfHeader);
-  Load->add(Out::ProgramHeaders);
+  // In the other partitions the headers are ordinary sections, so they don't
+  // need to be added here.
+  if (isMain) {
+    load = addHdr(PT_LOAD, flags);
+    load->add(Out::elfHeader);
+    load->add(Out::programHeaders);
+  }
 
-  for (OutputSection *Sec : OutputSections) {
-    if (!(Sec->Flags & SHF_ALLOC))
+  // PT_GNU_RELRO includes all sections that should be marked as
+  // read-only by dynamic linker after proccessing relocations.
+  // Current dynamic loaders only support one PT_GNU_RELRO PHDR, give
+  // an error message if more than one PT_GNU_RELRO PHDR is required.
+  PhdrEntry *relRo = make<PhdrEntry>(PT_GNU_RELRO, PF_R);
+  bool inRelroPhdr = false;
+  OutputSection *relroEnd = nullptr;
+  for (OutputSection *sec : outputSections) {
+    if (sec->partition != partNo || !needsPtLoad(sec))
+      continue;
+    if (isRelroSection(sec)) {
+      inRelroPhdr = true;
+      if (!relroEnd)
+        relRo->add(sec);
+      else
+        error("section: " + sec->name + " is not contiguous with other relro" +
+              " sections");
+    } else if (inRelroPhdr) {
+      inRelroPhdr = false;
+      relroEnd = sec;
+    }
+  }
+
+  for (OutputSection *sec : outputSections) {
+    if (!(sec->flags & SHF_ALLOC))
       break;
-    if (!needsPtLoad(Sec))
+    if (!needsPtLoad(sec))
       continue;
 
+    // Normally, sections in partitions other than the current partition are
+    // ignored. But partition number 255 is a special case: it contains the
+    // partition end marker (.part.end). It needs to be added to the main
+    // partition so that a segment is created for it in the main partition,
+    // which will cause the dynamic loader to reserve space for the other
+    // partitions.
+    if (sec->partition != partNo) {
+      if (isMain && sec->partition == 255)
+        addHdr(PT_LOAD, computeFlags(sec->getPhdrFlags()))->add(sec);
+      continue;
+    }
+
     // Segments are contiguous memory regions that has the same attributes
     // (e.g. executable or writable). There is one phdr for each segment.
     // Therefore, we need to create a new phdr when the next section has
@@ -1925,222 +2120,187 @@ template <class ELFT> std::vector<PhdrEntry *> Writer<ELFT>::createPhdrs() {
     // region using AT or AT> linker script command, respectively. At the same
     // time, we don't want to create a separate load segment for the headers,
     // even if the first output section has an AT or AT> attribute.
-    uint64_t NewFlags = computeFlags(Sec->getPhdrFlags());
-    if (((Sec->LMAExpr ||
-          (Sec->LMARegion && (Sec->LMARegion != Load->FirstSec->LMARegion))) &&
-         Load->LastSec != Out::ProgramHeaders) ||
-        Sec->MemRegion != Load->FirstSec->MemRegion || Flags != NewFlags) {
-
-      Load = AddHdr(PT_LOAD, NewFlags);
-      Flags = NewFlags;
+    uint64_t newFlags = computeFlags(sec->getPhdrFlags());
+    if (!load ||
+        ((sec->lmaExpr ||
+          (sec->lmaRegion && (sec->lmaRegion != load->firstSec->lmaRegion))) &&
+         load->lastSec != Out::programHeaders) ||
+        sec->memRegion != load->firstSec->memRegion || flags != newFlags ||
+        sec == relroEnd) {
+      load = addHdr(PT_LOAD, newFlags);
+      flags = newFlags;
     }
 
-    Load->add(Sec);
+    load->add(sec);
   }
 
   // Add a TLS segment if any.
-  PhdrEntry *TlsHdr = make<PhdrEntry>(PT_TLS, PF_R);
-  for (OutputSection *Sec : OutputSections)
-    if (Sec->Flags & SHF_TLS)
-      TlsHdr->add(Sec);
-  if (TlsHdr->FirstSec)
-    Ret.push_back(TlsHdr);
+  PhdrEntry *tlsHdr = make<PhdrEntry>(PT_TLS, PF_R);
+  for (OutputSection *sec : outputSections)
+    if (sec->partition == partNo && sec->flags & SHF_TLS)
+      tlsHdr->add(sec);
+  if (tlsHdr->firstSec)
+    ret.push_back(tlsHdr);
 
   // Add an entry for .dynamic.
-  if (OutputSection *Sec = In.Dynamic->getParent())
-    AddHdr(PT_DYNAMIC, Sec->getPhdrFlags())->add(Sec);
+  if (OutputSection *sec = part.dynamic->getParent())
+    addHdr(PT_DYNAMIC, sec->getPhdrFlags())->add(sec);
 
-  // PT_GNU_RELRO includes all sections that should be marked as
-  // read-only by dynamic linker after proccessing relocations.
-  // Current dynamic loaders only support one PT_GNU_RELRO PHDR, give
-  // an error message if more than one PT_GNU_RELRO PHDR is required.
-  PhdrEntry *RelRo = make<PhdrEntry>(PT_GNU_RELRO, PF_R);
-  bool InRelroPhdr = false;
-  bool IsRelroFinished = false;
-  for (OutputSection *Sec : OutputSections) {
-    if (!needsPtLoad(Sec))
-      continue;
-    if (isRelroSection(Sec)) {
-      InRelroPhdr = true;
-      if (!IsRelroFinished)
-        RelRo->add(Sec);
-      else
-        error("section: " + Sec->Name + " is not contiguous with other relro" +
-              " sections");
-    } else if (InRelroPhdr) {
-      InRelroPhdr = false;
-      IsRelroFinished = true;
-    }
-  }
-  if (RelRo->FirstSec)
-    Ret.push_back(RelRo);
+  if (relRo->firstSec)
+    ret.push_back(relRo);
 
   // PT_GNU_EH_FRAME is a special section pointing on .eh_frame_hdr.
-  if (!In.EhFrame->empty() && In.EhFrameHdr && In.EhFrame->getParent() &&
-      In.EhFrameHdr->getParent())
-    AddHdr(PT_GNU_EH_FRAME, In.EhFrameHdr->getParent()->getPhdrFlags())
-        ->add(In.EhFrameHdr->getParent());
+  if (part.ehFrame->isNeeded() && part.ehFrameHdr &&
+      part.ehFrame->getParent() && part.ehFrameHdr->getParent())
+    addHdr(PT_GNU_EH_FRAME, part.ehFrameHdr->getParent()->getPhdrFlags())
+        ->add(part.ehFrameHdr->getParent());
 
   // PT_OPENBSD_RANDOMIZE is an OpenBSD-specific feature. That makes
   // the dynamic linker fill the segment with random data.
-  if (OutputSection *Cmd = findSection(".openbsd.randomdata"))
-    AddHdr(PT_OPENBSD_RANDOMIZE, Cmd->getPhdrFlags())->add(Cmd);
+  if (OutputSection *cmd = findSection(".openbsd.randomdata", partNo))
+    addHdr(PT_OPENBSD_RANDOMIZE, cmd->getPhdrFlags())->add(cmd);
 
   // PT_GNU_STACK is a special section to tell the loader to make the
   // pages for the stack non-executable. If you really want an executable
   // stack, you can pass -z execstack, but that's not recommended for
   // security reasons.
-  unsigned Perm = PF_R | PF_W;
-  if (Config->ZExecstack)
-    Perm |= PF_X;
-  AddHdr(PT_GNU_STACK, Perm)->p_memsz = Config->ZStackSize;
+  unsigned perm = PF_R | PF_W;
+  if (config->zExecstack)
+    perm |= PF_X;
+  addHdr(PT_GNU_STACK, perm)->p_memsz = config->zStackSize;
 
   // PT_OPENBSD_WXNEEDED is a OpenBSD-specific header to mark the executable
   // is expected to perform W^X violations, such as calling mprotect(2) or
   // mmap(2) with PROT_WRITE | PROT_EXEC, which is prohibited by default on
   // OpenBSD.
-  if (Config->ZWxneeded)
-    AddHdr(PT_OPENBSD_WXNEEDED, PF_X);
+  if (config->zWxneeded)
+    addHdr(PT_OPENBSD_WXNEEDED, PF_X);
 
-  // Create one PT_NOTE per a group of contiguous .note sections.
-  PhdrEntry *Note = nullptr;
-  for (OutputSection *Sec : OutputSections) {
-    if (Sec->Type == SHT_NOTE && (Sec->Flags & SHF_ALLOC)) {
-      if (!Note || Sec->LMAExpr)
-        Note = AddHdr(PT_NOTE, PF_R);
-      Note->add(Sec);
+  // Create one PT_NOTE per a group of contiguous SHT_NOTE sections with the
+  // same alignment.
+  PhdrEntry *note = nullptr;
+  for (OutputSection *sec : outputSections) {
+    if (sec->partition != partNo)
+      continue;
+    if (sec->type == SHT_NOTE && (sec->flags & SHF_ALLOC)) {
+      if (!note || sec->lmaExpr || note->lastSec->alignment != sec->alignment)
+        note = addHdr(PT_NOTE, PF_R);
+      note->add(sec);
     } else {
-      Note = nullptr;
+      note = nullptr;
     }
   }
-  return Ret;
+  return ret;
 }
 
 template <class ELFT>
-void Writer<ELFT>::addPtArmExid(std::vector<PhdrEntry *> &Phdrs) {
-  if (Config->EMachine != EM_ARM)
-    return;
-  auto I = llvm::find_if(OutputSections, [](OutputSection *Cmd) {
-    return Cmd->Type == SHT_ARM_EXIDX;
+void Writer<ELFT>::addPhdrForSection(Partition &part, unsigned shType,
+                                     unsigned pType, unsigned pFlags) {
+  unsigned partNo = part.getNumber();
+  auto i = llvm::find_if(outputSections, [=](OutputSection *cmd) {
+    return cmd->partition == partNo && cmd->type == shType;
   });
-  if (I == OutputSections.end())
+  if (i == outputSections.end())
     return;
 
-  // PT_ARM_EXIDX is the ARM EHABI equivalent of PT_GNU_EH_FRAME
-  PhdrEntry *ARMExidx = make<PhdrEntry>(PT_ARM_EXIDX, PF_R);
-  ARMExidx->add(*I);
-  Phdrs.push_back(ARMExidx);
+  PhdrEntry *entry = make<PhdrEntry>(pType, pFlags);
+  entry->add(*i);
+  part.phdrs.push_back(entry);
 }
 
 // The first section of each PT_LOAD, the first section in PT_GNU_RELRO and the
 // first section after PT_GNU_RELRO have to be page aligned so that the dynamic
 // linker can set the permissions.
 template <class ELFT> void Writer<ELFT>::fixSectionAlignments() {
-  auto PageAlign = [](OutputSection *Cmd) {
-    if (Cmd && !Cmd->AddrExpr)
-      Cmd->AddrExpr = [=] {
-        return alignTo(Script->getDot(), Config->MaxPageSize);
+  auto pageAlign = [](OutputSection *cmd) {
+    if (cmd && !cmd->addrExpr)
+      cmd->addrExpr = [=] {
+        return alignTo(script->getDot(), config->maxPageSize);
       };
   };
 
-  for (const PhdrEntry *P : Phdrs)
-    if (P->p_type == PT_LOAD && P->FirstSec)
-      PageAlign(P->FirstSec);
-
-  for (const PhdrEntry *P : Phdrs) {
-    if (P->p_type != PT_GNU_RELRO)
-      continue;
-
-    if (P->FirstSec)
-      PageAlign(P->FirstSec);
-
-    // Find the first section after PT_GNU_RELRO. If it is in a PT_LOAD we
-    // have to align it to a page.
-    auto End = OutputSections.end();
-    auto I = std::find(OutputSections.begin(), End, P->LastSec);
-    if (I == End || (I + 1) == End)
-      continue;
-
-    OutputSection *Cmd = (*(I + 1));
-    if (needsPtLoad(Cmd))
-      PageAlign(Cmd);
+  for (Partition &part : partitions) {
+    for (const PhdrEntry *p : part.phdrs)
+      if (p->p_type == PT_LOAD && p->firstSec)
+        pageAlign(p->firstSec);
   }
 }
 
 // Compute an in-file position for a given section. The file offset must be the
 // same with its virtual address modulo the page size, so that the loader can
 // load executables without any address adjustment.
-static uint64_t computeFileOffset(OutputSection *OS, uint64_t Off) {
+static uint64_t computeFileOffset(OutputSection *os, uint64_t off) {
   // File offsets are not significant for .bss sections. By convention, we keep
   // section offsets monotonically increasing rather than setting to zero.
-  if (OS->Type == SHT_NOBITS)
-    return Off;
+  if (os->type == SHT_NOBITS)
+    return off;
 
   // If the section is not in a PT_LOAD, we just have to align it.
-  if (!OS->PtLoad)
-    return alignTo(Off, OS->Alignment);
+  if (!os->ptLoad)
+    return alignTo(off, os->alignment);
 
   // The first section in a PT_LOAD has to have congruent offset and address
   // module the page size.
-  OutputSection *First = OS->PtLoad->FirstSec;
-  if (OS == First) {
-    uint64_t Alignment = std::max<uint64_t>(OS->Alignment, Config->MaxPageSize);
-    return alignTo(Off, Alignment, OS->Addr);
+  OutputSection *first = os->ptLoad->firstSec;
+  if (os == first) {
+    uint64_t alignment = std::max<uint64_t>(os->alignment, config->maxPageSize);
+    return alignTo(off, alignment, os->addr);
   }
 
   // If two sections share the same PT_LOAD the file offset is calculated
   // using this formula: Off2 = Off1 + (VA2 - VA1).
-  return First->Offset + OS->Addr - First->Addr;
+  return first->offset + os->addr - first->addr;
 }
 
 // Set an in-file position to a given section and returns the end position of
 // the section.
-static uint64_t setFileOffset(OutputSection *OS, uint64_t Off) {
-  Off = computeFileOffset(OS, Off);
-  OS->Offset = Off;
+static uint64_t setFileOffset(OutputSection *os, uint64_t off) {
+  off = computeFileOffset(os, off);
+  os->offset = off;
 
-  if (OS->Type == SHT_NOBITS)
-    return Off;
-  return Off + OS->Size;
+  if (os->type == SHT_NOBITS)
+    return off;
+  return off + os->size;
 }
 
 template <class ELFT> void Writer<ELFT>::assignFileOffsetsBinary() {
-  uint64_t Off = 0;
-  for (OutputSection *Sec : OutputSections)
-    if (Sec->Flags & SHF_ALLOC)
-      Off = setFileOffset(Sec, Off);
-  FileSize = alignTo(Off, Config->Wordsize);
+  uint64_t off = 0;
+  for (OutputSection *sec : outputSections)
+    if (sec->flags & SHF_ALLOC)
+      off = setFileOffset(sec, off);
+  fileSize = alignTo(off, config->wordsize);
 }
 
-static std::string rangeToString(uint64_t Addr, uint64_t Len) {
-  return "[0x" + utohexstr(Addr) + ", 0x" + utohexstr(Addr + Len - 1) + "]";
+static std::string rangeToString(uint64_t addr, uint64_t len) {
+  return "[0x" + utohexstr(addr) + ", 0x" + utohexstr(addr + len - 1) + "]";
 }
 
 // Assign file offsets to output sections.
 template <class ELFT> void Writer<ELFT>::assignFileOffsets() {
-  uint64_t Off = 0;
-  Off = setFileOffset(Out::ElfHeader, Off);
-  Off = setFileOffset(Out::ProgramHeaders, Off);
+  uint64_t off = 0;
+  off = setFileOffset(Out::elfHeader, off);
+  off = setFileOffset(Out::programHeaders, off);
 
-  PhdrEntry *LastRX = nullptr;
-  for (PhdrEntry *P : Phdrs)
-    if (P->p_type == PT_LOAD && (P->p_flags & PF_X))
-      LastRX = P;
+  PhdrEntry *lastRX = nullptr;
+  for (Partition &part : partitions)
+    for (PhdrEntry *p : part.phdrs)
+      if (p->p_type == PT_LOAD && (p->p_flags & PF_X))
+        lastRX = p;
 
-  for (OutputSection *Sec : OutputSections) {
-    Off = setFileOffset(Sec, Off);
-    if (Script->HasSectionsCommand)
+  for (OutputSection *sec : outputSections) {
+    off = setFileOffset(sec, off);
+    if (script->hasSectionsCommand)
       continue;
 
     // If this is a last section of the last executable segment and that
     // segment is the last loadable segment, align the offset of the
     // following section to avoid loading non-segments parts of the file.
-    if (LastRX && LastRX->LastSec == Sec)
-      Off = alignTo(Off, Target->PageSize);
+    if (lastRX && lastRX->lastSec == sec)
+      off = alignTo(off, config->commonPageSize);
   }
 
-  SectionHeaderOff = alignTo(Off, Config->Wordsize);
-  FileSize = SectionHeaderOff + (OutputSections.size() + 1) * sizeof(Elf_Shdr);
+  sectionHeaderOff = alignTo(off, config->wordsize);
+  fileSize = sectionHeaderOff + (outputSections.size() + 1) * sizeof(Elf_Shdr);
 
   // Our logic assumes that sections have rising VA within the same segment.
   // With use of linker scripts it is possible to violate this rule and get file
@@ -2151,62 +2311,49 @@ template <class ELFT> void Writer<ELFT>::assignFileOffsets() {
   // backwards, so we have to allow doing that to support linking them. We
   // perform non-critical checks for overlaps in checkSectionOverlap(), but here
   // we want to prevent file size overflows because it would crash the linker.
-  for (OutputSection *Sec : OutputSections) {
-    if (Sec->Type == SHT_NOBITS)
+  for (OutputSection *sec : outputSections) {
+    if (sec->type == SHT_NOBITS)
       continue;
-    if ((Sec->Offset > FileSize) || (Sec->Offset + Sec->Size > FileSize))
-      error("unable to place section " + Sec->Name + " at file offset " +
-            rangeToString(Sec->Offset, Sec->Size) +
+    if ((sec->offset > fileSize) || (sec->offset + sec->size > fileSize))
+      error("unable to place section " + sec->name + " at file offset " +
+            rangeToString(sec->offset, sec->size) +
             "; check your linker script for overflows");
   }
 }
 
 // Finalize the program headers. We call this function after we assign
 // file offsets and VAs to all sections.
-template <class ELFT> void Writer<ELFT>::setPhdrs() {
-  for (PhdrEntry *P : Phdrs) {
-    OutputSection *First = P->FirstSec;
-    OutputSection *Last = P->LastSec;
+template <class ELFT> void Writer<ELFT>::setPhdrs(Partition &part) {
+  for (PhdrEntry *p : part.phdrs) {
+    OutputSection *first = p->firstSec;
+    OutputSection *last = p->lastSec;
 
-    if (First) {
-      P->p_filesz = Last->Offset - First->Offset;
-      if (Last->Type != SHT_NOBITS)
-        P->p_filesz += Last->Size;
+    if (first) {
+      p->p_filesz = last->offset - first->offset;
+      if (last->type != SHT_NOBITS)
+        p->p_filesz += last->size;
 
-      P->p_memsz = Last->Addr + Last->Size - First->Addr;
-      P->p_offset = First->Offset;
-      P->p_vaddr = First->Addr;
+      p->p_memsz = last->addr + last->size - first->addr;
+      p->p_offset = first->offset;
+      p->p_vaddr = first->addr;
 
-      if (!P->HasLMA)
-        P->p_paddr = First->getLMA();
+      // File offsets in partitions other than the main partition are relative
+      // to the offset of the ELF headers. Perform that adjustment now.
+      if (part.elfHeader)
+        p->p_offset -= part.elfHeader->getParent()->offset;
+
+      if (!p->hasLMA)
+        p->p_paddr = first->getLMA();
     }
 
-    if (P->p_type == PT_LOAD) {
-      P->p_align = std::max<uint64_t>(P->p_align, Config->MaxPageSize);
-    } else if (P->p_type == PT_GNU_RELRO) {
-      P->p_align = 1;
+    if (p->p_type == PT_LOAD) {
+      p->p_align = std::max<uint64_t>(p->p_align, config->maxPageSize);
+    } else if (p->p_type == PT_GNU_RELRO) {
+      p->p_align = 1;
       // The glibc dynamic loader rounds the size down, so we need to round up
       // to protect the last page. This is a no-op on FreeBSD which always
       // rounds up.
-      P->p_memsz = alignTo(P->p_memsz, Target->PageSize);
-    }
-
-    if (P->p_type == PT_TLS && P->p_memsz) {
-      if (!Config->Shared &&
-          (Config->EMachine == EM_ARM || Config->EMachine == EM_AARCH64)) {
-        // On ARM/AArch64, reserve extra space (8 words) between the thread
-        // pointer and an executable's TLS segment by overaligning the segment.
-        // This reservation is needed for backwards compatibility with Android's
-        // TCB, which allocates several slots after the thread pointer (e.g.
-        // TLS_SLOT_STACK_GUARD==5). For simplicity, this overalignment is also
-        // done on other operating systems.
-        P->p_align = std::max<uint64_t>(P->p_align, Config->Wordsize * 8);
-      }
-
-      // The TLS pointer goes after PT_TLS for variant 2 targets. At least glibc
-      // will align it, so round up the size to make sure the offsets are
-      // correct.
-      P->p_memsz = alignTo(P->p_memsz, P->p_align);
+      p->p_memsz = alignTo(p->p_memsz, config->commonPageSize);
     }
   }
 }
@@ -2214,37 +2361,37 @@ template <class ELFT> void Writer<ELFT>::setPhdrs() {
 // A helper struct for checkSectionOverlap.
 namespace {
 struct SectionOffset {
-  OutputSection *Sec;
-  uint64_t Offset;
+  OutputSection *sec;
+  uint64_t offset;
 };
 } // namespace
 
 // Check whether sections overlap for a specific address range (file offsets,
 // load and virtual adresses).
-static void checkOverlap(StringRef Name, std::vector<SectionOffset> &Sections,
-                         bool IsVirtualAddr) {
-  llvm::sort(Sections, [=](const SectionOffset &A, const SectionOffset &B) {
-    return A.Offset < B.Offset;
+static void checkOverlap(StringRef name, std::vector<SectionOffset> &sections,
+                         bool isVirtualAddr) {
+  llvm::sort(sections, [=](const SectionOffset &a, const SectionOffset &b) {
+    return a.offset < b.offset;
   });
 
   // Finding overlap is easy given a vector is sorted by start position.
   // If an element starts before the end of the previous element, they overlap.
-  for (size_t I = 1, End = Sections.size(); I < End; ++I) {
-    SectionOffset A = Sections[I - 1];
-    SectionOffset B = Sections[I];
-    if (B.Offset >= A.Offset + A.Sec->Size)
+  for (size_t i = 1, end = sections.size(); i < end; ++i) {
+    SectionOffset a = sections[i - 1];
+    SectionOffset b = sections[i];
+    if (b.offset >= a.offset + a.sec->size)
       continue;
 
     // If both sections are in OVERLAY we allow the overlapping of virtual
     // addresses, because it is what OVERLAY was designed for.
-    if (IsVirtualAddr && A.Sec->InOverlay && B.Sec->InOverlay)
+    if (isVirtualAddr && a.sec->inOverlay && b.sec->inOverlay)
       continue;
 
-    errorOrWarn("section " + A.Sec->Name + " " + Name +
-                " range overlaps with " + B.Sec->Name + "\n>>> " + A.Sec->Name +
-                " range is " + rangeToString(A.Offset, A.Sec->Size) + "\n>>> " +
-                B.Sec->Name + " range is " +
-                rangeToString(B.Offset, B.Sec->Size));
+    errorOrWarn("section " + a.sec->name + " " + name +
+                " range overlaps with " + b.sec->name + "\n>>> " + a.sec->name +
+                " range is " + rangeToString(a.offset, a.sec->size) + "\n>>> " +
+                b.sec->name + " range is " +
+                rangeToString(b.offset, b.sec->size));
   }
 }
 
@@ -2255,11 +2402,11 @@ static void checkOverlap(StringRef Name, std::vector<SectionOffset> &Sections,
 // ranges and the virtual address ranges don't overlap
 template <class ELFT> void Writer<ELFT>::checkSections() {
   // First, check that section's VAs fit in available address space for target.
-  for (OutputSection *OS : OutputSections)
-    if ((OS->Addr + OS->Size < OS->Addr) ||
-        (!ELFT::Is64Bits && OS->Addr + OS->Size > UINT32_MAX))
-      errorOrWarn("section " + OS->Name + " at 0x" + utohexstr(OS->Addr) +
-                  " of size 0x" + utohexstr(OS->Size) +
+  for (OutputSection *os : outputSections)
+    if ((os->addr + os->size < os->addr) ||
+        (!ELFT::Is64Bits && os->addr + os->size > UINT32_MAX))
+      errorOrWarn("section " + os->name + " at 0x" + utohexstr(os->addr) +
+                  " of size 0x" + utohexstr(os->size) +
                   " exceeds available address space");
 
   // Check for overlapping file offsets. In this case we need to skip any
@@ -2267,17 +2414,17 @@ template <class ELFT> void Writer<ELFT>::checkSections() {
   // the file so Sec->Offset + Sec->Size can overlap with others. If --oformat
   // binary is specified only add SHF_ALLOC sections are added to the output
   // file so we skip any non-allocated sections in that case.
-  std::vector<SectionOffset> FileOffs;
-  for (OutputSection *Sec : OutputSections)
-    if (Sec->Size > 0 && Sec->Type != SHT_NOBITS &&
-        (!Config->OFormatBinary || (Sec->Flags & SHF_ALLOC)))
-      FileOffs.push_back({Sec, Sec->Offset});
-  checkOverlap("file", FileOffs, false);
+  std::vector<SectionOffset> fileOffs;
+  for (OutputSection *sec : outputSections)
+    if (sec->size > 0 && sec->type != SHT_NOBITS &&
+        (!config->oFormatBinary || (sec->flags & SHF_ALLOC)))
+      fileOffs.push_back({sec, sec->offset});
+  checkOverlap("file", fileOffs, false);
 
   // When linking with -r there is no need to check for overlapping virtual/load
   // addresses since those addresses will only be assigned when the final
   // executable/shared object is created.
-  if (Config->Relocatable)
+  if (config->relocatable)
     return;
 
   // Checking for overlapping virtual and load addresses only needs to take
@@ -2285,20 +2432,20 @@ template <class ELFT> void Writer<ELFT>::checkSections() {
   // Furthermore, we also need to skip SHF_TLS sections since these will be
   // mapped to other addresses at runtime and can therefore have overlapping
   // ranges in the file.
-  std::vector<SectionOffset> VMAs;
-  for (OutputSection *Sec : OutputSections)
-    if (Sec->Size > 0 && (Sec->Flags & SHF_ALLOC) && !(Sec->Flags & SHF_TLS))
-      VMAs.push_back({Sec, Sec->Addr});
-  checkOverlap("virtual address", VMAs, true);
+  std::vector<SectionOffset> vmas;
+  for (OutputSection *sec : outputSections)
+    if (sec->size > 0 && (sec->flags & SHF_ALLOC) && !(sec->flags & SHF_TLS))
+      vmas.push_back({sec, sec->addr});
+  checkOverlap("virtual address", vmas, true);
 
   // Finally, check that the load addresses don't overlap. This will usually be
   // the same as the virtual addresses but can be different when using a linker
   // script with AT().
-  std::vector<SectionOffset> LMAs;
-  for (OutputSection *Sec : OutputSections)
-    if (Sec->Size > 0 && (Sec->Flags & SHF_ALLOC) && !(Sec->Flags & SHF_TLS))
-      LMAs.push_back({Sec, Sec->getLMA()});
-  checkOverlap("load address", LMAs, false);
+  std::vector<SectionOffset> lmas;
+  for (OutputSection *sec : outputSections)
+    if (sec->size > 0 && (sec->flags & SHF_ALLOC) && !(sec->flags & SHF_TLS))
+      lmas.push_back({sec, sec->getLMA()});
+  checkOverlap("load address", lmas, false);
 }
 
 // The entry point address is chosen in the following ways.
@@ -2311,89 +2458,45 @@ template <class ELFT> void Writer<ELFT>::checkSections() {
 // 6. the address 0.
 static uint64_t getEntryAddr() {
   // Case 1, 2 or 3
-  if (Symbol *B = Symtab->find(Config->Entry))
-    return B->getVA();
+  if (Symbol *b = symtab->find(config->entry))
+    return b->getVA();
 
   // Case 4
-  uint64_t Addr;
-  if (to_integer(Config->Entry, Addr))
-    return Addr;
+  uint64_t addr;
+  if (to_integer(config->entry, addr))
+    return addr;
 
   // Case 5
-  if (OutputSection *Sec = findSection(".text")) {
-    if (Config->WarnMissingEntry)
-      warn("cannot find entry symbol " + Config->Entry + "; defaulting to 0x" +
-           utohexstr(Sec->Addr));
-    return Sec->Addr;
+  if (OutputSection *sec = findSection(".text")) {
+    if (config->warnMissingEntry)
+      warn("cannot find entry symbol " + config->entry + "; defaulting to 0x" +
+           utohexstr(sec->addr));
+    return sec->addr;
   }
 
   // Case 6
-  if (Config->WarnMissingEntry)
-    warn("cannot find entry symbol " + Config->Entry +
+  if (config->warnMissingEntry)
+    warn("cannot find entry symbol " + config->entry +
          "; not setting start address");
   return 0;
 }
 
 static uint16_t getELFType() {
-  if (Config->Pic)
+  if (config->isPic)
     return ET_DYN;
-  if (Config->Relocatable)
+  if (config->relocatable)
     return ET_REL;
   return ET_EXEC;
 }
 
-static uint8_t getAbiVersion() {
-  // MIPS non-PIC executable gets ABI version 1.
-  if (Config->EMachine == EM_MIPS && getELFType() == ET_EXEC &&
-      (Config->EFlags & (EF_MIPS_PIC | EF_MIPS_CPIC)) == EF_MIPS_CPIC)
-    return 1;
-  return 0;
-}
-
 template <class ELFT> void Writer<ELFT>::writeHeader() {
-  uint8_t *Buf = Buffer->getBufferStart();
+  writeEhdr<ELFT>(Out::bufferStart, *mainPart);
+  writePhdrs<ELFT>(Out::bufferStart + sizeof(Elf_Ehdr), *mainPart);
 
-  // For executable segments, the trap instructions are written before writing
-  // the header. Setting Elf header bytes to zero ensures that any unused bytes
-  // in header are zero-cleared, instead of having trap instructions.
-  memset(Buf, 0, sizeof(Elf_Ehdr));
-  memcpy(Buf, "\177ELF", 4);
-
-  // Write the ELF header.
-  auto *EHdr = reinterpret_cast<Elf_Ehdr *>(Buf);
-  EHdr->e_ident[EI_CLASS] = Config->Is64 ? ELFCLASS64 : ELFCLASS32;
-  EHdr->e_ident[EI_DATA] = Config->IsLE ? ELFDATA2LSB : ELFDATA2MSB;
-  EHdr->e_ident[EI_VERSION] = EV_CURRENT;
-  EHdr->e_ident[EI_OSABI] = Config->OSABI;
-  EHdr->e_ident[EI_ABIVERSION] = getAbiVersion();
-  EHdr->e_type = getELFType();
-  EHdr->e_machine = Config->EMachine;
-  EHdr->e_version = EV_CURRENT;
-  EHdr->e_entry = getEntryAddr();
-  EHdr->e_shoff = SectionHeaderOff;
-  EHdr->e_flags = Config->EFlags;
-  EHdr->e_ehsize = sizeof(Elf_Ehdr);
-  EHdr->e_phnum = Phdrs.size();
-  EHdr->e_shentsize = sizeof(Elf_Shdr);
-
-  if (!Config->Relocatable) {
-    EHdr->e_phoff = sizeof(Elf_Ehdr);
-    EHdr->e_phentsize = sizeof(Elf_Phdr);
-  }
-
-  // Write the program header table.
-  auto *HBuf = reinterpret_cast<Elf_Phdr *>(Buf + EHdr->e_phoff);
-  for (PhdrEntry *P : Phdrs) {
-    HBuf->p_type = P->p_type;
-    HBuf->p_flags = P->p_flags;
-    HBuf->p_offset = P->p_offset;
-    HBuf->p_vaddr = P->p_vaddr;
-    HBuf->p_paddr = P->p_paddr;
-    HBuf->p_filesz = P->p_filesz;
-    HBuf->p_memsz = P->p_memsz;
-    HBuf->p_align = P->p_align;
-    ++HBuf;
-  }
+  auto *eHdr = reinterpret_cast<Elf_Ehdr *>(Out::bufferStart);
+  eHdr->e_type = getELFType();
+  eHdr->e_entry = getEntryAddr();
+  eHdr->e_shoff = sectionHeaderOff;
 
   // Write the section header table.
   //
@@ -2404,57 +2507,58 @@ template <class ELFT> void Writer<ELFT>::writeHeader() {
   // the value. The sentinel values and fields are:
   // e_shnum = 0, SHdrs[0].sh_size = number of sections.
   // e_shstrndx = SHN_XINDEX, SHdrs[0].sh_link = .shstrtab section index.
-  auto *SHdrs = reinterpret_cast<Elf_Shdr *>(Buf + EHdr->e_shoff);
-  size_t Num = OutputSections.size() + 1;
-  if (Num >= SHN_LORESERVE)
-    SHdrs->sh_size = Num;
+  auto *sHdrs = reinterpret_cast<Elf_Shdr *>(Out::bufferStart + eHdr->e_shoff);
+  size_t num = outputSections.size() + 1;
+  if (num >= SHN_LORESERVE)
+    sHdrs->sh_size = num;
   else
-    EHdr->e_shnum = Num;
+    eHdr->e_shnum = num;
 
-  uint32_t StrTabIndex = In.ShStrTab->getParent()->SectionIndex;
-  if (StrTabIndex >= SHN_LORESERVE) {
-    SHdrs->sh_link = StrTabIndex;
-    EHdr->e_shstrndx = SHN_XINDEX;
+  uint32_t strTabIndex = in.shStrTab->getParent()->sectionIndex;
+  if (strTabIndex >= SHN_LORESERVE) {
+    sHdrs->sh_link = strTabIndex;
+    eHdr->e_shstrndx = SHN_XINDEX;
   } else {
-    EHdr->e_shstrndx = StrTabIndex;
+    eHdr->e_shstrndx = strTabIndex;
   }
 
-  for (OutputSection *Sec : OutputSections)
-    Sec->writeHeaderTo<ELFT>(++SHdrs);
+  for (OutputSection *sec : outputSections)
+    sec->writeHeaderTo<ELFT>(++sHdrs);
 }
 
 // Open a result file.
 template <class ELFT> void Writer<ELFT>::openFile() {
-  uint64_t MaxSize = Config->Is64 ? INT64_MAX : UINT32_MAX;
-  if (MaxSize < FileSize) {
-    error("output file too large: " + Twine(FileSize) + " bytes");
+  uint64_t maxSize = config->is64 ? INT64_MAX : UINT32_MAX;
+  if (fileSize != size_t(fileSize) || maxSize < fileSize) {
+    error("output file too large: " + Twine(fileSize) + " bytes");
     return;
   }
 
-  unlinkAsync(Config->OutputFile);
-  unsigned Flags = 0;
-  if (!Config->Relocatable)
-    Flags = FileOutputBuffer::F_executable;
-  Expected<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
-      FileOutputBuffer::create(Config->OutputFile, FileSize, Flags);
+  unlinkAsync(config->outputFile);
+  unsigned flags = 0;
+  if (!config->relocatable)
+    flags = FileOutputBuffer::F_executable;
+  Expected<std::unique_ptr<FileOutputBuffer>> bufferOrErr =
+      FileOutputBuffer::create(config->outputFile, fileSize, flags);
 
-  if (!BufferOrErr)
-    error("failed to open " + Config->OutputFile + ": " +
-          llvm::toString(BufferOrErr.takeError()));
-  else
-    Buffer = std::move(*BufferOrErr);
+  if (!bufferOrErr) {
+    error("failed to open " + config->outputFile + ": " +
+          llvm::toString(bufferOrErr.takeError()));
+    return;
+  }
+  buffer = std::move(*bufferOrErr);
+  Out::bufferStart = buffer->getBufferStart();
 }
 
 template <class ELFT> void Writer<ELFT>::writeSectionsBinary() {
-  uint8_t *Buf = Buffer->getBufferStart();
-  for (OutputSection *Sec : OutputSections)
-    if (Sec->Flags & SHF_ALLOC)
-      Sec->writeTo<ELFT>(Buf + Sec->Offset);
+  for (OutputSection *sec : outputSections)
+    if (sec->flags & SHF_ALLOC)
+      sec->writeTo<ELFT>(Out::bufferStart + sec->offset);
 }
 
-static void fillTrap(uint8_t *I, uint8_t *End) {
-  for (; I + 4 <= End; I += 4)
-    memcpy(I, &Target->TrapInstr, 4);
+static void fillTrap(uint8_t *i, uint8_t *end) {
+  for (; i + 4 <= end; i += 4)
+    memcpy(i, &target->trapInstr, 4);
 }
 
 // Fill the last page of executable segments with trap instructions
@@ -2464,61 +2568,119 @@ static void fillTrap(uint8_t *I, uint8_t *End) {
 // We'll leave other pages in segments as-is because the rest will be
 // overwritten by output sections.
 template <class ELFT> void Writer<ELFT>::writeTrapInstr() {
-  if (Script->HasSectionsCommand)
+  if (script->hasSectionsCommand)
     return;
 
-  // Fill the last page.
-  uint8_t *Buf = Buffer->getBufferStart();
-  for (PhdrEntry *P : Phdrs)
-    if (P->p_type == PT_LOAD && (P->p_flags & PF_X))
-      fillTrap(Buf + alignDown(P->p_offset + P->p_filesz, Target->PageSize),
-               Buf + alignTo(P->p_offset + P->p_filesz, Target->PageSize));
+  for (Partition &part : partitions) {
+    // Fill the last page.
+    for (PhdrEntry *p : part.phdrs)
+      if (p->p_type == PT_LOAD && (p->p_flags & PF_X))
+        fillTrap(Out::bufferStart + alignDown(p->firstSec->offset + p->p_filesz,
+                                              config->commonPageSize),
+                 Out::bufferStart + alignTo(p->firstSec->offset + p->p_filesz,
+                                            config->commonPageSize));
 
-  // Round up the file size of the last segment to the page boundary iff it is
-  // an executable segment to ensure that other tools don't accidentally
-  // trim the instruction padding (e.g. when stripping the file).
-  PhdrEntry *Last = nullptr;
-  for (PhdrEntry *P : Phdrs)
-    if (P->p_type == PT_LOAD)
-      Last = P;
+    // Round up the file size of the last segment to the page boundary iff it is
+    // an executable segment to ensure that other tools don't accidentally
+    // trim the instruction padding (e.g. when stripping the file).
+    PhdrEntry *last = nullptr;
+    for (PhdrEntry *p : part.phdrs)
+      if (p->p_type == PT_LOAD)
+        last = p;
 
-  if (Last && (Last->p_flags & PF_X))
-    Last->p_memsz = Last->p_filesz = alignTo(Last->p_filesz, Target->PageSize);
+    if (last && (last->p_flags & PF_X))
+      last->p_memsz = last->p_filesz =
+          alignTo(last->p_filesz, config->commonPageSize);
+  }
 }
 
 // Write section contents to a mmap'ed file.
 template <class ELFT> void Writer<ELFT>::writeSections() {
-  uint8_t *Buf = Buffer->getBufferStart();
-
-  OutputSection *EhFrameHdr = nullptr;
-  if (In.EhFrameHdr && !In.EhFrameHdr->empty())
-    EhFrameHdr = In.EhFrameHdr->getParent();
-
   // In -r or -emit-relocs mode, write the relocation sections first as in
   // ELf_Rel targets we might find out that we need to modify the relocated
   // section while doing it.
-  for (OutputSection *Sec : OutputSections)
-    if (Sec->Type == SHT_REL || Sec->Type == SHT_RELA)
-      Sec->writeTo<ELFT>(Buf + Sec->Offset);
-
-  for (OutputSection *Sec : OutputSections)
-    if (Sec != EhFrameHdr && Sec->Type != SHT_REL && Sec->Type != SHT_RELA)
-      Sec->writeTo<ELFT>(Buf + Sec->Offset);
-
-  // The .eh_frame_hdr depends on .eh_frame section contents, therefore
-  // it should be written after .eh_frame is written.
-  if (EhFrameHdr)
-    EhFrameHdr->writeTo<ELFT>(Buf + EhFrameHdr->Offset);
+  for (OutputSection *sec : outputSections)
+    if (sec->type == SHT_REL || sec->type == SHT_RELA)
+      sec->writeTo<ELFT>(Out::bufferStart + sec->offset);
+
+  for (OutputSection *sec : outputSections)
+    if (sec->type != SHT_REL && sec->type != SHT_RELA)
+      sec->writeTo<ELFT>(Out::bufferStart + sec->offset);
+}
+
+// Split one uint8 array into small pieces of uint8 arrays.
+static std::vector<ArrayRef<uint8_t>> split(ArrayRef<uint8_t> arr,
+                                            size_t chunkSize) {
+  std::vector<ArrayRef<uint8_t>> ret;
+  while (arr.size() > chunkSize) {
+    ret.push_back(arr.take_front(chunkSize));
+    arr = arr.drop_front(chunkSize);
+  }
+  if (!arr.empty())
+    ret.push_back(arr);
+  return ret;
+}
+
+// Computes a hash value of Data using a given hash function.
+// In order to utilize multiple cores, we first split data into 1MB
+// chunks, compute a hash for each chunk, and then compute a hash value
+// of the hash values.
+static void
+computeHash(llvm::MutableArrayRef<uint8_t> hashBuf,
+            llvm::ArrayRef<uint8_t> data,
+            std::function<void(uint8_t *dest, ArrayRef<uint8_t> arr)> hashFn) {
+  std::vector<ArrayRef<uint8_t>> chunks = split(data, 1024 * 1024);
+  std::vector<uint8_t> hashes(chunks.size() * hashBuf.size());
+
+  // Compute hash values.
+  parallelForEachN(0, chunks.size(), [&](size_t i) {
+    hashFn(hashes.data() + i * hashBuf.size(), chunks[i]);
+  });
+
+  // Write to the final output buffer.
+  hashFn(hashBuf.data(), hashes);
 }
 
 template <class ELFT> void Writer<ELFT>::writeBuildId() {
-  if (!In.BuildId || !In.BuildId->getParent())
+  if (!mainPart->buildId || !mainPart->buildId->getParent())
     return;
 
+  if (config->buildId == BuildIdKind::Hexstring) {
+    for (Partition &part : partitions)
+      part.buildId->writeBuildId(config->buildIdVector);
+    return;
+  }
+
   // Compute a hash of all sections of the output file.
-  uint8_t *Start = Buffer->getBufferStart();
-  uint8_t *End = Start + FileSize;
-  In.BuildId->writeBuildId({Start, End});
+  size_t hashSize = mainPart->buildId->hashSize;
+  std::vector<uint8_t> buildId(hashSize);
+  llvm::ArrayRef<uint8_t> buf{Out::bufferStart, size_t(fileSize)};
+
+  switch (config->buildId) {
+  case BuildIdKind::Fast:
+    computeHash(buildId, buf, [](uint8_t *dest, ArrayRef<uint8_t> arr) {
+      write64le(dest, xxHash64(arr));
+    });
+    break;
+  case BuildIdKind::Md5:
+    computeHash(buildId, buf, [&](uint8_t *dest, ArrayRef<uint8_t> arr) {
+      memcpy(dest, MD5::hash(arr).data(), hashSize);
+    });
+    break;
+  case BuildIdKind::Sha1:
+    computeHash(buildId, buf, [&](uint8_t *dest, ArrayRef<uint8_t> arr) {
+      memcpy(dest, SHA1::hash(arr).data(), hashSize);
+    });
+    break;
+  case BuildIdKind::Uuid:
+    if (auto ec = llvm::getRandomBytes(buildId.data(), hashSize))
+      error("entropy source failure: " + ec.message());
+    break;
+  default:
+    llvm_unreachable("unknown BuildIdKind");
+  }
+  for (Partition &part : partitions)
+    part.buildId->writeBuildId(buildId);
 }
 
 template void elf::writeResult<ELF32LE>();
diff --git a/deps/lld/ELF/Writer.h b/deps/lld/ELF/Writer.h
index 7806f824c58f9a972c39edb2923d23619228106c..784fba9c75a6d774b9695e45ef6e7a523cc1d153 100644
--- a/deps/lld/ELF/Writer.h
+++ b/deps/lld/ELF/Writer.h
@@ -1,9 +1,8 @@
 //===- Writer.h -------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -20,16 +19,14 @@ namespace elf {
 class InputFile;
 class OutputSection;
 class InputSectionBase;
-template <class ELFT> class ObjFile;
-class SymbolTable;
 template <class ELFT> void writeResult();
 
 // This describes a program header entry.
 // Each contains type, access flags and range of output sections that will be
 // placed in it.
 struct PhdrEntry {
-  PhdrEntry(unsigned Type, unsigned Flags) : p_type(Type), p_flags(Flags) {}
-  void add(OutputSection *Sec);
+  PhdrEntry(unsigned type, unsigned flags) : p_type(type), p_flags(flags) {}
+  void add(OutputSection *sec);
 
   uint64_t p_paddr = 0;
   uint64_t p_vaddr = 0;
@@ -40,22 +37,22 @@ struct PhdrEntry {
   uint32_t p_type = 0;
   uint32_t p_flags = 0;
 
-  OutputSection *FirstSec = nullptr;
-  OutputSection *LastSec = nullptr;
-  bool HasLMA = false;
+  OutputSection *firstSec = nullptr;
+  OutputSection *lastSec = nullptr;
+  bool hasLMA = false;
 
-  uint64_t LMAOffset = 0;
+  uint64_t lmaOffset = 0;
 };
 
 void addReservedSymbols();
-llvm::StringRef getOutputSectionName(const InputSectionBase *S);
+llvm::StringRef getOutputSectionName(const InputSectionBase *s);
 
 template <class ELFT> uint32_t calcMipsEFlags();
 
-uint8_t getMipsFpAbiFlag(uint8_t OldFlag, uint8_t NewFlag,
-                         llvm::StringRef FileName);
+uint8_t getMipsFpAbiFlag(uint8_t oldFlag, uint8_t newFlag,
+                         llvm::StringRef fileName);
 
-bool isMipsN32Abi(const InputFile *F);
+bool isMipsN32Abi(const InputFile *f);
 bool isMicroMips();
 bool isMipsR6();
 } // namespace elf
diff --git a/deps/lld/LICENSE.TXT b/deps/lld/LICENSE.TXT
index 09b8b616c227da95f65e46836bf27fde5614a424..cba22f66a9e0d384b4de547b60b5eb45350be7d6 100644
--- a/deps/lld/LICENSE.TXT
+++ b/deps/lld/LICENSE.TXT
@@ -1,5 +1,240 @@
 ==============================================================================
-lld License
+The LLVM Project is under the Apache License v2.0 with LLVM Exceptions:
+==============================================================================
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+    1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+    2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+    3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+    4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+    5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+    6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+    7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+    8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+    9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+    END OF TERMS AND CONDITIONS
+
+    APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+    Copyright [yyyy] [name of copyright owner]
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+
+---- LLVM Exceptions to the Apache 2.0 License ----
+
+As an exception, if, as a result of your compiling your source code, portions
+of this Software are embedded into an Object form of such source code, you
+may redistribute such embedded portions in such Object form without complying
+with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
+
+In addition, if you combine or link compiled forms of this Software with
+software that is licensed under the GPLv2 ("Combined Software") and if a
+court of competent jurisdiction determines that the patent provision (Section
+3), the indemnity provision (Section 9) or other Section of the License
+conflicts with the conditions of the GPLv2, you may retroactively and
+prospectively choose to deem waived or otherwise exclude such Section(s) of
+the License, but only in their entirety and only with respect to the Combined
+Software.
+
+==============================================================================
+Software from third parties included in the LLVM Project:
+==============================================================================
+The LLVM Project contains third party software which is under different license
+terms. All such code will be identified clearly using at least one of two
+mechanisms:
+1) It will be in a separate directory tree with its own `LICENSE.txt` or
+   `LICENSE` file at the top containing the specific license and restrictions
+   which apply to that software, or
+2) It will contain specific license and restriction terms at the top of every
+   file.
+
+==============================================================================
+Legacy LLVM License (https://llvm.org/docs/DeveloperPolicy.html#legacy):
 ==============================================================================
 University of Illinois/NCSA
 Open Source License
@@ -41,22 +276,3 @@ CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
 SOFTWARE.
-
-==============================================================================
-The lld software contains code written by third parties.  Such software will
-have its own individual LICENSE.TXT file in the directory in which it appears.
-This file will describe the copyrights, license, and restrictions which apply
-to that code.
-
-The disclaimer of warranty in the University of Illinois Open Source License
-applies to all code in the lld Distribution, and nothing in any of the
-other licenses gives permission to use the names of the LLVM Team or the
-University of Illinois to endorse or promote products derived from this
-Software.
-
-The following pieces of software have additional or alternate copyrights,
-licenses, and/or restrictions:
-
-Program             Directory
--------             ---------
-<none yet>
diff --git a/deps/lld/MinGW/Driver.cpp b/deps/lld/MinGW/Driver.cpp
index def769bb912531b25fbc5ef4494c9a72ca082c6a..24e18aacb3c164ca50ebecf46a06cfc4d93de49d 100644
--- a/deps/lld/MinGW/Driver.cpp
+++ b/deps/lld/MinGW/Driver.cpp
@@ -1,9 +1,8 @@
 //===- MinGW/Driver.cpp ---------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -31,10 +30,13 @@
 
 #include "lld/Common/Driver.h"
 #include "lld/Common/ErrorHandler.h"
+#include "lld/Common/Memory.h"
+#include "lld/Common/Version.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/ADT/Triple.h"
 #include "llvm/Option/Arg.h"
 #include "llvm/Option/ArgList.h"
 #include "llvm/Option/Option.h"
@@ -63,7 +65,7 @@ enum {
 #undef PREFIX
 
 // Create table mapping all options defined in Options.td
-static const opt::OptTable::Info InfoTable[] = {
+static const opt::OptTable::Info infoTable[] = {
 #define OPTION(X1, X2, ID, KIND, GROUP, ALIAS, X7, X8, X9, X10, X11, X12)      \
   {X1, X2, X10,         X11,         OPT_##ID, opt::Option::KIND##Class,       \
    X9, X8, OPT_##GROUP, OPT_##ALIAS, X7,       X12},
@@ -74,208 +76,277 @@ static const opt::OptTable::Info InfoTable[] = {
 namespace {
 class MinGWOptTable : public opt::OptTable {
 public:
-  MinGWOptTable() : OptTable(InfoTable, false) {}
-  opt::InputArgList parse(ArrayRef<const char *> Argv);
+  MinGWOptTable() : OptTable(infoTable, false) {}
+  opt::InputArgList parse(ArrayRef<const char *> argv);
 };
 } // namespace
 
-opt::InputArgList MinGWOptTable::parse(ArrayRef<const char *> Argv) {
-  unsigned MissingIndex;
-  unsigned MissingCount;
-
-  SmallVector<const char *, 256> Vec(Argv.data(), Argv.data() + Argv.size());
-  opt::InputArgList Args = this->ParseArgs(Vec, MissingIndex, MissingCount);
-
-  if (MissingCount)
-    fatal(StringRef(Args.getArgString(MissingIndex)) + ": missing argument");
-  for (auto *Arg : Args.filtered(OPT_UNKNOWN))
-    fatal("unknown argument: " + Arg->getSpelling());
-  if (!Args.hasArg(OPT_INPUT) && !Args.hasArg(OPT_l))
-    fatal("no input files");
-  return Args;
+static void printHelp(const char *argv0) {
+  MinGWOptTable().PrintHelp(
+      outs(), (std::string(argv0) + " [options] file...").c_str(), "lld",
+      false /*ShowHidden*/, true /*ShowAllAliases*/);
+  outs() << "\n";
+}
+
+static cl::TokenizerCallback getQuotingStyle() {
+  if (Triple(sys::getProcessTriple()).getOS() == Triple::Win32)
+    return cl::TokenizeWindowsCommandLine;
+  return cl::TokenizeGNUCommandLine;
+}
+
+opt::InputArgList MinGWOptTable::parse(ArrayRef<const char *> argv) {
+  unsigned missingIndex;
+  unsigned missingCount;
+
+  SmallVector<const char *, 256> vec(argv.data(), argv.data() + argv.size());
+  cl::ExpandResponseFiles(saver, getQuotingStyle(), vec);
+  opt::InputArgList args = this->ParseArgs(vec, missingIndex, missingCount);
+
+  if (missingCount)
+    fatal(StringRef(args.getArgString(missingIndex)) + ": missing argument");
+  for (auto *arg : args.filtered(OPT_UNKNOWN))
+    fatal("unknown argument: " + arg->getAsString(args));
+  return args;
 }
 
 // Find a file by concatenating given paths.
-static Optional<std::string> findFile(StringRef Path1, const Twine &Path2) {
-  SmallString<128> S;
-  sys::path::append(S, Path1, Path2);
-  if (sys::fs::exists(S))
-    return S.str().str();
+static Optional<std::string> findFile(StringRef path1, const Twine &path2) {
+  SmallString<128> s;
+  sys::path::append(s, path1, path2);
+  if (sys::fs::exists(s))
+    return s.str().str();
   return None;
 }
 
 // This is for -lfoo. We'll look for libfoo.dll.a or libfoo.a from search paths.
 static std::string
-searchLibrary(StringRef Name, ArrayRef<StringRef> SearchPaths, bool BStatic) {
-  if (Name.startswith(":")) {
-    for (StringRef Dir : SearchPaths)
-      if (Optional<std::string> S = findFile(Dir, Name.substr(1)))
-        return *S;
-    fatal("unable to find library -l" + Name);
+searchLibrary(StringRef name, ArrayRef<StringRef> searchPaths, bool bStatic) {
+  if (name.startswith(":")) {
+    for (StringRef dir : searchPaths)
+      if (Optional<std::string> s = findFile(dir, name.substr(1)))
+        return *s;
+    fatal("unable to find library -l" + name);
   }
 
-  for (StringRef Dir : SearchPaths) {
-    if (!BStatic)
-      if (Optional<std::string> S = findFile(Dir, "lib" + Name + ".dll.a"))
-        return *S;
-    if (Optional<std::string> S = findFile(Dir, "lib" + Name + ".a"))
-      return *S;
+  for (StringRef dir : searchPaths) {
+    if (!bStatic)
+      if (Optional<std::string> s = findFile(dir, "lib" + name + ".dll.a"))
+        return *s;
+    if (Optional<std::string> s = findFile(dir, "lib" + name + ".a"))
+      return *s;
   }
-  fatal("unable to find library -l" + Name);
+  fatal("unable to find library -l" + name);
 }
 
 // Convert Unix-ish command line arguments to Windows-ish ones and
 // then call coff::link.
-bool mingw::link(ArrayRef<const char *> ArgsArr, raw_ostream &Diag) {
-  MinGWOptTable Parser;
-  opt::InputArgList Args = Parser.parse(ArgsArr.slice(1));
+bool mingw::link(ArrayRef<const char *> argsArr, raw_ostream &diag) {
+  MinGWOptTable parser;
+  opt::InputArgList args = parser.parse(argsArr.slice(1));
 
-  std::vector<std::string> LinkArgs;
-  auto Add = [&](const Twine &S) { LinkArgs.push_back(S.str()); };
+  if (args.hasArg(OPT_help)) {
+    printHelp(argsArr[0]);
+    return true;
+  }
+
+  // A note about "compatible with GNU linkers" message: this is a hack for
+  // scripts generated by GNU Libtool 2.4.6 (released in February 2014 and
+  // still the newest version in March 2017) or earlier to recognize LLD as
+  // a GNU compatible linker. As long as an output for the -v option
+  // contains "GNU" or "with BFD", they recognize us as GNU-compatible.
+  if (args.hasArg(OPT_v) || args.hasArg(OPT_version))
+    message(getLLDVersion() + " (compatible with GNU linkers)");
+
+  // The behavior of -v or --version is a bit strange, but this is
+  // needed for compatibility with GNU linkers.
+  if (args.hasArg(OPT_v) && !args.hasArg(OPT_INPUT) && !args.hasArg(OPT_l))
+    return true;
+  if (args.hasArg(OPT_version))
+    return true;
+
+  if (!args.hasArg(OPT_INPUT) && !args.hasArg(OPT_l))
+    fatal("no input files");
 
-  Add("lld-link");
-  Add("-lldmingw");
+  std::vector<std::string> linkArgs;
+  auto add = [&](const Twine &s) { linkArgs.push_back(s.str()); };
 
-  if (auto *A = Args.getLastArg(OPT_entry)) {
-    StringRef S = A->getValue();
-    if (Args.getLastArgValue(OPT_m) == "i386pe" && S.startswith("_"))
-      Add("-entry:" + S.substr(1));
+  add("lld-link");
+  add("-lldmingw");
+
+  if (auto *a = args.getLastArg(OPT_entry)) {
+    StringRef s = a->getValue();
+    if (args.getLastArgValue(OPT_m) == "i386pe" && s.startswith("_"))
+      add("-entry:" + s.substr(1));
     else
-      Add("-entry:" + S);
+      add("-entry:" + s);
+  }
+
+  if (args.hasArg(OPT_major_os_version, OPT_minor_os_version,
+                  OPT_major_subsystem_version, OPT_minor_subsystem_version)) {
+    auto *majOSVer = args.getLastArg(OPT_major_os_version);
+    auto *minOSVer = args.getLastArg(OPT_minor_os_version);
+    auto *majSubSysVer = args.getLastArg(OPT_major_subsystem_version);
+    auto *minSubSysVer = args.getLastArg(OPT_minor_subsystem_version);
+    if (majOSVer && majSubSysVer &&
+        StringRef(majOSVer->getValue()) != StringRef(majSubSysVer->getValue()))
+      warn("--major-os-version and --major-subsystem-version set to differing "
+           "versions, not supported");
+    if (minOSVer && minSubSysVer &&
+        StringRef(minOSVer->getValue()) != StringRef(minSubSysVer->getValue()))
+      warn("--minor-os-version and --minor-subsystem-version set to differing "
+           "versions, not supported");
+    StringRef subSys = args.getLastArgValue(OPT_subs, "default");
+    StringRef major = majOSVer ? majOSVer->getValue()
+                               : majSubSysVer ? majSubSysVer->getValue() : "6";
+    StringRef minor = minOSVer ? minOSVer->getValue()
+                               : minSubSysVer ? minSubSysVer->getValue() : "";
+    StringRef sep = minor.empty() ? "" : ".";
+    add("-subsystem:" + subSys + "," + major + sep + minor);
+  } else if (auto *a = args.getLastArg(OPT_subs)) {
+    add("-subsystem:" + StringRef(a->getValue()));
   }
 
-  if (auto *A = Args.getLastArg(OPT_subs))
-    Add("-subsystem:" + StringRef(A->getValue()));
-  if (auto *A = Args.getLastArg(OPT_out_implib))
-    Add("-implib:" + StringRef(A->getValue()));
-  if (auto *A = Args.getLastArg(OPT_stack))
-    Add("-stack:" + StringRef(A->getValue()));
-  if (auto *A = Args.getLastArg(OPT_output_def))
-    Add("-output-def:" + StringRef(A->getValue()));
-  if (auto *A = Args.getLastArg(OPT_image_base))
-    Add("-base:" + StringRef(A->getValue()));
-  if (auto *A = Args.getLastArg(OPT_map))
-    Add("-lldmap:" + StringRef(A->getValue()));
-
-  if (auto *A = Args.getLastArg(OPT_o))
-    Add("-out:" + StringRef(A->getValue()));
-  else if (Args.hasArg(OPT_shared))
-    Add("-out:a.dll");
+  if (auto *a = args.getLastArg(OPT_out_implib))
+    add("-implib:" + StringRef(a->getValue()));
+  if (auto *a = args.getLastArg(OPT_stack))
+    add("-stack:" + StringRef(a->getValue()));
+  if (auto *a = args.getLastArg(OPT_output_def))
+    add("-output-def:" + StringRef(a->getValue()));
+  if (auto *a = args.getLastArg(OPT_image_base))
+    add("-base:" + StringRef(a->getValue()));
+  if (auto *a = args.getLastArg(OPT_map))
+    add("-lldmap:" + StringRef(a->getValue()));
+
+  if (auto *a = args.getLastArg(OPT_o))
+    add("-out:" + StringRef(a->getValue()));
+  else if (args.hasArg(OPT_shared))
+    add("-out:a.dll");
   else
-    Add("-out:a.exe");
-
-  if (auto *A = Args.getLastArg(OPT_pdb)) {
-    Add("-debug");
-    Add("-pdb:" + StringRef(A->getValue()));
-  } else if (Args.hasArg(OPT_strip_debug)) {
-    Add("-debug:symtab");
-  } else if (!Args.hasArg(OPT_strip_all)) {
-    Add("-debug:dwarf");
+    add("-out:a.exe");
+
+  if (auto *a = args.getLastArg(OPT_pdb)) {
+    add("-debug");
+    StringRef v = a->getValue();
+    if (!v.empty())
+      add("-pdb:" + v);
+  } else if (args.hasArg(OPT_strip_debug)) {
+    add("-debug:symtab");
+  } else if (!args.hasArg(OPT_strip_all)) {
+    add("-debug:dwarf");
   }
 
-  if (Args.hasArg(OPT_shared))
-    Add("-dll");
-  if (Args.hasArg(OPT_verbose))
-    Add("-verbose");
-  if (Args.hasArg(OPT_export_all_symbols))
-    Add("-export-all-symbols");
-  if (Args.hasArg(OPT_large_address_aware))
-    Add("-largeaddressaware");
-  if (Args.hasArg(OPT_kill_at))
-    Add("-kill-at");
-
-  if (Args.getLastArgValue(OPT_m) != "thumb2pe" &&
-      Args.getLastArgValue(OPT_m) != "arm64pe" && !Args.hasArg(OPT_dynamicbase))
-    Add("-dynamicbase:no");
-
-  if (Args.hasFlag(OPT_gc_sections, OPT_no_gc_sections, false))
-    Add("-opt:ref");
+  if (args.hasArg(OPT_shared))
+    add("-dll");
+  if (args.hasArg(OPT_verbose))
+    add("-verbose");
+  if (args.hasArg(OPT_exclude_all_symbols))
+    add("-exclude-all-symbols");
+  if (args.hasArg(OPT_export_all_symbols))
+    add("-export-all-symbols");
+  if (args.hasArg(OPT_large_address_aware))
+    add("-largeaddressaware");
+  if (args.hasArg(OPT_kill_at))
+    add("-kill-at");
+  if (args.hasArg(OPT_appcontainer))
+    add("-appcontainer");
+
+  if (args.getLastArgValue(OPT_m) != "thumb2pe" &&
+      args.getLastArgValue(OPT_m) != "arm64pe" && !args.hasArg(OPT_dynamicbase))
+    add("-dynamicbase:no");
+
+  if (args.hasFlag(OPT_no_insert_timestamp, OPT_insert_timestamp, false))
+    add("-timestamp:0");
+
+  if (args.hasFlag(OPT_gc_sections, OPT_no_gc_sections, false))
+    add("-opt:ref");
   else
-    Add("-opt:noref");
-
-  if (auto *A = Args.getLastArg(OPT_icf)) {
-    StringRef S = A->getValue();
-    if (S == "all")
-      Add("-opt:icf");
-    else if (S == "safe" || S == "none")
-      Add("-opt:noicf");
+    add("-opt:noref");
+
+  if (auto *a = args.getLastArg(OPT_icf)) {
+    StringRef s = a->getValue();
+    if (s == "all")
+      add("-opt:icf");
+    else if (s == "safe" || s == "none")
+      add("-opt:noicf");
     else
-      fatal("unknown parameter: --icf=" + S);
+      fatal("unknown parameter: --icf=" + s);
   } else {
-    Add("-opt:noicf");
+    add("-opt:noicf");
   }
 
-  if (auto *A = Args.getLastArg(OPT_m)) {
-    StringRef S = A->getValue();
-    if (S == "i386pe")
-      Add("-machine:x86");
-    else if (S == "i386pep")
-      Add("-machine:x64");
-    else if (S == "thumb2pe")
-      Add("-machine:arm");
-    else if (S == "arm64pe")
-      Add("-machine:arm64");
+  if (auto *a = args.getLastArg(OPT_m)) {
+    StringRef s = a->getValue();
+    if (s == "i386pe")
+      add("-machine:x86");
+    else if (s == "i386pep")
+      add("-machine:x64");
+    else if (s == "thumb2pe")
+      add("-machine:arm");
+    else if (s == "arm64pe")
+      add("-machine:arm64");
     else
-      fatal("unknown parameter: -m" + S);
+      fatal("unknown parameter: -m" + s);
   }
 
-  for (auto *A : Args.filtered(OPT_mllvm))
-    Add("-mllvm:" + StringRef(A->getValue()));
+  for (auto *a : args.filtered(OPT_mllvm))
+    add("-mllvm:" + StringRef(a->getValue()));
 
-  for (auto *A : Args.filtered(OPT_Xlink))
-    Add(A->getValue());
+  for (auto *a : args.filtered(OPT_Xlink))
+    add(a->getValue());
 
-  if (Args.getLastArgValue(OPT_m) == "i386pe")
-    Add("-alternatename:__image_base__=___ImageBase");
+  if (args.getLastArgValue(OPT_m) == "i386pe")
+    add("-alternatename:__image_base__=___ImageBase");
   else
-    Add("-alternatename:__image_base__=__ImageBase");
+    add("-alternatename:__image_base__=__ImageBase");
 
-  for (auto *A : Args.filtered(OPT_require_defined))
-    Add("-include:" + StringRef(A->getValue()));
+  for (auto *a : args.filtered(OPT_require_defined))
+    add("-include:" + StringRef(a->getValue()));
+  for (auto *a : args.filtered(OPT_undefined))
+    add("-includeoptional:" + StringRef(a->getValue()));
 
-  std::vector<StringRef> SearchPaths;
-  for (auto *A : Args.filtered(OPT_L)) {
-    SearchPaths.push_back(A->getValue());
-    Add("-libpath:" + StringRef(A->getValue()));
+  std::vector<StringRef> searchPaths;
+  for (auto *a : args.filtered(OPT_L)) {
+    searchPaths.push_back(a->getValue());
+    add("-libpath:" + StringRef(a->getValue()));
   }
 
-  StringRef Prefix = "";
-  bool Static = false;
-  for (auto *A : Args) {
-    switch (A->getOption().getUnaliasedOption().getID()) {
+  StringRef prefix = "";
+  bool isStatic = false;
+  for (auto *a : args) {
+    switch (a->getOption().getID()) {
     case OPT_INPUT:
-      if (StringRef(A->getValue()).endswith_lower(".def"))
-        Add("-def:" + StringRef(A->getValue()));
+      if (StringRef(a->getValue()).endswith_lower(".def"))
+        add("-def:" + StringRef(a->getValue()));
       else
-        Add(Prefix + StringRef(A->getValue()));
+        add(prefix + StringRef(a->getValue()));
       break;
     case OPT_l:
-      Add(Prefix + searchLibrary(A->getValue(), SearchPaths, Static));
+      add(prefix + searchLibrary(a->getValue(), searchPaths, isStatic));
       break;
     case OPT_whole_archive:
-      Prefix = "-wholearchive:";
+      prefix = "-wholearchive:";
       break;
     case OPT_no_whole_archive:
-      Prefix = "";
+      prefix = "";
       break;
     case OPT_Bstatic:
-      Static = true;
+      isStatic = true;
       break;
     case OPT_Bdynamic:
-      Static = false;
+      isStatic = false;
       break;
     }
   }
 
-  if (Args.hasArg(OPT_verbose) || Args.hasArg(OPT__HASH_HASH_HASH))
-    outs() << llvm::join(LinkArgs, " ") << "\n";
+  if (args.hasArg(OPT_verbose) || args.hasArg(OPT__HASH_HASH_HASH))
+    outs() << llvm::join(linkArgs, " ") << "\n";
 
-  if (Args.hasArg(OPT__HASH_HASH_HASH))
+  if (args.hasArg(OPT__HASH_HASH_HASH))
     return true;
 
   // Repack vector of strings to vector of const char pointers for coff::link.
-  std::vector<const char *> Vec;
-  for (const std::string &S : LinkArgs)
-    Vec.push_back(S.c_str());
-  return coff::link(Vec, true);
+  std::vector<const char *> vec;
+  for (const std::string &s : linkArgs)
+    vec.push_back(s.c_str());
+  return coff::link(vec, true);
 }
diff --git a/deps/lld/MinGW/Options.td b/deps/lld/MinGW/Options.td
index 0cda2447e5223bc64a04607518055859df39d57b..44de98dfc90bfa2c09d0fc8c17a29267d7294acb 100644
--- a/deps/lld/MinGW/Options.td
+++ b/deps/lld/MinGW/Options.td
@@ -6,20 +6,45 @@ class S<string name>: Separate<["--", "-"], name>;
 
 def L: JoinedOrSeparate<["-"], "L">, MetaVarName<"<dir>">,
   HelpText<"Add a directory to the library search path">;
+def Bdynamic: F<"Bdynamic">, HelpText<"Link against shared libraries">;
+def Bstatic: F<"Bstatic">, HelpText<"Do not link against shared libraries">;
 def dynamicbase: F<"dynamicbase">, HelpText<"Enable ASLR">;
 def entry: S<"entry">, MetaVarName<"<entry>">,
   HelpText<"Name of entry point symbol">;
+def exclude_all_symbols: F<"exclude-all-symbols">,
+    HelpText<"Don't automatically export any symbols">;
 def export_all_symbols: F<"export-all-symbols">,
     HelpText<"Export all symbols even if a def file or dllexport attributes are used">;
 def gc_sections: F<"gc-sections">, HelpText<"Remove unused sections">;
+def help: F<"help">, HelpText<"Print option help">;
 def icf: J<"icf=">, HelpText<"Identical code folding">;
 def image_base: S<"image-base">, HelpText<"Base address of the program">;
+def insert_timestamp: F<"insert-timestamp">,
+    HelpText<"Include PE header timestamp">;
 def kill_at: F<"kill-at">, HelpText<"Remove @n from exported symbols">;
 def l: JoinedOrSeparate<["-"], "l">, MetaVarName<"<libName>">,
   HelpText<"Root name of library to use">;
 def m: JoinedOrSeparate<["-"], "m">, HelpText<"Set target emulation">;
+def major_os_version: Separate<["--"], "major-os-version">,
+    HelpText<"Set the OS and subsystem major version">;
+def major_os_version_eq: Joined<["--"], "major-os-version=">,
+    Alias<major_os_version>;
+def major_subsystem_version: Separate<["--"], "major-subsystem-version">,
+    HelpText<"Set the OS and subsystem major version">;
+def major_subsystem_version_eq: Joined<["--"], "major-subsystem-version=">,
+    Alias<major_subsystem_version>;
 def map: S<"Map">, HelpText<"Output a linker map">;
 def map_eq: J<"Map=">, Alias<map>;
+def minor_os_version: Separate<["--"], "minor-os-version">,
+    HelpText<"Set the OS and subsystem minor version">;
+def minor_os_version_eq: Joined<["--"], "minor-os-version=">,
+    Alias<minor_os_version>;
+def minor_subsystem_version: Separate<["--"], "minor-subsystem-version">,
+    HelpText<"Set the OS and subsystem minor version">;
+def minor_subsystem_version_eq: Joined<["--"], "minor-subsystem-version=">,
+    Alias<minor_subsystem_version>;
+def no_insert_timestamp: F<"no-insert-timestamp">,
+    HelpText<"Don't include PE header timestamp">;
 def no_whole_archive: F<"no-whole-archive">,
     HelpText<"No longer include all object files for following archives">;
 def large_address_aware: Flag<["--"], "large-address-aware">,
@@ -32,14 +57,21 @@ def out_implib_eq: Joined<["--"], "out-implib=">, Alias<out_implib>;
 def output_def: S<"output-def">, HelpText<"Output def file">;
 def shared: F<"shared">, HelpText<"Build a shared object">;
 def subs: S<"subsystem">, HelpText<"Specify subsystem">;
+def subs_eq: J<"subsystem=">, Alias<subs>;
 def stack: S<"stack">;
 def strip_all: F<"strip-all">,
     HelpText<"Omit all symbol information from the output binary">;
 def strip_debug: F<"strip-debug">,
     HelpText<"Omit all debug information, but keep symbol information">;
+def undefined: S<"u">,
+    HelpText<"Include symbol in the link, if available">;
+def undefined_long: S<"undefined">, Alias<undefined>;
+def undefined_eq: J<"undefined=">, Alias<undefined>;
 def whole_archive: F<"whole-archive">,
     HelpText<"Include all object files for following archives">;
+def v: Flag<["-"], "v">, HelpText<"Display the version number">;
 def verbose: F<"verbose">, HelpText<"Verbose mode">;
+def version: F<"version">, HelpText<"Display the version number and exit">;
 def require_defined: S<"require-defined">,
     HelpText<"Force symbol to be added to symbol table as an undefined one">;
 def require_defined_eq: J<"require-defined=">, Alias<require_defined>;
@@ -47,40 +79,36 @@ def require_defined_eq: J<"require-defined=">, Alias<require_defined>;
 // LLD specific options
 def _HASH_HASH_HASH : Flag<["-"], "###">,
     HelpText<"Print (but do not run) the commands to run for this compilation">;
+def appcontainer: F<"appcontainer">, HelpText<"Set the appcontainer flag in the executable">;
 def mllvm: S<"mllvm">;
-def pdb: S<"pdb">, HelpText<"Specify output PDB debug information file">;
+def pdb: S<"pdb">, HelpText<"Output PDB debug info file, chosen implicitly if the argument is empty">;
+def pdb_eq: J<"pdb=">, Alias<pdb>;
 def Xlink : J<"Xlink=">, MetaVarName<"<arg>">,
     HelpText<"Pass <arg> to the COFF linker">;
 
-// Currently stubs to avoid errors
-def Bdynamic: F<"Bdynamic">, HelpText<"Link against shared libraries">;
-def Bstatic: F<"Bstatic">, HelpText<"Do not link against shared libraries">;
-def O: Joined<["-"], "O">, HelpText<"Optimize output file size">;
-def build_id: F<"build-id">;
-def disable_auto_image_base: F<"disable-auto-image-base">;
-def enable_auto_image_base: F<"enable-auto-image-base">;
-def enable_auto_import: F<"enable-auto-import">;
-def end_group: F<"end-group">;
-def full_shutdown: Flag<["--"], "full-shutdown">;
-def high_entropy_va: F<"high-entropy-va">, HelpText<"Enable 64-bit ASLR">;
-def major_image_version: S<"major-image-version">;
-def minor_image_version: S<"minor-image-version">;
-def no_seh: F<"no-seh">;
-def nxcompat: F<"nxcompat">, HelpText<"Enable data execution prevention">;
-def pic_executable: F<"pic-executable">;
-def sysroot: J<"sysroot">, HelpText<"Sysroot">;
-def start_group: F<"start-group">;
-def tsaware: F<"tsaware">, HelpText<"Create Terminal Server aware executable">;
-def v: Flag<["-"], "v">, HelpText<"Display the version number">;
-def version: F<"version">, HelpText<"Display the version number and exit">;
-
 // Alias
 def alias_entry_e: JoinedOrSeparate<["-"], "e">, Alias<entry>;
 def alias_strip_s: Flag<["-"], "s">, Alias<strip_all>;
 def alias_strip_S: Flag<["-"], "S">, Alias<strip_debug>;
 
 // Ignored options
+def: Joined<["-"], "O">;
+def: F<"build-id">;
+def: F<"disable-auto-image-base">;
+def: F<"enable-auto-image-base">;
+def: F<"enable-auto-import">, HelpText<"Ignored; listed for libtool compatibility">;
+def: F<"end-group">;
+def: Flag<["--"], "full-shutdown">;
+def: F<"high-entropy-va">;
+def: S<"major-image-version">;
+def: S<"minor-image-version">;
+def: F<"no-seh">;
+def: F<"nxcompat">;
+def: F<"pic-executable">;
 def: S<"plugin">;
 def: J<"plugin=">;
 def: S<"plugin-opt">;
 def: J<"plugin-opt=">;
+def: J<"sysroot">;
+def: F<"start-group">;
+def: F<"tsaware">;
diff --git a/deps/lld/docs/NewLLD.rst b/deps/lld/docs/NewLLD.rst
index 79bdf90c6ccd93f090bf5e74c0891a6205f8dc25..d01fb53b953fea69757d43490f5389b1989b0627 100644
--- a/deps/lld/docs/NewLLD.rst
+++ b/deps/lld/docs/NewLLD.rst
@@ -307,3 +307,11 @@ Glossary
   On Unix, your program is generally not guaranteed to be safe with ICF,
   although large programs happen to work correctly.
   LLD works fine with ICF for example.
+
+Other Info
+----------
+
+.. toctree::
+   :maxdepth: 1
+
+   missingkeyfunction
diff --git a/deps/lld/docs/Partitions.rst b/deps/lld/docs/Partitions.rst
new file mode 100644
index 0000000000000000000000000000000000000000..e9113087631af59c829406da02f0fe0f56715a2f
--- /dev/null
+++ b/deps/lld/docs/Partitions.rst
@@ -0,0 +1,116 @@
+Partitions
+==========
+
+.. warning::
+
+  This feature is currently experimental, and its interface is subject
+  to change.
+
+LLD's partitioning feature allows a program (which may be an executable
+or a shared library) to be split into multiple pieces, or partitions. A
+partitioned program consists of a main partition together with a number of
+loadable partitions. The loadable partitions depend on the main partition
+in a similar way to a regular ELF shared object dependency, but unlike a
+shared object, the main partition and the loadable partitions share a virtual
+address space at link time, and each loadable partition is assigned a fixed
+offset from the main partition. This allows the loadable partitions to refer
+to code and data in the main partition directly without the binary size and
+performance overhead of PLTs, GOTs or symbol table entries.
+
+Usage
+-----
+
+A program that uses the partitioning feature must decide which symbols are
+going to be used as the "entry points" for each partition. An entry point
+could, for example, be the equivalent of the partition's ``main`` function, or
+there could be a group of functions that expose the functionality implemented
+by the partition. The intent is that in order to use a loadable partition,
+the program will use ``dlopen``/``dlsym`` or similar functions to dynamically
+load the partition at its assigned address, look up an entry point by name
+and call it. Note, however, that the standard ``dlopen`` function does not
+allow specifying a load address. On Android, the ``android_dlopen_ext``
+function may be used together with the ``ANDROID_DLEXT_RESERVED_ADDRESS``
+flag to load a shared object at a specific address.
+
+Once the entry points have been decided, the translation unit(s)
+containing the entry points should be compiled using the Clang compiler flag
+``-fsymbol-partition=<soname>``, where ``<soname>`` is the intended soname
+of the partition. The resulting object files are passed to the linker in
+the usual way.
+
+The linker will then use these entry points to automatically split the program
+into partitions according to which sections of the program are reachable from
+which entry points, similarly to how ``--gc-sections`` removes unused parts of
+a program. Any sections that are only reachable from a loadable partition's
+entry point are assigned to that partition, while all other sections are
+assigned to the main partition, including sections only reachable from
+loadable partitions.
+
+The following diagram illustrates how sections are assigned to partitions. Each
+section is colored according to its assigned partition.
+
+.. image:: partitions.svg
+
+The result of linking a program that uses partitions is essentially an
+ELF file with all of the partitions concatenated together. This file is
+referred to as a combined output file. To extract a partition from the
+combined output file, the ``llvm-objcopy`` tool should be used together
+with the flag ``--extract-main-partition`` to extract the main partition, or
+``-extract-partition=<soname>`` to extract one of the loadable partitions.
+An example command sequence is shown below:
+
+.. code-block:: shell
+
+  # Compile the main program.
+  clang -ffunction-sections -fdata-sections -c main.c
+
+  # Compile a feature to be placed in a loadable partition.
+  # Note that this is likely to be a separate build step to the main partition.
+  clang -ffunction-sections -fdata-sections -fsymbol-partition=libfeature.so -c feature.c
+
+  # Link the combined output file.
+  clang main.o feature.o -fuse-ld=lld -shared -o libcombined.so -Wl,-soname,libmain.so -Wl,--gc-sections
+
+  # Extract the partitions.
+  llvm-objcopy libcombined.so libmain.so --extract-main-partition
+  llvm-objcopy libcombined.so libfeature.so --extract-partition=libfeature.so
+
+In order to allow a program to discover the names of its loadable partitions
+and the locations of their reserved regions, the linker creates a partition
+index, which is an array of structs with the following definition:
+
+.. code-block:: c
+
+  struct partition_index_entry {
+    int32_t name_offset;
+    int32_t addr_offset;
+    uint32_t size;
+  };
+
+The ``name_offset`` field is a relative pointer to a null-terminated string
+containing the soname of the partition, the ``addr_offset`` field is a
+relative pointer to its load address and the ``size`` field contains the
+size of the region reserved for the partition. To derive an absolute pointer
+from the relative pointer fields in this data structure, the address of the
+field should be added to the value stored in the field.
+
+The program may discover the location of the partition index using the
+linker-defined symbols ``__part_index_begin`` and ``__part_index_end``.
+
+Restrictions
+------------
+
+This feature is currently only supported in the ELF linker.
+
+The partitioning feature may not currently be used together with the
+``SECTIONS`` or ``PHDRS`` linker script features, nor may it be used with the
+``--section-start``, ``-Ttext``, ``-Tdata`` or ``-Tbss`` flags. All of these
+features assume a single set of output sections and/or program headers, which
+makes their semantics ambiguous in the presence of more than one partition.
+
+The partitioning feature may not currently be used on the MIPS architecture
+because it is unclear whether the MIPS multi-GOT ABI is compatible with
+partitions.
+
+The current implementation only supports creating up to 254 partitions due
+to implementation limitations. This limit may be relaxed in the future.
diff --git a/deps/lld/docs/ReleaseNotes.rst b/deps/lld/docs/ReleaseNotes.rst
index aab52573d925a42c8e13455944d63f76ad08cd90..bccef8165f82ef24ca8b99add3520b010340d80d 100644
--- a/deps/lld/docs/ReleaseNotes.rst
+++ b/deps/lld/docs/ReleaseNotes.rst
@@ -1,19 +1,22 @@
 =======================
-lld 8.0.0 Release Notes
+lld 9.0.0 Release Notes
 =======================
 
 .. contents::
     :local:
 
+.. warning::
+   These are in-progress notes for the upcoming LLVM 9.0.0 release.
+   Release notes for previous releases can be found on
+   `the Download Page <https://releases.llvm.org/download.html>`_.
+
 Introduction
 ============
 
-lld is a high-performance linker that supports ELF (Unix), COFF (Windows),
-Mach-O (macOS), MinGW and WebAssembly. lld is command-line-compatible with
-GNU linkers and Microsoft link.exe and is significantly faster than the
-system default linkers.
-
-lld 8.0.0 has lots of feature improvements and bug fixes.
+This document contains the release notes for the lld linker, release 9.0.0.
+Here we describe the status of lld, including major improvements
+from the previous release. All lld releases may be downloaded
+from the `LLVM releases web site <https://llvm.org/releases/>`_.
 
 Non-comprehensive list of changes in this release
 =================================================
@@ -21,101 +24,69 @@ Non-comprehensive list of changes in this release
 ELF Improvements
 ----------------
 
-* lld now supports RISC-V. (`r339364
-  <https://reviews.llvm.org/rL339364>`_)
+* ld.lld now has typo suggestions for flags:
+  ``$ ld.lld --call-shared`` now prints
+  ``unknown argument '--call-shared', did you mean '--call_shared'``.
 
-* Default image base address has changed from 65536 to 2 MiB for i386
-  and 4 MiB for AArch64 to make lld-generated executables work better
-  with automatic superpage promotion. FreeBSD can promote contiguous
-  non-superpages to a superpage if they are aligned to the superpage
-  size. (`r342746 <https://reviews.llvm.org/rL342746>`_)
-
-* lld now attempts to place a ``.note`` segment in the first page of a
-  generated file, so that you can find some important information
-  (``.note.gnu.build-id`` in particular) in a core file even if a core
-  file is truncated by ulimit.
-  (`r349524 <https://reviews.llvm.org/rL349524>`_)
-
-* lld now reports an error if ``_GLOBAL_OFFSET_TABLE_`` symbol is
-  defined by an input object file, as the symbol is supposed to be
-  synthesized by the linker.
-  (`r347854 <https://reviews.llvm.org/rL347854>`_)
-
-* lld/Hexagon can now link Linux kernel and musl libc for Qualcomm
-  Hexagon ISA.
-
-* Initial MSP430 ISA support has landed.
-
-* lld now uses the ``sigrie`` instruction as a trap instruction for
-  MIPS targets.
-
-* lld now creates a TLS segment for AArch64 with a slightly larger
-  alignment requirement, so that the loader makes a few bytes room
-  before each TLS segment at runtime. The aim of this change is to
-  make room to accomodate nonstandard Android TLS slots while keeping
-  the compatibility with the standard AArch64 ABI.
-  (`r350681 <https://reviews.llvm.org/rL350681>`_)
-
-* The following flags have been added: ``--call-graph-profile``,
-  ``--no-call-graph-profile``, ``--warn-ifunc-textrel``,
-  ``-z interpose``, ``-z global``, ``-z nodefaultlib``
+* ...
 
 COFF Improvements
 -----------------
 
-* PDB GUID is set to hash of PDB contents instead to a random byte
-  sequence for build reproducibility.
+* Like the ELF driver, lld-link now has typo suggestions for flags.
 
-* ``/pdbsourcepath:`` is now also used to make ``"cwd"``, ``"exe"``, ``"pdb"``
-  in the env block of PDB outputs absolute if they are relative, and to make
-  paths to obj files referenced in PDB outputs absolute if they are relative.
-  Together with the previous item, this makes it possible to generate
-  executables and PDBs that are fully deterministic and independent of the
-  absolute path to the build directory, so that different machines building
-  the same code in different directories can produce exactly the same output.
+* lld-link now correctly reports duplicate symbol errors for obj files
+  that were compiled with /Gy.
 
-* The following flags have been added: ``/force:multiple``
+* lld-link now correctly reports duplicate symbol errors when several res
+  input files define resources with the same type, name, and language.
+  This can be demoted to a warning using ``/force:multipleres``.
 
-* lld now can link against import libraries produced by GNU tools.
+* Having more than two ``/natvis:`` now works correctly; it used to not
+  work for larger binaries before.
 
-* lld can create thunks for ARM and ARM64, to allow linking larger images
-  (over 16 MB for ARM and over 128 MB for ARM64)
+* Undefined symbols are now printed only in demangled form. Pass
+  ``/demangle:no`` to see raw symbol names instead.
+
+* The following flags have been added: ``/functionpadmin``, ``/swaprun:``,
+  ``/threads:no``
 
 * Several speed and memory usage improvements.
 
-* lld now creates debug info for typedefs.
+* Range extension thunks are now created for ARM64, if needed
 
-* lld can now link obj files produced by ``cl.exe /Z7 /Yc``.
+* lld-link now supports resource object files created by GNU windres and
+  MS cvtres, not only llvm-cvtres
 
-* lld now understands ``%_PDB%`` and ``%_EXT%`` in ``/pdbaltpath:``.
+* The generated thunks for delayimports now share the majority of code
+  among thunks, significantly reducing the overhead of using delayimport
 
-* Undefined symbols are now printed in demangled form in addition to raw form.
+* ...
 
 MinGW Improvements
 ------------------
 
-* lld can now automatically import data variables from DLLs without the
-  use of the dllimport attribute.
+* lld now correctly links crtend.o as the last object file, handling
+  terminators for the sections such as .eh_frame properly, fixing
+  DWARF exception handling with libgcc and gcc's crtend.o.
 
-* lld can now use existing normal MinGW sysroots with import libraries and
-  CRT startup object files for GNU binutils. lld can handle most object
-  files produced by GCC, and thus works as a drop-in replacement for
-  ld.bfd in such environments. (There are known issues with linking crtend.o
-  from GCC in setups with DWARF exceptions though, where object files are
-  linked in a different order than with GNU ld, inserting a DWARF exception
-  table terminator too early.)
+* lld now also handles DWARF unwind info generated by GCC, when linking
+  with libgcc
 
-* lld now supports COFF embedded directives for linking to nondefault
-  libraries, just like for the normal COFF target.
+* Many more GNU ld options are now supported, which e.g. allows the lld
+  MinGW frontend to be called by GCC
 
-* Actually generate a codeview build id signature, even if not creating a PDB.
-  Previously, the ``--build-id`` option did not actually generate a build id
-  unless ``--pdb`` was specified.
+* PDB output can be requested without manually specifying the PDB file
+  name, with the new option ``-pdb=`` with an empty value to the option.
+  (The old existing syntax ``-pdb <filename>`` was more cumbersome to use
+  with an empty parameter value.)
+
+MachO Improvements
+------------------
+
+* Item 1.
 
 WebAssembly Improvements
 ------------------------
 
-* Add initial support for creating shared libraries (-shared).
-  Note: The shared library format is still under active development and may
-  undergo significant changes in future versions.
-  See: https://github.com/WebAssembly/tool-conventions/blob/master/DynamicLinking.md
+* ...
diff --git a/deps/lld/docs/WebAssembly.rst b/deps/lld/docs/WebAssembly.rst
index 424c1a10c7e73195412c60539a0c12161648fcab..41522163bb85588067b5fa81008fb90fc30b30df 100644
--- a/deps/lld/docs/WebAssembly.rst
+++ b/deps/lld/docs/WebAssembly.rst
@@ -4,21 +4,17 @@ WebAssembly lld port
 The WebAssembly version of lld takes WebAssembly binaries as inputs and produces
 a WebAssembly binary as its output.  For the most part it tries to mimic the
 behaviour of traditional ELF linkers and specifically the ELF lld port.  Where
-possible that command line flags and the semantics should be the same.
+possible the command line flags and the semantics should be the same.
 
 
 Object file format
 ------------------
 
-The format the input object files that lld expects is specified as part of the
-the WebAssembly tool conventions
-https://github.com/WebAssembly/tool-conventions/blob/master/Linking.md.
-
-This is object format that the llvm will produce when run with the
-``wasm32-unknown-unknown`` target.  To build llvm with WebAssembly support
-currently requires enabling the experimental backed using
-``-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly``.
+The WebAssembly object file format used by LLVM and LLD is specified as part of
+the WebAssembly tool conventions on linking_.
 
+This is the object format that the llvm will produce when run with the
+``wasm32-unknown-unknown`` target.
 
 Usage
 -----
@@ -88,10 +84,52 @@ WebAssembly-specific options:
 By default the function table is neither imported nor exported, but defined
 for internal use only.
 
-When building shared libraries symbols are exported if they are marked
-as ``visibility=default``.  When building executables only the entry point is
-exported by default.  In addition any symbol included on the command line via
-``--export`` is also exported.
+Behaviour
+---------
+
+In general, where possible, the WebAssembly linker attempts to emulate the
+behaviour of a traditional ELF linker, and in particular the ELF port of lld.
+For more specific details on how this is achieved see the tool conventions on
+linking_.
+
+Function Signatures
+~~~~~~~~~~~~~~~~~~~
+
+One way in which the WebAssembly linker differs from traditional native linkers
+is that function signature checking is strict in WebAssembly.  It is a
+validation error for a module to contain a call site that doesn't agree with
+the target signature.  Even though this is undefined behaviour in C/C++, it is not
+uncommon to find this in real-world C/C++ programs.  For example, a call site in
+one compilation unit which calls a function defined in another compilation
+unit but with too many arguments.
+
+In order not to generate such invalid modules, lld has two modes of handling such
+mismatches: it can simply error-out or it can create stub functions that will
+trap at runtime (functions that contain only an ``unreachable`` instruction)
+and use these stub functions at the otherwise invalid call sites.
+
+The default behaviour is to generate these stub function and to produce
+a warning.  The ``--falal-warnings`` flag can be used to disable this behaviour
+and error out if mismatched are found.
+
+Imports and Exports
+~~~~~~~~~~~~~~~~~~~
+
+When building a shared library any symbols marked as ``visibility=default`` will
+be exported.  When building an executable, only the entry point and symbols
+flagged as ``WASM_SYMBOL_EXPORTED`` are exported by default.  In LLVM the
+``WASM_SYMBOL_EXPORTED`` flag is applied to any symbol in the ``llvm.used`` list
+which corresponds to ``__attribute__((used))`` in C/C++ sources.
+
+In addition, symbols can be exported via the linker command line using
+``--export``.
+
+Finally, just like with native ELF linker the ``--export-dynamic`` flag can be
+used to export symbol in the executable which are marked as
+``visibility=default``.
+
+Garbage Collection
+~~~~~~~~~~~~~~~~~~
 
 Since WebAssembly is designed with size in mind the linker defaults to
 ``--gc-sections`` which means that all unused functions and data segments will
@@ -103,6 +141,18 @@ The symbols which are preserved by default are:
 - Any symbol which is to be exported.
 - Any symbol transitively referenced by the above.
 
+Weak Undefined Functions
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+On native platforms, calls to weak undefined functions end up as calls to the
+null function pointer.  With WebAssembly, direct calls must reference a defined
+function (with the correct signature).  In order to handle this case the linker
+will generate function a stub containing only the ``unreachable`` instruction
+and use this for any direct references to an undefined weak function.
+
+For example a runtime call to a weak undefined function ``foo`` will up trapping
+on ``unreachable`` inside and linker-generated function called
+``undefined:foo``.
 
 Missing features
 ----------------
@@ -112,3 +162,5 @@ Missing features
 - No support for creating shared libraries.  The spec for shared libraries in
   WebAssembly is still in flux:
   https://github.com/WebAssembly/tool-conventions/blob/master/DynamicLinking.md
+
+.. _linking: https://github.com/WebAssembly/tool-conventions/blob/master/Linking.md
diff --git a/deps/lld/docs/conf.py b/deps/lld/docs/conf.py
index 62404b275450564f333f6642d0e6bf21c1dd8608..dd65859fe1215361f57a472f1a12f1b2b5eecaa0 100644
--- a/deps/lld/docs/conf.py
+++ b/deps/lld/docs/conf.py
@@ -48,9 +48,9 @@ copyright = u'2011-%d, LLVM Project' % date.today().year
 # built documents.
 #
 # The short version.
-version = '8'
+version = '9'
 # The full version, including alpha/beta/rc tags.
-release = '8'
+release = '9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/deps/lld/docs/getting_started.rst b/deps/lld/docs/getting_started.rst
index 97c3d1bccbda4bd450d587a43e16e5b81e6e213c..a174f652e73632c90e945c8ee09bcb69e1652373 100644
--- a/deps/lld/docs/getting_started.rst
+++ b/deps/lld/docs/getting_started.rst
@@ -28,23 +28,15 @@ On Unix-like Systems
 .. _libc++: http://libcxx.llvm.org/
 .. _Python 2.4: http://python.org/download/
 
-2. Check out LLVM::
+2. Check out LLVM and subprojects (including lld)::
 
-     $ cd path/to/llvm-project
-     $ svn co http://llvm.org/svn/llvm-project/llvm/trunk llvm
-
-3. Check out lld::
-
-     $ cd llvm/tools
-     $ svn co http://llvm.org/svn/llvm-project/lld/trunk lld
-
-  * lld can also be checked out to ``path/to/llvm-project`` and built as an external
-    project.
+     $ git clone https://github.com/llvm/llvm-project.git
 
 4. Build LLVM and lld::
 
-     $ cd path/to/llvm-build/llvm (out of source build required)
-     $ cmake -G "Unix Makefiles" path/to/llvm-project/llvm
+     $ cd llvm-project
+     $ mkdir build && cd build
+     $ cmake -G "Unix Makefiles" -DLLVM_ENABLE_PROJECTS=lld ../llvm
      $ make
 
   * If you want to build with clang and it is not the default compiler or
@@ -71,23 +63,12 @@ Using Visual Studio
 .. _Visual Studio 12 (2013) or later: http://www.microsoft.com/visualstudio/11/en-us
 .. _Python 2.4: http://python.org/download/
 
-#. Check out LLVM::
-
-     $ cd path/to/llvm-project
-     $ svn co http://llvm.org/svn/llvm-project/llvm/trunk llvm
-
-#. Check out lld::
-
-     $ cd llvm/tools
-     $ svn co http://llvm.org/svn/llvm-project/lld/trunk lld
-
-  * lld can also be checked out to ``path/to/llvm-project`` and built as an external
-    project.
+#. Check out LLVM as above.
 
 #. Generate Visual Studio project files::
 
-     $ cd path/to/llvm-build/llvm (out of source build required)
-     $ cmake -G "Visual Studio 11" path/to/llvm-project/llvm
+     $ cd llvm-project/build (out of source build required)
+     $ cmake -G "Visual Studio 11" -DLLVM_ENABLE_PROJECTS=lld ../llvm
 
 #. Build
 
diff --git a/deps/lld/docs/index.rst b/deps/lld/docs/index.rst
index 2564e9b6310fd760bbf1e2462e3fd896351a84a7..9056d1c2de15af90f080f2a366a7265bed8f28d3 100644
--- a/deps/lld/docs/index.rst
+++ b/deps/lld/docs/index.rst
@@ -106,7 +106,7 @@ build that tree. You need `cmake` and of course a C++ compiler.
 
 .. code-block:: console
 
-  $ git clone https://github.com/llvm-project/llvm-project-20170507 llvm-project
+  $ git clone https://github.com/llvm/llvm-project llvm-project
   $ mkdir build
   $ cd build
   $ cmake -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS=lld -DCMAKE_INSTALL_PREFIX=/usr/local ../llvm-project/llvm
@@ -174,4 +174,5 @@ document soon.
    WebAssembly
    windows_support
    missingkeyfunction
+   Partitions
    ReleaseNotes
diff --git a/deps/lld/docs/ld.lld.1 b/deps/lld/docs/ld.lld.1
index 889d5feabe4d1e0f4b890a1724c9ba69394831d4..c432aacf7f73f92925ff53f8bbfe20ca2b053969 100644
--- a/deps/lld/docs/ld.lld.1
+++ b/deps/lld/docs/ld.lld.1
@@ -1,9 +1,10 @@
-.\" This file is distributed under the University of Illinois Open Source
-.\" License. See LICENSE.TXT for details.
+.\" Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+.\" See https://llvm.org/LICENSE.txt for license information.
+.\" SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 .\"
 .\" This man page documents only lld's ELF linking support, obtained originally
 .\" from FreeBSD.
-.Dd September 26, 2018
+.Dd May 12, 2019
 .Dt LD.LLD 1
 .Os
 .Sh NAME
@@ -45,6 +46,9 @@ as a native linker as well as a cross linker.
 .It Fl -allow-multiple-definition
 Do not error if a symbol is defined multiple times.
 The first definition will be used.
+.It Fl -allow-shlib-undefined
+Allow unresolved references in shared libraries.
+This option is enabled by default when linking a shared library.
 .It Fl -apply-dynamic-relocs
 Apply link-time values for dynamic relocations.
 .It Fl -as-needed
@@ -178,6 +182,8 @@ Set the
 field to the specified value.
 .It Fl -fini Ns = Ns Ar symbol
 Specify a finalizer function.
+.It Fl -force-bti
+Force enable AArch64 BTI instruction in PLT, warn if Input ELF file does not have GNU_PROPERTY_AARCH64_FEATURE_1_BTI property.
 .It Fl -format Ns = Ns Ar input-format , Fl b Ar input-format
 Specify the format of the inputs following this option.
 .Ar input-format
@@ -213,6 +219,15 @@ Enable identical code folding.
 Enable safe identical code folding.
 .It Fl -icf Ns = Ns Cm none
 Disable identical code folding.
+.It Fl -ignore-data-address-equality
+Ignore address equality of data. C/C++ requires each data to have a unique
+address. This option allows lld to do unsafe optimization that breaks the
+requirement: create copies of read-only data or merge two or more read-only data
+that happen to have the same value.
+.It Fl -ignore-function-address-equality
+Ignore address equality of functions. This option allows non-PIC calls to a
+function with non-default visibility in a shared object. The function may have
+different addresses within the executable and within the shared object.
 .It Fl -image-base Ns = Ns Ar value
 Set the base address to
 .Ar value .
@@ -241,6 +256,11 @@ Set target emulation.
 .It Fl -Map Ns = Ns Ar file , Fl M Ar file
 Print a link map to
 .Ar file .
+.It Fl -nmagic , Fl n
+Do not page align sections, link against static libraries.
+.It Fl -no-allow-shlib-undefined
+Do not allow unresolved references in shared libraries.
+This option is enabled by default when linking an executable.
 .It Fl -no-as-needed
 Always set
 .Dv DT_NEEDED
@@ -259,6 +279,12 @@ section.
 Disable garbage collection of unused sections.
 .It Fl -no-gnu-unique
 Disable STB_GNU_UNIQUE symbol binding.
+.It Fl -no-merge-exidx-entries
+Disable merging .ARM.exidx entries.
+.It Fl -no-nmagic
+Page align sections.
+.It Fl -no-omagic
+Do not set the text data sections to be writable, page align sections.
 .It Fl -no-rosegment
 Do not put read-only non-executable sections in their own segment.
 .It Fl -no-threads
@@ -267,9 +293,11 @@ Do not run the linker multi-threaded.
 Report version scripts that refer undefined symbols.
 .It Fl -no-undefined
 Report unresolved symbols even if the linker is creating a shared library.
+.It Fl -no-warn-symbol-ordering
+Do not warn about problems with the symbol ordering file or call graph profile.
 .It Fl -no-whole-archive
 Restores the default behavior of loading archive members.
-.It Fl -no-pie
+.It Fl -no-pie , Fl -no-pic-executable
 Do not create a position independent executable.
 .It Fl -noinhibit-exec
 Retain the executable output file whenever it is still usable.
@@ -305,15 +333,62 @@ is
 .Cm binary ,
 which produces output with no ELF header.
 .It Fl -omagic , Fl N
-Set the text and data sections to be readable and writable.
+Set the text and data sections to be readable and writable, do not page align sections, link against static libraries.
 .It Fl -opt-remarks-filename Ar file
 Write optimization remarks in YAML format to
 .Ar file .
+.It Fl -opt-remarks-passes Ar pass-regex
+Filter optimization remarks by only allowing the passes matching
+.Ar pass-regex .
 .It Fl -opt-remarks-with-hotness
 Include hotness information in the optimization remarks file.
+.It Fl -orphan-handling Ns = Ns Ar mode
+Control how orphan sections are handled. An orphan section is one not
+specifically mentioned in a linker script.
+.Ar mode
+may be:
+.Pp
+.Bl -tag -width 2n -compact
+.It Cm place
+Place orphan sections in suitable output sections.
+.It Cm warn
+Place orphan sections as for
+.Cm place
+and also report a warning.
+.It Cm error
+Place orphan sections as for
+.Cm place
+and also report an error.
+.El
+.Pp
+.Cm place
+is the default.
+.It Fl -pack-dyn-relocs Ns = Ns Ar format
+Pack dynamic relocations in the given format.
+.Ar format
+may be:
+.Pp
+.Bl -tag -width 2n -compact
+.It Cm none
+Don't pack. Dynamic relocations are encoded in SHT_REL(A).
+.It Cm android
+Pack dynamic relocations in SHT_ANDROID_REL(A).
+.It Cm relr
+Pack relative relocations in SHT_RELR, and the rest of dynamic relocations in SHT_REL(A).
+.It Cm android+relr
+Pack relative relocations in SHT_RELR, and the rest of dynamic relocations in SHT_ANDROID_REL(A).
+.El
+.Pp
+.Cm none
+is the default. If
+.Fl -use-android-relr-tags
+is specified, use SHT_ANDROID_RELR instead of SHT_RELR.
+.Pp
+.It Fl -pac-plt
+AArch64 only, use pointer authentication in PLT.
 .It Fl -pic-veneer
 Always generate position independent thunks.
-.It Fl -pie
+.It Fl -pie , Fl -pic-executable
 Create a position independent executable.
 .It Fl -print-gc-sections
 List removed unused sections.
@@ -358,6 +433,8 @@ Set
 .Dv DT_SONAME
 to
 .Ar value .
+.It Fl -sort-common
+This option is ignored for GNU compatibility.
 .It Fl -sort-section Ns = Ns Ar value
 Specifies sections sorting rule when linkerscript is used.
 .It Fl -start-lib
@@ -427,11 +504,27 @@ Print the names of the input files.
 Trace references to
 .Ar symbol .
 .It Fl -undefined Ns = Ns Ar symbol , Fl u Ar symbol
-Force
+If
 .Ar symbol
-to be an undefined symbol during linking.
+is not defined after symbol resolution, and there's a static library
+that contains an object file defining the symbol, load the member
+to include the object file in the output file.
+.It Fl -undefined-glob Ns = Ns Ar pattern
+Synonym for
+.Fl -undefined ,
+except that it takes a glob pattern. In a glob pattern,
+.Cm *
+matches zero or more characters,
+.Cm ?
+matches any single character, and
+.Cm [...]
+matches the characters within brackets. All symbols that match
+a given pattern are handled as if they were given as arguments of
+.Fl -undefined .
 .It Fl -unresolved-symbols Ns = Ns Ar value
 Determine how to handle unresolved symbols.
+.It Fl -use-android-relr-tags
+Use SHT_ANDROID_RELR / DT_ANDROID_RELR* tags instead of SHT_RELR / DT_RELR*.
 .It Fl v
 Display the version number and proceed with linking if object files are
 specified.
@@ -479,6 +572,14 @@ Sets the
 .Dv DYNAMIC
 section.
 Different loaders can decide how to handle this flag on their own.
+.It Cm ifunc-noplt
+Do not emit PLT entries for ifunc symbols.
+Instead, emit text relocations referencing the resolver.
+This is an experimental optimization and only suitable for standalone
+environments where text relocations do not have the usual drawbacks.
+This option must be combined with the
+.Fl z Li notext
+option.
 .It Cm initfirst
 Sets the
 .Dv DF_1_INITFIRST
diff --git a/deps/lld/docs/missingkeyfunction.rst b/deps/lld/docs/missingkeyfunction.rst
index 54ad3251f794e7a0dbe409ca2c976409afed2ce4..db4ea11b4a4f1b399d5dbb05ea04d02327f82610 100644
--- a/deps/lld/docs/missingkeyfunction.rst
+++ b/deps/lld/docs/missingkeyfunction.rst
@@ -4,23 +4,24 @@ Missing Key Function
 If your build failed with a linker error something like this::
 
   foo.cc:28: error: undefined reference to 'vtable for C'
-  the vtable symbol may be undefined because the class is missing its key function (see https://lld.llvm.org/missingkeyfunction)
+  the vtable symbol may be undefined because the class is missing its key function
+  (see https://lld.llvm.org/missingkeyfunction)
 
 it's likely that your class C has a key function (defined by the ABI as the first
-non-pure, non-inline, virtual method), but you haven't actually defined it.
+non-pure, non-inline, virtual function), but you haven't actually defined it.
 
 When a class has a key function, the compiler emits the vtable (and some other
 things as well) only in the translation unit that defines that key function. Thus,
 if you're missing the key function, you'll also be missing the vtable. If no other
-function calls your missing method, you won't see any undefined reference errors
+function calls your missing function, you won't see any undefined reference errors
 for it, but you will see undefined references to the vtable symbol.
 
-When a class has no non-pure, non-inline, virtual methods, there is no key
-method, and the compiler is forced to emit the vtable in every translation unit
+When a class has no non-pure, non-inline, virtual functions, there is no key
+function, and the compiler is forced to emit the vtable in every translation unit
 that references the class. In this case, it is emitted in a COMDAT section,
 which allows the linker to eliminate all duplicate copies. This is still
 wasteful in terms of object file size and link time, so it's always advisable to
-ensure there is at least one eligible method that can serve as the key function.
+ensure there is at least one eligible function that can serve as the key function.
 
 Here are the most common mistakes that lead to this error:
 
@@ -36,8 +37,8 @@ Say you have a base class declared in a header file::
     ...
   };
 
-Here, ``~B`` is the first non-pure, non-inline, virtual method, so it is the key
-method. If you forget to define ``B::~B`` in your source file, the compiler will
+Here, ``~B`` is the first non-pure, non-inline, virtual function, so it is the key
+function. If you forget to define ``B::~B`` in your source file, the compiler will
 not emit the vtable for ``B``, and you'll get an undefined reference to "vtable
 for B".
 
@@ -47,10 +48,10 @@ the first eligible key function and it's easy to forget to implement them. It's
 also more likely that you won't have any direct references to the destructor, so
 you won't see any undefined reference errors that point directly to the problem.
 
-The solution in this case is to implement the missing method.
+The solution in this case is to implement the missing function.
 
-Forgetting to declare a virtual method in an abstract class as pure
--------------------------------------------------------------------
+Forgetting to declare a virtual function in an abstract class as pure
+---------------------------------------------------------------------
 
 Say you have an abstract base class declared in a header file::
 
@@ -65,18 +66,18 @@ Say you have an abstract base class declared in a header file::
   };
 
 This base class is intended to be abstract, but you forgot to mark one of the
-methods pure. Here, ``A::bar``, being non-pure, is nominated as the key function,
+functions pure. Here, ``A::bar``, being non-pure, is nominated as the key function,
 and as a result, the vtable for ``A`` is not emitted, because the compiler is
 waiting for a translation unit that defines ``A::bar``.
 
 The solution in this case is to add the missing ``= 0`` to the declaration of
 ``A::bar``.
 
-Key method is defined, but the linker doesn't see it
-----------------------------------------------------
+Key function is defined, but the linker doesn't see it
+------------------------------------------------------
 
 It's also possible that you have defined the key function somewhere, but the
-object file containing the definition of that method isn't being linked into
+object file containing the definition of that function isn't being linked into
 your application.
 
 The solution in this case is to check your dependencies to make sure that
diff --git a/deps/lld/docs/partitions.dot b/deps/lld/docs/partitions.dot
new file mode 100644
index 0000000000000000000000000000000000000000..81f12a2f4283b05a4a25fd813216248daeeea8b2
--- /dev/null
+++ b/deps/lld/docs/partitions.dot
@@ -0,0 +1,22 @@
+digraph G {
+  part_main [label="Main partition",shape=plaintext];
+  part1 [label="Loadable partition 1",shape=plaintext];
+  part2 [label="Loadable partition 2",shape=plaintext];
+  main [style=filled,fillcolor=lightblue];
+  f1 [style=filled,fillcolor=lightsalmon];
+  f2 [style=filled,fillcolor=palegreen];
+  f3 [style=filled,fillcolor=lightblue];
+  f4 [style=filled,fillcolor=lightsalmon];
+  f5 [style=filled,fillcolor=lightblue];
+  f6 [style=filled,fillcolor=palegreen];
+  part_main -> main;
+  main -> f3;
+  part1 -> f1;
+  f1 -> f3;
+  f1 -> f4;
+  f1 -> f5;
+  part2 -> f2;
+  f2 -> f3;
+  f2 -> f5;
+  f2 -> f6;
+}
diff --git a/deps/lld/docs/partitions.svg b/deps/lld/docs/partitions.svg
new file mode 100644
index 0000000000000000000000000000000000000000..39cd96933446d2e480eb405e226eb73794deff3f
--- /dev/null
+++ b/deps/lld/docs/partitions.svg
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 2.38.0 (20140413.2041)
+ -->
+<!-- Title: G Pages: 1 -->
+<svg width="393pt" height="188pt"
+ viewBox="0.00 0.00 393.00 188.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 184)">
+<title>G</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-184 389,-184 389,4 -4,4"/>
+<!-- part_main -->
+<g id="node1" class="node"><title>part_main</title>
+<text text-anchor="middle" x="47.5" y="-158.3" font-family="Times,serif" font-size="14.00">Main partition</text>
+</g>
+<!-- main -->
+<g id="node4" class="node"><title>main</title>
+<ellipse fill="lightblue" stroke="black" cx="75.5" cy="-90" rx="28.6953" ry="18"/>
+<text text-anchor="middle" x="75.5" y="-86.3" font-family="Times,serif" font-size="14.00">main</text>
+</g>
+<!-- part_main&#45;&gt;main -->
+<g id="edge1" class="edge"><title>part_main&#45;&gt;main</title>
+<path fill="none" stroke="black" d="M54.4214,-143.697C57.6218,-135.696 61.492,-126.02 65.0381,-117.155"/>
+<polygon fill="black" stroke="black" points="68.3868,-118.207 68.8511,-107.622 61.8874,-115.607 68.3868,-118.207"/>
+</g>
+<!-- part1 -->
+<g id="node2" class="node"><title>part1</title>
+<text text-anchor="middle" x="176.5" y="-158.3" font-family="Times,serif" font-size="14.00">Loadable partition 1</text>
+</g>
+<!-- f1 -->
+<g id="node5" class="node"><title>f1</title>
+<ellipse fill="lightsalmon" stroke="black" cx="176.5" cy="-90" rx="27" ry="18"/>
+<text text-anchor="middle" x="176.5" y="-86.3" font-family="Times,serif" font-size="14.00">f1</text>
+</g>
+<!-- part1&#45;&gt;f1 -->
+<g id="edge3" class="edge"><title>part1&#45;&gt;f1</title>
+<path fill="none" stroke="black" d="M176.5,-143.697C176.5,-135.983 176.5,-126.712 176.5,-118.112"/>
+<polygon fill="black" stroke="black" points="180,-118.104 176.5,-108.104 173,-118.104 180,-118.104"/>
+</g>
+<!-- part2 -->
+<g id="node3" class="node"><title>part2</title>
+<text text-anchor="middle" x="321.5" y="-158.3" font-family="Times,serif" font-size="14.00">Loadable partition 2</text>
+</g>
+<!-- f2 -->
+<g id="node6" class="node"><title>f2</title>
+<ellipse fill="palegreen" stroke="black" cx="284.5" cy="-90" rx="27" ry="18"/>
+<text text-anchor="middle" x="284.5" y="-86.3" font-family="Times,serif" font-size="14.00">f2</text>
+</g>
+<!-- part2&#45;&gt;f2 -->
+<g id="edge7" class="edge"><title>part2&#45;&gt;f2</title>
+<path fill="none" stroke="black" d="M312.354,-143.697C307.97,-135.403 302.636,-125.311 297.813,-116.187"/>
+<polygon fill="black" stroke="black" points="300.801,-114.35 293.034,-107.145 294.612,-117.621 300.801,-114.35"/>
+</g>
+<!-- f3 -->
+<g id="node7" class="node"><title>f3</title>
+<ellipse fill="lightblue" stroke="black" cx="104.5" cy="-18" rx="27" ry="18"/>
+<text text-anchor="middle" x="104.5" y="-14.3" font-family="Times,serif" font-size="14.00">f3</text>
+</g>
+<!-- main&#45;&gt;f3 -->
+<g id="edge2" class="edge"><title>main&#45;&gt;f3</title>
+<path fill="none" stroke="black" d="M82.3726,-72.411C85.7675,-64.2164 89.9422,-54.1395 93.7473,-44.9548"/>
+<polygon fill="black" stroke="black" points="97.0828,-46.0481 97.6767,-35.4699 90.6158,-43.3689 97.0828,-46.0481"/>
+</g>
+<!-- f1&#45;&gt;f3 -->
+<g id="edge4" class="edge"><title>f1&#45;&gt;f3</title>
+<path fill="none" stroke="black" d="M161.93,-74.8345C151.75,-64.9376 137.976,-51.5462 126.469,-40.3591"/>
+<polygon fill="black" stroke="black" points="128.905,-37.8461 119.296,-33.3847 124.026,-42.865 128.905,-37.8461"/>
+</g>
+<!-- f4 -->
+<g id="node8" class="node"><title>f4</title>
+<ellipse fill="lightsalmon" stroke="black" cx="176.5" cy="-18" rx="27" ry="18"/>
+<text text-anchor="middle" x="176.5" y="-14.3" font-family="Times,serif" font-size="14.00">f4</text>
+</g>
+<!-- f1&#45;&gt;f4 -->
+<g id="edge5" class="edge"><title>f1&#45;&gt;f4</title>
+<path fill="none" stroke="black" d="M176.5,-71.6966C176.5,-63.9827 176.5,-54.7125 176.5,-46.1124"/>
+<polygon fill="black" stroke="black" points="180,-46.1043 176.5,-36.1043 173,-46.1044 180,-46.1043"/>
+</g>
+<!-- f5 -->
+<g id="node9" class="node"><title>f5</title>
+<ellipse fill="lightblue" stroke="black" cx="248.5" cy="-18" rx="27" ry="18"/>
+<text text-anchor="middle" x="248.5" y="-14.3" font-family="Times,serif" font-size="14.00">f5</text>
+</g>
+<!-- f1&#45;&gt;f5 -->
+<g id="edge6" class="edge"><title>f1&#45;&gt;f5</title>
+<path fill="none" stroke="black" d="M191.07,-74.8345C201.25,-64.9376 215.024,-51.5462 226.531,-40.3591"/>
+<polygon fill="black" stroke="black" points="228.974,-42.865 233.704,-33.3847 224.095,-37.8461 228.974,-42.865"/>
+</g>
+<!-- f2&#45;&gt;f3 -->
+<g id="edge8" class="edge"><title>f2&#45;&gt;f3</title>
+<path fill="none" stroke="black" d="M260.806,-81.0022C232.063,-71.1346 182.266,-53.5073 140.5,-36 138.683,-35.2385 136.825,-34.4358 134.957,-33.6106"/>
+<polygon fill="black" stroke="black" points="136.231,-30.3452 125.68,-29.3829 133.328,-36.7149 136.231,-30.3452"/>
+</g>
+<!-- f2&#45;&gt;f5 -->
+<g id="edge9" class="edge"><title>f2&#45;&gt;f5</title>
+<path fill="none" stroke="black" d="M276.15,-72.7646C271.788,-64.2831 266.353,-53.7144 261.459,-44.1974"/>
+<polygon fill="black" stroke="black" points="264.49,-42.4395 256.804,-35.1473 258.265,-45.6409 264.49,-42.4395"/>
+</g>
+<!-- f6 -->
+<g id="node10" class="node"><title>f6</title>
+<ellipse fill="palegreen" stroke="black" cx="320.5" cy="-18" rx="27" ry="18"/>
+<text text-anchor="middle" x="320.5" y="-14.3" font-family="Times,serif" font-size="14.00">f6</text>
+</g>
+<!-- f2&#45;&gt;f6 -->
+<g id="edge10" class="edge"><title>f2&#45;&gt;f6</title>
+<path fill="none" stroke="black" d="M292.85,-72.7646C297.212,-64.2831 302.647,-53.7144 307.541,-44.1974"/>
+<polygon fill="black" stroke="black" points="310.735,-45.6409 312.196,-35.1473 304.51,-42.4395 310.735,-45.6409"/>
+</g>
+</g>
+</svg>
diff --git a/deps/lld/docs/sphinx_intro.rst b/deps/lld/docs/sphinx_intro.rst
index 6bb9816b5ab4743a7aa8401a3c829373173016f9..b671cdc3df64e8db14dae0f1443dbb8520c8e0b1 100644
--- a/deps/lld/docs/sphinx_intro.rst
+++ b/deps/lld/docs/sphinx_intro.rst
@@ -43,8 +43,8 @@ to install it using:
     Use your distribution's standard package management tool to install it,
     i.e., ``apt-get install easy_install`` or ``yum install easy_install``.
 
-  Mac OS X
-    All modern Mac OS X systems come with ``easy_install`` as part of the base
+  macOS
+    All modern macOS systems come with ``easy_install`` as part of the base
     system.
 
   Windows
diff --git a/deps/lld/include/lld/Common/Args.h b/deps/lld/include/lld/Common/Args.h
index 769d4840cf065cad49deebb6d8f8c0093a2d7752..b3c8686e57e229a08ea63cc2a4c826de0a8a3634 100644
--- a/deps/lld/include/lld/Common/Args.h
+++ b/deps/lld/include/lld/Common/Args.h
@@ -1,9 +1,8 @@
 //===- Args.h ---------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -11,6 +10,7 @@
 #define LLD_ARGS_H
 
 #include "lld/Common/LLVM.h"
+#include "llvm/Support/CodeGen.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include <vector>
 
@@ -22,15 +22,20 @@ class InputArgList;
 
 namespace lld {
 namespace args {
-int getInteger(llvm::opt::InputArgList &Args, unsigned Key, int Default);
-std::vector<StringRef> getStrings(llvm::opt::InputArgList &Args, int Id);
 
-uint64_t getZOptionValue(llvm::opt::InputArgList &Args, int Id, StringRef Key,
+llvm::CodeGenOpt::Level getCGOptLevel(int optLevelLTO);
+
+int64_t getInteger(llvm::opt::InputArgList &args, unsigned key,
+                   int64_t Default);
+
+std::vector<StringRef> getStrings(llvm::opt::InputArgList &args, int id);
+
+uint64_t getZOptionValue(llvm::opt::InputArgList &args, int id, StringRef key,
                          uint64_t Default);
 
-std::vector<StringRef> getLines(MemoryBufferRef MB);
+std::vector<StringRef> getLines(MemoryBufferRef mb);
 
-StringRef getFilenameWithoutExe(StringRef Path);
+StringRef getFilenameWithoutExe(StringRef path);
 
 } // namespace args
 } // namespace lld
diff --git a/deps/lld/include/lld/Common/Driver.h b/deps/lld/include/lld/Common/Driver.h
index f6d92933af62234057e18838a38e707219a1b1c7..e5595952ad22246f01f6fd6bcf582a8073bfb6de 100644
--- a/deps/lld/include/lld/Common/Driver.h
+++ b/deps/lld/include/lld/Common/Driver.h
@@ -1,9 +1,8 @@
 //===- lld/Common/Driver.h - Linker Driver Emulator -----------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -15,28 +14,28 @@
 
 namespace lld {
 namespace coff {
-bool link(llvm::ArrayRef<const char *> Args, bool CanExitEarly,
-          llvm::raw_ostream &Diag = llvm::errs());
+bool link(llvm::ArrayRef<const char *> args, bool canExitEarly,
+          llvm::raw_ostream &diag = llvm::errs());
 }
 
 namespace mingw {
-bool link(llvm::ArrayRef<const char *> Args,
-          llvm::raw_ostream &Diag = llvm::errs());
+bool link(llvm::ArrayRef<const char *> args,
+          llvm::raw_ostream &diag = llvm::errs());
 }
 
 namespace elf {
-bool link(llvm::ArrayRef<const char *> Args, bool CanExitEarly,
-          llvm::raw_ostream &Diag = llvm::errs());
+bool link(llvm::ArrayRef<const char *> args, bool canExitEarly,
+          llvm::raw_ostream &diag = llvm::errs());
 }
 
 namespace mach_o {
-bool link(llvm::ArrayRef<const char *> Args, bool CanExitEarly,
-          llvm::raw_ostream &Diag = llvm::errs());
+bool link(llvm::ArrayRef<const char *> args, bool canExitEarly,
+          llvm::raw_ostream &diag = llvm::errs());
 }
 
 namespace wasm {
-bool link(llvm::ArrayRef<const char *> Args, bool CanExitEarly,
-          llvm::raw_ostream &Diag = llvm::errs());
+bool link(llvm::ArrayRef<const char *> args, bool canExitEarly,
+          llvm::raw_ostream &diag = llvm::errs());
 }
 }
 
diff --git a/deps/lld/include/lld/Common/ErrorHandler.h b/deps/lld/include/lld/Common/ErrorHandler.h
index c169f7b50de891254f891d6a98dc113387869460..7126a7bf410ae3b8e546e4d56409cadbedaf9149 100644
--- a/deps/lld/include/lld/Common/ErrorHandler.h
+++ b/deps/lld/include/lld/Common/ErrorHandler.h
@@ -1,9 +1,8 @@
 //===- ErrorHandler.h -------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -83,74 +82,75 @@ namespace lld {
 
 class ErrorHandler {
 public:
-  uint64_t ErrorCount = 0;
-  uint64_t ErrorLimit = 20;
-  StringRef ErrorLimitExceededMsg = "too many errors emitted, stopping now";
-  StringRef LogName = "lld";
-  llvm::raw_ostream *ErrorOS = &llvm::errs();
-  bool ColorDiagnostics = llvm::errs().has_colors();
-  bool ExitEarly = true;
-  bool FatalWarnings = false;
-  bool Verbose = false;
+  uint64_t errorCount = 0;
+  uint64_t errorLimit = 20;
+  StringRef errorLimitExceededMsg = "too many errors emitted, stopping now";
+  StringRef logName = "lld";
+  llvm::raw_ostream *errorOS = &llvm::errs();
+  bool colorDiagnostics = llvm::errs().has_colors();
+  bool exitEarly = true;
+  bool fatalWarnings = false;
+  bool verbose = false;
+  bool vsDiagnostics = false;
 
-  void error(const Twine &Msg);
-  LLVM_ATTRIBUTE_NORETURN void fatal(const Twine &Msg);
-  void log(const Twine &Msg);
-  void message(const Twine &Msg);
-  void warn(const Twine &Msg);
+  void error(const Twine &msg);
+  LLVM_ATTRIBUTE_NORETURN void fatal(const Twine &msg);
+  void log(const Twine &msg);
+  void message(const Twine &msg);
+  void warn(const Twine &msg);
 
-  std::unique_ptr<llvm::FileOutputBuffer> OutputBuffer;
+  std::unique_ptr<llvm::FileOutputBuffer> outputBuffer;
 
 private:
-  void print(StringRef S, raw_ostream::Colors C);
+  void printHeader(StringRef s, raw_ostream::Colors c, const Twine &msg);
 };
 
 /// Returns the default error handler.
 ErrorHandler &errorHandler();
 
-inline void error(const Twine &Msg) { errorHandler().error(Msg); }
-inline LLVM_ATTRIBUTE_NORETURN void fatal(const Twine &Msg) {
-  errorHandler().fatal(Msg);
+inline void error(const Twine &msg) { errorHandler().error(msg); }
+inline LLVM_ATTRIBUTE_NORETURN void fatal(const Twine &msg) {
+  errorHandler().fatal(msg);
 }
-inline void log(const Twine &Msg) { errorHandler().log(Msg); }
-inline void message(const Twine &Msg) { errorHandler().message(Msg); }
-inline void warn(const Twine &Msg) { errorHandler().warn(Msg); }
-inline uint64_t errorCount() { return errorHandler().ErrorCount; }
+inline void log(const Twine &msg) { errorHandler().log(msg); }
+inline void message(const Twine &msg) { errorHandler().message(msg); }
+inline void warn(const Twine &msg) { errorHandler().warn(msg); }
+inline uint64_t errorCount() { return errorHandler().errorCount; }
 
-LLVM_ATTRIBUTE_NORETURN void exitLld(int Val);
+LLVM_ATTRIBUTE_NORETURN void exitLld(int val);
 
-void diagnosticHandler(const llvm::DiagnosticInfo &DI);
-void checkError(Error E);
+void diagnosticHandler(const llvm::DiagnosticInfo &di);
+void checkError(Error e);
 
 // check functions are convenient functions to strip errors
 // from error-or-value objects.
-template <class T> T check(ErrorOr<T> E) {
-  if (auto EC = E.getError())
-    fatal(EC.message());
-  return std::move(*E);
+template <class T> T check(ErrorOr<T> e) {
+  if (auto ec = e.getError())
+    fatal(ec.message());
+  return std::move(*e);
 }
 
-template <class T> T check(Expected<T> E) {
-  if (!E)
-    fatal(llvm::toString(E.takeError()));
-  return std::move(*E);
+template <class T> T check(Expected<T> e) {
+  if (!e)
+    fatal(llvm::toString(e.takeError()));
+  return std::move(*e);
 }
 
 template <class T>
-T check2(ErrorOr<T> E, llvm::function_ref<std::string()> Prefix) {
-  if (auto EC = E.getError())
-    fatal(Prefix() + ": " + EC.message());
-  return std::move(*E);
+T check2(ErrorOr<T> e, llvm::function_ref<std::string()> prefix) {
+  if (auto ec = e.getError())
+    fatal(prefix() + ": " + ec.message());
+  return std::move(*e);
 }
 
 template <class T>
-T check2(Expected<T> E, llvm::function_ref<std::string()> Prefix) {
-  if (!E)
-    fatal(Prefix() + ": " + toString(E.takeError()));
-  return std::move(*E);
+T check2(Expected<T> e, llvm::function_ref<std::string()> prefix) {
+  if (!e)
+    fatal(prefix() + ": " + toString(e.takeError()));
+  return std::move(*e);
 }
 
-inline std::string toString(const Twine &S) { return S.str(); }
+inline std::string toString(const Twine &s) { return s.str(); }
 
 // To evaluate the second argument lazily, we use C macro.
 #define CHECK(E, S) check2((E), [&] { return toString(S); })
diff --git a/deps/lld/include/lld/Common/Filesystem.h b/deps/lld/include/lld/Common/Filesystem.h
new file mode 100644
index 0000000000000000000000000000000000000000..63a0f554a06c57ffd6fa310d90fde00b4d3c2425
--- /dev/null
+++ b/deps/lld/include/lld/Common/Filesystem.h
@@ -0,0 +1,20 @@
+//===- Filesystem.h ---------------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLD_FILESYSTEM_H
+#define LLD_FILESYSTEM_H
+
+#include "lld/Common/LLVM.h"
+#include <system_error>
+
+namespace lld {
+void unlinkAsync(StringRef path);
+std::error_code tryCreateFile(StringRef path);
+} // namespace lld
+
+#endif
diff --git a/deps/lld/include/lld/Common/LLVM.h b/deps/lld/include/lld/Common/LLVM.h
index 95a2aa903957ddf8b59b6ed53017dc702910b63e..f7ed1d793ca7b1d09b74684678f26dcece349eb1 100644
--- a/deps/lld/include/lld/Common/LLVM.h
+++ b/deps/lld/include/lld/Common/LLVM.h
@@ -1,9 +1,8 @@
 //===--- LLVM.h - Import various common LLVM datatypes ----------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -30,6 +29,7 @@ class Twine;
 class MemoryBuffer;
 class MemoryBufferRef;
 template <typename T> class ArrayRef;
+template <typename T> class MutableArrayRef;
 template <unsigned InternalLen> class SmallString;
 template <typename T, unsigned N> class SmallVector;
 template <typename T> class ErrorOr;
@@ -63,6 +63,7 @@ using llvm::isa;
 
 // ADT's.
 using llvm::ArrayRef;
+using llvm::MutableArrayRef;
 using llvm::Error;
 using llvm::ErrorOr;
 using llvm::Expected;
diff --git a/deps/lld/include/lld/Common/Memory.h b/deps/lld/include/lld/Common/Memory.h
index 699f7c1654cd368b4b9e221feda98334f9db346e..41d8f15d7b34b16b681808aea3ed736581d2748b 100644
--- a/deps/lld/include/lld/Common/Memory.h
+++ b/deps/lld/include/lld/Common/Memory.h
@@ -1,9 +1,8 @@
 //===- Memory.h -------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -29,30 +28,30 @@
 namespace lld {
 
 // Use this arena if your object doesn't have a destructor.
-extern llvm::BumpPtrAllocator BAlloc;
-extern llvm::StringSaver Saver;
+extern llvm::BumpPtrAllocator bAlloc;
+extern llvm::StringSaver saver;
 
 void freeArena();
 
 // These two classes are hack to keep track of all
 // SpecificBumpPtrAllocator instances.
 struct SpecificAllocBase {
-  SpecificAllocBase() { Instances.push_back(this); }
+  SpecificAllocBase() { instances.push_back(this); }
   virtual ~SpecificAllocBase() = default;
   virtual void reset() = 0;
-  static std::vector<SpecificAllocBase *> Instances;
+  static std::vector<SpecificAllocBase *> instances;
 };
 
 template <class T> struct SpecificAlloc : public SpecificAllocBase {
-  void reset() override { Alloc.DestroyAll(); }
-  llvm::SpecificBumpPtrAllocator<T> Alloc;
+  void reset() override { alloc.DestroyAll(); }
+  llvm::SpecificBumpPtrAllocator<T> alloc;
 };
 
 // Use this arena if your object has a destructor.
 // Your destructor will be invoked from freeArena().
-template <typename T, typename... U> T *make(U &&... Args) {
-  static SpecificAlloc<T> Alloc;
-  return new (Alloc.Alloc.Allocate()) T(std::forward<U>(Args)...);
+template <typename T, typename... U> T *make(U &&... args) {
+  static SpecificAlloc<T> alloc;
+  return new (alloc.alloc.Allocate()) T(std::forward<U>(args)...);
 }
 
 } // namespace lld
diff --git a/deps/lld/include/lld/Common/Reproduce.h b/deps/lld/include/lld/Common/Reproduce.h
index 0f425de269c7f1e642c0e63003804c15b4c1651c..734d9e4011d199a55f0ee97e8765ae0a5cb52fd3 100644
--- a/deps/lld/include/lld/Common/Reproduce.h
+++ b/deps/lld/include/lld/Common/Reproduce.h
@@ -1,9 +1,8 @@
 //===- Reproduce.h - Utilities for creating reproducers ---------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -23,17 +22,13 @@ namespace lld {
 // Makes a given pathname an absolute path first, and then remove
 // beginning /. For example, "../foo.o" is converted to "home/john/foo.o",
 // assuming that the current directory is "/home/john/bar".
-std::string relativeToRoot(StringRef Path);
+std::string relativeToRoot(StringRef path);
 
 // Quote a given string if it contains a space character.
-std::string quote(StringRef S);
-
-// Rewrite the given path if a file exists with that pathname, otherwise
-// returns the original path.
-std::string rewritePath(StringRef S);
+std::string quote(StringRef s);
 
 // Returns the string form of the given argument.
-std::string toString(const llvm::opt::Arg &Arg);
+std::string toString(const llvm::opt::Arg &arg);
 }
 
 #endif
diff --git a/deps/lld/include/lld/Common/Strings.h b/deps/lld/include/lld/Common/Strings.h
index 566030e43aa6415b14438d9aa67e4c83614d7a60..ded22dd769bede76ba6f54dc9ffede99f6b5b5ff 100644
--- a/deps/lld/include/lld/Common/Strings.h
+++ b/deps/lld/include/lld/Common/Strings.h
@@ -1,9 +1,8 @@
 //===- Strings.h ------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -20,25 +19,25 @@
 namespace lld {
 // Returns a demangled C++ symbol name. If Name is not a mangled
 // name, it returns Optional::None.
-llvm::Optional<std::string> demangleItanium(llvm::StringRef Name);
-llvm::Optional<std::string> demangleMSVC(llvm::StringRef S);
+llvm::Optional<std::string> demangleItanium(llvm::StringRef name);
+llvm::Optional<std::string> demangleMSVC(llvm::StringRef s);
 
-std::vector<uint8_t> parseHex(llvm::StringRef S);
-bool isValidCIdentifier(llvm::StringRef S);
+std::vector<uint8_t> parseHex(llvm::StringRef s);
+bool isValidCIdentifier(llvm::StringRef s);
 
 // Write the contents of the a buffer to a file
-void saveBuffer(llvm::StringRef Buffer, const llvm::Twine &Path);
+void saveBuffer(llvm::StringRef buffer, const llvm::Twine &path);
 
 // This class represents multiple glob patterns.
 class StringMatcher {
 public:
   StringMatcher() = default;
-  explicit StringMatcher(llvm::ArrayRef<llvm::StringRef> Pat);
+  explicit StringMatcher(llvm::ArrayRef<llvm::StringRef> pat);
 
-  bool match(llvm::StringRef S) const;
+  bool match(llvm::StringRef s) const;
 
 private:
-  std::vector<llvm::GlobPattern> Patterns;
+  std::vector<llvm::GlobPattern> patterns;
 };
 
 } // namespace lld
diff --git a/deps/lld/include/lld/Common/TargetOptionsCommandFlags.h b/deps/lld/include/lld/Common/TargetOptionsCommandFlags.h
index 2eaecb72759e5746777344383a8dc6900c5570bd..9345e616f9a96ad3249d4ce3cf60b7e60807a645 100644
--- a/deps/lld/include/lld/Common/TargetOptionsCommandFlags.h
+++ b/deps/lld/include/lld/Common/TargetOptionsCommandFlags.h
@@ -1,9 +1,8 @@
 //===-- TargetOptionsCommandFlags.h ----------------------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -16,8 +15,8 @@
 #include "llvm/Target/TargetOptions.h"
 
 namespace lld {
-llvm::TargetOptions InitTargetOptionsFromCodeGenFlags();
-llvm::Optional<llvm::CodeModel::Model> GetCodeModelFromCMModel();
-std::string GetCPUStr();
-std::vector<std::string> GetMAttrs();
+llvm::TargetOptions initTargetOptionsFromCodeGenFlags();
+llvm::Optional<llvm::CodeModel::Model> getCodeModelFromCMModel();
+std::string getCPUStr();
+std::vector<std::string> getMAttrs();
 }
diff --git a/deps/lld/include/lld/Common/Threads.h b/deps/lld/include/lld/Common/Threads.h
index 1425abd1292245b2655e0ef31255cf08c9674f29..7834130fdf7260027c0a4b35d2bae02cb9512b70 100644
--- a/deps/lld/include/lld/Common/Threads.h
+++ b/deps/lld/include/lld/Common/Threads.h
@@ -1,9 +1,8 @@
 //===- Threads.h ------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -64,21 +63,28 @@
 
 namespace lld {
 
-extern bool ThreadsEnabled;
+extern bool threadsEnabled;
 
-template <typename R, class FuncTy> void parallelForEach(R &&Range, FuncTy Fn) {
-  if (ThreadsEnabled)
-    for_each(llvm::parallel::par, std::begin(Range), std::end(Range), Fn);
+template <typename R, class FuncTy> void parallelForEach(R &&range, FuncTy fn) {
+  if (threadsEnabled)
+    for_each(llvm::parallel::par, std::begin(range), std::end(range), fn);
   else
-    for_each(llvm::parallel::seq, std::begin(Range), std::end(Range), Fn);
+    for_each(llvm::parallel::seq, std::begin(range), std::end(range), fn);
 }
 
-inline void parallelForEachN(size_t Begin, size_t End,
-                             llvm::function_ref<void(size_t)> Fn) {
-  if (ThreadsEnabled)
-    for_each_n(llvm::parallel::par, Begin, End, Fn);
+inline void parallelForEachN(size_t begin, size_t end,
+                             llvm::function_ref<void(size_t)> fn) {
+  if (threadsEnabled)
+    for_each_n(llvm::parallel::par, begin, end, fn);
   else
-    for_each_n(llvm::parallel::seq, Begin, End, Fn);
+    for_each_n(llvm::parallel::seq, begin, end, fn);
+}
+
+template <typename R, class FuncTy> void parallelSort(R &&range, FuncTy fn) {
+  if (threadsEnabled)
+    sort(llvm::parallel::par, std::begin(range), std::end(range), fn);
+  else
+    sort(llvm::parallel::seq, std::begin(range), std::end(range), fn);
 }
 
 } // namespace lld
diff --git a/deps/lld/include/lld/Common/Timer.h b/deps/lld/include/lld/Common/Timer.h
index 6654af626919218f890d129e098c1b02aaf70931..4a298b04a30b55540fafb21e70ce9647334c1793 100644
--- a/deps/lld/include/lld/Common/Timer.h
+++ b/deps/lld/include/lld/Common/Timer.h
@@ -1,9 +1,8 @@
 //===- Timer.h ----------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -22,18 +21,18 @@ namespace lld {
 class Timer;
 
 struct ScopedTimer {
-  explicit ScopedTimer(Timer &T);
+  explicit ScopedTimer(Timer &t);
 
   ~ScopedTimer();
 
   void stop();
 
-  Timer *T = nullptr;
+  Timer *t = nullptr;
 };
 
 class Timer {
 public:
-  Timer(llvm::StringRef Name, Timer &Parent);
+  Timer(llvm::StringRef name, Timer &parent);
 
   static Timer &root();
 
@@ -44,14 +43,14 @@ public:
   double millis() const;
 
 private:
-  explicit Timer(llvm::StringRef Name);
-  void print(int Depth, double TotalDuration, bool Recurse = true) const;
+  explicit Timer(llvm::StringRef name);
+  void print(int depth, double totalDuration, bool recurse = true) const;
 
-  std::chrono::time_point<std::chrono::high_resolution_clock> StartTime;
-  std::chrono::nanoseconds Total;
-  std::vector<Timer *> Children;
-  std::string Name;
-  Timer *Parent;
+  std::chrono::time_point<std::chrono::high_resolution_clock> startTime;
+  std::chrono::nanoseconds total;
+  std::vector<Timer *> children;
+  std::string name;
+  Timer *parent;
 };
 
 } // namespace lld
diff --git a/deps/lld/include/lld/Common/Version.h b/deps/lld/include/lld/Common/Version.h
index 23a10ed6dbf3b4427cff871e05043c1ccd61d13e..9571aa2743e5b254afac4468f091285d27f9d687 100644
--- a/deps/lld/include/lld/Common/Version.h
+++ b/deps/lld/include/lld/Common/Version.h
@@ -1,9 +1,8 @@
 //===- lld/Common/Version.h - LLD Version Number ----------------*- C++ -*-===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
diff --git a/deps/lld/include/lld/Core/AbsoluteAtom.h b/deps/lld/include/lld/Core/AbsoluteAtom.h
index ed25297cea812ca2e6778f2a64e7baf32ccf4df2..5214b418f3d5b10d726012e51be91a30331099aa 100644
--- a/deps/lld/include/lld/Core/AbsoluteAtom.h
+++ b/deps/lld/include/lld/Core/AbsoluteAtom.h
@@ -1,9 +1,8 @@
 //===- Core/AbsoluteAtom.h - An absolute Atom -----------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/include/lld/Core/ArchiveLibraryFile.h b/deps/lld/include/lld/Core/ArchiveLibraryFile.h
index 2c736e7d6c6160b45597224977ce571987dc8d03..0abef40447b9668b653ea6d03aba44b628d1771d 100644
--- a/deps/lld/include/lld/Core/ArchiveLibraryFile.h
+++ b/deps/lld/include/lld/Core/ArchiveLibraryFile.h
@@ -1,9 +1,8 @@
 //===- Core/ArchiveLibraryFile.h - Models static library ------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/include/lld/Core/Atom.h b/deps/lld/include/lld/Core/Atom.h
index 149c3d5ee2c573472f5269d2a7a401bdb06599a2..4d3d27a2af57ba100eecaff3ca4a0849ce25009f 100644
--- a/deps/lld/include/lld/Core/Atom.h
+++ b/deps/lld/include/lld/Core/Atom.h
@@ -1,9 +1,8 @@
 //===- Core/Atom.h - A node in linking graph --------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/include/lld/Core/DefinedAtom.h b/deps/lld/include/lld/Core/DefinedAtom.h
index ba10b45411f16cca8ca7e362d17c9ef03a238e1e..4b1de7ffec112fa609d97a44aaf7b684ed235d1d 100644
--- a/deps/lld/include/lld/Core/DefinedAtom.h
+++ b/deps/lld/include/lld/Core/DefinedAtom.h
@@ -1,9 +1,8 @@
 //===- Core/DefinedAtom.h - An Atom with content --------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/include/lld/Core/Error.h b/deps/lld/include/lld/Core/Error.h
index 36a36724987a4658c92eda2b39bd30254321c8a1..c18fe96d268c88a1520eb8d57facdc4ac34a226c 100644
--- a/deps/lld/include/lld/Core/Error.h
+++ b/deps/lld/include/lld/Core/Error.h
@@ -1,9 +1,8 @@
 //===- Error.h - system_error extensions for lld ----------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
diff --git a/deps/lld/include/lld/Core/File.h b/deps/lld/include/lld/Core/File.h
index 54f533576a4b319de2904e9d659adf10025d32d3..492f35989f166705551a183c1b05766e2878f6a1 100644
--- a/deps/lld/include/lld/Core/File.h
+++ b/deps/lld/include/lld/Core/File.h
@@ -1,9 +1,8 @@
 //===- Core/File.h - A Container of Atoms ---------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/include/lld/Core/Instrumentation.h b/deps/lld/include/lld/Core/Instrumentation.h
index 939d6455758790b2656fcf4d279104c79ab23a72..602a37aff57cb95ed2923f78c995f65556729c8f 100644
--- a/deps/lld/include/lld/Core/Instrumentation.h
+++ b/deps/lld/include/lld/Core/Instrumentation.h
@@ -1,9 +1,8 @@
 //===- include/Core/Instrumentation.h - Instrumentation API ---------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 ///
diff --git a/deps/lld/include/lld/Core/LinkingContext.h b/deps/lld/include/lld/Core/LinkingContext.h
index 52ab1a2480e8203171e961ea953eea20cb9fb29d..e090ff9902318b253628de9042d4e301328149aa 100644
--- a/deps/lld/include/lld/Core/LinkingContext.h
+++ b/deps/lld/include/lld/Core/LinkingContext.h
@@ -1,9 +1,8 @@
 //===- lld/Core/LinkingContext.h - Linker Target Info Interface -*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/include/lld/Core/Node.h b/deps/lld/include/lld/Core/Node.h
index c30482409e7a414f1cea84f6d5e2b051c44653af..a224793d7824f8fa007b01e5a7f9f1cfb08e81bf 100644
--- a/deps/lld/include/lld/Core/Node.h
+++ b/deps/lld/include/lld/Core/Node.h
@@ -1,9 +1,8 @@
 //===- lld/Core/Node.h - Input file class -----------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 ///
diff --git a/deps/lld/include/lld/Core/Pass.h b/deps/lld/include/lld/Core/Pass.h
index bfe3f9b10e0c398e1079de723b94cf3d7f81bcd4..57d5a40e082a0074885e07c1d1baaacc34a092a7 100644
--- a/deps/lld/include/lld/Core/Pass.h
+++ b/deps/lld/include/lld/Core/Pass.h
@@ -1,9 +1,8 @@
 //===------ Core/Pass.h - Base class for linker passes ----------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/include/lld/Core/PassManager.h b/deps/lld/include/lld/Core/PassManager.h
index f2ef10f406f21bf39b4977a300b78e49fbff579c..02499d09caee3bd864a753538c06b8631c626651 100644
--- a/deps/lld/include/lld/Core/PassManager.h
+++ b/deps/lld/include/lld/Core/PassManager.h
@@ -1,9 +1,8 @@
 //===- lld/Core/PassManager.h - Manage linker passes ----------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/include/lld/Core/Reader.h b/deps/lld/include/lld/Core/Reader.h
index 6cf6282ff39c4922087feea9f528fa277b8616bf..a2d7912d741338ea0cdfa4a4d79afca6b8bf6ad5 100644
--- a/deps/lld/include/lld/Core/Reader.h
+++ b/deps/lld/include/lld/Core/Reader.h
@@ -1,9 +1,8 @@
 //===- lld/Core/Reader.h - Abstract File Format Reading Interface ---------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/include/lld/Core/Reference.h b/deps/lld/include/lld/Core/Reference.h
index 1d3003c84616b7a547ae9c5024573e25c3683d87..191e0f07ec3811bc1db81618b968d889bcf1c332 100644
--- a/deps/lld/include/lld/Core/Reference.h
+++ b/deps/lld/include/lld/Core/Reference.h
@@ -1,9 +1,8 @@
 //===- Core/References.h - A Reference to Another Atom ----------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/include/lld/Core/Resolver.h b/deps/lld/include/lld/Core/Resolver.h
index 5157c9fddc1a2eea4df49cb32afd7d777cdd7cd8..9ab2195094595fa84d2e73ca0577e82a85d20134 100644
--- a/deps/lld/include/lld/Core/Resolver.h
+++ b/deps/lld/include/lld/Core/Resolver.h
@@ -1,9 +1,8 @@
 //===- Core/Resolver.h - Resolves Atom References -------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/include/lld/Core/SharedLibraryAtom.h b/deps/lld/include/lld/Core/SharedLibraryAtom.h
index 7fec7a3e3d291778f9aafaf31b1c955950ad11f1..171d154bc0556be5e0dbc6e9ac7f975d0198b540 100644
--- a/deps/lld/include/lld/Core/SharedLibraryAtom.h
+++ b/deps/lld/include/lld/Core/SharedLibraryAtom.h
@@ -1,9 +1,8 @@
 //===- Core/SharedLibraryAtom.h - A Shared Library Atom -------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/include/lld/Core/SharedLibraryFile.h b/deps/lld/include/lld/Core/SharedLibraryFile.h
index 53bf967b0236d0b15e103e6e195efdacee098cd6..846d1f22f17a06027946c444a101312418026101 100644
--- a/deps/lld/include/lld/Core/SharedLibraryFile.h
+++ b/deps/lld/include/lld/Core/SharedLibraryFile.h
@@ -1,9 +1,8 @@
 //===- Core/SharedLibraryFile.h - Models shared libraries as Atoms --------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/include/lld/Core/Simple.h b/deps/lld/include/lld/Core/Simple.h
index feeed6ae473b560ecbea3749cf1cd6a5e7ba2a4f..f211beb9953f9dbeaa1b9c7d142debe4261549cb 100644
--- a/deps/lld/include/lld/Core/Simple.h
+++ b/deps/lld/include/lld/Core/Simple.h
@@ -1,9 +1,8 @@
 //===- lld/Core/Simple.h - Simple implementations of Atom and File --------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 ///
diff --git a/deps/lld/include/lld/Core/SymbolTable.h b/deps/lld/include/lld/Core/SymbolTable.h
index 156c56eafbf76aa354527c5dce0c567d34aeed98..c7502a45d7c34e621ad46db0110498453063f9f3 100644
--- a/deps/lld/include/lld/Core/SymbolTable.h
+++ b/deps/lld/include/lld/Core/SymbolTable.h
@@ -1,9 +1,8 @@
 //===- Core/SymbolTable.h - Main Symbol Table -----------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/include/lld/Core/UndefinedAtom.h b/deps/lld/include/lld/Core/UndefinedAtom.h
index f45d6ecda6b018e13b1dd4f97f38523026413d5d..a40db36519ecaa51052b7803bf60be645b5c030e 100644
--- a/deps/lld/include/lld/Core/UndefinedAtom.h
+++ b/deps/lld/include/lld/Core/UndefinedAtom.h
@@ -1,9 +1,8 @@
 //===- Core/UndefinedAtom.h - An Undefined Atom ---------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/include/lld/Core/Writer.h b/deps/lld/include/lld/Core/Writer.h
index 1cdfabefebd7ed2553aef86b61d2b7fd9e587733..0de5fca32bce1c68b6bc5264d13b47c748e04c75 100644
--- a/deps/lld/include/lld/Core/Writer.h
+++ b/deps/lld/include/lld/Core/Writer.h
@@ -1,9 +1,8 @@
 //===- lld/Core/Writer.h - Abstract File Format Interface -----------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/include/lld/ReaderWriter/MachOLinkingContext.h b/deps/lld/include/lld/ReaderWriter/MachOLinkingContext.h
index fde65880c3e3968975d1569cebbbd4fc2718c512..f48ad77053e5e1f4ce41f51891738f83f4c946db 100644
--- a/deps/lld/include/lld/ReaderWriter/MachOLinkingContext.h
+++ b/deps/lld/include/lld/ReaderWriter/MachOLinkingContext.h
@@ -1,9 +1,8 @@
 //===- lld/ReaderWriter/MachOLinkingContext.h -----------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/include/lld/ReaderWriter/YamlContext.h b/deps/lld/include/lld/ReaderWriter/YamlContext.h
index b97d21f68e55ba1f255e7047ba3e17f514bbd681..dc133e3627de367f4ac39a212bcf14d514c712e3 100644
--- a/deps/lld/include/lld/ReaderWriter/YamlContext.h
+++ b/deps/lld/include/lld/ReaderWriter/YamlContext.h
@@ -1,9 +1,8 @@
 //===- lld/ReaderWriter/YamlContext.h - object used in YAML I/O context ---===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/Core/DefinedAtom.cpp b/deps/lld/lib/Core/DefinedAtom.cpp
index 177cae7fcbf081df518fc42c52877a8ee64a6f9c..3c1eece16841dd9517105760c7816248f698457d 100644
--- a/deps/lld/lib/Core/DefinedAtom.cpp
+++ b/deps/lld/lib/Core/DefinedAtom.cpp
@@ -1,9 +1,8 @@
 //===- DefinedAtom.cpp ------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/Core/Error.cpp b/deps/lld/lib/Core/Error.cpp
index 6fc76f7ca3d0f7b68830b7a0b6f04e2e37d958c2..f138a81efaab865984e8b4be307a4a7a61e426c5 100644
--- a/deps/lld/lib/Core/Error.cpp
+++ b/deps/lld/lib/Core/Error.cpp
@@ -1,9 +1,8 @@
 //===- Error.cpp - system_error extensions for lld --------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/Core/File.cpp b/deps/lld/lib/Core/File.cpp
index 30ded091a92ad029e5ef84ff965eea02ef97ec9b..ce33923c136eb174058dcf53a47e8626175b5769 100644
--- a/deps/lld/lib/Core/File.cpp
+++ b/deps/lld/lib/Core/File.cpp
@@ -1,9 +1,8 @@
 //===- Core/File.cpp - A Container of Atoms -------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/Core/LinkingContext.cpp b/deps/lld/lib/Core/LinkingContext.cpp
index 0f225c32212270ddd40ae7a32253c9810fa9b661..911ae606678d7bc28152f1ff487088897ff61754 100644
--- a/deps/lld/lib/Core/LinkingContext.cpp
+++ b/deps/lld/lib/Core/LinkingContext.cpp
@@ -1,9 +1,8 @@
 //===- lib/Core/LinkingContext.cpp - Linker Context Object Interface ------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/Core/Reader.cpp b/deps/lld/lib/Core/Reader.cpp
index 5d8bbbbfe4d74e691379e9f2f7019f20019f912f..3592d87ce627c850ec244215bad2e7482900d776 100644
--- a/deps/lld/lib/Core/Reader.cpp
+++ b/deps/lld/lib/Core/Reader.cpp
@@ -1,9 +1,8 @@
 //===- lib/Core/Reader.cpp ------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/Core/Resolver.cpp b/deps/lld/lib/Core/Resolver.cpp
index 9c51c6cdb19c124ded5553c7402d76310e7eebbb..7e6d95f8223f9162084a40c24f63e96e899951e3 100644
--- a/deps/lld/lib/Core/Resolver.cpp
+++ b/deps/lld/lib/Core/Resolver.cpp
@@ -1,9 +1,8 @@
 //===- Core/Resolver.cpp - Resolves Atom References -----------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/Core/SymbolTable.cpp b/deps/lld/lib/Core/SymbolTable.cpp
index 51ae8d17181dd17944b3e8882beb720ca3087ced..55cc27c38a6261bd52ec323a791e89a0626f82ab 100644
--- a/deps/lld/lib/Core/SymbolTable.cpp
+++ b/deps/lld/lib/Core/SymbolTable.cpp
@@ -1,9 +1,8 @@
 //===- Core/SymbolTable.cpp - Main Symbol Table ---------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/Core/Writer.cpp b/deps/lld/lib/Core/Writer.cpp
index 51f95bc5053a4a2b9ded3a0e79e26615228a079c..12788b187e11e7fe5a567af836db40e75047ee04 100644
--- a/deps/lld/lib/Core/Writer.cpp
+++ b/deps/lld/lib/Core/Writer.cpp
@@ -1,9 +1,8 @@
 //===- lib/Core/Writer.cpp ------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/Driver/DarwinLdDriver.cpp b/deps/lld/lib/Driver/DarwinLdDriver.cpp
index bbac230df4536b6c4459bad9daab0c481ca0a969..8646d86c08e4b72dd53ef2a1995e32bc68c5e360 100644
--- a/deps/lld/lib/Driver/DarwinLdDriver.cpp
+++ b/deps/lld/lib/Driver/DarwinLdDriver.cpp
@@ -1,9 +1,8 @@
 //===- lib/Driver/DarwinLdDriver.cpp --------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 ///
@@ -334,8 +333,8 @@ bool parse(llvm::ArrayRef<const char *> args, MachOLinkingContext &ctx) {
          Twine(unknownArg->getAsString(parsedArgs)));
   }
 
-  errorHandler().Verbose = parsedArgs.hasArg(OPT_v);
-  errorHandler().ErrorLimit = args::getInteger(parsedArgs, OPT_error_limit, 20);
+  errorHandler().verbose = parsedArgs.hasArg(OPT_v);
+  errorHandler().errorLimit = args::getInteger(parsedArgs, OPT_error_limit, 20);
 
   // Figure out output kind ( -dylib, -r, -bundle, -preload, or -static )
   llvm::MachO::HeaderFileType fileType = llvm::MachO::MH_EXECUTE;
@@ -638,7 +637,7 @@ bool parse(llvm::ArrayRef<const char *> args, MachOLinkingContext &ctx) {
 
   // Now that we've constructed the final set of search paths, print out those
   // search paths in verbose mode.
-  if (errorHandler().Verbose) {
+  if (errorHandler().verbose) {
     message("Library search paths:");
     for (auto path : ctx.searchDirs()) {
       message("    " + path);
@@ -1146,13 +1145,13 @@ static void createFiles(MachOLinkingContext &ctx, bool Implicit) {
 /// This is where the link is actually performed.
 bool link(llvm::ArrayRef<const char *> args, bool CanExitEarly,
           raw_ostream &Error) {
-  errorHandler().LogName = args::getFilenameWithoutExe(args[0]);
-  errorHandler().ErrorLimitExceededMsg =
+  errorHandler().logName = args::getFilenameWithoutExe(args[0]);
+  errorHandler().errorLimitExceededMsg =
       "too many errors emitted, stopping now (use "
       "'-error-limit 0' to see all errors)";
-  errorHandler().ErrorOS = &Error;
-  errorHandler().ExitEarly = CanExitEarly;
-  errorHandler().ColorDiagnostics = Error.has_colors();
+  errorHandler().errorOS = &Error;
+  errorHandler().exitEarly = CanExitEarly;
+  errorHandler().colorDiagnostics = Error.has_colors();
 
   MachOLinkingContext ctx;
   if (!parse(args, ctx))
@@ -1197,9 +1196,9 @@ bool link(llvm::ArrayRef<const char *> args, bool CanExitEarly,
   if (auto ec = pm.runOnFile(*merged)) {
     // FIXME: This should be passed to logAllUnhandledErrors but it needs
     // to be passed a Twine instead of a string.
-    *errorHandler().ErrorOS << "Failed to run passes on file '"
+    *errorHandler().errorOS << "Failed to run passes on file '"
                             << ctx.outputPath() << "': ";
-    logAllUnhandledErrors(std::move(ec), *errorHandler().ErrorOS,
+    logAllUnhandledErrors(std::move(ec), *errorHandler().errorOS,
                           std::string());
     return false;
   }
@@ -1211,9 +1210,9 @@ bool link(llvm::ArrayRef<const char *> args, bool CanExitEarly,
   if (auto ec = ctx.writeFile(*merged)) {
     // FIXME: This should be passed to logAllUnhandledErrors but it needs
     // to be passed a Twine instead of a string.
-    *errorHandler().ErrorOS << "Failed to write file '" << ctx.outputPath()
+    *errorHandler().errorOS << "Failed to write file '" << ctx.outputPath()
                             << "': ";
-    logAllUnhandledErrors(std::move(ec), *errorHandler().ErrorOS,
+    logAllUnhandledErrors(std::move(ec), *errorHandler().errorOS,
                           std::string());
     return false;
   }
diff --git a/deps/lld/lib/ReaderWriter/FileArchive.cpp b/deps/lld/lib/ReaderWriter/FileArchive.cpp
index 2f52d9d3431291fe4b268585a690ac4adef7ddc0..b09bf34dc47c7d17bf554b8754bbe32eb8509dc9 100644
--- a/deps/lld/lib/ReaderWriter/FileArchive.cpp
+++ b/deps/lld/lib/ReaderWriter/FileArchive.cpp
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/FileArchive.cpp -----------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/ArchHandler.cpp b/deps/lld/lib/ReaderWriter/MachO/ArchHandler.cpp
index cb20907b3e30d6879b1c7685fd5e654f67cca1a0..c101f3b157bba89d183997c58a7baa4703c52d9a 100644
--- a/deps/lld/lib/ReaderWriter/MachO/ArchHandler.cpp
+++ b/deps/lld/lib/ReaderWriter/MachO/ArchHandler.cpp
@@ -1,9 +1,8 @@
 //===- lib/FileFormat/MachO/ArchHandler.cpp -------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/ArchHandler.h b/deps/lld/lib/ReaderWriter/MachO/ArchHandler.h
index 80840b561701c78740034aa791a505b1a788b5af..83646c09b1a8106a0d86395334bf2bbb103a3917 100644
--- a/deps/lld/lib/ReaderWriter/MachO/ArchHandler.h
+++ b/deps/lld/lib/ReaderWriter/MachO/ArchHandler.h
@@ -1,9 +1,8 @@
 //===- lib/FileFormat/MachO/ArchHandler.h ---------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/ArchHandler_arm.cpp b/deps/lld/lib/ReaderWriter/MachO/ArchHandler_arm.cpp
index 2f663c660f5cfd56519134fc38f0647dcf7929b7..06c98ac06fd115524cf6002a8e4998fe9d9bb55b 100644
--- a/deps/lld/lib/ReaderWriter/MachO/ArchHandler_arm.cpp
+++ b/deps/lld/lib/ReaderWriter/MachO/ArchHandler_arm.cpp
@@ -1,9 +1,8 @@
 //===- lib/FileFormat/MachO/ArchHandler_arm.cpp ---------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/ArchHandler_arm64.cpp b/deps/lld/lib/ReaderWriter/MachO/ArchHandler_arm64.cpp
index b9c815c5a32047d7d4c5c43ec2adfcfc75379286..a424edf4985aa494a5ae8529dea38cf19bc2a2ee 100644
--- a/deps/lld/lib/ReaderWriter/MachO/ArchHandler_arm64.cpp
+++ b/deps/lld/lib/ReaderWriter/MachO/ArchHandler_arm64.cpp
@@ -1,9 +1,8 @@
 //===- lib/FileFormat/MachO/ArchHandler_arm64.cpp -------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/ArchHandler_x86.cpp b/deps/lld/lib/ReaderWriter/MachO/ArchHandler_x86.cpp
index a2c68092724de71af832138a9b8f7cfb30cdb516..6ea8e8c42e800dd8791d4cf80b3dcc1dcf1062f7 100644
--- a/deps/lld/lib/ReaderWriter/MachO/ArchHandler_x86.cpp
+++ b/deps/lld/lib/ReaderWriter/MachO/ArchHandler_x86.cpp
@@ -1,9 +1,8 @@
 //===- lib/FileFormat/MachO/ArchHandler_x86.cpp ---------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/ArchHandler_x86_64.cpp b/deps/lld/lib/ReaderWriter/MachO/ArchHandler_x86_64.cpp
index c94ddb7ebf6f56503226ce3ab2e268ad8c9d3d75..316b5bbc6f4fd89a066cec1cb30c78b8c9a4e90d 100644
--- a/deps/lld/lib/ReaderWriter/MachO/ArchHandler_x86_64.cpp
+++ b/deps/lld/lib/ReaderWriter/MachO/ArchHandler_x86_64.cpp
@@ -1,9 +1,8 @@
 //===- lib/FileFormat/MachO/ArchHandler_x86_64.cpp ------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -622,6 +621,7 @@ void ArchHandler_x86_64::applyFixupFinal(
     // Fall into llvm_unreachable().
     break;
   }
+  llvm_unreachable("invalid x86_64 Reference Kind");
 }
 
 void ArchHandler_x86_64::applyFixupRelocatable(const Reference &ref,
diff --git a/deps/lld/lib/ReaderWriter/MachO/Atoms.h b/deps/lld/lib/ReaderWriter/MachO/Atoms.h
index 573efca9f6f98748fe8145ae59d967f2f1f81564..b8bca1959cfb003caabbf34493edf286ca1ef872 100644
--- a/deps/lld/lib/ReaderWriter/MachO/Atoms.h
+++ b/deps/lld/lib/ReaderWriter/MachO/Atoms.h
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/Atoms.h ---------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/CompactUnwindPass.cpp b/deps/lld/lib/ReaderWriter/MachO/CompactUnwindPass.cpp
index fa0aaa103eeb803836a6a9aee1253aa080fbbfb1..de5adb088799eef8e2a50b6552b1df91c3617ed5 100644
--- a/deps/lld/lib/ReaderWriter/MachO/CompactUnwindPass.cpp
+++ b/deps/lld/lib/ReaderWriter/MachO/CompactUnwindPass.cpp
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/CompactUnwindPass.cpp -------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 ///
@@ -388,12 +387,9 @@ private:
 
       // Gather the personality functions now, so that they're in deterministic
       // order (derived from the DefinedAtom order).
-      if (unwindEntry.personalityFunction) {
-        auto pFunc = std::find(personalities.begin(), personalities.end(),
-                               unwindEntry.personalityFunction);
-        if (pFunc == personalities.end())
-          personalities.push_back(unwindEntry.personalityFunction);
-      }
+      if (unwindEntry.personalityFunction &&
+          !llvm::count(personalities, unwindEntry.personalityFunction))
+        personalities.push_back(unwindEntry.personalityFunction);
     }
   }
 
@@ -552,8 +548,7 @@ private:
       }
     }
 
-    auto personality = std::find(personalities.begin(), personalities.end(),
-                                 entry.personalityFunction);
+    auto personality = llvm::find(personalities, entry.personalityFunction);
     uint32_t personalityIdx = personality == personalities.end()
                                   ? 0
                                   : personality - personalities.begin() + 1;
diff --git a/deps/lld/lib/ReaderWriter/MachO/DebugInfo.h b/deps/lld/lib/ReaderWriter/MachO/DebugInfo.h
index 28e41bf4263c6a357bea75f169da30479495bdae..959e10f9a07353136641ca7927b5af8c7b7d4117 100644
--- a/deps/lld/lib/ReaderWriter/MachO/DebugInfo.h
+++ b/deps/lld/lib/ReaderWriter/MachO/DebugInfo.h
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/File.h ----------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/ExecutableAtoms.h b/deps/lld/lib/ReaderWriter/MachO/ExecutableAtoms.h
index ab14e6d8c3e78204ef00456ef3f6d6ecabebcb75..ce94be45702621d09073b7837a24c2d7bdd07ace 100644
--- a/deps/lld/lib/ReaderWriter/MachO/ExecutableAtoms.h
+++ b/deps/lld/lib/ReaderWriter/MachO/ExecutableAtoms.h
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/ExecutableAtoms.h ---------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/File.h b/deps/lld/lib/ReaderWriter/MachO/File.h
index 2bdd6342b47744e579b93190f683e4bafa1a4473..1cc1c4109dce70964f6dc2116e63bb10d083f52e 100644
--- a/deps/lld/lib/ReaderWriter/MachO/File.h
+++ b/deps/lld/lib/ReaderWriter/MachO/File.h
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/File.h ----------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/FlatNamespaceFile.h b/deps/lld/lib/ReaderWriter/MachO/FlatNamespaceFile.h
index 7ccd4f19f834cefaf01435310a0b77d2046f889d..1885effef49fa39c6b0d23cbfb5c16e4cda7f10c 100644
--- a/deps/lld/lib/ReaderWriter/MachO/FlatNamespaceFile.h
+++ b/deps/lld/lib/ReaderWriter/MachO/FlatNamespaceFile.h
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/FlatNamespaceFile.h -------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/GOTPass.cpp b/deps/lld/lib/ReaderWriter/MachO/GOTPass.cpp
index 49e6f88d4aa43fd6f008eb8b34b8a8344af17577..bc66d49eafb94ebdaba244ea317bfb56d7c38189 100644
--- a/deps/lld/lib/ReaderWriter/MachO/GOTPass.cpp
+++ b/deps/lld/lib/ReaderWriter/MachO/GOTPass.cpp
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/GOTPass.cpp -----------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 ///
diff --git a/deps/lld/lib/ReaderWriter/MachO/LayoutPass.cpp b/deps/lld/lib/ReaderWriter/MachO/LayoutPass.cpp
index 9058e4f562e235b720e2011fca98a3e096992b02..2718dfcf743fb182a55bf05eb2600829499ad93b 100644
--- a/deps/lld/lib/ReaderWriter/MachO/LayoutPass.cpp
+++ b/deps/lld/lib/ReaderWriter/MachO/LayoutPass.cpp
@@ -1,9 +1,8 @@
 //===-- ReaderWriter/MachO/LayoutPass.cpp - Layout atoms ------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/LayoutPass.h b/deps/lld/lib/ReaderWriter/MachO/LayoutPass.h
index c18777eded0aae0060f5ce0426bc37ca212f4664..904e16b7fb0e0fbad65e0d13a5afc0fbed17cd58 100644
--- a/deps/lld/lib/ReaderWriter/MachO/LayoutPass.h
+++ b/deps/lld/lib/ReaderWriter/MachO/LayoutPass.h
@@ -1,9 +1,8 @@
 //===------ lib/ReaderWriter/MachO/LayoutPass.h - Handles Layout of atoms -===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp b/deps/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
index 61583963ddd7d1caf67afe5bc34495000bc8720d..38456024c9f80c9eb40a9a31247d656196198506 100644
--- a/deps/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
+++ b/deps/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/MachOLinkingContext.cpp ---------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -768,8 +767,7 @@ void MachOLinkingContext::registerDylib(MachODylibFile *dylib,
                                         bool upward) const {
   std::lock_guard<std::mutex> lock(_dylibsMutex);
 
-  if (std::find(_allDylibs.begin(),
-                _allDylibs.end(), dylib) == _allDylibs.end())
+  if (!llvm::count(_allDylibs, dylib))
     _allDylibs.push_back(dylib);
   _pathToDylibMap[dylib->installName()] = dylib;
   // If path is different than install name, register path too.
@@ -1016,11 +1014,10 @@ static bool isLibrary(const std::unique_ptr<Node> &elem) {
 // new undefines from libraries.
 void MachOLinkingContext::finalizeInputFiles() {
   std::vector<std::unique_ptr<Node>> &elements = getNodes();
-  std::stable_sort(elements.begin(), elements.end(),
-                   [](const std::unique_ptr<Node> &a,
-                      const std::unique_ptr<Node> &b) {
-                     return !isLibrary(a) && isLibrary(b);
-                   });
+  llvm::stable_sort(elements, [](const std::unique_ptr<Node> &a,
+                                 const std::unique_ptr<Node> &b) {
+    return !isLibrary(a) && isLibrary(b);
+  });
   size_t numLibs = std::count_if(elements.begin(), elements.end(), isLibrary);
   elements.push_back(llvm::make_unique<GroupEnd>(numLibs));
 }
diff --git a/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h b/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h
index 7eeb8adbd84f970fe675ae60c543c6be713896ce..3ef2949addab2499ba9b4f86605d1cc797207788 100644
--- a/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h
+++ b/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/MachONormalizedFile.h -----------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -288,7 +287,8 @@ readBinary(std::unique_ptr<MemoryBuffer> &mb,
 /// Takes in-memory normalized view and writes a mach-o object file.
 llvm::Error writeBinary(const NormalizedFile &file, StringRef path);
 
-size_t headerAndLoadCommandsSize(const NormalizedFile &file);
+size_t headerAndLoadCommandsSize(const NormalizedFile &file,
+                                 bool includeFunctionStarts);
 
 
 /// Parses a yaml encoded mach-o file to produce an in-memory normalized view.
diff --git a/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp b/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
index 7c2e833c090f936f5d4e52d36f684272eff713d9..38b365374f3668f738ed617973923e6de474dde7 100644
--- a/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
+++ b/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp ---------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h b/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h
index ee9e174b82e0d51e55604564d16efb185a4fdce9..aeb04ef4508a78e93d41ac978fd6498ab0aa541a 100644
--- a/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h
+++ b/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h ------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp b/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
index 7ef0237e8c36ca6811cedd98c05e242344d9b7c3..da27c7cadf96cee3c0ca88b2f8d72ae23c92073c 100644
--- a/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
+++ b/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp ---------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -109,7 +108,7 @@ private:
 class MachOFileLayout {
 public:
   /// All layout computation is done in the constructor.
-  MachOFileLayout(const NormalizedFile &file);
+  MachOFileLayout(const NormalizedFile &file, bool alwaysIncludeFunctionStarts);
 
   /// Returns the final file size as computed in the constructor.
   size_t      size() const;
@@ -123,7 +122,8 @@ public:
   llvm::Error writeBinary(StringRef path);
 
 private:
-  uint32_t    loadCommandsSize(uint32_t &count);
+  uint32_t    loadCommandsSize(uint32_t &count,
+                               bool alwaysIncludeFunctionStarts);
   void        buildFileOffsets();
   void        writeMachHeader();
   llvm::Error writeLoadCommands();
@@ -232,8 +232,9 @@ private:
   ByteBuffer            _exportTrie;
 };
 
-size_t headerAndLoadCommandsSize(const NormalizedFile &file) {
-  MachOFileLayout layout(file);
+size_t headerAndLoadCommandsSize(const NormalizedFile &file,
+                                 bool includeFunctionStarts) {
+  MachOFileLayout layout(file, includeFunctionStarts);
   return layout.headerAndLoadCommandsSize();
 }
 
@@ -250,7 +251,8 @@ size_t MachOFileLayout::headerAndLoadCommandsSize() const {
   return _endOfLoadCommands;
 }
 
-MachOFileLayout::MachOFileLayout(const NormalizedFile &file)
+MachOFileLayout::MachOFileLayout(const NormalizedFile &file,
+                                 bool alwaysIncludeFunctionStarts)
     : _file(file),
       _is64(MachOLinkingContext::is64Bit(file.arch)),
       _swap(!MachOLinkingContext::isHostEndian(file.arch)),
@@ -271,7 +273,7 @@ MachOFileLayout::MachOFileLayout(const NormalizedFile &file)
       _endOfLoadCommands += sizeof(version_min_command);
       _countOfLoadCommands++;
     }
-    if (!_file.functionStarts.empty()) {
+    if (!_file.functionStarts.empty() || alwaysIncludeFunctionStarts) {
       _endOfLoadCommands += sizeof(linkedit_data_command);
       _countOfLoadCommands++;
     }
@@ -326,7 +328,8 @@ MachOFileLayout::MachOFileLayout(const NormalizedFile &file)
   } else {
     // Final linked images have one load command per segment.
     _endOfLoadCommands = _startOfLoadCommands
-                          + loadCommandsSize(_countOfLoadCommands);
+                          + loadCommandsSize(_countOfLoadCommands,
+                                             alwaysIncludeFunctionStarts);
 
     // Assign section file offsets.
     buildFileOffsets();
@@ -375,7 +378,8 @@ MachOFileLayout::MachOFileLayout(const NormalizedFile &file)
   }
 }
 
-uint32_t MachOFileLayout::loadCommandsSize(uint32_t &count) {
+uint32_t MachOFileLayout::loadCommandsSize(uint32_t &count,
+                                           bool alwaysIncludeFunctionStarts) {
   uint32_t size = 0;
   count = 0;
 
@@ -445,7 +449,7 @@ uint32_t MachOFileLayout::loadCommandsSize(uint32_t &count) {
   }
 
   // Add LC_FUNCTION_STARTS if needed
-  if (!_file.functionStarts.empty()) {
+  if (!_file.functionStarts.empty() || alwaysIncludeFunctionStarts) {
     size += sizeof(linkedit_data_command);
     ++count;
   }
@@ -1007,6 +1011,7 @@ llvm::Error MachOFileLayout::writeLoadCommands() {
       lc += sizeof(linkedit_data_command);
     }
   }
+  assert(lc == &_buffer[_endOfLoadCommands]);
   return llvm::Error::success();
 }
 
@@ -1018,6 +1023,7 @@ void MachOFileLayout::writeSectionContent() {
     if (s.content.empty())
       continue;
     uint32_t offset = _sectInfo[&s].fileOffset;
+    assert(offset >= _endOfLoadCommands);
     uint8_t *p = &_buffer[offset];
     memcpy(p, &s.content[0], s.content.size());
     p += s.content.size();
@@ -1543,7 +1549,7 @@ llvm::Error MachOFileLayout::writeBinary(StringRef path) {
 
 /// Takes in-memory normalized view and writes a mach-o object file.
 llvm::Error writeBinary(const NormalizedFile &file, StringRef path) {
-  MachOFileLayout layout(file);
+  MachOFileLayout layout(file, false);
   return layout.writeBinary(path);
 }
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp b/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
index e93ca86c3164aa811183cd491978996d6fc382a9..1a4603be77c02025bc1f54a09682fb92a21f67f0 100644
--- a/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
+++ b/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp ------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -588,7 +587,8 @@ void Util::layoutSectionsInTextSegment(size_t hlcSize, SegmentInfo *seg,
 
 void Util::assignAddressesToSections(const NormalizedFile &file) {
   // NOTE!: Keep this in sync with organizeSections.
-  size_t hlcSize = headerAndLoadCommandsSize(file);
+  size_t hlcSize = headerAndLoadCommandsSize(file,
+                                      _ctx.generateFunctionStartsLoadCommand());
   uint64_t address = 0;
   for (SegmentInfo *seg : _segmentInfos) {
     if (seg->name.equals("__PAGEZERO")) {
diff --git a/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp b/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
index 473de894894eb3d1715c4aac3b22d759ab513f80..879f07fb4760c9f9580ae1a9b3462fb2a7918aa2 100644
--- a/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
+++ b/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp --------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp b/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp
index 92a646dab5e039f286a9ad4876a73951d4330ce4..7f53faaeaea36974b232b7fa2f56c8620c463dde 100644
--- a/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp
+++ b/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp -----------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/MachOPasses.h b/deps/lld/lib/ReaderWriter/MachO/MachOPasses.h
index cd01d4aa2c932c89f289e837b6dc07ff5e7394d5..93cd3e4df28103ca6b3c31d088a86f98df078cae 100644
--- a/deps/lld/lib/ReaderWriter/MachO/MachOPasses.h
+++ b/deps/lld/lib/ReaderWriter/MachO/MachOPasses.h
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/MachOPasses.h -------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/ObjCPass.cpp b/deps/lld/lib/ReaderWriter/MachO/ObjCPass.cpp
index 23c71e0f5ecd970e2a4139d26d9f3811c36f94e2..df121f0e1d5de215808bd88f7a1e2ff7709acb2b 100644
--- a/deps/lld/lib/ReaderWriter/MachO/ObjCPass.cpp
+++ b/deps/lld/lib/ReaderWriter/MachO/ObjCPass.cpp
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/ObjCPass.cpp -------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
diff --git a/deps/lld/lib/ReaderWriter/MachO/SectCreateFile.h b/deps/lld/lib/ReaderWriter/MachO/SectCreateFile.h
index 49e65f63151df68f9f8dca38e42029ebce66d66f..7bb98e16695c3b1792a9acc7f36f23a885461ae8 100644
--- a/deps/lld/lib/ReaderWriter/MachO/SectCreateFile.h
+++ b/deps/lld/lib/ReaderWriter/MachO/SectCreateFile.h
@@ -1,9 +1,8 @@
 //===---- lib/ReaderWriter/MachO/SectCreateFile.h ---------------*- c++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/MachO/ShimPass.cpp b/deps/lld/lib/ReaderWriter/MachO/ShimPass.cpp
index 8a2d2e910cad87143116d04289ed7b78a4df887a..b0775ad5fc26d565fda4c3706226532051f9e0c4 100644
--- a/deps/lld/lib/ReaderWriter/MachO/ShimPass.cpp
+++ b/deps/lld/lib/ReaderWriter/MachO/ShimPass.cpp
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/ShimPass.cpp -------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
diff --git a/deps/lld/lib/ReaderWriter/MachO/StubsPass.cpp b/deps/lld/lib/ReaderWriter/MachO/StubsPass.cpp
index 04c586df336c765cc5d3895a61cf005f13b43e46..fbbd8b2c7584408376a0554eeaf7f0d2f1c8efdf 100644
--- a/deps/lld/lib/ReaderWriter/MachO/StubsPass.cpp
+++ b/deps/lld/lib/ReaderWriter/MachO/StubsPass.cpp
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/StubsPass.cpp ---------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -271,9 +270,8 @@ public:
     mergedFile.addAtom(*helperCacheNLPAtom);
 
     // Add reference to dyld_stub_binder in libSystem.dylib
-    auto I = std::find_if(
-        mergedFile.sharedLibrary().begin(), mergedFile.sharedLibrary().end(),
-        [&](const SharedLibraryAtom *atom) {
+    auto I = llvm::find_if(
+        mergedFile.sharedLibrary(), [&](const SharedLibraryAtom *atom) {
           return atom->name().equals(_stubInfo.binderSymbolName);
         });
     assert(I != mergedFile.sharedLibrary().end() &&
diff --git a/deps/lld/lib/ReaderWriter/MachO/TLVPass.cpp b/deps/lld/lib/ReaderWriter/MachO/TLVPass.cpp
index e362e507ebf2bf1b84f14b6a40536622751ff4d1..89b655e1f888847d399fc532c2ade3d984cb6c75 100644
--- a/deps/lld/lib/ReaderWriter/MachO/TLVPass.cpp
+++ b/deps/lld/lib/ReaderWriter/MachO/TLVPass.cpp
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/TLVPass.cpp -----------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 ///
diff --git a/deps/lld/lib/ReaderWriter/MachO/WriterMachO.cpp b/deps/lld/lib/ReaderWriter/MachO/WriterMachO.cpp
index c457e7b55a436bdef8a8b717feb5c5dd4043c7b0..60e0e9dd9a81def6c43002282051819ab4ac6c5f 100644
--- a/deps/lld/lib/ReaderWriter/MachO/WriterMachO.cpp
+++ b/deps/lld/lib/ReaderWriter/MachO/WriterMachO.cpp
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/MachO/WriterMachO.cpp -----------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp b/deps/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
index 59548684e67773b676a429bb7ea592866de795f3..5feff2a0514abc70a11035c9a6016d87b07d007a 100644
--- a/deps/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
+++ b/deps/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
@@ -1,9 +1,8 @@
 //===- lib/ReaderWriter/YAML/ReaderWriterYAML.cpp -------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/test/CMakeLists.txt b/deps/lld/test/CMakeLists.txt
index 1b908335c4a14c6d3fe70941ce5aff0c07334900..8be42c46dd8ad46d25bc88ed599764fbd271389d 100644
--- a/deps/lld/test/CMakeLists.txt
+++ b/deps/lld/test/CMakeLists.txt
@@ -14,7 +14,9 @@ if(LLD_BUILT_STANDALONE)
 endif()
 
 llvm_canonicalize_cmake_booleans(
-  HAVE_LIBZ)
+  HAVE_LIBZ
+  LLVM_LIBXML2_ENABLED
+  )
 
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
@@ -32,8 +34,8 @@ configure_lit_site_cfg(
 set(LLD_TEST_DEPS lld)
 if (NOT LLD_BUILT_STANDALONE)
   list(APPEND LLD_TEST_DEPS
-    FileCheck count llc llvm-ar llvm-as llvm-bcanalyzer llvm-config llvm-dis
-    llvm-dwarfdump llvm-lib llvm-mc llvm-nm llvm-objcopy llvm-objdump
+    FileCheck count llc llvm-ar llvm-as llvm-bcanalyzer llvm-config llvm-cvtres
+    llvm-dis llvm-dwarfdump llvm-lib llvm-mc llvm-nm llvm-objcopy llvm-objdump
     llvm-pdbutil llvm-readelf llvm-readobj not obj2yaml opt yaml2obj
     )
 endif()
diff --git a/deps/lld/test/COFF/Inputs/combined-resources-2.rc b/deps/lld/test/COFF/Inputs/combined-resources-2.rc
index 081b3a77bebc10742778e5157a551e4817d3e3c0..82031d0e20839527d4a5350e758a7c03a2a3c040 100644
--- a/deps/lld/test/COFF/Inputs/combined-resources-2.rc
+++ b/deps/lld/test/COFF/Inputs/combined-resources-2.rc
@@ -1,36 +1,36 @@
-#include "windows.h"
-
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-randomdat RCDATA
-{
-	"this is a random bit of data that means nothing\0",
-	0x23a9,
-	0x140e,
-	194292,
-}
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-randomdat RCDATA
-{
-	"zhe4 shi4 yi1ge4 sui2ji1 de shu4ju4, zhe4 yi4wei4zhe shen2me\0",
-	0x23a9,
-	0x140e,
-	194292,
-}
-
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_LUXEMBOURG
-randomdat RCDATA
-{
-	"Dies ist ein zufälliges Bit von Daten, die nichts bedeutet\0",
-	0x23a9,
-	0x140e,
-	194292,
-}
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-myaccelerators ACCELERATORS
-{
-	"^C", 999, VIRTKEY, ALT
-	"D", 1100, VIRTKEY, CONTROL, SHIFT
-	"^R", 444, ASCII, NOINVERT
-}
+#include "windows.h"
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+randomdat RCDATA
+{
+	"this is a random bit of data that means nothing\0",
+	0x23a9,
+	0x140e,
+	194292,
+}
+
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
+randomdat RCDATA
+{
+	"zhe4 shi4 yi1ge4 sui2ji1 de shu4ju4, zhe4 yi4wei4zhe shen2me\0",
+	0x23a9,
+	0x140e,
+	194292,
+}
+
+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_LUXEMBOURG
+randomdat RCDATA
+{
+	"Dies ist ein zufälliges Bit von Daten, die nichts bedeutet\0",
+	0x23a9,
+	0x140e,
+	194292,
+}
+
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
+myaccelerators ACCELERATORS
+{
+	"^C", 999, VIRTKEY, ALT
+	"D", 1100, VIRTKEY, CONTROL, SHIFT
+	"^R", 444, ASCII, NOINVERT
+}
diff --git a/deps/lld/test/COFF/Inputs/crt-dyn-initializer-order_1.yaml b/deps/lld/test/COFF/Inputs/crt-dyn-initializer-order_1.yaml
index 302f6f2feeacfb2d7d93be9e9ea04d2a825f6d65..964714f6af21b83215a6bfc1425a0d67dcc87aae 100644
--- a/deps/lld/test/COFF/Inputs/crt-dyn-initializer-order_1.yaml
+++ b/deps/lld/test/COFF/Inputs/crt-dyn-initializer-order_1.yaml
@@ -1,15 +1,15 @@
---- !COFF
-header:
-  Machine:         IMAGE_FILE_MACHINE_AMD64
-  Characteristics: [  ]
-sections:
-  - Name:            '.CRT$XCU'
-    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
-    Alignment:       1
-    SectionData:     55
-  - Name:            '.CRT$XCU'
-    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
-    Alignment:       1
-    SectionData:     70
-symbols:
-...
+--- !COFF
+header:
+  Machine:         IMAGE_FILE_MACHINE_AMD64
+  Characteristics: [  ]
+sections:
+  - Name:            '.CRT$XCU'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
+    Alignment:       1
+    SectionData:     55
+  - Name:            '.CRT$XCU'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
+    Alignment:       1
+    SectionData:     70
+symbols:
+...
diff --git a/deps/lld/test/COFF/Inputs/crt-dyn-initializer-order_2.yaml b/deps/lld/test/COFF/Inputs/crt-dyn-initializer-order_2.yaml
index a2d0e5e25b1c1d63446b45b3b28e9b3b9ba016da..88d95f2df3834eea1e506ae28c4bb7c56f1e9afa 100644
--- a/deps/lld/test/COFF/Inputs/crt-dyn-initializer-order_2.yaml
+++ b/deps/lld/test/COFF/Inputs/crt-dyn-initializer-order_2.yaml
@@ -1,19 +1,19 @@
---- !COFF
-header:
-  Machine:         IMAGE_FILE_MACHINE_AMD64
-  Characteristics: [  ]
-sections:
-  - Name:            '.CRT$XCU'
-    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
-    Alignment:       1
-    SectionData:     10
-  - Name:            '.CRT$XCU'
-    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
-    Alignment:       1
-    SectionData:     11
-  - Name:            '.CRT$XCU'
-    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
-    Alignment:       1
-    SectionData:     12
-symbols:
-...
+--- !COFF
+header:
+  Machine:         IMAGE_FILE_MACHINE_AMD64
+  Characteristics: [  ]
+sections:
+  - Name:            '.CRT$XCU'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
+    Alignment:       1
+    SectionData:     10
+  - Name:            '.CRT$XCU'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
+    Alignment:       1
+    SectionData:     11
+  - Name:            '.CRT$XCU'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
+    Alignment:       1
+    SectionData:     12
+symbols:
+...
diff --git a/deps/lld/test/COFF/Inputs/delayimporttables-dll1.yaml b/deps/lld/test/COFF/Inputs/delayimporttables-dll1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b154e7e9404e499a21818b7800243a890e8f2297
--- /dev/null
+++ b/deps/lld/test/COFF/Inputs/delayimporttables-dll1.yaml
@@ -0,0 +1,57 @@
+--- !COFF
+header:
+  Machine:         IMAGE_FILE_MACHINE_AMD64
+  Characteristics: [  ]
+sections:
+  - Name:            .drectve
+    Characteristics: [ IMAGE_SCN_LNK_INFO, IMAGE_SCN_LNK_REMOVE ]
+    Alignment:       1
+    SectionData:     2020202F44454641554C544C49423A224C4942434D5422202F44454641554C544C49423A224F4C444E414D455322202F4558504F52543A6F6E65202F4558504F52543A74776F20
+  - Name:            '.text$mn'
+    Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
+    Alignment:       16
+    SectionData:     C20000CCCCCCCCCCCCCCCCCCCCCCCCCCC20000CCCCCCCCCCCCCCCCCCCCCCCCCC4C894424188954241048894C240833C0C3
+symbols:
+  - Name:            .drectve
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          71
+      NumberOfRelocations: 0
+      NumberOfLinenumbers: 0
+      CheckSum:        4081356488
+      Number:          0
+  - Name:            '.text$mn'
+    Value:           0
+    SectionNumber:   2
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          49
+      NumberOfRelocations: 0
+      NumberOfLinenumbers: 0
+      CheckSum:        405845281
+      Number:          0
+  - Name:            one
+    Value:           0
+    SectionNumber:   2
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+  - Name:            two
+    Value:           16
+    SectionNumber:   2
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+  - Name:            DllMain
+    Value:           32
+    SectionNumber:   2
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+...
diff --git a/deps/lld/test/COFF/Inputs/delayimporttables-dll2.yaml b/deps/lld/test/COFF/Inputs/delayimporttables-dll2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7c2d535ca7b43203e374534f4d53c7895493755f
--- /dev/null
+++ b/deps/lld/test/COFF/Inputs/delayimporttables-dll2.yaml
@@ -0,0 +1,57 @@
+--- !COFF
+header:
+  Machine:         IMAGE_FILE_MACHINE_AMD64
+  Characteristics: [  ]
+sections:
+  - Name:            .drectve
+    Characteristics: [ IMAGE_SCN_LNK_INFO, IMAGE_SCN_LNK_REMOVE ]
+    Alignment:       1
+    SectionData:     2020202F44454641554C544C49423A224C4942434D5422202F44454641554C544C49423A224F4C444E414D455322202F4558504F52543A6C656674202F4558504F52543A726967687420
+  - Name:            '.text$mn'
+    Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
+    Alignment:       16
+    SectionData:     C20000CCCCCCCCCCCCCCCCCCCCCCCCCCC20000CCCCCCCCCCCCCCCCCCCCCCCCCC4C894424188954241048894C240833C0C3
+symbols:
+  - Name:            .drectve
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          74
+      NumberOfRelocations: 0
+      NumberOfLinenumbers: 0
+      CheckSum:        127731413
+      Number:          0
+  - Name:            '.text$mn'
+    Value:           0
+    SectionNumber:   2
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          49
+      NumberOfRelocations: 0
+      NumberOfLinenumbers: 0
+      CheckSum:        405845281
+      Number:          0
+  - Name:            left
+    Value:           0
+    SectionNumber:   2
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+  - Name:            right
+    Value:           16
+    SectionNumber:   2
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+  - Name:            DllMain
+    Value:           32
+    SectionNumber:   2
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+...
diff --git a/deps/lld/test/COFF/Inputs/eh_frame_terminator-crtend.s b/deps/lld/test/COFF/Inputs/eh_frame_terminator-crtend.s
new file mode 100644
index 0000000000000000000000000000000000000000..5588975efe55a57b307eb6e532b91a48d51b8496
--- /dev/null
+++ b/deps/lld/test/COFF/Inputs/eh_frame_terminator-crtend.s
@@ -0,0 +1,3 @@
+    .section .eh_frame,"dr"
+__FRAME_END__:
+    .byte 3
diff --git a/deps/lld/test/COFF/Inputs/eh_frame_terminator-otherfunc.s b/deps/lld/test/COFF/Inputs/eh_frame_terminator-otherfunc.s
new file mode 100644
index 0000000000000000000000000000000000000000..049d2da44f877f02fbd453aa6b300155efbb5ecb
--- /dev/null
+++ b/deps/lld/test/COFF/Inputs/eh_frame_terminator-otherfunc.s
@@ -0,0 +1,7 @@
+    .text
+    .globl otherfunc
+otherfunc:
+    ret
+
+    .section .eh_frame,"dr"
+    .byte 2
diff --git a/deps/lld/test/COFF/Inputs/failmismatch1.ll b/deps/lld/test/COFF/Inputs/failmismatch1.ll
new file mode 100644
index 0000000000000000000000000000000000000000..9f14ce7c23c114ed03f7a3eb10d4bdab35957b99
--- /dev/null
+++ b/deps/lld/test/COFF/Inputs/failmismatch1.ll
@@ -0,0 +1,15 @@
+; ModuleID = 'test.cpp'
+
+; Function Attrs: noinline nounwind optnone sspstrong uwtable
+define dso_local i32 @"?f@@YAHXZ"() #0 {
+  ret i32 0
+}
+
+!llvm.linker.options = !{!0}
+!llvm.module.flags = !{!1, !2}
+!llvm.ident = !{!3}
+
+!0 = !{!"/FAILIFMISMATCH:\22TEST=1\22"}
+!1 = !{i32 1, !"wchar_size", i32 2}
+!2 = !{i32 7, !"PIC Level", i32 2}
+!3 = !{!"clang version 7.0.1 (tags/RELEASE_701/final)"}
diff --git a/deps/lld/test/COFF/Inputs/failmismatch2.ll b/deps/lld/test/COFF/Inputs/failmismatch2.ll
new file mode 100644
index 0000000000000000000000000000000000000000..4facbfda2871085ff462e9c60151b112fcfed7b1
--- /dev/null
+++ b/deps/lld/test/COFF/Inputs/failmismatch2.ll
@@ -0,0 +1,20 @@
+; ModuleID = 'test2.cpp'
+
+; Function Attrs: noinline norecurse nounwind optnone sspstrong uwtable
+define dso_local i32 @main() #0 {
+  %1 = alloca i32, align 4
+  store i32 0, i32* %1, align 4
+  %2 = call i32 @"?f@@YAHXZ"()
+  ret i32 %2
+}
+
+declare dso_local i32 @"?f@@YAHXZ"() #1
+
+!llvm.linker.options = !{!0}
+!llvm.module.flags = !{!1, !2}
+!llvm.ident = !{!3}
+
+!0 = !{!"/FAILIFMISMATCH:\22TEST=2\22"}
+!1 = !{i32 1, !"wchar_size", i32 2}
+!2 = !{i32 7, !"PIC Level", i32 2}
+!3 = !{!"clang version 7.0.1 (tags/RELEASE_701/final)"}
diff --git a/deps/lld/test/COFF/Inputs/hello32.yaml b/deps/lld/test/COFF/Inputs/hello32.yaml
index 09e76f144532bda7131c370f51a1e3e7cac43142..c01c4c6ba56bbf986e0073c42e439364de8adb0f 100644
--- a/deps/lld/test/COFF/Inputs/hello32.yaml
+++ b/deps/lld/test/COFF/Inputs/hello32.yaml
@@ -79,4 +79,10 @@ symbols:
     SimpleType:      IMAGE_SYM_TYPE_NULL
     ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
     StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+  - Name:            '@feat.00'
+    Value:           1
+    SectionNumber:   -1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
 ...
diff --git a/deps/lld/test/COFF/Inputs/id.res b/deps/lld/test/COFF/Inputs/id.res
new file mode 100644
index 0000000000000000000000000000000000000000..1d58013a91cc3c671301cef10a5696dcea965369
Binary files /dev/null and b/deps/lld/test/COFF/Inputs/id.res differ
diff --git a/deps/lld/test/COFF/Inputs/id.res.o b/deps/lld/test/COFF/Inputs/id.res.o
new file mode 100644
index 0000000000000000000000000000000000000000..8db1cc045b2ab76159a1b5061db0d183e207cee5
Binary files /dev/null and b/deps/lld/test/COFF/Inputs/id.res.o differ
diff --git a/deps/lld/test/COFF/Inputs/no-ipi-stream-obj.obj.yaml b/deps/lld/test/COFF/Inputs/no-ipi-stream-obj.obj.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b244b50968878ea9c6abcf9ce826447ae73dea43
--- /dev/null
+++ b/deps/lld/test/COFF/Inputs/no-ipi-stream-obj.obj.yaml
@@ -0,0 +1,13 @@
+--- !COFF
+header:          
+  Machine:         IMAGE_FILE_MACHINE_I386
+sections:        
+  - Name:            '.debug$T'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
+    Types:           
+      - Kind:            LF_TYPESERVER2
+        TypeServer2:     
+          Guid:            '{01234567-0123-0123-0123-0123456789AB}'
+          Age:             1
+          Name:            'no-ipi-stream-pdb.pdb'
+symbols:         
diff --git a/deps/lld/test/COFF/Inputs/no-ipi-stream-pdb.pdb.yaml b/deps/lld/test/COFF/Inputs/no-ipi-stream-pdb.pdb.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f3ac6931964af24da95c610c555ac565a848e5f9
--- /dev/null
+++ b/deps/lld/test/COFF/Inputs/no-ipi-stream-pdb.pdb.yaml
@@ -0,0 +1,2 @@
+PdbStream:       
+  Guid:            '{01234567-0123-0123-0123-0123456789AB}'
diff --git a/deps/lld/test/COFF/Inputs/pdb-diff.cpp b/deps/lld/test/COFF/Inputs/pdb-diff.cpp
index 7c5d13795f4ed2451fbd19e7e71564828a953afa..f9acd68d1199148630ad0d4f56a588fdc7701c19 100644
--- a/deps/lld/test/COFF/Inputs/pdb-diff.cpp
+++ b/deps/lld/test/COFF/Inputs/pdb-diff.cpp
@@ -1,10 +1,10 @@
-// Build with cl:
-//    cl.exe /Z7 pdb-diff.cpp /link /debug /pdb:pdb-diff-cl.pdb
-//           /nodefaultlib /entry:main
-// Build with lld (after running the above cl command):
-//    lld-link.exe /debug /pdb:pdb-diff-lld.pdb /nodefaultlib
-//                 /entry:main pdb-diff.obj
-
-void *__purecall = 0;
-
-int main() { return 42; }
+// Build with cl:
+//    cl.exe /Z7 pdb-diff.cpp /link /debug /pdb:pdb-diff-cl.pdb
+//           /nodefaultlib /entry:main
+// Build with lld (after running the above cl command):
+//    lld-link.exe /debug /pdb:pdb-diff-lld.pdb /nodefaultlib
+//                 /entry:main pdb-diff.obj
+
+void *__purecall = 0;
+
+int main() { return 42; }
diff --git a/deps/lld/test/COFF/Inputs/pdb-file-statics-a.yaml b/deps/lld/test/COFF/Inputs/pdb-file-statics-a.yaml
index 1a0dbdb678553c16fa1c72aaa5279a8ca81362ce..27e2ee160724bf66250863588cb6eda270e58b68 100644
--- a/deps/lld/test/COFF/Inputs/pdb-file-statics-a.yaml
+++ b/deps/lld/test/COFF/Inputs/pdb-file-statics-a.yaml
@@ -1280,6 +1280,7 @@ sections:
     Characteristics: [ IMAGE_SCN_CNT_UNINITIALIZED_DATA, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
     Alignment:       4
     SectionData:     ''
+    SizeOfRawData:   4
   - Name:            '.text$mn'
     Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_LNK_COMDAT, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
     Alignment:       4
diff --git a/deps/lld/test/COFF/Inputs/pdb-file-statics-b.yaml b/deps/lld/test/COFF/Inputs/pdb-file-statics-b.yaml
index f74bab703477a2297fe147308b6f80a16aa56473..b937088480562b5ce61278ed42f05b6eb97a08af 100644
--- a/deps/lld/test/COFF/Inputs/pdb-file-statics-b.yaml
+++ b/deps/lld/test/COFF/Inputs/pdb-file-statics-b.yaml
@@ -1255,6 +1255,7 @@ sections:
     Characteristics: [ IMAGE_SCN_CNT_UNINITIALIZED_DATA, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
     Alignment:       4
     SectionData:     ''
+    SizeOfRawData:   4
   - Name:            '.text$mn'
     Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_LNK_COMDAT, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
     Alignment:       4
diff --git a/deps/lld/test/COFF/Inputs/pdb-global-constants-a.s b/deps/lld/test/COFF/Inputs/pdb-global-constants-a.s
new file mode 100644
index 0000000000000000000000000000000000000000..7b1d34cc078c100c665b536f9d3f2acb01a31759
--- /dev/null
+++ b/deps/lld/test/COFF/Inputs/pdb-global-constants-a.s
@@ -0,0 +1,214 @@
+	.text
+	.def	 @feat.00;
+	.scl	3;
+	.type	0;
+	.endef
+	.globl	@feat.00
+.set @feat.00, 0
+	.file	"t.cpp"
+	.def	 main;
+	.scl	2;
+	.type	32;
+	.endef
+	.globl	main                    # -- Begin function main
+	.p2align	4, 0x90
+main:                                   # @main
+.Lfunc_begin0:
+	.cv_func_id 0
+	.cv_file	1 "C:\\src\\testing\\t.cpp" "D28AB0CC784E17E5DF9BBB49CB629C81" 1
+	.cv_loc	0 1 4 0                 # t.cpp:4:0
+.seh_proc main
+# %bb.0:                                # %entry
+	pushq	%rax
+	.seh_stackalloc 8
+	.seh_endprologue
+	movl	$0, 4(%rsp)
+.Ltmp0:
+	movl	$83, %eax
+	popq	%rcx
+	retq
+.Ltmp1:
+.Lfunc_end0:
+	.seh_handlerdata
+	.text
+	.seh_endproc
+                                        # -- End function
+	.section	.debug$S,"dr"
+	.p2align	2
+	.long	4                       # Debug section magic
+	.long	241
+	.long	.Ltmp3-.Ltmp2           # Subsection size
+.Ltmp2:
+	.short	.Ltmp5-.Ltmp4           # Record length
+.Ltmp4:
+	.short	4412                    # Record kind: S_COMPILE3
+	.long	1                       # Flags and language
+	.short	208                     # CPUType
+	.short	9                       # Frontend version
+	.short	0
+	.short	0
+	.short	0
+	.short	9000                    # Backend version
+	.short	0
+	.short	0
+	.short	0
+	.asciz	"clang version 9.0.0 (https://github.com/llvm/llvm-project.git ad522e17b285b1f2667163d52da5abf0968ec650)" # Null-terminated compiler version string
+	.p2align	2
+.Ltmp5:
+.Ltmp3:
+	.p2align	2
+	.long	241                     # Symbol subsection for main
+	.long	.Ltmp7-.Ltmp6           # Subsection size
+.Ltmp6:
+	.short	.Ltmp9-.Ltmp8           # Record length
+.Ltmp8:
+	.short	4423                    # Record kind: S_GPROC32_ID
+	.long	0                       # PtrParent
+	.long	0                       # PtrEnd
+	.long	0                       # PtrNext
+	.long	.Lfunc_end0-main        # Code size
+	.long	0                       # Offset after prologue
+	.long	0                       # Offset before epilogue
+	.long	4098                    # Function type index
+	.secrel32	main            # Function section relative address
+	.secidx	main                    # Function section index
+	.byte	0                       # Flags
+	.asciz	"main"                  # Function name
+	.p2align	2
+.Ltmp9:
+	.short	.Ltmp11-.Ltmp10         # Record length
+.Ltmp10:
+	.short	4114                    # Record kind: S_FRAMEPROC
+	.long	8                       # FrameSize
+	.long	0                       # Padding
+	.long	0                       # Offset of padding
+	.long	0                       # Bytes of callee saved registers
+	.long	0                       # Exception handler offset
+	.short	0                       # Exception handler section
+	.long	81920                   # Flags (defines frame register)
+	.p2align	2
+.Ltmp11:
+	.short	2                       # Record length
+	.short	4431                    # Record kind: S_PROC_ID_END
+.Ltmp7:
+	.p2align	2
+	.cv_linetable	0, main, .Lfunc_end0
+	.long	241                     # Symbol subsection for globals
+	.long	.Ltmp13-.Ltmp12         # Subsection size
+.Ltmp12:
+	.short	.Ltmp15-.Ltmp14         # Record length
+.Ltmp14:
+	.short	4359                    # Record kind: S_CONSTANT
+	.long	4099                    # Type
+	.byte	0x29, 0x00              # Value
+	.asciz	"Foo"                   # Name
+	.p2align	2
+.Ltmp15:
+	.short	.Ltmp17-.Ltmp16         # Record length
+.Ltmp16:
+	.short	4359                    # Record kind: S_CONSTANT
+	.long	4099                    # Type
+	.byte	0x2a, 0x00              # Value
+	.asciz	"Bar"                   # Name
+	.p2align	2
+.Ltmp17:
+.Ltmp13:
+	.p2align	2
+	.cv_filechecksums               # File index to string table offset subsection
+	.cv_stringtable                 # String table
+	.long	241
+	.long	.Ltmp19-.Ltmp18         # Subsection size
+.Ltmp18:
+	.short	.Ltmp21-.Ltmp20         # Record length
+.Ltmp20:
+	.short	4428                    # Record kind: S_BUILDINFO
+	.long	4102                    # LF_BUILDINFO index
+	.p2align	2
+.Ltmp21:
+.Ltmp19:
+	.p2align	2
+	.section	.debug$T,"dr"
+	.p2align	2
+	.long	4                       # Debug section magic
+	# ArgList (0x1000) {
+	#   TypeLeafKind: LF_ARGLIST (0x1201)
+	#   NumArgs: 0
+	#   Arguments [
+	#   ]
+	# }
+	.byte	0x06, 0x00, 0x01, 0x12
+	.byte	0x00, 0x00, 0x00, 0x00
+	# Procedure (0x1001) {
+	#   TypeLeafKind: LF_PROCEDURE (0x1008)
+	#   ReturnType: int (0x74)
+	#   CallingConvention: NearC (0x0)
+	#   FunctionOptions [ (0x0)
+	#   ]
+	#   NumParameters: 0
+	#   ArgListType: () (0x1000)
+	# }
+	.byte	0x0e, 0x00, 0x08, 0x10
+	.byte	0x74, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x10, 0x00, 0x00
+	# FuncId (0x1002) {
+	#   TypeLeafKind: LF_FUNC_ID (0x1601)
+	#   ParentScope: 0x0
+	#   FunctionType: int () (0x1001)
+	#   Name: main
+	# }
+	.byte	0x12, 0x00, 0x01, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x01, 0x10, 0x00, 0x00
+	.byte	0x6d, 0x61, 0x69, 0x6e
+	.byte	0x00, 0xf3, 0xf2, 0xf1
+	# Modifier (0x1003) {
+	#   TypeLeafKind: LF_MODIFIER (0x1001)
+	#   ModifiedType: int (0x74)
+	#   Modifiers [ (0x1)
+	#     Const (0x1)
+	#   ]
+	# }
+	.byte	0x0a, 0x00, 0x01, 0x10
+	.byte	0x74, 0x00, 0x00, 0x00
+	.byte	0x01, 0x00, 0xf2, 0xf1
+	# StringId (0x1004) {
+	#   TypeLeafKind: LF_STRING_ID (0x1605)
+	#   Id: 0x0
+	#   StringData: C:\src\testing
+	# }
+	.byte	0x16, 0x00, 0x05, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x43, 0x3a, 0x5c, 0x73
+	.byte	0x72, 0x63, 0x5c, 0x74
+	.byte	0x65, 0x73, 0x74, 0x69
+	.byte	0x6e, 0x67, 0x00, 0xf1
+	# StringId (0x1005) {
+	#   TypeLeafKind: LF_STRING_ID (0x1605)
+	#   Id: 0x0
+	#   StringData: t.cpp
+	# }
+	.byte	0x0e, 0x00, 0x05, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x74, 0x2e, 0x63, 0x70
+	.byte	0x70, 0x00, 0xf2, 0xf1
+	# BuildInfo (0x1006) {
+	#   TypeLeafKind: LF_BUILDINFO (0x1603)
+	#   NumArgs: 5
+	#   Arguments [
+	#     ArgType: C:\src\testing (0x1004)
+	#     ArgType: 0x0
+	#     ArgType: t.cpp (0x1005)
+	#     ArgType: 0x0
+	#     ArgType: 0x0
+	#   ]
+	# }
+	.byte	0x1a, 0x00, 0x03, 0x16
+	.byte	0x05, 0x00, 0x04, 0x10
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x05, 0x10
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0xf2, 0xf1
+
+	.addrsig
diff --git a/deps/lld/test/COFF/Inputs/pdb-global-constants-b.s b/deps/lld/test/COFF/Inputs/pdb-global-constants-b.s
new file mode 100644
index 0000000000000000000000000000000000000000..1d987a5d127e8aa1ee9aee9d7ae489d1b6691b51
--- /dev/null
+++ b/deps/lld/test/COFF/Inputs/pdb-global-constants-b.s
@@ -0,0 +1,204 @@
+	.text
+	.def	 @feat.00;
+	.scl	3;
+	.type	0;
+	.endef
+	.globl	@feat.00
+.set @feat.00, 0
+	.file	"t2.cpp"
+	.def	 "?foobar@@YAHXZ";
+	.scl	2;
+	.type	32;
+	.endef
+	.globl	"?foobar@@YAHXZ"        # -- Begin function ?foobar@@YAHXZ
+	.p2align	4, 0x90
+"?foobar@@YAHXZ":                       # @"?foobar@@YAHXZ"
+.Lfunc_begin0:
+	.cv_func_id 0
+# %bb.0:                                # %entry
+	.cv_file	1 "C:\\src\\testing\\t2.cpp" "C9D7AF07363FDE8EC16D73EC30039C5B" 1
+	.cv_loc	0 1 5 0                 # t2.cpp:5:0
+	movl	$84, %eax
+	retq
+.Ltmp0:
+.Lfunc_end0:
+                                        # -- End function
+	.section	.debug$S,"dr"
+	.p2align	2
+	.long	4                       # Debug section magic
+	.long	241
+	.long	.Ltmp2-.Ltmp1           # Subsection size
+.Ltmp1:
+	.short	.Ltmp4-.Ltmp3           # Record length
+.Ltmp3:
+	.short	4412                    # Record kind: S_COMPILE3
+	.long	1                       # Flags and language
+	.short	208                     # CPUType
+	.short	9                       # Frontend version
+	.short	0
+	.short	0
+	.short	0
+	.short	9000                    # Backend version
+	.short	0
+	.short	0
+	.short	0
+	.asciz	"clang version 9.0.0 (https://github.com/llvm/llvm-project.git ad522e17b285b1f2667163d52da5abf0968ec650)" # Null-terminated compiler version string
+	.p2align	2
+.Ltmp4:
+.Ltmp2:
+	.p2align	2
+	.long	241                     # Symbol subsection for foobar
+	.long	.Ltmp6-.Ltmp5           # Subsection size
+.Ltmp5:
+	.short	.Ltmp8-.Ltmp7           # Record length
+.Ltmp7:
+	.short	4423                    # Record kind: S_GPROC32_ID
+	.long	0                       # PtrParent
+	.long	0                       # PtrEnd
+	.long	0                       # PtrNext
+	.long	.Lfunc_end0-"?foobar@@YAHXZ" # Code size
+	.long	0                       # Offset after prologue
+	.long	0                       # Offset before epilogue
+	.long	4098                    # Function type index
+	.secrel32	"?foobar@@YAHXZ" # Function section relative address
+	.secidx	"?foobar@@YAHXZ"        # Function section index
+	.byte	0                       # Flags
+	.asciz	"foobar"                # Function name
+	.p2align	2
+.Ltmp8:
+	.short	.Ltmp10-.Ltmp9          # Record length
+.Ltmp9:
+	.short	4114                    # Record kind: S_FRAMEPROC
+	.long	0                       # FrameSize
+	.long	0                       # Padding
+	.long	0                       # Offset of padding
+	.long	0                       # Bytes of callee saved registers
+	.long	0                       # Exception handler offset
+	.short	0                       # Exception handler section
+	.long	0                       # Flags (defines frame register)
+	.p2align	2
+.Ltmp10:
+	.short	2                       # Record length
+	.short	4431                    # Record kind: S_PROC_ID_END
+.Ltmp6:
+	.p2align	2
+	.cv_linetable	0, "?foobar@@YAHXZ", .Lfunc_end0
+	.long	241                     # Symbol subsection for globals
+	.long	.Ltmp12-.Ltmp11         # Subsection size
+.Ltmp11:
+	.short	.Ltmp14-.Ltmp13         # Record length
+.Ltmp13:
+	.short	4359                    # Record kind: S_CONSTANT
+	.long	4099                    # Type
+	.byte	0x2a, 0x00              # Value
+	.asciz	"Foo"                   # Name
+	.p2align	2
+.Ltmp14:
+	.short	.Ltmp16-.Ltmp15         # Record length
+.Ltmp15:
+	.short	4359                    # Record kind: S_CONSTANT
+	.long	4099                    # Type
+	.byte	0x2a, 0x00              # Value
+	.asciz	"Bar"                   # Name
+	.p2align	2
+.Ltmp16:
+.Ltmp12:
+	.p2align	2
+	.cv_filechecksums               # File index to string table offset subsection
+	.cv_stringtable                 # String table
+	.long	241
+	.long	.Ltmp18-.Ltmp17         # Subsection size
+.Ltmp17:
+	.short	.Ltmp20-.Ltmp19         # Record length
+.Ltmp19:
+	.short	4428                    # Record kind: S_BUILDINFO
+	.long	4102                    # LF_BUILDINFO index
+	.p2align	2
+.Ltmp20:
+.Ltmp18:
+	.p2align	2
+	.section	.debug$T,"dr"
+	.p2align	2
+	.long	4                       # Debug section magic
+	# ArgList (0x1000) {
+	#   TypeLeafKind: LF_ARGLIST (0x1201)
+	#   NumArgs: 0
+	#   Arguments [
+	#   ]
+	# }
+	.byte	0x06, 0x00, 0x01, 0x12
+	.byte	0x00, 0x00, 0x00, 0x00
+	# Procedure (0x1001) {
+	#   TypeLeafKind: LF_PROCEDURE (0x1008)
+	#   ReturnType: int (0x74)
+	#   CallingConvention: NearC (0x0)
+	#   FunctionOptions [ (0x0)
+	#   ]
+	#   NumParameters: 0
+	#   ArgListType: () (0x1000)
+	# }
+	.byte	0x0e, 0x00, 0x08, 0x10
+	.byte	0x74, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x10, 0x00, 0x00
+	# FuncId (0x1002) {
+	#   TypeLeafKind: LF_FUNC_ID (0x1601)
+	#   ParentScope: 0x0
+	#   FunctionType: int () (0x1001)
+	#   Name: foobar
+	# }
+	.byte	0x12, 0x00, 0x01, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x01, 0x10, 0x00, 0x00
+	.byte	0x66, 0x6f, 0x6f, 0x62
+	.byte	0x61, 0x72, 0x00, 0xf1
+	# Modifier (0x1003) {
+	#   TypeLeafKind: LF_MODIFIER (0x1001)
+	#   ModifiedType: int (0x74)
+	#   Modifiers [ (0x1)
+	#     Const (0x1)
+	#   ]
+	# }
+	.byte	0x0a, 0x00, 0x01, 0x10
+	.byte	0x74, 0x00, 0x00, 0x00
+	.byte	0x01, 0x00, 0xf2, 0xf1
+	# StringId (0x1004) {
+	#   TypeLeafKind: LF_STRING_ID (0x1605)
+	#   Id: 0x0
+	#   StringData: C:\src\testing
+	# }
+	.byte	0x16, 0x00, 0x05, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x43, 0x3a, 0x5c, 0x73
+	.byte	0x72, 0x63, 0x5c, 0x74
+	.byte	0x65, 0x73, 0x74, 0x69
+	.byte	0x6e, 0x67, 0x00, 0xf1
+	# StringId (0x1005) {
+	#   TypeLeafKind: LF_STRING_ID (0x1605)
+	#   Id: 0x0
+	#   StringData: t2.cpp
+	# }
+	.byte	0x0e, 0x00, 0x05, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x74, 0x32, 0x2e, 0x63
+	.byte	0x70, 0x70, 0x00, 0xf1
+	# BuildInfo (0x1006) {
+	#   TypeLeafKind: LF_BUILDINFO (0x1603)
+	#   NumArgs: 5
+	#   Arguments [
+	#     ArgType: C:\src\testing (0x1004)
+	#     ArgType: 0x0
+	#     ArgType: t2.cpp (0x1005)
+	#     ArgType: 0x0
+	#     ArgType: 0x0
+	#   ]
+	# }
+	.byte	0x1a, 0x00, 0x03, 0x16
+	.byte	0x05, 0x00, 0x04, 0x10
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x05, 0x10
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0xf2, 0xf1
+
+	.addrsig
diff --git a/deps/lld/test/COFF/Inputs/pdb-globals.yaml b/deps/lld/test/COFF/Inputs/pdb-globals.yaml
index 669522d7811fb744cdcf9289e9a8aaa5879e3013..34e57b3e020ab765727a51a950a1e51c893d9a62 100644
--- a/deps/lld/test/COFF/Inputs/pdb-globals.yaml
+++ b/deps/lld/test/COFF/Inputs/pdb-globals.yaml
@@ -70,6 +70,7 @@ sections:
     Characteristics: [ IMAGE_SCN_CNT_UNINITIALIZED_DATA, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
     Alignment:       4
     SectionData:     ''
+    SizeOfRawData:   4
   - Name:            .text
     Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_LNK_COMDAT, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
     Alignment:       16
@@ -263,7 +264,6 @@ sections:
   - Name:            '.debug$T'
     Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
     Alignment:       4
-    SectionData:     0400000006000112000000000E000810740000000000000000100000160001160000000001100000476C6F62616C46756E6300F10A000210700400000A8000000E0001120200000074000000031000000E0008107400000000000200041000001200011600000000051000006D61696E00F3F2F13200051500008002000000000000000000000000000048656C6C6F506F696E74002E3F415548656C6C6F506F696E74404000F2F1260003120D15030074000000000058000D15030074000000040059000D1503007400000008005A0032000515030000020810000000000000000000000C0048656C6C6F506F696E74002E3F415548656C6C6F506F696E74404000F2F13E00051600000000643A5C7372635C6C6C766D2D6D6F6E6F5C6C6C645C746573745C636F66665C696E707574735C7064622D676C6F62616C732E63707000F2F10E000616091000000A100000060000000A000210071000000A8000001A00091003000000071000000C1000000B000000001000000000000016000216071000000D10000048656C6C6F506F696E7400F11600011600000000011000004C6F63616C46756E6300F2F10A000110740000000100F2F10A000210101000000A800000
     Types:
       - Kind:            LF_ARGLIST
         ArgList:
diff --git a/deps/lld/test/COFF/Inputs/pdb-type-server-invalid-path.yaml b/deps/lld/test/COFF/Inputs/pdb-type-server-invalid-path.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9e485ffcecee831c720b35aa1157a692af73b1c2
--- /dev/null
+++ b/deps/lld/test/COFF/Inputs/pdb-type-server-invalid-path.yaml
@@ -0,0 +1,121 @@
+--- !COFF
+header:
+  Machine:         IMAGE_FILE_MACHINE_AMD64
+  Characteristics: [  ]
+sections:
+  - Name:            '.debug$S'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
+    Alignment:       1
+    Subsections:
+      - !Symbols
+        Records:
+          - Kind:            S_GPROC32_ID
+            ProcSym:
+              CodeSize:        3
+              DbgStart:        0
+              DbgEnd:          2
+              FunctionType:    4199
+              Flags:           [  ]
+              DisplayName:     main
+          - Kind:            S_FRAMEPROC
+            FrameProcSym:
+              TotalFrameBytes: 0
+              PaddingFrameBytes: 0
+              OffsetToPadding: 0
+              BytesOfCalleeSavedRegisters: 0
+              OffsetOfExceptionHandler: 0
+              SectionIdOfExceptionHandler: 0
+              Flags:           [ AsynchronousExceptionHandling, OptimizedForSpeed ]
+          - Kind:            S_PROC_ID_END
+            ScopeEndSym:
+      - !Lines
+        CodeSize:        3
+        Flags:           [  ]
+        RelocOffset:     0
+        RelocSegment:    0
+        Blocks:
+          - FileName:        'c:\src\llvm-project\build\t.c'
+            Lines:
+              - Offset:          0
+                LineStart:       1
+                IsStatement:     true
+                EndDelta:        0
+            Columns:
+      - !FileChecksums
+        Checksums:
+          - FileName:        'c:\src\llvm-project\build\t.c'
+            Kind:            MD5
+            Checksum:        270A878DCC1B845655B162F56C4F5020
+      - !StringTable
+        Strings:
+          - 'c:\src\llvm-project\build\t.c'
+    Relocations:
+      - VirtualAddress:  44
+        SymbolName:      main
+        Type:            IMAGE_REL_AMD64_SECREL
+      - VirtualAddress:  48
+        SymbolName:      main
+        Type:            IMAGE_REL_AMD64_SECTION
+      - VirtualAddress:  100
+        SymbolName:      main
+        Type:            IMAGE_REL_AMD64_SECREL
+      - VirtualAddress:  104
+        SymbolName:      main
+        Type:            IMAGE_REL_AMD64_SECTION
+  - Name:            '.debug$T'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
+    Alignment:       1
+    Types:
+      - Kind:            LF_TYPESERVER2
+        TypeServer2:
+          Guid:            '{8DABD2A0-28FF-CB43-9BAF-175B77B76414}'
+          Age:             1
+          Name:            'c:\some_invalid_path_AABB98765\pdb-diff-cl.pdb'
+  - Name:            '.text$mn'
+    Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
+    Alignment:       16
+    SectionData:     33C0C3
+symbols:
+  - Name:            '.debug$S'
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          328
+      NumberOfRelocations: 4
+      NumberOfLinenumbers: 0
+      CheckSum:        0
+      Number:          0
+  - Name:            '.debug$T'
+    Value:           0
+    SectionNumber:   2
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          564
+      NumberOfRelocations: 0
+      NumberOfLinenumbers: 0
+      CheckSum:        0
+      Number:          0
+  - Name:            '.text$mn'
+    Value:           0
+    SectionNumber:   3
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          3
+      NumberOfRelocations: 0
+      NumberOfLinenumbers: 0
+      CheckSum:        4021952397
+      Number:          0
+  - Name:            main
+    Value:           0
+    SectionNumber:   3
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+...
diff --git a/deps/lld/test/COFF/Inputs/pdb_comdat_bar.yaml b/deps/lld/test/COFF/Inputs/pdb_comdat_bar.yaml
index 796e71379c47534495644df8a59338f694136929..8758a566181b5bf778755f063b52fbe24a2c28bc 100644
--- a/deps/lld/test/COFF/Inputs/pdb_comdat_bar.yaml
+++ b/deps/lld/test/COFF/Inputs/pdb_comdat_bar.yaml
@@ -190,6 +190,7 @@ sections:
     Characteristics: [ IMAGE_SCN_CNT_UNINITIALIZED_DATA, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
     Alignment:       4
     SectionData:     ''
+    SizeOfRawData:   4
   - Name:            '.text$mn'
     Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
     Alignment:       16
diff --git a/deps/lld/test/COFF/Inputs/thinlto-empty.ll b/deps/lld/test/COFF/Inputs/thinlto-empty.ll
new file mode 100644
index 0000000000000000000000000000000000000000..b3c546a434eb44bc5174037edb98be4007cbc2c0
--- /dev/null
+++ b/deps/lld/test/COFF/Inputs/thinlto-empty.ll
@@ -0,0 +1,2 @@
+target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-pc-windows-msvc19.0.24215"
diff --git a/deps/lld/test/COFF/Inputs/thinlto.ll b/deps/lld/test/COFF/Inputs/thinlto.ll
new file mode 100644
index 0000000000000000000000000000000000000000..44ff9a0f1f1d8b7ab78cd13075d7704c10779aae
--- /dev/null
+++ b/deps/lld/test/COFF/Inputs/thinlto.ll
@@ -0,0 +1,6 @@
+target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-pc-windows-msvc19.0.24215"
+
+define void @g() {
+  ret void
+}
diff --git a/deps/lld/test/COFF/Inputs/tlssup.s b/deps/lld/test/COFF/Inputs/tlssup.s
new file mode 100644
index 0000000000000000000000000000000000000000..ca61c9dda3e9206b89afe741e49b16b184b661b0
--- /dev/null
+++ b/deps/lld/test/COFF/Inputs/tlssup.s
@@ -0,0 +1,10 @@
+    .section    .tls,"dw"
+    .byte       0xaa
+
+    .section    .tls$ZZZ,"dw"
+    .byte       0xff
+
+    .globl      _tls_index
+    .data
+_tls_index:
+    .int        0
diff --git a/deps/lld/test/COFF/Inputs/undefined-symbol-lto-a.ll b/deps/lld/test/COFF/Inputs/undefined-symbol-lto-a.ll
new file mode 100644
index 0000000000000000000000000000000000000000..6793ec718e806da23d0bb938de6206e8579c864b
--- /dev/null
+++ b/deps/lld/test/COFF/Inputs/undefined-symbol-lto-a.ll
@@ -0,0 +1,82 @@
+; ModuleID = 't.obj'
+source_filename = "t.cpp"
+target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-pc-windows-msvc19.21.27702"
+
+%struct.Init = type { %struct.S }
+%struct.S = type { i32 (...)** }
+%rtti.CompleteObjectLocator = type { i32, i32, i32, i32, i32, i32 }
+%rtti.TypeDescriptor7 = type { i8**, i8*, [8 x i8] }
+%rtti.ClassHierarchyDescriptor = type { i32, i32, i32, i32 }
+%rtti.BaseClassDescriptor = type { i32, i32, i32, i32, i32, i32, i32 }
+
+$"??_SS@@6B@" = comdat largest
+
+$"??_R4S@@6B@" = comdat any
+
+$"??_R0?AUS@@@8" = comdat any
+
+$"??_R3S@@8" = comdat any
+
+$"??_R2S@@8" = comdat any
+
+$"??_R1A@?0A@EA@S@@8" = comdat any
+
+@"?d@@3UInit@@A" = dso_local local_unnamed_addr global %struct.Init zeroinitializer, align 8
+@anon.bcb2691509de99310dddb690fcdb4cdc.0 = private unnamed_addr constant { [2 x i8*] } { [2 x i8*] [i8* bitcast (%rtti.CompleteObjectLocator* @"??_R4S@@6B@" to i8*), i8* bitcast (void (%struct.S*)* @"?foo@S@@UEAAXXZ" to i8*)] }, comdat($"??_SS@@6B@"), !type !0
+@"??_R4S@@6B@" = linkonce_odr constant %rtti.CompleteObjectLocator { i32 1, i32 0, i32 0, i32 trunc (i64 sub nuw nsw (i64 ptrtoint (%rtti.TypeDescriptor7* @"??_R0?AUS@@@8" to i64), i64 ptrtoint (i8* @__ImageBase to i64)) to i32), i32 trunc (i64 sub nuw nsw (i64 ptrtoint (%rtti.ClassHierarchyDescriptor* @"??_R3S@@8" to i64), i64 ptrtoint (i8* @__ImageBase to i64)) to i32), i32 trunc (i64 sub nuw nsw (i64 ptrtoint (%rtti.CompleteObjectLocator* @"??_R4S@@6B@" to i64), i64 ptrtoint (i8* @__ImageBase to i64)) to i32) }, comdat
+@"??_7type_info@@6B@" = external constant i8*
+@"??_R0?AUS@@@8" = linkonce_odr global %rtti.TypeDescriptor7 { i8** @"??_7type_info@@6B@", i8* null, [8 x i8] c".?AUS@@\00" }, comdat
+@__ImageBase = external dso_local constant i8
+@"??_R3S@@8" = linkonce_odr constant %rtti.ClassHierarchyDescriptor { i32 0, i32 0, i32 1, i32 trunc (i64 sub nuw nsw (i64 ptrtoint ([2 x i32]* @"??_R2S@@8" to i64), i64 ptrtoint (i8* @__ImageBase to i64)) to i32) }, comdat
+@"??_R2S@@8" = linkonce_odr constant [2 x i32] [i32 trunc (i64 sub nuw nsw (i64 ptrtoint (%rtti.BaseClassDescriptor* @"??_R1A@?0A@EA@S@@8" to i64), i64 ptrtoint (i8* @__ImageBase to i64)) to i32), i32 0], comdat
+@"??_R1A@?0A@EA@S@@8" = linkonce_odr constant %rtti.BaseClassDescriptor { i32 trunc (i64 sub nuw nsw (i64 ptrtoint (%rtti.TypeDescriptor7* @"??_R0?AUS@@@8" to i64), i64 ptrtoint (i8* @__ImageBase to i64)) to i32), i32 0, i32 0, i32 -1, i32 0, i32 64, i32 trunc (i64 sub nuw nsw (i64 ptrtoint (%rtti.ClassHierarchyDescriptor* @"??_R3S@@8" to i64), i64 ptrtoint (i8* @__ImageBase to i64)) to i32) }, comdat
+@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__sub_I_t.cpp, i8* null }]
+
+@"??_SS@@6B@" = unnamed_addr alias i8*, getelementptr inbounds ({ [2 x i8*] }, { [2 x i8*] }* @anon.bcb2691509de99310dddb690fcdb4cdc.0, i32 0, i32 0, i32 1)
+
+declare dso_local void @"?undefined_ref@@YAXXZ"() local_unnamed_addr #0
+
+declare dllimport void @"?foo@S@@UEAAXXZ"(%struct.S*) unnamed_addr #0
+
+; Function Attrs: nounwind sspstrong uwtable
+define internal void @_GLOBAL__sub_I_t.cpp() #1 {
+entry:
+  store i32 (...)** bitcast (i8** @"??_SS@@6B@" to i32 (...)**), i32 (...)*** getelementptr inbounds (%struct.Init, %struct.Init* @"?d@@3UInit@@A", i64 0, i32 0, i32 0), align 8
+  tail call void @"?undefined_ref@@YAXXZ"() #2
+  ret void
+}
+
+attributes #0 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind sspstrong uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #2 = { nounwind }
+
+!llvm.linker.options = !{!1, !2}
+!llvm.module.flags = !{!3, !4, !5, !6}
+!llvm.ident = !{!7}
+
+!0 = !{i64 8, !"?AUS@@"}
+!1 = !{!"/DEFAULTLIB:libcmt.lib"}
+!2 = !{!"/DEFAULTLIB:oldnames.lib"}
+!3 = !{i32 1, !"wchar_size", i32 2}
+!4 = !{i32 7, !"PIC Level", i32 2}
+!5 = !{i32 1, !"ThinLTO", i32 0}
+!6 = !{i32 1, !"EnableSplitLTOUnit", i32 0}
+!7 = !{!"clang version 9.0.0 (git@github.com:llvm/llvm-project.git 1a285c27fdf6407ceed3398e015d00559f5f533d)"}
+
+^0 = module: (path: "t.obj", hash: (0, 0, 0, 0, 0))
+^1 = gv: (name: "__ImageBase") ; guid = 434928772013489304
+^2 = gv: (name: "??_R2S@@8", summaries: (variable: (module: ^0, flags: (linkage: linkonce_odr, notEligibleToImport: 1, live: 0, dsoLocal: 0, canAutoHide: 0), varFlags: (readonly: 0, writeonly: 0), refs: (^1, ^6)))) ; guid = 2160898732728284029
+^3 = gv: (name: "llvm.global_ctors", summaries: (variable: (module: ^0, flags: (linkage: appending, notEligibleToImport: 1, live: 1, dsoLocal: 0, canAutoHide: 0), varFlags: (readonly: 0, writeonly: 0), refs: (^14)))) ; guid = 2412314959268824392
+^4 = gv: (name: "?foo@S@@UEAAXXZ") ; guid = 6578172636330484861
+^5 = gv: (name: "??_SS@@6B@", summaries: (alias: (module: ^0, flags: (linkage: external, notEligibleToImport: 1, live: 0, dsoLocal: 0, canAutoHide: 0), aliasee: ^10))) ; guid = 8774897714842691026
+^6 = gv: (name: "??_R1A@?0A@EA@S@@8", summaries: (variable: (module: ^0, flags: (linkage: linkonce_odr, notEligibleToImport: 1, live: 0, dsoLocal: 0, canAutoHide: 0), varFlags: (readonly: 0, writeonly: 0), refs: (^11, ^1, ^8)))) ; guid = 9397802696236423453
+^7 = gv: (name: "?undefined_ref@@YAXXZ") ; guid = 9774674600202276560
+^8 = gv: (name: "??_R3S@@8", summaries: (variable: (module: ^0, flags: (linkage: linkonce_odr, notEligibleToImport: 1, live: 0, dsoLocal: 0, canAutoHide: 0), varFlags: (readonly: 0, writeonly: 0), refs: (^1, ^2)))) ; guid = 10685958509605791599
+^9 = gv: (name: "??_7type_info@@6B@") ; guid = 10826752452437539368
+^10 = gv: (name: "anon.bcb2691509de99310dddb690fcdb4cdc.0", summaries: (variable: (module: ^0, flags: (linkage: private, notEligibleToImport: 1, live: 0, dsoLocal: 1, canAutoHide: 0), varFlags: (readonly: 0, writeonly: 0), vTableFuncs: ((virtFunc: ^4, offset: 8)), refs: (^13, ^4)))) ; guid = 11510395461204283992
+^11 = gv: (name: "??_R0?AUS@@@8", summaries: (variable: (module: ^0, flags: (linkage: linkonce_odr, notEligibleToImport: 1, live: 0, dsoLocal: 0, canAutoHide: 0), varFlags: (readonly: 0, writeonly: 0), refs: (^9)))) ; guid = 12346607659584231960
+^12 = gv: (name: "?d@@3UInit@@A", summaries: (variable: (module: ^0, flags: (linkage: external, notEligibleToImport: 1, live: 0, dsoLocal: 1, canAutoHide: 0), varFlags: (readonly: 1, writeonly: 1)))) ; guid = 14563354643524156382
+^13 = gv: (name: "??_R4S@@6B@", summaries: (variable: (module: ^0, flags: (linkage: linkonce_odr, notEligibleToImport: 1, live: 0, dsoLocal: 0, canAutoHide: 0), varFlags: (readonly: 0, writeonly: 0), refs: (^13, ^11, ^1, ^8)))) ; guid = 14703528065171087394
+^14 = gv: (name: "_GLOBAL__sub_I_t.cpp", summaries: (function: (module: ^0, flags: (linkage: internal, notEligibleToImport: 1, live: 0, dsoLocal: 1, canAutoHide: 0), insts: 3, calls: ((callee: ^7)), refs: (^12, ^5)))) ; guid = 15085897428757412588
+^15 = typeidCompatibleVTable: (name: "?AUS@@", summary: ((offset: 8, ^10))) ; guid = 13986515119763165370
diff --git a/deps/lld/test/COFF/Inputs/undefined-symbol-lto-b.ll b/deps/lld/test/COFF/Inputs/undefined-symbol-lto-b.ll
new file mode 100644
index 0000000000000000000000000000000000000000..ff73e7c6ba68022f462679a4f8969ff63d63b063
--- /dev/null
+++ b/deps/lld/test/COFF/Inputs/undefined-symbol-lto-b.ll
@@ -0,0 +1,29 @@
+; ModuleID = 'b.obj'
+source_filename = "b.cpp"
+target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-pc-windows-msvc19.21.27702"
+
+%struct.S = type { i32 (...)** }
+
+; Function Attrs: norecurse nounwind readnone sspstrong uwtable
+define dso_local void @"?foo@S@@UEAAXXZ"(%struct.S* nocapture %this) unnamed_addr #0 align 2 {
+entry:
+  ret void
+}
+
+attributes #0 = { norecurse nounwind readnone sspstrong uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.linker.options = !{!0, !1}
+!llvm.module.flags = !{!2, !3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = !{!"/DEFAULTLIB:libcmt.lib"}
+!1 = !{!"/DEFAULTLIB:oldnames.lib"}
+!2 = !{i32 1, !"wchar_size", i32 2}
+!3 = !{i32 7, !"PIC Level", i32 2}
+!4 = !{i32 1, !"ThinLTO", i32 0}
+!5 = !{i32 1, !"EnableSplitLTOUnit", i32 0}
+!6 = !{!"clang version 9.0.0 (git@github.com:llvm/llvm-project.git 1a285c27fdf6407ceed3398e015d00559f5f533d)"}
+
+^0 = module: (path: "b.obj", hash: (0, 0, 0, 0, 0))
+^1 = gv: (name: "?foo@S@@UEAAXXZ", summaries: (function: (module: ^0, flags: (linkage: external, notEligibleToImport: 1, live: 0, dsoLocal: 1, canAutoHide: 0), insts: 1, funcFlags: (readNone: 1, readOnly: 0, noRecurse: 1, returnDoesNotAlias: 0, noInline: 0)))) ; guid = 6578172636330484861
diff --git a/deps/lld/test/COFF/allow-unknown-debug-info.test b/deps/lld/test/COFF/allow-unknown-debug-info.test
new file mode 100644
index 0000000000000000000000000000000000000000..1cc9e9e0b9e2706a9301a457b7b13a3fd621f433
--- /dev/null
+++ b/deps/lld/test/COFF/allow-unknown-debug-info.test
@@ -0,0 +1,26 @@
+# RUN: yaml2obj %s > %t.obj
+# RUN: lld-link -safeseh:no /dll /noentry /debug %t.obj 2>&1 | FileCheck %s
+
+# CHECK: ignoring section .debug$S with unrecognized magic 0x1
+
+--- !COFF
+header:
+  Machine:         IMAGE_FILE_MACHINE_I386
+  Characteristics: []
+sections:
+  - Name:            '.debug$S'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
+    SectionData:     01000000
+symbols:
+  - Name:            '.debug$S'
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          4
+      NumberOfRelocations: 0
+      NumberOfLinenumbers: 0
+      CheckSum:        0
+      Number:          0
diff --git a/deps/lld/test/COFF/arm64-delayimport.yaml b/deps/lld/test/COFF/arm64-delayimport.yaml
index 6d3d70564c047785acc2555a40c72edae0f4c47c..24a47ef592a24c74129cdd182e8fa26cce8da2ba 100644
--- a/deps/lld/test/COFF/arm64-delayimport.yaml
+++ b/deps/lld/test/COFF/arm64-delayimport.yaml
@@ -3,35 +3,36 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /entry:main /subsystem:console /out:%t.exe %t.obj %p/Inputs/library-arm64.lib /alternatename:__delayLoadHelper2=main /delayload:library.dll
 # RUN: llvm-objdump -d %t.exe | FileCheck %s -check-prefix DISASM
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck %s -check-prefix IMPORTS
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck %s -check-prefix IMPORTS
 
 # DISASM:  140001014:      11 00 00 d0     adrp    x17, #8192
 # DISASM:  140001018:      31 22 00 91     add     x17, x17, #8
-# DISASM:  14000101c:      fd 7b b3 a9     stp     x29, x30, [sp, #-208]!
-# DISASM:  140001020:      fd 03 00 91     mov     x29, sp
-# DISASM:  140001024:      e0 07 01 a9     stp     x0, x1, [sp, #16]
-# DISASM:  140001028:      e2 0f 02 a9     stp     x2, x3, [sp, #32]
-# DISASM:  14000102c:      e4 17 03 a9     stp     x4, x5, [sp, #48]
-# DISASM:  140001030:      e6 1f 04 a9     stp     x6, x7, [sp, #64]
-# DISASM:  140001034:      e0 87 02 ad     stp     q0, q1, [sp, #80]
-# DISASM:  140001038:      e2 8f 03 ad     stp     q2, q3, [sp, #112]
-# DISASM:  14000103c:      e4 97 04 ad     stp     q4, q5, [sp, #144]
-# DISASM:  140001040:      e6 9f 05 ad     stp     q6, q7, [sp, #176]
-# DISASM:  140001044:      e1 03 11 aa     mov     x1, x17
-# DISASM:  140001048:      00 00 00 b0     adrp    x0, #4096
-# DISASM:  14000104c:      00 00 00 91     add     x0, x0, #0
-# DISASM:  140001050:      ec ff ff 97     bl      #-80 <.text>
-# DISASM:  140001054:      f0 03 00 aa     mov     x16, x0
-# DISASM:  140001058:      e6 9f 45 ad     ldp     q6, q7, [sp, #176]
-# DISASM:  14000105c:      e4 97 44 ad     ldp     q4, q5, [sp, #144]
-# DISASM:  140001060:      e2 8f 43 ad     ldp     q2, q3, [sp, #112]
-# DISASM:  140001064:      e0 87 42 ad     ldp     q0, q1, [sp, #80]
-# DISASM:  140001068:      e6 1f 44 a9     ldp     x6, x7, [sp, #64]
-# DISASM:  14000106c:      e4 17 43 a9     ldp     x4, x5, [sp, #48]
-# DISASM:  140001070:      e2 0f 42 a9     ldp     x2, x3, [sp, #32]
-# DISASM:  140001074:      e0 07 41 a9     ldp     x0, x1, [sp, #16]
-# DISASM:  140001078:      fd 7b cd a8     ldp     x29, x30, [sp], #208
-# DISASM:  14000107c:      00 02 1f d6     br      x16
+# DISASM:  14000101c:      01 00 00 14     b       #4 <.text+0x20>
+# DISASM:  140001020:      fd 7b b3 a9     stp     x29, x30, [sp, #-208]!
+# DISASM:  140001024:      fd 03 00 91     mov     x29, sp
+# DISASM:  140001028:      e0 07 01 a9     stp     x0, x1, [sp, #16]
+# DISASM:  14000102c:      e2 0f 02 a9     stp     x2, x3, [sp, #32]
+# DISASM:  140001030:      e4 17 03 a9     stp     x4, x5, [sp, #48]
+# DISASM:  140001034:      e6 1f 04 a9     stp     x6, x7, [sp, #64]
+# DISASM:  140001038:      e0 87 02 ad     stp     q0, q1, [sp, #80]
+# DISASM:  14000103c:      e2 8f 03 ad     stp     q2, q3, [sp, #112]
+# DISASM:  140001040:      e4 97 04 ad     stp     q4, q5, [sp, #144]
+# DISASM:  140001044:      e6 9f 05 ad     stp     q6, q7, [sp, #176]
+# DISASM:  140001048:      e1 03 11 aa     mov     x1, x17
+# DISASM:  14000104c:      00 00 00 b0     adrp    x0, #4096
+# DISASM:  140001050:      00 00 00 91     add     x0, x0, #0
+# DISASM:  140001054:      eb ff ff 97     bl      #-84 <.text>
+# DISASM:  140001058:      f0 03 00 aa     mov     x16, x0
+# DISASM:  14000105c:      e6 9f 45 ad     ldp     q6, q7, [sp, #176]
+# DISASM:  140001060:      e4 97 44 ad     ldp     q4, q5, [sp, #144]
+# DISASM:  140001064:      e2 8f 43 ad     ldp     q2, q3, [sp, #112]
+# DISASM:  140001068:      e0 87 42 ad     ldp     q0, q1, [sp, #80]
+# DISASM:  14000106c:      e6 1f 44 a9     ldp     x6, x7, [sp, #64]
+# DISASM:  140001070:      e4 17 43 a9     ldp     x4, x5, [sp, #48]
+# DISASM:  140001074:      e2 0f 42 a9     ldp     x2, x3, [sp, #32]
+# DISASM:  140001078:      e0 07 41 a9     ldp     x0, x1, [sp, #16]
+# DISASM:  14000107c:      fd 7b cd a8     ldp     x29, x30, [sp], #208
+# DISASM:  140001080:      00 02 1f d6     br      x16
 
 # IMPORTS: Format: COFF-ARM64
 # IMPORTS: Arch: aarch64
diff --git a/deps/lld/test/COFF/arm64-import2.test b/deps/lld/test/COFF/arm64-import2.test
index 3119e73e1d54553a16e0c2e94ad9742cb8ff4b4e..7f3ce036802237579263a58c2b5e1317af6c7e8b 100644
--- a/deps/lld/test/COFF/arm64-import2.test
+++ b/deps/lld/test/COFF/arm64-import2.test
@@ -4,14 +4,16 @@
 # RUN: llvm-objdump -d %t.obj | FileCheck %s -check-prefix BEFORE
 # RUN: lld-link /entry:main /subsystem:console /out:%t.exe %t.obj %p/Inputs/library-arm64.lib %p/Inputs/library2-arm64.lib
 # RUN: llvm-objdump -d %t.exe | FileCheck %s -check-prefix AFTER
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck %s -check-prefix IMPORTS
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck %s -check-prefix IMPORTS
 
 # BEFORE: Disassembly of section .text:
+# BEFORE-EMPTY:
 # BEFORE:        0:       00 00 00 94     bl      #0
 # BEFORE:        4:       00 00 00 94     bl      #0
 # BEFORE:        8:       c0 03 5f d6     ret
 
 # AFTER: Disassembly of section .text:
+# AFTER-EMPTY:
 # AFTER:  140001000:      03 00 00 94     bl      #12
 # AFTER:  140001004:      05 00 00 94     bl      #20
 # AFTER:  140001008:      c0 03 5f d6     ret
diff --git a/deps/lld/test/COFF/arm64-magic.yaml b/deps/lld/test/COFF/arm64-magic.yaml
index a35eeca483c7a183e317a6904813bae490eb089e..a33c3461792caa3b2cf3dccc7de36e2ce428aa88 100644
--- a/deps/lld/test/COFF/arm64-magic.yaml
+++ b/deps/lld/test/COFF/arm64-magic.yaml
@@ -1,6 +1,6 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe /entry:mainCRTStartup /subsystem:console %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 # CHECK: Format: COFF-ARM64
 # CHECK: Arch: aarch64
diff --git a/deps/lld/test/COFF/arm64-relocs-imports.test b/deps/lld/test/COFF/arm64-relocs-imports.test
index e2c00f189fef377770f0110201782828b619db41..05748f9fa8d6993bd32b828973e04f681adc8078 100644
--- a/deps/lld/test/COFF/arm64-relocs-imports.test
+++ b/deps/lld/test/COFF/arm64-relocs-imports.test
@@ -6,6 +6,7 @@
 # RUN: llvm-objdump -d %t.exe | FileCheck %s -check-prefix AFTER
 
 # BEFORE: Disassembly of section .text:
+# BEFORE-EMPTY:
 # BEFORE:        0:       fe 0f 1f f8     str     x30, [sp, #-16]!
 # BEFORE:        4:       00 00 00 90     adrp    x0, #0
 # BEFORE:        8:       00 08 00 91     add     x0, x0, #2
@@ -45,12 +46,14 @@
 # BEFORE:       90:       20 1a 09 30     adr x0, #74565
 # BEFORE:       94:       01 00 00 54     b.ne    #0
 # BEFORE:       98:       00 00 00 36     tbz     w0, #0, #0
+# BEFORE:       9c:       01 00 00 00     udf #1
 
 # AFTER: Disassembly of section .text:
+# AFTER-EMPTY:
 # AFTER:  140001000:      fe 0f 1f f8     str     x30, [sp, #-16]!
 # AFTER:  140001004:      00 00 00 b0     adrp    x0, #4096
 # AFTER:  140001008:      00 18 00 91     add     x0, x0, #6
-# AFTER:  14000100c:      24 00 00 94     bl      #144
+# AFTER:  14000100c:      25 00 00 94     bl      #148
 # AFTER:  140001010:      00 21 40 39     ldrb    w0, [x8, #8]
 # AFTER:  140001014:      00 11 40 79     ldrh    w0, [x8, #8]
 # AFTER:  140001018:      00 09 40 b9     ldr     w0, [x8, #8]
@@ -84,11 +87,12 @@
 # AFTER:  140001088:      00 c4 41 f9     ldr     x0, [x0, #904]
 # AFTER:  14000108c:      03 00 00 00     udf #3
 # AFTER:  140001090:      e0 95 09 30     adr     x0, #78525
-# AFTER:  140001094:      41 00 00 54     b.ne    #8
-# AFTER:  140001098:      20 00 00 36     tbz     w0, #0, #4
-# AFTER:  14000109c:      10 00 00 b0     adrp    x16, #4096
-# AFTER:  1400010a0:      10 2a 40 f9     ldr     x16, [x16, #80]
-# AFTER:  1400010a4:      00 02 1f d6     br      x16
+# AFTER:  140001094:      61 00 00 54     b.ne    #12
+# AFTER:  140001098:      40 00 00 36     tbz     w0, #0, #8
+# AFTER:  14000109c:      61 ff ff ff     <unknown>
+# AFTER:  1400010a0:      10 00 00 b0     adrp    x16, #4096
+# AFTER:  1400010a4:      10 2a 40 f9     ldr     x16, [x16, #80]
+# AFTER:  1400010a8:      00 02 1f d6     br      x16
 
 --- !COFF
 header:
@@ -98,7 +102,7 @@ sections:
   - Name:            .text
     Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
     Alignment:       4
-    SectionData:     FE0F1FF80000009000080091000000940001403900014079000140B9000140F90001003900010079000100B9000100F90001403D0001407D000140BD000140FD0001C03D0001003D0001007D000100BD000100FD0001803D000540F9201A01B000FC4FF9E0031F2AFE0741F8C0035FD6080000000000000001000000010000000000009100004091000040f901000000201a09300100005400000036
+    SectionData:     FE0F1FF80000009000080091000000940001403900014079000140B9000140F90001003900010079000100B9000100F90001403D0001407D000140BD000140FD0001C03D0001003D0001007D000100BD000100FD0001803D000540F9201A01B000FC4FF9E0031F2AFE0741F8C0035FD6080000000000000001000000010000000000009100004091000040f901000000201a0930010000540000003601000000
     Relocations:
       - VirtualAddress:  4
         SymbolName:      .Lstr
@@ -202,6 +206,9 @@ sections:
       - VirtualAddress:  152
         SymbolName:      function
         Type:            IMAGE_REL_ARM64_BRANCH14
+      - VirtualAddress:  156
+        SymbolName:      main
+        Type:            IMAGE_REL_ARM64_REL32
   - Name:            .data
     Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
     Alignment:       4
diff --git a/deps/lld/test/COFF/armnt-blx23t.test b/deps/lld/test/COFF/armnt-blx23t.test
index ec36225e433204cc862d29cef2cb144b065597e6..3e522be7cd790f52afe2fbfe68f35062b9e75638 100644
--- a/deps/lld/test/COFF/armnt-blx23t.test
+++ b/deps/lld/test/COFF/armnt-blx23t.test
@@ -6,6 +6,7 @@
 # RUN: llvm-objdump -d %t.exe | FileCheck %s -check-prefix AFTER
 
 # BEFORE: Disassembly of section .text:
+# BEFORE-EMPTY:
 # BEFORE:        0: 70 47         bx lr
 # BEFORE:        2: 00 bf         nop
 # BEFORE:        4: 2d e9 00 48   push.w {r11, lr}
@@ -16,6 +17,7 @@
 # BEFORE:       12: bd e8 00 88   pop.w {r11, pc}
 
 # AFTER: Disassembly of section .text:
+# AFTER-EMPTY:
 # AFTER:     1000: 70 47         bx lr
 # AFTER:     1002: 00 bf         nop
 # AFTER:     1004: 2d e9 00 48   push.w {r11, lr}
diff --git a/deps/lld/test/COFF/armnt-branch24t.test b/deps/lld/test/COFF/armnt-branch24t.test
index 88d17e445b1eb5a2acdfc5246fa4663bd4994d44..c98df6e0dc9a6f65b1ed6bfd411ff29c6132fdc6 100644
--- a/deps/lld/test/COFF/armnt-branch24t.test
+++ b/deps/lld/test/COFF/armnt-branch24t.test
@@ -6,12 +6,14 @@
 # RUN: llvm-objdump -d %t.exe | FileCheck %s -check-prefix AFTER
 
 # BEFORE: Disassembly of section .text:
+# BEFORE-EMPTY:
 # BEFORE:        0: 70 47         bx lr
 # BEFORE:        2: 00 bf         nop
 # BEFORE:        4: 20 20         movs r0, #32
 # BEFORE:        6: 00 f0 00 b8   b.w #0
 
 # AFTER: Disassembly of section .text:
+# AFTER-EMPTY:
 # AFTER: .text:
 # AFTER:     1000: 70 47         bx lr
 # AFTER:     1002: 00 bf         nop
diff --git a/deps/lld/test/COFF/armnt-entry-point.test b/deps/lld/test/COFF/armnt-entry-point.test
index 7b1bd100e08359d419874a90c560b1e5b5573b1f..933c0de2860e14bada5138f0ff51c22526ec1877 100644
--- a/deps/lld/test/COFF/armnt-entry-point.test
+++ b/deps/lld/test/COFF/armnt-entry-point.test
@@ -1,5 +1,5 @@
 # RUN: yaml2obj < %p/Inputs/armnt-executable.obj.yaml > %t.obj
 # RUN: lld-link /out:%t.exe /entry:mainCRTStartup /subsystem:console %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 CHECK: AddressOfEntryPoint: 0x1001
diff --git a/deps/lld/test/COFF/armnt-imports.test b/deps/lld/test/COFF/armnt-imports.test
index 7d3612a0df7e694fe8ba4622a33bbe6575b8fdec..4cf07fd6c7ab8500962a6372382b548254bc26cb 100644
--- a/deps/lld/test/COFF/armnt-imports.test
+++ b/deps/lld/test/COFF/armnt-imports.test
@@ -1,7 +1,7 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe /subsystem:console %t.obj \
 # RUN:   /entry:mainCRTStartup %p/Inputs/library.lib
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck %s
 
 # CHECK: Import {
 # CHECK:   Name: library.dll
diff --git a/deps/lld/test/COFF/armnt-mov32t-exec.test b/deps/lld/test/COFF/armnt-mov32t-exec.test
index abc78c7fcc5bd9495a401490928a85f779baf678..d1170a33ef8eefd1a70bdfb6df4ef5d20b55806e 100644
--- a/deps/lld/test/COFF/armnt-mov32t-exec.test
+++ b/deps/lld/test/COFF/armnt-mov32t-exec.test
@@ -6,6 +6,7 @@
 # RUN: llvm-objdump -d %t.exe | FileCheck %s -check-prefix AFTER
 
 # BEFORE: Disassembly of section .text:
+# BEFORE-EMPTY:
 # BEFORE:        0: 70 47         bx lr
 # BEFORE:        2: 00 bf         nop
 # BEFORE:        4: 40 f2 00 00   movw r0, #0
@@ -13,6 +14,7 @@
 # BEFORE:        c: 70 47         bx lr
 
 # AFTER: Disassembly of section .text:
+# AFTER-EMPTY:
 # AFTER:     1000: 70 47         bx lr
 # AFTER:     1002: 00 bf         nop
 # AFTER:     1004: 41 f2 01 00   movw r0, #4097
diff --git a/deps/lld/test/COFF/armnt-movt32t.test b/deps/lld/test/COFF/armnt-movt32t.test
index 6a0640c76fc379e1c7685e52321f9ec0fa3761e5..7febe9d753de0825c7c0de55c291990a431f8cf4 100644
--- a/deps/lld/test/COFF/armnt-movt32t.test
+++ b/deps/lld/test/COFF/armnt-movt32t.test
@@ -6,11 +6,13 @@
 # RUN: llvm-objdump -d %t.exe | FileCheck %s -check-prefix AFTER
 
 # BEFORE: Disassembly of section .text:
+# BEFORE-EMPTY:
 # BEFORE:        0: 40 f2 00 00   movw r0, #0
 # BEFORE:        4: c0 f2 00 00   movt r0, #0
 # BEFORE:        8: 70 47         bx lr
 
 # AFTER: Disassembly of section .text:
+# AFTER-EMPTY:
 # AFTER:        0: 42 f2 00 00   movw r0, #8192
 # AFTER:        4: c0 f2 40 00   movt r0, #64
 # AFTER:        8: 70 47         bx lr
diff --git a/deps/lld/test/COFF/armnt-rel32.yaml b/deps/lld/test/COFF/armnt-rel32.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..fa385c5fd7d5114bed1144245ac2c1e4fdce8bcd
--- /dev/null
+++ b/deps/lld/test/COFF/armnt-rel32.yaml
@@ -0,0 +1,47 @@
+# REQUIRES: arm
+
+# RUN: yaml2obj < %s > %t.obj
+# RUN: llvm-objdump -s %t.obj | FileCheck %s -check-prefix BEFORE
+# RUN: lld-link /entry:function /subsystem:console /out:%t.exe %t.obj
+# RUN: llvm-objdump -s %t.exe | FileCheck %s -check-prefix AFTER
+
+# BEFORE: Contents of section .text:
+# BEFORE:    0000 704700bf 01000000 01000000
+
+# AFTER: Contents of section .text:
+# AFTER:   401000 704700bf faffffff f50f0000
+
+--- !COFF
+header:
+  Machine:         IMAGE_FILE_MACHINE_ARMNT
+  Characteristics: []
+sections:
+  - Name:            .text
+    Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_PURGEABLE, IMAGE_SCN_MEM_16BIT, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
+    Alignment:       4
+    SectionData:     704700BF0100000001000000
+    Relocations:
+      - VirtualAddress:  4
+        SymbolName:      function
+        Type:            IMAGE_REL_ARM_REL32
+      - VirtualAddress:  8
+        SymbolName:      data
+        Type:            IMAGE_REL_ARM_REL32
+  - Name:            .rdata
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
+    Alignment:       1
+    SectionData:     00
+symbols:
+  - Name:            function
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+  - Name:            data
+    Value:           0
+    SectionNumber:   2
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+...
diff --git a/deps/lld/test/COFF/associative-comdat-empty.test b/deps/lld/test/COFF/associative-comdat-empty.test
new file mode 100644
index 0000000000000000000000000000000000000000..c4ee8b7256f1025d58459126021848b90588c791
--- /dev/null
+++ b/deps/lld/test/COFF/associative-comdat-empty.test
@@ -0,0 +1,56 @@
+# RUN: yaml2obj < %s > %t.obj
+# RUN: not lld-link /include:symbol /dll /noentry /nodefaultlib %t.obj /out:%t.exe 2>&1 | FileCheck %s
+
+# Tests an associative comdat being associated with an empty section errors.
+# CHECK: lld-link: error: {{.*}}: associative comdat .text$ac1 (sec 1) has invalid reference to section .text$nm (sec 2)
+# CHECK-NOT: lld-link: error:
+
+--- !COFF
+header:          
+  Machine:         IMAGE_FILE_MACHINE_AMD64
+  Characteristics: [  ]
+sections:        
+  - Name:            '.text$ac1'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_LNK_COMDAT, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
+    Alignment:       1
+    SectionData:     '01000000'
+  - Name:            '.text$nm'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_LNK_COMDAT, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
+    Alignment:       1
+    SectionData:     '01000000'
+symbols:         
+  - Name:            '.text$ac1'
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition: 
+      Length:          4
+      NumberOfRelocations: 0
+      NumberOfLinenumbers: 0
+      CheckSum:        3099354981
+      Number:          2
+      Selection:       IMAGE_COMDAT_SELECT_ASSOCIATIVE
+  - Name:            '.text$nm'
+    Value:           0
+    SectionNumber:   2
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition: 
+      Length:          0
+      NumberOfRelocations: 0
+      NumberOfLinenumbers: 0
+      CheckSum:        3099354981
+      Number:          4
+      Selection:       IMAGE_COMDAT_SELECT_ANY
+  - Name:            assocsym
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+...
+
+
diff --git a/deps/lld/test/COFF/associative-comdat-mingw-i386.s b/deps/lld/test/COFF/associative-comdat-mingw-i386.s
new file mode 100644
index 0000000000000000000000000000000000000000..3f5e02330d505fb8d90e968f061adabefe3b68bd
--- /dev/null
+++ b/deps/lld/test/COFF/associative-comdat-mingw-i386.s
@@ -0,0 +1,37 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -triple=i686-windows-gnu %s -filetype=obj -o %t.obj
+
+# RUN: lld-link -lldmingw -entry:main %t.obj -out:%t.exe
+# RUN: llvm-objdump -s %t.exe | FileCheck %s
+
+# Check that the .eh_frame comdat was included, even if it had no symbols,
+# due to associativity with the symbol _foo.
+
+# CHECK: Contents of section .eh_fram:
+# CHECK:  403000 42
+
+        .text
+        .def            _main;
+        .scl            2;
+        .type           32;
+        .endef
+        .globl          _main
+        .p2align        4, 0x90
+_main:
+        call            _foo
+        ret
+
+        .section        .eh_frame$foo,"dr"
+        .linkonce       discard
+        .byte           0x42
+
+        .def            _foo;
+        .scl            2;
+        .type           32;
+        .endef
+        .section        .text$foo,"xr",discard,foo
+        .globl          _foo
+        .p2align        4
+_foo:
+        ret
diff --git a/deps/lld/test/COFF/associative-comdat-mingw.s b/deps/lld/test/COFF/associative-comdat-mingw.s
index def20cd85294be104ff753125a972688779a5c45..a738fce8aedb8f2d7b9c9a7debf98422338d005e 100644
--- a/deps/lld/test/COFF/associative-comdat-mingw.s
+++ b/deps/lld/test/COFF/associative-comdat-mingw.s
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -triple=x86_64-windows-gnu %S/Inputs/associative-comdat-mingw-2.s -filetype=obj -o %t2.obj
 
 # RUN: lld-link -lldmingw -entry:main %t1.obj %t2.obj -out:%t.gc.exe -verbose
-# RUN: llvm-readobj -sections %t.gc.exe | FileCheck %s
+# RUN: llvm-readobj --sections %t.gc.exe | FileCheck %s
 
 # CHECK: Sections [
 # CHECK:   Section {
diff --git a/deps/lld/test/COFF/associative-comdat-order.test b/deps/lld/test/COFF/associative-comdat-order.test
new file mode 100644
index 0000000000000000000000000000000000000000..c7756f348e0ebad922ed4e820bfc062fbda568f2
--- /dev/null
+++ b/deps/lld/test/COFF/associative-comdat-order.test
@@ -0,0 +1,97 @@
+# Tests that an associative comdat being associated with another
+# associated comdat later in the file produces an error.
+# RUN: sed -e s/ASSOC1/2/ -e s/ASSOC2/3/ %s | yaml2obj > %t.obj
+# RUN: not lld-link /include:symbol /dll /noentry /nodefaultlib %t.obj /out:%t.exe 2>&1 | FileCheck --check-prefix=FORWARD %s
+# FORWARD: lld-link: error: {{.*}}: associative comdat .text$ac1 (sec 1) has invalid reference to section .text$ac2 (sec 2)
+# FORWARD-NOT: lld-link: error:
+
+# Tests that an associative comdat being associated with another
+# associated comdat earlier in the file works.
+# RUN: sed -e s/ASSOC1/3/ -e s/ASSOC2/1/ %s | yaml2obj > %t.obj
+
+# RUN: lld-link /include:symbol /dll /noentry /nodefaultlib %t.obj /out:%t.exe
+# RUN: llvm-objdump -s %t.exe | FileCheck --check-prefix=BACKWARD %s
+# BACKWARD: Contents of section .text:
+# BACKWARD:   180001000 01000000 02000000 03000000 ............
+
+# RUN: lld-link /dll /noentry /nodefaultlib %t.obj /out:%t.exe
+# RUN: llvm-objdump -s %t.exe | FileCheck --check-prefix=BACKWARDDROP %s
+# BACKWARDDROP-NOT: Contents of section .text:
+
+--- !COFF
+header:          
+  Machine:         IMAGE_FILE_MACHINE_AMD64
+  Characteristics: [  ]
+sections:        
+  - Name:            '.text$ac1'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_LNK_COMDAT, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
+    Alignment:       1
+    SectionData:     '01000000'
+  - Name:            '.text$ac2'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_LNK_COMDAT, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
+    Alignment:       1
+    SectionData:     '02000000'
+  - Name:            '.text$nm'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_LNK_COMDAT, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
+    Alignment:       1
+    SectionData:     '03000000'
+symbols:         
+  - Name:            '.text$ac1'
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition: 
+      Length:          4
+      NumberOfRelocations: 0
+      NumberOfLinenumbers: 0
+      CheckSum:        3099354981
+      Number:          ASSOC1
+      Selection:       IMAGE_COMDAT_SELECT_ASSOCIATIVE
+  - Name:            '.text$ac2'
+    Value:           0
+    SectionNumber:   2
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition: 
+      Length:          4
+      NumberOfRelocations: 0
+      NumberOfLinenumbers: 0
+      CheckSum:        3099354981
+      Number:          ASSOC2
+      Selection:       IMAGE_COMDAT_SELECT_ASSOCIATIVE
+  - Name:            '.text$nm'
+    Value:           0
+    SectionNumber:   3
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition: 
+      Length:          4
+      NumberOfRelocations: 0
+      NumberOfLinenumbers: 0
+      CheckSum:        3099354981
+      Number:          4
+      Selection:       IMAGE_COMDAT_SELECT_ANY
+  - Name:            symbol
+    Value:           0
+    SectionNumber:   3
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+  - Name:            assocsym2
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+  - Name:            assocsym
+    Value:           0
+    SectionNumber:   2
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+...
+
diff --git a/deps/lld/test/COFF/associative-comdat.s b/deps/lld/test/COFF/associative-comdat.s
index a3d069b53571b9f19ad530af56f1344c594cae01..8831e807dfba1ec0f180091459ce2e1dd6910ce1 100644
--- a/deps/lld/test/COFF/associative-comdat.s
+++ b/deps/lld/test/COFF/associative-comdat.s
@@ -3,10 +3,10 @@
 # RUN: llvm-mc -triple=x86_64-windows-msvc %S/Inputs/associative-comdat-2.s -filetype=obj -o %t2.obj
 
 # RUN: lld-link -entry:main %t1.obj %t2.obj -out:%t.gc.exe
-# RUN: llvm-readobj -sections %t.gc.exe | FileCheck %s
+# RUN: llvm-readobj --sections %t.gc.exe | FileCheck %s
 
 # RUN: lld-link -entry:main %t1.obj %t2.obj -opt:noref -out:%t.nogc.exe
-# RUN: llvm-readobj -sections %t.nogc.exe | FileCheck %s
+# RUN: llvm-readobj --sections %t.nogc.exe | FileCheck %s
 
 # CHECK: Sections [
 # CHECK:   Section {
diff --git a/deps/lld/test/COFF/autoimport-arm-data.s b/deps/lld/test/COFF/autoimport-arm-data.s
index 945d51c9423c2a3be72361c860d2a373b9213425..aa24e90115c770070175722da0dd74abe8ac1dbe 100644
--- a/deps/lld/test/COFF/autoimport-arm-data.s
+++ b/deps/lld/test/COFF/autoimport-arm-data.s
@@ -7,7 +7,7 @@
 # RUN: llvm-mc -triple=armv7-windows-gnu %s -filetype=obj -o %t.obj
 # RUN: lld-link -lldmingw -out:%t.exe -entry:main %t.obj %t-lib.lib -verbose
 
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
 # RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=CONTENTS %s
 
 # IMPORTS: Import {
diff --git a/deps/lld/test/COFF/autoimport-arm64-data.s b/deps/lld/test/COFF/autoimport-arm64-data.s
index be4d8706fe3ad803ae3853d49126bcb9de3547e2..9ac6daf48d2e68d68970b7608778ce57611cd69c 100644
--- a/deps/lld/test/COFF/autoimport-arm64-data.s
+++ b/deps/lld/test/COFF/autoimport-arm64-data.s
@@ -7,7 +7,7 @@
 # RUN: llvm-mc -triple=aarch64-windows-gnu %s -filetype=obj -o %t.obj
 # RUN: lld-link -lldmingw -out:%t.exe -entry:main %t.obj %t-lib.lib -verbose
 
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
 # RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=CONTENTS %s
 
 # IMPORTS: Import {
diff --git a/deps/lld/test/COFF/autoimport-gnu-implib.s b/deps/lld/test/COFF/autoimport-gnu-implib.s
index 375e0a5857e5e3c00de35d5cd4c4498fef5f4907..e6e0ed207c0b62920eb897d0f816da2b09d945a8 100644
--- a/deps/lld/test/COFF/autoimport-gnu-implib.s
+++ b/deps/lld/test/COFF/autoimport-gnu-implib.s
@@ -9,7 +9,7 @@
 # RUN: llvm-mc -triple=x86_64-windows-gnu %s -filetype=obj -o %t.obj
 # RUN: lld-link -lldmingw -out:%t.exe -entry:main %t.obj %t-implib.a -verbose
 
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
 
 # IMPORTS: Import {
 # IMPORTS-NEXT: Name: foo.dll
diff --git a/deps/lld/test/COFF/autoimport-refptr.s b/deps/lld/test/COFF/autoimport-refptr.s
index 4b11a8adde847af9f5643af4c0f00729e50f1d54..f5616512434b43fa27ec5422209f0c788b7864f1 100644
--- a/deps/lld/test/COFF/autoimport-refptr.s
+++ b/deps/lld/test/COFF/autoimport-refptr.s
@@ -7,7 +7,7 @@
 # RUN: llvm-mc -triple=x86_64-windows-gnu %s -filetype=obj -o %t.obj
 # RUN: lld-link -lldmingw -out:%t.exe -entry:main %t.obj %t-lib.lib -verbose
 
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
 # RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=DISASM %s
 # RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=CONTENTS %s
 
@@ -19,6 +19,7 @@
 # IMPORTS-NEXT: }
 
 # DISASM: Disassembly of section .text:
+# DISASM-EMPTY:
 # DISASM: .text:
 # Relative offset at 0x1002 pointing at the IAT at 0x2060
 # DISASM: 140001000:      48 8b 05 59 10 00 00    movq    4185(%rip), %rax
diff --git a/deps/lld/test/COFF/autoimport-x86.s b/deps/lld/test/COFF/autoimport-x86.s
index 379985e88097273238d88bfc3633d32c1b120b33..400cec71173ec00dbbc230e57ae35f434508ec52 100644
--- a/deps/lld/test/COFF/autoimport-x86.s
+++ b/deps/lld/test/COFF/autoimport-x86.s
@@ -7,7 +7,7 @@
 # RUN: llvm-mc -triple=x86_64-windows-gnu %s -filetype=obj -o %t.obj
 # RUN: lld-link -lldmingw -out:%t.exe -entry:main %t.obj %t-lib.lib -verbose
 
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
 # RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=DISASM %s
 # RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=CONTENTS %s
 
@@ -19,6 +19,7 @@
 # IMPORTS-NEXT: }
 
 # DISASM: Disassembly of section .text:
+# DISASM-EMPTY:
 # DISASM: .text:
 # Relative offset at 0x1002 pointing at the IAT at 0x2080.
 # DISASM: 140001000:      8b 05 7a 10 00 00       movl    4218(%rip), %eax
diff --git a/deps/lld/test/COFF/base.test b/deps/lld/test/COFF/base.test
index 662632bf90766611f0733f1971a5ffee88786446..b6c43f9594eeb8369b88f0c9d6294d7702d11042 100644
--- a/deps/lld/test/COFF/base.test
+++ b/deps/lld/test/COFF/base.test
@@ -1,7 +1,7 @@
 # RUN: yaml2obj < %s > %t.obj
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=DEFAULT-HEADER %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=DEFAULT-HEADER %s
 # RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=DEFAULT-TEXT %s
 
 # DEFAULT-HEADER:    ImageBase: 0x140000000
@@ -9,7 +9,7 @@
 # DEFAULT-TEXT-NEXT: 1000 00000040 01000000
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj /base:0x280000000
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=BASE-HEADER %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=BASE-HEADER %s
 # RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=BASE-TEXT %s
 
 # BASE-HEADER: ImageBase: 0x280000000
diff --git a/deps/lld/test/COFF/baserel.test b/deps/lld/test/COFF/baserel.test
index a10d6ed4d08db131cc23346e633204e8e905abe7..d062923ca58150b39c18d0ace3c89a2f5aea2109 100644
--- a/deps/lld/test/COFF/baserel.test
+++ b/deps/lld/test/COFF/baserel.test
@@ -1,10 +1,10 @@
 # RUN: yaml2obj < %s > %t.obj
 #
 # RUN: lld-link /out:%t.exe /entry:main %t.obj %p/Inputs/std64.lib
-# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck %s -check-prefix=BASEREL
+# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck %s -check-prefix=BASEREL
 #
 # RUN: lld-link /out:%t.exe /entry:main /fixed %t.obj %p/Inputs/std64.lib
-# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck %s -check-prefix=NOBASEREL
+# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck %s -check-prefix=NOBASEREL
 #
 # BASEREL:      BaseReloc [
 # BASEREL-NEXT: Entry {
@@ -44,11 +44,11 @@
 # NOBASEREL-NEXT: ]
 #
 # RUN: lld-link /out:%t.exe /entry:main %t.obj %p/Inputs/std64.lib
-# RUN: llvm-readobj -file-headers -sections %t.exe | FileCheck %s \
+# RUN: llvm-readobj --file-headers --sections %t.exe | FileCheck %s \
 # RUN:   --check-prefix=BASEREL-HEADER
 #
 # RUN: lld-link /out:%t.exe /entry:main /fixed %t.obj %p/Inputs/std64.lib
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s \
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s \
 # RUN:   --check-prefix=NOBASEREL-HEADER
 #
 # BASEREL-HEADER-NOT: IMAGE_FILE_RELOCS_STRIPPED
diff --git a/deps/lld/test/COFF/color-diagnostics.test b/deps/lld/test/COFF/color-diagnostics.test
new file mode 100644
index 0000000000000000000000000000000000000000..11cf8aff7a0ae2f53f7be5f49824edcc00cbd8cc
--- /dev/null
+++ b/deps/lld/test/COFF/color-diagnostics.test
@@ -0,0 +1,18 @@
+# Windows command prompt doesn't support ANSI escape sequences.
+# REQUIRES: shell
+
+# RUN: not lld-link -xyz --color-diagnostics /nosuchfile 2>&1 \
+# RUN:   | FileCheck -check-prefix=COLOR %s
+# RUN: not lld-link -xyz --color-diagnostics=always /nosuchfile 2>&1 \
+# RUN:   | FileCheck -check-prefix=COLOR %s
+
+# COLOR: {{lld-link: .\[0;1;35mwarning: .\[0mignoring unknown argument '-xyz'}}
+# COLOR: {{lld-link: .\[0;1;31merror: .\[0mcould not open '/nosuchfile'}}
+
+# RUN: not lld-link /nosuchfile 2>&1 | FileCheck -check-prefix=NOCOLOR %s
+# RUN: not lld-link -color-diagnostics=never /nosuchfile 2>&1 \
+# RUN:   | FileCheck -check-prefix=NOCOLOR %s
+# RUN: not lld-link -color-diagnostics=always -no-color-diagnostics \
+# RUN:   /nosuchfile 2>&1 | FileCheck -check-prefix=NOCOLOR %s
+
+# NOCOLOR: lld-link: error: could not open '/nosuchfile'
diff --git a/deps/lld/test/COFF/combined-resources.test b/deps/lld/test/COFF/combined-resources.test
index 37dfc5732f48534866fac12e2b904214b638faa8..04cb45c39e36220e0fa93c64a73ba326eb93a523 100644
--- a/deps/lld/test/COFF/combined-resources.test
+++ b/deps/lld/test/COFF/combined-resources.test
@@ -8,7 +8,7 @@
 # RUN: lld-link /out:%t.exe /entry:main %t.obj %p/Inputs/resource.res \
 # RUN:   %p/Inputs/combined-resources.res %p/Inputs/combined-resources-2.res
 
-# RUN: llvm-readobj -coff-resources -file-headers -section-data %t.exe | \
+# RUN: llvm-readobj --coff-resources --file-headers --section-data %t.exe | \
 # RUN:   FileCheck %s
 
 CHECK:      ResourceTableRVA: 0x2000
diff --git a/deps/lld/test/COFF/comdat-selection-associative-largest.s b/deps/lld/test/COFF/comdat-selection-associative-largest.s
new file mode 100644
index 0000000000000000000000000000000000000000..301aaec1f83b97c4981faff2f7f1fb324f426a9f
--- /dev/null
+++ b/deps/lld/test/COFF/comdat-selection-associative-largest.s
@@ -0,0 +1,45 @@
+# REQUIRES: x86
+
+# Tests handling of several comdats with "largest" selection type that each
+# has an associative comdat.
+
+# Create obj files.
+# RUN: sed -e s/TYPE/.byte/  -e s/SIZE/1/ %s | llvm-mc -triple x86_64-pc-win32 -filetype=obj -o %t.1.obj
+# RUN: sed -e s/TYPE/.short/ -e s/SIZE/2/ %s | llvm-mc -triple x86_64-pc-win32 -filetype=obj -o %t.2.obj
+# RUN: sed -e s/TYPE/.long/  -e s/SIZE/4/ %s | llvm-mc -triple x86_64-pc-win32 -filetype=obj -o %t.4.obj
+
+        .section .text$ac, "", associative, symbol
+assocsym:
+        .long SIZE
+
+        .section .text$nm, "", largest, symbol
+        .globl symbol
+symbol:
+        TYPE SIZE
+
+# Pass the obj files in different orders and check that only the associative
+# comdat of the largest obj file makes it into the output, independent of
+# the order of the obj files on the command line.
+
+# FIXME: Make these pass when /opt:noref is passed.
+
+# RUN: lld-link /include:symbol /dll /noentry /nodefaultlib %t.1.obj %t.2.obj %t.4.obj /out:%t.exe
+# RUN: llvm-objdump -s %t.exe | FileCheck --check-prefix=ALL124 %s
+# ALL124: Contents of section .text:
+# ALL124:   180001000 04000000 04000000 ....
+
+# RUN: lld-link /include:symbol /dll /noentry /nodefaultlib %t.4.obj %t.2.obj %t.1.obj /out:%t.exe
+# RUN: llvm-objdump -s %t.exe | FileCheck --check-prefix=ALL421 %s
+# ALL421: Contents of section .text:
+# ALL421:   180001000 04000000 04000000 ....
+
+# RUN: lld-link /include:symbol /dll /noentry /nodefaultlib %t.2.obj %t.4.obj %t.1.obj /out:%t.exe
+# RUN: llvm-objdump -s %t.exe | FileCheck --check-prefix=ALL241 %s
+# ALL241: Contents of section .text:
+# ALL241:   180001000 04000000 04000000 ....
+
+# RUN: lld-link /include:symbol /dll /noentry /nodefaultlib %t.2.obj %t.1.obj /out:%t.exe
+# RUN: llvm-objdump -s %t.exe | FileCheck --check-prefix=JUST21 %s
+# JUST21: Contents of section .text:
+# JUST21:   180001000 02000000 0200 ....
+
diff --git a/deps/lld/test/COFF/comdat-selection.s b/deps/lld/test/COFF/comdat-selection.s
new file mode 100644
index 0000000000000000000000000000000000000000..988d9bd9516dc805444ee91333ead9b3f4db973b
--- /dev/null
+++ b/deps/lld/test/COFF/comdat-selection.s
@@ -0,0 +1,107 @@
+# REQUIRES: x86
+
+# Tests handling of the comdat selection type.
+# (Except associative which is tested in associative-comdat.s and
+# comdat-selection-associate-largest.s instead.)
+
+# Create obj files with each selection type.
+# RUN: sed -e s/SEL/discard/ %s | llvm-mc -triple x86_64-pc-win32 -filetype=obj -o %t.discard.obj
+# RUN: sed -e s/SEL/discard/ -e s/.long/.short/ -e s/1/2/ %s | llvm-mc -triple x86_64-pc-win32 -filetype=obj -o %t.discard.short.2.obj
+# RUN: sed -e s/SEL/one_only/ %s | llvm-mc -triple x86_64-pc-win32 -filetype=obj -o %t.one_only.obj
+# RUN: sed -e s/SEL/same_size/ %s | llvm-mc -triple x86_64-pc-win32 -filetype=obj -o %t.same_size.obj
+# RUN: sed -e s/SEL/same_size/ -e s/.long/.short/ %s | llvm-mc -triple x86_64-pc-win32 -filetype=obj -o %t.same_size.short.obj
+# RUN: sed -e s/SEL/same_contents/ %s | llvm-mc -triple x86_64-pc-win32 -filetype=obj -o %t.same_contents.obj
+# RUN: sed -e s/SEL/same_contents/ -e s/.long/.short/ %s | llvm-mc -triple x86_64-pc-win32 -filetype=obj -o %t.same_contents.short.obj
+# RUN: sed -e s/SEL/same_contents/ -e s/1/2/ %s | llvm-mc -triple x86_64-pc-win32 -filetype=obj -o %t.same_contents.2.obj
+# RUN: sed -e s/SEL/largest/ %s | llvm-mc -triple x86_64-pc-win32 -filetype=obj -o %t.largest.obj
+# RUN: sed -e s/SEL/largest/ -e s/.long/.short/ -e s/1/2/ %s | llvm-mc -triple x86_64-pc-win32 -filetype=obj -o %t.largest.short.2.obj
+# RUN: sed -e s/SEL/newest/ %s | llvm-mc -triple x86_64-pc-win32 -filetype=obj -o %t.newest.obj
+
+        .section .text$nm, "", SEL, symbol
+        .globl symbol
+symbol:
+        .long 1
+
+# First, pass each selection type twice. All should link fine except for
+# one_only which should report a duplicate symbol error and newest which
+# link.exe (and hence lld-link) doesn't understand.
+
+# RUN: cp %t.discard.obj %t.obj && lld-link /dll /noentry /nodefaultlib %t.discard.obj %t.obj
+# RUN: cp %t.one_only.obj %t.obj && not lld-link /dll /noentry /nodefaultlib %t.one_only.obj %t.obj 2>&1 | FileCheck --check-prefix=ONEONE %s
+# ONEONE: lld-link: error: duplicate symbol: symbol
+# RUN: cp %t.same_size.obj %t.obj && lld-link /dll /noentry /nodefaultlib %t.same_size.obj %t.obj
+# RUN: cp %t.same_contents.obj %t.obj && lld-link /dll /noentry /nodefaultlib %t.same_contents.obj %t.obj
+# RUN: cp %t.largest.obj %t.obj && lld-link /dll /noentry /nodefaultlib %t.largest.obj %t.obj
+# RUN: cp %t.newest.obj %t.obj && not lld-link /dll /noentry /nodefaultlib %t.newest.obj %t.obj 2>&1 | FileCheck --check-prefix=NEWNEW %s
+# NEWNEW: lld-link: error: unknown comdat type 7 for symbol
+
+# /force doesn't affect errors about unknown comdat types.
+# RUN: cp %t.newest.obj %t.obj && not lld-link /force /dll /noentry /nodefaultlib %t.newest.obj %t.obj 2>&1 | FileCheck --check-prefix=NEWNEWFORCE %s
+# NEWNEWFORCE: lld-link: error: unknown comdat type 7 for symbol
+
+# Check that same_size, same_contents, largest do what they're supposed to.
+
+# Check that the "same_size" selection produces an error if passed two symbols
+# with different size.
+# RUN: not lld-link /dll /noentry /nodefaultlib %t.same_size.obj %t.same_size.short.obj 2>&1 | FileCheck --check-prefix=SAMESIZEDUPE %s
+# SAMESIZEDUPE: lld-link: error: duplicate symbol: symbol
+
+# Check that the "same_contents" selection produces an error if passed two
+# symbols with different contents.
+# RUN: not lld-link /dll /noentry /nodefaultlib %t.same_contents.obj %t.same_contents.2.obj 2>&1 | FileCheck --check-prefix=SAMECONTENTSDUPE1 %s
+# SAMECONTENTSDUPE1: lld-link: error: duplicate symbol: symbol
+# RUN: not lld-link /dll /noentry /nodefaultlib %t.same_contents.obj %t.same_contents.2.obj 2>&1 | FileCheck --check-prefix=SAMECONTENTSDUPE2 %s
+# SAMECONTENTSDUPE2: lld-link: error: duplicate symbol: symbol
+
+# Check that the "largest" selection picks the larger comdat (independent of
+# the order the .obj files are passed on the commandline).
+# RUN: lld-link /opt:noref /include:symbol /dll /noentry /nodefaultlib %t.largest.obj %t.largest.short.2.obj /out:%t.exe
+# RUN: llvm-objdump -s %t.exe | FileCheck --check-prefix=LARGEST1 %s
+# LARGEST1: Contents of section .text:
+# LARGEST1:   180001000 01000000 ....
+
+# FIXME: Make this pass when /opt:noref is passed.
+# RUN: lld-link /include:symbol /dll /noentry /nodefaultlib %t.largest.short.2.obj %t.largest.obj /out:%t.exe
+# RUN: llvm-objdump -s %t.exe | FileCheck --check-prefix=LARGEST2 %s
+# LARGEST2: Contents of section .text:
+# LARGEST2:   180001000 01000000 ....
+
+
+# Test linking the same symbol with different comdat selection types.
+# link.exe generally rejects this, except for "largest" which is allowed to
+# combine with everything (https://bugs.llvm.org/show_bug.cgi?id=40094#c7).
+# lld-link rejects all comdat selection type mismatches. Spot-test just a few
+# combinations.
+
+# RUN: not lld-link /verbose /dll /noentry /nodefaultlib %t.discard.obj %t.one_only.obj 2>&1 | FileCheck --check-prefix=DISCARDONE %s
+# DISCARDONE: lld-link: conflicting comdat type for symbol: 2 in
+# DISCARDONE: lld-link: error: duplicate symbol: symbol
+# RUN: lld-link /verbose /force /dll /noentry /nodefaultlib %t.discard.obj %t.one_only.obj 2>&1 | FileCheck --check-prefix=DISCARDONEFORCE %s
+# DISCARDONEFORCE: lld-link: conflicting comdat type for symbol: 2 in
+# DISCARDONEFORCE: lld-link: warning: duplicate symbol: symbol
+
+# Make sure the error isn't depending on the order of .obj files.
+# RUN: not lld-link /verbose /dll /noentry /nodefaultlib %t.one_only.obj %t.discard.obj 2>&1 | FileCheck --check-prefix=ONEDISCARD %s
+# ONEDISCARD: lld-link: conflicting comdat type for symbol: 1 in
+# ONEDISCARD: lld-link: error: duplicate symbol: symbol
+
+# RUN: not lld-link /verbose /dll /noentry /nodefaultlib %t.same_contents.obj %t.same_size.obj 2>&1 | FileCheck --check-prefix=CONTENTSSIZE %s
+# CONTENTSSIZE: lld-link: conflicting comdat type for symbol: 4 in
+# CONTENTSSIZE: lld-link: error: duplicate symbol: symbol
+
+# Check that linking one 'discard' and one 'largest' has the effect of
+# 'largest'.
+# RUN: lld-link /dll /noentry /nodefaultlib %t.discard.short.2.obj %t.largest.obj
+# RUN: llvm-objdump -s %t.exe | FileCheck --check-prefix=DISCARDLARGEST %s
+# DISCARDLARGEST: Contents of section .text:
+# DISCARDLARGEST:   180001000 01000000 ....
+# RUN: lld-link /dll /noentry /nodefaultlib %t.largest.obj %t.discard.short.2.obj
+# RUN: llvm-objdump -s %t.exe | FileCheck --check-prefix=LARGESTDISCARD %s
+# LARGESTDISCARD: Contents of section .text:
+# LARGESTDISCARD:   180001000 01000000 ....
+
+
+# These cases are accepted by link.exe but not by lld-link.
+# RUN: not lld-link /verbose /dll /noentry /nodefaultlib %t.largest.obj %t.one_only.obj 2>&1 | FileCheck --check-prefix=LARGESTONE %s
+# LARGESTONE: lld-link: conflicting comdat type for symbol: 6 in
+# LARGESTONE: lld-link: error: duplicate symbol: symbol
diff --git a/deps/lld/test/COFF/common-replacement.s b/deps/lld/test/COFF/common-replacement.s
index 115ebe5bfd11b8c754af6c10ea74193dcf054e8c..3928b26874f60f6d842537444e6c1539f4b5fbb2 100644
--- a/deps/lld/test/COFF/common-replacement.s
+++ b/deps/lld/test/COFF/common-replacement.s
@@ -5,7 +5,7 @@
 
 # RUN: lld-link -lldmingw -entry:main %t1.obj %t2.obj -out:%t.exe -verbose 2>&1 \
 # RUN:   | FileCheck -check-prefix VERBOSE %s
-# RUN: llvm-readobj -s %t.exe | FileCheck -check-prefix SECTIONS %s
+# RUN: llvm-readobj -S %t.exe | FileCheck -check-prefix SECTIONS %s
 
 # VERBOSE: -aligncomm:"foo",2
 
diff --git a/deps/lld/test/COFF/common.test b/deps/lld/test/COFF/common.test
index 7d11da2ae150fc9e40264b4a4da11b8d944c1a90..23f746a58f880bddf43c68ea7235f39b7ff2a871 100644
--- a/deps/lld/test/COFF/common.test
+++ b/deps/lld/test/COFF/common.test
@@ -79,7 +79,7 @@ symbols:
     ComplexType:     IMAGE_SYM_DTYPE_NULL
     StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
   - Name:            bssdata16
-    Value:           16
+    Value:           15
     SectionNumber:   0
     SimpleType:      IMAGE_SYM_TYPE_NULL
     ComplexType:     IMAGE_SYM_DTYPE_NULL
diff --git a/deps/lld/test/COFF/conflict-mangled.test b/deps/lld/test/COFF/conflict-mangled.test
index 2f028ef6d5fdf11459192554b817d61df115a95a..eaaede537b2d4878142e847904c2f774798cf256 100644
--- a/deps/lld/test/COFF/conflict-mangled.test
+++ b/deps/lld/test/COFF/conflict-mangled.test
@@ -1,10 +1,13 @@
-# REQUIRES: system-windows
 # RUN: yaml2obj < %s > %t1.obj
 # RUN: yaml2obj < %s > %t2.obj
 # RUN: not lld-link /out:%t.exe %t1.obj %t2.obj >& %t.log
 # RUN: FileCheck %s < %t.log
+# RUN: not lld-link /out:%t.exe /demangle %t1.obj %t2.obj 2>&1 | FileCheck %s
+# RUN: not lld-link /out:%t.exe /demangle:no %t1.obj %t2.obj 2>&1 | FileCheck --check-prefix=NODEMANGLE %s
 
-# CHECK: duplicate symbol: "int __cdecl mangled(void)" (?mangled@@YAHXZ) in {{.+}}1.obj and in {{.+}}2.obj
+# NODEMANGLE: duplicate symbol: ?mangled@@YAHXZ in {{.+}}1.obj and in {{.+}}2.obj
+
+# CHECK: duplicate symbol: int __cdecl mangled(void) in {{.+}}1.obj and in {{.+}}2.obj
 
 --- !COFF
 header:
diff --git a/deps/lld/test/COFF/constant-export.test b/deps/lld/test/COFF/constant-export.test
index 80597660ce1993b79bdf71fd49e06b587dcbcdea..38ec4506304922459f0f0bd74ca687cb8bf5a85a 100644
--- a/deps/lld/test/COFF/constant-export.test
+++ b/deps/lld/test/COFF/constant-export.test
@@ -1,7 +1,7 @@
 # RUN: mkdir -p %t
 # RUN: yaml2obj -o %t/constant-export.obj %s
 # RUN: lld-link /machine:x86 /dll /entry:__CFConstantStringClassReference -out:%t/constant-export.dll %t/constant-export.obj
-# RUN: llvm-readobj -coff-exports %t/constant-export.lib | FileCheck %s
+# RUN: llvm-readobj --coff-exports %t/constant-export.lib | FileCheck %s
 
 # CHECK: Type: const
 # CHECK: Name type: noprefix
diff --git a/deps/lld/test/COFF/constant.test b/deps/lld/test/COFF/constant.test
index 02d6b3e2ccae7773c5ddab92b15a637a80975dae..dc97f1cb9a38f08b4dbf575c5c7612b9fa039cf2 100644
--- a/deps/lld/test/COFF/constant.test
+++ b/deps/lld/test/COFF/constant.test
@@ -2,5 +2,5 @@ REQUIRES: x86
 RUN: mkdir -p %t
 RUN: llvm-mc -triple i686-unknown-windows-msvc -filetype obj -o %t/import.o %S/Inputs/constant-import.s
 RUN: llc -mtriple i686-unknown-windows-msvc -filetype obj -o %t/export.o %S/Inputs/constant-export.ll
-RUN: lld-link -machine:x86 -dll -out:%t/export.dll %t/export.o -entry:__CFConstantStringClassReference
-RUN: lld-link -machine:x86 -dll -out:%t/import.dll %t/import.o %t/export.lib
+RUN: lld-link -safeseh:no -machine:x86 -dll -out:%t/export.dll %t/export.o -entry:__CFConstantStringClassReference
+RUN: lld-link -safeseh:no -machine:x86 -dll -out:%t/import.dll %t/import.o %t/export.lib
diff --git a/deps/lld/test/COFF/could-not-open.test b/deps/lld/test/COFF/could-not-open.test
index 87f11c34e7d45162f6588acd4f297de870f88075..91fe9ea6179782115c524762afdca7301926c192 100644
--- a/deps/lld/test/COFF/could-not-open.test
+++ b/deps/lld/test/COFF/could-not-open.test
@@ -1,5 +1,5 @@
 RUN: not lld-link 01 2>&1 | FileCheck %s
 
-CHECK:     could not open 01
+CHECK:     could not open '01'
 CHECK-NOT: /machine is not specified
 CHECK-NOT: subsystem must be defined
diff --git a/deps/lld/test/COFF/crt-chars.test b/deps/lld/test/COFF/crt-chars.test
index e685631bb504eca29e9c588646383aa6c39897c1..14051e265e1f9ddac1aef82c92c579a6545eba6d 100644
--- a/deps/lld/test/COFF/crt-chars.test
+++ b/deps/lld/test/COFF/crt-chars.test
@@ -1,6 +1,6 @@
 # RUN: yaml2obj %s > %t.obj
 # RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t.obj
-# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s
+# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s
 
 # CHECK: Name: .CRT
 # CHECK: Characteristics [
diff --git a/deps/lld/test/COFF/crt-dyn-initializer-order.test b/deps/lld/test/COFF/crt-dyn-initializer-order.test
index 963b0657793b59e6ffb0dec557a662edc7c72036..019f1bdf484b1f8bd1c3578021d855c522002a07 100644
--- a/deps/lld/test/COFF/crt-dyn-initializer-order.test
+++ b/deps/lld/test/COFF/crt-dyn-initializer-order.test
@@ -1,100 +1,100 @@
-# // a.cpp
-# #include <iostream>
-# #include <vector>
-# 
-# template <int Magic> struct TemplatedObject {
-#   static std::vector<TemplatedObject<Magic> *> Instances;
-#   TemplatedObject() { Instances.push_back(this); }
-# };
-# 
-# using Object = TemplatedObject<0>;
-# template <> std::vector<Object *> Object::Instances{};
-# Object idle{};
-# 
-# int main() {
-#   if (Object::Instances.size() == 0)
-#     std::cout << "It's broken" << std::endl;
-#   else
-#     std::cout << "It works!" << std::endl;
-#   return 0;
-# }
-# // using `clang-cl /c a.cpp | lld-link a.obj` works
-# // using `cl /c a.cpp | lld-link a.obj` fails without lld/COFF/Writer.cpp/Writer::sortSectionChunks()
-
-# RUN: yaml2obj %s > %t.obj
-# RUN: yaml2obj %S/Inputs/crt-dyn-initializer-order_1.yaml > %t1.obj
-# RUN: yaml2obj %S/Inputs/crt-dyn-initializer-order_2.yaml > %t2.obj
-
-# CHECK: Name: .CRT
-# CHECK: Characteristics [
-# CHECK-NEXT: IMAGE_SCN_CNT_INITIALIZED_DATA
-# CHECK-NEXT: IMAGE_SCN_MEM_READ
-# CHECK-NEXT: ]
-# CHECK-NEXT: SectionData (
-
-# RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t.obj %t1.obj %t2.obj 
-# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE1
-# CASE1-NEXT: 01020304 55701011 1205
-
-# RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t.obj %t2.obj %t1.obj 
-# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE2
-# CASE2-NEXT: 01020304 10111255 7005
-
-# RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t1.obj %t2.obj %t.obj 
-# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE3
-# CASE3-NEXT: 01557010 11120203 0405
-
-# RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t1.obj %t.obj %t2.obj 
-# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE4
-# CASE4-NEXT: 01557002 03041011 1205
-
-# RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t2.obj %t1.obj %t.obj 
-# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE5
-# CASE5-NEXT: 01101112 55700203 0405
-
-# RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t2.obj %t.obj %t1.obj
-# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE6
-# CASE6-NEXT: 01101112 02030455 7005
-
-# CHECK-NEXT: )
-
---- !COFF
-header:
-  Machine:         IMAGE_FILE_MACHINE_AMD64
-  Characteristics: [  ]
-sections:
-  - Name:            '.CRT$XCA'
-    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
-    Alignment:       1
-    SectionData:     01
-  - Name:            '.CRT$XCU'
-    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
-    Alignment:       1
-    SectionData:     02
-  - Name:            '.CRT$XCU'
-    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ, IMAGE_SCN_LNK_COMDAT ]
-    Alignment:       1
-    SectionData:     03
-  - Name:            '.CRT$XCU'
-    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
-    Alignment:       1
-    SectionData:     04
-  - Name:            '.CRT$XCZ'
-    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
-    Alignment:       1
-    SectionData:     05
-symbols:
-  - Name:            '.CRT$XCU'
-    Value:           0
-    SectionNumber:   3
-    SimpleType:      IMAGE_SYM_TYPE_NULL
-    ComplexType:     IMAGE_SYM_DTYPE_NULL
-    StorageClass:    IMAGE_SYM_CLASS_STATIC
-    SectionDefinition:
-      Length:          1
-      NumberOfRelocations: 0
-      NumberOfLinenumbers: 0
-      CheckSum:        1
-      Number:          2
-      Selection:       IMAGE_COMDAT_SELECT_ASSOCIATIVE
-...
+# // a.cpp
+# #include <iostream>
+# #include <vector>
+#
+# template <int Magic> struct TemplatedObject {
+#   static std::vector<TemplatedObject<Magic> *> Instances;
+#   TemplatedObject() { Instances.push_back(this); }
+# };
+#
+# using Object = TemplatedObject<0>;
+# template <> std::vector<Object *> Object::Instances{};
+# Object idle{};
+#
+# int main() {
+#   if (Object::Instances.size() == 0)
+#     std::cout << "It's broken" << std::endl;
+#   else
+#     std::cout << "It works!" << std::endl;
+#   return 0;
+# }
+# // using `clang-cl /c a.cpp | lld-link a.obj` works
+# // using `cl /c a.cpp | lld-link a.obj` fails without lld/COFF/Writer.cpp/Writer::sortSectionChunks()
+
+# RUN: yaml2obj %s > %t.obj
+# RUN: yaml2obj %S/Inputs/crt-dyn-initializer-order_1.yaml > %t1.obj
+# RUN: yaml2obj %S/Inputs/crt-dyn-initializer-order_2.yaml > %t2.obj
+
+# CHECK: Name: .CRT
+# CHECK: Characteristics [
+# CHECK-NEXT: IMAGE_SCN_CNT_INITIALIZED_DATA
+# CHECK-NEXT: IMAGE_SCN_MEM_READ
+# CHECK-NEXT: ]
+# CHECK-NEXT: SectionData (
+
+# RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t.obj %t1.obj %t2.obj
+# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE1
+# CASE1-NEXT: 01020304 55701011 1205
+
+# RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t.obj %t2.obj %t1.obj
+# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE2
+# CASE2-NEXT: 01020304 10111255 7005
+
+# RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t1.obj %t2.obj %t.obj
+# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE3
+# CASE3-NEXT: 01557010 11120203 0405
+
+# RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t1.obj %t.obj %t2.obj
+# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE4
+# CASE4-NEXT: 01557002 03041011 1205
+
+# RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t2.obj %t1.obj %t.obj
+# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE5
+# CASE5-NEXT: 01101112 55700203 0405
+
+# RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t2.obj %t.obj %t1.obj
+# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE6
+# CASE6-NEXT: 01101112 02030455 7005
+
+# CHECK-NEXT: )
+
+--- !COFF
+header:
+  Machine:         IMAGE_FILE_MACHINE_AMD64
+  Characteristics: [  ]
+sections:
+  - Name:            '.CRT$XCA'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
+    Alignment:       1
+    SectionData:     01
+  - Name:            '.CRT$XCU'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
+    Alignment:       1
+    SectionData:     02
+  - Name:            '.CRT$XCU'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ, IMAGE_SCN_LNK_COMDAT ]
+    Alignment:       1
+    SectionData:     03
+  - Name:            '.CRT$XCU'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
+    Alignment:       1
+    SectionData:     04
+  - Name:            '.CRT$XCZ'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
+    Alignment:       1
+    SectionData:     05
+symbols:
+  - Name:            '.CRT$XCU'
+    Value:           0
+    SectionNumber:   3
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          1
+      NumberOfRelocations: 0
+      NumberOfLinenumbers: 0
+      CheckSum:        1
+      Number:          2
+      Selection:       IMAGE_COMDAT_SELECT_ASSOCIATIVE
+...
diff --git a/deps/lld/test/COFF/debug-reloc.s b/deps/lld/test/COFF/debug-reloc.s
index 897f31a6b5ed71c15e7bda6784b92bc9abb83c8f..bdf2563156540a258cbfd6dd11a755d3e954deb5 100644
--- a/deps/lld/test/COFF/debug-reloc.s
+++ b/deps/lld/test/COFF/debug-reloc.s
@@ -3,10 +3,10 @@
 # RUN: llvm-mc -triple=x86_64-windows-gnu %s -filetype=obj -o %t.obj
 
 # RUN: lld-link -lldmingw -debug:dwarf -out:%t.exe -entry:mainfunc -subsystem:console %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck %s -check-prefix SECTIONS
-# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck %s -check-prefix RELOCS
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s -check-prefix HEADERS
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck %s -check-prefix DEBUG
+# RUN: llvm-readobj --sections %t.exe | FileCheck %s -check-prefix SECTIONS
+# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck %s -check-prefix RELOCS
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s -check-prefix HEADERS
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck %s -check-prefix DEBUG
 
 # SECTIONS:         Number: 3
 # SECTIONS-NEXT:    Name: .buildid (2E 62 75 69 6C 64 69 64)
diff --git a/deps/lld/test/COFF/def-export-stdcall.s b/deps/lld/test/COFF/def-export-stdcall.s
index fd1ec2ca3ace9155a8ecd3798d6c2d6cf44033f0..f015e205c74a33ddeab796578e88fdd5b2c906f9 100644
--- a/deps/lld/test/COFF/def-export-stdcall.s
+++ b/deps/lld/test/COFF/def-export-stdcall.s
@@ -1,9 +1,9 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=i686-windows-msvc %s -o %t.obj
 # RUN: echo -e "LIBRARY foo\nEXPORTS\n  stdcall\n  fastcall\n  vectorcall\n  _underscored" > %t.def
-# RUN: lld-link -entry:dllmain -dll -def:%t.def %t.obj -out:%t.dll -implib:%t.lib
+# RUN: lld-link -safeseh:no -entry:dllmain -dll -def:%t.def %t.obj -out:%t.dll -implib:%t.lib
 # RUN: llvm-readobj %t.lib | FileCheck -check-prefix UNDECORATED-IMPLIB %s
-# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix UNDECORATED-EXPORTS %s
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix UNDECORATED-EXPORTS %s
 
 # UNDECORATED-IMPLIB: Name type: noprefix
 # UNDECORATED-IMPLIB-NEXT: __imp___underscored
@@ -25,9 +25,9 @@
 
 
 # RUN: echo -e "LIBRARY foo\nEXPORTS\n  _stdcall@8\n  @fastcall@8\n  vectorcall@@8" > %t.def
-# RUN: lld-link -entry:dllmain -dll -def:%t.def %t.obj -out:%t.dll -implib:%t.lib
+# RUN: lld-link -safeseh:no -entry:dllmain -dll -def:%t.def %t.obj -out:%t.dll -implib:%t.lib
 # RUN: llvm-readobj %t.lib | FileCheck -check-prefix DECORATED-IMPLIB %s
-# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix DECORATED-EXPORTS %s
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix DECORATED-EXPORTS %s
 
 # DECORATED-IMPLIB: Name type: name
 # DECORATED-IMPLIB-NEXT: __imp_@fastcall@8
@@ -48,7 +48,7 @@
 # RUN: echo -e "LIBRARY foo\nEXPORTS\n  stdcall@8\n  @fastcall@8\n  vectorcall@@8" > %t.def
 # RUN: lld-link -lldmingw -entry:dllmain -dll -def:%t.def %t.obj -out:%t.dll -implib:%t.lib
 # RUN: llvm-readobj %t.lib | FileCheck -check-prefix DECORATED-MINGW-IMPLIB %s
-# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix DECORATED-MINGW-EXPORTS %s
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix DECORATED-MINGW-EXPORTS %s
 
 # DECORATED-MINGW-IMPLIB: Name type: name
 # DECORATED-MINGW-IMPLIB-NEXT: __imp_@fastcall@8
@@ -68,11 +68,11 @@
 
 # RUN: lld-link -lldmingw -kill-at -entry:dllmain -dll -def:%t.def %t.obj -out:%t.dll -implib:%t.lib
 # RUN: llvm-readobj %t.lib | FileCheck -check-prefix MINGW-KILL-AT-IMPLIB %s
-# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix MINGW-KILL-AT-EXPORTS %s
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix MINGW-KILL-AT-EXPORTS %s
 
 # RUN: lld-link -lldmingw -kill-at -entry:dllmain -dll %t.obj -out:%t.dll -implib:%t.lib
 # RUN: llvm-readobj %t.lib | FileCheck -check-prefix MINGW-KILL-AT-IMPLIB %s
-# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix MINGW-KILL-AT-EXPORTS %s
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix MINGW-KILL-AT-EXPORTS %s
 
 # MINGW-KILL-AT-IMPLIB: Name type: noprefix
 # MINGW-KILL-AT-IMPLIB: __imp__fastcall
diff --git a/deps/lld/test/COFF/delayimports-armnt.yaml b/deps/lld/test/COFF/delayimports-armnt.yaml
index a080d028d20f9ce826fe5030e3a564f833605e35..643787701812128f4475a91ed3135cd3260e602a 100644
--- a/deps/lld/test/COFF/delayimports-armnt.yaml
+++ b/deps/lld/test/COFF/delayimports-armnt.yaml
@@ -3,8 +3,8 @@
 # RUN: lld-link %t.obj %p/Inputs/library.lib /subsystem:console \
 # RUN:   /entry:mainCRTStartup /alternatename:__delayLoadHelper2=mainCRTStartup \
 # RUN:   /delayload:library.dll /out:%t.exe
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
-# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
+# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
 # RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=DISASM %s
 
 # IMPORT:      Format: COFF-ARM
@@ -35,7 +35,7 @@
 # BASEREL-NEXT:   }
 # BASEREL-NEXT:   Entry {
 # BASEREL-NEXT:     Type: ARM_MOV32(T)
-# BASEREL-NEXT:     Address: 0x1022
+# BASEREL-NEXT:     Address: 0x1026
 # BASEREL-NEXT:   }
 # BASEREL-NEXT:   Entry {
 # BASEREL-NEXT:     Type: ABSOLUTE
@@ -53,13 +53,14 @@
 #
 # DISASM:      40100c:       43 f2 08 0c     movw r12, #12296
 # DISASM-NEXT:               c0 f2 40 0c     movt    r12, #64
+# DISASM-NEXT:               00 f0 00 b8     b.w     #0
 # DISASM-NEXT:               2d e9 0f 48     push.w  {r0, r1, r2, r3, r11, lr}
 # DISASM-NEXT:               0d f2 10 0b     addw    r11, sp, #16
 # DISASM-NEXT:               2d ed 10 0b     vpush   {d0, d1, d2, d3, d4, d5, d6, d7}
 # DISASM-NEXT:               61 46           mov     r1, r12
 # DISASM-NEXT:               42 f2 00 00     movw r0, #8192
 # DISASM-NEXT:               c0 f2 40 00     movt    r0, #64
-# DISASM-NEXT:               ff f7 e9 ff     bl      #-46
+# DISASM-NEXT:               ff f7 e7 ff     bl      #-50
 # DISASM-NEXT:               84 46           mov     r12, r0
 # DISASM-NEXT:               bd ec 10 0b     vpop    {d0, d1, d2, d3, d4, d5, d6, d7}
 # DISASM-NEXT:               bd e8 0f 48     pop.w   {r0, r1, r2, r3, r11, lr}
diff --git a/deps/lld/test/COFF/delayimports.test b/deps/lld/test/COFF/delayimports.test
index c6888b31720eac22ed8cf68e142932e46e111b20..3a6db67e98db2fc57ccad432c2e40657237198ca 100644
--- a/deps/lld/test/COFF/delayimports.test
+++ b/deps/lld/test/COFF/delayimports.test
@@ -1,8 +1,8 @@
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console \
 # RUN:   %p/Inputs/hello64.obj %p/Inputs/std64.lib /delayload:STD64.DLL \
 # RUN:   /alternatename:__delayLoadHelper2=main
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
-# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
+# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
 
 IMPORT:      DelayImport {
 IMPORT-NEXT:   Name: std64.dll
@@ -18,11 +18,11 @@ IMPORT-NEXT:     Address: 0x140001066
 IMPORT-NEXT:   }
 IMPORT-NEXT:   Import {
 IMPORT-NEXT:     Symbol:  (50)
-IMPORT-NEXT:     Address: 0x1400010BD
+IMPORT-NEXT:     Address: 0x140001072
 IMPORT-NEXT:   }
 IMPORT-NEXT:   Import {
 IMPORT-NEXT:     Symbol: MessageBoxA (0)
-IMPORT-NEXT:     Address: 0x140001114
+IMPORT-NEXT:     Address: 0x14000107E
 IMPORT-NEXT:   }
 IMPORT-NEXT: }
 
diff --git a/deps/lld/test/COFF/delayimports32.test b/deps/lld/test/COFF/delayimports32.test
index 9aa8f8697d4c3adab6c94fc7af4f70f9afffe5e2..0fc90200c1bfa452dd01cceecb110aec000dcc7c 100644
--- a/deps/lld/test/COFF/delayimports32.test
+++ b/deps/lld/test/COFF/delayimports32.test
@@ -1,10 +1,10 @@
 # REQUIRES: x86
 # RUN: yaml2obj < %p/Inputs/hello32.yaml > %t.obj
-# RUN: lld-link %t.obj %p/Inputs/std32.lib /subsystem:console \
+# RUN: lld-link -safeseh:no %t.obj %p/Inputs/std32.lib /subsystem:console \
 # RUN:   /entry:main@0 /alternatename:___delayLoadHelper2@8=_main@0 \
 # RUN:   /delayload:std32.dll /out:%t.exe
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
-# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
+# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
 # RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=DISASM %s
 
 IMPORT:      Format: COFF-i386
@@ -24,7 +24,7 @@ IMPORT-NEXT:     Address: 0x401029
 IMPORT-NEXT:   }
 IMPORT-NEXT:   Import {
 IMPORT-NEXT:     Symbol: MessageBoxA (0)
-IMPORT-NEXT:     Address: 0x40103E
+IMPORT-NEXT:     Address: 0x401033
 IMPORT-NEXT:   }
 IMPORT-NEXT: }
 
@@ -47,19 +47,19 @@ BASEREL-NEXT:     Address: 0x1025
 BASEREL-NEXT:   }
 BASEREL-NEXT:   Entry {
 BASEREL-NEXT:     Type: HIGHLOW
-BASEREL-NEXT:     Address: 0x102C
+BASEREL-NEXT:     Address: 0x102A
 BASEREL-NEXT:   }
 BASEREL-NEXT:   Entry {
 BASEREL-NEXT:     Type: HIGHLOW
-BASEREL-NEXT:     Address: 0x1031
+BASEREL-NEXT:     Address: 0x1034
 BASEREL-NEXT:   }
 BASEREL-NEXT:   Entry {
 BASEREL-NEXT:     Type: HIGHLOW
 BASEREL-NEXT:     Address: 0x1041
 BASEREL-NEXT:   }
 BASEREL-NEXT:   Entry {
-BASEREL-NEXT:     Type: HIGHLOW
-BASEREL-NEXT:     Address: 0x1046
+BASEREL-NEXT:     Type: ABSOLUTE
+BASEREL-NEXT:     Address: 0x1000
 BASEREL-NEXT:   }
 BASEREL-NEXT:   Entry {
 BASEREL-NEXT:     Type: HIGHLOW
@@ -71,17 +71,15 @@ BASEREL-NEXT:     Address: 0x3024
 BASEREL-NEXT:   }
 BASEREL-NEXT: ]
 
-DISASM:      102b:      68 20 30 40 00  pushl   $4206624
-DISASM-NEXT: 1030:      68 00 20 40 00  pushl   $4202496
-DISASM-NEXT: 1035:      e8 c6 ff ff ff  calll   -58 <.text>
-DISASM-NEXT: 103a:      5a      popl    %edx
-DISASM-NEXT: 103b:      59      popl    %ecx
-DISASM-NEXT: 103c:      ff e0   jmpl    *%eax
-DISASM-NEXT: 103e:      51      pushl   %ecx
-DISASM-NEXT: 103f:      52      pushl   %edx
-DISASM-NEXT: 1040:      68 24 30 40 00  pushl   $4206628
-DISASM-NEXT: 1045:      68 00 20 40 00  pushl   $4202496
-DISASM-NEXT: 104a:      e8 b1 ff ff ff  calll   -79 <.text>
-DISASM-NEXT: 104f:      5a      popl    %edx
-DISASM-NEXT: 1050:      59      popl    %ecx
-DISASM-NEXT: 1051:      ff e0   jmpl    *%eax
+DISASM:      1029:      b8 20 30 40 00  movl    $4206624, %eax
+DISASM-NEXT: 102e:      e9 0a 00 00 00  jmp     10 <.text+0x3d>
+DISASM-NEXT: 1033:      b8 24 30 40 00  movl    $4206628, %eax
+DISASM-NEXT: 1038:      e9 00 00 00 00  jmp     0 <.text+0x3d>
+DISASM-NEXT: 103d:      51      pushl   %ecx
+DISASM-NEXT: 103e:      52      pushl   %edx
+DISASM-NEXT: 103f:      50      pushl   %eax
+DISASM-NEXT: 1040:      68 00 20 40 00  pushl   $4202496
+DISASM-NEXT: 1045:      e8 b6 ff ff ff  calll   -74 <.text>
+DISASM-NEXT: 104a:      5a      popl    %edx
+DISASM-NEXT: 104b:      59      popl    %ecx
+DISASM-NEXT: 104c:      ff e0   jmpl    *%eax
diff --git a/deps/lld/test/COFF/delayimporttables.yaml b/deps/lld/test/COFF/delayimporttables.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..aaf755af0baf1e471af5a73602769decc1c07462
--- /dev/null
+++ b/deps/lld/test/COFF/delayimporttables.yaml
@@ -0,0 +1,122 @@
+# RUN: yaml2obj %p/Inputs/delayimporttables-dll1.yaml > %t1.obj
+# RUN: yaml2obj %p/Inputs/delayimporttables-dll2.yaml > %t2.obj
+# RUN: yaml2obj %s > %t.obj
+# RUN: lld-link /nodefaultlib /entry:DllMain /out:%T/delayimporttables-dll1.dll /dll /implib:%t-dll1.lib %t1.obj
+# RUN: lld-link /nodefaultlib /entry:DllMain /out:%T/delayimporttables-dll2.dll /dll /implib:%t-dll2.lib %t2.obj
+# RUN: lld-link /nodefaultlib /entry:main /out:%t.exe /delayload:delayimporttables-dll1.dll /delayload:delayimporttables-dll2.dll %t.obj %t-dll1.lib %t-dll2.lib
+# RUN: llvm-readobj --coff-imports %t.exe |FileCheck %s
+
+#      CHECK: Format: COFF-x86-64
+# CHECK-NEXT: Arch: x86_64
+# CHECK-NEXT: AddressSize: 64bit
+# CHECK-NEXT: DelayImport {
+# CHECK-NEXT:   Name: delayimporttables-dll1.dll
+# CHECK-NEXT:   Attributes: 0x1
+# CHECK-NEXT:   ModuleHandle: 0x3000
+# CHECK-NEXT:   ImportAddressTable: 0x3010
+# CHECK-NEXT:   ImportNameTable: 0x2060
+# CHECK-NEXT:   BoundDelayImportTable: 0x0
+# CHECK-NEXT:   UnloadDelayImportTable: 0x0
+# CHECK-NEXT:   Import {
+# CHECK-NEXT:     Symbol: one (0)
+# CHECK-NEXT:     Address: 0x14000104D
+# CHECK-NEXT:   }
+# CHECK-NEXT:   Import {
+# CHECK-NEXT:     Symbol: two (0)
+# CHECK-NEXT:     Address: 0x140001059
+# CHECK-NEXT:   }
+# CHECK-NEXT: }
+# CHECK-NEXT: DelayImport {
+# CHECK-NEXT:   Name: delayimporttables-dll2.dll
+# CHECK-NEXT:   Attributes: 0x1
+# CHECK-NEXT:   ModuleHandle: 0x3008
+# CHECK-NEXT:   ImportAddressTable: 0x3028
+# CHECK-NEXT:   ImportNameTable: 0x2078
+# CHECK-NEXT:   BoundDelayImportTable: 0x0
+# CHECK-NEXT:   UnloadDelayImportTable: 0x0
+# CHECK-NEXT:   Import {
+# CHECK-NEXT:     Symbol: left (0)
+# CHECK-NEXT:     Address: 0x1400010B8
+# CHECK-NEXT:   }
+# CHECK-NEXT:   Import {
+# CHECK-NEXT:     Symbol: right (0)
+# CHECK-NEXT:     Address: 0x1400010C4
+# CHECK-NEXT:   }
+# CHECK-NEXT: }
+
+--- !COFF
+header:
+  Machine:         IMAGE_FILE_MACHINE_AMD64
+  Characteristics: [  ]
+sections:
+  - Name:            .drectve
+    Characteristics: [ IMAGE_SCN_LNK_INFO, IMAGE_SCN_LNK_REMOVE ]
+    Alignment:       1
+    SectionData:     2020202F44454641554C544C49423A224C4942434D5422202F44454641554C544C49423A224F4C444E414D45532220
+  - Name:            '.text$mn'
+    Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
+    Alignment:       16
+    SectionData:     4889542410894C24084883EC28FF1500000000FF1500000000FF1500000000FF150000000033C04883C428C3CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC488954241048894C240833C0C3
+    Relocations:
+      - VirtualAddress:  15
+        SymbolName:      __imp_one
+        Type:            IMAGE_REL_AMD64_REL32
+      - VirtualAddress:  21
+        SymbolName:      __imp_two
+        Type:            IMAGE_REL_AMD64_REL32
+      - VirtualAddress:  27
+        SymbolName:      __imp_left
+        Type:            IMAGE_REL_AMD64_REL32
+      - VirtualAddress:  33
+        SymbolName:      __imp_right
+        Type:            IMAGE_REL_AMD64_REL32
+symbols:
+  - Name:            .drectve
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          47
+      NumberOfRelocations: 0
+      NumberOfLinenumbers: 0
+      CheckSum:        0
+      Number:          0
+  - Name:            __imp_one
+    Value:           0
+    SectionNumber:   0
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+  - Name:            __imp_two
+    Value:           0
+    SectionNumber:   0
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+  - Name:            __imp_left
+    Value:           0
+    SectionNumber:   0
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+  - Name:            __imp_right
+    Value:           0
+    SectionNumber:   0
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+  - Name:            main
+    Value:           0
+    SectionNumber:   2
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+  - Name:            __delayLoadHelper2
+    Value:           64
+    SectionNumber:   2
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+...
diff --git a/deps/lld/test/COFF/dll.test b/deps/lld/test/COFF/dll.test
index f04e28c561bfa6eb3d58c1ec0dc9701f4b54bec2..b2681609beecf2fca2cdc5fbdd112d45f8269ad2 100644
--- a/deps/lld/test/COFF/dll.test
+++ b/deps/lld/test/COFF/dll.test
@@ -42,10 +42,10 @@ EXPORT-LTO-NEXT:       3   0x1030  exportfn3
 # RUN:   /export:exportfn1 /export:exportfn2
 # RUN: yaml2obj < %p/Inputs/import.yaml > %t2.obj
 # RUN: lld-link /out:%t2.exe /entry:main %t2.obj %t2.lib
-# RUN: llvm-readobj -coff-imports %t2.exe | FileCheck -check-prefix=IMPORT %s
+# RUN: llvm-readobj --coff-imports %t2.exe | FileCheck -check-prefix=IMPORT %s
 
 # RUN: lld-link /out:%t2.lto.exe /entry:main %t2.obj %t.lto.lib
-# RUN: llvm-readobj -coff-imports %t2.lto.exe | FileCheck -check-prefix=IMPORT %s
+# RUN: llvm-readobj --coff-imports %t2.lto.exe | FileCheck -check-prefix=IMPORT %s
 
 IMPORT: Symbol: exportfn1
 IMPORT: Symbol: exportfn2
diff --git a/deps/lld/test/COFF/dllexport.s b/deps/lld/test/COFF/dllexport.s
index 78d97c978748aaf2a42ee46df83752674258ad3f..a238b70ce1b4f698def930ca91083da619c99b7d 100644
--- a/deps/lld/test/COFF/dllexport.s
+++ b/deps/lld/test/COFF/dllexport.s
@@ -1,9 +1,9 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=i686-windows-msvc %s -o %t.obj
 
-# RUN: lld-link -entry:dllmain -dll %t.obj -out:%t.dll -implib:%t.lib
+# RUN: lld-link -safeseh:no -entry:dllmain -dll %t.obj -out:%t.dll -implib:%t.lib
 # RUN: llvm-readobj %t.lib | FileCheck -check-prefix DECORATED-IMPLIB %s
-# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix DECORATED-EXPORTS %s
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix DECORATED-EXPORTS %s
 
 # DECORATED-IMPLIB: Name type: name
 # DECORATED-IMPLIB-NEXT: __imp_@fastcall@8
diff --git a/deps/lld/test/COFF/dllimport-gc.test b/deps/lld/test/COFF/dllimport-gc.test
index d8523fbc7dae9a7930ed6a9fa34c232b66b3669e..83864d890c2c5299789f1ad2f7b6ae0e81f1885f 100644
--- a/deps/lld/test/COFF/dllimport-gc.test
+++ b/deps/lld/test/COFF/dllimport-gc.test
@@ -6,11 +6,11 @@
 # RUN: yaml2obj < %s > %t.obj
 
 # RUN: lld-link /out:%t1.exe /entry:main %t.obj %t-oldname.obj %t.lib
-# RUN: llvm-readobj -coff-imports %t1.exe | FileCheck -check-prefix=REF %s
+# RUN: llvm-readobj --coff-imports %t1.exe | FileCheck -check-prefix=REF %s
 # REF-NOT: Symbol: exportfn1
 
 # RUN: lld-link /out:%t2.exe /entry:main %t.obj %t-oldname.obj %t.lib /opt:noref
-# RUN: llvm-readobj -coff-imports %t2.exe | FileCheck -check-prefix=NOREF %s
+# RUN: llvm-readobj --coff-imports %t2.exe | FileCheck -check-prefix=NOREF %s
 # NOREF: Symbol: exportfn1
 
 --- !COFF
diff --git a/deps/lld/test/COFF/driver.test b/deps/lld/test/COFF/driver.test
index aef7046d198bcaa7b58bf29b8a2815a54da22394..44abe4d63ee1d4e36c6f920dca81cff4d3b08705 100644
--- a/deps/lld/test/COFF/driver.test
+++ b/deps/lld/test/COFF/driver.test
@@ -1,6 +1,6 @@
 # RUN: not lld-link nosuchfile.obj >& %t.log
 # RUN: FileCheck -check-prefix=MISSING %s < %t.log
-MISSING: nosuchfile.obj: {{[Nn]}}o such file or directory
+MISSING: 'nosuchfile.obj': {{[Nn]}}o such file or directory
 
 # RUN: lld-link --version | FileCheck -check-prefix=VERSION %s
 VERSION: {{LLD [0-9]+\.[0-9]+}}
@@ -15,3 +15,25 @@ LIBHELP: OVERVIEW: LLVM Lib
 
 # RUN: not lld-link /WX /lib 2>&1 | FileCheck -check-prefix=LIBBAD %s
 LIBBAD: ignoring /lib since it's not the first argument
+
+# RUN: yaml2obj < %p/Inputs/hello32.yaml > %t.obj
+# RUN: not lld-link /out:/ %t.obj 2>&1 | FileCheck -check-prefix=DIR %s
+DIR: cannot open output file
+
+# RUN: not lld-link -version 2>&1 | FileCheck -check-prefix=SPELLVERSION %s
+SPELLVERSION: ignoring unknown argument '-version', did you mean '--version'
+SPELLVERSION: no input files
+
+# RUN: not lld-link -nodefaultlibs 2>&1 | FileCheck -check-prefix=SPELLNODEFAULTLIB %s
+SPELLNODEFAULTLIB: ignoring unknown argument '-nodefaultlibs', did you mean '-nodefaultlib'
+SPELLNODEFAULTLIB: no input files
+
+# RUN: not lld-link /nodefaultlibs 2>&1 | FileCheck -check-prefix=SPELLNODEFAULTLIB_SLASH %s
+SPELLNODEFAULTLIB_SLASH: could not open '/nodefaultlibs': {{.*}}; did you mean '/nodefaultlib'
+SPELLNODEFAULTLIB_SLASH-NOT: no input files
+
+# Getting flags as typo corrections for normal input files is a side effect
+# of how spell checking for /-style flags is implemented.
+# RUN: not lld-link force 2>&1 | FileCheck -check-prefix=SPELLFORCE %s
+SPELLFORCE: could not open 'force': {{.*}}; did you mean '/force'
+SPELLFORCE-NOT: no input files
diff --git a/deps/lld/test/COFF/eh_frame_suffix_sorting.s b/deps/lld/test/COFF/eh_frame_suffix_sorting.s
new file mode 100644
index 0000000000000000000000000000000000000000..f920751a9a202f609c98229fa9593c9921ea57a7
--- /dev/null
+++ b/deps/lld/test/COFF/eh_frame_suffix_sorting.s
@@ -0,0 +1,39 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -triple=i686-windows-gnu %s -filetype=obj -o %t.main.o
+# RUN: llvm-mc -filetype=obj -triple=i686-windows-gnu \
+# RUN:   %p/Inputs/eh_frame_terminator-crtend.s -o %t.crtend.o
+
+# RUN: lld-link -lldmingw -entry:main %t.main.o %t.crtend.o -out:%t.exe
+# RUN: llvm-objdump -s %t.exe | FileCheck %s
+
+# Check that the contents of .eh_frame$foo was placed before .eh_frame from
+# crtend.o, even if the former had a section name suffix.
+
+# CHECK: Contents of section .eh_fram:
+# CHECK:  403000 4203
+
+        .text
+        .def            _main;
+        .scl            2;
+        .type           32;
+        .endef
+        .globl          _main
+        .p2align        4, 0x90
+_main:
+        call            _foo
+        ret
+
+        .section        .eh_frame$foo,"dr"
+        .linkonce       discard
+        .byte           0x42
+
+        .def            _foo;
+        .scl            2;
+        .type           32;
+        .endef
+        .section        .text$foo,"xr",discard,foo
+        .globl          _foo
+        .p2align        4
+_foo:
+        ret
diff --git a/deps/lld/test/COFF/eh_frame_terminator.s b/deps/lld/test/COFF/eh_frame_terminator.s
new file mode 100644
index 0000000000000000000000000000000000000000..001485a92bffbf4e4e93784c70c5f6ba2afcfe90
--- /dev/null
+++ b/deps/lld/test/COFF/eh_frame_terminator.s
@@ -0,0 +1,26 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64-windows-gnu %s -o %t.main.o
+// RUN: llvm-mc -filetype=obj -triple=x86_64-windows-gnu \
+// RUN:   %p/Inputs/eh_frame_terminator-otherfunc.s -o %t.otherfunc.o
+// RUN: llvm-mc -filetype=obj -triple=x86_64-windows-gnu \
+// RUN:   %p/Inputs/eh_frame_terminator-crtend.s -o %t.crtend.o
+// RUN: rm -f %t.otherfunc.lib
+// RUN: llvm-ar rcs %t.otherfunc.lib %t.otherfunc.o
+// RUN: lld-link -lldmingw %t.main.o %t.otherfunc.lib %t.crtend.o -out:%t.exe
+// RUN: llvm-objdump -s %t.exe | FileCheck %s
+
+    .text
+    .globl main
+main:
+    call otherfunc
+    ret
+
+    .globl mainCRTStartup
+mainCRTStartup:
+    call main
+
+    .section .eh_frame,"dr"
+    .byte 1
+
+// CHECK: Contents of section .eh_fram:
+// CHECK-NEXT: 140003000 010203
diff --git a/deps/lld/test/COFF/entry-drectve.test b/deps/lld/test/COFF/entry-drectve.test
index e51e7cb201f3f4df3eeafb2a93d855bfbedf4122..0848b0a04aeeef6e8a8b5f5ab6133277a866a08b 100644
--- a/deps/lld/test/COFF/entry-drectve.test
+++ b/deps/lld/test/COFF/entry-drectve.test
@@ -1,5 +1,5 @@
 # RUN: yaml2obj < %s > %t.obj
-# RUN: lld-link /subsystem:console /out:%t.exe %t.obj
+# RUN: lld-link -safeseh:no /subsystem:console /out:%t.exe %t.obj
 
 --- !COFF
 header:
diff --git a/deps/lld/test/COFF/entry-inference-mingw.s b/deps/lld/test/COFF/entry-inference-mingw.s
index cf356205eb22dd2e7d12fb1a90330e64458ddc13..52bea8b129c32bbac08d1b294192f77ed4ddd45d 100644
--- a/deps/lld/test/COFF/entry-inference-mingw.s
+++ b/deps/lld/test/COFF/entry-inference-mingw.s
@@ -5,9 +5,9 @@
 # RUN: lld-link -lldmingw %t.o -out:%t-cui.exe -subsystem:console 2>&1 | FileCheck -allow-empty -check-prefix=LINK %s
 # RUN: lld-link -lldmingw %t.o -out:%t-gui.exe -subsystem:windows 2>&1 | FileCheck -allow-empty -check-prefix=LINK %s
 
-# RUN: llvm-readobj -file-headers %t-default.exe | FileCheck -check-prefix=CUI %s
-# RUN: llvm-readobj -file-headers %t-cui.exe | FileCheck -check-prefix=CUI %s
-# RUN: llvm-readobj -file-headers %t-gui.exe | FileCheck -check-prefix=GUI %s
+# RUN: llvm-readobj --file-headers %t-default.exe | FileCheck -check-prefix=CUI %s
+# RUN: llvm-readobj --file-headers %t-cui.exe | FileCheck -check-prefix=CUI %s
+# RUN: llvm-readobj --file-headers %t-gui.exe | FileCheck -check-prefix=GUI %s
 
 # Check that this doesn't print any warnings.
 # LINK-NOT: found both wmain and main
diff --git a/deps/lld/test/COFF/entry-inference332.test b/deps/lld/test/COFF/entry-inference332.test
index 75c557af47e8673d9663d7c704f6c135c0be38a7..ddeaf280a9ec22c082cfe0eca6774fcd6edc9037 100644
--- a/deps/lld/test/COFF/entry-inference332.test
+++ b/deps/lld/test/COFF/entry-inference332.test
@@ -1,9 +1,9 @@
 # RUN: sed -e s/ENTRYNAME/_mainCRTStartup/ %s | yaml2obj > %t.obj
-# RUN: lld-link /subsystem:console /out:%t.exe %t.obj /verbose /nodefaultlib > %t.log 2>&1
+# RUN: lld-link -safeseh:no /subsystem:console /out:%t.exe %t.obj /verbose /nodefaultlib > %t.log 2>&1
 # RUN: FileCheck %s < %t.log
 
 # RUN: sed -e s/ENTRYNAME/?mainCRTStartup@@YAHXZ/ %s | yaml2obj > %t.obj
-# RUN: lld-link /subsystem:console /out:%t.exe %t.obj /verbose /nodefaultlib > %t.log 2>&1
+# RUN: lld-link -safeseh:no /subsystem:console /out:%t.exe %t.obj /verbose /nodefaultlib > %t.log 2>&1
 # RUN: FileCheck %s < %t.log
 
 # CHECK: Entry name inferred: _mainCRTStartup
diff --git a/deps/lld/test/COFF/error-limit.test b/deps/lld/test/COFF/error-limit.test
index 09c3b9d07f30eb936b23ce39d513510baccfdbfa..eddd2ab9a64dc0142116e1df8129374ee2d92a3a 100644
--- a/deps/lld/test/COFF/error-limit.test
+++ b/deps/lld/test/COFF/error-limit.test
@@ -1,26 +1,26 @@
 RUN: not lld-link 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 \
 RUN:   21 22 2>&1 | FileCheck -check-prefix=DEFAULT %s
 
-DEFAULT:      could not open 01
-DEFAULT:      could not open 20
+DEFAULT:      could not open '01'
+DEFAULT:      could not open '20'
 DEFAULT-NEXT: too many errors emitted, stopping now (use /errorlimit:0 to see all errors)
-DEFAULT-NOT:  could not open 21
+DEFAULT-NOT:  could not open '21'
 
 RUN: not lld-link /errorlimit:5 01 02 03 04 05 06 07 08 09 10 2>&1 \
 RUN:   | FileCheck -check-prefix=LIMIT5 %s
 
-LIMIT5:      could not open 01
-LIMIT5:      could not open 05
+LIMIT5:      could not open '01'
+LIMIT5:      could not open '05'
 LIMIT5-NEXT: too many errors emitted, stopping now (use /errorlimit:0 to see all errors)
-LIMIT5-NOT:  could not open 06
+LIMIT5-NOT:  could not open '06'
 
 RUN: not lld-link /errorlimit:0 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 \
 RUN:   16 17 18 19 20 21 22 2>&1 | FileCheck -check-prefix=UNLIMITED %s
 
-UNLIMITED:     could not open 01
-UNLIMITED:     could not open 20
-UNLIMITED:     could not open 21
-UNLIMITED:     could not open 22
+UNLIMITED:     could not open '01'
+UNLIMITED:     could not open '20'
+UNLIMITED:     could not open '21'
+UNLIMITED:     could not open '22'
 UNLIMITED-NOT: too many errors emitted, stopping now (use /errorlimit:0 to see all errors)
 
 RUN: not lld-link /errorlimit:XYZ 01 02 03 04 05 06 07 08 09 10 11 12 13 14 \
diff --git a/deps/lld/test/COFF/exclude-all.s b/deps/lld/test/COFF/exclude-all.s
new file mode 100644
index 0000000000000000000000000000000000000000..41caece2dd94a4521ee0cdd883f8f1ec08420ccc
--- /dev/null
+++ b/deps/lld/test/COFF/exclude-all.s
@@ -0,0 +1,31 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -triple=i686-windows-gnu %s -filetype=obj -o %t.obj
+
+# RUN: lld-link -lldmingw -exclude-all-symbols -dll -out:%t.dll -entry:DllMainCRTStartup@12 %t.obj
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck %s -check-prefix=NO-EXPORTS
+
+# NO-EXPORTS-NOT: Name:
+
+.global _foobar
+.global _DllMainCRTStartup@12
+.global _dataSym
+.text
+_DllMainCRTStartup@12:
+  ret
+_foobar:
+  ret
+.data
+_dataSym:
+  .int 4
+
+# Test specifying -exclude-all-symbols, on an object file that contains
+# dllexport directive for some of the symbols. In this case, the dllexported
+# symbols are still exported.
+
+# RUN: yaml2obj < %p/Inputs/export.yaml > %t.obj
+#
+# RUN: lld-link -safeseh:no -out:%t.dll -dll %t.obj -lldmingw -exclude-all-symbols -output-def:%t.def
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix=DLLEXPORT %s
+
+# DLLEXPORT: Name: exportfn3
diff --git a/deps/lld/test/COFF/export-all.s b/deps/lld/test/COFF/export-all.s
index 3d80603e2e71b9e4531d00dae4296f90af8445e3..6292ed33e35834ebdcd0fcdc4e7f2ef00c41273f 100644
--- a/deps/lld/test/COFF/export-all.s
+++ b/deps/lld/test/COFF/export-all.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -triple=i686-windows-gnu %s -filetype=obj -o %t.obj
 
 # RUN: lld-link -lldmingw -dll -out:%t.dll -entry:DllMainCRTStartup@12 %t.obj -implib:%t.lib
-# RUN: llvm-readobj -coff-exports %t.dll | grep Name: | FileCheck %s
+# RUN: llvm-readobj --coff-exports %t.dll | grep Name: | FileCheck %s
 # RUN: llvm-readobj %t.lib | FileCheck -check-prefix=IMPLIB %s
 
 # CHECK: Name:
@@ -42,8 +42,8 @@ __imp__unexported:
 
 # RUN: yaml2obj < %p/Inputs/export.yaml > %t.obj
 #
-# RUN: lld-link -out:%t.dll -dll %t.obj -lldmingw -export-all-symbols -output-def:%t.def
-# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix=CHECK2 %s
+# RUN: lld-link -safeseh:no -out:%t.dll -dll %t.obj -lldmingw -export-all-symbols -output-def:%t.def
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix=CHECK2 %s
 # RUN: cat %t.def | FileCheck -check-prefix=CHECK2-DEF %s
 
 # Note, this will actually export _DllMainCRTStartup as well, since
@@ -69,7 +69,7 @@ __imp__unexported:
 # RUN: llvm-ar rcs %T/libs/libmingwex.a %T/libs/mingwfunc.o
 # RUN: echo -e ".global crtfunc\n.text\ncrtfunc:\nret\n" > %T/libs/crtfunc.s
 # RUN: llvm-mc -triple=x86_64-windows-gnu %T/libs/crtfunc.s -filetype=obj -o %T/libs/crt2.o
-# RUN: lld-link -out:%t.dll -dll -entry:DllMainCRTStartup %t.main.obj -lldmingw %T/libs/crt2.o %T/libs/libmingwex.a -output-def:%t.def
+# RUN: lld-link -safeseh:no -out:%t.dll -dll -entry:DllMainCRTStartup %t.main.obj -lldmingw %T/libs/crt2.o %T/libs/libmingwex.a -output-def:%t.def
 # RUN: echo "EOF" >> %t.def
 # RUN: cat %t.def | FileCheck -check-prefix=CHECK-EXCLUDE %s
 
@@ -80,7 +80,7 @@ __imp__unexported:
 # Test that libraries included with -wholearchive: are autoexported, even if
 # they are in a library that otherwise normally would be excluded.
 
-# RUN: lld-link -out:%t.dll -dll -entry:DllMainCRTStartup %t.main.obj -lldmingw %T/libs/crt2.o -wholearchive:%T/libs/libmingwex.a -output-def:%t.def
+# RUN: lld-link -safeseh:no -out:%t.dll -dll -entry:DllMainCRTStartup %t.main.obj -lldmingw %T/libs/crt2.o -wholearchive:%T/libs/libmingwex.a -output-def:%t.def
 # RUN: echo "EOF" >> %t.def
 # RUN: cat %t.def | FileCheck -check-prefix=CHECK-WHOLEARCHIVE %s
 
diff --git a/deps/lld/test/COFF/export-stdcall.s b/deps/lld/test/COFF/export-stdcall.s
new file mode 100644
index 0000000000000000000000000000000000000000..aa39eaecf6b9349f0bf60a8deed2b5b03c64b165
--- /dev/null
+++ b/deps/lld/test/COFF/export-stdcall.s
@@ -0,0 +1,32 @@
+# REQUIRES: x86
+# RUN: llvm-mc -triple i686-windows-msvc %s -o %t.obj -filetype=obj
+# RUN: lld-link -safeseh:no %t.obj -out:%t.dll -dll -nodefaultlib -noentry -export:foo_std=bar_std -export:foo_fast=bar_fast
+# RUN: llvm-nm %t.lib | FileCheck %s
+
+# MSVC fudges the lookup of 'bar' to allow it to find the stdcall function
+# _bar_std@8, and then exports _foo_std@8. Same for fastcall and other mangling
+# schemes.
+
+# CHECK: export-stdcall.s.tmp.dll:
+# CHECK: 00000000 T @foo_fast@8
+# CHECK: 00000000 T __imp_@foo_fast@8
+
+# CHECK: export-stdcall.s.tmp.dll:
+# CHECK: 00000000 T __imp__foo_std@8
+# CHECK: 00000000 T _foo_std@8
+
+	.text
+	.def	 _bar_std@8; .scl	2; .type	32; .endef
+	.globl	_bar_std@8
+_bar_std@8:
+	movl	8(%esp), %eax
+	movl	4(%esp), %ecx
+	leal	42(%ecx,%eax), %eax
+	retl	$8
+
+	.def	 @bar_fast@8; .scl	2; .type	32; .endef
+	.globl	@bar_fast@8
+@bar_fast@8:
+	leal	42(%ecx,%eax), %eax
+	retl
+
diff --git a/deps/lld/test/COFF/export-weak-alias.s b/deps/lld/test/COFF/export-weak-alias.s
new file mode 100644
index 0000000000000000000000000000000000000000..5fc505f309b92ee73c803c5740f24599e749bb45
--- /dev/null
+++ b/deps/lld/test/COFF/export-weak-alias.s
@@ -0,0 +1,33 @@
+# REQUIRES: x86
+# RUN: llvm-mc -triple x86_64-windows-msvc %s -o %t.obj -filetype=obj
+# RUN: lld-link %t.obj -out:%t.dll -dll -nodefaultlib -noentry
+# RUN: llvm-nm %t.lib | FileCheck %s
+
+# CHECK: export-weak-alias.s.tmp.dll:
+# CHECK: 00000000 T __imp_foo_dll{{$}}
+# CHECK: 00000000 T foo_dll{{$}}
+
+	.text
+	.def	 @feat.00;
+	.scl	3;
+	.type	0;
+	.endef
+	.globl	@feat.00
+.set @feat.00, 0
+	.file	"t.c"
+	.def	 foo_def;
+	.scl	2;
+	.type	32;
+	.endef
+	.globl	foo_def                 # -- Begin function foo_def
+	.p2align	4, 0x90
+foo_def:                                # @foo_def
+# %bb.0:                                # %entry
+	movl	$42, %eax
+	retq
+                                        # -- End function
+	.section	.drectve,"yn"
+	.ascii	" /alternatename:foo=foo_def"
+	.ascii	" /export:foo_dll=foo"
+
+	.addrsig
diff --git a/deps/lld/test/COFF/export32.test b/deps/lld/test/COFF/export32.test
index 9218ac2829d17140b5db05df3b206953162e5190..1251d43aacbc75d92b7c9dad61beacf7e3c753b0 100644
--- a/deps/lld/test/COFF/export32.test
+++ b/deps/lld/test/COFF/export32.test
@@ -1,11 +1,11 @@
 # RUN: yaml2obj < %s > %t.obj
 #
-# RUN: lld-link /out:%t.dll /dll %t.obj /export:exportfn1 /export:exportfn2
+# RUN: lld-link -safeseh:no /out:%t.dll /dll %t.obj /export:exportfn1 /export:exportfn2
 # RUN: llvm-objdump -p %t.dll | FileCheck -check-prefix=CHECK1 %s
 #
-# RUN: lld-link /out:%t.dll /dll %t.obj /export:exportfn1 /export:exportfn2 /merge:.edata=.rdata
+# RUN: lld-link -safeseh:no /out:%t.dll /dll %t.obj /export:exportfn1 /export:exportfn2 /merge:.edata=.rdata
 # RUN: llvm-objdump -p %t.dll | FileCheck -check-prefix=CHECK1 %s
-# RUN: llvm-readobj -file-headers -sections %t.dll | FileCheck -check-prefix=HEADER-MERGE %s
+# RUN: llvm-readobj --file-headers --sections %t.dll | FileCheck -check-prefix=HEADER-MERGE %s
 
 # CHECK1:      Export Table:
 # CHECK1:      DLL name: export32.test.tmp.dll
@@ -20,7 +20,7 @@
 # HEADER-MERGE-NEXT: VirtualSize: 0x7E
 # HEADER-MERGE-NEXT: VirtualAddress: 0x2000
 
-# RUN: lld-link /out:%t.dll /dll %t.obj /export:exportfn1,@5 \
+# RUN: lld-link -safeseh:no /out:%t.dll /dll %t.obj /export:exportfn1,@5 \
 # RUN:   /export:exportfn2 /export:mangled
 # RUN: llvm-objdump -p %t.dll | FileCheck -check-prefix=CHECK2 %s
 
@@ -37,7 +37,7 @@
 # CHECK2-NEXT:       7   0x1010  exportfn3
 # CHECK2-NEXT:       8   0x1010  mangled
 
-# RUN: lld-link /out:%t.dll /dll %t.obj /export:exportfn1,@5,noname /export:exportfn2
+# RUN: lld-link -safeseh:no /out:%t.dll /dll %t.obj /export:exportfn1,@5,noname /export:exportfn2
 # RUN: llvm-objdump -p %t.dll | FileCheck -check-prefix=CHECK3 %s
 
 # CHECK3:      Export Table:
@@ -51,7 +51,7 @@
 # CHECK3-NEXT:       5   0x1008
 # CHECK3-NEXT:       6   0x1010  exportfn2
 
-# RUN: lld-link /out:%t.dll /dll %t.obj /export:f1=exportfn1 /export:f2=exportfn2
+# RUN: lld-link -safeseh:no /out:%t.dll /dll %t.obj /export:f1=exportfn1 /export:f2=exportfn2
 # RUN: llvm-objdump -p %t.dll | FileCheck -check-prefix=CHECK4 %s
 
 # CHECK4:      Export Table:
@@ -64,12 +64,12 @@
 
 # RUN: echo "EXPORTS exportfn1 @3" > %t.def
 # RUN: echo "fn2=exportfn2 @2" >> %t.def
-# RUN: lld-link /out:%t.dll /dll %t.obj /def:%t.def
+# RUN: lld-link -safeseh:no /out:%t.dll /dll %t.obj /def:%t.def
 # RUN: llvm-objdump -p %t.dll | FileCheck -check-prefix=CHECK5 %s
 
 # RUN: echo "EXPORTS exportfn1 @ 3" > %t.def
 # RUN: echo "fn2=exportfn2 @ 2" >> %t.def
-# RUN: lld-link /out:%t.dll /dll %t.obj /def:%t.def
+# RUN: lld-link -safeseh:no /out:%t.dll /dll %t.obj /def:%t.def
 # RUN: llvm-objdump -p %t.dll | FileCheck -check-prefix=CHECK5 %s
 
 # CHECK5:      Export Table:
@@ -81,14 +81,14 @@
 # CHECK5-NEXT:       3   0x1008  exportfn1
 # CHECK5-NEXT:       4   0x1010  exportfn3
 
-# RUN: lld-link /out:%t.dll /dll %t.obj /export:exportfn1 /export:exportfn2 \
+# RUN: lld-link -safeseh:no /out:%t.dll /dll %t.obj /export:exportfn1 /export:exportfn2 \
 # RUN:   /export:exportfn1 /export:exportfn2,@5 >& %t.log
 # RUN: FileCheck -check-prefix=CHECK6 %s < %t.log
 
 # CHECK6:     duplicate /export option: _exportfn2
 # CHECK6-NOT: duplicate /export option: _exportfn1
 
-# RUN: lld-link /out:%t.dll /dll %t.obj /export:foo=mangled
+# RUN: lld-link -safeseh:no /out:%t.dll /dll %t.obj /export:foo=mangled
 # RUN: llvm-objdump -p %t.dll | FileCheck -check-prefix=CHECK7 %s
 
 # CHECK7:      Export Table:
diff --git a/deps/lld/test/COFF/failifmismatch.test b/deps/lld/test/COFF/failifmismatch.test
index 021d91b644c44541dc4d35fa91ae7bc5ea6a39de..1cf77e47b0351b7fbd71d5418a1e4705665c2187 100644
--- a/deps/lld/test/COFF/failifmismatch.test
+++ b/deps/lld/test/COFF/failifmismatch.test
@@ -1,11 +1,32 @@
-# RUN: lld-link /entry:main /subsystem:console /out:%t.exe \
-# RUN:   %p/Inputs/ret42.obj
+REQUIRES: x86
 
-# RUN: lld-link /entry:main /subsystem:console /out:%t.exe \
-# RUN:   %p/Inputs/ret42.obj /failifmismatch:k1=v1 /failifmismatch:k2=v1
+RUN: lld-link /entry:main /subsystem:console /out:%t.exe \
+RUN:   %p/Inputs/ret42.obj
 
-# RUN: lld-link /entry:main /subsystem:console /out:%t.exe \
-# RUN:   %p/Inputs/ret42.obj /failifmismatch:k1=v1 /failifmismatch:k1=v1
+RUN: lld-link /entry:main /subsystem:console /out:%t.exe \
+RUN:   %p/Inputs/ret42.obj /failifmismatch:k1=v1 /failifmismatch:k2=v1
 
-# RUN: not lld-link /entry:main /subsystem:console /out:%t.exe \
-# RUN:   %p/Inputs/ret42.obj /failifmismatch:k1=v1 /failifmismatch:k1=v2
+RUN: lld-link /entry:main /subsystem:console /out:%t.exe \
+RUN:   %p/Inputs/ret42.obj /failifmismatch:k1=v1 /failifmismatch:k1=v1
+
+RUN: not lld-link /entry:main /subsystem:console /out:%t.exe \
+RUN:   %p/Inputs/ret42.obj /failifmismatch:k1=v1 /failifmismatch:k1=v2 2>&1 | FileCheck %s 
+
+RUN: llc < %p/Inputs/failmismatch1.ll -mtriple x86_64-windows-msvc -filetype obj -o %t1.obj
+RUN: llc < %p/Inputs/failmismatch2.ll -mtriple x86_64-windows-msvc -filetype obj -o %t2.obj
+RUN: not lld-link %t1.obj %t2.obj 2>&1 | FileCheck %s -check-prefix OBJ
+
+RUN: llvm-lib %t1.obj /out:%t.lib
+RUN: not lld-link %t.lib %t2.obj 2>&1 | FileCheck %s -check-prefix LIB
+
+CHECK: lld-link: error: /failifmismatch: mismatch detected for 'k1':
+CHECK-NEXT: >>> cmd-line has value v1
+CHECK-NEXT: >>> cmd-line has value v2
+
+OBJ: lld-link: error: /failifmismatch: mismatch detected for 'TEST':
+OBJ-NEXT: >>> {{.*}}failifmismatch.test.tmp1.obj has value 1
+OBJ-NEXT: >>> {{.*}}failifmismatch.test.tmp2.obj has value 2
+
+LIB: lld-link: error: /failifmismatch: mismatch detected for 'TEST':
+LIB-NEXT: >>> {{.*}}failifmismatch.test.tmp2.obj has value 2
+LIB-NEXT: >>> failifmismatch.test.tmp.lib(failifmismatch.test.tmp1.obj) has value 1
diff --git a/deps/lld/test/COFF/filealign.test b/deps/lld/test/COFF/filealign.test
new file mode 100644
index 0000000000000000000000000000000000000000..d6535101c4a218e1addc13ec3c1f523eb79bb745
--- /dev/null
+++ b/deps/lld/test/COFF/filealign.test
@@ -0,0 +1,51 @@
+# RUN: yaml2obj < %s > %t.obj
+
+# RUN: lld-link /out:%t.exe /entry:main %t.obj
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=DEFAULT-HEADER %s
+
+# DEFAULT-HEADER:    FileAlignment: 512
+
+# RUN: lld-link /out:%t.exe /entry:main %t.obj /filealign:4096
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=FILEALIGN-HEADER %s
+
+# FILEALIGN-HEADER: FileAlignment: 4096
+
+--- !COFF
+header:
+  Machine:         IMAGE_FILE_MACHINE_AMD64
+  Characteristics: []
+sections:
+  - Name:            .text
+    Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
+    Alignment:       4096
+    SectionData:     0000000000000000
+    Relocations:
+      - VirtualAddress:  0
+        SymbolName:      __ImageBase
+        Type:            IMAGE_REL_AMD64_ADDR64
+symbols:
+  - Name:            .text
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          8
+      NumberOfRelocations: 1
+      NumberOfLinenumbers: 0
+      CheckSum:        0
+      Number:          0
+  - Name:            main
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+  - Name:            __ImageBase
+    Value:           0
+    SectionNumber:   0
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+...
diff --git a/deps/lld/test/COFF/fixed.test b/deps/lld/test/COFF/fixed.test
index 6975fed0846b86137a41cba9460fab5fa3b210db..e162570dfc7655ca32fadb11d71fe86e171d8b94 100644
--- a/deps/lld/test/COFF/fixed.test
+++ b/deps/lld/test/COFF/fixed.test
@@ -1,22 +1,22 @@
 # REQUIRES: x86
 # RUN: yaml2obj < %p/Inputs/hello32.yaml > %t.obj
 #
-# RUN: lld-link %t.obj /fixed %p/Inputs/std32.lib /subsystem:console \
+# RUN: lld-link -safeseh:no %t.obj /fixed %p/Inputs/std32.lib /subsystem:console \
 # RUN:   /entry:main@0 /debug /out:%t.fixed.exe
-# RUN: llvm-readobj -file-headers %t.fixed.exe | \
+# RUN: llvm-readobj --file-headers %t.fixed.exe | \
 # RUN:   FileCheck -check-prefix=EXEFIXED %s
 #
-# RUN: lld-link %t.obj %p/Inputs/std32.lib /subsystem:console \
+# RUN: lld-link -safeseh:no %t.obj %p/Inputs/std32.lib /subsystem:console \
 # RUN:   /entry:main@0 /debug /out:%t.exe
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=EXEREL %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=EXEREL %s
 #
 # RUN: yaml2obj < %p/Inputs/export.yaml > %t.obj
 #
-# RUN: lld-link %t.obj /dll /fixed /debug /out:%t.fixed.dll
-# RUN: llvm-readobj -file-headers %t.fixed.dll | FileCheck -check-prefix=DLLFIXED %s
+# RUN: lld-link -safeseh:no %t.obj /dll /fixed /debug /out:%t.fixed.dll
+# RUN: llvm-readobj --file-headers %t.fixed.dll | FileCheck -check-prefix=DLLFIXED %s
 #
-# RUN: lld-link %t.obj /dll /debug /out:%t.dll
-# RUN: llvm-readobj -file-headers %t.dll | FileCheck -check-prefix=DLLREL %s
+# RUN: lld-link -safeseh:no %t.obj /dll /debug /out:%t.dll
+# RUN: llvm-readobj --file-headers %t.dll | FileCheck -check-prefix=DLLREL %s
 
 EXEFIXED-NOT: IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE
 DLLFIXED-NOT: IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE
diff --git a/deps/lld/test/COFF/force-multipleres.test b/deps/lld/test/COFF/force-multipleres.test
new file mode 100644
index 0000000000000000000000000000000000000000..09329684eb35075194b4551c5542fb870a17afa9
--- /dev/null
+++ b/deps/lld/test/COFF/force-multipleres.test
@@ -0,0 +1,21 @@
+// Check that lld-link rejects duplicate resources, unless
+// /force or /force:multipleres is passed.
+// The input was generated with the following command, using the original Windows
+// rc.exe:
+// > rc /fo id.res /nologo id.rc
+// > rc /fo name.res /nologo name.rc
+
+RUN: rm -rf %t.dir
+RUN: mkdir %t.dir
+RUN: cp %S/Inputs/id.res %t.dir/id1.res
+RUN: cp %S/Inputs/id.res %t.dir/id2.res
+
+RUN: not lld-link /machine:x64 /nodefaultlib /noentry /dll %t.dir/id1.res %t.dir/id2.res 2>&1 | \
+RUN:     FileCheck -check-prefix=ERR %s
+ERR: error: duplicate resource: type STRINGTABLE (ID 6)/name ID 3/language 1033, in {{.*}}id1.res and in {{.*}}id2.res
+
+RUN: lld-link /force /machine:x64 /nodefaultlib /noentry /dll %t.dir/id1.res %t.dir/id2.res 2>&1 | \
+RUN:     FileCheck -check-prefix=WARN %s
+RUN: lld-link /force:multipleres /machine:x64 /nodefaultlib /noentry /dll %t.dir/id1.res %t.dir/id2.res 2>&1 | \
+RUN:     FileCheck -check-prefix=WARN %s
+WARN: warning: duplicate resource: type STRINGTABLE (ID 6)/name ID 3/language 1033, in {{.*}}id1.res and in {{.*}}id2.res
diff --git a/deps/lld/test/COFF/functionpadmin.test b/deps/lld/test/COFF/functionpadmin.test
new file mode 100644
index 0000000000000000000000000000000000000000..8b4f226846f72d847cb58772e41a7ee14561106c
--- /dev/null
+++ b/deps/lld/test/COFF/functionpadmin.test
@@ -0,0 +1,147 @@
+// ---- precomp-a.obj - x86_64, hotpatch
+RUN: lld-link %S/Inputs/precomp-a.obj /out:%t.exe /nodefaultlib /force
+RUN: llvm-objdump -s %t.exe | FileCheck %s --check-prefix BASE
+
+RUN: lld-link %S/Inputs/precomp-a.obj /out:%t.exe /nodefaultlib /force /functionpadmin
+RUN: llvm-objdump -s %t.exe | FileCheck %s --check-prefix PADDED
+
+RUN: lld-link %S/Inputs/precomp-a.obj /out:%t.exe /nodefaultlib /force /functionpadmin:17
+RUN: llvm-objdump -s %t.exe | FileCheck %s --check-prefix PADDED-MORE
+
+// ---- Many arguments
+RUN: lld-link %S/Inputs/precomp-a.obj /out:%t.exe /nodefaultlib /force /functionpadmin:17 /functionpadmin
+RUN: llvm-objdump -s %t.exe | FileCheck %s --check-prefix PADDED
+
+RUN: lld-link %S/Inputs/precomp-a.obj /out:%t.exe /nodefaultlib /force /functionpadmin /functionpadmin:17
+RUN: llvm-objdump -s %t.exe | FileCheck %s --check-prefix PADDED-MORE
+
+RUN: not lld-link %S/Inputs/precomp-a.obj /out:%t.exe /nodefaultlib /force /functionpadmin:zz 2>&1 | FileCheck %s --check-prefix FAIL
+
+// ---- precomp-a.obj, precomp-b.obj - x86_64, hotpatch - Ensure several functions are properly padded
+RUN: lld-link %S/Inputs/precomp-a.obj %S/Inputs/precomp-b.obj %S/Inputs/precomp.obj /out:%t.exe /nodefaultlib /force
+RUN: llvm-objdump -s %t.exe | FileCheck %s --check-prefix MULTI-BASE
+
+RUN: lld-link %S/Inputs/precomp-a.obj %S/Inputs/precomp-b.obj %S/Inputs/precomp.obj /out:%t.exe /nodefaultlib /force /functionpadmin
+RUN: llvm-objdump -s %t.exe | FileCheck %s --check-prefix MULTI-BASE-PADDED
+
+RUN: lld-link %S/Inputs/precomp-a.obj %S/Inputs/precomp-b.obj %S/Inputs/precomp.obj /out:%t.exe /nodefaultlib /force /functionpadmin:17
+RUN: llvm-objdump -s %t.exe | FileCheck %s --check-prefix MULTI-BASE-PADDED-MORE
+
+// ---- pdb-diff.obj - x86, no hotpatch - No padding is applied
+RUN: lld-link %S/Inputs/pdb-diff.obj /out:%t.exe /nodefaultlib /force /functionpadmin
+RUN: llvm-objdump -s %t.exe | FileCheck %s --check-prefix NO-HOTPATCH
+
+// ---- hello64.obj - MASM, x86_64, no hotpatch - No padding is applied
+RUN: lld-link %S/Inputs/hello64.obj /out:%t.exe /nodefaultlib /force /functionpadmin
+RUN: llvm-objdump -s %t.exe | FileCheck %s --check-prefix HELLO
+
+// ---- std64.lib - Import library, x86_64 - Ensure thunks are padded
+RUN: lld-link %S/Inputs/std64.lib /entry:ExitProcess /out:%t.exe /nodefaultlib /force /subsystem:console
+RUN: llvm-objdump -s %t.exe | FileCheck %s --check-prefix THUNKS-NO-PAD
+RUN: llvm-readobj --file-headers %t.exe | FileCheck %s --check-prefix THUNKS-NO-PAD-ENTRY
+
+RUN: lld-link %S/Inputs/std64.lib /entry:ExitProcess /out:%t.exe /nodefaultlib /force /functionpadmin /subsystem:console
+RUN: llvm-objdump -s %t.exe | FileCheck %s --check-prefix THUNKS-PAD
+RUN: llvm-readobj --file-headers %t.exe | FileCheck %s --check-prefix THUNKS-PAD-ENTRY
+
+BASE: Contents of section .text:
+BASE-NEXT:  140001000 4883ec28 b161e8f5 efffbf33 c04883c4  H..(.a.....3.H..
+BASE-NEXT:  140001010 28c3                                 (.
+BASE-NEXT: Contents of section .rdata:
+BASE-NEXT:  140002000 01040100 04420000                    .....B..
+BASE-NEXT: Contents of section .pdata:
+BASE-NEXT:  140003000 00100000 12100000 00200000           ......... ..
+
+PADDED: Contents of section .text:
+PADDED-NEXT:  140001000 cccccccc cccccccc cccccccc cccccccc  ................
+PADDED-NEXT:  140001010 4883ec28 b161e8e5 efffbf33 c04883c4  H..(.a.....3.H..
+PADDED-NEXT:  140001020 28c3                                 (.
+PADDED-NEXT: Contents of section .rdata:
+PADDED-NEXT:  140002000 01040100 04420000                    .....B..
+PADDED-NEXT: Contents of section .pdata:
+PADDED-NEXT:  140003000 10100000 22100000 00200000           ....".... ..
+
+PADDED-MORE: Contents of section .text:
+PADDED-MORE-NEXT:  140001000 cccccccc cccccccc cccccccc cccccccc  ................
+PADDED-MORE-NEXT:  140001010 cccccccc cccccccc cccccccc cccccccc  ................
+PADDED-MORE-NEXT:  140001020 4883ec28 b161e8d5 efffbf33 c04883c4  H..(.a.....3.H..
+PADDED-MORE-NEXT:  140001030 28c3                                 (.
+PADDED-MORE-NEXT: Contents of section .rdata:
+PADDED-MORE-NEXT:  140002000 01040100 04420000                    .....B..
+PADDED-MORE-NEXT: Contents of section .pdata:
+PADDED-MORE-NEXT:  140003000 20100000 32100000 00200000            ...2.... ..
+
+FAIL: lld-link: error: /functionpadmin: invalid argument: zz
+
+MULTI-BASE: Contents of section .text:
+MULTI-BASE-NEXT:  140001000 4883ec28 b161e815 00000033 c04883c4  H..(.a.....3.H..
+MULTI-BASE-NEXT:  140001010 28c3cccc cccccccc cccccccc cccccccc  (...............
+MULTI-BASE-NEXT:  140001020 884c2408 0fbe4424 08c3               .L$...D$..
+MULTI-BASE-NEXT: Contents of section .rdata:
+MULTI-BASE-NEXT:  140002000 01040100 04420000                    .....B..
+MULTI-BASE-NEXT: Contents of section .pdata:
+MULTI-BASE-NEXT:  140004000 00100000 12100000 00200000           ......... ..
+
+MULTI-BASE-PADDED: Contents of section .text:
+MULTI-BASE-PADDED-NEXT:  140001000 cccccccc cccccccc cccccccc cccccccc  ................
+MULTI-BASE-PADDED-NEXT:  140001010 4883ec28 b161e815 00000033 c04883c4  H..(.a.....3.H..
+MULTI-BASE-PADDED-NEXT:  140001020 28c3cccc cccccccc cccccccc cccccccc  (...............
+MULTI-BASE-PADDED-NEXT:  140001030 884c2408 0fbe4424 08c3               .L$...D$..
+MULTI-BASE-PADDED-NEXT: Contents of section .rdata:
+MULTI-BASE-PADDED-NEXT:  140002000 01040100 04420000                    .....B..
+MULTI-BASE-PADDED-NEXT: Contents of section .pdata:
+MULTI-BASE-PADDED-NEXT:  140004000 10100000 22100000 00200000           ....".... ..
+
+MULTI-BASE-PADDED-MORE: Contents of section .text:
+MULTI-BASE-PADDED-MORE-NEXT:  140001000 cccccccc cccccccc cccccccc cccccccc  ................
+MULTI-BASE-PADDED-MORE-NEXT:  140001010 cccccccc cccccccc cccccccc cccccccc  ................
+MULTI-BASE-PADDED-MORE-NEXT:  140001020 4883ec28 b161e825 00000033 c04883c4  H..(.a.%...3.H..
+MULTI-BASE-PADDED-MORE-NEXT:  140001030 28c3cccc cccccccc cccccccc cccccccc  (...............
+MULTI-BASE-PADDED-MORE-NEXT:  140001040 cccccccc cccccccc cccccccc cccccccc  ................
+MULTI-BASE-PADDED-MORE-NEXT:  140001050 884c2408 0fbe4424 08c3               .L$...D$..
+MULTI-BASE-PADDED-MORE-NEXT: Contents of section .rdata:
+MULTI-BASE-PADDED-MORE-NEXT:  140002000 01040100 04420000                    .....B..
+MULTI-BASE-PADDED-MORE-NEXT: Contents of section .pdata:
+MULTI-BASE-PADDED-MORE-NEXT:  140004000 20100000 32100000 00200000            ...2.... ..
+
+
+NO-HOTPATCH: Contents of section .text:
+NO-HOTPATCH-NEXT: 401000 558becb8 2a000000 5dc3               U...*...].
+
+HELLO: Contents of section .text:
+HELLO-NEXT:  140001000 4883ec28 48c7c100 00000048 8d15f40f  H..(H......H....
+HELLO-NEXT:  140001010 00004c8d 05e70f00 0041b900 000000e8  ..L......A......
+HELLO-NEXT:  140001020 dcefffbf b9000000 00e8d2ef ffbfe8cd  ................
+HELLO-NEXT:  140001030 efffbf                               ...
+HELLO-NEXT: Contents of section .data:
+HELLO-NEXT:  140002000 48656c6c 6f004865 6c6c6f20 576f726c  Hello.Hello Worl
+HELLO-NEXT:  140002010 642100                               d!.
+
+THUNKS-NO-PAD: Contents of section .text:
+THUNKS-NO-PAD-NEXT:  140001000 ff253210 0000                        .%2...
+THUNKS-NO-PAD-NEXT: Contents of section .rdata:
+THUNKS-NO-PAD-NEXT:  140002000 28200000 00000000 00000000 56200000  ( ..........V ..
+THUNKS-NO-PAD-NEXT:  140002010 38200000 00000000 00000000 00000000  8 ..............
+THUNKS-NO-PAD-NEXT:  140002020 00000000 00000000 48200000 00000000  ........H ......
+THUNKS-NO-PAD-NEXT:  140002030 00000000 00000000 48200000 00000000  ........H ......
+THUNKS-NO-PAD-NEXT:  140002040 00000000 00000000 00004578 69745072  ..........ExitPr
+THUNKS-NO-PAD-NEXT:  140002050 6f636573 73007374 6436342e 646c6c00  ocess.std64.dll.
+
+THUNKS-NO-PAD-ENTRY-LABEL: ImageOptionalHeader {
+THUNKS-NO-PAD-ENTRY:   AddressOfEntryPoint: 0x1000
+THUNKS-NO-PAD-ENTRY-NEXT:   BaseOfCode: 0x1000
+
+THUNKS-PAD: Contents of section .text:
+THUNKS-PAD-NEXT:  140001000 cccccccc cccccccc cccccccc cccccccc  ................
+THUNKS-PAD-NEXT:  140001010 ff252210 0000                        .%"...
+THUNKS-PAD-NEXT: Contents of section .rdata:
+THUNKS-PAD-NEXT:  140002000 28200000 00000000 00000000 56200000  ( ..........V ..
+THUNKS-PAD-NEXT:  140002010 38200000 00000000 00000000 00000000  8 ..............
+THUNKS-PAD-NEXT:  140002020 00000000 00000000 48200000 00000000  ........H ......
+THUNKS-PAD-NEXT:  140002030 00000000 00000000 48200000 00000000  ........H ......
+THUNKS-PAD-NEXT:  140002040 00000000 00000000 00004578 69745072  ..........ExitPr
+THUNKS-PAD-NEXT:  140002050 6f636573 73007374 6436342e 646c6c00  ocess.std64.dll.
+
+THUNKS-PAD-ENTRY-LABEL: ImageOptionalHeader {
+THUNKS-PAD-ENTRY:   AddressOfEntryPoint: 0x1010
+THUNKS-PAD-ENTRY-NEXT:   BaseOfCode: 0x1000
diff --git a/deps/lld/test/COFF/gfids-corrupt.s b/deps/lld/test/COFF/gfids-corrupt.s
index 92cd321c09c152a81b594afbec437126b4908986..a571f2fb67f0cdca8b4099d8ef84ebc970fe906e 100644
--- a/deps/lld/test/COFF/gfids-corrupt.s
+++ b/deps/lld/test/COFF/gfids-corrupt.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple x86_64-windows-msvc %s -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -opt:noref -guard:nolongjmp -out:%t.exe -entry:main 2>&1 | FileCheck %s --check-prefix=ERRS
-# RUN: llvm-readobj -file-headers -coff-load-config %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers --coff-load-config %t.exe | FileCheck %s
 
 # ERRS: warning: ignoring .gfids$y symbol table index section in object {{.*}}gfids-corrupt{{.*}}
 # ERRS: warning: ignoring invalid symbol table index in section .gfids$y in object {{.*}}gfids-corrupt{{.*}}
diff --git a/deps/lld/test/COFF/gfids-export.s b/deps/lld/test/COFF/gfids-export.s
index 87a4f4b47fa32dd5a5dc4bf8f95102a5cfd90d5f..6c605dfdbd6c973ac9edb6ab4d2ca63684692dfd 100644
--- a/deps/lld/test/COFF/gfids-export.s
+++ b/deps/lld/test/COFF/gfids-export.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple x86_64-pc-win32 %s -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -guard:cf -dll -out:%t.dll -noentry
-# RUN: llvm-readobj -coff-load-config %t.dll | FileCheck %s --check-prefix=CHECK
+# RUN: llvm-readobj --coff-load-config %t.dll | FileCheck %s --check-prefix=CHECK
 
 # There should be a single entry in the table for the exported symbol.
 #
diff --git a/deps/lld/test/COFF/gfids-fallback.s b/deps/lld/test/COFF/gfids-fallback.s
index 53fff17ce0bdb822bb0b620ef1f44d9964e82f4e..be94e2efb38e8f52b7208be82debcd2242319326 100644
--- a/deps/lld/test/COFF/gfids-fallback.s
+++ b/deps/lld/test/COFF/gfids-fallback.s
@@ -2,7 +2,7 @@
 # RUN: grep -B99999 [S]PLITMARKER %s | llvm-mc -triple x86_64-windows-msvc -filetype=obj -o %t1.obj
 # RUN: grep -A99999 [S]PLITMARKER %s | llvm-mc -triple x86_64-windows-msvc -filetype=obj -o %t2.obj
 # RUN: lld-link %t1.obj %t2.obj -guard:nolongjmp -out:%t.exe -entry:main -opt:noref
-# RUN: llvm-readobj -file-headers -coff-load-config %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers --coff-load-config %t.exe | FileCheck %s
 
 # CHECK: ImageBase: 0x140000000
 # CHECK: LoadConfig [
diff --git a/deps/lld/test/COFF/gfids-gc.s b/deps/lld/test/COFF/gfids-gc.s
index 22fdbf19ce45322d3677f7fb204d9de15811eb1f..cf4b5fdae07aeeda3acee7d557a7b38ba59c6425 100644
--- a/deps/lld/test/COFF/gfids-gc.s
+++ b/deps/lld/test/COFF/gfids-gc.s
@@ -1,11 +1,11 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple x86_64-windows-msvc %s -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -guard:nolongjmp -out:%t.exe -opt:noref -entry:main
-# RUN: llvm-readobj -file-headers -coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK-NOGC
+# RUN: llvm-readobj --file-headers --coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK-NOGC
 # RUN: lld-link %t.obj -guard:nolongjmp -out:%t.exe -opt:noref -entry:main -debug:dwarf
-# RUN: llvm-readobj -file-headers -coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK-NOGC
+# RUN: llvm-readobj --file-headers --coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK-NOGC
 # RUN: lld-link %t.obj -guard:nolongjmp -out:%t.exe -opt:ref -entry:main
-# RUN: llvm-readobj -file-headers -coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK-GC
+# RUN: llvm-readobj --file-headers --coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK-GC
 
 # This assembly is meant to mimic what CL emits for this kind of C code when
 # /Gw (-fdata-sections) is enabled:
diff --git a/deps/lld/test/COFF/gfids-icf.s b/deps/lld/test/COFF/gfids-icf.s
index b0b4d7019fc153b36b0c5ce557a6547134897df3..7cf7ddac17fc09129dba44eabb40312f78039449 100644
--- a/deps/lld/test/COFF/gfids-icf.s
+++ b/deps/lld/test/COFF/gfids-icf.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple x86_64-windows-msvc %s -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -guard:nolongjmp -out:%t.exe -opt:icf -entry:main
-# RUN: llvm-readobj -file-headers -coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK
+# RUN: llvm-readobj --file-headers --coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK
 
 # This assembly is meant to mimic what CL emits for this kind of C code:
 # int icf1() { return 42; }
@@ -35,6 +35,16 @@
 # CHECK-NEXT:   0x14000{{.*}}
 # CHECK-NEXT: ]
 
+# There should be no .gfids section in the output exectuable when we link with
+# -guard:cf or with no -guard:cf/nolongjmp flag.
+# RUN: llvm-readobj --sections %t.exe | FileCheck %s --check-prefix NOGFIDSEC
+# RUN: lld-link %t.obj -out:%t.exe -opt:icf -entry:main
+# RUN: llvm-readobj --sections %t.exe | FileCheck %s --check-prefix NOGFIDSEC
+
+# NOGFIDSEC: Sections [
+# NOGFIDSEC: Section {
+# NOGFIDSEC: Name: .text
+# NOGFIDSEC-NOT: Name: .gfids
 
 # Indicate that gfids are present.
         .def     @feat.00; .scl    3; .type   0; .endef
diff --git a/deps/lld/test/COFF/gfids-relocations32.s b/deps/lld/test/COFF/gfids-relocations32.s
index 0f7efeb46078486921933b4e7f2c55fff4411ebd..6c51f7aca820761074de9fe8439510e22d8336bb 100644
--- a/deps/lld/test/COFF/gfids-relocations32.s
+++ b/deps/lld/test/COFF/gfids-relocations32.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple i686-pc-win32 %s -filetype=obj -o %t.obj
-# RUN: lld-link %t.obj -guard:cf -out:%t.exe -entry:main
-# RUN: llvm-readobj -coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK
+# RUN: lld-link -safeseh:no %t.obj -guard:cf -out:%t.exe -entry:main
+# RUN: llvm-readobj --coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK
 
 # Only f and _main should go in the table.
 # (use /lldmap:map.txt to check their addresses).
diff --git a/deps/lld/test/COFF/gfids-relocations64.s b/deps/lld/test/COFF/gfids-relocations64.s
index ae2e687222d58ed9f8d9d46ce031b133d5bfa109..7d3afb221258df1018b92c764798cbefcc9a1f7c 100644
--- a/deps/lld/test/COFF/gfids-relocations64.s
+++ b/deps/lld/test/COFF/gfids-relocations64.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple x86_64-pc-win32 %s -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -guard:cf -out:%t.exe -entry:main
-# RUN: llvm-readobj -coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK
+# RUN: llvm-readobj --coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK
 
 # f, g, and main go in the table.
 # Including g isn't strictly necessary since it's not an indirect call target,
diff --git a/deps/lld/test/COFF/guard-longjmp.s b/deps/lld/test/COFF/guard-longjmp.s
index a6d115d3ed390a5abe7f2aec2a2b2193822a8e7a..51ca41420f691331ed33b6449aa721a6ec35baac 100644
--- a/deps/lld/test/COFF/guard-longjmp.s
+++ b/deps/lld/test/COFF/guard-longjmp.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple x86_64-windows-msvc %s -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -guard:cf -out:%t.exe -entry:main
-# RUN: llvm-readobj -file-headers -coff-load-config %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers --coff-load-config %t.exe | FileCheck %s
 
 # CHECK: ImageBase: 0x140000000
 # CHECK: LoadConfig [
diff --git a/deps/lld/test/COFF/guardcf-align.s b/deps/lld/test/COFF/guardcf-align.s
index 449d3fcd2a743b1b6d1d5fb86f02de7b2a1a26de..5529565ed5fb12a9baa99301d04c56fa8126e64e 100644
--- a/deps/lld/test/COFF/guardcf-align.s
+++ b/deps/lld/test/COFF/guardcf-align.s
@@ -4,7 +4,7 @@
 # RUN:     > %T/guardcf-align-foobar.obj
 # RUN: lld-link -out:%T/guardcf-align.exe -entry:main -guard:cf \
 # RUN:     %t.obj %T/guardcf-align-foobar.obj
-# RUN: llvm-readobj -coff-load-config %T/guardcf-align.exe | FileCheck %s
+# RUN: llvm-readobj --coff-load-config %T/guardcf-align.exe | FileCheck %s
 
 # Check that the gfids table contains at least one entry that ends in 0
 # and no entries that end in something other than 0.
diff --git a/deps/lld/test/COFF/guardcf-lto.ll b/deps/lld/test/COFF/guardcf-lto.ll
index 8ab3e1e04f83b24a09adc47d91821a8ce503d839..6658b60815da26544345ef7f852e3e37b1304568 100644
--- a/deps/lld/test/COFF/guardcf-lto.ll
+++ b/deps/lld/test/COFF/guardcf-lto.ll
@@ -9,7 +9,7 @@
 
 ; RUN: llvm-as %s -o %t.bc
 ; RUN: lld-link -entry:main -guard:cf -dll %t.bc %t.lib %t.ldcfg.obj -out:%t.dll
-; RUN: llvm-readobj -coff-load-config %t.dll | FileCheck %s
+; RUN: llvm-readobj --coff-load-config %t.dll | FileCheck %s
 
 ; There must be *two* entries in the table: DLL entry point, and my_handler.
 
diff --git a/deps/lld/test/COFF/guardcf-thunk.s b/deps/lld/test/COFF/guardcf-thunk.s
new file mode 100644
index 0000000000000000000000000000000000000000..ec0bd1d4579c91dd47a81e902a45f39b87915b88
--- /dev/null
+++ b/deps/lld/test/COFF/guardcf-thunk.s
@@ -0,0 +1,43 @@
+# REQUIRES: x86
+
+# Make a DLL that exports exportfn1.
+# RUN: yaml2obj < %p/Inputs/export.yaml > %t.obj
+# RUN: lld-link /out:%t.dll /dll %t.obj /export:exportfn1 /implib:%t.lib
+
+# Make an obj that takes the address of that exported function.
+# RUN: llvm-mc -filetype=obj -triple=x86_64-windows-msvc %s -o %t2.obj
+# RUN: lld-link -entry:main -guard:cf %t2.obj %t.lib -nodefaultlib -out:%t.exe
+# RUN: llvm-readobj --coff-load-config %t.exe | FileCheck %s
+
+# Check that the gfids table contains *exactly* two entries, one for exportfn1
+# and one for main.
+# CHECK: GuardFidTable [
+# CHECK-NEXT: 0x{{[0-9A-Fa-f]+0$}}
+# CHECK-NEXT: 0x{{[0-9A-Fa-f]+0$}}
+# CHECK-NEXT: ]
+
+
+        .def     @feat.00;
+        .scl    3;
+        .type   0;
+        .endef
+        .globl  @feat.00
+@feat.00 = 0x001
+
+        .section .text,"rx"
+        .def     main; .scl    2; .type   32; .endef
+        .global main
+main:
+        leaq exportfn1(%rip), %rax
+        retq
+
+        .section .rdata,"dr"
+.globl _load_config_used
+_load_config_used:
+        .long 256
+        .fill 124, 1, 0
+        .quad __guard_fids_table
+        .quad __guard_fids_count
+        .long __guard_flags
+        .fill 128, 1, 0
+
diff --git a/deps/lld/test/COFF/header-size.s b/deps/lld/test/COFF/header-size.s
index 3373cdea84f0d57696cd83a7a0f30e0a2dfc00e3..6561b60a2c9cbd37301920dd2b69b444530a522a 100644
--- a/deps/lld/test/COFF/header-size.s
+++ b/deps/lld/test/COFF/header-size.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-windows %s -o %t.obj
 // RUN: lld-link -entry:main -subsystem:console %t.obj -out:%t.exe
-// RUN: llvm-readobj -sections %t.exe | FileCheck %s
+// RUN: llvm-readobj --sections %t.exe | FileCheck %s
     .globl main
 main:
     ret
diff --git a/deps/lld/test/COFF/heap.test b/deps/lld/test/COFF/heap.test
index 1eb70a2f19539ddda9f2851d525024e1c7c085bf..6adcf02b1429935559de16d71dd7ba92e29b9300 100644
--- a/deps/lld/test/COFF/heap.test
+++ b/deps/lld/test/COFF/heap.test
@@ -1,25 +1,25 @@
 # RUN: yaml2obj < %p/Inputs/ret42.yaml > %t.obj
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=DEFAULT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=DEFAULT %s
 
 DEFAULT: SizeOfHeapReserve: 1048576
 DEFAULT: SizeOfHeapCommit: 4096
 
 # RUN: lld-link /out:%t.exe /entry:main /heap:0x3000 %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
 # RUN: echo "HEAPSIZE 12288" > %t.def
 # RUN: lld-link /out:%t.exe /entry:main /def:%t.def %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
 
 CHECK1: SizeOfHeapReserve: 12288
 CHECK1: SizeOfHeapCommit: 4096
 
 # RUN: lld-link /out:%t.exe /entry:main /heap:0x5000,0x3000 %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
 # RUN: echo "HEAPSIZE 20480,12288" > %t.def
 # RUN: lld-link /out:%t.exe /entry:main /def:%t.def %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
 
 CHECK2: SizeOfHeapReserve: 20480
 CHECK2: SizeOfHeapCommit: 12288
diff --git a/deps/lld/test/COFF/hello32.test b/deps/lld/test/COFF/hello32.test
index 87c58797a901f6d908140d94eccf938e65c1dc6e..61418d3d24bb5f989b75716b82d487c48bed0f22 100644
--- a/deps/lld/test/COFF/hello32.test
+++ b/deps/lld/test/COFF/hello32.test
@@ -1,9 +1,9 @@
 # RUN: yaml2obj < %p/Inputs/hello32.yaml > %t.obj
-# RUN: lld-link %t.obj %p/Inputs/std32.lib /subsystem:console \
+# RUN: lld-link -safeseh:no %t.obj %p/Inputs/std32.lib /subsystem:console \
 # RUN:   /entry:main@0 /out:%t.exe /appcontainer
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=HEADER %s
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
-# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=HEADER %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
+# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
 
 HEADER:      Format: COFF-i386
 HEADER-NEXT: Arch: i386
@@ -42,10 +42,9 @@ HEADER-NEXT:   MinorSubsystemVersion: 0
 HEADER-NEXT:   SizeOfImage: 20480
 HEADER-NEXT:   SizeOfHeaders: 1024
 HEADER-NEXT:   Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI (0x3)
-HEADER-NEXT:   Characteristics [ (0x9540)
+HEADER-NEXT:   Characteristics [ (0x9140)
 HEADER-NEXT:     IMAGE_DLL_CHARACTERISTICS_APPCONTAINER (0x1000)
 HEADER-NEXT:     IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE (0x40)
-HEADER-NEXT:     IMAGE_DLL_CHARACTERISTICS_NO_SEH (0x400)
 HEADER-NEXT:     IMAGE_DLL_CHARACTERISTICS_NX_COMPAT (0x100)
 HEADER-NEXT:     IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE (0x8000)
 HEADER-NEXT:   ]
diff --git a/deps/lld/test/COFF/icf-pdata.s b/deps/lld/test/COFF/icf-pdata.s
index 8f5b3baece7df99ddc8ae00efef333f83277ceb3..4fa5c06e11d2e76e92c91c7dae5c43f3e20b98b2 100644
--- a/deps/lld/test/COFF/icf-pdata.s
+++ b/deps/lld/test/COFF/icf-pdata.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc %s -triple x86_64-windows-msvc -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -dll -noentry -out:%t.dll -merge:.xdata=.xdata
-# RUN: llvm-readobj -sections -coff-exports %t.dll | FileCheck %s
+# RUN: llvm-readobj --sections --coff-exports %t.dll | FileCheck %s
 
 # CHECK:         Name: .pdata
 # CHECK-NEXT:    VirtualSize: 0x18
diff --git a/deps/lld/test/COFF/icf-xdata.s b/deps/lld/test/COFF/icf-xdata.s
index f2b6c3df6c6180933931d06eff0c8bfa213a0656..959db5134232f13f771f40df335ba2d9f03d6569 100644
--- a/deps/lld/test/COFF/icf-xdata.s
+++ b/deps/lld/test/COFF/icf-xdata.s
@@ -2,9 +2,9 @@
 # RUN: llvm-mc %s -triple x86_64-windows-msvc -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -dll -noentry -out:%t.dll -merge:.xdata=.xdata 2>&1 \
 # RUN:     | FileCheck %s --check-prefix=WARN
-# RUN: llvm-readobj -sections %t.dll | FileCheck %s --check-prefix=XDATA
+# RUN: llvm-readobj --sections %t.dll | FileCheck %s --check-prefix=XDATA
 # RUN: lld-link %t.obj -dll -noentry -out:%t.dll
-# RUN: llvm-readobj -sections %t.dll | FileCheck %s --check-prefix=RDATA
+# RUN: llvm-readobj --sections %t.dll | FileCheck %s --check-prefix=RDATA
 
 # There shouldn't be much xdata, because all three .pdata entries (12 bytes
 # each) should use the same .xdata unwind info.
diff --git a/deps/lld/test/COFF/imports-gnu-autoexport.s b/deps/lld/test/COFF/imports-gnu-autoexport.s
index 8c204e1c665a50bc6cbe0c0f3923095e39f4e219..e9cd93485afbcd189ba869da7a1fef5229331b35 100644
--- a/deps/lld/test/COFF/imports-gnu-autoexport.s
+++ b/deps/lld/test/COFF/imports-gnu-autoexport.s
@@ -7,7 +7,7 @@
 # RUN: llvm-ar rcs %t-implib.a %t-dabcdh.o %t-dabcds00000.o %t-dabcdt.o
 # RUN: lld-link -lldmingw -dll -out:%t.dll -entry:main -subsystem:console \
 # RUN:   %p/Inputs/hello64.obj %p/Inputs/std64.lib %t-implib.a -include:func
-# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix=EXPORT %s
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix=EXPORT %s
 
 # Check that only the single normal symbol was exported, none of the symbols
 # from the import library.
diff --git a/deps/lld/test/COFF/imports-gnu.test b/deps/lld/test/COFF/imports-gnu.test
index e56be2f446b75030d12e4719ff22293b11451524..2f308b8229004c34ec9bac5d876d3b2a6859581f 100644
--- a/deps/lld/test/COFF/imports-gnu.test
+++ b/deps/lld/test/COFF/imports-gnu.test
@@ -9,7 +9,7 @@
 # Not linking with -lldmingw; one can link to GNU import libs even if not targeting MinGW.
 # RUN: lld-link -out:%t.exe -entry:main -subsystem:console \
 # RUN:   %p/Inputs/hello64.obj %p/Inputs/std64.lib %t-implib.a -include:func
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
 
 # Check that import entries from both libraries show up.
 
diff --git a/deps/lld/test/COFF/imports-mangle.test b/deps/lld/test/COFF/imports-mangle.test
index 5d8ccae2300965ad31266caf93029f0c2ce6e19f..71140b7531e853b09675fac33b202f7d168bad23 100644
--- a/deps/lld/test/COFF/imports-mangle.test
+++ b/deps/lld/test/COFF/imports-mangle.test
@@ -1,7 +1,7 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe /opt:noref /entry:main \
 # RUN:   %t.obj %p/Inputs/imports-mangle.lib
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck %s
 
 # CHECK: Import {
 # CHECK:   Symbol: sym4 (0)
diff --git a/deps/lld/test/COFF/imports.test b/deps/lld/test/COFF/imports.test
index f54bdfd88dfab1a8525ed3c3580cd04b2381248d..7fc66823a6c560058483ddedbe7377e0528889b5 100644
--- a/deps/lld/test/COFF/imports.test
+++ b/deps/lld/test/COFF/imports.test
@@ -4,14 +4,15 @@
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console \
 # RUN:   %p/Inputs/hello64.obj %p/Inputs/std64.lib
 # RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=TEXT %s
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
 
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console \
 # RUN:   %p/Inputs/hello64.obj %p/Inputs/std64.lib /include:ExitProcess
 # RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=TEXT %s
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
 
 TEXT: Disassembly of section .text:
+TEXT-EMPTY:
 TEXT-NEXT: .text:
 TEXT-NEXT: subq    $40, %rsp
 TEXT-NEXT: movq    $0, %rcx
@@ -37,7 +38,7 @@ IMPORT-NEXT: }
 
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console /merge:.rdata=.text \
 # RUN:   %p/Inputs/hello64.obj %p/Inputs/std64.lib /include:ExitProcess
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=MERGE %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=MERGE %s
 
 MERGE:      Import {
 MERGE-NEXT:   Name: std64.dll
diff --git a/deps/lld/test/COFF/includeoptional.yaml b/deps/lld/test/COFF/includeoptional.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..65eb140d162c98b19f0b1ba81995c8596b1b30d8
--- /dev/null
+++ b/deps/lld/test/COFF/includeoptional.yaml
@@ -0,0 +1,39 @@
+# RUN: yaml2obj < %s > %t.main.obj
+# RUN: yaml2obj < %p/Inputs/include1c.yaml > %t.lib.obj
+# RUN: rm -f %t.lib.lib
+# RUN: llvm-ar cru %t.lib.lib %t.lib.obj
+# RUN: lld-link /out:%t.exe /entry:main /includeoptional:bar /includeoptional:actuallymissing %t.main.obj %t.lib.lib /verbose >& %t.log
+# RUN: FileCheck %s < %t.log
+
+# CHECK: includeoptional.yaml.tmp.main.obj
+# CHECK: includeoptional.yaml.tmp.lib.lib
+# CHECK: includeoptional.yaml.tmp.lib.lib(includeoptional.yaml.tmp.lib.obj) for bar
+--- !COFF
+header:
+  Machine:         IMAGE_FILE_MACHINE_AMD64
+  Characteristics: []
+sections:
+  - Name:            .text
+    Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
+    Alignment:       4
+    SectionData:     B800000000506800000000680000000050E80000000050E800000000
+symbols:
+  - Name:            .text
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          28
+      NumberOfRelocations: 4
+      NumberOfLinenumbers: 0
+      CheckSum:        0
+      Number:          0
+  - Name:            main
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+...
diff --git a/deps/lld/test/COFF/includeoptional2.yaml b/deps/lld/test/COFF/includeoptional2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..48b2112773af0d8b1a1ff5ee1c65c0ad23302096
--- /dev/null
+++ b/deps/lld/test/COFF/includeoptional2.yaml
@@ -0,0 +1,44 @@
+# RUN: yaml2obj < %s > %t.obj
+# RUN: not lld-link /out:%t.exe /entry:main /includeoptional:undeffunc %t.obj /verbose 2>&1 | FileCheck %s
+
+# CHECK: error: undefined symbol: undeffunc
+
+--- !COFF
+header:
+  Machine:         IMAGE_FILE_MACHINE_AMD64
+  Characteristics: []
+sections:
+  - Name:            .text
+    Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
+    Alignment:       4
+    SectionData:     B800000000506800000000680000000050E80000000050E800000000
+    Relocations:
+      - VirtualAddress:  17
+        SymbolName:      undeffunc
+        Type:            IMAGE_REL_AMD64_REL32
+symbols:
+  - Name:            .text
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          28
+      NumberOfRelocations: 1
+      NumberOfLinenumbers: 0
+      CheckSum:        0
+      Number:          0
+  - Name:            main
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+  - Name:            undeffunc
+    Value:           0
+    SectionNumber:   0
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+...
diff --git a/deps/lld/test/COFF/invalid-debug-type.test b/deps/lld/test/COFF/invalid-debug-type.test
index 0fa40b0312b519d683ee70bd7380426c34d13001..de6add7dfdbd4905b84df9049f87b985e291ff86 100644
--- a/deps/lld/test/COFF/invalid-debug-type.test
+++ b/deps/lld/test/COFF/invalid-debug-type.test
@@ -1,6 +1,11 @@
 # RUN: yaml2obj < %p/Inputs/pdb1.yaml > %t1.obj
 # RUN: yaml2obj < %p/Inputs/pdb2.yaml > %t2.obj
-# RUN: lld-link /debug /debugtype:invalid /pdb:%t.pdb /dll /out:%t.dll /entry:main /nodefaultlib \
-# RUN:   %t1.obj %t2.obj 2>&1 | FileCheck %s
+# RUN: lld-link /debug /debugtype:invalid /pdb:%t.pdb /dll /out:%t.dll \
+# RUN:     /entry:main /nodefaultlib %t1.obj %t2.obj 2>&1 | FileCheck %s
+# CHECK: /debugtype: unknown option 'invalid'
 
-# CHECK: /debugtype: unknown option: invalid
\ No newline at end of file
+# RUN: lld-link /debug /debugtype:invalid,foo /pdb:%t.pdb /dll /out:%t.dll \
+# RUN:     /entry:main /nodefaultlib %t1.obj %t2.obj 2>&1 | \
+# RUN:     FileCheck --check-prefix=TWO %s
+# TWO: /debugtype: unknown option 'invalid'
+# TWO: /debugtype: unknown option 'foo'
diff --git a/deps/lld/test/COFF/largeaddressaware.test b/deps/lld/test/COFF/largeaddressaware.test
index 76aadee6a946b6af7917380a34a135ce3f28a27f..ddd37131a65db0d699effe5f22ca66e23a0230d6 100644
--- a/deps/lld/test/COFF/largeaddressaware.test
+++ b/deps/lld/test/COFF/largeaddressaware.test
@@ -1,7 +1,7 @@
 # RUN: yaml2obj < %p/Inputs/hello32.yaml > %t.obj
-# RUN: lld-link %t.obj %p/Inputs/std32.lib /subsystem:console \
+# RUN: lld-link -safeseh:no %t.obj %p/Inputs/std32.lib /subsystem:console \
 # RUN:   /entry:main@0 /out:%t.exe /largeaddressaware
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=HEADER %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=HEADER %s
 
 HEADER:      Format: COFF-i386
 HEADER-NEXT: Arch: i386
diff --git a/deps/lld/test/COFF/lib-module-asm.ll b/deps/lld/test/COFF/lib-module-asm.ll
new file mode 100644
index 0000000000000000000000000000000000000000..0431af9b0f9d647530e0bba8989258478bbe7421
--- /dev/null
+++ b/deps/lld/test/COFF/lib-module-asm.ll
@@ -0,0 +1,22 @@
+; REQUIRES: x86
+; PR41803: llvm-link /lib on object with module asm crashes
+; RUN: rm -f %t.lib
+; RUN: llvm-as -o %t.obj %s
+; RUN: lld-link /lib /out:%t.lib %t.obj
+; RUN: llvm-nm -M %t.lib | FileCheck %s
+
+target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32"
+target triple = "i386-pc-windows-msvc19.11.0"
+
+module asm ".global global_asm_sym"
+module asm "global_asm_sym:"
+module asm "local_asm_sym:"
+module asm ".long undef_asm_sym"
+
+; CHECK: Archive map
+; CHECK-NEXT: global_asm_sym in {{.*}}lib-module-asm.ll.tmp.obj
+
+; CHECK: lib-module-asm.ll.tmp.obj:{{$}}
+; CHECK-NEXT:         T global_asm_sym
+; CHECK-NEXT:         t local_asm_sym
+; CHECK-NEXT:         U undef_asm_sym
diff --git a/deps/lld/test/COFF/line-error.yaml b/deps/lld/test/COFF/line-error.yaml
index 55fb723a6abb50ab8ae8d29ba1a9ee939e1356b3..0bd165b3c361d3e64075f6dbcddb14caad0b517a 100644
--- a/deps/lld/test/COFF/line-error.yaml
+++ b/deps/lld/test/COFF/line-error.yaml
@@ -1,160 +1,160 @@
-# RUN: yaml2obj %s -o %t.obj
-# RUN: not lld-link %t.obj /subsystem:console 2>&1 | FileCheck %s
-
-# CHECK: lld-link: error: undefined symbol: function
-# CHECK-NEXT: >>> referenced by {{.*}}line-error.yaml.tmp.obj:(caller1)
-# CHECK-NEXT: >>> referenced by E:\file.cpp:1935
-# CHECK-NEXT: >>>               {{.*}}line-error.yaml.tmp.obj:(caller22)
-
---- !COFF
-header:          
-  Machine:         IMAGE_FILE_MACHINE_AMD64
-  Characteristics: [  ]
-sections:        
-  - Name:            .text
-    Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
-    Alignment:       16
-    SectionData:     488B0500000000488B51284881C2D80000004889C148FF2500000000
-    Relocations:     
-      - VirtualAddress:  3
-        SymbolName:      function
-        Type:            IMAGE_REL_AMD64_REL32
-  - Name:            .text
-    Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_LNK_COMDAT, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
-    Alignment:       16
-    SectionData:     488B0500000000488B51084881C2D80000004889C148FF2500000000
-    Relocations:     
-      - VirtualAddress:  3
-        SymbolName:      function
-        Type:            IMAGE_REL_AMD64_REL32
-  - Name:            '.debug$S'
-    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
-    Alignment:       4
-    Subsections:     
-      - !FileChecksums
-        Checksums:       
-          - FileName:        'E:\file.cpp'
-            Kind:            MD5
-            Checksum:        D72EDEF8B8E50C364A330F9CB3CD904B
-      - !StringTable
-        Strings:         
-          - 'E:\file.cpp'
-  - Name:            '.debug$S'
-    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
-    Alignment:       4
-    Subsections:     
-      - !Lines
-        CodeSize:        28
-        Flags:           [  ]
-        RelocOffset:     0
-        RelocSegment:    0
-        Blocks:          []
-    Relocations:     
-      - VirtualAddress:  12
-        SymbolName:      caller1
-        Type:            IMAGE_REL_AMD64_SECREL
-  - Name:            '.debug$S'
-    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_LNK_COMDAT, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
-    Alignment:       4
-    Subsections:     
-      - !Lines
-        CodeSize:        28
-        Flags:           [  ]
-        RelocOffset:     0
-        RelocSegment:    0
-        Blocks:          
-          - FileName:        'E:\file.cpp'
-            Lines:           
-              - Offset:          11
-                LineStart:       1935
-                IsStatement:     false
-                EndDelta:        0
-            Columns:         []
-    Relocations:     
-      - VirtualAddress:  12
-        SymbolName:      caller22
-        Type:            IMAGE_REL_AMD64_SECREL
-symbols:
-  - Name:            .text
-    Value:           0
-    SectionNumber:   1
-    SimpleType:      IMAGE_SYM_TYPE_NULL
-    ComplexType:     IMAGE_SYM_DTYPE_NULL
-    StorageClass:    IMAGE_SYM_CLASS_STATIC
-    SectionDefinition: 
-      Length:          28
-      NumberOfRelocations: 2
-      NumberOfLinenumbers: 0
-      CheckSum:        2430089736
-      Number:          1
-      Selection:       IMAGE_COMDAT_SELECT_NODUPLICATES
-  - Name:            caller1
-    Value:           0
-    SectionNumber:   1
-    SimpleType:      IMAGE_SYM_TYPE_NULL
-    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
-    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL    
-  - Name:            .text
-    Value:           0
-    SectionNumber:   2
-    SimpleType:      IMAGE_SYM_TYPE_NULL
-    ComplexType:     IMAGE_SYM_DTYPE_NULL
-    StorageClass:    IMAGE_SYM_CLASS_STATIC
-    SectionDefinition: 
-      Length:          28
-      NumberOfRelocations: 2
-      NumberOfLinenumbers: 0
-      CheckSum:        3449717304
-      Number:          2
-      Selection:       IMAGE_COMDAT_SELECT_NODUPLICATES
-  - Name:            caller22
-    Value:           0
-    SectionNumber:   2
-    SimpleType:      IMAGE_SYM_TYPE_NULL
-    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
-    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL    
-  - Name:            '.debug$S'
-    Value:           0
-    SectionNumber:   3
-    SimpleType:      IMAGE_SYM_TYPE_NULL
-    ComplexType:     IMAGE_SYM_DTYPE_NULL
-    StorageClass:    IMAGE_SYM_CLASS_STATIC
-    SectionDefinition: 
-      Length:          767204
-      NumberOfRelocations: 0
-      NumberOfLinenumbers: 0
-      CheckSum:        4280093374
-      Number:          3
-  - Name:            '.debug$S'
-    Value:           0
-    SectionNumber:   4
-    SimpleType:      IMAGE_SYM_TYPE_NULL
-    ComplexType:     IMAGE_SYM_DTYPE_NULL
-    StorageClass:    IMAGE_SYM_CLASS_STATIC
-    SectionDefinition: 
-      Length:          296
-      NumberOfRelocations: 1
-      NumberOfLinenumbers: 0
-      CheckSum:        1957793731
-      Number:          1
-      Selection:       IMAGE_COMDAT_SELECT_ASSOCIATIVE
-  - Name:            '.debug$S'
-    Value:           0
-    SectionNumber:   5
-    SimpleType:      IMAGE_SYM_TYPE_NULL
-    ComplexType:     IMAGE_SYM_DTYPE_NULL
-    StorageClass:    IMAGE_SYM_CLASS_STATIC
-    SectionDefinition: 
-      Length:          276
-      NumberOfRelocations: 1
-      NumberOfLinenumbers: 0
-      CheckSum:        1957793731
-      Number:          2
-      Selection:       IMAGE_COMDAT_SELECT_ASSOCIATIVE
-  - Name:            function
-    Value:           0
-    SectionNumber:   0
-    SimpleType:      IMAGE_SYM_TYPE_NULL
-    ComplexType:     IMAGE_SYM_DTYPE_NULL
-    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
-...
+# RUN: yaml2obj %s -o %t.obj
+# RUN: not lld-link %t.obj /subsystem:console 2>&1 | FileCheck %s
+
+# CHECK: lld-link: error: undefined symbol: function
+# CHECK-NEXT: >>> referenced by {{.*}}line-error.yaml.tmp.obj:(caller1)
+# CHECK-NEXT: >>> referenced by E:\file.cpp:1935
+# CHECK-NEXT: >>>               {{.*}}line-error.yaml.tmp.obj:(caller22)
+
+--- !COFF
+header:
+  Machine:         IMAGE_FILE_MACHINE_AMD64
+  Characteristics: [  ]
+sections:
+  - Name:            .text
+    Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
+    Alignment:       16
+    SectionData:     488B0500000000488B51284881C2D80000004889C148FF2500000000
+    Relocations:
+      - VirtualAddress:  3
+        SymbolName:      function
+        Type:            IMAGE_REL_AMD64_REL32
+  - Name:            .text
+    Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_LNK_COMDAT, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
+    Alignment:       16
+    SectionData:     488B0500000000488B51084881C2D80000004889C148FF2500000000
+    Relocations:
+      - VirtualAddress:  3
+        SymbolName:      function
+        Type:            IMAGE_REL_AMD64_REL32
+  - Name:            '.debug$S'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
+    Alignment:       4
+    Subsections:
+      - !FileChecksums
+        Checksums:
+          - FileName:        'E:\file.cpp'
+            Kind:            MD5
+            Checksum:        D72EDEF8B8E50C364A330F9CB3CD904B
+      - !StringTable
+        Strings:
+          - 'E:\file.cpp'
+  - Name:            '.debug$S'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
+    Alignment:       4
+    Subsections:
+      - !Lines
+        CodeSize:        28
+        Flags:           [  ]
+        RelocOffset:     0
+        RelocSegment:    0
+        Blocks:          []
+    Relocations:
+      - VirtualAddress:  12
+        SymbolName:      caller1
+        Type:            IMAGE_REL_AMD64_SECREL
+  - Name:            '.debug$S'
+    Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_LNK_COMDAT, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
+    Alignment:       4
+    Subsections:
+      - !Lines
+        CodeSize:        28
+        Flags:           [  ]
+        RelocOffset:     0
+        RelocSegment:    0
+        Blocks:
+          - FileName:        'E:\file.cpp'
+            Lines:
+              - Offset:          11
+                LineStart:       1935
+                IsStatement:     false
+                EndDelta:        0
+            Columns:         []
+    Relocations:
+      - VirtualAddress:  12
+        SymbolName:      caller22
+        Type:            IMAGE_REL_AMD64_SECREL
+symbols:
+  - Name:            .text
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          28
+      NumberOfRelocations: 2
+      NumberOfLinenumbers: 0
+      CheckSum:        2430089736
+      Number:          1
+      Selection:       IMAGE_COMDAT_SELECT_NODUPLICATES
+  - Name:            caller1
+    Value:           0
+    SectionNumber:   1
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+  - Name:            .text
+    Value:           0
+    SectionNumber:   2
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          28
+      NumberOfRelocations: 2
+      NumberOfLinenumbers: 0
+      CheckSum:        3449717304
+      Number:          2
+      Selection:       IMAGE_COMDAT_SELECT_NODUPLICATES
+  - Name:            caller22
+    Value:           0
+    SectionNumber:   2
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_FUNCTION
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+  - Name:            '.debug$S'
+    Value:           0
+    SectionNumber:   3
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          767204
+      NumberOfRelocations: 0
+      NumberOfLinenumbers: 0
+      CheckSum:        4280093374
+      Number:          3
+  - Name:            '.debug$S'
+    Value:           0
+    SectionNumber:   4
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          296
+      NumberOfRelocations: 1
+      NumberOfLinenumbers: 0
+      CheckSum:        1957793731
+      Number:          1
+      Selection:       IMAGE_COMDAT_SELECT_ASSOCIATIVE
+  - Name:            '.debug$S'
+    Value:           0
+    SectionNumber:   5
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_STATIC
+    SectionDefinition:
+      Length:          276
+      NumberOfRelocations: 1
+      NumberOfLinenumbers: 0
+      CheckSum:        1957793731
+      Number:          2
+      Selection:       IMAGE_COMDAT_SELECT_ASSOCIATIVE
+  - Name:            function
+    Value:           0
+    SectionNumber:   0
+    SimpleType:      IMAGE_SYM_TYPE_NULL
+    ComplexType:     IMAGE_SYM_DTYPE_NULL
+    StorageClass:    IMAGE_SYM_CLASS_EXTERNAL
+...
diff --git a/deps/lld/test/COFF/linkrepro-pdb.test b/deps/lld/test/COFF/linkrepro-pdb.test
index 33aa0bc4a90e0e499e5a60c9a5eb5462e77e45e5..f248c431458b1caea0e09b76d25daee947ef3f20 100644
--- a/deps/lld/test/COFF/linkrepro-pdb.test
+++ b/deps/lld/test/COFF/linkrepro-pdb.test
@@ -4,6 +4,19 @@ RUN: rm -rf %t && mkdir -p %t && cd %t
 RUN: yaml2obj %S/Inputs/pdb-type-server-simple-a.yaml -o a.obj
 RUN: yaml2obj %S/Inputs/pdb-type-server-simple-b.yaml -o b.obj
 RUN: llvm-pdbutil yaml2pdb %S/Inputs/pdb-type-server-simple-ts.yaml -pdb ts.pdb
-RUN: lld-link a.obj b.obj -entry:main -debug -out:t.exe -pdb:t.pdb -nodefaultlib -linkrepro:.
+RUN: lld-link a.obj b.obj -entry:main -debug -out:%t.exe -pdb:%t.pdb -nodefaultlib -linkrepro:.
 RUN: tar xOf repro.tar repro/%:t/ts.pdb > repro-ts.pdb
 RUN: diff ts.pdb repro-ts.pdb
+
+RUN: tar xf repro.tar
+RUN: cat repro/response.txt | FileCheck -check-prefix=PDB %s
+
+PDB: -out:linkrepro-pdb.test.tmp.exe
+PDB-NEXT: -pdb:linkrepro-pdb.test.tmp.pdb
+
+RUN: yaml2obj < %p/Inputs/export.yaml > %t1.obj
+RUN: lld-link /out:%t1.dll /dll %t1.obj /implib:%t1.lib /export:exportfn1 /export:exportfn2 /linkrepro:.
+RUN: tar xf repro.tar
+RUN: cat repro/response.txt | FileCheck -check-prefix=IMP %s
+
+IMP: /implib:linkrepro-pdb.test.tmp1.lib
diff --git a/deps/lld/test/COFF/loadcfg.ll b/deps/lld/test/COFF/loadcfg.ll
index 6c1cf69e87284c66e9734573974df93851658563..96b4b8e5966265ec7b2f1d061feaa7d0fc4c7a48 100644
--- a/deps/lld/test/COFF/loadcfg.ll
+++ b/deps/lld/test/COFF/loadcfg.ll
@@ -1,7 +1,7 @@
 ; REQUIRES: x86
 ; RUN: llvm-as -o %t.obj %s
 ; RUN: lld-link /out:%t.exe %t.obj /entry:main /subsystem:console
-; RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+; RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 ; CHECK: LoadConfigTableRVA: 0x2000
 ; CHECK: LoadConfigTableSize: 0x70
diff --git a/deps/lld/test/COFF/loadcfg.test b/deps/lld/test/COFF/loadcfg.test
index 2e226f43941597857d8e9a4cee9a926d857b5d9f..52326861ea9147f7dd45198cee54fb47418cc868 100644
--- a/deps/lld/test/COFF/loadcfg.test
+++ b/deps/lld/test/COFF/loadcfg.test
@@ -1,6 +1,6 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe %t.obj /entry:main /subsystem:console
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 # CHECK: LoadConfigTableRVA: 0x2000
 # CHECK: LoadConfigTableSize: 0x70
diff --git a/deps/lld/test/COFF/loadcfg32.test b/deps/lld/test/COFF/loadcfg32.test
index 9485aa08820d3bdc19698bbefa028a36a2e419f0..dffdab8b146e6f0468a73e3d143deda032cef4db 100644
--- a/deps/lld/test/COFF/loadcfg32.test
+++ b/deps/lld/test/COFF/loadcfg32.test
@@ -1,6 +1,6 @@
 # RUN: yaml2obj < %s > %t.obj
-# RUN: lld-link /out:%t.exe %t.obj /entry:main /subsystem:console
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: lld-link -safeseh:no /out:%t.exe %t.obj /entry:main /subsystem:console
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 # CHECK: LoadConfigTableRVA: 0x2000
 # CHECK: LoadConfigTableSize: 0x40
diff --git a/deps/lld/test/COFF/locally-imported-arm64.test b/deps/lld/test/COFF/locally-imported-arm64.test
index 35200ffc1e8d3a241f60db74f0073c8f17f6bb1b..f305d6814dd1cbdcb2bcf3815d8508fa9e49d5c1 100644
--- a/deps/lld/test/COFF/locally-imported-arm64.test
+++ b/deps/lld/test/COFF/locally-imported-arm64.test
@@ -1,7 +1,7 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
 # RUN: llvm-objdump -s %t.exe | FileCheck %s
-# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
+# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
 
 # CHECK:      Contents of section .text:
 # CHECK-NEXT: 1000 00200000
diff --git a/deps/lld/test/COFF/locally-imported.test b/deps/lld/test/COFF/locally-imported.test
index b269cecf00b70068f66e012c89a3389b3395c893..6c9f061a148cc9a86579cb3e836dd24bf6e4e78d 100644
--- a/deps/lld/test/COFF/locally-imported.test
+++ b/deps/lld/test/COFF/locally-imported.test
@@ -1,7 +1,7 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe /entry:main %t.obj 2>&1 | FileCheck -check-prefix=WARN %s
 # RUN: llvm-objdump -s %t.exe | FileCheck %s
-# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
+# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
 
 # WARN: warning: [[INPUT:.+]]: locally defined symbol imported: main (defined in [[INPUT]])
 
diff --git a/deps/lld/test/COFF/locally-imported32.test b/deps/lld/test/COFF/locally-imported32.test
index 789c8c8f8094debe6e4877856d520829e9eaca20..993099d423a5c2326ba7c9a8fb4e7e2b39ca5dda 100644
--- a/deps/lld/test/COFF/locally-imported32.test
+++ b/deps/lld/test/COFF/locally-imported32.test
@@ -1,5 +1,5 @@
 # RUN: yaml2obj < %s > %t.obj
-# RUN: lld-link /out:%t.exe /entry:main %t.obj
+# RUN: lld-link -safeseh:no /out:%t.exe /entry:main %t.obj
 # RUN: llvm-objdump -s %t.exe | FileCheck %s
 
 # CHECK:      Contents of section .text:
diff --git a/deps/lld/test/COFF/long-section-name.test b/deps/lld/test/COFF/long-section-name.test
index bad7876c888fd268eb4ab8e0a80a0bdd353c1f45..6cb88e17bfe54d547d7d7b6db6b71f8151aedf12 100644
--- a/deps/lld/test/COFF/long-section-name.test
+++ b/deps/lld/test/COFF/long-section-name.test
@@ -1,8 +1,8 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck %s
 # RUN: lld-link /debug /out:%t2.exe /entry:main %t.obj
-# RUN: llvm-readobj -sections %t2.exe | FileCheck %s
+# RUN: llvm-readobj --sections %t2.exe | FileCheck %s
 
 # CHECK: Name: .eh_fram (
 # CHECK: Name: .data_long_section_name
diff --git a/deps/lld/test/COFF/lto-comdat.ll b/deps/lld/test/COFF/lto-comdat.ll
index c5c1d7ba0a4fde523a54ab58501fb8c831ffb96b..fbb7104bf11d9b08170c5cd9efbd44876fa87dbd 100644
--- a/deps/lld/test/COFF/lto-comdat.ll
+++ b/deps/lld/test/COFF/lto-comdat.ll
@@ -14,40 +14,42 @@
 ; Check that, when we use an LTO main with LTO objects, we optimize away all
 ; of f1, f2, and comdat.
 ; RUN: lld-link /out:%T/comdat-main.exe /entry:main /subsystem:console %T/comdat-main.lto.obj %T/comdat1.lto.obj %T/comdat2.lto.obj
-; RUN: llvm-readobj -file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-11 %s
+; RUN: llvm-readobj --file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-11 %s
 ; RUN: llvm-objdump -d %T/comdat-main.exe | FileCheck -check-prefix=TEXT-11 %s
 ; RUN: lld-link /out:%T/comdat-main.exe /entry:main /subsystem:console %T/comdat-main.lto.obj %T/comdat.lto.lib
-; RUN: llvm-readobj -file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-11 %s
+; RUN: llvm-readobj --file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-11 %s
 ; RUN: llvm-objdump -d %T/comdat-main.exe | FileCheck -check-prefix=TEXT-11 %s
 
 ; Check that, when we use a non-LTO main with LTO objects, we pick the comdat
 ; implementation in LTO, elide calls to it from inside LTO, and retain the
 ; call to comdat from main.
 ; RUN: lld-link /out:%T/comdat-main.exe /entry:main /subsystem:console %T/comdat-main.obj %T/comdat1.lto.obj %T/comdat2.lto.obj
-; RUN: llvm-readobj -file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-01 %s
+; RUN: llvm-readobj --file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-01 %s
 ; RUN: llvm-objdump -d %T/comdat-main.exe | FileCheck -check-prefix=TEXT-01 %s
 ; RUN: lld-link /out:%T/comdat-main.exe /entry:main /subsystem:console %T/comdat-main.obj %T/comdat.lto.lib
-; RUN: llvm-readobj -file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-01 %s
+; RUN: llvm-readobj --file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-01 %s
 ; RUN: llvm-objdump -d %T/comdat-main.exe | FileCheck -check-prefix=TEXT-01 %s
 
 ; Check that, when we use an LTO main with non-LTO objects, we pick the comdat
 ; implementation in LTO, elide the call to it from inside LTO, and keep the
 ; calls to comdat from the non-LTO objects.
 ; RUN: lld-link /out:%T/comdat-main.exe /entry:main /subsystem:console %T/comdat-main.lto.obj %T/comdat1.obj %T/comdat2.obj
-; RUN: llvm-readobj -file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-10 %s
+; RUN: llvm-readobj --file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-10 %s
 ; RUN: llvm-objdump -d %T/comdat-main.exe | FileCheck -check-prefix=TEXT-10 %s
 ; RUN: lld-link /out:%T/comdat-main.exe /entry:main /subsystem:console %T/comdat-main.lto.obj %T/comdat.lib
-; RUN: llvm-readobj -file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-10 %s
+; RUN: llvm-readobj --file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-10 %s
 ; RUN: llvm-objdump -d %T/comdat-main.exe | FileCheck -check-prefix=TEXT-10 %s
 
 ; HEADERS-11: AddressOfEntryPoint: 0x1000
 ; TEXT-11: Disassembly of section .text:
+; TEXT-11-EMPTY:
 ; TEXT-11-NEXT: .text:
 ; TEXT-11-NEXT: xorl	%eax, %eax
 ; TEXT-11-NEXT: retq
 
 ; HEADERS-01: AddressOfEntryPoint: 0x1000
 ; TEXT-01: Disassembly of section .text:
+; TEXT-01-EMPTY:
 ; TEXT-01-NEXT: .text:
 ; TEXT-01-NEXT: subq	$40, %rsp
 ; TEXT-01-NEXT: callq	23
@@ -65,6 +67,7 @@
 
 ; HEADERS-10: AddressOfEntryPoint: 0x1020
 ; TEXT-10: Disassembly of section .text:
+; TEXT-10-EMPTY:
 ; TEXT-10-NEXT: .text:
 ; TEXT-10-NEXT: subq	$40, %rsp
 ; TEXT-10-NEXT: callq	55
diff --git a/deps/lld/test/COFF/lto-icf.ll b/deps/lld/test/COFF/lto-icf.ll
index b36b572eb8895422bd074bc7eab3ee242425640d..ef98d7b06044cf43bcfddc919710f3efa58f09d4 100644
--- a/deps/lld/test/COFF/lto-icf.ll
+++ b/deps/lld/test/COFF/lto-icf.ll
@@ -4,7 +4,7 @@
 
 ; RUN: llvm-as %s -o %t.bc
 ; RUN: lld-link -opt:icf -dll -noentry %t.bc -out:%t.dll
-; RUN: llvm-readobj -coff-exports %t.dll | FileCheck %s
+; RUN: llvm-readobj --coff-exports %t.dll | FileCheck %s
 
 ; CHECK: Export {
 ; CHECK: Export {
diff --git a/deps/lld/test/COFF/lto-lazy-reference.ll b/deps/lld/test/COFF/lto-lazy-reference.ll
index 1e92873776c13f2f06016e7bb5c0c6f93e9552de..428a7b845d145aa0ce3f3dc06dfa2c893830507c 100644
--- a/deps/lld/test/COFF/lto-lazy-reference.ll
+++ b/deps/lld/test/COFF/lto-lazy-reference.ll
@@ -9,6 +9,10 @@
 target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32"
 target triple = "i686-pc-windows-msvc18.0.0"
 
+; Define fltused, since we don't link against the MS C runtime but are
+; using floats.
+@_fltused = dllexport global i32 0, align 4
+
 define double @main(double %x) {
 entry:
   ; When compiled, this defines the __real@40800000 symbol, which already has a
diff --git a/deps/lld/test/COFF/lto-new-symbol.ll b/deps/lld/test/COFF/lto-new-symbol.ll
index 5223f73f07fa28dca879b06d454470c5cc9a0e29..dadd49537cf908effb05a7f620e4e5f74ae940a0 100644
--- a/deps/lld/test/COFF/lto-new-symbol.ll
+++ b/deps/lld/test/COFF/lto-new-symbol.ll
@@ -5,6 +5,10 @@
 target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-pc-windows-msvc"
 
+; Define fltused, since we don't link against the MS C runtime but are
+; using floats.
+@_fltused = dllexport global i32 0, align 4
+
 define void @foo(<4 x i32>* %p, <4 x float>* %q, i1 %t) nounwind {
 entry:
   br label %loop
diff --git a/deps/lld/test/COFF/lto.ll b/deps/lld/test/COFF/lto.ll
index c83a151f115b1a564dd4232b96d9591d6d42c3bc..54624906c32532c42e50e4bcd17fdafafcedb927 100644
--- a/deps/lld/test/COFF/lto.ll
+++ b/deps/lld/test/COFF/lto.ll
@@ -10,30 +10,31 @@
 ; RUN: llvm-ar cru %T/foo.lib %T/foo.obj
 
 ; RUN: lld-link /out:%T/main.exe /entry:main /include:f2 /subsystem:console %T/main.lto.obj %T/foo.lto.obj
-; RUN: llvm-readobj -file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-11 %s
+; RUN: llvm-readobj --file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-11 %s
 ; RUN: llvm-objdump -d %T/main.exe | FileCheck -check-prefix=TEXT-11 %s
 ; RUN: lld-link /out:%T/main.exe /entry:main /include:f2 /subsystem:console %T/main.lto.obj %T/foo.lto.lib /verbose 2>&1 | FileCheck -check-prefix=VERBOSE %s
-; RUN: llvm-readobj -file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-11 %s
+; RUN: llvm-readobj --file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-11 %s
 ; RUN: llvm-objdump -d %T/main.exe | FileCheck -check-prefix=TEXT-11 %s
 
 ; RUN: lld-link /out:%T/main.exe /entry:main /subsystem:console %T/main.obj %T/foo.lto.obj
-; RUN: llvm-readobj -file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-01 %s
+; RUN: llvm-readobj --file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-01 %s
 ; RUN: llvm-objdump -d %T/main.exe | FileCheck -check-prefix=TEXT-01 %s
 ; RUN: lld-link /out:%T/main.exe /entry:main /subsystem:console %T/main.obj %T/foo.lto.lib
-; RUN: llvm-readobj -file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-01 %s
+; RUN: llvm-readobj --file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-01 %s
 ; RUN: llvm-objdump -d %T/main.exe | FileCheck -check-prefix=TEXT-01 %s
 
 ; RUN: lld-link /out:%T/main.exe /entry:main /subsystem:console %T/main.lto.obj %T/foo.obj
-; RUN: llvm-readobj -file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-10 %s
+; RUN: llvm-readobj --file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-10 %s
 ; RUN: llvm-objdump -d %T/main.exe | FileCheck -check-prefix=TEXT-10 %s
 ; RUN: lld-link /out:%T/main.exe /entry:main /subsystem:console %T/main.lto.obj %T/foo.lib
-; RUN: llvm-readobj -file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-10 %s
+; RUN: llvm-readobj --file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-10 %s
 ; RUN: llvm-objdump -d %T/main.exe | FileCheck -check-prefix=TEXT-10 %s
 
 ; VERBOSE: foo.lto.lib({{.*}}foo.lto.obj)
 
 ; HEADERS-11: AddressOfEntryPoint: 0x1000
 ; TEXT-11: Disassembly of section .text:
+; TEXT-11-EMPTY:
 ; TEXT-11-NEXT: .text:
 ; TEXT-11-NEXT: xorl	%eax, %eax
 ; TEXT-11-NEXT: retq
@@ -55,6 +56,7 @@
 
 ; HEADERS-01: AddressOfEntryPoint: 0x1000
 ; TEXT-01: Disassembly of section .text:
+; TEXT-01-EMPTY:
 ; TEXT-01-NEXT: .text:
 ; TEXT-01-NEXT: subq	$40, %rsp
 ; TEXT-01-NEXT: callq	23
@@ -81,6 +83,7 @@
 
 ; HEADERS-10: AddressOfEntryPoint: 0x1020
 ; TEXT-10: Disassembly of section .text:
+; TEXT-10-EMPTY:
 ; TEXT-10-NEXT: .text:
 ; TEXT-10-NEXT: retq
 ; TEXT-10-NEXT: nop
diff --git a/deps/lld/test/COFF/machine.test b/deps/lld/test/COFF/machine.test
index 847018f20fbd1439825db720813280b06b166038..921b7e3931493f416a155d0abb21a8e8bcff619b 100644
--- a/deps/lld/test/COFF/machine.test
+++ b/deps/lld/test/COFF/machine.test
@@ -1,18 +1,18 @@
 # RUN: yaml2obj %p/Inputs/machine-x64.yaml > %t.obj
-# RUN: lld-link /entry:main /subsystem:console /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=AMD64 %s
-# RUN: lld-link /entry:main /subsystem:console /machine:x64 \
+# RUN: lld-link -safeseh:no /entry:main /subsystem:console /out:%t.exe %t.obj
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=AMD64 %s
+# RUN: lld-link -safeseh:no /entry:main /subsystem:console /machine:x64 \
 # RUN:   /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=AMD64 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=AMD64 %s
 
 AMD64: Machine: IMAGE_FILE_MACHINE_AMD64
 
 # RUN: yaml2obj %p/Inputs/machine-x86.yaml > %t.obj
-# RUN: lld-link /entry:main /subsystem:console /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=I386 %s
-# RUN: lld-link /entry:main /subsystem:console /machine:x86 \
+# RUN: lld-link -safeseh:no /entry:main /subsystem:console /out:%t.exe %t.obj
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=I386 %s
+# RUN: lld-link -safeseh:no /entry:main /subsystem:console /machine:x86 \
 # RUN:   /out:%t.exe %t.obj /fixed
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=I386 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=I386 %s
 
 I386: Machine: IMAGE_FILE_MACHINE_I386
 
diff --git a/deps/lld/test/COFF/manifestinput.test b/deps/lld/test/COFF/manifestinput.test
index 33f14d8434baabdd77d4363020fd406501783796..cfc28f248b82c1116c19d80b2e71708d6c9c3ac2 100644
--- a/deps/lld/test/COFF/manifestinput.test
+++ b/deps/lld/test/COFF/manifestinput.test
@@ -5,7 +5,7 @@
 # RUN:   /manifest:embed \
 # RUN:   /manifestuac:"level='requireAdministrator'" \
 # RUN:   /manifestinput:%p/Inputs/manifestinput.test %t.obj
-# RUN: llvm-readobj -coff-resources -file-headers %t.exe | FileCheck %s \
+# RUN: llvm-readobj --coff-resources --file-headers %t.exe | FileCheck %s \
 # RUN:   -check-prefix TEST_EMBED
 
 TEST_EMBED:          ResourceTableRVA: 0x2000
@@ -14,7 +14,7 @@ TEST_EMBED-DAG:      Resources [
 TEST_EMBED-NEXT:       Total Number of Resources: 1
 TEST_EMBED-DAG:        Number of String Entries: 0
 TEST_EMBED-NEXT:       Number of ID Entries: 1
-TEST_EMBED-NEXT:       Type: kRT_MANIFEST (ID 24) [
+TEST_EMBED-NEXT:       Type: MANIFEST (ID 24) [
 TEST_EMBED-NEXT:         Table Offset: 0x18
 TEST_EMBED-NEXT:         Number of String Entries: 0
 TEST_EMBED-NEXT:         Number of ID Entries: 1
diff --git a/deps/lld/test/COFF/merge.test b/deps/lld/test/COFF/merge.test
index 10a5672431069c6cb6a89717cfcab4e330e9fb3e..fcffb70e0f7bef5a2328dd1d52b7f601ba72d9bf 100644
--- a/deps/lld/test/COFF/merge.test
+++ b/deps/lld/test/COFF/merge.test
@@ -1,11 +1,11 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console /force \
 # RUN:   /merge:.foo=.abc /merge:.bar=.def %t.obj /debug
-# RUN: llvm-readobj -sections %t.exe | FileCheck %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck %s
 
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console /force \
 # RUN:   /merge:.foo=.bar /merge:.bar=.abc %t.obj /debug
-# RUN: llvm-readobj -sections %t.exe | FileCheck --check-prefix=CHECK2 %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck --check-prefix=CHECK2 %s
 
 # RUN: not lld-link /out:%t.exe /entry:main /subsystem:console /force \
 # RUN:   /merge:.rsrc=.foo %t.obj /debug 2>&1 | FileCheck --check-prefix=NO-RSRC %s
diff --git a/deps/lld/test/COFF/multiple-resource-objs.test b/deps/lld/test/COFF/multiple-resource-objs.test
new file mode 100644
index 0000000000000000000000000000000000000000..4263c64be4d43c42a219b7539912328d1b3a98fd
--- /dev/null
+++ b/deps/lld/test/COFF/multiple-resource-objs.test
@@ -0,0 +1,11 @@
+# RUN: llvm-cvtres /out:%t_resource.obj %S/Inputs/resource.res
+# RUN: llvm-cvtres /out:%t_id.obj %S/Inputs/id.res
+# RUN: not lld-link /out:%t.exe /dll /noentry %t_id.obj %t_resource.obj 2>&1 | \
+# RUN:     FileCheck --check-prefix=TWOOBJ %s
+
+TWOOBJ: error: {{.*}}_resource.obj: more than one resource obj file not allowed, already got {{.*}}_id.obj
+
+# RUN: not lld-link /out:%t.exe /dll /noentry %S/Inputs/id.res %t_resource.obj 2>&1 | \
+# RUN:     FileCheck --check-prefix=OBJRES %s
+
+OBJRES: error: internal .obj file created from .res files: more than one resource obj file not allowed, already got {{.*}}_resource.obj
diff --git a/deps/lld/test/COFF/no-idata.s b/deps/lld/test/COFF/no-idata.s
index d2f78d5598c7e482ca1e5da58490f0a3f2093d81..419e58874570abc7aee9c7eae8e97d52649b0c71 100644
--- a/deps/lld/test/COFF/no-idata.s
+++ b/deps/lld/test/COFF/no-idata.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -triple=x86_64-windows-gnu %s -filetype=obj -o %t.obj
 # RUN: lld-link -out:%t.exe -entry:main -subsystem:console %t.obj
 # RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=DUMP %s
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=DIRECTORY %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=DIRECTORY %s
 
         .text
         .global main
diff --git a/deps/lld/test/COFF/no-ipi-stream.test b/deps/lld/test/COFF/no-ipi-stream.test
new file mode 100644
index 0000000000000000000000000000000000000000..e9b2a31bc0a7c9985550d49a8bff4dd28c46f042
--- /dev/null
+++ b/deps/lld/test/COFF/no-ipi-stream.test
@@ -0,0 +1,4 @@
+# RUN: rm -rf %t && mkdir %t
+# RUN: yaml2obj < %p/Inputs/no-ipi-stream-obj.obj.yaml > %t/no-ipi-stream-obj.obj
+# RUN: llvm-pdbutil yaml2pdb %p/Inputs/no-ipi-stream-pdb.pdb.yaml -pdb=%t/no-ipi-stream-pdb.pdb
+# RUN: lld-link -safeseh:no /dll /noentry /debug %t/no-ipi-stream-obj.obj
diff --git a/deps/lld/test/COFF/nodefaultlib.test b/deps/lld/test/COFF/nodefaultlib.test
index 8f4da3a21efee75aa95af015637f7bafdc08d0c6..61a31c21b6cc9e1cc6c1f3ab4cfd55b64de5a5e1 100644
--- a/deps/lld/test/COFF/nodefaultlib.test
+++ b/deps/lld/test/COFF/nodefaultlib.test
@@ -19,8 +19,8 @@
 # RUN:   /nodefaultlib:std64.lib >& %t.log || true
 # RUN: FileCheck -check-prefix=CHECK3 %s < %t.log
 
-CHECK1: error: could not open hello64.obj: {{[Nn]}}o such file or directory
-CHECK2: error: could not open hello64: {{[Nn]}}o such file or directory
+CHECK1: error: could not open 'hello64.obj': {{[Nn]}}o such file or directory
+CHECK2: error: could not open 'hello64': {{[Nn]}}o such file or directory
 CHECK3: error: undefined symbol: MessageBoxA
 CHECK3-NEXT: >>> referenced by {{.*}}hello64.obj:(main)
 
@@ -29,3 +29,10 @@ CHECK3-NEXT: >>> referenced by {{.*}}hello64.obj:(main)
 
 # RUN: env LIB=%T lld-link /out:%t.exe /entry:main \
 # RUN:   /subsystem:console hello64.obj /defaultlib:std64.lib
+
+MSVC stamps uppercase references in OBJ directives, thus ensure that passing lowercase 'libcmt' and 'oldnames' to /nodefaultlib works.
+# RUN: lld-link %S/Inputs/precomp.obj %S/Inputs/precomp-a.obj %S/Inputs/precomp-b.obj /nodefaultlib:libcmt /nodefaultlib:oldnames /entry:main /debug /pdb:%t.pdb /out:%t.exe /opt:ref /opt:icf
+# RUN: llvm-pdbutil dump -modules %t.pdb | FileCheck %s -check-prefix UPPERCASE
+
+UPPERCASE-NOT: OLDNAMES
+UPPERCASE-NOT: LIBCMT
diff --git a/deps/lld/test/COFF/noentry.test b/deps/lld/test/COFF/noentry.test
index cc02c85e7010dec68166c8e17353e84a11e30fa5..84de668b3d4c89480ae771ce1a29ecaf6fac1619 100644
--- a/deps/lld/test/COFF/noentry.test
+++ b/deps/lld/test/COFF/noentry.test
@@ -1,8 +1,8 @@
 # RUN: yaml2obj < %p/Inputs/export.yaml > %t.obj
 # RUN: lld-link /out:%t.dll /dll %t.obj
-# RUN: llvm-readobj -file-headers %t.dll | FileCheck -check-prefix=ENTRY %s
+# RUN: llvm-readobj --file-headers %t.dll | FileCheck -check-prefix=ENTRY %s
 # RUN: lld-link /out:%t.dll /dll /noentry %t.obj
-# RUN: llvm-readobj -file-headers %t.dll | FileCheck -check-prefix=NOENTRY %s
+# RUN: llvm-readobj --file-headers %t.dll | FileCheck -check-prefix=NOENTRY %s
 
 ENTRY:   AddressOfEntryPoint: 0x1000
 NOENTRY: AddressOfEntryPoint: 0x0
diff --git a/deps/lld/test/COFF/options.test b/deps/lld/test/COFF/options.test
index 6b9f2ca06fab9e038574fd6f0e7d63da42dc3c41..37220f93de182722e35d36ec900ec46b83252b9a 100644
--- a/deps/lld/test/COFF/options.test
+++ b/deps/lld/test/COFF/options.test
@@ -1,65 +1,105 @@
 # RUN: yaml2obj < %p/Inputs/ret42.yaml > %t.obj
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=BIND %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=BIND %s
 # RUN: lld-link /allowbind /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=BIND %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=BIND %s
 BIND-NOT: IMAGE_DLL_CHARACTERISTICS_NO_BIND
 
 # RUN: lld-link /allowbind:no /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NOBIND %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NOBIND %s
 NOBIND: IMAGE_DLL_CHARACTERISTICS_NO_BIND
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=ISO %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=ISO %s
 # RUN: lld-link /allowisolation /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=ISO %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=ISO %s
 ISO-NOT: IMAGE_DLL_CHARACTERISTICS_NO_ISOLATION
 
 # RUN: lld-link /allowisolation:no /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NOISO %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NOISO %s
 NOISO: IMAGE_DLL_CHARACTERISTICS_NO_ISOLATION
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=ENT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=ENT %s
 # RUN: lld-link /out:%t.exe /entry:main /highentropyva %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=ENT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=ENT %s
 ENT: IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA
 
 # RUN: lld-link /out:%t.exe /highentropyva:no /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NOENT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NOENT %s
 NOENT-NOT: IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA
 
 # RUN: lld-link /out:%t.exe /entry:main /integritycheck %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=INT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=INT %s
 INT: IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NOINT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NOINT %s
 # RUN: lld-link /out:%t.exe /integritycheck:no /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NOINT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NOINT %s
 NOINT-NOT: IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NXCOMPAT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NXCOMPAT %s
 # RUN: lld-link /out:%t.exe /entry:main /nxcompat %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NXCOMPAT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NXCOMPAT %s
 NXCOMPAT: IMAGE_DLL_CHARACTERISTICS_NX_COMPAT
 
 # RUN: lld-link /out:%t.exe /nxcompat:no /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NONXCOMPAT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NONXCOMPAT %s
 NONXCOMPAT-NOT: IMAGE_DLL_CHARACTERISTICS_NX_COMPAT
 
+# RUN: lld-link /out:%t.exe /entry:main /swaprun:CD %t.obj
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=SWAPCD %s
+# RUN: lld-link /out:%t.exe /entry:main /swaprun:cd,net %t.obj
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=SWAPCD %s
+SWAPCD: IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP
+
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=TSAWARE %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NOSWAPCD %s
+NOSWAPCD-NOT: IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP
+
+# RUN: lld-link /out:%t.exe /entry:main /swaprun:NeT %t.obj
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=SWAPNET %s
+# RUN: lld-link /out:%t.exe /entry:main /swaprun:net,cd,cd,net %t.obj
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=SWAPNET %s
+SWAPNET: IMAGE_FILE_NET_RUN_FROM_SWAP
+
+# RUN: lld-link /out:%t.exe /entry:main %t.obj
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NOSWAPNET %s
+NOSWAPNET-NOT: IMAGE_FILE_NET_RUN_FROM_SWAP
+
+# RUN: not lld-link /out:%t.exe /entry:main /swaprun: %t.obj 2>&1 | \
+# RUN:     FileCheck -check-prefix=SWAPERR1 %s
+# RUN: not lld-link /out:%t.exe /entry:main /swaprun:cd, %t.obj 2>&1 | \
+# RUN:     FileCheck -check-prefix=SWAPERR1 %s
+# RUN: not lld-link /out:%t.exe /entry:main /swaprun:,, %t.obj 2>&1 | \
+# RUN:     FileCheck -check-prefix=SWAPERR1 %s
+# RUN: not lld-link /out:%t.exe /entry:main /swaprun:,cd %t.obj 2>&1 | \
+# RUN:     FileCheck -check-prefix=SWAPERR1 %s
+SWAPERR1: /swaprun: missing argument
+
+# RUN: not lld-link /out:%t.exe /entry:main /swaprun:foo %t.obj 2>&1 | \
+# RUN:     FileCheck -check-prefix=SWAPERR2 %s
+# RUN: not lld-link /out:%t.exe /entry:main /swaprun:cd,foo,net %t.obj 2>&1 | \
+# RUN:     FileCheck -check-prefix=SWAPERR2 %s
+SWAPERR2: /swaprun: invalid argument: foo
+
+# RUN: not lld-link /out:%t.exe /entry:main /swaprun:cdfoo,net %t.obj 2>&1 | \
+# RUN:     FileCheck -check-prefix=SWAPERR3 %s
+SWAPERR3: /swaprun: invalid argument: cdfoo
+
+# RUN: lld-link /out:%t.exe /entry:main %t.obj
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=TSAWARE %s
 # RUN: lld-link /out:%t.exe /entry:main /tsaware %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=TSAWARE %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=TSAWARE %s
 TSAWARE: IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE
 
 # RUN: lld-link /tsaware:no /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NOTSAWARE %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NOTSAWARE %s
 # RUN: lld-link /dll /out:%t.dll /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.dll | FileCheck -check-prefix=NOTSAWARE %s
+# RUN: llvm-readobj --file-headers %t.dll | FileCheck -check-prefix=NOTSAWARE %s
 # RUN: lld-link /tsaware /dll /out:%t.dll /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.dll | FileCheck -check-prefix=NOTSAWARE %s
+# RUN: llvm-readobj --file-headers %t.dll | FileCheck -check-prefix=NOTSAWARE %s
 NOTSAWARE-NOT: IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE
diff --git a/deps/lld/test/COFF/order-i386.test b/deps/lld/test/COFF/order-i386.test
index 4cde5fa813f748b14fcb7e4a530fe123a4bbdbef..acd9ad2aa2c957b549f1af49bbfe0ca671236622 100644
--- a/deps/lld/test/COFF/order-i386.test
+++ b/deps/lld/test/COFF/order-i386.test
@@ -3,12 +3,12 @@
 # RUN: echo fn1 > %t.order
 # RUN: echo fn2 >> %t.order
 
-# RUN: lld-link -entry:fn1 -subsystem:console -opt:noref %t.obj \
+# RUN: lld-link -safeseh:no -entry:fn1 -subsystem:console -opt:noref %t.obj \
 # RUN:   -lldmap:- -out:%t.exe -order:@%t.order | FileCheck %s
 # CHECK: fn1
 # CHECK: fn2
 
-# RUN: lld-link -entry:fn1 -subsystem:console -opt:noref %t.obj \
+# RUN: lld-link -safeseh:no -entry:fn1 -subsystem:console -opt:noref %t.obj \
 # RUN:   -lldmap:- -out:%t.exe | FileCheck -check-prefix=DEFAULT %s
 # DEFAULT: fn2
 # DEFAULT: fn1
diff --git a/deps/lld/test/COFF/output-chars.test b/deps/lld/test/COFF/output-chars.test
index 2ccb084364ce4e6d78951e2172b8737d59ed9526..2733c3da1734d05d8893f7df57cf1b712a5ceb95 100644
--- a/deps/lld/test/COFF/output-chars.test
+++ b/deps/lld/test/COFF/output-chars.test
@@ -1,12 +1,12 @@
 # RUN: yaml2obj %s > %t.obj
 # RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t.obj
-# RUN: llvm-readobj -sections %t.dll | FileCheck %s
+# RUN: llvm-readobj --sections %t.dll | FileCheck %s
 # RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t.obj /section:.foo,rwe
-# RUN: llvm-readobj -sections %t.dll | FileCheck --check-prefix=SECTION %s
+# RUN: llvm-readobj --sections %t.dll | FileCheck --check-prefix=SECTION %s
 # RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t.obj /merge:.foo=.bar
-# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck --check-prefix=MERGE %s
+# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck --check-prefix=MERGE %s
 # RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t.obj /merge:.foo=.bar /section:.foo,rwe
-# RUN: llvm-readobj -sections %t.dll | FileCheck --check-prefix=MERGE-SECTION %s
+# RUN: llvm-readobj --sections %t.dll | FileCheck --check-prefix=MERGE-SECTION %s
 
 # CHECK: Name: .foo
 # CHECK: Characteristics [
diff --git a/deps/lld/test/COFF/pdb-comdat.test b/deps/lld/test/COFF/pdb-comdat.test
index 2c402739162d6f63a2d5ac92c17842d7be68ad49..86c07f4af2f5c705cc53bc0373ec310b33c66047 100644
--- a/deps/lld/test/COFF/pdb-comdat.test
+++ b/deps/lld/test/COFF/pdb-comdat.test
@@ -48,9 +48,9 @@ CHECK-NEXT:             module = 2, sum name = 0, offset = 120
 CHECK-NEXT:       128 | S_PROCREF [size = 20] `foo`
 CHECK-NEXT:             module = 1, sum name = 0, offset = 208
 CHECK-NEXT:       104 | S_GDATA32 [size = 24] `global`
-CHECK-NEXT:             type = 0x0074 (int), addr = 0000:0000
+CHECK-NEXT:             type = 0x0074 (int), addr = 0003:0000
 CHECK-NEXT:       168 | S_GDATA32 [size = 24] `global`
-CHECK-NEXT:             type = 0x0074 (int), addr = 0000:0000
+CHECK-NEXT:             type = 0x0074 (int), addr = 0003:0000
 
 CHECK:                           Symbols
 CHECK: ============================================================
diff --git a/deps/lld/test/COFF/pdb-debug-f.s b/deps/lld/test/COFF/pdb-debug-f.s
index 624c1192914aa55514f661a7d80a666e626e56e9..ccc34558c832bca7e86583ac731fddcf920c1d26 100644
--- a/deps/lld/test/COFF/pdb-debug-f.s
+++ b/deps/lld/test/COFF/pdb-debug-f.s
@@ -1,6 +1,6 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple=i386-pc-win32 -filetype=obj -o %t.obj %s
-# RUN: lld-link /subsystem:console /debug /nodefaultlib /entry:foo /out:%t.exe /pdb:%t.pdb %t.obj
+# RUN: lld-link -safeseh:no /subsystem:console /debug /nodefaultlib /entry:foo /out:%t.exe /pdb:%t.pdb %t.obj
 # RUN: llvm-pdbutil dump -fpo %t.pdb | FileCheck %s
 
 # CHECK:                         Old FPO Data
diff --git a/deps/lld/test/COFF/pdb-exe-path-dots.test b/deps/lld/test/COFF/pdb-exe-path-dots.test
index 131898122545287a7d170a8271cc120e1d154295..9f1e031ceb718dfc2117627355682d3a3a311c88 100644
--- a/deps/lld/test/COFF/pdb-exe-path-dots.test
+++ b/deps/lld/test/COFF/pdb-exe-path-dots.test
@@ -5,6 +5,6 @@ RUN: mkdir %t
 RUN: mkdir %t/foo
 RUN: lld-link /debug /pdb:%t/foo/./out.pdb /out:%t/out.exe /entry:main /nodefaultlib \
 RUN:   %t1.obj %t2.obj
-RUN: llvm-readobj -coff-debug-directory %t/out.exe | FileCheck %s
+RUN: llvm-readobj --coff-debug-directory %t/out.exe | FileCheck %s
 
 CHECK: PDBFileName: {{.*}}tmp{{/|\\}}foo{{/|\\}}out.pdb
\ No newline at end of file
diff --git a/deps/lld/test/COFF/pdb-global-constants.test b/deps/lld/test/COFF/pdb-global-constants.test
new file mode 100644
index 0000000000000000000000000000000000000000..b646fc9c2aa3ef6bc51c2f736162fa6b0ee24b96
--- /dev/null
+++ b/deps/lld/test/COFF/pdb-global-constants.test
@@ -0,0 +1,28 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj %S/Inputs/pdb-global-constants-a.s -o %t-a.obj -triple x86_64-windows-msvc
+# RUN: llvm-mc -filetype=obj %S/Inputs/pdb-global-constants-b.s -o %t-b.obj -triple x86_64-windows-msvc
+# RUN: lld-link -entry:main -nodefaultlib %t-a.obj %t-b.obj -out:%t.exe -pdb:%t.pdb -debug
+# RUN: llvm-pdbutil dump -globals %t.pdb | FileCheck %s
+
+# Test that lld deduplicates S_CONSTANT records with the same name and value.
+#
+# Compiled from this C code, using
+# clang t.cpp -g -gcodeview -S
+#
+# %t-a.cpp:
+# const int Foo = 41;
+# const int Bar = 42;
+# int main() { return Foo + Bar; }
+#
+# %t-b.cpp:
+# const int Foo = 42;
+# const int Bar = 42;
+# int foobar() { return Foo + Bar; }
+
+CHECK:                       Global Symbols
+CHECK:           88 | S_CONSTANT [size = 16] `Bar`
+CHECK-NEXT:           type = 0x1002 (const int), value = 42
+CHECK-NEXT:      72 | S_CONSTANT [size = 16] `Foo`
+CHECK-NEXT:           type = 0x1002 (const int), value = 41
+CHECK-NEXT:     128 | S_CONSTANT [size = 16] `Foo`
+CHECK-NEXT:           type = 0x1002 (const int), value = 42
diff --git a/deps/lld/test/COFF/pdb-global-gc.yaml b/deps/lld/test/COFF/pdb-global-gc.yaml
index 7206196fae2da27486f06276c4da4eda978fe33b..5351ef545df87ced31f44bdcd69e6f2d897a313a 100644
--- a/deps/lld/test/COFF/pdb-global-gc.yaml
+++ b/deps/lld/test/COFF/pdb-global-gc.yaml
@@ -23,6 +23,7 @@
 # CHECK:      ============================================================
 # CHECK-NEXT:   Mod 0000 | `{{.*}}pdb-global-gc.yaml.tmp.obj`:
 # CHECK-NEXT:   Mod 0001 | `{{.*}}pdb-global-gc.yaml.tmp2.obj`:
+# CHECK-NEXT:   Error loading module stream 1.  The specified stream could not be loaded. Module stream not present
 # CHECK-NEXT:   Mod 0002 | `* Linker *`:
 
 --- !COFF
diff --git a/deps/lld/test/COFF/pdb-globals.test b/deps/lld/test/COFF/pdb-globals.test
index ee9c0ef2efee97bf01d1edbabfe986c66c953388..00909fa317bbeafec38b6125b6151f8234406577 100644
--- a/deps/lld/test/COFF/pdb-globals.test
+++ b/deps/lld/test/COFF/pdb-globals.test
@@ -2,6 +2,11 @@ RUN: yaml2obj %S/Inputs/pdb-globals.yaml > %t.obj
 RUN: lld-link /debug /nodefaultlib /entry:main /out:%t.exe /pdb:%t.pdb %t.obj
 RUN: llvm-pdbutil dump -symbols -globals %t.pdb | FileCheck %s
 
+RUN: lld-link /debug /nodefaultlib /entry:main /out:%t.exe /pdb:%t.pdb %t.obj /threads
+RUN: llvm-pdbutil dump -symbols -globals %t.pdb | FileCheck %s
+RUN: lld-link /debug /nodefaultlib /entry:main /out:%t.exe /pdb:%t.pdb %t.obj /threads:no
+RUN: llvm-pdbutil dump -symbols -globals %t.pdb | FileCheck %s
+
 # Test that we correctly distribute symbols between the globals and module
 # symbol streams.  Specifically:
 #  * S_UDT, S_GDATA32, and S_CONSTANT end up in the globals stream, and are
diff --git a/deps/lld/test/COFF/pdb-inlinees-extrafiles.s b/deps/lld/test/COFF/pdb-inlinees-extrafiles.s
new file mode 100644
index 0000000000000000000000000000000000000000..759663d7a4f463f24d2e0970b323dbc7fcf0f1ed
--- /dev/null
+++ b/deps/lld/test/COFF/pdb-inlinees-extrafiles.s
@@ -0,0 +1,334 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj %s -o %t.obj -triple x86_64-windows-msvc
+# RUN: lld-link -entry:main -nodefaultlib %t.obj -out:%t.exe -pdb:%t.pdb -debug
+# RUN: llvm-pdbutil dump -il %t.pdb | FileCheck %s
+
+# The assembly was hand written to model the following C code. As of this
+# writing, clang does not emit extra files for inlinees, so it had to be hand
+# written.
+
+# // t1.h:
+# ++x;
+# #include "t2.h"
+# ++x;
+
+# // t2.h:
+# ++x;
+# __debugbreak();
+# ++x;
+
+# // t.c:
+# volatile int x;
+# static __forceinline void inlinee_1(void) {
+#   ++x;
+# #include "t1.inc"
+#   ++x;
+# }
+# int main() {
+#   ++x;
+#   inlinee_1();
+#   ++x;
+#   return x;
+# }
+
+# CHECK:                             Inlinee Lines
+# CHECK:      Mod 0000 | `{{.*}}pdb-inlinees-extrafiles.s.tmp.obj`:
+# CHECK-NEXT:  Inlinee |  Line | Source File
+# CHECK-NEXT:   0x1000 |     7 | C:\src\llvm-project\build\t.c (MD5: A79D837C976E9F0463A474D74E2EE9E7)
+# CHECK-NEXT:                    C:\src\llvm-project\build\t1.h (MD5: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+# CHECK-NEXT:                    C:\src\llvm-project\build\t2.h (MD5: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+
+	.text
+	.def	 @feat.00;
+	.scl	3;
+	.type	0;
+	.endef
+	.globl	@feat.00
+.set @feat.00, 0
+	.intel_syntax noprefix
+	.file	"t.c"
+	.def	 main;
+	.scl	2;
+	.type	32;
+	.endef
+	.section	.text,"xr",one_only,main
+	.globl	main                    # -- Begin function main
+main:                                   # @main
+.Lfunc_begin0:
+	.cv_func_id 0
+# %bb.0:                                # %entry
+	.cv_file	1 "C:\\src\\llvm-project\\build\\t.c" "A79D837C976E9F0463A474D74E2EE9E7" 1
+	.cv_file	2 "C:\\src\\llvm-project\\build\\t1.h" "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" 1
+	.cv_file	3 "C:\\src\\llvm-project\\build\\t2.h" "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" 1
+	.cv_loc	0 1 13 0                # t.c:13:0
+	inc	dword ptr [rip + x]
+.Ltmp0:
+	.cv_inline_site_id 1 within 0 inlined_at 1 14 0
+	.cv_loc	1 1 3 0                 # t.c:3:0
+	inc	dword ptr [rip + x]
+.Ltmp1:
+	.cv_loc	1 2 1 0                 # t1.h:1:0
+	inc	dword ptr [rip + x]
+	.cv_loc	1 3 1 0                 # t2.h:1:0
+	inc	dword ptr [rip + x]
+	.cv_loc	1 3 2 0                 # t2.h:2:0
+	int3
+	.cv_loc	1 3 3 0                 # t2.h:3:0
+	inc	dword ptr [rip + x]
+	.cv_loc	1 2 3 0                 # t1.h:3:0
+	inc	dword ptr [rip + x]
+.Ltmp2:
+	.cv_loc	1 1 5 0                # t.c:5:0
+	inc	dword ptr [rip + x]
+.Ltmp3:
+	.cv_loc	0 1 15 0                # t.c:15:0
+	inc	dword ptr [rip + x]
+	.cv_loc	0 1 16 0                # t.c:16:0
+	mov	eax, dword ptr [rip + x]
+	ret
+.Ltmp4:
+.Lfunc_end0:
+                                        # -- End function
+	.comm	x,4,2                   # @x
+	.section	.debug$S,"dr"
+	.p2align	2
+	.long	4                       # Debug section magic
+	.long	241
+	.long	.Ltmp6-.Ltmp5           # Subsection size
+.Ltmp5:
+	.short	.Ltmp8-.Ltmp7           # Record length
+.Ltmp7:
+	.short	4412                    # Record kind: S_COMPILE3
+	.long	0                       # Flags and language
+	.short	208                     # CPUType
+	.short	9                       # Frontend version
+	.short	0
+	.short	0
+	.short	0
+	.short	9000                    # Backend version
+	.short	0
+	.short	0
+	.short	0
+	.asciz	"clang version 9.0.0 (git@github.com:llvm/llvm-project.git aa762a56caf3ef2b0b41c501e66d3ef32903a2d0)" # Null-terminated compiler version string
+	.p2align	2
+.Ltmp8:
+.Ltmp6:
+	.p2align	2
+	.long	246                     # Inlinee lines subsection
+	.long	.Ltmp10-.Ltmp9          # Subsection size
+.Ltmp9:
+	.long	1                       # Inlinee lines signature, extra files
+
+                                        # Inlined function inlinee_1 starts at t.c:7
+	.long	4098                    # Type index of inlined function
+	.cv_filechecksumoffset	1       # Offset into filechecksum table
+	.long	7                       # Starting line number
+	.long 2
+	.cv_filechecksumoffset	2       # Offset into filechecksum table
+	.cv_filechecksumoffset	3       # Offset into filechecksum table
+
+.Ltmp10:
+	.p2align	2
+	.section	.debug$S,"dr",associative,main
+	.p2align	2
+	.long	4                       # Debug section magic
+	.long	241                     # Symbol subsection for main
+	.long	.Ltmp12-.Ltmp11         # Subsection size
+.Ltmp11:
+	.short	.Ltmp14-.Ltmp13         # Record length
+.Ltmp13:
+	.short	4423                    # Record kind: S_GPROC32_ID
+	.long	0                       # PtrParent
+	.long	0                       # PtrEnd
+	.long	0                       # PtrNext
+	.long	.Lfunc_end0-main        # Code size
+	.long	0                       # Offset after prologue
+	.long	0                       # Offset before epilogue
+	.long	4101                    # Function type index
+	.secrel32	main            # Function section relative address
+	.secidx	main                    # Function section index
+	.byte	0                       # Flags
+	.asciz	"main"                  # Function name
+	.p2align	2
+.Ltmp14:
+	.short	.Ltmp16-.Ltmp15         # Record length
+.Ltmp15:
+	.short	4114                    # Record kind: S_FRAMEPROC
+	.long	0                       # FrameSize
+	.long	0                       # Padding
+	.long	0                       # Offset of padding
+	.long	0                       # Bytes of callee saved registers
+	.long	0                       # Exception handler offset
+	.short	0                       # Exception handler section
+	.long	0                       # Flags (defines frame register)
+	.p2align	2
+.Ltmp16:
+	.short	.Ltmp18-.Ltmp17         # Record length
+.Ltmp17:
+	.short	4429                    # Record kind: S_INLINESITE
+	.long	0                       # PtrParent
+	.long	0                       # PtrEnd
+	.long	4098                    # Inlinee type index
+	.cv_inline_linetable	1 1 7 .Lfunc_begin0 .Lfunc_end0
+	.p2align	2
+.Ltmp18:
+	.short	2                       # Record length
+	.short	4430                    # Record kind: S_INLINESITE_END
+	.short	2                       # Record length
+	.short	4431                    # Record kind: S_PROC_ID_END
+.Ltmp12:
+	.p2align	2
+	.cv_linetable	0, main, .Lfunc_end0
+	.section	.debug$S,"dr"
+	.long	241                     # Symbol subsection for globals
+	.long	.Ltmp22-.Ltmp21         # Subsection size
+.Ltmp21:
+	.short	.Ltmp24-.Ltmp23         # Record length
+.Ltmp23:
+	.short	4365                    # Record kind: S_GDATA32
+	.long	4102                    # Type
+	.secrel32	x               # DataOffset
+	.secidx	x                       # Segment
+	.asciz	"x"                     # Name
+	.p2align	2
+.Ltmp24:
+.Ltmp22:
+	.p2align	2
+	.cv_filechecksums               # File index to string table offset subsection
+	.cv_stringtable                 # String table
+	.long	241
+	.long	.Ltmp26-.Ltmp25         # Subsection size
+.Ltmp25:
+	.short	.Ltmp28-.Ltmp27         # Record length
+.Ltmp27:
+	.short	4428                    # Record kind: S_BUILDINFO
+	.long	4105                    # LF_BUILDINFO index
+	.p2align	2
+.Ltmp28:
+.Ltmp26:
+	.p2align	2
+	.section	.debug$T,"dr"
+	.p2align	2
+	.long	4                       # Debug section magic
+	# ArgList (0x1000) {
+	#   TypeLeafKind: LF_ARGLIST (0x1201)
+	#   NumArgs: 0
+	#   Arguments [
+	#   ]
+	# }
+	.byte	0x06, 0x00, 0x01, 0x12
+	.byte	0x00, 0x00, 0x00, 0x00
+	# Procedure (0x1001) {
+	#   TypeLeafKind: LF_PROCEDURE (0x1008)
+	#   ReturnType: void (0x3)
+	#   CallingConvention: NearC (0x0)
+	#   FunctionOptions [ (0x0)
+	#   ]
+	#   NumParameters: 0
+	#   ArgListType: () (0x1000)
+	# }
+	.byte	0x0e, 0x00, 0x08, 0x10
+	.byte	0x03, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x10, 0x00, 0x00
+	# FuncId (0x1002) {
+	#   TypeLeafKind: LF_FUNC_ID (0x1601)
+	#   ParentScope: 0x0
+	#   FunctionType: void () (0x1001)
+	#   Name: inlinee_1
+	# }
+	.byte	0x16, 0x00, 0x01, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x01, 0x10, 0x00, 0x00
+	.byte	0x69, 0x6e, 0x6c, 0x69
+	.byte	0x6e, 0x65, 0x65, 0x5f
+	.byte	0x31, 0x00, 0xf2, 0xf1
+	# FuncId (0x1003) {
+	#   TypeLeafKind: LF_FUNC_ID (0x1601)
+	#   ParentScope: 0x0
+	#   FunctionType: void () (0x1001)
+	#   Name: inlinee_2
+	# }
+	.byte	0x16, 0x00, 0x01, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x01, 0x10, 0x00, 0x00
+	.byte	0x69, 0x6e, 0x6c, 0x69
+	.byte	0x6e, 0x65, 0x65, 0x5f
+	.byte	0x32, 0x00, 0xf2, 0xf1
+	# Procedure (0x1004) {
+	#   TypeLeafKind: LF_PROCEDURE (0x1008)
+	#   ReturnType: int (0x74)
+	#   CallingConvention: NearC (0x0)
+	#   FunctionOptions [ (0x0)
+	#   ]
+	#   NumParameters: 0
+	#   ArgListType: () (0x1000)
+	# }
+	.byte	0x0e, 0x00, 0x08, 0x10
+	.byte	0x74, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x10, 0x00, 0x00
+	# FuncId (0x1005) {
+	#   TypeLeafKind: LF_FUNC_ID (0x1601)
+	#   ParentScope: 0x0
+	#   FunctionType: int () (0x1004)
+	#   Name: main
+	# }
+	.byte	0x12, 0x00, 0x01, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x04, 0x10, 0x00, 0x00
+	.byte	0x6d, 0x61, 0x69, 0x6e
+	.byte	0x00, 0xf3, 0xf2, 0xf1
+	# Modifier (0x1006) {
+	#   TypeLeafKind: LF_MODIFIER (0x1001)
+	#   ModifiedType: int (0x74)
+	#   Modifiers [ (0x2)
+	#     Volatile (0x2)
+	#   ]
+	# }
+	.byte	0x0a, 0x00, 0x01, 0x10
+	.byte	0x74, 0x00, 0x00, 0x00
+	.byte	0x02, 0x00, 0xf2, 0xf1
+	# StringId (0x1007) {
+	#   TypeLeafKind: LF_STRING_ID (0x1605)
+	#   Id: 0x0
+	#   StringData: C:\src\llvm-project\build
+	# }
+	.byte	0x22, 0x00, 0x05, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x43, 0x3a, 0x5c, 0x73
+	.byte	0x72, 0x63, 0x5c, 0x6c
+	.byte	0x6c, 0x76, 0x6d, 0x2d
+	.byte	0x70, 0x72, 0x6f, 0x6a
+	.byte	0x65, 0x63, 0x74, 0x5c
+	.byte	0x62, 0x75, 0x69, 0x6c
+	.byte	0x64, 0x00, 0xf2, 0xf1
+	# StringId (0x1008) {
+	#   TypeLeafKind: LF_STRING_ID (0x1605)
+	#   Id: 0x0
+	#   StringData: t.c
+	# }
+	.byte	0x0a, 0x00, 0x05, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x74, 0x2e, 0x63, 0x00
+	# BuildInfo (0x1009) {
+	#   TypeLeafKind: LF_BUILDINFO (0x1603)
+	#   NumArgs: 5
+	#   Arguments [
+	#     ArgType: C:\src\llvm-project\build (0x1007)
+	#     ArgType: 0x0
+	#     ArgType: t.c (0x1008)
+	#     ArgType: 0x0
+	#     ArgType: 0x0
+	#   ]
+	# }
+	.byte	0x1a, 0x00, 0x03, 0x16
+	.byte	0x05, 0x00, 0x07, 0x10
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x08, 0x10
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0xf2, 0xf1
+
+	.addrsig
+	.addrsig_sym x
diff --git a/deps/lld/test/COFF/pdb-inlinees.s b/deps/lld/test/COFF/pdb-inlinees.s
new file mode 100644
index 0000000000000000000000000000000000000000..845a04bdec0f755b6e222883dfa6474d3de36597
--- /dev/null
+++ b/deps/lld/test/COFF/pdb-inlinees.s
@@ -0,0 +1,332 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj %s -o %t.obj -triple x86_64-windows-msvc
+# RUN: lld-link -entry:main -nodefaultlib %t.obj -out:%t.exe -pdb:%t.pdb -debug
+# RUN: llvm-pdbutil dump -il %t.pdb | FileCheck %s
+
+# Compiled from this C code, with modifications to test multiple file checksums:
+# volatile int x;
+# static __forceinline void inlinee_2(void) {
+#   ++x;
+#   __debugbreak();
+#   ++x;
+# }
+# static __forceinline void inlinee_1(void) {
+#   ++x;
+#   inlinee_2();
+#   ++x;
+# }
+# int main() {
+#   ++x;
+#   inlinee_1();
+#   ++x;
+#   return x;
+# }
+
+# CHECK:                             Inlinee Lines
+# CHECK:      Mod 0000 | `{{.*}}pdb-inlinees.s.tmp.obj`:
+# CHECK-NEXT:  Inlinee |  Line | Source File
+# CHECK-NEXT:   0x1000 |     7 | C:\src\llvm-project\build\t.c (MD5: A79D837C976E9F0463A474D74E2EE9E7)
+# CHECK-NEXT:   0x1001 |     2 | C:\src\llvm-project\build\file2.h (MD5: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
+
+	.text
+	.def	 @feat.00;
+	.scl	3;
+	.type	0;
+	.endef
+	.globl	@feat.00
+.set @feat.00, 0
+	.intel_syntax noprefix
+	.file	"t.c"
+	.def	 main;
+	.scl	2;
+	.type	32;
+	.endef
+	.section	.text,"xr",one_only,main
+	.globl	main                    # -- Begin function main
+main:                                   # @main
+.Lfunc_begin0:
+	.cv_func_id 0
+# %bb.0:                                # %entry
+	.cv_file	1 "C:\\src\\llvm-project\\build\\t.c" "A79D837C976E9F0463A474D74E2EE9E7" 1
+	.cv_file	2 "C:\\src\\llvm-project\\build\\file2.h" "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" 1
+	.cv_loc	0 1 13 0                # t.c:13:0
+	inc	dword ptr [rip + x]
+.Ltmp0:
+	.cv_inline_site_id 1 within 0 inlined_at 1 14 0
+	.cv_loc	1 1 8 0                 # t.c:8:0
+	inc	dword ptr [rip + x]
+.Ltmp1:
+	.cv_inline_site_id 2 within 1 inlined_at 1 9 0
+	.cv_loc	2 2 3 0                 # file2.h:3:0
+	inc	dword ptr [rip + x]
+	.cv_loc	2 2 4 0                 # file2.h:4:0
+	int3
+	.cv_loc	2 2 5 0                 # file2.h:5:0
+	inc	dword ptr [rip + x]
+.Ltmp2:
+	.cv_loc	1 1 10 0                # t.c:10:0
+	inc	dword ptr [rip + x]
+.Ltmp3:
+	.cv_loc	0 1 15 0                # t.c:15:0
+	inc	dword ptr [rip + x]
+	.cv_loc	0 1 16 0                # t.c:16:0
+	mov	eax, dword ptr [rip + x]
+	ret
+.Ltmp4:
+.Lfunc_end0:
+                                        # -- End function
+	.comm	x,4,2                   # @x
+	.section	.debug$S,"dr"
+	.p2align	2
+	.long	4                       # Debug section magic
+	.long	241
+	.long	.Ltmp6-.Ltmp5           # Subsection size
+.Ltmp5:
+	.short	.Ltmp8-.Ltmp7           # Record length
+.Ltmp7:
+	.short	4412                    # Record kind: S_COMPILE3
+	.long	0                       # Flags and language
+	.short	208                     # CPUType
+	.short	9                       # Frontend version
+	.short	0
+	.short	0
+	.short	0
+	.short	9000                    # Backend version
+	.short	0
+	.short	0
+	.short	0
+	.asciz	"clang version 9.0.0 (git@github.com:llvm/llvm-project.git aa762a56caf3ef2b0b41c501e66d3ef32903a2d0)" # Null-terminated compiler version string
+	.p2align	2
+.Ltmp8:
+.Ltmp6:
+	.p2align	2
+	.long	246                     # Inlinee lines subsection
+	.long	.Ltmp10-.Ltmp9          # Subsection size
+.Ltmp9:
+	.long	0                       # Inlinee lines signature
+
+                                        # Inlined function inlinee_1 starts at t.c:7
+	.long	4098                    # Type index of inlined function
+	.cv_filechecksumoffset	1       # Offset into filechecksum table
+	.long	7                       # Starting line number
+
+                                        # Inlined function inlinee_2 starts at file2.h:2
+	.long	4099                    # Type index of inlined function
+	.cv_filechecksumoffset	2       # Offset into filechecksum table
+	.long	2                       # Starting line number
+.Ltmp10:
+	.p2align	2
+	.section	.debug$S,"dr",associative,main
+	.p2align	2
+	.long	4                       # Debug section magic
+	.long	241                     # Symbol subsection for main
+	.long	.Ltmp12-.Ltmp11         # Subsection size
+.Ltmp11:
+	.short	.Ltmp14-.Ltmp13         # Record length
+.Ltmp13:
+	.short	4423                    # Record kind: S_GPROC32_ID
+	.long	0                       # PtrParent
+	.long	0                       # PtrEnd
+	.long	0                       # PtrNext
+	.long	.Lfunc_end0-main        # Code size
+	.long	0                       # Offset after prologue
+	.long	0                       # Offset before epilogue
+	.long	4101                    # Function type index
+	.secrel32	main            # Function section relative address
+	.secidx	main                    # Function section index
+	.byte	0                       # Flags
+	.asciz	"main"                  # Function name
+	.p2align	2
+.Ltmp14:
+	.short	.Ltmp16-.Ltmp15         # Record length
+.Ltmp15:
+	.short	4114                    # Record kind: S_FRAMEPROC
+	.long	0                       # FrameSize
+	.long	0                       # Padding
+	.long	0                       # Offset of padding
+	.long	0                       # Bytes of callee saved registers
+	.long	0                       # Exception handler offset
+	.short	0                       # Exception handler section
+	.long	0                       # Flags (defines frame register)
+	.p2align	2
+.Ltmp16:
+	.short	.Ltmp18-.Ltmp17         # Record length
+.Ltmp17:
+	.short	4429                    # Record kind: S_INLINESITE
+	.long	0                       # PtrParent
+	.long	0                       # PtrEnd
+	.long	4098                    # Inlinee type index
+	.cv_inline_linetable	1 1 7 .Lfunc_begin0 .Lfunc_end0
+	.p2align	2
+.Ltmp18:
+	.short	.Ltmp20-.Ltmp19         # Record length
+.Ltmp19:
+	.short	4429                    # Record kind: S_INLINESITE
+	.long	0                       # PtrParent
+	.long	0                       # PtrEnd
+	.long	4099                    # Inlinee type index
+	.cv_inline_linetable	2 2 2 .Lfunc_begin0 .Lfunc_end0
+	.p2align	2
+.Ltmp20:
+	.short	2                       # Record length
+	.short	4430                    # Record kind: S_INLINESITE_END
+	.short	2                       # Record length
+	.short	4430                    # Record kind: S_INLINESITE_END
+	.short	2                       # Record length
+	.short	4431                    # Record kind: S_PROC_ID_END
+.Ltmp12:
+	.p2align	2
+	.cv_linetable	0, main, .Lfunc_end0
+	.section	.debug$S,"dr"
+	.long	241                     # Symbol subsection for globals
+	.long	.Ltmp22-.Ltmp21         # Subsection size
+.Ltmp21:
+	.short	.Ltmp24-.Ltmp23         # Record length
+.Ltmp23:
+	.short	4365                    # Record kind: S_GDATA32
+	.long	4102                    # Type
+	.secrel32	x               # DataOffset
+	.secidx	x                       # Segment
+	.asciz	"x"                     # Name
+	.p2align	2
+.Ltmp24:
+.Ltmp22:
+	.p2align	2
+	.cv_filechecksums               # File index to string table offset subsection
+	.cv_stringtable                 # String table
+	.long	241
+	.long	.Ltmp26-.Ltmp25         # Subsection size
+.Ltmp25:
+	.short	.Ltmp28-.Ltmp27         # Record length
+.Ltmp27:
+	.short	4428                    # Record kind: S_BUILDINFO
+	.long	4105                    # LF_BUILDINFO index
+	.p2align	2
+.Ltmp28:
+.Ltmp26:
+	.p2align	2
+	.section	.debug$T,"dr"
+	.p2align	2
+	.long	4                       # Debug section magic
+	# ArgList (0x1000) {
+	#   TypeLeafKind: LF_ARGLIST (0x1201)
+	#   NumArgs: 0
+	#   Arguments [
+	#   ]
+	# }
+	.byte	0x06, 0x00, 0x01, 0x12
+	.byte	0x00, 0x00, 0x00, 0x00
+	# Procedure (0x1001) {
+	#   TypeLeafKind: LF_PROCEDURE (0x1008)
+	#   ReturnType: void (0x3)
+	#   CallingConvention: NearC (0x0)
+	#   FunctionOptions [ (0x0)
+	#   ]
+	#   NumParameters: 0
+	#   ArgListType: () (0x1000)
+	# }
+	.byte	0x0e, 0x00, 0x08, 0x10
+	.byte	0x03, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x10, 0x00, 0x00
+	# FuncId (0x1002) {
+	#   TypeLeafKind: LF_FUNC_ID (0x1601)
+	#   ParentScope: 0x0
+	#   FunctionType: void () (0x1001)
+	#   Name: inlinee_1
+	# }
+	.byte	0x16, 0x00, 0x01, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x01, 0x10, 0x00, 0x00
+	.byte	0x69, 0x6e, 0x6c, 0x69
+	.byte	0x6e, 0x65, 0x65, 0x5f
+	.byte	0x31, 0x00, 0xf2, 0xf1
+	# FuncId (0x1003) {
+	#   TypeLeafKind: LF_FUNC_ID (0x1601)
+	#   ParentScope: 0x0
+	#   FunctionType: void () (0x1001)
+	#   Name: inlinee_2
+	# }
+	.byte	0x16, 0x00, 0x01, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x01, 0x10, 0x00, 0x00
+	.byte	0x69, 0x6e, 0x6c, 0x69
+	.byte	0x6e, 0x65, 0x65, 0x5f
+	.byte	0x32, 0x00, 0xf2, 0xf1
+	# Procedure (0x1004) {
+	#   TypeLeafKind: LF_PROCEDURE (0x1008)
+	#   ReturnType: int (0x74)
+	#   CallingConvention: NearC (0x0)
+	#   FunctionOptions [ (0x0)
+	#   ]
+	#   NumParameters: 0
+	#   ArgListType: () (0x1000)
+	# }
+	.byte	0x0e, 0x00, 0x08, 0x10
+	.byte	0x74, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x10, 0x00, 0x00
+	# FuncId (0x1005) {
+	#   TypeLeafKind: LF_FUNC_ID (0x1601)
+	#   ParentScope: 0x0
+	#   FunctionType: int () (0x1004)
+	#   Name: main
+	# }
+	.byte	0x12, 0x00, 0x01, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x04, 0x10, 0x00, 0x00
+	.byte	0x6d, 0x61, 0x69, 0x6e
+	.byte	0x00, 0xf3, 0xf2, 0xf1
+	# Modifier (0x1006) {
+	#   TypeLeafKind: LF_MODIFIER (0x1001)
+	#   ModifiedType: int (0x74)
+	#   Modifiers [ (0x2)
+	#     Volatile (0x2)
+	#   ]
+	# }
+	.byte	0x0a, 0x00, 0x01, 0x10
+	.byte	0x74, 0x00, 0x00, 0x00
+	.byte	0x02, 0x00, 0xf2, 0xf1
+	# StringId (0x1007) {
+	#   TypeLeafKind: LF_STRING_ID (0x1605)
+	#   Id: 0x0
+	#   StringData: C:\src\llvm-project\build
+	# }
+	.byte	0x22, 0x00, 0x05, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x43, 0x3a, 0x5c, 0x73
+	.byte	0x72, 0x63, 0x5c, 0x6c
+	.byte	0x6c, 0x76, 0x6d, 0x2d
+	.byte	0x70, 0x72, 0x6f, 0x6a
+	.byte	0x65, 0x63, 0x74, 0x5c
+	.byte	0x62, 0x75, 0x69, 0x6c
+	.byte	0x64, 0x00, 0xf2, 0xf1
+	# StringId (0x1008) {
+	#   TypeLeafKind: LF_STRING_ID (0x1605)
+	#   Id: 0x0
+	#   StringData: t.c
+	# }
+	.byte	0x0a, 0x00, 0x05, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x74, 0x2e, 0x63, 0x00
+	# BuildInfo (0x1009) {
+	#   TypeLeafKind: LF_BUILDINFO (0x1603)
+	#   NumArgs: 5
+	#   Arguments [
+	#     ArgType: C:\src\llvm-project\build (0x1007)
+	#     ArgType: 0x0
+	#     ArgType: t.c (0x1008)
+	#     ArgType: 0x0
+	#     ArgType: 0x0
+	#   ]
+	# }
+	.byte	0x1a, 0x00, 0x03, 0x16
+	.byte	0x05, 0x00, 0x07, 0x10
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x08, 0x10
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0xf2, 0xf1
+
+	.addrsig
+	.addrsig_sym x
diff --git a/deps/lld/test/COFF/pdb-lib.s b/deps/lld/test/COFF/pdb-lib.s
index c970f0ba198022420a84596b250762fb4a56b5ec..09f1892069a454237ed95651e162edfdd9e7ea97 100644
--- a/deps/lld/test/COFF/pdb-lib.s
+++ b/deps/lld/test/COFF/pdb-lib.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=i686-windows-msvc %s -o foo.obj
 # RUN: llc %S/Inputs/bar.ll -filetype=obj -mtriple=i686-windows-msvc -o bar.obj
 # RUN: llvm-lib bar.obj -out:bar.lib
-# RUN: lld-link -debug -pdb:foo.pdb foo.obj bar.lib -out:foo.exe -entry:main
+# RUN: lld-link -safeseh:no -debug -pdb:foo.pdb foo.obj bar.lib -out:foo.exe -entry:main
 # RUN: llvm-pdbutil dump -modules %t/foo.pdb | FileCheck %s
 
 # Make sure that the PDB has module descriptors. foo.obj and bar.lib should be
@@ -13,15 +13,15 @@
 # CHECK-NEXT: ============================================================
 # CHECK-NEXT:   Mod 0000 | `{{.*pdb-lib.s.tmp[/\\]foo.obj}}`:
 # CHECK-NEXT:              Obj: `{{.*pdb-lib.s.tmp[/\\]foo.obj}}`:
-# CHECK-NEXT:              debug stream: 10, # files: 0, has ec info: false
+# CHECK-NEXT:              debug stream: 65535, # files: 0, has ec info: false
 # CHECK-NEXT:              pdb file ni: 0 ``, src file ni: 0 ``
 # CHECK-NEXT:   Mod 0001 | `bar.obj`:
 # CHECK-NEXT:              Obj: `{{.*pdb-lib.s.tmp[/\\]bar.lib}}`:
-# CHECK-NEXT:              debug stream: 11, # files: 0, has ec info: false
+# CHECK-NEXT:              debug stream: 65535, # files: 0, has ec info: false
 # CHECK-NEXT:              pdb file ni: 0 ``, src file ni: 0 ``
 # CHECK-NEXT:   Mod 0002 | `* Linker *`:
 # CHECK-NEXT:              Obj: ``:
-# CHECK-NEXT:              debug stream: 12, # files: 0, has ec info: false
+# CHECK-NEXT:              debug stream: 10, # files: 0, has ec info: false
 # CHECK-NEXT:              pdb file ni: 1 `{{.*foo.pdb}}`, src file ni: 0 ``
 
         .def     _main;
diff --git a/deps/lld/test/COFF/pdb-publics-import.test b/deps/lld/test/COFF/pdb-publics-import.test
index a1fe7d00a08c72e92e165f3f4fc2d676baac71a5..52b7d742ed09f1b40c936e9cea8d412b31cdd6fc 100644
--- a/deps/lld/test/COFF/pdb-publics-import.test
+++ b/deps/lld/test/COFF/pdb-publics-import.test
@@ -8,7 +8,48 @@ RUN:   /export:exportfn1 /export:exportfn2
 RUN: yaml2obj < %p/Inputs/import.yaml > %t2.obj
 RUN: lld-link /out:%t2.exe /pdb:%t2.pdb /pdbaltpath:test.pdb \
 RUN:   /debug /entry:main %t2.obj %t1.lib
-RUN: llvm-pdbutil dump %t2.pdb -publics -section-contribs | FileCheck %s
+RUN: llvm-pdbutil dump %t2.pdb -all | FileCheck %s
+
+CHECK:                             Streams
+CHECK-NEXT: ============================================================
+CHECK-LABEL:   Stream 10 ( 256 bytes): [Module "Import:pdb-publics-import.test.tmp1.dll"]
+
+CHECK:                         Module Stats
+CHECK-NEXT: ============================================================
+CHECK-NEXT: Mod 0000 | `{{.*}}pdb-publics-import.test.tmp2.obj`:
+CHECK-NEXT:   Mod 0 (debug info not present): [{{.*}}pdb-publics-import.test.tmp2.obj]
+CHECK-NEXT: Mod 0001 | `pdb-publics-import.test.tmp1.dll`:
+CHECK-NEXT:   Mod 1 (debug info not present): [pdb-publics-import.test.tmp1.dll]
+CHECK-NEXT: Mod 0002 | `Import:pdb-publics-import.test.tmp1.dll`:
+CHECK-NEXT:   Stream 10, 256 bytes
+
+CHECK:                           Modules
+CHECK-NEXT: ============================================================
+CHECK-NEXT:   Mod 0000 | `{{.*}}pdb-publics-import.test.tmp2.obj`:
+CHECK-NEXT:   SC[.text]  | mod = 0, 0001:0000, size = 8, data crc = 0, reloc crc = 0
+CHECK-NEXT:           IMAGE_SCN_CNT_CODE | IMAGE_SCN_ALIGN_4BYTES | IMAGE_SCN_MEM_EXECUTE |
+CHECK-NEXT:           IMAGE_SCN_MEM_READ
+CHECK-NEXT:   Obj: `{{.*}}pdb-publics-import.test.tmp2.obj`:
+CHECK-NEXT:   debug stream: 65535, # files: 0, has ec info: false
+CHECK-NEXT:   pdb file ni: 0 ``, src file ni: 0 ``
+CHECK-NEXT: Mod 0001 | `pdb-publics-import.test.tmp1.dll`:
+CHECK-NEXT: SC[???]  | mod = 65535, 65535:0000, size = -1, data crc = 0, reloc crc = 0
+CHECK-NEXT:         none
+CHECK-NEXT: Obj: `{{.*}}pdb-publics-import.test.tmp1.lib`:
+CHECK-NEXT: debug stream: 65535, # files: 0, has ec info: false
+CHECK-NEXT: pdb file ni: 0 ``, src file ni: 0 ``
+CHECK-NEXT: Mod 0002 | `Import:pdb-publics-import.test.tmp1.dll`:
+CHECK-NEXT: SC[.text]  | mod = 2, 0001:0032, size = 6, data crc = 0, reloc crc = 0
+CHECK-NEXT:         IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_MEM_READ
+CHECK-NEXT: Obj: `{{.*}}pdb-publics-import.test.tmp1.lib`:
+CHECK-NEXT: debug stream: 10, # files: 0, has ec info: false
+CHECK-NEXT: pdb file ni: 0 ``, src file ni: 0 ``
+CHECK-NEXT: Mod 0003 | `* Linker *`:
+CHECK-NEXT: SC[???]  | mod = 65535, 65535:0000, size = -1, data crc = 0, reloc crc = 0
+CHECK-NEXT:         none
+CHECK-NEXT: Obj: ``:
+CHECK-NEXT: debug stream: 11, # files: 0, has ec info: false
+CHECK-NEXT: pdb file ni: 1 `{{.*}}pdb-publics-import.test.tmp2.pdb`, src file ni: 0 ``
 
 CHECK:                             Public Symbols
 CHECK-NEXT: ============================================================
@@ -24,6 +65,86 @@ CHECK-NEXT:            flags = none, addr = 0002:0136
 CHECK-NEXT:        0 | S_PUB32 [size = 32] `__imp_exportfn1`
 CHECK-NEXT:            flags = none, addr = 0002:0128
 
+CHECK:                           Symbols
+CHECK-NEXT: ============================================================
+CHECK-NEXT:   Mod 0000 | `{{.*}}pdb-publics-import.test.tmp2.obj`:
+CHECK-NEXT:   Error loading module stream 0.  The specified stream could not be loaded. Module stream not present
+CHECK-NEXT: Mod 0001 | `pdb-publics-import.test.tmp1.dll`:
+CHECK-NEXT: Error loading module stream 1.  The specified stream could not be loaded. Module stream not present
+CHECK-NEXT: Mod 0002 | `Import:pdb-publics-import.test.tmp1.dll`:
+CHECK-NEXT:      4 | S_OBJNAME [size = 44] sig=0, `pdb-publics-import.test.tmp1.dll`
+CHECK-NEXT:     48 | S_COMPILE3 [size = 40]
+CHECK-NEXT:          machine = intel x86-x64, Ver = LLVM Linker, language = link
+CHECK-NEXT:          frontend = 0.0.0.0, backend = 14.10.25019.0
+CHECK-NEXT:          flags = none
+CHECK-NEXT:     88 | S_THUNK32 [size = 36] `exportfn1`
+CHECK-NEXT:          parent = 0, end = 124, next = 0
+CHECK-NEXT:          kind = thunk, size = 6, addr = 0001:0016
+CHECK-NEXT:    124 | S_END [size = 4]
+CHECK-NEXT:    128 | S_OBJNAME [size = 44] sig=0, `pdb-publics-import.test.tmp1.dll`
+CHECK-NEXT:    172 | S_COMPILE3 [size = 40]
+CHECK-NEXT:          machine = intel x86-x64, Ver = LLVM Linker, language = link
+CHECK-NEXT:          frontend = 0.0.0.0, backend = 14.10.25019.0
+CHECK-NEXT:          flags = none
+CHECK-NEXT:    212 | S_THUNK32 [size = 36] `exportfn2`
+CHECK-NEXT:          parent = 0, end = 248, next = 0
+CHECK-NEXT:          kind = thunk, size = 6, addr = 0001:0032
+CHECK-NEXT:    248 | S_END [size = 4]
+CHECK-NEXT: Mod 0003 | `* Linker *`:
+CHECK-NEXT:      4 | S_OBJNAME [size = 20] sig=0, `* Linker *`
+CHECK-NEXT:     24 | S_COMPILE3 [size = 40]
+CHECK-NEXT:          machine = intel x86-x64, Ver = LLVM Linker, language = link
+CHECK-NEXT:          frontend = 0.0.0.0, backend = 14.10.25019.0
+CHECK-NEXT:          flags = none
+CHECK-NEXT:     64 | S_ENVBLOCK [size = {{[0-9]+}}]
+CHECK:  {{[0-9]+}} | S_SECTION [size = 28] `.text`
+CHECK-NEXT:          length = 38, alignment = 12, rva = 4096, section # = 1
+CHECK-NEXT:          characteristics =
+CHECK-NEXT:            code
+CHECK-NEXT:            execute permissions
+CHECK-NEXT:            read permissions
+CHECK-NEXT: {{[0-9]+}} | S_COFFGROUP [size = 24] `.text`
+CHECK-NEXT:          length = 8, addr = 0001:0000
+CHECK-NEXT:          characteristics =
+CHECK-NEXT:            code
+CHECK-NEXT:            execute permissions
+CHECK-NEXT:            read permissions
+CHECK-NEXT: {{[0-9]+}} | S_SECTION [size = 28] `.rdata`
+CHECK-NEXT:          length = 209, alignment = 12, rva = 8192, section # = 2
+CHECK-NEXT:          characteristics =
+CHECK-NEXT:            initialized data
+CHECK-NEXT:            read permissions
+CHECK-NEXT: {{[0-9]+}} | S_COFFGROUP [size = 28] `.idata$2`
+CHECK-NEXT:          length = 40, addr = 0002:0061
+CHECK-NEXT:          characteristics =
+CHECK-NEXT:            initialized data
+CHECK-NEXT:            read permissions
+CHECK-NEXT:            write permissions
+CHECK-NEXT: {{[0-9]+}} | S_COFFGROUP [size = 28] `.idata$4`
+CHECK-NEXT:          length = 24, addr = 0002:0104
+CHECK-NEXT:          characteristics =
+CHECK-NEXT:            initialized data
+CHECK-NEXT:            read permissions
+CHECK-NEXT:            write permissions
+CHECK-NEXT: {{[0-9]+}} | S_COFFGROUP [size = 28] `.idata$5`
+CHECK-NEXT:          length = 24, addr = 0002:0128
+CHECK-NEXT:          characteristics =
+CHECK-NEXT:            initialized data
+CHECK-NEXT:            read permissions
+CHECK-NEXT:            write permissions
+CHECK-NEXT: {{[0-9]+}} | S_COFFGROUP [size = 28] `.idata$6`
+CHECK-NEXT:          length = 24, addr = 0002:0152
+CHECK-NEXT:          characteristics =
+CHECK-NEXT:            initialized data
+CHECK-NEXT:            read permissions
+CHECK-NEXT:            write permissions
+CHECK-NEXT: {{[0-9]+}} | S_COFFGROUP [size = 28] `.idata$7`
+CHECK-NEXT:          length = 33, addr = 0002:0176
+CHECK-NEXT:          characteristics =
+CHECK-NEXT:            initialized data
+CHECK-NEXT:            read permissions
+CHECK-NEXT:            write permissions
+
 CHECK:                         Section Contributions
 CHECK-NEXT: ============================================================
     main
@@ -31,13 +152,35 @@ CHECK-NEXT:   SC[.text]   | mod = 0, 0001:0000, size = 8, data crc = 0, reloc cr
 CHECK-NEXT:                 IMAGE_SCN_CNT_CODE | IMAGE_SCN_ALIGN_4BYTES | IMAGE_SCN_MEM_EXECUTE |
 CHECK-NEXT:                 IMAGE_SCN_MEM_READ
     exportfn1 thunk
-CHECK-NEXT:   SC[.text]   | mod = 1, 0001:0016, size = 6, data crc = 0, reloc crc = 0
+CHECK-NEXT:   SC[.text]   | mod = 3, 0001:0016, size = 6, data crc = 0, reloc crc = 0
 CHECK-NEXT:                 IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_MEM_READ
     exportfn2 thunk
-CHECK-NEXT:   SC[.text]   | mod = 1, 0001:0032, size = 6, data crc = 0, reloc crc = 0
+CHECK-NEXT:   SC[.text]   | mod = 3, 0001:0032, size = 6, data crc = 0, reloc crc = 0
 CHECK-NEXT:                 IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_MEM_READ
     .rdata debug directory data chunks
-CHECK-NEXT:   SC[.rdata]  | mod = 1, 0002:0000, size = 28, data crc = 0, reloc crc = 0
+CHECK-NEXT:   SC[.rdata]  | mod = 3, 0002:0000, size = 28, data crc = 0, reloc crc = 0
 CHECK-NEXT:                 IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ
-CHECK-NEXT:   SC[.rdata]  | mod = 1, 0002:0028, size = 33, data crc = 0, reloc crc = 0
+CHECK-NEXT:   SC[.rdata]  | mod = 3, 0002:0028, size = 33, data crc = 0, reloc crc = 0
+CHECK-NEXT:                 IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ
+CHECK-NEXT:   SC[.rdata]  | mod = 3, 0002:0061, size = 20, data crc = 0, reloc crc = 0
+CHECK-NEXT:                 IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ
+CHECK-NEXT:   SC[.rdata]  | mod = 3, 0002:0081, size = 20, data crc = 0, reloc crc = 0
+CHECK-NEXT:                 IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ
+CHECK-NEXT:   SC[.rdata]  | mod = 3, 0002:0104, size = 8, data crc = 0, reloc crc = 0
+CHECK-NEXT:                 IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ
+CHECK-NEXT:   SC[.rdata]  | mod = 3, 0002:0112, size = 8, data crc = 0, reloc crc = 0
+CHECK-NEXT:                 IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ
+CHECK-NEXT:   SC[.rdata]  | mod = 3, 0002:0120, size = 8, data crc = 0, reloc crc = 0
+CHECK-NEXT:                 IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ
+CHECK-NEXT:   SC[.rdata]  | mod = 3, 0002:0128, size = 8, data crc = 0, reloc crc = 0
+CHECK-NEXT:                 IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ
+CHECK-NEXT:   SC[.rdata]  | mod = 3, 0002:0136, size = 8, data crc = 0, reloc crc = 0
+CHECK-NEXT:                 IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ
+CHECK-NEXT:   SC[.rdata]  | mod = 3, 0002:0144, size = 8, data crc = 0, reloc crc = 0
+CHECK-NEXT:                 IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ
+CHECK-NEXT:   SC[.rdata]  | mod = 3, 0002:0152, size = 12, data crc = 0, reloc crc = 0
+CHECK-NEXT:                 IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ
+CHECK-NEXT:   SC[.rdata]  | mod = 3, 0002:0164, size = 12, data crc = 0, reloc crc = 0
+CHECK-NEXT:                 IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ
+CHECK-NEXT:   SC[.rdata]  | mod = 3, 0002:0176, size = 33, data crc = 0, reloc crc = 0
 CHECK-NEXT:                 IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ
diff --git a/deps/lld/test/COFF/pdb-safeseh.yaml b/deps/lld/test/COFF/pdb-safeseh.yaml
index 27948e38d3d3ad12aac0df381366b0c2068734b3..cc7ddb19a49c640483dd4eda3877d4b36e617daf 100644
--- a/deps/lld/test/COFF/pdb-safeseh.yaml
+++ b/deps/lld/test/COFF/pdb-safeseh.yaml
@@ -1,5 +1,5 @@
 # RUN: yaml2obj %s -o %t.obj
-# RUN: lld-link -debug -entry:main -out:%t.exe -pdb:%t.pdb %t.obj
+# RUN: lld-link -safeseh:no -debug -entry:main -out:%t.exe -pdb:%t.pdb %t.obj
 # RUN: llvm-pdbutil dump -globals %t.pdb | FileCheck %s
 
 # There is an S_GDATA32 symbol record with .secrel32 and .secidx relocations in
diff --git a/deps/lld/test/COFF/pdb-tpi-hash-size.test b/deps/lld/test/COFF/pdb-tpi-hash-size.test
new file mode 100644
index 0000000000000000000000000000000000000000..3635a5caf360bea9477c48a52859a5d4bfc45f3a
--- /dev/null
+++ b/deps/lld/test/COFF/pdb-tpi-hash-size.test
@@ -0,0 +1,10 @@
+# RUN: yaml2obj < %p/Inputs/pdb1.yaml > %t1.obj
+# RUN: yaml2obj < %p/Inputs/pdb2.yaml > %t2.obj
+# RUN: rm -f %t.dll %t.pdb
+# RUN: lld-link /debug /pdb:%t.pdb /dll /out:%t.dll \
+# RUN:   /entry:main /nodefaultlib %t1.obj %t2.obj
+
+# RUN: llvm-pdbutil dump -types -type-extras %t.pdb | FileCheck %s
+
+CHECK:      Hash Key Size: 4
+CHECK-NEXT: Num Hash Buckets: 262143
diff --git a/deps/lld/test/COFF/pdb-type-server-invalid-signature.yaml b/deps/lld/test/COFF/pdb-type-server-invalid-signature.yaml
index 247e00096235c6769b4c4131e1c9998b00e8f796..612bd74eeaa8496e74d773e5baac349b34ccfc92 100644
--- a/deps/lld/test/COFF/pdb-type-server-invalid-signature.yaml
+++ b/deps/lld/test/COFF/pdb-type-server-invalid-signature.yaml
@@ -1,22 +1,30 @@
 
+# Test linking an OBJ with a reference to an out-of-date PDB type server
 # RUN: cd %S/Inputs
 # RUN: yaml2obj %s -o %t.obj
 # RUN: lld-link %t.obj -out:%t.exe -debug -pdb:%t.pdb -nodefaultlib -entry:main 2>&1 | FileCheck %s
 # RUN: cd %S
 
-# CHECK: warning: Cannot use debug info for {{.*}}.obj
+# CHECK: warning: Cannot use debug info for '{{.*}}.obj'
 # CHECK-NEXT: The signature does not match; the file(s) might be out of date
 
-# Also test a valid match
-
+# Also test linking an OBJ with a reference to *valid* PDB type server
 # RUN: cd %S/Inputs
 # RUN: yaml2obj %S/Inputs/pdb-type-server-valid-signature.yaml -o %t2.obj
 # RUN: lld-link %t2.obj -out:%t2.exe -debug -pdb:%t2.pdb -nodefaultlib -entry:main 2>&1 | FileCheck %s -check-prefix=VALID-SIGNATURE -allow-empty
 # RUN: cd %S
 
-# VALID-SIGNATURE-NOT: warning: Cannot use debug info for {{.*}}.obj
+# VALID-SIGNATURE-NOT: warning: Cannot use debug info for '{{.*}}.obj'
 # VALID-SIGNATURE-NOT: The signature does not match; the file(s) might be out of date
 
+# Test an invalid path reference to a PDB type server; as a fallback LLD should try to load the PDB in the same path as the OBJ
+# RUN: yaml2obj %S/Inputs/pdb-type-server-invalid-path.yaml -o %t3.obj
+# RUN: cp %S/Inputs/pdb-diff-cl.pdb %T
+# RUN: lld-link %t3.obj -out:%t3.exe -debug -pdb:%t3.pdb -nodefaultlib -entry:main 2>&1 | FileCheck %s -check-prefix=INVALID-PATH -allow-empty
+
+# INVALID-PATH-NOT: warning: Cannot use debug info for '{{.*}}3.obj' [LNK4099]
+# INVALID-PATH-NOT: failed to load reference 'c:\some_invalid_path_AABB98765\pdb-diff-cl.pdb': {{[Nn]}}o such file or directory
+
 --- !COFF
 header:
   Machine:         IMAGE_FILE_MACHINE_AMD64
diff --git a/deps/lld/test/COFF/pdb-type-server-simple.test b/deps/lld/test/COFF/pdb-type-server-simple.test
index f69a34a98855428e4bdfbf1f27089cf38d27908d..6243f5b20555aeaff2a80f1c9577f9bd2afce529 100644
--- a/deps/lld/test/COFF/pdb-type-server-simple.test
+++ b/deps/lld/test/COFF/pdb-type-server-simple.test
@@ -20,7 +20,7 @@ RUN: rm -rf %t && mkdir -p %t && cd %t
 RUN: yaml2obj %S/Inputs/pdb-type-server-simple-a.yaml -o a.obj
 RUN: yaml2obj %S/Inputs/pdb-type-server-simple-b.yaml -o b.obj
 RUN: llvm-pdbutil yaml2pdb %S/Inputs/pdb-type-server-simple-ts.yaml -pdb ts.pdb
-RUN: lld-link a.obj b.obj -entry:main -debug -out:t.exe -pdb:t.pdb -nodefaultlib
+RUN: lld-link a.obj b.obj -entry:main -debug -out:t.exe -pdb:t.pdb -nodefaultlib /summary | FileCheck %s -check-prefix SUMMARY
 RUN: llvm-pdbutil dump -symbols -types -ids -globals %t/t.pdb | FileCheck %s
 
 
@@ -95,3 +95,14 @@ CHECK:            type = [[FOO_PTR]] (Foo*), register = RSP, offset = 8
 CHECK:      196 | S_END [size = 4]
 CHECK:      200 | S_BUILDINFO [size = 8] BuildId = `[[B_BUILD]]`
 CHECK-LABEL:   Mod 0002 | `* Linker *`:
+
+SUMMARY:                                     Summary
+SUMMARY-NEXT: --------------------------------------------------------------------------------
+SUMMARY-NEXT:               2 Input OBJ files (expanded from all cmd-line inputs)
+SUMMARY-NEXT:               1 PDB type server dependencies
+SUMMARY-NEXT:               0 Precomp OBJ dependencies
+SUMMARY-NEXT:              25 Merged TPI records
+SUMMARY-NEXT:               3 Output PDB strings
+SUMMARY-NEXT:               4 Global symbol records
+SUMMARY-NEXT:              14 Module symbol records
+SUMMARY-NEXT:               2 Public symbol records
\ No newline at end of file
diff --git a/deps/lld/test/COFF/pdb-unknown-subsection.s b/deps/lld/test/COFF/pdb-unknown-subsection.s
new file mode 100644
index 0000000000000000000000000000000000000000..10ffa46ded3f634df45ebfdae20cc776f2641eb2
--- /dev/null
+++ b/deps/lld/test/COFF/pdb-unknown-subsection.s
@@ -0,0 +1,60 @@
+# Check that unknown symbol subsections are ignored with a warning, and a PDB
+# is produced anyway.
+
+# REQUIRES: x86
+# RUN: llvm-mc -triple=i386-pc-win32 -filetype=obj -o %t.obj %s
+# RUN: lld-link -safeseh:no -subsystem:console -debug -nodefaultlib -entry:foo -out:%t.exe -pdb:%t.pdb %t.obj 2>&1 | FileCheck %s --check-prefix=WARNING
+# RUN: llvm-pdbutil dump -symbols %t.pdb | FileCheck %s
+
+# WARNING-NOT: ignoring unknown
+# WARNING: ignoring unknown debug$S subsection kind 0xFF
+# WARNING-NOT: ignoring unknown
+
+# CHECK:                           Symbols
+# CHECK:        4 | S_COMPILE3 [size = 52]
+# CHECK:            machine = intel x86-x64, Ver = clang version SENTINEL, language = c
+
+.text
+_foo:
+ret
+
+.global _foo
+
+.section .debug$S,"dr"
+	.p2align	2
+	.long	4                       # Debug section magic
+	.long	0xF1 # Symbol subsection
+	.long	.Ltmp6-.Ltmp5           # Subsection size
+.Ltmp5:
+	.short	.Ltmp8-.Ltmp7           # Record length
+.Ltmp7:
+	.short	4412                    # Record kind: S_COMPILE3
+	.long	0                       # Flags and language
+	.short	208                     # CPUType
+	.short	9                       # Frontend version
+	.short	0
+	.short	0
+	.short	0
+	.short	9000                    # Backend version
+	.short	0
+	.short	0
+	.short	0
+	.asciz	"clang version SENTINEL" # Null-terminated compiler version string
+	.p2align	2
+.Ltmp8:
+.Ltmp6:
+	.long	0xFF # Unknown subsection kind
+	.long	4           # Subsection size
+	.long  0
+	.long	0x800000F1 # Unknown subsection kind
+	.long	4           # Subsection size
+	.long  0
+	.long	0x800000F2 # Unknown subsection kind
+	.long	4           # Subsection size
+	.long  0
+	.long	0x800000F3 # Unknown subsection kind
+	.long	4           # Subsection size
+	.long  0
+	.long	0x800000F4 # Unknown subsection kind
+	.long	4           # Subsection size
+	.long  0
diff --git a/deps/lld/test/COFF/pdb.test b/deps/lld/test/COFF/pdb.test
index 5788b516ad841c11550ce9259648bebc2e8871b5..dba96508a1c074a8440e9644f511edfa1d345bf2 100644
--- a/deps/lld/test/COFF/pdb.test
+++ b/deps/lld/test/COFF/pdb.test
@@ -134,7 +134,7 @@ RAW-NEXT:              Obj: `{{.*}}pdb.test.tmp2.obj`:
 RAW-NEXT:              debug stream: 12, # files: 1, has ec info: false
 RAW-NEXT:              pdb file ni: 0 ``, src file ni: 0 ``
 RAW-NEXT:   Mod 0002 | `* Linker *`:
-RAW-NEXT:              SC[???]  | mod = 2, 0000:0000, size = 0, data crc = 0, reloc crc = 0
+RAW-NEXT:              SC[???]  | mod = 65535, 65535:0000, size = -1, data crc = 0, reloc crc = 0
 RAW-NEXT:                         none
 RAW-NEXT:              Obj: ``:
 RAW-NEXT:              debug stream: 13, # files: 0, has ec info: false
@@ -142,40 +142,40 @@ RAW-NEXT:              pdb file ni: 1 `{{.*pdb.test.tmp.pdb}}`, src file ni: 0 `
 RAW:                          Types (TPI Stream)
 RAW-NEXT: ============================================================
 RAW-NEXT:   Showing 5 records
-RAW-NEXT:   0x1000 | LF_ARGLIST [size = 8, hash = 0xEC0]
-RAW-NEXT:   0x1001 | LF_PROCEDURE [size = 16, hash = 0x7BC]
+RAW-NEXT:   0x1000 | LF_ARGLIST [size = 8, hash = 0x32484]
+RAW-NEXT:   0x1001 | LF_PROCEDURE [size = 16, hash = 0x27EE9]
 RAW-NEXT:            return type = 0x0074 (int), # args = 0, param list = 0x1000
 RAW-NEXT:            calling conv = cdecl, options = None
-RAW-NEXT:   0x1002 | LF_POINTER [size = 12, hash = 0x884]
+RAW-NEXT:   0x1002 | LF_POINTER [size = 12, hash = 0x39732]
 RAW-NEXT:            referent = 0x1001, mode = pointer, opts = None, kind = ptr64
-RAW-NEXT:   0x1003 | LF_ARGLIST [size = 12, hash = 0x936]
+RAW-NEXT:   0x1003 | LF_ARGLIST [size = 12, hash = 0x1FC10]
 RAW-NEXT:            <no type>: ``
-RAW-NEXT:   0x1004 | LF_PROCEDURE [size = 16, hash = 0x852]
+RAW-NEXT:   0x1004 | LF_PROCEDURE [size = 16, hash = 0x1BD3]
 RAW-NEXT:            return type = 0x0074 (int), # args = 0, param list = 0x1003
 RAW-NEXT:            calling conv = cdecl, options = None
 RAW:                          Types (IPI Stream)
 RAW-NEXT: ============================================================
 RAW-NEXT:   Showing 12 records
-RAW-NEXT:   0x1000 | LF_FUNC_ID [size = 20, hash = 0x330]
+RAW-NEXT:   0x1000 | LF_FUNC_ID [size = 20, hash = 0x38E5A]
 RAW-NEXT:            name = main, type = 0x1004, parent scope = <no type>
-RAW-NEXT:   0x1001 | LF_FUNC_ID [size = 16, hash = 0x120]
+RAW-NEXT:   0x1001 | LF_FUNC_ID [size = 16, hash = 0xD08E]
 RAW-NEXT:            name = foo, type = 0x1001, parent scope = <no type>
-RAW-NEXT:   0x1002 | LF_STRING_ID [size = 16, hash = 0x757] ID: <no type>, String: D:\b
-RAW-NEXT:   0x1003 | LF_STRING_ID [size = 36, hash = 0xC3A] ID: <no type>, String: C:\vs14\VC\BIN\amd64\cl.exe
-RAW-NEXT:   0x1004 | LF_STRING_ID [size = 260, hash = 0x433] ID: <no type>, String: -Z7 -c -MT -IC:\vs14\VC\INCLUDE -IC:\vs14\VC\ATLMFC\INCLUDE -I"C:\Program Files (x86)\Windows Kits\10\include\10.0.10150.0\ucrt" -I"C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\include\um" -I"C:\Program Files (x86)\Windows Kits\8.1\include\shared"
-RAW-NEXT:   0x1005 | LF_SUBSTR_LIST [size = 12, hash = 0x759]
+RAW-NEXT:   0x1002 | LF_STRING_ID [size = 16, hash = 0x3EBD9] ID: <no type>, String: D:\b
+RAW-NEXT:   0x1003 | LF_STRING_ID [size = 36, hash = 0xD327] ID: <no type>, String: C:\vs14\VC\BIN\amd64\cl.exe
+RAW-NEXT:   0x1004 | LF_STRING_ID [size = 260, hash = 0x2FA6A]  ID: <no type>, String: -Z7 -c -MT -IC:\vs14\VC\INCLUDE -IC:\vs14\VC\ATLMFC\INCLUDE -I"C:\Program Files (x86)\Windows Kits\10\include\10.0.10150.0\ucrt" -I"C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\include\um" -I"C:\Program Files (x86)\Windows Kits\8.1\include\shared"
+RAW-NEXT:   0x1005 | LF_SUBSTR_LIST [size = 12, hash = 0x6053]
 RAW-NEXT:            0x1004: `-Z7 -c -MT -IC:\vs14\VC\INCLUDE -IC:\vs14\VC\ATLMFC\INCLUDE -I"C:\Program Files (x86)\Windows Kits\10\include\10.0.10150.0\ucrt" -I"C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\include\um" -I"C:\Program Files (x86)\Windows Kits\8.1\include\shared"`
-RAW-NEXT:   0x1006 | LF_STRING_ID [size = 132, hash = 0xF57] ID: 0x1005, String:  -I"C:\Program Files (x86)\Windows Kits\8.1\include\um" -I"C:\Program Files (x86)\Windows Kits\8.1\include\winrt" -TC -X
-RAW-NEXT:   0x1007 | LF_STRING_ID [size = 24, hash = 0x2D1] ID: <no type>, String: ret42-main.c
-RAW-NEXT:   0x1008 | LF_STRING_ID [size = 24, hash = 0xB8B] ID: <no type>, String: D:\b\vc140.pdb
-RAW-NEXT:   0x1009 | LF_BUILDINFO [size = 28, hash = 0xA8C]
+RAW-NEXT:   0x1006 | LF_STRING_ID [size = 132, hash = 0xCAC7] ID: 0x1005, String:  -I"C:\Program Files (x86)\Windows Kits\8.1\include\um" -I"C:\Program Files (x86)\Windows Kits\8.1\include\winrt" -TC -X
+RAW-NEXT:   0x1007 | LF_STRING_ID [size = 24, hash = 0x21783] ID: <no type>, String: ret42-main.c
+RAW-NEXT:   0x1008 | LF_STRING_ID [size = 24, hash = 0x1DB87] ID: <no type>, String: D:\b\vc140.pdb
+RAW-NEXT:   0x1009 | LF_BUILDINFO [size = 28, hash = 0x5E91]
 RAW-NEXT:            0x1002: `D:\b`
 RAW-NEXT:            0x1003: `C:\vs14\VC\BIN\amd64\cl.exe`
 RAW-NEXT:            0x1007: `ret42-main.c`
 RAW-NEXT:            0x1008: `D:\b\vc140.pdb`
 RAW-NEXT:            0x1006: ` -I"C:\Program Files (x86)\Windows Kits\8.1\include\um" -I"C:\Program Files (x86)\Windows Kits\8.1\include\winrt" -TC -X`
-RAW-NEXT:   0x100A | LF_STRING_ID [size = 20, hash = 0x39C] ID: <no type>, String: ret42-sub.c
-RAW-NEXT:   0x100B | LF_BUILDINFO [size = 28, hash = 0xAD7]
+RAW-NEXT:   0x100A | LF_STRING_ID [size = 20, hash = 0x7C68] ID: <no type>, String: ret42-sub.c
+RAW-NEXT:   0x100B | LF_BUILDINFO [size = 28, hash = 0x254D2]
 RAW-NEXT:            0x1002: `D:\b`
 RAW-NEXT:            0x1003: `C:\vs14\VC\BIN\amd64\cl.exe`
 RAW-NEXT:            0x100A: `ret42-sub.c`
diff --git a/deps/lld/test/COFF/pdbaltpath.test b/deps/lld/test/COFF/pdbaltpath.test
index 952e208867ef455ad3c3bd9feff8c955a687d509..661ad964f89c84fc18a0f4af61a3f9cad5578851 100644
--- a/deps/lld/test/COFF/pdbaltpath.test
+++ b/deps/lld/test/COFF/pdbaltpath.test
@@ -1,39 +1,39 @@
 # RUN: yaml2obj %p/Inputs/empty.yaml > %t.obj
 
 # RUN: lld-link /entry:main %t.obj /out:%t.exe /debug /pdbaltpath:hello.pdb
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck --check-prefix HELLO %s
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck --check-prefix HELLO %s
 # HELLO:       PDBFileName: hello.pdb
 
 # RUN: lld-link /entry:main %t.obj /out:%t.exe /debug /pdbaltpath:%_Pdb%
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck --check-prefix PDBVAR %s
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck --check-prefix PDBVAR %s
 # PDBVAR:       PDBFileName: pdbaltpath.test.tmp.pdb
 
 # RUN: lld-link /entry:main %t.obj /out:%t.exe /debug /pdbaltpath:foo%_ExT%.pdb
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck --check-prefix EXTVAR %s
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck --check-prefix EXTVAR %s
 # EXTVAR:       PDBFileName: fooexe.pdb
 
 # RUN: lld-link /entry:main %t.obj /out:%t.exe /debug /pdbaltpath:%_PDB
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck --check-prefix NOCLOSE %s
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck --check-prefix NOCLOSE %s
 # NOCLOSE:       PDBFileName: %_PDB
 
 # RUN: lld-link /entry:main %t.obj /out:%t.exe /debug /pdbaltpath:foo%_PDB
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck --check-prefix NOCLOSE2 %s
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck --check-prefix NOCLOSE2 %s
 # NOCLOSE2:       PDBFileName: foo%_PDB
 
 # RUN: lld-link /entry:main %t.obj /out:%t.exe /debug /pdbaltpath:foo%_PDB%bar%_EXT
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck --check-prefix CLOSEONE %s
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck --check-prefix CLOSEONE %s
 # CLOSEONE:       PDBFileName: foopdbaltpath.test.tmp.pdbbar%_EXT
 
 # RUN: lld-link /entry:main %t.obj /out:%t.exe /debug /pdbaltpath:foo%_PDB%bar%_EXT%
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck --check-prefix CLOSETWO %s
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck --check-prefix CLOSETWO %s
 # CLOSETWO:       PDBFileName: foopdbaltpath.test.tmp.pdbbarexe
 
 # RUN: lld-link /entry:main %t.obj /out:%t.exe /debug /pdbaltpath:foo%_PDB%bar%_EXT%a
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck --check-prefix CLOSETWO2 %s
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck --check-prefix CLOSETWO2 %s
 # CLOSETWO2:       PDBFileName: foopdbaltpath.test.tmp.pdbbarexea
 
 # RUN: lld-link /entry:main %t.obj /out:%t.exe /debug /pdbaltpath:foo%FoO%bar%r%a 2>&1 | FileCheck --check-prefix UNKNOWN-WARN %s
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck --check-prefix ENVVARS %s
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck --check-prefix ENVVARS %s
 # UNKNOWN-WARN: only %_PDB% and %_EXT% supported in /pdbaltpath:, keeping %FoO% as literal
 # UNKNOWN-WARN: only %_PDB% and %_EXT% supported in /pdbaltpath:, keeping %r% as literal
 # ENVVARS:       PDBFileName: foo%FoO%bar%r%a
diff --git a/deps/lld/test/COFF/precomp-link.test b/deps/lld/test/COFF/precomp-link.test
index b60b0b2f1d77367412b14879c2c5740737a52617..e0ab3006867a28225518819a7bc8a3dae49da357 100644
--- a/deps/lld/test/COFF/precomp-link.test
+++ b/deps/lld/test/COFF/precomp-link.test
@@ -1,42 +1,54 @@
-RUN: lld-link %S/Inputs/precomp-a.obj %S/Inputs/precomp-b.obj %S/Inputs/precomp.obj /nodefaultlib /entry:main /debug /pdb:%t.pdb /out:%t.exe /opt:ref /opt:icf
-RUN: llvm-pdbutil dump -types %t.pdb | FileCheck %s
-
-RUN: lld-link %S/Inputs/precomp.obj %S/Inputs/precomp-a.obj %S/Inputs/precomp-b.obj /nodefaultlib /entry:main /debug /pdb:%t.pdb /out:%t.exe /opt:ref /opt:icf
-RUN: llvm-pdbutil dump -types %t.pdb | FileCheck %s
-
-RUN: lld-link %S/Inputs/precomp-a.obj %S/Inputs/precomp-invalid.obj %S/Inputs/precomp.obj /nodefaultlib /entry:main /debug /pdb:%t.pdb /out:%t.exe /opt:ref /opt:icf 2>&1 | FileCheck %s -check-prefix FAILURE
-
-RUN: not lld-link %S/Inputs/precomp-a.obj %S/Inputs/precomp-b.obj /nodefaultlib /entry:main /debug /pdb:%t.pdb /out:%t.exe /opt:ref /opt:icf 2>&1 | FileCheck %s -check-prefix FAILURE-MISSING-PRECOMPOBJ
-
-FAILURE: warning: Cannot use debug info for 'precomp-invalid.obj' [LNK4099]
-FAILURE-NEXT: failed to load reference '{{.*}}precomp.obj': The signature does not match; the file(s) might be out of date.
-
-FAILURE-MISSING-PRECOMPOBJ: warning: Cannot use debug info for 'precomp-a.obj' [LNK4099]
-FAILURE-MISSING-PRECOMPOBJ-NEXT: failed to load reference '{{.*}}precomp.obj': The path to this file must be provided on the command-line
-
-CHECK: Types (TPI Stream)
-CHECK-NOT: LF_PRECOMP
-CHECK-NOT: LF_ENDPRECOMP
-
-// precomp.h
-#pragma once
-int Function(char A);
-
-// precomp.cpp
-#include "precomp.h"
-
-// a.cpp
-#include "precomp.h"
-int main(void) {
-  Function('a');
-  return 0;
-}
-
-// b.cpp
-#include "precomp.h"
-int Function(char a) {
-  return (int)a;
-}
-
-// cl.exe precomp.cpp /Z7 /Ycprecomp.h /c
-// cl.exe a.cpp b.cpp /Z7 /Yuprecomp.h /c
+RUN: lld-link %S/Inputs/precomp-a.obj %S/Inputs/precomp-b.obj %S/Inputs/precomp.obj /nodefaultlib /entry:main /debug /pdb:%t.pdb /out:%t.exe /opt:ref /opt:icf /summary | FileCheck %s -check-prefix SUMMARY
+RUN: llvm-pdbutil dump -types %t.pdb | FileCheck %s
+
+RUN: lld-link %S/Inputs/precomp.obj %S/Inputs/precomp-a.obj %S/Inputs/precomp-b.obj /nodefaultlib /entry:main /debug /pdb:%t.pdb /out:%t.exe /opt:ref /opt:icf
+RUN: llvm-pdbutil dump -types %t.pdb | FileCheck %s
+
+RUN: lld-link %S/Inputs/precomp-a.obj %S/Inputs/precomp-invalid.obj %S/Inputs/precomp.obj /nodefaultlib /entry:main /debug /pdb:%t.pdb /out:%t.exe /opt:ref /opt:icf 2>&1 | FileCheck %s -check-prefix FAILURE
+
+RUN: not lld-link %S/Inputs/precomp-a.obj %S/Inputs/precomp-b.obj /nodefaultlib /entry:main /debug /pdb:%t.pdb /out:%t.exe /opt:ref /opt:icf 2>&1 | FileCheck %s -check-prefix FAILURE-MISSING-PRECOMPOBJ
+
+FAILURE: warning: Cannot use debug info for '{{.*}}precomp-invalid.obj' [LNK4099]
+FAILURE-NEXT: failed to load reference '{{.*}}precomp.obj': The signature does not match; the file(s) might be out of date.
+
+FAILURE-MISSING-PRECOMPOBJ: warning: Cannot use debug info for '{{.*}}precomp-a.obj' [LNK4099]
+FAILURE-MISSING-PRECOMPOBJ-NEXT: failed to load reference '{{.*}}precomp.obj': The path to this file must be provided on the command-line
+
+CHECK: Types (TPI Stream)
+CHECK-NOT: LF_PRECOMP
+CHECK-NOT: LF_ENDPRECOMP
+
+
+SUMMARY:                                     Summary
+SUMMARY-NEXT: --------------------------------------------------------------------------------
+SUMMARY-NEXT:               3 Input OBJ files (expanded from all cmd-line inputs)
+SUMMARY-NEXT:               0 PDB type server dependencies
+SUMMARY-NEXT:               1 Precomp OBJ dependencies
+SUMMARY-NEXT:            1044 Merged TPI records
+SUMMARY-NEXT:               5 Output PDB strings
+SUMMARY-NEXT:             167 Global symbol records
+SUMMARY-NEXT:              20 Module symbol records
+SUMMARY-NEXT:               3 Public symbol records
+
+// precomp.h
+#pragma once
+int Function(char A);
+
+// precomp.cpp
+#include "precomp.h"
+
+// a.cpp
+#include "precomp.h"
+int main(void) {
+  Function('a');
+  return 0;
+}
+
+// b.cpp
+#include "precomp.h"
+int Function(char a) {
+  return (int)a;
+}
+
+// cl.exe precomp.cpp /Z7 /Ycprecomp.h /c
+// cl.exe a.cpp b.cpp /Z7 /Yuprecomp.h /c
diff --git a/deps/lld/test/COFF/reloc-x86.test b/deps/lld/test/COFF/reloc-x86.test
index bd500be164a7122bbc9ebde909daf43c7d196cdf..99547d1cd14527b0f9ebf1d3857f605200623117 100644
--- a/deps/lld/test/COFF/reloc-x86.test
+++ b/deps/lld/test/COFF/reloc-x86.test
@@ -1,6 +1,6 @@
 # REQUIRES: x86
 # RUN: yaml2obj < %s > %t.obj
-# RUN: lld-link /out:%t.exe /entry:main /base:0x400000 %t.obj
+# RUN: lld-link -safeseh:no /out:%t.exe /entry:main /base:0x400000 %t.obj
 # RUN: llvm-objdump -d %t.exe | FileCheck %s
 
 # CHECK: .text:
diff --git a/deps/lld/test/COFF/resource-objs.test b/deps/lld/test/COFF/resource-objs.test
new file mode 100644
index 0000000000000000000000000000000000000000..d28cc14d817960316bcc2773d765c607e0c967af
--- /dev/null
+++ b/deps/lld/test/COFF/resource-objs.test
@@ -0,0 +1,5 @@
+# RUN: lld-link /out:%t.exe /dll /noentry %S/Inputs/id.res.o
+# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+
+CHECK: ResourceTableRVA: 0x1000
+CHECK: ResourceTableSize: 0x80
diff --git a/deps/lld/test/COFF/resource.test b/deps/lld/test/COFF/resource.test
index 4108957f6f684e0684c79dff2e2cdc3ef37cedcc..afe4ea659671cc697422c75b6b93795b297a9253 100644
--- a/deps/lld/test/COFF/resource.test
+++ b/deps/lld/test/COFF/resource.test
@@ -7,7 +7,7 @@
 EXE: {{H.e.l.l.o}}
 
 # Verify the resource tree layout in the final executable.
-# RUN: llvm-readobj -file-headers -coff-resources -section-data %t.exe | \
+# RUN: llvm-readobj --file-headers --coff-resources --section-data %t.exe | \
 # RUN:   FileCheck --check-prefix=RESOURCE_INFO %s
 
 RESOURCE_INFO:      ResourceTableRVA: 0x2000
@@ -17,7 +17,7 @@ RESOURCE_INFO-NEXT:   Total Number of Resources: 1
 RESOURCE_INFO-NEXT:   Base Table Address: 0x600
 RESOURCE_INFO-DAG:    Number of String Entries: 0
 RESOURCE_INFO-NEXT:   Number of ID Entries: 1
-RESOURCE_INFO-NEXT:   Type: kRT_STRING (ID 6) [
+RESOURCE_INFO-NEXT:   Type: STRINGTABLE (ID 6) [
 RESOURCE_INFO-NEXT:     Table Offset: 0x18
 RESOURCE_INFO-NEXT:     Number of String Entries: 0
 RESOURCE_INFO-NEXT:     Number of ID Entries: 1
diff --git a/deps/lld/test/COFF/responsefile.test b/deps/lld/test/COFF/responsefile.test
index 742962423cc5cac48cda7529090ec952eb07c6cb..1480406d3486d8f934812a2e830c6cb2e093511a 100644
--- a/deps/lld/test/COFF/responsefile.test
+++ b/deps/lld/test/COFF/responsefile.test
@@ -2,7 +2,7 @@
 
 # RUN: echo /out:%t.exe /entry:main %t.obj > %t.rsp
 # RUN: lld-link @%t.rsp /heap:0x3000
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 CHECK: SizeOfHeapReserve: 12288
 
 # RUN: not lld-link --rsp-quoting=foobar @%t.rsp 2>&1 | \
@@ -12,14 +12,14 @@ INVRSP: invalid response file quoting: foobar
 # RUN: echo "blah\foo" > %t.rsp
 # RUN: not lld-link @%t.rsp 2>&1 | \
 # RUN:     FileCheck --check-prefix=DEFRSP %s
-DEFRSP: error: could not open blah\foo
+DEFRSP: error: could not open 'blah\foo'
 
 # RUN: echo "blah\foo" > %t.rsp
 # RUN: not lld-link --rsp-quoting=windows @%t.rsp 2>&1 | \
 # RUN:     FileCheck --check-prefix=WINRSP %s
-WINRSP: error: could not open blah\foo
+WINRSP: error: could not open 'blah\foo'
 
 # RUN: echo "blah\foo" > %t.rsp
 # RUN: not lld-link --rsp-quoting=posix @%t.rsp 2>&1 | \
 # RUN:     FileCheck --check-prefix=POSRSP %s
-POSRSP: error: could not open blahfoo
+POSRSP: error: could not open 'blahfoo'
diff --git a/deps/lld/test/COFF/rsds.test b/deps/lld/test/COFF/rsds.test
index b2c1be7478f5d266ca2f5e8fa0b9786158b56d52..51c3e561594b5aa8aa7b803645a53e90ea39da7c 100644
--- a/deps/lld/test/COFF/rsds.test
+++ b/deps/lld/test/COFF/rsds.test
@@ -2,29 +2,29 @@
 
 # RUN: rm -f %t.dll %t.pdb
 # RUN: lld-link /debug /pdbaltpath:test.pdb /dll /out:%t.dll /entry:DllMain %t.obj
-# RUN: llvm-readobj -coff-debug-directory %t.dll > %t.1.txt
+# RUN: llvm-readobj --coff-debug-directory %t.dll > %t.1.txt
 # RUN: lld-link /debug /pdbaltpath:test.pdb /dll /out:%t.dll /entry:DllMain %t.obj
-# RUN: llvm-readobj -coff-debug-directory %t.dll > %t.2.txt
+# RUN: llvm-readobj --coff-debug-directory %t.dll > %t.2.txt
 # RUN: cat %t.1.txt %t.2.txt | FileCheck %s
 
 # RUN: rm -f %t.dll %t.pdb
 # RUN: lld-link /debug /pdb:%t1.pdb /dll /out:%t.dll /entry:DllMain %t.obj
-# RUN: llvm-readobj -coff-debug-directory %t.dll > %t.3.txt
+# RUN: llvm-readobj --coff-debug-directory %t.dll > %t.3.txt
 # RUN: lld-link /debug /pdb:%t2.pdb /dll /out:%t.dll /entry:DllMain %t.obj
-# RUN: llvm-readobj -coff-debug-directory %t.dll > %t.4.txt
+# RUN: llvm-readobj --coff-debug-directory %t.dll > %t.4.txt
 # RUN: cat %t.3.txt %t.4.txt | FileCheck --check-prefix TWOPDBS %s
 
 # RUN: rm -f %t.dll %t.pdb
 # RUN: lld-link /Brepro /dll /out:%t.dll /entry:DllMain %t.obj
-# RUN: llvm-readobj -coff-debug-directory %t.dll | FileCheck --check-prefix REPRO %s
+# RUN: llvm-readobj --coff-debug-directory %t.dll | FileCheck --check-prefix REPRO %s
 
 # RUN: rm -f %t.dll %t.pdb
 # RUN: lld-link /Brepro /debug /dll /out:%t.dll /entry:DllMain %t.obj
-# RUN: llvm-readobj -coff-debug-directory %t.dll | FileCheck --check-prefix REPRODEBUG %s
+# RUN: llvm-readobj --coff-debug-directory %t.dll | FileCheck --check-prefix REPRODEBUG %s
 
 # RUN: rm -f %t.dll %t.pdb
 # RUN: lld-link /lldmingw /debug:dwarf /dll /out:%t.dll /entry:DllMain %t.obj
-# RUN: llvm-readobj -coff-debug-directory %t.dll | FileCheck --check-prefix MINGW %s
+# RUN: llvm-readobj --coff-debug-directory %t.dll | FileCheck --check-prefix MINGW %s
 
 # CHECK: File: [[FILE:.*]].dll
 # CHECK: DebugDirectory [
diff --git a/deps/lld/test/COFF/s_udt.s b/deps/lld/test/COFF/s_udt.s
index 8ad342e4e3d21f8225ad1088dd22fd20c5db0fa1..900948aa8b53b7d2dda40752e7f21d9d86a2d2de 100644
--- a/deps/lld/test/COFF/s_udt.s
+++ b/deps/lld/test/COFF/s_udt.s
@@ -27,450 +27,450 @@
 # CHECK-NEXT: ============================================================
 # CHECK:      {{.*}} | S_GPROC32 [size = 44] `main`
 # CHECK-NEXT:          parent = 0, end = 252, addr = 0001:0000, code size = 52
-# CHECK-NEXT:          type = `0x1002 (int (int, char**))`, debug start = 0, debug end = 0, flags = none
+# CHECK-NEXT:          type = `0x1002 (int (int, char**))`, debug start = 0, debug end = 0, flags = none
 # CHECK-NOT:  {{.*}} | S_END
 # CHECK:      {{.*}} | S_UDT [size = 28] `main::LocalTypedef`
 # CHECK-NEXT:          original type = 0x1004
-# CHECK:      {{.*}} | S_END [size = 4]
-
-# source code to re-generate:
-# clang-cl /Z7 /GS- /GR- /c foo.cpp
-#
-# struct Struct {
-#   int x;
-# };
-# 
-# using IntTypedef = int;
-# using StructTypedef = Struct;
-# Struct S;
-# StructTypedef SS;
-# IntTypedef I;
-# 
-# int main(int argc, char **argv) {
-#   using LocalTypedef = Struct*;
-#   LocalTypedef SPtr;
-#   return I + S.x + SS.x + SPtr->x;
+# CHECK:      {{.*}} | S_END [size = 4]
+
+# source code to re-generate:
+# clang-cl /Z7 /GS- /GR- /c foo.cpp
+#
+# struct Struct {
+#   int x;
+# };
+#
+# using IntTypedef = int;
+# using StructTypedef = Struct;
+# Struct S;
+# StructTypedef SS;
+# IntTypedef I;
+#
+# int main(int argc, char **argv) {
+#   using LocalTypedef = Struct*;
+#   LocalTypedef SPtr;
+#   return I + S.x + SS.x + SPtr->x;
 # }
 
-	.text
-	.def	 @feat.00;
-	.scl	3;
-	.type	0;
-	.endef
-	.globl	@feat.00
-.set @feat.00, 0
-	.intel_syntax noprefix
-	.def	 main;
-	.scl	2;
-	.type	32;
-	.endef
-	.globl	main                    # -- Begin function main
-	.p2align	4, 0x90
-main:                                   # @main
-.Lfunc_begin0:
-	.cv_func_id 0
-	.cv_file	1 "D:\\src\\llvmbuild\\cl\\Debug\\x64\\foo.cpp" "2B62298EE3EEF94E1D81FDFE18BD46A6" 1
-	.cv_loc	0 1 12 0                # foo.cpp:12:0
-.seh_proc main
-# %bb.0:                                # %entry
-	sub	rsp, 32
-	.seh_stackalloc 32
-	.seh_endprologue
-	mov	dword ptr [rsp + 28], 0
-	mov	qword ptr [rsp + 16], rdx
-	mov	dword ptr [rsp + 12], ecx
-.Ltmp0:
-	.cv_loc	0 1 15 0                # foo.cpp:15:0
-	mov	ecx, dword ptr [rip + "?I@@3HA"]
-	add	ecx, dword ptr [rip + "?S@@3UStruct@@A"]
-	add	ecx, dword ptr [rip + "?SS@@3UStruct@@A"]
-	mov	rdx, qword ptr [rsp]
-	add	ecx, dword ptr [rdx]
-	mov	eax, ecx
-	add	rsp, 32
-	ret
-.Ltmp1:
-.Lfunc_end0:
-	.seh_handlerdata
-	.text
-	.seh_endproc
-                                        # -- End function
-	.bss
-	.globl	"?S@@3UStruct@@A"       # @"?S@@3UStruct@@A"
-	.p2align	2
-"?S@@3UStruct@@A":
-	.zero	4
-
-	.globl	"?SS@@3UStruct@@A"      # @"?SS@@3UStruct@@A"
-	.p2align	2
-"?SS@@3UStruct@@A":
-	.zero	4
-
-	.globl	"?I@@3HA"               # @"?I@@3HA"
-	.p2align	2
-"?I@@3HA":
-	.long	0                       # 0x0
-
-	.section	.drectve,"yn"
-	.ascii	" /DEFAULTLIB:libcmt.lib"
-	.ascii	" /DEFAULTLIB:oldnames.lib"
-	.section	.debug$S,"dr"
-	.p2align	2
-	.long	4                       # Debug section magic
-	.long	241
-	.long	.Ltmp3-.Ltmp2           # Subsection size
-.Ltmp2:
-	.short	.Ltmp5-.Ltmp4           # Record length
-.Ltmp4:
-	.short	4412                    # Record kind: S_COMPILE3
-	.long	1                       # Flags and language
-	.short	208                     # CPUType
-	.short	8                       # Frontend version
-	.short	0
-	.short	0
-	.short	0
-	.short	8000                    # Backend version
-	.short	0
-	.short	0
-	.short	0
-	.asciz	"clang version 8.0.0 "  # Null-terminated compiler version string
-.Ltmp5:
-.Ltmp3:
-	.p2align	2
-	.long	241                     # Symbol subsection for main
-	.long	.Ltmp7-.Ltmp6           # Subsection size
-.Ltmp6:
-	.short	.Ltmp9-.Ltmp8           # Record length
-.Ltmp8:
-	.short	4423                    # Record kind: S_GPROC32_ID
-	.long	0                       # PtrParent
-	.long	0                       # PtrEnd
-	.long	0                       # PtrNext
-	.long	.Lfunc_end0-main        # Code size
-	.long	0                       # Offset after prologue
-	.long	0                       # Offset before epilogue
-	.long	4099                    # Function type index
-	.secrel32	main            # Function section relative address
-	.secidx	main                    # Function section index
-	.byte	0                       # Flags
-	.asciz	"main"                  # Function name
-.Ltmp9:
-	.short	.Ltmp11-.Ltmp10         # Record length
-.Ltmp10:
-	.short	4114                    # Record kind: S_FRAMEPROC
-	.long	32                      # FrameSize
-	.long	0                       # Padding
-	.long	0                       # Offset of padding
-	.long	0                       # Bytes of callee saved registers
-	.long	0                       # Exception handler offset
-	.short	0                       # Exception handler section
-	.long	81920                   # Flags (defines frame register)
-.Ltmp11:
-	.short	.Ltmp13-.Ltmp12         # Record length
-.Ltmp12:
-	.short	4414                    # Record kind: S_LOCAL
-	.long	116                     # TypeIndex
-	.short	1                       # Flags
-	.asciz	"argc"
-.Ltmp13:
-	.cv_def_range	 .Ltmp0 .Ltmp1, "B\021\f\000\000\000"
-	.short	.Ltmp15-.Ltmp14         # Record length
-.Ltmp14:
-	.short	4414                    # Record kind: S_LOCAL
-	.long	4096                    # TypeIndex
-	.short	1                       # Flags
-	.asciz	"argv"
-.Ltmp15:
-	.cv_def_range	 .Ltmp0 .Ltmp1, "B\021\020\000\000\000"
-	.short	.Ltmp17-.Ltmp16         # Record length
-.Ltmp16:
-	.short	4414                    # Record kind: S_LOCAL
-	.long	4101                    # TypeIndex
-	.short	0                       # Flags
-	.asciz	"SPtr"
-.Ltmp17:
-	.cv_def_range	 .Ltmp0 .Ltmp1, "B\021\000\000\000\000"
-	.short	.Ltmp19-.Ltmp18         # Record length
-.Ltmp18:
-	.short	4360                    # Record kind: S_UDT
-	.long	4101                    # Type
-	.asciz	"main::LocalTypedef"
-.Ltmp19:
-	.short	2                       # Record length
-	.short	4431                    # Record kind: S_PROC_ID_END
-.Ltmp7:
-	.p2align	2
-	.cv_linetable	0, main, .Lfunc_end0
-	.long	241                     # Symbol subsection for globals
-	.long	.Ltmp21-.Ltmp20         # Subsection size
-.Ltmp20:
-	.short	.Ltmp23-.Ltmp22         # Record length
-.Ltmp22:
-	.short	4365                    # Record kind: S_GDATA32
-	.long	4103                    # Type
-	.secrel32	"?S@@3UStruct@@A" # DataOffset
-	.secidx	"?S@@3UStruct@@A"       # Segment
-	.asciz	"S"                     # Name
-.Ltmp23:
-	.short	.Ltmp25-.Ltmp24         # Record length
-.Ltmp24:
-	.short	4365                    # Record kind: S_GDATA32
-	.long	4100                    # Type
-	.secrel32	"?SS@@3UStruct@@A" # DataOffset
-	.secidx	"?SS@@3UStruct@@A"      # Segment
-	.asciz	"SS"                    # Name
-.Ltmp25:
-	.short	.Ltmp27-.Ltmp26         # Record length
-.Ltmp26:
-	.short	4365                    # Record kind: S_GDATA32
-	.long	116                     # Type
-	.secrel32	"?I@@3HA"       # DataOffset
-	.secidx	"?I@@3HA"               # Segment
-	.asciz	"I"                     # Name
-.Ltmp27:
-.Ltmp21:
-	.p2align	2
-	.long	241
-	.long	.Ltmp29-.Ltmp28         # Subsection size
-.Ltmp28:
-	.short	.Ltmp31-.Ltmp30         # Record length
-.Ltmp30:
-	.short	4360                    # Record kind: S_UDT
-	.long	4103                    # Type
-	.asciz	"Struct"
-.Ltmp31:
-	.short	.Ltmp33-.Ltmp32         # Record length
-.Ltmp32:
-	.short	4360                    # Record kind: S_UDT
-	.long	4100                    # Type
-	.asciz	"StructTypedef"
-.Ltmp33:
-	.short	.Ltmp35-.Ltmp34         # Record length
-.Ltmp34:
-	.short	4360                    # Record kind: S_UDT
-	.long	116                     # Type
-	.asciz	"IntTypedef"
-.Ltmp35:
-.Ltmp29:
-	.p2align	2
-	.cv_filechecksums               # File index to string table offset subsection
-	.cv_stringtable                 # String table
-	.long	241
-	.long	.Ltmp37-.Ltmp36         # Subsection size
-.Ltmp36:
-	.short	6                       # Record length
-	.short	4428                    # Record kind: S_BUILDINFO
-	.long	4108                    # LF_BUILDINFO index
-.Ltmp37:
-	.p2align	2
-	.section	.debug$T,"dr"
-	.p2align	2
-	.long	4                       # Debug section magic
-	# Pointer (0x1000) {
-	#   TypeLeafKind: LF_POINTER (0x1002)
-	#   PointeeType: char* (0x670)
-	#   PtrType: Near64 (0xC)
-	#   PtrMode: Pointer (0x0)
-	#   IsFlat: 0
-	#   IsConst: 0
-	#   IsVolatile: 0
-	#   IsUnaligned: 0
-	#   IsRestrict: 0
-	#   IsThisPtr&: 0
-	#   IsThisPtr&&: 0
-	#   SizeOf: 8
-	# }
-	.byte	0x0a, 0x00, 0x02, 0x10
-	.byte	0x70, 0x06, 0x00, 0x00
-	.byte	0x0c, 0x00, 0x01, 0x00
-	# ArgList (0x1001) {
-	#   TypeLeafKind: LF_ARGLIST (0x1201)
-	#   NumArgs: 2
-	#   Arguments [
-	#     ArgType: int (0x74)
-	#     ArgType: char** (0x1000)
-	#   ]
-	# }
-	.byte	0x0e, 0x00, 0x01, 0x12
-	.byte	0x02, 0x00, 0x00, 0x00
-	.byte	0x74, 0x00, 0x00, 0x00
-	.byte	0x00, 0x10, 0x00, 0x00
-	# Procedure (0x1002) {
-	#   TypeLeafKind: LF_PROCEDURE (0x1008)
-	#   ReturnType: int (0x74)
-	#   CallingConvention: NearC (0x0)
-	#   FunctionOptions [ (0x0)
-	#   ]
-	#   NumParameters: 2
-	#   ArgListType: (int, char**) (0x1001)
-	# }
-	.byte	0x0e, 0x00, 0x08, 0x10
-	.byte	0x74, 0x00, 0x00, 0x00
-	.byte	0x00, 0x00, 0x02, 0x00
-	.byte	0x01, 0x10, 0x00, 0x00
-	# FuncId (0x1003) {
-	#   TypeLeafKind: LF_FUNC_ID (0x1601)
-	#   ParentScope: 0x0
-	#   FunctionType: int (int, char**) (0x1002)
-	#   Name: main
-	# }
-	.byte	0x12, 0x00, 0x01, 0x16
-	.byte	0x00, 0x00, 0x00, 0x00
-	.byte	0x02, 0x10, 0x00, 0x00
-	.byte	0x6d, 0x61, 0x69, 0x6e
-	.byte	0x00, 0xf3, 0xf2, 0xf1
-	# Struct (0x1004) {
-	#   TypeLeafKind: LF_STRUCTURE (0x1505)
-	#   MemberCount: 0
-	#   Properties [ (0x280)
-	#     ForwardReference (0x80)
-	#     HasUniqueName (0x200)
-	#   ]
-	#   FieldList: 0x0
-	#   DerivedFrom: 0x0
-	#   VShape: 0x0
-	#   SizeOf: 0
-	#   Name: Struct
-	#   LinkageName: .?AUStruct@@
-	# }
-	.byte	0x2a, 0x00, 0x05, 0x15
-	.byte	0x00, 0x00, 0x80, 0x02
-	.byte	0x00, 0x00, 0x00, 0x00
-	.byte	0x00, 0x00, 0x00, 0x00
-	.byte	0x00, 0x00, 0x00, 0x00
-	.byte	0x00, 0x00, 0x53, 0x74
-	.byte	0x72, 0x75, 0x63, 0x74
-	.byte	0x00, 0x2e, 0x3f, 0x41
-	.byte	0x55, 0x53, 0x74, 0x72
-	.byte	0x75, 0x63, 0x74, 0x40
-	.byte	0x40, 0x00, 0xf2, 0xf1
-	# Pointer (0x1005) {
-	#   TypeLeafKind: LF_POINTER (0x1002)
-	#   PointeeType: Struct (0x1004)
-	#   PtrType: Near64 (0xC)
-	#   PtrMode: Pointer (0x0)
-	#   IsFlat: 0
-	#   IsConst: 0
-	#   IsVolatile: 0
-	#   IsUnaligned: 0
-	#   IsRestrict: 0
-	#   IsThisPtr&: 0
-	#   IsThisPtr&&: 0
-	#   SizeOf: 8
-	# }
-	.byte	0x0a, 0x00, 0x02, 0x10
-	.byte	0x04, 0x10, 0x00, 0x00
-	.byte	0x0c, 0x00, 0x01, 0x00
-	# FieldList (0x1006) {
-	#   TypeLeafKind: LF_FIELDLIST (0x1203)
-	#   DataMember {
-	#     TypeLeafKind: LF_MEMBER (0x150D)
-	#     AccessSpecifier: Public (0x3)
-	#     Type: int (0x74)
-	#     FieldOffset: 0x0
-	#     Name: x
-	#   }
-	# }
-	.byte	0x0e, 0x00, 0x03, 0x12
-	.byte	0x0d, 0x15, 0x03, 0x00
-	.byte	0x74, 0x00, 0x00, 0x00
-	.byte	0x00, 0x00, 0x78, 0x00
-	# Struct (0x1007) {
-	#   TypeLeafKind: LF_STRUCTURE (0x1505)
-	#   MemberCount: 1
-	#   Properties [ (0x200)
-	#     HasUniqueName (0x200)
-	#   ]
-	#   FieldList: <field list> (0x1006)
-	#   DerivedFrom: 0x0
-	#   VShape: 0x0
-	#   SizeOf: 4
-	#   Name: Struct
-	#   LinkageName: .?AUStruct@@
-	# }
-	.byte	0x2a, 0x00, 0x05, 0x15
-	.byte	0x01, 0x00, 0x00, 0x02
-	.byte	0x06, 0x10, 0x00, 0x00
-	.byte	0x00, 0x00, 0x00, 0x00
-	.byte	0x00, 0x00, 0x00, 0x00
-	.byte	0x04, 0x00, 0x53, 0x74
-	.byte	0x72, 0x75, 0x63, 0x74
-	.byte	0x00, 0x2e, 0x3f, 0x41
-	.byte	0x55, 0x53, 0x74, 0x72
-	.byte	0x75, 0x63, 0x74, 0x40
-	.byte	0x40, 0x00, 0xf2, 0xf1
-	# StringId (0x1008) {
-	#   TypeLeafKind: LF_STRING_ID (0x1605)
-	#   Id: 0x0
-	#   StringData: D:\src\llvmbuild\cl\Debug\x64\foo.cpp
-	# }
-	.byte	0x2e, 0x00, 0x05, 0x16
-	.byte	0x00, 0x00, 0x00, 0x00
-	.byte	0x44, 0x3a, 0x5c, 0x73
-	.byte	0x72, 0x63, 0x5c, 0x6c
-	.byte	0x6c, 0x76, 0x6d, 0x62
-	.byte	0x75, 0x69, 0x6c, 0x64
-	.byte	0x5c, 0x63, 0x6c, 0x5c
-	.byte	0x44, 0x65, 0x62, 0x75
-	.byte	0x67, 0x5c, 0x78, 0x36
-	.byte	0x34, 0x5c, 0x66, 0x6f
-	.byte	0x6f, 0x2e, 0x63, 0x70
-	.byte	0x70, 0x00, 0xf2, 0xf1
-	# UdtSourceLine (0x1009) {
-	#   TypeLeafKind: LF_UDT_SRC_LINE (0x1606)
-	#   UDT: Struct (0x1007)
-	#   SourceFile: D:\src\llvmbuild\cl\Debug\x64\foo.cpp (0x1008)
-	#   LineNumber: 1
-	# }
-	.byte	0x0e, 0x00, 0x06, 0x16
-	.byte	0x07, 0x10, 0x00, 0x00
-	.byte	0x08, 0x10, 0x00, 0x00
-	.byte	0x01, 0x00, 0x00, 0x00
-	# StringId (0x100A) {
-	#   TypeLeafKind: LF_STRING_ID (0x1605)
-	#   Id: 0x0
-	#   StringData: D:\\src\\llvmbuild\\cl\\Debug\\x64
-	# }
-	.byte	0x2a, 0x00, 0x05, 0x16
-	.byte	0x00, 0x00, 0x00, 0x00
-	.byte	0x44, 0x3a, 0x5c, 0x5c
-	.byte	0x73, 0x72, 0x63, 0x5c
-	.byte	0x5c, 0x6c, 0x6c, 0x76
-	.byte	0x6d, 0x62, 0x75, 0x69
-	.byte	0x6c, 0x64, 0x5c, 0x5c
-	.byte	0x63, 0x6c, 0x5c, 0x5c
-	.byte	0x44, 0x65, 0x62, 0x75
-	.byte	0x67, 0x5c, 0x5c, 0x78
-	.byte	0x36, 0x34, 0x00, 0xf1
-	# StringId (0x100B) {
-	#   TypeLeafKind: LF_STRING_ID (0x1605)
-	#   Id: 0x0
-	#   StringData: foo.cpp
-	# }
-	.byte	0x0e, 0x00, 0x05, 0x16
-	.byte	0x00, 0x00, 0x00, 0x00
-	.byte	0x66, 0x6f, 0x6f, 0x2e
-	.byte	0x63, 0x70, 0x70, 0x00
-	# BuildInfo (0x100C) {
-	#   TypeLeafKind: LF_BUILDINFO (0x1603)
-	#   NumArgs: 5
-	#   Arguments [
-	#     ArgType: D:\\src\\llvmbuild\\cl\\Debug\\x64 (0x100A)
-	#     ArgType: 0x0
-	#     ArgType: foo.cpp (0x100B)
-	#     ArgType: 0x0
-	#     ArgType: 0x0
-	#   ]
-	# }
-	.byte	0x1a, 0x00, 0x03, 0x16
-	.byte	0x05, 0x00, 0x0a, 0x10
-	.byte	0x00, 0x00, 0x00, 0x00
-	.byte	0x00, 0x00, 0x0b, 0x10
-	.byte	0x00, 0x00, 0x00, 0x00
-	.byte	0x00, 0x00, 0x00, 0x00
-	.byte	0x00, 0x00, 0xf2, 0xf1
-
-	.addrsig
-	.addrsig_sym "?S@@3UStruct@@A"
-	.addrsig_sym "?SS@@3UStruct@@A"
-	.addrsig_sym "?I@@3HA"
+	.text
+	.def	 @feat.00;
+	.scl	3;
+	.type	0;
+	.endef
+	.globl	@feat.00
+.set @feat.00, 0
+	.intel_syntax noprefix
+	.def	 main;
+	.scl	2;
+	.type	32;
+	.endef
+	.globl	main                    # -- Begin function main
+	.p2align	4, 0x90
+main:                                   # @main
+.Lfunc_begin0:
+	.cv_func_id 0
+	.cv_file	1 "D:\\src\\llvmbuild\\cl\\Debug\\x64\\foo.cpp" "2B62298EE3EEF94E1D81FDFE18BD46A6" 1
+	.cv_loc	0 1 12 0                # foo.cpp:12:0
+.seh_proc main
+# %bb.0:                                # %entry
+	sub	rsp, 32
+	.seh_stackalloc 32
+	.seh_endprologue
+	mov	dword ptr [rsp + 28], 0
+	mov	qword ptr [rsp + 16], rdx
+	mov	dword ptr [rsp + 12], ecx
+.Ltmp0:
+	.cv_loc	0 1 15 0                # foo.cpp:15:0
+	mov	ecx, dword ptr [rip + "?I@@3HA"]
+	add	ecx, dword ptr [rip + "?S@@3UStruct@@A"]
+	add	ecx, dword ptr [rip + "?SS@@3UStruct@@A"]
+	mov	rdx, qword ptr [rsp]
+	add	ecx, dword ptr [rdx]
+	mov	eax, ecx
+	add	rsp, 32
+	ret
+.Ltmp1:
+.Lfunc_end0:
+	.seh_handlerdata
+	.text
+	.seh_endproc
+                                        # -- End function
+	.bss
+	.globl	"?S@@3UStruct@@A"       # @"?S@@3UStruct@@A"
+	.p2align	2
+"?S@@3UStruct@@A":
+	.zero	4
+
+	.globl	"?SS@@3UStruct@@A"      # @"?SS@@3UStruct@@A"
+	.p2align	2
+"?SS@@3UStruct@@A":
+	.zero	4
+
+	.globl	"?I@@3HA"               # @"?I@@3HA"
+	.p2align	2
+"?I@@3HA":
+	.long	0                       # 0x0
+
+	.section	.drectve,"yn"
+	.ascii	" /DEFAULTLIB:libcmt.lib"
+	.ascii	" /DEFAULTLIB:oldnames.lib"
+	.section	.debug$S,"dr"
+	.p2align	2
+	.long	4                       # Debug section magic
+	.long	241
+	.long	.Ltmp3-.Ltmp2           # Subsection size
+.Ltmp2:
+	.short	.Ltmp5-.Ltmp4           # Record length
+.Ltmp4:
+	.short	4412                    # Record kind: S_COMPILE3
+	.long	1                       # Flags and language
+	.short	208                     # CPUType
+	.short	8                       # Frontend version
+	.short	0
+	.short	0
+	.short	0
+	.short	8000                    # Backend version
+	.short	0
+	.short	0
+	.short	0
+	.asciz	"clang version 8.0.0 "  # Null-terminated compiler version string
+.Ltmp5:
+.Ltmp3:
+	.p2align	2
+	.long	241                     # Symbol subsection for main
+	.long	.Ltmp7-.Ltmp6           # Subsection size
+.Ltmp6:
+	.short	.Ltmp9-.Ltmp8           # Record length
+.Ltmp8:
+	.short	4423                    # Record kind: S_GPROC32_ID
+	.long	0                       # PtrParent
+	.long	0                       # PtrEnd
+	.long	0                       # PtrNext
+	.long	.Lfunc_end0-main        # Code size
+	.long	0                       # Offset after prologue
+	.long	0                       # Offset before epilogue
+	.long	4099                    # Function type index
+	.secrel32	main            # Function section relative address
+	.secidx	main                    # Function section index
+	.byte	0                       # Flags
+	.asciz	"main"                  # Function name
+.Ltmp9:
+	.short	.Ltmp11-.Ltmp10         # Record length
+.Ltmp10:
+	.short	4114                    # Record kind: S_FRAMEPROC
+	.long	32                      # FrameSize
+	.long	0                       # Padding
+	.long	0                       # Offset of padding
+	.long	0                       # Bytes of callee saved registers
+	.long	0                       # Exception handler offset
+	.short	0                       # Exception handler section
+	.long	81920                   # Flags (defines frame register)
+.Ltmp11:
+	.short	.Ltmp13-.Ltmp12         # Record length
+.Ltmp12:
+	.short	4414                    # Record kind: S_LOCAL
+	.long	116                     # TypeIndex
+	.short	1                       # Flags
+	.asciz	"argc"
+.Ltmp13:
+	.cv_def_range	 .Ltmp0 .Ltmp1, "B\021\f\000\000\000"
+	.short	.Ltmp15-.Ltmp14         # Record length
+.Ltmp14:
+	.short	4414                    # Record kind: S_LOCAL
+	.long	4096                    # TypeIndex
+	.short	1                       # Flags
+	.asciz	"argv"
+.Ltmp15:
+	.cv_def_range	 .Ltmp0 .Ltmp1, "B\021\020\000\000\000"
+	.short	.Ltmp17-.Ltmp16         # Record length
+.Ltmp16:
+	.short	4414                    # Record kind: S_LOCAL
+	.long	4101                    # TypeIndex
+	.short	0                       # Flags
+	.asciz	"SPtr"
+.Ltmp17:
+	.cv_def_range	 .Ltmp0 .Ltmp1, "B\021\000\000\000\000"
+	.short	.Ltmp19-.Ltmp18         # Record length
+.Ltmp18:
+	.short	4360                    # Record kind: S_UDT
+	.long	4101                    # Type
+	.asciz	"main::LocalTypedef"
+.Ltmp19:
+	.short	2                       # Record length
+	.short	4431                    # Record kind: S_PROC_ID_END
+.Ltmp7:
+	.p2align	2
+	.cv_linetable	0, main, .Lfunc_end0
+	.long	241                     # Symbol subsection for globals
+	.long	.Ltmp21-.Ltmp20         # Subsection size
+.Ltmp20:
+	.short	.Ltmp23-.Ltmp22         # Record length
+.Ltmp22:
+	.short	4365                    # Record kind: S_GDATA32
+	.long	4103                    # Type
+	.secrel32	"?S@@3UStruct@@A" # DataOffset
+	.secidx	"?S@@3UStruct@@A"       # Segment
+	.asciz	"S"                     # Name
+.Ltmp23:
+	.short	.Ltmp25-.Ltmp24         # Record length
+.Ltmp24:
+	.short	4365                    # Record kind: S_GDATA32
+	.long	4100                    # Type
+	.secrel32	"?SS@@3UStruct@@A" # DataOffset
+	.secidx	"?SS@@3UStruct@@A"      # Segment
+	.asciz	"SS"                    # Name
+.Ltmp25:
+	.short	.Ltmp27-.Ltmp26         # Record length
+.Ltmp26:
+	.short	4365                    # Record kind: S_GDATA32
+	.long	116                     # Type
+	.secrel32	"?I@@3HA"       # DataOffset
+	.secidx	"?I@@3HA"               # Segment
+	.asciz	"I"                     # Name
+.Ltmp27:
+.Ltmp21:
+	.p2align	2
+	.long	241
+	.long	.Ltmp29-.Ltmp28         # Subsection size
+.Ltmp28:
+	.short	.Ltmp31-.Ltmp30         # Record length
+.Ltmp30:
+	.short	4360                    # Record kind: S_UDT
+	.long	4103                    # Type
+	.asciz	"Struct"
+.Ltmp31:
+	.short	.Ltmp33-.Ltmp32         # Record length
+.Ltmp32:
+	.short	4360                    # Record kind: S_UDT
+	.long	4100                    # Type
+	.asciz	"StructTypedef"
+.Ltmp33:
+	.short	.Ltmp35-.Ltmp34         # Record length
+.Ltmp34:
+	.short	4360                    # Record kind: S_UDT
+	.long	116                     # Type
+	.asciz	"IntTypedef"
+.Ltmp35:
+.Ltmp29:
+	.p2align	2
+	.cv_filechecksums               # File index to string table offset subsection
+	.cv_stringtable                 # String table
+	.long	241
+	.long	.Ltmp37-.Ltmp36         # Subsection size
+.Ltmp36:
+	.short	6                       # Record length
+	.short	4428                    # Record kind: S_BUILDINFO
+	.long	4108                    # LF_BUILDINFO index
+.Ltmp37:
+	.p2align	2
+	.section	.debug$T,"dr"
+	.p2align	2
+	.long	4                       # Debug section magic
+	# Pointer (0x1000) {
+	#   TypeLeafKind: LF_POINTER (0x1002)
+	#   PointeeType: char* (0x670)
+	#   PtrType: Near64 (0xC)
+	#   PtrMode: Pointer (0x0)
+	#   IsFlat: 0
+	#   IsConst: 0
+	#   IsVolatile: 0
+	#   IsUnaligned: 0
+	#   IsRestrict: 0
+	#   IsThisPtr&: 0
+	#   IsThisPtr&&: 0
+	#   SizeOf: 8
+	# }
+	.byte	0x0a, 0x00, 0x02, 0x10
+	.byte	0x70, 0x06, 0x00, 0x00
+	.byte	0x0c, 0x00, 0x01, 0x00
+	# ArgList (0x1001) {
+	#   TypeLeafKind: LF_ARGLIST (0x1201)
+	#   NumArgs: 2
+	#   Arguments [
+	#     ArgType: int (0x74)
+	#     ArgType: char** (0x1000)
+	#   ]
+	# }
+	.byte	0x0e, 0x00, 0x01, 0x12
+	.byte	0x02, 0x00, 0x00, 0x00
+	.byte	0x74, 0x00, 0x00, 0x00
+	.byte	0x00, 0x10, 0x00, 0x00
+	# Procedure (0x1002) {
+	#   TypeLeafKind: LF_PROCEDURE (0x1008)
+	#   ReturnType: int (0x74)
+	#   CallingConvention: NearC (0x0)
+	#   FunctionOptions [ (0x0)
+	#   ]
+	#   NumParameters: 2
+	#   ArgListType: (int, char**) (0x1001)
+	# }
+	.byte	0x0e, 0x00, 0x08, 0x10
+	.byte	0x74, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x02, 0x00
+	.byte	0x01, 0x10, 0x00, 0x00
+	# FuncId (0x1003) {
+	#   TypeLeafKind: LF_FUNC_ID (0x1601)
+	#   ParentScope: 0x0
+	#   FunctionType: int (int, char**) (0x1002)
+	#   Name: main
+	# }
+	.byte	0x12, 0x00, 0x01, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x02, 0x10, 0x00, 0x00
+	.byte	0x6d, 0x61, 0x69, 0x6e
+	.byte	0x00, 0xf3, 0xf2, 0xf1
+	# Struct (0x1004) {
+	#   TypeLeafKind: LF_STRUCTURE (0x1505)
+	#   MemberCount: 0
+	#   Properties [ (0x280)
+	#     ForwardReference (0x80)
+	#     HasUniqueName (0x200)
+	#   ]
+	#   FieldList: 0x0
+	#   DerivedFrom: 0x0
+	#   VShape: 0x0
+	#   SizeOf: 0
+	#   Name: Struct
+	#   LinkageName: .?AUStruct@@
+	# }
+	.byte	0x2a, 0x00, 0x05, 0x15
+	.byte	0x00, 0x00, 0x80, 0x02
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x53, 0x74
+	.byte	0x72, 0x75, 0x63, 0x74
+	.byte	0x00, 0x2e, 0x3f, 0x41
+	.byte	0x55, 0x53, 0x74, 0x72
+	.byte	0x75, 0x63, 0x74, 0x40
+	.byte	0x40, 0x00, 0xf2, 0xf1
+	# Pointer (0x1005) {
+	#   TypeLeafKind: LF_POINTER (0x1002)
+	#   PointeeType: Struct (0x1004)
+	#   PtrType: Near64 (0xC)
+	#   PtrMode: Pointer (0x0)
+	#   IsFlat: 0
+	#   IsConst: 0
+	#   IsVolatile: 0
+	#   IsUnaligned: 0
+	#   IsRestrict: 0
+	#   IsThisPtr&: 0
+	#   IsThisPtr&&: 0
+	#   SizeOf: 8
+	# }
+	.byte	0x0a, 0x00, 0x02, 0x10
+	.byte	0x04, 0x10, 0x00, 0x00
+	.byte	0x0c, 0x00, 0x01, 0x00
+	# FieldList (0x1006) {
+	#   TypeLeafKind: LF_FIELDLIST (0x1203)
+	#   DataMember {
+	#     TypeLeafKind: LF_MEMBER (0x150D)
+	#     AccessSpecifier: Public (0x3)
+	#     Type: int (0x74)
+	#     FieldOffset: 0x0
+	#     Name: x
+	#   }
+	# }
+	.byte	0x0e, 0x00, 0x03, 0x12
+	.byte	0x0d, 0x15, 0x03, 0x00
+	.byte	0x74, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x78, 0x00
+	# Struct (0x1007) {
+	#   TypeLeafKind: LF_STRUCTURE (0x1505)
+	#   MemberCount: 1
+	#   Properties [ (0x200)
+	#     HasUniqueName (0x200)
+	#   ]
+	#   FieldList: <field list> (0x1006)
+	#   DerivedFrom: 0x0
+	#   VShape: 0x0
+	#   SizeOf: 4
+	#   Name: Struct
+	#   LinkageName: .?AUStruct@@
+	# }
+	.byte	0x2a, 0x00, 0x05, 0x15
+	.byte	0x01, 0x00, 0x00, 0x02
+	.byte	0x06, 0x10, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x04, 0x00, 0x53, 0x74
+	.byte	0x72, 0x75, 0x63, 0x74
+	.byte	0x00, 0x2e, 0x3f, 0x41
+	.byte	0x55, 0x53, 0x74, 0x72
+	.byte	0x75, 0x63, 0x74, 0x40
+	.byte	0x40, 0x00, 0xf2, 0xf1
+	# StringId (0x1008) {
+	#   TypeLeafKind: LF_STRING_ID (0x1605)
+	#   Id: 0x0
+	#   StringData: D:\src\llvmbuild\cl\Debug\x64\foo.cpp
+	# }
+	.byte	0x2e, 0x00, 0x05, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x44, 0x3a, 0x5c, 0x73
+	.byte	0x72, 0x63, 0x5c, 0x6c
+	.byte	0x6c, 0x76, 0x6d, 0x62
+	.byte	0x75, 0x69, 0x6c, 0x64
+	.byte	0x5c, 0x63, 0x6c, 0x5c
+	.byte	0x44, 0x65, 0x62, 0x75
+	.byte	0x67, 0x5c, 0x78, 0x36
+	.byte	0x34, 0x5c, 0x66, 0x6f
+	.byte	0x6f, 0x2e, 0x63, 0x70
+	.byte	0x70, 0x00, 0xf2, 0xf1
+	# UdtSourceLine (0x1009) {
+	#   TypeLeafKind: LF_UDT_SRC_LINE (0x1606)
+	#   UDT: Struct (0x1007)
+	#   SourceFile: D:\src\llvmbuild\cl\Debug\x64\foo.cpp (0x1008)
+	#   LineNumber: 1
+	# }
+	.byte	0x0e, 0x00, 0x06, 0x16
+	.byte	0x07, 0x10, 0x00, 0x00
+	.byte	0x08, 0x10, 0x00, 0x00
+	.byte	0x01, 0x00, 0x00, 0x00
+	# StringId (0x100A) {
+	#   TypeLeafKind: LF_STRING_ID (0x1605)
+	#   Id: 0x0
+	#   StringData: D:\\src\\llvmbuild\\cl\\Debug\\x64
+	# }
+	.byte	0x2a, 0x00, 0x05, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x44, 0x3a, 0x5c, 0x5c
+	.byte	0x73, 0x72, 0x63, 0x5c
+	.byte	0x5c, 0x6c, 0x6c, 0x76
+	.byte	0x6d, 0x62, 0x75, 0x69
+	.byte	0x6c, 0x64, 0x5c, 0x5c
+	.byte	0x63, 0x6c, 0x5c, 0x5c
+	.byte	0x44, 0x65, 0x62, 0x75
+	.byte	0x67, 0x5c, 0x5c, 0x78
+	.byte	0x36, 0x34, 0x00, 0xf1
+	# StringId (0x100B) {
+	#   TypeLeafKind: LF_STRING_ID (0x1605)
+	#   Id: 0x0
+	#   StringData: foo.cpp
+	# }
+	.byte	0x0e, 0x00, 0x05, 0x16
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x66, 0x6f, 0x6f, 0x2e
+	.byte	0x63, 0x70, 0x70, 0x00
+	# BuildInfo (0x100C) {
+	#   TypeLeafKind: LF_BUILDINFO (0x1603)
+	#   NumArgs: 5
+	#   Arguments [
+	#     ArgType: D:\\src\\llvmbuild\\cl\\Debug\\x64 (0x100A)
+	#     ArgType: 0x0
+	#     ArgType: foo.cpp (0x100B)
+	#     ArgType: 0x0
+	#     ArgType: 0x0
+	#   ]
+	# }
+	.byte	0x1a, 0x00, 0x03, 0x16
+	.byte	0x05, 0x00, 0x0a, 0x10
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x0b, 0x10
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0xf2, 0xf1
+
+	.addrsig
+	.addrsig_sym "?S@@3UStruct@@A"
+	.addrsig_sym "?SS@@3UStruct@@A"
+	.addrsig_sym "?I@@3HA"
diff --git a/deps/lld/test/COFF/safeseh-md.s b/deps/lld/test/COFF/safeseh-md.s
index b762457a9bb9f0e428de07ddd662d7cdcb6ca22b..d065af872b8f908241edd1c976843c77019133af 100644
--- a/deps/lld/test/COFF/safeseh-md.s
+++ b/deps/lld/test/COFF/safeseh-md.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple i686-windows-msvc %s -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj %S/Inputs/except_handler3.lib -safeseh -out:%t.exe -opt:noref -entry:main
-# RUN: llvm-readobj -coff-load-config %t.exe | FileCheck %s
+# RUN: llvm-readobj --coff-load-config %t.exe | FileCheck %s
 
 # CHECK: SEHTable [
 # CHECK-NEXT: 0x
diff --git a/deps/lld/test/COFF/safeseh-no.s b/deps/lld/test/COFF/safeseh-no.s
new file mode 100644
index 0000000000000000000000000000000000000000..70d6f56e888036f1905e52519882632386ebe248
--- /dev/null
+++ b/deps/lld/test/COFF/safeseh-no.s
@@ -0,0 +1,57 @@
+# REQUIRES: x86
+# RUN: llvm-mc -triple i686-windows-msvc %s -filetype=obj -o %t.obj
+# RUN: not lld-link %t.obj -safeseh -out:%t.exe -entry:main 2>&1 | FileCheck %s --check-prefix=ERROR
+# safe seh should be on by default.
+# RUN: not lld-link %t.obj -out:%t.exe -entry:main 2>&1 | FileCheck %s --check-prefix=ERROR
+# RUN: lld-link %t.obj -safeseh:no -out:%t.exe -entry:main
+# RUN: llvm-readobj --file-headers --coff-load-config %t.exe | FileCheck %s
+# -lldmingw should also turn off safeseh by default.
+# RUN: lld-link %t.obj -lldmingw -out:%t.exe -entry:main
+# RUN: llvm-readobj --file-headers --coff-load-config %t.exe | FileCheck %s
+
+# ERROR: /safeseh: {{.*}}safeseh-no.s.tmp.obj is not compatible with SEH
+
+# CHECK: Characteristics [
+# CHECK-NOT:   IMAGE_DLL_CHARACTERISTICS_NO_SEH
+# CHECK: ]
+# CHECK: LoadConfig [
+# CHECK:   Size: 0x48
+# CHECK:   SEHandlerTable: 0x0
+# CHECK:   SEHandlerCount: 0
+# CHECK: ]
+# CHECK-NOT: SEHTable
+
+
+# Explicitly mark the object as not having safeseh. LLD should error unless
+# -safeseh:no is passed.
+        .def     @feat.00; .scl    3; .type   0; .endef
+        .globl  @feat.00
+@feat.00 = 0
+
+        .def     _main;
+        .scl    2;
+        .type   32;
+        .endef
+        .section        .text,"xr",one_only,_main
+        .globl  _main
+_main:
+        movl $42, %eax
+        ret
+
+# Add a handler to create an .sxdata section, which -safeseh:no should ignore.
+        .def     _my_handler; .scl    3; .type   32;
+        .endef
+        .section        .text,"xr",one_only,_my_handler
+_my_handler:
+        ret
+.safeseh _my_handler
+
+
+        .section .rdata,"dr"
+.globl __load_config_used
+__load_config_used:
+        .long 72
+        .fill 60, 1, 0
+        .long ___safe_se_handler_table
+        .long ___safe_se_handler_count
+
diff --git a/deps/lld/test/COFF/safeseh-notable.s b/deps/lld/test/COFF/safeseh-notable.s
index 8a9d4296dad69f1852e086f54fb81c48e8871e40..de7c73090cb478ed19814bb8dc51d2cb6ea4a85d 100644
--- a/deps/lld/test/COFF/safeseh-notable.s
+++ b/deps/lld/test/COFF/safeseh-notable.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple i686-windows-msvc %s -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -safeseh -out:%t.exe -entry:main
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 # This object lacks a _load_config_used global, so we set
 # IMAGE_DLL_CHARACTERISTICS_NO_SEH even though there is an exception handler.
diff --git a/deps/lld/test/COFF/safeseh.s b/deps/lld/test/COFF/safeseh.s
index ee6a60d0df217face6298ccf5455b9d7efa5555e..4ea5cfb16115b25cec988aa2670f3f0b60e12338 100644
--- a/deps/lld/test/COFF/safeseh.s
+++ b/deps/lld/test/COFF/safeseh.s
@@ -1,11 +1,11 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple i686-windows-msvc %s -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -safeseh -out:%t.exe -opt:noref -entry:main
-# RUN: llvm-readobj -coff-basereloc -coff-load-config -file-headers %t.exe | FileCheck %s --check-prefix=CHECK-NOGC
+# RUN: llvm-readobj --coff-basereloc --coff-load-config --file-headers %t.exe | FileCheck %s --check-prefix=CHECK-NOGC
 # RUN: lld-link %t.obj -safeseh -out:%t.exe -opt:noref -entry:main -debug:dwarf
-# RUN: llvm-readobj -coff-basereloc -coff-load-config -file-headers %t.exe | FileCheck %s --check-prefix=CHECK-NOGC
+# RUN: llvm-readobj --coff-basereloc --coff-load-config --file-headers %t.exe | FileCheck %s --check-prefix=CHECK-NOGC
 # RUN: lld-link %t.obj -safeseh -out:%t.exe -opt:ref -entry:main
-# RUN: llvm-readobj -coff-basereloc -coff-load-config -file-headers %t.exe | FileCheck %s --check-prefix=CHECK-GC
+# RUN: llvm-readobj --coff-basereloc --coff-load-config --file-headers %t.exe | FileCheck %s --check-prefix=CHECK-GC
 
 # __safe_se_handler_table needs to be relocated against ImageBase.
 # check that the relocation is present.
diff --git a/deps/lld/test/COFF/section.test b/deps/lld/test/COFF/section.test
index 5e1162e8f3580d07b9f9838f7e0c20c95b831485..0d70bf6010190c29f2e8f303bf5d8940eb9b8004 100644
--- a/deps/lld/test/COFF/section.test
+++ b/deps/lld/test/COFF/section.test
@@ -1,19 +1,19 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console /force \
 # RUN:   /section:.foo,r %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck -check-prefix=R %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck -check-prefix=R %s
 
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console /force \
 # RUN:   /section:.foo,w %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck -check-prefix=W %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck -check-prefix=W %s
 
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console /force \
 # RUN:   /section:.foo,e %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck -check-prefix=E %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck -check-prefix=E %s
 
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console /force \
 # RUN:   /section:.foo,s %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck -check-prefix=S %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck -check-prefix=S %s
 
 # R:      Characteristics [
 # R-NEXT:   IMAGE_SCN_CNT_INITIALIZED_DATA
diff --git a/deps/lld/test/COFF/sort-debug.test b/deps/lld/test/COFF/sort-debug.test
index 5e2701b6610dcab7dd835d102325d34290080029..708c65a23fafa998b10e056ba8eaa7705562c44b 100644
--- a/deps/lld/test/COFF/sort-debug.test
+++ b/deps/lld/test/COFF/sort-debug.test
@@ -1,12 +1,12 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /debug /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck %s
 # RUN: lld-link /debug:dwarf /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck %s
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck -check-prefix=NODEBUG %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck -check-prefix=NODEBUG %s
 # RUN: lld-link /debug:symtab /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck -check-prefix=NODEBUG %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck -check-prefix=NODEBUG %s
 
 # CHECK: Name: .text
 # CHECK: Name: .reloc
@@ -45,6 +45,7 @@ sections:
     Characteristics: [ IMAGE_SCN_CNT_UNINITIALIZED_DATA, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
     Alignment:       4
     SectionData:     ''
+    SizeOfRawData:   4
   - Name:            '.debug$S'
     Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
     Alignment:       1
diff --git a/deps/lld/test/COFF/stack.test b/deps/lld/test/COFF/stack.test
index df066b16c20d351f551cc09319493ff0a032c07b..2f2ba0d12a358b9c2623207d05439edaf31e865e 100644
--- a/deps/lld/test/COFF/stack.test
+++ b/deps/lld/test/COFF/stack.test
@@ -1,25 +1,25 @@
 # RUN: yaml2obj < %p/Inputs/ret42.yaml > %t.obj
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=DEFAULT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=DEFAULT %s
 
 DEFAULT: SizeOfStackReserve: 1048576
 DEFAULT: SizeOfStackCommit: 4096
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj /stack:0x3000
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
 # RUN: echo "STACKSIZE 12288" > %t.def
 # RUN: lld-link /out:%t.exe /entry:main /def:%t.def %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
 
 CHECK1: SizeOfStackReserve: 12288
 CHECK1: SizeOfStackCommit: 4096
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj /stack:0x5000,0x3000
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
 # RUN: echo "STACKSIZE 20480,12288" > %t.def
 # RUN: lld-link /out:%t.exe /entry:main /def:%t.def %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
 
 CHECK2: SizeOfStackReserve: 20480
 CHECK2: SizeOfStackCommit: 12288
diff --git a/deps/lld/test/COFF/strtab-size.s b/deps/lld/test/COFF/strtab-size.s
index 6b29049f548c26c51e4b2e46a87b9af8fc2fa59e..574b1a0265ba612c64f39c3b4193ab5d6d45b5bc 100644
--- a/deps/lld/test/COFF/strtab-size.s
+++ b/deps/lld/test/COFF/strtab-size.s
@@ -12,8 +12,8 @@
 # output SymbolCount: 0 (and dumpbin.exe would error out with "invalid file
 # or disk full, cannot seek to 0x1602").
 
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
-# CHECK: SymbolCount: 199
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
+# CHECK: SymbolCount: 197
 
 .global main
 .text
diff --git a/deps/lld/test/COFF/subsystem-drectve.test b/deps/lld/test/COFF/subsystem-drectve.test
index fa567bc7a9af5deab3c3997a849bb3a79d96ab04..68630eb2d82fb404860826a995a3759930a9c926 100644
--- a/deps/lld/test/COFF/subsystem-drectve.test
+++ b/deps/lld/test/COFF/subsystem-drectve.test
@@ -1,6 +1,6 @@
 # RUN: yaml2obj < %s > %t.obj
-# RUN: lld-link /dll /noentry /out:%t.dll %t.obj
-# RUN: llvm-readobj -file-headers %t.dll | FileCheck %s
+# RUN: lld-link -safeseh:no /dll /noentry /out:%t.dll %t.obj
+# RUN: llvm-readobj --file-headers %t.dll | FileCheck %s
 
 # CHECK: MajorOperatingSystemVersion: 42
 # CHECK: MinorOperatingSystemVersion: 43
diff --git a/deps/lld/test/COFF/subsystem-inference-mingw.s b/deps/lld/test/COFF/subsystem-inference-mingw.s
index 3339e6408af1b70e34f4bd4a5b22f36a6913d65f..7b21d9c4553baa61b1c6e6abe36796a6dcde3599 100644
--- a/deps/lld/test/COFF/subsystem-inference-mingw.s
+++ b/deps/lld/test/COFF/subsystem-inference-mingw.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -triple=x86_64-windows-gnu %s -filetype=obj -o %t.o
 
 # RUN: lld-link -lldmingw %t.o -out:%t.exe
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 # CHECK: AddressOfEntryPoint: 0x1001
 # CHECK: Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI (0x3)
diff --git a/deps/lld/test/COFF/subsystem-inference.test b/deps/lld/test/COFF/subsystem-inference.test
index 231fd5491120ca8b5fbbf06e00ff7321e6d8b5d2..a024a61e3df96750538786e2c591561bd79f596e 100644
--- a/deps/lld/test/COFF/subsystem-inference.test
+++ b/deps/lld/test/COFF/subsystem-inference.test
@@ -1,18 +1,22 @@
 # RUN: sed -e s/ENTRYNAME/main/ %s | yaml2obj > %t.obj
 # RUN: lld-link /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=MAIN %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=MAIN %s
+# RUN: lld-link /out:%t.exe %t.obj /subsystem:default,6.0
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=MAIN %s
 
 # RUN: sed s/ENTRYNAME/wmain/ %s | yaml2obj > %t.obj
 # RUN: lld-link /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=WMAIN %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WMAIN %s
 
 # RUN: sed s/ENTRYNAME/WinMain/ %s | yaml2obj > %t.obj
 # RUN: lld-link /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=WINMAIN %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WINMAIN %s
+# RUN: lld-link /out:%t.exe %t.obj /subsystem:default,6.0
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WINMAIN %s
 
 # RUN: sed s/ENTRYNAME/wWinMain/ %s | yaml2obj > %t.obj
 # RUN: lld-link /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=WWINMAIN %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WWINMAIN %s
 
 # MAIN:     Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI
 # WMAIN:    Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI
diff --git a/deps/lld/test/COFF/subsystem-inference2.test b/deps/lld/test/COFF/subsystem-inference2.test
index 0c159a7ded5541feb9f36fad716c5b1530836a69..6866bb4722c05c5df9d45dc05b4692d4b0274bcf 100644
--- a/deps/lld/test/COFF/subsystem-inference2.test
+++ b/deps/lld/test/COFF/subsystem-inference2.test
@@ -1,6 +1,6 @@
 # RUN: yaml2obj %s > %t.obj
 # RUN: lld-link /out:%t.exe %t.obj 2>&1 | FileCheck -check-prefix=WARN %s
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 # WARN: warning: found main and WinMain; defaulting to /subsystem:console
 # CHECK:     Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI
diff --git a/deps/lld/test/COFF/subsystem-inference32.test b/deps/lld/test/COFF/subsystem-inference32.test
index 8e66a85a7920f97b97a3af0d0383b9501e81aaab..d213550786bd95d96a59e107c902a393d92eb1fc 100644
--- a/deps/lld/test/COFF/subsystem-inference32.test
+++ b/deps/lld/test/COFF/subsystem-inference32.test
@@ -1,18 +1,18 @@
 # RUN: sed -e s/ENTRYNAME/_main/ %s | yaml2obj > %t.obj
-# RUN: lld-link /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=MAIN %s
+# RUN: lld-link -safeseh:no /out:%t.exe %t.obj
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=MAIN %s
 
 # RUN: sed s/ENTRYNAME/_wmain/ %s | yaml2obj > %t.obj
-# RUN: lld-link /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=WMAIN %s
+# RUN: lld-link -safeseh:no /out:%t.exe %t.obj
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WMAIN %s
 
 # RUN: sed s/ENTRYNAME/_WinMain@16/ %s | yaml2obj > %t.obj
-# RUN: lld-link /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=WINMAIN %s
+# RUN: lld-link -safeseh:no /out:%t.exe %t.obj
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WINMAIN %s
 
 # RUN: sed s/ENTRYNAME/_wWinMain@16/ %s | yaml2obj > %t.obj
-# RUN: lld-link /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=WWINMAIN %s
+# RUN: lld-link -safeseh:no /out:%t.exe %t.obj
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WWINMAIN %s
 
 # MAIN:     Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI
 # WMAIN:    Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI
diff --git a/deps/lld/test/COFF/subsystem.test b/deps/lld/test/COFF/subsystem.test
index 5e72706dd1cb9d2855aaa11ddd4f031b45d7ecb0..5c38390c71f95dac3792aac4fff9c2019c1ffe4f 100644
--- a/deps/lld/test/COFF/subsystem.test
+++ b/deps/lld/test/COFF/subsystem.test
@@ -1,6 +1,6 @@
 # RUN: lld-link /entry:main /out:%t.exe /subsystem:windows \
 # RUN:   %p/Inputs/ret42.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
 
 CHECK1: MajorOperatingSystemVersion: 6
 CHECK1: MinorOperatingSystemVersion: 0
@@ -10,10 +10,19 @@ CHECK1: Subsystem: IMAGE_SUBSYSTEM_WINDOWS_GUI
 
 # RUN: lld-link /entry:main /out:%t.exe /subsystem:windows,8.9 \
 # RUN:   %p/Inputs/ret42.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
 
 CHECK2: MajorOperatingSystemVersion: 8
 CHECK2: MinorOperatingSystemVersion: 9
 CHECK2: MajorSubsystemVersion: 8
 CHECK2: MinorSubsystemVersion: 9
 CHECK2: Subsystem: IMAGE_SUBSYSTEM_WINDOWS_GUI
+
+# RUN: lld-link /entry:main /out:%t.exe /subsystem:default,8.9 \
+# RUN:   %p/Inputs/ret42.obj
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK3 %s
+
+CHECK3: MajorOperatingSystemVersion: 8
+CHECK3: MinorOperatingSystemVersion: 9
+CHECK3: MajorSubsystemVersion: 8
+CHECK3: MinorSubsystemVersion: 9
diff --git a/deps/lld/test/COFF/symtab-gc.s b/deps/lld/test/COFF/symtab-gc.s
index 5552639908be5800c58cfc4e86db910267229a70..00098c67928a485d30f0b52e717c53e98ef7ef41 100644
--- a/deps/lld/test/COFF/symtab-gc.s
+++ b/deps/lld/test/COFF/symtab-gc.s
@@ -4,7 +4,7 @@
 # RUN: lld-link -dll -entry:f -out:%t.dll -implib:%t.lib %tobject.obj
 # RUN: llvm-mc -filetype=obj -triple=x86_64-windows-msvc -o %tmain.obj %s
 # RUN: lld-link -entry:main -out:%t.exe -opt:ref -debug:dwarf %tmain.obj %t.lib
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck %s
 
 # CHECK-NOT: Symbol: f
 
diff --git a/deps/lld/test/COFF/symtab.test b/deps/lld/test/COFF/symtab.test
index bedcd2f601a2666e7fc5248c6703a06a9ba857cf..c4cef44754754208e16605638e7227ba371dcf71 100644
--- a/deps/lld/test/COFF/symtab.test
+++ b/deps/lld/test/COFF/symtab.test
@@ -1,13 +1,13 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /debug:dwarf /out:%t.exe /entry:main %t.obj %p/Inputs/std64.lib
-# RUN: llvm-readobj -symbols %t.exe | FileCheck %s
+# RUN: llvm-readobj --symbols %t.exe | FileCheck %s
 # RUN: lld-link /debug:dwarf /opt:noref /out:%t.exe /entry:main %t.obj %p/Inputs/std64.lib
-# RUN: llvm-readobj -symbols %t.exe | FileCheck %s
+# RUN: llvm-readobj --symbols %t.exe | FileCheck %s
 # RUN: lld-link /debug:symtab /opt:noref /out:%t.exe /entry:main %t.obj %p/Inputs/std64.lib
-# RUN: llvm-readobj -symbols %t.exe | FileCheck %s
+# RUN: llvm-readobj --symbols %t.exe | FileCheck %s
 
 # RUN: lld-link /debug /out:%t.exe /entry:main %t.obj %p/Inputs/std64.lib
-# RUN: llvm-readobj -symbols %t.exe | FileCheck -check-prefix=NO %s
+# RUN: llvm-readobj --symbols %t.exe | FileCheck -check-prefix=NO %s
 
 # CHECK:      Symbols [
 # CHECK-NEXT:   Symbol {
diff --git a/deps/lld/test/COFF/thinlto-archivecollision.ll b/deps/lld/test/COFF/thinlto-archivecollision.ll
new file mode 100644
index 0000000000000000000000000000000000000000..8b8865d03d3fac7ac43074cf16c89fb00f65f6e1
--- /dev/null
+++ b/deps/lld/test/COFF/thinlto-archivecollision.ll
@@ -0,0 +1,29 @@
+; REQUIRES: x86
+; RUN: rm -fr %t
+; RUN: mkdir %t %t/a %t/b
+; RUN: opt -thinlto-bc -o %t/main.obj %s
+; RUN: opt -thinlto-bc -o %t/a/bar.obj %S/Inputs/lto-dep.ll
+; RUN: opt -thinlto-bc -o %t/b/bar.obj %S/Inputs/bar.ll
+; RUN: llvm-ar crs %t/libbar.lib %t/a/bar.obj %t/b/bar.obj
+; RUN: lld-link -out:%t/main.exe -entry:main -lldsavetemps \
+; RUN:     -subsystem:console %t/main.obj %t/libbar.lib
+; RUN: FileCheck %s < %t/main.exe.resolution.txt
+
+; CHECK: {{/|\\\\thinlto-archivecollision.ll.tmp/main.obj$}}
+; CHECK: {{^-r=.*/|\\\\thinlto-archivecollision.ll.tmp/main.obj,main,px$}}
+; CHECK: {{/|\\\\thinlto-archivecollision.ll.tmp/libbar.libbar.obj[0-9]+$}}
+; CHECK-NEXT: {{^-r=.*/|\\\\thinlto-archivecollision.ll.tmp/libbar.libbar.obj[0-9]+,foo,p$}}
+; CHECK-NEXT: {{/|\\\\thinlto-archivecollision.ll.tmp/libbar.libbar.obj[0-9]+$}}
+; CHECK-NEXT: {{^-r=.*/|\\\\thinlto-archivecollision.ll.tmp/libbar.libbar.obj[0-9]+,bar,p$}}
+
+target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-pc-windows-msvc"
+
+declare void @bar()
+declare void @foo()
+
+define i32 @main() {
+  call void @foo()
+  call void @bar()
+  ret i32 0
+}
diff --git a/deps/lld/test/COFF/thinlto-archives.ll b/deps/lld/test/COFF/thinlto-archives.ll
index 6a27115705b134ddfdb079dc09b7dbb127369e6c..a3de6c9e557e06417f08560b5cd212c04ac705a6 100644
--- a/deps/lld/test/COFF/thinlto-archives.ll
+++ b/deps/lld/test/COFF/thinlto-archives.ll
@@ -13,10 +13,10 @@
 
 ; CHECK: {{/thinlto-archives/main.obj$}}
 ; CHECK: {{^-r=.*/thinlto-archives/main.obj,main,px$}}
-; CHECK: {{/thinlto-archives/a.libbar.obj$}}
-; CHECK-NEXT: {{^-r=.*/thinlto-archives/a.libbar.obj,foo,p$}}
-; CHECK-NEXT: {{/thinlto-archives/b.libbar.obj$}}
-; CHECK-NEXT: {{^-r=.*/thinlto-archives/b.libbar.obj,bar,p$}}
+; CHECK: {{/thinlto-archives/a.libbar.obj[0-9]+$}}
+; CHECK-NEXT: {{^-r=.*/thinlto-archives/a.libbar.obj[0-9]+,foo,p$}}
+; CHECK-NEXT: {{/thinlto-archives/b.libbar.obj[0-9]+$}}
+; CHECK-NEXT: {{^-r=.*/thinlto-archives/b.libbar.obj[0-9]+,bar,p$}}
 
 target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-pc-windows-msvc"
diff --git a/deps/lld/test/COFF/thinlto-emit-imports.ll b/deps/lld/test/COFF/thinlto-emit-imports.ll
new file mode 100644
index 0000000000000000000000000000000000000000..b2ecd46c9e129ca4b95b6077bc8f1493714168e0
--- /dev/null
+++ b/deps/lld/test/COFF/thinlto-emit-imports.ll
@@ -0,0 +1,59 @@
+; REQUIRES: x86
+
+; Generate summary sections and test lld handling.
+; RUN: opt -module-summary %s -o %t1.obj
+; RUN: opt -module-summary %p/Inputs/thinlto.ll -o %t2.obj
+
+; Include a file with an empty module summary index, to ensure that the expected
+; output files are created regardless, for a distributed build system.
+; RUN: opt -module-summary %p/Inputs/thinlto-empty.ll -o %t3.obj
+
+; Ensure lld generates imports files if requested for distributed backends.
+; RUN: rm -f %t3.obj.imports %t3.obj.thinlto.bc
+; RUN: lld-link -entry:main -thinlto-index-only \
+; RUN:     -thinlto-emit-imports-files %t1.obj %t2.obj %t3.obj -out:%t4.exe
+
+; The imports file for this module contains the bitcode file for
+; Inputs/thinlto.ll
+; RUN: cat %t1.obj.imports | count 1
+; RUN: cat %t1.obj.imports | FileCheck %s --check-prefix=IMPORTS1
+; IMPORTS1: thinlto-emit-imports.ll.tmp2.obj
+
+; The imports file for Input/thinlto.ll is empty as it does not import anything.
+; RUN: cat %t2.obj.imports | count 0
+
+; The imports file for Input/thinlto_empty.ll is empty but should exist.
+; RUN: cat %t3.obj.imports | count 0
+
+; The index file should be created even for the input with an empty summary.
+; RUN: ls %t3.obj.thinlto.bc
+
+; Ensure lld generates error if unable to write to imports file.
+; RUN: rm -f %t3.obj.imports
+; RUN: touch %t3.obj.imports
+; RUN: chmod 400 %t3.obj.imports
+; RUN: not lld-link -entry:main -thinlto-index-only \
+; RUN:     -thinlto-emit-imports-files %t1.obj %t2.obj %t3.obj \
+; RUN:     -out:%t4.exe 2>&1 | FileCheck %s --check-prefix=ERR
+; ERR: cannot open {{.*}}3.obj.imports: {{P|p}}ermission denied
+
+; Ensure lld doesn't generate import files when thinlto-index-only is not enabled
+; RUN: rm -f %t1.obj.imports
+; RUN: rm -f %t2.obj.imports
+; RUN: rm -f %t3.obj.imports
+; RUN: lld-link -entry:main -thinlto-emit-imports-files \
+; RUN:     %t1.obj %t2.obj %t3.obj -out:%t4.exe
+; RUN: not ls %t1.obj.imports
+; RUN: not ls %t2.obj.imports
+; RUN: not ls %t3.obj.imports
+
+target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-pc-windows-msvc19.0.24215"
+
+declare void @g(...)
+
+define void @main() {
+entry:
+  call void (...) @g()
+  ret void
+}
diff --git a/deps/lld/test/COFF/thinlto-index-only.ll b/deps/lld/test/COFF/thinlto-index-only.ll
new file mode 100644
index 0000000000000000000000000000000000000000..f1f2412b87b2812741b10635197c008062f1d26c
--- /dev/null
+++ b/deps/lld/test/COFF/thinlto-index-only.ll
@@ -0,0 +1,52 @@
+; REQUIRES: x86
+
+; Basic ThinLTO tests.
+; RUN: opt -thinlto-bc %s -o %t1.obj
+; RUN: opt -thinlto-bc %p/Inputs/thinlto.ll -o %t2.obj
+; RUN: opt -thinlto-bc %p/Inputs/thinlto-empty.ll -o %t3.obj
+
+; Ensure lld generates an index and not a binary if requested.
+; RUN: rm -f %t4.exe
+; RUN: lld-link -thinlto-index-only -entry:main %t1.obj %t2.obj -out:%t4.exe
+; RUN: llvm-bcanalyzer -dump %t1.obj.thinlto.bc | FileCheck %s --check-prefix=BACKEND1
+; RUN: llvm-bcanalyzer -dump %t2.obj.thinlto.bc | FileCheck %s --check-prefix=BACKEND2
+; RUN: not test -e %t4.exe
+
+; The backend index for this module contains summaries from itself and
+; Inputs/thinlto.ll, as it imports from the latter.
+; BACKEND1: <MODULE_STRTAB_BLOCK
+; BACKEND1-NEXT: <ENTRY {{.*}} record string = '{{.*}}thinlto-index-only.ll.tmp{{.*}}.obj'
+; BACKEND1: <ENTRY {{.*}} record string = '{{.*}}thinlto-index-only.ll.tmp{{.*}}.obj'
+; BACKEND1-NOT: <ENTRY
+; BACKEND1: </MODULE_STRTAB_BLOCK
+; BACKEND1: <GLOBALVAL_SUMMARY_BLOCK
+; BACKEND1: <VERSION
+; BACKEND1: <FLAGS
+; BACKEND1: <VALUE_GUID op0={{1|2}} op1={{-5300342847281564238|-2624081020897602054}}
+; BACKEND1: <VALUE_GUID op0={{1|2}} op1={{-5300342847281564238|-2624081020897602054}}
+; BACKEND1: <COMBINED
+; BACKEND1: <COMBINED
+; BACKEND1: </GLOBALVAL_SUMMARY_BLOCK
+
+; The backend index for Input/thinlto.ll contains summaries from itself only,
+; as it does not import anything.
+; BACKEND2: <MODULE_STRTAB_BLOCK
+; BACKEND2-NEXT: <ENTRY {{.*}} record string = '{{.*}}thinlto-index-only.ll.tmp2.obj'
+; BACKEND2-NOT: <ENTRY
+; BACKEND2: </MODULE_STRTAB_BLOCK
+; BACKEND2-NEXT: <GLOBALVAL_SUMMARY_BLOCK
+; BACKEND2-NEXT: <VERSION
+; BACKEND2-NEXT: <FLAGS
+; BACKEND2-NEXT: <VALUE_GUID op0=1 op1=-5300342847281564238
+; BACKEND2-NEXT: <COMBINED
+; BACKEND2-NEXT: </GLOBALVAL_SUMMARY_BLOCK
+
+target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-pc-windows-msvc19.0.24215"
+
+declare void @g(...)
+
+define void @main() {
+  call void (...) @g()
+  ret void
+}
diff --git a/deps/lld/test/COFF/thinlto-object-suffix-replace.ll b/deps/lld/test/COFF/thinlto-object-suffix-replace.ll
new file mode 100644
index 0000000000000000000000000000000000000000..eea898de0c57694fb4f0942a8359810b55dd9b24
--- /dev/null
+++ b/deps/lld/test/COFF/thinlto-object-suffix-replace.ll
@@ -0,0 +1,50 @@
+; REQUIRES: x86
+
+; Test to make sure the thinlto-object-suffix-replace option is handled
+; correctly.
+
+; Generate bitcode file with summary, as well as a minimized bitcode without
+; the debug metadata for the thin link.
+; RUN: opt -thinlto-bc %s -thin-link-bitcode-file=%t1.thinlink.bc -o %t1.obj
+
+; First perform the thin link on the normal bitcode file, and save the
+; resulting index.
+; RUN: lld-link -thinlto-index-only -entry:main %t1.obj -out:%t3.exe
+; RUN: cp %t1.obj.thinlto.bc %t1.obj.thinlto.bc.orig
+
+; Next perform the thin link on the minimized bitcode file, and compare dump
+; of the resulting index to the above dump to ensure they are identical.
+; RUN: rm -f %t1.obj.thinlto.bc
+; Make sure it isn't inadvertently using the regular bitcode file.
+; RUN: rm -f %t1.obj
+; RUN: lld-link -entry:main -thinlto-index-only \
+; RUN:     -thinlto-object-suffix-replace:".thinlink.bc;.obj" \
+; RUN:     %t1.thinlink.bc -out:%t3.exe
+; RUN: diff %t1.obj.thinlto.bc.orig %t1.obj.thinlto.bc
+
+; Ensure lld generates error if suffix replace option not in 'old;new' format.
+; RUN: rm -f %t1.obj.thinlto.bc
+; RUN: not lld-link -entry:main -thinlto-index-only \
+; RUN: -thinlto-object-suffix-replace:"abc:def" %t1.thinlink.bc \
+; RUN: -out:%t3.exe 2>&1 | FileCheck %s --check-prefix=ERR1
+; ERR1: -thinlto-object-suffix-replace: expects 'old;new' format, but got abc:def
+
+; If filename does not end with old suffix, no suffix change should occur,
+; so ".thinlto.bc" will simply be appended to the input file name.
+; RUN: rm -f %t1.thinlink.bc.thinlto.bc
+; RUN: lld-link -entry:main -thinlto-index-only \
+; RUN: -thinlto-object-suffix-replace:".abc;.obj" %t1.thinlink.bc -out:%t3.exe
+; RUN: ls %t1.thinlink.bc.thinlto.bc
+
+target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-pc-windows-msvc19.0.24215"
+
+define void @main() {
+entry:
+  ret void
+}
+
+!llvm.dbg.cu = !{}
+
+!1 = !{i32 2, !"Debug Info Version", i32 3}
+!llvm.module.flags = !{!1}
diff --git a/deps/lld/test/COFF/thinlto-prefix-replace.ll b/deps/lld/test/COFF/thinlto-prefix-replace.ll
new file mode 100644
index 0000000000000000000000000000000000000000..a6a116d67e1469c66561d6e45e0984458b136673
--- /dev/null
+++ b/deps/lld/test/COFF/thinlto-prefix-replace.ll
@@ -0,0 +1,26 @@
+; REQUIRES: x86
+; Check that changing the output path via thinlto-prefix-replace works
+; RUN: mkdir -p %t/oldpath
+; RUN: opt -module-summary %s -o %t/oldpath/t.obj
+
+; Ensure that there is no existing file at the new path, so we properly
+; test the creation of the new file there.
+; RUN: rm -f %t/newpath/t.obj.thinlto.bc
+; RUN: lld-link -entry:main -thinlto-index-only \
+; RUN:     -thinlto-prefix-replace:"%t/oldpath/;%t/newpath/" %t/oldpath/t.obj \
+; RUN:     -out:%t/t.exe
+; RUN: ls %t/newpath/t.obj.thinlto.bc
+
+; Ensure that lld errors if prefix replace option is not in 'old;new' format.
+; RUN: rm -f %t/newpath/t.obj.thinlto.bc
+; RUN: not lld-link -entry:main -thinlto-index-only \
+; RUN:     -thinlto-prefix-replace:"abc:def" %t/oldpath/t.obj \
+; RUN:     -out:%t/t.exe 2>&1 | FileCheck --check-prefix=ERR %s
+; ERR: -thinlto-prefix-replace: expects 'old;new' format, but got abc:def
+
+target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-pc-windows-msvc19.0.24215"
+
+define void @main() {
+  ret void
+}
diff --git a/deps/lld/test/COFF/timestamp.test b/deps/lld/test/COFF/timestamp.test
index 7e5f79fde53b218b508619d584953e81eb5802c7..3a4da7d4dd22727da0930c76c312cc0c01d8d370 100644
--- a/deps/lld/test/COFF/timestamp.test
+++ b/deps/lld/test/COFF/timestamp.test
@@ -3,9 +3,9 @@ RUN: yaml2obj %p/Inputs/generic.yaml > %t.obj
 RUN: lld-link %t.obj /debug /Brepro /entry:main /nodefaultlib /out:%t.1.exe
 RUN: lld-link %t.obj /debug /Brepro /entry:main /nodefaultlib /out:%t.2.exe
 RUN: lld-link %t.obj /debug /timestamp:0 /entry:main /nodefaultlib /out:%t.3.exe
-RUN: llvm-readobj -file-headers -coff-debug-directory %t.1.exe | FileCheck %s --check-prefix=HASH
-RUN: llvm-readobj -file-headers -coff-debug-directory %t.2.exe | FileCheck %s --check-prefix=HASH
-RUN: llvm-readobj -file-headers -coff-debug-directory %t.3.exe | FileCheck %s --check-prefix=ZERO
+RUN: llvm-readobj --file-headers --coff-debug-directory %t.1.exe | FileCheck %s --check-prefix=HASH
+RUN: llvm-readobj --file-headers --coff-debug-directory %t.2.exe | FileCheck %s --check-prefix=HASH
+RUN: llvm-readobj --file-headers --coff-debug-directory %t.3.exe | FileCheck %s --check-prefix=ZERO
 
 HASH: ImageFileHeader {
 HASH: TimeDateStamp: [[STAMP:.*]]
diff --git a/deps/lld/test/COFF/tls.test b/deps/lld/test/COFF/tls.test
index a577fe832fb9e80226c4d87fa36919eaa524d2e0..0c2f1f6757250da56fd04ca912df7c491950ab6e 100644
--- a/deps/lld/test/COFF/tls.test
+++ b/deps/lld/test/COFF/tls.test
@@ -1,6 +1,6 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 # CHECK: TLSTableRVA: 0x1000
 # CHECK: TLSTableSize: 0x28
diff --git a/deps/lld/test/COFF/tls32.test b/deps/lld/test/COFF/tls32.test
index fa39614f121ea58d5b13df98b83831779c8219b7..462cec06b20974e9f497066b34aa4add4633c06e 100644
--- a/deps/lld/test/COFF/tls32.test
+++ b/deps/lld/test/COFF/tls32.test
@@ -1,6 +1,6 @@
 # RUN: yaml2obj < %s > %t.obj
-# RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: lld-link -safeseh:no /out:%t.exe /entry:main %t.obj
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 # CHECK: TLSTableRVA: 0x1000
 # CHECK: TLSTableSize: 0x18
diff --git a/deps/lld/test/COFF/tls_suffix_sorting.s b/deps/lld/test/COFF/tls_suffix_sorting.s
new file mode 100644
index 0000000000000000000000000000000000000000..d426ac1fe1cdf0d8702374b504fdd0fd284f604f
--- /dev/null
+++ b/deps/lld/test/COFF/tls_suffix_sorting.s
@@ -0,0 +1,27 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -triple=x86_64-windows-gnu %S/Inputs/tlssup.s -filetype=obj -o %t.tlssup.o
+# RUN: llvm-mc -triple=x86_64-windows-gnu %s -filetype=obj -o %t.main.o
+
+# RUN: lld-link -lldmingw -entry:main %t.main.o %t.tlssup.o -out:%t.exe
+# RUN: llvm-objdump -s %t.exe | FileCheck %s
+
+# Check that .tls$$foo is sorted after the start marker (aa) and before the
+# end marker (ff).
+
+# CHECK: Contents of section .tls:
+# CHECK:  140004000 aabbff
+
+        .text
+        .globl          main
+main:
+        movl            _tls_index(%rip), %eax
+        movq            %gs:88, %rcx
+        movq            (%rcx,%rax,8), %rax
+        movb            foo@SECREL32(%rax), %al
+        ret
+
+        .section        .tls$$foo,"dw"
+        .linkonce       discard
+foo:
+        .byte           0xbb
diff --git a/deps/lld/test/COFF/undefined-symbol-cv.s b/deps/lld/test/COFF/undefined-symbol-cv.s
index e730c5dfc9f49067f3304faed5e0cdf2aa366073..08a85826b9f9688135e0cbedd7554cda2cf9b0de 100644
--- a/deps/lld/test/COFF/undefined-symbol-cv.s
+++ b/deps/lld/test/COFF/undefined-symbol-cv.s
@@ -2,19 +2,19 @@
 # RUN: llvm-mc -triple=x86_64-windows-msvc -filetype=obj -o %t.obj %s
 # RUN: not lld-link /out:%t.exe %t.obj 2>&1 | FileCheck %s
 
-# CHECK: error: undefined symbol: "int __cdecl foo(void)" (?foo@@YAHXZ)
+# CHECK: error: undefined symbol: int __cdecl foo(void)
 # CHECK-NEXT: >>> referenced by file1.cpp:1
 # CHECK-NEXT: >>>               {{.*}}.obj:(main)
 # CHECK-NEXT: >>> referenced by file1.cpp:2
 # CHECK-NEXT: >>>               {{.*}}.obj:(main)
 # CHECK-EMPTY:
-# CHECK-NEXT: error: undefined symbol: "int __cdecl bar(void)" (?bar@@YAHXZ)
+# CHECK-NEXT: error: undefined symbol: int __cdecl bar(void)
 # CHECK-NEXT: >>> referenced by file2.cpp:3
 # CHECK-NEXT: >>>               {{.*}}.obj:(main)
 # CHECK-NEXT: >>> referenced by file1.cpp:4
 # CHECK-NEXT: >>>               {{.*}}.obj:(f1)
 # CHECK-EMPTY:
-# CHECK-NEXT: error: undefined symbol: "int __cdecl baz(void)" (?baz@@YAHXZ)
+# CHECK-NEXT: error: undefined symbol: int __cdecl baz(void)
 # CHECK-NEXT: >>> referenced by file1.cpp:5
 # CHECK-NEXT: >>>               {{.*}}.obj:(f2)
 
diff --git a/deps/lld/test/COFF/undefined-symbol-lto.test b/deps/lld/test/COFF/undefined-symbol-lto.test
new file mode 100644
index 0000000000000000000000000000000000000000..41957168baf6002df4f1699acc35580e13714c07
--- /dev/null
+++ b/deps/lld/test/COFF/undefined-symbol-lto.test
@@ -0,0 +1,31 @@
+REQUIRES: x86
+
+RUN: rm -rf %t && mkdir -p %t && cd %t
+RUN: llvm-as %S/Inputs/undefined-symbol-lto-a.ll -o t.obj
+RUN: llvm-as %S/Inputs/undefined-symbol-lto-b.ll -o b.obj
+RUN: llvm-lib b.obj -out:b.lib
+RUN: not lld-link -entry:main -nodefaultlib t.obj b.lib -subsystem:console 2>&1 | FileCheck %s
+
+CHECK: undefined symbol: main
+CHECK: undefined symbol: void __cdecl undefined_ref(void)
+CHECK: referenced by
+
+Originally reported as PR42536.
+
+a.ll corresponds to this C++:
+
+struct __declspec(dllimport) S {
+  virtual void foo();
+};
+void undefined_ref();
+struct Init {
+  Init() { undefined_ref(); }
+  S c;
+} d;
+
+b.ll is from this C++:
+
+struct S {
+  virtual void foo();
+};
+void S::foo() {}
diff --git a/deps/lld/test/COFF/undefined-symbol-multi.s b/deps/lld/test/COFF/undefined-symbol-multi.s
new file mode 100644
index 0000000000000000000000000000000000000000..5942972a02519578f802ea0f7130f6d9a40a48a1
--- /dev/null
+++ b/deps/lld/test/COFF/undefined-symbol-multi.s
@@ -0,0 +1,47 @@
+# REQUIRES: x86
+# RUN: llvm-mc -triple=x86_64-windows-msvc -filetype=obj -o %t.obj %s
+
+# All references to a single undefined symbol count as a single error -- but
+# at most 10 references are printed.
+# RUN: echo ".globl bar" > %t.moreref.s
+# RUN: echo "bar:" >> %t.moreref.s
+# RUN: echo '  call "?foo@@YAHXZ"' >> %t.moreref.s
+# RUN: echo '  call "?foo@@YAHXZ"' >> %t.moreref.s
+# RUN: echo '  call "?foo@@YAHXZ"' >> %t.moreref.s
+# RUN: echo '  call "?foo@@YAHXZ"' >> %t.moreref.s
+# RUN: echo '  call "?foo@@YAHXZ"' >> %t.moreref.s
+# RUN: echo '  call "?foo@@YAHXZ"' >> %t.moreref.s
+# RUN: echo '  call "?foo@@YAHXZ"' >> %t.moreref.s
+# RUN: echo '  call "?foo@@YAHXZ"' >> %t.moreref.s
+# RUN: echo '  call "?foo@@YAHXZ"' >> %t.moreref.s
+# RUN: echo '  call "?foo@@YAHXZ"' >> %t.moreref.s
+# RUN: llvm-mc -triple=x86_64-windows-msvc -filetype=obj -o %t2.obj %t.moreref.s
+# RUN: not lld-link /out:/dev/null  %t.obj %t2.obj 2>&1 | FileCheck %s
+
+# CHECK: error: undefined symbol: int __cdecl foo(void)
+# CHECK-NEXT: >>> referenced by {{.*}}tmp.obj:(main)
+# CHECK-NEXT: >>> referenced by {{.*}}tmp.obj:(main)
+# CHECK-NEXT: >>> referenced by {{.*}}tmp2.obj:(bar)
+# CHECK-NEXT: >>> referenced by {{.*}}tmp2.obj:(bar)
+# CHECK-NEXT: >>> referenced by {{.*}}tmp2.obj:(bar)
+# CHECK-NEXT: >>> referenced by {{.*}}tmp2.obj:(bar)
+# CHECK-NEXT: >>> referenced by {{.*}}tmp2.obj:(bar)
+# CHECK-NEXT: >>> referenced by {{.*}}tmp2.obj:(bar)
+# CHECK-NEXT: >>> referenced by {{.*}}tmp2.obj:(bar)
+# CHECK-NEXT: >>> referenced by {{.*}}tmp2.obj:(bar)
+# CHECK-NEXT: >>> referenced 2 more times
+# CHECK-EMPTY:
+# CHECK-NEXT: error: undefined symbol: int __cdecl bar(void)
+# CHECK-NEXT: >>> referenced by {{.*}}.obj:(main)
+# CHECK-NEXT: >>> referenced by {{.*}}.obj:(f1)
+
+        .section        .text,"xr",one_only,main
+.globl main
+main:
+	call	"?foo@@YAHXZ"
+	call	"?foo@@YAHXZ"
+	call	"?bar@@YAHXZ"
+
+f1:
+	call	"?bar@@YAHXZ"
+.Lfunc_end1:
diff --git a/deps/lld/test/COFF/undefined-symbol.s b/deps/lld/test/COFF/undefined-symbol.s
index 31da50a9e18178c95400a277dc13bcd10b610ffb..5fb2511ae25d0887c50a839461a7730d46481029 100644
--- a/deps/lld/test/COFF/undefined-symbol.s
+++ b/deps/lld/test/COFF/undefined-symbol.s
@@ -1,16 +1,22 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple=x86_64-windows-msvc -filetype=obj -o %t.obj %s
 # RUN: not lld-link /out:%t.exe %t.obj 2>&1 | FileCheck %s
+# RUN: not lld-link /out:%t.exe /demangle %t.obj 2>&1 | FileCheck %s
+# RUN: not lld-link /out:%t.exe /demangle:no %t.obj 2>&1 | FileCheck --check-prefix=NODEMANGLE %s
 
-# CHECK: error: undefined symbol: "int __cdecl foo(void)" (?foo@@YAHXZ)
+# NODEMANGLE: error: undefined symbol: ?foo@@YAHXZ
+# NODEMANGLE: error: undefined symbol: ?bar@@YAHXZ
+# NODEMANGLE: error: undefined symbol: __imp_?baz@@YAHXZ
+
+# CHECK: error: undefined symbol: int __cdecl foo(void)
 # CHECK-NEXT: >>> referenced by {{.*}}.obj:(main)
 # CHECK-NEXT: >>> referenced by {{.*}}.obj:(main)
 # CHECK-EMPTY:
-# CHECK-NEXT: error: undefined symbol: "int __cdecl bar(void)" (?bar@@YAHXZ)
+# CHECK-NEXT: error: undefined symbol: int __cdecl bar(void)
 # CHECK-NEXT: >>> referenced by {{.*}}.obj:(main)
 # CHECK-NEXT: >>> referenced by {{.*}}.obj:(f1)
 # CHECK-EMPTY:
-# CHECK-NEXT: error: undefined symbol: "__declspec(dllimport) int __cdecl baz(void)" (__imp_?baz@@YAHXZ)
+# CHECK-NEXT: error: undefined symbol: __declspec(dllimport) int __cdecl baz(void)
 # CHECK-NEXT: >>> referenced by {{.*}}.obj:(f2)
 
         .section        .text,"xr",one_only,main
diff --git a/deps/lld/test/COFF/unwind.test b/deps/lld/test/COFF/unwind.test
index 5b74aa7c1bba1385f930c357bce8278d29bd012e..080174315d35d3d6dbf8b4dfa888223ee78b1867 100644
--- a/deps/lld/test/COFF/unwind.test
+++ b/deps/lld/test/COFF/unwind.test
@@ -1,11 +1,11 @@
 # RUN: yaml2obj < %s > %t.obj
 #
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=HEADER %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=HEADER %s
 # RUN: llvm-objdump -unwind-info %t.exe | FileCheck -check-prefix=UNWIND %s
 #
 # RUN: lld-link /merge:.pdata=.rdata /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers -sections %t.exe | FileCheck -check-prefix=HEADER-MERGE %s
+# RUN: llvm-readobj --file-headers --sections %t.exe | FileCheck -check-prefix=HEADER-MERGE %s
 #
 # HEADER: ExceptionTableRVA: 0x3000
 #
diff --git a/deps/lld/test/COFF/used-lto.ll b/deps/lld/test/COFF/used-lto.ll
new file mode 100644
index 0000000000000000000000000000000000000000..c269fbac85d72078c1b263084cb173f75f3c49b5
--- /dev/null
+++ b/deps/lld/test/COFF/used-lto.ll
@@ -0,0 +1,15 @@
+; REQUIRES: x86
+; RUN: llvm-as -o %t.obj %s
+; RUN: lld-link -dll -debug -opt:ref -noentry -out:%t.dll %t.obj
+; RUN: llvm-pdbutil dump -publics %t.pdb | FileCheck %s
+
+; CHECK: S_PUB32 {{.*}} `foo`
+
+target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-pc-windows-msvc"
+
+@llvm.used = appending global [1 x i8*] [i8* bitcast (void ()* @foo to i8*)], section "llvm.metadata"
+
+define void @foo() {
+  ret void
+}
diff --git a/deps/lld/test/COFF/version.test b/deps/lld/test/COFF/version.test
index 69fa93394a0f49a72b734fbb9e7035b32362faff..636389ee5080ddfe5a402918dd663d6b45e930a9 100644
--- a/deps/lld/test/COFF/version.test
+++ b/deps/lld/test/COFF/version.test
@@ -1,19 +1,19 @@
 # RUN: yaml2obj < %p/Inputs/ret42.yaml > %t.obj
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=DEFAULT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=DEFAULT %s
 
 DEFAULT: MajorImageVersion: 0
 DEFAULT: MinorImageVersion: 0
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj /version:11
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
 
 CHECK1: MajorImageVersion: 11
 CHECK1: MinorImageVersion: 0
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj /version:11.22
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
 
 CHECK2: MajorImageVersion: 11
 CHECK2: MinorImageVersion: 22
diff --git a/deps/lld/test/COFF/wx.s b/deps/lld/test/COFF/wx.s
index 3a470edc261c0d7a462c123cb37b6a9bb8fe841c..21c3ca35f528c13d0cdd62392699c8c1aa5412a3 100644
--- a/deps/lld/test/COFF/wx.s
+++ b/deps/lld/test/COFF/wx.s
@@ -1,15 +1,15 @@
 # REQUIRES: x86
 
 # RUN: llvm-mc -triple=x86_64-windows-msvc -filetype=obj -o %t.obj %s
-# RUN: not lld-link /out:%t.exe /entry:main -notarealoption /WX %t.obj 2>&1 | \
+# RUN: not lld-link /out:%t.exe /entry:main -notarealopt=ion /WX %t.obj 2>&1 | \
 # RUN:   FileCheck -check-prefix=ERROR %s
-# RUN: not lld-link /out:%t.exe /entry:main -notarealoption /WX:NO /WX %t.obj 2>&1 | \
+# RUN: not lld-link /out:%t.exe /entry:main -notarealopt=ion /WX:NO /WX %t.obj 2>&1 | \
 # RUN:   FileCheck -check-prefix=ERROR %s
-# RUN: lld-link /out:%t.exe /entry:main -notarealoption /WX /WX:NO %t.obj 2>&1 | \
+# RUN: lld-link /out:%t.exe /entry:main -notarealopt=ion /WX /WX:NO %t.obj 2>&1 | \
 # RUN:   FileCheck -check-prefix=WARNING %s
 
-# ERROR: error: ignoring unknown argument: -notarealoption
-# WARNING: warning: ignoring unknown argument: -notarealoption
+# ERROR: error: ignoring unknown argument '-notarealopt=ion'
+# WARNING: warning: ignoring unknown argument '-notarealopt=ion'
 
 .text
 .global main
diff --git a/deps/lld/test/ELF/Inputs/aarch64-addrifunc.s b/deps/lld/test/ELF/Inputs/aarch64-addrifunc.s
new file mode 100644
index 0000000000000000000000000000000000000000..70536e15d3acafbeee7ac6c04b7f5873d74dd407
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/aarch64-addrifunc.s
@@ -0,0 +1,8 @@
+        .text
+        .globl myfunc
+        .globl func1
+        .type func1, %function
+func1:
+        adrp x8, :got: myfunc
+        ldr x8, [x8, :got_lo12: myfunc]
+        ret
diff --git a/deps/lld/test/ELF/Inputs/aarch64-bti1.s b/deps/lld/test/ELF/Inputs/aarch64-bti1.s
new file mode 100644
index 0000000000000000000000000000000000000000..032eea6bec3640dad6e9f9458df5bbdcd4866b38
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/aarch64-bti1.s
@@ -0,0 +1,19 @@
+.section ".note.gnu.property", "a"
+.long 4
+.long 0x10
+.long 0x5
+.asciz "GNU"
+
+.long 0xc0000000 // GNU_PROPERTY_AARCH64_FEATURE_1_AND
+.long 4
+.long 1          // GNU_PROPERTY_AARCH64_FEATURE_1_BTI
+.long 0
+
+.text
+.globl func2
+.type func2,@function
+func2:
+  .globl func3
+  .type func3, @function
+  bl func3
+  ret
diff --git a/deps/lld/test/ELF/Inputs/aarch64-btipac1.s b/deps/lld/test/ELF/Inputs/aarch64-btipac1.s
new file mode 100644
index 0000000000000000000000000000000000000000..0d6519bcd07a8a8f99e13011a3fe792a7b8d994e
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/aarch64-btipac1.s
@@ -0,0 +1,19 @@
+.section ".note.gnu.property", "a"
+.long 4
+.long 0x10
+.long 0x5
+.asciz "GNU"
+
+.long 0xc0000000 // GNU_PROPERTY_AARCH64_FEATURE_1_AND
+.long 4
+.long 3          // GNU_PROPERTY_AARCH64_FEATURE_1_PAC and BTI
+.long 0
+
+.text
+.globl func2
+.type func2,@function
+func2:
+  .globl func3
+  .type func3, @function
+  bl func3
+  ret
diff --git a/deps/lld/test/ELF/Inputs/aarch64-func2.s b/deps/lld/test/ELF/Inputs/aarch64-func2.s
new file mode 100644
index 0000000000000000000000000000000000000000..65de414b70972ee32f510d87c3cd27ae33e17ecf
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/aarch64-func2.s
@@ -0,0 +1,8 @@
+.text
+.globl func2
+.type func2,@function
+func2:
+  .globl func3
+  .type func3, @function
+  bl func3
+  ret
diff --git a/deps/lld/test/ELF/Inputs/aarch64-func3-bti.s b/deps/lld/test/ELF/Inputs/aarch64-func3-bti.s
new file mode 100644
index 0000000000000000000000000000000000000000..1869f1be98bf5ef32d724ab2f515f19d490cbf6a
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/aarch64-func3-bti.s
@@ -0,0 +1,16 @@
+.section ".note.gnu.property", "a"
+.long 4
+.long 0x10
+.long 0x5
+.asciz "GNU"
+
+.long 0xc0000000 // GNU_PROPERTY_AARCH64_FEATURE_1_AND
+.long 4
+.long 1          // GNU_PROPERTY_AARCH64_FEATURE_1_BTI
+.long 0
+
+.text
+.globl func3
+.type func3,@function
+func3:
+  ret
diff --git a/deps/lld/test/ELF/Inputs/aarch64-func3-btipac.s b/deps/lld/test/ELF/Inputs/aarch64-func3-btipac.s
new file mode 100644
index 0000000000000000000000000000000000000000..51dd2cd71b054bed879a8c36b364996d2f89ca63
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/aarch64-func3-btipac.s
@@ -0,0 +1,16 @@
+.section ".note.gnu.property", "a"
+.long 4
+.long 0x10
+.long 0x5
+.asciz "GNU"
+
+.long 0xc0000000 // GNU_PROPERTY_AARCH64_FEATURE_1_AND
+.long 4
+.long 3          // GNU_PROPERTY_AARCH64_FEATURE_1_PAC
+.long 0
+
+.text
+.globl func3
+.type func3,@function
+func3:
+  ret
diff --git a/deps/lld/test/ELF/Inputs/aarch64-func3-pac.s b/deps/lld/test/ELF/Inputs/aarch64-func3-pac.s
new file mode 100644
index 0000000000000000000000000000000000000000..d8108364e823a142fd6093a92004d90dfcac5834
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/aarch64-func3-pac.s
@@ -0,0 +1,16 @@
+.section ".note.gnu.property", "a"
+.long 4
+.long 0x10
+.long 0x5
+.asciz "GNU"
+
+.long 0xc0000000 // GNU_PROPERTY_AARCH64_FEATURE_1_AND
+.long 4
+.long 2          // GNU_PROPERTY_AARCH64_FEATURE_1_PAC
+.long 0
+
+.text
+.globl func3
+.type func3,@function
+func3:
+  ret
diff --git a/deps/lld/test/ELF/Inputs/aarch64-func3.s b/deps/lld/test/ELF/Inputs/aarch64-func3.s
new file mode 100644
index 0000000000000000000000000000000000000000..4c92e06642ac6dd80f86ac5923317a00c3769210
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/aarch64-func3.s
@@ -0,0 +1,5 @@
+.text
+.globl func3
+.type func3,@function
+func3:
+  ret
diff --git a/deps/lld/test/ELF/Inputs/aarch64-nobti.s b/deps/lld/test/ELF/Inputs/aarch64-nobti.s
new file mode 100644
index 0000000000000000000000000000000000000000..65de414b70972ee32f510d87c3cd27ae33e17ecf
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/aarch64-nobti.s
@@ -0,0 +1,8 @@
+.text
+.globl func2
+.type func2,@function
+func2:
+  .globl func3
+  .type func3, @function
+  bl func3
+  ret
diff --git a/deps/lld/test/ELF/Inputs/aarch64-nopac.s b/deps/lld/test/ELF/Inputs/aarch64-nopac.s
new file mode 100644
index 0000000000000000000000000000000000000000..65de414b70972ee32f510d87c3cd27ae33e17ecf
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/aarch64-nopac.s
@@ -0,0 +1,8 @@
+.text
+.globl func2
+.type func2,@function
+func2:
+  .globl func3
+  .type func3, @function
+  bl func3
+  ret
diff --git a/deps/lld/test/ELF/Inputs/aarch64-pac1.s b/deps/lld/test/ELF/Inputs/aarch64-pac1.s
new file mode 100644
index 0000000000000000000000000000000000000000..d8ac67572c867ed54dcb377c92107f875e012a68
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/aarch64-pac1.s
@@ -0,0 +1,19 @@
+.section ".note.gnu.property", "a"
+.long 4
+.long 0x10
+.long 0x5
+.asciz "GNU"
+
+.long 0xc0000000 // GNU_PROPERTY_AARCH64_FEATURE_1_AND
+.long 4
+.long 2          // GNU_PROPERTY_AARCH64_FEATURE_1_PAC
+.long 0
+
+.text
+.globl func2
+.type func2,@function
+func2:
+  .globl func3
+  .type func3, @function
+  bl func3
+  ret
diff --git a/deps/lld/test/ELF/Inputs/bad-reloc-target.test b/deps/lld/test/ELF/Inputs/bad-reloc-target.test
deleted file mode 100644
index dabd005881f43ea0d05f950b0b3d74682ab27052..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/Inputs/bad-reloc-target.test
+++ /dev/null
@@ -1,21 +0,0 @@
---- !ELF
-FileHeader:
-  Class:           ELFCLASS64
-  Data:            ELFDATA2LSB
-  Type:            ET_REL
-  Machine:         EM_X86_64
-Sections:
-  - Name:            .text
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-  - Name:            .rela.text
-    Type:            SHT_RELA
-    Link:            .symtab
-    Info:            99
-    Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          foo
-        Type:            R_X86_64_64
-Symbols:
-  Global:
-    - Name:            foo
\ No newline at end of file
diff --git a/deps/lld/test/ELF/Inputs/comdat-discarded-reloc.s b/deps/lld/test/ELF/Inputs/comdat-discarded-reloc.s
index 9526f5ac95c00ee558f04a424db9a29faf2e244e..d89575f27e9447a34802092ebf0e525046548ede 100644
--- a/deps/lld/test/ELF/Inputs/comdat-discarded-reloc.s
+++ b/deps/lld/test/ELF/Inputs/comdat-discarded-reloc.s
@@ -1,6 +1,8 @@
-.section .text.bar1,"aG",@progbits,group,comdat
+.global bar, _start
 
-.section .text.bar2
-.global bar
-bar:
- .quad .text.bar1
+.section .text.foo,"aG",@progbits,group,comdat
+
+.section .text
+_start:
+ .quad .text.foo
+ .quad bar
diff --git a/deps/lld/test/ELF/Inputs/deplibs-lib_bar.s b/deps/lld/test/ELF/Inputs/deplibs-lib_bar.s
new file mode 100644
index 0000000000000000000000000000000000000000..b092459eef337ddf2f352c7e0a4680e653806382
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/deplibs-lib_bar.s
@@ -0,0 +1,2 @@
+        .global bar
+bar:
diff --git a/deps/lld/test/ELF/Inputs/deplibs-lib_foo.s b/deps/lld/test/ELF/Inputs/deplibs-lib_foo.s
new file mode 100644
index 0000000000000000000000000000000000000000..2f0ccf81e395df538a3e628ac2a99cd3fc2a6155
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/deplibs-lib_foo.s
@@ -0,0 +1,2 @@
+        .global foo
+foo:
diff --git a/deps/lld/test/ELF/Inputs/dtrace-r.o b/deps/lld/test/ELF/Inputs/dtrace-r.o
deleted file mode 100644
index ce742de3bd2be7140052612b7d94cdc52f4210a5..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/Inputs/dtrace-r.o and /dev/null differ
diff --git a/deps/lld/test/ELF/Inputs/dummy-shared.s b/deps/lld/test/ELF/Inputs/dummy-shared.s
new file mode 100644
index 0000000000000000000000000000000000000000..f500936565f7d87ad256a4db8fd9f536623e7490
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/dummy-shared.s
@@ -0,0 +1,2 @@
+.globl bar
+bar:
diff --git a/deps/lld/test/ELF/Inputs/gdb-index-multiple-cu-2.s b/deps/lld/test/ELF/Inputs/gdb-index-multiple-cu-2.s
index 80c738eab1ff3161302086f2d46afa408739c793..997eb6be3e5230c279ad0872dbf93605ca5cdfa2 100644
--- a/deps/lld/test/ELF/Inputs/gdb-index-multiple-cu-2.s
+++ b/deps/lld/test/ELF/Inputs/gdb-index-multiple-cu-2.s
@@ -31,7 +31,7 @@ _start:
 	.byte	0
 .Lcu_end0:
 
-# .debug_gnu_pubnames has just one set, associated with .Lcu_begin1 (CuIndex: 1)
+# .debug_gnu_pubnames has just one set, associated with .Lcu_begin1 (cuIndex: 1)
 .section .debug_gnu_pubnames,"",@progbits
 	.long	.LpubNames_end0 - .LpubNames_begin0
 .LpubNames_begin0:
diff --git a/deps/lld/test/ELF/Inputs/gnu-ifunc-canon-ro-abs.s b/deps/lld/test/ELF/Inputs/gnu-ifunc-canon-ro-abs.s
new file mode 100644
index 0000000000000000000000000000000000000000..3c09bd6023aef486c57129f5a41772fc1ccc9bae
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/gnu-ifunc-canon-ro-abs.s
@@ -0,0 +1,2 @@
+.rodata
+.8byte ifunc
diff --git a/deps/lld/test/ELF/Inputs/gnu-ifunc-canon-ro-pcrel.s b/deps/lld/test/ELF/Inputs/gnu-ifunc-canon-ro-pcrel.s
new file mode 100644
index 0000000000000000000000000000000000000000..c173d3d72d186c86cbcbd45d7e92f1d30ef3883f
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/gnu-ifunc-canon-ro-pcrel.s
@@ -0,0 +1,2 @@
+.rodata
+.4byte ifunc - .
diff --git a/deps/lld/test/ELF/Inputs/gnu-ifunc-canon-rw-addend.s b/deps/lld/test/ELF/Inputs/gnu-ifunc-canon-rw-addend.s
new file mode 100644
index 0000000000000000000000000000000000000000..7f369d39344ed15439b5110c888952b3273cc648
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/gnu-ifunc-canon-rw-addend.s
@@ -0,0 +1,2 @@
+.data
+.8byte ifunc + 1
diff --git a/deps/lld/test/ELF/Inputs/i386-cet1.s b/deps/lld/test/ELF/Inputs/i386-cet1.s
new file mode 100644
index 0000000000000000000000000000000000000000..62cd66edf046c35c35cd24c587ec876082448e3f
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/i386-cet1.s
@@ -0,0 +1,16 @@
+.section ".note.gnu.property", "a"
+.align 4
+.long 4
+.long 12
+.long 5
+.asciz "GNU"
+
+.long 0xc0000002
+.long 4
+.long 3
+
+.text
+.globl func2
+.type func2,@function
+func2:
+  ret
diff --git a/deps/lld/test/ELF/Inputs/i386-cet2.s b/deps/lld/test/ELF/Inputs/i386-cet2.s
new file mode 100644
index 0000000000000000000000000000000000000000..1ccf701a253a7eac6979f39c5aa64dbe89a1ad13
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/i386-cet2.s
@@ -0,0 +1,20 @@
+.section ".note.gnu.property", "a"
+.align 4
+.long 4
+.long 24
+.long 5
+.asciz "GNU"
+
+.long 0xc0000000
+.long 4
+.long 0
+
+.long 0xc0000002
+.long 4
+.long 3
+
+.text
+.globl func2
+.type func2,@function
+func2:
+  ret
diff --git a/deps/lld/test/ELF/Inputs/i386-cet3.s b/deps/lld/test/ELF/Inputs/i386-cet3.s
new file mode 100644
index 0000000000000000000000000000000000000000..cdec62a1948291296857cedf7f025df3456278f3
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/i386-cet3.s
@@ -0,0 +1,5 @@
+.text
+.globl func2
+.type func2,@function
+func2:
+  ret
diff --git a/deps/lld/test/ELF/Inputs/i386-cet4.s b/deps/lld/test/ELF/Inputs/i386-cet4.s
new file mode 100644
index 0000000000000000000000000000000000000000..6d07eeaff6a1e39f5b250170044579a39fde52d6
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/i386-cet4.s
@@ -0,0 +1,16 @@
+.section ".note.gnu.property", "a"
+.align 4
+.long 4
+.long 12
+.long 5
+.asciz "GNU"
+
+.long 0xc0000002
+.long 4
+.long 0xfffffffd
+
+.text
+.globl func2
+.type func2,@function
+func2:
+  ret
diff --git a/deps/lld/test/ELF/Inputs/i386-reloc-16-error.s b/deps/lld/test/ELF/Inputs/i386-reloc-16-error.s
deleted file mode 100644
index 8deed64dbef895eb9a2c71f7b001e1bbb5cfdf23..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/Inputs/i386-reloc-16-error.s
+++ /dev/null
@@ -1,3 +0,0 @@
-.globl foo
-.hidden foo
-foo = 65536
diff --git a/deps/lld/test/ELF/Inputs/i386-reloc-16.s b/deps/lld/test/ELF/Inputs/i386-reloc-16.s
deleted file mode 100644
index ac4601b5c58028deeb342fcdbbbded38dd42fae4..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/Inputs/i386-reloc-16.s
+++ /dev/null
@@ -1,3 +0,0 @@
-.globl foo
-.hidden foo
-foo = 0xffff
diff --git a/deps/lld/test/ELF/Inputs/i386-reloc-8-error.s b/deps/lld/test/ELF/Inputs/i386-reloc-8-error.s
deleted file mode 100644
index b6a7626456dc97206786eb17773a1918cd73341f..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/Inputs/i386-reloc-8-error.s
+++ /dev/null
@@ -1,3 +0,0 @@
-.globl foo
-.hidden foo
-foo = 256
diff --git a/deps/lld/test/ELF/Inputs/i386-reloc-8.s b/deps/lld/test/ELF/Inputs/i386-reloc-8.s
deleted file mode 100644
index ce488f6e1d57a07d530b663ab17d0641085cef9d..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/Inputs/i386-reloc-8.s
+++ /dev/null
@@ -1,3 +0,0 @@
-.globl foo
-.hidden foo
-foo = 0xff
diff --git a/deps/lld/test/ELF/Inputs/i386-static-tls-model1.s b/deps/lld/test/ELF/Inputs/i386-static-tls-model1.s
new file mode 100644
index 0000000000000000000000000000000000000000..d287fb64eee60aef8cac2d80f84082d5405bb11d
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/i386-static-tls-model1.s
@@ -0,0 +1,9 @@
+.section ".tdata", "awT", @progbits
+.globl var
+var:
+
+.section .foo, "aw"
+.global _start
+_start:
+ movl $var@tpoff, %edx # R_386_TLS_LE_32
+ movl %gs:0, %ecx
diff --git a/deps/lld/test/ELF/Inputs/i386-static-tls-model2.s b/deps/lld/test/ELF/Inputs/i386-static-tls-model2.s
new file mode 100644
index 0000000000000000000000000000000000000000..2c01cee42ddfd112e719ded6a9c009480d57ea0f
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/i386-static-tls-model2.s
@@ -0,0 +1,9 @@
+.section ".tdata", "awT", @progbits
+.globl var
+var:
+
+.section .foo, "aw"
+.global _start
+_start: 
+ movl %gs:0, %eax
+ addl var@gotntpoff(%ebx), %eax # R_386_TLS_GOTIE
diff --git a/deps/lld/test/ELF/Inputs/i386-static-tls-model3.s b/deps/lld/test/ELF/Inputs/i386-static-tls-model3.s
new file mode 100644
index 0000000000000000000000000000000000000000..fd18fceb71caa3cbad695319c3d9771adbd6008c
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/i386-static-tls-model3.s
@@ -0,0 +1,9 @@
+.section ".tdata", "awT", @progbits
+.globl var
+var:
+
+.section .foo, "aw"
+.global _start
+_start:
+ movl %gs:0, %eax
+ addl var@indntpoff, %eax # R_386_TLS_IE
diff --git a/deps/lld/test/ELF/Inputs/i386-static-tls-model4.s b/deps/lld/test/ELF/Inputs/i386-static-tls-model4.s
new file mode 100644
index 0000000000000000000000000000000000000000..6006518bfd7ce2350966c76491c22a88fb78af6d
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/i386-static-tls-model4.s
@@ -0,0 +1,9 @@
+.section ".tdata", "awT", @progbits
+.globl var
+var:
+
+.section .foo, "aw"
+.global _start
+_start:
+ movl %gs:0, %eax
+ leal var@ntpoff(%eax), %eax # R_386_TLS_LE
diff --git a/deps/lld/test/ELF/Inputs/ppc64-sort-small-cm-relocs-input2.s b/deps/lld/test/ELF/Inputs/ppc64-sort-small-cm-relocs-input2.s
new file mode 100644
index 0000000000000000000000000000000000000000..b903f9b549672855a80af6550f8909a50e51fb02
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/ppc64-sort-small-cm-relocs-input2.s
@@ -0,0 +1,23 @@
+    .text
+
+    .global set
+    .type set,@function
+set:
+.Lgep:
+    addis 2, 12, .TOC.-.Lgep@ha
+    addi 2, 2, .TOC.-.Lgep@l
+.Llep:
+    .localentry	set, .Llep-.Lgep
+    addis 5, 2, .LC0@toc@ha
+    addis 6, 2, .LC1@toc@ha
+    ld 5, .LC0@toc@l(5)
+    ld 6, .LC1@toc@l(6)
+    stw 3, 0(5)
+    stw 4, 0(6)
+    blr
+
+    .section .toc,"aw",@progbits
+.LC0:
+    .tc c[TC],c
+.LC1:
+    .tc d[TC],d
diff --git a/deps/lld/test/ELF/Inputs/ppc64-sort-small-cm-relocs-input3.s b/deps/lld/test/ELF/Inputs/ppc64-sort-small-cm-relocs-input3.s
new file mode 100644
index 0000000000000000000000000000000000000000..733bbb344a26c1c7aadcc21bdad1b8da902a8ef5
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/ppc64-sort-small-cm-relocs-input3.s
@@ -0,0 +1,41 @@
+    .text
+    .global getA
+    .type getA,@function
+getA:
+.LgepA:
+    addis 2, 12, .TOC.-.LgepA@ha
+    addi 2, 2, .TOC.-.LgepA@l
+.LlepA:
+    .localentry getA, .LlepA-.LgepA
+    ld 3, .LC0@toc(2)
+    lwa 3, 0(3)
+    blr
+
+    .global getB
+    .type getB,@function
+getB:
+.LgepB:
+    addis 2, 12, .TOC.-.LgepB@ha
+    addi 2, 2, .TOC.-.LgepB@l
+.LlepB:
+    .localentry getB, .LlepB-.LgepB
+    ld 3, .LC1@toc(2)
+    lwa 3, 0(3)
+    blr
+
+    .section .toc,"aw",@progbits
+.LC0:
+    .tc a[TC],a
+.LConst1:
+    .quad 0xa
+.LC1:
+    .tc b[TC],b
+.Lconst2:
+    .quad 0xaabbccddeeff
+
+    .type b,@object
+    .data
+    .global b
+b:
+    .long 22
+    .size b, 4
diff --git a/deps/lld/test/ELF/Inputs/ppc64-sort-small-cm-relocs-input4.s b/deps/lld/test/ELF/Inputs/ppc64-sort-small-cm-relocs-input4.s
new file mode 100644
index 0000000000000000000000000000000000000000..90f6e0fd6cf303d74e8a26a732ba66208e53befe
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/ppc64-sort-small-cm-relocs-input4.s
@@ -0,0 +1,18 @@
+    .text
+    .global getRodata
+    .type getRodata,@function
+getRodata:
+.Lgep:
+    addis 2, 12, .TOC.-.Lgep@ha
+    addi 2, 2, .TOC.-.Lgep@l
+.Llep:
+    .localentry     getRodata, .Llep-.Lgep
+    lwa 3, .LC0@toc(2)
+    blr
+
+    .section        .rodata,"aMS",@progbits,8
+    .quad _start
+
+    .section        .toc,"aw",@progbits
+.LC0:
+    .tc .rodata[TC], .rodata
diff --git a/deps/lld/test/ELF/Inputs/ppc64-toc-relax-shared.s b/deps/lld/test/ELF/Inputs/ppc64-toc-relax-shared.s
new file mode 100644
index 0000000000000000000000000000000000000000..4f65e4bcf27f8237e7861c55fb3cfdcecb27742f
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/ppc64-toc-relax-shared.s
@@ -0,0 +1,7 @@
+.data
+
+.type shared,@object
+.globl shared
+shared:
+  .long 8
+  .size shared, 4
diff --git a/deps/lld/test/ELF/Inputs/ppc64-toc-relax.s b/deps/lld/test/ELF/Inputs/ppc64-toc-relax.s
new file mode 100644
index 0000000000000000000000000000000000000000..6c7f3b5ddfa1914a4f4a9842a357d686fb33de92
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/ppc64-toc-relax.s
@@ -0,0 +1,15 @@
+.data
+
+.globl default, hidden
+.hidden hidden
+
+default:
+hidden:
+  .long 0
+
+.space 65532
+
+.globl hidden2
+.hidden hidden2
+hidden2:
+  .long 0
diff --git a/deps/lld/test/ELF/Inputs/print-icf.s b/deps/lld/test/ELF/Inputs/print-icf.s
index a67bee2f185c5bfb41603f8cc3a4baedabb3c94d..df9bcbc0989d778f5cb190240b9fea3719815c8a 100644
--- a/deps/lld/test/ELF/Inputs/print-icf.s
+++ b/deps/lld/test/ELF/Inputs/print-icf.s
@@ -1,9 +1,9 @@
-.section .text.f6, "ax"
-f6:
-  mov $60, %rax
-  mov $42, %rdi
-  syscall
-
-  .section .text.f7, "ax"
-f7:
-  mov $0, %rax
+.section .text.f6, "ax"
+f6:
+  mov $60, %rax
+  mov $42, %rdi
+  syscall
+
+  .section .text.f7, "ax"
+f7:
+  mov $0, %rax
diff --git a/deps/lld/test/ELF/Inputs/shf-info-link.test b/deps/lld/test/ELF/Inputs/shf-info-link.test
index b877969168e821ee42e88c40283405dae69954b9..a2cc2e87d875900a012ea04bfddf8984412b8671 100644
--- a/deps/lld/test/ELF/Inputs/shf-info-link.test
+++ b/deps/lld/test/ELF/Inputs/shf-info-link.test
@@ -17,5 +17,5 @@ Sections:
         Symbol:          foo
         Type:            R_X86_64_64
 Symbols:
-  Global:
-    - Name:            foo
+  - Name:            foo
+    Binding:         STB_GLOBAL
diff --git a/deps/lld/test/ELF/Inputs/vs-diagnostics-duplicate2.s b/deps/lld/test/ELF/Inputs/vs-diagnostics-duplicate2.s
new file mode 100644
index 0000000000000000000000000000000000000000..4edfae09258f183b499eb8b95ceef4227a9e1406
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/vs-diagnostics-duplicate2.s
@@ -0,0 +1,31 @@
+.global foo, bar
+
+.text
+foo:
+  nop
+
+.file 1 "duplicate2.s"
+.loc 1 20
+bar:
+  nop
+
+.section .debug_abbrev,"",@progbits
+  .byte  1                      # Abbreviation Code
+  .byte 17                      # DW_TAG_compile_unit
+  .byte  0                      # DW_CHILDREN_no
+  .byte 16                      # DW_AT_stmt_list
+  .byte 23                      # DW_FORM_sec_offset
+  .byte  0                      # EOM(1)
+  .byte  0                      # EOM(2)
+  .byte  0                      # EOM(3)
+
+.section .debug_info,"",@progbits
+  .long .Lend0 - .Lbegin0       # Length of Unit
+.Lbegin0:
+  .short 4                      # DWARF version number
+  .long  .debug_abbrev          # Offset Into Abbrev. Section
+  .byte  8                      # Address Size (in bytes)
+  .byte  1                      # Abbrev [1] 0xb:0x1f DW_TAG_compile_unit
+  .long  .debug_line            # DW_AT_stmt_list
+.Lend0:
+  .section .debug_line,"",@progbits
diff --git a/deps/lld/test/ELF/Inputs/vs-diagnostics-duplicate3.s b/deps/lld/test/ELF/Inputs/vs-diagnostics-duplicate3.s
new file mode 100644
index 0000000000000000000000000000000000000000..81829c82bf551556f80c3fa245740c23d4bfd834
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/vs-diagnostics-duplicate3.s
@@ -0,0 +1,6 @@
+.file "duplicate3.s"
+
+.global baz
+.text
+baz:
+  nop
diff --git a/deps/lld/test/ELF/Inputs/x86-64-cet1.s b/deps/lld/test/ELF/Inputs/x86-64-cet1.s
new file mode 100644
index 0000000000000000000000000000000000000000..ca0a368ce389079c7c2d8e5e2fa63d8af3704eb9
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/x86-64-cet1.s
@@ -0,0 +1,17 @@
+.section ".note.gnu.property", "a"
+.align 4
+.long 4
+.long 16
+.long 5
+.asciz "GNU"
+
+.long 0xc0000002
+.long 4
+.long 3
+.long 0
+
+.text
+.globl func2
+.type func2,@function
+func2:
+  ret
diff --git a/deps/lld/test/ELF/Inputs/x86-64-cet2.s b/deps/lld/test/ELF/Inputs/x86-64-cet2.s
new file mode 100644
index 0000000000000000000000000000000000000000..39a6291e56f859e50d7f3dd96a8810cb1baae10e
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/x86-64-cet2.s
@@ -0,0 +1,22 @@
+.section ".note.gnu.property", "a"
+.align 4
+.long 4
+.long 32
+.long 5
+.asciz "GNU"
+
+.long 0xc0000000
+.long 4
+.long 0
+.long 0
+
+.long 0xc0000002
+.long 4
+.long 3
+.long 0
+
+.text
+.globl func2
+.type func2,@function
+func2:
+  ret
diff --git a/deps/lld/test/ELF/Inputs/x86-64-cet3.s b/deps/lld/test/ELF/Inputs/x86-64-cet3.s
new file mode 100644
index 0000000000000000000000000000000000000000..cdec62a1948291296857cedf7f025df3456278f3
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/x86-64-cet3.s
@@ -0,0 +1,5 @@
+.text
+.globl func2
+.type func2,@function
+func2:
+  ret
diff --git a/deps/lld/test/ELF/Inputs/x86-64-cet4.s b/deps/lld/test/ELF/Inputs/x86-64-cet4.s
new file mode 100644
index 0000000000000000000000000000000000000000..85ddee299370c5464ee46c6bc1e77f2231a942f5
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/x86-64-cet4.s
@@ -0,0 +1,17 @@
+.section ".note.gnu.property", "a"
+.align 4
+.long 4
+.long 16
+.long 5
+.asciz "GNU"
+
+.long 0xc0000002
+.long 4
+.long 0xfffffffd
+.long 0
+
+.text
+.globl func2
+.type func2,@function
+func2:
+  ret
diff --git a/deps/lld/test/ELF/Inputs/x86-64-pcrel.s b/deps/lld/test/ELF/Inputs/x86-64-pcrel.s
new file mode 100644
index 0000000000000000000000000000000000000000..dea824ae719b7ca81b919a8030af9bbd12d81b1c
--- /dev/null
+++ b/deps/lld/test/ELF/Inputs/x86-64-pcrel.s
@@ -0,0 +1,8 @@
+.globl foo
+foo:
+
+.word _start - foo
+.fill 14,1,0xcc
+
+.byte _start - foo
+.fill 15,1,0xcc
diff --git a/deps/lld/test/ELF/Inputs/x86-64-reloc-16-error.s b/deps/lld/test/ELF/Inputs/x86-64-reloc-16-error.s
deleted file mode 100644
index 8deed64dbef895eb9a2c71f7b001e1bbb5cfdf23..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/Inputs/x86-64-reloc-16-error.s
+++ /dev/null
@@ -1,3 +0,0 @@
-.globl foo
-.hidden foo
-foo = 65536
diff --git a/deps/lld/test/ELF/Inputs/x86-64-reloc-16.s b/deps/lld/test/ELF/Inputs/x86-64-reloc-16.s
deleted file mode 100644
index c5b2f55360475950bb9562b706f6bb02b3bfd91c..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/Inputs/x86-64-reloc-16.s
+++ /dev/null
@@ -1,3 +0,0 @@
-.globl foo
-.hidden foo
-foo = 0x42
diff --git a/deps/lld/test/ELF/Inputs/x86-64-reloc-8-error.s b/deps/lld/test/ELF/Inputs/x86-64-reloc-8-error.s
deleted file mode 100644
index b6a7626456dc97206786eb17773a1918cd73341f..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/Inputs/x86-64-reloc-8-error.s
+++ /dev/null
@@ -1,3 +0,0 @@
-.globl foo
-.hidden foo
-foo = 256
diff --git a/deps/lld/test/ELF/Inputs/x86-64-reloc-8.s b/deps/lld/test/ELF/Inputs/x86-64-reloc-8.s
deleted file mode 100644
index c5b2f55360475950bb9562b706f6bb02b3bfd91c..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/Inputs/x86-64-reloc-8.s
+++ /dev/null
@@ -1,3 +0,0 @@
-.globl foo
-.hidden foo
-foo = 0x42
diff --git a/deps/lld/test/ELF/aarch64-abs16.s b/deps/lld/test/ELF/aarch64-abs16.s
index c9d88b31ae35ec2b0a7b2588d5b64cfdc68e95db..261413185c7c9894c24c389099132b7e5f221c25 100644
--- a/deps/lld/test/ELF/aarch64-abs16.s
+++ b/deps/lld/test/ELF/aarch64-abs16.s
@@ -20,8 +20,8 @@ _start:
 //         S + A = 0x8000
 // CHECK-NEXT: 210000 ffff0080
 
-// RUN: not ld.lld %t.o %t255.o -o %t2 2>&1 | FileCheck %s --check-prefix=OVERFLOW1
-// OVERFLOW1: relocation R_AARCH64_ABS16 out of range: -32769 is not in [-32768, 32767]
+// RUN: not ld.lld %t.o %t255.o -o /dev/null 2>&1 | FileCheck %s --check-prefix=OVERFLOW1
+// OVERFLOW1: relocation R_AARCH64_ABS16 out of range: -32769 is not in [-32768, 65535]
 
-// RUN: not ld.lld %t.o %t257.o -o %t2 2>&1 | FileCheck %s --check-prefix=OVERFLOW2
-// OVERFLOW2: relocation R_AARCH64_ABS16 out of range: 65536 is not in [-32768, 32767]
+// RUN: not ld.lld %t.o %t257.o -o /dev/null 2>&1 | FileCheck %s --check-prefix=OVERFLOW2
+// OVERFLOW2: relocation R_AARCH64_ABS16 out of range: 65536 is not in [-32768, 65535]
diff --git a/deps/lld/test/ELF/aarch64-abs32-dyn.s b/deps/lld/test/ELF/aarch64-abs32-dyn.s
new file mode 100644
index 0000000000000000000000000000000000000000..085fe15cba10546f753203097b98abc0b9fc78bf
--- /dev/null
+++ b/deps/lld/test/ELF/aarch64-abs32-dyn.s
@@ -0,0 +1,14 @@
+# REQUIRES: aarch64
+# RUN: llvm-mc -filetype=obj -triple=aarch64 %s -o %t.o
+# RUN: not ld.lld -shared %t.o -o /dev/null 2>&1 | FileCheck %s
+
+## Test we don't create R_AARCH64_RELATIVE.
+
+# CHECK: error: relocation R_AARCH64_ABS32 cannot be used against symbol hidden; recompile with -fPIC
+
+.globl hidden
+.hidden hidden
+hidden:
+
+.data
+.long hidden
diff --git a/deps/lld/test/ELF/aarch64-abs32.s b/deps/lld/test/ELF/aarch64-abs32.s
index da2005dc97a649e849e294aa025fdf2390c6bf83..7b697d3570ae5e50c04b01d8157bfa847002dd67 100644
--- a/deps/lld/test/ELF/aarch64-abs32.s
+++ b/deps/lld/test/ELF/aarch64-abs32.s
@@ -20,8 +20,8 @@ _start:
 //         S + A = 0x80000000
 // CHECK-NEXT: 210000 ffffffff 00000080
 
-// RUN: not ld.lld %t.o %t255.o -o %t2 2>&1 | FileCheck %s --check-prefix=OVERFLOW1
-// OVERFLOW1: relocation R_AARCH64_ABS32 out of range: -2147483649 is not in [-2147483648, 2147483647]
+// RUN: not ld.lld %t.o %t255.o -o /dev/null 2>&1 | FileCheck %s --check-prefix=OVERFLOW1
+// OVERFLOW1: relocation R_AARCH64_ABS32 out of range: -2147483649 is not in [-2147483648, 4294967295]
 
-// RUN: not ld.lld %t.o %t257.o -o %t2 2>&1 | FileCheck %s --check-prefix=OVERFLOW2
-// OVERFLOW2: relocation R_AARCH64_ABS32 out of range: 4294967296 is not in [-2147483648, 2147483647]
+// RUN: not ld.lld %t.o %t257.o -o /dev/null 2>&1 | FileCheck %s --check-prefix=OVERFLOW2
+// OVERFLOW2: relocation R_AARCH64_ABS32 out of range: 4294967296 is not in [-2147483648, 4294967295]
diff --git a/deps/lld/test/ELF/aarch64-abs64-dyn.s b/deps/lld/test/ELF/aarch64-abs64-dyn.s
index 2220225d5300550392a06396f27e1d1436d50623..dbaf3b9e8d4fd2ebf9985209ddb6db88935d7b19 100644
--- a/deps/lld/test/ELF/aarch64-abs64-dyn.s
+++ b/deps/lld/test/ELF/aarch64-abs64-dyn.s
@@ -14,7 +14,7 @@ bar:
         .xword bar
 
 // RUN: ld.lld -shared -o %t.so %t.o
-// RUN: llvm-readobj -symbols -dyn-relocations %t.so | FileCheck %s
+// RUN: llvm-readobj --symbols --dyn-relocations %t.so | FileCheck %s
 
 // CHECK:      Dynamic Relocations {
 // CHECK-NEXT:   {{.*}} R_AARCH64_RELATIVE - [[BAR_ADDR:.*]]
diff --git a/deps/lld/test/ELF/aarch64-bti-pac-cli-error.s b/deps/lld/test/ELF/aarch64-bti-pac-cli-error.s
new file mode 100644
index 0000000000000000000000000000000000000000..1ce7dde19dbb0278fd372665b894924fe82a91b7
--- /dev/null
+++ b/deps/lld/test/ELF/aarch64-bti-pac-cli-error.s
@@ -0,0 +1,12 @@
+# REQUIRES: x86
+# RUN: llvm-mc --triple=x86_64-pc-linux --filetype=obj -o %t.o %s
+# RUN: not ld.lld --pac-plt --force-bti %t.o -o %t 2>&1 | FileCheck %s
+#
+## Check that we error if --pac-plt and --force-bti are used when target is not
+## aarch64
+
+# CHECK: error: --pac-plt only supported on AArch64
+# CHECK-NEXT: error: --force-bti only supported on AArch64
+
+        .globl start
+start:  ret
diff --git a/deps/lld/test/ELF/aarch64-call26-thunk.s b/deps/lld/test/ELF/aarch64-call26-thunk.s
index 1ca079946842df52f0250c61f808807e233b2d0e..6e93b099ed999d9ec9e620b9b79031188f8972e4 100644
--- a/deps/lld/test/ELF/aarch64-call26-thunk.s
+++ b/deps/lld/test/ELF/aarch64-call26-thunk.s
@@ -10,6 +10,7 @@ _start:
     bl big
 
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // CHECK-NEXT:    210000:        02 00 00 94     bl      #8
 // CHECK: __AArch64AbsLongThunk_big:
diff --git a/deps/lld/test/ELF/aarch64-condb-reloc.s b/deps/lld/test/ELF/aarch64-condb-reloc.s
index b7fe7779def0c660d155068ce8af5012d9cf583f..6798c4e6688196fa3ed9d5bbb882ec7150f9e536 100644
--- a/deps/lld/test/ELF/aarch64-condb-reloc.s
+++ b/deps/lld/test/ELF/aarch64-condb-reloc.s
@@ -5,12 +5,13 @@
 # RUN: llvm-objdump -d %t | FileCheck %s
 # RUN: ld.lld -shared %t1 %t2 -o %t3
 # RUN: llvm-objdump -d %t3 | FileCheck -check-prefix=DSO %s
-# RUN: llvm-readobj -s -r %t3 | FileCheck -check-prefix=DSOREL %s
+# RUN: llvm-readobj -S -r %t3 | FileCheck -check-prefix=DSOREL %s
 
 # 0x11024 - 36 = 0x11000
 # 0x11028 - 24 = 0x11010
 # 0x1102c - 16 = 0x1101c
 # CHECK:      Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: _foo:
 # CHECK-NEXT:    210000: {{.*}} nop
 # CHECK-NEXT:    210004: {{.*}} nop
@@ -36,8 +37,8 @@
 #DSOREL-NEXT:     SHF_ALLOC
 #DSOREL-NEXT:     SHF_WRITE
 #DSOREL-NEXT:   ]
-#DSOREL-NEXT:   Address: 0x20000
-#DSOREL-NEXT:   Offset: 0x20000
+#DSOREL-NEXT:   Address: 0x30000
+#DSOREL-NEXT:   Offset: 0x30000
 #DSOREL-NEXT:   Size: 48
 #DSOREL-NEXT:   Link: 0
 #DSOREL-NEXT:   Info: 0
@@ -46,13 +47,14 @@
 #DSOREL-NEXT:  }
 #DSOREL:      Relocations [
 #DSOREL-NEXT:  Section ({{.*}}) .rela.plt {
-#DSOREL-NEXT:    0x20018 R_AARCH64_JUMP_SLOT _foo
-#DSOREL-NEXT:    0x20020 R_AARCH64_JUMP_SLOT _bar
-#DSOREL-NEXT:    0x20028 R_AARCH64_JUMP_SLOT _dah
+#DSOREL-NEXT:    0x30018 R_AARCH64_JUMP_SLOT _foo
+#DSOREL-NEXT:    0x30020 R_AARCH64_JUMP_SLOT _bar
+#DSOREL-NEXT:    0x30028 R_AARCH64_JUMP_SLOT _dah
 #DSOREL-NEXT:  }
 #DSOREL-NEXT:]
 
 #DSO:      Disassembly of section .text:
+#DSO-EMPTY:
 #DSO-NEXT: _foo:
 #DSO-NEXT:     10000: {{.*}} nop
 #DSO-NEXT:     10004: {{.*}} nop
@@ -69,10 +71,12 @@
 #DSO-NEXT:     10024: {{.*}} b.eq #44
 #DSO-NEXT:     10028: {{.*}} b.eq #56
 #DSO-NEXT:     1002c: {{.*}} b.eq #68
+#DSO-EMPTY:
 #DSO-NEXT: Disassembly of section .plt:
+#DSO-EMPTY:
 #DSO-NEXT: .plt:
 #DSO-NEXT:     10030: {{.*}} stp x16, x30, [sp, #-16]!
-#DSO-NEXT:     10034: {{.*}} adrp x16, #65536
+#DSO-NEXT:     10034: {{.*}} adrp x16, #131072
 #DSO-NEXT:     10038: {{.*}} ldr x17, [x16, #16]
 #DSO-NEXT:     1003c: {{.*}} add x16, x16, #16
 #DSO-NEXT:     10040: {{.*}} br x17
@@ -81,19 +85,19 @@
 #DSO-NEXT:     1004c: {{.*}} nop
 #DSO-EMPTY:
 #DSO-NEXT:   _foo@plt:
-#DSO-NEXT:     10050: {{.*}} adrp x16, #65536
+#DSO-NEXT:     10050: {{.*}} adrp x16, #131072
 #DSO-NEXT:     10054: {{.*}} ldr x17, [x16, #24]
 #DSO-NEXT:     10058: {{.*}} add x16, x16, #24
 #DSO-NEXT:     1005c: {{.*}} br x17
 #DSO-EMPTY:
 #DSO-NEXT:   _bar@plt:
-#DSO-NEXT:     10060: {{.*}} adrp x16, #65536
+#DSO-NEXT:     10060: {{.*}} adrp x16, #131072
 #DSO-NEXT:     10064: {{.*}} ldr x17, [x16, #32]
 #DSO-NEXT:     10068: {{.*}} add x16, x16, #32
 #DSO-NEXT:     1006c: {{.*}} br x17
 #DSO-EMPTY:
 #DSO-NEXT:   _dah@plt:
-#DSO-NEXT:     10070: {{.*}} adrp x16, #65536
+#DSO-NEXT:     10070: {{.*}} adrp x16, #131072
 #DSO-NEXT:     10074: {{.*}} ldr x17, [x16, #40]
 #DSO-NEXT:     10078: {{.*}} add x16, x16, #40
 #DSO-NEXT:     1007c: {{.*}} br x17
diff --git a/deps/lld/test/ELF/aarch64-copy.s b/deps/lld/test/ELF/aarch64-copy.s
index 5a42c8db4796e00e670908cf3989663847d96569..31f47a77d9a9166b48a0cefb558de527214a859d 100644
--- a/deps/lld/test/ELF/aarch64-copy.s
+++ b/deps/lld/test/ELF/aarch64-copy.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=aarch64-pc-freebsd %p/Inputs/relocation-copy.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -soname fixed-length-string.so -o %t2.so
 // RUN: ld.lld %t.o %t2.so -o %t3
-// RUN: llvm-readobj -s -r --expand-relocs -symbols %t3 | FileCheck %s
+// RUN: llvm-readobj -S -r --expand-relocs --symbols %t3 | FileCheck %s
 // RUN: llvm-objdump -d %t3 | FileCheck -check-prefix=CODE %s
 // RUN: llvm-objdump -s -section=.rodata %t3 | FileCheck -check-prefix=RODATA %s
 
@@ -77,6 +77,7 @@ _start:
 // CHECK: ]
 
 // CODE: Disassembly of section .text:
+// CODE-EMPTY:
 // CODE-NEXT: _start:
 // S(x) = 0x230000, A = 0, P = 0x210000
 // S + A - P = 0x20000 = 131072
@@ -90,4 +91,4 @@ _start:
 
 // RODATA: Contents of section .rodata:
 // S(z) = 0x230014
-// RODATA-NEXT:  2002e0 14002300
+// RODATA-NEXT:  200318 14002300
diff --git a/deps/lld/test/ELF/aarch64-copy2.s b/deps/lld/test/ELF/aarch64-copy2.s
deleted file mode 100644
index 5324c74d47dbf437a5503fc2fe13abf0071ec62c..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/aarch64-copy2.s
+++ /dev/null
@@ -1,27 +0,0 @@
-// REQUIRES: aarch64
-// RUN: llvm-mc %s -o %t.o -filetype=obj -triple=aarch64-pc-linux
-// RUN: llvm-mc %p/Inputs/aarch64-copy2.s -o %t2.o -filetype=obj -triple=aarch64-pc-linux
-// RUN: ld.lld %t2.o -o %t2.so -shared
-// RUN: ld.lld %t.o %t2.so -o %t
-// RUN: llvm-readobj -t %t | FileCheck %s
-
-        .global _start
-_start:
-        adrp    x8, foo
-        bl bar
-
-// CHECK:      Name: bar
-// CHECK-NEXT: Value: 0x0
-// CHECK-NEXT: Size: 0
-// CHECK-NEXT: Binding: Global
-// CHECK-NEXT: Type: None
-// CHECK-NEXT: Other: 0
-// CHECK-NEXT: Section: Undefined
-
-// CHECK:      Name: foo
-// CHECK-NEXT: Value: 0x210030
-// CHECK-NEXT: Size: 0
-// CHECK-NEXT: Binding: Global
-// CHECK-NEXT: Type: Function
-// CHECK-NEXT: Other: 0
-// CHECK-NEXT: Section: Undefined
diff --git a/deps/lld/test/ELF/aarch64-cortex-a53-843419-large.s b/deps/lld/test/ELF/aarch64-cortex-a53-843419-large.s
index c9021775337afad3460e240f028ed7eae1314615..37e6af52234cfa102e76afad01eeee319a2904fe 100644
--- a/deps/lld/test/ELF/aarch64-cortex-a53-843419-large.s
+++ b/deps/lld/test/ELF/aarch64-cortex-a53-843419-large.s
@@ -42,7 +42,7 @@ t3_ff8_ldr:
         ret
 
 // CHECK3: t3_ff8_ldr:
-// CHECK3-NEXT:    211ff8:       60 00 04 f0     adrp    x0, #134279168
+// CHECK3-NEXT:    211ff8:       e0 00 04 f0     adrp    x0, #134344704
 // CHECK3-NEXT:    211ffc:       21 00 40 f9     ldr     x1, [x1]
 // CHECK3-NEXT:    212000:       02 08 80 15     b       #100671496
 // CHECK3-NEXT:    212004:       c0 03 5f d6     ret
@@ -63,7 +63,7 @@ t3_ff8_str:
         ret
 
 // CHECK4: t3_ff8_str:
-// CHECK4-NEXT:  4213ff8:       60 00 02 b0     adrp    x0, #67162112
+// CHECK4-NEXT:  4213ff8:       e0 00 02 b0     adrp    x0, #67227648
 // CHECK4-NEXT:  4213ffc:       21 00 40 f9     ldr     x1, [x1]
 // CHECK4-NEXT:  4214000:       04 00 80 14     b       #33554448
 // CHECK4-NEXT:  4214004:       c0 03 5f d6     ret
@@ -102,7 +102,7 @@ t3_ffc_ldr:
         ret
 
 // CHECK7: t3_ffc_ldr:
-// CHECK7-NEXT:  8211ffc:       60 00 00 f0     adrp    x0, #61440
+// CHECK7-NEXT:  8211ffc:       e0 00 00 f0     adrp    x0, #126976
 // CHECK7-NEXT:  8212000:       21 00 40 f9     ldr     x1, [x1]
 // CHECK7-NEXT:  8212004:       02 00 00 14     b       #8
 // CHECK7-NEXT:  8212008:       c0 03 5f d6     ret
diff --git a/deps/lld/test/ELF/aarch64-cortex-a53-843419-recognize.s b/deps/lld/test/ELF/aarch64-cortex-a53-843419-recognize.s
index cde35919806e18412acac8c4c921eab243f177e5..64d8c1f3a86ba35df05b98ff8318e6c02e08b5f6 100644
--- a/deps/lld/test/ELF/aarch64-cortex-a53-843419-recognize.s
+++ b/deps/lld/test/ELF/aarch64-cortex-a53-843419-recognize.s
@@ -28,7 +28,7 @@
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 211FF8 in unpatched output.
 // CHECK: t3_ff8_ldr:
-// CHECK-NEXT:    211ff8:        e0 01 00 f0     adrp    x0, #258048
+// CHECK-NEXT:    211ff8:        60 02 00 f0     adrp    x0, #323584
 // CHECK-NEXT:    211ffc:        21 00 40 f9     ldr             x1, [x1]
 // CHECK-FIX:     212000:        03 c8 00 14     b       #204812
 // CHECK-NOFIX:   212000:        00 00 40 f9     ldr             x0, [x0]
@@ -46,7 +46,7 @@ t3_ff8_ldr:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 213FF8 in unpatched output.
 // CHECK: t3_ff8_ldrsimd:
-// CHECK-NEXT:    213ff8:        e0 01 00 b0     adrp    x0, #249856
+// CHECK-NEXT:    213ff8:        60 02 00 b0     adrp    x0, #315392
 // CHECK-NEXT:    213ffc:        21 00 40 bd     ldr             s1, [x1]
 // CHECK-FIX:     214000:        05 c0 00 14     b       #196628
 // CHECK-NOFIX:   214000:        02 04 40 f9     ldr     x2, [x0, #8]
@@ -64,7 +64,7 @@ t3_ff8_ldrsimd:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 215FFC in unpatched output.
 // CHECK: t3_ffc_ldrpost:
-// CHECK-NEXT:    215ffc:        c0 01 00 f0     adrp    x0, #241664
+// CHECK-NEXT:    215ffc:        40 02 00 f0     adrp    x0, #307200
 // CHECK-NEXT:    216000:        21 84 40 bc     ldr     s1, [x1], #8
 // CHECK-FIX:     216004:        06 b8 00 14     b       #188440
 // CHECK-NOFIX:   216004:        03 08 40 f9     ldr     x3, [x0, #16]
@@ -82,7 +82,7 @@ t3_ffc_ldrpost:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 217FF8 in unpatched output.
 // CHECK: t3_ff8_strpre:
-// CHECK-NEXT:    217ff8:        c0 01 00 b0     adrp    x0, #233472
+// CHECK-NEXT:    217ff8:        40 02 00 b0     adrp    x0, #299008
 // CHECK-NEXT:    217ffc:        21 8c 00 bc     str     s1, [x1, #8]!
 // CHECK-FIX:     218000:        09 b0 00 14     b       #180260
 // CHECK-NOFIX:   218000:        02 00 40 f9     ldr             x2, [x0]
@@ -100,7 +100,7 @@ t3_ff8_strpre:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 219FFC in unpatched output.
 // CHECK: t3_ffc_str:
-// CHECK-NEXT:    219ffc:        bc 01 00 f0     adrp    x28, #225280
+// CHECK-NEXT:    219ffc:        3c 02 00 f0     adrp    x28, #290816
 // CHECK-NEXT:    21a000:        42 00 00 f9     str             x2, [x2]
 // CHECK-FIX:     21a004:        0a a8 00 14     b       #172072
 // CHECK-NOFIX:   21a004:        9c 07 00 f9     str     x28, [x28, #8]
@@ -118,7 +118,7 @@ t3_ffc_str:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 21BFFC in unpatched output.
 // CHECK: t3_ffc_strsimd:
-// CHECK-NEXT:    21bffc:        bc 01 00 b0     adrp    x28, #217088
+// CHECK-NEXT:    21bffc:        3c 02 00 b0     adrp    x28, #282624
 // CHECK-NEXT:    21c000:        44 00 00 b9     str             w4, [x2]
 // CHECK-FIX:     21c004:        0c a0 00 14     b       #163888
 // CHECK-NOFIX:   21c004:        84 0b 00 f9     str     x4, [x28, #16]
@@ -136,7 +136,7 @@ t3_ffc_strsimd:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 21DFF8 in unpatched output.
 // CHECK: t3_ff8_ldrunpriv:
-// CHECK-NEXT:    21dff8:        9d 01 00 f0     adrp    x29, #208896
+// CHECK-NEXT:    21dff8:        1d 02 00 f0     adrp    x29, #274432
 // CHECK-NEXT:    21dffc:        41 08 40 38     ldtrb           w1, [x2]
 // CHECK-FIX:     21e000:        0f 98 00 14     b       #155708
 // CHECK-NOFIX:   21e000:        bd 03 40 f9     ldr             x29, [x29]
@@ -154,7 +154,7 @@ t3_ff8_ldrunpriv:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 21FFFC in unpatched output.
 // CHECK: t3_ffc_ldur:
-// CHECK-NEXT:    21fffc:        9d 01 00 b0     adrp    x29, #200704
+// CHECK-NEXT:    21fffc:        1d 02 00 b0     adrp    x29, #266240
 // CHECK-NEXT:    220000:        42 40 40 b8     ldur    w2, [x2, #4]
 // CHECK-FIX:     220004:        10 90 00 14     b       #147520
 // CHECK-NOFIX:   220004:        bd 07 40 f9     ldr     x29, [x29, #8]
@@ -171,7 +171,7 @@ t3_ffc_ldur:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 221FFC in unpatched output.
 // CHECK: t3_ffc_sturh:
-// CHECK-NEXT:    221ffc:        72 01 00 f0     adrp    x18, #192512
+// CHECK-NEXT:    221ffc:        f2 01 00 f0     adrp    x18, #258048
 // CHECK-NEXT:    222000:        43 40 00 78     sturh   w3, [x2, #4]
 // CHECK-FIX:     222004:        12 88 00 14     b       #139336
 // CHECK-NOFIX:   222004:        41 0a 40 f9     ldr     x1, [x18, #16]
@@ -189,7 +189,7 @@ t3_ffc_sturh:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 223FF8 in unpatched output.
 // CHECK: t3_ff8_literal:
-// CHECK-NEXT:    223ff8:        72 01 00 b0     adrp    x18, #184320
+// CHECK-NEXT:    223ff8:        f2 01 00 b0     adrp    x18, #249856
 // CHECK-NEXT:    223ffc:        e3 ff ff 58     ldr     x3, #-4
 // CHECK-FIX:     224000:        15 80 00 14     b       #131156
 // CHECK-NOFIX:   224000:        52 02 40 f9     ldr             x18, [x18]
@@ -207,7 +207,7 @@ t3_ff8_literal:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 225FFC in unpatched output.
 // CHECK: t3_ffc_register:
-// CHECK-NEXT:    225ffc:        4f 01 00 f0     adrp    x15, #176128
+// CHECK-NEXT:    225ffc:        cf 01 00 f0     adrp    x15, #241664
 // CHECK-NEXT:    226000:        43 68 61 f8     ldr             x3, [x2, x1]
 // CHECK-FIX:     226004:        16 78 00 14     b       #122968
 // CHECK-NOFIX:   226004:        ea 05 40 f9     ldr     x10, [x15, #8]
@@ -225,7 +225,7 @@ t3_ffc_register:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 227FF8 in unpatched output.
 // CHECK: t3_ff8_stp:
-// CHECK-NEXT:    227ff8:        50 01 00 b0     adrp    x16, #167936
+// CHECK-NEXT:    227ff8:        d0 01 00 b0     adrp    x16, #233472
 // CHECK-NEXT:    227ffc:        61 08 00 a9     stp             x1, x2, [x3]
 // CHECK-FIX:     228000:        19 70 00 14     b       #114788
 // CHECK-NOFIX:   228000:        0d 0a 40 f9     ldr     x13, [x16, #16]
@@ -243,7 +243,7 @@ t3_ff8_stp:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 229FFC in unpatched output.
 // CHECK: t3_ffc_stnp:
-// CHECK-NEXT:    229ffc:        27 01 00 f0     adrp    x7, #159744
+// CHECK-NEXT:    229ffc:        a7 01 00 f0     adrp    x7, #225280
 // CHECK-NEXT:    22a000:        61 08 00 a8     stnp            x1, x2, [x3]
 // CHECK-FIX:     22a004:        1a 68 00 14     b       #106600
 // CHECK-NOFIX:   22a004:        e9 00 40 f9     ldr             x9, [x7]
@@ -261,7 +261,7 @@ t3_ffc_stnp:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 22BFFC in unpatched output.
 // CHECK: t3_ffc_st1singlepost:
-// CHECK-NEXT:    22bffc:        37 01 00 b0     adrp    x23, #151552
+// CHECK-NEXT:    22bffc:        b7 01 00 b0     adrp    x23, #217088
 // CHECK-NEXT:    22c000:        20 04 82 0d     st1 { v0.b }[1], [x1], x2
 // CHECK-FIX:     22c004:        1c 60 00 14     b       #98416
 // CHECK-NOFIX:   22c004:        f6 06 40 f9     ldr     x22, [x23, #8]
@@ -279,7 +279,7 @@ t3_ffc_st1singlepost:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 22DFF8 in unpatched output.
 // CHECK: t3_ff8_st1multiple:
-// CHECK-NEXT:    22dff8:        17 01 00 f0     adrp    x23, #143360
+// CHECK-NEXT:    22dff8:        97 01 00 f0     adrp    x23, #208896
 // CHECK-NEXT:    22dffc:        20 a0 00 4c     st1     { v0.16b, v1.16b }, [x1]
 // CHECK-FIX:     22e000:        1f 58 00 14     b       #90236
 // CHECK-NOFIX:   22e000:        f8 0a 40 f9     ldr     x24, [x23, #16]
@@ -297,7 +297,7 @@ t3_ff8_st1multiple:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 22FFF8 in unpatched output.
 // CHECK: t4_ff8_ldr:
-// CHECK-NEXT:    22fff8:        00 01 00 b0     adrp    x0, #135168
+// CHECK-NEXT:    22fff8:        80 01 00 b0     adrp    x0, #200704
 // CHECK-NEXT:    22fffc:        21 00 40 f9     ldr             x1, [x1]
 // CHECK-NEXT:    230000:        42 00 00 8b     add             x2, x2, x0
 // CHECK-FIX:     230004:        20 50 00 14     b       #82048
@@ -317,7 +317,7 @@ t4_ff8_ldr:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 231FFC in unpatched output.
 // CHECK: t4_ffc_str:
-// CHECK-NEXT:    231ffc:        fc 00 00 f0     adrp    x28, #126976
+// CHECK-NEXT:    231ffc:        7c 01 00 f0     adrp    x28, #192512
 // CHECK-NEXT:    232000:        42 00 00 f9     str             x2, [x2]
 // CHECK-NEXT:    232004:        20 00 02 cb     sub             x0, x1, x2
 // CHECK-FIX:     232008:        21 48 00 14     b       #73860
@@ -337,7 +337,7 @@ t4_ffc_str:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 233FF8 in unpatched output.
 // CHECK: t4_ff8_stp:
-// CHECK-NEXT:    233ff8:        f0 00 00 b0     adrp    x16, #118784
+// CHECK-NEXT:    233ff8:        70 01 00 b0     adrp    x16, #184320
 // CHECK-NEXT:    233ffc:        61 08 00 a9     stp             x1, x2, [x3]
 // CHECK-NEXT:    234000:        03 7e 10 9b     mul             x3, x16, x16
 // CHECK-FIX:     234004:        24 40 00 14     b       #65680
@@ -357,7 +357,7 @@ t4_ff8_stp:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 235FF8 in unpatched output.
 // CHECK: t4_ff8_stppre:
-// CHECK-NEXT:    235ff8:        d0 00 00 f0     adrp    x16, #110592
+// CHECK-NEXT:    235ff8:        50 01 00 f0     adrp    x16, #176128
 // CHECK-NEXT:    235ffc:        61 08 81 a9     stp     x1, x2, [x3, #16]!
 // CHECK-NEXT:    236000:        03 7e 10 9b     mul             x3, x16, x16
 // CHECK-FIX:     236004:        26 38 00 14     b       #57496
@@ -377,7 +377,7 @@ t4_ff8_stppre:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 237FF8 in unpatched output.
 // CHECK: t4_ff8_stppost:
-// CHECK-NEXT:    237ff8:        d0 00 00 b0     adrp    x16, #102400
+// CHECK-NEXT:    237ff8:        50 01 00 b0     adrp    x16, #167936
 // CHECK-NEXT:    237ffc:        61 08 81 a8     stp     x1, x2, [x3], #16
 // CHECK-NEXT:    238000:        03 7e 10 9b     mul             x3, x16, x16
 // CHECK-FIX:     238004:        28 30 00 14     b       #49312
@@ -397,7 +397,7 @@ t4_ff8_stppost:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 239FFC in unpatched output.
 // CHECK: t4_ffc_stpsimd:
-// CHECK-NEXT:    239ffc:        b0 00 00 f0     adrp    x16, #94208
+// CHECK-NEXT:    239ffc:        30 01 00 f0     adrp    x16, #159744
 // CHECK-NEXT:    23a000:        61 08 00 ad     stp             q1, q2, [x3]
 // CHECK-NEXT:    23a004:        03 7e 10 9b     mul             x3, x16, x16
 // CHECK-FIX:     23a008:        29 28 00 14     b       #41124
@@ -417,7 +417,7 @@ t4_ffc_stpsimd:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 23BFFC in unpatched output.
 // CHECK: t4_ffc_stnp:
-// CHECK-NEXT:    23bffc:        a7 00 00 b0     adrp    x7, #86016
+// CHECK-NEXT:    23bffc:        27 01 00 b0     adrp    x7, #151552
 // CHECK-NEXT:    23c000:        61 08 00 a8     stnp            x1, x2, [x3]
 // CHECK-NEXT:    23c004:        1f 20 03 d5     nop
 // CHECK-FIX:     23c008:        2b 20 00 14     b       #32940
@@ -437,7 +437,7 @@ t4_ffc_stnp:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 23DFFC in unpatched output.
 // CHECK: t4_ffc_st1:
-// CHECK-NEXT:    23dffc:        98 00 00 f0     adrp    x24, #77824
+// CHECK-NEXT:    23dffc:        18 01 00 f0     adrp    x24, #143360
 // CHECK-NEXT:    23e000:        20 80 00 4d     st1 { v0.s }[2], [x1]
 // CHECK-NEXT:    23e004:        f6 06 40 f9     ldr     x22, [x23, #8]
 // CHECK-FIX:     23e008:        2d 18 00 14     b       #24756
@@ -457,7 +457,7 @@ t4_ffc_st1:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 23FFF8 in unpatched output.
 // CHECK: t3_ff8_ldr_once:
-// CHECK-NEXT:    23fff8:        80 00 00 b0     adrp    x0, #69632
+// CHECK-NEXT:    23fff8:        00 01 00 b0     adrp    x0, #135168
 // CHECK-NEXT:    23fffc:        20 70 82 4c     st1     { v0.16b }, [x1], x2
 // CHECK-FIX:     240000:        31 10 00 14     b       #16580
 // CHECK-NOFIX:   240000:        01 08 40 f9     ldr     x1, [x0, #16]
@@ -477,7 +477,7 @@ t3_ff8_ldr_once:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 241FF8 in unpatched output.
 // CHECK: t3_ff8_ldxr:
-// CHECK-NEXT:    241ff8:        60 00 00 f0     adrp    x0, #61440
+// CHECK-NEXT:    241ff8:        e0 00 00 f0     adrp    x0, #126976
 // CHECK-NEXT:    241ffc:        03 7c 5f c8     ldxr    x3, [x0]
 // CHECK-FIX:     242000:        33 08 00 14     b       #8396
 // CHECK-NOFIX:   242000:        01 08 40 f9     ldr     x1, [x0, #16]
@@ -497,7 +497,7 @@ t3_ff8_ldxr:
 
 // CHECK-PRINT: detected cortex-a53-843419 erratum sequence starting at 243FF8 in unpatched output.
 // CHECK: t3_ff8_stxr:
-// CHECK-NEXT:    243ff8:        60 00 00 b0     adrp    x0, #53248
+// CHECK-NEXT:    243ff8:        e0 00 00 b0     adrp    x0, #118784
 // CHECK-NEXT:    243ffc:        03 7c 04 c8     stxr    w4, x3, [x0]
 // CHECK-FIX:     244000:        35 00 00 14     b       #212
 // CHECK-NOFIX:   244000:        01 08 40 f9     ldr     x1, [x0, #16]
diff --git a/deps/lld/test/ELF/aarch64-cortex-a53-843419-thunk.s b/deps/lld/test/ELF/aarch64-cortex-a53-843419-thunk.s
index c802f3f605f1300b122fcbe74e31581ea039785a..dac644f930bf1717a07eedeffbc955e093c7e3a3 100644
--- a/deps/lld/test/ELF/aarch64-cortex-a53-843419-thunk.s
+++ b/deps/lld/test/ELF/aarch64-cortex-a53-843419-thunk.s
@@ -44,7 +44,7 @@ t3_ff8_ldr:
 // CHECK-NEXT:    11004:        02 00 00 14     b       #8
 // CHECK-NEXT:    11008:        c0 03 5f d6     ret
 // CHECK: __CortexA53843419_11004:
-// CHECK-NEXT:    1100c:        00 08 40 f9     ldr     x0, [x0, #16]
+// CHECK-NEXT:    1100c:        00 04 40 f9     ldr     x0, [x0, #8]
 // CHECK-NEXT:    11010:        fe ff ff 17     b       #-8
 
         .section .text.04, "ax", %progbits
diff --git a/deps/lld/test/ELF/aarch64-cortex-a53-843419-tlsrelax.s b/deps/lld/test/ELF/aarch64-cortex-a53-843419-tlsrelax.s
index 2db5c7e36bbcee9286bac196a20fc605780b2610..bff72d3725f4cbcb56b6333675bf50d4dc5d5e7f 100644
--- a/deps/lld/test/ELF/aarch64-cortex-a53-843419-tlsrelax.s
+++ b/deps/lld/test/ELF/aarch64-cortex-a53-843419-tlsrelax.s
@@ -26,9 +26,9 @@ _start:
 // CHECK: _start:
 // CHECK-NEXT:   210ff8:        41 d0 3b d5     mrs     x1, TPIDR_EL0
 // CHECK-NEXT:   210ffc:        00 00 a0 d2     movz    x0, #0, lsl #16
-// CHECK-NEXT:   211000:        01 08 80 f2     movk    x1, #64
+// CHECK-NEXT:   211000:        01 02 80 f2     movk    x1, #16
 // CHECK-NEXT:   211004:        00 00 a0 d2     movz    x0, #0, lsl #16
-// CHECK-NEXT:   211008:        01 08 80 f2     movk    x1, #64
+// CHECK-NEXT:   211008:        01 02 80 f2     movk    x1, #16
 // CHECK-NEXT:   21100c:        c0 03 5f d6     ret
 
  .type  v,@object
diff --git a/deps/lld/test/ELF/aarch64-feature-bti.s b/deps/lld/test/ELF/aarch64-feature-bti.s
new file mode 100644
index 0000000000000000000000000000000000000000..7ccf59274bd7efa4faf3b8ba290a1d46764813eb
--- /dev/null
+++ b/deps/lld/test/ELF/aarch64-feature-bti.s
@@ -0,0 +1,218 @@
+# REQUIRES: aarch64
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %s -o %t.o
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %p/Inputs/aarch64-bti1.s -o %t1.o
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %p/Inputs/aarch64-func3.s -o %t2.o
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %p/Inputs/aarch64-func3-bti.s -o %t3.o
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %p/Inputs/aarch64-func2.s -o %tno.o
+
+## We do not add BTI support when the inputs don't have the .note.gnu.property
+## field.
+
+# RUN: ld.lld %tno.o %t3.o --shared -o %tno.so
+# RUN: llvm-objdump -d -mattr=+bti --no-show-raw-insn %tno.so | FileCheck --check-prefix=NOBTI %s
+# RUN: llvm-readelf -x .got.plt %tno.so | FileCheck --check-prefix SOGOTPLT %s
+# RUN: llvm-readelf --dynamic-table %tno.so | FileCheck --check-prefix NOBTIDYN %s
+
+# NOBTIDYN-NOT:   0x0000000070000001 (AARCH64_BTI_PLT)
+# NOBTIDYN-NOT:   0x0000000070000003 (AARCH64_PAC_PLT)
+
+# NOBTI: 0000000000010000 func2:
+# NOBTI-NEXT:    10000: bl      #48 <func3@plt>
+# NOBTI-NEXT:    10004: ret
+# NOBTI: Disassembly of section .plt:
+# NOBTI: 0000000000010010 .plt:
+# NOBTI-NEXT:    10010: stp     x16, x30, [sp, #-16]!
+# NOBTI-NEXT:    10014: adrp    x16, #131072
+# NOBTI-NEXT:    10018: ldr     x17, [x16, #16]
+# NOBTI-NEXT:    1001c: add     x16, x16, #16
+# NOBTI-NEXT:    10020: br      x17
+# NOBTI-NEXT:    10024: nop
+# NOBTI-NEXT:    10028: nop
+# NOBTI-NEXT:    1002c: nop
+# NOBTI: 0000000000010030 func3@plt:
+# NOBTI-NEXT:    10030: adrp    x16, #131072
+# NOBTI-NEXT:    10034: ldr     x17, [x16, #24]
+# NOBTI-NEXT:    10038: add     x16, x16, #24
+# NOBTI-NEXT:    1003c: br      x17
+
+## Expect a bti c at the start of plt[0], the plt entries do not need bti c as
+## their address doesn't escape the shared object, so they can't be indirectly
+## called. Expect no other difference.
+
+# RUN: ld.lld %t1.o %t3.o --shared -o %t.so
+# RUN: llvm-readelf -n %t.so | FileCheck --check-prefix BTIPROP %s
+# RUN: llvm-objdump -d -mattr=+bti --no-show-raw-insn %t.so | FileCheck --check-prefix BTISO %s
+# RUN: llvm-readelf -x .got.plt %t.so | FileCheck --check-prefix SOGOTPLT %s
+# RUN: llvm-readelf --dynamic-table %t.so | FileCheck --check-prefix BTIDYN %s
+
+# BTIPROP: Properties:    aarch64 feature: BTI
+
+# BTIDYN:      0x0000000070000001 (AARCH64_BTI_PLT)
+# BTIDYN-NOT:  0x0000000070000003 (AARCH64_PAC_PLT)
+
+# BTISO: 0000000000010000 func2:
+# BTISO-NEXT:    10000: bl      #48 <func3@plt>
+# BTISO-NEXT:    10004: ret
+# BTISO: Disassembly of section .plt:
+# BTISO: 0000000000010010 .plt:
+# BTISO-NEXT:    10010: bti     c
+# BTISO-NEXT:    10014: stp     x16, x30, [sp, #-16]!
+# BTISO-NEXT:    10018: adrp    x16, #131072
+# BTISO-NEXT:    1001c: ldr     x17, [x16, #16]
+# BTISO-NEXT:    10020: add     x16, x16, #16
+# BTISO-NEXT:    10024: br      x17
+# BTISO-NEXT:    10028: nop
+# BTISO-NEXT:    1002c: nop
+# BTISO: 0000000000010030 func3@plt:
+# BTISO-NEXT:    10030: adrp    x16, #131072
+# BTISO-NEXT:    10034: ldr     x17, [x16, #24]
+# BTISO-NEXT:    10038: add     x16, x16, #24
+# BTISO-NEXT:    1003c: br      x17
+
+## The .got.plt should be identical between the BTI and no BTI DSO PLT.
+# SOGOTPLT: Hex dump of section '.got.plt'
+# SOGOTPLT-NEXT:  0x00030000 00000000 00000000 00000000 00000000
+# SOGOTPLT-NEXT:  0x00030010 00000000 00000000 10000100 00000000
+
+## Build an executable with all relocatable inputs having the BTI
+## .note.gnu.property. We expect a bti c in front of all PLT entries as the
+## address of a PLT entry can escape an executable.
+
+# RUN: ld.lld %t2.o --shared -o %t2.so
+
+# RUN: ld.lld %t.o %t.so %t2.so -o %t.exe
+# RUN: llvm-readelf --dynamic-table -n %t.exe | FileCheck --check-prefix=BTIPROP %s
+# RUN: llvm-objdump -d -mattr=+bti --no-show-raw-insn %t.exe | FileCheck --check-prefix=EXECBTI %s
+
+# EXECBTI: Disassembly of section .text:
+# EXECBTI: 0000000000210000 func1:
+# EXECBTI-NEXT:   210000: bl      #48 <func2@plt>
+# EXECBTI-NEXT:   210004: ret
+# EXECBTI: Disassembly of section .plt:
+# EXECBTI: 0000000000210010 .plt:
+# EXECBTI-NEXT:   210010: bti     c
+# EXECBTI-NEXT:   210014: stp     x16, x30, [sp, #-16]!
+# EXECBTI-NEXT:   210018: adrp    x16, #131072
+# EXECBTI-NEXT:   21001c: ldr     x17, [x16, #16]
+# EXECBTI-NEXT:   210020: add     x16, x16, #16
+# EXECBTI-NEXT:   210024: br      x17
+# EXECBTI-NEXT:   210028: nop
+# EXECBTI-NEXT:   21002c: nop
+# EXECBTI: 0000000000210030 func2@plt:
+# EXECBTI-NEXT:   210030: bti     c
+# EXECBTI-NEXT:   210034: adrp    x16, #131072
+# EXECBTI-NEXT:   210038: ldr     x17, [x16, #24]
+# EXECBTI-NEXT:   21003c: add     x16, x16, #24
+# EXECBTI-NEXT:   210040: br      x17
+# EXECBTI-NEXT:   210044: nop
+
+## We expect the same for PIE, as the address of an ifunc can escape
+# RUN: ld.lld --pie %t.o %t.so %t2.so -o %tpie.exe
+# RUN: llvm-readelf -n %tpie.exe | FileCheck --check-prefix=BTIPROP %s
+# RUN: llvm-readelf --dynamic-table -n %tpie.exe | FileCheck --check-prefix=BTIPROP %s
+# RUN: llvm-objdump -d -mattr=+bti --no-show-raw-insn %tpie.exe | FileCheck --check-prefix=PIE %s
+
+# PIE: Disassembly of section .text:
+# PIE: 0000000000010000 func1:
+# PIE-NEXT:    10000: bl      #48 <func2@plt>
+# PIE-NEXT:    10004: ret
+# PIE: Disassembly of section .plt:
+# PIE: 0000000000010010 .plt:
+# PIE-NEXT:    10010: bti     c
+# PIE-NEXT:    10014: stp     x16, x30, [sp, #-16]!
+# PIE-NEXT:    10018: adrp    x16, #131072
+# PIE-NEXT:    1001c: ldr     x17, [x16, #16]
+# PIE-NEXT:    10020: add     x16, x16, #16
+# PIE-NEXT:    10024: br      x17
+# PIE-NEXT:    10028: nop
+# PIE-NEXT:    1002c: nop
+# PIE: 0000000000010030 func2@plt:
+# PIE-NEXT:    10030: bti     c
+# PIE-NEXT:    10034: adrp    x16, #131072
+# PIE-NEXT:    10038: ldr     x17, [x16, #24]
+# PIE-NEXT:    1003c: add     x16, x16, #24
+# PIE-NEXT:    10040: br      x17
+# PIE-NEXT:    10044: nop
+
+## Build and executable with not all relocatable inputs having the BTI
+## .note.property, expect no bti c and no .note.gnu.property entry
+
+# RUN: ld.lld %t.o %t2.o %t.so -o %tnobti.exe
+# RUN: llvm-readelf --dynamic-table %tnobti.exe | FileCheck --check-prefix NOBTIDYN %s
+# RUN: llvm-objdump -d -mattr=+bti --no-show-raw-insn %tnobti.exe | FileCheck --check-prefix=NOEX %s
+
+# NOEX: Disassembly of section .text:
+# NOEX: 0000000000210000 func1:
+# NOEX-NEXT:   210000: bl      #48 <func2@plt>
+# NOEX-NEXT:   210004: ret
+# NOEX: 0000000000210008 func3:
+# NOEX-NEXT:   210008: ret
+# NOEX: Disassembly of section .plt:
+# NOEX: 0000000000210010 .plt:
+# NOEX-NEXT:   210010: stp     x16, x30, [sp, #-16]!
+# NOEX-NEXT:   210014: adrp    x16, #131072
+# NOEX-NEXT:   210018: ldr     x17, [x16, #16]
+# NOEX-NEXT:   21001c: add     x16, x16, #16
+# NOEX-NEXT:   210020: br      x17
+# NOEX-NEXT:   210024: nop
+# NOEX-NEXT:   210028: nop
+# NOEX-NEXT:   21002c: nop
+# NOEX: 0000000000210030 func2@plt:
+# NOEX-NEXT:   210030: adrp    x16, #131072
+# NOEX-NEXT:   210034: ldr     x17, [x16, #24]
+# NOEX-NEXT:   210038: add     x16, x16, #24
+# NOEX-NEXT:   21003c: br      x17
+
+## Force BTI entries with the --force-bti command line option. Expect a warning
+## from the file without the .note.gnu.property.
+
+# RUN: ld.lld %t.o %t2.o --force-bti %t.so -o %tforcebti.exe 2>&1 | FileCheck --check-prefix=FORCE-WARN %s
+
+# FORCE-WARN: aarch64-feature-bti.s.tmp2.o: --force-bti: file does not have BTI property
+
+
+# RUN: llvm-readelf -n %tforcebti.exe | FileCheck --check-prefix=BTIPROP %s
+# RUN: llvm-readelf --dynamic-table %tforcebti.exe | FileCheck --check-prefix BTIDYN %s
+# RUN: llvm-objdump -d -mattr=+bti --no-show-raw-insn %tforcebti.exe | FileCheck --check-prefix=FORCE %s
+
+# FORCE: Disassembly of section .text:
+# FORCE: 0000000000210000 func1:
+# FORCE-NEXT:   210000: bl      #48 <func2@plt>
+# FORCE-NEXT:   210004: ret
+# FORCE: 0000000000210008 func3:
+# FORCE-NEXT:   210008: ret
+# FORCE: Disassembly of section .plt:
+# FORCE: 0000000000210010 .plt:
+# FORCE-NEXT:   210010: bti     c
+# FORCE-NEXT:   210014: stp     x16, x30, [sp, #-16]!
+# FORCE-NEXT:   210018: adrp    x16, #131072
+# FORCE-NEXT:   21001c: ldr     x17, [x16, #16]
+# FORCE-NEXT:   210020: add     x16, x16, #16
+# FORCE-NEXT:   210024: br      x17
+# FORCE-NEXT:   210028: nop
+# FORCE-NEXT:   21002c: nop
+# FORCE: 0000000000210030 func2@plt:
+# FORCE-NEXT:   210030: bti     c
+# FORCE-NEXT:   210034: adrp    x16, #131072
+# FORCE-NEXT:   210038: ldr     x17, [x16, #24]
+# FORCE-NEXT:   21003c: add     x16, x16, #24
+# FORCE-NEXT:   210040: br      x17
+# FORCE-NEXT:   210044: nop
+
+.section ".note.gnu.property", "a"
+.long 4
+.long 0x10
+.long 0x5
+.asciz "GNU"
+
+.long 0xc0000000 // GNU_PROPERTY_AARCH64_FEATURE_1_AND
+.long 4
+.long 1          // GNU_PROPERTY_AARCH64_FEATURE_1_BTI
+.long 0
+
+.text
+.globl _start
+.type func1,%function
+func1:
+  bl func2
+  ret
diff --git a/deps/lld/test/ELF/aarch64-feature-btipac.s b/deps/lld/test/ELF/aarch64-feature-btipac.s
new file mode 100644
index 0000000000000000000000000000000000000000..9dec79edc41aab4c34857a6f97b7b0c617e209fc
--- /dev/null
+++ b/deps/lld/test/ELF/aarch64-feature-btipac.s
@@ -0,0 +1,142 @@
+# REQUIRES: aarch64
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %s -o %t.o
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %p/Inputs/aarch64-btipac1.s -o %t1.o
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %p/Inputs/aarch64-func3.s -o %t3.o
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %p/Inputs/aarch64-func3-btipac.s -o %t3btipac.o
+
+## Build shared library with all inputs having BTI and PAC, expect PLT
+## entries supporting both PAC and BTI. For a shared library this means:
+## PLT[0] has bti c at start
+## PLT[n] has autia1716 before br x17
+
+# RUN: ld.lld %t1.o %t3btipac.o --shared -o %t.so
+# RUN: llvm-readelf -n %t.so | FileCheck --check-prefix BTIPACPROP %s
+# RUN: llvm-objdump -d -mattr=+v8.5a --no-show-raw-insn %t.so | FileCheck --check-prefix BTIPACSO %s
+# RUN: llvm-readelf --dynamic-table %t.so | FileCheck --check-prefix BTIPACDYN %s
+
+# BTIPACSO: Disassembly of section .text:
+# BTIPACSO: 0000000000010000 func2:
+# BTIPACSO-NEXT:    10000: bl      #48 <func3@plt>
+# BTIPACSO-NEXT:    10004: ret
+# BTIPACSO: 0000000000010008 func3:
+# BTIPACSO-NEXT:    10008: ret
+# BTIPACSO: Disassembly of section .plt:
+# BTIPACSO: 0000000000010010 .plt:
+# BTIPACSO-NEXT:    10010: bti     c
+# BTIPACSO-NEXT:    10014: stp     x16, x30, [sp, #-16]!
+# BTIPACSO-NEXT:    10018: adrp    x16, #131072
+# BTIPACSO-NEXT:    1001c: ldr     x17, [x16, #16]
+# BTIPACSO-NEXT:    10020: add     x16, x16, #16
+# BTIPACSO-NEXT:    10024: br      x17
+# BTIPACSO-NEXT:    10028: nop
+# BTIPACSO-NEXT:    1002c: nop
+# BTIPACSO: 0000000000010030 func3@plt:
+# BTIPACSO-NEXT:    10030: adrp    x16, #131072
+# BTIPACSO-NEXT:    10034: ldr     x17, [x16, #24]
+# BTIPACSO-NEXT:    10038: add     x16, x16, #24
+# BTIPACSO-NEXT:    1003c: autia1716
+# BTIPACSO-NEXT:    10040: br      x17
+# BTIPACSO-NEXT:    10044: nop
+
+# BTIPACPROP:    Properties:    aarch64 feature: BTI, PAC
+
+# BTIPACDYN:   0x0000000070000001 (AARCH64_BTI_PLT)
+# BTIPACDYN:   0x0000000070000003 (AARCH64_PAC_PLT)
+
+## Make an executable with both BTI and PAC properties. Expect:
+## PLT[0] bti c as first instruction
+## PLT[n] bti n as first instruction, autia1716 before br x17
+
+# RUN: ld.lld %t.o %t3btipac.o %t.so -o %t.exe
+# RUN: llvm-readelf -n %t.exe | FileCheck --check-prefix=BTIPACPROP %s
+# RUN: llvm-objdump -d -mattr=+v8.5a --no-show-raw-insn %t.exe | FileCheck --check-prefix BTIPACEX %s
+# RUN: llvm-readelf --dynamic-table %t.exe | FileCheck --check-prefix BTIPACDYN %s
+
+# BTIPACEX: Disassembly of section .text:
+# BTIPACEX: 0000000000210000 func1:
+# BTIPACEX-NEXT:   210000: bl      #48 <func2@plt>
+# BTIPACEX-NEXT:   210004: ret
+# BTIPACEX-NEXT:   210008: ret
+# BTIPACEX: 000000000021000c func3:
+# BTIPACEX-NEXT:   21000c: ret
+# BTIPACEX: Disassembly of section .plt:
+# BTIPACEX: 0000000000210010 .plt:
+# BTIPACEX-NEXT:   210010: bti     c
+# BTIPACEX-NEXT:   210014: stp     x16, x30, [sp, #-16]!
+# BTIPACEX-NEXT:   210018: adrp    x16, #131072
+# BTIPACEX-NEXT:   21001c: ldr     x17, [x16, #16]
+# BTIPACEX-NEXT:   210020: add     x16, x16, #16
+# BTIPACEX-NEXT:   210024: br      x17
+# BTIPACEX-NEXT:   210028: nop
+# BTIPACEX-NEXT:   21002c: nop
+# BTIPACEX: 0000000000210030 func2@plt:
+# BTIPACEX-NEXT:   210030: bti     c
+# BTIPACEX-NEXT:   210034: adrp    x16, #131072
+# BTIPACEX-NEXT:   210038: ldr     x17, [x16, #24]
+# BTIPACEX-NEXT:   21003c: add     x16, x16, #24
+# BTIPACEX-NEXT:   210040: autia1716
+# BTIPACEX-NEXT:   210044: br      x17
+
+## Check that combinations of BTI+PAC with 0 properties results in standard PLT
+
+# RUN: ld.lld %t.o %t3.o %t.so -o %t.exe
+# RUN: llvm-objdump -d -mattr=+v8.5a --no-show-raw-insn %t.exe | FileCheck --check-prefix EX %s
+# RUN: llvm-readelf --dynamic-table %t.exe | FileCheck --check-prefix=NODYN %s
+
+# EX: Disassembly of section .text:
+# EX: 0000000000210000 func1:
+# EX-NEXT:   210000: bl      #48 <func2@plt>
+# EX-NEXT:   210004: ret
+# EX-NEXT:   210008: ret
+# EX: 000000000021000c func3:
+# EX-NEXT:   21000c: ret
+# EX: Disassembly of section .plt:
+# EX: 0000000000210010 .plt:
+# EX-NEXT:   210010: stp     x16, x30, [sp, #-16]!
+# EX-NEXT:   210014: adrp    x16, #131072
+# EX-NEXT:   210018: ldr     x17, [x16, #16]
+# EX-NEXT:   21001c: add     x16, x16, #16
+# EX-NEXT:   210020: br      x17
+# EX-NEXT:   210024: nop
+# EX-NEXT:   210028: nop
+# EX-NEXT:   21002c: nop
+# EX: 0000000000210030 func2@plt:
+# EX:        210030: adrp    x16, #131072
+# EX-NEXT:   210034: ldr     x17, [x16, #24]
+# EX-NEXT:   210038: add     x16, x16, #24
+# EX-NEXT:   21003c: br      x17
+
+# NODYN-NOT:   0x0000000070000001 (AARCH64_BTI_PLT)
+# NODYN-NOT:   0x0000000070000003 (AARCH64_PAC_PLT)
+
+## Check that combination of --pac-plt and --force-bti warns for the file that
+## doesn't contain the BTI property, but generates PAC and BTI PLT sequences.
+## The --pac-plt doesn't warn as it is not required for correctness.
+
+# RUN: ld.lld %t.o %t3.o %t.so --pac-plt --force-bti -o %t.exe 2>&1 | FileCheck --check-prefix=FORCE-WARN %s
+
+# FORCE-WARN: aarch64-feature-btipac.s.tmp3.o: --force-bti: file does not have BTI property
+
+# RUN: llvm-readelf -n %t.exe | FileCheck --check-prefix=BTIPACPROP %s
+# RUN: llvm-objdump -d -mattr=+v8.5a --no-show-raw-insn %t.exe | FileCheck --check-prefix BTIPACEX %s
+# RUN: llvm-readelf --dynamic-table %t.exe | FileCheck --check-prefix BTIPACDYN %s
+.section ".note.gnu.property", "a"
+.long 4
+.long 0x10
+.long 0x5
+.asciz "GNU"
+
+.long 0xc0000000 // GNU_PROPERTY_AARCH64_FEATURE_1_AND
+.long 4
+.long 3          // GNU_PROPERTY_AARCH64_FEATURE_1_BTI and PAC
+.long 0
+
+.text
+.globl _start
+.type func1,%function
+func1:
+  bl func2
+  ret
+.globl func3
+.type func3,%function
+  ret
diff --git a/deps/lld/test/ELF/aarch64-feature-pac.s b/deps/lld/test/ELF/aarch64-feature-pac.s
new file mode 100644
index 0000000000000000000000000000000000000000..39d1f19ff7075d328e4756eb95c096536a897002
--- /dev/null
+++ b/deps/lld/test/ELF/aarch64-feature-pac.s
@@ -0,0 +1,129 @@
+# REQUIRES: aarch64
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %s -o %t.o
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %p/Inputs/aarch64-pac1.s -o %t1.o
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %p/Inputs/aarch64-func3.s -o %t2.o
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %p/Inputs/aarch64-func3-pac.s -o %t3.o
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %p/Inputs/aarch64-func2.s -o %tno.o
+
+## We do not add PAC support when the inputs don't have the .note.gnu.property
+## field.
+
+# RUN: ld.lld %tno.o %t3.o --shared -o %tno.so
+# RUN: llvm-objdump -d -mattr=+v8.3a --no-show-raw-insn %tno.so | FileCheck --check-prefix=NOPAC %s
+# RUN: llvm-readelf -x .got.plt %tno.so | FileCheck --check-prefix SOGOTPLT %s
+# RUN: llvm-readelf --dynamic-table %tno.so | FileCheck --check-prefix NOPACDYN %s
+
+# NOPAC: 0000000000010000 func2:
+# NOPAC-NEXT:    10000: bl      #48 <func3@plt>
+# NOPAC-NEXT:    10004: ret
+# NOPAC: Disassembly of section .plt:
+# NOPAC: 0000000000010010 .plt:
+# NOPAC-NEXT:    10010: stp     x16, x30, [sp, #-16]!
+# NOPAC-NEXT:    10014: adrp    x16, #131072
+# NOPAC-NEXT:    10018: ldr     x17, [x16, #16]
+# NOPAC-NEXT:    1001c: add     x16, x16, #16
+# NOPAC-NEXT:    10020: br      x17
+# NOPAC-NEXT:    10024: nop
+# NOPAC-NEXT:    10028: nop
+# NOPAC-NEXT:    1002c: nop
+# NOPAC: 0000000000010030 func3@plt:
+# NOPAC-NEXT:    10030: adrp    x16, #131072
+# NOPAC-NEXT:    10034: ldr     x17, [x16, #24]
+# NOPAC-NEXT:    10038: add     x16, x16, #24
+# NOPAC-NEXT:    1003c: br      x17
+
+# NOPACDYN-NOT:   0x0000000070000001 (AARCH64_BTI_PLT)
+# NOPACDYN-NOT:   0x0000000070000003 (AARCH64_PAC_PLT)
+
+# RUN: ld.lld %t1.o %t3.o --shared -o %t.so
+# RUN: llvm-readelf -n %t.so | FileCheck --check-prefix PACPROP %s
+# RUN: llvm-objdump -d -mattr=+v8.3a --no-show-raw-insn %t.so | FileCheck --check-prefix PACSO %s
+# RUN: llvm-readelf -x .got.plt %t.so | FileCheck --check-prefix SOGOTPLT %s
+# RUN: llvm-readelf --dynamic-table %t.so |  FileCheck --check-prefix PACDYN %s
+
+## PAC has no effect on PLT[0], for PLT[N] autia1716 is used to authenticate
+## the address in x17 (context in x16) before branching to it. The dynamic
+## loader is responsible for calling pacia1716 on the entry.
+# PACSO: 0000000000010000 func2:
+# PACSO-NEXT:    10000: bl      #48 <func3@plt>
+# PACSO-NEXT:    10004: ret
+# PACSO: Disassembly of section .plt:
+# PACSO: 0000000000010010 .plt:
+# PACSO-NEXT:    10010: stp     x16, x30, [sp, #-16]!
+# PACSO-NEXT:    10014: adrp    x16, #131072
+# PACSO-NEXT:    10018: ldr     x17, [x16, #16]
+# PACSO-NEXT:    1001c: add     x16, x16, #16
+# PACSO-NEXT:    10020: br      x17
+# PACSO-NEXT:    10024: nop
+# PACSO-NEXT:    10028: nop
+# PACSO-NEXT:    1002c: nop
+# PACSO: 0000000000010030 func3@plt:
+# PACSO-NEXT:    10030: adrp    x16, #131072
+# PACSO-NEXT:    10034: ldr     x17, [x16, #24]
+# PACSO-NEXT:    10038: add     x16, x16, #24
+# PACSO-NEXT:    1003c: autia1716
+# PACSO-NEXT:    10040: br      x17
+# PACSO-NEXT:    10044: nop
+
+# The .got.plt should be identical between the PAC and no PAC DSO PLT.
+# SOGOTPLT: Hex dump of section '.got.plt':
+# SOGOTPLT-NEXT: 0x00030000 00000000 00000000 00000000 00000000
+# SOGOTPLT-NEXT: 0x00030010 00000000 00000000 10000100 00000000
+
+# PACPROP: Properties:    aarch64 feature: PAC
+
+# PACDYN-NOT:      0x0000000070000001 (AARCH64_BTI_PLT)
+# PACDYN:          0x0000000070000003 (AARCH64_PAC_PLT)
+
+## Turn on PAC entries with the --pac-plt command line option. There are no
+## warnings in this case as the choice to use PAC in PLT entries is orthogonal
+## to the choice of using PAC in relocatable objects. The presence of the PAC
+## .note.gnu.property is an indication of preference by the relocatable object.
+
+# RUN: ld.lld %t.o %t2.o --pac-plt %t.so -o %tpacplt.exe
+# RUN: llvm-readelf -n %tpacplt.exe | FileCheck --check-prefix=PACPROP %s
+# RUN: llvm-readelf --dynamic-table %tpacplt.exe | FileCheck --check-prefix PACDYN %s
+# RUN: llvm-objdump -d -mattr=+v8.3a --no-show-raw-insn %tpacplt.exe | FileCheck --check-prefix PACPLT %s
+
+# PACPLT: Disassembly of section .text:
+# PACPLT: 0000000000210000 func1:
+# PACPLT-NEXT:   210000: bl      #48 <func2@plt>
+# PACPLT-NEXT:   210004: ret
+# PACPLT: 0000000000210008 func3:
+# PACPLT-NEXT:   210008: ret
+# PACPLT: Disassembly of section .plt:
+# PACPLT: 0000000000210010 .plt:
+# PACPLT-NEXT:   210010: stp     x16, x30, [sp, #-16]!
+# PACPLT-NEXT:   210014: adrp    x16, #131072
+# PACPLT-NEXT:   210018: ldr     x17, [x16, #16]
+# PACPLT-NEXT:   21001c: add     x16, x16, #16
+# PACPLT-NEXT:   210020: br      x17
+# PACPLT-NEXT:   210024: nop
+# PACPLT-NEXT:   210028: nop
+# PACPLT-NEXT:   21002c: nop
+# PACPLT: 0000000000210030 func2@plt:
+# PACPLT-NEXT:   210030: adrp    x16, #131072
+# PACPLT-NEXT:   210034: ldr     x17, [x16, #24]
+# PACPLT-NEXT:   210038: add     x16, x16, #24
+# PACPLT-NEXT:   21003c: autia1716
+# PACPLT-NEXT:   210040: br      x17
+# PACPLT-NEXT:   210044: nop
+
+
+.section ".note.gnu.property", "a"
+.long 4
+.long 0x10
+.long 0x5
+.asciz "GNU"
+
+.long 0xc0000000 // GNU_PROPERTY_AARCH64_FEATURE_1_AND
+.long 4
+.long 2          // GNU_PROPERTY_AARCH64_FEATURE_1_PAC
+.long 0
+
+.text
+.globl _start
+.type func1,%function
+func1:
+  bl func2
+  ret
diff --git a/deps/lld/test/ELF/aarch64-fpic-adr_prel_pg_hi21.s b/deps/lld/test/ELF/aarch64-fpic-adr_prel_pg_hi21.s
index 651a32e568685d69be944894c55cdbef367fa5e4..8be6e5abe9f2eb8c11b22156037c2d51122265dd 100644
--- a/deps/lld/test/ELF/aarch64-fpic-adr_prel_pg_hi21.s
+++ b/deps/lld/test/ELF/aarch64-fpic-adr_prel_pg_hi21.s
@@ -4,8 +4,10 @@
 // CHECK: relocation R_AARCH64_ADR_PREL_PG_HI21 cannot be used against symbol dat; recompile with -fPIC
 // CHECK: >>> defined in {{.*}}.o
 // CHECK: >>> referenced by {{.*}}.o:(.text+0x0)
+// CHECK: relocation R_AARCH64_ADR_PREL_PG_HI21_NC cannot be used against symbol dat; recompile with -fPIC
 
   adrp x0, dat
+  adrp x0, :pg_hi21_nc:dat
 .data
 .globl dat
 dat:
diff --git a/deps/lld/test/ELF/aarch64-fpic-got.s b/deps/lld/test/ELF/aarch64-fpic-got.s
index 70b2a7a76f86b87dc789fe5022614a8fbf7888a4..b4b685acd9c6071abbcd7e7eb8fd67d9aac570e9 100644
--- a/deps/lld/test/ELF/aarch64-fpic-got.s
+++ b/deps/lld/test/ELF/aarch64-fpic-got.s
@@ -3,14 +3,22 @@
 # RUN: llvm-mc -filetype=obj -triple=aarch64-none-linux %s -o %t.o
 # RUN: llvm-mc -filetype=obj -triple=aarch64-none-linux %p/Inputs/shared.s -o %t-lib.o
 # RUN: ld.lld -shared %t-lib.o -o %t-lib.so
+
 # RUN: ld.lld %t-lib.so %t.o -o %t.exe
-# RUN: llvm-readobj -dyn-relocations %t.exe | FileCheck %s
+# RUN: llvm-readobj -r %t.exe | FileCheck --check-prefix=RELOC %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.exe | FileCheck --check-prefix=DIS %s
 
 ## Checks if got access to dynamic objects is done through a got relative
 ## dynamic relocation and not using plt relative (R_AARCH64_JUMP_SLOT).
-# CHECK:       Dynamic Relocations {
-# CHECK-NEXT:    0x{{[0-9A-F]+}}  R_AARCH64_GLOB_DAT bar 0x0
-# CHECK-NEXT:  }
+# RELOC:      .rela.dyn {
+# RELOC-NEXT:   0x2200C0 R_AARCH64_GLOB_DAT bar 0x0
+# RELOC-NEXT: }
+
+## page(0x2200C0) - page(0x210000) = 65536
+## page(0x2200C0) & 0xff8 = 192
+# DIS:      _start:
+# DIS-NEXT: 210000: adrp x0, #65536
+# DIS-NEXT: 210004: ldr x0, [x0, #192]
 
 .globl _start
 _start:
diff --git a/deps/lld/test/ELF/aarch64-gnu-ifunc-address-pie.s b/deps/lld/test/ELF/aarch64-gnu-ifunc-address-pie.s
deleted file mode 100644
index 3db9070dbd07bb3317598c886730286ce8a49320..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/aarch64-gnu-ifunc-address-pie.s
+++ /dev/null
@@ -1,44 +0,0 @@
-# REQUIRES: aarch64
-# RUN: llvm-mc -filetype=obj -triple=aarch64-none-linux-gnu %s -o %t.o
-# RUN: ld.lld -pie %t.o -o %tout
-# RUN: llvm-objdump -D %tout | FileCheck %s
-# RUN: llvm-readobj -r %tout | FileCheck %s -check-prefix=CHECK-RELOCS
-
-# Test that when we take the address of a preemptible ifunc using -fpie, we can
-# handle the case when the ifunc is in the same translation unit as the address
-# taker. In this case the compiler knows that ifunc is not defined in a shared
-# library so it can use a non got generating relative reference.
-.text
-.globl myfunc
-.type myfunc,@gnu_indirect_function
-myfunc:
- ret
-
-.text
-.globl main
-.type main,@function
-main:
- adrp x8, myfunc
- add  x8, x8, :lo12: myfunc
- ret
-
-# CHECK: 0000000000010000 myfunc:
-# CHECK-NEXT:    10000:	c0 03 5f d6 	ret
-# CHECK: 0000000000010004 main:
-# CHECK-NEXT:    10004:	08 00 00 90 	adrp	x8, #0
-# x8 = 0x10000
-# CHECK-NEXT:    10008:	08 41 00 91 	add	x8, x8, #16
-# x8 = 0x10010 = .plt for myfunc
-# CHECK-NEXT:    1000c:	c0 03 5f d6 	ret
-# CHECK-NEXT: Disassembly of section .plt:
-# CHECK-NEXT: 0000000000010010 .plt:
-# CHECK-NEXT:    10010:	90 00 00 90 	adrp	x16, #65536
-# CHECK-NEXT:    10014:	11 02 40 f9 	ldr	x17, [x16]
-# CHECK-NEXT:    10018:	10 02 00 91 	add	x16, x16, #0
-# CHECK-NEXT:    1001c:	20 02 1f d6 	br	x17
-
-# CHECK-RELOCS: Relocations [
-# CHECK-RELOCS-NEXT:   Section {{.*}} .rela.plt {
-# CHECK-RELOCS-NEXT:     0x20000 R_AARCH64_IRELATIVE - 0x10000
-# CHECK-RELOCS-NEXT:   }
-# CHECK-RELOCS-NEXT: ]
diff --git a/deps/lld/test/ELF/aarch64-gnu-ifunc-address.s b/deps/lld/test/ELF/aarch64-gnu-ifunc-address.s
index 9321fe35e536177a53392e5b344a85fd34da0799..ad70ecbc84ec9bbb4171e05f56cdcd7499532050 100644
--- a/deps/lld/test/ELF/aarch64-gnu-ifunc-address.s
+++ b/deps/lld/test/ELF/aarch64-gnu-ifunc-address.s
@@ -1,7 +1,7 @@
 # REQUIRES: aarch64
 # RUN: llvm-mc -filetype=obj -triple=aarch64-none-linux-gnu %s -o %t.o
 # RUN: ld.lld -shared %t.o -o %tout
-# RUN: llvm-objdump -D %tout | FileCheck %s
+# RUN: llvm-objdump -D --no-show-raw-insn %tout | FileCheck %s
 # RUN: llvm-readobj -r %tout | FileCheck %s --check-prefix=CHECK-RELOCS
 
 # Test that when we take the address of a preemptible ifunc in a shared object
@@ -21,20 +21,18 @@ main:
  ldr  x8, [x8, :got_lo12:myfunc]
  ret
 # CHECK:   0000000000010004 main:
-# x8 = 0x30000
-# CHECK-NEXT:    10004: 08 01 00 90     adrp    x8, #131072
-# x8 = 0x300e0 = .got entry for myfunc with R_AARCH64_GLOB_DAT
-# CHECK-NEXT:    10008: 08 71 40 f9     ldr     x8, [x8, #224]
-# CHECK-NEXT:    1000c: c0 03 5f d6     ret
+# x8 = 0x20000
+# CHECK-NEXT:    10004: adrp    x8, #65536
+# x8 = 0x200a0 = .got entry for myfunc with R_AARCH64_GLOB_DAT
+# CHECK-NEXT:    10008: ldr     x8, [x8, #160]
+# CHECK-NEXT:    1000c: ret
 
 # CHECK: Disassembly of section .got:
-# CHECK-NEXT: 00000000000300e0 .got:
+# CHECK-EMPTY:
+# CHECK-NEXT: 00000000000200a0 .got:
 
 # CHECK-RELOCS: Relocations [
 # CHECK-RELOCS-NEXT:   Section {{.*}} .rela.dyn {
-# CHECK-RELOCS-NEXT:     0x300E0 R_AARCH64_GLOB_DAT myfunc 0x0
-# CHECK-RELOCS-NEXT:   }
-# CHECK-RELOCS-NEXT:   Section {{.*}} .rela.plt {
-# CHECK-RELOCS-NEXT:     0x20018 R_AARCH64_JUMP_SLOT myfunc 0x0
+# CHECK-RELOCS-NEXT:     0x200A0 R_AARCH64_GLOB_DAT myfunc 0x0
 # CHECK-RELOCS-NEXT:   }
 # CHECK-RELOCS-NEXT: ]
diff --git a/deps/lld/test/ELF/aarch64-gnu-ifunc-nonpreemptable.s b/deps/lld/test/ELF/aarch64-gnu-ifunc-nonpreemptable.s
new file mode 100644
index 0000000000000000000000000000000000000000..571d7c29fac68a0628b0ac3ec7e3cf0740f5eca9
--- /dev/null
+++ b/deps/lld/test/ELF/aarch64-gnu-ifunc-nonpreemptable.s
@@ -0,0 +1,72 @@
+# REQUIRES: aarch64
+# RUN: llvm-mc -filetype=obj -triple=aarch64-none-linux-gnu %s -o %t.o
+
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s --check-prefix=PDE
+# RUN: llvm-readobj -r %t | FileCheck %s --check-prefix=PDE-RELOC
+
+# RUN: ld.lld -pie %t.o -o %t
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s --check-prefix=PIE
+# RUN: llvm-readobj -r %t | FileCheck %s --check-prefix=PIE-RELOC
+
+## When compiling with -fno-PIE or -fPIE, if the ifunc is in the same
+## translation unit as the address taker, the compiler knows that ifunc is not
+## defined in a shared library so it can use a non GOT generating relative reference.
+.text
+.globl myfunc
+.type myfunc,@gnu_indirect_function
+myfunc:
+.globl myfunc_resolver
+.type myfunc_resolver,@function
+myfunc_resolver:
+ ret
+
+.text
+.globl main
+.type main,@function
+main:
+ adrp x8, myfunc
+ add  x8, x8, :lo12: myfunc
+ ret
+
+## The address of myfunc is the address of the PLT entry for myfunc.
+# PDE:      myfunc_resolver:
+# PDE-NEXT:   210000:   ret
+# PDE:      main:
+# PDE-NEXT:   210004:   adrp    x8, #0
+# PDE-NEXT:   210008:   add     x8, x8, #16
+# PDE-NEXT:   21000c:   ret
+# PDE-EMPTY:
+# PDE-NEXT: Disassembly of section .plt:
+# PDE-EMPTY:
+# PDE-NEXT: myfunc:
+## page(.got.plt) - page(0x210010) = 65536
+# PDE-NEXT:   210010: adrp    x16, #65536
+# PDE-NEXT:   210014: ldr     x17, [x16]
+# PDE-NEXT:   210018: add     x16, x16, #0
+# PDE-NEXT:   21001c: br      x17
+
+## The adrp to myfunc should generate a PLT entry and a GOT entry with an
+## irelative relocation.
+# PDE-RELOC:      .rela.plt {
+# PDE-RELOC-NEXT:   0x220000 R_AARCH64_IRELATIVE - 0x210000
+# PDE-RELOC-NEXT: }
+
+# PIE:      myfunc_resolver:
+# PIE-NEXT:    10000: ret
+# PIE:      main:
+# PIE-NEXT:    10004: adrp    x8, #0
+# PIE-NEXT:    10008: add     x8, x8, #16
+# PIE-NEXT:    1000c: ret
+# PIE-EMPTY:
+# PIE-NEXT: Disassembly of section .plt:
+# PIE-EMPTY:
+# PIE-NEXT: myfunc:
+# PIE-NEXT:    10010: adrp    x16, #131072
+# PIE-NEXT:    10014: ldr     x17, [x16]
+# PIE-NEXT:    10018: add     x16, x16, #0
+# PIE-NEXT:    1001c: br      x17
+
+# PIE-RELOC:      .rela.plt {
+# PIE-RELOC-NEXT:   0x30000 R_AARCH64_IRELATIVE - 0x10000
+# PIE-RELOC-NEXT: }
diff --git a/deps/lld/test/ELF/aarch64-gnu-ifunc-nosym.s b/deps/lld/test/ELF/aarch64-gnu-ifunc-nosym.s
index aa0124aa3fa2f49070c6d3070fb1624905d1a205..69e45682b0149179ccc33ae86d30df32c07a5c75 100644
--- a/deps/lld/test/ELF/aarch64-gnu-ifunc-nosym.s
+++ b/deps/lld/test/ELF/aarch64-gnu-ifunc-nosym.s
@@ -1,7 +1,7 @@
 // REQUIRES: aarch64
 // RUN: llvm-mc -filetype=obj -triple=aarch64-none-linux-gnu %s -o %t.o
 // RUN: ld.lld -static %t.o -o %tout
-// RUN: llvm-readobj -symbols %tout | FileCheck %s
+// RUN: llvm-readobj --symbols %tout | FileCheck %s
 
 // Check that no __rela_iplt_end/__rela_iplt_start
 // appear in symtab if there is no references to them.
diff --git a/deps/lld/test/ELF/aarch64-gnu-ifunc-plt.s b/deps/lld/test/ELF/aarch64-gnu-ifunc-plt.s
index 381bcf7cd1427e5b5eb0bfabfc7d191eafb90c8b..6186b4ab669d0dbfedc911126e7cfd4eee087f2e 100644
--- a/deps/lld/test/ELF/aarch64-gnu-ifunc-plt.s
+++ b/deps/lld/test/ELF/aarch64-gnu-ifunc-plt.s
@@ -5,24 +5,24 @@
 // RUN: ld.lld --hash-style=sysv %t.so %t.o -o %tout
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DISASM
 // RUN: llvm-objdump -s %tout | FileCheck %s --check-prefix=GOTPLT
-// RUN: llvm-readobj -r -dynamic-table %tout | FileCheck %s
+// RUN: llvm-readobj -r --dynamic-table %tout | FileCheck %s
 
 // Check that the IRELATIVE relocations are after the JUMP_SLOT in the plt
 // CHECK: Relocations [
 // CHECK-NEXT:   Section (4) .rela.plt {
-// CHECK:     0x220018 R_AARCH64_JUMP_SLOT bar2 0x0
-// CHECK-NEXT:     0x220020 R_AARCH64_JUMP_SLOT zed2 0x0
-// CHECK-NEXT:     0x220028 R_AARCH64_IRELATIVE - 0x210000
-// CHECK-NEXT:     0x220030 R_AARCH64_IRELATIVE - 0x210004
+// CHECK:     0x230018 R_AARCH64_JUMP_SLOT bar2 0x0
+// CHECK-NEXT:     0x230020 R_AARCH64_JUMP_SLOT zed2 0x0
+// CHECK-NEXT:     0x230028 R_AARCH64_IRELATIVE - 0x210000
+// CHECK-NEXT:     0x230030 R_AARCH64_IRELATIVE - 0x210004
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
 // Check that .got.plt entries point back to PLT header
 // GOTPLT: Contents of section .got.plt:
-// GOTPLT-NEXT:  220000 00000000 00000000 00000000 00000000
-// GOTPLT-NEXT:  220010 00000000 00000000 20002100 00000000
-// GOTPLT-NEXT:  220020 20002100 00000000 20002100 00000000
-// GOTPLT-NEXT:  220030 20002100 00000000
+// GOTPLT-NEXT:  230000 00000000 00000000 00000000 00000000
+// GOTPLT-NEXT:  230010 00000000 00000000 20002100 00000000
+// GOTPLT-NEXT:  230020 20002100 00000000 20002100 00000000
+// GOTPLT-NEXT:  230030 20002100 00000000
 
 // Check that the PLTRELSZ tag includes the IRELATIVE relocations
 // CHECK: DynamicSection [
@@ -30,6 +30,7 @@
 
 // Check that a PLT header is written and the ifunc entries appear last
 // DISASM: Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: foo:
 // DISASM-NEXT:    210000: {{.*}} ret
 // DISASM:      bar:
@@ -39,10 +40,12 @@
 // DISASM-NEXT:    21000c: {{.*}} bl      #100
 // DISASM-NEXT:    210010: {{.*}} bl      #48
 // DISASM-NEXT:    210014: {{.*}} bl      #60
+// DISASM-EMPTY:
 // DISASM-NEXT: Disassembly of section .plt:
+// DISASM-EMPTY:
 // DISASM-NEXT: .plt:
 // DISASM-NEXT:    210020: {{.*}} stp     x16, x30, [sp, #-16]!
-// DISASM-NEXT:    210024: {{.*}} adrp    x16, #65536
+// DISASM-NEXT:    210024: {{.*}} adrp    x16, #131072
 // DISASM-NEXT:    210028: {{.*}} ldr     x17, [x16, #16]
 // DISASM-NEXT:    21002c: {{.*}} add     x16, x16, #16
 // DISASM-NEXT:    210030: {{.*}} br      x17
@@ -51,21 +54,21 @@
 // DISASM-NEXT:    21003c: {{.*}} nop
 // DISASM-EMPTY:
 // DISASM-NEXT:   bar2@plt:
-// DISASM-NEXT:    210040: {{.*}} adrp    x16, #65536
+// DISASM-NEXT:    210040: {{.*}} adrp    x16, #131072
 // DISASM-NEXT:    210044: {{.*}} ldr     x17, [x16, #24]
 // DISASM-NEXT:    210048: {{.*}} add     x16, x16, #24
 // DISASM-NEXT:    21004c: {{.*}} br      x17
 // DISASM-EMPTY:
 // DISASM-NEXT:   zed2@plt:
-// DISASM-NEXT:    210050: {{.*}} adrp    x16, #65536
+// DISASM-NEXT:    210050: {{.*}} adrp    x16, #131072
 // DISASM-NEXT:    210054: {{.*}} ldr     x17, [x16, #32]
 // DISASM-NEXT:    210058: {{.*}} add     x16, x16, #32
 // DISASM-NEXT:    21005c: {{.*}} br      x17
-// DISASM-NEXT:    210060: {{.*}} adrp    x16, #65536
+// DISASM-NEXT:    210060: {{.*}} adrp    x16, #131072
 // DISASM-NEXT:    210064: {{.*}} ldr     x17, [x16, #40]
 // DISASM-NEXT:    210068: {{.*}} add     x16, x16, #40
 // DISASM-NEXT:    21006c: {{.*}} br      x17
-// DISASM-NEXT:    210070: {{.*}} adrp    x16, #65536
+// DISASM-NEXT:    210070: {{.*}} adrp    x16, #131072
 // DISASM-NEXT:    210074: {{.*}} ldr     x17, [x16, #48]
 // DISASM-NEXT:    210078: {{.*}} add     x16, x16, #48
 // DISASM-NEXT:    21007c: {{.*}} br      x17
diff --git a/deps/lld/test/ELF/aarch64-gnu-ifunc.s b/deps/lld/test/ELF/aarch64-gnu-ifunc.s
index 9a15f1341d3dda212a5808958b28cf53792825ae..c89de9689dcc2905c728d0e8d60c23d7f6a50fd3 100644
--- a/deps/lld/test/ELF/aarch64-gnu-ifunc.s
+++ b/deps/lld/test/ELF/aarch64-gnu-ifunc.s
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=aarch64-none-linux-gnu %s -o %t.o
 // RUN: ld.lld -static %t.o -o %tout
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DISASM
-// RUN: llvm-readobj -r -symbols -sections %tout | FileCheck %s
+// RUN: llvm-readobj -r --symbols --sections %tout | FileCheck %s
 
 // CHECK:      Sections [
 // CHECK:       Section {
@@ -100,6 +100,7 @@
 // 392 = 0x188
 
 // DISASM: Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: foo:
 // DISASM-NEXT:  210000: c0 03 5f d6 ret
 // DISASM: bar:
@@ -109,7 +110,9 @@
 // DISASM-NEXT:  21000c: 09 00 00 94     bl      #36
 // DISASM-NEXT:  210010: 42 60 05 91     add     x2, x2, #344
 // DISASM-NEXT:  210014: 42 20 06 91     add     x2, x2, #392
+// DISASM-EMPTY:
 // DISASM-NEXT: Disassembly of section .plt:
+// DISASM-EMPTY:
 // DISASM-NEXT: .plt:
 // DISASM-NEXT:  210020: 90 00 00 90 adrp x16, #65536
 // DISASM-NEXT:  210024: 11 02 40 f9 ldr x17, [x16]
diff --git a/deps/lld/test/ELF/aarch64-gnu-ifunc2.s b/deps/lld/test/ELF/aarch64-gnu-ifunc2.s
index 2caff3f145860bbe855b827f6aaac0f0650a2140..ea24cd3161c3db0177606db047bd8fa525fe52f6 100644
--- a/deps/lld/test/ELF/aarch64-gnu-ifunc2.s
+++ b/deps/lld/test/ELF/aarch64-gnu-ifunc2.s
@@ -5,16 +5,18 @@
 # RUN: llvm-readobj -r %tout | FileCheck %s --check-prefix=RELOC
 
 # CHECK:      Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: myfunc:
 # CHECK-NEXT:   210000:
 
 # CHECK:      main:
-# adrp x8, 0x230000, 0x230000 == address in .got
-# CHECK-NEXT:   210004: {{.*}} adrp    x8, #131072
+# adrp x8, 0x220000, 0x220000 == address in .got.plt
+# CHECK-NEXT:   210004: {{.*}} adrp    x8, #65536
 # CHECK-NEXT:   210008: {{.*}} ldr     x8, [x8]
 # CHECK-NEXT:   21000c: {{.*}} ret
 
 # CHECK:      Disassembly of section .plt:
+# CHECK-EMPTY:
 # CHECK-NEXT: .plt:
 # adrp x16, 0x220000, 0x220000 == address in .got.plt
 # CHECK-NEXT:   210010: {{.*}} adrp    x16, #65536
@@ -23,14 +25,10 @@
 # CHECK-NEXT:   21001c: {{.*}} br      x17
 
 # CHECK:      Disassembly of section .got.plt:
+# CHECK-EMPTY:
 # CHECK-NEXT: .got.plt:
 # CHECK-NEXT:   220000:
 
-# CHECK:      Disassembly of section .got:
-# CHECK-NEXT: .got:
-# 0x210010 == address in .plt
-# CHECK-NEXT:   230000: 10 00 21 00
-
 # RELOC:      Relocations [
 # RELOC-NEXT:   Section {{.*}} .rela.plt {
 # RELOC-NEXT:     0x220000 R_AARCH64_IRELATIVE - 0x210000
diff --git a/deps/lld/test/ELF/aarch64-gnu-ifunc3.s b/deps/lld/test/ELF/aarch64-gnu-ifunc3.s
deleted file mode 100644
index 11d5631b8578f435fe89681a05207d97a584d41e..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/aarch64-gnu-ifunc3.s
+++ /dev/null
@@ -1,49 +0,0 @@
-# REQUIRES: aarch64
-# RUN: llvm-mc -filetype=obj -triple=aarch64-none-linux-gnu %s -o %t.o
-# RUN: ld.lld -static %t.o -o %tout
-# RUN: llvm-objdump -D %tout | FileCheck %s
-# RUN: llvm-readobj -r %tout | FileCheck %s --check-prefix=RELOC
-
-# The address of myfunc is the address of the PLT entry for myfunc.
-# The adrp to myfunc should generate a PLT entry and a got entry with an
-# irelative relocation.
-.text
-.globl myfunc
-.type myfunc,@gnu_indirect_function
-myfunc:
- ret
-
-.text
-.globl _start
-.type _start,@function
-_start:
- adrp x8, myfunc
- add  x8, x8, :lo12:myfunc
- ret
-
-# CHECK: Disassembly of section .text:
-# CHECK-NEXT: myfunc:
-# CHECK-NEXT:   210000:	c0 03 5f d6 	ret
-# CHECK: _start:
-# adrp x8, 0x210000 + 0x10 from add == .plt entry
-# CHECK-NEXT:   210004:	08 00 00 90 	adrp	x8, #0
-# CHECK-NEXT:   210008:	08 41 00 91 	add	x8, x8, #16
-# CHECK-NEXT:   21000c:	c0 03 5f d6 	ret
-# CHECK-NEXT: Disassembly of section .plt:
-# CHECK-NEXT: .plt:
-# adrp x16, 0x220000, 0x220000 == address in .got.plt
-# CHECK-NEXT:   210010:	90 00 00 90 	adrp	x16, #65536
-# CHECK-NEXT:   210014:	11 02 40 f9 	ldr	x17, [x16]
-# CHECK-NEXT:   210018:	10 02 00 91 	add	x16, x16, #0
-# CHECK-NEXT:   21001c:	20 02 1f d6 	br	x17
-# CHECK-NEXT: Disassembly of section .got.plt:
-# CHECK-NEXT: .got.plt:
-# 0x210010 == address in .plt
-# CHECK-NEXT:   220000:	10 00 21 00
-# CHECK-NEXT:   220004:	00 00 00 00
-
-# RELOC: Relocations [
-# RELOC-NEXT:  Section (1) .rela.plt {
-# RELOC-NEXT:    0x220000 R_AARCH64_IRELATIVE - 0x210000
-# RELOC-NEXT:  }
-# RELOC-NEXT: ]
diff --git a/deps/lld/test/ELF/aarch64-got-reloc.s b/deps/lld/test/ELF/aarch64-got-reloc.s
deleted file mode 100644
index 1882dcd43a488e54dbeb436c38592d19f1aac12b..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/aarch64-got-reloc.s
+++ /dev/null
@@ -1,30 +0,0 @@
-// REQUIRES: aarch64
-// RUN: llvm-mc -filetype=obj -triple=aarch64-none-freebsd %s -o %t.o
-// RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -s --section-data  %t | FileCheck %s
-
-// CHECK:      Name: .got
-// CHECK-NEXT: Type: SHT_PROGBITS
-// CHECK-NEXT:  Flags [
-// CHECK-NEXT:    SHF_ALLOC
-// CHECK-NEXT:    SHF_WRITE
-// CHECK-NEXT:  ]
-// CHECK-NEXT:  Address:
-// CHECK-NEXT:  Offset:
-// CHECK-NEXT:  Size: 8
-// CHECK-NEXT:  Link: 0
-// CHECK-NEXT:  Info: 0
-// CHECK-NEXT:  AddressAlignment: 8
-// CHECK-NEXT:  EntrySize: 0
-// CHECK-NEXT:  SectionData (
-// CHECK-NEXT:    0000: 00000000 00000000                    |........|
-// CHECK-NEXT:  )
-
-        .globl  _start
-_start:
-        adrp    x8, :got:foo
-        ldr     x8, [x8, :got_lo12:foo]
-        ldr     w0, [x8]
-        ret
-
-        .weak   foo
diff --git a/deps/lld/test/ELF/aarch64-got-weak-undef.s b/deps/lld/test/ELF/aarch64-got-weak-undef.s
new file mode 100644
index 0000000000000000000000000000000000000000..fcdce49fb4c86e8896d69b1c119e70b3709314d8
--- /dev/null
+++ b/deps/lld/test/ELF/aarch64-got-weak-undef.s
@@ -0,0 +1,18 @@
+// REQUIRES: aarch64
+// RUN: llvm-mc -filetype=obj -triple=aarch64-none-freebsd %s -o %t.o
+// RUN: ld.lld %t.o -o %t
+// RUN: llvm-readelf -r %t | FileCheck --check-prefix=RELOC %s
+// RUN: llvm-readelf -x .got %t | FileCheck %s
+
+// RELOC: no relocations
+
+// CHECK: 0x00220000 00000000 00000000
+
+        .globl  _start
+_start:
+        adrp    x8, :got:foo
+        ldr     x8, [x8, :got_lo12:foo]
+        ldr     w0, [x8]
+        ret
+
+        .weak   foo
diff --git a/deps/lld/test/ELF/aarch64-got.s b/deps/lld/test/ELF/aarch64-got.s
deleted file mode 100644
index f56d8a734784e92fe8b3b35f986797fceddb401f..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/aarch64-got.s
+++ /dev/null
@@ -1,18 +0,0 @@
-# REQUIRES: aarch64
-# RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd %s -o %t.o
-# RUN: ld.lld %t.o -o %t
-# RUN: llvm-readobj -s %t | FileCheck %s
-
-# CHECK-NOT: Name: .got
-
-.globl _start
-_start:
- adrp    x0, :gottprel:foo
-
-	.global foo
- .section .tdata,"awT",%progbits
- .align 2
- .type foo, %object
- .size foo, 4
-foo:
- .word 5
diff --git a/deps/lld/test/ELF/aarch64-hi21-nc.s b/deps/lld/test/ELF/aarch64-hi21-nc.s
new file mode 100644
index 0000000000000000000000000000000000000000..154f98c792b907dcbbca89ada56f6db430b9989b
--- /dev/null
+++ b/deps/lld/test/ELF/aarch64-hi21-nc.s
@@ -0,0 +1,8 @@
+// REQUIRES: aarch64
+// RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %s -o %t.o
+// RUN: ld.lld %t.o -o %t
+// RUN: llvm-objdump -d %t | FileCheck %s
+
+foo = . + 0x1100000000000000
+// CHECK: adrp x0, #0
+adrp x0, :pg_hi21_nc:foo
diff --git a/deps/lld/test/ELF/aarch64-ifunc-bti.s b/deps/lld/test/ELF/aarch64-ifunc-bti.s
new file mode 100644
index 0000000000000000000000000000000000000000..a881e96388f9187b0d70e25a1910feb5c4c56aa9
--- /dev/null
+++ b/deps/lld/test/ELF/aarch64-ifunc-bti.s
@@ -0,0 +1,65 @@
+# REQUIRES: aarch64
+# RUN: llvm-mc -filetype=obj -triple=aarch64-none-linux-gnu %s -o %t.o
+# RUN: llvm-mc -filetype=obj -triple=aarch64-none-linux-gnu %p/Inputs/aarch64-addrifunc.s -o %t1.o
+
+# RUN: ld.lld --shared %t1.o -o %t1.so
+# RUN: ld.lld --pie %t1.so %t.o -o %t
+# RUN: llvm-objdump -d -mattr=+bti -triple=aarch64-linux-gnu %t | FileCheck %s
+
+# When the address of an ifunc is taken using a non-got reference which clang
+# can do, LLD exports a canonical PLT entry that may have its address taken so
+# we must use bti c.
+
+# CHECK: Disassembly of section .plt:
+# CHECK: 0000000000010020 .plt:
+# CHECK-NEXT:    10020: 5f 24 03 d5                     bti     c
+# CHECK-NEXT:    10024: f0 7b bf a9                     stp     x16, x30, [sp, #-16]!
+# CHECK-NEXT:    10028: 10 01 00 90                     adrp    x16, #131072
+# CHECK-NEXT:    1002c: 11 0a 40 f9                     ldr     x17, [x16, #16]
+# CHECK-NEXT:    10030: 10 42 00 91                     add     x16, x16, #16
+# CHECK-NEXT:    10034: 20 02 1f d6                     br      x17
+# CHECK-NEXT:    10038: 1f 20 03 d5                     nop
+# CHECK-NEXT:    1003c: 1f 20 03 d5                     nop
+# CHECK: 0000000000010040 func1@plt:
+# CHECK-NEXT:    10040: 5f 24 03 d5                     bti     c
+# CHECK-NEXT:    10044: 10 01 00 90                     adrp    x16, #131072
+# CHECK-NEXT:    10048: 11 0e 40 f9                     ldr     x17, [x16, #24]
+# CHECK-NEXT:    1004c: 10 62 00 91                     add     x16, x16, #24
+# CHECK-NEXT:    10050: 20 02 1f d6                     br      x17
+# CHECK-NEXT:    10054: 1f 20 03 d5                     nop
+# CHECK-NEXT:           ...
+# CHECK: 0000000000010060 myfunc:
+# CHECK-NEXT:    10060: 5f 24 03 d5                     bti     c
+# CHECK-NEXT:    10064: 10 01 00 90                     adrp    x16, #131072
+# CHECK-NEXT:    10068: 11 12 40 f9                     ldr     x17, [x16, #32]
+# CHECK-NEXT:    1006c: 10 82 00 91                     add     x16, x16, #32
+# CHECK-NEXT:    10070: 20 02 1f d6                     br      x17
+# CHECK-NEXT:    10074: 1f 20 03 d5                     nop
+
+.section ".note.gnu.property", "a"
+.long 4
+.long 0x10
+.long 0x5
+.asciz "GNU"
+
+.long 0xc0000000 // GNU_PROPERTY_AARCH64_FEATURE_1_AND
+.long 4
+.long 1          // GNU_PROPERTY_AARCH64_FEATURE_1_BTI
+.long 0
+
+.text
+.globl myfunc
+.type myfunc,@gnu_indirect_function
+myfunc:
+ ret
+
+.globl func1
+
+.text
+.globl _start
+.type _start, %function
+_start:
+  bl func1
+  adrp x8, myfunc
+  add x8, x8, :lo12:myfunc
+  ret
diff --git a/deps/lld/test/ELF/aarch64-jump26-thunk.s b/deps/lld/test/ELF/aarch64-jump26-thunk.s
index a381c701eca13469e6f3d538cc786ad62dbee89e..76206fcdcf78c23923913f521697588b85709f74 100644
--- a/deps/lld/test/ELF/aarch64-jump26-thunk.s
+++ b/deps/lld/test/ELF/aarch64-jump26-thunk.s
@@ -10,6 +10,7 @@ _start:
     b big
 
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // CHECK-NEXT:    210000:        02 00 00 14     b       #8
 // CHECK: __AArch64AbsLongThunk_big:
diff --git a/deps/lld/test/ELF/aarch64-ldprel-lo19-invalid.s b/deps/lld/test/ELF/aarch64-ldprel-lo19-invalid.s
index cf38b2c84fd077b1e0cfaa4dd9160437479f441c..be97945a26ca148f84c1de257bfb32999661867d 100644
--- a/deps/lld/test/ELF/aarch64-ldprel-lo19-invalid.s
+++ b/deps/lld/test/ELF/aarch64-ldprel-lo19-invalid.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=aarch64-linux-none %s -o %t.o
 # RUN: not ld.lld -shared %t.o -o /dev/null 2>&1 | FileCheck %s
 
-# CHECK: relocation R_AARCH64_LD_PREL_LO19 out of range: 2065536 is not in [-1048576, 1048575]
+# CHECK: relocation R_AARCH64_LD_PREL_LO19 out of range: 2131072 is not in [-1048576, 1048575]
 
   ldr x8, patatino
   .data
diff --git a/deps/lld/test/ELF/aarch64-load-alignment.s b/deps/lld/test/ELF/aarch64-load-alignment.s
index 175f1e6dad749c7c82b5594d002de37069133e0d..44304a3a21e168f20b3e895f29e2be45498b7819 100644
--- a/deps/lld/test/ELF/aarch64-load-alignment.s
+++ b/deps/lld/test/ELF/aarch64-load-alignment.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=aarch64-linux-none %s -o %t.o
 # RUN: not ld.lld -shared %t.o -o /dev/null 2>&1 | FileCheck %s
 
-# CHECK: improper alignment for relocation R_AARCH64_LD_PREL_LO19: 0x10005 is not aligned to 4 bytes
+# CHECK: improper alignment for relocation R_AARCH64_LD_PREL_LO19: 0x20005 is not aligned to 4 bytes
 
   ldr x8, patatino
   .data
diff --git a/deps/lld/test/ELF/aarch64-nopic-plt.s b/deps/lld/test/ELF/aarch64-nopic-plt.s
new file mode 100644
index 0000000000000000000000000000000000000000..1faa65cc7e95f1a48b9bd5572ecf41e5fc713d5b
--- /dev/null
+++ b/deps/lld/test/ELF/aarch64-nopic-plt.s
@@ -0,0 +1,27 @@
+// REQUIRES: aarch64
+// RUN: llvm-mc %s -o %t.o -filetype=obj -triple=aarch64-pc-linux
+// RUN: llvm-mc %p/Inputs/aarch64-copy2.s -o %t2.o -filetype=obj -triple=aarch64-pc-linux
+// RUN: ld.lld %t2.o -o %t2.so -shared
+// RUN: ld.lld %t.o %t2.so -o %t
+// RUN: llvm-readobj --symbols %t | FileCheck %s
+
+        .global _start
+_start:
+        adrp    x8, foo
+        bl bar
+
+// CHECK:      Name: bar
+// CHECK-NEXT: Value: 0x0
+// CHECK-NEXT: Size: 0
+// CHECK-NEXT: Binding: Global
+// CHECK-NEXT: Type: None
+// CHECK-NEXT: Other: 0
+// CHECK-NEXT: Section: Undefined
+
+// CHECK:      Name: foo
+// CHECK-NEXT: Value: 0x210030
+// CHECK-NEXT: Size: 0
+// CHECK-NEXT: Binding: Global
+// CHECK-NEXT: Type: Function
+// CHECK-NEXT: Other: 0
+// CHECK-NEXT: Section: Undefined
diff --git a/deps/lld/test/ELF/aarch64-prel16.s b/deps/lld/test/ELF/aarch64-prel16.s
index 18a594c319a1ff5c708890b897df7bf94a4c2a04..49c93472d8f0f9de20d291bc4c27f2fe82d3b8a9 100644
--- a/deps/lld/test/ELF/aarch64-prel16.s
+++ b/deps/lld/test/ELF/aarch64-prel16.s
@@ -25,7 +25,7 @@ _start:
 // CHECK-NEXT: 201000 ffff0080
 
 // RUN: not ld.lld -z max-page-size=4096 %t.o %t255.o -o %t2 2>&1 | FileCheck %s --check-prefix=OVERFLOW1
-// OVERFLOW1: relocation R_AARCH64_PREL16 out of range: -32769 is not in [-32768, 32767]
+// OVERFLOW1: relocation R_AARCH64_PREL16 out of range: -32769 is not in [-32768, 65535]
 
 // RUN: not ld.lld -z max-page-size=4096 %t.o %t257.o -o %t2 2>&1 | FileCheck %s --check-prefix=OVERFLOW2
-// OVERFLOW2: relocation R_AARCH64_PREL16 out of range: 65536 is not in [-32768, 32767]
+// OVERFLOW2: relocation R_AARCH64_PREL16 out of range: 65536 is not in [-32768, 65535]
diff --git a/deps/lld/test/ELF/aarch64-prel32.s b/deps/lld/test/ELF/aarch64-prel32.s
index 16c8bb3c201945277037403b2b35d4d99410bf59..7246caf2bfedb7954a51fa0c14d798b60ae18b4a 100644
--- a/deps/lld/test/ELF/aarch64-prel32.s
+++ b/deps/lld/test/ELF/aarch64-prel32.s
@@ -25,7 +25,7 @@ _start:
 // CHECK-NEXT: 201000 ffffffff 00000080
 
 // RUN: not ld.lld -z max-page-size=4096 %t.o %t255.o -o %t2 2>&1 | FileCheck %s --check-prefix=OVERFLOW1
-// OVERFLOW1: relocation R_AARCH64_PREL32 out of range: -2147483649 is not in [-2147483648, 2147483647]
+// OVERFLOW1: relocation R_AARCH64_PREL32 out of range: -2147483649 is not in [-2147483648, 4294967295]
 
 // RUN: not ld.lld -z max-page-size=4096 %t.o %t257.o -o %t2 2>&1 | FileCheck %s --check-prefix=OVERFLOW2
-// OVERFLOW2: relocation R_AARCH64_PREL32 out of range: 4294967296 is not in [-2147483648, 2147483647]
+// OVERFLOW2: relocation R_AARCH64_PREL32 out of range: 4294967296 is not in [-2147483648, 4294967295]
diff --git a/deps/lld/test/ELF/aarch64-property-relocatable.s b/deps/lld/test/ELF/aarch64-property-relocatable.s
new file mode 100644
index 0000000000000000000000000000000000000000..e6634e0e6919caf57ca59f2c40a336b39067d1af
--- /dev/null
+++ b/deps/lld/test/ELF/aarch64-property-relocatable.s
@@ -0,0 +1,36 @@
+# REQUIRES: aarch64
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %s -o %t.o
+# RUN: ld.lld -r %t.o -o %t2.o
+# RUN: llvm-readelf -n %t2.o | FileCheck -match-full-lines %s
+
+## Test that .note.gnu.property is passed through -r, and that we can handle
+## more than one FEATURE_AND in the same object file. This is logically the
+## same as if the features were combined in a single FEATURE_AND as the rule
+## states that the bit in the output pr_data field if it is set in all
+.text
+ret
+
+.section ".note.gnu.property", "a"
+.p2align 3
+.long 4
+.long 0x10
+.long 0x5
+.asciz "GNU"
+
+.long 0xc0000000 // GNU_PROPERTY_AARCH64_FEATURE_1_AND
+.long 4
+.long 1          // GNU_PROPERTY_AARCH64_FEATURE_1_BTI
+.long 0
+
+.long 4
+.long 0x10
+.long 0x5
+.asciz "GNU"
+.long 0xc0000000 // GNU_PROPERTY_AARCH64_FEATURE_1_AND
+.long 4
+.long 2          // GNU_PROPERTY_AARCH64_FEATURE_1_PAC
+.long 0
+
+# CHECK:   Owner                 Data size	Description
+# CHECK-NEXT:   GNU                   0x00000010	NT_GNU_PROPERTY_TYPE_0 (property note)
+# CHECK-NEXT:     Properties:    aarch64 feature: BTI, PAC
diff --git a/deps/lld/test/ELF/aarch64-relocs.s b/deps/lld/test/ELF/aarch64-relocs.s
index 93a67c00c6ec9618537c06e7f4675c1ceaf2c6ec..c76789680401e7e33394d0b6243df25e033de663 100644
--- a/deps/lld/test/ELF/aarch64-relocs.s
+++ b/deps/lld/test/ELF/aarch64-relocs.s
@@ -12,6 +12,7 @@ msg:  .asciz  "Hello, world\n"
 msgend:
 
 # CHECK: Disassembly of section .R_AARCH64_ADR_PREL_LO21:
+# CHECK-EMPTY:
 # CHECK: _start:
 # CHECK:        0:       21 00 00 10     adr     x1, #4
 # CHECK: msg:
@@ -29,6 +30,7 @@ mystr:
 # PAGE(P) = 0x210000
 #
 # CHECK: Disassembly of section .R_AARCH64_ADR_PREL_PG_H121:
+# CHECK-EMPTY:
 # CHECK-NEXT: $x.2:
 # CHECK-NEXT:   210012:       01 00 00 90     adrp    x1, #0
 
@@ -43,6 +45,7 @@ mystr:
 # R << 10 = 0x7c00
 #
 # CHECK: Disassembly of section .R_AARCH64_ADD_ABS_LO12_NC:
+# CHECK-EMPTY:
 # CHECK-NEXT: $x.4:
 # CHECK-NEXT:   21001b:       00 7c 00 91     add     x0, x0, #31
 
@@ -56,6 +59,7 @@ foo:
 # R = ((S + A) & 0xFFF) << 7 = 0x00001400
 # 0x00001400 | 0xf940177c = 0xf940177c
 # CHECK: Disassembly of section .R_AARCH64_LDST64_ABS_LO12_NC:
+# CHECK-EMPTY:
 # CHECK-NEXT: $x.6:
 # CHECK-NEXT:   210024:       7c 17 40 f9     ldr     x28, [x27, #40]
 
@@ -65,6 +69,7 @@ sub:
   nop
 
 # CHECK: Disassembly of section .SUB:
+# CHECK-EMPTY:
 # CHECK-NEXT: $x.8:
 # CHECK-NEXT:   21002c:       1f 20 03 d5     nop
 # CHECK: sub:
@@ -79,6 +84,7 @@ call26:
 # (R & 0x0ffffffc) >> 2 = 0x03ffffff
 # 0x94000000 | 0x03ffffff = 0x97ffffff
 # CHECK: Disassembly of section .R_AARCH64_CALL26:
+# CHECK-EMPTY:
 # CHECK-NEXT: call26:
 # CHECK-NEXT:   210034:       ff ff ff 97     bl     #-4
 
@@ -91,6 +97,7 @@ jump26:
 # (R & 0x0ffffffc) >> 2 = 0x03fffffe
 # 0x14000000 | 0x03fffffe = 0x17fffffe
 # CHECK: Disassembly of section .R_AARCH64_JUMP26:
+# CHECK-EMPTY:
 # CHECK-NEXT: jump26:
 # CHECK-NEXT:   210038:       fe ff ff 17     b      #-8
 
@@ -105,6 +112,7 @@ foo32:
 # R = ((S + A) & 0xFFC) << 8 = 0x00004000
 # 0x00004000 | 0xbd4000a4 = 0xbd4040a4
 # CHECK: Disassembly of section .R_AARCH64_LDST32_ABS_LO12_NC:
+# CHECK-EMPTY:
 # CHECK-NEXT: ldst32:
 # CHECK-NEXT:   21003c:       a4 40 40 bd     ldr s4, [x5, #64]
 
@@ -119,6 +127,7 @@ foo8:
 # R = ((S + A) & 0xFFF) << 10 = 0x00012000
 # 0x00012000 | 0x398001ab = 0x398121ab
 # CHECK: Disassembly of section .R_AARCH64_LDST8_ABS_LO12_NC:
+# CHECK-EMPTY:
 # CHECK-NEXT: ldst8:
 # CHECK-NEXT:   210044:       ab 21 81 39     ldrsb x11, [x13, #72]
 
@@ -133,6 +142,7 @@ foo128:
 # R = ((S + A) & 0xFF8) << 6 = 0x00001400
 # 0x00001400 | 0x3dc00274 = 0x3dc01674
 # CHECK: Disassembly of section .R_AARCH64_LDST128_ABS_LO12_NC:
+# CHECK-EMPTY:
 # CHECK: ldst128:
 # CHECK:   21004c:       74 16 c0 3d     ldr     q20, [x19, #80]
 #foo128:
@@ -151,6 +161,7 @@ foo16:
 # R = ((S + A) & 0x0FFC) << 9 = 0xb000
 # 0xb000 | 0x7d400271 = 0x7d40b271
 # CHECK: Disassembly of section .R_AARCH64_LDST16_ABS_LO12_NC:
+# CHECK-EMPTY:
 # CHECK-NEXT: ldst16:
 # CHECK-NEXT:   210054:       71 c2 40 7d     ldr     h17, [x19, #96]
 # CHECK-NEXT:   210058:       61 c2 40 79     ldrh    w1, [x19, #96]
@@ -166,6 +177,7 @@ movz1:
 
 ## 4222124650659840 == (0xF << 48)
 # CHECK: Disassembly of section .R_AARCH64_MOVW_UABS:
+# CHECK-EMPTY:
 # CHECK-NEXT: movz1:
 # CHECK-NEXT: 8c 01 80 f2   movk  x12, #12
 # CHECK-NEXT: ad 01 a0 f2   movk  x13, #13, lsl #16
diff --git a/deps/lld/test/ELF/aarch64-relro.s b/deps/lld/test/ELF/aarch64-relro.s
index 3ec19d73d683c71f06688fc327f34117ceb434b0..6d811c08790a06476d36fd0e9e01efb7dadafea5 100644
--- a/deps/lld/test/ELF/aarch64-relro.s
+++ b/deps/lld/test/ELF/aarch64-relro.s
@@ -1,7 +1,7 @@
 # REQUIRES: aarch64
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj -l %t2 | FileCheck %s
 
 # CHECK:      Type: PT_GNU_RELRO
 # CHECK-NEXT: Offset:
diff --git a/deps/lld/test/ELF/aarch64-thunk-pi.s b/deps/lld/test/ELF/aarch64-thunk-pi.s
index 345e6ee91f58f7460c49232787af75ee097cb1dc..834a069fb53ba6d9cdaef1f7b9b81be446628b8a 100644
--- a/deps/lld/test/ELF/aarch64-thunk-pi.s
+++ b/deps/lld/test/ELF/aarch64-thunk-pi.s
@@ -72,11 +72,12 @@ high_target2:
 // CHECK-NEXT: 10000018:	00 02 1f d6 	br	x16
 
 // CHECK: Disassembly of section .plt:
+// CHECK-EMPTY:
 // CHECK-NEXT: .plt:
 // CHECK-NEXT: 10000020:       f0 7b bf a9     stp     x16, x30, [sp, #-16]!
 // CHECK-NEXT: 10000024:       10 00 00 90     adrp    x16, #0
-// CHECK-NEXT: 10000028:       11 3a 40 f9     ldr     x17, [x16, #112]
-// CHECK-NEXT: 1000002c:       10 c2 01 91     add     x16, x16, #112
+// CHECK-NEXT: 10000028:       11 92 40 f9     ldr     x17, [x16, #288]
+// CHECK-NEXT: 1000002c:       10 82 04 91     add     x16, x16, #288
 // CHECK-NEXT: 10000030:       20 02 1f d6     br      x17
 // CHECK-NEXT: 10000034:       1f 20 03 d5     nop
 // CHECK-NEXT: 10000038:       1f 20 03 d5     nop
@@ -84,12 +85,12 @@ high_target2:
 // CHECK-EMPTY:
 // CHECK-NEXT:   high_target@plt:
 // CHECK-NEXT: 10000040:       10 00 00 90     adrp    x16, #0
-// CHECK-NEXT: 10000044:       11 3e 40 f9     ldr     x17, [x16, #120]
-// CHECK-NEXT: 10000048:       10 e2 01 91     add     x16, x16, #120
+// CHECK-NEXT: 10000044:       11 96 40 f9     ldr     x17, [x16, #296]
+// CHECK-NEXT: 10000048:       10 a2 04 91     add     x16, x16, #296
 // CHECK-NEXT: 1000004c:       20 02 1f d6     br      x17
 // CHECK-EMPTY:
 // CHECK-NEXT:   low_target@plt:
 // CHECK-NEXT: 10000050:       10 00 00 90     adrp    x16, #0
-// CHECK-NEXT: 10000054:       11 42 40 f9     ldr     x17, [x16, #128]
-// CHECK-NEXT: 10000058:       10 02 02 91     add     x16, x16, #128
+// CHECK-NEXT: 10000054:       11 9a 40 f9     ldr     x17, [x16, #304]
+// CHECK-NEXT: 10000058:       10 c2 04 91     add     x16, x16, #304
 // CHECK-NEXT: 1000005c:       20 02 1f d6     br      x17
diff --git a/deps/lld/test/ELF/aarch64-thunk-script.s b/deps/lld/test/ELF/aarch64-thunk-script.s
index 1dfdcbc7a5624446fced9559c7b78a3187864744..0d735fe9b776a619bf98d3e28ce73c15e2ce5994 100644
--- a/deps/lld/test/ELF/aarch64-thunk-script.s
+++ b/deps/lld/test/ELF/aarch64-thunk-script.s
@@ -26,6 +26,7 @@ high_target:
  ret
 
 // CHECK: Disassembly of section .text_low:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // CHECK-NEXT:     2000:       02 00 00 94     bl      #8
 // CHECK-NEXT:     2004:       c0 03 5f d6     ret
@@ -36,6 +37,7 @@ high_target:
 // CHECK-NEXT:     2010:       00 20 00 08     .word   0x08002000
 // CHECK-NEXT:     2014:       00 00 00 00     .word   0x00000000
 // CHECK: Disassembly of section .text_high:
+// CHECK-EMPTY:
 // CHECK-NEXT: high_target:
 // CHECK-NEXT:  8002000:       00 00 00 96     bl      #-134217728
 // CHECK-NEXT:  8002004:       c0 03 5f d6     ret
diff --git a/deps/lld/test/ELF/aarch64-tls-gdie.s b/deps/lld/test/ELF/aarch64-tls-gdie.s
index 3b795f60e0d8f64911346d1282851f0a8eaabadf..588a46acfce4b1020290a14b3ccc06b48692e849 100644
--- a/deps/lld/test/ELF/aarch64-tls-gdie.s
+++ b/deps/lld/test/ELF/aarch64-tls-gdie.s
@@ -3,8 +3,8 @@
 // RUN: llvm-mc %p/Inputs/aarch64-tls-gdie.s -o %t2.o -filetype=obj -triple=aarch64-pc-linux
 // RUN: ld.lld %t2.o -o %t2.so -shared
 // RUN: ld.lld --hash-style=sysv %t.o %t2.so -o %t
-// RUN: llvm-readobj -s %t | FileCheck --check-prefix=SEC %s
-// RUN: llvm-objdump -d %t | FileCheck %s
+// RUN: llvm-readobj -S %t | FileCheck --check-prefix=SEC %s
+// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 
         .globl  _start
 _start:
@@ -27,8 +27,8 @@ _start:
 // 0x0B0 = 176
 
 // CHECK:      _start:
-// CHECK-NEXT: 210000: {{.*}} nop
-// CHECK-NEXT: 210004: {{.*}} adrp       x0, #65536
-// CHECK-NEXT: 210008: {{.*}} ldr        x0, [x0, #176]
-// CHECK-NEXT: 21000c: {{.*}} nop
-// CHECK-NEXT: 210010: {{.*}} nop
+// CHECK-NEXT: 210000: nop
+// CHECK-NEXT: 210004: adrp    x0, #65536
+// CHECK-NEXT: 210008: ldr     x0, [x0, #176]
+// CHECK-NEXT: 21000c: nop
+// CHECK-NEXT: 210010: nop
diff --git a/deps/lld/test/ELF/aarch64-tls-gdle.s b/deps/lld/test/ELF/aarch64-tls-gdle.s
index 882ec8c1ae1764093fef5292488ae982676c9532..533955fb375e0d991b6eb697ee8bfa885e1f2b3e 100644
--- a/deps/lld/test/ELF/aarch64-tls-gdle.s
+++ b/deps/lld/test/ELF/aarch64-tls-gdle.s
@@ -2,20 +2,21 @@
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %p/Inputs/aarch64-tls-ie.s -o %ttlsie.o
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %s -o %tmain.o
 # RUN: ld.lld %tmain.o %ttlsie.o -o %tout
-# RUN: llvm-objdump -d %tout | FileCheck %s
-# RUN: llvm-readobj -s -r %tout | FileCheck -check-prefix=RELOC %s
+# RUN: llvm-objdump -d --no-show-raw-insn %tout | FileCheck %s
+# RUN: llvm-readobj -r %tout | FileCheck -check-prefix=RELOC %s
 
-#Local-Dynamic to Local-Exec relax creates no
-#RELOC:      Relocations [
-#RELOC-NEXT: ]
+## Local-Dynamic to Local-Exec relax creates no dynamic relocations.
+# RELOC:      Relocations [
+# RELOC-NEXT: ]
 
-# TCB size = 64 and foo is first element from TLS register.
+# TCB size = 0x16 and foo is first element from TLS register.
 # CHECK: Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK: _start:
-# CHECK:  210000:	00 00 a0 d2	movz	x0, #0, lsl #16
-# CHECK:  210004:	00 08 80 f2 	movk	x0, #64
-# CHECK:  210008:	1f 20 03 d5 	nop
-# CHECK:  21000c:	1f 20 03 d5 	nop
+# CHECK:  210000: movz    x0, #0, lsl #16
+# CHECK:  210004: movk    x0, #16
+# CHECK:  210008: nop
+# CHECK:  21000c: nop
 
 .globl _start
 _start:
diff --git a/deps/lld/test/ELF/aarch64-tls-ie.s b/deps/lld/test/ELF/aarch64-tls-ie.s
index 5786fe3a0a97e4560b891aed974cf77425f19db8..3d35876c90577d568dd858dbceeb496f880ee4d9 100644
--- a/deps/lld/test/ELF/aarch64-tls-ie.s
+++ b/deps/lld/test/ELF/aarch64-tls-ie.s
@@ -1,45 +1,43 @@
-// REQUIRES: aarch64
 # REQUIRES: aarch64
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd %p/Inputs/aarch64-tls-ie.s -o %tdso.o
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd %s -o %tmain.o
 # RUN: ld.lld -shared %tdso.o -o %tdso.so
 # RUN: ld.lld --hash-style=sysv %tmain.o %tdso.so -o %tout
-# RUN: llvm-objdump -d %tout | FileCheck %s
-# RUN: llvm-readobj -s -r %tout | FileCheck -check-prefix=RELOC %s
+# RUN: llvm-objdump -d --no-show-raw-insn %tout | FileCheck %s
+# RUN: llvm-readobj -S -r %tout | FileCheck -check-prefix=RELOC %s
 
-#RELOC:      Section {
-#RELOC:        Index:
-#RELOC:        Name: .got
-#RELOC-NEXT:   Type: SHT_PROGBITS
-#RELOC-NEXT:   Flags [
-#RELOC-NEXT:     SHF_ALLOC
-#RELOC-NEXT:     SHF_WRITE
-#RELOC-NEXT:   ]
-#RELOC-NEXT:   Address: 0x2200B0
-#RELOC-NEXT:   Offset: 0x200B0
-#RELOC-NEXT:   Size: 16
-#RELOC-NEXT:   Link: 0
-#RELOC-NEXT:   Info: 0
-#RELOC-NEXT:   AddressAlignment: 8
-#RELOC-NEXT:   EntrySize: 0
-#RELOC-NEXT: }
-#RELOC:      Relocations [
-#RELOC-NEXT:  Section ({{.*}}) .rela.dyn {
-#RELOC-NEXT:    0x2200B8 R_AARCH64_TLS_TPREL64 bar 0x0
-#RELOC-NEXT:    0x2200B0 R_AARCH64_TLS_TPREL64 foo 0x0
-#RELOC-NEXT:  }
-#RELOC-NEXT:]
+# RELOC:      Section {
+# RELOC:        Index:
+# RELOC:        Name: .got
+# RELOC-NEXT:   Type: SHT_PROGBITS
+# RELOC-NEXT:   Flags [
+# RELOC-NEXT:     SHF_ALLOC
+# RELOC-NEXT:     SHF_WRITE
+# RELOC-NEXT:   ]
+# RELOC-NEXT:   Address: 0x2200B0
+# RELOC-NEXT:   Offset: 0x200B0
+# RELOC-NEXT:   Size: 16
+# RELOC-NEXT:   Link: 0
+# RELOC-NEXT:   Info: 0
+# RELOC-NEXT:   AddressAlignment: 8
+# RELOC-NEXT:   EntrySize: 0
+# RELOC-NEXT: }
+# RELOC:      Relocations [
+# RELOC-NEXT:  Section ({{.*}}) .rela.dyn {
+# RELOC-NEXT:    0x2200B8 R_AARCH64_TLS_TPREL64 bar 0x0
+# RELOC-NEXT:    0x2200B0 R_AARCH64_TLS_TPREL64 foo 0x0
+# RELOC-NEXT:  }
+# RELOC-NEXT:]
 
-# Page(0x2200B0) - Page(0x210000) = 0x10000 = 65536
-# 0x2200B0 & 0xff8 = 0xB0 = 176
-# Page(0x2200B8) - Page(0x210000) = 0x10000 = 65536
-# 0x2200B8 & 0xff8 = 0xB8 = 184
-#CHECK: Disassembly of section .text:
-#CHECK: _start:
-#CHECK:  210000: 80 00 00 90 adrp x0, #65536
-#CHECK:  210004: 00 58 40 f9 ldr  x0, [x0, #176]
-#CHECK:  210008: 80 00 00 90 adrp x0, #65536
-#CHECK:  21000c: 00 5c 40 f9 ldr  x0, [x0, #184]
+## Page(0x2200B0) - Page(0x210000) = 0x10000 = 65536
+## 0x2200B0 & 0xff8 = 0xB0 = 176
+## Page(0x2200B8) - Page(0x210000) = 0x10000 = 65536
+## 0x2200B8 & 0xff8 = 0xB8 = 184
+# CHECK:     _start:
+# CHECK-NEXT: 210000: adrp x0, #65536
+# CHECK-NEXT: 210004: ldr  x0, [x0, #176]
+# CHECK-NEXT: 210008: adrp x0, #65536
+# CHECK-NEXT: 21000c: ldr  x0, [x0, #184]
 
 .globl _start
 _start:
diff --git a/deps/lld/test/ELF/aarch64-tls-iele.s b/deps/lld/test/ELF/aarch64-tls-iele.s
index 0229d6676cd59843c873dfb38c8dab374709756d..928ea450e9e732d84d90f64eebae54eec0581866 100644
--- a/deps/lld/test/ELF/aarch64-tls-iele.s
+++ b/deps/lld/test/ELF/aarch64-tls-iele.s
@@ -2,20 +2,25 @@
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %p/Inputs/aarch64-tls-ie.s -o %ttlsie.o
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %s -o %tmain.o
 # RUN: ld.lld %tmain.o %ttlsie.o -o %tout
-# RUN: llvm-objdump -d %tout | FileCheck %s
-# RUN: llvm-readobj -s -r %tout | FileCheck -check-prefix=RELOC %s
+# RUN: llvm-objdump -d --no-show-raw-insn %tout | FileCheck %s
+# RUN: llvm-readobj -r %tout | FileCheck -check-prefix=RELOC %s
+
+# RUN: ld.lld -pie %tmain.o %ttlsie.o -o %tout
+# RUN: llvm-objdump -d --no-show-raw-insn %tout | FileCheck %s
+# RUN: llvm-readobj -r %tout | FileCheck -check-prefix=RELOC %s
 
 # Initial-Exec to Local-Exec relax creates no dynamic relocations.
 # RELOC:      Relocations [
 # RELOC-NEXT: ]
 
-# TCB size = 64 and foo is first element from TLS register.
+# TCB size = 0x16 and foo is first element from TLS register.
 # CHECK: Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK: _start:
-# CHECK-NEXT: 210000:  00 00 a0 d2   movz   x0, #0, lsl #16
-# CHECK-NEXT: 210004:  80 08 80 f2   movk   x0, #68
-# CHECK-NEXT: 210008:  00 00 a0 d2   movz   x0, #0, lsl #16
-# CHECK-NEXT: 21000c:  00 08 80 f2   movk   x0, #64
+# CHECK-NEXT: movz   x0, #0, lsl #16
+# CHECK-NEXT: movk   x0, #20
+# CHECK-NEXT: movz   x0, #0, lsl #16
+# CHECK-NEXT: movk   x0, #16
 
 .section .tdata
 .align 2
diff --git a/deps/lld/test/ELF/aarch64-tls-le.s b/deps/lld/test/ELF/aarch64-tls-le.s
index 49c322facb12809fcd72ee2898729496e5bdcefb..573349f90f84ddcd696a598e6fe8fae8ebe14880 100644
--- a/deps/lld/test/ELF/aarch64-tls-le.s
+++ b/deps/lld/test/ELF/aarch64-tls-le.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd %s -o %tmain.o
 # RUN: ld.lld %tmain.o -o %tout
 # RUN: llvm-objdump -d %tout | FileCheck %s
-# RUN: llvm-readobj -s -r %tout | FileCheck -check-prefix=RELOC %s
+# RUN: llvm-readobj -S -r %tout | FileCheck -check-prefix=RELOC %s
 
 #Local-Dynamic to Local-Exec relax creates no
 #RELOC:      Relocations [
@@ -17,12 +17,12 @@ _start:
  add x0, x0, :tprel_hi12:v2
  add x0, x0, :tprel_lo12_nc:v2
 
-# TCB size = 64 and foo is first element from TLS register.
+# TCB size = 0x16 and foo is first element from TLS register.
 #CHECK: Disassembly of section .text:
 #CHECK: _start:
 #CHECK:  210000: 40 d0 3b d5     mrs     x0, TPIDR_EL0
 #CHECK:  210004: 00 00 40 91     add     x0, x0, #0, lsl #12
-#CHECK:  210008: 00 00 01 91     add     x0, x0, #64
+#CHECK:  210008: 00 40 00 91     add     x0, x0, #16
 #CHECK:  21000c: 40 d0 3b d5     mrs     x0, TPIDR_EL0
 #CHECK:  210010: 00 fc 7f 91     add     x0, x0, #4095, lsl #12
 #CHECK:  210014: 00 e0 3f 91     add     x0, x0, #4088
@@ -36,9 +36,9 @@ v1:
 .word  0
 .size  v1, 4
 
-# The current offset from the thread pointer is 68. Raise it to just below the
+# The current offset from the thread pointer is 20. Raise it to just below the
 # 24-bit limit.
-.space (0xfffff8 - 68)
+.space (0xfffff8 - 20)
 
 .type   v2,@object
 .globl  v2
diff --git a/deps/lld/test/ELF/aarch64-tls-pie.s b/deps/lld/test/ELF/aarch64-tls-pie.s
deleted file mode 100644
index 466045d6765da9247f5994352d2f1d8a7c9ae695..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/aarch64-tls-pie.s
+++ /dev/null
@@ -1,28 +0,0 @@
-# REQUIRES: aarch64
-# RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-cloudabi %s -o %t1.o
-# RUN: ld.lld -pie %t1.o -o %t
-# RUN: llvm-readobj -r %t | FileCheck %s
-
-# Similar to bug 27174: R_AARCH64_TLSLE_*TPREL* relocations should be
-# eliminated when building a PIE executable, as the static TLS layout is
-# fixed.
-#
-# CHECK:      Relocations [
-# CHECK-NEXT: ]
-
-	.globl	_start
-_start:
-	# Accessing the variable directly.
-	add	x11, x8, :tprel_hi12:i
-	add	x11, x11, :tprel_lo12_nc:i
-
-	# Accessing the variable through the GOT.
-	adrp	x10, :gottprel:i
-	mrs	x8, TPIDR_EL0
-	ldr	x10, [x10, :gottprel_lo12:i]
-
-	.section	.tbss.i,"awT",@nobits
-	.globl	i
-i:
-	.word	0
-	.size	i, 4
diff --git a/deps/lld/test/ELF/aarch64-tls-static.s b/deps/lld/test/ELF/aarch64-tls-static.s
index 309a2e9f56ca0395d1e4528e083e00d54bcf8a53..cab60f33703e68e28af4f8ad2db0801f6facf78c 100644
--- a/deps/lld/test/ELF/aarch64-tls-static.s
+++ b/deps/lld/test/ELF/aarch64-tls-static.s
@@ -1,7 +1,7 @@
 // REQUIRES: aarch64
 // RUN: llvm-mc %s -o %t.o -triple aarch64-pc-linux -filetype=obj
 // RUN: ld.lld --hash-style=sysv %t.o -o %t.so -shared
-// RUN: llvm-readobj -s %t.so | FileCheck --check-prefix=SEC %s
+// RUN: llvm-readobj -S %t.so | FileCheck --check-prefix=SEC %s
 // RUN: llvm-objdump -d %t.so | FileCheck %s
 
 foo:
diff --git a/deps/lld/test/ELF/aarch64-tlsld-ldst.s b/deps/lld/test/ELF/aarch64-tlsld-ldst.s
index 8ebdc2f152a6c60a66f0fc9b9115b3e9f97578f3..3f00630bd95c7864ee80bfcf40ae90ebc2bb4f25 100644
--- a/deps/lld/test/ELF/aarch64-tlsld-ldst.s
+++ b/deps/lld/test/ELF/aarch64-tlsld-ldst.s
@@ -1,7 +1,7 @@
 // REQUIRES: aarch64
 // RUN: llvm-mc -triple=aarch64-linux-gnu -filetype=obj %s -o %t.o
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-objdump -d %t | FileCheck %s
+// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 // RUN: llvm-readelf --symbols %t | FileCheck -check-prefix CHECK-SYMS %s
 
         .text
@@ -25,28 +25,28 @@ _start:  mrs x8, TPIDR_EL0
         ldrb w0, [x8, :tprel_lo12_nc:var4]
 
 // CHECK: _start:
-// CHECK-NEXT:    210000:       48 d0 3b d5     mrs     x8, TPIDR_EL0
-// 0x0 + c40 = 0xc40       = tcb (64-bytes) + var0
-// CHECK-NEXT:    210004:       08 01 40 91     add x8, x8, #0, lsl #12
-// CHECK-NEXT:    210008:       14 11 c3 3d     ldr q20, [x8, #3136]
-// 0x1000 + 0x850 = 0x1850 = tcb + var1
-// CHECK-NEXT:    21000c:       08 05 40 91     add x8, x8, #1, lsl #12
-// CHECK-NEXT:    210010:       00 29 44 f9     ldr x0, [x8, #2128]
-// 0x2000 + 0x458 = 0x2458 = tcb + var2
-// CHECK-NEXT:    210014:       08 09 40 91     add x8, x8, #2, lsl #12
-// CHECK-NEXT:    210018:       00 59 44 b9     ldr w0, [x8, #1112]
-// 0x3000 + 0x5c  = 0x305c = tcb + var3
-// CHECK-NEXT:    21001c:       08 0d 40 91     add x8, x8, #3, lsl #12
-// CHECK-NEXT:    210020:       00 b9 40 79     ldrh  w0, [x8, #92]
-// 0x3000 + 0xc5e = 0x3c5e = tcb + var4
-// CHECK-NEXT:    210024:       08 0d 40 91     add x8, x8, #3, lsl #12
-// CHECK-NEXT:    210028:       00 79 71 39     ldrb  w0, [x8, #3166]
+// CHECK-NEXT:    210000:       mrs     x8, TPIDR_EL0
+// 0x0 + c10 = 0xc10       = tcb (16-bytes) + var0
+// CHECK-NEXT:    210004:       add     x8, x8, #0, lsl #12
+// CHECK-NEXT:    210008:       ldr     q20, [x8, #3088]
+// 0x1000 + 0x820 = 0x1820 = tcb + var1
+// CHECK-NEXT:    21000c:       add     x8, x8, #1, lsl #12
+// CHECK-NEXT:    210010:       ldr     x0, [x8, #2080]
+// 0x2000 + 0x428 = 0x2428 = tcb + var2
+// CHECK-NEXT:    210014:       add     x8, x8, #2, lsl #12
+// CHECK-NEXT:    210018:       ldr     w0, [x8, #1064]
+// 0x3000 + 0x2c  = 0x302c = tcb + var3
+// CHECK-NEXT:    21001c:       add     x8, x8, #3, lsl #12
+// CHECK-NEXT:    210020:       ldrh    w0, [x8, #44]
+// 0x3000 + 0xc2e = 0x32ce = tcb + var4
+// CHECK-NEXT:    210024:       add     x8, x8, #3, lsl #12
+// CHECK-NEXT:    210028:       ldrb    w0, [x8, #3118]
 
-// CHECK-SYMS:      0000000000000c00    16 TLS     GLOBAL DEFAULT    2 var0
-// CHECK-SYMS-NEXT: 0000000000001810     8 TLS     GLOBAL DEFAULT    2 var1
-// CHECK-SYMS-NEXT: 0000000000002418     4 TLS     GLOBAL DEFAULT    2 var2
-// CHECK-SYMS-NEXT: 000000000000301c     2 TLS     GLOBAL DEFAULT    2 var3
-// CHECK-SYMS-NEXT: 0000000000003c1e     1 TLS     GLOBAL DEFAULT    2 var4
+// CHECK-SYMS:      0000000000000c00     0 TLS     GLOBAL DEFAULT    2 var0
+// CHECK-SYMS-NEXT: 0000000000001810     4 TLS     GLOBAL DEFAULT    2 var1
+// CHECK-SYMS-NEXT: 0000000000002418     2 TLS     GLOBAL DEFAULT    2 var2
+// CHECK-SYMS-NEXT: 000000000000301c     1 TLS     GLOBAL DEFAULT    2 var3
+// CHECK-SYMS-NEXT: 0000000000003c1e     0 TLS     GLOBAL DEFAULT    2 var4
 
         .globl var0
         .globl var1
@@ -59,12 +59,12 @@ _start:  mrs x8, TPIDR_EL0
         .type var3,@object
 
 .section .tbss,"awT",@nobits
-        .balign 64
+        .balign 16
         .space 1024 * 3
 var0:
         .quad 0
         .quad 0
-        .size var0, 16
+        .size var1, 16
         .space 1024 * 3
 var1:
         .quad 0
@@ -72,14 +72,14 @@ var1:
         .space 1024 * 3
 var2:
         .word 0
-        .size var2, 4
+        .size var1, 4
 
         .space 1024 * 3
 var3:
         .hword 0
-        .size var3, 2
+        .size var2, 2
         .space 1024 * 3
 var4:
         .byte 0
-        .size var4, 1
+        .size var3, 1
         .space 1024 * 3
diff --git a/deps/lld/test/ELF/aarch64-tstbr14-reloc.s b/deps/lld/test/ELF/aarch64-tstbr14-reloc.s
index 9e9d969d9bb6e0a7266583dcfbb8b36349f85691..e473bdf121401516e76f7de8ef7a1c7a8218e826 100644
--- a/deps/lld/test/ELF/aarch64-tstbr14-reloc.s
+++ b/deps/lld/test/ELF/aarch64-tstbr14-reloc.s
@@ -5,13 +5,14 @@
 # RUN: llvm-objdump -d %t | FileCheck %s
 # RUN: ld.lld -shared %t1 %t2 -o %t3
 # RUN: llvm-objdump -d %t3 | FileCheck -check-prefix=DSO %s
-# RUN: llvm-readobj -s -r %t3 | FileCheck -check-prefix=DSOREL %s
+# RUN: llvm-readobj -S -r %t3 | FileCheck -check-prefix=DSOREL %s
 
 # 0x1101c - 28 = 0x20000
 # 0x11020 - 16 = 0x20010
 # 0x11024 - 36 = 0x20000
 # 0x11028 - 24 = 0x20010
 # CHECK:      Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: _foo:
 # CHECK-NEXT:  210000: {{.*}} nop
 # CHECK-NEXT:  210004: {{.*}} nop
@@ -35,8 +36,8 @@
 #DSOREL-NEXT:     SHF_ALLOC
 #DSOREL-NEXT:     SHF_WRITE
 #DSOREL-NEXT:   ]
-#DSOREL-NEXT:   Address: 0x20000
-#DSOREL-NEXT:   Offset: 0x20000
+#DSOREL-NEXT:   Address: 0x30000
+#DSOREL-NEXT:   Offset: 0x30000
 #DSOREL-NEXT:   Size: 40
 #DSOREL-NEXT:   Link: 0
 #DSOREL-NEXT:   Info: 0
@@ -45,12 +46,13 @@
 #DSOREL-NEXT:  }
 #DSOREL:      Relocations [
 #DSOREL-NEXT:  Section ({{.*}}) .rela.plt {
-#DSOREL-NEXT:    0x20018 R_AARCH64_JUMP_SLOT _foo
-#DSOREL-NEXT:    0x20020 R_AARCH64_JUMP_SLOT _bar
+#DSOREL-NEXT:    0x30018 R_AARCH64_JUMP_SLOT _foo
+#DSOREL-NEXT:    0x30020 R_AARCH64_JUMP_SLOT _bar
 #DSOREL-NEXT:  }
 #DSOREL-NEXT:]
 
 #DSO:      Disassembly of section .text:
+#DSO-EMPTY:
 #DSO-NEXT: _foo:
 #DSO-NEXT:  10000: {{.*}} nop
 #DSO-NEXT:  10004: {{.*}} nop
@@ -69,10 +71,12 @@
 #DSO-NEXT:  10020: {{.*}} tbnz w3, #15, #64
 #DSO-NEXT:  10024: {{.*}} tbz x6, #45, #44
 #DSO-NEXT:  10028: {{.*}} tbz x6, #45, #56
+#DSO-EMPTY:
 #DSO-NEXT: Disassembly of section .plt:
+#DSO-EMPTY:
 #DSO-NEXT: .plt:
 #DSO-NEXT:  10030: {{.*}} stp x16, x30, [sp, #-16]!
-#DSO-NEXT:  10034: {{.*}} adrp x16, #65536
+#DSO-NEXT:  10034: {{.*}} adrp x16, #131072
 #DSO-NEXT:  10038: {{.*}} ldr x17, [x16, #16]
 #DSO-NEXT:  1003c: {{.*}} add x16, x16, #16
 #DSO-NEXT:  10040: {{.*}} br x17
@@ -81,13 +85,13 @@
 #DSO-NEXT:  1004c: {{.*}} nop
 #DSO-EMPTY:
 #DSO-NEXT:   _foo@plt:
-#DSO-NEXT:  10050: {{.*}} adrp x16, #65536
+#DSO-NEXT:  10050: {{.*}} adrp x16, #131072
 #DSO-NEXT:  10054: {{.*}} ldr x17, [x16, #24]
 #DSO-NEXT:  10058: {{.*}} add x16, x16, #24
 #DSO-NEXT:  1005c: {{.*}} br x17
 #DSO-EMPTY:
 #DSO-NEXT:   _bar@plt:
-#DSO-NEXT:  10060: {{.*}} adrp x16, #65536
+#DSO-NEXT:  10060: {{.*}} adrp x16, #131072
 #DSO-NEXT:  10064: {{.*}} ldr x17, [x16, #32]
 #DSO-NEXT:  10068: {{.*}} add x16, x16, #32
 #DSO-NEXT:  1006c: {{.*}} br x17
diff --git a/deps/lld/test/ELF/aarch64-undefined-weak.s b/deps/lld/test/ELF/aarch64-undefined-weak.s
index ef14bfc237abd5f062b2592ba76505ac06aa2204..348385ae736eea3ceb3ecb9d3b28f5b1a483e6cb 100644
--- a/deps/lld/test/ELF/aarch64-undefined-weak.s
+++ b/deps/lld/test/ELF/aarch64-undefined-weak.s
@@ -34,6 +34,7 @@ _start:
  ldr x8, target
 
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // 2162688 = 0x210000
 // CHECK:         210000: {{.*}} b       #4
 // CHECK-NEXT:    210004: {{.*}} bl      #4
diff --git a/deps/lld/test/ELF/abs-hidden.s b/deps/lld/test/ELF/abs-hidden.s
index 82d19cdc015a8513668d658974e25c33ded6f017..e607b42584ecf67ebc1c5a444dd6ab2e8bb4d023 100644
--- a/deps/lld/test/ELF/abs-hidden.s
+++ b/deps/lld/test/ELF/abs-hidden.s
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/abs-hidden.s -o %t2.o
 // RUN: ld.lld --hash-style=sysv %t.o %t2.o -o %t.so -shared
-// RUN: llvm-readobj -r -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -r -S --section-data %t.so | FileCheck %s
 
         .quad foo
         .long foo@gotpcrel
diff --git a/deps/lld/test/ELF/allow-shlib-undefined.s b/deps/lld/test/ELF/allow-shlib-undefined.s
index abb0351db72343c6ec9a84a8e7eede725c00eeb1..5b09681f2e9d0fbcdb98fd744245cc961fa38f0e 100644
--- a/deps/lld/test/ELF/allow-shlib-undefined.s
+++ b/deps/lld/test/ELF/allow-shlib-undefined.s
@@ -1,26 +1,30 @@
 # REQUIRES: x86
-# --allow-shlib-undefined and --no-allow-shlib-undefined are fully
-# ignored in linker implementation.
-# --allow-shlib-undefined is set by default
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux \
-# RUN: %p/Inputs/allow-shlib-undefined.s -o %t
-# RUN: ld.lld -shared %t -o %t.so
-# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
+# RUN:   %p/Inputs/allow-shlib-undefined.s -o %t1.o
+# RUN: ld.lld -shared %t1.o -o %t.so
 
-# Executable: should link with DSO containing undefined symbols in any case.
-# RUN: ld.lld %t1 %t.so -o %t2
-# RUN: ld.lld --no-allow-shlib-undefined %t1 %t.so -o %t2
-# RUN: ld.lld --allow-shlib-undefined %t1 %t.so -o %t2
+# RUN: ld.lld --allow-shlib-undefined %t.o %t.so -o /dev/null
+# RUN: not ld.lld --no-allow-shlib-undefined %t.o %t.so -o /dev/null 2>&1 | FileCheck %s
+# Executable defaults to --no-allow-shlib-undefined
+# RUN: not ld.lld %t.o %t.so -o /dev/null 2>&1 | FileCheck %s
+# -shared defaults to --allow-shlib-undefined
+# RUN: ld.lld -shared %t.o %t.so -o /dev/null
+
+# RUN: echo | llvm-mc -filetype=obj -triple=x86_64-unknown-linux -o %tempty.o
+# RUN: ld.lld -shared %tempty.o -o %tempty.so
+# RUN: ld.lld -shared %t1.o %tempty.so -o %t2.so
+# RUN: ld.lld --no-allow-shlib-undefined %t.o %t2.so -o /dev/null
 
 # DSO with undefines:
 # should link with or without any of these options.
-# RUN: ld.lld -shared %t -o %t.so
-# RUN: ld.lld -shared --allow-shlib-undefined %t -o %t.so
-# RUN: ld.lld -shared --no-allow-shlib-undefined %t -o %t.so
-
-# Executable still should not link when have undefines inside.
-# RUN: not ld.lld %t -o %t.so
+# RUN: ld.lld -shared %t1.o -o /dev/null
+# RUN: ld.lld -shared --allow-shlib-undefined %t1.o -o /dev/null
+# RUN: ld.lld -shared --no-allow-shlib-undefined %t1.o -o /dev/null
 
 .globl _start
 _start:
   callq _shared@PLT
+
+# CHECK: undefined reference to _unresolved
diff --git a/deps/lld/test/ELF/amdgpu-abi-version-err.s b/deps/lld/test/ELF/amdgpu-abi-version-err.s
new file mode 100644
index 0000000000000000000000000000000000000000..a670ec75bf1f0f7d656efee4424fd9fba62bafd2
--- /dev/null
+++ b/deps/lld/test/ELF/amdgpu-abi-version-err.s
@@ -0,0 +1,10 @@
+# REQUIRES: amdgpu
+# RUN: llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx900 -filetype=obj %s -o %t-0.o
+# RUN: llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=-code-object-v3 -filetype=obj %s -o %t-1.o
+# RUN: not ld.lld -shared %t-0.o %t-1.o -o %t.so 2>&1 | FileCheck %s
+
+# CHECK: ld.lld: error: incompatible ABI version: {{.*}}-1.o
+
+.text
+  s_nop 0x0
+  s_endpgm
diff --git a/deps/lld/test/ELF/amdgpu-abi-version.s b/deps/lld/test/ELF/amdgpu-abi-version.s
new file mode 100644
index 0000000000000000000000000000000000000000..6fc95f1039aad3e03c86154d969969d740402425
--- /dev/null
+++ b/deps/lld/test/ELF/amdgpu-abi-version.s
@@ -0,0 +1,11 @@
+# REQUIRES: amdgpu
+# RUN: llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx900 -filetype=obj %s -o %t.o
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: llvm-readobj --file-headers %t.so | FileCheck %s
+
+# CHECK: OS/ABI: AMDGPU_HSA (0x40)
+# CHECK: ABIVersion: 1
+
+.text
+  s_nop 0x0
+  s_endpgm
diff --git a/deps/lld/test/ELF/amdgpu-elf-flags.s b/deps/lld/test/ELF/amdgpu-elf-flags.s
index c96913cf31d399aed5b49df2e706ee341f048c31..53292a7409a95e1965c6a2d79e00f2f1f737ce5d 100644
--- a/deps/lld/test/ELF/amdgpu-elf-flags.s
+++ b/deps/lld/test/ELF/amdgpu-elf-flags.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx803 -mattr=-code-object-v3 -filetype=obj %S/Inputs/amdgpu-kernel-0.s -o %t-0.o
 # RUN: llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx803 -mattr=-code-object-v3 -filetype=obj %S/Inputs/amdgpu-kernel-1.s -o %t-1.o
 # RUN: ld.lld -shared %t-0.o %t-1.o -o %t.so
-# RUN: llvm-readobj -file-headers %t.so | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.so | FileCheck %s
 
 # CHECK: Flags [
 # CHECK:   EF_AMDGPU_MACH_AMDGCN_GFX803 (0x2A)
diff --git a/deps/lld/test/ELF/amdgpu-globals.s b/deps/lld/test/ELF/amdgpu-globals.s
index eadc4ef1e0d6aa72e5490bfd298ef9af221ca259..ed2637d0342a5d09ea9481ef3606ab9d96fbce66 100644
--- a/deps/lld/test/ELF/amdgpu-globals.s
+++ b/deps/lld/test/ELF/amdgpu-globals.s
@@ -1,7 +1,7 @@
 # REQUIRES: amdgpu
 # RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri %s -o %t.o
 # RUN: ld.lld -shared %t.o -o %t
-# RUN: llvm-readobj -sections -symbols -program-headers %t | FileCheck %s
+# RUN: llvm-readobj --sections --symbols -l %t | FileCheck %s
 
 .type glob0, @object
 .data
diff --git a/deps/lld/test/ELF/amdgpu-kernels.s b/deps/lld/test/ELF/amdgpu-kernels.s
index 5888201acf372e4fdda1e65f86123a044043a443..65ca8497d8f5b7c649dfcc0753b03e3c3c2f8fad 100644
--- a/deps/lld/test/ELF/amdgpu-kernels.s
+++ b/deps/lld/test/ELF/amdgpu-kernels.s
@@ -1,7 +1,7 @@
 # REQUIRES: amdgpu
 # RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 %s -o %t.o
 # RUN: ld.lld -shared %t.o -o %t
-# RUN: llvm-readobj -sections -symbols -program-headers %t | FileCheck %s
+# RUN: llvm-readobj --sections --symbols -l %t | FileCheck %s
 
 .hsa_code_object_version 1,0
 .hsa_code_object_isa 7,0,0,"AMD","AMDGPU"
diff --git a/deps/lld/test/ELF/amdgpu-relocs.s b/deps/lld/test/ELF/amdgpu-relocs.s
index eeb7571e21df9e6699032f88558eb6c3f788a9a0..88b5c5ec270fc1f2079ea1cd6712eeb9b50bc929 100644
--- a/deps/lld/test/ELF/amdgpu-relocs.s
+++ b/deps/lld/test/ELF/amdgpu-relocs.s
@@ -2,7 +2,8 @@
 # RUN: llvm-mc -filetype=obj -triple=amdgcn--amdhsa -mcpu=fiji %s -o %t.o
 # RUN: ld.lld --hash-style=sysv -shared %t.o -o %t.so
 # RUN: llvm-readobj -r %t.so | FileCheck %s
-# RUN: llvm-objdump -s %t.so | FileCheck %s --check-prefix=OBJDUMP
+# RUN: llvm-nm %t.so | FileCheck %s --check-prefix=NM
+# RUN: llvm-readelf -x .rodata -x nonalloc %t.so | FileCheck %s --check-prefix=HEX
 
 .text
 
@@ -48,6 +49,9 @@ kernel0:
   .local   local_var0
   .local   local_var1
   .local   local_var2
+  local_var0:
+  local_var1:
+  local_var2:
 
 # R_AMDGPU_ABS32:
 .section nonalloc, "w", @progbits
@@ -68,6 +72,7 @@ ptr:
   .type temp2, @object
   .local temp2
   .size temp2, 4
+  temp2:
 
   .type ptr2, @object
   .globl ptr2
@@ -89,7 +94,7 @@ foo:
 # linker.
 # CHECK: Relocations [
 # CHECK: .rela.dyn {
-# CHECK-NEXT: R_AMDGPU_RELATIVE64 - 0x0
+# CHECK-NEXT: R_AMDGPU_RELATIVE64 - 0x3008
 # CHECK-NEXT: R_AMDGPU_ABS64 common_var0 0x0
 # CHECK-NEXT: R_AMDGPU_ABS64 common_var1 0x0
 # CHECK-NEXT: R_AMDGPU_ABS64 common_var2 0x0
@@ -109,9 +114,16 @@ foo:
 # CHECK-NEXT: }
 # CHECK-NEXT: ]
 
-# OBJDUMP: Contents of section .rodata:
-# OBJDUMP: d0f8ffff ffffffff
+# NM: 0000000000003010 B common_var0
+# NM: 0000000000003410 B common_var1
+# NM: 0000000000003810 B common_var2
+# NM: 0000000000003008 d temp2
 
-# OBJDUMP: Contents of section nonalloc:
-# OBJDUMP-NEXT: 0000 00000000 04480000 00000000 08440000
-# OBJDUMP-NEXT: 00000000 0c400000
+# temp2 - foo = 0x3008-0x768 = 0x28a0
+# HEX:      section '.rodata':
+# HEX-NEXT: 0x00000768 a0280000 00000000
+
+# common_var2+4, common_var1+8, and common_var0+12.
+# HEX:      section 'nonalloc':
+# HEX-NEXT: 0x00000000 00000000 14380000 00000000 18340000
+# HEX-NEXT: 0x00000010 00000000 1c300000
diff --git a/deps/lld/test/ELF/archive-fetch.s b/deps/lld/test/ELF/archive-fetch.s
index 201218f4cc2685332d879b835641571b3779206d..cefbc0561a9ad96b1eba875779b16ce184dafca8 100644
--- a/deps/lld/test/ELF/archive-fetch.s
+++ b/deps/lld/test/ELF/archive-fetch.s
@@ -9,7 +9,14 @@
 # RUN: llvm-ar rcs %t.a %tfoo.o %tbar.o
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-# RUN: ld.lld %t.a %t.o -o /dev/null
+# RUN: ld.lld %t.a %t.o -o %t
+# RUN: llvm-nm %t | FileCheck %s
+
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: ld.lld %t.a %t.so -o %t
+# RUN: llvm-nm %t | FileCheck %s
+
+# CHECK: T foo
 
 _start:
 callq foo
diff --git a/deps/lld/test/ELF/archive-no-index.s b/deps/lld/test/ELF/archive-no-index.s
new file mode 100644
index 0000000000000000000000000000000000000000..e59274cfa43abd3a3ed311a39f3fb5b8e83560b6
--- /dev/null
+++ b/deps/lld/test/ELF/archive-no-index.s
@@ -0,0 +1,13 @@
+# REQUIRES: x86
+# Tests error on archive file without a symbol table
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux -o %t.o %s
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux -o %t.archive.o %S/Inputs/archive.s
+# RUN: rm -f %t.a
+# RUN: llvm-ar crS %t.a %t.archive.o
+
+# RUN: not ld.lld -o /dev/null %t.o %t.a 2>&1 | FileCheck %s
+
+.globl _start
+_start:
+
+# CHECK: error: {{.*}}.a: archive has no index; run ranlib to add one
diff --git a/deps/lld/test/ELF/archive-thin-missing-member.s b/deps/lld/test/ELF/archive-thin-missing-member.s
new file mode 100644
index 0000000000000000000000000000000000000000..d96fbc45415b1f2830bff3aebdf314bdb682da86
--- /dev/null
+++ b/deps/lld/test/ELF/archive-thin-missing-member.s
@@ -0,0 +1,24 @@
+# REQUIRES: x86
+
+# RUN: rm -f %t-no-syms.a
+# RUN: rm -f %t-syms.a
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
+# RUN: llvm-ar rcTS %t-no-syms.a %t.o
+# RUN: llvm-ar rcT %t-syms.a %t.o
+# RUN: rm %t.o
+
+# Test error when loading symbols from missing thin archive member.
+# RUN: not ld.lld %t-no-syms.a -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR1
+# ERR1: {{.*}}-no-syms.a: could not get the buffer for a child of the archive: '{{.*}}.o': {{[Nn]}}o such file or directory
+
+# Test error when thin archive has symbol table but member is missing.
+# RUN: not ld.lld -m elf_amd64_fbsd %t-syms.a -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR2
+# ERR2: {{.*}}-syms.a: could not get the buffer for the member defining symbol _start: '{{.*}}.o': {{[Nn]}}o such file or directory
+
+# Test error when thin archive is linked using --whole-archive but member is missing.
+# RUN: not ld.lld --whole-archive %t-syms.a -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR3
+# ERR3: {{.*}}-syms.a: could not get the buffer for a child of the archive: '{{.*}}.o': {{[Nn]}}o such file or directory
+
+.global _start
+_start:
+    nop
diff --git a/deps/lld/test/ELF/arm-abs32-dyn.s b/deps/lld/test/ELF/arm-abs32-dyn.s
index afdf573680cdd3a687c9caf5392973209d157cfd..36c0353acfbc45e059c5986e97179cf7ef9a0085 100644
--- a/deps/lld/test/ELF/arm-abs32-dyn.s
+++ b/deps/lld/test/ELF/arm-abs32-dyn.s
@@ -14,12 +14,19 @@ bar:
  .word foo
  .word bar
 
+// In PIC mode, if R_ARM_TARGET1 represents R_ARM_ABS32 (the default), an
+// R_ARM_TARGET1 to a non-preemptable symbol also creates an R_ARM_RELATIVE in
+// a writable section.
+ .word bar(target1)
+
 // RUN: ld.lld -shared -o %t.so %t.o
-// RUN: llvm-readobj -symbols -dyn-relocations %t.so | FileCheck %s
+// RUN: llvm-readobj --symbols --dyn-relocations %t.so | FileCheck %s
+// RUN: llvm-readelf -x .data %t.so | FileCheck --check-prefix=HEX %s
 
 // CHECK:      Dynamic Relocations {
-// CHECK-NEXT:   0x1004 R_ARM_RELATIVE
-// CHECK-NEXT:   0x1000 R_ARM_ABS32 foo 0x0
+// CHECK-NEXT:   0x2004 R_ARM_RELATIVE
+// CHECK-NEXT:   0x2008 R_ARM_RELATIVE
+// CHECK-NEXT:   0x2000 R_ARM_ABS32 foo 0x0
 // CHECK-NEXT: }
 
 // CHECK:      Symbols [
@@ -30,3 +37,5 @@ bar:
 // CHECK:        Symbol {
 // CHECK:          Name: foo
 // CHECK-NEXT:     Value: 0x1000
+
+// HEX: 0x00002000 00000000 00100000 00100000
diff --git a/deps/lld/test/ELF/arm-attributes.s b/deps/lld/test/ELF/arm-attributes.s
index e4411e79b010e787da35432c1783eef8e8ea7bae..de7cdfc550b318f337560b7111d1df773d5af899 100644
--- a/deps/lld/test/ELF/arm-attributes.s
+++ b/deps/lld/test/ELF/arm-attributes.s
@@ -3,11 +3,11 @@
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t2.o
 
 // RUN: ld.lld %t1.o %t2.o -o %t
-// RUN: llvm-readobj -arm-attributes %t | FileCheck %s
+// RUN: llvm-readobj --arm-attributes %t | FileCheck %s
 // RUN: ld.lld %t1.o %t2.o -shared -o %t2
-// RUN: llvm-readobj -arm-attributes %t2 | FileCheck %s
+// RUN: llvm-readobj --arm-attributes %t2 | FileCheck %s
 // RUN: ld.lld %t1.o %t2.o -r -o %t3
-// RUN: llvm-readobj -arm-attributes %t3 | FileCheck %s
+// RUN: llvm-readobj --arm-attributes %t3 | FileCheck %s
 
 // Check that we retain only 1 SHT_ARM_ATTRIBUTES section. At present we do not
 // try and merge or use the contents of SHT_ARM_ATTRIBUTES sections. We just
diff --git a/deps/lld/test/ELF/arm-bl-v6-inrange.s b/deps/lld/test/ELF/arm-bl-v6-inrange.s
index 0e186c53f3c39f254ef3595babd04dd1ea85e40a..0047b7b964fbec8ad1e235e70df291f7f29386e2 100644
--- a/deps/lld/test/ELF/arm-bl-v6-inrange.s
+++ b/deps/lld/test/ELF/arm-bl-v6-inrange.s
@@ -28,9 +28,12 @@ _start:
 thumbfunc:
   bx lr
 // CHECK-THUMB: Disassembly of section .callee1:
+// CHECK-THUMB-EMPTY:
 // CHECK-THUMB-NEXT: thumbfunc:
 // CHECK-THUMB-NEXT:   100004:       70 47   bx      lr
+// CHECK-THUMB-EMPTY:
 // CHECK-THUMB-NEXT: Disassembly of section .caller:
+// CHECK-THUMB-EMPTY:
 // CHECK-THUMB-NEXT: _start:
 // CHECK-THUMB-NEXT:   500000:       00 f4 00 f8     bl      #-4194304
 // CHECK-THUMB-NEXT:   500004:       ff f3 fe ef     blx     #4194300
@@ -43,5 +46,6 @@ thumbfunc:
 armfunc:
   bx lr
 // CHECK-ARM: Disassembly of section .callee2:
+// CHECK-ARM-EMPTY:
 // CHECK-ARM-NEXT: armfunc:
 // CHECK-ARM-NEXT:   900004:       1e ff 2f e1     bx      lr
diff --git a/deps/lld/test/ELF/arm-bl-v6.s b/deps/lld/test/ELF/arm-bl-v6.s
index 13be7694120dfc6fd6d462d5a224fa34d9825bd1..0085e2acca48b910e1d6440469ab297858b1156c 100644
--- a/deps/lld/test/ELF/arm-bl-v6.s
+++ b/deps/lld/test/ELF/arm-bl-v6.s
@@ -26,6 +26,7 @@ _start:
   bx lr
 
 // CHECK-ARM1: Disassembly of section .text:
+// CHECK-ARM1-EMPTY:
 // CHECK-ARM1-NEXT: _start:
 // CHECK-ARM1-NEXT:    11000:   00 00 00 fa     blx     #0 <thumbfunc>
 // CHECK-ARM1-NEXT:    11004:   1e ff 2f e1     bx      lr
diff --git a/deps/lld/test/ELF/arm-blx.s b/deps/lld/test/ELF/arm-blx.s
index 5b44c8416c20ae722ebaac71c8f599deab8f7aa4..91df04bd5dc25dee67d055758545e37b87b27557 100644
--- a/deps/lld/test/ELF/arm-blx.s
+++ b/deps/lld/test/ELF/arm-blx.s
@@ -74,16 +74,19 @@ callee_arm_high:
   bx lr
 
 // CHECK-THUMB: Disassembly of section .callee1:
+// CHECK-THUMB-EMPTY:
 // CHECK-THUMB-NEXT: callee_low:
 // CHECK-THUMB-NEXT:    b4:       70 47   bx      lr
 // CHECK-THUMB: callee_low2:
 // CHECK-THUMB-NEXT:    b6:       70 47   bx      lr
 
 // CHECK-ARM: Disassembly of section .callee2:
+// CHECK-ARM-EMPTY:
 // CHECK-ARM-NEXT: callee_arm_low:
 // CHECK-ARM-NEXT:    100:        1e ff 2f e1     bx      lr
 
 // CHECK-ARM: Disassembly of section .caller:
+// CHECK-ARM-EMPTY:
 // CHECK-ARM-NEXT: _start:
 // CHECK-ARM-NEXT:   10000:       2b c0 ff fa     blx     #-65364 <callee_low>
 // CHECK-ARM-NEXT:   10004:       2a c0 ff fa     blx     #-65368 <callee_low>
@@ -104,11 +107,13 @@ callee_arm_high:
 // CHECK-ARM-NEXT:   10038:       1e ff 2f e1     bx      lr
 
 // CHECK-THUMB: Disassembly of section .callee3:
+// CHECK-THUMB-EMPTY:
 // CHECK-THUMB: callee_high:
 // CHECK-THUMB-NEXT:    10100:       70 47   bx      lr
 // CHECK-THUMB: callee_high2:
 // CHECK-THUMB-NEXT:    10102:       70 47   bx      lr
 
 // CHECK-ARM: Disassembly of section .callee4:
+// CHECK-ARM-EMPTY:
 // CHECK-NEXT-ARM: callee_arm_high:
 // CHECK-NEXT-ARM:   10200:     1e ff 2f e1     bx      lr
diff --git a/deps/lld/test/ELF/arm-branch-rangethunk.s b/deps/lld/test/ELF/arm-branch-rangethunk.s
index 7d83c8735cb0af2c1fd935935d6a93a2c063d00b..585f402a4a1a016b5c4685b052f45825eb4f3b68 100644
--- a/deps/lld/test/ELF/arm-branch-rangethunk.s
+++ b/deps/lld/test/ELF/arm-branch-rangethunk.s
@@ -19,6 +19,7 @@ _start:
  beq too_far3
 
 // SHORT: Disassembly of section .text:
+// SHORT-EMPTY:
 // SHORT-NEXT: _start:
 // SHORT-NEXT:    20000:       01 00 00 eb     bl      #4 <__ARMv7ABSLongThunk_too_far1>
 // SHORT-NEXT:    20004:       01 00 00 ea     b       #4 <__ARMv7ABSLongThunk_too_far2>
@@ -31,6 +32,7 @@ _start:
 // SHORT-NEXT:    20014:       fd ff 7f ea     b       #33554420 <__ARMv7ABSLongThunk_too_far3+0x1fffffc>
 
 // LONG: Disassembly of section .text:
+// LONG-EMPTY:
 // LONG-NEXT: _start:
 // LONG-NEXT:    20000:       01 00 00 eb     bl      #4 <__ARMv7ABSLongThunk_too_far1>
 // LONG-NEXT:    20004:       03 00 00 ea     b       #12 <__ARMv7ABSLongThunk_too_far2>
diff --git a/deps/lld/test/ELF/arm-branch-undef-weak-plt-thunk.s b/deps/lld/test/ELF/arm-branch-undef-weak-plt-thunk.s
index 919d4f5bdc33f87ef9b9d35c89b40846f4dbf1b0..4b033d178bf77e8e30b839659e7f4b4e1e298109 100644
--- a/deps/lld/test/ELF/arm-branch-undef-weak-plt-thunk.s
+++ b/deps/lld/test/ELF/arm-branch-undef-weak-plt-thunk.s
@@ -22,6 +22,7 @@ _start:
  .space 32 * 1024 * 1024
 
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // CHECK-NEXT:    11000:       00 00 00 ea     b       #0 <__ARMv7ABSLongThunk_undefined_weak_we_expect_a_plt_entry_for>
 // CHECK-NEXT:    11004:       02 00 00 eb     bl      #8 <__ARMv7ABSLongThunk_bar2>
diff --git a/deps/lld/test/ELF/arm-branch.s b/deps/lld/test/ELF/arm-branch.s
index 48c497724b0dd94d31008f6a6f8abb9b150f2475..f201e1052ab596cb5764e4ae7c837023625615af 100644
--- a/deps/lld/test/ELF/arm-branch.s
+++ b/deps/lld/test/ELF/arm-branch.s
@@ -38,6 +38,7 @@ callee_high:
  bx lr
 
 // CHECK: Disassembly of section .caller:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // S(callee_low) = 0xb4 P = 0x10000 A = -8 = -0xff54 = -65364
 // CHECK-NEXT:   10000:       2b c0 ff eb          bl      #-65364 <callee_low>
diff --git a/deps/lld/test/ELF/arm-copy.s b/deps/lld/test/ELF/arm-copy.s
index e42f93ea5bb646f564cc50914ea0f1d643941a68..7353b8cd1943902c8a909ee0b1de2599d389962a 100644
--- a/deps/lld/test/ELF/arm-copy.s
+++ b/deps/lld/test/ELF/arm-copy.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %p/Inputs/relocation-copy-arm.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -soname fixed-length-string.so -o %t2.so
 // RUN: ld.lld --hash-style=sysv %t.o %t2.so -o %t3
-// RUN: llvm-readobj -s -r --expand-relocs -symbols %t3 | FileCheck %s
+// RUN: llvm-readobj -S -r --expand-relocs --symbols %t3 | FileCheck %s
 // RUN: llvm-objdump -d -triple=armv7a-none-linux-gnueabi %t3 | FileCheck -check-prefix=CODE %s
 // RUN: llvm-objdump -s -triple=armv7a-none-linux-gnueabi -section=.rodata %t3 | FileCheck -check-prefix=RODATA %s
 
@@ -65,6 +65,7 @@ _start:
 // CHECK-NEXT:    Section: .bss
 
 // CODE: Disassembly of section .text:
+// CODE-EMPTY:
 // CODE-NEXT: _start:
 // S(y) = 0x13000, A = 0
 // (S + A) & 0x0000ffff = 0x3000 = #12288
@@ -78,4 +79,4 @@ _start:
 
 // RODATA: Contents of section .rodata:
 // S(z) = 0x13004
-// RODATA-NEXT: 10190 04300100
+// RODATA-NEXT: 101b0 04300100
diff --git a/deps/lld/test/ELF/arm-data-prel.s b/deps/lld/test/ELF/arm-data-prel.s
index 78b42818609b94fc16dbe9221ed39a9aebcb65d1..432392cf73de1afb137241b4e409f30ec964cdbe 100644
--- a/deps/lld/test/ELF/arm-data-prel.s
+++ b/deps/lld/test/ELF/arm-data-prel.s
@@ -1,12 +1,11 @@
 // REQUIRES: arm
-// RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o %t.o
+// RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj --arm-add-build-attributes -o %t.o
 // RUN: echo "SECTIONS { \
 // RUN:          .text : { *(.text) } \
 // RUN:          .prel.test : { *(.ARM.exidx) } \
-// RUN:          .prel.test.TEST1 : { *(.ARM.exidx.TEST1) } \
 // RUN:          .TEST1 : { *(.TEST1) } } " > %t.script
 // RUN: ld.lld --script %t.script %t.o -o %t
-// RUN: llvm-readobj -s -sd %t | FileCheck --check-prefix=CHECK %s
+// RUN: llvm-readobj -S --section-data %t | FileCheck --check-prefix=CHECK %s
 
 // The R_ARM_PREL31 relocation is used in by the .ARM.exidx exception tables
 // bit31 of the place denotes whether the field is an inline table entry
@@ -47,17 +46,14 @@ __aeabi_unwind_cpp_pr0:
 // The expected value of the exception table is
 // Word0 0 in bit 31, -4 encoded in 31-bit signed offset
 // Word1 Inline table entry EHT Inline Personality Routine #0
-// CHECK:  Name: .prel.test
-// CHECK:  SectionData (
-// CHECK:     0000: FCFFFF7F B0B0B080
-// CHECK:  )
-
-// The expected value of the exception table is
-// Word0 0 in bit 31, +8 encoded in 31-bit signed offset
-// Word1 Inline table entry EHT Inline Personality Routine #0
+// Word3 0 in bit 31, +10 encoded in 31-bit signed offset
+// Word4 Inline table entry EHT Inline Personality Routine #0
 // set vsp = r11
 // pop r11, r14
-// CHECK:  Name: .prel.test.TEST1
+// Word5 Sentinel +18 EXIDX_CANTUNWIND
+
+// CHECK:  Name: .prel.test
 // CHECK:  SectionData (
-// CHECK:     0000: 08000000 80849B80
+// CHECK:     0000: FCFFFF7F B0B0B080 10000000 80849B80
+// CHECK:     0010: 18000000 01000000
 // CHECK:  )
diff --git a/deps/lld/test/ELF/arm-data-relocs.s b/deps/lld/test/ELF/arm-data-relocs.s
index 586e1a6c8933a9508069613396ceb12c0dbca2a0..5805c3dbce738e04022e3de64d62a6fd8cce9043 100644
--- a/deps/lld/test/ELF/arm-data-relocs.s
+++ b/deps/lld/test/ELF/arm-data-relocs.s
@@ -12,9 +12,11 @@ _start:
 // S = 0x100, A = 0x24
 // S + A = 0x124
 // CHECK: Disassembly of section .R_ARM_ABS32POS:
+// CHECK-EMPTY:
 // CHECK: 11000: 24 01 00 00
  .section .R_ARM_ABS32NEG, "ax",%progbits
  .word foo - 0x24
 // S = 0x100, A = -0x24
 // CHECK: Disassembly of section .R_ARM_ABS32NEG:
+// CHECK-EMPTY:
 // CHECK: 11004: dc 00 00 00
diff --git a/deps/lld/test/ELF/arm-eabi-version.s b/deps/lld/test/ELF/arm-eabi-version.s
index 4b4f8603db6aa6b335f2bb442416636d47f1c3e6..aff79e769020daa1e78c6f353340f4a223a0f99b 100644
--- a/deps/lld/test/ELF/arm-eabi-version.s
+++ b/deps/lld/test/ELF/arm-eabi-version.s
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t.o
 // RUN: ld.lld -static %t.o -o %tout
-// RUN: llvm-readobj -file-headers %tout | FileCheck %s
+// RUN: llvm-readobj --file-headers %tout | FileCheck %s
  .syntax unified
  .text
  .globl _start
diff --git a/deps/lld/test/ELF/arm-exidx-add-missing.s b/deps/lld/test/ELF/arm-exidx-add-missing.s
new file mode 100644
index 0000000000000000000000000000000000000000..04feba0ca34fc1dbacd722e1b552bd9308086ea1
--- /dev/null
+++ b/deps/lld/test/ELF/arm-exidx-add-missing.s
@@ -0,0 +1,66 @@
+// REQUIRES: arm
+// RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi --arm-add-build-attributes %s -o %t
+// RUN: ld.lld %t --no-merge-exidx-entries -o %t2
+// RUN: llvm-objdump -s %t2 | FileCheck %s
+// RUN: ld.lld %t -o %t3
+// RUN: llvm-objdump -s %t3 | FileCheck %s -check-prefix=CHECK-MERGE
+
+// The ARM.exidx section is a table of 8-byte entries of the form:
+// | PREL31 Relocation to start of function | Unwinding information |
+// The range of addresses covered by the table entry is terminated by the
+// next table entry. This means that an executable section without a .ARM.exidx
+// section does not terminate the range of addresses. To fix this the linker
+// synthesises an EXIDX_CANTUNWIND entry for each section wihout a .ARM.exidx
+// section.
+
+        .syntax unified
+
+        // Expect inline unwind instructions
+        .section .text.01, "ax", %progbits
+        .global f1
+f1:
+        .fnstart
+        bx lr
+        .save {r7, lr}
+        .setfp r7, sp, #0
+        .fnend
+
+        // Expect no unwind information from assembler. The linker must
+        // synthesise an EXIDX_CANTUNWIND entry to prevent an exception
+        // thrown through f2 from matching against the unwind instructions
+        // for f1.
+        .section .text.02, "ax", %progbits
+        .global f2
+f2:
+        bx lr
+
+
+        // Expect 1 EXIDX_CANTUNWIND entry that can be merged into the linker
+        // generated EXIDX_CANTUNWIND as if the assembler had generated it.
+        .section .text.03, "ax",%progbits
+        .global f3
+f3:
+        .fnstart
+        bx lr
+        .cantunwind
+        .fnend
+
+        // Dummy implementation of personality routines to satisfy reference
+        // from exception tables, linker will generate EXIDX_CANTUNWIND.
+        .section .text.__aeabi_unwind_cpp_pr0, "ax", %progbits
+        .global __aeabi_unwind_cpp_pr0
+__aeabi_unwind_cpp_pr0:
+        bx lr
+
+// f1, f2
+// CHECK:      100d4 2c0f0000 08849780 280f0000 01000000
+// f3, __aeabi_unwind_cpp_pr0
+// CHECK-NEXT: 100e4 240f0000 01000000 200f0000 01000000
+// sentinel
+// CHECK-NEXT: 100f4 1c0f0000 01000000
+
+// f1, (f2, f3, __aeabi_unwind_cpp_pr0)
+// CHECK-MERGE:      100d4 2c0f0000 08849780 280f0000 01000000
+// sentinel
+// CHECK-MERGE-NEXT: 100e4 2c0f0000 01000000
+
diff --git a/deps/lld/test/ELF/arm-exidx-canunwind.s b/deps/lld/test/ELF/arm-exidx-canunwind.s
index df89d0082fcf632f30edd1dcba048d658873cb0a..d1ed8635bba13c7c9f43ae7615a2ea9c6fecb98e 100644
--- a/deps/lld/test/ELF/arm-exidx-canunwind.s
+++ b/deps/lld/test/ELF/arm-exidx-canunwind.s
@@ -1,6 +1,6 @@
 // REQUIRES: arm
-// RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t
-// RUN: ld.lld %t -o %t2 2>&1
+// RUN: llvm-mc -filetype=obj --arm-add-build-attributes -triple=armv7a-none-linux-gnueabi %s -o %t
+// RUN: ld.lld %t -o %t2
 // RUN: llvm-objdump -d -triple=armv7a-none-linux-gnueabi %t2 | FileCheck %s
 // RUN: llvm-objdump -s -triple=armv7a-none-linux-gnueabi %t2 | FileCheck -check-prefix=CHECK-EXIDX %s
 // RUN: llvm-readobj --program-headers --sections %t2 | FileCheck -check-prefix=CHECK-PT %s
@@ -53,6 +53,7 @@ _start:
  bx lr
 
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // CHECK-NEXT:    11000:       01 00 00 eb     bl      #4 <func1>
 // CHECK-NEXT:    11004:       01 00 00 eb     bl      #4 <func2>
@@ -66,15 +67,14 @@ _start:
 // CHECK:      __aeabi_unwind_cpp_pr0:
 // CHECK-NEXT:    11018:       1e ff 2f e1     bx      lr
 
-// CHECK-EXIDX: Contents of section .ARM.exidx:
-// 100d4 + f38 = 1100c = func1 (inline unwinding data)
-// 100dc + f34 = 11010 = func2 (100e0 + c = 100ec = .ARM.extab entry)
-// CHECK-EXIDX-NEXT: 100d4 380f0000 08849780 340f0000 0c000000
-// 100e4 + f30 = 11014 = terminate = func2 + sizeof(func2)
-// CHECK-EXIDX-NEXT: 100e4 300f0000 01000000
-// CHECK-EXIDX-NEXT: Contents of section .ARM.extab:
-// 100ec + f28 = 11014 = __gxx_personality_v0
-// CHECK-EXIDX-NEXT: 100ec 280f0000 b0b0b000 00000000
+// 100d4 + f2c = 11000 = main (linker generated cantunwind)
+// 100dc + f30 = 1100c = func1 (inline unwinding data)
+// CHECK-EXIDX:      100d4 2c0f0000 01000000 300f0000 08849780
+// 100e4 + f2c = 11010 = func2 (100e8 + 14 = 100fc = .ARM.extab entry)
+// 100ec + f28 = 11014 = __gcc_personality_v0 (linker generated cantunwind)
+// CHECK-EXIDX-NEXT: 100e4 2c0f0000 14000000 280f0000 01000000
+// 100f4 + f28 = 1101c = sentinel
+// CHECK-EXIDX-NEXT: 100f4 280f0000 01000000
 
 // CHECK-PT:          Name: .ARM.exidx
 // CHECK-PT-NEXT:     Type: SHT_ARM_EXIDX (0x70000001)
@@ -84,14 +84,14 @@ _start:
 // CHECK-PT-NEXT:     ]
 // CHECK-PT-NEXT:     Address: 0x100D4
 // CHECK-PT-NEXT:     Offset: 0xD4
-// CHECK-PT-NEXT:     Size: 24
+// CHECK-PT-NEXT:     Size: 40
 
 // CHECK-PT:          Type: PT_ARM_EXIDX (0x70000001)
 // CHECK-PT-NEXT:     Offset: 0xD4
 // CHECK-PT-NEXT:     VirtualAddress: 0x100D4
 // CHECK-PT-NEXT:     PhysicalAddress: 0x100D4
-// CHECK-PT-NEXT:     FileSize: 24
-// CHECK-PT-NEXT:     MemSize: 24
+// CHECK-PT-NEXT:     FileSize: 40
+// CHECK-PT-NEXT:     MemSize: 40
 // CHECK-PT-NEXT:     Flags [ (0x4)
 // CHECK-PT-NEXT:       PF_R (0x4)
 // CHECK-PT-NEXT:     ]
diff --git a/deps/lld/test/ELF/arm-exidx-dedup.s b/deps/lld/test/ELF/arm-exidx-dedup.s
index 49d4c2cd1ec3777e6f038901ef9c33e0c9264bff..d9164188617330cfcb0c13304074a85057e569b4 100644
--- a/deps/lld/test/ELF/arm-exidx-dedup.s
+++ b/deps/lld/test/ELF/arm-exidx-dedup.s
@@ -1,27 +1,29 @@
 // REQUIRES: arm
-// RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t
+// RUN: llvm-mc -filetype=obj --arm-add-build-attributes -triple=armv7a-none-linux-gnueabi %s -o %t
 // RUN: ld.lld %t --no-merge-exidx-entries -o %t2
 // RUN: llvm-objdump -s %t2 | FileCheck --check-prefix CHECK-DUPS %s
 // RUN: ld.lld %t -o %t3
 // RUN: llvm-objdump -s %t3 | FileCheck %s
+
 // Test that lld can at least remove duplicate .ARM.exidx sections. A more
 // fine grained implementation will be able to remove duplicate entries within
 // a .ARM.exidx section.
 
 // With duplicate entries
 // CHECK-DUPS: Contents of section .ARM.exidx:
-// CHECK-DUPS-NEXT:  100d4 2c0f0000 01000000 280f0000 01000000
-// CHECK-DUPS-NEXT:  100e4 240f0000 01000000 200f0000 01000000
-// CHECK-DUPS-NEXT:  100f4 1c0f0000 08849780 180f0000 08849780
-// CHECK-DUPS-NEXT:  10104 140f0000 08849780 100f0000 14000000
-// CHECK-DUPS-NEXT:  10114 0c0f0000 18000000 080f0000 01000000
+// CHECK-DUPS-NEXT: 100d4 2c0f0000 01000000 280f0000 01000000
+// CHECK-DUPS-NEXT: 100e4 240f0000 01000000 200f0000 01000000
+// CHECK-DUPS-NEXT: 100f4 1c0f0000 08849780 180f0000 08849780
+// CHECK-DUPS-NEXT: 10104 140f0000 08849780 100f0000 24000000
+// CHECK-DUPS-NEXT: 10114 0c0f0000 28000000 080f0000 01000000
+// CHECK-DUPS-NEXT: 10124 040f0000 01000000 000f0000 01000000
 // CHECK-DUPS-NEXT: Contents of section .ARM.extab:
 
 // After duplicate entry removal
 // CHECK: Contents of section .ARM.exidx:
-// CHECK-NEXT:  100d4 2c0f0000 01000000 340f0000 08849780
-// CHECK-NEXT:  100e4 380f0000 14000000 340f0000 18000000
-// CHECK-NEXT:  100f4 300f0000 01000000
+// CHECK-NEXT: 100d4 2c0f0000 01000000 340f0000 08849780
+// CHECK-NEXT: 100e4 380f0000 1c000000 340f0000 20000000
+// CHECK-NEXT: 100f4 300f0000 01000000 300f0000 01000000
 // CHECK-NEXT: Contents of section .ARM.extab:
         .syntax unified
 
@@ -113,8 +115,9 @@ f8:
         .long 0
         .fnend
 
- // Dummy implementation of personality routines to satisfy reference from
- // exception tables
+// Dummy implementation of personality routines to satisfy reference from
+// exception tables
+// Expect Linker generated EXIDX_CANTUNWIND tables
         .section .text.__gcc_personality_v0, "ax", %progbits
         .global __gxx_personality_v0
 __gxx_personality_v0:
diff --git a/deps/lld/test/ELF/arm-exidx-discard.s b/deps/lld/test/ELF/arm-exidx-discard.s
index 2a204a04cd1b68eee1bd9df44721c53054fb6f00..297d84e1b845fd7d7e34a445edb33db0ac39a49e 100644
--- a/deps/lld/test/ELF/arm-exidx-discard.s
+++ b/deps/lld/test/ELF/arm-exidx-discard.s
@@ -2,12 +2,15 @@
 // RUN: llvm-mc -filetype=obj -triple arm-gnu-linux-eabi -mcpu cortex-a7 -arm-add-build-attributes %s -o %t.o
 // RUN: echo "ENTRY(__entrypoint) SECTIONS { . = 0x10000; .text : { *(.text .text.*) } /DISCARD/ : { *(.ARM.exidx*) *(.gnu.linkonce.armexidx.*) } }" > %t.script
 // RUN: ld.lld -T %t.script %t.o -o %t.elf 2>&1
-// RUN: llvm-readobj -sections %t.elf | FileCheck %s
+// RUN: llvm-readobj --sections %t.elf | FileCheck %s
 
 .globl  __entrypoint
 __entrypoint:
+.fnstart
     bx  lr
-
+ .save {r7, lr}
+ .setfp r7, sp, #0
+ .fnend
 // Check that .ARM.exidx/.gnu.linkonce.armexidx
 // are correctly removed if they were added.
 // CHECK-NOT: .ARM.exidx
diff --git a/deps/lld/test/ELF/arm-exidx-emit-relocs.s b/deps/lld/test/ELF/arm-exidx-emit-relocs.s
new file mode 100644
index 0000000000000000000000000000000000000000..e7dff5bbdfb6e7450afdcf515dcb16f376452a65
--- /dev/null
+++ b/deps/lld/test/ELF/arm-exidx-emit-relocs.s
@@ -0,0 +1,71 @@
+// REQUIRES: arm
+// RUN: llvm-mc -filetype=obj --arm-add-build-attributes -triple=armv7a-none-linux-gnueabi %s -o %t
+// RUN: ld.lld --emit-relocs %t -o %t2
+// RUN: llvm-objdump -s -triple=armv7a-none-linux-gnueabi %t2 | FileCheck %s
+// RUN: llvm-readelf --relocs %t2 | FileCheck -check-prefix=CHECK-RELOCS %s
+
+// LLD does not support --emit-relocs for .ARM.exidx sections as the relocations
+// from synthetic table entries won't be represented. Given the known use cases
+// of --emit-relocs, relocating kernels, and binary analysis, the former doesn't
+// use exceptions and the latter can derive the relocations from the table if
+// they need them.
+ .syntax unified
+ // Will produce an ARM.exidx entry with inline unwinding instructions
+ .section .text.func1, "ax",%progbits
+ .global func1
+func1:
+ .fnstart
+ bx lr
+ .save {r7, lr}
+ .setfp r7, sp, #0
+ .fnend
+
+ .syntax unified
+ .section .text.func2, "ax",%progbits
+// A function with the same inline unwinding instructions, expect merge.
+ .global func2
+func2:
+ .fnstart
+ bx lr
+ .save {r7, lr}
+ .setfp r7, sp, #0
+ .fnend
+
+ .section .text.25, "ax", %progbits
+ .global func25
+func25:
+        .fnstart
+        bx lr
+        .cantunwind
+        .fnend
+
+ .section .text.26, "ax", %progbits
+ .global func26
+func26:
+        .fnstart
+        bx lr
+        .cantunwind
+        .fnend
+
+ .syntax unified
+ .section .text.func3, "ax",%progbits
+// A function with the same inline unwinding instructions, expect merge.
+ .global func3
+func3:
+ .fnstart
+ bx lr
+ .save {r7, lr}
+ .setfp r7, sp, #0
+ .fnend
+
+ .section .text.__aeabi_unwind_cpp_pr0, "ax", %progbits
+ .global __aeabi_unwind_cpp_pr0
+__aeabi_unwind_cpp_pr0:
+ bx lr
+
+// CHECK: Contents of section .ARM.exidx:
+// CHECK-NEXT:  100d4 2c0f0000 08849780 2c0f0000 01000000
+// CHECK-NEXT:  100e4 2c0f0000 08849780 280f0000 01000000
+// CHECK-NEXT:  100f4 240f0000 01000000
+
+// CHECK-RELOCS-NOT: Relocation section '.rel.ARM.exidx'
diff --git a/deps/lld/test/ELF/arm-exidx-gc.s b/deps/lld/test/ELF/arm-exidx-gc.s
index 50c8616ae773d1967d8c00f0490094495d931220..d710675f8542c664be8260dcb93d0faac014a05a 100644
--- a/deps/lld/test/ELF/arm-exidx-gc.s
+++ b/deps/lld/test/ELF/arm-exidx-gc.s
@@ -1,5 +1,5 @@
 // REQUIRES: arm
-// RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t
+// RUN: llvm-mc -filetype=obj --arm-add-build-attributes -triple=armv7a-none-linux-gnueabi %s -o %t
 // RUN: ld.lld %t --no-merge-exidx-entries -o %t2 --gc-sections 2>&1
 // RUN: llvm-objdump -d -triple=armv7a-none-linux-gnueabi %t2 | FileCheck %s
 // RUN: llvm-objdump -s -triple=armv7a-none-linux-gnueabi %t2 | FileCheck -check-prefix=CHECK-EXIDX %s
@@ -91,6 +91,7 @@ _start:
 // routines are kept alive by references from live .ARM.exidx and .ARM.extab
 // sections
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // CHECK-NEXT:   11000:       01 00 00 eb     bl      #4 <func1>
 // CHECK-NEXT:   11004:       01 00 00 eb     bl      #4 <func2>
@@ -111,14 +112,15 @@ _start:
 // CHECK-NOT: __gxx_personality_v1
 
 // CHECK-EXIDX: Contents of section .ARM.exidx:
-// 100d4 + f38 = 1100c = func1
-// 100dc + f34 = 11010 = func2 (100e0 + 1c = 100fc = .ARM.extab)
-// CHECK-EXIDX-NEXT: 100d4 380f0000 08849780 340f0000 1c000000
-// 100e4 + f30 = 11014 = __gxx_personality_v0
-// 100ec + f2c = 11018 = __aeabi_unwind_cpp_pr0
-// CHECK-EXIDX-NEXT: 100e4 300f0000 01000000 2c0f0000 01000000
-// 100f4 + f28 = 1101c = __aeabi_unwind_cpp_pr0 + sizeof(__aeabi_unwind_cpp_pr0)
-// CHECK-EXIDX-NEXT: 100f4 280f0000 01000000
+// 100d4 + f2c = 11000
+// 100dc + f30 = 1100c = func1
+// CHECK-EXIDX-NEXT: 100d4 2c0f0000 01000000 300f0000 08849780
+// 100e4 + f2c = 11010 = func2 (100e8 + 1c = 10104 = .ARM.extab)
+// 100ec + f28 = 11014 = __gxx_personality_v0
+// CHECK-EXIDX-NEXT: 100e4 2c0f0000 1c000000 280f0000 01000000
+// 100f4 + f24 = 11018 = __aeabi_unwind_cpp_pr0
+// 100fc + f20 = 1101c = __aeabi_unwind_cpp_pr0 + sizeof(__aeabi_unwind_cpp_pr0)
+// CHECK-EXIDX-NEXT: 100f4 240f0000 01000000 200f0000 01000000
 // CHECK-EXIDX-NEXT: Contents of section .ARM.extab:
-// 100fc + f18 = 11014 = __gxx_personality_v0
-// CHECK-EXIDX-NEXT: 100fc 180f0000 b0b0b000
+// 10104 + f10 = 11014 = __gxx_personality_v0
+// CHECK-EXIDX-NEXT: 10104 100f0000 b0b0b000
diff --git a/deps/lld/test/ELF/arm-exidx-link.s b/deps/lld/test/ELF/arm-exidx-link.s
index 50f981261d9de008d5771cf7b42cb2a1e40051ae..071d28546c0e3358c8a5ba8cf32d5187702b6a1a 100644
--- a/deps/lld/test/ELF/arm-exidx-link.s
+++ b/deps/lld/test/ELF/arm-exidx-link.s
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -s %t.so | FileCheck %s
+// RUN: llvm-readobj -S %t.so | FileCheck %s
 
 // CHECK:      Name: .ARM.exidx
 // CHECK-NEXT: Type: SHT_ARM_EXIDX
diff --git a/deps/lld/test/ELF/arm-exidx-order.s b/deps/lld/test/ELF/arm-exidx-order.s
index 7e2d4ce91d926f33bb1b53a91fe420e9590d9c91..8b0b86f465eabd737a286e709674830671ab0707 100644
--- a/deps/lld/test/ELF/arm-exidx-order.s
+++ b/deps/lld/test/ELF/arm-exidx-order.s
@@ -54,6 +54,7 @@ f3:
 // Check default no linker script order.
 
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK: _start:
 // CHECK-NEXT:    11000:       1e ff 2f e1     bx      lr
 // CHECK: f1:
@@ -67,12 +68,15 @@ f3:
 // CHECK: func5:
 // CHECK-NEXT:    11014:       1e ff 2f e1     bx      lr
 // CHECK: Disassembly of section .func1:
+// CHECK-EMPTY:
 // CHECK-NEXT: func1:
 // CHECK-NEXT:    11018:       1e ff 2f e1     bx      lr
 // CHECK: Disassembly of section .func2:
+// CHECK-EMPTY:
 // CHECK-NEXT: func2:
 // CHECK-NEXT:    1101c:       1e ff 2f e1     bx      lr
 // CHECK: Disassembly of section .func3:
+// CHECK-EMPTY:
 // CHECK-NEXT: func3:
 // CHECK-NEXT:    11020:       1e ff 2f e1     bx      lr
 
@@ -128,6 +132,7 @@ f3:
 // the .text section but before the orphan sections
 
 // CHECK-SCRIPT: Disassembly of section .text:
+// CHECK-SCRIPT-EMPTY:
 // CHECK-SCRIPT-NEXT: func4:
 // CHECK-SCRIPT-NEXT:    11000:       1e ff 2f e1     bx      lr
 // CHECK-SCRIPT:      func5:
@@ -140,13 +145,19 @@ f3:
 // CHECK-SCRIPT-NEXT:    11010:       1e ff 2f e1     bx      lr
 // CHECK-SCRIPT:      f3:
 // CHECK-SCRIPT-NEXT:    11014:       1e ff 2f e1     bx      lr
+// CHECK-SCRIPT-EMPTY:
 // CHECK-SCRIPT-NEXT: Disassembly of section .func1:
+// CHECK-SCRIPT-EMPTY:
 // CHECK-SCRIPT-NEXT: func1:
 // CHECK-SCRIPT-NEXT:    11018:       1e ff 2f e1     bx      lr
+// CHECK-SCRIPT-EMPTY:
 // CHECK-SCRIPT-NEXT: Disassembly of section .func2:
+// CHECK-SCRIPT-EMPTY:
 // CHECK-SCRIPT-NEXT: func2:
 // CHECK-SCRIPT-NEXT:    1101c:       1e ff 2f e1     bx      lr
+// CHECK-SCRIPT-EMPTY:
 // CHECK-SCRIPT-NEXT: Disassembly of section .func3:
+// CHECK-SCRIPT-EMPTY:
 // CHECK-SCRIPT-NEXT: func3:
 // CHECK-SCRIPT-NEXT:    11020:       1e ff 2f e1     bx      lr
 
diff --git a/deps/lld/test/ELF/arm-exidx-output.s b/deps/lld/test/ELF/arm-exidx-output.s
index 4c65c274b71338c6b337deb8b3573b7376800c65..758c1539a474ec4efd356e88d8334c2e6ecaaa55 100644
--- a/deps/lld/test/ELF/arm-exidx-output.s
+++ b/deps/lld/test/ELF/arm-exidx-output.s
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t
 // RUN: ld.lld %t -o %t2 2>&1
-// RUN: llvm-readobj -sections %t2 | FileCheck %s
+// RUN: llvm-readobj --sections %t2 | FileCheck %s
 
 // Check that only a single .ARM.exidx output section is created when
 // there are input sections of the form .ARM.exidx.<section-name>. The
diff --git a/deps/lld/test/ELF/arm-exidx-relocatable.s b/deps/lld/test/ELF/arm-exidx-relocatable.s
index 422dfc289ed73f67e5dfab59103681464fb96cda..e9b2d726833b0d3c5bb44e3fbd51c238549832f5 100644
--- a/deps/lld/test/ELF/arm-exidx-relocatable.s
+++ b/deps/lld/test/ELF/arm-exidx-relocatable.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %S/Inputs/arm-exidx-cantunwind.s -o %tcantunwind
 // Check that relocatable link maintains SHF_LINK_ORDER
 // RUN: ld.lld -r %t %tcantunwind -o %t4 2>&1
-// RUN: llvm-readobj -s %t4 | FileCheck %s
+// RUN: llvm-readobj -S %t4 | FileCheck %s
 
 // Each assembler created .ARM.exidx section has the SHF_LINK_ORDER flag set
 // with the sh_link containing the section index of the executable section
diff --git a/deps/lld/test/ELF/arm-exidx-sentinel-norelocatable.s b/deps/lld/test/ELF/arm-exidx-sentinel-norelocatable.s
index 22e3a09c573f01bea16ee087281389f671882b5b..0a1ff1cb710ddc28d38493b0ebc14a7d92d47d6c 100644
--- a/deps/lld/test/ELF/arm-exidx-sentinel-norelocatable.s
+++ b/deps/lld/test/ELF/arm-exidx-sentinel-norelocatable.s
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o %t.o
 // RUN: ld.lld -r %t.o -o %t
-// RUN: llvm-readobj -s %t | FileCheck %s
+// RUN: llvm-readobj -S %t | FileCheck %s
 // Check that when doing a relocatable link we don't add a terminating entry
 // to the .ARM.exidx section
  .syntax unified
diff --git a/deps/lld/test/ELF/arm-exidx-shared.s b/deps/lld/test/ELF/arm-exidx-shared.s
index 631eb0711b8d40d9bab5cb8f351592271d8cd042..7987035046d1d7202d1835d72bda4dccfe325e2c 100644
--- a/deps/lld/test/ELF/arm-exidx-shared.s
+++ b/deps/lld/test/ELF/arm-exidx-shared.s
@@ -1,8 +1,8 @@
 // REQUIRES: arm
-// RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t
+// RUN: llvm-mc -filetype=obj -arm-add-build-attributes -triple=armv7a-none-linux-gnueabi %s -o %t
 // RUN: ld.lld --hash-style=sysv %t --shared -o %t2 2>&1
 // RUN: llvm-readobj --relocations %t2 | FileCheck %s
-// RUN: llvm-objdump -s -triple=armv7a-none-linux-gnueabi %t2 | FileCheck -check-prefix=CHECK-EXTAB %s
+// RUN: llvm-objdump -s -triple=armv7a-none-linux-gnueabi %t2 | FileCheck --check-prefix=CHECK-EXTAB-NEXT %s
 
 // Check that the relative R_ARM_PREL31 relocation can access a PLT entry
 // for when the personality routine is referenced from a shared library.
@@ -38,8 +38,8 @@ __aeabi_unwind_cpp_pr0:
 
 // CHECK: Relocations [
 // CHECK-NEXT:   Section {{.*}} .rel.plt {
-// CHECK-NEXT:     0x200C R_ARM_JUMP_SLOT __gxx_personality_v0
+// CHECK-NEXT:     0x300C R_ARM_JUMP_SLOT __gxx_personality_v0
 
 // CHECK-EXTAB: Contents of section .ARM.extab:
-// 0x0210 + 0x0e20 = 0x1030 = __gxx_personality_v0(PLT)
-// CHECK-EXTAB-NEXT:  0210 200e0000 b0b0b000 00000000
+// 0x0238 + 0xdf8 = 0x1030 = __gxx_personality_v0(PLT)      
+// CHECK-EXTAB-NEXT: 0238 f80d0000 b0b0b000 00000000 
diff --git a/deps/lld/test/ELF/arm-exidx-synthetic-link.s b/deps/lld/test/ELF/arm-exidx-synthetic-link.s
new file mode 100644
index 0000000000000000000000000000000000000000..9500aed41b102619724d93f4e637344bee9ea708
--- /dev/null
+++ b/deps/lld/test/ELF/arm-exidx-synthetic-link.s
@@ -0,0 +1,37 @@
+// REQUIRES: arm
+// RUN: llvm-mc -filetype=obj  -arm-add-build-attributes -triple=armv7a-none-linux-gnueabi %s -o %t.o
+// RUN: ld.lld %t.o -o %t.so -shared
+// RUN: llvm-readobj -S %t.so | FileCheck %s
+
+// Test that when all the .ARM.exidx sections are merged into a single
+// synthetic EXIDX_CANTUNWIND entry we can still set the SHF_LINK_ORDER
+// link.
+ .syntax unified
+ .section .text.1, "ax", %progbits
+ .globl f1
+ .type f1, %function
+f1:
+ bx lr
+
+ .section .text.2, "ax", %progbits
+ .globl f2
+ .type f2, %function
+f2:
+ .fnstart
+ bx lr
+ .cantunwind
+ .fnend
+
+// CHECK:      Name: .ARM.exidx
+// CHECK-NEXT: Type: SHT_ARM_EXIDX
+// CHECK-NEXT: Flags [
+// CHECK-NEXT:   SHF_ALLOC
+// CHECK-NEXT:   SHF_LINK_ORDER
+// CHECK-NEXT: ]
+// CHECK-NEXT: Address:
+// CHECK-NEXT: Offset:
+// CHECK-NEXT: Size:
+// CHECK-NEXT: Link: [[INDEX:.*]]
+
+// CHECK:      Index: [[INDEX]]
+// CHECK-NEXT: Name: .text
diff --git a/deps/lld/test/ELF/arm-extreme-range-pi-thunk.s b/deps/lld/test/ELF/arm-extreme-range-pi-thunk.s
index 5daf38807ba16721b4548624ce8361d9dca9a90e..c53cae984003cd851ecc7f8090826b1721c906e7 100644
--- a/deps/lld/test/ELF/arm-extreme-range-pi-thunk.s
+++ b/deps/lld/test/ELF/arm-extreme-range-pi-thunk.s
@@ -32,6 +32,7 @@ high:
 // ARMv7a instructions and relocations.
 
 // CHECK: Disassembly of section .text_low:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // CHECK-NEXT:      130:        00 00 00 eb     bl      #0 <__ARMV7PILongThunk_high>
 // CHECK-NEXT:      134:        1e ff 2f e1     bx      lr
@@ -44,6 +45,7 @@ high:
 // CHECK-NEXT:      144:        1c ff 2f e1     bx      r12
 
 // CHECK: Disassembly of section .text_high:
+// CHECK-EMPTY:
 // CHECK-NEXT: high:
 // CHECK-NEXT: f0000000:        00 00 00 eb     bl      #0 <__ARMV7PILongThunk__start>
 // CHECK-NEXT: f0000004:        1e ff 2f e1     bx      lr
@@ -57,6 +59,7 @@ high:
 
 // Thumbv7a instructions and relocations
 // CHECK-THUMB: Disassembly of section .text_low:
+// CHECK-THUMB-EMPTY:
 // CHECK-THUMB-NEXT: _start:
 // CHECK-THUMB-NEXT:      130:  00 f0 02 f8     bl      #4
 // CHECK-THUMB-NEXT:      134:  70 47   bx      lr
@@ -70,6 +73,7 @@ high:
 // CHECK-THUMB-NEXT:      142:  60 47   bx      r12
 
 // CHECK-THUMB: Disassembly of section .text_high:
+// CHECK-THUMB-EMPTY:
 // CHECK-THUMB-NEXT: high:
 // CHECK-THUMB-NEXT: f0000000:  00 f0 02 f8     bl      #4
 // CHECK-THUMB-NEXT: f0000004:  70 47   bx      lr
diff --git a/deps/lld/test/ELF/arm-force-pi-thunk.s b/deps/lld/test/ELF/arm-force-pi-thunk.s
index 2c88de0424ee5cd8eb22882dc5495139e40f5378..7fe2a022e35b2203b5b23df7729cd05ce3f68644 100644
--- a/deps/lld/test/ELF/arm-force-pi-thunk.s
+++ b/deps/lld/test/ELF/arm-force-pi-thunk.s
@@ -31,6 +31,7 @@ low_target2:
  bl high_target2
 
 // CHECK: Disassembly of section .text_low:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // CHECK-NEXT:       94:        70 47   bx      lr
 // CHECK: low_target:
@@ -69,6 +70,7 @@ high_target2:
  bl low_target2
 
 // CHECK: Disassembly of section .text_high:
+// CHECK-EMPTY:
 // CHECK-NEXT: high_target:
 // CHECK-NEXT:  2000000:        00 f0 02 f8     bl      #4
 // CHECK-NEXT:  2000004:        00 f0 06 f8     bl      #12
diff --git a/deps/lld/test/ELF/arm-fpic-got.s b/deps/lld/test/ELF/arm-fpic-got.s
index a5f8152350ccdc1ca105a893440f60d159d7c3a5..81f14519b9c8349726ff1598c5e7a7275d7d855c 100644
--- a/deps/lld/test/ELF/arm-fpic-got.s
+++ b/deps/lld/test/ELF/arm-fpic-got.s
@@ -1,8 +1,8 @@
 // REQUIRES: arm
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t.o
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -s %t | FileCheck %s
-// RUN: llvm-readobj -s -symbols %t | FileCheck -check-prefix=SYMBOLS %s
+// RUN: llvm-readobj -S %t | FileCheck %s
+// RUN: llvm-readobj -S --symbols %t | FileCheck -check-prefix=SYMBOLS %s
 // RUN: llvm-objdump -d -triple=armv7a-none-linux-gnueabi %t | FileCheck -check-prefix=CODE %s
 
 // Test the R_ARM_GOT_PREL relocation
@@ -36,7 +36,7 @@ val:
 // CHECK-NEXT:      SHF_ALLOC
 // CHECK-NEXT:      SHF_WRITE
 // CHECK-NEXT:    ]
-// CHECK-NEXT:    Address: 0x13000
+// CHECK-NEXT:    Address: 0x12000
 // CHECK-NEXT:    Offset:
 // CHECK-NEXT:    Size: 4
 // CHECK-NEXT:    Link:
@@ -45,7 +45,7 @@ val:
 // CHECK-NEXT:    EntrySize:
 
 // SYMBOLS:    Name: val
-// SYMBOLS-NEXT:    Value: 0x12000
+// SYMBOLS-NEXT:    Value: 0x13000
 // SYMBOLS-NEXT:    Size: 4
 // SYMBOLS-NEXT:    Binding: Global
 // SYMBOLS-NEXT:    Type: Object
@@ -53,11 +53,12 @@ val:
 // SYMBOLS-NEXT:    Section: .data
 
 // CODE: Disassembly of section .text:
+// CODE-EMPTY:
 // CODE-NEXT: _start:
 // CODE-NEXT:   11000:  08 00 9f e5     ldr     r0, [pc, #8]
 // CODE-NEXT:   11004:  00 00 9f e7     ldr     r0, [pc, r0]
 // CODE-NEXT:   11008:  00 00 90 e5     ldr     r0, [r0]
 // CODE-NEXT:   1100c:  1e ff 2f e1     bx      lr
 // CODE: $d.1:
-// 0x11004 + 0x1ff4 + 8 = 0x13000 = .got
-// CODE-NEXT:   11010:  f4 1f 00 00
+// 0x11004 + 0x0ff4 + 8 = 0x12000 = .got
+// CODE-NEXT:   11010:  f4 0f 00 00
diff --git a/deps/lld/test/ELF/arm-gnu-ifunc-nosym.s b/deps/lld/test/ELF/arm-gnu-ifunc-nosym.s
index b76ede75b4a108f6d45553cbe38426fc56e01235..71d40f02834d1645f39299db2bac5f27ce758c25 100644
--- a/deps/lld/test/ELF/arm-gnu-ifunc-nosym.s
+++ b/deps/lld/test/ELF/arm-gnu-ifunc-nosym.s
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t.o
 // RUN: ld.lld -static %t.o -o %tout
-// RUN: llvm-readobj -symbols %tout | FileCheck %s
+// RUN: llvm-readobj --symbols %tout | FileCheck %s
 
 // Check that no __rel_iplt_end/__rel_iplt_start
 // appear in symtab if there are no references to them.
diff --git a/deps/lld/test/ELF/arm-gnu-ifunc-plt.s b/deps/lld/test/ELF/arm-gnu-ifunc-plt.s
index 441c31c2bb256af36478a4be40373819219e123f..751c61cdc4912360d1dcf379ded0517836463d73 100644
--- a/deps/lld/test/ELF/arm-gnu-ifunc-plt.s
+++ b/deps/lld/test/ELF/arm-gnu-ifunc-plt.s
@@ -5,30 +5,31 @@
 // RUN: ld.lld --hash-style=sysv %t.so %t.o -o %tout
 // RUN: llvm-objdump -triple=armv7a-linux-gnueabihf -d %tout | FileCheck %s --check-prefix=DISASM
 // RUN: llvm-objdump -s %tout | FileCheck %s --check-prefix=GOTPLT
-// RUN: llvm-readobj -r -dynamic-table %tout | FileCheck %s
+// RUN: llvm-readobj -r --dynamic-table %tout | FileCheck %s
 
 // Check that the IRELATIVE relocations are last in the .got
 // CHECK: Relocations [
 // CHECK-NEXT:   Section (4) .rel.dyn {
-// CHECK-NEXT:     0x13078 R_ARM_GLOB_DAT bar2 0x0
-// CHECK-NEXT:     0x1307C R_ARM_GLOB_DAT zed2 0x0
-// CHECK-NEXT:     0x13080 R_ARM_IRELATIVE - 0x0
-// CHECK-NEXT:     0x13084 R_ARM_IRELATIVE - 0x0
+// CHECK-NEXT:     0x12078 R_ARM_GLOB_DAT bar2 0x0
+// CHECK-NEXT:     0x1207C R_ARM_GLOB_DAT zed2 0x0
+// CHECK-NEXT:     0x12080 R_ARM_IRELATIVE - 0x0
+// CHECK-NEXT:     0x12084 R_ARM_IRELATIVE - 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Section (5) .rel.plt {
-// CHECK-NEXT:     0x1200C R_ARM_JUMP_SLOT bar2 0x0
-// CHECK-NEXT:     0x12010 R_ARM_JUMP_SLOT zed2 0x0
+// CHECK-NEXT:     0x1300C R_ARM_JUMP_SLOT bar2 0x0
+// CHECK-NEXT:     0x13010 R_ARM_JUMP_SLOT zed2 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
 // Check that the GOT entries refer back to the ifunc resolver
-// GOTPLT: Contents of section .got.plt:
-// GOTPLT-NEXT:  12000 00000000 00000000 00000000 20100100
-// GOTPLT-NEXT:  12010 20100100
 // GOTPLT: Contents of section .got:
-// GOTPLT-NEXT:  13078 00000000 00000000 00100100 04100100
+// GOTPLT-NEXT:  12078 00000000 00000000 00100100 04100100
+// GOTPLT: Contents of section .got.plt:
+// GOTPLT-NEXT:  13000 00000000 00000000 00000000 20100100
+// GOTPLT-NEXT:  13010 20100100
 
 // DISASM: Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: foo:
 // DISASM-NEXT:    11000:       1e ff 2f e1     bx      lr
 // DISASM: bar:
@@ -41,11 +42,13 @@
 // DISASM-NEXT:    11014:       04 00 00 00     .word   0x00000004
 // DISASM:         11018:       08 00 00 eb     bl      #32
 // DISASM-NEXT:    1101c:       0b 00 00 eb     bl      #44
+// DISASM-EMPTY:
 // DISASM-NEXT: Disassembly of section .plt:
+// DISASM-EMPTY:
 // DISASM-NEXT: $a:
 // DISASM-NEXT:    11020:       04 e0 2d e5     str     lr, [sp, #-4]!
 // DISASM-NEXT:    11024:       00 e6 8f e2     add     lr, pc, #0, #12
-// DISASM-NEXT:    11028:       00 ea 8e e2     add     lr, lr, #0, #20
+// DISASM-NEXT:    11028:       01 ea 8e e2     add     lr, lr, #4096
 // DISASM-NEXT:    1102c:       dc ff be e5     ldr     pc, [lr, #4060]!
 // DISASM: $d:
 // DISASM-NEXT:    11030:       d4 d4 d4 d4     .word   0xd4d4d4d4
@@ -54,25 +57,25 @@
 // DISASM-NEXT:    1103c:       d4 d4 d4 d4     .word   0xd4d4d4d4
 // DISASM: $a:
 // DISASM-NEXT:    11040:       00 c6 8f e2     add     r12, pc, #0, #12
-// DISASM-NEXT:    11044:       00 ca 8c e2     add     r12, r12, #0, #20
+// DISASM-NEXT:    11044:       01 ca 8c e2     add     r12, r12, #4096
 // DISASM-NEXT:    11048:       c4 ff bc e5     ldr     pc, [r12, #4036]!
 // DISASM: $d:
 // DISASM-NEXT:    1104c:       d4 d4 d4 d4     .word   0xd4d4d4d4
 // DISASM: $a:
 // DISASM-NEXT:    11050:       00 c6 8f e2     add     r12, pc, #0, #12
-// DISASM-NEXT:    11054:       00 ca 8c e2     add     r12, r12, #0, #20
+// DISASM-NEXT:    11054:       01 ca 8c e2     add     r12, r12, #4096
 // DISASM-NEXT:    11058:       b8 ff bc e5     ldr     pc, [r12, #4024]!
 // DISASM: $d:
 // DISASM-NEXT:    1105c:       d4 d4 d4 d4     .word   0xd4d4d4d4
 // DISASM: $a:
 // DISASM-NEXT:    11060:       00 c6 8f e2     add     r12, pc, #0, #12
-// DISASM-NEXT:    11064:       02 ca 8c e2     add     r12, r12, #8192
+// DISASM-NEXT:    11064:       01 ca 8c e2     add     r12, r12, #4096
 // DISASM-NEXT:    11068:       18 f0 bc e5     ldr     pc, [r12, #24]!
 // DISASM: $d:
 // DISASM-NEXT:    1106c:       d4 d4 d4 d4     .word   0xd4d4d4d4
 // DISASM: $a:
 // DISASM-NEXT:    11070:       00 c6 8f e2     add     r12, pc, #0, #12
-// DISASM-NEXT:    11074:       02 ca 8c e2     add     r12, r12, #8192
+// DISASM-NEXT:    11074:       01 ca 8c e2     add     r12, r12, #4096
 // DISASM-NEXT:    11078:       0c f0 bc e5     ldr     pc, [r12, #12]!
 // DISASM: $d:
 // DISASM-NEXT:   1107c:	d4 d4 d4 d4 	.word	0xd4d4d4d4
diff --git a/deps/lld/test/ELF/arm-gnu-ifunc.s b/deps/lld/test/ELF/arm-gnu-ifunc.s
index 92f87b5d5faefdf262469259a403420f0ff7d822..5755ff7f99b8b12e800dd821b59171ccce6d95ff 100644
--- a/deps/lld/test/ELF/arm-gnu-ifunc.s
+++ b/deps/lld/test/ELF/arm-gnu-ifunc.s
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t.o
 // RUN: ld.lld -static %t.o -o %tout
 // RUN: llvm-objdump -triple armv7a-none-linux-gnueabi -d %tout | FileCheck %s --check-prefix=DISASM
-// RUN: llvm-readobj -r -symbols -sections %tout | FileCheck %s
+// RUN: llvm-readobj -r --symbols --sections %tout | FileCheck %s
  .syntax unified
  .text
  .type foo STT_GNU_IFUNC
@@ -113,6 +113,7 @@ _start:
 // CHECK-NEXT:  }
 
 // DISASM: Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: foo:
 // DISASM-NEXT:    11000:      1e ff 2f e1     bx      lr
 // DISASM: bar:
@@ -126,7 +127,9 @@ _start:
 // 1 * 65536 + 260 = 0x10104 __rel_iplt_end
 // DISASM-NEXT:    11018:      04 01 00 e3     movw    r0, #260
 // DISASM-NEXT:    1101c:      01 00 40 e3     movt    r0, #1
+// DISASM-EMPTY:
 // DISASM-NEXT: Disassembly of section .plt:
+// DISASM-EMPTY:
 // DISASM-NEXT: $a:
 // DISASM-NEXT:    11020:       00 c6 8f e2     add     r12, pc, #0, #12
 // DISASM-NEXT:    11024:       00 ca 8c e2     add     r12, r12, #0, #20
diff --git a/deps/lld/test/ELF/arm-got-relative.s b/deps/lld/test/ELF/arm-got-relative.s
index cf8b0a64a966d5b7b8476c98971ca0376e109d11..89cad2732d1e3df06bbde6a65b46fe60759c046f 100644
--- a/deps/lld/test/ELF/arm-got-relative.s
+++ b/deps/lld/test/ELF/arm-got-relative.s
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc -position-independent -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t.o
 // RUN: ld.lld --hash-style=sysv %t.o -shared -o %t
-// RUN: llvm-readobj -s -symbols -dyn-relocations %t | FileCheck %s
+// RUN: llvm-readobj -S --symbols --dyn-relocations %t | FileCheck %s
 // RUN: llvm-objdump -d -triple=armv7a-none-linux-gnueabi %t | FileCheck -check-prefix=CODE %s
  .syntax unified
  .text
@@ -41,6 +41,7 @@ function:
 // CHECK-NEXT:    Section: .got
 
 // CODE: Disassembly of section .text:
+// CODE-EMPTY:
 // CODE-NEXT: _start:
 // CODE-NEXT:    1000:        08 30 9f e5    ldr     r3, [pc, #8]
 // CODE-NEXT:    1004:        08 20 9f e5    ldr     r2, [pc, #8]
diff --git a/deps/lld/test/ELF/arm-gotoff.s b/deps/lld/test/ELF/arm-gotoff.s
index b9432b20df20d4dffed56b8cd889fe57529a318e..b1705c23eb05e75d79db9d8e5187bc55d400f88d 100644
--- a/deps/lld/test/ELF/arm-gotoff.s
+++ b/deps/lld/test/ELF/arm-gotoff.s
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc -filetype=obj -triple=armv7a-linux-gnueabi %s -o %t.o
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -s -r -t %t | FileCheck %s
+// RUN: llvm-readobj -S -r --symbols %t | FileCheck %s
 // RUN: llvm-objdump -triple=armv7a-linux-gnueabi -d %t | FileCheck --check-prefix=DISASM %s
 
 // Test the R_ARM_GOTOFF32 relocation
@@ -53,6 +53,7 @@
 // CHECK-NEXT:    Section: .bss
 
 // DISASM:      Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT :_start:
 // DISASM-NEXT   11000:       1e ff 2f e1     bx      lr
 // Offset 0 from .got = bar
diff --git a/deps/lld/test/ELF/arm-icf-exidx.s b/deps/lld/test/ELF/arm-icf-exidx.s
index 629505cb7ffa79baddfbdb78fb43c7a24b24f037..0de27a26baefcb1b6331d317ecd335ebd955a98e 100644
--- a/deps/lld/test/ELF/arm-icf-exidx.s
+++ b/deps/lld/test/ELF/arm-icf-exidx.s
@@ -23,6 +23,7 @@ __aeabi_unwind_cpp_pr0:
  bx lr
 
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT: g:
 // CHECK-NEXT:    11000:        1e ff 2f e1     bx      lr
 // CHECK: __aeabi_unwind_cpp_pr0:
diff --git a/deps/lld/test/ELF/arm-mov-relocs.s b/deps/lld/test/ELF/arm-mov-relocs.s
index f49e2c102e407b8879935ba408675a98b776169d..80c1cac4f80932038261419136e2eab96f231582 100644
--- a/deps/lld/test/ELF/arm-mov-relocs.s
+++ b/deps/lld/test/ELF/arm-mov-relocs.s
@@ -18,6 +18,7 @@ _start:
  movw r3, :lower16:label3
  movw r4, :lower16:label3 + 4
 // CHECK: Disassembly of section .R_ARM_MOVW_ABS_NC
+// CHECK-EMPTY:
 // CHECK: movw	r0, #0
 // CHECK: movw	r1, #4
 // CHECK: movw	r2, #12
@@ -30,6 +31,7 @@ _start:
  movt r3, :upper16:label3
  movt r4, :upper16:label3 + 4
 // CHECK: Disassembly of section .R_ARM_MOVT_ABS
+// CHECK-EMPTY:
 // CHECK: movt	r0, #2
 // CHECK: movt	r1, #2
 // CHECK: movt	r2, #2
diff --git a/deps/lld/test/ELF/arm-pie-relative.s b/deps/lld/test/ELF/arm-pie-relative.s
index 582bb8aa03d2d223da7eb160802ca2625b589ed6..55e495774c0ef404b4caf12216111c344b3873bb 100644
--- a/deps/lld/test/ELF/arm-pie-relative.s
+++ b/deps/lld/test/ELF/arm-pie-relative.s
@@ -19,7 +19,7 @@ sym:
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section (4) .rel.dyn {
-// CHECK-NEXT:     0x3058 R_ARM_RELATIVE
+// CHECK-NEXT:     0x2058 R_ARM_RELATIVE
 
 // GOT: Contents of section .got:
-// GOT-NEXT:  3058 00200000
+// GOT-NEXT:  2058 00300000
diff --git a/deps/lld/test/ELF/arm-plt-reloc.s b/deps/lld/test/ELF/arm-plt-reloc.s
index 347bc87f6655b6f8400ecfca8b7eff2a6edc677d..45cac352e3526957f2cb250691bb5489bcfb28d9 100644
--- a/deps/lld/test/ELF/arm-plt-reloc.s
+++ b/deps/lld/test/ELF/arm-plt-reloc.s
@@ -5,7 +5,7 @@
 // RUN: llvm-objdump -triple=armv7a-none-linux-gnueabi -d %t | FileCheck %s
 // RUN: ld.lld --hash-style=sysv -shared %t1 %t2 -o %t3
 // RUN: llvm-objdump -triple=armv7a-none-linux-gnueabi -d %t3 | FileCheck -check-prefix=DSO %s
-// RUN: llvm-readobj -s -r %t3 | FileCheck -check-prefix=DSOREL %s
+// RUN: llvm-readobj -S -r %t3 | FileCheck -check-prefix=DSOREL %s
 //
 // Test PLT entry generation
  .syntax unified
@@ -20,6 +20,7 @@ _start:
 
 // Executable, expect no PLT
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT: func1:
 // CHECK-NEXT:   11000:        1e ff 2f e1    bx      lr
 // CHECK: func2:
@@ -34,6 +35,7 @@ _start:
 // Expect PLT entries as symbols can be preempted
 // The .got.plt and .plt displacement is small so we can use small PLT entries.
 // DSO: Disassembly of section .text:
+// DSO-EMPTY:
 // DSO-NEXT: func1:
 // DSO-NEXT:     1000:       1e ff 2f e1     bx      lr
 // DSO: func2:
@@ -47,12 +49,14 @@ _start:
 // DSO-NEXT:     1010:       0e 00 00 eb     bl      #56
 // S(0x10160) - P(0x1014) + A(-8) = 0x44 = 68
 // DSO-NEXT:     1014:       11 00 00 0a     beq     #68
+// DSO-EMPTY:
 // DSO-NEXT: Disassembly of section .plt:
+// DSO-EMPTY:
 // DSO-NEXT: $a:
 // DSO-NEXT:     1020:       04 e0 2d e5     str     lr, [sp, #-4]!
-// (0x1024 + 8) + (0 RoR 12) + (0 RoR 20) + (0xfdc) = 0x2008 = .got.plt[3]
+// (0x1024 + 8) + (0 RoR 12) + 4096 + (0xfdc) = 0x3008 = .got.plt[3]
 // DSO-NEXT:     1024:       00 e6 8f e2     add     lr, pc, #0, #12
-// DSO-NEXT:     1028:       00 ea 8e e2     add     lr, lr, #0, #20
+// DSO-NEXT:     1028:       01 ea 8e e2     add     lr, lr, #4096
 // DSO-NEXT:     102c:       dc ff be e5     ldr     pc, [lr, #4060]!
 // DSO: $d:
 // DSO-NEXT:     1030:       d4 d4 d4 d4     .word   0xd4d4d4d4
@@ -60,23 +64,23 @@ _start:
 // DSO-NEXT:     1038:       d4 d4 d4 d4     .word   0xd4d4d4d4
 // DSO-NEXT:     103c:       d4 d4 d4 d4     .word   0xd4d4d4d4
 // DSO: $a:
-// (0x1040 + 8) + (0 RoR 12) + (0 RoR 20) + (0xfc4) = 0x200c
+// (0x1040 + 8) + (0 RoR 12) + 4096 + (0xfc4) = 0x300c
 // DSO-NEXT:     1040:       00 c6 8f e2     add     r12, pc, #0, #12
-// DSO-NEXT:     1044:       00 ca 8c e2     add     r12, r12, #0, #20
+// DSO-NEXT:     1044:       01 ca 8c e2     add     r12, r12, #4096
 // DSO-NEXT:     1048:       c4 ff bc e5     ldr     pc, [r12, #4036]!
 // DSO: $d:
 // DSO-NEXT:     104c:       d4 d4 d4 d4     .word   0xd4d4d4d4
 // DSO: $a:
-// (0x1050 + 8) + (0 RoR 12) + (0 RoR 20) + (0xfb8) = 0x2010
+// (0x1050 + 8) + (0 RoR 12) + 4096 + (0xfb8) = 0x3010
 // DSO-NEXT:     1050:       00 c6 8f e2     add     r12, pc, #0, #12
-// DSO-NEXT:     1054:       00 ca 8c e2     add     r12, r12, #0, #20
+// DSO-NEXT:     1054:       01 ca 8c e2     add     r12, r12, #4096
 // DSO-NEXT:     1058:       b8 ff bc e5     ldr     pc, [r12, #4024]!
 // DSO: $d:
 // DSO-NEXT:     105c:       d4 d4 d4 d4     .word   0xd4d4d4d4
 // DSO: $a:
-// (0x1060 + 8) + (0 RoR 12) + (0 RoR 20) + (0xfac) = 0x2014
+// (0x1060 + 8) + (0 RoR 12) + 4096 + (0xfac) = 0x3014
 // DSO-NEXT:     1060:       00 c6 8f e2     add     r12, pc, #0, #12
-// DSO-NEXT:     1064:       00 ca 8c e2     add     r12, r12, #0, #20
+// DSO-NEXT:     1064:       01 ca 8c e2     add     r12, r12, #4096
 // DSO-NEXT:     1068:       ac ff bc e5     ldr     pc, [r12, #4012]!
 // DSO: $d:
 // DSO-NEXT:     106c:       d4 d4 d4 d4     .word   0xd4d4d4d4
@@ -88,7 +92,7 @@ _start:
 // DSOREL-NEXT:      SHF_ALLOC
 // DSOREL-NEXT:      SHF_WRITE
 // DSOREL-NEXT:    ]
-// DSOREL-NEXT:    Address: 0x2000
+// DSOREL-NEXT:    Address: 0x3000
 // DSOREL-NEXT:    Offset:
 // DSOREL-NEXT:    Size: 24
 // DSOREL-NEXT:    Link:
@@ -97,9 +101,9 @@ _start:
 // DSOREL-NEXT:    EntrySize:
 // DSOREL:  Relocations [
 // DSOREL-NEXT:  Section {{.*}} .rel.plt {
-// DSOREL-NEXT:    0x200C R_ARM_JUMP_SLOT func1 0x0
-// DSOREL-NEXT:    0x2010 R_ARM_JUMP_SLOT func2 0x0
-// DSOREL-NEXT:    0x2014 R_ARM_JUMP_SLOT func3 0x0
+// DSOREL-NEXT:    0x300C R_ARM_JUMP_SLOT func1 0x0
+// DSOREL-NEXT:    0x3010 R_ARM_JUMP_SLOT func2 0x0
+// DSOREL-NEXT:    0x3014 R_ARM_JUMP_SLOT func3 0x0
 
 // Test a large separation between the .plt and .got.plt
 // The .got.plt and .plt displacement is large but still within the range
@@ -111,9 +115,10 @@ _start:
 // RUN:       }" > %t.script
 // RUN: ld.lld --hash-style=sysv --script %t.script -shared %t1 %t2 -o %t4
 // RUN: llvm-objdump -triple=armv7a-none-linux-gnueabi -d %t4 | FileCheck --check-prefix=CHECKHIGH %s
-// RUN: llvm-readobj -s -r %t4 | FileCheck --check-prefix=DSORELHIGH %s
+// RUN: llvm-readobj -S -r %t4 | FileCheck --check-prefix=DSORELHIGH %s
 
 // CHECKHIGH: Disassembly of section .text:
+// CHECKHIGH-EMPTY:
 // CHECKHIGH-NEXT: func1:
 // CHECKHIGH-NEXT:     1000:       1e ff 2f e1     bx      lr
 // CHECKHIGH: func2:
@@ -124,7 +129,9 @@ _start:
 // CHECKHIGH-NEXT:     100c:       03 04 00 ea     b       #4108 <$a>
 // CHECKHIGH-NEXT:     1010:       06 04 00 eb     bl      #4120 <$a>
 // CHECKHIGH-NEXT:     1014:       09 04 00 0a     beq     #4132 <$a>
+// CHECKHIGH-EMPTY:
 // CHECKHIGH-NEXT: Disassembly of section .plt:
+// CHECKHIGH-EMPTY:
 // CHECKHIGH-NEXT: $a:
 // CHECKHIGH-NEXT:     2000:       04 e0 2d e5     str     lr, [sp, #-4]!
 // CHECKHIGH-NEXT:     2004:       10 e6 8f e2     add     lr, pc, #16, #12
@@ -176,9 +183,10 @@ _start:
 // RUN:       }" > %t2.script
 // RUN: ld.lld --hash-style=sysv --script %t2.script -shared %t1 %t2 -o %t5
 // RUN: llvm-objdump -triple=armv7a-none-linux-gnueabi -d %t5 | FileCheck --check-prefix=CHECKLONG %s
-// RUN: llvm-readobj -s -r %t5 | FileCheck --check-prefix=DSORELLONG %s
+// RUN: llvm-readobj -S -r %t5 | FileCheck --check-prefix=DSORELLONG %s
 
 // CHECKLONG: Disassembly of section .text:
+// CHECKLONG-EMPTY:
 // CHECKLONG-NEXT: func1:
 // CHECKLONG-NEXT:     1000:       1e ff 2f e1     bx      lr
 // CHECKLONG: func2:
@@ -189,7 +197,9 @@ _start:
 // CHECKLONG-NEXT:     100c:       03 04 00 ea     b       #4108 <$a>
 // CHECKLONG-NEXT:     1010:       06 04 00 eb     bl      #4120 <$a>
 // CHECKLONG-NEXT:     1014:       09 04 00 0a     beq     #4132 <$a>
+// CHECKLONG-EMPTY:
 // CHECKLONG-NEXT: Disassembly of section .plt:
+// CHECKLONG-EMPTY:
 // CHECKLONG-NEXT: $a:
 // CHECKLONG-NEXT:     2000:       04 e0 2d e5     str     lr, [sp, #-4]!
 // CHECKLONG-NEXT:     2004:       04 e0 9f e5     ldr     lr, [pc, #4]
@@ -242,9 +252,10 @@ _start:
 // RUN:       }" > %t3.script
 // RUN: ld.lld --hash-style=sysv --script %t3.script -shared %t1 %t2 -o %t6
 // RUN: llvm-objdump -triple=armv7a-none-linux-gnueabi -d %t6 | FileCheck --check-prefix=CHECKMIX %s
-// RUN: llvm-readobj -s -r %t6 | FileCheck --check-prefix=DSORELMIX %s
+// RUN: llvm-readobj -S -r %t6 | FileCheck --check-prefix=DSORELMIX %s
 
 // CHECKMIX: Disassembly of section .text:
+// CHECKMIX-EMPTY:
 // CHECKMIX-NEXT: func1:
 // CHECKMIX-NEXT:     1000:     1e ff 2f e1     bx      lr
 // CHECKMIX: func2:
@@ -255,7 +266,9 @@ _start:
 // CHECKMIX-NEXT:     100c:     03 04 00 ea     b       #4108 <$a>
 // CHECKMIX-NEXT:     1010:     06 04 00 eb     bl      #4120 <$a>
 // CHECKMIX-NEXT:     1014:     09 04 00 0a     beq     #4132 <$a>
+// CHECKMIX-EMPTY:
 // CHECKMIX-NEXT: Disassembly of section .plt:
+// CHECKMIX-EMPTY:
 // CHECKMIX-NEXT: $a:
 // CHECKMIX-NEXT:     2000:     04 e0 2d e5     str     lr, [sp, #-4]!
 // CHECKMIX-NEXT:     2004:     04 e0 9f e5     ldr     lr, [pc, #4]
diff --git a/deps/lld/test/ELF/arm-sbrel32.s b/deps/lld/test/ELF/arm-sbrel32.s
index 064f59bbd3fe36ec142354d7fef76bafe8fc482e..a09cf8fe9509115c540cbb6b9c648d1a3dbc327e 100644
--- a/deps/lld/test/ELF/arm-sbrel32.s
+++ b/deps/lld/test/ELF/arm-sbrel32.s
@@ -31,6 +31,7 @@ foo3:   .space 4
 foo4:   .space 4
 
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // CHECK-NEXT:    11000:        1e ff 2f e1     bx      lr
 // CHECK:         11004:        00 00 00 00     .word   0x00000000
diff --git a/deps/lld/test/ELF/arm-tag-vfp-args.s b/deps/lld/test/ELF/arm-tag-vfp-args.s
index b0ff095687f15f49d0c0c0983312b1b917d05d41..9a38b04b09c8936fb17b4b4310717a37070ffa18 100644
--- a/deps/lld/test/ELF/arm-tag-vfp-args.s
+++ b/deps/lld/test/ELF/arm-tag-vfp-args.s
@@ -7,15 +7,15 @@
 
 // The default for this file is 0 (Base AAPCS)
 // RUN: ld.lld %t.o -o %tdefault
-// RUN: llvm-readobj -file-headers %tdefault | FileCheck -check-prefix=CHECK-BASE %s
+// RUN: llvm-readobj --file-headers %tdefault | FileCheck -check-prefix=CHECK-BASE %s
 
 // Expect explicit Base AAPCS.
 // RUN: ld.lld %t.o %tbase.o -o %tbase
-// RUN: llvm-readobj -file-headers %tbase | FileCheck -check-prefix=CHECK-BASE %s
+// RUN: llvm-readobj --file-headers %tbase | FileCheck -check-prefix=CHECK-BASE %s
 
 // Expect explicit Base AAPCS when linking Base and Compatible.
 // RUN: ld.lld %t.o %tbase.o %tcompat.o -o %tbasecompat
-// RUN: llvm-readobj -file-headers %tbasecompat | FileCheck -check-prefix=CHECK-BASE %s
+// RUN: llvm-readobj --file-headers %tbasecompat | FileCheck -check-prefix=CHECK-BASE %s
 
 // CHECK-BASE:   Flags [ (0x5000200)
 // CHECK-BASE-NEXT:     0x200
@@ -25,11 +25,11 @@
 
 // Expect Hard float VFP AAPCS
 // RUN: ld.lld %t.o %tvfp.o -o %tvfp
-// RUN: llvm-readobj -file-headers %tvfp | FileCheck -check-prefix=CHECK-VFP %s
+// RUN: llvm-readobj --file-headers %tvfp | FileCheck -check-prefix=CHECK-VFP %s
 
 // Expect Hard float VFP AAPCS when linking VFP and Compatible
 // RUN: ld.lld %t.o %tvfp.o %tcompat.o -o %tvfpcompat
-// RUN: llvm-readobj -file-headers %tvfpcompat | FileCheck -check-prefix=CHECK-VFP %s
+// RUN: llvm-readobj --file-headers %tvfpcompat | FileCheck -check-prefix=CHECK-VFP %s
 
 // CHECK-VFP:   Flags [ (0x5000400)
 // CHECK-VFP-NEXT:     0x400
@@ -39,11 +39,11 @@
 
 // Expect Toolchain specifc to not use either Base or VFP AAPCS
 // RUN: ld.lld %t.o %ttoolchain.o -o %ttoolchain
-// RUN: llvm-readobj -file-headers %ttoolchain | FileCheck -check-prefix=CHECK-TOOLCHAIN %s
+// RUN: llvm-readobj --file-headers %ttoolchain | FileCheck -check-prefix=CHECK-TOOLCHAIN %s
 
 // Expect Toolchain and Compatible to have same affect as Toolchain.
 // RUN: ld.lld %t.o %ttoolchain.o %tcompat.o -o %ttoolchaincompat
-// RUN: llvm-readobj -file-headers %ttoolchaincompat | FileCheck -check-prefix=CHECK-TOOLCHAIN %s
+// RUN: llvm-readobj --file-headers %ttoolchaincompat | FileCheck -check-prefix=CHECK-TOOLCHAIN %s
 
 // CHECK-TOOLCHAIN:   Flags [ (0x5000000)
 // CHECK-TOOLCHAIN-NEXT:     0x1000000
diff --git a/deps/lld/test/ELF/arm-target1.s b/deps/lld/test/ELF/arm-target1.s
index 2fc0b8bc428111b1f0b750f9f7dd85cf2278cd8b..604878aab972faeb26cd2d5fd765b9c1a5161eef 100644
--- a/deps/lld/test/ELF/arm-target1.s
+++ b/deps/lld/test/ELF/arm-target1.s
@@ -26,6 +26,7 @@
 // Force generation of $d.0 as section is not all data
   nop
 // RELATIVE: Disassembly of section .text:
+// RELATIVE-EMPTY:
 // RELATIVE: $d.0:
 // RELATIVE:     1000:       04 00 00 00     .word   0x00000004
 // RELATIVE: SYMBOL TABLE:
diff --git a/deps/lld/test/ELF/arm-thumb-blx.s b/deps/lld/test/ELF/arm-thumb-blx.s
index 5316d13dbc28b5572a321d5b4cf29e07e86edd48..8b5d20071e89ea9fad856946226b0522702af3f1 100644
--- a/deps/lld/test/ELF/arm-thumb-blx.s
+++ b/deps/lld/test/ELF/arm-thumb-blx.s
@@ -41,14 +41,17 @@ _start:
  bx lr
 
 // CHECK-ARM: Disassembly of section .R_ARM_CALL24_callee1:
+// CHECK-ARM-EMPTY:
 // CHECK-NEXT-ARM: callee_low:
 // CHECK-NEXT-ARM:      b4:     1e ff 2f e1     bx      lr
 
 // CHECK-THUMB: Disassembly of section .R_ARM_CALL24_callee2:
+// CHECK-THUMB-EMPTY:
 // CHECK-NEXT-THUMB: callee_thumb_low:
 // CHECK-NEXT-THUMB:     100:	70 47 	bx	lr
 
 // CHECK-THUMB: Disassembly of section .caller:
+// CHECK-THUMB-EMPTY:
 // CHECK-THUMB: _start:
 // Align(0x10000,4) - 0xff50 (65360) + 4 = 0xb4 = callee_low
 // CHECK-NEXT-THUMB:   10000:       f0 f7 58 e8     blx     #-65360
@@ -77,9 +80,11 @@ _start:
 
 
 // CHECK-ARM: Disassembly of section .R_ARM_CALL24_callee3:
+// CHECK-ARM-EMPTY:
 // CHECK-NEXT-ARM: callee_high:
 // CHECK-NEXT-ARM:   10100:     1e ff 2f e1     bx      lr
 
 // CHECK: Disassembly of section .R_ARM_CALL24_callee4:
+// CHECK-EMPTY:
 // CHECK-NEXT-THUMB:callee_thumb_high:
 // CHECK-NEXT-THUMB:   10200:   70 47   bx      lr
diff --git a/deps/lld/test/ELF/arm-thumb-branch-rangethunk.s b/deps/lld/test/ELF/arm-thumb-branch-rangethunk.s
index 31a239dcdd8840f7d2b4f0d1b7bfd61883e24cfa..338c195abf93ec844808c458c1e6d6b6b76b715d 100644
--- a/deps/lld/test/ELF/arm-thumb-branch-rangethunk.s
+++ b/deps/lld/test/ELF/arm-thumb-branch-rangethunk.s
@@ -17,6 +17,7 @@ _start:
  beq.w too_far3
 
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // CHECK-NEXT:    20000:       00 f0 04 f8     bl      #8
 // CHECK-NEXT:    20004:       00 f0 07 b8     b.w     #14 <__Thumbv7ABSLongThunk_too_far2>
diff --git a/deps/lld/test/ELF/arm-thumb-branch.s b/deps/lld/test/ELF/arm-thumb-branch.s
index 043db4b08f97ae004d5ee20e284f6f572ced7226..78907000553abaee6550062d53ed25e7b40590a4 100644
--- a/deps/lld/test/ELF/arm-thumb-branch.s
+++ b/deps/lld/test/ELF/arm-thumb-branch.s
@@ -40,9 +40,12 @@ callee_high:
  bx lr
 
 // CHECK: Disassembly of section .callee1:
+// CHECK-EMPTY:
 // CHECK-NEXT: callee_low:
 // CHECK-NEXT:      b4:       70 47   bx      lr
+// CHECK-EMPTY:
 // CHECK-NEXT: Disassembly of section .caller:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // CHECK-NEXT:   10000:       f0 f7 58 f8     bl      #-65360
 // CHECK-NEXT:   10004:       f0 f7 56 b8     b.w     #-65364
@@ -55,6 +58,8 @@ callee_high:
 // CHECK-NEXT:   10020:       3f f3 ff af     bgt.w   #1048574
 // CHECK-NEXT:   10024:       70 47   bx      lr
 // CHECK-NEXT:   10026:
+// CHECK-EMPTY:
 // CHECK-NEXT: Disassembly of section .callee2:
+// CHECK-EMPTY:
 // CHECK-NEXT: callee_high:
 // CHECK-NEXT:   10028:       70 47   bx      lr
diff --git a/deps/lld/test/ELF/arm-thumb-condbranch-thunk.s b/deps/lld/test/ELF/arm-thumb-condbranch-thunk.s
index 8a5e9c85f51034102f6e25bae38e094ca6102016..a2666725970e112862fcf2832fa31164fee96586 100644
--- a/deps/lld/test/ELF/arm-thumb-condbranch-thunk.s
+++ b/deps/lld/test/ELF/arm-thumb-condbranch-thunk.s
@@ -34,6 +34,7 @@ _start:
 // Section
  bl tfunc33
 // CHECK1: Disassembly of section .text:
+// CHECK1-EMPTY:
 // CHECK1-NEXT: tfunc00:
 // CHECK1-NEXT:    80000:       70 47   bx      lr
 // CHECK1-NEXT:    80002:       7f f3 ff d7     bl      #16252926
diff --git a/deps/lld/test/ELF/arm-thumb-interwork-shared.s b/deps/lld/test/ELF/arm-thumb-interwork-shared.s
index 5c847367e09bba8b38b6f797cc82695bd4aab823..695afdaed92ed407761b7eb3b8517cc5568e20f9 100644
--- a/deps/lld/test/ELF/arm-thumb-interwork-shared.s
+++ b/deps/lld/test/ELF/arm-thumb-interwork-shared.s
@@ -15,6 +15,7 @@ sym1:
 // entry.
 
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT: sym1:
 // CHECK-NEXT: 1000: 00 f0 02 b8 b.w #4 <__ThumbV7PILongThunk_elsewhere>
 // CHECK-NEXT: 1004: 00 f0 06 b8 b.w #12 <__ThumbV7PILongThunk_weakref>
@@ -30,10 +31,11 @@ sym1:
 // CHECK-NEXT:     101e:       60 47   bx      r12
 
 // PLT: Disassembly of section .plt:
+// PLT-EMPTY:
 // PLT-NEXT: $a:
 // PLT-NEXT:     1020:  04 e0 2d e5     str     lr, [sp, #-4]!
 // PLT-NEXT:     1024:  00 e6 8f e2     add     lr, pc, #0, #12
-// PLT-NEXT:     1028:  00 ea 8e e2     add     lr, lr, #0, #20
+// PLT-NEXT:     1028:  01 ea 8e e2     add     lr, lr, #4096
 // PLT-NEXT:     102c:  dc ff be e5     ldr     pc, [lr, #4060]!
 // PLT: $d:
 // PLT-NEXT:     1030:  d4 d4 d4 d4     .word   0xd4d4d4d4
@@ -42,13 +44,13 @@ sym1:
 // PLT-NEXT:     103c:  d4 d4 d4 d4     .word   0xd4d4d4d4
 // PLT: $a:
 // PLT-NEXT:     1040:  00 c6 8f e2     add     r12, pc, #0, #12
-// PLT-NEXT:     1044:  00 ca 8c e2     add     r12, r12, #0, #20
+// PLT-NEXT:     1044:  01 ca 8c e2     add     r12, r12, #4096
 // PLT-NEXT:     1048:  c4 ff bc e5     ldr     pc, [r12, #4036]!
 // PLT: $d:
 // PLT-NEXT:     104c:  d4 d4 d4 d4     .word   0xd4d4d4d4
 // PLT: $a:
 // PLT-NEXT:     1050:  00 c6 8f e2     add     r12, pc, #0, #12
-// PLT-NEXT:     1054:  00 ca 8c e2     add     r12, r12, #0, #20
+// PLT-NEXT:     1054:  01 ca 8c e2     add     r12, r12, #4096
 // PLT-NEXT:     1058:  b8 ff bc e5     ldr     pc, [r12, #4024]!
 // PLT: $d:
 // PLT-NEXT:     105c:  d4 d4 d4 d4     .word   0xd4d4d4d4
diff --git a/deps/lld/test/ELF/arm-thumb-interwork-thunk.s b/deps/lld/test/ELF/arm-thumb-interwork-thunk.s
index 4ff08e0112b72ed0514b9d130f37e5b88ab79453..4bc8025b31a64508c6ee8af78cb8649ddf632037 100644
--- a/deps/lld/test/ELF/arm-thumb-interwork-thunk.s
+++ b/deps/lld/test/ELF/arm-thumb-interwork-thunk.s
@@ -19,7 +19,7 @@
 // RUN: llvm-objdump -d -triple=armv7a-none-linux-gnueabi %t3 | FileCheck -check-prefix=CHECK-ARM -check-prefix=CHECK-PI-ARM %s
 // RUN: llvm-objdump -d -triple=thumbv7a-none-linux-gnueabi %t4 | FileCheck -check-prefix=CHECK-THUMB -check-prefix=CHECK-PI-PLT-THUMB %s
 // RUN: llvm-objdump -d -triple=armv7a-none-linux-gnueabi %t4 | FileCheck -check-prefix=CHECK-ARM -check-prefix=CHECK-PI-PLT-ARM %s
-// RUN: llvm-readobj -s -r %t4 | FileCheck -check-prefix=CHECK-DSO-REL %s
+// RUN: llvm-readobj -S -r %t4 | FileCheck -check-prefix=CHECK-DSO-REL %s
 
 // Test ARM Thumb Interworking
 // The file is linked and checked 3 times to check the following contexts
@@ -39,6 +39,7 @@ thumb_callee1:
  bx lr
 
 // CHECK-THUMB: Disassembly of section .R_ARM_JUMP24_callee_1:
+// CHECK-THUMB-EMPTY:
 // CHECK-THUMB: thumb_callee1:
 // CHECK-THUMB: 1000:       70 47   bx
  .section .R_ARM_THM_JUMP_callee_low, "ax", %progbits
@@ -79,6 +80,7 @@ arm_caller:
  bne arm_callee3
  bx lr
 // CHECK-ARM-ABS-ARM: Disassembly of section .arm_caller:
+// CHECK-ARM-ABS-ARM-EMPTY:
 // CHECK-ARM-ABS-ARM-NEXT: arm_caller:
 // CHECK-ARM-ABS-ARM-NEXT:     1300:       3e ff ff fa     blx     #-776 <thumb_callee1>
 // CHECK-ARM-ABS-ARM-NEXT:     1304:       3d ff ff fa     blx     #-780 <thumb_callee1>
@@ -107,6 +109,7 @@ arm_caller:
 // CHECK-ARM-ABS-ARM-NEXT:     1348:       1c ff 2f e1     bx      r12
 
 // CHECK-PI-ARM: Disassembly of section .arm_caller:
+// CHECK-PI-ARM-EMPTY:
 // CHECK-PI-ARM-NEXT: arm_caller:
 // CHECK-PI-ARM-NEXT:     1300:       3e ff ff fa     blx     #-776 <thumb_callee1>
 // CHECK-PI-ARM-NEXT:     1304:       3d ff ff fa     blx     #-780 <thumb_callee1>
@@ -140,6 +143,7 @@ arm_caller:
 
 // All PLT entries are ARM, no need for interworking thunks
 // CHECK-PI-ARM-PLT: Disassembly of section .arm_caller:
+// CHECK-PI-ARM-PLT-EMPTY:
 // CHECK-PI-ARM-PLT-NEXT: arm_caller:
 // 0x17e4 PLT(thumb_callee1)
 // CHECK-PI-ARM-PLT-NEXT:    1300:       37 01 00 eb     bl      #1244
@@ -184,6 +188,7 @@ thumb_caller:
  beq.w arm_callee2
  bne.w arm_callee3
 // CHECK-ABS-THUMB: Disassembly of section .thumb_caller:
+// CHECK-ABS-THUMB-EMPTY:
 // CHECK-ABS-THUMB-NEXT: thumb_caller:
 // CHECK-ABS-THUMB-NEXT:     1400:       ff f7 7e ee     blx     #-772
 // CHECK-ABS-THUMB-NEXT:     1404:       ff f7 7c ee     blx     #-776
@@ -210,6 +215,7 @@ thumb_caller:
 // CHECK-ABS-THUMB-NEXT:     143c:       60 47   bx      r12
 
 // CHECK-PI-THUMB: Disassembly of section .thumb_caller:
+// CHECK-PI-THUMB-EMPTY:
 // CHECK-PI-THUMB-NEXT: thumb_caller:
 // CHECK-PI-THUMB-NEXT:     1400:       ff f7 7e ee     blx     #-772
 // CHECK-PI-THUMB-NEXT:     1404:       ff f7 7c ee     blx     #-776
@@ -239,6 +245,7 @@ thumb_caller:
 // CHECK-PI-THUMB-NEXT:     1442:       60 47   bx      r12
 
 // CHECK-PI-THUMB-PLT: Disassembly of section .arm_caller:
+// CHECK-PI-THUMB-PLT-EMPTY:
 // CHECK-PI-THUMB-PLT-NEXT: thumb_caller:
 // 0x1400 + 4 + 0x410 = 0x1814 = PLT(arm_callee1)
 // CHECK-PI-THUMB-PLT-NEXT:    1400:    00 f0 08 ea     blx     #1040
@@ -286,6 +293,7 @@ thumb_callee2:
 thumb_callee3:
  bx lr
 // CHECK-THUMB:  Disassembly of section .R_ARM_JUMP24_callee_2:
+// CHECK-THUMB-EMPTY:
 // CHECK-THUMB-NEXT: thumb_callee2:
 // CHECK-THUMB-NEXT: 1500:       70 47   bx      lr
 // CHECK-THUMB: thumb_callee3:
@@ -303,6 +311,7 @@ arm_callee2:
 arm_callee3:
  bx lr
 // CHECK-ARM: Disassembly of section .R_ARM_THM_JUMP_callee_2:
+// CHECK-ARM-EMPTY:
 // CHECK-ARM-NEXT: arm_callee2:
 // CHECK-ARM-NEXT:     1600:     1e ff 2f e1     bx      lr
 // CHECK-ARM: arm_callee3:
@@ -321,6 +330,7 @@ _start:
 
 
 // CHECK-PI-ARM-PLT: Disassembly of section .plt:
+// CHECK-PI-ARM-PLT-EMPTY:
 // CHECK-PI-ARM-PLT-NEXT: .plt:
 // CHECK-PI-ARM-PLT-NEXT: 17b0:         04 e0 2d e5     str     lr, [sp, #-4]!
 // CHECK-PI-ARM-PLT-NEXT: 17b4:         04 e0 9f e5     ldr     lr, [pc, #4]
diff --git a/deps/lld/test/ELF/arm-thumb-narrow-branch-check.s b/deps/lld/test/ELF/arm-thumb-narrow-branch-check.s
index 27bac59787e1a11cb12150fd6bf3097e8666dd16..b3409bf97891a1440fed0e36ec28bd4099cc7137 100644
--- a/deps/lld/test/ELF/arm-thumb-narrow-branch-check.s
+++ b/deps/lld/test/ELF/arm-thumb-narrow-branch-check.s
@@ -50,9 +50,12 @@ callee_high:
 callee_high_far = 0x180d
 
 // CHECK: Disassembly of section .R_ARM_PC11_1:
+// CHECK-EMPTY:
 // CHECK-NEXT: callee_low:
 // CHECK-NEXT:    1000:       70 47   bx      lr
+// CHECK-EMPTY:
 // CHECK-NEXT: Disassembly of section .caller:
+// CHECK-EMPTY:
 // CHECK-NEXT: callers:
 // 1004 - 0x800 (2048) + 4 = 0x808 = callee_low_far
 // CHECK-NEXT:    1004:       00 e4   b       #-2048
@@ -64,10 +67,14 @@ callee_high_far = 0x180d
 // CHECK-NEXT:    100a:       ff e3   b       #2046
 // CHECK-NEXT:    100c:       70 47   bx      lr
 // CHECK-NEXT:    100e:       00 bf   nop
+// CHECK-EMPTY:
 // CHECK-NEXT: Disassembly of section .R_ARM_PC11_2:
+// CHECK-EMPTY:
 // CHECK-NEXT: callee_high:
 // CHECK-NEXT:    1010:       70 47   bx      lr
+// CHECK-EMPTY:
 // CHECK-NEXT: Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // CHECK-NEXT:    1014:       ff f7 f6 ff     bl      #-20
 // CHECK-NEXT:    1018:       70 47   bx      lr
diff --git a/deps/lld/test/ELF/arm-thumb-no-undefined-thunk.s b/deps/lld/test/ELF/arm-thumb-no-undefined-thunk.s
index 5456e76394981186008f5b1437b5860ce0edd17a..bfe8fe52d739c54b78fd6c423446f2897961bd35 100644
--- a/deps/lld/test/ELF/arm-thumb-no-undefined-thunk.s
+++ b/deps/lld/test/ELF/arm-thumb-no-undefined-thunk.s
@@ -17,6 +17,7 @@ _start:
  b.w target
 
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // 69636 = 0x11004 = next instruction
 // CHECK:         11000: {{.*}} bl      #0
diff --git a/deps/lld/test/ELF/arm-thumb-plt-range-thunk-os.s b/deps/lld/test/ELF/arm-thumb-plt-range-thunk-os.s
index 08907510be8868aafffcd0768ce4bb51c9585fa2..0b5eacb9610142d12a7631ff9ddfc4e6e80166c2 100644
--- a/deps/lld/test/ELF/arm-thumb-plt-range-thunk-os.s
+++ b/deps/lld/test/ELF/arm-thumb-plt-range-thunk-os.s
@@ -35,6 +35,7 @@ preemptible:
  bl far_nonpreemptible_alias
  bx lr
 // CHECK1: Disassembly of section .text:
+// CHECK1-EMPTY:
 // CHECK1-NEXT: sym1:
 // CHECK1-NEXT:  2000000:       00 f0 00 d8     bl      #8388608
 // CHECK1-NEXT:  2000004:       00 f0 04 d8     bl      #8388616
@@ -84,10 +85,11 @@ far_nonpreemptible_alias:
 // CHECK3:  4000000:       00 f0 16 e8     blx     #44
 
 // CHECK4: Disassembly of section .plt:
+// CHECK4-EMPTY:
 // CHECK4-NEXT: $a:
 // CHECK4-NEXT:  4000010:	04 e0 2d e5 	str	lr, [sp, #-4]!
 // CHECK4-NEXT:  4000014:	00 e6 8f e2 	add	lr, pc, #0, #12
-// CHECK4-NEXT:  4000018:	00 ea 8e e2 	add	lr, lr, #0, #20
+// CHECK4-NEXT:  4000018:	01 ea 8e e2 	add	lr, lr, #4096
 // CHECK4-NEXT:  400001c:	ec ff be e5 	ldr	pc, [lr, #4076]!
 // CHECK4: $d:
 // CHECK4-NEXT:  4000020:	d4 d4 d4 d4 	.word	0xd4d4d4d4
@@ -96,19 +98,19 @@ far_nonpreemptible_alias:
 // CHECK4-NEXT:  400002c:	d4 d4 d4 d4 	.word	0xd4d4d4d4
 // CHECK4: $a:
 // CHECK4-NEXT:  4000030:	00 c6 8f e2 	add	r12, pc, #0, #12
-// CHECK4-NEXT:  4000034:	00 ca 8c e2 	add	r12, r12, #0, #20
+// CHECK4-NEXT:  4000034:	01 ca 8c e2 	add	r12, r12, #4096
 // CHECK4-NEXT:  4000038:	d4 ff bc e5 	ldr	pc, [r12, #4052]!
 // CHECK4: $d:
 // CHECK4-NEXT:  400003c:	d4 d4 d4 d4 	.word	0xd4d4d4d4
 // CHECK4: $a:
 // CHECK4-NEXT:  4000040:	00 c6 8f e2 	add	r12, pc, #0, #12
-// CHECK4-NEXT:  4000044:	00 ca 8c e2 	add	r12, r12, #0, #20
+// CHECK4-NEXT:  4000044:	01 ca 8c e2 	add	r12, r12, #4096
 // CHECK4-NEXT:  4000048:	c8 ff bc e5 	ldr	pc, [r12, #4040]!
 // CHECK4: $d:
 // CHECK4-NEXT:  400004c:	d4 d4 d4 d4 	.word	0xd4d4d4d4
 // CHECK4: $a:
 // CHECK4-NEXT:  4000050:	00 c6 8f e2 	add	r12, pc, #0, #12
-// CHECK4-NEXT:  4000054:	00 ca 8c e2 	add	r12, r12, #0, #20
+// CHECK4-NEXT:  4000054:	01 ca 8c e2 	add	r12, r12, #4096
 // CHECK4-NEXT:  4000058:	bc ff bc e5 	ldr	pc, [r12, #4028]!
 // CHECK4: $d:
 // CHECK4-NEXT:  400005c:	d4 d4 d4 d4 	.word	0xd4d4d4d4
diff --git a/deps/lld/test/ELF/arm-thumb-plt-reloc.s b/deps/lld/test/ELF/arm-thumb-plt-reloc.s
index 742e95994fff8ec37eb990bc7c6639c77f506018..9980460bb3197c6e5e1850cd9b907814bf8ecdd5 100644
--- a/deps/lld/test/ELF/arm-thumb-plt-reloc.s
+++ b/deps/lld/test/ELF/arm-thumb-plt-reloc.s
@@ -6,7 +6,7 @@
 // RUN: ld.lld --hash-style=sysv -shared %t1 %t2 -o %t3
 // RUN: llvm-objdump -triple=thumbv7a-none-linux-gnueabi -d %t3 | FileCheck -check-prefix=DSOTHUMB %s
 // RUN: llvm-objdump -triple=armv7a-none-linux-gnueabi -d %t3 | FileCheck -check-prefix=DSOARM %s
-// RUN: llvm-readobj -s -r %t3 | FileCheck -check-prefix=DSOREL %s
+// RUN: llvm-readobj -S -r %t3 | FileCheck -check-prefix=DSOREL %s
 //
 // Test PLT entry generation
  .syntax unified
@@ -24,6 +24,7 @@ _start:
 
 // Executable, expect no PLT
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT: func1:
 // CHECK-NEXT:   11000: 70 47   bx      lr
 // CHECK: func2:
@@ -43,6 +44,7 @@ _start:
 // .text is Thumb and .plt is ARM, llvm-objdump can currently only disassemble
 // as ARM or Thumb. Work around by disassembling twice.
 // DSOTHUMB: Disassembly of section .text:
+// DSOTHUMB-EMPTY:
 // DSOTHUMB-NEXT: func1:
 // DSOTHUMB-NEXT:     1000:     70 47   bx      lr
 // DSOTHUMB: func2:
@@ -58,11 +60,12 @@ _start:
 // 0x1010 + 0x4C + 4 = 0x1060 = PLT func3
 // DSOTHUMB-NEXT:     1010:     00 f0 26 e8     blx     #76
 // DSOARM: Disassembly of section .plt:
+// DSOARM-EMPTY:
 // DSOARM-NEXT: $a:
 // DSOARM-NEXT:     1020:       04 e0 2d e5     str     lr, [sp, #-4]!
-// (0x1024 + 8) + (0 RoR 12) + (0 RoR 20) + (0xfdc) = 0x2008 = .got.plt[3]
+// (0x1024 + 8) + (0 RoR 12) + 4096 + (0xfdc) = 0x3008 = .got.plt[3]
 // DSOARM-NEXT:     1024:       00 e6 8f e2     add     lr, pc, #0, #12
-// DSOARM-NEXT:     1028:       00 ea 8e e2     add     lr, lr, #0, #20
+// DSOARM-NEXT:     1028:       01 ea 8e e2     add     lr, lr, #4096
 // DSOARM-NEXT:     102c:       dc ff be e5     ldr     pc, [lr, #4060]!
 // DSOARM: $d:
 
@@ -71,23 +74,23 @@ _start:
 // DSOARM-NEXT:     1038:       d4 d4 d4 d4     .word   0xd4d4d4d4
 // DSOARM-NEXT:     103c:       d4 d4 d4 d4     .word   0xd4d4d4d4
 // DSOARM: $a:
-// (0x1040 + 8) + (0 RoR 12) + (0 RoR 20) + (0xfc4) = 0x200c
+// (0x1040 + 8) + (0 RoR 12) + 4096 + (0xfc4) = 0x300c
 // DSOARM-NEXT:     1040:       00 c6 8f e2     add     r12, pc, #0, #12
-// DSOARM-NEXT:     1044:       00 ca 8c e2     add     r12, r12, #0, #20
+// DSOARM-NEXT:     1044:       01 ca 8c e2     add     r12, r12, #4096
 // DSOARM-NEXT:     1048:       c4 ff bc e5     ldr     pc, [r12, #4036]!
 // DSOARM: $d:
 // DSOARM-NEXT:     104c:       d4 d4 d4 d4     .word   0xd4d4d4d4
 // DSOARM: $a:
-// (0x1050 + 8) + (0 RoR 12) + (0 RoR 20) + (0xfb8) = 0x2010
+// (0x1050 + 8) + (0 RoR 12) + 4096 + (0xfb8) = 0x3010
 // DSOARM-NEXT:     1050:       00 c6 8f e2     add     r12, pc, #0, #12
-// DSOARM-NEXT:     1054:       00 ca 8c e2     add     r12, r12, #0, #20
+// DSOARM-NEXT:     1054:       01 ca 8c e2     add     r12, r12, #4096
 // DSOARM-NEXT:     1058:       b8 ff bc e5     ldr     pc, [r12, #4024]!
 // DSOARM: $d:
 // DSOARM-NEXT:     105c:       d4 d4 d4 d4     .word   0xd4d4d4d4
 // DSOARM: $a:
-// (0x1060 + 8) + (0 RoR 12) + (0 RoR 20) + (0xfac) = 0x2014
+// (0x1060 + 8) + (0 RoR 12) + 4096 + (0xfac) = 0x3014
 // DSOARM-NEXT:     1060:       00 c6 8f e2     add     r12, pc, #0, #12
-// DSOARM-NEXT:     1064:       00 ca 8c e2     add     r12, r12, #0, #20
+// DSOARM-NEXT:     1064:       01 ca 8c e2     add     r12, r12, #4096
 // DSOARM-NEXT:     1068:       ac ff bc e5     ldr     pc, [r12, #4012]!
 // DSOARM: $d:
 // DSOARM-NEXT:     106c:       d4 d4 d4 d4     .word   0xd4d4d4d4
@@ -98,7 +101,7 @@ _start:
 // DSOREL-NEXT:      SHF_ALLOC
 // DSOREL-NEXT:      SHF_WRITE
 // DSOREL-NEXT:    ]
-// DSOREL-NEXT:    Address: 0x2000
+// DSOREL-NEXT:    Address: 0x3000
 // DSOREL-NEXT:    Offset:
 // DSOREL-NEXT:    Size: 24
 // DSOREL-NEXT:    Link:
@@ -107,6 +110,6 @@ _start:
 // DSOREL-NEXT:    EntrySize:
 // DSOREL:  Relocations [
 // DSOREL-NEXT:  Section (4) .rel.plt {
-// DSOREL-NEXT:    0x200C R_ARM_JUMP_SLOT func1 0x0
-// DSOREL-NEXT:    0x2010 R_ARM_JUMP_SLOT func2 0x0
-// DSOREL-NEXT:    0x2014 R_ARM_JUMP_SLOT func3 0x0
+// DSOREL-NEXT:    0x300C R_ARM_JUMP_SLOT func1 0x0
+// DSOREL-NEXT:    0x3010 R_ARM_JUMP_SLOT func2 0x0
+// DSOREL-NEXT:    0x3014 R_ARM_JUMP_SLOT func3 0x0
diff --git a/deps/lld/test/ELF/arm-thumb-range-thunk-os.s b/deps/lld/test/ELF/arm-thumb-range-thunk-os.s
index 281e79a4eb1c12aadcdcdcb6afe44ddf3357e76a..ccaabae490e1b3307ee0c63df5815b6a62864839 100644
--- a/deps/lld/test/ELF/arm-thumb-range-thunk-os.s
+++ b/deps/lld/test/ELF/arm-thumb-range-thunk-os.s
@@ -43,6 +43,7 @@ _start:
 // the first of the pre-created ThunkSections.
  bl tfunc16
 // CHECK1: Disassembly of section .text:
+// CHECK1-EMPTY:
 // CHECK1-NEXT: _start:
 // CHECK1-NEXT:   100000:       ff f0 fe ff     bl      #1048572
 // CHECK1-NEXT:   100004:       ff f3 fc d7     bl      #16777208
diff --git a/deps/lld/test/ELF/arm-thumb-thunk-empty-pass.s b/deps/lld/test/ELF/arm-thumb-thunk-empty-pass.s
index 6e81b508492f339d979f316ee1b113dfda0c9964..84cd30c476adb32df8e3a77928d1c73b5ebc89dd 100644
--- a/deps/lld/test/ELF/arm-thumb-thunk-empty-pass.s
+++ b/deps/lld/test/ELF/arm-thumb-thunk-empty-pass.s
@@ -17,6 +17,7 @@ foo:
  bl _start
 
 // CHECK1: Disassembly of section .text:
+// CHECK1-EMPTY:
 // CHECK1-NEXT: _start:
 // CHECK1-NEXT:    11000:       ff f7 fe ff     bl      #-4
 // CHECK1: __Thumbv7ABSLongThunk__start:
diff --git a/deps/lld/test/ELF/arm-thumb-thunk-v6m.s b/deps/lld/test/ELF/arm-thumb-thunk-v6m.s
index bf5afd5edfee67e6db19425288942fd07f9f24b7..2bb9f488c246d2e31dfef8bdc76412d5335a2e32 100644
--- a/deps/lld/test/ELF/arm-thumb-thunk-v6m.s
+++ b/deps/lld/test/ELF/arm-thumb-thunk-v6m.s
@@ -31,6 +31,7 @@ far:
  bx lr
 
 // CHECK: Disassembly of section .text_low:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // CHECK-NEXT:       94:        00 f0 00 f8     bl      #0
 // CHECK: __Thumbv6MABSLongThunk_far:
@@ -40,10 +41,12 @@ far:
 // CHECK-NEXT:       9e:        01 bd   pop     {r0, pc}
 // CHECK:       a0:     01 00 00 02     .word   0x02000001
 // CHECK: Disassembly of section .text_high:
+// CHECK-EMPTY:
 // CHECK-NEXT: far:
 // CHECK-NEXT:  2000000:        70 47   bx      lr
 
 // CHECK-PI: Disassembly of section .text_low:
+// CHECK-PI-EMPTY:
 // CHECK-PI-NEXT: _start:
 // CHECK-PI-NEXT:      130:     00 f0 00 f8     bl      #0
 // CHECK-PI: __Thumbv6MPILongThunk_far:
@@ -57,5 +60,6 @@ far:
 // CHECK-PI:           140:     c1 fe ff 01     .word   0x01fffec1
 
 // CHECK-PI: Disassembly of section .text_high:
+// CHECK-PI-EMPTY:
 // CHECK-PI-NEXT: far:
 // CHECK-PI-NEXT:  2000000:     70 47   bx      lr
diff --git a/deps/lld/test/ELF/arm-thumb-undefined-weak-narrow.test b/deps/lld/test/ELF/arm-thumb-undefined-weak-narrow.test
index 15f428e019b07c71d8932b831cce183ecd40dc85..1fb3ca528c18ca337100f5b34ab879155bcdaeac 100644
--- a/deps/lld/test/ELF/arm-thumb-undefined-weak-narrow.test
+++ b/deps/lld/test/ELF/arm-thumb-undefined-weak-narrow.test
@@ -4,6 +4,7 @@
 # RUN: llvm-objdump -triple=thumbv7a-linux-gnueabi -d %t | FileCheck %s
 
 # CHECK: Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT:_start:
 # CHECK-NEXT:    11000:       ff e7   b       #-2
 
@@ -33,18 +34,16 @@ Sections:
         Type:            R_ARM_THM_JUMP11
 
 Symbols:
- Global:
-   - Type:             STT_FUNC
-     Name:             _start
-     Value:            1
-     Section:          .text
- Local:
-   - Type:             STT_NOTYPE
-     Name:             "$t"
-     Section:          .text
-     Value:            0
- Weak:
-   - Type:             STT_NOTYPE
-     Name:             undefined_weak
-     Value:            0
-
+  - Type:             STT_NOTYPE
+    Name:             "$t"
+    Section:          .text
+    Value:            0
+  - Type:             STT_FUNC
+    Name:             _start
+    Value:            1
+    Section:          .text
+    Binding:          STB_GLOBAL
+  - Type:             STT_NOTYPE
+    Name:             undefined_weak
+    Value:            0
+    Binding:          STB_WEAK
diff --git a/deps/lld/test/ELF/arm-thumb-undefined-weak.s b/deps/lld/test/ELF/arm-thumb-undefined-weak.s
index d973c58f16d85e9f4a138efb96a4fdd7ff4e4ab2..07004c99d3255c053c7bdaa7e6f2c4766209a34c 100644
--- a/deps/lld/test/ELF/arm-thumb-undefined-weak.s
+++ b/deps/lld/test/ELF/arm-thumb-undefined-weak.s
@@ -28,6 +28,7 @@ _start:
  movw r0, :lower16:target - .
 
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // 69636 = 0x11004
 // CHECK:         11000: {{.*}} beq.w   #0 <_start+0x4>
 // CHECK-NEXT:    11004: {{.*}} b.w     #0 <_start+0x8>
diff --git a/deps/lld/test/ELF/arm-thunk-largesection.s b/deps/lld/test/ELF/arm-thunk-largesection.s
index 940888f185d4d92776700e61f70c3eab7c6bfb44..c4ed8880ccfd718dcff5e57e3680de1d8e718fb9 100644
--- a/deps/lld/test/ELF/arm-thunk-largesection.s
+++ b/deps/lld/test/ELF/arm-thunk-largesection.s
@@ -16,6 +16,7 @@ _start:
  bx lr
  .space 0x1000
 // CHECK1: Disassembly of section .text:
+// CHECK1-EMPTY:
 // CHECK1-NEXT:_start:
 // CHECK1-NEXT:   11000:       70 47   bx      lr
 // CHECK1-EMPTY:
diff --git a/deps/lld/test/ELF/arm-thunk-linkerscript-dotexpr.s b/deps/lld/test/ELF/arm-thunk-linkerscript-dotexpr.s
index 4b68ad813bffe53efd92b2a65669d4beae0c8b79..e4ca77f0a0b6e06baa74065a0fc228eb2121f980 100644
--- a/deps/lld/test/ELF/arm-thunk-linkerscript-dotexpr.s
+++ b/deps/lld/test/ELF/arm-thunk-linkerscript-dotexpr.s
@@ -28,6 +28,7 @@ low_target2:
  bl high_target
  bl high_target2
 // CHECK1: Disassembly of section .text_low:
+// CHECK1-EMPTY:
 // CHECK1-NEXT: _start:
 // CHECK1-NEXT:       94:       70 47   bx      lr
 // CHECK1: low_target:
diff --git a/deps/lld/test/ELF/arm-thunk-linkerscript-large.s b/deps/lld/test/ELF/arm-thunk-linkerscript-large.s
index 1b9ec0bc86ff00862a27558818ee51b8b6bca487..04429166b49a2df58950196e5593e1e76f873122 100644
--- a/deps/lld/test/ELF/arm-thunk-linkerscript-large.s
+++ b/deps/lld/test/ELF/arm-thunk-linkerscript-large.s
@@ -53,6 +53,7 @@ _start:
  // Expect a range extension thunk in .text OutputSection
  bl tfunch31
 // CHECK1: Disassembly of section .text:
+// CHECK1-EMPTY:
 // CHECK1-NEXT: _start:
 // CHECK1-NEXT:   100000:       ff f0 fe ff     bl      #1048572
 // CHECK1-NEXT:   100004:       00 f0 00 f8     bl      #0
@@ -66,6 +67,7 @@ _start:
  // We can reuse existing thunk in .text
  bl tfunch31
 // CHECK2: Disassembly of section .textl:
+// CHECK2-EMPTY:
 // CHECK2-NEXT: tfuncl00:
 // CHECK2-NEXT:   200000:	70 47 	bx	lr
 // CHECK2-NEXT:   200002:	ff f0 ff df 	bl	#9437182
@@ -122,6 +124,7 @@ _start:
  // Shouldn't need a thunk
         bl tfuncl31
 // CHECK5:  Disassembly of section .texth:
+// CHECK5-EMPTY:
 // CHECK5-NEXT: tfunch00:
 // CHECK5-NEXT:  2200000:       70 47   bx      lr
 // CHECK5-NEXT:  2200002:       00 f7 05 f8     bl      #-1048566
diff --git a/deps/lld/test/ELF/arm-thunk-linkerscript-orphan.s b/deps/lld/test/ELF/arm-thunk-linkerscript-orphan.s
index 556e67be3165d022320c31ff046f71b0a37d2e5d..a5821d8d6d7f66348e085f407b7fd2b6d475eb83 100644
--- a/deps/lld/test/ELF/arm-thunk-linkerscript-orphan.s
+++ b/deps/lld/test/ELF/arm-thunk-linkerscript-orphan.s
@@ -18,6 +18,7 @@ low_target:
  bl high_target
  bl orphan_target
 // CHECK: Disassembly of section .text_low:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // CHECK-NEXT:   100000:        70 47   bx      lr
 // CHECK: low_target:
@@ -39,6 +40,7 @@ high_target:
  bl low_target
  bl orphan_target
 // CHECK: Disassembly of section .text_high:
+// CHECK-EMPTY:
 // CHECK-NEXT: high_target:
 // CHECK-NEXT:  2000000:        00 f0 02 f8     bl      #4
 // CHECK-NEXT:  2000004:        00 f0 06 f8     bl      #12
@@ -55,6 +57,7 @@ orphan_target:
  bl low_target
  bl high_target
 // CHECK: Disassembly of section orphan:
+// CHECK-EMPTY:
 // CHECK-NEXT: orphan_target:
 // CHECK-NEXT:  2000014:        ff f7 f8 ff     bl      #-16
 // CHECK-NEXT:  2000018:        ff f7 f2 ff     bl      #-28
diff --git a/deps/lld/test/ELF/arm-thunk-linkerscript.s b/deps/lld/test/ELF/arm-thunk-linkerscript.s
index 6e476a21b43f4125b6c7e02abfee4d890d99b374..ba9cef87025e40cdb6e4ca898149783f4b104000 100644
--- a/deps/lld/test/ELF/arm-thunk-linkerscript.s
+++ b/deps/lld/test/ELF/arm-thunk-linkerscript.s
@@ -28,6 +28,7 @@ low_target2:
  bl high_target2
 
 // CHECK: Disassembly of section .text_low:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // CHECK-NEXT:       94:        70 47   bx      lr
 // CHECK: low_target:
@@ -62,6 +63,7 @@ high_target2:
  bl low_target2
 
 // CHECK: Disassembly of section .text_high:
+// CHECK-EMPTY:
 // CHECK-NEXT: high_target:
 // CHECK-NEXT:  2000000:        00 f0 02 f8     bl      #4
 // CHECK-NEXT:  2000004:        00 f0 05 f8     bl      #10
diff --git a/deps/lld/test/ELF/arm-thunk-multipass-plt.s b/deps/lld/test/ELF/arm-thunk-multipass-plt.s
new file mode 100644
index 0000000000000000000000000000000000000000..ea1b9b6a6af78b9d106a772d30142b742433d90e
--- /dev/null
+++ b/deps/lld/test/ELF/arm-thunk-multipass-plt.s
@@ -0,0 +1,95 @@
+// REQUIRES: arm
+// RUN: llvm-mc -arm-add-build-attributes -filetype=obj -triple=armv5-none-linux-gnueabi %s -o %t
+// RUN: ld.lld %t -o %t2 --shared 2>&1
+// RUN: llvm-objdump --start-address=7340044 --stop-address=7340048 --triple=armv5-none-linux-gnueabi -d %t2 | FileCheck %s
+// RUN: llvm-objdump --start-address=8388620 --stop-address=8388624 --triple=thumbv5-none-linux-gnueabi -d %t2 | FileCheck %s -check-prefix=CHECK-CALL
+// RUN: llvm-objdump --start-address=13631520 --stop-address=13631584 --triple=armv5-none-linux-gnueabi -d %t2 | FileCheck %s -check-prefix=CHECK-PLT
+// When we create a thunk to a PLT entry the relocation is redirected to the
+// Thunk, changing its expression to a non-PLT equivalent. If the thunk
+// becomes unusable we need to restore the relocation expression to the PLT
+// form so that when we create a new thunk it targets the PLT.
+
+// Test case that checks the case:
+// - Thunk is created on pass 1 to a PLT entry for preemptible
+// - Some other Thunk added in the same pass moves the thunk to
+// preemptible out of range of its caller.
+// - New Thunk is created on pass 2 to PLT entry for preemptible
+
+        .globl preemptible
+        .globl preemptible2
+.section .text.01, "ax", %progbits
+.balign 0x100000
+        .thumb
+        .globl needsplt
+        .type needsplt, %function
+needsplt:
+        bl preemptible
+        .section .text.02, "ax", %progbits
+        .space (1024 * 1024)
+
+        .section .text.03, "ax", %progbits
+        .space (1024 * 1024)
+
+        .section .text.04, "ax", %progbits
+        .space (1024 * 1024)
+
+        .section .text.05, "ax", %progbits
+        .space (1024 * 1024)
+
+        .section .text.06, "ax", %progbits
+        .space (1024 * 1024)
+
+        .section .text.07, "ax", %progbits
+        .space (1024 * 1024)
+// 0x70000c + 8 + 0x60002c = 0xd00040 = preemptible@plt
+// CHECK: 0070000c __ARMV5PILongThunk_preemptible:
+// CHECK-NEXT:   70000c:        0b 00 18 ea     b       #6291500
+
+        .section .text.08, "ax", %progbits
+        .space (1024 * 1024) - 4
+
+        .section .text.10, "ax", %progbits
+        .balign 2
+        bl preemptible
+        bl preemptible2
+// 0x80000c + 4 - 100004 = 0x70000c = __ARMv5PILongThunk_preemptible
+// CHECK-CALL: 80000c:   ff f6 fe ef     blx     #-1048580
+        .balign 2
+        .globl preemptible
+        .type preemptible, %function
+preemptible:
+        bx lr
+        .globl preemptible2
+        .type preemptible2, %function
+preemptible2:
+        bx lr
+
+
+        .section .text.11, "ax", %progbits
+        .space (5 * 1024 * 1024)
+
+
+// CHECK-PLT: Disassembly of section .plt:
+// CHECK-PLT-EMPTY:
+// CHECK-PLT-NEXT: 00d00020 $a:
+// CHECK-PLT-NEXT:   d00020:    04 e0 2d e5     str     lr, [sp, #-4]!
+// CHECK-PLT-NEXT:   d00024:    00 e6 8f e2     add     lr, pc, #0, #12
+// CHECK-PLT-NEXT:   d00028:    01 ea 8e e2     add     lr, lr, #4096
+// CHECK-PLT-NEXT:   d0002c:    dc ff be e5     ldr     pc, [lr, #4060]!
+// CHECK-PLT: 00d00030 $d:
+// CHECK-PLT-NEXT:   d00030:    d4 d4 d4 d4     .word   0xd4d4d4d4
+// CHECK-PLT-NEXT:   d00034:    d4 d4 d4 d4     .word   0xd4d4d4d4
+// CHECK-PLT-NEXT:   d00038:    d4 d4 d4 d4     .word   0xd4d4d4d4
+// CHECK-PLT-NEXT:   d0003c:    d4 d4 d4 d4     .word   0xd4d4d4d4
+// CHECK-PLT: 00d00040 $a:
+// CHECK-PLT-NEXT:   d00040:    00 c6 8f e2     add     r12, pc, #0, #12
+// CHECK-PLT-NEXT:   d00044:    01 ca 8c e2     add     r12, r12, #4096
+// CHECK-PLT-NEXT:   d00048:    c4 ff bc e5     ldr     pc, [r12, #4036]!
+// CHECK-PLT: 00d0004c $d:
+// CHECK-PLT-NEXT:   d0004c:    d4 d4 d4 d4     .word   0xd4d4d4d4
+// CHECK-PLT: 00d00050 $a:
+// CHECK-PLT-NEXT:   d00050:    00 c6 8f e2     add     r12, pc, #0, #12
+// CHECK-PLT-NEXT:   d00054:    01 ca 8c e2     add     r12, r12, #4096
+// CHECK-PLT-NEXT:   d00058:    b8 ff bc e5     ldr     pc, [r12, #4024]!
+// CHECK-PLT: 00d0005c $d:
+// CHECK-PLT-NEXT:   d0005c:    d4 d4 d4 d4     .word   0xd4d4d4d4
diff --git a/deps/lld/test/ELF/arm-thunk-re-add.s b/deps/lld/test/ELF/arm-thunk-re-add.s
index 9e8feb38182975aacc07d4624c37ce9f1f9b9710..a0b2439b985bc26e82fa42ccaf9fa44142174471 100644
--- a/deps/lld/test/ELF/arm-thunk-re-add.s
+++ b/deps/lld/test/ELF/arm-thunk-re-add.s
@@ -99,10 +99,11 @@ callers:
 // CHECK2-NEXT:  110001c:       ff f6 f8 bf     b.w     #-1048592 <__ThumbV7PILongThunk_imported2>
 
 // CHECK3: Disassembly of section .plt:
+// CHECK3-EMPTY:
 // CHECK3-NEXT: $a:
 // CHECK3-NEXT:  1100020:       04 e0 2d e5     str     lr, [sp, #-4]!
 // CHECK3-NEXT:  1100024:       00 e6 8f e2     add     lr, pc, #0, #12
-// CHECK3-NEXT:  1100028:       00 ea 8e e2     add     lr, lr, #0, #20
+// CHECK3-NEXT:  1100028:       01 ea 8e e2     add     lr, lr, #4096
 // CHECK3-NEXT:  110002c:       dc ff be e5     ldr     pc, [lr, #4060]!
 // CHECK3: $d:
 // CHECK3-NEXT:  1100030:       d4 d4 d4 d4     .word   0xd4d4d4d4
@@ -111,13 +112,13 @@ callers:
 // CHECK3-NEXT:  110003c:       d4 d4 d4 d4     .word   0xd4d4d4d4
 // CHECK3: $a:
 // CHECK3-NEXT:  1100040:       00 c6 8f e2     add     r12, pc, #0, #12
-// CHECK3-NEXT:  1100044:       00 ca 8c e2     add     r12, r12, #0, #20
+// CHECK3-NEXT:  1100044:       01 ca 8c e2     add     r12, r12, #4096
 // CHECK3-NEXT:  1100048:       c4 ff bc e5     ldr     pc, [r12, #4036]!
 // CHECK3: $d:
 // CHECK3-NEXT:  110004c:       d4 d4 d4 d4     .word   0xd4d4d4d4
 // CHECK3: $a:
 // CHECK3-NEXT:  1100050:       00 c6 8f e2     add     r12, pc, #0, #12
-// CHECK3-NEXT:  1100054:       00 ca 8c e2     add     r12, r12, #0, #20
+// CHECK3-NEXT:  1100054:       01 ca 8c e2     add     r12, r12, #4096
 // CHECK3-NEXT:  1100058:       b8 ff bc e5     ldr     pc, [r12, #4024]!
 // CHECK3: $d:
 // CHECK3-NEXT:  110005c:       d4 d4 d4 d4     .word   0xd4d4d4d4
diff --git a/deps/lld/test/ELF/arm-tls-gd32.s b/deps/lld/test/ELF/arm-tls-gd32.s
index 28ef4967aba82ee101203ed9d380373c51412658..edbc6a54e0d219f5c76d1c346357de3d28968b01 100644
--- a/deps/lld/test/ELF/arm-tls-gd32.s
+++ b/deps/lld/test/ELF/arm-tls-gd32.s
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=armv7a-linux-gnueabi
 // RUN: ld.lld --hash-style=sysv %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -dyn-relocations %t.so | FileCheck --check-prefix=SEC %s
+// RUN: llvm-readobj -S --dyn-relocations %t.so | FileCheck --check-prefix=SEC %s
 // RUN: llvm-objdump -d -triple=armv7a-linux-gnueabi %t.so | FileCheck %s
 
 // Test the handling of the global-dynamic TLS model. Dynamic Loader finds
@@ -91,8 +91,7 @@ x:
 // SEC-NEXT: 0x2058 R_ARM_TLS_DTPOFF32 y
 
 
-// CHECK: Disassembly
-// CHECK-NEXT: func:
+// CHECK-LABEL: 00001000 func:
 // CHECK-NEXT:    1000:      00 f0 20 e3     nop
 // CHECK-NEXT:    1004:      00 f0 20 e3     nop
 // CHECK-NEXT:    1008:      00 f0 20 e3     nop
diff --git a/deps/lld/test/ELF/arm-tls-ie32.s b/deps/lld/test/ELF/arm-tls-ie32.s
index b12bc1be31619072bb33b7df45dc3df53bf06734..3c0db3cd362ab3513132d1fda0a31c2222b09893 100644
--- a/deps/lld/test/ELF/arm-tls-ie32.s
+++ b/deps/lld/test/ELF/arm-tls-ie32.s
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=armv7a-linux-gnueabi
 // RUN: ld.lld --hash-style=sysv %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -dyn-relocations %t.so | FileCheck --check-prefix=SEC %s
+// RUN: llvm-readobj -S --dyn-relocations %t.so | FileCheck --check-prefix=SEC %s
 // RUN: llvm-objdump -d -triple=armv7a-linux-gnueabi %t.so | FileCheck %s
 
 // Test the handling of the initial-exec TLS model. Relative location within
@@ -83,6 +83,7 @@ x:
 // SEC:  0x2050 R_ARM_TLS_TPOFF32 y
 
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT: func:
 // CHECK-NEXT:    1000: 00 f0 20 e3     nop
 // CHECK-NEXT:    1004: 00 f0 20 e3     nop
diff --git a/deps/lld/test/ELF/arm-tls-ldm32.s b/deps/lld/test/ELF/arm-tls-ldm32.s
index 94931d945761835b63cdded172d1a98dc40c97e8..5bf9e93bbf77f3c7fc74967ef3b8d32cbe53e911 100644
--- a/deps/lld/test/ELF/arm-tls-ldm32.s
+++ b/deps/lld/test/ELF/arm-tls-ldm32.s
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=armv7a-linux-gnueabi
 // RUN: ld.lld --hash-style=sysv %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -dyn-relocations %t.so | FileCheck --check-prefix=SEC %s
+// RUN: llvm-readobj -S --dyn-relocations %t.so | FileCheck --check-prefix=SEC %s
 // RUN: llvm-objdump -d -triple=armv7a-linux-gnueabi %t.so | FileCheck %s
 
 // Test the handling of the local-dynamic TLS model. Dynamic loader finds
@@ -56,6 +56,7 @@ x:
 // SEC-NEXT:  0x204C R_ARM_TLS_DTPMOD32 - 0x0
 
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // CHECK-NEXT: 1000:       00 f0 20 e3     nop
 
@@ -65,6 +66,7 @@ x:
 // CHECK-NEXT: 100c:       04 00 00 00
 
 // CHECK-EXE: Disassembly of section .text:
+// CHECK-EXE-EMPTY:
 // CHECK-NEXT-EXE: _start:
 // CHECK-NEXT-EXE:   11000:       00 f0 20 e3     nop
 
diff --git a/deps/lld/test/ELF/arm-tls-le32.s b/deps/lld/test/ELF/arm-tls-le32.s
index f9a5fa9b2fc90d8edbb0f90ad9d41917229eb768..c3cea8072d48541dc04f73910e30d4646e6bee10 100644
--- a/deps/lld/test/ELF/arm-tls-le32.s
+++ b/deps/lld/test/ELF/arm-tls-le32.s
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=armv7a-linux-gnueabi
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -s -dyn-relocations %t | FileCheck --check-prefix=SEC %s
+// RUN: llvm-readobj -S --dyn-relocations %t | FileCheck --check-prefix=SEC %s
 // RUN: llvm-objdump -d -triple=armv7a-linux-gnueabi %t | FileCheck %s
 
 // Test the handling of the local exec TLS model. TLS can be resolved
@@ -68,10 +68,11 @@ x:
 // SEC-NEXT: }
 
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
-// offset of x from Thread pointer = (TcbSize + 0x0 = 0x20)
-// CHECK-NEXT:   11000:         20 00 00 00
-// offset of z from Thread pointer = (TcbSize + 0x8 = 0x28)
-// CHECK-NEXT:   11004:         28 00 00 00
-// offset of y from Thread pointer = (TcbSize + 0x4 = 0x24)
-// CHECK-NEXT:   11008:         24 00 00 00
+// offset of x from Thread pointer = (TcbSize + 0x0 = 0x8)
+// CHECK-NEXT:   11000:         08 00 00 00
+// offset of z from Thread pointer = (TcbSize + 0x8 = 0x10)
+// CHECK-NEXT:   11004:         10 00 00 00
+// offset of y from Thread pointer = (TcbSize + 0x4 = 0xc)
+// CHECK-NEXT:   11008:         0c 00 00 00
diff --git a/deps/lld/test/ELF/arm-tls-norelax-gd-ie.s b/deps/lld/test/ELF/arm-tls-norelax-gd-ie.s
index ba60521520fe6804f3144be5c123e0acb1eedee2..3ea57dc1755383afb556aa8343da446e21bef46d 100644
--- a/deps/lld/test/ELF/arm-tls-norelax-gd-ie.s
+++ b/deps/lld/test/ELF/arm-tls-norelax-gd-ie.s
@@ -3,7 +3,7 @@
 // RUN: ld.lld %t1 --shared -o %t1.so
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=armv7a-linux-gnueabi
 // RUN: ld.lld --hash-style=sysv %t1.so %t.o -o %t
-// RUN: llvm-readobj -s -dyn-relocations %t | FileCheck %s
+// RUN: llvm-readobj -S --dyn-relocations %t | FileCheck %s
 
 // This tls global-dynamic sequence is with respect to a preemptible symbol but
 // is in an application so a relaxation to Initial Exec would normally be
@@ -25,6 +25,6 @@ func:
  .Lt0: .word   y(TLSGD) + (. - .L0 - 8)
 
 // CHECK: Dynamic Relocations {
-// CHECK-NEXT:   0x13078 R_ARM_TLS_DTPMOD32 y
-// CHECK-NEXT:   0x1307C R_ARM_TLS_DTPOFF32 y
-// CHECK-NEXT:   0x1200C R_ARM_JUMP_SLOT __tls_get_addr
+// CHECK-NEXT:   0x12078 R_ARM_TLS_DTPMOD32 y
+// CHECK-NEXT:   0x1207C R_ARM_TLS_DTPOFF32 y
+// CHECK-NEXT:   0x1300C R_ARM_JUMP_SLOT __tls_get_addr
diff --git a/deps/lld/test/ELF/arm-tls-norelax-gd-le.s b/deps/lld/test/ELF/arm-tls-norelax-gd-le.s
index f1e78c4c76b16a0bd21a3b4a7ac7ed8678c3b9bf..60532d8cfafe8c8a16013eda02cf8793339a8298 100644
--- a/deps/lld/test/ELF/arm-tls-norelax-gd-le.s
+++ b/deps/lld/test/ELF/arm-tls-norelax-gd-le.s
@@ -33,7 +33,7 @@ x:
 
 // CHECK:       Contents of section .got:
 // Module index is always 1 for executable
-// CHECK-NEXT:  13060 01000000 00000000
+// CHECK-NEXT:  12060 01000000 00000000
 
 
 // Without any definition of __tls_get_addr we get an error
diff --git a/deps/lld/test/ELF/arm-tls-norelax-ie-le.s b/deps/lld/test/ELF/arm-tls-norelax-ie-le.s
index 11c3e4f5dc1a247d4d266aa210de9f31327565ee..78a30a8676b294de2f42ac60b0c676f60b3e3bce 100644
--- a/deps/lld/test/ELF/arm-tls-norelax-ie-le.s
+++ b/deps/lld/test/ELF/arm-tls-norelax-ie-le.s
@@ -37,5 +37,5 @@ x2:
  .type x2, %object
 
 // CHECK: Contents of section .got:
-// x1 at offset 0x20 from TP, x2 at offset 0x24 from TP. Offsets include TCB size of 0x20
-// CHECK-NEXT: 13064 20000000 24000000
+// x1 at offset 8 from TP, x2 at offset 0xc from TP. Offsets include TCB size of 8
+// CHECK-NEXT: 12064 08000000 0c000000
diff --git a/deps/lld/test/ELF/arm-tls-norelax-ld-le.s b/deps/lld/test/ELF/arm-tls-norelax-ld-le.s
index ce0697ad90479378543719f62dbcdccce9e79fce..3b4fc945a0afe9434559134b18d462ff90dda885 100644
--- a/deps/lld/test/ELF/arm-tls-norelax-ld-le.s
+++ b/deps/lld/test/ELF/arm-tls-norelax-ld-le.s
@@ -32,4 +32,4 @@ x:
  .word   10
 
 // CHECK: Contents of section .got:
-// CHECK-NEXT:  13064 01000000 00000000
+// CHECK-NEXT:  12064 01000000 00000000
diff --git a/deps/lld/test/ELF/arm-undefined-weak.s b/deps/lld/test/ELF/arm-undefined-weak.s
index 0d4714a54835b92b41e62e41021756c654715b54..c7d1cd0bb04188b935c88339d80302e835ea479a 100644
--- a/deps/lld/test/ELF/arm-undefined-weak.s
+++ b/deps/lld/test/ELF/arm-undefined-weak.s
@@ -28,6 +28,7 @@ _start:
  .word target - .
 
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // 69636 = 0x11004
 // CHECK:         11000: {{.*}} b       #-4 <_start+0x4>
 // CHECK-NEXT:    11004: {{.*}} bl      #-4 <_start+0x8>
diff --git a/deps/lld/test/ELF/arm-v4bx.test b/deps/lld/test/ELF/arm-v4bx.test
index 1b39a431417bec3cd3fcf36bdfeba42ce2e9c438..dd9614a1fa698c559b5bcbaeae447de270ea7973 100644
--- a/deps/lld/test/ELF/arm-v4bx.test
+++ b/deps/lld/test/ELF/arm-v4bx.test
@@ -27,14 +27,11 @@ Sections:
     Info:            .text
     Relocations:
       - Offset:          0x0000000000000000
-        Symbol:          ''
         Type:            R_ARM_V4BX
 Symbols:
-  Global:
-    - Name:            _start
-      Section:         .text
-  Local:
-    - Name:            .text
-      Type:            STT_SECTION
-      Section:         .text
-DynamicSymbols:
+  - Name:            .text
+    Type:            STT_SECTION
+    Section:         .text
+  - Name:            _start
+    Section:         .text
+    Binding:         STB_GLOBAL
diff --git a/deps/lld/test/ELF/as-needed-weak.s b/deps/lld/test/ELF/as-needed-weak.s
index a47399a600c3c53994e6cda8534ff18d763a83f5..1c38fd2abf2b98b9e9d9f4824c924e2d21166cbd 100644
--- a/deps/lld/test/ELF/as-needed-weak.s
+++ b/deps/lld/test/ELF/as-needed-weak.s
@@ -10,9 +10,10 @@
 
 # CHECK-NOT: libfoo
 
-# CHECK:      Symbol table of .hash for image:
-# CHECK-NEXT: Num Buc:    Value          Size   Type   Bind Vis      Ndx Name
-# CHECK-NEXT:   1   1: 0000000000000000     0 FUNC    WEAK   DEFAULT UND foo
+# CHECK:      Symbol table '.dynsym' contains 2 entries:
+# CHECK-NEXT: Num:    Value          Size Type    Bind   Vis     Ndx Name
+# CHECK-NEXT:   0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT UND
+# CHECK-NEXT:   1: 0000000000000000     0 FUNC    WEAK   DEFAULT UND foo
 
 .globl _start
 .weak foo
diff --git a/deps/lld/test/ELF/as-needed.s b/deps/lld/test/ELF/as-needed.s
index a7bba79d57b012cf922a9fed99fa22f287345705..1623f324892b49bf59aed771c309a3de6fb24df9 100644
--- a/deps/lld/test/ELF/as-needed.s
+++ b/deps/lld/test/ELF/as-needed.s
@@ -10,27 +10,27 @@
 /// Check if --as-needed actually works.
 
 // RUN: ld.lld %t.o %t2.so %t3.so %t4.so -o %t2
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck %s
 
 // RUN: ld.lld --as-needed %t.o %t2.so %t3.so %t4.so -o %t2
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck -check-prefix=CHECK2 %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck -check-prefix=CHECK2 %s
 
 // Test with the .o last
 // RUN: ld.lld --as-needed %t2.so %t3.so %t4.so %t.o -o %t2
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck -check-prefix=CHECK2 %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck -check-prefix=CHECK2 %s
 
 // RUN: ld.lld --as-needed %t.o %t2.so --no-as-needed %t3.so %t4.so -o %t2
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck %s
 
 /// GROUP command is the same as listing the files on the command line.
 
 // RUN: echo "GROUP(\"%t2.so\" \"%t3.so\" \"%t4.so\")" > %t.script
 // RUN: ld.lld %t.o %t.script -o %t2
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck %s
 
 // RUN: echo "GROUP(AS_NEEDED(\"%t2.so\" \"%t3.so\" \"%t4.so\"))" > %t.script
 // RUN: ld.lld %t.o %t.script -o %t2
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck -check-prefix=CHECK2 %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck -check-prefix=CHECK2 %s
 
 // CHECK: NEEDED Shared library: [shared1]
 // CHECK: NEEDED Shared library: [shared2]
diff --git a/deps/lld/test/ELF/assignment-archive.s b/deps/lld/test/ELF/assignment-archive.s
index 11753a69213004767c16e998c04f53aa375ac117..d6e9610842db926500a0f0ffd46aa328f0735f3a 100644
--- a/deps/lld/test/ELF/assignment-archive.s
+++ b/deps/lld/test/ELF/assignment-archive.s
@@ -6,14 +6,14 @@
 
 # RUN: echo "SECTIONS { foo = 1; }" > %t1.script
 # RUN: ld.lld -o %t1.exe --script %t1.script %tar.a %t.o
-# RUN: llvm-readobj -symbols %t1.exe | FileCheck %s
+# RUN: llvm-readobj --symbols %t1.exe | FileCheck %s
 # CHECK-NOT: bar
 # CHECK:     foo
 # CHECK-NOT: bar
 
 # RUN: echo "SECTIONS { zed = foo; }" > %t2.script
 # RUN: ld.lld -o %t2.exe --script %t2.script %tar.a %t.o
-# RUN: llvm-readobj -symbols %t2.exe | FileCheck %s --check-prefix=SYMS
+# RUN: llvm-readobj --symbols %t2.exe | FileCheck %s --check-prefix=SYMS
 # SYMS: bar
 # SYMS: foo
 
diff --git a/deps/lld/test/ELF/avoid-empty-program-headers.s b/deps/lld/test/ELF/avoid-empty-program-headers.s
index 731ecce67cbc3281ec1ce71916b846500f15902b..109c2abdfc05b765b428c13d762293db64adcf3f 100644
--- a/deps/lld/test/ELF/avoid-empty-program-headers.s
+++ b/deps/lld/test/ELF/avoid-empty-program-headers.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %tout
-// RUN: llvm-readobj -program-headers %tout | FileCheck %s
+// RUN: llvm-readobj -l %tout | FileCheck %s
 
 .global _start
 _start:
diff --git a/deps/lld/test/ELF/bad-reloc-target.test b/deps/lld/test/ELF/bad-reloc-target.test
deleted file mode 100644
index fea8c5f0f3963af1d5e1a51c02eec177ba51ab32..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/bad-reloc-target.test
+++ /dev/null
@@ -1,29 +0,0 @@
-# RUN: yaml2obj %s -o %t1.o
-# RUN: not ld.lld %t1.o -o %t1 2>&1 | FileCheck %s
-# CHECK: error: {{.*}}.o: unsupported relocation reference
-
-# RUN: yaml2obj %S/Inputs/bad-reloc-target.test -o %t2.o
-# RUN: not ld.lld %t2.o -o %t2 2>&1 | FileCheck %s --check-prefix=ERR2
-# ERR2: error: {{.*}}.o: invalid relocated section index: 99
-
---- !ELF
-FileHeader:
-  Class:           ELFCLASS64
-  Data:            ELFDATA2LSB
-  Type:            ET_REL
-  Machine:         EM_X86_64
-Sections:
-  - Name:            .text
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-  - Name:            .rela.text
-    Type:            SHT_RELA
-    Link:            .symtab
-    Info:            0
-    Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          foo
-        Type:            R_X86_64_64
-Symbols:
-  Global:
-    - Name:            foo
\ No newline at end of file
diff --git a/deps/lld/test/ELF/basic-aarch64.s b/deps/lld/test/ELF/basic-aarch64.s
index 151bf52cc3eed205f061173df0e50a2c48df9db1..60bbd5d1b5e1a3ee0557571abee2fec7e8e56630 100644
--- a/deps/lld/test/ELF/basic-aarch64.s
+++ b/deps/lld/test/ELF/basic-aarch64.s
@@ -1,7 +1,7 @@
 # REQUIRES: aarch64
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols %t2 \
+# RUN: llvm-readobj --file-headers --sections -l --symbols %t2 \
 # RUN:   | FileCheck %s
 
 # exits with return code 42 on FreeBSD/AArch64
diff --git a/deps/lld/test/ELF/basic-freebsd.s b/deps/lld/test/ELF/basic-freebsd.s
index f614bb64b0696e059ef61ab2964fc51daeb7dd47..078f97442446336a38ab89bc6c011a275f7a78d2 100644
--- a/deps/lld/test/ELF/basic-freebsd.s
+++ b/deps/lld/test/ELF/basic-freebsd.s
@@ -3,7 +3,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-freebsd %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -file-headers %t2 | FileCheck %s
+# RUN: llvm-readobj --file-headers %t2 | FileCheck %s
 
 .globl _start
 _start:
diff --git a/deps/lld/test/ELF/basic-i386.s b/deps/lld/test/ELF/basic-i386.s
new file mode 100644
index 0000000000000000000000000000000000000000..1f37e7adc3069dfada3fbea07558aa6194c8da31
--- /dev/null
+++ b/deps/lld/test/ELF/basic-i386.s
@@ -0,0 +1,179 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-readobj --file-headers --sections -l %t | FileCheck %s
+
+# exits with return code 42 on linux
+.globl _start
+_start:
+  mov $1, %eax
+  mov $42, %ebx
+  int $0x80
+
+# CHECK:      ElfHeader {
+# CHECK-NEXT:   Ident {
+# CHECK-NEXT:     Magic: (7F 45 4C 46)
+# CHECK-NEXT:     Class: 32-bit (0x1)
+# CHECK-NEXT:     DataEncoding: LittleEndian (0x1)
+# CHECK-NEXT:     FileVersion: 1
+# CHECK-NEXT:     OS/ABI: SystemV (0x0)
+# CHECK-NEXT:     ABIVersion: 0
+# CHECK-NEXT:     Unused: (00 00 00 00 00 00 00)
+# CHECK-NEXT:   }
+# CHECK-NEXT:   Type: Executable (0x2)
+# CHECK-NEXT:   Machine: EM_386 (0x3)
+# CHECK-NEXT:   Version: 1
+# CHECK-NEXT:   Entry: 0x401000
+# CHECK-NEXT:   ProgramHeaderOffset: 0x34
+# CHECK-NEXT:   SectionHeaderOffset: 0x205C
+# CHECK-NEXT:   Flags [ (0x0)
+# CHECK-NEXT:   ]
+# CHECK-NEXT:   HeaderSize: 52
+# CHECK-NEXT:   ProgramHeaderEntrySize: 32
+# CHECK-NEXT:   ProgramHeaderCount: 4
+# CHECK-NEXT:   SectionHeaderEntrySize: 40
+# CHECK-NEXT:   SectionHeaderCount: 6
+# CHECK-NEXT:   StringTableSectionIndex: 4
+# CHECK-NEXT: }
+# CHECK-NEXT: Sections [
+# CHECK-NEXT:   Section {
+# CHECK-NEXT:     Index: 0
+# CHECK-NEXT:     Name:  (0)
+# CHECK-NEXT:     Type: SHT_NULL (0x0)
+# CHECK-NEXT:     Flags [ (0x0)
+# CHECK-NEXT:     ]
+# CHECK-NEXT:     Address: 0x0
+# CHECK-NEXT:     Offset: 0x0
+# CHECK-NEXT:     Size: 0
+# CHECK-NEXT:     Link: 0
+# CHECK-NEXT:     Info: 0
+# CHECK-NEXT:     AddressAlignment: 0
+# CHECK-NEXT:     EntrySize: 0
+# CHECK-NEXT:   }
+# CHECK-NEXT:   Section {
+# CHECK-NEXT:     Index: 1
+# CHECK-NEXT:     Name: .text
+# CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
+# CHECK-NEXT:     Flags [ (0x6)
+# CHECK-NEXT:       SHF_ALLOC (0x2)
+# CHECK-NEXT:       SHF_EXECINSTR (0x4)
+# CHECK-NEXT:     ]
+# CHECK-NEXT:     Address: 0x401000
+# CHECK-NEXT:     Offset: 0x1000
+# CHECK-NEXT:     Size: 12
+# CHECK-NEXT:     Link: 0
+# CHECK-NEXT:     Info: 0
+# CHECK-NEXT:     AddressAlignment: 4
+# CHECK-NEXT:     EntrySize: 0
+# CHECK-NEXT:   }
+# CHECK-NEXT:   Section {
+# CHECK-NEXT:     Index: 2
+# CHECK-NEXT:     Name: .comment
+# CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
+# CHECK-NEXT:     Flags [ (0x30)
+# CHECK-NEXT:       SHF_MERGE (0x10)
+# CHECK-NEXT:       SHF_STRINGS (0x20)
+# CHECK-NEXT:     ]
+# CHECK-NEXT:     Address: 0x0
+# CHECK-NEXT:     Offset: 0x2000
+# CHECK-NEXT:     Size: 8
+# CHECK-NEXT:     Link: 0
+# CHECK-NEXT:     Info: 0
+# CHECK-NEXT:     AddressAlignment: 1
+# CHECK-NEXT:     EntrySize: 1
+# CHECK-NEXT:   }
+# CHECK-NEXT:   Section {
+# CHECK-NEXT:     Index: 3
+# CHECK-NEXT:     Name: .symtab
+# CHECK-NEXT:     Type: SHT_SYMTAB
+# CHECK-NEXT:     Flags [
+# CHECK-NEXT:     ]
+# CHECK-NEXT:     Address: 0x0
+# CHECK-NEXT:     Offset: 0x2008
+# CHECK-NEXT:     Size: 32
+# CHECK-NEXT:     Link: 5
+# CHECK-NEXT:     Info: 1
+# CHECK-NEXT:     AddressAlignment: 4
+# CHECK-NEXT:     EntrySize: 16
+# CHECK-NEXT:   }
+# CHECK-NEXT:   Section {
+# CHECK-NEXT:     Index: 4
+# CHECK-NEXT:     Name: .shstrtab
+# CHECK-NEXT:     Type: SHT_STRTAB (0x3)
+# CHECK-NEXT:     Flags [ (0x0)
+# CHECK-NEXT:     ]
+# CHECK-NEXT:     Address: 0x0
+# CHECK-NEXT:     Offset: 0x2028
+# CHECK-NEXT:     Size: 42
+# CHECK-NEXT:     Link: 0
+# CHECK-NEXT:     Info: 0
+# CHECK-NEXT:     AddressAlignment: 1
+# CHECK-NEXT:     EntrySize: 0
+# CHECK-NEXT:   }
+# CHECK-NEXT:   Section {
+# CHECK-NEXT:     Index: 5
+# CHECK-NEXT:     Name: .strtab
+# CHECK-NEXT:     Type: SHT_STRTAB (0x3)
+# CHECK-NEXT:     Flags [ (0x0)
+# CHECK-NEXT:     ]
+# CHECK-NEXT:     Address: 0x0
+# CHECK-NEXT:     Offset: 0x2052
+# CHECK-NEXT:     Size: 8
+# CHECK-NEXT:     Link: 0
+# CHECK-NEXT:     Info: 0
+# CHECK-NEXT:     AddressAlignment: 1
+# CHECK-NEXT:     EntrySize: 0
+# CHECK-NEXT:   }
+# CHECK-NEXT: ]
+# CHECK-NEXT: ProgramHeaders [
+# CHECK-NEXT:   ProgramHeader {
+# CHECK-NEXT:     Type: PT_PHDR (0x6)
+# CHECK-NEXT:     Offset: 0x34
+# CHECK-NEXT:     VirtualAddress: 0x400034
+# CHECK-NEXT:     PhysicalAddress: 0x400034
+# CHECK-NEXT:     FileSize: 128
+# CHECK-NEXT:     MemSize: 128
+# CHECK-NEXT:     Flags [ (0x4)
+# CHECK-NEXT:       PF_R (0x4)
+# CHECK-NEXT:     ]
+# CHECK-NEXT:     Alignment: 4
+# CHECK-NEXT:   }
+# CHECK-NEXT:   ProgramHeader {
+# CHECK-NEXT:     Type: PT_LOAD (0x1)
+# CHECK-NEXT:     Offset: 0x0
+# CHECK-NEXT:     VirtualAddress: 0x400000
+# CHECK-NEXT:     PhysicalAddress: 0x400000
+# CHECK-NEXT:     FileSize: 180
+# CHECK-NEXT:     MemSize: 180
+# CHECK-NEXT:     Flags [
+# CHECK-NEXT:       PF_R
+# CHECK-NEXT:     ]
+# CHECK-NEXT:     Alignment: 4096
+# CHECK-NEXT:   }
+# CHECK-NEXT:   ProgramHeader {
+# CHECK-NEXT:     Type: PT_LOAD (0x1)
+# CHECK-NEXT:     Offset: 0x1000
+# CHECK-NEXT:     VirtualAddress: 0x401000
+# CHECK-NEXT:     PhysicalAddress: 0x401000
+# CHECK-NEXT:     FileSize: 4096
+# CHECK-NEXT:     MemSize: 4096
+# CHECK-NEXT:     Flags [ (0x5)
+# CHECK-NEXT:       PF_R (0x4)
+# CHECK-NEXT:       PF_X (0x1)
+# CHECK-NEXT:     ]
+# CHECK-NEXT:     Alignment: 4096
+# CHECK-NEXT:   }
+# CHECK-NEXT:   ProgramHeader {
+# CHECK-NEXT:     Type: PT_GNU_STACK
+# CHECK-NEXT:     Offset: 0x0
+# CHECK-NEXT:     VirtualAddress: 0x0
+# CHECK-NEXT:     PhysicalAddress: 0x0
+# CHECK-NEXT:     FileSize: 0
+# CHECK-NEXT:     MemSize: 0
+# CHECK-NEXT:     Flags [
+# CHECK-NEXT:       PF_R
+# CHECK-NEXT:       PF_W
+# CHECK-NEXT:     ]
+# CHECK-NEXT:     Alignment: 0
+# CHECK-NEXT:   }
+# CHECK-NEXT: ]
diff --git a/deps/lld/test/ELF/basic-mips.s b/deps/lld/test/ELF/basic-mips.s
index 9ecabff47f6a2d86d5c493b9beac53d1dc36c15a..c23fcb7a1a3afcc0640e93ef7b2ba55d9a3bc188 100644
--- a/deps/lld/test/ELF/basic-mips.s
+++ b/deps/lld/test/ELF/basic-mips.s
@@ -1,7 +1,7 @@
 # REQUIRES: mips
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t.exe
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols %t.exe \
+# RUN: llvm-readobj --file-headers --sections -l --symbols %t.exe \
 # RUN:   | FileCheck %s
 
 # Exits with return code 1 on Linux.
@@ -34,7 +34,7 @@ __start:
 # CHECK-NEXT:   ]
 # CHECK-NEXT:   HeaderSize: 52
 # CHECK-NEXT:   ProgramHeaderEntrySize: 32
-# CHECK-NEXT:   ProgramHeaderCount: 5
+# CHECK-NEXT:   ProgramHeaderCount: 7
 # CHECK-NEXT:   SectionHeaderEntrySize: 40
 # CHECK-NEXT:   SectionHeaderCount: 11
 # CHECK-NEXT:   StringTableSectionIndex: 9
@@ -61,8 +61,8 @@ __start:
 # CHECK-NEXT:     Flags [ (0x2)
 # CHECK-NEXT:       SHF_ALLOC (0x2)
 # CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x100D8
-# CHECK-NEXT:     Offset: 0xD8
+# CHECK-NEXT:     Address: 0x10118
+# CHECK-NEXT:     Offset: 0x118
 # CHECK-NEXT:     Size: 24
 # CHECK-NEXT:     Link: 0
 # CHECK-NEXT:     Info: 0
@@ -76,8 +76,8 @@ __start:
 # CHECK-NEXT:     Flags [ (0x2)
 # CHECK-NEXT:       SHF_ALLOC (0x2)
 # CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x100F0
-# CHECK-NEXT:     Offset: 0xF0
+# CHECK-NEXT:     Address: 0x10130
+# CHECK-NEXT:     Offset: 0x130
 # CHECK-NEXT:     Size: 24
 # CHECK-NEXT:     Link: 0
 # CHECK-NEXT:     Info: 0
@@ -245,8 +245,8 @@ __start:
 # CHECK-NEXT:     Offset: 0x34
 # CHECK-NEXT:     VirtualAddress: 0x10034
 # CHECK-NEXT:     PhysicalAddress: 0x10034
-# CHECK-NEXT:     FileSize: 160
-# CHECK-NEXT:     MemSize: 160
+# CHECK-NEXT:     FileSize: 224
+# CHECK-NEXT:     MemSize: 224
 # CHECK-NEXT:     Flags [ (0x4)
 # CHECK-NEXT:       PF_R (0x4)
 # CHECK-NEXT:     ]
@@ -257,8 +257,8 @@ __start:
 # CHECK-NEXT:     Offset: 0x0
 # CHECK-NEXT:     VirtualAddress: 0x10000
 # CHECK-NEXT:     PhysicalAddress: 0x10000
-# CHECK-NEXT:     FileSize: 264
-# CHECK-NEXT:     MemSize: 264
+# CHECK-NEXT:     FileSize: 328
+# CHECK-NEXT:     MemSize: 328
 # CHECK-NEXT:     Flags [ (0x4)
 # CHECK-NEXT:       PF_R (0x4)
 # CHECK-NEXT:     ]
@@ -291,16 +291,40 @@ __start:
 # CHECK-NEXT:     Alignment: 65536
 # CHECK-NEXT:   }
 # CHECK-NEXT:   ProgramHeader {
-# CHECK-NEXT:    Type: PT_GNU_STACK
-# CHECK-NEXT:    Offset: 0x0
-# CHECK-NEXT:    VirtualAddress: 0x0
-# CHECK-NEXT:    PhysicalAddress: 0x0
-# CHECK-NEXT:    FileSize: 0
-# CHECK-NEXT:    MemSize: 0
-# CHECK-NEXT:    Flags [
-# CHECK-NEXT:      PF_R
-# CHECK-NEXT:      PF_W
-# CHECK-NEXT:    ]
-# CHECK-NEXT:    Alignment: 0
-# CHECK-NEXT:  }
-# CHECK-NEXT:]
+# CHECK-NEXT:     Type: PT_GNU_STACK
+# CHECK-NEXT:     Offset: 0x0
+# CHECK-NEXT:     VirtualAddress: 0x0
+# CHECK-NEXT:     PhysicalAddress: 0x0
+# CHECK-NEXT:     FileSize: 0
+# CHECK-NEXT:     MemSize: 0
+# CHECK-NEXT:     Flags [
+# CHECK-NEXT:       PF_R
+# CHECK-NEXT:       PF_W
+# CHECK-NEXT:     ]
+# CHECK-NEXT:     Alignment: 0
+# CHECK-NEXT:   }
+# CHECK-NEXT:   ProgramHeader {
+# CHECK-NEXT:     Type: PT_MIPS_REGINFO
+# CHECK-NEXT:     Offset: 0x130
+# CHECK-NEXT:     VirtualAddress: 0x10130
+# CHECK-NEXT:     PhysicalAddress: 0x10130
+# CHECK-NEXT:     FileSize: 24
+# CHECK-NEXT:     MemSize: 24
+# CHECK-NEXT:     Flags [ (0x4)
+# CHECK-NEXT:       PF_R (0x4)
+# CHECK-NEXT:     ]
+# CHECK-NEXT:     Alignment: 4
+# CHECK-NEXT:   }
+# CHECK-NEXT:   ProgramHeader {
+# CHECK-NEXT:     Type: PT_MIPS_ABIFLAGS
+# CHECK-NEXT:     Offset: 0x118
+# CHECK-NEXT:     VirtualAddress: 0x10118
+# CHECK-NEXT:     PhysicalAddress: 0x10118
+# CHECK-NEXT:     FileSize: 24
+# CHECK-NEXT:     MemSize: 24
+# CHECK-NEXT:     Flags [ (0x4)
+# CHECK-NEXT:       PF_R (0x4)
+# CHECK-NEXT:     ]
+# CHECK-NEXT:     Alignment: 8
+# CHECK-NEXT:   }
+# CHECK-NEXT: ]
diff --git a/deps/lld/test/ELF/basic-ppc.s b/deps/lld/test/ELF/basic-ppc.s
index 48b146a21d4450b4e653c8415475e1e6e096fab7..c47f983d995828332dfb64fab83c99b7c99530d3 100644
--- a/deps/lld/test/ELF/basic-ppc.s
+++ b/deps/lld/test/ELF/basic-ppc.s
@@ -1,7 +1,7 @@
 # REQUIRES: ppc
-# RUN: llvm-mc -filetype=obj -triple=powerpc-unknown-freebsd %s -o %t
-# RUN: ld.lld --hash-style=sysv -discard-all -shared %t -o %t2
-# RUN: llvm-readobj -file-headers -sections -section-data -program-headers %t2 | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=powerpc-unknown-freebsd %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-readobj --file-headers --sections --section-data -l %t | FileCheck %s
 
 # exits with return code 42 on FreeBSD
 .text
@@ -23,20 +23,20 @@
 // CHECK-NEXT:     ABIVersion: 0
 // CHECK-NEXT:     Unused: (00 00 00 00 00 00 00)
 // CHECK-NEXT:   }
-// CHECK-NEXT:   Type: SharedObject (0x3)
+// CHECK-NEXT:   Type: Executable (0x2)
 // CHECK-NEXT:   Machine: EM_PPC (0x14)
 // CHECK-NEXT:   Version: 1
-// CHECK-NEXT:   Entry: 0x1000
+// CHECK-NEXT:   Entry: 0x10010000
 // CHECK-NEXT:   ProgramHeaderOffset: 0x34
-// CHECK-NEXT:   SectionHeaderOffset: 0x20AC
+// CHECK-NEXT:   SectionHeaderOffset: 0x11044
 // CHECK-NEXT:   Flags [ (0x0)
 // CHECK-NEXT:   ]
 // CHECK-NEXT:   HeaderSize: 52
 // CHECK-NEXT:   ProgramHeaderEntrySize: 32
-// CHECK-NEXT:   ProgramHeaderCount: 7
+// CHECK-NEXT:   ProgramHeaderCount: 4
 // CHECK-NEXT:   SectionHeaderEntrySize: 40
-// CHECK-NEXT:   SectionHeaderCount: 10
-// CHECK-NEXT:   StringTableSectionIndex: 8
+// CHECK-NEXT:   SectionHeaderCount: 6
+// CHECK-NEXT:   StringTableSectionIndex: 4
 // CHECK-NEXT: }
 // CHECK-NEXT: Sections [
 // CHECK-NEXT:   Section {
@@ -57,68 +57,14 @@
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Section {
 // CHECK-NEXT:     Index: 1
-// CHECK-NEXT:     Name: .dynsym
-// CHECK-NEXT:     Type: SHT_DYNSYM (0xB)
-// CHECK-NEXT:     Flags [ (0x2)
-// CHECK-NEXT:       SHF_ALLOC (0x2)
-// CHECK-NEXT:     ]
-// CHECK-NEXT:     Address: 0x114
-// CHECK-NEXT:     Offset: 0x114
-// CHECK-NEXT:     Size: 16
-// CHECK-NEXT:     Link: 3
-// CHECK-NEXT:     Info: 1
-// CHECK-NEXT:     AddressAlignment: 4
-// CHECK-NEXT:     EntrySize: 16
-// CHECK-NEXT:     SectionData (
-// CHECK-NEXT:       0000: 00000000 00000000 00000000 00000000  |................|
-// CHECK-NEXT:     )
-// CHECK-NEXT:   }
-// CHECK-NEXT:   Section {
-// CHECK-NEXT:     Index: 2
-// CHECK-NEXT:     Name: .hash
-// CHECK-NEXT:     Type: SHT_HASH (0x5)
-// CHECK-NEXT:     Flags [ (0x2)
-// CHECK-NEXT:       SHF_ALLOC (0x2)
-// CHECK-NEXT:     ]
-// CHECK-NEXT:     Address: 0x124
-// CHECK-NEXT:     Offset: 0x124
-// CHECK-NEXT:     Size: 16
-// CHECK-NEXT:     Link: 1
-// CHECK-NEXT:     Info: 0
-// CHECK-NEXT:     AddressAlignment: 4
-// CHECK-NEXT:     EntrySize: 4
-// CHECK-NEXT:     SectionData (
-// CHECK-NEXT:       0000: 00000001 00000001 00000000 00000000  |................|
-// CHECK-NEXT:     )
-// CHECK-NEXT:   }
-// CHECK-NEXT:   Section {
-// CHECK-NEXT:     Index: 3
-// CHECK-NEXT:     Name: .dynstr
-// CHECK-NEXT:     Type: SHT_STRTAB (0x3)
-// CHECK-NEXT:     Flags [ (0x2)
-// CHECK-NEXT:       SHF_ALLOC (0x2)
-// CHECK-NEXT:     ]
-// CHECK-NEXT:     Address: 0x134
-// CHECK-NEXT:     Offset: 0x134
-// CHECK-NEXT:     Size: 1
-// CHECK-NEXT:     Link: 0
-// CHECK-NEXT:     Info: 0
-// CHECK-NEXT:     AddressAlignment: 1
-// CHECK-NEXT:     EntrySize: 0
-// CHECK-NEXT:     SectionData (
-// CHECK-NEXT:       0000: 00                                   |.|
-// CHECK-NEXT:     )
-// CHECK-NEXT:   }
-// CHECK-NEXT:   Section {
-// CHECK-NEXT:     Index: 4
 // CHECK-NEXT:     Name: .text
 // CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
 // CHECK-NEXT:     Flags [ (0x6)
 // CHECK-NEXT:       SHF_ALLOC (0x2)
 // CHECK-NEXT:       SHF_EXECINSTR (0x4)
 // CHECK-NEXT:     ]
-// CHECK-NEXT:     Address: 0x1000
-// CHECK-NEXT:     Offset: 0x1000
+// CHECK-NEXT:     Address: 0x10010000
+// CHECK-NEXT:     Offset: 0x10000
 // CHECK-NEXT:     Size: 12
 // CHECK-NEXT:     Link: 0
 // CHECK-NEXT:     Info: 0
@@ -129,28 +75,7 @@
 // CHECK-NEXT:     )
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Section {
-// CHECK-NEXT:     Index: 5
-// CHECK-NEXT:     Name: .dynamic
-// CHECK-NEXT:     Type: SHT_DYNAMIC (0x6)
-// CHECK-NEXT:     Flags [ (0x3)
-// CHECK-NEXT:       SHF_ALLOC (0x2)
-// CHECK-NEXT:       SHF_WRITE (0x1)
-// CHECK-NEXT:     ]
-// CHECK-NEXT:     Address: 0x2000
-// CHECK-NEXT:     Offset: 0x2000
-// CHECK-NEXT:     Size: 48
-// CHECK-NEXT:     Link: 3
-// CHECK-NEXT:     Info: 0
-// CHECK-NEXT:     AddressAlignment: 4
-// CHECK-NEXT:     EntrySize: 8
-// CHECK-NEXT:     SectionData (
-// CHECK-NEXT:       0000: 00000006 00000114 0000000B 00000010
-// CHECK-NEXT:       0010: 00000005 00000134 0000000A 00000001
-// CHECK-NEXT:       0020: 00000004 00000124 00000000 00000000
-// CHECK-NEXT:     )
-// CHECK-NEXT:   }
-// CHECK-NEXT:   Section {
-// CHECK-NEXT:     Index: 6
+// CHECK-NEXT:     Index: 2
 // CHECK-NEXT:     Name: .comment
 // CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
 // CHECK-NEXT:     Flags [ (0x30)
@@ -158,70 +83,59 @@
 // CHECK-NEXT:       SHF_STRINGS (0x20)
 // CHECK-NEXT:     ]
 // CHECK-NEXT:     Address: 0x0
-// CHECK-NEXT:     Offset: 0x2030
+// CHECK-NEXT:     Offset: 0x11000
 // CHECK-NEXT:     Size: 8
 // CHECK-NEXT:     Link: 0
 // CHECK-NEXT:     Info: 0
 // CHECK-NEXT:     AddressAlignment: 1
 // CHECK-NEXT:     EntrySize: 1
-// CHECK-NEXT:     SectionData (
-// CHECK-NEXT:       0000: 4C4C4420 312E3000                    |LLD 1.0.|
-// CHECK-NEXT:     )
-// CHECK-NEXT:   }
+// CHECK:        }
 // CHECK-NEXT:   Section {
-// CHECK-NEXT:     Index: 7
+// CHECK-NEXT:     Index: 3
 // CHECK-NEXT:     Name: .symtab
 // CHECK-NEXT:     Type: SHT_SYMTAB (0x2)
 // CHECK-NEXT:     Flags [ (0x0)
 // CHECK-NEXT:     ]
 // CHECK-NEXT:     Address: 0x0
-// CHECK-NEXT:     Offset: 0x2038
-// CHECK-NEXT:     Size: 32
-// CHECK-NEXT:     Link: 9
-// CHECK-NEXT:     Info: 2
+// CHECK-NEXT:     Offset: 0x11008
+// CHECK-NEXT:     Size: 16
+// CHECK-NEXT:     Link: 5
+// CHECK-NEXT:     Info: 1
 // CHECK-NEXT:     AddressAlignment: 4
 // CHECK-NEXT:     EntrySize: 16
 // CHECK-NEXT:     SectionData (
 // CHECK-NEXT:       0000: 00000000 00000000 00000000 00000000  |................|
-// CHECK-NEXT:       0010: 00000001 00002000 00000000 00020005  |...... .........|
 // CHECK-NEXT:     )
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Section {
-// CHECK-NEXT:     Index: 8
+// CHECK-NEXT:     Index: 4
 // CHECK-NEXT:     Name: .shstrtab
 // CHECK-NEXT:     Type: SHT_STRTAB (0x3)
 // CHECK-NEXT:     Flags [ (0x0)
 // CHECK-NEXT:     ]
 // CHECK-NEXT:     Address: 0x0
-// CHECK-NEXT:     Offset: 0x2058
-// CHECK-NEXT:     Size: 73
+// CHECK-NEXT:     Offset: 0x11018
+// CHECK-NEXT:     Size: 42
 // CHECK-NEXT:     Link: 0
 // CHECK-NEXT:     Info: 0
 // CHECK-NEXT:     AddressAlignment: 1
 // CHECK-NEXT:     EntrySize: 0
-// CHECK-NEXT:     SectionData (
-// CHECK-NEXT:       0000: 002E6479 6E73796D 002E6861 7368002E  |..dynsym..hash..|
-// CHECK-NEXT:       0010: 64796E73 7472002E 74657874 002E6479  |dynstr..text..dy|
-// CHECK-NEXT:       0020: 6E616D69 63002E63 6F6D6D65 6E74002E  |namic..comment..|
-// CHECK-NEXT:       0030: 73796D74 6162002E 73687374 72746162  |symtab..shstrtab|
-// CHECK-NEXT:       0040: 002E7374 72746162 00                 |..strtab.|
-// CHECK-NEXT:     )
-// CHECK-NEXT:   }
+// CHECK:        }
 // CHECK-NEXT:   Section {
-// CHECK-NEXT:     Index: 9
+// CHECK-NEXT:     Index: 5
 // CHECK-NEXT:     Name: .strtab
 // CHECK-NEXT:     Type: SHT_STRTAB (0x3)
 // CHECK-NEXT:     Flags [ (0x0)
 // CHECK-NEXT:     ]
 // CHECK-NEXT:     Address: 0x0
-// CHECK-NEXT:     Offset: 0x20A1
-// CHECK-NEXT:     Size: 10
+// CHECK-NEXT:     Offset: 0x11042
+// CHECK-NEXT:     Size: 1
 // CHECK-NEXT:     Link: 0
 // CHECK-NEXT:     Info: 0
 // CHECK-NEXT:     AddressAlignment: 1
 // CHECK-NEXT:     EntrySize: 0
 // CHECK-NEXT:     SectionData (
-// CHECK-NEXT:       0000: 005F4459 4E414D49 4300               |._DYNAMIC.|
+// CHECK-NEXT:       0000: 00
 // CHECK-NEXT:     )
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
@@ -229,10 +143,10 @@
 // CHECK-NEXT:   ProgramHeader {
 // CHECK-NEXT:     Type: PT_PHDR (0x6)
 // CHECK-NEXT:     Offset: 0x34
-// CHECK-NEXT:     VirtualAddress: 0x34
-// CHECK-NEXT:     PhysicalAddress: 0x34
-// CHECK-NEXT:     FileSize: 224
-// CHECK-NEXT:     MemSize: 224
+// CHECK-NEXT:     VirtualAddress: 0x10000034
+// CHECK-NEXT:     PhysicalAddress: 0x10000034
+// CHECK-NEXT:     FileSize: 128
+// CHECK-NEXT:     MemSize: 128
 // CHECK-NEXT:     Flags [ (0x4)
 // CHECK-NEXT:       PF_R (0x4)
 // CHECK-NEXT:     ]
@@ -241,65 +155,27 @@
 // CHECK-NEXT:   ProgramHeader {
 // CHECK-NEXT:     Type: PT_LOAD (0x1)
 // CHECK-NEXT:     Offset: 0x0
-// CHECK-NEXT:     VirtualAddress: 0x0
-// CHECK-NEXT:     PhysicalAddress: 0x0
-// CHECK-NEXT:     FileSize: 309
-// CHECK-NEXT:     MemSize: 309
+// CHECK-NEXT:     VirtualAddress: 0x10000000
+// CHECK-NEXT:     PhysicalAddress: 0x10000000
+// CHECK-NEXT:     FileSize: 180
+// CHECK-NEXT:     MemSize: 180
 // CHECK-NEXT:     Flags [ (0x4)
 // CHECK-NEXT:       PF_R (0x4)
 // CHECK-NEXT:     ]
-// CHECK-NEXT:     Alignment: 4096
+// CHECK-NEXT:     Alignment: 65536
 // CHECK-NEXT:   }
 // CHECK-NEXT:   ProgramHeader {
 // CHECK-NEXT:     Type: PT_LOAD (0x1)
 // CHECK-NEXT:     Offset: 0x1000
-// CHECK-NEXT:     VirtualAddress: 0x1000
-// CHECK-NEXT:     PhysicalAddress: 0x1000
-// CHECK-NEXT:     FileSize: 12
-// CHECK-NEXT:     MemSize: 12
+// CHECK-NEXT:     VirtualAddress: 0x10010000
+// CHECK-NEXT:     PhysicalAddress: 0x10010000
+// CHECK-NEXT:     FileSize: 4096
+// CHECK-NEXT:     MemSize: 4096
 // CHECK-NEXT:     Flags [ (0x5)
 // CHECK-NEXT:       PF_R (0x4)
 // CHECK-NEXT:       PF_X (0x1)
 // CHECK-NEXT:     ]
-// CHECK-NEXT:     Alignment: 4096
-// CHECK-NEXT:   }
-// CHECK-NEXT:   ProgramHeader {
-// CHECK-NEXT:     Type: PT_LOAD (0x1)
-// CHECK-NEXT:     Offset: 0x2000
-// CHECK-NEXT:     VirtualAddress: 0x2000
-// CHECK-NEXT:     PhysicalAddress: 0x2000
-// CHECK-NEXT:     FileSize: 48
-// CHECK-NEXT:     MemSize: 48
-// CHECK-NEXT:     Flags [ (0x6)
-// CHECK-NEXT:       PF_R (0x4)
-// CHECK-NEXT:       PF_W (0x2)
-// CHECK-NEXT:     ]
-// CHECK-NEXT:     Alignment: 4096
-// CHECK-NEXT:   }
-// CHECK-NEXT:   ProgramHeader {
-// CHECK-NEXT:     Type: PT_DYNAMIC (0x2)
-// CHECK-NEXT:     Offset: 0x2000
-// CHECK-NEXT:     VirtualAddress: 0x2000
-// CHECK-NEXT:     PhysicalAddress: 0x2000
-// CHECK-NEXT:     FileSize: 48
-// CHECK-NEXT:     MemSize: 48
-// CHECK-NEXT:     Flags [ (0x6)
-// CHECK-NEXT:       PF_R (0x4)
-// CHECK-NEXT:       PF_W (0x2)
-// CHECK-NEXT:     ]
-// CHECK-NEXT:     Alignment: 4
-// CHECK-NEXT:   }
-// CHECK-NEXT:   ProgramHeader {
-// CHECK-NEXT:     Type: PT_GNU_RELRO (0x6474E552)
-// CHECK-NEXT:     Offset: 0x2000
-// CHECK-NEXT:     VirtualAddress: 0x2000
-// CHECK-NEXT:     PhysicalAddress: 0x2000
-// CHECK-NEXT:     FileSize: 48
-// CHECK-NEXT:     MemSize: 4096
-// CHECK-NEXT:     Flags [ (0x4)
-// CHECK-NEXT:       PF_R (0x4)
-// CHECK-NEXT:     ]
-// CHECK-NEXT:     Alignment: 1
+// CHECK-NEXT:     Alignment: 65536
 // CHECK-NEXT:   }
 // CHECK-NEXT:   ProgramHeader {
 // CHECK-NEXT:     Type: PT_GNU_STACK (0x6474E551)
diff --git a/deps/lld/test/ELF/basic-ppc64.s b/deps/lld/test/ELF/basic-ppc64.s
index 624d8301cb63e14b7fa50d578351273f956f04b9..cab130212b0b0145a437c173377ed376df08a4b3 100644
--- a/deps/lld/test/ELF/basic-ppc64.s
+++ b/deps/lld/test/ELF/basic-ppc64.s
@@ -1,7 +1,12 @@
 # REQUIRES: ppc
-# # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t
-# RUN: ld.lld --hash-style=sysv -discard-all -shared %t -o %t2
-# RUN: llvm-readobj -file-headers -sections -section-data -program-headers %t2 | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
+# RUN: ld.lld --hash-style=sysv -discard-all -shared %t.o -o %t.so
+# RUN: llvm-readobj --file-headers --sections --section-data -l %t.so | FileCheck --check-prefixes=CHECK,LE %s
+
+# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
+# RUN: ld.lld --hash-style=sysv -discard-all -shared %t.o -o %t.so
+# RUN: llvm-readobj --file-headers --sections --section-data -l %t.so | FileCheck --check-prefixes=CHECK,BE %s
+
 .abiversion 2
 # Exits with return code 55 on linux.
 .text
@@ -10,14 +15,16 @@
   sc
 
 // CHECK:Format: ELF64-ppc64
-// CHECK-NEXT:Arch: powerpc64le
-// CHECK-NEXT:AddressSize: 64bit
-// CHECK-NEXT:LoadName: 
-// CHECK-NEXT:ElfHeader {
+// LE-NEXT:    Arch: powerpc64le
+// BE-NEXT:    Arch: powerpc64{{$}}
+// CHECK-NEXT: AddressSize: 64bit
+// CHECK-NEXT: LoadName:
+// CHECK-NEXT: ElfHeader {
 // CHECK-NEXT:  Ident {
 // CHECK-NEXT:    Magic: (7F 45 4C 46)
 // CHECK-NEXT:    Class: 64-bit (0x2)
-// CHECK-NEXT:    DataEncoding: LittleEndian (0x1)
+// LE-NEXT:       DataEncoding: LittleEndian (0x1)
+// BE-NEXT:       DataEncoding: BigEndian (0x2)
 // CHECK-NEXT:    FileVersion: 1
 // CHECK-NEXT:    OS/ABI: SystemV (0x0)
 // CHECK-NEXT:    ABIVersion: 0
@@ -63,8 +70,8 @@
 // CHECK-NEXT:    Flags [ (0x2)
 // CHECK-NEXT:      SHF_ALLOC (0x2)
 // CHECK-NEXT:    ]
-// CHECK-NEXT:    Address: 0x1C8
-// CHECK-NEXT:    Offset: 0x1C8
+// CHECK-NEXT:    Address: 0x200
+// CHECK-NEXT:    Offset: 0x200
 // CHECK-NEXT:    Size: 24
 // CHECK-NEXT:    Link: 3
 // CHECK-NEXT:    Info: 1
@@ -82,15 +89,16 @@
 // CHECK-NEXT:    Flags [ (0x2)
 // CHECK-NEXT:      SHF_ALLOC (0x2)
 // CHECK-NEXT:    ]
-// CHECK-NEXT:    Address: 0x1E0
-// CHECK-NEXT:    Offset: 0x1E0
+// CHECK-NEXT:    Address: 0x218
+// CHECK-NEXT:    Offset: 0x218
 // CHECK-NEXT:    Size: 16
 // CHECK-NEXT:    Link: 1
 // CHECK-NEXT:    Info: 0
 // CHECK-NEXT:    AddressAlignment: 4
 // CHECK-NEXT:    EntrySize: 4
 // CHECK-NEXT:    SectionData (
-// CHECK-NEXT:      0000: 01000000 01000000 00000000 00000000  |................|
+// LE-NEXT:         0000: 01000000 01000000 00000000 00000000
+// BE-NEXT:         0000: 00000001 00000001 00000000 00000000
 // CHECK-NEXT:    )
 // CHECK-NEXT:  }
 // CHECK-NEXT:  Section {
@@ -100,8 +108,8 @@
 // CHECK-NEXT:    Flags [ (0x2)
 // CHECK-NEXT:      SHF_ALLOC (0x2)
 // CHECK-NEXT:    ]
-// CHECK-NEXT:    Address: 0x1F0
-// CHECK-NEXT:    Offset: 0x1F0
+// CHECK-NEXT:    Address: 0x228
+// CHECK-NEXT:    Offset: 0x228
 // CHECK-NEXT:    Size: 1
 // CHECK-NEXT:    Link: 0
 // CHECK-NEXT:    Info: 0
@@ -127,7 +135,8 @@
 // CHECK-NEXT:    AddressAlignment: 4
 // CHECK-NEXT:    EntrySize: 0
 // CHECK-NEXT:    SectionData (
-// CHECK-NEXT:      0000: 01000038 37006038 02000044           |...87.`8...D|
+// LE-NEXT:         0000: 01000038 37006038 02000044
+// BE-NEXT:         0000: 38000001 38600037 44000002
 // CHECK-NEXT:    )
 // CHECK-NEXT:  }
 // CHECK-NEXT:  Section {
@@ -146,12 +155,18 @@
 // CHECK-NEXT:    AddressAlignment: 8
 // CHECK-NEXT:    EntrySize: 16
 // CHECK-NEXT:    SectionData (
-// CHECK-NEXT:      0000: 06000000 00000000 C8010000 00000000  |................|
-// CHECK-NEXT:      0010: 0B000000 00000000 18000000 00000000  |................|
-// CHECK-NEXT:      0020: 05000000 00000000 F0010000 00000000  |................|
-// CHECK-NEXT:      0030: 0A000000 00000000 01000000 00000000  |................|
-// CHECK-NEXT:      0040: 04000000 00000000 E0010000 00000000  |................|
-// CHECK-NEXT:      0050: 00000000 00000000 00000000 00000000  |................|
+// LE-NEXT:         0000: 06000000 00000000 00020000 00000000  |
+// LE-NEXT:         0010: 0B000000 00000000 18000000 00000000  |
+// LE-NEXT:         0020: 05000000 00000000 28020000 00000000  |
+// LE-NEXT:         0030: 0A000000 00000000 01000000 00000000  |
+// LE-NEXT:         0040: 04000000 00000000 18020000 00000000  |
+// LE-NEXT:         0050: 00000000 00000000 00000000 00000000  |
+// BE-NEXT:         0000: 00000000 00000006 00000000 00000200  |
+// BE-NEXT:         0010: 00000000 0000000B 00000000 00000018  |
+// BE-NEXT:         0020: 00000000 00000005 00000000 00000228  |
+// BE-NEXT:         0030: 00000000 0000000A 00000000 00000001  |
+// BE-NEXT:         0040: 00000000 00000004 00000000 00000218  |
+// BE-NEXT:         0050: 00000000 00000000 00000000 00000000  |
 // CHECK-NEXT:    )
 // CHECK-NEXT:  }
 // CHECK-NEXT:  Section {
@@ -203,9 +218,12 @@
 // CHECK-NEXT:    AddressAlignment: 8
 // CHECK-NEXT:    EntrySize: 24
 // CHECK-NEXT:    SectionData (
-// CHECK-NEXT:      0000: 00000000 00000000 00000000 00000000  |................|
-// CHECK-NEXT:      0010: 00000000 00000000 01000000 00020500  |................|
-// CHECK-NEXT:      0020: 00000200 00000000 00000000 00000000  |................|
+// LE-NEXT:         0000: 00000000 00000000 00000000 00000000  |................|
+// LE-NEXT:         0010: 00000000 00000000 01000000 00020500  |................|
+// LE-NEXT:         0020: 00000200 00000000 00000000 00000000  |................|
+// BE-NEXT:         0000: 00000000 00000000 00000000 00000000  |................|
+// BE-NEXT:         0010: 00000000 00000000 00000001 00020005  |................|
+// BE-NEXT:         0020: 00000000 00020000 00000000 00000000  |................|
 // CHECK-NEXT:    )
 // CHECK-NEXT:  }
 // CHECK-NEXT:  Section {
@@ -254,8 +272,8 @@
 // CHECK-NEXT:    Offset: 0x40
 // CHECK-NEXT:    VirtualAddress: 0x40
 // CHECK-NEXT:    PhysicalAddress: 0x40
-// CHECK-NEXT:    FileSize: 392
-// CHECK-NEXT:    MemSize: 392
+// CHECK-NEXT:    FileSize: 448
+// CHECK-NEXT:    MemSize: 448
 // CHECK-NEXT:    Flags [ (0x4)
 // CHECK-NEXT:      PF_R (0x4)
 // CHECK-NEXT:    ]
@@ -266,8 +284,8 @@
 // CHECK-NEXT:    Offset: 0x0
 // CHECK-NEXT:    VirtualAddress: 0x0
 // CHECK-NEXT:    PhysicalAddress: 0x0
-// CHECK-NEXT:    FileSize: 497
-// CHECK-NEXT:    MemSize: 497
+// CHECK-NEXT:    FileSize: 553
+// CHECK-NEXT:    MemSize: 553
 // CHECK-NEXT:    Flags [ (0x4)
 // CHECK-NEXT:      PF_R (0x4)
 // CHECK-NEXT:    ]
@@ -292,7 +310,7 @@
 // CHECK-NEXT:    VirtualAddress: 0x20000
 // CHECK-NEXT:    PhysicalAddress: 0x20000
 // CHECK-NEXT:    FileSize: 96
-// CHECK-NEXT:    MemSize: 65536
+// CHECK-NEXT:    MemSize: 96
 // CHECK-NEXT:    Flags [ (0x6)
 // CHECK-NEXT:      PF_R (0x4)
 // CHECK-NEXT:      PF_W (0x2)
diff --git a/deps/lld/test/ELF/basic-sparcv9.s b/deps/lld/test/ELF/basic-sparcv9.s
index 272fe01cfc40a2f97b7e6ee23add405ee36891b8..caf02352c61c8ed04d51dc434afddac5fa184627 100644
--- a/deps/lld/test/ELF/basic-sparcv9.s
+++ b/deps/lld/test/ELF/basic-sparcv9.s
@@ -1,7 +1,7 @@
 # REQUIRES: sparc
 # RUN: llvm-mc -filetype=obj -triple=sparc64-unknown-openbsd %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols %t2 \
+# RUN: llvm-readobj --file-headers --sections -l --symbols %t2 \
 # RUN:   | FileCheck %s
 
 # exits with return code 42 on OpenBSD/sparc64
diff --git a/deps/lld/test/ELF/basic.s b/deps/lld/test/ELF/basic.s
index a62f3dc0e8530c3c30e540baebc9f6ba6f6eeccb..96bac2a7ac9312334c3e792437bae1efd74a7c1a 100644
--- a/deps/lld/test/ELF/basic.s
+++ b/deps/lld/test/ELF/basic.s
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols %t2 \
+# RUN: llvm-readobj --file-headers --sections -l --symbols %t2 \
 # RUN:   | FileCheck %s
 # RUN: ld.lld %t -o /dev/null
 
@@ -204,7 +204,7 @@ _start:
 # Test for the response file (POSIX quoting style)
 # RUN: echo " -o %t2" > %t.responsefile
 # RUN: ld.lld %t --rsp-quoting=posix @%t.responsefile
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols %t2 \
+# RUN: llvm-readobj --file-headers --sections -l --symbols %t2 \
 # RUN:   | FileCheck %s
 
 # Test for the response file (Windows quoting style)
@@ -234,7 +234,7 @@ _start:
 # NO_O_VAL: -o: missing argument
 
 # RUN: not ld.lld --foo 2>&1 | FileCheck --check-prefix=UNKNOWN %s
-# UNKNOWN: unknown argument: --foo
+# UNKNOWN: unknown argument '--foo'
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: not ld.lld %t %t -o %t2 2>&1 | FileCheck --check-prefix=DUP %s
@@ -252,3 +252,6 @@ _start:
 # RUN: not ld.lld %t --thinlto-jobs=0 2>&1 | FileCheck --check-prefix=NOTHREADSTHIN %s
 # RUN: not ld.lld %t --plugin-opt=jobs=0 2>&1 | FileCheck --check-prefix=NOTHREADSTHIN %s
 # NOTHREADSTHIN: --thinlto-jobs: number of threads must be > 0
+
+# RUN: not ld.lld %t -z ifunc-noplt -z text 2>&1 | FileCheck --check-prefix=NOIFUNCPLTNOTEXTREL %s
+# NOIFUNCPLTNOTEXTREL: -z text and -z ifunc-noplt may not be used together
diff --git a/deps/lld/test/ELF/basic32.s b/deps/lld/test/ELF/basic32.s
deleted file mode 100644
index 38ef77959598c75b16d2a8aee264c35f1b56dbbb..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/basic32.s
+++ /dev/null
@@ -1,179 +0,0 @@
-# REQUIRES: x86
-# RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %t
-# RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -file-headers -sections -program-headers %t2 | FileCheck %s
-
-# exits with return code 42 on linux
-.globl _start
-_start:
-  mov $1, %eax
-  mov $42, %ebx
-  int $0x80
-
-# CHECK:      ElfHeader {
-# CHECK-NEXT:   Ident {
-# CHECK-NEXT:     Magic: (7F 45 4C 46)
-# CHECK-NEXT:     Class: 32-bit (0x1)
-# CHECK-NEXT:     DataEncoding: LittleEndian (0x1)
-# CHECK-NEXT:     FileVersion: 1
-# CHECK-NEXT:     OS/ABI: SystemV (0x0)
-# CHECK-NEXT:     ABIVersion: 0
-# CHECK-NEXT:     Unused: (00 00 00 00 00 00 00)
-# CHECK-NEXT:   }
-# CHECK-NEXT:   Type: Executable (0x2)
-# CHECK-NEXT:   Machine: EM_386 (0x3)
-# CHECK-NEXT:   Version: 1
-# CHECK-NEXT:   Entry: 0x401000
-# CHECK-NEXT:   ProgramHeaderOffset: 0x34
-# CHECK-NEXT:   SectionHeaderOffset: 0x205C
-# CHECK-NEXT:   Flags [ (0x0)
-# CHECK-NEXT:   ]
-# CHECK-NEXT:   HeaderSize: 52
-# CHECK-NEXT:   ProgramHeaderEntrySize: 32
-# CHECK-NEXT:   ProgramHeaderCount: 4
-# CHECK-NEXT:   SectionHeaderEntrySize: 40
-# CHECK-NEXT:   SectionHeaderCount: 6
-# CHECK-NEXT:   StringTableSectionIndex: 4
-# CHECK-NEXT: }
-# CHECK-NEXT: Sections [
-# CHECK-NEXT:   Section {
-# CHECK-NEXT:     Index: 0
-# CHECK-NEXT:     Name:  (0)
-# CHECK-NEXT:     Type: SHT_NULL (0x0)
-# CHECK-NEXT:     Flags [ (0x0)
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x0
-# CHECK-NEXT:     Offset: 0x0
-# CHECK-NEXT:     Size: 0
-# CHECK-NEXT:     Link: 0
-# CHECK-NEXT:     Info: 0
-# CHECK-NEXT:     AddressAlignment: 0
-# CHECK-NEXT:     EntrySize: 0
-# CHECK-NEXT:   }
-# CHECK-NEXT:   Section {
-# CHECK-NEXT:     Index: 1
-# CHECK-NEXT:     Name: .text
-# CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
-# CHECK-NEXT:     Flags [ (0x6)
-# CHECK-NEXT:       SHF_ALLOC (0x2)
-# CHECK-NEXT:       SHF_EXECINSTR (0x4)
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x401000
-# CHECK-NEXT:     Offset: 0x1000
-# CHECK-NEXT:     Size: 12
-# CHECK-NEXT:     Link: 0
-# CHECK-NEXT:     Info: 0
-# CHECK-NEXT:     AddressAlignment: 4
-# CHECK-NEXT:     EntrySize: 0
-# CHECK-NEXT:   }
-# CHECK-NEXT:   Section {
-# CHECK-NEXT:     Index: 2
-# CHECK-NEXT:     Name: .comment
-# CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
-# CHECK-NEXT:     Flags [ (0x30)
-# CHECK-NEXT:       SHF_MERGE (0x10)
-# CHECK-NEXT:       SHF_STRINGS (0x20)
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x0
-# CHECK-NEXT:     Offset: 0x2000
-# CHECK-NEXT:     Size: 8
-# CHECK-NEXT:     Link: 0
-# CHECK-NEXT:     Info: 0
-# CHECK-NEXT:     AddressAlignment: 1
-# CHECK-NEXT:     EntrySize: 1
-# CHECK-NEXT:   }
-# CHECK-NEXT:   Section {
-# CHECK-NEXT:     Index: 3
-# CHECK-NEXT:     Name: .symtab
-# CHECK-NEXT:     Type: SHT_SYMTAB
-# CHECK-NEXT:     Flags [
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x0
-# CHECK-NEXT:     Offset: 0x2008
-# CHECK-NEXT:     Size: 32
-# CHECK-NEXT:     Link: 5
-# CHECK-NEXT:     Info: 1
-# CHECK-NEXT:     AddressAlignment: 4
-# CHECK-NEXT:     EntrySize: 16
-# CHECK-NEXT:   }
-# CHECK-NEXT:   Section {
-# CHECK-NEXT:     Index: 4
-# CHECK-NEXT:     Name: .shstrtab
-# CHECK-NEXT:     Type: SHT_STRTAB (0x3)
-# CHECK-NEXT:     Flags [ (0x0)
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x0
-# CHECK-NEXT:     Offset: 0x2028
-# CHECK-NEXT:     Size: 42
-# CHECK-NEXT:     Link: 0
-# CHECK-NEXT:     Info: 0
-# CHECK-NEXT:     AddressAlignment: 1
-# CHECK-NEXT:     EntrySize: 0
-# CHECK-NEXT:   }
-# CHECK-NEXT:   Section {
-# CHECK-NEXT:     Index: 5
-# CHECK-NEXT:     Name: .strtab
-# CHECK-NEXT:     Type: SHT_STRTAB (0x3)
-# CHECK-NEXT:     Flags [ (0x0)
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x0
-# CHECK-NEXT:     Offset: 0x2052
-# CHECK-NEXT:     Size: 8
-# CHECK-NEXT:     Link: 0
-# CHECK-NEXT:     Info: 0
-# CHECK-NEXT:     AddressAlignment: 1
-# CHECK-NEXT:     EntrySize: 0
-# CHECK-NEXT:   }
-# CHECK-NEXT: ]
-# CHECK-NEXT: ProgramHeaders [
-# CHECK-NEXT:   ProgramHeader {
-# CHECK-NEXT:     Type: PT_PHDR (0x6)
-# CHECK-NEXT:     Offset: 0x34
-# CHECK-NEXT:     VirtualAddress: 0x400034
-# CHECK-NEXT:     PhysicalAddress: 0x400034
-# CHECK-NEXT:     FileSize: 128
-# CHECK-NEXT:     MemSize: 128
-# CHECK-NEXT:     Flags [ (0x4)
-# CHECK-NEXT:       PF_R (0x4)
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Alignment: 4
-# CHECK-NEXT:   }
-# CHECK-NEXT:   ProgramHeader {
-# CHECK-NEXT:     Type: PT_LOAD (0x1)
-# CHECK-NEXT:     Offset: 0x0
-# CHECK-NEXT:     VirtualAddress: 0x400000
-# CHECK-NEXT:     PhysicalAddress: 0x400000
-# CHECK-NEXT:     FileSize: 180
-# CHECK-NEXT:     MemSize: 180
-# CHECK-NEXT:     Flags [
-# CHECK-NEXT:       PF_R
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Alignment: 4096
-# CHECK-NEXT:   }
-# CHECK-NEXT:   ProgramHeader {
-# CHECK-NEXT:     Type: PT_LOAD (0x1)
-# CHECK-NEXT:     Offset: 0x1000
-# CHECK-NEXT:     VirtualAddress: 0x401000
-# CHECK-NEXT:     PhysicalAddress: 0x401000
-# CHECK-NEXT:     FileSize: 4096
-# CHECK-NEXT:     MemSize: 4096
-# CHECK-NEXT:     Flags [ (0x5)
-# CHECK-NEXT:       PF_R (0x4)
-# CHECK-NEXT:       PF_X (0x1)
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Alignment: 4096
-# CHECK-NEXT:   }
-# CHECK-NEXT:   ProgramHeader {
-# CHECK-NEXT:     Type: PT_GNU_STACK
-# CHECK-NEXT:     Offset: 0x0
-# CHECK-NEXT:     VirtualAddress: 0x0
-# CHECK-NEXT:     PhysicalAddress: 0x0
-# CHECK-NEXT:     FileSize: 0
-# CHECK-NEXT:     MemSize: 0
-# CHECK-NEXT:     Flags [
-# CHECK-NEXT:       PF_R
-# CHECK-NEXT:       PF_W
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Alignment: 0
-# CHECK-NEXT:   }
-# CHECK-NEXT: ]
diff --git a/deps/lld/test/ELF/basic64be.s b/deps/lld/test/ELF/basic64be.s
deleted file mode 100644
index 0add5b99bd570510d7c911b0ceca83417e28aa30..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/basic64be.s
+++ /dev/null
@@ -1,217 +0,0 @@
-# REQUIRES: ppc
-# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t
-# RUN: ld.lld -discard-all %t -o %t2
-# RUN: llvm-readobj -file-headers -sections -section-data -program-headers %t2 | FileCheck %s
-
-# exits with return code 42 on linux
-.text
-	li      0,1
-	li      3,42
-	sc
-# CHECK: ElfHeader {
-# CHECK-NEXT:   Ident {
-# CHECK-NEXT:     Magic: (7F 45 4C 46)
-# CHECK-NEXT:     Class: 64-bit (0x2)
-# CHECK-NEXT:     DataEncoding: BigEndian (0x2)
-# CHECK-NEXT:     FileVersion: 1
-# CHECK-NEXT:     OS/ABI: SystemV (0x0)
-# CHECK-NEXT:     ABIVersion: 0
-# CHECK-NEXT:     Unused: (00 00 00 00 00 00 00)
-# CHECK-NEXT:   }
-# CHECK-NEXT:   Type: Executable (0x2)
-# CHECK-NEXT:   Machine: EM_PPC64 (0x15)
-# CHECK-NEXT:   Version: 1
-# CHECK-NEXT:   Entry: 0x10010000
-# CHECK-NEXT:   ProgramHeaderOffset: 0x40
-# CHECK-NEXT:   SectionHeaderOffset: 0x20058
-# CHECK-NEXT:   Flags [ (0x2)
-# CHECK-NEXT:     0x2
-# CHECK-NEXT:   ]
-# CHECK-NEXT:   HeaderSize: 64
-# CHECK-NEXT:   ProgramHeaderEntrySize: 56
-# CHECK-NEXT:   ProgramHeaderCount: 4
-# CHECK-NEXT:   SectionHeaderEntrySize: 64
-# CHECK-NEXT:   SectionHeaderCount: 7
-# CHECK-NEXT:   StringTableSectionIndex: 5
-# CHECK-NEXT: }
-# CHECK-NEXT: Sections [
-# CHECK-NEXT:   Section {
-# CHECK-NEXT:     Index: 0
-# CHECK-NEXT:     Name:  (0)
-# CHECK-NEXT:     Type: SHT_NULL (0x0)
-# CHECK-NEXT:     Flags [ (0x0)
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x0
-# CHECK-NEXT:     Offset: 0x0
-# CHECK-NEXT:     Size: 0
-# CHECK-NEXT:     Link: 0
-# CHECK-NEXT:     Info: 0
-# CHECK-NEXT:     AddressAlignment: 0
-# CHECK-NEXT:     EntrySize: 0
-# CHECK-NEXT:     SectionData (
-# CHECK-NEXT:     )
-# CHECK-NEXT:   }
-# CHECK-NEXT:   Section {
-# CHECK-NEXT:     Index: 1
-# CHECK-NEXT:     Name: .text (1)
-# CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
-# CHECK-NEXT:     Flags [ (0x6)
-# CHECK-NEXT:       SHF_ALLOC (0x2)
-# CHECK-NEXT:       SHF_EXECINSTR (0x4)
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x10010000
-# CHECK-NEXT:     Offset: 0x10000
-# CHECK-NEXT:     Size: 12
-# CHECK-NEXT:     Link: 0
-# CHECK-NEXT:     Info: 0
-# CHECK-NEXT:     AddressAlignment: 4
-# CHECK-NEXT:     EntrySize: 0
-# CHECK-NEXT:     SectionData (
-# CHECK-NEXT:       0000: 38000001 3860002A 44000002           |8...8`.*D...|
-# CHECK-NEXT:     )
-# CHECK-NEXT:   }
-# CHECK-NEXT:   Section {
-# CHECK-NEXT:     Index: 2
-# CHECK-NEXT:     Name: .branch_lt (7)
-# CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
-# CHECK-NEXT:     Flags [ (0x3)
-# CHECK-NEXT:       SHF_ALLOC (0x2)
-# CHECK-NEXT:       SHF_WRITE (0x1)
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x10020000
-# CHECK-NEXT:     Offset: 0x20000
-# CHECK-NEXT:     Size: 0
-# CHECK-NEXT:     Link: 0
-# CHECK-NEXT:     Info: 0
-# CHECK-NEXT:     AddressAlignment: 8
-# CHECK-NEXT:     EntrySize: 0
-# CHECK-NEXT:     SectionData (
-# CHECK-NEXT:     )
-# CHECK-NEXT:   }
-# CHECK-NEXT:   Section {
-# CHECK-NEXT:     Index: 3
-# CHECK-NEXT:     Name: .comment (18)
-# CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
-# CHECK-NEXT:     Flags [ (0x30)
-# CHECK-NEXT:       SHF_MERGE (0x10)
-# CHECK-NEXT:       SHF_STRINGS (0x20)
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x0
-# CHECK-NEXT:     Offset: 0x20000
-# CHECK-NEXT:     Size: 8
-# CHECK-NEXT:     Link: 0
-# CHECK-NEXT:     Info: 0
-# CHECK-NEXT:     AddressAlignment: 1
-# CHECK-NEXT:     EntrySize: 1
-# CHECK-NEXT:     SectionData (
-# CHECK-NEXT:       0000: 4C4C4420 312E3000                    |LLD 1.0.|
-# CHECK-NEXT:     )
-# CHECK-NEXT:   }
-# CHECK-NEXT:   Section {
-# CHECK-NEXT:     Index: 4
-# CHECK-NEXT:     Name: .symtab (27)
-# CHECK-NEXT:     Type: SHT_SYMTAB (0x2)
-# CHECK-NEXT:     Flags [ (0x0)
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x0
-# CHECK-NEXT:     Offset: 0x20008
-# CHECK-NEXT:     Size: 24
-# CHECK-NEXT:     Link: 6
-# CHECK-NEXT:     Info: 1
-# CHECK-NEXT:     AddressAlignment: 8
-# CHECK-NEXT:     EntrySize: 24
-# CHECK-NEXT:     SectionData (
-# CHECK-NEXT:       0000: 00000000 00000000 00000000 00000000  |................|
-# CHECK-NEXT:       0010: 00000000 00000000                    |........|
-# CHECK-NEXT:     )
-# CHECK-NEXT:   }
-# CHECK-NEXT:   Section {
-# CHECK-NEXT:     Index: 5
-# CHECK-NEXT:     Name: .shstrtab (35)
-# CHECK-NEXT:     Type: SHT_STRTAB (0x3)
-# CHECK-NEXT:     Flags [ (0x0)
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x0
-# CHECK-NEXT:     Offset: 0x20020
-# CHECK-NEXT:     Size: 53
-# CHECK-NEXT:     Link: 0
-# CHECK-NEXT:     Info: 0
-# CHECK-NEXT:     AddressAlignment: 1
-# CHECK-NEXT:     EntrySize: 0
-# CHECK-NEXT:     SectionData (
-# CHECK-NEXT:       0000: 002E7465 7874002E 6272616E 63685F6C  |..text..branch_l|
-# CHECK-NEXT:       0010: 74002E63 6F6D6D65 6E74002E 73796D74  |t..comment..symt|
-# CHECK-NEXT:       0020: 6162002E 73687374 72746162 002E7374  |ab..shstrtab..st|
-# CHECK-NEXT:       0030: 72746162 00                          |rtab.|
-# CHECK-NEXT:     )
-# CHECK-NEXT:   }
-# CHECK-NEXT:   Section {
-# CHECK-NEXT:     Index: 6
-# CHECK-NEXT:     Name: .strtab (45)
-# CHECK-NEXT:     Type: SHT_STRTAB (0x3)
-# CHECK-NEXT:     Flags [ (0x0)
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x0
-# CHECK-NEXT:     Offset: 0x20055
-# CHECK-NEXT:     Size: 1
-# CHECK-NEXT:     Link: 0
-# CHECK-NEXT:     Info: 0
-# CHECK-NEXT:     AddressAlignment: 1
-# CHECK-NEXT:     EntrySize: 0
-# CHECK-NEXT:     SectionData (
-# CHECK-NEXT:       0000: 00                                   |.|
-# CHECK-NEXT:     )
-# CHECK-NEXT:   }
-# CHECK-NEXT: ]
-# CHECK-NEXT: ProgramHeaders [
-# CHECK-NEXT:   ProgramHeader {
-# CHECK-NEXT:     Type: PT_PHDR (0x6)
-# CHECK-NEXT:     Offset: 0x40
-# CHECK-NEXT:     VirtualAddress: 0x10000040
-# CHECK-NEXT:     PhysicalAddress: 0x10000040
-# CHECK-NEXT:     FileSize: 280
-# CHECK-NEXT:     MemSize: 280
-# CHECK-NEXT:     Flags [ (0x4)
-# CHECK-NEXT:       PF_R (0x4)
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Alignment: 8
-# CHECK-NEXT:   }
-# CHECK-NEXT:   ProgramHeader {
-# CHECK-NEXT:     Type: PT_LOAD (0x1)
-# CHECK-NEXT:     Offset: 0x0
-# CHECK-NEXT:     VirtualAddress: 0x10000000
-# CHECK-NEXT:     PhysicalAddress: 0x10000000
-# CHECK-NEXT:     FileSize: 344
-# CHECK-NEXT:     MemSize: 344
-# CHECK-NEXT:     Flags [ (0x4)
-# CHECK-NEXT:       PF_R (0x4)
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Alignment: 65536
-# CHECK-NEXT:   }
-# CHECK-NEXT:   ProgramHeader {
-# CHECK-NEXT:     Type: PT_LOAD (0x1)
-# CHECK-NEXT:     Offset: 0x10000
-# CHECK-NEXT:     VirtualAddress: 0x10010000
-# CHECK-NEXT:     PhysicalAddress: 0x10010000
-# CHECK-NEXT:     FileSize: 4096
-# CHECK-NEXT:     MemSize: 4096
-# CHECK-NEXT:     Flags [ (0x5)
-# CHECK-NEXT:       PF_R (0x4)
-# CHECK-NEXT:       PF_X (0x1)
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Alignment: 65536
-# CHECK-NEXT:   }
-# CHECK-NEXT:   ProgramHeader {
-# CHECK-NEXT:     Type: PT_GNU_STACK (0x6474E551)
-# CHECK-NEXT:     Offset: 0x0
-# CHECK-NEXT:     VirtualAddress: 0x0
-# CHECK-NEXT:     PhysicalAddress: 0x0
-# CHECK-NEXT:     FileSize: 0
-# CHECK-NEXT:     MemSize: 0
-# CHECK-NEXT:     Flags [ (0x6)
-# CHECK-NEXT:       PF_R (0x4)
-# CHECK-NEXT:       PF_W (0x2)
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Alignment: 0
-# CHECK-NEXT:   }
-# CHECK-NEXT: ]
diff --git a/deps/lld/test/ELF/bss-start-common.s b/deps/lld/test/ELF/bss-start-common.s
index cedf6a8668d4632cedf9905c978f1043679ad976..3a32f858999c2423c46382171bd6847d9bd06f5e 100644
--- a/deps/lld/test/ELF/bss-start-common.s
+++ b/deps/lld/test/ELF/bss-start-common.s
@@ -4,7 +4,7 @@
 # RUN: llvm-objdump -t -section-headers %t2 | FileCheck %s
 
 # CHECK: Sections:
-# CHECK: Idx Name          Size      Address          Type
+# CHECK: Idx Name          Size     VMA          Type
 # CHECK:   2 .bss          00000004 0000000000201000 BSS
 # CHECK: SYMBOL TABLE:
 # CHECK: 0000000000201000  .bss 00000000 __bss_start
diff --git a/deps/lld/test/ELF/bss.s b/deps/lld/test/ELF/bss.s
index d35449828aed71aec61cd31862a763c0650e1ef1..78cdff619a0002d38d61b147cda59bde9765c47b 100644
--- a/deps/lld/test/ELF/bss.s
+++ b/deps/lld/test/ELF/bss.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %t2
-// RUN: llvm-readobj -sections %t2 | FileCheck %s
+// RUN: llvm-readobj --sections %t2 | FileCheck %s
 
 // Test that bss takes no space on disk.
 
diff --git a/deps/lld/test/ELF/bsymbolic-undef.s b/deps/lld/test/ELF/bsymbolic-undef.s
index 97080273cf6c21d08bd98885adadeb25b8390a45..befece34ec2d870fdc460ef631d707759c3d3416 100644
--- a/deps/lld/test/ELF/bsymbolic-undef.s
+++ b/deps/lld/test/ELF/bsymbolic-undef.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld -shared -Bsymbolic %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s
 
 # CHECK:      DynamicSymbols [
 # CHECK-NEXT:   Symbol {
diff --git a/deps/lld/test/ELF/bsymbolic.s b/deps/lld/test/ELF/bsymbolic.s
index adb9b3ce36305d3f644a620f7ac912b3609b0e7f..f70cec64ddc8eb2e307d0d9500aa41d81dcb6d76 100644
--- a/deps/lld/test/ELF/bsymbolic.s
+++ b/deps/lld/test/ELF/bsymbolic.s
@@ -3,9 +3,9 @@
 // RUN: ld.lld -shared %t.o -o %t0.so
 // RUN: ld.lld -shared -Bsymbolic %t.o -o %t1.so
 // RUN: ld.lld -shared -Bsymbolic-functions %t.o -o %t2.so
-// RUN: llvm-readobj -s %t0.so | FileCheck -check-prefix=NOOPTION %s
-// RUN: llvm-readobj -s %t1.so | FileCheck -check-prefix=SYMBOLIC %s
-// RUN: llvm-readobj -s %t2.so | FileCheck -check-prefix=SYMBOLIC %s
+// RUN: llvm-readobj -S %t0.so | FileCheck -check-prefix=NOOPTION %s
+// RUN: llvm-readobj -S %t1.so | FileCheck -check-prefix=SYMBOLIC %s
+// RUN: llvm-readobj -S %t2.so | FileCheck -check-prefix=SYMBOLIC %s
 
 // NOOPTION:     Section {
 // NOOPTION:       Name: .plt
diff --git a/deps/lld/test/ELF/build-id.s b/deps/lld/test/ELF/build-id.s
index 5ff2996dc8ea952762afb669c90f637e2907e875..ebfcb08e2e875d8d09a119b00071f19dfb3e9fd9 100644
--- a/deps/lld/test/ELF/build-id.s
+++ b/deps/lld/test/ELF/build-id.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 
 # RUN: ld.lld --build-id %t -o %t2
-# RUN: llvm-readobj -s %t2 | FileCheck -check-prefix=ALIGN %s
+# RUN: llvm-readobj -S %t2 | FileCheck -check-prefix=ALIGN %s
 
 # RUN: ld.lld --build-id %t -o %t2 -threads
 # RUN: llvm-objdump -s %t2 | FileCheck -check-prefix=DEFAULT %s
@@ -65,15 +65,15 @@ _start:
 # DEFAULT:      Contents of section .note.test:
 # DEFAULT:      Contents of section .note.gnu.build-id:
 # DEFAULT-NEXT: 04000000 08000000 03000000 474e5500  ............GNU.
-# DEFAULT-NEXT: 894c04e8 fbf5556b
+# DEFAULT-NEXT: 95849665 2621c734
 
 # MD5:      Contents of section .note.gnu.build-id:
 # MD5-NEXT: 04000000 10000000 03000000 474e5500  ............GNU.
-# MD5-NEXT: 6a51bbd7 9e8ee3f9 2e02d213 711cfec9
+# MD5-NEXT: 1882c01f 71698eed 229b3994 eb554c80
 
 # SHA1:      Contents of section .note.gnu.build-id:
 # SHA1-NEXT: 04000000 14000000 03000000 474e5500  ............GNU.
-# SHA1-NEXT: 9a8618b1 d6fd0e5c eda73dd8 76de5596
+# SHA1-NEXT: 96820adf d90d5470 0a0c32ff a88c4017
 
 # UUID:      Contents of section .note.gnu.build-id:
 # UUID-NEXT: 04000000 10000000 03000000 474e5500  ............GNU.
diff --git a/deps/lld/test/ELF/cgprofile-bad-clusters.s b/deps/lld/test/ELF/cgprofile-bad-clusters.s
index a6a09bd04252cda32cc8d93d9f3cb3cc594f077e..a981e37209ae5bf3e9d52318e66bc55b6407e377 100644
--- a/deps/lld/test/ELF/cgprofile-bad-clusters.s
+++ b/deps/lld/test/ELF/cgprofile-bad-clusters.s
@@ -11,7 +11,7 @@
 # RUN: echo "G H 5" >> %t.call_graph
 # RUN: echo "H I 4" >> %t.call_graph
 # RUN: ld.lld -e A %t --call-graph-ordering-file %t.call_graph -o %t2
-# RUN: llvm-readobj -symbols %t2 | FileCheck %s
+# RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
     .section    .text.A,"ax",@progbits
     .globl A
diff --git a/deps/lld/test/ELF/cgprofile-icf.s b/deps/lld/test/ELF/cgprofile-icf.s
index 93b7274a5d3398129112a6d0c57ab0168473d1d0..ce6cfcf6546c4ffa75eafd2407c2b6fb7245f561 100644
--- a/deps/lld/test/ELF/cgprofile-icf.s
+++ b/deps/lld/test/ELF/cgprofile-icf.s
@@ -6,9 +6,9 @@
 # RUN: echo "A C 40" >> %t.call_graph
 # RUN: echo "C D 61" >> %t.call_graph
 # RUN: ld.lld -e A %t --call-graph-ordering-file %t.call_graph -o %t.out -icf=all
-# RUN: llvm-readobj -symbols %t.out | FileCheck %s
+# RUN: llvm-readobj --symbols %t.out | FileCheck %s
 # RUN: ld.lld -e A %t --call-graph-ordering-file %t.call_graph -o %t2.out
-# RUN: llvm-readobj -symbols %t2.out | FileCheck %s --check-prefix=NOICF
+# RUN: llvm-readobj --symbols %t2.out | FileCheck %s --check-prefix=NOICF
 
     .section    .text.D,"ax",@progbits
     .globl  D
diff --git a/deps/lld/test/ELF/cgprofile-print.s b/deps/lld/test/ELF/cgprofile-print.s
new file mode 100644
index 0000000000000000000000000000000000000000..b103ef5109effbb7ff5d62ea36875473527fc9da
--- /dev/null
+++ b/deps/lld/test/ELF/cgprofile-print.s
@@ -0,0 +1,37 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
+# RUN: echo "A B 5" > %t.call_graph
+# RUN: echo "B C 50" >> %t.call_graph
+# RUN: echo "C D 40" >> %t.call_graph
+# RUN: echo "D B 10" >> %t.call_graph
+# RUN: ld.lld -e A %t --call-graph-ordering-file %t.call_graph -o %t2 --print-symbol-order=%t3
+# RUN: FileCheck %s --input-file %t3
+
+# CHECK: B
+# CHECK-NEXT: C
+# CHECK-NEXT: D
+# CHECK-NEXT: A
+
+.section    .text.A,"ax",@progbits
+.globl  A
+A:
+ nop
+
+.section    .text.B,"ax",@progbits
+.globl  B
+B:
+ nop
+
+.section    .text.C,"ax",@progbits
+.globl  C
+C:
+ nop
+
+.section    .text.D,"ax",@progbits
+.globl  D
+D:
+ nop
+
+
+
diff --git a/deps/lld/test/ELF/cgprofile-reproduce.s b/deps/lld/test/ELF/cgprofile-reproduce.s
new file mode 100644
index 0000000000000000000000000000000000000000..778981496b4892591eb5d2484b6878aa05817fae
--- /dev/null
+++ b/deps/lld/test/ELF/cgprofile-reproduce.s
@@ -0,0 +1,42 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
+# RUN: echo "A B 5" > %t.call_graph
+# RUN: echo "B C 50" >> %t.call_graph
+# RUN: echo "C D 40" >> %t.call_graph
+# RUN: echo "D B 10" >> %t.call_graph
+# RUN: ld.lld -e A %t --call-graph-ordering-file %t.call_graph -o %t2 --print-symbol-order=%t3
+# RUN: ld.lld -e A %t --symbol-ordering-file %t3 -o %t2
+# RUN: llvm-readobj --symbols %t2 | FileCheck %s
+
+# CHECK:      Name: A
+# CHECK-NEXT: Value: 0x201003
+# CHECK:      Name: B
+# CHECK-NEXT: Value: 0x201000
+# CHECK:      Name: C
+# CHECK-NEXT: Value: 0x201001
+# CHECK:      Name: D
+# CHECK-NEXT: Value: 0x201002
+
+.section    .text.A,"ax",@progbits
+.globl  A
+A:
+ nop
+
+.section    .text.B,"ax",@progbits
+.globl  B
+B:
+ nop
+
+.section    .text.C,"ax",@progbits
+.globl  C
+C:
+ nop
+
+.section    .text.D,"ax",@progbits
+.globl  D
+D:
+ nop
+
+
+
diff --git a/deps/lld/test/ELF/cgprofile-txt.s b/deps/lld/test/ELF/cgprofile-txt.s
index ee5149aac90de5e8860198171502ad9ecfea52ec..650a4ef421542ff12ba84605a87cc9b20a1ec243 100644
--- a/deps/lld/test/ELF/cgprofile-txt.s
+++ b/deps/lld/test/ELF/cgprofile-txt.s
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld -e A %t -o %t2
-# RUN: llvm-readobj -symbols %t2 | FileCheck %s --check-prefix=NOSORT
+# RUN: llvm-readobj --symbols %t2 | FileCheck %s --check-prefix=NOSORT
 
 # RUN: echo "A B 10" > %t.call_graph
 # RUN: echo "A B 10" >> %t.call_graph
@@ -25,7 +25,7 @@
 # RUN: echo "TooManyPreds9 TooManyPreds 10" >> %t.call_graph
 # RUN: echo "TooManyPreds10 TooManyPreds 11" >> %t.call_graph
 # RUN: ld.lld -e A %t --call-graph-ordering-file %t.call_graph -o %t2
-# RUN: llvm-readobj -symbols %t2 | FileCheck %s
+# RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
     .section    .text.D,"ax",@progbits
 D:
diff --git a/deps/lld/test/ELF/cgprofile-txt2.s b/deps/lld/test/ELF/cgprofile-txt2.s
index e4f68524d2ac5b07b09c9ac40dda599e6d5ba48b..7d59440f7cbdf5b441aa6e8b9c325d1bd46d8b6d 100644
--- a/deps/lld/test/ELF/cgprofile-txt2.s
+++ b/deps/lld/test/ELF/cgprofile-txt2.s
@@ -6,7 +6,7 @@
 # RUN: echo "C D 40" >> %t.call_graph
 # RUN: echo "D B 10" >> %t.call_graph
 # RUN: ld.lld -e A %t --call-graph-ordering-file %t.call_graph -o %t2
-# RUN: llvm-readobj -symbols %t2 | FileCheck %s
+# RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
 # CHECK:      Name: A
 # CHECK-NEXT: Value: 0x201003
diff --git a/deps/lld/test/ELF/color-diagnostics.test b/deps/lld/test/ELF/color-diagnostics.test
index 6dfa0ab1af9228a31303366631992371caa650d2..8613074dc565d9fa816300f445801c95bd2a88af 100644
--- a/deps/lld/test/ELF/color-diagnostics.test
+++ b/deps/lld/test/ELF/color-diagnostics.test
@@ -6,7 +6,7 @@
 # RUN: not ld.lld -xyz -color-diagnostics=always /nosuchfile 2>&1 \
 # RUN:   | FileCheck -check-prefix=COLOR %s
 
-# COLOR: {{ld.lld: .\[0;1;31merror: .\[0munknown argument: -xyz}}
+# COLOR: {{ld.lld: .\[0;1;31merror: .\[0munknown argument '-xyz'}}
 # COLOR: {{ld.lld: .\[0;1;31merror: .\[0mcannot open /nosuchfile}}
 
 # RUN: not ld.lld -color-diagnostics=foobar 2>&1 | FileCheck -check-prefix=ERR %s
diff --git a/deps/lld/test/ELF/combreloc.s b/deps/lld/test/ELF/combreloc.s
new file mode 100644
index 0000000000000000000000000000000000000000..b8c7517928628a1dca735d57d871e6171a663e73
--- /dev/null
+++ b/deps/lld/test/ELF/combreloc.s
@@ -0,0 +1,48 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: echo 'mov aaa@gotpcrel(%rip), %rax' | llvm-mc -filetype=obj -triple=x86_64 - -o %t1.o
+
+# RUN: ld.lld -shared %t.o %t1.o -o %t.so
+# RUN: llvm-readobj -r --dynamic-table %t.so | FileCheck %s
+# RUN: ld.lld -shared %t.o %t1.o -o %t.so -z combreloc
+# RUN: llvm-readobj -r --dynamic-table %t.so | FileCheck %s
+
+# -z combreloc is the default: sort relocations by (!IsRelative,SymIndex,r_offset),
+# and emit DT_RELACOUNT (except on MIPS) to indicate the number of relative
+# relocations.
+
+# CHECK:      Relocations [
+# CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
+# CHECK-NEXT:     0x3020 R_X86_64_RELATIVE - 0x3028
+# CHECK-NEXT:     0x20B0 R_X86_64_GLOB_DAT aaa 0x0
+# CHECK-NEXT:     0x3000 R_X86_64_64 aaa 0x0
+# CHECK-NEXT:     0x3018 R_X86_64_64 aaa 0x0
+# CHECK-NEXT:     0x3010 R_X86_64_64 bbb 0x0
+# CHECK-NEXT:     0x3008 R_X86_64_64 ccc 0x0
+# CHECK-NEXT:   }
+# CHECK:      DynamicSection [
+# CHECK:        RELACOUNT 1
+
+# RUN: ld.lld -z nocombreloc -shared %t.o %t1.o -o %t.so
+# RUN: llvm-readobj -r --dynamic-table %t.so | FileCheck --check-prefix=NOCOMB %s
+
+# NOCOMB:      Relocations [
+# NOCOMB-NEXT:   Section ({{.*}}) .rela.dyn {
+# NOCOMB-NEXT:     0x3000 R_X86_64_64 aaa 0x0
+# NOCOMB-NEXT:     0x3008 R_X86_64_64 ccc 0x0
+# NOCOMB-NEXT:     0x3010 R_X86_64_64 bbb 0x0
+# NOCOMB-NEXT:     0x3018 R_X86_64_64 aaa 0x0
+# NOCOMB-NEXT:     0x3020 R_X86_64_RELATIVE - 0x3028
+# NOCOMB-NEXT:     0x20A0 R_X86_64_GLOB_DAT aaa 0x0
+# NOCOMB-NEXT:   }
+# NOCOMB:      DynamicSection [
+# NOCOMB-NOT:    RELACOUNT
+
+.data
+ .quad aaa
+ .quad ccc
+ .quad bbb
+ .quad aaa
+ .quad relative
+relative:
diff --git a/deps/lld/test/ELF/combrelocs.s b/deps/lld/test/ELF/combrelocs.s
deleted file mode 100644
index 595f6049f5fab1c4dab0ce4fd691693ace423df0..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/combrelocs.s
+++ /dev/null
@@ -1,95 +0,0 @@
-# REQUIRES: x86
-
-# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
-# RUN: ld.lld -shared %t.o -o %t.out
-# RUN: llvm-readobj -r --expand-relocs --dynamic-table %t.out | FileCheck %s
-
-# RUN: ld.lld -shared %t.o -o %t.out -z combreloc
-# RUN: llvm-readobj -r --expand-relocs --dynamic-table %t.out | FileCheck %s
-
-# CHECK:      Relocations [
-# CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
-# CHECK-NEXT:     Relocation {
-# CHECK-NEXT:       Offset: 0x1000
-# CHECK-NEXT:       Type: R_X86_64_64
-# CHECK-NEXT:       Symbol: aaa (1)
-# CHECK-NEXT:       Addend: 0x0
-# CHECK-NEXT:     }
-# CHECK-NEXT:     Relocation {
-# CHECK-NEXT:       Offset: 0x1018
-# CHECK-NEXT:       Type: R_X86_64_64
-# CHECK-NEXT:       Symbol: aaa (1)
-# CHECK-NEXT:       Addend: 0x0
-# CHECK-NEXT:     }
-# CHECK-NEXT:     Relocation {
-# CHECK-NEXT:       Offset: 0x1010
-# CHECK-NEXT:       Type: R_X86_64_64
-# CHECK-NEXT:       Symbol: bbb (2)
-# CHECK-NEXT:       Addend: 0x0
-# CHECK-NEXT:     }
-# CHECK-NEXT:     Relocation {
-# CHECK-NEXT:       Offset: 0x1008
-# CHECK-NEXT:       Type: R_X86_64_64
-# CHECK-NEXT:       Symbol: ccc (3)
-# CHECK-NEXT:       Addend: 0x0
-# CHECK-NEXT:     }
-# CHECK-NEXT:     Relocation {
-# CHECK-NEXT:       Offset: 0x1020
-# CHECK-NEXT:       Type: R_X86_64_64
-# CHECK-NEXT:       Symbol: ddd (4)
-# CHECK-NEXT:       Addend: 0x0
-# CHECK-NEXT:     }
-# CHECK-NEXT:   }
-# CHECK-NEXT: ]
-# CHECK:      DynamicSection [
-# CHECK-NEXT:   Tag
-# CHECK-NOT:    RELACOUNT
-
-# RUN: ld.lld -z nocombreloc -shared %t.o -o %t.out
-# RUN: llvm-readobj -r --expand-relocs --dynamic-table %t.out | \
-# RUN:    FileCheck --check-prefix=NOCOMB %s
-
-# NOCOMB:      Relocations [
-# NOCOMB-NEXT:    Section ({{.*}}) .rela.dyn {
-# NOCOMB-NEXT:     Relocation {
-# NOCOMB-NEXT:       Offset: 0x1000
-# NOCOMB-NEXT:       Type: R_X86_64_64
-# NOCOMB-NEXT:       Symbol: aaa (1)
-# NOCOMB-NEXT:       Addend: 0x0
-# NOCOMB-NEXT:     }
-# NOCOMB-NEXT:     Relocation {
-# NOCOMB-NEXT:       Offset: 0x1008
-# NOCOMB-NEXT:       Type: R_X86_64_64
-# NOCOMB-NEXT:       Symbol: ccc (3)
-# NOCOMB-NEXT:       Addend: 0x0
-# NOCOMB-NEXT:     }
-# NOCOMB-NEXT:     Relocation {
-# NOCOMB-NEXT:       Offset: 0x1010
-# NOCOMB-NEXT:       Type: R_X86_64_64
-# NOCOMB-NEXT:       Symbol: bbb (2)
-# NOCOMB-NEXT:       Addend: 0x0
-# NOCOMB-NEXT:     }
-# NOCOMB-NEXT:     Relocation {
-# NOCOMB-NEXT:       Offset: 0x1018
-# NOCOMB-NEXT:       Type: R_X86_64_64
-# NOCOMB-NEXT:       Symbol: aaa (1)
-# NOCOMB-NEXT:       Addend: 0x0
-# NOCOMB-NEXT:     }
-# NOCOMB-NEXT:     Relocation {
-# NOCOMB-NEXT:       Offset: 0x1020
-# NOCOMB-NEXT:       Type: R_X86_64_64
-# NOCOMB-NEXT:       Symbol: ddd (4)
-# NOCOMB-NEXT:       Addend: 0x0
-# NOCOMB-NEXT:     }
-# NOCOMB-NEXT:   }
-# NOCOMB-NEXT:  ]
-# NOCOMB:      DynamicSection [
-# NOCOMB-NEXT:   Tag
-# NOCOMB-NOT:    RELACOUNT
-
-.data
- .quad aaa
- .quad ccc
- .quad bbb
- .quad aaa
- .quad ddd
diff --git a/deps/lld/test/ELF/comdat-discarded-error.s b/deps/lld/test/ELF/comdat-discarded-error.s
new file mode 100644
index 0000000000000000000000000000000000000000..d5aa4aa68df77b1a2053db34d0c7191abd379db6
--- /dev/null
+++ b/deps/lld/test/ELF/comdat-discarded-error.s
@@ -0,0 +1,28 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t1.o
+# RUN: echo '.section .text.foo,"axG",@progbits,foo,comdat; .globl foo; foo:' |\
+# RUN:   llvm-mc -filetype=obj -triple=x86_64 - -o %t2.o
+# RUN: echo '.section .text.foo,"axG",@progbits,foo,comdat; .globl bar; bar:' |\
+# RUN:   llvm-mc -filetype=obj -triple=x86_64 - -o %t3.o
+
+# RUN: not ld.lld %t2.o %t3.o %t1.o -o /dev/null 2>&1 | FileCheck %s
+
+# CHECK:      error: relocation refers to a symbol in a discarded section: bar
+# CHECK-NEXT: >>> defined in {{.*}}3.o
+# CHECK-NEXT: >>> section group signature: foo
+# CHECK-NEXT: >>> prevailing definition is in {{.*}}2.o
+# CHECK-NEXT: >>> referenced by {{.*}}1.o:(.text+0x1)
+
+# CHECK:      error: relocation refers to a discarded section: .text.foo
+# CHECK-NEXT: >>> defined in {{.*}}1.o
+# CHECK-NEXT: >>> section group signature: foo
+# CHECK-NEXT: >>> prevailing definition is in {{.*}}2.o
+# CHECK-NEXT: >>> referenced by {{.*}}1.o:(.data+0x0)
+
+.globl _start
+_start:
+  jmp bar
+
+.section .text.foo,"axG",@progbits,foo,comdat
+.data
+  .quad .text.foo
diff --git a/deps/lld/test/ELF/comdat-discarded-gdb-index.s b/deps/lld/test/ELF/comdat-discarded-gdb-index.s
new file mode 100644
index 0000000000000000000000000000000000000000..43505960498a2279e631d9aac36288192b6a2e13
--- /dev/null
+++ b/deps/lld/test/ELF/comdat-discarded-gdb-index.s
@@ -0,0 +1,63 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: ld.lld --gdb-index %t.o %t.o -o %t
+
+## .debug_info has a relocation to .text.foo . The second %t.o is discarded.
+## Check we don't error on the relocation.
+# CHECK: .rela.debug_info {
+# CHECK-NEXT: 0xC R_X86_64_64 .text.foo 0x0
+
+.section .text.foo,"axG",@progbits,foo,comdat
+.globl foo
+.Lfunc_begin0:
+foo:
+  ret
+.Lfunc_end0:
+
+.section .debug_abbrev,"",@progbits
+  .byte   1       # Abbreviation Code
+  .byte   17      # DW_TAG_compile_unit
+  .byte   1       # DW_CHILDREN_yes
+  .byte   17      # DW_AT_low_pc
+  .byte   1       # DW_FORM_addr
+  .byte   18      # DW_AT_high_pc
+  .byte   6       # DW_FORM_data4
+  .ascii  "\264B" # DW_AT_GNU_pubnames
+  .byte   25      # DW_FORM_flag_present
+  .byte   0       # EOM(1)
+  .byte   0       # EOM(2)
+  .byte   2       # Abbreviation Code
+  .byte   46      # DW_TAG_subprogram
+  .byte   0       # DW_CHILDREN_no
+  .byte   3       # DW_AT_name
+  .byte   8       # DW_FORM_string
+  .byte   0       # EOM(1)
+  .byte   0       # EOM(2)
+  .byte   0
+
+.section .debug_info,"",@progbits
+.Lcu_begin0:
+  .long   .Lcu_end0 - .Lcu_begin0 - 4
+  .short  4              # DWARF version number
+  .long   0              # Offset Into Abbrev. Section
+  .byte   4              # Address Size
+.Ldie0:
+  .byte   1              # Abbrev [1] DW_TAG_compile_unit
+  .quad   .Lfunc_begin0  # DW_AT_low_pc
+  .long   .Lfunc_end0 - .Lfunc_begin0 # DW_AT_high_pc
+  .byte   2              # Abbrev [2] DW_TAG_subprogram
+  .asciz  "foo"          # DW_AT_name
+  .byte   0
+.Lcu_end0:
+
+.section .debug_gnu_pubnames,"",@progbits
+  .long   .LpubNames_end0 - .LpubNames_begin0
+.LpubNames_begin0:
+  .short  2              # Version
+  .long   .Lcu_begin0    # CU Offset
+  .long   .Lcu_end0 - .Lcu_begin0
+  .long   .Ldie0 - .Lcu_begin0
+  .byte   48             # Attributes: FUNCTION, EXTERNAL
+  .asciz  "foo"          # External Name
+  .long   0
+.LpubNames_end0:
diff --git a/deps/lld/test/ELF/comdat-discarded-ppc64.s b/deps/lld/test/ELF/comdat-discarded-ppc64.s
new file mode 100644
index 0000000000000000000000000000000000000000..81e48fdaad7b235fc546df5382bb2e70c6cbd4b1
--- /dev/null
+++ b/deps/lld/test/ELF/comdat-discarded-ppc64.s
@@ -0,0 +1,17 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le %s -o %t.o
+# RUN: ld.lld %t.o %t.o -o /dev/null
+# RUN: ld.lld -r --fatal-warnings %t.o %t.o -o /dev/null
+
+## clang/gcc PPC64 may emit a .rela.toc which references a switch table in a
+## discarded .rodata/.text section. The .toc and the .rela.toc are incorrectly
+## not placed in the comdat.
+## Don't error "relocation refers to a discarded section".
+
+.section .text.foo,"axG",@progbits,foo,comdat
+.globl foo
+foo:
+.L0:
+
+.section .toc,"aw"
+.quad .L0
diff --git a/deps/lld/test/ELF/comdat-discarded-reloc.s b/deps/lld/test/ELF/comdat-discarded-reloc.s
index d23baf386e92da159853c6d5a482cb792848c834..4d50ab10e5127f71357c7bcd248016b848bef047 100644
--- a/deps/lld/test/ELF/comdat-discarded-reloc.s
+++ b/deps/lld/test/ELF/comdat-discarded-reloc.s
@@ -1,17 +1,42 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/comdat-discarded-reloc.s -o %t2.o
-# RUN: ld.lld -gc-sections %t.o %t2.o -o %t
+# RUN: ld.lld -gc-sections --noinhibit-exec %t2.o %t.o -o /dev/null
+# RUN: ld.lld -r %t2.o %t.o -o %t 2>&1 | FileCheck --check-prefix=WARN %s
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC %s
 
 ## ELF spec doesn't allow a relocation to point to a deduplicated
 ## COMDAT section. Unfortunately this happens in practice (e.g. .eh_frame)
 ## Test case checks we do not crash.
 
-.global bar, _start
+# WARN: warning: relocation refers to a discarded section: .text.bar1
+# WARN-NEXT: >>> referenced by {{.*}}.o:(.rela.text.bar2+0x0)
+# WARN-NOT: warning
 
-.section .text.foo,"aG",@progbits,group,comdat
+# RELOC:      .rela.eh_frame {
+# RELOC-NEXT:   R_X86_64_NONE
+# RELOC-NEXT: }
+# RELOC-NEXT: .rela.debug_foo {
+# RELOC-NEXT:   R_X86_64_NONE
+# RELOC-NEXT: }
+# RELOC-NEXT: .rela.gcc_except_table {
+# RELOC-NEXT:   R_X86_64_NONE
+# RELOC-NEXT: }
 
-.section .text
-_start:
- .quad .text.foo
- .quad bar
+.section .text.bar1,"aG",@progbits,group,comdat
+
+## .text.bar1 in this file is discarded. Warn on the relocation.
+.section .text.bar2,"ax"
+.globl bar
+bar:
+  .quad .text.bar1
+
+## Don't warn on .eh_frame, .debug*, .zdebug*, or .gcc_except_table
+.section .eh_frame,"a"
+  .quad .text.bar1
+
+.section .debug_foo
+  .quad .text.bar1
+
+.section .gcc_except_table,"a"
+  .quad .text.bar1
diff --git a/deps/lld/test/ELF/comdat.s b/deps/lld/test/ELF/comdat.s
index 4728dd34af5f6b7205bfd963f1612a662824603a..9e3f5a81d300e3a830b4f1c166eb806d1d9e2d6b 100644
--- a/deps/lld/test/ELF/comdat.s
+++ b/deps/lld/test/ELF/comdat.s
@@ -1,9 +1,9 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/comdat.s -o %t2.o
-// RUN: ld.lld -shared %t.o %t.o %t2.o -o %t
+// RUN: ld.lld -shared %t.o %t2.o -o %t
 // RUN: llvm-objdump -d %t | FileCheck %s
-// RUN: llvm-readobj -s -t %t | FileCheck --check-prefix=READ %s
+// RUN: llvm-readobj -S --symbols %t | FileCheck --check-prefix=READ %s
 
 // Check that we don't crash with --gc-section and that we print a list of
 // reclaimed sections on stderr.
@@ -19,6 +19,7 @@ foo:
         nop
 
 // CHECK: Disassembly of section .text2:
+// CHECK-EMPTY:
 // CHECK-NEXT: foo:
 // CHECK-NEXT:   1000: {{.*}}  nop
 // CHECK-NOT: nop
@@ -27,11 +28,10 @@ foo:
         call foo
 
 // CHECK: Disassembly of section bar:
+// CHECK-EMPTY:
 // CHECK-NEXT: bar:
 // 0x1000 - 0x1001 - 5 = -6
-// 0      - 0x1006 - 5 = -4107
 // CHECK-NEXT:   1001:	{{.*}}  callq  -6
-// CHECK-NEXT:   1006:	{{.*}}  callq  -4107
 
         .section .text3,"axG",@progbits,zed,comdat,unique,0
 
diff --git a/deps/lld/test/ELF/common-gc.s b/deps/lld/test/ELF/common-gc.s
index 99fde9ea3c3985943af4f626219821efb35c84b1..ab1d674ea0e029aa12b2b1f5d3291bfd595eb0c8 100644
--- a/deps/lld/test/ELF/common-gc.s
+++ b/deps/lld/test/ELF/common-gc.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -sections -symbols %t2 | FileCheck %s --check-prefix=NOGC
+# RUN: llvm-readobj --sections --symbols %t2 | FileCheck %s --check-prefix=NOGC
 
 # NOGC:      Name: .bss
 # NOGC-NEXT: Type:
@@ -18,7 +18,7 @@
 # NOGC: Name: foo
 
 # RUN: ld.lld -gc-sections %t -o %t1
-# RUN: llvm-readobj -sections -symbols %t1 | FileCheck %s --check-prefix=GC
+# RUN: llvm-readobj --sections --symbols %t1 | FileCheck %s --check-prefix=GC
 
 # GC:      Name: .bss
 # GC-NEXT: Type:
diff --git a/deps/lld/test/ELF/common-page.s b/deps/lld/test/ELF/common-page.s
new file mode 100644
index 0000000000000000000000000000000000000000..4734a49a84e7ede690011f21bebabca10cc84126
--- /dev/null
+++ b/deps/lld/test/ELF/common-page.s
@@ -0,0 +1,223 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
+
+# exits with return code 42 on linux
+.globl _start
+_start:
+  nop
+
+# Increase max-page-size to 64k while using the default x86_64 common page size
+# of 4k. If the last loadable segment is executable then lld aligns the next
+# section using the common page size.
+
+# RUN: ld.lld -z max-page-size=0x10000 -z common-page-size=0x1000 %t -o %t2
+# RUN: llvm-readobj --sections -l %t2 | FileCheck --check-prefix=CHECK-MAX %s
+
+# CHECK-MAX:      Sections [
+# CHECK-MAX-NEXT:   Section {
+# CHECK-MAX-NEXT:     Index: 0
+# CHECK-MAX-NEXT:     Name:  (0)
+# CHECK-MAX-NEXT:     Type: SHT_NULL (0x0)
+# CHECK-MAX-NEXT:     Flags [ (0x0)
+# CHECK-MAX-NEXT:     ]
+# CHECK-MAX-NEXT:     Address: 0x0
+# CHECK-MAX-NEXT:     Offset: 0x0
+# CHECK-MAX-NEXT:     Size: 0
+# CHECK-MAX-NEXT:     Link: 0
+# CHECK-MAX-NEXT:     Info: 0
+# CHECK-MAX-NEXT:     AddressAlignment: 0
+# CHECK-MAX-NEXT:     EntrySize: 0
+# CHECK-MAX-NEXT:   }
+# CHECK-MAX-NEXT:   Section {
+# CHECK-MAX-NEXT:     Index: 1
+# CHECK-MAX-NEXT:     Name: .text (1)
+# CHECK-MAX-NEXT:     Type: SHT_PROGBITS (0x1)
+# CHECK-MAX-NEXT:     Flags [ (0x6)
+# CHECK-MAX-NEXT:       SHF_ALLOC (0x2)
+# CHECK-MAX-NEXT:       SHF_EXECINSTR (0x4)
+# CHECK-MAX-NEXT:     ]
+# CHECK-MAX-NEXT:     Address: 0x210000
+# CHECK-MAX-NEXT:     Offset: 0x10000
+# CHECK-MAX-NEXT:     Size: 1
+# CHECK-MAX-NEXT:     Link: 0
+# CHECK-MAX-NEXT:     Info: 0
+# CHECK-MAX-NEXT:     AddressAlignment: 4
+# CHECK-MAX-NEXT:     EntrySize: 0
+# CHECK-MAX-NEXT:   }
+# CHECK-MAX-NEXT:   Section {
+# CHECK-MAX-NEXT:     Index: 2
+# CHECK-MAX-NEXT:     Name: .comment (7)
+# CHECK-MAX-NEXT:     Type: SHT_PROGBITS (0x1)
+# CHECK-MAX-NEXT:     Flags [ (0x30)
+# CHECK-MAX-NEXT:       SHF_MERGE (0x10)
+# CHECK-MAX-NEXT:       SHF_STRINGS (0x20)
+# CHECK-MAX-NEXT:     ]
+# CHECK-MAX-NEXT:     Address: 0x0
+# CHECK-MAX-NEXT:     Offset: 0x11000
+# CHECK-MAX-NEXT:     Size: 8
+# CHECK-MAX-NEXT:     Link: 0
+# CHECK-MAX-NEXT:     Info: 0
+# CHECK-MAX-NEXT:     AddressAlignment: 1
+# CHECK-MAX-NEXT:     EntrySize: 1
+
+# CHECK-MAX: ProgramHeaders [
+# CHECK-MAX-NEXT:   ProgramHeader {
+# CHECK-MAX-NEXT:     Type: PT_PHDR (0x6)
+# CHECK-MAX-NEXT:     Offset: 0x40
+# CHECK-MAX-NEXT:     VirtualAddress: 0x200040
+# CHECK-MAX-NEXT:     PhysicalAddress: 0x200040
+# CHECK-MAX-NEXT:     FileSize: 224
+# CHECK-MAX-NEXT:     MemSize: 224
+# CHECK-MAX-NEXT:     Flags [ (0x4)
+# CHECK-MAX-NEXT:       PF_R (0x4)
+# CHECK-MAX-NEXT:     ]
+# CHECK-MAX-NEXT:     Alignment: 8
+# CHECK-MAX-NEXT:   }
+# CHECK-MAX-NEXT:   ProgramHeader {
+# CHECK-MAX-NEXT:     Type: PT_LOAD (0x1)
+# CHECK-MAX-NEXT:     Offset: 0x0
+# CHECK-MAX-NEXT:     VirtualAddress: 0x200000
+# CHECK-MAX-NEXT:     PhysicalAddress: 0x200000
+# CHECK-MAX-NEXT:     FileSize: 288
+# CHECK-MAX-NEXT:     MemSize: 288
+# CHECK-MAX-NEXT:     Flags [ (0x4)
+# CHECK-MAX-NEXT:       PF_R (0x4)
+# CHECK-MAX-NEXT:     ]
+# CHECK-MAX-NEXT:     Alignment: 65536
+# CHECK-MAX-NEXT:   }
+# CHECK-MAX-NEXT:   ProgramHeader {
+# CHECK-MAX-NEXT:     Type: PT_LOAD (0x1)
+# CHECK-MAX-NEXT:     Offset: 0x10000
+# CHECK-MAX-NEXT:     VirtualAddress: 0x210000
+# CHECK-MAX-NEXT:     PhysicalAddress: 0x210000
+# CHECK-MAX-NEXT:     FileSize: 4096
+# CHECK-MAX-NEXT:     MemSize: 4096
+# CHECK-MAX-NEXT:     Flags [ (0x5)
+# CHECK-MAX-NEXT:       PF_R (0x4)
+# CHECK-MAX-NEXT:       PF_X (0x1)
+# CHECK-MAX-NEXT:     ]
+# CHECK-MAX-NEXT:     Alignment: 65536
+# CHECK-MAX-NEXT:   }
+# CHECK-MAX-NEXT:   ProgramHeader {
+# CHECK-MAX-NEXT:     Type: PT_GNU_STACK (0x6474E551)
+# CHECK-MAX-NEXT:     Offset: 0x0
+# CHECK-MAX-NEXT:     VirtualAddress: 0x0
+# CHECK-MAX-NEXT:     PhysicalAddress: 0x0
+# CHECK-MAX-NEXT:     FileSize: 0
+# CHECK-MAX-NEXT:     MemSize: 0
+# CHECK-MAX-NEXT:     Flags [ (0x6)
+# CHECK-MAX-NEXT:       PF_R (0x4)
+# CHECK-MAX-NEXT:       PF_W (0x2)
+# CHECK-MAX-NEXT:     ]
+# CHECK-MAX-NEXT:     Alignment: 0
+
+# Increase common-page-size to max-page-size. Expect to see a larger offset
+# of the first Section after the executable loadable segment due to the higher
+# alignment requirement.
+
+# RUN: ld.lld -z max-page-size=0x10000 -z common-page-size=0x10000 %t -o %t3
+# RUN: llvm-readobj --sections -l %t3 | FileCheck --check-prefix=CHECK-COMMON %s
+
+# Check that we truncate common-page-size to max-page-size
+
+# RUN: ld.lld -z max-page-size=0x10000 -z common-page-size=0x100000 %t -o %t4
+# RUN: llvm-readobj --sections -l %t4 | FileCheck --check-prefix=CHECK-COMMON %s
+
+# CHECK-COMMON: Sections [
+# CHECK-COMMON-NEXT:   Section {
+# CHECK-COMMON-NEXT:     Index: 0
+# CHECK-COMMON-NEXT:     Name:  (0)
+# CHECK-COMMON-NEXT:     Type: SHT_NULL (0x0)
+# CHECK-COMMON-NEXT:     Flags [ (0x0)
+# CHECK-COMMON-NEXT:     ]
+# CHECK-COMMON-NEXT:     Address: 0x0
+# CHECK-COMMON-NEXT:     Offset: 0x0
+# CHECK-COMMON-NEXT:     Size: 0
+# CHECK-COMMON-NEXT:     Link: 0
+# CHECK-COMMON-NEXT:     Info: 0
+# CHECK-COMMON-NEXT:     AddressAlignment: 0
+# CHECK-COMMON-NEXT:     EntrySize: 0
+# CHECK-COMMON-NEXT:   }
+# CHECK-COMMON-NEXT:   Section {
+# CHECK-COMMON-NEXT:     Index: 1
+# CHECK-COMMON-NEXT:     Name: .text (1)
+# CHECK-COMMON-NEXT:     Type: SHT_PROGBITS (0x1)
+# CHECK-COMMON-NEXT:     Flags [ (0x6)
+# CHECK-COMMON-NEXT:       SHF_ALLOC (0x2)
+# CHECK-COMMON-NEXT:       SHF_EXECINSTR (0x4)
+# CHECK-COMMON-NEXT:     ]
+# CHECK-COMMON-NEXT:     Address: 0x210000
+# CHECK-COMMON-NEXT:     Offset: 0x10000
+# CHECK-COMMON-NEXT:     Size: 1
+# CHECK-COMMON-NEXT:     Link: 0
+# CHECK-COMMON-NEXT:     Info: 0
+# CHECK-COMMON-NEXT:     AddressAlignment: 4
+# CHECK-COMMON-NEXT:     EntrySize: 0
+# CHECK-COMMON-NEXT:   }
+# CHECK-COMMON-NEXT:   Section {
+# CHECK-COMMON-NEXT:     Index: 2
+# CHECK-COMMON-NEXT:     Name: .comment (7)
+# CHECK-COMMON-NEXT:     Type: SHT_PROGBITS (0x1)
+# CHECK-COMMON-NEXT:     Flags [ (0x30)
+# CHECK-COMMON-NEXT:       SHF_MERGE (0x10)
+# CHECK-COMMON-NEXT:       SHF_STRINGS (0x20)
+# CHECK-COMMON-NEXT:     ]
+# CHECK-COMMON-NEXT:     Address: 0x0
+# CHECK-COMMON-NEXT:     Offset: 0x20000
+# CHECK-COMMON-NEXT:     Size: 8
+# CHECK-COMMON-NEXT:     Link: 0
+# CHECK-COMMON-NEXT:     Info: 0
+# CHECK-COMMON-NEXT:     AddressAlignment: 1
+# CHECK-COMMON-NEXT:     EntrySize: 1
+
+# CHECK-COMMON: ProgramHeaders [
+# CHECK-COMMON-NEXT:   ProgramHeader {
+# CHECK-COMMON-NEXT:     Type: PT_PHDR (0x6)
+# CHECK-COMMON-NEXT:     Offset: 0x40
+# CHECK-COMMON-NEXT:     VirtualAddress: 0x200040
+# CHECK-COMMON-NEXT:     PhysicalAddress: 0x200040
+# CHECK-COMMON-NEXT:     FileSize: 224
+# CHECK-COMMON-NEXT:     MemSize: 224
+# CHECK-COMMON-NEXT:     Flags [ (0x4)
+# CHECK-COMMON-NEXT:       PF_R (0x4)
+# CHECK-COMMON-NEXT:     ]
+# CHECK-COMMON-NEXT:     Alignment: 8
+# CHECK-COMMON-NEXT:   }
+# CHECK-COMMON-NEXT:   ProgramHeader {
+# CHECK-COMMON-NEXT:     Type: PT_LOAD (0x1)
+# CHECK-COMMON-NEXT:     Offset: 0x0
+# CHECK-COMMON-NEXT:     VirtualAddress: 0x200000
+# CHECK-COMMON-NEXT:     PhysicalAddress: 0x200000
+# CHECK-COMMON-NEXT:     FileSize: 288
+# CHECK-COMMON-NEXT:     MemSize: 288
+# CHECK-COMMON-NEXT:     Flags [ (0x4)
+# CHECK-COMMON-NEXT:       PF_R (0x4)
+# CHECK-COMMON-NEXT:     ]
+# CHECK-COMMON-NEXT:     Alignment: 65536
+# CHECK-COMMON-NEXT:   }
+# CHECK-COMMON-NEXT:   ProgramHeader {
+# CHECK-COMMON-NEXT:     Type: PT_LOAD (0x1)
+# CHECK-COMMON-NEXT:     Offset: 0x10000
+# CHECK-COMMON-NEXT:     VirtualAddress: 0x210000
+# CHECK-COMMON-NEXT:     PhysicalAddress: 0x210000
+# CHECK-COMMON-NEXT:     FileSize: 65536
+# CHECK-COMMON-NEXT:     MemSize: 65536
+# CHECK-COMMON-NEXT:     Flags [ (0x5)
+# CHECK-COMMON-NEXT:       PF_R (0x4)
+# CHECK-COMMON-NEXT:       PF_X (0x1)
+# CHECK-COMMON-NEXT:     ]
+# CHECK-COMMON-NEXT:     Alignment: 65536
+# CHECK-COMMON-NEXT:   }
+# CHECK-COMMON-NEXT:   ProgramHeader {
+# CHECK-COMMON-NEXT:     Type: PT_GNU_STACK (0x6474E551)
+# CHECK-COMMON-NEXT:     Offset: 0x0
+# CHECK-COMMON-NEXT:     VirtualAddress: 0x0
+# CHECK-COMMON-NEXT:     PhysicalAddress: 0x0
+# CHECK-COMMON-NEXT:     FileSize: 0
+# CHECK-COMMON-NEXT:     MemSize: 0
+# CHECK-COMMON-NEXT:     Flags [ (0x6)
+# CHECK-COMMON-NEXT:       PF_R (0x4)
+# CHECK-COMMON-NEXT:       PF_W (0x2)
+# CHECK-COMMON-NEXT:     ]
+# CHECK-COMMON-NEXT:     Alignment: 0
diff --git a/deps/lld/test/ELF/common.s b/deps/lld/test/ELF/common.s
index da6657173bfd6c7379170ab3c09c9324e398daea..b9c7d95b44f115e9bf2b93cf32e853bcbaa04843 100644
--- a/deps/lld/test/ELF/common.s
+++ b/deps/lld/test/ELF/common.s
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/common.s -o %t2
 // RUN: ld.lld %t %t2 -o %t3
-// RUN: llvm-readobj -t -s %t3 | FileCheck %s
+// RUN: llvm-readobj --symbols -S %t3 | FileCheck %s
 
 // CHECK:      Name: .bss
 // CHECK-NEXT: Type: SHT_NOBITS
diff --git a/deps/lld/test/ELF/compress-debug-sections.s b/deps/lld/test/ELF/compress-debug-sections.s
index a7933e130b77940ddd9751ae9c16ff01146f360a..cbc6a9862825f14fe0a5ec85496fbd16d0c898ad 100644
--- a/deps/lld/test/ELF/compress-debug-sections.s
+++ b/deps/lld/test/ELF/compress-debug-sections.s
@@ -7,7 +7,7 @@
 # ZLIBCONTENT:     Contents of section .debug_str:
 # ZLIBCONTENT-NOT: AAAAAAAAA
 
-# RUN: llvm-readobj -s %t1 | FileCheck %s --check-prefix=ZLIBFLAGS
+# RUN: llvm-readobj -S %t1 | FileCheck %s --check-prefix=ZLIBFLAGS
 # ZLIBFLAGS:       Section {
 # ZLIBFLAGS:         Index:
 # ZLIBFLAGS:         Name: .debug_str
@@ -24,7 +24,7 @@
 ## Test alias.
 # RUN: ld.lld %t.o -o %t2 --compress-debug-sections zlib
 # RUN: llvm-objdump -s %t2 | FileCheck %s --check-prefix=ZLIBCONTENT
-# RUN: llvm-readobj -s %t2 | FileCheck %s --check-prefix=ZLIBFLAGS
+# RUN: llvm-readobj -S %t2 | FileCheck %s --check-prefix=ZLIBFLAGS
 
 # RUN: not ld.lld %t.o -o %t1 --compress-debug-sections=zlib-gabi 2>&1 | \
 # RUN:   FileCheck -check-prefix=ERR %s
diff --git a/deps/lld/test/ELF/compressed-debug-conflict.s b/deps/lld/test/ELF/compressed-debug-conflict.s
index e8c24262b7f4106370fc751716805ecfc1fb4f1c..d1113cb312bdf83b5e06284b2bdf583799ef3e2e 100644
--- a/deps/lld/test/ELF/compressed-debug-conflict.s
+++ b/deps/lld/test/ELF/compressed-debug-conflict.s
@@ -1,6 +1,6 @@
 # REQUIRES: x86, zlib
 # RUN: llvm-mc -filetype=obj -triple i686-linux-gnu -compress-debug-sections=zlib %s -o %t.o
-# RUN: llvm-readobj -sections %t.o | FileCheck -check-prefix=OBJ %s
+# RUN: llvm-readobj --sections %t.o | FileCheck -check-prefix=OBJ %s
 # RUN: not ld.lld %t.o %t.o -o /dev/null 2>&1 | FileCheck -check-prefix=ERROR %s
 
 # OBJ:      Sections [
diff --git a/deps/lld/test/ELF/compressed-debug-input.s b/deps/lld/test/ELF/compressed-debug-input.s
index aad8cd02b3b18d17cca9b824b5107596af5cc696..32991a8e4052f4ed8a790562006cbffced0a55bb 100644
--- a/deps/lld/test/ELF/compressed-debug-input.s
+++ b/deps/lld/test/ELF/compressed-debug-input.s
@@ -1,7 +1,7 @@
 # REQUIRES: zlib, x86
 
 # RUN: llvm-mc -compress-debug-sections=zlib -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: llvm-readobj -sections %t | FileCheck -check-prefix=ZLIB %s
+# RUN: llvm-readobj --sections %t | FileCheck -check-prefix=ZLIB %s
 # ZLIB:      Section {
 # ZLIB:        Index: 2
 # ZLIB:        Name: .debug_str
@@ -16,12 +16,12 @@
 # ZLIB-NEXT:   Size:
 # ZLIB-NEXT:   Link:
 # ZLIB-NEXT:   Info:
-# ZLIB-NEXT:   AddressAlignment: 1
+# ZLIB-NEXT:   AddressAlignment: 8
 # ZLIB-NEXT:   EntrySize: 1
 # ZLIB-NEXT: }
 
 # RUN: llvm-mc -compress-debug-sections=zlib-gnu -filetype=obj -triple=x86_64-unknown-linux %s -o %t2
-# RUN: llvm-readobj -sections %t2 | FileCheck -check-prefix=GNU %s
+# RUN: llvm-readobj --sections %t2 | FileCheck -check-prefix=GNU %s
 # GNU:      Section {
 # GNU:        Index: 2
 # GNU:        Name: .zdebug_str
@@ -40,10 +40,10 @@
 # GNU-NEXT: }
 
 # RUN: ld.lld --hash-style=sysv %t -o %t.so -shared
-# RUN: llvm-readobj -sections -section-data %t.so | FileCheck -check-prefix=DATA %s
+# RUN: llvm-readobj --sections --section-data %t.so | FileCheck -check-prefix=DATA %s
 
 # RUN: ld.lld --hash-style=sysv %t2 -o %t2.so -shared
-# RUN: llvm-readobj -sections -section-data %t2.so | FileCheck -check-prefix=DATA %s
+# RUN: llvm-readobj --sections --section-data %t2.so | FileCheck -check-prefix=DATA %s
 
 # DATA:      Section {
 # DATA:        Index: 6
diff --git a/deps/lld/test/ELF/compressed-input-alignment.test b/deps/lld/test/ELF/compressed-input-alignment.test
new file mode 100644
index 0000000000000000000000000000000000000000..fd71bf361e2521d901735877e64ceb6d424dde58
--- /dev/null
+++ b/deps/lld/test/ELF/compressed-input-alignment.test
@@ -0,0 +1,67 @@
+# REQUIRES: zlib, x86
+
+# RUN: yaml2obj -docnum=1 %s -o %t.o
+# RUN: ld.lld %t.o %t.o -o %t2
+# RUN: llvm-readobj --sections --section-data %t2 | FileCheck %s
+
+# RUN: yaml2obj -docnum=2 %s -o %t.o
+# RUN: ld.lld %t.o %t.o -o %t2
+# RUN: llvm-readobj --sections --section-data %t2 | FileCheck %s
+
+# CHECK:        Name: .debug_info
+# CHECK-NEXT:   Type: SHT_PROGBITS
+# CHECK-NEXT:   Flags [
+# CHECK-NEXT:   ]
+# CHECK-NEXT:   Address: 0x0
+# CHECK-NEXT:   Offset: 0xE8
+# CHECK-NEXT:   Size: 108
+# CHECK-NEXT:   Link: 0
+# CHECK-NEXT:   Info: 0
+# CHECK-NEXT:   AddressAlignment: 1
+# CHECK-NEXT:   EntrySize: 0
+# CHECK-NEXT:   SectionData (
+# CHECK-NEXT:     0000: {{.*}} |ABCDEFGHIJKLMNOP|
+# CHECK-NEXT:     0010: {{.*}} |QRSTUVWXYZ.ABCDE|
+# CHECK-NEXT:     0020: {{.*}} |FGHIJKLMNOPQRSTU|
+# CHECK-NEXT:     0030: {{.*}} |VWXYZ.ABCDEFGHIJ|
+# CHECK-NEXT:     0040: {{.*}} |KLMNOPQRSTUVWXYZ|
+# CHECK-NEXT:     0050: {{.*}} |.ABCDEFGHIJKLMNO|
+# CHECK-NEXT:     0060: {{.*}} |PQRSTUVWXYZ.|
+# CHECK-NEXT:   )
+# CHECK-NEXT: }
+
+## YAML below is produced from the following code. AddressAlign of .debug_info is 8,
+## while compressed header has ch_addralign = 1. LLD had a bug and did not use the
+## value of ch_addralign at all. We produced broken section content.
+##
+## .section .debug_info,"",@progbits
+##  .string "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+##  .string "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+
+--- !ELF
+FileHeader:      
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_REL
+  Machine:         EM_X86_64
+Sections:
+  - Name:            .debug_info
+    Type:            SHT_PROGBITS
+    Flags:           [ SHF_COMPRESSED ]
+    AddressAlign:    0x0000000000000008
+    Content:         010000000000000036000000000000000100000000000000789C73747276717573F7F0F4F2F6F1F5F30F080C0A0E090D0B8F888C6270C42D0500ADA00FBF
+
+## YAML below is the same as above, with a single change: ch_addralign field of the compressed
+## header was set to 0. This is allowed by the standard, we have to support it.
+--- !ELF
+FileHeader:      
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_REL
+  Machine:         EM_X86_64
+Sections:
+  - Name:            .debug_info
+    Type:            SHT_PROGBITS
+    Flags:           [ SHF_COMPRESSED ]
+    AddressAlign:    0x0000000000000008
+    Content:         010000000000000036000000000000000000000000000000789C73747276717573F7F0F4F2F6F1F5F30F080C0A0E090D0B8F888C6270C42D0500ADA00FBF
diff --git a/deps/lld/test/ELF/copy-rel-pie.s b/deps/lld/test/ELF/copy-rel-pie.s
index 9bf91595db129a37f0db6d50ff0a3673d9a342e8..4a485e5b3c4f26b098c39807a610a6ee89241f4b 100644
--- a/deps/lld/test/ELF/copy-rel-pie.s
+++ b/deps/lld/test/ELF/copy-rel-pie.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc %p/Inputs/copy-rel-pie.s -o %t2.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t2.o -o %t2.so -shared
 // RUN: ld.lld --hash-style=sysv %t.o %t2.so -o %t.exe -pie
-// RUN: llvm-readobj -s -r %t.exe | FileCheck %s
+// RUN: llvm-readobj -S -r %t.exe | FileCheck %s
 // RUN: llvm-objdump -d %t.exe | FileCheck --check-prefix=DISASM %s
 
 .global _start
@@ -27,21 +27,22 @@ _start:
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x4000
+// CHECK-NEXT: Address: 0x3020
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section (4) .rela.dyn {
-// CHECK-NEXT:     0x4000 R_X86_64_COPY foo 0x0
+// CHECK-NEXT:     0x3020 R_X86_64_COPY foo 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Section (5) .rela.plt {
-// CHECK-NEXT:     0x2018 R_X86_64_JUMP_SLOT bar 0x0
+// CHECK-NEXT:     0x3018 R_X86_64_JUMP_SLOT bar 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
 // (0x1010 + 0x10) - 0x1005 = 27
-// 0x4000          - 0x100a = 12278
+// 0x3020          - 0x100a = 8214
 
 // DISASM:      Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: _start:
 // DISASM-NEXT:     1000:       e8 1b 00 00 00  callq   27
-// DISASM-NEXT:     1005:       e8 f6 2f 00 00  callq   12278 <foo>
+// DISASM-NEXT:     1005:       e8 16 20 00 00  callq   8214 <foo>
diff --git a/deps/lld/test/ELF/copy-rel-version.s b/deps/lld/test/ELF/copy-rel-version.s
index 29fae8ecbb057f9ad5c1317e76c58ec01e029a94..afa5ebeb6e4daf7ab0893687cb0a662d1ce8b33a 100644
--- a/deps/lld/test/ELF/copy-rel-version.s
+++ b/deps/lld/test/ELF/copy-rel-version.s
@@ -4,7 +4,7 @@
 // RUN: echo "v1 {}; v2 {};" > %t.ver
 // RUN: ld.lld %t1.o -shared -soname t1.so --version-script=%t.ver -o %t1.so
 // RUN: ld.lld %t.o %t1.so -o %t
-// RUN: llvm-readobj -t %t | FileCheck %s
+// RUN: llvm-readobj --symbols %t | FileCheck %s
 
 .global _start
 _start:
diff --git a/deps/lld/test/ELF/copy-relocation-zero-abs-addr.s b/deps/lld/test/ELF/copy-relocation-zero-abs-addr.s
index fae963e9bd9e1719641f3cd3cdeb12b0fd127ffc..c0b7abd8eeecae4fc53e6dc0e05c1badd9503d45 100644
--- a/deps/lld/test/ELF/copy-relocation-zero-abs-addr.s
+++ b/deps/lld/test/ELF/copy-relocation-zero-abs-addr.s
@@ -3,8 +3,8 @@
 // RUN: ld.lld -shared -o %t2.so %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t3.o
 // RUN: ld.lld %t2.so %t3.o -o %t4
-// RUN: llvm-readobj -symbols %t2.so | FileCheck -check-prefix=ABSADDR %s
-// RUN: llvm-readobj -s -r --expand-relocs %t4 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2.so | FileCheck -check-prefix=ABSADDR %s
+// RUN: llvm-readobj -S -r --expand-relocs %t4 | FileCheck %s
 
 // This tests that symbols with absolute addresses are properly
 // handled. Normal DSO symbols are handled as usual.
diff --git a/deps/lld/test/ELF/debug-gnu-pubnames.s b/deps/lld/test/ELF/debug-gnu-pubnames.s
index aebfdfd0fb91c445962645f92ce509e6823e1934..11244e7643dc84a43cd6ddbfca265301c9f2ae40 100644
--- a/deps/lld/test/ELF/debug-gnu-pubnames.s
+++ b/deps/lld/test/ELF/debug-gnu-pubnames.s
@@ -2,12 +2,12 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 
 # RUN: ld.lld %t.o -o %t1.exe
-# RUN: llvm-readobj -sections %t1.exe | FileCheck %s
+# RUN: llvm-readobj --sections %t1.exe | FileCheck %s
 # CHECK: .debug_gnu_pubnames
 # CHECK: .debug_gnu_pubtypes
 
 # RUN: ld.lld -gdb-index %t.o -o %t2.exe
-# RUN: llvm-readobj -sections %t2.exe | FileCheck %s --check-prefix=GDB
+# RUN: llvm-readobj --sections %t2.exe | FileCheck %s --check-prefix=GDB
 # GDB-NOT: .debug_gnu_pubnames
 # GDB-NOT: .debug_gnu_pubtypes
 
diff --git a/deps/lld/test/ELF/debug-line-obj.s b/deps/lld/test/ELF/debug-line-obj.s
new file mode 100644
index 0000000000000000000000000000000000000000..020678bb6319764bd50c69719aff0490caf57549
--- /dev/null
+++ b/deps/lld/test/ELF/debug-line-obj.s
@@ -0,0 +1,175 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux -dwarf-version=5 %s -o %t.o
+# RUN: not ld.lld %t.o -o %t1 2>&1 | FileCheck %s
+
+# When compiling with -ffunction-sections, .debug_line may contain descriptions
+# of locations from the different text sections. Until relocated such
+# descriptions might contain overlapping offsets. Check LLD is able to report
+# the error locations correctly in this case.
+
+# CHECK:      error: undefined symbol: foo()
+# CHECK-NEXT: >>> referenced by test.cpp:2
+# CHECK-NEXT: >>>               {{.*}}.o:(bar())
+# CHECK-NEXT: >>> referenced by test.cpp:3
+# CHECK-NEXT: >>>               {{.*}}.o:(baz())
+
+# The code below is the reduced version of the output
+# from the following invocation and source:
+#
+# // test.cpp:
+# int foo();
+# int bar() { return foo(); }
+# int baz() { return foo(); }
+#
+# clang -gdwarf-5 -ffunction-sections test.cpp -o test.s -S
+
+.text
+.file  "test.cpp"
+.section  .text._Z3barv,"ax",@progbits
+.globl  _Z3barv
+.type  _Z3barv,@function
+_Z3barv:
+.Lfunc_begin0:
+  .file  0 "/path" "test.cpp" md5 0x9ff11a8404ab4d032ee2dd4f5f8c4140
+  .loc  0 2 0                   # test.cpp:2:0
+  .loc  0 2 20 prologue_end     # test.cpp:2:20
+  callq  _Z3foov
+  .loc  0 2 13 is_stmt 0        # test.cpp:2:13
+.Lfunc_end0:
+.size  _Z3barv, .Lfunc_end0-_Z3barv
+                                        # -- End function
+.section  .text._Z3bazv,"ax",@progbits
+.globl  _Z3bazv                 # -- Begin function _Z3bazv
+  .type  _Z3bazv,@function
+_Z3bazv:                                # @_Z3bazv
+.Lfunc_begin1:
+  .loc  0 3 0 is_stmt 1         # test.cpp:3:0
+  .loc  0 3 20 prologue_end     # test.cpp:3:20
+  callq  _Z3foov
+  .loc  0 3 13 is_stmt 0        # test.cpp:3:13
+.Lfunc_end1:
+  .size  _Z3bazv, .Lfunc_end1-_Z3bazv
+
+.section  .debug_str,"MS",@progbits,1
+.Linfo_string0:
+  .asciz  "stub"
+
+.section  .debug_str_offsets,"",@progbits
+  .long  8
+  .short  5
+  .short  0
+.Lstr_offsets_base0:
+  .long  .Linfo_string0
+
+.section  .debug_abbrev,"",@progbits
+  .byte  1                       # Abbreviation Code
+  .byte  17                      # DW_TAG_compile_unit
+  .byte  1                       # DW_CHILDREN_yes
+  .byte  37                      # DW_AT_producer
+  .byte  37                      # DW_FORM_strx1
+  .byte  19                      # DW_AT_language
+  .byte  5                       # DW_FORM_data2
+  .byte  3                       # DW_AT_name
+  .byte  37                      # DW_FORM_strx1
+  .byte  114                     # DW_AT_str_offsets_base
+  .byte  23                      # DW_FORM_sec_offset
+  .byte  16                      # DW_AT_stmt_list
+  .byte  23                      # DW_FORM_sec_offset
+  .byte  27                      # DW_AT_comp_dir
+  .byte  37                      # DW_FORM_strx1
+  .byte  115                     # DW_AT_addr_base
+  .byte  23                      # DW_FORM_sec_offset
+  .byte  17                      # DW_AT_low_pc
+  .byte  1                       # DW_FORM_addr
+  .byte  85                      # DW_AT_ranges
+  .byte  35                      # DW_FORM_rnglistx
+  .byte  116                     # DW_AT_rnglists_base
+  .byte  23                      # DW_FORM_sec_offset
+  .byte  0                       # EOM(1)
+  .byte  0                       # EOM(2)
+  .byte  2                       # Abbreviation Code
+  .byte  46                      # DW_TAG_subprogram
+  .byte  0                       # DW_CHILDREN_no
+  .byte  17                      # DW_AT_low_pc
+  .byte  27                      # DW_FORM_addrx
+  .byte  18                      # DW_AT_high_pc
+  .byte  6                       # DW_FORM_data4
+  .byte  64                      # DW_AT_frame_base
+  .byte  24                      # DW_FORM_exprloc
+  .byte  110                     # DW_AT_linkage_name
+  .byte  37                      # DW_FORM_strx1
+  .byte  3                       # DW_AT_name
+  .byte  37                      # DW_FORM_strx1
+  .byte  58                      # DW_AT_decl_file
+  .byte  11                      # DW_FORM_data1
+  .byte  59                      # DW_AT_decl_line
+  .byte  11                      # DW_FORM_data1
+  .byte  73                      # DW_AT_type
+  .byte  19                      # DW_FORM_ref4
+  .byte  63                      # DW_AT_external
+  .byte  25                      # DW_FORM_flag_present
+  .byte  0                       # EOM(1)
+  .byte  0                       # EOM(2)
+  .byte  3                       # Abbreviation Code
+  .byte  36                      # DW_TAG_base_type
+  .byte  0                       # DW_CHILDREN_no
+  .byte  3                       # DW_AT_name
+  .byte  37                      # DW_FORM_strx1
+  .byte  62                      # DW_AT_encoding
+  .byte  11                      # DW_FORM_data1
+  .byte  11                      # DW_AT_byte_size
+  .byte  11                      # DW_FORM_data1
+  .byte  0                       # EOM(1)
+  .byte  0                       # EOM(2)
+  .byte  0                       # EOM(3)
+ 
+.section  .debug_info,"",@progbits
+.Lcu_begin0:
+  .long  .Ldebug_info_end0-.Ldebug_info_start0 # Length of Unit
+.Ldebug_info_start0:
+  .short  5                       # DWARF version number
+  .byte  1                       # DWARF Unit Type
+  .byte  8                       # Address Size (in bytes)
+  .long  .debug_abbrev           # Offset Into Abbrev. Section
+  .byte  1                       # Abbrev [1] 0xc:0x44 DW_TAG_compile_unit
+  .byte  0                       # DW_AT_producer
+  .short  4                       # DW_AT_language
+  .byte  0                       # DW_AT_name
+  .long  .Lstr_offsets_base0     # DW_AT_str_offsets_base
+  .long  .Lline_table_start0     # DW_AT_stmt_list
+  .byte  2                       # DW_AT_comp_dir
+  .long  0      # DW_AT_addr_base
+  .quad  0                       # DW_AT_low_pc
+  .byte  0                       # DW_AT_ranges
+  .long  0  # DW_AT_rnglists_base
+  .byte  2                       # Abbrev [2] 0x2b:0x10 DW_TAG_subprogram
+  .byte  0                       # DW_AT_low_pc
+  .long  .Lfunc_end0-.Lfunc_begin0 # DW_AT_high_pc
+  .byte  1                       # DW_AT_frame_base
+  .byte  86
+  .byte  3                       # DW_AT_linkage_name
+  .byte  0                       # DW_AT_name
+  .byte  1                       # DW_AT_decl_file
+  .byte  2                       # DW_AT_decl_line
+  .long  75                      # DW_AT_type
+                                        # DW_AT_external
+  .byte  2                       # Abbrev [2] 0x3b:0x10 DW_TAG_subprogram
+  .byte  1                       # DW_AT_low_pc
+  .long  .Lfunc_end1-.Lfunc_begin1 # DW_AT_high_pc
+  .byte  1                       # DW_AT_frame_base
+  .byte  86
+  .byte  6                       # DW_AT_linkage_name
+  .byte  0                       # DW_AT_name
+  .byte  1                       # DW_AT_decl_file
+  .byte  3                       # DW_AT_decl_line
+  .long  75                      # DW_AT_type
+                                        # DW_AT_external
+  .byte  3                       # Abbrev [3] 0x4b:0x4 DW_TAG_base_type
+  .byte  0                       # DW_AT_name
+  .byte  5                       # DW_AT_encoding
+  .byte  4                       # DW_AT_byte_size
+  .byte  0                       # End Of Children Mark
+.Ldebug_info_end0:
+
+.section  .debug_line,"",@progbits
+.Lline_table_start0:
diff --git a/deps/lld/test/ELF/debug-line-str.s b/deps/lld/test/ELF/debug-line-str.s
index e23b5c87929170fa09abf9d0b404abfab2299019..af5eee4f5abd219e074490afa9c0fa3812ae436e 100644
--- a/deps/lld/test/ELF/debug-line-str.s
+++ b/deps/lld/test/ELF/debug-line-str.s
@@ -27,8 +27,7 @@
 main:
 .Lfunc_begin0:
  .file 0 "/home/path" "test.cpp" md5 0x8ed32099ab837bd13543fd3e8102739f
- .file 1 "test.cpp" md5 0x8ed32099ab837bd13543fd3e8102739f
- .loc 1 3 10 prologue_end
+ .loc 0 3 10 prologue_end
  jmp _Z3foov
 .Lfunc_end0:
 
diff --git a/deps/lld/test/ELF/debug-relocation-none.test b/deps/lld/test/ELF/debug-relocation-none.test
index d22941db222024a6b6b5808d01fd15f6607b22be..6a8cc5d30f6736a3e9a851bbad5f42386e86e29d 100644
--- a/deps/lld/test/ELF/debug-relocation-none.test
+++ b/deps/lld/test/ELF/debug-relocation-none.test
@@ -52,7 +52,8 @@ Sections:
     Content:         '0111001017000000'
 
 Symbols:
-  Global:
-    - Name:            _start
-      Section:         .text
-    - Name:            bar
+  - Name:            _start
+    Section:         .text
+    Binding:         STB_GLOBAL
+  - Name:            bar
+    Binding:         STB_GLOBAL
diff --git a/deps/lld/test/ELF/defsym-reserved-syms.s b/deps/lld/test/ELF/defsym-reserved-syms.s
index fdab00fed66b8f28f653d7ad09bfc4feb39820a6..b71ca28fdbb5b6c30fa2b0d4bc56e910a73f449f 100644
--- a/deps/lld/test/ELF/defsym-reserved-syms.s
+++ b/deps/lld/test/ELF/defsym-reserved-syms.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -o %t %t.o --defsym=foo2=etext
-# RUN: llvm-readobj -t -s %t | FileCheck %s
+# RUN: llvm-readobj --symbols -S %t | FileCheck %s
 
 ## Check 'foo2' value is equal to value of 'etext'.
 # CHECK:     Symbol {
@@ -14,7 +14,7 @@
 ## Check 'foo2' value set correctly when using
 ## reserved symbol 'etext' in expression.
 # RUN: ld.lld -o %t %t.o --defsym=foo2=etext+2
-# RUN: llvm-readobj -t -s %t | FileCheck %s --check-prefix=EXPR
+# RUN: llvm-readobj --symbols -S %t | FileCheck %s --check-prefix=EXPR
 # EXPR:     Symbol {
 # EXPR:      Name: foo2
 # EXPR-NEXT:  Value: 0x201007
diff --git a/deps/lld/test/ELF/defsym.s b/deps/lld/test/ELF/defsym.s
index 598ecd51681fa949c4e742e8b32be82a5b7c3957..380b7f37aefc647d39cd4a893c806e9aa9fa7097 100644
--- a/deps/lld/test/ELF/defsym.s
+++ b/deps/lld/test/ELF/defsym.s
@@ -1,12 +1,12 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -o %t %t.o --defsym=foo2=foo1
-# RUN: llvm-readobj -t -s %t | FileCheck %s
+# RUN: llvm-readobj --symbols -S %t | FileCheck %s
 # RUN: llvm-objdump -d -print-imm-hex %t | FileCheck %s --check-prefix=USE
 
 ## Check that we accept --defsym foo2=foo1 form.
 # RUN: ld.lld -o %t2 %t.o --defsym foo2=foo1
-# RUN: llvm-readobj -t -s %t2 | FileCheck %s
+# RUN: llvm-readobj --symbols -S %t2 | FileCheck %s
 # RUN: llvm-objdump -d -print-imm-hex %t2 | FileCheck %s --check-prefix=USE
 
 ## Check we are reporting the error correctly and don't crash
@@ -36,11 +36,12 @@
 
 ## Check we can use foo2 and it that it is an alias for foo1.
 # USE:       Disassembly of section .text:
+# USE-EMPTY:
 # USE-NEXT:  _start:
 # USE-NEXT:    movl $0x123, %edx
 
 # RUN: ld.lld -o %t %t.o --defsym=foo2=1
-# RUN: llvm-readobj -t -s %t | FileCheck %s --check-prefix=ABS
+# RUN: llvm-readobj --symbols -S %t | FileCheck %s --check-prefix=ABS
 
 # ABS:      Symbol {
 # ABS:        Name: foo2
@@ -53,7 +54,7 @@
 # ABS-NEXT: }
 
 # RUN: ld.lld -o %t %t.o --defsym=foo2=foo1+5
-# RUN: llvm-readobj -t -s %t | FileCheck %s --check-prefix=EXPR
+# RUN: llvm-readobj --symbols -S %t | FileCheck %s --check-prefix=EXPR
 
 # EXPR:      Symbol {
 # EXPR:        Name: foo1
diff --git a/deps/lld/test/ELF/deplibs-colon-prefix.s b/deps/lld/test/ELF/deplibs-colon-prefix.s
new file mode 100644
index 0000000000000000000000000000000000000000..6f480717b5b2c208defe4a01dc01c750145e8459
--- /dev/null
+++ b/deps/lld/test/ELF/deplibs-colon-prefix.s
@@ -0,0 +1,15 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/deplibs-lib_foo.s -o %tfoo.o
+# RUN: rm -rf %t.dir
+# RUN: mkdir -p %t.dir
+# RUN: llvm-ar rc %t.dir/foo.a %tfoo.o
+# RUN: not ld.lld %t.o -o /dev/null -L %t.dir 2>&1 | FileCheck %s -DOBJ=%t.o
+# CHECK: error: [[OBJ]]: unable to find library from dependent library specifier: :foo.a
+
+        .global _start
+_start:
+        call foo
+    .section ".deplibs","MS",@llvm_dependent_libraries,1
+        .asciz  ":foo.a"
diff --git a/deps/lld/test/ELF/deplibs-corrupt.s b/deps/lld/test/ELF/deplibs-corrupt.s
new file mode 100644
index 0000000000000000000000000000000000000000..b17987f1479675affea63c681b233ae9bf857978
--- /dev/null
+++ b/deps/lld/test/ELF/deplibs-corrupt.s
@@ -0,0 +1,8 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: not ld.lld %t.o -o /dev/null -L %t.dir 2>&1 | FileCheck %s -DOBJ=%t.o
+# CHECK: error: [[OBJ]]: corrupted dependent libraries section (unterminated string): .deplibs
+
+.section ".deplibs","MS",@llvm_dependent_libraries,1
+    .ascii  ":foo.a"
diff --git a/deps/lld/test/ELF/deplibs.s b/deps/lld/test/ELF/deplibs.s
new file mode 100644
index 0000000000000000000000000000000000000000..a0023163e82110de448ae1d3a113c688445e0f95
--- /dev/null
+++ b/deps/lld/test/ELF/deplibs.s
@@ -0,0 +1,56 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/deplibs-lib_foo.s -o %tfoo.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/deplibs-lib_bar.s -o %tbar.o
+# RUN: rm -rf %t.dir %t.cwd
+# RUN: mkdir -p %t.dir
+
+# error if dependent libraries cannot be found
+# RUN: not ld.lld %t.o -o /dev/null 2>&1 | FileCheck %s -DOBJ=%t.o --check-prefix MISSING
+# MISSING: error: [[OBJ]]: unable to find library from dependent library specifier: foo.a
+# MISSING-NEXT: error: [[OBJ]]: unable to find library from dependent library specifier: bar
+
+# can ignore dependent libraries
+# RUN: not ld.lld %t.o -o /dev/null --no-dependent-libraries 2>&1 | FileCheck %s --check-prefix IGNORE
+# IGNORE: error: undefined symbol: foo
+# IGNORE: error: undefined symbol: bar
+
+# -r links preserve dependent libraries
+# RUN: ld.lld %t.o %t.o -r -o %t-r.o
+# RUN: not ld.lld %t-r.o -o /dev/null 2>&1 | sort | FileCheck %s -DOBJ=%t-r.o --check-prefixes MINUSR
+# MINUSR: error: [[OBJ]]: unable to find library from dependent library specifier: bar
+# MINUSR-NEXT: error: [[OBJ]]: unable to find library from dependent library specifier: foo.a
+# MINUSR-NOT: unable to find library from dependent library specifier
+
+# static archives located relative to library search paths
+# RUN: llvm-ar rc %t.dir/foo.a %tfoo.o
+# RUN: llvm-ar rc %t.dir/libbar.a %tbar.o
+# RUN: ld.lld %t.o -o /dev/null -L %t.dir
+
+# shared objects located relative to library search paths
+# RUN: rm %t.dir/libbar.a
+# RUN: ld.lld -shared -o %t.dir/libbar.so %tbar.o
+# RUN: ld.lld -Bdynamic %t.o -o /dev/null -L %t.dir
+
+# dependent libraries searched for symbols after libraries on the command line
+# RUN: mkdir -p %t.cwd
+# RUN: cd %t.cwd
+# RUN: cp %t.dir/foo.a %t.cwd/libcmdline.a
+# RUN: ld.lld %t.o libcmdline.a -o /dev/null -L %t.dir --trace 2>&1 | FileCheck %s -DOBJ=%t.o -DSO=%t.dir --check-prefix CMDLINE --implicit-check-not foo.a
+# CMDLINE: [[OBJ]]
+# CMDLINE-NEXT: {{^libcmdline\.a}}
+# CMDLINE-NEXT: [[SO]]{{[\\/]}}libbar.so
+
+# libraries can be found from specifiers as if the specifiers were listed on on the command-line.
+# RUN: cp %t.dir/foo.a %t.cwd/foo.a
+# RUN: ld.lld %t.o -o /dev/null -L %t.dir --trace 2>&1 | FileCheck %s -DOBJ=%t.o -DSO=%t.dir --check-prefix ASIFCMDLINE --implicit-check-not foo.a
+# ASIFCMDLINE: [[OBJ]]
+# ASIFCMDLINE-NEXT: {{^foo\.a}}
+# ASIFCMDLINE-NEXT: [[SO]]{{[\\/]}}libbar.so
+
+    call foo
+    call bar
+.section ".deplibs","MS",@llvm_dependent_libraries,1
+    .asciz  "foo.a"
+    .asciz  "bar"
diff --git a/deps/lld/test/ELF/discard-locals.s b/deps/lld/test/ELF/discard-locals.s
index 50cf5a04e985b8b48da6029bc22129b0cecfeac9..bee47fa28bdf299808e4c0ba166b6e2daff0b47d 100644
--- a/deps/lld/test/ELF/discard-locals.s
+++ b/deps/lld/test/ELF/discard-locals.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux -save-temp-labels %s -o %t
 // RUN: ld.lld -discard-locals %t -o %t2
-// RUN: llvm-readobj -s -sd -t %t2 | FileCheck %s
+// RUN: llvm-readobj -S --section-data --symbols %t2 | FileCheck %s
 
 .global _start
 _start:
diff --git a/deps/lld/test/ELF/discard-merge-locals.s b/deps/lld/test/ELF/discard-merge-locals.s
index 20be35c6e4e8082c25010bc5f1b1b535b5190bfa..80e7670d28b19732c8be793efc80100c286ac1ba 100644
--- a/deps/lld/test/ELF/discard-merge-locals.s
+++ b/deps/lld/test/ELF/discard-merge-locals.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: ld.lld %t -o %t2 -shared
-// RUN: llvm-readobj -t %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
 	leaq	.L.str(%rip), %rdi
 
diff --git a/deps/lld/test/ELF/discard-merge-unnamed.s b/deps/lld/test/ELF/discard-merge-unnamed.s
index be174f27b50b6d2235ec5eb8aa784a2fc0c91c1a..f2cbe187e02b2417ed9771deed20b7c007d30215 100644
--- a/deps/lld/test/ELF/discard-merge-unnamed.s
+++ b/deps/lld/test/ELF/discard-merge-unnamed.s
@@ -1,5 +1,5 @@
 // RUN: ld.lld %p/Inputs/discard-merge-unnamed.o -o %t2 -shared
-// RUN: llvm-readobj -t %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
 // Test that the unnamed symbol is SHF_MERGE is omitted.
 
diff --git a/deps/lld/test/ELF/discard-none.s b/deps/lld/test/ELF/discard-none.s
index 4a42639c63f1b3a5cdc73c687788968be181281d..fb5b66a5e977d273ca228b79038bd8b84d95b059 100644
--- a/deps/lld/test/ELF/discard-none.s
+++ b/deps/lld/test/ELF/discard-none.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux -save-temp-labels %s -o %t
 // RUN: ld.lld -discard-none -shared %t -o %t2
-// RUN: llvm-readobj -s -sd -t %t2 | FileCheck %s
+// RUN: llvm-readobj -S --section-data --symbols %t2 | FileCheck %s
 
 .text
 .Lmyvar:
diff --git a/deps/lld/test/ELF/driver.test b/deps/lld/test/ELF/driver.test
index 585800a3b0b5401ffe900b73564c2bb4811f8fa0..77f9828a0357eb324797e19f07d49a4551a6a5c4 100644
--- a/deps/lld/test/ELF/driver.test
+++ b/deps/lld/test/ELF/driver.test
@@ -1,10 +1,10 @@
 # REQUIRES: x86
 
-# RUN: not ld.lld --unknown1 --unknown2 -m foo /no/such/file -lnosuchlib \
+# RUN: not ld.lld --unknown1 --unkn=own2 -m foo /no/such/file -lnosuchlib \
 # RUN:   2>&1 | FileCheck -check-prefix=UNKNOWN %s
 
-# UNKNOWN: unknown argument: --unknown1
-# UNKNOWN: unknown argument: --unknown2
+# UNKNOWN: unknown argument '--unknown1'
+# UNKNOWN: unknown argument '--unkn=own2'
 # UNKNOWN: unknown emulation: foo
 # UNKNOWN: cannot open /no/such/file
 # UNKNOWN: unable to find library -lnosuchlib
@@ -22,6 +22,9 @@
 # RUN: not ld.lld -v xyz 2>&1 | FileCheck -check-prefix=VERSION %s
 # VERSION: LLD {{.*}} (compatible with GNU linkers)
 
+# RUN: not ld.lld --versin 2>&1 | FileCheck -check-prefix=SPELLVERSION %s
+# SPELLVERSION: unknown argument '--versin', did you mean '--version'
+
 ## Attempt to link DSO with -r
 # RUN: ld.lld -shared %t -o %t.so
 # RUN: not ld.lld -r %t.so %t -o %tfail 2>&1 | FileCheck -check-prefix=ERR %s
@@ -60,6 +63,7 @@
 # ERR9: cannot open output file utput=/no/such/file
 
 # RUN: not ld.lld %t -z foo 2>&1 | FileCheck -check-prefix=ERR10 %s
+# RUN: not ld.lld %t -z foo --version 2>&1 | FileCheck -check-prefix=ERR10 %s
 # ERR10: unknown -z value: foo
 
 ## Check we report "unknown -z value" error even with -v.
diff --git a/deps/lld/test/ELF/dso-undef-size.s b/deps/lld/test/ELF/dso-undef-size.s
index 5a235565bbc90a26a2215444cff72a6e788f1edb..2e2aa0b5fa46d43712a63feab515ddba25522452 100644
--- a/deps/lld/test/ELF/dso-undef-size.s
+++ b/deps/lld/test/ELF/dso-undef-size.s
@@ -3,7 +3,7 @@
 # RUN: ld.lld -shared %t1.o -o %t1.so
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t2.o
 # RUN: ld.lld -shared %t2.o %t1.so -o %t2.so
-# RUN: llvm-readobj -symbols -dyn-symbols %t2.so
+# RUN: llvm-readobj --symbols --dyn-syms %t2.so
 
 # CHECK:      Symbols [
 # CHECK-NEXT:   Symbol {
diff --git a/deps/lld/test/ELF/dso_handle.s b/deps/lld/test/ELF/dso_handle.s
index 99e2594ef814cbf5391d0592c134eaf623ecc385..9d212c352f53b61439bb6c3eeac8a00dc05db0dd 100644
--- a/deps/lld/test/ELF/dso_handle.s
+++ b/deps/lld/test/ELF/dso_handle.s
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld -shared %t.o -o %t
-# RUN: llvm-readobj -symbols %t | FileCheck %s
+# RUN: llvm-readobj --symbols %t | FileCheck %s
 # CHECK:    Name: __dso_handle
 # CHECK-NEXT:    Value: 0x0
 # CHECK-NEXT:    Size: 0
diff --git a/deps/lld/test/ELF/dt_flags.s b/deps/lld/test/ELF/dt_flags.s
index 5f6addd0780ac0c67b5a6f625840d0346532c181..18470f940d06d52352c99c62821c37340b6010b8 100644
--- a/deps/lld/test/ELF/dt_flags.s
+++ b/deps/lld/test/ELF/dt_flags.s
@@ -5,13 +5,13 @@
 
 # RUN: ld.lld -z global -z initfirst -z interpose -z now -z nodefaultlib \
 # RUN:   -z nodelete -z nodlopen -z origin -Bsymbolic %t %t.so -o %t1
-# RUN: llvm-readobj -dynamic-table %t1 | FileCheck -check-prefix=FLAGS %s
+# RUN: llvm-readobj --dynamic-table %t1 | FileCheck -check-prefix=FLAGS %s
 
 # RUN: ld.lld %t %t.so -o %t2
-# RUN: llvm-readobj -dynamic-table %t2 | FileCheck %s
+# RUN: llvm-readobj --dynamic-table %t2 | FileCheck %s
 
 # RUN: ld.lld -z lazy %t %t.so -o %t2
-# RUN: llvm-readobj -dynamic-table %t2 | FileCheck %s
+# RUN: llvm-readobj --dynamic-table %t2 | FileCheck %s
 
 # FLAGS: DynamicSection [
 # FLAGS:   0x000000000000001E FLAGS ORIGIN SYMBOLIC BIND_NOW
diff --git a/deps/lld/test/ELF/dt_tags.s b/deps/lld/test/ELF/dt_tags.s
index f2759d6ef204421ae5857664e6ac37b2178c6d7e..04b348192ce610d9e34c970cffd3d452dbd67cb9 100644
--- a/deps/lld/test/ELF/dt_tags.s
+++ b/deps/lld/test/ELF/dt_tags.s
@@ -3,8 +3,8 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-freebsd %s -o %t
 # RUN: ld.lld -shared %t -o %t.so
 # RUN: ld.lld %t %t.so -o %t.exe
-# RUN: llvm-readobj -dynamic-table %t.so | FileCheck -check-prefix=DSO %s
-# RUN: llvm-readobj -dynamic-table %t.exe | FileCheck -check-prefix=EXE %s
+# RUN: llvm-readobj --dynamic-table %t.so | FileCheck -check-prefix=DSO %s
+# RUN: llvm-readobj --dynamic-table %t.exe | FileCheck -check-prefix=EXE %s
 
 # EXE: DynamicSection [
 # EXE:   0x0000000000000015 DEBUG                0x0
diff --git a/deps/lld/test/ELF/dtrace-r.test b/deps/lld/test/ELF/dtrace-r.test
deleted file mode 100644
index 2b6d885d4c891b4d5601dce14e688ace7063e621..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/dtrace-r.test
+++ /dev/null
@@ -1,8 +0,0 @@
-RUN: ld.lld -r -o %t.o %p/Inputs/dtrace-r.o
-RUN: llvm-readobj -r %t.o | FileCheck %s
-
-CHECK:      Relocations [
-CHECK-NEXT:   Section ({{.*}}) .rela.text {
-CHECK-NEXT:     0x0 R_X86_64_NONE - 0x0
-CHECK-NEXT:   }
-CHECK-NEXT: ]
diff --git a/deps/lld/test/ELF/dynamic-got-rela.s b/deps/lld/test/ELF/dynamic-got-rela.s
index b46afaae0feffb3ada0dde13a0a1ae7bd4c81b83..6899363d9eabcee06996753afcc8847f80b5737d 100644
--- a/deps/lld/test/ELF/dynamic-got-rela.s
+++ b/deps/lld/test/ELF/dynamic-got-rela.s
@@ -1,11 +1,11 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared --apply-dynamic-relocs
-// RUN: llvm-readobj -r -s -l -section-data %t.so | FileCheck -check-prefix CHECK -check-prefix APPLYDYNREL %s
+// RUN: llvm-readobj -r -S -l --section-data %t.so | FileCheck -check-prefix CHECK -check-prefix APPLYDYNREL %s
 // RUN: ld.lld %t.o -o %t2.so -shared
-// RUN: llvm-readobj -r -s -l -section-data %t2.so | FileCheck -check-prefix CHECK -check-prefix NOAPPLYDYNREL %s
+// RUN: llvm-readobj -r -S -l --section-data %t2.so | FileCheck -check-prefix CHECK -check-prefix NOAPPLYDYNREL %s
 // RUN: ld.lld %t.o -o %t2.so -shared --no-apply-dynamic-relocs
-// RUN: llvm-readobj -r -s -l -section-data %t2.so | FileCheck -check-prefix CHECK -check-prefix NOAPPLYDYNREL %s
+// RUN: llvm-readobj -r -S -l --section-data %t2.so | FileCheck -check-prefix CHECK -check-prefix NOAPPLYDYNREL %s
 
 // APPLYDYNREL:      Name: .got
 // APPLYDYNREL-NEXT: Type: SHT_PROGBITS
diff --git a/deps/lld/test/ELF/dynamic-got.s b/deps/lld/test/ELF/dynamic-got.s
index 844e4f48b3f794f1646f2edab0c5fb49450c979f..605e104efee4a512a55e1759776d132deffb0fa8 100644
--- a/deps/lld/test/ELF/dynamic-got.s
+++ b/deps/lld/test/ELF/dynamic-got.s
@@ -1,7 +1,24 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i386-pc-linux %s -o %t.o
 // RUN: ld.lld --hash-style=sysv %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -l -section-data -r %t.so | FileCheck %s
+// RUN: llvm-readobj -S -l --section-data -r %t.so | FileCheck %s
+
+// CHECK:      Name: .got
+// CHECK-NEXT: Type: SHT_PROGBITS
+// CHECK-NEXT: Flags [
+// CHECK-NEXT:   SHF_ALLOC
+// CHECK-NEXT:   SHF_WRITE
+// CHECK-NEXT: ]
+// CHECK-NEXT: Address:
+// CHECK-NEXT: Offset:
+// CHECK-NEXT: Size:
+// CHECK-NEXT: Link:
+// CHECK-NEXT: Info:
+// CHECK-NEXT: AddressAlignment:
+// CHECK-NEXT: EntrySize:
+// CHECK-NEXT: SectionData (
+// CHECK-NEXT:   0000: 00200000
+// CHECK-NEXT: )
 
 // CHECK:     Name: .got.plt
 // CHECK-NEXT:     Type: SHT_PROGBITS
@@ -17,36 +34,19 @@
 // CHECK-NEXT:     AddressAlignment:
 // CHECK-NEXT:     EntrySize:
 // CHECK-NEXT:     SectionData (
-// CHECK-NEXT:       0000: 00300000 00000000 00000000
+// CHECK-NEXT:       0000: 00200000 00000000 00000000
 // CHECK-NEXT:     )
 
-// CHECK:      Name: .got
-// CHECK-NEXT: Type: SHT_PROGBITS
-// CHECK-NEXT: Flags [
-// CHECK-NEXT:   SHF_ALLOC
-// CHECK-NEXT:   SHF_WRITE
-// CHECK-NEXT: ]
-// CHECK-NEXT: Address:
-// CHECK-NEXT: Offset:
-// CHECK-NEXT: Size:
-// CHECK-NEXT: Link:
-// CHECK-NEXT: Info:
-// CHECK-NEXT: AddressAlignment:
-// CHECK-NEXT: EntrySize:
-// CHECK-NEXT: SectionData (
-// CHECK-NEXT:   0000: 00300000
-// CHECK-NEXT: )
-
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rel.dyn {
-// CHECK-NEXT:     0x3050 R_386_RELATIVE - 0x0
+// CHECK-NEXT:     0x2050 R_386_RELATIVE - 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
 // CHECK:      Type: PT_DYNAMIC
-// CHECK-NEXT: Offset: 0x3000
-// CHECK-NEXT: VirtualAddress: 0x3000
-// CHECK-NEXT: PhysicalAddress: 0x3000
+// CHECK-NEXT: Offset: 0x2000
+// CHECK-NEXT: VirtualAddress: 0x2000
+// CHECK-NEXT: PhysicalAddress: 0x2000
 
         calll   .L0$pb
 .L0$pb:
diff --git a/deps/lld/test/ELF/dynamic-list-preempt-replace-symbol.s b/deps/lld/test/ELF/dynamic-list-preempt-replace-symbol.s
new file mode 100644
index 0000000000000000000000000000000000000000..0407477e9753cd704e7afa9cb2c7727a5ef2e764
--- /dev/null
+++ b/deps/lld/test/ELF/dynamic-list-preempt-replace-symbol.s
@@ -0,0 +1,14 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: echo '{ common; };' > %t.list
+# RUN: ld.lld --dynamic-list %t.list -shared %t.o -o %t.so
+
+# RUN: llvm-readobj -r %t.so | FileCheck %s
+
+# CHECK: R_X86_64_GLOB_DAT common 0x0
+
+movq common@gotpcrel(%rip), %rax
+
+.type common,@object
+.comm common,4,4
diff --git a/deps/lld/test/ELF/dynamic-list-preempt.s b/deps/lld/test/ELF/dynamic-list-preempt.s
index daed27a08f0940b8fc443b02778300d4376deef3..024f9302a0081f9cfdef14244b146e73379b35df 100644
--- a/deps/lld/test/ELF/dynamic-list-preempt.s
+++ b/deps/lld/test/ELF/dynamic-list-preempt.s
@@ -5,11 +5,16 @@
 # RUN: echo "{ global: foo; bar; local: *; };" > %t.vers
 # RUN: ld.lld --hash-style=sysv -fatal-warnings -dynamic-list %t.list -version-script %t.vers -shared %t.o -o %t.so
 # RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=RELOCS %s
-# RUN: llvm-readobj -dyn-symbols  %t.so | FileCheck --check-prefix=DYNSYMS %s
+# RUN: llvm-readobj --dyn-syms  %t.so | FileCheck --check-prefix=DYNSYMS %s
+
+# RUN: echo "V1 { global: foo; bar; local: *; };" > %t.vers
+# RUN: ld.lld --hash-style=sysv -fatal-warnings -dynamic-list %t.list -version-script %t.vers -shared %t.o -o %t.so
+# RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=RELOCS %s
+# RUN: llvm-readobj --dyn-syms  %t.so | FileCheck --check-prefix=DYNSYMS %s
 
 # RELOCS:      Relocations [
 # RELOCS-NEXT:   Section ({{.*}}) .rela.plt {
-# RELOCS-NEXT:     R_X86_64_JUMP_SLOT foo 0x0
+# RELOCS-NEXT:     R_X86_64_JUMP_SLOT foo{{.*}} 0x0
 # RELOCS-NEXT:     R_X86_64_JUMP_SLOT ext 0x0
 # RELOCS-NEXT:   }
 # RELOCS-NEXT: ]
diff --git a/deps/lld/test/ELF/dynamic-list-weak-archive.s b/deps/lld/test/ELF/dynamic-list-weak-archive.s
index f7f72afd0c3b87b7f0a20f50c440ae29bcb8876d..627b76db21a19dcc87de1ac6d8d9aac531cc3373 100644
--- a/deps/lld/test/ELF/dynamic-list-weak-archive.s
+++ b/deps/lld/test/ELF/dynamic-list-weak-archive.s
@@ -10,7 +10,7 @@
 
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section ({{.*}}) .rela.plt {
-# CHECK-NEXT:     0x2018 R_X86_64_JUMP_SLOT foo
+# CHECK-NEXT:     0x3018 R_X86_64_JUMP_SLOT foo
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 
diff --git a/deps/lld/test/ELF/dynamic-list-wildcard.s b/deps/lld/test/ELF/dynamic-list-wildcard.s
index 09a78af01a5ac01bea35fce6a94d07d6660aae67..7c140f2d0dc9ecfd00ca458a30a81dc2fe6b4d27 100644
--- a/deps/lld/test/ELF/dynamic-list-wildcard.s
+++ b/deps/lld/test/ELF/dynamic-list-wildcard.s
@@ -4,7 +4,7 @@
 
 # RUN: echo "{ foo1*; };" > %t.list
 # RUN: ld.lld --hash-style=sysv -pie --dynamic-list %t.list %t -o %t.exe
-# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.exe | FileCheck %s
 
 # CHECK:      DynamicSymbols [
 # CHECK-NEXT:   Symbol {
diff --git a/deps/lld/test/ELF/dynamic-list.s b/deps/lld/test/ELF/dynamic-list.s
index f6addcb9bf2ef6d50f6565be717289055c8b3204..74361bf5cd543bb437e4f2b6c2e64be2e15705ca 100644
--- a/deps/lld/test/ELF/dynamic-list.s
+++ b/deps/lld/test/ELF/dynamic-list.s
@@ -7,19 +7,19 @@
 ## Check exporting only one symbol.
 # RUN: echo "{ foo1; };" > %t.list
 # RUN: ld.lld --hash-style=sysv --dynamic-list %t.list %t %t2.so -o %t.exe
-# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.exe | FileCheck %s
 
 ## And now using quoted strings (the output is the same since it does
 ## use any wildcard character).
 # RUN: echo "{ \"foo1\"; };" > %t.list
 # RUN: ld.lld --hash-style=sysv --dynamic-list %t.list %t %t2.so -o %t.exe
-# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.exe | FileCheck %s
 
 ## And now using --export-dynamic-symbol.
 # RUN: ld.lld --hash-style=sysv --export-dynamic-symbol foo1 %t %t2.so -o %t.exe
-# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.exe | FileCheck %s
 # RUN: ld.lld --hash-style=sysv --export-dynamic-symbol=foo1 %t %t2.so -o %t.exe
-# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.exe | FileCheck %s
 
 # CHECK:      DynamicSymbols [
 # CHECK-NEXT:   Symbol {
@@ -46,11 +46,11 @@
 ## Now export all the foo1, foo2, and foo31 symbols
 # RUN: echo "{ foo1; foo2; foo31; };" > %t.list
 # RUN: ld.lld --hash-style=sysv --dynamic-list %t.list %t %t2.so -o %t.exe
-# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck -check-prefix=CHECK2 %s
+# RUN: llvm-readobj --dyn-syms %t.exe | FileCheck -check-prefix=CHECK2 %s
 # RUN: echo "{ foo1; foo2; };" > %t1.list
 # RUN: echo "{ foo31; };" > %t2.list
 # RUN: ld.lld --hash-style=sysv --dynamic-list %t1.list --dynamic-list %t2.list %t %t2.so -o %t.exe
-# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck -check-prefix=CHECK2 %s
+# RUN: llvm-readobj --dyn-syms %t.exe | FileCheck -check-prefix=CHECK2 %s
 
 # CHECK2:      DynamicSymbols [
 # CHECK2-NEXT:   Symbol {
@@ -96,11 +96,11 @@
 ## incomplete dynamic-list still exports everything.
 # RUN: echo "{ foo2; };" > %t.list
 # RUN: ld.lld --hash-style=sysv --dynamic-list %t.list --export-dynamic %t %t2.so -o %t.exe
-# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck -check-prefix=CHECK3 %s
+# RUN: llvm-readobj --dyn-syms %t.exe | FileCheck -check-prefix=CHECK3 %s
 
 ## The same with --export-dynamic-symbol.
 # RUN: ld.lld --hash-style=sysv --export-dynamic-symbol=foo2 --export-dynamic %t %t2.so -o %t.exe
-# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck -check-prefix=CHECK3 %s
+# RUN: llvm-readobj --dyn-syms %t.exe | FileCheck -check-prefix=CHECK3 %s
 
 # CHECK3:      DynamicSymbols [
 # CHECK3-NEXT:   Symbol {
diff --git a/deps/lld/test/ELF/dynamic-no-rosegment.s b/deps/lld/test/ELF/dynamic-no-rosegment.s
index f2b5f352d96707874fa81cf88909852d5331ae19..e3c83db02e088e526d32d5125f3e7e1afb759ef4 100644
--- a/deps/lld/test/ELF/dynamic-no-rosegment.s
+++ b/deps/lld/test/ELF/dynamic-no-rosegment.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -shared --no-rosegment -z rodynamic -o %t %t.o
-# RUN: llvm-readobj -dynamic-table -s %t | FileCheck %s
+# RUN: llvm-readobj --dynamic-table -S %t | FileCheck %s
 
 # CHECK:      DynamicSection [ (7 entries)
 # CHECK-NEXT:   Tag                Type                 Name/Value
diff --git a/deps/lld/test/ELF/dynamic-reloc-index.s b/deps/lld/test/ELF/dynamic-reloc-index.s
index 0c14d3454571fe0644c1976432acef59d04ec078..2aa0133400fd9bd22bdf58ea5f37a5b29a575711 100644
--- a/deps/lld/test/ELF/dynamic-reloc-index.s
+++ b/deps/lld/test/ELF/dynamic-reloc-index.s
@@ -9,7 +9,7 @@
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rela.plt {
-// CHECK-NEXT:     0x202018 R_X86_64_JUMP_SLOT bar 0x0
+// CHECK-NEXT:     0x203018 R_X86_64_JUMP_SLOT bar 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
diff --git a/deps/lld/test/ELF/dynamic-reloc.s b/deps/lld/test/ELF/dynamic-reloc.s
index ce6d21c1b1e5afa5355248728e15ac0b04cbc1ad..9d639fdd87095d38578c7c1ca03ded4cdad1b0e0 100644
--- a/deps/lld/test/ELF/dynamic-reloc.s
+++ b/deps/lld/test/ELF/dynamic-reloc.s
@@ -4,7 +4,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/dynamic-reloc.s -o %t3.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld --hash-style=sysv %t.o %t3.o %t2.so -o %t
-// RUN: llvm-readobj -dynamic-table -r --expand-relocs -s %t | FileCheck %s
+// RUN: llvm-readobj --dynamic-table -r --expand-relocs -S %t | FileCheck %s
 
 // CHECK:      Index: 1
 // CHECK-NEXT: Name: .dynsym
@@ -18,7 +18,7 @@
 // CHECK-NEXT: Offset:
 // CHECK-NEXT: Size: [[RELASIZE:.*]]
 // CHECK-NEXT: Link: 1
-// CHECK-NEXT: Info: 7
+// CHECK-NEXT: Info: 8
 // CHECK-NEXT: AddressAlignment: 8
 // CHECK-NEXT: EntrySize: 24
 
@@ -33,7 +33,7 @@
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rela.plt {
 // CHECK-NEXT:     Relocation {
-// CHECK-NEXT:       Offset: 0x202018
+// CHECK-NEXT:       Offset: 0x203018
 // CHECK-NEXT:       Type: R_X86_64_JUMP_SLOT
 // CHECK-NEXT:       Symbol: bar
 // CHECK-NEXT:       Addend: 0x0
diff --git a/deps/lld/test/ELF/dynamic.s b/deps/lld/test/ELF/dynamic.s
index 0ed7abc146be2f21402451900dff5d6a533e6151..91177eb2c8675123cdc8f0caca84a76b15473050 100644
--- a/deps/lld/test/ELF/dynamic.s
+++ b/deps/lld/test/ELF/dynamic.s
@@ -4,7 +4,7 @@
 ## Check that _DYNAMIC symbol is created when creating dynamic output,
 ## and has hidden visibility and address equal to .dynamic section.
 # RUN: ld.lld -shared %t.o -o %t.so
-# RUN: llvm-readobj -sections -symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --sections --symbols %t.so | FileCheck %s
 # CHECK:      Section {
 # CHECK:        Index: 5
 # CHECK:        Name: .dynamic
@@ -35,7 +35,7 @@
 # CHECK-NEXT:   }
 
 # RUN: ld.lld %t.o -o %t2
-# RUN: llvm-readobj -sections -symbols %t2 | FileCheck -check-prefix=NODYN %s
+# RUN: llvm-readobj --sections --symbols %t2 | FileCheck -check-prefix=NODYN %s
 # NODYN:    Symbols [
 # NODYN-NOT: Name: _DYNAMIC
 # NODYN:    ]
diff --git a/deps/lld/test/ELF/dynsym-no-rosegment.s b/deps/lld/test/ELF/dynsym-no-rosegment.s
index c378bbce4afefa7b2193876e98a79a4cb2ccb48c..a6ebdf68ca51e38d26e036d6b7c002b41782314a 100644
--- a/deps/lld/test/ELF/dynsym-no-rosegment.s
+++ b/deps/lld/test/ELF/dynsym-no-rosegment.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -shared --no-rosegment -o %t %t.o
-# RUN: llvm-readobj -dyn-symbols -s %t | FileCheck %s
+# RUN: llvm-readobj --dyn-syms -S %t | FileCheck %s
 
 # CHECK:      DynamicSymbols [
 # CHECK-NEXT:   Symbol {
diff --git a/deps/lld/test/ELF/dynsym-pie.s b/deps/lld/test/ELF/dynsym-pie.s
index 6a7f4f1f0f70f6d8713fb38fc7ddd76585c3fa99..10ddfa5cb25e1b1f948980d47bd17a253323cd83 100644
--- a/deps/lld/test/ELF/dynsym-pie.s
+++ b/deps/lld/test/ELF/dynsym-pie.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 # RUN: ld.lld -pie %t -o %t.out
-# RUN: llvm-readobj -t -dyn-symbols %t.out | FileCheck %s
+# RUN: llvm-readobj --symbols --dyn-syms %t.out | FileCheck %s
 
 # CHECK:       Symbols [
 # CHECK:        Symbol {
diff --git a/deps/lld/test/ELF/edata-etext.s b/deps/lld/test/ELF/edata-etext.s
index 6eef319f189e41ff6fa0d90e04772809707356fe..5c83256bfca1d1c547df99e0a6f6444daac23f7d 100644
--- a/deps/lld/test/ELF/edata-etext.s
+++ b/deps/lld/test/ELF/edata-etext.s
@@ -12,7 +12,7 @@
 ## 3) Address of _end is different from _edata because of 2.
 ## 4) Addresses of _edata == edata, _end == end and _etext == etext.
 # CHECK:      Sections:
-# CHECK-NEXT:  Idx Name          Size      Address          Type
+# CHECK-NEXT:  Idx Name          Size     VMA              Type
 # CHECK-NEXT:    0               00000000 0000000000000000
 # CHECK-NEXT:    1 .text         00000001 0000000000201000 TEXT
 # CHECK-NEXT:    2 .data         00000002 0000000000202000 DATA
diff --git a/deps/lld/test/ELF/eh-align-cie.s b/deps/lld/test/ELF/eh-align-cie.s
index 9e6ac2dc17be12c174f162461c15b16c0ad19cc2..16b404e8fcd12271c2868424da13d1742322e34f 100644
--- a/deps/lld/test/ELF/eh-align-cie.s
+++ b/deps/lld/test/ELF/eh-align-cie.s
@@ -9,7 +9,7 @@
 bar:
 
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-// RUN: llvm-readobj -s -section-data %t.o | FileCheck --check-prefix=OBJ %s
+// RUN: llvm-readobj -S --section-data %t.o | FileCheck --check-prefix=OBJ %s
 
 // Check the size of the CIE (0x18 + 4) an FDE (0x10 + 4)
 // OBJ: Name: .eh_frame
@@ -32,7 +32,7 @@ bar:
 
 
 // RUN: ld.lld --hash-style=sysv %t.o -o %t -shared
-// RUN: llvm-readobj -s -section-data %t | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 // Check that the size of the CIE was changed to (0x1C + 4) and the FDE one was
 // changed to (0x14 + 4)
diff --git a/deps/lld/test/ELF/eh-frame-begin-end.s b/deps/lld/test/ELF/eh-frame-begin-end.s
index a7f0bb7d3efd49d380363a05dfadcf773cc33686..9ec2f6e8c4b4c3446d898ae5b3d4783b68c427bc 100644
--- a/deps/lld/test/ELF/eh-frame-begin-end.s
+++ b/deps/lld/test/ELF/eh-frame-begin-end.s
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=amd64-unknown-openbsd %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=amd64-unknown-openbsd %p/Inputs/eh-frame-end.s -o %t2.o
 // RUN: ld.lld %t.o %t2.o -o %t
-// RUN: llvm-readobj -sections %t | FileCheck %s
+// RUN: llvm-readobj --sections %t | FileCheck %s
 
 // CHECK:      Name: .eh_frame
 // CHECK-NEXT: Type: SHT_PROGBITS
diff --git a/deps/lld/test/ELF/eh-frame-gc.s b/deps/lld/test/ELF/eh-frame-gc.s
index b2e21f497f418bd0e80748052336509381fe8391..83d2ba5371669890e88bed10a55d49d03173e827 100644
--- a/deps/lld/test/ELF/eh-frame-gc.s
+++ b/deps/lld/test/ELF/eh-frame-gc.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o
 # RUN: ld.lld -shared --gc-sections %t.o -o %t
-# RUN: llvm-readobj  -s %t | FileCheck %s
+# RUN: llvm-readobj  -S %t | FileCheck %s
 
 ## Check that section containing personality is
 ## not garbage collected.
diff --git a/deps/lld/test/ELF/eh-frame-gc2.s b/deps/lld/test/ELF/eh-frame-gc2.s
index 9cf0d0832d5b65dd04685607094fc99a80f56a71..a4043d5da5bb4adc825f92f2b038a0d7012be99a 100644
--- a/deps/lld/test/ELF/eh-frame-gc2.s
+++ b/deps/lld/test/ELF/eh-frame-gc2.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o
 // RUN: ld.lld --gc-sections %t.o -o %t
-// RUN: llvm-readobj -s %t | FileCheck %s
+// RUN: llvm-readobj -S %t | FileCheck %s
 
 // Test that the we don't gc the personality function.
 // CHECK: Name: .foobar
diff --git a/deps/lld/test/ELF/eh-frame-hdr-abs-fde.s b/deps/lld/test/ELF/eh-frame-hdr-abs-fde.s
index 7f75058d4b358b4cf6b7c998cd37f22bb3f9c77d..d597ee94b463dc0012bb54e7a3b8f4d64b33b825 100644
--- a/deps/lld/test/ELF/eh-frame-hdr-abs-fde.s
+++ b/deps/lld/test/ELF/eh-frame-hdr-abs-fde.s
@@ -1,23 +1,23 @@
-# REQUIRES: mips
+# REQUIRES: x86
 # Check reading PC values of FDEs and writing lookup table in the .eh_frame_hdr
 # if CIE augmentation string has 'L' token and PC values are encoded using
 # absolute (not relative) format.
 
-# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
+# RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld --eh-frame-hdr %t.o -o %t
 # RUN: llvm-objdump -s -dwarf=frames %t | FileCheck %s
 
 # CHECK:      Contents of section .eh_frame_hdr:
-# CHECK-NEXT:  10128 011b033b 00000010 00000001 0000fed8
-#                                               ^-- 0x20000 - 0x10138
-#                                                   .text   - .eh_frame_hdr
-# CHECK-NEXT:  10138 0000002c
+# CHECK-NEXT:  200190 011b033b 14000000 01000000 700e0000
+#                                                ^-- 0x201000 - 0x200190
+#                                                    .text    - .eh_frame_hdr
+# CHECK-NEXT:  2001a0 30000000
 # CHECK:      Contents of section .text:
-# CHECK-NEXT:  20000 00000000
+# CHECK-NEXT:  201000 90
 
 # CHECK: Augmentation:          "zLR"
-# CHECK: Augmentation data:     00 0B
-#                                  ^-- DW_EH_PE_udata4 | DW_EH_PE_signed
+# CHECK: Augmentation data:     00 1B
+#                                  ^-- DW_EH_PE_pcrel | DW_EH_PE_udata4 | DW_EH_PE_signed
 
 	.text
   .globl __start
diff --git a/deps/lld/test/ELF/eh-frame-hdr-augmentation.s b/deps/lld/test/ELF/eh-frame-hdr-augmentation.s
index 934f9200a27cace2ca02ce2c543dc9b4989fb19b..c51ea1c4976b9d9d7b77f4024ddffacbca58f04f 100644
--- a/deps/lld/test/ELF/eh-frame-hdr-augmentation.s
+++ b/deps/lld/test/ELF/eh-frame-hdr-augmentation.s
@@ -11,7 +11,7 @@
 // CHECK-NEXT:   Code alignment factor: 1
 // CHECK-NEXT:   Data alignment factor: -8
 // CHECK-NEXT:   Return address column: 16
-// CHECK-NEXT:   Personality Address: 00000dad
+// CHECK-NEXT:   Personality Address: 0000000000000dad
 // CHECK-NEXT:   Augmentation data:
 
 // CHECK:      DW_CFA_def_cfa:  reg7 +8
@@ -20,7 +20,7 @@
 // CHECK-NEXT: DW_CFA_nop:
 
 // CHECK:      00000020 00000014 00000024 FDE cie=00000024 pc=00000d98...00000d98
-// CHECK-NEXT:   LSDA Address: 00000d8f
+// CHECK-NEXT:   LSDA Address: 0000000000000d8f
 // CHECK-NEXT:   DW_CFA_nop:
 // CHECK-NEXT:   DW_CFA_nop:
 // CHECK-NEXT:   DW_CFA_nop:
diff --git a/deps/lld/test/ELF/eh-frame-hdr-icf-fde.s b/deps/lld/test/ELF/eh-frame-hdr-icf-fde.s
index 68de65d5724ca9d441f5089be1c2bc5d174107b5..ca7066d950233ff695d44f69a75ff7c97252ec8b 100644
--- a/deps/lld/test/ELF/eh-frame-hdr-icf-fde.s
+++ b/deps/lld/test/ELF/eh-frame-hdr-icf-fde.s
@@ -6,7 +6,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2 --icf=all --eh-frame-hdr
 # RUN: llvm-readobj -r %t | FileCheck %s --check-prefix=OBJ
-# RUN: llvm-readobj -s -section-data %t2 | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t2 | FileCheck %s
 
 # OBJ:      Relocations [
 # OBJ-NEXT:   Section {{.*}} .rela.eh_frame {
diff --git a/deps/lld/test/ELF/eh-frame-hdr-no-out2.s b/deps/lld/test/ELF/eh-frame-hdr-no-out2.s
index 0eeb0ea5548d672e7c07b529dfbcb50eacf0b1e3..3be287a089ffefd9af63306243512bc88621dfaf 100644
--- a/deps/lld/test/ELF/eh-frame-hdr-no-out2.s
+++ b/deps/lld/test/ELF/eh-frame-hdr-no-out2.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld --eh-frame-hdr %t.o -o %t
-// RUN: llvm-readobj -s -program-headers %t | FileCheck %s --check-prefix=NOHDR
+// RUN: llvm-readobj -S -l %t | FileCheck %s --check-prefix=NOHDR
 
 .section foo,"ax",@progbits
  nop
diff --git a/deps/lld/test/ELF/eh-frame-hdr.s b/deps/lld/test/ELF/eh-frame-hdr.s
index 0c33bc6dde3e47f6f921496cedb8b0ae98cb1be8..d8507c1f1ea20d4a2888f6471099fd9115341ead 100644
--- a/deps/lld/test/ELF/eh-frame-hdr.s
+++ b/deps/lld/test/ELF/eh-frame-hdr.s
@@ -2,15 +2,15 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -file-headers -s -section-data -program-headers -symbols %t \
+// RUN: llvm-readobj --file-headers -S --section-data -l --symbols %t \
 // RUN:   | FileCheck %s --check-prefix=NOHDR
 
 // RUN: ld.lld -eh-frame-hdr -no-eh-frame-hdr %t.o -o %t
-// RUN: llvm-readobj -file-headers -s -section-data -program-headers -symbols %t \
+// RUN: llvm-readobj --file-headers -S --section-data -l --symbols %t \
 // RUN:   | FileCheck %s --check-prefix=NOHDR
 
 // RUN: ld.lld --eh-frame-hdr %t.o -o %t
-// RUN: llvm-readobj -file-headers -s -section-data -program-headers -symbols %t \
+// RUN: llvm-readobj --file-headers -S --section-data -l --symbols %t \
 // RUN:   | FileCheck %s --check-prefix=HDR
 // RUN: llvm-objdump -d %t | FileCheck %s --check-prefix=HDRDISASM
 
@@ -38,15 +38,20 @@ _start:
 // NOHDR:      ProgramHeaders [
 // NOHDR-NOT:   PT_GNU_EH_FRAME
 
-//HDRDISASM:      Disassembly of section foo:
-//HDRDISASM-NEXT: foo:
-//HDRDISASM-NEXT:    201000: 90 nop
-//HDRDISASM-NEXT: Disassembly of section bar:
-//HDRDISASM-NEXT: bar:
-//HDRDISASM-NEXT:    201001: 90 nop
-//HDRDISASM-NEXT: Disassembly of section dah:
-//HDRDISASM-NEXT: dah:
-//HDRDISASM-NEXT:    201002: 90 nop
+// HDRDISASM:      Disassembly of section foo:
+// HDRDISASM-EMPTY:
+// HDRDISASM-NEXT: foo:
+// HDRDISASM-NEXT:    201000: 90 nop
+// HDRDISASM-EMPTY:
+// HDRDISASM-NEXT: Disassembly of section bar:
+// HDRDISASM-EMPTY:
+// HDRDISASM-NEXT: bar:
+// HDRDISASM-NEXT:    201001: 90 nop
+// HDRDISASM-EMPTY:
+// HDRDISASM-NEXT: Disassembly of section dah:
+// HDRDISASM-EMPTY:
+// HDRDISASM-NEXT: dah:
+// HDRDISASM-NEXT:    201002: 90 nop
 
 // HDR:       Section {
 // HDR:         Index:
diff --git a/deps/lld/test/ELF/eh-frame-marker.s b/deps/lld/test/ELF/eh-frame-marker.s
index f5696bdef36fb5f01b18458944a0827c2afd4710..7a03cf7ff5190b07922a9c0294fe86a8be7121c9 100644
--- a/deps/lld/test/ELF/eh-frame-marker.s
+++ b/deps/lld/test/ELF/eh-frame-marker.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld --eh-frame-hdr %t.o -o %t.so -shared
-// RUN: llvm-readobj -t -s %t.so | FileCheck %s
+// RUN: llvm-readobj --symbols -S %t.so | FileCheck %s
 // We used to crash on this.
 
 // CHECK:      Name: .eh_frame_hdr
diff --git a/deps/lld/test/ELF/eh-frame-merge.s b/deps/lld/test/ELF/eh-frame-merge.s
index 6731d90f844b3cf02e7ed5bb007eb181031d2da0..d9217980736105b396b7da9c8a10e0e26cfc35af 100644
--- a/deps/lld/test/ELF/eh-frame-merge.s
+++ b/deps/lld/test/ELF/eh-frame-merge.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld --hash-style=sysv %t.o %t.o -o %t -shared
-// RUN: llvm-readobj -s -section-data %t | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
         .section	foo,"ax",@progbits
 	.cfi_startproc
diff --git a/deps/lld/test/ELF/eh-frame-negative-pcrel-sdata2.s b/deps/lld/test/ELF/eh-frame-negative-pcrel-sdata2.s
index 30ee8560f0a39d0c6ca0002dcbb4514be4e1cdf4..f2db28d9ce3f68f0793861696e402c0b0bb8dd83 100644
--- a/deps/lld/test/ELF/eh-frame-negative-pcrel-sdata2.s
+++ b/deps/lld/test/ELF/eh-frame-negative-pcrel-sdata2.s
@@ -6,7 +6,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "SECTIONS { .text : { *(.text) } .eh_frame : { *(.eh_frame) } }" > %t.script
 # RUN: ld.lld --eh-frame-hdr --script %t.script --section-start .text=0x1000 %t.o -o %t
-# RUN: llvm-readobj -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 # CHECK:      Section {
 # CHECK:        Index:
diff --git a/deps/lld/test/ELF/eh-frame-negative-pcrel-sdata4.s b/deps/lld/test/ELF/eh-frame-negative-pcrel-sdata4.s
index 71b91cf1f4a6d1b6dd4e7d0c8321d1fcdb8bba87..b48f9247576a9cc3d566fd6d8e36f9228a816bc9 100644
--- a/deps/lld/test/ELF/eh-frame-negative-pcrel-sdata4.s
+++ b/deps/lld/test/ELF/eh-frame-negative-pcrel-sdata4.s
@@ -6,7 +6,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "SECTIONS { .text : { *(.text) } .eh_frame : { *(.eh_frame) } }" > %t.script
 # RUN: ld.lld --eh-frame-hdr --script %t.script --section-start .text=0x1000 %t.o -o %t
-# RUN: llvm-readobj -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 # CHECK:      Section {
 # CHECK:        Index:
diff --git a/deps/lld/test/ELF/eh-frame-negative-pcrel-sdata8.s b/deps/lld/test/ELF/eh-frame-negative-pcrel-sdata8.s
index 2c6c9f27cd38f9308a46c2b0447b5cacf6a7a6e1..283f722be84c0cadf866e70c848ed29b22b7c488 100644
--- a/deps/lld/test/ELF/eh-frame-negative-pcrel-sdata8.s
+++ b/deps/lld/test/ELF/eh-frame-negative-pcrel-sdata8.s
@@ -6,7 +6,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "SECTIONS { .text : { *(.text) } .eh_frame : { *(.eh_frame) } }" > %t.script
 # RUN: ld.lld --eh-frame-hdr --script %t.script --section-start .text=0x1000 %t.o -o %t
-# RUN: llvm-readobj -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 # CHECK:      Section {
 # CHECK:        Index:
diff --git a/deps/lld/test/ELF/eh-frame-padding-no-rosegment.s b/deps/lld/test/ELF/eh-frame-padding-no-rosegment.s
index 222ce0da6ca91a476403e73fc2aa8c0b93ce7bb9..754903e40d92f2762534397e6968d8a170245d1d 100644
--- a/deps/lld/test/ELF/eh-frame-padding-no-rosegment.s
+++ b/deps/lld/test/ELF/eh-frame-padding-no-rosegment.s
@@ -12,7 +12,7 @@ bar:
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 
 // Check the size of the CIE (0x18 + 4) and FDE (0x10 + 4)
-// RUN: llvm-readobj -s -section-data %t.o | FileCheck --check-prefix=OBJ %s
+// RUN: llvm-readobj -S --section-data %t.o | FileCheck --check-prefix=OBJ %s
 
 // OBJ:      Name: .eh_frame
 // OBJ-NEXT: Type:
@@ -35,14 +35,14 @@ bar:
 // RUN: ld.lld --hash-style=sysv %t.o -no-rosegment -o %t -shared
 
 // Check that .eh_frame is in the same segment as .text
-// RUN: llvm-readobj -l --elf-output-style=GNU %t | FileCheck --check-prefix=PHDR %s
+// RUN: llvm-readelf -l %t | FileCheck --check-prefix=PHDR %s
 
 // PHDR: Segment Sections
 // PHDR: .eh_frame {{.*}}.text
 
 // Check that the CIE and FDE are padded with 0x00 and not 0xCC when the
 // .eh_frame section is placed in the executable segment
-// RUN: llvm-readobj -s -section-data %t | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 // CHECK:      Name: .eh_frame
 // CHECK-NEXT: Type:
diff --git a/deps/lld/test/ELF/eh-frame-type.test b/deps/lld/test/ELF/eh-frame-type.test
index 756299739e1677d2f90f9ba02cc9b36128355430..9649921787e3a20304a61b6070adaf42d27d0092 100644
--- a/deps/lld/test/ELF/eh-frame-type.test
+++ b/deps/lld/test/ELF/eh-frame-type.test
@@ -1,6 +1,6 @@
 # RUN: yaml2obj %s -o %t.o
 # RUN: ld.lld %t.o -o %t -shared
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 # CHECK:      Name: .eh_frame
 # CHECK-NEXT: Type: SHT_PROGBITS
diff --git a/deps/lld/test/ELF/eh-frame-value-format7.s b/deps/lld/test/ELF/eh-frame-value-format7.s
index 90543a2b72f240f1a676bb3ef9213bfa6d0f403f..ffe578188f3cd99927591231c3e7dfe96ec14959 100644
--- a/deps/lld/test/ELF/eh-frame-value-format7.s
+++ b/deps/lld/test/ELF/eh-frame-value-format7.s
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld --eh-frame-hdr --section-start .text=0x1000 %t.o -o %t
-# RUN: llvm-readobj -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 ## Check we are able to handle DW_EH_PE_udata2 encoding.
 
diff --git a/deps/lld/test/ELF/eh-frame-value-format8.s b/deps/lld/test/ELF/eh-frame-value-format8.s
index 60324706665ee1b20aa49aa094235c549b8803a9..cb1f2410938caddf7e6352257cebaec727656b21 100644
--- a/deps/lld/test/ELF/eh-frame-value-format8.s
+++ b/deps/lld/test/ELF/eh-frame-value-format8.s
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld --eh-frame-hdr --section-start .text=0x1000 %t.o -o %t
-# RUN: llvm-readobj -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 ## Check we are able to handle DW_EH_PE_absptr encoding.
 
diff --git a/deps/lld/test/ELF/ehdr_start.s b/deps/lld/test/ELF/ehdr_start.s
index 94e0fedcfc52327ee4416959fdfb56d438a242f7..b7e5a6d60b14bc3c76973ee8d2450e4cadcf02f0 100644
--- a/deps/lld/test/ELF/ehdr_start.s
+++ b/deps/lld/test/ELF/ehdr_start.s
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t
-# RUN: llvm-readobj -symbols %t | FileCheck %s
+# RUN: llvm-readobj --symbols %t | FileCheck %s
 # CHECK:    Name: __ehdr_start (1)
 # CHECK-NEXT:    Value: 0x200000
 # CHECK-NEXT:    Size: 0
@@ -30,7 +30,7 @@ _start:
   .quad __executable_start
 
 # RUN: ld.lld -r %t.o -o %t.r
-# RUN: llvm-readobj -symbols %t.r | FileCheck %s --check-prefix=RELOCATABLE
+# RUN: llvm-readobj --symbols %t.r | FileCheck %s --check-prefix=RELOCATABLE
 
 # RELOCATABLE:    Name: __ehdr_start (1)
 # RELOCATABLE-NEXT:    Value: 0x0
diff --git a/deps/lld/test/ELF/ehframe-relocation.s b/deps/lld/test/ELF/ehframe-relocation.s
index 4ab44c20f8aec35b627fea6b8107d489b8137bd8..f860df4e0ba47e4abc6a5229b587295ee498535e 100644
--- a/deps/lld/test/ELF/ehframe-relocation.s
+++ b/deps/lld/test/ELF/ehframe-relocation.s
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/ehframe-relocation.s  -o %t2.o
 // RUN: ld.lld %t.o %t2.o -o %t
-// RUN: llvm-readobj -s %t | FileCheck %s
+// RUN: llvm-readobj -S %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
 // CHECK:      Name: .eh_frame
@@ -18,6 +18,7 @@
 // 0x200120 = 2097440
 // 0x200120 + 5 = 2097445
 // DISASM:      Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: _start:
 // DISASM-NEXT:   201000: {{.*}} movq 2097440, %rax
 // DISASM-NEXT:   201008: {{.*}} movq 2097445, %rax
diff --git a/deps/lld/test/ELF/elf-header.s b/deps/lld/test/ELF/elf-header.s
index e188650f73113f86157dab092600f767e17ac466..da8fe349e728846761d46a1b881367b6742cc253 100644
--- a/deps/lld/test/ELF/elf-header.s
+++ b/deps/lld/test/ELF/elf-header.s
@@ -1,10 +1,10 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t1
-# RUN: llvm-readobj -file-headers %t1 | FileCheck %s
+# RUN: llvm-readobj --file-headers %t1 | FileCheck %s
 
 # RUN: ld.lld %t.o -no-rosegment -o %t2
-# RUN: llvm-readobj -file-headers %t2 | FileCheck %s
+# RUN: llvm-readobj --file-headers %t2 | FileCheck %s
 
 # CHECK:      ElfHeader {
 # CHECK-NEXT:   Ident {
diff --git a/deps/lld/test/ELF/emit-relocs-merge.s b/deps/lld/test/ELF/emit-relocs-merge.s
index 3fecca23b735d1d3da68e6bce75f4aa0cfda40d7..3ac2d13e148f219f519b9b1c3e9dcdeb3f6f9752 100644
--- a/deps/lld/test/ELF/emit-relocs-merge.s
+++ b/deps/lld/test/ELF/emit-relocs-merge.s
@@ -5,12 +5,12 @@
 
 # CHECK:       Relocations [
 # CHECK-NEXT:    Section ({{.*}}) .rela.dyn {
-# CHECK-NEXT:     0x1000 R_X86_64_64 zed 0x0
-# CHECK-NEXT:     0x1008 R_X86_64_64 zed 0x0
+# CHECK-NEXT:     0x2000 R_X86_64_64 zed 0x0
+# CHECK-NEXT:     0x2008 R_X86_64_64 zed 0x0
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section ({{.*}}) .rela.data {
-# CHECK-NEXT:     0x1000 R_X86_64_64 zed 0x0
-# CHECK-NEXT:     0x1008 R_X86_64_64 zed 0x0
+# CHECK-NEXT:     0x2000 R_X86_64_64 zed 0x0
+# CHECK-NEXT:     0x2008 R_X86_64_64 zed 0x0
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 
diff --git a/deps/lld/test/ELF/emit-relocs-mergeable-i386.s b/deps/lld/test/ELF/emit-relocs-mergeable-i386.s
index 1ddee8c1faf13854ed5a4a89d385cc5b37052d95..91f280cc7dd9c839bb58ea43198da28d465d6b1c 100644
--- a/deps/lld/test/ELF/emit-relocs-mergeable-i386.s
+++ b/deps/lld/test/ELF/emit-relocs-mergeable-i386.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t1
 # RUN: ld.lld --emit-relocs %t1 -o %t2
-# RUN: llvm-readobj -sections -section-data %t2 | FileCheck %s
+# RUN: llvm-readobj --sections --section-data %t2 | FileCheck %s
 
 ## Check lf we produce proper relocations when doing merging of SHF_MERGE sections.
 
diff --git a/deps/lld/test/ELF/emit-relocs-mergeable.s b/deps/lld/test/ELF/emit-relocs-mergeable.s
index 1553cb61601294536af213ebe7520050b857a0fc..3390d970bc8c3129d8559f3ea7a4e4f7337e7140 100644
--- a/deps/lld/test/ELF/emit-relocs-mergeable.s
+++ b/deps/lld/test/ELF/emit-relocs-mergeable.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
 # RUN: ld.lld --emit-relocs %t1 -o %t2
-# RUN: llvm-readobj -sections -section-data -r %t2 | FileCheck %s
+# RUN: llvm-readobj --sections --section-data -r %t2 | FileCheck %s
 
 ## Check if we produce proper relocations when doing merging of SHF_MERGE sections.
 
diff --git a/deps/lld/test/ELF/emit-relocs-mergeable2.s b/deps/lld/test/ELF/emit-relocs-mergeable2.s
new file mode 100644
index 0000000000000000000000000000000000000000..22d4cf4238af9ca42ff189c25e3fd4baef9ddcaf
--- /dev/null
+++ b/deps/lld/test/ELF/emit-relocs-mergeable2.s
@@ -0,0 +1,14 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: ld.lld --emit-relocs %t.o -o %t.exe
+# RUN: llvm-readelf --relocations %t.exe | FileCheck %s
+
+# CHECK: 0000000000201004  000000010000000b R_X86_64_32S 0000000000200120 .Lfoo + 8
+
+.globl  _start
+_start:
+  movq .Lfoo+8, %rax
+.section .rodata.cst16,"aM",@progbits,16
+.Lfoo:
+  .quad 0
+  .quad 0
diff --git a/deps/lld/test/ELF/emit-relocs-shared.s b/deps/lld/test/ELF/emit-relocs-shared.s
index cb87d9f848055d204a095519a644f5bb411938b0..6c4456e04a9c7c41249b5fb1c6406ffddf53568a 100644
--- a/deps/lld/test/ELF/emit-relocs-shared.s
+++ b/deps/lld/test/ELF/emit-relocs-shared.s
@@ -8,9 +8,9 @@
 
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section {{.*}} .rela.dyn {
-# CHECK-NEXT:     0x1000 R_X86_64_64 foo 0x0
+# CHECK-NEXT:     0x2000 R_X86_64_64 foo 0x0
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section {{.*}} .rela.data {
-# CHECK-NEXT:     0x1000 R_X86_64_64 foo 0x0
+# CHECK-NEXT:     0x2000 R_X86_64_64 foo 0x0
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
diff --git a/deps/lld/test/ELF/emit-relocs.s b/deps/lld/test/ELF/emit-relocs.s
index b91bb9abe182c6080c42a41fb9fa8a979417447c..5d46535b749efd178da07f1d0e596ddbe9ed14e4 100644
--- a/deps/lld/test/ELF/emit-relocs.s
+++ b/deps/lld/test/ELF/emit-relocs.s
@@ -1,15 +1,15 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
 # RUN: ld.lld --emit-relocs %t1.o -o %t
-# RUN: llvm-readobj -t -r -s %t | FileCheck %s
+# RUN: llvm-readobj --symbols -r -S %t | FileCheck %s
 
 ## Check single dash form.
 # RUN: ld.lld -emit-relocs %t1.o -o %t1
-# RUN: llvm-readobj -t -r -s %t1 | FileCheck %s
+# RUN: llvm-readobj --symbols -r -S %t1 | FileCheck %s
 
 ## Check alias.
 # RUN: ld.lld -q %t1.o -o %t2
-# RUN: llvm-readobj -t -r -s %t2 | FileCheck %s
+# RUN: llvm-readobj --symbols -r -S %t2 | FileCheck %s
 
 # CHECK:      Section {
 # CHECK:        Index: 2
diff --git a/deps/lld/test/ELF/empty-pack-dyn-relocs.s b/deps/lld/test/ELF/empty-pack-dyn-relocs.s
index b74a89d66d46e8d9bc0d1131f1a49e3dd3c7a638..fa8261ddb3998cfcc1aa645b617238ca7c0ad03d 100644
--- a/deps/lld/test/ELF/empty-pack-dyn-relocs.s
+++ b/deps/lld/test/ELF/empty-pack-dyn-relocs.s
@@ -2,7 +2,7 @@
 
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: ld.lld -pie --pack-dyn-relocs=relr %t.o -o %t
-// RUN: llvm-readobj -sections %t | FileCheck %s
+// RUN: llvm-readobj --sections %t | FileCheck %s
 
 .global _start
 _start:
diff --git a/deps/lld/test/ELF/empty-pt-load.s b/deps/lld/test/ELF/empty-pt-load.s
index 4074b63cb80f64ca0b5d26ad7eeac726637b5276..0f2cccc1339b3994f021c007cc202df8305c230f 100644
--- a/deps/lld/test/ELF/empty-pt-load.s
+++ b/deps/lld/test/ELF/empty-pt-load.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -l --elf-output-style=GNU %t.so | FileCheck %s
+// RUN: llvm-readelf -l %t.so | FileCheck %s
 
 // Test that we don't create an empty executable PT_LOAD.
 
diff --git a/deps/lld/test/ELF/empty-ver.s b/deps/lld/test/ELF/empty-ver.s
index d923607bfb01f4576a20323e29be88e82367a03b..ce32c2cfe4911b8d0b55e09b95f8ca389528697c 100644
--- a/deps/lld/test/ELF/empty-ver.s
+++ b/deps/lld/test/ELF/empty-ver.s
@@ -3,7 +3,7 @@
 // RUN: cd %t.dir
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t.o -o t.so -shared -version-script %p/Inputs/empty-ver.ver
-// RUN: llvm-readobj -s -section-data -version-info t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data --version-info t.so | FileCheck %s
 
 // CHECK:      Name: .dynstr
 // CHECK-NEXT: Type: SHT_STRTAB
diff --git a/deps/lld/test/ELF/empty-ver2.s b/deps/lld/test/ELF/empty-ver2.s
index f4b288eb512cf053493ad34e7360d345519fa01d..d8be09a97fb6567879b4805f02cf7111dbe761be 100644
--- a/deps/lld/test/ELF/empty-ver2.s
+++ b/deps/lld/test/ELF/empty-ver2.s
@@ -3,7 +3,7 @@
 # RUN: cd %t.dir
 # RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 # RUN: ld.lld %t.o -o t.so -shared -version-script %p/Inputs/empty-ver.ver
-# RUN: llvm-readobj -version-info t.so | FileCheck %s
+# RUN: llvm-readobj --version-info t.so | FileCheck %s
 
 # CHECK:       Symbols [
 # CHECK-NEXT:   Symbol {
diff --git a/deps/lld/test/ELF/emulation-aarch64.s b/deps/lld/test/ELF/emulation-aarch64.s
index c0edc9a69d36de1966efb74ab2af2a0f579a281b..2d25106746917d7e76da448397a89396e0797cbb 100644
--- a/deps/lld/test/ELF/emulation-aarch64.s
+++ b/deps/lld/test/ELF/emulation-aarch64.s
@@ -1,16 +1,16 @@
 # REQUIRES: aarch64
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %s -o %taarch64
 # RUN: ld.lld -m aarch64linux %taarch64 -o %t2aarch64
-# RUN: llvm-readobj -file-headers %t2aarch64 | FileCheck --check-prefix=AARCH64 %s
+# RUN: llvm-readobj --file-headers %t2aarch64 | FileCheck --check-prefix=AARCH64 %s
 # RUN: ld.lld -m aarch64elf %taarch64 -o %t3aarch64
-# RUN: llvm-readobj -file-headers %t3aarch64 | FileCheck --check-prefix=AARCH64 %s
+# RUN: llvm-readobj --file-headers %t3aarch64 | FileCheck --check-prefix=AARCH64 %s
 # RUN: ld.lld -m aarch64_elf64_le_vec %taarch64 -o %t4aarch64
-# RUN: llvm-readobj -file-headers %t4aarch64 | FileCheck --check-prefix=AARCH64 %s
+# RUN: llvm-readobj --file-headers %t4aarch64 | FileCheck --check-prefix=AARCH64 %s
 # RUN: ld.lld %taarch64 -o %t5aarch64
-# RUN: llvm-readobj -file-headers %t5aarch64 | FileCheck --check-prefix=AARCH64 %s
+# RUN: llvm-readobj --file-headers %t5aarch64 | FileCheck --check-prefix=AARCH64 %s
 # RUN: echo 'OUTPUT_FORMAT(elf64-littleaarch64)' > %t4aarch64.script
 # RUN: ld.lld %t4aarch64.script %taarch64 -o %t4aarch64
-# RUN: llvm-readobj -file-headers %t4aarch64 | FileCheck --check-prefix=AARCH64 %s
+# RUN: llvm-readobj --file-headers %t4aarch64 | FileCheck --check-prefix=AARCH64 %s
 # AARCH64:      ElfHeader {
 # AARCH64-NEXT:   Ident {
 # AARCH64-NEXT:     Magic: (7F 45 4C 46)
@@ -33,7 +33,7 @@
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd %s -o %taarch64fbsd
 # RUN: echo 'OUTPUT_FORMAT(elf64-aarch64-freebsd)' > %taarch64fbsd.script
 # RUN: ld.lld %taarch64fbsd.script %taarch64fbsd -o %t2aarch64fbsd
-# RUN: llvm-readobj -file-headers %t2aarch64fbsd | FileCheck --check-prefix=AARCH64-FBSD %s
+# RUN: llvm-readobj --file-headers %t2aarch64fbsd | FileCheck --check-prefix=AARCH64-FBSD %s
 # AARCH64-FBSD:      ElfHeader {
 # AARCH64-FBSD-NEXT:   Ident {
 # AARCH64-FBSD-NEXT:     Magic: (7F 45 4C 46)
diff --git a/deps/lld/test/ELF/emulation-arm.s b/deps/lld/test/ELF/emulation-arm.s
index 53015e4701c8cbb220876240edc04e108a7d1d80..caa5b6ec6d296c56798d0cd46ab40f9493d6e6a0 100644
--- a/deps/lld/test/ELF/emulation-arm.s
+++ b/deps/lld/test/ELF/emulation-arm.s
@@ -1,14 +1,14 @@
 # REQUIRES: arm
 # RUN: llvm-mc -filetype=obj -triple=armv7-unknown-linux %s -o %tarm
 # RUN: ld.lld -m armelf %tarm -o %t2arm
-# RUN: llvm-readobj -file-headers %t2arm | FileCheck --check-prefix=ARM %s
+# RUN: llvm-readobj --file-headers %t2arm | FileCheck --check-prefix=ARM %s
 # RUN: ld.lld -m armelf_linux_eabi %tarm -o %t3arm
-# RUN: llvm-readobj -file-headers %t3arm | FileCheck --check-prefix=ARM %s
+# RUN: llvm-readobj --file-headers %t3arm | FileCheck --check-prefix=ARM %s
 # RUN: ld.lld %tarm -o %t4arm
-# RUN: llvm-readobj -file-headers %t4arm | FileCheck --check-prefix=ARM %s
+# RUN: llvm-readobj --file-headers %t4arm | FileCheck --check-prefix=ARM %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-littlearm)' > %t5arm.script
 # RUN: ld.lld %t5arm.script %tarm -o %t5arm
-# RUN: llvm-readobj -file-headers %t5arm | FileCheck --check-prefix=ARM %s
+# RUN: llvm-readobj --file-headers %t5arm | FileCheck --check-prefix=ARM %s
 # ARM:      ElfHeader {
 # ARM-NEXT:   Ident {
 # ARM-NEXT:     Magic: (7F 45 4C 46)
diff --git a/deps/lld/test/ELF/emulation-mips.s b/deps/lld/test/ELF/emulation-mips.s
index 6d7a1198b761fffb4b0b79ff2150ae2930a44cfa..5b9f27290fd158d9fc20e6ef612ad17128d2a632 100644
--- a/deps/lld/test/ELF/emulation-mips.s
+++ b/deps/lld/test/ELF/emulation-mips.s
@@ -1,15 +1,15 @@
 # REQUIRES: mips
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %tmips
 # RUN: ld.lld -m elf32btsmip -e _start %tmips -o %t2mips
-# RUN: llvm-readobj -file-headers %t2mips | FileCheck --check-prefix=MIPS %s
+# RUN: llvm-readobj --file-headers %t2mips | FileCheck --check-prefix=MIPS %s
 # RUN: ld.lld %tmips -e _start -o %t3mips
-# RUN: llvm-readobj -file-headers %t3mips | FileCheck --check-prefix=MIPS %s
+# RUN: llvm-readobj --file-headers %t3mips | FileCheck --check-prefix=MIPS %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-tradbigmips)' > %tmips.script
 # RUN: ld.lld %tmips.script -e _start %tmips -o %t4mips
-# RUN: llvm-readobj -file-headers %t4mips | FileCheck --check-prefix=MIPS %s
+# RUN: llvm-readobj --file-headers %t4mips | FileCheck --check-prefix=MIPS %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-bigmips)' > %tmips2.script
 # RUN: ld.lld %tmips2.script -e _start %tmips -o %t5mips
-# RUN: llvm-readobj -file-headers %t5mips | FileCheck --check-prefix=MIPS %s
+# RUN: llvm-readobj --file-headers %t5mips | FileCheck --check-prefix=MIPS %s
 # MIPS:      ElfHeader {
 # MIPS-NEXT:   Ident {
 # MIPS-NEXT:     Magic: (7F 45 4C 46)
@@ -34,14 +34,14 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %tmipsel
 # RUN: ld.lld -m elf32ltsmip -e _start %tmipsel -o %t2mipsel
-# RUN: llvm-readobj -file-headers %t2mipsel | FileCheck --check-prefix=MIPSEL %s
+# RUN: llvm-readobj --file-headers %t2mipsel | FileCheck --check-prefix=MIPSEL %s
 # RUN: ld.lld -melf32ltsmip -e _start %tmipsel -o %t2mipsel
-# RUN: llvm-readobj -file-headers %t2mipsel | FileCheck --check-prefix=MIPSEL %s
+# RUN: llvm-readobj --file-headers %t2mipsel | FileCheck --check-prefix=MIPSEL %s
 # RUN: ld.lld %tmipsel -e _start -o %t3mipsel
-# RUN: llvm-readobj -file-headers %t3mipsel | FileCheck --check-prefix=MIPSEL %s
+# RUN: llvm-readobj --file-headers %t3mipsel | FileCheck --check-prefix=MIPSEL %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-tradlittlemips)' > %tmipsel.script
 # RUN: ld.lld %tmipsel.script -e _start %tmipsel -o %t4mipsel
-# RUN: llvm-readobj -file-headers %t4mipsel | FileCheck --check-prefix=MIPSEL %s
+# RUN: llvm-readobj --file-headers %t4mipsel | FileCheck --check-prefix=MIPSEL %s
 # MIPSEL:      ElfHeader {
 # MIPSEL-NEXT:   Ident {
 # MIPSEL-NEXT:     Magic: (7F 45 4C 46)
@@ -66,12 +66,12 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux-gnuabin32 %s -o %tmipsn32
 # RUN: ld.lld -m elf32btsmipn32 -e _start %tmipsn32 -o %t2mipsn32
-# RUN: llvm-readobj -file-headers %t2mipsn32 | FileCheck --check-prefix=MIPSN32 %s
+# RUN: llvm-readobj --file-headers %t2mipsn32 | FileCheck --check-prefix=MIPSN32 %s
 # RUN: ld.lld %tmipsn32 -e _start -o %t3mipsn32
-# RUN: llvm-readobj -file-headers %t3mipsn32 | FileCheck --check-prefix=MIPSN32 %s
+# RUN: llvm-readobj --file-headers %t3mipsn32 | FileCheck --check-prefix=MIPSN32 %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-ntradbigmips)' > %tmipsn32.script
 # RUN: ld.lld %tmipsn32.script -e _start %tmipsn32 -o %t4mipsn32
-# RUN: llvm-readobj -file-headers %t4mipsn32 | FileCheck --check-prefix=MIPSN32 %s
+# RUN: llvm-readobj --file-headers %t4mipsn32 | FileCheck --check-prefix=MIPSN32 %s
 # MIPSN32:      ElfHeader {
 # MIPSN32-NEXT:   Ident {
 # MIPSN32-NEXT:     Magic: (7F 45 4C 46)
@@ -96,14 +96,14 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips64el-unknown-linux-gnuabin32 %s -o %tmipsn32el
 # RUN: ld.lld -m elf32ltsmipn32 -e _start %tmipsn32el -o %t2mipsn32el
-# RUN: llvm-readobj -file-headers %t2mipsn32el | FileCheck --check-prefix=MIPSN32EL %s
+# RUN: llvm-readobj --file-headers %t2mipsn32el | FileCheck --check-prefix=MIPSN32EL %s
 # RUN: ld.lld -melf32ltsmipn32 -e _start %tmipsn32el -o %t2mipsn32el
-# RUN: llvm-readobj -file-headers %t2mipsn32el | FileCheck --check-prefix=MIPSN32EL %s
+# RUN: llvm-readobj --file-headers %t2mipsn32el | FileCheck --check-prefix=MIPSN32EL %s
 # RUN: ld.lld %tmipsn32el -e _start -o %t3mipsn32el
-# RUN: llvm-readobj -file-headers %t3mipsn32el | FileCheck --check-prefix=MIPSN32EL %s
+# RUN: llvm-readobj --file-headers %t3mipsn32el | FileCheck --check-prefix=MIPSN32EL %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-ntradlittlemips)' > %tmipsn32el.script
 # RUN: ld.lld %tmipsn32el.script -e _start %tmipsn32el -o %t4mipsn32el
-# RUN: llvm-readobj -file-headers %t4mipsn32el | FileCheck --check-prefix=MIPSN32EL %s
+# RUN: llvm-readobj --file-headers %t4mipsn32el | FileCheck --check-prefix=MIPSN32EL %s
 # MIPSN32EL:      ElfHeader {
 # MIPSN32EL-NEXT:   Ident {
 # MIPSN32EL-NEXT:     Magic: (7F 45 4C 46)
@@ -129,12 +129,12 @@
 # RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux -position-independent \
 # RUN:         %s -o %tmips64
 # RUN: ld.lld -m elf64btsmip -e _start %tmips64 -o %t2mips64
-# RUN: llvm-readobj -file-headers %t2mips64 | FileCheck --check-prefix=MIPS64 %s
+# RUN: llvm-readobj --file-headers %t2mips64 | FileCheck --check-prefix=MIPS64 %s
 # RUN: ld.lld %tmips64 -e _start -o %t3mips64
-# RUN: llvm-readobj -file-headers %t3mips64 | FileCheck --check-prefix=MIPS64 %s
+# RUN: llvm-readobj --file-headers %t3mips64 | FileCheck --check-prefix=MIPS64 %s
 # RUN: echo 'OUTPUT_FORMAT(elf64-tradbigmips)' > %tmips64.script
 # RUN: ld.lld %tmips64.script -e _start %tmips64 -o %t4mips64
-# RUN: llvm-readobj -file-headers %t4mips64 | FileCheck --check-prefix=MIPS64 %s
+# RUN: llvm-readobj --file-headers %t4mips64 | FileCheck --check-prefix=MIPS64 %s
 # MIPS64:      ElfHeader {
 # MIPS64-NEXT:   Ident {
 # MIPS64-NEXT:     Magic: (7F 45 4C 46)
@@ -160,12 +160,12 @@
 # RUN: llvm-mc -filetype=obj -triple=mips64el-unknown-linux \
 # RUN:         -position-independent %s -o %tmips64el
 # RUN: ld.lld -m elf64ltsmip -e _start %tmips64el -o %t2mips64el
-# RUN: llvm-readobj -file-headers %t2mips64el | FileCheck --check-prefix=MIPS64EL %s
+# RUN: llvm-readobj --file-headers %t2mips64el | FileCheck --check-prefix=MIPS64EL %s
 # RUN: ld.lld %tmips64el -e _start -o %t3mips64el
-# RUN: llvm-readobj -file-headers %t3mips64el | FileCheck --check-prefix=MIPS64EL %s
+# RUN: llvm-readobj --file-headers %t3mips64el | FileCheck --check-prefix=MIPS64EL %s
 # RUN: echo 'OUTPUT_FORMAT(elf64-tradlittlemips)' > %tmips64el.script
 # RUN: ld.lld %tmips64el.script -e _start %tmips64el -o %t4mips64el
-# RUN: llvm-readobj -file-headers %t4mips64el | FileCheck --check-prefix=MIPS64EL %s
+# RUN: llvm-readobj --file-headers %t4mips64el | FileCheck --check-prefix=MIPS64EL %s
 # MIPS64EL:      ElfHeader {
 # MIPS64EL-NEXT:   Ident {
 # MIPS64EL-NEXT:     Magic: (7F 45 4C 46)
diff --git a/deps/lld/test/ELF/emulation-ppc.s b/deps/lld/test/ELF/emulation-ppc.s
index 4c8beb10159e6c9dcba23057de1e3de09badb8f3..def78a521b207249853c1442fbfb57cc79f338b2 100644
--- a/deps/lld/test/ELF/emulation-ppc.s
+++ b/deps/lld/test/ELF/emulation-ppc.s
@@ -1,12 +1,12 @@
 # REQUIRES: ppc
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %tppc64
 # RUN: ld.lld -m elf64ppc %tppc64 -o %t2ppc64
-# RUN: llvm-readobj -file-headers %t2ppc64 | FileCheck --check-prefix=PPC64 %s
+# RUN: llvm-readobj --file-headers %t2ppc64 | FileCheck --check-prefix=PPC64 %s
 # RUN: ld.lld %tppc64 -o %t3ppc64
-# RUN: llvm-readobj -file-headers %t3ppc64 | FileCheck --check-prefix=PPC64 %s
+# RUN: llvm-readobj --file-headers %t3ppc64 | FileCheck --check-prefix=PPC64 %s
 # RUN: echo 'OUTPUT_FORMAT(elf64-powerpc)' > %tppc64.script
 # RUN: ld.lld %tppc64.script  %tppc64 -o %t4ppc64
-# RUN: llvm-readobj -file-headers %t4ppc64 | FileCheck --check-prefix=PPC64 %s
+# RUN: llvm-readobj --file-headers %t4ppc64 | FileCheck --check-prefix=PPC64 %s
 
 # PPC64:      ElfHeader {
 # PPC64-NEXT:   Ident {
@@ -38,7 +38,7 @@
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-freebsd %s -o %tppc64fbsd
 # RUN: echo 'OUTPUT_FORMAT(elf64-powerpc-freebsd)' > %tppc64fbsd.script
 # RUN: ld.lld %tppc64fbsd.script  %tppc64fbsd -o %t2ppc64fbsd
-# RUN: llvm-readobj -file-headers %t2ppc64fbsd | FileCheck --check-prefix=PPC64-FBSD %s
+# RUN: llvm-readobj --file-headers %t2ppc64fbsd | FileCheck --check-prefix=PPC64-FBSD %s
 
 # PPC64-FBSD:      ElfHeader {
 # PPC64-FBSD-NEXT:   Ident {
@@ -69,12 +69,12 @@
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %tppc64le
 # RUN: ld.lld -m elf64lppc %tppc64le -o %t2ppc64le
-# RUN: llvm-readobj -file-headers %t2ppc64le | FileCheck --check-prefix=PPC64LE %s
+# RUN: llvm-readobj --file-headers %t2ppc64le | FileCheck --check-prefix=PPC64LE %s
 # RUN: ld.lld %tppc64le -o %t3ppc64le
-# RUN: llvm-readobj -file-headers %t3ppc64le | FileCheck --check-prefix=PPC64LE %s
+# RUN: llvm-readobj --file-headers %t3ppc64le | FileCheck --check-prefix=PPC64LE %s
 # RUN: echo 'OUTPUT_FORMAT(elf64-powerpcle)' > %tppc64le.script
 # RUN: ld.lld %tppc64le.script  %tppc64le -o %t4ppc64le
-# RUN: llvm-readobj -file-headers %t4ppc64le | FileCheck --check-prefix=PPC64LE %s
+# RUN: llvm-readobj --file-headers %t4ppc64le | FileCheck --check-prefix=PPC64LE %s
 
 # PPC64LE:      ElfHeader {
 # PPC64LE-NEXT:   Ident {
@@ -105,14 +105,14 @@
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc-unknown-linux %s -o %tppc32
 # RUN: ld.lld -m elf32ppc %tppc32 -o %t2ppc32
-# RUN: llvm-readobj -file-headers %t2ppc32 | FileCheck --check-prefix=PPC32 %s
+# RUN: llvm-readobj --file-headers %t2ppc32 | FileCheck --check-prefix=PPC32 %s
 # RUN: ld.lld %tppc32 -o %t3ppc32
-# RUN: llvm-readobj -file-headers %t3ppc32 | FileCheck --check-prefix=PPC32 %s
+# RUN: llvm-readobj --file-headers %t3ppc32 | FileCheck --check-prefix=PPC32 %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-powerpc)' > %tppc32.script
 # RUN: ld.lld %tppc32.script  %tppc32 -o %t4ppc32
-# RUN: llvm-readobj -file-headers %t4ppc32 | FileCheck --check-prefix=PPC32 %s
+# RUN: llvm-readobj --file-headers %t4ppc32 | FileCheck --check-prefix=PPC32 %s
 # RUN: ld.lld -m elf32ppclinux %tppc32 -o %t5ppc32
-# RUN: llvm-readobj -file-headers %t5ppc32 | FileCheck --check-prefix=PPC32 %s
+# RUN: llvm-readobj --file-headers %t5ppc32 | FileCheck --check-prefix=PPC32 %s
 
 # PPC32:      ElfHeader {
 # PPC32-NEXT:   Ident {
diff --git a/deps/lld/test/ELF/emulation-riscv.s b/deps/lld/test/ELF/emulation-riscv.s
new file mode 100644
index 0000000000000000000000000000000000000000..7522b54d14291ba3dac7ac99850219d933696d00
--- /dev/null
+++ b/deps/lld/test/ELF/emulation-riscv.s
@@ -0,0 +1,74 @@
+# REQUIRES: riscv
+
+# RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-readobj --file-headers %t | FileCheck --check-prefix=RV32 %s
+# RUN: ld.lld -m elf32lriscv %t.o -o %t
+# RUN: llvm-readobj --file-headers %t | FileCheck --check-prefix=RV32 %s
+# RUN: echo 'OUTPUT_FORMAT(elf32-littleriscv)' > %t.script
+# RUN: ld.lld %t.script %t.o -o %t
+# RUN: llvm-readobj --file-headers %t | FileCheck --check-prefix=RV32 %s
+
+# RV32:      ElfHeader {
+# RV32-NEXT:   Ident {
+# RV32-NEXT:     Magic: (7F 45 4C 46)
+# RV32-NEXT:     Class: 32-bit (0x1)
+# RV32-NEXT:     DataEncoding: LittleEndian (0x1)
+# RV32-NEXT:     FileVersion: 1
+# RV32-NEXT:     OS/ABI: SystemV (0x0)
+# RV32-NEXT:     ABIVersion: 0
+# RV32-NEXT:     Unused: (00 00 00 00 00 00 00)
+# RV32-NEXT:   }
+# RV32-NEXT:   Type: Executable (0x2)
+# RV32-NEXT:   Machine: EM_RISCV (0xF3)
+# RV32-NEXT:   Version: 1
+# RV32-NEXT:   Entry:
+# RV32-NEXT:   ProgramHeaderOffset: 0x34
+# RV32-NEXT:   SectionHeaderOffset:
+# RV32-NEXT:   Flags [ (0x0)
+# RV32-NEXT:   ]
+# RV32-NEXT:   HeaderSize: 52
+# RV32-NEXT:   ProgramHeaderEntrySize: 32
+# RV32-NEXT:   ProgramHeaderCount:
+# RV32-NEXT:   SectionHeaderEntrySize: 40
+# RV32-NEXT:   SectionHeaderCount:
+# RV32-NEXT:   StringTableSectionIndex:
+# RV32-NEXT: }
+
+# RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-readobj --file-headers %t | FileCheck --check-prefix=RV64 %s
+# RUN: ld.lld -m elf64lriscv %t.o -o %t
+# RUN: llvm-readobj --file-headers %t | FileCheck --check-prefix=RV64 %s
+# RUN: echo 'OUTPUT_FORMAT(elf64-littleriscv)' > %t.script
+# RUN: ld.lld %t.script %t.o -o %t
+# RUN: llvm-readobj --file-headers %t | FileCheck --check-prefix=RV64 %s
+
+# RV64:      ElfHeader {
+# RV64-NEXT:   Ident {
+# RV64-NEXT:     Magic: (7F 45 4C 46)
+# RV64-NEXT:     Class: 64-bit (0x2)
+# RV64-NEXT:     DataEncoding: LittleEndian (0x1)
+# RV64-NEXT:     FileVersion: 1
+# RV64-NEXT:     OS/ABI: SystemV (0x0)
+# RV64-NEXT:     ABIVersion: 0
+# RV64-NEXT:     Unused: (00 00 00 00 00 00 00)
+# RV64-NEXT:   }
+# RV64-NEXT:   Type: Executable (0x2)
+# RV64-NEXT:   Machine: EM_RISCV (0xF3)
+# RV64-NEXT:   Version: 1
+# RV64-NEXT:   Entry:
+# RV64-NEXT:   ProgramHeaderOffset: 0x40
+# RV64-NEXT:   SectionHeaderOffset:
+# RV64-NEXT:   Flags [ (0x0)
+# RV64-NEXT:   ]
+# RV64-NEXT:   HeaderSize: 64
+# RV64-NEXT:   ProgramHeaderEntrySize: 56
+# RV64-NEXT:   ProgramHeaderCount:
+# RV64-NEXT:   SectionHeaderEntrySize: 64
+# RV64-NEXT:   SectionHeaderCount:
+# RV64-NEXT:   StringTableSectionIndex:
+# RV64-NEXT: }
+
+.globl _start
+_start:
diff --git a/deps/lld/test/ELF/emulation-x86.s b/deps/lld/test/ELF/emulation-x86.s
index 02b89435669287e428053723bb4fa6e38ead9852..0fbb6f261bfba2a97118dc54ccd52a43e995f124 100644
--- a/deps/lld/test/ELF/emulation-x86.s
+++ b/deps/lld/test/ELF/emulation-x86.s
@@ -1,15 +1,15 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-freebsd %s -o %tx64
 # RUN: ld.lld -m elf_amd64_fbsd %tx64 -o %t2x64
-# RUN: llvm-readobj -file-headers %t2x64 | FileCheck --check-prefix=AMD64 %s
+# RUN: llvm-readobj --file-headers %t2x64 | FileCheck --check-prefix=AMD64 %s
 # RUN: ld.lld %tx64 -o %t3x64
-# RUN: llvm-readobj -file-headers %t3x64 | FileCheck --check-prefix=AMD64 %s
+# RUN: llvm-readobj --file-headers %t3x64 | FileCheck --check-prefix=AMD64 %s
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.sysv
 # RUN: ld.lld -m elf_amd64_fbsd %t.sysv -o %t.freebsd
-# RUN: llvm-readobj -file-headers %t.freebsd | FileCheck --check-prefix=AMD64 %s
+# RUN: llvm-readobj --file-headers %t.freebsd | FileCheck --check-prefix=AMD64 %s
 # RUN: echo 'OUTPUT_FORMAT(elf64-x86-64-freebsd)' > %t4x64.script
 # RUN: ld.lld %t4x64.script %tx64 -o %t4x64
-# RUN: llvm-readobj -file-headers %t4x64 | FileCheck --check-prefix=AMD64 %s
+# RUN: llvm-readobj --file-headers %t4x64 | FileCheck --check-prefix=AMD64 %s
 # AMD64:      ElfHeader {
 # AMD64-NEXT:   Ident {
 # AMD64-NEXT:     Magic: (7F 45 4C 46)
@@ -38,13 +38,13 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %tx64
 # RUN: ld.lld -m elf_x86_64 %tx64 -o %t2x64
-# RUN: llvm-readobj -file-headers %t2x64 | FileCheck --check-prefix=X86-64 %s
+# RUN: llvm-readobj --file-headers %t2x64 | FileCheck --check-prefix=X86-64 %s
 # RUN: ld.lld %tx64 -o %t3x64
-# RUN: llvm-readobj -file-headers %t3x64 | FileCheck --check-prefix=X86-64 %s
+# RUN: llvm-readobj --file-headers %t3x64 | FileCheck --check-prefix=X86-64 %s
 # RUN: echo 'OUTPUT_FORMAT(elf64-x86-64)' > %t4x64.script
 # RUN: ld.lld %t4x64.script %tx64 -o %t4x64
 # RUN: ld.lld %tx64 -o %t4x64 %t4x64.script
-# RUN: llvm-readobj -file-headers %t4x64 | FileCheck --check-prefix=X86-64 %s
+# RUN: llvm-readobj --file-headers %t4x64 | FileCheck --check-prefix=X86-64 %s
 # X86-64:      ElfHeader {
 # X86-64-NEXT:   Ident {
 # X86-64-NEXT:     Magic: (7F 45 4C 46)
@@ -73,12 +73,12 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux-gnux32 %s -o %tx32
 # RUN: ld.lld -m elf32_x86_64 %tx32 -o %t2x32
-# RUN: llvm-readobj -file-headers %t2x32 | FileCheck --check-prefix=X32 %s
+# RUN: llvm-readobj --file-headers %t2x32 | FileCheck --check-prefix=X32 %s
 # RUN: ld.lld %tx32 -o %t3x32
-# RUN: llvm-readobj -file-headers %t3x32 | FileCheck --check-prefix=X32 %s
+# RUN: llvm-readobj --file-headers %t3x32 | FileCheck --check-prefix=X32 %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-x86-64)' > %t4x32.script
 # RUN: ld.lld %t4x32.script %tx32 -o %t4x32
-# RUN: llvm-readobj -file-headers %t4x32 | FileCheck --check-prefix=X32 %s
+# RUN: llvm-readobj --file-headers %t4x32 | FileCheck --check-prefix=X32 %s
 # X32:      ElfHeader {
 # X32-NEXT:   Ident {
 # X32-NEXT:     Magic: (7F 45 4C 46)
@@ -107,12 +107,12 @@
 
 # RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %tx86
 # RUN: ld.lld -m elf_i386 %tx86 -o %t2x86
-# RUN: llvm-readobj -file-headers %t2x86 | FileCheck --check-prefix=X86 %s
+# RUN: llvm-readobj --file-headers %t2x86 | FileCheck --check-prefix=X86 %s
 # RUN: ld.lld %tx86 -o %t3x86
-# RUN: llvm-readobj -file-headers %t3x86 | FileCheck --check-prefix=X86 %s
+# RUN: llvm-readobj --file-headers %t3x86 | FileCheck --check-prefix=X86 %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-i386)' > %t4x86.script
 # RUN: ld.lld %t4x86.script %tx86 -o %t4x86
-# RUN: llvm-readobj -file-headers %t4x86 | FileCheck --check-prefix=X86 %s
+# RUN: llvm-readobj --file-headers %t4x86 | FileCheck --check-prefix=X86 %s
 # X86:      ElfHeader {
 # X86-NEXT:   Ident {
 # X86-NEXT:     Magic: (7F 45 4C 46)
@@ -141,12 +141,12 @@
 
 # RUN: llvm-mc -filetype=obj -triple=i686-unknown-freebsd %s -o %tx86fbsd
 # RUN: ld.lld -m elf_i386_fbsd %tx86fbsd -o %t2x86fbsd
-# RUN: llvm-readobj -file-headers %t2x86fbsd | FileCheck --check-prefix=X86FBSD %s
+# RUN: llvm-readobj --file-headers %t2x86fbsd | FileCheck --check-prefix=X86FBSD %s
 # RUN: ld.lld %tx86fbsd -o %t3x86fbsd
-# RUN: llvm-readobj -file-headers %t3x86fbsd | FileCheck --check-prefix=X86FBSD %s
+# RUN: llvm-readobj --file-headers %t3x86fbsd | FileCheck --check-prefix=X86FBSD %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-i386-freebsd)' > %t4x86fbsd.script
 # RUN: ld.lld %t4x86fbsd.script %tx86fbsd -o %t4x86fbsd
-# RUN: llvm-readobj -file-headers %t4x86fbsd | FileCheck --check-prefix=X86FBSD %s
+# RUN: llvm-readobj --file-headers %t4x86fbsd | FileCheck --check-prefix=X86FBSD %s
 # X86FBSD:      ElfHeader {
 # X86FBSD-NEXT:   Ident {
 # X86FBSD-NEXT:     Magic: (7F 45 4C 46)
@@ -175,12 +175,12 @@
 
 # RUN: llvm-mc -filetype=obj -triple=i586-intel-elfiamcu %s -o %tiamcu
 # RUN: ld.lld -m elf_iamcu %tiamcu -o %t2iamcu
-# RUN: llvm-readobj -file-headers %t2iamcu | FileCheck --check-prefix=IAMCU %s
+# RUN: llvm-readobj --file-headers %t2iamcu | FileCheck --check-prefix=IAMCU %s
 # RUN: ld.lld %tiamcu -o %t3iamcu
-# RUN: llvm-readobj -file-headers %t3iamcu | FileCheck --check-prefix=IAMCU %s
+# RUN: llvm-readobj --file-headers %t3iamcu | FileCheck --check-prefix=IAMCU %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-iamcu)' > %t4iamcu.script
 # RUN: ld.lld %t4iamcu.script %tiamcu -o %t4iamcu
-# RUN: llvm-readobj -file-headers %t4iamcu | FileCheck --check-prefix=IAMCU %s
+# RUN: llvm-readobj --file-headers %t4iamcu | FileCheck --check-prefix=IAMCU %s
 # IAMCU:      ElfHeader {
 # IAMCU-NEXT:   Ident {
 # IAMCU-NEXT:     Magic: (7F 45 4C 46)
diff --git a/deps/lld/test/ELF/end-update.s b/deps/lld/test/ELF/end-update.s
index 9ece23ce9ac2337f902abfbbce5b93b4b3146c39..c485d8a949e273baba04fd58059124dcf33b8085 100644
--- a/deps/lld/test/ELF/end-update.s
+++ b/deps/lld/test/ELF/end-update.s
@@ -3,7 +3,7 @@
 
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -sections -symbols %t | FileCheck %s
+// RUN: llvm-readobj --sections --symbols %t | FileCheck %s
 
 // CHECK: Sections [
 // CHECK:     Name: .bss
diff --git a/deps/lld/test/ELF/end.s b/deps/lld/test/ELF/end.s
index 530a007837045ce4314f3dafa8f0f0b78ac9ffd7..9ddf208348ea14984fddbe60bb5391922e6ba7f9 100644
--- a/deps/lld/test/ELF/end.s
+++ b/deps/lld/test/ELF/end.s
@@ -5,7 +5,7 @@
 
 // By default, the .bss section is the latest section of the data segment.
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -sections -symbols %t | FileCheck %s --check-prefix=DEFAULT
+// RUN: llvm-readobj --sections --symbols %t | FileCheck %s --check-prefix=DEFAULT
 
 // DEFAULT: Sections [
 // DEFAULT:     Name: .bss
diff --git a/deps/lld/test/ELF/entry.s b/deps/lld/test/ELF/entry.s
index cc7a7248f08223f86b845248334ca7eb72685a70..b469138ecc2603614aa8f8db828d121fe7d22a14 100644
--- a/deps/lld/test/ELF/entry.s
+++ b/deps/lld/test/ELF/entry.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
 
 # RUN: ld.lld -e foobar %t1 -o %t2 2>&1 | FileCheck -check-prefix=WARN1 %s
-# RUN: llvm-readobj -file-headers %t2 | FileCheck -check-prefix=TEXT %s
+# RUN: llvm-readobj --file-headers %t2 | FileCheck -check-prefix=TEXT %s
 
 # WARN1: warning: cannot find entry symbol foobar; defaulting to 0x201000
 # TEXT: Entry: 0x201000
@@ -19,7 +19,7 @@
 # RUN: echo .data > %t.s
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux -n %t.s -o %t3
 # RUN: ld.lld %t3 -o %t4 2>&1 | FileCheck -check-prefix=WARN4 %s
-# RUN: llvm-readobj -file-headers %t4 | FileCheck -check-prefix=NOENTRY %s
+# RUN: llvm-readobj --file-headers %t4 | FileCheck -check-prefix=NOENTRY %s
 
 # WARN4: cannot find entry symbol _start; not setting start address
 # NOENTRY: Entry: 0x0
@@ -28,23 +28,23 @@
 # WARN5-NOT: warning: cannot find entry symbol
 
 # RUN: ld.lld %t1 -o %t2 -e entry
-# RUN: llvm-readobj -file-headers %t2 | FileCheck -check-prefix=SYM %s
+# RUN: llvm-readobj --file-headers %t2 | FileCheck -check-prefix=SYM %s
 # SYM: Entry: 0x201008
 
 # RUN: ld.lld %t1 --fatal-warnings -shared -o %t2 -e entry
-# RUN: llvm-readobj -file-headers %t2 | FileCheck -check-prefix=DSO %s
+# RUN: llvm-readobj --file-headers %t2 | FileCheck -check-prefix=DSO %s
 # DSO: Entry: 0x1008
 
 # RUN: ld.lld %t1 -o %t2 --entry=4096
-# RUN: llvm-readobj -file-headers %t2 | FileCheck -check-prefix=DEC %s
+# RUN: llvm-readobj --file-headers %t2 | FileCheck -check-prefix=DEC %s
 # DEC: Entry: 0x1000
 
 # RUN: ld.lld %t1 -o %t2 --entry 0xcafe
-# RUN: llvm-readobj -file-headers %t2 | FileCheck -check-prefix=HEX %s
+# RUN: llvm-readobj --file-headers %t2 | FileCheck -check-prefix=HEX %s
 # HEX: Entry: 0xCAFE
 
 # RUN: ld.lld %t1 -o %t2 -e 0777
-# RUN: llvm-readobj -file-headers %t2 | FileCheck -check-prefix=OCT %s
+# RUN: llvm-readobj --file-headers %t2 | FileCheck -check-prefix=OCT %s
 # OCT: Entry: 0x1FF
 
 .globl entry
diff --git a/deps/lld/test/ELF/exclude-discarded-error.s b/deps/lld/test/ELF/exclude-discarded-error.s
new file mode 100644
index 0000000000000000000000000000000000000000..f51edfe850c845baa235cd77aaa29a7215872c0a
--- /dev/null
+++ b/deps/lld/test/ELF/exclude-discarded-error.s
@@ -0,0 +1,15 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: not ld.lld %t.o -o /dev/null 2>&1 | FileCheck %s
+
+# CHECK:      error: relocation refers to a symbol in a discarded section: foo
+# CHECK-NEXT: >>> defined in {{.*}}.o
+# CHECK-NEXT: >>> referenced by {{.*}}.o:(.text+0x1)
+
+.globl _start
+_start:
+  jmp foo
+
+.section .foo,"ae"
+.globl foo
+foo:
diff --git a/deps/lld/test/ELF/exclude-discarded-error2.s b/deps/lld/test/ELF/exclude-discarded-error2.s
new file mode 100644
index 0000000000000000000000000000000000000000..5474cfe8170fe0e0110bd4cf73920351edcc46de
--- /dev/null
+++ b/deps/lld/test/ELF/exclude-discarded-error2.s
@@ -0,0 +1,14 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: echo '.section .foo,"ae"; .weak foo; foo:' | \
+# RUN:   llvm-mc -filetype=obj -triple=x86_64 - -o %t1.o
+# RUN: not ld.lld %t.o %t1.o -o /dev/null 2>&1 | FileCheck %s
+
+# Because foo defined in %t1.o is weak, it does not override global undefined
+# in %t.o
+# CHECK-NOT: discarded section
+# CHECK: undefined symbol: foo
+
+.globl _start
+_start:
+  jmp foo
diff --git a/deps/lld/test/ELF/exclude-libs.s b/deps/lld/test/ELF/exclude-libs.s
index c061c484b344fea5187a1ad3f073f7dff77184c4..513eb20ba6b48241f8e199550b151cb13c9e04af 100644
--- a/deps/lld/test/ELF/exclude-libs.s
+++ b/deps/lld/test/ELF/exclude-libs.s
@@ -9,28 +9,28 @@
 // RUN: llvm-ar rcs %t.dir/exc.a %t2.o %t3.o
 
 // RUN: ld.lld -shared %t.o %t.dir/exc.a -o %t.exe
-// RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=DEFAULT %s
+// RUN: llvm-readobj --dyn-syms %t.exe | FileCheck --check-prefix=DEFAULT %s
 
 // RUN: ld.lld -shared %t.o %t.dir/exc.a -o %t.exe --exclude-libs=foo,bar
-// RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=DEFAULT %s
+// RUN: llvm-readobj --dyn-syms %t.exe | FileCheck --check-prefix=DEFAULT %s
 
 // RUN: ld.lld -shared %t.o %t.dir/exc.a -o %t.exe --exclude-libs foo,bar,exc.a
-// RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=EXCLUDE %s
+// RUN: llvm-readobj --dyn-syms %t.exe | FileCheck --check-prefix=EXCLUDE %s
 
 // RUN: ld.lld -shared %t.o %t.dir/exc.a -o %t.exe --exclude-libs foo:bar:exc.a
-// RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=EXCLUDE %s
+// RUN: llvm-readobj --dyn-syms %t.exe | FileCheck --check-prefix=EXCLUDE %s
 
 // RUN: ld.lld -shared %t.o %t.dir/exc.a -o %t.exe --exclude-libs=ALL
-// RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=EXCLUDE %s
+// RUN: llvm-readobj --dyn-syms %t.exe | FileCheck --check-prefix=EXCLUDE %s
 
 // RUN: ld.lld -shared %t.o %t2.o %t3.o %t.dir/exc.a -o %t.exe --exclude-libs=ALL
-// RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=DEFAULT %s
+// RUN: llvm-readobj --dyn-syms %t.exe | FileCheck --check-prefix=DEFAULT %s
 
 // RUN: ld.lld -shared --whole-archive %t.o %t.dir/exc.a -o %t.exe --exclude-libs foo,bar,exc.a
-// RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=EXCLUDE %s
+// RUN: llvm-readobj --dyn-syms %t.exe | FileCheck --check-prefix=EXCLUDE %s
 
 // RUN: ld.lld -shared --whole-archive %t.o %t.dir/exc.a -o %t.exe --exclude-libs=ALL
-// RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=EXCLUDE %s
+// RUN: llvm-readobj --dyn-syms %t.exe | FileCheck --check-prefix=EXCLUDE %s
 
 // DEFAULT: Name: fn
 // DEFAULT: Name: fn2
diff --git a/deps/lld/test/ELF/executable-undefined-ignoreall.s b/deps/lld/test/ELF/executable-undefined-ignoreall.s
index 44f83a687ee2a045c18084cfe39aaadc7d57824e..514435afcfeffc4c0f4fb52a065d10d7d65c0e8c 100644
--- a/deps/lld/test/ELF/executable-undefined-ignoreall.s
+++ b/deps/lld/test/ELF/executable-undefined-ignoreall.s
@@ -5,7 +5,7 @@
 
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section ({{.*}}) .rela.plt {
-# CHECK-NEXT:     0x2018 R_X86_64_JUMP_SLOT foo 0x0
+# CHECK-NEXT:     0x3018 R_X86_64_JUMP_SLOT foo 0x0
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 
diff --git a/deps/lld/test/ELF/executable-undefined-protected-ignoreall.s b/deps/lld/test/ELF/executable-undefined-protected-ignoreall.s
index 967a6938867076d5fe11bf65113cc34442dc5bb8..ebc52dbfdd2ec8ea4f78e7e8378741c258b5b4af 100644
--- a/deps/lld/test/ELF/executable-undefined-protected-ignoreall.s
+++ b/deps/lld/test/ELF/executable-undefined-protected-ignoreall.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: not ld.lld %t -o /dev/null --unresolved-symbols=ignore-all -pie 2>&1 | FileCheck %s
-# CHECK: error: undefined symbol: foo
+# CHECK: error: undefined protected symbol: foo
 
 .protected foo
 _start:
diff --git a/deps/lld/test/ELF/fill-trap-ppc.s b/deps/lld/test/ELF/fill-trap-ppc.s
index da7d7cb320bbffe9a9c58b56971892daef9e5f41..d9a995e37c86c94fd34f2d839b717e4d68eed473 100644
--- a/deps/lld/test/ELF/fill-trap-ppc.s
+++ b/deps/lld/test/ELF/fill-trap-ppc.s
@@ -2,12 +2,12 @@
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t.ppc64le
-# RUN: llvm-readobj -program-headers %t.ppc64le | FileCheck %s
+# RUN: llvm-readobj -l %t.ppc64le | FileCheck %s
 # RUN: od -Ax -t x1 -N16 -j0x10ff0 %t.ppc64le | FileCheck %s -check-prefix=LE
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t.ppc64
-# RUN: llvm-readobj -program-headers %t.ppc64 | FileCheck %s
+# RUN: llvm-readobj -l %t.ppc64 | FileCheck %s
 # RUN: od -Ax -t x1 -N16 -j0x10ff0 %t.ppc64 | FileCheck %s -check-prefix=BE
 
 # CHECK: ProgramHeader {
diff --git a/deps/lld/test/ELF/fill-trap.s b/deps/lld/test/ELF/fill-trap.s
index 001b904a77909fdc86532121d3696dc0a5bf20ae..ccd9f6cb5da02b45115f048d71efacc1c7fccae7 100644
--- a/deps/lld/test/ELF/fill-trap.s
+++ b/deps/lld/test/ELF/fill-trap.s
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj -l %t2 | FileCheck %s
 # RUN: od -Ax -x -N16 -j0x1ff0 %t2 | FileCheck %s -check-prefix=FILL
 
 # CHECK: ProgramHeader {
diff --git a/deps/lld/test/ELF/format-binary-non-ascii.s b/deps/lld/test/ELF/format-binary-non-ascii.s
index 36263e5ddabac3a271005e1a27d40b1943d4ea2a..ce74171dce9a4198c0c7e241d2e304176c027385 100644
--- a/deps/lld/test/ELF/format-binary-non-ascii.s
+++ b/deps/lld/test/ELF/format-binary-non-ascii.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t£.o
 
 # RUN: ld.lld -o %t.elf %t£.o --format=binary %t£.o
-# RUN: llvm-readobj -symbols %t.elf | FileCheck %s
+# RUN: llvm-readobj --symbols %t.elf | FileCheck %s
 
 # CHECK: Name: _binary_{{[a-zA-Z0-9_]+}}test_ELF_Output_format_binary_non_ascii_s_tmp_{{[_]+}}o_start
 # CHECK: Name: _binary_{{[a-zA-Z0-9_]+}}test_ELF_Output_format_binary_non_ascii_s_tmp_{{[_]+}}o_end
diff --git a/deps/lld/test/ELF/gc-debuginfo-tls.s b/deps/lld/test/ELF/gc-debuginfo-tls.s
index e23578f58c25af71d519d7e62080f3794de1df51..2fe6a32965d44093953efacb68ac47f459423dbc 100644
--- a/deps/lld/test/ELF/gc-debuginfo-tls.s
+++ b/deps/lld/test/ELF/gc-debuginfo-tls.s
@@ -2,8 +2,8 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o --gc-sections -shared -o %t1
 # RUN: ld.lld %t.o -shared -o %t2
-# RUN: llvm-readobj -symbols %t1 | FileCheck %s --check-prefix=GC
-# RUN: llvm-readobj -symbols %t2 | FileCheck %s --check-prefix=NOGC
+# RUN: llvm-readobj --symbols %t1 | FileCheck %s --check-prefix=GC
+# RUN: llvm-readobj --symbols %t2 | FileCheck %s --check-prefix=NOGC
 
 # NOGC:      Symbol {
 # NOGC:        Name: patatino
diff --git a/deps/lld/test/ELF/gc-merge-local-sym.s b/deps/lld/test/ELF/gc-merge-local-sym.s
index b82d0cebae82500f806c1e4ec87548e780d119bc..ae93ab751eb07735e95c01acdee19128cc715301 100644
--- a/deps/lld/test/ELF/gc-merge-local-sym.s
+++ b/deps/lld/test/ELF/gc-merge-local-sym.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t.o -o %t.so -shared -O3 --gc-sections
-// RUN: llvm-readobj -s -section-data -t %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data --symbols %t.so | FileCheck %s
 
 // CHECK:      Name: .rodata
 // CHECK-NEXT: Type: SHT_PROGBITS
diff --git a/deps/lld/test/ELF/gc-sections-alloc.s b/deps/lld/test/ELF/gc-sections-alloc.s
index bffd1f9cdcab7afd2afa39d4c7035b946f4a5189..70f917a0fbfcda3c3aeeedde43a9252559f97acd 100644
--- a/deps/lld/test/ELF/gc-sections-alloc.s
+++ b/deps/lld/test/ELF/gc-sections-alloc.s
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2 --gc-sections -shared
-# RUN: llvm-readobj -sections  -section-data %t2 | FileCheck %s
+# RUN: llvm-readobj --sections  --section-data %t2 | FileCheck %s
 
 # Non alloca section .bar should not keep section .foo alive.
 
diff --git a/deps/lld/test/ELF/gc-sections-eh.s b/deps/lld/test/ELF/gc-sections-eh.s
index 88c3dd0d9ca4374a858d8907038553667189a2ac..2eee328b44569aea49cfc57cd7a3153db8146d7d 100644
--- a/deps/lld/test/ELF/gc-sections-eh.s
+++ b/deps/lld/test/ELF/gc-sections-eh.s
@@ -3,11 +3,11 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 
 # RUN: ld.lld %t -o %t2 --gc-sections
-# RUN: llvm-readobj -t %t2 | FileCheck %s
+# RUN: llvm-readobj --symbols %t2 | FileCheck %s
 # RUN: llvm-objdump --dwarf=frames %t2 | FileCheck --check-prefix=EH %s
 
 # RUN: ld.lld %t -o %t3
-# RUN: llvm-readobj -t %t3 | FileCheck --check-prefix=NOGC %s
+# RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=NOGC %s
 # RUN: llvm-objdump --dwarf=frames %t3 | FileCheck --check-prefix=EHNOGC %s
 
 # CHECK-NOT: foo
diff --git a/deps/lld/test/ELF/gc-sections-implicit-addend.s b/deps/lld/test/ELF/gc-sections-implicit-addend.s
index e3bdeaac1d7fe624c229b0aa8859973229de6cfc..d673f936cb7cd1ec5f1fd61ef3cb88d568fcb130 100644
--- a/deps/lld/test/ELF/gc-sections-implicit-addend.s
+++ b/deps/lld/test/ELF/gc-sections-implicit-addend.s
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=i386-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t --gc-sections
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 # RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
 # CHECK:      Name: .foo
diff --git a/deps/lld/test/ELF/gc-sections-keep-shared-start.s b/deps/lld/test/ELF/gc-sections-keep-shared-start.s
index 23417ca01dc60bee5732fcb9414b1f299ea2269c..7eb3c6ce3b8520286950f6639d15da1b44bab549 100644
--- a/deps/lld/test/ELF/gc-sections-keep-shared-start.s
+++ b/deps/lld/test/ELF/gc-sections-keep-shared-start.s
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld -shared --gc-sections -o %t1 %t
-# RUN: llvm-readobj --elf-output-style=GNU --file-headers --symbols %t1
+# RUN: llvm-readelf --file-headers --symbols %t1
 #   | FileCheck %s
 # CHECK: Entry point address:               0x1000
 # CHECK: 0000000000001000     0 FUNC    LOCAL  HIDDEN     4 _start
diff --git a/deps/lld/test/ELF/gc-sections-linker-defined-symbol.s b/deps/lld/test/ELF/gc-sections-linker-defined-symbol.s
index e570116e31e1bc0f1c078be5b05a6fa761ed81ae..b033123187bbee9fd1de0776484ce558271e0b3c 100644
--- a/deps/lld/test/ELF/gc-sections-linker-defined-symbol.s
+++ b/deps/lld/test/ELF/gc-sections-linker-defined-symbol.s
@@ -10,7 +10,7 @@
 # CHECK-NEXT: Binding: Global
 # CHECK-NEXT: Type: None
 # CHECK-NEXT: Other:
-# CHECK-NEXT: Section: .dynamic
+# CHECK-NEXT: Section: .data
 
         .data
         .globl g
diff --git a/deps/lld/test/ELF/gc-sections-local-sym.s b/deps/lld/test/ELF/gc-sections-local-sym.s
index 15bca37ca4096f50cd380de39ba8deeff00e468e..d43275e2167a894f239712ee9b9b7e07c03fb4f6 100644
--- a/deps/lld/test/ELF/gc-sections-local-sym.s
+++ b/deps/lld/test/ELF/gc-sections-local-sym.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %t2 -shared --gc-sections
-// RUN: llvm-readobj -t -s -section-data %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols -S --section-data %t2 | FileCheck %s
 
 .global foo
 foo:
diff --git a/deps/lld/test/ELF/gc-sections-lsda.s b/deps/lld/test/ELF/gc-sections-lsda.s
index 1fc75c8e85b774b72fb85ffde651218fe166782e..701c6a7b3b214445271ffa6b3f932b7df416da60 100644
--- a/deps/lld/test/ELF/gc-sections-lsda.s
+++ b/deps/lld/test/ELF/gc-sections-lsda.s
@@ -7,7 +7,7 @@
 // precise and gc the entire contents of this file, but test that at least
 // we are consistent: if we keep .abc, we have to keep .foo
 
-// RUN: llvm-readobj -s %t | FileCheck %s
+// RUN: llvm-readobj -S %t | FileCheck %s
 // CHECK:  Name: .abc
 // CHECK: Name: .foo
 
diff --git a/deps/lld/test/ELF/gc-sections-merge-addend.s b/deps/lld/test/ELF/gc-sections-merge-addend.s
index 4dd95b43bfc03e4f5afcc6845a22a4f230a3ca59..6e883a15787cfd1da23385e46b8a7ba2648d5bd6 100644
--- a/deps/lld/test/ELF/gc-sections-merge-addend.s
+++ b/deps/lld/test/ELF/gc-sections-merge-addend.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t.o -o %t.so -shared --gc-sections
-// RUN: llvm-readobj -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
 
 
 // CHECK:      Name: .rodata
diff --git a/deps/lld/test/ELF/gc-sections-merge-implicit-addend.s b/deps/lld/test/ELF/gc-sections-merge-implicit-addend.s
index 36bb21126434c7a994511a8e34a0d529e3f83d44..efd432c15ccfd5166a40d238a63d76af4ce6d63c 100644
--- a/deps/lld/test/ELF/gc-sections-merge-implicit-addend.s
+++ b/deps/lld/test/ELF/gc-sections-merge-implicit-addend.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=i386-pc-linux
 // RUN: ld.lld %t.o -o %t.so -shared --gc-sections
-// RUN: llvm-readobj -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
 
 
 // CHECK:      Name: .rodata
diff --git a/deps/lld/test/ELF/gc-sections-merge.s b/deps/lld/test/ELF/gc-sections-merge.s
index 08dfdaaea669a5735db94c5af07d38e314d84bf8..08b619f0118536a3bc80d8e0281e63d3185a6c8a 100644
--- a/deps/lld/test/ELF/gc-sections-merge.s
+++ b/deps/lld/test/ELF/gc-sections-merge.s
@@ -2,8 +2,8 @@
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t.o -o %t.so -shared
 // RUN: ld.lld %t.o -o %t.gc.so -shared --gc-sections
-// RUN: llvm-readobj -s -section-data %t.so | FileCheck %s
-// RUN: llvm-readobj -s -section-data %t.gc.so | FileCheck --check-prefix=GC %s
+// RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t.gc.so | FileCheck --check-prefix=GC %s
 
 
 // CHECK:      Name: .rodata
diff --git a/deps/lld/test/ELF/gc-sections-metadata-startstop.s b/deps/lld/test/ELF/gc-sections-metadata-startstop.s
index ede1899698c4fadd5577af550afb4eedae64f5fb..0a1efb7e607581da14e49ec89ff7d29a37a89ee9 100644
--- a/deps/lld/test/ELF/gc-sections-metadata-startstop.s
+++ b/deps/lld/test/ELF/gc-sections-metadata-startstop.s
@@ -11,7 +11,7 @@
 # CHECK-NOT: yy
 
 # CHECK: SYMBOL TABLE:
-# CHECK: xx 00000000 __start_xx
+# CHECK:   xx    00000000 .protected __start_xx
 # CHECK: w *UND* 00000000 __start_yy
 
 .weak __start_xx
diff --git a/deps/lld/test/ELF/gc-sections-non-alloc-to-merge.s b/deps/lld/test/ELF/gc-sections-non-alloc-to-merge.s
index 37b0328d8455e63e824908c981ac9d734803c343..2b7b38498e0b9ccd69cfe75eaeccfcf39332da43 100644
--- a/deps/lld/test/ELF/gc-sections-non-alloc-to-merge.s
+++ b/deps/lld/test/ELF/gc-sections-non-alloc-to-merge.s
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t --gc-sections
-# RUN: llvm-readobj -s --elf-output-style=GNU %t | FileCheck %s
+# RUN: llvm-readelf -S %t | FileCheck %s
 
 # CHECK:  .merge1     PROGBITS    {{[0-9a-z]*}} {{[0-9a-z]*}} 000004
 
diff --git a/deps/lld/test/ELF/gc-sections-protected.s b/deps/lld/test/ELF/gc-sections-protected.s
index 28e779b1b7a1fa3b9b29e403339895da9cf4cf5c..7bc34429d043e1f22243824b97feae2c18196f62 100644
--- a/deps/lld/test/ELF/gc-sections-protected.s
+++ b/deps/lld/test/ELF/gc-sections-protected.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t.o -o %t.so -shared --gc-sections
-// RUN: llvm-readobj -s %t.so | FileCheck %s
+// RUN: llvm-readobj -S %t.so | FileCheck %s
 
 // CHECK:      Name: .text
 // CHECK-NEXT: Type: SHT_PROGBITS
diff --git a/deps/lld/test/ELF/gc-sections-synthetic.s b/deps/lld/test/ELF/gc-sections-synthetic.s
index e47cc02cdde7fed62b4078681aaabf38bfed7b7e..faf6c8a0ff685b9951906203e2318bfe256a7d62 100644
--- a/deps/lld/test/ELF/gc-sections-synthetic.s
+++ b/deps/lld/test/ELF/gc-sections-synthetic.s
@@ -6,7 +6,7 @@
 # RUN: ld.lld %t1 -shared -o %t.so
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t2
 # RUN: ld.lld %t2 %t.so -build-id -dynamic-linker /foo/bar -o %t.out
-# RUN: llvm-readobj -sections %t.out | FileCheck %s
+# RUN: llvm-readobj --sections %t.out | FileCheck %s
 
 # CHECK: Name: .interp
 # CHECK: Name: .note.gnu.build-id
diff --git a/deps/lld/test/ELF/gc-sections-undefined.s b/deps/lld/test/ELF/gc-sections-undefined.s
index e1ce9c7397380d20484010c5b3dcf05aa7bb4bec..e681d9ab22b9e802d699e433718465c52453aeae 100644
--- a/deps/lld/test/ELF/gc-sections-undefined.s
+++ b/deps/lld/test/ELF/gc-sections-undefined.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t1 --gc-sections --undefined=foo
-# RUN: llvm-readobj -t %t1 | FileCheck %s
+# RUN: llvm-readobj --symbols %t1 | FileCheck %s
 
 # CHECK: foo
 
diff --git a/deps/lld/test/ELF/gc-sections-weak.s b/deps/lld/test/ELF/gc-sections-weak.s
index 625b613843ba6f2fb745680bc4ccd105c9320c62..d96d5266308323521dcde910a9a5e57b78601eaa 100644
--- a/deps/lld/test/ELF/gc-sections-weak.s
+++ b/deps/lld/test/ELF/gc-sections-weak.s
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/gc-sections-weak.s -o %t2.o
 // RUN: ld.lld %t.o %t2.o -o %t.so -shared --gc-sections
-// RUN: llvm-readobj -s %t.so | FileCheck %s
+// RUN: llvm-readobj -S %t.so | FileCheck %s
 
 .global foo
 foo:
diff --git a/deps/lld/test/ELF/gc-sections.s b/deps/lld/test/ELF/gc-sections.s
index 0ae6fa4f06de2a679805f656083af3c5b72b0b4e..b7f9b3db182072deca72ca8bae91d3665958b523 100644
--- a/deps/lld/test/ELF/gc-sections.s
+++ b/deps/lld/test/ELF/gc-sections.s
@@ -2,11 +2,11 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -sections -symbols %t2 | FileCheck -check-prefix=NOGC %s
+# RUN: llvm-readobj --sections --symbols %t2 | FileCheck -check-prefix=NOGC %s
 # RUN: ld.lld --gc-sections %t -o %t2
-# RUN: llvm-readobj -sections -symbols %t2 | FileCheck -check-prefix=GC1 %s
+# RUN: llvm-readobj --sections --symbols %t2 | FileCheck -check-prefix=GC1 %s
 # RUN: ld.lld --export-dynamic --gc-sections %t -o %t2
-# RUN: llvm-readobj -sections -symbols %t2 | FileCheck -check-prefix=GC2 %s
+# RUN: llvm-readobj --sections --symbols %t2 | FileCheck -check-prefix=GC2 %s
 
 # NOGC: Name: .eh_frame
 # NOGC: Name: .text
diff --git a/deps/lld/test/ELF/gdb-index-invalid-section-index.yaml b/deps/lld/test/ELF/gdb-index-invalid-section-index.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b9c6c5db9539d878bcc7ab9d0a3dd932c83ca67c
--- /dev/null
+++ b/deps/lld/test/ELF/gdb-index-invalid-section-index.yaml
@@ -0,0 +1,140 @@
+# RUN: yaml2obj %s -o %t.o
+# RUN: ld.lld --gdb-index %t.o -o /dev/null
+
+## We used to crash if a DWARFAddressRange has invalid SectionIndex (-1).
+## Such DWARFAddressRange can be produced by clang -c -gdwarf-5 -gmlt before r360678.
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_REL
+  Machine:         EM_X86_64
+Sections:
+  - Name:            .text
+    Type:            SHT_PROGBITS
+    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
+    AddressAlign:    0x0000000000000010
+    Content:         31C0C3
+  - Name:            .debug_str_offsets
+    Type:            SHT_PROGBITS
+    AddressAlign:    0x0000000000000001
+    Content:         '1000000005000000000000000000000000000000'
+  - Name:            .rela.debug_str_offsets
+    Type:            SHT_RELA
+    Link:            .symtab
+    AddressAlign:    0x0000000000000008
+    EntSize:         0x0000000000000018
+    Info:            .debug_str_offsets
+    Relocations:
+      - Offset:          0x0000000000000008
+        Symbol:          .debug_str
+        Type:            R_X86_64_32
+      - Offset:          0x000000000000000C
+        Symbol:          .debug_str
+        Type:            R_X86_64_32
+        Addend:          1
+      - Offset:          0x0000000000000010
+        Symbol:          .debug_str
+        Type:            R_X86_64_32
+        Addend:          6
+  - Name:            .debug_str
+    Type:            SHT_PROGBITS
+    Flags:           [ SHF_MERGE, SHF_STRINGS ]
+    AddressAlign:    0x0000000000000001
+    EntSize:         0x0000000000000001
+    Content:         00612E6363002F746D7000
+  - Name:            .debug_abbrev
+    Type:            SHT_PROGBITS
+    AddressAlign:    0x0000000000000001
+    Content:         011100252513050325721710171B25111B1206000000
+  - Name:            .debug_info
+    Type:            SHT_PROGBITS
+    AddressAlign:    0x0000000000000001
+    Content:         1B000000050001080000000001000400010000000000000000020003000000
+  - Name:            .rela.debug_info
+    Type:            SHT_RELA
+    Link:            .symtab
+    AddressAlign:    0x0000000000000008
+    EntSize:         0x0000000000000018
+    Info:            .debug_info
+    Relocations:
+      - Offset:          0x0000000000000008
+        Symbol:          .debug_abbrev
+        Type:            R_X86_64_32
+      - Offset:          0x0000000000000011
+        Symbol:          .debug_str_offsets
+        Type:            R_X86_64_32
+        Addend:          8
+      - Offset:          0x0000000000000015
+        Symbol:          .debug_line
+        Type:            R_X86_64_32
+  - Name:            .debug_addr
+    Type:            SHT_PROGBITS
+    AddressAlign:    0x0000000000000001
+    Content:         0C000000050008000000000000000000
+  - Name:            .rela.debug_addr
+    Type:            SHT_RELA
+    Link:            .symtab
+    AddressAlign:    0x0000000000000008
+    EntSize:         0x0000000000000018
+    Info:            .debug_addr
+    Relocations:
+      - Offset:          0x0000000000000008
+        Symbol:          .text
+        Type:            R_X86_64_64
+  - Name:            .debug_line
+    Type:            SHT_PROGBITS
+    AddressAlign:    0x0000000000000001
+    Content:         2D0000000500080025000000010101FB0E0D00010101010000000100000101011F010000000002011F020F010000000000
+  - Name:            .rela.debug_line
+    Type:            SHT_RELA
+    Link:            .symtab
+    AddressAlign:    0x0000000000000008
+    EntSize:         0x0000000000000018
+    Info:            .debug_line
+    Relocations:
+      - Offset:          0x0000000000000022
+        Symbol:          .debug_line_str
+        Type:            R_X86_64_32
+      - Offset:          0x000000000000002C
+        Symbol:          .debug_line_str
+        Type:            R_X86_64_32
+        Addend:          5
+  - Name:            .debug_line_str
+    Type:            SHT_PROGBITS
+    Flags:           [ SHF_MERGE, SHF_STRINGS ]
+    AddressAlign:    0x0000000000000001
+    EntSize:         0x0000000000000001
+    Content:         2F746D7000612E636300
+Symbols:
+  - Name:            a.ll
+    Type:            STT_FILE
+    Index:           SHN_ABS
+  - Name:            .text
+    Type:            STT_SECTION
+    Section:         .text
+  - Name:            .debug_str_offsets
+    Type:            STT_SECTION
+    Section:         .debug_str_offsets
+  - Name:            .debug_str
+    Type:            STT_SECTION
+    Section:         .debug_str
+  - Name:            .debug_abbrev
+    Type:            STT_SECTION
+    Section:         .debug_abbrev
+  - Name:            .debug_info
+    Type:            STT_SECTION
+    Section:         .debug_info
+  - Name:            .debug_line
+    Type:            STT_SECTION
+    Section:         .debug_line
+  - Name:            .debug_line_str
+    Type:            STT_SECTION
+    Section:         .debug_line_str
+  - Name:            foo
+    Type:            STT_FUNC
+    Section:         .text
+    Binding:         STB_GLOBAL
+    Size:            0x0000000000000003
+...
diff --git a/deps/lld/test/ELF/gdb-index-multiple-cu-2.s b/deps/lld/test/ELF/gdb-index-multiple-cu-2.s
index 9cf2a0c826934cd0de5bb1916cb2d209a39897c0..06316860871dadb9d7652f6c23bac31d48198eb5 100644
--- a/deps/lld/test/ELF/gdb-index-multiple-cu-2.s
+++ b/deps/lld/test/ELF/gdb-index-multiple-cu-2.s
@@ -4,8 +4,8 @@
 # RUN: ld.lld --gdb-index %t.o %t1.o -o %t
 # RUN: llvm-dwarfdump -gdb-index %t | FileCheck %s
 
-# %t.o has 2 CUs while %t1 has 1, thus _start in %t1.o should have CuIndex 2.
-# Attributes << 24 | CuIndex = 48 << 24 | 2 = 0x30000002
+# %t.o has 2 CUs while %t1 has 1, thus _start in %t1.o should have cuIndex 2.
+# attributes << 24 | cuIndex = 48 << 24 | 2 = 0x30000002
 # CHECK:      Constant pool
 # CHECK-NEXT:   0(0x0): 0x30000002
 
diff --git a/deps/lld/test/ELF/gdb-index-multiple-cu.s b/deps/lld/test/ELF/gdb-index-multiple-cu.s
index 9a8c2eae78d4a5937301de299b5bf67313dca690..8702d9f3924db0b0cbf656f9928c23f5c4518493 100644
--- a/deps/lld/test/ELF/gdb-index-multiple-cu.s
+++ b/deps/lld/test/ELF/gdb-index-multiple-cu.s
@@ -3,10 +3,10 @@
 # RUN: ld.lld --gdb-index %t.o -o %t
 # RUN: llvm-dwarfdump -gdb-index %t | FileCheck %s
 
-# CuIndexAndAttrs of _start:
-#   Attributes << 24 | CuIndex = 48 << 24 | 0 = 0x30000000
-# CuIndexAndAttrs of foo:
-#   Attributes << 24 | CuIndex = 48 << 24 | 1 = 0x30000001
+# cuIndexAndAttrs of _start:
+#   attributes << 24 | cuIndex = 48 << 24 | 0 = 0x30000000
+# cuIndexAndAttrs of foo:
+#   attributes << 24 | cuIndex = 48 << 24 | 1 = 0x30000001
 # CHECK:      Symbol table
 # CHECK-DAG:      String name: _start, CU vector index: 0
 # CHECK-DAG:      String name: foo, CU vector index: 1
@@ -63,7 +63,7 @@ foo:
 # Swap sets to test the case where pubnames are in a
 # different order than the CUs they refer to.
 .section .debug_gnu_pubnames,"",@progbits
-	# CuIndex: 1
+	# cuIndex: 1
 	.long	.LpubNames_end1 - .LpubNames_begin1
 .LpubNames_begin1:
 	.short	2              # Version
@@ -75,7 +75,7 @@ foo:
 	.long	0
 .LpubNames_end1:
 
-	# CuIndex: 0
+	# cuIndex: 0
 	.long	.LpubNames_end0 - .LpubNames_begin0
 .LpubNames_begin0:
 	.short	2              # Version
diff --git a/deps/lld/test/ELF/gdb-index-ranges-discarded.s b/deps/lld/test/ELF/gdb-index-ranges-discarded.s
new file mode 100644
index 0000000000000000000000000000000000000000..2d5ce15736fb918e340ff1fde51426c9a390eac3
--- /dev/null
+++ b/deps/lld/test/ELF/gdb-index-ranges-discarded.s
@@ -0,0 +1,51 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: ld.lld --gdb-index -e main %t.o -o %t
+# RUN: llvm-dwarfdump -gdb-index %t | FileCheck %s
+
+# CHECK:      .gdb_index contents:
+# CHECK:       Address area offset = 0x28, has 1 entries:
+# CHECK-NEXT:    Low/High address = [0x201000, 0x201001) (Size: 0x1), CU id = 0
+
+## .debug_ranges contains 2 entries. .Lfunc_end0 is defined in the discarded
+## .text.foo. Test we resolve it to a non-zero value, otherwise the address area
+## of .gdb_index will not included [.Lfunc_begin1, .Lfunc_end1).
+
+.section .text.foo,"aex",@progbits
+.Lfunc_begin0:
+  ret
+.Lfunc_end0:
+
+.section .text.bar,"ax",@progbits
+.Lfunc_begin1:
+  ret
+.Lfunc_end1:
+
+.section .debug_abbrev,"",@progbits
+  .byte 1         # Abbreviation Code
+  .byte 17        # DW_TAG_compile_unit
+  .byte 0         # DW_CHILDREN_no
+  .byte 85        # DW_AT_ranges
+  .byte 23        # DW_FORM_sec_offset
+  .byte 0         # EOM(1)
+  .byte 0         # EOM(2)
+  .byte 0
+
+.section .debug_info,"",@progbits
+.Lcu_begin0:
+  .long .Lcu_end0 - .Lcu_begin0 - 4
+  .short 4        # DWARF version number
+  .long  0        # Offset Into Abbrev. Section
+  .byte  8        # Address Size
+.Ldie0:
+  .byte  1        # Abbrev [1] DW_TAG_compile_unit
+  .long  0        # DW_AT_ranges
+.Lcu_end0:
+
+.section .debug_ranges,"",@progbits
+  .quad .Lfunc_begin0
+  .quad .Lfunc_end0
+  .quad .Lfunc_begin1
+  .quad .Lfunc_end1
+  .quad 0
+  .quad 0
diff --git a/deps/lld/test/ELF/gdb-index.s b/deps/lld/test/ELF/gdb-index.s
index c9a02fd04d73a115c90174334936b1416d8450e8..77c16c2afbd22c4ff8075fcdce593ba7707eebd6 100644
--- a/deps/lld/test/ELF/gdb-index.s
+++ b/deps/lld/test/ELF/gdb-index.s
@@ -16,6 +16,7 @@
 # RUN: llvm-readelf -sections %t | FileCheck %s --check-prefix=SECTION
 
 # DISASM:       Disassembly of section .text:
+# DISASM-EMPTY:
 # DISASM:       entrypoint:
 # DISASM-CHECK:   201000: 90 nop
 # DISASM-CHECK:   201001: cc int3
@@ -48,7 +49,7 @@
 # SECTION-NOT: debug_gnu_pubnames
 
 # RUN: ld.lld --gdb-index --no-gdb-index %t1.o %t2.o -o %t2
-# RUN: llvm-readobj -sections %t2 | FileCheck -check-prefix=NOGDB %s
+# RUN: llvm-readobj --sections %t2 | FileCheck -check-prefix=NOGDB %s
 # NOGDB-NOT: Name: .gdb_index
 
 ## The following section contents are created by this using gcc 7.1.0:
diff --git a/deps/lld/test/ELF/global-offset-table-position-aarch64.s b/deps/lld/test/ELF/global-offset-table-position-aarch64.s
index 7fdc7978825fe8045ba17ed03a5b831ccd7ffc7d..4c89cc4c71c0a019fa7865d15f5835c6675e9056 100644
--- a/deps/lld/test/ELF/global-offset-table-position-aarch64.s
+++ b/deps/lld/test/ELF/global-offset-table-position-aarch64.s
@@ -1,7 +1,7 @@
 // REQUIRES: aarch64
 // RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %s -o %t
 // RUN: ld.lld --hash-style=sysv -shared %t -o %t2
-// RUN: llvm-readobj -t %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck %s
 .globl  a
 .type   a,@object
 .comm   a,4,4
@@ -20,7 +20,7 @@ _start:
 .long _GLOBAL_OFFSET_TABLE_ - .
 
 // CHECK: Name: _GLOBAL_OFFSET_TABLE_ (11)
-// CHECK-NEXT:     Value: 0x20008
+// CHECK-NEXT:     Value: 0x30008
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local (0x0)
 // CHECK-NEXT:     Type: None (0x0)
diff --git a/deps/lld/test/ELF/global-offset-table-position-arm.s b/deps/lld/test/ELF/global-offset-table-position-arm.s
index 9abca8b463172c3b1093b8eede821c8d176a8422..37d731da50a16068d198823720d1c846487528b8 100644
--- a/deps/lld/test/ELF/global-offset-table-position-arm.s
+++ b/deps/lld/test/ELF/global-offset-table-position-arm.s
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc -filetype=obj -triple=armv7a-linux-gnueabihf %s -o %t
 // RUN: ld.lld --hash-style=sysv -shared %t -o %t2
-// RUN: llvm-readobj -t %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
 // The ARM _GLOBAL_OFFSET_TABLE_ should be defined at the start of the .got
 .globl  a
@@ -25,7 +25,7 @@ _start:
 .data
 
 // CHECK:     Name: _GLOBAL_OFFSET_TABLE_
-// CHECK-NEXT:     Value: 0x3068
+// CHECK-NEXT:     Value: 0x2068
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local
 // CHECK-NEXT:     Type: None
diff --git a/deps/lld/test/ELF/global-offset-table-position-i386.s b/deps/lld/test/ELF/global-offset-table-position-i386.s
index e3d34342701513495c1d558b93169f32a060887a..26b140725a2fc85917d26fd2b6f3f2433728ecb8 100644
--- a/deps/lld/test/ELF/global-offset-table-position-i386.s
+++ b/deps/lld/test/ELF/global-offset-table-position-i386.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i386-pc-linux %s -o %t
 // RUN: ld.lld --hash-style=sysv -shared %t -o %t2
-// RUN: llvm-readobj -t %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
 // The X86 _GLOBAL_OFFSET_TABLE_ is defined at the start of the .got.plt
 // section.
@@ -22,7 +22,7 @@ addl    $_GLOBAL_OFFSET_TABLE_, %eax
 calll   f@PLT
 
 // CHECK:     Name: _GLOBAL_OFFSET_TABLE_ (1)
-// CHECK-NEXT:     Value: 0x2000
+// CHECK-NEXT:     Value: 0x3000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local (0x0)
 // CHECK-NEXT:     Type: None (0x0)
diff --git a/deps/lld/test/ELF/global-offset-table-position-mips.s b/deps/lld/test/ELF/global-offset-table-position-mips.s
index a5577f2e142101ea796fdb131e2a4d7420a09341..2d1e6e2e9160a83ef3842b52417fc317963682fb 100644
--- a/deps/lld/test/ELF/global-offset-table-position-mips.s
+++ b/deps/lld/test/ELF/global-offset-table-position-mips.s
@@ -1,7 +1,7 @@
 // REQUIRES: mips
 // RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux %s -o %t
 // RUN: ld.lld -shared %t -o %t2
-// RUN: llvm-readobj -t %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
 // The Mips _GLOBAL_OFFSET_TABLE_ should be defined at the start of the .got
 
diff --git a/deps/lld/test/ELF/global-offset-table-position.s b/deps/lld/test/ELF/global-offset-table-position.s
index aa8083654039200a1174cbd923d55f622bbc39fa..2efeadcc8c0576f0886d6aa04e0c874ee2516b2c 100644
--- a/deps/lld/test/ELF/global-offset-table-position.s
+++ b/deps/lld/test/ELF/global-offset-table-position.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: ld.lld --hash-style=sysv -shared %t -o %t2
-// RUN: llvm-readobj -t %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
 // The X86_64 _GLOBAL_OFFSET_TABLE_ is defined at the start of the .got.plt
 // section.
@@ -22,7 +22,7 @@ callq	f@PLT
 .long _GLOBAL_OFFSET_TABLE_ - .
 
 // CHECK:     Name: _GLOBAL_OFFSET_TABLE_
-// CHECK-NEXT:     Value: 0x2008
+// CHECK-NEXT:     Value: 0x3008
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local
 // CHECK-NEXT:     Type: None (0x0)
diff --git a/deps/lld/test/ELF/global_offset_table_shared.s b/deps/lld/test/ELF/global_offset_table_shared.s
index 7af6a403ac6c16c1a02128d5c87dc4187077b906..233d0858cda9f78c43d2d1ea20913442c6207525 100644
--- a/deps/lld/test/ELF/global_offset_table_shared.s
+++ b/deps/lld/test/ELF/global_offset_table_shared.s
@@ -1,11 +1,11 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: ld.lld --hash-style=sysv -shared %t -o %t2
-// RUN: llvm-readobj -t %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck %s
 .long _GLOBAL_OFFSET_TABLE_ - .
 
 // CHECK:      Name: _GLOBAL_OFFSET_TABLE_
-// CHECK-NEXT: Value: 0x2000
+// CHECK-NEXT: Value: 0x3000
 // CHECK-NEXT: Size: 0
 // CHECK-NEXT: Binding: Local
 // CHECK-NEXT: Type: None
diff --git a/deps/lld/test/ELF/gnu-hash-table-rwsegment.s b/deps/lld/test/ELF/gnu-hash-table-rwsegment.s
index ab1b252bc5d4c8aa4b786800de7ca3d317235447..d1525f2ac283c8669d6d4e32d19a8021d2277d5a 100644
--- a/deps/lld/test/ELF/gnu-hash-table-rwsegment.s
+++ b/deps/lld/test/ELF/gnu-hash-table-rwsegment.s
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -shared -hash-style=gnu --no-rosegment -o %t.so %t.o
-# RUN: llvm-readobj -gnu-hash-table %t.so | FileCheck %s
+# RUN: llvm-readobj --gnu-hash-table %t.so | FileCheck %s
 
 # CHECK:      GnuHashTable {
 # CHECK-NEXT:   Num Buckets: 1
diff --git a/deps/lld/test/ELF/gnu-hash-table.s b/deps/lld/test/ELF/gnu-hash-table.s
index 052a5bb20fbf2fd7d0e10c633b10404317c0551d..092e584cf47aa178e28a982ef7449d761f2ee707 100644
--- a/deps/lld/test/ELF/gnu-hash-table.s
+++ b/deps/lld/test/ELF/gnu-hash-table.s
@@ -36,15 +36,15 @@
 # RUN: ld.lld -shared --hash-style both -o %t-ppc64le.so  %t-ppc64le.o  %t2-ppc64le.a  %t3-ppc64le.so
 # RUN: ld.lld -shared --hash-style both -o %t-ppc64.so  %t-ppc64.o  %t2-ppc64.a  %t3-ppc64.so
 
-# RUN: llvm-readobj -dyn-symbols -gnu-hash-table %te-i386.so \
+# RUN: llvm-readobj --dyn-syms --gnu-hash-table %te-i386.so \
 # RUN:   | FileCheck %s -check-prefix=EMPTY
-# RUN: llvm-readobj -sections -dyn-symbols -gnu-hash-table %t-i386.so \
+# RUN: llvm-readobj --sections --dyn-syms --gnu-hash-table %t-i386.so \
 # RUN:   | FileCheck %s -check-prefix=I386
-# RUN: llvm-readobj -sections -dyn-symbols -gnu-hash-table %t-x86_64.so \
+# RUN: llvm-readobj --sections --dyn-syms --gnu-hash-table %t-x86_64.so \
 # RUN:   | FileCheck %s -check-prefix=X86_64
-# RUN: llvm-readobj -sections -dyn-symbols -gnu-hash-table %t-ppc64le.so \
+# RUN: llvm-readobj --sections --dyn-syms --gnu-hash-table %t-ppc64le.so \
 # RUN:   | FileCheck %s -check-prefix=PPC64
-# RUN: llvm-readobj -sections -dyn-symbols -gnu-hash-table %t-ppc64.so \
+# RUN: llvm-readobj --sections --dyn-syms --gnu-hash-table %t-ppc64.so \
 # RUN:   | FileCheck %s -check-prefix=PPC64
 
 # EMPTY:      DynamicSymbols [
diff --git a/deps/lld/test/ELF/gnu-ifunc-canon.s b/deps/lld/test/ELF/gnu-ifunc-canon.s
new file mode 100644
index 0000000000000000000000000000000000000000..e069a82c6bd1b99c66c0b439b9c8888f4ef39283
--- /dev/null
+++ b/deps/lld/test/ELF/gnu-ifunc-canon.s
@@ -0,0 +1,92 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/gnu-ifunc-canon-ro-pcrel.s -o %t-ro-pcrel.o
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/gnu-ifunc-canon-ro-abs.s -o %t-ro-abs.o
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/gnu-ifunc-canon-rw-addend.s -o %t-rw-addend.o
+// RUN: ld.lld %t.o -o %t1
+// RUN: llvm-readobj -r %t1 | FileCheck --check-prefix=IREL2 %s
+// RUN: ld.lld %t.o %t-ro-pcrel.o -o %t2
+// RUN: llvm-readobj -r %t2 | FileCheck --check-prefix=IREL1 %s
+// RUN: ld.lld %t.o %t-ro-abs.o -o %t3
+// RUN: llvm-readobj -r %t3 | FileCheck --check-prefix=IREL1 %s
+// RUN: ld.lld %t.o %t-rw-addend.o -o %t4
+// RUN: llvm-readobj -r %t4 | FileCheck --check-prefix=IREL1 %s
+// RUN: llvm-objdump -s %t4 | FileCheck --check-prefix=DUMP %s
+// RUN: ld.lld %t.o %t-rw-addend.o -o %t4a -z retpolineplt
+// RUN: llvm-readobj -r %t4a | FileCheck --check-prefix=IREL1 %s
+// RUN: llvm-objdump -s %t4a | FileCheck --check-prefix=DUMP2 %s
+// RUN: ld.lld %t-ro-pcrel.o %t.o -o %t5
+// RUN: llvm-readobj -r %t5 | FileCheck --check-prefix=IREL1 %s
+// RUN: ld.lld %t-ro-abs.o %t.o -o %t6
+// RUN: llvm-readobj -r %t6 | FileCheck --check-prefix=IREL1 %s
+// RUN: ld.lld %t-rw-addend.o %t.o -o %t7
+// RUN: llvm-readobj -r %t7 | FileCheck --check-prefix=IREL1 %s
+// RUN: ld.lld %t.o -o %t8 -pie
+// RUN: llvm-readobj -r %t8 | FileCheck --check-prefix=IREL2 %s
+// RUN: ld.lld %t.o %t-ro-pcrel.o -o %t9 -pie
+// RUN: llvm-readobj -r %t9 | FileCheck --check-prefix=IREL1-REL2 %s
+// RUN: ld.lld %t.o %t-rw-addend.o -o %t10 -pie
+// RUN: llvm-readobj -r %t10 | FileCheck --check-prefix=IREL1-REL3 %s
+// RUN: ld.lld %t-ro-pcrel.o %t.o -o %t11 -pie
+// RUN: llvm-readobj -r %t11 | FileCheck --check-prefix=IREL1-REL2 %s
+// RUN: ld.lld %t-rw-addend.o %t.o -o %t12 -pie
+// RUN: llvm-readobj -r %t12 | FileCheck --check-prefix=IREL1-REL3 %s
+
+// Two relocs, one for the GOT and the other for .data.
+// IREL2-NOT: R_X86_64_
+// IREL2: .rela.plt
+// IREL2-NEXT: R_X86_64_IRELATIVE
+// IREL2-NEXT: R_X86_64_IRELATIVE
+// IREL2-NOT: R_X86_64_
+
+// One reloc for the canonical PLT.
+// IREL1-NOT: R_X86_64_
+// IREL1: .rela.plt
+// IREL1-NEXT: R_X86_64_IRELATIVE
+// IREL1-NOT: R_X86_64_
+
+// One reloc for the canonical PLT and two RELATIVE relocations pointing to it,
+// one in the GOT and one in .data.
+// IREL1-REL2-NOT: R_X86_64_
+// IREL1-REL2: .rela.dyn
+// IREL1-REL2-NEXT: R_X86_64_RELATIVE
+// IREL1-REL2-NEXT: R_X86_64_RELATIVE
+// IREL1-REL2: .rela.plt
+// IREL1-REL2-NEXT: R_X86_64_IRELATIVE
+// IREL1-REL2-NOT: R_X86_64_
+
+// One reloc for the canonical PLT and three RELATIVE relocations pointing to it,
+// one in the GOT and two in .data.
+// IREL1-REL3-NOT: R_X86_64_
+// IREL1-REL3: .rela.dyn
+// IREL1-REL3-NEXT: R_X86_64_RELATIVE
+// IREL1-REL3-NEXT: R_X86_64_RELATIVE
+// IREL1-REL3-NEXT: R_X86_64_RELATIVE
+// IREL1-REL3: .rela.plt
+// IREL1-REL3-NEXT: R_X86_64_IRELATIVE
+// IREL1-REL3-NOT: R_X86_64_
+
+// Make sure the static relocations look right, both with and without headers.
+// DUMP: Contents of section .plt:
+// DUMP-NEXT: 201010
+// DUMP: Contents of section .got:
+// DUMP-NEXT: 202000 10102000 00000000
+// DUMP: Contents of section .data:
+// DUMP-NEXT: 203000 10102000 00000000 11102000 00000000
+
+// DUMP2: Contents of section .plt:
+// DUMP2-NEXT: 201010
+// DUMP2: Contents of section .got:
+// DUMP2-NEXT: 202000 40102000 00000000
+// DUMP2: Contents of section .data:
+// DUMP2-NEXT: 203000 40102000 00000000 41102000 00000000
+
+lea ifunc@gotpcrel(%rip), %rbx
+
+.type ifunc STT_GNU_IFUNC
+.globl ifunc
+ifunc:
+ret
+
+.data
+.8byte ifunc
diff --git a/deps/lld/test/ELF/gnu-ifunc-dso.s b/deps/lld/test/ELF/gnu-ifunc-dso.s
index 6ceff3b17d42cfd877d4180401e04029b8ea332c..5c2d9d54cc2d925ed3a0f270bc866220e89cffc6 100644
--- a/deps/lld/test/ELF/gnu-ifunc-dso.s
+++ b/deps/lld/test/ELF/gnu-ifunc-dso.s
@@ -3,10 +3,10 @@
 # RUN: ld.lld -shared %t1.o -o %t.so
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t2.o
 # RUN: ld.lld -shared %t2.o %t.so -o %t
-# RUN: llvm-readobj -dyn-relocations %t | FileCheck %s
+# RUN: llvm-readobj --dyn-relocations %t | FileCheck %s
 
 # CHECK:      Dynamic Relocations {
-# CHECK-NEXT:   0x1000 R_X86_64_64 foo 0x0
+# CHECK-NEXT:   0x2000 R_X86_64_64 foo 0x0
 # CHECK-NEXT: }
 
 .data
diff --git a/deps/lld/test/ELF/gnu-ifunc-dyntags.s b/deps/lld/test/ELF/gnu-ifunc-dyntags.s
index 81bd338d088dc1f3b3e5a424fa5276a2c8c60938..b177183355102cba5445b123e23b8c0364c56d84 100644
--- a/deps/lld/test/ELF/gnu-ifunc-dyntags.s
+++ b/deps/lld/test/ELF/gnu-ifunc-dyntags.s
@@ -2,14 +2,14 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -pie %t.o -o %tout
 # RUN: llvm-objdump -section-headers %tout | FileCheck %s
-# RUN: llvm-readobj -dynamic-table -r %tout | FileCheck %s --check-prefix=TAGS
+# RUN: llvm-readobj --dynamic-table -r %tout | FileCheck %s --check-prefix=TAGS
 
 ## Check we produce DT_PLTREL/DT_JMPREL/DT_PLTGOT and DT_PLTRELSZ tags
 ## when there are no other relocations except R_*_IRELATIVE.
 
-# CHECK:  Name          Size      Address
-# CHECK:  .rela.plt   00000030 0000000000000210
-# CHECK:  .got.plt    00000010 0000000000002000
+# CHECK:  Name          Size   VMA
+# CHECK:  .rela.plt   00000030 0000000000000248
+# CHECK:  .got.plt    00000010 0000000000003000
 
 # TAGS:      Relocations [
 # TAGS-NEXT:   Section {{.*}} .rela.plt {
@@ -19,9 +19,9 @@
 # TAGS-NEXT: ]
 
 # TAGS:   Tag                Type                 Name/Value
-# TAGS:   0x0000000000000017 JMPREL               0x210
+# TAGS:   0x0000000000000017 JMPREL               0x248
 # TAGS:   0x0000000000000002 PLTRELSZ             48
-# TAGS:   0x0000000000000003 PLTGOT               0x2000
+# TAGS:   0x0000000000000003 PLTGOT               0x3000
 # TAGS:   0x0000000000000014 PLTREL               RELA
 
 .text
diff --git a/deps/lld/test/ELF/gnu-ifunc-gotpcrel.s b/deps/lld/test/ELF/gnu-ifunc-gotpcrel.s
index b506ffa8c390d1b91efc56a61f52edc4a3e75b43..7ec30757f5ce15b5656408e348a551a76295f1a6 100644
--- a/deps/lld/test/ELF/gnu-ifunc-gotpcrel.s
+++ b/deps/lld/test/ELF/gnu-ifunc-gotpcrel.s
@@ -3,7 +3,7 @@
 # RUN: ld.lld -shared %t2.o -o %t2.so
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld --hash-style=sysv %t.o %t2.so -o %t
-# RUN: llvm-readobj -dyn-relocations %t | FileCheck %s
+# RUN: llvm-readobj --dyn-relocations %t | FileCheck %s
 
 # CHECK:      Dynamic Relocations {
 # CHECK-NEXT:   0x2020B0 R_X86_64_GLOB_DAT foo 0x0
diff --git a/deps/lld/test/ELF/gnu-ifunc-i386.s b/deps/lld/test/ELF/gnu-ifunc-i386.s
index bfc1587f0114359f02e1da426c62180606099c05..ea451dd40fd1005e2cc0f73f6906905075290e3f 100644
--- a/deps/lld/test/ELF/gnu-ifunc-i386.s
+++ b/deps/lld/test/ELF/gnu-ifunc-i386.s
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o
 // RUN: ld.lld -static %t.o -o %tout
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DISASM
-// RUN: llvm-readobj -r -symbols -sections %tout | FileCheck %s
+// RUN: llvm-readobj -r --symbols --sections %tout | FileCheck %s
 
 // CHECK:      Sections [
 // CHECK:       Section {
@@ -70,39 +70,61 @@
 // CHECK-NEXT: }
 // CHECK-NEXT: Symbol {
 // CHECK-NEXT:   Name: bar
+// CHECK-NEXT:   Value: 0x401030
+// CHECK-NEXT:   Size: 0
+// CHECK-NEXT:   Binding: Global
+// CHECK-NEXT:   Type: Function
+// CHECK-NEXT:   Other: 0
+// CHECK-NEXT:   Section: .plt
+// CHECK-NEXT: }
+// CHECK-NEXT: Symbol {
+// CHECK-NEXT:   Name: bar_resolver
 // CHECK-NEXT:   Value: 0x401001
 // CHECK-NEXT:   Size: 0
 // CHECK-NEXT:   Binding: Global
-// CHECK-NEXT:   Type: GNU_IFunc
+// CHECK-NEXT:   Type: Function
 // CHECK-NEXT:   Other: 0
 // CHECK-NEXT:   Section: .text
 // CHECK-NEXT: }
 // CHECK-NEXT: Symbol {
 // CHECK-NEXT:   Name: foo
+// CHECK-NEXT:   Value: 0x401020
+// CHECK-NEXT:   Size: 0
+// CHECK-NEXT:   Binding: Global
+// CHECK-NEXT:   Type: Function
+// CHECK-NEXT:   Other: 0
+// CHECK-NEXT:   Section: .plt
+// CHECK-NEXT: }
+// CHECK-NEXT: Symbol {
+// CHECK-NEXT:   Name: foo_resolver
 // CHECK-NEXT:   Value: 0x401000
 // CHECK-NEXT:   Size: 0
 // CHECK-NEXT:   Binding: Global
-// CHECK-NEXT:   Type: GNU_IFunc
+// CHECK-NEXT:   Type: Function
 // CHECK-NEXT:   Other: 0
 // CHECK-NEXT:   Section: .text
 // CHECK-NEXT: }
 // CHECK-NEXT:]
 
 // DISASM: Disassembly of section .text:
-// DISASM-NEXT: foo:
+// DISASM-EMPTY:
+// DISASM-NEXT: foo_resolver:
 // DISASM-NEXT:    401000: c3 retl
-// DISASM: bar:
+// DISASM: bar_resolver:
 // DISASM-NEXT:    401001: c3 retl
 // DISASM:      _start:
 // DISASM-NEXT:    401002: e8 19 00 00 00 calll 25
 // DISASM-NEXT:    401007: e8 24 00 00 00 calll 36
 // DISASM-NEXT:    40100c: ba d4 00 40 00 movl $4194516, %edx
 // DISASM-NEXT:    401011: ba e4 00 40 00 movl $4194532, %edx
+// DISASM-EMPTY:
 // DISASM-NEXT: Disassembly of section .plt:
-// DISASM-NEXT: .plt:
+// DISASM-EMPTY:
+// DISASM-NEXT: foo:
 // DISASM-NEXT:    401020: ff 25 00 20 40 00 jmpl *4202496
 // DISASM-NEXT:    401026: 68 10 00 00 00 pushl $16
 // DISASM-NEXT:    40102b: e9 e0 ff ff ff jmp -32 <_start+0xe>
+// DISASM:      bar:
 // DISASM-NEXT:    401030: ff 25 04 20 40 00 jmpl *4202500
 // DISASM-NEXT:    401036: 68 18 00 00 00 pushl $24
 // DISASM-NEXT:    40103b: e9 d0 ff ff ff jmp -48 <_start+0xe>
@@ -111,11 +133,17 @@
 .type foo STT_GNU_IFUNC
 .globl foo
 foo:
+.type foo_resolver STT_FUNC
+.globl foo_resolver
+foo_resolver:
  ret
 
 .type bar STT_GNU_IFUNC
 .globl bar
 bar:
+.type bar_resolver STT_FUNC
+.globl bar_resolver
+bar_resolver:
  ret
 
 .globl _start
diff --git a/deps/lld/test/ELF/gnu-ifunc-noplt-i386.s b/deps/lld/test/ELF/gnu-ifunc-noplt-i386.s
new file mode 100644
index 0000000000000000000000000000000000000000..d673fc00cb3b53378a84bbc2b4b426495aadbdd0
--- /dev/null
+++ b/deps/lld/test/ELF/gnu-ifunc-noplt-i386.s
@@ -0,0 +1,71 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=i686-pc-freebsd %S/Inputs/shared2-x86-64.s -o %t1.o
+// RUN: ld.lld %t1.o --shared -o %t.so
+// RUN: llvm-mc -filetype=obj -triple=i686-pc-freebsd %s -o %t.o
+// RUN: ld.lld -z ifunc-noplt -z notext --hash-style=sysv %t.so %t.o -o %tout
+// RUN: llvm-objdump -d --no-show-raw-insn %tout | FileCheck %s --check-prefix=DISASM
+// RUN: llvm-readobj -r --dynamic-table %tout | FileCheck %s
+
+// Check that we emitted relocations for the ifunc calls
+// CHECK: Relocations [
+// CHECK-NEXT:   Section (4) .rel.dyn {
+// CHECK-NEXT:     0x401008 R_386_PLT32 bar
+// CHECK-NEXT:     0x401003 R_386_PLT32 foo
+// CHECK-NEXT:   }
+// CHECK-NEXT:   Section (5) .rel.plt {
+// CHECK-NEXT:     0x40300C R_386_JUMP_SLOT bar2
+// CHECK-NEXT:     0x403010 R_386_JUMP_SLOT zed2
+// CHECK-NEXT:   }
+
+// Check that ifunc call sites still require relocation
+// DISASM: Disassembly of section .text:
+// DISASM-EMPTY:
+// DISASM-NEXT: 00401000 foo:
+// DISASM-NEXT:   401000:      	retl
+// DISASM-EMPTY:
+// DISASM-NEXT: 00401001 bar:
+// DISASM-NEXT:   401001:      	retl
+// DISASM-EMPTY:
+// DISASM-NEXT: 00401002 _start:
+// DISASM-NEXT:   401002:      	calll	-4 <_start+0x1>
+// DISASM-NEXT:   401007:      	calll	-4 <_start+0x6>
+// DISASM-NEXT:   40100c:      	calll	31 <bar2@plt>
+// DISASM-NEXT:   401011:      	calll	42 <zed2@plt>
+// DISASM-EMPTY:
+// DISASM-NEXT: Disassembly of section .plt:
+// DISASM-EMPTY:
+// DISASM-NEXT: 00401020 .plt:
+// DISASM-NEXT:   401020:      	pushl	4206596
+// DISASM-NEXT:   401026:      	jmpl	*4206600
+// DISASM-NEXT:   40102c:      	nop
+// DISASM-NEXT:   40102d:      	nop
+// DISASM-NEXT:   40102e:      	nop
+// DISASM-NEXT:   40102f:      	nop
+// DISASM-EMPTY:
+// DISASM-NEXT: 00401030 bar2@plt:
+// DISASM-NEXT:   401030:      	jmpl	*4206604
+// DISASM-NEXT:   401036:      	pushl	$0
+// DISASM-NEXT:   40103b:      	jmp	-32 <.plt>
+// DISASM-EMPTY:
+// DISASM-NEXT: 00401040 zed2@plt:
+// DISASM-NEXT:   401040:      	jmpl	*4206608
+// DISASM-NEXT:   401046:      	pushl	$8
+// DISASM-NEXT:   40104b:      	jmp	-48 <.plt>
+
+.text
+.type foo STT_GNU_IFUNC
+.globl foo
+foo:
+ ret
+
+.type bar STT_GNU_IFUNC
+.globl bar
+bar:
+ ret
+
+.globl _start
+_start:
+ call foo@plt
+ call bar@plt
+ call bar2@plt
+ call zed2@plt
diff --git a/deps/lld/test/ELF/gnu-ifunc-noplt.s b/deps/lld/test/ELF/gnu-ifunc-noplt.s
new file mode 100644
index 0000000000000000000000000000000000000000..95ae741d080dfeb5a1e6744f459cc415a81000d9
--- /dev/null
+++ b/deps/lld/test/ELF/gnu-ifunc-noplt.s
@@ -0,0 +1,68 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-freebsd %S/Inputs/shared2-x86-64.s -o %t1.o
+// RUN: ld.lld %t1.o --shared -o %t.so
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-freebsd %s -o %t.o
+// RUN: ld.lld -z ifunc-noplt -z notext --hash-style=sysv %t.so %t.o -o %tout
+// RUN: llvm-objdump -d --no-show-raw-insn %tout | FileCheck %s --check-prefix=DISASM
+// RUN: llvm-readobj -r --dynamic-table %tout | FileCheck %s
+
+// Check that we emitted relocations for the ifunc calls
+// CHECK: Relocations [
+// CHECK-NEXT:   Section (4) .rela.dyn {
+// CHECK-NEXT:     0x201008 R_X86_64_PLT32 bar 0xFFFFFFFFFFFFFFFC
+// CHECK-NEXT:     0x201003 R_X86_64_PLT32 foo 0xFFFFFFFFFFFFFFFC
+// CHECK-NEXT:   }
+// CHECK-NEXT:   Section (5) .rela.plt {
+// CHECK-NEXT:     0x203018 R_X86_64_JUMP_SLOT bar2 0x0
+// CHECK-NEXT:     0x203020 R_X86_64_JUMP_SLOT zed2 0x0
+// CHECK-NEXT:   }
+
+// Check that ifunc call sites still require relocation
+// DISASM: Disassembly of section .text:
+// DISASM-EMPTY:
+// DISASM-NEXT: 0000000000201000 foo:
+// DISASM-NEXT:   201000:      	retq
+// DISASM-EMPTY:
+// DISASM-NEXT: 0000000000201001 bar:
+// DISASM-NEXT:   201001:      	retq
+// DISASM-EMPTY:
+// DISASM-NEXT: 0000000000201002 _start:
+// DISASM-NEXT:   201002:      	callq	0 <_start+0x5>
+// DISASM-NEXT:   201007:      	callq	0 <_start+0xa>
+// DISASM-NEXT:   20100c:      	callq	31 <bar2@plt>
+// DISASM-NEXT:   201011:      	callq	42 <zed2@plt>
+// DISASM-EMPTY:
+// DISASM-NEXT: Disassembly of section .plt:
+// DISASM-EMPTY:
+// DISASM-NEXT: 0000000000201020 .plt:
+// DISASM-NEXT:   201020:      	pushq	8162(%rip)
+// DISASM-NEXT:   201026:      	jmpq	*8164(%rip)
+// DISASM-NEXT:   20102c:      	nopl	(%rax)
+// DISASM-EMPTY:
+// DISASM-NEXT: 0000000000201030 bar2@plt:
+// DISASM-NEXT:   201030:      	jmpq	*8162(%rip)
+// DISASM-NEXT:   201036:      	pushq	$0
+// DISASM-NEXT:   20103b:      	jmp	-32 <.plt>
+// DISASM-EMPTY:
+// DISASM-NEXT: 0000000000201040 zed2@plt:
+// DISASM-NEXT:   201040:      	jmpq	*8154(%rip)
+// DISASM-NEXT:   201046:      	pushq	$1
+// DISASM-NEXT:   20104b:      	jmp	-48 <.plt>
+
+.text
+.type foo STT_GNU_IFUNC
+.globl foo
+foo:
+ ret
+
+.type bar STT_GNU_IFUNC
+.globl bar
+bar:
+ ret
+
+.globl _start
+_start:
+ call foo
+ call bar
+ call bar2
+ call zed2
diff --git a/deps/lld/test/ELF/gnu-ifunc-nosym-i386.s b/deps/lld/test/ELF/gnu-ifunc-nosym-i386.s
index 564b87e23b3256a2c2fedf19164f721c12c32460..5d7e615cd0c2d9e45365ca93f2e65411fb1262be 100644
--- a/deps/lld/test/ELF/gnu-ifunc-nosym-i386.s
+++ b/deps/lld/test/ELF/gnu-ifunc-nosym-i386.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o
 // RUN: ld.lld -static %t.o -o %tout
-// RUN: llvm-readobj -symbols %tout | FileCheck %s
+// RUN: llvm-readobj --symbols %tout | FileCheck %s
 
 // Check that no __rel_iplt_end/__rel_iplt_start
 // appear in symtab if there is no references to them.
diff --git a/deps/lld/test/ELF/gnu-ifunc-nosym.s b/deps/lld/test/ELF/gnu-ifunc-nosym.s
index 4206f57d1363cc5e4f2733af709f6f987bdd7865..3eeb9753ecb00760220ba883b9ea77f8cb5efd54 100644
--- a/deps/lld/test/ELF/gnu-ifunc-nosym.s
+++ b/deps/lld/test/ELF/gnu-ifunc-nosym.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld -static %t.o -o %tout
-// RUN: llvm-readobj -symbols %tout | FileCheck %s
+// RUN: llvm-readobj --symbols %tout | FileCheck %s
 
 // Check that no __rela_iplt_end/__rela_iplt_start
 // appear in symtab if there is no references to them.
diff --git a/deps/lld/test/ELF/gnu-ifunc-plt-i386.s b/deps/lld/test/ELF/gnu-ifunc-plt-i386.s
index 3ed4e7616f57754e5adc78105d076b4e29771fd7..533b39311f2add4d8afa7ff773b61305a52913c9 100644
--- a/deps/lld/test/ELF/gnu-ifunc-plt-i386.s
+++ b/deps/lld/test/ELF/gnu-ifunc-plt-i386.s
@@ -5,21 +5,21 @@
 // RUN: ld.lld --hash-style=sysv %t.so %t.o -o %tout
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DISASM
 // RUN: llvm-objdump -s %tout | FileCheck %s --check-prefix=GOTPLT
-// RUN: llvm-readobj -r -dynamic-table %tout | FileCheck %s
+// RUN: llvm-readobj -r --dynamic-table %tout | FileCheck %s
 
 // Check that the IRELATIVE relocations are after the JUMP_SLOT in the plt
 // CHECK: Relocations [
 // CHECK-NEXT:   Section (4) .rel.plt {
-// CHECK-NEXT:     0x40200C R_386_JUMP_SLOT bar2
-// CHECK-NEXT:     0x402010 R_386_JUMP_SLOT zed2
-// CHECK-NEXT:     0x402014 R_386_IRELATIVE
-// CHECK-NEXT:     0x402018 R_386_IRELATIVE
+// CHECK-NEXT:     0x40300C R_386_JUMP_SLOT bar2
+// CHECK-NEXT:     0x403010 R_386_JUMP_SLOT zed2
+// CHECK-NEXT:     0x403014 R_386_IRELATIVE
+// CHECK-NEXT:     0x403018 R_386_IRELATIVE
 
 // Check that IRELATIVE .got.plt entries point to ifunc resolver and not
 // back to the plt entry + 6.
 // GOTPLT: Contents of section .got.plt:
-// GOTPLT:       402000 00304000 00000000 00000000 36104000
-// GOTPLT-NEXT:  402010 46104000 00104000 01104000
+// GOTPLT:       403000 00204000 00000000 00000000 36104000
+// GOTPLT-NEXT:  403010 46104000 00104000 01104000
 
 // Check that the PLTRELSZ tag includes the IRELATIVE relocations
 // CHECK: DynamicSection [
@@ -27,6 +27,7 @@
 
 // Check that a PLT header is written and the ifunc entries appear last
 // DISASM: Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: foo:
 // DISASM-NEXT:    401000:       c3      retl
 // DISASM:      bar:
@@ -36,28 +37,30 @@
 // DISASM-NEXT:    401007:       e8 54 00 00 00          calll   84
 // DISASM-NEXT:    40100c:       e8 1f 00 00 00          calll   31
 // DISASM-NEXT:    401011:       e8 2a 00 00 00          calll   42
+// DISASM-EMPTY:
 // DISASM-NEXT: Disassembly of section .plt:
+// DISASM-EMPTY:
 // DISASM-NEXT: .plt:
-// DISASM-NEXT:    401020:       ff 35 04 20 40 00       pushl   4202500
-// DISASM-NEXT:    401026:       ff 25 08 20 40 00       jmpl    *4202504
+// DISASM-NEXT:    401020:       ff 35 04 30 40 00       pushl   4206596
+// DISASM-NEXT:    401026:       ff 25 08 30 40 00       jmpl    *4206600
 // DISASM-NEXT:    40102c:       90      nop
 // DISASM-NEXT:    40102d:       90      nop
 // DISASM-NEXT:    40102e:       90      nop
 // DISASM-NEXT:    40102f:       90      nop
 // DISASM-EMPTY:
 // DISASM-NEXT:   bar2@plt:
-// DISASM-NEXT:    401030:       ff 25 0c 20 40 00       jmpl    *4202508
+// DISASM-NEXT:    401030:       ff 25 0c 30 40 00       jmpl    *4206604
 // DISASM-NEXT:    401036:       68 00 00 00 00          pushl   $0
 // DISASM-NEXT:    40103b:       e9 e0 ff ff ff          jmp     -32 <.plt>
 // DISASM-EMPTY:
 // DISASM-NEXT:   zed2@plt:
-// DISASM-NEXT:    401040:       ff 25 10 20 40 00       jmpl    *4202512
+// DISASM-NEXT:    401040:       ff 25 10 30 40 00       jmpl    *4206608
 // DISASM-NEXT:    401046:       68 08 00 00 00          pushl   $8
 // DISASM-NEXT:    40104b:       e9 d0 ff ff ff          jmp     -48 <.plt>
-// DISASM-NEXT:    401050:       ff 25 14 20 40 00       jmpl    *4202516
+// DISASM-NEXT:    401050:       ff 25 14 30 40 00       jmpl    *4206612
 // DISASM-NEXT:    401056:       68 30 00 00 00          pushl   $48
 // DISASM-NEXT:    40105b:       e9 e0 ff ff ff          jmp     -32 <zed2@plt>
-// DISASM-NEXT:    401060:       ff 25 18 20 40 00       jmpl    *4202520
+// DISASM-NEXT:    401060:       ff 25 18 30 40 00       jmpl    *4206616
 // DISASM-NEXT:    401066:       68 38 00 00 00          pushl   $56
 // DISASM-NEXT:    40106b:       e9 d0 ff ff ff          jmp     -48 <zed2@plt>
 
diff --git a/deps/lld/test/ELF/gnu-ifunc-plt.s b/deps/lld/test/ELF/gnu-ifunc-plt.s
index aa1c3c72f593da7675abe350ebb8a1d5766d5e90..28161fe3dc626bf699c4593cececa68790bf07a0 100644
--- a/deps/lld/test/ELF/gnu-ifunc-plt.s
+++ b/deps/lld/test/ELF/gnu-ifunc-plt.s
@@ -5,22 +5,22 @@
 // RUN: ld.lld --hash-style=sysv %t.so %t.o -o %tout
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DISASM
 // RUN: llvm-objdump -s %tout | FileCheck %s --check-prefix=GOTPLT
-// RUN: llvm-readobj -r -dynamic-table %tout | FileCheck %s
+// RUN: llvm-readobj -r --dynamic-table %tout | FileCheck %s
 
 // Check that the IRELATIVE relocations are after the JUMP_SLOT in the plt
 // CHECK: Relocations [
 // CHECK-NEXT:   Section (4) .rela.plt {
-// CHECK-NEXT:     0x202018 R_X86_64_JUMP_SLOT bar2 0x0
-// CHECK-NEXT:     0x202020 R_X86_64_JUMP_SLOT zed2 0x0
-// CHECK-NEXT:     0x202028 R_X86_64_IRELATIVE - 0x201000
-// CHECK-NEXT:     0x202030 R_X86_64_IRELATIVE - 0x201001
+// CHECK-NEXT:     0x203018 R_X86_64_JUMP_SLOT bar2 0x0
+// CHECK-NEXT:     0x203020 R_X86_64_JUMP_SLOT zed2 0x0
+// CHECK-NEXT:     0x203028 R_X86_64_IRELATIVE - 0x201000
+// CHECK-NEXT:     0x203030 R_X86_64_IRELATIVE - 0x201001
 
 // Check that .got.plt entries point back to PLT header
 // GOTPLT: Contents of section .got.plt:
-// GOTPLT-NEXT:  202000 00302000 00000000 00000000 00000000
-// GOTPLT-NEXT:  202010 00000000 00000000 36102000 00000000
-// GOTPLT-NEXT:  202020 46102000 00000000 56102000 00000000
-// GOTPLT-NEXT:  202030 66102000 00000000
+// GOTPLT-NEXT:  203000 00202000 00000000 00000000 00000000
+// GOTPLT-NEXT:  203010 00000000 00000000 36102000 00000000
+// GOTPLT-NEXT:  203020 46102000 00000000 56102000 00000000
+// GOTPLT-NEXT:  203030 66102000 00000000
 
 // Check that the PLTRELSZ tag includes the IRELATIVE relocations
 // CHECK: DynamicSection [
@@ -28,6 +28,7 @@
 
 // Check that a PLT header is written and the ifunc entries appear last
 // DISASM: Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: foo:
 // DISASM-NEXT:   201000:       c3      retq
 // DISASM:      bar:
@@ -37,25 +38,27 @@
 // DISASM-NEXT:   201007:       e8 54 00 00 00          callq   84
 // DISASM-NEXT:   20100c:       e8 1f 00 00 00          callq   31
 // DISASM-NEXT:   201011:       e8 2a 00 00 00          callq   42
+// DISASM-EMPTY:
 // DISASM-NEXT: Disassembly of section .plt:
+// DISASM-EMPTY:
 // DISASM-NEXT: .plt:
-// DISASM-NEXT:   201020:       ff 35 e2 0f 00 00       pushq   4066(%rip)
-// DISASM-NEXT:   201026:       ff 25 e4 0f 00 00       jmpq    *4068(%rip)
+// DISASM-NEXT:   201020:       ff 35 e2 1f 00 00       pushq   8162(%rip)
+// DISASM-NEXT:   201026:       ff 25 e4 1f 00 00       jmpq    *8164(%rip)
 // DISASM-NEXT:   20102c:       0f 1f 40 00     nopl    (%rax)
 // DISASM-EMPTY:
 // DISASM-NEXT:   bar2@plt:
-// DISASM-NEXT:   201030:       ff 25 e2 0f 00 00       jmpq    *4066(%rip)
+// DISASM-NEXT:   201030:       ff 25 e2 1f 00 00       jmpq    *8162(%rip)
 // DISASM-NEXT:   201036:       68 00 00 00 00          pushq   $0
 // DISASM-NEXT:   20103b:       e9 e0 ff ff ff          jmp     -32 <.plt>
 // DISASM-EMPTY:
 // DISASM-NEXT:   zed2@plt:
-// DISASM-NEXT:   201040:       ff 25 da 0f 00 00       jmpq    *4058(%rip)
+// DISASM-NEXT:   201040:       ff 25 da 1f 00 00       jmpq    *8154(%rip)
 // DISASM-NEXT:   201046:       68 01 00 00 00          pushq   $1
 // DISASM-NEXT:   20104b:       e9 d0 ff ff ff          jmp     -48 <.plt>
-// DISASM-NEXT:   201050:       ff 25 d2 0f 00 00       jmpq    *4050(%rip)
+// DISASM-NEXT:   201050:       ff 25 d2 1f 00 00       jmpq    *8146(%rip)
 // DISASM-NEXT:   201056:       68 00 00 00 00          pushq   $0
 // DISASM-NEXT:   20105b:       e9 e0 ff ff ff          jmp     -32 <zed2@plt>
-// DISASM-NEXT:   201060:       ff 25 ca 0f 00 00       jmpq    *4042(%rip)
+// DISASM-NEXT:   201060:       ff 25 ca 1f 00 00       jmpq    *8138(%rip)
 // DISASM-NEXT:   201066:       68 01 00 00 00          pushq   $1
 // DISASM-NEXT:   20106b:       e9 d0 ff ff ff          jmp     -48 <zed2@plt>
 
diff --git a/deps/lld/test/ELF/gnu-ifunc-relative.s b/deps/lld/test/ELF/gnu-ifunc-relative.s
index 65750ec46f617b388ac7fcd0c11151046d43dbec..510f246c394493b4d68fc1281fb1f30027934f9f 100644
--- a/deps/lld/test/ELF/gnu-ifunc-relative.s
+++ b/deps/lld/test/ELF/gnu-ifunc-relative.s
@@ -3,7 +3,7 @@
 // RUN: ld.lld --strip-all %t.o -o %t
 // RUN: llvm-readobj -r %t | FileCheck %s
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -r -t %t | FileCheck %s --check-prefixes=CHECK,SYM
+// RUN: llvm-readobj -r --symbols %t | FileCheck %s --check-prefixes=CHECK,SYM
 
 .type foo STT_GNU_IFUNC
 .globl foo
diff --git a/deps/lld/test/ELF/gnu-ifunc-shared.s b/deps/lld/test/ELF/gnu-ifunc-shared.s
index bc91ff9e5b32484a7dae594de308bef7d5547f2d..532355f2270f52d836ad049d99a1027225ad78c3 100644
--- a/deps/lld/test/ELF/gnu-ifunc-shared.s
+++ b/deps/lld/test/ELF/gnu-ifunc-shared.s
@@ -7,6 +7,7 @@
 // Check that an IRELATIVE relocation is used for a non-preemptible ifunc
 // handler and a JUMP_SLOT is used for a preemptible ifunc
 // DISASM: Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: fct:
 // DISASM-NEXT:     1000:       c3      retq
 // DISASM:     fct2:
@@ -18,30 +19,32 @@
 // DISASM-NEXT:     1011:       c3      retq
 // DISASM:     f2:
 // DISASM-NEXT:     1012:       c3      retq
+// DISASM-EMPTY:
 // DISASM-NEXT: Disassembly of section .plt:
+// DISASM-EMPTY:
 // DISASM-NEXT: .plt:
-// DISASM-NEXT:     1020:       ff 35 e2 0f 00 00       pushq   4066(%rip)
-// DISASM-NEXT:     1026:       ff 25 e4 0f 00 00       jmpq    *4068(%rip)
+// DISASM-NEXT:     1020:       ff 35 e2 1f 00 00       pushq   8162(%rip)
+// DISASM-NEXT:     1026:       ff 25 e4 1f 00 00       jmpq    *8164(%rip)
 // DISASM-NEXT:     102c:       0f 1f 40 00     nopl    (%rax)
 // DISASM-EMPTY:
 // DISASM-NEXT:   fct2@plt:
-// DISASM-NEXT:     1030:       ff 25 e2 0f 00 00       jmpq    *4066(%rip)
+// DISASM-NEXT:     1030:       ff 25 e2 1f 00 00       jmpq    *8162(%rip)
 // DISASM-NEXT:     1036:       68 00 00 00 00          pushq   $0
 // DISASM-NEXT:     103b:       e9 e0 ff ff ff          jmp     -32 <.plt>
 // DISASM-EMPTY:
 // DISASM-NEXT:   f2@plt:
-// DISASM-NEXT:     1040:       ff 25 da 0f 00 00       jmpq    *4058(%rip)
+// DISASM-NEXT:     1040:       ff 25 da 1f 00 00       jmpq    *8154(%rip)
 // DISASM-NEXT:     1046:       68 01 00 00 00          pushq   $1
 // DISASM-NEXT:     104b:       e9 d0 ff ff ff          jmp     -48 <.plt>
-// DISASM-NEXT:     1050:       ff 25 d2 0f 00 00       jmpq    *4050(%rip)
+// DISASM-NEXT:     1050:       ff 25 d2 1f 00 00       jmpq    *8146(%rip)
 // DISASM-NEXT:     1056:       68 00 00 00 00          pushq   $0
 // DISASM-NEXT:     105b:       e9 e0 ff ff ff          jmp     -32 <f2@plt>
 
 // CHECK: Relocations [
 // CHECK-NEXT:   Section (4) .rela.plt {
-// CHECK-NEXT:     0x2018 R_X86_64_JUMP_SLOT fct2 0x0
-// CHECK-NEXT:     0x2020 R_X86_64_JUMP_SLOT f2 0x0
-// CHECK-NEXT:     0x2028 R_X86_64_IRELATIVE - 0x1000
+// CHECK-NEXT:     0x3018 R_X86_64_JUMP_SLOT fct2 0x0
+// CHECK-NEXT:     0x3020 R_X86_64_JUMP_SLOT f2 0x0
+// CHECK-NEXT:     0x3028 R_X86_64_IRELATIVE - 0x1000
 
  // Hidden expect IRELATIVE
  .globl fct
diff --git a/deps/lld/test/ELF/gnu-ifunc.s b/deps/lld/test/ELF/gnu-ifunc.s
index 25c71b033e2033805e4741488b6b64d04588dcaf..087faba8b7105a41ba892d0b7377ecd97df19ee3 100644
--- a/deps/lld/test/ELF/gnu-ifunc.s
+++ b/deps/lld/test/ELF/gnu-ifunc.s
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld -static %t.o -o %tout
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DISASM
-// RUN: llvm-readobj -r -symbols -sections %tout | FileCheck %s
+// RUN: llvm-readobj -r --symbols --sections %tout | FileCheck %s
 
 // CHECK:      Sections [
 // CHECK:       Section {
@@ -90,6 +90,7 @@
 // CHECK-NEXT: ]
 
 // DISASM: Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: foo:
 // DISASM-NEXT:  201000: {{.*}} retq
 // DISASM:      bar:
@@ -100,7 +101,9 @@
 // DISASM-NEXT:  20100c: {{.*}} movl $2097496, %edx
 // DISASM-NEXT:  201011: {{.*}} movl $2097544, %edx
 // DISASM-NEXT:  201016: {{.*}} movl $2097545, %edx
+// DISASM-EMPTY:
 // DISASM-NEXT: Disassembly of section .plt:
+// DISASM-EMPTY:
 // DISASM-NEXT: .plt:
 // DISASM-NEXT:  201020: {{.*}} jmpq *4058(%rip)
 // DISASM-NEXT:  201026: {{.*}} pushq $0
diff --git a/deps/lld/test/ELF/gnu-unique.s b/deps/lld/test/ELF/gnu-unique.s
index 83f0f233f4f3228c5a5c36b6b028129dc3f6128f..fecca562f9287f998124150b493b96c75b628fd9 100644
--- a/deps/lld/test/ELF/gnu-unique.s
+++ b/deps/lld/test/ELF/gnu-unique.s
@@ -2,12 +2,12 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 //
 // RUN: ld.lld %t -shared -o %tout.so
-// RUN: llvm-readobj -dyn-symbols %tout.so | FileCheck -check-prefix=GNU %s
+// RUN: llvm-readobj --dyn-syms %tout.so | FileCheck -check-prefix=GNU %s
 // RUN: ld.lld %t -shared -o %tout.so --gnu-unique
-// RUN: llvm-readobj -dyn-symbols %tout.so | FileCheck -check-prefix=GNU %s
+// RUN: llvm-readobj --dyn-syms %tout.so | FileCheck -check-prefix=GNU %s
 //
 // RUN: ld.lld %t -shared -o %tout.so --no-gnu-unique
-// RUN: llvm-readobj -dyn-symbols %tout.so | FileCheck -check-prefix=NO %s
+// RUN: llvm-readobj --dyn-syms %tout.so | FileCheck -check-prefix=NO %s
 
 // Check that STB_GNU_UNIQUE is treated as a global and ends up in the dynamic
 // symbol table as STB_GNU_UNIQUE.
diff --git a/deps/lld/test/ELF/gnustack.s b/deps/lld/test/ELF/gnustack.s
index 3ab6f16ac7bd6054cec7c2383b6d66555fd55a4d..43dde48af3f12cd4096a5950f8dbd4994d72ae42 100644
--- a/deps/lld/test/ELF/gnustack.s
+++ b/deps/lld/test/ELF/gnustack.s
@@ -2,13 +2,13 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
 
 # RUN: ld.lld %t1 -z execstack -o %t
-# RUN: llvm-readobj --program-headers -s %t | FileCheck --check-prefix=RWX %s
+# RUN: llvm-readobj --program-headers -S %t | FileCheck --check-prefix=RWX %s
 
 # RUN: ld.lld %t1 -o %t
-# RUN: llvm-readobj --program-headers -s %t | FileCheck --check-prefix=RW %s
+# RUN: llvm-readobj --program-headers -S %t | FileCheck --check-prefix=RW %s
 
 # RUN: ld.lld %t1 -o %t -z noexecstack
-# RUN: llvm-readobj --program-headers -s %t | FileCheck --check-prefix=RW %s
+# RUN: llvm-readobj --program-headers -S %t | FileCheck --check-prefix=RW %s
 
 # RW:      Type: PT_GNU_STACK
 # RW-NEXT: Offset: 0x0
diff --git a/deps/lld/test/ELF/got-aarch64.s b/deps/lld/test/ELF/got-aarch64.s
deleted file mode 100644
index c9e20276472f8df098c9f743034181fbf30cd672..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/got-aarch64.s
+++ /dev/null
@@ -1,40 +0,0 @@
-// REQUIRES: aarch64
-// RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %s -o %t.o
-// RUN: ld.lld --hash-style=sysv -shared %t.o -o %t.so
-// RUN: llvm-readobj -s -r %t.so | FileCheck %s
-// RUN: llvm-objdump -d %t.so | FileCheck --check-prefix=DISASM %s
-
-// CHECK:      Name: .got
-// CHECK-NEXT: Type: SHT_PROGBITS
-// CHECK-NEXT: Flags [
-// CHECK-NEXT:   SHF_ALLOC
-// CHECK-NEXT:   SHF_WRITE
-// CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x30090
-// CHECK-NEXT: Offset:
-// CHECK-NEXT: Size: 8
-// CHECK-NEXT: Link: 0
-// CHECK-NEXT: Info: 0
-// CHECK-NEXT: AddressAlignment: 8
-
-// CHECK:      Relocations [
-// CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
-// CHECK-NEXT:     0x30090 R_AARCH64_GLOB_DAT dat 0x0
-// CHECK-NEXT:   }
-// CHECK-NEXT: ]
-
-// Page(0x20098) - Page(0x10000) = 0x10000 = 65536
-// 0x20098 & 0xff8 = 0x98 = 152
-
-// DISASM: main:
-// DISASM-NEXT:   10000:  00 01 00 90   adrp  x0, #131072
-// DISASM-NEXT:   10004: 00 48 40 f9   ldr x0, [x0, #144]
-
-.global main,foo,dat
-.text
-main:
-    adrp x0, :got:dat
-    ldr x0, [x0, :got_lo12:dat]
-.data
-dat:
-    .word 42
diff --git a/deps/lld/test/ELF/got-i386.s b/deps/lld/test/ELF/got-i386.s
index 3b2ef1a31c2c150c754134a35f86b5d4003594d2..d51a576f19b7eb6c340664d7197c898f03897895 100644
--- a/deps/lld/test/ELF/got-i386.s
+++ b/deps/lld/test/ELF/got-i386.s
@@ -1,10 +1,10 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -s -r -t %t | FileCheck %s
+// RUN: llvm-readobj -S -r --symbols %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
-// CHECK:      Name: .got
+// CHECK:      Name: .got.plt
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
@@ -12,14 +12,14 @@
 // CHECK-NEXT: ]
 // CHECK-NEXT: Address: 0x402000
 // CHECK-NEXT: Offset:
-// CHECK-NEXT: Size: 0
+// CHECK-NEXT: Size:
 // CHECK-NEXT: Link:
 // CHECK-NEXT: Info:
 // CHECK-NEXT: AddressAlignment:
 
 // CHECK:      Symbol {
 // CHECK:       Name: bar
-// CHECK-NEXT:  Value: 0x402000
+// CHECK-NEXT:  Value: 0x40200C
 // CHECK-NEXT:  Size: 10
 // CHECK-NEXT:  Binding: Global
 // CHECK-NEXT:  Type: Object
@@ -28,7 +28,7 @@
 // CHECK-NEXT: }
 // CHECK-NEXT: Symbol {
 // CHECK-NEXT:  Name: obj
-// CHECK-NEXT:  Value: 0x40200A
+// CHECK-NEXT:  Value: 0x402016
 // CHECK-NEXT:  Size: 10
 // CHECK-NEXT:  Binding: Global
 // CHECK-NEXT:  Type: Object
@@ -40,10 +40,11 @@
 // 0x40200A - 10 = addr(.got) = 0x402000
 // 0x40200A + 5 - 15 = addr(.got) = 0x402000
 // DISASM:      Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: _start:
-// DISASM-NEXT: 401000: c7 81 00 00 00 00 01 00 00 00 movl $1, (%ecx)
-// DISASM-NEXT: 40100a: c7 81 0a 00 00 00 02 00 00 00 movl $2, 10(%ecx)
-// DISASM-NEXT: 401014: c7 81 0f 00 00 00 03 00 00 00 movl $3, 15(%ecx)
+// DISASM-NEXT: 401000: c7 81 0c 00 00 00 01 00 00 00 movl $1, 12(%ecx)
+// DISASM-NEXT: 40100a: c7 81 16 00 00 00 02 00 00 00 movl $2, 22(%ecx)
+// DISASM-NEXT: 401014: c7 81 1b 00 00 00 03 00 00 00 movl $3, 27(%ecx)
 
 .global _start
 _start:
diff --git a/deps/lld/test/ELF/got-plt-header.s b/deps/lld/test/ELF/got-plt-header.s
index f8412e13c41d01b24b088f383fa478db3e32b4e0..a65e49c512c3e3f28daef445a6ddf6caf77ae8a2 100644
--- a/deps/lld/test/ELF/got-plt-header.s
+++ b/deps/lld/test/ELF/got-plt-header.s
@@ -1,31 +1,31 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
 
         call foo@plt
 
 // Check that the first .got.plt entry has the address of the dynamic table.
 
+// CHECK:      Type: SHT_DYNAMIC
+// CHECK-NEXT: Flags [
+// CHECK-NEXT:   SHF_ALLOC
+// CHECK-NEXT:   SHF_WRITE
+// CHECK-NEXT: ]
+// CHECK-NEXT: Address: 0x2000
+
 // CHECK:      Name: .got.plt
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x2000
-// CHECK-NEXT: Offset: 0x2000
+// CHECK-NEXT: Address: 0x3000
+// CHECK-NEXT: Offset: 0x3000
 // CHECK-NEXT: Size: 32
 // CHECK-NEXT: Link: 0
 // CHECK-NEXT: Info: 0
 // CHECK-NEXT: AddressAlignment: 8
 // CHECK-NEXT: EntrySize: 0
 // CHECK-NEXT: SectionData (
-// CHECK-NEXT:   0000: 00300000 00000000 00000000 00000000
-
-// CHECK:      Type: SHT_DYNAMIC
-// CHECK-NEXT: Flags [
-// CHECK-NEXT:   SHF_ALLOC
-// CHECK-NEXT:   SHF_WRITE
-// CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x3000
+// CHECK-NEXT:   0000: 00200000 00000000 00000000 00000000
diff --git a/deps/lld/test/ELF/got.s b/deps/lld/test/ELF/got.s
index 9d2d804454bf4c6a092d9b00624cae586b3bb857..3f53029ab19b61fb60c981124c10513b54f327f5 100644
--- a/deps/lld/test/ELF/got.s
+++ b/deps/lld/test/ELF/got.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld --hash-style=sysv %t.o %t2.so -o %t
-// RUN: llvm-readobj -s -r %t | FileCheck %s
+// RUN: llvm-readobj -S -r %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
 // CHECK:      Name: .got
diff --git a/deps/lld/test/ELF/got32-i386.s b/deps/lld/test/ELF/got32-i386.s
index ff67a4bbe0efcb792f5a498ccb56408cfcaabc76..0080e1be1ebf0a57459cce41a474df4da0c286e7 100644
--- a/deps/lld/test/ELF/got32-i386.s
+++ b/deps/lld/test/ELF/got32-i386.s
@@ -16,7 +16,7 @@ _start:
 # CHECK:       _start:
 # CHECK-NEXT:   401001: 8b 1d {{.*}}  movl 4202496, %ebx
 # CHECK: Sections:
-# CHECK:  Name Size     Address
+# CHECK:  Name Size     VMA
 # CHECK:  .got 00000004 0000000000402000
 
 # RUN: not ld.lld %t.o -o %t -pie 2>&1 | FileCheck %s --check-prefix=ERR
diff --git a/deps/lld/test/ELF/got32x-i386.s b/deps/lld/test/ELF/got32x-i386.s
index 88e7e31ee5617a22830a8a031492286ddf2e4d0e..0e601fe7498103a3e6d1711c6b5fcaa6fb0e0421 100644
--- a/deps/lld/test/ELF/got32x-i386.s
+++ b/deps/lld/test/ELF/got32x-i386.s
@@ -33,13 +33,13 @@
 
 ## 73728 == 0x12000 == ADDR(.got)
 # CHECK:       _start:
-# CHECK-NEXT:   401001: 8b 05 {{.*}} movl 4206592, %eax
-# CHECK-NEXT:   401007: 8b 1d {{.*}} movl 4206592, %ebx
-# CHECK-NEXT:   40100d: 8b 80 {{.*}} movl -4(%eax), %eax
-# CHECK-NEXT:   401013: 8b 83 {{.*}} movl -4(%ebx), %eax
+# CHECK-NEXT:   401001: 8b 05 {{.*}} movl 4202496, %eax
+# CHECK-NEXT:   401007: 8b 1d {{.*}} movl 4202496, %ebx
+# CHECK-NEXT:   40100d: 8b 80 {{.*}} movl -4096(%eax), %eax
+# CHECK-NEXT:   401013: 8b 83 {{.*}} movl -4096(%ebx), %eax
 # CHECK: Sections:
-# CHECK:  Name Size     Address
-# CHECK:  .got 00000004 0000000000403000
+# CHECK:  Name Size     VMA
+# CHECK:  .got.plt 0000000c 0000000000403000
 
 # RUN: not ld.lld %S/Inputs/i386-got32x-baseless.elf -o %t1 -pie 2>&1 | \
 # RUN:   FileCheck %s --check-prefix=ERR
diff --git a/deps/lld/test/ELF/gotpc-relax-nopic.s b/deps/lld/test/ELF/gotpc-relax-nopic.s
index e51b8bd9f4e9f723781a3b6a2e8b4816c5bc30b7..51a7f0e4cc8a8799efab469010ca65ecd97c608b 100644
--- a/deps/lld/test/ELF/gotpc-relax-nopic.s
+++ b/deps/lld/test/ELF/gotpc-relax-nopic.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -relax-relocations -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld --hash-style=sysv %t.o -o %t1
-# RUN: llvm-readobj -symbols -r %t1 | FileCheck --check-prefix=SYMRELOC %s
+# RUN: llvm-readobj --symbols -r %t1 | FileCheck --check-prefix=SYMRELOC %s
 # RUN: llvm-objdump -d %t1 | FileCheck --check-prefix=DISASM %s
 
 ## There is no relocations.
@@ -14,6 +14,7 @@
 
 ## 2105344 = 0x202000 (bar)
 # DISASM:      Disassembly of section .text:
+# DISASM-EMPTY:
 # DISASM-NEXT: _start:
 # DISASM-NEXT:   201000: {{.*}} adcq  $2105344, %rax
 # DISASM-NEXT:   201007: {{.*}} addq  $2105344, %rbx
@@ -26,7 +27,7 @@
 # DISASM-NEXT:   201038: {{.*}} testq $2105344, %r15
 
 # RUN: ld.lld --hash-style=sysv -shared %t.o -o %t2
-# RUN: llvm-readobj -s -r -d %t2 | FileCheck --check-prefix=SEC-PIC    %s
+# RUN: llvm-readobj -S -r -d %t2 | FileCheck --check-prefix=SEC-PIC    %s
 # RUN: llvm-objdump -d %t2 | FileCheck --check-prefix=DISASM-PIC %s
 # SEC-PIC:      Section {
 # SEC-PIC:        Index:
@@ -36,8 +37,8 @@
 # SEC-PIC-NEXT:     SHF_ALLOC
 # SEC-PIC-NEXT:     SHF_WRITE
 # SEC-PIC-NEXT:   ]
-# SEC-PIC-NEXT:   Address: 0x30A0
-# SEC-PIC-NEXT:   Offset: 0x30A0
+# SEC-PIC-NEXT:   Address: 0x20A0
+# SEC-PIC-NEXT:   Offset: 0x20A0
 # SEC-PIC-NEXT:   Size: 8
 # SEC-PIC-NEXT:   Link:
 # SEC-PIC-NEXT:   Info:
@@ -46,7 +47,7 @@
 # SEC-PIC-NEXT: }
 # SEC-PIC:      Relocations [
 # SEC-PIC-NEXT:   Section ({{.*}}) .rela.dyn {
-# SEC-PIC-NEXT:     0x30A0 R_X86_64_RELATIVE - 0x2000
+# SEC-PIC-NEXT:     0x20A0 R_X86_64_RELATIVE - 0x3000
 # SEC-PIC-NEXT:   }
 # SEC-PIC-NEXT: ]
 # SEC-PIC:      0x000000006FFFFFF9 RELACOUNT            1
@@ -55,16 +56,17 @@
 ## Ex: 0x1000 + 4249 + 7 = 0x20A0
 ##     0x102a + 4207 + 7 = 0x20A0
 # DISASM-PIC:      Disassembly of section .text:
+# DISASM-PIC-EMPTY:
 # DISASM-PIC-NEXT: _start:
-# DISASM-PIC-NEXT: 1000: {{.*}} adcq  8345(%rip), %rax
-# DISASM-PIC-NEXT: 1007: {{.*}} addq  8338(%rip), %rbx
-# DISASM-PIC-NEXT: 100e: {{.*}} andq  8331(%rip), %rcx
-# DISASM-PIC-NEXT: 1015: {{.*}} cmpq  8324(%rip), %rdx
-# DISASM-PIC-NEXT: 101c: {{.*}} orq   8317(%rip), %rdi
-# DISASM-PIC-NEXT: 1023: {{.*}} sbbq  8310(%rip), %rsi
-# DISASM-PIC-NEXT: 102a: {{.*}} subq  8303(%rip), %rbp
-# DISASM-PIC-NEXT: 1031: {{.*}} xorq  8296(%rip), %r8
-# DISASM-PIC-NEXT: 1038: {{.*}} testq %r15, 8289(%rip)
+# DISASM-PIC-NEXT: 1000: {{.*}} adcq  4249(%rip), %rax
+# DISASM-PIC-NEXT: 1007: {{.*}} addq  4242(%rip), %rbx
+# DISASM-PIC-NEXT: 100e: {{.*}} andq  4235(%rip), %rcx
+# DISASM-PIC-NEXT: 1015: {{.*}} cmpq  4228(%rip), %rdx
+# DISASM-PIC-NEXT: 101c: {{.*}} orq   4221(%rip), %rdi
+# DISASM-PIC-NEXT: 1023: {{.*}} sbbq  4214(%rip), %rsi
+# DISASM-PIC-NEXT: 102a: {{.*}} subq  4207(%rip), %rbp
+# DISASM-PIC-NEXT: 1031: {{.*}} xorq  4200(%rip), %r8
+# DISASM-PIC-NEXT: 1038: {{.*}} testq %r15, 4193(%rip)
 
 .data
 .type   bar, @object
diff --git a/deps/lld/test/ELF/gotpc-relax-und-dso.s b/deps/lld/test/ELF/gotpc-relax-und-dso.s
index 3c5c8ba8c49b0ebecc94da148527d261ef3e48d0..601f70c8c384a5ba7caa50e99ea7d476f882f5bd 100644
--- a/deps/lld/test/ELF/gotpc-relax-und-dso.s
+++ b/deps/lld/test/ELF/gotpc-relax-und-dso.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -relax-relocations -triple=x86_64-pc-linux %S/Inputs/gotpc-relax-und-dso.s -o %tdso.o
 # RUN: ld.lld -shared %tdso.o -o %t.so
 # RUN: ld.lld --hash-style=sysv -shared %t.o %t.so -o %tout
-# RUN: llvm-readobj -r -s %tout | FileCheck --check-prefix=RELOC %s
+# RUN: llvm-readobj -r -S %tout | FileCheck --check-prefix=RELOC %s
 # RUN: llvm-objdump -d %tout | FileCheck --check-prefix=DISASM %s
 
 # RELOC:      Relocations [
@@ -17,6 +17,7 @@
 # 0x101e + 7 - 36 = 0x1001
 # 0x1025 + 7 - 43 = 0x1001
 # DISASM:      Disassembly of section .text:
+# DISASM-EMPTY:
 # DISASM-NEXT: foo:
 # DISASM-NEXT:     nop
 # DISASM:      hid:
diff --git a/deps/lld/test/ELF/gotpc-relax.s b/deps/lld/test/ELF/gotpc-relax.s
index 3d2f2ab578e838104f9ae1ed019e56cc283c9f12..21ec4e10960e7d94d4c106b23383a5e4ca4c3b8a 100644
--- a/deps/lld/test/ELF/gotpc-relax.s
+++ b/deps/lld/test/ELF/gotpc-relax.s
@@ -13,6 +13,7 @@
 # 0x201011 + 7 - 23 = 0x201001
 # 0x201018 + 7 - 30 = 0x201001
 # DISASM:      Disassembly of section .text:
+# DISASM-EMPTY:
 # DISASM-NEXT: foo:
 # DISASM-NEXT:   201000: 90 nop
 # DISASM:      hid:
diff --git a/deps/lld/test/ELF/gotpcrelx.s b/deps/lld/test/ELF/gotpcrelx.s
index d9a7b8e048c348541374c71262eed8218d2759aa..9e0f0237455ab142887d74410ad25b0415873083 100644
--- a/deps/lld/test/ELF/gotpcrelx.s
+++ b/deps/lld/test/ELF/gotpcrelx.s
@@ -3,7 +3,7 @@
 // RUN: %s -o %t.o
 // RUN: llvm-readobj -r %t.o | FileCheck --check-prefix=RELS %s
 // RUN: ld.lld --hash-style=sysv %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -r %t.so | FileCheck %s
+// RUN: llvm-readobj -S -r %t.so | FileCheck %s
 
 movq foo@GOTPCREL(%rip), %rax
 movq bar@GOTPCREL(%rip), %rax
diff --git a/deps/lld/test/ELF/hexagon-shared.s b/deps/lld/test/ELF/hexagon-shared.s
index 97f8e84f9257c19ea99a80557233383e55b86eeb..caf872c345052085262ffbd3cb4496782e01b928 100644
--- a/deps/lld/test/ELF/hexagon-shared.s
+++ b/deps/lld/test/ELF/hexagon-shared.s
@@ -25,22 +25,22 @@ jumpr r0
 # R_HEX_GOT_16_X
 r0 = add(r1,##bar@GOT)
 
-# PLT: { immext(#65472
-# PLT: r28 = add(pc,##65488) }
+# PLT: { immext(#131008
+# PLT: r28 = add(pc,##131024) }
 # PLT: { r14 -= add(r28,#16)
 # PLT: r15 = memw(r28+#8)
 # PLT: r28 = memw(r28+#4) }
 # PLT: { r14 = asr(r14,#2)
 # PLT: jumpr r28 }
 # PLT: { trap0(#219) }
-# PLT: immext(#65472)
-# PLT: r14 = add(pc,##65472) }
+# PLT: immext(#131008)
+# PLT: r14 = add(pc,##131008) }
 # PLT: r28 = memw(r14+#0) }
 # PLT: jumpr r28 }
 
-# TEXT:  10000: 00 00 02 00 00020000
+# TEXT:  10000: 00 00 01 00 00010000
 # TEXT: { 	call 0x10050 }
-# TEXT: r0 = add(r1,##65664) }
+# TEXT: r0 = add(r1,##-65408) }
 
 # GOT: .got:
-# GOT: 30080:	00 00 00 00 00000000 <unknown>
+# GOT: 20080:	00 00 00 00 00000000 <unknown>
diff --git a/deps/lld/test/ELF/hidden-shared-err.s b/deps/lld/test/ELF/hidden-shared-err.s
index e6d424c24824959516908671e590a0353e6ad11f..cbdec478d4dad83fe92bcd3a47da4195a7e11843 100644
--- a/deps/lld/test/ELF/hidden-shared-err.s
+++ b/deps/lld/test/ELF/hidden-shared-err.s
@@ -11,7 +11,7 @@
 # RUN: not ld.lld %t.o %t3.o %t2.so -o %t 2>&1 | FileCheck %s
 # RUN: not ld.lld %t3.o %t.o %t2.so -o %t 2>&1 | FileCheck %s
 
-# CHECK: undefined symbol: foo
+# CHECK: undefined hidden symbol: foo
 
 .global _start
 _start:
diff --git a/deps/lld/test/ELF/i386-cet.s b/deps/lld/test/ELF/i386-cet.s
new file mode 100644
index 0000000000000000000000000000000000000000..125c7977ee280eae068a93c80e4a1f6c0bd74940
--- /dev/null
+++ b/deps/lld/test/ELF/i386-cet.s
@@ -0,0 +1,47 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=i386-unknown-linux %s -o %t.o
+# RUN: llvm-mc -filetype=obj -triple=i386-unknown-linux %p/Inputs/i386-cet1.s -o %t1.o
+# RUN: llvm-mc -filetype=obj -triple=i386-unknown-linux %p/Inputs/i386-cet2.s -o %t2.o
+# RUN: llvm-mc -filetype=obj -triple=i386-unknown-linux %p/Inputs/i386-cet3.s -o %t3.o
+# RUN: llvm-mc -filetype=obj -triple=i386-unknown-linux %p/Inputs/i386-cet4.s -o %t4.o
+
+# RUN: ld.lld -e func1 %t.o %t1.o -o %t
+# RUN: llvm-readelf -n %t | FileCheck -check-prefix=CET -match-full-lines %s
+
+# RUN: ld.lld -e func1 %t.o %t2.o -o %t
+# RUN: llvm-readelf -n %t | FileCheck -check-prefix=CET -match-full-lines %s
+
+# CET: Properties: x86 feature: IBT, SHSTK
+
+# RUN: ld.lld -e func1 %t.o %t3.o -o %t
+# RUN: llvm-readelf -S %t | FileCheck -check-prefix=NOCET %s
+
+# NOCET:     Section Headers
+# NOCET-NOT: .note.gnu.property
+
+# RUN: not ld.lld -e func1 %t.o %t3.o -o %t --require-cet 2>&1 \
+# RUN:   | FileCheck -check-prefix=ERROR %s
+# ERROR: i386-cet.s.tmp3.o: --require-cet: file is not compatible with CET
+
+# RUN: ld.lld -e func1 %t.o %t4.o -o %t
+# RUN: llvm-readelf -n %t | FileCheck -check-prefix=NOSHSTK -match-full-lines %s
+
+# Check .note.gnu.protery without property SHSTK.
+# NOSHSTK: Properties: x86 feature: IBT
+
+.section ".note.gnu.property", "a"
+.long 4
+.long 0xc
+.long 0x5
+.asciz "GNU"
+
+.long 0xc0000002
+.long 4
+.long 3
+
+.text
+.globl func1
+.type func1,@function
+func1:
+  call func2
+  ret
diff --git a/deps/lld/test/ELF/i386-debug-noabs.test b/deps/lld/test/ELF/i386-debug-noabs.test
index dbc7a57f8f7ab25daea1b1b9d8c58d15fbea7744..486cc8d9fbed82f8087f7d9d93213e453c5c96c7 100644
--- a/deps/lld/test/ELF/i386-debug-noabs.test
+++ b/deps/lld/test/ELF/i386-debug-noabs.test
@@ -29,5 +29,5 @@ Sections:
         Symbol:          _GLOBAL_OFFSET_TABLE_
         Type:            R_386_GOTPC
 Symbols:
-  Global:
-    - Name:            _GLOBAL_OFFSET_TABLE_
+  - Name:            _GLOBAL_OFFSET_TABLE_
+    Binding:         STB_GLOBAL
diff --git a/deps/lld/test/ELF/i386-got-and-copy.s b/deps/lld/test/ELF/i386-got-and-copy.s
index 78788a55f23c8e40ec023cfa89233dbae1821783..9c2f60f68929e7a54d0a955aee9150bf29516fb7 100644
--- a/deps/lld/test/ELF/i386-got-and-copy.s
+++ b/deps/lld/test/ELF/i386-got-and-copy.s
@@ -14,8 +14,8 @@
 
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section (4) .rel.dyn {
-# CHECK-NEXT:     0x{{[0-9A-F]+}} R_386_COPY foo
 # CHECK-NEXT:     0x{{[0-9A-F]+}} R_386_GLOB_DAT foo
+# CHECK-NEXT:     0x{{[0-9A-F]+}} R_386_COPY foo
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 
diff --git a/deps/lld/test/ELF/i386-gotoff-shared.s b/deps/lld/test/ELF/i386-gotoff-shared.s
index c22bd6dd5d78fca36e33d7a7d33ffb2619068245..59369b3e3f2367d989dfa10302481ae48a88b5c5 100644
--- a/deps/lld/test/ELF/i386-gotoff-shared.s
+++ b/deps/lld/test/ELF/i386-gotoff-shared.s
@@ -1,23 +1,15 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o
 // RUN: ld.lld --hash-style=sysv %t.o -o %t.so -shared
-// RUN: llvm-readobj -s %t.so | FileCheck %s
+// RUN: llvm-readelf -S %t.so | FileCheck %s
 // RUN: llvm-objdump -d %t.so | FileCheck --check-prefix=DISASM %s
 
 bar:
         movl    bar@GOTOFF(%ebx), %eax
         mov     bar@GOT, %eax
 
-// CHECK:      Name: .got
-// CHECK-NEXT: Type: SHT_PROGBITS
-// CHECK-NEXT: Flags [
-// CHECK-NEXT:   SHF_ALLOC
-// CHECK-NEXT:   SHF_WRITE
-// CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x2050
-// CHECK-NEXT: Offset: 0x2050
-// CHECK-NEXT: Size: 4
+// CHECK: .got.plt          PROGBITS        00003000
 
-// 0x1000 - (0x2050 + 4) = -4180
+// 0x1000 - 0x3000 (.got.plt) = -8192
 
-// DISASM:  1000: {{.*}} movl    -4180(%ebx), %eax
+// DISASM:  1000: {{.*}} movl    -8192(%ebx), %eax
diff --git a/deps/lld/test/ELF/i386-gotpc-dynamic.s b/deps/lld/test/ELF/i386-gotpc-dynamic.s
index 0ec737e701a6c0385c30f02fcdb5a6888529477d..c75f0bef4a2bbf97f125f935856f2d5651b146ff 100644
--- a/deps/lld/test/ELF/i386-gotpc-dynamic.s
+++ b/deps/lld/test/ELF/i386-gotpc-dynamic.s
@@ -1,28 +1,13 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o
 # RUN: ld.lld --hash-style=sysv %t.o -o %t.so -shared
-# RUN: llvm-readobj -s %t.so | FileCheck %s
+# RUN: llvm-readelf -S %t.so | FileCheck %s
 # RUN: llvm-objdump -d %t.so | FileCheck --check-prefix=DISASM %s
 
-# CHECK:       Section {
-# CHECK:        Index: 7
-# CHECK-NEXT:   Name: .got
-# CHECK-NEXT:   Type: SHT_PROGBITS
-# CHECK-NEXT:   Flags [
-# CHECK-NEXT:     SHF_ALLOC
-# CHECK-NEXT:     SHF_WRITE
-# CHECK-NEXT:   ]
-# CHECK-NEXT:   Address: 0x2030
-# CHECK-NEXT:   Offset:
-# CHECK-NEXT:   Size:
-# CHECK-NEXT:   Link:
-# CHECK-NEXT:   Info:
-# CHECK-NEXT:   AddressAlignment:
-# CHECK-NEXT:   EntrySize:
-# CHECK-NEXT: }
+# CHECK: .got.plt          PROGBITS        00003000
 
-## 0x1000 + 4144 = 0x2030
-# DISASM: 1000: {{.*}} movl $4144, %eax
+## 0x3000 - 0x1000 = 8192
+# DISASM: 1000: {{.*}} movl $8192, %eax
 
 .section .foo,"ax",@progbits
 foo:
diff --git a/deps/lld/test/ELF/i386-gotpc.s b/deps/lld/test/ELF/i386-gotpc.s
index af8380b911530ecf6591c00b7dd8f9bdcab3c1a2..47f303ebd854d58eafa1a5b9fdc0476131e10fb1 100644
--- a/deps/lld/test/ELF/i386-gotpc.s
+++ b/deps/lld/test/ELF/i386-gotpc.s
@@ -1,28 +1,15 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o
 // RUN: ld.lld --hash-style=sysv %t.o -o %t.so -shared
-// RUN: llvm-readobj -s %t.so | FileCheck %s
+// RUN: llvm-readelf -S %t.so | FileCheck %s
 // RUN: llvm-objdump -d %t.so | FileCheck --check-prefix=DISASM %s
 
 movl $_GLOBAL_OFFSET_TABLE_, %eax
 
-// CHECK:     Name: .got.plt
-// CHECK-NEXT: Type: SHT_PROGBITS
-// CHECK-NEXT: Flags [
-// CHECK-NEXT:   SHF_ALLOC
-// CHECK-NEXT:   SHF_WRITE
-// CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x2000
-
-// CHECK:      Name: .got
-// CHECK-NEXT: Type: SHT_PROGBITS
-// CHECK-NEXT: Flags [
-// CHECK-NEXT:   SHF_ALLOC
-// CHECK-NEXT:   SHF_WRITE
-// CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x3030
+// CHECK: .got.plt          PROGBITS        00003000
 
 // DISASM:      Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: .text:
-// DISASM-NEXT:    1000: {{.*}}         movl    $8240, %eax
-//                                              0x3030 - 0x1000 = 0x2030
+// DISASM-NEXT:    1000: {{.*}}         movl    $8192, %eax
+//                                              0x3000 (.got.plt) - 0x1000 = 8192
diff --git a/deps/lld/test/ELF/i386-merge.s b/deps/lld/test/ELF/i386-merge.s
index d895c73270005c56222fef3e9243ecdca831f057..0bda9e87d736201570f56f8c36528e3d1552b509 100644
--- a/deps/lld/test/ELF/i386-merge.s
+++ b/deps/lld/test/ELF/i386-merge.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i386-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t -shared
-// RUN: llvm-readobj -s -section-data %t | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 // CHECK:      Name: .mysec
 // CHECK-NEXT: Type:
@@ -9,7 +9,7 @@
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_MERGE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x158
+// CHECK-NEXT: Address: 0x178
 // CHECK-NEXT: Offset:
 // CHECK-NEXT: Size:
 // CHECK-NEXT: Link:
@@ -27,15 +27,15 @@
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x1000
-// CHECK-NEXT: Offset: 0x1000
+// CHECK-NEXT: Address: 0x2000
+// CHECK-NEXT: Offset: 0x2000
 // CHECK-NEXT: Size: 4
 // CHECK-NEXT: Link: 0
 // CHECK-NEXT: Info: 0
 // CHECK-NEXT: AddressAlignment: 1
 // CHECK-NEXT: EntrySize: 0
 // CHECK-NEXT: SectionData (
-// CHECK-NEXT:   0000: 58010000 |
+// CHECK-NEXT:   0000: 78010000 |
 // CHECK-NEXT: )
 
 // The content of .data should be the address of .mysec.
diff --git a/deps/lld/test/ELF/i386-pc16.test b/deps/lld/test/ELF/i386-pc16.test
index 14f8b501d083869ed3993e62ae059f6d394be107..4033f2c86cfb7d1c0842cbc0f14001ae94a716d1 100644
--- a/deps/lld/test/ELF/i386-pc16.test
+++ b/deps/lld/test/ELF/i386-pc16.test
@@ -32,9 +32,9 @@ Sections:
         Symbol:          _start
         Type:            R_386_PC16
 Symbols:
-  Global:
-    - Name:     _start
-      Type:     STT_FUNC
-      Section:  .text
-      Value:    0x1234
-      Size:     4
+  - Name:     _start
+    Type:     STT_FUNC
+    Section:  .text
+    Value:    0x1234
+    Size:     4
+    Binding:  STB_GLOBAL
diff --git a/deps/lld/test/ELF/i386-relax-reloc.s b/deps/lld/test/ELF/i386-relax-reloc.s
index a7fdc404ceca5a848afdf4501c3006a6dc92b78c..8aeb53fa9b6b74f59a4068c3ca391ef3d5878eef 100644
--- a/deps/lld/test/ELF/i386-relax-reloc.s
+++ b/deps/lld/test/ELF/i386-relax-reloc.s
@@ -1,12 +1,17 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o -relax-relocations
 // RUN: ld.lld -shared %t.o -o %t.so
+// RUN: llvm-readelf -S %t.so | FileCheck --check-prefix=SEC %s
 // RUN: llvm-objdump -d %t.so | FileCheck %s
 
+// SEC:      .got PROGBITS 00002050
+// SEC-NEXT: .got.plt PROGBITS 00003000
+
+// 0x2050 - 0x3000 = -4016
+// CHECK: foo:
+// CHECK-NEXT: movl    -4016(%ebx), %eax
+// CHECK-NEXT: movl    -4008(%ebx), %eax
+
 foo:
         movl bar@GOT(%ebx), %eax
         movl bar+8@GOT(%ebx), %eax
-
-// CHECK: foo:
-// CHECK-NEXT: movl    -4(%ebx), %eax
-// CHECK-NEXT: movl    4(%ebx), %eax
diff --git a/deps/lld/test/ELF/i386-reloc-16.s b/deps/lld/test/ELF/i386-reloc-16.s
index 9a099a6ba3edec739297be77f882e49819a8e07f..aef2394a691a6e6b2709f38c9d39e36c24b278f9 100644
--- a/deps/lld/test/ELF/i386-reloc-16.s
+++ b/deps/lld/test/ELF/i386-reloc-16.s
@@ -1,15 +1,20 @@
-// REQUIRES: x86
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=i386 %s -o %t.o
 
-// RUN: llvm-mc -filetype=obj -triple=i386-pc-linux %S/Inputs/x86-64-reloc-16.s -o %t1
-// RUN: llvm-mc -filetype=obj -triple=i386-pc-linux %S/Inputs/x86-64-reloc-16-error.s -o %t2
-// RUN: llvm-mc -filetype=obj -triple=i386-pc-linux %s -o %t
-// RUN: ld.lld -shared %t %t1 -o %t3
-// RUN: llvm-objdump -s %t3 | FileCheck %s
+# RUN: ld.lld %t.o --defsym=a=0 --defsym=b=32768 -o %t
+# RUN: llvm-readelf -x .text %t | FileCheck %s
+# CHECK: b80080bb ffff
 
-// CHECK:      Contents of section .text:
-// CHECK-NEXT:   1000 42
+# RUN: not ld.lld %t.o --defsym=a=-1 --defsym=b=0 -o /dev/null 2>&1 | \
+# RUN:   FileCheck --check-prefix=OVERFLOW1 %s
+# OVERFLOW1: relocation R_386_16 out of range: -32769 is not in [-32768, 65535]
 
-// RUN: not ld.lld -shared %t %t2 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR %s
-// ERROR: relocation R_386_16 out of range: 65536 is not in [-32768, 32767]
+# RUN: not ld.lld %t.o --defsym=a=0 --defsym=b=32769 -o /dev/null 2>&1 | \
+# RUN:   FileCheck --check-prefix=OVERFLOW2 %s
+# OVERFLOW2: relocation R_386_16 out of range: 65536 is not in [-32768, 65535]
 
-.short foo
+.code16
+.global _start
+_start:
+movw $a-32768, %ax
+movw $b+32767, %bx
diff --git a/deps/lld/test/ELF/i386-reloc-8.s b/deps/lld/test/ELF/i386-reloc-8.s
index b46aaa688261708f7fee1b859f01a54d512eeeec..6949ab651f60a3fa573508c4d45edc36b0962500 100644
--- a/deps/lld/test/ELF/i386-reloc-8.s
+++ b/deps/lld/test/ELF/i386-reloc-8.s
@@ -1,15 +1,20 @@
-// REQUIRES: x86
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=i386 %s -o %t.o
 
-// RUN: llvm-mc -filetype=obj -triple=i386-pc-linux %S/Inputs/i386-reloc-8.s -o %t1
-// RUN: llvm-mc -filetype=obj -triple=i386-pc-linux %S/Inputs/i386-reloc-8-error.s -o %t2
-// RUN: llvm-mc -filetype=obj -triple=i386-pc-linux %s -o %t
-// RUN: ld.lld -shared %t %t1 -o %t3
-// RUN: llvm-objdump -s %t3 | FileCheck %s
+# RUN: ld.lld %t.o --defsym=a=0 --defsym=b=128 -o %t
+# RUN: llvm-readelf -x .text %t | FileCheck %s
+# CHECK: b480b7ff
 
-// CHECK:      Contents of section .text:
-// CHECK-NEXT:   1000 ff
+# RUN: not ld.lld %t.o --defsym=a=-1 --defsym=b=0 -o /dev/null 2>&1 | \
+# RUN:   FileCheck --check-prefix=OVERFLOW1 %s
+# OVERFLOW1: relocation R_386_8 out of range: -129 is not in [-128, 255]
 
-// RUN: not ld.lld -shared %t %t2 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR %s
-// ERROR: relocation R_386_8 out of range: 256 is not in [-128, 127]
+# RUN: not ld.lld %t.o --defsym=a=0 --defsym=b=129 -o /dev/null 2>&1 | \
+# RUN:   FileCheck --check-prefix=OVERFLOW2 %s
+# OVERFLOW2: relocation R_386_8 out of range: 256 is not in [-128, 255]
 
-.byte foo
+.code16
+.globl _start
+_start:
+movb $a-128, %ah
+movb $b+127, %bh
diff --git a/deps/lld/test/ELF/i386-reloc-large-addend.s b/deps/lld/test/ELF/i386-reloc-large-addend.s
index 5af5844755622a363b3bea40e5a7ebb83c2696ab..94cf940073c5725237d2ea6f765ae78ad065d024 100644
--- a/deps/lld/test/ELF/i386-reloc-large-addend.s
+++ b/deps/lld/test/ELF/i386-reloc-large-addend.s
@@ -8,6 +8,7 @@
 // RUN: llvm-objdump -d -triple=i386-pc-linux-code16 %t | FileCheck %s
 
 // CHECK:        Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // CHECK-NEXT:     7000:       e9 fe 1f        jmp     8190
 //                            0x1 + 0x9000 - 0x7003 == 8190
diff --git a/deps/lld/test/ELF/i386-reloc-range.s b/deps/lld/test/ELF/i386-reloc-range.s
index 4378bb6f9d18e30e583c0aebb20de5c48ab46e80..c670b0d3b11a6f56d14065e336ec70923598e6fc 100644
--- a/deps/lld/test/ELF/i386-reloc-range.s
+++ b/deps/lld/test/ELF/i386-reloc-range.s
@@ -10,6 +10,7 @@
 // RUN: llvm-objdump -d -triple=i386-pc-linux-code16 %t1 | FileCheck %s
 
 // CHECK:        Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // CHECK-NEXT:      200: {{.*}} jmp -1
 //              0x10202 - 0x203 == 0xffff
diff --git a/deps/lld/test/ELF/i386-retpoline-nopic-linkerscript.s b/deps/lld/test/ELF/i386-retpoline-nopic-linkerscript.s
index 4243761d23e4832534bc347aed7c8471d381f404..371f78a81170b85fea76b8e9e9491e1d9ced28a4 100644
--- a/deps/lld/test/ELF/i386-retpoline-nopic-linkerscript.s
+++ b/deps/lld/test/ELF/i386-retpoline-nopic-linkerscript.s
@@ -13,10 +13,11 @@
 // RUN: llvm-objdump -d -s %t.exe | FileCheck %s
 
 // CHECK:      Disassembly of section .plt:
+// CHECK-EMPTY:
 // CHECK-NEXT: .plt:
-// CHECK-NEXT: 10:       ff 35 84 00 00 00       pushl   132
+// CHECK-NEXT: 10:       ff 35 ec 00 00 00       pushl   236
 // CHECK-NEXT: 16:       50      pushl   %eax
-// CHECK-NEXT: 17:       a1 88 00 00 00 movl    136, %eax
+// CHECK-NEXT: 17:       a1 f0 00 00 00 movl    240, %eax
 // CHECK-NEXT: 1c:       e8 0f 00 00 00  calll   15 <.plt+0x20>
 // CHECK-NEXT: 21:       f3 90   pause
 // CHECK-NEXT: 23:       0f ae e8        lfence
@@ -37,7 +38,7 @@
 // CHECK-NEXT: 3e:       c3      retl
 // CHECK-NEXT: 3f:       cc      int3
 // CHECK-NEXT: 40:       50      pushl   %eax
-// CHECK-NEXT: 41:       a1 8c 00 00 00  movl    140, %eax
+// CHECK-NEXT: 41:       a1 f4 00 00 00  movl    244, %eax
 // CHECK-NEXT: 46:       e8 e5 ff ff ff  calll   -27 <.plt+0x20>
 // CHECK-NEXT: 4b:       e9 d1 ff ff ff  jmp     -47 <.plt+0x11>
 // CHECK-NEXT: 50:       68 00 00 00 00  pushl   $0
@@ -49,7 +50,7 @@
 // CHECK-NEXT: 5e:       cc      int3
 // CHECK-NEXT: 5f:       cc      int3
 // CHECK-NEXT: 60:       50      pushl   %eax
-// CHECK-NEXT: 61:       a1 90 00 00 00  movl    144, %eax
+// CHECK-NEXT: 61:       a1 f8 00 00 00  movl    248, %eax
 // CHECK-NEXT: 66:       e8 c5 ff ff ff  calll   -59 <.plt+0x20>
 // CHECK-NEXT: 6b:       e9 b1 ff ff ff  jmp     -79 <.plt+0x11>
 // CHECK-NEXT: 70:       68 08 00 00 00  pushl   $8
diff --git a/deps/lld/test/ELF/i386-retpoline-nopic.s b/deps/lld/test/ELF/i386-retpoline-nopic.s
index 6d0a699cf3067c4766ec75c0f76de21f07c39880..dd3cc6bd951827565afa10ce74bfc16d9abc98a8 100644
--- a/deps/lld/test/ELF/i386-retpoline-nopic.s
+++ b/deps/lld/test/ELF/i386-retpoline-nopic.s
@@ -7,10 +7,11 @@
 // RUN: llvm-objdump -d -s %t.exe | FileCheck %s
 
 // CHECK:      Disassembly of section .plt:
+// CHECK-EMPTY:
 // CHECK-NEXT: .plt:
-// CHECK-NEXT: 401010:       ff 35 04 20 40 00       pushl   4202500
+// CHECK-NEXT: 401010:       ff 35 04 30 40 00       pushl   4206596
 // CHECK-NEXT: 401016:       50      pushl   %eax
-// CHECK-NEXT: 401017:       a1 08 20 40 00  movl    4202504, %eax
+// CHECK-NEXT: 401017:       a1 08 30 40 00  movl    4206600, %eax
 // CHECK-NEXT: 40101c:       e8 0f 00 00 00  calll   15 <.plt+0x20>
 // CHECK-NEXT: 401021:       f3 90   pause
 // CHECK-NEXT: 401023:       0f ae e8        lfence
@@ -31,7 +32,7 @@
 // CHECK-NEXT: 40103e:       c3      retl
 // CHECK-NEXT: 40103f:       cc      int3
 // CHECK-NEXT: 401040:       50      pushl   %eax
-// CHECK-NEXT: 401041:       a1 0c 20 40 00  movl    4202508, %eax
+// CHECK-NEXT: 401041:       a1 0c 30 40 00  movl    4206604, %eax
 // CHECK-NEXT: 401046:       e8 e5 ff ff ff  calll   -27 <.plt+0x20>
 // CHECK-NEXT: 40104b:       e9 d1 ff ff ff  jmp     -47 <.plt+0x11>
 // CHECK-NEXT: 401050:       68 00 00 00 00  pushl   $0
@@ -43,7 +44,7 @@
 // CHECK-NEXT: 40105e:       cc      int3
 // CHECK-NEXT: 40105f:       cc      int3
 // CHECK-NEXT: 401060:       50      pushl   %eax
-// CHECK-NEXT: 401061:       a1 10 20 40 00  movl    4202512, %eax
+// CHECK-NEXT: 401061:       a1 10 30 40 00  movl    4206608, %eax
 // CHECK-NEXT: 401066:       e8 c5 ff ff ff  calll   -59 <.plt+0x20>
 // CHECK-NEXT: 40106b:       e9 b1 ff ff ff  jmp     -79 <.plt+0x11>
 // CHECK-NEXT: 401070:       68 08 00 00 00  pushl   $8
@@ -56,7 +57,7 @@
 // CHECK-NEXT: 40107f:       cc      int3
 
 // CHECK:      Contents of section .got.plt:
-// CHECK-NEXT: 00304000 00000000 00000000 50104000
+// CHECK-NEXT: 00204000 00000000 00000000 50104000
 // CHECK-NEXT: 70104000
 
 .global _start
diff --git a/deps/lld/test/ELF/i386-retpoline-pic-linkerscript.s b/deps/lld/test/ELF/i386-retpoline-pic-linkerscript.s
index 6220332f91d1a2732fd725593e8c431093299e0c..fef364705dcc3f4e6f0ada5bfb5bd631f3573eb4 100644
--- a/deps/lld/test/ELF/i386-retpoline-pic-linkerscript.s
+++ b/deps/lld/test/ELF/i386-retpoline-pic-linkerscript.s
@@ -13,10 +13,11 @@
 // RUN: llvm-objdump -d -s %t.exe | FileCheck %s
 
 // CHECK:      Disassembly of section .plt:
+// CHECK-EMPTY:
 // CHECK-NEXT: .plt:
-// CHECK-NEXT: 10:       ff b3 84 00 00 00       pushl   132(%ebx)
+// CHECK-NEXT: 10:       ff b3 04 00 00 00       pushl   4(%ebx)
 // CHECK-NEXT: 16:       50      pushl   %eax
-// CHECK-NEXT: 17:       8b 83 88 00 00 00 movl    136(%ebx), %eax
+// CHECK-NEXT: 17:       8b 83 08 00 00 00 movl    8(%ebx), %eax
 // CHECK-NEXT: 1d:       e8 0e 00 00 00  calll   14 <.plt+0x20>
 // CHECK-NEXT: 22:       f3 90   pause
 // CHECK-NEXT: 24:       0f ae e8        lfence
@@ -36,7 +37,7 @@
 // CHECK-NEXT: 3e:       c3      retl
 // CHECK-NEXT: 3f:       cc      int3
 // CHECK-NEXT: 40:       50      pushl   %eax
-// CHECK-NEXT: 41:       8b 83 8c 00 00 00       movl    140(%ebx), %eax
+// CHECK-NEXT: 41:       8b 83 0c 00 00 00       movl    12(%ebx), %eax
 // CHECK-NEXT: 47:       e8 e4 ff ff ff  calll   -28 <.plt+0x20>
 // CHECK-NEXT: 4c:       e9 d1 ff ff ff  jmp     -47 <.plt+0x12>
 // CHECK-NEXT: 51:       68 00 00 00 00  pushl   $0
@@ -47,7 +48,7 @@
 // CHECK-NEXT: 5e:       cc      int3
 // CHECK-NEXT: 5f:       cc      int3
 // CHECK-NEXT: 60:       50      pushl   %eax
-// CHECK-NEXT: 61:       8b 83 90 00 00 00       movl    144(%ebx), %eax
+// CHECK-NEXT: 61:       8b 83 10 00 00 00       movl    16(%ebx), %eax
 // CHECK-NEXT: 67:       e8 c4 ff ff ff  calll   -60 <.plt+0x20>
 // CHECK-NEXT: 6c:       e9 b1 ff ff ff  jmp     -79 <.plt+0x12>
 // CHECK-NEXT: 71:       68 08 00 00 00  pushl   $8
diff --git a/deps/lld/test/ELF/i386-retpoline-pic.s b/deps/lld/test/ELF/i386-retpoline-pic.s
index 3555950b168aee8c67cefe447b7573a063e75e49..ee31762deaabb278b6b2a740c950b02343278957 100644
--- a/deps/lld/test/ELF/i386-retpoline-pic.s
+++ b/deps/lld/test/ELF/i386-retpoline-pic.s
@@ -7,10 +7,11 @@
 // RUN: llvm-objdump -d -s %t.exe | FileCheck %s
 
 // CHECK:      Disassembly of section .plt:
+// CHECK-EMPTY:
 // CHECK-NEXT: .plt:
-// CHECK-NEXT: 1010:       ff b3 04 20 00 00       pushl   8196(%ebx)
+// CHECK-NEXT: 1010:       ff b3 04 00 00 00       pushl   4(%ebx)
 // CHECK-NEXT: 1016:       50      pushl   %eax
-// CHECK-NEXT: 1017:       8b 83 08 20 00 00       movl    8200(%ebx), %eax
+// CHECK-NEXT: 1017:       8b 83 08 00 00 00       movl    8(%ebx), %eax
 // CHECK-NEXT: 101d:       e8 0e 00 00 00  calll   14 <.plt+0x20>
 // CHECK-NEXT: 1022:       f3 90   pause
 // CHECK-NEXT: 1024:       0f ae e8        lfence
@@ -30,7 +31,7 @@
 // CHECK-NEXT: 103e:       c3      retl
 // CHECK-NEXT: 103f:       cc      int3
 // CHECK-NEXT: 1040:       50      pushl   %eax
-// CHECK-NEXT: 1041:       8b 83 0c 20 00 00       movl    8204(%ebx), %eax
+// CHECK-NEXT: 1041:       8b 83 0c 00 00 00       movl    12(%ebx), %eax
 // CHECK-NEXT: 1047:       e8 e4 ff ff ff  calll   -28 <.plt+0x20>
 // CHECK-NEXT: 104c:       e9 d1 ff ff ff  jmp     -47 <.plt+0x12>
 // CHECK-NEXT: 1051:       68 00 00 00 00  pushl   $0
@@ -41,7 +42,7 @@
 // CHECK-NEXT: 105e:       cc      int3
 // CHECK-NEXT: 105f:       cc      int3
 // CHECK-NEXT: 1060:       50      pushl   %eax
-// CHECK-NEXT: 1061:       8b 83 10 20 00 00       movl    8208(%ebx), %eax
+// CHECK-NEXT: 1061:       8b 83 10 00 00 00       movl    16(%ebx), %eax
 // CHECK-NEXT: 1067:       e8 c4 ff ff ff  calll   -60 <.plt+0x20>
 // CHECK-NEXT: 106c:       e9 b1 ff ff ff  jmp     -79 <.plt+0x12>
 // CHECK-NEXT: 1071:       68 08 00 00 00  pushl   $8
@@ -53,8 +54,8 @@
 // CHECK-NEXT: 107f:       cc      int3
 
 // CHECK:      Contents of section .got.plt:
-// CHECK-NEXT: 2000 00300000 00000000 00000000 51100000
-// CHECK-NEXT: 2010 71100000
+// CHECK-NEXT: 3000 00200000 00000000 00000000 51100000
+// CHECK-NEXT: 3010 71100000
 
 .global _start
 _start:
diff --git a/deps/lld/test/ELF/i386-static-tls-model.s b/deps/lld/test/ELF/i386-static-tls-model.s
new file mode 100644
index 0000000000000000000000000000000000000000..cfd7cf6ba9722a9a70a3e6789ae506a9df53c059
--- /dev/null
+++ b/deps/lld/test/ELF/i386-static-tls-model.s
@@ -0,0 +1,20 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %S/Inputs/i386-static-tls-model1.s -o %t.o
+# RUN: ld.lld %t.o -o %t1 -shared
+# RUN: llvm-readobj --dynamic-table %t1 | FileCheck %s
+
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %S/Inputs/i386-static-tls-model2.s -o %t.o
+# RUN: ld.lld %t.o -o %t2 -shared
+# RUN: llvm-readobj --dynamic-table %t2 | FileCheck %s
+
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %S/Inputs/i386-static-tls-model3.s -o %t.o
+# RUN: ld.lld %t.o -o %t3 -shared
+# RUN: llvm-readobj --dynamic-table %t3 | FileCheck %s
+
+# RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %S/Inputs/i386-static-tls-model4.s -o %t.o
+# RUN: ld.lld %t.o -o %t4 -shared
+# RUN: llvm-readobj --dynamic-table %t4 | FileCheck %s
+
+# CHECK: DynamicSection [
+# CHECK: FLAGS STATIC_TLS
diff --git a/deps/lld/test/ELF/i386-tls-ie-shared.s b/deps/lld/test/ELF/i386-tls-ie-shared.s
index 9e5ed1bcc462de2726411671d8da72842703c915..abf5e0c2564d980b579cf94a1d1b879bc3f5eeb5 100644
--- a/deps/lld/test/ELF/i386-tls-ie-shared.s
+++ b/deps/lld/test/ELF/i386-tls-ie-shared.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %p/Inputs/tls-opt-iele-i686-nopic.s -o %tso.o
 // RUN: ld.lld -shared %tso.o -o %tso
 // RUN: ld.lld --hash-style=sysv -shared %t.o %tso -o %t1
-// RUN: llvm-readobj -s -r -d %t1 | FileCheck --check-prefix=GOTRELSHARED %s
+// RUN: llvm-readobj -S -r -d %t1 | FileCheck --check-prefix=GOTRELSHARED %s
 // RUN: llvm-objdump -d %t1 | FileCheck --check-prefix=DISASMSHARED %s
 
 // GOTRELSHARED:     Section {
@@ -14,8 +14,8 @@
 // GOTRELSHARED-NEXT:     SHF_ALLOC
 // GOTRELSHARED-NEXT:     SHF_WRITE
 // GOTRELSHARED-NEXT:   ]
-// GOTRELSHARED-NEXT:   Address: 0x2058
-// GOTRELSHARED-NEXT:   Offset: 0x2058
+// GOTRELSHARED-NEXT:   Address: 0x2060
+// GOTRELSHARED-NEXT:   Offset: 0x2060
 // GOTRELSHARED-NEXT:   Size: 16
 // GOTRELSHARED-NEXT:   Link: 0
 // GOTRELSHARED-NEXT:   Info: 0
@@ -32,36 +32,37 @@
 // GOTRELSHARED-NEXT:     0x102D R_386_RELATIVE - 0x0
 // GOTRELSHARED-NEXT:     0x1036 R_386_RELATIVE - 0x0
 // GOTRELSHARED-NEXT:     0x103F R_386_RELATIVE - 0x0
-// GOTRELSHARED-NEXT:     0x2058 R_386_TLS_TPOFF tlslocal0 0x0
-// GOTRELSHARED-NEXT:     0x205C R_386_TLS_TPOFF tlslocal1 0x0
-// GOTRELSHARED-NEXT:     0x2060 R_386_TLS_TPOFF tlsshared0 0x0
-// GOTRELSHARED-NEXT:     0x2064 R_386_TLS_TPOFF tlsshared1 0x0
+// GOTRELSHARED-NEXT:     0x2060 R_386_TLS_TPOFF tlslocal0 0x0
+// GOTRELSHARED-NEXT:     0x2064 R_386_TLS_TPOFF tlslocal1 0x0
+// GOTRELSHARED-NEXT:     0x2068 R_386_TLS_TPOFF tlsshared0 0x0
+// GOTRELSHARED-NEXT:     0x206C R_386_TLS_TPOFF tlsshared1 0x0
 // GOTRELSHARED-NEXT:   }
 // GOTRELSHARED-NEXT: ]
 // GOTRELSHARED:      0x6FFFFFFA RELCOUNT             8
 
 // DISASMSHARED:       Disassembly of section test:
+// DISASMSHARED-EMPTY:
 // DISASMSHARED-NEXT:  _start:
-// (.got)[0] = 0x2058 = 8280
-// (.got)[1] = 0x205C = 8284
-// (.got)[2] = 0x2060 = 8288
-// (.got)[3] = 0x2064 = 8292
-// DISASMSHARED-NEXT:  1000: 8b 0d 58 20 00 00   movl  8280, %ecx
-// DISASMSHARED-NEXT:  1006: 65 8b 01  movl  %gs:(%ecx), %eax
-// DISASMSHARED-NEXT:  1009: a1 58 20 00 00  movl  8280, %eax
-// DISASMSHARED-NEXT:  100e: 65 8b 00  movl  %gs:(%eax), %eax
-// DISASMSHARED-NEXT:  1011: 03 0d 58 20 00 00   addl  8280, %ecx
-// DISASMSHARED-NEXT:  1017: 65 8b 01  movl  %gs:(%ecx), %eax
-// DISASMSHARED-NEXT:  101a: 8b 0d 5c 20 00 00   movl  8284, %ecx
-// DISASMSHARED-NEXT:  1020: 65 8b 01  movl  %gs:(%ecx), %eax
-// DISASMSHARED-NEXT:  1023: a1 5c 20 00 00  movl  8284, %eax
-// DISASMSHARED-NEXT:  1028: 65 8b 00  movl  %gs:(%eax), %eax
-// DISASMSHARED-NEXT:  102b: 03 0d 5c 20 00 00   addl  8284, %ecx
-// DISASMSHARED-NEXT:  1031: 65 8b 01  movl  %gs:(%ecx), %eax
-// DISASMSHARED-NEXT:  1034: 8b 0d 60 20 00 00   movl  8288, %ecx
-// DISASMSHARED-NEXT:  103a: 65 8b 01  movl  %gs:(%ecx), %eax
-// DISASMSHARED-NEXT:  103d: 03 0d 64 20 00 00   addl  8292, %ecx
-// DISASMSHARED-NEXT:  1043: 65 8b 01  movl  %gs:(%ecx), %eax
+// (.got)[0] = 0x2060 = 8288
+// (.got)[1] = 0x2064 = 8292
+// (.got)[2] = 0x2068 = 8296
+// (.got)[3] = 0x206C = 8300
+// DISASMSHARED-NEXT:  1000: {{.*}} movl  8288, %ecx
+// DISASMSHARED-NEXT:  1006: {{.*}} movl  %gs:(%ecx), %eax
+// DISASMSHARED-NEXT:  1009: {{.*}} movl  8288, %eax
+// DISASMSHARED-NEXT:  100e: {{.*}} movl  %gs:(%eax), %eax
+// DISASMSHARED-NEXT:  1011: {{.*}} addl  8288, %ecx
+// DISASMSHARED-NEXT:  1017: {{.*}} movl  %gs:(%ecx), %eax
+// DISASMSHARED-NEXT:  101a: {{.*}} movl  8292, %ecx
+// DISASMSHARED-NEXT:  1020: {{.*}} movl  %gs:(%ecx), %eax
+// DISASMSHARED-NEXT:  1023: {{.*}} movl  8292, %eax
+// DISASMSHARED-NEXT:  1028: {{.*}} movl  %gs:(%eax), %eax
+// DISASMSHARED-NEXT:  102b: {{.*}} addl  8292, %ecx
+// DISASMSHARED-NEXT:  1031: {{.*}} movl  %gs:(%ecx), %eax
+// DISASMSHARED-NEXT:  1034: {{.*}} movl  8296, %ecx
+// DISASMSHARED-NEXT:  103a: {{.*}} movl  %gs:(%ecx), %eax
+// DISASMSHARED-NEXT:  103d: {{.*}} addl  8300, %ecx
+// DISASMSHARED-NEXT:  1043: {{.*}} movl  %gs:(%ecx), %eax
 
 .type tlslocal0,@object
 .section .tbss,"awT",@nobits
diff --git a/deps/lld/test/ELF/i386-tls-ld-preemptable.s b/deps/lld/test/ELF/i386-tls-ld-preemptable.s
new file mode 100644
index 0000000000000000000000000000000000000000..8f9d91a965b52b658dbe412cd8e9f1a56205d10e
--- /dev/null
+++ b/deps/lld/test/ELF/i386-tls-ld-preemptable.s
@@ -0,0 +1,18 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=i386 %s -o %t.o
+# RUN: ld.lld %t.o -shared -o %t.so
+# RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck %s
+
+# CHECK: 100b:       movl    (%eax), %eax
+
+# We used to error on R_386_TLS_LDO_32 to preemptable symbols.
+# i is STB_GLOBAL and preemptable.
+  leal i@TLSLDM(%ebx), %eax
+  calll __tls_get_addr@PLT
+  movl i@DTPOFF(%eax), %eax # R_386_TLS_LDO_32
+
+.section .tbss,"awT",@nobits
+.globl i
+i:
+  .long 0
+  .size i, 4
diff --git a/deps/lld/test/ELF/i386-tls-le-align.s b/deps/lld/test/ELF/i386-tls-le-align.s
new file mode 100644
index 0000000000000000000000000000000000000000..20ee1ec4002d6a340ab18014d8570c4f5e9009ba
--- /dev/null
+++ b/deps/lld/test/ELF/i386-tls-le-align.s
@@ -0,0 +1,29 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=i386 %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-objdump -d --no-show-raw-insn --print-imm-hex %t | FileCheck %s
+
+# -alignTo(p_memsz, p_align) = -alignTo(4, 64) = -64
+
+# CHECK:      movl %gs:0xffffffc0, %eax
+  movl %gs:a@NTPOFF, %eax
+
+# CHECK-NEXT: subl $0x40, %edx
+  subl $a@tpoff, %edx
+
+# GD to LE relaxation.
+# CHECK-NEXT: movl %gs:0x0, %eax
+# CHECK-NEXT: subl $0x40, %eax
+  leal a@tlsgd(,%ebx,1), %eax
+  call ___tls_get_addr@plt
+  ret
+
+.globl ___tls_get_addr
+.type ___tls_get_addr,@function
+___tls_get_addr:
+
+.section .tbss,"awT"
+.align 64
+a:
+.long 0
+.size a, 4
diff --git a/deps/lld/test/ELF/i386-tls-le-undef.s b/deps/lld/test/ELF/i386-tls-le-undef.s
new file mode 100644
index 0000000000000000000000000000000000000000..95d097d6c63c2b9e3c261bbd806d984732f5ede1
--- /dev/null
+++ b/deps/lld/test/ELF/i386-tls-le-undef.s
@@ -0,0 +1,16 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=i386 %s -o %t.o
+# RUN: ld.lld --noinhibit-exec %t.o -o %t 2>&1
+# RUN: llvm-objdump -d %t | FileCheck %s
+
+## Undefined TLS symbols resolve to 0.
+## In --noinhibit-exec mode, a non-weak undefined symbol is not an error.
+
+# CHECK: subl $0, %eax
+# CHECK: subl $0, %eax
+
+.weak weak_undef
+movl %gs:0, %eax
+subl $weak_undef@tpoff,%eax
+movl %gs:0, %eax
+subl $undef@tpoff,%eax
diff --git a/deps/lld/test/ELF/icf-merged-sections.s b/deps/lld/test/ELF/icf-merged-sections.s
index 1f6e77ec535366912c49c025f979fbc6acde8252..480feb9ab60544024df41d648f2400a1e613468e 100644
--- a/deps/lld/test/ELF/icf-merged-sections.s
+++ b/deps/lld/test/ELF/icf-merged-sections.s
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t --icf=all --ignore-data-address-equality --print-icf-sections | FileCheck -allow-empty --check-prefix=NOICF %s
-# RUN: llvm-readobj -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 # Check that merge synthetic sections are not merged by ICF.
 
@@ -19,7 +19,7 @@
 # CHECK-NEXT: Size: 16
 # CHECK-NEXT: Link:
 # CHECK-NEXT: Info:
-# CHECK-NEXT: AddressAlignment: 8
+# CHECK-NEXT: AddressAlignment: 1
 # CHECK-NEXT: EntrySize: 0
 # CHECK-NEXT: SectionData (
 # CHECK-NEXT:   0000: 67452301 10325476 67452301 10325476
diff --git a/deps/lld/test/ELF/icf-symbol-type.s b/deps/lld/test/ELF/icf-symbol-type.s
index 9cc1c509689aabbc343f356b7374cb47333de4a3..350f203717d4475989ad9c36329af2da5bf1ea95 100644
--- a/deps/lld/test/ELF/icf-symbol-type.s
+++ b/deps/lld/test/ELF/icf-symbol-type.s
@@ -7,8 +7,8 @@
 # We used to mark bar as absolute.
 
 # CHECK: .text             PROGBITS        0000000000001000
-# CHECK: 0000000000001001 0 NOTYPE  GLOBAL DEFAULT   4 foo
 # CHECK: 0000000000001001 0 NOTYPE  GLOBAL DEFAULT   4 bar
+# CHECK: 0000000000001001 0 NOTYPE  GLOBAL DEFAULT   4 foo
 
 # The nop makes the test more interesting by making the offset of
 # text.f non zero.
diff --git a/deps/lld/test/ELF/icf10.s b/deps/lld/test/ELF/icf10.s
new file mode 100644
index 0000000000000000000000000000000000000000..b782f9248448d154d23285ec05818ba972425e22
--- /dev/null
+++ b/deps/lld/test/ELF/icf10.s
@@ -0,0 +1,17 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-freebsd %s -o %t.o
+# RUN: ld.lld --icf=all %t.o -o /dev/null --print-icf-sections 2>&1 | FileCheck %s
+
+# Checks that ICF does not merge 2 sections the offset of
+# the relocations of which differ.
+
+# CHECK-NOT: selected
+
+.section .text.foo,"ax"
+  .quad -1
+  .reloc 0, R_X86_64_NONE, 0
+
+.section .text.bar,"ax"
+  .quad -1
+  .reloc 1, R_X86_64_NONE, 0
diff --git a/deps/lld/test/ELF/icf10.test b/deps/lld/test/ELF/icf10.test
deleted file mode 100644
index 96b4caf2f2e5ac74cf6f74b8abdddbe0886e855d..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/icf10.test
+++ /dev/null
@@ -1,40 +0,0 @@
-# RUN: yaml2obj %s -o %t.o
-# RUN: ld.lld --icf=all %t.o -o /dev/null --print-icf-sections 2>&1 | FileCheck %s
-
-# Checks that ICF does not merge 2 sections the offset of
-# the relocations of which differ.
-
-# CHECK-NOT: selected
-
-!ELF
-FileHeader:
-  Class:           ELFCLASS64
-  Data:            ELFDATA2LSB
-  OSABI:           ELFOSABI_FREEBSD
-  Type:            ET_REL
-  Machine:         EM_X86_64
-Sections:
-  - Name:            .text.foo
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR]
-    Content:         "FFFFFFFFFFFFFFFF"
-  - Name:            .text.bar
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR]
-    Content:         "FFFFFFFFFFFFFFFF"
-  - Name:            .rela.text.foo
-    Type:            SHT_RELA
-    Link:            .symtab
-    Info:            .text.foo
-    Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          ''
-        Type:            R_X86_64_NONE
-  - Name:            .rela.text.bar
-    Type:            SHT_RELA
-    Link:            .symtab
-    Info:            .text.bar
-    Relocations:
-      - Offset:          0x0000000000000001
-        Symbol:          ''
-        Type:            R_X86_64_NONE
diff --git a/deps/lld/test/ELF/icf11.test b/deps/lld/test/ELF/icf11.test
index 8c3aa93568d7f127ef9e9446e1012566c986e988..1aa3454612a3440ae14c329f242ca137cf641db8 100644
--- a/deps/lld/test/ELF/icf11.test
+++ b/deps/lld/test/ELF/icf11.test
@@ -33,7 +33,6 @@ Sections:
     Info:            .text.foo
     Relocations:
       - Offset:          0x0000000000000000
-        Symbol:          ''
         Type:            R_X86_64_NONE
   - Name:            .rela.text.bar
     Type:            SHT_RELA
@@ -44,9 +43,9 @@ Sections:
         Symbol:          zed
         Type:            R_X86_64_64
 Symbols:
-  Global:
-    - Name:     zed
-      Type:     STT_FUNC
-      Section:  .text
-      Value:    0x0
-      Size:     8
+  - Name:     zed
+    Type:     STT_FUNC
+    Section:  .text
+    Value:    0x0
+    Size:     8
+    Binding:  STB_GLOBAL
diff --git a/deps/lld/test/ELF/image-base.s b/deps/lld/test/ELF/image-base.s
index 8866708c4001ab391767d9ab9b8147dd91d118f8..bbacb426f52aba6bd74e0770ee443bae835962d8 100644
--- a/deps/lld/test/ELF/image-base.s
+++ b/deps/lld/test/ELF/image-base.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld -image-base=0x1000000 %t -o %t1
-# RUN: llvm-readobj -program-headers %t1 | FileCheck %s
+# RUN: llvm-readobj -l %t1 | FileCheck %s
 
 # RUN: not ld.lld -image-base=ABC %t -o %t1 2>&1 | FileCheck --check-prefix=ERR %s
 # ERR: error: -image-base: number expected, but got ABC
@@ -11,7 +11,7 @@
 
 # Check alias.
 # RUN: ld.lld -image-base 0x1000000 %t -o %t1
-# RUN: llvm-readobj -program-headers %t1 | FileCheck %s
+# RUN: llvm-readobj -l %t1 | FileCheck %s
 
 .global _start
 _start:
diff --git a/deps/lld/test/ELF/init-fini-progbits.s b/deps/lld/test/ELF/init-fini-progbits.s
index a8749446f702f483d61adb7d47acf3b520759c44..dc8e251b139b02b59932459584e1cdb76c54ea4a 100644
--- a/deps/lld/test/ELF/init-fini-progbits.s
+++ b/deps/lld/test/ELF/init-fini-progbits.s
@@ -2,7 +2,7 @@
 
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %t.exe
-// RUN: llvm-readobj -sections %t.exe | FileCheck %s
+// RUN: llvm-readobj --sections %t.exe | FileCheck %s
 
 // CHECK:      Name: .init_array
 // CHECK-NEXT: Type: SHT_INIT_ARRAY
diff --git a/deps/lld/test/ELF/init-fini.s b/deps/lld/test/ELF/init-fini.s
index 37d8b0149077029a749d6f56d669dcfc12db250c..7979e669f1593ac33e7b7a5bd5c5040882524cb8 100644
--- a/deps/lld/test/ELF/init-fini.s
+++ b/deps/lld/test/ELF/init-fini.s
@@ -3,25 +3,25 @@
 
 // Should use "_init" and "_fini" by default when fills dynamic table
 // RUN: ld.lld -shared %t -o %t2
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck --check-prefix=BYDEF %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck --check-prefix=BYDEF %s
 // BYDEF: INIT 0x11010
 // BYDEF: FINI 0x11020
 
 // -init and -fini override symbols to use
 // RUN: ld.lld -shared %t -o %t2 -init _foo -fini _bar
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck --check-prefix=OVR %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck --check-prefix=OVR %s
 // OVR: INIT 0x11030
 // OVR: FINI 0x11040
 
 // Check aliases as well
 // RUN: ld.lld -shared %t -o %t2 -init=_foo -fini=_bar
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck --check-prefix=OVR %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck --check-prefix=OVR %s
 
 // Don't add an entry for undef. The freebsd dynamic linker doesn't
 // check if the value is null. If it is, it will just call the
 // load address.
 // RUN: ld.lld -shared %t -o %t2 -init=_undef -fini=_undef
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck --check-prefix=UNDEF %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck --check-prefix=UNDEF %s
 // UNDEF-NOT: INIT
 // UNDEF-NOT: FINI
 
@@ -30,14 +30,14 @@
 // RUN: echo > %t.s
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %t.s -o %t2.o
 // RUN: ld.lld -shared %t2.o %t.so -o %t2
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck --check-prefix=SHARED %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck --check-prefix=SHARED %s
 // SHARED-NOT: INIT
 // SHARED-NOT: FINI
 
 // Should not add new entries to the symbol table
 // and should not require given symbols to be resolved
 // RUN: ld.lld -shared %t -o %t2 -init=_unknown -fini=_unknown
-// RUN: llvm-readobj -symbols -dynamic-table %t2 | FileCheck --check-prefix=NOENTRY %s
+// RUN: llvm-readobj --symbols --dynamic-table %t2 | FileCheck --check-prefix=NOENTRY %s
 // NOENTRY: Symbols [
 // NOENTRY-NOT: Name: _unknown
 // NOENTRY: ]
diff --git a/deps/lld/test/ELF/invalid-relocations.test b/deps/lld/test/ELF/invalid-relocations.test
index 7c32058c435331c6318e101cd8224951ba89a6e3..53a7981262f1c40deeb24caebd7de2a3be4a0826 100644
--- a/deps/lld/test/ELF/invalid-relocations.test
+++ b/deps/lld/test/ELF/invalid-relocations.test
@@ -17,7 +17,7 @@ Sections:
         Symbol:          lulz
         Type:            R_X86_64_PC32
 Symbols:
-  Global:
-    - Name:            lulz
+  - Name:            lulz
+    Binding:         STB_GLOBAL
 
 # CHECK: invalid relocated section index
diff --git a/deps/lld/test/ELF/invalid-undef-section-symbol.test b/deps/lld/test/ELF/invalid-undef-section-symbol.test
deleted file mode 100644
index cb89306b781e8c4a8b0d2c4084fb6e9da8f49e10..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/invalid-undef-section-symbol.test
+++ /dev/null
@@ -1,27 +0,0 @@
-# RUN: yaml2obj %s -o %t.o
-# RUN: not ld.lld -r %t.o -o /dev/null 2>&1 | FileCheck %s
-
-# We used to crash at this.
-# CHECK: STT_SECTION symbol should be defined
-
---- !ELF
-FileHeader:
-  Class:           ELFCLASS64
-  Data:            ELFDATA2LSB
-  Type:            ET_REL
-  Machine:         EM_X86_64
-Sections:
-  - Name:            .text
-    Type:            SHT_PROGBITS
-  - Name:            .rela.text
-    Type:            SHT_RELA
-    AddressAlign:    0x0000000000000008
-    Info:            .text
-    Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          .text
-        Type:            R_X86_64_NONE
-Symbols:
-  Local:
-    - Name:            .text
-      Type:            STT_SECTION
diff --git a/deps/lld/test/ELF/invalid/Inputs/binding.elf b/deps/lld/test/ELF/invalid/Inputs/binding.elf
deleted file mode 100644
index 61b5af9b456c75d8922ef3dae3b7781da9c0bac8..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/invalid/Inputs/binding.elf and /dev/null differ
diff --git a/deps/lld/test/ELF/invalid/Inputs/broken-relaxation-x64.elf b/deps/lld/test/ELF/invalid/Inputs/broken-relaxation-x64.elf
deleted file mode 100644
index 01a6af9a7fb53189acfbda03fa911c96e4656d39..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/invalid/Inputs/broken-relaxation-x64.elf and /dev/null differ
diff --git a/deps/lld/test/ELF/invalid/Inputs/common-symbol-alignment.elf b/deps/lld/test/ELF/invalid/Inputs/common-symbol-alignment.elf
deleted file mode 100644
index 9e7823b852b2c82881c6f44d75edc268eeafcbd8..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/invalid/Inputs/common-symbol-alignment.elf and /dev/null differ
diff --git a/deps/lld/test/ELF/invalid/Inputs/common-symbol-alignment2.elf b/deps/lld/test/ELF/invalid/Inputs/common-symbol-alignment2.elf
deleted file mode 100644
index 21c2457cbea161b5d55cc44cfaa5c747f8e936b6..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/invalid/Inputs/common-symbol-alignment2.elf and /dev/null differ
diff --git a/deps/lld/test/ELF/invalid/Inputs/data-encoding.a b/deps/lld/test/ELF/invalid/Inputs/data-encoding.a
deleted file mode 100644
index ff2b37318c1e6cafc11efc78227290dad7664cea..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/invalid/Inputs/data-encoding.a and /dev/null differ
diff --git a/deps/lld/test/ELF/invalid/Inputs/dynamic-section-sh_size.elf b/deps/lld/test/ELF/invalid/Inputs/dynamic-section-sh_size.elf
deleted file mode 100644
index ea35dba95179e011d1ee1c46adffd70ec8ee94e8..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/invalid/Inputs/dynamic-section-sh_size.elf and /dev/null differ
diff --git a/deps/lld/test/ELF/invalid/Inputs/file-class.a b/deps/lld/test/ELF/invalid/Inputs/file-class.a
deleted file mode 100644
index f0ce607b4fdc831d97b8f3bbd3067ace32b366b8..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/invalid/Inputs/file-class.a and /dev/null differ
diff --git a/deps/lld/test/ELF/invalid/Inputs/invalid-e_shnum.elf b/deps/lld/test/ELF/invalid/Inputs/invalid-e_shnum.elf
deleted file mode 100644
index 0b46fbd8cec0caee456e37b8da7d16b6d62de3b6..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/invalid/Inputs/invalid-e_shnum.elf and /dev/null differ
diff --git a/deps/lld/test/ELF/invalid/Inputs/mips-invalid-options-descriptor.elf b/deps/lld/test/ELF/invalid/Inputs/mips-invalid-options-descriptor.elf
deleted file mode 100644
index 85feeebc61984b8993ffa4004d974a8fe88b0215..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/invalid/Inputs/mips-invalid-options-descriptor.elf and /dev/null differ
diff --git a/deps/lld/test/ELF/invalid/Inputs/multiple-eh-relocs.elf b/deps/lld/test/ELF/invalid/Inputs/multiple-eh-relocs.elf
deleted file mode 100644
index 62914596256a665627151dd64e33785942468c57..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/invalid/Inputs/multiple-eh-relocs.elf and /dev/null differ
diff --git a/deps/lld/test/ELF/invalid/Inputs/section-alignment-notpow2.elf b/deps/lld/test/ELF/invalid/Inputs/section-alignment-notpow2.elf
deleted file mode 100644
index 59d4de7e730328d7411fc06f259712ec715d3026..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/invalid/Inputs/section-alignment-notpow2.elf and /dev/null differ
diff --git a/deps/lld/test/ELF/invalid/Inputs/section-index.elf b/deps/lld/test/ELF/invalid/Inputs/section-index.elf
deleted file mode 100644
index ec5adcf3b0b8c92f703bc81e5fdb9181dbae5774..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/invalid/Inputs/section-index.elf and /dev/null differ
diff --git a/deps/lld/test/ELF/invalid/Inputs/symbol-index.elf b/deps/lld/test/ELF/invalid/Inputs/symbol-index.elf
deleted file mode 100644
index f31ffbf602c3b64f264d7598e599a441c4dbc891..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/invalid/Inputs/symbol-index.elf and /dev/null differ
diff --git a/deps/lld/test/ELF/invalid/Inputs/symbol-name-offset.elf b/deps/lld/test/ELF/invalid/Inputs/symbol-name-offset.elf
deleted file mode 100644
index 8b8abde798731014ade15c31a7bde61e59a46af7..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/invalid/Inputs/symbol-name-offset.elf and /dev/null differ
diff --git a/deps/lld/test/ELF/invalid/Inputs/symtab-sh_info.elf b/deps/lld/test/ELF/invalid/Inputs/symtab-sh_info.elf
deleted file mode 100644
index aa63d582d757c4936ae67f852003be94f95f9802..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/invalid/Inputs/symtab-sh_info.elf and /dev/null differ
diff --git a/deps/lld/test/ELF/invalid/Inputs/symtab-sh_info2.elf b/deps/lld/test/ELF/invalid/Inputs/symtab-sh_info2.elf
deleted file mode 100644
index 4fea12cf203332e236ce0425e574dbd20d02e5ee..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/invalid/Inputs/symtab-sh_info2.elf and /dev/null differ
diff --git a/deps/lld/test/ELF/invalid/Inputs/symtab-sh_info3.elf b/deps/lld/test/ELF/invalid/Inputs/symtab-sh_info3.elf
deleted file mode 100644
index ca889fbca1aaa641fba224d513eca7dfaadacd13..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/invalid/Inputs/symtab-sh_info3.elf and /dev/null differ
diff --git a/deps/lld/test/ELF/invalid/Inputs/tls-symbol.elf b/deps/lld/test/ELF/invalid/Inputs/tls-symbol.elf
deleted file mode 100644
index 78c759897ddccc9aca5d4f6a2f714e3dabdeec14..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/invalid/Inputs/tls-symbol.elf and /dev/null differ
diff --git a/deps/lld/test/ELF/invalid/Inputs/undefined-local-symbol-in-dso.so b/deps/lld/test/ELF/invalid/Inputs/undefined-local-symbol-in-dso.so
deleted file mode 100755
index b88427351197bf0093afdb021076e5a84fb8b56b..0000000000000000000000000000000000000000
Binary files a/deps/lld/test/ELF/invalid/Inputs/undefined-local-symbol-in-dso.so and /dev/null differ
diff --git a/deps/lld/test/ELF/invalid/bad-arm-attributes.s b/deps/lld/test/ELF/invalid/bad-arm-attributes.s
new file mode 100644
index 0000000000000000000000000000000000000000..be9eb8df881af66ba933c97c7260754adf676f71
--- /dev/null
+++ b/deps/lld/test/ELF/invalid/bad-arm-attributes.s
@@ -0,0 +1,8 @@
+# REQUIRES: arm
+# RUN: llvm-mc -filetype=obj -triple=arm-unknown-linux %s -o %t
+# RUN: ld.lld %t -o /dev/null 2>&1 | FileCheck %s
+
+# CHECK: invalid subsection length 0 at offset 1
+
+.section .ARM.attributes,"a",%0x70000003
+  .quad 0
diff --git a/deps/lld/test/ELF/invalid/bad-arm-attributes2.s b/deps/lld/test/ELF/invalid/bad-arm-attributes2.s
new file mode 100644
index 0000000000000000000000000000000000000000..3b3d092202e591d71adf72874133a66211a24aba
--- /dev/null
+++ b/deps/lld/test/ELF/invalid/bad-arm-attributes2.s
@@ -0,0 +1,8 @@
+# REQUIRES: arm
+# RUN: llvm-mc -filetype=obj -triple=arm-unknown-linux %s -o %t
+# RUN: ld.lld %t -o /dev/null 2>&1 | FileCheck %s
+
+# CHECK: invalid subsection length 4294967295 at offset 1
+
+.section .ARM.attributes,"a",%0x70000003
+  .byte 0, 0xFF, 0xFF, 0xFF, 0xFF
diff --git a/deps/lld/test/ELF/invalid/bad-reloc-target.test b/deps/lld/test/ELF/invalid/bad-reloc-target.test
new file mode 100644
index 0000000000000000000000000000000000000000..05aa2e5d6fae7913f659da5983e6cca7b35ce781
--- /dev/null
+++ b/deps/lld/test/ELF/invalid/bad-reloc-target.test
@@ -0,0 +1,76 @@
+# RUN: yaml2obj -docnum=1 %s -o %t1.o
+# RUN: not ld.lld %t1.o -o %t1 2>&1 | FileCheck %s
+# CHECK: error: {{.*}}.o: unsupported relocation reference
+
+--- !ELF
+FileHeader:
+  Class:         ELFCLASS64
+  Data:          ELFDATA2LSB
+  Type:          ET_REL
+  Machine:       EM_X86_64
+Sections:        
+  - Name:        .text
+    Type:        SHT_PROGBITS
+    Flags:       [ SHF_ALLOC, SHF_EXECINSTR ]
+  - Name:        .rela.text
+    Type:        SHT_RELA
+    Link:        .symtab
+    Info:        0
+    Relocations: 
+      - Offset:  0x0000000000000000
+        Symbol:  foo
+        Type:    R_X86_64_64
+Symbols:         
+  - Name:        foo
+    Binding:     STB_GLOBAL
+
+# RUN: yaml2obj -docnum=2 %s -o %t2.o
+# RUN: not ld.lld %t2.o -o %t2 2>&1 | FileCheck %s --check-prefix=ERR2
+# ERR2: error: {{.*}}.o: invalid relocated section index: 99
+
+--- !ELF
+FileHeader:
+  Class:         ELFCLASS64
+  Data:          ELFDATA2LSB
+  Type:          ET_REL
+  Machine:       EM_X86_64
+Sections:        
+  - Name:        .text
+    Type:        SHT_PROGBITS
+    Flags:       [ SHF_ALLOC, SHF_EXECINSTR ]
+  - Name:        .rela.text
+    Type:        SHT_RELA
+    Link:        .symtab
+    Info:        99
+    Relocations: 
+      - Offset:  0x0000000000000000
+        Symbol:  foo
+        Type:    R_X86_64_64
+Symbols:         
+  - Name:        foo
+    Binding:     STB_GLOBAL
+
+## Relocation refers to a symbol with index larger than
+## symbol table size. Check we report it.
+# RUN: yaml2obj -docnum=3 %s -o %t2.o
+# RUN: not ld.lld %t2.o -o %t2 2>&1 | FileCheck %s --check-prefix=ERR3
+# ERR3: error: {{.*}}.o: invalid symbol index
+
+--- !ELF
+FileHeader:
+  Class:         ELFCLASS64
+  Data:          ELFDATA2LSB
+  Type:          ET_REL
+  Machine:       EM_X86_64
+Sections:
+  - Name:        .text
+    Type:        SHT_PROGBITS
+    Flags:       [ SHF_ALLOC, SHF_EXECINSTR ]
+  - Name:        .rela.text
+    Type:        SHT_RELA
+    Link:        .symtab
+    Info:        .text
+    Relocations:
+      - Offset:  0x0000000000000000
+        Symbol:  255
+        Type:    R_X86_64_64
diff --git a/deps/lld/test/ELF/invalid/broken-relaxation-x64.test b/deps/lld/test/ELF/invalid/broken-relaxation-x64.test
index 10d4655847d52fe48bc33c7c8fbf623dbe08b2d7..7ff9bb2838cfdd79f5657e282be67515a904fe4d 100644
--- a/deps/lld/test/ELF/invalid/broken-relaxation-x64.test
+++ b/deps/lld/test/ELF/invalid/broken-relaxation-x64.test
@@ -38,9 +38,10 @@ Sections:
         Symbol:          foo
         Type:            R_X86_64_GOTTPOFF
 Symbols:
-  Global:
-    - Name:     foo
-      Type:     STT_TLS
-      Section:  .text
-      Value:    0x12345
-      Size:     4
+  - Name:     foo
+    Type:     STT_TLS
+    Section:  .text
+    Value:    0x12345
+    Size:     4
+    Binding:  STB_GLOBAL
+ 
\ No newline at end of file
diff --git a/deps/lld/test/ELF/invalid/comdat-broken.test b/deps/lld/test/ELF/invalid/comdat-broken.test
index 9ff8eca476a5a26b144a62759ac047c3f5a7da86..3bae4d5b326b14d73ceaffb8105852753c912c20 100644
--- a/deps/lld/test/ELF/invalid/comdat-broken.test
+++ b/deps/lld/test/ELF/invalid/comdat-broken.test
@@ -21,5 +21,5 @@ Sections:
       - SectionOrType: 0xFF
       - SectionOrType: 3
 Symbols:
-  Global:
-    - Name:            foo
+  - Name:              foo
+    Binding:           STB_GLOBAL
diff --git a/deps/lld/test/ELF/invalid/common-symbol-alignment.s b/deps/lld/test/ELF/invalid/common-symbol-alignment.s
deleted file mode 100644
index 2a654b11479beec669b220506963c4ac309830a0..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/invalid/common-symbol-alignment.s
+++ /dev/null
@@ -1,12 +0,0 @@
-# REQUIRES: x86
-
-## common-symbol-alignment.elf contains common symbol with zero alignment.
-# RUN: not ld.lld %S/Inputs/common-symbol-alignment.elf \
-# RUN:   -o %t 2>&1 | FileCheck %s
-# CHECK: common symbol 'bar' has invalid alignment: 0
-
-## common-symbol-alignment2.elf contains common symbol alignment greater
-## than UINT32_MAX.
-# RUN: not ld.lld %S/Inputs/common-symbol-alignment2.elf \
-# RUN:   -o %t 2>&1 | FileCheck %s --check-prefix=BIG
-# BIG: common symbol 'bar' has invalid alignment: 271644049215
diff --git a/deps/lld/test/ELF/invalid/common-symbol-alignment.test b/deps/lld/test/ELF/invalid/common-symbol-alignment.test
new file mode 100644
index 0000000000000000000000000000000000000000..7b79441aa110bbb8eb411b0161d4dc7d6d5ff6b2
--- /dev/null
+++ b/deps/lld/test/ELF/invalid/common-symbol-alignment.test
@@ -0,0 +1,36 @@
+## If an object contains a common symbol with zero alignment,
+## check we report it.
+# RUN: yaml2obj -docnum=1 %s -o %t1.o
+# RUN: not ld.lld %t1.o -o %t 2>&1 | FileCheck %s
+# CHECK: common symbol 'bar' has invalid alignment: 0
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_REL
+  Machine:         EM_X86_64
+Symbols:
+  - Name:            bar
+    Type:            STT_FUNC
+    Index:           SHN_COMMON
+    Binding:         STB_GLOBAL
+
+## If an object contains a common symbol with alignment greater
+## than UINT32_MAX, check we report it.
+# RUN: yaml2obj -docnum=2 %s -o %t2.o
+# RUN: not ld.lld %t2.o -o %t 2>&1 | FileCheck %s --check-prefix=BIG
+# BIG: common symbol 'bar' has invalid alignment: 271644049215
+
+--- !ELF
+FileHeader:      
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_REL
+  Machine:         EM_X86_64
+Symbols:
+  - Name:            bar
+    Type:            STT_FUNC
+    Index:           SHN_COMMON
+    Value:           0x0000003F3F3F3F3F
+    Binding:         STB_GLOBAL
diff --git a/deps/lld/test/ELF/invalid/data-encoding.test b/deps/lld/test/ELF/invalid/data-encoding.test
new file mode 100644
index 0000000000000000000000000000000000000000..5f0550f4dbb2f8a69f7e2e852b115a9ed54a395f
--- /dev/null
+++ b/deps/lld/test/ELF/invalid/data-encoding.test
@@ -0,0 +1,17 @@
+# REQUIRES: x86
+
+# The object in the archive has invalid data encoding.
+# Check we report this.
+
+# RUN: yaml2obj %s -o %t.o
+# RUN: llvm-ar rcs %t.a %t.o
+
+# RUN: not ld.lld --whole-archive %t.a -o /dev/null 2>&1 | FileCheck %s
+# CHECK: {{.*}}.a({{.*}}.o): corrupted ELF file: invalid data encoding
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATANONE
+  Type:            ET_REL
+  Machine:         EM_X86_64
diff --git a/deps/lld/test/ELF/invalid/dynamic-section-broken.test b/deps/lld/test/ELF/invalid/dynamic-section-broken.test
new file mode 100644
index 0000000000000000000000000000000000000000..ecc7834300ece98ac3b514717feb74cb630694f6
--- /dev/null
+++ b/deps/lld/test/ELF/invalid/dynamic-section-broken.test
@@ -0,0 +1,36 @@
+## .dynamic section has invalid sh_entsize, check we report it.
+# RUN: yaml2obj -docnum=1 %s -o %t.so
+# RUN: not ld.lld %t.so -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR1
+# ERR1: error: {{.*}}.so: section [index 1] has an invalid sh_entsize: 291
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_DYN
+  Machine:         EM_X86_64
+Sections:
+  - Name:          .dynamic
+    Type:          SHT_DYNAMIC
+    Flags:         [ SHF_ALLOC ]
+    Link:          .strtab
+    EntSize:       0x123
+
+## The  .dynamic section has invalid sh_size, which is too short and
+## even less than entry size. Check we report it.
+# RUN: yaml2obj -docnum=2 %s -o %t.so
+# RUN: not ld.lld %t.so -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR2
+# ERR2: error: {{.*}}.so: section [index 1] has an invalid sh_size (1) which is not a multiple of its sh_entsize (16)
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_DYN
+  Machine:         EM_X86_64
+Sections:
+  - Name:          .dynamic
+    Type:          SHT_DYNAMIC
+    Flags:         [ SHF_ALLOC ]
+    Link:          .strtab
+    Content:       "00"
diff --git a/deps/lld/test/ELF/invalid/dynamic-section-size.s b/deps/lld/test/ELF/invalid/dynamic-section-size.s
deleted file mode 100644
index 58a7d0688c258716362441155d93f04fed976644..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/invalid/dynamic-section-size.s
+++ /dev/null
@@ -1,4 +0,0 @@
-## dynamic-section-sh_size.elf has incorrect sh_size of dynamic section.
-# RUN: not ld.lld %p/Inputs/dynamic-section-sh_size.elf -o /dev/null 2>&1 | \
-# RUN:   FileCheck %s
-# CHECK: error: {{.*}}: invalid sh_entsize
diff --git a/deps/lld/test/ELF/invalid/ehframe-broken-relocation.test b/deps/lld/test/ELF/invalid/ehframe-broken-relocation.test
index 1333a6d0a86843cd197d9ce16f86eb14c2dd75fa..810524eeeffff50de4973e308247be4c04b737bb 100644
--- a/deps/lld/test/ELF/invalid/ehframe-broken-relocation.test
+++ b/deps/lld/test/ELF/invalid/ehframe-broken-relocation.test
@@ -23,9 +23,9 @@ Sections:
         Symbol:          zed
         Type:            R_X86_64_64
 Symbols:
-  Global:
-    - Name:     zed
-      Type:     STT_FUNC
-      Section:  .eh_frame
-      Value:    0x0
-      Size:     8
+  - Name:     zed
+    Type:     STT_FUNC
+    Section:  .eh_frame
+    Value:    0x0
+    Size:     8
+    Binding:  STB_GLOBAL
diff --git a/deps/lld/test/ELF/invalid/invalid-binding.test b/deps/lld/test/ELF/invalid/invalid-binding.test
new file mode 100644
index 0000000000000000000000000000000000000000..4d8963367e75608b00139972ec610470d03ca3fb
--- /dev/null
+++ b/deps/lld/test/ELF/invalid/invalid-binding.test
@@ -0,0 +1,19 @@
+# RUN: yaml2obj %s -o %t.o
+# RUN: not ld.lld %t.o -o /dev/null 2>&1 | FileCheck %s
+# CHECK: error: {{.*}}.o: unexpected binding: 9
+
+--- !ELF
+FileHeader:
+  Class:      ELFCLASS64
+  Data:       ELFDATA2LSB
+  OSABI:      ELFOSABI_GNU
+  Type:       ET_REL
+  Machine:    EM_X86_64
+Sections:
+  - Name:     .text
+    Type:     SHT_PROGBITS
+    Flags:    [ SHF_ALLOC, SHF_EXECINSTR ]
+Symbols:
+  - Name:     foo
+    Section:  .text
+    Binding:  0x9
diff --git a/deps/lld/test/ELF/invalid/invalid-debug-relocations.test b/deps/lld/test/ELF/invalid/invalid-debug-relocations.test
index 9c86b6743093372f54f43059add184a39fef9a7b..71e4135e608638b75587064777df784ce4cd995b 100644
--- a/deps/lld/test/ELF/invalid/invalid-debug-relocations.test
+++ b/deps/lld/test/ELF/invalid/invalid-debug-relocations.test
@@ -2,7 +2,7 @@
 # RUN: yaml2obj %s -o %t.o
 # RUN: not ld.lld -gdb-index %t.o -o %t.exe 2>&1 | FileCheck %s
 
-# CHECK: error: {{.*}}invalid-debug-relocations.test.tmp.o:(.debug_info+0x0): has non-ABS relocation Unknown (255) against symbol '_start'
+# CHECK: error: {{.*}}invalid-debug-relocations.test.tmp.o:(.debug_info+0x0): unknown relocation (255) against symbol _start
 
 !ELF
 FileHeader:
@@ -33,8 +33,8 @@ Sections:
         Symbol:          _start
         Type:            0xFF
 Symbols:
-  Global:
-    - Name:     _start
-      Type:     STT_FUNC
-      Section:  .text
-      Value:    0x0
+  - Name:     _start
+    Type:     STT_FUNC
+    Section:  .text
+    Value:    0x0
+    Binding:  STB_GLOBAL
diff --git a/deps/lld/test/ELF/invalid/invalid-e_shnum.s b/deps/lld/test/ELF/invalid/invalid-e_shnum.s
deleted file mode 100644
index 34a742e180726fe0a7a6bbe287df0577e20ea24f..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/invalid/invalid-e_shnum.s
+++ /dev/null
@@ -1,3 +0,0 @@
-## Spec says that "If a file has no section header table, e_shnum holds the value zero.", though
-## in this test case it holds non-zero and lld used to crash.
-# RUN: ld.lld %p/Inputs/invalid-e_shnum.elf -o /dev/null
diff --git a/deps/lld/test/ELF/invalid/invalid-e_shnum.test b/deps/lld/test/ELF/invalid/invalid-e_shnum.test
new file mode 100644
index 0000000000000000000000000000000000000000..6c208a7815c0f24048c202d541d6f2dee4e7f770
--- /dev/null
+++ b/deps/lld/test/ELF/invalid/invalid-e_shnum.test
@@ -0,0 +1,15 @@
+## Spec says that "If a file has no section header table, e_shnum holds the value zero.", though
+## in this test case it holds non-zero and lld used to crash.
+
+# RUN: yaml2obj %s -o %t
+# RUN: ld.lld %t -o /dev/null
+
+--- !ELF
+FileHeader:
+  Class:     ELFCLASS64
+  Data:      ELFDATA2LSB
+  Type:      ET_REL
+  Machine:   EM_X86_64
+  SHOffset:  0
+  SHNum:     0x1
+  SHStrNdx:  0
diff --git a/deps/lld/test/ELF/invalid/invalid-elf.test b/deps/lld/test/ELF/invalid/invalid-elf.test
index 80c8f41eb61d71c2907578115acc69bc2c54622b..bcbdc3683beceb4890ff485573548513fee254e8 100644
--- a/deps/lld/test/ELF/invalid/invalid-elf.test
+++ b/deps/lld/test/ELF/invalid/invalid-elf.test
@@ -1,28 +1,5 @@
-# REQUIRES: x86
-# RUN: llvm-mc %s -o %t -filetype=obj -triple x86_64-pc-linux
-
-# RUN: not ld.lld %t %p/Inputs/data-encoding.a -o %t2 2>&1 | \
-# RUN:   FileCheck --check-prefix=INVALID-DATA-ENC %s
-# INVALID-DATA-ENC: test.o: invalid data encoding
-
-# RUN: not ld.lld %t %p/Inputs/file-class.a -o %t2 2>&1 | \
-# RUN:   FileCheck --check-prefix=INVALID-FILE-CLASS %s
-# INVALID-FILE-CLASS: test.o: invalid file class
-
-# RUN: not ld.lld %p/Inputs/symtab-sh_info.elf -o %t2 2>&1 | \
-# RUN:   FileCheck --check-prefix=INVALID-SYMTAB-SHINFO %s
-# INVALID-SYMTAB-SHINFO: invalid sh_info in symbol table
-
-# RUN: not ld.lld %p/Inputs/binding.elf -o %t2 2>&1 | \
-# RUN:   FileCheck --check-prefix=INVALID-BINDING %s
-# INVALID-BINDING: unexpected binding
-
-# RUN: not ld.lld %p/Inputs/section-index.elf -o %t2 2>&1 | \
-# RUN:   FileCheck --check-prefix=INVALID-SECTION-INDEX-LLD %s
-# INVALID-SECTION-INDEX-LLD: invalid section index
-
-# RUN: not ld.lld %p/Inputs/multiple-eh-relocs.elf -o %t2 2>&1 | \
-# RUN:   FileCheck --check-prefix=INVALID-EH-RELOCS %s
-# INVALID-EH-RELOCS: multiple relocation sections to one section are not supported
-
-.long foo
+# RUN: rm -rf %t && mkdir -p %t
+# RUN: echo > %t/empty.o
+# RUN: llvm-ar --format=gnu cr %t/not-elf.a %t/empty.o
+# RUN: not ld.lld --whole-archive %t/not-elf.a -o %t2 2>&1 | FileCheck %s
+# CHECK: not-elf.a(empty.o): not an ELF file
diff --git a/deps/lld/test/ELF/invalid/invalid-file-class.test b/deps/lld/test/ELF/invalid/invalid-file-class.test
new file mode 100644
index 0000000000000000000000000000000000000000..a271d3717ce4f3ff2e89ad0d74fcb4d5d0860b1e
--- /dev/null
+++ b/deps/lld/test/ELF/invalid/invalid-file-class.test
@@ -0,0 +1,19 @@
+# REQUIRES: x86
+# RUN: rm -rf %t && mkdir -p %t
+
+## In this test, we check that able to report objects with
+## invalid ELF class type. There are 2 cases we want to check:
+## when the object is a regular input and when it is fetched from the archive.
+
+## Create a broken ELF object with ELFCLASSNONE class using echo. We need to fill
+## first 18 bytes which are used by LLD to check the object.
+## 0x7f, 'E', 'L', 'F', ELFCLASSNONE(0), ELFDATA2LSB(1),
+## EV_CURRENT(1), ELFOSABI_LINUX(3), <padding zero bytes>, ET_REL(1), EM_NONE(0)
+# RUN: echo -e -n "\x7f\x45\x4c\x46\x00\x01\x01\x03\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00" > %t/invalid.o
+
+# RUN: llvm-ar --format=gnu cr %t/invalid-class.a %t/invalid.o
+# RUN: not ld.lld -whole-archive %t/invalid-class.a -o %t2 2>&1 | FileCheck %s
+# CHECK: invalid-class.a(invalid.o): corrupted ELF file: invalid file class
+
+# RUN: not ld.lld %t/invalid.o -o %t2 2>&1 | FileCheck %s --check-prefix=OBJ
+# OBJ: invalid.o: corrupted ELF file: invalid file class
diff --git a/deps/lld/test/ELF/invalid/invalid-relocation-x64.test b/deps/lld/test/ELF/invalid/invalid-relocation-x64.test
index a9b3164156975181804f4a24b62052bd16d3d625..fddc0ce462ceb52264d06eadee6d51396098e839 100644
--- a/deps/lld/test/ELF/invalid/invalid-relocation-x64.test
+++ b/deps/lld/test/ELF/invalid/invalid-relocation-x64.test
@@ -3,8 +3,8 @@
 # RUN: echo ".global foo; foo:" > %t2.s
 # RUN: llvm-mc %t2.s -o %t2.o -filetype=obj -triple x86_64-pc-linux
 # RUN: not ld.lld %t1.o %t2.o -o /dev/null 2>&1 | FileCheck %s
-# CHECK: error: unrecognized reloc 152
-# CHECK: error: unrecognized reloc 153
+# CHECK: error: unknown relocation (152) against symbol foo
+# CHECK: error: unknown relocation (153) against symbol foo
 
 !ELF
 FileHeader:
@@ -29,5 +29,5 @@ Sections:
         Symbol:          foo
         Type:            0x99
 Symbols:
-  Global:
-      - Name:            foo
+  - Name:            foo
+    Binding:         STB_GLOBAL
diff --git a/deps/lld/test/ELF/invalid/invalid-soname.test b/deps/lld/test/ELF/invalid/invalid-soname.test
index 8641465acd5059edd982b077a02eba7aff2c3f00..bf4b33c87d06bd6f21ae6f8a6cc39a7804994e42 100644
--- a/deps/lld/test/ELF/invalid/invalid-soname.test
+++ b/deps/lld/test/ELF/invalid/invalid-soname.test
@@ -14,5 +14,8 @@ Sections:
   - Name:          .test
     Type:          SHT_DYNAMIC
     Flags:         [ SHF_ALLOC ]
-    Content:         "0e000000000000000000000000000001"
     Link:          .strtab
+    EntSize:       0x0000000000000010
+    Entries:       
+      - Tag:         DT_SONAME
+        Value:       0x0100000000000000
diff --git a/deps/lld/test/ELF/invalid/mips-invalid-options-descriptor.s b/deps/lld/test/ELF/invalid/mips-invalid-options-descriptor.s
deleted file mode 100644
index c05e3478529998e63a8fdabbac1d4440ffbd0358..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/invalid/mips-invalid-options-descriptor.s
+++ /dev/null
@@ -1,5 +0,0 @@
-## mips-invalid-options-descriptor.elf has option descriptor in
-## .MIPS.options with size of zero.
-# RUN: not ld.lld %p/Inputs/mips-invalid-options-descriptor.elf -o /dev/null 2>&1 | \
-# RUN:   FileCheck %s
-# CHECK: error: {{.*}}: invalid section offset
diff --git a/deps/lld/test/ELF/invalid/mips-invalid-options-descriptor.test b/deps/lld/test/ELF/invalid/mips-invalid-options-descriptor.test
new file mode 100644
index 0000000000000000000000000000000000000000..ce797c978cd4e654a47332896f828f194dc2c7a1
--- /dev/null
+++ b/deps/lld/test/ELF/invalid/mips-invalid-options-descriptor.test
@@ -0,0 +1,21 @@
+# RUN: yaml2obj %s -o %t1.o
+# RUN: not ld.lld %t1.o -o %t 2>&1 | FileCheck %s
+# CHECK: error: {{.*}}1.o: zero option descriptor size
+
+## YAML has a description of ODK_NULL (Undefined) MIPS option,
+## with a size of zero. We do not allow options with a zero size.
+## Check we report it.
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2MSB
+  Type:            ET_REL
+  Machine:         EM_MIPS
+  Flags:           [ EF_MIPS_CPIC, EF_MIPS_ARCH_64 ]
+Sections:
+  - Name:          .MIPS.options
+    Type:          SHT_MIPS_OPTIONS
+    Flags:         [ SHF_ALLOC, SHF_MIPS_NOSTRIP ]
+    AddressAlign:  0x0000000000000008
+    Content:       '0000000000000000'
diff --git a/deps/lld/test/ELF/invalid/multiple-relocations-sections.test b/deps/lld/test/ELF/invalid/multiple-relocations-sections.test
new file mode 100644
index 0000000000000000000000000000000000000000..deb0a4de984f0bdf59f6546f785fb849e74e316e
--- /dev/null
+++ b/deps/lld/test/ELF/invalid/multiple-relocations-sections.test
@@ -0,0 +1,29 @@
+# RUN: yaml2obj %s -o %t1.o
+# RUN: not ld.lld %t1.o -o %t 2>&1 | FileCheck %s
+# CHECK: error: {{.*}}1.o: multiple relocation sections to one section are not supported
+
+## The file has two relocation sections referring to a single target section.
+## Multiple relocation sections to one section are not supported, check we report this case.
+
+--- !ELF
+FileHeader:
+  Class:     ELFCLASS64
+  Data:      ELFDATA2LSB
+  Type:      ET_REL
+  Machine:   EM_X86_64
+Sections:
+  - Name:    .text
+    Type:    SHT_PROGBITS
+    Flags:   [ SHF_ALLOC, SHF_EXECINSTR ]
+  - Name:    .rela.text1
+    Type:    SHT_RELA
+    Link:    .symtab
+    Info:    .text
+  - Name:    .rela.text2
+    Type:    SHT_RELA
+    Link:    .symtab
+    Info:    .text
+Symbols:
+  - Name:    .text
+    Type:    STT_SECTION
+    Section: .text
diff --git a/deps/lld/test/ELF/invalid/reloc-section-reordered.test b/deps/lld/test/ELF/invalid/reloc-section-reordered.test
index 7ff4ed6e8adec516bd6624dbee070df5e87b345b..286d6612b76846b18e6d7a8fc40840b68fd065ae 100644
--- a/deps/lld/test/ELF/invalid/reloc-section-reordered.test
+++ b/deps/lld/test/ELF/invalid/reloc-section-reordered.test
@@ -28,3 +28,7 @@ Sections:
     Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
     AddressAlign:    0x04
     Content:         "FFFFFFFFFFFFFFFF"
+Symbols:
+  - Name:    .text
+    Type:    STT_SECTION
+    Section: .text
diff --git a/deps/lld/test/ELF/invalid/section-alignment2.s b/deps/lld/test/ELF/invalid/section-alignment2.s
index 879ba8c03c1447e8116b0ee7c04988e34698a26f..df997d2f5f7e2c35ba89551b0d0208db6d08000d 100644
--- a/deps/lld/test/ELF/invalid/section-alignment2.s
+++ b/deps/lld/test/ELF/invalid/section-alignment2.s
@@ -1,5 +1,16 @@
-## section-alignment-notpow2.elf has section alignment
-## 0xFFFFFFFF which is not a power of 2.
-# RUN: not ld.lld %p/Inputs/section-alignment-notpow2.elf -o /dev/null 2>&1 | \
-# RUN:   FileCheck %s
-# CHECK: section sh_addralign is not a power of 2
+# RUN: yaml2obj %s -o %t.o
+# RUN: not ld.lld %t.o -o %tout 2>&1 | FileCheck %s
+
+# CHECK: error: {{.*}}.o:(.text): sh_addralign is not a power of 2
+
+!ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_REL
+  Machine:         EM_X86_64
+Sections:
+  - Name:            .text
+    Type:            SHT_PROGBITS
+    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
+    AddressAlign:    0x3
diff --git a/deps/lld/test/ELF/invalid/section-index.test b/deps/lld/test/ELF/invalid/section-index.test
new file mode 100644
index 0000000000000000000000000000000000000000..80d89ef39ab987fc73a8241bddab714fffe987c7
--- /dev/null
+++ b/deps/lld/test/ELF/invalid/section-index.test
@@ -0,0 +1,16 @@
+## If an object contains a symbol with a broken (too large) st_shndx,
+## check we report it.
+
+# RUN: yaml2obj %s -o %t1.o
+# RUN: not ld.lld %t1.o -o %t 2>&1 | FileCheck %s
+# CHECK: {{.*}}1.o: invalid section index: 256
+
+!ELF
+FileHeader:
+  Class:    ELFCLASS32
+  Data:     ELFDATA2LSB
+  Type:     ET_REL
+  Machine:  EM_386
+Symbols:
+  - Name:   foo
+    Index:  0x100
diff --git a/deps/lld/test/ELF/invalid/sht-group-wrong-section.test b/deps/lld/test/ELF/invalid/sht-group-wrong-section.test
index d431dcbc2d24929a2be76877224a39ead83d87bc..dba266a1ff07443459fddbcc89aa83503f02ff4b 100644
--- a/deps/lld/test/ELF/invalid/sht-group-wrong-section.test
+++ b/deps/lld/test/ELF/invalid/sht-group-wrong-section.test
@@ -18,5 +18,5 @@ Sections:
       - SectionOrType: GRP_COMDAT
       - SectionOrType: 12345
 Symbols:
-  Global:
-    - Name:            foo
+  - Name:            foo
+    Binding:         STB_GLOBAL
diff --git a/deps/lld/test/ELF/invalid/symbol-index.s b/deps/lld/test/ELF/invalid/symbol-index.s
deleted file mode 100644
index e3989b4e1adc0da51b0e7ba59f2f70bd6c413f4a..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/invalid/symbol-index.s
+++ /dev/null
@@ -1,10 +0,0 @@
-## symbol-index.elf has incorrect type of .symtab section.
-## There is no symbol bodies because of that and any symbol index becomes incorrect.
-## Section Headers:
-##   [Nr] Name              Type            Address          Off    Size   ES Flg Lk Inf Al
-##   [ 0]                   NULL            0000000000000000 000000 000000 00      0   0  0
-## ...
-##   [ 4] .symtab           RELA            0000000000000000 000048 000030 18      1   2  8
-# RUN: not ld.lld %p/Inputs/symbol-index.elf -o /dev/null 2>&1 | \
-# RUN:   FileCheck --check-prefix=INVALID-SYMBOL-INDEX %s
-# INVALID-SYMBOL-INDEX: invalid symbol index
diff --git a/deps/lld/test/ELF/invalid/symbol-name.s b/deps/lld/test/ELF/invalid/symbol-name.s
deleted file mode 100644
index 53a20ef6af9c615e10629d56bb74b7733ef7a5dd..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/invalid/symbol-name.s
+++ /dev/null
@@ -1,7 +0,0 @@
-# REQUIRES: x86
-
-## symbol-name-offset.elf contains symbol with invalid (too large)
-## st_name value.
-# RUN: not ld.lld %S/Inputs/symbol-name-offset.elf \
-# RUN:   -o /dev/null 2>&1 | FileCheck %s
-# CHECK: invalid symbol name offset
diff --git a/deps/lld/test/ELF/invalid/symbol-name.test b/deps/lld/test/ELF/invalid/symbol-name.test
new file mode 100644
index 0000000000000000000000000000000000000000..da457bb1ade10a504e10424469e5c7fc827615f0
--- /dev/null
+++ b/deps/lld/test/ELF/invalid/symbol-name.test
@@ -0,0 +1,15 @@
+# RUN: yaml2obj %s -o %t.o
+# RUN: not ld.lld %t.o -o %t.exe 2>&1 | FileCheck %s
+# CHECK: error: {{.*}}.o: invalid symbol name offset
+
+## YAML below contains symbol with name offset in st_name
+## larger than string table size. Check we report it.
+
+!ELF
+FileHeader:
+  Class:       ELFCLASS64
+  Data:        ELFDATA2LSB
+  Type:        ET_REL
+  Machine:     EM_X86_64
+Symbols:
+  - NameIndex: 255
diff --git a/deps/lld/test/ELF/invalid/symtab-sh-info.s b/deps/lld/test/ELF/invalid/symtab-sh-info.s
index 3522ae550c08a49879163349a1e366a13954f97b..9e694dcc4982a6f4e1f4b7c496b2170437223559 100644
--- a/deps/lld/test/ELF/invalid/symtab-sh-info.s
+++ b/deps/lld/test/ELF/invalid/symtab-sh-info.s
@@ -1,9 +1,59 @@
-## sh_info contains zero value. First entry in a symbol table is always completely zeroed,
-## so sh_info should be at least 1 in a valid ELF.
-# RUN: not ld.lld %p/Inputs/symtab-sh_info2.elf -o %t2 2>&1 | FileCheck %s
-# CHECK: invalid sh_info in symbol table
-
-## sh_info contains invalid value saying non-local symbol is local.
-# RUN: not ld.lld %p/Inputs/symtab-sh_info3.elf -o %t2 2>&1 | \
-# RUN:   FileCheck --check-prefix=INVALID-SYMTAB-SHINFO %s
-# INVALID-SYMTAB-SHINFO: broken object: getLocalSymbols returns a non-local symbol
+## .symtab's sh_info contains zero value. First entry in a .symtab is a
+## zero entry that must exist in a valid object, so sh_info can't be null.
+## Check we report a proper error for that case.
+# RUN: yaml2obj -docnum=1 %s -o %t.o
+# RUN: not ld.lld %t.o -o %t2 2>&1 | FileCheck %s --check-prefix=ERR1
+# ERR1: invalid sh_info in symbol table
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_REL
+  Machine:         EM_X86_64
+Sections:
+  - Name:            .symtab
+    Info:            0
+    Type:            SHT_SYMTAB
+Symbols:
+  - Name:          foo
+    Binding:       STB_GLOBAL
+
+## sh_info has value 2 what says that non-local symbol `foo` is local.
+## Check we report this case.
+# RUN: yaml2obj -docnum=2 %s -o %t.o
+# RUN: not ld.lld %t.o -o %t2 2>&1 | FileCheck --check-prefix=ERR2 %s
+# ERR2: broken object: getLocalSymbols returns a non-local symbol
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_REL
+  Machine:         EM_X86_64
+Sections:
+  - Name:            .symtab
+    Info:            2
+    Type:            SHT_SYMTAB
+Symbols:
+  - Name:          foo
+    Binding:       STB_GLOBAL
+
+## sh_info has value 0xff what is larger than number of symbols in a .symtab.
+## Check we report this case.
+# RUN: yaml2obj -docnum=3 %s -o %t.o
+# RUN: not ld.lld %t.o -o %t2 2>&1 | FileCheck --check-prefix=ERR1 %s
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_REL
+  Machine:         EM_X86_64
+Sections:
+  - Name:            .symtab
+    Info:            0xff
+    Type:            SHT_SYMTAB
+Symbols:
+  - Name:          foo
+    Binding:       STB_GLOBAL
diff --git a/deps/lld/test/ELF/invalid/symtab-symbols.test b/deps/lld/test/ELF/invalid/symtab-symbols.test
index 953b2e32a4acd9dbd1ae6798b943f652af296e43..5f4ae353de505c83efbe9b8ec30dfa97db4725a0 100644
--- a/deps/lld/test/ELF/invalid/symtab-symbols.test
+++ b/deps/lld/test/ELF/invalid/symtab-symbols.test
@@ -20,6 +20,5 @@ Sections:
     AddressAlign:    0x0000000000000010
     Content:         "00000000"
 Symbols:
-  Local:
-    - Type:            STT_NOTYPE
-      Section:         .symtab
+  - Type:            STT_NOTYPE
+    Section:         .symtab
diff --git a/deps/lld/test/ELF/invalid/tls-symbol.s b/deps/lld/test/ELF/invalid/tls-symbol.s
index 99c47dc13023a64a0fef6b1edddf597240f2b2be..3f371d406e1f2f62295df7331656ffbef3583010 100644
--- a/deps/lld/test/ELF/invalid/tls-symbol.s
+++ b/deps/lld/test/ELF/invalid/tls-symbol.s
@@ -1,5 +1,24 @@
-# REQUIRES: x86
-
 ## The test file contains an STT_TLS symbol but has no TLS section.
-# RUN: not ld.lld %S/Inputs/tls-symbol.elf -o /dev/null 2>&1 | FileCheck %s
+## Check we report an error properly.
+
+# RUN: yaml2obj %s -o %t.o
+# RUN: not ld.lld %t.o -o /dev/null 2>&1 | FileCheck %s
+
 # CHECK: has an STT_TLS symbol but doesn't have an SHF_TLS section
+
+--- !ELF
+FileHeader:      
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_REL
+  Machine:         EM_X86_64
+Sections:        
+  - Name:            .text
+    Type:            SHT_PROGBITS
+    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
+    Content:         ''
+Symbols:
+  - Name:          bar
+    Type:          STT_TLS
+    Section:       .text
+    Binding:       STB_GLOBAL
diff --git a/deps/lld/test/ELF/invalid/undefined-local-symbol-in-dso.test b/deps/lld/test/ELF/invalid/undefined-local-symbol-in-dso.test
index a9c30f30db6f38ec78deca488c3da42707e89d23..edd5fa1e1fd368b8112e55050ccf7a1e7c1ec8ef 100644
--- a/deps/lld/test/ELF/invalid/undefined-local-symbol-in-dso.test
+++ b/deps/lld/test/ELF/invalid/undefined-local-symbol-in-dso.test
@@ -8,59 +8,19 @@
 # STB_LOCAL is a nonsensical combination. Nevertheless, we should warn on such
 # input files instead of crashing.
 
-# We've found actual broken DSOs of this sort in the wild, but for this test, we
-# created a reduced broken input file. There are no tools capable of producing a
-# broken DSO of this nature, so instead we created a valid DSO with an undefined
-# global symbol in the dynamic symbol table and then manually edited the binary
-# to make that symbol local. The valid DSO was created as follows:
-
-```
-% cat undef.s
-.hidden bar
-bar:
-	movq	foo@GOT, %rax
-
-% llvm-mc -triple=x86_64-linux-gnu -filetype=obj -o undef.o undef.s
-% ld.lld --no-rosegment -shared -o undefined-local-symbol-in-dso.so undef.o
-% strip undef.so
-```
-
-# (--no-rosegment and stripping are unnecessary; they just produce a smaller
-# binary)
-
-# This DSO should only have a single dynamic symbol table entry for foo, and
-# then we can use a small C program to modify that symbol table entry to be
-# STB_LOCAL instead of STB_GLOBAL.
-
-```
-#include <elf.h>
-#include <stdio.h>
-
-int main(int argc, char *argv[]) {
-  FILE *F = fopen(argv[1], "rb+");
-
-  Elf64_Ehdr Ehdr;
-  fread(&Ehdr, sizeof(Ehdr), 1, F);
-  fseek(F, Ehdr.e_shoff, SEEK_SET);
-
-  Elf64_Shdr Shdr;
-  do {
-    fread(&Shdr, sizeof(Shdr), 1, F);
-  } while (Shdr.sh_type != SHT_DYNSYM);
-
-  Elf64_Sym Sym;
-  fseek(F, Shdr.sh_offset + sizeof(Elf64_Sym), SEEK_SET);
-  fread(&Sym, sizeof(Sym), 1, F);
-  Sym.st_info = STB_LOCAL << 4 | ELF64_ST_TYPE(Sym.st_info);
-  fseek(F, Shdr.sh_offset + sizeof(Elf64_Sym), SEEK_SET);
-  fwrite(&Sym, sizeof(Sym), 1, F);
-  fclose(F);
-}
-```
-
-# (the C program just takes its input DSO and modifies the binding of the first
-# dynamic symbol table entry to be STB_LOCAL instead of STB_GLOBAL)
-
-# RUN: ld.lld %p/Inputs/undefined-local-symbol-in-dso.so -o %t 2>&1 | \
-# RUN:   FileCheck -check-prefix=WARN %s
-# WARN: found local symbol 'foo' in global part of symbol table in file {{.*}}undefined-local-symbol-in-dso.so
+# RUN: yaml2obj %s -o %t.so
+# RUN: ld.lld %t.so -o %t 2>&1 | FileCheck -check-prefix=WARN %s
+# WARN: found local symbol 'foo' in global part of symbol table in file {{.*}}.so
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_DYN
+  Machine:         EM_X86_64
+Sections:
+  - Name:          .dynsym
+    Info:          1
+    Type:          SHT_DYNSYM
+DynamicSymbols:
+  - Name: foo
diff --git a/deps/lld/test/ELF/invalid/verdef-no-symtab.test b/deps/lld/test/ELF/invalid/verdef-no-symtab.test
index 5b5c32e4ff5c3cd9fecb038a1c75234c08cc3b71..536515dbab6663b8e3ed6fd9a3c0da08b1994361 100644
--- a/deps/lld/test/ELF/invalid/verdef-no-symtab.test
+++ b/deps/lld/test/ELF/invalid/verdef-no-symtab.test
@@ -14,13 +14,6 @@ Sections:
     Type:            SHT_GNU_versym
     Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
     AddressAlign:    0x1
-    Content:         "00000000"
-
-  - Name:            .verdef
-    Type:            SHT_GNU_verdef
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-    AddressAlign:    0x1
-    Content:         "00000000"
-
+    Entries:         [ 0 ]
 
 # CHECK: SHT_GNU_versym should be associated with symbol table
diff --git a/deps/lld/test/ELF/invalid/x86-64-tlsdesc-gd.s b/deps/lld/test/ELF/invalid/x86-64-tlsdesc-gd.s
new file mode 100644
index 0000000000000000000000000000000000000000..bd75ff2bc8f3e0dd0ae84409d4344f890b5e2817
--- /dev/null
+++ b/deps/lld/test/ELF/invalid/x86-64-tlsdesc-gd.s
@@ -0,0 +1,15 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: echo '.tbss; .globl a; a:' | llvm-mc -filetype=obj -triple=x86_64 - -o %t1.o
+# RUN: ld.lld -shared %t1.o -o %t1.so
+
+## GD to LE relaxation.
+# RUN: not ld.lld %t.o %t1.o -o /dev/null 2>&1 | FileCheck -DINPUT=%t.o %s
+## GD to IE relaxation.
+# RUN: not ld.lld %t.o %t1.so -o /dev/null 2>&1 | FileCheck -DINPUT=%t.o %s
+
+# CHECK: error: [[INPUT]]:(.text+0x0): R_X86_64_GOTPC32_TLSDESC must be used in callq *x@tlsdesc(%rip), %rax
+
+leaq a@tlsdesc(%rip), %rdx
+call *a@tlscall(%rdx)
+movl %fs:(%rax), %eax
diff --git a/deps/lld/test/ELF/linkerscript/absolute-expr.test b/deps/lld/test/ELF/linkerscript/absolute-expr.test
index 9e8f517d0ac4988e9be5a8cf8dcb4c23bcb11f18..47016d3f5d880808b9ecbe06d3e82b6a25a83992 100644
--- a/deps/lld/test/ELF/linkerscript/absolute-expr.test
+++ b/deps/lld/test/ELF/linkerscript/absolute-expr.test
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: echo ".global foo; foo = 0x123" | llvm-mc -filetype=obj -triple=x86_64-pc-linux - -o %t.o
 # RUN: ld.lld -o %t.so --script %s %t.o -shared
-# RUN: llvm-readobj -t %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols %t.so | FileCheck %s
 
 SECTIONS {
   .text : {
diff --git a/deps/lld/test/ELF/linkerscript/addr-zero.test b/deps/lld/test/ELF/linkerscript/addr-zero.test
index 6253f619381bb002f85a8156ccea10d6bdd3ce07..5b50816dd1e962f712e4da9a8b78f9e64cc8e1d2 100644
--- a/deps/lld/test/ELF/linkerscript/addr-zero.test
+++ b/deps/lld/test/ELF/linkerscript/addr-zero.test
@@ -1,14 +1,14 @@
-# REQUIRES: x86
+# REQUIRES: x86, aarch64
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux /dev/null -o %t.o
 # RUN: ld.lld -o %t.so --script %s %t.o -shared
 # RUN: llvm-readobj --symbols %t.so | FileCheck %s
 
-# Test that the script creates a non absolute symbol with value
-# 0 I.E., a symbol that refers to the load address.
+## Test that the script creates a non absolute symbol with value
+## 0 I.E., a symbol that refers to the load address.
 
 # CHECK:      Symbol {
 # CHECK:        Name: foo
-# CHECK-NEXT:   Value: 0x70
+# CHECK-NEXT:   Value: 0x0
 # CHECK-NEXT:   Size: 0
 # CHECK-NEXT:   Binding: Global
 # CHECK-NEXT:   Type: None
@@ -16,6 +16,12 @@
 # CHECK-NEXT:   Section: .text
 # CHECK-NEXT: }
 
+## Because of a bug we had a different behavior (different symbol 'foo' value)
+## on a platforms that might use thunks, like AArch64. Check that issue is fixed.
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu /dev/null -o %t.o
+# RUN: ld.lld -o %t.so --script %s %t.o -shared
+# RUN: llvm-readobj --symbols %t.so | FileCheck %s
+
 SECTIONS {
   foo = ADDR(.text) - ABSOLUTE(ADDR(.text));
 };
diff --git a/deps/lld/test/ELF/linkerscript/addr.test b/deps/lld/test/ELF/linkerscript/addr.test
index db0568e56c762161320e6a9855ff2ad2eb69a3e5..2e68cc271c03b2ca191ea6deff9941e37e3af951 100644
--- a/deps/lld/test/ELF/linkerscript/addr.test
+++ b/deps/lld/test/ELF/linkerscript/addr.test
@@ -4,7 +4,7 @@
 # RUN: llvm-objdump -section-headers %t1 | FileCheck %s
 
 # CHECK:      Sections:
-# CHECK-NEXT: Idx Name          Size      Address          Type
+# CHECK-NEXT: Idx Name          Size     VMA              Type
 # CHECK-NEXT:   0               00000000 0000000000000000
 # CHECK-NEXT:   1 .text         00000000 0000000000001000 TEXT
 # CHECK-NEXT:   2 .foo.1        00000008 0000000000001000 DATA
diff --git a/deps/lld/test/ELF/linkerscript/align-empty.test b/deps/lld/test/ELF/linkerscript/align-empty.test
index 63fe32882c0b395c9ab5b61b60c395d727d23a39..06d3945ddc4f3fd15faa62c6c0b8f70d072ff7c8 100644
--- a/deps/lld/test/ELF/linkerscript/align-empty.test
+++ b/deps/lld/test/ELF/linkerscript/align-empty.test
@@ -13,7 +13,7 @@ SECTIONS {
 }
 
 # CHECK:      Sections:
-# CHECK-NEXT: Idx Name          Size      Address
+# CHECK-NEXT: Idx Name          Size     VMA
 # CHECK-NEXT:   0               00000000 0000000000000000
 # CHECK-NEXT:   1 .dynsym       00000018 0000000000000190
 # CHECK-NEXT:   2 .gnu.hash     0000001c 00000000000001a8
diff --git a/deps/lld/test/ELF/linkerscript/align1.test b/deps/lld/test/ELF/linkerscript/align1.test
index 5804bf9337405d09796b92ce449c228a24aa4665..70d1141022ab9cb6dd7103830d601c531a952da7 100644
--- a/deps/lld/test/ELF/linkerscript/align1.test
+++ b/deps/lld/test/ELF/linkerscript/align1.test
@@ -13,7 +13,7 @@ SECTIONS {
 }
 
 # CHECK:      Sections:
-# CHECK-NEXT: Idx Name          Size      Address          Type
+# CHECK-NEXT: Idx Name          Size     VMA              Type
 # CHECK-NEXT:   0               00000000 0000000000000000
 # CHECK-NEXT:   1 .aaa          00000008 0000000000010000 DATA
 # CHECK-NEXT:   2 .bbb          00000008 0000000000011000 DATA
@@ -25,7 +25,7 @@ SECTIONS {
 # RUN: llvm-objdump -section-headers %t4 | FileCheck %s -check-prefix=ZERO
 
 # ZERO:      Sections:
-# ZERO-NEXT: Idx Name          Size      Address         Type
+# ZERO-NEXT: Idx Name          Size     VMA              Type
 # ZERO-NEXT:   0               00000000 0000000000000000
 # ZERO-NEXT:   1 .aaa          00000008 0000000000000123 DATA
 
diff --git a/deps/lld/test/ELF/linkerscript/align2.test b/deps/lld/test/ELF/linkerscript/align2.test
index a9003a403d75161d860417077d4e08e57d77f8e1..56aba4738a795c7951a92994af33075649745148 100644
--- a/deps/lld/test/ELF/linkerscript/align2.test
+++ b/deps/lld/test/ELF/linkerscript/align2.test
@@ -13,7 +13,7 @@ SECTIONS {
 }
 
 # CHECK:      Sections:
-# CHECK-NEXT: Idx Name          Size      Address          Type
+# CHECK-NEXT: Idx Name          Size     VMA              Type
 # CHECK-NEXT:   0               00000000 0000000000000000
 # CHECK-NEXT:   1 .aaa          00000008 0000000000010000 DATA
 # CHECK-NEXT:   2 .bbb          00000008 0000000000011000 DATA
diff --git a/deps/lld/test/ELF/linkerscript/align3.test b/deps/lld/test/ELF/linkerscript/align3.test
index 2a091fcbd6bdcd826178bbddfb38302ccd81d147..8c9146e016d100d84dafe4481e14828686068719 100644
--- a/deps/lld/test/ELF/linkerscript/align3.test
+++ b/deps/lld/test/ELF/linkerscript/align3.test
@@ -11,7 +11,7 @@ SECTIONS {
 }
 
 # CHECK:      Sections:
-# CHECK-NEXT: Idx Name          Size      Address          Type
+# CHECK-NEXT: Idx Name          Size     VMA              Type
 # CHECK-NEXT:   0               00000000 0000000000000000
 # CHECK-NEXT:   1 .aaa          00000008 0000000000010000 DATA
 # CHECK-NEXT:   2 .bbb          00000008 0000000000011000 DATA
diff --git a/deps/lld/test/ELF/linkerscript/alternate-sections.s b/deps/lld/test/ELF/linkerscript/alternate-sections.s
index fd74a8a967f32665174bb0b2e9d23416f917136f..226acafdcb911634899550a6cbebff75332cdf43 100644
--- a/deps/lld/test/ELF/linkerscript/alternate-sections.s
+++ b/deps/lld/test/ELF/linkerscript/alternate-sections.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "SECTIONS { abc : { *(foo) *(bar) *(zed) } }" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o -shared
-# RUN: llvm-readobj -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 # CHECK:       Section {
 # CHECK:        Index:
diff --git a/deps/lld/test/ELF/linkerscript/arm-exidx-order.test b/deps/lld/test/ELF/linkerscript/arm-exidx-order.test
index 60abddfd77da02f47919d3941306456e56cfa849..a5fb3e70e8f5f77f9739a6340b65d4c70b8ed282 100644
--- a/deps/lld/test/ELF/linkerscript/arm-exidx-order.test
+++ b/deps/lld/test/ELF/linkerscript/arm-exidx-order.test
@@ -2,7 +2,7 @@
 # RUN: echo ".fnstart; .cantunwind; .fnend" \
 # RUN:   | llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi - -o %t.o
 # RUN: ld.lld -T %s %t.o -shared -o %t.so
-# RUN: llvm-readobj -s %t.so | FileCheck %s
+# RUN: llvm-readobj -S %t.so | FileCheck %s
 
 SECTIONS {
   . = SIZEOF_HEADERS;
@@ -13,7 +13,7 @@ SECTIONS {
 # CHECK:      Section {
 # CHECK:        Index:
 # CHECK:        Name: .foo
-# CHECK-NEXT:   Type: SHT_NOBITS
+# CHECK-NEXT:   Type: SHT_PROGBITS
 # CHECK-NEXT:   Flags [
 # CHECK-NEXT:     SHF_ALLOC
 # CHECK-NEXT:   ]
diff --git a/deps/lld/test/ELF/linkerscript/arm-exidx-sentinel-and-assignment.s b/deps/lld/test/ELF/linkerscript/arm-exidx-sentinel-and-assignment.s
index 332ed93a4605a9e39c723185a0a2cbc16d4a9655..ea3548ca820ee3c240bcbc7b318f2fee20489b45 100644
--- a/deps/lld/test/ELF/linkerscript/arm-exidx-sentinel-and-assignment.s
+++ b/deps/lld/test/ELF/linkerscript/arm-exidx-sentinel-and-assignment.s
@@ -8,7 +8,7 @@
 ## was anything but an input section description.
 # RUN: ld.lld --no-merge-exidx-entries -T %t.script %t.o -shared -o %t.so
 # RUN: llvm-objdump -s -triple=armv7a-none-linux-gnueabi %t.so | FileCheck %s
-# RUN: llvm-readobj -s -t %t.so | FileCheck %s --check-prefix=SYMBOL
+# RUN: llvm-readobj -S --symbols %t.so | FileCheck %s --check-prefix=SYMBOL
 
  .syntax unified
  .text
diff --git a/deps/lld/test/ELF/linkerscript/at-addr.s b/deps/lld/test/ELF/linkerscript/at-addr.s
index f0ab989c52c7f0a2f89ec412e7fd81d5f1cfaf63..dc9c988a03328e25e63cc434805066939fe3b823 100644
--- a/deps/lld/test/ELF/linkerscript/at-addr.s
+++ b/deps/lld/test/ELF/linkerscript/at-addr.s
@@ -6,7 +6,7 @@
 # RUN:  .ccc : AT(ADDR(.ccc) - 0x500) { *(.ccc) } \
 # RUN: }" > %t.script
 # RUN: ld.lld %t --script %t.script -o %t2
-# RUN: llvm-readobj -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj -l %t2 | FileCheck %s
 
 # CHECK:      Type: PT_LOAD
 # CHECK-NEXT:   Offset: 0x1000
diff --git a/deps/lld/test/ELF/linkerscript/at-self-reference.s b/deps/lld/test/ELF/linkerscript/at-self-reference.s
index 7208a4b9fcd43600add6ff2b293e4ab70ce0fe63..87b8cfb42b413fee7a822631a883de8ade6b12d0 100644
--- a/deps/lld/test/ELF/linkerscript/at-self-reference.s
+++ b/deps/lld/test/ELF/linkerscript/at-self-reference.s
@@ -6,7 +6,7 @@
 # RUN:  .bbb : AT(ADDR(.bbb)) { *(.bbb) } \
 # RUN: }" > %t.script
 # RUN: ld.lld %t --script %t.script -o %t2
-# RUN: llvm-readobj -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj -l %t2 | FileCheck %s
 
 # CHECK:      ProgramHeaders [
 # CHECK-NEXT:  ProgramHeader {
diff --git a/deps/lld/test/ELF/linkerscript/at.s b/deps/lld/test/ELF/linkerscript/at.s
index 430e68a53d98032aaed0522c609e7175d034582e..00f0d340637c5740d2930f046ff3ecac172b523c 100644
--- a/deps/lld/test/ELF/linkerscript/at.s
+++ b/deps/lld/test/ELF/linkerscript/at.s
@@ -9,7 +9,7 @@
 # RUN:  .eee 0x5000 : AT(0x5000) { *(.eee) } \
 # RUN: }" > %t.script
 # RUN: ld.lld %t --script %t.script -o %t2
-# RUN: llvm-readobj -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj -l %t2 | FileCheck %s
 
 # CHECK:      ProgramHeaders [
 # CHECK-NEXT:   ProgramHeader {
diff --git a/deps/lld/test/ELF/linkerscript/at2.test b/deps/lld/test/ELF/linkerscript/at2.test
index 82c9ae1d22526999830640b4460dfd5a2869c333..d5405b20301b2d56ed0b37b388fc99e7ec47a901 100644
--- a/deps/lld/test/ELF/linkerscript/at2.test
+++ b/deps/lld/test/ELF/linkerscript/at2.test
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/at2.s -o %t.o
 # RUN: ld.lld -o %t.exe %t.o --script %s
-# RUN: llvm-readobj -program-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj -l %t.exe | FileCheck %s
 # RUN: llvm-objdump -section-headers %t.exe | FileCheck %s --check-prefix=SECTIONS
 
 MEMORY {
@@ -48,7 +48,7 @@ SECTIONS {
 # CHECK-NEXT:   }
 
 # SECTIONS:      Sections:
-# SECTIONS-NEXT: Idx Name          Size      Address
+# SECTIONS-NEXT: Idx Name          Size     VMA
 # SECTIONS-NEXT:   0               00000000 0000000000000000
 # SECTIONS-NEXT:   1 .foo1         00000008 0000000000002000
 # SECTIONS-NEXT:   2 .foo2         00000008 0000000000002008
diff --git a/deps/lld/test/ELF/linkerscript/at4.s b/deps/lld/test/ELF/linkerscript/at4.s
index a6fa50820376e1deae8e9a692cc2ccfbfed5d976..6fef699db82f3089a66cd48bbc0513bd5a5a6194 100644
--- a/deps/lld/test/ELF/linkerscript/at4.s
+++ b/deps/lld/test/ELF/linkerscript/at4.s
@@ -7,7 +7,7 @@
 # RUN:  .ccc : { *(.ccc) } \
 # RUN: }" > %t.script
 # RUN: ld.lld %t --script %t.script -o %t2
-# RUN: llvm-readobj -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj -l %t2 | FileCheck %s
 
 # CHECK:        Type: PT_LOAD
 # CHECK-NEXT:     Offset: 0x1000
diff --git a/deps/lld/test/ELF/linkerscript/comdat-gc.s b/deps/lld/test/ELF/linkerscript/comdat-gc.s
index 63dcf85c5a67fe5073098754e6839fc957d68cc0..2d225a4d8a946cb4c7e85f0e4b8956965fcbb2c5 100644
--- a/deps/lld/test/ELF/linkerscript/comdat-gc.s
+++ b/deps/lld/test/ELF/linkerscript/comdat-gc.s
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/comdat-gc.s -o %t1
 # RUN: echo "SECTIONS { .text : { *(.text*) } }" > %t.script
 # RUN: ld.lld --gc-sections --script %t.script %t %t1 -o %t2
-# RUN: llvm-readobj -sections -symbols %t2 | FileCheck -check-prefix=GC1 %s
+# RUN: llvm-readobj --sections --symbols %t2 | FileCheck -check-prefix=GC1 %s
 
 # GC1:     Name: .debug_line
 
diff --git a/deps/lld/test/ELF/linkerscript/common-assign.s b/deps/lld/test/ELF/linkerscript/common-assign.s
index 4244ae321110704ff4fe0ce25feac2d793190b83..4b8ad2cf3b240d7d772cd58f1f62895b3df316f5 100644
--- a/deps/lld/test/ELF/linkerscript/common-assign.s
+++ b/deps/lld/test/ELF/linkerscript/common-assign.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: echo "SECTIONS { . = SIZEOF_HEADERS; pfoo = foo; pbar = bar; }" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -symbols %t1 | FileCheck %s
+# RUN: llvm-readobj --symbols %t1 | FileCheck %s
 
 # CHECK:       Symbol {
 # CHECK:         Name: bar
diff --git a/deps/lld/test/ELF/linkerscript/common-exclude.s b/deps/lld/test/ELF/linkerscript/common-exclude.s
index ef2d51b1b22951fd73624c3a4ce63f3c90371af7..23faa54913275fcbdf16297343f9876bbdc8a864 100644
--- a/deps/lld/test/ELF/linkerscript/common-exclude.s
+++ b/deps/lld/test/ELF/linkerscript/common-exclude.s
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/common-filespec2.s -o %tfile2.o
 # RUN: echo "SECTIONS { .common.incl : { *(EXCLUDE_FILE (*file2.o) COMMON) } .common.excl : { *(COMMON) } }" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %tfile0.o %tfile1.o %tfile2.o
-# RUN: llvm-readobj -s -t %t1 | FileCheck %s
+# RUN: llvm-readobj -S --symbols %t1 | FileCheck %s
 
 # Commons from file0 and file1 are not excluded, so they must be in .common.incl
 # Commons from file2 are excluded from the first rule and should be caught by
diff --git a/deps/lld/test/ELF/linkerscript/common-filespec.test b/deps/lld/test/ELF/linkerscript/common-filespec.test
index 2afd91d3d5b73a7dd86ed9572a5e767bbf38ebdb..99462dee9e086e9a06a662f5939bd1b3de77bcc5 100644
--- a/deps/lld/test/ELF/linkerscript/common-filespec.test
+++ b/deps/lld/test/ELF/linkerscript/common-filespec.test
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/common-filespec1.s -o %tfile1.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/common-filespec2.s -o %tfile2.o
 # RUN: ld.lld -o %t1 --script %s %tfile0.o %tfile1.o %tfile2.o
-# RUN: llvm-readobj -s -t %t1 | FileCheck %s
+# RUN: llvm-readobj -S --symbols %t1 | FileCheck %s
 
 SECTIONS {
   .common_0 : { *file0.o(COMMON) }
diff --git a/deps/lld/test/ELF/linkerscript/common.s b/deps/lld/test/ELF/linkerscript/common.s
index 52f0371526c40ec16da393b04686dc0a6285c5f1..04b667f659128adbfe56d7e8be60b504abbb4025 100644
--- a/deps/lld/test/ELF/linkerscript/common.s
+++ b/deps/lld/test/ELF/linkerscript/common.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: echo "SECTIONS { . = SIZEOF_HEADERS; .common : { *(COMMON) } }" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -s -t %t1 | FileCheck %s
+# RUN: llvm-readobj -S --symbols %t1 | FileCheck %s
 
 # CHECK:       Section {
 # CHECK:         Index:
diff --git a/deps/lld/test/ELF/linkerscript/compress-debug-sections.s b/deps/lld/test/ELF/linkerscript/compress-debug-sections.s
index 5e8cd004068d90d7a63ba628e826001b49f5aec1..305ff830f2cf0717327cf387ea398a4dcd1cfa49 100644
--- a/deps/lld/test/ELF/linkerscript/compress-debug-sections.s
+++ b/deps/lld/test/ELF/linkerscript/compress-debug-sections.s
@@ -11,12 +11,12 @@
 # RUN: echo "SECTIONS { }" > %t.script
 # RUN: ld.lld -O0 %t1.o %t2.o %t.script -o %t1 --compress-debug-sections=zlib
 # RUN: llvm-dwarfdump -a %t1 | FileCheck %s
-# RUN: llvm-readobj -s %t1 | FileCheck %s --check-prefix=ZLIBFLAGS
+# RUN: llvm-readobj -S %t1 | FileCheck %s --check-prefix=ZLIBFLAGS
 
 # RUN: echo "SECTIONS { .debug_str 0 : { *(.debug_str) } }" > %t2.script
 # RUN: ld.lld -O0 %t1.o %t2.o %t2.script -o %t2 --compress-debug-sections=zlib
 # RUN: llvm-dwarfdump -a %t2 | FileCheck %s
-# RUN: llvm-readobj -s %t2 | FileCheck %s --check-prefix=ZLIBFLAGS
+# RUN: llvm-readobj -S %t2 | FileCheck %s --check-prefix=ZLIBFLAGS
 
 # CHECK:       .debug_str contents:
 # CHECK-NEXT:    CCC
diff --git a/deps/lld/test/ELF/linkerscript/copy-rel-symbol-value.s b/deps/lld/test/ELF/linkerscript/copy-rel-symbol-value.s
index 64627b42f8854310d607feb68fb6ec47d1dd5648..4fe338738b6a5150eb828583ec0c576d0efd538c 100644
--- a/deps/lld/test/ELF/linkerscript/copy-rel-symbol-value.s
+++ b/deps/lld/test/ELF/linkerscript/copy-rel-symbol-value.s
@@ -4,7 +4,7 @@
 # RUN: ld.lld %t2.o -o %t2.so -shared
 # RUN: echo "SECTIONS { . = . + SIZEOF_HEADERS; foo = bar; }" > %t.script
 # RUN: ld.lld %t.o %t2.so --script %t.script -o %t
-# RUN: llvm-readobj -t %t | FileCheck %s
+# RUN: llvm-readobj --symbols %t | FileCheck %s
 
 # CHECK:      Name: bar
 # CHECK-NEXT: Value: 0x[[VAL:.*]]
diff --git a/deps/lld/test/ELF/linkerscript/data-segment-relro.test b/deps/lld/test/ELF/linkerscript/data-segment-relro.test
index aeaf085408713475f56aafd514badfbe6545ad30..a74cb4ae49a2127d4204dd1eab91650b9fd74a51 100644
--- a/deps/lld/test/ELF/linkerscript/data-segment-relro.test
+++ b/deps/lld/test/ELF/linkerscript/data-segment-relro.test
@@ -7,10 +7,10 @@
 ## page boundary.
 
 # RUN: ld.lld --hash-style=sysv -z norelro %t1.o %t2.so --script %s -o %t
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 # RUN: ld.lld --hash-style=sysv -z relro %t1.o %t2.so --script %s -o %t2
-# RUN: llvm-readobj -s %t2 | FileCheck %s
+# RUN: llvm-readobj -S %t2 | FileCheck %s
 
 SECTIONS {
   . = SIZEOF_HEADERS;
diff --git a/deps/lld/test/ELF/linkerscript/defsym.s b/deps/lld/test/ELF/linkerscript/defsym.s
index 467adaeea2f82a351a3eb0f104d947a1066860a9..8dd27479efc84d6e9a7bcf22df3d37a8d11cd379 100644
--- a/deps/lld/test/ELF/linkerscript/defsym.s
+++ b/deps/lld/test/ELF/linkerscript/defsym.s
@@ -7,13 +7,13 @@
 
 ## Check that linker script can override -defsym assignments.
 # RUN: ld.lld %t.o -defsym=foo=0x11 -script %t.script -o %t
-# RUN: llvm-readobj -t %t | FileCheck %s
+# RUN: llvm-readobj --symbols %t | FileCheck %s
 # CHECK:      Name: foo
 # CHECK-NEXT:   Value: 0x22
 
 ## Check that -defsym can override linker script. Check that multiple
 ## -defsym commands for the same symbol are allowed.
 # RUN: ld.lld %t.o -script %t.script -defsym=foo=0x11 -defsym=foo=0x33 -o %t
-# RUN: llvm-readobj -t %t | FileCheck %s --check-prefix=REORDER
+# RUN: llvm-readobj --symbols %t | FileCheck %s --check-prefix=REORDER
 # REORDER:      Name: foo
 # REORDER-NEXT:   Value: 0x33
diff --git a/deps/lld/test/ELF/linkerscript/discard-interp.test b/deps/lld/test/ELF/linkerscript/discard-interp.test
index 02e97b99958c80718afc0e5f07f23cf5a4dc88d5..97df880684060a6849c13c54baa2810864867c63 100644
--- a/deps/lld/test/ELF/linkerscript/discard-interp.test
+++ b/deps/lld/test/ELF/linkerscript/discard-interp.test
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %p/../Inputs/shared.s -o %t2.o
 # RUN: ld.lld -shared %t2.o -o %t2.so
 # RUN: ld.lld -dynamic-linker foo -rpath bar -rpath baz --script %s --export-dynamic %t.o %t2.so -o %t
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 # CHECK-NOT:        Name: .interp
 
diff --git a/deps/lld/test/ELF/linkerscript/discard-phdr.s b/deps/lld/test/ELF/linkerscript/discard-phdr.s
new file mode 100644
index 0000000000000000000000000000000000000000..dc2c8235fcd179d325a061d344a14bd9ffa5d1b5
--- /dev/null
+++ b/deps/lld/test/ELF/linkerscript/discard-phdr.s
@@ -0,0 +1,36 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: echo "PHDRS { \
+# RUN:   exec PT_LOAD FLAGS(0x4 | 0x1); \
+# RUN: } \
+# RUN: SECTIONS { \
+# RUN:  .text : { *(.text) } :exec \
+# RUN:  .foo : { *(.foo) } \
+# RUN:  .bar : { *(.bar) } \
+# RUN:  /DISCARD/ : { *(.discard) } :NONE \
+# RUN: }" > %t.script
+# RUN: ld.lld -o %t --script %t.script %t.o
+# RUN: llvm-readelf -S -l %t | FileCheck --implicit-check-not=/DISCARD/ %s
+
+## Check that /DISCARD/ does not interfere with the assignment of segments to
+## sections.
+
+# CHECK: Section Headers
+# CHECK: .text
+# CHECK-NEXT: .foo
+# CHECK-NEXT: .bar
+
+# CHECK: Segment Sections
+# CHECK-NEXT: .text .foo .bar
+
+.section .text,"ax"
+ ret
+
+.section .foo,"a"
+ .byte 0
+
+.section .bar,"ax"
+ ret
+
+.section .discard
+ .byte 0
diff --git a/deps/lld/test/ELF/linkerscript/dot-is-not-abs.s b/deps/lld/test/ELF/linkerscript/dot-is-not-abs.s
index a93d1c8b4344fc6eba2a58792d195c475dc5328c..dd23ed92cb9c8dd407f607c3b6be42089ff53f78 100644
--- a/deps/lld/test/ELF/linkerscript/dot-is-not-abs.s
+++ b/deps/lld/test/ELF/linkerscript/dot-is-not-abs.s
@@ -3,7 +3,7 @@
 
 # RUN: echo "SECTIONS { .text : { *(.text) } foo = .; .bar : { *(.bar) } }" > %t1.script
 # RUN: ld.lld -o %t1 --script %t1.script %t.o -shared
-# RUN: llvm-readobj -t -s -section-data %t1 | FileCheck %s
+# RUN: llvm-readobj --symbols -S --section-data %t1 | FileCheck %s
 
 .hidden foo
 .long foo - .
diff --git a/deps/lld/test/ELF/linkerscript/dynamic-sym.s b/deps/lld/test/ELF/linkerscript/dynamic-sym.s
index e3193b1a765d2bc9d08fcdbc350671799647d151..d59c569c7585260921449cd86bcb48ed96ec534a 100644
--- a/deps/lld/test/ELF/linkerscript/dynamic-sym.s
+++ b/deps/lld/test/ELF/linkerscript/dynamic-sym.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "_DYNAMIC = 0x123;" > %t.script
 # RUN: ld.lld -T %t.script %t.o -shared -o %t.so
-# RUN: llvm-readobj -t %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols %t.so | FileCheck %s
 
 # CHECK:      Symbol {
 # CHECK:        Name: _DYNAMIC
diff --git a/deps/lld/test/ELF/linkerscript/dynamic.s b/deps/lld/test/ELF/linkerscript/dynamic.s
index ab65ab831f8f52eae11f214b1956d1d30f60558d..d236fba77b0840d6e5b3e1ada8dcae53e3bfbe0d 100644
--- a/deps/lld/test/ELF/linkerscript/dynamic.s
+++ b/deps/lld/test/ELF/linkerscript/dynamic.s
@@ -5,7 +5,7 @@
 
 # RUN: echo "SECTIONS { }" > %t.script
 # RUN: ld.lld %t1.o %t2.so -o %t
-# RUN: llvm-readobj -dynamic-table %t | FileCheck %s
+# RUN: llvm-readobj --dynamic-table %t | FileCheck %s
 
 # CHECK:      DynamicSection [
 # CHECK-NEXT:  Tag                 Type             Name/Value
diff --git a/deps/lld/test/ELF/linkerscript/eh-frame-merge.s b/deps/lld/test/ELF/linkerscript/eh-frame-merge.s
new file mode 100644
index 0000000000000000000000000000000000000000..ac25399df41788d3c647214d21c020c53eb3e1ce
--- /dev/null
+++ b/deps/lld/test/ELF/linkerscript/eh-frame-merge.s
@@ -0,0 +1,20 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: echo "SECTIONS { .eh_frame_hdr : { *(.eh_frame_hdr) *(.eh_frame) } }" > %t.script
+# RUN: ld.lld -o %t --no-threads --eh-frame-hdr --script %t.script %t.o
+# RUN: llvm-readobj -S -u %t | FileCheck %s
+
+# CHECK: Name: .dah
+# CHECK-NOT: Section
+# CHECK: Address: 0x4D
+
+# CHECK: initial_location: 0x4d
+
+.global _start
+_start:
+ nop
+
+.section .dah,"ax",@progbits
+.cfi_startproc
+ nop
+.cfi_endproc
diff --git a/deps/lld/test/ELF/linkerscript/ehdr_start.s b/deps/lld/test/ELF/linkerscript/ehdr_start.s
index 4da158a8395613fd8523fc1718ab1cac8f0610c2..c1791d28e626b3e73f6d003465b055968a1c979e 100644
--- a/deps/lld/test/ELF/linkerscript/ehdr_start.s
+++ b/deps/lld/test/ELF/linkerscript/ehdr_start.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: echo "SECTIONS { }" > %t.script
 # RUN: ld.lld %t.o -script %t.script -o %t
-# RUN: llvm-readobj -symbols %t | FileCheck %s
+# RUN: llvm-readobj --symbols %t | FileCheck %s
 # CHECK:    Name: __ehdr_start (1)
 # CHECK-NEXT:    Value: 0x0
 # CHECK-NEXT:    Size: 0
diff --git a/deps/lld/test/ELF/linkerscript/emit-reloc.s b/deps/lld/test/ELF/linkerscript/emit-reloc.s
index 43ab4e8e47d8569a2a11742c5f44b28fbed414ae..4e59588608925fa4a5e8140a5b2be66a97cd566a 100644
--- a/deps/lld/test/ELF/linkerscript/emit-reloc.s
+++ b/deps/lld/test/ELF/linkerscript/emit-reloc.s
@@ -9,9 +9,9 @@
 
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
-# CHECK-NEXT:     0x68 R_X86_64_64 .foo 0x0
+# CHECK-NEXT:     0xF8 R_X86_64_64 .foo 0x0
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section ({{.*}}) .rela.data {
-# CHECK-NEXT:     0x68 R_X86_64_64 .foo 0x0
+# CHECK-NEXT:     0xF8 R_X86_64_64 .foo 0x0
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
diff --git a/deps/lld/test/ELF/linkerscript/empty-link-order.test b/deps/lld/test/ELF/linkerscript/empty-link-order.test
index b63b60ca8c151b28766b44ea5baa4b86ba312487..908f86b0e13b9b0a53799b46a1d7b32c108d49b4 100644
--- a/deps/lld/test/ELF/linkerscript/empty-link-order.test
+++ b/deps/lld/test/ELF/linkerscript/empty-link-order.test
@@ -11,7 +11,7 @@ SECTIONS {
 # RUN: ld.lld %t.o -o %t --script %s
 
 ## Check we do not crash and do not set SHF_LINK_ORDER flag for .foo
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 # CHECK:      Section {
 # CHECK:       Index:
 # CHECK:       Name: .foo
diff --git a/deps/lld/test/ELF/linkerscript/empty-relaplt-dyntags.test b/deps/lld/test/ELF/linkerscript/empty-relaplt-dyntags.test
new file mode 100644
index 0000000000000000000000000000000000000000..3836dfb02d02bf3b257d48d428c412146ae8c9a9
--- /dev/null
+++ b/deps/lld/test/ELF/linkerscript/empty-relaplt-dyntags.test
@@ -0,0 +1,44 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux /dev/null -o %t.o
+# RUN: ld.lld -shared %t.o -T %s -o %t
+# RUN: llvm-readobj --dynamic-table --sections %t | FileCheck %s
+
+## In spite of .rela.plt is empty, it might have been preserved because it is
+## mentioned in the linker script. However, even in that case, we should not
+## produce DT_JMPREL and DT_PLTGOT tags because this can cause a dynamic loader
+## to write into slots in .got.plt it considers reserved to support lazy symbol
+## resolution. In fact, as .got.plt is also empty, that memory might be
+## allocated for something else.
+
+# CHECK: Sections [
+# CHECK:      Name: .rela.plt
+# CHECK-NEXT: Type: SHT_RELA
+# CHECK-NEXT: Flags [
+# CHECK-NEXT:   SHF_ALLOC
+# CHECK-NEXT: ]
+# CHECK-NEXT: Address:
+# CHECK-NEXT: Offset:
+# CHECK-NEXT: Size: 0
+# CHECK:      Name: .got.plt
+# CHECK-NEXT: Type: SHT_PROGBITS
+# CHECK-NEXT: Flags [
+# CHECK-NEXT:   SHF_ALLOC
+# CHECK-NEXT:   SHF_WRITE
+# CHECK-NEXT: ]
+# CHECK-NEXT: Address:
+# CHECK-NEXT: Offset:
+# CHECK-NEXT: Size: 0
+
+# CHECK: DynamicSection [
+# CHECK-NOT: JMPREL
+# CHECK-NOT: PLTGOT
+
+PHDRS {
+  all PT_LOAD;
+  dyn PT_DYNAMIC;
+}
+SECTIONS {
+  .rela.plt : { *(.rela.plt) }: all
+  .dynamic : { *(.dynamic) }: all : dyn
+  .got.plt : {*(.got.plt)}: all
+}
diff --git a/deps/lld/test/ELF/linkerscript/empty-section-size.test b/deps/lld/test/ELF/linkerscript/empty-section-size.test
index 665ddf1ddf0106003894f6d5fc5566c6cc13a201..632b85db7a7c951ba3b1e90c26d10c79ef0723c7 100644
--- a/deps/lld/test/ELF/linkerscript/empty-section-size.test
+++ b/deps/lld/test/ELF/linkerscript/empty-section-size.test
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux /dev/null -o %t.o
 # RUN: ld.lld %t.o --script %s -o %t1
-# RUN: llvm-readobj -symbols %t1 | FileCheck %s
+# RUN: llvm-readobj --symbols %t1 | FileCheck %s
 
 ## We had a bug when LLD increased the size of the output section even
 ## if it was empty. That happened because of empty synthetic sections included.
diff --git a/deps/lld/test/ELF/linkerscript/empty-sections-expressions.test b/deps/lld/test/ELF/linkerscript/empty-sections-expressions.test
new file mode 100644
index 0000000000000000000000000000000000000000..3f1da48f325a90b7c3a55c9e8bcae528509a7aac
--- /dev/null
+++ b/deps/lld/test/ELF/linkerscript/empty-sections-expressions.test
@@ -0,0 +1,24 @@
+# REQUIRES: x86
+# RUN: echo ".text; nop; .data; .byte 0" \
+# RUN:   | llvm-mc -filetype=obj -triple=x86_64-pc-linux - -o %t.o
+# RUN: ld.lld -o %t --script %s %t.o
+# RUN: llvm-readelf -program-headers %t | FileCheck %s
+
+## Check we do not remove the empty output sections used in LOADADDR/ADDR
+## expressions and hence can evaluate the correct addresses.
+
+# CHECK:      Program Headers:
+# CHECK-NEXT:  Type Offset   VirtAddr           PhysAddr
+# CHECK-NEXT:  LOAD 0x001000 0x0000000000080000 0x0000000000080000
+# CHECK-NEXT:  LOAD 0x001001 0x0000000000080001 0x0000000000082000
+
+# CHECK:      Section to Segment mapping:
+# CHECK:       00 .empty .text
+# CHECK-NEXT:  01 .data
+
+SECTIONS {
+ . = 0x00080000;
+ .empty  : { *(.empty ) }
+ .text   : AT(LOADADDR(.empty) + SIZEOF(.empty)) { *(.text) }
+ .data   : AT(ADDR(.empty) + 0x2000) { *(.data) }
+}
diff --git a/deps/lld/test/ELF/linkerscript/empty-synthetic-removed-flags.s b/deps/lld/test/ELF/linkerscript/empty-synthetic-removed-flags.s
index 54a8baba3bec8a07b23412fe43279dac67f34ad2..b8d72702425f19f2b31d7c887c6d2425cb499a4d 100644
--- a/deps/lld/test/ELF/linkerscript/empty-synthetic-removed-flags.s
+++ b/deps/lld/test/ELF/linkerscript/empty-synthetic-removed-flags.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: echo "SECTIONS { .foo : { *(.foo) } .bar : { *(.got.plt) BYTE(0x11) }}" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 ## We have ".got.plt" synthetic section with SHF_ALLOC|SHF_WRITE flags.
 ## It is empty, so linker removes it, but it has to keep ".got.plt" output
@@ -21,7 +21,7 @@
 ## Check flags are not the same if we omit empty synthetic section in script.
 # RUN: echo "SECTIONS { .foo : { *(.foo) } .bar : { BYTE(0x11) }}" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readobj -s %t | FileCheck --check-prefix=EMPTY %s
+# RUN: llvm-readobj -S %t | FileCheck --check-prefix=EMPTY %s
 
 # EMPTY:     Section {
 # EMPTY:       Index: 2
diff --git a/deps/lld/test/ELF/linkerscript/entry.s b/deps/lld/test/ELF/linkerscript/entry.s
index d75b1345a8aaa180ef46a84eb83b512809a34265..15ad313c8056f1fb38153a18d98ec0c1650a67ca 100644
--- a/deps/lld/test/ELF/linkerscript/entry.s
+++ b/deps/lld/test/ELF/linkerscript/entry.s
@@ -14,7 +14,7 @@
 # -e has precedence over linker script's ENTRY.
 # RUN: echo "ENTRY(_label)" > %t.script
 # RUN: ld.lld -e _start -o %t2 %t.script %t
-# RUN: llvm-readobj -file-headers -symbols %t2 | \
+# RUN: llvm-readobj --file-headers --symbols %t2 | \
 # RUN:   FileCheck -check-prefix=OVERLOAD %s
 
 # OVERLOAD: Entry: [[ENTRY:0x[0-9A-F]+]]
@@ -24,7 +24,7 @@
 # The entry symbol can be a linker-script-defined symbol.
 # RUN: echo "ENTRY(foo); foo = 1;" > %t.script
 # RUN: ld.lld -o %t2 %t.script %t
-# RUN: llvm-readobj -file-headers -symbols %t2 | \
+# RUN: llvm-readobj --file-headers --symbols %t2 | \
 # RUN:   FileCheck -check-prefix=SCRIPT %s
 
 # SCRIPT: Entry: 0x1
diff --git a/deps/lld/test/ELF/linkerscript/excludefile.s b/deps/lld/test/ELF/linkerscript/excludefile.s
index 95b9534d9535ac7dd9a3cf1def818814e088b963..3f8e55efd0b833b059042246b6963bc9d25431e2 100644
--- a/deps/lld/test/ELF/linkerscript/excludefile.s
+++ b/deps/lld/test/ELF/linkerscript/excludefile.s
@@ -10,6 +10,7 @@
 # RUN: llvm-objdump -d %t | FileCheck %s
 
 # CHECK: Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK: _start:
 # CHECK-NEXT: :       48 c7 c0 3c 00 00 00    movq    $60, %rax
 # CHECK-NEXT: :       48 c7 c7 2a 00 00 00    movq    $42, %rdi
@@ -30,6 +31,7 @@
 # RUN: llvm-objdump -d %t4 | FileCheck %s --check-prefix=EXCLUDE
 
 # EXCLUDE: Disassembly of section .patatino:
+# EXCLUDE-EMPTY:
 # EXCLUDE: _start:
 # EXCLUDE-NEXT: :       48 c7 c0 3c 00 00 00    movq    $60, %rax
 # EXCLUDE-NEXT: :       48 c7 c7 2a 00 00 00    movq    $42, %rdi
@@ -39,6 +41,7 @@
 # EXCLUDE-NEXT: :       90      nop
 # EXCLUDE-NEXT: :       90      nop
 # EXCLUDE: Disassembly of section .text:
+# EXCLUDE-EMPTY:
 # EXCLUDE: tomato:
 # EXCLUDE-NEXT: :       b8 01 00 00 00  movl    $1, %eax
 
diff --git a/deps/lld/test/ELF/linkerscript/extend-pt-load1.test b/deps/lld/test/ELF/linkerscript/extend-pt-load1.test
index a1359eace18673f0a12194adf0b02a5d921d306d..c39e0244ec2c5c2d3d04237a6fe7b26a18dabfa2 100644
--- a/deps/lld/test/ELF/linkerscript/extend-pt-load1.test
+++ b/deps/lld/test/ELF/linkerscript/extend-pt-load1.test
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/extend-pt-load.s -o %t.o
 # RUN: ld.lld --hash-style=sysv -o %t1 --script %s %t.o -shared
-# RUN: llvm-readobj --elf-output-style=GNU -l -s %t1 | FileCheck %s
+# RUN: llvm-readelf -S -l %t1 | FileCheck %s
 
 # This test demonstrates an odd consequence of the way we handle sections with just symbol
 # assignments.
diff --git a/deps/lld/test/ELF/linkerscript/extend-pt-load2.test b/deps/lld/test/ELF/linkerscript/extend-pt-load2.test
index 1aa943703f27c984aae6a15163e70719e4a67407..4fbeb505b1786709695a2acf07c932180da98625 100644
--- a/deps/lld/test/ELF/linkerscript/extend-pt-load2.test
+++ b/deps/lld/test/ELF/linkerscript/extend-pt-load2.test
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/extend-pt-load.s -o %t.o
 # RUN: ld.lld --hash-style=sysv -o %t2 --script %s %t.o -shared
-# RUN: llvm-readobj --elf-output-style=GNU -l -s %t2 | FileCheck %s
+# RUN: llvm-readelf -S -l %t2 | FileCheck %s
 
 # Then add the section bar. Note how bar is given AX flags, which causes the PT_LOAD to now
 # cover the padding bits created by ALIGN.
@@ -17,8 +17,8 @@ SECTIONS {
 }
 
 # CHECK:      .text        PROGBITS 00000000000001bc 0001bc 000001 00 AX
-# CHECK-NEXT: bar          NOBITS   00000000000001bd 0001bd 000e43 00 AX
+# CHECK-NEXT: bar          PROGBITS 00000000000001bd 0001bd 000e43 00 AX
 # CHECK-NEXT: .data.rel.ro PROGBITS 0000000000001000 001000 000001 00 WA
 
-# CHECK:      LOAD 0x000000 0x0000000000000000 0x0000000000000000 0x0001bd 0x001000 R E
+# CHECK:      LOAD 0x000000 0x0000000000000000 0x0000000000000000 0x001000 0x001000 R E
 # CHECK-NEXT: LOAD 0x001000 0x0000000000001000 0x0000000000001000 0x000068 0x000068 RW
diff --git a/deps/lld/test/ELF/linkerscript/extend-pt-load3.test b/deps/lld/test/ELF/linkerscript/extend-pt-load3.test
index 1b7ef6fdbf94f4aba07787a03c61b0d5ba73da5e..9dd4ab8e0c43fd0f1bfe8e70573e43286195dfe2 100644
--- a/deps/lld/test/ELF/linkerscript/extend-pt-load3.test
+++ b/deps/lld/test/ELF/linkerscript/extend-pt-load3.test
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/extend-pt-load.s -o %t.o
 # RUN: ld.lld --hash-style=sysv -o %t3 --script %s %t.o -shared
-# RUN: llvm-readobj --elf-output-style=GNU -l -s %t3 | FileCheck --check-prefix=CHECK %s
+# RUN: llvm-readelf -S -l %t3 | FileCheck --check-prefix=CHECK %s
 
 # If the current behavior becomes a problem we should consider just moving the commands out
 # of the section. That is, handle the above like the following test.
diff --git a/deps/lld/test/ELF/linkerscript/fill.test b/deps/lld/test/ELF/linkerscript/fill.test
index 5bf295ec9c149b06b09e6c1f8de6600e780b2e20..9ba3b2a7bf2ddd4f72249f2212c5d9ea7b9fba56 100644
--- a/deps/lld/test/ELF/linkerscript/fill.test
+++ b/deps/lld/test/ELF/linkerscript/fill.test
@@ -7,14 +7,19 @@ SECTIONS {
   .out : {
    FILL(0x11111111)
    . += 2;
+   FILL(0x10101010)
    *(.aaa)
    . += 4;
    *(.bbb)
    . += 4;
-   FILL(0x22222222);
+   FILL(0x22220000 + 0x2222);
    . += 4;
   }
 }
 
 # CHECK:      Contents of section .out:
 # CHECK-NEXT: 2222aa22 222222bb 22222222 22222222
+
+# RUN: echo 'SECTIONS { .out : { FILL 0x11111111 } }' > %t.script
+# RUN: not ld.lld -o /dev/null --script %t.script 2>&1 | FileCheck %s --check-prefix=ERR
+# ERR: ( expected, but got 0x11111111
diff --git a/deps/lld/test/ELF/linkerscript/header-addr.test b/deps/lld/test/ELF/linkerscript/header-addr.test
index 7994c0fc96536138b793b37251fc74e2fad347bc..85045c41d7213489554eb591bbc1eaeb5ce4dd60 100644
--- a/deps/lld/test/ELF/linkerscript/header-addr.test
+++ b/deps/lld/test/ELF/linkerscript/header-addr.test
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux /dev/null -o %t.o
 # RUN: ld.lld --hash-style=sysv -o %t.so --script %s %t.o -shared
-# RUN: llvm-readobj -program-headers %t.so | FileCheck %s
+# RUN: llvm-readobj -l %t.so | FileCheck %s
 
 PHDRS { all PT_LOAD PHDRS; }
 
@@ -28,7 +28,7 @@ SECTIONS {
 # CHECK-NEXT: ]
 
 # RUN: ld.lld --hash-style=sysv -o %t2.so --script %s %t.o -shared -z max-page-size=0x2000
-# RUN: llvm-readobj -program-headers %t2.so \
+# RUN: llvm-readobj -l %t2.so \
 # RUN:   | FileCheck --check-prefix=MAXPAGE %s
 
 # MAXPAGE:      ProgramHeaders [
diff --git a/deps/lld/test/ELF/linkerscript/header-phdr.test b/deps/lld/test/ELF/linkerscript/header-phdr.test
index 72be15b88a94da8951a943d684cbb27845586484..866e2d487b31afe328e29005015a9817347b408c 100644
--- a/deps/lld/test/ELF/linkerscript/header-phdr.test
+++ b/deps/lld/test/ELF/linkerscript/header-phdr.test
@@ -2,7 +2,7 @@
 # RUN: echo '.section .zed, "a"; .zero 4' \
 # RUN:   | llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t.o
 # RUN: ld.lld --script %s %t.o -o %t
-# RUN: llvm-readelf -l -S -W %t | FileCheck %s
+# RUN: llvm-readelf -S -l -W %t | FileCheck %s
 
 # CHECK: [ 1] .abc              PROGBITS        0000000000001000 001000 000004 00   A  0   0  1
 # CHECK: LOAD           0x000000 0x0000000000000000 0x0000000000000000 0x001004 0x001004 R E 0x1000
diff --git a/deps/lld/test/ELF/linkerscript/info-section-type.s b/deps/lld/test/ELF/linkerscript/info-section-type.s
index 16e663fc5d0ff29d96bc7567ba9d301304feb954..c9f56b0def11b97a403b12891dadc59c2fc90b62 100644
--- a/deps/lld/test/ELF/linkerscript/info-section-type.s
+++ b/deps/lld/test/ELF/linkerscript/info-section-type.s
@@ -6,7 +6,7 @@
 
 # RUN: echo "SECTIONS { .bar : { *(.foo) } };" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=DEFAULT
+# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=DEFAULT
 # DEFAULT:      Name: .bar
 # DEFAULT:      Type: SHT_PROGBITS
 # DEFAULT-NEXT: Flags [
@@ -15,7 +15,7 @@
 
 # RUN: echo "SECTIONS { .bar (COPY) : { *(.foo) } };" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=NONALLOC
+# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=NONALLOC
 # NONALLOC:      Name: .bar
 # NONALLOC:      Type: SHT_PROGBITS
 # NONALLOC-NEXT: Flags [
@@ -23,15 +23,19 @@
 
 # RUN: echo "SECTIONS { .bar (INFO) : { *(.foo) } };" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=NONALLOC
+# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=NONALLOC
 
 # RUN: echo "SECTIONS { .bar (OVERLAY) : { *(.foo) } };" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=NONALLOC
+# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=NONALLOC
+
+# RUN: echo "SECTIONS { .bar (INFO) : { . += 1; } };" > %t.script
+# RUN: ld.lld -o %t --script %t.script %t.o
+# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=NONALLOC
 
 # RUN: echo "SECTIONS { .bar 0x20000 (INFO) : { *(.foo) } };" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=NONALLOC
+# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=NONALLOC
 
 # RUN: echo "SECTIONS { .bar 0x20000 (BAR) : { *(.foo) } };" > %t.script
 # RUN: not ld.lld -o %t --script %t.script %t.o 2>&1 |\
diff --git a/deps/lld/test/ELF/linkerscript/insert-after.test b/deps/lld/test/ELF/linkerscript/insert-after.test
index 4260cd77f553bf54fa90ee02651805b30d3c403d..005c1500b1beabd4f0bb2439ce5c15c37cafbfe7 100644
--- a/deps/lld/test/ELF/linkerscript/insert-after.test
+++ b/deps/lld/test/ELF/linkerscript/insert-after.test
@@ -16,7 +16,7 @@ SECTIONS {
 # RUN: ld.lld %t1.o -o %t1 --script %p/Inputs/insert-after.script --script %s
 # RUN: llvm-objdump -section-headers %t1 | FileCheck %s
 # CHECK:      Sections:
-# CHECK-NEXT: Idx Name          Size      Address          Type
+# CHECK-NEXT: Idx Name          Size     VMA              Type
 # CHECK-NEXT:   0               00000000 0000000000000000
 # CHECK-NEXT:   1 .text         00000008 0000000000000000 TEXT
 # CHECK-NEXT:   2 .foo.text     00000008 0000000000000008 TEXT
diff --git a/deps/lld/test/ELF/linkerscript/insert-before.test b/deps/lld/test/ELF/linkerscript/insert-before.test
index 52317bef6ac0ad1ba66ebca1b84dad7d2155bfc1..24fdd69a80aca72839244c974fc281c1225d0e9f 100644
--- a/deps/lld/test/ELF/linkerscript/insert-before.test
+++ b/deps/lld/test/ELF/linkerscript/insert-before.test
@@ -16,7 +16,7 @@ SECTIONS {
 # RUN: ld.lld %t1.o -o %t1 --script %p/Inputs/insert-after.script --script %s
 # RUN: llvm-objdump -section-headers %t1 | FileCheck %s
 # CHECK:      Sections:
-# CHECK-NEXT: Idx Name          Size      Address          Type
+# CHECK-NEXT: Idx Name          Size     VMA         Type
 # CHECK-NEXT:   0               00000000 0000000000000000
 # CHECK-NEXT:   1 .foo.text     00000008 0000000000000000 TEXT
 # CHECK-NEXT:   2 .text         00000008 0000000000000008 TEXT
diff --git a/deps/lld/test/ELF/linkerscript/lazy-symbols.test b/deps/lld/test/ELF/linkerscript/lazy-symbols.test
index f409b839c4dd8b496edff33e924a681af44229cd..b10b3e002f1cb9cb7ef15c5205cee5b5c34195ba 100644
--- a/deps/lld/test/ELF/linkerscript/lazy-symbols.test
+++ b/deps/lld/test/ELF/linkerscript/lazy-symbols.test
@@ -4,7 +4,7 @@
 # RUN: llvm-ar rcs %tar %t1
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux /dev/null -o %t2
 # RUN: ld.lld %t2 %tar --script %s -o %tout
-# RUN: llvm-readobj -symbols %tout | FileCheck %s
+# RUN: llvm-readobj --symbols %tout | FileCheck %s
 
 foo = 1;
 
diff --git a/deps/lld/test/ELF/linkerscript/linkerscript.s b/deps/lld/test/ELF/linkerscript/linkerscript.s
index 39d2d4620a4f2d7ec0cc0ad060228e1224aaec40..5e1cf27f0762cea9d7cf1c72d7da35262572e51e 100644
--- a/deps/lld/test/ELF/linkerscript/linkerscript.s
+++ b/deps/lld/test/ELF/linkerscript/linkerscript.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux \
 # RUN:   %p/Inputs/libsearch-st.s -o %t2.o
 
-# RUN: echo "EXTERN( undef undef2 )" > %t.script
+# RUN: echo "EXTERN( undef undef2 \"undef3\" \"undef4@@other\")" > %t.script
 # RUN: ld.lld %t -o %t2 %t.script
 # RUN: llvm-readobj %t2 > /dev/null
 
diff --git a/deps/lld/test/ELF/linkerscript/locationcountererr2.s b/deps/lld/test/ELF/linkerscript/locationcountererr2.s
index 9efe86a7283b0378b891b326be5c09d7fb154b16..3a0c7692c54ecddd3ddcaaace801ee99584f6672 100644
--- a/deps/lld/test/ELF/linkerscript/locationcountererr2.s
+++ b/deps/lld/test/ELF/linkerscript/locationcountererr2.s
@@ -4,7 +4,7 @@
 # RUN: echo ". = 0x150; . = 0x10; .text : {} }" >> %t.script
 # RUN: ld.lld %t.o --script %t.script -o %t -shared
 # RUN: llvm-objdump -section-headers %t | FileCheck %s
-# CHECK:  Name   Size      Address
+# CHECK:  Name   Size   VMA
 # CHECK: .text 00000000 0000000000000010
 
 # RUN: echo "SECTIONS { . = 0x20; . = ASSERT(0x1, "foo"); }" > %t2.script
diff --git a/deps/lld/test/ELF/linkerscript/memory-at.test b/deps/lld/test/ELF/linkerscript/memory-at.test
index 0f06a6620a79296c0c3663dd8c3a52e4316dbf14..7a1b416391bdc7e9525dda6ff372aa603526f59c 100644
--- a/deps/lld/test/ELF/linkerscript/memory-at.test
+++ b/deps/lld/test/ELF/linkerscript/memory-at.test
@@ -3,7 +3,7 @@
 # RUN: echo '.section .data,"aw"; .quad 0' >> %t.s
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %t.s -o %t
 # RUN: ld.lld %t --script %s -o %t2
-# RUN: llvm-readobj -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj -l %t2 | FileCheck %s
 
 MEMORY {
   FLASH (rx) : ORIGIN = 0x1000, LENGTH = 0x100
diff --git a/deps/lld/test/ELF/linkerscript/memory-region-alignment.test b/deps/lld/test/ELF/linkerscript/memory-region-alignment.test
index ba9d4e3bab3f03376f27dc5e9a5383b9376097aa..f0540a7f11a7898c4495d56664ae7cdead260755 100644
--- a/deps/lld/test/ELF/linkerscript/memory-region-alignment.test
+++ b/deps/lld/test/ELF/linkerscript/memory-region-alignment.test
@@ -17,7 +17,7 @@ SECTIONS {
 }
 
 # RUN: ld.lld %t.o -o %t --script %s
-# RUN: llvm-readobj -sections %t | FileCheck %s
+# RUN: llvm-readobj --sections %t | FileCheck %s
 
 # CHECK:        Name: .foo
 # CHECK-NEXT:   Type: SHT_PROGBITS
diff --git a/deps/lld/test/ELF/linkerscript/memory3.s b/deps/lld/test/ELF/linkerscript/memory3.s
index 6a24313f0621098658e16021426fe7c5524483f7..3a4913724c5f628155c760d69aa06c49e4387669 100644
--- a/deps/lld/test/ELF/linkerscript/memory3.s
+++ b/deps/lld/test/ELF/linkerscript/memory3.s
@@ -14,7 +14,7 @@
 
 ## Check we place .text into first defined memory region with appropriate flags.
 # CHECK: Sections:
-# CHECK: Idx Name  Size      Address
+# CHECK: Idx Name  Size     VMA
 # CHECK:   0       00000000 0000000000000000
 # CHECK:   1 .text 00000001 0000000000001000
 
diff --git a/deps/lld/test/ELF/linkerscript/memory5.test b/deps/lld/test/ELF/linkerscript/memory5.test
index 150ddf0e833cc886b35c753872d404d0b54c3f37..fa921a72a0659d39e30ed69782ca9430a700ad06 100644
--- a/deps/lld/test/ELF/linkerscript/memory5.test
+++ b/deps/lld/test/ELF/linkerscript/memory5.test
@@ -5,9 +5,9 @@
 # RUN: llvm-objdump -section-headers %t.so | FileCheck %s
 
 # CHECK:      1 .text         00000001 0000000000042000
-# CHECK-NEXT: 2 .data         00000001 0000000000044001
+# CHECK-NEXT: 2 .data         00000001 0000000000042001
 
-## Test that assign to Dot changes the position in a memory region.
+## Test that assigning to Dot does not change the position in a memory region.
 
 MEMORY {
   ram (wxa) : ORIGIN = 0x42000, LENGTH = 0x100000
diff --git a/deps/lld/test/ELF/linkerscript/merge-sections.s b/deps/lld/test/ELF/linkerscript/merge-sections.s
index 8fb9e87d616a4d74790bead147837a2b3cf09fc3..b9ebfe79714ab330949ee1d9407371b7967c171d 100644
--- a/deps/lld/test/ELF/linkerscript/merge-sections.s
+++ b/deps/lld/test/ELF/linkerscript/merge-sections.s
@@ -6,7 +6,7 @@
 # RUN:   .foo : { begin = .; *(.foo.*) end = .;} \
 # RUN: }" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t -shared
-# RUN: llvm-readobj -s -t %t1 | FileCheck %s
+# RUN: llvm-readobj -S --symbols %t1 | FileCheck %s
 
 # CHECK:        Name: .foo
 # CHECK-NEXT:   Type: SHT_PROGBITS
@@ -32,10 +32,10 @@
 
 # Check that we don't crash with --gc-sections
 # RUN: ld.lld --gc-sections -o %t2 --script %t.script %t -shared
-# RUN: llvm-readobj -s -t %t2 | FileCheck %s --check-prefix=GC
+# RUN: llvm-readobj -S --symbols %t2 | FileCheck %s --check-prefix=GC
 
 # GC:        Name: .foo
-# GC-NEXT:   Type: SHT_NOBITS
+# GC-NEXT:   Type: SHT_PROGBITS
 # GC-NEXT:   Flags [
 # GC-NEXT:     SHF_ALLOC
 # GC-NEXT:   ]
diff --git a/deps/lld/test/ELF/linkerscript/multi-sections-constraint.s b/deps/lld/test/ELF/linkerscript/multi-sections-constraint.s
index bfedd10fc2854980fde0610f19257ef43209fa3d..c1a253a69c1cc5d21055c40c0ad60d5c7749f8fd 100644
--- a/deps/lld/test/ELF/linkerscript/multi-sections-constraint.s
+++ b/deps/lld/test/ELF/linkerscript/multi-sections-constraint.s
@@ -8,7 +8,7 @@
 # RUN: llvm-objdump -section-headers %t1 | FileCheck %s
 
 # CHECK:      Sections:
-# CHECK-NEXT: Idx Name          Size      Address          Type
+# CHECK-NEXT: Idx Name          Size      VMA          Type
 # CHECK: .aaa          00000010 0000000000002000 DATA
 
 
@@ -20,7 +20,7 @@
 # RUN: llvm-objdump -section-headers %t2 | FileCheck %s --check-prefix=REV
 
 # REV:      Sections:
-# REV-NEXT: Idx Name          Size      Address          Type
+# REV-NEXT: Idx Name          Size       VMA          Type
 # REV:  .aaa          00000010 0000000000001000 DATA
 
 .global _start
diff --git a/deps/lld/test/ELF/linkerscript/multiple-tbss.s b/deps/lld/test/ELF/linkerscript/multiple-tbss.s
index 6bbbca92c23997a6e9778a9cd32800f4b3ea4055..2ac0fd84fd94b996e29f8faeb17d5bbba7edd4f4 100644
--- a/deps/lld/test/ELF/linkerscript/multiple-tbss.s
+++ b/deps/lld/test/ELF/linkerscript/multiple-tbss.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "SECTIONS { }" > %t.script
 # RUN: ld.lld -T %t.script %t.o -o %t
-# RUN: llvm-readobj -l -s %t | FileCheck %s
+# RUN: llvm-readobj -S -l %t | FileCheck %s
 
 # CHECK:        Name: .tbss
 # CHECK-NEXT:   Type: SHT_NOBITS
diff --git a/deps/lld/test/ELF/linkerscript/nmagic-alignment.test b/deps/lld/test/ELF/linkerscript/nmagic-alignment.test
new file mode 100644
index 0000000000000000000000000000000000000000..9835004e23438b443131fca120f3acc61254aad7
--- /dev/null
+++ b/deps/lld/test/ELF/linkerscript/nmagic-alignment.test
@@ -0,0 +1,85 @@
+# REQUIRES: x86
+
+# Test that mimics a use case of -n to produce a kernel mapped shared-object
+# in a non paged context. We specifically want to test:
+# - We can allocate the headers into the first program header (via PHDRS)
+# typically -n does not allocate headers.
+# - The alignment of the .text section is not page aligned.
+
+# RUN: echo ".text; .globl foo; foo: nop" > %t.s
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %t.s -o %t.o
+# RUN: ld.lld %t.o -o %t.so --shared --hash-style=sysv --script %s
+# RUN: llvm-readobj --program-headers %t.so | FileCheck %s
+# RUN: ld.lld %t.o -o %t2.so --shared --hash-style=sysv -n --script %s
+# RUN: llvm-readobj --program-headers %t2.so | FileCheck %s --check-prefix=CHECK-N
+
+SECTIONS {
+ . = 0x0 + SIZEOF_HEADERS;
+ .hash : { *(.hash) } :text
+ .dynsym : { *(.dynsym) }
+ .dynstr : { *(.dynstr) }
+ . = ALIGN(4);
+ .text : { *(.text*) }
+ .dynamic : { *(.dynamic) } :text :dynamic
+}
+
+PHDRS {
+ text PT_LOAD FLAGS(5) FILEHDR PHDRS;
+ dynamic PT_DYNAMIC FLAGS(4);
+}
+
+# CHECK: ProgramHeaders [
+# CHECK-NEXT:   ProgramHeader {
+# CHECK-NEXT:     Type: PT_LOAD
+# CHECK-NEXT:     Offset: 0x0
+# CHECK-NEXT:     VirtualAddress: 0x0
+# CHECK-NEXT:     PhysicalAddress: 0x0
+# CHECK-NEXT:     FileSize:
+# CHECK-NEXT:     MemSize:
+# CHECK-NEXT:     Flags [
+# CHECK-NEXT:       PF_R
+# CHECK-NEXT:       PF_X
+# CHECK-NEXT:     ]
+# CHECK-NEXT:     Alignment: 4096
+# CHECK-NEXT:   }
+# CHECK-NEXT:   ProgramHeader {
+# CHECK-NEXT:     Type: PT_DYNAMIC
+# CHECK-NEXT:     Offset: 0x108
+# CHECK-NEXT:     VirtualAddress: 0x108
+# CHECK-NEXT:     PhysicalAddress: 0x108
+# CHECK-NEXT:     FileSize:
+# CHECK-NEXT:     MemSize:
+# CHECK-NEXT:     Flags [
+# CHECK-NEXT:       PF_R
+# CHECK-NEXT:     ]
+# CHECK-NEXT:     Alignment: 8
+# CHECK-NEXT:   }
+# CHECK-NEXT: ]
+
+# CHECK-N: ProgramHeaders [
+# CHECK-N-NEXT:   ProgramHeader {
+# CHECK-N-NEXT:     Type: PT_LOAD
+# CHECK-N-NEXT:     Offset: 0x0
+# CHECK-N-NEXT:     VirtualAddress: 0x0
+# CHECK-N-NEXT:     PhysicalAddress: 0x0
+# CHECK-N-NEXT:     FileSize: 360
+# CHECK-N-NEXT:     MemSize: 360
+# CHECK-N-NEXT:     Flags [
+# CHECK-N-NEXT:       PF_R
+# CHECK-N-NEXT:       PF_X
+# CHECK-N-NEXT:     ]
+# CHECK-N-NEXT:     Alignment: 8
+# CHECK-N-NEXT:   }
+# CHECK-N-NEXT:   ProgramHeader {
+# CHECK-N-NEXT:     Type: PT_DYNAMIC
+# CHECK-N-NEXT:     Offset: 0x108
+# CHECK-N-NEXT:     VirtualAddress: 0x108
+# CHECK-N-NEXT:     PhysicalAddress: 0x108
+# CHECK-N-NEXT:     FileSize:
+# CHECK-N-NEXT:     MemSize:
+# CHECK-N-NEXT:     Flags [
+# CHECK-N-NEXT:       PF_R
+# CHECK-N-NEXT:     ]
+# CHECK-N-NEXT:     Alignment: 8
+# CHECK-N-NEXT:   }
+# CHECK-N-NEXT: ]
diff --git a/deps/lld/test/ELF/linkerscript/noload.s b/deps/lld/test/ELF/linkerscript/noload.s
index bd49160d80bd1ff73a569cea6f32d51f1559d23c..18b509134afc0842be15d06b4f7579f20141ffe0 100644
--- a/deps/lld/test/ELF/linkerscript/noload.s
+++ b/deps/lld/test/ELF/linkerscript/noload.s
@@ -5,7 +5,7 @@
 # RUN:        .data_noload_b (0x10000) (NOLOAD) : { *(.data_noload_b) } \
 # RUN:        .text (0x20000) : { *(.text) } };" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readobj -sections -program-headers  %t | FileCheck %s
+# RUN: llvm-readobj --sections -l  %t | FileCheck %s
 
 # CHECK:      Section {
 # CHECK:        Index: 1
diff --git a/deps/lld/test/ELF/linkerscript/non-absolute.s b/deps/lld/test/ELF/linkerscript/non-absolute.s
index b4b25a7bbf8464f45be212179715706108c34773..7d3921c060e476a73d45a4ed6b000c9cca8ce586 100644
--- a/deps/lld/test/ELF/linkerscript/non-absolute.s
+++ b/deps/lld/test/ELF/linkerscript/non-absolute.s
@@ -3,11 +3,12 @@
 # RUN: echo "SECTIONS { A = . - 0x10; B = A + 0x1; }" > %t.script
 # RUN: ld.lld -shared %t1.o --script %t.script -o %t
 # RUN: llvm-objdump -d %t | FileCheck %s --check-prefix=DUMP
-# RUN: llvm-readobj -t %t | FileCheck %s --check-prefix=SYMBOL
+# RUN: llvm-readobj --symbols %t | FileCheck %s --check-prefix=SYMBOL
 
 # B = A + 0x1 = -0x10 + 0x1 = -0xf -> 0xFFFFFFFFFFFFFFF1
 # B - (0x94+6) = -0xf - (0x94+6) = -169
 # DUMP:       Disassembly of section .text:
+# DUMP-EMPTY:
 # DUMP-NEXT:  foo:
 # DUMP-NEXT:   94: {{.*}} -169(%rip), %eax
 
diff --git a/deps/lld/test/ELF/linkerscript/non-absolute2.test b/deps/lld/test/ELF/linkerscript/non-absolute2.test
index b60666412b8a9c5cc1e70bbb2b97b992ccf5e5c5..2d08354a0369458d825c63e08b50b93991b52dd4 100644
--- a/deps/lld/test/ELF/linkerscript/non-absolute2.test
+++ b/deps/lld/test/ELF/linkerscript/non-absolute2.test
@@ -9,7 +9,7 @@ SECTIONS {
 }
 
 # CHECK:       Sections:
-# CHECK-NEXT:  Idx Name          Size      Address
+# CHECK-NEXT:  Idx Name          Size     VMA
 # CHECK-NEXT:    0               00000000 0000000000000000
 # CHECK-NEXT:    1 .dynsym       00000030 0000000000001000
 # CHECK:         5 .text         00000000 000000000000106c
diff --git a/deps/lld/test/ELF/linkerscript/numbers.s b/deps/lld/test/ELF/linkerscript/numbers.s
index 98d7e3361343c07a02c0bfda5dee80a566a1ddb6..ceb85fd68d59b0994bfe8ca39fdc849cf48fac9d 100644
--- a/deps/lld/test/ELF/linkerscript/numbers.s
+++ b/deps/lld/test/ELF/linkerscript/numbers.s
@@ -18,7 +18,7 @@
 # RUN: llvm-objdump -section-headers %t2 | FileCheck %s
 
 # CHECK:     Sections:
-# CHECK-NEXT: Idx Name          Size      Address
+# CHECK-NEXT: Idx Name          Size     VMA
 # CHECK-NEXT:   0               00000000 0000000000000000
 # CHECK-NEXT:   1 .hex1         00000008 0000000000001000
 # CHECK-NEXT:   2 .hex2         00000008 0000000000001010
@@ -67,7 +67,7 @@
 # RUN: ld.lld %t --script %t8.script -o %t6
 # RUN: llvm-objdump -section-headers %t6 | FileCheck -check-prefix=SECADDR %s
 # SECADDR:     Sections:
-# SECADDR-NEXT: Idx Name          Size      Address
+# SECADDR-NEXT: Idx Name          Size     VMA
 # SECADDR-NEXT:   0               00000000 0000000000000000
 # SECADDR-NEXT:   1 .hex1         00000008 0000000000000400
 # SECADDR-NEXT:   2 .hex2         00000008 0000000000000500
diff --git a/deps/lld/test/ELF/linkerscript/obj-symbol-value.s b/deps/lld/test/ELF/linkerscript/obj-symbol-value.s
index 1c0b1190e815084ea5f02afcc699dc72d714961b..17c072a7567dd9e8e4639fd48f9ca1cfcabaaf89 100644
--- a/deps/lld/test/ELF/linkerscript/obj-symbol-value.s
+++ b/deps/lld/test/ELF/linkerscript/obj-symbol-value.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "SECTIONS { foo = bar; .bar : { *(.bar*) } }" > %t.script
 # RUN: ld.lld %t.o --script %t.script -o %t.so -shared
-# RUN: llvm-readobj -t %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols %t.so | FileCheck %s
 
 # CHECK:     Symbol {
 # CHECK:      Name: bar
diff --git a/deps/lld/test/ELF/linkerscript/openbsd-bootdata.test b/deps/lld/test/ELF/linkerscript/openbsd-bootdata.test
index 6846c7f22f8608877635396fa7b5adbabc52ef77..e0c647df45910bf50bc99d37592c1ec8f60f3a69 100644
--- a/deps/lld/test/ELF/linkerscript/openbsd-bootdata.test
+++ b/deps/lld/test/ELF/linkerscript/openbsd-bootdata.test
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux /dev/null -o %t.o
 # RUN: ld.lld --script %s %t.o -o %t
-# RUN: llvm-readobj --program-headers -s %t | FileCheck %s
+# RUN: llvm-readobj --program-headers -S %t | FileCheck %s
 
 PHDRS { boot PT_OPENBSD_BOOTDATA; }
 
diff --git a/deps/lld/test/ELF/linkerscript/openbsd-randomize.s b/deps/lld/test/ELF/linkerscript/openbsd-randomize.s
index 575a6b25be78d6463d2b2ec970c7405db5b29dad..b473d5110615ec62882f8040e0f42d2dcbbf3fe6 100644
--- a/deps/lld/test/ELF/linkerscript/openbsd-randomize.s
+++ b/deps/lld/test/ELF/linkerscript/openbsd-randomize.s
@@ -5,7 +5,7 @@
 # RUN:         .text : { *(.text) } \
 # RUN:         .openbsd.randomdata : { *(.openbsd.randomdata) } : rand }" > %t.script
 # RUN: ld.lld --script %t.script %t.o -o %t
-# RUN: llvm-readobj --program-headers -s %t | FileCheck %s
+# RUN: llvm-readobj --program-headers -S %t | FileCheck %s
 
 # CHECK:      ProgramHeader {
 # CHECK:        Type: PT_OPENBSD_RANDOMIZE (0x65A3DBE6)
diff --git a/deps/lld/test/ELF/linkerscript/orphan-first-cmd.test b/deps/lld/test/ELF/linkerscript/orphan-first-cmd.test
index 84b183f96efb3ce0321ee8f37140ab88ea27fb47..c68312a116712fcb5f4b79a7d41d47896e9016da 100644
--- a/deps/lld/test/ELF/linkerscript/orphan-first-cmd.test
+++ b/deps/lld/test/ELF/linkerscript/orphan-first-cmd.test
@@ -2,7 +2,7 @@
 # RUN: echo '.section .bar, "aw"' \
 # RUN:   | llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t.o
 # RUN: ld.lld -o %t -T %s %t.o -shared
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 SECTIONS {
   foo = 123;
diff --git a/deps/lld/test/ELF/linkerscript/orphan-live-only.s b/deps/lld/test/ELF/linkerscript/orphan-live-only.s
new file mode 100644
index 0000000000000000000000000000000000000000..500005173a866820f5e53a1314918bce1a3bfd29
--- /dev/null
+++ b/deps/lld/test/ELF/linkerscript/orphan-live-only.s
@@ -0,0 +1,42 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: echo "PHDRS { \
+# RUN:   exec PT_LOAD FLAGS(0x4 | 0x1); \
+# RUN:   ro   PT_LOAD FLAGS(0x4); \
+# RUN: } \
+# RUN: SECTIONS { \
+# RUN:  .pad : { QUAD(0); } :exec \
+# RUN:  .text : { *(.text) } \
+# RUN:  .ro : { *(.ro) } :ro \
+# RUN: }" > %t.script
+# RUN: ld.lld -o %t --script %t.script %t.o
+# RUN: llvm-readelf -S -l %t | FileCheck %s
+
+## The ".pad" section is not "live" and should be ignored by the
+## orphan placement.
+##
+## Check that the orphan section is placed correctly and belongs to
+## the correct segment.
+
+# CHECK: Section Headers
+# CHECK: .pad
+# CHECK-NEXT: .text
+# CHECK-NEXT: .orphan2
+# CHECK-NEXT: .ro
+# CHECK-NEXT: .orphan1
+
+# CHECK: Segment Sections
+# CHECK-NEXT: .pad .text .orphan2
+# CHECK-NEXT: .ro .orphan1
+
+.section .text,"ax"
+ ret
+
+.section .ro,"a"
+ .byte 0
+
+.section .orphan1,"a"
+ .byte 0
+
+.section .orphan2,"ax"
+ ret
diff --git a/deps/lld/test/ELF/linkerscript/orphan-phdrs.s b/deps/lld/test/ELF/linkerscript/orphan-phdrs.s
index c889562d0fcc43aa2afc0442f88b23fcba2e64f6..8bfa24b0d033c5ce213b1b556f40c7338e20405a 100644
--- a/deps/lld/test/ELF/linkerscript/orphan-phdrs.s
+++ b/deps/lld/test/ELF/linkerscript/orphan-phdrs.s
@@ -23,13 +23,13 @@
 
 # CHECK: Segment Sections
 # CHECK-NEXT: .text .orphan
-# CHECK-NEXT: .rw
+# CHECK-NEXT: .empty .rw
 
-.section .text, "ax"
+.section .text,"ax"
  ret
 
-.section .rw, "aw"
+.section .rw,"aw"
  .quad 0
 
-.section .orphan, "ax"
+.section .orphan,"ax"
  ret
diff --git a/deps/lld/test/ELF/linkerscript/orphan-report.s b/deps/lld/test/ELF/linkerscript/orphan-report.s
index 903ef799e7a1f5c0d97cacc3aa0beda3bc7bd191..0791b286d90053fea037333f3aef8e75fea8f695 100644
--- a/deps/lld/test/ELF/linkerscript/orphan-report.s
+++ b/deps/lld/test/ELF/linkerscript/orphan-report.s
@@ -27,16 +27,16 @@
 # REPORT-NEXT: <internal>:(.dynamic) is being placed in '.dynamic'
 # REPORT-NEXT: <internal>:(.dynstr) is being placed in '.dynstr'
 # REPORT-NEXT: <internal>:(.rela.dyn) is being placed in '.rela.dyn'
-# REPORT-NEXT: <internal>:(.got) is being placed in '.got'
-# REPORT-NEXT: <internal>:(.got.plt) is being placed in '.got.plt'
-# REPORT-NEXT: <internal>:(.got.plt) is being placed in '.got.plt'
-# REPORT-NEXT: <internal>:(.rela.plt) is being placed in '.rela.plt'
-# REPORT-NEXT: <internal>:(.rela.plt) is being placed in '.rela.plt'
-# REPORT-NEXT: <internal>:(.plt) is being placed in '.plt'
-# REPORT-NEXT: <internal>:(.plt) is being placed in '.plt'
 # REPORT-NEXT: <internal>:(.eh_frame) is being placed in '.eh_frame'
+# REPORT-NEXT: <internal>:(.got) is being placed in '.got'
+# REPORT-NEXT: <internal>:(.got.plt) is being placed in '.got.plt'
+# REPORT-NEXT: <internal>:(.got.plt) is being placed in '.got.plt'
+# REPORT-NEXT: <internal>:(.rela.plt) is being placed in '.rela.plt'
+# REPORT-NEXT: <internal>:(.rela.plt) is being placed in '.rela.plt'
+# REPORT-NEXT: <internal>:(.plt) is being placed in '.plt'
+# REPORT-NEXT: <internal>:(.plt) is being placed in '.plt'
 # REPORT-NEXT: <internal>:(.symtab) is being placed in '.symtab'
-# REPORT-NEXT: <internal>:(.symtab_shndxr) is being placed in '.symtab_shndxr'
+# REPORT-NEXT: <internal>:(.symtab_shndx) is being placed in '.symtab_shndx'
 # REPORT-NEXT: <internal>:(.shstrtab) is being placed in '.shstrtab'
 # REPORT-NEXT: <internal>:(.strtab) is being placed in '.strtab'
 
diff --git a/deps/lld/test/ELF/linkerscript/orphan.s b/deps/lld/test/ELF/linkerscript/orphan.s
index 4dbaf37c687ef4d69ced1e6fe9e11cd683e99c43..8a61b74d56c4ff330fddfa1be53480d947aea0ae 100644
--- a/deps/lld/test/ELF/linkerscript/orphan.s
+++ b/deps/lld/test/ELF/linkerscript/orphan.s
@@ -9,15 +9,15 @@
 # RUN: ld.lld -o %t1 --script %t.script %t
 # RUN: llvm-objdump -section-headers %t1 | FileCheck %s
 
-## .jcr is a relro section and should be placed after other RW sections.
+## .jcr is a relro section and should be placed before other RW sections.
 ## .bss is SHT_NOBITS section and should be last RW section, so some space
 ## in ELF file could be saved.
 # CHECK:       0               00000000 0000000000000000
 # CHECK-NEXT:  1 .text         00000000 0000000000000000 TEXT
-# CHECK-NEXT:  2 .rw1          00000008 0000000000000000 DATA
-# CHECK-NEXT:  3 .rw2          00000008 0000000000000008 DATA
-# CHECK-NEXT:  4 .rw3          00000008 0000000000000010 DATA
-# CHECK-NEXT:  5 .jcr          00000008 0000000000000018 DATA
+# CHECK-NEXT:  2 .jcr          00000008 0000000000000000 DATA
+# CHECK-NEXT:  3 .rw1          00000008 0000000000000008 DATA
+# CHECK-NEXT:  4 .rw2          00000008 0000000000000010 DATA
+# CHECK-NEXT:  5 .rw3          00000008 0000000000000018 DATA
 # CHECK-NEXT:  6 .bss          00000008 0000000000000020 BSS
 
 .section .rw1, "aw"
diff --git a/deps/lld/test/ELF/linkerscript/out-of-order-section-in-region.test b/deps/lld/test/ELF/linkerscript/out-of-order-section-in-region.test
new file mode 100644
index 0000000000000000000000000000000000000000..e7ea39610ad5939140f12f876eff7785723e880f
--- /dev/null
+++ b/deps/lld/test/ELF/linkerscript/out-of-order-section-in-region.test
@@ -0,0 +1,20 @@
+# REQUIRES: x86
+
+# RUN: echo ".section .aaa, \"a\"; .quad 0; .section .bbb, \"a\"; .quad 0;" \
+# RUN:   | llvm-mc -filetype=obj -triple=x86_64-pc-linux - -o %t
+# RUN: ld.lld %t --script %s -o %t2
+
+# RUN: llvm-objdump -section-headers %t2 | FileCheck %s
+# CHECK: .aaa 00000008 0000000000001008 DATA
+# CHECK: .bbb 00000008 0000000000001000 DATA
+
+MEMORY {
+  REGION (rwx) : ORIGIN = 0x1000, LENGTH = 0x100
+}
+
+SECTIONS {
+  .aaa ORIGIN(REGION) + 0x8 : { *(.aaa) } > REGION
+  _stext = .;
+  .bbb ORIGIN(REGION) : { *(.bbb) } > REGION
+  . = _stext;
+}
diff --git a/deps/lld/test/ELF/linkerscript/out-of-order.s b/deps/lld/test/ELF/linkerscript/out-of-order.s
index da8c103bb47fbf5d2656ec03d8c6e9b6a6f7703f..6dc479b752903d5e4092796e8f9e9589fdd3b441 100644
--- a/deps/lld/test/ELF/linkerscript/out-of-order.s
+++ b/deps/lld/test/ELF/linkerscript/out-of-order.s
@@ -22,10 +22,10 @@
 # must take responsibility to make sure this does not happen.
 
 # CHECK:      Sections:
-# CHECK-NEXT: Idx Name          Size      Address          Type
+# CHECK-NEXT: Idx Name          Size     VMA              Type
 # CHECK-NEXT:   0               00000000 0000000000000000
-# CHECK-NEXT:   1 .data         00000008 0000000000004000
-# CHECK-NEXT:   2 .dynamic      00000060 0000000000004008
+# CHECK-NEXT:   1 .dynamic      00000060 0000000000000000
+# CHECK-NEXT:   2 .data         00000008 0000000000004000
 # CHECK-NEXT:   3 .dynsym       00000018 0000000000002000
 # CHECK-NEXT:   4 .dynstr       00000001 0000000000002018
 # CHECK-NEXT:   5 .hash         00000010 000000000000201c
diff --git a/deps/lld/test/ELF/linkerscript/output-too-large-32bit.s b/deps/lld/test/ELF/linkerscript/output-too-large-32bit.s
new file mode 100644
index 0000000000000000000000000000000000000000..a6224c4077a2b355febd9f49b087acea8fbd829e
--- /dev/null
+++ b/deps/lld/test/ELF/linkerscript/output-too-large-32bit.s
@@ -0,0 +1,11 @@
+# REQUIRES: x86 && !llvm-64-bits
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: echo "SECTIONS { .text : { . = 0x6fffffffffffffff; *(.text*); } }" > %t.script
+# RUN: not ld.lld --no-check-sections --script %t.script %t.o -o /dev/null 2>&1 | FileCheck %s
+
+# CHECK: output file too large
+
+.global _start
+_start:
+  nop
diff --git a/deps/lld/test/ELF/linkerscript/outsections-addr.s b/deps/lld/test/ELF/linkerscript/outsections-addr.s
index fda9bc9943403c5725e529922826f20da8ca4f77..a56cfc8a842d724af081129676e809b60fcf9e4b 100644
--- a/deps/lld/test/ELF/linkerscript/outsections-addr.s
+++ b/deps/lld/test/ELF/linkerscript/outsections-addr.s
@@ -7,7 +7,7 @@
 # RUN:   .ddd 0x5001 : { *(.ddd) } \
 # RUN: }" > %t.script
 # RUN: ld.lld %t --script %t.script -o %tout
-# RUN: llvm-readobj -s %tout | FileCheck %s
+# RUN: llvm-readobj -S %tout | FileCheck %s
 
 ## Check:
 ## 1) Simple constant as address.
diff --git a/deps/lld/test/ELF/linkerscript/overlapping-sections.s b/deps/lld/test/ELF/linkerscript/overlapping-sections.s
index 818301fd2b0e6864154ef16185153b7d563750d3..c13ce9259c41fab1490f3cabb443ecf78c746d0f 100644
--- a/deps/lld/test/ELF/linkerscript/overlapping-sections.s
+++ b/deps/lld/test/ELF/linkerscript/overlapping-sections.s
@@ -17,18 +17,18 @@
 
 # Verify that the .sec2 was indeed placed in a PT_LOAD where the PhysAddr
 # overlaps with where .sec1 is loaded:
-# RUN: llvm-readobj -sections -program-headers -elf-output-style=GNU %t.so | FileCheck %s -check-prefix BAD-LMA
+# RUN: llvm-readelf --sections -l %t.so | FileCheck %s -check-prefix BAD-LMA
 # BAD-LMA-LABEL: Section Headers:
 # BAD-LMA: .sec1             PROGBITS        0000000000008000 002000 000100 00  WA  0   0  1
 # BAD-LMA: .sec2             PROGBITS        0000000000008800 002800 000100 00  WA  0   0  1
 # BAD-LMA-LABEL: Program Headers:
 # BAD-LMA-NEXT:  Type           Offset   VirtAddr           PhysAddr           FileSiz  MemSiz   Flg Align
 # BAD-LMA-NEXT:  LOAD           0x001000 0x0000000000000000 0x0000000000000000 0x000100 0x000100 R E 0x1000
+# BAD-LMA-NEXT:  LOAD           0x001100 0x0000000000000100 0x0000000000000100 0x000070 0x000070 RW  0x1000
 # BAD-LMA-NEXT:  LOAD           0x002000 0x0000000000008000 0x0000000000008000 0x000100 0x000100 RW  0x1000
-# BAD-LMA-NEXT:  LOAD           0x002800 0x0000000000008800 0x0000000000008080 0x000170 0x000170 RW  0x1000
 # BAD-LMA-LABEL: Section to Segment mapping:
-# BAD-LMA:  01     .sec1
-# BAD-LMA:  02     .sec2 .dynamic
+# BAD-LMA:  01     .text .dynamic
+# BAD-LMA:  02     .sec1
 
 # Now try a script where the virtual memory addresses overlap but ensure that the
 # load addresses don't:
@@ -43,18 +43,18 @@
 
 # Check that the expected binary was created with --noinhibit-exec:
 # RUN: ld.lld -o %t.so --script %t-vaddr.script %t.o -shared --noinhibit-exec
-# RUN: llvm-readobj -sections -program-headers -elf-output-style=GNU %t.so | FileCheck %s -check-prefix BAD-VADDR
+# RUN: llvm-readelf --sections -l %t.so | FileCheck %s -check-prefix BAD-VADDR
 # BAD-VADDR-LABEL: Section Headers:
 # BAD-VADDR: .sec1             PROGBITS        0000000000008000 002000 000100 00  WA  0   0  1
 # BAD-VADDR: .sec2             PROGBITS        0000000000008020 003020 000100 00  WA  0   0  1
 # BAD-VADDR-LABEL: Program Headers:
 # BAD-VADDR-NEXT:  Type           Offset   VirtAddr           PhysAddr           FileSiz  MemSiz   Flg Align
 # BAD-VADDR-NEXT:  LOAD           0x001000 0x0000000000000000 0x0000000000000000 0x000100 0x000100 R E 0x1000
+# BAD-VADDR-NEXT:  LOAD           0x001100 0x0000000000000100 0x0000000000000100 0x000070 0x000070 RW  0x1000
 # BAD-VADDR-NEXT:  LOAD           0x002000 0x0000000000008000 0x0000000000008000 0x000100 0x000100 RW  0x1000
-# BAD-VADDR-NEXT:  LOAD           0x003020 0x0000000000008020 0x0000000000008800 0x000170 0x000170 RW  0x1000
 # BAD-VADDR-LABEL: Section to Segment mapping:
-# BAD-VADDR:  01     .sec1
-# BAD-VADDR:  02     .sec2 .dynamic
+# BAD-VADDR:  01     .text .dynamic
+# BAD-VADDR:  02     .sec1
 
 # Finally check the case where both LMA and vaddr overlap
 
@@ -91,16 +91,16 @@
 # Starting here the contents of .sec2 overwrites .sec1:
 # BROKEN-OUTPUT-FILE-NEXT: 8040 02020202 02020202 02020202 02020202
 
-# RUN: llvm-readobj -sections -program-headers -elf-output-style=GNU %t.so | FileCheck %s -check-prefix BAD-BOTH
+# RUN: llvm-readelf --sections -l %t.so | FileCheck %s -check-prefix BAD-BOTH
 # BAD-BOTH-LABEL: Section Headers:
 # BAD-BOTH: .sec1             PROGBITS        0000000000008000 002000 000100 00  WA  0   0  1
 # BAD-BOTH: .sec2             PROGBITS        0000000000008040 002040 000100 00  WA  0   0  1
 # BAD-BOTH-LABEL: Program Headers:
 # BAD-BOTH-NEXT:  Type           Offset   VirtAddr           PhysAddr           FileSiz  MemSiz   Flg Align
 # BAD-BOTH-NEXT:  LOAD 0x001000 0x0000000000000000 0x0000000000000000 0x000100 0x000100 R E 0x1000
-# BAD-BOTH-NEXT:  LOAD           0x002000 0x0000000000008000 0x0000000000008000 0x0001b0 0x0001b0 RW  0x1000
+# BAD-BOTH-NEXT:  LOAD           0x001100 0x0000000000000100 0x0000000000000100 0x000070 0x000070 RW  0x1000
 # BAD-BOTH-LABEL: Section to Segment mapping:
-# BAD-BOTH:   01     .sec1 .sec2 .dynamic
+# BAD-BOTH:   01     .text .dynamic
 
 .section        .first_sec,"aw",@progbits
 .rept 0x100
diff --git a/deps/lld/test/ELF/linkerscript/overlay.test b/deps/lld/test/ELF/linkerscript/overlay.test
index a28ab610ec09488eccff1ccc755083f72e54d662..aaa8619a94fcf014d7eaebae006c1c6683f0263a 100644
--- a/deps/lld/test/ELF/linkerscript/overlay.test
+++ b/deps/lld/test/ELF/linkerscript/overlay.test
@@ -16,7 +16,7 @@ SECTIONS {
 ## .text does not cause overlapping error and that
 ## .text's VA is 0x1000 + max(sizeof(.out.big), sizeof(.out.small)).
 
-# RUN: llvm-readobj -sections -program-headers -elf-output-style=GNU %t | FileCheck %s
+# RUN: llvm-readelf --sections -l %t | FileCheck %s
 
 # CHECK: Section Headers:
 # CHECK: Name       Type     Address          Off    Size
diff --git a/deps/lld/test/ELF/linkerscript/page-size-align.test b/deps/lld/test/ELF/linkerscript/page-size-align.test
index f69413157426702d5bf1d428c3ba09a6fc994507..c1a4446ba0139ff03b34f93a8b02b9e31289840d 100644
--- a/deps/lld/test/ELF/linkerscript/page-size-align.test
+++ b/deps/lld/test/ELF/linkerscript/page-size-align.test
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux /dev/null -o %t.o
 # RUN: ld.lld -T %s -z max-page-size=0x4000 %t.o -o %t.so -shared
-# RUN: llvm-readobj -s %t.so | FileCheck %s
+# RUN: llvm-readobj -S %t.so | FileCheck %s
 
 SECTIONS {
   . = SIZEOF_HEADERS;
diff --git a/deps/lld/test/ELF/linkerscript/page-size.s b/deps/lld/test/ELF/linkerscript/page-size.s
index 330339d672237aa66d5708d12540b60a347a9239..bf06611d9b3218c8cf139ea1a99c95718b026917 100644
--- a/deps/lld/test/ELF/linkerscript/page-size.s
+++ b/deps/lld/test/ELF/linkerscript/page-size.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 
 # RUN: ld.lld -z max-page-size=0x4000 %t -o %t2
-# RUN: llvm-readobj -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj -l %t2 | FileCheck %s
 
 # CHECK:      ProgramHeaders [
 # CHECK:        ProgramHeader {
diff --git a/deps/lld/test/ELF/linkerscript/phdr-check.s b/deps/lld/test/ELF/linkerscript/phdr-check.s
index b35256be6b71e5a7135668a9576a09a89eff4cdb..63fdec7b6a8bc8f1b310e71f2a920d99ea260458 100644
--- a/deps/lld/test/ELF/linkerscript/phdr-check.s
+++ b/deps/lld/test/ELF/linkerscript/phdr-check.s
@@ -3,7 +3,7 @@
 
 # RUN: echo "SECTIONS { . = 0x10000000 + SIZEOF_HEADERS; .text : {*(.text.*)} }" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -program-headers %t1 | FileCheck %s
+# RUN: llvm-readobj -l %t1 | FileCheck %s
 # CHECK:      ProgramHeaders [
 # CHECK-NEXT:  ProgramHeader {
 # CHECK-NEXT:    Type: PT_PHDR (0x6)
diff --git a/deps/lld/test/ELF/linkerscript/phdrs-flags.s b/deps/lld/test/ELF/linkerscript/phdrs-flags.s
index 3cb6432db09ca69536e6a13b70ee1587efd4c1a3..2311b6d22b41de961aa78746ab6abb263ea02b0a 100644
--- a/deps/lld/test/ELF/linkerscript/phdrs-flags.s
+++ b/deps/lld/test/ELF/linkerscript/phdrs-flags.s
@@ -7,7 +7,7 @@
 # RUN:           .foo : {*(.foo.*)} :all \
 # RUN:           .data : {*(.data.*)} :all}" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -program-headers %t1 | FileCheck %s
+# RUN: llvm-readobj -l %t1 | FileCheck %s
 
 # RUN: echo "PHDRS {all PT_LOAD FILEHDR PHDRS FLAGS (0x1);} \
 # RUN:       SECTIONS { \
@@ -16,7 +16,7 @@
 # RUN:           .foo : {*(.foo.*)}  \
 # RUN:           .data : {*(.data.*)} }" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -program-headers %t1 | FileCheck --check-prefix=DEFHDR %s
+# RUN: llvm-readobj -l %t1 | FileCheck --check-prefix=DEFHDR %s
 
 # CHECK:     ProgramHeaders [
 # CHECK-NEXT:  ProgramHeader {
diff --git a/deps/lld/test/ELF/linkerscript/phdrs.s b/deps/lld/test/ELF/linkerscript/phdrs.s
index c688bef5282c8d246cbae6d14604ffdc501a5286..c6882b68122a653ac5bcd622e77eb8d12d9dfe8f 100644
--- a/deps/lld/test/ELF/linkerscript/phdrs.s
+++ b/deps/lld/test/ELF/linkerscript/phdrs.s
@@ -7,7 +7,7 @@
 # RUN:           .foo : {*(.foo.*)} :all \
 # RUN:           .data : {*(.data.*)} :all}" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -program-headers %t1 | FileCheck %s
+# RUN: llvm-readobj -l %t1 | FileCheck %s
 
 ## Check that program headers are not written, unless we explicitly tell
 ## lld to do this.
@@ -18,7 +18,7 @@
 # RUN:           .foo : {*(.foo.*)} :all \
 # RUN:       }" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -program-headers %t1 | FileCheck --check-prefix=NOPHDR %s
+# RUN: llvm-readobj -l %t1 | FileCheck --check-prefix=NOPHDR %s
 
 ## Check the AT(expr)
 # RUN: echo "PHDRS {all PT_LOAD FILEHDR PHDRS AT(0x500 + 0x500) ;} \
@@ -28,7 +28,7 @@
 # RUN:           .foo : {*(.foo.*)} :all \
 # RUN:           .data : {*(.data.*)} :all}" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -program-headers %t1 | FileCheck --check-prefix=AT %s
+# RUN: llvm-readobj -l %t1 | FileCheck --check-prefix=AT %s
 
 # RUN: echo "PHDRS {all PT_LOAD FILEHDR PHDRS ;} \
 # RUN:       SECTIONS { \
@@ -37,7 +37,7 @@
 # RUN:           .foo : {*(.foo.*)}  \
 # RUN:           .data : {*(.data.*)} }" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -program-headers %t1 | FileCheck --check-prefix=DEFHDR %s
+# RUN: llvm-readobj -l %t1 | FileCheck --check-prefix=DEFHDR %s
 
 ## Check that error is reported when trying to use phdr which is not listed
 ## inside PHDRS {} block
@@ -95,7 +95,7 @@
 # RUN: echo "PHDRS {text PT_LOAD FILEHDR PHDRS; foo 0x11223344; } \
 # RUN:       SECTIONS { . = SIZEOF_HEADERS; .foo : { *(.foo* .text*) } : text : foo}" > %t1.script
 # RUN: ld.lld -o %t2 --script %t1.script %t
-# RUN: llvm-readobj -program-headers %t2 | FileCheck --check-prefix=INT-PHDRS %s
+# RUN: llvm-readobj -l %t2 | FileCheck --check-prefix=INT-PHDRS %s
 
 # INT-PHDRS:      ProgramHeaders [
 # INT-PHDRS:        ProgramHeader {
diff --git a/deps/lld/test/ELF/linkerscript/provide-empty-section.s b/deps/lld/test/ELF/linkerscript/provide-empty-section.s
index 56cb6aca1e3bb52a48c0c83c971a5349e21c9c2c..686d2c1b0b4ecdcd28882b49a30500ce28b19bd5 100644
--- a/deps/lld/test/ELF/linkerscript/provide-empty-section.s
+++ b/deps/lld/test/ELF/linkerscript/provide-empty-section.s
@@ -8,19 +8,19 @@
 
 # Case 1: Provided symbol is undefined and not referenced - empty section should be removed.
 # RUN: ld.lld %tundefined.o -T %t.script -o %t1.elf
-# RUN: llvm-readobj -sections %t1.elf | FileCheck %s --check-prefix=NOSECTION
+# RUN: llvm-readobj --sections %t1.elf | FileCheck %s --check-prefix=NOSECTION
 
 # Case 2: Provided symbol is undefined and referenced - empty section should not be removed.
 # RUN: ld.lld %tundefined.o %treference.o -T %t.script -o %t2.elf
-# RUN: llvm-readobj -sections %t2.elf | FileCheck %s --check-prefix=SECTION
+# RUN: llvm-readobj --sections %t2.elf | FileCheck %s --check-prefix=SECTION
 
 # Case 3: Provided symbol is defined and not referenced - empty section should be removed.
 # RUN: ld.lld %tdefined.o -T %t.script -o %t3.elf
-# RUN: llvm-readobj -sections %t3.elf | FileCheck %s --check-prefix=NOSECTION
+# RUN: llvm-readobj --sections %t3.elf | FileCheck %s --check-prefix=NOSECTION
 
 # Case 4: Provided symbol is defined and referenced - empty section should not be removed.
 # RUN: ld.lld %tdefined.o %treference.o -T %t.script -o %t4.elf
-# RUN: llvm-readobj -sections %t4.elf | FileCheck %s --check-prefix=SECTION
+# RUN: llvm-readobj --sections %t4.elf | FileCheck %s --check-prefix=SECTION
 
 .global _start
 _start:
diff --git a/deps/lld/test/ELF/linkerscript/provide-shared2.s b/deps/lld/test/ELF/linkerscript/provide-shared2.s
index 1a7b213d8e5413daaafd0a62ef948d49a1c16c79..3c55d2fa6318c3bb5d8f465f0830bcf6a7ed687f 100644
--- a/deps/lld/test/ELF/linkerscript/provide-shared2.s
+++ b/deps/lld/test/ELF/linkerscript/provide-shared2.s
@@ -6,7 +6,7 @@
 # RUN: ld.lld -o %t --script %t.script %t.o %t2.so
 # RUN: llvm-readelf --dyn-symbols %t | FileCheck  %s
 
-# CHECK: 1 1: 000000000000002a 0 NOTYPE GLOBAL DEFAULT ABS foo
+# CHECK: 1: 000000000000002a 0 NOTYPE GLOBAL DEFAULT ABS foo
 
 .global _start
 _start:
diff --git a/deps/lld/test/ELF/linkerscript/pt-interp.test b/deps/lld/test/ELF/linkerscript/pt-interp.test
index 0441817aea6dca5915d70290d51336a8e077ac4d..9f5e96e02d274bc7c283ab6ac807131d80688485 100644
--- a/deps/lld/test/ELF/linkerscript/pt-interp.test
+++ b/deps/lld/test/ELF/linkerscript/pt-interp.test
@@ -5,17 +5,17 @@
 ## Check we create PT_INTERP program header when it is specified in PHDRS.
 # RUN: echo "PHDRS { interp PT_INTERP; }" > %t1.script
 # RUN: ld.lld -o %t1 --script %t1.script %t.o %t.so --dynamic-linker foo
-# RUN: llvm-readobj -program-headers %t1 | FileCheck %s
+# RUN: llvm-readobj -l %t1 | FileCheck %s
 # CHECK: PT_INTERP
 
 ## Check we do not create it if it is not specified,
 ## but only if PHDRS is not empty by itself.
 # RUN: echo "PHDRS { ph_text PT_LOAD; }" > %t2.script
 # RUN: ld.lld -o %t1 --script %t2.script %t.o %t.so --dynamic-linker foo
-# RUN: llvm-readobj -program-headers %t1 | FileCheck %s --check-prefix=NOINTERP
+# RUN: llvm-readobj -l %t1 | FileCheck %s --check-prefix=NOINTERP
 # NOINTERP-NOT: PT_INTERP
 
 ## Otherwise, if PHDRS is empty, we create PT_INTERP header.
 # RUN: echo "PHDRS {}" > %t3.script
 # RUN: ld.lld -o %t1 --script %t3.script %t.o %t.so --dynamic-linker foo
-# RUN: llvm-readobj -program-headers %t1 | FileCheck %s
+# RUN: llvm-readobj -l %t1 | FileCheck %s
diff --git a/deps/lld/test/ELF/linkerscript/quoted-section-name.test b/deps/lld/test/ELF/linkerscript/quoted-section-name.test
new file mode 100644
index 0000000000000000000000000000000000000000..aa675759631c0faf2dd833e7525246bc0989039b
--- /dev/null
+++ b/deps/lld/test/ELF/linkerscript/quoted-section-name.test
@@ -0,0 +1,13 @@
+# REQUIRES: x86
+
+## Handling of quotes is tricky sometimes. Check we do that right and include
+## "foo bar" section into .data as expected.
+
+# RUN: echo '.section "foo bar", "aw"; nop' | llvm-mc -filetype=obj -triple=x86_64-pc-linux - -o %t
+# RUN: ld.lld %t --script %s -o %t2 --print-map | FileCheck %s
+# CHECK:      .data
+# CHECK-NEXT:   {{.*}}(foo bar)
+
+SECTIONS {
+  .data : { *("foo bar") }
+}
diff --git a/deps/lld/test/ELF/linkerscript/relocatable-discard.s b/deps/lld/test/ELF/linkerscript/relocatable-discard.s
index d4f5826b72d9dd7103a99e07e2c6c49cd59eccd8..a8c00046405ae49b19d49bfecdd8c2e68de5e5f5 100644
--- a/deps/lld/test/ELF/linkerscript/relocatable-discard.s
+++ b/deps/lld/test/ELF/linkerscript/relocatable-discard.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: echo "SECTIONS { /DISCARD/ : { *(.discard.*) }}" > %t.script
 # RUN: ld.lld -o %t --script %t.script -r %t.o
-# RUN: llvm-readobj -sections %t | FileCheck %s
+# RUN: llvm-readobj --sections %t | FileCheck %s
 
 ## Test shows that we do not crash after discarding the .discard.foo with -r.
 ## Previously it happened because of 2 reasons:
diff --git a/deps/lld/test/ELF/linkerscript/repsection-symbol.s b/deps/lld/test/ELF/linkerscript/repsection-symbol.s
index 195380be9ff854f8b82d1a3c9b7224b5ba35ac29..96963eef3abefb2f6b993a6010e2ff1b2e4d2dd5 100644
--- a/deps/lld/test/ELF/linkerscript/repsection-symbol.s
+++ b/deps/lld/test/ELF/linkerscript/repsection-symbol.s
@@ -7,16 +7,16 @@
 # RUN:   .foo : {foo1 = .;  *(.foo.*) foo2 = .;  *(.bar) foo3 = .;} \
 # RUN: }" > %t.script
 # RUN: ld.lld --hash-style=sysv -o %t1 --script %t.script %t -shared
-# RUN: llvm-readobj -t %t1 | FileCheck %s
+# RUN: llvm-readobj --symbols %t1 | FileCheck %s
 
 # CHECK:      Name: foo1
-# CHECK-NEXT: Value: 0x228
+# CHECK-NEXT: Value: 0x2C0
 
 # CHECK:      Name: foo2
-# CHECK-NEXT: Value: 0x230
+# CHECK-NEXT: Value: 0x2C8
 
 # CHECK:      Name: foo3
-# CHECK-NEXT: Value: 0x234
+# CHECK-NEXT: Value: 0x2CC
 
 .section .foo.1,"a"
  .long 1
diff --git a/deps/lld/test/ELF/linkerscript/repsection-va.s b/deps/lld/test/ELF/linkerscript/repsection-va.s
index 8a50fc0998f9ea40ed2c8cb1915e9774fa575c98..5da94d020e934fbc8d35ad6597d40e7c451575e1 100644
--- a/deps/lld/test/ELF/linkerscript/repsection-va.s
+++ b/deps/lld/test/ELF/linkerscript/repsection-va.s
@@ -5,7 +5,7 @@
 # RUN: ld.lld -o %t1 --script %t.script %t
 # RUN: llvm-objdump -section-headers %t1 | FileCheck %s
 # CHECK:      Sections:
-# CHECK-NEXT: Idx Name          Size      Address          Type
+# CHECK-NEXT: Idx Name          Size     VMA          Type
 # CHECK-NOT: .foo
 # CHECK:  .foo          00000008 {{.*}} DATA
 # CHECK-NOT: .foo
diff --git a/deps/lld/test/ELF/linkerscript/section-align.s b/deps/lld/test/ELF/linkerscript/section-align.s
index f4bdb0feac6d22c4088e80f6602239aeddc8917f..53ef95b6912b4d45cf9ec502f450834186964ead 100644
--- a/deps/lld/test/ELF/linkerscript/section-align.s
+++ b/deps/lld/test/ELF/linkerscript/section-align.s
@@ -7,7 +7,7 @@
 # RUN:   .ccc : ALIGN(4096 * 8) { *(.ccc) } \
 # RUN: }" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -sections %t1 | FileCheck %s
+# RUN: llvm-readobj --sections %t1 | FileCheck %s
 
 .global _start
 _start:
diff --git a/deps/lld/test/ELF/linkerscript/sections-constraint2.s b/deps/lld/test/ELF/linkerscript/sections-constraint2.s
index e726365582d8bc8e201aa1116b3271842ecce82c..6d4a33936877125534bd316fe79756c3cab6eee5 100644
--- a/deps/lld/test/ELF/linkerscript/sections-constraint2.s
+++ b/deps/lld/test/ELF/linkerscript/sections-constraint2.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "SECTIONS { zed : ONLY_IF_RO { *(foo) *(bar) } }" > %t.script
 # RUN: ld.lld -T %t.script %t.o -o %t.so -shared
-# RUN: llvm-readobj -s %t.so | FileCheck %s
+# RUN: llvm-readobj -S %t.so | FileCheck %s
 
 # CHECK: Sections [
 # CHECK-NOT: zed
diff --git a/deps/lld/test/ELF/linkerscript/sections-constraint3.s b/deps/lld/test/ELF/linkerscript/sections-constraint3.s
index 259f11e91dd181a8424b5752b19aba0b8de9fb7d..ac6724c38d52f5c90944959f7ad9947170c19426 100644
--- a/deps/lld/test/ELF/linkerscript/sections-constraint3.s
+++ b/deps/lld/test/ELF/linkerscript/sections-constraint3.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "SECTIONS { zed : ONLY_IF_RO { abc = 1; *(foo) } }" > %t.script
 # RUN: ld.lld -T %t.script %t.o -o %t.so -shared
-# RUN: llvm-readobj -t %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols %t.so | FileCheck %s
 
 # CHECK: Symbols [
 # CHECK-NOT: abc
diff --git a/deps/lld/test/ELF/linkerscript/sections-constraint4.s b/deps/lld/test/ELF/linkerscript/sections-constraint4.s
index 6c2d4c8e1ee431418cb950073a93b2b8a00cea97..100529ecf62d8766e9f7019996fc19fd402a89ec 100644
--- a/deps/lld/test/ELF/linkerscript/sections-constraint4.s
+++ b/deps/lld/test/ELF/linkerscript/sections-constraint4.s
@@ -4,7 +4,7 @@
 # RUN:  .foo : ONLY_IF_RO { *(.foo) } \
 # RUN:  .bar : {bar1 = .; *(.bar) } }" > %t1.script
 # RUN: ld.lld -o %t1 --script %t1.script %t
-# RUN: llvm-readobj -t %t1 | FileCheck %s
+# RUN: llvm-readobj --symbols %t1 | FileCheck %s
 
 # CHECK: Name: bar1
 
diff --git a/deps/lld/test/ELF/linkerscript/sections-constraint5.s b/deps/lld/test/ELF/linkerscript/sections-constraint5.s
index ea14aad5247ef6bfa8958b1134ce13c2cc3a22fc..ce1c2c23865abf9093b94ac7cf4f04c759dbe9f0 100644
--- a/deps/lld/test/ELF/linkerscript/sections-constraint5.s
+++ b/deps/lld/test/ELF/linkerscript/sections-constraint5.s
@@ -6,7 +6,7 @@
 # RUN:       }" > %t.script
 
 # RUN: ld.lld -o %t -T %t.script %t.o
-# RUN: llvm-readobj -s -t %t | FileCheck %s
+# RUN: llvm-readobj -S --symbols %t | FileCheck %s
 
 # CHECK: Sections [
 # CHECK:      Name: bar
diff --git a/deps/lld/test/ELF/linkerscript/sections-gc2.s b/deps/lld/test/ELF/linkerscript/sections-gc2.s
index e2941aa57ed643a4113e3d2aba95ee042b6d0923..7b1fa8dacaf34a7f29a0b599f72cd2d867b1b1a9 100644
--- a/deps/lld/test/ELF/linkerscript/sections-gc2.s
+++ b/deps/lld/test/ELF/linkerscript/sections-gc2.s
@@ -8,7 +8,7 @@
 # RUN: ld.lld -T %t.script -o %t.so %t.o --gc-sections
 # RUN: llvm-objdump -h %t.so | FileCheck %s
 
-# CHECK: Idx Name          Size      Address          Type
+# CHECK: Idx Name          Size      VMA          Type
 # CHECK-NEXT:  0
 # CHECK-NEXT:    used_in_reloc
 # CHECK-NEXT:    .text
diff --git a/deps/lld/test/ELF/linkerscript/sections-padding.s b/deps/lld/test/ELF/linkerscript/sections-padding.s
index 91ced2ef7a1e6d208495a9027721828844c69345..ab5d122cf2476a83a378fb789e5b6d7edb137ea3 100644
--- a/deps/lld/test/ELF/linkerscript/sections-padding.s
+++ b/deps/lld/test/ELF/linkerscript/sections-padding.s
@@ -7,11 +7,16 @@
 # RUN: llvm-objdump -s %t.out | FileCheck -check-prefix=YES %s
 # YES: 66000011 22000011 22000011 22000011
 
+# RUN: echo "SECTIONS { .mysec : { *(.mysec*) } =0x1100+0x22 }" > %t.script
+# RUN: ld.lld -o %t.out --script %t.script %t
+# RUN: llvm-objdump -s %t.out | FileCheck -check-prefix=YES2 %s
+# YES2: 66000011 22000011 22000011 22000011
+
 ## Confirming that address was correct:
 # RUN: echo "SECTIONS { .mysec : { *(.mysec*) } =0x99887766 }" > %t.script
 # RUN: ld.lld -o %t.out --script %t.script %t
-# RUN: llvm-objdump -s %t.out | FileCheck -check-prefix=YES2 %s
-# YES2: 66998877 66998877 66998877 66998877
+# RUN: llvm-objdump -s %t.out | FileCheck -check-prefix=YES3 %s
+# YES3: 66998877 66998877 66998877 66998877
 
 ## Default padding value is 0x00:
 # RUN: echo "SECTIONS { .mysec : { *(.mysec*) } }" > %t.script
@@ -29,9 +34,9 @@
 # RUN: echo "SECTIONS { .mysec : { *(.mysec*) } =0x99XX }" > %t.script
 # RUN: not ld.lld -o %t.out --script %t.script %t 2>&1 \
 # RUN:   | FileCheck --check-prefix=ERR2 %s
-# ERR2: invalid filler expression: 0x99XX
+# ERR2: malformed number: 0x99XX
 
-## Check case with space between '=' and expression:
+## Check case with space between '=' and a value:
 # RUN: echo "SECTIONS { .mysec : { *(.mysec*) } = 0x1122 }" > %t.script
 # RUN: ld.lld -o %t.out --script %t.script %t
 # RUN: llvm-objdump -s %t.out | FileCheck -check-prefix=YES %s
@@ -41,6 +46,26 @@
 # RUN: ld.lld -o %t.out --script %t.script %t
 # RUN: llvm-objdump -s %t.out | FileCheck -check-prefix=YES %s
 
+## Check we can use an artbitrary expression as a filler.
+# RUN: echo "SECTIONS { .mysec : { *(.mysec*) } = ((0x11<<8) | 0x22) }" > %t.script
+# RUN: ld.lld -o %t.out --script %t.script %t
+# RUN: llvm-objdump -s %t.out | FileCheck -check-prefix=YES %s
+
+## Check case with space between '=' and expression:
+# RUN: echo "SECTIONS { .mysec : { *(.mysec*) } =((0x11 << 8) | 0x22) }" > %t.script
+# RUN: ld.lld -o %t.out --script %t.script %t
+# RUN: llvm-objdump -s %t.out | FileCheck -check-prefix=YES %s
+
+## Check we report an error if expression value is larger than 32-bits.
+# RUN: echo "SECTIONS { .mysec : { *(.mysec*) } =(0x11 << 32) }" > %t.script
+# RUN: not ld.lld -o %t.out --script %t.script %t 2>&1 | FileCheck --check-prefix=ERR3 %s
+# ERR3: filler expression result does not fit 32-bit: 0x1100000000
+
+## Check we report an error if an expression use a symbol.
+# RUN: echo "SECTIONS { foo = 0x11; .mysec : { *(.mysec*) } = foo }" > %t.script
+# RUN: not ld.lld -o %t.out %t --script %t.script 2>&1 | FileCheck --check-prefix=ERR4 %s
+# ERR4: symbol not found: foo
+
 .section        .mysec.1,"a"
 .align  16
 .byte   0x66
diff --git a/deps/lld/test/ELF/linkerscript/segment-none.s b/deps/lld/test/ELF/linkerscript/segment-none.s
index 36d09e7764780d11e10697eebb54a7518c2443c5..85739747ac9c584621db4d9686addb2ce16cb415 100644
--- a/deps/lld/test/ELF/linkerscript/segment-none.s
+++ b/deps/lld/test/ELF/linkerscript/segment-none.s
@@ -23,7 +23,7 @@
 
 # CHECK: Section to Segment mapping:
 # CHECK-NEXT: Segment Sections...
-# CHECK-NOT: .foo
+# CHECK: None {{.*}}.foo
 
 # DEFINED: Section to Segment mapping:
 # DEFINED-NEXT: Segment Sections...
diff --git a/deps/lld/test/ELF/linkerscript/sort-non-script.s b/deps/lld/test/ELF/linkerscript/sort-non-script.s
index 7207e90d4d76e591daa2fcc231bff646aa34fb1a..7cb31304596682bb904ff351913fe4925dc0ae11 100644
--- a/deps/lld/test/ELF/linkerscript/sort-non-script.s
+++ b/deps/lld/test/ELF/linkerscript/sort-non-script.s
@@ -9,8 +9,8 @@
 # CHECK-NEXT: .hash    {{.*}}   A
 # CHECK-NEXT: .dynstr  {{.*}}   A
 # CHECK-NEXT: .text    {{.*}}   AX
-# CHECK-NEXT: foo      {{.*}}  WA
 # CHECK-NEXT: .dynamic {{.*}}  WA
+# CHECK-NEXT: foo      {{.*}}  WA
 
 .section foo, "aw"
 .byte 0
diff --git a/deps/lld/test/ELF/linkerscript/symbol-alias-relocation.s b/deps/lld/test/ELF/linkerscript/symbol-alias-relocation.s
new file mode 100644
index 0000000000000000000000000000000000000000..b464828126481839e5d932fd8d8c9bada5176bff
--- /dev/null
+++ b/deps/lld/test/ELF/linkerscript/symbol-alias-relocation.s
@@ -0,0 +1,36 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: echo "aliasto__text = __text; SECTIONS { .text 0x1000 : { __text = . ; *(.text) } }" > %t.script
+# RUN: ld.lld -pie -o %t --script %t.script %t.o
+# RUN: llvm-readobj --symbols %t | FileCheck %s
+
+## Check that alias 'aliasto__text' has the correct value.
+## (It should belong to the section .text and point to it's start).
+
+# CHECK:      Symbol {
+# CHECK:        Name: __text
+# CHECK-NEXT:   Value: 0x1000
+# CHECK-NEXT:   Size: 0
+# CHECK-NEXT:   Binding: Global
+# CHECK-NEXT:   Type: None
+# CHECK-NEXT:   Other: 0
+# CHECK-NEXT:   Section: .text
+# CHECK-NEXT: }
+
+# CHECK:      Symbol {
+# CHECK:        Name: aliasto__text
+# CHECK-NEXT:   Value: 0x1000
+# CHECK-NEXT:   Size: 0
+# CHECK-NEXT:   Binding: Global
+# CHECK-NEXT:   Type: None
+# CHECK-NEXT:   Other: 0
+# CHECK-NEXT:   Section: .text
+# CHECK-NEXT: }
+
+.text
+.globl _start
+.type _start, %function
+_start:
+.globl aliasto__text
+   call __text
+   call aliasto__text
diff --git a/deps/lld/test/ELF/linkerscript/symbol-location.s b/deps/lld/test/ELF/linkerscript/symbol-location.s
index 323d237e15336cd74bdbd8bc49e8afec6d4c9fa4..91070d8ec6df914c46237d236cd0926fe3b787e7 100644
--- a/deps/lld/test/ELF/linkerscript/symbol-location.s
+++ b/deps/lld/test/ELF/linkerscript/symbol-location.s
@@ -1,15 +1,16 @@
 # REQUIRES: x86
-# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
-# RUN: echo "foo = 1;" > %t.script
-# RUN: not ld.lld -pie -o %t --script %t.script %t.o 2>&1 | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: echo 'foo = _start;' > %t.script
+# RUN: not ld.lld -shared -T %t.script %t.o -o /dev/null 2>&1 | FileCheck %s
 
 ## Here we check that symbol 'foo' location is reported properly.
 
-# CHECK: error: relocation R_X86_64_PLT32 cannot refer to absolute symbol: foo
+# CHECK: error: relocation R_X86_64_PC32 cannot be used against symbol foo
 # CHECK: >>> defined in {{.*}}.script:1
 # CHECK: >>> referenced by {{.*}}.o:(.text+0x1)
 
 .text
 .globl _start
 _start:
- call foo@PLT
+  .byte 0xe8
+  .long foo - .
diff --git a/deps/lld/test/ELF/linkerscript/symbol-only-align.test b/deps/lld/test/ELF/linkerscript/symbol-only-align.test
new file mode 100644
index 0000000000000000000000000000000000000000..24da737a6500dae74b27ca3d8eb4c4788d89e599
--- /dev/null
+++ b/deps/lld/test/ELF/linkerscript/symbol-only-align.test
@@ -0,0 +1,35 @@
+# REQUIRES: x86
+# RUN: echo '.text; ret; .data; .quad 0' > %t.s
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %t.s -o %t.o
+# RUN: ld.lld -o %t --script %s %t.o -shared
+# RUN: llvm-readelf -S --symbols -l %t | FileCheck %s
+
+PHDRS {
+  text PT_LOAD FLAGS(0x5);
+  data PT_LOAD FLAGS(0x6);
+}
+
+SECTIONS {
+  . = SIZEOF_HEADERS;
+  .text : { *(.text) } : text
+  . = ALIGN(CONSTANT(MAXPAGESIZE));
+  foo : { __start_foo = .; *(foo); __end_foo = .; } : data
+  .data : { *(.data) }
+  .dynamic : { *(.dynamic) }
+}
+
+## Check that foo, the symbol only section, has the expected aligned address and
+## file offset. Also check that the section's symbols and the data segment's
+## offset and addresses match.
+
+# CHECK: Section Headers
+# CHECK:      foo   PROGBITS 0000000000[[ADDR:[0-9a-f]*]] [[ADDR]]
+# CHECK-NEXT: .data PROGBITS 0000000000[[ADDR]] [[ADDR]]
+
+# CHECK: Symbol table
+# CHECK: 0000000000[[ADDR]] 0 NOTYPE GLOBAL DEFAULT {{[0-9]+}} __start_foo
+# CHECK: 0000000000[[ADDR]] 0 NOTYPE GLOBAL DEFAULT {{[0-9]+}} __end_foo
+
+# CHECK: Program Headers
+# CHECK:      LOAD
+# CHECK-NEXT: LOAD 0x[[ADDR]] 0x0000000000[[ADDR]] 0x0000000000[[ADDR]]
diff --git a/deps/lld/test/ELF/linkerscript/symbol-only-flags.test b/deps/lld/test/ELF/linkerscript/symbol-only-flags.test
index cea2539cd6ba74a318eebbf74c5bfb57662ca8d3..ed2ea762f87251e4279239b298135acd740c9d55 100644
--- a/deps/lld/test/ELF/linkerscript/symbol-only-flags.test
+++ b/deps/lld/test/ELF/linkerscript/symbol-only-flags.test
@@ -2,7 +2,7 @@
 # RUN: echo '.section .tbss,"awT",@nobits; .quad 0' \
 # RUN:   | llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t.o
 # RUN: ld.lld -o %t --script %s %t.o
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 SECTIONS {
   . = SIZEOF_HEADERS;
@@ -14,7 +14,7 @@ SECTIONS {
 # CHECK:     Section {
 # CHECK:       Index:
 # CHECK:       Name: .foo
-# CHECK-NEXT:  Type: SHT_NOBITS
+# CHECK-NEXT:  Type: SHT_PROGBITS
 # CHECK-NEXT:  Flags [
 # CHECK-NEXT:    SHF_ALLOC
 # CHECK-NEXT:    SHF_WRITE
diff --git a/deps/lld/test/ELF/linkerscript/symbol-only.test b/deps/lld/test/ELF/linkerscript/symbol-only.test
index f2fefdc049b93dfcf1710ac1f31b0004a8241728..9951e9c8857f240a3b7165e271b532340e5c01e9 100644
--- a/deps/lld/test/ELF/linkerscript/symbol-only.test
+++ b/deps/lld/test/ELF/linkerscript/symbol-only.test
@@ -12,7 +12,7 @@ SECTIONS {
 }
 
 # CHECK:      Sections:
-# CHECK-NEXT: Idx Name          Size      Address
+# CHECK-NEXT: Idx Name          Size     VMA
 # CHECK-NEXT:   0               00000000 0000000000000000
 # CHECK:          abc           00000000 [[ADDR:[0-9a-f]*]]
 # CHECK:          bar           00000000 0000000000001000
diff --git a/deps/lld/test/ELF/linkerscript/symbol-pie.s b/deps/lld/test/ELF/linkerscript/symbol-pie.s
new file mode 100644
index 0000000000000000000000000000000000000000..4e7407cad8c7ee30ae25ea47a9caed340549d74f
--- /dev/null
+++ b/deps/lld/test/ELF/linkerscript/symbol-pie.s
@@ -0,0 +1,19 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: echo "SECTIONS { .data 0x2000 : { foo = .; *(.data) } }" > %t.script
+# RUN: ld.lld -pie -o %t --script %t.script %t.o
+# RUN: llvm-readobj -r %t | FileCheck %s
+
+## Position independent executables require dynamic
+## relocations for references to non-absolute script
+## symbols.
+
+# CHECK:      Relocations [
+# CHECK-NEXT:  Section ({{.*}}) .rela.dyn {
+# CHECK-NEXT:    0x2000 R_X86_64_RELATIVE - 0x2000
+# CHECK-NEXT:  }
+# CHECK-NEXT: ]
+
+.data
+.quad foo
diff --git a/deps/lld/test/ELF/linkerscript/tbss.s b/deps/lld/test/ELF/linkerscript/tbss.s
index de8ed50cb4a4eef6a69c13d164078c1f058a7dc8..1560ad5d039a205c1dc734b188e9241ca6d30f18 100644
--- a/deps/lld/test/ELF/linkerscript/tbss.s
+++ b/deps/lld/test/ELF/linkerscript/tbss.s
@@ -7,7 +7,7 @@
 # RUN:   bar : { *(bar) } \
 # RUN: }" > %t.script
 # RUN: ld.lld -T %t.script %t.o -o %t
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 # test that a tbss section doesn't use address space.
 
diff --git a/deps/lld/test/ELF/linkerscript/ttext-script.s b/deps/lld/test/ELF/linkerscript/ttext-script.s
index 9dcde9bb13c5e9325b68edfc97daf4152d146d60..3e75d18f8d7708d6635fee8b6a4254fe341aaba9 100644
--- a/deps/lld/test/ELF/linkerscript/ttext-script.s
+++ b/deps/lld/test/ELF/linkerscript/ttext-script.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "SECTIONS { .text 0x200000 : { *(.text) } }" > %t.script
 # RUN: ld.lld -T %t.script -Ttext 0x100000 %t.o -o %t
-# RUN: llvm-readobj --elf-output-style=GNU -s  %t | FileCheck %s
+# RUN: llvm-readelf -S  %t | FileCheck %s
 
 # CHECK: .text             PROGBITS        0000000000100000
 
diff --git a/deps/lld/test/ELF/linkerscript/va.s b/deps/lld/test/ELF/linkerscript/va.s
index c305f0689e110e48f2d2873c9790694cae29712c..bbf55cb45b35e6cd83c6ece3974d2621cb74f040 100644
--- a/deps/lld/test/ELF/linkerscript/va.s
+++ b/deps/lld/test/ELF/linkerscript/va.s
@@ -5,7 +5,7 @@
 # RUN: ld.lld -o %t1 --script %t.script %t
 # RUN: llvm-objdump -section-headers %t1 | FileCheck %s
 # CHECK:      Sections:
-# CHECK-NEXT: Idx Name          Size      Address
+# CHECK-NEXT: Idx Name          Size     VMA
 # CHECK-NEXT:   0               00000000 0000000000000000
 # CHECK-NEXT:   1 .foo          00000004 0000000000000000
 # CHECK-NEXT:   2 .boo          00000004 0000000000000004
diff --git a/deps/lld/test/ELF/linkerscript/version-linker-symbol.s b/deps/lld/test/ELF/linkerscript/version-linker-symbol.s
index de30cf5c2ed5f4a6a32b58efea8feec5b6fb4cb9..a92580ecd12b9538bad3429db5ae34ca1b934d80 100644
--- a/deps/lld/test/ELF/linkerscript/version-linker-symbol.s
+++ b/deps/lld/test/ELF/linkerscript/version-linker-symbol.s
@@ -3,7 +3,7 @@
 # RUN: echo "VER1 { global: _end; foo ; local: * ; } ;" > %t.script
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s
 
 # CHECK:      Name: _end@@VER1
 # CHECK-NEXT: Value: 0
@@ -11,7 +11,7 @@
 # CHECK-NEXT: Binding: Global
 # CHECK-NEXT: Type: None
 # CHECK-NEXT: Other: 0
-# CHECK-NEXT: Section: .dynamic
+# CHECK-NEXT: Section: .data
 
 # CHECK:      Name: foo@@VER1
 # CHECK-NEXT: Value: 0
diff --git a/deps/lld/test/ELF/linkerscript/visibility.s b/deps/lld/test/ELF/linkerscript/visibility.s
index 9d9fcf0c5cdc05060537673eb308698e4bda2e6a..f62a6755a91b9ff998f5769b536dae25608c8a46 100644
--- a/deps/lld/test/ELF/linkerscript/visibility.s
+++ b/deps/lld/test/ELF/linkerscript/visibility.s
@@ -3,7 +3,7 @@
 
 # RUN: echo "SECTIONS { foo = .; }" > %t1.script
 # RUN: ld.lld -o %t1 --script %t1.script %t.o -shared
-# RUN: llvm-readobj -t %t1 | FileCheck %s
+# RUN: llvm-readobj --symbols %t1 | FileCheck %s
 
 # CHECK:      Symbol {
 # CHECK:        Name: foo
@@ -19,4 +19,4 @@
 
         .data
         .hidden foo
-        .long foo
+        .quad foo
diff --git a/deps/lld/test/ELF/local-dynamic.s b/deps/lld/test/ELF/local-dynamic.s
index 0adad2bf41d9a9842196b6d7e0d1c8109772d8ce..8c7cd870ef47d7f2e3cfff5bc18ea586f6e69fd7 100644
--- a/deps/lld/test/ELF/local-dynamic.s
+++ b/deps/lld/test/ELF/local-dynamic.s
@@ -2,7 +2,7 @@
 // Check that local symbols are not inserted into dynamic table.
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: ld.lld %t -shared -o %t1.so
-// RUN: llvm-readobj -t -dyn-symbols %t1.so | FileCheck %s
+// RUN: llvm-readobj --symbols --dyn-syms %t1.so | FileCheck %s
 
 // CHECK: Symbols [
 // CHECK-NEXT:   Symbol {
diff --git a/deps/lld/test/ELF/local-got-pie.s b/deps/lld/test/ELF/local-got-pie.s
index c89fc1cb4ed434e2b9e3eef58980427a97434886..3a985458de5c78b459c7e0513a9c118986ea4916 100644
--- a/deps/lld/test/ELF/local-got-pie.s
+++ b/deps/lld/test/ELF/local-got-pie.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: ld.lld --hash-style=sysv %t.o -o %t -pie
-// RUN: llvm-readobj -s -r -d %t | FileCheck %s
+// RUN: llvm-readobj -S -r -d %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
 .globl _start
@@ -15,6 +15,7 @@ foo:
 
 // 0x20B0 - 1001 - 5 = 4266
 // DISASM:      Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: _start:
 // DISASM-NEXT:   1000: {{.*}} callq 4267
 // DISASM:      foo:
diff --git a/deps/lld/test/ELF/local-got-shared.s b/deps/lld/test/ELF/local-got-shared.s
index 284135db13e00b99b3db21b4bbc0f62bdc615b24..7a603a32502578629a370e10f56439b1340a0225 100644
--- a/deps/lld/test/ELF/local-got-shared.s
+++ b/deps/lld/test/ELF/local-got-shared.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: ld.lld --hash-style=sysv %t.o -o %t -shared
-// RUN: llvm-readobj -s -r -d %t | FileCheck %s
+// RUN: llvm-readobj -S -r -d %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
 bar:
diff --git a/deps/lld/test/ELF/local-got.s b/deps/lld/test/ELF/local-got.s
index 2c1bd58d76828d59745011a82fc88da4a8c66e30..3c8882c68471356826b44cfd875863dc2f619bb3 100644
--- a/deps/lld/test/ELF/local-got.s
+++ b/deps/lld/test/ELF/local-got.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld --hash-style=sysv %t.o %t2.so -o %t
-// RUN: llvm-readobj -s -r -section-data %t | FileCheck %s
+// RUN: llvm-readobj -S -r --section-data %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
         .globl _start
diff --git a/deps/lld/test/ELF/local-symbols-order.s b/deps/lld/test/ELF/local-symbols-order.s
index dfd964f2de273e14a99c648bc465d6078a7f9fc0..b6db94599715454709d4af74ef22a11439779616 100644
--- a/deps/lld/test/ELF/local-symbols-order.s
+++ b/deps/lld/test/ELF/local-symbols-order.s
@@ -5,7 +5,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
 
 # RUN: ld.lld -o %t %t1.o %t2.o --emit-relocs
-# RUN: llvm-readobj -symbols -sections -elf-output-style=GNU %t | FileCheck %s
+# RUN: llvm-readelf --symbols --sections %t | FileCheck %s
 
 ## Check we sort local symbols to match the following order: 
 ## file1, local1, section1, hidden1, file2, local2, section2, hidden2 ...
diff --git a/deps/lld/test/ELF/local-undefined-symbol.s b/deps/lld/test/ELF/local-undefined-symbol.s
index 34ef847180ae416b0b8a7fc558b51ae963e504ab..c2ab207359bf662af7f228d370dd27dfc88033c6 100644
--- a/deps/lld/test/ELF/local-undefined-symbol.s
+++ b/deps/lld/test/ELF/local-undefined-symbol.s
@@ -1,10 +1,8 @@
 # REQUIRES: x86
-# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o %t1
-# RUN: llvm-readobj -t %t1 | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: not ld.lld %t.o -o %t 2>&1 | FileCheck %s
 
-# CHECK:     Symbols [
-# CHECK-NOT:  Name: foo
+# CHECK: error: undefined symbol: foo
 
 .global _start
 _start:
diff --git a/deps/lld/test/ELF/local.s b/deps/lld/test/ELF/local.s
index cb9adc864852ac9e15faec26919a0bec083ca99e..4567b7b34a2f37be6ac8dfa985226a08afcea6b2 100644
--- a/deps/lld/test/ELF/local.s
+++ b/deps/lld/test/ELF/local.s
@@ -2,7 +2,7 @@
 // Check that symbol table is correctly populated with local symbols.
 // RUN: llvm-mc -save-temp-labels -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: ld.lld %t -o %t1
-// RUN: llvm-readobj -t -s %t1 | FileCheck %s
+// RUN: llvm-readobj --symbols -S %t1 | FileCheck %s
 
 // Check that Info is equal to the number of local symbols.
 // CHECK:   Section {
diff --git a/deps/lld/test/ELF/lto/Inputs/irmover-warning.ll b/deps/lld/test/ELF/lto/Inputs/irmover-warning.ll
new file mode 100644
index 0000000000000000000000000000000000000000..72d437fb62c9bd4e8c147ea9ae263ac5a082618a
--- /dev/null
+++ b/deps/lld/test/ELF/lto/Inputs/irmover-warning.ll
@@ -0,0 +1,10 @@
+target triple = "x86_64-unknown-linux-gnu"
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+
+define void @f() {
+  ret void
+}
+
+!0 = !{ i32 2, !"foo", i32 2 }
+
+!llvm.module.flags = !{ !0 }
diff --git a/deps/lld/test/ELF/lto/Inputs/obj-path.ll b/deps/lld/test/ELF/lto/Inputs/obj-path.ll
new file mode 100644
index 0000000000000000000000000000000000000000..31c72ec4653a644b0266f5eeb78a988454612b45
--- /dev/null
+++ b/deps/lld/test/ELF/lto/Inputs/obj-path.ll
@@ -0,0 +1,7 @@
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+define void @g() {
+entry:
+  ret void
+}
diff --git a/deps/lld/test/ELF/lto/archive-2.ll b/deps/lld/test/ELF/lto/archive-2.ll
index 28e349ebd317c269aec0f81fb02294b74bcd3da8..40d1aba36f1b0c9f2d102cd5907b1269afdf2098 100644
--- a/deps/lld/test/ELF/lto/archive-2.ll
+++ b/deps/lld/test/ELF/lto/archive-2.ll
@@ -4,9 +4,9 @@
 ; RUN: llvm-ar rcs %t.a %t1.o
 ; RUN: llvm-as %s -o %t2.o
 ; RUN: ld.lld %t2.o %t.a -o %t3
-; RUN: llvm-readobj -t %t3 | FileCheck %s
+; RUN: llvm-readobj --symbols %t3 | FileCheck %s
 ; RUN: ld.lld %t2.o --whole-archive %t.a -o %t3 -shared
-; RUN: llvm-readobj -t %t3 | FileCheck %s
+; RUN: llvm-readobj --symbols %t3 | FileCheck %s
 
 ; CHECK:      Name: _start (
 ; CHECK-NEXT: Value:
diff --git a/deps/lld/test/ELF/lto/archive-no-index.ll b/deps/lld/test/ELF/lto/archive-no-index.ll
index 5ac2628fefd8970f6a0d2273f16d6670e937d0e3..f7a2cf81c4f1cb99b1424b765a5cda2a10e2887a 100644
--- a/deps/lld/test/ELF/lto/archive-no-index.ll
+++ b/deps/lld/test/ELF/lto/archive-no-index.ll
@@ -1,8 +1,6 @@
 ; REQUIRES: x86
-; Tests that we suggest that LTO symbols missing from an archive index
-; may be the cause of undefined references, but only if we both
-; encountered an empty archive index and undefined references (to prevent
-; noisy false alarms).
+; Tests that we accept an archive file without symbol table
+; if all the member files are bitcode files.
 
 ; RUN: llvm-as -o %t1.o %s
 ; RUN: llvm-as -o %t2.o %S/Inputs/archive.ll
@@ -23,3 +21,14 @@ define i32 @main() {
   call void @f()
   ret i32 0
 }
+
+; RUN: echo 'f:' | llvm-mc -triple=x86_64-pc-linux -filetype=obj - -o %t3.o
+; RUN: rm -f %t3.a
+; RUN: llvm-ar crS %t3.a %t3.o
+; RUN: not ld.lld -o /dev/null -emain %t1.o %t3.a 2>&1 | FileCheck -check-prefix=ERR1 %s
+; ERR1: error: {{.*}}.a: archive has no index; run ranlib to add one
+
+; RUN: rm -f %t4.a
+; RUN: llvm-ar cr %t4.a
+; RUN: not ld.lld -o /dev/null -emain %t1.o %t4.a 2>&1 | FileCheck -check-prefix=ERR2 %s
+; ERR2: error: undefined symbol: f
diff --git a/deps/lld/test/ELF/lto/archive.ll b/deps/lld/test/ELF/lto/archive.ll
index 6c4ca5e9aaaa3c84253b805a7967cdfb7af2632b..655c48ece038813431020f0212abf46854324280 100644
--- a/deps/lld/test/ELF/lto/archive.ll
+++ b/deps/lld/test/ELF/lto/archive.ll
@@ -4,9 +4,9 @@
 ; RUN: llvm-ar rcs %t.a %t1.o
 ; RUN: llvm-as %s -o %t2.o
 ; RUN: ld.lld %t2.o %t.a -o %t3 -shared
-; RUN: llvm-readobj -t %t3 | FileCheck %s
+; RUN: llvm-readobj --symbols %t3 | FileCheck %s
 ; RUN: ld.lld %t2.o --whole-archive %t.a -o %t3 -shared
-; RUN: llvm-readobj -t %t3 | FileCheck %s
+; RUN: llvm-readobj --symbols %t3 | FileCheck %s
 
 ; CHECK:      Name: g (
 ; CHECK-NEXT: Value:
diff --git a/deps/lld/test/ELF/lto/comdat.ll b/deps/lld/test/ELF/lto/comdat.ll
index 1739351220cd7418621ca36ef85b5b799caa158f..d61058f2e6715de200a6d1f541e5e054b00ae4dd 100644
--- a/deps/lld/test/ELF/lto/comdat.ll
+++ b/deps/lld/test/ELF/lto/comdat.ll
@@ -1,7 +1,7 @@
 ; REQUIRES: x86
 ; RUN: llvm-as %s -o %t.o
 ; RUN: ld.lld %t.o %t.o -o %t.so -shared
-; RUN: llvm-readobj -t %t.so | FileCheck %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck %s
 
 ; CHECK:      Name: foo
 ; CHECK-NEXT: Value:
diff --git a/deps/lld/test/ELF/lto/comdat2.ll b/deps/lld/test/ELF/lto/comdat2.ll
index e7c6ea10b5e28aae2a91e8aa1dbd644386e3f03f..3a23198de2cfae3e674180636a69aa8c343ed43b 100644
--- a/deps/lld/test/ELF/lto/comdat2.ll
+++ b/deps/lld/test/ELF/lto/comdat2.ll
@@ -2,9 +2,9 @@
 ; RUN: llvm-as %s -o %t.o
 ; RUN: llvm-mc -triple=x86_64-pc-linux %p/Inputs/comdat.s -o %t2.o -filetype=obj
 ; RUN: ld.lld %t.o %t2.o -o %t.so -shared
-; RUN: llvm-readobj -t %t.so | FileCheck %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck %s
 ; RUN: ld.lld %t2.o %t.o -o %t2.so -shared
-; RUN: llvm-readobj -t %t2.so | FileCheck %s --check-prefix=OTHER
+; RUN: llvm-readobj --symbols %t2.so | FileCheck %s --check-prefix=OTHER
 
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
diff --git a/deps/lld/test/ELF/lto/common.ll b/deps/lld/test/ELF/lto/common.ll
index b02002431320430b0d19b528e79362eb63ebacb3..82f00bc42218b3164b9d9408bc8e8264536ce8df 100644
--- a/deps/lld/test/ELF/lto/common.ll
+++ b/deps/lld/test/ELF/lto/common.ll
@@ -2,7 +2,7 @@
 ; RUN: llvm-as %s -o %t1.o
 ; RUN: llvm-mc -triple=x86_64-pc-linux %p/Inputs/common.s -o %t2.o -filetype=obj
 ; RUN: ld.lld %t1.o %t2.o -o %t.so -shared
-; RUN: llvm-readobj -s -t %t.so | FileCheck %s
+; RUN: llvm-readobj -S --symbols %t.so | FileCheck %s
 
 ; CHECK:      Name: .bss
 ; CHECK-NEXT: Type: SHT_NOBITS
diff --git a/deps/lld/test/ELF/lto/common2.ll b/deps/lld/test/ELF/lto/common2.ll
index 1cb5c322ba05d8e60be6ca4b1c41a59375a5161f..a7463cb1e26b650665b3309e362ab71b1a63ac63 100644
--- a/deps/lld/test/ELF/lto/common2.ll
+++ b/deps/lld/test/ELF/lto/common2.ll
@@ -2,7 +2,7 @@
 ; RUN: llvm-as %s -o %t1.o
 ; RUN: ld.lld %t1.o -o %t -shared -save-temps
 ; RUN: llvm-dis < %t.0.2.internalize.bc | FileCheck %s
-; RUN: llvm-readobj -t %t | FileCheck %s --check-prefix=SHARED
+; RUN: llvm-readobj --symbols %t | FileCheck %s --check-prefix=SHARED
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/deps/lld/test/ELF/lto/common4.ll b/deps/lld/test/ELF/lto/common4.ll
new file mode 100644
index 0000000000000000000000000000000000000000..1d2f2d9e0a434b648a2d6275845555f9e9486c42
--- /dev/null
+++ b/deps/lld/test/ELF/lto/common4.ll
@@ -0,0 +1,21 @@
+; REQUIRES: x86
+
+;; Make sure that common symbols are properly internalized.
+;; In this file, @a does not interpose any symbol in a DSO,
+;; so LTO should be able to internelize it.
+
+; RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux /dev/null -o %t.so.o
+; RUN: ld.lld -shared -o %t.so %t.so.o
+
+; RUN: llvm-as %s -o %t.o
+; RUN: ld.lld -o %t.exe -save-temps %t.o %t.so
+; RUN: llvm-dis < %t.exe.0.2.internalize.bc | FileCheck %s
+
+; RUN: ld.lld -pie -o %t.exe -save-temps %t.o
+; RUN: llvm-dis < %t.exe.0.2.internalize.bc | FileCheck %s
+
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@a = common dso_local local_unnamed_addr global i32 0, align 4
+; CHECK-DAG: @a = internal global i32 0, align 4
diff --git a/deps/lld/test/ELF/lto/ctors.ll b/deps/lld/test/ELF/lto/ctors.ll
index f64189711aa58632a70f649159c82e36a0e9c020..a17e5b78500a2518c9ba4b8cf7a3b7a1f1d9a5df 100644
--- a/deps/lld/test/ELF/lto/ctors.ll
+++ b/deps/lld/test/ELF/lto/ctors.ll
@@ -1,7 +1,7 @@
 ; REQUIRES: x86
 ; RUN: llvm-as %s -o %t.o
 ; RUN: ld.lld %t.o -o %t.so -shared
-; RUN: llvm-readobj -sections %t.so | FileCheck %s
+; RUN: llvm-readobj --sections %t.so | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/deps/lld/test/ELF/lto/defsym.ll b/deps/lld/test/ELF/lto/defsym.ll
index 671f589da18df3f5c92279c5b4d5be28e8b1c409..1073ab8820f43fb544d0c02b9a5a3bde97997c47 100644
--- a/deps/lld/test/ELF/lto/defsym.ll
+++ b/deps/lld/test/ELF/lto/defsym.ll
@@ -11,7 +11,7 @@
 ; RUN: opt -module-summary %S/Inputs/defsym-bar.ll -o %t1.o
 ; RUN: ld.lld %t.o %t1.o -shared -o %t2.so -defsym=bar2=bar3 -save-temps
 ; RUN: llvm-readelf --symbols %t2.so1.lto.o | FileCheck --check-prefix=OBJ %s
-; RUN: llvm-objdump -d %t2.so | FileCheck %s --check-prefix=THIN
+; RUN: llvm-objdump -d %t2.so | FileCheck %s
 
 ; OBJ:  UND bar2
 
@@ -19,17 +19,11 @@
 ; Symbol bar3 should not be eliminated
 
 ; CHECK:      foo:
-; CHECK-NEXT: pushq	%rax
+; CHECK-NEXT: pushq %rax
 ; CHECK-NEXT: callq
 ; CHECK-NEXT: callq{{.*}}<bar3>
-; CHECK-NEXT: callq
-
-; THIN:       foo
-; THIN-NEXT:  pushq %rax
-; THIN-NEXT:  callq
-; THIN-NEXT:  callq{{.*}}<bar3>
-; THIN-NEXT:  popq %rax
-; THIN-NEXT:  jmp
+; CHECK-NEXT: popq %rax
+; CHECK-NEXT: jmp
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/deps/lld/test/ELF/lto/deplibs.s b/deps/lld/test/ELF/lto/deplibs.s
new file mode 100644
index 0000000000000000000000000000000000000000..cc27869846363e2392b22cb2869c9c72d04a2e15
--- /dev/null
+++ b/deps/lld/test/ELF/lto/deplibs.s
@@ -0,0 +1,15 @@
+; REQUIRES: x86
+
+; RUN: llvm-as %s -o %t.o
+; RUN: not ld.lld -shared %t.o -o /dev/null 2>&1 | FileCheck %s -DOBJ=%t.o
+
+; CHECK: error: [[OBJ]]: unable to find library from dependent library specifier: foo
+; CHECK: error: [[OBJ]]: unable to find library from dependent library specifier: bar
+
+target triple = "x86_64-unknown-linux-gnu"
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+
+!llvm.dependent-libraries = !{!0, !1}
+
+!0 = !{!"foo"}
+!1 = !{!"bar"}
diff --git a/deps/lld/test/ELF/lto/dynamic-list.ll b/deps/lld/test/ELF/lto/dynamic-list.ll
index 84b667b0eb0cc641d0b46baff50d8d665c32b9f0..05a5f39a6b80c9a16699b1dc6c95ce3337f91e1b 100644
--- a/deps/lld/test/ELF/lto/dynamic-list.ll
+++ b/deps/lld/test/ELF/lto/dynamic-list.ll
@@ -2,7 +2,7 @@
 ; RUN: llvm-as %s -o %t.o
 ; RUN: echo "{ foo; };" > %t.list
 ; RUN: ld.lld -o %t --dynamic-list %t.list -pie %t.o
-; RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+; RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 ; CHECK:      Name:     foo
 ; CHECK-NEXT: Value:    0x1010
diff --git a/deps/lld/test/ELF/lto/dynsym.ll b/deps/lld/test/ELF/lto/dynsym.ll
index d056c0b555e3a3a04c8a1e91c75abbecd89e5268..392ac561e27e797685b8fe64489de320969cf926 100644
--- a/deps/lld/test/ELF/lto/dynsym.ll
+++ b/deps/lld/test/ELF/lto/dynsym.ll
@@ -3,12 +3,12 @@
 ; RUN: ld.lld %t.o -o %t.so -shared
 ; RUN: llvm-as %s -o %t2.o
 ; RUN: ld.lld %t2.o %t.so -o %t
-; RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+; RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 ; Check that we don't crash when gc'ing sections and printing the result.
 ; RUN: ld.lld %t2.o %t.so --gc-sections --print-gc-sections \
 ; RUN:   -o %t
-; RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+; RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/deps/lld/test/ELF/lto/irmover-warning.ll b/deps/lld/test/ELF/lto/irmover-warning.ll
new file mode 100644
index 0000000000000000000000000000000000000000..7b0db782cca695cd33a04ef695871ed72979a474
--- /dev/null
+++ b/deps/lld/test/ELF/lto/irmover-warning.ll
@@ -0,0 +1,23 @@
+; REQUIRES: x86
+; RUN: llvm-as -o %t1.bc %s
+; RUN: llvm-as -o %t2.bc %S/Inputs/irmover-warning.ll
+; RUN: rm -f %t.a
+; RUN: llvm-ar rcs %t.a %t2.bc
+; RUN: ld.lld %t1.bc %t.a -o %t 2>&1 | FileCheck %s
+
+; CHECK: warning: linking module flags 'foo': IDs have conflicting values
+; CHECK-SAME: irmover-warning.ll.tmp.a(irmover-warning.ll.tmp2.bc at {{[0-9]+}})
+
+target triple = "x86_64-unknown-linux-gnu"
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+
+declare void @f()
+
+define void @g() {
+  call void @f()
+  ret void
+}
+
+!0 = !{ i32 2, !"foo", i32 1 }
+
+!llvm.module.flags = !{ !0 }
diff --git a/deps/lld/test/ELF/lto/linker-script-symbols-assign.ll b/deps/lld/test/ELF/lto/linker-script-symbols-assign.ll
index bd7a37402997069c0dc2a57304bf408ba5ad6ed9..30a69f8ace1e6e47fd1a3c02f2a4e9a914789f5e 100644
--- a/deps/lld/test/ELF/lto/linker-script-symbols-assign.ll
+++ b/deps/lld/test/ELF/lto/linker-script-symbols-assign.ll
@@ -3,12 +3,12 @@
 
 ; RUN: echo "foo = 1;" > %t.script
 ; RUN: ld.lld %t.o -o %t2 --script %t.script -save-temps
-; RUN: llvm-readobj -symbols %t2.lto.o | FileCheck %s
+; RUN: llvm-readobj --symbols %t2.lto.o | FileCheck %s
 
 ; CHECK-NOT: bar
 ; CHECK-NOT: foo
 
-; RUN: llvm-readobj -symbols %t2 | FileCheck %s --check-prefix=VAL
+; RUN: llvm-readobj --symbols %t2 | FileCheck %s --check-prefix=VAL
 ; VAL:       Symbol {
 ; VAL:        Name: foo
 ; VAL-NEXT:   Value: 0x1
@@ -21,7 +21,7 @@
 
 ; RUN: echo "zed = 1;" > %t2.script
 ; RUN: ld.lld %t.o -o %t3 --script %t2.script
-; RUN: llvm-readobj -symbols %t3 | FileCheck %s --check-prefix=ABS
+; RUN: llvm-readobj --symbols %t3 | FileCheck %s --check-prefix=ABS
 ; ABS:      Symbol {
 ; ABS:        Name: zed
 ; ABS-NEXT:   Value: 0x1
diff --git a/deps/lld/test/ELF/lto/linker-script-symbols.ll b/deps/lld/test/ELF/lto/linker-script-symbols.ll
index 28758c0520674da1d789c5ec50baf88194c2242a..1fdafefe4e7cb06055a34db1f75a22dc65fa68e2 100644
--- a/deps/lld/test/ELF/lto/linker-script-symbols.ll
+++ b/deps/lld/test/ELF/lto/linker-script-symbols.ll
@@ -3,8 +3,9 @@
 ; RUN: echo "foo = bar;" > %t.script
 
 ; RUN: ld.lld %t.o -o %t2 --script %t.script -save-temps
-; RUN: llvm-readobj -symbols %t2.lto.o | FileCheck %s
+; RUN: llvm-readobj --symbols %t2.lto.o | FileCheck %s
 
+; CHECK: Symbols [
 ; CHECK-NOT:  zed
 ; CHECK:      Symbol {
 ; CHECK:        Name: bar
diff --git a/deps/lld/test/ELF/lto/lto-start.ll b/deps/lld/test/ELF/lto/lto-start.ll
index cc1eb4bd5b013ae84e3b4b3bd3c5b862efe3d859..d50b488e9c275031650dcdbace22dce6e2340198 100644
--- a/deps/lld/test/ELF/lto/lto-start.ll
+++ b/deps/lld/test/ELF/lto/lto-start.ll
@@ -1,7 +1,7 @@
 ; REQUIRES: x86
 ; RUN: llvm-as %s -o %t.o
 ; RUN: ld.lld %t.o -o %t2
-; RUN: llvm-readobj -t %t2 | FileCheck %s
+; RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
 ; CHECK:      Format: ELF64-x86-64
 ; CHECK-NEXT: Arch: x86_64
diff --git a/deps/lld/test/ELF/lto/obj-path.ll b/deps/lld/test/ELF/lto/obj-path.ll
new file mode 100644
index 0000000000000000000000000000000000000000..808e17b242770be0741997afc553d34b63a66fec
--- /dev/null
+++ b/deps/lld/test/ELF/lto/obj-path.ll
@@ -0,0 +1,35 @@
+; REQUIRES: x86
+
+; RUN: opt -module-summary %s -o %t1.o
+; RUN: opt -module-summary %p/Inputs/obj-path.ll -o %t2.o
+
+; Test to ensure that obj-path creates the ELF file.
+; RUN: rm -f %t4.o
+; RUN: ld.lld --plugin-opt=obj-path=%t4.o -shared %t1.o %t2.o -o %t3
+; RUN: llvm-readobj --symbols %t3 | FileCheck %s
+; RUN: llvm-readobj -h %t4.o1 | FileCheck %s -check-prefix=ELF1
+; RUN: llvm-readobj -h %t4.o2 | FileCheck %s -check-prefix=ELF2
+; RUN: llvm-nm %t4.o1 2>&1 | FileCheck %s -check-prefix=NM1
+; RUN: llvm-nm %t4.o2 2>&1 | FileCheck %s -check-prefix=NM2
+
+; CHECK:      Name: g
+; CHECK-NEXT: Value: 0x1010
+; CHECK:      Name: f
+; CHECK-NEXT: Value: 0x1000
+
+; NM1: T f
+; ELF1: Format: ELF64-x86-64
+
+; NM2: T g
+; ELF2: Format: ELF64-x86-64
+
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+declare void @g(...)
+
+define void @f() {
+entry:
+  call void (...) @g()
+  ret void
+}
diff --git a/deps/lld/test/ELF/lto/opt-remarks.ll b/deps/lld/test/ELF/lto/opt-remarks.ll
index bef7e016a1c08521aac64910d09ebbfd8751702a..013e28e79bf4611a60b1342128cc379a0a70f99f 100644
--- a/deps/lld/test/ELF/lto/opt-remarks.ll
+++ b/deps/lld/test/ELF/lto/opt-remarks.ll
@@ -8,10 +8,16 @@
 ; RUN:  %t.o -o %t -shared
 ; RUN: cat %t.yaml | FileCheck %s -check-prefix=YAML
 ; RUN: cat %t.hot.yaml | FileCheck %s -check-prefix=YAML-HOT
+; RUN: ld.lld --opt-remarks-filename %t1.yaml --opt-remarks-passes inline %t.o \
+; RUN: -o /dev/null -shared
+; RUN: cat %t1.yaml | FileCheck %s -check-prefix=YAML-PASSES
+; RUN: ld.lld --opt-remarks-filename %t1.yaml --opt-remarks-format yaml %t.o \
+; RUN: -o /dev/null -shared
+; RUN: cat %t.yaml | FileCheck %s -check-prefix=YAML
 
 ; Check that @tinkywinky is inlined after optimizations.
 ; CHECK-LABEL: define i32 @main
-; CHECK-NEXT:  %a.i = call i32 @patatino()
+; CHECK-NEXT:  %a.i = {{.*}}call i32 @patatino()
 ; CHECK-NEXT:  ret i32 %a.i
 ; CHECK-NEXT: }
 
@@ -48,6 +54,8 @@
 ; YAML-HOT-NEXT:   - String:          ')'
 ; YAML-HOT-NEXT: ...
 
+; YAML-PASSES: Pass:            inline
+
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-scei-ps4"
 
diff --git a/deps/lld/test/ELF/lto/parallel-internalize.ll b/deps/lld/test/ELF/lto/parallel-internalize.ll
index f21b3ccd29e9f6e70d3a7e02b4fb3010d2306b49..907ba478d87b2234a2bca1cd2cae04a401a3c502 100644
--- a/deps/lld/test/ELF/lto/parallel-internalize.ll
+++ b/deps/lld/test/ELF/lto/parallel-internalize.ll
@@ -3,7 +3,7 @@
 ; RUN: rm -f %t.lto.o %t1.lto.o
 ; RUN: ld.lld --lto-partitions=2 -save-temps -o %t %t.bc \
 ; RUN:   -e foo --lto-O0
-; RUN: llvm-readobj -t -dyn-symbols %t | FileCheck %s
+; RUN: llvm-readobj --symbols --dyn-syms %t | FileCheck %s
 ; RUN: llvm-nm %t.lto.o | FileCheck --check-prefix=CHECK0 %s
 ; RUN: llvm-nm %t1.lto.o | FileCheck --check-prefix=CHECK1 %s
 
diff --git a/deps/lld/test/ELF/lto/relocatable.ll b/deps/lld/test/ELF/lto/relocatable.ll
index 5a0ed4252bfe3a196cc9c205ba01c65a5a518b4b..9c7a0c280da24a1597678a2610a7557608a67ad8 100644
--- a/deps/lld/test/ELF/lto/relocatable.ll
+++ b/deps/lld/test/ELF/lto/relocatable.ll
@@ -1,7 +1,7 @@
 ; REQUIRES: x86
 ; RUN: llvm-as %s -o %t1.o
 ; RUN: ld.lld %t1.o -r -o %t
-; RUN: llvm-readobj -symbols %t | FileCheck %s
+; RUN: llvm-readobj --symbols %t | FileCheck %s
 
 ; CHECK:       Symbols [
 ; CHECK-NEXT:   Symbol {
@@ -71,3 +71,5 @@ define void @foo() {
 define internal void @bar() {
   ret void
 }
+
+declare i32 @baz(...)
diff --git a/deps/lld/test/ELF/lto/resolution.ll b/deps/lld/test/ELF/lto/resolution.ll
index b3fcf1db3a1b60d1a95e183b6b1ad933b6320927..d4ab1bf1c671083895541ca32fe58dfcb22f4a71 100644
--- a/deps/lld/test/ELF/lto/resolution.ll
+++ b/deps/lld/test/ELF/lto/resolution.ll
@@ -2,7 +2,7 @@
 ; RUN: llvm-as %s -o %t1.o
 ; RUN: llvm-mc -triple=x86_64-pc-linux %p/Inputs/resolution.s -o %t2.o -filetype=obj
 ; RUN: ld.lld %t1.o %t2.o -o %t.so -shared
-; RUN: llvm-readobj -s --section-data %t.so | FileCheck %s
+; RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
 
 ; CHECK:      Name: .data
 ; CHECK-NEXT: Type: SHT_PROGBITS
diff --git a/deps/lld/test/ELF/lto/riscv32.ll b/deps/lld/test/ELF/lto/riscv32.ll
new file mode 100644
index 0000000000000000000000000000000000000000..1fe5547748fc329d4b65a49af0901c1e8b96b076
--- /dev/null
+++ b/deps/lld/test/ELF/lto/riscv32.ll
@@ -0,0 +1,10 @@
+; REQUIRES: riscv
+
+; RUN: llvm-as %s -o %t.o
+; RUN: ld.lld %t.o -o %t
+target datalayout = "e-m:e-p:32:32-i64:64-n32-S128"
+target triple = "riscv32-unknown-elf"
+
+define void @f() {
+  ret void
+}
diff --git a/deps/lld/test/ELF/lto/riscv64.ll b/deps/lld/test/ELF/lto/riscv64.ll
new file mode 100644
index 0000000000000000000000000000000000000000..59de1de4a8d9122beaa847157d47f04b488004c5
--- /dev/null
+++ b/deps/lld/test/ELF/lto/riscv64.ll
@@ -0,0 +1,10 @@
+; REQUIRES: riscv
+
+; RUN: llvm-as %s -o %t.o
+; RUN: ld.lld %t.o -o %t
+target datalayout = "e-m:e-p:64:64-i64:64-i128:128-n64-S128"
+target triple = "riscv64-unknown-elf"
+
+define void @f() {
+  ret void
+}
diff --git a/deps/lld/test/ELF/lto/setting-dso-local.ll b/deps/lld/test/ELF/lto/setting-dso-local.ll
index 74ce4e7f16d38cbabea95f6b98a8fcf0bdd2d7c9..d2d9c29fc4634fd538c9b1460b801050f09113dd 100644
--- a/deps/lld/test/ELF/lto/setting-dso-local.ll
+++ b/deps/lld/test/ELF/lto/setting-dso-local.ll
@@ -2,7 +2,7 @@
 ; RUN: llvm-as %s -o %t1.o
 ; RUN: not ld.lld -o %t %t1.o 2>&1 | FileCheck %s
 
-; CHECK: undefined symbol: foobar
+; CHECK: undefined hidden symbol: foobar
 
 ; We used to crash setting foobar to non-dso_local
 
diff --git a/deps/lld/test/ELF/lto/shlib-undefined.ll b/deps/lld/test/ELF/lto/shlib-undefined.ll
index eec40cc2771bf2e3de5e98d85400e556cf3763e2..01fe915d6b031dc91f0c7ef1f6792e552056a02f 100644
--- a/deps/lld/test/ELF/lto/shlib-undefined.ll
+++ b/deps/lld/test/ELF/lto/shlib-undefined.ll
@@ -4,7 +4,7 @@
 ; RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %t2.s -o %t2.o
 ; RUN: ld.lld -shared %t2.o -o %t2.so
 ; RUN: ld.lld -o %t %t.o %t2.so
-; RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+; RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 ; CHECK:      Name:     __progname
 ; CHECK-NEXT: Value:    0x201010
diff --git a/deps/lld/test/ELF/lto/thinlto-cant-write-index.ll b/deps/lld/test/ELF/lto/thinlto-cant-write-index.ll
index 94f2a45c2743fab5fd5ca6b78cddd5e4a356a85a..784fbafd2a4872dca8d99c26b3833adf8646db36 100644
--- a/deps/lld/test/ELF/lto/thinlto-cant-write-index.ll
+++ b/deps/lld/test/ELF/lto/thinlto-cant-write-index.ll
@@ -7,8 +7,9 @@
 ; Ensure lld generates error if unable to write to index files
 ; RUN: rm -f %t2.o.thinlto.bc
 ; RUN: touch %t2.o.thinlto.bc
-; RUN: chmod 400 %t2.o.thinlto.bc
+; RUN: chmod u-w %t2.o.thinlto.bc
 ; RUN: not ld.lld --plugin-opt=thinlto-index-only -shared %t1.o %t2.o -o %t3 2>&1 | FileCheck %s
+; RUN: chmod u+w %t2.o.thinlto.bc
 ; CHECK: cannot open {{.*}}2.o.thinlto.bc: {{P|p}}ermission denied
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
diff --git a/deps/lld/test/ELF/lto/thinlto-index-only.ll b/deps/lld/test/ELF/lto/thinlto-index-only.ll
index 6263799ee2fd5e3a934b54f16abe2dad42c475b0..594b4bcf7677985b5d6243d1fe43c31706382bfe 100644
--- a/deps/lld/test/ELF/lto/thinlto-index-only.ll
+++ b/deps/lld/test/ELF/lto/thinlto-index-only.ll
@@ -38,15 +38,11 @@
 ; RUN: ls %t1.o.thinlto.bc
 ; RUN: ls %t1.o.imports
 
-; Ensure lld generates an error if unable to write an empty index file
-; for lazy object file that is not added to link.
-; RUN: rm -f %t1.o.thinlto.bc
-; RUN: touch %t1.o.thinlto.bc
-; RUN: chmod 400 %t1.o.thinlto.bc
-; RUN: not ld.lld --plugin-opt=thinlto-index-only -shared %t2.o --start-lib %t1.o --end-lib \
-; RUN:   -o %t3 2>&1 | FileCheck %s
-; CHECK: cannot open {{.*}}1.o.thinlto.bc: {{P|p}}ermission denied
+; Ensure LLD generates an empty index for each bitcode file even if all bitcode files are lazy.
 ; RUN: rm -f %t1.o.thinlto.bc
+; RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux-gnu /dev/null -o %tdummy.o
+; RUN: ld.lld --plugin-opt=thinlto-index-only -shared %tdummy.o --start-lib %t1.o --end-lib -o /dev/null
+; RUN: ls %t1.o.thinlto.bc
 
 ; NM: T f
 
diff --git a/deps/lld/test/ELF/lto/tls-preserve.ll b/deps/lld/test/ELF/lto/tls-preserve.ll
index c9b7675cd22fd759d6e5e48c856cf1df83e2f0dc..a3d767c0dadb8b37315dd8a63332b3f8332897f5 100644
--- a/deps/lld/test/ELF/lto/tls-preserve.ll
+++ b/deps/lld/test/ELF/lto/tls-preserve.ll
@@ -2,7 +2,7 @@
 ; REQUIRES: x86
 ; RUN: llvm-as %s -o %t1.o
 ; RUN: ld.lld -shared %t1.o -o %t1
-; RUN: llvm-readobj -t %t1 | FileCheck %s
+; RUN: llvm-readobj --symbols %t1 | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/deps/lld/test/ELF/lto/undef-mixed.ll b/deps/lld/test/ELF/lto/undef-mixed.ll
index 0fff5781020c319f5e41395356da22077b6cc8ee..defda599f40d1a7cb9eadc59813504ed8e5bd432 100644
--- a/deps/lld/test/ELF/lto/undef-mixed.ll
+++ b/deps/lld/test/ELF/lto/undef-mixed.ll
@@ -2,7 +2,7 @@
 ; RUN: llvm-mc %p/Inputs/undef-mixed.s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 ; RUN: llvm-as %s -o %t2.o
 ; RUN: ld.lld %t2.o %t.o -o %t.so -shared
-; RUN: llvm-readobj -t %t.so | FileCheck %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck %s
 
 ; CHECK:      Name: bar
 ; CHECK-NEXT: Value:
diff --git a/deps/lld/test/ELF/lto/undef-weak.ll b/deps/lld/test/ELF/lto/undef-weak.ll
index e090f5653a0987462db407fdab9f379891f6ee90..a84adb42441391f8eff7c7b97e83287a405c1344 100644
--- a/deps/lld/test/ELF/lto/undef-weak.ll
+++ b/deps/lld/test/ELF/lto/undef-weak.ll
@@ -5,7 +5,7 @@
 
 ; RUN: llvm-as %s -o %t2.o
 ; RUN: ld.lld %t2.o -o %t2.so %t.a -shared
-; RUN: llvm-readobj -t %t2.so | FileCheck %s
+; RUN: llvm-readobj --symbols %t2.so | FileCheck %s
 
 target triple = "x86_64-unknown-linux-gnu"
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
diff --git a/deps/lld/test/ELF/lto/undef.ll b/deps/lld/test/ELF/lto/undef.ll
index 4ea7e833df10cc96dcafa42f55054013da90e377..74127db2e051e43fab77ac804e207e5c12ad145e 100644
--- a/deps/lld/test/ELF/lto/undef.ll
+++ b/deps/lld/test/ELF/lto/undef.ll
@@ -1,7 +1,7 @@
 ; REQUIRES: x86
 ; RUN: llvm-as %s -o %t.o
 ; RUN: ld.lld %t.o -o %t.so -shared
-; RUN: llvm-readobj -t %t.so | FileCheck %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck %s
 target triple = "x86_64-unknown-linux-gnu"
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 
diff --git a/deps/lld/test/ELF/lto/undefined-puts.ll b/deps/lld/test/ELF/lto/undefined-puts.ll
index f34abe68206c0dc23a328b397161c0cdb8e8a37d..777ca56eae36b09f0b6836e055792c6ad5078495 100644
--- a/deps/lld/test/ELF/lto/undefined-puts.ll
+++ b/deps/lld/test/ELF/lto/undefined-puts.ll
@@ -3,7 +3,7 @@
 ; RUN: ld.lld %t1.o -o %t1.so -shared
 ; RUN: llvm-as %s -o %t2.o
 ; RUN: ld.lld %t1.so %t2.o -o %t
-; RUN: llvm-readobj -dyn-symbols -dyn-relocations %t | FileCheck %s
+; RUN: llvm-readobj --dyn-syms --dyn-relocations %t | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
@@ -20,7 +20,7 @@ declare i32 @printf(i8*, ...)
 ; Check that puts symbol is present in the dynamic symbol table and
 ; there's a relocation for it.
 ; CHECK: Dynamic Relocations {
-; CHECK-NEXT:  0x202018 R_X86_64_JUMP_SLOT puts 0x0
+; CHECK-NEXT:  0x203018 R_X86_64_JUMP_SLOT puts 0x0
 ; CHECK-NEXT: }
 
 ; CHECK: DynamicSymbols [
diff --git a/deps/lld/test/ELF/lto/version-script.ll b/deps/lld/test/ELF/lto/version-script.ll
index eae5a35a6ff4dd092e307636bdce96239573c121..f12d7b6f6df72601fccb1448a9d74bdbd19caaa4 100644
--- a/deps/lld/test/ELF/lto/version-script.ll
+++ b/deps/lld/test/ELF/lto/version-script.ll
@@ -3,7 +3,7 @@
 ; RUN: echo "VERSION_1.0{ global: foo; local: *; }; VERSION_2.0{ global: bar; local: *; };" > %t.script
 ; RUN: ld.lld %t.o -o %t2 -shared --version-script %t.script -save-temps
 ; RUN: llvm-dis < %t2.0.0.preopt.bc | FileCheck %s
-; RUN: llvm-readobj -V -dyn-symbols %t2 | FileCheck --check-prefix=DSO %s
+; RUN: llvm-readobj -V --dyn-syms %t2 | FileCheck --check-prefix=DSO %s
 
 target triple = "x86_64-unknown-linux-gnu"
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
diff --git a/deps/lld/test/ELF/lto/version-script2.ll b/deps/lld/test/ELF/lto/version-script2.ll
index ab8f75a3eecc8728a1b0fa7682bc64a1a26e50cd..899a42b0e44394c614597b4cbd9603dec7cf0b7d 100644
--- a/deps/lld/test/ELF/lto/version-script2.ll
+++ b/deps/lld/test/ELF/lto/version-script2.ll
@@ -2,7 +2,7 @@
 ; RUN: llvm-as %s -o %t.o
 ; RUN: echo "VER1 {};" > %t.script
 ; RUN: ld.lld %t.o -o %t.so -shared --version-script %t.script
-; RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s
+; RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s
 
 ; test that we have the correct version.
 ; CHECK: Name: foo@@VER1 (
diff --git a/deps/lld/test/ELF/lto/visibility.ll b/deps/lld/test/ELF/lto/visibility.ll
index 434b61ef294c395f633ac8eee1ec5b6e17f9eaf4..fdf579a51f13ca1cc3bf1dbad893eb0384dffb93 100644
--- a/deps/lld/test/ELF/lto/visibility.ll
+++ b/deps/lld/test/ELF/lto/visibility.ll
@@ -3,7 +3,7 @@
 ; RUN: llvm-mc -triple=x86_64-pc-linux %p/Inputs/visibility.s -o %t2.o -filetype=obj
 ; RUN: ld.lld %t1.o %t2.o -o %t.so -shared -save-temps
 ; RUN: llvm-dis < %t.so.0.2.internalize.bc | FileCheck --check-prefix=IR %s
-; RUN: llvm-readobj -t %t.so | FileCheck %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck %s
 
 ; CHECK:      Name: g
 ; CHECK-NEXT: Value: 0x1000
@@ -16,7 +16,7 @@
 ; CHECK-NEXT: Section: .text
 
 ; CHECK:      Name: a
-; CHECK-NEXT: Value: 0x2000
+; CHECK-NEXT: Value: 0x3000
 ; CHECK-NEXT: Size: 0
 ; CHECK-NEXT: Binding: Local
 ; CHECK-NEXT: Type: None
diff --git a/deps/lld/test/ELF/lto/weak.ll b/deps/lld/test/ELF/lto/weak.ll
index a807c1325db506c5b5953d3f345ab7fd13cc2dfc..f716e3327766d18b829e53079fd1052df005f168 100644
--- a/deps/lld/test/ELF/lto/weak.ll
+++ b/deps/lld/test/ELF/lto/weak.ll
@@ -1,7 +1,7 @@
 ; REQUIRES: x86
 ; RUN: llvm-as %s -o %t.o
 ; RUN: ld.lld %t.o %t.o -o %t.so -shared
-; RUN: llvm-readobj -t %t.so | FileCheck %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck %s
 
 target triple = "x86_64-unknown-linux-gnu"
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
diff --git a/deps/lld/test/ELF/lto/weakodr-visibility.ll b/deps/lld/test/ELF/lto/weakodr-visibility.ll
index 95bd3e4c5a2893886fd68b719608291053024470..496de3c60c704947af42ec43fcabb4010a0c213b 100644
--- a/deps/lld/test/ELF/lto/weakodr-visibility.ll
+++ b/deps/lld/test/ELF/lto/weakodr-visibility.ll
@@ -9,7 +9,7 @@
 ; but keeps `protected` visibility.
 
 ; RUN: ld.lld %t1.o %t2.o -o %t.so -shared
-; RUN: llvm-readobj -t %t.so | FileCheck %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck %s
 ; RUN: llvm-objdump -d %t.so | FileCheck %s --check-prefix=FIRST
 ; CHECK:       Symbol {
 ; CHECK:        Name: foo
@@ -27,7 +27,7 @@
 
 ; Now swap the files order.
 ; RUN: ld.lld %t2.o %t1.o -o %t.so -shared
-; RUN: llvm-readobj -t %t.so | FileCheck %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck %s
 ; RUN: llvm-objdump -d %t.so | FileCheck %s --check-prefix=SECOND
 ; SECOND:      foo:
 ; SECOND-NEXT:   movl    $42, %eax
diff --git a/deps/lld/test/ELF/lto/wrap-1.ll b/deps/lld/test/ELF/lto/wrap-1.ll
index b82bece253d1a89362031ad02da67827206575c3..310a7dab384a2b9d209207113a4836fd641cffe6 100644
--- a/deps/lld/test/ELF/lto/wrap-1.ll
+++ b/deps/lld/test/ELF/lto/wrap-1.ll
@@ -2,13 +2,13 @@
 ; LTO
 ; RUN: llvm-as %s -o %t.o
 ; RUN: ld.lld %t.o -o %t.out -wrap=bar -save-temps
-; RUN: llvm-readobj -t %t.out | FileCheck %s
+; RUN: llvm-readobj --symbols %t.out | FileCheck %s
 ; RUN: cat %t.out.resolution.txt | FileCheck -check-prefix=RESOLS %s
 
 ; ThinLTO
 ; RUN: opt -module-summary %s -o %t.o
 ; RUN: ld.lld %t.o -o %t.out -wrap=bar -save-temps
-; RUN: llvm-readobj -t %t.out | FileCheck %s
+; RUN: llvm-readobj --symbols %t.out | FileCheck %s
 ; RUN: cat %t.out.resolution.txt | FileCheck -check-prefix=RESOLS %s
 
 ; CHECK:      Name: __wrap_bar
diff --git a/deps/lld/test/ELF/lto/wrap-2.ll b/deps/lld/test/ELF/lto/wrap-2.ll
index 997725fb8defc2c1d35cc2c8d123a3ea25e79995..7a312f881b72dcdbcb611643575459df6a2ee8c6 100644
--- a/deps/lld/test/ELF/lto/wrap-2.ll
+++ b/deps/lld/test/ELF/lto/wrap-2.ll
@@ -4,14 +4,14 @@
 ; RUN: llvm-as %S/Inputs/wrap-bar.ll -o %t1.o
 ; RUN: ld.lld %t.o %t1.o -shared -o %t.so -wrap=bar
 ; RUN: llvm-objdump -d %t.so | FileCheck %s
-; RUN: llvm-readobj -t %t.so | FileCheck -check-prefix=BIND %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck -check-prefix=BIND %s
 
 ; ThinLTO
 ; RUN: opt -module-summary %s -o %t.o
 ; RUN: opt -module-summary %S/Inputs/wrap-bar.ll -o %t1.o
 ; RUN: ld.lld %t.o %t1.o -shared -o %t.so -wrap=bar
-; RUN: llvm-objdump -d %t.so | FileCheck %s -check-prefix=THIN
-; RUN: llvm-readobj -t %t.so | FileCheck -check-prefix=BIND %s
+; RUN: llvm-objdump -d %t.so | FileCheck %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck -check-prefix=BIND %s
 
 ; Make sure that calls in foo() are not eliminated and that bar is
 ; routed to __wrap_bar and __real_bar is routed to bar.
@@ -19,13 +19,8 @@
 ; CHECK:      foo:
 ; CHECK-NEXT: pushq	%rax
 ; CHECK-NEXT: callq{{.*}}<__wrap_bar>
-; CHECK-NEXT: callq{{.*}}<bar>
-
-; THIN:      foo:
-; THIN-NEXT: pushq	%rax
-; THIN-NEXT: callq{{.*}}<__wrap_bar>
-; THIN-NEXT: popq  %rax
-; THIN-NEXT: jmp{{.*}}<bar>
+; CHECK-NEXT: popq  %rax
+; CHECK-NEXT: jmp{{.*}}<bar>
 
 ; Check that bar and __wrap_bar retain their original binding.
 ; BIND:      Name: bar
diff --git a/deps/lld/test/ELF/magic-page-combo-warn.s b/deps/lld/test/ELF/magic-page-combo-warn.s
new file mode 100644
index 0000000000000000000000000000000000000000..50f328647d9e44aa536af3b3b4afb24e763017a6
--- /dev/null
+++ b/deps/lld/test/ELF/magic-page-combo-warn.s
@@ -0,0 +1,86 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
+
+# Test that we warn when a page size is set and paging is disabled by -n or -N.
+
+# RUN: ld.lld -z max-page-size=0x10 -z common-page-size=0x10 -N %t -o %t2 2>&1 | FileCheck --check-prefix=WARN %s
+# RUN: llvm-readobj --program-headers %t2 | FileCheck --check-prefix=OMAGIC %s
+# RUN: ld.lld -z max-page-size=0x10 -z common-page-size=0x10 --omagic %t -o %t2  2>&1 | FileCheck --check-prefix=WARN %s
+# RUN: llvm-readobj --program-headers %t2 | FileCheck --check-prefix=OMAGIC %s
+
+# WARN: ld.lld: warning: -z max-page-size set, but paging disabled by omagic or nmagic
+# WARN-NEXT: ld.lld: warning: -z common-page-size set, but paging disabled by omagic or nmagic
+
+# OMAGIC:     ProgramHeader {
+# OMAGIC:      Type: PT_LOAD
+# OMAGIC-NEXT:   Offset: 0xE8
+# OMAGIC-NEXT:   VirtualAddress:
+# OMAGIC-NEXT:   PhysicalAddress:
+# OMAGIC-NEXT:   FileSize:
+# OMAGIC-NEXT:   MemSize:
+# OMAGIC-NEXT:   Flags [
+# OMAGIC-NEXT:     PF_R
+# OMAGIC-NEXT:     PF_W
+# OMAGIC-NEXT:     PF_X
+# OMAGIC-NEXT:   ]
+# OMAGIC-NEXT:   Alignment: 8
+# OMAGIC-NEXT: }
+# OMAGIC-NEXT: ProgramHeader {
+# OMAGIC-NEXT:   Type: PT_GNU_STACK
+
+# RUN: ld.lld -z max-page-size=0x10 -z common-page-size=0x10 -n %t -o %t3  2>&1 | FileCheck --check-prefix=WARN %s
+# RUN: llvm-readobj --program-headers %t3 | FileCheck --check-prefix=NMAGIC %s
+# RUN: ld.lld -z max-page-size=0x10 -z common-page-size=0x10 --nmagic %t -o %t3  2>&1 | FileCheck --check-prefix=WARN %s
+# RUN: llvm-readobj --program-headers %t3 | FileCheck --check-prefix=NMAGIC %s
+
+# NMAGIC:   ProgramHeader {
+# NMAGIC-NEXT:     Type: PT_LOAD
+# NMAGIC-NEXT:     Offset: 0x158
+# NMAGIC-NEXT:     VirtualAddress:
+# NMAGIC-NEXT:     PhysicalAddress:
+# NMAGIC-NEXT:     FileSize: 1
+# NMAGIC-NEXT:     MemSize: 1
+# NMAGIC-NEXT:     Flags [
+# NMAGIC-NEXT:       PF_R
+# NMAGIC-NEXT:     ]
+# NMAGIC-NEXT:     Alignment: 8
+# NMAGIC-NEXT:   }
+# NMAGIC-NEXT:   ProgramHeader {
+# NMAGIC-NEXT:     Type: PT_LOAD
+# NMAGIC-NEXT:     Offset: 0x15C
+# NMAGIC-NEXT:     VirtualAddress:
+# NMAGIC-NEXT:     PhysicalAddress:
+# NMAGIC-NEXT:     FileSize: 2
+# NMAGIC-NEXT:     MemSize: 2
+# NMAGIC-NEXT:     Flags [
+# NMAGIC-NEXT:       PF_R
+# NMAGIC-NEXT:       PF_X
+# NMAGIC-NEXT:     ]
+# NMAGIC-NEXT:     Alignment: 4
+# NMAGIC-NEXT:   }
+# NMAGIC-NEXT:   ProgramHeader {
+# NMAGIC-NEXT:     Type: PT_LOAD (0x1)
+# NMAGIC-NEXT:     Offset: 0x15E
+# NMAGIC-NEXT:     VirtualAddress:
+# NMAGIC-NEXT:     PhysicalAddress:
+# NMAGIC-NEXT:     FileSize: 1
+# NMAGIC-NEXT:     MemSize: 1
+# NMAGIC-NEXT:     Flags [
+# NMAGIC-NEXT:       PF_R
+# NMAGIC-NEXT:       PF_W
+# NMAGIC-NEXT:     ]
+# NMAGIC-NEXT:     Alignment: 1
+# NMAGIC-NEXT:   }
+
+.global _start
+_start:
+ nop
+
+.section .ro,"a"
+nop
+
+.section .rw,"aw"
+nop
+
+.section .rx,"ax"
+nop
diff --git a/deps/lld/test/ELF/many-alloc-sections.s b/deps/lld/test/ELF/many-alloc-sections.s
index a022b9275d9faec87cc9e9211dbf09cee5fe6bd6..12c7a5ce3bc1160ef53b3def8c594654d67970e6 100644
--- a/deps/lld/test/ELF/many-alloc-sections.s
+++ b/deps/lld/test/ELF/many-alloc-sections.s
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t.o
 // RUN: echo "SECTIONS { . = SIZEOF_HEADERS; .text : { *(.text) } }" > %t.script
 // RUN: ld.lld -T %t.script %t.o -o %t
-// RUN: llvm-readobj -t %t | FileCheck %s
+// RUN: llvm-readobj --symbols %t | FileCheck %s
 
 // Test that _start is in the correct section.
 // CHECK:      Name: _start
diff --git a/deps/lld/test/ELF/many-sections.s b/deps/lld/test/ELF/many-sections.s
index e3b845f305a8c06f22c0b036685f8ce15d763707..81be8a464aaac23a7bf0e385624e1c3556feedea 100644
--- a/deps/lld/test/ELF/many-sections.s
+++ b/deps/lld/test/ELF/many-sections.s
@@ -1,6 +1,6 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t
-// RUN: llvm-readobj -t %t | FileCheck  %s
+// RUN: llvm-readobj --symbols %t | FileCheck  %s
 
 // Verify that the symbol _start is in a section with an index >= SHN_LORESERVE.
 // CHECK:      Name: _start
@@ -12,12 +12,12 @@
 // CHECK-NEXT: Section: dm (0xFF00)
 
 // RUN: ld.lld %t -o %t2
-// RUN: llvm-readobj -t %t2 | FileCheck --check-prefix=LINKED %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck --check-prefix=LINKED %s
 
 // Test also with a linker script.
 // RUN: echo "SECTIONS { . = SIZEOF_HEADERS; .text : { *(.text) } }" > %t.script
 // RUN: ld.lld -T %t.script %t -o %t2
-// RUN: llvm-readobj -t %t2 | FileCheck --check-prefix=LINKED %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck --check-prefix=LINKED %s
 
 // Test that _start is in the correct section.
 // LINKED:      Name: _start
diff --git a/deps/lld/test/ELF/map-file.s b/deps/lld/test/ELF/map-file.s
index 76e50fb5db04f54626afbc77c01ad7d18c05b9ef..2a23eb1925b4d997f73a3b9028e11b9e57d7837d 100644
--- a/deps/lld/test/ELF/map-file.s
+++ b/deps/lld/test/ELF/map-file.s
@@ -41,22 +41,22 @@ abs = 0xAB5
 labs = 0x1AB5
 
 // CHECK:         VMA              LMA     Size Align Out     In      Symbol
-// CHECK-NEXT: 2001c8           2001c8       78     8 .dynsym
-// CHECK-NEXT: 2001c8           2001c8       78     8         <internal>:(.dynsym)
-// CHECK-NEXT: 200240           200240       2c     8 .gnu.hash
-// CHECK-NEXT: 200240           200240       2c     8         <internal>:(.gnu.hash)
-// CHECK-NEXT: 20026c           20026c       30     4 .hash
-// CHECK-NEXT: 20026c           20026c       30     4         <internal>:(.hash)
-// CHECK-NEXT: 20029c           20029c       31     1 .dynstr
-// CHECK-NEXT: 20029c           20029c       31     1         <internal>:(.dynstr)
-// CHECK-NEXT: 2002d0           2002d0       30     8 .rela.dyn
-// CHECK-NEXT: 2002d0           2002d0       30     8         <internal>:(.rela.dyn)
-// CHECK-NEXT: 200300           200300       30     8 .rela.plt
-// CHECK-NEXT: 200300           200300       30     8         <internal>:(.rela.plt)
-// CHECK-NEXT: 200330           200330       64     8 .eh_frame
-// CHECK-NEXT: 200330           200330       2c     1         {{.*}}{{/|\\}}map-file.s.tmp1.o:(.eh_frame+0x0)
-// CHECK-NEXT: 200360           200360       14     1         {{.*}}{{/|\\}}map-file.s.tmp1.o:(.eh_frame+0x2c)
-// CHECK-NEXT: 200378           200378       18     1         {{.*}}{{/|\\}}map-file.s.tmp2.o:(.eh_frame+0x18)
+// CHECK-NEXT: 200200           200200       78     8 .dynsym
+// CHECK-NEXT: 200200           200200       78     8         <internal>:(.dynsym)
+// CHECK-NEXT: 200278           200278       2c     8 .gnu.hash
+// CHECK-NEXT: 200278           200278       2c     8         <internal>:(.gnu.hash)
+// CHECK-NEXT: 2002a4           2002a4       30     4 .hash
+// CHECK-NEXT: 2002a4           2002a4       30     4         <internal>:(.hash)
+// CHECK-NEXT: 2002d4           2002d4       31     1 .dynstr
+// CHECK-NEXT: 2002d4           2002d4       31     1         <internal>:(.dynstr)
+// CHECK-NEXT: 200308           200308       30     8 .rela.dyn
+// CHECK-NEXT: 200308           200308       30     8         <internal>:(.rela.dyn)
+// CHECK-NEXT: 200338           200338       30     8 .rela.plt
+// CHECK-NEXT: 200338           200338       30     8         <internal>:(.rela.plt)
+// CHECK-NEXT: 200368           200368       64     8 .eh_frame
+// CHECK-NEXT: 200368           200368       2c     1         {{.*}}{{/|\\}}map-file.s.tmp1.o:(.eh_frame+0x0)
+// CHECK-NEXT: 200398           200398       14     1         {{.*}}{{/|\\}}map-file.s.tmp1.o:(.eh_frame+0x2c)
+// CHECK-NEXT: 2003b0           2003b0       18     1         {{.*}}{{/|\\}}map-file.s.tmp2.o:(.eh_frame+0x18)
 // CHECK-NEXT: 201000           201000       2d     4 .text
 // CHECK-NEXT: 201000           201000       28     4         {{.*}}{{/|\\}}map-file.s.tmp1.o:(.text)
 // CHECK-NEXT: 201000           201000        0     1                 _start
@@ -75,17 +75,17 @@ labs = 0x1AB5
 // CHECK-NEXT: 201030           201030       30    16         <internal>:(.plt)
 // CHECK-NEXT: 201040           201040        0     1                 sharedFunc1
 // CHECK-NEXT: 201050           201050        0     1                 sharedFunc2
-// CHECK-NEXT: 202000           202000       28     8 .got.plt
-// CHECK-NEXT: 202000           202000       28     8         <internal>:(.got.plt)
-// CHECK-NEXT: 203000           203000      100     8 .dynamic
-// CHECK-NEXT: 203000           203000      100     8         <internal>:(.dynamic)
-// CHECK-NEXT: 204000           204000       10    16 .bss
-// CHECK-NEXT: 204000           204000        4    16         {{.*}}{{/|\\}}map-file.s.tmp1.o:(COMMON)
-// CHECK-NEXT: 204000           204000        4     1                 common
-// CHECK-NEXT: 204004           204004        4     1         <internal>:(.bss)
-// CHECK-NEXT: 204004           204004        4     1                 sharedFoo
-// CHECK-NEXT: 204008           204008        8     1         <internal>:(.bss)
-// CHECK-NEXT: 204008           204008        8     1                 sharedBar
+// CHECK-NEXT: 202000           202000      100     8 .dynamic
+// CHECK-NEXT: 202000           202000      100     8         <internal>:(.dynamic)
+// CHECK-NEXT: 203000           203000       28     8 .got.plt
+// CHECK-NEXT: 203000           203000       28     8         <internal>:(.got.plt)
+// CHECK-NEXT: 203030           203030       10    16 .bss
+// CHECK-NEXT: 203030           203030        4    16         {{.*}}{{/|\\}}map-file.s.tmp1.o:(COMMON)
+// CHECK-NEXT: 203030           203030        4     1                 common
+// CHECK-NEXT: 203034           203034        4     1         <internal>:(.bss)
+// CHECK-NEXT: 203034           203034        4     1                 sharedFoo
+// CHECK-NEXT: 203038           203038        8     1         <internal>:(.bss)
+// CHECK-NEXT: 203038           203038        8     1                 sharedBar
 // CHECK-NEXT:      0                0        8     1 .comment
 // CHECK-NEXT:      0                0        8     1         <internal>:(.comment)
 // CHECK-NEXT:      0                0      198     8 .symtab
diff --git a/deps/lld/test/ELF/merge-align.s b/deps/lld/test/ELF/merge-align.s
index dea2fc2086e46afb1e9be07169fae3248a392c29..6c6ee30ab494e45809c0b2131d119a0f4dcaa39a 100644
--- a/deps/lld/test/ELF/merge-align.s
+++ b/deps/lld/test/ELF/merge-align.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
 
         .section        .rodata.foo,"aM",@progbits,1
         .align  16
diff --git a/deps/lld/test/ELF/merge-align2.s b/deps/lld/test/ELF/merge-align2.s
new file mode 100644
index 0000000000000000000000000000000000000000..8dafe161bdd71503560ab064f3653d25c6932159
--- /dev/null
+++ b/deps/lld/test/ELF/merge-align2.s
@@ -0,0 +1,35 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-readelf -S %t | FileCheck --check-prefix=SEC %s
+# RUN: llvm-readelf -x .cst8 %t | FileCheck %s
+
+# RUN: ld.lld -O0 -r %t.o -o %t1.o
+# RUN: llvm-readelf -S %t1.o | FileCheck --check-prefix=SEC %s
+# RUN: llvm-readelf -x .cst8 %t1.o | FileCheck %s
+
+## Check that if we have SHF_MERGE sections with the same name, flags and
+## entsize, but different alignments, we combine them with the maximum input
+## alignment as the output alignment.
+
+# SEC: Name  Type     {{.*}} Size   ES Flg Lk Inf Al
+# SEC: .cst8 PROGBITS {{.*}} 000018 08  AM  0   0  8
+
+# CHECK:      0x{{[0-9a-f]+}} 02000000 00000000 01000000 00000000
+# CHECK-NEXT: 0x{{[0-9a-f]+}} 03000000 00000000
+
+.section .cst8,"aM",@progbits,8,unique,0
+.align 4
+.quad 1
+.quad 1
+
+.section .cst8,"aM",@progbits,8,unique,1
+.align 4
+.quad 1
+.quad 2
+
+.section .cst8,"aM",@progbits,8,unique,2
+.align 8
+.quad 1
+.quad 3
diff --git a/deps/lld/test/ELF/merge-entsize.s b/deps/lld/test/ELF/merge-entsize.s
index c2e41ccf185ade0fe9ce867382d9f9e71098b1de..080d71b329713c30ea2835a359f3aacf9918fc96 100644
--- a/deps/lld/test/ELF/merge-entsize.s
+++ b/deps/lld/test/ELF/merge-entsize.s
@@ -1,13 +1,18 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -s %t | FileCheck %s
+// RUN: llvm-readobj -S %t | FileCheck %s
 
         .section  .rodata.1,"aM",@progbits,1
+        .p2align 2
         .byte 0x42
 
-        .section  .rodata.2,"aM",@progbits,2
+// sh_addralign = 4 while sh_entsize = 3.
+// sh_entsize is not necessarily a power of 2 and it can be unrelated to sh_addralign.
+        .section  .rodata.2,"aM",@progbits,3
+        .p2align 2
         .short 0x42
+        .byte 0
 
 // Since the output section has both .rodata.1 and .rodata.2, it
 // contains elements of different sizes and we use an entsize of 0.
@@ -23,5 +28,5 @@
 // CHECK-NEXT: Size:
 // CHECK-NEXT: Link:
 // CHECK-NEXT: Info:
-// CHECK-NEXT: AddressAlignment:
+// CHECK-NEXT: AddressAlignment: 4
 // CHECK-NEXT: EntrySize: 0
diff --git a/deps/lld/test/ELF/merge-entsize2.s b/deps/lld/test/ELF/merge-entsize2.s
new file mode 100644
index 0000000000000000000000000000000000000000..26e40d3a55e371bb85b0dd89fec6c54c96659aef
--- /dev/null
+++ b/deps/lld/test/ELF/merge-entsize2.s
@@ -0,0 +1,49 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-readelf -S %t | FileCheck --check-prefix=SEC %s
+# RUN: llvm-readelf -x .cst %t | FileCheck --check-prefix=HEX %s
+
+# RUN: ld.lld -O0 -r %t.o -o %t1.o
+# RUN: llvm-readelf -S %t1.o | FileCheck --check-prefix=SEC-R %s
+# RUN: llvm-readelf -x .cst %t1.o | FileCheck --check-prefix=HEX-R %s
+
+## Check that SHF_MERGE sections with the same name, sh_flags and sh_entsize
+## are grouped together and can be merged within the group.
+
+## .cst 0 and .cst 1 are merged (sh_entsize=4). The result and .cst 2 and
+## combined (sh_entsize=8). The output sh_entsize is 0.
+# SEC:   Name  Type     {{.*}} Size   ES Flg Lk Inf Al
+# SEC:   .cst  PROGBITS {{.*}} 000020 00  AM  0   0  8
+
+## .cst 0 and .cst 1 are merged, but emitted as a separate output section.
+# SEC-R: .cst  PROGBITS {{.*}} 00000c 04  AM  0   0  4
+# SEC-R: .cst  PROGBITS {{.*}} 000010 08  AM  0   0  8
+
+# HEX:      Hex dump of section '.cst':
+# HEX-NEXT: 0x{{[0-9a-f]+}} 01000000 00000000 02000000 00000000
+# HEX-NEXT: 0x{{[0-9a-f]+}} 01000000 00000000 03000000 00000000
+
+# HEX-R:      Hex dump of section '.cst':
+# HEX-R-NEXT: 0x00000000 01000000 00000000 02000000
+# HEX-R-EMPTY:
+# HEX-R-NEXT: Hex dump of section '.cst':
+# HEX-R-NEXT: 0x00000000 01000000 00000000 03000000 00000000
+
+.section .cst,"aM",@progbits,4,unique,0
+.align 2
+.long 1
+.long 0
+.long 2
+
+.section .cst,"aM",@progbits,4,unique,1
+.align 4
+.long 1
+.long 0
+.long 2
+
+.section .cst,"aM",@progbits,8,unique,2
+.align 8
+.quad 1
+.quad 3
diff --git a/deps/lld/test/ELF/merge-gc-piece.s b/deps/lld/test/ELF/merge-gc-piece.s
index 4aec3b2aaed30b9e5e8018ae53c4ef1d9f952d15..9daa38096d8a7c262148428b38ef505b04fac2e1 100644
--- a/deps/lld/test/ELF/merge-gc-piece.s
+++ b/deps/lld/test/ELF/merge-gc-piece.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t.so -shared --gc-sections
-# RUN: llvm-readobj -s -section-data %t.so | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
 
 
 # CHECK:      Name: .foo
@@ -10,7 +10,7 @@
 # CHECK-NEXT:   SHF_ALLOC
 # CHECK-NEXT:   SHF_MERGE
 # CHECK-NEXT: ]
-# CHECK-NEXT: Address: 0x200
+# CHECK-NEXT: Address: 0x1FD
 
 # CHECK:      Name: .bar
 # CHECK-NEXT: Type: SHT_PROGBITS
@@ -24,7 +24,7 @@
 # CHECK-NEXT: AddressAlignment:
 # CHECK-NEXT: EntrySize:
 # CHECK-NEXT: SectionData (
-# CHECK-NEXT:   0000: 01020000 00000000 02020000 00000000
+# CHECK-NEXT:   0000: FE010000 00000000 FF010000 00000000
 # CHECK-NEXT: )
 
         .section .foo,"aM",@progbits,8
diff --git a/deps/lld/test/ELF/merge-gc-piece2.s b/deps/lld/test/ELF/merge-gc-piece2.s
index 88e0904caf2e66255ee365424f8cded6db6f4036..c16e37b8e4e1c70de2e3ac318d3b2c40eae7aacb 100644
--- a/deps/lld/test/ELF/merge-gc-piece2.s
+++ b/deps/lld/test/ELF/merge-gc-piece2.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t.so -shared --gc-sections
-# RUN: llvm-readobj -s -section-data %t.so | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
 
 # CHECK:      Name: .bar
 # CHECK-NEXT: Type: SHT_PROGBITS
diff --git a/deps/lld/test/ELF/merge-reloc-O0.s b/deps/lld/test/ELF/merge-reloc-O0.s
deleted file mode 100644
index daf5c34b6c0a1922958fcf6d71af9b77f6d444e4..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/merge-reloc-O0.s
+++ /dev/null
@@ -1,48 +0,0 @@
-# REQUIRES: x86
-# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-# RUN: ld.lld %t.o -r -o %t2.o -O0
-# RUN: llvm-readobj -s -section-data %t2.o | FileCheck %s
-
-# We combine just the sections with the same name and sh_entsize.
-
-# CHECK:      Name: .foo
-# CHECK-NEXT: Type: SHT_PROGBITS
-# CHECK-NEXT: Flags [
-# CHECK-NEXT:   SHF_ALLOC
-# CHECK-NEXT:   SHF_MERGE
-# CHECK-NEXT: ]
-# CHECK-NEXT: Address:
-# CHECK-NEXT: Offset:
-# CHECK-NEXT: Size: 16
-# CHECK-NEXT: Link:
-# CHECK-NEXT: Info:
-# CHECK-NEXT: AddressAlignment: 8
-# CHECK-NEXT: EntrySize: 8
-# CHECK-NEXT: SectionData (
-# CHECK-NEXT:   0000: 41000000 00000000 42000000 00000000
-# CHECK-NEXT: )
-
-# CHECK:      Name: .foo
-# CHECK-NEXT: Type: SHT_PROGBITS
-# CHECK-NEXT: Flags [
-# CHECK-NEXT:   SHF_ALLOC
-# CHECK-NEXT:   SHF_MERGE
-# CHECK-NEXT: ]
-# CHECK-NEXT: Address:
-# CHECK-NEXT: Offset:
-# CHECK-NEXT: Size: 8
-# CHECK-NEXT: Link:
-# CHECK-NEXT: Info:
-# CHECK-NEXT: AddressAlignment: 4
-# CHECK-NEXT: EntrySize: 4
-# CHECK-NEXT: SectionData (
-# CHECK-NEXT:   0000: 41000000 42000000
-# CHECK-NEXT: )
-
-        .section .foo, "aM",@progbits,8,unique,0
-        .quad 0x41
-        .section .foo, "aM",@progbits,8,unique,1
-        .quad 0x42
-        .section .foo, "aM",@progbits,4,unique,2
-        .long 0x41
-        .long 0x42
diff --git a/deps/lld/test/ELF/merge-reloc.s b/deps/lld/test/ELF/merge-reloc.s
index 3dde6aa3529730ff3a3cb0e862c76a0455d3382e..a343d5679b58e2eb021302e6528bee8e8f11dbb3 100644
--- a/deps/lld/test/ELF/merge-reloc.s
+++ b/deps/lld/test/ELF/merge-reloc.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -r -o %t-rel
-# RUN: llvm-readobj -s -section-data %t-rel | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t-rel | FileCheck %s
 
 # When linker generates a relocatable object it does string merging in the same
 # way as for regular link. It should keep SHF_MERGE flag and set proper sh_entsize
diff --git a/deps/lld/test/ELF/merge-section-types.s b/deps/lld/test/ELF/merge-section-types.s
index f8462824684fdfea39f16ce2e4ca4779f8bd5c6c..a83e8cdfb2919ef82d63076254d93018afb4c05e 100644
--- a/deps/lld/test/ELF/merge-section-types.s
+++ b/deps/lld/test/ELF/merge-section-types.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld -shared %t.o -o %t
-// RUN: llvm-readobj -s %t | FileCheck %s
+// RUN: llvm-readobj -S %t | FileCheck %s
 
 // CHECK:      Name: .foo
 // CHECK-NEXT: Type: SHT_PROGBITS
@@ -9,8 +9,8 @@
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x1000
-// CHECK-NEXT: Offset: 0x1000
+// CHECK-NEXT: Address: 0x2000
+// CHECK-NEXT: Offset: 0x2000
 // CHECK-NEXT: Size: 16
 
 .section .foo, "aw", @progbits, unique, 1
diff --git a/deps/lld/test/ELF/merge-shared-str.s b/deps/lld/test/ELF/merge-shared-str.s
index 7502eb93ab362a7b8cc388329ddf6727eec053bb..9ecdd64e973100db80bbbca58d3dad399d9ef19f 100644
--- a/deps/lld/test/ELF/merge-shared-str.s
+++ b/deps/lld/test/ELF/merge-shared-str.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared -O3
-// RUN: llvm-readobj -r -s %t.so | FileCheck %s
+// RUN: llvm-readobj -r -S %t.so | FileCheck %s
 
 
         .section        foo,"aMS",@progbits,1
@@ -19,10 +19,10 @@
 // CHECK-NEXT:   SHF_MERGE
 // CHECK-NEXT:   SHF_STRINGS
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x228
+// CHECK-NEXT: Address: 0x260
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
-// CHECK-NEXT:     0x{{.*}} R_X86_64_RELATIVE - 0x229
+// CHECK-NEXT:     0x{{.*}} R_X86_64_RELATIVE - 0x261
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
diff --git a/deps/lld/test/ELF/merge-shared.s b/deps/lld/test/ELF/merge-shared.s
index 6615169f1ecd90ad95ea518dcd0eccf0199e19b9..12cb738c1077ef20478bcae6226978444ebf6767 100644
--- a/deps/lld/test/ELF/merge-shared.s
+++ b/deps/lld/test/ELF/merge-shared.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -r -s %t.so | FileCheck %s
+// RUN: llvm-readobj -r -S %t.so | FileCheck %s
 
 	.section	foo,"aM",@progbits,4
         .long 42
@@ -17,10 +17,10 @@
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_MERGE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x228
+// CHECK-NEXT: Address: 0x260
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
-// CHECK-NEXT:     0x{{.*}} R_X86_64_RELATIVE - 0x22A
+// CHECK-NEXT:     0x{{.*}} R_X86_64_RELATIVE - 0x262
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
diff --git a/deps/lld/test/ELF/merge-string-align.s b/deps/lld/test/ELF/merge-string-align.s
index bcad6ee2d9634e7def79a449148fb61c01f616cd..0098d95b23d3393fff89356d8dc327817f177a4a 100644
--- a/deps/lld/test/ELF/merge-string-align.s
+++ b/deps/lld/test/ELF/merge-string-align.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
 
         .section        .rodata.foo,"aMS",@progbits,1
         .align  16
diff --git a/deps/lld/test/ELF/merge-string-align2.s b/deps/lld/test/ELF/merge-string-align2.s
new file mode 100644
index 0000000000000000000000000000000000000000..0d6a407d20403ca93d9c7d8d2cd6900c9e5c9d19
--- /dev/null
+++ b/deps/lld/test/ELF/merge-string-align2.s
@@ -0,0 +1,25 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-readelf -S %t | FileCheck --check-prefix=SEC %s
+# RUN: llvm-readelf -x .rodata %t | FileCheck %s
+
+# SEC: Name    Type     {{.*}} Size   ES Flg Lk Inf Al
+# SEC: .rodata PROGBITS {{.*}} 000006 01 AMS  0   0  8
+
+## Check there is no extra padding.
+
+# CHECK: a.b.c.
+
+.section .rodata.str1.8,"aMS",@progbits,1
+.align 8
+.asciz "a"
+
+.section .rodata.str1.2,"aMS",@progbits,1
+.align 2
+.asciz "b"
+
+.section .rodata.str1.1,"aMS",@progbits,1
+.align 1
+.asciz "c"
diff --git a/deps/lld/test/ELF/merge-string-error.s b/deps/lld/test/ELF/merge-string-error.s
index a0ffaafde8546421bb7850d9058937597a39c6c2..bd77a4c1dce875028468e04f237b8f220b9cbb5e 100644
--- a/deps/lld/test/ELF/merge-string-error.s
+++ b/deps/lld/test/ELF/merge-string-error.s
@@ -6,6 +6,6 @@
 	.asciz	"abc"
 
         .data
-        .long .rodata.str1.1 + 4
+        .quad .rodata.str1.1 + 4
 
 // CHECK: merge-string-error.s.tmp.o:(.rodata.str1.1): offset is outside the section
diff --git a/deps/lld/test/ELF/merge-string.s b/deps/lld/test/ELF/merge-string.s
index 065e8003840abf3145559ea479b5a5a899edb7dc..fa5bd5ad4bcd36ed3b7ab1b6f7b91b2dcf54d2a4 100644
--- a/deps/lld/test/ELF/merge-string.s
+++ b/deps/lld/test/ELF/merge-string.s
@@ -1,11 +1,11 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld -O 2 %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -section-data -t %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data --symbols %t.so | FileCheck %s
 // RUN: ld.lld -O 1 %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -section-data -t %t.so | FileCheck --check-prefix=NOTAIL %s
+// RUN: llvm-readobj -S --section-data --symbols %t.so | FileCheck --check-prefix=NOTAIL %s
 // RUN: ld.lld -O 0 %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -section-data -t %t.so | FileCheck --check-prefix=NOMERGE %s
+// RUN: llvm-readobj -S --section-data --symbols %t.so | FileCheck --check-prefix=NOMERGE %s
 
         .section	.rodata1,"aMS",@progbits,1
 	.asciz	"abc"
diff --git a/deps/lld/test/ELF/merge-sym.s b/deps/lld/test/ELF/merge-sym.s
index 89becc85531c4556707e1ead68a77cfa25144e1f..27ae3e048e200971eb3a0d564d4cef5c5cc90fdc 100644
--- a/deps/lld/test/ELF/merge-sym.s
+++ b/deps/lld/test/ELF/merge-sym.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -t -s %t.so | FileCheck %s
+// RUN: llvm-readobj --symbols -S %t.so | FileCheck %s
 
         .section        .rodata.cst4,"aM",@progbits,4
         .short 0
@@ -15,7 +15,7 @@ foo:
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_MERGE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x210
+// CHECK-NEXT: Address: 0x20D
 
 // CHECK:      Name: foo
-// CHECK-NEXT: Value: 0x212
+// CHECK-NEXT: Value: 0x20F
diff --git a/deps/lld/test/ELF/merge-to-non-alloc.s b/deps/lld/test/ELF/merge-to-non-alloc.s
index 86f6f260814bc9088cfd45b566216f506bd5dc80..17e826ed5bb0cb23488271d7a3ca71a5d9bf5aaf 100644
--- a/deps/lld/test/ELF/merge-to-non-alloc.s
+++ b/deps/lld/test/ELF/merge-to-non-alloc.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -section-data -t %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data --symbols %t.so | FileCheck %s
 
 // CHECK:      Name: .bar
 // CHECK-NEXT: Type: SHT_PROGBITS
diff --git a/deps/lld/test/ELF/merge.s b/deps/lld/test/ELF/merge.s
index b84d33a3411e435d87b4178c245c58c7388370e7..381465f0c2fd3b31cb94deac2f91aa1650576fba 100644
--- a/deps/lld/test/ELF/merge.s
+++ b/deps/lld/test/ELF/merge.s
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/merge.s -o %t2.o
 // RUN: ld.lld %t.o %t2.o -o %t
-// RUN: llvm-readobj -s -section-data -t %t | FileCheck %s
+// RUN: llvm-readobj -S --section-data --symbols %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
         .section        .mysec,"aM",@progbits,4
@@ -72,6 +72,7 @@ zed:
         .globl  _start
 _start:
 // DISASM:      Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: _start:
 
         movl .mysec, %eax
diff --git a/deps/lld/test/ELF/mips-26-mask.s b/deps/lld/test/ELF/mips-26-mask.s
index 874d5c4b2338a84938020d3f03b3e9b913626ce4..eee682a0bb2af1b962ed2ebe326a3d9e2af63318 100644
--- a/deps/lld/test/ELF/mips-26-mask.s
+++ b/deps/lld/test/ELF/mips-26-mask.s
@@ -6,6 +6,7 @@
 # RUN: llvm-objdump -d %t.exe | FileCheck %s
 
 # CHECK:      Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK:      __start:
 # CHECK-NEXT:   20000:       0e 00 80 00     jal     134348800
 
diff --git a/deps/lld/test/ELF/mips-26-n32-n64.s b/deps/lld/test/ELF/mips-26-n32-n64.s
deleted file mode 100644
index 92f533152da3460e99acc0235717a95487450da7..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/mips-26-n32-n64.s
+++ /dev/null
@@ -1,40 +0,0 @@
-# REQUIRES: mips
-# Check R_MIPS_26 relocation handling in case of N64 ABIs.
-
-# RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux \
-# RUN:         %S/Inputs/mips-dynamic.s -o %t-so.o
-# RUN: ld.lld %t-so.o -shared -o %t.so
-# RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux %s -o %t.o
-# RUN: ld.lld %t.o %t.so -o %t.exe
-# RUN: llvm-objdump -d %t.exe | FileCheck %s --check-prefixes=CHECK,DEFAULT
-# RUN: ld.lld %t-so.o -shared -o %t.so -z hazardplt
-# RUN: ld.lld %t.o %t.so -o %t.exe -z hazardplt
-# RUN: llvm-objdump -d %t.exe | FileCheck %s --check-prefixes=CHECK,HAZARDPLT
-
-
-# CHECK:      Disassembly of section .text:
-# CHECK-NEXT: __start:
-# CHECK-NEXT:    20000:       0c 00 80 0c     jal     131120
-# CHECK-NEXT:    20004:       00 00 00 00     nop
-# CHECK-NEXT: Disassembly of section .plt:
-# CHECK-NEXT: .plt:
-# CHECK-NEXT:    20010:       3c 0e 00 03     lui     $14, 3
-# CHECK-NEXT:    20014:       dd d9 00 08     ld      $25, 8($14)
-# CHECK-NEXT:    20018:       25 ce 00 08     addiu   $14, $14, 8
-# CHECK-NEXT:    2001c:       03 0e c0 23     subu    $24, $24, $14
-# CHECK-NEXT:    20020:       03 e0 78 25     move    $15, $ra
-# CHECK-NEXT:    20024:       00 18 c0 c2     srl     $24, $24, 3
-# DEFAULT:       20028:       03 20 f8 09     jalr    $25
-# HAZARDPLT:     20028:       03 20 fc 09     jalr.hb $25
-# CHECK-NEXT:    2002c:       27 18 ff fe     addiu   $24, $24, -2
-# CHECK-NEXT:    20030:       3c 0f 00 03     lui     $15, 3
-# CHECK-NEXT:    20034:       8d f9 00 18     lw      $25, 24($15)
-# DEFAULT:       20038:       03 20 00 08     jr      $25
-# HAZARDPLT:     20038:       03 20 04 08     jr.hb   $25
-# CHECK-NEXT:    2003c:       25 f8 00 18     addiu   $24, $15, 24
-
-  .text
-  .option pic0
-  .global __start
-__start:
-  jal   foo0
diff --git a/deps/lld/test/ELF/mips-26.s b/deps/lld/test/ELF/mips-26.s
index 882129b1fa9e7e8ea71d262d62f9ca591fbd11b1..b4cbdb67e4ffee965118888ffff8210d78717906 100644
--- a/deps/lld/test/ELF/mips-26.s
+++ b/deps/lld/test/ELF/mips-26.s
@@ -7,10 +7,11 @@
 # RUN: ld.lld %t2.o -shared -o %t.so
 # RUN: ld.lld %t1.o %t.so -o %t.exe
 # RUN: llvm-objdump -d %t.exe | FileCheck %s
-# RUN: llvm-readobj -dynamic-table -s -r -mips-plt-got %t.exe \
+# RUN: llvm-readobj --dynamic-table -S -r --mips-plt-got %t.exe \
 # RUN:   | FileCheck -check-prefix=REL %s
 
 # CHECK:      Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: bar:
 # CHECK-NEXT:   20000:       0c 00 80 06     jal     131096 <loc>
 # CHECK-NEXT:   20004:       00 00 00 00     nop
@@ -24,7 +25,9 @@
 #
 # CHECK:      loc:
 # CHECK-NEXT:   20018:       00 00 00 00     nop
+# CHECK-EMPTY:
 # CHECK-NEXT: Disassembly of section .plt:
+# CHECK-EMPTY:
 # CHECK-NEXT: .plt:
 # CHECK-NEXT:   20020:       3c 1c 00 03     lui     $gp, 3
 # CHECK-NEXT:   20024:       8f 99 00 04     lw      $25, 4($gp)
diff --git a/deps/lld/test/ELF/mips-32.s b/deps/lld/test/ELF/mips-32.s
index 85bc95592edb65c84d9996b61643cc2642d716a0..dcfd94b8d92d3c3fcdceb47caf69104052244786 100644
--- a/deps/lld/test/ELF/mips-32.s
+++ b/deps/lld/test/ELF/mips-32.s
@@ -3,16 +3,14 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t-be.o
 # RUN: ld.lld -shared %t-be.o -o %t-be.so
-# RUN: llvm-objdump -t -s %t-be.so \
-# RUN:   | FileCheck -check-prefix=SYM -check-prefix=BE %s
-# RUN: llvm-readobj -r -dynamic-table -mips-plt-got %t-be.so \
+# RUN: llvm-objdump -t -s %t-be.so | FileCheck -check-prefixes=SYM,BE %s
+# RUN: llvm-readobj -r --dynamic-table --mips-plt-got %t-be.so \
 # RUN:   | FileCheck -check-prefix=REL %s
 
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %t-el.o
 # RUN: ld.lld -shared %t-el.o -o %t-el.so
-# RUN: llvm-objdump -t -s %t-el.so \
-# RUN:   | FileCheck -check-prefix=SYM -check-prefix=EL %s
-# RUN: llvm-readobj -r -dynamic-table -mips-plt-got %t-el.so \
+# RUN: llvm-objdump -t -s %t-el.so | FileCheck -check-prefixes=SYM,EL %s
+# RUN: llvm-readobj -r --dynamic-table --mips-plt-got %t-el.so \
 # RUN:   | FileCheck -check-prefix=REL %s
 
   .globl  __start
diff --git a/deps/lld/test/ELF/mips-64-disp.s b/deps/lld/test/ELF/mips-64-disp.s
index 5d5049c4cae74caaa267bdd99842defa30d603cc..1d9b39335a154d05930c0cb17976eda1613acf32 100644
--- a/deps/lld/test/ELF/mips-64-disp.s
+++ b/deps/lld/test/ELF/mips-64-disp.s
@@ -7,7 +7,7 @@
 # RUN: ld.lld %t.so.o -shared -o %t.so
 # RUN: ld.lld %t.exe.o %t.so -o %t.exe
 # RUN: llvm-objdump -d -t %t.exe | FileCheck %s
-# RUN: llvm-readobj -r -mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readelf -r --mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
 
 # CHECK:      __start:
 # CHECK-NEXT:    20000:   24 42 80 40   addiu   $2, $2, -32704
@@ -20,59 +20,24 @@
 # CHECK: 0000000000020000     .text   00000000 __start
 # CHECK: 0000000000000000 g F *UND*   00000000 foo1a
 
-# GOT:      Relocations [
-# GOT-NEXT: ]
-# GOT-NEXT: Primary GOT {
-# GOT-NEXT:   Canonical gp value:
-# GOT-NEXT:   Reserved entries [
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32752
-# GOT-NEXT:       Initial: 0x0
-# GOT-NEXT:       Purpose: Lazy resolver
-# GOT-NEXT:     }
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32744
-# GOT-NEXT:       Initial: 0x8000000000000000
-# GOT-NEXT:       Purpose: Module pointer (GNU extension)
-# GOT-NEXT:     }
-# GOT-NEXT:   ]
-# GOT-NEXT:   Local entries [
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32736
-# GOT-NEXT:       Initial: 0x20014
-# GOT-NEXT:     }
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32728
-# GOT-NEXT:       Initial: 0x20004
-# GOT-NEXT:     }
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32720
-# GOT-NEXT:       Initial: 0x20008
-# GOT-NEXT:     }
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32712
-# GOT-NEXT:       Initial: 0x2000C
-# GOT-NEXT:     }
-# GOT-NEXT:   ]
-# GOT-NEXT:   Global entries [
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32704
-# GOT-NEXT:       Initial: 0x0
-# GOT-NEXT:       Value: 0x0
-# GOT-NEXT:       Type: Function
-# GOT-NEXT:       Section: Undefined
-# GOT-NEXT:       Name: foo1a
-# GOT-NEXT:     }
-# GOT-NEXT:   ]
-# GOT-NEXT:   Number of TLS and multi-GOT entries: 0
-# GOT-NEXT: }
+# GOT:      Primary GOT:
+# GOT-NEXT:  Canonical gp value: 0000000000038000
+# GOT-EMPTY:
+# GOT-NEXT:  Reserved entries:
+# GOT-NEXT:            Address     Access          Initial Purpose
+# GOT-NEXT:   0000000000030010 -32752(gp) 0000000000000000 Lazy resolver
+# GOT-NEXT:   0000000000030018 -32744(gp) 8000000000000000 Module pointer (GNU extension)
+# GOT-EMPTY:
+# GOT-NEXT:  Local entries:
+# GOT-NEXT:            Address     Access          Initial
+# GOT-NEXT:   0000000000030020 -32736(gp) 0000000000020014
+# GOT-NEXT:   0000000000030028 -32728(gp) 0000000000020004
+# GOT-NEXT:   0000000000030030 -32720(gp) 0000000000020008
+# GOT-NEXT:   0000000000030038 -32712(gp) 000000000002000c
+# GOT-EMPTY:
+# GOT-NEXT:  Global entries:
+# GOT-NEXT:            Address     Access          Initial         Sym.Val. Type Ndx Name
+# GOT-NEXT:   0000000000030040 -32704(gp) 0000000000000000 0000000000000000 FUNC UND foo1a
 
   .text
   .global  __start
diff --git a/deps/lld/test/ELF/mips-64-got-overflow.s b/deps/lld/test/ELF/mips-64-got-overflow.s
index 5de71b1b366e44bca96f9bcd4b16e231eadac335..621d2ee384bf8c94b5d8c3cbc65a052945b2e2ab 100644
--- a/deps/lld/test/ELF/mips-64-got-overflow.s
+++ b/deps/lld/test/ELF/mips-64-got-overflow.s
@@ -6,69 +6,35 @@
 # RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux %s -o %t2.so.o
 # RUN: ld.lld -shared -mips-got-size 32 %t1.so.o %t2.so.o -o %t-sgot.so
 # RUN: ld.lld -shared -mips-got-size 24 %t1.so.o %t2.so.o -o %t-mgot.so
-# RUN: llvm-readobj -r -dt -mips-plt-got %t-sgot.so | FileCheck -check-prefix=SGOT %s
-# RUN: llvm-readobj -r -dt -mips-plt-got %t-mgot.so | FileCheck -check-prefix=MGOT %s
+# RUN: llvm-readelf --mips-plt-got %t-sgot.so | FileCheck -check-prefix=SGOT %s
+# RUN: llvm-readelf --mips-plt-got %t-mgot.so | FileCheck -check-prefix=MGOT %s
 
-# SGOT:      Primary GOT {
-# SGOT-NEXT:   Canonical gp value: 0x27FF0
-# SGOT-NEXT:   Reserved entries [
-# SGOT-NEXT:     Entry {
-# SGOT-NEXT:       Address:
-# SGOT-NEXT:       Access: -32752
-# SGOT-NEXT:       Initial: 0x0
-# SGOT-NEXT:       Purpose: Lazy resolver
-# SGOT-NEXT:     }
-# SGOT-NEXT:     Entry {
-# SGOT-NEXT:       Address:
-# SGOT-NEXT:       Access: -32744
-# SGOT-NEXT:       Initial: 0x80000000
-# SGOT-NEXT:       Purpose: Module pointer (GNU extension)
-# SGOT-NEXT:     }
-# SGOT-NEXT:   ]
-# SGOT-NEXT:   Local entries [
-# SGOT-NEXT:     Entry {
-# SGOT-NEXT:       Address:
-# SGOT-NEXT:       Access: -32736
-# SGOT-NEXT:       Initial: 0x20020
-# SGOT-NEXT:     }
-# SGOT-NEXT:     Entry {
-# SGOT-NEXT:       Address:
-# SGOT-NEXT:       Access: -32728
-# SGOT-NEXT:       Initial: 0x20030
-# SGOT-NEXT:     }
-# SGOT-NEXT:   ]
-# SGOT-NEXT:   Global entries [
-# SGOT-NEXT:   ]
-# SGOT-NEXT:   Number of TLS and multi-GOT entries: 0
-# SGOT-NEXT: }
+# SGOT:      Primary GOT:
+# SGOT-NEXT:  Canonical gp value: 0000000000027ff0
+# SGOT-EMPTY:
+# SGOT-NEXT:  Reserved entries:
+# SGOT-NEXT:            Address     Access          Initial Purpose
+# SGOT-NEXT:   0000000000020000 -32752(gp) 0000000000000000 Lazy resolver
+# SGOT-NEXT:   0000000000020008 -32744(gp) 8000000000000000 Module pointer (GNU extension)
+# SGOT-EMPTY:
+# SGOT-NEXT:  Local entries:
+# SGOT-NEXT:            Address     Access          Initial
+# SGOT-NEXT:   0000000000020010 -32736(gp) 0000000000020020
+# SGOT-NEXT:   0000000000020018 -32728(gp) 0000000000020030
 
-# MGOT:      Primary GOT {
-# MGOT-NEXT:   Canonical gp value: 0x27FF0
-# MGOT-NEXT:   Reserved entries [
-# MGOT-NEXT:     Entry {
-# MGOT-NEXT:       Address:
-# MGOT-NEXT:       Access: -32752
-# MGOT-NEXT:       Initial: 0x0
-# MGOT-NEXT:       Purpose: Lazy resolver
-# MGOT-NEXT:     }
-# MGOT-NEXT:     Entry {
-# MGOT-NEXT:       Address:
-# MGOT-NEXT:       Access: -32744
-# MGOT-NEXT:       Initial: 0x80000000
-# MGOT-NEXT:       Purpose: Module pointer (GNU extension)
-# MGOT-NEXT:     }
-# MGOT-NEXT:   ]
-# MGOT-NEXT:   Local entries [
-# MGOT-NEXT:     Entry {
-# MGOT-NEXT:       Address:
-# MGOT-NEXT:       Access: -32736
-# MGOT-NEXT:       Initial: 0x20020
-# MGOT-NEXT:     }
-# MGOT-NEXT:   ]
-# MGOT-NEXT:   Global entries [
-# MGOT-NEXT:   ]
-# MGOT-NEXT:   Number of TLS and multi-GOT entries: 1
-# MGOT-NEXT: }
+# MGOT:      Primary GOT:
+# MGOT-NEXT:  Canonical gp value: 0000000000027ff0
+# MGOT-EMPTY:
+# MGOT-NEXT:  Reserved entries:
+# MGOT-NEXT:            Address     Access          Initial Purpose
+# MGOT-NEXT:   0000000000020000 -32752(gp) 0000000000000000 Lazy resolver
+# MGOT-NEXT:   0000000000020008 -32744(gp) 8000000000000000 Module pointer (GNU extension)
+# MGOT-EMPTY:
+# MGOT-NEXT:  Local entries:
+# MGOT-NEXT:            Address     Access          Initial
+# MGOT-NEXT:   0000000000020010 -32736(gp) 0000000000020020
+# MGOT-EMPTY:
+# MGOT-NEXT:  Number of TLS and multi-GOT entries 1
 
   .text
   .global foo2
diff --git a/deps/lld/test/ELF/mips-64-got.s b/deps/lld/test/ELF/mips-64-got.s
index e1b1f347547011d510b61a34ea98c786e344f7e0..e9e1133b3ab23ded68455ca987d1aaff333d505f 100644
--- a/deps/lld/test/ELF/mips-64-got.s
+++ b/deps/lld/test/ELF/mips-64-got.s
@@ -7,7 +7,7 @@
 # RUN: ld.lld %t.so.o -shared -o %t.so
 # RUN: ld.lld %t.exe.o %t.so -o %t.exe
 # RUN: llvm-objdump -d -t %t.exe | FileCheck %s
-# RUN: llvm-readobj -r -mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readelf -r --mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
 
 # CHECK:      __start:
 
@@ -21,59 +21,25 @@
 # CHECK: 0000000000020000   .text   00000000 __start
 # CHECK: 0000000000020014   .text   00000000 bar
 
-# GOT:      Relocations [
-# GOT-NEXT: ]
-# GOT-NEXT: Primary GOT {
-# GOT-NEXT:   Canonical gp value:
-# GOT-NEXT:   Reserved entries [
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32752
-# GOT-NEXT:       Initial: 0x0
-# GOT-NEXT:       Purpose: Lazy resolver
-# GOT-NEXT:     }
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32744
-# GOT-NEXT:       Initial: 0x8000000000000000
-# GOT-NEXT:       Purpose: Module pointer (GNU extension)
-# GOT-NEXT:     }
-# GOT-NEXT:   ]
-# GOT-NEXT:   Local entries [
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32736
-# GOT-NEXT:       Initial: 0x20000
-# GOT-NEXT:     }
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32728
-# GOT-NEXT:       Initial: 0x30000
-# GOT-NEXT:     }
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32720
-# GOT-NEXT:       Initial: 0x20014
-# GOT-NEXT:     }
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32712
-# GOT-NEXT:       Initial: 0x20018
-# GOT-NEXT:     }
-# GOT-NEXT:   ]
-# GOT-NEXT:   Global entries [
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32704
-# GOT-NEXT:       Initial: 0x0
-# GOT-NEXT:       Value: 0x0
-# GOT-NEXT:       Type: Function
-# GOT-NEXT:       Section: Undefined
-# GOT-NEXT:       Name: foo1a
-# GOT-NEXT:     }
-# GOT-NEXT:   ]
-# GOT-NEXT:   Number of TLS and multi-GOT entries: 0
-# GOT-NEXT: }
+# GOT:      There are no relocations in this file.
+# GOT-NEXT: Primary GOT:
+# GOT-NEXT:  Canonical gp value: 0000000000038000
+# GOT-EMPTY:
+# GOT-NEXT:  Reserved entries:
+# GOT-NEXT:            Address     Access          Initial Purpose
+# GOT-NEXT:   0000000000030010 -32752(gp) 0000000000000000 Lazy resolver
+# GOT-NEXT:   0000000000030018 -32744(gp) 8000000000000000 Module pointer (GNU extension)
+# GOT-EMPTY:
+# GOT-NEXT:  Local entries:
+# GOT-NEXT:            Address     Access          Initial
+# GOT-NEXT:   0000000000030020 -32736(gp) 0000000000020000
+# GOT-NEXT:   0000000000030028 -32728(gp) 0000000000030000
+# GOT-NEXT:   0000000000030030 -32720(gp) 0000000000020014
+# GOT-NEXT:   0000000000030038 -32712(gp) 0000000000020018
+# GOT-EMPTY:
+# GOT-NEXT:  Global entries:
+# GOT-NEXT:            Address     Access          Initial         Sym.Val. Type Ndx Name
+# GOT-NEXT:   0000000000030040 -32704(gp) 0000000000000000 0000000000000000 FUNC UND foo1a
 
   .text
   .global  __start, bar
diff --git a/deps/lld/test/ELF/mips-64-gprel-so.s b/deps/lld/test/ELF/mips-64-gprel-so.s
index d741dd907137eb720473c989839045ffd70e0b47..e88c80f2e38a4f4de7e3c7509aa46e1e5c109418 100644
--- a/deps/lld/test/ELF/mips-64-gprel-so.s
+++ b/deps/lld/test/ELF/mips-64-gprel-so.s
@@ -6,6 +6,7 @@
 # RUN: llvm-objdump -d -t %t.so | FileCheck %s
 
 # CHECK:      Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: foo:
 # CHECK-NEXT:    10000:    3c 1c 00 01    lui     $gp, 1
 # CHECK-NEXT:    10004:    03 99 e0 2d    daddu   $gp, $gp, $25
diff --git a/deps/lld/test/ELF/mips-64.s b/deps/lld/test/ELF/mips-64.s
index 70e445f5327a5f1cae597bb889eea9404ad00ecf..f708098ca677f64b4fb6d4c5899084901ad75a6a 100644
--- a/deps/lld/test/ELF/mips-64.s
+++ b/deps/lld/test/ELF/mips-64.s
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux %s -o %t.o
 # RUN: ld.lld -shared %t.o -o %t.so
 # RUN: llvm-objdump -t %t.so | FileCheck -check-prefix=SYM %s
-# RUN: llvm-readobj -r -dynamic-table -mips-plt-got %t.so | FileCheck %s
+# RUN: llvm-readobj -r --dynamic-table --mips-plt-got %t.so | FileCheck %s
 
   .global  __start
 __start:
diff --git a/deps/lld/test/ELF/mips-abs-got.s b/deps/lld/test/ELF/mips-abs-got.s
index 4964c8558325211170b985cc53a3cca166c9c792..bccfe5914e6f20a7d9a0a1bce03aeaa5a0d23a89 100644
--- a/deps/lld/test/ELF/mips-abs-got.s
+++ b/deps/lld/test/ELF/mips-abs-got.s
@@ -4,9 +4,9 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux -o %t.o %s
 # RUN: echo "SECTIONS { \
-# RUN:          zero = 0; foo = 0x11004; bar = 0x22000; }" > %t.script
+# RUN:          zero1 = 0; zero2 = 0; foo = 0x11004; bar = 0x22000; }" > %t.script
 # RUN: ld.lld --script %t.script -o %t.exe %t.o
-# RUN: llvm-readobj -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj --mips-plt-got %t.exe | FileCheck %s
 
 # CHECK:      Static GOT {
 # CHECK:        Local entries [
@@ -30,7 +30,7 @@
 
   .text
   nop
-  .reloc 0, R_MIPS_GOT_PAGE, 0
-  ld      $v0, %got_page(zero)($gp)
+  ld      $v0, %got_page(zero1)($gp)
+  ld      $v0, %got_page(zero2)($gp)
   ld      $v0, %got_page(foo)($gp)
   ld      $v0, %got_page(bar+0x10008)($gp)
diff --git a/deps/lld/test/ELF/mips-call-hilo.s b/deps/lld/test/ELF/mips-call-hilo.s
index 9c7633a8464d42d6153f20ced82095a429b8200d..a075ff7cd059f0d0dabbc0d67b4d50bbb3801fad 100644
--- a/deps/lld/test/ELF/mips-call-hilo.s
+++ b/deps/lld/test/ELF/mips-call-hilo.s
@@ -4,9 +4,10 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -shared -o %t.so
 # RUN: llvm-objdump -d %t.so | FileCheck %s
-# RUN: llvm-readobj -r -mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readelf -r --mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
 
 # CHECK:      Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: foo:
 # CHECK-NEXT:    10000:       3c 02 00 00     lui     $2, 0
 # CHECK-NEXT:    10004:       8c 42 80 20     lw      $2, -32736($2)
@@ -15,36 +16,23 @@
 # CHECK-NEXT:    10010:       3c 02 00 00     lui     $2, 0
 # CHECK-NEXT:    10014:       8c 42 80 1c     lw      $2, -32740($2)
 
-# GOT:      Relocations [
-# GOT-NEXT: ]
-
-# GOT:      Primary GOT {
-# GOT-NEXT:   Canonical gp value: 0x27FF0
-# GOT:        Local entries [
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x20008
-# GOT-NEXT:       Access: -32744
-# GOT-NEXT:       Initial: 0x10018
-# GOT-NEXT:     }
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x2000C
-# GOT-NEXT:       Access: -32740
-# GOT-NEXT:       Initial: 0x1001C
-# GOT-NEXT:     }
-# GOT-NEXT:   ]
-# GOT-NEXT:   Global entries [
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address: 0x20010
-# GOT-NEXT:       Access: -32736
-# GOT-NEXT:       Initial: 0x0
-# GOT-NEXT:       Value: 0x0
-# GOT-NEXT:       Type: None
-# GOT-NEXT:       Section: Undefined
-# GOT-NEXT:       Name: bar
-# GOT-NEXT:     }
-# GOT-NEXT:   ]
-# GOT-NEXT:   Number of TLS and multi-GOT entries: 0
-# GOT-NEXT: }
+# GOT:      There are no relocations in this file.
+# GOT:      Primary GOT:
+# GOT-NEXT:  Canonical gp value: 00027ff0
+# GOT-EMPTY:
+# GOT-NEXT:  Reserved entries:
+# GOT-NEXT:    Address     Access  Initial Purpose
+# GOT-NEXT:   00020000 -32752(gp) 00000000 Lazy resolver
+# GOT-NEXT:   00020004 -32748(gp) 80000000 Module pointer (GNU extension)
+# GOT-EMPTY:
+# GOT-NEXT:  Local entries:
+# GOT-NEXT:    Address     Access  Initial
+# GOT-NEXT:   00020008 -32744(gp) 00010018
+# GOT-NEXT:   0002000c -32740(gp) 0001001c
+# GOT-EMPTY:
+# GOT-NEXT:  Global entries:
+# GOT-NEXT:    Address     Access  Initial Sym.Val. Type    Ndx Name
+# GOT-NEXT:   00020010 -32736(gp) 00000000 00000000 NOTYPE  UND bar
 
   .text
   .global foo
diff --git a/deps/lld/test/ELF/mips-call16.s b/deps/lld/test/ELF/mips-call16.s
index 7b3da0c41ff0a9a51893d75e4d136dc6e64f0e7f..508c499610d31e274fdc6fa1c63cadd53c52295e 100644
--- a/deps/lld/test/ELF/mips-call16.s
+++ b/deps/lld/test/ELF/mips-call16.s
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -shared -o %t.exe
 # RUN: llvm-objdump -d %t.exe | FileCheck %s
-# RUN: llvm-readobj -mips-plt-got -symbols %t.exe \
+# RUN: llvm-readobj --mips-plt-got --symbols %t.exe \
 # RUN:   | FileCheck -check-prefix=GOT %s
 
   .text
@@ -18,6 +18,7 @@ g1:
   nop
 
 # CHECK:      Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: __start:
 # CHECK-NEXT:      10000:   8f 88 80 18   lw   $8, -32744
 
diff --git a/deps/lld/test/ELF/mips-dynamic.s b/deps/lld/test/ELF/mips-dynamic.s
index 2852b5088374bc5d3a6bbaa35d78a6a311e7eddb..eca61bb757c32aec3739d9aa92ef52c894719e38 100644
--- a/deps/lld/test/ELF/mips-dynamic.s
+++ b/deps/lld/test/ELF/mips-dynamic.s
@@ -6,19 +6,19 @@
 # RUN: ld.lld -shared %td.o -o %td.so
 
 # RUN: ld.lld %t.o %td.so -o %t.exe
-# RUN: llvm-readobj -sections -dynamic-table %t.exe \
+# RUN: llvm-readobj --sections --dynamic-table %t.exe \
 # RUN:   | FileCheck -check-prefixes=EXE,NOPIE %s
 
 # RUN: ld.lld -pie %t.o %td.so -o %t.so
-# RUN: llvm-readobj -sections -dyn-symbols -dynamic-table %t.so \
+# RUN: llvm-readobj --sections --dyn-syms --dynamic-table %t.so \
 # RUN:   | FileCheck -check-prefixes=EXE,PIE %s
 
 # RUN: ld.lld %t.o --image-base=0x123000 %td.so -o %t.exe
-# RUN: llvm-readobj -sections -dynamic-table %t.exe \
+# RUN: llvm-readobj --sections --dynamic-table %t.exe \
 # RUN:   | FileCheck -check-prefix=IMAGE_BASE %s
 
 # RUN: ld.lld -shared %t.o %td.so -o %t.so
-# RUN: llvm-readobj -sections -dyn-symbols -dynamic-table %t.so \
+# RUN: llvm-readobj --sections --dyn-syms --dynamic-table %t.so \
 # RUN:   | FileCheck -check-prefix=DSO %s
 
 # EXE:      Sections [
diff --git a/deps/lld/test/ELF/mips-dynsym-sort.s b/deps/lld/test/ELF/mips-dynsym-sort.s
index 3f98b7cd72e0282e81202e54d0332dbad40b8dc3..413d2e7156de919d3220437d893c5326f7d8ffc1 100644
--- a/deps/lld/test/ELF/mips-dynsym-sort.s
+++ b/deps/lld/test/ELF/mips-dynsym-sort.s
@@ -3,11 +3,11 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t-be.o
 # RUN: ld.lld -shared %t-be.o -o %t-be.so
-# RUN: llvm-readobj -symbols -dyn-symbols %t-be.so | FileCheck %s
+# RUN: llvm-readobj --symbols --dyn-syms %t-be.so | FileCheck %s
 
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %t-el.o
 # RUN: ld.lld -shared %t-el.o -o %t-el.so
-# RUN: llvm-readobj -symbols -dyn-symbols %t-el.so | FileCheck %s
+# RUN: llvm-readobj --symbols --dyn-syms %t-el.so | FileCheck %s
 
   .data
   .globl v1,v2,v3
diff --git a/deps/lld/test/ELF/mips-elf-flags.s b/deps/lld/test/ELF/mips-elf-flags.s
index 68f4cc3008e4bbc278ae560d4ee271abe3d1fd74..40ef0a7cafdf875e1a075c9296e5d5b21522db4f 100644
--- a/deps/lld/test/ELF/mips-elf-flags.s
+++ b/deps/lld/test/ELF/mips-elf-flags.s
@@ -4,16 +4,16 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:         %S/Inputs/mips-dynamic.s -o %t-so.o
 # RUN: ld.lld %t-so.o --gc-sections -shared -o %t.so
-# RUN: llvm-readobj -h -mips-abi-flags %t.so | FileCheck -check-prefix=SO %s
+# RUN: llvm-readobj -h --mips-abi-flags %t.so | FileCheck -check-prefix=SO %s
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t.exe
-# RUN: llvm-readobj -h -mips-abi-flags %t.exe | FileCheck -check-prefix=EXE %s
+# RUN: llvm-readobj -h --mips-abi-flags %t.exe | FileCheck -check-prefix=EXE %s
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:         -mcpu=mips32r2 %s -o %t-r2.o
 # RUN: ld.lld %t-r2.o -o %t-r2.exe
-# RUN: llvm-readobj -h -mips-abi-flags %t-r2.exe \
+# RUN: llvm-readobj -h --mips-abi-flags %t-r2.exe \
 # RUN:   | FileCheck -check-prefix=EXE-R2 %s
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
@@ -21,26 +21,26 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:         -mcpu=mips32r5 %S/Inputs/mips-dynamic.s -o %t-r5.o
 # RUN: ld.lld %t-r2.o %t-r5.o -o %t-r5.exe
-# RUN: llvm-readobj -h -mips-abi-flags %t-r5.exe \
+# RUN: llvm-readobj -h --mips-abi-flags %t-r5.exe \
 # RUN:   | FileCheck -check-prefix=EXE-R5 %s
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:         -mcpu=mips32r6 %s -o %t-r6.o
 # RUN: ld.lld %t-r6.o -o %t-r6.exe
-# RUN: llvm-readobj -h -mips-abi-flags %t-r6.exe \
+# RUN: llvm-readobj -h --mips-abi-flags %t-r6.exe \
 # RUN:   | FileCheck -check-prefix=EXE-R6 %s
 
 # RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux \
 # RUN:         -position-independent -mcpu=octeon %s -o %t.o
 # RUN: ld.lld %t.o -o %t.exe
-# RUN: llvm-readobj -h -mips-abi-flags %t.exe \
+# RUN: llvm-readobj -h --mips-abi-flags %t.exe \
 # RUN:   | FileCheck -check-prefix=OCTEON %s
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:         -mattr=micromips %S/Inputs/mips-fpic.s -o %t-mm.o
 # RUN: ld.lld %t.o %t-mm.o -o %t.exe
-# RUN: llvm-readobj -h -mips-abi-flags %t.exe | FileCheck -check-prefix=MICRO %s
+# RUN: llvm-readobj -h --mips-abi-flags %t.exe | FileCheck -check-prefix=MICRO %s
 
   .text
   .globl  __start
diff --git a/deps/lld/test/ELF/mips-got-and-copy.s b/deps/lld/test/ELF/mips-got-and-copy.s
index fed23d1eb762da1d131406a5577d3a4891602e8e..f51e679821a8a598d9aedce228985709cb3c6435 100644
--- a/deps/lld/test/ELF/mips-got-and-copy.s
+++ b/deps/lld/test/ELF/mips-got-and-copy.s
@@ -10,7 +10,7 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.so.o -shared -o %t.so
 # RUN: ld.lld %t.o %t.so -o %t.exe
-# RUN: llvm-readobj -r -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj -r --mips-plt-got %t.exe | FileCheck %s
 
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section (7) .rel.dyn {
diff --git a/deps/lld/test/ELF/mips-got-extsym.s b/deps/lld/test/ELF/mips-got-extsym.s
index b5063a8559c98056bca7b021bd6594b47d1f7ea0..b1c2da37640e491260f4068526d0497bf996e18e 100644
--- a/deps/lld/test/ELF/mips-got-extsym.s
+++ b/deps/lld/test/ELF/mips-got-extsym.s
@@ -9,7 +9,7 @@
 # RUN: ld.lld -shared %t.so.o -o %t.so
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o %t.so -o %t.exe
-# RUN: llvm-readobj -dt -t -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj --dyn-syms --symbols --mips-plt-got %t.exe | FileCheck %s
 
 # CHECK:      Symbols [
 # CHECK:        Symbol {
diff --git a/deps/lld/test/ELF/mips-got-hilo.s b/deps/lld/test/ELF/mips-got-hilo.s
index 1ae24f3472feee2ba4934888344d4a91b114aa7b..07a95f33da0d2577c339c6fbe998656d28d0fdc2 100644
--- a/deps/lld/test/ELF/mips-got-hilo.s
+++ b/deps/lld/test/ELF/mips-got-hilo.s
@@ -4,9 +4,10 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -shared -o %t.so
 # RUN: llvm-objdump -d %t.so | FileCheck %s
-# RUN: llvm-readobj -r -mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readobj -r --mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
 
 # CHECK:      Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: foo:
 # CHECK-NEXT:    10000:       3c 02 00 00     lui     $2, 0
 # CHECK-NEXT:    10004:       8c 42 80 20     lw      $2, -32736($2)
diff --git a/deps/lld/test/ELF/mips-got-page-script.s b/deps/lld/test/ELF/mips-got-page-script.s
index 0ec19fc14ad491cf41cc285dc1664f1c10e108fd..f8fe3bc6057889333610a975fa50de140923107a 100644
--- a/deps/lld/test/ELF/mips-got-page-script.s
+++ b/deps/lld/test/ELF/mips-got-page-script.s
@@ -7,7 +7,7 @@
 # RUN:          .text : { *(.text) } \
 # RUN:          .data 0x10000 : { *(.data) } }" > %t.script
 # RUN: ld.lld -shared --script %t.script -o %t.so %t.o
-# RUN: llvm-readobj -t -mips-plt-got %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols --mips-plt-got %t.so | FileCheck %s
 
 # CHECK:      Name: foo1
 # CHECK-NEXT: Value: 0x10000
diff --git a/deps/lld/test/ELF/mips-got-page.s b/deps/lld/test/ELF/mips-got-page.s
index 46ddf4a7122ce8666f5dd76b90afc79cafbeefe6..faddb67f13ecb26df568d1f1b9eb1c078502e147 100644
--- a/deps/lld/test/ELF/mips-got-page.s
+++ b/deps/lld/test/ELF/mips-got-page.s
@@ -5,7 +5,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux -o %t.o %s
 # RUN: ld.lld --section-start .rodata=0x27FFC -shared -o %t.so %t.o
-# RUN: llvm-readobj -t -mips-plt-got %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols --mips-plt-got %t.so | FileCheck %s
 
 # CHECK:       Name: bar
 # CHECK-NEXT:  Value: 0x28000
diff --git a/deps/lld/test/ELF/mips-got-redundant.s b/deps/lld/test/ELF/mips-got-redundant.s
index 24138ca19995b74ed10c25f1625a851fc1d7982c..3a32bd7cc8c12410e3b0985efad6cc3b08adff32 100644
--- a/deps/lld/test/ELF/mips-got-redundant.s
+++ b/deps/lld/test/ELF/mips-got-redundant.s
@@ -3,7 +3,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -shared -o %t.so
-# RUN: llvm-readobj -mips-plt-got %t.so | FileCheck %s
+# RUN: llvm-readobj --mips-plt-got %t.so | FileCheck %s
 
 # CHECK:      Local entries [
 # CHECK-NEXT:   Entry {
diff --git a/deps/lld/test/ELF/mips-got-relocs.s b/deps/lld/test/ELF/mips-got-relocs.s
index 0465b08b9ed48858d09c5c9fdde7366031d7165e..f05605540bf993f969f927bc71c41cd1deeecd02 100644
--- a/deps/lld/test/ELF/mips-got-relocs.s
+++ b/deps/lld/test/ELF/mips-got-relocs.s
@@ -3,33 +3,25 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t-be.o
 # RUN: ld.lld %t-be.o -o %t-be.exe
-# RUN: llvm-objdump -section-headers -t %t-be.exe | FileCheck -check-prefix=EXE_SYM %s
-# RUN: llvm-objdump -s -section=.got %t-be.exe | FileCheck -check-prefix=EXE_GOT_BE %s
-# RUN: llvm-objdump -d %t-be.exe | FileCheck -check-prefix=EXE_DIS_BE %s
-# RUN: llvm-readobj -relocations %t-be.exe | FileCheck -check-prefix=NORELOC %s
-# RUN: llvm-readobj -sections %t-be.exe | FileCheck -check-prefix=SHFLAGS %s
+# RUN: llvm-readobj --sections -r --symbols --mips-plt-got %t-be.exe \
+# RUN:   | FileCheck -check-prefixes=ELF,EXE %s
+# RUN: llvm-objdump -d %t-be.exe | FileCheck -check-prefix=DIS %s
 
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %t-el.o
 # RUN: ld.lld %t-el.o -o %t-el.exe
-# RUN: llvm-objdump -section-headers -t %t-el.exe | FileCheck -check-prefix=EXE_SYM %s
-# RUN: llvm-objdump -s -section=.got %t-el.exe | FileCheck -check-prefix=EXE_GOT_EL %s
-# RUN: llvm-objdump -d %t-el.exe | FileCheck -check-prefix=EXE_DIS_EL %s
-# RUN: llvm-readobj -relocations %t-el.exe | FileCheck -check-prefix=NORELOC %s
-# RUN: llvm-readobj -sections %t-el.exe | FileCheck -check-prefix=SHFLAGS %s
+# RUN: llvm-readobj --sections -r --symbols --mips-plt-got %t-el.exe \
+# RUN:   | FileCheck -check-prefixes=ELF,EXE %s
+# RUN: llvm-objdump -d %t-el.exe | FileCheck -check-prefix=DIS %s
 
 # RUN: ld.lld -shared %t-be.o -o %t-be.so
-# RUN: llvm-objdump -section-headers -t %t-be.so | FileCheck -check-prefix=DSO_SYM %s
-# RUN: llvm-objdump -s -section=.got %t-be.so | FileCheck -check-prefix=DSO_GOT_BE %s
-# RUN: llvm-objdump -d %t-be.so | FileCheck -check-prefix=DSO_DIS_BE %s
-# RUN: llvm-readobj -relocations %t-be.so | FileCheck -check-prefix=NORELOC %s
-# RUN: llvm-readobj -sections %t-be.so | FileCheck -check-prefix=SHFLAGS %s
+# RUN: llvm-readobj --sections -r --symbols --mips-plt-got %t-be.so \
+# RUN:   | FileCheck -check-prefixes=ELF,DSO %s
+# RUN: llvm-objdump -d %t-be.so | FileCheck -check-prefix=DIS %s
 
 # RUN: ld.lld -shared %t-el.o -o %t-el.so
-# RUN: llvm-objdump -section-headers -t %t-el.so | FileCheck -check-prefix=DSO_SYM %s
-# RUN: llvm-objdump -s -section=.got %t-el.so | FileCheck -check-prefix=DSO_GOT_EL %s
-# RUN: llvm-objdump -d %t-el.so | FileCheck -check-prefix=DSO_DIS_EL %s
-# RUN: llvm-readobj -relocations %t-el.so | FileCheck -check-prefix=NORELOC %s
-# RUN: llvm-readobj -sections %t-el.so | FileCheck -check-prefix=SHFLAGS %s
+# RUN: llvm-readobj --sections -r --symbols --mips-plt-got %t-el.so \
+# RUN:   | FileCheck -check-prefixes=ELF,DSO %s
+# RUN: llvm-objdump -d %t-el.so | FileCheck -check-prefix=DIS %s
 
   .text
   .globl  __start
@@ -43,57 +35,32 @@ __start:
 v1:
   .word 0
 
-# EXE_SYM: Sections:
-# EXE_SYM: .got 0000000c 0000000000030010 DATA
-# EXE_SYM: SYMBOL TABLE:
-# EXE_SYM: 00038000         .got    00000000 .hidden _gp
-#          ^-- .got + GP offset (0x7ff0)
-# EXE_SYM: 00030000 g     O .data		 00000004 v1
-
-
-# EXE_GOT_BE: Contents of section .got:
-# EXE_GOT_BE:  30010 00000000 80000000 00030000
-#                    ^        ^        ^-- v1 (0x30000)
-#                    |        +-- Module pointer (0x80000000)
-#                    +-- Lazy resolver (0x0)
-
-# EXE_GOT_EL: Contents of section .got:
-# EXE_GOT_EL:  30010 00000000 00000080 00000300
-#                    ^        ^        ^-- v1 (0x30000)
-#                    |        +-- Module pointer (0x80000000)
-#                    +-- Lazy resolver (0x0)
-
-# v1GotAddr (0x3000c) - _gp (0x37ff4) = -0x7fe8 => 0x8018 = 32792
-# EXE_DIS_BE:  20000:  3c 02 80 18  lui $2, 32792
-# EXE_DIS_EL:  20000:  18 80 02 3c  lui $2, 32792
-
-# DSO_SYM: Sections:
-# DSO_SYM: .got 0000000c 0000000000020010 DATA
-# DSO_SYM: SYMBOL TABLE:
-# DSO_SYM: 00028000         .got    00000000 .hidden _gp
-#          ^-- .got + GP offset (0x7ff0)
-# DSO_SYM: 00020000 g     O .data		 00000004 v1
-
-# DSO_GOT_BE: Contents of section .got:
-# DSO_GOT_BE:  20010 00000000 80000000 00020000
-#                    ^        ^        ^-- v1 (0x20000)
-#                    |        +-- Module pointer (0x80000000)
-#                    +-- Lazy resolver (0x0)
-
-# DSO_GOT_EL: Contents of section .got:
-# DSO_GOT_EL:  20010 00000000 00000080 00000200
-#                    ^        ^        ^-- v1 (0x20000)
-#                    |        +-- Module pointer (0x80000000)
-#                    +-- Lazy resolver (0x0)
-
-# v1GotAddr (0x2000c) - _gp (0x27ff4) = -0x7fe8 => 0x8018 = 32792
-# DSO_DIS_BE:  10000:  3c 02 80 18  lui $2, 32792
-# DSO_DIS_EL:  10000:  18 80 02 3c  lui $2, 32792
-
-# NORELOC:      Relocations [
-# NORELOC-NEXT: ]
-
-# SHFLAGS:      Name: .got
-# SHFLAGS-NEXT: Type: SHT_PROGBITS
-# SHFLAGS-NEXT: Flags [ (0x10000003)
-#                        ^-- SHF_MIPS_GPREL | SHF_ALLOC | SHF_WRITE
+# ELF:      Section {
+# ELF:        Name: .got
+# ELF:        Flags [
+# ELF-NEXT:     SHF_ALLOC
+# ELF-NEXT:     SHF_MIPS_GPREL
+# ELF-NEXT:     SHF_WRITE
+# ELF-NEXT:   ]
+#
+# ELF:      Relocations [
+# ELF-NEXT: ]
+#
+# ELF:      Symbol {
+# ELF:        Name: v1
+# ELF-NEXT:   Value: 0x[[V1:[0-9A-F]+]]
+#
+# ELF:      {{.*}} GOT {
+# EXE-NEXT:   Canonical gp value: 0x38000
+# DSO-NEXT:   Canonical gp value: 0x28000
+#
+# ELF:        Entry {
+# EXE:          Address: 0x30018
+# DSO:          Address: 0x20018
+# ELF-NEXT:     Access: -32744
+# ELF-NEXT:     Initial: 0x[[V1]]
+
+# "v1 GOT entry address" - _gp
+# exe: 0x30018 - 0x38000 = -0x7fe8 == 0x8018 == 32792
+# dso: 0x20018 - 0x28000 = -0x7fe8 == 0x8018 == 32792
+# DIS:  {{.*}}  lui $2, 32792
diff --git a/deps/lld/test/ELF/mips-got-script.s b/deps/lld/test/ELF/mips-got-script.s
index 6590c59e1cdaaa574fbb060db1f06b9cd8bdd19a..7c43de2ce5494e95cdaff359e187f428a720aabc 100644
--- a/deps/lld/test/ELF/mips-got-script.s
+++ b/deps/lld/test/ELF/mips-got-script.s
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: echo "SECTIONS { .data : { *(.data.1); . += 0x10000; *(.data.2) } }" > %t.script
 # RUN: ld.lld %t.o -shared -o %t.so -T %t.script
-# RUN: llvm-readobj -mips-plt-got -dynamic-table %t.so | FileCheck %s
+# RUN: llvm-readobj --mips-plt-got --dynamic-table %t.so | FileCheck %s
 
 # CHECK: 0x7000000A MIPS_LOCAL_GOTNO 4
 #                                    ^-- 2 * header + 2 local entries
diff --git a/deps/lld/test/ELF/mips-got-string.s b/deps/lld/test/ELF/mips-got-string.s
index cfdd0daf68dd05ac095366c851fdb72d6bcea8e3..7dee285bd74a3e9d3b673527a662ea73e49d622b 100644
--- a/deps/lld/test/ELF/mips-got-string.s
+++ b/deps/lld/test/ELF/mips-got-string.s
@@ -3,20 +3,12 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux -o %t.o %s
 # RUN: ld.lld -shared -o %t.so %t.o
-# RUN: llvm-readobj -t -mips-plt-got %t.so | FileCheck %s
+# RUN: llvm-readelf --mips-plt-got %t.so | FileCheck %s
 
-# CHECK:      Symbol {
-# CHECK:        Name: $.str
-# CHECK-NEXT:   Value: 0x1B1
-# CHECK:      }
-
-# CHECK:      Local entries [
-# CHECK-NEXT:   Entry {
-# CHECK-NEXT:     Address:
-# CHECK-NEXT:     Access: -32744
-# CHECK-NEXT:     Initial: 0x0
-# CHECK:        }
-# CHECK:      ]
+# CHECK:       Local entries:
+# CHECK-NEXT:         Address     Access  Initial
+# CHECK-NEXT:   {{[0-9a-f]+}} -32744(gp) 00000000
+# CHECK-NEXT:   {{[0-9a-f]+}} -32740(gp) 00010000
 
   .text
   lw     $t9, %got($.str)($gp)
diff --git a/deps/lld/test/ELF/mips-got-weak.s b/deps/lld/test/ELF/mips-got-weak.s
index 478e294f02f380294a60b4f313ff82ae56cced24..5e43bf3c3480e969ab02608a5ebe002a53d62887 100644
--- a/deps/lld/test/ELF/mips-got-weak.s
+++ b/deps/lld/test/ELF/mips-got-weak.s
@@ -3,10 +3,10 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -shared -o %t1.so
-# RUN: llvm-readobj -r -dt -dynamic-table -mips-plt-got %t1.so \
+# RUN: llvm-readobj -r --dyn-syms --dynamic-table --mips-plt-got %t1.so \
 # RUN:   | FileCheck -check-prefixes=CHECK,NOSYM %s
 # RUN: ld.lld %t.o -shared -Bsymbolic -o %t2.so
-# RUN: llvm-readobj -r -dt -dynamic-table -mips-plt-got %t2.so \
+# RUN: llvm-readobj -r --dyn-syms --dynamic-table --mips-plt-got %t2.so \
 # RUN:   | FileCheck -check-prefixes=CHECK,SYM %s
 
 # CHECK:      Relocations [
diff --git a/deps/lld/test/ELF/mips-got16-relocatable.s b/deps/lld/test/ELF/mips-got16-relocatable.s
index e1100c2b31b374820c86efddf649e4e16232cecd..b92a9d523ec0157a42ab4c07a8419f5ff46c9de6 100644
--- a/deps/lld/test/ELF/mips-got16-relocatable.s
+++ b/deps/lld/test/ELF/mips-got16-relocatable.s
@@ -9,6 +9,7 @@
 # RUN: llvm-objdump -d %t.so | FileCheck -check-prefix=SO %s
 
 # OBJ:      Disassembly of section .text:
+# OBJ-EMPTY:
 # OBJ-NEXT: .text:
 # OBJ-NEXT:        0:       8f 99 00 00     lw      $25, 0($gp)
 # OBJ-NEXT:                         00000000:  R_MIPS_GOT16 .data
@@ -20,6 +21,7 @@
 # OBJ-NEXT:                         00000014:  R_MIPS_LO16  .data
 
 # SO:      Disassembly of section .text:
+# SO-EMPTY:
 # SO-NEXT: .text:
 # SO-NEXT:    10000:       8f 99 80 18     lw      $25, -32744($gp)
 # SO-NEXT:    10004:       27 24 00 00     addiu   $4, $25, 0
diff --git a/deps/lld/test/ELF/mips-got16.s b/deps/lld/test/ELF/mips-got16.s
index 53734ed31bb15682a2e43a1ebeb44aeeb6e01304..f25f3a01478d64c41d8d1d601f06a583fbe34783 100644
--- a/deps/lld/test/ELF/mips-got16.s
+++ b/deps/lld/test/ELF/mips-got16.s
@@ -4,9 +4,10 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -shared -o %t.so
 # RUN: llvm-objdump -d -t %t.so | FileCheck %s
-# RUN: llvm-readobj -r -mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readelf -r --mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
 
 # CHECK:      Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: __start:
 # CHECK-NEXT:    10000:       8f 88 80 18     lw      $8, -32744($gp)
 # CHECK-NEXT:    10004:       21 08 00 2c     addi    $8, $8, 44
@@ -24,83 +25,29 @@
 # CHECK: 00041008         .data           00000000 .hidden bar
 # CHECK: 00000000         *UND*           00000000 foo
 
-# GOT:      Relocations [
-# GOT-NEXT: ]
+# GOT: There are no relocations in this file.
 
-# GOT:      Primary GOT {
-# GOT-NEXT:   Canonical gp value:
-# GOT-NEXT:   Reserved entries [
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32752
-# GOT-NEXT:       Initial: 0x0
-# GOT-NEXT:       Purpose: Lazy resolver
-# GOT-NEXT:     }
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32748
-# GOT-NEXT:       Initial: 0x80000000
-# GOT-NEXT:       Purpose: Module pointer (GNU extension)
-# GOT-NEXT:     }
-# GOT-NEXT:   ]
-# GOT-NEXT:   Local entries [
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32744
-# GOT-NEXT:       Initial: 0x10000
-#                          ^-- (0x1002c + 0x8000) & ~0xffff
-# GOT-NEXT:     }
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32740
-# GOT-NEXT:       Initial: 0x20000
-#                          ^-- redundant unused entry
-# GOT-NEXT:     }
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32736
-# GOT-NEXT:       Initial: 0x20000
-#                          ^-- redundant unused entry
-# GOT-NEXT:     }
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32732
-# GOT-NEXT:       Initial: 0x30000
-#                          ^-- (0x29000 + 0x8000) & ~0xffff
-# GOT-NEXT:     }
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32728
-# GOT-NEXT:       Initial: 0x40000
-#                          ^-- (0x29000 + 0x10004 + 0x8000) & ~0xffff
-#                          ^-- (0x29000 + 0x18004 + 0x8000) & ~0xffff
-# GOT-NEXT:     }
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32724
-# GOT-NEXT:       Initial: 0x50000
-#                          ^-- redundant unused entry
-# GOT-NEXT:     }
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32720
-# GOT-NEXT:       Initial: 0x41008
-#                          ^-- 'bar' address
-# GOT-NEXT:     }
-# GOT-NEXT:   ]
-# GOT-NEXT:   Global entries [
-# GOT-NEXT:     Entry {
-# GOT-NEXT:       Address:
-# GOT-NEXT:       Access: -32716
-# GOT-NEXT:       Initial: 0x0
-# GOT-NEXT:       Value: 0x0
-# GOT-NEXT:       Type: None
-# GOT-NEXT:       Section: Undefined
-# GOT-NEXT:       Name: foo
-# GOT-NEXT:     }
-# GOT-NEXT:   ]
-# GOT-NEXT:   Number of TLS and multi-GOT entries: 0
-# GOT-NEXT: }
+# GOT:       Local entries:
+# GOT-NEXT:    Address     Access  Initial
+# GOT-NEXT:   00041018 -32744(gp) 00010000
+#                                 ^-- (0x1002c + 0x8000) & ~0xffff
+# GOT-NEXT:   0004101c -32740(gp) 00020000
+#                                 ^-- redundant unused entry
+# GOT-NEXT:   00041020 -32736(gp) 00020000
+#                                 ^-- redundant unused entry
+# GOT-NEXT:   00041024 -32732(gp) 00030000
+#                                 ^-- (0x29000 + 0x8000) & ~0xffff
+# GOT-NEXT:   00041028 -32728(gp) 00040000
+#                                 ^-- (0x29000 + 0x10004 + 0x8000) & ~0xffff
+#                                 ^-- (0x29000 + 0x18004 + 0x8000) & ~0xffff
+# GOT-NEXT:   0004102c -32724(gp) 00050000
+#                                 ^-- redundant unused entry
+# GOT-NEXT:   00041030 -32720(gp) 00041008
+#                                 ^-- 'bar' address
+# GOT-EMPTY:
+# GOT-NEXT:  Global entries:
+# GOT-NEXT:    Address     Access  Initial Sym.Val. Type    Ndx Name
+# GOT-NEXT:   00041034 -32716(gp) 00000000 00000000 NOTYPE  UND foo
 
   .text
   .globl  __start
diff --git a/deps/lld/test/ELF/mips-gp-disp.s b/deps/lld/test/ELF/mips-gp-disp.s
index 1b4226d6022b26ed2fef2fb5e549deb17ba98c9a..b50cb02e226f7652d73c0ac40d7b22445828ff4f 100644
--- a/deps/lld/test/ELF/mips-gp-disp.s
+++ b/deps/lld/test/ELF/mips-gp-disp.s
@@ -4,11 +4,11 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld -shared -o %t.so %t.o %S/Inputs/mips-gp-disp.so
-# RUN: llvm-readobj -symbols %t.so | FileCheck -check-prefix=INT-SO %s
-# RUN: llvm-readobj -symbols %S/Inputs/mips-gp-disp.so \
+# RUN: llvm-readobj --symbols %t.so | FileCheck -check-prefix=INT-SO %s
+# RUN: llvm-readobj --symbols %S/Inputs/mips-gp-disp.so \
 # RUN:   | FileCheck -check-prefix=EXT-SO %s
 # RUN: llvm-objdump -d -t %t.so | FileCheck -check-prefix=DIS %s
-# RUN: llvm-readobj -relocations %t.so | FileCheck -check-prefix=REL %s
+# RUN: llvm-readobj -r %t.so | FileCheck -check-prefix=REL %s
 
 # INT-SO:      Name: _gp_disp
 # INT-SO-NEXT: Value:
@@ -19,6 +19,7 @@
 # EXT-SO-NEXT: Value: 0x20000
 
 # DIS:      Disassembly of section .text:
+# DIS-EMPTY:
 # DIS-NEXT: __start:
 # DIS-NEXT:    10000:  3c 08 00 01  lui   $8, 1
 # DIS-NEXT:    10004:  21 08 7f f0  addi  $8, $8, 32752
diff --git a/deps/lld/test/ELF/mips-gp-local.s b/deps/lld/test/ELF/mips-gp-local.s
index 1146af8ff751d8acc02c5df14c2ce3f850ca9227..e81f58b14796d316aec1f44a0c9823ada643806a 100644
--- a/deps/lld/test/ELF/mips-gp-local.s
+++ b/deps/lld/test/ELF/mips-gp-local.s
@@ -6,6 +6,7 @@
 # RUN: llvm-objdump -d -t %t.exe | FileCheck %s
 
 # CHECK:      Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: __start:
 # CHECK-NEXT:    20000:  3c 08 00 03  lui   $8, 3
 # CHECK-NEXT:    20004:  21 08 7f f0  addi  $8, $8, 32752
diff --git a/deps/lld/test/ELF/mips-gp-lowest.s b/deps/lld/test/ELF/mips-gp-lowest.s
index 46da50334f5ac1c355ef90de984c522735109d17..699684119bfde4c4086b0d1e0b510fcfefe1035a 100644
--- a/deps/lld/test/ELF/mips-gp-lowest.s
+++ b/deps/lld/test/ELF/mips-gp-lowest.s
@@ -7,7 +7,7 @@
 # RUN:          .sdata : { *(.sdata) } \
 # RUN:          .got  : { *(.got) } }" > %t.rel.script
 # RUN: ld.lld %t.o --script %t.rel.script -shared -o %t.so
-# RUN: llvm-readobj -s -t %t.so | FileCheck %s
+# RUN: llvm-readobj -S --symbols %t.so | FileCheck %s
 
   .text
   .global foo
diff --git a/deps/lld/test/ELF/mips-gprel-sec.s b/deps/lld/test/ELF/mips-gprel-sec.s
index 7517983895b89d1ed7ca1afad483d4d63c586a42..e9efa02d6d5820b85542d18e2dcf50dbac8452b4 100644
--- a/deps/lld/test/ELF/mips-gprel-sec.s
+++ b/deps/lld/test/ELF/mips-gprel-sec.s
@@ -3,7 +3,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -shared -o %t.so
-# RUN: llvm-readobj -s %t.so | FileCheck %s
+# RUN: llvm-readobj -S %t.so | FileCheck %s
 
   .text
   nop
diff --git a/deps/lld/test/ELF/mips-gprel32-relocs-gp0.s b/deps/lld/test/ELF/mips-gprel32-relocs-gp0.s
index 1abdeec1b11af6d1888855d09c94d6a49786f4de..045279ad07572b2e76b7dd494fb9b0a4a02f5236 100644
--- a/deps/lld/test/ELF/mips-gprel32-relocs-gp0.s
+++ b/deps/lld/test/ELF/mips-gprel32-relocs-gp0.s
@@ -3,10 +3,10 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld -r -o %t-rel.o %t.o
-# RUN: llvm-readobj -mips-reginfo %t-rel.o | FileCheck --check-prefix=REL %s
+# RUN: llvm-readobj --mips-reginfo %t-rel.o | FileCheck --check-prefix=REL %s
 
 # RUN: ld.lld -shared -o %t.so %S/Inputs/mips-gp0-non-zero.o
-# RUN: llvm-readobj -mips-reginfo %t.so | FileCheck --check-prefix=DSO %s
+# RUN: llvm-readobj --mips-reginfo %t.so | FileCheck --check-prefix=DSO %s
 # RUN: llvm-objdump -s -t %t.so | FileCheck --check-prefix=DUMP %s
 
 # REL: GP: 0x0
diff --git a/deps/lld/test/ELF/mips-hilo-gp-disp.s b/deps/lld/test/ELF/mips-hilo-gp-disp.s
index 997074efff162b7e3018570642d2e21f9215f814..46a7204bdb08c34552f921931b95fc44974ef448 100644
--- a/deps/lld/test/ELF/mips-hilo-gp-disp.s
+++ b/deps/lld/test/ELF/mips-hilo-gp-disp.s
@@ -20,6 +20,7 @@ bar:
   addi   $t0,$t0,%lo(_gp_disp)
 
 # EXE:      Disassembly of section .text:
+# EXE-EMPTY:
 # EXE-NEXT: __start:
 # EXE-NEXT:  20000:   3c 08 00 02   lui    $8, 2
 #                                              ^-- %hi(0x47ff0-0x20000)
@@ -37,6 +38,7 @@ bar:
 # EXE: 00020000     .text   00000000 __start
 
 # SO:      Disassembly of section .text:
+# SO-EMPTY:
 # SO-NEXT: __start:
 # SO-NEXT:  10000:   3c 08 00 02   lui    $8, 2
 #                                             ^-- %hi(0x28000-0x10000)
diff --git a/deps/lld/test/ELF/mips-hilo-hi-only.s b/deps/lld/test/ELF/mips-hilo-hi-only.s
index 6fd4c683fd9140c26357f0f9c29d026f74d524d7..dd9bb90ad98d941e23c5f984ce32fdb585f73748 100644
--- a/deps/lld/test/ELF/mips-hilo-hi-only.s
+++ b/deps/lld/test/ELF/mips-hilo-hi-only.s
@@ -16,6 +16,7 @@ _label:
 # WARN: can't find matching R_MIPS_LO16 relocation for R_MIPS_HI16
 
 # CHECK:      Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: __start:
 # CHECK-NEXT:  20000:   3c 08 00 03   lui    $8, 3
 #                                                ^-- %hi(__start) w/o addend
diff --git a/deps/lld/test/ELF/mips-hilo.s b/deps/lld/test/ELF/mips-hilo.s
index 64f41140350bd705afd0db56d7290768826f1879..517ae2fd00997448c3fa5066e4e29fe5fa870389 100644
--- a/deps/lld/test/ELF/mips-hilo.s
+++ b/deps/lld/test/ELF/mips-hilo.s
@@ -30,6 +30,7 @@ g1:
   .word 0
 
 # CHECK:      Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: __start:
 # CHECK-NEXT:  20000:   3c 08 00 02   lui    $8, 2
 #                                                ^-- %hi(__start+4)
diff --git a/deps/lld/test/ELF/mips-jalr.test b/deps/lld/test/ELF/mips-jalr.test
index c1b119c701b69304cab9d846fc7f77259a0cf947..8aada95469644b0b0408465389ca2ebe4562d357 100644
--- a/deps/lld/test/ELF/mips-jalr.test
+++ b/deps/lld/test/ELF/mips-jalr.test
@@ -3,7 +3,7 @@
 # RUN: yaml2obj %s -o %t.o
 # RUN: ld.lld %t.o -o %t.so -shared
 # RUN: llvm-objdump -d %t.so | FileCheck %s
-# RUN: llvm-readobj -relocations %t.so | FileCheck -check-prefix=REL %s
+# RUN: llvm-readobj -r %t.so | FileCheck -check-prefix=REL %s
 
 # REQUIRES: mips
 
@@ -38,15 +38,14 @@ Sections:
         Type:    R_MIPS_JALR
 
 Symbols:
-  Local:
-    - Name:     T1
-      Type:     STT_FUNC
-      Section:  .text
-      Value:    0
-      Size:     4
-  Global:
-    - Name:     __start
-      Type:     STT_FUNC
-      Section:  .text
-      Value:    0
-      Size:     4
+  - Name:     T1
+    Type:     STT_FUNC
+    Section:  .text
+    Value:    0
+    Size:     4
+  - Name:     __start
+    Type:     STT_FUNC
+    Section:  .text
+    Value:    0
+    Size:     4
+    Binding:  STB_GLOBAL
diff --git a/deps/lld/test/ELF/mips-merge-abiflags.s b/deps/lld/test/ELF/mips-merge-abiflags.s
index d061c1b022bd828fa49ba72780aace4af3076786..27587e124b975aaf110db32f7eb581c54311c7ef 100644
--- a/deps/lld/test/ELF/mips-merge-abiflags.s
+++ b/deps/lld/test/ELF/mips-merge-abiflags.s
@@ -4,8 +4,8 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips64-unknown-freebsd %s -o %t.o
 # RUN: ld.lld %t.o %p/Inputs/mips-concatenated-abiflags.o -o %t.exe
-# RUN: llvm-readobj -sections -mips-abi-flags %t.exe | FileCheck %s
-# RUN: llvm-readobj -sections -mips-abi-flags \
+# RUN: llvm-readobj --sections --mips-abi-flags %t.exe | FileCheck %s
+# RUN: llvm-readobj --sections --mips-abi-flags \
 # RUN:     %p/Inputs/mips-concatenated-abiflags.o | \
 # RUN:   FileCheck --check-prefix=INPUT-OBJECT %s
 
diff --git a/deps/lld/test/ELF/mips-mgot.s b/deps/lld/test/ELF/mips-mgot.s
index 4e364916c8143cc4638cdbe811f635bc06b51cdc..9488cc94c6e344607721f017407f07b7948c2160 100644
--- a/deps/lld/test/ELF/mips-mgot.s
+++ b/deps/lld/test/ELF/mips-mgot.s
@@ -8,14 +8,14 @@
 # RUN:         %p/Inputs/mips-mgot-2.s -o %t2.o
 # RUN: ld.lld -shared -mips-got-size 52 %t0.o %t1.o %t2.o -o %t.so
 # RUN: llvm-objdump -s -section=.got -t %t.so | FileCheck %s
-# RUN: llvm-readobj -r -dt -mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readobj -r --dyn-syms --mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
 
 # CHECK:      Contents of section .got:
-# CHECK-NEXT:  60000 00000000 80000000 00010000 00010030
-# CHECK-NEXT:  60010 00000000 00000004 00020000 00030000
-# CHECK-NEXT:  60020 00040000 00050000 00060000 00070000
-# CHECK-NEXT:  60030 00000000 00000000 00000000 00000000
-# CHECK-NEXT:  60040 00000000 00000000 00000000
+# CHECK-NEXT:  70000 00000000 80000000 00010000 00010030
+# CHECK-NEXT:  70010 00000000 00000004 00030000 00040000
+# CHECK-NEXT:  70020 00050000 00060000 00070000 00080000
+# CHECK-NEXT:  70030 00000000 00000000 00000000 00000000
+# CHECK-NEXT:  70040 00000000 00000000 00000000
 
 # CHECK: SYMBOL TABLE:
 # CHECK: 00000000 l    O .tdata          00000000 loc0
@@ -28,20 +28,20 @@
 
 # GOT:      Relocations [
 # GOT-NEXT:   Section (7) .rel.dyn {
-# GOT-NEXT:     0x60018 R_MIPS_REL32 - 0x0
-# GOT-NEXT:     0x6001C R_MIPS_REL32 - 0x0
-# GOT-NEXT:     0x60020 R_MIPS_REL32 - 0x0
-# GOT-NEXT:     0x60024 R_MIPS_REL32 - 0x0
-# GOT-NEXT:     0x60028 R_MIPS_REL32 - 0x0
-# GOT-NEXT:     0x6002C R_MIPS_REL32 - 0x0
-# GOT-NEXT:     0x60030 R_MIPS_REL32 foo0 0x0
-# GOT-NEXT:     0x60034 R_MIPS_REL32 foo2 0x0
-# GOT-NEXT:     0x60044 R_MIPS_TLS_DTPMOD32 - 0x0
-# GOT-NEXT:     0x60010 R_MIPS_TLS_TPREL32 tls0 0x0
-# GOT-NEXT:     0x60038 R_MIPS_TLS_TPREL32 tls0 0x0
-# GOT-NEXT:     0x6003C R_MIPS_TLS_DTPMOD32 tls0 0x0
-# GOT-NEXT:     0x60040 R_MIPS_TLS_DTPREL32 tls0 0x0
-# GOT-NEXT:     0x60014 R_MIPS_TLS_TPREL32 tls1 0x0
+# GOT-NEXT:     0x70018 R_MIPS_REL32 - 0x0
+# GOT-NEXT:     0x7001C R_MIPS_REL32 - 0x0
+# GOT-NEXT:     0x70020 R_MIPS_REL32 - 0x0
+# GOT-NEXT:     0x70024 R_MIPS_REL32 - 0x0
+# GOT-NEXT:     0x70028 R_MIPS_REL32 - 0x0
+# GOT-NEXT:     0x7002C R_MIPS_REL32 - 0x0
+# GOT-NEXT:     0x70030 R_MIPS_REL32 foo0 0x0
+# GOT-NEXT:     0x70034 R_MIPS_REL32 foo2 0x0
+# GOT-NEXT:     0x70044 R_MIPS_TLS_DTPMOD32 - 0x0
+# GOT-NEXT:     0x70010 R_MIPS_TLS_TPREL32 tls0 0x0
+# GOT-NEXT:     0x70038 R_MIPS_TLS_TPREL32 tls0 0x0
+# GOT-NEXT:     0x7003C R_MIPS_TLS_DTPMOD32 tls0 0x0
+# GOT-NEXT:     0x70040 R_MIPS_TLS_DTPREL32 tls0 0x0
+# GOT-NEXT:     0x70014 R_MIPS_TLS_TPREL32 tls1 0x0
 # GOT-NEXT:   }
 # GOT-NEXT: ]
 
@@ -57,7 +57,7 @@
 # GOT-NEXT: ]
 
 # GOT:      Primary GOT {
-# GOT-NEXT:   Canonical gp value: 0x67FF0
+# GOT-NEXT:   Canonical gp value: 0x77FF0
 # GOT-NEXT:   Reserved entries [
 # GOT-NEXT:     Entry {
 # GOT-NEXT:       Address:
diff --git a/deps/lld/test/ELF/mips-micro-bad-cross-calls.s b/deps/lld/test/ELF/mips-micro-bad-cross-calls.s
new file mode 100644
index 0000000000000000000000000000000000000000..63f7e407ed8066e50804bc0043b17b7c864dd765
--- /dev/null
+++ b/deps/lld/test/ELF/mips-micro-bad-cross-calls.s
@@ -0,0 +1,15 @@
+# REQUIRES: mips
+# Check error message for invalid cross-mode branch instructions.
+
+# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
+# RUN:         %S/Inputs/mips-dynamic.s -o %t2.o
+# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t1.o
+# RUN: not ld.lld -o %t.exe %t1.o %t2.o 2>&1 | FileCheck %s
+
+# CHECK: (.text+0x0): unsupported jump/branch instruction between ISA modes referenced by R_MICROMIPS_PC10_S1 relocation
+
+  .text
+  .set micromips
+  .global __start
+__start:
+  b16 foo0
diff --git a/deps/lld/test/ELF/mips-micro-cross-calls.s b/deps/lld/test/ELF/mips-micro-cross-calls.s
new file mode 100644
index 0000000000000000000000000000000000000000..fc9dd0aeb8e4ad5c25818f10b93cef90e5a3858c
--- /dev/null
+++ b/deps/lld/test/ELF/mips-micro-cross-calls.s
@@ -0,0 +1,44 @@
+# REQUIRES: mips
+# Check various cases of microMIPS - regular code cross-calls.
+
+# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
+# RUN:         -mattr=micromips %s -o %t-eb.o
+# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
+# RUN:         -position-independent -mattr=micromips \
+# RUN:         %S/Inputs/mips-micro.s -o %t-eb-pic.o
+# RUN: ld.lld -o %t-eb.exe %t-eb.o %t-eb-pic.o
+# RUN: llvm-objdump -d -mattr=-micromips %t-eb.exe \
+# RUN:   | FileCheck --check-prefix=REG %s
+# RUN: llvm-objdump -d -mattr=+micromips %t-eb.exe \
+# RUN:   | FileCheck --check-prefix=MICRO %s
+
+# REG:        __start:
+# REG-NEXT:      20000:       74 00 80 04     jalx 131088 <micro>
+# REG-NEXT:      20004:       00 00 00 00     nop
+# REG-NEXT:      20008:       74 00 80 08     jalx 131104 <__microLA25Thunk_foo>
+
+# REG:        __LA25Thunk_bar:
+# REG-NEXT:      20030:       3c 19 00 02     lui     $25, 2
+# REG-NEXT:      20034:       08 00 80 11     j       131140 <bar>
+
+# MICRO:      micro:
+# MICRO-NEXT:    20010:       f0 00 80 00     jalx 65536
+# MICRO-NEXT:    20014:       00 00 00 00     nop
+# MICRO-NEXT:    20018:       f0 00 80 0c     jalx 65560
+
+# MICRO:      __microLA25Thunk_foo:
+# MICRO-NEXT:    20020:       41 b9 00 02     lui     $25, 2
+# MICRO-NEXT:    20024:       d4 01 00 20     j       131136
+
+  .text
+  .set nomicromips
+  .global __start
+__start:
+  jal micro
+  jal foo
+
+  .set micromips
+  .global micro
+micro:
+  jal __start
+  jal bar
diff --git a/deps/lld/test/ELF/mips-micro-got.s b/deps/lld/test/ELF/mips-micro-got.s
index a881e0ae5fcb69fb5fb55855d2280af6b9594126..539b6223fb79a068394069f1e841538f087b9467 100644
--- a/deps/lld/test/ELF/mips-micro-got.s
+++ b/deps/lld/test/ELF/mips-micro-got.s
@@ -7,7 +7,7 @@
 # RUN:         %S/Inputs/mips-dynamic.s -o %t2.o
 # RUN: ld.lld %t2.o -shared -o %t.so
 # RUN: ld.lld %t1.o %t.so -o %t.exe
-# RUN: llvm-readobj -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj --mips-plt-got %t.exe | FileCheck %s
 
 # CHECK:      Local entries [
 # CHECK-NEXT:   Entry {
diff --git a/deps/lld/test/ELF/mips-micro-jal.s b/deps/lld/test/ELF/mips-micro-jal.s
index f41d7dc3a6cebab5fb9f85702bcafe5bc9141c28..50d534d823aab942ab256c08fb7d3820bcd16ad8 100644
--- a/deps/lld/test/ELF/mips-micro-jal.s
+++ b/deps/lld/test/ELF/mips-micro-jal.s
@@ -8,7 +8,7 @@
 # RUN:         -mattr=micromips %s -o %t2eb.o
 # RUN: ld.lld -o %teb.exe %t2eb.o %teb.so
 # RUN: llvm-objdump -d -mattr=micromips %teb.exe | FileCheck --check-prefix=EB %s
-# RUN: llvm-readobj -mips-plt-got %teb.exe | FileCheck --check-prefix=PLT %s
+# RUN: llvm-readobj --mips-plt-got %teb.exe | FileCheck --check-prefix=PLT %s
 
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux \
 # RUN:         -mattr=micromips %S/Inputs/mips-micro.s -o %t1el.o
@@ -17,7 +17,7 @@
 # RUN:         -mattr=micromips %s -o %t2el.o
 # RUN: ld.lld -o %tel.exe %t2el.o %tel.so
 # RUN: llvm-objdump -d -mattr=micromips %tel.exe | FileCheck --check-prefix=EL %s
-# RUN: llvm-readobj -mips-plt-got %tel.exe | FileCheck --check-prefix=PLT %s
+# RUN: llvm-readobj --mips-plt-got %tel.exe | FileCheck --check-prefix=PLT %s
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:         -mattr=micromips -mcpu=mips32r6 %S/Inputs/mips-micro.s -o %t1eb.o
@@ -47,6 +47,7 @@
 # RUN:   | FileCheck --check-prefix=MIXED %s
 
 # EB:      Disassembly of section .plt:
+# EB-EMPTY:
 # EB-NEXT: .plt:
 # EB-NEXT:    20010:       79 80 3f fd     addiupc $3, 65524
 # EB-NEXT:    20014:       ff 23 00 00     lw      $25, 0($3)
@@ -64,6 +65,7 @@
 # EB-NEXT:    2003a:       0f 02           move    $24, $2
 
 # EL:      Disassembly of section .plt:
+# EL-EMPTY:
 # EL-NEXT: .plt:
 # EL-NEXT:    20010:       80 79 fd 3f     addiupc $3, 65524
 # EL-NEXT:    20014:       23 ff 00 00     lw      $25, 0($3)
@@ -81,6 +83,7 @@
 # EL-NEXT:    2003a:       02 0f           move    $24, $2
 
 # EBR6:      Disassembly of section .plt:
+# EBR6-EMPTY:
 # EBR6-NEXT: .plt:
 # EBR6-NEXT:    20010:       78 60 3f fd     lapc    $3, 65524
 # EBR6-NEXT:    20014:       ff 23 00 00     lw      $25, 0($3)
@@ -97,6 +100,7 @@
 # EBR6-NEXT:    2003a:       47 23           jrc16   $25
 
 # ELR6:      Disassembly of section .plt:
+# ELR6-EMPTY:
 # ELR6-NEXT: .plt:
 # ELR6-NEXT:    20010:       60 78 fd 3f     lapc    $3, 65524
 # ELR6-NEXT:    20014:       23 ff 00 00     lw      $25, 0($3)
@@ -113,6 +117,7 @@
 # ELR6-NEXT:    2003a:       23 47           jrc16   $25
 
 # MIXED:      Disassembly of section .plt:
+# MIXED-EMPTY:
 # MIXED-NEXT: .plt:
 # MIXED-NEXT:    20020:       79 80 3f f9     addiupc $3, 65508
 # MIXED-NEXT:    20024:       ff 23 00 00     lw      $25, 0($3)
diff --git a/deps/lld/test/ELF/mips-micro-plt.s b/deps/lld/test/ELF/mips-micro-plt.s
index 24e90ae49a86307c82d39f1f11a80fc6916b3de8..e7f74e453f8134ae0fd4d1ed7d5b8ce383685f0e 100644
--- a/deps/lld/test/ELF/mips-micro-plt.s
+++ b/deps/lld/test/ELF/mips-micro-plt.s
@@ -7,7 +7,7 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:         -mattr=micromips %s -o %t-exe.o
 # RUN: ld.lld %t-exe.o %t.so -o %t.exe
-# RUN: llvm-readobj -t -dt -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj --symbols --dyn-syms --mips-plt-got %t.exe | FileCheck %s
 # RUN: llvm-objdump -d -mattr=micromips %t.exe | FileCheck --check-prefix=ASM %s
 
 # CHECK:      Symbols [
@@ -87,9 +87,9 @@
 
 # ASM:      __start:
 # ASM-NEXT:    20000:       fd 1c 80 18     lw      $8, -32744($gp)
-# ASM-NEXT:    20004:       11 08 00 10     addi    $8, $8, 16
+# ASM-NEXT:    20004:       11 08 00 11     addi    $8, $8, 17
 # ASM-NEXT:    20008:       41 a8 00 02     lui     $8, 2
-# ASM-NEXT:    2000c:       11 08 00 40     addi    $8, $8, 64
+# ASM-NEXT:    2000c:       11 08 00 41     addi    $8, $8, 65
 #
 # ASM:      foo:
 # ASM-NEXT:    20010:       f4 01 00 20     jal     131136
diff --git a/deps/lld/test/ELF/mips-micro-relocs.s b/deps/lld/test/ELF/mips-micro-relocs.s
index b539aa9467634a8e02d91a0aca1278c9bb9c2c07..a0decf13708c961913453a55eaf9db8198bd5654 100644
--- a/deps/lld/test/ELF/mips-micro-relocs.s
+++ b/deps/lld/test/ELF/mips-micro-relocs.s
@@ -6,20 +6,22 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:         -mattr=micromips %s -o %t2eb.o
 # RUN: ld.lld -o %teb.exe %t1eb.o %t2eb.o
-# RUN: llvm-objdump -d -t -mattr=micromips %teb.exe \
+# RUN: llvm-objdump -d -t -s -mattr=micromips %teb.exe \
 # RUN:   | FileCheck --check-prefixes=EB,SYM %s
+# RUN: llvm-readobj -h %teb.exe | FileCheck --check-prefix=ELF %s
 
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux \
 # RUN:         -mattr=micromips %S/Inputs/mips-micro.s -o %t1el.o
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux \
 # RUN:         -mattr=micromips %s -o %t2el.o
 # RUN: ld.lld -o %tel.exe %t1el.o %t2el.o
-# RUN: llvm-objdump -d -t -mattr=micromips %tel.exe \
+# RUN: llvm-objdump -d -t -s -mattr=micromips %tel.exe \
 # RUN:   | FileCheck --check-prefixes=EL,SYM %s
+# RUN: llvm-readobj -h %tel.exe | FileCheck --check-prefix=ELF %s
 
 # EB:      __start:
 # EB-NEXT:      20010:       41 a3 00 01     lui     $3, 1
-# EB-NEXT:      20014:       30 63 7f df     addiu   $3, $3, 32735
+# EB-NEXT:      20014:       30 63 7f ef     addiu   $3, $3, 32751
 # EB-NEXT:      20018:       fc 7c 80 18     lw      $3, -32744($gp)
 # EB-NEXT:      2001c:       fc 63 80 18     lw      $3, -32744($3)
 # EB-NEXT:      20020:       8f 70           beqz16  $6, -32
@@ -28,9 +30,15 @@
 # EB-NEXT:      20028:       00 00 00 00     nop
 # EB-NEXT:      2002c:       94 00 ff e8     b       -44
 
+# EB:      Contents of section .data:
+# EB-NEXT:  30000 fffe8011
+
+# EB:      Contents of section .debug_info
+# EB-NEXT:  0000 00020011
+
 # EL:      __start:
 # EL-NEXT:      20010:       a3 41 01 00     lui     $3, 1
-# EL-NEXT:      20014:       63 30 df 7f     addiu   $3, $3, 32735
+# EL-NEXT:      20014:       63 30 ef 7f     addiu   $3, $3, 32751
 # EL-NEXT:      20018:       7c fc 18 80     lw      $3, -32744($gp)
 # EL-NEXT:      2001c:       63 fc 18 80     lw      $3, -32744($3)
 # EL-NEXT:      20020:       70 8f           beqz16  $6, -32
@@ -39,9 +47,18 @@
 # EL-NEXT:      20028:       00 00 00 00     nop
 # EL-NEXT:      2002c:       00 94 e8 ff     b       -44
 
-# SYM: 00037ff0         .got            00000000 .hidden _gp
-# SYM: 00020000 g F     .text           00000000 foo
-# SYM: 00020010         .text           00000000 __start
+# EL:      Contents of section .data:
+# EL-NEXT:  30000 1180feff
+
+# EL:      Contents of section .debug_info
+# EL-NEXT:  0000 11000200
+
+# SYM: 00038000         .got   00000000 .hidden _gp
+# SYM: 00020000 g F     .text  00000000 0x80 foo
+# SYM: 00020010         .text  00000000 0x80 __start
+
+# ELF: ElfHeader {
+# ELF:   Entry: 0x20011
 
   .text
   .set micromips
@@ -56,3 +73,9 @@ __start:
   beqz16  $6, foo                 # R_MICROMIPS_PC7_S1
   b16     foo                     # R_MICROMIPS_PC10_S1
   b       foo                     # R_MICROMIPS_PC16_S1
+
+  .data
+  .gpword __start                 # R_MIPS_GPREL32
+
+  .section .debug_info
+  .word __start                   # R_MIPS_32
diff --git a/deps/lld/test/ELF/mips-micror6-relocs.s b/deps/lld/test/ELF/mips-micror6-relocs.s
index ca2c1c064f5605fb799813a6ef926e3057949dfe..fb450ba5cf3c53d3c755d595a64c78666527303a 100644
--- a/deps/lld/test/ELF/mips-micror6-relocs.s
+++ b/deps/lld/test/ELF/mips-micror6-relocs.s
@@ -26,8 +26,8 @@
 # EL-NEXT:    20014:  7f 80 f6 ff  beqzc  $3, -36
 # EL-NEXT:    20018:  ff b7 f4 ff  balc   -24 <foo>
 
-# SYM: 00020000 g F     .text           00000000 foo
-# SYM: 00020010         .text           00000000 __start
+# SYM: 00020000 g F     .text  00000000 0x80 foo
+# SYM: 00020010         .text  00000000 0x80 __start
 
   .text
   .set micromips
diff --git a/deps/lld/test/ELF/mips-n32-rels.s b/deps/lld/test/ELF/mips-n32-rels.s
index b59000c06d869d4a18bb243ca4f0dce36b32a370..0e5e785edd428be19f98f21fefa7e63f71abc599 100644
--- a/deps/lld/test/ELF/mips-n32-rels.s
+++ b/deps/lld/test/ELF/mips-n32-rels.s
@@ -24,6 +24,7 @@ loc:
   .gpword(loc)                                # R_MIPS_GPREL32
 
 # CHECK:      Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: __start:
 # CHECK-NEXT:    20000:  3c 1c 00 01  lui     $gp, 1
 #                                                  ^-- 0x20000 - 0x37ff0
diff --git a/deps/lld/test/ELF/mips-non-zero-gp0.s b/deps/lld/test/ELF/mips-non-zero-gp0.s
index 9e6b13c70725e56c47eccbccfbd48c14c7ef764b..0d385fafccf7155179f84c391f085b484bab8dfc 100644
--- a/deps/lld/test/ELF/mips-non-zero-gp0.s
+++ b/deps/lld/test/ELF/mips-non-zero-gp0.s
@@ -34,11 +34,11 @@
 #   lui     $gp,%hi(%neg(%gp_rel(foo)))
 
 # RUN: ld.lld -r -o %t-32.r %S/Inputs/mips-gp0-non-zero.o
-# RUN: llvm-readobj -mips-reginfo %t-32.r | FileCheck --check-prefix=GPVAL %s
+# RUN: llvm-readobj --mips-reginfo %t-32.r | FileCheck --check-prefix=GPVAL %s
 # RUN: llvm-objdump -s %t-32.r | FileCheck --check-prefix=ADDEND32 %s
 
 # RUN: ld.lld -r -o %t-64.r %S/Inputs/mips-n64-gp0-non-zero.o
-# RUN: llvm-readobj -mips-options %t-64.r | FileCheck --check-prefix=GPVAL %s
+# RUN: llvm-readobj --mips-options %t-64.r | FileCheck --check-prefix=GPVAL %s
 # RUN: llvm-readobj -r %S/Inputs/mips-n64-gp0-non-zero.o %t-64.r \
 # RUN:   | FileCheck --check-prefix=ADDEND64 %s
 
diff --git a/deps/lld/test/ELF/mips-npic-call-pic-os.s b/deps/lld/test/ELF/mips-npic-call-pic-os.s
index 8799d832994d586607c544d20565af31720af599..719894587e86ae04902e1d25f1a00a0a2e86f83c 100644
--- a/deps/lld/test/ELF/mips-npic-call-pic-os.s
+++ b/deps/lld/test/ELF/mips-npic-call-pic-os.s
@@ -14,6 +14,7 @@
 # RUN: llvm-objdump -d %t.exe | FileCheck %s
 
 # CHECK: Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: __LA25Thunk_foo1a:
 # CHECK-NEXT:    20000:       3c 19 00 02     lui     $25, 2
 # CHECK-NEXT:    20004:       08 00 80 08     j       131104 <foo1a>
@@ -52,7 +53,9 @@
 
 # CHECK: fnpic:
 # CHECK-NEXT:    20070:       00 00 00 00     nop
+# CHECK-EMPTY:
 # CHECK-NEXT: Disassembly of section differentos:
+# CHECK-EMPTY:
 # CHECK-NEXT: __start:
 # CHECK-NEXT:    20074:       0c 00 80 00     jal     131072 <__LA25Thunk_foo1a>
 # CHECK-NEXT:    20078:       00 00 00 00     nop
@@ -74,6 +77,7 @@
 # RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=REVERSE %s
 
 # REVERSE: Disassembly of section .text:
+# REVERSE-EMPTY:
 # REVERSE-NEXT: __LA25Thunk_foo1a:
 # REVERSE-NEXT:    20000:       3c 19 00 02     lui     $25, 2
 # REVERSE-NEXT:    20004:       08 00 80 08     j       131104 <foo1a>
@@ -114,6 +118,7 @@
 # REVERSE-NEXT:    20070:       00 00 00 00     nop
 
 # REVERSE: Disassembly of section differentos:
+# REVERSE-EMPTY:
 # REVERSE-NEXT: __start:
 # REVERSE-NEXT:    20074:       0c 00 80 00     jal     131072 <__LA25Thunk_foo1a>
 # REVERSE-NEXT:    20078:       00 00 00 00     nop
diff --git a/deps/lld/test/ELF/mips-npic-call-pic-script.s b/deps/lld/test/ELF/mips-npic-call-pic-script.s
index 11aa51aca83c6b7982ebf76775c1d51ca36a0480..90c1eee3ed02db103e6ddc7c89a47e6e9e5ea474 100644
--- a/deps/lld/test/ELF/mips-npic-call-pic-script.s
+++ b/deps/lld/test/ELF/mips-npic-call-pic-script.s
@@ -14,6 +14,7 @@
 # RUN: llvm-objdump -d %t.exe | FileCheck %s
 
 # CHECK: Disassembly of section .out:
+# CHECK-EMPTY:
 # CHECK-NEXT: __LA25Thunk_foo1a:
 # CHECK-NEXT:    20000:       3c 19 00 02     lui     $25, 2
 # CHECK-NEXT:    20004:       08 00 80 08     j       131104 <foo1a>
@@ -84,6 +85,7 @@ __start:
 # RUN: llvm-objdump -d %t2.exe | FileCheck -check-prefix=ORPH1 %s
 
 # ORPH1: Disassembly of section .text:
+# ORPH1-EMPTY:
 # ORPH1-NEXT: __start:
 # ORPH1-NEXT:    20000:       0c 00 80 15     jal     131156 <__LA25Thunk_foo1a>
 # ORPH1-NEXT:    20004:       00 00 00 00     nop
@@ -144,6 +146,7 @@ __start:
 # RUN: llvm-objdump -d %t3.exe | FileCheck -check-prefix=ORPH2 %s
 
 # ORPH2: Disassembly of section .out:
+# ORPH2-EMPTY:
 # ORPH2-NEXT: __start:
 # ORPH2-NEXT:    20000:       0c 00 80 18     jal     131168 <__LA25Thunk_foo1a>
 # ORPH2-NEXT:    20004:       00 00 00 00     nop
@@ -169,7 +172,9 @@ __start:
 
 # ORPH2: fnpic:
 # ORPH2-NEXT:    20050:       00 00 00 00     nop
+# ORPH2-EMPTY:
 # ORPH2-NEXT: Disassembly of section .text:
+# ORPH2-EMPTY:
 
 # ORPH2-NEXT: __LA25Thunk_foo1a:
 # ORPH2-NEXT:    20060:       3c 19 00 02     lui     $25, 2
diff --git a/deps/lld/test/ELF/mips-npic-call-pic.s b/deps/lld/test/ELF/mips-npic-call-pic.s
index 5921c9f510fcce528fd6946dc816e84ed90ccbb8..a742c40be096dc6d1756f50e4488d0b7f6a8dcd4 100644
--- a/deps/lld/test/ELF/mips-npic-call-pic.s
+++ b/deps/lld/test/ELF/mips-npic-call-pic.s
@@ -2,18 +2,32 @@
 # Check LA25 stubs creation. This stub code is necessary when
 # non-PIC code calls PIC function.
 
-# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
+# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux -mcpu=mips32r2 \
 # RUN:   %p/Inputs/mips-fpic.s -o %t-fpic.o
-# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
+# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux -mcpu=mips32r2 \
 # RUN:   %p/Inputs/mips-fnpic.s -o %t-fnpic.o
-# RUN: ld.lld -r %t-fpic.o %t-fnpic.o -o %t-sto-pic.o
-# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
-# RUN:   %p/Inputs/mips-pic.s -o %t-pic.o
-# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t-npic.o
-# RUN: ld.lld %t-npic.o %t-pic.o %t-sto-pic.o -o %t.exe
-# RUN: llvm-objdump -d %t.exe | FileCheck %s
+# RUN: ld.lld -r %t-fpic.o %t-fnpic.o -o %t-sto-pic-r2.o
+# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux -mcpu=mips32r2 \
+# RUN:   %p/Inputs/mips-pic.s -o %t-pic-r2.o
+# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux -mcpu=mips32r2 \
+# RUN:   %s -o %t-npic-r2.o
+# RUN: ld.lld %t-npic-r2.o %t-pic-r2.o %t-sto-pic-r2.o -o %t-r2.exe
+# RUN: llvm-objdump -d %t-r2.exe | FileCheck --check-prefixes=CHECK,R2 %s
+
+# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux -mcpu=mips32r6 \
+# RUN:   %p/Inputs/mips-fpic.s -o %t-fpic.o
+# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux -mcpu=mips32r6 \
+# RUN:   %p/Inputs/mips-fnpic.s -o %t-fnpic.o
+# RUN: ld.lld -r %t-fpic.o %t-fnpic.o -o %t-sto-pic-r6.o
+# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux -mcpu=mips32r6 \
+# RUN:   %p/Inputs/mips-pic.s -o %t-pic-r6.o
+# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux -mcpu=mips32r6 \
+# RUN:   %s -o %t-npic-r6.o
+# RUN: ld.lld %t-npic-r6.o %t-pic-r6.o %t-sto-pic-r6.o -o %t-r6.exe
+# RUN: llvm-objdump -d %t-r6.exe | FileCheck --check-prefixes=CHECK,R6 %s
 
 # CHECK:     Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: __start:
 # CHECK-NEXT:    20000:       0c 00 80 0c     jal     131120 <__LA25Thunk_foo1a>
 # CHECK-NEXT:    20004:       00 00 00 00     nop
@@ -29,13 +43,15 @@
 # CHECK-NEXT:    2002c:       00 00 00 00     nop
 #
 # CHECK: __LA25Thunk_foo1a:
-# CHECK-NEXT:    20030:       3c 19 00 02     lui     $25, 2
-# CHECK-NEXT:    20034:       08 00 80 14     j       131152 <foo1a>
+# R2:            20030:       3c 19 00 02     lui     $25, 2
+# R6:            20030:       3c 19 00 02     aui     $25, $zero, 2
+# CHECK:         20034:       08 00 80 14     j       131152 <foo1a>
 # CHECK-NEXT:    20038:       27 39 00 50     addiu   $25, $25, 80
 # CHECK-NEXT:    2003c:       00 00 00 00     nop
 
 # CHECK: __LA25Thunk_foo1b:
-# CHECK-NEXT:    20040:       3c 19 00 02     lui     $25, 2
+# R2:            20040:       3c 19 00 02     lui     $25, 2
+# R6:            20040:       3c 19 00 02     aui     $25, $zero, 2
 # CHECK-NEXT:    20044:       08 00 80 15     j       131156 <foo1b>
 # CHECK-NEXT:    20048:       27 39 00 54     addiu   $25, $25, 84
 # CHECK-NEXT:    2004c:       00 00 00 00     nop
@@ -47,7 +63,8 @@
 # CHECK-NEXT:    20054:       00 00 00 00     nop
 
 # CHECK: __LA25Thunk_foo2:
-# CHECK-NEXT:    20058:       3c 19 00 02     lui     $25, 2
+# R2:            20058:       3c 19 00 02     lui     $25, 2
+# R6:            20058:       3c 19 00 02     aui     $25, $zero, 2
 # CHECK-NEXT:    2005c:       08 00 80 1c     j       131184 <foo2>
 # CHECK-NEXT:    20060:       27 39 00 70     addiu   $25, $25, 112
 # CHECK-NEXT:    20064:       00 00 00 00     nop
@@ -56,7 +73,8 @@
 # CHECK-NEXT:    20070:       00 00 00 00     nop
 
 # CHECK: __LA25Thunk_fpic:
-# CHECK-NEXT:    20074:       3c 19 00 02     lui     $25, 2
+# R2:            20074:       3c 19 00 02     lui     $25, 2
+# R6:            20074:       3c 19 00 02     aui     $25, $zero, 2
 # CHECK-NEXT:    20078:       08 00 80 24     j       131216 <fpic>
 # CHECK-NEXT:    2007c:       27 39 00 90     addiu   $25, $25, 144
 # CHECK-NEXT:    20080:       00 00 00 00     nop
@@ -70,19 +88,25 @@
 # Make sure the thunks are created properly no matter how
 # objects are laid out.
 #
-# RUN: ld.lld %t-pic.o %t-npic.o %t-sto-pic.o -o %t.exe
-# RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=REVERSE %s
+# RUN: ld.lld %t-pic-r2.o %t-npic-r2.o %t-sto-pic-r2.o -o %t.exe
+# RUN: llvm-objdump -d %t.exe | FileCheck -check-prefixes=REVERSE,REV-R2 %s
+#
+# RUN: ld.lld %t-pic-r6.o %t-npic-r6.o %t-sto-pic-r6.o -o %t.exe
+# RUN: llvm-objdump -d %t.exe | FileCheck -check-prefixes=REVERSE,REV-R6 %s
 
 # REVERSE: Disassembly of section .text:
+# REVERSE-EMPTY:
 # REVERSE-NEXT: __LA25Thunk_foo1a:
-# REVERSE-NEXT:    20000:       3c 19 00 02     lui     $25, 2
-# REVERSE-NEXT:    20004:       08 00 80 08     j       131104 <foo1a>
+# REV-R2:          20000:       3c 19 00 02     lui     $25, 2
+# REV-R6:          20000:       3c 19 00 02     aui     $25, $zero, 2
+# REVERSE:         20004:       08 00 80 08     j       131104 <foo1a>
 # REVERSE-NEXT:    20008:       27 39 00 20     addiu   $25, $25, 32
 # REVERSE-NEXT:    2000c:       00 00 00 00     nop
 
 # REVERSE: __LA25Thunk_foo1b:
-# REVERSE-NEXT:    20010:       3c 19 00 02     lui     $25, 2
-# REVERSE-NEXT:    20014:       08 00 80 09     j       131108 <foo1b>
+# REV-R2:          20010:       3c 19 00 02     lui     $25, 2
+# REV-R6:          20010:       3c 19 00 02     aui     $25, $zero, 2
+# REVERSE:         20014:       08 00 80 09     j       131108 <foo1b>
 # REVERSE-NEXT:    20018:       27 39 00 24     addiu   $25, $25, 36
 # REVERSE-NEXT:    2001c:       00 00 00 00     nop
 
@@ -93,8 +117,9 @@
 # REVERSE-NEXT:    20024:       00 00 00 00     nop
 
 # REVERSE: __LA25Thunk_foo2:
-# REVERSE-NEXT:    20028:       3c 19 00 02     lui     $25, 2
-# REVERSE-NEXT:    2002c:       08 00 80 10     j       131136 <foo2>
+# REV-R2:          20028:       3c 19 00 02     lui     $25, 2
+# REV-R6:          20028:       3c 19 00 02     aui     $25, $zero, 2
+# REVERSE:         2002c:       08 00 80 10     j       131136 <foo2>
 # REVERSE-NEXT:    20030:       27 39 00 40     addiu   $25, $25, 64
 # REVERSE-NEXT:    20034:       00 00 00 00     nop
 
@@ -116,8 +141,9 @@
 # REVERSE-NEXT:    2007c:       00 00 00 00     nop
 
 # REVERSE: __LA25Thunk_fpic:
-# REVERSE-NEXT:    20080:       3c 19 00 02     lui     $25, 2
-# REVERSE-NEXT:    20084:       08 00 80 24     j       131216 <fpic>
+# REV-R2:          20080:       3c 19 00 02     lui     $25, 2
+# REV-R6:          20080:       3c 19 00 02     aui     $25, $zero, 2
+# REVERSE:         20084:       08 00 80 24     j       131216 <fpic>
 # REVERSE-NEXT:    20088:       27 39 00 90     addiu   $25, $25, 144
 # REVERSE-NEXT:    2008c:       00 00 00 00     nop
 
diff --git a/deps/lld/test/ELF/mips-options-r.test b/deps/lld/test/ELF/mips-options-r.test
index 40c61c0d2bac38af5aa981600c50e32924feb89c..dc0499d372f82f5957e04d74b5aba8fe1e56b16c 100644
--- a/deps/lld/test/ELF/mips-options-r.test
+++ b/deps/lld/test/ELF/mips-options-r.test
@@ -11,7 +11,7 @@
 # % as -mabi=64 -mips64r2 t.s
 
 # RUN: ld.lld -r %p/Inputs/mips-options.o -o %t.o
-# RUN: llvm-readobj -s %t.o | FileCheck %s
+# RUN: llvm-readobj -S %t.o | FileCheck %s
 
 # REQUIRES: mips
 
diff --git a/deps/lld/test/ELF/mips-options.s b/deps/lld/test/ELF/mips-options.s
index ad634171eff7a7f0ab5b9700e2dbf90275855fe3..67179af8d100b3c8fe5efe7ff97dbb589876aede 100644
--- a/deps/lld/test/ELF/mips-options.s
+++ b/deps/lld/test/ELF/mips-options.s
@@ -8,7 +8,7 @@
 # RUN:          . = 0x100000000; \
 # RUN:          .got  : { *(.got) } }" > %t.rel.script
 # RUN: ld.lld %t1.o %t2.o --gc-sections --script %t.rel.script -shared -o %t.so
-# RUN: llvm-readobj -symbols -mips-options %t.so | FileCheck %s
+# RUN: llvm-readobj -l --symbols --mips-options %t.so | FileCheck %s
 
   .text
   .globl  __start
@@ -18,6 +18,19 @@ __start:
 # CHECK:      Name: _gp
 # CHECK-NEXT: Value: 0x[[GP:[0-9A-F]+]]
 
+# CHECK:      ProgramHeader {
+# CHECK:        Type: PT_MIPS_OPTIONS
+# CHECK-NEXT:   Offset:
+# CHECK-NEXT:   VirtualAddress:
+# CHECK-NEXT:   PhysicalAddress:
+# CHECK-NEXT:   FileSize:
+# CHECK-NEXT:   MemSize:
+# CHECK-NEXT:   Flags [
+# CHECK-NEXT:     PF_R
+# CHECK-NEXT:   ]
+# CHECK-NEXT:   Alignment: 8
+# CHECK-NEXT: }
+
 # CHECK:      MIPS Options {
 # CHECK-NEXT:   ODK_REGINFO {
 # CHECK-NEXT:     GP: 0x[[GP]]
diff --git a/deps/lld/test/ELF/mips-pc-relocs.s b/deps/lld/test/ELF/mips-pc-relocs.s
index 46c2b75578d904cad3f1562bab0e85dedd6c220d..ec7716ca1633334ce3aecb943b62c549d4db648f 100644
--- a/deps/lld/test/ELF/mips-pc-relocs.s
+++ b/deps/lld/test/ELF/mips-pc-relocs.s
@@ -22,6 +22,7 @@ __start:
   .word _foo+8-.                    # R_MIPS_PC32
 
 # CHECK:      Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: __start:
 # CHECK-NEXT:    20000:       ec c8 00 08     lwpc    $6, 32
 #                                      ^-- (0x20020-0x20000)>>2
diff --git a/deps/lld/test/ELF/mips-plt-copy.s b/deps/lld/test/ELF/mips-plt-copy.s
index e035c5bd588c72b5490bbf41834aa73e2e93cabd..068f498afa1940692805e1f480dcda3e9fe6ca11 100644
--- a/deps/lld/test/ELF/mips-plt-copy.s
+++ b/deps/lld/test/ELF/mips-plt-copy.s
@@ -7,7 +7,7 @@
 # RUN:         %S/Inputs/mips-dynamic.s -o %t.so.o
 # RUN: ld.lld %t.so.o -shared -o %t.so
 # RUN: ld.lld %t.o %t.so -o %t.exe
-# RUN: llvm-readobj -r -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj -r --mips-plt-got %t.exe | FileCheck %s
 
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section ({{.*}}) .rel.dyn {
diff --git a/deps/lld/test/ELF/mips-plt-n32.s b/deps/lld/test/ELF/mips-plt-n32.s
index 06699fc1d045070ed78e47607702378a484c54a8..78cc698f5dcb965c5ac579362f47ec222ebde8b2 100644
--- a/deps/lld/test/ELF/mips-plt-n32.s
+++ b/deps/lld/test/ELF/mips-plt-n32.s
@@ -14,12 +14,15 @@
 # RUN: llvm-objdump -d %t.exe | FileCheck %s --check-prefixes=HAZARDPLT,CHECK
 
 # CHECK:      Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: __start:
 # CHECK-NEXT:   20000:       0c 00 80 0c     jal     131120
 #                                                    ^-- 0x20030 gotplt[foo0]
 # CHECK-NEXT:   20004:       00 00 00 00     nop
 #
+# CHECK-EMPTY:
 # CHECK-NEXT: Disassembly of section .plt:
+# CHECK-EMPTY:
 # CHECK-NEXT: .plt:
 # CHECK-NEXT:   20010:       3c 0e 00 03     lui     $14, 3
 # CHECK-NEXT:   20014:       8d d9 00 04     lw      $25, 4($14)
diff --git a/deps/lld/test/ELF/mips-plt-n64.s b/deps/lld/test/ELF/mips-plt-n64.s
new file mode 100644
index 0000000000000000000000000000000000000000..1d5309dac353586c846efe338b8e8f08284dfab7
--- /dev/null
+++ b/deps/lld/test/ELF/mips-plt-n64.s
@@ -0,0 +1,42 @@
+# REQUIRES: mips
+# Check R_MIPS_26 relocation handling in case of N64 ABIs.
+
+# RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux \
+# RUN:         %S/Inputs/mips-dynamic.s -o %t-so.o
+# RUN: ld.lld %t-so.o -shared -o %t.so
+# RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux %s -o %t.o
+# RUN: ld.lld %t.o %t.so -o %t.exe
+# RUN: llvm-objdump -d %t.exe | FileCheck %s --check-prefixes=CHECK,DEFAULT
+# RUN: ld.lld %t-so.o -shared -o %t.so -z hazardplt
+# RUN: ld.lld %t.o %t.so -o %t.exe -z hazardplt
+# RUN: llvm-objdump -d %t.exe | FileCheck %s --check-prefixes=CHECK,HAZARDPLT
+
+# CHECK:      Disassembly of section .text:
+# CHECK-EMPTY:
+# CHECK-NEXT: __start:
+# CHECK-NEXT:    20000:       0c 00 80 0c     jal     131120
+# CHECK-NEXT:    20004:       00 00 00 00     nop
+# CHECK-EMPTY:
+# CHECK-NEXT: Disassembly of section .plt:
+# CHECK-EMPTY:
+# CHECK-NEXT: .plt:
+# CHECK-NEXT:    20010:       3c 0e 00 03     lui     $14, 3
+# CHECK-NEXT:    20014:       dd d9 00 08     ld      $25, 8($14)
+# CHECK-NEXT:    20018:       25 ce 00 08     addiu   $14, $14, 8
+# CHECK-NEXT:    2001c:       03 0e c0 23     subu    $24, $24, $14
+# CHECK-NEXT:    20020:       03 e0 78 25     move    $15, $ra
+# CHECK-NEXT:    20024:       00 18 c0 c2     srl     $24, $24, 3
+# DEFAULT:       20028:       03 20 f8 09     jalr    $25
+# HAZARDPLT:     20028:       03 20 fc 09     jalr.hb $25
+# CHECK-NEXT:    2002c:       27 18 ff fe     addiu   $24, $24, -2
+# CHECK-NEXT:    20030:       3c 0f 00 03     lui     $15, 3
+# CHECK-NEXT:    20034:       dd f9 00 18     ld      $25, 24($15)
+# DEFAULT:       20038:       03 20 00 08     jr      $25
+# HAZARDPLT:     20038:       03 20 04 08     jr.hb   $25
+# CHECK-NEXT:    2003c:       65 f8 00 18     daddiu  $24, $15, 24
+
+  .text
+  .option pic0
+  .global __start
+__start:
+  jal   foo0
diff --git a/deps/lld/test/ELF/mips-plt-r6.s b/deps/lld/test/ELF/mips-plt-r6.s
index b0ceb8214f0223f9b92d9f68c11af6fa089e9067..2fb532da982ec97079c225b61a93e4a0f7e87384 100644
--- a/deps/lld/test/ELF/mips-plt-r6.s
+++ b/deps/lld/test/ELF/mips-plt-r6.s
@@ -13,12 +13,15 @@
 # RUN: llvm-objdump -d %t.exe | FileCheck %s --check-prefixes=HAZARDPLT,CHECK
 
 # CHECK:      Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: __start:
 # CHECK-NEXT:   20000:       0c 00 80 0c     jal     131120
 #                                                    ^-- 0x20030 gotplt[foo0]
 # CHECK-NEXT:   20004:       00 00 00 00     nop
 #
+# CHECK-EMPTY:
 # CHECK-NEXT: Disassembly of section .plt:
+# CHECK-EMPTY:
 # CHECK-NEXT: .plt:
 # CHECK-NEXT:   20010:       3c 1c 00 03     aui     $gp, $zero, 3
 # CHECK-NEXT:   20014:       8f 99 00 04     lw      $25, 4($gp)
diff --git a/deps/lld/test/ELF/mips-reginfo.s b/deps/lld/test/ELF/mips-reginfo.s
index 049950d7424be546996818ebf6ae7c46f7b648b3..2df0cabe4c7a40a6a2bd89010c52a02c2c745164 100644
--- a/deps/lld/test/ELF/mips-reginfo.s
+++ b/deps/lld/test/ELF/mips-reginfo.s
@@ -5,7 +5,7 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:         %S/Inputs/mips-dynamic.s -o %t2.o
 # RUN: ld.lld %t1.o %t2.o --gc-sections -shared -o %t.so
-# RUN: llvm-readobj -symbols -mips-reginfo %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols --mips-reginfo %t.so | FileCheck %s
 
   .text
   .globl  __start
diff --git a/deps/lld/test/ELF/mips-sto-pic-flag.s b/deps/lld/test/ELF/mips-sto-pic-flag.s
index ae496979f7c63ddfeeec05256250bf53dba1e150..c313a8eb3c7f8d532bcdb98a0d807e0a640765a8 100644
--- a/deps/lld/test/ELF/mips-sto-pic-flag.s
+++ b/deps/lld/test/ELF/mips-sto-pic-flag.s
@@ -7,7 +7,7 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:   %p/Inputs/mips-pic.s -o %t-pic.o
 # RUN: ld.lld -r %t-npic.o %t-pic.o -o %t-rel.o
-# RUN: llvm-readobj -t %t-rel.o | FileCheck %s
+# RUN: llvm-readobj --symbols %t-rel.o | FileCheck %s
 
 # CHECK:      Symbol {
 # CHECK:        Name: main
diff --git a/deps/lld/test/ELF/mips-sto-plt.s b/deps/lld/test/ELF/mips-sto-plt.s
index 4bd0d9e7ba44c9466a7bc2f593324fadc0cebc86..dde5aff6a9bbda982d81abd49f0b8d9fcbc3ef1b 100644
--- a/deps/lld/test/ELF/mips-sto-plt.s
+++ b/deps/lld/test/ELF/mips-sto-plt.s
@@ -6,7 +6,7 @@
 # RUN: ld.lld %t.so.o -shared -o %t.so
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o %t.so -o %t.exe
-# RUN: llvm-readobj -dt -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj --dyn-syms --mips-plt-got %t.exe | FileCheck %s
 
 # CHECK:      Symbol {
 # CHECK:        Name: foo0
diff --git a/deps/lld/test/ELF/mips-tls-64.s b/deps/lld/test/ELF/mips-tls-64.s
index 2d0749edc585f54a9117c71e1bbd942f4b68c09e..83caa5275f0887afe54474af026d1ba4dbf73d1c 100644
--- a/deps/lld/test/ELF/mips-tls-64.s
+++ b/deps/lld/test/ELF/mips-tls-64.s
@@ -8,11 +8,11 @@
 
 # RUN: ld.lld %t.o %t.so -o %t.exe
 # RUN: llvm-objdump -d -s -t %t.exe | FileCheck -check-prefix=DIS %s
-# RUN: llvm-readobj -r -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj -r --mips-plt-got %t.exe | FileCheck %s
 
 # RUN: ld.lld -shared %t.o %t.so -o %t-out.so
 # RUN: llvm-objdump -d -s -t %t-out.so | FileCheck -check-prefix=DIS-SO %s
-# RUN: llvm-readobj -r -mips-plt-got %t-out.so | FileCheck -check-prefix=SO %s
+# RUN: llvm-readobj -r --mips-plt-got %t-out.so | FileCheck -check-prefix=SO %s
 
 # DIS:      __start:
 # DIS-NEXT:    20000:   24 62 80 30   addiu   $2, $3, -32720
@@ -22,11 +22,11 @@
 # DIS-NEXT:    20010:   24 62 80 28   addiu   $2, $3, -32728
 
 # DIS:      Contents of section .got:
-# DIS-NEXT:  30010 00000000 00000000 80000000 00000000
-# DIS-NEXT:  30020 00000000 00000000 ffffffff ffff9004
-# DIS-NEXT:  30030 00000000 00000000 00000000 00000000
-# DIS-NEXT:  30040 00000000 00000001 00000000 00000000
-# DIS-NEXT:  30050 00000000 00000001 ffffffff ffff8004
+# DIS-NEXT:  40010 00000000 00000000 80000000 00000000
+# DIS-NEXT:  40020 00000000 00000000 ffffffff ffff9004
+# DIS-NEXT:  40030 00000000 00000000 00000000 00000000
+# DIS-NEXT:  40040 00000000 00000001 00000000 00000000
+# DIS-NEXT:  40050 00000000 00000001 ffffffff ffff8004
 
 # DIS: 0000000000000000 l     O .tdata          00000000 loc
 # DIS: 0000000000000004 g     O .tdata          00000000 bar
@@ -34,13 +34,13 @@
 
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section (7) .rel.dyn {
-# CHECK-NEXT:     0x30020 R_MIPS_TLS_TPREL64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
-# CHECK-NEXT:     0x30030 R_MIPS_TLS_DTPMOD64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
-# CHECK-NEXT:     0x30038 R_MIPS_TLS_DTPREL64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
+# CHECK-NEXT:     0x40020 R_MIPS_TLS_TPREL64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
+# CHECK-NEXT:     0x40030 R_MIPS_TLS_DTPMOD64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
+# CHECK-NEXT:     0x40038 R_MIPS_TLS_DTPREL64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 # CHECK-NEXT: Primary GOT {
-# CHECK-NEXT:   Canonical gp value: 0x38000
+# CHECK-NEXT:   Canonical gp value: 0x48000
 # CHECK-NEXT:   Reserved entries [
 # CHECK:        ]
 # CHECK-NEXT:   Local entries [
@@ -58,25 +58,25 @@
 #               ^-- -32680                     VA - 0x8000 bar
 
 # DIS-SO:      Contents of section .got:
-# DIS-SO-NEXT:  20000 00000000 00000000 80000000 00000000
-# DIS-SO-NEXT:  20010 00000000 00000000 00000000 00000004
-# DIS-SO-NEXT:  20020 00000000 00000000 00000000 00000000
-# DIS-SO-NEXT:  20030 00000000 00000000 00000000 00000000
-# DIS-SO-NEXT:  20040 00000000 00000000 00000000 00000000
+# DIS-SO-NEXT:  30000 00000000 00000000 80000000 00000000
+# DIS-SO-NEXT:  30010 00000000 00000000 00000000 00000004
+# DIS-SO-NEXT:  30020 00000000 00000000 00000000 00000000
+# DIS-SO-NEXT:  30030 00000000 00000000 00000000 00000000
+# DIS-SO-NEXT:  30040 00000000 00000000 00000000 00000000
 
 # SO:      Relocations [
 # SO-NEXT:   Section (7) .rel.dyn {
-# SO-NEXT:     0x20030 R_MIPS_TLS_DTPMOD64/R_MIPS_NONE/R_MIPS_NONE - 0x0
-# SO-NEXT:     0x20018 R_MIPS_TLS_TPREL64/R_MIPS_NONE/R_MIPS_NONE bar 0x0
-# SO-NEXT:     0x20040 R_MIPS_TLS_DTPMOD64/R_MIPS_NONE/R_MIPS_NONE bar 0x0
-# SO-NEXT:     0x20048 R_MIPS_TLS_DTPREL64/R_MIPS_NONE/R_MIPS_NONE bar 0x0
-# SO-NEXT:     0x20010 R_MIPS_TLS_TPREL64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
-# SO-NEXT:     0x20020 R_MIPS_TLS_DTPMOD64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
-# SO-NEXT:     0x20028 R_MIPS_TLS_DTPREL64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
+# SO-NEXT:     0x30030 R_MIPS_TLS_DTPMOD64/R_MIPS_NONE/R_MIPS_NONE - 0x0
+# SO-NEXT:     0x30018 R_MIPS_TLS_TPREL64/R_MIPS_NONE/R_MIPS_NONE bar 0x0
+# SO-NEXT:     0x30040 R_MIPS_TLS_DTPMOD64/R_MIPS_NONE/R_MIPS_NONE bar 0x0
+# SO-NEXT:     0x30048 R_MIPS_TLS_DTPREL64/R_MIPS_NONE/R_MIPS_NONE bar 0x0
+# SO-NEXT:     0x30010 R_MIPS_TLS_TPREL64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
+# SO-NEXT:     0x30020 R_MIPS_TLS_DTPMOD64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
+# SO-NEXT:     0x30028 R_MIPS_TLS_DTPREL64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
 # SO-NEXT:   }
 # SO-NEXT: ]
 # SO-NEXT: Primary GOT {
-# SO-NEXT:   Canonical gp value: 0x27FF0
+# SO-NEXT:   Canonical gp value: 0x37FF0
 # SO-NEXT:   Reserved entries [
 # SO:        ]
 # SO-NEXT:   Local entries [
diff --git a/deps/lld/test/ELF/mips-tls-hilo.s b/deps/lld/test/ELF/mips-tls-hilo.s
index 6b6df17eb97d26ee9385f9d321a79bbaa5f36132..41fc784de1be1432adc3e89a560b0565468b5780 100644
--- a/deps/lld/test/ELF/mips-tls-hilo.s
+++ b/deps/lld/test/ELF/mips-tls-hilo.s
@@ -5,10 +5,10 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t.exe
 # RUN: llvm-objdump -d -t %t.exe | FileCheck -check-prefix=DIS %s
-# RUN: llvm-readobj -r -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj -r --mips-plt-got %t.exe | FileCheck %s
 
 # RUN: ld.lld %t.o -shared -o %t.so
-# RUN: llvm-readobj -r -mips-plt-got %t.so | FileCheck -check-prefix=SO %s
+# RUN: llvm-readobj -r --mips-plt-got %t.so | FileCheck -check-prefix=SO %s
 
 # DIS:      __start:
 # DIS-NEXT:    20000:   24 62 00 00   addiu   $2, $3, 0
diff --git a/deps/lld/test/ELF/mips-tls-static-64.s b/deps/lld/test/ELF/mips-tls-static-64.s
index 23c775fb32f53a7bee91178d5bfc726cbbedf824..f2da42ecde931049ae4217641bac34829c0decd6 100644
--- a/deps/lld/test/ELF/mips-tls-static-64.s
+++ b/deps/lld/test/ELF/mips-tls-static-64.s
@@ -7,8 +7,8 @@
 # RUN: llvm-objdump -s -t %t.exe | FileCheck %s
 
 # CHECK:      Contents of section .data:
-# CHECK-NEXT:  30000 00020004 ffffffff ffff8004 ffffffff
-# CHECK-NEXT:  30010 ffff9004
+# CHECK-NEXT:  40000 00020004 ffffffff ffff8004 ffffffff
+# CHECK-NEXT:  40010 ffff9004
 #
 # CHECK: SYMBOL TABLE:
 # CHECK: 0000000000020004        .text           00000000 __tls_get_addr
diff --git a/deps/lld/test/ELF/mips-tls-static.s b/deps/lld/test/ELF/mips-tls-static.s
index 9a1294003f489336f5a68f415e5d881057980e08..4062f85556f8aefa39cec65373887e9ddc50c210 100644
--- a/deps/lld/test/ELF/mips-tls-static.s
+++ b/deps/lld/test/ELF/mips-tls-static.s
@@ -7,10 +7,10 @@
 # RUN: llvm-objdump -s -t %t.exe | FileCheck %s
 
 # CHECK:      Contents of section .data:
-# CHECK-NEXT:  30000 0002000c ffff8004 ffff9004
+# CHECK-NEXT:  40000 0002000c ffff8004 ffff9004
 # CHECK:      Contents of section .got:
-# CHECK-NEXT:  30010 00000000 80000000 ffff9000 00000001
-# CHECK-NEXT:  30020 ffff8000 00000001 00000000
+# CHECK-NEXT:  40010 00000000 80000000 ffff9000 00000001
+# CHECK-NEXT:  40020 ffff8000 00000001 00000000
 #
 # CHECK: SYMBOL TABLE:
 # CHECK: 0002000c        .text           00000000 __tls_get_addr
diff --git a/deps/lld/test/ELF/mips-tls.s b/deps/lld/test/ELF/mips-tls.s
index 5e1f8a957d20ec74df7fe5a953cf55fbf1089264..d33bf6ac760a639045555151da9cdbe3a9beeabe 100644
--- a/deps/lld/test/ELF/mips-tls.s
+++ b/deps/lld/test/ELF/mips-tls.s
@@ -8,11 +8,11 @@
 
 # RUN: ld.lld %t.o %t.so -o %t.exe
 # RUN: llvm-objdump -d -s -t %t.exe | FileCheck -check-prefix=DIS %s
-# RUN: llvm-readobj -r -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj -r --mips-plt-got %t.exe | FileCheck %s
 
 # RUN: ld.lld -shared %t.o %t.so -o %t-out.so
 # RUN: llvm-objdump -d -s -t %t-out.so | FileCheck -check-prefix=DIS-SO %s
-# RUN: llvm-readobj -r -mips-plt-got %t-out.so | FileCheck -check-prefix=SO %s
+# RUN: llvm-readobj -r --mips-plt-got %t-out.so | FileCheck -check-prefix=SO %s
 
 # DIS:      __start:
 # DIS-NEXT:    20000:   24 62 80 20   addiu   $2, $3, -32736
@@ -22,9 +22,9 @@
 # DIS-NEXT:    20010:   24 62 80 1c   addiu   $2, $3, -32740
 
 # DIS:      Contents of section .got:
-# DIS-NEXT:  30010 00000000 80000000 00000000 ffff9004
-# DIS-NEXT:  30020 00000000 00000000 00000001 00000000
-# DIS-NEXT:  30030 00000001 ffff8004
+# DIS-NEXT:  40010 00000000 80000000 00000000 ffff9004
+# DIS-NEXT:  40020 00000000 00000000 00000001 00000000
+# DIS-NEXT:  40030 00000001 ffff8004
 
 # DIS: 00000000 l    O .tdata          00000000 loc
 # DIS: 00000004 g    O .tdata          00000000 bar
@@ -32,13 +32,13 @@
 
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section (7) .rel.dyn {
-# CHECK-NEXT:     0x30018 R_MIPS_TLS_TPREL32 foo 0x0
-# CHECK-NEXT:     0x30020 R_MIPS_TLS_DTPMOD32 foo 0x0
-# CHECK-NEXT:     0x30024 R_MIPS_TLS_DTPREL32 foo 0x0
+# CHECK-NEXT:     0x40018 R_MIPS_TLS_TPREL32 foo 0x0
+# CHECK-NEXT:     0x40020 R_MIPS_TLS_DTPMOD32 foo 0x0
+# CHECK-NEXT:     0x40024 R_MIPS_TLS_DTPREL32 foo 0x0
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 # CHECK-NEXT: Primary GOT {
-# CHECK-NEXT:   Canonical gp value: 0x38000
+# CHECK-NEXT:   Canonical gp value: 0x48000
 # CHECK-NEXT:   Reserved entries [
 # CHECK:        ]
 # CHECK-NEXT:   Local entries [
@@ -56,23 +56,23 @@
 #               ^-- -32716                     VA - 0x8000 bar
 
 # DIS-SO:      Contents of section .got:
-# DIS-SO-NEXT:  20000 00000000 80000000 00000000 00000004
-# DIS-SO-NEXT:  20010 00000000 00000000 00000000 00000000
-# DIS-SO-NEXT:  20020 00000000 00000000
+# DIS-SO-NEXT:  30000 00000000 80000000 00000000 00000004
+# DIS-SO-NEXT:  30010 00000000 00000000 00000000 00000000
+# DIS-SO-NEXT:  30020 00000000 00000000
 
 # SO:      Relocations [
 # SO-NEXT:   Section (7) .rel.dyn {
-# SO-NEXT:     0x20018 R_MIPS_TLS_DTPMOD32 - 0x0
-# SO-NEXT:     0x2000C R_MIPS_TLS_TPREL32 bar 0x0
-# SO-NEXT:     0x20020 R_MIPS_TLS_DTPMOD32 bar 0x0
-# SO-NEXT:     0x20024 R_MIPS_TLS_DTPREL32 bar 0x0
-# SO-NEXT:     0x20008 R_MIPS_TLS_TPREL32 foo 0x0
-# SO-NEXT:     0x20010 R_MIPS_TLS_DTPMOD32 foo 0x0
-# SO-NEXT:     0x20014 R_MIPS_TLS_DTPREL32 foo 0x0
+# SO-NEXT:     0x30018 R_MIPS_TLS_DTPMOD32 - 0x0
+# SO-NEXT:     0x3000C R_MIPS_TLS_TPREL32 bar 0x0
+# SO-NEXT:     0x30020 R_MIPS_TLS_DTPMOD32 bar 0x0
+# SO-NEXT:     0x30024 R_MIPS_TLS_DTPREL32 bar 0x0
+# SO-NEXT:     0x30008 R_MIPS_TLS_TPREL32 foo 0x0
+# SO-NEXT:     0x30010 R_MIPS_TLS_DTPMOD32 foo 0x0
+# SO-NEXT:     0x30014 R_MIPS_TLS_DTPREL32 foo 0x0
 # SO-NEXT:   }
 # SO-NEXT: ]
 # SO-NEXT: Primary GOT {
-# SO-NEXT:   Canonical gp value: 0x27FF0
+# SO-NEXT:   Canonical gp value: 0x37FF0
 # SO-NEXT:   Reserved entries [
 # SO:        ]
 # SO-NEXT:   Local entries [
diff --git a/deps/lld/test/ELF/mips-xgot-order.s b/deps/lld/test/ELF/mips-xgot-order.s
index c44cf64edd5a6d19d7b8236a5d3a282fe615795e..9ba27d28f04b821e0842bb52bcbea0587cb788f0 100644
--- a/deps/lld/test/ELF/mips-xgot-order.s
+++ b/deps/lld/test/ELF/mips-xgot-order.s
@@ -7,6 +7,7 @@
 # RUN: llvm-objdump -d -s -t %t.exe | FileCheck %s
 
 # CHECK:      Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: __start:
 # CHECK-NEXT:    20000:       3c 02 00 00     lui     $2, 0
 # CHECK-NEXT:    20004:       8c 42 80 24     lw      $2, -32732($2)
diff --git a/deps/lld/test/ELF/msp430.s b/deps/lld/test/ELF/msp430.s
index 96820acbc3f952bc9d8774d0a332abb79fffba9c..f481a303367f4b62c37be07505ef5a4dca8eedd7 100644
--- a/deps/lld/test/ELF/msp430.s
+++ b/deps/lld/test/ELF/msp430.s
@@ -13,6 +13,7 @@ foo:
   jmp _start
 
 ; CHECK:      Disassembly of section .text:
+; CHECK-EMPTY:
 ; CHECK-NEXT: _start:
 ; CHECK-NEXT: 8000: {{.*}} nop
 ; CHECK:      foo:
diff --git a/deps/lld/test/ELF/new-dtags.test b/deps/lld/test/ELF/new-dtags.test
index bceea4bd6d65eea9bf6e08f1e3b5a42d33c9bc2d..3801ef71a1c70111b7bfe289d7288a7965f57f92 100644
--- a/deps/lld/test/ELF/new-dtags.test
+++ b/deps/lld/test/ELF/new-dtags.test
@@ -10,11 +10,11 @@
 // RUN: llvm-readobj --dynamic-table %t2 | FileCheck --check-prefix=ENABLE %s
 
 // DISABLE: DynamicSection [
-// DISABLE:   0x000000000000000F RPATH                /somepath
+// DISABLE:   0x000000000000000F RPATH    Library rpath: [/somepath]
 // DISABLE-NOT: RUNPATH
 // DISABLE: ]
 
 // ENABLE: DynamicSection [
-// ENABLE:   0x000000000000001D RUNPATH              /somepath
+// ENABLE:   0x000000000000001D RUNPATH   Library runpath: [/somepath]
 // ENABLE-NOT: RPATH
 // ENABLE: ]
diff --git a/deps/lld/test/ELF/no-discard-this_module.s b/deps/lld/test/ELF/no-discard-this_module.s
index 3ce56d165fc1a61d861405fcf91ff635ae9e73d7..48078594509e98310cc9aae96bebf049d200d630 100644
--- a/deps/lld/test/ELF/no-discard-this_module.s
+++ b/deps/lld/test/ELF/no-discard-this_module.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-linux-gnu -save-temp-labels %s -o %t
 // RUN: ld.lld %t -o %t2
-// RUN: llvm-readobj -s -sd -t %t2 | FileCheck %s
+// RUN: llvm-readobj -S --section-data --symbols %t2 | FileCheck %s
 
 .global _start
 _start:
diff --git a/deps/lld/test/ELF/no-inhibit-exec.s b/deps/lld/test/ELF/no-inhibit-exec.s
index 1535f6e7b87ef9b7551d8436cc9070059a147fe3..203d37da44cc488ac6be8d68ce1463259f536adf 100644
--- a/deps/lld/test/ELF/no-inhibit-exec.s
+++ b/deps/lld/test/ELF/no-inhibit-exec.s
@@ -6,6 +6,7 @@
 # RUN: llvm-readobj -r %t2 | FileCheck %s --check-prefix=RELOC
 
 # CHECK: Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: _start
 # CHECK-NEXT: 201000: {{.*}} callq -2101253
 
diff --git a/deps/lld/test/ELF/non-abs-reloc.s b/deps/lld/test/ELF/non-abs-reloc.s
index ac69915b1b536c892b4daf4dc0ddda562d8843cf..a47dfe8ab4cc11719735c2d05002e9ad0ef43b55 100644
--- a/deps/lld/test/ELF/non-abs-reloc.s
+++ b/deps/lld/test/ELF/non-abs-reloc.s
@@ -6,6 +6,7 @@
 
 // RUN: llvm-objdump -D %t | FileCheck --check-prefix=DISASM %s
 // DISASM:      Disassembly of section .nonalloc:
+// DISASM-EMPTY:
 // DISASM-NEXT: .nonalloc:
 // DISASM-NEXT: 0: {{.*}}  callq {{.*}} <_start>
 // DISASM-NEXT: 5: {{.*}}  callq {{.*}} <_start>
diff --git a/deps/lld/test/ELF/non-alloc-link-order-gc.s b/deps/lld/test/ELF/non-alloc-link-order-gc.s
index 8147c45090d9940bcfa5a06bf3a96ccbd74d8807..93fff35d833fae4dcfb56fdedc1c8fe103545563 100644
--- a/deps/lld/test/ELF/non-alloc-link-order-gc.s
+++ b/deps/lld/test/ELF/non-alloc-link-order-gc.s
@@ -6,6 +6,7 @@
 ## Check that we are able to GC non-allocatable metadata sections without crash.
 
 # CHECK:      Disassembly of section .stack_sizes:
+# CHECK-EMPTY:
 # CHECK-NEXT:   .stack_sizes:
 # CHECK-NEXT:    01
 
diff --git a/deps/lld/test/ELF/noplt-pie.s b/deps/lld/test/ELF/noplt-pie.s
index 7f6ccf23d5cc4a751e97596446ee386856b2beb4..dded01d002292c5f506538e3734490cf466ae526 100644
--- a/deps/lld/test/ELF/noplt-pie.s
+++ b/deps/lld/test/ELF/noplt-pie.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
 # RUN: ld.lld -shared %t2.o -o %t2.so
 # RUN: ld.lld --hash-style=sysv %t1.o %t2.so -o %t.out
-# RUN: llvm-readobj -s -r %t.out | FileCheck %s
+# RUN: llvm-readobj -S -r %t.out | FileCheck %s
 
 # CHECK: Section {
 # CHECK-NOT: Name: .plt
diff --git a/deps/lld/test/ELF/note-alignment.s b/deps/lld/test/ELF/note-alignment.s
new file mode 100644
index 0000000000000000000000000000000000000000..417721f9521a82e8e587a33deafdcbdee29641a8
--- /dev/null
+++ b/deps/lld/test/ELF/note-alignment.s
@@ -0,0 +1,36 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-readelf -l %t | FileCheck %s
+
+# Check that we don't mix 4-byte and 8-byte aligned notes in one PT_LOAD.
+# The possible 4-byte padding before the 8-byte align note may make consumers
+# fail to parse it.
+
+# CHECK: NOTE {{0x[0-9a-f]+}} {{0x[0-9a-f]+}} {{0x[0-9a-f]+}} 0x000004 0x000004 R   0x4
+# CHECK: NOTE {{0x[0-9a-f]+}} {{0x[0-9a-f]+}} {{0x[0-9a-f]+}} 0x000010 0x000010 R   0x8
+# CHECK: NOTE {{0x[0-9a-f]+}} {{0x[0-9a-f]+}} {{0x[0-9a-f]+}} 0x000008 0x000008 R   0x4
+
+# CHECK:      03     .note.a
+# CHECK-NEXT: 04     .note.b .note.c
+# CHECK-NEXT: 05     .note.d .note.e
+
+.section .note.a, "a", @note
+.align 4
+.long 0
+
+.section .note.b, "a", @note
+.align 8
+.quad 0
+
+.section .note.c, "a", @note
+.align 8
+.quad 0
+
+.section .note.d, "a", @note
+.align 4
+.long 0
+
+.section .note.e, "a", @note
+.align 4
+.long 0
diff --git a/deps/lld/test/ELF/note-contiguous.s b/deps/lld/test/ELF/note-contiguous.s
index 7b04e984932013831ed63b26d06ca3d37591369b..a2da70e7dd28a66b3c62c09204706374cacc910f 100644
--- a/deps/lld/test/ELF/note-contiguous.s
+++ b/deps/lld/test/ELF/note-contiguous.s
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 
 // RUN: ld.lld %t.o -o %t1
-// RUN: llvm-readobj -program-headers %t1 | FileCheck %s
+// RUN: llvm-readobj -l %t1 | FileCheck %s
 
 // CHECK:      Type: PT_NOTE
 // CHECK-NEXT: Offset:
@@ -18,7 +18,7 @@
 
 // RUN: echo "SECTIONS { .note : { *(.note.a) *(.note.b) } }" > %t.script
 // RUN: ld.lld %t.o --script %t.script -o %t2
-// RUN: llvm-readobj -program-headers %t2 | FileCheck -check-prefix=SCRIPT %s
+// RUN: llvm-readobj -l %t2 | FileCheck -check-prefix=SCRIPT %s
 
 // SCRIPT:      Type: PT_NOTE
 // SCRIPT-NEXT: Offset:
diff --git a/deps/lld/test/ELF/note-loadaddr.s b/deps/lld/test/ELF/note-loadaddr.s
index 6d2ebaeeaa0acdf595df118f3253df458ff6b658..3a39863a9075a46aa19065fc2f4a65bfabda2ce8 100644
--- a/deps/lld/test/ELF/note-loadaddr.s
+++ b/deps/lld/test/ELF/note-loadaddr.s
@@ -5,7 +5,7 @@
 // RUN:  .note.b : AT(0x2000) { *(.note.b) } \
 // RUN: }" > %t.script
 // RUN: ld.lld %t.o --script %t.script -o %t
-// RUN: llvm-readobj -program-headers %t | FileCheck %s
+// RUN: llvm-readobj -l %t | FileCheck %s
 
 // CHECK:      Type: PT_NOTE
 // CHECK-NEXT: Offset: 0x1000
diff --git a/deps/lld/test/ELF/note-multiple.s b/deps/lld/test/ELF/note-multiple.s
index cebe8aa80b490106e00e37579aa12e64ba5df0f2..518be8f746d648ea9f095ab671ff94818b8b920d 100644
--- a/deps/lld/test/ELF/note-multiple.s
+++ b/deps/lld/test/ELF/note-multiple.s
@@ -7,7 +7,7 @@
 // RUN:  .note.d : { *(.note.d) } \
 // RUN: }" > %t.script
 // RUN: ld.lld %t.o --script %t.script -o %t
-// RUN: llvm-readobj -program-headers %t | FileCheck %s
+// RUN: llvm-readobj -l %t | FileCheck %s
 
 // CHECK:      Type: PT_NOTE
 // CHECK-NEXT: Offset: 0x1000
diff --git a/deps/lld/test/ELF/note-noalloc.s b/deps/lld/test/ELF/note-noalloc.s
index 80c7a4d23a03aac31fcda84e0d3aceb7226c0909..6ccdccfc24d434c7b6c46fc1fd336d9acf716458 100644
--- a/deps/lld/test/ELF/note-noalloc.s
+++ b/deps/lld/test/ELF/note-noalloc.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t -shared
-// RUN: llvm-readobj -program-headers -sections %t | FileCheck %s
+// RUN: llvm-readobj -l --sections %t | FileCheck %s
 
 // PR37361: A note without SHF_ALLOC should not be included into a PT_NOTE program header.
 
diff --git a/deps/lld/test/ELF/note-noalloc2.s b/deps/lld/test/ELF/note-noalloc2.s
index 3705799d45cbf634346e00da706aad0ab11ee332..d09cb8ee851ef0af8628233c4847e7db16424ffa 100644
--- a/deps/lld/test/ELF/note-noalloc2.s
+++ b/deps/lld/test/ELF/note-noalloc2.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t
-# RUN: llvm-readobj -program-headers %t | FileCheck %s
+# RUN: llvm-readobj -l %t | FileCheck %s
 
 ## Check we do not create a PT_NOTE segment for non-allocatable note section.
 
diff --git a/deps/lld/test/ELF/note.s b/deps/lld/test/ELF/note.s
index a383b95c9907e57abe8f6ed93330b7878b9d0b46..4b43bd4040edb165a7dab9cb9ad38c6c1d8b7e05 100644
--- a/deps/lld/test/ELF/note.s
+++ b/deps/lld/test/ELF/note.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t -shared
-// RUN: llvm-readobj -program-headers %t | FileCheck %s
+// RUN: llvm-readobj -l %t | FileCheck %s
 
 // CHECK:      Type: PT_NOTE
 // CHECK-NEXT: Offset:
diff --git a/deps/lld/test/ELF/output-section.s b/deps/lld/test/ELF/output-section.s
index 2a119d998218dcf3e7bef3531de26e49e683cfc8..d4f893bb775ae6bac1fd99ecfff06351268923d4 100644
--- a/deps/lld/test/ELF/output-section.s
+++ b/deps/lld/test/ELF/output-section.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %t2
-// RUN: llvm-readobj -t %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
 // CHECK:      Symbol {
 // CHECK:        Name: bar_sym
diff --git a/deps/lld/test/ELF/pack-dyn-relocs-loop.s b/deps/lld/test/ELF/pack-dyn-relocs-loop.s
index 308ead5cf5f24351ccd2b1b0069f62c6c732ae86..2a5533795faacf5c57473c85beed80c0dab08497 100644
--- a/deps/lld/test/ELF/pack-dyn-relocs-loop.s
+++ b/deps/lld/test/ELF/pack-dyn-relocs-loop.s
@@ -1,8 +1,8 @@
 // REQUIRES: arm, aarch64
 
 // RUN: llvm-mc -filetype=obj -triple=aarch64-none-linux-android %s -o %t.o
-// RUN: ld.lld -shared %t.o -o %t.so --pack-dyn-relocs=android
-// RUN: llvm-readobj -s %t.so | FileCheck %s
+// RUN: ld.lld -shared %t.o -o %t.so --pack-dyn-relocs=android -z norelro
+// RUN: llvm-readobj -S %t.so | FileCheck %s
 
 // This test is making sure the Android packed relocation support doesn't
 // cause an infinite loop due to the size of the section oscillating
@@ -16,8 +16,8 @@
 // CHECK-NEXT:    Flags [ (0x2)
 // CHECK-NEXT:      SHF_ALLOC (0x2)
 // CHECK-NEXT:    ]
-// CHECK-NEXT:    Address: 0x210
-// CHECK-NEXT:    Offset: 0x210
+// CHECK-NEXT:    Address: 0x1D8
+// CHECK-NEXT:    Offset: 0x1D8
 // CHECK-NEXT:    Size: 21
 
 // CHECK:         Name: x (43)
@@ -25,9 +25,9 @@
 // CHECK-NEXT:    Flags [ (0x2)
 // CHECK-NEXT:      SHF_ALLOC (0x2)
 // CHECK-NEXT:    ]
-// CHECK-NEXT:    Address: 0x225
-// CHECK-NEXT:    Offset: 0x225
-// CHECK-NEXT:    Size: 64980
+// CHECK-NEXT:    Address: 0x1ED
+// CHECK-NEXT:    Offset: 0x1ED
+// CHECK-NEXT:    Size: 65036
 
 // CHECK:         Name: barr (45)
 // CHECK-NEXT:    Type: SHT_PROGBITS (0x1)
@@ -46,7 +46,7 @@
 // CHECK-NEXT:    ]
 // CHECK-NEXT:    Address: 0x10004
 // CHECK-NEXT:    Offset: 0x10004
-// CHECK-NEXT:    Size: 12
+// CHECK-NEXT:    Size: 24
 
 
 .data
@@ -54,12 +54,12 @@
 
 .section foo,"aw"
 foof:
-.long foof
-.long bar-53
-.long bar
+.quad foof
+.quad bar-53
+.quad bar
 
 .section x,"a"
-.zero 64980
+.zero 65036
 
 .section barr,"a"
 .p2align 1
diff --git a/deps/lld/test/ELF/pack-dyn-relocs-tls-aarch64.s b/deps/lld/test/ELF/pack-dyn-relocs-tls-aarch64.s
index 978e2e7b24266583823b9d0f526cd3d3746f056e..d6a39a806ef0bbaaf0a3c52c4ea3bd2e6da32d02 100644
--- a/deps/lld/test/ELF/pack-dyn-relocs-tls-aarch64.s
+++ b/deps/lld/test/ELF/pack-dyn-relocs-tls-aarch64.s
@@ -2,7 +2,7 @@
 
 // RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %s -o %t.o
 // RUN: ld.lld -shared --pack-dyn-relocs=android %t.o -o %t.so
-// RUN: llvm-readobj -relocations %t.so | FileCheck %s
+// RUN: llvm-readobj -r %t.so | FileCheck %s
 
 // Bug 37841: Symbol::getVA must work on TLS symbols during the layout loop in
 // finalizeSections.
diff --git a/deps/lld/test/ELF/pack-dyn-relocs-tls-x86-64.s b/deps/lld/test/ELF/pack-dyn-relocs-tls-x86-64.s
index 491efa6cc1d46cac4f18470eff2e628462530ffb..b3b1e8a0602772a017711e6b0d61c3d7b023fafd 100644
--- a/deps/lld/test/ELF/pack-dyn-relocs-tls-x86-64.s
+++ b/deps/lld/test/ELF/pack-dyn-relocs-tls-x86-64.s
@@ -2,7 +2,7 @@
 
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld -shared --pack-dyn-relocs=android %t.o -o %t.so
-// RUN: llvm-readobj -relocations %t.so | FileCheck %s
+// RUN: llvm-readobj -r %t.so | FileCheck %s
 
 // Bug 37841: Symbol::getVA must work on TLS symbols during the layout loop in
 // finalizeSections. This test uses an atypical IE access in a shared object to
diff --git a/deps/lld/test/ELF/pack-dyn-relocs.s b/deps/lld/test/ELF/pack-dyn-relocs.s
index b37729dd890bfd4f4c841e0dbcd59692b21aba82..943dd52e00649b4d76d6d5eb8544e3a7076a1031 100644
--- a/deps/lld/test/ELF/pack-dyn-relocs.s
+++ b/deps/lld/test/ELF/pack-dyn-relocs.s
@@ -4,45 +4,45 @@
 // RUN: ld.lld -shared %t.a32.so.o -o %t.a32.so
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t.a32
 // RUN: ld.lld -pie --pack-dyn-relocs=none %t.a32 %t.a32.so -o %t2.a32
-// RUN: llvm-readobj -relocations %t2.a32 | FileCheck --check-prefix=UNPACKED32 %s
+// RUN: llvm-readobj -r %t2.a32 | FileCheck --check-prefix=UNPACKED32 %s
 
 // Unpacked should have the relative relocations in their natural order.
 // UNPACKED32:          Section ({{.+}}) .rel.dyn {
-// UNPACKED32-NEXT:     0x1000 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x1004 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x1008 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x100C R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x1010 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x1014 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x1018 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x101C R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x2000 R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x2004 R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x2008 R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x200C R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x2010 R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x2014 R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x2018 R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x201C R_ARM_RELATIVE - 0x0
 
-// UNPACKED32-NEXT:     0x1024 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x1028 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x102C R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x1030 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x1034 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x1038 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x103C R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x2024 R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x2028 R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x202C R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x2030 R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x2034 R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x2038 R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x203C R_ARM_RELATIVE - 0x0
 
-// UNPACKED32-NEXT:     0x1044 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x1048 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x104C R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x1050 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x1054 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x1058 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x105C R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x1060 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x1064 R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x2044 R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x2048 R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x204C R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x2050 R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x2054 R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x2058 R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x205C R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x2060 R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x2064 R_ARM_RELATIVE - 0x0
 
-// UNPACKED32-NEXT:     0x1069 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x1020 R_ARM_ABS32 bar2 0x0
-// UNPACKED32-NEXT:     0x1040 R_ARM_ABS32 zed2 0x0
+// UNPACKED32-NEXT:     0x2069 R_ARM_RELATIVE - 0x0
+// UNPACKED32-NEXT:     0x2020 R_ARM_ABS32 bar2 0x0
+// UNPACKED32-NEXT:     0x2040 R_ARM_ABS32 zed2 0x0
 // UNPACKED32-NEXT:     }
 
 // RUN: ld.lld -pie --pack-dyn-relocs=android %t.a32 %t.a32.so -o %t3.a32
-// RUN: llvm-readobj -s -dynamic-table %t3.a32 | FileCheck --check-prefix=ANDROID32-HEADERS %s
-// RUN: llvm-readobj -relocations %t3.a32 | FileCheck --check-prefix=ANDROID32 %s
+// RUN: llvm-readobj -S --dynamic-table %t3.a32 | FileCheck --check-prefix=ANDROID32-HEADERS %s
+// RUN: llvm-readobj -r %t3.a32 | FileCheck --check-prefix=ANDROID32 %s
 
 // ANDROID32-HEADERS:       Index: 1
 // ANDROID32-HEADERS-NEXT:  Name: .dynsym
@@ -66,42 +66,42 @@
 // Packed should have the larger groups of relative relocations first,
 // i.e. the 8 and 9 followed by the 7.
 // ANDROID32:          Section ({{.+}}) .rel.dyn {
-// ANDROID32-NEXT:     0x1000 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x1004 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x1008 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x100C R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x1010 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x1014 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x1018 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x101C R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x2000 R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x2004 R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x2008 R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x200C R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x2010 R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x2014 R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x2018 R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x201C R_ARM_RELATIVE - 0x0
 
-// ANDROID32-NEXT:     0x1044 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x1048 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x104C R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x1050 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x1054 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x1058 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x105C R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x1060 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x1064 R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x2044 R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x2048 R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x204C R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x2050 R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x2054 R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x2058 R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x205C R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x2060 R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x2064 R_ARM_RELATIVE - 0x0
 
-// ANDROID32-NEXT:     0x1024 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x1028 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x102C R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x1030 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x1034 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x1038 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x103C R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x2024 R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x2028 R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x202C R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x2030 R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x2034 R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x2038 R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x203C R_ARM_RELATIVE - 0x0
 
-// ANDROID32-NEXT:     0x1069 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x1020 R_ARM_ABS32 bar2 0x0
-// ANDROID32-NEXT:     0x1040 R_ARM_ABS32 zed2 0x0
+// ANDROID32-NEXT:     0x2069 R_ARM_RELATIVE - 0x0
+// ANDROID32-NEXT:     0x2020 R_ARM_ABS32 bar2 0x0
+// ANDROID32-NEXT:     0x2040 R_ARM_ABS32 zed2 0x0
 // ANDROID32-NEXT:     }
 
 // RUN: ld.lld -pie --pack-dyn-relocs=relr %t.a32 %t.a32.so -o %t4.a32
-// RUN: llvm-readobj -s -dynamic-table %t4.a32 | FileCheck --check-prefix=RELR32-HEADERS %s
-// RUN: llvm-readobj -relocations -raw-relr %t4.a32 | FileCheck --check-prefix=RAW-RELR32 %s
-// RUN: llvm-readobj -relocations %t4.a32 | FileCheck --check-prefix=RELR32 %s
+// RUN: llvm-readobj -S --dynamic-table %t4.a32 | FileCheck --check-prefix=RELR32-HEADERS %s
+// RUN: llvm-readobj -r --raw-relr %t4.a32 | FileCheck --check-prefix=RAW-RELR32 %s
+// RUN: llvm-readobj -r %t4.a32 | FileCheck --check-prefix=RELR32 %s
 
 // RELR32-HEADERS:       Index: 1
 // RELR32-HEADERS-NEXT:  Name: .dynsym
@@ -126,7 +126,7 @@
 // SHT_RELR section contains address/bitmap entries
 // encoding the offsets for relative relocation.
 // RAW-RELR32:           Section ({{.+}}) .relr.dyn {
-// RAW-RELR32-NEXT:      0x1000
+// RAW-RELR32-NEXT:      0x2000
 // RAW-RELR32-NEXT:      0x3FEFEFF
 // RAW-RELR32-NEXT:      }
 
@@ -134,81 +134,81 @@
 // but contains only the relative relocations.
 // Any relative relocations with odd offset stay in SHT_REL.
 // RELR32:               Section ({{.+}}) .rel.dyn {
-// RELR32-NEXT:          0x1069 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x1020 R_ARM_ABS32 bar2 0x0
-// RELR32-NEXT:          0x1040 R_ARM_ABS32 zed2 0x0
+// RELR32-NEXT:          0x2069 R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x2020 R_ARM_ABS32 bar2 0x0
+// RELR32-NEXT:          0x2040 R_ARM_ABS32 zed2 0x0
 // RELR32-NEXT:          }
 // RELR32-NEXT:          Section ({{.+}}) .relr.dyn {
-// RELR32-NEXT:          0x1000 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x1004 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x1008 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x100C R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x1010 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x1014 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x1018 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x101C R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x2000 R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x2004 R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x2008 R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x200C R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x2010 R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x2014 R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x2018 R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x201C R_ARM_RELATIVE - 0x0
 
-// RELR32-NEXT:          0x1024 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x1028 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x102C R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x1030 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x1034 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x1038 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x103C R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x2024 R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x2028 R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x202C R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x2030 R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x2034 R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x2038 R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x203C R_ARM_RELATIVE - 0x0
 
-// RELR32-NEXT:          0x1044 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x1048 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x104C R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x1050 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x1054 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x1058 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x105C R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x1060 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x1064 R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x2044 R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x2048 R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x204C R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x2050 R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x2054 R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x2058 R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x205C R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x2060 R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x2064 R_ARM_RELATIVE - 0x0
 // RELR32-NEXT:          }
 
 // RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %p/Inputs/shared2.s -o %t.a64.so.o
 // RUN: ld.lld -shared %t.a64.so.o -o %t.a64.so
 // RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %s -o %t.a64
 // RUN: ld.lld -pie --pack-dyn-relocs=none %t.a64 %t.a64.so -o %t2.a64
-// RUN: llvm-readobj -relocations %t2.a64 | FileCheck --check-prefix=UNPACKED64 %s
+// RUN: llvm-readobj -r %t2.a64 | FileCheck --check-prefix=UNPACKED64 %s
 
 // UNPACKED64:          Section ({{.+}}) .rela.dyn {
-// UNPACKED64-NEXT:     0x10000 R_AARCH64_RELATIVE - 0x1
-// UNPACKED64-NEXT:     0x10008 R_AARCH64_RELATIVE - 0x2
-// UNPACKED64-NEXT:     0x10010 R_AARCH64_RELATIVE - 0x3
-// UNPACKED64-NEXT:     0x10018 R_AARCH64_RELATIVE - 0x4
-// UNPACKED64-NEXT:     0x10020 R_AARCH64_RELATIVE - 0x5
-// UNPACKED64-NEXT:     0x10028 R_AARCH64_RELATIVE - 0x6
-// UNPACKED64-NEXT:     0x10030 R_AARCH64_RELATIVE - 0x7
-// UNPACKED64-NEXT:     0x10038 R_AARCH64_RELATIVE - 0x8
+// UNPACKED64-NEXT:     0x20000 R_AARCH64_RELATIVE - 0x1
+// UNPACKED64-NEXT:     0x20008 R_AARCH64_RELATIVE - 0x2
+// UNPACKED64-NEXT:     0x20010 R_AARCH64_RELATIVE - 0x3
+// UNPACKED64-NEXT:     0x20018 R_AARCH64_RELATIVE - 0x4
+// UNPACKED64-NEXT:     0x20020 R_AARCH64_RELATIVE - 0x5
+// UNPACKED64-NEXT:     0x20028 R_AARCH64_RELATIVE - 0x6
+// UNPACKED64-NEXT:     0x20030 R_AARCH64_RELATIVE - 0x7
+// UNPACKED64-NEXT:     0x20038 R_AARCH64_RELATIVE - 0x8
 
-// UNPACKED64-NEXT:     0x10048 R_AARCH64_RELATIVE - 0x1
-// UNPACKED64-NEXT:     0x10050 R_AARCH64_RELATIVE - 0x2
-// UNPACKED64-NEXT:     0x10058 R_AARCH64_RELATIVE - 0x3
-// UNPACKED64-NEXT:     0x10060 R_AARCH64_RELATIVE - 0x4
-// UNPACKED64-NEXT:     0x10068 R_AARCH64_RELATIVE - 0x5
-// UNPACKED64-NEXT:     0x10070 R_AARCH64_RELATIVE - 0x6
-// UNPACKED64-NEXT:     0x10078 R_AARCH64_RELATIVE - 0x7
+// UNPACKED64-NEXT:     0x20048 R_AARCH64_RELATIVE - 0x1
+// UNPACKED64-NEXT:     0x20050 R_AARCH64_RELATIVE - 0x2
+// UNPACKED64-NEXT:     0x20058 R_AARCH64_RELATIVE - 0x3
+// UNPACKED64-NEXT:     0x20060 R_AARCH64_RELATIVE - 0x4
+// UNPACKED64-NEXT:     0x20068 R_AARCH64_RELATIVE - 0x5
+// UNPACKED64-NEXT:     0x20070 R_AARCH64_RELATIVE - 0x6
+// UNPACKED64-NEXT:     0x20078 R_AARCH64_RELATIVE - 0x7
 
-// UNPACKED64-NEXT:     0x10088 R_AARCH64_RELATIVE - 0x1
-// UNPACKED64-NEXT:     0x10090 R_AARCH64_RELATIVE - 0x2
-// UNPACKED64-NEXT:     0x10098 R_AARCH64_RELATIVE - 0x3
-// UNPACKED64-NEXT:     0x100A0 R_AARCH64_RELATIVE - 0x4
-// UNPACKED64-NEXT:     0x100A8 R_AARCH64_RELATIVE - 0x5
-// UNPACKED64-NEXT:     0x100B0 R_AARCH64_RELATIVE - 0x6
-// UNPACKED64-NEXT:     0x100B8 R_AARCH64_RELATIVE - 0x7
-// UNPACKED64-NEXT:     0x100C0 R_AARCH64_RELATIVE - 0x8
-// UNPACKED64-NEXT:     0x100C8 R_AARCH64_RELATIVE - 0x9
+// UNPACKED64-NEXT:     0x20088 R_AARCH64_RELATIVE - 0x1
+// UNPACKED64-NEXT:     0x20090 R_AARCH64_RELATIVE - 0x2
+// UNPACKED64-NEXT:     0x20098 R_AARCH64_RELATIVE - 0x3
+// UNPACKED64-NEXT:     0x200A0 R_AARCH64_RELATIVE - 0x4
+// UNPACKED64-NEXT:     0x200A8 R_AARCH64_RELATIVE - 0x5
+// UNPACKED64-NEXT:     0x200B0 R_AARCH64_RELATIVE - 0x6
+// UNPACKED64-NEXT:     0x200B8 R_AARCH64_RELATIVE - 0x7
+// UNPACKED64-NEXT:     0x200C0 R_AARCH64_RELATIVE - 0x8
+// UNPACKED64-NEXT:     0x200C8 R_AARCH64_RELATIVE - 0x9
 
-// UNPACKED64-NEXT:     0x100D1 R_AARCH64_RELATIVE - 0xA
-// UNPACKED64-NEXT:     0x10040 R_AARCH64_ABS64 bar2 0x1
-// UNPACKED64-NEXT:     0x10080 R_AARCH64_ABS64 zed2 0x0
+// UNPACKED64-NEXT:     0x200D1 R_AARCH64_RELATIVE - 0xA
+// UNPACKED64-NEXT:     0x20040 R_AARCH64_ABS64 bar2 0x1
+// UNPACKED64-NEXT:     0x20080 R_AARCH64_ABS64 zed2 0x0
 // UNPACKED64-NEXT:     }
 
 // RUN: ld.lld -pie --pack-dyn-relocs=android %t.a64 %t.a64.so -o %t3.a64
-// RUN: llvm-readobj -s -dynamic-table %t3.a64 | FileCheck --check-prefix=ANDROID64-HEADERS %s
-// RUN: llvm-readobj -relocations %t3.a64 | FileCheck --check-prefix=ANDROID64 %s
+// RUN: llvm-readobj -S --dynamic-table %t3.a64 | FileCheck --check-prefix=ANDROID64-HEADERS %s
+// RUN: llvm-readobj -r %t3.a64 | FileCheck --check-prefix=ANDROID64 %s
 
 // ANDROID64-HEADERS:       Index: 1
 // ANDROID64-HEADERS-NEXT:  Name: .dynsym
@@ -230,42 +230,42 @@
 // ANDROID64-HEADERS: 0x0000000060000012 ANDROID_RELASZ        [[SIZE]]
 
 // ANDROID64:          Section ({{.+}}) .rela.dyn {
-// ANDROID64-NEXT:     0x10000 R_AARCH64_RELATIVE - 0x1
-// ANDROID64-NEXT:     0x10008 R_AARCH64_RELATIVE - 0x2
-// ANDROID64-NEXT:     0x10010 R_AARCH64_RELATIVE - 0x3
-// ANDROID64-NEXT:     0x10018 R_AARCH64_RELATIVE - 0x4
-// ANDROID64-NEXT:     0x10020 R_AARCH64_RELATIVE - 0x5
-// ANDROID64-NEXT:     0x10028 R_AARCH64_RELATIVE - 0x6
-// ANDROID64-NEXT:     0x10030 R_AARCH64_RELATIVE - 0x7
-// ANDROID64-NEXT:     0x10038 R_AARCH64_RELATIVE - 0x8
+// ANDROID64-NEXT:     0x20000 R_AARCH64_RELATIVE - 0x1
+// ANDROID64-NEXT:     0x20008 R_AARCH64_RELATIVE - 0x2
+// ANDROID64-NEXT:     0x20010 R_AARCH64_RELATIVE - 0x3
+// ANDROID64-NEXT:     0x20018 R_AARCH64_RELATIVE - 0x4
+// ANDROID64-NEXT:     0x20020 R_AARCH64_RELATIVE - 0x5
+// ANDROID64-NEXT:     0x20028 R_AARCH64_RELATIVE - 0x6
+// ANDROID64-NEXT:     0x20030 R_AARCH64_RELATIVE - 0x7
+// ANDROID64-NEXT:     0x20038 R_AARCH64_RELATIVE - 0x8
 
-// ANDROID64-NEXT:     0x10088 R_AARCH64_RELATIVE - 0x1
-// ANDROID64-NEXT:     0x10090 R_AARCH64_RELATIVE - 0x2
-// ANDROID64-NEXT:     0x10098 R_AARCH64_RELATIVE - 0x3
-// ANDROID64-NEXT:     0x100A0 R_AARCH64_RELATIVE - 0x4
-// ANDROID64-NEXT:     0x100A8 R_AARCH64_RELATIVE - 0x5
-// ANDROID64-NEXT:     0x100B0 R_AARCH64_RELATIVE - 0x6
-// ANDROID64-NEXT:     0x100B8 R_AARCH64_RELATIVE - 0x7
-// ANDROID64-NEXT:     0x100C0 R_AARCH64_RELATIVE - 0x8
-// ANDROID64-NEXT:     0x100C8 R_AARCH64_RELATIVE - 0x9
+// ANDROID64-NEXT:     0x20088 R_AARCH64_RELATIVE - 0x1
+// ANDROID64-NEXT:     0x20090 R_AARCH64_RELATIVE - 0x2
+// ANDROID64-NEXT:     0x20098 R_AARCH64_RELATIVE - 0x3
+// ANDROID64-NEXT:     0x200A0 R_AARCH64_RELATIVE - 0x4
+// ANDROID64-NEXT:     0x200A8 R_AARCH64_RELATIVE - 0x5
+// ANDROID64-NEXT:     0x200B0 R_AARCH64_RELATIVE - 0x6
+// ANDROID64-NEXT:     0x200B8 R_AARCH64_RELATIVE - 0x7
+// ANDROID64-NEXT:     0x200C0 R_AARCH64_RELATIVE - 0x8
+// ANDROID64-NEXT:     0x200C8 R_AARCH64_RELATIVE - 0x9
 
-// ANDROID64-NEXT:     0x10048 R_AARCH64_RELATIVE - 0x1
-// ANDROID64-NEXT:     0x10050 R_AARCH64_RELATIVE - 0x2
-// ANDROID64-NEXT:     0x10058 R_AARCH64_RELATIVE - 0x3
-// ANDROID64-NEXT:     0x10060 R_AARCH64_RELATIVE - 0x4
-// ANDROID64-NEXT:     0x10068 R_AARCH64_RELATIVE - 0x5
-// ANDROID64-NEXT:     0x10070 R_AARCH64_RELATIVE - 0x6
-// ANDROID64-NEXT:     0x10078 R_AARCH64_RELATIVE - 0x7
+// ANDROID64-NEXT:     0x20048 R_AARCH64_RELATIVE - 0x1
+// ANDROID64-NEXT:     0x20050 R_AARCH64_RELATIVE - 0x2
+// ANDROID64-NEXT:     0x20058 R_AARCH64_RELATIVE - 0x3
+// ANDROID64-NEXT:     0x20060 R_AARCH64_RELATIVE - 0x4
+// ANDROID64-NEXT:     0x20068 R_AARCH64_RELATIVE - 0x5
+// ANDROID64-NEXT:     0x20070 R_AARCH64_RELATIVE - 0x6
+// ANDROID64-NEXT:     0x20078 R_AARCH64_RELATIVE - 0x7
 
-// ANDROID64-NEXT:     0x100D1 R_AARCH64_RELATIVE - 0xA
-// ANDROID64-NEXT:     0x10040 R_AARCH64_ABS64 bar2 0x1
-// ANDROID64-NEXT:     0x10080 R_AARCH64_ABS64 zed2 0x0
+// ANDROID64-NEXT:     0x200D1 R_AARCH64_RELATIVE - 0xA
+// ANDROID64-NEXT:     0x20040 R_AARCH64_ABS64 bar2 0x1
+// ANDROID64-NEXT:     0x20080 R_AARCH64_ABS64 zed2 0x0
 // ANDROID64-NEXT:     }
 
 // RUN: ld.lld -pie --pack-dyn-relocs=relr %t.a64 %t.a64.so -o %t4.a64
-// RUN: llvm-readobj -s -dynamic-table %t4.a64 | FileCheck --check-prefix=RELR64-HEADERS %s
-// RUN: llvm-readobj -relocations -raw-relr %t4.a64 | FileCheck --check-prefix=RAW-RELR64 %s
-// RUN: llvm-readobj -relocations %t4.a64 | FileCheck --check-prefix=RELR64 %s
+// RUN: llvm-readobj -S --dynamic-table %t4.a64 | FileCheck --check-prefix=RELR64-HEADERS %s
+// RUN: llvm-readobj -r --raw-relr %t4.a64 | FileCheck --check-prefix=RAW-RELR64 %s
+// RUN: llvm-readobj -r %t4.a64 | FileCheck --check-prefix=RELR64 %s
 
 // RELR64-HEADERS:       Index: 1
 // RELR64-HEADERS-NEXT:  Name: .dynsym
@@ -290,7 +290,7 @@
 // SHT_RELR section contains address/bitmap entries
 // encoding the offsets for relative relocation.
 // RAW-RELR64:           Section ({{.+}}) .relr.dyn {
-// RAW-RELR64-NEXT:      0x10000
+// RAW-RELR64-NEXT:      0x20000
 // RAW-RELR64-NEXT:      0x3FEFEFF
 // RAW-RELR64-NEXT:      }
 
@@ -298,37 +298,37 @@
 // but contains only the relative relocations.
 // Any relative relocations with odd offset stay in SHT_RELA.
 // RELR64:               Section ({{.+}}) .rela.dyn {
-// RELR64-NEXT:          0x100D1 R_AARCH64_RELATIVE - 0xA
-// RELR64-NEXT:          0x10040 R_AARCH64_ABS64 bar2 0x1
-// RELR64-NEXT:          0x10080 R_AARCH64_ABS64 zed2 0x0
+// RELR64-NEXT:          0x200D1 R_AARCH64_RELATIVE - 0xA
+// RELR64-NEXT:          0x20040 R_AARCH64_ABS64 bar2 0x1
+// RELR64-NEXT:          0x20080 R_AARCH64_ABS64 zed2 0x0
 // RELR64-NEXT:          }
 // RELR64-NEXT:          Section ({{.+}}) .relr.dyn {
-// RELR64-NEXT:          0x10000 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x10008 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x10010 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x10018 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x10020 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x10028 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x10030 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x10038 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x20000 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x20008 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x20010 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x20018 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x20020 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x20028 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x20030 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x20038 R_AARCH64_RELATIVE - 0x0
 
-// RELR64-NEXT:          0x10048 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x10050 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x10058 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x10060 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x10068 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x10070 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x10078 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x20048 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x20050 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x20058 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x20060 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x20068 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x20070 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x20078 R_AARCH64_RELATIVE - 0x0
 
-// RELR64-NEXT:          0x10088 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x10090 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x10098 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x100A0 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x100A8 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x100B0 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x100B8 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x100C0 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:          0x100C8 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x20088 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x20090 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x20098 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x200A0 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x200A8 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x200B0 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x200B8 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x200C0 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:          0x200C8 R_AARCH64_RELATIVE - 0x0
 // RELR64-NEXT:          }
 
 .data
diff --git a/deps/lld/test/ELF/pack-dyn-relocs2.s b/deps/lld/test/ELF/pack-dyn-relocs2.s
index 20c7176a6061f52169aafb5ae0b28a59454d275e..bd8b974d9e1796373ae44dbe0f505e830aa64087 100644
--- a/deps/lld/test/ELF/pack-dyn-relocs2.s
+++ b/deps/lld/test/ELF/pack-dyn-relocs2.s
@@ -5,46 +5,46 @@
 
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t.o
 // RUN: ld.lld -pie --pack-dyn-relocs=relr %t.o %t.so -o %t.exe
-// RUN: llvm-readobj -relocations %t.exe | FileCheck %s
+// RUN: llvm-readobj -r %t.exe | FileCheck %s
 
 // CHECK:      Section (5) .relr.dyn {
-// CHECK-NEXT:   0x1000 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1004 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1008 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x100C R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1010 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1014 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1018 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x101C R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1020 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1024 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1028 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x102C R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1030 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1034 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1038 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x103C R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1040 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1044 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1048 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x104C R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1050 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1054 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1058 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x105C R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1060 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1064 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1068 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x106C R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1070 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1074 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1078 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x107C R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1080 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x1084 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2000 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2004 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2008 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x200C R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2010 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2014 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2018 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x201C R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2020 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2024 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2028 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x202C R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2030 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2034 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2038 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x203C R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2040 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2044 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2048 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x204C R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2050 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2054 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2058 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x205C R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2060 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2064 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2068 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x206C R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2070 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2074 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2078 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x207C R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2080 R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x2084 R_ARM_RELATIVE - 0x0
 // CHECK-NEXT: }
 
-// RUN: llvm-readobj -s -dynamic-table %t.exe | FileCheck --check-prefix=HEADER %s
+// RUN: llvm-readobj -S --dynamic-table %t.exe | FileCheck --check-prefix=HEADER %s
 // HEADER: 0x00000023 RELRSZ 0xC
 
 .data
diff --git a/deps/lld/test/ELF/partition-errors.s b/deps/lld/test/ELF/partition-errors.s
new file mode 100644
index 0000000000000000000000000000000000000000..6150fe20cdadbe3bdd7cab45ed5233c738e12422
--- /dev/null
+++ b/deps/lld/test/ELF/partition-errors.s
@@ -0,0 +1,23 @@
+// REQUIRES: x86, mips
+// RUN: llvm-mc -triple=x86_64-unknown-linux -filetype=obj -o %t.o %s
+// RUN: echo "SECTIONS {}" > %t.script
+// RUN: not ld.lld --export-dynamic %t.o %t.script 2>&1 | FileCheck %s
+// RUN: echo "PHDRS { text PT_LOAD; }" > %t2.script
+// RUN: not ld.lld --export-dynamic %t.o %t2.script 2>&1 | FileCheck %s
+// RUN: not ld.lld --export-dynamic %t.o --section-start .text=0 2>&1 | FileCheck %s
+// RUN: not ld.lld --export-dynamic %t.o -Ttext=0 2>&1 | FileCheck %s
+// RUN: not ld.lld --export-dynamic %t.o -Tdata=0 2>&1 | FileCheck %s
+// RUN: not ld.lld --export-dynamic %t.o -Tbss=0 2>&1 | FileCheck %s
+
+// RUN: llvm-mc -triple=mipsel-unknown-linux -filetype=obj -o %t2.o %s
+// RUN: not ld.lld --export-dynamic %t2.o 2>&1 | FileCheck %s
+
+// CHECK: error: {{.*}}.o: partitions cannot be used
+
+.section .llvm_sympart.f1,"",@llvm_sympart
+.asciz "part1"
+.quad f1
+
+.text
+.globl f1
+f1:
diff --git a/deps/lld/test/ELF/partition-exidx.s b/deps/lld/test/ELF/partition-exidx.s
new file mode 100644
index 0000000000000000000000000000000000000000..9dff6c0055b44f4712bf207fe2191192dbcfccd9
--- /dev/null
+++ b/deps/lld/test/ELF/partition-exidx.s
@@ -0,0 +1,49 @@
+// Test that exidx output sections are created correctly for each partition.
+
+// REQUIRES: arm
+// RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t.o
+// RUN: ld.lld %t.o -o %t -shared --gc-sections
+
+// RUN: llvm-objcopy --extract-main-partition %t %t0
+// RUN: llvm-objcopy --extract-partition=part1 %t %t1
+
+// Change upper case to lower case so that we can match unwind info (which is dumped
+// in upper case) against program headers (which are dumped in lower case).
+// RUN: llvm-readelf -l --unwind %t0 | tr A-Z a-z | FileCheck %s
+// RUN: llvm-readelf -l --unwind %t1 | tr A-Z a-z | FileCheck %s
+
+// Each file should have one exidx section for its text section and one sentinel.
+// CHECK:      sectionoffset: 0x[[EXIDX_OFFSET:.*]]
+// CHECK-NEXT: entries [
+// CHECK-NEXT:   entry {
+// CHECK-NEXT:     functionaddress: 0x[[TEXT_ADDR:.*]]
+// CHECK-NEXT:     model: cantunwind
+// CHECK-NEXT:   }
+// CHECK-NEXT:   entry {
+// CHECK-NEXT:     functionaddress:
+// CHECK-NEXT:     model: cantunwind
+// CHECK-NEXT:   }
+// CHECK-NEXT: ]
+
+// CHECK: load  {{[^ ]*}} 0x{{0*}}[[TEXT_ADDR]] {{.*}} r e
+// CHECK: exidx 0x{{0*}}[[EXIDX_OFFSET]] {{.*}} 0x00010 0x00010 r
+
+.section .llvm_sympart,"",%llvm_sympart
+.asciz "part1"
+.4byte p1
+
+.section .text.p0,"ax",%progbits
+.globl p0
+p0:
+.fnstart
+bx lr
+.cantunwind
+.fnend
+
+.section .text.p1,"ax",%progbits
+.globl p1
+p1:
+.fnstart
+bx lr
+.cantunwind
+.fnend
diff --git a/deps/lld/test/ELF/partition-icf.s b/deps/lld/test/ELF/partition-icf.s
new file mode 100644
index 0000000000000000000000000000000000000000..58be0c1ad00faa7e83fc133094f1f51e194ba3d7
--- /dev/null
+++ b/deps/lld/test/ELF/partition-icf.s
@@ -0,0 +1,50 @@
+// REQUIRES: x86
+// RUN: llvm-mc %s -o %t.o -filetype=obj --triple=x86_64-unknown-linux
+// RUN: ld.lld %t.o -o %t --export-dynamic --gc-sections --icf=all
+// RUN: llvm-readelf -S -s %t | FileCheck %s
+
+// CHECK: [[MAIN:[0-9]+]]] .text
+// CHECK: [[P1:[0-9]+]]] .text
+// CHECK: [[P2:[0-9]+]]] .text
+
+// CHECK: Symbol table '.symtab'
+// CHECK:   [[P1]] f1
+// CHECK:   [[P2]] f2
+// CHECK: [[MAIN]] g1
+// CHECK: [[MAIN]] g2
+
+.section .llvm_sympart.f1,"",@llvm_sympart
+.asciz "part1"
+.quad f1
+
+.section .llvm_sympart.f2,"",@llvm_sympart
+.asciz "part2"
+.quad f2
+
+.section .llvm_sympart.g1,"",@llvm_sympart
+.asciz "part1"
+.quad g1
+
+.section .llvm_sympart.g2,"",@llvm_sympart
+.asciz "part2"
+.quad g2
+
+.section .text.f1,"ax",@progbits
+.globl f1
+f1:
+.byte 1
+
+.section .text.f2,"ax",@progbits
+.globl f2
+f2:
+.byte 2
+
+.section .text.g1,"ax",@progbits
+.globl g1
+g1:
+.byte 3
+
+.section .text.g2,"ax",@progbits
+.globl g2
+g2:
+.byte 3
diff --git a/deps/lld/test/ELF/partition-move-to-main.s b/deps/lld/test/ELF/partition-move-to-main.s
new file mode 100644
index 0000000000000000000000000000000000000000..c9fe14c135f65b6359bb247c108deec60da865a9
--- /dev/null
+++ b/deps/lld/test/ELF/partition-move-to-main.s
@@ -0,0 +1,44 @@
+// REQUIRES: x86
+// RUN: llvm-mc %s -o %t.o -filetype=obj --triple=x86_64-unknown-linux
+// RUN: ld.lld %t.o -o %t --export-dynamic --gc-sections
+// RUN: llvm-readelf -S -s %t | FileCheck %s
+
+// Ordinarily, the TLS and IFUNC sections would be split into partitions.
+// Make sure that that didn't happen by checking that there is only one
+// of each section.
+
+// CHECK: .ifunc
+// CHECK: .tdata
+
+// CHECK-NOT: .ifunc
+// CHECK-NOT: .tdata
+
+.section .llvm_sympart.f1,"",@llvm_sympart
+.asciz "part1"
+.quad f1
+
+.section .text._start,"ax",@progbits
+.globl _start
+_start:
+call tls1
+call ifunc1
+
+.section .text.f1,"ax",@progbits
+.globl f1
+f1:
+call tls2
+call ifunc2
+
+.section .ifunc,"ax",@progbits,unique,1
+.type ifunc1 STT_GNU_IFUNC
+ifunc1:
+
+.section .ifunc,"ax",@progbits,unique,2
+.type ifunc2 STT_GNU_IFUNC
+ifunc2:
+
+.section .tdata,"awT",@progbits,unique,1
+tls1:
+
+.section .tdata,"awT",@progbits,unique,2
+tls2:
diff --git a/deps/lld/test/ELF/partition-notes.s b/deps/lld/test/ELF/partition-notes.s
new file mode 100644
index 0000000000000000000000000000000000000000..0805e8f8506c3931ba71d6363863e3040bfe8353
--- /dev/null
+++ b/deps/lld/test/ELF/partition-notes.s
@@ -0,0 +1,45 @@
+// Test that notes (both from object files and synthetic) are duplicated into
+// each partition.
+
+// REQUIRES: x86
+
+// RUN: llvm-mc %s -o %t.o -filetype=obj --triple=x86_64-unknown-linux
+// RUN: ld.lld %t.o -o %t --shared --gc-sections --build-id=sha1
+
+// RUN: llvm-objcopy --extract-main-partition %t %t0
+// RUN: llvm-objcopy --extract-partition=part1 %t %t1
+
+// RUN: llvm-readelf --all %t0 | FileCheck --check-prefixes=CHECK,PART0 %s
+// RUN: llvm-readelf --all %t1 | FileCheck --check-prefixes=CHECK,PART1 %s
+
+// CHECK: Program Headers:
+// CHECK: NOTE 0x{{0*}}[[NOTE_OFFSET:[^ ]*]]
+
+// CHECK: Displaying notes found at file offset 0x{{0*}}[[NOTE_OFFSET]]
+// CHECK-NEXT: Owner
+// CHECK-NEXT: foo                   0x00000004	NT_VERSION (version)
+// CHECK-NEXT: Displaying notes
+// CHECK-NEXT: Owner
+// CHECK-NEXT: GNU                   0x00000014	NT_GNU_BUILD_ID (unique build ID bitstring)
+// CHECK-NEXT: Build ID: 0f4d5297cbbe52e4bea558eeb792944670de22e1
+
+.section .llvm_sympart,"",@llvm_sympart
+.asciz "part1"
+.quad p1
+
+.section .data.p0,"aw",@progbits
+.globl p0
+p0:
+
+.section .data.p1,"aw",@progbits
+.globl p1
+p1:
+
+.section .note.obj,"a",@note
+.align 4
+.long 2f-1f
+.long 3f-2f
+.long 1
+1: .asciz "foo"
+2: .asciz "bar"
+3:
diff --git a/deps/lld/test/ELF/partition-pack-dyn-relocs.s b/deps/lld/test/ELF/partition-pack-dyn-relocs.s
new file mode 100644
index 0000000000000000000000000000000000000000..d317759fc9c90c62cc3694f6ff0e3cf8d06ece0b
--- /dev/null
+++ b/deps/lld/test/ELF/partition-pack-dyn-relocs.s
@@ -0,0 +1,51 @@
+// Test that both Android and RELR packed relocation sections are created
+// correctly for each partition.
+
+// REQUIRES: x86
+
+// RUN: llvm-mc %s -o %t.o -filetype=obj --triple=x86_64-unknown-linux
+// RUN: ld.lld %t.o -o %t --shared --gc-sections --pack-dyn-relocs=android+relr
+
+// RUN: llvm-objcopy --extract-main-partition %t %t0
+// RUN: llvm-objcopy --extract-partition=part1 %t %t1
+
+// RUN: llvm-readelf --all %t0 | FileCheck --check-prefixes=CHECK,PART0 %s
+// RUN: llvm-readelf --all %t1 | FileCheck --check-prefixes=CHECK,PART1 %s
+
+// CHECK: Section Headers:
+// CHECK: .rela.dyn      ANDROID_RELA {{0*}}[[ANDROID_RELA_ADDR:[^ ]*]]
+// CHECK: .relr.dyn      RELR         {{0*}}[[RELR_ADDR:[^ ]*]]
+// CHECK: .data          PROGBITS     000000000000[[DATA_SEGMENT:.]]000
+
+// CHECK: Relocation section '.rela.dyn'
+// CHECK-NEXT: Offset
+// PART0-NEXT: 000000000000[[DATA_SEGMENT]]008 {{.*}} R_X86_64_64 000000000000[[DATA_SEGMENT]]000 p0 + 0
+// PART1-NEXT: 000000000000[[DATA_SEGMENT]]008 {{.*}} R_X86_64_64 000000000000[[DATA_SEGMENT]]000 p1 + 0
+// CHECK-EMPTY:
+
+// CHECK: Relocation section '.relr.dyn'
+// CHECK-NEXT: Offset
+// CHECK-NEXT: 000000000000[[DATA_SEGMENT]]000 {{.*}} R_X86_64_RELATIVE
+// CHECK-EMPTY:
+
+// CHECK: Dynamic section
+// CHECK: 0x0000000060000011 (ANDROID_RELA)       0x[[ANDROID_RELA_ADDR]]
+// CHECK: 0x0000000000000024 (RELR)               0x[[RELR_ADDR]]
+
+.section .llvm_sympart,"",@llvm_sympart
+.asciz "part1"
+.quad p1
+
+.section .data.p0,"aw",@progbits
+.align 8
+.globl p0
+p0:
+.quad __ehdr_start
+.quad p0
+
+.section .data.p1,"aw",@progbits
+.align 8
+.globl p1
+p1:
+.quad __ehdr_start
+.quad p1
diff --git a/deps/lld/test/ELF/partition-synthetic-sections.s b/deps/lld/test/ELF/partition-synthetic-sections.s
new file mode 100644
index 0000000000000000000000000000000000000000..66f9babaa3258a753056d3b1c55d98b51f3c5f12
--- /dev/null
+++ b/deps/lld/test/ELF/partition-synthetic-sections.s
@@ -0,0 +1,241 @@
+// Test that synthetic sections are created correctly for each partition.
+
+// REQUIRES: x86
+
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/verneed1.s -o %t1.o
+// RUN: echo "v1 {}; v2 {}; v3 { local: *; };" > %t1.script
+// RUN: ld.lld -shared %t1.o --version-script %t1.script -o %t1.so -soname verneed1.so.0
+
+// RUN: llvm-mc %s -o %t.o -filetype=obj --triple=x86_64-unknown-linux
+// RUN: echo "x1 { global: p0; }; x2 { global: p1; p1alias; };" > %t.script
+// RUN: ld.lld %t.o %t1.so --version-script %t.script -o %t --shared --gc-sections --eh-frame-hdr -soname main.so
+
+// RUN: llvm-objcopy --extract-main-partition %t %t0
+// RUN: llvm-objcopy --extract-partition=part1 %t %t1
+
+// RUN: llvm-readelf --all --unwind %t0 | FileCheck --check-prefixes=CHECK,PART0 %s
+// RUN: llvm-readelf --all --unwind %t1 | FileCheck --check-prefixes=CHECK,PART1 %s
+
+// FIXME: llvm-objcopy does not preserve padding (see pr42145) so for now we
+// check the combined output file.
+// RUN: od -Ax -x %t | FileCheck %s -check-prefix=FILL
+
+// RUN: llvm-objdump -s -j .rodata -j .dynstr %t0 | FileCheck --check-prefix=PART-INDEX %s
+
+// CHECK: Section Headers:
+// CHECK-NEXT: Name
+// CHECK-NEXT: NULL
+// CHECK-NEXT: .dynsym           DYNSYM          {{0*}}[[DYNSYM_ADDR:[^ ]*]]
+// CHECK-NEXT: .gnu.version      VERSYM          {{0*}}[[VERSYM_ADDR:[^ ]*]]
+// CHECK-NEXT: .gnu.version_d    VERDEF          {{0*}}[[VERDEF_ADDR:[^ ]*]]
+// CHECK-NEXT: .gnu.version_r    VERNEED         {{0*}}[[VERNEED_ADDR:[^ ]*]]
+// CHECK-NEXT: .gnu.hash         GNU_HASH        {{0*}}[[GNU_HASH_ADDR:[^ ]*]]
+// CHECK-NEXT: .hash             HASH            {{0*}}[[HASH_ADDR:[^ ]*]]
+// CHECK-NEXT: .dynstr           STRTAB          {{0*}}[[DYNSTR_ADDR:[^ ]*]]
+// CHECK-NEXT: .rela.dyn         RELA            {{0*}}[[RELA_DYN_ADDR:[^ ]*]]
+// PART0-NEXT: .rela.plt         RELA            {{0*}}[[RELA_PLT_ADDR:[^ ]*]]
+// CHECK-NEXT: .eh_frame_hdr     PROGBITS        {{0*}}[[EH_FRAME_HDR_ADDR:[^ ]*]]
+// CHECK-NEXT: .eh_frame         PROGBITS        {{0*}}[[EH_FRAME_ADDR:[^ ]*]]
+// PART0-NEXT: .rodata           PROGBITS
+// CHECK-NEXT: .text             PROGBITS        {{0*}}[[TEXT_ADDR:[^ ]*]]
+// PART0-NEXT: .plt              PROGBITS
+// PART0-NEXT: .init_array       INIT_ARRAY      {{0*}}[[INIT_ARRAY_ADDR:[^ ]*]]
+// CHECK-NEXT: .dynamic          DYNAMIC         {{0*}}[[DYNAMIC_ADDR:[^ ]*]]
+// CHECK-NEXT: .data             PROGBITS        000000000000[[DATA_SEGMENT:.]]000
+// PART0-NEXT: .got.plt          PROGBITS        {{0*}}[[GOT_PLT_ADDR:[^ ]*]]
+// PART0-NEXT: .part.end         NOBITS          {{0*}}[[PART_END_ADDR:[^ ]*]]
+// CHECK-NEXT: .comment          PROGBITS
+// CHECK-NEXT: .symtab           SYMTAB
+// CHECK-NEXT: .shstrtab         STRTAB
+// CHECK-NEXT: .strtab           STRTAB
+// CHECK-NEXT: Key to Flags
+
+// CHECK: Relocation section '.rela.dyn'
+// CHECK-NEXT: Offset
+// PART0-NEXT: 000000000000[[DATA_SEGMENT]]000 {{.*}} R_X86_64_64 {{.*}} f1@v3 + 0
+// PART0-NEXT: {{0*}}[[INIT_ARRAY_ADDR]]       {{.*}} R_X86_64_64 {{.*}} p0@@x1 + 0
+// PART1-NEXT: 000000000000[[DATA_SEGMENT]]018 {{.*}} R_X86_64_RELATIVE 3000
+// PART1-NEXT: 000000000000[[DATA_SEGMENT]]000 {{.*}} R_X86_64_64 {{.*}} f2@v2 + 0
+// PART1-NEXT: 000000000000[[DATA_SEGMENT]]008 {{.*}} R_X86_64_64 {{.*}} p0@@x1 + 0
+// PART1-NEXT: 000000000000[[DATA_SEGMENT]]010 {{.*}} R_X86_64_64 {{.*}} p0@@x1 + 0
+// CHECK-EMPTY:
+
+// PART0: Relocation section '.rela.plt'
+// PART0-NEXT: Offset
+// PART0-NEXT: 000000000000[[DATA_SEGMENT]]020 {{.*}} R_X86_64_JUMP_SLOT {{.*}} f1@v3 + 0
+// PART0-NEXT: 000000000000[[DATA_SEGMENT]]028 {{.*}} R_X86_64_JUMP_SLOT {{.*}} f2@v2 + 0
+// PART0-EMPTY:
+
+// CHECK: Symbol table '.dynsym'
+// PART0: 1: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f1@v3
+// PART0: 2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f2@v2
+// PART0: 3: {{0*}}[[TEXT_ADDR]]  0 NOTYPE  GLOBAL DEFAULT {{.*}} p0@@x1
+// PART1: 1: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f2@v2
+// PART1: 2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND p0@@x1
+// PART1: 3: {{0*}}[[TEXT_ADDR]]  0 NOTYPE  GLOBAL DEFAULT {{.*}} p1@@x2
+// PART1: 4: {{0*}}[[TEXT_ADDR]]  0 NOTYPE  GLOBAL DEFAULT {{.*}} p1alias@@x2
+// CHECK-EMPTY:
+
+// PART0: Symbol table '.symtab'
+// PART0: 000000000000048c     0 NOTYPE  LOCAL  HIDDEN    {{.*}} __part_index_begin
+// PART0: 0000000000000498     0 NOTYPE  LOCAL  HIDDEN    {{.*}} __part_index_end
+
+// PART-INDEX: Contents of section .dynstr:
+// PART-INDEX-NEXT: 03a8 00663100 66320070 30007061 72743100  .f1.f2.p0.part1.
+// PART-INDEX: Contents of section .rodata:
+//                       0x48c + 0xffffff26 = 0x3b2
+//                                0x490 + 0x3b70 = 0x4000
+// PART-INDEX-NEXT: 048c 26ffffff 703b0000 00400000
+
+// CHECK: {{.*}}EH_FRAME Header
+// CHECK: Address: 0x[[EH_FRAME_HDR_ADDR]]
+// CHECK: eh_frame_ptr: 0x[[EH_FRAME_ADDR]]
+// CHECK: initial_location: 0x[[TEXT_ADDR]]
+// CHECK: address: 0x[[FDE_ADDR:.*]]
+
+// CHECK: .eh_frame section
+// CHECK: 0x[[EH_FRAME_ADDR]]] CIE length=20
+// CHECK-NOT: FDE
+// CHECK: 0x[[FDE_ADDR]]] FDE length=20 cie={{.}}0x[[EH_FRAME_ADDR]]
+// CHECK-NEXT: initial_location: 0x[[TEXT_ADDR]]
+// CHECK-NOT: FDE
+// CHECK: CIE length=0
+
+// CHECK: Dynamic section
+// CHECK-NEXT: Tag
+// CHECK-NEXT: 0x0000000000000001 (NEEDED)             Shared library: [verneed1.so.0]
+// PART0-NEXT: 0x000000000000000e (SONAME)             Library soname: [main.so]
+// PART1-NEXT: 0x0000000000000001 (NEEDED)             Shared library: [main.so]
+// PART1-NEXT: 0x000000000000000e (SONAME)             Library soname: [part1]
+// CHECK-NEXT: 0x0000000000000007 (RELA)               0x[[RELA_DYN_ADDR]]
+// CHECK-NEXT: 0x0000000000000008 (RELASZ)
+// CHECK-NEXT: 0x0000000000000009 (RELAENT)            24 (bytes)
+// PART1-NEXT: 0x000000006ffffff9 (RELACOUNT)          1
+// PART0-NEXT: 0x0000000000000017 (JMPREL)             0x[[RELA_PLT_ADDR]]
+// PART0-NEXT: 0x0000000000000002 (PLTRELSZ)           48 (bytes)
+// PART0-NEXT: 0x0000000000000003 (PLTGOT)             0x[[GOT_PLT_ADDR]]
+// PART0-NEXT: 0x0000000000000014 (PLTREL)             RELA
+// CHECK-NEXT: 0x0000000000000006 (SYMTAB)             0x[[DYNSYM_ADDR]]
+// CHECK-NEXT: 0x000000000000000b (SYMENT)             24 (bytes)
+// CHECK-NEXT: 0x0000000000000005 (STRTAB)             0x[[DYNSTR_ADDR]]
+// CHECK-NEXT: 0x000000000000000a (STRSZ)
+// CHECK-NEXT: 0x000000006ffffef5 (GNU_HASH)           0x[[GNU_HASH_ADDR]]
+// CHECK-NEXT: 0x0000000000000004 (HASH)               0x[[HASH_ADDR]]
+// PART0-NEXT: 0x0000000000000019 (INIT_ARRAY)         0x[[INIT_ARRAY_ADDR]]
+// PART0-NEXT: 0x000000000000001b (INIT_ARRAYSZ)       8 (bytes)
+// CHECK-NEXT: 0x000000006ffffff0 (VERSYM)             0x[[VERSYM_ADDR]]
+// CHECK-NEXT: 0x000000006ffffffc (VERDEF)             0x[[VERDEF_ADDR]]
+// CHECK-NEXT: 0x000000006ffffffd (VERDEFNUM)          3
+// CHECK-NEXT: 0x000000006ffffffe (VERNEED)            0x[[VERNEED_ADDR]]
+// CHECK-NEXT: 0x000000006fffffff (VERNEEDNUM)         1
+// PART0-NEXT: 0x0000000000000000 (NULL)               0x0
+
+// CHECK: Program Headers:
+// CHECK-NEXT: Type
+// PART0-NEXT: PHDR           {{.*}} 0x000230 0x000230 R
+// PART1-NEXT: PHDR           {{.*}} 0x0001f8 0x0001f8 R
+// PART0-NEXT: LOAD           0x000000 0x0000000000000000 0x0000000000000000 {{.*}} R   0x1000
+// PART0-NEXT: LOAD           0x001000 0x0000000000001000 0x0000000000001000 {{.*}} R E 0x1000
+// PART0-NEXT: LOAD           0x002000 0x0000000000002000 0x0000000000002000 {{.*}} RW  0x1000
+// PART0-NEXT: LOAD           0x003000 0x0000000000003000 0x0000000000003000 {{.*}} RW  0x1000
+// PART0-NEXT: LOAD           0x004000 0x0000000000008000 0x0000000000008000 0x000000 0x001000 RW  0x1000
+// PART1-NEXT: LOAD           0x000000 0x0000000000004000 0x0000000000004000 {{.*}} R   0x1000
+// PART1-NEXT: LOAD           0x001000 0x0000000000005000 0x0000000000005000 {{.*}} R E 0x1000
+// PART1-NEXT: LOAD           0x002000 0x0000000000006000 0x0000000000006000 {{.*}} RW  0x1000
+// PART1-NEXT: LOAD           0x003000 0x0000000000007000 0x0000000000007000 {{.*}} RW  0x1000
+// CHECK-NEXT: DYNAMIC        {{.*}} 0x{{0*}}[[DYNAMIC_ADDR]] 0x{{0*}}[[DYNAMIC_ADDR]] {{.*}} RW  0x8
+// PART0-NEXT: GNU_RELRO      0x002000 0x0000000000002000 0x0000000000002000 {{.*}} R   0x1
+// PART1-NEXT: GNU_RELRO      0x002000 0x0000000000006000 0x0000000000006000 {{.*}} R   0x1
+// CHECK-NEXT: GNU_EH_FRAME   {{.*}} 0x{{0*}}[[EH_FRAME_HDR_ADDR]] 0x{{0*}}[[EH_FRAME_HDR_ADDR]] {{.*}} R   0x4
+// CHECK-NEXT: GNU_STACK      0x000000 0x0000000000000000 0x0000000000000000 0x000000 0x000000 RW  0x0
+// CHECK-EMPTY:
+
+// CHECK: Version symbols section '.gnu.version'
+// CHECK-NEXT: Addr:
+// PART0-NEXT: 000:   0 (*local*)       4 (v3)            5 (v2)            2 (x1)
+// PART1-NEXT: 000:   0 (*local*)       5 (v2)            2 (x1)            3 (x2)
+
+// CHECK: Version definition section '.gnu.version_d'
+// CHECK-NEXT: Addr:
+// PART0-NEXT: 0x0000: Rev: 1  Flags: BASE  Index: 1  Cnt: 1  Name: main.so
+// PART1-NEXT: 0x0000: Rev: 1  Flags: BASE  Index: 1  Cnt: 1  Name: part1
+// CHECK-NEXT: 0x001c: Rev: 1  Flags: none  Index: 2  Cnt: 1  Name: x1
+// CHECK-NEXT: 0x0038: Rev: 1  Flags: none  Index: 3  Cnt: 1  Name: x2
+
+// CHECK: Version needs section '.gnu.version_r'
+// CHECK-NEXT: Addr:
+// CHECK-NEXT: 0x0000: Version: 1  File: verneed1.so.0  Cnt: 2
+// CHECK-NEXT: 0x0010:   Name: v2  Flags: none  Version: 5
+// CHECK-NEXT: 0x0020:   Name: v3  Flags: none  Version: 4
+
+// PART0: Histogram for bucket list length (total of 4 buckets)
+// PART0-NEXT:  Length  Number     % of total  Coverage
+// PART0-NEXT:       0  1          ( 25.0%)       0.0%
+// PART0-NEXT:       1  3          ( 75.0%)     100.0%
+// PART0-NEXT: Histogram for `.gnu.hash' bucket list length (total of 1 buckets)
+// PART0-NEXT:  Length  Number     % of total  Coverage
+// PART0-NEXT:       0  0          (  0.0%)       0.0%
+// PART0-NEXT:       1  1          (100.0%)     100.0%
+
+// PART1: Histogram for bucket list length (total of 5 buckets)
+// PART1-NEXT:  Length  Number     % of total  Coverage
+// PART1-NEXT:       0  3          ( 60.0%)       0.0%
+// PART1-NEXT:       1  2          ( 40.0%)     100.0%
+// PART1-NEXT: Histogram for `.gnu.hash' bucket list length (total of 1 buckets)
+// PART1-NEXT:  Length  Number     % of total  Coverage
+// PART1-NEXT:       0  0          (  0.0%)       0.0%
+// PART1-NEXT:       1  0          (  0.0%)       0.0%
+// PART1-NEXT:       2  1          (100.0%)     100.0%
+
+// FILL: 001040 cccc cccc cccc cccc cccc cccc cccc cccc
+// FILL-NEXT: *
+// FILL-NEXT: 002000
+
+// FILL: 005010 cccc cccc cccc cccc cccc cccc cccc cccc
+// FILL-NEXT: *
+// FILL-NEXT: 006000
+
+.section .llvm_sympart,"",@llvm_sympart
+.asciz "part1"
+.quad p1
+
+.section .llvm_sympart2,"",@llvm_sympart
+.asciz "part1"
+.quad p1alias
+
+.section .text.p0,"ax",@progbits
+.globl p0
+p0:
+.cfi_startproc
+lea d0(%rip), %rax
+call f1
+ret
+.cfi_endproc
+
+.section .data.d0,"aw",@progbits
+d0:
+.quad f1
+
+.section .text.p1,"ax",@progbits
+.globl p1
+p1:
+.globl p1alias
+p1alias:
+.cfi_startproc
+lea d1(%rip), %rax
+call f2
+ret
+.cfi_endproc
+
+.section .data.d1,"aw",@progbits
+d1:
+.quad f2
+.quad p0
+.quad p0
+.quad d0
+
+.section .init_array,"aw",@init_array
+.quad p0
+
+.globl __part_index_begin
+.globl __part_index_end
diff --git a/deps/lld/test/ELF/partition-thunk-reuse.s b/deps/lld/test/ELF/partition-thunk-reuse.s
new file mode 100644
index 0000000000000000000000000000000000000000..6425bdf345b031702b90b5d28e7dd778cbe75565
--- /dev/null
+++ b/deps/lld/test/ELF/partition-thunk-reuse.s
@@ -0,0 +1,45 @@
+// REQUIRES: arm
+// RUN: llvm-mc %s -o %t.o -filetype=obj --triple=armv7-unknown-linux -arm-add-build-attributes
+// RUN: ld.lld %t.o -o %t --export-dynamic --gc-sections
+// RUN: llvm-nm %t | FileCheck %s
+
+// CHECK: __Thumbv7ABSLongThunk__start
+// CHECK: __Thumbv7ABSLongThunk__start
+
+// CHECK: __Thumbv7ABSLongThunk_foo
+// CHECK-NOT: __Thumbv7ABSLongThunk_foo
+
+.thumb
+
+.section .llvm_sympart.g1,"",%llvm_sympart
+.asciz "part1"
+.4byte f1
+
+.section .llvm_sympart.g2,"",%llvm_sympart
+.asciz "part2"
+.4byte f2
+
+.section .text._start,"ax",%progbits
+.globl _start
+_start:
+bx lr
+foo:
+b f0
+.zero 17*1048576
+
+.section .text.f0,"ax",%progbits
+.globl f0
+f0:
+b foo
+
+.section .text.f1,"aw",%progbits
+.globl f1
+f1:
+b _start
+b foo
+
+.section .text.f2,"ax",%progbits
+.globl f2
+f2:
+b _start
+b foo
diff --git a/deps/lld/test/ELF/partitions.s b/deps/lld/test/ELF/partitions.s
new file mode 100644
index 0000000000000000000000000000000000000000..0fb8dcb9849f5790686a5d71222338bbf8405372
--- /dev/null
+++ b/deps/lld/test/ELF/partitions.s
@@ -0,0 +1,63 @@
+// REQUIRES: x86
+// RUN: llvm-mc %s -o %t.o -filetype=obj --triple=x86_64-unknown-linux
+// RUN: ld.lld %t.o -o %t --export-dynamic --gc-sections
+// RUN: llvm-readelf -S -s %t | FileCheck %s
+
+// This is basically lld/docs/partitions.dot in object file form.
+// Test that the sections are correctly allocated to partitions.
+
+// CHECK: [[MAIN:[0-9]+]]] .text
+// CHECK: [[P1:[0-9]+]]] .text
+// CHECK: [[P2:[0-9]+]]] .text
+
+// CHECK: Symbol table '.symtab'
+// CHECK: [[MAIN]] f3
+// CHECK:   [[P1]] f4
+// CHECK: [[MAIN]] f5
+// CHECK:   [[P2]] f6
+// CHECK: [[MAIN]] _start
+// CHECK:   [[P1]] f1
+// CHECK:   [[P2]] f2
+
+.section .llvm_sympart.f1,"",@llvm_sympart
+.asciz "part1"
+.quad f1
+
+.section .llvm_sympart.f2,"",@llvm_sympart
+.asciz "part2"
+.quad f2
+
+.section .text._start,"ax",@progbits
+.globl _start
+_start:
+call f3
+
+.section .text.f1,"ax",@progbits
+.globl f1
+f1:
+call f3
+call f4
+call f5
+
+.section .text.f2,"ax",@progbits
+.globl f2
+f2:
+call f3
+call f5
+call f6
+
+.section .text.f3,"ax",@progbits
+f3:
+ret
+
+.section .text.f4,"ax",@progbits
+f4:
+ret
+
+.section .text.f5,"ax",@progbits
+f5:
+ret
+
+.section .text.f6,"ax",@progbits
+f6:
+ret
diff --git a/deps/lld/test/ELF/phdr-align.s b/deps/lld/test/ELF/phdr-align.s
index 354897eedd275ab57c79b39a6006b9ba57696f26..0748ae358095983d24df2c3bdad9d08e0cadc542 100644
--- a/deps/lld/test/ELF/phdr-align.s
+++ b/deps/lld/test/ELF/phdr-align.s
@@ -7,7 +7,7 @@
 # RUN:  .data : { *(.data) } \
 # RUN:  .text : { *(.text) } }" > %t.script
 # RUN: ld.lld %t.o --script %t.script -o %t
-# RUN: llvm-readobj -sections -symbols %t | FileCheck %s
+# RUN: llvm-readobj --sections --symbols %t | FileCheck %s
 
 # CHECK:      Sections [
 # CHECK-NEXT:  Section {
diff --git a/deps/lld/test/ELF/pie-weak.s b/deps/lld/test/ELF/pie-weak.s
index c4d64e3ff287a7c836ce16e71c6155a4aa375cff..0bfea1f402a9767881d880b8f3cb02e6f979afc5 100644
--- a/deps/lld/test/ELF/pie-weak.s
+++ b/deps/lld/test/ELF/pie-weak.s
@@ -1,6 +1,8 @@
 # REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/dummy-shared.s -o %t1.o
+# RUN: ld.lld %t1.o -shared -o %t1.so
 # RUN: llvm-mc -filetype=obj -relax-relocations=false -triple=x86_64-unknown-linux %s -o %t.o
-# RUN: ld.lld --hash-style=sysv -pie %t.o -o %t
+# RUN: ld.lld --hash-style=sysv -pie %t.o %t1.so -o %t
 # RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOCS %s
 # RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
@@ -15,6 +17,6 @@
 .globl _start
 _start:
 # DISASM: _start:
-# DISASM-NEXT: 1000: 48 8b 05 99 10 00 00 movq 4249(%rip), %rax
+# DISASM-NEXT: 1000: 48 8b 05 a9 10 00 00 movq 4265(%rip), %rax
 #                                              ^ .got - (.text + 7)
 mov foo@gotpcrel(%rip), %rax
diff --git a/deps/lld/test/ELF/pie.s b/deps/lld/test/ELF/pie.s
index ccab1623cd5cc5fcd3fb950ca0176b6e8650e8bf..5626cca8617a670c4c9b68f29107fe24c2c75d07 100644
--- a/deps/lld/test/ELF/pie.s
+++ b/deps/lld/test/ELF/pie.s
@@ -3,16 +3,16 @@
 
 ## Default is no PIE.
 # RUN: ld.lld %t1.o -o %t
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols -r %t \
+# RUN: llvm-readobj --file-headers --sections -l --symbols -r %t \
 # RUN:   | FileCheck %s --check-prefix=NOPIE
 
 ## Check -pie.
 # RUN: ld.lld -pie %t1.o -o %t
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols -r %t | FileCheck %s
+# RUN: llvm-readobj --file-headers --sections -l --symbols -r %t | FileCheck %s
 
 ## Test --pic-executable alias
 # RUN: ld.lld --pic-executable %t1.o -o %t
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols -r %t | FileCheck %s
+# RUN: llvm-readobj --file-headers --sections -l --symbols -r %t | FileCheck %s
 
 # CHECK:      ElfHeader {
 # CHECK-NEXT:  Ident {
@@ -49,9 +49,9 @@
 
 ## Check -nopie
 # RUN: ld.lld -no-pie %t1.o -o %t2
-# RUN: llvm-readobj -file-headers -r %t2 | FileCheck %s --check-prefix=NOPIE
+# RUN: llvm-readobj --file-headers -r %t2 | FileCheck %s --check-prefix=NOPIE
 # RUN: ld.lld -no-pic-executable %t1.o -o %t2
-# RUN: llvm-readobj -file-headers -r %t2 | FileCheck %s --check-prefix=NOPIE
+# RUN: llvm-readobj --file-headers -r %t2 | FileCheck %s --check-prefix=NOPIE
 # NOPIE-NOT: Type: SharedObject
 
 .globl _start
diff --git a/deps/lld/test/ELF/plt-aarch64.s b/deps/lld/test/ELF/plt-aarch64.s
index f9c53a46f3eba807a19750875d56d170ef3ac3d9..1446f68398756a8f6b0caa5a83bb830e5d543a1a 100644
--- a/deps/lld/test/ELF/plt-aarch64.s
+++ b/deps/lld/test/ELF/plt-aarch64.s
@@ -4,10 +4,10 @@
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld -shared %t.o %t2.so -o %t.so
 // RUN: ld.lld %t.o %t2.so -o %t.exe
-// RUN: llvm-readobj -s -r %t.so | FileCheck --check-prefix=CHECKDSO %s
+// RUN: llvm-readobj -S -r %t.so | FileCheck --check-prefix=CHECKDSO %s
 // RUN: llvm-objdump -s -section=.got.plt %t.so | FileCheck --check-prefix=DUMPDSO %s
 // RUN: llvm-objdump -d %t.so | FileCheck --check-prefix=DISASMDSO %s
-// RUN: llvm-readobj -s -r %t.exe | FileCheck --check-prefix=CHECKEXE %s
+// RUN: llvm-readobj -S -r %t.exe | FileCheck --check-prefix=CHECKEXE %s
 // RUN: llvm-objdump -s -section=.got.plt %t.exe | FileCheck --check-prefix=DUMPEXE %s
 // RUN: llvm-objdump -d %t.exe | FileCheck --check-prefix=DISASMEXE %s
 
@@ -30,7 +30,7 @@
 // CHECKDSO-NEXT:       SHF_ALLOC
 // CHECKDSO-NEXT:       SHF_WRITE
 // CHECKDSO-NEXT:     ]
-// CHECKDSO-NEXT:     Address: 0x20000
+// CHECKDSO-NEXT:     Address: 0x30000
 // CHECKDSO-NEXT:     Offset:
 // CHECKDSO-NEXT:     Size: 48
 // CHECKDSO-NEXT:     Link:
@@ -40,23 +40,23 @@
 // CHECKDSO: Relocations [
 // CHECKDSO-NEXT:   Section ({{.*}}) .rela.plt {
 
-// &(.got.plt[3]) = 0x20000 + 3 * 8 = 0x30018
-// CHECKDSO-NEXT:     0x20018 R_AARCH64_JUMP_SLOT foo
+// &(.got.plt[3]) = 0x30000 + 3 * 8 = 0x30018
+// CHECKDSO-NEXT:     0x30018 R_AARCH64_JUMP_SLOT foo
 
-// &(.got.plt[4]) = 0x20000 + 4 * 8 = 0x30020
-// CHECKDSO-NEXT:     0x20020 R_AARCH64_JUMP_SLOT bar
+// &(.got.plt[4]) = 0x30000 + 4 * 8 = 0x30020
+// CHECKDSO-NEXT:     0x30020 R_AARCH64_JUMP_SLOT bar
 
-// &(.got.plt[5]) = 0x20000 + 5 * 8 = 0x30028
-// CHECKDSO-NEXT:     0x20028 R_AARCH64_JUMP_SLOT weak
+// &(.got.plt[5]) = 0x30000 + 5 * 8 = 0x30028
+// CHECKDSO-NEXT:     0x30028 R_AARCH64_JUMP_SLOT weak
 // CHECKDSO-NEXT:   }
 // CHECKDSO-NEXT: ]
 
 // DUMPDSO: Contents of section .got.plt:
 // .got.plt[0..2] = 0 (reserved)
 // .got.plt[3..5] = .plt = 0x10010
-// DUMPDSO-NEXT: 20000 00000000 00000000 00000000 00000000  ................
-// DUMPDSO-NEXT: 20010 00000000 00000000 10000100 00000000  ................
-// DUMPDSO-NEXT: 20020 10000100 00000000 10000100 00000000  ................
+// DUMPDSO-NEXT: 30000 00000000 00000000 00000000 00000000  ................
+// DUMPDSO-NEXT: 30010 00000000 00000000 10000100 00000000  ................
+// DUMPDSO-NEXT: 30020 10000100 00000000 10000100 00000000  ................
 
 // DISASMDSO: _start:
 // 0x10030 - 0x10000 = 0x30 = 48
@@ -70,11 +70,12 @@
 // DISASMDSO-NEXT:     1000c:	1f 20 03 d5 	nop
 
 // DISASMDSO: Disassembly of section .plt:
+// DISASMDSO-EMPTY:
 // DISASMDSO-NEXT: .plt:
 // DISASMDSO-NEXT:     10010:	f0 7b bf a9 	stp	x16, x30, [sp, #-16]!
 // &(.got.plt[2]) = 0x3000 + 2 * 8 = 0x3010
-// Page(0x20010) - Page(0x10014) = 0x20000 - 0x10000 = 0x10000 = 65536
-// DISASMDSO-NEXT:     10014:	90 00 00 90 	adrp	x16, #65536
+// Page(0x30010) - Page(0x10014) = 0x30000 - 0x10000 = 0x20000 = 131072
+// DISASMDSO-NEXT:     10014:	10 01 00 90 	adrp	x16, #131072
 // 0x3010 & 0xFFF = 0x10 = 16
 // DISASMDSO-NEXT:     10018:	11 0a 40 f9 ldr x17, [x16, #16]
 // DISASMDSO-NEXT:     1001c:	10 42 00 91 	add	x16, x16, #16
@@ -84,30 +85,30 @@
 // DISASMDSO-NEXT:     1002c:	1f 20 03 d5 	nop
 
 // foo@plt
-// Page(0x30018) - Page(0x10030) = 0x20000 - 0x10000 = 0x10000 = 65536
+// Page(0x30018) - Page(0x10030) = 0x30000 - 0x10000 = 0x20000 = 131072
 // DISASMDSO-EMPTY:
 // DISASMDSO-NEXT:   foo@plt:
-// DISASMDSO-NEXT:     10030:	90 00 00 90 	adrp	x16, #65536
+// DISASMDSO-NEXT:     10030:	10 01 00 90 	adrp	x16, #131072
 // 0x3018 & 0xFFF = 0x18 = 24
 // DISASMDSO-NEXT:     10034:	11 0e 40 f9 	ldr	x17, [x16, #24]
 // DISASMDSO-NEXT:     10038:	10 62 00 91 	add	x16, x16, #24
 // DISASMDSO-NEXT:     1003c:	20 02 1f d6 	br	x17
 
 // bar@plt
-// Page(0x30020) - Page(0x10040) = 0x20000 - 0x10000 = 0x10000 = 65536
+// Page(0x30020) - Page(0x10040) = 0x30000 - 0x10000 = 0x20000 = 131072
 // DISASMDSO-EMPTY:
 // DISASMDSO-NEXT:   bar@plt:
-// DISASMDSO-NEXT:     10040:	90 00 00 90 	adrp	x16, #65536
+// DISASMDSO-NEXT:     10040:	10 01 00 90 	adrp	x16, #131072
 // 0x3020 & 0xFFF = 0x20 = 32
 // DISASMDSO-NEXT:     10044:	11 12 40 f9 	ldr	x17, [x16, #32]
 // DISASMDSO-NEXT:     10048:	10 82 00 91 	add	x16, x16, #32
 // DISASMDSO-NEXT:     1004c:	20 02 1f d6 	br	x17
 
 // weak@plt
-// Page(0x30028) - Page(0x10050) = 0x20000 - 0x10000 = 0x10000 = 65536
+// Page(0x30028) - Page(0x10050) = 0x30000 - 0x10000 = 0x20000 = 131072
 // DISASMDSO-EMPTY:
 // DISASMDSO-NEXT:   weak@plt:
-// DISASMDSO-NEXT:     10050:	90 00 00 90 	adrp	x16, #65536
+// DISASMDSO-NEXT:     10050:	10 01 00 90 	adrp	x16, #131072
 // 0x3028 & 0xFFF = 0x28 = 40
 // DISASMDSO-NEXT:     10054:	11 16 40 f9 	ldr	x17, [x16, #40]
 // DISASMDSO-NEXT:     10058:	10 a2 00 91 	add	x16, x16, #40
@@ -132,7 +133,7 @@
 // CHECKEXE-NEXT:       SHF_ALLOC
 // CHECKEXE-NEXT:       SHF_WRITE
 // CHECKEXE-NEXT:     ]
-// CHECKEXE-NEXT:     Address: 0x220000
+// CHECKEXE-NEXT:     Address: 0x230000
 // CHECKEXE-NEXT:     Offset:
 // CHECKEXE-NEXT:     Size: 40
 // CHECKEXE-NEXT:     Link:
@@ -142,20 +143,20 @@
 // CHECKEXE: Relocations [
 // CHECKEXE-NEXT:   Section ({{.*}}) .rela.plt {
 
-// &(.got.plt[3]) = 0x220000 + 3 * 8 = 0x220018
-// CHECKEXE-NEXT:     0x220018 R_AARCH64_JUMP_SLOT bar 0x0
+// &(.got.plt[3]) = 0x230000 + 3 * 8 = 0x230018
+// CHECKEXE-NEXT:     0x230018 R_AARCH64_JUMP_SLOT bar 0x0
 
-// &(.got.plt[4]) = 0x220000 + 4 * 8 = 0x220020
-// CHECKEXE-NEXT:     0x220020 R_AARCH64_JUMP_SLOT weak 0x0
+// &(.got.plt[4]) = 0x230000 + 4 * 8 = 0x230020
+// CHECKEXE-NEXT:     0x230020 R_AARCH64_JUMP_SLOT weak 0x0
 // CHECKEXE-NEXT:   }
 // CHECKEXE-NEXT: ]
 
 // DUMPEXE: Contents of section .got.plt:
 // .got.plt[0..2] = 0 (reserved)
 // .got.plt[3..4] = .plt = 0x40010
-// DUMPEXE-NEXT:  220000 00000000 00000000 00000000 00000000
-// DUMPEXE-NEXT:  220010 00000000 00000000 10002100 00000000
-// DUMPEXE-NEXT:  220020 10002100 00000000
+// DUMPEXE-NEXT:  230000 00000000 00000000 00000000 00000000
+// DUMPEXE-NEXT:  230010 00000000 00000000 10002100 00000000
+// DUMPEXE-NEXT:  230020 10002100 00000000
 
 // DISASMEXE: _start:
 // 0x21000c - 0x210000 = 0xc = 12
@@ -169,11 +170,12 @@
 // DISASMEXE-NEXT:    21000c:	1f 20 03 d5 	nop
 
 // DISASMEXE: Disassembly of section .plt:
+// DISASMEXE-EMPTY:
 // DISASMEXE-NEXT: .plt:
 // DISASMEXE-NEXT:    210010:	f0 7b bf a9 	stp	x16, x30, [sp, #-16]!
 // &(.got.plt[2]) = 0x2200B0 + 2 * 8 = 0x2200C0
-// Page(0x220010) - Page(0x210014) = 0x220000 - 0x210000 = 0x10000 = 65536
-// DISASMEXE-NEXT:    210014:	90 00 00 90  	adrp	x16, #65536
+// Page(0x230010) - Page(0x210014) = 0x230000 - 0x210000 = 0x20000 = 131072
+// DISASMEXE-NEXT:    210014:	10 01 00 90  	adrp	x16, #131072
 // 0x120c0 & 0xFFF = 0xC0 = 192
 // DISASMEXE-NEXT:    210018:	11 0a 40 f9 	ldr	x17, [x16, #16]
 // DISASMEXE-NEXT:    21001c:	10 42 00 91 	add	x16, x16, #16
@@ -183,19 +185,19 @@
 // DISASMEXE-NEXT:    21002c:	1f 20 03 d5 	nop
 
 // bar@plt
-// Page(0x40018) - Page(0x210030) = 0x220000 - 0x210000 = 0x10000 = 65536
+// Page(0x230018) - Page(0x210030) = 0x230000 - 0x210000 = 0x20000 = 131072
 // DISASMEXE-EMPTY:
 // DISASMEXE-NEXT:   bar@plt:
-// DISASMEXE-NEXT:    210030:	90 00 00 90 	adrp	x16, #65536
+// DISASMEXE-NEXT:    210030:	10 01 00 90 	adrp	x16, #131072
 // DISASMEXE-NEXT:    210034:	11 0e 40 f9 	ldr	x17, [x16, #24]
 // DISASMEXE-NEXT:    210038:	10 62 00 91 	add	x16, x16, #24
 // DISASMEXE-NEXT:    21003c:	20 02 1f d6 	br	x17
 
 // weak@plt
-// Page(0x40020) - Page(0x210040) = 0x220000 - 0x210000 = 0x10000 = 65536
+// Page(0x230020) - Page(0x210040) = 0x230000 - 0x210000 = 0x20000 = 131072
 // DISASMEXE-EMPTY:
 // DISASMEXE-NEXT:   weak@plt:
-// DISASMEXE-NEXT:    210040:	90 00 00 90 	adrp	x16, #65536
+// DISASMEXE-NEXT:    210040:	10 01 00 90 	adrp	x16, #131072
 // DISASMEXE-NEXT:    210044:	11 12 40 f9 	ldr	x17, [x16, #32]
 // DISASMEXE-NEXT:    210048:	10 82 00 91 	add	x16, x16, #32
 // DISASMEXE-NEXT:    21004c:	20 02 1f d6 	br	x17
diff --git a/deps/lld/test/ELF/plt-i686.s b/deps/lld/test/ELF/plt-i686.s
index 8a5863310eaedefb293a47649b21d87d5ebb8077..615bd1ec9b3e4fcab96d9d2d06ea27b1ac542a43 100644
--- a/deps/lld/test/ELF/plt-i686.s
+++ b/deps/lld/test/ELF/plt-i686.s
@@ -3,10 +3,10 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld %t.o %t2.so -o %t
-// RUN: llvm-readobj -s -r %t | FileCheck %s
+// RUN: llvm-readobj -S -r %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 // RUN: ld.lld -shared %t.o %t2.so -o %t
-// RUN: llvm-readobj -s -r %t | FileCheck --check-prefix=CHECKSHARED %s
+// RUN: llvm-readobj -S -r %t | FileCheck --check-prefix=CHECKSHARED %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASMSHARED %s
 // RUN: ld.lld -pie %t.o %t2.so -o %t
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASMPIE %s
@@ -30,8 +30,8 @@
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x402000
-// CHECK-NEXT: Offset: 0x2000
+// CHECK-NEXT: Address: 0x403000
+// CHECK-NEXT: Offset: 0x3000
 // CHECK-NEXT: Size: 20
 // CHECK-NEXT: Link: 0
 // CHECK-NEXT: Info: 0
@@ -42,8 +42,8 @@
 // 0x12000 + got.plt.reserved(12) + 4 = 0x12010
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rel.plt {
-// CHECK-NEXT:     0x40200C R_386_JUMP_SLOT bar 0x0
-// CHECK-NEXT:     0x402010 R_386_JUMP_SLOT zed 0x0
+// CHECK-NEXT:     0x40300C R_386_JUMP_SLOT bar 0x0
+// CHECK-NEXT:     0x403010 R_386_JUMP_SLOT zed 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
@@ -67,26 +67,27 @@
 
 // 0x401010 - 0x40102b - 5 = -32
 // 0x401010 - 0x40103b - 5 = -48
-// 4202500 = 0x402004 = .got.plt (0x402000) + 4
-// 4202504 = 0x402008 = .got.plt (0x402000) + 8
-// 4202508 = 0x40200C = .got.plt (0x402000) + got.plt.reserved(12)
-// 4202512 = 0x402010 = .got.plt (0x402000) + got.plt.reserved(12) + 4
+// 4206596 = 0x403004 = .got.plt (0x403000) + 4
+// 4206600 = 0x403008 = .got.plt (0x403000) + 8
+// 4206604 = 0x40300C = .got.plt (0x403000) + got.plt.reserved(12)
+// 4206608 = 0x403010 = .got.plt (0x403000) + got.plt.reserved(12) + 4
 // DISASM:      Disassembly of section .plt:
+// DISASM-EMPTY:
 // DISASM-NEXT: .plt:
-// DISASM-NEXT:    401020: ff 35 04 20 40 00 pushl 4202500
-// DISASM-NEXT:    401026: ff 25 08 20 40 00 jmpl *4202504
+// DISASM-NEXT:    401020: ff 35 04 30 40 00 pushl 4206596
+// DISASM-NEXT:    401026: ff 25 08 30 40 00 jmpl *4206600
 // DISASM-NEXT:    40102c: 90 nop
 // DISASM-NEXT:    40102d: 90 nop
 // DISASM-NEXT:    40102e: 90 nop
 // DISASM-NEXT:    40102f: 90 nop
 // DISASM-EMPTY:
 // DISASM-NEXT:   bar@plt:
-// DISASM-NEXT:    401030: ff 25 0c 20 40 00 jmpl *4202508
+// DISASM-NEXT:    401030: ff 25 0c 30 40 00 jmpl *4206604
 // DISASM-NEXT:    401036: 68 00 00 00 00 pushl $0
 // DISASM-NEXT:    40103b: e9 e0 ff ff ff jmp -32 <.plt>
 // DISASM-EMPTY:
 // DISASM-NEXT:   zed@plt:
-// DISASM-NEXT:    401040: ff 25 10 20 40 00 jmpl *4202512
+// DISASM-NEXT:    401040: ff 25 10 30 40 00 jmpl *4206608
 // DISASM-NEXT:    401046: 68 08 00 00 00 pushl $8
 // DISASM-NEXT:    40104b: e9 d0 ff ff ff jmp -48 <.plt>
 
@@ -110,8 +111,8 @@
 // CHECKSHARED-NEXT:     SHF_ALLOC
 // CHECKSHARED-NEXT:     SHF_WRITE
 // CHECKSHARED-NEXT:   ]
-// CHECKSHARED-NEXT:   Address: 0x2000
-// CHECKSHARED-NEXT:   Offset: 0x2000
+// CHECKSHARED-NEXT:   Address: 0x3000
+// CHECKSHARED-NEXT:   Offset: 0x3000
 // CHECKSHARED-NEXT:   Size: 20
 // CHECKSHARED-NEXT:   Link: 0
 // CHECKSHARED-NEXT:   Info: 0
@@ -119,12 +120,12 @@
 // CHECKSHARED-NEXT:   EntrySize: 0
 // CHECKSHARED-NEXT:   }
 
-// 0x2000 + got.plt.reserved(12) = 0x200C
-// 0x2000 + got.plt.reserved(12) + 4 = 0x2010
+// 0x3000 + got.plt.reserved(12) = 0x300C
+// 0x3000 + got.plt.reserved(12) + 4 = 0x3010
 // CHECKSHARED:        Relocations [
 // CHECKSHARED-NEXT:     Section ({{.*}}) .rel.plt {
-// CHECKSHARED-NEXT:       0x200C R_386_JUMP_SLOT bar 0x0
-// CHECKSHARED-NEXT:       0x2010 R_386_JUMP_SLOT zed 0x0
+// CHECKSHARED-NEXT:       0x300C R_386_JUMP_SLOT bar 0x0
+// CHECKSHARED-NEXT:       0x3010 R_386_JUMP_SLOT zed 0x0
 // CHECKSHARED-NEXT:     }
 // CHECKSHARED-NEXT:   ]
 
@@ -137,33 +138,40 @@
 // DISASMSHARED-NEXT:  1009: e9 22 00 00 00 jmp 34
 // DISASMSHARED-NEXT:  100e: e9 2d 00 00 00 jmp 45
 // DISASMSHARED-NEXT:  1013: e9 e8 ff ff ff jmp -24
+// DISASMSHARED-EMPTY:
 // DISASMSHARED-NEXT:  Disassembly of section .plt:
+// DISASMSHARED-EMPTY:
 // DISASMSHARED-NEXT:  .plt:
-// DISASMSHARED-NEXT:  1020: ff b3 04 20 00 00 pushl 8196(%ebx)
-// DISASMSHARED-NEXT:  1026: ff a3 08 20 00 00 jmpl *8200(%ebx)
+// DISASMSHARED-NEXT:  1020: ff b3 04 00 00 00 pushl 4(%ebx)
+// DISASMSHARED-NEXT:  1026: ff a3 08 00 00 00 jmpl *8(%ebx)
 // DISASMSHARED-NEXT:  102c: 90 nop
 // DISASMSHARED-NEXT:  102d: 90 nop
 // DISASMSHARED-NEXT:  102e: 90 nop
 // DISASMSHARED-NEXT:  102f: 90 nop
-// DISASMSHARED-NEXT:  1030: ff a3 0c 20 00 00 jmpl *8204(%ebx)
+// DISASMSHARED:       bar@plt:
+// DISASMSHARED-NEXT:  1030: ff a3 0c 00 00 00 jmpl *12(%ebx)
 // DISASMSHARED-NEXT:  1036: 68 00 00 00 00     pushl $0
 // DISASMSHARED-NEXT:  103b: e9 e0 ff ff ff     jmp -32 <.plt>
-// DISASMSHARED-NEXT:  1040: ff a3 10 20 00 00 jmpl *8208(%ebx)
+// DISASMSHARED:       zed@plt:
+// DISASMSHARED-NEXT:  1040: ff a3 10 00 00 00 jmpl *16(%ebx)
 // DISASMSHARED-NEXT:  1046: 68 08 00 00 00     pushl $8
 // DISASMSHARED-NEXT:  104b: e9 d0 ff ff ff     jmp -48 <.plt>
 
 // DISASMPIE:      Disassembly of section .plt:
+// DISASMPIE-EMPTY:
 // DISASMPIE-NEXT: .plt:
-// DISASMPIE-NEXT:   1020:	ff b3 04 20 00 00 pushl 8196(%ebx)
-// DISASMPIE-NEXT:   1026:	ff a3 08 20 00 00 jmpl *8200(%ebx)
+// DISASMPIE-NEXT:   1020:	ff b3 04 00 00 00 pushl 4(%ebx)
+// DISASMPIE-NEXT:   1026:	ff a3 08 00 00 00 jmpl *8(%ebx)
 // DISASMPIE-NEXT:   102c:	90 nop
 // DISASMPIE-NEXT:   102d:	90 nop
 // DISASMPIE-NEXT:   102e:	90 nop
 // DISASMPIE-NEXT:   102f:	90 nop
-// DISASMPIE-NEXT:   1030:	ff a3 0c 20 00 00 jmpl *8204(%ebx)
+// DISASMPIE:        bar@plt:
+// DISASMPIE-NEXT:   1030:	ff a3 0c 00 00 00 jmpl *12(%ebx)
 // DISASMPIE-NEXT:   1036:	68 00 00 00 00 pushl $0
 // DISASMPIE-NEXT:   103b:	e9 e0 ff ff ff jmp -32 <.plt>
-// DISASMPIE-NEXT:   1040:	ff a3 10 20 00 00 jmpl *8208(%ebx)
+// DISASMPIE:        zed@plt:
+// DISASMPIE-NEXT:   1040:	ff a3 10 00 00 00 jmpl *16(%ebx)
 // DISASMPIE-NEXT:   1046:	68 08 00 00 00 pushl $8
 // DISASMPIE-NEXT:   104b:	e9 d0 ff ff ff jmp -48 <.plt>
 
diff --git a/deps/lld/test/ELF/plt.s b/deps/lld/test/ELF/plt.s
index 21f0f12f03ea64f5caa8ce792ee01b768e3d2fbb..15e82fa66383b37e53f6aa15d1a872e33c625107 100644
--- a/deps/lld/test/ELF/plt.s
+++ b/deps/lld/test/ELF/plt.s
@@ -4,9 +4,9 @@
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld -shared %t.o %t2.so -o %t
 // RUN: ld.lld %t.o %t2.so -o %t3
-// RUN: llvm-readobj -s -r %t | FileCheck %s
+// RUN: llvm-readobj -S -r %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
-// RUN: llvm-readobj -s -r %t3 | FileCheck --check-prefix=CHECK2 %s
+// RUN: llvm-readobj -S -r %t3 | FileCheck --check-prefix=CHECK2 %s
 // RUN: llvm-objdump -d %t3 | FileCheck --check-prefix=DISASM2 %s
 
 // CHECK:      Name: .plt
@@ -24,9 +24,9 @@
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rela.plt {
-// CHECK-NEXT:     0x2018 R_X86_64_JUMP_SLOT bar 0x0
-// CHECK-NEXT:     0x2020 R_X86_64_JUMP_SLOT zed 0x0
-// CHECK-NEXT:     0x2028 R_X86_64_JUMP_SLOT _start 0x0
+// CHECK-NEXT:     0x3018 R_X86_64_JUMP_SLOT bar 0x0
+// CHECK-NEXT:     0x3020 R_X86_64_JUMP_SLOT zed 0x0
+// CHECK-NEXT:     0x3028 R_X86_64_JUMP_SLOT _start 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
@@ -45,8 +45,8 @@
 
 // CHECK2:      Relocations [
 // CHECK2-NEXT:   Section ({{.*}}) .rela.plt {
-// CHECK2-NEXT:     0x202018 R_X86_64_JUMP_SLOT bar 0x0
-// CHECK2-NEXT:     0x202020 R_X86_64_JUMP_SLOT zed 0x0
+// CHECK2-NEXT:     0x203018 R_X86_64_JUMP_SLOT bar 0x0
+// CHECK2-NEXT:     0x203020 R_X86_64_JUMP_SLOT zed 0x0
 // CHECK2-NEXT:   }
 // CHECK2-NEXT: ]
 
@@ -64,28 +64,29 @@
 // DISASM-NEXT:   100a:  e9 {{.*}}       jmp  49
 // DISASM-NEXT:   100f:  e9 {{.*}}       jmp  60
 
-// 0x2018 - 0x1036  = 4066
-// 0x2020 - 0x1046  = 4058
-// 0x2028 - 0x1056  = 4050
+// 0x3018 - 0x1036  = 8162
+// 0x3020 - 0x1046  = 8154
+// 0x3028 - 0x1056  = 8146
 
 // DISASM:      Disassembly of section .plt:
+// DISASM-EMPTY:
 // DISASM-NEXT: .plt:
-// DISASM-NEXT:   1020:  ff 35 e2 0f 00 00  pushq 4066(%rip)
-// DISASM-NEXT:   1026:  ff 25 e4 0f 00 00  jmpq *4068(%rip)
+// DISASM-NEXT:   1020:  ff 35 e2 1f 00 00  pushq 8162(%rip)
+// DISASM-NEXT:   1026:  ff 25 e4 1f 00 00  jmpq *8164(%rip)
 // DISASM-NEXT:   102c:  0f 1f 40 00        nopl (%rax)
 // DISASM-EMPTY:
 // DISASM-NEXT:   bar@plt:
-// DISASM-NEXT:   1030:  ff 25 e2 0f 00 00  jmpq *4066(%rip)
+// DISASM-NEXT:   1030:  ff 25 e2 1f 00 00  jmpq *8162(%rip)
 // DISASM-NEXT:   1036:  68 00 00 00 00     pushq $0
 // DISASM-NEXT:   103b:  e9 e0 ff ff ff     jmp -32 <.plt>
 // DISASM-EMPTY:
 // DISASM-NEXT:   zed@plt:
-// DISASM-NEXT:   1040:  ff 25 da 0f 00 00  jmpq *4058(%rip)
+// DISASM-NEXT:   1040:  ff 25 da 1f 00 00  jmpq *8154(%rip)
 // DISASM-NEXT:   1046:  68 01 00 00 00     pushq $1
 // DISASM-NEXT:   104b:  e9 d0 ff ff ff     jmp -48 <.plt>
 // DISASM-EMPTY:
 // DISASM-NEXT:   _start@plt:
-// DISASM-NEXT:   1050:  ff 25 d2 0f 00 00  jmpq *4050(%rip)
+// DISASM-NEXT:   1050:  ff 25 d2 1f 00 00  jmpq *8146(%rip)
 // DISASM-NEXT:   1056:  68 02 00 00 00     pushq $2
 // DISASM-NEXT:   105b:  e9 c0 ff ff ff     jmp -64 <.plt>
 
@@ -104,18 +105,19 @@
 // 0x202020 - 0x201046  = 4058
 
 // DISASM2:      Disassembly of section .plt:
+// DISASM2-EMPTY:
 // DISASM2-NEXT: .plt:
-// DISASM2-NEXT:  201020:  ff 35 e2 0f 00 00   pushq 4066(%rip)
-// DISASM2-NEXT:  201026:  ff 25 e4 0f 00 00   jmpq *4068(%rip)
+// DISASM2-NEXT:  201020:  ff 35 e2 1f 00 00   pushq 8162(%rip)
+// DISASM2-NEXT:  201026:  ff 25 e4 1f 00 00   jmpq *8164(%rip)
 // DISASM2-NEXT:  20102c:  0f 1f 40 00         nopl  (%rax)
 // DISASM2-EMPTY:
 // DISASM2-NEXT:   bar@plt:
-// DISASM2-NEXT:  201030:  ff 25 e2 0f 00 00   jmpq *4066(%rip)
+// DISASM2-NEXT:  201030:  ff 25 e2 1f 00 00   jmpq *8162(%rip)
 // DISASM2-NEXT:  201036:  68 00 00 00 00      pushq $0
 // DISASM2-NEXT:  20103b:  e9 e0 ff ff ff      jmp -32 <.plt>
 // DISASM2-EMPTY:
 // DISASM2-NEXT:   zed@plt:
-// DISASM2-NEXT:  201040:  ff 25 da 0f 00 00   jmpq *4058(%rip)
+// DISASM2-NEXT:  201040:  ff 25 da 1f 00 00   jmpq *8154(%rip)
 // DISASM2-NEXT:  201046:  68 01 00 00 00      pushq $1
 // DISASM2-NEXT:  20104b:  e9 d0 ff ff ff      jmp -48 <.plt>
 // DISASM2-NOT:   2010C0
diff --git a/deps/lld/test/ELF/ppc-rela.s b/deps/lld/test/ELF/ppc-rela.s
index 430c5a748181e4fcc953ba9017d6649a53f2d4d3..5f19120cbdf3f564ef4368050fed8003c3baa1b0 100644
--- a/deps/lld/test/ELF/ppc-rela.s
+++ b/deps/lld/test/ELF/ppc-rela.s
@@ -7,5 +7,5 @@
   .long foo
 
 // CHECK:      Section ({{.*}}) .rela.dyn {
-// CHECK-NEXT:   0x1000 R_PPC_ADDR32 foo 0x0
+// CHECK-NEXT:   0x20000 R_PPC_ADDR32 foo 0x0
 // CHECK-NEXT: }
diff --git a/deps/lld/test/ELF/ppc-relocs.s b/deps/lld/test/ELF/ppc-relocs.s
deleted file mode 100644
index 40536b6f37680a9b5784a0861bf3e54181cec15a..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/ppc-relocs.s
+++ /dev/null
@@ -1,101 +0,0 @@
-# REQUIRES: ppc
-# RUN: llvm-mc -filetype=obj -triple=powerpc-unknown-freebsd %s -o %t
-# RUN: ld.lld %t -o %t2
-# RUN: llvm-objdump -d %t2 | FileCheck %s
-
-.section .R_PPC_ADDR16_HA,"ax",@progbits
-.globl _start
-_start:
-  lis 4, msg@ha
-msg:
-  .string "foo"
-  len = . - msg
-
-# CHECK: Disassembly of section .R_PPC_ADDR16_HA:
-# CHECK: _start:
-# CHECK:    11000:       3c 80 00 01     lis 4, 1
-# CHECK: msg:
-# CHECK:    11004:       66 6f 6f 00     oris 15, 19, 28416
-
-.section .R_PPC_ADDR16_HI,"ax",@progbits
-.globl _starti
-_starti:
-  lis 4,msgi@h
-msgi:
-  .string "foo"
-  leni = . - msgi
-
-# CHECK: Disassembly of section .R_PPC_ADDR16_HI:
-# CHECK: _starti:
-# CHECK:    11008:       3c 80 00 01     lis 4, 1
-# CHECK: msgi:
-# CHECK:    1100c:       66 6f 6f 00     oris 15, 19, 28416
-
-.section .R_PPC_ADDR16_LO,"ax",@progbits
-  addi 4, 4, msg@l
-mystr:
-  .asciz "blah"
-  len = . - mystr
-
-# CHECK: Disassembly of section .R_PPC_ADDR16_LO:
-# CHECK: .R_PPC_ADDR16_LO:
-# CHECK:    11010:       38 84 10 04     addi 4, 4, 4100
-# CHECK: mystr:
-# CHECK:    11014:       62 6c 61 68     ori 12, 19, 24936
-
-.align  2
-.section .R_PPC_REL24,"ax",@progbits
-.globl .FR_PPC_REL24
-.FR_PPC_REL24:
-  b .Lfoox
-.section .R_PPC_REL24_2,"ax",@progbits
-.Lfoox:
-
-# CHECK: Disassembly of section .R_PPC_REL24:
-# CHECK: .FR_PPC_REL24:
-# CHECK:    1101c:       48 00 00 04     b .+4
-
-.section .R_PPC_REL14,"ax",@progbits
-.globl .FR_PPC_REL14
-.FR_PPC_REL14:
-  beq .Lfooy
-.section .R_PPC_REL14_2,"ax",@progbits
-.Lfooy:
-
-# CHECK: Disassembly of section .R_PPC_REL14:
-# CHECK: .FR_PPC_REL14:
-# CHECK:    11020: {{.*}} bt 2, .+4
-
-.section .R_PPC_REL32,"ax",@progbits
-.globl .FR_PPC_REL32
-.FR_PPC_REL32:
-  .long .Lfoox3 - .
-.section .R_PPC_REL32_2,"ax",@progbits
-.Lfoox3:
-
-# CHECK: Disassembly of section .R_PPC_REL32:
-# CHECK: .FR_PPC_REL32:
-# CHECK:    11024:       00 00 00 04
-
-.section .R_PPC_ADDR32,"ax",@progbits
-.globl .FR_PPC_ADDR32
-.FR_PPC_ADDR32:
-  .long .Lfoox2
-.section .R_PPC_ADDR32_2,"ax",@progbits
-.Lfoox2:
-
-# CHECK: Disassembly of section .R_PPC_ADDR32:
-# CHECK: .FR_PPC_ADDR32:
-# CHECK:    11028:       00 01 10 2c
-
-.align  2
-.section .R_PPC_PLTREL24,"ax",@progbits
-.globl .R_PPC_PLTREL24
-.FR_PPC_PLTREL24:
-  b .Lfoox4@PLT
-.section .R_PPC_PLTREL24_2,"ax",@progbits
-.Lfoox4:
-
-# CHECK: Disassembly of section .R_PPC_PLTREL24:
-# CHECK: .R_PPC_PLTREL24:
-# CHECK:    1102c:       48 00 00 04     b .+4
diff --git a/deps/lld/test/ELF/ppc32-abs-pic.s b/deps/lld/test/ELF/ppc32-abs-pic.s
new file mode 100644
index 0000000000000000000000000000000000000000..311220d4a4aec056d9c07a1df10316c99ba78f20
--- /dev/null
+++ b/deps/lld/test/ELF/ppc32-abs-pic.s
@@ -0,0 +1,23 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc %s -o %t.o
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: llvm-nm %t.so | FileCheck --check-prefix=NM %s
+# RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=RELOC %s
+
+## R_PPC_ADDR32 is an absolute relocation type.
+## In PIC mode, it creates a relative relocation if the symbol is non-preemptable.
+
+# NM: 00020004 d b
+
+# RELOC:      .rela.dyn {
+# RELOC-NEXT:   0x20004 R_PPC_RELATIVE - 0x20004
+# RELOC-NEXT:   0x20000 R_PPC_ADDR32 a 0
+# RELOC-NEXT: }
+
+.globl a, b
+.hidden b
+
+.data
+.long a
+b:
+.long b
diff --git a/deps/lld/test/ELF/ppc32-call-stub-nopic.s b/deps/lld/test/ELF/ppc32-call-stub-nopic.s
new file mode 100644
index 0000000000000000000000000000000000000000..2d788adbace08b50a5b934db48d1c55622837a70
--- /dev/null
+++ b/deps/lld/test/ELF/ppc32-call-stub-nopic.s
@@ -0,0 +1,81 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc %s -o %t.o
+# RUN: echo '.globl f, g, h; f: g: h:' | llvm-mc -filetype=obj -triple=powerpc - -o %t1.o
+# RUN: ld.lld -shared %t1.o -soname t1.so -o %t1.so
+
+## Check we can create PLT entries for -fno-PIE executable.
+# RUN: ld.lld %t.o %t1.so -o %t
+# RUN: llvm-readobj -r -d %t | FileCheck --check-prefix=RELOC %s
+# RUN: llvm-readelf -S %t | FileCheck --check-prefix=SEC %s
+# RUN: llvm-readelf -x .plt %t | FileCheck --check-prefix=HEX %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+
+# RELOC:      .rela.plt {
+# RELOC-NEXT:   0x10030000 R_PPC_JMP_SLOT f 0x0
+# RELOC-NEXT:   0x10030004 R_PPC_JMP_SLOT g 0x0
+# RELOC-NEXT: }
+
+# SEC:   .got PROGBITS 10020070
+# RELOC: PPC_GOT 0x10020070
+
+## .got2+0x8000-0x10004 = 0x30000+0x8000-0x10004 = 65536*2+32764
+# CHECK-LABEL: _start:
+# CHECK-NEXT:    bl .+16
+# CHECK-NEXT:    bl .+12
+# CHECK-NEXT:    bl .+24
+# CHECK-NEXT:    bl .+20
+# CHECK-EMPTY:
+
+## -fno-PIC call stubs of f and g.
+## .plt[0] = 0x10030000 = 65536*4099+0
+## .plt[1] = 0x10030004 = 65536*4099+4
+# CHECK-NEXT:  00000000.plt_call32.f:
+# CHECK-NEXT:    lis 11, 4099
+# CHECK-NEXT:    lwz 11, 0(11)
+# CHECK-NEXT:    mtctr 11
+# CHECK-NEXT:    bctr
+# CHECK-EMPTY:
+# CHECK-NEXT:  00000000.plt_call32.g:
+# CHECK-NEXT:    lis 11, 4099
+# CHECK-NEXT:    lwz 11, 4(11)
+# CHECK-NEXT:    mtctr 11
+# CHECK-NEXT:    bctr
+# CHECK-EMPTY:
+
+## In Secure PLT ABI, .plt stores function pointers to first instructions of .glink
+# HEX: 0x10030000 10010040 10010044
+
+## These instructions are referenced by .plt entries.
+# CHECK: 10010040 .glink:
+# CHECK-NEXT: b .+8
+# CHECK-NEXT: b .+4
+
+## PLTresolve
+## Operands of lis & lwz: .got+4 = 0x10020070+4 = 65536*4098+116
+## Operands of addis & addi: -.glink = -0x10010040 = 65536*-4097-48
+# CHECK-NEXT: lis 12, 4098
+# CHECK-NEXT: addis 11, 11, -4097
+# CHECK-NEXT: lwz 0, 116(12)
+# CHECK-NEXT: addi 11, 11, -64
+
+# CHECK-NEXT: mtctr 0
+# CHECK-NEXT: add 0, 11, 11
+# CHECK-NEXT: lwz 12, 120(12)
+# CHECK-NEXT: add 11, 0, 11
+# CHECK-NEXT: bctr
+
+## glibc crti.o references _GLOBAL_OFFSET_TABLE_.
+.section .init
+  bcl 20, 31, .+4
+.L:
+  mflr 30
+  addis 30, 30, _GLOBAL_OFFSET_TABLE_-.L@ha
+  addi 30, 30, _GLOBAL_OFFSET_TABLE_-.L@l
+
+.text
+.globl _start
+_start:
+  bl f
+  bl f
+  bl g
+  bl g
diff --git a/deps/lld/test/ELF/ppc32-call-stub-pic.s b/deps/lld/test/ELF/ppc32-call-stub-pic.s
new file mode 100644
index 0000000000000000000000000000000000000000..30d5192a3ee4a7bbd0bfc09a89cadff3ec23fd09
--- /dev/null
+++ b/deps/lld/test/ELF/ppc32-call-stub-pic.s
@@ -0,0 +1,151 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc %s -o %t.o
+# RUN: echo '.globl f, g, h; f: g: h:' | llvm-mc -filetype=obj -triple=powerpc - -o %t1.o
+# RUN: ld.lld -shared %t1.o -soname t1.so -o %t1.so
+# RUN: echo 'bl f+0x8000@plt' | llvm-mc -filetype=obj -triple=powerpc - -o %t2.o
+
+## Check we can create PLT entries for -fPIE or -fpie executable.
+# RUN: ld.lld -pie %t.o %t1.so %t2.o -o %t
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC %s
+# RUN: llvm-readobj -d %t | FileCheck --check-prefix=DYN %s
+# RUN: llvm-readelf -S %t | FileCheck --check-prefix=SEC %s
+# RUN: llvm-readelf -x .plt %t | FileCheck --check-prefix=HEX %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefixes=CHECK,PIE %s
+
+## Check we can create PLT entries for -fPIC or -fpic DSO.
+# RUN: ld.lld -shared %t.o %t1.so %t2.o -o %t
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefixes=CHECK,SHARED %s
+
+# RELOC:      .rela.dyn {
+# RELOC-NEXT:   R_PPC_ADDR32 f 0x0
+# RELOC-NEXT:   R_PPC_ADDR32 g 0x0
+# RELOC-NEXT:   R_PPC_ADDR32 h 0x0
+# RELOC-NEXT: }
+# RELOC-NEXT: .rela.plt {
+# RELOC-NEXT:   R_PPC_JMP_SLOT f 0x0
+# RELOC-NEXT:   R_PPC_JMP_SLOT g 0x0
+# RELOC-NEXT:   R_PPC_JMP_SLOT h 0x0
+# RELOC-NEXT: }
+
+# SEC: .got PROGBITS 00020088
+# DYN: PPC_GOT 0x20088
+
+## .got2+0x8000-0x10004 = 0x30000+0x8000-0x10004 = 65536*2+32764
+# CHECK-LABEL: _start:
+# CHECK-NEXT:    bcl 20, 31, .+4
+# CHECK-NEXT:  10004: mflr 30
+# CHECK-NEXT:    addis 30, 30, 2
+# CHECK-NEXT:    addi 30, 30, 32764
+
+## Two bl 00008000.got2.plt_pic32.f
+# CHECK-NEXT:    bl .+40
+# CHECK-NEXT:    bl .+36
+## Two bl 00008000.got2.plt_pic32.g
+# CHECK-NEXT:    bl .+48
+# CHECK-NEXT:    bl .+44
+## Two bl 00008000.got2.plt_pic32.h
+# CHECK-NEXT:    bl .+56
+# CHECK-NEXT:    bl .+52
+# CHECK-NEXT:    addis 30, 30, {{.*}}
+# CHECK-NEXT:    addi 30, 30, {{.*}}
+## bl 00008000.plt_pic32.f
+# CHECK-NEXT:    bl .+56
+## bl 00008000.plt_pic32.f
+# CHECK-NEXT:    bl .+68
+# CHECK-EMPTY:
+
+## -fPIC call stubs of f and g.
+# CHECK-NEXT:  00008000.got2.plt_pic32.f:
+# CHECK-NEXT:    lwz 11, 32760(30)
+# CHECK-NEXT:    mtctr 11
+# CHECK-NEXT:    bctr
+# CHECK-NEXT:    nop
+# CHECK-EMPTY:
+# CHECK-NEXT:  00008000.got2.plt_pic32.g:
+# CHECK-NEXT:    lwz 11, 32764(30)
+# CHECK-NEXT:    mtctr 11
+# CHECK-NEXT:    bctr
+# CHECK-NEXT:    nop
+# CHECK-EMPTY:
+
+## The -fPIC call stub of h needs two instructions addis+lwz to represent the offset 65536*1-32768.
+# CHECK-NEXT:  00008000.got2.plt_pic32.h:
+# CHECK-NEXT:    addis 11, 30, 1
+# CHECK-NEXT:    lwz 11, -32768(11)
+# CHECK-NEXT:    mtctr 11
+# CHECK-NEXT:    bctr
+# CHECK-EMPTY:
+
+## -fpic call stub of f.
+# CHECK-NEXT:  00000000.plt_pic32.f:
+# CHECK-NEXT:    addis 11, 30, 2
+# PIE-NEXT:      lwz 11, -144(11)
+# SHARED-NEXT:   lwz 11, -136(11)
+# CHECK-NEXT:    mtctr 11
+# CHECK-NEXT:    bctr
+# CHECK-EMPTY:
+
+## Another -fPIC call stub of f from another object file %t2.o
+## .got2 may have different addresses in different object files,
+## so the call stub cannot be shared.
+# CHECK-NEXT:  00008000.got2.plt_pic32.f:
+
+## In Secure PLT ABI, .plt stores function pointers to first instructions of .glink
+# HEX: 0x0003fff8 00010090 00010094 00010098
+
+## These instructions are referenced by .plt entries.
+# CHECK: 00010090 .glink:
+# CHECK-NEXT: b .+12
+# CHECK-NEXT: b .+8
+# CHECK-NEXT: b .+4
+
+## PLTresolve
+## Operand of addi: 0x100a8-.glink = 24
+# CHECK-NEXT: addis 11, 11, 0
+# CHECK-NEXT: mflr 0
+# CHECK-NEXT: bcl 20, 31, .+4
+# CHECK-NEXT: 100a8: addi 11, 11, 24
+
+# CHECK-NEXT: mflr 12
+# CHECK-NEXT: mtlr 0
+# CHECK-NEXT: subf 11, 12, 11
+
+## Operand of lwz in -pie mode: &.got[1] - 0x100a8 = 0x20088+4 - 0x100a8 = 65536*1-28
+# CHECK-NEXT: addis 12, 12, 1
+# PIE-NEXT:   lwz 0, -28(12)
+# SHARED-NEXT: lwz 0, -36(12)
+
+# PIE-NEXT:   lwz 12, -24(12)
+# SHARED-NEXT: lwz 12, -32(12)
+# CHECK-NEXT: mtctr 0
+# CHECK-NEXT: add 0, 11, 11
+# CHECK-NEXT: add 11, 0, 11
+# CHECK-NEXT: bctr
+
+.section .got2,"aw"
+.space 65516
+.long f
+.long g
+.long h
+
+.text
+.globl _start
+_start:
+  bcl 20,31,.L
+.L:
+  mflr 30
+  addis 30, 30, .got2+0x8000-.L@ha
+  addi 30, 30, .got2+0x8000-.L@l
+  bl f+0x8000@plt
+  bl f+0x8000@plt
+  bl g+0x8000@plt
+  bl g+0x8000@plt
+  bl h+0x8000@plt
+  bl h+0x8000@plt
+
+## An addend of 0 indicates r30 is stored in _GLOBAL_OFFSET_TABLE_.
+## The existing thunk is incompatible, thus it cannot be reused.
+  addis 30, 30, _GLOBAL_OFFSET_TABLE_-.L@ha
+  addi 30, 30, _GLOBAL_OFFSET_TABLE_-.L@l
+  bl f@plt
diff --git a/deps/lld/test/ELF/ppc32-gnu-ifunc-nonpreemptable.s b/deps/lld/test/ELF/ppc32-gnu-ifunc-nonpreemptable.s
new file mode 100644
index 0000000000000000000000000000000000000000..388ddf05ae298997ba21fe4f7ad82bf80a351212
--- /dev/null
+++ b/deps/lld/test/ELF/ppc32-gnu-ifunc-nonpreemptable.s
@@ -0,0 +1,45 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC %s
+# RUN: llvm-readelf -s %t | FileCheck --check-prefix=SYM %s
+# RUN: llvm-readelf -x .got2 %t | FileCheck --check-prefix=HEX %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+
+# RELOC:      .rela.plt {
+# RELOC-NEXT:   0x10020004 R_PPC_IRELATIVE - 0x10010000
+# RELOC-NEXT: }
+
+# SYM: 10010020 0 FUNC GLOBAL DEFAULT {{.*}} func
+# HEX: 0x10020000 10010020
+
+.section .got2,"aw"
+.long func
+
+# CHECK:      func_resolver:
+# CHECK-NEXT: 10010000: blr
+# CHECK:      _start:
+# CHECK-NEXT:   bl .+12
+# CHECK-NEXT:   lis 9, 4097
+# CHECK-NEXT:   addi 9, 9, 32
+# CHECK-EMPTY:
+# CHECK-NEXT: 00000000.plt_call32.func:
+## 10020004 = 65536*4098+4
+# CHECK-NEXT:   lis 11, 4098
+# CHECK-NEXT:   lwz 11, 4(11)
+
+.text
+.globl func
+.type func, @gnu_indirect_function
+func:
+.globl func_resolver
+.type func_resolver, @function
+func_resolver:
+  blr
+
+.globl _start
+_start:
+  bl func
+
+  lis 9, func@ha
+  la 9, func@l(9)
diff --git a/deps/lld/test/ELF/ppc32-gnu-ifunc.s b/deps/lld/test/ELF/ppc32-gnu-ifunc.s
new file mode 100644
index 0000000000000000000000000000000000000000..87c1c0bab04a8c45f6bcc4ae4d91b75415bda82b
--- /dev/null
+++ b/deps/lld/test/ELF/ppc32-gnu-ifunc.s
@@ -0,0 +1,41 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC %s
+# RUN: llvm-readelf -S -s %t | FileCheck --check-prefixes=SEC,SYM %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+
+# RELOC:      .rela.plt {
+# RELOC-NEXT:   0x10020000 R_PPC_IRELATIVE - 0x10010000
+# RELOC-NEXT: }
+
+# SEC: .rela.plt RELA 100000d4 0000d4 00000c
+# SYM: 10010000 0 FUNC GLOBAL DEFAULT {{.*}} func
+
+# CHECK:      func_resolver:
+# CHECK-NEXT:   10010000:
+# CHECK:      _start:
+# CHECK-NEXT:   bl .+20
+## .rela.plt = 0x100000d4 = 65536*4096+212
+## end(.rela.plt) = 0x100000d4+0xc = 65536*4096+224
+# CHECK-NEXT:   lis 9, 4096
+# CHECK-NEXT:   lis 8, 4096
+# CHECK-NEXT:   addi 9, 9, 212
+# CHECK-NEXT:   addi 8, 8, 224
+
+.globl func
+.type func, @gnu_indirect_function
+func:
+.globl func_resolver
+.type func_resolver, @function
+func_resolver:
+  blr
+
+.globl _start
+_start:
+  bl func
+
+  lis 9, __rela_iplt_start@ha
+  lis 8, __rela_iplt_end@ha
+  la 9, __rela_iplt_start@l(9)
+  la 8, __rela_iplt_end@l(8)
diff --git a/deps/lld/test/ELF/ppc32-local-branch.s b/deps/lld/test/ELF/ppc32-local-branch.s
new file mode 100644
index 0000000000000000000000000000000000000000..2abf92638686d50ee658d58e5d3fd8ed4bea07bc
--- /dev/null
+++ b/deps/lld/test/ELF/ppc32-local-branch.s
@@ -0,0 +1,21 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc %s -o %t.o
+# RUN: echo '.globl foo; foo: blr' | llvm-mc -filetype=obj -triple=powerpc - -o %t1.o
+# RUN: ld.lld %t.o %t1.o -o %t
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+
+## R_PPC_REL24 and R_PPC_PLTREL24 are converted to PC relative relocations if the
+## symbol is non-preemptable. The addend of R_PPC_PLTREL24 should be ignored.
+
+# CHECK:      _start:
+# CHECK-NEXT:   b .+12
+# CHECK-NEXT:   b .+8
+# CHECK-NEXT:   b .+4
+# CHECK-EMPTY:
+# CHECK-NEXT: foo:
+
+.globl _start
+_start:
+  b foo  # R_PPC_REL24
+  b foo@plt  # R_PPC_PLTREL24
+  b foo+32768@plt  #_PPC_PLTREL24 with addend
diff --git a/deps/lld/test/ELF/ppc32-reloc-addr.s b/deps/lld/test/ELF/ppc32-reloc-addr.s
new file mode 100644
index 0000000000000000000000000000000000000000..98bd61b1192bdd0c01e50371cb94bf98b35c0bfa
--- /dev/null
+++ b/deps/lld/test/ELF/ppc32-reloc-addr.s
@@ -0,0 +1,26 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc %s -o %t.o
+# RUN: ld.lld %t.o --defsym=a=0x1234 --defsym=b=0xbcdef -o %t
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+# RUN: llvm-objdump -s --no-show-raw-insn %t | FileCheck --check-prefix=HEX %s
+
+.section .R_PPC_ADDR16_HA,"ax",@progbits
+  lis 4, a@ha
+# CHECK-LABEL: section .R_PPC_ADDR16_HA:
+# CHECK: lis 4, 0
+
+.section .R_PPC_ADDR16_HI,"ax",@progbits
+  lis 4, a@h
+# CHECK-LABEL: section .R_PPC_ADDR16_HI:
+# CHECK: lis 4, 0
+
+.section .R_PPC_ADDR16_LO,"ax",@progbits
+  addi 4, 4, a@l
+# CHECK-LABEL: section .R_PPC_ADDR16_LO:
+# CHECK: addi 4, 4, 4660
+
+.section .R_PPC_ADDR32,"a",@progbits
+  .long a
+  .long b
+# HEX-LABEL: section .R_PPC_ADDR32:
+# HEX-NEXT: 100000b4 00001234 000bcdef
diff --git a/deps/lld/test/ELF/ppc32-reloc-got.s b/deps/lld/test/ELF/ppc32-reloc-got.s
new file mode 100644
index 0000000000000000000000000000000000000000..3e9b644fbed50955aa0f4057a2c59201b8b526d1
--- /dev/null
+++ b/deps/lld/test/ELF/ppc32-reloc-got.s
@@ -0,0 +1,36 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc %s -o %t.o
+# RUN: echo '.globl b; b:' | llvm-mc -filetype=obj -triple=powerpc - -o %t1.o
+# RUN: ld.lld -shared %t1.o -o %t1.so
+
+# RUN: ld.lld %t.o %t1.so -o %t
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC %s
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-readobj -x .got %t | FileCheck --check-prefix=HEX %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+
+## Check we can handle R_PPC_GOT16, which may be generated by -fpic code.
+
+# SEC: .got PROGBITS 00020068 020068 000014
+
+# RELOC:      .rela.dyn {
+# RELOC-NEXT:   0x10020078 R_PPC_GLOB_DAT b 0x0
+# RELOC-NEXT: }
+
+# NM: 10030000 d a
+
+## The GOT slot of a can be filled at link time.
+# HEX: section '.got':
+# HEX: 0x10020068 {{[0-9a-f]+}} 00000000 00000000 10030000
+
+## a: &.got[3] - _GLOBAL_OFFSET_TABLE_ = 12
+## b: &.got[4] - _GLOBAL_OFFSET_TABLE_ = 16
+# CHECK: lwz 3, 12(30)
+# CHECK: lwz 4, 16(30)
+
+lwz 3,a@got(30)
+lwz 4,b@got(30)
+
+.data
+a:
+.long _GLOBAL_OFFSET_TABLE_
diff --git a/deps/lld/test/ELF/ppc32-reloc-rel.s b/deps/lld/test/ELF/ppc32-reloc-rel.s
new file mode 100644
index 0000000000000000000000000000000000000000..49d149550aae88cd55de773ffd38e2907a8245e3
--- /dev/null
+++ b/deps/lld/test/ELF/ppc32-reloc-rel.s
@@ -0,0 +1,34 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+
+.section .R_PPC_REL14,"ax",@progbits
+  beq 1f
+1:
+# CHECK-LABEL: section .R_PPC_REL14:
+# CHECK: bt 2, .+4
+
+.section .R_PPC_REL24,"ax",@progbits
+  b 1f
+1:
+# CHECK-LABEL: section .R_PPC_REL24:
+# CHECK: b .+4
+
+.section .R_PPC_REL32,"ax",@progbits
+  .long 1f - .
+1:
+# HEX-LABEL: section .R_PPC_REL32:
+# HEX-NEXT: 10010008 00000004
+
+.section .R_PPC_PLTREL24,"ax",@progbits
+  b 1f@PLT+32768
+1:
+# CHECK-LABEL: section .R_PPC_PLTREL24:
+# CHECK: b .+4
+
+.section .R_PPC_LOCAL24PC,"ax",@progbits
+  b 1f@local
+1:
+# CHECK-LABEL: section .R_PPC_LOCAL24PC:
+# CHECK: b .+4
diff --git a/deps/lld/test/ELF/ppc32-tls-gd.s b/deps/lld/test/ELF/ppc32-tls-gd.s
new file mode 100644
index 0000000000000000000000000000000000000000..6d8372dc4cf08d165c9ac4001e96c95adf2e6401
--- /dev/null
+++ b/deps/lld/test/ELF/ppc32-tls-gd.s
@@ -0,0 +1,98 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc %s -o %t.o
+# RUN: echo '.tbss; .globl b, c; b: .zero 4; c:' | llvm-mc -filetype=obj -triple=powerpc - -o %t1.o
+# RUN: ld.lld -shared -soname=t1.so %t1.o -o %t1.so
+# RUN: echo '.globl __tls_get_addr; __tls_get_addr:' | llvm-mc -filetype=obj -triple=powerpc - -o %tga.o
+
+# RUN: ld.lld -shared %t.o %t1.o -o %t.so
+# RUN: llvm-readobj -d %t.so | FileCheck --check-prefix=GD-DYN %s
+# RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=GD-REL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck --check-prefix=GD %s
+
+# RUN: ld.lld %t.o %t1.o %tga.o -o %t
+# RUN: llvm-readelf -r %t | FileCheck --check-prefix=NOREL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=LE %s
+
+# RUN: ld.lld %t.o %t1.so -o %t
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=IE-REL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=IE %s
+
+## DT_PPC_GOT represents the address of _GLOBAL_OFFSET_TABLE_.
+# GD-DYN: PPC_GOT 0x20078
+
+# GD-REL:      .rela.dyn {
+# GD-REL-NEXT:   0x20078 R_PPC_DTPMOD32 a 0x0
+# GD-REL-NEXT:   0x2007C R_PPC_DTPREL32 a 0x0
+# GD-REL-NEXT:   0x20080 R_PPC_DTPMOD32 b 0x0
+# GD-REL-NEXT:   0x20084 R_PPC_DTPREL32 b 0x0
+# GD-REL-NEXT:   0x20088 R_PPC_DTPMOD32 c 0x0
+# GD-REL-NEXT:   0x2008C R_PPC_DTPREL32 c 0x0
+# GD-REL-NEXT: }
+
+## &DTPMOD(a) - _GLOBAL_OFFSET_TABLE_ = 0x20078 - 0x20078 = 0
+# GD:      addi 3, 31, 0
+# GD-NEXT: bl .+32
+# GD-NEXT: lwz 3, 0(3)
+
+## &DTPMOD(b) - _GLOBAL_OFFSET_TABLE_ = 0x20080 - 0x20078 = 8
+# GD-NEXT: addi 3, 31, 8
+# GD-NEXT: bl .+20
+# GD-NEXT: lwz 3, 0(3)
+
+## &DTPMOD(c) - _GLOBAL_OFFSET_TABLE_ = 0x20088 - 0x20078 = 16
+# GD-NEXT: addi 3, 9, 16
+# GD-NEXT: bl .+8
+# GD-NEXT: lwz 3, 0(3)
+
+# NOREL: no relocations
+
+## a@tprel = 8-0x7000 = -28664
+# LE:      addis 3, 2, 0
+# LE-NEXT: addi 3, 3, -28664
+# LE-NEXT: lwz 3, 0(3)
+## b@tprel = 12-0x7000 = -28660
+# LE-NEXT: addis 3, 2, 0
+# LE-NEXT: addi 3, 3, -28660
+# LE-NEXT: lwz 3, 0(3)
+## c@tprel = 16-0x7000 = -28656
+# LE-NEXT: addis 3, 2, 0
+# LE-NEXT: addi 3, 3, -28656
+# LE-NEXT: lwz 3, 0(3)
+
+# IE-REL:      .rela.dyn {
+# IE-REL-NEXT:   0x10020068 R_PPC_TPREL32 b 0x0
+# IE-REL-NEXT:   0x1002006C R_PPC_TPREL32 c 0x0
+# IE-REL-NEXT: }
+
+## a is relaxed to use LE.
+## a@tprel = st_value(a)-0x8000 = -28664
+# IE:      addis 3, 2, 0
+# IE-NEXT: addi 3, 3, -28664
+# IE-NEXT: lwz 3, 0(3)
+## &.got[0] - _GLOBAL_OFFSET_TABLE_ = 0
+# IE-NEXT: lwz 3, 0(31)
+# IE-NEXT: add 3, 3, 2
+# IE-NEXT: lwz 3, 0(3)
+## &.got[1] - _GLOBAL_OFFSET_TABLE_ = 4
+# IE-NEXT: lwz 3, 4(9)
+# IE-NEXT: add 3, 3, 2
+# IE-NEXT: lwz 3, 0(3)
+
+addi 3, 31, a@got@tlsgd
+bl __tls_get_addr(a@tlsgd)
+lwz 3, 0(3)
+
+addi 3, 31, b@got@tlsgd
+bl __tls_get_addr(b@tlsgd)
+lwz 3, 0(3)
+
+## -fpic may use a different register (e.g. r9).
+addi 3, 9, c@got@tlsgd
+bl __tls_get_addr(c@tlsgd)
+lwz 3, 0(3)
+
+.section .tbss
+.globl a
+.zero 8
+a:
+.zero 4
diff --git a/deps/lld/test/ELF/ppc32-tls-ie.s b/deps/lld/test/ELF/ppc32-tls-ie.s
new file mode 100644
index 0000000000000000000000000000000000000000..ebd6fa37dcd7dfdec84357ce7cc14ef245d5fab3
--- /dev/null
+++ b/deps/lld/test/ELF/ppc32-tls-ie.s
@@ -0,0 +1,67 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc %s -o %t.o
+
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=IE-REL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck --check-prefix=IE %s
+
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-readelf -r %t | FileCheck --check-prefix=NOREL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=LE %s
+
+## A non-preemptable symbol (b) has 0 st_shndx.
+# IE-REL:      .rela.dyn {
+# IE-REL-NEXT:   0x2005C R_PPC_TPREL32 - 0xC
+# IE-REL-NEXT:   0x20058 R_PPC_TPREL32 a 0x0
+# IE-REL-NEXT: }
+
+## &.got[0] - _GLOBAL_OFFSET_TABLE_ = 0
+# IE:      lwz 10, 0(9)
+# IE-NEXT: add 10, 10, 2
+## &.got[1] - _GLOBAL_OFFSET_TABLE_ = 4
+# IE-NEXT: lwz 8, 4(7)
+# IE-NEXT: lbzx 10, 8, 2
+
+# NOREL: no relocations
+
+## a@tprel = st_value(a)-0x7000 = -28664
+## b@tprel = st_value(b)-0x7000 = -28660
+# LE:      addis 10, 2, 0
+# LE-NEXT: addi 10, 10, -28664
+# LE-NEXT: addis 8, 2, 0
+# LE-NEXT: lbz 10, -28660(8)
+
+lwz 10, a@got@tprel(9)
+add 10, 10, a@tls
+
+lwz 8, c@got@tprel(7)
+lbzx 10, 8, c@tls
+
+## In IE, these instructions (op rT, rA, x@tls) are not changed.
+# IE-NEXT: lhzx 12, 2, 2
+# IE-NEXT: lwzx 13, 3, 2
+# IE-NEXT: stbx 14, 4, 2
+# IE-NEXT: sthx 15, 5, 2
+# IE-NEXT: stwx 16, 6, 2
+
+## In LE, these X-Form instructions are changed to their corresponding D-Form.
+# LE-NEXT: lhz 12, -28660(2)
+# LE-NEXT: lwz 13, -28660(3)
+# LE-NEXT: stb 14, -28660(4)
+# LE-NEXT: sth 15, -28660(5)
+# LE-NEXT: stw 16, -28660(6)
+
+lhzx 12, 2, s@tls
+lwzx 13, 3, i@tls
+stbx 14, 4, c@tls
+sthx 15, 5, s@tls
+stwx 16, 6, i@tls
+
+.section .tbss
+.globl a
+.zero 8
+a:
+.zero 4
+c:
+s:
+i:
diff --git a/deps/lld/test/ELF/ppc32-tls-ld.s b/deps/lld/test/ELF/ppc32-tls-ld.s
new file mode 100644
index 0000000000000000000000000000000000000000..cf6be367c8c053b1f6983d2768cc2dfd4a17e944
--- /dev/null
+++ b/deps/lld/test/ELF/ppc32-tls-ld.s
@@ -0,0 +1,82 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc %s -o %t.o
+# RUN: echo '.globl __tls_get_addr; __tls_get_addr:' | llvm-mc -filetype=obj -triple=powerpc - -o %tga.o
+
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=LD-REL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck --check-prefix=LD %s
+
+# RUN: ld.lld %t.o %tga.o -o %t
+# RUN: llvm-readelf -r %t | FileCheck --check-prefix=NOREL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=LE %s
+
+# LD-REL:      .rela.dyn {
+# LD-REL-NEXT:   0x20078 R_PPC_DTPMOD32 - 0x0
+# LD-REL-NEXT: }
+
+## .got - _GLOBAL_OFFSET_TABLE_ = 0
+# LD:      addi 3, 30, 0
+# LD-NEXT: bl .+40
+## a@dtprel = st_value(a)-0x8000 = 65540-0x8000 = 65536*1-32764
+## b@dtprel = st_value(a)-0x8000 = 131080-0x8000 = 65536*2-32760
+# LD-NEXT: addis 9, 3, 1
+# LD-NEXT: addis 10, 3, 2
+# LD-NEXT: addi 9, 9, -32764
+# LD-NEXT: addi 10, 10, -32760
+## small@dtprel = st_value(small)-0x8000 = 4-0x8000 = -32764
+# LD-NEXT: addi 9, 3, -32764
+
+## Check that b@got@tlsld does not allocate another GOT entry.
+## It shares In.Got->TlsIndexOff allocated when processing a@got@tlsld.
+## .got - _GLOBAL_OFFSET_TABLE_ = 0
+# LD-NEXT: addi 3, 9, 0
+# LD-NEXT: bl .+12
+## b@dtprel = st_value(a)-0x8000 = 131080-0x8000 = 65536*2-32760
+# LD-NEXT: addis 29, 3, 2
+# LD-NEXT: addi 29, 29, -32760
+
+## When producing an executable, the LD code sequence can be relaxed to LE.
+## It is the same as GD->LE.
+## tpoff(_TLS_MODULE_BASE_) = 0, tpoff(a) = -8, tpoff(b) = -4
+
+# NOREL: no relocations
+
+## Set r3 to r2+4096
+# LE:      addis 3, 2, 0
+# LE-NEXT: addi 3, 3, 4096
+## a@tprel = 65540-0x7000 = 65536*1-32764
+## b@tprel = 131080-0x7000 = 65536*2-32760
+# LE-NEXT: addis 9, 3, 1
+# LE-NEXT: addis 10, 3, 2
+# LE-NEXT: addi 9, 9, -32764
+# LE-NEXT: addi 10, 10, -32760
+## small@tprel = 4-0x7000 = -32764
+# LE-NEXT: addi 9, 3, -32764
+
+## Set r3 to r2+4096
+# LE-NEXT: addis 3, 2, 0
+# LE-NEXT: addi 3, 3, 4096
+## b@tprel = 131080-0x7000 = 65536*2-32760
+# LE-NEXT: addis 29, 3, 2
+# LE-NEXT: addi 29, 29, -32760
+
+addi 3, 30, a@got@tlsld
+bl __tls_get_addr(a@tlsld)
+addis 9, 3, a@dtprel@ha
+addis 10, 3, b@dtprel@ha
+addi 9, 9, a@dtprel@l
+addi 10, 10, b@dtprel@l
+addi 9, 3, small@dtprel
+
+addi 3, 9, b@got@tlsld
+bl __tls_get_addr(b@tlsld)
+addis 29, 3, b@dtprel@ha
+addi 29, 29, b@dtprel@l
+
+.section .tbss
+.zero 4
+small:
+.zero 65536
+a:
+.zero 65540
+b:
diff --git a/deps/lld/test/ELF/ppc32-tls-le.s b/deps/lld/test/ELF/ppc32-tls-le.s
new file mode 100644
index 0000000000000000000000000000000000000000..e4790eb0e16ebc0113a863d14e4ba70d54caba5c
--- /dev/null
+++ b/deps/lld/test/ELF/ppc32-tls-le.s
@@ -0,0 +1,24 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=LE %s
+
+## a@tprel = st_value(a)-0x7000 = -28664
+## b@tprel = st_value(b)-0x7000 = -28660
+# LE:      addis 9, 2, 0
+# LE-NEXT: addi 9, 9, -28664
+# LE-NEXT: addis 10, 2, 0
+# LE-NEXT: lwz 9, -28660(10)
+
+addis 9, 2, a@tprel@ha
+addi 9, 9, a@tprel@l
+
+addis 10, 2, b@tprel@ha
+lwz 9,b@tprel@l(10)
+
+.section .tbss
+.globl a
+.zero 8
+a:
+.zero 4
+b:
diff --git a/deps/lld/test/ELF/ppc32-weak-undef-call.s b/deps/lld/test/ELF/ppc32-weak-undef-call.s
new file mode 100644
index 0000000000000000000000000000000000000000..303e5a8ac10e51d97a227de49ed0b29354835f01
--- /dev/null
+++ b/deps/lld/test/ELF/ppc32-weak-undef-call.s
@@ -0,0 +1,19 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=EXE %s
+# RUN: ld.lld -pie %t.o -o %t
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=EXE %s
+# RUN: ld.lld -shared %t.o -o %t
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=SHARED %s
+
+## It does not really matter how we fixup it, but we cannot overflow and
+## should not generate a call stub (this would waste space).
+# EXE: bl .+0
+
+## With -shared, create a call stub. ld.bfd produces bl .+0
+# SHARED: bl .+4
+# SHARED: 00000000.plt_pic32.foo:
+
+.weak foo
+bl foo
diff --git a/deps/lld/test/ELF/ppc64-abs32-dyn.s b/deps/lld/test/ELF/ppc64-abs32-dyn.s
new file mode 100644
index 0000000000000000000000000000000000000000..8bfa0dd686c7277018791fdcb9042ecc89a19334
--- /dev/null
+++ b/deps/lld/test/ELF/ppc64-abs32-dyn.s
@@ -0,0 +1,14 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le %s -o %t.o
+# RUN: not ld.lld -shared %t.o -o /dev/null 2>&1 | FileCheck %s
+
+## Test we don't create R_AARCH64_RELATIVE.
+
+# CHECK: error: relocation R_PPC64_ADDR32 cannot be used against symbol hidden; recompile with -fPIC
+
+.globl hidden
+.hidden hidden
+hidden:
+
+.data
+.long hidden
diff --git a/deps/lld/test/ELF/ppc64-abs64-dyn.s b/deps/lld/test/ELF/ppc64-abs64-dyn.s
new file mode 100644
index 0000000000000000000000000000000000000000..f8629c3a156708337d24a32f80023ed827b19a3b
--- /dev/null
+++ b/deps/lld/test/ELF/ppc64-abs64-dyn.s
@@ -0,0 +1,29 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: llvm-readobj -r %t.so | FileCheck %s
+
+# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: llvm-readobj -r %t.so | FileCheck %s
+
+## Test that we create R_PPC64_RELATIVE for R_PPC64_ADDR64 to non-preemptable
+## symbols and R_PPC64_TOC in writable sections.
+
+## FIXME the addend for offset 0x20000 should be TOC base+0x8000+1, not 0x80001.
+# CHECK:      .rela.dyn {
+# CHECK-NEXT:   0x20000 R_PPC64_RELATIVE - 0x8001
+# CHECK-NEXT:   0x20008 R_PPC64_RELATIVE - 0x20001
+# CHECK-NEXT:   0x20010 R_PPC64_ADDR64 external 0x1
+# CHECK-NEXT:   0x20018 R_PPC64_ADDR64 global 0x1
+# CHECK-NEXT: }
+
+.data
+.globl global
+global:
+local:
+
+.quad .TOC.@tocbase + 1
+.quad local + 1
+.quad external + 1
+.quad global + 1
diff --git a/deps/lld/test/ELF/ppc64-addr16-error.s b/deps/lld/test/ELF/ppc64-addr16-error.s
deleted file mode 100644
index 5ffca587d6e5881ca61f006a3430d12c0054d144..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/ppc64-addr16-error.s
+++ /dev/null
@@ -1,13 +0,0 @@
-// REQUIRES: ppc
-
-// RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t
-// RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/ppc64-addr16-error.s -o %t2
-// RUN: not ld.lld -shared %t %t2 -o /dev/null 2>&1 | FileCheck %s
-
-// RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t
-// RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/ppc64-addr16-error.s -o %t2
-// RUN: not ld.lld -shared %t %t2 -o /dev/null 2>&1 | FileCheck %s
-
-.short sym+65539
-
-// CHECK: relocation R_PPC64_ADDR16 out of range: 65539 is not in [-32768, 32767]
diff --git a/deps/lld/test/ELF/ppc64-bsymbolic-toc-restore.s b/deps/lld/test/ELF/ppc64-bsymbolic-toc-restore.s
index 49d347c48992710294ee3d10bdf158b55e29c886..d467d22ff7b1e70723ba33612210fb8769826118 100644
--- a/deps/lld/test/ELF/ppc64-bsymbolic-toc-restore.s
+++ b/deps/lld/test/ELF/ppc64-bsymbolic-toc-restore.s
@@ -53,7 +53,7 @@ caller:
 # CHECK-LABEL: caller
 # CHECK:         bl .+44
 # CHECK-NEXT:    mr 31, 3
-# CHECK-NEXT:    bl .+67108816
+# CHECK-NEXT:    bl .+44
 # CHECK-NEXT:    ld 2, 24(1)
 # CHECK-NEXT:    add 3, 3, 31
 # CHECK-NEXT:    addi 1, 1, 32
@@ -63,6 +63,6 @@ caller:
 # CHECK-EMPTY:
 # CHECK-NEXT:  def:
 # CHECK-NEXT:    addis 2, 12, 2
-# CHECK-NEXT:    addi 2, 2, -32636
+# CHECK-NEXT:    addi 2, 2, -32616
 # CHECK-NEXT:    li 3, 55
 # CHECK-NEXT:    blr
diff --git a/deps/lld/test/ELF/ppc64-call-reach.s b/deps/lld/test/ELF/ppc64-call-reach.s
index a02bfa829933511e235316293c547c39e2e3037a..8a32af07acfdaea050afbcf95c06c1f2ece51b93 100644
--- a/deps/lld/test/ELF/ppc64-call-reach.s
+++ b/deps/lld/test/ELF/ppc64-call-reach.s
@@ -3,16 +3,16 @@
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
 # RUN: ld.lld --defsym callee=0x12010010 --defsym tail_callee=0x12010020 \
 # RUN: %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 # RUN: ld.lld --defsym callee=0x12010010 --defsym tail_callee=0x12010020 \
 # RUN: %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 # RUN: ld.lld --defsym callee=0xE010014 --defsym tail_callee=0xE010024 \
 # RUN: %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck --check-prefix=NEGOFFSET  %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=NEGOFFSET  %s
 # RUN: ld.lld --defsym callee=0x12010018 --defsym tail_callee=0x12010028 \
 # RUN: %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck --check-prefix=THUNK %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=THUNK %s
 # RUN: llvm-readelf --sections %t | FileCheck --check-prefix=BRANCHLT %s
 # RUN: not ld.lld --defsym callee=0x1001002D --defsym tail_callee=0x1001002F \
 # RUN: %t.o -o %t 2>&1 | FileCheck --check-prefix=MISSALIGNED %s
@@ -20,16 +20,16 @@
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
 # RUN: ld.lld --defsym callee=0x12010010 --defsym tail_callee=0x12010020 \
 # RUN: %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 # RUN: ld.lld --defsym callee=0x12010010 --defsym tail_callee=0x12010020 \
 # RUN: %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 # RUN: ld.lld --defsym callee=0xE010014 --defsym tail_callee=0xE010024 \
 # RUN: %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck --check-prefix=NEGOFFSET  %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=NEGOFFSET  %s
 # RUN: ld.lld --defsym callee=0x12010018 --defsym tail_callee=0x12010028 \
 # RUN: %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck --check-prefix=THUNK %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=THUNK %s
 # RUN: llvm-readelf --sections %t | FileCheck --check-prefix=BRANCHLT %s
 # RUN: not ld.lld --defsym callee=0x1001002D --defsym tail_callee=0x1001002F \
 # RUN: %t.o -o %t 2>&1 | FileCheck --check-prefix=MISSALIGNED %s
@@ -58,37 +58,33 @@ test:
 # Check that we are branching to the definitions, and not range-extending
 # thunks.
 # CHECK-LABEL: test
-# CHECK:  10010014: {{.*}}  bl .+33554428
-# CHECK:  10010024: {{.*}}  b  .+33554428
+# CHECK:  10010014:       bl .+33554428
+# CHECK:  10010024:       b  .+33554428
 
 # NEGOFFSET-LABEL: test
-# NEGOFFSET:  10010014: {{.*}}  bl .+33554432
-# NEGOFFSET:  10010024: {{.*}}  b  .+33554432
+# NEGOFFSET:  10010014:       bl .-33554432
+# NEGOFFSET:  10010024:       b  .+33554432
+
+# THUNK-LABEL: test:
+# THUNK: 10010014:       bl .+20
+# THUNK: 10010024:       b .+20
 
 # .branch_lt[0]
 # THUNK-LABEL: __long_branch_callee:
-# THUNK-NEXT: 10010000: {{.*}} addis 12, 2, -1
-# THUNK-NEXT:                  ld 12, -32768(12)
-# THUNK-NEXT:                  mtctr 12
-# THUNK-NEXT:                  bctr
+# THUNK-NEXT: 10010028:       addis 12, 2, 1
+# THUNK-NEXT:                 ld 12, -32768(12)
+# THUNK-NEXT:                 mtctr 12
+# THUNK-NEXT:                 bctr
 
 # .branch_lt[1]
 # THUNK-LABEL: __long_branch_tail_callee:
-# THUNK-NEXT: 10010010: {{.*}} addis 12, 2, -1
-# THUNK-NEXT:                  ld 12, -32760(12)
-# THUNK-NEXT:                  mtctr 12
-# THUNK-NEXT:                  bctr
-
-# Each call now branches to a thunk, and although it is printed as positive
-# the offset is interpreted as a signed 26 bit value so 67108812 is actually
-# -52.
-# THUNK-LABEL: test:
-# THUNK: 10010034: {{.*}}  bl .+67108812
-# THUNK: 10010044: {{.*}}  b .+67108812
+# THUNK-NEXT: 10010038:       addis 12, 2, 1
+# THUNK-NEXT:                 ld 12, -32760(12)
+# THUNK-NEXT:                 mtctr 12
+# THUNK-NEXT:                 bctr
 
 # The offset from the TOC to the .branch_lt section  is (-1 << 16) - 32768.
 #                Name             Type            Address          Off    Size
-# BRANCHLT:     .branch_lt        PROGBITS        0000000010020000 020000 000010
-# BRANCHLT:     .got              PROGBITS        0000000010030000 030000 000008
+# BRANCHLT:     .got              PROGBITS        0000000010020000 020000 000008
+# BRANCHLT:     .branch_lt        PROGBITS        0000000010030000 030000 000010
 # BRANCHLT-NOT: .plt
-
diff --git a/deps/lld/test/ELF/ppc64-dtprel.s b/deps/lld/test/ELF/ppc64-dtprel.s
index e5ac83ac426af8bc4e2369d147f59356eb65bf6b..4bb767a488162ac0fbb812dc88f94fd036c3a6df 100644
--- a/deps/lld/test/ELF/ppc64-dtprel.s
+++ b/deps/lld/test/ELF/ppc64-dtprel.s
@@ -4,15 +4,15 @@
 // RUN: ld.lld -shared %t.o -o %t.so
 // RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
 // RUN: llvm-readelf -r %t.so | FileCheck --check-prefix=OutputRelocs %s
-// RUN: llvm-objdump -D %t.so | FileCheck --check-prefix=Dis %s
-// RUN: llvm-objdump -D %t.so | FileCheck --check-prefix=GotDisLE %s
+// RUN: llvm-readelf -x .got %t.so | FileCheck --check-prefix=HEX-LE %s
+// RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck --check-prefix=Dis %s
 
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
 // RUN: ld.lld -shared %t.o -o %t.so
 // RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
 // RUN: llvm-readelf -r %t.so | FileCheck --check-prefix=OutputRelocs %s
-// RUN: llvm-objdump -D %t.so | FileCheck --check-prefix=Dis %s
-// RUN: llvm-objdump -D %t.so | FileCheck --check-prefix=GotDisBE %s
+// RUN: llvm-readelf -x .got %t.so | FileCheck --check-prefix=HEX-BE %s
+// RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck --check-prefix=Dis %s
 
         .text
         .abiversion 2
@@ -97,15 +97,6 @@ test_not_adjusted:
         mtlr 0
         blr
 
-        .globl test_got_dtprel
-        .p2align 4
-        .type test_got_dtprel,@function
-test_got_dtprel:
-         addis 3, 2, i@got@dtprel@ha
-         ld 3, i@got@dtprel@l(3)
-         addis 3, 2, i@got@dtprel@h
-         addi 3, 2, i@got@dtprel
-
         .section        .debug_addr,"",@progbits
         .quad   i@dtprel+32768
 
@@ -137,10 +128,6 @@ k:
 // InputRelocs: R_PPC64_DTPREL16_HIGHER   {{[0-9a-f]+}} k + 0
 // InputRelocs: R_PPC64_DTPREL16_HI       {{[0-9a-f]+}} k + 0
 // InputRelocs: R_PPC64_DTPREL16_LO       {{[0-9a-f]+}} k + 0
-// InputRelocs: R_PPC64_GOT_DTPREL16_HA    {{[0-9a-f]+}} i + 0
-// InputRelocs: R_PPC64_GOT_DTPREL16_LO_DS {{[0-9a-f]+}} i + 0
-// InputRelocs: R_PPC64_GOT_DTPREL16_HI    {{[0-9a-f]+}} i + 0
-// InputRelocs: R_PPC64_GOT_DTPREL16_DS    {{[0-9a-f]+}} i + 0
 // InputRelocs: Relocation section '.rela.debug_addr'
 // InputRelocs: R_PPC64_DTPREL64          {{[0-9a-f]+}} i + 8000
 
@@ -150,10 +137,19 @@ k:
 // OutputRelocs-NEXT: R_PPC64_DTPMOD64
 
 
-// i@dtprel  --> (1024 - 0x8000) = -31744
-// Dis: test:
-// Dis:    addi 4, 3, -31744
-// Dis:    lwa 4, -31744(3)
+// The got entry for i is at .got+8*3 = 0x420510
+// i@dtprel = 1024 - 0x8000 = -31744 = 0xffffffffffff8400
+// HEX-LE:      section '.got':
+// HEX-LE-NEXT: 4204f8 f8844200 00000000 00000000 00000000
+// HEX-LE-NEXT: 420508 00000000 00000000
+
+// HEX-BE:      section '.got':
+// HEX-BE-NEXT: 4204f8 00000000 004284f8 00000000 00000000
+// HEX-BE-NEXT: 420508 00000000 00000000
+
+// Dis:     test:
+// Dis:      addi 4, 3, -31744
+// Dis-NEXT: lwa 4, -31744(3)
 
 // #k@dtprel(1024 + 4 + 1024 * 1024 * 4) = 0x400404
 
@@ -177,28 +173,3 @@ k:
 // Dis:    oris 4, 4, 63
 // Dis:    ori 4, 4, 33796
 
-// Check for GOT entry for i. There should be a got entry which holds the offset
-// of i relative to the dynamic thread pointer.
-// i@dtprel ->  (1024 - 0x8000) = 0xffff8400
-// GotDisBE: Disassembly of section .got:
-// GotDisBE: 4204f8: 00 00 00 00
-// GotDisBE: 4204fc: 00 42 84 f8
-// GotDisBE: 420510: ff ff ff ff
-// GotDisBE: 420514: ff ff 84 00
-
-// GotDisLE: Disassembly of section .got:
-// GotDisLE: 4204f8: f8 84 42 00
-// GotDisLE: 420510: 00 84 ff ff
-// GotDisLE: 420514: ff ff ff ff
-
-// Check that we have the correct offset to the got entry for i@got@dtprel
-// The got entry for i is 0x420510, and the TOC pointer is 0x4284f8.
-// #ha(i@got@dtprel) --> ((0x420510 - 0x4284f8 + 0x8000) >> 16) & 0xffff = 0
-// #lo(i@got@dtprel) --> (0x420510 - 0x4284f8) & 0xffff = -32744
-// #hi(i@got@dtprel) --> ((0x420510 - 0x4284f8) >> 16) & 0xffff = -1
-// i@got@dtprel --> 0x420510 - 0x4284f8 = -32744
-// Dis: test_got_dtprel:
-// Dis:    addis 3, 2, 0
-// Dis:    ld 3, -32744(3)
-// Dis:    addis 3, 2, -1
-// Dis:    addi 3, 2, -32744
diff --git a/deps/lld/test/ELF/ppc64-dynamic-relocations.s b/deps/lld/test/ELF/ppc64-dynamic-relocations.s
deleted file mode 100644
index 2d9dfc6f804cbdae9024fb2391639dcd4dd593e1..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/ppc64-dynamic-relocations.s
+++ /dev/null
@@ -1,50 +0,0 @@
-// REQUIRES: ppc
-
-// RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-// RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o
-// RUN: ld.lld -shared %t2.o -o %t2.so
-// RUN: ld.lld %t.o %t2.so -o %t
-// RUN: llvm-readobj -dyn-relocations %t | FileCheck %s
-// RUN: llvm-objdump --section-headers %t | FileCheck --check-prefix=DIS %s
-// RUN: llvm-readelf -dynamic-table %t | FileCheck --check-prefix=DT %s
-
-// RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-// RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o
-// RUN: ld.lld -shared %t2.o -o %t2.so
-// RUN: ld.lld %t.o %t2.so -o %t
-// RUN: llvm-readobj -dyn-relocations %t | FileCheck %s
-// RUN: llvm-objdump --section-headers %t | FileCheck --check-prefix=DIS %s
-// RUN: llvm-readelf -dynamic-table %t | FileCheck --check-prefix=DT %s
-
-
-// The dynamic relocation for foo should point to 16 bytes past the start of
-// the .plt section.
-// CHECK: Dynamic Relocations {
-// CHECK-NEXT:    0x10030010 R_PPC64_JMP_SLOT foo 0x0
-
-// There should be 2 reserved doublewords before the first entry. The dynamic
-// linker will fill those in with the address of the resolver entry point and
-// the dynamic object identifier.
-// DIS: Idx Name       Size      Address          Type
-// DIS:     .plt       00000018  0000000010030000 BSS
-
-// DT_PLTGOT should point to the start of the .plt section.
-// DT: 0x0000000000000003 PLTGOT               0x10030000
-
-    .text
-    .abiversion 2
-    .globl  _start
-    .p2align        4
-    .type   _start,@function
-_start:
-.Lfunc_begin0:
-.Lfunc_gep0:
-  addis 2, 12, .TOC.-.Lfunc_gep0@ha
-  addi 2, 2, .TOC.-.Lfunc_gep0@l
-.Lfunc_lep0:
-  .localentry     _start, .Lfunc_lep0-.Lfunc_gep0
-  bl foo
-  nop
-  li 0, 1
-  sc
-  .size _start, .-.Lfunc_begin0
diff --git a/deps/lld/test/ELF/ppc64-entry-point.s b/deps/lld/test/ELF/ppc64-entry-point.s
index 6dbfc53d9abd83c22dc70c0688d2340014a0ca59..0977158a447619060f29669b022aba7089d30a09 100644
--- a/deps/lld/test/ELF/ppc64-entry-point.s
+++ b/deps/lld/test/ELF/ppc64-entry-point.s
@@ -1,14 +1,14 @@
 # REQUIRES: ppc
 
-# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t
-# RUN: ld.lld %t -o %t2
-# RUN: llvm-objdump -D %t2 | FileCheck %s
-# RUN: llvm-objdump -D %t2 | FileCheck -check-prefix=CHECK-LE %s
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 
-# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o %t2
-# RUN: llvm-objdump -D %t2 | FileCheck %s
-# RUN: llvm-objdump -D %t2 | FileCheck -check-prefix=CHECK-BE %s
+# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 
 .text
 .abiversion 2
@@ -23,8 +23,8 @@ _start:
   addi  4, 4, .Lfunc_gep0@l
   # now r4 should contain the address of _start
 
-  lis   5, .TOC.-.Lfunc_gep0@ha
-  addi  5, 5, .TOC.-.Lfunc_gep0@l
+  lis   5, .TOC.-.Lfunc_gep0@ha   # R_PPC64_REL16_HA
+  addi  5, 5, .TOC.-.Lfunc_gep0@l # R_PPC64_REL16_LO
   # now r5 should contain the offset s.t. r4 + r5 = TOC base
 
   # exit 55
@@ -34,16 +34,12 @@ _start:
 .Lfunc_end0:
     .size   _start, .Lfunc_end0-.Lfunc_begin0
 
-// CHECK: 10010000:       {{.*}}     lis 4, 4097
-// CHECK-NEXT: 10010004:       {{.*}}     addi 4, 4, 0
-// CHECK-NEXT: 10010008:       {{.*}}     lis 5, 2
-// CHECK-NEXT: 1001000c:       {{.*}}     addi 5, 5, -32768
+# NM-DAG: 0000000010028000 d .TOC.
+# NM-DAG: 0000000010010000 T _start
 
-// CHECK-LE: Disassembly of section .got:
-// CHECK-LE-NEXT: .got:
-// CHECK-LE-NEXT: 10020000:       00 80 02 10
-
-// CHECK-BE: Disassembly of section .got:
-// CHECK-BE-NEXT: .got:
-// CHECK-BE-NEXT: 10020000:       00 00 00 00 {{.*}}
-// CHECK-BE-NEXT: 10020004:       10 02 80 00 {{.*}}
+# 0x10010000 = (4097<<16) + 0
+# CHECK:      10010000:       lis 4, 4097
+# CHECK-NEXT: 10010004:       addi 4, 4, 0
+# .TOC. - _start = (2<<16) - 32768
+# CHECK-NEXT: 10010008:       lis 5, 2
+# CHECK-NEXT: 1001000c:       addi 5, 5, -32768
diff --git a/deps/lld/test/ELF/ppc64-func-entry-points.s b/deps/lld/test/ELF/ppc64-func-entry-points.s
index 1f23e6650a9ca17c386426df07067d4a6e3599e6..9b9e26ab01c96cca9705bb14046047f2cf00d0a7 100644
--- a/deps/lld/test/ELF/ppc64-func-entry-points.s
+++ b/deps/lld/test/ELF/ppc64-func-entry-points.s
@@ -73,8 +73,8 @@ glob:
 // CHECK: 10010020:       {{.*}}     bl .+144
 // CHECK: 10010034:       {{.*}}     bl .+84
 // CHECK: foo_external_diff:
-// CHECK-NEXT: 10010080:       {{.*}}     addis 2, 12, 2
+// CHECK-NEXT: 10010080:       {{.*}}     addis 2, 12, 1
 // CHECK-NEXT: 10010084:       {{.*}}     addi 2, 2, 32640
-// CHECK-NEXT: 10010088:       {{.*}}     nop
+// CHECK-NEXT: 10010088:       {{.*}}     addis 5, 2, 1
 // CHECK: foo_external_same:
 // CHECK-NEXT: 100100b0:       {{.*}}     add 3, 4, 3
diff --git a/deps/lld/test/ELF/ppc64-gd-to-ie.s b/deps/lld/test/ELF/ppc64-gd-to-ie.s
deleted file mode 100644
index 121032cafdc8c3cb2f950c15df9199f9b0986250..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/ppc64-gd-to-ie.s
+++ /dev/null
@@ -1,104 +0,0 @@
-# REQUIRES: ppc
-
-# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/ppc64-tls.s -o %t2.o
-# RUN: ld.lld -shared %t2.o -o %t3.so
-# RUN: ld.lld  %t.o %t3.so -o %t
-# RUN: llvm-objdump --section-headers %t | FileCheck --check-prefix=CheckGot %s
-# RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s
-# RUN: llvm-readelf -r %t | FileCheck --check-prefix=OutputRelocs %s
-
-# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/ppc64-tls.s -o %t2.o
-# RUN: ld.lld -shared %t2.o -o %t3.so
-# RUN: ld.lld  %t.o %t3.so -o %t
-# RUN: llvm-objdump --section-headers %t | FileCheck --check-prefix=CheckGot %s
-# RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s
-# RUN: llvm-readelf -r %t | FileCheck --check-prefix=OutputRelocs %s
-
-        .text
-        .abiversion 2
-        .globl _start
-        .p2align        4
-        .type   _start,@function
-_start:
-.Lfunc_gep0:
-        addis 2, 12, .TOC.-.Lfunc_gep0@ha
-        addi 2, 2, .TOC.-.Lfunc_gep0@l
-.Lfunc_lep0:
-        .localentry     _start, .Lfunc_lep0-.Lfunc_gep0
-        mflr 0
-        std 0, 16(1)
-        stdu 1, -32(1)
-        addis 3, 2, a@got@tlsgd@ha
-        addi 3, 3, a@got@tlsgd@l
-        bl __tls_get_addr(a@tlsgd)
-        nop
-        lwa 3, 0(3)
-        addi 1, 1, 32
-        ld 0, 16(1)
-        mtlr 0
-        blr
-
-
-        .globl other_reg
-        .p2align        4
-        .type   other_reg,@function
-other_reg:
-.Lfunc_gep1:
-        addis 2, 12, .TOC.-.Lfunc_gep1@ha
-        addi 2, 2, .TOC.-.Lfunc_gep1@l
-.Lfunc_lep1:
-        .localentry     other_reg, .Lfunc_lep1-.Lfunc_gep1
-        mflr 0
-        std 0, 16(1)
-        stdu 1, -32(1)
-        addis 5, 2, a@got@tlsgd@ha
-        addi 3, 5, a@got@tlsgd@l
-        bl __tls_get_addr(a@tlsgd)
-        nop
-        lwa 4, 0(3)
-        addis 30, 2, b@got@tlsgd@ha
-        addi 3, 30, b@got@tlsgd@l
-        bl __tls_get_addr(b@tlsgd)
-        nop
-        lwa 3, 0(3)
-        add 3, 4, 3
-        addi 1, 1, 32
-        ld 0, 16(1)
-        mtlr 0
-        blr
-
-        .globl __tls_get_addr
-        .type __tls_get_addr,@function
-__tls_get_addr:
-
-
-# CheckGot: .got          00000018 00000000100200c0 DATA
-# .got is at 0x100200c0 so the toc-base is 100280c0.
-# `a` is at .got[1], we expect the offsets to be:
-# Ha(a) = ((0x100200c8  - 0x100280c0) + 0x8000) >> 16 = 0
-# Lo(a) = (0x100200c8  - 0x100280c0) = -32760
-
-# Dis-LABEL: _start
-# Dis:         addis 3, 2, 0
-# Dis-NEXT:    ld 3, -32760(3)
-# Dis-NEXT:    nop
-# Dis-NEXT:    add 3, 3, 13
-
-# Dis-LABEL: other_reg
-# Dis:         addis 5, 2, 0
-# Dis-NEXT:    ld 3, -32760(5)
-# Dis-NEXT:    nop
-# Dis-NEXT:    add 3, 3, 13
-# Dis:         addis 30, 2, 0
-# Dis:         ld 3, -32752(30)
-# Dis-NEXT:    nop
-# Dis-NEXT:    add 3, 3, 13
-
-# Verify that the only dynamic relocations we emit are TPREL ones rather then
-# the DTPMOD64/DTPREL64 pair for general-dynamic.
-# OutputRelocs: Relocation section '.rela.dyn' at offset 0x{{[0-9a-f]+}} contains 2 entries:
-# OutputRelocs-NEXT:    Offset             Info             Type               Symbol's Value  Symbol's Name + Addend
-# OutputRelocs-NEXT:  {{[0-9a-f]+}}    {{[0-9a-f]+}}   R_PPC64_TPREL64        {{[0-9a-f]+}} a + 0
-# OutputRelocs-NEXT:  {{[0-9a-f]+}}    {{[0-9a-f]+}}   R_PPC64_TPREL64        {{[0-9a-f]+}} b + 0
diff --git a/deps/lld/test/ELF/ppc64-general-dynamic-tls.s b/deps/lld/test/ELF/ppc64-general-dynamic-tls.s
deleted file mode 100644
index 8ae25a91a087629ee44d7b2007f7ce3962d668af..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/ppc64-general-dynamic-tls.s
+++ /dev/null
@@ -1,112 +0,0 @@
-// REQUIRES: ppc
-
-// RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-// RUN: ld.lld -shared %t.o -o %t.so
-// RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
-// RUN: llvm-readelf -r %t.so | FileCheck --check-prefix=OutputRelocs %s
-// RUN: llvm-objdump --section-headers %t.so | FileCheck --check-prefix=CheckGot %s
-// RUN: llvm-objdump -d %t.so | FileCheck --check-prefix=Dis %s
-
-// RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-// RUN: ld.lld -shared %t.o -o %t.so
-// RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
-// RUN: llvm-readelf -r %t.so | FileCheck --check-prefix=OutputRelocs %s
-// RUN: llvm-objdump --section-headers %t.so | FileCheck --check-prefix=CheckGot %s
-// RUN: llvm-objdump -d %t.so | FileCheck --check-prefix=Dis %s
-
-	.text
-	.abiversion 2
-	.globl	test
-	.p2align	4
-	.type	test,@function
-test:
-.Lfunc_gep0:
-	addis 2, 12, .TOC.-.Lfunc_gep0@ha
-	addi 2, 2, .TOC.-.Lfunc_gep0@l
-.Lfunc_lep0:
-	.localentry	test, .Lfunc_lep0-.Lfunc_gep0
-	mflr 0
-	std 31, -8(1)
-	std 0, 16(1)
-	stdu 1, -48(1)
-	mr 31, 1
-	std 30, 32(31)
-	addis 3, 2, i@got@tlsgd@ha
-	addi 3, 3, i@got@tlsgd@l
-	bl __tls_get_addr(i@tlsgd)
-	nop
-	lwz 30, 0(3)
-	extsw 3, 30
-	ld 30, 32(31)
-	addi 1, 1, 48
-	ld 0, 16(1)
-	ld 31, -8(1)
-	mtlr 0
-	blr
-
-
-test_hi:
-.Lfunc_gep1:
-  addis 2, 12, .TOC.-.Lfunc_gep1@ha
-  addi  2, 2,  .TOC.-.Lfunc_gep1@l
-.Lfunc_lep1:
-  .localentry test2, .Lfunc_lep1-.Lfunc_gep1
-  addis 3, 0, j@got@tlsgd@h
-  blr
-
-test_16:
-.Lfunc_gep2:
-  addis 2, 12, .TOC.-.Lfunc_gep2@ha
-  addi 2, 2, .TOC.-.Lfunc_gep2@l
-.Lfunc_lep2:
-  .localentry test16, .Lfunc_lep2-.Lfunc_gep2
-  addi 3, 0, k@got@tlsgd
-  blr
-
-// Verify that the input has every general-dynamic tls relocation type.
-// InputRelocs:  Relocation section '.rela.text'
-// InputRelocs: R_PPC64_GOT_TLSGD16_HA  {{0+}}  i + 0
-// InputRelocs: R_PPC64_GOT_TLSGD16_LO  {{0+}}  i + 0
-// InputRelocs: R_PPC64_TLSGD           {{0+}}  i + 0
-// InputRelocs: R_PPC64_GOT_TLSGD16_HI  {{0+}}  j + 0
-// InputRelocs: R_PPC64_GOT_TLSGD16     {{0+}}  k + 0
-
-// There is 2 got entries for each tls variable that is accessed with the
-// general-dynamic model.  The entries can be though of as a structure to be
-// filled in by the dynamic linker:
-// typedef struct {
-//  unsigned long int ti_module; --> R_PPC64_DTPMOD64
-//  unsigned long int ti_offset; --> R_PPC64_DTPREL64
-//} tls_index;
-// OutputRelocs: Relocation section '.rela.dyn' at offset 0x{{[0-9a-f]+}} contains 6 entries:
-// OutputRelocs: R_PPC64_DTPMOD64  {{0+}}  i + 0
-// OutputRelocs: R_PPC64_DTPREL64  {{0+}}  i + 0
-// OutputRelocs: R_PPC64_DTPMOD64  {{0+}}  j + 0
-// OutputRelocs: R_PPC64_DTPREL64  {{0+}}  j + 0
-// OutputRelocs: R_PPC64_DTPMOD64  {{0+}}  k + 0
-// OutputRelocs: R_PPC64_DTPREL64  {{0+}}  k + 0
-
-// Check that the got has 7 entires. (1 for the TOC and 3 structures of
-// 2 entries for the tls variables). Also verify the address so we can check
-// the offsets we calculated for each relocation type.
-// CheckGot: got          00000038 00000000000200f0
-
-// got starts at 0x200f0, so .TOC. will be 0x280f0.
-
-// We are building the address of the first tls_index in the got which starts at
-// 0x200f8 (got[1]).
-// #ha(i@got@tlsgd) --> (0x200f8 - 0x280f0 + 0x8000) >> 16 = 0
-// #lo(i@got@tlsgd) --> (0x200f8 - 0x280f0) & 0xFFFF =  -7ff8 = -32760
-// Dis:  test:
-// Dis:    addis 3, 2, 0
-// Dis:    addi 3, 3, -32760
-
-// Second tls_index starts at got[3].
-// #hi(j@got@tlsgd) --> (0x20108 - 0x280f0) >> 16 = -1
-// Dis: test_hi:
-// Dis:   lis 3, -1
-
-// Third tls index is at got[5].
-// k@got@tlsgd --> (0x20118 -  0x280f0) = -0x7fd8 = -32728
-// Dis: test_16:
-// Dis:   li 3, -32728
diff --git a/deps/lld/test/ELF/ppc64-got-indirect.s b/deps/lld/test/ELF/ppc64-got-indirect.s
deleted file mode 100644
index d81700a83dd984bdd6f5eed4e3296016799bc4e1..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/ppc64-got-indirect.s
+++ /dev/null
@@ -1,115 +0,0 @@
-# REQUIRES: ppc
-
-# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-# RUN: llvm-readobj -relocations %t.o | FileCheck -check-prefix=RELOCS-LE %s
-# RUN: ld.lld %t.o -o %t2
-# RUN: llvm-objdump -D %t2 | FileCheck %s --check-prefix=CHECK-LE
-# RUN: llvm-objdump -D %t2 | FileCheck %s
-
-# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-# RUN: llvm-readobj -relocations %t.o | FileCheck -check-prefix=RELOCS-BE %s
-# RUN: ld.lld %t.o -o %t2
-# RUN: llvm-objdump -D %t2 | FileCheck %s --check-prefix=CHECK-BE
-# RUN: llvm-objdump -D %t2 | FileCheck %s
-
-# Make sure we calculate the offset correctly for a got-indirect access to a
-# global variable as described by the PPC64 ELF V2 abi.
-  .text
-  .abiversion 2
-  .globl  _start                    # -- Begin function _start
-  .p2align  4
-  .type  _start,@function
-_start:                                   # @_start
-.Lfunc_begin0:
-.Lfunc_gep0:
-  addis 2, 12, .TOC.-.Lfunc_gep0@ha
-  addi 2, 2, .TOC.-.Lfunc_gep0@l
-.Lfunc_lep0:
-  .localentry  _start, .Lfunc_lep0-.Lfunc_gep0
-# %bb.0:                                # %entry
-  addis 3, 2, .LC0@toc@ha
-  ld 3, .LC0@toc@l(3)
-  li 4, 0
-  stw 4, -12(1)
-  li 0,1
-        lwa 3, 0(3)
-  sc
-  .long  0
-  .quad  0
-.Lfunc_end0:
-  .size  _start, .Lfunc_end0-.Lfunc_begin0
-                                        # -- End function
-  .section  .toc,"aw",@progbits
-.LC0:
-  .tc glob[TC],glob
-  .type  glob,@object            # @glob
-  .data
-  .globl  glob
-  .p2align  2
-glob:
-  .long  55                      # 0x37
-  .size  glob, 4
-
-# Verify the relocations emitted for glob are through the .toc
-
-# RELOCS-LE: Relocations [
-# RELOCS-LE:  .rela.text {
-# RELOCS-LE:     0x0 R_PPC64_REL16_HA .TOC. 0x0
-# RELOCS-LE:     0x4 R_PPC64_REL16_LO .TOC. 0x4
-# RELOCS-LE:     0x8 R_PPC64_TOC16_HA .toc 0x0
-# RELOCS-LE:     0xC R_PPC64_TOC16_LO_DS .toc 0x0
-# RELOCS-LE:   }
-# RELOCS-LE:   .rela.toc {
-# RELOCS-LE:     0x0 R_PPC64_ADDR64 glob 0x0
-# RELOCS-LE:   }
-
-# RELOCS-BE: Relocations [
-# RELOCS-BE:  .rela.text {
-# RELOCS-BE:    0x2 R_PPC64_REL16_HA .TOC. 0x2
-# RELOCS-BE:    0x6 R_PPC64_REL16_LO .TOC. 0x6
-# RELOCS-BE:    0xA R_PPC64_TOC16_HA .toc 0x0
-# RELOCS-BE:    0xE R_PPC64_TOC16_LO_DS .toc 0x0
-# RELOCS-BE:  }
-# RELOCS-BE:  .rela.toc {
-# RELOCS-BE:    0x0 R_PPC64_ADDR64 glob 0x0
-# RELOCS-BE:  }
-# RELOCS-BE:]
-
-# Verify that the global variable access is done through the correct
-# toc entry:
-# r2 = .TOC. = 0x10038000.
-# r3 = r2 - 32760 = 0x10030008 -> .toc entry for glob.
-
-# CHECK: _start:
-# CHECK-NEXT: 10010000:  {{.*}}   addis 2, 12, 3
-# CHECK-NEXT: 10010004:  {{.*}}   addi 2, 2, -32768
-# CHECK-NEXT: 10010008:  {{.*}}   nop
-# CHECK-NEXT: 1001000c:  {{.*}}   ld 3, -32760(2)
-# CHECK: 1001001c:  {{.*}}   lwa 3, 0(3)
-
-# CHECK-LE: Disassembly of section .data:
-# CHECK-LE-NEXT: glob:
-# CHECK-LE-NEXT: 10020000:       37 00 00 00
-
-# CHECK-LE: Disassembly of section .got:
-# CHECK-LE-NEXT: .got:
-# CHECK-LE-NEXT: 10030000:       00 80 03 10
-# CHECK-LE-NEXT: 10030004:       00 00 00 00
-
-# Verify that .toc comes right after .got
-# CHECK-LE: Disassembly of section .toc:
-# CHECK-LE: 10030008:       00 00 02 10
-
-# CHECK-BE: Disassembly of section .data:
-# CHECK-BE-NEXT: glob:
-# CHECK-BE-NEXT: 10020000:       00 00 00 37
-
-# CHECK-BE: Disassembly of section .got:
-# CHECK-BE-NEXT: .got:
-# CHECK-BE-NEXT: 10030000:       00 00 00 00
-# CHECK-BE-NEXT: 10030004:       10 03 80 00
-
-# Verify that .toc comes right after .got
-# CHECK-BE: Disassembly of section .toc:
-# CHECK-BE: 10030008:       00 00 00 00
-# CHECK-BE: 1003000c:       10 02 00 00
diff --git a/deps/lld/test/ELF/ppc64-ifunc.s b/deps/lld/test/ELF/ppc64-ifunc.s
index 6f2d3318b9c28f2379369b6ebad4d5a0f8fea64c..32e317f3c059db46a223e62724ed0fc784e6dd47 100644
--- a/deps/lld/test/ELF/ppc64-ifunc.s
+++ b/deps/lld/test/ELF/ppc64-ifunc.s
@@ -1,79 +1,67 @@
 # REQUIRES: ppc
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o
-# RUN: ld.lld -shared %t2.o -o %t2.so
-# RUN: ld.lld %t.o %t2.so -o %t
-# RUN: llvm-objdump -D %t | FileCheck %s
-# RUN: llvm-readelf -dynamic-table %t | FileCheck --check-prefix=DT %s
-# RUN: llvm-readelf -dyn-relocations %t | FileCheck --check-prefix=DYNREL %s
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-readelf -S %t | FileCheck --check-prefix=SECTIONS %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+# RUN: llvm-readelf -r %t | FileCheck --check-prefix=DYNREL %s
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o
-# RUN: ld.lld -shared %t2.o -o %t2.so
-# RUN: ld.lld %t.o %t2.so -o %t
-# RUN: llvm-objdump -D %t | FileCheck %s
-# RUN: llvm-readelf -dynamic-table %t | FileCheck --check-prefix=DT %s
-# RUN: llvm-readelf -dyn-relocations %t | FileCheck --check-prefix=DYNREL %s
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-readelf -S %t | FileCheck --check-prefix=SECTIONS %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+# RUN: llvm-readelf -r %t | FileCheck --check-prefix=DYNREL %s
 
-# CHECK: Disassembly of section .text:
+# NM-DAG: 0000000010028000 d .TOC.
+# NM-DAG: 0000000010010000 T ifunc
+# NM-DAG: 0000000010010004 T ifunc2
 
-# Tocbase    + (0 << 16) + 32560
-# 0x100280e0 +  0        + 32560 = 0x10030010 (.plt[2])
-# CHECK: __plt_foo:
-# CHECK-NEXT:     std 2, 24(1)
-# CHECK-NEXT:     addis 12, 2, 0
-# CHECK-NEXT:     ld 12, 32560(12)
-# CHECK-NEXT:     mtctr 12
-# CHECK-NEXT:     bctr
-
-# Tocbase    + (0 << 16)  +  32568
-# 0x100280e0 +  0          + 32568 = 0x1003018 (.plt[3])
-# CHECK: __plt_ifunc:
-# CHECK-NEXT:     std 2, 24(1)
-# CHECK-NEXT:     addis 12, 2, 0
-# CHECK-NEXT:     ld 12, 32568(12)
-# CHECK-NEXT:     mtctr 12
-# CHECK-NEXT:     bctr
-
-# CHECK: ifunc:
-# CHECK-NEXT: 10010028:  {{.*}} nop
+# SECTIONS: .plt NOBITS 0000000010030000
 
+# __plt_ifunc - . = 0x10010020 - 0x10010010 = 16
+# __plt_ifunc2 - . = 0x10010044 - 0x10010018 = 28
 # CHECK: _start:
-# CHECK-NEXT:     addis 2, 12, 2
-# CHECK-NEXT:     addi 2, 2, -32588
-# CHECK-NEXT:     bl .+67108812
-# CHECK-NEXT:     ld 2, 24(1)
-# CHECK-NEXT:     bl .+67108824
-# CHECK-NEXT:     ld 2, 24(1)
+# CHECK-NEXT:                 addis 2, 12, 1
+# CHECK-NEXT:                 addi 2, 2, 32760
+# CHECK-NEXT: 10010010:       bl .+16
+# CHECK-NEXT:                 ld 2, 24(1)
+# CHECK-NEXT: 10010018:       bl .+28
+# CHECK-NEXT:                 ld 2, 24(1)
 
-# Check tocbase
-# CHECK:       Disassembly of section .got:
-# CHECK-NEXT:    .got:
-# CHECK-NEXT:    100200e0
+# .plt[0] - .TOC. = 0x10030000 - 0x10028000 = (1<<16) - 32768
+# CHECK: __plt_ifunc:
+# CHECK-NEXT:     std 2, 24(1)
+# CHECK-NEXT:     addis 12, 2, 1
+# CHECK-NEXT:     ld 12, -32768(12)
+# CHECK-NEXT:     mtctr 12
+# CHECK-NEXT:     bctr
 
-# Check .plt address
-# DT_PLTGOT should point to the start of the .plt section.
-# DT: 0x0000000000000003 PLTGOT 0x10030000
+# .plt[1] - .TOC. = 0x10030000+8 - 0x10028000 = (1<<16) - 32760
+# CHECK: __plt_ifunc2:
+# CHECK-NEXT:     std 2, 24(1)
+# CHECK-NEXT:     addis 12, 2, 1
+# CHECK-NEXT:     ld 12, -32760(12)
+# CHECK-NEXT:     mtctr 12
+# CHECK-NEXT:     bctr
 
-# Check that we emit the correct dynamic relocation type for an ifunc
-# DYNREL: 'PLT' relocation section at offset 0x{{[0-9a-f]+}} contains 48 bytes:
-# 48 bytes --> 2 Elf64_Rela relocations
-# DYNREL-NEXT: Offset        Info           Type               Symbol's Value  Symbol's Name + Addend
-# DYNREL-NEXT: {{[0-9a-f]+}} {{[0-9a-f]+}}  R_PPC64_JMP_SLOT      {{0+}}            foo + 0
-# DYNREL-NEXT: {{[0-9a-f]+}} {{[0-9a-f]+}}  R_PPC64_IRELATIVE     10010028
-
-
-    .text
-    .abiversion 2
+# Check that we emit 2 R_PPC64_IRELATIVE.
+# DYNREL: R_PPC64_IRELATIVE       10010000
+# DYNREL: R_PPC64_IRELATIVE       10010004
 
 .type ifunc STT_GNU_IFUNC
 .globl ifunc
 ifunc:
- nop
+  nop
 
-    .global _start
-    .type   _start,@function
+.type ifunc2 STT_GNU_IFUNC
+.globl ifunc2
+ifunc2:
+  nop
+
+.global _start
+.type   _start,@function
 
 _start:
 .Lfunc_gep0:
@@ -81,7 +69,7 @@ _start:
   addi 2, 2, .TOC.-.Lfunc_gep0@l
 .Lfunc_lep0:
   .localentry     _start, .Lfunc_lep0-.Lfunc_gep0
-  bl foo
-  nop
   bl ifunc
   nop
+  bl ifunc2
+  nop
diff --git a/deps/lld/test/ELF/ppc64-initial-exec-tls.s b/deps/lld/test/ELF/ppc64-initial-exec-tls.s
deleted file mode 100644
index 9cdd3e4375c4010fd8f748d894c275bcd39fe4c1..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/ppc64-initial-exec-tls.s
+++ /dev/null
@@ -1,102 +0,0 @@
-// REQUIRES: ppc
-
-// RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-// RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/ppc64-tls.s -o %t2.o
-// RUN: ld.lld -shared %t2.o -o %t2.so
-// RUN: ld.lld -dynamic-linker /lib64/ld64.so.2 %t.o %t2.so -o %t
-// RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
-// RUN: llvm-readelf -r %t | FileCheck --check-prefix=OutputRelocs %s
-// RUN: llvm-objdump --section-headers %t | FileCheck --check-prefix=CheckGot %s
-// RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s
-
-// RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-// RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/ppc64-tls.s -o %t2.o
-// RUN: ld.lld -shared %t2.o -o %t2.so
-// RUN: ld.lld -dynamic-linker /lib64/ld64.so.2 %t.o %t2.so -o %t
-// RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
-// RUN: llvm-readelf -r %t | FileCheck --check-prefix=OutputRelocs %s
-// RUN: llvm-objdump --section-headers %t | FileCheck --check-prefix=CheckGot %s
-// RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s
-
-	.text
-	.abiversion 2
-	.file	"intial_exec.c"
-	.globl	test_initial_exec                    # -- Begin function test_initial_exec
-	.p2align	4
-	.type	test_initial_exec,@function
-test_initial_exec:                                   # @test_initial_exec
-.Lfunc_begin0:
-.Lfunc_gep0:
-	addis 2, 12, .TOC.-.Lfunc_gep0@ha
-	addi 2, 2, .TOC.-.Lfunc_gep0@l
-.Lfunc_lep0:
-	.localentry	test_initial_exec, .Lfunc_lep0-.Lfunc_gep0
-# %bb.0:                                # %entry
-	li 3, 0
-	stw 3, -12(1)
-	addis 3, 2, a@got@tprel@ha
-	ld 3, a@got@tprel@l(3)
-	lwzx 4, 3, a@tls
-	extsw 3, 4
-	blr
-
-
-test_hi:
-.Lfunc_gep1:
-  addis 2, 12, .TOC.-.Lfunc_gep1@ha
-  addi  2, 2,  .TOC.-.Lfunc_gep1@l
-.Lfunc_lep1:
-  .localentry test2, .Lfunc_lep1-.Lfunc_gep1
-  addis 3, 0, b@got@tprel@h
-  blr
-
-test_ds:
-.Lfunc_gep2:
-  addis 2, 12, .TOC.-.Lfunc_gep2@ha
-  addi 2, 2, .TOC.-.Lfunc_gep2@l
-.Lfunc_lep2:
-  .localentry test16, .Lfunc_lep2-.Lfunc_gep2
-  addi 3, 0, c@got@tprel
-  blr
-
-// Verify that the input has every initial-exec tls relocation type.
-// InputRelocs: Relocation section '.rela.text'
-// InputRelocs: R_PPC64_GOT_TPREL16_HA {{0+}} a + 0
-// InputRelocs: R_PPC64_GOT_TPREL16_LO_DS {{0+}} a + 0
-// InputRelocs: R_PPC64_TLS {{0+}} a + 0
-// InputRelocs: R_PPC64_GOT_TPREL16_HI {{0+}} b + 0
-// InputRelocs: R_PPC64_GOT_TPREL16_DS {{0+}} c + 0
-
-// There is a got entry for each tls variable that is accessed with the
-// initial-exec model to be filled in by the dynamic linker.
-// OutputRelocs: Relocation section '.rela.dyn' at offset 0x{{[0-9a-f]+}} contains 3 entries:
-// OutputRelocs: R_PPC64_TPREL64  {{0+}}  a + 0
-// OutputRelocs: R_PPC64_TPREL64  {{0+}}  b + 0
-// OutputRelocs: R_PPC64_TPREL64  {{0+}}  c + 0
-
-// Check that the got has 4 entires. (1 for the TOC and 3 entries for TLS
-// variables). Also verify the address so we can check
-// the offsets we calculated for each relocation type.
-// CheckGot: got          00000020 00000000100200c0
-
-// GOT stats at 0x100200c0, so TOC will be 0x100280c0
-
-// We are building the address of the first TLS got entry which contains the
-// offset of the tls variable relative to the thread pointer.
-// 0x100200c8 (got[1]).
-// #ha(a@got@tprel) --> (0x100200c8 - 0x100280c0 + 0x8000) >> 16 = 0
-// #lo(a@got@tprel)) --> (0x100200c8 - 0x100280c0) & 0xFFFF =  -7ff8 = -32760
-// Dis:  test_initial_exec:
-// Dis:    addis 3, 2, 0
-// Dis:    ld 3, -32760(3)
-// Dis:    lwzx 4, 3, 13
-
-// Second TLS got entry starts at got[2] 0x100200d0
-// #hi(b@got@tprel) --> (0x100200d0 - 0x100280c0) >> 16 = -1
-// Dis: test_hi:
-// Dis:   lis 3, -1
-
-// Third TLS got entry starts at got[3] 0x100200d8.
-// c@got@tprel--> (0x100200d8. -  0x100280c0) = -0x7fe8 = 32744
-// Dis: test_ds:
-// Dis:   li 3, -32744
diff --git a/deps/lld/test/ELF/ppc64-ld-got-dtprel.s b/deps/lld/test/ELF/ppc64-ld-got-dtprel.s
new file mode 100644
index 0000000000000000000000000000000000000000..319c14e42cb94b8e320414257afdbb08418ffd34
--- /dev/null
+++ b/deps/lld/test/ELF/ppc64-ld-got-dtprel.s
@@ -0,0 +1,44 @@
+# REQUIRES: ppc
+
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le %s -o %t.o
+# RUN: llvm-readobj -r %t.o | FileCheck --check-prefix=RELOCS %s
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck %s
+## Check LD->LE relaxation does not affect R_PPC64_GOT_DTPREL16*.
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+
+# RUN: llvm-mc -filetype=obj -triple=powerpc64 %s -o %t.o
+# RUN: llvm-readobj -r %t.o | FileCheck --check-prefix=RELOCS %s
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck %s
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+
+# RELOCS:      .rela.text {
+# RELOCS-NEXT:   R_PPC64_GOT_DTPREL16_HA i 0x0
+# RELOCS-NEXT:   R_PPC64_GOT_DTPREL16_LO_DS i 0x0
+# RELOCS-NEXT:   R_PPC64_GOT_DTPREL16_HI j 0x0
+# RELOCS-NEXT:   R_PPC64_GOT_DTPREL16_DS j 0x0
+# RELOCS-NEXT: }
+
+## ha(i@got@dtprel) = (&.got[0] - (.got+0x8000) + 0x8000 >> 16) & 0xffff = 0
+## lo(i@got@dtprel) = &.got[0] - (.got+0x8000) & 0xffff = -32768
+## hi(j@got@dtprel) = (&.got[1] - (.got+0x8000) >> 16) & 0xffff = -1
+## j@got@dtprel = &.got[1] - (.got+0x8000) = -32760
+# CHECK:      addis 3, 2, 0
+# CHECK-NEXT: ld 3, -32768(3)
+# CHECK-NEXT: addis 3, 2, -1
+# CHECK-NEXT: addi 3, 2, -32760
+
+  addis 3, 2, i@got@dtprel@ha
+  ld 3, i@got@dtprel@l(3)
+  addis 3, 2, j@got@dtprel@h
+  addi 3, 2, j@got@dtprel
+
+.section .tbss,"awT",@progbits
+.p2align 2
+i:
+  .long 0
+j:
+  .long 0
diff --git a/deps/lld/test/ELF/ppc64-local-dynamic.s b/deps/lld/test/ELF/ppc64-local-dynamic.s
index 6ed3b0fd8f076ca6b1a13a4f946d18b9cd064c1a..87e33b784b8b41bd3c1f43aa48d799281fe80405 100644
--- a/deps/lld/test/ELF/ppc64-local-dynamic.s
+++ b/deps/lld/test/ELF/ppc64-local-dynamic.s
@@ -113,7 +113,7 @@ k:
 // Dis:     test:
 // Dis:        addis 3, 2, 0
 // Dis-NEXT:   addi 3, 3, -32760
-// Dis-NEXT:   bl .+67108804
+// Dis-NEXT:   bl .+60
 // Dis-NEXT:   ld 2, 24(1)
 // Dis-NEXT:   addis 3, 3, 0
 // Dis-NEXT:   lwa 3, -32768(3)
diff --git a/deps/lld/test/ELF/ppc64-local-entry.s b/deps/lld/test/ELF/ppc64-local-entry.s
new file mode 100644
index 0000000000000000000000000000000000000000..2a2295169b958b8b09544f0012fb261ce6b8dfd5
--- /dev/null
+++ b/deps/lld/test/ELF/ppc64-local-entry.s
@@ -0,0 +1,47 @@
+# REQUIRES: ppc
+
+# RUN: llvm-mc -filetype=obj -triple=powerpc64 %s -o %t
+# RUN: ld.lld -r %t -o %t2
+# RUN: llvm-objdump -s -section=.symtab %t2 | FileCheck %s
+
+.text
+.abiversion 2
+.globl  _start
+.p2align	2
+.type   _start,@function
+
+_start:
+.Lfunc_begin0:
+.Lfunc_gep0:
+	addis 2, 12, .TOC.-.Lfunc_gep0@ha
+	addi 2, 2, .TOC.-.Lfunc_gep0@l
+.Lfunc_lep0:
+	.localentry	_start, .Lfunc_lep0-.Lfunc_gep0
+	# The code below is not important, it just needs to access some
+	# global data or function, in order to use the TOC.
+	# In this case, it performs the following:
+	# g += 10;
+	# Also note that this code is not intended to be run, but only
+	# to check if the linker will preserve the localentry info.
+	addis 3, 2, g@toc@ha
+	addi 3, 3, g@toc@l
+	lwz 4, 0(3)
+	addi 4, 4, 10
+	stw 4, 0(3)
+	blr
+	.long	0
+	.quad	0
+.Lfunc_end0:
+	.size   _start, .Lfunc_end0-.Lfunc_begin0
+
+	.type	g,@object               # @g
+	.lcomm	g,4,4
+
+// We expect the st_other byte to be 0x60:
+// localentry = 011 (gep + 2 instructions), reserved = 000,
+// visibility = 00 (STV_DEFAULT)
+// Currently, llvm-objdump does not support displaying
+// st_other's PPC64 specific flags, thus we check the
+// result of the hexdump of .symtab section.
+
+// CHECK: 0070 00000000 00000000 00000009 12600001
diff --git a/deps/lld/test/ELF/ppc64-long-branch-init.s b/deps/lld/test/ELF/ppc64-long-branch-init.s
new file mode 100644
index 0000000000000000000000000000000000000000..cc2f73c6666fd8a6e8c724187eff5f801ca27564
--- /dev/null
+++ b/deps/lld/test/ELF/ppc64-long-branch-init.s
@@ -0,0 +1,44 @@
+# REQUIRES: ppc
+
+# RUN: llvm-mc -filetype=obj -triple=powerpc64-pc-freebsd13.0 %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+
+## .init consists of sections from several object files. Sections other than the
+## last one do not have a terminator. Check we do not create a long branch stub
+## in the middle.
+## We currently use thunk section spacing to ensure the stub is in the end. This
+## is not foolproof but good enough to not break in practice.
+
+# CHECK: Disassembly of section .init:
+# CHECK-EMPTY:
+# CHECK-LABEL: _init:
+# CHECK:         blr
+# CHECK-EMPTY:
+# CHECK-LABEL: __long_branch_foo:
+
+.globl foo
+foo:
+  .space 0x2000000
+  blr
+
+.section .init,"ax",@progbits,unique,0
+.globl _init
+_init:
+  stdu 1, -48(1)
+  mflr 0
+  std 0, 64(1)
+
+.section .init,"ax",@progbits,unique,1
+  bl foo
+  nop
+
+.section .init,"ax",@progbits,unique,2
+  bl foo
+  nop
+
+.section .init,"ax",@progbits,unique,3
+  ld 1, 0(1)
+  ld 0, 16(1)
+  mtlr 0
+  blr
diff --git a/deps/lld/test/ELF/ppc64-long-branch-localentry-offset.s b/deps/lld/test/ELF/ppc64-long-branch-localentry-offset.s
new file mode 100644
index 0000000000000000000000000000000000000000..fd37c13db6ba27a5b0096292faa66425f2799662
--- /dev/null
+++ b/deps/lld/test/ELF/ppc64-long-branch-localentry-offset.s
@@ -0,0 +1,30 @@
+# REQUIRES: ppc
+
+# RUN: llvm-mc -filetype=obj -triple=ppc64le %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-nm %t | FileCheck %s
+
+# CHECK-DAG: 0000000010010000 t __long_branch_callee
+# CHECK-DAG: 0000000010010010 T _start
+# CHECK-DAG: 0000000012010008 T callee
+
+# The bl instruction jumps to the local entry. The distance requires a long branch stub:
+# localentry(callee) - _start = 0x12010008+8 - 0x10010010 = 0x2000000
+
+# We used to compute globalentry(callee) - _start and caused a "R_PPC64_REL24
+# out of range" error because we didn't create the stub.
+
+.globl _start
+_start:
+  bl callee
+
+.space 0x1fffff4
+
+.globl callee
+callee:
+.Lgep0:
+  addis 2, 12, .TOC.-.Lgep0@ha
+  addi 2, 2, .TOC.-.Lgep0@l
+.Llep0:
+  .localentry callee, .Llep0-.Lgep0
+  blr
diff --git a/deps/lld/test/ELF/ppc64-long-branch.s b/deps/lld/test/ELF/ppc64-long-branch.s
index db662d926df0914ac9b9d4783fee06342531e13f..bf13b643253df83113e0930616f90755cebd6e09 100644
--- a/deps/lld/test/ELF/ppc64-long-branch.s
+++ b/deps/lld/test/ELF/ppc64-long-branch.s
@@ -1,22 +1,16 @@
 # REQUIRES: ppc
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/ppc64-func-global-entry.s -o %t2.o
-# RUN: ld.lld  -shared %t2.o  -o %t3.so
-# RUN: ld.lld --no-toc-optimize %t.o %t3.so -o %t
-# RUN: llvm-objdump -d -start-address=0x10010000 -stop-address=0x10010018 %t | FileCheck %s -check-prefix=CALLEE_DUMP
-# RUN: llvm-objdump -d -start-address=0x12010020 -stop-address=0x12010084 %t | FileCheck %s -check-prefix=CALLER_DUMP
-# RUN: llvm-objdump -D -start-address=0x12020008 -stop-address=0x12020010 %t | FileCheck %s -check-prefix=BRANCH_LT_LE
-# RUN: llvm-readelf --sections %t | FileCheck %s -check-prefix=SECTIONS
+# RUN: ld.lld --no-toc-optimize %t.o -o %t
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-readelf -x .branch_lt %t | FileCheck %s -check-prefix=BRANCH-LE
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/ppc64-func-global-entry.s -o %t2.o
-# RUN: ld.lld  -shared %t2.o  -o %t3.so
-# RUN: ld.lld --no-toc-optimize %t.o %t3.so -o %t
-# RUN: llvm-objdump -d -start-address=0x10010000 -stop-address=0x10010018 %t | FileCheck %s -check-prefix=CALLEE_DUMP
-# RUN: llvm-objdump -d -start-address=0x12010020 -stop-address=0x12010084 %t | FileCheck %s -check-prefix=CALLER_DUMP
-# RUN: llvm-objdump -D -start-address=0x12020008 -stop-address=0x12020010 %t | FileCheck %s -check-prefix=BRANCH_LT_BE
-# RUN: llvm-readelf --sections %t | FileCheck %s -check-prefix=SECTIONS
+# RUN: ld.lld --no-toc-optimize %t.o -o %t
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-readelf -x .branch_lt %t | FileCheck %s -check-prefix=BRANCH-BE
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 
         .text
         .abiversion 2
@@ -52,24 +46,14 @@ _start:
     std  0, 16(1)
     stdu 1, -32(1)
     bl callee
-    bl foo_external_diff
-    nop
+    bl callee
     addi 1, 1, 32
     ld   0, 16(1)
     mtlr 0
 
-    addis 4, 2, .LC1@toc@ha
-    ld    4, .LC1@toc@l(4)
-    lwz   4, 0(4)
-    add   3, 3, 4
-    blr
-
-
         .section        .toc,"aw",@progbits
 .LC0:
        .tc a[TC],a
-.LC1:
-       .tc b[TC],b
 
 
         .data
@@ -80,42 +64,31 @@ a:
         .long 11
         .size a, 4
 
-        .type b,@object
-        .global b
-        .p2align 2
-b:
-        .long 33
-        .size b, 4
+# NM: 0000000012028000 d .TOC.
 
-# Verify address of the callee
-# CALLEE_DUMP: callee:
-# CALLEE_DUMP:   10010000:  {{.*}}  addis 2, 12, 515
-# CALLEE_DUMP:   10010004:  {{.*}}  addi 2, 2, -32544
-# CALLEE_DUMP:   10010008:  {{.*}}  addis 4, 2, 0
+# Without --toc-optimize, compute the address of .toc[0] first. .toc[0] stores
+# the address of a.
+# .TOC. - callee = 0x12030000 - 0x10010000 = (514<<16) - 32768
+# CHECK: callee:
+# CHECK:   10010000:       addis 2, 12, 514
+# CHECK:   10010004:       addi 2, 2, -32768
+# CHECK:   10010008:       addis 4, 2, 0
 
-# Verify the address of _start, and the call to the long-branch thunk.
-# CALLER_DUMP: _start:
-# CALLER_DUMP:   12010020:  {{.*}}  addis 2, 12, 3
-# CALLER_DUMP:   12010038:  {{.*}}  bl .+56
+# __long_branch_callee - . = 0x12010050 - 0x12010034 = 20
+# __long_branch_callee is not a PLT call stub. Calling it does not need TOC
+# restore, so it doesn't have to be followed by a nop.
+# CHECK: _start:
+# CHECK:   12010034:       bl .+20
+# CHECK:   12010038:       bl .+16
 
-# Verify the thunks contents: TOC-pointer + offset = .branch_lt[0]
-#                             0x120380e8  + (-2 << 16 + 32552) = 0x12020008
-# CALLER_DUMP: __long_branch_callee:
-# CALLER_DUMP:   12010060:  {{.*}}  addis 12, 2, -2
-# CALLER_DUMP:   12010064:  {{.*}}  ld 12, 32552(12)
-# CALLER_DUMP:   12010068:  {{.*}}  mtctr 12
-# CALLER_DUMP:   1201006c:  {{.*}}  bctr
+# BRANCH-LE:     section '.branch_lt':
+# BRANCH-LE-NEXT: 0x12030008 08000110 00000000
+# BRANCH-BE:     section '.branch_lt':
+# BRANCH-BE-NEXT: 0x12030008 00000000 10010008
 
-# BRANCH_LT_LE:     Disassembly of section .branch_lt:
-# BRANCH_LT_LE-NEXT:  .branch_lt:
-# BRANCH_LT_LE-NEXT:  12020008:   08 00 01 10
-# BRANCH_LT_LE-NEXT:  1202000c:   00 00 00 00
-
-# BRANCH_LT_BE:     Disassembly of section .branch_lt:
-# BRANCH_LT_BE-NEXT:  .branch_lt:
-# BRANCH_LT_BE-NEXT:  12020008:   00 00 00 00
-# BRANCH_LT_BE-NEXT:  1202000c:   10 01 00 08
-
-#            [Nr] Name        Type            Address          Off     Size
-# SECTIONS:  [ 9] .branch_lt  PROGBITS        0000000012020008 2020008 000008
-# SECTIONS:  [11] .got        PROGBITS        00000000120300e0 20300e0 000008
+# .branch_lt - .TOC. = 0x12030008 - 0x12028000 = (1<<16) - 32760
+# CHECK:     __long_branch_callee:
+# CHECK-NEXT: 12010048:       addis 12, 2, 1
+# CHECK-NEXT:                 ld 12, -32760(12)
+# CHECK-NEXT:                 mtctr 12
+# CHECK-NEXT:                 bctr
diff --git a/deps/lld/test/ELF/ppc64-plt-stub.s b/deps/lld/test/ELF/ppc64-plt-stub.s
index a644f487b8bed308a74226ecd03db5cd3a888180..44ea40dca8c9c8eb212d95165ad6af3502387fc1 100644
--- a/deps/lld/test/ELF/ppc64-plt-stub.s
+++ b/deps/lld/test/ELF/ppc64-plt-stub.s
@@ -1,28 +1,39 @@
-// REQUIRES: ppc
-
-// RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-// RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o
-// RUN: ld.lld -shared %t2.o -o %t2.so
-// RUN: ld.lld %t.o %t2.so -o %t
-// RUN: llvm-objdump -d %t | FileCheck %s
-
-// RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-// RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o
-// RUN: ld.lld -shared %t2.o -o %t2.so
-// RUN: ld.lld %t.o %t2.so -o %t
-// RUN: llvm-objdump -d %t | FileCheck %s
-
-// CHECK:      Disassembly of section .text:
-// CHECK-NEXT: __plt_foo:
-// CHECK-NEXT:      std 2, 24(1)
-// CHECK-NEXT:      addis 12, 2, 0
-// CHECK-NEXT:      ld 12, 32560(12)
-// CHECK-NEXT:      mtctr 12
-// CHECK-NEXT:      bctr
-
-
-// CHECK:            _start:
-// CHECK:            bl .+67108824
+# REQUIRES: ppc
+
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o
+# RUN: ld.lld -shared %t2.o -soname=t2.so -o %t2.so
+# RUN: ld.lld %t.o %t2.so -o %t
+# RUN: llvm-readelf -S -d %t | FileCheck --check-prefix=SEC %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+
+# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
+# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o
+# RUN: ld.lld -shared %t2.o -soname=t2.so -o %t2.so
+# RUN: ld.lld %t.o %t2.so -o %t
+# RUN: llvm-readelf -S -d %t | FileCheck --check-prefix=SEC %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+
+## DT_PLTGOT points to .plt
+# SEC: .plt NOBITS 0000000010030000 030000 000018
+# SEC: 0x0000000000000003 (PLTGOT) 0x10030000
+
+## .plt[0] holds the address of _dl_runtime_resolve.
+## .plt[1] holds the link map.
+## The JMP_SLOT relocation is stored at .plt[2]
+# RELOC: 0x10030010 R_PPC64_JMP_SLOT foo 0x0
+
+# CHECK:      _start:
+# CHECK:      10010008: bl .+16
+
+# CHECK-LABEL: 0000000010010018 __plt_foo:
+# CHECK-NEXT:      std 2, 24(1)
+# CHECK-NEXT:      addis 12, 2, 0
+# CHECK-NEXT:      ld 12, 32560(12)
+# CHECK-NEXT:      mtctr 12
+# CHECK-NEXT:      bctr
+
+
         .text
         .abiversion 2
         .globl  _start
diff --git a/deps/lld/test/ELF/ppc64-rel-calls.s b/deps/lld/test/ELF/ppc64-rel-calls.s
index 4c79498dc56bdd0f584bce6969cc5a89d02662e1..9c0c21c01fe9c1af99a4a117e0a08947229a0efb 100644
--- a/deps/lld/test/ELF/ppc64-rel-calls.s
+++ b/deps/lld/test/ELF/ppc64-rel-calls.s
@@ -9,6 +9,7 @@
 # RUN: llvm-objdump -d %t2 | FileCheck %s
 
 # CHECK: Disassembly of section .text:
+# CHECK-EMPTY:
 
 .text
 .global _start
@@ -30,9 +31,8 @@ bar:
   nop
   blr
 
-# FIXME: The printing here is misleading, the branch offset here is negative.
-# CHECK: 1001000c:       {{.*}}     bl .+67108852
+# CHECK: 1001000c:       {{.*}}     bl .-12
 # CHECK: 10010010:       {{.*}}     nop
-# CHECK: 10010014:       {{.*}}     bl .+67108844
+# CHECK: 10010014:       {{.*}}     bl .-20
 # CHECK: 10010018:       {{.*}}     nop
 # CHECK: 1001001c:       {{.*}}     blr
diff --git a/deps/lld/test/ELF/ppc64-reloc-addr.s b/deps/lld/test/ELF/ppc64-reloc-addr.s
new file mode 100644
index 0000000000000000000000000000000000000000..f3a7708bc38bc902622b23fea214699f850c8236
--- /dev/null
+++ b/deps/lld/test/ELF/ppc64-reloc-addr.s
@@ -0,0 +1,25 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le %s -o %t.o
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le %S/Inputs/abs255.s -o %t255.o
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le %S/Inputs/abs256.s -o %t256.o
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le %S/Inputs/abs257.s -o %t257.o
+
+# RUN: ld.lld %t.o %t256.o -o %t
+# RUN: llvm-readelf -x .data %t | FileCheck %s
+# CHECK: 0x{{[0-9a-f]+}} ffff0080 ffffffff 00000080
+
+# RUN: not ld.lld %t.o %t255.o -o /dev/null 2>&1 | FileCheck --check-prefix=OVERFLOW1 %s
+# OVERFLOW1: relocation R_PPC64_ADDR16 out of range: -32769 is not in [-32768, 65535]
+# OVERFLOW1: relocation R_PPC64_ADDR32 out of range: -2147483649 is not in [-2147483648, 4294967295]
+
+# RUN: not ld.lld %t.o %t257.o -o /dev/null 2>&1 | FileCheck --check-prefix=OVERFLOW2 %s
+# OVERFLOW2: relocation R_PPC64_ADDR16 out of range: 65536 is not in [-32768, 65535]
+# OVERFLOW2: relocation R_PPC64_ADDR32 out of range: 4294967296 is not in [-2147483648, 4294967295]
+
+.globl _start
+_start:
+.data
+.word foo + 0xfeff
+.word foo - 0x8100
+.long foo + 0xfffffeff
+.long foo - 0x80000100
diff --git a/deps/lld/test/ELF/ppc64-relocs.s b/deps/lld/test/ELF/ppc64-relocs.s
index b439c44466543a79f025c95dbb90221fa5b106f2..5e8c529e96144404dec3b4706ae6f7a4a8461425 100644
--- a/deps/lld/test/ELF/ppc64-relocs.s
+++ b/deps/lld/test/ELF/ppc64-relocs.s
@@ -1,14 +1,14 @@
 # REQUIRES: ppc
 
-# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t
-# RUN: ld.lld %t -o %t2
-# RUN: llvm-objdump -D %t2 | FileCheck %s --check-prefix=DATALE
-# RUN: llvm-objdump -D %t2 | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
+# RUN: ld.lld --no-toc-optimize %t.o -o %t
+# RUN: llvm-readelf -x .rodata -x .R_PPC64_TOC -x .eh_frame %t | FileCheck %s --check-prefix=DATALE
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 
-# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o %t2
-# RUN: llvm-objdump -D %t2 | FileCheck %s --check-prefix=DATABE
-# RUN: llvm-objdump -D %t2 | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
+# RUN: ld.lld --no-toc-optimize %t.o -o %t
+# RUN: llvm-readelf -x .rodata -x .R_PPC64_TOC -x .eh_frame %t | FileCheck %s --check-prefix=DATABE
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 
 .text
 .global _start
@@ -30,154 +30,106 @@ _start:
         .tc .LJTI0_0[TC],.LJTI0_0
 
 .section .R_PPC64_TOC16_LO_DS,"ax",@progbits
-.globl .FR_PPC64_TOC16_LO_DS
-.FR_PPC64_TOC16_LO_DS:
   ld 1, .L1@toc@l(2)
 
-# CHECK: Disassembly of section .R_PPC64_TOC16_LO_DS:
-# CHECK: .FR_PPC64_TOC16_LO_DS:
-# CHECK: 1001000c:       {{.*}}     ld 1, -32768(2)
+# CHECK-LABEL: Disassembly of section .R_PPC64_TOC16_LO_DS:
+# CHECK: 1001000c:       ld 1, -32768(2)
 
 .section .R_PPC64_TOC16_LO,"ax",@progbits
-.globl .FR_PPC64_TOC16_LO
-.FR_PPC64_TOC16_LO:
   addi  1, 2, .L1@toc@l
 
-# CHECK: Disassembly of section .R_PPC64_TOC16_LO:
-# CHECK: .FR_PPC64_TOC16_LO:
-# CHECK: 10010010: {{.*}} addi 1, 2, -32768
+# CHECK-LABEL: Disassembly of section .R_PPC64_TOC16_LO:
+# CHECK: 10010010:       addi 1, 2, -32768
 
 .section .R_PPC64_TOC16_HI,"ax",@progbits
-.globl .FR_PPC64_TOC16_HI
-.FR_PPC64_TOC16_HI:
   addis 1, 2, .L1@toc@h
 
-# CHECK: Disassembly of section .R_PPC64_TOC16_HI:
-# CHECK: .FR_PPC64_TOC16_HI:
-# CHECK: 10010014: {{.*}} addis 1, 2, -1
+# CHECK-LABEL: Disassembly of section .R_PPC64_TOC16_HI:
+# CHECK: 10010014:       addis 1, 2, -1
 
 .section .R_PPC64_TOC16_HA,"ax",@progbits
-.globl .FR_PPC64_TOC16_HA
-.FR_PPC64_TOC16_HA:
   addis 1, 2, .L1@toc@ha
 
-# CHECK: Disassembly of section .R_PPC64_TOC16_HA:
-# CHECK: .FR_PPC64_TOC16_HA:
-# CHECK: 10010018: {{.*}} nop
+# CHECK-LABEL: Disassembly of section .R_PPC64_TOC16_HA:
+# CHECK: 10010018:       addis 1, 2, 0
 
 .section .R_PPC64_REL24,"ax",@progbits
-.globl .FR_PPC64_REL24
-.FR_PPC64_REL24:
-  b .Lfoox
-.section .R_PPC64_REL24_2,"ax",@progbits
-.Lfoox:
+  b 1f
+1:
 
-# CHECK: Disassembly of section .R_PPC64_REL24:
-# CHECK: .FR_PPC64_REL24:
-# CHECK: 1001001c: {{.*}} b .+4
+# CHECK-LABEL: Disassembly of section .R_PPC64_REL24:
+# CHECK: 1001001c:       b .+4
 
 .section .R_PPC64_REL14,"ax",@progbits
-.globl .FR_PPC64_REL14
-.FR_PPC64_REL14:
-  beq .Lfooy
-.section .R_PPC64_REL14_2,"ax",@progbits
-.Lfooy:
+  beq 1f
+1:
 
-# CHECK: Disassembly of section .R_PPC64_REL14:
-# CHECK: .FR_PPC64_REL14:
-# CHECK: 10010020: {{.*}} bt 2, .+4
+# CHECK-LABEL: Disassembly of section .R_PPC64_REL14:
+# CHECK: 10010020:       bt 2, .+4
 
 .section .R_PPC64_ADDR16_LO,"ax",@progbits
-.globl .FR_PPC64_ADDR16_LO
-.FR_PPC64_ADDR16_LO:
   li 1, .Lfoo@l
 
-# CHECK: Disassembly of section .R_PPC64_ADDR16_LO:
-# CHECK: .FR_PPC64_ADDR16_LO:
-# CHECK: 10010024: {{.*}} li 1, 0
+# CHECK-LABEL: Disassembly of section .R_PPC64_ADDR16_LO:
+# CHECK: 10010024:       li 1, 0
 
 .section .R_PPC64_ADDR16_HI,"ax",@progbits
-.globl .FR_PPC64_ADDR16_HI
-.FR_PPC64_ADDR16_HI:
   li 1, .Lfoo@h
 
-# CHECK: Disassembly of section .R_PPC64_ADDR16_HI:
-# CHECK: .FR_PPC64_ADDR16_HI:
-# CHECK: 10010028: {{.*}} li 1, 4097
+# CHECK-LABEL: Disassembly of section .R_PPC64_ADDR16_HI:
+# CHECK: 10010028:       li 1, 4097
 
 .section .R_PPC64_ADDR16_HA,"ax",@progbits
-.globl .FR_PPC64_ADDR16_HA
-.FR_PPC64_ADDR16_HA:
   li 1, .Lfoo@ha
 
-# CHECK: Disassembly of section .R_PPC64_ADDR16_HA:
-# CHECK: .FR_PPC64_ADDR16_HA:
-# CHECK: 1001002c: {{.*}} li 1, 4097
+# CHECK-LABEL: Disassembly of section .R_PPC64_ADDR16_HA:
+# CHECK: 1001002c:       li 1, 4097
 
 .section .R_PPC64_ADDR16_HIGHER,"ax",@progbits
-.globl .FR_PPC64_ADDR16_HIGHER
-.FR_PPC64_ADDR16_HIGHER:
   li 1, .Lfoo@higher
 
-# CHECK: Disassembly of section .R_PPC64_ADDR16_HIGHER:
-# CHECK: .FR_PPC64_ADDR16_HIGHER:
-# CHECK: 10010030: {{.*}} li 1, 0
+# CHECK-LABEL: Disassembly of section .R_PPC64_ADDR16_HIGHER:
+# CHECK: 10010030:       li 1, 0
 
 .section .R_PPC64_ADDR16_HIGHERA,"ax",@progbits
-.globl .FR_PPC64_ADDR16_HIGHERA
-.FR_PPC64_ADDR16_HIGHERA:
   li 1, .Lfoo@highera
 
-# CHECK: Disassembly of section .R_PPC64_ADDR16_HIGHERA:
-# CHECK: .FR_PPC64_ADDR16_HIGHERA:
-# CHECK: 10010034: {{.*}} li 1, 0
+# CHECK-LABEL: Disassembly of section .R_PPC64_ADDR16_HIGHERA:
+# CHECK: 10010034:       li 1, 0
 
 .section .R_PPC64_ADDR16_HIGHEST,"ax",@progbits
-.globl .FR_PPC64_ADDR16_HIGHEST
-.FR_PPC64_ADDR16_HIGHEST:
   li 1, .Lfoo@highest
 
-# CHECK: Disassembly of section .R_PPC64_ADDR16_HIGHEST:
-# CHECK: .FR_PPC64_ADDR16_HIGHEST:
-# CHECK: 10010038: {{.*}} li 1, 0
+# CHECK-LABEL: Disassembly of section .R_PPC64_ADDR16_HIGHEST:
+# CHECK: 10010038:       li 1, 0
 
 .section .R_PPC64_ADDR16_HIGHESTA,"ax",@progbits
-.globl .FR_PPC64_ADDR16_HIGHESTA
-.FR_PPC64_ADDR16_HIGHESTA:
   li 1, .Lfoo@highesta
 
-# CHECK: Disassembly of section .R_PPC64_ADDR16_HIGHESTA:
-# CHECK: .FR_PPC64_ADDR16_HIGHESTA:
-# CHECK: 1001003c: {{.*}} li 1, 0
+# CHECK-LABEL: Disassembly of section .R_PPC64_ADDR16_HIGHESTA:
+# CHECK: 1001003c:       li 1, 0
 
 .section  .R_PPC64_REL32, "ax",@progbits
-.globl .FR_PPC64_REL32
-.FR_PPC64_REL32:
   addis 5, 2, .LC0@toc@ha
   ld 5, .LC0@toc@l(5)
 .LBB0_2:
   add 3, 3, 4
 
-# DATALE: Disassembly of section .rodata:
-# DATALE: .rodata:
-# DATALE: 10000190: b8 fe 00 00
+# DATALE: '.rodata':
+# DATALE: 0x100001c8 80fe0000
 
-# DATABE: Disassembly of section .rodata:
-# DATABE: .rodata:
-# DATABE: 10000190: 00 00 fe b8
+# DATABE: '.rodata':
+# DATABE: 0x100001c8 0000fe80
 
 # Address of rodata + value stored at rodata entry
 # should equal address of LBB0_2.
 # 0x10000190 + 0xfeb4 = 0x10010044
-# CHECK: Disassembly of section .R_PPC64_REL32:
-# CHECK: .FR_PPC64_REL32:
-# CHECK: 10010040: {{.*}} nop
-# CHECK: 10010044: {{.*}} ld 5, -32736(2)
-# CHECK: 10010048: {{.*}} add 3, 3, 4
+# CHECK-LABEL: Disassembly of section .R_PPC64_REL32:
+# CHECK: 10010040:       addis 5, 2, 0
+# CHECK: 10010044:       ld 5, -32736(5)
+# CHECK: 10010048:       add 3, 3, 4
 
 .section .R_PPC64_REL64, "ax",@progbits
-.globl  .FR_PPC64_REL64
-.FR_PPC64_REL64:
         .cfi_startproc
         .cfi_personality 148, __foo
         li 0, 1
@@ -187,18 +139,26 @@ _start:
 __foo:
   li 3,0
 
-# Check that address of eh_frame entry + value stored
-# should equal the address of foo. Since it is not aligned,
-# the entry is not stored exactly at 10000198. It starts at
-# address 0x1000019a and has the value 0xfeaa.
-# 0x100001aa + 0xfeae = 0x10010058
-# DATALE: Disassembly of section .eh_frame:
-# DATALE: .eh_frame:
-# DATALE: 100001a8: {{.*}} ae fe
-
-# DATABE: Disassembly of section .eh_frame:
-# DATABE: .eh_frame:
-# DATABE: 100001b0: fe ae {{.*}}
+.section .R_PPC64_TOC,"a",@progbits
+  .quad .TOC.@tocbase
+
+# SEC: .got PROGBITS 0000000010020000
+
+## tocbase = .got+0x8000 = 0x10028000
+# DATALE-LABEL: section '.R_PPC64_TOC':
+# DATALE: 00800210 00000000
+
+# DATABE-LABEL: section '.R_PPC64_TOC':
+# DATABE: 00000000 10028000
+
+# Check that the personality (relocated by R_PPC64_REL64) in the .eh_frame
+# equals the address of __foo.
+# 0x100001ea + 0xfe6e = 0x10010058
+# DATALE: section '.eh_frame':
+# DATALE: 0x100001e8 {{....}}6efe
+
+# DATABE: section '.eh_frame':
+# DATABE: 0x100001e8 {{[0-9a-f]+ [0-9a-f]+}} fe6e{{....}}
 
 # CHECK: __foo
-# CHECK-NEXT: 10010058: {{.*}} li 3, 0
+# CHECK-NEXT: 10010058:       li 3, 0
diff --git a/deps/lld/test/ELF/ppc64-shared-long_branch.s b/deps/lld/test/ELF/ppc64-shared-long_branch.s
index 34d53147a5514a7434cdeb124553877b0e2113f3..4ffb39251bf6fdbdda819d6c8f09ef4d49a99c87 100644
--- a/deps/lld/test/ELF/ppc64-shared-long_branch.s
+++ b/deps/lld/test/ELF/ppc64-shared-long_branch.s
@@ -83,32 +83,32 @@ b:
 
 # Verify address of the callee
 # CALLEE_DUMP: callee:
-# CALLEE_DUMP:   10000:  {{.*}}  addis 2, 12, 515
+# CALLEE_DUMP:   10000:  {{.*}}  addis 2, 12, 514
 # CALLEE_DUMP:   10004:  {{.*}}  addi 2, 2, -32528
 # CALLEE_DUMP:   10008:  {{.*}}  addis 4, 2, 0
 
 # Verify the address of _start, and the call to the long-branch thunk.
 # CALLER_DUMP: _start:
-# CALLER_DUMP:   2010020:  {{.*}}  addis 2, 12, 3
+# CALLER_DUMP:   2010020:  {{.*}}  addis 2, 12, 2
 # CALLER_DUMP:   2010038:  {{.*}}  bl .+56
 
 # Verify the thunks contents: TOC-pointer + offset = .branch_lt[0]
-#                             0x20380F0   + 32552  = 0x2040018
+#                             0x20280F0   + 32560  = 0x2030020
 # CALLER_DUMP: __long_branch_callee:
 # CALLER_DUMP:   2010060:  {{.*}}  addis 12, 2, 0
-# CALLER_DUMP:   2010064:  {{.*}}  ld 12, 32552(12)
+# CALLER_DUMP:   2010064:  {{.*}}  ld 12, 32560(12)
 # CALLER_DUMP:   2010068:  {{.*}}  mtctr 12
 # CALLER_DUMP:   201006c:  {{.*}}  bctr
 
 # .got section is at address 0x20300f0 so TOC pointer points to 0x20400F0.
 # .plt section has a 2 entry header and a single entry for the long branch.
 #            [Nr] Name        Type            Address          Off     Size
-# SECTIONS:  [11] .got        PROGBITS        00000000020300f0 20300f0 000008
-# SECTIONS:  [13] .plt        NOBITS          0000000002040000 2030108 000018
-# SECTIONS:  [14] .branch_lt  NOBITS          0000000002040018 2030108 000008
+# SECTIONS:  [10] .got        PROGBITS        00000000020200f0 20200f0 000008
+# SECTIONS:  [13] .plt        NOBITS          0000000002030008 2030008 000018
+# SECTIONS:  [14] .branch_lt  NOBITS          0000000002030020 2030008 000008
 
 # There is a relative dynamic relocation for (.plt + 16 bytes), with a base
 # address equal to callees local entry point (0x10000 + 8).
 # DYNRELOC: Relocation section '.rela.dyn' at offset 0x{{[0-9a-f]+}} contains 3 entries:
 # DYNRELOC:    Offset             Info             Type               Symbol's Value
-# DYNRELOC:    0000000002040018   0000000000000016 R_PPC64_RELATIVE   10008
+# DYNRELOC:    0000000002030020   0000000000000016 R_PPC64_RELATIVE   10008
diff --git a/deps/lld/test/ELF/ppc64-sort-small-cm-relocs.s b/deps/lld/test/ELF/ppc64-sort-small-cm-relocs.s
new file mode 100644
index 0000000000000000000000000000000000000000..fbbecc77a37fb2dcf3d4a79e9aef73372313593b
--- /dev/null
+++ b/deps/lld/test/ELF/ppc64-sort-small-cm-relocs.s
@@ -0,0 +1,108 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t1.o
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/ppc64-sort-small-cm-relocs-input2.s -o %t2.o
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/ppc64-sort-small-cm-relocs-input3.s -o %t3.o
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/ppc64-sort-small-cm-relocs-input4.s -o %t4.o
+
+# RUN: ld.lld %t1.o %t2.o %t3.o %t4.o -o %t -Map=%t.map
+# RUN: FileCheck %s < %t.map
+
+# Test an alternate link order.
+# RUN: ld.lld %t2.o %t3.o %t4.o %t1.o -o %t -Map=%t.map
+# RUN: FileCheck %s -check-prefix=ALTERNATE < %t.map
+
+# If a linker script has a sections command then allow that to override the
+# default sorting behavior.
+# RUN: echo "SECTIONS {          \
+# RUN:         .toc : {          \
+# RUN:            *ppc64-sort-small-cm-relocs.s.tmp4.o(.toc*) \
+# RUN:            *ppc64-sort-small-cm-relocs.s.tmp1.o(.toc*)  \
+# RUN:            *(.toc*)       \
+# RUN:          }                \
+# RUN:       } " > %t.script
+# RUN: ld.lld %t1.o %t2.o %t3.o %t4.o -o %t -script %t.script -Map=%t.map
+# RUN: FileCheck %s -check-prefix=SEC-CMD < %t.map
+
+# RUN: echo "SECTIONS { .text : {*(.text*)} } " > %t.script
+# RUN: ld.lld %t1.o %t2.o %t3.o %t4.o -o %t -script %t.script -Map=%t.map
+# RUN: FileCheck %s -check-prefix=SEC-CMD2 < %t.map
+
+# Default sort if the linker script does not have a sections command.
+# RUN: echo "" > %t.script
+# RUN: ld.lld %t1.o %t2.o %t3.o %t4.o -o %t -script %t.script -Map=%t.map
+# RUN: FileCheck %s -check-prefix=NOSEC < %t.map
+    .text
+
+    .global _start
+    .type _start,@function
+_start:
+    li 3, 55
+    blr
+
+    .type a,@object
+    .data
+    .global a
+a:
+    .long 10
+    .size a, 4
+
+    .type c,@object
+    .data
+    .global c
+c:
+    .long  55
+    .size  c, 4
+
+    .type   d,@object
+    .global d
+d:
+    .long 33
+    .size d, 4
+
+    # .toc section contains only some constants.
+    .section        .toc,"aw",@progbits
+    .quad 0xa1a1a1a1a1a1a1a1
+    .quad 0xb2b2b2b2b2b2b2b2
+
+# Input files tmp3.o and tmp4.o contain small code model relocs.
+
+# CHECK:      .got
+# CHECK-NEXT:         <internal>:(.got)
+# CHECK-NEXT: .toc
+# CHECK-NEXT:         {{.*}}3.o:(.toc)
+# CHECK-NEXT:         {{.*}}4.o:(.toc)
+# CHECK-NEXT:         {{.*}}1.o:(.toc)
+# CHECK-NEXT:         {{.*}}2.o:(.toc)
+
+# ALTERNATE:      .got
+# ALTERNATE-NEXT:         <internal>:(.got)
+# ALTERNATE-NEXT: .toc
+# ALTERNATE-NEXT:         {{.*}}3.o:(.toc)
+# ALTERNATE-NEXT:         {{.*}}4.o:(.toc)
+# ALTERNATE-NEXT:         {{.*}}2.o:(.toc)
+# ALTERNATE-NEXT:         {{.*}}1.o:(.toc)
+
+# SEC-CMD:      .got
+# SEC-CMD-NEXT:         <internal>:(.got)
+# SEC-CMD-NEXT: .toc
+# SEC-CMD-NEXT:         {{.*}}4.o:(.toc)
+# SEC-CMD-NEXT:         {{.*}}1.o:(.toc)
+# SEC-CMD-NEXT:         {{.*}}2.o:(.toc)
+# SEC-CMD-NEXT:         {{.*}}3.o:(.toc)
+
+# SEC-CMD2:      .got
+# SEC-CMD2-NEXT:         <internal>:(.got)
+# SEC-CMD2-NEXT: .toc
+# SEC-CMD2-NEXT:         {{.*}}1.o:(.toc)
+# SEC-CMD2-NEXT:         {{.*}}2.o:(.toc)
+# SEC-CMD2-NEXT:         {{.*}}3.o:(.toc)
+# SEC-CMD2-NEXT:         {{.*}}4.o:(.toc)
+
+# NOSEC:      .got
+# NOSEC-NEXT:         <internal>:(.got)
+# NOSEC-NEXT: .toc
+# NOSEC-NEXT:         {{.*}}3.o:(.toc)
+# NOSEC-NEXT:         {{.*}}4.o:(.toc)
+# NOSEC-NEXT:         {{.*}}1.o:(.toc)
+# NOSEC-NEXT:         {{.*}}2.o:(.toc)
+
diff --git a/deps/lld/test/ELF/ppc64-tls-gd-le-small.s b/deps/lld/test/ELF/ppc64-tls-gd-le-small.s
deleted file mode 100644
index f5a1ec6f01d64b72489053b1bef0ece0fab365f6..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/ppc64-tls-gd-le-small.s
+++ /dev/null
@@ -1,61 +0,0 @@
-# REQUIRES: ppc
-
-# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-# RUN: llvm-objdump -d -r %t.o | FileCheck --check-prefix=CHECK-INPUT %s
-# RUN: ld.lld  --defsym __tls_get_addr=0x10001000 %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck --check-prefix=CHECK-DIS %s
-# RUN: llvm-readelf -relocations %t | FileCheck --check-prefix=DYN-RELOCS %s
-
-# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-# RUN: llvm-objdump -d -r %t.o | FileCheck --check-prefix=CHECK-INPUT %s
-# RUN: ld.lld  --defsym __tls_get_addr=0x10001000 %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck --check-prefix=CHECK-DIS %s
-# RUN: llvm-readelf -relocations %t | FileCheck --check-prefix=DYN-RELOCS %s
-
-# Test checks the relaxation of a 'small' general-dynamic tls access into a
-# local-exec tls access.
-
-        .text
-        .abiversion 2
-
-        .global test
-        .p2align    4
-        .type test, @function
-
-test:
-.Lgep:
-    addis 2, 12, .TOC.-.Lgep@ha
-    addi  2, 2,  .TOC.-.Lgep@l
-    .localentry test, .-test
-    mflr 0
-    std 0, 16(1)
-    stdu 1, -32(1)
-    addi 3, 2, a@got@tlsgd
-    bl __tls_get_addr(a@tlsgd)
-    nop
-    lwz 3, 0(3)
-    addi 1, 1, 32
-    ld 0, 16(1)
-    mtlr 0
-    blr
-
-        .type a, @object
-        .section .tdata,"awT",@progbits
-        .global a
-        .p2align 2
-a:
-        .long 55
-        .size a, 4
-
-# CHECK-INPUT:       addi 3, 2, 0
-# CHECK-INPUT-NEXT:  R_PPC64_GOT_TLSGD16  a
-# CHECK-INPUT-NEXT:  bl .+0
-# CHECK-INPUT-NEXT:  R_PPC64_TLSGD        a
-# CHECK-INPUT-NEXT:  R_PPC64_REL24        __tls_get_addr
-
-# CHECK-DIS:      addis 3, 13, 0
-# CHECK-DIS-NEXT: nop
-# CHECK-DIS-NEXT: addi  3, 3, -28672
-# CHECK-DIS-NEXT: lwz 3, 0(3)
-
-# DYN-RELOCS: There are no relocations in this file
diff --git a/deps/lld/test/ELF/ppc64-tls-gd-le.s b/deps/lld/test/ELF/ppc64-tls-gd-le.s
deleted file mode 100644
index 7907d1104a2b888880f35f5eb7ade40d966be489..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/ppc64-tls-gd-le.s
+++ /dev/null
@@ -1,83 +0,0 @@
-// REQUIRES: ppc
-
-// RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-// RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
-// RUN: ld.lld  %t.o -o %t
-// RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s
-// RUN: llvm-readelf -r %t | FileCheck --check-prefix=OutputRelocs %s
-
-// RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-// RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
-// RUN: ld.lld  %t.o -o %t
-// RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s
-// RUN: llvm-readelf -r %t | FileCheck --check-prefix=OutputRelocs %s
-
-	.text
-	.abiversion 2
-	.globl	_start                    # -- Begin function _start
-	.p2align	4
-	.type	_start,@function
-_start:                                   # @_start
-.Lfunc_begin0:
-.Lfunc_gep0:
-	addis 2, 12, .TOC.-.Lfunc_gep0@ha
-	addi 2, 2, .TOC.-.Lfunc_gep0@l
-.Lfunc_lep0:
-	.localentry	_start, .Lfunc_lep0-.Lfunc_gep0
-# %bb.0:                                # %entry
-	mflr 0
-	std 31, -8(1)
-	std 0, 16(1)
-	stdu 1, -64(1)
-	mr 31, 1
-	std 30, 48(31)                  # 8-byte Folded Spill
-	li 3, 0
-	stw 3, 44(31)
-	addis 3, 2, a@got@tlsgd@ha
-	addi 3, 3, a@got@tlsgd@l
-	bl __tls_get_addr(a@tlsgd)
-	nop
-	lwz 30, 0(3)
-	extsw 3, 30
-	ld 30, 48(31)                   # 8-byte Folded Reload
-	addi 1, 1, 64
-	ld 0, 16(1)
-	ld 31, -8(1)
-	mtlr 0
-	blr
-	.long	0
-	.quad	0
-.Lfunc_end0:
-	.size	_start, .Lfunc_end0-.Lfunc_begin0
-
-.globl __tls_get_addr
-.type __tls_get_addr,@function
-__tls_get_addr:
-
-                                        # -- End function
-	.type	a,@object               # @a
-	.section	.tdata,"awT",@progbits
-	.globl	a
-	.p2align	2
-a:
-	.long	55                      # 0x37
-	.size	a, 4
-
-// Verify that the input has general-dynamic tls relocation types
-// InputRelocs:  Relocation section '.rela.text'
-// InputRelocs: R_PPC64_GOT_TLSGD16_HA  {{0+}}  a + 0
-// InputRelocs: R_PPC64_GOT_TLSGD16_LO  {{0+}}  a + 0
-// InputRelocs: R_PPC64_TLSGD           {{0+}}  a + 0
-
-// Verify that the general-dynamic sequence is  relaxed to local exec.
-// #ha(a@tprel) --> (0 - 0x7000 + 0x8000) >> 16 = 0
-// #lo(a@tprel)) --> (0 - 0x7000) &  0xFFFF =  -0x7000 = -28672
-// Dis: _start:
-// Dis: nop
-// Dis: addis 3, 13, 0
-// Dis: nop
-// Dis: addi 3, 3, -28672
-
-// Verify that no general-dynamic relocations exist for the dynamic linker.
-// OutputRelocs-NOT: R_PPC64_DTPMOD64
-// OutputRelocs-NOT: R_PPC64_DTPREL64
diff --git a/deps/lld/test/ELF/ppc64-tls-gd.s b/deps/lld/test/ELF/ppc64-tls-gd.s
new file mode 100644
index 0000000000000000000000000000000000000000..5b9c9edbb0bfce7397c33979b9331a3a6338c873
--- /dev/null
+++ b/deps/lld/test/ELF/ppc64-tls-gd.s
@@ -0,0 +1,102 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le %s -o %t.o
+# RUN: echo '.tbss; .globl b, c; b: .zero 4; c:' | llvm-mc -filetype=obj -triple=powerpc64le - -o %t1.o
+# RUN: ld.lld -shared -soname=t1.so %t1.o -o %t1.so
+
+# RUN: ld.lld -shared %t.o %t1.o -o %t.so
+# RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=GD-REL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck --check-prefix=GD %s
+
+# RUN: ld.lld %t.o %t1.o -o %t
+# RUN: llvm-readelf -r %t | FileCheck --check-prefix=NOREL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=LE %s
+
+# RUN: ld.lld %t.o %t1.so -o %t
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=IE-REL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=IE %s
+
+# GD-REL:      .rela.dyn {
+# GD-REL-NEXT:   0x200F0 R_PPC64_DTPMOD64 a 0x0
+# GD-REL-NEXT:   0x200F8 R_PPC64_DTPREL64 a 0x0
+# GD-REL-NEXT:   0x20100 R_PPC64_DTPMOD64 b 0x0
+# GD-REL-NEXT:   0x20108 R_PPC64_DTPREL64 b 0x0
+# GD-REL-NEXT:   0x20110 R_PPC64_DTPMOD64 c 0x0
+# GD-REL-NEXT:   0x20118 R_PPC64_DTPREL64 c 0x0
+# GD-REL-NEXT: }
+
+## &DTPMOD(a) - .TOC. = &.got[0] - (.got+0x8000) = -32768
+# GD:      addis 3, 2, 0
+# GD-NEXT: addi 3, 3, -32768
+# GD-NEXT: bl .+40
+# GD-NEXT: ld 2, 24(1)
+
+## &DTPMOD(b) - .TOC. = &.got[2] - (.got+0x8000) = -32752
+# GD-NEXT: addis 3, 2, 0
+# GD-NEXT: addi 3, 3, -32752
+# GD-NEXT: bl .+24
+# GD-NEXT: ld 2, 24(1)
+
+## &DTPMOD(b) - .TOC. = &.got[4] - (.got+0x8000) = -32736
+# GD-NEXT: li 3, -32736
+# GD-NEXT: bl .+12
+# GD-NEXT: ld 2, 24(1)
+
+# NOREL: no relocations
+
+## a@tprel = st_value(a)-0x7000 = -28664
+# LE:      nop
+# LE-NEXT: addis 3, 13, 0
+# LE-NEXT: nop
+# LE-NEXT: addi 3, 3, -28664
+## b@tprel = st_value(b)-0x7000 = -28660
+# LE:      nop
+# LE-NEXT: addis 3, 13, 0
+# LE-NEXT: nop
+# LE-NEXT: addi 3, 3, -28660
+## c@tprel = st_value(c)-0x7000 = -28656
+# LE-NEXT: addis 3, 13, 0
+# LE-NEXT: nop
+# LE-NEXT: addi 3, 3, -28656
+
+# IE-REL:      .rela.dyn {
+# IE-REL-NEXT:   0x100200C0 R_PPC64_TPREL64 b 0x0
+# IE-REL-NEXT:   0x100200C8 R_PPC64_TPREL64 c 0x0
+# IE-REL-NEXT: }
+
+## a is relaxed to use LE.
+## a@tprel = st_value(a)-0x7000 = -28664
+# IE:      nop
+# IE-NEXT: addis 3, 13, 0
+# IE-NEXT: nop
+# IE-NEXT: addi 3, 3, -28664
+## &DTPMOD(b) - .TOC. = &.got[0] - (.got+0x8000) = -32768
+# IE-NEXT: addis 3, 2, 0
+# IE-NEXT: ld 3, -32768(3)
+# IE-NEXT: nop
+# IE-NEXT: add 3, 3, 13
+## &DTPMOD(c) - .TOC. = &.got[1] - (.got+0x8000) = -32760
+## r0 is wrong. R_PPC64_GOT_TLS16 cannot be relaxed to IE but the behavior is
+## consistent with ld.bfd
+# IE-NEXT: ld 3, -32760(0)
+# IE-NEXT: nop
+# IE-NEXT: add 3, 3, 13
+
+addis 3, 2, a@got@tlsgd@ha
+addi 3, 3, a@got@tlsgd@l
+bl __tls_get_addr(a@tlsgd)
+nop
+
+addis 3, 2, b@got@tlsgd@ha
+addi 3, 3, b@got@tlsgd@l
+bl __tls_get_addr(b@tlsgd)
+nop
+
+addi 3, 0, c@got@tlsgd
+bl __tls_get_addr(c@tlsgd)
+nop
+
+.section .tbss
+.globl a
+.zero 8
+a:
+.zero 4
diff --git a/deps/lld/test/ELF/ppc64-tls-ie-le.s b/deps/lld/test/ELF/ppc64-tls-ie-le.s
deleted file mode 100644
index 358d3e862b6250dfa8f8a71bc969a7f2a02b760b..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/ppc64-tls-ie-le.s
+++ /dev/null
@@ -1,140 +0,0 @@
-// REQUIRES: ppc
-
-// RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-// RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/ppc64-tls-ie-le.s -o %t2.o
-// RUN: ld.lld -dynamic-linker /lib64/ld64.so.2 %t.o %t2.o -o %t
-// RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
-// RUN: llvm-readelf -r %t | FileCheck --check-prefix=OutputRelocs %s
-// RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s
-
-// RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-// RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/ppc64-tls-ie-le.s -o %t2.o
-// RUN: ld.lld -dynamic-linker /lib64/ld64.so.2 %t.o %t2.o -o %t
-// RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
-// RUN: llvm-readelf -r %t | FileCheck --check-prefix=OutputRelocs %s
-// RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s
-
-	.text
-	.abiversion 2
-test1:                                  # @test1
-	addis 3, 2, c@got@tprel@ha
-	ld 3, c@got@tprel@l(3)
-	lbzx 3, 3, c@tls
-	blr
-test2:                                  # @test2
-	addis 3, 2, s@got@tprel@ha
-	ld 3, s@got@tprel@l(3)
-	lhzx 3, 3, s@tls
-	blr
-test3:                                  # @test3
-	addis 3, 2, i@got@tprel@ha
-	ld 3, i@got@tprel@l(3)
-	lwzx 3, 3, i@tls
-	blr
-test4:                                  # @test4
-	addis 3, 2, l@got@tprel@ha
-	ld 3, l@got@tprel@l(3)
-	ldx 3, 3, l@tls
-	blr
-test5:                                  # @test5
-	addis 4, 2, c@got@tprel@ha
-	ld 4, c@got@tprel@l(4)
-	stbx 3, 4, c@tls
-	blr
-test6:                                  # @test6
-	addis 4, 2, s@got@tprel@ha
-	ld 4, s@got@tprel@l(4)
-	sthx 3, 4, s@tls
-	blr
-test7:                                  # @test7
-	addis 4, 2, i@got@tprel@ha
-	ld 4, i@got@tprel@l(4)
-	stwx 3, 4, i@tls
-	blr
-test8:                                  # @test8
-	addis 4, 2, l@got@tprel@ha
-	ld 4, l@got@tprel@l(4)
-	stdx 3, 4, l@tls
-	blr
-test9:                                  # @test9
-	addis 3, 2, i@got@tprel@ha
-	ld 3, i@got@tprel@l(3)
-	add 3, 3, i@tls
-	blr
-test_ds:                                  # @test_ds
-	ld 4, l@got@tprel(2)
-	stdx 3, 4, l@tls
-	blr
-
-
-// Verify that the input has initial-exec tls relocation types.
-// InputRelocs: Relocation section '.rela.text'
-// InputRelocs: R_PPC64_GOT_TPREL16_HA {{0+}} c + 0
-// InputRelocs: R_PPC64_GOT_TPREL16_LO_DS {{0+}} c + 0
-// InputRelocs: R_PPC64_TLS {{0+}} c + 0
-// InputRelocs: R_PPC64_GOT_TPREL16_HA {{0+}} s + 0
-// InputRelocs: R_PPC64_GOT_TPREL16_LO_DS {{0+}} s + 0
-// InputRelocs: R_PPC64_TLS {{0+}} s + 0
-// InputRelocs: R_PPC64_GOT_TPREL16_HA {{0+}} i + 0
-// InputRelocs: R_PPC64_GOT_TPREL16_LO_DS {{0+}} i + 0
-// InputRelocs: R_PPC64_TLS {{0+}} i + 0
-// InputRelocs: R_PPC64_GOT_TPREL16_HA {{0+}} l + 0
-// InputRelocs: R_PPC64_GOT_TPREL16_LO_DS {{0+}} l + 0
-// InputRelocs: R_PPC64_TLS {{0+}} l + 0
-// InputRelocs: R_PPC64_GOT_TPREL16_DS {{0+}} l + 0
-// InputRelocs: R_PPC64_TLS {{0+}} l + 0
-
-// Verify that no initial-exec relocations exist for the dynamic linker.
-// OutputRelocs-NOT: R_PPC64_TPREL64  {{0+}}  c + 0
-// OutputRelocs-NPT: R_PPC64_TPREL64  {{0+}}  s + 0
-// OutputRelocs-NOT: R_PPC64_TPREL64  {{0+}}  i + 0
-// OutputRelocs-NOT: R_PPC64_TPREL64  {{0+}}  l + 0
-
-// Dis: test1:
-// Dis: nop
-// Dis: addis 3, 13, 0
-// Dis: lbz 3, -28672(3)
-
-// Dis: test2:
-// Dis: nop
-// Dis: addis 3, 13, 0
-// Dis: lhz 3, -28670(3)
-
-// Dis: test3:
-// Dis: nop
-// Dis: addis 3, 13, 0
-// Dis: lwz 3, -28668(3)
-
-// Dis: test4:
-// Dis: nop
-// Dis: addis 3, 13, 0
-// Dis: ld 3, -28664(3)
-
-// Dis: test5:
-// Dis: nop
-// Dis: addis 4, 13, 0
-// Dis: stb 3, -28672(4)
-
-// Dis: test6:
-// Dis: nop
-// Dis: addis 4, 13, 0
-// Dis: sth 3, -28670(4)
-
-// Dis: test7:
-// Dis: nop
-// Dis: addis 4, 13, 0
-// Dis: stw 3, -28668(4)
-
-// Dis: test8:
-// Dis: nop
-// Dis: addis 4, 13, 0
-// Dis: std 3, -28664(4)
-
-// Dis: test9:
-// Dis: nop
-// Dis: addis 3, 13, 0
-// Dis: addi 3, 3, -28668
-
-// Dis: test_ds:
-// Dis: addis 4, 13, 0
-// Dis: std 3, -28664(4)
diff --git a/deps/lld/test/ELF/ppc64-tls-ie.s b/deps/lld/test/ELF/ppc64-tls-ie.s
new file mode 100644
index 0000000000000000000000000000000000000000..aa5509072c316ac932dea9fb3ac27a7b50a7425d
--- /dev/null
+++ b/deps/lld/test/ELF/ppc64-tls-ie.s
@@ -0,0 +1,171 @@
+# REQUIRES: ppc
+
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le %s -o %t.o
+# RUN: llvm-readobj -r %t.o | FileCheck --check-prefix=INPUT-REL %s
+## IE
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=IE-REL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck --check-prefix=IE %s
+## IE -> LE
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-readelf -r %t | FileCheck --check-prefix=NOREL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=LE %s
+
+# RUN: llvm-mc -filetype=obj -triple=powerpc64 %s -o %t.o
+# RUN: llvm-readobj -r %t.o | FileCheck --check-prefix=INPUT-REL %s
+## IE
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=IE-REL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck --check-prefix=IE %s
+## IE -> LE
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-readelf -r %t | FileCheck --check-prefix=NOREL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=LE %s
+
+# IE-REL:      .rela.dyn {
+# IE-REL-NEXT:   0x200B0 R_PPC64_TPREL64 c 0x0
+# IE-REL-NEXT:   0x200C0 R_PPC64_TPREL64 i 0x0
+# IE-REL-NEXT:   0x200C8 R_PPC64_TPREL64 l 0x0
+# IE-REL-NEXT:   0x200B8 R_PPC64_TPREL64 s 0x0
+# IE-REL-NEXT: }
+
+# INPUT-REL: R_PPC64_GOT_TPREL16_HA c 0x0
+# INPUT-REL: R_PPC64_GOT_TPREL16_LO_DS c 0x0
+# INPUT-REL: R_PPC64_TLS c 0x0
+## &.got[0] - .TOC. = -32768
+# IE-LABEL: test1:
+# IE-NEXT:  addis 3, 2, 0
+# IE-NEXT:  ld 3, -32768(3)
+# IE-NEXT:  lbzx 3, 3, 13
+# LE-LABEL: test1:
+# LE-NEXT:   nop
+# LE-NEXT:   addis 3, 13, 0
+# LE-NEXT:   lbz 3, -28672(3)
+test1:
+  addis 3, 2, c@got@tprel@ha
+  ld 3, c@got@tprel@l(3)
+  lbzx 3, 3, c@tls
+
+# INPUT-REL: R_PPC64_GOT_TPREL16_HA s 0x0
+# INPUT-REL: R_PPC64_GOT_TPREL16_LO_DS s 0x0
+# INPUT-REL: R_PPC64_TLS s 0x0
+## &.got[1] - .TOC. = -32760
+# IE-LABEL: test2:
+# IE-NEXT:  addis 3, 2, 0
+# IE-NEXT:  ld 3, -32760(3)
+# IE-NEXT:  lhzx 3, 3, 13
+# LE-LABEL: test2:
+# LE-NEXT:  nop
+# LE-NEXT:  addis 3, 13, 0
+# LE-NEXT:  lhz 3, -28670(3)
+test2:
+  addis 3, 2, s@got@tprel@ha
+  ld 3, s@got@tprel@l(3)
+  lhzx 3, 3, s@tls
+
+# INPUT-REL: R_PPC64_GOT_TPREL16_HA i 0x0
+# INPUT-REL: R_PPC64_GOT_TPREL16_LO_DS i 0x0
+# INPUT-REL: R_PPC64_TLS i 0x0
+## &.got[2] - .TOC. = -32752
+# IE-LABEL: test3:
+# IE-NEXT:  addis 3, 2, 0
+# IE-NEXT:  ld 3, -32752(3)
+# IE-NEXT:  lwzx 3, 3, 13
+# LE-LABEL: test3:
+# LE-NEXT:  nop
+# LE-NEXT:  addis 3, 13, 0
+# LE-NEXT:  lwz 3, -28668(3)
+test3:
+  addis 3, 2, i@got@tprel@ha
+  ld 3, i@got@tprel@l(3)
+  lwzx 3, 3, i@tls
+
+# INPUT-REL: R_PPC64_GOT_TPREL16_HA l 0x0
+# INPUT-REL: R_PPC64_GOT_TPREL16_LO_DS l 0x0
+# INPUT-REL: R_PPC64_TLS l 0x0
+## &.got[3] - .TOC. = -32744
+# IE-LABEL: test4:
+# IE-NEXT:  addis 3, 2, 0
+# IE-NEXT:  ld 3, -32744(3)
+# IE-NEXT:  ldx 3, 3, 13
+# LE-LABEL: test4:
+# LE-NEXT:  nop
+# LE-NEXT:  addis 3, 13, 0
+# LE-NEXT:  ld 3, -28664(3)
+test4:
+  addis 3, 2, l@got@tprel@ha
+  ld 3, l@got@tprel@l(3)
+  ldx 3, 3, l@tls
+
+# LE-LABEL: test5:
+# LE-NEXT:  nop
+# LE-NEXT:  addis 4, 13, 0
+# LE-NEXT: stb 3, -28672(4)
+test5:
+  addis 4, 2, c@got@tprel@ha
+  ld 4, c@got@tprel@l(4)
+  stbx 3, 4, c@tls
+
+
+# LE-LABEL: test6:
+# LE-NEXT:  nop
+# LE-NEXT:  addis 4, 13, 0
+# LE-NEXT: sth 3, -28670(4)
+test6:
+  addis 4, 2, s@got@tprel@ha
+  ld 4, s@got@tprel@l(4)
+  sthx 3, 4, s@tls
+
+
+# LE-LABEL: test7:
+# LE-NEXT:  nop
+# LE-NEXT:  addis 4, 13, 0
+# LE-NEXT: stw 3, -28668(4)
+test7:
+  addis 4, 2, i@got@tprel@ha
+  ld 4, i@got@tprel@l(4)
+  stwx 3, 4, i@tls
+
+# LE-LABEL: test8:
+# LE-NEXT:  nop
+# LE-NEXT:  addis 4, 13, 0
+# LE-NEXT: std 3, -28664(4)
+test8:
+  addis 4, 2, l@got@tprel@ha
+  ld 4, l@got@tprel@l(4)
+  stdx 3, 4, l@tls
+
+# LE-LABEL: test9:
+# LE-NEXT:  nop
+# LE-NEXT:  addis 3, 13, 0
+# LE-NEXT:  addi 3, 3, -28668
+test9:
+  addis 3, 2, i@got@tprel@ha
+  ld 3, i@got@tprel@l(3)
+  add 3, 3, i@tls
+
+# LE-LABEL: test_ds:
+# LE-NEXT:  addis 4, 13, 0
+# LE-NEXT: std 3, -28664(4)
+test_ds:
+  ld 4, l@got@tprel(2)
+  stdx 3, 4, l@tls
+
+# NOREL: There are no relocations in this file.
+
+.section .tdata,"awT",@progbits
+.globl c, s, i, l
+c:
+.byte 97
+
+.p2align 1
+s:
+.short 55
+
+.p2align 2
+i:
+.long 55
+
+.p2align 3
+l:
+.quad 55
diff --git a/deps/lld/test/ELF/ppc64-tls-ld-le.s b/deps/lld/test/ELF/ppc64-tls-ld-le.s
index b684515e8b04134396c7d1351ea6cb743290a256..f348bb9a4f439ade8f6e8afa3a703094d491981b 100644
--- a/deps/lld/test/ELF/ppc64-tls-ld-le.s
+++ b/deps/lld/test/ELF/ppc64-tls-ld-le.s
@@ -3,13 +3,13 @@
 // RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
 // RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
 // RUN: ld.lld  %t.o -o %t
-// RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s
+// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=Dis %s
 // RUN: llvm-readelf -r %t | FileCheck --check-prefix=OutputRelocs %s
 
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
 // RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
 // RUN: ld.lld  %t.o -o %t
-// RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s
+// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=Dis %s
 // RUN: llvm-readelf -r %t | FileCheck --check-prefix=OutputRelocs %s
 
 	.text
@@ -52,9 +52,7 @@ _start:                                   # @_start
 .Lfunc_end0:
 	.size	_start, .Lfunc_end0-.Lfunc_begin0
                                         # -- End function
-.globl __tls_get_addr
-.type __tls_get_addr,@function
-__tls_get_addr:
+
 	.type	a,@object               # @a
 	.section	.tdata,"awT",@progbits
 	.p2align	2
diff --git a/deps/lld/test/ELF/ppc64-tls-ld-preemptable.s b/deps/lld/test/ELF/ppc64-tls-ld-preemptable.s
new file mode 100644
index 0000000000000000000000000000000000000000..8070f2a1a03206269e8d131e66243a0806873a4c
--- /dev/null
+++ b/deps/lld/test/ELF/ppc64-tls-ld-preemptable.s
@@ -0,0 +1,35 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=ppc64le %s -o %t.o
+# RUN: ld.lld %t.o -shared -o %t.so
+# RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck %s
+# RUN: llvm-nm %t.so | FileCheck --check-prefix=NM %s
+# RUN: llvm-readelf -x .rodata %t.so | FileCheck --check-prefix=RODATA %s
+
+# 0x2a - 0x8000 = -32726
+# CHECK:      addis 4, 3, 0
+# CHECK-NEXT: addi 4, 4, -32726
+# CHECK-NEXT: lis 5, 0
+# CHECK-NEXT: ori 5, 5, 0
+
+# NM: 000000000000002a B i
+# RODATA: 2a000000 00000000
+
+# We used to error on R_PPC64_DTPREL* to preemptable symbols.
+# i is STB_GLOBAL and preemptable.
+.globl foo
+foo:
+  addis 4, 3, i@dtprel@ha # R_PPC64_DTPREL16_HA
+  addi 4, 4, i@dtprel@l   # R_PPC64_DTPREL16_LO
+
+  lis 5, i@dtprel@highesta # R_PPC64_DTPREL16_HIGHESTA
+  ori 5, 5, i@dtprel@highera # R_PPC64_DTPREL16_HIGHERA
+
+.section .rodata,"a",@progbits
+  .quad i@dtprel+32768
+
+.section .tbss,"awT",@nobits
+  .space 0x2a
+.globl i
+i:
+  .long 0
+  .size i, 4
diff --git a/deps/lld/test/ELF/ppc64-toc-addis-nop-lqsq.s b/deps/lld/test/ELF/ppc64-toc-addis-nop-lqsq.s
index da57f38804a4de434c47fb5d1fefe8bf51bd79ce..07c41cc32dfc7b77999fe60dd695f62aaeba2954 100644
--- a/deps/lld/test/ELF/ppc64-toc-addis-nop-lqsq.s
+++ b/deps/lld/test/ELF/ppc64-toc-addis-nop-lqsq.s
@@ -6,10 +6,10 @@
 # RUN: ld.lld -shared %t2.o -o %t2.so
 
 # RUN: ld.lld  %t2.so %p/Inputs/ppc64le-quadword-ldst.o -o %t
-# RUN: llvm-objdump -D %t | FileCheck --check-prefix=Dis %s
+# RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s
 
 # RUN: ld.lld --no-toc-optimize %t2.so %p/Inputs/ppc64le-quadword-ldst.o -o %t
-# RUN: llvm-objdump -D %t | FileCheck --check-prefix=NoOpt %s
+# RUN: llvm-objdump -d %t | FileCheck --check-prefix=NoOpt %s
 
 # QuadInputRelocs: Relocation section '.rela.text'
 # QuadInputRelocs:  R_PPC64_TOC16_LO_DS    0000000000000000 quadLd
@@ -70,4 +70,3 @@
 # NoOpt-NEXT:    addis 3, 2, 0
 # NoOpt-NEXT:    82 7f 83 f8  <unknown>
 # NoOpt-NEXT:    blr
-
diff --git a/deps/lld/test/ELF/ppc64-toc-addis-nop.s b/deps/lld/test/ELF/ppc64-toc-addis-nop.s
index a8c850ca2593b8a9297c020df90f28c8f37210b8..76c45b192faaefdaae6e55ef2c19dc86344c4f6a 100644
--- a/deps/lld/test/ELF/ppc64-toc-addis-nop.s
+++ b/deps/lld/test/ELF/ppc64-toc-addis-nop.s
@@ -1,16 +1,16 @@
 # REQUIRES: ppc
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-# RUN: llvm-readelf -relocations --wide %t.o | FileCheck --check-prefix=InputRelocs %s
+# RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o
 # RUN: ld.lld -shared %t2.o -o %t2.so
 #
 # RUN: ld.lld  %t2.so %t.o -o %t
-# RUN: llvm-objdump -D %t | FileCheck --check-prefix=Dis %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=Dis %s
 #
 # RUN: ld.lld --no-toc-optimize %t2.so %t.o -o %t
-# RUN: llvm-objdump -D %t | FileCheck --check-prefix=NoOpt %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=NoOpt %s
 
 # InputRelocs:  Relocation section '.rela.text'
 # InputRelocs:   R_PPC64_TOC16_HA
@@ -35,7 +35,7 @@ bytes:
         addis 4, 2, byteSt@toc@ha
         stb   3,    byteSt@toc@l(4)
         blr
-# Dis-LABEL: bytes
+# Dis-LABEL: bytes:
 # Dis-NEXT:   addis
 # Dis-NEXT:   addi
 # Dis-NEXT:   nop
@@ -44,7 +44,7 @@ bytes:
 # Dis-NEXT:   stb   3, 32625(2)
 # Dis-NEXT:   blr
 
-# NoOpt-LABEL: bytes
+# NoOpt-LABEL: bytes:
 # NoOpt-NEXT:     addis
 # NoOpt-NEXT:     addi
 # NoOpt-NEXT:     addis 3, 2, 0
@@ -69,7 +69,7 @@ halfs:
         addis 5, 2, halfSt@toc@ha
         sth   4,    halfSt@toc@l(5)
         blr
-# Dis-LABEL: halfs
+# Dis-LABEL: halfs:
 # Dis-NEXT:   addis
 # Dis-NEXT:   addi
 # Dis-NEXT:   nop
@@ -80,7 +80,7 @@ halfs:
 # Dis-NEXT:   sth 4, 32628(2)
 # Dis-NEXT:   blr
 
-# NoOpt-LABEL: halfs
+# NoOpt-LABEL: halfs:
 # NoOpt-NEXT:   addis
 # NoOpt-NEXT:   addi
 # NoOpt-NEXT:   addis 3, 2, 0
@@ -178,7 +178,7 @@ vec_dq:
         stxv  3,    vecSt@toc@l(3)
         blr
 
-# Dis-LABEL: vec_dq
+# Dis-LABEL: vec_dq:
 # Dis-NEXT:    addis
 # Dis-NEXT:    addi
 # Dis-NEXT:    nop
@@ -187,7 +187,7 @@ vec_dq:
 # Dis-NEXT:    stxv 3, 32672(2)
 # Dis-NEXT:    blr
 
-# NoOpt-LABEL: vec_dq
+# NoOpt-LABEL: vec_dq:
 # NoOpt-NEXT:    addis
 # NoOpt-NEXT:    addi
 # NoOpt-NEXT:    addis 3, 2, 0
@@ -214,7 +214,7 @@ vec_ds:
         addis  3, 2, vecSt@toc@ha
         stxssp 3,    vecSt@toc@l(3)
         blr
-# Dis-LABEL: vec_ds
+# Dis-LABEL: vec_ds:
 # Dis-NEXT:   addis
 # Dis-NEXT:   addi
 # Dis-NEXT:   nop
@@ -227,7 +227,7 @@ vec_ds:
 # Dis-NEXT:   stxssp 3, 32672(2)
 # Dis-NEXT:   blr
 
-# NoOpt-LABEL: vec_ds
+# NoOpt-LABEL: vec_ds:
 # NoOpt-NEXT:   addis
 # NoOpt-NEXT:   addi
 # NoOpt-NEXT:   addis 3, 2, 0
diff --git a/deps/lld/test/ELF/ppc64-toc-rel.s b/deps/lld/test/ELF/ppc64-toc-rel.s
index 5769e43fbb91ec88753b422474963e669012a9e8..7dccaa970db88c2a6f99b77a7a6f697f09eed56c 100644
--- a/deps/lld/test/ELF/ppc64-toc-rel.s
+++ b/deps/lld/test/ELF/ppc64-toc-rel.s
@@ -1,16 +1,18 @@
 # REQUIRES: ppc
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-# RUN: llvm-readobj -relocations %t.o | FileCheck -check-prefix=RELOCS-LE %s
-# RUN: ld.lld %t.o -o %t2
-# RUN: llvm-objdump -D %t2 | FileCheck %s
-# RUN: llvm-objdump -D %t2 | FileCheck -check-prefix=CHECK-LE %s
+# RUN: llvm-readobj -r %t.o | FileCheck -check-prefix=RELOCS-LE %s
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-readelf -x .got %t | FileCheck --check-prefix=HEX-LE %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=CHECK %s
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-# RUN: llvm-readobj -relocations %t.o | FileCheck -check-prefix=RELOCS-BE %s
-# RUN: ld.lld %t.o -o %t2
-# RUN: llvm-objdump -D %t2 | FileCheck %s
-# RUN: llvm-objdump -D %t2 | FileCheck -check-prefix=CHECK-BE %s
+# RUN: llvm-readobj -r %t.o | FileCheck -check-prefix=RELOCS-BE %s
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-readelf -x .got %t | FileCheck --check-prefix=HEX-BE %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=CHECK %s
 
 # Make sure we calculate the offset correctly for a toc-relative access to a
 # global variable as described by the PPC64 Elf V2 abi.
@@ -57,26 +59,19 @@ _start:
 # RELOCS-BE:          0xA R_PPC64_TOC16_HA global_a 0x0
 # RELOCS-BE:          0xE R_PPC64_TOC16_LO global_a 0x0
 
-# Want to check _start for the values used to build the offset from the TOC base
-# to global_a. The .TOC. symbol is expected at address 0x10030000, and the
-# TOC base is address-of(.TOC.) + 0x8000.  The expected offset is:
-# 0x10020000(global_a) - 0x10038000(Toc base) = -0x18000(Offset)
-# which gets materialized into r3 as ((-1 << 16) - 32768).
+# The .TOC. symbol represents the TOC base address: .got + 0x8000 = 0x10028000,
+# which is stored in the first entry of .got
+# NM: 0000000010028000 d .TOC.
+# NM: 0000000010030000 D global_a
+# HEX-LE:     section '.got':
+# HEX-LE-NEXT: 0x10020000 00800210 00000000
+# HEX-BE:     section '.got':
+# HEX-BE-NEXT: 0x10020000 00000000 10028000
 
-# CHECK:      Disassembly of section .text:
-# CHECK-NEXT: _start:
-# CHECK:      10010008:       {{.*}}     addis 3, 2, -1
-# CHECK-NEXT: 1001000c:       {{.*}}     addi 3, 3, -32768
-
-# CHECK:      Disassembly of section .data:
-# CHECK-NEXT: global_a:
-# CHECK-NEXT: 10020000:       {{.*}}
-
-# CHECK-LE:      Disassembly of section .got:
-# CHECK-LE-NEXT: .got:
-# CHECK-LE-NEXT: 10030000:       00 80 03 10
-
-# CHECK-BE:      Disassembly of section .got:
-# CHECK-BE-NEXT: .got:
-# CHECK-BE-NEXT: 10030000:       00 00 00 00
-# CHECK-BE-NEXT: 10030004:       10 03 80 00
+# r2 stores the TOC base address. To access global_a with r3, it
+# computes the address with TOC plus an offset.
+# The offset global_a - .TOC. = 0x10030000 - 0x10028000 = 0x8000
+# gets materialized as (1 << 16) - 32768.
+# CHECK:      _start:
+# CHECK:      10010008:       addis 3, 2, 1
+# CHECK-NEXT: 1001000c:       addi 3, 3, -32768
diff --git a/deps/lld/test/ELF/ppc64-toc-relax-constants.s b/deps/lld/test/ELF/ppc64-toc-relax-constants.s
new file mode 100644
index 0000000000000000000000000000000000000000..05be7fe96cf0be50b01a9bdf242451888e5ec6f2
--- /dev/null
+++ b/deps/lld/test/ELF/ppc64-toc-relax-constants.s
@@ -0,0 +1,61 @@
+# REQUIRES: ppc
+
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unkown-linux %p/Inputs/ppc64-toc-relax-shared.s -o %t.o
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t1.o
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/ppc64-toc-relax.s -o %t2.o
+# RUN: llvm-readobj -r %t1.o | FileCheck --check-prefix=RELOCS %s
+# RUN: ld.lld %t1.o %t2.o %t.so -o %t
+# RUN: llvm-readelf -S %t | FileCheck --check-prefix=SECTIONS %s
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-objdump -D %t | FileCheck %s
+
+# In most cases, .toc contains exclusively addresses relocated by R_PPC64_ADDR16.
+# Rarely .toc contain constants or variables.
+# Test we can still perform toc-indirect to toc-relative relaxation.
+
+# RELOCS:      .rela.text {
+# RELOCS-NEXT:   0x0 R_PPC64_TOC16_HA .toc 0x0
+# RELOCS-NEXT:   0x4 R_PPC64_TOC16_LO_DS .toc 0x0
+# RELOCS-NEXT:   0x8 R_PPC64_TOC16_HA .toc 0x8
+# RELOCS-NEXT:   0xC R_PPC64_TOC16_LO_DS .toc 0x8
+# RELOCS-NEXT:   0x10 R_PPC64_TOC16_HA .toc 0x10
+# RELOCS-NEXT:   0x14 R_PPC64_TOC16_LO_DS .toc 0x10
+# RELOCS-NEXT: }
+
+# SECTIONS: .got              PROGBITS        0000000010020090
+# SECTIONS: .toc              PROGBITS        0000000010020090
+
+# NM: 0000000010030000 D default
+
+# .LCONST1 is .toc[0].
+# .LCONST1 - (.got+0x8000) = 0x10020090 - (0x10020090+0x8000) = -32768
+# CHECK: nop
+# CHECK: lwa 3, -32768(2)
+  addis 3, 2, .LCONST1@toc@ha
+  lwa 3, .LCONST1@toc@l(3)
+
+# .LCONST2 is .toc[1]
+# .LCONST2 - (.got+0x8000) = 0x10020098 - (0x10020090+0x8000) = -32760
+# CHECK: nop
+# CHECK: ld 4, -32760(2)
+  addis 4, 2, .LCONST2@toc@ha
+  ld 4, .LCONST2@toc@l(4)
+
+# .Ldefault is .toc[2]. `default` is not preemptable when producing an executable.
+# After toc-indirection to toc-relative relaxation, it is loaded using an
+# offset relative to r2.
+# CHECK: nop
+# CHECK: addi 5, 2, 32624
+# CHECK: lwa 5, 0(5)
+  addis 5, 2, .Ldefault@toc@ha
+  ld    5, .Ldefault@toc@l(5)
+  lwa   5, 0(5)
+
+.section .toc,"aw",@progbits
+.LCONST1:
+  .quad 11
+.LCONST2:
+  .quad 22
+.Ldefault:
+  .tc default[TC],default
diff --git a/deps/lld/test/ELF/ppc64-toc-relax-jumptable.s b/deps/lld/test/ELF/ppc64-toc-relax-jumptable.s
new file mode 100644
index 0000000000000000000000000000000000000000..3c1b335036b8fc66af661008f15c8fa02f21a768
--- /dev/null
+++ b/deps/lld/test/ELF/ppc64-toc-relax-jumptable.s
@@ -0,0 +1,73 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-readelf -S %t | FileCheck --check-prefixes=SECTIONS %s
+# RUN: llvm-readelf -x .toc %t | FileCheck --check-prefixes=HEX-LE %s
+# RUN: llvm-objdump -d %t | FileCheck --check-prefixes=CHECK %s
+
+# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-readelf -S %t | FileCheck --check-prefixes=SECTIONS %s
+# RUN: llvm-readelf -x .toc %t | FileCheck --check-prefixes=HEX-BE %s
+# RUN: llvm-objdump -d %t | FileCheck --check-prefixes=CHECK %s
+
+# .LJT is a local symbol (non-preemptable).
+# Test we can perform the toc-indirect to toc-relative relaxation.
+
+# SECTIONS: .rodata PROGBITS 00000000100001c8
+
+# HEX-LE:      section '.toc':
+# HEX-LE-NEXT: 10020008 c8010010 00000000
+
+# HEX-BE:      section '.toc':
+# HEX-BE-NEXT: 10020008 00000000 100001c8
+
+# CHECK-LABEL: _start
+# CHECK:       clrldi  3, 3, 62
+# CHECK-NEXT:  addis 4, 2, -2
+# CHECK-NEXT:  addi  4, 4, -32312
+# CHECK-NEXT:  sldi  3, 3, 2
+
+    .text
+    .global _start
+    .type _start, @function
+_start:
+.Lstart_gep:
+    addis 2, 12, .TOC.-.Lstart_gep@ha
+    addi  2,  2, .TOC.-.Lstart_gep@l
+.Lstart_lep:
+    .localentry _start, .Lstart_lep-.Lstart_gep
+    rldicl 3, 3, 0, 62
+    addis 4, 2, .LJTI_TE@toc@ha
+    ld    4, .LJTI_TE@toc@l(4)
+    sldi  3, 3, 2
+    lwax  3, 3, 4
+    add   3, 3, 4
+    mtctr 3
+    bctr
+
+.LBB1:
+    li 3, 0
+    blr
+.LBB2:
+    li 3, 10
+    blr
+.LBB3:
+    li 3, 55
+    blr
+.LBB4:
+    li 3, 255
+    blr
+
+    .section        .rodata,"a",@progbits
+    .p2align        2
+.LJT:
+    .long   .LBB1-.LJT
+    .long   .LBB2-.LJT
+    .long   .LBB3-.LJT
+    .long   .LBB4-.LJT
+
+.section        .toc,"aw",@progbits
+# TOC entry for the jumptable address.
+.LJTI_TE:
+    .tc .LJT[TC],.LJT
diff --git a/deps/lld/test/ELF/ppc64-toc-relax.s b/deps/lld/test/ELF/ppc64-toc-relax.s
new file mode 100644
index 0000000000000000000000000000000000000000..adda57a27aa7865318a1f79fd944c52dd5d305b0
--- /dev/null
+++ b/deps/lld/test/ELF/ppc64-toc-relax.s
@@ -0,0 +1,105 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/ppc64-toc-relax-shared.s -o %t.o
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t1.o
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/ppc64-toc-relax.s -o %t2.o
+# RUN: llvm-readobj -r %t1.o | FileCheck --check-prefixes=RELOCS-LE,RELOCS %s
+# RUN: ld.lld %t1.o %t2.o %t.so -o %t
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefixes=COMMON,EXE %s
+
+# RUN: ld.lld -shared %t1.o %t2.o %t.so -o %t2.so
+# RUN: llvm-objdump -d --no-show-raw-insn %t2.so | FileCheck --check-prefixes=COMMON,SHARED %s
+
+# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/ppc64-toc-relax-shared.s -o %t.o
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t1.o
+# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/ppc64-toc-relax.s -o %t2.o
+# RUN: llvm-readobj -r %t1.o | FileCheck --check-prefixes=RELOCS-BE,RELOCS %s
+# RUN: ld.lld %t1.o %t2.o %t.so -o %t
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefixes=COMMON,EXE %s
+
+# RUN: ld.lld -shared %t1.o %t2.o %t.so -o %t2.so
+# RUN: llvm-objdump -d --no-show-raw-insn %t2.so | FileCheck --check-prefixes=COMMON,SHARED %s
+
+# RELOCS-LE:      .rela.text {
+# RELOCS-LE-NEXT:   0x0 R_PPC64_TOC16_HA .toc 0x0
+# RELOCS-LE-NEXT:   0x4 R_PPC64_TOC16_LO_DS .toc 0x0
+# RELOCS-LE-NEXT:   0xC R_PPC64_TOC16_HA .toc 0x8
+# RELOCS-LE-NEXT:   0x10 R_PPC64_TOC16_LO_DS .toc 0x8
+# RELOCS-LE-NEXT:   0x18 R_PPC64_TOC16_HA .toc 0x10
+# RELOCS-LE-NEXT:   0x1C R_PPC64_TOC16_LO_DS .toc 0x10
+# RELOCS-LE-NEXT:   0x24 R_PPC64_TOC16_HA .toc 0x18
+# RELOCS-LE-NEXT:   0x28 R_PPC64_TOC16_LO_DS .toc 0x18
+# RELOCS-LE-NEXT: }
+
+# RELOCS-BE:      .rela.text {
+# RELOCS-BE-NEXT:   0x2 R_PPC64_TOC16_HA .toc 0x0
+# RELOCS-BE-NEXT:   0x6 R_PPC64_TOC16_LO_DS .toc 0x0
+# RELOCS-BE-NEXT:   0xE R_PPC64_TOC16_HA .toc 0x8
+# RELOCS-BE-NEXT:   0x12 R_PPC64_TOC16_LO_DS .toc 0x8
+# RELOCS-BE-NEXT:   0x1A R_PPC64_TOC16_HA .toc 0x10
+# RELOCS-BE-NEXT:   0x1E R_PPC64_TOC16_LO_DS .toc 0x10
+# RELOCS-BE-NEXT:   0x26 R_PPC64_TOC16_HA .toc 0x18
+# RELOCS-BE-NEXT:   0x2A R_PPC64_TOC16_LO_DS .toc 0x18
+# RELOCS-BE-NEXT: }
+
+# RELOCS:         .rela.toc {
+# RELOCS-NEXT:      0x0 R_PPC64_ADDR64 hidden 0x0
+# RELOCS-NEXT:      0x8 R_PPC64_ADDR64 hidden2 0x0
+# RELOCS-NEXT:      0x10 R_PPC64_ADDR64 shared 0x0
+# RELOCS-NEXT:      0x18 R_PPC64_ADDR64 default 0x0
+# RELOCS-NEXT:    }
+
+# NM-DAG: 0000000010030000 D default
+# NM-DAG: 0000000010030000 d hidden
+# NM-DAG: 0000000010040000 d hidden2
+
+# 'hidden' is non-preemptable. It is relaxed.
+# address(hidden) - (.got+0x8000) = 0x10030000 - (0x100200c0+0x8000) = 32576
+# COMMON: nop
+# COMMON: addi 3, 2, 32576
+# COMMON: lwa 3, 0(3)
+  addis 3, 2, .Lhidden@toc@ha
+  ld    3, .Lhidden@toc@l(3)
+  lwa   3, 0(3)
+
+# address(hidden2) - (.got+0x8000) = 0x10040000 - (0x100200c0+0x8000) = (1<<16)+32576
+# COMMON: addis 3, 2, 1
+# COMMON: addi 3, 3, 32576
+# COMMON: lwa 3, 0(3)
+  addis 3, 2, .Lhidden2@toc@ha
+  ld    3, .Lhidden2@toc@l(3)
+  lwa   3, 0(3)
+
+# 'shared' is not defined in an object file. Its definition is determined at
+# runtime by the dynamic linker, so the extra indirection cannot be relaxed.
+# The first addis can still be relaxed to nop, though.
+# COMMON: nop
+# COMMON: ld 4, -32752(2)
+# COMMON: lwa 4, 0(4)
+  addis 4, 2, .Lshared@toc@ha
+  ld    4, .Lshared@toc@l(4)
+  lwa   4, 0(4)
+
+# 'default' has default visibility. It is non-preemptable when producing an executable.
+# address(default) - (.got+0x8000) = 0x10030000 - (0x100200c0+0x8000) = 32576
+# EXE: nop
+# EXE: addi 5, 2, 32576
+# EXE: lwa 5, 0(5)
+
+# SHARED: nop
+# SHARED: ld 5, -32744(2)
+# SHARED: lwa 5, 0(5)
+  addis 5, 2, .Ldefault@toc@ha
+  ld    5, .Ldefault@toc@l(5)
+  lwa   5, 0(5)
+
+.section .toc,"aw",@progbits
+.Lhidden:
+  .tc hidden[TC], hidden
+.Lhidden2:
+  .tc hidden2[TC], hidden2
+.Lshared:
+  .tc shared[TC], shared
+.Ldefault:
+  .tc default[TC], default
diff --git a/deps/lld/test/ELF/ppc64-toc-restore-recursive-call.s b/deps/lld/test/ELF/ppc64-toc-restore-recursive-call.s
index 4bedcfecf3830c2c3b5e859aceaeb9b8106fb11b..756a058cc565035725fae186b5247533f795e280 100644
--- a/deps/lld/test/ELF/ppc64-toc-restore-recursive-call.s
+++ b/deps/lld/test/ELF/ppc64-toc-restore-recursive-call.s
@@ -1,8 +1,8 @@
 # REQUIRES: ppc
 
-# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t1.o
-# RUN: ld.lld -shared %t1.o -o %t
-# RUN: llvm-objdump -d -r %t | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: llvm-objdump -d --no-show-raw-insn -r %t.so | FileCheck %s
 
 # For a recursive call that is interposable the linker calls the plt-stub rather
 # then calling the function directly. Since the call is through a plt stub and
@@ -14,12 +14,11 @@
 # for recursive calls as well as keeps the logic for recursive calls consistent
 # with non-recursive calls.
 
-# CHECK-LABEL: __plt_recursive_func:
-# CHECK-NEXT: 10000:
-# CHECK-LABEL: recursive_func
-# CHECK-NEXT:  10014:
-# CHECK:       1003c: {{[0-9a-fA-F ]+}} bl .+67108804
-# CHECK-NEXT:  ld 2, 24(1)
+# CHECK-LABEL: 0000000000010000 recursive_func:
+# CHECK:       10028:       bl .+32
+# CHECK-NEXT:               ld 2, 24(1)
+
+# CHECK-LABEL: 0000000000010048 __plt_recursive_func:
 
         .abiversion 2
         .section ".text"
diff --git a/deps/lld/test/ELF/ppc64-toc-restore.s b/deps/lld/test/ELF/ppc64-toc-restore.s
index d9e06ca6e596876777cd6103c27118f666cda63f..d65bef847a7b2b56f68b62a54aee9901a8c5c7e3 100644
--- a/deps/lld/test/ELF/ppc64-toc-restore.s
+++ b/deps/lld/test/ELF/ppc64-toc-restore.s
@@ -5,14 +5,14 @@
 // RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/ppc64-func.s -o %t3.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld %t.o %t2.so %t3.o -o %t
-// RUN: llvm-objdump -d %t | FileCheck %s
+// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/ppc64-func.s -o %t3.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld %t.o %t2.so %t3.o -o %t
-// RUN: llvm-objdump -d %t | FileCheck %s
+// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 
     .text
     .abiversion 2
@@ -28,16 +28,11 @@ _start:
   bl foo
   nop
   bl bar_local
-
-
-// CHECK: Disassembly of section .text:
-// CHECK: _start:
-// CHECK:     1001001c: {{.*}}  bl .+67108836
-// CHECK-NOT: 10010020: {{.*}}  nop
-// CHECK:     10010020: {{.*}}  ld 2, 24(1)
-// CHECK:     10010024: {{.*}}  bl .+67108848
-// CHECK-NOT: 10010028: {{.*}}  nop
-// CHECK-NOT: 10010028: {{.*}}  ld 2, 24(1)
+// CHECK-LABEL: _start:
+// CHECK-NEXT:  10010008:       bl .+64
+// CHECK-NEXT:  1001000c:       ld 2, 24(1)
+// CHECK-NEXT:  10010010:       bl .-16
+// CHECK-EMPTY:
 
 # Calling a function in another object file which will have same
 # TOC base does not need a nop. If nop present, do not rewrite to
@@ -47,26 +42,24 @@ _diff_object:
   bl foo_not_shared
   bl foo_not_shared
   nop
-
-// CHECK: _diff_object:
-// CHECK-NEXT: 10010028: {{.*}}  bl .+24
-// CHECK-NEXT: 1001002c: {{.*}}  bl .+20
-// CHECK-NEXT: 10010030: {{.*}}  nop
+// CHECK-LABEL: _diff_object:
+// CHECK-NEXT:  10010014:       bl .+28
+// CHECK-NEXT:  10010018:       bl .+24
+// CHECK-NEXT:  1001001c:       nop
 
 # Branching to a local function does not need a nop
 .global noretbranch
 noretbranch:
   b bar_local
-// CHECK: noretbranch:
-// CHECK:     10010034:  {{.*}}  b .+67108832
-// CHECK-NOT: 10010038:  {{.*}}  nop
-// CHECK-NOT: 1001003c:  {{.*}}  ld 2, 24(1)
+// CHECK-LABEL: noretbranch:
+// CHECK:       10010020:        b .+67108832
+// CHECK-EMPTY:
 
 // This should come last to check the end-of-buffer condition.
 .global last
 last:
   bl foo
   nop
-// CHECK: last:
-// CHECK:      10010038: {{.*}}   bl .+67108808
-// CHECK-NEXT: 1001003c: {{.*}}   ld 2, 24(1)
+// CHECK-LABEL: last:
+// CHECK-NEXT:  10010024:       bl .+36
+// CHECK-NEXT:  10010028:       ld 2, 24(1)
diff --git a/deps/lld/test/ELF/ppc64-weak-undef-call-shared.s b/deps/lld/test/ELF/ppc64-weak-undef-call-shared.s
index db4824762a0ff57838913f797cff9e86af520b64..244f72f995737575a8535f89290c1028be80865a 100644
--- a/deps/lld/test/ELF/ppc64-weak-undef-call-shared.s
+++ b/deps/lld/test/ELF/ppc64-weak-undef-call-shared.s
@@ -2,11 +2,11 @@
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
 # RUN: ld.lld -shared %t.o -o %t.so
-# RUN: llvm-readobj -t -r -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols -r --dyn-syms %t.so | FileCheck %s
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
 # RUN: ld.lld -shared %t.o -o %t.so
-# RUN: llvm-readobj -t -r -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols -r --dyn-syms %t.so | FileCheck %s
 
 .section        ".toc","aw"
 .quad weakfunc
diff --git a/deps/lld/test/ELF/ppc64-weak-undef-call.s b/deps/lld/test/ELF/ppc64-weak-undef-call.s
index 30c168656e2013b68c3b32d547158a39161fcc8d..dea10909a045c7aec5a0014f4120d8d68884071e 100644
--- a/deps/lld/test/ELF/ppc64-weak-undef-call.s
+++ b/deps/lld/test/ELF/ppc64-weak-undef-call.s
@@ -2,13 +2,14 @@
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-objdump -d %t2 | FileCheck %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t2 | FileCheck %s
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-objdump -d %t2 | FileCheck %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t2 | FileCheck %s
 
 # CHECK: Disassembly of section .text:
+# CHECK-EMPTY:
 
 .text
 .global _start
@@ -23,6 +24,6 @@ _start:
 # be unreachable. But, we should link successfully. We should not, however,
 # generate a .plt entry (this would be wasted space). For now, we do nothing
 # (leaving the zero relative offset present in the input).
-# CHECK: 10010000:       {{.*}}     bl .+0
-# CHECK: 10010004:       {{.*}}     nop
-# CHECK: 10010008:       {{.*}}     blr
+# CHECK: 10010000:       bl .+0
+# CHECK: 10010004:       nop
+# CHECK: 10010008:       blr
diff --git a/deps/lld/test/ELF/pr34660.s b/deps/lld/test/ELF/pr34660.s
index 9509b4e9d9845472750040a500a8f542b1c97776..5aed069514a1166f1091c4abdcd438b75d2ef68a 100644
--- a/deps/lld/test/ELF/pr34660.s
+++ b/deps/lld/test/ELF/pr34660.s
@@ -13,11 +13,12 @@
 # correct symbol.
 
 # DISASM: Disassembly of section .text:
+# DISASM-EMPTY:
 # DISASM-NEXT: $x.0:
-# DISASM-NEXT:   10000:       28 00 08 58     ldr     x8, #65540
+# DISASM-NEXT:   10000:       28 00 10 58     ldr     x8, #131076
 
 # SYM: Symbol table '.symtab'
-# SYM:  0000000000020004     0 NOTYPE  LOCAL  DEFAULT    5 patatino
+# SYM:  0000000000030004     0 NOTYPE  LOCAL  DEFAULT    6 patatino
 
   ldr x8, patatino
   .data
diff --git a/deps/lld/test/ELF/pr34872.s b/deps/lld/test/ELF/pr34872.s
index c6ca81972096aca2fea271322e7065751d7fd970..2991e94ca1a444405d11114f3805ba83670bb0e3 100644
--- a/deps/lld/test/ELF/pr34872.s
+++ b/deps/lld/test/ELF/pr34872.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc %p/Inputs/undefined-error.s -filetype=obj \
 # RUN:    -triple=x86_64-pc-linux -o %t2.o
 # RUN: ld.lld -shared %t2.o -o %t2.so
-# RUN: not ld.lld %t2.so %t.o -o /dev/null 2>&1 | FileCheck %s
+# RUN: not ld.lld --allow-shlib-undefined %t2.so %t.o -o /dev/null 2>&1 | FileCheck %s
 
 # CHECK: undefined symbol: fmod
 # Check we're not emitting other diagnostics for this symbol.
diff --git a/deps/lld/test/ELF/pr36475.s b/deps/lld/test/ELF/pr36475.s
index 0228974b1c4534a8ed367f979a06e75caff45cf8..8148b152228bfda49efcc4ef1b1eaddd5e8c27e4 100644
--- a/deps/lld/test/ELF/pr36475.s
+++ b/deps/lld/test/ELF/pr36475.s
@@ -10,7 +10,7 @@
 # RUN: echo " .got.plt : { BYTE(42); *(.got); } : ph_data" >> %t.script
 # RUN: echo "}" >> %t.script
 # RUN: ld.lld -T %t.script %t.o -o %t.elf
-# RUN: llvm-readobj -l -elf-output-style=GNU %t.elf | FileCheck %s
+# RUN: llvm-readelf -l %t.elf | FileCheck %s
 
 # CHECK: Section to Segment mapping:
 # CHECK-NEXT: Segment Sections...
diff --git a/deps/lld/test/ELF/pre_init_fini_array.s b/deps/lld/test/ELF/pre_init_fini_array.s
index cf716ab681ebcba2a9094bb262ba29a7860b9c22..56daa96c69692f05df1555b5c89b2aebdaf4e419 100644
--- a/deps/lld/test/ELF/pre_init_fini_array.s
+++ b/deps/lld/test/ELF/pre_init_fini_array.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2
 // RUN: ld.lld %t2 -o %t2.so -shared
 // RUN: ld.lld %t %t2.so -o %t2
-// RUN: llvm-readobj -r -symbols -sections -dynamic-table %t2 | FileCheck %s
+// RUN: llvm-readobj -r --symbols --sections --dynamic-table %t2 | FileCheck %s
 // RUN: llvm-objdump -d %t2 | FileCheck --check-prefix=DISASM %s
 
 .globl _start
diff --git a/deps/lld/test/ELF/pre_init_fini_array_missing.s b/deps/lld/test/ELF/pre_init_fini_array_missing.s
index d5b998443a24811d316d44942afd7c09539070e0..c56733ba5523eb622b95bf7233f9a69807c4a0cb 100644
--- a/deps/lld/test/ELF/pre_init_fini_array_missing.s
+++ b/deps/lld/test/ELF/pre_init_fini_array_missing.s
@@ -20,6 +20,7 @@ _start:
 // ...
 
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT:  _start:
 // CHECK-NEXT:   201000:    e8 fb ff ff ff     callq    -5
 // CHECK-NEXT:   201005:    e8 f6 ff ff ff     callq    -10
@@ -31,6 +32,7 @@ _start:
 // In position-independent binaries, they resolve to .text too.
 
 // PIE:      Disassembly of section .text:
+// PIE-EMPTY:
 // PIE-NEXT: _start:
 // PIE-NEXT:     1000:  e8 fb ff ff ff  callq   -5
 // PIE-NEXT:     1005:  e8 f6 ff ff ff  callq   -10
diff --git a/deps/lld/test/ELF/progname.s b/deps/lld/test/ELF/progname.s
index 228e3f61e67ae34eb4bff798a1428b01f5399c62..0033eaf5e091539d11348594e3c5d62bddebb1ed 100644
--- a/deps/lld/test/ELF/progname.s
+++ b/deps/lld/test/ELF/progname.s
@@ -4,18 +4,18 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %t2.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld -o %t %t.o %t2.so
-// RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+// RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 // RUN: echo "VER_1 { global: bar; };" > %t.script
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux \
 // RUN:   %p/Inputs/progname-ver.s -o %t-ver.o
 // RUN: ld.lld -shared -o %t.so -version-script %t.script %t-ver.o
 // RUN: ld.lld -o %t %t.o %t.so
-// RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+// RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 // RUN: echo "{ _start; };" > %t.dynlist
 // RUN: ld.lld -dynamic-list %t.dynlist -o %t %t.o %t.so
-// RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+// RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 // CHECK:      Name:     __progname
 // CHECK-NEXT: Value:    0x201000
diff --git a/deps/lld/test/ELF/program-header-layout.s b/deps/lld/test/ELF/program-header-layout.s
index 949a96e4f438202f0ba078ed5c29c3f5fc8fb70e..a2e6587c5b266b5cf4112401b95a1955deb297da 100644
--- a/deps/lld/test/ELF/program-header-layout.s
+++ b/deps/lld/test/ELF/program-header-layout.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -sections -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj --sections -l %t2 | FileCheck %s
 
 # Check that different output sections with the same flags are merged into a
 # single Read/Write PT_LOAD.
diff --git a/deps/lld/test/ELF/protected-shared.s b/deps/lld/test/ELF/protected-shared.s
index 3501162e6153819d88390ae87c4c57ba5e60fff2..9406b36b650c31ee61510d6fa816bc98d201222b 100644
--- a/deps/lld/test/ELF/protected-shared.s
+++ b/deps/lld/test/ELF/protected-shared.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/protected-shared.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld %t.o %t2.so -o %t
-// RUN: llvm-readobj -t --dyn-symbols %t | FileCheck %s
+// RUN: llvm-readobj --symbols --dyn-symbols %t | FileCheck %s
 
         .global  _start
 _start:
diff --git a/deps/lld/test/ELF/push-state.s b/deps/lld/test/ELF/push-state.s
index f3d55c3488b33295b4ff339c50fd4f6ce037ab86..f8c09833c20f5eb3ae685df6862366478659d70f 100644
--- a/deps/lld/test/ELF/push-state.s
+++ b/deps/lld/test/ELF/push-state.s
@@ -19,11 +19,11 @@
 // RUN: ld.lld -shared %t3.o -soname libfoo -o %t.so
 
 // RUN: ld.lld -o %t.exe -push-state -as-needed %t.so %t1.o
-// RUN: llvm-readobj -dynamic-table %t.exe | FileCheck -check-prefix=AS-NEEDED %s
+// RUN: llvm-readobj --dynamic-table %t.exe | FileCheck -check-prefix=AS-NEEDED %s
 // AS-NEEDED-NOT: NEEDED Shared library: [libfoo]
 
 // RUN: ld.lld -o %t.exe -push-state -as-needed -pop-state %t.so %t1.o
-// RUN: llvm-readobj -dynamic-table %t.exe | FileCheck -check-prefix=NO-AS-NEEDED %s
+// RUN: llvm-readobj --dynamic-table %t.exe | FileCheck -check-prefix=NO-AS-NEEDED %s
 // NO-AS-NEEDED: NEEDED Shared library: [libfoo]
 
 
diff --git a/deps/lld/test/ELF/rel-addend-with-rela-input.s b/deps/lld/test/ELF/rel-addend-with-rela-input.s
index 11eac97ed519a28ec0686a0dae4894b1e327fe9f..88b5ececd67444b875045229c170bf7213ed9b9f 100644
--- a/deps/lld/test/ELF/rel-addend-with-rela-input.s
+++ b/deps/lld/test/ELF/rel-addend-with-rela-input.s
@@ -3,7 +3,7 @@
 # uses Elf_Rela
 
 # RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux %s -o %t-rela.o
-# RUN: llvm-readobj -h -s -section-data -relocations %t-rela.o | FileCheck -check-prefix INPUT-RELA %s
+# RUN: llvm-readobj -h -S --section-data -r %t-rela.o | FileCheck -check-prefix INPUT-RELA %s
 # INPUT-RELA:  ElfHeader {
 # INPUT-RELA:     Class: 64-bit
 # INPUT-RELA:     DataEncoding: BigEndian
@@ -21,7 +21,7 @@
 # Previously the addend to the dynamic relocation in the .data section was not copied if
 # the input file used RELA and the output uses REL. Check that it works now:
 # RUN: ld.lld -shared -o %t.so %t-rela.o  -verbose
-# RUN: llvm-readobj -h -s -section-data -relocations %t.so | FileCheck -check-prefix RELA-TO-REL %s
+# RUN: llvm-readobj -h -S --section-data -r %t.so | FileCheck -check-prefix RELA-TO-REL %s
 # RELA-TO-REL:  ElfHeader {
 # RELA-TO-REL:    Class: 64-bit
 # RELA-TO-REL:    DataEncoding: BigEndian
diff --git a/deps/lld/test/ELF/rel-offset.s b/deps/lld/test/ELF/rel-offset.s
index 8044e61c3cb3b29787bf662e2fe46c7ef97a7d2e..6f35bcebc4b029f4b53295e8fc291208912110d5 100644
--- a/deps/lld/test/ELF/rel-offset.s
+++ b/deps/lld/test/ELF/rel-offset.s
@@ -10,6 +10,6 @@
         .quad   foo
 
 // CHECK:      Section ({{.*}}) .rela.dyn {
-// CHECK-NEXT:   0x1000 R_X86_64_64 foo 0x0
-// CHECK-NEXT:   0x1008 R_X86_64_64 foo 0x0
+// CHECK-NEXT:   0x2000 R_X86_64_64 foo 0x0
+// CHECK-NEXT:   0x2008 R_X86_64_64 foo 0x0
 // CHECK-NEXT: }
diff --git a/deps/lld/test/ELF/relative-dynamic-reloc-pie.s b/deps/lld/test/ELF/relative-dynamic-reloc-pie.s
index f7c8b3c1516cbde8477e325c2847e35832b9ba7e..790eed1199bdae4160b324f1e61505064daf2b35 100644
--- a/deps/lld/test/ELF/relative-dynamic-reloc-pie.s
+++ b/deps/lld/test/ELF/relative-dynamic-reloc-pie.s
@@ -1,14 +1,14 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld -pie %t.o -o %t.pie
-# RUN: llvm-readobj -r -dyn-symbols %t.pie | FileCheck %s
+# RUN: llvm-readobj -r --dyn-syms %t.pie | FileCheck %s
 
 ## Test that we create R_X86_64_RELATIVE relocations with -pie.
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
-# CHECK-NEXT:     0x2000 R_X86_64_RELATIVE - 0x2000
-# CHECK-NEXT:     0x2008 R_X86_64_RELATIVE - 0x2008
-# CHECK-NEXT:     0x2010 R_X86_64_RELATIVE - 0x2009
+# CHECK-NEXT:     0x3000 R_X86_64_RELATIVE - 0x3000
+# CHECK-NEXT:     0x3008 R_X86_64_RELATIVE - 0x3008
+# CHECK-NEXT:     0x3010 R_X86_64_RELATIVE - 0x3009
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 
diff --git a/deps/lld/test/ELF/relative-dynamic-reloc-ppc64.s b/deps/lld/test/ELF/relative-dynamic-reloc-ppc64.s
deleted file mode 100644
index d65ea275413c66b4f7cafadaad07c74057819623..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/relative-dynamic-reloc-ppc64.s
+++ /dev/null
@@ -1,71 +0,0 @@
-// REQUIRES: ppc
-// RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-// RUN: ld.lld -shared %t.o -o %t.so
-// RUN: llvm-readobj -t -r -dyn-symbols %t.so | FileCheck %s
-
-// RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-// RUN: ld.lld -shared %t.o -o %t.so
-// RUN: llvm-readobj -t -r -dyn-symbols %t.so | FileCheck %s
-
-// Test that we create R_PPC64_RELATIVE relocations but don't put any
-// symbols in the dynamic symbol table.
-
-// CHECK:      Relocations [
-// CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
-// CHECK-NEXT:     0x[[FOO_ADDR:.*]] R_PPC64_RELATIVE - 0x[[FOO_ADDR]]
-// CHECK-NEXT:     0x[[BAR_ADDR:.*]] R_PPC64_RELATIVE - 0x[[BAR_ADDR]]
-// CHECK-NEXT:     0x10010 R_PPC64_RELATIVE - 0x10009
-// CHECK-NEXT:     0x{{.*}} R_PPC64_RELATIVE - 0x[[ZED_ADDR:.*]]
-// CHECK-NEXT:     0x{{.*}} R_PPC64_RELATIVE - 0x[[FOO_ADDR]]
-// CHECK-NEXT:     0x10028 R_PPC64_ADDR64 external 0x0
-// CHECK-NEXT:   }
-// CHECK-NEXT: ]
-
-// CHECK:      Symbols [
-// CHECK:        Name: foo
-// CHECK-NEXT:   Value: 0x[[FOO_ADDR]]
-// CHECK:        Name: bar
-// CHECK-NEXT:   Value: 0x[[BAR_ADDR]]
-// CHECK:        Name: zed
-// CHECK-NEXT:   Value: 0x[[ZED_ADDR]]
-// CHECK:      ]
-
-// CHECK:      DynamicSymbols [
-// CHECK-NEXT:   Symbol {
-// CHECK-NEXT:     Name:
-// CHECK-NEXT:     Value: 0x0
-// CHECK-NEXT:     Size: 0
-// CHECK-NEXT:     Binding: Local
-// CHECK-NEXT:     Type: None
-// CHECK-NEXT:     Other: 0
-// CHECK-NEXT:     Section: Undefined
-// CHECK-NEXT:   }
-// CHECK-NEXT:   Symbol {
-// CHECK-NEXT:     Name: external
-// CHECK-NEXT:     Value: 0x0
-// CHECK-NEXT:     Size: 0
-// CHECK-NEXT:     Binding: Global
-// CHECK-NEXT:     Type: None
-// CHECK-NEXT:     Other: 0
-// CHECK-NEXT:     Section: Undefined
-// CHECK-NEXT:   }
-// CHECK-NEXT: ]
-
-        .data
-foo:
-        .quad foo
-
-        .hidden bar
-        .global bar
-bar:
-        .quad bar
-        .quad bar + 1
-
-        .hidden zed
-        .comm zed,1
-        .quad zed
-
-        .section abc,"aw"
-        .quad foo
-
-        .quad external
diff --git a/deps/lld/test/ELF/relative-dynamic-reloc.s b/deps/lld/test/ELF/relative-dynamic-reloc.s
index 24d03f28a43bfc6a39cf628af46b653c1e7818b2..70caf6f75e58320d1bb81cc385894d23d73d523e 100644
--- a/deps/lld/test/ELF/relative-dynamic-reloc.s
+++ b/deps/lld/test/ELF/relative-dynamic-reloc.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: ld.lld -shared %t.o -o %t.so
-// RUN: llvm-readobj -t -r -dyn-symbols %t.so | FileCheck %s
+// RUN: llvm-readobj --symbols -r --dyn-syms %t.so | FileCheck %s
 
 // Test that we create R_X86_64_RELATIVE relocations but don't put any
 // symbols in the dynamic symbol table.
@@ -10,10 +10,10 @@
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
 // CHECK-NEXT:     0x[[FOO_ADDR:.*]] R_X86_64_RELATIVE - 0x[[FOO_ADDR]]
 // CHECK-NEXT:     0x[[BAR_ADDR:.*]] R_X86_64_RELATIVE - 0x[[BAR_ADDR]]
-// CHECK-NEXT:     0x1010 R_X86_64_RELATIVE - 0x1009
+// CHECK-NEXT:     0x2010 R_X86_64_RELATIVE - 0x2009
 // CHECK-NEXT:     0x{{.*}} R_X86_64_RELATIVE - 0x[[ZED_ADDR:.*]]
 // CHECK-NEXT:     0x{{.*}} R_X86_64_RELATIVE - 0x[[FOO_ADDR]]
-// CHECK-NEXT:     0x1028 R_X86_64_64 external 0x0
+// CHECK-NEXT:     0x2028 R_X86_64_64 external 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
diff --git a/deps/lld/test/ELF/relocatable-bss.s b/deps/lld/test/ELF/relocatable-bss.s
index 716eb4abf2f650f7d62efd24eb6410b71be465d4..89730a030261542181d9136c19e18b0238ea9a0f 100644
--- a/deps/lld/test/ELF/relocatable-bss.s
+++ b/deps/lld/test/ELF/relocatable-bss.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
 # RUN: ld.lld -r %t1.o -o %t
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols -r %t | FileCheck %s
+# RUN: llvm-readobj --file-headers --sections -l --symbols -r %t | FileCheck %s
 
 ## We check here that .bss does not occupy the space in file.
 ## If it would, the SectionHeaderOffset would have offset about 5 megabytes.
diff --git a/deps/lld/test/ELF/relocatable-comdat-multiple.s b/deps/lld/test/ELF/relocatable-comdat-multiple.s
index 6a8d83357cf0625251f9745bea6292ac99eb06bd..7a4eddd837a9ba6aa88d0cdbd683266583b0bae3 100644
--- a/deps/lld/test/ELF/relocatable-comdat-multiple.s
+++ b/deps/lld/test/ELF/relocatable-comdat-multiple.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/relocatable-comdat-multiple.s -o %t2.o
 # RUN: ld.lld -r %t.o %t2.o -o %t
-# RUN: llvm-readobj -elf-section-groups %t | FileCheck %s
+# RUN: llvm-readobj --elf-section-groups %t | FileCheck %s
 
 # CHECK:      Groups {
 # CHECK-NEXT:   Group {
diff --git a/deps/lld/test/ELF/relocatable-comdat.s b/deps/lld/test/ELF/relocatable-comdat.s
index 98ef993d5d0d2c67bb5c2721d0fa38d5a24a9f7f..213d14bd2cc6febe4fcd61211473f89127162d7f 100644
--- a/deps/lld/test/ELF/relocatable-comdat.s
+++ b/deps/lld/test/ELF/relocatable-comdat.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -r %t.o %t.o -o %t
-# RUN: llvm-readobj -elf-section-groups -sections %t | FileCheck %s
+# RUN: llvm-readobj --elf-section-groups --sections %t | FileCheck %s
 
 # CHECK:        Name: .text.bar
 # CHECK-NEXT:   Type: SHT_PROGBITS
diff --git a/deps/lld/test/ELF/relocatable-comdat2.s b/deps/lld/test/ELF/relocatable-comdat2.s
index 3318fb6f10bec956add7d01c65260465da9af032..8e3161d49f8fc193a706af9d4e67d914679eaef3 100644
--- a/deps/lld/test/ELF/relocatable-comdat2.s
+++ b/deps/lld/test/ELF/relocatable-comdat2.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -r %t.o -o %t
-# RUN: llvm-readobj -elf-section-groups -s %t | FileCheck %s
+# RUN: llvm-readobj --elf-section-groups -S %t | FileCheck %s
 
 ## Check .foo was not merged.
 # CHECK: Sections [
diff --git a/deps/lld/test/ELF/relocatable-comment.s b/deps/lld/test/ELF/relocatable-comment.s
index 8ec22c2f43de24faf1995cae05b3256215dbd9ee..ca511fc8ae8a20c56a03019945767aa10d0c6c2c 100644
--- a/deps/lld/test/ELF/relocatable-comment.s
+++ b/deps/lld/test/ELF/relocatable-comment.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t1.o
 # RUN: ld.lld -r %t1.o -o %t
-# RUN: llvm-readobj -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 # CHECK:      Name: .comment
 # CHECK-NEXT: Type: SHT_PROGBITS
diff --git a/deps/lld/test/ELF/relocatable-common.s b/deps/lld/test/ELF/relocatable-common.s
index 698380b650fcd518ef51bcde07e10b26c94f3d69..a12ce87779cd08264f0736be741b567c132b1489 100644
--- a/deps/lld/test/ELF/relocatable-common.s
+++ b/deps/lld/test/ELF/relocatable-common.s
@@ -1,17 +1,17 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
 # RUN: ld.lld -r %t1.o -o %t
-# RUN: llvm-readobj -symbols -r %t | FileCheck %s
+# RUN: llvm-readobj --symbols -r %t | FileCheck %s
 # RUN: ld.lld -r --no-define-common %t1.o -o %t
-# RUN: llvm-readobj -symbols -r %t | FileCheck %s
+# RUN: llvm-readobj --symbols -r %t | FileCheck %s
 # RUN: ld.lld -r --define-common %t1.o -o %t
-# RUN: llvm-readobj -symbols -r %t | FileCheck -check-prefix=DEFCOMM %s
+# RUN: llvm-readobj --symbols -r %t | FileCheck -check-prefix=DEFCOMM %s
 # RUN: ld.lld -r -d %t1.o -o %t
-# RUN: llvm-readobj -symbols -r %t | FileCheck -check-prefix=DEFCOMM %s
+# RUN: llvm-readobj --symbols -r %t | FileCheck -check-prefix=DEFCOMM %s
 # RUN: ld.lld -r -dc %t1.o -o %t
-# RUN: llvm-readobj -symbols -r %t | FileCheck -check-prefix=DEFCOMM %s
+# RUN: llvm-readobj --symbols -r %t | FileCheck -check-prefix=DEFCOMM %s
 # RUN: ld.lld -r -dp %t1.o -o %t
-# RUN: llvm-readobj -symbols -r %t | FileCheck -check-prefix=DEFCOMM %s
+# RUN: llvm-readobj --symbols -r %t | FileCheck -check-prefix=DEFCOMM %s
 
 # CHECK:        Symbol {
 # CHECK:          Name: common
diff --git a/deps/lld/test/ELF/relocatable-compressed-input.s b/deps/lld/test/ELF/relocatable-compressed-input.s
index 7ef0cf0b051b5bb00acdc75f1dc5ffd0a22adf5a..a98f93d6619f2c4c135b0cbee1a3102a5fee5a62 100644
--- a/deps/lld/test/ELF/relocatable-compressed-input.s
+++ b/deps/lld/test/ELF/relocatable-compressed-input.s
@@ -1,11 +1,11 @@
 # REQUIRES: x86, zlib
 
 # RUN: llvm-mc -compress-debug-sections=zlib-gnu -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
-# RUN: llvm-readobj -sections %t1 | FileCheck -check-prefix=GNU %s
+# RUN: llvm-readobj --sections %t1 | FileCheck -check-prefix=GNU %s
 # GNU: Name: .zdebug_str
 
 # RUN: ld.lld %t1 -o %t2 -r
-# RUN: llvm-readobj -sections -section-data %t2 | FileCheck %s
+# RUN: llvm-readobj --sections --section-data %t2 | FileCheck %s
 
 ## Check we uncompress section and remove ".z" prefix specific for zlib-gnu compression.
 # CHECK:      Section {
diff --git a/deps/lld/test/ELF/relocatable-eh-frame-hdr.s b/deps/lld/test/ELF/relocatable-eh-frame-hdr.s
index f7b57249d506f54ba6bb3d9ac907ff870e75cb0a..02a4c5fc793bc3f910eb9898bd73315f89ba7641 100644
--- a/deps/lld/test/ELF/relocatable-eh-frame-hdr.s
+++ b/deps/lld/test/ELF/relocatable-eh-frame-hdr.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld --eh-frame-hdr -r %t.o -o %t
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 # CHECK:       Sections [
 # CHECK-NOT:    Name: .eh_frame_hdr
diff --git a/deps/lld/test/ELF/relocatable-eh-frame.s b/deps/lld/test/ELF/relocatable-eh-frame.s
deleted file mode 100644
index dee906acb87fb8c99cfecc48d1e3a509367c7fcc..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/relocatable-eh-frame.s
+++ /dev/null
@@ -1,19 +0,0 @@
-# REQUIRES: x86
-# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-# RUN: ld.lld -r %t.o %t.o -o %t
-# RUN: llvm-readobj -r %t | FileCheck %s
-# RUN: ld.lld %t -o %t.so -shared
-# RUN: llvm-objdump -h %t.so | FileCheck --check-prefix=DSO %s
-
-# DSO: .eh_frame     00000034
-
-# CHECK:      Relocations [
-# CHECK-NEXT:   Section ({{.*}}) .rela.eh_frame {
-# CHECK-NEXT:     0x20 R_X86_64_PC32 .foo 0x0
-# CHECK-NEXT:     0x50 R_X86_64_NONE - 0x0
-# CHECK-NEXT:   }
-# CHECK-NEXT: ]
-
-.section .foo,"aG",@progbits,bar,comdat
-.cfi_startproc
-.cfi_endproc
diff --git a/deps/lld/test/ELF/relocatable-ehframe.s b/deps/lld/test/ELF/relocatable-ehframe.s
index 2d302e5988f0af194d6849f236230c51c92602fa..c4ce01ec86543032b8abe377e3ceee0eb2083699 100644
--- a/deps/lld/test/ELF/relocatable-ehframe.s
+++ b/deps/lld/test/ELF/relocatable-ehframe.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/relocatable-ehframe.s -o %t2.o
 # RUN: ld.lld -r %t1.o %t2.o -o %t
-# RUN: llvm-readobj -r -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -r -S --section-data %t | FileCheck %s
 
 # CHECK:      Name: .strtab
 # CHECK-NEXT: Type: SHT_STRTAB
diff --git a/deps/lld/test/ELF/relocatable-empty-archive.s b/deps/lld/test/ELF/relocatable-empty-archive.s
index 545ef7bfc24c7d99ebe69fdb77a3a73361d1b2c8..30a711af5509d8852c177ca4fb465c01c629a41e 100644
--- a/deps/lld/test/ELF/relocatable-empty-archive.s
+++ b/deps/lld/test/ELF/relocatable-empty-archive.s
@@ -2,7 +2,7 @@
 # RUN: rm -f %t.a
 # RUN: llvm-ar rc %t.a
 # RUN: ld.lld -m elf_x86_64 %t.a -o %t -r
-# RUN: llvm-readobj -file-headers %t | FileCheck %s
+# RUN: llvm-readobj --file-headers %t | FileCheck %s
 
 # CHECK: Format: ELF64-x86-64
 # CHECK: Arch: x86_64
diff --git a/deps/lld/test/ELF/relocatable-many-sections.s b/deps/lld/test/ELF/relocatable-many-sections.s
index 0d84c6bd78baf2c9442371bee055bddfe8a659da..9abefd47254b514e8b8ff70cf02fddf706a0c88f 100644
--- a/deps/lld/test/ELF/relocatable-many-sections.s
+++ b/deps/lld/test/ELF/relocatable-many-sections.s
@@ -7,25 +7,25 @@
 
 ## Check we emit a valid ELF header when
 ## sections amount is greater than SHN_LORESERVE.
-# RUN: llvm-readobj -file-headers %t | FileCheck %s --check-prefix=HDR
+# RUN: llvm-readobj --file-headers %t | FileCheck %s --check-prefix=HDR
 # HDR:      ElfHeader {
 # HDR:        SectionHeaderCount: 0 (65544)
 # HDR-NEXT:   StringTableSectionIndex: 65535 (65542)
 
 ## Check that:
 ## 1) 65541 is the index of .shstrtab section.
-## 2) .symtab_shndxr is linked with .symtab.
-## 3) .symtab_shndxr entry size and alignment == 4.
-## 4) .symtab_shndxr has size equal to
-##    (sizeof(.symtab) / entsize(.symtab)) * entsize(.symtab_shndxr) = 0x4 * 0x180048 / 0x18 == 0x04000c
+## 2) .symtab_shndx is linked with .symtab.
+## 3) .symtab_shndx entry size and alignment == 4.
+## 4) .symtab_shndx has size equal to
+##    (sizeof(.symtab) / entsize(.symtab)) * entsize(.symtab_shndx) = 0x4 * 0x180078 / 0x18 == 0x040014
 
 # RUN: llvm-readelf -sections -symbols %t | FileCheck %s
 #        [Nr] Name              Type            Address          Off    Size   ES Flg Lk Inf Al
 # CHECK: [65539] .note.GNU-stack PROGBITS       0000000000000000 000040 000000 00      0   0  1
 # CHECK: [65540] .symtab        SYMTAB          0000000000000000 000040 180078 18     65543 65539  8
-# CHECK: [65541] .symtab_shndxr SYMTAB SECTION INDICES 0000000000000000 1800b8 040014 04     65540   0  4
-# CHECK: [65542] .shstrtab      STRTAB          0000000000000000 1c00cc 0f0045 00      0   0  1
-# CHECK: [65543] .strtab        STRTAB          0000000000000000 2b0111 00000c 00      0   0  1
+# CHECK: [65541] .symtab_shndx  SYMTAB SECTION INDICES 0000000000000000 1800b8 040014 04     65540   0  4
+# CHECK: [65542] .shstrtab      STRTAB          0000000000000000 1c00cc 0f0044 00      0   0  1
+# CHECK: [65543] .strtab        STRTAB          0000000000000000 2b0110 00000c 00      0   0  1
 
 # 5) Check we are able to represent symbol foo with section (.bar) index  > 0xFF00 (SHN_LORESERVE).
 # CHECK: GLOBAL DEFAULT  65538 foo
diff --git a/deps/lld/test/ELF/relocatable-rel-iplt.s b/deps/lld/test/ELF/relocatable-rel-iplt.s
index 773a09f5281564af275c536a869c07aa2662d062..6fc50da1b86c61e3404e7707b4ac7de1d1759fa4 100644
--- a/deps/lld/test/ELF/relocatable-rel-iplt.s
+++ b/deps/lld/test/ELF/relocatable-rel-iplt.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=i686-- %s -o %t1.o
 # RUN: ld.lld -r %t1.o -o %t2.o
-# RUN: llvm-readobj -t %t2.o | FileCheck %s
+# RUN: llvm-readobj --symbols %t2.o | FileCheck %s
 
 // CHECK:      Symbols [
 // CHECK-NEXT:   Symbol {
@@ -14,7 +14,7 @@
 // CHECK-NEXT:     Section: Undefined (0x0)
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
-// CHECK-NEXT:     Name:  (0)
+// CHECK-NEXT:     Name: .text (0)
 // CHECK-NEXT:     Value: 0x0
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local (0x0)
diff --git a/deps/lld/test/ELF/relocatable-script.s b/deps/lld/test/ELF/relocatable-script.s
index 133d61f480565cbdd4d755fe455e99c93c9c81a7..35ea13a67cc25023cfaf3a7000d80068863a083c 100644
--- a/deps/lld/test/ELF/relocatable-script.s
+++ b/deps/lld/test/ELF/relocatable-script.s
@@ -2,6 +2,6 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux -o %t1.o %s
 # RUN: echo "SECTIONS { .foo : { BYTE(0x0) } }" > %t.script
 # RUN: ld.lld -r %t1.o -script %t.script -o %t2.o
-# RUN: llvm-readobj -sections %t2.o | FileCheck %s
+# RUN: llvm-readobj --sections %t2.o | FileCheck %s
 
 # CHECK:  Name: .foo
diff --git a/deps/lld/test/ELF/relocatable-section-symbol.s b/deps/lld/test/ELF/relocatable-section-symbol.s
index 57a75ab92f11453f601650251c116dea558b79ed..9924ddf1fbee3eca2c70c947defdcf0ca4578089 100644
--- a/deps/lld/test/ELF/relocatable-section-symbol.s
+++ b/deps/lld/test/ELF/relocatable-section-symbol.s
@@ -13,7 +13,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o
 # RUN: ld.lld -r -o %t %t.o %t.o
-# RUN: llvm-readobj -r -s -section-data %t | FileCheck --check-prefix=REL %s
+# RUN: llvm-readobj -r -S --section-data %t | FileCheck --check-prefix=REL %s
 
 
 # REL:      Section {
diff --git a/deps/lld/test/ELF/relocatable-symbol-name.s b/deps/lld/test/ELF/relocatable-symbol-name.s
index d8a85dd4b815be69262125d02b8e301e3f56d9b4..3a7c2bbcc09644c03b4420ff28822c63e6383872 100644
--- a/deps/lld/test/ELF/relocatable-symbol-name.s
+++ b/deps/lld/test/ELF/relocatable-symbol-name.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -r %t.o -o %t
-# RUN: llvm-readobj -t %t | FileCheck %s
+# RUN: llvm-readobj --symbols %t | FileCheck %s
 
 # Test that the section symbol has st_name equal to zero. GNU objdump
 # requires this to print relocations against the section.
@@ -17,7 +17,7 @@
 # CHECK-NEXT:     Section:
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Symbol {
-# CHECK-NEXT:     Name:  (0)
+# CHECK-NEXT:     Name: .text (0)
 # CHECK-NEXT:     Value:
 # CHECK-NEXT:     Size:
 # CHECK-NEXT:     Binding:
diff --git a/deps/lld/test/ELF/relocatable-symbols.s b/deps/lld/test/ELF/relocatable-symbols.s
index 46d8ab7395fc9fc896b018ca1f31076d19ea597a..2c22c7f422bbf228141df4166ca40ed625189ab6 100644
--- a/deps/lld/test/ELF/relocatable-symbols.s
+++ b/deps/lld/test/ELF/relocatable-symbols.s
@@ -3,7 +3,7 @@
 # RUN: ld.lld -r %t -o %tout
 # RUN: llvm-objdump -d %tout | FileCheck -check-prefix=DISASM %s
 # RUN: llvm-readobj -r %t | FileCheck -check-prefix=RELOC %s
-# RUN: llvm-readobj -symbols -r %tout | FileCheck -check-prefix=SYMBOL %s
+# RUN: llvm-readobj --symbols -r %tout | FileCheck -check-prefix=SYMBOL %s
 
 # DISASM:      _start:
 # DISASM-NEXT:   0: {{.*}} callq 0
@@ -18,12 +18,16 @@
 # DISASM-NEXT:  2d: {{.*}} callq 0
 # DISASM-NEXT:  32: {{.*}} callq 0
 # DISASM-NEXT:  37: {{.*}} callq 0
+# DISASM-EMPTY:
 # DISASM-NEXT: Disassembly of section foo:
+# DISASM-EMPTY:
 # DISASM-NEXT: foo:
 # DISASM-NEXT:  0: 90 nop
 # DISASM-NEXT:  1: 90 nop
 # DISASM-NEXT:  2: 90 nop
+# DISASM-EMPTY:
 # DISASM-NEXT: Disassembly of section bar:
+# DISASM-EMPTY:
 # DISASM-NEXT: bar:
 # DISASM-NEXT:  0: 90 nop
 # DISASM-NEXT:  1: 90 nop
diff --git a/deps/lld/test/ELF/relocatable-visibility.s b/deps/lld/test/ELF/relocatable-visibility.s
index 7cc7da3097bb11d1f2c48407574a2896708dd85e..95ab1e2895d9584df3ad2220048b565bb5cd57e7 100644
--- a/deps/lld/test/ELF/relocatable-visibility.s
+++ b/deps/lld/test/ELF/relocatable-visibility.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld -r %t.o -o %t1
-# RUN: llvm-readobj -t %t1 | FileCheck --check-prefix=RELOCATABLE %s
+# RUN: llvm-readobj --symbols %t1 | FileCheck --check-prefix=RELOCATABLE %s
 
 # RELOCATABLE:      Name: foo
 # RELOCATABLE-NEXT: Value: 0x0
diff --git a/deps/lld/test/ELF/relocatable.s b/deps/lld/test/ELF/relocatable.s
index 7235ea03c2887ce4c90d2bd183b157cb627bd13c..1907ae46e1b8c45876db5e369c655deebde9b338 100644
--- a/deps/lld/test/ELF/relocatable.s
+++ b/deps/lld/test/ELF/relocatable.s
@@ -3,18 +3,18 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/relocatable.s -o %t2.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/relocatable2.s -o %t3.o
 # RUN: ld.lld -r %t1.o %t2.o %t3.o -o %t
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols -r %t | FileCheck %s
+# RUN: llvm-readobj --file-headers --sections -l --symbols -r %t | FileCheck %s
 # RUN: llvm-objdump -section-headers %t | FileCheck -check-prefix=SECTION %s
 # RUN: llvm-objdump -s -d %t | FileCheck -check-prefix=CHECKTEXT %s
 
 ## Test --relocatable alias
 # RUN: ld.lld --relocatable %t1.o %t2.o %t3.o -o %t
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols -r %t | FileCheck %s
+# RUN: llvm-readobj --file-headers --sections -l --symbols -r %t | FileCheck %s
 # RUN: llvm-objdump -s -d %t | FileCheck -check-prefix=CHECKTEXT %s
 
 ## Verify that we can use our relocation output as input to produce executable
 # RUN: ld.lld -e main %t -o %texec
-# RUN: llvm-readobj -file-headers %texec | FileCheck -check-prefix=CHECKEXE %s
+# RUN: llvm-readobj --file-headers %texec | FileCheck -check-prefix=CHECKEXE %s
 
 # CHECK:       ElfHeader {
 # CHECK-NEXT:  Ident {
@@ -53,7 +53,7 @@
 # CHECK-NEXT:  }
 
 # SECTION: Sections:
-# SECTION: Idx Name          Size      Address          Type
+# SECTION: Idx Name          Size     VMA              Type
 # SECTION:   0               00000000 0000000000000000
 # SECTION:   1 .text         00000056 0000000000000000 TEXT
 # SECTION:   2 .rela.text    00000090 0000000000000000
@@ -64,6 +64,7 @@
 # SECTION:   7 .strtab       0000002d 0000000000000000
 
 # CHECKTEXT:      Disassembly of section .text:
+# CHECKTEXT-EMPTY:
 # CHECKTEXT-NEXT: main:
 # CHECKTEXT-NEXT: 0: c7 04 25 00 00 00 00 05 00 00 00 movl $5, 0
 # CHECKTEXT-NEXT: b: c7 04 25 00 00 00 00 07 00 00 00 movl $7, 0
diff --git a/deps/lld/test/ELF/relocation-b-aarch64.test b/deps/lld/test/ELF/relocation-b-aarch64.test
index 152cc39d8ac36bcc5c6f63d42f1eacc34d2aefd1..15ad4a6c16c71be081b8ca2b872fd2b634fd82ed 100644
--- a/deps/lld/test/ELF/relocation-b-aarch64.test
+++ b/deps/lld/test/ELF/relocation-b-aarch64.test
@@ -8,6 +8,7 @@
 # immediate. We use this property to overwrite instructions with a branch.
 
 # CHECK: Disassembly of section .text:
+# CHECK-EMPTY:
 # CHECK-NEXT: foo:
 # CHECK-NEXT:    210000:        01 00 00 14     b       #4
 # CHECK: bar:
@@ -37,12 +38,11 @@ Sections:
         Type:            R_AARCH64_JUMP26
 
 Symbols:
- Local:
-   - Type:             STT_FUNC
-     Section:          .text
-     Name:             foo
-     Value:            0
-   - Type:             STT_FUNC
-     Section:          .text
-     Name:             bar
-     Value:            4
+  - Type:             STT_FUNC
+    Section:          .text
+    Name:             foo
+    Value:            0
+  - Type:             STT_FUNC
+    Section:          .text
+    Name:             bar
+    Value:            4
diff --git a/deps/lld/test/ELF/relocation-before-merge-start.s b/deps/lld/test/ELF/relocation-before-merge-start.s
index 3550fd2efa65587db649db41000bb463710fc6e7..912032ad624cead1bc8e13df535e68e61e75f320 100644
--- a/deps/lld/test/ELF/relocation-before-merge-start.s
+++ b/deps/lld/test/ELF/relocation-before-merge-start.s
@@ -4,6 +4,6 @@
 // CHECK: relocation-before-merge-start.s.tmp.o:(.foo): offset is outside the section
 
 .data
-.long .foo - 1
+.quad .foo - 1
 .section	.foo,"aM",@progbits,4
 .quad 0
diff --git a/deps/lld/test/ELF/relocation-copy-align-common.s b/deps/lld/test/ELF/relocation-copy-align-common.s
index 56eab76cbf81fdff72e6a6b60b0c0361c58494e5..124064c71d14c2a2b64b35409361c1996dae597e 100644
--- a/deps/lld/test/ELF/relocation-copy-align-common.s
+++ b/deps/lld/test/ELF/relocation-copy-align-common.s
@@ -4,7 +4,7 @@
 # RUN:   %p/Inputs/relocation-copy-align-common.s -o %t2.o
 # RUN: ld.lld -shared %t2.o -o %t.so
 # RUN: ld.lld --hash-style=sysv %t.o %t.so -o %t3
-# RUN: llvm-readobj -s -r --expand-relocs %t3 | FileCheck %s
+# RUN: llvm-readobj -S -r --expand-relocs %t3 | FileCheck %s
 
 # CHECK:      Section {
 # CHECK:        Index:
diff --git a/deps/lld/test/ELF/relocation-copy-align.s b/deps/lld/test/ELF/relocation-copy-align.s
index 07ae6636e149c03212963793e02a3cbeb37b8d8f..78f05d2eb96de55bcbead8e85710bb5b2efe3ef4 100644
--- a/deps/lld/test/ELF/relocation-copy-align.s
+++ b/deps/lld/test/ELF/relocation-copy-align.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/relocation-copy-align.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t.so
 // RUN: ld.lld %t.o %t.so -o %t3
-// RUN: llvm-readobj -s -r --expand-relocs %t3 | FileCheck %s
+// RUN: llvm-readobj -S -r --expand-relocs %t3 | FileCheck %s
 
 .global _start
 _start:
diff --git a/deps/lld/test/ELF/relocation-copy-flags.s b/deps/lld/test/ELF/relocation-copy-flags.s
index 3f74bade3347ef853b4f4488a210c15f534b7993..7b85196c0b6668f2e4adb071d1ca0b0fdefccd41 100644
--- a/deps/lld/test/ELF/relocation-copy-flags.s
+++ b/deps/lld/test/ELF/relocation-copy-flags.s
@@ -4,7 +4,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/relocation-copy.s -o %t2.o
 // RUN: ld.lld %t2.o -o %t2.so -shared
 // RUN: ld.lld --hash-style=sysv %t.o %t2.so -o %t.exe
-// RUN: llvm-readobj -s -section-data -r %t.exe | FileCheck %s
+// RUN: llvm-readobj -S --section-data -r %t.exe | FileCheck %s
 
         .global _start
 _start:
@@ -30,7 +30,7 @@ _start:
 // CHECK-NEXT: AddressAlignment: 4
 // CHECK-NEXT: EntrySize: 0
 // CHECK-NEXT: SectionData (
-// CHECK-NEXT:   0000: 00402000
+// CHECK-NEXT:   0000: 10302000
 // CHECK-NEXT: )
 
 // CHECK:      Name: bar
@@ -39,8 +39,8 @@ _start:
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x202000
-// CHECK-NEXT: Offset: 0x2000
+// CHECK-NEXT: Address: 0x203000
+// CHECK-NEXT: Offset: 0x3000
 // CHECK-NEXT: Size: 8
 // CHECK-NEXT: Link: 0
 // CHECK-NEXT: Info: 0
@@ -55,7 +55,7 @@ _start:
 // CHECK-NEXT: Flags [
 // CHECK-NEXT: ]
 // CHECK-NEXT: Address: 0x0
-// CHECK-NEXT: Offset: 0x30B0
+// CHECK-NEXT: Offset: 0x3008
 // CHECK-NEXT: Size: 8
 // CHECK-NEXT: Link: 0
 // CHECK-NEXT: Info: 0
@@ -67,7 +67,7 @@ _start:
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section (4) .rela.dyn {
-// CHECK-NEXT:     0x204000 R_X86_64_COPY x 0x0
-// CHECK-NEXT:     0x202000 R_X86_64_64 z 0x0
+// CHECK-NEXT:     0x203010 R_X86_64_COPY x 0x0
+// CHECK-NEXT:     0x203000 R_X86_64_64 z 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
diff --git a/deps/lld/test/ELF/relocation-copy-i686.s b/deps/lld/test/ELF/relocation-copy-i686.s
index 8b14f9aadde6f52a4acf5579051bab1e8ccde642..e5ec99d162f65b6aaee758793a3e7317d3a7d8a6 100644
--- a/deps/lld/test/ELF/relocation-copy-i686.s
+++ b/deps/lld/test/ELF/relocation-copy-i686.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %p/Inputs/relocation-copy.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t.so
 // RUN: ld.lld -e main %t.o %t.so -o %t3
-// RUN: llvm-readobj -s -r --expand-relocs %t3 | FileCheck %s
+// RUN: llvm-readobj -S -r --expand-relocs %t3 | FileCheck %s
 // RUN: llvm-objdump -d %t3 | FileCheck -check-prefix=CODE %s
 
 .text
@@ -57,6 +57,7 @@ movl $9, z
 // 4206608 =  0x403000 + 16
 // 4206612 =  0x403000 + 16 + 4
 // CODE: Disassembly of section .text:
+// CODE-EMPTY:
 // CODE-NEXT: main:
 // CODE-NEXT: 401000: c7 05 00 30 40 00 05 00 00 00 movl $5, 4206592
 // CODE-NEXT: 40100a: c7 05 10 30 40 00 07 00 00 00 movl $7, 4206608
diff --git a/deps/lld/test/ELF/relocation-copy-relro.s b/deps/lld/test/ELF/relocation-copy-relro.s
index 947c6c73f67427a50cdbd20a09a773a119f57d37..5f03c6910ab6f87a751a65f36c81ed20c314af50 100644
--- a/deps/lld/test/ELF/relocation-copy-relro.s
+++ b/deps/lld/test/ELF/relocation-copy-relro.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/relocation-copy-relro.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t.so
 // RUN: ld.lld --hash-style=sysv %t.o %t.so -o %t3
-// RUN: llvm-readobj -program-headers -s -r %t3 | FileCheck %s
+// RUN: llvm-readobj -S -l -r %t3 | FileCheck %s
 
 // CHECK:        Name: .bss.rel.ro (48)
 // CHECK-NEXT:   Type: SHT_NOBITS (0x8)
diff --git a/deps/lld/test/ELF/relocation-copy.s b/deps/lld/test/ELF/relocation-copy.s
index 9a3254fb25491e8cc2d1cbda4f33d2b58ee72b5d..08d648183fc595061b421fb0c882686adce39eeb 100644
--- a/deps/lld/test/ELF/relocation-copy.s
+++ b/deps/lld/test/ELF/relocation-copy.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/relocation-copy.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t.so
 // RUN: ld.lld %t.o %t.so -o %t3
-// RUN: llvm-readobj -s -r --expand-relocs %t3 | FileCheck %s
+// RUN: llvm-readobj -S -r --expand-relocs %t3 | FileCheck %s
 // RUN: llvm-objdump -d %t3 | FileCheck -check-prefix=CODE %s
 
 .text
@@ -58,6 +58,7 @@ movl $z, %edx
 // 2109456 = 0x203000 + 16
 // 2109460 = 0x203000 + 16 + 4
 // CODE: Disassembly of section .text:
+// CODE-EMPTY:
 // CODE-NEXT: _start:
 // CODE-NEXT: 201000: {{.*}} movl $5, 2109440
 // CODE-NEXT: 20100b: {{.*}} movl $7, 2109456
diff --git a/deps/lld/test/ELF/relocation-dtrace.test b/deps/lld/test/ELF/relocation-dtrace.test
deleted file mode 100644
index 9007a265bfaa88dd53929769764e1059f13579f9..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/relocation-dtrace.test
+++ /dev/null
@@ -1,24 +0,0 @@
-# RUN: yaml2obj %s -o %t.o
-# RUN: ld.lld -shared %t.o -o /dev/null
-
-# Test that we can handle R_X86_64_NONE as produced by dtrace.
-
-!ELF
-FileHeader:
-  Class:           ELFCLASS64
-  Data:            ELFDATA2LSB
-  OSABI:           ELFOSABI_FREEBSD
-  Type:            ET_REL
-  Machine:         EM_X86_64
-Sections:
-  - Name:            .text
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC ]
-  - Name:            .rela.text
-    Type:            SHT_RELA
-    Link:            .symtab
-    Info:            .text
-    Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          ''
-        Type:            R_X86_64_NONE
diff --git a/deps/lld/test/ELF/relocation-group.test b/deps/lld/test/ELF/relocation-group.test
index 0820ff8b9352dbe390d02610ab8b9b39173ee312..f3d49aac886ff407592ac51989b686ede6a8d45c 100644
--- a/deps/lld/test/ELF/relocation-group.test
+++ b/deps/lld/test/ELF/relocation-group.test
@@ -1,6 +1,6 @@
 # RUN: yaml2obj %s -o %t.o
 # RUN: ld.lld %t.o %t.o -o %t -r
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 # CHECK:     Name: .text.foo
 # CHECK:     Name: .rela.text.foo
@@ -39,5 +39,5 @@ Sections:
         Symbol:          foo
         Type:            R_X86_64_64
 Symbols:
-  Global:
-    - Name:            foo
+  - Name:    foo
+    Binding: STB_GLOBAL
diff --git a/deps/lld/test/ELF/relocation-i686.s b/deps/lld/test/ELF/relocation-i686.s
index 6ca487c0ab1115a2c10010eda143aa678ca664b3..388dd9c7163e9ceeaf2cae3aa229de8b7655138f 100644
--- a/deps/lld/test/ELF/relocation-i686.s
+++ b/deps/lld/test/ELF/relocation-i686.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld --hash-style=sysv %t %t2.so -o %t2
-// RUN: llvm-readobj -s %t2 | FileCheck --check-prefix=ADDR %s
+// RUN: llvm-readobj -S %t2 | FileCheck --check-prefix=ADDR %s
 // RUN: llvm-objdump -d %t2 | FileCheck %s
 
 .global _start
@@ -26,10 +26,12 @@ R_386_PC32_2:
   nop
 
 // CHECK: Disassembly of section .R_386_32:
+// CHECK-EMPTY:
 // CHECK-NEXT: R_386_32:
 // CHECK-NEXT:  401000: {{.*}} movl $4198401, %edx
 
 // CHECK: Disassembly of section .R_386_PC32:
+// CHECK-EMPTY:
 // CHECK-NEXT: R_386_PC32:
 // CHECK-NEXT:   401005:  e8 04 00 00 00  calll 4
 
@@ -49,30 +51,32 @@ movl bar@GOT, %eax
 // ADDR-NEXT: Offset: 0x1040
 // ADDR-NEXT: Size: 32
 
-// ADDR:      Name: .got (
+// ADDR:      Name: .got.plt (
 // ADDR-NEXT: Type: SHT_PROGBITS
 // ADDR-NEXT: Flags [
 // ADDR-NEXT:   SHF_ALLOC
 // ADDR-NEXT:   SHF_WRITE
 // ADDR-NEXT: ]
-// ADDR-NEXT: Address: 0x403078
+// ADDR-NEXT: Address: 0x403000
 // ADDR-NEXT: Offset:
-// ADDR-NEXT: Size: 8
+// ADDR-NEXT: Size:
 
 .section .R_386_GOTPC,"ax",@progbits
 R_386_GOTPC:
  movl $_GLOBAL_OFFSET_TABLE_, %eax
 
-// 0x402078 + 8 - 0x401014 = 4204
+// 0x403000 (.got.plt) - 0x401014 = 8300
 
 // CHECK:      Disassembly of section .R_386_GOTPC:
+// CHECK-EMPTY:
 // CHECK-NEXT: R_386_GOTPC:
-// CHECK-NEXT:   401014:  {{.*}} movl  $8300, %eax
+// CHECK-NEXT:   401014:  {{.*}} movl  $8172, %eax
 
 .section .dynamic_reloc, "ax",@progbits
  call bar
 // addr(.plt) + 16 - (0x401019 + 5) = 50
 // CHECK:      Disassembly of section .dynamic_reloc:
+// CHECK-EMPTY:
 // CHECK-NEXT: .dynamic_reloc:
 // CHECK-NEXT:   401019:  e8 32 00 00 00 calll 50
 
@@ -84,13 +88,12 @@ R_386_GOT32:
  movl bar+8@GOT, %eax
  movl zed+4@GOT, %eax
 
-// 4294967288 = 0xFFFFFFF8 = got[0](0x402070) - .got(0x402070) - sizeof(.got)(8)
-// 4294967292 = 0xFFFFFFFC = got[1](0x402074) - .got(0x402070) - sizeof(.got)(8)
-// 0xFFFFFFF8 + 8 = 0
-// 0xFFFFFFFC + 4 = 0
+// 4294963320 = 0xfffff078 = got[0](0x402078) - .got.plt(0x403000)
+// 4294963324 = 0xfffff07c = got[1](0x40207c) - .got(0x403000)
 // CHECK:      Disassembly of section .R_386_GOT32:
+// CHECK-EMPTY:
 // CHECK-NEXT: R_386_GOT32:
-// CHECK-NEXT: 40101e: a1 f8 ff ff ff movl 4294967288, %eax
-// CHECK-NEXT: 401023: a1 fc ff ff ff movl 4294967292, %eax
-// CHECK-NEXT: 401028: a1 00 00 00 00 movl 0, %eax
-// CHECK-NEXT: 40102d: a1 00 00 00 00 movl 0, %eax
+// CHECK-NEXT: 40101e: a1 78 f0 ff ff movl 4294963320, %eax
+// CHECK-NEXT: 401023: a1 7c f0 ff ff movl 4294963324, %eax
+// CHECK-NEXT: 401028: a1 80 f0 ff ff movl 4294963328, %eax
+// CHECK-NEXT: 40102d: a1 80 f0 ff ff movl 4294963328, %eax
diff --git a/deps/lld/test/ELF/relocation-local.s b/deps/lld/test/ELF/relocation-local.s
index 383c5c82f64a12f2fab9e68dd4140cccf460e785..646660415d9408be687ac5ca0c8131fea814842f 100644
--- a/deps/lld/test/ELF/relocation-local.s
+++ b/deps/lld/test/ELF/relocation-local.s
@@ -19,6 +19,7 @@ R_X86_64_32:
 // FIXME: this would be far more self evident if llvm-objdump printed
 // constants in hex.
 // CHECK: Disassembly of section .text2:
+// CHECK-EMPTY:
 // CHECK-NEXT: R_X86_64_32:
 // CHECK-NEXT:  201009: {{.*}} movl $2101257, %edx
 
@@ -27,6 +28,7 @@ R_X86_64_32S:
   movq lulz - 0x100000, %rdx
 
 // CHECK: Disassembly of section .R_X86_64_32S:
+// CHECK-EMPTY:
 // CHECK-NEXT: R_X86_64_32S:
 // CHECK-NEXT:  {{.*}}: {{.*}} movq 1052681, %rdx
 
diff --git a/deps/lld/test/ELF/relocation-non-alloc.s b/deps/lld/test/ELF/relocation-non-alloc.s
index 95166fbe0d4a1a30f64d34f296afb6791ecdf276..04f3e396420617cbacb434f0247650ac0b636c27 100644
--- a/deps/lld/test/ELF/relocation-non-alloc.s
+++ b/deps/lld/test/ELF/relocation-non-alloc.s
@@ -2,12 +2,12 @@
 
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: ld.lld %t -o %t2 -shared --apply-dynamic-relocs
-// RUN: llvm-readobj -s -section-data -r %t2 | FileCheck -check-prefix CHECK -check-prefix APPLYDYNREL %s
+// RUN: llvm-readobj -S --section-data -r %t2 | FileCheck -check-prefix CHECK -check-prefix APPLYDYNREL %s
 
 // RUN: ld.lld %t -o %t2 -shared
-// RUN: llvm-readobj -s -section-data -r %t2 | FileCheck -check-prefix CHECK -check-prefix NOAPPLYDYNREL %s
+// RUN: llvm-readobj -S --section-data -r %t2 | FileCheck -check-prefix CHECK -check-prefix NOAPPLYDYNREL %s
 // RUN: ld.lld %t -o %t2 -shared --no-apply-dynamic-relocs
-// RUN: llvm-readobj -s -section-data -r %t2 | FileCheck -check-prefix CHECK -check-prefix NOAPPLYDYNREL %s
+// RUN: llvm-readobj -S --section-data -r %t2 | FileCheck -check-prefix CHECK -check-prefix NOAPPLYDYNREL %s
 
 // APPLYDYNREL:      Name: .data
 // APPLYDYNREL-NEXT: Type: SHT_PROGBITS
@@ -15,15 +15,15 @@
 // APPLYDYNREL-NEXT:   SHF_ALLOC
 // APPLYDYNREL-NEXT:   SHF_WRITE
 // APPLYDYNREL-NEXT: ]
-// APPLYDYNREL-NEXT: Address: 0x1000
-// APPLYDYNREL-NEXT: Offset: 0x1000
+// APPLYDYNREL-NEXT: Address: 0x2000
+// APPLYDYNREL-NEXT: Offset: 0x2000
 // APPLYDYNREL-NEXT: Size: 16
 // APPLYDYNREL-NEXT: Link: 0
 // APPLYDYNREL-NEXT: Info: 0
 // APPLYDYNREL-NEXT: AddressAlignment: 1
 // APPLYDYNREL-NEXT: EntrySize: 0
 // APPLYDYNREL-NEXT: SectionData (
-// APPLYDYNREL-NEXT:   0000: 00100000 00000000 00000000 00000000
+// APPLYDYNREL-NEXT:   0000: 00200000 00000000 00000000 00000000
 // APPLYDYNREL-NEXT: )
 
 // NOAPPLYDYNREL:      Name: .data
@@ -32,8 +32,8 @@
 // NOAPPLYDYNREL-NEXT:   SHF_ALLOC
 // NOAPPLYDYNREL-NEXT:   SHF_WRITE
 // NOAPPLYDYNREL-NEXT: ]
-// NOAPPLYDYNREL-NEXT: Address: 0x1000
-// NOAPPLYDYNREL-NEXT: Offset: 0x1000
+// NOAPPLYDYNREL-NEXT: Address: 0x2000
+// NOAPPLYDYNREL-NEXT: Offset: 0x2000
 // NOAPPLYDYNREL-NEXT: Size: 16
 // NOAPPLYDYNREL-NEXT: Link: 0
 // NOAPPLYDYNREL-NEXT: Info: 0
@@ -55,14 +55,14 @@
 // CHECK-NEXT: AddressAlignment: 1
 // CHECK-NEXT: EntrySize: 0
 // CHECK-NEXT: SectionData (
-// CHECK-NEXT:   0000: 00100000 00000000 00100000 00000000
-// CHECK-NEXT:   0010: 00100000 00000000 00100000 00000000
+// CHECK-NEXT:   0000: 00200000 00000000 00200000 00000000
+// CHECK-NEXT:   0010: 00200000 00000000 00200000 00000000
 // CHECK-NEXT: )
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.}}) .rela.dyn {
-// CHECK-NEXT:     0x1000 R_X86_64_RELATIVE - 0x1000
-// CHECK-NEXT:     0x1008 R_X86_64_64 zed 0x0
+// CHECK-NEXT:     0x2000 R_X86_64_RELATIVE - 0x2000
+// CHECK-NEXT:     0x2008 R_X86_64_64 zed 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
diff --git a/deps/lld/test/ELF/relocation-none-aarch64.s b/deps/lld/test/ELF/relocation-none-aarch64.s
new file mode 100644
index 0000000000000000000000000000000000000000..7783c127cf867a6a10939c552fe1ab3fe9e61664
--- /dev/null
+++ b/deps/lld/test/ELF/relocation-none-aarch64.s
@@ -0,0 +1,26 @@
+# REQUIRES: aarch64
+
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-musl %s -o %t.o
+# RUN: ld.lld --gc-sections %t.o -o %t
+# RUN: llvm-readelf -S -r %t | FileCheck %s
+
+# Test that we discard R_AARCH64_NONE, but respect the references it creates
+# among sections.
+
+# CHECK: .data
+# CHECK: There are no relocations in this file.
+
+# RUN: ld.lld -r %t.o -o %t
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC %s
+
+# RELOC:      Section ({{.*}}) .rela.text {
+# RELOC-NEXT:   0x0 R_AARCH64_NONE .data 0x0
+# RELOC-NEXT: }
+
+.globl _start
+_start:
+  ret
+  .reloc 0, R_AARCH64_NONE, .data
+
+.data
+  .long 0
diff --git a/deps/lld/test/ELF/relocation-none-aarch64.test b/deps/lld/test/ELF/relocation-none-aarch64.test
deleted file mode 100644
index e77989a54a83e9b275054c0cf186fbbeff2cccf2..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/relocation-none-aarch64.test
+++ /dev/null
@@ -1,24 +0,0 @@
-# REQUIRES: aarch64
-
-# RUN: yaml2obj %s -o %t.o
-# RUN: ld.lld %t.o -o /dev/null
-
-!ELF
-FileHeader:
-  Class:           ELFCLASS64
-  Data:            ELFDATA2LSB
-  Type:            ET_REL
-  Machine:         EM_AARCH64
-Sections:
-  - Type:            SHT_PROGBITS
-    Name:            .text
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-    Content:         "00000000"
-  - Type:            SHT_RELA
-    Name:            .rela.text
-    Link:            .symtab
-    Info:            .text
-    Relocations:
-      - Offset:          0
-        Symbol:          ''
-        Type:            R_AARCH64_NONE
diff --git a/deps/lld/test/ELF/relocation-none-arm.s b/deps/lld/test/ELF/relocation-none-arm.s
new file mode 100644
index 0000000000000000000000000000000000000000..dc4eaa7b0b8d7c8004a702f22bc54cf822f1fab4
--- /dev/null
+++ b/deps/lld/test/ELF/relocation-none-arm.s
@@ -0,0 +1,26 @@
+# REQUIRES: arm
+
+# RUN: llvm-mc -filetype=obj -triple=armv7-linux-musl %s -o %t.o
+# RUN: ld.lld --gc-sections %t.o -o %t
+# RUN: llvm-readelf -S -r %t | FileCheck %s
+
+# Test that we discard R_ARM_NONE, but respect the references it creates among
+# sections.
+
+# CHECK: .data
+# CHECK: There are no relocations in this file.
+
+# RUN: ld.lld -r %t.o -o %t
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC %s
+
+# RELOC:      Section ({{.*}}) .rel.text {
+# RELOC-NEXT:   0x0 R_ARM_NONE .data 0x0
+# RELOC-NEXT: }
+
+.globl _start
+_start:
+  nop
+  .reloc 0, R_ARM_NONE, .data
+
+.data
+  .long 0
diff --git a/deps/lld/test/ELF/relocation-none-i386.s b/deps/lld/test/ELF/relocation-none-i386.s
new file mode 100644
index 0000000000000000000000000000000000000000..4174dc1ec382ba85e1294791f8c290b01df89873
--- /dev/null
+++ b/deps/lld/test/ELF/relocation-none-i386.s
@@ -0,0 +1,26 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -filetype=obj -triple=i386-linux-musl %s -o %t.o
+# RUN: ld.lld --gc-sections %t.o -o %t
+# RUN: llvm-readelf -S -r %t | FileCheck %s
+
+# Test that we discard R_386_NONE, but respect the
+# references it creates among sections.
+
+# CHECK: .data
+# CHECK: There are no relocations in this file.
+
+# RUN: ld.lld -r %t.o -o %t
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC %s
+
+# RELOC:      Section ({{.*}}) .rel.text {
+# RELOC-NEXT:   0x0 R_386_NONE .data 0x0
+# RELOC-NEXT: }
+
+.globl _start
+_start:
+  ret
+  .reloc 0, R_386_NONE, .data
+
+.data
+  .long 0
diff --git a/deps/lld/test/ELF/relocation-none-i686.test b/deps/lld/test/ELF/relocation-none-i686.test
deleted file mode 100644
index 82dc4e608c03791460664004e701a85b341d91e0..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/relocation-none-i686.test
+++ /dev/null
@@ -1,23 +0,0 @@
-# RUN: yaml2obj %s -o %t.o
-# RUN: ld.lld %t.o -o /dev/null
-
-# Test that we can handle R_386_NONE.
-
-!ELF
-FileHeader:
-  Class:           ELFCLASS32
-  Data:            ELFDATA2LSB
-  Type:            ET_REL
-  Machine:         EM_386
-Sections:
-  - Name:            .text
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC ]
-  - Name:            .rel.text
-    Type:            SHT_RELA
-    Link:            .symtab
-    Info:            .text
-    Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          ''
-        Type:            R_386_NONE
diff --git a/deps/lld/test/ELF/relocation-none-x86-64.s b/deps/lld/test/ELF/relocation-none-x86-64.s
new file mode 100644
index 0000000000000000000000000000000000000000..be6b07c3f5022ae0166a7a1295512e6763ac67db
--- /dev/null
+++ b/deps/lld/test/ELF/relocation-none-x86-64.s
@@ -0,0 +1,26 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-linux-musl %s -o %t.o
+# RUN: ld.lld --gc-sections %t.o -o %t
+# RUN: llvm-readelf -S -r %t | FileCheck %s
+
+# Test that we discard R_X86_64_NONE, but respect the
+# references it creates among sections.
+
+# CHECK: .data
+# CHECK: There are no relocations in this file.
+
+# RUN: ld.lld -r %t.o -o %t
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC %s
+
+# RELOC:      Section ({{.*}}) .rela.text {
+# RELOC-NEXT:   0x0 R_X86_64_NONE .data 0x0
+# RELOC-NEXT: }
+
+.globl _start
+_start:
+  ret
+  .reloc 0, R_X86_64_NONE, .data
+
+.data
+  .long 0
diff --git a/deps/lld/test/ELF/relocation-past-merge-end.s b/deps/lld/test/ELF/relocation-past-merge-end.s
index 53015bc9013db9d22a8f2b99ac69ff619d7ffb05..15214a5a4fc05da567ee2e4a96db233296725e1c 100644
--- a/deps/lld/test/ELF/relocation-past-merge-end.s
+++ b/deps/lld/test/ELF/relocation-past-merge-end.s
@@ -4,6 +4,6 @@
 // CHECK: relocation-past-merge-end.s.tmp.o:(.foo): offset is outside the section
 
 .data
-.long .foo + 10
+.quad .foo + 10
 .section	.foo,"aM",@progbits,4
 .quad 0
diff --git a/deps/lld/test/ELF/relocation-relative-synthetic.s b/deps/lld/test/ELF/relocation-relative-synthetic.s
index f4d449b844e49ef75ff0052eda2d6165f16ecc20..16feaa503f19e28b2c9e700265f92fdede50edee 100644
--- a/deps/lld/test/ELF/relocation-relative-synthetic.s
+++ b/deps/lld/test/ELF/relocation-relative-synthetic.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t -pie
-# RUN: llvm-readobj -dyn-relocations %t | FileCheck %s
+# RUN: llvm-readobj --dyn-relocations %t | FileCheck %s
 
 # CHECK:      Dynamic Relocations {
 # CHECK-NEXT: }
diff --git a/deps/lld/test/ELF/relocation-relative-weak.s b/deps/lld/test/ELF/relocation-relative-weak.s
index 7f28fced7116109af0e3d303299b43ba37bf1191..ff1c79ddb26107ea05db8747d24b59e5349f865b 100644
--- a/deps/lld/test/ELF/relocation-relative-weak.s
+++ b/deps/lld/test/ELF/relocation-relative-weak.s
@@ -1,10 +1,12 @@
 # REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/dummy-shared.s -o %t1.o
+# RUN: ld.lld %t1.o -shared -o %t1.so
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-# RUN: ld.lld %t.o -o %t -pie
-# RUN: llvm-readobj -dyn-relocations %t | FileCheck %s
+# RUN: ld.lld %t.o %t1.so -o %t -pie
+# RUN: llvm-readobj --dyn-relocations %t | FileCheck %s
 
 # CHECK:      Dynamic Relocations {
-# CHECK-NEXT:   0x2018 R_X86_64_JUMP_SLOT w 0x0
+# CHECK-NEXT:   0x3018 R_X86_64_JUMP_SLOT w 0x0
 # CHECK-NEXT: }
 
 .globl _start
diff --git a/deps/lld/test/ELF/relocation-shared.s b/deps/lld/test/ELF/relocation-shared.s
index 81537cec1ef56a32c4d64a181fcb55a10be9643d..40a16c4f7a29bf991647a5edba29c7df76c6d267 100644
--- a/deps/lld/test/ELF/relocation-shared.s
+++ b/deps/lld/test/ELF/relocation-shared.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -shared -o %t.so
-// RUN: llvm-readobj -r -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -r -S --section-data %t.so | FileCheck %s
 
 // CHECK:      Name: foo
 // CHECK-NEXT: Type: SHT_PROGBITS
diff --git a/deps/lld/test/ELF/relocation-size-shared.s b/deps/lld/test/ELF/relocation-size-shared.s
index 1aa2222d9494e09b8b477ac1f846d53bf1f8c31b..13f52bc722e34a883845db958bd1c2922f2fb16c 100644
--- a/deps/lld/test/ELF/relocation-size-shared.s
+++ b/deps/lld/test/ELF/relocation-size-shared.s
@@ -18,6 +18,7 @@
 // RELOCSHARED-NEXT:]
 
 // DISASM:      Disassembly of section test
+// DISASM-EMPTY:
 // DISASM:      _data:
 // DISASM-NEXT: 201000: 19 00
 // DISASM-NEXT: 201002: 00 00
diff --git a/deps/lld/test/ELF/relocation-size.s b/deps/lld/test/ELF/relocation-size.s
index c2554a4e4fc111553bcb3bc652a923b03f4372d1..58df74c1c8e4347d18664906e50fa28db7a47c18 100644
--- a/deps/lld/test/ELF/relocation-size.s
+++ b/deps/lld/test/ELF/relocation-size.s
@@ -11,6 +11,7 @@
 // NORELOC-NEXT: ]
 
 // DISASM:      Disassembly of section test:
+// DISASM-EMPTY:
 // DISASM-NEXT: _data:
 // DISASM-NEXT: 201000: 19 00
 // DISASM-NEXT: 201002: 00 00
@@ -56,6 +57,7 @@
 // RELOCSHARED-NEXT: ]
 
 // DISASMSHARED:      Disassembly of section test:
+// DISASMSHARED-EMPTY:
 // DISASMSHARED-NEXT: _data:
 // DISASMSHARED-NEXT: ...
 // DISASMSHARED-NEXT: 1018: 19 00
diff --git a/deps/lld/test/ELF/relocation-undefined-weak.s b/deps/lld/test/ELF/relocation-undefined-weak.s
index 7ea247fd5d6e6cb16aefde471f31c2c37eb6a612..2d83c6e3d457dc2b709b7346c3f29e8472d89230 100644
--- a/deps/lld/test/ELF/relocation-undefined-weak.s
+++ b/deps/lld/test/ELF/relocation-undefined-weak.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: ld.lld %t -o %tout
-// RUN: llvm-readobj -sections %tout | FileCheck %s
+// RUN: llvm-readobj --sections %tout | FileCheck %s
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix DISASM
 
 // Check that undefined weak symbols are treated as having a VA of 0.
diff --git a/deps/lld/test/ELF/relocation.s b/deps/lld/test/ELF/relocation.s
index 00b75d25f968fefb600a3f3ccdd6e7081398f357..3905f8808fa73301599e9dabaf67ba7f821b5ed4 100644
--- a/deps/lld/test/ELF/relocation.s
+++ b/deps/lld/test/ELF/relocation.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/shared.s -o %t2
 // RUN: ld.lld %t2 -soname fixed-length-string.so -o %t2.so -shared
 // RUN: ld.lld --hash-style=sysv %t %t2.so -o %t3
-// RUN: llvm-readobj -s  %t3 | FileCheck --check-prefix=SEC %s
+// RUN: llvm-readobj -S  %t3 | FileCheck --check-prefix=SEC %s
 // RUN: llvm-objdump -s -d %t3 | FileCheck %s
 
 // SEC:      Name: .plt
@@ -16,28 +16,13 @@
 // SEC-NEXT: Offset: 0x1030
 // SEC-NEXT: Size: 48
 
-// SEC:        Name: .got.plt
-// SEC-NEXT:   Type: SHT_PROGBITS
-// SEC-NEXT:   Flags [
-// SEC-NEXT:     SHF_ALLOC
-// SEC-NEXT:     SHF_WRITE
-// SEC-NEXT:   ]
-// SEC-NEXT:   Address: 0x202000
-// SEC-NEXT:   Offset: 0x2000
-// SEC-NEXT:   Size: 40
-// SEC-NEXT:   Link: 0
-// SEC-NEXT:   Info: 0
-// SEC-NEXT:   AddressAlignment: 8
-// SEC-NEXT:   EntrySize: 0
-// SEC-NEXT:   }
-
 // SEC:         Name: .got
 // SEC-NEXT:   Type: SHT_PROGBITS
 // SEC-NEXT:   Flags [
 // SEC-NEXT:     SHF_ALLOC
 // SEC-NEXT:     SHF_WRITE
 // SEC-NEXT:   ]
-// SEC-NEXT:   Address: 0x2030F0
+// SEC-NEXT:   Address: 0x2020F0
 // SEC-NEXT:   Offset:
 // SEC-NEXT:   Size: 8
 // SEC-NEXT:   Link: 0
@@ -46,6 +31,21 @@
 // SEC-NEXT:   EntrySize: 0
 // SEC-NEXT: }
 
+// SEC:        Name: .got.plt
+// SEC-NEXT:   Type: SHT_PROGBITS
+// SEC-NEXT:   Flags [
+// SEC-NEXT:     SHF_ALLOC
+// SEC-NEXT:     SHF_WRITE
+// SEC-NEXT:   ]
+// SEC-NEXT:   Address: 0x203000
+// SEC-NEXT:   Offset: 0x3000
+// SEC-NEXT:   Size: 40
+// SEC-NEXT:   Link: 0
+// SEC-NEXT:   Info: 0
+// SEC-NEXT:   AddressAlignment: 8
+// SEC-NEXT:   EntrySize: 0
+// SEC-NEXT:   }
+
 .section       .text,"ax",@progbits,unique,1
 .global _start
 _start:
@@ -58,6 +58,7 @@ lulz:
   nop
 
 // CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
 // CHECK-NEXT: _start:
 // CHECK-NEXT:   201000:  e8 04 00 00 00   callq 4
 // CHECK-NEXT:   201005:
@@ -74,6 +75,7 @@ R_X86_64_32:
 // FIXME: this would be far more self evident if llvm-objdump printed
 // constants in hex.
 // CHECK: Disassembly of section .text2:
+// CHECK-EMPTY:
 // CHECK-NEXT: R_X86_64_32:
 // CHECK-NEXT:  20100a: {{.*}} movl $2101258, %edx
 
@@ -83,6 +85,7 @@ R_X86_64_32S:
   movq lulz - 0x100000, %rdx
 
 // CHECK: Disassembly of section .R_X86_64_32S:
+// CHECK-EMPTY:
 // CHECK-NEXT: R_X86_64_32S:
 // CHECK-NEXT:  {{.*}}: {{.*}} movq 1052681, %rdx
 
@@ -94,6 +97,7 @@ R_X86_64_PC32:
 //16 is a size of PLT[0]
 // 0x201030 + 16 - (0x201017 + 5) = 20
 // CHECK:      Disassembly of section .R_X86_64_PC32:
+// CHECK-EMPTY:
 // CHECK-NEXT: R_X86_64_PC32:
 // CHECK-NEXT:  201017:   {{.*}}  callq  36
 // CHECK-NEXT:  20101c:   {{.*}}  movl $2101312, %eax
@@ -104,6 +108,7 @@ R_X86_64_32S_2:
   mov bar2, %eax
 // plt is  at 0x201030. The second plt entry is at 0x201050 == 69712
 // CHECK:      Disassembly of section .R_X86_64_32S_2:
+// CHECK-EMPTY:
 // CHECK-NEXT: R_X86_64_32S_2:
 // CHECK-NEXT: 201021: {{.*}}  movl    2101328, %eax
 
@@ -113,16 +118,16 @@ R_X86_64_64:
  .quad R_X86_64_64
 
 // CHECK:      Contents of section .R_X86_64_64:
-// CHECK-NEXT:   2002c0 c0022000 00000000
+// CHECK-NEXT:   2002f8 f8022000 00000000
 
 .section .R_X86_64_GOTPCREL,"a",@progbits
 .global R_X86_64_GOTPCREL
 R_X86_64_GOTPCREL:
  .long zed@gotpcrel
 
-// 0x2030F0(.got) - 0x2002c8(.R_X86_64_GOTPCREL) = 0x2e28
+// 0x2020F0(.got) - 0x2002c8(.R_X86_64_GOTPCREL) = 0x1e28
 // CHECK:      Contents of section .R_X86_64_GOTPCREL
-// CHECK-NEXT:   2002c8 282e0000
+// CHECK-NEXT:   200300 f01d0000
 
 .section .R_X86_64_GOT32,"a",@progbits
 .global R_X86_64_GOT32
@@ -130,11 +135,11 @@ R_X86_64_GOT32:
         .long zed@got
 
 // CHECK: Contents of section .R_X86_64_GOT32:
-// CHECK-NEXT: f8ffffff
+// CHECK-NEXT: f0f0ffff
 
 
 // CHECK: Contents of section .R_X86_64_GOT64:
-// CHECK-NEXT: f8ffffff ffffffff
+// CHECK-NEXT: f0f0ffff ffffffff
 .section .R_X86_64_GOT64,"a",@progbits
 .global R_X86_64_GOT64
 R_X86_64_GOT64:
diff --git a/deps/lld/test/ELF/relro-bss.s b/deps/lld/test/ELF/relro-bss.s
new file mode 100644
index 0000000000000000000000000000000000000000..20a3333f3c95ead5cf397f6402dce838c28e5c2c
--- /dev/null
+++ b/deps/lld/test/ELF/relro-bss.s
@@ -0,0 +1,44 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-readelf -l %t | FileCheck --check-prefix=SEG %s
+# RUN: llvm-readelf -S %t | FileCheck %s
+
+# We have 2 RW PT_LOAD segments. p_offset p_vaddr p_paddr p_filesz of the first
+# should match PT_GNU_RELRO.
+# Because .bss.rel.ro (nobits) doesn't take space, p_filesz < p_memsz.
+
+#           Type           Offset   VirtAddr           PhysAddr           FileSiz  MemSiz   Flg Align
+# SEG:      LOAD           0x001000 0x0000000000201000 0x0000000000201000 0x000001 0x000001 R E 0x1000
+# SEG-NEXT: LOAD           0x002000 0x0000000000202000 0x0000000000202000 0x000001 0x002001 RW  0x1000
+# SEG-NEXT: LOAD           0x003000 0x0000000000205000 0x0000000000205000 0x000001 0x000002 RW  0x1000
+# SEG-NEXT: GNU_RELRO      0x002000 0x0000000000202000 0x0000000000202000 0x000001 0x003000 R   0x1
+# SEG-NEXT: GNU_STACK      0x000000 0x0000000000000000 0x0000000000000000 0x000000 0x000000 RW  0x0
+
+# SEG:      .text
+# SEG-NEXT: .data.rel.ro .bss.rel.ro
+# SEG-NEXT: .data .bss
+
+# And .data is placed in the next page (sh_offset = alignTo(0x2001, 4096) = 0x3000).
+
+#        [Nr] Name              Type            Address          Off    Size
+# CHECK:      .data.rel.ro      PROGBITS        0000000000202000 002000 000001
+# CHECK-NEXT: .bss.rel.ro       NOBITS          0000000000202001 002001 002000
+# CHECK-NEXT: .data             PROGBITS        0000000000205000 003000 000001
+# CHECK-NEXT: .bss              NOBITS          0000000000205001 003001 000001
+
+.globl _start
+_start:
+  ret
+
+.section .data.rel.ro, "aw"
+.space 1
+
+.section .bss.rel.ro, "aw", @nobits
+.space 8192
+
+.section .data, "aw"
+.space 1
+
+.section .bss, "aw"
+.space 1
diff --git a/deps/lld/test/ELF/relro-non-contiguous.s b/deps/lld/test/ELF/relro-non-contiguous.s
index 8fdf64a37456401313da584a22e06d6132d6f1cb..99cd59ee15627f414acb36aa07f5e8b0b59f794d 100644
--- a/deps/lld/test/ELF/relro-non-contiguous.s
+++ b/deps/lld/test/ELF/relro-non-contiguous.s
@@ -3,12 +3,12 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/copy-in-shared.s -o %t2.o
 // RUN: ld.lld -shared %t.o %t2.o -o %t.so
 
-// Place the .got.plt (non relro) immediately after .dynamic. This is the
-// reverse order of the non-linker script case. The linker created .bss.rel.ro
-// section will be placed after .got.plt causing the relro to be non-contiguous.
+// Separate RelRo sections .dynamic .bss.rel.ro with non RelRo .got.plt.
+// This causes the RelRo sections to be non-contiguous.
 // RUN: echo "SECTIONS { \
 // RUN: .dynamic : { *(.dynamic) } \
 // RUN: .got.plt : { *(.got.plt) } \
+// RUN: .bss.rel.ro : { *(.bss.rel.o) } \
 // RUN: } " > %t.script
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t3.o
 
diff --git a/deps/lld/test/ELF/relro-omagic.s b/deps/lld/test/ELF/relro-omagic.s
index ba0ca72e219b95df2f50083b6743a8a4f2b80a1b..1d4909c85c3a68b6a94c8785a3d89809f9002d31 100644
--- a/deps/lld/test/ELF/relro-omagic.s
+++ b/deps/lld/test/ELF/relro-omagic.s
@@ -2,12 +2,12 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
 # RUN: ld.lld -shared %t2.o -o %t2.so -soname relro-omagic.s.tmp2.so
-# RUN: ld.lld --hash-style=sysv -N %t.o %t2.so -o %t
+# RUN: ld.lld --hash-style=sysv -N %t.o -Bdynamic %t2.so -o %t
 # RUN: llvm-objdump -section-headers %t | FileCheck --check-prefix=NORELRO %s
 # RUN: llvm-readobj --program-headers %t | FileCheck --check-prefix=NOPHDRS %s
 
 # NORELRO:      Sections:
-# NORELRO-NEXT: Idx Name          Size      Address          Type
+# NORELRO-NEXT: Idx Name          Size     VMA              Type
 # NORELRO-NEXT:   0               00000000 0000000000000000
 # NORELRO-NEXT:   1 .dynsym       00000048 0000000000200120
 # NORELRO-NEXT:   2 .hash         00000020 0000000000200168
diff --git a/deps/lld/test/ELF/relro-tls.s b/deps/lld/test/ELF/relro-tls.s
index 0ee5b6d328c2cd94ce486070cb07acc9c6119fb6..79e383d10d77521a31269971df4b1468573796d6 100644
--- a/deps/lld/test/ELF/relro-tls.s
+++ b/deps/lld/test/ELF/relro-tls.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %tout
-// RUN: llvm-readobj -program-headers %tout | FileCheck %s
+// RUN: llvm-readobj -l %tout | FileCheck %s
 
 // CHECK:      Type: PT_GNU_RELRO
 // CHECK-NEXT: Offset:
diff --git a/deps/lld/test/ELF/relro.s b/deps/lld/test/ELF/relro.s
index 0f721318c7840899de42920ddd49eaa8e04f847f..163e257e2956e0ae854f4a358f9e37b31c5f32f9 100644
--- a/deps/lld/test/ELF/relro.s
+++ b/deps/lld/test/ELF/relro.s
@@ -5,13 +5,13 @@
 // RUN: ld.lld -shared %t2.o -o %t2.so
 
 // RUN: ld.lld %t.o %t2.so -z now -z norelro -z relro -o %t
-// RUN: llvm-readobj -l --elf-output-style=GNU %t | FileCheck --check-prefix=CHECK --check-prefix=FULLRELRO %s
+// RUN: llvm-readelf -l %t | FileCheck --check-prefix=CHECK --check-prefix=FULLRELRO %s
 
 // RUN: ld.lld %t.o %t2.so -z norelro -z relro -o %t
-// RUN: llvm-readobj -l --elf-output-style=GNU %t | FileCheck --check-prefix=CHECK --check-prefix=PARTRELRO %s
+// RUN: llvm-readelf -l %t | FileCheck --check-prefix=CHECK --check-prefix=PARTRELRO %s
 
 // RUN: ld.lld %t.o %t2.so -z norelro -o %t
-// RUN: llvm-readobj -l --elf-output-style=GNU %t | FileCheck --check-prefix=NORELRO %s
+// RUN: llvm-readelf -l %t | FileCheck --check-prefix=NORELRO %s
 
 // CHECK:      Program Headers:
 // CHECK-NEXT: Type
@@ -19,12 +19,13 @@
 // CHECK-NEXT: LOAD
 // CHECK-NEXT: LOAD
 // CHECK-NEXT: LOAD
+// CHECK-NEXT: LOAD
 // CHECK-NEXT: DYNAMIC
 // CHECK-NEXT: GNU_RELRO
 // CHECK: Section to Segment mapping:
 
-// FULLRELRO:  05     .openbsd.randomdata .dynamic .got .got.plt {{$}}
-// PARTRELRO:  05     .openbsd.randomdata .dynamic .got {{$}}
+// FULLRELRO:  03     .openbsd.randomdata .dynamic .got .got.plt {{$}}
+// PARTRELRO:  03     .openbsd.randomdata .dynamic .got {{$}}
 
 
 // NORELRO-NOT: GNU_RELRO
diff --git a/deps/lld/test/ELF/resolution-end.s b/deps/lld/test/ELF/resolution-end.s
index c8c5a044e60268e5305c15a8e5a5138eef600f47..79078fce934b5468de98a9596d302e01da197e91 100644
--- a/deps/lld/test/ELF/resolution-end.s
+++ b/deps/lld/test/ELF/resolution-end.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/resolution-end.s -o %t2.o
 # RUN: ld.lld -shared -o %t2.so %t2.o
 # RUN: ld.lld --hash-style=sysv %t1.o %t2.so -o %t
-# RUN: llvm-readobj -t -s -section-data  %t | FileCheck %s
+# RUN: llvm-readobj --symbols -S --section-data  %t | FileCheck %s
 
 # Test that we resolve _end to the this executable.
 
diff --git a/deps/lld/test/ELF/resolution-shared.s b/deps/lld/test/ELF/resolution-shared.s
index 2d61d268c6f98f6d866ff483772fa20b7e5d0e91..f59adce4957c490a578a02f479aadbbdd80f2071 100644
--- a/deps/lld/test/ELF/resolution-shared.s
+++ b/deps/lld/test/ELF/resolution-shared.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/resolution-shared.s -o %t2.o
 // RUN: ld.lld %t2.o -o %t2.so -shared
 // RUN: ld.lld %t.o %t2.so -o %t3 -shared
-// RUN: llvm-readobj -t %t3 | FileCheck %s
+// RUN: llvm-readobj --symbols %t3 | FileCheck %s
 
         .weak foo
 foo:
diff --git a/deps/lld/test/ELF/resolution.s b/deps/lld/test/ELF/resolution.s
index f72f487e68ea22bbba8359bfdca0a337b5ddb939..95ddb517a081cd7037cb168240ba9b1d3584b47e 100644
--- a/deps/lld/test/ELF/resolution.s
+++ b/deps/lld/test/ELF/resolution.s
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/resolution.s -o %t2
 // RUN: ld.lld -discard-all %t %t2 -o %t3
-// RUN: llvm-readobj -t %t3 | FileCheck %s
+// RUN: llvm-readobj --symbols %t3 | FileCheck %s
 
 // This is an exhaustive test for checking which symbol is kept when two
 // have the same name. Each symbol has a different size which is used
diff --git a/deps/lld/test/ELF/riscv-branch.s b/deps/lld/test/ELF/riscv-branch.s
new file mode 100644
index 0000000000000000000000000000000000000000..247b6f3c22407cf7f9020a0bb913bd389c7cdb48
--- /dev/null
+++ b/deps/lld/test/ELF/riscv-branch.s
@@ -0,0 +1,32 @@
+# REQUIRES: riscv
+
+# RUN: llvm-mc -filetype=obj -triple=riscv32-unknown-elf -mattr=-relax %s -o %t.rv32.o
+# RUN: llvm-mc -filetype=obj -triple=riscv64-unknown-elf -mattr=-relax %s -o %t.rv64.o
+
+# RUN: ld.lld %t.rv32.o --defsym foo=_start+4 --defsym bar=_start -o %t.rv32
+# RUN: ld.lld %t.rv64.o --defsym foo=_start+4 --defsym bar=_start -o %t.rv64
+# RUN: llvm-objdump -d %t.rv32 | FileCheck %s
+# RUN: llvm-objdump -d %t.rv64 | FileCheck %s
+# CHECK: 63 02 00 00     beqz    zero, 4
+# CHECK: e3 1e 00 fe     bnez    zero, -4
+#
+# RUN: ld.lld %t.rv32.o --defsym foo=_start+0xffe --defsym bar=_start+4-0x1000 -o %t.rv32.limits
+# RUN: ld.lld %t.rv64.o --defsym foo=_start+0xffe --defsym bar=_start+4-0x1000 -o %t.rv64.limits
+# RUN: llvm-objdump -d %t.rv32.limits | FileCheck --check-prefix=LIMITS %s
+# RUN: llvm-objdump -d %t.rv64.limits | FileCheck --check-prefix=LIMITS %s
+# LIMITS:      e3 0f 00 7e     beqz    zero, 4094
+# LIMITS-NEXT: 63 10 00 80     bnez    zero, -4096
+
+# RUN: not ld.lld %t.rv32.o --defsym foo=_start+0x1000 --defsym bar=_start+4-0x1002 -o %t 2>&1 | FileCheck --check-prefix=ERROR-RANGE %s
+# RUN: not ld.lld %t.rv64.o --defsym foo=_start+0x1000 --defsym bar=_start+4-0x1002 -o %t 2>&1 | FileCheck --check-prefix=ERROR-RANGE %s
+# ERROR-RANGE:      relocation R_RISCV_BRANCH out of range: 2048 is not in [-2048, 2047]
+# ERROR-RANGE-NEXT: relocation R_RISCV_BRANCH out of range: -2049 is not in [-2048, 2047]
+
+# RUN: not ld.lld %t.rv32.o --defsym foo=_start+1 --defsym bar=_start-1 -o %t 2>&1 | FileCheck --check-prefix=ERROR-ALIGN %s
+# RUN: not ld.lld %t.rv64.o --defsym foo=_start+1 --defsym bar=_start-1 -o %t 2>&1 | FileCheck --check-prefix=ERROR-ALIGN %s
+# ERROR-ALIGN: improper alignment for relocation R_RISCV_BRANCH: 0x1 is not aligned to 2 bytes
+
+.global _start
+_start:
+     beq x0, x0, foo
+     bne x0, x0, bar
diff --git a/deps/lld/test/ELF/riscv-branch.test b/deps/lld/test/ELF/riscv-branch.test
deleted file mode 100644
index 3af9364c5028aff25fc6508db014a0dbba764116..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/riscv-branch.test
+++ /dev/null
@@ -1,119 +0,0 @@
-# .option norelax
-# .global _start
-# _start:
-#     beq x0, x0, _start
-#
-# .section .reloc_max, "ax", @progbits
-# L1:
-#     beq x0, x0, L1 + 0xffe
-#
-# .section .reloc_min, "ax", @progbits
-# L2:
-#     beq x0, x0, L2 - 0x1000
-#
-# REQUIRES: riscv
-# RUN: yaml2obj %s -o %t.o
-# RUN: ld.lld %t.o -o %t
-# RUN: obj2yaml %t | FileCheck %s
-#
-# CHECK: - Name:            .text
-# CHECK:   Content:         '63000000'
-# 11000:       00000063                beqz    zero,11000 <_start>
-#
-# CHECK: - Name:            .reloc_max
-# CHECK:   Content:         E30F007E
-# 11004:       7e000fe3                beqz    zero,12002
-#
-# CHECK: - Name:            .reloc_min
-# CHECK:   Content:         '63000080'
-# 11008:       80000063                beqz    zero,10008
-
---- !ELF
-FileHeader:
-  Class:           ELFCLASS32
-  Data:            ELFDATA2LSB
-  Type:            ET_REL
-  Machine:         EM_RISCV
-  Flags:           [ EF_RISCV_RVC, EF_RISCV_FLOAT_ABI_SOFT ]
-Sections:
-  - Name:            .text
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-    AddressAlign:    0x0000000000000002
-    Content:         '63000000'
-  - Name:            .rela.text
-    Type:            SHT_RELA
-    Flags:           [ SHF_INFO_LINK ]
-    Link:            .symtab
-    AddressAlign:    0x0000000000000004
-    Info:            .text
-    Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          _start
-        Type:            R_RISCV_BRANCH
-  - Name:            .data
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_WRITE, SHF_ALLOC ]
-    AddressAlign:    0x0000000000000001
-    Content:         ''
-  - Name:            .bss
-    Type:            SHT_NOBITS
-    Flags:           [ SHF_WRITE, SHF_ALLOC ]
-    AddressAlign:    0x0000000000000001
-  - Name:            .reloc_max
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-    AddressAlign:    0x0000000000000001
-    Content:         E30F007E
-  - Name:            .rela.reloc_max
-    Type:            SHT_RELA
-    Flags:           [ SHF_INFO_LINK ]
-    Link:            .symtab
-    AddressAlign:    0x0000000000000004
-    Info:            .reloc_max
-    Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          L1
-        Type:            R_RISCV_BRANCH
-        Addend:          4094
-  - Name:            .reloc_min
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-    AddressAlign:    0x0000000000000001
-    Content:         '63000080'
-  - Name:            .rela.reloc_min
-    Type:            SHT_RELA
-    Flags:           [ SHF_INFO_LINK ]
-    Link:            .symtab
-    AddressAlign:    0x0000000000000004
-    Info:            .reloc_min
-    Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          L2
-        Type:            R_RISCV_BRANCH
-        Addend:          -4096
-Symbols:
-  Local:
-    - Name:            .text
-      Type:            STT_SECTION
-      Section:         .text
-    - Name:            .data
-      Type:            STT_SECTION
-      Section:         .data
-    - Name:            .bss
-      Type:            STT_SECTION
-      Section:         .bss
-    - Name:            .reloc_max
-      Type:            STT_SECTION
-      Section:         .reloc_max
-    - Name:            L1
-      Section:         .reloc_max
-    - Name:            .reloc_min
-      Type:            STT_SECTION
-      Section:         .reloc_min
-    - Name:            L2
-      Section:         .reloc_min
-  Global:
-    - Name:            _start
-      Section:         .text
-...
diff --git a/deps/lld/test/ELF/riscv-call.s b/deps/lld/test/ELF/riscv-call.s
new file mode 100644
index 0000000000000000000000000000000000000000..a9a73841fd746f6d5358284d927208caeb837b02
--- /dev/null
+++ b/deps/lld/test/ELF/riscv-call.s
@@ -0,0 +1,32 @@
+# REQUIRES: riscv
+
+# RUN: llvm-mc -filetype=obj -triple=riscv32-unknown-elf -mattr=-relax %s -o %t.rv32.o
+# RUN: llvm-mc -filetype=obj -triple=riscv64-unknown-elf -mattr=-relax %s -o %t.rv64.o
+
+# RUN: ld.lld %t.rv32.o --defsym foo=_start+8 --defsym bar=_start -o %t.rv32
+# RUN: ld.lld %t.rv64.o --defsym foo=_start+8 --defsym bar=_start -o %t.rv64
+# RUN: llvm-objdump -d %t.rv32 | FileCheck %s
+# RUN: llvm-objdump -d %t.rv64 | FileCheck %s
+# CHECK:      97 00 00 00     auipc   ra, 0
+# CHECK-NEXT: e7 80 80 00     jalr    8(ra)
+# CHECK:      97 00 00 00     auipc   ra, 0
+# CHECK-NEXT: e7 80 80 ff     jalr    -8(ra)
+
+# RUN: ld.lld %t.rv32.o --defsym foo=_start+0x7ffff7ff --defsym bar=_start+8-0x80000800 -o %t.rv32.limits
+# RUN: ld.lld %t.rv64.o --defsym foo=_start+0x7ffff7ff --defsym bar=_start+8-0x80000800 -o %t.rv64.limits
+# RUN: llvm-objdump -d %t.rv32.limits | FileCheck --check-prefix=LIMITS %s
+# RUN: llvm-objdump -d %t.rv64.limits | FileCheck --check-prefix=LIMITS %s
+# LIMITS:      97 f0 ff 7f     auipc   ra, 524287
+# LIMITS-NEXT: e7 80 f0 7f     jalr    2047(ra)
+# LIMITS-NEXT: 97 00 00 80     auipc   ra, 524288
+# LIMITS-NEXT: e7 80 00 80     jalr    -2048(ra)
+
+# RUN: ld.lld %t.rv32.o --defsym foo=_start+0x7ffff800 --defsym bar=_start+8-0x80000801 -o %t
+# RUN: not ld.lld %t.rv64.o --defsym foo=_start+0x7ffff800 --defsym bar=_start+8-0x80000801 -o %t 2>&1 | FileCheck --check-prefix=ERROR %s
+# ERROR:      relocation R_RISCV_CALL out of range: 524288 is not in [-524288, 524287]
+# ERROR-NEXT: relocation R_RISCV_CALL out of range: -524289 is not in [-524288, 524287]
+
+.global _start
+_start:
+    call    foo
+    call    bar
diff --git a/deps/lld/test/ELF/riscv-call.test b/deps/lld/test/ELF/riscv-call.test
deleted file mode 100644
index d8077d4803787c97bf05b0d37f0f7e62e422c131..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/riscv-call.test
+++ /dev/null
@@ -1,95 +0,0 @@
-# .option norelax
-# .global _start
-# _start:
-#     call    _start + 4
-#
-# .section .reloc_neg, "ax", @progbits
-# L1:
-#     call    L1 - 4
-#
-# REQUIRES: riscv
-# RUN: yaml2obj %s -o %t.o
-# RUN: ld.lld %t.o -o %t
-# RUN: obj2yaml %t | FileCheck %s
-#
-# CHECK:  - Name:            .text
-# CHECK:    Content:         '97000000E7804000'
-#
-# 11000:       00000097                auipc   ra,0x0
-# 11004:       004080e7                jalr    4(ra)
-#
-# CHECK:  - Name:            .reloc_neg
-# CHECK:    Content:         97000000E780C0FF
-#
-# 11008:       00000097                auipc   ra,0x0
-# 1100c:       ffc080e7                jalr    -4(ra)
-
---- !ELF
-FileHeader:
-  Class:           ELFCLASS32
-  Data:            ELFDATA2LSB
-  Type:            ET_REL
-  Machine:         EM_RISCV
-  Flags:           [ EF_RISCV_RVC, EF_RISCV_FLOAT_ABI_SOFT ]
-Sections:
-  - Name:            .text
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-    AddressAlign:    0x0000000000000002
-    Content:         '97000000E7800000'
-  - Name:            .rela.text
-    Type:            SHT_RELA
-    Flags:           [ SHF_INFO_LINK ]
-    Link:            .symtab
-    AddressAlign:    0x0000000000000004
-    Info:            .text
-    Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          _start
-        Type:            R_RISCV_CALL
-        Addend:          4
-  - Name:            .data
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_WRITE, SHF_ALLOC ]
-    AddressAlign:    0x0000000000000001
-    Content:         ''
-  - Name:            .bss
-    Type:            SHT_NOBITS
-    Flags:           [ SHF_WRITE, SHF_ALLOC ]
-    AddressAlign:    0x0000000000000001
-  - Name:            .reloc_neg
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-    AddressAlign:    0x0000000000000001
-    Content:         '97000000E7800000'
-  - Name:            .rela.reloc_neg
-    Type:            SHT_RELA
-    Flags:           [ SHF_INFO_LINK ]
-    Link:            .symtab
-    AddressAlign:    0x0000000000000004
-    Info:            .reloc_neg
-    Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          L1
-        Type:            R_RISCV_CALL
-        Addend:          -4
-Symbols:
-  Local:
-    - Name:            .text
-      Type:            STT_SECTION
-      Section:         .text
-    - Name:            .data
-      Type:            STT_SECTION
-      Section:         .data
-    - Name:            .bss
-      Type:            STT_SECTION
-      Section:         .bss
-    - Name:            .reloc_neg
-      Type:            STT_SECTION
-      Section:         .reloc_neg
-    - Name:            L1
-      Section:         .reloc_neg
-  Global:
-    - Name:            _start
-      Section:         .text
-...
diff --git a/deps/lld/test/ELF/riscv-gp-dummy-sdata.s b/deps/lld/test/ELF/riscv-gp-dummy-sdata.s
new file mode 100644
index 0000000000000000000000000000000000000000..e04b170d5b2b9711b7579a48d88fa0e491e849b5
--- /dev/null
+++ b/deps/lld/test/ELF/riscv-gp-dummy-sdata.s
@@ -0,0 +1,25 @@
+# REQUIRES: riscv
+# RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.32.o
+# RUN: ld.lld -pie %t.32.o -o %t.32
+# RUN: llvm-readelf -S %t.32 | FileCheck --check-prefix=SEC %s
+# RUN: llvm-readelf -s %t.32 | FileCheck --check-prefix=SYM %s
+
+# RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.64.o
+# RUN: ld.lld -pie %t.64.o -o %t.64
+# RUN: llvm-readelf -S %t.64 | FileCheck --check-prefix=SEC %s
+# RUN: llvm-readelf -s %t.64 | FileCheck --check-prefix=SYM %s
+
+## If there is an undefined reference to __global_pointer$ but .sdata doesn't
+## exist, create a dummy one.
+
+## __global_pointer$ = .sdata+0x800
+# SEC: [ 7] .sdata PROGBITS {{0*}}00003000
+# SYM: {{0*}}00003800 0 NOTYPE GLOBAL DEFAULT 7 __global_pointer$
+
+## If __global_pointer$ is not used, don't create .sdata .
+
+# RUN: llvm-mc -filetype=obj -triple=riscv32 /dev/null -o %t.32.o
+# RUN: ld.lld -pie %t.32.o -o %t.32
+# RUN: llvm-readelf -S %t.32 | FileCheck --implicit-check-not=.sdata /dev/null
+
+lla gp, __global_pointer$
diff --git a/deps/lld/test/ELF/riscv-gp.s b/deps/lld/test/ELF/riscv-gp.s
new file mode 100644
index 0000000000000000000000000000000000000000..83b5f0dd735408a8347b76b190b7f0c6200ed769
--- /dev/null
+++ b/deps/lld/test/ELF/riscv-gp.s
@@ -0,0 +1,26 @@
+# REQUIRES: riscv
+# RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.32.o
+# RUN: ld.lld -pie %t.32.o -o %t.32
+# RUN: llvm-readelf -s %t.32 | FileCheck --check-prefix=SYM %s
+# RUN: llvm-readelf -S %t.32 | FileCheck --check-prefix=SEC %s
+# RUN: not ld.lld -shared %t.32.o -o /dev/null 2>&1 | FileCheck --check-prefix=ERR %s
+
+# RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.64.o
+# RUN: ld.lld -pie %t.64.o -o %t.64
+# RUN: llvm-readelf -s %t.64 | FileCheck --check-prefix=SYM %s
+# RUN: llvm-readelf -S %t.64 | FileCheck --check-prefix=SEC %s
+# RUN: not ld.lld -shared %t.64.o -o /dev/null 2>&1 | FileCheck --check-prefix=ERR %s
+
+## __global_pointer$ = .sdata+0x800 = 0x3800
+# SEC: [ 7] .sdata PROGBITS {{0*}}00003000
+# SYM: {{0*}}00003800 0 NOTYPE GLOBAL DEFAULT 7 __global_pointer$
+
+## __global_pointer$ - 0x1000 = 4096*3-2048
+# DIS:      1000: auipc gp, 3
+# DIS-NEXT:       addi gp, gp, -2048
+
+# ERR: error: relocation R_RISCV_PCREL_HI20 cannot be used against symbol __global_pointer$; recompile with -fPIC
+
+lla gp, __global_pointer$
+
+.section .sdata,"aw"
diff --git a/deps/lld/test/ELF/riscv-hi20-lo12.s b/deps/lld/test/ELF/riscv-hi20-lo12.s
new file mode 100644
index 0000000000000000000000000000000000000000..24d2d65027d6c0a7576d3435d532102504a615f8
--- /dev/null
+++ b/deps/lld/test/ELF/riscv-hi20-lo12.s
@@ -0,0 +1,40 @@
+# REQUIRES: riscv
+
+# RUN: llvm-mc -filetype=obj -triple=riscv32-unknown-elf -mattr=-relax %s -o %t.rv32.o
+# RUN: llvm-mc -filetype=obj -triple=riscv64-unknown-elf -mattr=-relax %s -o %t.rv64.o
+
+# RUN: ld.lld %t.rv32.o --defsym foo=0 --defsym bar=42 -o %t.rv32
+# RUN: ld.lld %t.rv64.o --defsym foo=0 --defsym bar=42 -o %t.rv64
+# RUN: llvm-objdump -d %t.rv32 | FileCheck %s
+# RUN: llvm-objdump -d %t.rv64 | FileCheck %s
+# CHECK:      37 05 00 00     lui     a0, 0
+# CHECK-NEXT: 13 05 05 00     mv      a0, a0
+# CHECK-NEXT: 23 20 a5 00     sw      a0, 0(a0)
+# CHECK-NEXT: b7 05 00 00     lui     a1, 0
+# CHECK-NEXT: 93 85 a5 02     addi    a1, a1, 42
+# CHECK-NEXT: 23 a5 b5 02     sw      a1, 42(a1)
+
+# RUN: ld.lld %t.rv32.o --defsym foo=0x7ffff7ff --defsym bar=0x7ffff800 -o %t.rv32.limits
+# RUN: ld.lld %t.rv64.o --defsym foo=0x7ffff7ff --defsym bar=0xffffffff7ffff800 -o %t.rv64.limits
+# RUN: llvm-objdump -d %t.rv32.limits | FileCheck --check-prefix=LIMITS %s
+# RUN: llvm-objdump -d %t.rv64.limits | FileCheck --check-prefix=LIMITS %s
+# LIMITS:      37 f5 ff 7f     lui     a0, 524287
+# LIMITS-NEXT: 13 05 f5 7f     addi    a0, a0, 2047
+# LIMITS-NEXT: a3 2f a5 7e     sw      a0, 2047(a0)
+# LIMITS-NEXT: b7 05 00 80     lui     a1, 524288
+# LIMITS-NEXT: 93 85 05 80     addi    a1, a1, -2048
+# LIMITS-NEXT: 23 a0 b5 80     sw      a1, -2048(a1)
+
+# RUN: not ld.lld %t.rv64.o --defsym foo=0x7ffff800 --defsym bar=0xffffffff7ffff7ff -o %t 2>&1 | FileCheck --check-prefix ERROR %s
+# ERROR:      relocation R_RISCV_HI20 out of range: 524288 is not in [-524288, 524287]
+# ERROR-NEXT: relocation R_RISCV_HI20 out of range: -524289 is not in [-524288, 524287]
+
+.global _start
+
+_start:
+    lui     a0, %hi(foo)
+    addi    a0, a0, %lo(foo)
+    sw      a0, %lo(foo)(a0)
+    lui     a1, %hi(bar)
+    addi    a1, a1, %lo(bar)
+    sw      a1, %lo(bar)(a1)
diff --git a/deps/lld/test/ELF/riscv-hi20-lo12.test b/deps/lld/test/ELF/riscv-hi20-lo12.test
deleted file mode 100644
index 8d21d334dfa1fadad031ab49692b6cb45ed230d8..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/riscv-hi20-lo12.test
+++ /dev/null
@@ -1,86 +0,0 @@
-# .option norelax
-# .global _start
-#
-# .section .reloc_12345678, "ax", @progbits
-# _start:
-# foo = 0x12345678
-#     lui     a0, %hi(foo)
-#     addi    a0, a0, %lo(foo)
-#     lw      a0, %lo(foo)(a0)
-#
-# .section .reloc_fedcba98, "ax", @progbits
-# foo = 0xfedcba98
-#     lui     a0, %hi(foo)
-#     addi    a0, a0, %lo(foo)
-#
-# REQUIRES: riscv
-# RUN: yaml2obj %s -o %t.o
-# RUN: ld.lld %t.o -o %t
-# RUN: obj2yaml %t | FileCheck %s
-#
-# CHECK: - Name:            .reloc_12345678
-# CHECK:   Content:         '375534121305856703258567'
-# 11000:       12345537                lui     a0,0x12345
-# 11004:       67850513                addi    a0,a0,1656 # 12345678 <__global_pointer$+0x12332e78>
-# 11008:       67852503                lw      a0,1656(a0)
-#
-# CHECK: - Name:            .reloc_fedcba98
-# CHECK:   Content:         37C5DCFE130585A9
-# 1100c:       fedcc537                lui     a0,0xfedcc
-# 11010:       a9850513                addi    a0,a0,-1384 # fedcba98 <__global_pointer$+0xfedb9298>
-
---- !ELF
-FileHeader:
-  Class:           ELFCLASS32
-  Data:            ELFDATA2LSB
-  Type:            ET_REL
-  Machine:         EM_RISCV
-  Flags:           [ EF_RISCV_RVC, EF_RISCV_FLOAT_ABI_SOFT ]
-Sections:
-  - Name:            .text
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-    AddressAlign:    0x0000000000000002
-    Content:         ''
-  - Name:            .data
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_WRITE, SHF_ALLOC ]
-    AddressAlign:    0x0000000000000001
-    Content:         ''
-  - Name:            .bss
-    Type:            SHT_NOBITS
-    Flags:           [ SHF_WRITE, SHF_ALLOC ]
-    AddressAlign:    0x0000000000000001
-  - Name:            .reloc_12345678
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-    AddressAlign:    0x0000000000000001
-    Content:         '375534121305856703258567'
-  - Name:            .reloc_fedcba98
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-    AddressAlign:    0x0000000000000001
-    Content:         37C5DCFE130585A9
-Symbols:
-  Local:
-    - Name:            .text
-      Type:            STT_SECTION
-      Section:         .text
-    - Name:            .data
-      Type:            STT_SECTION
-      Section:         .data
-    - Name:            .bss
-      Type:            STT_SECTION
-      Section:         .bss
-    - Name:            .reloc_12345678
-      Type:            STT_SECTION
-      Section:         .reloc_12345678
-    - Name:            foo
-      Value:           0x00000000FEDCBA98
-    - Name:            .reloc_fedcba98
-      Type:            STT_SECTION
-      Section:         .reloc_fedcba98
-  Global:
-    - Name:            _start
-      Section:         .reloc_12345678
-...
diff --git a/deps/lld/test/ELF/riscv-jal-error.test b/deps/lld/test/ELF/riscv-jal-error.test
deleted file mode 100644
index 9df95c9cc4ea63f9a18334d4c33ff00257fa0e31..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/riscv-jal-error.test
+++ /dev/null
@@ -1,93 +0,0 @@
-# .option norelax
-# .global _start
-#
-# _start:
-# L1:
-#     jal x0, L1 + 0x100000
-# L2:
-#     jal x0, L2 - 0x100002
-# L3:
-#     jal x0, L3 + 1
-# L4:
-#     c.jal L4 + 1
-#
-# REQUIRES: riscv
-# RUN: yaml2obj %s -o %t.o
-# RUN: not ld.lld %t.o -o %t 2>&1 | FileCheck %s
-#
-# CHECK: {{.*}}(.text+0x0): relocation R_RISCV_JAL out of range
-# CHECK: {{.*}}(.text+0x4): relocation R_RISCV_JAL out of range
-# CHECK: {{.*}}(.text+0x8): improper alignment for relocation R_RISCV_JAL
-# CHECK: {{.*}}(.text+0xC): improper alignment for relocation R_RISCV_RVC_JUMP
-
---- !ELF
-FileHeader:
-  Class:           ELFCLASS32
-  Data:            ELFDATA2LSB
-  Type:            ET_REL
-  Machine:         EM_RISCV
-  Flags:           [ EF_RISCV_RVC, EF_RISCV_FLOAT_ABI_SOFT ]
-Sections:
-  - Name:            .text
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-    AddressAlign:    0x0000000000000002
-    Content:         6F0000806FF0FF7F6F0000000120
-  - Name:            .rela.text
-    Type:            SHT_RELA
-    Flags:           [ SHF_INFO_LINK ]
-    Link:            .symtab
-    AddressAlign:    0x0000000000000004
-    Info:            .text
-    Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          L1
-        Type:            R_RISCV_JAL
-        Addend:          1048576
-      - Offset:          0x0000000000000004
-        Symbol:          L2
-        Type:            R_RISCV_JAL
-        Addend:          -1048578
-      - Offset:          0x0000000000000008
-        Symbol:          L3
-        Type:            R_RISCV_JAL
-        Addend:          1
-      - Offset:          0x000000000000000C
-        Symbol:          L4
-        Type:            R_RISCV_RVC_JUMP
-        Addend:          1
-  - Name:            .data
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_WRITE, SHF_ALLOC ]
-    AddressAlign:    0x0000000000000001
-    Content:         ''
-  - Name:            .bss
-    Type:            SHT_NOBITS
-    Flags:           [ SHF_WRITE, SHF_ALLOC ]
-    AddressAlign:    0x0000000000000001
-Symbols:
-  Local:
-    - Name:            .text
-      Type:            STT_SECTION
-      Section:         .text
-    - Name:            .data
-      Type:            STT_SECTION
-      Section:         .data
-    - Name:            .bss
-      Type:            STT_SECTION
-      Section:         .bss
-    - Name:            L1
-      Section:         .text
-    - Name:            L2
-      Section:         .text
-      Value:           0x0000000000000004
-    - Name:            L3
-      Section:         .text
-      Value:           0x0000000000000008
-    - Name:            L4
-      Section:         .text
-      Value:           0x000000000000000C
-  Global:
-    - Name:            _start
-      Section:         .text
-...
diff --git a/deps/lld/test/ELF/riscv-jal.s b/deps/lld/test/ELF/riscv-jal.s
new file mode 100644
index 0000000000000000000000000000000000000000..5979a5e1110fe89297a35eda183dd262f285b2fc
--- /dev/null
+++ b/deps/lld/test/ELF/riscv-jal.s
@@ -0,0 +1,34 @@
+# REQUIRES: riscv
+
+# RUN: llvm-mc -filetype=obj -triple=riscv32-unknown-elf -mattr=-relax %s -o %t.rv32.o
+# RUN: llvm-mc -filetype=obj -triple=riscv64-unknown-elf -mattr=-relax %s -o %t.rv64.o
+
+# RUN: ld.lld %t.rv32.o --defsym foo=_start+4 --defsym bar=_start -o %t.rv32
+# RUN: ld.lld %t.rv64.o --defsym foo=_start+4 --defsym bar=_start -o %t.rv64
+# RUN: llvm-objdump -d %t.rv32 | FileCheck %s
+# RUN: llvm-objdump -d %t.rv64 | FileCheck %s
+# CHECK: 6f 00 40 00    j   4
+# CHECK: ef f0 df ff    jal -4
+
+# RUN: ld.lld %t.rv32.o --defsym foo=_start+0xffffe --defsym bar=_start+4-0x100000 -o %t.rv32.limits
+# RUN: ld.lld %t.rv64.o --defsym foo=_start+0xffffe --defsym bar=_start+4-0x100000 -o %t.rv64.limits
+# RUN: llvm-objdump -d %t.rv32.limits | FileCheck --check-prefix=LIMITS %s
+# RUN: llvm-objdump -d %t.rv64.limits | FileCheck --check-prefix=LIMITS %s
+# LIMITS:      6f f0 ff 7f j   1048574
+# LIMITS-NEXT: ef 00 00 80 jal -1048576
+
+# RUN: not ld.lld %t.rv32.o --defsym foo=_start+0x100000 --defsym bar=_start+4-0x100002 -o %t 2>&1 | FileCheck --check-prefix=ERROR-RANGE %s
+# RUN: not ld.lld %t.rv64.o --defsym foo=_start+0x100000 --defsym bar=_start+4-0x100002 -o %t 2>&1 | FileCheck --check-prefix=ERROR-RANGE %s
+# ERROR-RANGE:      relocation R_RISCV_JAL out of range: 524288 is not in [-524288, 524287]
+# ERROR-RANGE-NEXT: relocation R_RISCV_JAL out of range: -524289 is not in [-524288, 524287]
+
+# RUN: not ld.lld %t.rv32.o --defsym foo=_start+1 --defsym bar=_start+4+3 -o %t 2>&1 | FileCheck --check-prefix=ERROR-ALIGN %s
+# RUN: not ld.lld %t.rv64.o --defsym foo=_start+1 --defsym bar=_start+4+3 -o %t 2>&1 | FileCheck --check-prefix=ERROR-ALIGN %s
+# ERROR-ALIGN:      improper alignment for relocation R_RISCV_JAL: 0x1 is not aligned to 2 bytes
+# ERROR-ALIGN-NEXT: improper alignment for relocation R_RISCV_JAL: 0x3 is not aligned to 2 bytes
+
+.global _start
+
+_start:
+    jal x0, foo
+    jal x1, bar
diff --git a/deps/lld/test/ELF/riscv-jal.test b/deps/lld/test/ELF/riscv-jal.test
deleted file mode 100644
index cb40dc6db124aaff0b12ba1d98ac8e9236596eea..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/riscv-jal.test
+++ /dev/null
@@ -1,161 +0,0 @@
-# .option norelax
-# .global _start
-#
-# .section .reloc_zero, "ax", @progbits
-# _start:
-# L1:
-#     jal x0, L1
-# L2:
-#     c.jal L2
-#
-# .section .reloc_max, "ax", @progbits
-# L3:
-#     jal x0, L3 + 0xffffe
-# L4:
-#     c.jal L4 + 0x7fe
-#
-# .section .reloc_min, "ax", @progbits
-# L5:
-#     jal x0, L5 - 0x100000
-# L6:
-#     c.jal L6 - 0x800
-#
-# REQUIRES: riscv
-# RUN: yaml2obj %s -o %t.o
-# RUN: ld.lld %t.o -o %t
-# RUN: obj2yaml %t | FileCheck %s
-#
-# CHECK: - Name:            .reloc_zero
-# CHECK:   Content:         6F0000000120
-# 11000:       0000006f                j       11000
-# 11004:       2001                    jal     11004
-#
-# CHECK: - Name:            .reloc_max
-# CHECK:   Content:         6FF0FF7FFD2F
-# 11006:       7ffff06f                j       111004
-# 1100a:       2ffd                    jal     11808
-#
-# CHECK: - Name:            .reloc_min
-# CHECK:   Content:         6F0000800130
-# 1100c:       8000006f                j       fff1100c
-# 11010:       3001                    jal     10810
-
---- !ELF
-FileHeader:
-  Class:           ELFCLASS32
-  Data:            ELFDATA2LSB
-  Type:            ET_REL
-  Machine:         EM_RISCV
-  Flags:           [ EF_RISCV_RVC, EF_RISCV_FLOAT_ABI_SOFT ]
-Sections:
-  - Name:            .text
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-    AddressAlign:    0x0000000000000002
-    Content:         ''
-  - Name:            .data
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_WRITE, SHF_ALLOC ]
-    AddressAlign:    0x0000000000000001
-    Content:         ''
-  - Name:            .bss
-    Type:            SHT_NOBITS
-    Flags:           [ SHF_WRITE, SHF_ALLOC ]
-    AddressAlign:    0x0000000000000001
-  - Name:            .reloc_zero
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-    AddressAlign:    0x0000000000000001
-    Content:         6F0000000120
-  - Name:            .rela.reloc_zero
-    Type:            SHT_RELA
-    Flags:           [ SHF_INFO_LINK ]
-    Link:            .symtab
-    AddressAlign:    0x0000000000000004
-    Info:            .reloc_zero
-    Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          L1
-        Type:            R_RISCV_JAL
-      - Offset:          0x0000000000000004
-        Symbol:          L2
-        Type:            R_RISCV_RVC_JUMP
-  - Name:            .reloc_max
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-    AddressAlign:    0x0000000000000001
-    Content:         6FF0FF7FFD2F
-  - Name:            .rela.reloc_max
-    Type:            SHT_RELA
-    Flags:           [ SHF_INFO_LINK ]
-    Link:            .symtab
-    AddressAlign:    0x0000000000000004
-    Info:            .reloc_max
-    Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          L3
-        Type:            R_RISCV_JAL
-        Addend:          1048574
-      - Offset:          0x0000000000000004
-        Symbol:          L4
-        Type:            R_RISCV_RVC_JUMP
-        Addend:          2046
-  - Name:            .reloc_min
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-    AddressAlign:    0x0000000000000001
-    Content:         6F0000800130
-  - Name:            .rela.reloc_min
-    Type:            SHT_RELA
-    Flags:           [ SHF_INFO_LINK ]
-    Link:            .symtab
-    AddressAlign:    0x0000000000000004
-    Info:            .reloc_min
-    Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          L5
-        Type:            R_RISCV_JAL
-        Addend:          -1048576
-      - Offset:          0x0000000000000004
-        Symbol:          L6
-        Type:            R_RISCV_RVC_JUMP
-        Addend:          -2048
-Symbols:
-  Local:
-    - Name:            .text
-      Type:            STT_SECTION
-      Section:         .text
-    - Name:            .data
-      Type:            STT_SECTION
-      Section:         .data
-    - Name:            .bss
-      Type:            STT_SECTION
-      Section:         .bss
-    - Name:            .reloc_zero
-      Type:            STT_SECTION
-      Section:         .reloc_zero
-    - Name:            L1
-      Section:         .reloc_zero
-    - Name:            L2
-      Section:         .reloc_zero
-      Value:           0x0000000000000004
-    - Name:            .reloc_max
-      Type:            STT_SECTION
-      Section:         .reloc_max
-    - Name:            L3
-      Section:         .reloc_max
-    - Name:            L4
-      Section:         .reloc_max
-      Value:           0x0000000000000004
-    - Name:            .reloc_min
-      Type:            STT_SECTION
-      Section:         .reloc_min
-    - Name:            L5
-      Section:         .reloc_min
-    - Name:            L6
-      Section:         .reloc_min
-      Value:           0x0000000000000004
-  Global:
-    - Name:            _start
-      Section:         .reloc_zero
-...
diff --git a/deps/lld/test/ELF/riscv-pcrel-hilo-error.s b/deps/lld/test/ELF/riscv-pcrel-hilo-error.s
new file mode 100644
index 0000000000000000000000000000000000000000..bfc205520bd83fc5fd8a46ca5a830c62299569bb
--- /dev/null
+++ b/deps/lld/test/ELF/riscv-pcrel-hilo-error.s
@@ -0,0 +1,7 @@
+# REQUIRES: riscv
+# RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.o
+# RUN: not ld.lld %t.o --defsym external=0 2>&1 | FileCheck %s
+
+# CHECK: error: R_RISCV_PCREL_LO12 relocation points to an absolute symbol: external
+
+addi sp,sp,%pcrel_lo(external)
diff --git a/deps/lld/test/ELF/riscv-pcrel-hilo.s b/deps/lld/test/ELF/riscv-pcrel-hilo.s
new file mode 100644
index 0000000000000000000000000000000000000000..5ae05036bfbb292e44bf71a9e27ff506de7ed655
--- /dev/null
+++ b/deps/lld/test/ELF/riscv-pcrel-hilo.s
@@ -0,0 +1,45 @@
+# REQUIRES: riscv
+
+# RUN: llvm-mc -filetype=obj -triple=riscv32-unknown-elf -mattr=-relax %s -o %t.rv32.o
+# RUN: llvm-mc -filetype=obj -triple=riscv64-unknown-elf -mattr=-relax %s -o %t.rv64.o
+
+# RUN: ld.lld %t.rv32.o --defsym foo=_start+12 --defsym bar=_start -o %t.rv32
+# RUN: ld.lld %t.rv64.o --defsym foo=_start+12 --defsym bar=_start -o %t.rv64
+# RUN: llvm-objdump -d --no-show-raw-insn %t.rv32 | FileCheck %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.rv64 | FileCheck %s
+# RUN: ld.lld -pie %t.rv32.o --defsym foo=_start+12 --defsym bar=_start -o %t.rv32
+# RUN: ld.lld -pie %t.rv64.o --defsym foo=_start+12 --defsym bar=_start -o %t.rv64
+# RUN: llvm-objdump -d --no-show-raw-insn %t.rv32 | FileCheck %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.rv64 | FileCheck %s
+# CHECK:      auipc   a0, 0
+# CHECK-NEXT: addi    a0, a0, 12
+# CHECK-NEXT: sw      zero, 12(a0)
+# CHECK:      auipc   a0, 0
+# CHECK-NEXT: addi    a0, a0, -12
+# CHECK-NEXT: sw      zero, -12(a0)
+
+# RUN: ld.lld %t.rv32.o --defsym foo=_start+0x7ffff7ff --defsym bar=_start+12-0x80000800 -o %t.rv32.limits
+# RUN: ld.lld %t.rv64.o --defsym foo=_start+0x7ffff7ff --defsym bar=_start+12-0x80000800 -o %t.rv64.limits
+# RUN: llvm-objdump -d --no-show-raw-insn %t.rv32.limits | FileCheck --check-prefix=LIMITS %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.rv64.limits | FileCheck --check-prefix=LIMITS %s
+# LIMITS:      auipc   a0, 524287
+# LIMITS-NEXT: addi    a0, a0, 2047
+# LIMITS-NEXT: sw      zero, 2047(a0)
+# LIMITS:      auipc   a0, 524288
+# LIMITS-NEXT: addi    a0, a0, -2048
+# LIMITS-NEXT: sw      zero, -2048(a0)
+
+# RUN: ld.lld %t.rv32.o --defsym foo=_start+0x7ffff800 --defsym bar=_start+12-0x80000801 -o %t
+# RUN: not ld.lld %t.rv64.o --defsym foo=_start+0x7ffff800 --defsym bar=_start+12-0x80000801 -o %t 2>&1 | FileCheck --check-prefix=ERROR %s
+# ERROR:      relocation R_RISCV_PCREL_HI20 out of range: 524288 is not in [-524288, 524287]
+# ERROR-NEXT: relocation R_RISCV_PCREL_HI20 out of range: -524289 is not in [-524288, 524287]
+
+.global _start
+_start:
+    auipc   a0, %pcrel_hi(foo)
+    addi    a0, a0, %pcrel_lo(_start)
+    sw      x0, %pcrel_lo(_start)(a0)
+.L1:
+    auipc   a0, %pcrel_hi(bar)
+    addi    a0, a0, %pcrel_lo(.L1)
+    sw      x0, %pcrel_lo(.L1)(a0)
diff --git a/deps/lld/test/ELF/riscv-pcrel-hilo.test b/deps/lld/test/ELF/riscv-pcrel-hilo.test
deleted file mode 100644
index 9767e14903c317ffd129259988369ddcda21469a..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/riscv-pcrel-hilo.test
+++ /dev/null
@@ -1,103 +0,0 @@
-# .option norelax
-# .global _start
-#
-# _start:
-#     auipc   a0, %pcrel_hi(_start + 4)
-#     addi    a0, a0, %pcrel_lo(_start)
-#
-# .section .reloc_neg, "ax", @progbits
-# L1:
-#     auipc   a0, %pcrel_hi(L1 - 2)
-#     addi    a0, a0, %pcrel_lo(L1)
-#
-#
-# REQUIRES: riscv
-# RUN: yaml2obj %s -o %t.o
-# RUN: ld.lld %t.o -o %t
-# RUN: obj2yaml %t | FileCheck %s
-#
-# CHECK: - Name:            .text
-# CHECK:   Content:         '1705000013054500'
-# 11000:       00000517                auipc   a0,0x0
-# 11004:       00450513                addi    a0,a0,4 # 11004 <_start+0x4>
-#
-# CHECK: - Name:            .reloc_neg
-# CHECK:   Content:         170500001305E5FF
-# 11008:       00000517                auipc   a0,0x0
-# 1100c:       ffe50513                addi    a0,a0,-2 # 11006 <_start+0x6>
-
---- !ELF
-FileHeader:
-  Class:           ELFCLASS32
-  Data:            ELFDATA2LSB
-  Type:            ET_REL
-  Machine:         EM_RISCV
-  Flags:           [ EF_RISCV_RVC, EF_RISCV_FLOAT_ABI_SOFT ]
-Sections:
-  - Name:            .text
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-    AddressAlign:    0x0000000000000002
-    Content:         '1705000013050500'
-  - Name:            .rela.text
-    Type:            SHT_RELA
-    Flags:           [ SHF_INFO_LINK ]
-    Link:            .symtab
-    AddressAlign:    0x0000000000000004
-    Info:            .text
-    Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          _start
-        Type:            R_RISCV_PCREL_HI20
-        Addend:          4
-      - Offset:          0x0000000000000004
-        Symbol:          _start
-        Type:            R_RISCV_PCREL_LO12_I
-  - Name:            .data
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_WRITE, SHF_ALLOC ]
-    AddressAlign:    0x0000000000000001
-    Content:         ''
-  - Name:            .bss
-    Type:            SHT_NOBITS
-    Flags:           [ SHF_WRITE, SHF_ALLOC ]
-    AddressAlign:    0x0000000000000001
-  - Name:            .reloc_neg
-    Type:            SHT_PROGBITS
-    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
-    AddressAlign:    0x0000000000000001
-    Content:         '1705000013050500'
-  - Name:            .rela.reloc_neg
-    Type:            SHT_RELA
-    Flags:           [ SHF_INFO_LINK ]
-    Link:            .symtab
-    AddressAlign:    0x0000000000000004
-    Info:            .reloc_neg
-    Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          L1
-        Type:            R_RISCV_PCREL_HI20
-        Addend:          -2
-      - Offset:          0x0000000000000004
-        Symbol:          L1
-        Type:            R_RISCV_PCREL_LO12_I
-Symbols:
-  Local:
-    - Name:            .text
-      Type:            STT_SECTION
-      Section:         .text
-    - Name:            .data
-      Type:            STT_SECTION
-      Section:         .data
-    - Name:            .bss
-      Type:            STT_SECTION
-      Section:         .bss
-    - Name:            .reloc_neg
-      Type:            STT_SECTION
-      Section:         .reloc_neg
-    - Name:            L1
-      Section:         .reloc_neg
-  Global:
-    - Name:            _start
-      Section:         .text
-...
diff --git a/deps/lld/test/ELF/riscv-plt.s b/deps/lld/test/ELF/riscv-plt.s
new file mode 100644
index 0000000000000000000000000000000000000000..0afd5b0057fad347fe39f554298cef92bd5054b6
--- /dev/null
+++ b/deps/lld/test/ELF/riscv-plt.s
@@ -0,0 +1,103 @@
+# REQUIRES: riscv
+# RUN: echo '.globl bar, weak; .type bar,@function; .type weak,@function; bar: weak:' > %t1.s
+
+# RUN: llvm-mc -filetype=obj -triple=riscv32 %t1.s -o %t1.32.o
+# RUN: ld.lld -shared %t1.32.o -o %t1.32.so
+# RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.32.o
+# RUN: ld.lld %t.32.o %t1.32.so -o %t.32
+# RUN: llvm-readelf -S -s %t.32 | FileCheck --check-prefixes=SEC,NM %s
+# RUN: llvm-readobj -r %t.32 | FileCheck --check-prefix=RELOC32 %s
+# RUN: llvm-readelf -x .got.plt %t.32 | FileCheck --check-prefix=GOTPLT32 %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.32 | FileCheck --check-prefixes=DIS,DIS32 %s
+
+# RUN: llvm-mc -filetype=obj -triple=riscv64 %t1.s -o %t1.64.o
+# RUN: ld.lld -shared %t1.64.o -o %t1.64.so
+# RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.64.o
+# RUN: ld.lld %t.64.o %t1.64.so -o %t.64
+# RUN: llvm-readelf -S -s %t.64 | FileCheck --check-prefixes=SEC,NM %s
+# RUN: llvm-readobj -r %t.64 | FileCheck --check-prefix=RELOC64 %s
+# RUN: llvm-readelf -x .got.plt %t.64 | FileCheck --check-prefix=GOTPLT64 %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.64 | FileCheck --check-prefixes=DIS,DIS64 %s
+
+# SEC: .plt PROGBITS {{0*}}00011030
+
+## A canonical PLT has a non-zero st_value. bar and weak are called but their
+## addresses are not taken, so a canonical PLT is not necessary.
+# NM: {{0*}}00000000 0 FUNC GLOBAL DEFAULT UND bar
+# NM: {{0*}}00000000 0 FUNC WEAK   DEFAULT UND weak
+
+## The .got.plt slots relocated by .rela.plt point to .plt
+## This is required by glibc.
+# RELOC32:      .rela.plt {
+# RELOC32-NEXT:   0x13008 R_RISCV_JUMP_SLOT bar 0x0
+# RELOC32-NEXT:   0x1300C R_RISCV_JUMP_SLOT weak 0x0
+# RELOC32-NEXT: }
+# GOTPLT32:      section '.got.plt'
+# GOTPLT32-NEXT: 0x00013000 00000000 00000000 30100100 30100100
+
+# RELOC64:      .rela.plt {
+# RELOC64-NEXT:   0x13010 R_RISCV_JUMP_SLOT bar 0x0
+# RELOC64-NEXT:   0x13018 R_RISCV_JUMP_SLOT weak 0x0
+# RELOC64-NEXT: }
+# GOTPLT64:      section '.got.plt'
+# GOTPLT64-NEXT: 0x00013000 00000000 00000000 00000000 00000000
+# GOTPLT64-NEXT: 0x00013010 30100100 00000000 30100100 00000000
+
+# DIS:      _start:
+## Direct call
+## foo - . = 0x11020-0x11000 = 32
+# DIS-NEXT:          auipc ra, 0
+# DIS-NEXT:   11004: jalr 32(ra)
+## bar@plt - . = 0x11050-0x1100c = 72
+# DIS-NEXT:          auipc ra, 0
+# DIS-NEXT:   1100c: jalr 72(ra)
+## bar@plt - . = 0x11050-0x11014 = 64
+# DIS-NEXT:          auipc ra, 0
+# DIS-NEXT:   11014: jalr 64(ra)
+## weak@plt - . = 0x11060-0x1101c = 72
+# DIS-NEXT:          auipc ra, 0
+# DIS-NEXT:   1101c: jalr 72(ra)
+# DIS:      foo:
+# DIS-NEXT:   11020:
+
+# DIS:      Disassembly of section .plt:
+# DIS:      .plt:
+# DIS-NEXT:     auipc t2, 2
+# DIS-NEXT:     sub t1, t1, t3
+## .got.plt - .plt = 0x13000 - 0x11030 = 4096*2-48
+# DIS32-NEXT:   lw t3, -48(t2)
+# DIS64-NEXT:   ld t3, -48(t2)
+# DIS-NEXT:     addi t1, t1, -44
+# DIS-NEXT:     addi t0, t2, -48
+# DIS32-NEXT:   srli t1, t1, 2
+# DIS64-NEXT:   srli t1, t1, 1
+# DIS32-NEXT:   lw t0, 4(t0)
+# DIS64-NEXT:   ld t0, 8(t0)
+# DIS-NEXT:     jr t3
+
+## 32-bit: &.got.plt[bar]-. = 0x13008-0x11050 = 4096*2-72
+# DIS:        11050: auipc t3, 2
+# DIS32-NEXT:   lw t3, -72(t3)
+# DIS64-NEXT:   ld t3, -64(t3)
+# DIS-NEXT:     jalr t1, t3
+# DIS-NEXT:     nop
+
+## 32-bit: &.got.plt[weak]-. = 0x1300c-0x11060 = 4096*2-84
+# DIS:        11060: auipc t3, 2
+# DIS32-NEXT:   lw t3, -84(t3)
+# DIS64-NEXT:   ld t3, -72(t3)
+# DIS-NEXT:     jalr t1, t3
+# DIS-NEXT:     nop
+
+.global _start, foo, bar
+.weak weak
+
+_start:
+  call foo
+  call bar
+  call bar@plt
+  call weak
+
+## foo is local and non-preemptale, no PLT is generated.
+foo:
+  ret
diff --git a/deps/lld/test/ELF/riscv-reloc-64-pic.s b/deps/lld/test/ELF/riscv-reloc-64-pic.s
new file mode 100644
index 0000000000000000000000000000000000000000..b704f19e61d3586449394655a52741fc177bc73b
--- /dev/null
+++ b/deps/lld/test/ELF/riscv-reloc-64-pic.s
@@ -0,0 +1,10 @@
+# REQUIRES: riscv
+# RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.o
+# RUN: not ld.lld -shared %t.o -o %t.so 2>&1 | FileCheck %s
+
+# CHECK: error: relocation R_RISCV_32 cannot be used against symbol a
+
+.globl a
+
+.data
+.long a
diff --git a/deps/lld/test/ELF/riscv-reloc-add.s b/deps/lld/test/ELF/riscv-reloc-add.s
new file mode 100644
index 0000000000000000000000000000000000000000..85fd20ecca5988bf197f489059dcf6b41ca313b9
--- /dev/null
+++ b/deps/lld/test/ELF/riscv-reloc-add.s
@@ -0,0 +1,32 @@
+# REQUIRES: riscv
+# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+relax %s -o %t.32.o
+# RUN: ld.lld -pie %t.32.o -o %t.32
+# RUN: llvm-readelf -x .rodata %t.32 | FileCheck --check-prefix=HEX %s
+
+# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+relax %s -o %t.64.o
+# RUN: ld.lld -shared %t.64.o -o %t.64
+# RUN: llvm-readelf -x .rodata %t.64 | FileCheck --check-prefix=HEX %s
+
+# HEX:      section '.rodata':
+# HEX-NEXT: 0x{{[0-9a-f]+}} 04000000 00000000 04000000 040004
+
+## R_RISCV_ADD* and R_RISCV_SUB* are link-time constants, otherwise they are
+## not allowed in -pie/-shared mode.
+
+.global _start
+_start:
+.L0:
+  ret
+.L1:
+
+.rodata
+.dword .L1 - .L0
+.word .L1 - .L0
+.half .L1 - .L0
+.byte .L1 - .L0
+
+## Debug section may use R_RISCV_ADD64/R_RISCV_SUB64 pairs to measure lengths
+## of code ranges (e.g. DW_AT_high_pc). Check we allow R_RISCV_ADD*/R_RISCV_SUB*
+## in such non-SHF_ALLOC sections in -pie/-shared mode.
+.section .debug_info
+.quad .L1 - .L0
diff --git a/deps/lld/test/ELF/riscv-reloc-copy.s b/deps/lld/test/ELF/riscv-reloc-copy.s
new file mode 100644
index 0000000000000000000000000000000000000000..94d839d41df94743c580c58e228e16902f4ebbaa
--- /dev/null
+++ b/deps/lld/test/ELF/riscv-reloc-copy.s
@@ -0,0 +1,23 @@
+# REQUIRES: riscv
+# RUN: llvm-mc -filetype=obj -triple=riscv32 %p/Inputs/relocation-copy.s -o %t1.o
+# RUN: ld.lld -shared %t1.o -o %t1.so
+# RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.o
+# RUN: ld.lld %t.o %t1.so -o %t
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC %s
+# RUN: llvm-nm -S %t | FileCheck --check-prefix=NM32 %s
+
+# RUN: llvm-mc -filetype=obj -triple=riscv64 %p/Inputs/relocation-copy.s -o %t1.o
+# RUN: ld.lld -shared %t1.o -o %t1.so
+# RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.o
+# RUN: ld.lld %t.o %t1.so -o %t
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC %s
+# RUN: llvm-nm -S %t | FileCheck --check-prefix=NM64 %s
+
+# RELOC:      .rela.dyn {
+# RELOC-NEXT:   0x13000 R_RISCV_COPY x 0x0
+# RELOC-NEXT: }
+
+# NM32: 00013000 00000004 B x
+# NM64: 0000000000013000 0000000000000004 B x
+
+la a0, x
diff --git a/deps/lld/test/ELF/riscv-reloc-got.s b/deps/lld/test/ELF/riscv-reloc-got.s
new file mode 100644
index 0000000000000000000000000000000000000000..1adccd9d05f2ea5d1d0f3749d7cfb1a8c4fc2d1e
--- /dev/null
+++ b/deps/lld/test/ELF/riscv-reloc-got.s
@@ -0,0 +1,65 @@
+# REQUIRES: riscv
+# RUN: echo '.globl b; b:' | llvm-mc -filetype=obj -triple=riscv32 - -o %t1.o
+# RUN: ld.lld -shared %t1.o -o %t1.so
+
+# RUN: llvm-mc -filetype=obj -triple=riscv32 -position-independent %s -o %t.o
+# RUN: ld.lld %t.o %t1.so -o %t
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC32 %s
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-readobj -x .got %t | FileCheck --check-prefix=HEX32 %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=DIS32 %s
+
+# RUN: echo '.globl b; b:' | llvm-mc -filetype=obj -triple=riscv64 - -o %t1.o
+# RUN: ld.lld -shared %t1.o -o %t1.so
+
+# RUN: llvm-mc -filetype=obj -triple=riscv64 -position-independent %s -o %t.o
+# RUN: ld.lld %t.o %t1.so -o %t
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC64 %s
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-readobj -x .got %t | FileCheck --check-prefix=HEX64 %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=DIS64 %s
+
+# SEC: .got PROGBITS 00012060 020060 00000c
+
+# RELOC32:      .rela.dyn {
+# RELOC32-NEXT:   0x12068 R_RISCV_32 b 0x0
+# RELOC32-NEXT: }
+
+# RELOC64:      .rela.dyn {
+# RELOC64-NEXT:   0x120D0 R_RISCV_64 b 0x0
+# RELOC64-NEXT: }
+
+# NM: 00013000 d a
+
+## .got[0] = _DYNAMIC
+## .got[1] = a (filled at link time)
+## .got[2] = 0 (relocated by R_RISCV_64 at runtime)
+# HEX32: section '.got':
+# HEX32: 0x00012060 00200100 00300100 00000000
+
+# HEX64: section '.got':
+# HEX64: 0x000120c0 00200100 00000000 00300100 00000000
+# HEX64: 0x000120d0 00000000 00000000
+
+## &.got[1]-. = 0x12060-0x11000 = 4096*1+100
+# DIS32:      11000: auipc a0, 1
+# DIS32-NEXT:        lw a0, 100(a0)
+## &.got[2]-. = 0x12064-0x11008 = 4096*1+96
+# DIS32:      11008: auipc a0, 1
+# DIS32-NEXT:        lw a0, 96(a0)
+
+## &.got[1]-. = 0x120c8-0x11000 = 4096*1+100
+# DIS64:      11000: auipc a0, 1
+# DIS64-NEXT:        ld a0, 200(a0)
+## &.got[2]-. = 0x120d0-0x11008 = 4096*1+200
+# DIS64:      11008: auipc a0, 1
+# DIS64-NEXT:        ld a0, 200(a0)
+
+la a0,a
+la a0,b
+
+.data
+a:
+## An undefined reference of _GLOBAL_OFFSET_TABLE_ causes .got[0] to be
+## allocated to store _DYNAMIC.
+.long _GLOBAL_OFFSET_TABLE_ - .
diff --git a/deps/lld/test/ELF/riscv-tls-gd.s b/deps/lld/test/ELF/riscv-tls-gd.s
new file mode 100644
index 0000000000000000000000000000000000000000..3f5735aabf2de05db6c04bd07d308f78e1fda797
--- /dev/null
+++ b/deps/lld/test/ELF/riscv-tls-gd.s
@@ -0,0 +1,124 @@
+# REQUIRES: riscv
+# RUN: echo '.tbss; .globl b, c; b: .zero 4; c:' > %t.s
+# RUN: echo '.globl __tls_get_addr; __tls_get_addr:' > %tga.s
+
+## RISC-V psABI doesn't specify TLS relaxation. Though the code sequences are not
+## relaxed, dynamic relocations can be omitted for GD->LE relaxation.
+
+# RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.32.o
+# RUN: llvm-mc -filetype=obj -triple=riscv32 %t.s -o %t1.32.o
+# RUN: ld.lld -shared -soname=t1.so %t1.32.o -o %t1.32.so
+# RUN: llvm-mc -filetype=obj -triple=riscv32 %tga.s -o %tga.32.o
+## rv32 GD
+# RUN: ld.lld -shared %t.32.o %t1.32.o -o %t.32.so
+# RUN: llvm-readobj -r %t.32.so | FileCheck --check-prefix=GD32-REL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.32.so | FileCheck --check-prefix=GD32 %s
+## rv32 GD -> LE
+# RUN: ld.lld %t.32.o %t1.32.o %tga.32.o -o %t.32
+# RUN: llvm-readelf -r %t.32 | FileCheck --check-prefix=NOREL %s
+# RUN: llvm-readelf -x .got %t.32 | FileCheck --check-prefix=LE32-GOT %s
+# RUN: ld.lld -pie %t.32.o %t1.32.o %tga.32.o -o %t.32
+# RUN: llvm-readelf -r %t.32 | FileCheck --check-prefix=NOREL %s
+# RUN: llvm-readelf -x .got %t.32 | FileCheck --check-prefix=LE32-GOT %s
+## rv32 GD -> IE
+# RUN: ld.lld %t.32.o %t1.32.so %tga.32.o -o %t.32
+# RUN: llvm-readobj -r %t.32 | FileCheck --check-prefix=IE32-REL %s
+# RUN: llvm-readelf -x .got %t.32 | FileCheck --check-prefix=IE32-GOT %s
+
+# RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.64.o
+# RUN: llvm-mc -filetype=obj -triple=riscv64 %t.s -o %t1.64.o
+# RUN: ld.lld -shared -soname=t1.so %t1.64.o -o %t1.64.so
+# RUN: llvm-mc -filetype=obj -triple=riscv64 %tga.s -o %tga.64.o
+## rv64 GD
+# RUN: ld.lld -shared %t.64.o %t1.64.o -o %t.64.so
+# RUN: llvm-readobj -r %t.64.so | FileCheck --check-prefix=GD64-REL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.64.so | FileCheck --check-prefix=GD64 %s
+## rv64 GD -> LE
+# RUN: ld.lld %t.64.o %t1.64.o %tga.64.o -o %t.64
+# RUN: llvm-readelf -r %t.64 | FileCheck --check-prefix=NOREL %s
+# RUN: llvm-readelf -x .got %t.64 | FileCheck --check-prefix=LE64-GOT %s
+# RUN: ld.lld -pie %t.64.o %t1.64.o %tga.64.o -o %t.64
+# RUN: llvm-readelf -r %t.64 | FileCheck --check-prefix=NOREL %s
+# RUN: llvm-readelf -x .got %t.64 | FileCheck --check-prefix=LE64-GOT %s
+## rv64 GD -> IE
+# RUN: ld.lld %t.64.o %t1.64.so %tga.64.o -o %t.64
+# RUN: llvm-readobj -r %t.64 | FileCheck --check-prefix=IE64-REL %s
+# RUN: llvm-readelf -x .got %t.64 | FileCheck --check-prefix=IE64-GOT %s
+
+# GD32-REL:      .rela.dyn {
+# GD32-REL-NEXT:   0x2070 R_RISCV_TLS_DTPMOD32 a 0x0
+# GD32-REL-NEXT:   0x2074 R_RISCV_TLS_DTPREL32 a 0x0
+# GD32-REL-NEXT:   0x2078 R_RISCV_TLS_DTPMOD32 b 0x0
+# GD32-REL-NEXT:   0x207C R_RISCV_TLS_DTPREL32 b 0x0
+# GD32-REL-NEXT: }
+
+## &DTPMOD(a) - . = 0x2070 - 0x1000 = 4096*1+112
+# GD32:      1000: auipc a0, 1
+# GD32-NEXT:       addi a0, a0, 112
+# GD32-NEXT:       auipc ra, 0
+# GD32-NEXT:       jalr 56(ra)
+
+## &DTPMOD(b) - . = 0x2078 - 0x1010 = 4096*1+104
+# GD32:      1010: auipc a0, 1
+# GD32-NEXT:       addi a0, a0, 104
+# GD32-NEXT:       auipc ra, 0
+# GD32-NEXT:       jalr 40(ra)
+
+# GD64-REL:      .rela.dyn {
+# GD64-REL-NEXT:   0x20E0 R_RISCV_TLS_DTPMOD64 a 0x0
+# GD64-REL-NEXT:   0x20E8 R_RISCV_TLS_DTPREL64 a 0x0
+# GD64-REL-NEXT:   0x20F0 R_RISCV_TLS_DTPMOD64 b 0x0
+# GD64-REL-NEXT:   0x20F8 R_RISCV_TLS_DTPREL64 b 0x0
+# GD64-REL-NEXT: }
+
+## &DTPMOD(a) - . = 0x20e0 - 0x1000 = 4096*1+224
+# GD64:      1000: auipc a0, 1
+# GD64-NEXT:       addi a0, a0, 224
+# GD64-NEXT:       auipc ra, 0
+# GD64-NEXT:       jalr 56(ra)
+
+## &DTPMOD(b) - . = 0x20f0 - 0x1010 = 4096*1+224
+# GD64:      1010: auipc a0, 1
+# GD64-NEXT:       addi a0, a0, 224
+# GD64-NEXT:       auipc ra, 0
+# GD64-NEXT:       jalr 40(ra)
+
+# NOREL: no relocations
+
+## .got contains pre-populated values: [a@dtpmod, a@dtprel, b@dtpmod, b@dtprel]
+## a@dtprel = st_value(a)-0x800 = 0xfffff808
+## b@dtprel = st_value(b)-0x800 = 0xfffff80c
+# LE32-GOT: section '.got':
+# LE32-GOT-NEXT: 0x{{[0-9a-f]+}} 01000000 08f8ffff 01000000 0cf8ffff
+# LE64-GOT: section '.got':
+# LE64-GOT-NEXT: 0x{{[0-9a-f]+}} 01000000 00000000 08f8ffff ffffffff
+# LE64-GOT-NEXT: 0x{{[0-9a-f]+}} 01000000 00000000 0cf8ffff ffffffff
+
+## a is local - relaxed to LE - its DTPMOD/DTPREL slots are link-time constants.
+## b is external - DTPMOD/DTPREL dynamic relocations are required.
+# IE32-REL:      .rela.dyn {
+# IE32-REL-NEXT:   0x12068 R_RISCV_TLS_DTPMOD32 b 0x0
+# IE32-REL-NEXT:   0x1206C R_RISCV_TLS_DTPREL32 b 0x0
+# IE32-REL-NEXT: }
+# IE32-GOT:      section '.got':
+# IE32-GOT-NEXT: 0x00012060 01000000 08f8ffff 00000000 00000000
+
+# IE64-REL:      .rela.dyn {
+# IE64-REL-NEXT:   0x120D0 R_RISCV_TLS_DTPMOD64 b 0x0
+# IE64-REL-NEXT:   0x120D8 R_RISCV_TLS_DTPREL64 b 0x0
+# IE64-REL-NEXT: }
+# IE64-GOT:      section '.got':
+# IE64-GOT-NEXT: 0x000120c0 01000000 00000000 08f8ffff ffffffff
+# IE64-GOT-NEXT: 0x000120d0 00000000 00000000 00000000 00000000
+
+la.tls.gd a0,a
+call __tls_get_addr@plt
+
+la.tls.gd a0,b
+call __tls_get_addr@plt
+
+.section .tbss
+.globl a
+.zero 8
+a:
+.zero 4
diff --git a/deps/lld/test/ELF/riscv-tls-ie.s b/deps/lld/test/ELF/riscv-tls-ie.s
new file mode 100644
index 0000000000000000000000000000000000000000..b7497c3093d77fab6523139c12489a6c7a04e8c5
--- /dev/null
+++ b/deps/lld/test/ELF/riscv-tls-ie.s
@@ -0,0 +1,82 @@
+# REQUIRES: riscv
+
+# RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.32.o
+## rv32 IE
+# RUN: ld.lld -shared %t.32.o -o %t.32.so
+# RUN: llvm-readobj -r -d %t.32.so | FileCheck --check-prefix=IE32-REL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.32.so | FileCheck --check-prefixes=IE,IE32 %s
+## rv32 IE -> LE
+# RUN: ld.lld %t.32.o -o %t.32
+# RUN: llvm-readelf -r %t.32 | FileCheck --check-prefix=NOREL %s
+# RUN: llvm-readelf -x .got %t.32 | FileCheck --check-prefix=LE32-GOT %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.32 | FileCheck --check-prefixes=LE,LE32 %s
+
+# RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.64.o
+## rv64 IE
+# RUN: ld.lld -shared %t.64.o -o %t.64.so
+# RUN: llvm-readobj -r -d %t.64.so | FileCheck --check-prefix=IE64-REL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.64.so | FileCheck --check-prefixes=IE,IE64 %s
+## rv64 IE -> LE
+# RUN: ld.lld %t.64.o -o %t.64
+# RUN: llvm-readelf -r %t.64 | FileCheck --check-prefix=NOREL %s
+# RUN: llvm-readelf -x .got %t.64 | FileCheck --check-prefix=LE64-GOT %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.64 | FileCheck --check-prefixes=LE,LE64 %s
+
+# IE32-REL:      .rela.dyn {
+# IE32-REL-NEXT:   0x205C R_RISCV_TLS_TPREL32 - 0xC
+# IE32-REL-NEXT:   0x2058 R_RISCV_TLS_TPREL32 a 0x0
+# IE32-REL-NEXT: }
+# IE32-REL:      FLAGS STATIC_TLS
+
+# IE64-REL:      .rela.dyn {
+# IE64-REL-NEXT:   0x20B8 R_RISCV_TLS_TPREL64 - 0xC
+# IE64-REL-NEXT:   0x20B0 R_RISCV_TLS_TPREL64 a 0x0
+# IE64-REL-NEXT: }
+# IE64-REL:      FLAGS STATIC_TLS
+
+## rv32: &.got[1] - . = 0x2058 - . = 4096*1+88
+## rv64: &.got[1] - . = 0x20B0 - . = 4096*1+176
+# IE:        1000: auipc a4, 1
+# IE32-NEXT:       lw a4, 88(a4)
+# IE64-NEXT:       ld a4, 176(a4)
+# IE-NEXT:         add a4, a4, tp
+## rv32: &.got[0] - . = 0x205C - . = 4096*1+80
+## rv64: &.got[0] - . = 0x20B8 - . = 4096*1+172
+# IE:        100c: auipc a5, 1
+# IE32-NEXT:       lw a5, 80(a5)
+# IE64-NEXT:       ld a5, 172(a5)
+# IE-NEXT:         add a5, a5, tp
+
+# NOREL: no relocations
+
+# a@tprel = st_value(a) = 0x8
+# b@tprel = st_value(a) = 0xc
+# LE32-GOT: section '.got':
+# LE32-GOT-NEXT: 0x00012000 08000000 0c000000
+# LE64-GOT: section '.got':
+# LE64-GOT-NEXT: 0x00012000 08000000 00000000 0c000000 00000000
+
+## rv32: &.got[0] - . = 0x12000 - 0x11000 = 4096*1+0
+## rv64: &.got[0] - . = 0x12000 - 0x11000 = 4096*1+0
+# LE:        11000: auipc a4, 1
+# LE32-NEXT:        lw a4, 0(a4)
+# LE64-NEXT:        ld a4, 0(a4)
+# LE-NEXT:          add a4, a4, tp
+## rv32: &.got[1] - . = 0x12004 - 0x1100c = 4096*1-8
+## rv64: &.got[1] - . = 0x12008 - 0x1100c = 4096*1-4
+# LE:        1100c: auipc a5, 1
+# LE32-NEXT:        lw a5, -8(a5)
+# LE64-NEXT:        ld a5, -4(a5)
+# LE-NEXT:          add a5, a5, tp
+
+la.tls.ie a4,a
+add a4,a4,tp
+la.tls.ie a5,b
+add a5,a5,tp
+
+.section .tbss
+.globl a
+.zero 8
+a:
+.zero 4
+b:
diff --git a/deps/lld/test/ELF/riscv-tls-ld.s b/deps/lld/test/ELF/riscv-tls-ld.s
new file mode 100644
index 0000000000000000000000000000000000000000..6563cf874634d1d8572c97e30cb4ddfdd151dc9a
--- /dev/null
+++ b/deps/lld/test/ELF/riscv-tls-ld.s
@@ -0,0 +1,90 @@
+# REQUIRES: riscv
+# RUN: echo '.tbss; .globl b, c; b: .zero 4; c:' > %t.s
+# RUN: echo '.globl __tls_get_addr; __tls_get_addr:' > %tga.s
+
+## RISC-V psABI doesn't specify TLS relaxation. Though the code sequences are not
+## relaxed, dynamic relocations can be omitted for LD->LE relaxation.
+## LD uses the same relocation as GD: R_RISCV_GD_HI20, the difference is that it
+## references a local symbol (.LANCHOR0).
+
+# RUN: llvm-mc -filetype=obj -triple=riscv32 -position-independent %s -o %t.32.o
+# RUN: llvm-mc -filetype=obj -triple=riscv32 %tga.s -o %tga.o
+## rv32 LD
+# RUN: ld.lld -shared %t.32.o -o %t.32.so
+# RUN: llvm-readobj -r %t.32.so | FileCheck --check-prefix=LD32-REL %s
+# RUN: llvm-readelf -x .got %t.32.so | FileCheck --check-prefix=LD32-GOT %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.32.so | FileCheck --check-prefixes=LD,LD32 %s
+## rv32 LD -> LE
+# RUN: ld.lld %t.32.o %tga.o -o %t.32
+# RUN: llvm-readelf -r %t.32 | FileCheck --check-prefix=NOREL %s
+# RUN: llvm-readelf -x .got %t.32 | FileCheck --check-prefix=LE32-GOT %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.32 | FileCheck --check-prefixes=LE,LE32 %s
+
+# RUN: llvm-mc -filetype=obj -triple=riscv64 -position-independent %s -o %t.64.o
+# RUN: llvm-mc -filetype=obj -triple=riscv64 %tga.s -o %tga.o
+## rv64 LD
+# RUN: ld.lld -shared %t.64.o -o %t.64.so
+# RUN: llvm-readobj -r %t.64.so | FileCheck --check-prefix=LD64-REL %s
+# RUN: llvm-readelf -x .got %t.64.so | FileCheck --check-prefix=LD64-GOT %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.64.so | FileCheck --check-prefixes=LD,LD64 %s
+## rv64 LD -> LE
+# RUN: ld.lld %t.64.o %tga.o -o %t.64
+# RUN: llvm-readelf -r %t.64 | FileCheck --check-prefix=NOREL %s
+# RUN: llvm-readelf -x .got %t.64 | FileCheck --check-prefix=LE64-GOT %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.64 | FileCheck --check-prefixes=LE,LE64 %s
+
+## a@dtprel = st_value(a)-0x800 = 0xfffff808 is a link-time constant.
+# LD32-REL:      .rela.dyn {
+# LD32-REL-NEXT:   0x2084
+# LD32-REL-NEXT:   0x207C R_RISCV_TLS_DTPMOD32 - 0x0
+# LD32-REL-NEXT: }
+# LD32-GOT:      section '.got':
+# LD32-GOT-NEXT: 0x00002078 00200000 00000000 00f8ffff 00000000
+
+# LD64-REL:      .rela.dyn {
+# LD64-REL-NEXT:   0x2108
+# LD64-REL-NEXT:   0x20F8 R_RISCV_TLS_DTPMOD64 - 0x0
+# LD64-REL-NEXT: }
+# LD64-GOT:      section '.got':
+# LD64-GOT-NEXT: 0x000020f0 00200000 00000000 00000000 00000000
+# LD64-GOT-NEXT: 0x00002100 00f8ffff ffffffff 00000000 00000000
+
+## rv32: &DTPMOD(a) - . = 0x207c - 0x1000 = 4096*1+124
+## rv64: &DTPMOD(a) - . = 0x20e0 - 0x1000 = 4096*1+248
+# LD:        1000: auipc a0, 1
+# LD32-NEXT:       addi a0, a0, 124
+# LD64-NEXT:       addi a0, a0, 248
+# LD-NEXT:         auipc ra, 0
+# LD-NEXT:         jalr 56(ra)
+
+# NOREL: no relocations
+
+## a is local - its DTPMOD/DTPREL slots are link-time constants.
+## a@dtpmod = 1 (main module)
+# LE32-GOT: section '.got':
+# LE32-GOT-NEXT: 0x00012000 00000000 01000000 00f8ffff 00200100
+
+# LE64-GOT: section '.got':
+# LE64-GOT-NEXT: 0x00012000 00000000 00000000 01000000 00000000
+# LE64-GOT-NEXT: 0x00012010 00f8ffff ffffffff 00200100 00000000
+
+## rv32: DTPMOD(.LANCHOR0) - . = 0x12004 - 0x11000 = 4096*1+4
+## rv64: DTPMOD(.LANCHOR0) - . = 0x12008 - 0x11000 = 4096*1+8
+# LE:        11000: auipc a0, 1
+# LE32-NEXT:        addi a0, a0, 4
+# LE64-NEXT:        addi a0, a0, 8
+# LE-NEXT:          auipc ra, 0
+# LE-NEXT:          jalr 24(ra)
+
+la.tls.gd a0, .LANCHOR0
+call __tls_get_addr@plt
+lw a4, 0(a0)
+lh a0, 4(a0)
+
+## This is irrelevant to TLS. We use it to take 2 GOT slots to check DTPREL
+## offsets are correct.
+la a5, _GLOBAL_OFFSET_TABLE_
+
+.section .tbss,"awT",@nobits
+.set .LANCHOR0, . + 0
+.zero 8
diff --git a/deps/lld/test/ELF/riscv-tls-le.s b/deps/lld/test/ELF/riscv-tls-le.s
new file mode 100644
index 0000000000000000000000000000000000000000..860e6884c5daeb7be2a9d9dedb3948aa406cfe1a
--- /dev/null
+++ b/deps/lld/test/ELF/riscv-tls-le.s
@@ -0,0 +1,41 @@
+# REQUIRES: riscv
+
+# RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.32.o
+# RUN: ld.lld %t.32.o -o %t.32
+# RUN: llvm-nm -p %t.32 | FileCheck --check-prefixes=NM %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.32 | FileCheck --check-prefixes=LE %s
+# RUN: ld.lld -pie %t.32.o -o %t.32
+# RUN: llvm-objdump -d --no-show-raw-insn %t.32 | FileCheck --check-prefixes=LE %s
+
+# RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.64.o
+# RUN: ld.lld %t.64.o -o %t.64
+# RUN: llvm-objdump -d --no-show-raw-insn %t.64 | FileCheck --check-prefixes=LE %s
+# RUN: ld.lld -pie %t.64.o -o %t.64
+# RUN: llvm-objdump -d --no-show-raw-insn %t.64 | FileCheck --check-prefixes=LE %s
+
+# NM: {{0*}}00000008 b .LANCHOR0
+# NM: {{0*}}0000000c B a
+
+## .LANCHOR0@tprel = 8
+## a@tprel = 12
+# LE:      lui a5, 0
+# LE-NEXT: add a5, a5, tp
+# LE-NEXT: addi a5, a5, 8
+# LE-NEXT: lui a5, 0
+# LE-NEXT: add a5, a5, tp
+# LE-NEXT: sw a0, 12(a5)
+
+lui a5, %tprel_hi(.LANCHOR0)
+add a5, a5, tp, %tprel_add(.LANCHOR0)
+addi a5, a5, %tprel_lo(.LANCHOR0)
+
+lui a5, %tprel_hi(a)
+add a5, a5, tp, %tprel_add(a)
+sw a0, %tprel_lo(a)(a5)
+
+.section .tbss
+.space 8
+.LANCHOR0:
+.zero 4
+.globl a
+a:
diff --git a/deps/lld/test/ELF/riscv32-reloc-32-pic.s b/deps/lld/test/ELF/riscv32-reloc-32-pic.s
new file mode 100644
index 0000000000000000000000000000000000000000..7583c1e937efa160de3144123620cbd0a685aafb
--- /dev/null
+++ b/deps/lld/test/ELF/riscv32-reloc-32-pic.s
@@ -0,0 +1,23 @@
+# REQUIRES: riscv
+# RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.o
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: llvm-nm %t.so | FileCheck --check-prefix=NM %s
+# RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=RELOC %s
+
+## R_RISCV_32 is an absolute relocation type.
+## In PIC mode, it creates a relative relocation if the symbol is non-preemptable.
+
+# NM: 00002004 d b
+
+# RELOC:      .rela.dyn {
+# RELOC-NEXT:   0x2004 R_RISCV_RELATIVE - 0x2004
+# RELOC-NEXT:   0x2000 R_RISCV_32 a 0
+# RELOC-NEXT: }
+
+.globl a, b
+.hidden b
+
+.data
+.long a
+b:
+.long b
diff --git a/deps/lld/test/ELF/riscv64-reloc-64-pic.s b/deps/lld/test/ELF/riscv64-reloc-64-pic.s
new file mode 100644
index 0000000000000000000000000000000000000000..5bf504c5b6e0ed3bb09f04c865efd40f3e2798ed
--- /dev/null
+++ b/deps/lld/test/ELF/riscv64-reloc-64-pic.s
@@ -0,0 +1,23 @@
+# REQUIRES: riscv
+# RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.o
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: llvm-nm %t.so | FileCheck --check-prefix=NM %s
+# RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=RELOC %s
+
+## R_RISCV_64 is an absolute relocation type.
+## In PIC mode, it creates a relative relocation if the symbol is non-preemptable.
+
+# NM: 0000000000002008 d b
+
+# RELOC:      .rela.dyn {
+# RELOC-NEXT:   0x2008 R_RISCV_RELATIVE - 0x2008
+# RELOC-NEXT:   0x2000 R_RISCV_64 a 0
+# RELOC-NEXT: }
+
+.globl a, b
+.hidden b
+
+.data
+.quad a
+b:
+.quad b
diff --git a/deps/lld/test/ELF/rodynamic.s b/deps/lld/test/ELF/rodynamic.s
index 49d59cec4a6ac307697a7e28a2de29a0e0c5baed..d94aca38329148b08ee3186cf8a33c340e970486 100644
--- a/deps/lld/test/ELF/rodynamic.s
+++ b/deps/lld/test/ELF/rodynamic.s
@@ -4,13 +4,13 @@
 
 # RUN: ld.lld -shared %t.so.o -o %t.so
 # RUN: ld.lld %t.o %t.so -o %t.exe
-# RUN: llvm-readobj -dynamic-table %t.exe | FileCheck -check-prefix=DEFDEBUG %s
-# RUN: llvm-readobj -sections %t.exe | FileCheck -check-prefix=DEFSEC %s
+# RUN: llvm-readobj --dynamic-table %t.exe | FileCheck -check-prefix=DEFDEBUG %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck -check-prefix=DEFSEC %s
 
 # RUN: ld.lld -shared -z rodynamic %t.so.o -o %t.so
 # RUN: ld.lld -z rodynamic %t.o %t.so -o %t.exe
-# RUN: llvm-readobj -dynamic-table %t.exe | FileCheck -check-prefix=RODEBUG %s
-# RUN: llvm-readobj -sections %t.exe | FileCheck -check-prefix=ROSEC %s
+# RUN: llvm-readobj --dynamic-table %t.exe | FileCheck -check-prefix=RODEBUG %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck -check-prefix=ROSEC %s
 
 .globl _start
 _start:
diff --git a/deps/lld/test/ELF/section-align-0.test b/deps/lld/test/ELF/section-align-0.test
index 8827ecf740b374051201b4b50dfba4497b2baa3c..232d43a304cdae30c3c6e527d9ccb794307e480b 100644
--- a/deps/lld/test/ELF/section-align-0.test
+++ b/deps/lld/test/ELF/section-align-0.test
@@ -15,6 +15,6 @@ Sections:
     AddressAlign:    0
 
 Symbols:
-  Global:
-    - Name:            _start
-      Section:         .text
+  - Name:          _start
+    Section:       .text
+    Binding:       STB_GLOBAL
diff --git a/deps/lld/test/ELF/section-layout.s b/deps/lld/test/ELF/section-layout.s
index 0832109fa89844c762a5a5287c2b69fe71463593..ccd59129e31d620a153d6418f96c202ff724494d 100644
--- a/deps/lld/test/ELF/section-layout.s
+++ b/deps/lld/test/ELF/section-layout.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %tout
-# RUN: llvm-readobj -sections %tout | FileCheck %s
+# RUN: llvm-readobj --sections %tout | FileCheck %s
 
 # Check that sections are laid out in the correct order.
 
@@ -32,6 +32,7 @@ _start:
 // For non-executable and non-writable sections, PROGBITS appear after others.
 // CHECK: Name: a
 // CHECK: Name: b
+
 // CHECK: Name: c
 // CHECK: Name: d
 
@@ -40,13 +41,13 @@ _start:
 // CHECK: Name: k
 // CHECK: Name: l
 
-// Writable sections appear before TLS and other relro sections.
-// CHECK: Name: i
-
 // TLS sections are only sorted on NOBITS.
 // CHECK: Name: e
 // CHECK: Name: g
 
+// Writable sections appear after TLS and other relro sections.
+// CHECK: Name: i
+
 // CHECK: Name: j
 
 // Non allocated sections are in input order.
diff --git a/deps/lld/test/ELF/section-name.s b/deps/lld/test/ELF/section-name.s
index 4f010c81963c013530f69dbdd5986cb11beebb76..0ca8a884fbb0bf92753b84c722cbd6d541f5863e 100644
--- a/deps/lld/test/ELF/section-name.s
+++ b/deps/lld/test/ELF/section-name.s
@@ -45,12 +45,12 @@ _start:
 // CHECK:  1 .rodata  00000002
 // CHECK:  2 .gcc_except_table 00000001
 // CHECK:  3 .text         00000002
-// CHECK:  4 .data         00000002
-// CHECK:  5 .foo.a        00000001
-// CHECK:  6 .foo          00000001
-// CHECK:  7 .tdata        00000001
-// CHECK:  8 .tbss         00000001
-// CHECK:  9 .data.rel.ro  00000004
+// CHECK:  4 .tdata        00000001
+// CHECK:  5 .tbss         00000001
+// CHECK:  6 .data.rel.ro  00000004
+// CHECK:  7 .data         00000002
+// CHECK:  8 .foo.a        00000001
+// CHECK:  9 .foo          00000001
 // CHECK: 10 .bss          00000002
 // CHECK: 11 .comment      00000008
 // CHECK: 12 .symtab       00000030
diff --git a/deps/lld/test/ELF/section-symbol.s b/deps/lld/test/ELF/section-symbol.s
index 495c38db5da9a2efb300d1067de98acdb1f1385e..1c5fe7bf9520f8be4ca2645e32dfa672142f12aa 100644
--- a/deps/lld/test/ELF/section-symbol.s
+++ b/deps/lld/test/ELF/section-symbol.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: ld.lld %t -o %t.so -shared -discard-none
-// RUN: llvm-readobj -t %t.so | FileCheck %s
+// RUN: llvm-readobj --symbols %t.so | FileCheck %s
 
 // Test that we don't include the section symbols from the .o in the .so
 
diff --git a/deps/lld/test/ELF/section-symbols.test b/deps/lld/test/ELF/section-symbols.test
index 973b1102fdf3c71e668fd575562a1f0e612bba3d..74ed7ab6888bfc69fbf11b686150b30698088b1d 100644
--- a/deps/lld/test/ELF/section-symbols.test
+++ b/deps/lld/test/ELF/section-symbols.test
@@ -24,12 +24,11 @@ Sections:
     Info:            .text
     Relocations:
 Symbols:
-  Local:
-    - Type:            STT_SECTION
-      Section:         .rela.text
-    - Type:            STT_SECTION
-      Section:         .shstrtab
-    - Type:            STT_SECTION
-      Section:         .symtab
-    - Type:            STT_SECTION
-      Section:         .strtab
+  - Type:            STT_SECTION
+    Section:         .rela.text
+  - Type:            STT_SECTION
+    Section:         .shstrtab
+  - Type:            STT_SECTION
+    Section:         .symtab
+  - Type:            STT_SECTION
+    Section:         .strtab
diff --git a/deps/lld/test/ELF/sectionstart-noallochdr.s b/deps/lld/test/ELF/sectionstart-noallochdr.s
index be8e0c568e1e99067cfeb7605f3f018c75f34b7b..b32d67c7b789c05faa3d9d587334f782234e1d14 100644
--- a/deps/lld/test/ELF/sectionstart-noallochdr.s
+++ b/deps/lld/test/ELF/sectionstart-noallochdr.s
@@ -5,7 +5,7 @@
 # RUN: llvm-objdump -section-headers %t1 | FileCheck %s
 
 # CHECK:      Sections:
-# CHECK-NEXT:  Idx Name          Size      Address          Type
+# CHECK-NEXT:  Idx Name          Size     VMA              Type
 # CHECK-NEXT:    0               00000000 0000000000000000
 # CHECK-NEXT:    1 .text         00000001 0000000000000010 TEXT
 # CHECK-NEXT:    2 .data         00000004 0000000000000020 DATA
diff --git a/deps/lld/test/ELF/sectionstart.s b/deps/lld/test/ELF/sectionstart.s
index be8b5f0cfb40b3c925ed2087e8ea3d67af83013b..771d28e04592edcfc53e0432bfc09255ed11cd5a 100644
--- a/deps/lld/test/ELF/sectionstart.s
+++ b/deps/lld/test/ELF/sectionstart.s
@@ -5,7 +5,7 @@
 # RUN: llvm-objdump -section-headers %t | FileCheck %s
 
 # CHECK:      Sections:
-# CHECK-NEXT:  Idx Name          Size      Address          Type
+# CHECK-NEXT:  Idx Name          Size     VMA              Type
 # CHECK-NEXT:    0               00000000 0000000000000000
 # CHECK-NEXT:    1 .text         00000001 0000000000100000 TEXT
 # CHECK-NEXT:    2 .data         00000004 0000000000110000 DATA
@@ -45,15 +45,15 @@
 
 # RUN: not ld.lld %t.o -Ttext=1w0000 -o %t6 2>&1 \
 # RUN:    | FileCheck -check-prefix=ERR3 %s
-# ERR3: invalid argument: --Ttext 1w0000
+# ERR3: invalid argument: -Ttext=1w0000
 
 # RUN: not ld.lld %t.o -Tbss=1w0000 -o %t6 2>&1 \
 # RUN:    | FileCheck -check-prefix=ERR4 %s
-# ERR4: invalid argument: --Tbss 1w0000
+# ERR4: invalid argument: -Tbss=1w0000
 
 # RUN: not ld.lld %t.o -Tdata=1w0000 -o %t6 2>&1 \
 # RUN:    | FileCheck -check-prefix=ERR5 %s
-# ERR5: invalid argument: --Tdata 1w0000
+# ERR5: invalid argument: -Tdata=1w0000
 
 .text
 .globl _start
diff --git a/deps/lld/test/ELF/segments.s b/deps/lld/test/ELF/segments.s
index 4648ba97a854a4019f69a28c010edf844a66cceb..65d2f6e7060407a70f4bbb098989108590a38601 100644
--- a/deps/lld/test/ELF/segments.s
+++ b/deps/lld/test/ELF/segments.s
@@ -84,7 +84,7 @@
 
 # OMAGIC:     ProgramHeader {
 # OMAGIC:      Type: PT_LOAD
-# OMAGIC-NEXT:   Offset: 0x0
+# OMAGIC-NEXT:   Offset: 0xE8
 # OMAGIC-NEXT:   VirtualAddress:
 # OMAGIC-NEXT:   PhysicalAddress:
 # OMAGIC-NEXT:   FileSize:
@@ -94,11 +94,55 @@
 # OMAGIC-NEXT:     PF_W
 # OMAGIC-NEXT:     PF_X
 # OMAGIC-NEXT:   ]
-# OMAGIC-NEXT:   Alignment: 4096
+# OMAGIC-NEXT:   Alignment: 8
 # OMAGIC-NEXT: }
 # OMAGIC-NEXT: ProgramHeader {
 # OMAGIC-NEXT:   Type: PT_GNU_STACK
 
+# RUN: ld.lld -n %t -o %t4
+# RUN: llvm-readobj --program-headers %t4 | FileCheck --check-prefix=NMAGIC %s
+# RUN: ld.lld --nmagic %t -o %t4
+# RUN: llvm-readobj --program-headers %t4 | FileCheck --check-prefix=NMAGIC %s
+
+# NMAGIC:   ProgramHeader {
+# NMAGIC-NEXT:     Type: PT_LOAD
+# NMAGIC-NEXT:     Offset: 0x158
+# NMAGIC-NEXT:     VirtualAddress:
+# NMAGIC-NEXT:     PhysicalAddress:
+# NMAGIC-NEXT:     FileSize: 1
+# NMAGIC-NEXT:     MemSize: 1
+# NMAGIC-NEXT:     Flags [
+# NMAGIC-NEXT:       PF_R
+# NMAGIC-NEXT:     ]
+# NMAGIC-NEXT:     Alignment: 8
+# NMAGIC-NEXT:   }
+# NMAGIC-NEXT:   ProgramHeader {
+# NMAGIC-NEXT:     Type: PT_LOAD
+# NMAGIC-NEXT:     Offset: 0x15C
+# NMAGIC-NEXT:     VirtualAddress:
+# NMAGIC-NEXT:     PhysicalAddress:
+# NMAGIC-NEXT:     FileSize: 2
+# NMAGIC-NEXT:     MemSize: 2
+# NMAGIC-NEXT:     Flags [
+# NMAGIC-NEXT:       PF_R
+# NMAGIC-NEXT:       PF_X
+# NMAGIC-NEXT:     ]
+# NMAGIC-NEXT:     Alignment: 4
+# NMAGIC-NEXT:   }
+# NMAGIC-NEXT:   ProgramHeader {
+# NMAGIC-NEXT:     Type: PT_LOAD (0x1)
+# NMAGIC-NEXT:     Offset: 0x15E
+# NMAGIC-NEXT:     VirtualAddress:
+# NMAGIC-NEXT:     PhysicalAddress:
+# NMAGIC-NEXT:     FileSize: 1
+# NMAGIC-NEXT:     MemSize: 1
+# NMAGIC-NEXT:     Flags [
+# NMAGIC-NEXT:       PF_R
+# NMAGIC-NEXT:       PF_W
+# NMAGIC-NEXT:     ]
+# NMAGIC-NEXT:     Alignment: 1
+# NMAGIC-NEXT:   }
+
 .global _start
 _start:
  nop
diff --git a/deps/lld/test/ELF/shared-ppc64.s b/deps/lld/test/ELF/shared-ppc64.s
index f2280a1e8c1c8e9d659afd6073d3ca1e75483df4..00a27ad0d004e77fccc91acfa65d83264b9b6677 100644
--- a/deps/lld/test/ELF/shared-ppc64.s
+++ b/deps/lld/test/ELF/shared-ppc64.s
@@ -4,13 +4,13 @@
 // RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld -dynamic-linker /lib64/ld64.so.1 -rpath foo -rpath bar --export-dynamic %t.o %t2.so -o %t
-// RUN: llvm-readobj --dynamic-table -s %t | FileCheck %s
+// RUN: llvm-readobj --dynamic-table -S %t | FileCheck %s
 
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld -dynamic-linker /lib64/ld64.so.1 -rpath foo -rpath bar --export-dynamic %t.o %t2.so -o %t
-// RUN: llvm-readobj --dynamic-table -s %t | FileCheck %s
+// RUN: llvm-readobj --dynamic-table -S %t | FileCheck %s
 
 // CHECK:      Name: .rela.dyn
 // CHECK-NEXT: Type: SHT_REL
@@ -27,7 +27,7 @@
 
 // CHECK:      DynamicSection [
 // CHECK-NEXT:   Tag                Type                 Name/Value
-// CHECK-NEXT:   0x000000000000001D RUNPATH              foo:bar
+// CHECK-NEXT:   0x000000000000001D RUNPATH              Library runpath: [foo:bar]
 // CHECK-NEXT:   0x0000000000000001 NEEDED               Shared library: [{{.*}}2.so]
 // CHECK-NEXT:   0x0000000000000015 DEBUG                0x0
 // CHECK-NEXT:   0x0000000000000007 RELA                 [[RELADDR]]
@@ -39,6 +39,6 @@
 .global _start
 _start:
 .data
-.long bar
-.long zed
+.quad bar
+.quad zed
 
diff --git a/deps/lld/test/ELF/shared.s b/deps/lld/test/ELF/shared.s
index e00dd9937ff215f379dc3caf5d8d3ed6c9365c5a..592c5e3c177474e5114357a4b04d30b326e181b3 100644
--- a/deps/lld/test/ELF/shared.s
+++ b/deps/lld/test/ELF/shared.s
@@ -2,11 +2,11 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: ld.lld --hash-style=sysv -shared %t2.o -o %t2.so
-// RUN: llvm-readobj -s %t2.so | FileCheck --check-prefix=SO %s
+// RUN: llvm-readobj -S %t2.so | FileCheck --check-prefix=SO %s
 // RUN: ld.lld --hash-style=sysv -dynamic-linker /lib64/ld-linux-x86-64.so.2 -rpath foo -rpath bar --export-dynamic %t.o %t2.so -o %t
-// RUN: llvm-readobj --program-headers --dynamic-table -t -s -dyn-symbols -section-data -hash-table %t | FileCheck %s
+// RUN: llvm-readobj --program-headers --dynamic-table --symbols -S --dyn-syms --section-data --hash-table %t | FileCheck %s
 // RUN: ld.lld --hash-style=sysv %t.o %t2.so %t2.so -o %t2
-// RUN: llvm-readobj -dyn-symbols %t2 | FileCheck --check-prefix=DONT_EXPORT %s
+// RUN: llvm-readobj --dyn-syms %t2 | FileCheck --check-prefix=DONT_EXPORT %s
 
 // Make sure .symtab is properly aligned.
 // SO:      Name: .symtab
@@ -46,7 +46,7 @@
 // CHECK-NEXT:     SHF_ALLOC
 // CHECK-NEXT:   ]
 // CHECK-NEXT:   Address: [[DYNSYMADDR:.*]]
-// CHECK-NEXT:   Offset: 0x150
+// CHECK-NEXT:   Offset: 0x170
 // CHECK-NEXT:   Size:
 // CHECK-NEXT:   Link: [[DYNSTR:.*]]
 // CHECK-NEXT:   Info: 1
@@ -250,7 +250,7 @@
 
 // CHECK:      DynamicSection [
 // CHECK-NEXT:   Tag        Type                 Name/Value
-// CHECK-NEXT:   0x0000001D RUNPATH              foo:bar
+// CHECK-NEXT:   0x0000001D RUNPATH              Library runpath: [foo:bar]
 // CHECK-NEXT:   0x00000001 NEEDED               Shared library: [{{.*}}2.so]
 // CHECK-NEXT:   0x00000015 DEBUG                0x0
 // CHECK-NEXT:   0x00000011 REL                  [[RELADDR]]
diff --git a/deps/lld/test/ELF/shf-info-link.test b/deps/lld/test/ELF/shf-info-link.test
index ea15655ec89f74dc9b4655af3361ec26a1df1c8c..2f6f3ff98def190c2b0ca50e14522077623e975f 100644
--- a/deps/lld/test/ELF/shf-info-link.test
+++ b/deps/lld/test/ELF/shf-info-link.test
@@ -1,7 +1,7 @@
 # RUN: yaml2obj %s -o %t.o
 # RUN: yaml2obj %S/Inputs/shf-info-link.test  -o %t2.o
 # RUN: ld.lld %t.o %t2.o -o %t3.o -r
-# RUN: llvm-readobj -s %t3.o | FileCheck %s
+# RUN: llvm-readobj -S %t3.o | FileCheck %s
 
 # CHECK-NOT: Name: .rela.text
 # CHECK:     Name: .rela.text
@@ -28,5 +28,5 @@ Sections:
         Symbol:          foo
         Type:            R_X86_64_64
 Symbols:
-  Global:
-    - Name:            foo
+  - Name:           foo
+    Binding:        STB_GLOBAL
diff --git a/deps/lld/test/ELF/sht-group-empty.test b/deps/lld/test/ELF/sht-group-empty.test
index 46c77f332e7e704ebcce6e7723095678a6c64274..8432ccc41767e35c9c59339e7e64fe6a0ba19ddd 100644
--- a/deps/lld/test/ELF/sht-group-empty.test
+++ b/deps/lld/test/ELF/sht-group-empty.test
@@ -1,6 +1,6 @@
 # RUN: yaml2obj %s -o %t.o
 # RUN: ld.lld %t.o %t.o -o %t -r
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 # CHECK:     Name: .text.foo
 # CHECK:     Name: .rela.text.foo
@@ -49,7 +49,7 @@ Sections:
         Symbol:          bar
         Type:            R_X86_64_64
 Symbols:
-  Global:
-    - Name:            foo
-    - Name:            bar
-
+  - Name:            foo
+    Binding:         STB_GLOBAL
+  - Name:            bar
+    Binding:         STB_GLOBAL
diff --git a/deps/lld/test/ELF/silent-ignore.test b/deps/lld/test/ELF/silent-ignore.test
index adfc2442d4ed4d749ec038722ee6a143bd7f6e35..91bf89846e45863d6295ff6c14e7b93b033f61c6 100644
--- a/deps/lld/test/ELF/silent-ignore.test
+++ b/deps/lld/test/ELF/silent-ignore.test
@@ -6,8 +6,11 @@ RUN:   -no-allow-shlib-undefined \
 RUN:   -no-copy-dt-needed-entries \
 RUN:   -no-ctors-in-init-array \
 RUN:   -no-keep-memory \
+RUN:   -no-pipeline-knowledge \
 RUN:   -no-warn-common \
 RUN:   -no-warn-mismatch \
+RUN:   -p \
+RUN:   -secure-plt \
 RUN:   -sort-common \
 RUN:   -stats \
 RUN:   -warn-execstack \
diff --git a/deps/lld/test/ELF/sort-norosegment.s b/deps/lld/test/ELF/sort-norosegment.s
index 108713f8d1c817aeff762e442e94c9046397041e..37393cefc86ad540343a998e7919978e117aa0f9 100644
--- a/deps/lld/test/ELF/sort-norosegment.s
+++ b/deps/lld/test/ELF/sort-norosegment.s
@@ -8,8 +8,8 @@
 # CHECK-NEXT: .hash    {{.*}}   A
 # CHECK-NEXT: .dynstr  {{.*}}   A
 # CHECK-NEXT: .text    {{.*}}   AX
-# CHECK-NEXT: foo      {{.*}}  WA
 # CHECK-NEXT: .dynamic {{.*}}  WA
+# CHECK-NEXT: foo      {{.*}}  WA
 
 .section foo, "aw"
 .byte 0
diff --git a/deps/lld/test/ELF/start-lib-comdat.s b/deps/lld/test/ELF/start-lib-comdat.s
index ce03959fd74b9a83ad799a54dd3bf690ee1163e8..34c9934803f092b0230453a4b5edd867d14715ab 100644
--- a/deps/lld/test/ELF/start-lib-comdat.s
+++ b/deps/lld/test/ELF/start-lib-comdat.s
@@ -4,9 +4,9 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux \
 // RUN:   %p/Inputs/start-lib-comdat.s -o %t2.o
 // RUN: ld.lld -shared -o %t3 %t1.o --start-lib %t2.o --end-lib
-// RUN: llvm-readobj -t %t3 | FileCheck %s
+// RUN: llvm-readobj --symbols %t3 | FileCheck %s
 // RUN: ld.lld -shared -o %t3 --start-lib %t2.o --end-lib %t1.o
-// RUN: llvm-readobj -t %t3 | FileCheck %s
+// RUN: llvm-readobj --symbols %t3 | FileCheck %s
 
 // CHECK:      Name: zed
 // CHECK-NEXT: Value:
diff --git a/deps/lld/test/ELF/startstop-gccollect.s b/deps/lld/test/ELF/startstop-gccollect.s
index cb0009c54bec65d9ecfa70ac444d29941e20b12d..8fdd01c0908b055a0ef3fe1d1bb79205148e5e7b 100644
--- a/deps/lld/test/ELF/startstop-gccollect.s
+++ b/deps/lld/test/ELF/startstop-gccollect.s
@@ -20,10 +20,14 @@
 # DISASM:      _start:
 # DISASM-NEXT: 201000:        e8 05 00 00 00  callq   5 <__start_foo>
 # DISASM-NEXT: 201005:        e8 02 00 00 00  callq   2 <__stop_bar>
+# DISASM-EMPTY:
 # DISASM-NEXT: Disassembly of section foo:
+# DISASM-EMPTY:
 # DISASM-NEXT: __start_foo:
 # DISASM-NEXT: 20100a:        90      nop
+# DISASM-EMPTY:
 # DISASM-NEXT: Disassembly of section bar:
+# DISASM-EMPTY:
 # DISASM-NEXT: bar:
 # DISASM-NEXT: 20100b:        90      nop
 
diff --git a/deps/lld/test/ELF/startstop-shared.s b/deps/lld/test/ELF/startstop-shared.s
index 4d3192a357344e5527e8e29954051354faab4adb..02b4d0625be203c38452e2a592b3a23d52340a91 100644
--- a/deps/lld/test/ELF/startstop-shared.s
+++ b/deps/lld/test/ELF/startstop-shared.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -r -t %t.so | FileCheck  %s
+// RUN: llvm-readobj -r --symbols %t.so | FileCheck  %s
 
         .data
         .quad __start_foo
diff --git a/deps/lld/test/ELF/startstop.s b/deps/lld/test/ELF/startstop.s
index 470298eee37d8ef998e2cdcdfdf7503cf02954f2..efd117b21782b99c7e1ce3a797e06b4085677dfe 100644
--- a/deps/lld/test/ELF/startstop.s
+++ b/deps/lld/test/ELF/startstop.s
@@ -2,18 +2,20 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld --hash-style=sysv %t -o %tout -shared
 // RUN: llvm-objdump -d %tout | FileCheck -check-prefix=DISASM %s
-// RUN: llvm-readobj -symbols -r %tout | FileCheck -check-prefix=SYMBOL %s
+// RUN: llvm-readobj --symbols -r %tout | FileCheck -check-prefix=SYMBOL %s
 
 // DISASM: _start:
 // DISASM:    1000:       {{.*}}  callq   10
 // DISASM:    1005:       {{.*}}  callq   8
 // DISASM:    100a:       {{.*}}  callq   3
 // DISASM: Disassembly of section foo:
+// DISASM-EMPTY:
 // DISASM: __start_foo:
 // DISASM:    100f:       90      nop
 // DISASM:    1010:       90      nop
 // DISASM:    1011:       90      nop
 // DISASM: Disassembly of section bar:
+// DISASM-EMPTY:
 // DISASM: __start_bar:
 // DISASM:    1012:       90      nop
 // DISASM:    1013:       90      nop
@@ -50,13 +52,13 @@
 
 // SYMBOL: Symbol {
 // SYMBOL:   Name: __stop_zed1
-// SYMBOL:   Value: 0x2010
+// SYMBOL:   Value: 0x3010
 // SYMBOL:   STV_PROTECTED
 // SYMBOL:   Section: zed1
 // SYMBOL: }
 // SYMBOL: Symbol {
 // SYMBOL:   Name: __stop_zed2
-// SYMBOL:   Value: 0x2020
+// SYMBOL:   Value: 0x3020
 // SYMBOL:   STV_PROTECTED
 // SYMBOL:   Section: zed2
 // SYMBOL: }
diff --git a/deps/lld/test/ELF/static-with-export-dynamic.s b/deps/lld/test/ELF/static-with-export-dynamic.s
index a718babc2cf6a2a38903f32cf64ba70d20b4d94b..c2d2f12ed8aa3078641335de3537a7b9b1a09bad 100644
--- a/deps/lld/test/ELF/static-with-export-dynamic.s
+++ b/deps/lld/test/ELF/static-with-export-dynamic.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-cloudabi %s -o %t.o
 // RUN: ld.lld --export-dynamic %t.o -o %t
-// RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+// RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 // Ensure that a dynamic symbol table is present when --export-dynamic
 // is passed in, even when creating statically linked executables.
diff --git a/deps/lld/test/ELF/stdout.s b/deps/lld/test/ELF/stdout.s
new file mode 100644
index 0000000000000000000000000000000000000000..6c41436bc3b60f6f37ab96405a8bfd2b578335c5
--- /dev/null
+++ b/deps/lld/test/ELF/stdout.s
@@ -0,0 +1,15 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: ld.lld %t.o -o - > %t1
+# RUN: llvm-objdump -d %t1 | FileCheck %s
+
+# CHECK: 0000000000201000 _start:
+# CHECK: 201000: 90 nop
+
+# RUN: ld.lld %t.o -o %t2
+# RUN: diff %t1 %t2
+
+.globl _start
+_start:
+  nop
diff --git a/deps/lld/test/ELF/string-gc.s b/deps/lld/test/ELF/string-gc.s
index 8e4ee14e0f47271e316a3c094902a90dc263d04d..4bc7e80db71027d6fcca0b4ecb0b003b5215e596 100644
--- a/deps/lld/test/ELF/string-gc.s
+++ b/deps/lld/test/ELF/string-gc.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t --gc-sections
-// RUN: llvm-readobj -symbols %t | FileCheck %s
+// RUN: llvm-readobj --symbols %t | FileCheck %s
 
 // CHECK:      Symbols [
 // CHECK-NEXT:   Symbol {
diff --git a/deps/lld/test/ELF/string-table.s b/deps/lld/test/ELF/string-table.s
index 2a975501d951c890e8033a4d9cd731782f7bbe9d..2443a9b406317b9bea6d2ebf26a18061659ee863 100644
--- a/deps/lld/test/ELF/string-table.s
+++ b/deps/lld/test/ELF/string-table.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %t2
-// RUN: llvm-readobj -sections %t2 | FileCheck %s
+// RUN: llvm-readobj --sections %t2 | FileCheck %s
 
 .global _start
 _start:
diff --git a/deps/lld/test/ELF/strip-debug.s b/deps/lld/test/ELF/strip-debug.s
index e5295f10d1ecfc274bdaa9a296b9e6907d3c1c3b..3ffd2f89de6f0bc8b08d99fa64630d360578b442 100644
--- a/deps/lld/test/ELF/strip-debug.s
+++ b/deps/lld/test/ELF/strip-debug.s
@@ -1,11 +1,11 @@
 # REQUIRES: x86, zlib
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2 --strip-debug
-# RUN: llvm-readobj -sections %t2 | FileCheck %s
+# RUN: llvm-readobj --sections %t2 | FileCheck %s
 # RUN: ld.lld %t -o %t2 -S
-# RUN: llvm-readobj -sections %t2 | FileCheck %s
+# RUN: llvm-readobj --sections %t2 | FileCheck %s
 # RUN: ld.lld %t -o %t2 --strip-all
-# RUN: llvm-readobj -sections %t2 | FileCheck %s
+# RUN: llvm-readobj --sections %t2 | FileCheck %s
 
 # CHECK-NOT: Foo
 # CHECK-NOT: Bar
diff --git a/deps/lld/test/ELF/symbol-ordering-file-cgprofile-conflicts.s b/deps/lld/test/ELF/symbol-ordering-file-cgprofile-conflicts.s
new file mode 100644
index 0000000000000000000000000000000000000000..5a60aff18e9079c772c10edeecd7274b247fab98
--- /dev/null
+++ b/deps/lld/test/ELF/symbol-ordering-file-cgprofile-conflicts.s
@@ -0,0 +1,66 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+// RUN: ld.lld -e A %t.o --no-call-graph-profile-sort -o %t
+// RUN: llvm-nm --numeric-sort %t | FileCheck %s --check-prefix=NO_ORDERING
+// NO_ORDERING:         0000000000201000 t D
+// NO_ORDERING-NEXT:    0000000000201001 T C
+// NO_ORDERING-NEXT:    0000000000201002 T B
+// NO_ORDERING-NEXT:    0000000000201003 T A
+
+// RUN: ld.lld -e A %t.o -o %t
+// RUN: llvm-nm --numeric-sort %t | FileCheck %s --check-prefix=CALL_GRAPH
+// CALL_GRAPH:		0000000000201000 T A
+// CALL_GRAPH-NEXT:	0000000000201000 t Aa
+// CALL_GRAPH-NEXT:	0000000000201001 T B
+// CALL_GRAPH-NEXT:	0000000000201002 T C
+// CALL_GRAPH-NEXT:	0000000000201003 t D
+
+// RUN: rm -f %t.symbol_order
+// RUN: echo "C" >> %t.symbol_order
+// RUN: echo "B" >> %t.symbol_order
+// RUN: echo "D" >> %t.symbol_order
+// RUN: echo "A" >> %t.symbol_order
+
+// RUN: ld.lld -e A %t.o --symbol-ordering-file %t.symbol_order -o %t
+// RUN: llvm-nm --numeric-sort %t | FileCheck %s --check-prefix=SYMBOL_ORDER
+// SYMBOL_ORDER:	0000000000201000 T C
+// SYMBOL_ORDER-NEXT:	0000000000201001 T B
+// SYMBOL_ORDER-NEXT:	0000000000201002 t D
+// SYMBOL_ORDER-NEXT:	0000000000201003 T A
+
+// RUN: rm -f %t.call_graph
+// RUN: echo "A B 5" > %t.call_graph
+// RUN: echo "B C 50" >> %t.call_graph
+// RUN: echo "C D 40" >> %t.call_graph
+// RUN: echo "D B 10" >> %t.call_graph
+
+// RUN: not ld.lld -e A %t.o --symbol-ordering-file %t.symbol_order --call-graph-ordering-file %t.call_graph -o %t 2>&1 | FileCheck %s
+// RUN: not ld.lld -e A %t.o --call-graph-ordering-file %t.call_graph --symbol-ordering-file %t.symbol_order -o %t 2>&1 | FileCheck %s
+// CHECK: error: --symbol-ordering-file and --call-graph-order-file may not be used together
+
+    .section    .text.D,"ax",@progbits
+D:
+    retq
+
+    .section    .text.C,"ax",@progbits
+    .globl  C
+C:
+    retq
+
+    .section    .text.B,"ax",@progbits
+    .globl  B
+B:
+    retq
+
+    .section    .text.A,"ax",@progbits
+    .globl  A
+A:
+Aa:
+    retq
+
+    .cg_profile A, B, 10
+    .cg_profile A, B, 10
+    .cg_profile Aa, B, 80
+    .cg_profile A, C, 40
+    .cg_profile B, C, 30
+    .cg_profile C, D, 90
diff --git a/deps/lld/test/ELF/symbol-override.s b/deps/lld/test/ELF/symbol-override.s
index 2c3573381c1c8cf084022d399a6737a6a589518c..1d8330f2208994dd3e28f46f6d3479f6954a7dc4 100644
--- a/deps/lld/test/ELF/symbol-override.s
+++ b/deps/lld/test/ELF/symbol-override.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/symbol-override.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld %t1.o %t2.so -o %t
-// RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+// RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 // CHECK:      DynamicSymbols [
 // CHECK-NEXT:   Symbol {
diff --git a/deps/lld/test/ELF/symbols.s b/deps/lld/test/ELF/symbols.s
index e87b6438494a4d6393b74c30c731fc51601974b2..eb73da83f37f27856b2a6b29c5d2ebb5950b7c4d 100644
--- a/deps/lld/test/ELF/symbols.s
+++ b/deps/lld/test/ELF/symbols.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %t2
-// RUN: llvm-readobj -symbols -sections %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols --sections %t2 | FileCheck %s
 
 .type _start, @function
 .globl _start
diff --git a/deps/lld/test/ELF/synthetic-got.s b/deps/lld/test/ELF/synthetic-got.s
index 375a4387f1c8947eee0e13d6e2f2f7eba5e37a3e..b0bcabf9e0b780dd8c17b5396c2795fa4cec927f 100644
--- a/deps/lld/test/ELF/synthetic-got.s
+++ b/deps/lld/test/ELF/synthetic-got.s
@@ -7,13 +7,13 @@
 # RUN:   | FileCheck %s --check-prefix=GOTDATA
 
 # GOT:     Sections:
-# GOT:      8  .got.plt     00000020 00000000000000e0 DATA
-# GOT:      10 .got         00000008 00000000000001d0 DATA
-# GOTDATA:     Contents of section .got.plt:
-# GOTDATA-NEXT:  00e0 00010000 00000000 00000000 00000000
-# GOTDATA-NEXT:  00f0 00000000 00000000 d6000000 00000000
-# GOTDATA-NEXT: Contents of section .got:
-# GOTDATA-NEXT:  01d0 00000000 00000000
+# GOT:       9 .got         00000008 00000000000001b0 DATA
+# GOT:      10 .got.plt     00000020 00000000000001b8 DATA
+# GOTDATA:      Contents of section .got:
+# GOTDATA-NEXT:  01b0 00000000 00000000
+# GOTDATA-NEXT: Contents of section .got.plt:
+# GOTDATA-NEXT:  01b8 e0000000 00000000 00000000 00000000
+# GOTDATA-NEXT:  01c8 00000000 00000000 d6000000 00000000
 
 # RUN: echo "SECTIONS { .mygot : { *(.got) *(.got.plt) } }" > %t1.script
 # RUN: ld.lld --hash-style=sysv -shared %t.o -o %t1.out --script %t1.script
diff --git a/deps/lld/test/ELF/sysv-hash-no-rosegment.s b/deps/lld/test/ELF/sysv-hash-no-rosegment.s
index 31b9d2fbec050d77a5bdd5abdf9e80bb0bad5354..a704fcf07f39651a8e8d0228a1042be1aa8912e2 100644
--- a/deps/lld/test/ELF/sysv-hash-no-rosegment.s
+++ b/deps/lld/test/ELF/sysv-hash-no-rosegment.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -shared --no-rosegment -o %t %t.o
-# RUN: llvm-readobj -hash-table %t | FileCheck %s
+# RUN: llvm-readobj --hash-table %t | FileCheck %s
 
 # CHECK:      HashTable {
 # CHECK-NEXT:   Num Buckets: 2
diff --git a/deps/lld/test/ELF/tail-merge-string-align.s b/deps/lld/test/ELF/tail-merge-string-align.s
index a5d4603b6f8b6bc35444276308a8e30db0a32e09..8c63ab2de853f0a782e659d2e0c28eb395cd2a0e 100644
--- a/deps/lld/test/ELF/tail-merge-string-align.s
+++ b/deps/lld/test/ELF/tail-merge-string-align.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared -O3
-// RUN: llvm-readobj -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
 
         .section        .rodata.4a,"aMS",@progbits,1
         .align 4
diff --git a/deps/lld/test/ELF/tls-align.s b/deps/lld/test/ELF/tls-align.s
deleted file mode 100644
index 56b404e0851ca15bffe602a8758a2444576f2474..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/tls-align.s
+++ /dev/null
@@ -1,21 +0,0 @@
-// REQUIRES: x86
-// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-// RUN: ld.lld %t -o %tout -shared
-// RUN: llvm-readobj -program-headers %tout | FileCheck %s
-
-        .section        .tbss,"awT",@nobits
-        .align  8
-        .long   0
-
-// CHECK:      ProgramHeader {
-// CHECK:        Type: PT_TLS
-// CHECK-NEXT:   Offset:
-// CHECK-NEXT:   VirtualAddress:
-// CHECK-NEXT:   PhysicalAddress:
-// CHECK-NEXT:   FileSize: 0
-// CHECK-NEXT:   MemSize: 8
-// CHECK-NEXT:   Flags [
-// CHECK-NEXT:     PF_R (0x4)
-// CHECK-NEXT:   ]
-// CHECK-NEXT:   Alignment: 8
-// CHECK-NEXT: }
diff --git a/deps/lld/test/ELF/tls-dynamic-i686.s b/deps/lld/test/ELF/tls-dynamic-i686.s
index 1b13f26cc134faf158c077f35835edca9e3490c4..ed36f530cbe4f20b6a95f3acac309fc495f87e15 100644
--- a/deps/lld/test/ELF/tls-dynamic-i686.s
+++ b/deps/lld/test/ELF/tls-dynamic-i686.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t
-// RUN: ld.lld --hash-style=sysv -shared %t -o %tout
-// RUN: llvm-readobj -sections -relocations %tout | FileCheck %s
+// RUN: ld.lld --hash-style=sysv -shared -z norelro %t -o %tout
+// RUN: llvm-readobj --sections -r %tout | FileCheck %s
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DIS
 
 .type tls0,@object
@@ -56,8 +56,8 @@ addl tls1@gotntpoff(%ebx),%eax
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x3068
-// CHECK-NEXT: Offset: 0x3068
+// CHECK-NEXT: Address: 0x2070
+// CHECK-NEXT: Offset: 0x2070
 // CHECK-NEXT: Size: 32
 // CHECK-NEXT: Link: 0
 // CHECK-NEXT: Info: 0
@@ -66,34 +66,35 @@ addl tls1@gotntpoff(%ebx),%eax
 
 // CHECK: Relocations [
 // CHECK:      Section ({{.+}}) .rel.dyn {
-// CHECK-NEXT: 0x3078 R_386_TLS_DTPMOD32 - 0x0
-// CHECK-NEXT: 0x3068 R_386_TLS_DTPMOD32 tls0 0x0
-// CHECK-NEXT: 0x306C R_386_TLS_DTPOFF32 tls0 0x0
-// CHECK-NEXT: 0x3080 R_386_TLS_TPOFF tls0 0x0
-// CHECK-NEXT: 0x3070 R_386_TLS_DTPMOD32 tls1 0x0
-// CHECK-NEXT: 0x3074 R_386_TLS_DTPOFF32 tls1 0x0
-// CHECK-NEXT: 0x3084 R_386_TLS_TPOFF tls1 0x0
+// CHECK-NEXT: 0x2080 R_386_TLS_DTPMOD32 - 0x0
+// CHECK-NEXT: 0x2070 R_386_TLS_DTPMOD32 tls0 0x0
+// CHECK-NEXT: 0x2074 R_386_TLS_DTPOFF32 tls0 0x0
+// CHECK-NEXT: 0x2088 R_386_TLS_TPOFF tls0 0x0
+// CHECK-NEXT: 0x2078 R_386_TLS_DTPMOD32 tls1 0x0
+// CHECK-NEXT: 0x207C R_386_TLS_DTPOFF32 tls1 0x0
+// CHECK-NEXT: 0x208C R_386_TLS_TPOFF tls1 0x0
 // CHECK-NEXT: }
 
 // DIS:      Disassembly of section .text:
+// DIS-EMPTY:
 // DIS-NEXT: _start:
 // General dynamic model:
 // -32 and -24 are first and second GOT entries offsets.
 // Each one is a pair of records.
-// DIS-NEXT: 1000: 8d 04 1d e0 ff ff ff  leal -32(,%ebx), %eax
-// DIS-NEXT: 1007: e8 64 00 00 00        calll 100
-// DIS-NEXT: 100c: 8d 04 1d e8 ff ff ff  leal -24(,%ebx), %eax
-// DIS-NEXT: 1013: e8 58 00 00 00        calll 88
+// DIS-NEXT: 1000: {{.*}} leal -32(,%ebx), %eax
+// DIS-NEXT: 1007: {{.*}} calll 100
+// DIS-NEXT: 100c: {{.*}} leal -24(,%ebx), %eax
+// DIS-NEXT: 1013: {{.*}} calll 88
 // Local dynamic model:
 // -16 is a local module tls index offset.
-// DIS-NEXT: 1018: 8d 83 f0 ff ff ff leal -16(%ebx), %eax
-// DIS-NEXT: 101e: e8 4d 00 00 00    calll 77
-// DIS-NEXT: 1023: 8d 90 08 00 00 00 leal 8(%eax), %edx
-// DIS-NEXT: 1029: 8d 83 f0 ff ff ff leal -16(%ebx), %eax
-// DIS-NEXT: 102f: e8 3c 00 00 00    calll 60
-// DIS-NEXT: 1034: 8d 90 0c 00 00 00 leal 12(%eax), %edx
+// DIS-NEXT: 1018: {{.*}} leal -16(%ebx), %eax
+// DIS-NEXT: 101e: {{.*}} calll 77
+// DIS-NEXT: 1023: {{.*}} leal 8(%eax), %edx
+// DIS-NEXT: 1029: {{.*}} leal -16(%ebx), %eax
+// DIS-NEXT: 102f: {{.*}} calll 60
+// DIS-NEXT: 1034: {{.*}} leal 12(%eax), %edx
 // Initial exec model:
-// DIS-NEXT: 103a: 65 a1 00 00 00 00 movl %gs:0, %eax
-// DIS-NEXT: 1040: 03 83 f8 ff ff ff addl -8(%ebx), %eax
-// DIS-NEXT: 1046: 65 a1 00 00 00 00 movl %gs:0, %eax
-// DIS-NEXT: 104c: 03 83 fc ff ff ff addl -4(%ebx), %eax
+// DIS-NEXT: 103a: {{.*}} movl %gs:0, %eax
+// DIS-NEXT: 1040: {{.*}} addl -8(%ebx), %eax
+// DIS-NEXT: 1046: {{.*}} movl %gs:0, %eax
+// DIS-NEXT: 104c: {{.*}} addl -4(%ebx), %eax
diff --git a/deps/lld/test/ELF/tls-dynamic.s b/deps/lld/test/ELF/tls-dynamic.s
index 167f7687451e0dfb34d8dc1e3f3f83a7b4d9ff01..4e0377fc29a4375682b3ac6e8420fa90f8c4db62 100644
--- a/deps/lld/test/ELF/tls-dynamic.s
+++ b/deps/lld/test/ELF/tls-dynamic.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld --hash-style=sysv -shared %t -o %tout
-// RUN: llvm-readobj -sections -relocations %tout | FileCheck %s
+// RUN: llvm-readobj --sections -r %tout | FileCheck %s
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DIS
 
   leaq  a@tlsld(%rip), %rdi
@@ -48,28 +48,29 @@ c:
 // CHECK-NEXT:       SHF_ALLOC
 // CHECK-NEXT:       SHF_WRITE
 // CHECK-NEXT:     ]
-// CHECK-NEXT:     Address: 0x30D0
+// CHECK-NEXT:     Address: 0x20E0
 // CHECK-NEXT:     Offset:
 // CHECK-NEXT:     Size: 40
 
 // CHECK:      Relocations [
 // CHECK:        Section ({{.+}}) .rela.dyn {
-// CHECK-NEXT:     0x30D0 R_X86_64_DTPMOD64 - 0x0
-// CHECK-NEXT:     0x30E0 R_X86_64_DTPMOD64 c 0x0
-// CHECK-NEXT:     0x30E8 R_X86_64_DTPOFF64 c 0x0
-// CHECK-NEXT:     0x30F0 R_X86_64_TPOFF64 c 0x0
+// CHECK-NEXT:     0x20E0 R_X86_64_DTPMOD64 - 0x0
+// CHECK-NEXT:     0x20F0 R_X86_64_DTPMOD64 c 0x0
+// CHECK-NEXT:     0x20F8 R_X86_64_DTPOFF64 c 0x0
+// CHECK-NEXT:     0x2100 R_X86_64_TPOFF64 c 0x0
 // CHECK-NEXT:   }
 
-// 4297 = (0x20D0 + -4) - (0x1000 + 3) // PC relative offset to got entry.
-// 4285 = (0x20D0 + -4) - (0x100c + 3) // PC relative offset to got entry.
-// 4267 = (0x20E0 + -4) - (0x102e + 3) // PC relative offset to got entry.
-// 4263 = (0x20F0 + -4) - (0x1042 + 3) // PC relative offset to got entry.
+// 4313 = (0x20E0 + -4) - (0x1000 + 3) // PC relative offset to got entry.
+// 4301 = (0x20F0 + -4) - (0x100c + 3) // PC relative offset to got entry.
+// 4283 = (0x20F8 + -4) - (0x102e + 3) // PC relative offset to got entry.
+// 4279 = (0x2100 + -4) - (0x1042 + 3) // PC relative offset to got entry.
 
 // DIS:      Disassembly of section .text:
+// DIS-EMPTY:
 // DIS-NEXT: .text:
-// DIS-NEXT:     1000: {{.+}} leaq    8393(%rip), %rdi
+// DIS-NEXT:     1000: {{.+}} leaq    4313(%rip), %rdi
 // DIS-NEXT:     1007: {{.+}} callq
-// DIS-NEXT:     100c: {{.+}} leaq    8381(%rip), %rdi
+// DIS-NEXT:     100c: {{.+}} leaq    4301(%rip), %rdi
 // DIS-NEXT:     1013: {{.+}} callq
 // DIS-NEXT:     1018: {{.+}} leaq    (%rax), %rcx
 // DIS-NEXT:     101f: {{.+}} leaq    4(%rax), %rcx
@@ -77,10 +78,10 @@ c:
 // DIS-NEXT:     1028: 00 00
 // DIS-NEXT:     102a: 00 00
 // DIS-NEXT:     102c: 00 00
-// DIS-NEXT:     102e: {{.+}} leaq    8363(%rip), %rdi
+// DIS-NEXT:     102e: {{.+}} leaq    4283(%rip), %rdi
 // DIS-NEXT:     1035: {{.+}} callq
 // DIS-NEXT:     103b: {{.+}} leaq    (%rax), %rcx
-// DIS-NEXT:     1042: {{.+}} movq    8359(%rip), %rax
+// DIS-NEXT:     1042: {{.+}} movq    4279(%rip), %rax
 // DIS-NEXT:     1049: {{.+}} movq    %fs:(%rax), %rax
 // DIS-NEXT:     104d: {{.+}} movabsq $0, %rax
 // DIS-NEXT:     1057: {{.+}} movabsq $4, %rax
diff --git a/deps/lld/test/ELF/tls-got.s b/deps/lld/test/ELF/tls-got.s
index bedaaebeeb3cbd92f7770915aafd22d59fe5ca61..d05208bae3c465bccfd1f47325c0ee4044e680be 100644
--- a/deps/lld/test/ELF/tls-got.s
+++ b/deps/lld/test/ELF/tls-got.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/tls-got.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld --hash-style=sysv -e main %t1.o %t2.so -o %t3
-// RUN: llvm-readobj -s -r %t3 | FileCheck %s
+// RUN: llvm-readobj -S -r %t3 | FileCheck %s
 // RUN: llvm-objdump -d %t3 | FileCheck --check-prefix=DISASM %s
 
 // CHECK:      Section {
@@ -15,7 +15,7 @@
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
 // CHECK-NEXT: Address: [[ADDR:.*]]
-// CHECK-NEXT: Offset: 0x20B0
+// CHECK-NEXT: Offset: 0x20C0
 // CHECK-NEXT: Size: 16
 // CHECK-NEXT: Link: 0
 // CHECK-NEXT: Info: 0
@@ -25,23 +25,24 @@
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section (4) .rela.dyn {
-// CHECK-NEXT:     0x2020B8 R_X86_64_TPOFF64 tls0 0x0
-// CHECK-NEXT:     0x2020B0 R_X86_64_TPOFF64 tls1 0x0
+// CHECK-NEXT:     0x2020C8 R_X86_64_TPOFF64 tls0 0x0
+// CHECK-NEXT:     [[ADDR]] R_X86_64_TPOFF64 tls1 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
-//0x201000 + 4265 + 7 = 0x2020B0
-//0x20100A + 4263 + 7 = 0x2020B8
-//0x201014 + 4253 + 7 = 0x2020B8
-//DISASM:      Disassembly of section .text:
-//DISASM-NEXT: main:
-//DISASM-NEXT: 201000: 48 8b 05 a9 10 00 00 movq 4265(%rip), %rax
-//DISASM-NEXT: 201007: 64 8b 00 movl %fs:(%rax), %eax
-//DISASM-NEXT: 20100a: 48 8b 05 a7 10 00 00 movq 4263(%rip), %rax
-//DISASM-NEXT: 201011: 64 8b 00 movl %fs:(%rax), %eax
-//DISASM-NEXT: 201014: 48 8b 05 9d 10 00 00 movq 4253(%rip), %rax
-//DISASM-NEXT: 20101b: 64 8b 00 movl %fs:(%rax), %eax
-//DISASM-NEXT: 20101e: c3 retq
+// 0x201000 + 4281 + 7 = 0x2020C0
+// 0x20100A + 4279 + 7 = 0x2020C8
+// 0x201014 + 4269 + 7 = 0x2020C8
+// DISASM:      Disassembly of section .text:
+// DISASM-EMPTY:
+// DISASM-NEXT: main:
+// DISASM-NEXT: 201000: {{.*}} movq 4281(%rip), %rax
+// DISASM-NEXT: 201007: {{.*}} movl %fs:(%rax), %eax
+// DISASM-NEXT: 20100a: {{.*}} movq 4279(%rip), %rax
+// DISASM-NEXT: 201011: {{.*}} movl %fs:(%rax), %eax
+// DISASM-NEXT: 201014: {{.*}} movq 4269(%rip), %rax
+// DISASM-NEXT: 20101b: {{.*}} movl %fs:(%rax), %eax
+// DISASM-NEXT: 20101e: {{.*}} retq
 
 .section .tdata,"awT",@progbits
 
diff --git a/deps/lld/test/ELF/tls-i686.s b/deps/lld/test/ELF/tls-i686.s
index 31c9494c6f24c6e5536130811ef95a8df40ebc93..6ff1aa6947781a43251fb3fab46d4a5b8d950ed2 100644
--- a/deps/lld/test/ELF/tls-i686.s
+++ b/deps/lld/test/ELF/tls-i686.s
@@ -31,6 +31,7 @@ _start:
  leal var1@ntpoff+123(%ecx), %eax
 
 // DIS:      Disassembly of section test:
+// DIS-EMPTY:
 // DIS-NEXT: _start:
 // DIS-NEXT: 401000: ba 08 00 00 00       movl $8, %edx
 // DIS-NEXT: 401005: 65 8b 0d 00 00 00 00 movl %gs:0, %ecx
@@ -47,6 +48,7 @@ _start:
 // RELOC-NEXT: ]
 
 // DISSHARED: Disassembly of section test:
+// DISSHARED-EMPTY:
 // DISSHARED-NEXT: _start:
 // DISSHARED-NEXT: 1000: ba 00 00 00 00 movl   $0, %edx
 // DISSHARED-NEXT: 1005: 65 8b 0d 00 00 00 00  movl %gs:0, %ecx
diff --git a/deps/lld/test/ELF/tls-initial-exec-local.s b/deps/lld/test/ELF/tls-initial-exec-local.s
index e65fb294bc179b598702813ee46c875b8660c9a9..c7dacd554d7fe44eefec094a602408a5520b33b4 100644
--- a/deps/lld/test/ELF/tls-initial-exec-local.s
+++ b/deps/lld/test/ELF/tls-initial-exec-local.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld --hash-style=sysv -shared %t.o -o %t
-// RUN: llvm-readobj -r -s %t | FileCheck %s
+// RUN: llvm-readobj -r -S %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
 // CHECK:      Name: .got
@@ -10,21 +10,22 @@
 // CHECK-NEXT:   SHF_ALLOC (0x2)
 // CHECK-NEXT:   SHF_WRITE (0x1)
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x2090
+// CHECK-NEXT: Address: 0x20A0
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
-// CHECK-NEXT:     0x2090 R_X86_64_TPOFF64 - 0x0
-// CHECK-NEXT:     0x2098 R_X86_64_TPOFF64 - 0x4
+// CHECK-NEXT:     0x20A0 R_X86_64_TPOFF64 - 0x0
+// CHECK-NEXT:     0x20A8 R_X86_64_TPOFF64 - 0x4
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
-// 0x1007 + 4233 = 0x2090
-// 0x100e + 4234 = 0x2098
+// 0x1007 + 4249 = 0x20A0
+// 0x100e + 4250 = 0x20A8
 // DISASM:      Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: .text:
-// DISASM-NEXT:  1000: {{.*}} addq      4233(%rip), %rax
-// DISASM-NEXT:  1007: {{.*}} addq      4234(%rip), %rax
+// DISASM-NEXT:  1000: {{.*}} addq 4249(%rip), %rax
+// DISASM-NEXT:  1007: {{.*}} addq 4250(%rip), %rax
 
         addq    foo@GOTTPOFF(%rip), %rax
         addq    bar@GOTTPOFF(%rip), %rax
diff --git a/deps/lld/test/ELF/tls-offset.s b/deps/lld/test/ELF/tls-offset.s
index 75d9af7f5b724534ddad28ffa6c7111c2a03bf6d..d14ef28e5465677435eb4e75da836e010b1ce612 100644
--- a/deps/lld/test/ELF/tls-offset.s
+++ b/deps/lld/test/ELF/tls-offset.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %tout
-// RUN: llvm-readobj -s %tout | FileCheck %s
+// RUN: llvm-readobj -S %tout | FileCheck %s
 // RUN: echo "SECTIONS { \
 // RUN:   . = 0x201000; \
 // RUN:   .text : { *(.text) } \
@@ -12,7 +12,7 @@
 // RUN: }" > %t.script
 // RUN: ld.lld -T %t.script %t -o %tout2
 // RUN: echo SCRIPT
-// RUN: llvm-readobj -s %tout2 | FileCheck %s
+// RUN: llvm-readobj -S %tout2 | FileCheck %s
         .global _start
 _start:
         retq
diff --git a/deps/lld/test/ELF/tls-opt-gdie.s b/deps/lld/test/ELF/tls-opt-gdie.s
index 6d0eb979149acd1416bb838cb2087251cd40dc4b..f5d21d6eb812d2b5d876461e5d2cf6368588c62f 100644
--- a/deps/lld/test/ELF/tls-opt-gdie.s
+++ b/deps/lld/test/ELF/tls-opt-gdie.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/tls-opt-gdie.s -o %tso.o
 // RUN: ld.lld -shared %tso.o -o %t.so
 // RUN: ld.lld --hash-style=sysv %t.o %t.so -o %t1
-// RUN: llvm-readobj -s -r %t1 | FileCheck --check-prefix=RELOC %s
+// RUN: llvm-readobj -S -r %t1 | FileCheck --check-prefix=RELOC %s
 // RUN: llvm-objdump -d %t1 | FileCheck --check-prefix=DISASM %s
 
 //RELOC:      Section {
@@ -32,6 +32,7 @@
 //0x201009 + (4256 + 7) = 0x2020B0
 //0x201019 + (4248 + 7) = 0x2020B8
 // DISASM:      Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: _start:
 // DISASM-NEXT: 201000: {{.*}} movq %fs:0, %rax
 // DISASM-NEXT: 201009: {{.*}} addq 4256(%rip), %rax
diff --git a/deps/lld/test/ELF/tls-opt-gdiele-i686.s b/deps/lld/test/ELF/tls-opt-gdiele-i686.s
index 1baaf111cbfafcdf65593e5642db6def22791303..c9df1d089abff3506ca694200da287561339b8ac 100644
--- a/deps/lld/test/ELF/tls-opt-gdiele-i686.s
+++ b/deps/lld/test/ELF/tls-opt-gdiele-i686.s
@@ -14,11 +14,12 @@
 // NORELOC-NEXT: ]
 
 // DISASM:      Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: _start:
 // DISASM-NEXT: 401000: 65 a1 00 00 00 00 movl %gs:0, %eax
-// DISASM-NEXT: 401006: 03 83 f8 ff ff ff addl -8(%ebx), %eax
+// DISASM-NEXT: 401006: 03 83 58 f0 ff ff addl -4008(%ebx), %eax
 // DISASM-NEXT: 40100c: 65 a1 00 00 00 00 movl %gs:0, %eax
-// DISASM-NEXT: 401012: 03 83 fc ff ff ff addl -4(%ebx), %eax
+// DISASM-NEXT: 401012: 03 83 5c f0 ff ff addl -4004(%ebx), %eax
 // DISASM-NEXT: 401018: 65 a1 00 00 00 00 movl %gs:0, %eax
 // DISASM-NEXT: 40101e: 81 e8 08 00 00 00 subl $8, %eax
 // DISASM-NEXT: 401024: 65 a1 00 00 00 00 movl %gs:0, %eax
@@ -53,7 +54,7 @@ leal tlsshared0@tlsgd(,%ebx,1),%eax
 call ___tls_get_addr@plt
 leal tlsshared1@tlsgd(,%ebx,1),%eax
 call ___tls_get_addr@plt
-//GD->IE
+//GD->LE
 leal tlsexe1@tlsgd(,%ebx,1),%eax
 call ___tls_get_addr@plt
 leal tlsexe2@tlsgd(,%ebx,1),%eax
diff --git a/deps/lld/test/ELF/tls-opt-i686.s b/deps/lld/test/ELF/tls-opt-i686.s
index 0f9d4d6ff52251856bc9f499ec78571891873fed..23bad884a997d33fcfe2487d1cb23553be9a287d 100644
--- a/deps/lld/test/ELF/tls-opt-i686.s
+++ b/deps/lld/test/ELF/tls-opt-i686.s
@@ -8,6 +8,7 @@
 // NORELOC-NEXT: ]
 
 // DISASM:      Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: _start:
 // LD -> LE:
 // DISASM-NEXT: 401000: 65 a1 00 00 00 00 movl %gs:0, %eax
diff --git a/deps/lld/test/ELF/tls-opt-iele-i686-nopic.s b/deps/lld/test/ELF/tls-opt-iele-i686-nopic.s
index 704928b2b4dd400b762a74ca8729acc6f65e90fd..41e563c78aae704cc3d4ec8fa06ec2acd179508a 100644
--- a/deps/lld/test/ELF/tls-opt-iele-i686-nopic.s
+++ b/deps/lld/test/ELF/tls-opt-iele-i686-nopic.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %p/Inputs/tls-opt-iele-i686-nopic.s -o %tso.o
 // RUN: ld.lld -shared %tso.o -o %tso
 // RUN: ld.lld --hash-style=sysv %t.o %tso -o %t1
-// RUN: llvm-readobj -s -r %t1 | FileCheck --check-prefix=GOTREL %s
+// RUN: llvm-readobj -S -r %t1 | FileCheck --check-prefix=GOTREL %s
 // RUN: llvm-objdump -d %t1 | FileCheck --check-prefix=DISASM %s
 
 // GOTREL:      Section {
@@ -14,8 +14,8 @@
 // GOTREL-NEXT:     SHF_ALLOC
 // GOTREL-NEXT:     SHF_WRITE
 // GOTREL-NEXT:   ]
-// GOTREL-NEXT:   Address: 0x402058
-// GOTREL-NEXT:   Offset: 0x2058
+// GOTREL-NEXT:   Address:  0x402060
+// GOTREL-NEXT:   Offset: 0x2060
 // GOTREL-NEXT:   Size: 8
 // GOTREL-NEXT:   Link: 0
 // GOTREL-NEXT:   Info: 0
@@ -24,33 +24,34 @@
 // GOTREL-NEXT: }
 // GOTREL:      Relocations [
 // GOTREL-NEXT: Section ({{.*}}) .rel.dyn {
-// GOTREL-NEXT:   0x402058 R_386_TLS_TPOFF tlsshared0 0x0
-// GOTREL-NEXT:   0x40205C R_386_TLS_TPOFF tlsshared1 0x0
+// GOTREL-NEXT:   0x402060 R_386_TLS_TPOFF tlsshared0 0x0
+// GOTREL-NEXT:   0x402064 R_386_TLS_TPOFF tlsshared1 0x0
 // GOTREL-NEXT:  }
 // GOTREL-NEXT: ]
 
 // DISASM:      Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: _start:
 // 4294967288 = 0xFFFFFFF8
 // 4294967292 = 0xFFFFFFFC
-// 4202584 = (.got)[0] = 0x402058
-// 4202588 = (.got)[1] = 0x40205C
-// DISASM-NEXT: 401000: c7 c1 f8 ff ff ff movl $4294967288, %ecx
-// DISASM-NEXT: 401006: 65 8b 01          movl %gs:(%ecx), %eax
-// DISASM-NEXT: 401009: b8 f8 ff ff ff    movl $4294967288, %eax
-// DISASM-NEXT: 40100e: 65 8b 00          movl %gs:(%eax), %eax
-// DISASM-NEXT: 401011: 81 c1 f8 ff ff ff addl $4294967288, %ecx
-// DISASM-NEXT: 401017: 65 8b 01          movl %gs:(%ecx), %eax
-// DISASM-NEXT: 40101a: c7 c1 fc ff ff ff movl $4294967292, %ecx
-// DISASM-NEXT: 401020: 65 8b 01          movl %gs:(%ecx), %eax
-// DISASM-NEXT: 401023: b8 fc ff ff ff    movl $4294967292, %eax
-// DISASM-NEXT: 401028: 65 8b 00          movl %gs:(%eax), %eax
-// DISASM-NEXT: 40102b: 81 c1 fc ff ff ff addl $4294967292, %ecx
-// DISASM-NEXT: 401031: 65 8b 01          movl %gs:(%ecx), %eax
-// DISASM-NEXT: 401034: 8b 0d 58 20 40 00 movl 4202584, %ecx
-// DISASM-NEXT: 40103a: 65 8b 01          movl %gs:(%ecx), %eax
-// DISASM-NEXT: 40103d: 03 0d 5c 20 40 00 addl 4202588, %ecx
-// DISASM-NEXT: 401043: 65 8b 01          movl %gs:(%ecx), %eax
+// 4202592 = (.got)[0] = 0x402060
+// 4202596 = (.got)[1] = 0x402064
+// DISASM-NEXT: 401000: {{.*}} movl $4294967288, %ecx
+// DISASM-NEXT: 401006: {{.*}} movl %gs:(%ecx), %eax
+// DISASM-NEXT: 401009: {{.*}} movl $4294967288, %eax
+// DISASM-NEXT: 40100e: {{.*}} movl %gs:(%eax), %eax
+// DISASM-NEXT: 401011: {{.*}} addl $4294967288, %ecx
+// DISASM-NEXT: 401017: {{.*}} movl %gs:(%ecx), %eax
+// DISASM-NEXT: 40101a: {{.*}} movl $4294967292, %ecx
+// DISASM-NEXT: 401020: {{.*}} movl %gs:(%ecx), %eax
+// DISASM-NEXT: 401023: {{.*}} movl $4294967292, %eax
+// DISASM-NEXT: 401028: {{.*}} movl %gs:(%eax), %eax
+// DISASM-NEXT: 40102b: {{.*}} addl $4294967292, %ecx
+// DISASM-NEXT: 401031: {{.*}} movl %gs:(%ecx), %eax
+// DISASM-NEXT: 401034: {{.*}} movl 4202592, %ecx
+// DISASM-NEXT: 40103a: {{.*}} movl %gs:(%ecx), %eax
+// DISASM-NEXT: 40103d: {{.*}} addl 4202596, %ecx
+// DISASM-NEXT: 401043: {{.*}} movl %gs:(%ecx), %eax
 
 .type tlslocal0,@object
 .section .tbss,"awT",@nobits
diff --git a/deps/lld/test/ELF/tls-opt-local.s b/deps/lld/test/ELF/tls-opt-local.s
index e937d4d5d9725dd9b19042bee88556e5c0caabcf..2dee78e37c934c2d758ed086dfb3ee8f0df1aa4e 100644
--- a/deps/lld/test/ELF/tls-opt-local.s
+++ b/deps/lld/test/ELF/tls-opt-local.s
@@ -8,6 +8,7 @@
 // NORELOC-NEXT: ]
 
 // DISASM:      Disassembly of section .text:
+// DISASM-EMPTY:
 // DISASM-NEXT: _start:
 // DISASM-NEXT: 201000: 48 c7 c0 f8 ff ff ff movq $-8, %rax
 // DISASM-NEXT: 201007: 49 c7 c7 f8 ff ff ff movq $-8, %r15
diff --git a/deps/lld/test/ELF/tls-opt-no-plt.s b/deps/lld/test/ELF/tls-opt-no-plt.s
index c61388648fb15d2bfd022b5ebe7315549c6cd36e..9f4365249257c9427e852fc6ad56c80423b10815 100644
--- a/deps/lld/test/ELF/tls-opt-no-plt.s
+++ b/deps/lld/test/ELF/tls-opt-no-plt.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/tls-opt-gdie.s -o %t2.o
 // RUN: ld.lld %t2.o -o %t2.so -shared
 // RUN: ld.lld %t.o %t2.so -o %t.exe
-// RUN: llvm-readobj -s %t.exe | FileCheck %s
+// RUN: llvm-readobj -S %t.exe | FileCheck %s
 
 // CHECK-NOT: .plt
 
diff --git a/deps/lld/test/ELF/tls-relocatable.s b/deps/lld/test/ELF/tls-relocatable.s
index 2743861c1de0a37f2c66a9d9864cc5b110185756..34081deebbba369e1c29e6e29f5896deaeb28842 100644
--- a/deps/lld/test/ELF/tls-relocatable.s
+++ b/deps/lld/test/ELF/tls-relocatable.s
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -r -o %tr.o
 // RUN: ld.lld %tr.o -shared -o %t1
-// RUN: llvm-readobj -t %t1 | FileCheck %s
+// RUN: llvm-readobj --symbols %t1 | FileCheck %s
 
 // CHECK:       Symbol {
 // CHECK:         Name: tls0
diff --git a/deps/lld/test/ELF/tls.s b/deps/lld/test/ELF/tls.s
index a5b95597518bdfe71b9c592f4753d5ee9591cdf8..dc310e0a57ef23e7e065a5d1f25a84e446c70013 100644
--- a/deps/lld/test/ELF/tls.s
+++ b/deps/lld/test/ELF/tls.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %tout
-// RUN: llvm-readobj -symbols -sections -program-headers %tout | FileCheck %s
+// RUN: llvm-readobj --symbols --sections -l %tout | FileCheck %s
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DIS
 
 .global _start
@@ -163,6 +163,7 @@ d:
 // CHECK-NEXT:   }
 
 // DIS:      Disassembly of section .text:
+// DIS-EMPTY:
 // DIS-NEXT: _start:
 // DIS-NEXT:    201000: {{.+}} movl    %fs:-8, %eax
 // DIS-NEXT:    201008: {{.+}} movl    %fs:-16, %eax
diff --git a/deps/lld/test/ELF/trace-symbols.s b/deps/lld/test/ELF/trace-symbols.s
index 63004b7c18aab259964e33cf6dd3af63f944dccc..b6f8bea79d120c049d0e107a7bfe03eba5468760 100644
--- a/deps/lld/test/ELF/trace-symbols.s
+++ b/deps/lld/test/ELF/trace-symbols.s
@@ -14,46 +14,51 @@
 # RUN: llvm-ar rcs %t2.a %t2
 
 # RUN: ld.lld -y foo -trace-symbol common -trace-symbol=hsymbol \
-# RUN:   %t %t1 %t2 -o %t3 2>&1 | FileCheck -check-prefix=OBJECTRFOO %s
+# RUN:   %t %t1 %t2 -o %t3 | FileCheck -check-prefix=OBJECTRFOO %s
 # OBJECTRFOO: trace-symbols.s.tmp: reference to foo
 
 # RUN: ld.lld -y foo -trace-symbol=common -trace-symbol=hsymbol \
-# RUN:   %t %t1 %t2 -o %t3 2>&1 | FileCheck -check-prefix=OBJECTDCOMMON %s
+# RUN:   %t %t1 %t2 -o %t3 | FileCheck -check-prefix=OBJECTDCOMMON %s
 # OBJECTDCOMMON: trace-symbols.s.tmp1: common definition of common
 
 # RUN: ld.lld -y foo -trace-symbol=common -trace-symbol=hsymbol \
-# RUN:   %t %t1 %t2 -o %t3 2>&1 | FileCheck -check-prefix=OBJECTD1FOO %s
+# RUN:   %t %t1 %t2 -o %t3 | FileCheck -check-prefix=OBJECTD1FOO %s
 # OBJECTD1FOO: trace-symbols.s.tmp: reference to foo
 # OBJECTD1FOO: trace-symbols.s.tmp1: common definition of common
 # OBJECTD1FOO: trace-symbols.s.tmp1: definition of foo
 # OBJECTD1FOO: trace-symbols.s.tmp2: definition of foo
 
+# RUN: ld.lld -y foo %t1 %t2 %t -o %t3 | FileCheck -check-prefix=REFLAST %s
+# REFLAST: trace-symbols.s.tmp1: definition of foo
+# REFLAST: trace-symbols.s.tmp2: definition of foo
+# REFLAST: trace-symbols.s.tmp: reference to foo
+
 # RUN: ld.lld -y foo -trace-symbol=common -trace-symbol=hsymbol \
-# RUN:   %t %t1 %t2 -o %t3 2>&1 | FileCheck -check-prefix=OBJECTD2FOO %s
+# RUN:   %t %t1 %t2 -o %t3 | FileCheck -check-prefix=OBJECTD2FOO %s
 # RUN: ld.lld -y foo -y common --trace-symbol=hsymbol \
-# RUN:   %t %t2 %t1 -o /dev/null 2>&1 | FileCheck -check-prefix=OBJECTD2FOO %s
-# RUN: ld.lld -y foo -y common %t %t1.so %t2 -o %t3 2>&1 | \
+# RUN:   %t %t2 %t1 -o %t3 | FileCheck -check-prefix=OBJECTD2FOO %s
+# RUN: ld.lld -y foo -y common %t %t1.so %t2 -o %t3 | \
 # RUN:   FileCheck -check-prefix=OBJECTD2FOO %s
 # OBJECTD2FOO: trace-symbols.s.tmp2: definition of foo
 
-# RUN: ld.lld -y foo -y common %t %t2 %t1.a -o %t3 2>&1 | \
+# RUN: ld.lld -y foo -y common %t %t2 %t1.a -o %t3 | \
 # RUN:   FileCheck -check-prefix=FOO_AND_COMMON %s
 # FOO_AND_COMMON: trace-symbols.s.tmp: reference to foo
 # FOO_AND_COMMON: trace-symbols.s.tmp2: definition of foo
 # FOO_AND_COMMON: trace-symbols.s.tmp1.a: lazy definition of common
 
-# RUN: ld.lld -y foo -y common %t %t1.so %t2 -o %t3 2>&1 | \
+# RUN: ld.lld -y foo -y common %t %t1.so %t2 -o %t3 | \
 # RUN:   FileCheck -check-prefix=SHLIBDCOMMON %s
 # SHLIBDCOMMON: trace-symbols.s.tmp1.so: shared definition of common
 
-# RUN: ld.lld -y foo -y common %t %t2.so %t1.so -o %t3 2>&1 | \
+# RUN: ld.lld -y foo -y common %t %t2.so %t1.so -o %t3 | \
 # RUN:   FileCheck -check-prefix=SHLIBD2FOO %s
 # RUN: ld.lld -y foo %t %t1.a %t2.so -o %t3 | \
 # RUN:   FileCheck -check-prefix=NO-SHLIBD2FOO %s
 # SHLIBD2FOO:        trace-symbols.s.tmp2.so: shared definition of foo
 # NO-SHLIBD2FOO-NOT: trace-symbols.s.tmp2.so: definition of foo
 
-# RUN: ld.lld -y foo -y common %t %t2 %t1.a -o %t3 2>&1 | \
+# RUN: ld.lld -y foo -y common %t %t2 %t1.a -o %t3 | \
 # RUN:   FileCheck -check-prefix=ARCHIVEDCOMMON %s
 # ARCHIVEDCOMMON-NOT: trace-symbols.s.tmp1.a(trace-symbols.s.tmp1): definition of \
 # common
@@ -79,7 +84,7 @@
 # STARTLIB: trace-symbols.s.tmp1: reference to bar
 
 ## Check we do not crash when trying to trace special symbol.
-# RUN: not ld.lld -trace-symbol=_end %t -o /dev/null
+# RUN: ld.lld -trace-symbol=_end %t %t1 %t2 -o /dev/null
 
 .hidden hsymbol
 .globl	_start
diff --git a/deps/lld/test/ELF/trace.s b/deps/lld/test/ELF/trace.s
index 4374d93da6485721272dbc7735b653cc162100ed..43876adbc437ed3c00b4e0b0c24973421bda3590 100644
--- a/deps/lld/test/ELF/trace.s
+++ b/deps/lld/test/ELF/trace.s
@@ -6,4 +6,4 @@
 # CHECK: {{.*}}.foo.o
 
 ## Check --trace alias
-# RUN: ld.lld -shared %t.foo.o -o %t.so -t 2>&1 | FileCheck %s
+# RUN: ld.lld -shared %t.foo.o -o %t.so --trace 2>&1 | FileCheck %s
diff --git a/deps/lld/test/ELF/ttext-tdata-tbss.s b/deps/lld/test/ELF/ttext-tdata-tbss.s
index a52d88b49572fbf4ee2fb5f68e9f2a7fdba448b3..9637bdd55d044604da6ce970d423f56c0d8734f1 100644
--- a/deps/lld/test/ELF/ttext-tdata-tbss.s
+++ b/deps/lld/test/ELF/ttext-tdata-tbss.s
@@ -3,7 +3,7 @@
 
 ## Show what regular output gives to us.
 # RUN: ld.lld %t.o -o %t1
-# RUN: llvm-readobj --elf-output-style=GNU -l -s  %t1 | FileCheck %s
+# RUN: llvm-readelf -S -l  %t1 | FileCheck %s
 # CHECK:      .rodata   PROGBITS 0000000000200158 000158 000008
 # CHECK-NEXT: .text     PROGBITS 0000000000201000 001000 000001
 # CHECK-NEXT: .aw       PROGBITS 0000000000202000 002000 000008
@@ -15,7 +15,7 @@
 
 ## With .text at 0 there is no space to allocate the headers.
 # RUN: ld.lld -Ttext 0x0 -Tdata 0x4000 -Tbss 0x8000 %t.o -o %t2
-# RUN: llvm-readobj --elf-output-style=GNU -l -s %t2 | FileCheck %s --check-prefix=USER1
+# RUN: llvm-readelf -S -l %t2 | FileCheck %s --check-prefix=USER1
 # USER1:      .text   PROGBITS 0000000000000000 001000 000001
 # USER1-NEXT: .data   PROGBITS 0000000000004000 002000 000008
 # USER1-NEXT: .bss    NOBITS   0000000000008000 002008 000008
@@ -26,7 +26,7 @@
 
 ## With .text at 0x1000 there is space to allocate the headers.
 # RUN: ld.lld -Ttext 0x1000 -Tdata 0x4000 -Tbss 0x8000 %t.o -o %t3
-# RUN: llvm-readobj --elf-output-style=GNU -l -s  %t3 | FileCheck %s --check-prefix=USER2
+# RUN: llvm-readelf -S -l  %t3 | FileCheck %s --check-prefix=USER2
 # USER2:      .text   PROGBITS 0000000000001000 001000 000001
 # USER2-NEXT: .data   PROGBITS 0000000000004000 002000 000008
 # USER2-NEXT: .bss    NOBITS   0000000000008000 002008 000008
@@ -38,7 +38,7 @@
 
 ## With .text well above 200000 we don't need to change the image base
 # RUN: ld.lld -Ttext 0x201000 %t.o -o %t4
-# RUN: llvm-readobj --elf-output-style=GNU -l -s %t4 | FileCheck %s --check-prefix=USER3
+# RUN: llvm-readelf -S -l %t4 | FileCheck %s --check-prefix=USER3
 # USER3:     .text   PROGBITS 0000000000201000 001000 000001
 # USER3-NEX: .rodata PROGBITS 0000000000202000 002000 000008
 # USER3-NEX: .aw     PROGBITS 0000000000203000 003000 000008
diff --git a/deps/lld/test/ELF/undef-broken-debug.test b/deps/lld/test/ELF/undef-broken-debug.test
index c3405ad0b9ed3f22b16e130f7557c035bc2471c4..76449a59b73943411be578e794b610a3df14919a 100644
--- a/deps/lld/test/ELF/undef-broken-debug.test
+++ b/deps/lld/test/ELF/undef-broken-debug.test
@@ -1,12 +1,12 @@
 # REQUIRES: x86
 # RUN: yaml2obj %s -o %t.o
-# RUN: not ld.lld %t.o -o /dev/null 2>&1 | FileCheck %s
+# RUN: not ld.lld %t.o -o /dev/null
 
-# The debug info has a broken relocation. Check that we don't crash
-# and still report the undefined symbol.
+# The debug info has a broken relocation. Check that we don't crash.
 
-# CHECK: error: {{.*}}.o: relocation R_X86_64_64 at 0x29 has unsupported target
-# CHECK: error: undefined symbol: bar
+# We used to dereference null Target in DWARF.cpp:findAux while reporting a duplicate symbol error,
+# because Target wasn't initialized yet.
+# RUN: not ld.lld %t.o %t.o -o /dev/null
 
 --- !ELF
 FileHeader:
@@ -62,7 +62,14 @@ Sections:
     Content:         '0111001017000000'
 
 Symbols:
-  Global:
-    - Name:            _start
-      Section:         .text
-    - Name:            bar
+  - Name:            .debug_abbrev
+    Type:            STT_SECTION
+    Section:         .debug_abbrev
+  - Name:            .debug_line
+    Type:            STT_SECTION
+    Section:         .debug_line
+  - Name:            _start
+    Section:         .text
+    Binding:         STB_GLOBAL 
+  - Name:            bar
+    Binding:         STB_GLOBAL
diff --git a/deps/lld/test/ELF/undef-multi.s b/deps/lld/test/ELF/undef-multi.s
new file mode 100644
index 0000000000000000000000000000000000000000..627235b37b15d9e523cf973933acb6298333c447
--- /dev/null
+++ b/deps/lld/test/ELF/undef-multi.s
@@ -0,0 +1,65 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/undef.s -o %t2.o
+# RUN: not ld.lld %t.o %t2.o -o /dev/null 2>&1 | FileCheck %s
+
+# CHECK: error: undefined symbol: zed2
+# CHECK-NEXT: >>> referenced by undef-multi.s
+# CHECK-NEXT: >>>               {{.*}}:(.text+0x1)
+# CHECK-NEXT: >>> referenced by undef-multi.s
+# CHECK-NEXT: >>>               {{.*}}:(.text+0x6)
+# CHECK-NEXT: >>> referenced by undef-multi.s
+# CHECK-NEXT: >>>               {{.*}}:(.text+0xB)
+# CHECK-NEXT: >>> referenced by undef-multi.s
+# CHECK-NEXT: >>>               {{.*}}:(.text+0x10)
+# CHECK-NEXT: >>> referenced by {{.*}}tmp2.o:(.text+0x0)
+
+# All references to a single undefined symbol count as a single error -- but
+# at most 10 references are printed.
+# RUN: echo ".globl _bar" > %t.moreref.s
+# RUN: echo "_bar:" >> %t.moreref.s
+# RUN: echo "  call zed2" >> %t.moreref.s
+# RUN: echo "  call zed2" >> %t.moreref.s
+# RUN: echo "  call zed2" >> %t.moreref.s
+# RUN: echo "  call zed2" >> %t.moreref.s
+# RUN: echo "  call zed2" >> %t.moreref.s
+# RUN: echo "  call zed2" >> %t.moreref.s
+# RUN: echo "  call zed2" >> %t.moreref.s
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %t.moreref.s -o %t3.o
+# RUN: not ld.lld %t.o %t2.o %t3.o -o /dev/null -error-limit=2 2>&1 | \
+# RUN:     FileCheck --check-prefix=LIMIT %s
+
+# LIMIT: error: undefined symbol: zed2
+# LIMIT-NEXT: >>> referenced by undef-multi.s
+# LIMIT-NEXT: >>>               {{.*}}:(.text+0x1)
+# LIMIT-NEXT: >>> referenced by undef-multi.s
+# LIMIT-NEXT: >>>               {{.*}}:(.text+0x6)
+# LIMIT-NEXT: >>> referenced by undef-multi.s
+# LIMIT-NEXT: >>>               {{.*}}:(.text+0xB)
+# LIMIT-NEXT: >>> referenced by undef-multi.s
+# LIMIT-NEXT: >>>               {{.*}}:(.text+0x10)
+# LIMIT-NEXT: >>> referenced by {{.*}}tmp2.o:(.text+0x0)
+# LIMIT-NEXT: >>> referenced by {{.*}}tmp3.o:(.text+0x1)
+# LIMIT-NEXT: >>> referenced by {{.*}}tmp3.o:(.text+0x6)
+# LIMIT-NEXT: >>> referenced by {{.*}}tmp3.o:(.text+0xB)
+# LIMIT-NEXT: >>> referenced by {{.*}}tmp3.o:(.text+0x10)
+# LIMIT-NEXT: >>> referenced by {{.*}}tmp3.o:(.text+0x15)
+# LIMIT-NEXT: >>> referenced 2 more times
+
+.file "undef-multi.s"
+
+  .globl _start
+_start:
+  call zed2
+
+  .globl _f
+_f:
+  call zed2
+
+  .globl _g
+_g:
+  call zed2
+
+  .globl _h
+_h:
+  call zed2
diff --git a/deps/lld/test/ELF/undef-shared.s b/deps/lld/test/ELF/undef-shared.s
index 701f70ea94e6edf399c963f58fbcb1b9d69c9141..26e72f381ff32b8b4af5ac1d355e19db56b16da5 100644
--- a/deps/lld/test/ELF/undef-shared.s
+++ b/deps/lld/test/ELF/undef-shared.s
@@ -2,17 +2,17 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: not ld.lld %t.o -o /dev/null -shared 2>&1 | FileCheck %s
 
-# CHECK: error: undefined symbol: hidden
+# CHECK: error: undefined hidden symbol: hidden
 # CHECK: >>> referenced by {{.*}}:(.data+0x0)
 .global hidden
 .hidden hidden
 
-# CHECK: error: undefined symbol: internal
+# CHECK: error: undefined internal symbol: internal
 # CHECK: >>> referenced by {{.*}}:(.data+0x8)
 .global internal
 .internal internal
 
-# CHECK: error: undefined symbol: protected
+# CHECK: error: undefined protected symbol: protected
 # CHECK: >>> referenced by {{.*}}:(.data+0x10)
 .global protected
 .protected protected
diff --git a/deps/lld/test/ELF/undef-shared2.s b/deps/lld/test/ELF/undef-shared2.s
index cae5ea45642dab6660d45e3f48955f66a2cb21b5..9508f9db4a7afb19e0f365e5f69c768dbe142bc5 100644
--- a/deps/lld/test/ELF/undef-shared2.s
+++ b/deps/lld/test/ELF/undef-shared2.s
@@ -4,7 +4,7 @@
 # RUN: not ld.lld %t.o %t2.o -o %t.so -shared 2>&1 | FileCheck %s
 # RUN: not ld.lld %t2.o %t.o -o %t.so -shared 2>&1 | FileCheck %s
 
-# CHECK: error: undefined symbol: foo
+# CHECK: error: undefined protected symbol: foo
 
 .data
 .quad foo
diff --git a/deps/lld/test/ELF/undef-version-script.s b/deps/lld/test/ELF/undef-version-script.s
index 7ef4b7a22ca728cf5791be735e19d87c0b4c4c71..86ef104ee6046542b2d4f08e0a618fff64086641 100644
--- a/deps/lld/test/ELF/undef-version-script.s
+++ b/deps/lld/test/ELF/undef-version-script.s
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: echo "{ local: *; };" > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s
 
 # CHECK:      DynamicSymbols [
 # CHECK-NEXT:   Symbol {
diff --git a/deps/lld/test/ELF/undef-with-plt-addr-i686.s b/deps/lld/test/ELF/undef-with-plt-addr-i686.s
index cd1b3fdfe2a27aa2e801007dbaa4064f045bc092..d750cbfb88f65a8d97eb0091618c56ea00c3177a 100644
--- a/deps/lld/test/ELF/undef-with-plt-addr-i686.s
+++ b/deps/lld/test/ELF/undef-with-plt-addr-i686.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %p/Inputs/undef-with-plt-addr.s -o %t2.o
 // RUN: ld.lld %t2.o -o %t2.so -shared
 // RUN: ld.lld %t.o %t2.so -o %t3
-// RUN: llvm-readobj -t -s %t3 | FileCheck %s
+// RUN: llvm-readobj --symbols -S %t3 | FileCheck %s
 
 .globl _start
 _start:
diff --git a/deps/lld/test/ELF/undef-with-plt-addr.s b/deps/lld/test/ELF/undef-with-plt-addr.s
index d34859c04e8fa4e3bae93ea09d4b20f0f9a68004..f8c9b85dd31575d4dee062534fd6648ef4f00c11 100644
--- a/deps/lld/test/ELF/undef-with-plt-addr.s
+++ b/deps/lld/test/ELF/undef-with-plt-addr.s
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/undef-with-plt-addr.s -o %t2.o
 // RUN: ld.lld %t2.o -o %t2.so -shared
 // RUN: ld.lld %t.o %t2.so -o %t3
-// RUN: llvm-readobj -t -s -r %t3 | FileCheck %s
+// RUN: llvm-readobj --symbols -S -r %t3 | FileCheck %s
 
 // Test that -z nocopyreloc doesn't prevent the plt hack.
 // RUN: ld.lld %t.o %t2.so -o %t3 -z nocopyreloc
@@ -25,10 +25,10 @@ movabsq	$set_data, %rax
 // CHECK-NEXT: Address: 0x201010
 
 // CHECK:      Section ({{.*}}) .rela.dyn {
-// CHECK-NEXT:   0x202000 R_X86_64_64 foo 0x0
+// CHECK-NEXT:   0x203000 R_X86_64_64 foo 0x0
 // CHECK-NEXT: }
 // CHECK-NEXT: Section ({{.*}}) .rela.plt {
-// CHECK-NEXT:   0x202020 R_X86_64_JUMP_SLOT set_data 0x0
+// CHECK-NEXT:   0x203020 R_X86_64_JUMP_SLOT set_data 0x0
 // CHECK-NEXT: }
 
 // CHECK:      Name: foo
diff --git a/deps/lld/test/ELF/undefined-glob.s b/deps/lld/test/ELF/undefined-glob.s
new file mode 100644
index 0000000000000000000000000000000000000000..0f423b5fa651aee986b87222f9fe2fa0b7f23611
--- /dev/null
+++ b/deps/lld/test/ELF/undefined-glob.s
@@ -0,0 +1,58 @@
+# REQUIRES: x86
+
+# RUN: echo '.globl foo1; foo1:' | \
+# RUN:   llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t1.o
+# RUN: echo '.globl foo2; foo2:' | \
+# RUN:   llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t2.o
+# RUN: echo '.globl foo32; foo32:' | \
+# RUN:   llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t3.o
+# RUN: echo '.globl bar; bar:' | \
+# RUN:   llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t4.o
+# RUN: rm -f %t.a
+# RUN: llvm-ar rcs %t.a %t1.o %t2.o %t3.o %t4.o
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+
+# RUN: ld.lld -o %t.exe %t.o %t.a
+# RUN: llvm-readobj --symbols %t.exe | FileCheck --check-prefix=NO-OPT %s
+
+# NO-OPT-NOT: foo
+# NO-OPT-NOT: bar
+
+# RUN: ld.lld -o %t.exe %t.o %t.a --undefined-glob foo1
+# RUN: llvm-readobj --symbols %t.exe | FileCheck --check-prefix=FOO1 %s
+
+# FOO1: foo1
+# FOO1-NOT: foo2
+
+# RUN: ld.lld -o %t.exe %t.o %t.a --undefined-glob 'foo*'
+# RUN: llvm-readobj --symbols %t.exe | FileCheck --check-prefix=FOO-STAR %s
+
+# FOO-STAR: foo1
+# FOO-STAR: foo2
+# FOO-STAR: foo32
+# FOO-STAR-NOT: bar
+
+# RUN: ld.lld -o %t.exe %t.o %t.a --undefined-glob 'foo?'
+# RUN: llvm-readobj --symbols %t.exe | FileCheck --check-prefix=FOO-Q %s
+
+# FOO-Q: foo1
+# FOO-Q: foo2
+# FOO-Q-NOT: foo32
+# FOO-Q-NOT: bar
+
+# RUN: ld.lld -o %t.exe %t.o %t.a --undefined-glob 'foo[13]*'
+# RUN: llvm-readobj --symbols %t.exe | FileCheck --check-prefix=FOO13 %s
+
+# FOO13: foo1
+# FOO13-NOT: foo2
+# FOO13: foo32
+# FOO13-NOT: bar
+
+# RUN: not ld.lld -o %t.exe %t.o %t.a --undefined-glob '[' 2>&1 | \
+# RUN:   FileCheck -check-prefix=BAD-PATTERN %s
+
+# BAD-PATTERN: --undefined-glob: invalid glob pattern: [
+
+.globl _start
+_start:
diff --git a/deps/lld/test/ELF/undefined-opt.s b/deps/lld/test/ELF/undefined-opt.s
index 9e93e0fdce4d886cf7a15247ba7adbfcf8cfb0de..26899542767762331ae6623a9b413acecbcba8d4 100644
--- a/deps/lld/test/ELF/undefined-opt.s
+++ b/deps/lld/test/ELF/undefined-opt.s
@@ -40,7 +40,7 @@
 # TWO-UNDEFINED: Name: zed
 # TWO-UNDEFINED: ]
 # Now the same logic but linker script is used to set undefines
-# RUN: echo "EXTERN( bar abs )" > %t.script
+# RUN: echo "EXTERN( bar \"abs\" )" > %t.script
 # RUN: ld.lld -o %t3 %t.o %tar.a %t.script
 # RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=TWO-UNDEFINED %s
 
diff --git a/deps/lld/test/ELF/undefined-versioned-symbol.s b/deps/lld/test/ELF/undefined-versioned-symbol.s
index afa0ab9919e53a54829217e2bce548a96088ec0f..92bd9c4bdd51a11c22ef97772b797d958b43dd66 100644
--- a/deps/lld/test/ELF/undefined-versioned-symbol.s
+++ b/deps/lld/test/ELF/undefined-versioned-symbol.s
@@ -15,21 +15,21 @@
 
 // CHECK:      Section ({{.*}}) .rela.dyn {
 // CHECK-NEXT:   Relocation {
-// CHECK-NEXT:     Offset: 0x1000
+// CHECK-NEXT:     Offset: 0x2000
 // CHECK-NEXT:     Type: R_X86_64_64 (1)
-// CHECK-NEXT:     Symbol: basename (1)
+// CHECK-NEXT:     Symbol: basename@FBSD_1.1 (1)
 // CHECK-NEXT:     Addend: 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Relocation {
-// CHECK-NEXT:     Offset: 0x1008
+// CHECK-NEXT:     Offset: 0x2008
 // CHECK-NEXT:     Type: R_X86_64_64 (1)
-// CHECK-NEXT:     Symbol: basename (2)
+// CHECK-NEXT:     Symbol: basename@FBSD_1.0 (2)
 // CHECK-NEXT:     Addend: 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Relocation {
-// CHECK-NEXT:     Offset: 0x1010
+// CHECK-NEXT:     Offset: 0x2010
 // CHECK-NEXT:     Type: R_X86_64_64 (1)
-// CHECK-NEXT:     Symbol: basename (3)
+// CHECK-NEXT:     Symbol: basename@FBSD_1.1 (3)
 // CHECK-NEXT:     Addend: 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: }
diff --git a/deps/lld/test/ELF/unresolved-symbols.s b/deps/lld/test/ELF/unresolved-symbols.s
index 69da3e63c6d4df68ceed3e10dddfd9743da55e8e..04159729a85d93998d351df5cc5ad1541e1f1cd8 100644
--- a/deps/lld/test/ELF/unresolved-symbols.s
+++ b/deps/lld/test/ELF/unresolved-symbols.s
@@ -27,21 +27,21 @@
 # ERRUND: >>> referenced by {{.*}}:(.text+0x1)
 
 ## Also ignore all should not produce error for symbols from DSOs.
-# RUN: ld.lld %t1.o %t.so -o %t1_3 --unresolved-symbols=ignore-all
+# RUN: ld.lld %t1.o %t.so -o %t1_3 --allow-shlib-undefined --unresolved-symbols=ignore-all
 # RUN: llvm-readobj %t1_3 > /dev/null 2>&1
 
 ## Ignoring undefines in objects should not produce error for symbol from object.
 # RUN: ld.lld %t1.o %t2.o -o %t2 --unresolved-symbols=ignore-in-object-files
 # RUN: llvm-readobj %t2 > /dev/null 2>&1
 ## And still should not should produce for undefines from DSOs.
-# RUN: ld.lld %t1.o %t.so -o /dev/null --unresolved-symbols=ignore-in-object-files
+# RUN: ld.lld %t1.o %t.so -o /dev/null --allow-shlib-undefined --unresolved-symbols=ignore-in-object-files
 # RUN: llvm-readobj %t2 > /dev/null 2>&1
 
 ## Ignoring undefines in shared should produce error for symbol from object.
 # RUN: not ld.lld %t2.o -o /dev/null --unresolved-symbols=ignore-in-shared-libs 2>&1 | \
 # RUN:   FileCheck -check-prefix=ERRUND %s
 ## And should not produce errors for symbols from DSO.
-# RUN: ld.lld %t1.o %t.so -o %t3_1 --unresolved-symbols=ignore-in-shared-libs
+# RUN: ld.lld %t1.o %t.so -o %t3_1 --allow-shlib-undefined --unresolved-symbols=ignore-in-shared-libs
 # RUN: llvm-readobj %t3_1 > /dev/null 2>&1
 
 ## Ignoring undefines in shared libs should not produce error for symbol from object
diff --git a/deps/lld/test/ELF/verdef-defaultver.s b/deps/lld/test/ELF/verdef-defaultver.s
index db50e7c8f49feb835bea7f359a5145790e068345..467f73a3bd4e4a00c65b9119201d579144609c3b 100644
--- a/deps/lld/test/ELF/verdef-defaultver.s
+++ b/deps/lld/test/ELF/verdef-defaultver.s
@@ -4,7 +4,7 @@
 # RUN: echo "V1 { global: a; local: *; };" > %t.script
 # RUN: echo "V2 { global: b; c; } V1;" >> %t.script
 # RUN: ld.lld --hash-style=sysv -shared -soname shared %t1 --version-script %t.script -o %t.so
-# RUN: llvm-readobj -V -dyn-symbols %t.so | FileCheck --check-prefix=DSO %s
+# RUN: llvm-readobj -V --dyn-syms %t.so | FileCheck --check-prefix=DSO %s
 
 # DSO:      DynamicSymbols [
 # DSO-NEXT:    Symbol {
@@ -108,7 +108,7 @@
 ## Check that we can link against DSO produced.
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t2
 # RUN: ld.lld --hash-style=sysv %t2 %t.so -o %t3
-# RUN: llvm-readobj -V -dyn-symbols %t3 | FileCheck --check-prefix=EXE %s
+# RUN: llvm-readobj -V --dyn-syms %t3 | FileCheck --check-prefix=EXE %s
 
 # EXE:      DynamicSymbols [
 # EXE-NEXT:    Symbol {
@@ -150,8 +150,8 @@
 # EXE-NEXT:  ]
 # EXE-NEXT:  Version symbols {
 # EXE-NEXT:    Section Name: .gnu.version
-# EXE-NEXT:    Address: 0x200228
-# EXE-NEXT:    Offset: 0x228
+# EXE-NEXT:    Address: 0x200260
+# EXE-NEXT:    Offset: 0x260
 # EXE-NEXT:    Link: 1
 # EXE-NEXT:    Symbols [
 # EXE-NEXT:      Symbol {
@@ -179,18 +179,20 @@
 # EXE-NEXT:      Version: 1
 # EXE-NEXT:      Count: 2
 # EXE-NEXT:      FileName: shared
-# EXE-NEXT:      Entry {
-# EXE-NEXT:        Hash: 1425
-# EXE-NEXT:        Flags: 0x0
-# EXE-NEXT:        Index: 2
-# EXE-NEXT:        Name: V1
-# EXE-NEXT:      }
-# EXE-NEXT:      Entry {
-# EXE-NEXT:        Hash: 1426
-# EXE-NEXT:        Flags: 0x0
-# EXE-NEXT:        Index: 3
-# EXE-NEXT:        Name: V2
-# EXE-NEXT:      }
+# EXE-NEXT:      Entries [
+# EXE-NEXT:        Entry {
+# EXE-NEXT:          Hash: 1425
+# EXE-NEXT:          Flags: 0x0
+# EXE-NEXT:          Index: 2
+# EXE-NEXT:          Name: V1
+# EXE-NEXT:        }
+# EXE-NEXT:        Entry {
+# EXE-NEXT:          Hash: 1426
+# EXE-NEXT:          Flags: 0x0
+# EXE-NEXT:          Index: 3
+# EXE-NEXT:          Name: V2
+# EXE-NEXT:        }
+# EXE-NEXT:      ]
 # EXE-NEXT:    }
 # EXE-NEXT:  }
 
diff --git a/deps/lld/test/ELF/verdef-dependency.s b/deps/lld/test/ELF/verdef-dependency.s
index 3f126856b10fd83d65d402315accda7c0c4f5d40..ce58fbb0944d91ca0c4dc14250f1d53d1601bea8 100644
--- a/deps/lld/test/ELF/verdef-dependency.s
+++ b/deps/lld/test/ELF/verdef-dependency.s
@@ -4,7 +4,7 @@
 # RUN: echo "LIBSAMPLE_2.0 { global: b; local: *; } LIBSAMPLE_1.0;" >> %t.script
 # RUN: echo "LIBSAMPLE_3.0 { global: c; } LIBSAMPLE_2.0;" >> %t.script
 # RUN: ld.lld --version-script %t.script -shared -soname shared %t.o -o %t.so
-# RUN: llvm-readobj -V -dyn-symbols %t.so | FileCheck --check-prefix=DSO %s
+# RUN: llvm-readobj -V --dyn-syms %t.so | FileCheck --check-prefix=DSO %s
 
 # DSO:      SHT_GNU_verdef {
 # DSO-NEXT:   Definition {
diff --git a/deps/lld/test/ELF/verdef.s b/deps/lld/test/ELF/verdef.s
index 9fc5bdd4f279bf456ec2ec3c9edd6dc12e86744e..e758a59a12cc4e9143b9aea30e9a42e008e5ffed 100644
--- a/deps/lld/test/ELF/verdef.s
+++ b/deps/lld/test/ELF/verdef.s
@@ -4,7 +4,7 @@
 # RUN: echo "LIBSAMPLE_2.0 { global: b; local: *; };" >> %t.script
 # RUN: echo "LIBSAMPLE_3.0 { global: c; local: *; };" >> %t.script
 # RUN: ld.lld --hash-style=sysv --version-script %t.script -shared -soname shared %t.o -o %t.so
-# RUN: llvm-readobj -V -dyn-symbols %t.so | FileCheck --check-prefix=DSO %s
+# RUN: llvm-readobj -V --dyn-syms %t.so | FileCheck --check-prefix=DSO %s
 
 # DSO:        Version symbols {
 # DSO-NEXT:   Section Name: .gnu.version
@@ -70,8 +70,8 @@
 
 # MAIN:      Version symbols {
 # MAIN-NEXT:   Section Name: .gnu.version
-# MAIN-NEXT:   Address: 0x200228
-# MAIN-NEXT:   Offset: 0x228
+# MAIN-NEXT:   Address: 0x200260
+# MAIN-NEXT:   Offset: 0x260
 # MAIN-NEXT:   Link: 1
 # MAIN-NEXT:   Symbols [
 # MAIN-NEXT:     Symbol {
@@ -101,7 +101,7 @@
 # RUN: echo "LIBSAMPLE_3.0 { global: c; local: *; };" >> %t.script
 # RUN: echo "}" >> %t.script
 # RUN: ld.lld --hash-style=sysv --script %t.script -shared -soname shared %t.o -o %t2.so
-# RUN: llvm-readobj -V -dyn-symbols %t2.so | FileCheck --check-prefix=DSO %s
+# RUN: llvm-readobj -V --dyn-syms %t2.so | FileCheck --check-prefix=DSO %s
 
 .globl a
 .type  a,@function
diff --git a/deps/lld/test/ELF/verneed.s b/deps/lld/test/ELF/verneed.s
index e8b65c40663aa89f475a73c8868cb0f1a192f4dc..67f665a2a92cb11c010a23626493c7289098a833 100644
--- a/deps/lld/test/ELF/verneed.s
+++ b/deps/lld/test/ELF/verneed.s
@@ -7,7 +7,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld --hash-style=sysv %t.o %t1.so %t2.so -o %t
-# RUN: llvm-readobj -V -sections -section-data -dyn-symbols -dynamic-table %t | FileCheck %s
+# RUN: llvm-readobj -V --sections --section-data --dyn-syms --dynamic-table %t | FileCheck %s
 
 # CHECK:        Section {
 # CHECK:          Index: 1
@@ -16,8 +16,8 @@
 # CHECK-NEXT:     Flags [ (0x2)
 # CHECK-NEXT:       SHF_ALLOC (0x2)
 # CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x2001C8
-# CHECK-NEXT:     Offset: 0x1C8
+# CHECK-NEXT:     Address: 0x200200
+# CHECK-NEXT:     Offset: 0x200
 # CHECK-NEXT:     Size: 96
 # CHECK-NEXT:     Link: [[DYNSTR:.*]]
 # CHECK-NEXT:     Info: 1
@@ -47,7 +47,7 @@
 # CHECK-NEXT:      SHF_ALLOC (0x2)
 # CHECK-NEXT:    ]
 # CHECK-NEXT:    Address: [[VERNEED:.*]]
-# CHECK-NEXT:    Offset: 0x230
+# CHECK-NEXT:    Offset: 0x268
 # CHECK-NEXT:    Size: 80
 # CHECK-NEXT:    Link: 5
 # CHECK-NEXT:    Info: 2
@@ -60,17 +60,17 @@
 # CHECK-NEXT:     Flags [ (0x2)
 # CHECK-NEXT:       SHF_ALLOC (0x2)
 # CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x2002A8
-# CHECK-NEXT:     Offset: 0x2A8
+# CHECK-NEXT:     Address: 0x2002E0
+# CHECK-NEXT:     Offset: 0x2E0
 # CHECK-NEXT:     Size: 47
 # CHECK-NEXT:     Link: 0
 # CHECK-NEXT:     Info: 0
 # CHECK-NEXT:     AddressAlignment: 1
 # CHECK-NEXT:     EntrySize: 0
 # CHECK-NEXT:     SectionData (
-# CHECK-NEXT:       0000: 00766572 6E656564 312E736F 2E300076  |.verneed1.so.0.v|
-# CHECK-NEXT:       0010: 65726E65 6564322E 736F2E30 00663100  |erneed2.so.0.f1.|
-# CHECK-NEXT:       0020: 76330066 32007632 00673100 763100    |v3.f2.v2.g1.v1.|
+# CHECK-NEXT:       0000: 00663100 66320067 31007665 726E6565  |.f1.f2.g1.vernee|
+# CHECK-NEXT:       0010: 64312E73 6F2E3000 76320076 33007665  |d1.so.0.v2.v3.ve|
+# CHECK-NEXT:       0020: 726E6565 64322E73 6F2E3000 763100    |rneed2.so.0.v1.|
 # CHECK-NEXT:     )
 # CHECK-NEXT:   }
 
@@ -148,29 +148,33 @@
 # CHECK-NEXT:      Version: 1
 # CHECK-NEXT:      Count: 2
 # CHECK-NEXT:      FileName: verneed1.so.0
-# CHECK-NEXT:      Entry {
-# CHECK-NEXT:        Hash: 1938
-# CHECK-NEXT:        Flags: 0x0
-# CHECK-NEXT:        Index: 3
-# CHECK-NEXT:        Name: v2
-# CHECK-NEXT:      }
-# CHECK-NEXT:      Entry {
-# CHECK-NEXT:        Hash: 1939
-# CHECK-NEXT:        Flags: 0x0
-# CHECK-NEXT:        Index: 2
-# CHECK-NEXT:        Name: v3
-# CHECK-NEXT:      }
+# CHECK-NEXT:      Entries [
+# CHECK-NEXT:        Entry {
+# CHECK-NEXT:          Hash: 1938
+# CHECK-NEXT:          Flags: 0x0
+# CHECK-NEXT:          Index: 3
+# CHECK-NEXT:          Name: v2
+# CHECK-NEXT:        }
+# CHECK-NEXT:        Entry {
+# CHECK-NEXT:          Hash: 1939
+# CHECK-NEXT:          Flags: 0x0
+# CHECK-NEXT:          Index: 2
+# CHECK-NEXT:          Name: v3
+# CHECK-NEXT:        }
+# CHECK-NEXT:      ]
 # CHECK-NEXT:    }
 # CHECK-NEXT:    Dependency {
 # CHECK-NEXT:      Version: 1
 # CHECK-NEXT:      Count: 1
 # CHECK-NEXT:      FileName: verneed2.so.0
-# CHECK-NEXT:      Entry {
-# CHECK-NEXT:        Hash: 1937
-# CHECK-NEXT:        Flags: 0x0
-# CHECK-NEXT:        Index: 4
-# CHECK-NEXT:        Name: v1
-# CHECK-NEXT:      }
+# CHECK-NEXT:      Entries [
+# CHECK-NEXT:        Entry {
+# CHECK-NEXT:          Hash: 1937
+# CHECK-NEXT:          Flags: 0x0
+# CHECK-NEXT:          Index: 4
+# CHECK-NEXT:          Name: v1
+# CHECK-NEXT:        }
+# CHECK-NEXT:      ]
 # CHECK-NEXT:    }
 # CHECK-NEXT:  }
 
diff --git a/deps/lld/test/ELF/version-exclude-libs.s b/deps/lld/test/ELF/version-exclude-libs.s
index a25a08f14b6fcc413137614d5c053d46906340d2..652dd50ec9ab242cf9e869fc08347ecd96345206 100644
--- a/deps/lld/test/ELF/version-exclude-libs.s
+++ b/deps/lld/test/ELF/version-exclude-libs.s
@@ -4,8 +4,8 @@
 // RUN: llvm-ar -r %t.a %t.o
 // RUN: llvm-mc %s -o %t2.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t2.o %t.a --shared --exclude-libs ALL -o %t.so
-// RUN: llvm-readobj -symbols %t.so | FileCheck %s
-// RUN: llvm-readobj -dyn-symbols %t.so | FileCheck -check-prefix CHECK-DYN %s
+// RUN: llvm-readobj --symbols %t.so | FileCheck %s
+// RUN: llvm-readobj --dyn-syms %t.so | FileCheck -check-prefix CHECK-DYN %s
 // RUN: not ld.lld %t2.o %t.a --shared -o %t.so 2>&1 | FileCheck -check-prefix=CHECK-ERR %s
 
 // Test that we do not give an error message for undefined versions when the
diff --git a/deps/lld/test/ELF/version-script-anonymous-local.s b/deps/lld/test/ELF/version-script-anonymous-local.s
index 3716b7ac99c1e3fcb0a52f754b244a9ab2754b67..9fe30cd7f048db731908abcdc9342b00f3886a14 100644
--- a/deps/lld/test/ELF/version-script-anonymous-local.s
+++ b/deps/lld/test/ELF/version-script-anonymous-local.s
@@ -3,7 +3,7 @@
 
 # RUN: echo "{ global: foo; local: bar; };" > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols -t %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms --symbols %t.so | FileCheck %s
 
 # CHECK:      Symbols [
 # CHECK:          Name: bar
diff --git a/deps/lld/test/ELF/version-script-copy-rel.s b/deps/lld/test/ELF/version-script-copy-rel.s
index 42d922e7dc98575f9c878cd48f01baeae6f3255e..abff08c411f7961bc8044cc88260e2bd2be50e22 100644
--- a/deps/lld/test/ELF/version-script-copy-rel.s
+++ b/deps/lld/test/ELF/version-script-copy-rel.s
@@ -4,7 +4,7 @@
 # RUN: ld.lld --version-script %t.script -shared %t1.o -o %t.so
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t2.o
 # RUN: ld.lld %t2.o %t.so -o %tout
-# RUN: llvm-readobj -dyn-symbols %tout | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %tout | FileCheck %s
 
 # CHECK:      DynamicSymbols [
 # CHECK:        Symbol {
diff --git a/deps/lld/test/ELF/version-script-extern-exact.s b/deps/lld/test/ELF/version-script-extern-exact.s
index bfd44e589ac517d803562c68392359aadda20203..b092cffde44949644e0ba451045eb4460517b341 100644
--- a/deps/lld/test/ELF/version-script-extern-exact.s
+++ b/deps/lld/test/ELF/version-script-extern-exact.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "FOO { global: extern \"C++\" { \"aaa*\"; }; };" > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s --check-prefix=NOMATCH
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s --check-prefix=NOMATCH
 
 # NOMATCH:     DynamicSymbols [
 # NOMATCH-NOT:   _Z3aaaPf@@FOO
@@ -12,7 +12,7 @@
 
 # RUN: echo "FOO { global: extern \"C++\" { \"aaa*\"; aaa*; }; };" > %t2.script
 # RUN: ld.lld --version-script %t2.script -shared %t.o -o %t2.so
-# RUN: llvm-readobj -dyn-symbols %t2.so | FileCheck %s --check-prefix=MATCH
+# RUN: llvm-readobj --dyn-syms %t2.so | FileCheck %s --check-prefix=MATCH
 # MATCH:   DynamicSymbols [
 # MATCH:     _Z3aaaPf@@FOO
 # MATCH:     _Z3aaaPi@@FOO
diff --git a/deps/lld/test/ELF/version-script-extern-wildcards-anon.s b/deps/lld/test/ELF/version-script-extern-wildcards-anon.s
index 5ba2f7d21bd49969571244e483b49861e2d88a54..8f5164579706b09986be76030d4bc9533414f1d0 100644
--- a/deps/lld/test/ELF/version-script-extern-wildcards-anon.s
+++ b/deps/lld/test/ELF/version-script-extern-wildcards-anon.s
@@ -12,7 +12,7 @@
 # RUN:       local: *; \
 # RUN:       }; ' > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s
 
 # CHECK:      DynamicSymbols [
 # CHECK-NEXT:   Symbol {
diff --git a/deps/lld/test/ELF/version-script-extern-wildcards.s b/deps/lld/test/ELF/version-script-extern-wildcards.s
index 27660b25cb028c3cac52e9363fc3077d35090c10..7c9af58cb59535de9401ef606ef9fcc00e374039 100644
--- a/deps/lld/test/ELF/version-script-extern-wildcards.s
+++ b/deps/lld/test/ELF/version-script-extern-wildcards.s
@@ -4,7 +4,7 @@
 # RUN: echo "FOO { global: extern \"C++\" { foo*; }; };" > %t.script
 # RUN: echo "BAR { global: extern \"C++\" { zed*; bar; }; };" >> %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -V -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj -V --dyn-syms %t.so | FileCheck %s
 
 # CHECK:  Version symbols {
 # CHECK:   Symbols [
diff --git a/deps/lld/test/ELF/version-script-extern.s b/deps/lld/test/ELF/version-script-extern.s
index 682afb09fa3499eceef4406e23f118fdfdc991d9..481a76b2386d344c6eea3ef9149833b16e2ae5ee 100644
--- a/deps/lld/test/ELF/version-script-extern.s
+++ b/deps/lld/test/ELF/version-script-extern.s
@@ -8,7 +8,7 @@
 # RUN: echo '  extern "C" { _Z3bari; };' >> %t.script
 # RUN: echo "};" >> %t.script
 # RUN: ld.lld --hash-style=sysv --version-script %t.script -soname fixed-length-string -shared %t.o -o %t.so
-# RUN: llvm-readobj -V -dyn-symbols %t.so | FileCheck --check-prefix=DSO %s
+# RUN: llvm-readobj -V --dyn-syms %t.so | FileCheck --check-prefix=DSO %s
 
 # DSO:      DynamicSymbols [
 # DSO-NEXT:    Symbol {
diff --git a/deps/lld/test/ELF/version-script-glob.s b/deps/lld/test/ELF/version-script-glob.s
index d9ead0503d64740de8ebb6360ca5e93d2573386c..eca1e332c6c553286d215a55f3d4e7d6c1303203 100644
--- a/deps/lld/test/ELF/version-script-glob.s
+++ b/deps/lld/test/ELF/version-script-glob.s
@@ -3,7 +3,7 @@
 # RUN: echo "{ global: foo*; bar*; local: *; };" > %t.script
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -shared --version-script %t.script %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s
 
         .globl foo1
 foo1:
diff --git a/deps/lld/test/ELF/version-script-hide-so-symbol.s b/deps/lld/test/ELF/version-script-hide-so-symbol.s
index c84e37a5ac45155f71ed40eb6be8549b7de5872f..ba33c68511d04bed2a2a30e99eacb906cde8ea15 100644
--- a/deps/lld/test/ELF/version-script-hide-so-symbol.s
+++ b/deps/lld/test/ELF/version-script-hide-so-symbol.s
@@ -4,7 +4,7 @@
 # RUN: ld.lld -shared %t.o -o %t2.so
 # RUN: echo "{ local: *; };" > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o %t2.so -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s
 
 # The symbol foo must be hidden. This matches bfd and gold and is
 # required to make it possible for a c++ library to hide its own
diff --git a/deps/lld/test/ELF/version-script-locals.s b/deps/lld/test/ELF/version-script-locals.s
index 80110c396ecc3e6f50f41006f2126627cc8d8917..210adefad8c66c28da02f143614560902171848f 100644
--- a/deps/lld/test/ELF/version-script-locals.s
+++ b/deps/lld/test/ELF/version-script-locals.s
@@ -3,7 +3,7 @@
 
 # RUN: echo "VERSION_1.0 { local: foo1; };" > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck --check-prefix=EXACT %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck --check-prefix=EXACT %s
 # EXACT:  DynamicSymbols [
 # EXACT:      _start
 # EXACT-NOT:  foo1
@@ -12,7 +12,7 @@
 
 # RUN: echo "VERSION_1.0 { local: foo*; };" > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck --check-prefix=WC %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck --check-prefix=WC %s
 # WC:  DynamicSymbols [
 # WC:      _start
 # WC-NOT:  foo1
@@ -21,7 +21,7 @@
 
 # RUN: echo "VERSION_1.0 { global: *; local: foo*; };" > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck --check-prefix=MIX %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck --check-prefix=MIX %s
 # MIX:  DynamicSymbols [
 # MIX:      _start@@VERSION_1.0
 # MIX-NOT:  foo1
diff --git a/deps/lld/test/ELF/version-script-reassign.s b/deps/lld/test/ELF/version-script-reassign.s
new file mode 100644
index 0000000000000000000000000000000000000000..62b32cba82b1331de7e92278c17a71c6e317cb99
--- /dev/null
+++ b/deps/lld/test/ELF/version-script-reassign.s
@@ -0,0 +1,36 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: echo '{ local: foo; };' > %tl.ver
+# RUN: echo '{ global: foo; local: *; };' > %tg.ver
+# RUN: echo 'V1 { global: foo; };' > %t1.ver
+# RUN: echo 'V2 { global: foo; };' > %t2.ver
+# RUN: echo 'V2 { global: notexist; local: f*; };' > %t2w.ver
+
+## Note, ld.bfd errors on the two cases.
+# RUN: ld.lld -shared %t.o --version-script %tl.ver --version-script %t1.ver \
+# RUN:   -o %t.so 2>&1 | FileCheck --check-prefix=LOCAL %s
+# RUN: llvm-readelf --dyn-syms %t.so | FileCheck --check-prefix=LOCAL-SYM %s
+# RUN: ld.lld -shared %t.o --version-script %tg.ver --version-script %t1.ver \
+# RUN:   -o %t.so 2>&1 | FileCheck --check-prefix=GLOBAL %s
+# RUN: llvm-readelf --dyn-syms %t.so | FileCheck --check-prefix=GLOBAL-SYM %s
+
+## Note, ld.bfd silently accepts this case.
+# RUN: ld.lld -shared %t.o --version-script %t1.ver --version-script %t2.ver \
+# RUN:   -o %t.so 2>&1 | FileCheck --check-prefix=V1-WARN %s
+# RUN: llvm-readelf --dyn-syms %t.so | FileCheck --check-prefix=V1-SYM %s
+
+# RUN: ld.lld -shared %t.o --version-script %t1.ver --version-script %t2w.ver \
+# RUN:   -o %t.so --fatal-warnings
+# RUN: llvm-readelf --dyn-syms %t.so | FileCheck --check-prefix=V1-SYM %s
+
+# LOCAL: warning: attempt to reassign symbol 'foo' of VER_NDX_LOCAL to version 'V1'
+# LOCAL-SYM-NOT: foo
+
+# GLOBAL: warning: attempt to reassign symbol 'foo' of VER_NDX_GLOBAL to version 'V1'
+# GLOBAL-SYM: foo{{$}}
+
+# V1-WARN: warning: attempt to reassign symbol 'foo' of version 'V1' to version 'V2'
+# V1-SYM: foo@@V1
+
+.globl foo
+foo:
diff --git a/deps/lld/test/ELF/version-script-twice.s b/deps/lld/test/ELF/version-script-twice.s
index 1227dcd50f1dcd25a0bf8fe94432c6c66c6b4c1f..587b7cef01d4b7c362bba58dc94b6d58d64a6285 100644
--- a/deps/lld/test/ELF/version-script-twice.s
+++ b/deps/lld/test/ELF/version-script-twice.s
@@ -3,7 +3,7 @@
 # RUN: echo "FBSD_1.1 {}; FBSD_1.2 {};" > %t.ver
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -shared %t.o -o %t.so --version-script=%t.ver
-# RUN: llvm-readobj --dyn-symbols --elf-output-style=GNU %t.so | FileCheck %s
+# RUN: llvm-readelf --dyn-symbols %t.so | FileCheck %s
 
         .weak	openat
 openat:
diff --git a/deps/lld/test/ELF/version-script-weak.s b/deps/lld/test/ELF/version-script-weak.s
index 887d6f94d8906a879f797bf5c5267f22727b2b26..d5924500f55dbf5fc7bf67a116426d9069ff90bd 100644
--- a/deps/lld/test/ELF/version-script-weak.s
+++ b/deps/lld/test/ELF/version-script-weak.s
@@ -6,11 +6,11 @@
 # RUN: llvm-ar rcs %t.a %tmp.o
 # RUN: echo "{ local: *; };" > %t.script
 # RUN: ld.lld -shared --version-script %t.script %t.o %t.a -o %t.so
-# RUN: llvm-readobj -dyn-symbols -r %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms -r %t.so | FileCheck %s
 
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section ({{.*}}) .rela.plt {
-# CHECK-NEXT:     0x2018 R_X86_64_JUMP_SLOT foo
+# CHECK-NEXT:     0x3018 R_X86_64_JUMP_SLOT foo
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 # CHECK:      Symbol {
diff --git a/deps/lld/test/ELF/version-script.s b/deps/lld/test/ELF/version-script.s
index 5f2f3c44c9b2c48e787045ab30fd24d1c7d8d7d0..8bbd769d33feeefefc13302e780097de3bdb40e4 100644
--- a/deps/lld/test/ELF/version-script.s
+++ b/deps/lld/test/ELF/version-script.s
@@ -6,19 +6,19 @@
 # RUN: echo "{ global: foo1; foo3; local: *; };" > %t.script
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld --version-script %t.script -shared %t.o %t2.so -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck --check-prefix=DSO %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck --check-prefix=DSO %s
 
 # RUN: echo "# comment" > %t3.script
 # RUN: echo "{ local: *; # comment" >> %t3.script
 # RUN: echo -n "}; # comment" >> %t3.script
 # RUN: ld.lld --version-script %t3.script -shared %t.o %t2.so -o %t3.so
-# RUN: llvm-readobj -dyn-symbols %t3.so | FileCheck --check-prefix=DSO2 %s
+# RUN: llvm-readobj --dyn-syms %t3.so | FileCheck --check-prefix=DSO2 %s
 
 ## Also check that both "global:" and "global :" forms are accepted
 # RUN: echo "VERSION_1.0 { global : foo1; local : *; };" > %t4.script
 # RUN: echo "VERSION_2.0 { global: foo3; local: *; };" >> %t4.script
 # RUN: ld.lld --version-script %t4.script -shared %t.o %t2.so -o %t4.so
-# RUN: llvm-readobj -dyn-symbols %t4.so | FileCheck --check-prefix=VERDSO %s
+# RUN: llvm-readobj --dyn-syms %t4.so | FileCheck --check-prefix=VERDSO %s
 
 # RUN: echo "VERSION_1.0 { global: foo1; local: *; };" > %t5.script
 # RUN: echo "{ global: foo3; local: *; };" >> %t5.script
@@ -32,12 +32,6 @@
 # RUN:   FileCheck -check-prefix=ERR2 %s
 # ERR2: EOF expected, but got VERSION_2.0
 
-# RUN: echo "VERSION_1.0 { global: foo1; local: *; };" > %t6.script
-# RUN: echo "VERSION_2.0 { global: foo1; local: *; };" >> %t6.script
-# RUN: not ld.lld --version-script %t6.script -shared %t.o %t2.so -o /dev/null 2>&1 | \
-# RUN:   FileCheck -check-prefix=ERR3 %s
-# ERR3: duplicate symbol 'foo1' in version script
-
 # RUN: echo "{ foo1; foo2; };" > %t.list
 # RUN: ld.lld --version-script %t.script --dynamic-list %t.list %t.o %t2.so -o %t2
 # RUN: llvm-readobj %t2 > /dev/null
@@ -46,7 +40,7 @@
 # RUN: echo "VERSION_1.0 { global : foo1; local : *; };" > %t7a.script
 # RUN: echo "VERSION_2.0 { global: foo3; local: *; };" > %t7b.script
 # RUN: ld.lld --version-script %t7a.script --version-script %t7b.script -shared %t.o %t2.so -o %t7.so
-# RUN: llvm-readobj -dyn-symbols %t7.so | FileCheck --check-prefix=VERDSO %s
+# RUN: llvm-readobj --dyn-syms %t7.so | FileCheck --check-prefix=VERDSO %s
 
 # DSO:      DynamicSymbols [
 # DSO-NEXT:   Symbol {
@@ -149,12 +143,12 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld --hash-style=sysv -shared %t.o %t2.so -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck --check-prefix=ALL %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck --check-prefix=ALL %s
 
 # RUN: echo "{ global: foo1; foo3; };" > %t2.script
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld --hash-style=sysv --version-script %t2.script -shared %t.o %t2.so -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck --check-prefix=ALL %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck --check-prefix=ALL %s
 
 # ALL:      DynamicSymbols [
 # ALL-NEXT:   Symbol {
diff --git a/deps/lld/test/ELF/version-use.s b/deps/lld/test/ELF/version-use.s
index 7ef12bc04536a40e77b4d3f0ec0f9aa67566cf2d..e8b510427db3df66ceff477e0255beb60174e6a5 100644
--- a/deps/lld/test/ELF/version-use.s
+++ b/deps/lld/test/ELF/version-use.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t.o %p/Inputs/version-use.so -o %t.so -shared -z defs
-// RUN: llvm-readobj -s %t.so | FileCheck %s
+// RUN: llvm-readobj -S %t.so | FileCheck %s
 
 
         call    bar@PLT
diff --git a/deps/lld/test/ELF/version-wildcard.test b/deps/lld/test/ELF/version-wildcard.test
index f9a43319a837a793291b65e6465e9a3f783a1199..ddc2b0866d426bcbacbe5489203d73f6aabdc55e 100644
--- a/deps/lld/test/ELF/version-wildcard.test
+++ b/deps/lld/test/ELF/version-wildcard.test
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: echo "VERSION_1.0 { global: foo*; local: *; };" > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s
 
 # CHECK: DynamicSymbols [
 # CHECK-NEXT:   Symbol {
@@ -48,7 +48,7 @@
 # RUN: echo "VERSION_1.0 { global: foo2; local: *; };" > %t2.script
 # RUN: echo "VERSION_2.0 { global: foo*; };" >> %t2.script
 # RUN: ld.lld --version-script %t2.script -shared %t.o -o %t2.so
-# RUN: llvm-readobj -dyn-symbols %t2.so | FileCheck --check-prefix=MIX %s
+# RUN: llvm-readobj --dyn-syms %t2.so | FileCheck --check-prefix=MIX %s
 
 # MIX:      DynamicSymbols [
 # MIX-NEXT:   Symbol {
diff --git a/deps/lld/test/ELF/visibility.s b/deps/lld/test/ELF/visibility.s
index b9e9b55836a8b97a51dd601fad45b303dc2e32b6..1c9bafc326963835917666e7a20a7300f86312b3 100644
--- a/deps/lld/test/ELF/visibility.s
+++ b/deps/lld/test/ELF/visibility.s
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/visibility.s -o %t2
 // RUN: ld.lld -shared %t %t2 -o %t3
-// RUN: llvm-readobj -t -dyn-symbols %t3 | FileCheck %s
+// RUN: llvm-readobj --symbols --dyn-syms %t3 | FileCheck %s
 
 // CHECK:      Symbols [
 // CHECK-NEXT:   Symbol {
diff --git a/deps/lld/test/ELF/vs-diagnostics-duplicate.s b/deps/lld/test/ELF/vs-diagnostics-duplicate.s
new file mode 100644
index 0000000000000000000000000000000000000000..efd0cbe5fb67a463d836fad3ec42893f0b1f8158
--- /dev/null
+++ b/deps/lld/test/ELF/vs-diagnostics-duplicate.s
@@ -0,0 +1,63 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
+// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %S/Inputs/vs-diagnostics-duplicate2.s -o %t2.o
+// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %S/Inputs/vs-diagnostics-duplicate3.s -o %t3.o
+// RUN: not ld.lld --vs-diagnostics %t1.o %t2.o %t3.o -o %tout 2>&1 | FileCheck %s
+
+// Case 1. Both symbols have full source location.
+// CHECK:      duplicate.s(15): error: duplicate symbol: bar
+// CHECK-NEXT: >>> defined at duplicate.s:15
+// CHECK-NEXT: >>>{{.*}}1.o:(.text+0x{{.+}})
+// CHECK: >>> defined at duplicate2.s:20
+// CHECK: >>>{{.*}}2.o:(.text+0x{{.+}})
+
+// Case 2. The source locations are unknown for both symbols.
+// CHECK:      {{.*}}ld.lld{{.*}}: error: duplicate symbol: foo
+// CHECK-NEXT: >>> defined at {{.*}}1.o:(.text+0x{{.+}})
+// CHECK-NEXT: >>> defined at {{.*}}2.o:(.text+0x{{.+}})
+
+// Case 3. For the second definition of `baz` we know only the source file found in a STT_FILE symbol.
+// CHECK:      duplicate.s(30): error: duplicate symbol: baz
+// CHECK-NEXT: >>> defined at duplicate.s:30
+// CHECK-NEXT: >>> {{.*}}1.o:(.text+0x{{.+}})
+// CHECK-NEXT: >>> defined at duplicate3.s
+// CHECK-NEXT: >>>            {{.*}}3.o:(.text+0x{{.+}})
+
+.global _start, foo, bar, baz
+.text
+_start:
+  nop
+
+foo:
+  nop
+
+.file 1 "duplicate.s"
+.loc 1 15
+
+bar:
+  nop
+
+.loc 1 30
+baz:
+  nop
+
+.section .debug_abbrev,"",@progbits
+  .byte  1                      # Abbreviation Code
+  .byte 17                      # DW_TAG_compile_unit
+  .byte  0                      # DW_CHILDREN_no
+  .byte 16                      # DW_AT_stmt_list
+  .byte 23                      # DW_FORM_sec_offset
+  .byte  0                      # EOM(1)
+  .byte  0                      # EOM(2)
+  .byte  0                      # EOM(3)
+
+.section .debug_info,"",@progbits
+  .long .Lend0 - .Lbegin0       # Length of Unit
+.Lbegin0:
+  .short 4                      # DWARF version number
+  .long  .debug_abbrev          # Offset Into Abbrev. Section
+  .byte  8                      # Address Size (in bytes)
+  .byte  1                      # Abbrev [1] 0xb:0x1f DW_TAG_compile_unit
+  .long  .debug_line            # DW_AT_stmt_list
+.Lend0:
+  .section .debug_line,"",@progbits
diff --git a/deps/lld/test/ELF/vs-diagnostics-dynamic-relocation.s b/deps/lld/test/ELF/vs-diagnostics-dynamic-relocation.s
new file mode 100644
index 0000000000000000000000000000000000000000..6575133eca11a5fd0fe6cca083c975df25d77601
--- /dev/null
+++ b/deps/lld/test/ELF/vs-diagnostics-dynamic-relocation.s
@@ -0,0 +1,35 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
+// RUN: not ld.lld -shared --vs-diagnostics %t.o -o /dev/null 2>&1 | FileCheck %s
+
+// CHECK: dyn.s(15): error: can't create dynamic relocation R_X86_64_64 against local symbol in readonly segment; recompile object files with -fPIC or pass '-Wl,-z,notext' to allow text relocations in the output
+// CHECK-NEXT: >>> defined in {{.*}}.o
+// CHECK-NEXT: >>> referenced by dyn.s:15
+// CHECK-NEXT: >>>{{.*}}.o:(.text+0x{{.+}})
+
+.file 1 "dyn.s"
+.loc 1 15
+
+foo:
+.quad foo
+
+.section .debug_abbrev,"",@progbits
+  .byte  1                      # Abbreviation Code
+  .byte 17                      # DW_TAG_compile_unit
+  .byte  0                      # DW_CHILDREN_no
+  .byte 16                      # DW_AT_stmt_list
+  .byte 23                      # DW_FORM_sec_offset
+  .byte  0                      # EOM(1)
+  .byte  0                      # EOM(2)
+  .byte  0                      # EOM(3)
+
+.section .debug_info,"",@progbits
+  .long .Lend0 - .Lbegin0       # Length of Unit
+.Lbegin0:
+  .short 4                      # DWARF version number
+  .long  .debug_abbrev          # Offset Into Abbrev. Section
+  .byte  8                      # Address Size (in bytes)
+  .byte  1                      # Abbrev [1] 0xb:0x1f DW_TAG_compile_unit
+  .long  .debug_line            # DW_AT_stmt_list
+.Lend0:
+  .section .debug_line,"",@progbits
diff --git a/deps/lld/test/ELF/vs-diagnostics-undefined-symbol-1.s b/deps/lld/test/ELF/vs-diagnostics-undefined-symbol-1.s
new file mode 100644
index 0000000000000000000000000000000000000000..908549327ecfd6ee05b531d17a2687810eac8ff4
--- /dev/null
+++ b/deps/lld/test/ELF/vs-diagnostics-undefined-symbol-1.s
@@ -0,0 +1,15 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t1.o
+// RUN: not ld.lld --vs-diagnostics %t1.o -o %tout 2>&1 \
+// RUN:   | FileCheck -check-prefix=ERR -check-prefix=CHECK -DFILE=%t1.o %s
+// RUN: ld.lld --vs-diagnostics --warn-unresolved-symbols %t1.o -o %tout 2>&1 \
+// RUN:   | FileCheck -check-prefix=WARN -check-prefix=CHECK -DFILE=%t1.o %s
+
+// ERR:        [[FILE]]: error: undefined symbol: foo
+// WARN:       [[FILE]]: warning: undefined symbol: foo
+// CHECK-NEXT: >>> referenced by {{.*}}1.o:(.text+0x{{.+}})
+
+.global _start, foo
+.text
+_start:
+  jmp foo
\ No newline at end of file
diff --git a/deps/lld/test/ELF/vs-diagnostics-undefined-symbol-2.s b/deps/lld/test/ELF/vs-diagnostics-undefined-symbol-2.s
new file mode 100644
index 0000000000000000000000000000000000000000..3c8c80ef6a252e7ee1f70373ef4ed6b5ac3b4e73
--- /dev/null
+++ b/deps/lld/test/ELF/vs-diagnostics-undefined-symbol-2.s
@@ -0,0 +1,18 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t1.o
+// RUN: not ld.lld --vs-diagnostics %t1.o -o %tout 2>&1 \
+// RUN:   | FileCheck -check-prefix=ERR -check-prefix=CHECK %s
+// RUN: ld.lld --vs-diagnostics --warn-unresolved-symbols %t1.o -o %tout 2>&1 \
+// RUN:   | FileCheck -check-prefix=WARN -check-prefix=CHECK %s
+
+// ERR:        {{.*}}ld.lld{{.*}}: error: undefined symbol: foo
+// WARN:       {{.*}}ld.lld{{.*}}: warning: undefined symbol: foo
+// CHECK-NEXT: >>> referenced by undef2.s
+// CHECK-NEXT: >>>               {{.*}}1.o:(.text+0x{{.+}})
+
+.file "undef2.s"
+
+.global _start, foo
+.text
+_start:
+  jmp foo
diff --git a/deps/lld/test/ELF/vs-diagnostics-undefined-symbol-3.s b/deps/lld/test/ELF/vs-diagnostics-undefined-symbol-3.s
new file mode 100644
index 0000000000000000000000000000000000000000..3ff9885b7401decfd8f5a15121859bf224289e31
--- /dev/null
+++ b/deps/lld/test/ELF/vs-diagnostics-undefined-symbol-3.s
@@ -0,0 +1,40 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t1.o
+// RUN: not ld.lld --vs-diagnostics %t1.o -o %tout 2>&1 \
+// RUN:   | FileCheck -check-prefix=ERR -check-prefix=CHECK %s
+// RUN: ld.lld --vs-diagnostics --warn-unresolved-symbols %t1.o -o %tout 2>&1 \
+// RUN:   | FileCheck -check-prefix=WARN -check-prefix=CHECK %s
+
+// ERR:        undef3.s(15): error: undefined symbol: foo
+// WARN:       undef3.s(15): warning: undefined symbol: foo
+// CHECK:      >>> referenced by undef3.s:15
+// CHECK-NEXT: >>> {{.*}}1.o:(.text+0x{{.+}})
+
+.file 1 "undef3.s"
+
+.global _start, foo
+.text
+_start:
+.loc 1 15
+  jmp foo
+
+.section .debug_abbrev,"",@progbits
+  .byte  1                      # Abbreviation Code
+  .byte 17                      # DW_TAG_compile_unit
+  .byte  0                      # DW_CHILDREN_no
+  .byte 16                      # DW_AT_stmt_list
+  .byte 23                      # DW_FORM_sec_offset
+  .byte  0                      # EOM(1)
+  .byte  0                      # EOM(2)
+  .byte  0                      # EOM(3)
+
+.section .debug_info,"",@progbits
+  .long .Lend0 - .Lbegin0       # Length of Unit
+.Lbegin0:
+  .short 4                      # DWARF version number
+  .long  .debug_abbrev          # Offset Into Abbrev. Section
+  .byte  8                      # Address Size (in bytes)
+  .byte  1                      # Abbrev [1] 0xb:0x1f DW_TAG_compile_unit
+  .long  .debug_line            # DW_AT_stmt_list
+.Lend0:
+  .section .debug_line,"",@progbits
diff --git a/deps/lld/test/ELF/vs-diagnostics-versionscript.s b/deps/lld/test/ELF/vs-diagnostics-versionscript.s
new file mode 100644
index 0000000000000000000000000000000000000000..12901570dc576e84f2a2022a9d37af334052d1c3
--- /dev/null
+++ b/deps/lld/test/ELF/vs-diagnostics-versionscript.s
@@ -0,0 +1,5 @@
+# RUN: echo "\"" > %/terr1.script
+# RUN: not ld.lld --vs-diagnostics --version-script %/terr1.script 2>&1 | \
+# RUN: FileCheck %s -DSCRIPT="%/terr1.script"
+
+# CHECK: [[SCRIPT]](1): error: [[SCRIPT]]:1: unclosed quote
diff --git a/deps/lld/test/ELF/warn-unresolved-symbols-hidden.s b/deps/lld/test/ELF/warn-unresolved-symbols-hidden.s
index 9e3d9e152104c253af0918d130e65e63c55a4af6..bef8b6705f6b4a02b51b4f41783d56ec0fcdbe1b 100644
--- a/deps/lld/test/ELF/warn-unresolved-symbols-hidden.s
+++ b/deps/lld/test/ELF/warn-unresolved-symbols-hidden.s
@@ -3,8 +3,8 @@
 # RUN: not ld.lld -shared %t.o -o /dev/null -z defs --warn-unresolved-symbols 2>&1| FileCheck %s
 
 # CHECK: warning: undefined symbol: foo
-# CHECK: error: undefined symbol: bar
-# CHECK: error: undefined symbol: zed
+# CHECK: error: undefined hidden symbol: bar
+# CHECK: error: undefined protected symbol: zed
 
 .data
 .quad foo
diff --git a/deps/lld/test/ELF/weak-undef-export.s b/deps/lld/test/ELF/weak-undef-export.s
index 561a0571a413ff0603aeaae336162e308ce530ce..e8b36858830735df84e8b035ae2cb191842bd398 100644
--- a/deps/lld/test/ELF/weak-undef-export.s
+++ b/deps/lld/test/ELF/weak-undef-export.s
@@ -4,7 +4,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld --export-dynamic %t.o -o %t
-# RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 # CHECK:      DynamicSymbols [
 # CHECK-NEXT:   Symbol {
diff --git a/deps/lld/test/ELF/weak-undef-hidden.s b/deps/lld/test/ELF/weak-undef-hidden.s
index 70b951bf05965692a1df5cc024b9c7c56b229e6f..632e051ffdc14ccaa4197dfcaff1552eb64e8775 100644
--- a/deps/lld/test/ELF/weak-undef-hidden.s
+++ b/deps/lld/test/ELF/weak-undef-hidden.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -r -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -r -S --section-data %t.so | FileCheck %s
 
 .data
 .weak g
diff --git a/deps/lld/test/ELF/weak-undef-lib.s b/deps/lld/test/ELF/weak-undef-lib.s
index e4e7f46ebaa9994d39f6b4f417374e36926c276a..0b4183e80e52ee50de4645541b083139fdfc8072 100644
--- a/deps/lld/test/ELF/weak-undef-lib.s
+++ b/deps/lld/test/ELF/weak-undef-lib.s
@@ -4,7 +4,7 @@
 # RUN:   llvm-mc -filetype=obj -triple=x86_64-pc-linux - -o %t2.o
 
 # RUN: ld.lld -shared -o %t.so %t1.o --start-lib %t2.o
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s
 
 # CHECK:      Name: foo
 # CHECK-NEXT: Value: 0x0
diff --git a/deps/lld/test/ELF/weak-undef-no-shared-libs.s b/deps/lld/test/ELF/weak-undef-no-shared-libs.s
new file mode 100644
index 0000000000000000000000000000000000000000..1d708eef6f8f00bba0fa4a18fb7957cdf1fe2459
--- /dev/null
+++ b/deps/lld/test/ELF/weak-undef-no-shared-libs.s
@@ -0,0 +1,28 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+// RUN: ld.lld -pie %t.o -o %t
+// RUN: llvm-readobj -V --dyn-syms %t | FileCheck %s
+
+        .globl _start
+_start:
+        .type foo,@function
+        .weak foo
+        .long foo@gotpcrel
+
+// Test that an entry for weak undefined symbols is NOT emitted in .dynsym as
+// the PIE was not linked with any shared libraries. There are other tests which
+// ensure that the weak undefined symbols do get emitted in .dynsym for PIEs
+// linked against dynamic libraries.
+
+
+// CHECK:      DynamicSymbols [
+// CHECK-NEXT:   Symbol {
+// CHECK-NEXT:     Name:
+// CHECK-NEXT:     Value: 0x0
+// CHECK-NEXT:     Size: 0
+// CHECK-NEXT:     Binding: Local (0x0)
+// CHECK-NEXT:     Type: None (0x0)
+// CHECK-NEXT:     Other: 0
+// CHECK-NEXT:     Section: Undefined (0x0)
+// CHECK-NEXT:   }
+// CHECK-NEXT: ]
diff --git a/deps/lld/test/ELF/weak-undef-rw.s b/deps/lld/test/ELF/weak-undef-rw.s
index c75e7d67db3db3ea46b37592f767799a9ab74002..e8d9515305c7d42edb505db91296c19c8a698a6a 100644
--- a/deps/lld/test/ELF/weak-undef-rw.s
+++ b/deps/lld/test/ELF/weak-undef-rw.s
@@ -1,9 +1,13 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t --export-dynamic
-# RUN: llvm-readobj -r %t | FileCheck %s
+# RUN: llvm-readelf -r %t | FileCheck %s
 
-# CHECK: R_X86_64_64 foobar 0x0
+## gABI leaves the behavior of weak undefined references implementation defined.
+## We choose to resolve it statically and not create a dynamic relocation for
+## implementation simplicity. This also matches ld.bfd and gold.
+
+# CHECK: no relocations
 
         .global _start
 _start:
diff --git a/deps/lld/test/ELF/weak-undef-shared.s b/deps/lld/test/ELF/weak-undef-shared.s
index 668a05b658a18908ead712c14e2b419c188c9e1d..990e023b260f63eefb6a1a64747c3bf583072a75 100644
--- a/deps/lld/test/ELF/weak-undef-shared.s
+++ b/deps/lld/test/ELF/weak-undef-shared.s
@@ -1,19 +1,37 @@
-// REQUIRES: x86
-// RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
-// RUN: llvm-mc %p/Inputs/shared.s -o %t2.o -filetype=obj -triple=x86_64-pc-linux
-// RUN: ld.lld %t2.o -o %t2.so -shared
-// RUN: ld.lld %t.o %t2.so -o %t.exe
-// RUN: llvm-readobj -t %t.exe | FileCheck %s
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: ld.lld -shared %t.o -o %t.so
 
-// CHECK:      Name: bar
-// CHECK-NEXT: Value: 0x201020
-// CHECK-NEXT: Size: 0
-// CHECK-NEXT: Binding: Weak
-// CHECK-NEXT: Type: Function
-// CHECK-NEXT: Other: 0
-// CHECK-NEXT: Section: Undefined
+# RUN: echo '.data; .weak foo; .quad foo' | llvm-mc -filetype=obj -triple=x86_64 - -o %t1.o
+# RUN: echo '.data; .quad foo' | llvm-mc -filetype=obj -triple=x86_64 - -o %t2.o
+# RUN: ld.lld -shared %t2.o -o %t2.so
 
-.global _start
-_start:
-        .weak bar
-        .quad bar
+## If the first undefined reference is weak, the binding changes to
+## STB_WEAK.
+# RUN: ld.lld %t1.o %t.so -o %t
+# RUN: llvm-readelf --dyn-syms %t | FileCheck --check-prefix=WEAK %s
+# RUN: ld.lld %t.so %t1.o -o %t
+# RUN: llvm-readelf --dyn-syms %t | FileCheck --check-prefix=WEAK %s
+
+## The binding remains STB_WEAK if there is no STB_GLOBAL undefined reference.
+# RUN: ld.lld %t1.o %t.so %t1.o -o %t
+# RUN: llvm-readelf --dyn-syms %t | FileCheck --check-prefix=WEAK %s
+# RUN: ld.lld %t.so %t1.o %t1.o -o %t
+# RUN: llvm-readelf --dyn-syms %t | FileCheck --check-prefix=WEAK %s
+
+## The binding changes back to STB_GLOBAL if there is a STB_GLOBAL undefined reference.
+# RUN: ld.lld %t1.o %t.so %t2.o -o %t
+# RUN: llvm-readelf --dyn-syms %t | FileCheck --check-prefix=GLOBAL %s
+# RUN: ld.lld %t2.o %t.so %t1.o -o %t
+# RUN: llvm-readelf --dyn-syms %t | FileCheck --check-prefix=GLOBAL %s
+
+## Check the binding (weak) is not affected by the STB_GLOBAL undefined
+## reference in %t2.so
+# RUN: ld.lld %t1.o %t2.so -o %t
+# RUN: llvm-readelf --dyn-syms %t | FileCheck --check-prefix=WEAK %s
+
+# WEAK:   NOTYPE WEAK   DEFAULT UND foo
+# GLOBAL: NOTYPE GLOBAL DEFAULT UND foo
+
+.globl foo
+foo:
diff --git a/deps/lld/test/ELF/weak-undef-shared2.s b/deps/lld/test/ELF/weak-undef-shared2.s
new file mode 100644
index 0000000000000000000000000000000000000000..cdd65b8c80bff977ab584df734ed0b8c545f625c
--- /dev/null
+++ b/deps/lld/test/ELF/weak-undef-shared2.s
@@ -0,0 +1,21 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: echo '.globl f; f:' | llvm-mc -filetype=obj -triple=x86_64 - -o %t1.o
+# RUN: echo '.weak f; .data; .quad f' | llvm-mc -filetype=obj -triple=x86_64 - -o %t2.o
+# RUN: ld.lld -shared %t1.o -o %t1.so
+# RUN: ld.lld -shared %t2.o -o %t2.so
+
+## The undefined reference is STB_GLOBAL in %t.o while STB_WEAK in %t2.so.
+## Check the binding of the result is STB_GLOBAL.
+
+# RUN: ld.lld %t.o %t1.so %t2.so -o %t
+# RUN: llvm-readelf --dyn-syms %t | FileCheck %s
+# RUN: ld.lld %t1.so %t.o %t2.so -o %t
+# RUN: llvm-readelf --dyn-syms %t | FileCheck %s
+# RUN: ld.lld %t1.so %t2.so %t.o -o %t
+# RUN: llvm-readelf --dyn-syms %t | FileCheck %s
+
+# CHECK: NOTYPE GLOBAL DEFAULT UND f
+
+.data
+.quad f
diff --git a/deps/lld/test/ELF/weak-undef-val.s b/deps/lld/test/ELF/weak-undef-val.s
index acd42f4845de52f4ca369929466a7c59d49e0c6b..2797a717add6b4a95c73b8d44155097c425ac893 100644
--- a/deps/lld/test/ELF/weak-undef-val.s
+++ b/deps/lld/test/ELF/weak-undef-val.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t --export-dynamic
-# RUN: llvm-readobj -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 # CHECK:      Name: .text
 # CHECK-NEXT: Type: SHT_PROGBITS
diff --git a/deps/lld/test/ELF/weak-undef.s b/deps/lld/test/ELF/weak-undef.s
index e7905c33876c600edd531d767ea3559a894ccb83..1c086f4b43a76750139cb7eecff5f508e02f7161 100644
--- a/deps/lld/test/ELF/weak-undef.s
+++ b/deps/lld/test/ELF/weak-undef.s
@@ -1,7 +1,9 @@
 # REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/dummy-shared.s -o %t1.o
+# RUN: ld.lld %t1.o -shared -o %t1.so
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-# RUN: ld.lld %t.o -o %t -pie
-# RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+# RUN: ld.lld %t.o -o %t %t1.so -pie
+# RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 # CHECK:      DynamicSymbols [
 # CHECK-NEXT:   Symbol {
diff --git a/deps/lld/test/ELF/wrap-dynamic-undef.s b/deps/lld/test/ELF/wrap-dynamic-undef.s
index 95b9859810135d9bd4cc2ef57d2dfcc907fc5f40..50ada2d5e55671d8f28fb12f9ca2d703355960ac 100644
--- a/deps/lld/test/ELF/wrap-dynamic-undef.s
+++ b/deps/lld/test/ELF/wrap-dynamic-undef.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/wrap-dynamic-undef.s -o %t2.o
 # RUN: ld.lld %t2.o -o %t2.so -shared
 # RUN: ld.lld %t1.o %t2.so -o %t --wrap foo
-# RUN: llvm-readobj -dyn-symbols --elf-output-style=GNU %t | FileCheck %s
+# RUN: llvm-readelf --dyn-syms %t | FileCheck %s
 
 # Test that the dynamic relocation uses foo. We used to produce a
 # relocation with __real_foo.
diff --git a/deps/lld/test/ELF/wrap-entry.s b/deps/lld/test/ELF/wrap-entry.s
index c746b8e6d11801908b15ec1ce06b842672f90c64..8594bbd6aa00d5350b331bb29d9130927963348d 100644
--- a/deps/lld/test/ELF/wrap-entry.s
+++ b/deps/lld/test/ELF/wrap-entry.s
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 
 // RUN: ld.lld -o %t.exe %t.o -wrap=_start
-// RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+// RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 // CHECK: Entry: 0x201001
 
diff --git a/deps/lld/test/ELF/wrap-plt.s b/deps/lld/test/ELF/wrap-plt.s
index 71f533dc5a9c257bae5f01fd086899a1590050b3..997200ead06c9538dbc08045ee16972c913eefc0 100644
--- a/deps/lld/test/ELF/wrap-plt.s
+++ b/deps/lld/test/ELF/wrap-plt.s
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 
 // RUN: ld.lld -o %t2 %t -wrap foo -shared
-// RUN: llvm-readobj -s -r %t2 | FileCheck %s
+// RUN: llvm-readobj -S -r %t2 | FileCheck %s
 // RUN: llvm-objdump -d %t2 | FileCheck --check-prefix=DISASM %s
 
 // CHECK:      Name: .plt
@@ -20,8 +20,8 @@
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rela.plt {
-// CHECK-NEXT:     0x2018 R_X86_64_JUMP_SLOT __wrap_foo 0x0
-// CHECK-NEXT:     0x2020 R_X86_64_JUMP_SLOT _start 0x0
+// CHECK-NEXT:     0x3018 R_X86_64_JUMP_SLOT __wrap_foo 0x0
+// CHECK-NEXT:     0x3020 R_X86_64_JUMP_SLOT _start 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
diff --git a/deps/lld/test/ELF/wrap.s b/deps/lld/test/ELF/wrap.s
index 1a9726851f7e132efa36e9a107a0402c70b3a4f6..627154fcfb3af0d8d45156ef374339339ec5d56a 100644
--- a/deps/lld/test/ELF/wrap.s
+++ b/deps/lld/test/ELF/wrap.s
@@ -14,7 +14,7 @@
 // CHECK-NEXT: movl $0x11010, %edx
 // CHECK-NEXT: movl $0x11000, %edx
 
-// RUN: llvm-readobj -t %t3 > %t4.dump
+// RUN: llvm-readobj --symbols %t3 > %t4.dump
 // RUN: FileCheck --check-prefix=SYM1 %s < %t4.dump
 // RUN: FileCheck --check-prefix=SYM2 %s < %t4.dump
 // RUN: FileCheck --check-prefix=SYM3 %s < %t4.dump
diff --git a/deps/lld/test/ELF/x86-64-cet.s b/deps/lld/test/ELF/x86-64-cet.s
new file mode 100644
index 0000000000000000000000000000000000000000..3fb3716ed4e9294c882045263f816436be4a5bd2
--- /dev/null
+++ b/deps/lld/test/ELF/x86-64-cet.s
@@ -0,0 +1,48 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/x86-64-cet1.s -o %t1.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/x86-64-cet2.s -o %t2.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/x86-64-cet3.s -o %t3.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/x86-64-cet4.s -o %t4.o
+
+# RUN: ld.lld -e func1 %t.o %t1.o -o %t
+# RUN: llvm-readelf -n %t | FileCheck -check-prefix=CET -match-full-lines %s
+
+# RUN: ld.lld -e func1 %t.o %t2.o -o %t
+# RUN: llvm-readelf -n %t | FileCheck -check-prefix=CET -match-full-lines %s
+
+# CET: Properties: x86 feature: IBT, SHSTK
+
+# RUN: ld.lld -e func1 %t.o %t3.o -o %t
+# RUN: llvm-readelf -S %t | FileCheck -check-prefix=NOCET %s
+
+# NOCET:     Section Headers
+# NOCET-NOT: .note.gnu.property
+
+# RUN: not ld.lld -e func1 %t.o %t3.o -o %t --require-cet 2>&1 \
+# RUN:   | FileCheck -check-prefix=ERROR %s
+# ERROR: x86-64-cet.s.tmp3.o: --require-cet: file is not compatible with CET
+
+# RUN: ld.lld -e func1 %t.o %t4.o -o %t
+# RUN: llvm-readelf -n %t | FileCheck -check-prefix=NOSHSTK -match-full-lines %s
+
+# Check .note.gnu.protery without property SHSTK.
+# NOSHSTK: Properties: x86 feature: IBT
+
+.section ".note.gnu.property", "a"
+.long 4
+.long 0x10
+.long 0x5
+.asciz "GNU"
+
+.long 0xc0000002
+.long 4
+.long 3
+.long 0
+
+.text
+.globl func1
+.type func1,@function
+func1:
+  call func2
+  ret
diff --git a/deps/lld/test/ELF/x86-64-dyn-rel-error5.s b/deps/lld/test/ELF/x86-64-dyn-rel-error5.s
new file mode 100644
index 0000000000000000000000000000000000000000..6a85ab2986d9563c1ee768507914e5f96234e578
--- /dev/null
+++ b/deps/lld/test/ELF/x86-64-dyn-rel-error5.s
@@ -0,0 +1,26 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: not ld.lld -pie %t.o -o /dev/null 2>&1 | FileCheck %s
+# RUN: not ld.lld -shared %t.o -o /dev/null 2>&1 | FileCheck %s
+
+## Check we don't create dynamic relocations in a writable section,
+## if the number of bits is smaller than the wordsize.
+
+.globl hidden
+.hidden hidden
+local:
+hidden:
+
+# CHECK: error: relocation R_X86_64_8 cannot be used against local symbol; recompile with -fPIC
+# CHECK-NEXT: >>> defined in {{.*}}.o
+# CHECK-NEXT: >>> referenced by {{.*}}.o:(.data+0x0)
+# CHECK: error: relocation R_X86_64_16 cannot be used against local symbol; recompile with -fPIC
+# CHECK: error: relocation R_X86_64_32 cannot be used against local symbol; recompile with -fPIC
+# CHECK: error: relocation R_X86_64_32 cannot be used against symbol hidden; recompile with -fPIC
+
+.data
+.byte local     # R_X86_64_8
+.short local    # R_X86_64_16
+.long local     # R_X86_64_32
+
+.long hidden    # R_X86_64_32
diff --git a/deps/lld/test/ELF/x86-64-pcrel.s b/deps/lld/test/ELF/x86-64-pcrel.s
new file mode 100644
index 0000000000000000000000000000000000000000..8129c9cab2da621c822d61efdf4358eae40e2fd4
--- /dev/null
+++ b/deps/lld/test/ELF/x86-64-pcrel.s
@@ -0,0 +1,23 @@
+// REQUIRES: x86
+
+// This is a test for R_X86_64_PC8 and R_X86_64_PC16.
+
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t1.o
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/x86-64-pcrel.s -o %t2.o
+// RUN: ld.lld -o %t.exe %t1.o %t2.o
+// RUN: llvm-objdump -s %t.exe | FileCheck %s
+
+// CHECK:      Contents of section .text:
+// CHECK-NEXT: 2000cccc cccccccc cccccccc cccccccc
+// CHECK-NEXT: 20cccccc cccccccc cccccccc cccccccc
+// CHECK-NEXT: e0ffcccc cccccccc cccccccc cccccccc
+// CHECK-NEXT: e0cccccc cccccccc cccccccc cccccccc
+
+.globl _start
+_start:
+
+.word foo - _start
+.fill 14,1,0xcc
+
+.byte foo - _start
+.fill 15,1,0xcc
diff --git a/deps/lld/test/ELF/x86-64-plt-high-addr.s b/deps/lld/test/ELF/x86-64-plt-high-addr.s
index 4acccb63f4a740e72e7a8ea462bb0f660f96224b..147197e07c36d52b63d3b75294ca76216417abbd 100644
--- a/deps/lld/test/ELF/x86-64-plt-high-addr.s
+++ b/deps/lld/test/ELF/x86-64-plt-high-addr.s
@@ -8,16 +8,16 @@
 // RUN: llvm-objdump -s -j .got.plt %t1.exe | FileCheck %s
 
 // CHECK:      Contents of section .got.plt:
-// CHECK-NEXT: cafe00002000 00300000 feca0000 00000000 00000000
-// CHECK-NEXT: cafe00002010 00000000 00000000 26100000 feca0000
+// CHECK-NEXT: cafe00003000 00200000 feca0000 00000000 00000000
+// CHECK-NEXT: cafe00003010 00000000 00000000 26100000 feca0000
 
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t2.o
 // RUN: ld.lld -o %t2.exe %t2.o %t.so -image-base=0xcafe00000000 -z retpolineplt
 // RUN: llvm-objdump -s -j .got.plt %t2.exe | FileCheck -check-prefix=RETPOLINE %s
 
 // RETPOLINE:      Contents of section .got.plt:
-// RETPOLINE-NEXT: cafe00002000 00300000 feca0000 00000000 00000000
-// RETPOLINE-NEXT: cafe00002010 00000000 00000000 51100000 feca0000
+// RETPOLINE-NEXT: cafe00003000 00200000 feca0000 00000000 00000000
+// RETPOLINE-NEXT: cafe00003010 00000000 00000000 51100000 feca0000
 
 .global _start
 _start:
diff --git a/deps/lld/test/ELF/x86-64-rela.s b/deps/lld/test/ELF/x86-64-rela.s
index 41bdd76de4ca117bca8682dc28ca1b87deb744f0..6240d6d8e36e4b3dad66545798f89b1266a2f8c9 100644
--- a/deps/lld/test/ELF/x86-64-rela.s
+++ b/deps/lld/test/ELF/x86-64-rela.s
@@ -1,10 +1,10 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -dynamic-table %t.so | FileCheck %s
+// RUN: llvm-readobj --dynamic-table %t.so | FileCheck %s
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux-gnux32 %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -dynamic-table %t.so | FileCheck %s
+// RUN: llvm-readobj --dynamic-table %t.so | FileCheck %s
 
         call foo@plt
 
diff --git a/deps/lld/test/ELF/x86-64-reloc-16.s b/deps/lld/test/ELF/x86-64-reloc-16.s
deleted file mode 100644
index 5157c3706fef4f29b12441f4420e0e93b22f5205..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/x86-64-reloc-16.s
+++ /dev/null
@@ -1,14 +0,0 @@
-// REQUIRES: x86
-
-// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/x86-64-reloc-16.s -o %t1
-// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/x86-64-reloc-16-error.s -o %t2
-// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: ld.lld -shared %t %t1 -o /dev/null
-
-// CHECK:      Contents of section .text:
-// CHECK-NEXT:   200000 42
-
-// RUN: not ld.lld -shared %t %t2 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR %s
-// ERROR: relocation R_X86_64_16 out of range: 65536 is not in [0, 65535]
-
-.short foo
diff --git a/deps/lld/test/ELF/x86-64-reloc-8-16.s b/deps/lld/test/ELF/x86-64-reloc-8-16.s
new file mode 100644
index 0000000000000000000000000000000000000000..7c4eeb0a5963025e41384d139600f174dfa2ef45
--- /dev/null
+++ b/deps/lld/test/ELF/x86-64-reloc-8-16.s
@@ -0,0 +1,25 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %S/Inputs/abs255.s -o %t255.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %S/Inputs/abs256.s -o %t256.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %S/Inputs/abs257.s -o %t257.o
+
+# RUN: ld.lld %t.o %t256.o -o %t
+# RUN: llvm-readelf -x .data %t | FileCheck %s
+# CHECK: 0x{{[0-9a-f]+}} ff80ffff 0080
+
+# RUN: not ld.lld %t.o %t255.o -o /dev/null 2>&1 | FileCheck --check-prefix=OVERFLOW1 %s
+# OVERFLOW1: relocation R_X86_64_8 out of range: -129 is not in [-128, 255]
+# OVERFLOW1: relocation R_X86_64_16 out of range: -32769 is not in [-32768, 65535]
+
+# RUN: not ld.lld %t.o %t257.o -o /dev/null 2>&1 | FileCheck --check-prefix=OVERFLOW2 %s
+# OVERFLOW2: relocation R_X86_64_8 out of range: 256 is not in [-128, 255]
+# OVERFLOW2: relocation R_X86_64_16 out of range: 65536 is not in [-32768, 65535]
+
+.globl _start
+_start:
+.data
+.byte foo - 1
+.byte foo - 384
+.word foo + 0xfeff
+.word foo - 0x8100
diff --git a/deps/lld/test/ELF/x86-64-reloc-8.s b/deps/lld/test/ELF/x86-64-reloc-8.s
deleted file mode 100644
index f71bafb7ffb14a7384fea55e5542de85191356f9..0000000000000000000000000000000000000000
--- a/deps/lld/test/ELF/x86-64-reloc-8.s
+++ /dev/null
@@ -1,14 +0,0 @@
-// REQUIRES: x86
-
-// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/x86-64-reloc-8.s -o %t1
-// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/x86-64-reloc-8-error.s -o %t2
-// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
-// RUN: ld.lld -shared %t %t1 -o /dev/null
-
-// CHECK:      Contents of section .text:
-// CHECK-NEXT:   200000 42
-
-// RUN: not ld.lld -shared %t %t2 -o /dev/null 2>&1 | FileCheck --check-prefix=ERROR %s
-// ERROR: relocation R_X86_64_8 out of range: 256 is not in [0, 255]
-
-.byte foo
diff --git a/deps/lld/test/ELF/x86-64-reloc-gotoff64.s b/deps/lld/test/ELF/x86-64-reloc-gotoff64.s
index b78d96e00a6ec8353eb3dfc657ed4ff64ee730c9..9cc9dd7d94854e1def7f8d778708910eb512aa3e 100644
--- a/deps/lld/test/ELF/x86-64-reloc-gotoff64.s
+++ b/deps/lld/test/ELF/x86-64-reloc-gotoff64.s
@@ -4,14 +4,8 @@
 // RUN: llvm-readelf -S %t.so | FileCheck %s -check-prefix=SECTION
 // RUN: llvm-objdump -d %t.so | FileCheck %s
 
-// SECTION: .dynamic DYNAMIC 0000000000003000
-// SECTION: .got PROGBITS 0000000000003070 003070 000000
-
-// All the _GLOBAL_OFFSET_TABLE_ occurrences below refer to the address
-// of GOT base, not the address of the symbol _GLOBAL_OFFSET_TABLE_. These
-// instructions are special and produce GOT base relative relocations. We
-// currently use .got end as the GOT base, which is not equal to
-// the address of the special symbol _GLOBAL_OFFSET_TABLE_.
+// SECTION: .dynamic DYNAMIC 0000000000002000
+// SECTION: .got.plt PROGBITS 0000000000003000 003000 000018
 
 // The assembly is generated by
 // gcc -O2 -S -mcmodel=medium -fPIC a.c
@@ -20,10 +14,10 @@
 // extern long _DYNAMIC[] __attribute__((visibility("hidden")));
 // long* dynamic() { return _DYNAMIC; }
 
-// 0x3070 (.got end) - 0x1007 = 8297
-// 0x3000 (_DYNAMIC) - 0x3070 (.got end) = -112
-// CHECK:      1000: {{.*}} leaq 8297(%rip), %rdx
-// CHECK-NEXT: 1007: {{.*}} movabsq $-112, %rax
+// 0x3000 (.got.plt) - 0x1007 = 8185
+// 0x2000 (_DYNAMIC) - 0x3000 (.got.plt) = -4096
+// CHECK:      1000: {{.*}} leaq 8185(%rip), %rdx
+// CHECK-NEXT: 1007: {{.*}} movabsq $-4096, %rax
 .global dynamic
 dynamic:
   leaq _GLOBAL_OFFSET_TABLE_(%rip), %rdx
diff --git a/deps/lld/test/ELF/x86-64-reloc-gotpc64.s b/deps/lld/test/ELF/x86-64-reloc-gotpc64.s
index 9c58217b45861495bcd03bc9fec83e57ea68b872..cbd8a3acfe58568e95263c4f4dd8bf6d7aa379c1 100644
--- a/deps/lld/test/ELF/x86-64-reloc-gotpc64.s
+++ b/deps/lld/test/ELF/x86-64-reloc-gotpc64.s
@@ -4,11 +4,11 @@
 // RUN: llvm-readelf -S %t.so | FileCheck %s -check-prefix=SECTION
 // RUN: llvm-objdump -d %t.so | FileCheck %s
 
-// SECTION: .got PROGBITS 0000000000003070 003070 000000
+// SECTION: .got.plt PROGBITS 0000000000003000 003000 000018
 
-// 0x3070 (.got end) - 0x1000 = 8304
+// 0x3000 (.got.plt) - 0x1000 = 8192
 // CHECK: gotpc64:
-// CHECK-NEXT: 1000: {{.*}} movabsq $8304, %r11
+// CHECK-NEXT: 1000: {{.*}} movabsq $8192, %r11
 .global gotpc64
 gotpc64:
   movabsq $_GLOBAL_OFFSET_TABLE_-., %r11
diff --git a/deps/lld/test/ELF/x86-64-retpoline-linkerscript.s b/deps/lld/test/ELF/x86-64-retpoline-linkerscript.s
index 82d2ca6374c12799b6296a25fba7fcee7087c7a3..c46f32a609e264601c255be001f4384e40e57621 100644
--- a/deps/lld/test/ELF/x86-64-retpoline-linkerscript.s
+++ b/deps/lld/test/ELF/x86-64-retpoline-linkerscript.s
@@ -13,9 +13,10 @@
 // RUN: llvm-objdump -d -s %t.exe | FileCheck %s
 
 // CHECK:      Disassembly of section .plt:
+// CHECK-EMPTY:
 // CHECK-NEXT: .plt:
-// CHECK-NEXT: 10:       ff 35 72 00 00 00       pushq   114(%rip)
-// CHECK-NEXT: 16:       4c 8b 1d 73 00 00 00    movq    115(%rip), %r11
+// CHECK-NEXT: 10:       ff 35 32 01 00 00       pushq   306(%rip)
+// CHECK-NEXT: 16:       4c 8b 1d 33 01 00 00    movq    307(%rip), %r11
 // CHECK-NEXT: 1d:       e8 0e 00 00 00  callq   14 <.plt+0x20>
 // CHECK-NEXT: 22:       f3 90   pause
 // CHECK-NEXT: 24:       0f ae e8        lfence
@@ -40,7 +41,7 @@
 // CHECK-NEXT: 3d:       cc      int3
 // CHECK-NEXT: 3e:       cc      int3
 // CHECK-NEXT: 3f:       cc      int3
-// CHECK-NEXT: 40:       4c 8b 1d 51 00 00 00    movq    81(%rip), %r11
+// CHECK-NEXT: 40:       4c 8b 1d 11 01 00 00    movq    273(%rip), %r11
 // CHECK-NEXT: 47:       e8 e4 ff ff ff  callq   -28 <.plt+0x20>
 // CHECK-NEXT: 4c:       e9 d1 ff ff ff  jmp     -47 <.plt+0x12>
 // CHECK-NEXT: 51:       68 00 00 00 00  pushq   $0
@@ -50,7 +51,7 @@
 // CHECK-NEXT: 5d:       cc      int3
 // CHECK-NEXT: 5e:       cc      int3
 // CHECK-NEXT: 5f:       cc      int3
-// CHECK-NEXT: 60:       4c 8b 1d 39 00 00 00    movq    57(%rip), %r11
+// CHECK-NEXT: 60:       4c 8b 1d f9 00 00 00    movq    249(%rip), %r11
 // CHECK-NEXT: 67:       e8 c4 ff ff ff  callq   -60 <.plt+0x20>
 // CHECK-NEXT: 6c:       e9 b1 ff ff ff  jmp     -79 <.plt+0x12>
 // CHECK-NEXT: 71:       68 01 00 00 00  pushq   $1
diff --git a/deps/lld/test/ELF/x86-64-retpoline-znow-linkerscript.s b/deps/lld/test/ELF/x86-64-retpoline-znow-linkerscript.s
index 20196058d25156fa1625468a8b79a383b34374a9..2fda122dd26ad6e5b57da3fa2cd749c3c1b357f7 100644
--- a/deps/lld/test/ELF/x86-64-retpoline-znow-linkerscript.s
+++ b/deps/lld/test/ELF/x86-64-retpoline-znow-linkerscript.s
@@ -13,6 +13,7 @@
 // RUN: llvm-objdump -d -s %t.exe | FileCheck %s
 
 // CHECK:      Disassembly of section .plt:
+// CHECK-EMPTY:
 // CHECK-NEXT: .plt:
 // CHECK-NEXT: 10:	e8 0b 00 00 00 	callq	11 <.plt+0x10>
 // CHECK-NEXT: 15:	f3 90 	pause
diff --git a/deps/lld/test/ELF/x86-64-retpoline-znow.s b/deps/lld/test/ELF/x86-64-retpoline-znow.s
index 6464e2c0971f99d4d0dd9c3438b407769e5831f5..033ba4158fa79c4590acf9c9b450b28a6a40fee7 100644
--- a/deps/lld/test/ELF/x86-64-retpoline-znow.s
+++ b/deps/lld/test/ELF/x86-64-retpoline-znow.s
@@ -7,6 +7,7 @@
 // RUN: llvm-objdump -d -s %t.exe | FileCheck %s
 
 // CHECK:      Disassembly of section .plt:
+// CHECK-EMPTY:
 // CHECK-NEXT: .plt:
 // CHECK-NEXT: 1010:	e8 0b 00 00 00 	callq	11 <.plt+0x10>
 // CHECK-NEXT: 1015:	f3 90 	pause
diff --git a/deps/lld/test/ELF/x86-64-retpoline.s b/deps/lld/test/ELF/x86-64-retpoline.s
index 535f56533193559f4b91b8c8e64056d0f87a3ff7..d4c3a5267354a84959e060e0d79c8b43f92cc775 100644
--- a/deps/lld/test/ELF/x86-64-retpoline.s
+++ b/deps/lld/test/ELF/x86-64-retpoline.s
@@ -7,9 +7,10 @@
 // RUN: llvm-objdump -d -s %t.exe | FileCheck %s
 
 // CHECK:      Disassembly of section .plt:
+// CHECK-EMPTY:
 // CHECK-NEXT: .plt:
-// CHECK-NEXT: 1010:       ff 35 f2 0f 00 00       pushq   4082(%rip)
-// CHECK-NEXT: 1016:       4c 8b 1d f3 0f 00 00    movq    4083(%rip), %r11
+// CHECK-NEXT: 1010:       ff 35 f2 1f 00 00       pushq   8178(%rip)
+// CHECK-NEXT: 1016:       4c 8b 1d f3 1f 00 00    movq    8179(%rip), %r11
 // CHECK-NEXT: 101d:       e8 0e 00 00 00  callq   14 <.plt+0x20>
 // CHECK-NEXT: 1022:       f3 90   pause
 // CHECK-NEXT: 1024:       0f ae e8        lfence
@@ -34,7 +35,7 @@
 // CHECK-NEXT: 103d:       cc      int3
 // CHECK-NEXT: 103e:       cc      int3
 // CHECK-NEXT: 103f:       cc      int3
-// CHECK-NEXT: 1040:       4c 8b 1d d1 0f 00 00    movq    4049(%rip), %r11
+// CHECK-NEXT: 1040:       4c 8b 1d d1 1f 00 00    movq    8145(%rip), %r11
 // CHECK-NEXT: 1047:       e8 e4 ff ff ff  callq   -28 <.plt+0x20>
 // CHECK-NEXT: 104c:       e9 d1 ff ff ff  jmp     -47 <.plt+0x12>
 // CHECK-NEXT: 1051:       68 00 00 00 00  pushq   $0
@@ -44,7 +45,7 @@
 // CHECK-NEXT: 105d:       cc      int3
 // CHECK-NEXT: 105e:       cc      int3
 // CHECK-NEXT: 105f:       cc      int3
-// CHECK-NEXT: 1060:       4c 8b 1d b9 0f 00 00    movq    4025(%rip), %r11
+// CHECK-NEXT: 1060:       4c 8b 1d b9 1f 00 00    movq    8121(%rip), %r11
 // CHECK-NEXT: 1067:       e8 c4 ff ff ff  callq   -60 <.plt+0x20>
 // CHECK-NEXT: 106c:       e9 b1 ff ff ff  jmp     -79 <.plt+0x12>
 // CHECK-NEXT: 1071:       68 01 00 00 00  pushq   $1
@@ -56,9 +57,9 @@
 // CHECK-NEXT: 107f:       cc      int3
 
 // CHECK:      Contents of section .got.plt:
-// CHECK-NEXT: 2000 00300000 00000000 00000000 00000000
-// CHECK-NEXT: 2010 00000000 00000000 51100000 00000000
-// CHECK-NEXT: 2020 71100000 00000000
+// CHECK-NEXT: 3000 00200000 00000000 00000000 00000000
+// CHECK-NEXT: 3010 00000000 00000000 51100000 00000000
+// CHECK-NEXT: 3020 71100000 00000000
 
 .global _start
 _start:
diff --git a/deps/lld/test/ELF/x86-64-static-tls-model.s b/deps/lld/test/ELF/x86-64-static-tls-model.s
new file mode 100644
index 0000000000000000000000000000000000000000..997def3a842c1ca76ee3ba49bba6bc3112ec6cd1
--- /dev/null
+++ b/deps/lld/test/ELF/x86-64-static-tls-model.s
@@ -0,0 +1,18 @@
+# REQUIRES: x86
+
+## In this test R_X86_64_GOTTPOFF is a IE relocation (static TLS model),
+## test check we add STATIC_TLS flag.
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: ld.lld %t.o -o %t1 -shared
+# RUN: llvm-readobj --dynamic-table %t1 | FileCheck %s
+
+# CHECK: DynamicSection [
+# CHECK: FLAGS STATIC_TLS
+
+.section ".tdata", "awT", @progbits
+.globl var
+var:
+
+movq var@GOTTPOFF(%rip), %rax # R_X86_64_GOTTPOFF
+movl %fs:0(%rax), %eax
diff --git a/deps/lld/test/ELF/x86-64-tls-gd-local.s b/deps/lld/test/ELF/x86-64-tls-gd-local.s
index 8879737ad3fbf848329fb534133a8545fa3ef90b..e6b61190213cfda35aa5123fe9d22d4c08c08602 100644
--- a/deps/lld/test/ELF/x86-64-tls-gd-local.s
+++ b/deps/lld/test/ELF/x86-64-tls-gd-local.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld --hash-style=sysv %t.o -o %t.so -shared
-// RUN: llvm-readobj -r -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -r -S --section-data %t.so | FileCheck %s
 
         .byte   0x66
         leaq    foo@tlsgd(%rip), %rdi
@@ -34,8 +34,8 @@ bar:
 // CHECK-NEXT:   SHF_ALLOC (0x2)
 // CHECK-NEXT:   SHF_WRITE (0x1)
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x30D0
-// CHECK-NEXT: Offset: 0x30D0
+// CHECK-NEXT: Address: 0x20D0
+// CHECK-NEXT: Offset: 0x20D0
 // CHECK-NEXT: Size: 32
 // CHECK-NEXT: Link: 0
 // CHECK-NEXT: Info: 0
@@ -47,6 +47,6 @@ bar:
 // CHECK-NEXT: )
 
 // CHECK:      Section ({{.*}}) .rela.dyn {
-// CHECK-NEXT:   0x30D0 R_X86_64_DTPMOD64 - 0x0
-// CHECK-NEXT:   0x30E0 R_X86_64_DTPMOD64 - 0x0
+// CHECK-NEXT:   0x20D0 R_X86_64_DTPMOD64 - 0x0
+// CHECK-NEXT:   0x20E0 R_X86_64_DTPMOD64 - 0x0
 // CHECK-NEXT: }
diff --git a/deps/lld/test/ELF/x86-64-tls-ld-local.s b/deps/lld/test/ELF/x86-64-tls-ld-local.s
index 6daba638367f02b5813c9a55b592d2306b039b72..4978b83f12fde7e940d8b5becd5f3b783c6e447f 100644
--- a/deps/lld/test/ELF/x86-64-tls-ld-local.s
+++ b/deps/lld/test/ELF/x86-64-tls-ld-local.s
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -r -s %t.so | FileCheck %s
+// RUN: llvm-readobj -r -S %t.so | FileCheck %s
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
diff --git a/deps/lld/test/ELF/x86-64-tls-ld-preemptable.s b/deps/lld/test/ELF/x86-64-tls-ld-preemptable.s
new file mode 100644
index 0000000000000000000000000000000000000000..50f9b244776b72f3f54ed9a5f3d51c3b93da0ee9
--- /dev/null
+++ b/deps/lld/test/ELF/x86-64-tls-ld-preemptable.s
@@ -0,0 +1,20 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: ld.lld %t.o -shared -o %t.so
+# RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck %s
+
+# CHECK:      100c:       leaq    (%rax), %rax
+# CHECK-NEXT: 1013:       movabsq 0, %rax
+
+# We used to error on R_X86_64_DTPOFF{32,64} to preemptable symbols.
+# i is STB_GLOBAL and preemptable.
+  leaq i@TLSLD(%rip), %rdi
+  callq __tls_get_addr@PLT
+  leaq i@DTPOFF(%rax), %rax # R_X86_64_DTPOFF32
+  movabsq i@DTPOFF, %rax # R_X86_64_DTPOFF64
+
+.section .tbss,"awT",@nobits
+.globl i
+i:
+  .long 0
+  .size i, 4
diff --git a/deps/lld/test/ELF/x86-64-tls-le-align.s b/deps/lld/test/ELF/x86-64-tls-le-align.s
new file mode 100644
index 0000000000000000000000000000000000000000..d2ffd2a9a987b777228b8534df166563b262292e
--- /dev/null
+++ b/deps/lld/test/ELF/x86-64-tls-le-align.s
@@ -0,0 +1,16 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+
+# -alignTo(p_memsz, p_align) = -alignTo(4, 64) = -64
+
+# CHECK: movl %fs:-64, %eax
+
+  movl %fs:a@TPOFF, %eax
+
+.section .tbss,"awT"
+.align 64
+a:
+.long 0
+.size a, 4
diff --git a/deps/lld/test/ELF/x86-64-tls-le-undef.s b/deps/lld/test/ELF/x86-64-tls-le-undef.s
new file mode 100644
index 0000000000000000000000000000000000000000..8feb267c0915360b253baa1ec370f0b615ae4824
--- /dev/null
+++ b/deps/lld/test/ELF/x86-64-tls-le-undef.s
@@ -0,0 +1,15 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: ld.lld --noinhibit-exec %t.o -o %t 2>&1
+# RUN: llvm-objdump -d %t | FileCheck %s
+
+## Undefined TLS symbols resolve to 0.
+## In --noinhibit-exec mode, a non-weak undefined symbol is not an error.
+
+# CHECK:      leaq 16(%rax), %rdx
+# CHECK-NEXT: leaq 32(%rax), %rdx
+
+.weak weak
+movq %fs:0, %rax
+leaq weak@tpoff+16(%rax), %rdx
+leaq global@tpoff+32(%rax), %rdx
diff --git a/deps/lld/test/ELF/x86-64-tlsdesc-gd.s b/deps/lld/test/ELF/x86-64-tlsdesc-gd.s
new file mode 100644
index 0000000000000000000000000000000000000000..1c72fbe40d04b8dd4b585ac90b66bc9174b131d8
--- /dev/null
+++ b/deps/lld/test/ELF/x86-64-tlsdesc-gd.s
@@ -0,0 +1,69 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+# RUN: echo '.tbss; .globl b; b:' | llvm-mc -filetype=obj -triple=x86_64 - -o %t1.o
+# RUN: ld.lld -shared -soname=t1.so %t1.o -o %t1.so
+
+# RUN: ld.lld -shared %t.o %t1.o -o %t.so
+# RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=GD-REL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck --check-prefix=GD %s
+
+# RUN: ld.lld %t.o %t1.o -o %t
+# RUN: llvm-readelf -r %t | FileCheck --check-prefix=NOREL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=LE %s
+
+# RUN: ld.lld %t.o %t1.so -o %t
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=IE-REL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=IE %s
+
+# GD-REL:      .rela.dyn {
+# GD-REL-NEXT:   0x20A0 R_X86_64_TLSDESC a 0x0
+# GD-REL-NEXT:   0x20B0 R_X86_64_TLSDESC b 0x0
+# GD-REL-NEXT: }
+
+# 0x20a0-0x1007 = 4249
+# GD:            leaq 4249(%rip), %rax
+# GD-NEXT: 1007: callq *(%rax)
+# GD-NEXT:       movl %fs:(%rax), %eax
+
+# 0x20b0-0x1013 = 4253
+# GD-NEXT:       leaq 4253(%rip), %rax
+# GD-NEXT: 1013: callq *(%rax)
+# GD-NEXT:       movl %fs:(%rax), %eax
+
+# NOREL: no relocations
+
+## offset(a) = -4
+# LE:      movq $-4, %rax
+# LE-NEXT: nop
+# LE-NEXT: movl %fs:(%rax), %eax
+## offset(b) = 0
+# LE:      movq $0, %rax
+# LE-NEXT: nop
+# LE-NEXT: movl %fs:(%rax), %eax
+
+# IE-REL:      .rela.dyn {
+# IE-REL-NEXT:   0x2020C0 R_X86_64_TPOFF64 b 0x0
+# IE-REL-NEXT: }
+
+## a is relaxed to use LE.
+# IE:              movq $-4, %rax
+# IE-NEXT:         nop
+# IE-NEXT:         movl %fs:(%rax), %eax
+## 0x2020C0 - 0x201013 = 4269
+# IE-NEXT:         movq 4269(%rip), %rax
+# IE-NEXT: 201013: nop
+# IE-NEXT:         movl %fs:(%rax), %eax
+
+leaq a@tlsdesc(%rip), %rax
+call *a@tlscall(%rax)
+movl %fs:(%rax), %eax
+
+leaq b@tlsdesc(%rip), %rax
+call *b@tlscall(%rax)
+movl %fs:(%rax), %eax
+
+.section .tbss
+.globl a
+.zero 8
+a:
+.zero 4
diff --git a/deps/lld/test/ELF/x86-64-tlsdesc-ld.s b/deps/lld/test/ELF/x86-64-tlsdesc-ld.s
new file mode 100644
index 0000000000000000000000000000000000000000..c478f0baa7ff7b42e101541dee51d709e12df361
--- /dev/null
+++ b/deps/lld/test/ELF/x86-64-tlsdesc-ld.s
@@ -0,0 +1,45 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o
+
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=LD-REL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck --check-prefix=LD %s
+
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-readelf -r %t | FileCheck --check-prefix=NOREL %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=LE %s
+
+## Check _TLS_MODULE_BASE_ used by LD produces a dynamic relocation with a value of 0.
+# LD-REL:      .rela.dyn {
+# LD-REL-NEXT:   0x20A0 R_X86_64_TLSDESC - 0x0
+# LD-REL-NEXT: }
+
+## 0x20a0-0x1007 = 4249
+## dtpoff(a) = 8, dtpoff(b) = 12
+# LD:            leaq 4249(%rip), %rax
+# LD-NEXT: 1007: callq *(%rax)
+# LD-NEXT:       movl %fs:8(%rax), %edx
+# LD-NEXT:       addl %fs:12(%rax), %edx
+
+## When producing an executable, the LD code sequence can be relaxed to LE.
+## It is the same as GD->LE.
+## tpoff(_TLS_MODULE_BASE_) = 0, tpoff(a) = -8, tpoff(b) = -4
+
+# NOREL: no relocations
+
+# LE:      movq $0, %rax
+# LE-NEXT: nop
+# LE-NEXT: movl %fs:-8(%rax), %edx
+# LE-NEXT: addl %fs:-4(%rax), %edx
+
+leaq _TLS_MODULE_BASE_@tlsdesc(%rip), %rax
+call *_TLS_MODULE_BASE_@tlscall(%rax)
+movl %fs:a@dtpoff(%rax), %edx
+addl %fs:b@dtpoff(%rax), %edx
+
+.section .tbss
+.zero 8
+a:
+.zero 4
+b:
+.zero 4
diff --git a/deps/lld/test/ELF/x86-property-relocatable.s b/deps/lld/test/ELF/x86-property-relocatable.s
new file mode 100644
index 0000000000000000000000000000000000000000..12b1e73b4bace124fc012d63de383801480306ef
--- /dev/null
+++ b/deps/lld/test/ELF/x86-property-relocatable.s
@@ -0,0 +1,36 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: ld.lld -r %t.o -o %t2.o
+# RUN: llvm-readelf -n %t2.o | FileCheck -match-full-lines %s
+
+## Test that .note.gnu.property is passed through -r, and that we can handle
+## more than one FEATURE_AND in the same object file. This is logically the
+## same as if the features were combined in a single FEATURE_AND as the rule
+## states that the bit in the output pr_data field if it is set in all
+.text
+ret
+
+.section ".note.gnu.property", "a"
+.p2align 3
+.long 4
+.long 0x10
+.long 0x5
+.asciz "GNU"
+
+.long 0xc0000002 // GNU_PROPERTY_X86_FEATURE_1_AND
+.long 4
+.long 1          // GNU_PROPERTY_X86_FEATURE_1_IBT
+.long 0
+
+.long 4
+.long 0x10
+.long 0x5
+.asciz "GNU"
+.long 0xc0000002 // GNU_PROPERTY_X86_FEATURE_1_AND
+.long 4
+.long 2          // GNU_PROPERTY_X86_FEATURE_1_SHSTK
+.long 0
+
+# CHECK:   Owner                 Data size	Description
+# CHECK-NEXT:   GNU                   0x00000010	NT_GNU_PROPERTY_TYPE_0 (property note)
+# CHECK-NEXT:     Properties:    x86 feature: IBT, SHSTK
diff --git a/deps/lld/test/ELF/znotext-plt-relocations.s b/deps/lld/test/ELF/znotext-plt-relocations.s
index ad305b0c1f6c8a7e96346c871b93ab4589e853f2..3bc1f417cb0e1e02268056693e326f3605c3c702 100644
--- a/deps/lld/test/ELF/znotext-plt-relocations.s
+++ b/deps/lld/test/ELF/znotext-plt-relocations.s
@@ -16,5 +16,6 @@
 
 .text
 _start:
-callq atexit
+.byte 0xe8
+.long atexit - . - 4
 .quad foo
diff --git a/deps/lld/test/ELF/zstack-size.s b/deps/lld/test/ELF/zstack-size.s
index bec2b2057fb7bc889e01d3a983666cdb6e861c94..378a965793526c29e1304fa57295e6855cd8efd4 100644
--- a/deps/lld/test/ELF/zstack-size.s
+++ b/deps/lld/test/ELF/zstack-size.s
@@ -1,13 +1,13 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld -z stack-size=0x1000 %t -o %t1
-# RUN: llvm-readobj -program-headers %t1 | FileCheck %s -check-prefix=CHECK1
+# RUN: llvm-readobj -l %t1 | FileCheck %s -check-prefix=CHECK1
 
 # RUN: ld.lld -z stack-size=0 %t -o %t2
-# RUN: llvm-readobj -program-headers %t2 | FileCheck %s -check-prefix=CHECK2
+# RUN: llvm-readobj -l %t2 | FileCheck %s -check-prefix=CHECK2
 
 # RUN: ld.lld -z stack-size=0x2000 -z stack-size=0x1000 %t -o %t3
-# RUN: llvm-readobj -program-headers %t3 | FileCheck %s -check-prefix=CHECK1
+# RUN: llvm-readobj -l %t3 | FileCheck %s -check-prefix=CHECK1
 
 .global _start
 _start:
diff --git a/deps/lld/test/ELF/ztext.s b/deps/lld/test/ELF/ztext.s
index 1757769b29a20be428209d2940d4765a2c6531ec..d5a249675482639c6fdcd788d0e6513dbccb889d 100644
--- a/deps/lld/test/ELF/ztext.s
+++ b/deps/lld/test/ELF/ztext.s
@@ -4,11 +4,11 @@
 # RUN: ld.lld %t2.o -o %t2.so -shared
 
 # RUN: ld.lld -z notext %t.o %t2.so -o %t -shared
-# RUN: llvm-readobj  -dynamic-table -r %t | FileCheck %s
+# RUN: llvm-readobj  --dynamic-table -r %t | FileCheck %s
 # RUN: ld.lld -z notext %t.o %t2.so -o %t2 -pie
-# RUN: llvm-readobj  -dynamic-table -r %t2 | FileCheck %s
+# RUN: llvm-readobj  --dynamic-table -r %t2 | FileCheck %s
 # RUN: ld.lld -z notext %t.o %t2.so -o %t3
-# RUN: llvm-readobj  -dynamic-table -r %t3 | FileCheck --check-prefix=STATIC %s
+# RUN: llvm-readobj  --dynamic-table -r %t3 | FileCheck --check-prefix=STATIC %s
 
 # RUN: not ld.lld %t.o %t2.so -o %t -shared 2>&1 | FileCheck --check-prefix=ERR %s
 # RUN: not ld.lld -z text %t.o %t2.so -o %t -shared 2>&1 | FileCheck --check-prefix=ERR %s
diff --git a/deps/lld/test/MinGW/driver.test b/deps/lld/test/MinGW/driver.test
index 3222bb1115b85c9e3ec5905e46d333201866b037..cdd802e93f4daf4eeb39a36b6c2678179dac00de 100644
--- a/deps/lld/test/MinGW/driver.test
+++ b/deps/lld/test/MinGW/driver.test
@@ -4,6 +4,9 @@ X86-SAME: -machine:x86
 X86-SAME: -alternatename:__image_base__=___ImageBase
 X86-SAME: foo.o
 
+RUN: echo "-### foo.o -m i386pe" > %t.rsp
+RUN: ld.lld @%t.rsp | FileCheck -check-prefix=X86 %s
+
 RUN: ld.lld -### foo.o -m i386pep | FileCheck -check-prefix=X64 %s
 X64:      -out:a.exe
 X64-SAME: -machine:x64
@@ -54,8 +57,24 @@ MLLVM: -mllvm:bar -mllvm:baz
 
 RUN: ld.lld -### foo.o -m i386pep -subsystem console | FileCheck -check-prefix=SUBSYSTEM %s
 RUN: ld.lld -### foo.o -m i386pep --subsystem console | FileCheck -check-prefix=SUBSYSTEM %s
+RUN: ld.lld -### foo.o -m i386pep -subsystem=console | FileCheck -check-prefix=SUBSYSTEM %s
+RUN: ld.lld -### foo.o -m i386pep --subsystem=console | FileCheck -check-prefix=SUBSYSTEM %s
 SUBSYSTEM: -subsystem:console
 
+RUN: ld.lld -### foo.o -m i386pep --major-os-version 7 --minor-os-version 8 | FileCheck -check-prefix=SUBSYSTEM_VERSION %s
+RUN: ld.lld -### foo.o -m i386pep --major-subsystem-version 7 --minor-subsystem-version 8 | FileCheck -check-prefix=SUBSYSTEM_VERSION %s
+RUN: ld.lld -### foo.o -m i386pep --major-os-version=7 --minor-os-version=8 --major-subsystem-version=7 --minor-subsystem-version=8 | FileCheck -check-prefix=SUBSYSTEM_VERSION %s
+SUBSYSTEM_VERSION: -subsystem:default,7.8
+
+RUN: ld.lld -### foo.o -m i386pep --minor-subsystem-version 8 | FileCheck -check-prefix=SUBSYSTEM_DEFAULT_MAJOR %s
+SUBSYSTEM_DEFAULT_MAJOR: -subsystem:default,6.8
+
+RUN: ld.lld -### foo.o -m i386pep --major-subsystem-version 7 | FileCheck -check-prefix=SUBSYSTEM_DEFAULT_MINOR %s
+SUBSYSTEM_DEFAULT_MINOR: -subsystem:default,7
+
+RUN: ld.lld -### foo.o -m i386pep --subsystem windows --major-os-version 7 --minor-os-version 8 | FileCheck -check-prefix=SUBSYSTEM_WINDOWS %s
+SUBSYSTEM_WINDOWS: -subsystem:windows,7.8
+
 RUN: ld.lld -### foo.o -m i386pep -stack 4194304,8192 | FileCheck -check-prefix=STACK %s
 RUN: ld.lld -### foo.o -m i386pep --stack 4194304,8192 | FileCheck -check-prefix=STACK %s
 STACK: -stack:4194304,8192
@@ -74,6 +93,9 @@ WHOLE-ARCHIVE: foo.o -wholearchive:bar.a baz.a
 RUN: ld.lld -### -m i386pep foo.o | FileCheck -check-prefix MINGW-FLAG %s
 MINGW-FLAG: -lldmingw
 
+RUN: ld.lld -### -m i386pep foo.o --exclude-all-symbols | FileCheck -check-prefix EXCLUDE-ALL %s
+EXCLUDE-ALL: -exclude-all-symbols
+
 RUN: ld.lld -### -m i386pep foo.o --export-all-symbols | FileCheck -check-prefix EXPORT-ALL %s
 EXPORT-ALL: -export-all-symbols
 
@@ -96,9 +118,14 @@ STRIP-DEBUG: -debug:symtab
 STRIP-DEBUG-NOT: -debug:dwarf
 
 RUN: ld.lld -### -m i386pep foo.o -pdb out.pdb | FileCheck -check-prefix PDB %s
+RUN: ld.lld -### -m i386pep foo.o -pdb=out.pdb | FileCheck -check-prefix PDB %s
 PDB: -debug -pdb:out.pdb
 PDB-NOT: -debug:dwarf
 
+RUN: ld.lld -### -m i386pep foo.o -pdb= | FileCheck -check-prefix PDB-DEFAULT %s
+PDB-DEFAULT: -debug
+PDB-DEFAULT-NOT: -pdb:{{.*}}
+
 RUN: ld.lld -### -m i386pep foo.o --large-address-aware | FileCheck -check-prefix LARGE-ADDRESS-AWARE %s
 LARGE-ADDRESS-AWARE: -largeaddressaware
 
@@ -149,5 +176,27 @@ MAP: -lldmap:bar.map
 RUN: ld.lld -### foo.o -m i386pe -require-defined _foo --require-defined _bar -require-defined=_baz --require-defined=_foo2 | FileCheck -check-prefix=REQUIRE-DEFINED %s
 REQUIRE-DEFINED: -include:_foo -include:_bar -include:_baz -include:_foo2
 
+RUN: ld.lld -### foo.o -m i386pe -u _foo --undefined _bar -undefined=_baz --undefined=_foo2 | FileCheck -check-prefix=UNDEFINED %s
+UNDEFINED: -includeoptional:_foo -includeoptional:_bar -includeoptional:_baz -includeoptional:_foo2
+
 RUN: ld.lld -### -m i386pep foo.o -Llibpath | FileCheck -check-prefix LIBPATH %s
 LIBPATH: -libpath:libpath
+
+RUN: ld.lld -### -m i386pep foo.o --no-insert-timestamp | FileCheck -check-prefix NOTIMESTAMP %s
+RUN: ld.lld -### -m i386pep foo.o --insert-timestamp --no-insert-timestamp | FileCheck -check-prefix NOTIMESTAMP %s
+NOTIMESTAMP: -timestamp:0
+RUN: ld.lld -### -m i386pep foo.o --no-insert-timestamp --insert-timestamp | FileCheck -check-prefix TIMESTAMP %s
+TIMESTAMP-NOT: -timestamp:0
+
+RUN: ld.lld -### -m i386pep foo.o -appcontainer | FileCheck -check-prefix APPCONTAINER %s
+RUN: ld.lld -### -m i386pep foo.o --appcontainer | FileCheck -check-prefix APPCONTAINER %s
+APPCONTAINER: -appcontainer
+
+# RUN: ld.lld -m i386pep --version 2>&1 | FileCheck -check-prefix=VERSION %s
+# RUN: ld.lld -m i386pep -v 2>&1 | FileCheck -check-prefix=VERSION %s
+# RUN: not ld.lld -m i386pep -v xyz 2>&1 | FileCheck -check-prefix=VERSION %s
+# VERSION: LLD {{.*}} (compatible with GNU linkers)
+
+# RUN: ld.lld -m i386pep --help 2>&1 | FileCheck -check-prefix=HELP %s
+# HELP: USAGE:
+# HELP: --enable-auto-import
diff --git a/deps/lld/test/lit.cfg.py b/deps/lld/test/lit.cfg.py
index e53ff87400350336809c32efa9a167972980f3bd..267f8c5178584a17b50952b7ecc7458fedbc771e 100644
--- a/deps/lld/test/lit.cfg.py
+++ b/deps/lld/test/lit.cfg.py
@@ -87,16 +87,19 @@ config.environment['LLD_IN_TEST'] = '1'
 # Indirectly check if the mt.exe Microsoft utility exists by searching for
 # cvtres, which always accompanies it.  Alternatively, check if we can use
 # libxml2 to merge manifests.
-if (lit.util.which('cvtres', config.environment['PATH'])) or \
-        (config.llvm_libxml2_enabled == '1'):
+if (lit.util.which('cvtres', config.environment['PATH']) or 
+        config.llvm_libxml2_enabled):
     config.available_features.add('manifest_tool')
 
-if (config.llvm_libxml2_enabled == '1'):
+if config.llvm_libxml2_enabled:
     config.available_features.add('libxml2')
 
 if config.have_dia_sdk:
     config.available_features.add("diasdk")
 
+if config.sizeof_void_p == 8:
+    config.available_features.add("llvm-64-bits")
+
 tar_executable = lit.util.which('tar', config.environment['PATH'])
 if tar_executable:
     tar_version = subprocess.Popen(
diff --git a/deps/lld/test/lit.site.cfg.py.in b/deps/lld/test/lit.site.cfg.py.in
index 7475ac7eaa7f831141f791ca5debd653166e949c..02840f8d6a30361234cf76df06c1de6f72410b43 100644
--- a/deps/lld/test/lit.site.cfg.py.in
+++ b/deps/lld/test/lit.site.cfg.py.in
@@ -7,7 +7,7 @@ config.llvm_src_root = "@LLVM_SOURCE_DIR@"
 config.llvm_obj_root = "@LLVM_BINARY_DIR@"
 config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
 config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
-config.llvm_libxml2_enabled = "@LLVM_LIBXML2_ENABLED@"
+config.llvm_libxml2_enabled = @LLVM_LIBXML2_ENABLED@
 config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
 config.lld_obj_root = "@LLD_BINARY_DIR@"
 config.lld_libs_dir = "@LLVM_LIBRARY_OUTPUT_INTDIR@"
@@ -15,6 +15,7 @@ config.lld_tools_dir = "@LLVM_RUNTIME_OUTPUT_INTDIR@"
 config.target_triple = "@TARGET_TRIPLE@"
 config.python_executable = "@PYTHON_EXECUTABLE@"
 config.have_zlib = @HAVE_LIBZ@
+config.sizeof_void_p = @CMAKE_SIZEOF_VOID_P@
 
 # Support substitution of the tools and libs dirs with user parameters. This is
 # used when we can't determine the tool dir at configuration time.
diff --git a/deps/lld/test/mach-o/arm-interworking.yaml b/deps/lld/test/mach-o/arm-interworking.yaml
index a41355fcb9553311336fb215792ebe9c099be8f0..f58bff2f3d9e4ca1ef0de54a0309caac8eb7aac9 100644
--- a/deps/lld/test/mach-o/arm-interworking.yaml
+++ b/deps/lld/test/mach-o/arm-interworking.yaml
@@ -2,7 +2,7 @@
 # RUN: %p/Inputs/arm-interworking.yaml -o %t  | FileCheck %s \
 # RUN: && ld64.lld -arch armv7 -dylib -print_atoms \
 # RUN:         %p/Inputs/armv7/libSystem.yaml %t -o %t2  | FileCheck %s \
-# RUN: && llvm-readobj -s -sd %t2 | FileCheck -check-prefix=CODE %s
+# RUN: && llvm-readobj -S --section-data %t2 | FileCheck -check-prefix=CODE %s
 #
 # Test thumb and arm branches round trip through -r.
 # Test bl/blx instructions are fixed up properly.
diff --git a/deps/lld/test/mach-o/arm-shims.yaml b/deps/lld/test/mach-o/arm-shims.yaml
index 37e266e6218ef98a45ee1c0b151645a5aad876fc..e4e35283095ef44d920dfce051f0b82227536644 100644
--- a/deps/lld/test/mach-o/arm-shims.yaml
+++ b/deps/lld/test/mach-o/arm-shims.yaml
@@ -1,6 +1,6 @@
 # RUN: ld64.lld -arch armv7 %s %p/Inputs/arm-shims.yaml \
 # RUN: -dylib %p/Inputs/armv7/libSystem.yaml -o %t
-# RUN: llvm-readobj -s -sd %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 #
 # Test b from arm to thumb or vice versa has shims added.s
 #
diff --git a/deps/lld/test/mach-o/exe-offsets.yaml b/deps/lld/test/mach-o/exe-offsets.yaml
index 31b778286bb2abf949ea47f9c52ef492959e1aed..b653f9da377ecf379308054ce0bb5c77019c0045 100644
--- a/deps/lld/test/mach-o/exe-offsets.yaml
+++ b/deps/lld/test/mach-o/exe-offsets.yaml
@@ -1,5 +1,5 @@
 # RUN: ld64.lld -arch x86_64 %s -o %t -e start %p/Inputs/x86_64/libSystem.yaml
-# RUN: llvm-readobj -sections %t | FileCheck %s
+# RUN: llvm-readobj --sections %t | FileCheck %s
 
 # Make sure data gets put at offset
 
diff --git a/deps/lld/test/mach-o/exe-segment-overlap.yaml b/deps/lld/test/mach-o/exe-segment-overlap.yaml
index b2ded264f4b0486a0ff530cafa82e3bb53e04af0..ac99859d4ebae492e96d6640d9b2c123190e1e02 100644
--- a/deps/lld/test/mach-o/exe-segment-overlap.yaml
+++ b/deps/lld/test/mach-o/exe-segment-overlap.yaml
@@ -1,5 +1,5 @@
 # RUN: ld64.lld -arch x86_64 %s -o %t %p/Inputs/x86_64/libSystem.yaml
-# RUN: llvm-readobj -sections -section-data %t | FileCheck %s
+# RUN: llvm-readobj --sections --section-data %t | FileCheck %s
 
 --- !native
 defined-atoms:
diff --git a/deps/lld/test/mach-o/executable-exports.yaml b/deps/lld/test/mach-o/executable-exports.yaml
index 46ba9ca6d1d4d0a103657af8f5feaa6255cd240a..83d9c210173e918ce76118131ecf6cef7d903e0e 100644
--- a/deps/lld/test/mach-o/executable-exports.yaml
+++ b/deps/lld/test/mach-o/executable-exports.yaml
@@ -1,6 +1,6 @@
 # RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 \
 # RUN:      %s %p/Inputs/x86_64/libSystem.yaml -o %t  && \
-# RUN: llvm-objdump -exports-trie %t | FileCheck %s
+# RUN: llvm-objdump -macho -exports-trie %t | FileCheck %s
 #
 #
 # Tests that exports trie builds properly.
diff --git a/deps/lld/test/mach-o/export-trie-order.yaml b/deps/lld/test/mach-o/export-trie-order.yaml
index 53ee8afae660e962250d3bf52c1f97aa061d5e8b..1b1fc392bf25fab1ec90de1f9c991cf2a491e337 100644
--- a/deps/lld/test/mach-o/export-trie-order.yaml
+++ b/deps/lld/test/mach-o/export-trie-order.yaml
@@ -1,5 +1,5 @@
 # RUN: ld64.lld -arch i386 %s %p/Inputs/hello-world-x86.yaml -o %t
-# RUN: llvm-objdump -exports-trie %t | FileCheck %s
+# RUN: llvm-objdump -macho -exports-trie %t | FileCheck %s
 #
 # Test that the export trie is emitted in order.
 #
diff --git a/deps/lld/test/mach-o/got-order.yaml b/deps/lld/test/mach-o/got-order.yaml
index f7984741e5190fcb8d85f5810a09588e9f7dbafe..f2488f089a62cf1886263db700200fbf70c5cbf4 100644
--- a/deps/lld/test/mach-o/got-order.yaml
+++ b/deps/lld/test/mach-o/got-order.yaml
@@ -1,6 +1,6 @@
 # RUN: ld64.lld -arch x86_64  %s %p/Inputs/got-order.yaml \
 # RUN: %p/Inputs/got-order2.yaml -o %t %p/Inputs/x86_64/libSystem.yaml
-# RUN: llvm-objdump -bind %t | FileCheck %s
+# RUN: llvm-objdump -macho -bind %t | FileCheck %s
 #
 # Test that GOT slots are sorted by name
 #
diff --git a/deps/lld/test/mach-o/image-base.yaml b/deps/lld/test/mach-o/image-base.yaml
index f0eb68096604e90ce9483af9eb37ba2543a7f4e5..c184e1c3e1039a98c6264f87f5a5c7bcd7ffc826 100644
--- a/deps/lld/test/mach-o/image-base.yaml
+++ b/deps/lld/test/mach-o/image-base.yaml
@@ -1,5 +1,5 @@
 # RUN: ld64.lld -arch x86_64 -macosx_version_min 10.9 %s -o %t -image_base 31415926000 %p/Inputs/x86_64/libSystem.yaml
-# RUN: llvm-readobj -macho-segment %t | FileCheck %s
+# RUN: llvm-readobj --macho-segment %t | FileCheck %s
 # RUN: not ld64.lld -arch x86_64 -image_base 0x31415926530 %s >/dev/null 2> %t
 # RUN: FileCheck < %t %s --check-prefix=CHECK-ERROR-MISPAGED
 # RUN: not ld64.lld -arch x86_64 -image_base 1000 %s >/dev/null 2> %t
diff --git a/deps/lld/test/mach-o/lazy-bind-x86_64.yaml b/deps/lld/test/mach-o/lazy-bind-x86_64.yaml
index 37b8c31a9552a21d62275a138f9624f998b8d825..de97565d5469b0b0a06533835156cbb272e6e36f 100644
--- a/deps/lld/test/mach-o/lazy-bind-x86_64.yaml
+++ b/deps/lld/test/mach-o/lazy-bind-x86_64.yaml
@@ -4,7 +4,7 @@
 # RUN: %p/Inputs/lazy-bind-x86_64.yaml  %p/Inputs/lazy-bind-x86_64-2.yaml \
 # RUN: %p/Inputs/lazy-bind-x86_64-3.yaml -o %t  \
 # RUN:   %p/Inputs/x86_64/libSystem.yaml
-# RUN: llvm-objdump -lazy-bind %t | FileCheck %s
+# RUN: llvm-objdump -macho -lazy-bind %t | FileCheck %s
 # RUN: llvm-nm -m %t | FileCheck --check-prefix=CHECK-NM %s
 # RUN: llvm-objdump -disassemble %t | FileCheck --check-prefix=CHECK-HELPERS %s
 # RUN: llvm-objdump -private-headers %t | FileCheck --check-prefix=CHECK-DYLIBS %s
diff --git a/deps/lld/test/mach-o/load-commands-size.yaml b/deps/lld/test/mach-o/load-commands-size.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d1b4dd396f4a299d3dab1278eeff9c09c04c7916
--- /dev/null
+++ b/deps/lld/test/mach-o/load-commands-size.yaml
@@ -0,0 +1,305 @@
+# RUN: ld64.lld -arch x86_64 %s -o %t -dylib \
+# RUN: -macosx_version_min 10.10 -sdk_version 10.10 \
+# RUN: -install_name /usr/lib/foo.dylib \
+# RUN: %p/Inputs/x86_64/libSystem.yaml && \
+# RUN: llvm-readobj %t
+
+# (Tests that lld doesn't crash or produce an invalid file.)
+
+--- !native
+path:            '<linker-internal>'
+defined-atoms:
+  - name:            _foo
+    scope:           global
+    type:            unknown
+    content:         [ 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+                       00, 00, 00, 00 ]
+    alignment:       16
+    section-choice:  custom-required
+    section-name:    '__TEXT/__foo'
diff --git a/deps/lld/test/mach-o/sectalign.yaml b/deps/lld/test/mach-o/sectalign.yaml
index b788d422bbb8febcf8522d44f88c2409a897ff54..9c6c0ccbfef4672a3d8454f3cf56214b59655dfc 100644
--- a/deps/lld/test/mach-o/sectalign.yaml
+++ b/deps/lld/test/mach-o/sectalign.yaml
@@ -1,7 +1,7 @@
 # RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -dylib \
 # RUN:    -sectalign __DATA __custom 0x800 -sectalign __TEXT __text 0x400 \
 # RUN:    %p/Inputs/x86_64/libSystem.yaml -o %t \
-# RUN: && llvm-readobj -sections %t | FileCheck %s
+# RUN: && llvm-readobj --sections %t | FileCheck %s
 #
 # Test -sectalign option on __text and a custom section.
 #
diff --git a/deps/lld/test/mach-o/subsections-via-symbols-default.yaml b/deps/lld/test/mach-o/subsections-via-symbols-default.yaml
index a9bb4236875e0b7e05dc230618a5cc55510bc4cc..fe28a7fa3f99df3075644d51014eb62504c2245d 100644
--- a/deps/lld/test/mach-o/subsections-via-symbols-default.yaml
+++ b/deps/lld/test/mach-o/subsections-via-symbols-default.yaml
@@ -1,5 +1,5 @@
 # RUN: ld64.lld -ios_simulator_version_min 5.0 -arch x86_64 -r %s -o %t
-# RUN: llvm-readobj -file-headers %t | FileCheck %s
+# RUN: llvm-readobj --file-headers %t | FileCheck %s
 
 # Make sure that we have an objc image info in the output.  It should have
 # been generated by the objc pass.
diff --git a/deps/lld/test/mach-o/write-final-sections.yaml b/deps/lld/test/mach-o/write-final-sections.yaml
index b39127139f80bdd6a58fabde9895d7b39e944f7d..204203a9189450cf138f8b14a55cd67bee9c2d25 100644
--- a/deps/lld/test/mach-o/write-final-sections.yaml
+++ b/deps/lld/test/mach-o/write-final-sections.yaml
@@ -1,6 +1,6 @@
 # RUN: ld64.lld -arch x86_64 %s %p/Inputs/write-final-sections.yaml \
 # RUN: -o %t -e _foo
-# RUN: llvm-readobj -sections -section-data %t | FileCheck %s
+# RUN: llvm-readobj --sections --section-data %t | FileCheck %s
 
 --- !native
 defined-atoms:
diff --git a/deps/lld/test/wasm/Inputs/call-ret32.ll b/deps/lld/test/wasm/Inputs/call-ret32.ll
new file mode 100644
index 0000000000000000000000000000000000000000..90cbf9684573c3dfa71f512faebee2f2d2a03db3
--- /dev/null
+++ b/deps/lld/test/wasm/Inputs/call-ret32.ll
@@ -0,0 +1,11 @@
+target triple = "wasm32-unknown-unknown"
+
+@ret32_address = global i32 (float)* @ret32, align 4
+
+define hidden i32* @call_ret32() {
+entry:
+  %call1 = call i32 @ret32(float 0.000000e+00)
+  ret i32* bitcast (i32 (float)** @ret32_address to i32*)
+}
+
+declare i32 @ret32(float)
diff --git a/deps/lld/test/wasm/Inputs/comdat1.ll b/deps/lld/test/wasm/Inputs/comdat1.ll
index 12678b0eeff760dc4290b57355ba117b0606c5f8..34f7f161d10cda099eb68911b4151390d3433e53 100644
--- a/deps/lld/test/wasm/Inputs/comdat1.ll
+++ b/deps/lld/test/wasm/Inputs/comdat1.ll
@@ -1,13 +1,22 @@
 target triple = "wasm32-unknown-unknown"
 
-$inlineFn = comdat any
-@constantData = weak_odr constant [3 x i8] c"abc", comdat($inlineFn)
-define linkonce_odr i32 @inlineFn() comdat {
-entry:
+$foo = comdat any
+
+@constantData = constant [3 x i8] c"abc", comdat($foo)
+
+define i32 @comdatFn() comdat($foo) {
   ret i32 ptrtoint ([3 x i8]* @constantData to i32)
 }
 
-define i32 @callInline1() {
-entry:
-    ret i32 ptrtoint (i32 ()* @inlineFn to i32)
+define internal void @do_init() comdat($foo) {
+  ret void
+}
+
+%0 = type { i32, void ()*, i8* }
+@llvm.global_ctors = appending global [1 x %0 ] [%0 { i32 65535, void ()* @do_init, i8* null }]
+
+; Everything above this is part of the `foo` comdat group
+
+define i32 @callComdatFn1() {
+    ret i32 ptrtoint (i32 ()* @comdatFn to i32)
 }
diff --git a/deps/lld/test/wasm/Inputs/comdat2.ll b/deps/lld/test/wasm/Inputs/comdat2.ll
index d910e1afcdfc374264711f6ffbabe65d615b8f88..b1478ad7c3210037f12af9c61fe3ba92a71804bb 100644
--- a/deps/lld/test/wasm/Inputs/comdat2.ll
+++ b/deps/lld/test/wasm/Inputs/comdat2.ll
@@ -1,13 +1,22 @@
 target triple = "wasm32-unknown-unknown"
 
-$inlineFn = comdat any
-@constantData = weak_odr constant [3 x i8] c"abc", comdat($inlineFn)
-define linkonce_odr i32 @inlineFn() comdat {
-entry:
+$foo = comdat any
+
+@constantData = constant [3 x i8] c"abc", comdat($foo)
+
+define i32 @comdatFn() comdat($foo) {
   ret i32 ptrtoint ([3 x i8]* @constantData to i32)
 }
 
-define i32 @callInline2() {
-entry:
-  ret i32 ptrtoint (i32 ()* @inlineFn to i32)
+define internal void @do_init() comdat($foo) {
+  ret void
+}
+
+%0 = type { i32, void ()*, i8* }
+@llvm.global_ctors = appending global [1 x %0] [ %0 { i32 65535, void ()* @do_init, i8* getelementptr inbounds ([3 x i8], [3 x i8]* @constantData, i32 0, i32 0) }]
+
+; Everything above this is part of the `foo` comdat group
+
+define i32 @callComdatFn2() {
+  ret i32 ptrtoint (i32 ()* @comdatFn to i32)
 }
diff --git a/deps/lld/test/wasm/Inputs/disallow-feature-foo.yaml b/deps/lld/test/wasm/Inputs/disallow-feature-foo.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f4f987ef090a8324fdb928e1acb878b781a53e49
--- /dev/null
+++ b/deps/lld/test/wasm/Inputs/disallow-feature-foo.yaml
@@ -0,0 +1,13 @@
+--- !WASM
+FileHeader:
+  Version:         0x00000001
+Sections:
+  - Type:            CUSTOM
+    Name:            linking
+    Version:         2
+  - Type:            CUSTOM
+    Name:            target_features
+    Features:
+      - Prefix:        DISALLOWED
+        Name:          "foo"
+...
diff --git a/deps/lld/test/wasm/Inputs/explicit-section.ll b/deps/lld/test/wasm/Inputs/explicit-section.ll
new file mode 100644
index 0000000000000000000000000000000000000000..6d3e66a8450558da8a7d5aca047f51ad9f658535
--- /dev/null
+++ b/deps/lld/test/wasm/Inputs/explicit-section.ll
@@ -0,0 +1,4 @@
+target triple = "wasm32-unknown-unknown"
+
+@var1 = global i32 42, section "mysection", align 4
+@var2 = global i32 43, section "mysection", align 4
diff --git a/deps/lld/test/wasm/Inputs/globals.yaml b/deps/lld/test/wasm/Inputs/globals.yaml
index a2c4602294efa736455a79ffd8abd8c18e4434f6..6f632262785d35c40c4d1936007a07d5e8d1ad3f 100644
--- a/deps/lld/test/wasm/Inputs/globals.yaml
+++ b/deps/lld/test/wasm/Inputs/globals.yaml
@@ -29,7 +29,7 @@ Sections:
         Locals:
         Body:            2381808080000B
     Relocations:
-      - Type:            R_WEBASSEMBLY_GLOBAL_INDEX_LEB
+      - Type:            R_WASM_GLOBAL_INDEX_LEB
         Index:           1
         Offset:          0x00000004
   - Type:            CUSTOM
diff --git a/deps/lld/test/wasm/Inputs/no-feature-foo.yaml b/deps/lld/test/wasm/Inputs/no-feature-foo.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6456d0427072224037cc44ccdf1cdb0c9d78bca4
--- /dev/null
+++ b/deps/lld/test/wasm/Inputs/no-feature-foo.yaml
@@ -0,0 +1,11 @@
+--- !WASM
+FileHeader:
+  Version:         0x00000001
+Sections:
+  - Type:            CUSTOM
+    Name:            linking
+    Version:         2
+  - Type:            CUSTOM
+    Name:            target_features
+    Features:        [ ]
+...
diff --git a/deps/lld/test/wasm/Inputs/require-feature-foo.yaml b/deps/lld/test/wasm/Inputs/require-feature-foo.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..cf42b79fa4bba2c2b44c90bf3e86614faceb5b3b
--- /dev/null
+++ b/deps/lld/test/wasm/Inputs/require-feature-foo.yaml
@@ -0,0 +1,13 @@
+--- !WASM
+FileHeader:
+  Version:         0x00000001
+Sections:
+  - Type:            CUSTOM
+    Name:            linking
+    Version:         2
+  - Type:            CUSTOM
+    Name:            target_features
+    Features:
+      - Prefix:        REQUIRED
+        Name:          "foo"
+...
diff --git a/deps/lld/test/wasm/Inputs/undefined-globals.yaml b/deps/lld/test/wasm/Inputs/undefined-globals.yaml
index 49cf8811f8129b5420b0b037700855c222a00473..fd5a2361c9f55937bbe61aecf8592575e4442118 100644
--- a/deps/lld/test/wasm/Inputs/undefined-globals.yaml
+++ b/deps/lld/test/wasm/Inputs/undefined-globals.yaml
@@ -27,7 +27,7 @@ Sections:
         Locals:
         Body:            2381808080000B
     Relocations:
-      - Type:            R_WEBASSEMBLY_GLOBAL_INDEX_LEB
+      - Type:            R_WASM_GLOBAL_INDEX_LEB
         Index:           1
         Offset:          0x00000004
   - Type:            CUSTOM
diff --git a/deps/lld/test/wasm/Inputs/use-feature-foo.yaml b/deps/lld/test/wasm/Inputs/use-feature-foo.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..0d1203454c058c388c68869349ce9bb53fe63528
--- /dev/null
+++ b/deps/lld/test/wasm/Inputs/use-feature-foo.yaml
@@ -0,0 +1,13 @@
+--- !WASM
+FileHeader:
+  Version:         0x00000001
+Sections:
+  - Type:            CUSTOM
+    Name:            linking
+    Version:         2
+  - Type:            CUSTOM
+    Name:            target_features
+    Features:
+      - Prefix:        USED
+        Name:          "foo"
+...
diff --git a/deps/lld/test/wasm/alias.ll b/deps/lld/test/wasm/alias.ll
index 358582ea1520e3537ce4373c5a3eecd07f0aa539..e20e648731cb986984eee70d3a10f5566ddaedfb 100644
--- a/deps/lld/test/wasm/alias.ll
+++ b/deps/lld/test/wasm/alias.ll
@@ -22,7 +22,7 @@ entry:
 ; CHECK-NEXT:         ReturnType:      NORESULT
 ; CHECK-NEXT:         ParamTypes:
 ; CHECK-NEXT:   - Type:            FUNCTION
-; CHECK-NEXT:     FunctionTypes:   [ 0, 0 ]
+; CHECK-NEXT:     FunctionTypes:   [ 0 ]
 ; CHECK-NEXT:   - Type:            TABLE
 ; CHECK-NEXT:     Tables:
 ; CHECK-NEXT:       - ElemType:        FUNCREF
@@ -41,48 +41,25 @@ entry:
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           66560
-; CHECK-NEXT:       - Index:           1
-; CHECK-NEXT:         Type:            I32
-; CHECK-NEXT:         Mutable:         false
-; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           66560
-; CHECK-NEXT:       - Index:           2
-; CHECK-NEXT:         Type:            I32
-; CHECK-NEXT:         Mutable:         false
-; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           1024
 ; CHECK-NEXT:   - Type:            EXPORT
 ; CHECK-NEXT:     Exports:
 ; CHECK-NEXT:       - Name:            memory
 ; CHECK-NEXT:         Kind:            MEMORY
 ; CHECK-NEXT:         Index:           0
-; CHECK-NEXT:       - Name:            __heap_base
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           1
-; CHECK-NEXT:       - Name:            __data_end
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            _start
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           1
+; CHECK-NEXT:         Index:           0
 ; CHECK-NEXT:       - Name:            start_alias
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           1
+; CHECK-NEXT:         Index:           0
 ; CHECK-NEXT:   - Type:            CODE
 ; CHECK-NEXT:     Functions:
 ; CHECK-NEXT:       - Index:           0
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            0B
-; CHECK-NEXT:       - Index:           1
-; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            0B
 ; CHECK-NEXT:   - Type:            CUSTOM
 ; CHECK-NEXT:     Name:            name
 ; CHECK-NEXT:     FunctionNames:
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            __wasm_call_ctors
-; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            _start
 ; CHECK-NEXT: ...
diff --git a/deps/lld/test/wasm/archive-export.ll b/deps/lld/test/wasm/archive-export.ll
index 37256ce37244b7f50474c2402cd31ddb915e2ad4..664f7761e61fa7dceeb140df47a9d0385d3dc011 100644
--- a/deps/lld/test/wasm/archive-export.ll
+++ b/deps/lld/test/wasm/archive-export.ll
@@ -14,37 +14,25 @@ CHECK:         Exports:
 CHECK-NEXT:       - Name:            memory
 CHECK-NEXT:         Kind:            MEMORY
 CHECK-NEXT:         Index:           0
-CHECK-NEXT:       - Name:            __heap_base
-CHECK-NEXT:         Kind:            GLOBAL
-CHECK-NEXT:         Index:           1
-CHECK-NEXT:       - Name:            __data_end
-CHECK-NEXT:         Kind:            GLOBAL
-CHECK-NEXT:         Index:           2
 CHECK-NEXT:       - Name:            foo
 CHECK-NEXT:         Kind:            FUNCTION
-CHECK-NEXT:         Index:           2
+CHECK-NEXT:         Index:           1
 CHECK-NEXT:       - Name:            bar
 CHECK-NEXT:         Kind:            FUNCTION
-CHECK-NEXT:         Index:           3
+CHECK-NEXT:         Index:           2
 CHECK-NEXT:       - Name:            archive2_symbol
 CHECK-NEXT:         Kind:            FUNCTION
-CHECK-NEXT:         Index:           4
+CHECK-NEXT:         Index:           3
 CHECK-NEXT:       - Name:            _start
 CHECK-NEXT:         Kind:            FUNCTION
-CHECK-NEXT:         Index:           1
+CHECK-NEXT:         Index:           0
 CHECK-NEXT:   - Type:            CODE
 
 NOEXPORT:         Exports:
 NOEXPORT-NEXT:       - Name:            memory
 NOEXPORT-NEXT:         Kind:            MEMORY
 NOEXPORT-NEXT:         Index:           0
-NOEXPORT-NEXT:       - Name:            __heap_base
-NOEXPORT-NEXT:         Kind:            GLOBAL
-NOEXPORT-NEXT:         Index:           1
-NOEXPORT-NEXT:       - Name:            __data_end
-NOEXPORT-NEXT:         Kind:            GLOBAL
-NOEXPORT-NEXT:         Index:           2
 NOEXPORT-NEXT:       - Name:            _start
 NOEXPORT-NEXT:         Kind:            FUNCTION
-NOEXPORT-NEXT:         Index:           1
+NOEXPORT-NEXT:         Index:           0
 NOEXPORT-NEXT:   - Type:            CODE
diff --git a/deps/lld/test/wasm/archive-no-index.ll b/deps/lld/test/wasm/archive-no-index.ll
new file mode 100644
index 0000000000000000000000000000000000000000..237fd93dcd6c4dd465106743e9026e4360d98a60
--- /dev/null
+++ b/deps/lld/test/wasm/archive-no-index.ll
@@ -0,0 +1,13 @@
+; Tests error on archive file without a symbol table
+; RUN: llvm-as -o %t.o %s
+; RUN: llvm-as -o %t.archive.o %S/Inputs/archive1.ll
+; RUN: rm -f %t.a
+; RUN: llvm-ar crS %t.a %t.archive.o
+
+; RUN: not wasm-ld -o out.wasm %t.o %t.a 2>&1 | FileCheck %s
+
+define i32 @_start() {
+  ret i32 0
+}
+
+; CHECK: archive has no index; run ranlib to add one
diff --git a/deps/lld/test/wasm/archive-weak-undefined.ll b/deps/lld/test/wasm/archive-weak-undefined.ll
new file mode 100644
index 0000000000000000000000000000000000000000..0285724e5b86cb415f4f95c4452bd968ac6ea9c2
--- /dev/null
+++ b/deps/lld/test/wasm/archive-weak-undefined.ll
@@ -0,0 +1,19 @@
+; RUN: llc -filetype=obj %s -o %t.o
+; RUN: llc -filetype=obj %S/Inputs/ret32.ll -o %t.a1.o
+; RUN: rm -f %t.a
+; RUN: llvm-ar rcs %t.a %t.a1.o
+; RUN: wasm-ld %t.o %t.a -o %t.wasm
+; RUN: obj2yaml %t.wasm | FileCheck %s
+
+target triple = "wasm32-unknown-unknown"
+
+declare extern_weak i32 @ret32()
+
+define void @_start() {
+entry:
+  %call1 = call i32 @ret32()
+  ret void
+}
+
+; CHECK: Name: 'undefined:ret32'
+; CHECK-NOT: Name: ret32
diff --git a/deps/lld/test/wasm/archive.ll b/deps/lld/test/wasm/archive.ll
index beea2725cff97788051b277bb67ce65e3c388858..84054536a92dfc8e7fbafcfefda96f27a1bac89b 100644
--- a/deps/lld/test/wasm/archive.ll
+++ b/deps/lld/test/wasm/archive.ll
@@ -33,10 +33,10 @@ entry:
 ; TODO(ncw): Update LLD so that the symbol table is written out for
 ;   non-relocatable output (with an option to strip it)
 
-; CHECK:      00000004 T _start
-; CHECK-NEXT: 00000002 T archive2_symbol
+; CHECK:      00000016 T _start
+; CHECK-NEXT: 0000000a T archive2_symbol
 ; CHECK-NEXT: 00000001 T bar
-; CHECK-NEXT: 00000003 T foo
+; CHECK-NEXT: 0000000d T foo
 ; CHECK-NEXT:          U missing_func
 
 ; Verify that symbols from unused objects don't appear in the symbol table
@@ -47,6 +47,8 @@ entry:
 
 ; Verfiy errors include library name
 ; RUN: not wasm-ld -u archive2_symbol -u archive3_symbol %t.a %t.o -o %t.wasm 2>&1 | FileCheck -check-prefix=CHECK-DUP %s
+; And that this also works with --whole-archive
+; RUN: not wasm-ld -u archive2_symbol -u archive3_symbol --whole-archive %t.a %t.o -o %t.wasm 2>&1 | FileCheck -check-prefix=CHECK-DUP %s
 ; CHECK-DUP: error: duplicate symbol: bar
 ; CHECK-DUP: >>> defined in {{.*}}.a({{.*}}.a2.o)
 ; CHECK-DUP: >>> defined in {{.*}}.a({{.*}}.a3.o)
diff --git a/deps/lld/test/wasm/call-indirect.ll b/deps/lld/test/wasm/call-indirect.ll
index 7f8fe474f414d48efe336b8906892532eaa82c7e..b0bbc4aeb44caef1f3b124b9f17503246d2cd329 100644
--- a/deps/lld/test/wasm/call-indirect.ll
+++ b/deps/lld/test/wasm/call-indirect.ll
@@ -57,7 +57,7 @@ define void @call_ptr(i64 (i64)* %arg) {
 ; CHECK-NEXT:         ParamTypes:
 ; CHECK-NEXT:           - I32
 ; CHECK-NEXT:   - Type:            FUNCTION
-; CHECK-NEXT:     FunctionTypes:   [ 3, 0, 3, 1, 3, 4 ]
+; CHECK-NEXT:     FunctionTypes:   [ 0, 3, 1, 3, 4 ]
 ; CHECK-NEXT:   - Type:            TABLE
 ; CHECK-NEXT:     Tables:
 ; CHECK-NEXT:       - ElemType:        FUNCREF
@@ -81,80 +81,59 @@ define void @call_ptr(i64 (i64)* %arg) {
 ; CHECK-NEXT:         Mutable:         false
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           66576
-; CHECK-NEXT:       - Index:           2
-; CHECK-NEXT:         Type:            I32
-; CHECK-NEXT:         Mutable:         false
-; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           1036
-; CHECK-NEXT:       - Index:           3
-; CHECK-NEXT:         Type:            I32
-; CHECK-NEXT:         Mutable:         false
-; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1032
 ; CHECK-NEXT:   - Type:            EXPORT
 ; CHECK-NEXT:     Exports:
 ; CHECK-NEXT:       - Name:            memory
 ; CHECK-NEXT:         Kind:            MEMORY
 ; CHECK-NEXT:         Index:           0
-; CHECK-NEXT:       - Name:            __heap_base
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           1
-; CHECK-NEXT:       - Name:            __data_end
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            bar
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           1
+; CHECK-NEXT:         Index:           0
 ; CHECK-NEXT:       - Name:            call_bar_indirect
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           2
+; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:       - Name:            foo
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           3
+; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            _start
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           4
+; CHECK-NEXT:         Index:           3
 ; CHECK-NEXT:       - Name:            indirect_func
 ; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           3
+; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:       - Name:            call_ptr
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           5
+; CHECK-NEXT:         Index:           4
 ; CHECK-NEXT:   - Type:            ELEM
 ; CHECK-NEXT:     Segments:
 ; CHECK-NEXT:       - Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1
-; CHECK-NEXT:         Functions:       [ 1, 3 ]
+; CHECK-NEXT:         Functions:       [ 0, 2 ]
 ; CHECK-NEXT:   - Type:            CODE
 ; CHECK-NEXT:     Functions:
 ; CHECK-NEXT:       - Index:           0
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            0B
-; CHECK-NEXT:       - Index:           1
-; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            42010B
-; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:            - Type:            I32
 ; CHECK-NEXT:              Count:           1
 ; CHECK-NEXT:          Body:            4100280284888080002100410028028088808000118080808000001A2000118180808000001A0B
-; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:       - Index:           2
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            41020B
-; CHECK-NEXT:       - Index:           4
+; CHECK-NEXT:       - Index:           3
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            410028028888808000118180808000001A0B
-; CHECK-NEXT:       - Index:           5
+; CHECK-NEXT:       - Index:           4
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            42012000118280808000001A0B
 ; CHECK-NEXT:   - Type:            DATA
 ; CHECK-NEXT:     Segments:
 ; CHECK-NEXT:       - SectionOffset:    7
-; CHECK-NEXT:         MemoryIndex:      0
+; CHECK-NEXT:         InitFlags:        0
 ; CHECK-NEXT:         Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1024
@@ -163,15 +142,13 @@ define void @call_ptr(i64 (i64)* %arg) {
 ; CHECK-NEXT:     Name:            name
 ; CHECK-NEXT:     FunctionNames:
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            __wasm_call_ctors
-; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            bar
-; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            call_bar_indirect
-; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:       - Index:           2
 ; CHECK-NEXT:         Name:            foo
-; CHECK-NEXT:       - Index:           4
+; CHECK-NEXT:       - Index:           3
 ; CHECK-NEXT:         Name:            _start
-; CHECK-NEXT:       - Index:           5
+; CHECK-NEXT:       - Index:           4
 ; CHECK-NEXT:         Name:            call_ptr
 ; CHECK-NEXT: ...
diff --git a/deps/lld/test/wasm/comdats.ll b/deps/lld/test/wasm/comdats.ll
index 9baea22050efb7b1fe06f8a0a3b221fd1536f598..8fc301e9a10e02e4480c16e87b889d4778e21427 100644
--- a/deps/lld/test/wasm/comdats.ll
+++ b/deps/lld/test/wasm/comdats.ll
@@ -6,11 +6,13 @@
 
 target triple = "wasm32-unknown-unknown"
 
-declare i32 @inlineFn()
+declare void @__wasm_call_ctors()
+declare i32 @comdatFn()
 
-define void @_start() local_unnamed_addr {
+define void @_start() {
 entry:
-  %call = call i32 @inlineFn()
+  call void @__wasm_call_ctors()
+  %call = call i32 @comdatFn()
   ret void
 }
 
@@ -27,45 +29,27 @@ entry:
 ; CHECK-NEXT:        Mutable:         false
 ; CHECK-NEXT:        InitExpr:
 ; CHECK-NEXT:          Opcode:          I32_CONST
-; CHECK-NEXT:          Value:           66576
-; CHECK-NEXT:      - Index:           2
-; CHECK-NEXT:        Type:            I32
-; CHECK-NEXT:        Mutable:         false
-; CHECK-NEXT:        InitExpr:
-; CHECK-NEXT:          Opcode:          I32_CONST
-; CHECK-NEXT:          Value:           1027
-; CHECK-NEXT:      - Index:           3
-; CHECK-NEXT:        Type:            I32
-; CHECK-NEXT:        Mutable:         false
-; CHECK-NEXT:        InitExpr:
-; CHECK-NEXT:          Opcode:          I32_CONST
 ; CHECK-NEXT:          Value:           1024
 ; CHECK-NEXT:  - Type:            EXPORT
 ; CHECK-NEXT:    Exports:
 ; CHECK-NEXT:      - Name:            memory
 ; CHECK-NEXT:        Kind:            MEMORY
 ; CHECK-NEXT:        Index:           0
-; CHECK-NEXT:      - Name:            __heap_base
-; CHECK-NEXT:        Kind:            GLOBAL
-; CHECK-NEXT:        Index:           1
-; CHECK-NEXT:      - Name:            __data_end
-; CHECK-NEXT:        Kind:            GLOBAL
-; CHECK-NEXT:        Index:           2
 ; CHECK-NEXT:      - Name:            _start
 ; CHECK-NEXT:        Kind:            FUNCTION
 ; CHECK-NEXT:        Index:           1
-; CHECK-NEXT:      - Name:            inlineFn
+; CHECK-NEXT:      - Name:            comdatFn
 ; CHECK-NEXT:        Kind:            FUNCTION
 ; CHECK-NEXT:        Index:           2
 ; CHECK-NEXT:      - Name:            constantData
 ; CHECK-NEXT:        Kind:            GLOBAL
-; CHECK-NEXT:        Index:           3
-; CHECK-NEXT:      - Name:            callInline1
-; CHECK-NEXT:        Kind:            FUNCTION
-; CHECK-NEXT:        Index:           3
-; CHECK-NEXT:      - Name:            callInline2
+; CHECK-NEXT:        Index:           1
+; CHECK-NEXT:      - Name:            callComdatFn1
 ; CHECK-NEXT:        Kind:            FUNCTION
 ; CHECK-NEXT:        Index:           4
+; CHECK-NEXT:      - Name:            callComdatFn2
+; CHECK-NEXT:        Kind:            FUNCTION
+; CHECK-NEXT:        Index:           5
 ; CHECK-NEXT:  - Type:            ELEM
 ; CHECK-NEXT:    Segments:
 ; CHECK-NEXT:      - Offset:
@@ -76,23 +60,26 @@ entry:
 ; CHECK-NEXT:    Functions:
 ; CHECK-NEXT:      - Index:           0
 ; CHECK-NEXT:        Locals:
-; CHECK-NEXT:        Body:            0B
+; CHECK-NEXT:        Body:            10030B
 ; CHECK-NEXT:      - Index:           1
 ; CHECK-NEXT:        Locals:
-; CHECK-NEXT:        Body:            1082808080001A0B
+; CHECK-NEXT:        Body:            1080808080001082808080001A0B
 ; CHECK-NEXT:      - Index:           2
 ; CHECK-NEXT:        Locals:
 ; CHECK-NEXT:        Body:            4180888080000B
 ; CHECK-NEXT:      - Index:           3
 ; CHECK-NEXT:        Locals:
-; CHECK-NEXT:        Body:            4181808080000B
+; CHECK-NEXT:        Body:            0B
 ; CHECK-NEXT:      - Index:           4
 ; CHECK-NEXT:        Locals:
 ; CHECK-NEXT:        Body:            4181808080000B
+; CHECK-NEXT:      - Index:           5
+; CHECK-NEXT:        Locals:
+; CHECK-NEXT:        Body:            4181808080000B
 ; CHECK-NEXT:  - Type:            DATA
 ; CHECK-NEXT:    Segments:
 ; CHECK-NEXT:      - SectionOffset:   7
-; CHECK-NEXT:        MemoryIndex:     0
+; CHECK-NEXT:        InitFlags:       0
 ; CHECK-NEXT:        Offset:
 ; CHECK-NEXT:          Opcode:          I32_CONST
 ; CHECK-NEXT:          Value:           1024
diff --git a/deps/lld/test/wasm/corrupted.wasm.test b/deps/lld/test/wasm/corrupted.wasm.test
new file mode 100644
index 0000000000000000000000000000000000000000..988e0d5eec477674c451335e31ca6d4bc9476651
Binary files /dev/null and b/deps/lld/test/wasm/corrupted.wasm.test differ
diff --git a/deps/lld/test/wasm/cxx-mangling.ll b/deps/lld/test/wasm/cxx-mangling.ll
index e1f4ea4950a64111e5e2f88dda48b4f3cfa71e1c..415ad2f925243ed1ca638c75ce366ac7abb321f5 100644
--- a/deps/lld/test/wasm/cxx-mangling.ll
+++ b/deps/lld/test/wasm/cxx-mangling.ll
@@ -26,43 +26,32 @@ define void @_start() {
 ; CHECK-NEXT:       - Name:            memory
 ; CHECK-NEXT:         Kind:            MEMORY
 ; CHECK-NEXT:         Index:           0
-; CHECK-NEXT:       - Name:            __heap_base
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           1
-; CHECK-NEXT:       - Name:            __data_end
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            _Z3fooi
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           2
+; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:       - Name:            _start
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           3
+; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:   - Type:            CODE
 ; CHECK-NEXT:     Functions:
 ; CHECK-NEXT:       - Index:           0
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            0B
-; CHECK-NEXT:       - Index:           1
-; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            000B
-; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            0B
-; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:       - Index:           2
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            410110828080800041011081808080000B
+; CHECK-NEXT:         Body:            410110818080800041011080808080000B
 ; CHECK-NEXT:   - Type:            CUSTOM
 ; CHECK-NEXT:     Name:            name
 ; CHECK-NEXT:     FunctionNames:
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            __wasm_call_ctors
+; DEMANGLE-NEXT:      Name:            'undefined:bar(int)'
+; MANGLE-NEXT:        Name:            'undefined:_Z3bari'
 ; CHECK-NEXT:       - Index:           1
-; DEMANGLE-NEXT:      Name:            'undefined function bar(int)'
-; MANGLE-NEXT:        Name:            undefined function _Z3bari
-; CHECK-NEXT:       - Index:           2
 ; DEMANGLE-NEXT:      Name:            'foo(int)'
 ; MANGLE-NEXT:        Name:            _Z3fooi
-; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:       - Index:           2
 ; CHECK-NEXT:         Name:            _start
 ; CHECK-NEXT: ...
diff --git a/deps/lld/test/wasm/data-layout.ll b/deps/lld/test/wasm/data-layout.ll
index 7c215efb0d8f4c465446edddf88be1e76436f610..6c060f46001909a2b5281e9ac02560dab02bd79d 100644
--- a/deps/lld/test/wasm/data-layout.ll
+++ b/deps/lld/test/wasm/data-layout.ll
@@ -13,7 +13,7 @@ target triple = "wasm32-unknown-unknown"
 @local_struct = hidden global %struct.s zeroinitializer, align 4
 @local_struct_internal_ptr = hidden local_unnamed_addr global i32* getelementptr inbounds (%struct.s, %struct.s* @local_struct, i32 0, i32 1), align 4
 
-; RUN: wasm-ld -no-gc-sections --allow-undefined --no-entry -o %t.wasm %t.o %t.hello.o
+; RUN: wasm-ld -no-gc-sections --export=__data_end --export=__heap_base --allow-undefined --no-entry -o %t.wasm %t.o %t.hello.o
 ; RUN: obj2yaml %t.wasm | FileCheck %s
 
 ; CHECK:        - Type:            MEMORY
@@ -32,25 +32,31 @@ target triple = "wasm32-unknown-unknown"
 ; CHECK-NEXT:         Mutable:         false
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
+; CHECK-NEXT:           Value:           1071
+; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:         Type:            I32
+; CHECK-NEXT:         Mutable:         false
+; CHECK-NEXT:         InitExpr:
+; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           66608
 
-; CHECK:         - Type:            DATA
+; CHECK:        - Type:            DATA
 ; CHECK-NEXT:     Segments:
 ; CHECK-NEXT:       - SectionOffset:   7
-; CHECK-NEXT:         MemoryIndex:     0
+; CHECK-NEXT:         InitFlags:       0
 ; CHECK-NEXT:         Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1024
 ; CHECK-NEXT:         Content:         '0100000000000000000000000000000003000000000000002804000024040000'
 ; CHECK-NEXT:       - SectionOffset:   45
-; CHECK-NEXT:         MemoryIndex:     0
+; CHECK-NEXT:         InitFlags:       0
 ; CHECK-NEXT:         Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1056
 ; CHECK-NEXT:         Content:         '0000000000000000'
 ; CHECK-NEXT:       - SectionOffset:   59
-; CHECK-NEXT:         MemoryIndex:     0
-; CHECK-NEXT:         Offset:          
+; CHECK-NEXT:         InitFlags:       0
+; CHECK-NEXT:         Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1064
 ; CHECK-NEXT:         Content:         68656C6C6F0A00
@@ -70,7 +76,7 @@ target triple = "wasm32-unknown-unknown"
 
 ; RUN: wasm-ld -no-gc-sections --allow-undefined --no-entry --shared-memory \
 ; RUN:     --initial-memory=131072 --max-memory=131072 -o %t_max.wasm %t.o \
-; RUN:     %t.hello.o
+; RUN:     --active-segments %t.hello.o
 ; RUN: obj2yaml %t_max.wasm | FileCheck %s -check-prefix=CHECK-SHARED
 
 ; CHECK-SHARED:        - Type:            MEMORY
@@ -84,46 +90,46 @@ target triple = "wasm32-unknown-unknown"
 
 ; RELOC:       - Type:            DATA
 ; RELOC-NEXT:     Relocations:
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_I32
+; RELOC-NEXT:       - Type:            R_WASM_MEMORY_ADDR_I32
 ; RELOC-NEXT:         Index:           3
 ; RELOC-NEXT:         Offset:          0x00000018
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_I32
+; RELOC-NEXT:       - Type:            R_WASM_MEMORY_ADDR_I32
 ; RELOC-NEXT:         Index:           4
 ; RELOC-NEXT:         Offset:          0x0000002E
 ; RELOC-NEXT:         Addend:          4
 ; RELOC-NEXT:     Segments:
 ; RELOC-NEXT:       - SectionOffset:   6
-; RELOC-NEXT:         MemoryIndex:     0
+; RELOC-NEXT:         InitFlags:       0
 ; RELOC-NEXT:         Offset:
 ; RELOC-NEXT:           Opcode:          I32_CONST
 ; RELOC-NEXT:           Value:           0
 ; RELOC-NEXT:         Content:         '01000000'
 ; RELOC-NEXT:       - SectionOffset:   15
-; RELOC-NEXT:         MemoryIndex:     0
+; RELOC-NEXT:         InitFlags:       0
 ; RELOC-NEXT:         Offset:
 ; RELOC-NEXT:           Opcode:          I32_CONST
 ; RELOC-NEXT:           Value:           16
 ; RELOC-NEXT:         Content:         '03000000'
 ; RELOC-NEXT:       - SectionOffset:   24
-; RELOC-NEXT:         MemoryIndex:     0
+; RELOC-NEXT:         InitFlags:       0
 ; RELOC-NEXT:         Offset:
 ; RELOC-NEXT:           Opcode:          I32_CONST
 ; RELOC-NEXT:           Value:           24
 ; RELOC-NEXT:         Content:         '28000000'
 ; RELOC-NEXT:       - SectionOffset:   33
-; RELOC-NEXT:         MemoryIndex:     0
-; RELOC-NEXT:         Offset:          
+; RELOC-NEXT:         InitFlags:       0
+; RELOC-NEXT:         Offset:
 ; RELOC-NEXT:           Opcode:          I32_CONST
 ; RELOC-NEXT:           Value:           28
 ; RELOC-NEXT:         Content:         '0000000000000000'
 ; RELOC-NEXT:       - SectionOffset:   46
-; RELOC-NEXT:         MemoryIndex:     0
-; RELOC-NEXT:         Offset:          
+; RELOC-NEXT:         InitFlags:       0
+; RELOC-NEXT:         Offset:
 ; RELOC-NEXT:           Opcode:          I32_CONST
 ; RELOC-NEXT:           Value:           36
 ; RELOC-NEXT:         Content:         '20000000'
 ; RELOC-NEXT:       - SectionOffset:   55
-; RELOC-NEXT:         MemoryIndex:     0
+; RELOC-NEXT:         InitFlags:       0
 ; RELOC-NEXT:         Offset:
 ; RELOC-NEXT:           Opcode:          I32_CONST
 ; RELOC-NEXT:           Value:           40
diff --git a/deps/lld/test/wasm/data-segment-merging.ll b/deps/lld/test/wasm/data-segment-merging.ll
index 2a48b2db6e37eec3fc72a344a6d5b5e88722795b..8e4d6cc7965f885b85c279bfbd84bb8908b085e1 100644
--- a/deps/lld/test/wasm/data-segment-merging.ll
+++ b/deps/lld/test/wasm/data-segment-merging.ll
@@ -8,24 +8,117 @@ target triple = "wasm32-unknown-unknown"
 @e = private constant [9 x i8] c"constant\00", align 1
 @f = private constant i8 43, align 4
 
-; RUN: llc -filetype=obj %s -o %t.data-segment-merging.o
+; RUN: llc -mattr=+bulk-memory -filetype=obj %s -o %t.o
 
-; RUN: wasm-ld -no-gc-sections --no-entry -o %t.merged.wasm %t.data-segment-merging.o
+; RUN: wasm-ld -no-gc-sections --no-entry -o %t.merged.wasm %t.o
 ; RUN: obj2yaml %t.merged.wasm | FileCheck %s --check-prefix=MERGE
-; MERGE:   - Type:            DATA
-; MERGE:     Segments:
-; MERGE:        Content:         68656C6C6F00676F6F6462796500776861746576657200002A000000
-; MERGE:        Content:         636F6E7374616E74000000002B
-; MERGE-NOT:    Content:
 
-; RUN: wasm-ld -no-gc-sections --no-entry --no-merge-data-segments -o %t.separate.wasm %t.data-segment-merging.o
+; MERGE-LABEL: - Type:            DATA
+; MERGE-NEXT:    Segments:
+; MERGE-NEXT:      - SectionOffset:   7
+; MERGE-NEXT:        InitFlags:       0
+; MERGE-NEXT:        Offset:
+; MERGE:             Content:         68656C6C6F00676F6F6462796500776861746576657200002A000000
+; MERGE-NEXT:      - SectionOffset:   41
+; MERGE-NEXT:        InitFlags:       0
+; MERGE-NEXT:        Offset:
+; MERGE:             Content:         636F6E7374616E74000000002B
+; MERGE-NEXT:  - Type:            CUSTOM
+; MERGE-NEXT:    Name:            name
+; MERGE-NEXT:    FunctionNames:
+; MERGE-NEXT:      - Index:           0
+; MERGE-NEXT:        Name:            __wasm_call_ctors
+; MERGE-NOT:       - Index:
+
+; RUN: wasm-ld -no-gc-sections --no-entry --no-merge-data-segments -o %t.separate.wasm %t.o
 ; RUN: obj2yaml %t.separate.wasm | FileCheck %s --check-prefix=SEPARATE
-; SEPARATE:   - Type:            DATA
-; SEPARATE:     Segments:
-; SEPARATE:        Content:         68656C6C6F00
-; SEPARATE:        Content:         676F6F6462796500
-; SEPARATE:        Content:         '776861746576657200'
-; SEPARATE:        Content:         2A000000
-; SEPARATE:        Content:         636F6E7374616E7400
-; SEPARATE:        Content:         2B
-; SEPARATE-NOT:    Content:
+
+; SEPARATE-NOT:                  DATACOUNT
+; SEPARATE-LABEL: - Type:            DATA
+; SEPARATE-NEXT:    Segments:
+; SEPARATE-NEXT:      - SectionOffset:   7
+; SEPARATE-NEXT:        InitFlags:       0
+; SEPARATE-NEXT:        Offset:
+; SEPARATE:             Content:         68656C6C6F00
+; SEPARATE-NEXT:      - SectionOffset:   19
+; SEPARATE-NEXT:        InitFlags:       0
+; SEPARATE-NEXT:        Offset:
+; SEPARATE:             Content:         676F6F6462796500
+; SEPARATE-NEXT:      - SectionOffset:   33
+; SEPARATE-NEXT:        InitFlags:       0
+; SEPARATE-NEXT:        Offset:
+; SEPARATE:             Content:         '776861746576657200'
+; SEPARATE-NEXT:      - SectionOffset:   48
+; SEPARATE-NEXT:        InitFlags:       0
+; SEPARATE-NEXT:        Offset:
+; SEPARATE:             Content:         2A000000
+; SEPARATE-NEXT:      - SectionOffset:   58
+; SEPARATE-NEXT:        InitFlags:       0
+; SEPARATE-NEXT:        Offset:
+; SEPARATE:             Content:         636F6E7374616E7400
+; SEPARATE-NEXT:      - SectionOffset:   73
+; SEPARATE-NEXT:        InitFlags:       0
+; SEPARATE-NEXT:        Offset:
+; SEPARATE:             Content:         2B
+; SEPARATE-NEXT:  - Type:            CUSTOM
+; SEPARATE-NEXT:    Name:            name
+; SEPARATE-NEXT:    FunctionNames:
+; SEPARATE-NEXT:      - Index:           0
+; SEPARATE-NEXT:        Name:            __wasm_call_ctors
+; SEPARATE-NOT:       - Index:
+
+; RUN: wasm-ld -no-gc-sections --no-entry --passive-segments -o %t.merged.passive.wasm %t.o
+; RUN: obj2yaml %t.merged.passive.wasm | FileCheck %s --check-prefix=PASSIVE-MERGE
+
+; PASSIVE-MERGE-LABEL: - Type:            DATACOUNT
+; PASSIVE-MERGE-NEXT:    Count:           2
+; PASSIVE-MERGE-LABEL: - Type:            DATA
+; PASSIVE-MERGE-NEXT:    Segments:
+; PASSIVE-MERGE-NEXT:      - SectionOffset:   3
+; PASSIVE-MERGE-NEXT:        InitFlags:       1
+; PASSIVE-MERGE-NEXT:        Content:         68656C6C6F00676F6F6462796500776861746576657200002A000000
+; PASSIVE-MERGE-NEXT:      - SectionOffset:   33
+; PASSIVE-MERGE-NEXT:        InitFlags:       1
+; PASSIVE-MERGE-NEXT:        Content:         636F6E7374616E74000000002B
+; PASSIVE-MERGE-NEXT:  - Type:            CUSTOM
+; PASSIVE-MERGE-NEXT:    Name:            name
+; PASSIVE-MERGE-NEXT:    FunctionNames:
+; PASSIVE-MERGE-NEXT:      - Index:           0
+; PASSIVE-MERGE-NEXT:        Name:            __wasm_call_ctors
+; PASSIVE-MERGE-NEXT:      - Index:           1
+; PASSIVE-MERGE-NEXT:        Name:            __wasm_init_memory
+; PASSIVE-MERGE-NOT:       - Index:
+
+; RUN: wasm-ld -no-gc-sections --no-entry --passive-segments -no-merge-data-segments -o %t.separate.passive.wasm %t.o
+; RUN: obj2yaml %t.separate.passive.wasm | FileCheck %s --check-prefix=PASSIVE-SEPARATE
+
+; PASSIVE-SEPARATE-LABEL: - Type:            DATACOUNT
+; PASSIVE-SEPARATE-NEXT:    Count:           6
+; PASSIVE-SEPARATE-LABEL: - Type:            DATA
+; PASSIVE-SEPARATE-NEXT:    Segments:
+; PASSIVE-SEPARATE-NEXT:      - SectionOffset:   3
+; PASSIVE-SEPARATE-NEXT:        InitFlags:       1
+; PASSIVE-SEPARATE-NEXT:        Content:         68656C6C6F00
+; PASSIVE-SEPARATE-NEXT:      - SectionOffset:   11
+; PASSIVE-SEPARATE-NEXT:        InitFlags:       1
+; PASSIVE-SEPARATE-NEXT:        Content:         676F6F6462796500
+; PASSIVE-SEPARATE-NEXT:      - SectionOffset:   21
+; PASSIVE-SEPARATE-NEXT:        InitFlags:       1
+; PASSIVE-SEPARATE-NEXT:        Content:         '776861746576657200'
+; PASSIVE-SEPARATE-NEXT:      - SectionOffset:   32
+; PASSIVE-SEPARATE-NEXT:        InitFlags:       1
+; PASSIVE-SEPARATE-NEXT:        Content:         2A000000
+; PASSIVE-SEPARATE-NEXT:      - SectionOffset:   38
+; PASSIVE-SEPARATE-NEXT:        InitFlags:       1
+; PASSIVE-SEPARATE-NEXT:        Content:         636F6E7374616E7400
+; PASSIVE-SEPARATE-NEXT:      - SectionOffset:   49
+; PASSIVE-SEPARATE-NEXT:        InitFlags:       1
+; PASSIVE-SEPARATE-NEXT:        Content:         2B
+; PASSIVE-SEPARATE-NEXT:    - Type:            CUSTOM
+; PASSIVE-SEPARATE-NEXT:      Name:            name
+; PASSIVE-SEPARATE-NEXT:      FunctionNames:
+; PASSIVE-SEPARATE-NEXT:        - Index:           0
+; PASSIVE-SEPARATE-NEXT:          Name:            __wasm_call_ctors
+; PASSIVE-SEPARATE-NEXT:        - Index:           1
+; PASSIVE-SEPARATE-NEXT:          Name:            __wasm_init_memory
+; PASSIVE-SEPARATE-NOT:         - Index
diff --git a/deps/lld/test/wasm/data-segments.ll b/deps/lld/test/wasm/data-segments.ll
new file mode 100644
index 0000000000000000000000000000000000000000..32fb6812d3b9e891271cb1cac227a03ca2edb654
--- /dev/null
+++ b/deps/lld/test/wasm/data-segments.ll
@@ -0,0 +1,119 @@
+; RUN: llc -filetype=obj %s -o %t.atomics.o -mattr=+atomics
+; RUN: llc -filetype=obj %s -o %t.bulk-mem.o -mattr=+bulk-memory
+; RUN: llc -filetype=obj %s -o %t.atomics.bulk-mem.o -mattr=+atomics,+bulk-memory
+
+; atomics => error
+; RUN: not wasm-ld -no-gc-sections --no-entry --shared-memory --max-memory=131072 %t.atomics.o -o %t.atomics.wasm 2>&1 | FileCheck %s --check-prefix ERROR
+
+; atomics, active segments => active segments
+; RUN: wasm-ld -no-gc-sections --no-entry --shared-memory --max-memory=131072 --active-segments %t.atomics.o -o %t.atomics.active.wasm
+; RUN: obj2yaml %t.atomics.active.wasm | FileCheck %s --check-prefixes ACTIVE,ACTIVE-TLS
+
+; atomics, passive segments => error
+; RUN: not wasm-ld -no-gc-sections --no-entry --shared-memory --max-memory=131072 --passive-segments %t.atomics.o -o %t.atomics.passive.wasm 2>&1 | FileCheck %s --check-prefix ERROR
+
+; bulk memory => active segments
+; RUN: wasm-ld -no-gc-sections --no-entry %t.bulk-mem.o -o %t.bulk-mem.wasm
+; RUN: obj2yaml %t.bulk-mem.wasm | FileCheck %s --check-prefix ACTIVE
+
+; bulk-memory, active segments => active segments
+; RUN: wasm-ld -no-gc-sections --no-entry --active-segments %t.bulk-mem.o -o %t.bulk-mem.active.wasm
+; RUN: obj2yaml %t.bulk-mem.active.wasm | FileCheck %s --check-prefix ACTIVE
+
+; bulk memory, passive segments => passive segments
+; RUN: wasm-ld -no-gc-sections --no-entry --passive-segments %t.bulk-mem.o -o %t.bulk-mem.passive.wasm
+; RUN: obj2yaml %t.bulk-mem.passive.wasm | FileCheck %s --check-prefix PASSIVE
+
+; atomics, bulk memory => passive segments
+; RUN: wasm-ld -no-gc-sections --no-entry --shared-memory --max-memory=131072 %t.atomics.bulk-mem.o -o %t.atomics.bulk-mem.wasm
+; RUN: obj2yaml %t.atomics.bulk-mem.wasm | FileCheck %s --check-prefixes PASSIVE,PASSIVE-TLS
+
+; atomics, bulk memory, active segments => active segments
+; RUN: wasm-ld -no-gc-sections --no-entry --shared-memory --max-memory=131072 --active-segments %t.atomics.bulk-mem.o -o %t.atomics.bulk-mem.active.wasm
+; RUN: obj2yaml %t.atomics.bulk-mem.active.wasm | FileCheck %s --check-prefixes ACTIVE,ACTIVE-TLS
+
+; atomics, bulk memory, passive segments => passive segments
+; RUN: wasm-ld -no-gc-sections --no-entry --shared-memory --max-memory=131072 --passive-segments %t.atomics.bulk-mem.o -o %t.atomics.bulk-mem.passive.wasm
+; RUN: obj2yaml %t.atomics.bulk-mem.passive.wasm | FileCheck %s --check-prefixes PASSIVE,PASSIVE-TLS
+
+target triple = "wasm32-unknown-unknown"
+
+@a = hidden global [6 x i8] c"hello\00", align 1
+@b = hidden global [8 x i8] c"goodbye\00", align 1
+@c = hidden global [10000 x i8] zeroinitializer, align 1
+@d = hidden global i32 42, align 4
+
+@e = private constant [9 x i8] c"constant\00", align 1
+@f = private constant i8 43, align 4
+
+; ERROR: 'bulk-memory' feature must be used in order to emit passive segments
+
+; ACTIVE-LABEL: - Type:            CODE
+; ACTIVE-NEXT:    Functions:
+; ACTIVE-NEXT:      - Index:           0
+; ACTIVE-NEXT:        Locals:          []
+; ACTIVE-NEXT:        Body:            0B
+; ACTIVE-TLS-NEXT:  - Index:           1
+; ACTIVE-TLS-NEXT:    Locals:          []
+; ACTIVE-TLS-NEXT:    Body:            0B
+; ACTIVE-NEXT:  - Type:            DATA
+; ACTIVE-NEXT:    Segments:
+; ACTIVE-NEXT:      - SectionOffset:   7
+; ACTIVE-NEXT:        InitFlags:       0
+; ACTIVE-NEXT:        Offset:
+; ACTIVE-NEXT:          Opcode:          I32_CONST
+; ACTIVE-NEXT:          Value:           1024
+; ACTIVE-NEXT:        Content:         68656C6C6F00676F6F646279650000002A000000
+; ACTIVE-NEXT:      - SectionOffset:   34
+; ACTIVE-NEXT:        InitFlags:       0
+; ACTIVE-NEXT:        Offset:
+; ACTIVE-NEXT:          Opcode:          I32_CONST
+; ACTIVE-NEXT:          Value:           1044
+; ACTIVE-NEXT:        Content:         '0000000000
+; ACTIVE-SAME:                           0000000000'
+; ACTIVE-NEXT:      - SectionOffset:   10041
+; ACTIVE-NEXT:        InitFlags:       0
+; ACTIVE-NEXT:        Offset:
+; ACTIVE-NEXT:          Opcode:          I32_CONST
+; ACTIVE-NEXT:          Value:           11044
+; ACTIVE-NEXT:        Content:         636F6E7374616E74000000002B
+; ACTIVE-NEXT:  - Type:            CUSTOM
+; ACTIVE-NEXT:    Name:            name
+; ACTIVE-NEXT:    FunctionNames:
+; ACTIVE-NEXT:      - Index:           0
+; ACTIVE-NEXT:        Name:            __wasm_call_ctors
+; ACTIVE-TLS-NEXT:  - Index:           1
+; ACTIVE-TLS-NEXT:    Name:            __wasm_init_tls
+
+; PASSIVE-LABEL: - Type:            CODE
+; PASSIVE-NEXT:    Functions:
+; PASSIVE-NEXT:      - Index:           0
+; PASSIVE-NEXT:        Locals:          []
+; PASSIVE-NEXT:        Body:            10010B
+; PASSIVE-NEXT:      - Index:           1
+; PASSIVE-NEXT:        Locals:          []
+; PASSIVE-NEXT:        Body:            41800841004114FC080000FC090041940841004190CE00FC080100FC090141A4D6004100410DFC080200FC09020B
+; PASSIVE-TLS-NEXT:  - Index:           2
+; PASSIVE-TLS-NEXT:    Locals:          []
+; PASSIVE-TLS-NEXT:    Body:            0B
+; PASSIVE-NEXT:  - Type:            DATA
+; PASSIVE-NEXT:    Segments:
+; PASSIVE-NEXT:      - SectionOffset:   3
+; PASSIVE-NEXT:        InitFlags:       1
+; PASSIVE-NEXT:        Content:         68656C6C6F00676F6F646279650000002A000000
+; PASSIVE-NEXT:      - SectionOffset:   26
+; PASSIVE-NEXT:        InitFlags:       1
+; PASSIVE-NEXT:        Content:         '0000000000
+; PASSIVE-SAME:                           0000000000'
+; PASSIVE-NEXT:      - SectionOffset:   10028
+; PASSIVE-NEXT:        InitFlags:       1
+; PASSIVE-NEXT:        Content:         636F6E7374616E74000000002B
+; PASSIVE-NEXT:  - Type:            CUSTOM
+; PASSIVE-NEXT:    Name:            name
+; PASSIVE-NEXT:    FunctionNames:
+; PASSIVE-NEXT:      - Index:           0
+; PASSIVE-NEXT:        Name:            __wasm_call_ctors
+; PASSIVE-NEXT:      - Index:           1
+; PASSIVE-NEXT:        Name:            __wasm_init_memory
+; PASSIVE-TLS-NEXT:  - Index:           2
+; PASSIVE-TLS-NEXT:    Name:            __wasm_init_tls
diff --git a/deps/lld/test/wasm/emit-relocs-fpic.s b/deps/lld/test/wasm/emit-relocs-fpic.s
new file mode 100644
index 0000000000000000000000000000000000000000..e1adede20a5f784a341a3a8d9845a195b58b19ea
--- /dev/null
+++ b/deps/lld/test/wasm/emit-relocs-fpic.s
@@ -0,0 +1,20 @@
+# RUN: llvm-mc -triple=wasm32-unknown-unknown -filetype=obj -o %t.o < %s
+# RUN: llc --relocation-model=pic -filetype=obj %p/Inputs/ret32.ll -o %t.ret32.o
+# RUN: wasm-ld -pie --export-all --no-gc-sections --no-entry --emit-relocs -o %t.wasm %t.o %t.ret32.o
+# RUN: obj2yaml %t.wasm | FileCheck %s
+
+load_hidden_data:
+    .functype   load_hidden_data () -> (i32)
+    i32.const   .L.hidden_data@MBREL
+    end_function
+
+.section .rodata.hidden_data,"",@
+.L.hidden_data:
+    .int8 100
+    .size .L.hidden_data, 1
+
+# We just want to make sure that processing this relocation doesn't
+# cause corrupt output. We get most of the way there, by just checking
+# that obj2yaml doesn't fail. Here we just make sure that the relocation
+# survived the trip.
+# CHECK: R_WASM_MEMORY_ADDR_REL_SLEB
diff --git a/deps/lld/test/wasm/emit-relocs.ll b/deps/lld/test/wasm/emit-relocs.ll
new file mode 100644
index 0000000000000000000000000000000000000000..cdf492ab8fbdeb21bd1d32f260e305e2e507d113
--- /dev/null
+++ b/deps/lld/test/wasm/emit-relocs.ll
@@ -0,0 +1,39 @@
+; RUN: llc -filetype=obj %s -o %t.o
+; RUN: llc -filetype=obj %p/Inputs/ret32.ll -o %t.ret32.o
+; RUN: wasm-ld --emit-relocs -o %t.wasm %t.o %t.ret32.o
+; RUN: obj2yaml %t.wasm | FileCheck %s
+
+target triple = "wasm32-unknown-unknown"
+
+declare i32 @ret32(float)
+
+define void @unused_function() {
+  ret void
+}
+
+define hidden void @_start() local_unnamed_addr #0 {
+entry:
+  call i32 @ret32(float 0.0)
+  ret void
+}
+
+; CHECK:        - Type:            CODE
+; CHECK-NEXT:     Relocations:
+; CHECK-NEXT:       - Type:            R_WASM_FUNCTION_INDEX_LEB
+; CHECK-NEXT:         Index:           1
+; CHECK-NEXT:         Offset:          0x00000009
+
+; CHECK:        - Type:            CUSTOM
+; CHECK-NEXT:     Name:            linking
+; CHECK-NEXT:     Version:         2
+; CHECK-NEXT:     SymbolTable:
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Kind:            FUNCTION
+; CHECK-NEXT:         Name:            _start
+; CHECK-NEXT:         Flags:           [  ]
+; CHECK-NEXT:         Function:        0
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         Kind:            FUNCTION
+; CHECK-NEXT:         Name:            ret32
+; CHECK-NEXT:         Flags:           [ VISIBILITY_HIDDEN ]
+; CHECK-NEXT:         Function:        1
diff --git a/deps/lld/test/wasm/entry.ll b/deps/lld/test/wasm/entry.ll
index 30fff9a2bdcb2c47e027005baf520a806b184270..21779a01bfec7ba645b4bd2c61df25bd575e7035 100644
--- a/deps/lld/test/wasm/entry.ll
+++ b/deps/lld/test/wasm/entry.ll
@@ -17,15 +17,9 @@ entry:
 ; CHECK-NEXT:       - Name:            memory
 ; CHECK-NEXT:         Kind:            MEMORY
 ; CHECK-NEXT:         Index:           0
-; CHECK-NEXT:       - Name:            __heap_base
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           1
-; CHECK-NEXT:       - Name:            __data_end
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            entry
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           1
+; CHECK-NEXT:         Index:           0
 ; CHECK-NEXT:   - Type:
 
 ; The __wasm_call_ctors is somewhat special since its created by the linker.
@@ -41,10 +35,4 @@ entry:
 ; CHECK-CTOR-NEXT:       - Name:            __wasm_call_ctors
 ; CHECK-CTOR-NEXT:         Kind:            FUNCTION
 ; CHECK-CTOR-NEXT:         Index:           0
-; CHECK-CTOR-NEXT:       - Name:            __heap_base
-; CHECK-CTOR-NEXT:         Kind:            GLOBAL
-; CHECK-CTOR-NEXT:         Index:           1
-; CHECK-CTOR-NEXT:       - Name:            __data_end
-; CHECK-CTOR-NEXT:         Kind:            GLOBAL
-; CHECK-CTOR-NEXT:         Index:           2
 ; CHECK-CTOR-NEXT:   - Type:
diff --git a/deps/lld/test/wasm/export.ll b/deps/lld/test/wasm/export.ll
index 519aafebbe2321bb934cae6992eb998a24548902..8dc14ae861ed49c4199b110d4d8ea0b14c5cb809 100644
--- a/deps/lld/test/wasm/export.ll
+++ b/deps/lld/test/wasm/export.ll
@@ -3,13 +3,29 @@
 ; RUN: wasm-ld --export=hidden_function -o %t.wasm %t.o
 ; RUN: obj2yaml %t.wasm | FileCheck %s
 
+@llvm.used = appending global [1 x i8*] [i8* bitcast (i32 ()* @used_function to i8*)], section "llvm.metadata"
+
 target triple = "wasm32-unknown-unknown"
 
+; Not exported by default, but forced via commandline
 define hidden i32 @hidden_function() local_unnamed_addr {
 entry:
   ret i32 0
 }
 
+; Not exported by default
+define i32 @default_function() local_unnamed_addr {
+entry:
+  ret i32 0
+}
+
+; Exported because its part of llvm.used
+define i32 @used_function() local_unnamed_addr {
+entry:
+  ret i32 0
+}
+
+; Exported by default
 define void @_start() local_unnamed_addr {
 entry:
   ret void
@@ -17,19 +33,18 @@ entry:
 
 ; CHECK-ERROR: error: symbol exported via --export not found: missing
 
+; CHECK-NOT: - Name: default_function
+
 ; CHECK:        - Type:            EXPORT
 ; CHECK-NEXT:     Exports:
 ; CHECK-NEXT:       - Name:            memory
 ; CHECK-NEXT:         Kind:            MEMORY
 ; CHECK-NEXT:         Index:           0
-; CHECK-NEXT:       - Name:            __heap_base
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           1
-; CHECK-NEXT:       - Name:            __data_end
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            hidden_function
 ; CHECK-NEXT:         Kind:            FUNCTION
+; CHECK-NEXT:         Index:           0
+; CHECK-NEXT:       - Name:            used_function
+; CHECK-NEXT:         Kind:            FUNCTION
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:       - Name:            _start
 ; CHECK-NEXT:         Kind:            FUNCTION
diff --git a/deps/lld/test/wasm/fatal-warnings.ll b/deps/lld/test/wasm/fatal-warnings.ll
index 0007dc203f02bd761f353e09dd0608603d6ce1a2..d338420ef09c34be1f5f2db3b901f61d7d541dda 100644
--- a/deps/lld/test/wasm/fatal-warnings.ll
+++ b/deps/lld/test/wasm/fatal-warnings.ll
@@ -1,7 +1,7 @@
 ; RUN: llc -filetype=obj %s -o %t.main.o
 ; RUN: llc -filetype=obj %p/Inputs/ret32.ll -o %t.ret32.o
-; RUN: lld -flavor wasm -o %t.wasm %t.main.o %t.ret32.o 2>&1 | FileCheck %s -check-prefix=CHECK-WARN
-; RUN: not lld -flavor wasm --fatal-warnings -o %t.wasm %t.main.o %t.ret32.o 2>&1 | FileCheck %s -check-prefix=CHECK-FATAL
+; RUN: wasm-ld -o %t.wasm %t.main.o %t.ret32.o 2>&1 | FileCheck %s -check-prefix=CHECK-WARN
+; RUN: not wasm-ld --fatal-warnings -o %t.wasm %t.main.o %t.ret32.o 2>&1 | FileCheck %s -check-prefix=CHECK-FATAL
 
 ; CHECK-WARN: warning: function signature mismatch: ret32
 ; CHECK-FATAL: error: function signature mismatch: ret32
diff --git a/deps/lld/test/wasm/function-imports-first.ll b/deps/lld/test/wasm/function-imports-first.ll
index 00c73741b066f58e772e237b0b77ef0281bc74cb..04583bb54817216561b055028440b373a4f595a5 100644
--- a/deps/lld/test/wasm/function-imports-first.ll
+++ b/deps/lld/test/wasm/function-imports-first.ll
@@ -24,25 +24,20 @@ declare i32 @ret32(float) local_unnamed_addr #1
 ; CHECK-NEXT:        ParamTypes:
 ; CHECK-NEXT:          - F32
 ; CHECK:  - Type:            FUNCTION
-; CHECK-NEXT:    FunctionTypes: [ 0, 0, 1 ]
+; CHECK-NEXT:    FunctionTypes: [ 0, 1 ]
 ; CHECK:  - Type:            CODE
 ; CHECK-NEXT:    Functions:
 ; CHECK-NEXT:      - Index:           0
 ; CHECK-NEXT:        Locals:
-; CHECK-NEXT:        Body:            0B
+; CHECK-NEXT:        Body:            43000000001081808080001A0B
 ; CHECK-NEXT:      - Index:           1
 ; CHECK-NEXT:        Locals:
-; CHECK-NEXT:        Body:            43000000001082808080001A0B
-; CHECK-NEXT:      - Index:           2
-; CHECK-NEXT:        Locals:
 ; CHECK-NEXT:        Body:            41000B
 ; CHECK-NEXT:   - Type:            CUSTOM
 ; CHECK-NEXT:     Name:            name
 ; CHECK-NEXT:     FunctionNames:
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            __wasm_call_ctors
-; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            _start
-; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            ret32
 ; CHECK-NEXT: ...
diff --git a/deps/lld/test/wasm/function-imports.ll b/deps/lld/test/wasm/function-imports.ll
index a2c6405b0565e009207faa24d1054d12357db313..a21f6b509e2ff5d5d8e574c379f3f6e1c198c7a0 100644
--- a/deps/lld/test/wasm/function-imports.ll
+++ b/deps/lld/test/wasm/function-imports.ll
@@ -18,25 +18,22 @@ declare i32 @ret32(float) local_unnamed_addr #1
 ; CHECK:       - Type:            TYPE
 ; CHECK-NEXT:    Signatures:
 ; CHECK-NEXT:      - Index:           0
-; CHECK-NEXT:        ReturnType:      NORESULT
-; CHECK-NEXT:        ParamTypes:
-; CHECK-NEXT:      - Index:           1
 ; CHECK-NEXT:        ReturnType:      I32
 ; CHECK-NEXT:        ParamTypes:
 ; CHECK-NEXT:          - F32
+; CHECK-NEXT:      - Index:           1
+; CHECK-NEXT:        ReturnType:      NORESULT
+; CHECK-NEXT:        ParamTypes:
 ; CHECK-NEXT:  - Type:            FUNCTION
-; CHECK-NEXT:    FunctionTypes:   [ 0, 1, 0 ]
+; CHECK-NEXT:    FunctionTypes:   [ 0, 1 ]
 ; CHECK:       - Type:            CODE
 ; CHECK-NEXT:    Functions:
 ; CHECK:           - Index:       0
 ; CHECK:           - Index:       1
-; CHECK:           - Index:       2
 ; CHECK:         Name:            name
 ; CHECK-NEXT:    FunctionNames:
 ; CHECK-NEXT:      - Index:           0
-; CHECK-NEXT:        Name:            __wasm_call_ctors
-; CHECK-NEXT:      - Index:           1
 ; CHECK-NEXT:        Name:            ret32
-; CHECK-NEXT:      - Index:           2
+; CHECK-NEXT:      - Index:           1
 ; CHECK-NEXT:        Name:            _start
 ; CHECK-NEXT: ...
diff --git a/deps/lld/test/wasm/gc-imports.ll b/deps/lld/test/wasm/gc-imports.ll
index fbcb74dbdd3e3ab58549aa4c79befe82fe176893..68d403765916be2119c47daf29a517e5238ea68a 100644
--- a/deps/lld/test/wasm/gc-imports.ll
+++ b/deps/lld/test/wasm/gc-imports.ll
@@ -43,10 +43,8 @@ entry:
 ; CHECK-NEXT:       - Index:           0
 ; CHECK-NEXT:         Name:            used_undef_function
 ; CHECK-NEXT:       - Index:           1
-; CHECK-NEXT:         Name:            __wasm_call_ctors
-; CHECK-NEXT:       - Index:           2
 ; CHECK-NEXT:         Name:            _start
-; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:       - Index:           2
 ; CHECK-NEXT:         Name:            use_undef_global
 ; CHECK-NEXT: ...
 
diff --git a/deps/lld/test/wasm/gc-sections.ll b/deps/lld/test/wasm/gc-sections.ll
index 57b69738a6f3c75f82af707229f560b972fa0f2b..fbb4b2be17e2668fae3407648ebd8372363d5cff 100644
--- a/deps/lld/test/wasm/gc-sections.ll
+++ b/deps/lld/test/wasm/gc-sections.ll
@@ -38,11 +38,11 @@ entry:
 ; CHECK:        - Type:            TYPE
 ; CHECK-NEXT:     Signatures:
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         ReturnType:      NORESULT
-; CHECK-NEXT:         ParamTypes:
-; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         ReturnType:      I32
 ; CHECK-NEXT:         ParamTypes:
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         ReturnType:      NORESULT
+; CHECK-NEXT:         ParamTypes:
 ; CHECK-NEXT:       - Index:           2
 ; CHECK-NEXT:         ReturnType:      I64
 ; CHECK-NEXT:         ParamTypes:
@@ -66,8 +66,8 @@ entry:
 ; CHECK:        - Type:            DATA
 ; CHECK-NEXT:     Segments:        
 ; CHECK-NEXT:       - SectionOffset:   7
-; CHECK-NEXT:         MemoryIndex:     0
-; CHECK-NEXT:         Offset:          
+; CHECK-NEXT:         InitFlags:       0
+; CHECK-NEXT:         Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1024
 ; CHECK-NEXT:         Content:         '02000000'
@@ -75,12 +75,10 @@ entry:
 ; CHECK-NEXT:     Name:            name
 ; CHECK-NEXT:     FunctionNames:
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            __wasm_call_ctors
-; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            used_function
-; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            _start
-; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:       - Index:           2
 ; CHECK-NEXT:         Name:            use_global
 ; CHECK-NEXT: ...
 
@@ -129,8 +127,8 @@ entry:
 ; NO-GC:        - Type:            DATA
 ; NO-GC-NEXT:     Segments:        
 ; NO-GC-NEXT:       - SectionOffset:   7
-; NO-GC-NEXT:         MemoryIndex:     0
-; NO-GC-NEXT:         Offset:          
+; NO-GC-NEXT:         InitFlags:       0
+; NO-GC-NEXT:         Offset:
 ; NO-GC-NEXT:           Opcode:          I32_CONST
 ; NO-GC-NEXT:           Value:           1024
 ; NO-GC-NEXT:         Content:         '010000000000000002000000'
diff --git a/deps/lld/test/wasm/global-base.test b/deps/lld/test/wasm/global-base.test
new file mode 100644
index 0000000000000000000000000000000000000000..07c8d63085dac02ee0981e52aa8f230870529c23
--- /dev/null
+++ b/deps/lld/test/wasm/global-base.test
@@ -0,0 +1,71 @@
+RUN: llc -filetype=obj %p/Inputs/start.ll -o %t.o
+
+RUN: wasm-ld --export=__global_base --export=__data_end --allow-undefined -o %t.wasm %t.o
+RUN: obj2yaml %t.wasm | FileCheck %s  -check-prefix=CHECK-1024
+CHECK-1024:       - Type:            GLOBAL
+CHECK-1024-NEXT:    Globals:
+CHECK-1024-NEXT:      - Index:           0
+CHECK-1024-NEXT:        Type:            I32
+CHECK-1024-NEXT:        Mutable:         true
+CHECK-1024-NEXT:        InitExpr:
+CHECK-1024-NEXT:          Opcode:          I32_CONST
+CHECK-1024-NEXT:          Value:           66560
+CHECK-1024-NEXT:      - Index:           1
+CHECK-1024-NEXT:        Type:            I32
+CHECK-1024-NEXT:        Mutable:         false
+CHECK-1024-NEXT:        InitExpr:
+CHECK-1024-NEXT:          Opcode:          I32_CONST
+CHECK-1024-NEXT:          Value:           1024
+CHECK-1024-NEXT:      - Index:           2
+CHECK-1024-NEXT:        Type:            I32
+CHECK-1024-NEXT:        Mutable:         false
+CHECK-1024-NEXT:        InitExpr:
+CHECK-1024-NEXT:          Opcode:          I32_CONST
+CHECK-1024-NEXT:          Value:           1024
+
+CHECK-1024:       - Type:            EXPORT
+CHECK-1024-NEXT:    Exports:
+CHECK-1024-NEXT:      - Name:            memory
+CHECK-1024-NEXT:        Kind:            MEMORY
+CHECK-1024-NEXT:        Index:           0
+CHECK-1024-NEXT:      - Name:            __data_end
+CHECK-1024-NEXT:        Kind:            GLOBAL
+CHECK-1024-NEXT:        Index:           1
+CHECK-1024-NEXT:      - Name:            __global_base
+CHECK-1024-NEXT:        Kind:            GLOBAL
+CHECK-1024-NEXT:        Index:           2
+
+RUN: wasm-ld --export=__global_base --export=__data_end --allow-undefined --global-base=16777216 -o %t.wasm %t.o
+RUN: obj2yaml %t.wasm | FileCheck %s  -check-prefix=CHECK-16777216
+CHECK-16777216:       - Type:            GLOBAL
+CHECK-16777216-NEXT:    Globals:
+CHECK-16777216-NEXT:      - Index:           0
+CHECK-16777216-NEXT:        Type:            I32
+CHECK-16777216-NEXT:        Mutable:         true
+CHECK-16777216-NEXT:        InitExpr:
+CHECK-16777216-NEXT:          Opcode:          I32_CONST
+CHECK-16777216-NEXT:          Value:           16842752
+CHECK-16777216-NEXT:      - Index:           1
+CHECK-16777216-NEXT:        Type:            I32
+CHECK-16777216-NEXT:        Mutable:         false
+CHECK-16777216-NEXT:        InitExpr:
+CHECK-16777216-NEXT:          Opcode:          I32_CONST
+CHECK-16777216-NEXT:          Value:           16777216
+CHECK-16777216-NEXT:      - Index:           2
+CHECK-16777216-NEXT:        Type:            I32
+CHECK-16777216-NEXT:        Mutable:         false
+CHECK-16777216-NEXT:        InitExpr:
+CHECK-16777216-NEXT:          Opcode:          I32_CONST
+CHECK-16777216-NEXT:          Value:           16777216
+
+CHECK-16777216:       - Type:            EXPORT
+CHECK-16777216-NEXT:    Exports:
+CHECK-16777216-NEXT:      - Name:            memory
+CHECK-16777216-NEXT:        Kind:            MEMORY
+CHECK-16777216-NEXT:        Index:           0
+CHECK-16777216-NEXT:      - Name:            __data_end
+CHECK-16777216-NEXT:        Kind:            GLOBAL
+CHECK-16777216-NEXT:        Index:           1
+CHECK-16777216-NEXT:      - Name:            __global_base
+CHECK-16777216-NEXT:        Kind:            GLOBAL
+CHECK-16777216-NEXT:        Index:           2
diff --git a/deps/lld/test/wasm/import-memory.test b/deps/lld/test/wasm/import-memory.test
index 0a64afd6ce2016a27f8bcbb511daa25aae2f2c5c..e9dd972bc496195990b9b40612363a5e0e815dcb 100644
--- a/deps/lld/test/wasm/import-memory.test
+++ b/deps/lld/test/wasm/import-memory.test
@@ -32,8 +32,8 @@
 # CHECK-MAX-NEXT:          Maximum:         0x00000005
 # CHECK-MAX-NEXT:  - Type:
 
-# RUN: wasm-ld --import-memory --shared-memory --initial-memory=262144 \
-# RUN:     --max-memory=327680 -o %t.max.wasm %t.start.o
+# RUN: wasm-ld --import-memory --shared-memory --active-segments \
+# RUN:     --initial-memory=262144 --max-memory=327680 -o %t.max.wasm %t.start.o
 # RUN: obj2yaml %t.max.wasm | FileCheck -check-prefix=CHECK-SHARED %s
 
 # Verify the --shared-memory flag works with imports
diff --git a/deps/lld/test/wasm/init-fini-gc.ll b/deps/lld/test/wasm/init-fini-gc.ll
new file mode 100644
index 0000000000000000000000000000000000000000..4b2c14bd6858530c63aea2bd3b41b025b553dd46
--- /dev/null
+++ b/deps/lld/test/wasm/init-fini-gc.ll
@@ -0,0 +1,48 @@
+; RUN: llc -filetype=obj -o %t.o %s
+; RUN: wasm-ld %t.o -o %t.wasm
+; RUN: obj2yaml %t.wasm | FileCheck %s
+
+; RUN: wasm-ld %t.o -o %t.wasm
+; RUN: obj2yaml %t.wasm | FileCheck %s
+
+; RUN: wasm-ld --export=__wasm_call_ctors %t.o -o %t.export.wasm
+; RUN: obj2yaml %t.export.wasm | FileCheck %s -check-prefix=EXPORT
+
+; Test that the __wasm_call_ctor function if not referenced
+
+target triple = "wasm32-unknown-unknown"
+
+define hidden void @_start() {
+entry:
+  ret void
+}
+
+define hidden void @func1() {
+entry:
+  ret void
+}
+
+define hidden void @func2() {
+entry:
+  ret void
+}
+
+define i32 @__cxa_atexit(i32 %func, i32 %arg, i32 %dso_handle) {
+  ret i32 0
+}
+
+@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [
+  { i32, void ()*, i8* } { i32 1, void ()* @func1, i8* null }
+]
+
+@llvm.global_dtors = appending global [1 x { i32, void ()*, i8* }] [
+  { i32, void ()*, i8* } { i32 1, void ()* @func2, i8* null }
+]
+
+; CHECK-NOT: __cxa_atexit
+; CHECK-NOT: __wasm_call_ctors
+
+; EXPORT: __wasm_call_ctors
+; EXPORT: func1
+; EXPORT: func2
+; EXPORT: __cxa_atexit
diff --git a/deps/lld/test/wasm/init-fini.ll b/deps/lld/test/wasm/init-fini.ll
index b17020b177c71a79c1c565896493d2e26900cb7c..57be1a60d2d00896afd5cf8f7c4513bcba9df741 100644
--- a/deps/lld/test/wasm/init-fini.ll
+++ b/deps/lld/test/wasm/init-fini.ll
@@ -25,6 +25,7 @@ entry:
 
 declare hidden void @externCtor()
 declare hidden void @externDtor()
+declare hidden void @__wasm_call_ctors()
 
 define i32 @__cxa_atexit(i32 %func, i32 %arg, i32 %dso_handle) {
   ret i32 0
@@ -32,6 +33,7 @@ define i32 @__cxa_atexit(i32 %func, i32 %arg, i32 %dso_handle) {
 
 define hidden void @_start() {
 entry:
+  call void @__wasm_call_ctors();
   ret void
 }
 
@@ -75,7 +77,7 @@ entry:
 ; CHECK-NEXT:         Body:            10031004100A100F1012100F10141003100C100F10161001100E0B
 ; CHECK:            - Index:           22
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            024041868080800041004180888080001087808080000D000F0B00000B
+; CHECK-NEXT:         Body:            02404186808080004100418088808000108780808000450D0000000B0B
 ; CHECK-NEXT:   - Type:            CUSTOM
 ; CHECK-NEXT:     Name:            name
 ; CHECK-NEXT:     FunctionNames:
@@ -127,202 +129,22 @@ entry:
 ; CHECK-NEXT:         Name:            .Lregister_call_dtors.2002
 ; CHECK-NEXT: ...
 
-
 ; RUN: wasm-ld -r %t.o %t.global-ctor-dtor.o -o %t.reloc.wasm
-; RUN: obj2yaml %t.reloc.wasm | FileCheck -check-prefix=RELOC %s
+; RUN: llvm-readobj --symbols --sections %t.reloc.wasm | FileCheck -check-prefix=RELOC %s
 
-; RELOC:          SymbolTable:
-; RELOC-NEXT:       - Index:           0
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            func1
-; RELOC-NEXT:         Flags:           [ VISIBILITY_HIDDEN ]
-; RELOC-NEXT:         Function:        2
-; RELOC-NEXT:       - Index:           1
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            func2
-; RELOC-NEXT:         Flags:           [ VISIBILITY_HIDDEN ]
-; RELOC-NEXT:         Function:        3
-; RELOC-NEXT:       - Index:           2
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            func3
-; RELOC-NEXT:         Flags:           [ VISIBILITY_HIDDEN ]
-; RELOC-NEXT:         Function:        4
-; RELOC-NEXT:       - Index:           3
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            func4
-; RELOC-NEXT:         Flags:           [ VISIBILITY_HIDDEN ]
-; RELOC-NEXT:         Function:        5
-; RELOC-NEXT:       - Index:           4
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            __cxa_atexit
-; RELOC-NEXT:         Flags:           [  ]
-; RELOC-NEXT:         Function:        6
-; RELOC-NEXT:       - Index:           5
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            _start
-; RELOC-NEXT:         Flags:           [ VISIBILITY_HIDDEN ]
-; RELOC-NEXT:         Function:        7
-; RELOC-NEXT:       - Index:           6
-; RELOC-NEXT:         Kind:            DATA
-; RELOC-NEXT:         Name:            __dso_handle
-; RELOC-NEXT:         Flags:           [ BINDING_WEAK, VISIBILITY_HIDDEN, UNDEFINED ]
-; RELOC-NEXT:       - Index:           7
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            externDtor
-; RELOC-NEXT:         Flags:           [ VISIBILITY_HIDDEN, UNDEFINED ]
-; RELOC-NEXT:         Function:        0
-; RELOC-NEXT:       - Index:           8
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            externCtor
-; RELOC-NEXT:         Flags:           [ VISIBILITY_HIDDEN, UNDEFINED ]
-; RELOC-NEXT:         Function:        1
-; RELOC-NEXT:       - Index:           9
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            myctor
-; RELOC-NEXT:         Flags:           [ VISIBILITY_HIDDEN ]
-; RELOC-NEXT:         Function:        14
-; RELOC-NEXT:       - Index:           10
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            mydtor
-; RELOC-NEXT:         Flags:           [ VISIBILITY_HIDDEN ]
-; RELOC-NEXT:         Function:        15
-; RELOC-NEXT:       - Index:           11
-; RELOC-NEXT:         Kind:            GLOBAL
-; RELOC-NEXT:         Name:            __stack_pointer
-; RELOC-NEXT:         Flags:           [ UNDEFINED ]
-; RELOC-NEXT:         Global:          0
-; RELOC-NEXT:       - Index:           12
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            .Lcall_dtors.101
-; RELOC-NEXT:         Flags:           [ BINDING_LOCAL ]
-; RELOC-NEXT:         Function:        8
-; RELOC-NEXT:       - Index:           13
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            .Lregister_call_dtors.101
-; RELOC-NEXT:         Flags:           [ BINDING_LOCAL ]
-; RELOC-NEXT:         Function:        9
-; RELOC-NEXT:       - Index:           14
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            .Lcall_dtors.1001
-; RELOC-NEXT:         Flags:           [ BINDING_LOCAL ]
-; RELOC-NEXT:         Function:        10
-; RELOC-NEXT:       - Index:           15
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            .Lregister_call_dtors.1001
-; RELOC-NEXT:         Flags:           [ BINDING_LOCAL ]
-; RELOC-NEXT:         Function:        11
-; RELOC-NEXT:       - Index:           16
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            .Lcall_dtors.4000
-; RELOC-NEXT:         Flags:           [ BINDING_LOCAL ]
-; RELOC-NEXT:         Function:        12
-; RELOC-NEXT:       - Index:           17
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            .Lregister_call_dtors.4000
-; RELOC-NEXT:         Flags:           [ BINDING_LOCAL ]
-; RELOC-NEXT:         Function:        13
-; RELOC-NEXT:       - Index:           18
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            .Lcall_dtors.101
-; RELOC-NEXT:         Flags:           [ BINDING_LOCAL ]
-; RELOC-NEXT:         Function:        16
-; RELOC-NEXT:       - Index:           19
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            .Lregister_call_dtors.101
-; RELOC-NEXT:         Flags:           [ BINDING_LOCAL ]
-; RELOC-NEXT:         Function:        17
-; RELOC-NEXT:       - Index:           20
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            .Lcall_dtors.202
-; RELOC-NEXT:         Flags:           [ BINDING_LOCAL ]
-; RELOC-NEXT:         Function:        18
-; RELOC-NEXT:       - Index:           21
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            .Lregister_call_dtors.202
-; RELOC-NEXT:         Flags:           [ BINDING_LOCAL ]
-; RELOC-NEXT:         Function:        19
-; RELOC-NEXT:       - Index:           22
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            .Lcall_dtors.2002
-; RELOC-NEXT:         Flags:           [ BINDING_LOCAL ]
-; RELOC-NEXT:         Function:        20
-; RELOC-NEXT:       - Index:           23
-; RELOC-NEXT:         Kind:            FUNCTION
-; RELOC-NEXT:         Name:            .Lregister_call_dtors.2002
-; RELOC-NEXT:         Flags:           [ BINDING_LOCAL ]
-; RELOC-NEXT:         Function:        21
-; RELOC-NEXT:     InitFunctions:   
-; RELOC-NEXT:       - Priority:        101
-; RELOC-NEXT:         Symbol:          0
-; RELOC-NEXT:       - Priority:        101
-; RELOC-NEXT:         Symbol:          1
-; RELOC-NEXT:       - Priority:        101
-; RELOC-NEXT:         Symbol:          13
-; RELOC-NEXT:       - Priority:        101
-; RELOC-NEXT:         Symbol:          9
-; RELOC-NEXT:       - Priority:        101
-; RELOC-NEXT:         Symbol:          19
-; RELOC-NEXT:       - Priority:        202
-; RELOC-NEXT:         Symbol:          9
-; RELOC-NEXT:       - Priority:        202
-; RELOC-NEXT:         Symbol:          21
-; RELOC-NEXT:       - Priority:        1001
-; RELOC-NEXT:         Symbol:          0
-; RELOC-NEXT:       - Priority:        1001
-; RELOC-NEXT:         Symbol:          15
-; RELOC-NEXT:       - Priority:        2002
-; RELOC-NEXT:         Symbol:          9
-; RELOC-NEXT:       - Priority:        2002
-; RELOC-NEXT:         Symbol:          23
-; RELOC-NEXT:       - Priority:        4000
-; RELOC-NEXT:         Symbol:          8
-; RELOC-NEXT:       - Priority:        4000
-; RELOC-NEXT:         Symbol:          17
-; RELOC-NEXT:   - Type:            CUSTOM
-; RELOC-NEXT:     Name:            name
-; RELOC-NEXT:     FunctionNames:   
-; RELOC-NEXT:       - Index:           0
-; RELOC-NEXT:         Name:            externDtor
-; RELOC-NEXT:       - Index:           1
-; RELOC-NEXT:         Name:            externCtor
-; RELOC-NEXT:       - Index:           2
-; RELOC-NEXT:         Name:            func1
-; RELOC-NEXT:       - Index:           3
-; RELOC-NEXT:         Name:            func2
-; RELOC-NEXT:       - Index:           4
-; RELOC-NEXT:         Name:            func3
-; RELOC-NEXT:       - Index:           5
-; RELOC-NEXT:         Name:            func4
-; RELOC-NEXT:       - Index:           6
-; RELOC-NEXT:         Name:            __cxa_atexit
-; RELOC-NEXT:       - Index:           7
-; RELOC-NEXT:         Name:            _start
-; RELOC-NEXT:       - Index:           8
-; RELOC-NEXT:         Name:            .Lcall_dtors.101
-; RELOC-NEXT:       - Index:           9
-; RELOC-NEXT:         Name:            .Lregister_call_dtors.101
-; RELOC-NEXT:       - Index:           10
-; RELOC-NEXT:         Name:            .Lcall_dtors.1001
-; RELOC-NEXT:       - Index:           11
-; RELOC-NEXT:         Name:            .Lregister_call_dtors.1001
-; RELOC-NEXT:       - Index:           12
-; RELOC-NEXT:         Name:            .Lcall_dtors.4000
-; RELOC-NEXT:       - Index:           13
-; RELOC-NEXT:         Name:            .Lregister_call_dtors.4000
-; RELOC-NEXT:       - Index:           14
-; RELOC-NEXT:         Name:            myctor
-; RELOC-NEXT:       - Index:           15
-; RELOC-NEXT:         Name:            mydtor
-; RELOC-NEXT:       - Index:           16
-; RELOC-NEXT:         Name:            .Lcall_dtors.101
-; RELOC-NEXT:       - Index:           17
-; RELOC-NEXT:         Name:            .Lregister_call_dtors.101
-; RELOC-NEXT:       - Index:           18
-; RELOC-NEXT:         Name:            .Lcall_dtors.202
-; RELOC-NEXT:       - Index:           19
-; RELOC-NEXT:         Name:            .Lregister_call_dtors.202
-; RELOC-NEXT:       - Index:           20
-; RELOC-NEXT:         Name:            .Lcall_dtors.2002
-; RELOC-NEXT:       - Index:           21
-; RELOC-NEXT:         Name:            .Lregister_call_dtors.2002
-; RELOC-NEXT: ...
+; RELOC:       Name: linking
+; RELOC-NEXT:  InitFunctions [
+; RELOC-NEXT:    0 (priority=101)
+; RELOC-NEXT:    1 (priority=101)
+; RELOC-NEXT:    14 (priority=101)
+; RELOC-NEXT:    10 (priority=101)
+; RELOC-NEXT:    20 (priority=101)
+; RELOC-NEXT:    10 (priority=202)
+; RELOC-NEXT:    22 (priority=202)
+; RELOC-NEXT:    0 (priority=1001)
+; RELOC-NEXT:    16 (priority=1001)
+; RELOC-NEXT:    10 (priority=2002)
+; RELOC-NEXT:    24 (priority=2002)
+; RELOC-NEXT:    9 (priority=4000)
+; RELOC-NEXT:    18 (priority=4000)
+; RELOC-NEXT:  ]
diff --git a/deps/lld/test/wasm/large-memory.test b/deps/lld/test/wasm/large-memory.test
new file mode 100644
index 0000000000000000000000000000000000000000..8d403b5f6ab58754d22705c81476a7dde92e2222
--- /dev/null
+++ b/deps/lld/test/wasm/large-memory.test
@@ -0,0 +1,5 @@
+RUN: llc -filetype=obj %p/Inputs/start.ll -o %t.o
+
+; Verify we can parse large integers such as when we ask for 2G of total
+; memory.
+RUN: wasm-ld %t.o -o %t.wasm --max-memory=2147483648
diff --git a/deps/lld/test/wasm/lit.local.cfg b/deps/lld/test/wasm/lit.local.cfg
index bc76e57c8e8738617e5ed69dd522916b4b21cf80..0b3ba0937d4241dcc33490bb22a9524c940d29e2 100644
--- a/deps/lld/test/wasm/lit.local.cfg
+++ b/deps/lld/test/wasm/lit.local.cfg
@@ -1,4 +1,4 @@
 if 'wasm' not in config.available_features:
   config.unsupported = True
 
-config.suffixes = ['.test', '.yaml', '.ll']
+config.suffixes = ['.test', '.yaml', '.ll', '.s']
diff --git a/deps/lld/test/wasm/local-symbols.ll b/deps/lld/test/wasm/local-symbols.ll
index dd92b4ec9bc5df4f2678d6d0f344cb6520b5a40b..58d0ddbf70b9a3a266c8de9d68328a903b3bf7df 100644
--- a/deps/lld/test/wasm/local-symbols.ll
+++ b/deps/lld/test/wasm/local-symbols.ll
@@ -27,13 +27,13 @@ entry:
 ; CHECK-NEXT:   - Type:            TYPE
 ; CHECK-NEXT:     Signatures:
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         ReturnType:      NORESULT
-; CHECK-NEXT:         ParamTypes:
-; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         ReturnType:      I32
 ; CHECK-NEXT:         ParamTypes:
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         ReturnType:      NORESULT
+; CHECK-NEXT:         ParamTypes:
 ; CHECK-NEXT:   - Type:            FUNCTION
-; CHECK-NEXT:     FunctionTypes:   [ 0, 1, 0 ]
+; CHECK-NEXT:     FunctionTypes:   [ 0, 1 ]
 ; CHECK-NEXT:   - Type:            TABLE
 ; CHECK-NEXT:     Tables:
 ; CHECK-NEXT:       - ElemType:        FUNCREF
@@ -57,51 +57,30 @@ entry:
 ; CHECK-NEXT:         Mutable:         false
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           66576
-; CHECK-NEXT:       - Index:           2
-; CHECK-NEXT:         Type:            I32
-; CHECK-NEXT:         Mutable:         false
-; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           1032
-; CHECK-NEXT:       - Index:           3
-; CHECK-NEXT:         Type:            I32
-; CHECK-NEXT:         Mutable:         false
-; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1024
 ; CHECK-NEXT:   - Type:            EXPORT
 ; CHECK-NEXT:     Exports:
 ; CHECK-NEXT:       - Name:            memory
 ; CHECK-NEXT:         Kind:            MEMORY
 ; CHECK-NEXT:         Index:           0
-; CHECK-NEXT:       - Name:            __heap_base
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           1
-; CHECK-NEXT:       - Name:            __data_end
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            _start
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           2
+; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:       - Name:            foo
 ; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           3
+; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:   - Type:            CODE
 ; CHECK-NEXT:     Functions:
 ; CHECK-NEXT:       - Index:           0
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            0B
-; CHECK-NEXT:       - Index:           1
-; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4100280284888080000B
-; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            1081808080001A0B
+; CHECK-NEXT:         Body:            1080808080001A0B
 ; CHECK-NEXT:   - Type:            DATA
 ; CHECK-NEXT:     Segments:
 ; CHECK-NEXT:       - SectionOffset:   7
-; CHECK-NEXT:         MemoryIndex:     0
+; CHECK-NEXT:         InitFlags:       0
 ; CHECK-NEXT:         Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1024
@@ -110,9 +89,7 @@ entry:
 ; CHECK-NEXT:     Name:            name
 ; CHECK-NEXT:     FunctionNames:
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            __wasm_call_ctors
-; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            baz
-; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            _start
 ; CHECK-NEXT: ...
diff --git a/deps/lld/test/wasm/locals-duplicate.test b/deps/lld/test/wasm/locals-duplicate.test
index 74383bf429f69ba9a3afc050105e2b5ac3eb91a3..ce02c7fc3bf81b3899441c6a7315264ef70b1427 100644
--- a/deps/lld/test/wasm/locals-duplicate.test
+++ b/deps/lld/test/wasm/locals-duplicate.test
@@ -10,14 +10,11 @@
 ; CHECK-NEXT:   - Type:            TYPE
 ; CHECK-NEXT:     Signatures:
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         ReturnType:      NORESULT
-; CHECK-NEXT:         ParamTypes:
-; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         ReturnType:      I32
 ; CHECK-NEXT:         ParamTypes:
 ; CHECK-NEXT:   - Type:            FUNCTION
-; CHECK-NEXT:     FunctionTypes:   [ 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-; CHECK-NEXT:                        1, 1, 1 ]
+; CHECK-NEXT:     FunctionTypes:   [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+; CHECK-NEXT:                        0, 0 ]
 ; CHECK-NEXT:   - Type:            TABLE
 ; CHECK-NEXT:     Tables:
 ; CHECK-NEXT:       - ElemType:        FUNCREF
@@ -41,20 +38,8 @@
 ; CHECK-NEXT:         Mutable:         false
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           66592
-; CHECK-NEXT:       - Index:           2
-; CHECK-NEXT:         Type:            I32
-; CHECK-NEXT:         Mutable:         false
-; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           1048
-; CHECK-NEXT:       - Index:           3
-; CHECK-NEXT:         Type:            I32
-; CHECK-NEXT:         Mutable:         false
-; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1028
-; CHECK-NEXT:       - Index:           4
+; CHECK-NEXT:       - Index:           2
 ; CHECK-NEXT:         Type:            I32
 ; CHECK-NEXT:         Mutable:         false
 ; CHECK-NEXT:         InitExpr:
@@ -65,71 +50,65 @@
 ; CHECK-NEXT:       - Name:            memory
 ; CHECK-NEXT:         Kind:            MEMORY
 ; CHECK-NEXT:         Index:           0
-; CHECK-NEXT:       - Name:            __heap_base
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           1
-; CHECK-NEXT:       - Name:            __data_end
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            colliding_func2
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           2
+; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:       - Name:            get_global1A
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           4
+; CHECK-NEXT:         Index:           3
 ; CHECK-NEXT:       - Name:            get_global2A
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           5
+; CHECK-NEXT:         Index:           4
 ; CHECK-NEXT:       - Name:            colliding_global2
 ; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           3
+; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:       - Name:            get_global3A
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           6
+; CHECK-NEXT:         Index:           5
 ; CHECK-NEXT:       - Name:            get_func1A
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           7
+; CHECK-NEXT:         Index:           6
 ; CHECK-NEXT:       - Name:            get_func2A
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           8
+; CHECK-NEXT:         Index:           7
 ; CHECK-NEXT:       - Name:            get_func3A
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           9
+; CHECK-NEXT:         Index:           8
 ; CHECK-NEXT:       - Name:            colliding_func1
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           10
+; CHECK-NEXT:         Index:           9
 ; CHECK-NEXT:       - Name:            get_global1B
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           13
+; CHECK-NEXT:         Index:           12
 ; CHECK-NEXT:       - Name:            colliding_global1
 ; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           4
+; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            get_global2B
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           14
+; CHECK-NEXT:         Index:           13
 ; CHECK-NEXT:       - Name:            get_global3B
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           15
+; CHECK-NEXT:         Index:           14
 ; CHECK-NEXT:       - Name:            get_func1B
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           16
+; CHECK-NEXT:         Index:           15
 ; CHECK-NEXT:       - Name:            get_func2B
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           17
+; CHECK-NEXT:         Index:           16
 ; CHECK-NEXT:       - Name:            get_func3B
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           18
+; CHECK-NEXT:         Index:           17
 ; CHECK-NEXT:   - Type:            ELEM
 ; CHECK-NEXT:     Segments:
 ; CHECK-NEXT:       - Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1
-; CHECK-NEXT:         Functions:       [ 1, 2, 3, 10, 11, 12 ]
+; CHECK-NEXT:         Functions:       [ 0, 1, 2, 9, 10, 11 ]
 ; CHECK-NEXT:   - Type:            CODE
 ; CHECK-NEXT:     Functions:
 ; CHECK-NEXT:       - Index:           0
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            0B
+; CHECK-NEXT:         Body:            41020B
 ; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            41020B
@@ -138,25 +117,25 @@
 ; CHECK-NEXT:         Body:            41020B
 ; CHECK-NEXT:       - Index:           3
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            41020B
-; CHECK-NEXT:       - Index:           4
-; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4180888080000B
-; CHECK-NEXT:       - Index:           5
+; CHECK-NEXT:       - Index:           4
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4184888080000B
-; CHECK-NEXT:       - Index:           6
+; CHECK-NEXT:       - Index:           5
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4188888080000B
-; CHECK-NEXT:       - Index:           7
+; CHECK-NEXT:       - Index:           6
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4181808080000B
-; CHECK-NEXT:       - Index:           8
+; CHECK-NEXT:       - Index:           7
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4182808080000B
-; CHECK-NEXT:       - Index:           9
+; CHECK-NEXT:       - Index:           8
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4183808080000B
+; CHECK-NEXT:       - Index:           9
+; CHECK-NEXT:         Locals:
+; CHECK-NEXT:         Body:            41020B
 ; CHECK-NEXT:       - Index:           10
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            41020B
@@ -165,29 +144,26 @@
 ; CHECK-NEXT:         Body:            41020B
 ; CHECK-NEXT:       - Index:           12
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            41020B
-; CHECK-NEXT:       - Index:           13
-; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            418C888080000B
-; CHECK-NEXT:       - Index:           14
+; CHECK-NEXT:       - Index:           13
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4190888080000B
-; CHECK-NEXT:       - Index:           15
+; CHECK-NEXT:       - Index:           14
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4194888080000B
-; CHECK-NEXT:       - Index:           16
+; CHECK-NEXT:       - Index:           15
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4184808080000B
-; CHECK-NEXT:       - Index:           17
+; CHECK-NEXT:       - Index:           16
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4185808080000B
-; CHECK-NEXT:       - Index:           18
+; CHECK-NEXT:       - Index:           17
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4186808080000B
 ; CHECK-NEXT:   - Type:            DATA
 ; CHECK-NEXT:     Segments:
 ; CHECK-NEXT:       - SectionOffset:   7
-; CHECK-NEXT:         MemoryIndex:     0
+; CHECK-NEXT:         InitFlags:       0
 ; CHECK-NEXT:         Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1024
@@ -196,42 +172,40 @@
 ; CHECK-NEXT:     Name:            name
 ; CHECK-NEXT:     FunctionNames:
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            __wasm_call_ctors
-; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            colliding_func1
-; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            colliding_func2
-; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:       - Index:           2
 ; CHECK-NEXT:         Name:            colliding_func3
-; CHECK-NEXT:       - Index:           4
+; CHECK-NEXT:       - Index:           3
 ; CHECK-NEXT:         Name:            get_global1A
-; CHECK-NEXT:       - Index:           5
+; CHECK-NEXT:       - Index:           4
 ; CHECK-NEXT:         Name:            get_global2A
-; CHECK-NEXT:       - Index:           6
+; CHECK-NEXT:       - Index:           5
 ; CHECK-NEXT:         Name:            get_global3A
-; CHECK-NEXT:       - Index:           7
+; CHECK-NEXT:       - Index:           6
 ; CHECK-NEXT:         Name:            get_func1A
-; CHECK-NEXT:       - Index:           8
+; CHECK-NEXT:       - Index:           7
 ; CHECK-NEXT:         Name:            get_func2A
-; CHECK-NEXT:       - Index:           9
+; CHECK-NEXT:       - Index:           8
 ; CHECK-NEXT:         Name:            get_func3A
-; CHECK-NEXT:       - Index:           10
+; CHECK-NEXT:       - Index:           9
 ; CHECK-NEXT:         Name:            colliding_func1
-; CHECK-NEXT:       - Index:           11
+; CHECK-NEXT:       - Index:           10
 ; CHECK-NEXT:         Name:            colliding_func2
-; CHECK-NEXT:       - Index:           12
+; CHECK-NEXT:       - Index:           11
 ; CHECK-NEXT:         Name:            colliding_func3
-; CHECK-NEXT:       - Index:           13
+; CHECK-NEXT:       - Index:           12
 ; CHECK-NEXT:         Name:            get_global1B
-; CHECK-NEXT:       - Index:           14
+; CHECK-NEXT:       - Index:           13
 ; CHECK-NEXT:         Name:            get_global2B
-; CHECK-NEXT:       - Index:           15
+; CHECK-NEXT:       - Index:           14
 ; CHECK-NEXT:         Name:            get_global3B
-; CHECK-NEXT:       - Index:           16
+; CHECK-NEXT:       - Index:           15
 ; CHECK-NEXT:         Name:            get_func1B
-; CHECK-NEXT:       - Index:           17
+; CHECK-NEXT:       - Index:           16
 ; CHECK-NEXT:         Name:            get_func2B
-; CHECK-NEXT:       - Index:           18
+; CHECK-NEXT:       - Index:           17
 ; CHECK-NEXT:         Name:            get_func3B
 ; CHECK-NEXT: ...
 
@@ -269,40 +243,40 @@
 ; RELOC-NEXT:         Functions:       [ 0, 1, 2, 9, 10, 11 ]
 ; RELOC-NEXT:   - Type:            CODE
 ; RELOC-NEXT:     Relocations:
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_SLEB
+; RELOC-NEXT:       - Type:            R_WASM_MEMORY_ADDR_SLEB
 ; RELOC-NEXT:         Index:           18
 ; RELOC-NEXT:         Offset:          0x00000013
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_SLEB
+; RELOC-NEXT:       - Type:            R_WASM_MEMORY_ADDR_SLEB
 ; RELOC-NEXT:         Index:           3
 ; RELOC-NEXT:         Offset:          0x0000001C
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_SLEB
+; RELOC-NEXT:       - Type:            R_WASM_MEMORY_ADDR_SLEB
 ; RELOC-NEXT:         Index:           19
 ; RELOC-NEXT:         Offset:          0x00000025
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_TABLE_INDEX_SLEB
+; RELOC-NEXT:       - Type:            R_WASM_TABLE_INDEX_SLEB
 ; RELOC-NEXT:         Index:           16
 ; RELOC-NEXT:         Offset:          0x0000002E
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_TABLE_INDEX_SLEB
+; RELOC-NEXT:       - Type:            R_WASM_TABLE_INDEX_SLEB
 ; RELOC-NEXT:         Index:           0
 ; RELOC-NEXT:         Offset:          0x00000037
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_TABLE_INDEX_SLEB
+; RELOC-NEXT:       - Type:            R_WASM_TABLE_INDEX_SLEB
 ; RELOC-NEXT:         Index:           17
 ; RELOC-NEXT:         Offset:          0x00000040
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_SLEB
+; RELOC-NEXT:       - Type:            R_WASM_MEMORY_ADDR_SLEB
 ; RELOC-NEXT:         Index:           10
 ; RELOC-NEXT:         Offset:          0x00000058
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_SLEB
+; RELOC-NEXT:       - Type:            R_WASM_MEMORY_ADDR_SLEB
 ; RELOC-NEXT:         Index:           22
 ; RELOC-NEXT:         Offset:          0x00000061
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_SLEB
+; RELOC-NEXT:       - Type:            R_WASM_MEMORY_ADDR_SLEB
 ; RELOC-NEXT:         Index:           23
 ; RELOC-NEXT:         Offset:          0x0000006A
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_TABLE_INDEX_SLEB
+; RELOC-NEXT:       - Type:            R_WASM_TABLE_INDEX_SLEB
 ; RELOC-NEXT:         Index:           8
 ; RELOC-NEXT:         Offset:          0x00000073
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_TABLE_INDEX_SLEB
+; RELOC-NEXT:       - Type:            R_WASM_TABLE_INDEX_SLEB
 ; RELOC-NEXT:         Index:           20
 ; RELOC-NEXT:         Offset:          0x0000007C
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_TABLE_INDEX_SLEB
+; RELOC-NEXT:       - Type:            R_WASM_TABLE_INDEX_SLEB
 ; RELOC-NEXT:         Index:           21
 ; RELOC-NEXT:         Offset:          0x00000085
 ; RELOC-NEXT:     Functions:
@@ -363,19 +337,19 @@
 ; RELOC-NEXT:   - Type:            DATA
 ; RELOC-NEXT:     Segments:
 ; RELOC-NEXT:       - SectionOffset:   6
-; RELOC-NEXT:         MemoryIndex:     0
+; RELOC-NEXT:         InitFlags:       0
 ; RELOC-NEXT:         Offset:
 ; RELOC-NEXT:           Opcode:          I32_CONST
 ; RELOC-NEXT:           Value:           0
 ; RELOC-NEXT:         Content:         '0000000000000000'
 ; RELOC-NEXT:       - SectionOffset:   19
-; RELOC-NEXT:         MemoryIndex:     0
+; RELOC-NEXT:         InitFlags:       0
 ; RELOC-NEXT:         Offset:
 ; RELOC-NEXT:           Opcode:          I32_CONST
 ; RELOC-NEXT:           Value:           8
 ; RELOC-NEXT:         Content:         '0000000000000000'
 ; RELOC-NEXT:       - SectionOffset:   32
-; RELOC-NEXT:         MemoryIndex:     0
+; RELOC-NEXT:         InitFlags:       0
 ; RELOC-NEXT:         Offset:
 ; RELOC-NEXT:           Opcode:          I32_CONST
 ; RELOC-NEXT:           Value:           16
diff --git a/deps/lld/test/wasm/lto/archive.ll b/deps/lld/test/wasm/lto/archive.ll
index ab067d8cdce463b75ef5816aa0521a0ee3229e4c..89863bfea703286ec816a3b38f2dd1783bd3952b 100644
--- a/deps/lld/test/wasm/lto/archive.ll
+++ b/deps/lld/test/wasm/lto/archive.ll
@@ -18,8 +18,6 @@ declare void @f()
 ; CHECK:         Name:            name
 ; CHECK-NEXT:    FunctionNames:
 ; CHECK-NEXT:      - Index:           0
-; CHECK-NEXT:        Name:            __wasm_call_ctors
-; CHECK-NEXT:      - Index:           1
 ; CHECK-NEXT:        Name:            _start
-; CHECK-NEXT:      - Index:           2
+; CHECK-NEXT:      - Index:           1
 ; CHECK-NEXT:        Name:            f
diff --git a/deps/lld/test/wasm/lto/atomics.ll b/deps/lld/test/wasm/lto/atomics.ll
index a5a82ae2a5fca2effed2355b747663189b71ad58..00340f12b2b50b910913c7ff7d2518660f6a28d9 100644
--- a/deps/lld/test/wasm/lto/atomics.ll
+++ b/deps/lld/test/wasm/lto/atomics.ll
@@ -1,7 +1,8 @@
 ; RUN: llvm-as %s -o %t.o
 ; RUN: wasm-ld %t.o -o %t.wasm -lto-O0
-; Atomic operations with fail to compile if the ThreadModel is not
-; correctly set to Single (i.e. if atomics are not lowered to regular ops).
+
+; Atomic operations will not fail to compile if atomics are not
+; enabled because LLVM atomics will be lowered to regular ops.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
 target triple = "wasm32-unknown-unknown-wasm"
diff --git a/deps/lld/test/wasm/lto/comdat.ll b/deps/lld/test/wasm/lto/comdat.ll
new file mode 100644
index 0000000000000000000000000000000000000000..54c9f0f3b47b60c2840b5642d634dd224061dfca
--- /dev/null
+++ b/deps/lld/test/wasm/lto/comdat.ll
@@ -0,0 +1,17 @@
+; Verify that comdat symbols can be defined in LTO objects.  We had a
+; regression where the comdat handling code was causing symbol in the lto object
+; to be ignored.
+; RUN: llvm-as %s -o %t.bc
+; RUN: llc -filetype=obj %s -o %t.o
+; RUN: wasm-ld %t.bc %t.o -o %t.wasm
+; RUN: wasm-ld %t.o %t.bc -o %t.wasm
+
+target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
+target triple = "wasm32-unknown-unknown"
+
+$foo = comdat any
+
+define void @_start() comdat($foo) {
+entry:
+  ret void
+}
diff --git a/deps/lld/test/wasm/lto/export.ll b/deps/lld/test/wasm/lto/export.ll
index 0ff0be504eda6015215d9918f0fd16ddb03a8b6d..b6dba4de583352b8f8f08e762c1b322ac2ec996e 100644
--- a/deps/lld/test/wasm/lto/export.ll
+++ b/deps/lld/test/wasm/lto/export.ll
@@ -23,16 +23,10 @@ entry:
 ; CHECK-NEXT:       - Name:            memory
 ; CHECK-NEXT:         Kind:            MEMORY
 ; CHECK-NEXT:         Index:           0
-; CHECK-NEXT:       - Name:            __heap_base
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           1
-; CHECK-NEXT:       - Name:            __data_end
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            hidden_function
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           1
+; CHECK-NEXT:         Index:           0
 ; CHECK-NEXT:       - Name:            _start
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           2
+; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:   - Type:            CODE
diff --git a/deps/lld/test/wasm/lto/lto-start.ll b/deps/lld/test/wasm/lto/lto-start.ll
index 6e8f99c95308a697716cdc0e074757d65314e8c1..d21079577322d73e15ffbeac3679520f3de55cdd 100644
--- a/deps/lld/test/wasm/lto/lto-start.ll
+++ b/deps/lld/test/wasm/lto/lto-start.ll
@@ -6,8 +6,6 @@
 ; CHECK-NEXT:     Name:            name
 ; CHECK-NEXT:     FunctionNames:   
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            __wasm_call_ctors
-; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            _start
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
diff --git a/deps/lld/test/wasm/lto/opt-level.ll b/deps/lld/test/wasm/lto/opt-level.ll
index b7e6a4cdc70a3f6e84f91de401a22a5664149b65..f6156e725c7d14aa52f3d46dcfab7f93f43152e3 100644
--- a/deps/lld/test/wasm/lto/opt-level.ll
+++ b/deps/lld/test/wasm/lto/opt-level.ll
@@ -7,11 +7,11 @@
 ; RUN: obj2yaml %t2a | FileCheck --check-prefix=CHECK-O2 %s
 
 ; Reject invalid optimization levels.
-; RUN: not ld.lld -o %t3 -e main --lto-O6 %t.o 2>&1 | \
+; RUN: not wasm-ld -o %t3 -e main --lto-O6 %t.o 2>&1 | \
 ; RUN:   FileCheck --check-prefix=INVALID %s
 ; INVALID: invalid optimization level for LTO: 6
 
-; RUN: not ld.lld -o %t3 -m elf_x86_64 -e main --lto-O-1 %t.o 2>&1 | \
+; RUN: not wasm-ld -o %t3 -m elf_x86_64 -e main --lto-O-1 %t.o 2>&1 | \
 ; RUN:   FileCheck --check-prefix=INVALIDNEGATIVE %s
 ; INVALIDNEGATIVE: invalid optimization level for LTO: 4294967295
 
diff --git a/deps/lld/test/wasm/lto/relocatable.ll b/deps/lld/test/wasm/lto/relocatable.ll
new file mode 100644
index 0000000000000000000000000000000000000000..aeca2fc227fe60ed64c4b280469d0e111ccb4db1
--- /dev/null
+++ b/deps/lld/test/wasm/lto/relocatable.ll
@@ -0,0 +1,27 @@
+; RUN: llvm-as %s -o %t1.o
+; RUN: wasm-ld %t1.o -r -o %t
+; RUN: llvm-readobj --symbols %t | FileCheck %s
+
+; CHECK:      Symbols [
+; CHECK-NEXT:   Symbol {
+; CHECK-NEXT:     Name: foo
+; CHECK-NEXT:     Type: FUNCTION (0x0)
+; CHECK-NEXT:     Flags [ (0x0)
+; CHECK-NEXT:     ]
+; CHECK-NEXT:     ElementIndex: 0x0
+; CHECK-NEXT:   }
+; CHECK-NEXT: ]
+
+target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
+target triple = "wasm32-unknown-unknown"
+
+define void @foo() {
+  call void @bar()
+  ret void
+}
+
+define internal void @bar() {
+  ret void
+}
+
+declare i32 @baz(...)
diff --git a/deps/lld/test/wasm/lto/signature-mismatch.ll b/deps/lld/test/wasm/lto/signature-mismatch.ll
index e48bb39cd8d97963c8879f0f4e6a5b22cc2cf6dc..e12d91866023ae75ce2d7feffdaa8ff5d14077cf 100644
--- a/deps/lld/test/wasm/lto/signature-mismatch.ll
+++ b/deps/lld/test/wasm/lto/signature-mismatch.ll
@@ -15,5 +15,6 @@ define void @_start() {
   ret void
 }
 
+; CHECK: error: function signature mismatch: f
 ; CHECK: >>> defined as (i32) -> void in {{.*}}signature-mismatch.ll.tmp1.o
 ; CHECK: >>> defined as () -> void in lto.tmp
diff --git a/deps/lld/test/wasm/lto/undef.ll b/deps/lld/test/wasm/lto/undef.ll
index 729007b50c05981e019131afc5595b10a320a3e0..65e8e4642d5e01ddcfd80ada77c4f66de2e1069c 100644
--- a/deps/lld/test/wasm/lto/undef.ll
+++ b/deps/lld/test/wasm/lto/undef.ll
@@ -5,10 +5,22 @@
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
 target triple = "wasm32-unknown-unknown"
 
-declare void @bar()
+declare i32 @bar()
+
+; Symbols such as foo which are only called indirectly are handled slightly
+; differently with resepect to signature checking.
+declare i32 @foo()
+
+@ptr = global i8* bitcast (i32 ()* @foo to i8*), align 8
+; Ensure access to ptr is not inlined below, even under LTO
+@llvm.used = appending global [1 x i8**] [i8** @ptr], section "llvm.metadata"
 
 define void @_start() {
-  call void @bar()
+  call i32 @bar()
+
+  %addr = load i32 ()*, i32 ()** bitcast (i8** @ptr to i32 ()**), align 8
+  call i32 %addr()
+
   ret void
 }
 
@@ -18,3 +30,7 @@ define void @_start() {
 ; CHECK-NEXT:        Field:           bar
 ; CHECK-NEXT:        Kind:            FUNCTION
 ; CHECK-NEXT:        SigIndex:        0
+; CHECK-NEXT:      - Module:          env
+; CHECK-NEXT:        Field:           foo
+; CHECK-NEXT:        Kind:            FUNCTION
+; CHECK-NEXT:        SigIndex:        0
diff --git a/deps/lld/test/wasm/lto/used.ll b/deps/lld/test/wasm/lto/used.ll
index 8bf840366cc5fe64730d4296a5447678894d3cb0..15e6b41a73cf7a51007f0946a33da421e0d8e2c4 100644
--- a/deps/lld/test/wasm/lto/used.ll
+++ b/deps/lld/test/wasm/lto/used.ll
@@ -28,7 +28,7 @@ return:
 ; CHECK:        - Type:            DATA
 ; CHECK-NEXT:     Segments:
 ; CHECK-NEXT:       - SectionOffset:   7
-; CHECK-NEXT:         MemoryIndex:     0
+; CHECK-NEXT:         InitFlags:       0
 ; CHECK-NEXT:         Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1024
@@ -38,8 +38,6 @@ return:
 ; CHECK-NEXT:    Name:            name
 ; CHECK-NEXT:    FunctionNames:   
 ; CHECK-NEXT:      - Index:           0
-; CHECK-NEXT:        Name:            __wasm_call_ctors
-; CHECK-NEXT:      - Index:           1
 ; CHECK-NEXT:        Name:            _start
-; CHECK-NEXT:      - Index:           2
+; CHECK-NEXT:      - Index:           1
 ; CHECK-NEXT:        Name:            bar
diff --git a/deps/lld/test/wasm/lto/weak-undefined.ll b/deps/lld/test/wasm/lto/weak-undefined.ll
new file mode 100644
index 0000000000000000000000000000000000000000..5eb405afa2e652bcf9be895a44b65c3f336f6187
--- /dev/null
+++ b/deps/lld/test/wasm/lto/weak-undefined.ll
@@ -0,0 +1,20 @@
+; RUN: llvm-as %s -o %t.o
+; RUN: wasm-ld %t.o -o %t.wasm
+; RUN: obj2yaml %t.wasm | FileCheck %s
+
+; Test that undefined weak external functions are handled in the LTO case
+; We had a bug where stub function generation was failing because functions
+; that are in bitcode (pre-LTO) don't have signatures assigned.
+
+target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
+target triple = "wasm32-unknown-unknown"
+
+declare extern_weak i32 @foo()
+
+define void @_start() #0 {
+entry:
+    %call2 = call i32 @foo()
+    ret void
+}
+
+; CHECK: Name:            'undefined:foo'
diff --git a/deps/lld/test/wasm/lto/weak.ll b/deps/lld/test/wasm/lto/weak.ll
index 03a017c1a183359e4b20150e10e026a5280cfb7d..571b79f9c0d82d2aaf60012a985928c2eb8db17c 100644
--- a/deps/lld/test/wasm/lto/weak.ll
+++ b/deps/lld/test/wasm/lto/weak.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-as %s -o %t.o
 ; RUN: wasm-ld %t.o %t.o -o %t.wasm -r
-; RUN: llvm-readobj -t %t.wasm | FileCheck %s
+; RUN: llvm-readobj --symbols %t.wasm | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
 target triple = "wasm32-unknown-unknown-wasm"
@@ -12,5 +12,8 @@ define weak void @f() {
 ; CHECK:        Symbol {
 ; CHECK-NEXT:     Name: f
 ; CHECK-NEXT:     Type: FUNCTION (0x0)
-; CHECK-NEXT:     Flags: 0x1
+; CHECK-NEXT:     Flags [ (0x1)
+; CHECK-NEXT:       BINDING_WEAK (0x1)
+; CHECK-NEXT:     ]
+; CHECK-NEXT:     ElementIndex: 0x0
 ; CHECK-NEXT:   }
diff --git a/deps/lld/test/wasm/many-functions.ll b/deps/lld/test/wasm/many-functions.ll
index e2191bed9ed609c7495e983cf9f16a6f504e56d0..9ecb38d92df11daab8e06948de1a4f5d6958a81d 100644
--- a/deps/lld/test/wasm/many-functions.ll
+++ b/deps/lld/test/wasm/many-functions.ll
@@ -18,394 +18,394 @@ entry:
 
 ; CHECK:        - Type:            CODE
 ; CHECK-NEXT:     Relocations:
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000008
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000014
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000020
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000002C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000038
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000044
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000050
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000005C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000068
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000074
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000080
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000008C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000098
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000000A4
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000000B0
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000000BC
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000000C8
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000000D4
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000000E0
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000000EC
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000000F8
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000104
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000110
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000011C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000128
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000134
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000140
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000014C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000158
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000164
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000170
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000017C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000188
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000194
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000001A0
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000001AC
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000001B8
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000001C4
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000001D0
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000001DC
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000001E8
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000001F4
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000200
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000020C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000218
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000224
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000230
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000023C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000248
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000254
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000260
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000026C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000278
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000284
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000290
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000029C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000002A8
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000002B4
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000002C0
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000002CC
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000002D8
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000002E4
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000002F0
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000002FC
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000308
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000314
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000320
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000032C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000338
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000344
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000350
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000035C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000368
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000374
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000380
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000038C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000398
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000003A4
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000003B0
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000003BC
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000003C8
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000003D4
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000003E0
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000003EC
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000003F8
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000404
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000410
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000041C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000428
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000434
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000440
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000044C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000458
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000464
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000470
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000047C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000488
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000494
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000004A0
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000004AC
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000004B8
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000004C4
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000004D0
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000004DC
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000004E8
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000004F4
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000500
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000050C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000518
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000524
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000530
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000053C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000548
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000554
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000560
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000056C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000578
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000584
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000590
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x0000059C
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000005A8
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000005B4
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000005C0
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000005CC
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000005D8
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000005E4
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x000005F0
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           129
 ; CHECK-NEXT:         Offset:          0x000005FC
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_LEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_LEB
 ; CHECK-NEXT:         Index:           129
 ; CHECK-NEXT:         Offset:          0x00000608
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_FUNCTION_INDEX_LEB
+; CHECK-NEXT:       - Type:            R_WASM_FUNCTION_INDEX_LEB
 ; CHECK-NEXT:         Index:           131
 ; CHECK-NEXT:         Offset:          0x00000611
 ; CHECK-NEXT:     Functions:
@@ -802,13 +802,13 @@ entry:
 ; CHECK-NEXT:   - Type:            DATA
 ; CHECK-NEXT:     Segments:
 ; CHECK-NEXT:       - SectionOffset:   6
-; CHECK-NEXT:         MemoryIndex:     0
+; CHECK-NEXT:         InitFlags:       0
 ; CHECK-NEXT:         Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           0
 ; CHECK-NEXT:         Content:         '01000000'
 ; CHECK-NEXT:       - SectionOffset:   15
-; CHECK-NEXT:         MemoryIndex:     0
+; CHECK-NEXT:         InitFlags:       0
 ; CHECK-NEXT:         Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           4
diff --git a/deps/lld/test/wasm/pie.ll b/deps/lld/test/wasm/pie.ll
new file mode 100644
index 0000000000000000000000000000000000000000..c576e7c7bf7062c742350e8f51d9c0736909321e
--- /dev/null
+++ b/deps/lld/test/wasm/pie.ll
@@ -0,0 +1,58 @@
+; RUN: llc -relocation-model=pic -filetype=obj %s -o %t.o
+; RUN: wasm-ld --no-gc-sections --allow-undefined -pie -o %t.wasm %t.o
+; RUN: obj2yaml %t.wasm | FileCheck %s
+
+target triple = "wasm32-unknown-emscripten"
+
+@data = global i32 2, align 4
+@data_external = external global i32
+@indirect_func = local_unnamed_addr global i32 ()* @foo, align 4
+
+@data_addr = local_unnamed_addr global i32* @data, align 4
+@data_addr_external = local_unnamed_addr global i32* @data_external, align 4
+
+define hidden i32 @foo() {
+entry:
+  ; To ensure we use __stack_pointer
+  %ptr = alloca i32
+  %0 = load i32, i32* @data, align 4
+  %1 = load i32 ()*, i32 ()** @indirect_func, align 4
+  call i32 %1()
+  ret i32 %0
+}
+
+define default i32** @get_data_address() {
+entry:
+  ret i32** @data_addr_external
+}
+
+define void @_start() {
+  ret void
+}
+
+; CHECK:        - Type:            IMPORT
+; CHECK-NEXT:     Imports:
+; CHECK-NEXT:       - Module:          env
+; CHECK-NEXT:         Field:           __indirect_function_table
+; CHECK-NEXT:         Kind:            TABLE
+; CHECK-NEXT:         Table:
+; CHECK-NEXT:           ElemType:        FUNCREF
+; CHECK-NEXT:           Limits:
+; CHECK-NEXT:             Initial:         0x00000001
+; CHECK-NEXT:       - Module:          env
+; CHECK-NEXT:         Field:           __stack_pointer
+; CHECK-NEXT:         Kind:            GLOBAL
+; CHECK-NEXT:         GlobalType:      I32
+; CHECK-NEXT:         GlobalMutable:   true
+; CHECK-NEXT:       - Module:          env
+; CHECK-NEXT:         Field:           __memory_base
+; CHECK-NEXT:         Kind:            GLOBAL
+; CHECK-NEXT:         GlobalType:      I32
+; CHECK-NEXT:         GlobalMutable:   false
+; CHECK-NEXT:       - Module:          env
+; CHECK-NEXT:         Field:           __table_base
+; CHECK-NEXT:         Kind:            GLOBAL
+; CHECK-NEXT:         GlobalType:      I32
+; CHECK-NEXT:         GlobalMutable:   false
+
+
diff --git a/deps/lld/test/wasm/reloc-addend.ll b/deps/lld/test/wasm/reloc-addend.ll
index f678a3d4b61717a1f0b590b65f934495eede026b..fc00b8ebc31cfbdb32a7fd4a7a498bf222785a37 100644
--- a/deps/lld/test/wasm/reloc-addend.ll
+++ b/deps/lld/test/wasm/reloc-addend.ll
@@ -13,7 +13,7 @@ target triple = "wasm32-unknown-unknown"
 
 ; CHECK:        - Type:            DATA
 ; CHECK-NEXT:     Relocations:     
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_I32
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_I32
 ; CHECK-NEXT:         Index:           0
 ; CHECK-NEXT:         Offset:          0x0000013D
 ; CHECK-NEXT:         Addend:          64
diff --git a/deps/lld/test/wasm/relocatable.ll b/deps/lld/test/wasm/relocatable.ll
index c503afa812324baca0daf5707b81a40616522612..67f8ac0d8bec7ffadded12c5eb689c723cb896d8 100644
--- a/deps/lld/test/wasm/relocatable.ll
+++ b/deps/lld/test/wasm/relocatable.ll
@@ -79,19 +79,19 @@ entry:
 ; CHECK-NEXT:         Functions:       [ 4, 1, 2 ]
 ; CHECK-NEXT:   - Type:            CODE
 ; CHECK-NEXT:     Relocations:
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_SLEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_SLEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000004
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_FUNCTION_INDEX_LEB
+; CHECK-NEXT:       - Type:            R_WASM_FUNCTION_INDEX_LEB
 ; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:         Offset:          0x0000000A
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_FUNCTION_INDEX_LEB
+; CHECK-NEXT:       - Type:            R_WASM_FUNCTION_INDEX_LEB
 ; CHECK-NEXT:         Index:           4
 ; CHECK-NEXT:         Offset:          0x00000013
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_FUNCTION_INDEX_LEB
+; CHECK-NEXT:       - Type:            R_WASM_FUNCTION_INDEX_LEB
 ; CHECK-NEXT:         Index:           5
 ; CHECK-NEXT:         Offset:          0x0000001A
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_SLEB
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_SLEB
 ; CHECK-NEXT:         Index:           7
 ; CHECK-NEXT:         Offset:          0x00000026
 ; CHECK-NEXT:     Functions:
@@ -106,51 +106,51 @@ entry:
 ; CHECK-NEXT:         Body:          419C808080000B
 ; CHECK-NEXT:   - Type:            DATA
 ; CHECK-NEXT:     Relocations:
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_TABLE_INDEX_I32
+; CHECK-NEXT:       - Type:            R_WASM_TABLE_INDEX_I32
 ; CHECK-NEXT:         Index:           3
 ; CHECK-NEXT:         Offset:          0x00000012
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_TABLE_INDEX_I32
+; CHECK-NEXT:       - Type:            R_WASM_TABLE_INDEX_I32
 ; CHECK-NEXT:         Index:           4
 ; CHECK-NEXT:         Offset:          0x0000001B
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_TABLE_INDEX_I32
+; CHECK-NEXT:       - Type:            R_WASM_TABLE_INDEX_I32
 ; CHECK-NEXT:         Index:           5
 ; CHECK-NEXT:         Offset:          0x00000024
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_MEMORY_ADDR_I32
+; CHECK-NEXT:       - Type:            R_WASM_MEMORY_ADDR_I32
 ; CHECK-NEXT:         Index:           12
 ; CHECK-NEXT:         Offset:          0x0000002D
 ; CHECK-NEXT:     Segments:
 ; CHECK-NEXT:       - SectionOffset:   6
-; CHECK-NEXT:         MemoryIndex:     0
+; CHECK-NEXT:         InitFlags:       0
 ; CHECK-NEXT:         Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           0
 ; CHECK-NEXT:         Content:         68656C6C6F0A00
 ; CHECK-NEXT:       - SectionOffset:   18
-; CHECK-NEXT:         MemoryIndex:     0
+; CHECK-NEXT:         InitFlags:       0
 ; CHECK-NEXT:         Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           8
 ; CHECK-NEXT:         Content:         '01000000'
 ; CHECK-NEXT:       - SectionOffset:   27
-; CHECK-NEXT:         MemoryIndex:     0
+; CHECK-NEXT:         InitFlags:       0
 ; CHECK-NEXT:         Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           12
 ; CHECK-NEXT:         Content:         '02000000'
 ; CHECK-NEXT:       - SectionOffset:   36
-; CHECK-NEXT:         MemoryIndex:     0
+; CHECK-NEXT:         InitFlags:       0
 ; CHECK-NEXT:         Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           16
 ; CHECK-NEXT:         Content:         '03000000'
 ; CHECK-NEXT:       - SectionOffset:   45
-; CHECK-NEXT:         MemoryIndex:     0
+; CHECK-NEXT:         InitFlags:       0
 ; CHECK-NEXT:         Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           24
 ; CHECK-NEXT:         Content:         '00000000'
 ; CHECK-NEXT:       - SectionOffset:   54
-; CHECK-NEXT:         MemoryIndex:     0
+; CHECK-NEXT:         InitFlags:       0
 ; CHECK-NEXT:         Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           28
diff --git a/deps/lld/test/wasm/reproduce.ll b/deps/lld/test/wasm/reproduce.ll
new file mode 100644
index 0000000000000000000000000000000000000000..b00727e3b3e26a5dfdaeb34c237292554d2efe1c
--- /dev/null
+++ b/deps/lld/test/wasm/reproduce.ll
@@ -0,0 +1,27 @@
+; REQUIRES: shell
+; RUN: rm -rf %t.dir
+; RUN: mkdir -p %t.dir
+; RUN: llc -filetype=obj %s -o %t.dir/foo.o
+; RUN: wasm-ld --reproduce=%t.dir/repro.tar -o %t.dir/out.wasm %t.dir/foo.o
+
+; RUN: cd %t.dir
+; RUN: tar tf repro.tar | FileCheck --check-prefix=TAR %s
+
+; TAR: repro/response.txt
+; TAR: repro/version.txt
+; TAR: repro/{{.*}}/foo.o
+
+; RUN: tar xf repro.tar
+; RUN: FileCheck --check-prefix=RSP %s < repro/response.txt
+
+; RSP: -o {{.*}}out.wasm
+; RSP: {{.*}}/foo.o
+
+; RUN: FileCheck %s --check-prefix=VERSION < repro/version.txt
+; VERSION: LLD
+
+target triple = "wasm32-unknown-unknown"
+
+define void @_start() {
+  ret void
+}
diff --git a/deps/lld/test/wasm/section-symbol-relocs.yaml b/deps/lld/test/wasm/section-symbol-relocs.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b7d8a442536d8b08b51c6d8b8ca2c02f2c80d292
--- /dev/null
+++ b/deps/lld/test/wasm/section-symbol-relocs.yaml
@@ -0,0 +1,61 @@
+# RUN: yaml2obj %s -o %t.o
+# RUN: llc -filetype=obj  %S/Inputs/custom.ll -o %t2.o
+# RUN: wasm-ld --no-entry -o - %t2.o %t.o | obj2yaml | FileCheck %s
+# RUN: wasm-ld -r --no-entry -o - %t2.o %t.o | obj2yaml | FileCheck %s -check-prefix=RELOC
+
+--- !WASM
+FileHeader:
+  Version:         0x00000001
+Sections:
+  - Type:            CUSTOM
+    Name:            green
+    Payload:         'AA0000000000000000'
+    Relocations:
+      - Type:            R_WASM_SECTION_OFFSET_I32
+        Index:           0
+        Offset:          0x00000001
+      - Type:            R_WASM_SECTION_OFFSET_I32
+        Index:           1
+        Offset:          0x00000005
+  - Type:            CUSTOM
+    Name:            red
+    Payload:         'BB0000000000000000'
+  - Type:            CUSTOM
+    Name:            linking
+    Version:         2
+    SymbolTable:
+      - Index:           0
+        Kind:            SECTION
+        Section:         0
+        Flags:           [ BINDING_LOCAL ]
+      - Index:           1
+        Kind:            SECTION
+        Section:         1
+        Flags:           [ BINDING_LOCAL ]
+...
+
+# CHECK:        Name:            green
+# CHECK-NEXT:   Payload:         626172717578AA0600000003000000
+# CHECK:        Name:            red
+# CHECK-NEXT:   Payload:         666F6FBB0000000000000000
+
+# RELOC:        Relocations:
+# RELOC-NEXT:       - Type:            R_WASM_SECTION_OFFSET_I32
+# RELOC-NEXT:         Index:           0
+# RELOC-NEXT:         Offset:          0x00000007
+# RELOC-NEXT:         Addend:          6
+# RELOC-NEXT:       - Type:            R_WASM_SECTION_OFFSET_I32
+# RELOC-NEXT:         Index:           1
+# RELOC-NEXT:         Offset:          0x0000000B
+# RELOC-NEXT:         Addend:          3
+# RELOC-NEXT:    Name:            green
+#
+# RELOC:        SymbolTable:
+# RELOC-NEXT:     - Index:           0
+# RELOC-NEXT:       Kind:            SECTION
+# RELOC-NEXT:       Flags:           [ BINDING_LOCAL ]
+# RELOC-NEXT:       Section:         2
+# RELOC-NEXT:     - Index:           1
+# RELOC-NEXT:       Kind:            SECTION
+# RELOC-NEXT:       Flags:           [ BINDING_LOCAL ]
+# RELOC-NEXT:       Section:         3
diff --git a/deps/lld/test/wasm/shared-memory-no-atomics.yaml b/deps/lld/test/wasm/shared-memory-no-atomics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1588f2f0029e147254514b4ccbacc47fa0398e51
--- /dev/null
+++ b/deps/lld/test/wasm/shared-memory-no-atomics.yaml
@@ -0,0 +1,60 @@
+# RUN: yaml2obj %s -o %t1.o
+
+# RUN: wasm-ld --no-entry %t1.o -o - | obj2yaml | FileCheck %s --check-prefix NO-SHARED
+
+# RUN: not wasm-ld --no-entry --shared-memory --max-memory=131072 %t1.o -o - 2>&1 | FileCheck %s --check-prefix SHARED
+
+--- !WASM
+FileHeader:
+  Version:         0x00000001
+Sections:
+  - Type:            IMPORT
+    Imports:
+      - Module:          env
+        Field:           __linear_memory
+        Kind:            MEMORY
+        Memory:
+          Initial:         0x00000001
+      - Module:          env
+        Field:           __indirect_function_table
+        Kind:            TABLE
+        Table:
+          ElemType:        FUNCREF
+          Limits:
+            Initial:         0x00000000
+  - Type:            DATA
+    Segments:
+      - SectionOffset:   6
+        InitFlags:       0
+        Offset:
+          Opcode:          I32_CONST
+          Value:           0
+        Content:         68656C6C6F0A00
+  - Type:            CUSTOM
+    Name:            linking
+    Version:         2
+    SymbolTable:
+      - Index:           0
+        Kind:            DATA
+        Name:            hello_str
+        Flags:           [  ]
+        Segment:         0
+        Size:            7
+    SegmentInfo:
+      - Index:           0
+        Name:            .rodata.hello_str
+        Alignment:       0
+        Flags:           [  ]
+  - Type:            CUSTOM
+    Name:            target_features
+    Features:
+      - Prefix:        DISALLOWED
+        Name:          "atomics"
+...
+
+# NO-SHARED:      - Type:            MEMORY
+# NO-SHARED-NEXT:   Memories:
+# NO-SHARED-NEXT:     - Initial:         0x00000002
+# NO-SHARED-NOT:        Maximum:
+
+# SHARED: 'atomics' feature is disallowed by {{.*}}shared-memory-no-atomics.yaml.tmp1.o, so --shared-memory must not be used{{$}}
diff --git a/deps/lld/test/wasm/shared-memory.yaml b/deps/lld/test/wasm/shared-memory.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..57eccf1529175f48a632564bc9c142a37064794e
--- /dev/null
+++ b/deps/lld/test/wasm/shared-memory.yaml
@@ -0,0 +1,75 @@
+# RUN: yaml2obj %s -o %t1.o
+
+# RUN: not wasm-ld --no-entry --shared-memory --active-segments %t1.o -o - 2>&1 | FileCheck %s --check-prefix SHARED-NO-MAX
+
+# RUN: not wasm-ld --no-entry --shared-memory --active-segments --max-memory=100000 %t1.o -o - 2>&1 | FileCheck %s --check-prefix SHARED-UNALIGNED
+
+# RUN: wasm-ld --no-entry --shared-memory --active-segments --max-memory=131072 %t1.o -o - | obj2yaml | FileCheck %s --check-prefix SHARED
+
+# RUN: not wasm-ld --no-entry --features=atomics %t1.o -o - 2>&1 | FileCheck %s --check-prefix ATOMICS-NO-SHARED
+
+# RUN: not wasm-ld --no-entry --features=atomics --shared-memory --active-segments %t1.o -o - 2>&1 | FileCheck %s --check-prefix ATOMICS-NO-MAX
+
+# RUN: not wasm-ld --no-entry --features=atomics --shared-memory --active-segments --max-memory=100000 %t1.o -o - 2>&1 | FileCheck %s --check-prefix ATOMICS-UNALIGNED
+
+# RUN: wasm-ld --no-entry --features=atomics --shared-memory --active-segments --max-memory=131072 %t1.o -o - | obj2yaml | FileCheck %s --check-prefix SHARED
+
+
+--- !WASM
+FileHeader:
+  Version:         0x00000001
+Sections:
+  - Type:            IMPORT
+    Imports:
+      - Module:          env
+        Field:           __linear_memory
+        Kind:            MEMORY
+        Memory:
+          Initial:         0x00000001
+      - Module:          env
+        Field:           __indirect_function_table
+        Kind:            TABLE
+        Table:
+          ElemType:        FUNCREF
+          Limits:
+            Initial:         0x00000000
+  - Type:            DATA
+    Segments:
+      - SectionOffset:   6
+        InitFlags:       0
+        Offset:
+          Opcode:          I32_CONST
+          Value:           0
+        Content:         68656C6C6F0A00
+  - Type:            CUSTOM
+    Name:            linking
+    Version:         2
+    SymbolTable:
+      - Index:           0
+        Kind:            DATA
+        Name:            hello_str
+        Flags:           [  ]
+        Segment:         0
+        Size:            7
+    SegmentInfo:
+      - Index:           0
+        Name:            .rodata.hello_str
+        Alignment:       0
+        Flags:           [  ]
+...
+
+# SHARED-NO-MAX: maximum memory too small, 66560 bytes needed{{$}}
+
+# SHARED-UNALIGNED: maximum memory must be 65536-byte aligned{{$}}
+
+# SHARED:        - Type:            MEMORY
+# SHARED-NEXT:     Memories:
+# SHARED-NEXT:       - Flags:           [ HAS_MAX, IS_SHARED ]
+# SHARED-NEXT:         Initial:         0x00000002
+# SHARED-NEXT:         Maximum:         0x00000002
+
+# ATOMICS-NO-SHARED: 'atomics' feature is used, so --shared-memory must be used{{$}}
+
+# ATOMICS-NO-MAX: maximum memory too small, 66560 bytes needed{{$}}
+
+# ATOMICS-UNALIGNED: maximum memory must be 65536-byte aligned{{$}}
diff --git a/deps/lld/test/wasm/shared-needed.ll b/deps/lld/test/wasm/shared-needed.ll
new file mode 100644
index 0000000000000000000000000000000000000000..f0afb10985019fbb6c729b420716e1624fd21001
--- /dev/null
+++ b/deps/lld/test/wasm/shared-needed.ll
@@ -0,0 +1,38 @@
+; RUN: llc -filetype=obj %s -o %t.o
+; RUN: llc -filetype=obj %p/Inputs/ret32.ll -o %t.ret32.o
+
+; RUN: wasm-ld -shared -o %t1.so %t.o
+; RUN: obj2yaml %t1.so | FileCheck %s -check-prefix=SO1
+
+; RUN: wasm-ld -shared -o %t2.so %t1.so %t.ret32.o
+; RUN: obj2yaml %t2.so | FileCheck %s -check-prefix=SO2
+
+target triple = "wasm32-unknown-unknown"
+
+@data = global i32 2, align 4
+
+define default void @foo() {
+entry:
+  ret void
+}
+
+; SO1:      Sections:
+; SO1-NEXT:   - Type:            CUSTOM
+; SO1-NEXT:     Name:            dylink
+; SO1-NEXT:     MemorySize:      4
+; SO1-NEXT:     MemoryAlignment: 2
+; SO1-NEXT:     TableSize:       0
+; SO1-NEXT:     TableAlignment:  0
+; SO1-NEXT:     Needed:          []
+; SO1-NEXT:   - Type:            TYPE
+
+; SO2:      Sections:
+; SO2-NEXT:   - Type:            CUSTOM
+; SO2-NEXT:     Name:            dylink
+; SO2-NEXT:     MemorySize:      0
+; SO2-NEXT:     MemoryAlignment: 0
+; SO2-NEXT:     TableSize:       0
+; SO2-NEXT:     TableAlignment:  0
+; SO2-NEXT:     Needed:
+; SO2-NEXT:       - shared-needed.ll.tmp1.so
+; SO2-NEXT:   - Type:            TYPE
diff --git a/deps/lld/test/wasm/shared.ll b/deps/lld/test/wasm/shared.ll
index f3abd11727783490ac4b1225e02027fa2ba3b9a2..89fae3342ac2aae819bbe5d8f3fb56305c864009 100644
--- a/deps/lld/test/wasm/shared.ll
+++ b/deps/lld/test/wasm/shared.ll
@@ -1,44 +1,74 @@
-; RUN: llc -O0 -filetype=obj %s -o %t.o
+; RUN: llc -relocation-model=pic -filetype=obj %s -o %t.o
 ; RUN: wasm-ld -shared -o %t.wasm %t.o
 ; RUN: obj2yaml %t.wasm | FileCheck %s
 
-target triple = "wasm32-unknown-unknown"
+target triple = "wasm32-unknown-emscripten"
 
 @data = hidden global i32 2, align 4
-@indirect_func = local_unnamed_addr global void ()* @foo, align 4
+@data_external = external global i32
+@indirect_func = local_unnamed_addr global i32 ()* @foo, align 4
 @indirect_func_external = local_unnamed_addr global void ()* @func_external, align 4
 
-define default void @foo() {
+; Test data relocations
+@data_addr = local_unnamed_addr global i32* @data, align 4
+; .. against external symbols
+@data_addr_external = local_unnamed_addr global i32* @data_external, align 4
+; .. including addends
+%struct.s = type { i32, i32 }
+@extern_struct = external global %struct.s
+@extern_struct_internal_ptr = local_unnamed_addr global i32* getelementptr inbounds (%struct.s, %struct.s* @extern_struct, i32 0, i32 1), align 4
+
+define hidden i32 @foo() {
 entry:
   ; To ensure we use __stack_pointer
   %ptr = alloca i32
   %0 = load i32, i32* @data, align 4
-  %1 = load i32, i32* @data_external, align 4
-  %2 = load void ()*, void ()** @indirect_func, align 4
-  call void %2()
-  ret void
+  %1 = load i32 ()*, i32 ()** @indirect_func, align 4
+  call i32 %1()
+  ret i32 %0
+}
+
+define hidden i32* @get_data_address() {
+entry:
+  ret i32* @data_external
+}
+
+define hidden i8* @get_func_address() {
+entry:
+  ret i8* bitcast (void ()* @func_external to i8*)
+}
+
+define default i8* @get_local_func_address() {
+entry:
+  ; Verify that a function which is otherwise not address taken *is* added to
+  ; the wasm table with referenced via R_WASM_TABLE_INDEX_REL_SLEB
+  ret i8* bitcast (i8* ()* @get_func_address to i8*)
 }
 
 declare void @func_external()
 
-@data_external = external global i32
-
-
 ; check for dylink section at start
 
 ; CHECK:      Sections:
 ; CHECK-NEXT:   - Type:            CUSTOM
 ; CHECK-NEXT:     Name:            dylink
-; CHECK-NEXT:     MemorySize:      8
+; CHECK-NEXT:     MemorySize:      24
 ; CHECK-NEXT:     MemoryAlignment: 2
 ; CHECK-NEXT:     TableSize:       2
 ; CHECK-NEXT:     TableAlignment:  0
+; CHECK-NEXT:     Needed:          []
+; CHECK-NEXT:   - Type:            TYPE
 
 ; check for import of __table_base and __memory_base globals
 
 ; CHECK:        - Type:            IMPORT
 ; CHECK-NEXT:     Imports:
 ; CHECK-NEXT:       - Module:          env
+; CHECK-NEXT:         Field:           memory
+; CHECK-NEXT:         Kind:            MEMORY
+; CHECK-NEXT:         Memory:
+; CHECK-NEXT:           Initial:       0x0000000
+; CHECK-NEXT:       - Module:          env
 ; CHECK-NEXT:         Field:           __indirect_function_table
 ; CHECK-NEXT:         Kind:            TABLE
 ; CHECK-NEXT:         Table:
@@ -60,6 +90,37 @@ declare void @func_external()
 ; CHECK-NEXT:         Kind:            GLOBAL
 ; CHECK-NEXT:         GlobalType:      I32
 ; CHECK-NEXT:         GlobalMutable:   false
+; CHECK-NEXT:       - Module:          env
+; CHECK-NEXT:         Field:           func_external
+; CHECK-NEXT:         Kind:            FUNCTION
+; CHECK-NEXT:         SigIndex:        1
+; CHECK-NEXT:       - Module:          GOT.mem
+; CHECK-NEXT:         Field:           indirect_func
+; CHECK-NEXT:         Kind:            GLOBAL
+; CHECK-NEXT:         GlobalType:      I32
+; CHECK-NEXT:         GlobalMutable:   true
+; CHECK-NEXT:       - Module:          GOT.func
+; CHECK-NEXT:         Field:           func_external
+; CHECK-NEXT:         Kind:            GLOBAL
+; CHECK-NEXT:         GlobalType:      I32
+; CHECK-NEXT:         GlobalMutable:   true
+; CHECK-NEXT:       - Module:          GOT.mem
+; CHECK-NEXT:         Field:           data_external
+; CHECK-NEXT:         Kind:            GLOBAL
+; CHECK-NEXT:         GlobalType:      I32
+; CHECK-NEXT:         GlobalMutable:   true
+; CHECK-NEXT:       - Module:          GOT.mem
+; CHECK-NEXT:         Field:           extern_struct
+; CHECK-NEXT:         Kind:            GLOBAL
+; CHECK-NEXT:         GlobalType:      I32
+; CHECK-NEXT:         GlobalMutable:   true
+; CHECK-NEXT:   - Type:            FUNCTION
+
+; CHECK:        - Type:            EXPORT
+; CHECK-NEXT:     Exports:
+; CHECK-NEXT:       - Name:            __wasm_call_ctors
+; CHECK-NEXT:         Kind:            FUNCTION
+; CHECK-NEXT:         Index:           1
 
 ; check for elem segment initialized with __table_base global as offset
 
@@ -68,15 +129,27 @@ declare void @func_external()
 ; CHECK-NEXT:       - Offset:
 ; CHECK-NEXT:           Opcode:          GLOBAL_GET
 ; CHECK-NEXT:           Index:           2
-; CHECK-NEXT:         Functions:       [ 2, 0 ]
+; CHECK-NEXT:         Functions:       [ 4, 3 ]
+
+; check the generated code in __wasm_call_ctors and __wasm_apply_relocs functions
+; TODO(sbc): Disassemble and verify instructions.
+
+; CHECK:        - Type:            CODE
+; CHECK-NEXT:     Functions:
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         Locals:          []
+; CHECK-NEXT:         Body:            10020B
+; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:         Locals:          []
+; CHECK-NEXT:         Body:            230141046A230241016A360200230141086A23043602002301410C6A230141006A360200230141106A2305360200230141146A230641046A3602000B
 
 ; check the data segment initialized with __memory_base global as offset
 
 ; CHECK:        - Type:            DATA
 ; CHECK-NEXT:     Segments:
 ; CHECK-NEXT:       - SectionOffset:   6
-; CHECK-NEXT:         MemoryIndex:     0
+; CHECK-NEXT:         InitFlags:       0
 ; CHECK-NEXT:         Offset:
 ; CHECK-NEXT:           Opcode:          GLOBAL_GET
 ; CHECK-NEXT:           Index:           1
-; CHECK-NEXT:         Content:         '0000000001000000'
+; CHECK-NEXT:         Content:         '020000000100000000000000000000000000000000000000'
diff --git a/deps/lld/test/wasm/signature-mismatch-export.ll b/deps/lld/test/wasm/signature-mismatch-export.ll
new file mode 100644
index 0000000000000000000000000000000000000000..7e4d3a6a95b40d980ef80c745974894a4bf237a7
--- /dev/null
+++ b/deps/lld/test/wasm/signature-mismatch-export.ll
@@ -0,0 +1,30 @@
+; RUN: llc -filetype=obj %p/Inputs/ret32.ll -o %t.ret32.o
+; RUN: llc -filetype=obj %s -o %t.main.o
+; RUN: wasm-ld --export=ret32 -o %t.wasm %t.main.o %t.ret32.o
+; RUN: obj2yaml %t.wasm | FileCheck %s
+
+target triple = "wasm32-unknown-unknown"
+
+declare i32 @ret32(i32)
+
+define void @_start() {
+entry:
+  %call1 = call i32 @ret32(i32 0)
+  ret void
+}
+
+; CHECK:        - Type:            EXPORT
+; CHECK:            - Name:            ret32
+; CHECK-NEXT:         Kind:            FUNCTION
+; CHECK-NEXT:         Index:           2
+
+; CHECK:        - Type:            CUSTOM
+; CHECK-NEXT:     Name:            name
+; CHECK-NEXT:     FunctionNames:
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Name:            'unreachable:ret32'
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         Name:            _start
+; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:         Name:            ret32
+; CHECK-NEXT: ...
diff --git a/deps/lld/test/wasm/signature-mismatch-unknown.ll b/deps/lld/test/wasm/signature-mismatch-unknown.ll
new file mode 100644
index 0000000000000000000000000000000000000000..65bb31511d1cfb614c8690e391d48f47f9056d55
--- /dev/null
+++ b/deps/lld/test/wasm/signature-mismatch-unknown.ll
@@ -0,0 +1,19 @@
+; RUN: llc -filetype=obj %p/Inputs/ret32.ll -o %t.ret32.o
+; RUN: llc -filetype=obj %s -o %t.main.o
+; RUN: wasm-ld --fatal-warnings -o %t.wasm %t.ret32.o %t.main.o
+; RUN: wasm-ld --fatal-warnings -o %t.wasm %t.main.o %t.ret32.o
+
+target triple = "wasm32-unknown-unknown"
+
+; Function declartion with incorrect signature.
+declare dso_local void @ret32()
+
+; Simply taking the address of the function should *not* generate the
+; the signature mismatch warning.
+@ptr = dso_local global i8* bitcast (void ()* @ret32 to i8*), align 8
+
+define hidden void @_start() local_unnamed_addr {
+  %addr = load i32 ()*, i32 ()** bitcast (i8** @ptr to i32 ()**), align 8
+  call i32 %addr()
+  ret void
+}
diff --git a/deps/lld/test/wasm/signature-mismatch.ll b/deps/lld/test/wasm/signature-mismatch.ll
index 8f13d644a7ce5bb79cded3e6780bc1ab6e8e9cab..878ca53bb46c1804cf59cacc3fc3d4385303848d 100644
--- a/deps/lld/test/wasm/signature-mismatch.ll
+++ b/deps/lld/test/wasm/signature-mismatch.ll
@@ -1,26 +1,51 @@
 ; RUN: llc -filetype=obj %p/Inputs/ret32.ll -o %t.ret32.o
+; RUN: llc -filetype=obj %p/Inputs/call-ret32.ll -o %t.call.o
 ; RUN: llc -filetype=obj %s -o %t.main.o
-; RUN: not wasm-ld --fatal-warnings -o %t.wasm %t.main.o %t.ret32.o 2>&1 | FileCheck %s
-; Run the test again by with the object files in the other order to verify
-; the check works when the undefined symbol is resolved by an existing defined
-; one.
-; RUN: not wasm-ld --fatal-warnings -o %t.wasm %t.ret32.o %t.main.o 2>&1 | FileCheck %s -check-prefix=REVERSE
+; RUN: wasm-ld --export=call_ret32 --export=ret32 -o %t.wasm %t.main.o %t.ret32.o %t.call.o 2>&1 | FileCheck %s -check-prefix=WARN
+; RUN: obj2yaml %t.wasm | FileCheck %s -check-prefix=YAML
+; RUN: not wasm-ld --fatal-warnings -o %t.wasm %t.main.o %t.ret32.o %t.call.o 2>&1 | FileCheck %s -check-prefix=ERROR
 
 target triple = "wasm32-unknown-unknown"
 
+@ret32_address_main = global i32 (i32, i64, i32)* @ret32, align 4
+
 ; Function Attrs: nounwind
-define hidden void @_start() local_unnamed_addr #0 {
+define hidden void @_start() local_unnamed_addr {
 entry:
-  %call = tail call i32 @ret32(i32 1, i64 2, i32 3) #2
+  %call1 = call i32 @ret32(i32 1, i64 2, i32 3)
+  %addr = load i32 (i32, i64, i32)*, i32 (i32, i64, i32)** @ret32_address_main, align 4
+  %call2 = call i32 %addr(i32 1, i64 2, i32 3)
   ret void
 }
 
-declare i32 @ret32(i32, i64, i32) local_unnamed_addr #1
+declare i32 @ret32(i32, i64, i32) local_unnamed_addr
 
-; CHECK: error: function signature mismatch: ret32
-; CHECK-NEXT: >>> defined as (i32, i64, i32) -> i32 in {{.*}}.main.o
-; CHECK-NEXT: >>> defined as (f32) -> i32 in {{.*}}.ret32.o
+; WARN: warning: function signature mismatch: ret32
+; WARN-NEXT: >>> defined as (i32, i64, i32) -> i32 in {{.*}}.main.o
+; WARN-NEXT: >>> defined as (f32) -> i32 in {{.*}}.ret32.o
+
+; ERROR: error: function signature mismatch: ret32
+; ERROR-NEXT: >>> defined as (i32, i64, i32) -> i32 in {{.*}}.main.o
+; ERROR-NEXT: >>> defined as (f32) -> i32 in {{.*}}.ret32.o
+
+; YAML:        - Type:            EXPORT
+; YAML:           - Name:            ret32
+; YAML-NEXT:        Kind:            FUNCTION
+; YAML-NEXT:        Index:           2
+; YAML-NEXT:      - Name:            call_ret32
+; YAML-NEXT:        Kind:            FUNCTION
+; YAML-NEXT:        Index:           3
+
+; YAML:        - Type:            CUSTOM
+; YAML-NEXT:     Name:            name
+; YAML-NEXT:     FunctionNames:   
+; YAML-NEXT:       - Index:           0
+; YAML-NEXT:         Name:            'unreachable:ret32'
+; YAML-NEXT:       - Index:           1
+; YAML-NEXT:         Name:            _start
+; YAML-NEXT:       - Index:           2
+; YAML-NEXT:         Name:            ret32
+; YAML-NEXT:       - Index:           3
+; YAML-NEXT:         Name:            call_ret32
+; YAML-NEXT: ...
 
-; REVERSE: error: function signature mismatch: ret32
-; REVERSE-NEXT: >>> defined as (f32) -> i32 in {{.*}}.ret32.o
-; REVERSE-NEXT: >>> defined as (i32, i64, i32) -> i32 in {{.*}}.main.o
diff --git a/deps/lld/test/wasm/stack-first.test b/deps/lld/test/wasm/stack-first.test
index 71d1e9dde858fbdcf05365c89194e2e82e946ca7..bc45023c0db6311956760838ff547ebb5987271d 100644
--- a/deps/lld/test/wasm/stack-first.test
+++ b/deps/lld/test/wasm/stack-first.test
@@ -4,8 +4,7 @@
 ; global should be initialized to 512.
 
 RUN: llc -filetype=obj %p/Inputs/start.ll -o %t.o
-
-RUN: wasm-ld -z stack-size=512 --stack-first --allow-undefined -o %t.wasm %t.o
+RUN: wasm-ld -z stack-size=512 --stack-first --export=__data_end --export=__heap_base -o %t.wasm %t.o
 RUN: obj2yaml %t.wasm | FileCheck %s
 
 CHECK:        - Type:            GLOBAL
@@ -33,10 +32,12 @@ CHECK-NEXT:     Exports:
 CHECK-NEXT:       - Name:            memory
 CHECK-NEXT:         Kind:            MEMORY
 CHECK-NEXT:         Index:           0
-CHECK-NEXT:       - Name:            __heap_base
-CHECK-NEXT:         Kind:            GLOBAL
-CHECK-NEXT:         Index:           1
 CHECK-NEXT:       - Name:            __data_end
 CHECK-NEXT:         Kind:            GLOBAL
+CHECK-NEXT:         Index:           1
+CHECK-NEXT:       - Name:            __heap_base
+CHECK-NEXT:         Kind:            GLOBAL
 CHECK-NEXT:         Index:           2
-
+CHECK-NEXT:       - Name:            _start
+CHECK-NEXT:         Kind:            FUNCTION
+CHECK-NEXT:         Index:           0
diff --git a/deps/lld/test/wasm/stack-pointer.ll b/deps/lld/test/wasm/stack-pointer.ll
index 6851214fe91a3aebe765692f8e525d3efb0869db..30501baf84ad48acf36caba00e8471ccf431fed2 100644
--- a/deps/lld/test/wasm/stack-pointer.ll
+++ b/deps/lld/test/wasm/stack-pointer.ll
@@ -41,7 +41,7 @@ entry:
 ; CHECK-NEXT:       - Initial:         0x00000000
 ; CHECK-NEXT:   - Type:            CODE
 ; CHECK-NEXT:     Relocations:
-; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_GLOBAL_INDEX_LEB
+; CHECK-NEXT:       - Type:            R_WASM_GLOBAL_INDEX_LEB
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000004
 ; CHECK-NEXT:     Functions:
diff --git a/deps/lld/test/wasm/startstop.ll b/deps/lld/test/wasm/startstop.ll
new file mode 100644
index 0000000000000000000000000000000000000000..6339460076636ed553615b94f7af38efaa1fa4a1
--- /dev/null
+++ b/deps/lld/test/wasm/startstop.ll
@@ -0,0 +1,53 @@
+; RUN: llc -filetype=obj -o %t.o %s
+; RUN: llc -filetype=obj %p/Inputs/explicit-section.ll -o %t2.o
+; RUN: wasm-ld --export=get_start --export=get_end --export=foo --export=var1 %t.o %t2.o -o %t.wasm
+; RUN: obj2yaml %t.wasm | FileCheck %s
+
+target triple = "wasm32-unknown-unknown"
+
+@foo = global i32 3, section "mysection", align 4
+@bar = global i32 4, section "mysection", align 4
+
+@__start_mysection = external global i8*
+@__stop_mysection = external global i8*
+
+define i8** @get_start() {
+  ret i8** @__start_mysection
+}
+
+define i8** @get_end() {
+  ret i8** @__stop_mysection
+}
+
+define void @_start()  {
+entry:
+  ret void
+}
+; CHECK:        - Type:            CODE
+; CHECK-NEXT:     Functions:
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Locals:          []
+; CHECK-NEXT:         Body:            4180888080000B
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         Locals:          []
+; CHECK-NEXT:         Body:            4190888080000B
+; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:         Locals:          []
+; CHECK-NEXT:         Body:            0B
+; CHECK-NEXT:   - Type:            DATA
+; CHECK-NEXT:     Segments:
+; CHECK-NEXT:       - SectionOffset:   7
+; CHECK-NEXT:         InitFlags:       0
+; CHECK-NEXT:         Offset:
+; CHECK-NEXT:           Opcode:          I32_CONST
+; CHECK-NEXT:           Value:           1024
+; CHECK-NEXT:         Content:         03000000040000002A0000002B000000
+; CHECK-NEXT:   - Type:            CUSTOM
+; CHECK-NEXT:     Name:            name
+; CHECK-NEXT:     FunctionNames:
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Name:            get_start
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         Name:            get_end
+; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:         Name:            _start
diff --git a/deps/lld/test/wasm/target-feature-disallowed.yaml b/deps/lld/test/wasm/target-feature-disallowed.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9eaf7f6c9c114d2fdea0810f0bf1dc354d619936
--- /dev/null
+++ b/deps/lld/test/wasm/target-feature-disallowed.yaml
@@ -0,0 +1,72 @@
+# RUN: yaml2obj %s -o %t1.o
+
+# RUN: wasm-ld --no-entry --features=foo,bar,baz -o %t.specified.wasm %t1.o
+# RUN: obj2yaml %t.specified.wasm | FileCheck %s --check-prefix SPECIFIED
+
+# RUN: wasm-ld --no-entry --features=bar,baz,quux -o %t.unspecified.wasm %t1.o
+# RUN: obj2yaml %t.unspecified.wasm | FileCheck %s --check-prefix UNSPECIFIED
+
+# RUN: yaml2obj %S/Inputs/disallow-feature-foo.yaml -o %t.disallowed.o
+# RUN: wasm-ld --no-entry -o - %t1.o %t.disallowed.o | obj2yaml | FileCheck %s --check-prefix DISALLOWED
+
+# RUN: yaml2obj %S/Inputs/no-feature-foo.yaml -o %t.none.o
+# RUN: wasm-ld --no-entry -o - %t1.o %t.none.o | obj2yaml | FileCheck %s --check-prefix NONE
+
+# Check that the following combinations of feature linkage policies
+# give the expected results:
+#
+#     DISALLOWED x DISALLOWED => NONE
+#     DISALLOWED x NONE => NONE
+
+--- !WASM
+FileHeader:
+  Version:         0x00000001
+Sections:
+  - Type:            CUSTOM
+    Name:            linking
+    Version:         2
+  - Type:            CUSTOM
+    Name:            target_features
+    Features:
+      - Prefix:        DISALLOWED
+        Name:          "foo"
+        # included so output has target features section
+      - Prefix:        USED
+        Name:          "bar"
+...
+
+# SPECIFIED:        - Type:            CUSTOM
+# SPECIFIED-NEXT:     Name:            target_features
+# SPECIFIED-NEXT:     Features:
+# SPECIFIED-NEXT:       - Prefix:          USED
+# SPECIFIED-NEXT:         Name:            bar
+# SPECIFIED-NEXT:       - Prefix:          USED
+# SPECIFIED-NEXT:         Name:            baz
+# SPECIFIED-NEXT:       - Prefix:          USED
+# SPECIFIED-NEXT:         Name:            foo
+# SPECIFIED-NEXT: ...
+
+# UNSPECIFIED:        - Type:            CUSTOM
+# UNSPECIFIED-NEXT:     Name:            target_features
+# UNSPECIFIED-NEXT:     Features:
+# UNSPECIFIED-NEXT:       - Prefix:          USED
+# UNSPECIFIED-NEXT:         Name:            bar
+# UNSPECIFIED-NEXT:       - Prefix:          USED
+# UNSPECIFIED-NEXT:         Name:            baz
+# UNSPECIFIED-NEXT:       - Prefix:          USED
+# UNSPECIFIED-NEXT:         Name:            quux
+# UNSPECIFIED-NEXT: ...
+
+# DISALLOWED:        - Type:            CUSTOM
+# DISALLOWED-NEXT:     Name:            target_features
+# DISALLOWED-NEXT:     Features:
+# DISALLOWED-NEXT:       - Prefix:          USED
+# DISALLOWED-NEXT:         Name:            bar
+# DISALLOWED-NEXT: ...
+
+# NONE:        - Type:            CUSTOM
+# NONE-NEXT:     Name:            target_features
+# NONE-NEXT:     Features:
+# NONE-NEXT:       - Prefix:          USED
+# NONE-NEXT:         Name:            bar
+# NONE-NEXT: ...
diff --git a/deps/lld/test/wasm/target-feature-none.yaml b/deps/lld/test/wasm/target-feature-none.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..82fc5275707014d7d9cf9355b53f1feff84de266
--- /dev/null
+++ b/deps/lld/test/wasm/target-feature-none.yaml
@@ -0,0 +1,33 @@
+# RUN: yaml2obj %s -o %t1.o
+
+# RUN: wasm-ld --no-entry -o - %t1.o | obj2yaml | FileCheck %s --check-prefix EMPTY
+
+# RUN: wasm-ld --no-entry --features= -o - %t1.o | obj2yaml | FileCheck %s --check-prefix EMPTY
+
+# RUN: wasm-ld --no-entry --features=foo,bar,baz -o - %t1.o | obj2yaml | FileCheck %s --check-prefix SPECIFIED
+
+--- !WASM
+FileHeader:
+  Version:         0x00000001
+Sections:
+  - Type:            CUSTOM
+    Name:            linking
+    Version:         2
+  - Type:            CUSTOM
+    Name:            target_features
+    Features:        [ ]
+...
+
+# section is not emitted if it would be empty
+# EMPTY-NOT: target_features
+
+# SPECIFIED:        - Type:            CUSTOM
+# SPECIFIED-NEXT:     Name:            target_features
+# SPECIFIED-NEXT:     Features:
+# SPECIFIED-NEXT:       - Prefix:          USED
+# SPECIFIED-NEXT:         Name:            bar
+# SPECIFIED-NEXT:       - Prefix:          USED
+# SPECIFIED-NEXT:         Name:            baz
+# SPECIFIED-NEXT:       - Prefix:          USED
+# SPECIFIED-NEXT:         Name:            foo
+# SPECIFIED-NEXT: ...
diff --git a/deps/lld/test/wasm/target-feature-required.yaml b/deps/lld/test/wasm/target-feature-required.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ce9857a7e89ad7c261e1853b99fd856d084b2946
--- /dev/null
+++ b/deps/lld/test/wasm/target-feature-required.yaml
@@ -0,0 +1,90 @@
+# RUN: yaml2obj %s -o %t1.o
+
+# RUN: wasm-ld --no-entry --features=foo,bar,baz -o - %t1.o | obj2yaml | FileCheck %s --check-prefix SPECIFIED
+
+# RUN: not wasm-ld --no-entry --features=bar,baz,quux -o /dev/null %t1.o 2>&1 | FileCheck %s --check-prefix UNSPECIFIED
+
+# RUN: wasm-ld --no-entry --no-check-features --features=bar,baz,quux -o - %t1.o | obj2yaml | FileCheck %s --check-prefix UNSPECIFIED-NOCHECK
+
+# RUN: yaml2obj %S/Inputs/require-feature-foo.yaml -o %t.required.o
+# RUN: wasm-ld --no-entry -o - %t1.o %t.required.o | obj2yaml | FileCheck %s --check-prefix REQUIRED
+
+# RUN: yaml2obj %S/Inputs/disallow-feature-foo.yaml -o %t.disallowed.o
+# RUN: not wasm-ld --no-entry -o /dev/null %t1.o %t.disallowed.o 2>&1 | FileCheck %s --check-prefix DISALLOWED
+
+# RUN: wasm-ld --no-entry --no-check-features -o - %t1.o %t.disallowed.o | obj2yaml | FileCheck %s --check-prefix DISALLOWED-NOCHECK
+
+# RUN: yaml2obj %S/Inputs/no-feature-foo.yaml -o %t.none.o
+# RUN: not wasm-ld --no-entry -o /dev/null %t1.o %t.none.o 2>&1 | FileCheck %s --check-prefix NONE
+
+# RUN: wasm-ld --no-entry --no-check-features -o - %t1.o %t.none.o | obj2yaml | FileCheck %s --check-prefix NONE-NOCHECK
+
+# Check that the following combinations of feature linkage policies
+# give the expected results:
+#
+#     REQUIRED x REQUIRED => USED
+#     REQUIRED x DISALLOWED => Error
+#     REQUIRED x NONE => Error
+
+--- !WASM
+FileHeader:
+  Version:         0x00000001
+Sections:
+  - Type:            CUSTOM
+    Name:            linking
+    Version:         2
+  - Type:            CUSTOM
+    Name:            target_features
+    Features:
+      - Prefix:        REQUIRED
+        Name:          "foo"
+...
+
+# SPECIFIED:        - Type:            CUSTOM
+# SPECIFIED-NEXT:     Name:            target_features
+# SPECIFIED-NEXT:     Features:
+# SPECIFIED-NEXT:       - Prefix:          USED
+# SPECIFIED-NEXT:         Name:            bar
+# SPECIFIED-NEXT:       - Prefix:          USED
+# SPECIFIED-NEXT:         Name:            baz
+# SPECIFIED-NEXT:       - Prefix:          USED
+# SPECIFIED-NEXT:         Name:            foo
+# SPECIFIED-NEXT: ...
+
+# UNSPECIFIED: Target feature 'foo' used by {{.*}}target-feature-required.yaml.tmp1.o is not allowed.{{$}}
+
+# UNSPECIFIED-NOCHECK:        - Type:            CUSTOM
+# UNSPECIFIED-NOCHECK-NEXT:     Name:            target_features
+# UNSPECIFIED-NOCHECK-NEXT:     Features:
+# UNSPECIFIED-NOCHECK-NEXT:       - Prefix:          USED
+# UNSPECIFIED-NOCHECK-NEXT:         Name:            bar
+# UNSPECIFIED-NOCHECK-NEXT:       - Prefix:          USED
+# UNSPECIFIED-NOCHECK-NEXT:         Name:            baz
+# UNSPECIFIED-NOCHECK-NEXT:       - Prefix:          USED
+# UNSPECIFIED-NOCHECK-NEXT:         Name:            quux
+# UNSPECIFIED-NOCHECK-NEXT: ...
+
+# REQUIRED:        - Type:            CUSTOM
+# REQUIRED-NEXT:     Name:            target_features
+# REQUIRED-NEXT:     Features:
+# REQUIRED-NEXT:       - Prefix:          USED
+# REQUIRED-NEXT:         Name:            foo
+# REQUIRED-NEXT: ...
+
+# DISALLOWED: Target feature 'foo' used in {{.*}}target-feature-required.yaml.tmp1.o is disallowed by {{.*}}target-feature-required.yaml.tmp.disallowed.o. Use --no-check-features to suppress.{{$}}
+
+# DISALLOWED-NOCHECK:        - Type:            CUSTOM
+# DISALLOWED-NOCHECK-NEXT:     Name:            target_features
+# DISALLOWED-NOCHECK-NEXT:     Features:
+# DISALLOWED-NOCHECK-NEXT:       - Prefix:          USED
+# DISALLOWED-NOCHECK-NEXT:         Name:            foo
+# DISALLOWED-NOCHECK-NEXT: ...
+
+# NONE: Missing target feature 'foo' in {{.*}}target-feature-required.yaml.tmp.none.o, required by {{.*}}target-feature-required.yaml.tmp1.o. Use --no-check-features to suppress.{{$}}
+
+# NONE-NOCHECK:        - Type:            CUSTOM
+# NONE-NOCHECK-NEXT:     Name:            target_features
+# NONE-NOCHECK-NEXT:     Features:
+# NONE-NOCHECK-NEXT:       - Prefix:          USED
+# NONE-NOCHECK-NEXT:         Name:            foo
+# NONE-NOCHECK-NEXT: ...
diff --git a/deps/lld/test/wasm/target-feature-used.yaml b/deps/lld/test/wasm/target-feature-used.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c9c19c7494c0a220a2e3cf1b44e9b57c5b4de349
--- /dev/null
+++ b/deps/lld/test/wasm/target-feature-used.yaml
@@ -0,0 +1,97 @@
+# RUN: yaml2obj %s -o %t1.o
+
+# RUN: wasm-ld --no-entry --features=foo,bar,baz -o - %t1.o | obj2yaml | FileCheck %s --check-prefix SPECIFIED
+
+# RUN: not wasm-ld --no-entry --features=bar,baz,quux -o /dev/null %t1.o 2>&1 | FileCheck %s --check-prefix UNSPECIFIED
+
+# RUN: wasm-ld --no-entry --no-check-features --features=bar,baz,quux -o - %t1.o | obj2yaml | FileCheck %s --check-prefix UNSPECIFIED-NOCHECK
+
+# RUN: yaml2obj %S/Inputs/use-feature-foo.yaml -o %t.used.o
+# RUN: wasm-ld --no-entry -o - %t1.o %t.used.o | obj2yaml | FileCheck %s --check-prefix USED
+
+# RUN: yaml2obj %S/Inputs/require-feature-foo.yaml -o %t.required.o
+# RUN: wasm-ld --no-entry -o - %t1.o %t.required.o | obj2yaml | FileCheck %s --check-prefix REQUIRED
+
+# RUN: yaml2obj %S/Inputs/disallow-feature-foo.yaml -o %t.disallowed.o
+# RUN: not wasm-ld --no-entry -o /dev/null %t1.o %t.disallowed.o 2>&1 | FileCheck %s --check-prefix DISALLOWED
+
+# RUN: wasm-ld --no-entry --no-check-features -o - %t1.o %t.disallowed.o | obj2yaml | FileCheck %s --check-prefix DISALLOWED-NOCHECK
+
+# RUN: yaml2obj %S/Inputs/no-feature-foo.yaml -o %t.none.o
+# RUN: wasm-ld --no-entry -o - %t1.o %t.none.o | obj2yaml | FileCheck %s --check-prefix NONE
+
+# Check that the following combinations of feature linkage policies
+# give the expected results:
+#
+#     USED x USED => USED
+#     USED x REQUIRED => USED
+#     USED x DISALLOWED => Error
+#     USED x NONE => USED
+
+--- !WASM
+FileHeader:
+  Version:         0x00000001
+Sections:
+  - Type:            CUSTOM
+    Name:            linking
+    Version:         2
+  - Type:            CUSTOM
+    Name:            target_features
+    Features:
+      - Prefix:        USED
+        Name:          "foo"
+...
+
+# SPECIFIED:        - Type:            CUSTOM
+# SPECIFIED-NEXT:     Name:            target_features
+# SPECIFIED-NEXT:     Features:
+# SPECIFIED-NEXT:       - Prefix:          USED
+# SPECIFIED-NEXT:         Name:            bar
+# SPECIFIED-NEXT:       - Prefix:          USED
+# SPECIFIED-NEXT:         Name:            baz
+# SPECIFIED-NEXT:       - Prefix:          USED
+# SPECIFIED-NEXT:         Name:            foo
+# SPECIFIED-NEXT: ...
+
+# UNSPECIFIED: Target feature 'foo' used by {{.*}}target-feature-used.yaml.tmp1.o is not allowed.{{$}}
+
+# UNSPECIFIED-NOCHECK:        - Type:            CUSTOM
+# UNSPECIFIED-NOCHECK-NEXT:     Name:            target_features
+# UNSPECIFIED-NOCHECK-NEXT:     Features:
+# UNSPECIFIED-NOCHECK-NEXT:       - Prefix:          USED
+# UNSPECIFIED-NOCHECK-NEXT:         Name:            bar
+# UNSPECIFIED-NOCHECK-NEXT:       - Prefix:          USED
+# UNSPECIFIED-NOCHECK-NEXT:         Name:            baz
+# UNSPECIFIED-NOCHECK-NEXT:       - Prefix:          USED
+# UNSPECIFIED-NOCHECK-NEXT:         Name:            quux
+# UNSPECIFIED-NOCHECK-NEXT: ...
+
+# USED:        - Type:            CUSTOM
+# USED-NEXT:     Name:            target_features
+# USED-NEXT:     Features:
+# USED-NEXT:       - Prefix:          USED
+# USED-NEXT:         Name:            foo
+# USED-NEXT: ...
+
+# REQUIRED:        - Type:            CUSTOM
+# REQUIRED-NEXT:     Name:            target_features
+# REQUIRED-NEXT:     Features:
+# REQUIRED-NEXT:       - Prefix:          USED
+# REQUIRED-NEXT:         Name:            foo
+# REQUIRED-NEXT: ...
+
+# DISALLOWED: Target feature 'foo' used in {{.*}}target-feature-used.yaml.tmp1.o is disallowed by {{.*}}target-feature-used.yaml.tmp.disallowed.o. Use --no-check-features to suppress.{{$}}
+
+# DISALLOWED-NOCHECK:        - Type:            CUSTOM
+# DISALLOWED-NOCHECK-NEXT:     Name:            target_features
+# DISALLOWED-NOCHECK-NEXT:     Features:
+# DISALLOWED-NOCHECK-NEXT:       - Prefix:          USED
+# DISALLOWED-NOCHECK-NEXT:         Name:            foo
+# DISALLOWED-NOCHECK-NEXT: ...
+
+# NONE:        - Type:            CUSTOM
+# NONE-NEXT:     Name:            target_features
+# NONE-NEXT:     Features:
+# NONE-NEXT:       - Prefix:          USED
+# NONE-NEXT:         Name:            foo
+# NONE-NEXT: ...
diff --git a/deps/lld/test/wasm/tls.ll b/deps/lld/test/wasm/tls.ll
new file mode 100644
index 0000000000000000000000000000000000000000..e410e08656a4b60faebdad326836f2fb62002b56
--- /dev/null
+++ b/deps/lld/test/wasm/tls.ll
@@ -0,0 +1,79 @@
+; RUN: llc -mattr=+bulk-memory -filetype=obj %s -o %t.o
+
+target triple = "wasm32-unknown-unknown"
+
+@no_tls = global i32 0, align 4
+@tls1 = thread_local(localexec) global i32 1, align 4
+@tls2 = thread_local(localexec) global i32 1, align 4
+
+define i32* @tls1_addr() {
+  ret i32* @tls1
+}
+
+define i32* @tls2_addr() {
+  ret i32* @tls2
+}
+
+; RUN: wasm-ld -no-gc-sections --shared-memory --max-memory=131072 --no-entry -o %t.wasm %t.o
+; RUN: obj2yaml %t.wasm | FileCheck %s
+
+; RUN: wasm-ld -no-gc-sections --shared-memory --max-memory=131072 --no-merge-data-segments --no-entry -o %t.wasm %t.o
+; RUN: obj2yaml %t.wasm | FileCheck %s
+
+; CHECK:      - Type:            GLOBAL
+; CHECK-NEXT:   Globals:
+; CHECK-NEXT:     - Index:           0
+; CHECK-NEXT:       Type:            I32
+; CHECK-NEXT:       Mutable:         true
+; CHECK-NEXT:       InitExpr:
+; CHECK-NEXT:         Opcode:          I32_CONST
+; CHECK-NEXT:         Value:           66576
+; CHECK-NEXT:     - Index:           1
+; CHECK-NEXT:       Type:            I32
+; CHECK-NEXT:       Mutable:         true
+; CHECK-NEXT:       InitExpr:
+; CHECK-NEXT:         Opcode:          I32_CONST
+; CHECK-NEXT:         Value:           0
+; CHECK-NEXT:     - Index:           2
+; CHECK-NEXT:       Type:            I32
+; CHECK-NEXT:       Mutable:         false
+; CHECK-NEXT:       InitExpr:
+; CHECK-NEXT:         Opcode:          I32_CONST
+; CHECK-NEXT:         Value:           8
+
+
+; CHECK:      - Type:            CODE
+; CHECK-NEXT:   Functions:
+; Skip __wasm_call_ctors and __wasm_init_memory
+; CHECK:          - Index:           2
+; CHECK-NEXT:       Locals:          []
+; CHECK-NEXT:       Body:            20002401200041004108FC0801000B
+
+; Expected body of __wasm_init_tls:
+;   local.get 0
+;   global.set  1
+;   local.get 0
+;   i32.const 0
+;   i32.const 8
+;   memory.init 1, 0
+;   end
+
+; CHECK-NEXT:     - Index:           3
+; CHECK-NEXT:       Locals:          []
+; CHECK-NEXT:       Body:            2381808080004180808080006A0B
+
+; Expected body of tls1_addr:
+;   global.get 1
+;   i32.const 0
+;   i32.add
+;   end
+
+; CHECK-NEXT:     - Index:           4
+; CHECK-NEXT:       Locals:          []
+; CHECK-NEXT:       Body:            2381808080004184808080006A0B
+
+; Expected body of tls1_addr:
+;   global.get 1
+;   i32.const 4
+;   i32.add
+;   end
diff --git a/deps/lld/test/wasm/trace-symbol.ll b/deps/lld/test/wasm/trace-symbol.ll
new file mode 100644
index 0000000000000000000000000000000000000000..e589de0f6d43e5745a6098cd3c93f672a48ab8ba
--- /dev/null
+++ b/deps/lld/test/wasm/trace-symbol.ll
@@ -0,0 +1,28 @@
+; RUN: llc -filetype=obj %p/Inputs/ret32.ll -o %t.ret32.o
+; RUN: llc -filetype=obj -o %t.start.o %s
+; RUN: wasm-ld -o %t.wasm %t.start.o %t.ret32.o -y ret32 -y _start | FileCheck %s -check-prefix=BOTH
+; RUN: wasm-ld -o %t.wasm %t.ret32.o %t.start.o -y ret32 -y _start | FileCheck %s -check-prefix=REVERSED
+
+; check alias
+; RUN: wasm-ld -o %t.wasm %t.start.o %t.ret32.o -trace-symbol=_start | FileCheck %s -check-prefixes=JUST-START
+
+target triple = "wasm32-unknown-unknown"
+
+declare i32 @ret32(float %arg)
+
+define void @_start() {
+entry:
+  %call1 = call i32 @ret32(float 0.0)
+  ret void
+}
+
+; BOTH:          start.o: definition of _start
+; BOTH-NEXT:     start.o: reference to ret32
+; BOTH-NEXT:     ret32.o: definition of ret32
+
+; REVERSED:      ret32.o: definition of ret32
+; REVERSED-NEXT: start.o: definition of _start
+; REVERSED-NEXT: start.o: reference to ret32
+
+; JUST-START: start.o: definition of _start
+; JUST-START-NOT: ret32
diff --git a/deps/lld/test/wasm/trace.test b/deps/lld/test/wasm/trace.test
new file mode 100644
index 0000000000000000000000000000000000000000..023a2ccb2cc0d202b4efcd7663efca4d280ff8a7
--- /dev/null
+++ b/deps/lld/test/wasm/trace.test
@@ -0,0 +1,8 @@
+RUN: llc -filetype=obj %p/Inputs/start.ll -o %t.foo.o
+
+# Check -t
+RUN: wasm-ld %t.foo.o -o %t.t.out.wasm -t 2>&1 | FileCheck %s
+CHECK: {{.*}}.foo.o
+
+# Check --trace alias
+RUN: wasm-ld %t.foo.o -o %t.trace.out.wasm --trace 2>&1 | FileCheck %s
diff --git a/deps/lld/test/wasm/undefined-data.ll b/deps/lld/test/wasm/undefined-data.ll
new file mode 100644
index 0000000000000000000000000000000000000000..e19086c2e0e00729b306157c259eea511ce9957c
--- /dev/null
+++ b/deps/lld/test/wasm/undefined-data.ll
@@ -0,0 +1,17 @@
+; RUN: llc -filetype=obj %s -o %t.o
+; RUN: not wasm-ld -o %t.wasm %t.o 2>&1 | FileCheck %s -check-prefix=UNDEF
+; RUN: not wasm-ld --allow-undefined -o %t.wasm %t.o 2>&1 | FileCheck %s -check-prefix=UNDEF
+; RUN: not wasm-ld --shared -o %t.wasm %t.o 2>&1 | FileCheck %s -check-prefix=SHARED
+
+target triple = "wasm32-unknown-unknown"
+
+@data_external = external global i32
+
+define i32 @_start() {
+entry:
+    %0 = load i32, i32* @data_external, align 4
+    ret i32 %0
+}
+
+; UNDEF: error: {{.*}}undefined-data.ll.tmp.o: undefined symbol: data_external
+; SHARED: error: {{.*}}undefined-data.ll.tmp.o: relocation R_WASM_MEMORY_ADDR_LEB cannot be used against symbol data_external; recompile with -fPIC
diff --git a/deps/lld/test/wasm/undefined-weak-call.ll b/deps/lld/test/wasm/undefined-weak-call.ll
index 0b7d0c769d475c697939394716d343ed609776f5..badc77f54f01e051912160f54ba638abecd73fa5 100644
--- a/deps/lld/test/wasm/undefined-weak-call.ll
+++ b/deps/lld/test/wasm/undefined-weak-call.ll
@@ -42,7 +42,7 @@ define i32 @callWeakFuncs() {
 ; CHECK-NEXT:         ReturnType:      I32
 ; CHECK-NEXT:         ParamTypes:
 ; CHECK-NEXT:   - Type:            FUNCTION
-; CHECK-NEXT:     FunctionTypes:   [ 0, 0, 0, 1, 2 ]
+; CHECK-NEXT:     FunctionTypes:   [ 0, 0, 1, 2 ]
 ; CHECK-NEXT:   - Type:            TABLE
 ; CHECK-NEXT:     Tables:
 ; CHECK-NEXT:       - ElemType:        FUNCREF
@@ -61,37 +61,19 @@ define i32 @callWeakFuncs() {
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           66560
-; CHECK-NEXT:       - Index:           1
-; CHECK-NEXT:         Type:            I32
-; CHECK-NEXT:         Mutable:         false
-; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           66560
-; CHECK-NEXT:       - Index:           2
-; CHECK-NEXT:         Type:            I32
-; CHECK-NEXT:         Mutable:         false
-; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           1024
 ; CHECK-NEXT:   - Type:            EXPORT
 ; CHECK-NEXT:     Exports:
 ; CHECK-NEXT:       - Name:            memory
 ; CHECK-NEXT:         Kind:            MEMORY
 ; CHECK-NEXT:         Index:           0
-; CHECK-NEXT:       - Name:            __heap_base
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           1
-; CHECK-NEXT:       - Name:            __data_end
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            callWeakFuncs
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           4
+; CHECK-NEXT:         Index:           3
 ; CHECK-NEXT:   - Type:            CODE
 ; CHECK-NEXT:     Functions:
 ; CHECK-NEXT:       - Index:           0
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            0B
+; CHECK-NEXT:         Body:            000B
 ; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            000B
@@ -100,21 +82,16 @@ define i32 @callWeakFuncs() {
 ; CHECK-NEXT:         Body:            000B
 ; CHECK-NEXT:       - Index:           3
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            000B
-; CHECK-NEXT:       - Index:           4
-; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            10818080800010828080800041021083808080004180808080004180808080006A0B
+; CHECK-NEXT:         Body:            10808080800010818080800041021082808080004180808080004180808080006A0B
 ; CHECK-NEXT:   - Type:            CUSTOM
 ; CHECK-NEXT:     Name:            name
 ; CHECK-NEXT:     FunctionNames:
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            __wasm_call_ctors
+; CHECK-NEXT:         Name:            'undefined:weakFunc1'
 ; CHECK-NEXT:       - Index:           1
-; CHECK-NEXT:         Name:            undefined function weakFunc1
+; CHECK-NEXT:         Name:            'undefined:weakFunc2'
 ; CHECK-NEXT:       - Index:           2
-; CHECK-NEXT:         Name:            undefined function weakFunc2
+; CHECK-NEXT:         Name:            'undefined:weakFunc3'
 ; CHECK-NEXT:       - Index:           3
-; CHECK-NEXT:         Name:            undefined function weakFunc3
-; CHECK-NEXT:       - Index:           4
 ; CHECK-NEXT:         Name:            callWeakFuncs
 ; CHECK-NEXT: ...
diff --git a/deps/lld/test/wasm/undefined.ll b/deps/lld/test/wasm/undefined.ll
index 1da979fc07648b02638332ec72a545e2b5b39538..90f92f2bc135643ef281edcf7dcdfd7a73290f14 100644
--- a/deps/lld/test/wasm/undefined.ll
+++ b/deps/lld/test/wasm/undefined.ll
@@ -1,7 +1,7 @@
 ; RUN: llc -filetype=obj %s -o %t.o
 ; RUN: wasm-ld --allow-undefined -o %t.wasm %t.o
 
-; Fails due to undefined 'foo' 
+; Fails due to undefined 'foo'
 ; RUN: not wasm-ld --undefined=baz -o %t.wasm %t.o 2>&1 | FileCheck %s
 ; CHECK: error: {{.*}}.o: undefined symbol: foo
 ; CHECK-NOT: undefined symbol: baz
@@ -16,7 +16,8 @@
 target triple = "wasm32-unknown-unknown"
 
 ; Takes the address of the external foo() resulting in undefined external
-@bar = hidden local_unnamed_addr global i8* bitcast (i32 ()* @foo to i8*), align 4
+@bar = global i8* bitcast (i32 ()* @foo to i8*), align 4
+@llvm.used = appending global [1 x i8**] [i8** @bar], section "llvm.metadata"
 
 declare i32 @foo() #0
 
diff --git a/deps/lld/test/wasm/version.ll b/deps/lld/test/wasm/version.ll
index ea5b41ff9b0dabea444b435e375118ec11d1bfde..84932b029c9e4590b1fc5f7a774c120ae079c550 100644
--- a/deps/lld/test/wasm/version.ll
+++ b/deps/lld/test/wasm/version.ll
@@ -1,6 +1,6 @@
 ; RUN: llc -filetype=obj %s -o %t.o
 ; RUN: wasm-ld -o %t.wasm %t.o
-; RUN: llvm-readobj -file-headers %t.wasm | FileCheck %s
+; RUN: llvm-readobj --file-headers %t.wasm | FileCheck %s
 
 target triple = "wasm32-unknown-unknown"
 
diff --git a/deps/lld/test/wasm/visibility-hidden.ll b/deps/lld/test/wasm/visibility-hidden.ll
index b4fe0b53ba21ab0a64227352c899b03598f79228..f5731c4e964ad16f8723d9a7b9e595e18d939a39 100644
--- a/deps/lld/test/wasm/visibility-hidden.ll
+++ b/deps/lld/test/wasm/visibility-hidden.ll
@@ -43,21 +43,15 @@ entry:
 ; CHECK-NEXT:       - Name:            memory
 ; CHECK-NEXT:         Kind:            MEMORY
 ; CHECK-NEXT:         Index:           0
-; CHECK-NEXT:       - Name:            __heap_base
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           1
-; CHECK-NEXT:       - Name:            __data_end
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            objectDefault
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           2
+; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:       - Name:            _start
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           3
+; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            archiveDefault
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           5
+; CHECK-NEXT:         Index:           4
 ; CHECK-NEXT:   - Type:
 
 
@@ -66,13 +60,7 @@ entry:
 ; NO-DEFAULT-NEXT:       - Name:            memory
 ; NO-DEFAULT-NEXT:         Kind:            MEMORY
 ; NO-DEFAULT-NEXT:         Index:           0
-; NO-DEFAULT-NEXT:       - Name:            __heap_base
-; NO-DEFAULT-NEXT:         Kind:            GLOBAL
-; NO-DEFAULT-NEXT:         Index:           1
-; NO-DEFAULT-NEXT:       - Name:            __data_end
-; NO-DEFAULT-NEXT:         Kind:            GLOBAL
-; NO-DEFAULT-NEXT:         Index:           2
 ; NO-DEFAULT-NEXT:       - Name:            _start
 ; NO-DEFAULT-NEXT:         Kind:            FUNCTION
-; NO-DEFAULT-NEXT:         Index:           3
+; NO-DEFAULT-NEXT:         Index:           2
 ; NO-DEFAULT-NEXT:   - Type:
diff --git a/deps/lld/test/wasm/weak-alias-overide.ll b/deps/lld/test/wasm/weak-alias-overide.ll
index 7fefad0fb04a0efbe6505f15a5c2dbf9fb6b5100..913e53cba877bf50884abc0e02ec6c27f2401c92 100644
--- a/deps/lld/test/wasm/weak-alias-overide.ll
+++ b/deps/lld/test/wasm/weak-alias-overide.ll
@@ -26,13 +26,13 @@ entry:
 ; CHECK-NEXT:   - Type:            TYPE
 ; CHECK-NEXT:     Signatures:
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         ReturnType:      NORESULT
-; CHECK-NEXT:         ParamTypes:
-; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         ReturnType:      I32
 ; CHECK-NEXT:         ParamTypes:
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         ReturnType:      NORESULT
+; CHECK-NEXT:         ParamTypes:
 ; CHECK-NEXT:   - Type:            FUNCTION
-; CHECK-NEXT:     FunctionTypes:   [ 0, 1, 0, 1, 1, 1, 1, 1 ]
+; CHECK-NEXT:     FunctionTypes:   [ 0, 1, 0, 0, 0, 0, 0 ]
 ; CHECK-NEXT:   - Type:            TABLE
 ; CHECK-NEXT:     Tables:
 ; CHECK-NEXT:       - ElemType:        FUNCREF
@@ -51,103 +51,80 @@ entry:
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           66560
-; CHECK-NEXT:       - Index:           1
-; CHECK-NEXT:         Type:            I32
-; CHECK-NEXT:         Mutable:         false
-; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           66560
-; CHECK-NEXT:       - Index:           2
-; CHECK-NEXT:         Type:            I32
-; CHECK-NEXT:         Mutable:         false
-; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           1024
 ; CHECK-NEXT:   - Type:            EXPORT
 ; CHECK-NEXT:     Exports:
 ; CHECK-NEXT:       - Name:            memory
 ; CHECK-NEXT:         Kind:            MEMORY
 ; CHECK-NEXT:         Index:           0
-; CHECK-NEXT:       - Name:            __heap_base
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           1
-; CHECK-NEXT:       - Name:            __data_end
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            alias_fn
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           1
+; CHECK-NEXT:         Index:           0
 ; CHECK-NEXT:       - Name:            _start
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           2
+; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:       - Name:            direct_fn
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           3
+; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            call_direct
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           4
+; CHECK-NEXT:         Index:           3
 ; CHECK-NEXT:       - Name:            call_alias
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           5
+; CHECK-NEXT:         Index:           4
 ; CHECK-NEXT:       - Name:            call_alias_ptr
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           6
+; CHECK-NEXT:         Index:           5
 ; CHECK-NEXT:       - Name:            call_direct_ptr
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           7
+; CHECK-NEXT:         Index:           6
 ; CHECK-NEXT:   - Type:            ELEM
 ; CHECK-NEXT:     Segments:
 ; CHECK-NEXT:       - Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1
-; CHECK-NEXT:         Functions:       [ 1, 3 ]
+; CHECK-NEXT:         Functions:       [ 0, 2 ]
 ; CHECK-NEXT:   - Type:            CODE
 ; CHECK-NEXT:     Functions:
 ; CHECK-NEXT:       - Index:           0
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            0B
-; CHECK-NEXT:       - Index:           1
-; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            41010B
-; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            1081808080001A0B
-; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:         Body:            1080808080001A0B
+; CHECK-NEXT:       - Index:           2
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            41000B
+; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:         Locals:
+; CHECK-NEXT:         Body:            1082808080000B
 ; CHECK-NEXT:       - Index:           4
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            1083808080000B
+; CHECK-NEXT:         Body:            1080808080000B
 ; CHECK-NEXT:       - Index:           5
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            1081808080000B
+; CHECK-NEXT:           - Type:            I32
+; CHECK-NEXT:             Count:           2
+; CHECK-NEXT:         Body:            23808080800041106B220024808080800020004181808080003602081080808080002101200041106A24808080800020010B
 ; CHECK-NEXT:       - Index:           6
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:           - Type:            I32
 ; CHECK-NEXT:             Count:           2
-; CHECK-NEXT:         Body:            23808080800041106B220024808080800020004181808080003602081081808080002101200041106A24808080800020010B
-; CHECK-NEXT:       - Index:           7
-; CHECK-NEXT:         Locals:
-; CHECK-NEXT:           - Type:            I32
-; CHECK-NEXT:             Count:           2
-; CHECK-NEXT:         Body:            23808080800041106B220024808080800020004182808080003602081083808080002101200041106A24808080800020010B
+; CHECK-NEXT:         Body:            23808080800041106B220024808080800020004182808080003602081082808080002101200041106A24808080800020010B
 ; CHECK-NEXT:   - Type:            CUSTOM
 ; CHECK-NEXT:     Name:            name
 ; CHECK-NEXT:     FunctionNames:
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            __wasm_call_ctors
-; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            alias_fn
-; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            _start
-; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:       - Index:           2
 ; CHECK-NEXT:         Name:            direct_fn
-; CHECK-NEXT:       - Index:           4
+; CHECK-NEXT:       - Index:           3
 ; CHECK-NEXT:         Name:            call_direct
-; CHECK-NEXT:       - Index:           5
+; CHECK-NEXT:       - Index:           4
 ; CHECK-NEXT:         Name:            call_alias
-; CHECK-NEXT:       - Index:           6
+; CHECK-NEXT:       - Index:           5
 ; CHECK-NEXT:         Name:            call_alias_ptr
-; CHECK-NEXT:       - Index:           7
+; CHECK-NEXT:       - Index:           6
 ; CHECK-NEXT:         Name:            call_direct_ptr
 ; CHECK-NEXT: ...
diff --git a/deps/lld/test/wasm/weak-alias.ll b/deps/lld/test/wasm/weak-alias.ll
index a925c10ccda413f0419847295a1f4bfe35c89e8a..6d79b70249975574f57a2a4f549bc57230708446 100644
--- a/deps/lld/test/wasm/weak-alias.ll
+++ b/deps/lld/test/wasm/weak-alias.ll
@@ -29,7 +29,7 @@ entry:
 ; CHECK-NEXT:         ReturnType:      I32
 ; CHECK-NEXT:         ParamTypes:
 ; CHECK-NEXT:   - Type:            FUNCTION
-; CHECK-NEXT:     FunctionTypes:   [ 0, 0, 1, 1, 1, 1, 1 ]
+; CHECK-NEXT:     FunctionTypes:   [ 0, 1, 1, 1, 1, 1 ]
 ; CHECK-NEXT:   - Type:            TABLE
 ; CHECK-NEXT:     Tables:
 ; CHECK-NEXT:       - ElemType:        FUNCREF
@@ -48,99 +48,76 @@ entry:
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           66560
-; CHECK-NEXT:       - Index:           1
-; CHECK-NEXT:         Type:            I32
-; CHECK-NEXT:         Mutable:         false
-; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           66560
-; CHECK-NEXT:       - Index:           2
-; CHECK-NEXT:         Type:            I32
-; CHECK-NEXT:         Mutable:         false
-; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           1024
 ; CHECK-NEXT:   - Type:            EXPORT
 ; CHECK-NEXT:     Exports:
 ; CHECK-NEXT:       - Name:            memory
 ; CHECK-NEXT:         Kind:            MEMORY
 ; CHECK-NEXT:         Index:           0
-; CHECK-NEXT:       - Name:            __heap_base
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           1
-; CHECK-NEXT:       - Name:            __data_end
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            _start
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           1
+; CHECK-NEXT:         Index:           0
 ; CHECK-NEXT:       - Name:            alias_fn
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           2
+; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:       - Name:            direct_fn
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           2
+; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:       - Name:            call_direct
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           3
+; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            call_alias
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           4
+; CHECK-NEXT:         Index:           3
 ; CHECK-NEXT:       - Name:            call_alias_ptr
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           5
+; CHECK-NEXT:         Index:           4
 ; CHECK-NEXT:       - Name:            call_direct_ptr
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           6
+; CHECK-NEXT:         Index:           5
 ; CHECK-NEXT:   - Type:            ELEM
 ; CHECK-NEXT:     Segments:
 ; CHECK-NEXT:       - Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1
-; CHECK-NEXT:         Functions:       [ 2 ]
+; CHECK-NEXT:         Functions:       [ 1 ]
 ; CHECK-NEXT:   - Type:            CODE
 ; CHECK-NEXT:     Functions:
 ; CHECK-NEXT:       - Index:           0
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            0B
+; CHECK-NEXT:         Body:            1081808080001A0B
 ; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            1082808080001A0B
-; CHECK-NEXT:       - Index:           2
-; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            41000B
+; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:         Locals:
+; CHECK-NEXT:         Body:            1081808080000B
 ; CHECK-NEXT:       - Index:           3
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            1082808080000B
+; CHECK-NEXT:         Body:            1081808080000B
 ; CHECK-NEXT:       - Index:           4
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            1082808080000B
+; CHECK-NEXT:           - Type:            I32
+; CHECK-NEXT:             Count:           2
+; CHECK-NEXT:         Body:            23808080800041106B220024808080800020004181808080003602081081808080002101200041106A24808080800020010B
 ; CHECK-NEXT:       - Index:           5
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:           - Type:            I32
 ; CHECK-NEXT:             Count:           2
-; CHECK-NEXT:         Body:            23808080800041106B220024808080800020004181808080003602081082808080002101200041106A24808080800020010B
-; CHECK-NEXT:       - Index:           6
-; CHECK-NEXT:         Locals:
-; CHECK-NEXT:           - Type:            I32
-; CHECK-NEXT:             Count:           2
-; CHECK-NEXT:         Body:            23808080800041106B220024808080800020004181808080003602081082808080002101200041106A24808080800020010B
+; CHECK-NEXT:         Body:            23808080800041106B220024808080800020004181808080003602081081808080002101200041106A24808080800020010B
 ; CHECK-NEXT:   - Type:            CUSTOM
 ; CHECK-NEXT:     Name:            name
 ; CHECK-NEXT:     FunctionNames:
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            __wasm_call_ctors
-; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            _start
-; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            direct_fn
-; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:       - Index:           2
 ; CHECK-NEXT:         Name:            call_direct
-; CHECK-NEXT:       - Index:           4
+; CHECK-NEXT:       - Index:           3
 ; CHECK-NEXT:         Name:            call_alias
-; CHECK-NEXT:       - Index:           5
+; CHECK-NEXT:       - Index:           4
 ; CHECK-NEXT:         Name:            call_alias_ptr
-; CHECK-NEXT:       - Index:           6
+; CHECK-NEXT:       - Index:           5
 ; CHECK-NEXT:         Name:            call_direct_ptr
 ; CHECK-NEXT: ...
 
@@ -186,43 +163,43 @@ entry:
 ; RELOC-NEXT:         Functions:       [ 1 ]
 ; RELOC-NEXT:   - Type:            CODE
 ; RELOC-NEXT:     Relocations:
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_FUNCTION_INDEX_LEB
+; RELOC-NEXT:       - Type:            R_WASM_FUNCTION_INDEX_LEB
 ; RELOC-NEXT:         Index:           1
 ; RELOC-NEXT:         Offset:          0x00000004
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_FUNCTION_INDEX_LEB
+; RELOC-NEXT:       - Type:            R_WASM_FUNCTION_INDEX_LEB
 ; RELOC-NEXT:         Index:           2
 ; RELOC-NEXT:         Offset:          0x00000013
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_FUNCTION_INDEX_LEB
+; RELOC-NEXT:       - Type:            R_WASM_FUNCTION_INDEX_LEB
 ; RELOC-NEXT:         Index:           1
 ; RELOC-NEXT:         Offset:          0x0000001C
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_GLOBAL_INDEX_LEB
+; RELOC-NEXT:       - Type:            R_WASM_GLOBAL_INDEX_LEB
 ; RELOC-NEXT:         Index:           6
 ; RELOC-NEXT:         Offset:          0x00000027
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_GLOBAL_INDEX_LEB
+; RELOC-NEXT:       - Type:            R_WASM_GLOBAL_INDEX_LEB
 ; RELOC-NEXT:         Index:           6
 ; RELOC-NEXT:         Offset:          0x00000032
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_TABLE_INDEX_SLEB
+; RELOC-NEXT:       - Type:            R_WASM_TABLE_INDEX_SLEB
 ; RELOC-NEXT:         Index:           1
 ; RELOC-NEXT:         Offset:          0x0000003A
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_FUNCTION_INDEX_LEB
+; RELOC-NEXT:       - Type:            R_WASM_FUNCTION_INDEX_LEB
 ; RELOC-NEXT:         Index:           1
 ; RELOC-NEXT:         Offset:          0x00000043
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_GLOBAL_INDEX_LEB
+; RELOC-NEXT:       - Type:            R_WASM_GLOBAL_INDEX_LEB
 ; RELOC-NEXT:         Index:           6
 ; RELOC-NEXT:         Offset:          0x00000050
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_GLOBAL_INDEX_LEB
+; RELOC-NEXT:       - Type:            R_WASM_GLOBAL_INDEX_LEB
 ; RELOC-NEXT:         Index:           6
 ; RELOC-NEXT:         Offset:          0x0000005D
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_GLOBAL_INDEX_LEB
+; RELOC-NEXT:       - Type:            R_WASM_GLOBAL_INDEX_LEB
 ; RELOC-NEXT:         Index:           6
 ; RELOC-NEXT:         Offset:          0x00000068
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_TABLE_INDEX_SLEB
+; RELOC-NEXT:       - Type:            R_WASM_TABLE_INDEX_SLEB
 ; RELOC-NEXT:         Index:           2
 ; RELOC-NEXT:         Offset:          0x00000070
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_FUNCTION_INDEX_LEB
+; RELOC-NEXT:       - Type:            R_WASM_FUNCTION_INDEX_LEB
 ; RELOC-NEXT:         Index:           2
 ; RELOC-NEXT:         Offset:          0x00000079
-; RELOC-NEXT:       - Type:            R_WEBASSEMBLY_GLOBAL_INDEX_LEB
+; RELOC-NEXT:       - Type:            R_WASM_GLOBAL_INDEX_LEB
 ; RELOC-NEXT:         Index:           6
 ; RELOC-NEXT:         Offset:          0x00000086
 ; RELOC-NEXT:     Functions:
diff --git a/deps/lld/test/wasm/weak-symbols.ll b/deps/lld/test/wasm/weak-symbols.ll
index 41ade7c1aa0ea2fb498682ff4b08ec227d97a3d4..1ae28b350bd3acc9abf6bff53913f1f8ec7a665a 100644
--- a/deps/lld/test/wasm/weak-symbols.ll
+++ b/deps/lld/test/wasm/weak-symbols.ll
@@ -29,7 +29,7 @@ entry:
 ; CHECK-NEXT:         ReturnType:      I32
 ; CHECK-NEXT:         ParamTypes:
 ; CHECK-NEXT:   - Type:            FUNCTION
-; CHECK-NEXT:     FunctionTypes:   [ 0, 0, 1, 1, 1 ]
+; CHECK-NEXT:     FunctionTypes:   [ 0, 1, 1, 1 ]
 ; CHECK-NEXT:   - Type:            TABLE
 ; CHECK-NEXT:     Tables:
 ; CHECK-NEXT:       - ElemType:        FUNCREF
@@ -53,72 +53,51 @@ entry:
 ; CHECK-NEXT:         Mutable:         false
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           66576
-; CHECK-NEXT:       - Index:           2
-; CHECK-NEXT:         Type:            I32
-; CHECK-NEXT:         Mutable:         false
-; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           1028
-; CHECK-NEXT:       - Index:           3
-; CHECK-NEXT:         Type:            I32
-; CHECK-NEXT:         Mutable:         false
-; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1024
 ; CHECK-NEXT:   - Type:            EXPORT
 ; CHECK-NEXT:     Exports:
 ; CHECK-NEXT:       - Name:            memory
 ; CHECK-NEXT:         Kind:            MEMORY
 ; CHECK-NEXT:         Index:           0
-; CHECK-NEXT:       - Name:            __heap_base
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           1
-; CHECK-NEXT:       - Name:            __data_end
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            _start
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           1
+; CHECK-NEXT:         Index:           0
 ; CHECK-NEXT:       - Name:            weakFn
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           2
+; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:       - Name:            exportWeak1
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           3
+; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            weakGlobal
 ; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           3
+; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:       - Name:            exportWeak2
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           4
+; CHECK-NEXT:         Index:           3
 ; CHECK-NEXT:   - Type:            ELEM
 ; CHECK-NEXT:     Segments:
 ; CHECK-NEXT:       - Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1
-; CHECK-NEXT:         Functions:       [ 2 ]
+; CHECK-NEXT:         Functions:       [ 1 ]
 ; CHECK-NEXT:   - Type:            CODE
 ; CHECK-NEXT:     Functions:
 ; CHECK-NEXT:       - Index:           0
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            0B
+; CHECK-NEXT:         Body:            1081808080001A0B
 ; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            1082808080001A0B
-; CHECK-NEXT:       - Index:           2
-; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            41010B
-; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:       - Index:           2
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4181808080000B
-; CHECK-NEXT:       - Index:           4
+; CHECK-NEXT:       - Index:           3
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4181808080000B
 ; CHECK-NEXT:   - Type:            DATA
 ; CHECK-NEXT:     Segments:
 ; CHECK-NEXT:       - SectionOffset:   7
-; CHECK-NEXT:         MemoryIndex:     0
+; CHECK-NEXT:         InitFlags:       0
 ; CHECK-NEXT:         Offset:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1024
@@ -127,13 +106,11 @@ entry:
 ; CHECK-NEXT:     Name:            name
 ; CHECK-NEXT:     FunctionNames:
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            __wasm_call_ctors
-; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            _start
-; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            weakFn
-; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:       - Index:           2
 ; CHECK-NEXT:         Name:            exportWeak1
-; CHECK-NEXT:       - Index:           4
+; CHECK-NEXT:       - Index:           3
 ; CHECK-NEXT:         Name:            exportWeak2
 ; CHECK-NEXT: ...
diff --git a/deps/lld/test/wasm/weak-undefined.ll b/deps/lld/test/wasm/weak-undefined.ll
index 41e992e5ea47247705497f851e4add87a3562f5b..65f723de04219e1eaeed2f7bdfa8ccbfa88b5658 100644
--- a/deps/lld/test/wasm/weak-undefined.ll
+++ b/deps/lld/test/wasm/weak-undefined.ll
@@ -34,13 +34,13 @@ entry:
 ; CHECK-NEXT:   - Type:            TYPE
 ; CHECK-NEXT:     Signatures:
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         ReturnType:      NORESULT
-; CHECK-NEXT:         ParamTypes:
-; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         ReturnType:      I32
 ; CHECK-NEXT:         ParamTypes:
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         ReturnType:      NORESULT
+; CHECK-NEXT:         ParamTypes:
 ; CHECK-NEXT:   - Type:            FUNCTION
-; CHECK-NEXT:     FunctionTypes:   [ 0, 1, 1, 0 ]
+; CHECK-NEXT:     FunctionTypes:   [ 0, 0, 1 ]
 ; CHECK-NEXT:   - Type:            TABLE
 ; CHECK-NEXT:     Tables:
 ; CHECK-NEXT:       - ElemType:        FUNCREF
@@ -59,44 +59,23 @@ entry:
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           66560
-; CHECK-NEXT:       - Index:           1
-; CHECK-NEXT:         Type:            I32
-; CHECK-NEXT:         Mutable:         false
-; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           66560
-; CHECK-NEXT:       - Index:           2
-; CHECK-NEXT:         Type:            I32
-; CHECK-NEXT:         Mutable:         false
-; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           1024
 ; CHECK-NEXT:   - Type:            EXPORT
 ; CHECK-NEXT:     Exports:
 ; CHECK-NEXT:       - Name:            memory
 ; CHECK-NEXT:         Kind:            MEMORY
 ; CHECK-NEXT:         Index:           0
-; CHECK-NEXT:       - Name:            __heap_base
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           1
-; CHECK-NEXT:       - Name:            __data_end
-; CHECK-NEXT:         Kind:            GLOBAL
-; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:       - Name:            _start
 ; CHECK-NEXT:         Kind:            FUNCTION
-; CHECK-NEXT:         Index:           3
+; CHECK-NEXT:         Index:           2
 ; CHECK-NEXT:   - Type:            CODE
 ; CHECK-NEXT:     Functions:
 ; CHECK-NEXT:       - Index:           0
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            0B
+; CHECK-NEXT:         Body:            4180808080000B
 ; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4180808080000B
 ; CHECK-NEXT:       - Index:           2
 ; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            4180808080000B
-; CHECK-NEXT:       - Index:           3
-; CHECK-NEXT:         Locals:
-; CHECK-NEXT:         Body:            1082808080001A1081808080001A0B
+; CHECK-NEXT:         Body:            1081808080001A1080808080001A0B
 ; CHECK-NEXT: ...
diff --git a/deps/lld/test/wasm/wrap.ll b/deps/lld/test/wasm/wrap.ll
new file mode 100644
index 0000000000000000000000000000000000000000..ff850accfd59679722964468ccd0bfcba6fe5dc5
--- /dev/null
+++ b/deps/lld/test/wasm/wrap.ll
@@ -0,0 +1,40 @@
+; RUN: llc -filetype=obj %s -o %t.o
+; RUN: wasm-ld -wrap nosuchsym -wrap foo -o %t.wasm %t.o
+; RUN: wasm-ld -emit-relocs -wrap foo -o %t.wasm %t.o
+; RUN: obj2yaml %t.wasm | FileCheck %s
+
+target triple = "wasm32-unknown-unknown"
+
+define i32 @foo() {
+  ret i32 1
+}
+
+define void @_start() {
+entry:
+  call i32 @foo()
+  ret void
+}
+
+declare i32 @__real_foo()
+
+define i32 @__wrap_foo() {
+  %rtn = call i32 @__real_foo()
+  ret i32 %rtn
+}
+
+; CHECK:      - Type:            CODE
+; CHECK-NEXT:   Relocations:     
+; CHECK-NEXT:     - Type:            R_WASM_FUNCTION_INDEX_LEB
+; CHECK-NEXT:       Index:           2
+; CHECK-NEXT:       Offset:          0x00000009
+; CHECK-NEXT:     - Type:            R_WASM_FUNCTION_INDEX_LEB
+; CHECK-NEXT:       Index:           0
+; CHECK-NEXT:       Offset:          0x00000013
+
+; CHECK:        FunctionNames:
+; CHECK-NEXT:      - Index:           0
+; CHECK-NEXT:        Name:            foo
+; CHECK-NEXT:      - Index:           1
+; CHECK-NEXT:        Name:            _start
+; CHECK-NEXT:      - Index:           2
+; CHECK-NEXT:        Name:            __wrap_foo
diff --git a/deps/lld/tools/lld/CMakeLists.txt b/deps/lld/tools/lld/CMakeLists.txt
index d8829493fc22bdfdcf655f8c5d081eb550028127..a15e296e31dfaef128e611692e2d4fe4232e51d4 100644
--- a/deps/lld/tools/lld/CMakeLists.txt
+++ b/deps/lld/tools/lld/CMakeLists.txt
@@ -8,6 +8,7 @@ add_lld_tool(lld
 
 target_link_libraries(lld
   PRIVATE
+  lldCommon
   lldCOFF
   lldDriver
   lldELF
diff --git a/deps/lld/tools/lld/lld.cpp b/deps/lld/tools/lld/lld.cpp
index c749d458a992ab1d139ee9b577497bc7bfd99863..37ef260495e9b5ed24e627855141ad0ee0b44c83 100644
--- a/deps/lld/tools/lld/lld.cpp
+++ b/deps/lld/tools/lld/lld.cpp
@@ -1,9 +1,8 @@
 //===- tools/lld/lld.cpp - Linker Driver Dispatcher -----------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -27,9 +26,13 @@
 //===----------------------------------------------------------------------===//
 
 #include "lld/Common/Driver.h"
+#include "lld/Common/Memory.h"
 #include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringSwitch.h"
+#include "llvm/ADT/Triple.h"
 #include "llvm/ADT/Twine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Support/InitLLVM.h"
 #include "llvm/Support/Path.h"
 #include <cstdlib>
@@ -46,13 +49,13 @@ enum Flavor {
   Wasm,    // -flavor wasm
 };
 
-LLVM_ATTRIBUTE_NORETURN static void die(const Twine &S) {
-  errs() << S << "\n";
+LLVM_ATTRIBUTE_NORETURN static void die(const Twine &s) {
+  errs() << s << "\n";
   exit(1);
 }
 
-static Flavor getFlavor(StringRef S) {
-  return StringSwitch<Flavor>(S)
+static Flavor getFlavor(StringRef s) {
+  return StringSwitch<Flavor>(s)
       .CasesLower("ld", "ld.lld", "gnu", Gnu)
       .CasesLower("wasm", "ld-wasm", Wasm)
       .CaseLower("link", WinLink)
@@ -60,55 +63,73 @@ static Flavor getFlavor(StringRef S) {
       .Default(Invalid);
 }
 
-static bool isPETarget(const std::vector<const char *> &V) {
-  for (auto It = V.begin(); It + 1 != V.end(); ++It) {
-    if (StringRef(*It) != "-m")
+static cl::TokenizerCallback getDefaultQuotingStyle() {
+  if (Triple(sys::getProcessTriple()).getOS() == Triple::Win32)
+    return cl::TokenizeWindowsCommandLine;
+  return cl::TokenizeGNUCommandLine;
+}
+
+static bool isPETargetName(StringRef s) {
+  return s == "i386pe" || s == "i386pep" || s == "thumb2pe" || s == "arm64pe";
+}
+
+static bool isPETarget(std::vector<const char *> &v) {
+  for (auto it = v.begin(); it + 1 != v.end(); ++it) {
+    if (StringRef(*it) != "-m")
       continue;
-    StringRef S = *(It + 1);
-    return S == "i386pe" || S == "i386pep" || S == "thumb2pe" || S == "arm64pe";
+    return isPETargetName(*(it + 1));
+  }
+  // Expand response files (arguments in the form of @<filename>)
+  // to allow detecting the -m argument from arguments in them.
+  SmallVector<const char *, 256> expandedArgs(v.data(), v.data() + v.size());
+  cl::ExpandResponseFiles(saver, getDefaultQuotingStyle(), expandedArgs);
+  for (auto it = expandedArgs.begin(); it + 1 != expandedArgs.end(); ++it) {
+    if (StringRef(*it) != "-m")
+      continue;
+    return isPETargetName(*(it + 1));
   }
   return false;
 }
 
-static Flavor parseProgname(StringRef Progname) {
+static Flavor parseProgname(StringRef progname) {
 #if __APPLE__
   // Use Darwin driver for "ld" on Darwin.
-  if (Progname == "ld")
+  if (progname == "ld")
     return Darwin;
 #endif
 
 #if LLVM_ON_UNIX
   // Use GNU driver for "ld" on other Unix-like system.
-  if (Progname == "ld")
+  if (progname == "ld")
     return Gnu;
 #endif
 
   // Progname may be something like "lld-gnu". Parse it.
-  SmallVector<StringRef, 3> V;
-  Progname.split(V, "-");
-  for (StringRef S : V)
-    if (Flavor F = getFlavor(S))
-      return F;
+  SmallVector<StringRef, 3> v;
+  progname.split(v, "-");
+  for (StringRef s : v)
+    if (Flavor f = getFlavor(s))
+      return f;
   return Invalid;
 }
 
-static Flavor parseFlavor(std::vector<const char *> &V) {
+static Flavor parseFlavor(std::vector<const char *> &v) {
   // Parse -flavor option.
-  if (V.size() > 1 && V[1] == StringRef("-flavor")) {
-    if (V.size() <= 2)
+  if (v.size() > 1 && v[1] == StringRef("-flavor")) {
+    if (v.size() <= 2)
       die("missing arg value for '-flavor'");
-    Flavor F = getFlavor(V[2]);
-    if (F == Invalid)
-      die("Unknown flavor: " + StringRef(V[2]));
-    V.erase(V.begin() + 1, V.begin() + 3);
-    return F;
+    Flavor f = getFlavor(v[2]);
+    if (f == Invalid)
+      die("Unknown flavor: " + StringRef(v[2]));
+    v.erase(v.begin() + 1, v.begin() + 3);
+    return f;
   }
 
   // Deduct the flavor from argv[0].
-  StringRef Arg0 = path::filename(V[0]);
-  if (Arg0.endswith_lower(".exe"))
-    Arg0 = Arg0.drop_back(4);
-  return parseProgname(Arg0);
+  StringRef arg0 = path::filename(v[0]);
+  if (arg0.endswith_lower(".exe"))
+    arg0 = arg0.drop_back(4);
+  return parseProgname(arg0);
 }
 
 // If this function returns true, lld calls _exit() so that it quickly
@@ -121,21 +142,21 @@ static bool canExitEarly() { return StringRef(getenv("LLD_IN_TEST")) != "1"; }
 
 /// Universal linker main(). This linker emulates the gnu, darwin, or
 /// windows linker based on the argv[0] or -flavor option.
-int main(int Argc, const char **Argv) {
-  InitLLVM X(Argc, Argv);
+int main(int argc, const char **argv) {
+  InitLLVM x(argc, argv);
 
-  std::vector<const char *> Args(Argv, Argv + Argc);
-  switch (parseFlavor(Args)) {
+  std::vector<const char *> args(argv, argv + argc);
+  switch (parseFlavor(args)) {
   case Gnu:
-    if (isPETarget(Args))
-      return !mingw::link(Args);
-    return !elf::link(Args, canExitEarly());
+    if (isPETarget(args))
+      return !mingw::link(args);
+    return !elf::link(args, canExitEarly());
   case WinLink:
-    return !coff::link(Args, canExitEarly());
+    return !coff::link(args, canExitEarly());
   case Darwin:
-    return !mach_o::link(Args, canExitEarly());
+    return !mach_o::link(args, canExitEarly());
   case Wasm:
-    return !wasm::link(Args, canExitEarly());
+    return !wasm::link(args, canExitEarly());
   default:
     die("lld is a generic driver.\n"
         "Invoke ld.lld (Unix), ld64.lld (macOS), lld-link (Windows), wasm-ld"
diff --git a/deps/lld/unittests/DriverTests/DarwinLdDriverTest.cpp b/deps/lld/unittests/DriverTests/DarwinLdDriverTest.cpp
index e2e634a4cb2d5d675b976685ea6709e797ec3bed..80666702511cb88b0f231b54ab1c04f0adb058ee 100644
--- a/deps/lld/unittests/DriverTests/DarwinLdDriverTest.cpp
+++ b/deps/lld/unittests/DriverTests/DarwinLdDriverTest.cpp
@@ -1,9 +1,8 @@
 //===- lld/unittest/DarwinLdDriverTest.cpp --------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 ///
diff --git a/deps/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp b/deps/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp
index 336bbdba6269245dee467f159257fe926e787c04..aad5f8afcfdc390ed23dfa2d9e993b40866f1f2a 100644
--- a/deps/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp
+++ b/deps/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp
@@ -1,9 +1,8 @@
 //===- lld/unittest/MachOTests/MachONormalizedFileBinaryReaderTests.cpp ---===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp b/deps/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp
index 210fecbf08661d06517ed6f82bf51e3869fa2194..d0cdd50de63fd19b01a797b69ba92d354dc5bff2 100644
--- a/deps/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp
+++ b/deps/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp
@@ -1,9 +1,8 @@
 //===- lld/unittest/MachOTests/MachONormalizedFileBinaryWriterTests.cpp ---===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/unittests/MachOTests/MachONormalizedFileToAtomsTests.cpp b/deps/lld/unittests/MachOTests/MachONormalizedFileToAtomsTests.cpp
index a0176bb671b70de706690372dae5d33a06ff0cef..cf9a845c4b269a9e509f261de3e8422ae4df500c 100644
--- a/deps/lld/unittests/MachOTests/MachONormalizedFileToAtomsTests.cpp
+++ b/deps/lld/unittests/MachOTests/MachONormalizedFileToAtomsTests.cpp
@@ -1,9 +1,8 @@
 //===- lld/unittest/MachOTests/MachONormalizedFileToAtomsTests.cpp --------===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/unittests/MachOTests/MachONormalizedFileYAMLTests.cpp b/deps/lld/unittests/MachOTests/MachONormalizedFileYAMLTests.cpp
index 6bbde72d3dd1ab113381f1861082ceb69641e94b..6ceb197b4b84a7ec371c33d1c1ee27fb7ee81845 100644
--- a/deps/lld/unittests/MachOTests/MachONormalizedFileYAMLTests.cpp
+++ b/deps/lld/unittests/MachOTests/MachONormalizedFileYAMLTests.cpp
@@ -1,9 +1,8 @@
 //===- lld/unittest/MachOTests/MachONormalizedFileYAMLTests.cpp -----------===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/utils/benchmark.py b/deps/lld/utils/benchmark.py
index f1deb0647a15a78e153a5c295ef18c315dcdcbd1..47490b9a98289f22a14018a1e54884cf5a90f4cf 100755
--- a/deps/lld/utils/benchmark.py
+++ b/deps/lld/utils/benchmark.py
@@ -1,9 +1,8 @@
 #!/usr/bin/env python
 #
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
+# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+# See https://llvm.org/LICENSE.txt for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 #
 # ==------------------------------------------------------------------------==#
 
@@ -14,8 +13,13 @@ import subprocess
 import json
 import datetime
 import argparse
-import urllib
-import urllib2
+try:
+    from urllib.parse import urlencode
+    from urllib.request import urlopen, Request
+except ImportError:
+    from urllib import urlencode
+    from urllib2 import urlopen, Request
+
 
 parser = argparse.ArgumentParser()
 parser.add_argument('benchmark_directory')
@@ -127,8 +131,8 @@ def buildLntJson(benchmarks):
     return json.dumps(ret, sort_keys=True, indent=4)
 
 def submitToServer(data):
-    data2 = urllib.urlencode({ 'input_data' : data }).encode('ascii')
-    urllib2.urlopen(urllib2.Request(args.url, data2))
+    data2 = urlencode({ 'input_data' : data }).encode('ascii')
+    urlopen(Request(args.url, data2))
 
 os.chdir(args.benchmark_directory)
 data = buildLntJson(getBenchmarks())
diff --git a/deps/lld/wasm/CMakeLists.txt b/deps/lld/wasm/CMakeLists.txt
index 1a9e09b38429c23e0607e9245fc8e426f3e7ea5d..9e6075e1f7f16e8fd3627b1c7dc4f95c547730a3 100644
--- a/deps/lld/wasm/CMakeLists.txt
+++ b/deps/lld/wasm/CMakeLists.txt
@@ -13,8 +13,10 @@ add_lld_library(lldWasm
   LTO.cpp
   MarkLive.cpp
   OutputSections.cpp
+  Relocations.cpp
   SymbolTable.cpp
   Symbols.cpp
+  SyntheticSections.cpp
   Writer.cpp
   WriterUtils.cpp
 
@@ -35,4 +37,4 @@ add_lld_library(lldWasm
   DEPENDS
   WasmOptionsTableGen
   ${tablegen_deps}
-  )
\ No newline at end of file
+  )
diff --git a/deps/lld/wasm/Config.h b/deps/lld/wasm/Config.h
index 0857a645f1e8d4394984cc9252af3936c8140a56..e502b2f17cda3601c8d63610e117f62d67257196 100644
--- a/deps/lld/wasm/Config.h
+++ b/deps/lld/wasm/Config.h
@@ -1,9 +1,8 @@
 //===- Config.h -------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -18,49 +17,63 @@
 namespace lld {
 namespace wasm {
 
+// This struct contains the global configuration for the linker.
+// Most fields are direct mapping from the command line options
+// and such fields have the same name as the corresponding options.
+// Most fields are initialized by the driver.
 struct Configuration {
-  bool AllowUndefined;
-  bool CompressRelocations;
-  bool Demangle;
-  bool DisableVerify;
-  bool ExportAll;
-  bool ExportDynamic;
-  bool ExportTable;
-  bool GcSections;
-  bool ImportMemory;
-  bool SharedMemory;
-  bool ImportTable;
-  bool MergeDataSegments;
-  bool Pie;
-  bool PrintGcSections;
-  bool Relocatable;
-  bool SaveTemps;
-  bool Shared;
-  bool StripAll;
-  bool StripDebug;
-  bool StackFirst;
-  uint32_t GlobalBase;
-  uint32_t InitialMemory;
-  uint32_t MaxMemory;
-  uint32_t ZStackSize;
-  unsigned LTOPartitions;
-  unsigned LTOO;
-  unsigned Optimize;
-  unsigned ThinLTOJobs;
-  llvm::StringRef Entry;
-  llvm::StringRef OutputFile;
-  llvm::StringRef ThinLTOCacheDir;
+  bool allowUndefined;
+  bool checkFeatures;
+  bool compressRelocations;
+  bool demangle;
+  bool disableVerify;
+  bool emitRelocs;
+  bool exportAll;
+  bool exportDynamic;
+  bool exportTable;
+  bool gcSections;
+  bool importMemory;
+  bool sharedMemory;
+  bool passiveSegments;
+  bool importTable;
+  bool mergeDataSegments;
+  bool pie;
+  bool printGcSections;
+  bool relocatable;
+  bool saveTemps;
+  bool shared;
+  bool stripAll;
+  bool stripDebug;
+  bool stackFirst;
+  bool trace;
+  uint32_t globalBase;
+  uint32_t initialMemory;
+  uint32_t maxMemory;
+  uint32_t zStackSize;
+  unsigned ltoPartitions;
+  unsigned ltoo;
+  unsigned optimize;
+  unsigned thinLTOJobs;
 
-  llvm::StringSet<> AllowUndefinedSymbols;
-  std::vector<llvm::StringRef> SearchPaths;
-  llvm::CachePruningPolicy ThinLTOCachePolicy;
+  llvm::StringRef entry;
+  llvm::StringRef outputFile;
+  llvm::StringRef thinLTOCacheDir;
+
+  llvm::StringSet<> allowUndefinedSymbols;
+  llvm::StringSet<> exportedSymbols;
+  std::vector<llvm::StringRef> searchPaths;
+  llvm::CachePruningPolicy thinLTOCachePolicy;
+  llvm::Optional<std::vector<std::string>> features;
+
+  // The following config options do not directly correspond to any
+  // particualr command line options.
 
   // True if we are creating position-independent code.
-  bool Pic;
+  bool isPic;
 };
 
 // The only instance of Configuration struct.
-extern Configuration *Config;
+extern Configuration *config;
 
 } // namespace wasm
 } // namespace lld
diff --git a/deps/lld/wasm/Driver.cpp b/deps/lld/wasm/Driver.cpp
index ade15a19f66e0f33ab5a6ba7ddea85aede695abe..003dd0d30bafb67df40361331cf64c33708a9783 100644
--- a/deps/lld/wasm/Driver.cpp
+++ b/deps/lld/wasm/Driver.cpp
@@ -1,9 +1,8 @@
 //===- Driver.cpp ---------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -17,15 +16,18 @@
 #include "lld/Common/Args.h"
 #include "lld/Common/ErrorHandler.h"
 #include "lld/Common/Memory.h"
+#include "lld/Common/Reproduce.h"
 #include "lld/Common/Strings.h"
 #include "lld/Common/Threads.h"
 #include "lld/Common/Version.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Object/Wasm.h"
+#include "llvm/Option/Arg.h"
 #include "llvm/Option/ArgList.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Process.h"
+#include "llvm/Support/TarWriter.h"
 #include "llvm/Support/TargetSelect.h"
 
 #define DEBUG_TYPE "lld"
@@ -38,7 +40,7 @@ using namespace llvm::wasm;
 using namespace lld;
 using namespace lld::wasm;
 
-Configuration *lld::wasm::Config;
+Configuration *lld::wasm::config;
 
 namespace {
 
@@ -63,39 +65,39 @@ static void initLLVM() {
 
 class LinkerDriver {
 public:
-  void link(ArrayRef<const char *> ArgsArr);
+  void link(ArrayRef<const char *> argsArr);
 
 private:
-  void createFiles(opt::InputArgList &Args);
-  void addFile(StringRef Path);
-  void addLibrary(StringRef Name);
+  void createFiles(opt::InputArgList &args);
+  void addFile(StringRef path);
+  void addLibrary(StringRef name);
 
   // True if we are in --whole-archive and --no-whole-archive.
-  bool InWholeArchive = false;
+  bool inWholeArchive = false;
 
-  std::vector<InputFile *> Files;
+  std::vector<InputFile *> files;
 };
 } // anonymous namespace
 
-bool lld::wasm::link(ArrayRef<const char *> Args, bool CanExitEarly,
-                     raw_ostream &Error) {
-  errorHandler().LogName = args::getFilenameWithoutExe(Args[0]);
-  errorHandler().ErrorOS = &Error;
-  errorHandler().ColorDiagnostics = Error.has_colors();
-  errorHandler().ErrorLimitExceededMsg =
+bool lld::wasm::link(ArrayRef<const char *> args, bool canExitEarly,
+                     raw_ostream &error) {
+  errorHandler().logName = args::getFilenameWithoutExe(args[0]);
+  errorHandler().errorOS = &error;
+  errorHandler().colorDiagnostics = error.has_colors();
+  errorHandler().errorLimitExceededMsg =
       "too many errors emitted, stopping now (use "
       "-error-limit=0 to see all errors)";
 
-  Config = make<Configuration>();
-  Symtab = make<SymbolTable>();
+  config = make<Configuration>();
+  symtab = make<SymbolTable>();
 
   initLLVM();
-  LinkerDriver().link(Args);
+  LinkerDriver().link(args);
 
   // Exit immediately if we don't need to return to the caller.
   // This saves time because the overhead of calling destructors
   // for all globally-allocated objects is not negligible.
-  if (CanExitEarly)
+  if (canExitEarly)
     exitLld(errorCount() ? 1 : 0);
 
   freeArena();
@@ -108,7 +110,7 @@ bool lld::wasm::link(ArrayRef<const char *> Args, bool CanExitEarly,
 #undef PREFIX
 
 // Create table mapping all options defined in Options.td
-static const opt::OptTable::Info OptInfo[] = {
+static const opt::OptTable::Info optInfo[] = {
 #define OPTION(X1, X2, ID, KIND, GROUP, ALIAS, X7, X8, X9, X10, X11, X12)      \
   {X1, X2, X10,         X11,         OPT_##ID, opt::Option::KIND##Class,       \
    X9, X8, OPT_##GROUP, OPT_##ALIAS, X7,       X12},
@@ -119,57 +121,57 @@ static const opt::OptTable::Info OptInfo[] = {
 namespace {
 class WasmOptTable : public llvm::opt::OptTable {
 public:
-  WasmOptTable() : OptTable(OptInfo) {}
-  opt::InputArgList parse(ArrayRef<const char *> Argv);
+  WasmOptTable() : OptTable(optInfo) {}
+  opt::InputArgList parse(ArrayRef<const char *> argv);
 };
 } // namespace
 
 // Set color diagnostics according to -color-diagnostics={auto,always,never}
 // or -no-color-diagnostics flags.
-static void handleColorDiagnostics(opt::InputArgList &Args) {
-  auto *Arg = Args.getLastArg(OPT_color_diagnostics, OPT_color_diagnostics_eq,
+static void handleColorDiagnostics(opt::InputArgList &args) {
+  auto *arg = args.getLastArg(OPT_color_diagnostics, OPT_color_diagnostics_eq,
                               OPT_no_color_diagnostics);
-  if (!Arg)
+  if (!arg)
     return;
-  if (Arg->getOption().getID() == OPT_color_diagnostics) {
-    errorHandler().ColorDiagnostics = true;
-  } else if (Arg->getOption().getID() == OPT_no_color_diagnostics) {
-    errorHandler().ColorDiagnostics = false;
+  if (arg->getOption().getID() == OPT_color_diagnostics) {
+    errorHandler().colorDiagnostics = true;
+  } else if (arg->getOption().getID() == OPT_no_color_diagnostics) {
+    errorHandler().colorDiagnostics = false;
   } else {
-    StringRef S = Arg->getValue();
-    if (S == "always")
-      errorHandler().ColorDiagnostics = true;
-    else if (S == "never")
-      errorHandler().ColorDiagnostics = false;
-    else if (S != "auto")
-      error("unknown option: --color-diagnostics=" + S);
+    StringRef s = arg->getValue();
+    if (s == "always")
+      errorHandler().colorDiagnostics = true;
+    else if (s == "never")
+      errorHandler().colorDiagnostics = false;
+    else if (s != "auto")
+      error("unknown option: --color-diagnostics=" + s);
   }
 }
 
 // Find a file by concatenating given paths.
-static Optional<std::string> findFile(StringRef Path1, const Twine &Path2) {
-  SmallString<128> S;
-  path::append(S, Path1, Path2);
-  if (fs::exists(S))
-    return S.str().str();
+static Optional<std::string> findFile(StringRef path1, const Twine &path2) {
+  SmallString<128> s;
+  path::append(s, path1, path2);
+  if (fs::exists(s))
+    return s.str().str();
   return None;
 }
 
-opt::InputArgList WasmOptTable::parse(ArrayRef<const char *> Argv) {
-  SmallVector<const char *, 256> Vec(Argv.data(), Argv.data() + Argv.size());
+opt::InputArgList WasmOptTable::parse(ArrayRef<const char *> argv) {
+  SmallVector<const char *, 256> vec(argv.data(), argv.data() + argv.size());
 
-  unsigned MissingIndex;
-  unsigned MissingCount;
+  unsigned missingIndex;
+  unsigned missingCount;
 
   // Expand response files (arguments in the form of @<filename>)
-  cl::ExpandResponseFiles(Saver, cl::TokenizeGNUCommandLine, Vec);
+  cl::ExpandResponseFiles(saver, cl::TokenizeGNUCommandLine, vec);
 
-  opt::InputArgList Args = this->ParseArgs(Vec, MissingIndex, MissingCount);
+  opt::InputArgList args = this->ParseArgs(vec, missingIndex, missingCount);
 
-  handleColorDiagnostics(Args);
-  for (auto *Arg : Args.filtered(OPT_UNKNOWN))
-    error("unknown argument: " + Arg->getSpelling());
-  return Args;
+  handleColorDiagnostics(args);
+  for (auto *arg : args.filtered(OPT_UNKNOWN))
+    error("unknown argument: " + arg->getAsString(args));
+  return args;
 }
 
 // Currently we allow a ".imports" to live alongside a library. This can
@@ -179,149 +181,188 @@ opt::InputArgList WasmOptTable::parse(ArrayRef<const char *> Argv) {
 // In the long run this information would be better stored as a symbol
 // attribute/flag in the object file itself.
 // See: https://github.com/WebAssembly/tool-conventions/issues/35
-static void readImportFile(StringRef Filename) {
-  if (Optional<MemoryBufferRef> Buf = readFile(Filename))
-    for (StringRef Sym : args::getLines(*Buf))
-      Config->AllowUndefinedSymbols.insert(Sym);
+static void readImportFile(StringRef filename) {
+  if (Optional<MemoryBufferRef> buf = readFile(filename))
+    for (StringRef sym : args::getLines(*buf))
+      config->allowUndefinedSymbols.insert(sym);
 }
 
 // Returns slices of MB by parsing MB as an archive file.
 // Each slice consists of a member file in the archive.
-std::vector<MemoryBufferRef> static getArchiveMembers(MemoryBufferRef MB) {
-  std::unique_ptr<Archive> File =
-      CHECK(Archive::create(MB),
-            MB.getBufferIdentifier() + ": failed to parse archive");
+std::vector<MemoryBufferRef> static getArchiveMembers(MemoryBufferRef mb) {
+  std::unique_ptr<Archive> file =
+      CHECK(Archive::create(mb),
+            mb.getBufferIdentifier() + ": failed to parse archive");
 
-  std::vector<MemoryBufferRef> V;
-  Error Err = Error::success();
-  for (const ErrorOr<Archive::Child> &COrErr : File->children(Err)) {
-    Archive::Child C =
-        CHECK(COrErr, MB.getBufferIdentifier() +
+  std::vector<MemoryBufferRef> v;
+  Error err = Error::success();
+  for (const ErrorOr<Archive::Child> &cOrErr : file->children(err)) {
+    Archive::Child c =
+        CHECK(cOrErr, mb.getBufferIdentifier() +
                           ": could not get the child of the archive");
-    MemoryBufferRef MBRef =
-        CHECK(C.getMemoryBufferRef(),
-              MB.getBufferIdentifier() +
+    MemoryBufferRef mbref =
+        CHECK(c.getMemoryBufferRef(),
+              mb.getBufferIdentifier() +
                   ": could not get the buffer for a child of the archive");
-    V.push_back(MBRef);
+    v.push_back(mbref);
   }
-  if (Err)
-    fatal(MB.getBufferIdentifier() +
-          ": Archive::children failed: " + toString(std::move(Err)));
+  if (err)
+    fatal(mb.getBufferIdentifier() +
+          ": Archive::children failed: " + toString(std::move(err)));
 
   // Take ownership of memory buffers created for members of thin archives.
-  for (std::unique_ptr<MemoryBuffer> &MB : File->takeThinBuffers())
-    make<std::unique_ptr<MemoryBuffer>>(std::move(MB));
+  for (std::unique_ptr<MemoryBuffer> &mb : file->takeThinBuffers())
+    make<std::unique_ptr<MemoryBuffer>>(std::move(mb));
 
-  return V;
+  return v;
 }
 
-void LinkerDriver::addFile(StringRef Path) {
-  Optional<MemoryBufferRef> Buffer = readFile(Path);
-  if (!Buffer.hasValue())
+void LinkerDriver::addFile(StringRef path) {
+  Optional<MemoryBufferRef> buffer = readFile(path);
+  if (!buffer.hasValue())
     return;
-  MemoryBufferRef MBRef = *Buffer;
+  MemoryBufferRef mbref = *buffer;
 
-  switch (identify_magic(MBRef.getBuffer())) {
+  switch (identify_magic(mbref.getBuffer())) {
   case file_magic::archive: {
+    SmallString<128> importFile = path;
+    path::replace_extension(importFile, ".imports");
+    if (fs::exists(importFile))
+      readImportFile(importFile.str());
+
     // Handle -whole-archive.
-    if (InWholeArchive) {
-      for (MemoryBufferRef &M : getArchiveMembers(MBRef))
-        Files.push_back(createObjectFile(M));
+    if (inWholeArchive) {
+      for (MemoryBufferRef &m : getArchiveMembers(mbref))
+        files.push_back(createObjectFile(m, path));
       return;
     }
 
-    SmallString<128> ImportFile = Path;
-    path::replace_extension(ImportFile, ".imports");
-    if (fs::exists(ImportFile))
-      readImportFile(ImportFile.str());
+    std::unique_ptr<Archive> file =
+        CHECK(Archive::create(mbref), path + ": failed to parse archive");
 
-    Files.push_back(make<ArchiveFile>(MBRef));
+    if (!file->isEmpty() && !file->hasSymbolTable()) {
+      error(mbref.getBufferIdentifier() +
+            ": archive has no index; run ranlib to add one");
+    }
+
+    files.push_back(make<ArchiveFile>(mbref));
     return;
   }
   case file_magic::bitcode:
   case file_magic::wasm_object:
-    Files.push_back(createObjectFile(MBRef));
+    files.push_back(createObjectFile(mbref));
     break;
   default:
-    error("unknown file type: " + MBRef.getBufferIdentifier());
+    error("unknown file type: " + mbref.getBufferIdentifier());
   }
 }
 
 // Add a given library by searching it from input search paths.
-void LinkerDriver::addLibrary(StringRef Name) {
-  for (StringRef Dir : Config->SearchPaths) {
-    if (Optional<std::string> S = findFile(Dir, "lib" + Name + ".a")) {
-      addFile(*S);
+void LinkerDriver::addLibrary(StringRef name) {
+  for (StringRef dir : config->searchPaths) {
+    if (Optional<std::string> s = findFile(dir, "lib" + name + ".a")) {
+      addFile(*s);
       return;
     }
   }
 
-  error("unable to find library -l" + Name);
+  error("unable to find library -l" + name);
 }
 
-void LinkerDriver::createFiles(opt::InputArgList &Args) {
-  for (auto *Arg : Args) {
-    switch (Arg->getOption().getUnaliasedOption().getID()) {
+void LinkerDriver::createFiles(opt::InputArgList &args) {
+  for (auto *arg : args) {
+    switch (arg->getOption().getID()) {
     case OPT_l:
-      addLibrary(Arg->getValue());
+      addLibrary(arg->getValue());
       break;
     case OPT_INPUT:
-      addFile(Arg->getValue());
+      addFile(arg->getValue());
       break;
     case OPT_whole_archive:
-      InWholeArchive = true;
+      inWholeArchive = true;
       break;
     case OPT_no_whole_archive:
-      InWholeArchive = false;
+      inWholeArchive = false;
       break;
     }
   }
 }
 
-static StringRef getEntry(opt::InputArgList &Args, StringRef Default) {
-  auto *Arg = Args.getLastArg(OPT_entry, OPT_no_entry);
-  if (!Arg)
-    return Default;
-  if (Arg->getOption().getID() == OPT_no_entry)
+static StringRef getEntry(opt::InputArgList &args) {
+  auto *arg = args.getLastArg(OPT_entry, OPT_no_entry);
+  if (!arg) {
+    if (args.hasArg(OPT_relocatable))
+      return "";
+    if (args.hasArg(OPT_shared))
+      return "__wasm_call_ctors";
+    return "_start";
+  }
+  if (arg->getOption().getID() == OPT_no_entry)
     return "";
-  return Arg->getValue();
+  return arg->getValue();
 }
 
-static const uint8_t UnreachableFn[] = {
-    0x03 /* ULEB length */, 0x00 /* ULEB num locals */,
-    0x00 /* opcode unreachable */, 0x0b /* opcode end */
-};
+// Initializes Config members by the command line options.
+static void readConfigs(opt::InputArgList &args) {
+  config->allowUndefined = args.hasArg(OPT_allow_undefined);
+  config->checkFeatures =
+      args.hasFlag(OPT_check_features, OPT_no_check_features, true);
+  config->compressRelocations = args.hasArg(OPT_compress_relocations);
+  config->demangle = args.hasFlag(OPT_demangle, OPT_no_demangle, true);
+  config->disableVerify = args.hasArg(OPT_disable_verify);
+  config->emitRelocs = args.hasArg(OPT_emit_relocs);
+  config->entry = getEntry(args);
+  config->exportAll = args.hasArg(OPT_export_all);
+  config->exportDynamic = args.hasFlag(OPT_export_dynamic,
+      OPT_no_export_dynamic, false);
+  config->exportTable = args.hasArg(OPT_export_table);
+  errorHandler().fatalWarnings =
+      args.hasFlag(OPT_fatal_warnings, OPT_no_fatal_warnings, false);
+  config->importMemory = args.hasArg(OPT_import_memory);
+  config->sharedMemory = args.hasArg(OPT_shared_memory);
+  config->passiveSegments = args.hasFlag(
+      OPT_passive_segments, OPT_active_segments, config->sharedMemory);
+  config->importTable = args.hasArg(OPT_import_table);
+  config->ltoo = args::getInteger(args, OPT_lto_O, 2);
+  config->ltoPartitions = args::getInteger(args, OPT_lto_partitions, 1);
+  config->optimize = args::getInteger(args, OPT_O, 0);
+  config->outputFile = args.getLastArgValue(OPT_o);
+  config->relocatable = args.hasArg(OPT_relocatable);
+  config->gcSections =
+      args.hasFlag(OPT_gc_sections, OPT_no_gc_sections, !config->relocatable);
+  config->mergeDataSegments =
+      args.hasFlag(OPT_merge_data_segments, OPT_no_merge_data_segments,
+                   !config->relocatable);
+  config->pie = args.hasFlag(OPT_pie, OPT_no_pie, false);
+  config->printGcSections =
+      args.hasFlag(OPT_print_gc_sections, OPT_no_print_gc_sections, false);
+  config->saveTemps = args.hasArg(OPT_save_temps);
+  config->searchPaths = args::getStrings(args, OPT_L);
+  config->shared = args.hasArg(OPT_shared);
+  config->stripAll = args.hasArg(OPT_strip_all);
+  config->stripDebug = args.hasArg(OPT_strip_debug);
+  config->stackFirst = args.hasArg(OPT_stack_first);
+  config->trace = args.hasArg(OPT_trace);
+  config->thinLTOCacheDir = args.getLastArgValue(OPT_thinlto_cache_dir);
+  config->thinLTOCachePolicy = CHECK(
+      parseCachePruningPolicy(args.getLastArgValue(OPT_thinlto_cache_policy)),
+      "--thinlto-cache-policy: invalid cache policy");
+  config->thinLTOJobs = args::getInteger(args, OPT_thinlto_jobs, -1u);
+  errorHandler().verbose = args.hasArg(OPT_verbose);
+  LLVM_DEBUG(errorHandler().verbose = true);
+  threadsEnabled = args.hasFlag(OPT_threads, OPT_no_threads, true);
 
-// For weak undefined functions, there may be "call" instructions that reference
-// the symbol. In this case, we need to synthesise a dummy/stub function that
-// will abort at runtime, so that relocations can still provided an operand to
-// the call instruction that passes Wasm validation.
-static void handleWeakUndefines() {
-  for (Symbol *Sym : Symtab->getSymbols()) {
-    if (!Sym->isUndefined() || !Sym->isWeak())
-      continue;
-    auto *FuncSym = dyn_cast<FunctionSymbol>(Sym);
-    if (!FuncSym)
-      continue;
+  config->initialMemory = args::getInteger(args, OPT_initial_memory, 0);
+  config->globalBase = args::getInteger(args, OPT_global_base, 1024);
+  config->maxMemory = args::getInteger(args, OPT_max_memory, 0);
+  config->zStackSize =
+      args::getZOptionValue(args, OPT_z, "stack-size", WasmPageSize);
 
-    // It is possible for undefined functions not to have a signature (eg. if
-    // added via "--undefined"), but weak undefined ones do have a signature.
-    assert(FuncSym->Signature);
-    const WasmSignature &Sig = *FuncSym->Signature;
-
-    // Add a synthetic dummy for weak undefined functions.  These dummies will
-    // be GC'd if not used as the target of any "call" instructions.
-    std::string SymName = toString(*Sym);
-    StringRef DebugName = Saver.save("undefined function " + SymName);
-    auto *Func = make<SyntheticFunction>(Sig, Sym->getName(), DebugName);
-    Func->setBody(UnreachableFn);
-    // Ensure it compares equal to the null pointer, and so that table relocs
-    // don't pull in the stub body (only call-operand relocs should do that).
-    Func->setTableIndex(0);
-    Symtab->SyntheticFunctions.emplace_back(Func);
-    // Hide our dummy to prevent export.
-    uint32_t Flags = WASM_SYMBOL_VISIBILITY_HIDDEN;
-    replaceSymbol<DefinedFunction>(Sym, Sym->getName(), Flags, nullptr, Func);
+  if (auto *arg = args.getLastArg(OPT_features)) {
+    config->features =
+        llvm::Optional<std::vector<std::string>>(std::vector<std::string>());
+    for (StringRef s : arg->getValues())
+      config->features->push_back(s);
   }
 }
 
@@ -329,286 +370,418 @@ static void handleWeakUndefines() {
 // command line options, but computed based on other Config values.
 // This function initialize such members. See Config.h for the details
 // of these values.
-static void setConfigs(opt::InputArgList &Args) {
-  Config->AllowUndefined = Args.hasArg(OPT_allow_undefined);
-  Config->CompressRelocations = Args.hasArg(OPT_compress_relocations);
-  Config->Demangle = Args.hasFlag(OPT_demangle, OPT_no_demangle, true);
-  Config->DisableVerify = Args.hasArg(OPT_disable_verify);
-  Config->Entry = getEntry(Args, Args.hasArg(OPT_relocatable) ? "" : "_start");
-  Config->ExportAll = Args.hasArg(OPT_export_all);
-  Config->ExportDynamic = Args.hasFlag(OPT_export_dynamic,
-      OPT_no_export_dynamic, false);
-  Config->ExportTable = Args.hasArg(OPT_export_table);
-  errorHandler().FatalWarnings =
-      Args.hasFlag(OPT_fatal_warnings, OPT_no_fatal_warnings, false);
-  Config->ImportMemory = Args.hasArg(OPT_import_memory);
-  Config->SharedMemory = Args.hasArg(OPT_shared_memory);
-  Config->ImportTable = Args.hasArg(OPT_import_table);
-  Config->LTOO = args::getInteger(Args, OPT_lto_O, 2);
-  Config->LTOPartitions = args::getInteger(Args, OPT_lto_partitions, 1);
-  Config->Optimize = args::getInteger(Args, OPT_O, 0);
-  Config->OutputFile = Args.getLastArgValue(OPT_o);
-  Config->Relocatable = Args.hasArg(OPT_relocatable);
-  Config->GcSections =
-      Args.hasFlag(OPT_gc_sections, OPT_no_gc_sections, !Config->Relocatable);
-  Config->MergeDataSegments =
-      Args.hasFlag(OPT_merge_data_segments, OPT_no_merge_data_segments,
-                   !Config->Relocatable);
-  Config->Pie = Args.hasFlag(OPT_pie, OPT_no_pie, false);
-  Config->PrintGcSections =
-      Args.hasFlag(OPT_print_gc_sections, OPT_no_print_gc_sections, false);
-  Config->SaveTemps = Args.hasArg(OPT_save_temps);
-  Config->SearchPaths = args::getStrings(Args, OPT_L);
-  Config->Shared = Args.hasArg(OPT_shared);
-  Config->StripAll = Args.hasArg(OPT_strip_all);
-  Config->StripDebug = Args.hasArg(OPT_strip_debug);
-  Config->StackFirst = Args.hasArg(OPT_stack_first);
-  Config->ThinLTOCacheDir = Args.getLastArgValue(OPT_thinlto_cache_dir);
-  Config->ThinLTOCachePolicy = CHECK(
-      parseCachePruningPolicy(Args.getLastArgValue(OPT_thinlto_cache_policy)),
-      "--thinlto-cache-policy: invalid cache policy");
-  Config->ThinLTOJobs = args::getInteger(Args, OPT_thinlto_jobs, -1u);
-  errorHandler().Verbose = Args.hasArg(OPT_verbose);
-  ThreadsEnabled = Args.hasFlag(OPT_threads, OPT_no_threads, true);
+static void setConfigs() {
+  config->isPic = config->pie || config->shared;
 
-  Config->InitialMemory = args::getInteger(Args, OPT_initial_memory, 0);
-  Config->GlobalBase = args::getInteger(Args, OPT_global_base, 1024);
-  Config->MaxMemory = args::getInteger(Args, OPT_max_memory, 0);
-  Config->ZStackSize =
-      args::getZOptionValue(Args, OPT_z, "stack-size", WasmPageSize);
+  if (config->isPic) {
+    if (config->exportTable)
+      error("-shared/-pie is incompatible with --export-table");
+    config->importTable = true;
+  }
+
+  if (config->shared) {
+    config->importMemory = true;
+    config->exportDynamic = true;
+    config->allowUndefined = true;
+  }
 }
 
 // Some command line options or some combinations of them are not allowed.
 // This function checks for such errors.
-static void checkOptions(opt::InputArgList &Args) {
-  if (!Config->StripDebug && !Config->StripAll && Config->CompressRelocations)
+static void checkOptions(opt::InputArgList &args) {
+  if (!config->stripDebug && !config->stripAll && config->compressRelocations)
     error("--compress-relocations is incompatible with output debug"
           " information. Please pass --strip-debug or --strip-all");
 
-  if (Config->LTOO > 3)
-    error("invalid optimization level for LTO: " + Twine(Config->LTOO));
-  if (Config->LTOPartitions == 0)
+  if (config->ltoo > 3)
+    error("invalid optimization level for LTO: " + Twine(config->ltoo));
+  if (config->ltoPartitions == 0)
     error("--lto-partitions: number of threads must be > 0");
-  if (Config->ThinLTOJobs == 0)
+  if (config->thinLTOJobs == 0)
     error("--thinlto-jobs: number of threads must be > 0");
 
-  if (Config->Pie && Config->Shared)
+  if (config->pie && config->shared)
     error("-shared and -pie may not be used together");
 
-  if (Config->OutputFile.empty())
+  if (config->outputFile.empty())
     error("no output file specified");
 
-  if (Config->ImportTable && Config->ExportTable)
+  if (config->importTable && config->exportTable)
     error("--import-table and --export-table may not be used together");
 
-  if (Config->Relocatable) {
-    if (!Config->Entry.empty())
+  if (config->relocatable) {
+    if (!config->entry.empty())
       error("entry point specified for relocatable output file");
-    if (Config->GcSections)
+    if (config->gcSections)
       error("-r and --gc-sections may not be used together");
-    if (Config->CompressRelocations)
+    if (config->compressRelocations)
       error("-r -and --compress-relocations may not be used together");
-    if (Args.hasArg(OPT_undefined))
+    if (args.hasArg(OPT_undefined))
       error("-r -and --undefined may not be used together");
-    if (Config->Pie)
+    if (config->pie)
       error("-r and -pie may not be used together");
   }
 }
 
 // Force Sym to be entered in the output. Used for -u or equivalent.
-static Symbol *handleUndefined(StringRef Name) {
-  Symbol *Sym = Symtab->find(Name);
-  if (!Sym)
+static Symbol *handleUndefined(StringRef name) {
+  Symbol *sym = symtab->find(name);
+  if (!sym)
     return nullptr;
 
   // Since symbol S may not be used inside the program, LTO may
   // eliminate it. Mark the symbol as "used" to prevent it.
-  Sym->IsUsedInRegularObj = true;
+  sym->isUsedInRegularObj = true;
 
-  if (auto *LazySym = dyn_cast<LazySymbol>(Sym))
-    LazySym->fetch();
+  if (auto *lazySym = dyn_cast<LazySymbol>(sym))
+    lazySym->fetch();
 
-  return Sym;
+  return sym;
 }
 
 static UndefinedGlobal *
-createUndefinedGlobal(StringRef Name, llvm::wasm::WasmGlobalType *Type) {
-  auto *Sym =
-      cast<UndefinedGlobal>(Symtab->addUndefinedGlobal(Name, Name,
-                                                       DefaultModule, 0,
-                                                       nullptr, Type));
-  Config->AllowUndefinedSymbols.insert(Sym->getName());
-  Sym->IsUsedInRegularObj = true;
-  return Sym;
+createUndefinedGlobal(StringRef name, llvm::wasm::WasmGlobalType *type) {
+  auto *sym =
+      cast<UndefinedGlobal>(symtab->addUndefinedGlobal(name, name,
+                                                       defaultModule, 0,
+                                                       nullptr, type));
+  config->allowUndefinedSymbols.insert(sym->getName());
+  sym->isUsedInRegularObj = true;
+  return sym;
 }
 
 // Create ABI-defined synthetic symbols
 static void createSyntheticSymbols() {
-  static WasmSignature NullSignature = {{}, {}};
-  static llvm::wasm::WasmGlobalType GlobalTypeI32 = {WASM_TYPE_I32, false};
-  static llvm::wasm::WasmGlobalType MutableGlobalTypeI32 = {WASM_TYPE_I32,
+  static WasmSignature nullSignature = {{}, {}};
+  static WasmSignature i32ArgSignature = {{}, {ValType::I32}};
+  static llvm::wasm::WasmGlobalType globalTypeI32 = {WASM_TYPE_I32, false};
+  static llvm::wasm::WasmGlobalType mutableGlobalTypeI32 = {WASM_TYPE_I32,
                                                             true};
 
-  if (!Config->Relocatable)
-    WasmSym::CallCtors = Symtab->addSyntheticFunction(
+  if (!config->relocatable) {
+    WasmSym::callCtors = symtab->addSyntheticFunction(
         "__wasm_call_ctors", WASM_SYMBOL_VISIBILITY_HIDDEN,
-        make<SyntheticFunction>(NullSignature, "__wasm_call_ctors"));
+        make<SyntheticFunction>(nullSignature, "__wasm_call_ctors"));
 
-  // The __stack_pointer is imported in the shared library case, and exported
-  // in the non-shared (executable) case.
-  if (Config->Shared) {
-    WasmSym::StackPointer =
-        createUndefinedGlobal("__stack_pointer", &MutableGlobalTypeI32);
-  } else {
-    llvm::wasm::WasmGlobal Global;
-    Global.Type = {WASM_TYPE_I32, true};
-    Global.InitExpr.Value.Int32 = 0;
-    Global.InitExpr.Opcode = WASM_OPCODE_I32_CONST;
-    Global.SymbolName = "__stack_pointer";
-    auto *StackPointer = make<InputGlobal>(Global, nullptr);
-    StackPointer->Live = true;
-    // For non-PIC code
-    // TODO(sbc): Remove WASM_SYMBOL_VISIBILITY_HIDDEN when the mutable global
-    // spec proposal is implemented in all major browsers.
-    // See: https://github.com/WebAssembly/mutable-global
-    WasmSym::StackPointer = Symtab->addSyntheticGlobal(
-        "__stack_pointer", WASM_SYMBOL_VISIBILITY_HIDDEN, StackPointer);
-    WasmSym::HeapBase = Symtab->addSyntheticDataSymbol("__heap_base", 0);
-    WasmSym::DataEnd = Symtab->addSyntheticDataSymbol("__data_end", 0);
+    if (config->passiveSegments) {
+      // Passive segments are used to avoid memory being reinitialized on each
+      // thread's instantiation. These passive segments are initialized and
+      // dropped in __wasm_init_memory, which is the first function called from
+      // __wasm_call_ctors.
+      WasmSym::initMemory = symtab->addSyntheticFunction(
+          "__wasm_init_memory", WASM_SYMBOL_VISIBILITY_HIDDEN,
+          make<SyntheticFunction>(nullSignature, "__wasm_init_memory"));
+    }
 
-    // These two synthetic symbols exist purely for the embedder so we always
-    // want to export them.
-    WasmSym::HeapBase->ForceExport = true;
-    WasmSym::DataEnd->ForceExport = true;
+    if (config->isPic) {
+      // For PIC code we create a synthetic function __wasm_apply_relocs which
+      // is called from __wasm_call_ctors before the user-level constructors.
+      WasmSym::applyRelocs = symtab->addSyntheticFunction(
+          "__wasm_apply_relocs", WASM_SYMBOL_VISIBILITY_HIDDEN,
+          make<SyntheticFunction>(nullSignature, "__wasm_apply_relocs"));
+    }
   }
 
-  if (Config->Pic) {
+  if (!config->shared)
+    WasmSym::dataEnd = symtab->addOptionalDataSymbol("__data_end");
+
+  if (config->isPic) {
+    WasmSym::stackPointer =
+        createUndefinedGlobal("__stack_pointer", &mutableGlobalTypeI32);
     // For PIC code, we import two global variables (__memory_base and
     // __table_base) from the environment and use these as the offset at
     // which to load our static data and function table.
     // See:
     // https://github.com/WebAssembly/tool-conventions/blob/master/DynamicLinking.md
-    WasmSym::MemoryBase =
-        createUndefinedGlobal("__memory_base", &GlobalTypeI32);
-    WasmSym::TableBase = createUndefinedGlobal("__table_base", &GlobalTypeI32);
-    WasmSym::MemoryBase->markLive();
-    WasmSym::TableBase->markLive();
+    WasmSym::memoryBase =
+        createUndefinedGlobal("__memory_base", &globalTypeI32);
+    WasmSym::tableBase = createUndefinedGlobal("__table_base", &globalTypeI32);
+    WasmSym::memoryBase->markLive();
+    WasmSym::tableBase->markLive();
+  } else {
+    llvm::wasm::WasmGlobal global;
+    global.Type = {WASM_TYPE_I32, true};
+    global.InitExpr.Value.Int32 = 0;
+    global.InitExpr.Opcode = WASM_OPCODE_I32_CONST;
+    global.SymbolName = "__stack_pointer";
+    auto *stackPointer = make<InputGlobal>(global, nullptr);
+    stackPointer->live = true;
+    // For non-PIC code
+    // TODO(sbc): Remove WASM_SYMBOL_VISIBILITY_HIDDEN when the mutable global
+    // spec proposal is implemented in all major browsers.
+    // See: https://github.com/WebAssembly/mutable-global
+    WasmSym::stackPointer = symtab->addSyntheticGlobal(
+        "__stack_pointer", WASM_SYMBOL_VISIBILITY_HIDDEN, stackPointer);
+    WasmSym::globalBase = symtab->addOptionalDataSymbol("__global_base");
+    WasmSym::heapBase = symtab->addOptionalDataSymbol("__heap_base");
   }
 
-  WasmSym::DsoHandle = Symtab->addSyntheticDataSymbol(
+  if (config->sharedMemory && !config->shared) {
+    llvm::wasm::WasmGlobal tlsBaseGlobal;
+    tlsBaseGlobal.Type = {WASM_TYPE_I32, true};
+    tlsBaseGlobal.InitExpr.Value.Int32 = 0;
+    tlsBaseGlobal.InitExpr.Opcode = WASM_OPCODE_I32_CONST;
+    tlsBaseGlobal.SymbolName = "__tls_base";
+    WasmSym::tlsBase =
+        symtab->addSyntheticGlobal("__tls_base", WASM_SYMBOL_VISIBILITY_HIDDEN,
+                                   make<InputGlobal>(tlsBaseGlobal, nullptr));
+
+    llvm::wasm::WasmGlobal tlsSizeGlobal;
+    tlsSizeGlobal.Type = {WASM_TYPE_I32, false};
+    tlsSizeGlobal.InitExpr.Value.Int32 = 0;
+    tlsSizeGlobal.InitExpr.Opcode = WASM_OPCODE_I32_CONST;
+    tlsSizeGlobal.SymbolName = "__tls_size";
+    WasmSym::tlsSize =
+        symtab->addSyntheticGlobal("__tls_size", WASM_SYMBOL_VISIBILITY_HIDDEN,
+                                   make<InputGlobal>(tlsSizeGlobal, nullptr));
+
+    WasmSym::initTLS = symtab->addSyntheticFunction(
+        "__wasm_init_tls", WASM_SYMBOL_VISIBILITY_HIDDEN,
+        make<SyntheticFunction>(i32ArgSignature, "__wasm_init_tls"));
+  }
+
+  WasmSym::dsoHandle = symtab->addSyntheticDataSymbol(
       "__dso_handle", WASM_SYMBOL_VISIBILITY_HIDDEN);
 }
 
-void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
-  WasmOptTable Parser;
-  opt::InputArgList Args = Parser.parse(ArgsArr.slice(1));
+// Reconstructs command line arguments so that so that you can re-run
+// the same command with the same inputs. This is for --reproduce.
+static std::string createResponseFile(const opt::InputArgList &args) {
+  SmallString<0> data;
+  raw_svector_ostream os(data);
+
+  // Copy the command line to the output while rewriting paths.
+  for (auto *arg : args) {
+    switch (arg->getOption().getID()) {
+    case OPT_reproduce:
+      break;
+    case OPT_INPUT:
+      os << quote(relativeToRoot(arg->getValue())) << "\n";
+      break;
+    case OPT_o:
+      // If -o path contains directories, "lld @response.txt" will likely
+      // fail because the archive we are creating doesn't contain empty
+      // directories for the output path (-o doesn't create directories).
+      // Strip directories to prevent the issue.
+      os << "-o " << quote(sys::path::filename(arg->getValue())) << "\n";
+      break;
+    default:
+      os << toString(*arg) << "\n";
+    }
+  }
+  return data.str();
+}
+
+// The --wrap option is a feature to rename symbols so that you can write
+// wrappers for existing functions. If you pass `-wrap=foo`, all
+// occurrences of symbol `foo` are resolved to `wrap_foo` (so, you are
+// expected to write `wrap_foo` function as a wrapper). The original
+// symbol becomes accessible as `real_foo`, so you can call that from your
+// wrapper.
+//
+// This data structure is instantiated for each -wrap option.
+struct WrappedSymbol {
+  Symbol *sym;
+  Symbol *real;
+  Symbol *wrap;
+};
+
+static Symbol *addUndefined(StringRef name) {
+  return symtab->addUndefinedFunction(name, "", "", 0, nullptr, nullptr, false);
+}
+
+// Handles -wrap option.
+//
+// This function instantiates wrapper symbols. At this point, they seem
+// like they are not being used at all, so we explicitly set some flags so
+// that LTO won't eliminate them.
+static std::vector<WrappedSymbol> addWrappedSymbols(opt::InputArgList &args) {
+  std::vector<WrappedSymbol> v;
+  DenseSet<StringRef> seen;
+
+  for (auto *arg : args.filtered(OPT_wrap)) {
+    StringRef name = arg->getValue();
+    if (!seen.insert(name).second)
+      continue;
+
+    Symbol *sym = symtab->find(name);
+    if (!sym)
+      continue;
+
+    Symbol *real = addUndefined(saver.save("__real_" + name));
+    Symbol *wrap = addUndefined(saver.save("__wrap_" + name));
+    v.push_back({sym, real, wrap});
+
+    // We want to tell LTO not to inline symbols to be overwritten
+    // because LTO doesn't know the final symbol contents after renaming.
+    real->canInline = false;
+    sym->canInline = false;
+
+    // Tell LTO not to eliminate these symbols.
+    sym->isUsedInRegularObj = true;
+    wrap->isUsedInRegularObj = true;
+    real->isUsedInRegularObj = false;
+  }
+  return v;
+}
+
+// Do renaming for -wrap by updating pointers to symbols.
+//
+// When this function is executed, only InputFiles and symbol table
+// contain pointers to symbol objects. We visit them to replace pointers,
+// so that wrapped symbols are swapped as instructed by the command line.
+static void wrapSymbols(ArrayRef<WrappedSymbol> wrapped) {
+  DenseMap<Symbol *, Symbol *> map;
+  for (const WrappedSymbol &w : wrapped) {
+    map[w.sym] = w.wrap;
+    map[w.real] = w.sym;
+  }
+
+  // Update pointers in input files.
+  parallelForEach(symtab->objectFiles, [&](InputFile *file) {
+    MutableArrayRef<Symbol *> syms = file->getMutableSymbols();
+    for (size_t i = 0, e = syms.size(); i != e; ++i)
+      if (Symbol *s = map.lookup(syms[i]))
+        syms[i] = s;
+  });
+
+  // Update pointers in the symbol table.
+  for (const WrappedSymbol &w : wrapped)
+    symtab->wrap(w.sym, w.real, w.wrap);
+}
+
+void LinkerDriver::link(ArrayRef<const char *> argsArr) {
+  WasmOptTable parser;
+  opt::InputArgList args = parser.parse(argsArr.slice(1));
 
   // Handle --help
-  if (Args.hasArg(OPT_help)) {
-    Parser.PrintHelp(outs(),
-                     (std::string(ArgsArr[0]) + " [options] file...").c_str(),
+  if (args.hasArg(OPT_help)) {
+    parser.PrintHelp(outs(),
+                     (std::string(argsArr[0]) + " [options] file...").c_str(),
                      "LLVM Linker", false);
     return;
   }
 
   // Handle --version
-  if (Args.hasArg(OPT_version) || Args.hasArg(OPT_v)) {
+  if (args.hasArg(OPT_version) || args.hasArg(OPT_v)) {
     outs() << getLLDVersion() << "\n";
     return;
   }
 
+  // Handle --reproduce
+  if (auto *arg = args.getLastArg(OPT_reproduce)) {
+    StringRef path = arg->getValue();
+    Expected<std::unique_ptr<TarWriter>> errOrWriter =
+        TarWriter::create(path, path::stem(path));
+    if (errOrWriter) {
+      tar = std::move(*errOrWriter);
+      tar->append("response.txt", createResponseFile(args));
+      tar->append("version.txt", getLLDVersion() + "\n");
+    } else {
+      error("--reproduce: " + toString(errOrWriter.takeError()));
+    }
+  }
+
   // Parse and evaluate -mllvm options.
-  std::vector<const char *> V;
-  V.push_back("wasm-ld (LLVM option parsing)");
-  for (auto *Arg : Args.filtered(OPT_mllvm))
-    V.push_back(Arg->getValue());
-  cl::ParseCommandLineOptions(V.size(), V.data());
+  std::vector<const char *> v;
+  v.push_back("wasm-ld (LLVM option parsing)");
+  for (auto *arg : args.filtered(OPT_mllvm))
+    v.push_back(arg->getValue());
+  cl::ParseCommandLineOptions(v.size(), v.data());
 
-  errorHandler().ErrorLimit = args::getInteger(Args, OPT_error_limit, 20);
+  errorHandler().errorLimit = args::getInteger(args, OPT_error_limit, 20);
 
-  setConfigs(Args);
-  checkOptions(Args);
+  readConfigs(args);
+  setConfigs();
+  checkOptions(args);
 
-  if (auto *Arg = Args.getLastArg(OPT_allow_undefined_file))
-    readImportFile(Arg->getValue());
+  if (auto *arg = args.getLastArg(OPT_allow_undefined_file))
+    readImportFile(arg->getValue());
 
-  if (!Args.hasArg(OPT_INPUT)) {
+  if (!args.hasArg(OPT_INPUT)) {
     error("no input files");
     return;
   }
 
-  Config->Pic = Config->Pie || Config->Shared;
+  // Handle --trace-symbol.
+  for (auto *arg : args.filtered(OPT_trace_symbol))
+    symtab->trace(arg->getValue());
 
-  if (Config->Pic) {
-    if (Config->ExportTable)
-      error("-shared/-pie is incompatible with --export-table");
-    Config->ImportTable = true;
-  }
+  for (auto *arg : args.filtered(OPT_export))
+    config->exportedSymbols.insert(arg->getValue());
 
-  if (Config->Shared) {
-    Config->ExportDynamic = true;
-    Config->AllowUndefined = true;
-  }
-
-  if (!Config->Relocatable)
+  if (!config->relocatable)
     createSyntheticSymbols();
 
-  createFiles(Args);
+  createFiles(args);
   if (errorCount())
     return;
 
   // Add all files to the symbol table. This will add almost all
   // symbols that we need to the symbol table.
-  for (InputFile *F : Files)
-    Symtab->addFile(F);
+  for (InputFile *f : files)
+    symtab->addFile(f);
   if (errorCount())
     return;
 
   // Handle the `--undefined <sym>` options.
-  for (auto *Arg : Args.filtered(OPT_undefined))
-    handleUndefined(Arg->getValue());
+  for (auto *arg : args.filtered(OPT_undefined))
+    handleUndefined(arg->getValue());
 
   // Handle the `--export <sym>` options
   // This works like --undefined but also exports the symbol if its found
-  for (auto *Arg : Args.filtered(OPT_export)) {
-    Symbol *Sym = handleUndefined(Arg->getValue());
-    if (Sym && Sym->isDefined())
-      Sym->ForceExport = true;
-    else if (!Config->AllowUndefined)
-      error(Twine("symbol exported via --export not found: ") +
-            Arg->getValue());
-  }
+  for (auto *arg : args.filtered(OPT_export))
+    handleUndefined(arg->getValue());
 
-  Symbol *EntrySym = nullptr;
-  if (!Config->Relocatable) {
-    // Add synthetic dummies for weak undefined functions.
-    handleWeakUndefines();
-
-    if (!Config->Shared && !Config->Entry.empty()) {
-      EntrySym = handleUndefined(Config->Entry);
-      if (EntrySym && EntrySym->isDefined())
-        EntrySym->ForceExport = true;
-      else
-        error("entry symbol not defined (pass --no-entry to supress): " +
-              Config->Entry);
-    }
-
-    // Make sure we have resolved all symbols.
-    if (!Config->AllowUndefined)
-      Symtab->reportRemainingUndefines();
+  Symbol *entrySym = nullptr;
+  if (!config->relocatable && !config->entry.empty()) {
+    entrySym = handleUndefined(config->entry);
+    if (entrySym && entrySym->isDefined())
+      entrySym->forceExport = true;
+    else
+      error("entry symbol not defined (pass --no-entry to supress): " +
+            config->entry);
   }
 
   if (errorCount())
     return;
 
+  // Create wrapped symbols for -wrap option.
+  std::vector<WrappedSymbol> wrapped = addWrappedSymbols(args);
+
   // Do link-time optimization if given files are LLVM bitcode files.
   // This compiles bitcode files into real object files.
-  Symtab->addCombinedLTOObject();
+  symtab->addCombinedLTOObject();
   if (errorCount())
     return;
 
-  if (EntrySym)
-    EntrySym->setHidden(false);
+  // Resolve any variant symbols that were created due to signature
+  // mismatchs.
+  symtab->handleSymbolVariants();
+  if (errorCount())
+    return;
+
+  // Apply symbol renames for -wrap.
+  if (!wrapped.empty())
+    wrapSymbols(wrapped);
+
+  for (auto *arg : args.filtered(OPT_export)) {
+    Symbol *sym = symtab->find(arg->getValue());
+    if (sym && sym->isDefined())
+      sym->forceExport = true;
+    else if (!config->allowUndefined)
+      error(Twine("symbol exported via --export not found: ") +
+            arg->getValue());
+  }
+
+  if (!config->relocatable) {
+    // Add synthetic dummies for weak undefined functions.  Must happen
+    // after LTO otherwise functions may not yet have signatures.
+    symtab->handleWeakUndefines();
+  }
+
+  if (entrySym)
+    entrySym->setHidden(false);
 
   if (errorCount())
     return;
diff --git a/deps/lld/wasm/InputChunks.cpp b/deps/lld/wasm/InputChunks.cpp
index f5884a1beea4b8fc490fbea26fc7d81e41c0d4a2..d37b58a5deeb6b6b954e21eeec3606438a15bac1 100644
--- a/deps/lld/wasm/InputChunks.cpp
+++ b/deps/lld/wasm/InputChunks.cpp
@@ -1,9 +1,8 @@
 //===- InputChunks.cpp ----------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -23,8 +22,8 @@ using namespace llvm::support::endian;
 using namespace lld;
 using namespace lld::wasm;
 
-static StringRef reloctTypeToString(uint8_t RelocType) {
-  switch (RelocType) {
+StringRef lld::relocTypeToString(uint8_t relocType) {
+  switch (relocType) {
 #define WASM_RELOC(NAME, REL)                                                  \
   case REL:                                                                    \
     return #NAME;
@@ -34,62 +33,67 @@ static StringRef reloctTypeToString(uint8_t RelocType) {
   llvm_unreachable("unknown reloc type");
 }
 
-std::string lld::toString(const InputChunk *C) {
-  return (toString(C->File) + ":(" + C->getName() + ")").str();
+std::string lld::toString(const InputChunk *c) {
+  return (toString(c->file) + ":(" + c->getName() + ")").str();
 }
 
 StringRef InputChunk::getComdatName() const {
-  uint32_t Index = getComdat();
-  if (Index == UINT32_MAX)
+  uint32_t index = getComdat();
+  if (index == UINT32_MAX)
     return StringRef();
-  return File->getWasmObj()->linkingData().Comdats[Index];
+  return file->getWasmObj()->linkingData().Comdats[index];
 }
 
 void InputChunk::verifyRelocTargets() const {
-  for (const WasmRelocation &Rel : Relocations) {
-    uint32_t ExistingValue;
-    unsigned BytesRead = 0;
-    uint32_t Offset = Rel.Offset - getInputSectionOffset();
-    const uint8_t *Loc = data().data() + Offset;
-    switch (Rel.Type) {
-    case R_WEBASSEMBLY_TYPE_INDEX_LEB:
-    case R_WEBASSEMBLY_FUNCTION_INDEX_LEB:
-    case R_WEBASSEMBLY_GLOBAL_INDEX_LEB:
-    case R_WEBASSEMBLY_EVENT_INDEX_LEB:
-    case R_WEBASSEMBLY_MEMORY_ADDR_LEB:
-      ExistingValue = decodeULEB128(Loc, &BytesRead);
+  for (const WasmRelocation &rel : relocations) {
+    uint32_t existingValue;
+    unsigned bytesRead = 0;
+    uint32_t offset = rel.Offset - getInputSectionOffset();
+    const uint8_t *loc = data().data() + offset;
+    switch (rel.Type) {
+    case R_WASM_TYPE_INDEX_LEB:
+    case R_WASM_FUNCTION_INDEX_LEB:
+    case R_WASM_GLOBAL_INDEX_LEB:
+    case R_WASM_EVENT_INDEX_LEB:
+    case R_WASM_MEMORY_ADDR_LEB:
+      existingValue = decodeULEB128(loc, &bytesRead);
       break;
-    case R_WEBASSEMBLY_TABLE_INDEX_SLEB:
-    case R_WEBASSEMBLY_MEMORY_ADDR_SLEB:
-      ExistingValue = static_cast<uint32_t>(decodeSLEB128(Loc, &BytesRead));
+    case R_WASM_TABLE_INDEX_SLEB:
+    case R_WASM_TABLE_INDEX_REL_SLEB:
+    case R_WASM_MEMORY_ADDR_SLEB:
+    case R_WASM_MEMORY_ADDR_REL_SLEB:
+      existingValue = static_cast<uint32_t>(decodeSLEB128(loc, &bytesRead));
       break;
-    case R_WEBASSEMBLY_TABLE_INDEX_I32:
-    case R_WEBASSEMBLY_MEMORY_ADDR_I32:
-    case R_WEBASSEMBLY_FUNCTION_OFFSET_I32:
-    case R_WEBASSEMBLY_SECTION_OFFSET_I32:
-      ExistingValue = static_cast<uint32_t>(read32le(Loc));
+    case R_WASM_TABLE_INDEX_I32:
+    case R_WASM_MEMORY_ADDR_I32:
+    case R_WASM_FUNCTION_OFFSET_I32:
+    case R_WASM_SECTION_OFFSET_I32:
+      existingValue = static_cast<uint32_t>(read32le(loc));
       break;
     default:
       llvm_unreachable("unknown relocation type");
     }
 
-    if (BytesRead && BytesRead != 5)
+    if (bytesRead && bytesRead != 5)
       warn("expected LEB at relocation site be 5-byte padded");
-    uint32_t ExpectedValue = File->calcExpectedValue(Rel);
-    if (ExpectedValue != ExistingValue)
-      warn("unexpected existing value for " + reloctTypeToString(Rel.Type) +
-           ": existing=" + Twine(ExistingValue) +
-           " expected=" + Twine(ExpectedValue));
+
+    if (rel.Type != R_WASM_GLOBAL_INDEX_LEB) {
+      uint32_t expectedValue = file->calcExpectedValue(rel);
+      if (expectedValue != existingValue)
+        warn("unexpected existing value for " + relocTypeToString(rel.Type) +
+             ": existing=" + Twine(existingValue) +
+             " expected=" + Twine(expectedValue));
+    }
   }
 }
 
 // Copy this input chunk to an mmap'ed output file and apply relocations.
-void InputChunk::writeTo(uint8_t *Buf) const {
+void InputChunk::writeTo(uint8_t *buf) const {
   // Copy contents
-  memcpy(Buf + OutputOffset, data().data(), data().size());
+  memcpy(buf + outputOffset, data().data(), data().size());
 
   // Apply relocations
-  if (Relocations.empty())
+  if (relocations.empty())
     return;
 
 #ifndef NDEBUG
@@ -97,34 +101,38 @@ void InputChunk::writeTo(uint8_t *Buf) const {
 #endif
 
   LLVM_DEBUG(dbgs() << "applying relocations: " << getName()
-                    << " count=" << Relocations.size() << "\n");
-  int32_t Off = OutputOffset - getInputSectionOffset();
+                    << " count=" << relocations.size() << "\n");
+  int32_t off = outputOffset - getInputSectionOffset();
 
-  for (const WasmRelocation &Rel : Relocations) {
-    uint8_t *Loc = Buf + Rel.Offset + Off;
-    uint32_t Value = File->calcNewValue(Rel);
-    LLVM_DEBUG(dbgs() << "apply reloc: type=" << reloctTypeToString(Rel.Type)
-                      << " addend=" << Rel.Addend << " index=" << Rel.Index
-                      << " value=" << Value << " offset=" << Rel.Offset
+  for (const WasmRelocation &rel : relocations) {
+    uint8_t *loc = buf + rel.Offset + off;
+    uint32_t value = file->calcNewValue(rel);
+    LLVM_DEBUG(dbgs() << "apply reloc: type=" << relocTypeToString(rel.Type));
+    if (rel.Type != R_WASM_TYPE_INDEX_LEB)
+      LLVM_DEBUG(dbgs() << " sym=" << file->getSymbols()[rel.Index]->getName());
+    LLVM_DEBUG(dbgs() << " addend=" << rel.Addend << " index=" << rel.Index
+                      << " value=" << value << " offset=" << rel.Offset
                       << "\n");
 
-    switch (Rel.Type) {
-    case R_WEBASSEMBLY_TYPE_INDEX_LEB:
-    case R_WEBASSEMBLY_FUNCTION_INDEX_LEB:
-    case R_WEBASSEMBLY_GLOBAL_INDEX_LEB:
-    case R_WEBASSEMBLY_EVENT_INDEX_LEB:
-    case R_WEBASSEMBLY_MEMORY_ADDR_LEB:
-      encodeULEB128(Value, Loc, 5);
+    switch (rel.Type) {
+    case R_WASM_TYPE_INDEX_LEB:
+    case R_WASM_FUNCTION_INDEX_LEB:
+    case R_WASM_GLOBAL_INDEX_LEB:
+    case R_WASM_EVENT_INDEX_LEB:
+    case R_WASM_MEMORY_ADDR_LEB:
+      encodeULEB128(value, loc, 5);
       break;
-    case R_WEBASSEMBLY_TABLE_INDEX_SLEB:
-    case R_WEBASSEMBLY_MEMORY_ADDR_SLEB:
-      encodeSLEB128(static_cast<int32_t>(Value), Loc, 5);
+    case R_WASM_TABLE_INDEX_SLEB:
+    case R_WASM_TABLE_INDEX_REL_SLEB:
+    case R_WASM_MEMORY_ADDR_SLEB:
+    case R_WASM_MEMORY_ADDR_REL_SLEB:
+      encodeSLEB128(static_cast<int32_t>(value), loc, 5);
       break;
-    case R_WEBASSEMBLY_TABLE_INDEX_I32:
-    case R_WEBASSEMBLY_MEMORY_ADDR_I32:
-    case R_WEBASSEMBLY_FUNCTION_OFFSET_I32:
-    case R_WEBASSEMBLY_SECTION_OFFSET_I32:
-      write32le(Loc, Value);
+    case R_WASM_TABLE_INDEX_I32:
+    case R_WASM_MEMORY_ADDR_I32:
+    case R_WASM_FUNCTION_OFFSET_I32:
+    case R_WASM_SECTION_OFFSET_I32:
+      write32le(loc, value);
       break;
     default:
       llvm_unreachable("unknown relocation type");
@@ -135,82 +143,75 @@ void InputChunk::writeTo(uint8_t *Buf) const {
 // Copy relocation entries to a given output stream.
 // This function is used only when a user passes "-r". For a regular link,
 // we consume relocations instead of copying them to an output file.
-void InputChunk::writeRelocations(raw_ostream &OS) const {
-  if (Relocations.empty())
+void InputChunk::writeRelocations(raw_ostream &os) const {
+  if (relocations.empty())
     return;
 
-  int32_t Off = OutputOffset - getInputSectionOffset();
-  LLVM_DEBUG(dbgs() << "writeRelocations: " << File->getName()
-                    << " offset=" << Twine(Off) << "\n");
+  int32_t off = outputOffset - getInputSectionOffset();
+  LLVM_DEBUG(dbgs() << "writeRelocations: " << file->getName()
+                    << " offset=" << Twine(off) << "\n");
 
-  for (const WasmRelocation &Rel : Relocations) {
-    writeUleb128(OS, Rel.Type, "reloc type");
-    writeUleb128(OS, Rel.Offset + Off, "reloc offset");
-    writeUleb128(OS, File->calcNewIndex(Rel), "reloc index");
+  for (const WasmRelocation &rel : relocations) {
+    writeUleb128(os, rel.Type, "reloc type");
+    writeUleb128(os, rel.Offset + off, "reloc offset");
+    writeUleb128(os, file->calcNewIndex(rel), "reloc index");
 
-    switch (Rel.Type) {
-    case R_WEBASSEMBLY_MEMORY_ADDR_LEB:
-    case R_WEBASSEMBLY_MEMORY_ADDR_SLEB:
-    case R_WEBASSEMBLY_MEMORY_ADDR_I32:
-    case R_WEBASSEMBLY_FUNCTION_OFFSET_I32:
-    case R_WEBASSEMBLY_SECTION_OFFSET_I32:
-      writeSleb128(OS, File->calcNewAddend(Rel), "reloc addend");
-      break;
-    }
+    if (relocTypeHasAddend(rel.Type))
+      writeSleb128(os, file->calcNewAddend(rel), "reloc addend");
   }
 }
 
-void InputFunction::setFunctionIndex(uint32_t Index) {
+void InputFunction::setFunctionIndex(uint32_t index) {
   LLVM_DEBUG(dbgs() << "InputFunction::setFunctionIndex: " << getName()
-                    << " -> " << Index << "\n");
+                    << " -> " << index << "\n");
   assert(!hasFunctionIndex());
-  FunctionIndex = Index;
+  functionIndex = index;
 }
 
-void InputFunction::setTableIndex(uint32_t Index) {
+void InputFunction::setTableIndex(uint32_t index) {
   LLVM_DEBUG(dbgs() << "InputFunction::setTableIndex: " << getName() << " -> "
-                    << Index << "\n");
+                    << index << "\n");
   assert(!hasTableIndex());
-  TableIndex = Index;
+  tableIndex = index;
 }
 
 // Write a relocation value without padding and return the number of bytes
 // witten.
-static unsigned writeCompressedReloc(uint8_t *Buf, const WasmRelocation &Rel,
-                                     uint32_t Value) {
-  switch (Rel.Type) {
-  case R_WEBASSEMBLY_TYPE_INDEX_LEB:
-  case R_WEBASSEMBLY_FUNCTION_INDEX_LEB:
-  case R_WEBASSEMBLY_GLOBAL_INDEX_LEB:
-  case R_WEBASSEMBLY_EVENT_INDEX_LEB:
-  case R_WEBASSEMBLY_MEMORY_ADDR_LEB:
-    return encodeULEB128(Value, Buf);
-  case R_WEBASSEMBLY_TABLE_INDEX_SLEB:
-  case R_WEBASSEMBLY_MEMORY_ADDR_SLEB:
-    return encodeSLEB128(static_cast<int32_t>(Value), Buf);
+static unsigned writeCompressedReloc(uint8_t *buf, const WasmRelocation &rel,
+                                     uint32_t value) {
+  switch (rel.Type) {
+  case R_WASM_TYPE_INDEX_LEB:
+  case R_WASM_FUNCTION_INDEX_LEB:
+  case R_WASM_GLOBAL_INDEX_LEB:
+  case R_WASM_EVENT_INDEX_LEB:
+  case R_WASM_MEMORY_ADDR_LEB:
+    return encodeULEB128(value, buf);
+  case R_WASM_TABLE_INDEX_SLEB:
+  case R_WASM_MEMORY_ADDR_SLEB:
+    return encodeSLEB128(static_cast<int32_t>(value), buf);
   default:
     llvm_unreachable("unexpected relocation type");
   }
 }
 
-static unsigned getRelocWidthPadded(const WasmRelocation &Rel) {
-  switch (Rel.Type) {
-  case R_WEBASSEMBLY_TYPE_INDEX_LEB:
-  case R_WEBASSEMBLY_FUNCTION_INDEX_LEB:
-  case R_WEBASSEMBLY_GLOBAL_INDEX_LEB:
-  case R_WEBASSEMBLY_EVENT_INDEX_LEB:
-  case R_WEBASSEMBLY_MEMORY_ADDR_LEB:
-  case R_WEBASSEMBLY_TABLE_INDEX_SLEB:
-  case R_WEBASSEMBLY_MEMORY_ADDR_SLEB:
+static unsigned getRelocWidthPadded(const WasmRelocation &rel) {
+  switch (rel.Type) {
+  case R_WASM_TYPE_INDEX_LEB:
+  case R_WASM_FUNCTION_INDEX_LEB:
+  case R_WASM_GLOBAL_INDEX_LEB:
+  case R_WASM_EVENT_INDEX_LEB:
+  case R_WASM_MEMORY_ADDR_LEB:
+  case R_WASM_TABLE_INDEX_SLEB:
+  case R_WASM_MEMORY_ADDR_SLEB:
     return 5;
   default:
     llvm_unreachable("unexpected relocation type");
   }
 }
 
-static unsigned getRelocWidth(const WasmRelocation &Rel, uint32_t Value) {
-  uint8_t Buf[5];
-  return writeCompressedReloc(Buf, Rel, Value);
+static unsigned getRelocWidth(const WasmRelocation &rel, uint32_t value) {
+  uint8_t buf[5];
+  return writeCompressedReloc(buf, rel, value);
 }
 
 // Relocations of type LEB and SLEB in the code section are padded to 5 bytes
@@ -224,69 +225,124 @@ static unsigned getRelocWidth(const WasmRelocation &Rel, uint32_t Value) {
 // This function only computes the final output size.  It must be called
 // before getSize() is used to calculate of layout of the code section.
 void InputFunction::calculateSize() {
-  if (!File || !Config->CompressRelocations)
+  if (!file || !config->compressRelocations)
     return;
 
   LLVM_DEBUG(dbgs() << "calculateSize: " << getName() << "\n");
 
-  const uint8_t *SecStart = File->CodeSection->Content.data();
-  const uint8_t *FuncStart = SecStart + getInputSectionOffset();
-  uint32_t FunctionSizeLength;
-  decodeULEB128(FuncStart, &FunctionSizeLength);
+  const uint8_t *secStart = file->codeSection->Content.data();
+  const uint8_t *funcStart = secStart + getInputSectionOffset();
+  uint32_t functionSizeLength;
+  decodeULEB128(funcStart, &functionSizeLength);
 
-  uint32_t Start = getInputSectionOffset();
-  uint32_t End = Start + Function->Size;
+  uint32_t start = getInputSectionOffset();
+  uint32_t end = start + function->Size;
 
-  uint32_t LastRelocEnd = Start + FunctionSizeLength;
-  for (const WasmRelocation &Rel : Relocations) {
-    LLVM_DEBUG(dbgs() << "  region: " << (Rel.Offset - LastRelocEnd) << "\n");
-    CompressedFuncSize += Rel.Offset - LastRelocEnd;
-    CompressedFuncSize += getRelocWidth(Rel, File->calcNewValue(Rel));
-    LastRelocEnd = Rel.Offset + getRelocWidthPadded(Rel);
+  uint32_t lastRelocEnd = start + functionSizeLength;
+  for (const WasmRelocation &rel : relocations) {
+    LLVM_DEBUG(dbgs() << "  region: " << (rel.Offset - lastRelocEnd) << "\n");
+    compressedFuncSize += rel.Offset - lastRelocEnd;
+    compressedFuncSize += getRelocWidth(rel, file->calcNewValue(rel));
+    lastRelocEnd = rel.Offset + getRelocWidthPadded(rel);
   }
-  LLVM_DEBUG(dbgs() << "  final region: " << (End - LastRelocEnd) << "\n");
-  CompressedFuncSize += End - LastRelocEnd;
+  LLVM_DEBUG(dbgs() << "  final region: " << (end - lastRelocEnd) << "\n");
+  compressedFuncSize += end - lastRelocEnd;
 
   // Now we know how long the resulting function is we can add the encoding
   // of its length
-  uint8_t Buf[5];
-  CompressedSize = CompressedFuncSize + encodeULEB128(CompressedFuncSize, Buf);
+  uint8_t buf[5];
+  compressedSize = compressedFuncSize + encodeULEB128(compressedFuncSize, buf);
 
-  LLVM_DEBUG(dbgs() << "  calculateSize orig: " << Function->Size << "\n");
-  LLVM_DEBUG(dbgs() << "  calculateSize  new: " << CompressedSize << "\n");
+  LLVM_DEBUG(dbgs() << "  calculateSize orig: " << function->Size << "\n");
+  LLVM_DEBUG(dbgs() << "  calculateSize  new: " << compressedSize << "\n");
 }
 
 // Override the default writeTo method so that we can (optionally) write the
 // compressed version of the function.
-void InputFunction::writeTo(uint8_t *Buf) const {
-  if (!File || !Config->CompressRelocations)
-    return InputChunk::writeTo(Buf);
+void InputFunction::writeTo(uint8_t *buf) const {
+  if (!file || !config->compressRelocations)
+    return InputChunk::writeTo(buf);
 
-  Buf += OutputOffset;
-  uint8_t *Orig = Buf;
-  (void)Orig;
+  buf += outputOffset;
+  uint8_t *orig = buf;
+  (void)orig;
 
-  const uint8_t *SecStart = File->CodeSection->Content.data();
-  const uint8_t *FuncStart = SecStart + getInputSectionOffset();
-  const uint8_t *End = FuncStart + Function->Size;
-  uint32_t Count;
-  decodeULEB128(FuncStart, &Count);
-  FuncStart += Count;
+  const uint8_t *secStart = file->codeSection->Content.data();
+  const uint8_t *funcStart = secStart + getInputSectionOffset();
+  const uint8_t *end = funcStart + function->Size;
+  uint32_t count;
+  decodeULEB128(funcStart, &count);
+  funcStart += count;
 
   LLVM_DEBUG(dbgs() << "write func: " << getName() << "\n");
-  Buf += encodeULEB128(CompressedFuncSize, Buf);
-  const uint8_t *LastRelocEnd = FuncStart;
-  for (const WasmRelocation &Rel : Relocations) {
-    unsigned ChunkSize = (SecStart + Rel.Offset) - LastRelocEnd;
-    LLVM_DEBUG(dbgs() << "  write chunk: " << ChunkSize << "\n");
-    memcpy(Buf, LastRelocEnd, ChunkSize);
-    Buf += ChunkSize;
-    Buf += writeCompressedReloc(Buf, Rel, File->calcNewValue(Rel));
-    LastRelocEnd = SecStart + Rel.Offset + getRelocWidthPadded(Rel);
+  buf += encodeULEB128(compressedFuncSize, buf);
+  const uint8_t *lastRelocEnd = funcStart;
+  for (const WasmRelocation &rel : relocations) {
+    unsigned chunkSize = (secStart + rel.Offset) - lastRelocEnd;
+    LLVM_DEBUG(dbgs() << "  write chunk: " << chunkSize << "\n");
+    memcpy(buf, lastRelocEnd, chunkSize);
+    buf += chunkSize;
+    buf += writeCompressedReloc(buf, rel, file->calcNewValue(rel));
+    lastRelocEnd = secStart + rel.Offset + getRelocWidthPadded(rel);
   }
 
-  unsigned ChunkSize = End - LastRelocEnd;
-  LLVM_DEBUG(dbgs() << "  write final chunk: " << ChunkSize << "\n");
-  memcpy(Buf, LastRelocEnd, ChunkSize);
-  LLVM_DEBUG(dbgs() << "  total: " << (Buf + ChunkSize - Orig) << "\n");
+  unsigned chunkSize = end - lastRelocEnd;
+  LLVM_DEBUG(dbgs() << "  write final chunk: " << chunkSize << "\n");
+  memcpy(buf, lastRelocEnd, chunkSize);
+  LLVM_DEBUG(dbgs() << "  total: " << (buf + chunkSize - orig) << "\n");
+}
+
+// Generate code to apply relocations to the data section at runtime.
+// This is only called when generating shared libaries (PIC) where address are
+// not known at static link time.
+void InputSegment::generateRelocationCode(raw_ostream &os) const {
+  LLVM_DEBUG(dbgs() << "generating runtime relocations: " << getName()
+                    << " count=" << relocations.size() << "\n");
+
+  // TODO(sbc): Encode the relocations in the data section and write a loop
+  // here to apply them.
+  uint32_t segmentVA = outputSeg->startVA + outputSegmentOffset;
+  for (const WasmRelocation &rel : relocations) {
+    uint32_t offset = rel.Offset - getInputSectionOffset();
+    uint32_t outputOffset = segmentVA + offset;
+
+    LLVM_DEBUG(dbgs() << "gen reloc: type=" << relocTypeToString(rel.Type)
+                      << " addend=" << rel.Addend << " index=" << rel.Index
+                      << " output offset=" << outputOffset << "\n");
+
+    // Get __memory_base
+    writeU8(os, WASM_OPCODE_GLOBAL_GET, "GLOBAL_GET");
+    writeUleb128(os, WasmSym::memoryBase->getGlobalIndex(), "memory_base");
+
+    // Add the offset of the relocation
+    writeU8(os, WASM_OPCODE_I32_CONST, "I32_CONST");
+    writeSleb128(os, outputOffset, "offset");
+    writeU8(os, WASM_OPCODE_I32_ADD, "ADD");
+
+    Symbol *sym = file->getSymbol(rel);
+    // Now figure out what we want to store
+    if (sym->hasGOTIndex()) {
+      writeU8(os, WASM_OPCODE_GLOBAL_GET, "GLOBAL_GET");
+      writeUleb128(os, sym->getGOTIndex(), "global index");
+      if (rel.Addend) {
+        writeU8(os, WASM_OPCODE_I32_CONST, "CONST");
+        writeSleb128(os, rel.Addend, "addend");
+        writeU8(os, WASM_OPCODE_I32_ADD, "ADD");
+      }
+    } else {
+      const GlobalSymbol* baseSymbol = WasmSym::memoryBase;
+      if (rel.Type == R_WASM_TABLE_INDEX_I32)
+        baseSymbol = WasmSym::tableBase;
+      writeU8(os, WASM_OPCODE_GLOBAL_GET, "GLOBAL_GET");
+      writeUleb128(os, baseSymbol->getGlobalIndex(), "base");
+      writeU8(os, WASM_OPCODE_I32_CONST, "CONST");
+      writeSleb128(os, file->calcNewValue(rel), "offset");
+      writeU8(os, WASM_OPCODE_I32_ADD, "ADD");
+    }
+
+    // Store that value at the virtual address
+    writeU8(os, WASM_OPCODE_I32_STORE, "I32_STORE");
+    writeUleb128(os, 2, "align");
+    writeUleb128(os, 0, "offset");
+  }
 }
diff --git a/deps/lld/wasm/InputChunks.h b/deps/lld/wasm/InputChunks.h
index a3bcbb266ec539047c284b999efb72d41c2db4e3..2d3eb40f807e5b94381e252e01b9ee9857832bec 100644
--- a/deps/lld/wasm/InputChunks.h
+++ b/deps/lld/wasm/InputChunks.h
@@ -1,9 +1,8 @@
 //===- InputChunks.h --------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -32,20 +31,21 @@ namespace wasm {
 
 class ObjFile;
 class OutputSegment;
+class OutputSection;
 
 class InputChunk {
 public:
   enum Kind { DataSegment, Function, SyntheticFunction, Section };
 
-  Kind kind() const { return SectionKind; }
+  Kind kind() const { return sectionKind; }
 
   virtual uint32_t getSize() const { return data().size(); }
   virtual uint32_t getInputSize() const { return getSize(); };
 
-  virtual void writeTo(uint8_t *SectionStart) const;
+  virtual void writeTo(uint8_t *sectionStart) const;
 
-  ArrayRef<WasmRelocation> getRelocations() const { return Relocations; }
-  void setRelocations(ArrayRef<WasmRelocation> Rs) { Relocations = Rs; }
+  ArrayRef<WasmRelocation> getRelocations() const { return relocations; }
+  void setRelocations(ArrayRef<WasmRelocation> rs) { relocations = rs; }
 
   virtual StringRef getName() const = 0;
   virtual StringRef getDebugName() const = 0;
@@ -53,20 +53,23 @@ public:
   StringRef getComdatName() const;
   virtual uint32_t getInputSectionOffset() const = 0;
 
-  size_t NumRelocations() const { return Relocations.size(); }
-  void writeRelocations(llvm::raw_ostream &OS) const;
+  size_t getNumRelocations() const { return relocations.size(); }
+  void writeRelocations(llvm::raw_ostream &os) const;
 
-  ObjFile *File;
-  int32_t OutputOffset = 0;
+  ObjFile *file;
+  int32_t outputOffset = 0;
 
   // Signals that the section is part of the output.  The garbage collector,
   // and COMDAT handling can set a sections' Live bit.
   // If GC is disabled, all sections start out as live by default.
-  unsigned Live : 1;
+  unsigned live : 1;
+
+  // Signals the chunk was discarded by COMDAT handling.
+  unsigned discarded : 1;
 
 protected:
-  InputChunk(ObjFile *F, Kind K)
-      : File(F), Live(!Config->GcSections), SectionKind(K) {}
+  InputChunk(ObjFile *f, Kind k)
+      : file(f), live(!config->gcSections), discarded(false), sectionKind(k) {}
   virtual ~InputChunk() = default;
   virtual ArrayRef<uint8_t> data() const = 0;
 
@@ -74,8 +77,8 @@ protected:
   // This is performed only debug builds as an extra sanity check.
   void verifyRelocTargets() const;
 
-  ArrayRef<WasmRelocation> Relocations;
-  Kind SectionKind;
+  ArrayRef<WasmRelocation> relocations;
+  Kind sectionKind;
 };
 
 // Represents a WebAssembly data segment which can be included as part of
@@ -88,63 +91,65 @@ protected:
 // each global variable.
 class InputSegment : public InputChunk {
 public:
-  InputSegment(const WasmSegment &Seg, ObjFile *F)
-      : InputChunk(F, InputChunk::DataSegment), Segment(Seg) {}
+  InputSegment(const WasmSegment &seg, ObjFile *f)
+      : InputChunk(f, InputChunk::DataSegment), segment(seg) {}
 
-  static bool classof(const InputChunk *C) { return C->kind() == DataSegment; }
+  static bool classof(const InputChunk *c) { return c->kind() == DataSegment; }
 
-  uint32_t getAlignment() const { return Segment.Data.Alignment; }
-  StringRef getName() const override { return Segment.Data.Name; }
+  void generateRelocationCode(raw_ostream &os) const;
+
+  uint32_t getAlignment() const { return segment.Data.Alignment; }
+  StringRef getName() const override { return segment.Data.Name; }
   StringRef getDebugName() const override { return StringRef(); }
-  uint32_t getComdat() const override { return Segment.Data.Comdat; }
+  uint32_t getComdat() const override { return segment.Data.Comdat; }
   uint32_t getInputSectionOffset() const override {
-    return Segment.SectionOffset;
+    return segment.SectionOffset;
   }
 
-  const OutputSegment *OutputSeg = nullptr;
-  int32_t OutputSegmentOffset = 0;
+  const OutputSegment *outputSeg = nullptr;
+  int32_t outputSegmentOffset = 0;
 
 protected:
-  ArrayRef<uint8_t> data() const override { return Segment.Data.Content; }
+  ArrayRef<uint8_t> data() const override { return segment.Data.Content; }
 
-  const WasmSegment &Segment;
+  const WasmSegment &segment;
 };
 
 // Represents a single wasm function within and input file.  These are
 // combined to create the final output CODE section.
 class InputFunction : public InputChunk {
 public:
-  InputFunction(const WasmSignature &S, const WasmFunction *Func, ObjFile *F)
-      : InputChunk(F, InputChunk::Function), Signature(S), Function(Func) {}
+  InputFunction(const WasmSignature &s, const WasmFunction *func, ObjFile *f)
+      : InputChunk(f, InputChunk::Function), signature(s), function(func) {}
 
-  static bool classof(const InputChunk *C) {
-    return C->kind() == InputChunk::Function ||
-           C->kind() == InputChunk::SyntheticFunction;
+  static bool classof(const InputChunk *c) {
+    return c->kind() == InputChunk::Function ||
+           c->kind() == InputChunk::SyntheticFunction;
   }
 
-  void writeTo(uint8_t *SectionStart) const override;
-  StringRef getName() const override { return Function->SymbolName; }
-  StringRef getDebugName() const override { return Function->DebugName; }
-  uint32_t getComdat() const override { return Function->Comdat; }
+  void writeTo(uint8_t *sectionStart) const override;
+  StringRef getName() const override { return function->SymbolName; }
+  StringRef getDebugName() const override { return function->DebugName; }
+  uint32_t getComdat() const override { return function->Comdat; }
   uint32_t getFunctionInputOffset() const { return getInputSectionOffset(); }
-  uint32_t getFunctionCodeOffset() const { return Function->CodeOffset; }
+  uint32_t getFunctionCodeOffset() const { return function->CodeOffset; }
   uint32_t getSize() const override {
-    if (Config->CompressRelocations && File) {
-      assert(CompressedSize);
-      return CompressedSize;
+    if (config->compressRelocations && file) {
+      assert(compressedSize);
+      return compressedSize;
     }
     return data().size();
   }
-  uint32_t getInputSize() const override { return Function->Size; }
-  uint32_t getFunctionIndex() const { return FunctionIndex.getValue(); }
-  bool hasFunctionIndex() const { return FunctionIndex.hasValue(); }
-  void setFunctionIndex(uint32_t Index);
+  uint32_t getInputSize() const override { return function->Size; }
+  uint32_t getFunctionIndex() const { return functionIndex.getValue(); }
+  bool hasFunctionIndex() const { return functionIndex.hasValue(); }
+  void setFunctionIndex(uint32_t index);
   uint32_t getInputSectionOffset() const override {
-    return Function->CodeSectionOffset;
+    return function->CodeSectionOffset;
   }
-  uint32_t getTableIndex() const { return TableIndex.getValue(); }
-  bool hasTableIndex() const { return TableIndex.hasValue(); }
-  void setTableIndex(uint32_t Index);
+  uint32_t getTableIndex() const { return tableIndex.getValue(); }
+  bool hasTableIndex() const { return tableIndex.hasValue(); }
+  void setTableIndex(uint32_t index);
 
   // The size of a given input function can depend on the values of the
   // LEB relocations within it.  This finalizeContents method is called after
@@ -152,73 +157,77 @@ public:
   // called.
   void calculateSize();
 
-  const WasmSignature &Signature;
+  const WasmSignature &signature;
 
 protected:
   ArrayRef<uint8_t> data() const override {
-    assert(!Config->CompressRelocations);
-    return File->CodeSection->Content.slice(getInputSectionOffset(),
-                                            Function->Size);
+    assert(!config->compressRelocations);
+    return file->codeSection->Content.slice(getInputSectionOffset(),
+                                            function->Size);
   }
 
-  const WasmFunction *Function;
-  llvm::Optional<uint32_t> FunctionIndex;
-  llvm::Optional<uint32_t> TableIndex;
-  uint32_t CompressedFuncSize = 0;
-  uint32_t CompressedSize = 0;
+  const WasmFunction *function;
+  llvm::Optional<uint32_t> functionIndex;
+  llvm::Optional<uint32_t> tableIndex;
+  uint32_t compressedFuncSize = 0;
+  uint32_t compressedSize = 0;
 };
 
 class SyntheticFunction : public InputFunction {
 public:
-  SyntheticFunction(const WasmSignature &S, StringRef Name,
-                    StringRef DebugName = {})
-      : InputFunction(S, nullptr, nullptr), Name(Name), DebugName(DebugName) {
-    SectionKind = InputChunk::SyntheticFunction;
+  SyntheticFunction(const WasmSignature &s, StringRef name,
+                    StringRef debugName = {})
+      : InputFunction(s, nullptr, nullptr), name(name), debugName(debugName) {
+    sectionKind = InputChunk::SyntheticFunction;
   }
 
-  static bool classof(const InputChunk *C) {
-    return C->kind() == InputChunk::SyntheticFunction;
+  static bool classof(const InputChunk *c) {
+    return c->kind() == InputChunk::SyntheticFunction;
   }
 
-  StringRef getName() const override { return Name; }
-  StringRef getDebugName() const override { return DebugName; }
+  StringRef getName() const override { return name; }
+  StringRef getDebugName() const override { return debugName; }
   uint32_t getComdat() const override { return UINT32_MAX; }
 
-  void setBody(ArrayRef<uint8_t> Body_) { Body = Body_; }
+  void setBody(ArrayRef<uint8_t> body_) { body = body_; }
 
 protected:
-  ArrayRef<uint8_t> data() const override { return Body; }
+  ArrayRef<uint8_t> data() const override { return body; }
 
-  StringRef Name;
-  StringRef DebugName;
-  ArrayRef<uint8_t> Body;
+  StringRef name;
+  StringRef debugName;
+  ArrayRef<uint8_t> body;
 };
 
 // Represents a single Wasm Section within an input file.
 class InputSection : public InputChunk {
 public:
-  InputSection(const WasmSection &S, ObjFile *F)
-      : InputChunk(F, InputChunk::Section), Section(S) {
-    assert(Section.Type == llvm::wasm::WASM_SEC_CUSTOM);
+  InputSection(const WasmSection &s, ObjFile *f)
+      : InputChunk(f, InputChunk::Section), section(s) {
+    assert(section.Type == llvm::wasm::WASM_SEC_CUSTOM);
   }
 
-  StringRef getName() const override { return Section.Name; }
+  StringRef getName() const override { return section.Name; }
   StringRef getDebugName() const override { return StringRef(); }
   uint32_t getComdat() const override { return UINT32_MAX; }
 
+  OutputSection *outputSec = nullptr;
+
 protected:
-  ArrayRef<uint8_t> data() const override { return Section.Content; }
+  ArrayRef<uint8_t> data() const override { return section.Content; }
 
   // Offset within the input section.  This is only zero since this chunk
   // type represents an entire input section, not part of one.
   uint32_t getInputSectionOffset() const override { return 0; }
 
-  const WasmSection &Section;
+  const WasmSection &section;
 };
 
 } // namespace wasm
 
 std::string toString(const wasm::InputChunk *);
+StringRef relocTypeToString(uint8_t relocType);
+
 } // namespace lld
 
 #endif // LLD_WASM_INPUT_CHUNKS_H
diff --git a/deps/lld/wasm/InputEvent.h b/deps/lld/wasm/InputEvent.h
index d7c12627bd3dd38f9fcae89a4e2b75c49fcd15f7..98cfdf7bfc762ddaed2d6710d824a4f4666e30f8 100644
--- a/deps/lld/wasm/InputEvent.h
+++ b/deps/lld/wasm/InputEvent.h
@@ -1,9 +1,8 @@
 //===- InputEvent.h ---------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -29,33 +28,33 @@ namespace wasm {
 // form the final EVENTS section.
 class InputEvent {
 public:
-  InputEvent(const WasmSignature &S, const WasmEvent &E, ObjFile *F)
-      : File(F), Event(E), Signature(S), Live(!Config->GcSections) {}
+  InputEvent(const WasmSignature &s, const WasmEvent &e, ObjFile *f)
+      : file(f), event(e), signature(s), live(!config->gcSections) {}
 
-  StringRef getName() const { return Event.SymbolName; }
-  const WasmEventType &getType() const { return Event.Type; }
+  StringRef getName() const { return event.SymbolName; }
+  const WasmEventType &getType() const { return event.Type; }
 
-  uint32_t getEventIndex() const { return EventIndex.getValue(); }
-  bool hasEventIndex() const { return EventIndex.hasValue(); }
-  void setEventIndex(uint32_t Index) {
+  uint32_t getEventIndex() const { return eventIndex.getValue(); }
+  bool hasEventIndex() const { return eventIndex.hasValue(); }
+  void setEventIndex(uint32_t index) {
     assert(!hasEventIndex());
-    EventIndex = Index;
+    eventIndex = index;
   }
 
-  ObjFile *File;
-  WasmEvent Event;
-  const WasmSignature &Signature;
+  ObjFile *file;
+  WasmEvent event;
+  const WasmSignature &signature;
 
-  bool Live = false;
+  bool live = false;
 
 protected:
-  llvm::Optional<uint32_t> EventIndex;
+  llvm::Optional<uint32_t> eventIndex;
 };
 
 } // namespace wasm
 
-inline std::string toString(const wasm::InputEvent *E) {
-  return (toString(E->File) + ":(" + E->getName() + ")").str();
+inline std::string toString(const wasm::InputEvent *e) {
+  return (toString(e->file) + ":(" + e->getName() + ")").str();
 }
 
 } // namespace lld
diff --git a/deps/lld/wasm/InputFiles.cpp b/deps/lld/wasm/InputFiles.cpp
index 1e54272163545de645423ffeb01fd439c454de68..33ae3325c7472ca2347efe0eef3fb5241c3c9308 100644
--- a/deps/lld/wasm/InputFiles.cpp
+++ b/deps/lld/wasm/InputFiles.cpp
@@ -1,9 +1,8 @@
 //===- InputFiles.cpp -----------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -15,8 +14,10 @@
 #include "SymbolTable.h"
 #include "lld/Common/ErrorHandler.h"
 #include "lld/Common/Memory.h"
+#include "lld/Common/Reproduce.h"
 #include "llvm/Object/Binary.h"
 #include "llvm/Object/Wasm.h"
+#include "llvm/Support/TarWriter.h"
 #include "llvm/Support/raw_ostream.h"
 
 #define DEBUG_TYPE "lld"
@@ -28,62 +29,77 @@ using namespace llvm;
 using namespace llvm::object;
 using namespace llvm::wasm;
 
-Optional<MemoryBufferRef> lld::wasm::readFile(StringRef Path) {
-  log("Loading: " + Path);
+std::unique_ptr<llvm::TarWriter> lld::wasm::tar;
 
-  auto MBOrErr = MemoryBuffer::getFile(Path);
-  if (auto EC = MBOrErr.getError()) {
-    error("cannot open " + Path + ": " + EC.message());
+Optional<MemoryBufferRef> lld::wasm::readFile(StringRef path) {
+  log("Loading: " + path);
+
+  auto mbOrErr = MemoryBuffer::getFile(path);
+  if (auto ec = mbOrErr.getError()) {
+    error("cannot open " + path + ": " + ec.message());
     return None;
   }
-  std::unique_ptr<MemoryBuffer> &MB = *MBOrErr;
-  MemoryBufferRef MBRef = MB->getMemBufferRef();
-  make<std::unique_ptr<MemoryBuffer>>(std::move(MB)); // take MB ownership
+  std::unique_ptr<MemoryBuffer> &mb = *mbOrErr;
+  MemoryBufferRef mbref = mb->getMemBufferRef();
+  make<std::unique_ptr<MemoryBuffer>>(std::move(mb)); // take MB ownership
 
-  return MBRef;
+  if (tar)
+    tar->append(relativeToRoot(path), mbref.getBuffer());
+  return mbref;
 }
 
-InputFile *lld::wasm::createObjectFile(MemoryBufferRef MB) {
-  file_magic Magic = identify_magic(MB.getBuffer());
-  if (Magic == file_magic::wasm_object)
-    return make<ObjFile>(MB);
+InputFile *lld::wasm::createObjectFile(MemoryBufferRef mb,
+                                       StringRef archiveName) {
+  file_magic magic = identify_magic(mb.getBuffer());
+  if (magic == file_magic::wasm_object) {
+    std::unique_ptr<Binary> bin =
+        CHECK(createBinary(mb), mb.getBufferIdentifier());
+    auto *obj = cast<WasmObjectFile>(bin.get());
+    if (obj->isSharedObject())
+      return make<SharedFile>(mb);
+    return make<ObjFile>(mb, archiveName);
+  }
 
-  if (Magic == file_magic::bitcode)
-    return make<BitcodeFile>(MB);
+  if (magic == file_magic::bitcode)
+    return make<BitcodeFile>(mb, archiveName);
 
-  fatal("unknown file type: " + MB.getBufferIdentifier());
+  fatal("unknown file type: " + mb.getBufferIdentifier());
 }
 
 void ObjFile::dumpInfo() const {
-  log("info for: " + getName() +
-      "\n              Symbols : " + Twine(Symbols.size()) +
-      "\n     Function Imports : " + Twine(WasmObj->getNumImportedFunctions()) +
-      "\n       Global Imports : " + Twine(WasmObj->getNumImportedGlobals()) +
-      "\n        Event Imports : " + Twine(WasmObj->getNumImportedEvents()));
+  log("info for: " + toString(this) +
+      "\n              Symbols : " + Twine(symbols.size()) +
+      "\n     Function Imports : " + Twine(wasmObj->getNumImportedFunctions()) +
+      "\n       Global Imports : " + Twine(wasmObj->getNumImportedGlobals()) +
+      "\n        Event Imports : " + Twine(wasmObj->getNumImportedEvents()));
 }
 
 // Relocations contain either symbol or type indices.  This function takes a
 // relocation and returns relocated index (i.e. translates from the input
 // symbol/type space to the output symbol/type space).
-uint32_t ObjFile::calcNewIndex(const WasmRelocation &Reloc) const {
-  if (Reloc.Type == R_WEBASSEMBLY_TYPE_INDEX_LEB) {
-    assert(TypeIsUsed[Reloc.Index]);
-    return TypeMap[Reloc.Index];
+uint32_t ObjFile::calcNewIndex(const WasmRelocation &reloc) const {
+  if (reloc.Type == R_WASM_TYPE_INDEX_LEB) {
+    assert(typeIsUsed[reloc.Index]);
+    return typeMap[reloc.Index];
   }
-  return Symbols[Reloc.Index]->getOutputSymbolIndex();
+  const Symbol *sym = symbols[reloc.Index];
+  if (auto *ss = dyn_cast<SectionSymbol>(sym))
+    sym = ss->getOutputSectionSymbol();
+  return sym->getOutputSymbolIndex();
 }
 
 // Relocations can contain addend for combined sections. This function takes a
 // relocation and returns updated addend by offset in the output section.
-uint32_t ObjFile::calcNewAddend(const WasmRelocation &Reloc) const {
-  switch (Reloc.Type) {
-  case R_WEBASSEMBLY_MEMORY_ADDR_LEB:
-  case R_WEBASSEMBLY_MEMORY_ADDR_SLEB:
-  case R_WEBASSEMBLY_MEMORY_ADDR_I32:
-  case R_WEBASSEMBLY_FUNCTION_OFFSET_I32:
-    return Reloc.Addend;
-  case R_WEBASSEMBLY_SECTION_OFFSET_I32:
-    return getSectionSymbol(Reloc.Index)->Section->OutputOffset + Reloc.Addend;
+uint32_t ObjFile::calcNewAddend(const WasmRelocation &reloc) const {
+  switch (reloc.Type) {
+  case R_WASM_MEMORY_ADDR_LEB:
+  case R_WASM_MEMORY_ADDR_SLEB:
+  case R_WASM_MEMORY_ADDR_REL_SLEB:
+  case R_WASM_MEMORY_ADDR_I32:
+  case R_WASM_FUNCTION_OFFSET_I32:
+    return reloc.Addend;
+  case R_WASM_SECTION_OFFSET_I32:
+    return getSectionSymbol(reloc.Index)->section->outputOffset + reloc.Addend;
   default:
     llvm_unreachable("unexpected relocation type");
   }
@@ -92,39 +108,42 @@ uint32_t ObjFile::calcNewAddend(const WasmRelocation &Reloc) const {
 // Calculate the value we expect to find at the relocation location.
 // This is used as a sanity check before applying a relocation to a given
 // location.  It is useful for catching bugs in the compiler and linker.
-uint32_t ObjFile::calcExpectedValue(const WasmRelocation &Reloc) const {
-  switch (Reloc.Type) {
-  case R_WEBASSEMBLY_TABLE_INDEX_I32:
-  case R_WEBASSEMBLY_TABLE_INDEX_SLEB: {
-    const WasmSymbol &Sym = WasmObj->syms()[Reloc.Index];
-    return TableEntries[Sym.Info.ElementIndex];
+uint32_t ObjFile::calcExpectedValue(const WasmRelocation &reloc) const {
+  switch (reloc.Type) {
+  case R_WASM_TABLE_INDEX_I32:
+  case R_WASM_TABLE_INDEX_SLEB:
+  case R_WASM_TABLE_INDEX_REL_SLEB: {
+    const WasmSymbol &sym = wasmObj->syms()[reloc.Index];
+    return tableEntries[sym.Info.ElementIndex];
   }
-  case R_WEBASSEMBLY_MEMORY_ADDR_SLEB:
-  case R_WEBASSEMBLY_MEMORY_ADDR_I32:
-  case R_WEBASSEMBLY_MEMORY_ADDR_LEB: {
-    const WasmSymbol &Sym = WasmObj->syms()[Reloc.Index];
-    if (Sym.isUndefined())
+  case R_WASM_MEMORY_ADDR_SLEB:
+  case R_WASM_MEMORY_ADDR_I32:
+  case R_WASM_MEMORY_ADDR_LEB:
+  case R_WASM_MEMORY_ADDR_REL_SLEB: {
+    const WasmSymbol &sym = wasmObj->syms()[reloc.Index];
+    if (sym.isUndefined())
       return 0;
-    const WasmSegment &Segment =
-        WasmObj->dataSegments()[Sym.Info.DataRef.Segment];
-    return Segment.Data.Offset.Value.Int32 + Sym.Info.DataRef.Offset +
-           Reloc.Addend;
+    const WasmSegment &segment =
+        wasmObj->dataSegments()[sym.Info.DataRef.Segment];
+    return segment.Data.Offset.Value.Int32 + sym.Info.DataRef.Offset +
+           reloc.Addend;
   }
-  case R_WEBASSEMBLY_FUNCTION_OFFSET_I32:
-    if (auto *Sym = dyn_cast<DefinedFunction>(getFunctionSymbol(Reloc.Index))) {
-      return Sym->Function->getFunctionInputOffset() +
-             Sym->Function->getFunctionCodeOffset() + Reloc.Addend;
-    }
-    return 0;
-  case R_WEBASSEMBLY_SECTION_OFFSET_I32:
-    return Reloc.Addend;
-  case R_WEBASSEMBLY_TYPE_INDEX_LEB:
-    return Reloc.Index;
-  case R_WEBASSEMBLY_FUNCTION_INDEX_LEB:
-  case R_WEBASSEMBLY_GLOBAL_INDEX_LEB:
-  case R_WEBASSEMBLY_EVENT_INDEX_LEB: {
-    const WasmSymbol &Sym = WasmObj->syms()[Reloc.Index];
-    return Sym.Info.ElementIndex;
+  case R_WASM_FUNCTION_OFFSET_I32: {
+    const WasmSymbol &sym = wasmObj->syms()[reloc.Index];
+    InputFunction *f =
+        functions[sym.Info.ElementIndex - wasmObj->getNumImportedFunctions()];
+    return f->getFunctionInputOffset() + f->getFunctionCodeOffset() +
+           reloc.Addend;
+  }
+  case R_WASM_SECTION_OFFSET_I32:
+    return reloc.Addend;
+  case R_WASM_TYPE_INDEX_LEB:
+    return reloc.Index;
+  case R_WASM_FUNCTION_INDEX_LEB:
+  case R_WASM_GLOBAL_INDEX_LEB:
+  case R_WASM_EVENT_INDEX_LEB: {
+    const WasmSymbol &sym = wasmObj->syms()[reloc.Index];
+    return sym.Info.ElementIndex;
   }
   default:
     llvm_unreachable("unknown relocation type");
@@ -132,260 +151,299 @@ uint32_t ObjFile::calcExpectedValue(const WasmRelocation &Reloc) const {
 }
 
 // Translate from the relocation's index into the final linked output value.
-uint32_t ObjFile::calcNewValue(const WasmRelocation &Reloc) const {
-  switch (Reloc.Type) {
-  case R_WEBASSEMBLY_TABLE_INDEX_I32:
-  case R_WEBASSEMBLY_TABLE_INDEX_SLEB:
-    return getFunctionSymbol(Reloc.Index)->getTableIndex();
-  case R_WEBASSEMBLY_MEMORY_ADDR_SLEB:
-  case R_WEBASSEMBLY_MEMORY_ADDR_I32:
-  case R_WEBASSEMBLY_MEMORY_ADDR_LEB:
-    if (auto *Sym = dyn_cast<DefinedData>(getDataSymbol(Reloc.Index)))
-      if (Sym->isLive())
-        return Sym->getVirtualAddress() + Reloc.Addend;
-    return 0;
-  case R_WEBASSEMBLY_TYPE_INDEX_LEB:
-    return TypeMap[Reloc.Index];
-  case R_WEBASSEMBLY_FUNCTION_INDEX_LEB:
-    return getFunctionSymbol(Reloc.Index)->getFunctionIndex();
-  case R_WEBASSEMBLY_GLOBAL_INDEX_LEB:
-    return getGlobalSymbol(Reloc.Index)->getGlobalIndex();
-  case R_WEBASSEMBLY_EVENT_INDEX_LEB:
-    return getEventSymbol(Reloc.Index)->getEventIndex();
-  case R_WEBASSEMBLY_FUNCTION_OFFSET_I32:
-    if (auto *Sym = dyn_cast<DefinedFunction>(getFunctionSymbol(Reloc.Index))) {
-      if (Sym->isLive())
-        return Sym->Function->OutputOffset +
-               Sym->Function->getFunctionCodeOffset() + Reloc.Addend;
-    }
-    return 0;
-  case R_WEBASSEMBLY_SECTION_OFFSET_I32:
-    return getSectionSymbol(Reloc.Index)->Section->OutputOffset + Reloc.Addend;
+uint32_t ObjFile::calcNewValue(const WasmRelocation &reloc) const {
+  const Symbol* sym = nullptr;
+  if (reloc.Type != R_WASM_TYPE_INDEX_LEB) {
+    sym = symbols[reloc.Index];
+
+    // We can end up with relocations against non-live symbols.  For example
+    // in debug sections.
+    if ((isa<FunctionSymbol>(sym) || isa<DataSymbol>(sym)) && !sym->isLive())
+      return 0;
+  }
+
+  switch (reloc.Type) {
+  case R_WASM_TABLE_INDEX_I32:
+  case R_WASM_TABLE_INDEX_SLEB:
+  case R_WASM_TABLE_INDEX_REL_SLEB:
+    if (config->isPic && !getFunctionSymbol(reloc.Index)->hasTableIndex())
+      return 0;
+    return getFunctionSymbol(reloc.Index)->getTableIndex();
+  case R_WASM_MEMORY_ADDR_SLEB:
+  case R_WASM_MEMORY_ADDR_I32:
+  case R_WASM_MEMORY_ADDR_LEB:
+  case R_WASM_MEMORY_ADDR_REL_SLEB:
+    if (isa<UndefinedData>(sym))
+      return 0;
+    return cast<DefinedData>(sym)->getVirtualAddress() + reloc.Addend;
+  case R_WASM_TYPE_INDEX_LEB:
+    return typeMap[reloc.Index];
+  case R_WASM_FUNCTION_INDEX_LEB:
+    return getFunctionSymbol(reloc.Index)->getFunctionIndex();
+  case R_WASM_GLOBAL_INDEX_LEB:
+    if (auto gs = dyn_cast<GlobalSymbol>(sym))
+      return gs->getGlobalIndex();
+    return sym->getGOTIndex();
+  case R_WASM_EVENT_INDEX_LEB:
+    return getEventSymbol(reloc.Index)->getEventIndex();
+  case R_WASM_FUNCTION_OFFSET_I32: {
+    auto *f = cast<DefinedFunction>(sym);
+    return f->function->outputOffset + f->function->getFunctionCodeOffset() +
+           reloc.Addend;
+  }
+  case R_WASM_SECTION_OFFSET_I32:
+    return getSectionSymbol(reloc.Index)->section->outputOffset + reloc.Addend;
   default:
     llvm_unreachable("unknown relocation type");
   }
 }
 
 template <class T>
-static void setRelocs(const std::vector<T *> &Chunks,
-                      const WasmSection *Section) {
-  if (!Section)
+static void setRelocs(const std::vector<T *> &chunks,
+                      const WasmSection *section) {
+  if (!section)
     return;
 
-  ArrayRef<WasmRelocation> Relocs = Section->Relocations;
-  assert(std::is_sorted(Relocs.begin(), Relocs.end(),
-                        [](const WasmRelocation &R1, const WasmRelocation &R2) {
-                          return R1.Offset < R2.Offset;
+  ArrayRef<WasmRelocation> relocs = section->Relocations;
+  assert(std::is_sorted(relocs.begin(), relocs.end(),
+                        [](const WasmRelocation &r1, const WasmRelocation &r2) {
+                          return r1.Offset < r2.Offset;
                         }));
   assert(std::is_sorted(
-      Chunks.begin(), Chunks.end(), [](InputChunk *C1, InputChunk *C2) {
-        return C1->getInputSectionOffset() < C2->getInputSectionOffset();
+      chunks.begin(), chunks.end(), [](InputChunk *c1, InputChunk *c2) {
+        return c1->getInputSectionOffset() < c2->getInputSectionOffset();
       }));
 
-  auto RelocsNext = Relocs.begin();
-  auto RelocsEnd = Relocs.end();
-  auto RelocLess = [](const WasmRelocation &R, uint32_t Val) {
-    return R.Offset < Val;
+  auto relocsNext = relocs.begin();
+  auto relocsEnd = relocs.end();
+  auto relocLess = [](const WasmRelocation &r, uint32_t val) {
+    return r.Offset < val;
   };
-  for (InputChunk *C : Chunks) {
-    auto RelocsStart = std::lower_bound(RelocsNext, RelocsEnd,
-                                        C->getInputSectionOffset(), RelocLess);
-    RelocsNext = std::lower_bound(
-        RelocsStart, RelocsEnd, C->getInputSectionOffset() + C->getInputSize(),
-        RelocLess);
-    C->setRelocations(ArrayRef<WasmRelocation>(RelocsStart, RelocsNext));
+  for (InputChunk *c : chunks) {
+    auto relocsStart = std::lower_bound(relocsNext, relocsEnd,
+                                        c->getInputSectionOffset(), relocLess);
+    relocsNext = std::lower_bound(
+        relocsStart, relocsEnd, c->getInputSectionOffset() + c->getInputSize(),
+        relocLess);
+    c->setRelocations(ArrayRef<WasmRelocation>(relocsStart, relocsNext));
   }
 }
 
-void ObjFile::parse() {
+void ObjFile::parse(bool ignoreComdats) {
   // Parse a memory buffer as a wasm file.
   LLVM_DEBUG(dbgs() << "Parsing object: " << toString(this) << "\n");
-  std::unique_ptr<Binary> Bin = CHECK(createBinary(MB), toString(this));
+  std::unique_ptr<Binary> bin = CHECK(createBinary(mb), toString(this));
 
-  auto *Obj = dyn_cast<WasmObjectFile>(Bin.get());
-  if (!Obj)
+  auto *obj = dyn_cast<WasmObjectFile>(bin.get());
+  if (!obj)
     fatal(toString(this) + ": not a wasm file");
-  if (!Obj->isRelocatableObject())
+  if (!obj->isRelocatableObject())
     fatal(toString(this) + ": not a relocatable wasm file");
 
-  Bin.release();
-  WasmObj.reset(Obj);
+  bin.release();
+  wasmObj.reset(obj);
 
   // Build up a map of function indices to table indices for use when
   // verifying the existing table index relocations
-  uint32_t TotalFunctions =
-      WasmObj->getNumImportedFunctions() + WasmObj->functions().size();
-  TableEntries.resize(TotalFunctions);
-  for (const WasmElemSegment &Seg : WasmObj->elements()) {
-    if (Seg.Offset.Opcode != WASM_OPCODE_I32_CONST)
+  uint32_t totalFunctions =
+      wasmObj->getNumImportedFunctions() + wasmObj->functions().size();
+  tableEntries.resize(totalFunctions);
+  for (const WasmElemSegment &seg : wasmObj->elements()) {
+    if (seg.Offset.Opcode != WASM_OPCODE_I32_CONST)
       fatal(toString(this) + ": invalid table elements");
-    uint32_t Offset = Seg.Offset.Value.Int32;
-    for (uint32_t Index = 0; Index < Seg.Functions.size(); Index++) {
+    uint32_t offset = seg.Offset.Value.Int32;
+    for (uint32_t index = 0; index < seg.Functions.size(); index++) {
 
-      uint32_t FunctionIndex = Seg.Functions[Index];
-      TableEntries[FunctionIndex] = Offset + Index;
+      uint32_t functionIndex = seg.Functions[index];
+      tableEntries[functionIndex] = offset + index;
     }
   }
 
-  // Find the code and data sections.  Wasm objects can have at most one code
-  // and one data section.
-  uint32_t SectionIndex = 0;
-  for (const SectionRef &Sec : WasmObj->sections()) {
-    const WasmSection &Section = WasmObj->getWasmSection(Sec);
-    if (Section.Type == WASM_SEC_CODE) {
-      CodeSection = &Section;
-    } else if (Section.Type == WASM_SEC_DATA) {
-      DataSection = &Section;
-    } else if (Section.Type == WASM_SEC_CUSTOM) {
-      CustomSections.emplace_back(make<InputSection>(Section, this));
-      CustomSections.back()->setRelocations(Section.Relocations);
-      CustomSectionsByIndex[SectionIndex] = CustomSections.back();
+  uint32_t sectionIndex = 0;
+
+  // Bool for each symbol, true if called directly.  This allows us to implement
+  // a weaker form of signature checking where undefined functions that are not
+  // called directly (i.e. only address taken) don't have to match the defined
+  // function's signature.  We cannot do this for directly called functions
+  // because those signatures are checked at validation times.
+  // See https://bugs.llvm.org/show_bug.cgi?id=40412
+  std::vector<bool> isCalledDirectly(wasmObj->getNumberOfSymbols(), false);
+  for (const SectionRef &sec : wasmObj->sections()) {
+    const WasmSection &section = wasmObj->getWasmSection(sec);
+    // Wasm objects can have at most one code and one data section.
+    if (section.Type == WASM_SEC_CODE) {
+      assert(!codeSection);
+      codeSection = &section;
+    } else if (section.Type == WASM_SEC_DATA) {
+      assert(!dataSection);
+      dataSection = &section;
+    } else if (section.Type == WASM_SEC_CUSTOM) {
+      customSections.emplace_back(make<InputSection>(section, this));
+      customSections.back()->setRelocations(section.Relocations);
+      customSectionsByIndex[sectionIndex] = customSections.back();
     }
-    SectionIndex++;
+    sectionIndex++;
+    // Scans relocations to dermine determine if a function symbol is called
+    // directly
+    for (const WasmRelocation &reloc : section.Relocations)
+      if (reloc.Type == R_WASM_FUNCTION_INDEX_LEB)
+        isCalledDirectly[reloc.Index] = true;
   }
 
-  TypeMap.resize(getWasmObj()->types().size());
-  TypeIsUsed.resize(getWasmObj()->types().size(), false);
+  typeMap.resize(getWasmObj()->types().size());
+  typeIsUsed.resize(getWasmObj()->types().size(), false);
 
-  ArrayRef<StringRef> Comdats = WasmObj->linkingData().Comdats;
-  UsedComdats.resize(Comdats.size());
-  for (unsigned I = 0; I < Comdats.size(); ++I)
-    UsedComdats[I] = Symtab->addComdat(Comdats[I]);
+  ArrayRef<StringRef> comdats = wasmObj->linkingData().Comdats;
+  for (StringRef comdat : comdats) {
+    bool isNew = ignoreComdats || symtab->addComdat(comdat);
+    keptComdats.push_back(isNew);
+  }
 
   // Populate `Segments`.
-  for (const WasmSegment &S : WasmObj->dataSegments())
-    Segments.emplace_back(make<InputSegment>(S, this));
-  setRelocs(Segments, DataSection);
+  for (const WasmSegment &s : wasmObj->dataSegments()) {
+    auto* seg = make<InputSegment>(s, this);
+    seg->discarded = isExcludedByComdat(seg);
+    segments.emplace_back(seg);
+  }
+  setRelocs(segments, dataSection);
 
   // Populate `Functions`.
-  ArrayRef<WasmFunction> Funcs = WasmObj->functions();
-  ArrayRef<uint32_t> FuncTypes = WasmObj->functionTypes();
-  ArrayRef<WasmSignature> Types = WasmObj->types();
-  Functions.reserve(Funcs.size());
+  ArrayRef<WasmFunction> funcs = wasmObj->functions();
+  ArrayRef<uint32_t> funcTypes = wasmObj->functionTypes();
+  ArrayRef<WasmSignature> types = wasmObj->types();
+  functions.reserve(funcs.size());
 
-  for (size_t I = 0, E = Funcs.size(); I != E; ++I)
-    Functions.emplace_back(
-        make<InputFunction>(Types[FuncTypes[I]], &Funcs[I], this));
-  setRelocs(Functions, CodeSection);
+  for (size_t i = 0, e = funcs.size(); i != e; ++i) {
+    auto* func = make<InputFunction>(types[funcTypes[i]], &funcs[i], this);
+    func->discarded = isExcludedByComdat(func);
+    functions.emplace_back(func);
+  }
+  setRelocs(functions, codeSection);
 
   // Populate `Globals`.
-  for (const WasmGlobal &G : WasmObj->globals())
-    Globals.emplace_back(make<InputGlobal>(G, this));
+  for (const WasmGlobal &g : wasmObj->globals())
+    globals.emplace_back(make<InputGlobal>(g, this));
 
   // Populate `Events`.
-  for (const WasmEvent &E : WasmObj->events())
-    Events.emplace_back(make<InputEvent>(Types[E.Type.SigIndex], E, this));
+  for (const WasmEvent &e : wasmObj->events())
+    events.emplace_back(make<InputEvent>(types[e.Type.SigIndex], e, this));
 
-  // Populate `Symbols` based on the WasmSymbols in the object.
-  Symbols.reserve(WasmObj->getNumberOfSymbols());
-  for (const SymbolRef &Sym : WasmObj->symbols()) {
-    const WasmSymbol &WasmSym = WasmObj->getWasmSymbol(Sym.getRawDataRefImpl());
-    if (Symbol *Sym = createDefined(WasmSym))
-      Symbols.push_back(Sym);
-    else
-      Symbols.push_back(createUndefined(WasmSym));
+  // Populate `Symbols` based on the symbols in the object.
+  symbols.reserve(wasmObj->getNumberOfSymbols());
+  for (const SymbolRef &sym : wasmObj->symbols()) {
+    const WasmSymbol &wasmSym = wasmObj->getWasmSymbol(sym.getRawDataRefImpl());
+    if (wasmSym.isDefined()) {
+      // createDefined may fail if the symbol is comdat excluded in which case
+      // we fall back to creating an undefined symbol
+      if (Symbol *d = createDefined(wasmSym)) {
+        symbols.push_back(d);
+        continue;
+      }
+    }
+    size_t idx = symbols.size();
+    symbols.push_back(createUndefined(wasmSym, isCalledDirectly[idx]));
   }
 }
 
-bool ObjFile::isExcludedByComdat(InputChunk *Chunk) const {
-  uint32_t C = Chunk->getComdat();
-  if (C == UINT32_MAX)
+bool ObjFile::isExcludedByComdat(InputChunk *chunk) const {
+  uint32_t c = chunk->getComdat();
+  if (c == UINT32_MAX)
     return false;
-  return !UsedComdats[C];
+  return !keptComdats[c];
 }
 
-FunctionSymbol *ObjFile::getFunctionSymbol(uint32_t Index) const {
-  return cast<FunctionSymbol>(Symbols[Index]);
+FunctionSymbol *ObjFile::getFunctionSymbol(uint32_t index) const {
+  return cast<FunctionSymbol>(symbols[index]);
 }
 
-GlobalSymbol *ObjFile::getGlobalSymbol(uint32_t Index) const {
-  return cast<GlobalSymbol>(Symbols[Index]);
+GlobalSymbol *ObjFile::getGlobalSymbol(uint32_t index) const {
+  return cast<GlobalSymbol>(symbols[index]);
 }
 
-EventSymbol *ObjFile::getEventSymbol(uint32_t Index) const {
-  return cast<EventSymbol>(Symbols[Index]);
+EventSymbol *ObjFile::getEventSymbol(uint32_t index) const {
+  return cast<EventSymbol>(symbols[index]);
 }
 
-SectionSymbol *ObjFile::getSectionSymbol(uint32_t Index) const {
-  return cast<SectionSymbol>(Symbols[Index]);
+SectionSymbol *ObjFile::getSectionSymbol(uint32_t index) const {
+  return cast<SectionSymbol>(symbols[index]);
 }
 
-DataSymbol *ObjFile::getDataSymbol(uint32_t Index) const {
-  return cast<DataSymbol>(Symbols[Index]);
+DataSymbol *ObjFile::getDataSymbol(uint32_t index) const {
+  return cast<DataSymbol>(symbols[index]);
 }
 
-Symbol *ObjFile::createDefined(const WasmSymbol &Sym) {
-  if (!Sym.isDefined())
-    return nullptr;
+Symbol *ObjFile::createDefined(const WasmSymbol &sym) {
+  StringRef name = sym.Info.Name;
+  uint32_t flags = sym.Info.Flags;
 
-  StringRef Name = Sym.Info.Name;
-  uint32_t Flags = Sym.Info.Flags;
-
-  switch (Sym.Info.Kind) {
+  switch (sym.Info.Kind) {
   case WASM_SYMBOL_TYPE_FUNCTION: {
-    InputFunction *Func =
-        Functions[Sym.Info.ElementIndex - WasmObj->getNumImportedFunctions()];
-    if (isExcludedByComdat(Func)) {
-      Func->Live = false;
+    InputFunction *func =
+        functions[sym.Info.ElementIndex - wasmObj->getNumImportedFunctions()];
+    if (sym.isBindingLocal())
+      return make<DefinedFunction>(name, flags, this, func);
+    if (func->discarded)
       return nullptr;
-    }
-
-    if (Sym.isBindingLocal())
-      return make<DefinedFunction>(Name, Flags, this, Func);
-    return Symtab->addDefinedFunction(Name, Flags, this, Func);
+    return symtab->addDefinedFunction(name, flags, this, func);
   }
   case WASM_SYMBOL_TYPE_DATA: {
-    InputSegment *Seg = Segments[Sym.Info.DataRef.Segment];
-    if (isExcludedByComdat(Seg)) {
-      Seg->Live = false;
+    InputSegment *seg = segments[sym.Info.DataRef.Segment];
+    uint32_t offset = sym.Info.DataRef.Offset;
+    uint32_t size = sym.Info.DataRef.Size;
+    if (sym.isBindingLocal())
+      return make<DefinedData>(name, flags, this, seg, offset, size);
+    if (seg->discarded)
       return nullptr;
-    }
-
-    uint32_t Offset = Sym.Info.DataRef.Offset;
-    uint32_t Size = Sym.Info.DataRef.Size;
-
-    if (Sym.isBindingLocal())
-      return make<DefinedData>(Name, Flags, this, Seg, Offset, Size);
-    return Symtab->addDefinedData(Name, Flags, this, Seg, Offset, Size);
+    return symtab->addDefinedData(name, flags, this, seg, offset, size);
   }
   case WASM_SYMBOL_TYPE_GLOBAL: {
-    InputGlobal *Global =
-        Globals[Sym.Info.ElementIndex - WasmObj->getNumImportedGlobals()];
-    if (Sym.isBindingLocal())
-      return make<DefinedGlobal>(Name, Flags, this, Global);
-    return Symtab->addDefinedGlobal(Name, Flags, this, Global);
+    InputGlobal *global =
+        globals[sym.Info.ElementIndex - wasmObj->getNumImportedGlobals()];
+    if (sym.isBindingLocal())
+      return make<DefinedGlobal>(name, flags, this, global);
+    return symtab->addDefinedGlobal(name, flags, this, global);
   }
   case WASM_SYMBOL_TYPE_SECTION: {
-    InputSection *Section = CustomSectionsByIndex[Sym.Info.ElementIndex];
-    assert(Sym.isBindingLocal());
-    return make<SectionSymbol>(Name, Flags, Section, this);
+    InputSection *section = customSectionsByIndex[sym.Info.ElementIndex];
+    assert(sym.isBindingLocal());
+    return make<SectionSymbol>(flags, section, this);
   }
   case WASM_SYMBOL_TYPE_EVENT: {
-    InputEvent *Event =
-        Events[Sym.Info.ElementIndex - WasmObj->getNumImportedEvents()];
-    if (Sym.isBindingLocal())
-      return make<DefinedEvent>(Name, Flags, this, Event);
-    return Symtab->addDefinedEvent(Name, Flags, this, Event);
+    InputEvent *event =
+        events[sym.Info.ElementIndex - wasmObj->getNumImportedEvents()];
+    if (sym.isBindingLocal())
+      return make<DefinedEvent>(name, flags, this, event);
+    return symtab->addDefinedEvent(name, flags, this, event);
   }
   }
   llvm_unreachable("unknown symbol kind");
 }
 
-Symbol *ObjFile::createUndefined(const WasmSymbol &Sym) {
-  StringRef Name = Sym.Info.Name;
-  uint32_t Flags = Sym.Info.Flags;
+Symbol *ObjFile::createUndefined(const WasmSymbol &sym, bool isCalledDirectly) {
+  StringRef name = sym.Info.Name;
+  uint32_t flags = sym.Info.Flags;
 
-  switch (Sym.Info.Kind) {
+  switch (sym.Info.Kind) {
   case WASM_SYMBOL_TYPE_FUNCTION:
-    return Symtab->addUndefinedFunction(Name, Sym.Info.ImportName,
-                                        Sym.Info.ImportModule, Flags, this,
-                                        Sym.Signature);
+    if (sym.isBindingLocal())
+      return make<UndefinedFunction>(name, sym.Info.ImportName,
+                                     sym.Info.ImportModule, flags, this,
+                                     sym.Signature, isCalledDirectly);
+    return symtab->addUndefinedFunction(name, sym.Info.ImportName,
+                                        sym.Info.ImportModule, flags, this,
+                                        sym.Signature, isCalledDirectly);
   case WASM_SYMBOL_TYPE_DATA:
-    return Symtab->addUndefinedData(Name, Flags, this);
+    if (sym.isBindingLocal())
+      return make<UndefinedData>(name, flags, this);
+    return symtab->addUndefinedData(name, flags, this);
   case WASM_SYMBOL_TYPE_GLOBAL:
-    return Symtab->addUndefinedGlobal(Name, Sym.Info.ImportName,
-                                      Sym.Info.ImportModule, Flags, this,
-                                      Sym.GlobalType);
+    if (sym.isBindingLocal())
+      return make<UndefinedGlobal>(name, sym.Info.ImportName,
+                                   sym.Info.ImportModule, flags, this,
+                                   sym.GlobalType);
+    return symtab->addUndefinedGlobal(name, sym.Info.ImportName,
+                                      sym.Info.ImportModule, flags, this,
+                                      sym.GlobalType);
   case WASM_SYMBOL_TYPE_SECTION:
     llvm_unreachable("section symbols cannot be undefined");
   }
@@ -395,42 +453,41 @@ Symbol *ObjFile::createUndefined(const WasmSymbol &Sym) {
 void ArchiveFile::parse() {
   // Parse a MemoryBufferRef as an archive file.
   LLVM_DEBUG(dbgs() << "Parsing library: " << toString(this) << "\n");
-  File = CHECK(Archive::create(MB), toString(this));
+  file = CHECK(Archive::create(mb), toString(this));
 
   // Read the symbol table to construct Lazy symbols.
-  int Count = 0;
-  for (const Archive::Symbol &Sym : File->symbols()) {
-    Symtab->addLazy(this, &Sym);
-    ++Count;
+  int count = 0;
+  for (const Archive::Symbol &sym : file->symbols()) {
+    symtab->addLazy(this, &sym);
+    ++count;
   }
-  LLVM_DEBUG(dbgs() << "Read " << Count << " symbols\n");
+  LLVM_DEBUG(dbgs() << "Read " << count << " symbols\n");
 }
 
-void ArchiveFile::addMember(const Archive::Symbol *Sym) {
-  const Archive::Child &C =
-      CHECK(Sym->getMember(),
-            "could not get the member for symbol " + Sym->getName());
+void ArchiveFile::addMember(const Archive::Symbol *sym) {
+  const Archive::Child &c =
+      CHECK(sym->getMember(),
+            "could not get the member for symbol " + sym->getName());
 
   // Don't try to load the same member twice (this can happen when members
   // mutually reference each other).
-  if (!Seen.insert(C.getChildOffset()).second)
+  if (!seen.insert(c.getChildOffset()).second)
     return;
 
-  LLVM_DEBUG(dbgs() << "loading lazy: " << Sym->getName() << "\n");
+  LLVM_DEBUG(dbgs() << "loading lazy: " << sym->getName() << "\n");
   LLVM_DEBUG(dbgs() << "from archive: " << toString(this) << "\n");
 
-  MemoryBufferRef MB =
-      CHECK(C.getMemoryBufferRef(),
+  MemoryBufferRef mb =
+      CHECK(c.getMemoryBufferRef(),
             "could not get the buffer for the member defining symbol " +
-                Sym->getName());
+                sym->getName());
 
-  InputFile *Obj = createObjectFile(MB);
-  Obj->ArchiveName = getName();
-  Symtab->addFile(Obj);
+  InputFile *obj = createObjectFile(mb, getName());
+  symtab->addFile(obj);
 }
 
-static uint8_t mapVisibility(GlobalValue::VisibilityTypes GvVisibility) {
-  switch (GvVisibility) {
+static uint8_t mapVisibility(GlobalValue::VisibilityTypes gvVisibility) {
+  switch (gvVisibility) {
   case GlobalValue::DefaultVisibility:
     return WASM_SYMBOL_VISIBILITY_DEFAULT;
   case GlobalValue::HiddenVisibility:
@@ -440,45 +497,52 @@ static uint8_t mapVisibility(GlobalValue::VisibilityTypes GvVisibility) {
   llvm_unreachable("unknown visibility");
 }
 
-static Symbol *createBitcodeSymbol(const lto::InputFile::Symbol &ObjSym,
-                                   BitcodeFile &F) {
-  StringRef Name = Saver.save(ObjSym.getName());
+static Symbol *createBitcodeSymbol(const std::vector<bool> &keptComdats,
+                                   const lto::InputFile::Symbol &objSym,
+                                   BitcodeFile &f) {
+  StringRef name = saver.save(objSym.getName());
 
-  uint32_t Flags = ObjSym.isWeak() ? WASM_SYMBOL_BINDING_WEAK : 0;
-  Flags |= mapVisibility(ObjSym.getVisibility());
+  uint32_t flags = objSym.isWeak() ? WASM_SYMBOL_BINDING_WEAK : 0;
+  flags |= mapVisibility(objSym.getVisibility());
 
-  if (ObjSym.isUndefined()) {
-    if (ObjSym.isExecutable())
-      return Symtab->addUndefinedFunction(Name, Name, DefaultModule, Flags, &F,
-                                          nullptr);
-    return Symtab->addUndefinedData(Name, Flags, &F);
+  int c = objSym.getComdatIndex();
+  bool excludedByComdat = c != -1 && !keptComdats[c];
+
+  if (objSym.isUndefined() || excludedByComdat) {
+    if (objSym.isExecutable())
+      return symtab->addUndefinedFunction(name, name, defaultModule, flags, &f,
+                                          nullptr, true);
+    return symtab->addUndefinedData(name, flags, &f);
   }
 
-  if (ObjSym.isExecutable())
-    return Symtab->addDefinedFunction(Name, Flags, &F, nullptr);
-  return Symtab->addDefinedData(Name, Flags, &F, nullptr, 0, 0);
+  if (objSym.isExecutable())
+    return symtab->addDefinedFunction(name, flags, &f, nullptr);
+  return symtab->addDefinedData(name, flags, &f, nullptr, 0, 0);
 }
 
 void BitcodeFile::parse() {
-  Obj = check(lto::InputFile::create(MemoryBufferRef(
-      MB.getBuffer(), Saver.save(ArchiveName + MB.getBufferIdentifier()))));
-  Triple T(Obj->getTargetTriple());
-  if (T.getArch() != Triple::wasm32) {
-    error(toString(MB.getBufferIdentifier()) + ": machine type must be wasm32");
+  obj = check(lto::InputFile::create(MemoryBufferRef(
+      mb.getBuffer(), saver.save(archiveName + mb.getBufferIdentifier()))));
+  Triple t(obj->getTargetTriple());
+  if (t.getArch() != Triple::wasm32) {
+    error(toString(mb.getBufferIdentifier()) + ": machine type must be wasm32");
     return;
   }
+  std::vector<bool> keptComdats;
+  for (StringRef s : obj->getComdatTable())
+    keptComdats.push_back(symtab->addComdat(s));
 
-  for (const lto::InputFile::Symbol &ObjSym : Obj->symbols())
-    Symbols.push_back(createBitcodeSymbol(ObjSym, *this));
+  for (const lto::InputFile::Symbol &objSym : obj->symbols())
+    symbols.push_back(createBitcodeSymbol(keptComdats, objSym, *this));
 }
 
 // Returns a string in the format of "foo.o" or "foo.a(bar.o)".
-std::string lld::toString(const wasm::InputFile *File) {
-  if (!File)
+std::string lld::toString(const wasm::InputFile *file) {
+  if (!file)
     return "<internal>";
 
-  if (File->ArchiveName.empty())
-    return File->getName();
+  if (file->archiveName.empty())
+    return file->getName();
 
-  return (File->ArchiveName + "(" + File->getName() + ")").str();
+  return (file->archiveName + "(" + file->getName() + ")").str();
 }
diff --git a/deps/lld/wasm/InputFiles.h b/deps/lld/wasm/InputFiles.h
index bcda9cc8ee92d9468c32a9872c93672f54581885..2b25906f4435097c84f7d4685c9cbd471e561788 100644
--- a/deps/lld/wasm/InputFiles.h
+++ b/deps/lld/wasm/InputFiles.h
@@ -1,9 +1,8 @@
 //===- InputFiles.h ---------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -20,6 +19,10 @@
 #include "llvm/Support/MemoryBuffer.h"
 #include <vector>
 
+namespace llvm {
+class TarWriter;
+}
+
 namespace lld {
 namespace wasm {
 
@@ -30,10 +33,15 @@ class InputGlobal;
 class InputEvent;
 class InputSection;
 
+// If --reproduce option is given, all input files are written
+// to this tar archive.
+extern std::unique_ptr<llvm::TarWriter> tar;
+
 class InputFile {
 public:
   enum Kind {
     ObjectKind,
+    SharedKind,
     ArchiveKind,
     BitcodeKind,
   };
@@ -41,113 +49,129 @@ public:
   virtual ~InputFile() {}
 
   // Returns the filename.
-  StringRef getName() const { return MB.getBufferIdentifier(); }
+  StringRef getName() const { return mb.getBufferIdentifier(); }
 
-  // Reads a file (the constructor doesn't do that).
-  virtual void parse() = 0;
-
-  Kind kind() const { return FileKind; }
+  Kind kind() const { return fileKind; }
 
   // An archive file name if this file is created from an archive.
-  StringRef ArchiveName;
+  StringRef archiveName;
 
-  ArrayRef<Symbol *> getSymbols() const { return Symbols; }
+  ArrayRef<Symbol *> getSymbols() const { return symbols; }
+
+  MutableArrayRef<Symbol *> getMutableSymbols() { return symbols; }
 
 protected:
-  InputFile(Kind K, MemoryBufferRef M) : MB(M), FileKind(K) {}
-  MemoryBufferRef MB;
+  InputFile(Kind k, MemoryBufferRef m) : mb(m), fileKind(k) {}
+  MemoryBufferRef mb;
 
   // List of all symbols referenced or defined by this file.
-  std::vector<Symbol *> Symbols;
+  std::vector<Symbol *> symbols;
 
 private:
-  const Kind FileKind;
+  const Kind fileKind;
 };
 
 // .a file (ar archive)
 class ArchiveFile : public InputFile {
 public:
-  explicit ArchiveFile(MemoryBufferRef M) : InputFile(ArchiveKind, M) {}
-  static bool classof(const InputFile *F) { return F->kind() == ArchiveKind; }
+  explicit ArchiveFile(MemoryBufferRef m) : InputFile(ArchiveKind, m) {}
+  static bool classof(const InputFile *f) { return f->kind() == ArchiveKind; }
 
-  void addMember(const llvm::object::Archive::Symbol *Sym);
+  void addMember(const llvm::object::Archive::Symbol *sym);
 
-  void parse() override;
+  void parse();
 
 private:
-  std::unique_ptr<llvm::object::Archive> File;
-  llvm::DenseSet<uint64_t> Seen;
+  std::unique_ptr<llvm::object::Archive> file;
+  llvm::DenseSet<uint64_t> seen;
 };
 
 // .o file (wasm object file)
 class ObjFile : public InputFile {
 public:
-  explicit ObjFile(MemoryBufferRef M) : InputFile(ObjectKind, M) {}
-  static bool classof(const InputFile *F) { return F->kind() == ObjectKind; }
+  explicit ObjFile(MemoryBufferRef m, StringRef archiveName)
+      : InputFile(ObjectKind, m) {
+    this->archiveName = archiveName;
+  }
+  static bool classof(const InputFile *f) { return f->kind() == ObjectKind; }
 
-  void parse() override;
+  void parse(bool ignoreComdats = false);
 
   // Returns the underlying wasm file.
-  const WasmObjectFile *getWasmObj() const { return WasmObj.get(); }
+  const WasmObjectFile *getWasmObj() const { return wasmObj.get(); }
 
   void dumpInfo() const;
 
-  uint32_t calcNewIndex(const WasmRelocation &Reloc) const;
-  uint32_t calcNewValue(const WasmRelocation &Reloc) const;
-  uint32_t calcNewAddend(const WasmRelocation &Reloc) const;
-  uint32_t calcExpectedValue(const WasmRelocation &Reloc) const;
+  uint32_t calcNewIndex(const WasmRelocation &reloc) const;
+  uint32_t calcNewValue(const WasmRelocation &reloc) const;
+  uint32_t calcNewAddend(const WasmRelocation &reloc) const;
+  uint32_t calcExpectedValue(const WasmRelocation &reloc) const;
+  Symbol *getSymbol(const WasmRelocation &reloc) const {
+    return symbols[reloc.Index];
+  };
 
-  const WasmSection *CodeSection = nullptr;
-  const WasmSection *DataSection = nullptr;
+  const WasmSection *codeSection = nullptr;
+  const WasmSection *dataSection = nullptr;
 
   // Maps input type indices to output type indices
-  std::vector<uint32_t> TypeMap;
-  std::vector<bool> TypeIsUsed;
+  std::vector<uint32_t> typeMap;
+  std::vector<bool> typeIsUsed;
   // Maps function indices to table indices
-  std::vector<uint32_t> TableEntries;
-  std::vector<bool> UsedComdats;
-  std::vector<InputSegment *> Segments;
-  std::vector<InputFunction *> Functions;
-  std::vector<InputGlobal *> Globals;
-  std::vector<InputEvent *> Events;
-  std::vector<InputSection *> CustomSections;
-  llvm::DenseMap<uint32_t, InputSection *> CustomSectionsByIndex;
+  std::vector<uint32_t> tableEntries;
+  std::vector<bool> keptComdats;
+  std::vector<InputSegment *> segments;
+  std::vector<InputFunction *> functions;
+  std::vector<InputGlobal *> globals;
+  std::vector<InputEvent *> events;
+  std::vector<InputSection *> customSections;
+  llvm::DenseMap<uint32_t, InputSection *> customSectionsByIndex;
 
-  Symbol *getSymbol(uint32_t Index) const { return Symbols[Index]; }
-  FunctionSymbol *getFunctionSymbol(uint32_t Index) const;
-  DataSymbol *getDataSymbol(uint32_t Index) const;
-  GlobalSymbol *getGlobalSymbol(uint32_t Index) const;
-  SectionSymbol *getSectionSymbol(uint32_t Index) const;
-  EventSymbol *getEventSymbol(uint32_t Index) const;
+  Symbol *getSymbol(uint32_t index) const { return symbols[index]; }
+  FunctionSymbol *getFunctionSymbol(uint32_t index) const;
+  DataSymbol *getDataSymbol(uint32_t index) const;
+  GlobalSymbol *getGlobalSymbol(uint32_t index) const;
+  SectionSymbol *getSectionSymbol(uint32_t index) const;
+  EventSymbol *getEventSymbol(uint32_t index) const;
 
 private:
-  Symbol *createDefined(const WasmSymbol &Sym);
-  Symbol *createUndefined(const WasmSymbol &Sym);
+  Symbol *createDefined(const WasmSymbol &sym);
+  Symbol *createUndefined(const WasmSymbol &sym, bool isCalledDirectly);
 
-  bool isExcludedByComdat(InputChunk *Chunk) const;
+  bool isExcludedByComdat(InputChunk *chunk) const;
 
-  std::unique_ptr<WasmObjectFile> WasmObj;
+  std::unique_ptr<WasmObjectFile> wasmObj;
 };
 
+// .so file.
+class SharedFile : public InputFile {
+public:
+  explicit SharedFile(MemoryBufferRef m) : InputFile(SharedKind, m) {}
+  static bool classof(const InputFile *f) { return f->kind() == SharedKind; }
+};
+
+// .bc file
 class BitcodeFile : public InputFile {
 public:
-  explicit BitcodeFile(MemoryBufferRef M) : InputFile(BitcodeKind, M) {}
-  static bool classof(const InputFile *F) { return F->kind() == BitcodeKind; }
+  explicit BitcodeFile(MemoryBufferRef m, StringRef archiveName)
+      : InputFile(BitcodeKind, m) {
+    this->archiveName = archiveName;
+  }
+  static bool classof(const InputFile *f) { return f->kind() == BitcodeKind; }
 
-  void parse() override;
-  std::unique_ptr<llvm::lto::InputFile> Obj;
+  void parse();
+  std::unique_ptr<llvm::lto::InputFile> obj;
 };
 
 // Will report a fatal() error if the input buffer is not a valid bitcode
-// or was object file.
-InputFile *createObjectFile(MemoryBufferRef MB);
+// or wasm object file.
+InputFile *createObjectFile(MemoryBufferRef mb, StringRef archiveName = "");
 
 // Opens a given file.
-llvm::Optional<MemoryBufferRef> readFile(StringRef Path);
+llvm::Optional<MemoryBufferRef> readFile(StringRef path);
 
 } // namespace wasm
 
-std::string toString(const wasm::InputFile *File);
+std::string toString(const wasm::InputFile *file);
 
 } // namespace lld
 
diff --git a/deps/lld/wasm/InputGlobal.h b/deps/lld/wasm/InputGlobal.h
index 3b20600b22e85c01217196514fcbbc71f5231544..89cde8423c8d213c22029aeaeb389b658c096440 100644
--- a/deps/lld/wasm/InputGlobal.h
+++ b/deps/lld/wasm/InputGlobal.h
@@ -1,9 +1,8 @@
 //===- InputGlobal.h --------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -23,32 +22,32 @@ namespace wasm {
 // combined to form the final GLOBALS section.
 class InputGlobal {
 public:
-  InputGlobal(const WasmGlobal &G, ObjFile *F)
-      : File(F), Global(G), Live(!Config->GcSections) {}
+  InputGlobal(const WasmGlobal &g, ObjFile *f)
+      : file(f), global(g), live(!config->gcSections) {}
 
-  StringRef getName() const { return Global.SymbolName; }
-  const WasmGlobalType &getType() const { return Global.Type; }
+  StringRef getName() const { return global.SymbolName; }
+  const WasmGlobalType &getType() const { return global.Type; }
 
-  uint32_t getGlobalIndex() const { return GlobalIndex.getValue(); }
-  bool hasGlobalIndex() const { return GlobalIndex.hasValue(); }
-  void setGlobalIndex(uint32_t Index) {
+  uint32_t getGlobalIndex() const { return globalIndex.getValue(); }
+  bool hasGlobalIndex() const { return globalIndex.hasValue(); }
+  void setGlobalIndex(uint32_t index) {
     assert(!hasGlobalIndex());
-    GlobalIndex = Index;
+    globalIndex = index;
   }
 
-  ObjFile *File;
-  WasmGlobal Global;
+  ObjFile *file;
+  WasmGlobal global;
 
-  bool Live = false;
+  bool live = false;
 
 protected:
-  llvm::Optional<uint32_t> GlobalIndex;
+  llvm::Optional<uint32_t> globalIndex;
 };
 
 } // namespace wasm
 
-inline std::string toString(const wasm::InputGlobal *G) {
-  return (toString(G->File) + ":(" + G->getName() + ")").str();
+inline std::string toString(const wasm::InputGlobal *g) {
+  return (toString(g->file) + ":(" + g->getName() + ")").str();
 }
 
 } // namespace lld
diff --git a/deps/lld/wasm/LTO.cpp b/deps/lld/wasm/LTO.cpp
index e994691cceb2e01346f249d220eaf7d1f10c8629..fa48f4db7fd88c8264ba79e5ea129a5481fc8f93 100644
--- a/deps/lld/wasm/LTO.cpp
+++ b/deps/lld/wasm/LTO.cpp
@@ -1,9 +1,8 @@
 //===- LTO.cpp ------------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -11,6 +10,7 @@
 #include "Config.h"
 #include "InputFiles.h"
 #include "Symbols.h"
+#include "lld/Common/Args.h"
 #include "lld/Common/ErrorHandler.h"
 #include "lld/Common/Strings.h"
 #include "lld/Common/TargetOptionsCommandFlags.h"
@@ -40,124 +40,127 @@ using namespace lld;
 using namespace lld::wasm;
 
 static std::unique_ptr<lto::LTO> createLTO() {
-  lto::Config C;
-  C.Options = InitTargetOptionsFromCodeGenFlags();
+  lto::Config c;
+  c.Options = initTargetOptionsFromCodeGenFlags();
 
   // Always emit a section per function/data with LTO.
-  C.Options.FunctionSections = true;
-  C.Options.DataSections = true;
+  c.Options.FunctionSections = true;
+  c.Options.DataSections = true;
 
-  // Wasm currently only supports ThreadModel::Single
-  C.Options.ThreadModel = ThreadModel::Single;
+  c.DisableVerify = config->disableVerify;
+  c.DiagHandler = diagnosticHandler;
+  c.OptLevel = config->ltoo;
+  c.MAttrs = getMAttrs();
+  c.CGOptLevel = args::getCGOptLevel(config->ltoo);
 
-  C.DisableVerify = Config->DisableVerify;
-  C.DiagHandler = diagnosticHandler;
-  C.OptLevel = Config->LTOO;
-  C.MAttrs = GetMAttrs();
-
-  if (Config->Relocatable)
-    C.RelocModel = None;
-  else if (Config->Pic)
-    C.RelocModel = Reloc::PIC_;
+  if (config->relocatable)
+    c.RelocModel = None;
+  else if (config->isPic)
+    c.RelocModel = Reloc::PIC_;
   else
-    C.RelocModel = Reloc::Static;
+    c.RelocModel = Reloc::Static;
 
-  if (Config->SaveTemps)
-    checkError(C.addSaveTemps(Config->OutputFile.str() + ".",
+  if (config->saveTemps)
+    checkError(c.addSaveTemps(config->outputFile.str() + ".",
                               /*UseInputModulePath*/ true));
 
-  lto::ThinBackend Backend;
-  if (Config->ThinLTOJobs != -1U)
-    Backend = lto::createInProcessThinBackend(Config->ThinLTOJobs);
-  return llvm::make_unique<lto::LTO>(std::move(C), Backend,
-                                     Config->LTOPartitions);
+  lto::ThinBackend backend;
+  if (config->thinLTOJobs != -1U)
+    backend = lto::createInProcessThinBackend(config->thinLTOJobs);
+  return llvm::make_unique<lto::LTO>(std::move(c), backend,
+                                     config->ltoPartitions);
 }
 
-BitcodeCompiler::BitcodeCompiler() : LTOObj(createLTO()) {}
+BitcodeCompiler::BitcodeCompiler() : ltoObj(createLTO()) {}
 
 BitcodeCompiler::~BitcodeCompiler() = default;
 
-static void undefine(Symbol *S) {
-  if (auto F = dyn_cast<DefinedFunction>(S))
-    replaceSymbol<UndefinedFunction>(F, F->getName(), F->getName(),
-                                     DefaultModule, 0,
-                                     F->getFile(), F->Signature);
-  else if (isa<DefinedData>(S))
-    replaceSymbol<UndefinedData>(S, S->getName(), 0, S->getFile());
+static void undefine(Symbol *s) {
+  if (auto f = dyn_cast<DefinedFunction>(s))
+    replaceSymbol<UndefinedFunction>(f, f->getName(), f->getName(),
+                                     defaultModule, 0,
+                                     f->getFile(), f->signature);
+  else if (isa<DefinedData>(s))
+    replaceSymbol<UndefinedData>(s, s->getName(), 0, s->getFile());
   else
     llvm_unreachable("unexpected symbol kind");
 }
 
-void BitcodeCompiler::add(BitcodeFile &F) {
-  lto::InputFile &Obj = *F.Obj;
-  unsigned SymNum = 0;
-  ArrayRef<Symbol *> Syms = F.getSymbols();
-  std::vector<lto::SymbolResolution> Resols(Syms.size());
+void BitcodeCompiler::add(BitcodeFile &f) {
+  lto::InputFile &obj = *f.obj;
+  unsigned symNum = 0;
+  ArrayRef<Symbol *> syms = f.getSymbols();
+  std::vector<lto::SymbolResolution> resols(syms.size());
 
   // Provide a resolution to the LTO API for each symbol.
-  for (const lto::InputFile::Symbol &ObjSym : Obj.symbols()) {
-    Symbol *Sym = Syms[SymNum];
-    lto::SymbolResolution &R = Resols[SymNum];
-    ++SymNum;
+  for (const lto::InputFile::Symbol &objSym : obj.symbols()) {
+    Symbol *sym = syms[symNum];
+    lto::SymbolResolution &r = resols[symNum];
+    ++symNum;
 
     // Ideally we shouldn't check for SF_Undefined but currently IRObjectFile
     // reports two symbols for module ASM defined. Without this check, lld
     // flags an undefined in IR with a definition in ASM as prevailing.
     // Once IRObjectFile is fixed to report only one symbol this hack can
     // be removed.
-    R.Prevailing = !ObjSym.isUndefined() && Sym->getFile() == &F;
-    R.VisibleToRegularObj = Config->Relocatable || Sym->IsUsedInRegularObj ||
-                            (R.Prevailing && Sym->isExported());
-    if (R.Prevailing)
-      undefine(Sym);
+    r.Prevailing = !objSym.isUndefined() && sym->getFile() == &f;
+    r.VisibleToRegularObj = config->relocatable || sym->isUsedInRegularObj ||
+                            (r.Prevailing && sym->isExported());
+    if (r.Prevailing)
+      undefine(sym);
+
+    // We tell LTO to not apply interprocedural optimization for wrapped
+    // (with --wrap) symbols because otherwise LTO would inline them while
+    // their values are still not final.
+    r.LinkerRedefined = !sym->canInline;
   }
-  checkError(LTOObj->add(std::move(F.Obj), Resols));
+  checkError(ltoObj->add(std::move(f.obj), resols));
 }
 
 // Merge all the bitcode files we have seen, codegen the result
 // and return the resulting objects.
 std::vector<StringRef> BitcodeCompiler::compile() {
-  unsigned MaxTasks = LTOObj->getMaxTasks();
-  Buf.resize(MaxTasks);
-  Files.resize(MaxTasks);
+  unsigned maxTasks = ltoObj->getMaxTasks();
+  buf.resize(maxTasks);
+  files.resize(maxTasks);
 
   // The --thinlto-cache-dir option specifies the path to a directory in which
   // to cache native object files for ThinLTO incremental builds. If a path was
   // specified, configure LTO to use it as the cache directory.
-  lto::NativeObjectCache Cache;
-  if (!Config->ThinLTOCacheDir.empty())
-    Cache = check(
-        lto::localCache(Config->ThinLTOCacheDir,
-                        [&](size_t Task, std::unique_ptr<MemoryBuffer> MB) {
-                          Files[Task] = std::move(MB);
+  lto::NativeObjectCache cache;
+  if (!config->thinLTOCacheDir.empty())
+    cache = check(
+        lto::localCache(config->thinLTOCacheDir,
+                        [&](size_t task, std::unique_ptr<MemoryBuffer> mb) {
+                          files[task] = std::move(mb);
                         }));
 
-  checkError(LTOObj->run(
-      [&](size_t Task) {
+  checkError(ltoObj->run(
+      [&](size_t task) {
         return llvm::make_unique<lto::NativeObjectStream>(
-            llvm::make_unique<raw_svector_ostream>(Buf[Task]));
+            llvm::make_unique<raw_svector_ostream>(buf[task]));
       },
-      Cache));
+      cache));
 
-  if (!Config->ThinLTOCacheDir.empty())
-    pruneCache(Config->ThinLTOCacheDir, Config->ThinLTOCachePolicy);
+  if (!config->thinLTOCacheDir.empty())
+    pruneCache(config->thinLTOCacheDir, config->thinLTOCachePolicy);
 
-  std::vector<StringRef> Ret;
-  for (unsigned I = 0; I != MaxTasks; ++I) {
-    if (Buf[I].empty())
+  std::vector<StringRef> ret;
+  for (unsigned i = 0; i != maxTasks; ++i) {
+    if (buf[i].empty())
       continue;
-    if (Config->SaveTemps) {
-      if (I == 0)
-        saveBuffer(Buf[I], Config->OutputFile + ".lto.o");
+    if (config->saveTemps) {
+      if (i == 0)
+        saveBuffer(buf[i], config->outputFile + ".lto.o");
       else
-        saveBuffer(Buf[I], Config->OutputFile + Twine(I) + ".lto.o");
+        saveBuffer(buf[i], config->outputFile + Twine(i) + ".lto.o");
     }
-    Ret.emplace_back(Buf[I].data(), Buf[I].size());
+    ret.emplace_back(buf[i].data(), buf[i].size());
   }
 
-  for (std::unique_ptr<MemoryBuffer> &File : Files)
-    if (File)
-      Ret.push_back(File->getBuffer());
+  for (std::unique_ptr<MemoryBuffer> &file : files)
+    if (file)
+      ret.push_back(file->getBuffer());
 
-  return Ret;
+  return ret;
 }
diff --git a/deps/lld/wasm/LTO.h b/deps/lld/wasm/LTO.h
index d771301f224dca05f8d27230d4ed9c32f7c05876..9c1e1788ed385977c4a728625a9c15081a48c77f 100644
--- a/deps/lld/wasm/LTO.h
+++ b/deps/lld/wasm/LTO.h
@@ -1,9 +1,8 @@
 //===- LTO.h ----------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -44,13 +43,13 @@ public:
   BitcodeCompiler();
   ~BitcodeCompiler();
 
-  void add(BitcodeFile &F);
+  void add(BitcodeFile &f);
   std::vector<StringRef> compile();
 
 private:
-  std::unique_ptr<llvm::lto::LTO> LTOObj;
-  std::vector<SmallString<0>> Buf;
-  std::vector<std::unique_ptr<MemoryBuffer>> Files;
+  std::unique_ptr<llvm::lto::LTO> ltoObj;
+  std::vector<SmallString<0>> buf;
+  std::vector<std::unique_ptr<MemoryBuffer>> files;
 };
 } // namespace wasm
 } // namespace lld
diff --git a/deps/lld/wasm/MarkLive.cpp b/deps/lld/wasm/MarkLive.cpp
index 723ac4e3c6baa408fa208f1818a5e4b93a690403..9399156b748ce2dff57535ea3bdf1b643854ecde 100644
--- a/deps/lld/wasm/MarkLive.cpp
+++ b/deps/lld/wasm/MarkLive.cpp
@@ -1,9 +1,8 @@
 //===- MarkLive.cpp -------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -33,48 +32,68 @@ using namespace llvm;
 using namespace llvm::wasm;
 
 void lld::wasm::markLive() {
-  if (!Config->GcSections)
+  if (!config->gcSections)
     return;
 
   LLVM_DEBUG(dbgs() << "markLive\n");
-  SmallVector<InputChunk *, 256> Q;
+  SmallVector<InputChunk *, 256> q;
 
-  auto Enqueue = [&](Symbol *Sym) {
-    if (!Sym || Sym->isLive())
+  std::function<void(Symbol*)> enqueue = [&](Symbol *sym) {
+    if (!sym || sym->isLive())
       return;
-    LLVM_DEBUG(dbgs() << "markLive: " << Sym->getName() << "\n");
-    Sym->markLive();
-    if (InputChunk *Chunk = Sym->getChunk())
-      Q.push_back(Chunk);
+    LLVM_DEBUG(dbgs() << "markLive: " << sym->getName() << "\n");
+    sym->markLive();
+    if (InputChunk *chunk = sym->getChunk())
+      q.push_back(chunk);
+
+    // The ctor functions are all referenced by the synthetic callCtors
+    // function.  However, this function does not contain relocations so we
+    // have to manually mark the ctors as live if callCtors itself is live.
+    if (sym == WasmSym::callCtors) {
+      if (config->passiveSegments)
+        enqueue(WasmSym::initMemory);
+      if (config->isPic)
+        enqueue(WasmSym::applyRelocs);
+      for (const ObjFile *obj : symtab->objectFiles) {
+        const WasmLinkingData &l = obj->getWasmObj()->linkingData();
+        for (const WasmInitFunc &f : l.InitFunctions) {
+          auto* initSym = obj->getFunctionSymbol(f.Symbol);
+          if (!initSym->isDiscarded())
+            enqueue(initSym);
+        }
+      }
+    }
   };
 
   // Add GC root symbols.
-  if (!Config->Entry.empty())
-    Enqueue(Symtab->find(Config->Entry));
-  Enqueue(WasmSym::CallCtors);
+  if (!config->entry.empty())
+    enqueue(symtab->find(config->entry));
 
   // We need to preserve any exported symbol
-  for (Symbol *Sym : Symtab->getSymbols())
-    if (Sym->isExported())
-      Enqueue(Sym);
+  for (Symbol *sym : symtab->getSymbols())
+    if (sym->isExported())
+      enqueue(sym);
 
-  // The ctor functions are all used in the synthetic __wasm_call_ctors
-  // function, but since this function is created in-place it doesn't contain
-  // relocations which mean we have to manually mark the ctors.
-  for (const ObjFile *Obj : Symtab->ObjectFiles) {
-    const WasmLinkingData &L = Obj->getWasmObj()->linkingData();
-    for (const WasmInitFunc &F : L.InitFunctions)
-      Enqueue(Obj->getFunctionSymbol(F.Symbol));
+  // For relocatable output, we need to preserve all the ctor functions
+  if (config->relocatable) {
+    for (const ObjFile *obj : symtab->objectFiles) {
+      const WasmLinkingData &l = obj->getWasmObj()->linkingData();
+      for (const WasmInitFunc &f : l.InitFunctions)
+        enqueue(obj->getFunctionSymbol(f.Symbol));
+    }
   }
 
+  if (config->isPic)
+    enqueue(WasmSym::callCtors);
+
   // Follow relocations to mark all reachable chunks.
-  while (!Q.empty()) {
-    InputChunk *C = Q.pop_back_val();
+  while (!q.empty()) {
+    InputChunk *c = q.pop_back_val();
 
-    for (const WasmRelocation Reloc : C->getRelocations()) {
-      if (Reloc.Type == R_WEBASSEMBLY_TYPE_INDEX_LEB)
+    for (const WasmRelocation reloc : c->getRelocations()) {
+      if (reloc.Type == R_WASM_TYPE_INDEX_LEB)
         continue;
-      Symbol *Sym = C->File->getSymbol(Reloc.Index);
+      Symbol *sym = c->file->getSymbol(reloc.Index);
 
       // If the function has been assigned the special index zero in the table,
       // the relocation doesn't pull in the function body, since the function
@@ -83,38 +102,38 @@ void lld::wasm::markLive() {
       // zero is only reachable via "call", not via "call_indirect".  The stub
       // functions used for weak-undefined symbols have this behaviour (compare
       // equal to null pointer, only reachable via direct call).
-      if (Reloc.Type == R_WEBASSEMBLY_TABLE_INDEX_SLEB ||
-          Reloc.Type == R_WEBASSEMBLY_TABLE_INDEX_I32) {
-        auto *FuncSym = cast<FunctionSymbol>(Sym);
-        if (FuncSym->hasTableIndex() && FuncSym->getTableIndex() == 0)
+      if (reloc.Type == R_WASM_TABLE_INDEX_SLEB ||
+          reloc.Type == R_WASM_TABLE_INDEX_I32) {
+        auto *funcSym = cast<FunctionSymbol>(sym);
+        if (funcSym->hasTableIndex() && funcSym->getTableIndex() == 0)
           continue;
       }
 
-      Enqueue(Sym);
+      enqueue(sym);
     }
   }
 
   // Report garbage-collected sections.
-  if (Config->PrintGcSections) {
-    for (const ObjFile *Obj : Symtab->ObjectFiles) {
-      for (InputChunk *C : Obj->Functions)
-        if (!C->Live)
-          message("removing unused section " + toString(C));
-      for (InputChunk *C : Obj->Segments)
-        if (!C->Live)
-          message("removing unused section " + toString(C));
-      for (InputGlobal *G : Obj->Globals)
-        if (!G->Live)
-          message("removing unused section " + toString(G));
-      for (InputEvent *E : Obj->Events)
-        if (!E->Live)
-          message("removing unused section " + toString(E));
+  if (config->printGcSections) {
+    for (const ObjFile *obj : symtab->objectFiles) {
+      for (InputChunk *c : obj->functions)
+        if (!c->live)
+          message("removing unused section " + toString(c));
+      for (InputChunk *c : obj->segments)
+        if (!c->live)
+          message("removing unused section " + toString(c));
+      for (InputGlobal *g : obj->globals)
+        if (!g->live)
+          message("removing unused section " + toString(g));
+      for (InputEvent *e : obj->events)
+        if (!e->live)
+          message("removing unused section " + toString(e));
     }
-    for (InputChunk *C : Symtab->SyntheticFunctions)
-      if (!C->Live)
-        message("removing unused section " + toString(C));
-    for (InputGlobal *G : Symtab->SyntheticGlobals)
-      if (!G->Live)
-        message("removing unused section " + toString(G));
+    for (InputChunk *c : symtab->syntheticFunctions)
+      if (!c->live)
+        message("removing unused section " + toString(c));
+    for (InputGlobal *g : symtab->syntheticGlobals)
+      if (!g->live)
+        message("removing unused section " + toString(g));
   }
 }
diff --git a/deps/lld/wasm/MarkLive.h b/deps/lld/wasm/MarkLive.h
index 0b58f153ce458cb6e1ea682c6028019b7e125a61..7b88cb4859f8acc99883fe0fed54a1cb452c7127 100644
--- a/deps/lld/wasm/MarkLive.h
+++ b/deps/lld/wasm/MarkLive.h
@@ -1,9 +1,8 @@
 //===- MarkLive.h -----------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/deps/lld/wasm/Options.td b/deps/lld/wasm/Options.td
index 3ed55b4bcda07fb19c18c937c6d0f158fa3e5a78..4bce790cd576d1e77d3c732ab087091b446e4311 100644
--- a/deps/lld/wasm/Options.td
+++ b/deps/lld/wasm/Options.td
@@ -31,6 +31,8 @@ defm demangle: B<"demangle",
     "Demangle symbol names",
     "Do not demangle symbol names">;
 
+def emit_relocs: F<"emit-relocs">, HelpText<"Generate relocations in output">;
+
 defm export_dynamic: B<"export-dynamic",
     "Put symbols in the dynamic symbol table",
     "Do not put symbols in the dynamic symbol table (default)">;
@@ -85,6 +87,8 @@ defm print_gc_sections: B<"print-gc-sections",
 
 def relocatable: F<"relocatable">, HelpText<"Create relocatable object file">;
 
+defm reproduce: Eq<"reproduce", "Dump linker invocation and input files for debugging">;
+
 def shared: F<"shared">, HelpText<"Build a shared object">;
 
 def strip_all: F<"strip-all">, HelpText<"Strip all symbols">;
@@ -93,6 +97,10 @@ def strip_debug: F<"strip-debug">, HelpText<"Strip debugging information">;
 
 def threads: F<"threads">, HelpText<"Run the linker multi-threaded">;
 
+def trace: F<"trace">, HelpText<"Print the names of the input files">;
+
+defm trace_symbol: Eq<"trace-symbol", "Trace references to symbols">;
+
 defm undefined: Eq<"undefined", "Force undefined symbol during linking">;
 
 def v: Flag<["-"], "v">, HelpText<"Display the version number">;
@@ -104,6 +112,9 @@ def version: F<"version">, HelpText<"Display the version number and exit">;
 def z: JoinedOrSeparate<["-"], "z">, MetaVarName<"<option>">,
   HelpText<"Linker option extensions">;
 
+defm wrap: Eq<"wrap", "Use wrapper functions for symbol">,
+  MetaVarName<"<symbol>=<symbol>">;
+
 // The follow flags are unique to wasm
 
 def allow_undefined: F<"allow-undefined">,
@@ -132,6 +143,12 @@ def import_memory: F<"import-memory">,
 def shared_memory: F<"shared-memory">,
   HelpText<"Use shared linear memory">;
 
+def active_segments: F<"active-segments">,
+  HelpText<"Force segments to be active (default with unshared memory)">;
+
+def passive_segments: F<"passive-segments">,
+  HelpText<"Force segments to be passive (default with shared memory)">;
+
 def import_table: F<"import-table">,
   HelpText<"Import function table from the environment">;
 
@@ -151,6 +168,13 @@ defm whole_archive: B<"whole-archive",
     "Force load of all members in a static library",
     "Do not force load of all members in a static library (default)">;
 
+defm check_features: B<"check-features",
+    "Check feature compatibility of linked objects (default)",
+    "Ignore feature compatibility of linked objects">;
+
+def features: CommaJoined<["--", "-"], "features=">,
+  HelpText<"Comma-separated used features, inferred from input objects by default.">;
+
 // Aliases
 def: JoinedOrSeparate<["-"], "e">, Alias<entry>;
 def: J<"entry=">, Alias<entry>;
@@ -160,6 +184,8 @@ def: Flag<["-"], "m">, Alias<max_memory>;
 def: Flag<["-"], "r">, Alias<relocatable>;
 def: Flag<["-"], "s">, Alias<strip_all>, HelpText<"Alias for --strip-all">;
 def: Flag<["-"], "S">, Alias<strip_debug>, HelpText<"Alias for --strip-debug">;
+def: Flag<["-"], "t">, Alias<trace>, HelpText<"Alias for --trace">;
+def: JoinedOrSeparate<["-"], "y">, Alias<trace_symbol>, HelpText<"Alias for --trace-symbol">;
 def: JoinedOrSeparate<["-"], "u">, Alias<undefined>;
 
 // LTO-related options.
diff --git a/deps/lld/wasm/OutputSections.cpp b/deps/lld/wasm/OutputSections.cpp
index 6b7b18d4ca77d8503b6b2138cd3a0c2b54e4be54..c019d89e447ba65dd5fa087c8e8e591437f522a2 100644
--- a/deps/lld/wasm/OutputSections.cpp
+++ b/deps/lld/wasm/OutputSections.cpp
@@ -1,9 +1,8 @@
 //===- OutputSections.cpp -------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -24,8 +23,8 @@ using namespace llvm::wasm;
 using namespace lld;
 using namespace lld::wasm;
 
-static StringRef sectionTypeToString(uint32_t SectionType) {
-  switch (SectionType) {
+static StringRef sectionTypeToString(uint32_t sectionType) {
+  switch (sectionType) {
   case WASM_SEC_CUSTOM:
     return "CUSTOM";
   case WASM_SEC_TYPE:
@@ -52,198 +51,200 @@ static StringRef sectionTypeToString(uint32_t SectionType) {
     return "CODE";
   case WASM_SEC_DATA:
     return "DATA";
+  case WASM_SEC_DATACOUNT:
+    return "DATACOUNT";
   default:
     fatal("invalid section type");
   }
 }
 
 // Returns a string, e.g. "FUNCTION(.text)".
-std::string lld::toString(const OutputSection &Sec) {
-  if (!Sec.Name.empty())
-    return (Sec.getSectionName() + "(" + Sec.Name + ")").str();
-  return Sec.getSectionName();
+std::string lld::toString(const OutputSection &sec) {
+  if (!sec.name.empty())
+    return (sec.getSectionName() + "(" + sec.name + ")").str();
+  return sec.getSectionName();
 }
 
 StringRef OutputSection::getSectionName() const {
-  return sectionTypeToString(Type);
+  return sectionTypeToString(type);
 }
 
-void OutputSection::createHeader(size_t BodySize) {
-  raw_string_ostream OS(Header);
-  debugWrite(OS.tell(), "section type [" + getSectionName() + "]");
-  encodeULEB128(Type, OS);
-  writeUleb128(OS, BodySize, "section size");
-  OS.flush();
-  log("createHeader: " + toString(*this) + " body=" + Twine(BodySize) +
+void OutputSection::createHeader(size_t bodySize) {
+  raw_string_ostream os(header);
+  debugWrite(os.tell(), "section type [" + getSectionName() + "]");
+  encodeULEB128(type, os);
+  writeUleb128(os, bodySize, "section size");
+  os.flush();
+  log("createHeader: " + toString(*this) + " body=" + Twine(bodySize) +
       " total=" + Twine(getSize()));
 }
 
-CodeSection::CodeSection(ArrayRef<InputFunction *> Functions)
-    : OutputSection(WASM_SEC_CODE), Functions(Functions) {
-  assert(Functions.size() > 0);
+void CodeSection::finalizeContents() {
+  raw_string_ostream os(codeSectionHeader);
+  writeUleb128(os, functions.size(), "function count");
+  os.flush();
+  bodySize = codeSectionHeader.size();
 
-  raw_string_ostream OS(CodeSectionHeader);
-  writeUleb128(OS, Functions.size(), "function count");
-  OS.flush();
-  BodySize = CodeSectionHeader.size();
-
-  for (InputFunction *Func : Functions) {
-    Func->OutputOffset = BodySize;
-    Func->calculateSize();
-    BodySize += Func->getSize();
+  for (InputFunction *func : functions) {
+    func->outputOffset = bodySize;
+    func->calculateSize();
+    bodySize += func->getSize();
   }
 
-  createHeader(BodySize);
+  createHeader(bodySize);
 }
 
-void CodeSection::writeTo(uint8_t *Buf) {
+void CodeSection::writeTo(uint8_t *buf) {
   log("writing " + toString(*this));
   log(" size=" + Twine(getSize()));
-  log(" headersize=" + Twine(Header.size()));
-  log(" codeheadersize=" + Twine(CodeSectionHeader.size()));
-  Buf += Offset;
+  log(" headersize=" + Twine(header.size()));
+  log(" codeheadersize=" + Twine(codeSectionHeader.size()));
+  buf += offset;
 
   // Write section header
-  memcpy(Buf, Header.data(), Header.size());
-  Buf += Header.size();
+  memcpy(buf, header.data(), header.size());
+  buf += header.size();
 
   // Write code section headers
-  memcpy(Buf, CodeSectionHeader.data(), CodeSectionHeader.size());
+  memcpy(buf, codeSectionHeader.data(), codeSectionHeader.size());
 
   // Write code section bodies
-  for (const InputChunk *Chunk : Functions)
-    Chunk->writeTo(Buf);
+  for (const InputChunk *chunk : functions)
+    chunk->writeTo(buf);
 }
 
-uint32_t CodeSection::numRelocations() const {
-  uint32_t Count = 0;
-  for (const InputChunk *Func : Functions)
-    Count += Func->NumRelocations();
-  return Count;
+uint32_t CodeSection::getNumRelocations() const {
+  uint32_t count = 0;
+  for (const InputChunk *func : functions)
+    count += func->getNumRelocations();
+  return count;
 }
 
-void CodeSection::writeRelocations(raw_ostream &OS) const {
-  for (const InputChunk *C : Functions)
-    C->writeRelocations(OS);
+void CodeSection::writeRelocations(raw_ostream &os) const {
+  for (const InputChunk *c : functions)
+    c->writeRelocations(os);
 }
 
-DataSection::DataSection(ArrayRef<OutputSegment *> Segments)
-    : OutputSection(WASM_SEC_DATA), Segments(Segments) {
-  raw_string_ostream OS(DataSectionHeader);
+void DataSection::finalizeContents() {
+  raw_string_ostream os(dataSectionHeader);
 
-  writeUleb128(OS, Segments.size(), "data segment count");
-  OS.flush();
-  BodySize = DataSectionHeader.size();
+  writeUleb128(os, segments.size(), "data segment count");
+  os.flush();
+  bodySize = dataSectionHeader.size();
 
-  for (OutputSegment *Segment : Segments) {
-    raw_string_ostream OS(Segment->Header);
-    writeUleb128(OS, 0, "memory index");
-    WasmInitExpr InitExpr;
-    if (Config->Pic) {
-      assert(Segments.size() <= 1 &&
-             "Currenly only a single data segment is supported in PIC mode");
-      InitExpr.Opcode = WASM_OPCODE_GLOBAL_GET;
-      InitExpr.Value.Global = WasmSym::MemoryBase->getGlobalIndex();
-    } else {
-      InitExpr.Opcode = WASM_OPCODE_I32_CONST;
-      InitExpr.Value.Int32 = Segment->StartVA;
+  assert((!config->isPic || segments.size() <= 1) &&
+         "Currenly only a single data segment is supported in PIC mode");
+
+  for (OutputSegment *segment : segments) {
+    raw_string_ostream os(segment->header);
+    writeUleb128(os, segment->initFlags, "init flags");
+    if (segment->initFlags & WASM_SEGMENT_HAS_MEMINDEX)
+      writeUleb128(os, 0, "memory index");
+    if ((segment->initFlags & WASM_SEGMENT_IS_PASSIVE) == 0) {
+      WasmInitExpr initExpr;
+      if (config->isPic) {
+        initExpr.Opcode = WASM_OPCODE_GLOBAL_GET;
+        initExpr.Value.Global = WasmSym::memoryBase->getGlobalIndex();
+      } else {
+        initExpr.Opcode = WASM_OPCODE_I32_CONST;
+        initExpr.Value.Int32 = segment->startVA;
+      }
+      writeInitExpr(os, initExpr);
     }
-    writeInitExpr(OS, InitExpr);
-    writeUleb128(OS, Segment->Size, "segment size");
-    OS.flush();
+    writeUleb128(os, segment->size, "segment size");
+    os.flush();
 
-    Segment->SectionOffset = BodySize;
-    BodySize += Segment->Header.size() + Segment->Size;
-    log("Data segment: size=" + Twine(Segment->Size));
+    segment->sectionOffset = bodySize;
+    bodySize += segment->header.size() + segment->size;
+    log("Data segment: size=" + Twine(segment->size) + ", startVA=" +
+        Twine::utohexstr(segment->startVA) + ", name=" + segment->name);
 
-    for (InputSegment *InputSeg : Segment->InputSegments)
-      InputSeg->OutputOffset = Segment->SectionOffset + Segment->Header.size() +
-                               InputSeg->OutputSegmentOffset;
+    for (InputSegment *inputSeg : segment->inputSegments)
+      inputSeg->outputOffset = segment->sectionOffset + segment->header.size() +
+                               inputSeg->outputSegmentOffset;
   }
 
-  createHeader(BodySize);
+  createHeader(bodySize);
 }
 
-void DataSection::writeTo(uint8_t *Buf) {
+void DataSection::writeTo(uint8_t *buf) {
   log("writing " + toString(*this) + " size=" + Twine(getSize()) +
-      " body=" + Twine(BodySize));
-  Buf += Offset;
+      " body=" + Twine(bodySize));
+  buf += offset;
 
   // Write section header
-  memcpy(Buf, Header.data(), Header.size());
-  Buf += Header.size();
+  memcpy(buf, header.data(), header.size());
+  buf += header.size();
 
   // Write data section headers
-  memcpy(Buf, DataSectionHeader.data(), DataSectionHeader.size());
+  memcpy(buf, dataSectionHeader.data(), dataSectionHeader.size());
 
-  for (const OutputSegment *Segment : Segments) {
+  for (const OutputSegment *segment : segments) {
     // Write data segment header
-    uint8_t *SegStart = Buf + Segment->SectionOffset;
-    memcpy(SegStart, Segment->Header.data(), Segment->Header.size());
+    uint8_t *segStart = buf + segment->sectionOffset;
+    memcpy(segStart, segment->header.data(), segment->header.size());
 
     // Write segment data payload
-    for (const InputChunk *Chunk : Segment->InputSegments)
-      Chunk->writeTo(Buf);
+    for (const InputChunk *chunk : segment->inputSegments)
+      chunk->writeTo(buf);
   }
 }
 
-uint32_t DataSection::numRelocations() const {
-  uint32_t Count = 0;
-  for (const OutputSegment *Seg : Segments)
-    for (const InputChunk *InputSeg : Seg->InputSegments)
-      Count += InputSeg->NumRelocations();
-  return Count;
+uint32_t DataSection::getNumRelocations() const {
+  uint32_t count = 0;
+  for (const OutputSegment *seg : segments)
+    for (const InputChunk *inputSeg : seg->inputSegments)
+      count += inputSeg->getNumRelocations();
+  return count;
 }
 
-void DataSection::writeRelocations(raw_ostream &OS) const {
-  for (const OutputSegment *Seg : Segments)
-    for (const InputChunk *C : Seg->InputSegments)
-      C->writeRelocations(OS);
+void DataSection::writeRelocations(raw_ostream &os) const {
+  for (const OutputSegment *seg : segments)
+    for (const InputChunk *c : seg->inputSegments)
+      c->writeRelocations(os);
 }
 
-CustomSection::CustomSection(std::string Name,
-                             ArrayRef<InputSection *> InputSections)
-    : OutputSection(WASM_SEC_CUSTOM, Name), PayloadSize(0),
-      InputSections(InputSections) {
-  raw_string_ostream OS(NameData);
-  encodeULEB128(Name.size(), OS);
-  OS << Name;
-  OS.flush();
+void CustomSection::finalizeContents() {
+  raw_string_ostream os(nameData);
+  encodeULEB128(name.size(), os);
+  os << name;
+  os.flush();
 
-  for (InputSection *Section : InputSections) {
-    Section->OutputOffset = PayloadSize;
-    PayloadSize += Section->getSize();
+  for (InputSection *section : inputSections) {
+    section->outputOffset = payloadSize;
+    section->outputSec = this;
+    payloadSize += section->getSize();
   }
 
-  createHeader(PayloadSize + NameData.size());
+  createHeader(payloadSize + nameData.size());
 }
 
-void CustomSection::writeTo(uint8_t *Buf) {
+void CustomSection::writeTo(uint8_t *buf) {
   log("writing " + toString(*this) + " size=" + Twine(getSize()) +
-      " chunks=" + Twine(InputSections.size()));
+      " chunks=" + Twine(inputSections.size()));
 
-  assert(Offset);
-  Buf += Offset;
+  assert(offset);
+  buf += offset;
 
   // Write section header
-  memcpy(Buf, Header.data(), Header.size());
-  Buf += Header.size();
-  memcpy(Buf, NameData.data(), NameData.size());
-  Buf += NameData.size();
+  memcpy(buf, header.data(), header.size());
+  buf += header.size();
+  memcpy(buf, nameData.data(), nameData.size());
+  buf += nameData.size();
 
   // Write custom sections payload
-  for (const InputSection *Section : InputSections)
-    Section->writeTo(Buf);
+  for (const InputSection *section : inputSections)
+    section->writeTo(buf);
 }
 
-uint32_t CustomSection::numRelocations() const {
-  uint32_t Count = 0;
-  for (const InputSection *InputSect : InputSections)
-    Count += InputSect->NumRelocations();
-  return Count;
+uint32_t CustomSection::getNumRelocations() const {
+  uint32_t count = 0;
+  for (const InputSection *inputSect : inputSections)
+    count += inputSect->getNumRelocations();
+  return count;
 }
 
-void CustomSection::writeRelocations(raw_ostream &OS) const {
-  for (const InputSection *S : InputSections)
-    S->writeRelocations(OS);
+void CustomSection::writeRelocations(raw_ostream &os) const {
+  for (const InputSection *s : inputSections)
+    s->writeRelocations(os);
 }
diff --git a/deps/lld/wasm/OutputSections.h b/deps/lld/wasm/OutputSections.h
index 6c5baa309a98c62b8a226ae3f9d537b73e8fefee..6b1c2a2eba2f698fdd36d7cc49f4e6ed5e7396d1 100644
--- a/deps/lld/wasm/OutputSections.h
+++ b/deps/lld/wasm/OutputSections.h
@@ -1,9 +1,8 @@
 //===- OutputSections.h -----------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -21,7 +20,7 @@ namespace lld {
 namespace wasm {
 class OutputSection;
 }
-std::string toString(const wasm::OutputSection &Section);
+std::string toString(const wasm::OutputSection &section);
 
 namespace wasm {
 
@@ -29,86 +28,67 @@ class OutputSegment;
 
 class OutputSection {
 public:
-  OutputSection(uint32_t Type, std::string Name = "")
-      : Type(Type), Name(Name) {}
+  OutputSection(uint32_t type, std::string name = "")
+      : type(type), name(name) {}
   virtual ~OutputSection() = default;
 
   StringRef getSectionName() const;
-  void setOffset(size_t NewOffset) {
-    log("setOffset: " + toString(*this) + ": " + Twine(NewOffset));
-    Offset = NewOffset;
+  void setOffset(size_t newOffset) {
+    log("setOffset: " + toString(*this) + ": " + Twine(newOffset));
+    offset = newOffset;
   }
-  void createHeader(size_t BodySize);
+  void createHeader(size_t bodySize);
+  virtual bool isNeeded() const { return true; }
   virtual size_t getSize() const = 0;
-  virtual void writeTo(uint8_t *Buf) = 0;
-  virtual void finalizeContents() {}
-  virtual uint32_t numRelocations() const { return 0; }
-  virtual void writeRelocations(raw_ostream &OS) const {}
+  virtual void writeTo(uint8_t *buf) = 0;
+  virtual void finalizeContents() = 0;
+  virtual uint32_t getNumRelocations() const { return 0; }
+  virtual void writeRelocations(raw_ostream &os) const {}
 
-  std::string Header;
-  uint32_t Type;
-  std::string Name;
+  std::string header;
+  uint32_t type;
+  uint32_t sectionIndex = UINT32_MAX;
+  std::string name;
+  OutputSectionSymbol *sectionSym = nullptr;
 
 protected:
-  size_t Offset = 0;
-};
-
-class SyntheticSection : public OutputSection {
-public:
-  SyntheticSection(uint32_t Type, std::string Name = "")
-      : OutputSection(Type, Name), BodyOutputStream(Body) {
-    if (!Name.empty())
-      writeStr(BodyOutputStream, Name, "section name");
-  }
-
-  void writeTo(uint8_t *Buf) override {
-    assert(Offset);
-    log("writing " + toString(*this));
-    memcpy(Buf + Offset, Header.data(), Header.size());
-    memcpy(Buf + Offset + Header.size(), Body.data(), Body.size());
-  }
-
-  size_t getSize() const override { return Header.size() + Body.size(); }
-
-  void finalizeContents() override {
-    BodyOutputStream.flush();
-    createHeader(Body.size());
-  }
-
-  raw_ostream &getStream() { return BodyOutputStream; }
-
-  std::string Body;
-
-protected:
-  llvm::raw_string_ostream BodyOutputStream;
+  size_t offset = 0;
 };
 
 class CodeSection : public OutputSection {
 public:
-  explicit CodeSection(ArrayRef<InputFunction *> Functions);
-  size_t getSize() const override { return Header.size() + BodySize; }
-  void writeTo(uint8_t *Buf) override;
-  uint32_t numRelocations() const override;
-  void writeRelocations(raw_ostream &OS) const override;
+  explicit CodeSection(ArrayRef<InputFunction *> functions)
+      : OutputSection(llvm::wasm::WASM_SEC_CODE), functions(functions) {}
+
+  size_t getSize() const override { return header.size() + bodySize; }
+  void writeTo(uint8_t *buf) override;
+  uint32_t getNumRelocations() const override;
+  void writeRelocations(raw_ostream &os) const override;
+  bool isNeeded() const override { return functions.size() > 0; }
+  void finalizeContents() override;
 
 protected:
-  ArrayRef<InputFunction *> Functions;
-  std::string CodeSectionHeader;
-  size_t BodySize = 0;
+  ArrayRef<InputFunction *> functions;
+  std::string codeSectionHeader;
+  size_t bodySize = 0;
 };
 
 class DataSection : public OutputSection {
 public:
-  explicit DataSection(ArrayRef<OutputSegment *> Segments);
-  size_t getSize() const override { return Header.size() + BodySize; }
-  void writeTo(uint8_t *Buf) override;
-  uint32_t numRelocations() const override;
-  void writeRelocations(raw_ostream &OS) const override;
+  explicit DataSection(ArrayRef<OutputSegment *> segments)
+      : OutputSection(llvm::wasm::WASM_SEC_DATA), segments(segments) {}
+
+  size_t getSize() const override { return header.size() + bodySize; }
+  void writeTo(uint8_t *buf) override;
+  uint32_t getNumRelocations() const override;
+  void writeRelocations(raw_ostream &os) const override;
+  bool isNeeded() const override { return segments.size() > 0; }
+  void finalizeContents() override;
 
 protected:
-  ArrayRef<OutputSegment *> Segments;
-  std::string DataSectionHeader;
-  size_t BodySize = 0;
+  ArrayRef<OutputSegment *> segments;
+  std::string dataSectionHeader;
+  size_t bodySize = 0;
 };
 
 // Represents a custom section in the output file.  Wasm custom sections are
@@ -120,18 +100,21 @@ protected:
 // separately and are instead synthesized by the linker.
 class CustomSection : public OutputSection {
 public:
-  CustomSection(std::string Name, ArrayRef<InputSection *> InputSections);
+  CustomSection(std::string name, ArrayRef<InputSection *> inputSections)
+      : OutputSection(llvm::wasm::WASM_SEC_CUSTOM, name),
+        inputSections(inputSections) {}
   size_t getSize() const override {
-    return Header.size() + NameData.size() + PayloadSize;
+    return header.size() + nameData.size() + payloadSize;
   }
-  void writeTo(uint8_t *Buf) override;
-  uint32_t numRelocations() const override;
-  void writeRelocations(raw_ostream &OS) const override;
+  void writeTo(uint8_t *buf) override;
+  uint32_t getNumRelocations() const override;
+  void writeRelocations(raw_ostream &os) const override;
+  void finalizeContents() override;
 
 protected:
-  size_t PayloadSize;
-  ArrayRef<InputSection *> InputSections;
-  std::string NameData;
+  size_t payloadSize = 0;
+  ArrayRef<InputSection *> inputSections;
+  std::string nameData;
 };
 
 } // namespace wasm
diff --git a/deps/lld/wasm/OutputSegment.h b/deps/lld/wasm/OutputSegment.h
index a982282dac10342bf1bec871a8679bb26bc02574..14142fbd44fd15684fe1e961c92c2063e2a2036b 100644
--- a/deps/lld/wasm/OutputSegment.h
+++ b/deps/lld/wasm/OutputSegment.h
@@ -1,9 +1,8 @@
 //===- OutputSegment.h ------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -21,29 +20,30 @@ class InputSegment;
 
 class OutputSegment {
 public:
-  OutputSegment(StringRef N, uint32_t Index) : Name(N), Index(Index) {}
+  OutputSegment(StringRef n, uint32_t index) : name(n), index(index) {}
 
-  void addInputSegment(InputSegment *InSeg) {
-    Alignment = std::max(Alignment, InSeg->getAlignment());
-    InputSegments.push_back(InSeg);
-    Size = llvm::alignTo(Size, 1 << InSeg->getAlignment());
-    InSeg->OutputSeg = this;
-    InSeg->OutputSegmentOffset = Size;
-    Size += InSeg->getSize();
+  void addInputSegment(InputSegment *inSeg) {
+    alignment = std::max(alignment, inSeg->getAlignment());
+    inputSegments.push_back(inSeg);
+    size = llvm::alignTo(size, 1ULL << inSeg->getAlignment());
+    inSeg->outputSeg = this;
+    inSeg->outputSegmentOffset = size;
+    size += inSeg->getSize();
   }
 
-  StringRef Name;
-  const uint32_t Index;
-  uint32_t SectionOffset = 0;
-  uint32_t Alignment = 0;
-  uint32_t StartVA = 0;
-  std::vector<InputSegment *> InputSegments;
+  StringRef name;
+  const uint32_t index;
+  uint32_t initFlags = 0;
+  uint32_t sectionOffset = 0;
+  uint32_t alignment = 0;
+  uint32_t startVA = 0;
+  std::vector<InputSegment *> inputSegments;
 
   // Sum of the size of the all the input segments
-  uint32_t Size = 0;
+  uint32_t size = 0;
 
   // Segment header
-  std::string Header;
+  std::string header;
 };
 
 } // namespace wasm
diff --git a/deps/lld/wasm/Relocations.cpp b/deps/lld/wasm/Relocations.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e39f6987a425ff6abcad0be393006efc3eb03d3e
--- /dev/null
+++ b/deps/lld/wasm/Relocations.cpp
@@ -0,0 +1,101 @@
+//===- Relocations.cpp ----------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "Relocations.h"
+
+#include "InputChunks.h"
+#include "SyntheticSections.h"
+
+using namespace llvm;
+using namespace llvm::wasm;
+
+using namespace lld;
+using namespace lld::wasm;
+
+static bool requiresGOTAccess(const Symbol *sym) {
+  return config->isPic && !sym->isHidden() && !sym->isLocal();
+}
+
+static bool allowUndefined(const Symbol* sym) {
+  // Historically --allow-undefined doesn't work for data symbols since we don't
+  // have any way to represent these as imports in the final binary.  The idea
+  // behind allowing undefined symbols is to allow importing these symbols from
+  // the embedder and we can't do this for data symbols (at least not without
+  // compiling with -fPIC)
+  if (isa<DataSymbol>(sym))
+    return false;
+  return (config->allowUndefined ||
+          config->allowUndefinedSymbols.count(sym->getName()) != 0);
+}
+
+static void reportUndefined(const Symbol* sym) {
+  assert(sym->isUndefined());
+  assert(!sym->isWeak());
+  if (!allowUndefined(sym))
+    error(toString(sym->getFile()) + ": undefined symbol: " + toString(*sym));
+}
+
+void lld::wasm::scanRelocations(InputChunk *chunk) {
+  if (!chunk->live)
+    return;
+  ObjFile *file = chunk->file;
+  ArrayRef<WasmSignature> types = file->getWasmObj()->types();
+  for (const WasmRelocation &reloc : chunk->getRelocations()) {
+    if (reloc.Type == R_WASM_TYPE_INDEX_LEB) {
+      // Mark target type as live
+      file->typeMap[reloc.Index] =
+          out.typeSec->registerType(types[reloc.Index]);
+      file->typeIsUsed[reloc.Index] = true;
+      continue;
+    }
+
+    // Other relocation types all have a corresponding symbol
+    Symbol *sym = file->getSymbols()[reloc.Index];
+
+    switch (reloc.Type) {
+    case R_WASM_TABLE_INDEX_I32:
+    case R_WASM_TABLE_INDEX_SLEB:
+    case R_WASM_TABLE_INDEX_REL_SLEB:
+      if (requiresGOTAccess(sym))
+        break;
+      out.elemSec->addEntry(cast<FunctionSymbol>(sym));
+      break;
+    case R_WASM_GLOBAL_INDEX_LEB:
+      if (!isa<GlobalSymbol>(sym))
+        out.importSec->addGOTEntry(sym);
+      break;
+    }
+
+    if (config->isPic) {
+      switch (reloc.Type) {
+      case R_WASM_TABLE_INDEX_SLEB:
+      case R_WASM_MEMORY_ADDR_SLEB:
+      case R_WASM_MEMORY_ADDR_LEB:
+        // Certain relocation types can't be used when building PIC output,
+        // since they would require absolute symbol addresses at link time.
+        error(toString(file) + ": relocation " + relocTypeToString(reloc.Type) +
+              " cannot be used against symbol " + toString(*sym) +
+              "; recompile with -fPIC");
+        break;
+      case R_WASM_TABLE_INDEX_I32:
+      case R_WASM_MEMORY_ADDR_I32:
+        // These relocation types are only present in the data section and
+        // will be converted into code by `generateRelocationCode`.  This code
+        // requires the symbols to have GOT entires.
+        if (requiresGOTAccess(sym))
+          out.importSec->addGOTEntry(sym);
+        break;
+      }
+    } else {
+      // Report undefined symbols
+      if (sym->isUndefined() && !config->relocatable && !sym->isWeak())
+        reportUndefined(sym);
+    }
+
+  }
+}
diff --git a/deps/lld/wasm/Relocations.h b/deps/lld/wasm/Relocations.h
new file mode 100644
index 0000000000000000000000000000000000000000..02787f551d804ba84fe02dce5bc999accb1996a6
--- /dev/null
+++ b/deps/lld/wasm/Relocations.h
@@ -0,0 +1,22 @@
+//===- Relocations.h -------------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLD_WASM_RELOCATIONS_H
+#define LLD_WASM_RELOCATIONS_H
+
+namespace lld {
+namespace wasm {
+
+class InputChunk;
+
+void scanRelocations(InputChunk *chunk);
+
+} // namespace wasm
+} // namespace lld
+
+#endif
diff --git a/deps/lld/wasm/SymbolTable.cpp b/deps/lld/wasm/SymbolTable.cpp
index 65441d293b50be39e965c05e6343e300393aa8dc..b61812523400049a0e58d47f9e1184895f52fa5b 100644
--- a/deps/lld/wasm/SymbolTable.cpp
+++ b/deps/lld/wasm/SymbolTable.cpp
@@ -1,9 +1,8 @@
 //===- SymbolTable.cpp ----------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -25,17 +24,37 @@ using namespace llvm::object;
 using namespace lld;
 using namespace lld::wasm;
 
-SymbolTable *lld::wasm::Symtab;
+SymbolTable *lld::wasm::symtab;
 
-void SymbolTable::addFile(InputFile *File) {
-  log("Processing: " + toString(File));
-  File->parse();
+void SymbolTable::addFile(InputFile *file) {
+  log("Processing: " + toString(file));
+
+  // .a file
+  if (auto *f = dyn_cast<ArchiveFile>(file)) {
+    f->parse();
+    return;
+  }
+
+  // .so file
+  if (auto *f = dyn_cast<SharedFile>(file)) {
+    sharedFiles.push_back(f);
+    return;
+  }
+
+  if (config->trace)
+    message(toString(file));
 
   // LLVM bitcode file
-  if (auto *F = dyn_cast<BitcodeFile>(File))
-    BitcodeFiles.push_back(F);
-  else if (auto *F = dyn_cast<ObjFile>(File))
-    ObjectFiles.push_back(F);
+  if (auto *f = dyn_cast<BitcodeFile>(file)) {
+    f->parse();
+    bitcodeFiles.push_back(f);
+    return;
+  }
+
+  // Regular object file
+  auto *f = cast<ObjFile>(file);
+  f->parse(false);
+  objectFiles.push_back(f);
 }
 
 // This function is where all the optimizations of link-time
@@ -46,353 +65,620 @@ void SymbolTable::addFile(InputFile *File) {
 // Because all bitcode files that the program consists of are passed
 // to the compiler at once, it can do whole-program optimization.
 void SymbolTable::addCombinedLTOObject() {
-  if (BitcodeFiles.empty())
+  if (bitcodeFiles.empty())
     return;
 
   // Compile bitcode files and replace bitcode symbols.
-  LTO.reset(new BitcodeCompiler);
-  for (BitcodeFile *F : BitcodeFiles)
-    LTO->add(*F);
-
-  for (StringRef Filename : LTO->compile()) {
-    auto *Obj = make<ObjFile>(MemoryBufferRef(Filename, "lto.tmp"));
-    Obj->parse();
-    ObjectFiles.push_back(Obj);
+  lto.reset(new BitcodeCompiler);
+  for (BitcodeFile *f : bitcodeFiles)
+    lto->add(*f);
+
+  for (StringRef filename : lto->compile()) {
+    auto *obj = make<ObjFile>(MemoryBufferRef(filename, "lto.tmp"), "");
+    obj->parse(true);
+    objectFiles.push_back(obj);
   }
 }
 
-void SymbolTable::reportRemainingUndefines() {
-  for (Symbol *Sym : SymVector) {
-    if (!Sym->isUndefined() || Sym->isWeak())
-      continue;
-    if (Config->AllowUndefinedSymbols.count(Sym->getName()) != 0)
-      continue;
-    if (!Sym->IsUsedInRegularObj)
-      continue;
-    error(toString(Sym->getFile()) + ": undefined symbol: " + toString(*Sym));
-  }
+Symbol *SymbolTable::find(StringRef name) {
+  auto it = symMap.find(CachedHashStringRef(name));
+  if (it == symMap.end() || it->second == -1)
+    return nullptr;
+  return symVector[it->second];
 }
 
-Symbol *SymbolTable::find(StringRef Name) {
-  return SymMap.lookup(CachedHashStringRef(Name));
+void SymbolTable::replace(StringRef name, Symbol* sym) {
+  auto it = symMap.find(CachedHashStringRef(name));
+  symVector[it->second] = sym;
 }
 
-std::pair<Symbol *, bool> SymbolTable::insert(StringRef Name, InputFile *File) {
-  bool Inserted = false;
-  Symbol *&Sym = SymMap[CachedHashStringRef(Name)];
-  if (!Sym) {
-    Sym = reinterpret_cast<Symbol *>(make<SymbolUnion>());
-    Sym->IsUsedInRegularObj = false;
-    SymVector.emplace_back(Sym);
-    Inserted = true;
+std::pair<Symbol *, bool> SymbolTable::insertName(StringRef name) {
+  bool trace = false;
+  auto p = symMap.insert({CachedHashStringRef(name), (int)symVector.size()});
+  int &symIndex = p.first->second;
+  bool isNew = p.second;
+  if (symIndex == -1) {
+    symIndex = symVector.size();
+    trace = true;
+    isNew = true;
   }
-  if (!File || File->kind() == InputFile::ObjectKind)
-    Sym->IsUsedInRegularObj = true;
-  return {Sym, Inserted};
+
+  if (!isNew)
+    return {symVector[symIndex], false};
+
+  Symbol *sym = reinterpret_cast<Symbol *>(make<SymbolUnion>());
+  sym->isUsedInRegularObj = false;
+  sym->canInline = true;
+  sym->traced = trace;
+  symVector.emplace_back(sym);
+  return {sym, true};
+}
+
+std::pair<Symbol *, bool> SymbolTable::insert(StringRef name,
+                                              const InputFile *file) {
+  Symbol *s;
+  bool wasInserted;
+  std::tie(s, wasInserted) = insertName(name);
+
+  if (!file || file->kind() == InputFile::ObjectKind)
+    s->isUsedInRegularObj = true;
+
+  return {s, wasInserted};
 }
 
-static void reportTypeError(const Symbol *Existing, const InputFile *File,
-                            llvm::wasm::WasmSymbolType Type) {
-  error("symbol type mismatch: " + toString(*Existing) + "\n>>> defined as " +
-        toString(Existing->getWasmType()) + " in " +
-        toString(Existing->getFile()) + "\n>>> defined as " + toString(Type) +
-        " in " + toString(File));
+static void reportTypeError(const Symbol *existing, const InputFile *file,
+                            llvm::wasm::WasmSymbolType type) {
+  error("symbol type mismatch: " + toString(*existing) + "\n>>> defined as " +
+        toString(existing->getWasmType()) + " in " +
+        toString(existing->getFile()) + "\n>>> defined as " + toString(type) +
+        " in " + toString(file));
 }
 
 // Check the type of new symbol matches that of the symbol is replacing.
-// For functions this can also involve verifying that the signatures match.
-static void checkFunctionType(Symbol *Existing, const InputFile *File,
-                              const WasmSignature *NewSig) {
-  auto ExistingFunction = dyn_cast<FunctionSymbol>(Existing);
-  if (!ExistingFunction) {
-    reportTypeError(Existing, File, WASM_SYMBOL_TYPE_FUNCTION);
-    return;
-  }
-
-  if (!NewSig)
-    return;
+// Returns true if the function types match, false is there is a singature
+// mismatch.
+static bool signatureMatches(FunctionSymbol *existing,
+                             const WasmSignature *newSig) {
+  const WasmSignature *oldSig = existing->signature;
 
-  const WasmSignature *OldSig = ExistingFunction->Signature;
-  if (!OldSig) {
-    ExistingFunction->Signature = NewSig;
-    return;
-  }
+  // If either function is missing a signature (this happend for bitcode
+  // symbols) then assume they match.  Any mismatch will be reported later
+  // when the LTO objects are added.
+  if (!newSig || !oldSig)
+    return true;
 
-  if (*NewSig != *OldSig)
-    warn("function signature mismatch: " + Existing->getName() +
-         "\n>>> defined as " + toString(*OldSig) + " in " +
-         toString(Existing->getFile()) + "\n>>> defined as " +
-         toString(*NewSig) + " in " + toString(File));
+  return *newSig == *oldSig;
 }
 
-static void checkGlobalType(const Symbol *Existing, const InputFile *File,
-                            const WasmGlobalType *NewType) {
-  if (!isa<GlobalSymbol>(Existing)) {
-    reportTypeError(Existing, File, WASM_SYMBOL_TYPE_GLOBAL);
+static void checkGlobalType(const Symbol *existing, const InputFile *file,
+                            const WasmGlobalType *newType) {
+  if (!isa<GlobalSymbol>(existing)) {
+    reportTypeError(existing, file, WASM_SYMBOL_TYPE_GLOBAL);
     return;
   }
 
-  const WasmGlobalType *OldType = cast<GlobalSymbol>(Existing)->getGlobalType();
-  if (*NewType != *OldType) {
-    error("Global type mismatch: " + Existing->getName() + "\n>>> defined as " +
-          toString(*OldType) + " in " + toString(Existing->getFile()) +
-          "\n>>> defined as " + toString(*NewType) + " in " + toString(File));
+  const WasmGlobalType *oldType = cast<GlobalSymbol>(existing)->getGlobalType();
+  if (*newType != *oldType) {
+    error("Global type mismatch: " + existing->getName() + "\n>>> defined as " +
+          toString(*oldType) + " in " + toString(existing->getFile()) +
+          "\n>>> defined as " + toString(*newType) + " in " + toString(file));
   }
 }
 
-static void checkEventType(const Symbol *Existing, const InputFile *File,
-                           const WasmEventType *NewType,
-                           const WasmSignature *NewSig) {
-  auto ExistingEvent = dyn_cast<EventSymbol>(Existing);
-  if (!isa<EventSymbol>(Existing)) {
-    reportTypeError(Existing, File, WASM_SYMBOL_TYPE_EVENT);
+static void checkEventType(const Symbol *existing, const InputFile *file,
+                           const WasmEventType *newType,
+                           const WasmSignature *newSig) {
+  auto existingEvent = dyn_cast<EventSymbol>(existing);
+  if (!isa<EventSymbol>(existing)) {
+    reportTypeError(existing, file, WASM_SYMBOL_TYPE_EVENT);
     return;
   }
 
-  const WasmEventType *OldType = cast<EventSymbol>(Existing)->getEventType();
-  const WasmSignature *OldSig = ExistingEvent->Signature;
-  if (NewType->Attribute != OldType->Attribute)
-    error("Event type mismatch: " + Existing->getName() + "\n>>> defined as " +
-          toString(*OldType) + " in " + toString(Existing->getFile()) +
-          "\n>>> defined as " + toString(*NewType) + " in " + toString(File));
-  if (*NewSig != *OldSig)
-    warn("Event signature mismatch: " + Existing->getName() +
-         "\n>>> defined as " + toString(*OldSig) + " in " +
-         toString(Existing->getFile()) + "\n>>> defined as " +
-         toString(*NewSig) + " in " + toString(File));
+  const WasmEventType *oldType = cast<EventSymbol>(existing)->getEventType();
+  const WasmSignature *oldSig = existingEvent->signature;
+  if (newType->Attribute != oldType->Attribute)
+    error("Event type mismatch: " + existing->getName() + "\n>>> defined as " +
+          toString(*oldType) + " in " + toString(existing->getFile()) +
+          "\n>>> defined as " + toString(*newType) + " in " + toString(file));
+  if (*newSig != *oldSig)
+    warn("Event signature mismatch: " + existing->getName() +
+         "\n>>> defined as " + toString(*oldSig) + " in " +
+         toString(existing->getFile()) + "\n>>> defined as " +
+         toString(*newSig) + " in " + toString(file));
+}
+
+static void checkDataType(const Symbol *existing, const InputFile *file) {
+  if (!isa<DataSymbol>(existing))
+    reportTypeError(existing, file, WASM_SYMBOL_TYPE_DATA);
 }
 
-static void checkDataType(const Symbol *Existing, const InputFile *File) {
-  if (!isa<DataSymbol>(Existing))
-    reportTypeError(Existing, File, WASM_SYMBOL_TYPE_DATA);
+DefinedFunction *SymbolTable::addSyntheticFunction(StringRef name,
+                                                   uint32_t flags,
+                                                   InputFunction *function) {
+  LLVM_DEBUG(dbgs() << "addSyntheticFunction: " << name << "\n");
+  assert(!find(name));
+  syntheticFunctions.emplace_back(function);
+  return replaceSymbol<DefinedFunction>(insertName(name).first, name,
+                                        flags, nullptr, function);
 }
 
-DefinedFunction *SymbolTable::addSyntheticFunction(StringRef Name,
-                                                   uint32_t Flags,
-                                                   InputFunction *Function) {
-  LLVM_DEBUG(dbgs() << "addSyntheticFunction: " << Name << "\n");
-  assert(!find(Name));
-  SyntheticFunctions.emplace_back(Function);
-  return replaceSymbol<DefinedFunction>(insert(Name, nullptr).first, Name,
-                                        Flags, nullptr, Function);
+// Adds an optional, linker generated, data symbols.  The symbol will only be
+// added if there is an undefine reference to it, or if it is explictly exported
+// via the --export flag.  Otherwise we don't add the symbol and return nullptr.
+DefinedData *SymbolTable::addOptionalDataSymbol(StringRef name, uint32_t value,
+                                                uint32_t flags) {
+  Symbol *s = find(name);
+  if (!s && (config->exportAll || config->exportedSymbols.count(name) != 0))
+    s = insertName(name).first;
+  else if (!s || s->isDefined())
+    return nullptr;
+  LLVM_DEBUG(dbgs() << "addOptionalDataSymbol: " << name << "\n");
+  auto *rtn = replaceSymbol<DefinedData>(s, name, flags);
+  rtn->setVirtualAddress(value);
+  rtn->referenced = true;
+  return rtn;
 }
 
-DefinedData *SymbolTable::addSyntheticDataSymbol(StringRef Name,
-                                                 uint32_t Flags) {
-  LLVM_DEBUG(dbgs() << "addSyntheticDataSymbol: " << Name << "\n");
-  assert(!find(Name));
-  return replaceSymbol<DefinedData>(insert(Name, nullptr).first, Name, Flags);
+DefinedData *SymbolTable::addSyntheticDataSymbol(StringRef name,
+                                                 uint32_t flags) {
+  LLVM_DEBUG(dbgs() << "addSyntheticDataSymbol: " << name << "\n");
+  assert(!find(name));
+  return replaceSymbol<DefinedData>(insertName(name).first, name, flags);
 }
 
-DefinedGlobal *SymbolTable::addSyntheticGlobal(StringRef Name, uint32_t Flags,
-                                               InputGlobal *Global) {
-  LLVM_DEBUG(dbgs() << "addSyntheticGlobal: " << Name << " -> " << Global
+DefinedGlobal *SymbolTable::addSyntheticGlobal(StringRef name, uint32_t flags,
+                                               InputGlobal *global) {
+  LLVM_DEBUG(dbgs() << "addSyntheticGlobal: " << name << " -> " << global
                     << "\n");
-  assert(!find(Name));
-  SyntheticGlobals.emplace_back(Global);
-  return replaceSymbol<DefinedGlobal>(insert(Name, nullptr).first, Name, Flags,
-                                      nullptr, Global);
+  assert(!find(name));
+  syntheticGlobals.emplace_back(global);
+  return replaceSymbol<DefinedGlobal>(insertName(name).first, name, flags,
+                                      nullptr, global);
 }
 
-static bool shouldReplace(const Symbol *Existing, InputFile *NewFile,
-                          uint32_t NewFlags) {
+static bool shouldReplace(const Symbol *existing, InputFile *newFile,
+                          uint32_t newFlags) {
   // If existing symbol is undefined, replace it.
-  if (!Existing->isDefined()) {
+  if (!existing->isDefined()) {
     LLVM_DEBUG(dbgs() << "resolving existing undefined symbol: "
-                      << Existing->getName() << "\n");
+                      << existing->getName() << "\n");
     return true;
   }
 
   // Now we have two defined symbols. If the new one is weak, we can ignore it.
-  if ((NewFlags & WASM_SYMBOL_BINDING_MASK) == WASM_SYMBOL_BINDING_WEAK) {
+  if ((newFlags & WASM_SYMBOL_BINDING_MASK) == WASM_SYMBOL_BINDING_WEAK) {
     LLVM_DEBUG(dbgs() << "existing symbol takes precedence\n");
     return false;
   }
 
   // If the existing symbol is weak, we should replace it.
-  if (Existing->isWeak()) {
+  if (existing->isWeak()) {
     LLVM_DEBUG(dbgs() << "replacing existing weak symbol\n");
     return true;
   }
 
   // Neither symbol is week. They conflict.
-  error("duplicate symbol: " + toString(*Existing) + "\n>>> defined in " +
-        toString(Existing->getFile()) + "\n>>> defined in " +
-        toString(NewFile));
+  error("duplicate symbol: " + toString(*existing) + "\n>>> defined in " +
+        toString(existing->getFile()) + "\n>>> defined in " +
+        toString(newFile));
   return true;
 }
 
-Symbol *SymbolTable::addDefinedFunction(StringRef Name, uint32_t Flags,
-                                        InputFile *File,
-                                        InputFunction *Function) {
-  LLVM_DEBUG(dbgs() << "addDefinedFunction: " << Name << " ["
-                    << (Function ? toString(Function->Signature) : "none")
+Symbol *SymbolTable::addDefinedFunction(StringRef name, uint32_t flags,
+                                        InputFile *file,
+                                        InputFunction *function) {
+  LLVM_DEBUG(dbgs() << "addDefinedFunction: " << name << " ["
+                    << (function ? toString(function->signature) : "none")
                     << "]\n");
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(Name, File);
+  Symbol *s;
+  bool wasInserted;
+  std::tie(s, wasInserted) = insert(name, file);
 
-  if (WasInserted || S->isLazy()) {
-    replaceSymbol<DefinedFunction>(S, Name, Flags, File, Function);
-    return S;
-  }
-
-  if (Function)
-    checkFunctionType(S, File, &Function->Signature);
-
-  if (shouldReplace(S, File, Flags)) {
+  auto replaceSym = [&](Symbol *sym) {
     // If the new defined function doesn't have signture (i.e. bitcode
-    // functions) but the old symbols does then preserve the old signature
-    const WasmSignature *OldSig = nullptr;
-    if (auto* F = dyn_cast<FunctionSymbol>(S))
-      OldSig = F->Signature;
-    auto NewSym = replaceSymbol<DefinedFunction>(S, Name, Flags, File, Function);
-    if (!NewSym->Signature)
-      NewSym->Signature = OldSig;
+    // functions) but the old symbol does, then preserve the old signature
+    const WasmSignature *oldSig = s->getSignature();
+    auto* newSym = replaceSymbol<DefinedFunction>(sym, name, flags, file, function);
+    if (!newSym->signature)
+      newSym->signature = oldSig;
+  };
+
+  if (wasInserted || s->isLazy()) {
+    replaceSym(s);
+    return s;
   }
-  return S;
+
+  auto existingFunction = dyn_cast<FunctionSymbol>(s);
+  if (!existingFunction) {
+    reportTypeError(s, file, WASM_SYMBOL_TYPE_FUNCTION);
+    return s;
+  }
+
+  bool checkSig = true;
+  if (auto ud = dyn_cast<UndefinedFunction>(existingFunction))
+    checkSig = ud->isCalledDirectly;
+
+  if (checkSig && function && !signatureMatches(existingFunction, &function->signature)) {
+    Symbol* variant;
+    if (getFunctionVariant(s, &function->signature, file, &variant))
+      // New variant, always replace
+      replaceSym(variant);
+    else if (shouldReplace(s, file, flags))
+      // Variant already exists, replace it after checking shouldReplace
+      replaceSym(variant);
+
+    // This variant we found take the place in the symbol table as the primary
+    // variant.
+    replace(name, variant);
+    return variant;
+  }
+
+  // Existing function with matching signature.
+  if (shouldReplace(s, file, flags))
+    replaceSym(s);
+
+  return s;
 }
 
-Symbol *SymbolTable::addDefinedData(StringRef Name, uint32_t Flags,
-                                    InputFile *File, InputSegment *Segment,
-                                    uint32_t Address, uint32_t Size) {
-  LLVM_DEBUG(dbgs() << "addDefinedData:" << Name << " addr:" << Address
+Symbol *SymbolTable::addDefinedData(StringRef name, uint32_t flags,
+                                    InputFile *file, InputSegment *segment,
+                                    uint32_t address, uint32_t size) {
+  LLVM_DEBUG(dbgs() << "addDefinedData:" << name << " addr:" << address
                     << "\n");
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(Name, File);
+  Symbol *s;
+  bool wasInserted;
+  std::tie(s, wasInserted) = insert(name, file);
 
-  if (WasInserted || S->isLazy()) {
-    replaceSymbol<DefinedData>(S, Name, Flags, File, Segment, Address, Size);
-    return S;
+  auto replaceSym = [&]() {
+    replaceSymbol<DefinedData>(s, name, flags, file, segment, address, size);
+  };
+
+  if (wasInserted || s->isLazy()) {
+    replaceSym();
+    return s;
+  }
+
+  checkDataType(s, file);
+
+  if (shouldReplace(s, file, flags))
+    replaceSym();
+  return s;
+}
+
+Symbol *SymbolTable::addDefinedGlobal(StringRef name, uint32_t flags,
+                                      InputFile *file, InputGlobal *global) {
+  LLVM_DEBUG(dbgs() << "addDefinedGlobal:" << name << "\n");
+
+  Symbol *s;
+  bool wasInserted;
+  std::tie(s, wasInserted) = insert(name, file);
+
+  auto replaceSym = [&]() {
+    replaceSymbol<DefinedGlobal>(s, name, flags, file, global);
+  };
+
+  if (wasInserted || s->isLazy()) {
+    replaceSym();
+    return s;
+  }
+
+  checkGlobalType(s, file, &global->getType());
+
+  if (shouldReplace(s, file, flags))
+    replaceSym();
+  return s;
+}
+
+Symbol *SymbolTable::addDefinedEvent(StringRef name, uint32_t flags,
+                                     InputFile *file, InputEvent *event) {
+  LLVM_DEBUG(dbgs() << "addDefinedEvent:" << name << "\n");
+
+  Symbol *s;
+  bool wasInserted;
+  std::tie(s, wasInserted) = insert(name, file);
+
+  auto replaceSym = [&]() {
+    replaceSymbol<DefinedEvent>(s, name, flags, file, event);
+  };
+
+  if (wasInserted || s->isLazy()) {
+    replaceSym();
+    return s;
+  }
+
+  checkEventType(s, file, &event->getType(), &event->signature);
+
+  if (shouldReplace(s, file, flags))
+    replaceSym();
+  return s;
+}
+
+Symbol *SymbolTable::addUndefinedFunction(StringRef name, StringRef importName,
+                                          StringRef importModule,
+                                          uint32_t flags, InputFile *file,
+                                          const WasmSignature *sig,
+                                          bool isCalledDirectly) {
+  LLVM_DEBUG(dbgs() << "addUndefinedFunction: " << name << " ["
+                    << (sig ? toString(*sig) : "none")
+                    << "] IsCalledDirectly:" << isCalledDirectly << "\n");
+
+  Symbol *s;
+  bool wasInserted;
+  std::tie(s, wasInserted) = insert(name, file);
+  if (s->traced)
+    printTraceSymbolUndefined(name, file);
+
+  auto replaceSym = [&]() {
+    replaceSymbol<UndefinedFunction>(s, name, importName, importModule, flags,
+                                     file, sig, isCalledDirectly);
+  };
+
+  if (wasInserted)
+    replaceSym();
+  else if (auto *lazy = dyn_cast<LazySymbol>(s))
+    lazy->fetch();
+  else {
+    auto existingFunction = dyn_cast<FunctionSymbol>(s);
+    if (!existingFunction) {
+      reportTypeError(s, file, WASM_SYMBOL_TYPE_FUNCTION);
+      return s;
+    }
+    if (!existingFunction->signature && sig)
+      existingFunction->signature = sig;
+    if (isCalledDirectly && !signatureMatches(existingFunction, sig))
+      if (getFunctionVariant(s, sig, file, &s))
+        replaceSym();
   }
 
-  checkDataType(S, File);
+  return s;
+}
+
+Symbol *SymbolTable::addUndefinedData(StringRef name, uint32_t flags,
+                                      InputFile *file) {
+  LLVM_DEBUG(dbgs() << "addUndefinedData: " << name << "\n");
+
+  Symbol *s;
+  bool wasInserted;
+  std::tie(s, wasInserted) = insert(name, file);
+  if (s->traced)
+    printTraceSymbolUndefined(name, file);
+
+  if (wasInserted)
+    replaceSymbol<UndefinedData>(s, name, flags, file);
+  else if (auto *lazy = dyn_cast<LazySymbol>(s))
+    lazy->fetch();
+  else if (s->isDefined())
+    checkDataType(s, file);
+  return s;
+}
+
+Symbol *SymbolTable::addUndefinedGlobal(StringRef name, StringRef importName,
+                                        StringRef importModule, uint32_t flags,
+                                        InputFile *file,
+                                        const WasmGlobalType *type) {
+  LLVM_DEBUG(dbgs() << "addUndefinedGlobal: " << name << "\n");
+
+  Symbol *s;
+  bool wasInserted;
+  std::tie(s, wasInserted) = insert(name, file);
+  if (s->traced)
+    printTraceSymbolUndefined(name, file);
 
-  if (shouldReplace(S, File, Flags))
-    replaceSymbol<DefinedData>(S, Name, Flags, File, Segment, Address, Size);
-  return S;
+  if (wasInserted)
+    replaceSymbol<UndefinedGlobal>(s, name, importName, importModule, flags,
+                                   file, type);
+  else if (auto *lazy = dyn_cast<LazySymbol>(s))
+    lazy->fetch();
+  else if (s->isDefined())
+    checkGlobalType(s, file, type);
+  return s;
 }
 
-Symbol *SymbolTable::addDefinedGlobal(StringRef Name, uint32_t Flags,
-                                      InputFile *File, InputGlobal *Global) {
-  LLVM_DEBUG(dbgs() << "addDefinedGlobal:" << Name << "\n");
+void SymbolTable::addLazy(ArchiveFile *file, const Archive::Symbol *sym) {
+  LLVM_DEBUG(dbgs() << "addLazy: " << sym->getName() << "\n");
+  StringRef name = sym->getName();
 
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(Name, File);
+  Symbol *s;
+  bool wasInserted;
+  std::tie(s, wasInserted) = insertName(name);
 
-  if (WasInserted || S->isLazy()) {
-    replaceSymbol<DefinedGlobal>(S, Name, Flags, File, Global);
-    return S;
+  if (wasInserted) {
+    replaceSymbol<LazySymbol>(s, name, 0, file, *sym);
+    return;
   }
 
-  checkGlobalType(S, File, &Global->getType());
+  if (!s->isUndefined())
+    return;
 
-  if (shouldReplace(S, File, Flags))
-    replaceSymbol<DefinedGlobal>(S, Name, Flags, File, Global);
-  return S;
+  // The existing symbol is undefined, load a new one from the archive,
+  // unless the the existing symbol is weak in which case replace the undefined
+  // symbols with a LazySymbol.
+  if (s->isWeak()) {
+    const WasmSignature *oldSig = nullptr;
+    // In the case of an UndefinedFunction we need to preserve the expected
+    // signature.
+    if (auto *f = dyn_cast<UndefinedFunction>(s))
+      oldSig = f->signature;
+    LLVM_DEBUG(dbgs() << "replacing existing weak undefined symbol\n");
+    auto newSym = replaceSymbol<LazySymbol>(s, name, WASM_SYMBOL_BINDING_WEAK,
+                                            file, *sym);
+    newSym->signature = oldSig;
+    return;
+  }
+
+  LLVM_DEBUG(dbgs() << "replacing existing undefined\n");
+  file->addMember(sym);
+}
+
+bool SymbolTable::addComdat(StringRef name) {
+  return comdatGroups.insert(CachedHashStringRef(name)).second;
 }
 
-Symbol *SymbolTable::addDefinedEvent(StringRef Name, uint32_t Flags,
-                                     InputFile *File, InputEvent *Event) {
-  LLVM_DEBUG(dbgs() << "addDefinedEvent:" << Name << "\n");
+// The new signature doesn't match.  Create a variant to the symbol with the
+// signature encoded in the name and return that instead.  These symbols are
+// then unified later in handleSymbolVariants.
+bool SymbolTable::getFunctionVariant(Symbol* sym, const WasmSignature *sig,
+                                     const InputFile *file, Symbol **out) {
+  LLVM_DEBUG(dbgs() << "getFunctionVariant: " << sym->getName() << " -> "
+                    << " " << toString(*sig) << "\n");
+  Symbol *variant = nullptr;
 
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(Name, File);
+  // Linear search through symbol variants.  Should never be more than two
+  // or three entries here.
+  auto &variants = symVariants[CachedHashStringRef(sym->getName())];
+  if (variants.empty())
+    variants.push_back(sym);
 
-  if (WasInserted || S->isLazy()) {
-    replaceSymbol<DefinedEvent>(S, Name, Flags, File, Event);
-    return S;
+  for (Symbol* v : variants) {
+    if (*v->getSignature() == *sig) {
+      variant = v;
+      break;
+    }
   }
 
-  checkEventType(S, File, &Event->getType(), &Event->Signature);
+  bool wasAdded = !variant;
+  if (wasAdded) {
+    // Create a new variant;
+    LLVM_DEBUG(dbgs() << "added new variant\n");
+    variant = reinterpret_cast<Symbol *>(make<SymbolUnion>());
+    variants.push_back(variant);
+  } else {
+    LLVM_DEBUG(dbgs() << "variant already exists: " << toString(*variant) << "\n");
+    assert(*variant->getSignature() == *sig);
+  }
 
-  if (shouldReplace(S, File, Flags))
-    replaceSymbol<DefinedEvent>(S, Name, Flags, File, Event);
-  return S;
+  *out = variant;
+  return wasAdded;
+}
+
+// Set a flag for --trace-symbol so that we can print out a log message
+// if a new symbol with the same name is inserted into the symbol table.
+void SymbolTable::trace(StringRef name) {
+  symMap.insert({CachedHashStringRef(name), -1});
+}
+
+void SymbolTable::wrap(Symbol *sym, Symbol *real, Symbol *wrap) {
+  // Swap symbols as instructed by -wrap.
+  int &origIdx = symMap[CachedHashStringRef(sym->getName())];
+  int &realIdx= symMap[CachedHashStringRef(real->getName())];
+  int &wrapIdx = symMap[CachedHashStringRef(wrap->getName())];
+  LLVM_DEBUG(dbgs() << "wrap: " << sym->getName() << "\n");
+
+  // Anyone looking up __real symbols should get the original
+  realIdx = origIdx;
+  // Anyone looking up the original should get the __wrap symbol
+  origIdx = wrapIdx;
+}
+
+static const uint8_t unreachableFn[] = {
+    0x03 /* ULEB length */, 0x00 /* ULEB num locals */,
+    0x00 /* opcode unreachable */, 0x0b /* opcode end */
+};
+
+// Replace the given symbol body with an unreachable function.
+// This is used by handleWeakUndefines in order to generate a callable
+// equivalent of an undefined function and also handleSymbolVariants for
+// undefined functions that don't match the signature of the definition.
+InputFunction *SymbolTable::replaceWithUnreachable(Symbol *sym,
+                                                   const WasmSignature &sig,
+                                                   StringRef debugName) {
+  auto *func = make<SyntheticFunction>(sig, sym->getName(), debugName);
+  func->setBody(unreachableFn);
+  syntheticFunctions.emplace_back(func);
+  replaceSymbol<DefinedFunction>(sym, sym->getName(), sym->getFlags(), nullptr,
+                                 func);
+  return func;
+}
+
+// For weak undefined functions, there may be "call" instructions that reference
+// the symbol. In this case, we need to synthesise a dummy/stub function that
+// will abort at runtime, so that relocations can still provided an operand to
+// the call instruction that passes Wasm validation.
+void SymbolTable::handleWeakUndefines() {
+  for (Symbol *sym : getSymbols()) {
+    if (!sym->isUndefWeak())
+      continue;
+
+    const WasmSignature *sig = sym->getSignature();
+    if (!sig) {
+      // It is possible for undefined functions not to have a signature (eg. if
+      // added via "--undefined"), but weak undefined ones do have a signature.
+      // Lazy symbols may not be functions and therefore Sig can still be null
+      // in some circumstantce.
+      assert(!isa<FunctionSymbol>(sym));
+      continue;
+    }
+
+    // Add a synthetic dummy for weak undefined functions.  These dummies will
+    // be GC'd if not used as the target of any "call" instructions.
+    StringRef debugName = saver.save("undefined:" + toString(*sym));
+    InputFunction* func = replaceWithUnreachable(sym, *sig, debugName);
+    // Ensure it compares equal to the null pointer, and so that table relocs
+    // don't pull in the stub body (only call-operand relocs should do that).
+    func->setTableIndex(0);
+    // Hide our dummy to prevent export.
+    sym->setHidden(true);
+  }
 }
 
-Symbol *SymbolTable::addUndefinedFunction(StringRef Name, StringRef ImportName,
-                                          StringRef ImportModule,
-                                          uint32_t Flags, InputFile *File,
-                                          const WasmSignature *Sig) {
-  LLVM_DEBUG(dbgs() << "addUndefinedFunction: " << Name <<
-             " [" << (Sig ? toString(*Sig) : "none") << "]\n");
-
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(Name, File);
-
-  if (WasInserted)
-    replaceSymbol<UndefinedFunction>(S, Name, ImportName, ImportModule, Flags,
-                                     File, Sig);
-  else if (auto *Lazy = dyn_cast<LazySymbol>(S))
-    Lazy->fetch();
+static void reportFunctionSignatureMismatch(StringRef symName,
+                                            FunctionSymbol *a,
+                                            FunctionSymbol *b, bool isError) {
+  std::string msg = ("function signature mismatch: " + symName +
+                     "\n>>> defined as " + toString(*a->signature) + " in " +
+                     toString(a->getFile()) + "\n>>> defined as " +
+                     toString(*b->signature) + " in " + toString(b->getFile()))
+                        .str();
+  if (isError)
+    error(msg);
   else
-    checkFunctionType(S, File, Sig);
-
-  return S;
-}
-
-Symbol *SymbolTable::addUndefinedData(StringRef Name, uint32_t Flags,
-                                      InputFile *File) {
-  LLVM_DEBUG(dbgs() << "addUndefinedData: " << Name << "\n");
-
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(Name, File);
-
-  if (WasInserted)
-    replaceSymbol<UndefinedData>(S, Name, Flags, File);
-  else if (auto *Lazy = dyn_cast<LazySymbol>(S))
-    Lazy->fetch();
-  else if (S->isDefined())
-    checkDataType(S, File);
-  return S;
+    warn(msg);
 }
 
-Symbol *SymbolTable::addUndefinedGlobal(StringRef Name, StringRef ImportName,
-                                        StringRef ImportModule, uint32_t Flags,
-                                        InputFile *File,
-                                        const WasmGlobalType *Type) {
-  LLVM_DEBUG(dbgs() << "addUndefinedGlobal: " << Name << "\n");
-
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(Name, File);
-
-  if (WasInserted)
-    replaceSymbol<UndefinedGlobal>(S, Name, ImportName, ImportModule, Flags,
-                                   File, Type);
-  else if (auto *Lazy = dyn_cast<LazySymbol>(S))
-    Lazy->fetch();
-  else if (S->isDefined())
-    checkGlobalType(S, File, Type);
-  return S;
-}
-
-void SymbolTable::addLazy(ArchiveFile *File, const Archive::Symbol *Sym) {
-  LLVM_DEBUG(dbgs() << "addLazy: " << Sym->getName() << "\n");
-  StringRef Name = Sym->getName();
-
-  Symbol *S;
-  bool WasInserted;
-  std::tie(S, WasInserted) = insert(Name, nullptr);
-
-  if (WasInserted) {
-    replaceSymbol<LazySymbol>(S, Name, File, *Sym);
-    return;
+// Remove any variant symbols that were created due to function signature
+// mismatches.
+void SymbolTable::handleSymbolVariants() {
+  for (auto pair : symVariants) {
+    // Push the initial symbol onto the list of variants.
+    StringRef symName = pair.first.val();
+    std::vector<Symbol *> &variants = pair.second;
+
+#ifndef NDEBUG
+    LLVM_DEBUG(dbgs() << "symbol with (" << variants.size()
+                      << ") variants: " << symName << "\n");
+    for (auto *s: variants) {
+      auto *f = cast<FunctionSymbol>(s);
+      LLVM_DEBUG(dbgs() << " variant: " + f->getName() << " "
+                        << toString(*f->signature) << "\n");
+    }
+#endif
+
+    // Find the one definition.
+    DefinedFunction *defined = nullptr;
+    for (auto *symbol : variants) {
+      if (auto f = dyn_cast<DefinedFunction>(symbol)) {
+        defined = f;
+        break;
+      }
+    }
+
+    // If there are no definitions, and the undefined symbols disagree on
+    // the signature, there is not we can do since we don't know which one
+    // to use as the signature on the import.
+    if (!defined) {
+      reportFunctionSignatureMismatch(symName,
+                                      cast<FunctionSymbol>(variants[0]),
+                                      cast<FunctionSymbol>(variants[1]), true);
+      return;
+    }
+
+    for (auto *symbol : variants) {
+      if (symbol != defined) {
+        auto *f = cast<FunctionSymbol>(symbol);
+        reportFunctionSignatureMismatch(symName, f, defined, false);
+        StringRef debugName = saver.save("unreachable:" + toString(*f));
+        replaceWithUnreachable(f, *f->signature, debugName);
+      }
+    }
   }
-
-  // If there is an existing undefined symbol, load a new one from the archive.
-  if (S->isUndefined()) {
-    LLVM_DEBUG(dbgs() << "replacing existing undefined\n");
-    File->addMember(Sym);
-  }
-}
-
-bool SymbolTable::addComdat(StringRef Name) {
-  return Comdats.insert(CachedHashStringRef(Name)).second;
 }
diff --git a/deps/lld/wasm/SymbolTable.h b/deps/lld/wasm/SymbolTable.h
index 64678aee50055c6cd08f42a1579639cfeb985752..530d5e864103d176ee202f78ce53dc92ebfd3b17 100644
--- a/deps/lld/wasm/SymbolTable.h
+++ b/deps/lld/wasm/SymbolTable.h
@@ -1,9 +1,8 @@
 //===- SymbolTable.h --------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -36,60 +35,89 @@ class InputSegment;
 // There is one add* function per symbol type.
 class SymbolTable {
 public:
-  void addFile(InputFile *File);
+  void wrap(Symbol *sym, Symbol *real, Symbol *wrap);
+
+  void addFile(InputFile *file);
+
   void addCombinedLTOObject();
 
-  std::vector<ObjFile *> ObjectFiles;
-  std::vector<BitcodeFile *> BitcodeFiles;
-  std::vector<InputFunction *> SyntheticFunctions;
-  std::vector<InputGlobal *> SyntheticGlobals;
-
-  void reportRemainingUndefines();
-
-  ArrayRef<Symbol *> getSymbols() const { return SymVector; }
-  Symbol *find(StringRef Name);
-
-  Symbol *addDefinedFunction(StringRef Name, uint32_t Flags, InputFile *File,
-                             InputFunction *Function);
-  Symbol *addDefinedData(StringRef Name, uint32_t Flags, InputFile *File,
-                         InputSegment *Segment, uint32_t Address,
-                         uint32_t Size);
-  Symbol *addDefinedGlobal(StringRef Name, uint32_t Flags, InputFile *File,
-                           InputGlobal *G);
-  Symbol *addDefinedEvent(StringRef Name, uint32_t Flags, InputFile *File,
-                          InputEvent *E);
-
-  Symbol *addUndefinedFunction(StringRef Name, StringRef ImportName,
-                               StringRef ImportModule, uint32_t Flags,
-                               InputFile *File, const WasmSignature *Signature);
-  Symbol *addUndefinedData(StringRef Name, uint32_t Flags, InputFile *File);
-  Symbol *addUndefinedGlobal(StringRef Name, StringRef ImportName,
-                             StringRef ImportModule,  uint32_t Flags,
-                             InputFile *File, const WasmGlobalType *Type);
-
-  void addLazy(ArchiveFile *F, const llvm::object::Archive::Symbol *Sym);
-
-  bool addComdat(StringRef Name);
-
-  DefinedData *addSyntheticDataSymbol(StringRef Name, uint32_t Flags);
-  DefinedGlobal *addSyntheticGlobal(StringRef Name, uint32_t Flags,
-                                    InputGlobal *Global);
-  DefinedFunction *addSyntheticFunction(StringRef Name, uint32_t Flags,
-                                        InputFunction *Function);
+  ArrayRef<Symbol *> getSymbols() const { return symVector; }
+
+  Symbol *find(StringRef name);
+
+  void replace(StringRef name, Symbol* sym);
+
+  void trace(StringRef name);
+
+  Symbol *addDefinedFunction(StringRef name, uint32_t flags, InputFile *file,
+                             InputFunction *function);
+  Symbol *addDefinedData(StringRef name, uint32_t flags, InputFile *file,
+                         InputSegment *segment, uint32_t address,
+                         uint32_t size);
+  Symbol *addDefinedGlobal(StringRef name, uint32_t flags, InputFile *file,
+                           InputGlobal *g);
+  Symbol *addDefinedEvent(StringRef name, uint32_t flags, InputFile *file,
+                          InputEvent *e);
+
+  Symbol *addUndefinedFunction(StringRef name, StringRef importName,
+                               StringRef importModule, uint32_t flags,
+                               InputFile *file, const WasmSignature *signature,
+                               bool isCalledDirectly);
+  Symbol *addUndefinedData(StringRef name, uint32_t flags, InputFile *file);
+  Symbol *addUndefinedGlobal(StringRef name, StringRef importName,
+                             StringRef importModule,  uint32_t flags,
+                             InputFile *file, const WasmGlobalType *type);
+
+  void addLazy(ArchiveFile *f, const llvm::object::Archive::Symbol *sym);
+
+  bool addComdat(StringRef name);
+
+  DefinedData *addSyntheticDataSymbol(StringRef name, uint32_t flags);
+  DefinedGlobal *addSyntheticGlobal(StringRef name, uint32_t flags,
+                                    InputGlobal *global);
+  DefinedFunction *addSyntheticFunction(StringRef name, uint32_t flags,
+                                        InputFunction *function);
+  DefinedData *addOptionalDataSymbol(StringRef name, uint32_t value = 0,
+                                     uint32_t flags = 0);
+
+  void handleSymbolVariants();
+  void handleWeakUndefines();
+
+  std::vector<ObjFile *> objectFiles;
+  std::vector<SharedFile *> sharedFiles;
+  std::vector<BitcodeFile *> bitcodeFiles;
+  std::vector<InputFunction *> syntheticFunctions;
+  std::vector<InputGlobal *> syntheticGlobals;
 
 private:
-  std::pair<Symbol *, bool> insert(StringRef Name, InputFile *File);
+  std::pair<Symbol *, bool> insert(StringRef name, const InputFile *file);
+  std::pair<Symbol *, bool> insertName(StringRef name);
 
-  llvm::DenseMap<llvm::CachedHashStringRef, Symbol *> SymMap;
-  std::vector<Symbol *> SymVector;
+  bool getFunctionVariant(Symbol* sym, const WasmSignature *sig,
+                          const InputFile *file, Symbol **out);
+  InputFunction *replaceWithUnreachable(Symbol *sym, const WasmSignature &sig,
+                                        StringRef debugName);
 
-  llvm::DenseSet<llvm::CachedHashStringRef> Comdats;
+  // Maps symbol names to index into the symVector.  -1 means that symbols
+  // is to not yet in the vector but it should have tracing enabled if it is
+  // ever added.
+  llvm::DenseMap<llvm::CachedHashStringRef, int> symMap;
+  std::vector<Symbol *> symVector;
+
+  // For certain symbols types, e.g. function symbols, we allow for muliple
+  // variants of the same symbol with different signatures.
+  llvm::DenseMap<llvm::CachedHashStringRef, std::vector<Symbol *>> symVariants;
+
+  // Comdat groups define "link once" sections. If two comdat groups have the
+  // same name, only one of them is linked, and the other is ignored. This set
+  // is used to uniquify them.
+  llvm::DenseSet<llvm::CachedHashStringRef> comdatGroups;
 
   // For LTO.
-  std::unique_ptr<BitcodeCompiler> LTO;
+  std::unique_ptr<BitcodeCompiler> lto;
 };
 
-extern SymbolTable *Symtab;
+extern SymbolTable *symtab;
 
 } // namespace wasm
 } // namespace lld
diff --git a/deps/lld/wasm/Symbols.cpp b/deps/lld/wasm/Symbols.cpp
index 4bef9761ec250c8d7abbe7d89a7f0dce46bb1025..7d8d532c8ce167911bb88032c69c08863ec4a73d 100644
--- a/deps/lld/wasm/Symbols.cpp
+++ b/deps/lld/wasm/Symbols.cpp
@@ -1,9 +1,8 @@
 //===- Symbols.cpp --------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -13,6 +12,7 @@
 #include "InputEvent.h"
 #include "InputFiles.h"
 #include "InputGlobal.h"
+#include "OutputSections.h"
 #include "OutputSegment.h"
 #include "lld/Common/ErrorHandler.h"
 #include "lld/Common/Strings.h"
@@ -24,13 +24,19 @@ using namespace llvm::wasm;
 using namespace lld;
 using namespace lld::wasm;
 
-DefinedFunction *WasmSym::CallCtors;
-DefinedData *WasmSym::DsoHandle;
-DefinedData *WasmSym::DataEnd;
-DefinedData *WasmSym::HeapBase;
-GlobalSymbol *WasmSym::StackPointer;
-UndefinedGlobal *WasmSym::TableBase;
-UndefinedGlobal *WasmSym::MemoryBase;
+DefinedFunction *WasmSym::callCtors;
+DefinedFunction *WasmSym::initMemory;
+DefinedFunction *WasmSym::applyRelocs;
+DefinedFunction *WasmSym::initTLS;
+DefinedData *WasmSym::dsoHandle;
+DefinedData *WasmSym::dataEnd;
+DefinedData *WasmSym::globalBase;
+DefinedData *WasmSym::heapBase;
+GlobalSymbol *WasmSym::stackPointer;
+GlobalSymbol *WasmSym::tlsBase;
+GlobalSymbol *WasmSym::tlsSize;
+UndefinedGlobal *WasmSym::tableBase;
+UndefinedGlobal *WasmSym::memoryBase;
 
 WasmSymbolType Symbol::getWasmType() const {
   if (isa<FunctionSymbol>(this))
@@ -41,238 +47,260 @@ WasmSymbolType Symbol::getWasmType() const {
     return WASM_SYMBOL_TYPE_GLOBAL;
   if (isa<EventSymbol>(this))
     return WASM_SYMBOL_TYPE_EVENT;
-  if (isa<SectionSymbol>(this))
+  if (isa<SectionSymbol>(this) || isa<OutputSectionSymbol>(this))
     return WASM_SYMBOL_TYPE_SECTION;
   llvm_unreachable("invalid symbol kind");
 }
 
+const WasmSignature *Symbol::getSignature() const {
+  if (auto* f = dyn_cast<FunctionSymbol>(this))
+    return f->signature;
+  if (auto *l = dyn_cast<LazySymbol>(this))
+    return l->signature;
+  return nullptr;
+}
+
 InputChunk *Symbol::getChunk() const {
-  if (auto *F = dyn_cast<DefinedFunction>(this))
-    return F->Function;
-  if (auto *D = dyn_cast<DefinedData>(this))
-    return D->Segment;
+  if (auto *f = dyn_cast<DefinedFunction>(this))
+    return f->function;
+  if (auto *d = dyn_cast<DefinedData>(this))
+    return d->segment;
   return nullptr;
 }
 
+bool Symbol::isDiscarded() const {
+  if (InputChunk *c = getChunk())
+    return c->discarded;
+  return false;
+}
+
 bool Symbol::isLive() const {
-  if (auto *G = dyn_cast<DefinedGlobal>(this))
-    return G->Global->Live;
-  if (auto *E = dyn_cast<DefinedEvent>(this))
-    return E->Event->Live;
-  if (InputChunk *C = getChunk())
-    return C->Live;
-  return Referenced;
+  if (auto *g = dyn_cast<DefinedGlobal>(this))
+    return g->global->live;
+  if (auto *e = dyn_cast<DefinedEvent>(this))
+    return e->event->live;
+  if (InputChunk *c = getChunk())
+    return c->live;
+  return referenced;
 }
 
 void Symbol::markLive() {
-  if (auto *G = dyn_cast<DefinedGlobal>(this))
-    G->Global->Live = true;
-  if (auto *E = dyn_cast<DefinedEvent>(this))
-    E->Event->Live = true;
-  if (InputChunk *C = getChunk())
-    C->Live = true;
-  Referenced = true;
+  assert(!isDiscarded());
+  if (auto *g = dyn_cast<DefinedGlobal>(this))
+    g->global->live = true;
+  if (auto *e = dyn_cast<DefinedEvent>(this))
+    e->event->live = true;
+  if (InputChunk *c = getChunk())
+    c->live = true;
+  referenced = true;
 }
 
 uint32_t Symbol::getOutputSymbolIndex() const {
-  assert(OutputSymbolIndex != INVALID_INDEX);
-  return OutputSymbolIndex;
+  assert(outputSymbolIndex != INVALID_INDEX);
+  return outputSymbolIndex;
 }
 
-void Symbol::setOutputSymbolIndex(uint32_t Index) {
-  LLVM_DEBUG(dbgs() << "setOutputSymbolIndex " << Name << " -> " << Index
+void Symbol::setOutputSymbolIndex(uint32_t index) {
+  LLVM_DEBUG(dbgs() << "setOutputSymbolIndex " << name << " -> " << index
                     << "\n");
-  assert(OutputSymbolIndex == INVALID_INDEX);
-  OutputSymbolIndex = Index;
+  assert(outputSymbolIndex == INVALID_INDEX);
+  outputSymbolIndex = index;
+}
+
+void Symbol::setGOTIndex(uint32_t index) {
+  LLVM_DEBUG(dbgs() << "setGOTIndex " << name << " -> " << index << "\n");
+  assert(gotIndex == INVALID_INDEX);
+  // Any symbol that is assigned a GOT entry must be exported othewise the
+  // dynamic linker won't be able create the entry that contains it.
+  forceExport = true;
+  gotIndex = index;
 }
 
 bool Symbol::isWeak() const {
-  return (Flags & WASM_SYMBOL_BINDING_MASK) == WASM_SYMBOL_BINDING_WEAK;
+  return (flags & WASM_SYMBOL_BINDING_MASK) == WASM_SYMBOL_BINDING_WEAK;
 }
 
 bool Symbol::isLocal() const {
-  return (Flags & WASM_SYMBOL_BINDING_MASK) == WASM_SYMBOL_BINDING_LOCAL;
+  return (flags & WASM_SYMBOL_BINDING_MASK) == WASM_SYMBOL_BINDING_LOCAL;
 }
 
 bool Symbol::isHidden() const {
-  return (Flags & WASM_SYMBOL_VISIBILITY_MASK) == WASM_SYMBOL_VISIBILITY_HIDDEN;
+  return (flags & WASM_SYMBOL_VISIBILITY_MASK) == WASM_SYMBOL_VISIBILITY_HIDDEN;
 }
 
-void Symbol::setHidden(bool IsHidden) {
-  LLVM_DEBUG(dbgs() << "setHidden: " << Name << " -> " << IsHidden << "\n");
-  Flags &= ~WASM_SYMBOL_VISIBILITY_MASK;
-  if (IsHidden)
-    Flags |= WASM_SYMBOL_VISIBILITY_HIDDEN;
+void Symbol::setHidden(bool isHidden) {
+  LLVM_DEBUG(dbgs() << "setHidden: " << name << " -> " << isHidden << "\n");
+  flags &= ~WASM_SYMBOL_VISIBILITY_MASK;
+  if (isHidden)
+    flags |= WASM_SYMBOL_VISIBILITY_HIDDEN;
   else
-    Flags |= WASM_SYMBOL_VISIBILITY_DEFAULT;
+    flags |= WASM_SYMBOL_VISIBILITY_DEFAULT;
 }
 
 bool Symbol::isExported() const {
   if (!isDefined() || isLocal())
     return false;
 
-  if (ForceExport || Config->ExportAll)
+  if (forceExport || config->exportAll)
     return true;
 
-  if (Config->ExportDynamic && !isHidden())
+  if (config->exportDynamic && !isHidden())
     return true;
 
-  return false;
+  return flags & WASM_SYMBOL_EXPORTED;
 }
 
 uint32_t FunctionSymbol::getFunctionIndex() const {
-  if (auto *F = dyn_cast<DefinedFunction>(this))
-    return F->Function->getFunctionIndex();
-  assert(FunctionIndex != INVALID_INDEX);
-  return FunctionIndex;
+  if (auto *f = dyn_cast<DefinedFunction>(this))
+    return f->function->getFunctionIndex();
+  assert(functionIndex != INVALID_INDEX);
+  return functionIndex;
 }
 
-void FunctionSymbol::setFunctionIndex(uint32_t Index) {
-  LLVM_DEBUG(dbgs() << "setFunctionIndex " << Name << " -> " << Index << "\n");
-  assert(FunctionIndex == INVALID_INDEX);
-  FunctionIndex = Index;
+void FunctionSymbol::setFunctionIndex(uint32_t index) {
+  LLVM_DEBUG(dbgs() << "setFunctionIndex " << name << " -> " << index << "\n");
+  assert(functionIndex == INVALID_INDEX);
+  functionIndex = index;
 }
 
 bool FunctionSymbol::hasFunctionIndex() const {
-  if (auto *F = dyn_cast<DefinedFunction>(this))
-    return F->Function->hasFunctionIndex();
-  return FunctionIndex != INVALID_INDEX;
+  if (auto *f = dyn_cast<DefinedFunction>(this))
+    return f->function->hasFunctionIndex();
+  return functionIndex != INVALID_INDEX;
 }
 
 uint32_t FunctionSymbol::getTableIndex() const {
-  if (auto *F = dyn_cast<DefinedFunction>(this))
-    return F->Function->getTableIndex();
-  assert(TableIndex != INVALID_INDEX);
-  return TableIndex;
+  if (auto *f = dyn_cast<DefinedFunction>(this))
+    return f->function->getTableIndex();
+  assert(tableIndex != INVALID_INDEX);
+  return tableIndex;
 }
 
 bool FunctionSymbol::hasTableIndex() const {
-  if (auto *F = dyn_cast<DefinedFunction>(this))
-    return F->Function->hasTableIndex();
-  return TableIndex != INVALID_INDEX;
+  if (auto *f = dyn_cast<DefinedFunction>(this))
+    return f->function->hasTableIndex();
+  return tableIndex != INVALID_INDEX;
 }
 
-void FunctionSymbol::setTableIndex(uint32_t Index) {
+void FunctionSymbol::setTableIndex(uint32_t index) {
   // For imports, we set the table index here on the Symbol; for defined
   // functions we set the index on the InputFunction so that we don't export
   // the same thing twice (keeps the table size down).
-  if (auto *F = dyn_cast<DefinedFunction>(this)) {
-    F->Function->setTableIndex(Index);
+  if (auto *f = dyn_cast<DefinedFunction>(this)) {
+    f->function->setTableIndex(index);
     return;
   }
-  LLVM_DEBUG(dbgs() << "setTableIndex " << Name << " -> " << Index << "\n");
-  assert(TableIndex == INVALID_INDEX);
-  TableIndex = Index;
+  LLVM_DEBUG(dbgs() << "setTableIndex " << name << " -> " << index << "\n");
+  assert(tableIndex == INVALID_INDEX);
+  tableIndex = index;
 }
 
-DefinedFunction::DefinedFunction(StringRef Name, uint32_t Flags, InputFile *F,
-                                 InputFunction *Function)
-    : FunctionSymbol(Name, DefinedFunctionKind, Flags, F,
-                     Function ? &Function->Signature : nullptr),
-      Function(Function) {}
+DefinedFunction::DefinedFunction(StringRef name, uint32_t flags, InputFile *f,
+                                 InputFunction *function)
+    : FunctionSymbol(name, DefinedFunctionKind, flags, f,
+                     function ? &function->signature : nullptr),
+      function(function) {}
 
 uint32_t DefinedData::getVirtualAddress() const {
   LLVM_DEBUG(dbgs() << "getVirtualAddress: " << getName() << "\n");
-  if (Segment)
-    return Segment->OutputSeg->StartVA + Segment->OutputSegmentOffset + Offset;
-  return Offset;
+  if (segment) {
+    // For thread local data, the symbol location is relative to the start of
+    // the .tdata section, since they are used as offsets from __tls_base.
+    // Hence, we do not add in segment->outputSeg->startVA.
+    if (segment->outputSeg->name == ".tdata")
+      return segment->outputSegmentOffset + offset;
+    return segment->outputSeg->startVA + segment->outputSegmentOffset + offset;
+  }
+  return offset;
 }
 
-void DefinedData::setVirtualAddress(uint32_t Value) {
-  LLVM_DEBUG(dbgs() << "setVirtualAddress " << Name << " -> " << Value << "\n");
-  assert(!Segment);
-  Offset = Value;
+void DefinedData::setVirtualAddress(uint32_t value) {
+  LLVM_DEBUG(dbgs() << "setVirtualAddress " << name << " -> " << value << "\n");
+  assert(!segment);
+  offset = value;
 }
 
 uint32_t DefinedData::getOutputSegmentOffset() const {
   LLVM_DEBUG(dbgs() << "getOutputSegmentOffset: " << getName() << "\n");
-  return Segment->OutputSegmentOffset + Offset;
+  return segment->outputSegmentOffset + offset;
 }
 
 uint32_t DefinedData::getOutputSegmentIndex() const {
   LLVM_DEBUG(dbgs() << "getOutputSegmentIndex: " << getName() << "\n");
-  return Segment->OutputSeg->Index;
+  return segment->outputSeg->index;
 }
 
 uint32_t GlobalSymbol::getGlobalIndex() const {
-  if (auto *F = dyn_cast<DefinedGlobal>(this))
-    return F->Global->getGlobalIndex();
-  assert(GlobalIndex != INVALID_INDEX);
-  return GlobalIndex;
+  if (auto *f = dyn_cast<DefinedGlobal>(this))
+    return f->global->getGlobalIndex();
+  assert(globalIndex != INVALID_INDEX);
+  return globalIndex;
 }
 
-void GlobalSymbol::setGlobalIndex(uint32_t Index) {
-  LLVM_DEBUG(dbgs() << "setGlobalIndex " << Name << " -> " << Index << "\n");
-  assert(GlobalIndex == INVALID_INDEX);
-  GlobalIndex = Index;
+void GlobalSymbol::setGlobalIndex(uint32_t index) {
+  LLVM_DEBUG(dbgs() << "setGlobalIndex " << name << " -> " << index << "\n");
+  assert(globalIndex == INVALID_INDEX);
+  globalIndex = index;
 }
 
 bool GlobalSymbol::hasGlobalIndex() const {
-  if (auto *F = dyn_cast<DefinedGlobal>(this))
-    return F->Global->hasGlobalIndex();
-  return GlobalIndex != INVALID_INDEX;
+  if (auto *f = dyn_cast<DefinedGlobal>(this))
+    return f->global->hasGlobalIndex();
+  return globalIndex != INVALID_INDEX;
 }
 
-DefinedGlobal::DefinedGlobal(StringRef Name, uint32_t Flags, InputFile *File,
-                             InputGlobal *Global)
-    : GlobalSymbol(Name, DefinedGlobalKind, Flags, File,
-                   Global ? &Global->getType() : nullptr),
-      Global(Global) {}
+DefinedGlobal::DefinedGlobal(StringRef name, uint32_t flags, InputFile *file,
+                             InputGlobal *global)
+    : GlobalSymbol(name, DefinedGlobalKind, flags, file,
+                   global ? &global->getType() : nullptr),
+      global(global) {}
 
 uint32_t EventSymbol::getEventIndex() const {
-  if (auto *F = dyn_cast<DefinedEvent>(this))
-    return F->Event->getEventIndex();
-  assert(EventIndex != INVALID_INDEX);
-  return EventIndex;
+  if (auto *f = dyn_cast<DefinedEvent>(this))
+    return f->event->getEventIndex();
+  assert(eventIndex != INVALID_INDEX);
+  return eventIndex;
 }
 
-void EventSymbol::setEventIndex(uint32_t Index) {
-  LLVM_DEBUG(dbgs() << "setEventIndex " << Name << " -> " << Index << "\n");
-  assert(EventIndex == INVALID_INDEX);
-  EventIndex = Index;
+void EventSymbol::setEventIndex(uint32_t index) {
+  LLVM_DEBUG(dbgs() << "setEventIndex " << name << " -> " << index << "\n");
+  assert(eventIndex == INVALID_INDEX);
+  eventIndex = index;
 }
 
 bool EventSymbol::hasEventIndex() const {
-  if (auto *F = dyn_cast<DefinedEvent>(this))
-    return F->Event->hasEventIndex();
-  return EventIndex != INVALID_INDEX;
+  if (auto *f = dyn_cast<DefinedEvent>(this))
+    return f->event->hasEventIndex();
+  return eventIndex != INVALID_INDEX;
 }
 
-DefinedEvent::DefinedEvent(StringRef Name, uint32_t Flags, InputFile *File,
-                           InputEvent *Event)
-    : EventSymbol(Name, DefinedEventKind, Flags, File,
-                  Event ? &Event->getType() : nullptr,
-                  Event ? &Event->Signature : nullptr),
-      Event(Event) {}
+DefinedEvent::DefinedEvent(StringRef name, uint32_t flags, InputFile *file,
+                           InputEvent *event)
+    : EventSymbol(name, DefinedEventKind, flags, file,
+                  event ? &event->getType() : nullptr,
+                  event ? &event->signature : nullptr),
+      event(event) {}
 
-uint32_t SectionSymbol::getOutputSectionIndex() const {
-  LLVM_DEBUG(dbgs() << "getOutputSectionIndex: " << getName() << "\n");
-  assert(OutputSectionIndex != INVALID_INDEX);
-  return OutputSectionIndex;
+const OutputSectionSymbol *SectionSymbol::getOutputSectionSymbol() const {
+  assert(section->outputSec && section->outputSec->sectionSym);
+  return section->outputSec->sectionSym;
 }
 
-void SectionSymbol::setOutputSectionIndex(uint32_t Index) {
-  LLVM_DEBUG(dbgs() << "setOutputSectionIndex: " << getName() << " -> " << Index
-                    << "\n");
-  assert(Index != INVALID_INDEX);
-  OutputSectionIndex = Index;
-}
-
-void LazySymbol::fetch() { cast<ArchiveFile>(File)->addMember(&ArchiveSymbol); }
+void LazySymbol::fetch() { cast<ArchiveFile>(file)->addMember(&archiveSymbol); }
 
-std::string lld::toString(const wasm::Symbol &Sym) {
-  return lld::maybeDemangleSymbol(Sym.getName());
+std::string lld::toString(const wasm::Symbol &sym) {
+  return lld::maybeDemangleSymbol(sym.getName());
 }
 
-std::string lld::maybeDemangleSymbol(StringRef Name) {
-  if (Config->Demangle)
-    if (Optional<std::string> S = demangleItanium(Name))
-      return *S;
-  return Name;
+std::string lld::maybeDemangleSymbol(StringRef name) {
+  if (config->demangle)
+    if (Optional<std::string> s = demangleItanium(name))
+      return *s;
+  return name;
 }
 
-std::string lld::toString(wasm::Symbol::Kind Kind) {
-  switch (Kind) {
+std::string lld::toString(wasm::Symbol::Kind kind) {
+  switch (kind) {
   case wasm::Symbol::DefinedFunctionKind:
     return "DefinedFunction";
   case wasm::Symbol::DefinedDataKind:
@@ -291,6 +319,31 @@ std::string lld::toString(wasm::Symbol::Kind Kind) {
     return "LazyKind";
   case wasm::Symbol::SectionKind:
     return "SectionKind";
+  case wasm::Symbol::OutputSectionKind:
+    return "OutputSectionKind";
   }
   llvm_unreachable("invalid symbol kind");
 }
+
+
+void lld::wasm::printTraceSymbolUndefined(StringRef name, const InputFile* file) {
+  message(toString(file) + ": reference to " + name);
+}
+
+// Print out a log message for --trace-symbol.
+void lld::wasm::printTraceSymbol(Symbol *sym) {
+  // Undefined symbols are traced via printTraceSymbolUndefined
+  if (sym->isUndefined())
+    return;
+
+  std::string s;
+  if (sym->isLazy())
+    s = ": lazy definition of ";
+  else
+    s = ": definition of ";
+
+  message(toString(sym->getFile()) + s + sym->getName());
+}
+
+const char *lld::wasm::defaultModule = "env";
+const char *lld::wasm::functionTableName = "__indirect_function_table";
diff --git a/deps/lld/wasm/Symbols.h b/deps/lld/wasm/Symbols.h
index a065338ac1e42c2f61a3a852396e2019d51d5906..f4816aae7055199cf82a0202be50cbef5809cdc4 100644
--- a/deps/lld/wasm/Symbols.h
+++ b/deps/lld/wasm/Symbols.h
@@ -1,9 +1,8 @@
 //===- Symbols.h ------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -18,6 +17,14 @@
 namespace lld {
 namespace wasm {
 
+// Shared string constants
+
+// The default module name to use for symbol imports.
+extern const char *defaultModule;
+
+// The name under which to import or export the wasm table.
+extern const char *functionTableName;
+
 using llvm::wasm::WasmSymbolType;
 
 class InputFile;
@@ -27,48 +34,58 @@ class InputFunction;
 class InputGlobal;
 class InputEvent;
 class InputSection;
+class OutputSection;
 
 #define INVALID_INDEX UINT32_MAX
 
 // The base class for real symbol classes.
 class Symbol {
 public:
-  enum Kind {
+  enum Kind : uint8_t {
     DefinedFunctionKind,
     DefinedDataKind,
     DefinedGlobalKind,
     DefinedEventKind,
     SectionKind,
+    OutputSectionKind,
     UndefinedFunctionKind,
     UndefinedDataKind,
     UndefinedGlobalKind,
     LazyKind,
   };
 
-  Kind kind() const { return SymbolKind; }
+  Kind kind() const { return symbolKind; }
 
-  bool isDefined() const {
-    return SymbolKind == DefinedFunctionKind || SymbolKind == DefinedDataKind ||
-           SymbolKind == DefinedGlobalKind || SymbolKind == DefinedEventKind ||
-           SymbolKind == SectionKind;
-  }
+  bool isDefined() const { return !isLazy() && !isUndefined(); }
 
   bool isUndefined() const {
-    return SymbolKind == UndefinedFunctionKind ||
-           SymbolKind == UndefinedDataKind || SymbolKind == UndefinedGlobalKind;
+    return symbolKind == UndefinedFunctionKind ||
+           symbolKind == UndefinedDataKind || symbolKind == UndefinedGlobalKind;
   }
 
-  bool isLazy() const { return SymbolKind == LazyKind; }
+  bool isLazy() const { return symbolKind == LazyKind; }
 
   bool isLocal() const;
   bool isWeak() const;
   bool isHidden() const;
 
+  // Returns true if this symbol exists in a discarded (due to COMDAT) section
+  bool isDiscarded() const;
+
+  // True if this is an undefined weak symbol. This only works once
+  // all input files have been added.
+  bool isUndefWeak() const {
+    // See comment on lazy symbols for details.
+    return isWeak() && (isUndefined() || isLazy());
+  }
+
   // Returns the symbol name.
-  StringRef getName() const { return Name; }
+  StringRef getName() const { return name; }
 
   // Returns the file from which this symbol was created.
-  InputFile *getFile() const { return File; }
+  InputFile *getFile() const { return file; }
+
+  uint32_t getFlags() const { return flags; }
 
   InputChunk *getChunk() const;
 
@@ -80,205 +97,249 @@ public:
   // final image.
   void markLive();
 
-  void setHidden(bool IsHidden);
+  void setHidden(bool isHidden);
 
   // Get/set the index in the output symbol table.  This is only used for
   // relocatable output.
   uint32_t getOutputSymbolIndex() const;
-  void setOutputSymbolIndex(uint32_t Index);
+  void setOutputSymbolIndex(uint32_t index);
 
   WasmSymbolType getWasmType() const;
   bool isExported() const;
 
-  // True if this symbol was referenced by a regular (non-bitcode) object.
-  unsigned IsUsedInRegularObj : 1;
-  unsigned ForceExport : 1;
+  const WasmSignature* getSignature() const;
+
+  bool isInGOT() const { return gotIndex != INVALID_INDEX; }
+
+  uint32_t getGOTIndex() const {
+    assert(gotIndex != INVALID_INDEX);
+    return gotIndex;
+  }
+
+  void setGOTIndex(uint32_t index);
+  bool hasGOTIndex() const { return gotIndex != INVALID_INDEX; }
 
 protected:
-  Symbol(StringRef Name, Kind K, uint32_t Flags, InputFile *F)
-      : IsUsedInRegularObj(false), ForceExport(false), Name(Name),
-        SymbolKind(K), Flags(Flags), File(F), Referenced(!Config->GcSections) {}
-
-  StringRef Name;
-  Kind SymbolKind;
-  uint32_t Flags;
-  InputFile *File;
-  uint32_t OutputSymbolIndex = INVALID_INDEX;
-  bool Referenced;
+  Symbol(StringRef name, Kind k, uint32_t flags, InputFile *f)
+      : name(name), file(f), flags(flags), symbolKind(k),
+        referenced(!config->gcSections), isUsedInRegularObj(false),
+        forceExport(false), canInline(false), traced(false) {}
+
+  StringRef name;
+  InputFile *file;
+  uint32_t flags;
+  uint32_t outputSymbolIndex = INVALID_INDEX;
+  uint32_t gotIndex = INVALID_INDEX;
+  Kind symbolKind;
+
+public:
+  bool referenced : 1;
+
+  // True if the symbol was used for linking and thus need to be added to the
+  // output file's symbol table. This is true for all symbols except for
+  // unreferenced DSO symbols, lazy (archive) symbols, and bitcode symbols that
+  // are unreferenced except by other bitcode objects.
+  bool isUsedInRegularObj : 1;
+
+  // True if ths symbol is explicity marked for export (i.e. via the -e/--export
+  // command line flag)
+  bool forceExport : 1;
+
+  // False if LTO shouldn't inline whatever this symbol points to. If a symbol
+  // is overwritten after LTO, LTO shouldn't inline the symbol because it
+  // doesn't know the final contents of the symbol.
+  bool canInline : 1;
+
+  // True if this symbol is specified by --trace-symbol option.
+  bool traced : 1;
 };
 
 class FunctionSymbol : public Symbol {
 public:
-  static bool classof(const Symbol *S) {
-    return S->kind() == DefinedFunctionKind ||
-           S->kind() == UndefinedFunctionKind;
+  static bool classof(const Symbol *s) {
+    return s->kind() == DefinedFunctionKind ||
+           s->kind() == UndefinedFunctionKind;
   }
 
   // Get/set the table index
-  void setTableIndex(uint32_t Index);
+  void setTableIndex(uint32_t index);
   uint32_t getTableIndex() const;
   bool hasTableIndex() const;
 
   // Get/set the function index
   uint32_t getFunctionIndex() const;
-  void setFunctionIndex(uint32_t Index);
+  void setFunctionIndex(uint32_t index);
   bool hasFunctionIndex() const;
 
-  const WasmSignature *Signature;
+  const WasmSignature *signature;
 
 protected:
-  FunctionSymbol(StringRef Name, Kind K, uint32_t Flags, InputFile *F,
-                 const WasmSignature *Sig)
-      : Symbol(Name, K, Flags, F), Signature(Sig) {}
+  FunctionSymbol(StringRef name, Kind k, uint32_t flags, InputFile *f,
+                 const WasmSignature *sig)
+      : Symbol(name, k, flags, f), signature(sig) {}
 
-  uint32_t TableIndex = INVALID_INDEX;
-  uint32_t FunctionIndex = INVALID_INDEX;
+  uint32_t tableIndex = INVALID_INDEX;
+  uint32_t functionIndex = INVALID_INDEX;
 };
 
 class DefinedFunction : public FunctionSymbol {
 public:
-  DefinedFunction(StringRef Name, uint32_t Flags, InputFile *F,
-                  InputFunction *Function);
+  DefinedFunction(StringRef name, uint32_t flags, InputFile *f,
+                  InputFunction *function);
 
-  static bool classof(const Symbol *S) {
-    return S->kind() == DefinedFunctionKind;
+  static bool classof(const Symbol *s) {
+    return s->kind() == DefinedFunctionKind;
   }
 
-  InputFunction *Function;
+  InputFunction *function;
 };
 
 class UndefinedFunction : public FunctionSymbol {
 public:
-  UndefinedFunction(StringRef Name, StringRef ImportName,
-                    StringRef ImportModule, uint32_t Flags,
-                    InputFile *File = nullptr,
-                    const WasmSignature *Type = nullptr)
-      : FunctionSymbol(Name, UndefinedFunctionKind, Flags, File, Type),
-        ImportName(ImportName), ImportModule(ImportModule) {}
-
-  static bool classof(const Symbol *S) {
-    return S->kind() == UndefinedFunctionKind;
+  UndefinedFunction(StringRef name, StringRef importName,
+                    StringRef importModule, uint32_t flags,
+                    InputFile *file = nullptr,
+                    const WasmSignature *type = nullptr,
+                    bool isCalledDirectly = true)
+      : FunctionSymbol(name, UndefinedFunctionKind, flags, file, type),
+        importName(importName), importModule(importModule), isCalledDirectly(isCalledDirectly) {}
+
+  static bool classof(const Symbol *s) {
+    return s->kind() == UndefinedFunctionKind;
+  }
+
+  StringRef importName;
+  StringRef importModule;
+  bool isCalledDirectly;
+};
+
+// Section symbols for output sections are different from those for input
+// section.  These are generated by the linker and point the OutputSection
+// rather than an InputSection.
+class OutputSectionSymbol : public Symbol {
+public:
+  OutputSectionSymbol(const OutputSection *s)
+      : Symbol("", OutputSectionKind, llvm::wasm::WASM_SYMBOL_BINDING_LOCAL,
+               nullptr),
+        section(s) {}
+
+  static bool classof(const Symbol *s) {
+    return s->kind() == OutputSectionKind;
   }
 
-  StringRef ImportName;
-  StringRef ImportModule;
+  const OutputSection *section;
 };
 
 class SectionSymbol : public Symbol {
 public:
-  static bool classof(const Symbol *S) { return S->kind() == SectionKind; }
+  SectionSymbol(uint32_t flags, const InputSection *s, InputFile *f = nullptr)
+      : Symbol("", SectionKind, flags, f), section(s) {}
 
-  SectionSymbol(StringRef Name, uint32_t Flags, const InputSection *S,
-                InputFile *F = nullptr)
-      : Symbol(Name, SectionKind, Flags, F), Section(S) {}
+  static bool classof(const Symbol *s) { return s->kind() == SectionKind; }
 
-  const InputSection *Section;
+  const OutputSectionSymbol *getOutputSectionSymbol() const;
 
-  uint32_t getOutputSectionIndex() const;
-  void setOutputSectionIndex(uint32_t Index);
-
-protected:
-  uint32_t OutputSectionIndex = INVALID_INDEX;
+  const InputSection *section;
 };
 
 class DataSymbol : public Symbol {
 public:
-  static bool classof(const Symbol *S) {
-    return S->kind() == DefinedDataKind || S->kind() == UndefinedDataKind;
+  static bool classof(const Symbol *s) {
+    return s->kind() == DefinedDataKind || s->kind() == UndefinedDataKind;
   }
 
 protected:
-  DataSymbol(StringRef Name, Kind K, uint32_t Flags, InputFile *F)
-      : Symbol(Name, K, Flags, F) {}
+  DataSymbol(StringRef name, Kind k, uint32_t flags, InputFile *f)
+      : Symbol(name, k, flags, f) {}
 };
 
 class DefinedData : public DataSymbol {
 public:
   // Constructor for regular data symbols originating from input files.
-  DefinedData(StringRef Name, uint32_t Flags, InputFile *F,
-              InputSegment *Segment, uint32_t Offset, uint32_t Size)
-      : DataSymbol(Name, DefinedDataKind, Flags, F), Segment(Segment),
-        Offset(Offset), Size(Size) {}
+  DefinedData(StringRef name, uint32_t flags, InputFile *f,
+              InputSegment *segment, uint32_t offset, uint32_t size)
+      : DataSymbol(name, DefinedDataKind, flags, f), segment(segment),
+        offset(offset), size(size) {}
 
   // Constructor for linker synthetic data symbols.
-  DefinedData(StringRef Name, uint32_t Flags)
-      : DataSymbol(Name, DefinedDataKind, Flags, nullptr) {}
+  DefinedData(StringRef name, uint32_t flags)
+      : DataSymbol(name, DefinedDataKind, flags, nullptr) {}
 
-  static bool classof(const Symbol *S) { return S->kind() == DefinedDataKind; }
+  static bool classof(const Symbol *s) { return s->kind() == DefinedDataKind; }
 
   // Returns the output virtual address of a defined data symbol.
   uint32_t getVirtualAddress() const;
-  void setVirtualAddress(uint32_t VA);
+  void setVirtualAddress(uint32_t va);
 
   // Returns the offset of a defined data symbol within its OutputSegment.
   uint32_t getOutputSegmentOffset() const;
   uint32_t getOutputSegmentIndex() const;
-  uint32_t getSize() const { return Size; }
+  uint32_t getSize() const { return size; }
 
-  InputSegment *Segment = nullptr;
+  InputSegment *segment = nullptr;
 
 protected:
-  uint32_t Offset = 0;
-  uint32_t Size = 0;
+  uint32_t offset = 0;
+  uint32_t size = 0;
 };
 
 class UndefinedData : public DataSymbol {
 public:
-  UndefinedData(StringRef Name, uint32_t Flags, InputFile *File = nullptr)
-      : DataSymbol(Name, UndefinedDataKind, Flags, File) {}
-  static bool classof(const Symbol *S) {
-    return S->kind() == UndefinedDataKind;
+  UndefinedData(StringRef name, uint32_t flags, InputFile *file = nullptr)
+      : DataSymbol(name, UndefinedDataKind, flags, file) {}
+  static bool classof(const Symbol *s) {
+    return s->kind() == UndefinedDataKind;
   }
 };
 
 class GlobalSymbol : public Symbol {
 public:
-  static bool classof(const Symbol *S) {
-    return S->kind() == DefinedGlobalKind || S->kind() == UndefinedGlobalKind;
+  static bool classof(const Symbol *s) {
+    return s->kind() == DefinedGlobalKind || s->kind() == UndefinedGlobalKind;
   }
 
-  const WasmGlobalType *getGlobalType() const { return GlobalType; }
+  const WasmGlobalType *getGlobalType() const { return globalType; }
 
   // Get/set the global index
   uint32_t getGlobalIndex() const;
-  void setGlobalIndex(uint32_t Index);
+  void setGlobalIndex(uint32_t index);
   bool hasGlobalIndex() const;
 
 protected:
-  GlobalSymbol(StringRef Name, Kind K, uint32_t Flags, InputFile *F,
-               const WasmGlobalType *GlobalType)
-      : Symbol(Name, K, Flags, F), GlobalType(GlobalType) {}
+  GlobalSymbol(StringRef name, Kind k, uint32_t flags, InputFile *f,
+               const WasmGlobalType *globalType)
+      : Symbol(name, k, flags, f), globalType(globalType) {}
 
-  const WasmGlobalType *GlobalType;
-  uint32_t GlobalIndex = INVALID_INDEX;
+  const WasmGlobalType *globalType;
+  uint32_t globalIndex = INVALID_INDEX;
 };
 
 class DefinedGlobal : public GlobalSymbol {
 public:
-  DefinedGlobal(StringRef Name, uint32_t Flags, InputFile *File,
-                InputGlobal *Global);
+  DefinedGlobal(StringRef name, uint32_t flags, InputFile *file,
+                InputGlobal *global);
 
-  static bool classof(const Symbol *S) {
-    return S->kind() == DefinedGlobalKind;
+  static bool classof(const Symbol *s) {
+    return s->kind() == DefinedGlobalKind;
   }
 
-  InputGlobal *Global;
+  InputGlobal *global;
 };
 
 class UndefinedGlobal : public GlobalSymbol {
 public:
-  UndefinedGlobal(StringRef Name, StringRef ImportName, StringRef ImportModule,
-                  uint32_t Flags, InputFile *File = nullptr,
-                  const WasmGlobalType *Type = nullptr)
-      : GlobalSymbol(Name, UndefinedGlobalKind, Flags, File, Type),
-        ImportName(ImportName), ImportModule(ImportModule) {}
+  UndefinedGlobal(StringRef name, StringRef importName, StringRef importModule,
+                  uint32_t flags, InputFile *file = nullptr,
+                  const WasmGlobalType *type = nullptr)
+      : GlobalSymbol(name, UndefinedGlobalKind, flags, file, type),
+        importName(importName), importModule(importModule) {}
 
-  static bool classof(const Symbol *S) {
-    return S->kind() == UndefinedGlobalKind;
+  static bool classof(const Symbol *s) {
+    return s->kind() == UndefinedGlobalKind;
   }
 
-  StringRef ImportName;
-  StringRef ImportModule;
+  StringRef importName;
+  StringRef importModule;
 };
 
 // Wasm events are features that suspend the current execution and transfer the
@@ -295,100 +356,149 @@ public:
 // are used, and has name '__cpp_exception' for linking.
 class EventSymbol : public Symbol {
 public:
-  static bool classof(const Symbol *S) { return S->kind() == DefinedEventKind; }
+  static bool classof(const Symbol *s) { return s->kind() == DefinedEventKind; }
 
-  const WasmEventType *getEventType() const { return EventType; }
+  const WasmEventType *getEventType() const { return eventType; }
 
   // Get/set the event index
   uint32_t getEventIndex() const;
-  void setEventIndex(uint32_t Index);
+  void setEventIndex(uint32_t index);
   bool hasEventIndex() const;
 
-  const WasmSignature *Signature;
+  const WasmSignature *signature;
 
 protected:
-  EventSymbol(StringRef Name, Kind K, uint32_t Flags, InputFile *F,
-              const WasmEventType *EventType, const WasmSignature *Sig)
-      : Symbol(Name, K, Flags, F), Signature(Sig), EventType(EventType) {}
+  EventSymbol(StringRef name, Kind k, uint32_t flags, InputFile *f,
+              const WasmEventType *eventType, const WasmSignature *sig)
+      : Symbol(name, k, flags, f), signature(sig), eventType(eventType) {}
 
-  const WasmEventType *EventType;
-  uint32_t EventIndex = INVALID_INDEX;
+  const WasmEventType *eventType;
+  uint32_t eventIndex = INVALID_INDEX;
 };
 
 class DefinedEvent : public EventSymbol {
 public:
-  DefinedEvent(StringRef Name, uint32_t Flags, InputFile *File,
-               InputEvent *Event);
+  DefinedEvent(StringRef name, uint32_t flags, InputFile *file,
+               InputEvent *event);
 
-  static bool classof(const Symbol *S) { return S->kind() == DefinedEventKind; }
+  static bool classof(const Symbol *s) { return s->kind() == DefinedEventKind; }
 
-  InputEvent *Event;
+  InputEvent *event;
 };
 
+// LazySymbol represents a symbol that is not yet in the link, but we know where
+// to find it if needed. If the resolver finds both Undefined and Lazy for the
+// same name, it will ask the Lazy to load a file.
+//
+// A special complication is the handling of weak undefined symbols. They should
+// not load a file, but we have to remember we have seen both the weak undefined
+// and the lazy. We represent that with a lazy symbol with a weak binding. This
+// means that code looking for undefined symbols normally also has to take lazy
+// symbols into consideration.
 class LazySymbol : public Symbol {
 public:
-  LazySymbol(StringRef Name, InputFile *File,
-             const llvm::object::Archive::Symbol &Sym)
-      : Symbol(Name, LazyKind, 0, File), ArchiveSymbol(Sym) {}
+  LazySymbol(StringRef name, uint32_t flags, InputFile *file,
+             const llvm::object::Archive::Symbol &sym)
+      : Symbol(name, LazyKind, flags, file), archiveSymbol(sym) {}
 
-  static bool classof(const Symbol *S) { return S->kind() == LazyKind; }
+  static bool classof(const Symbol *s) { return s->kind() == LazyKind; }
   void fetch();
 
+  // Lazy symbols can have a signature because they can replace an
+  // UndefinedFunction which which case we need to be able to preserve the
+  // signture.
+  // TODO(sbc): This repetition of the signature field is inelegant.  Revisit
+  // the use of class hierarchy to represent symbol taxonomy.
+  const WasmSignature *signature = nullptr;
+
 private:
-  llvm::object::Archive::Symbol ArchiveSymbol;
+  llvm::object::Archive::Symbol archiveSymbol;
 };
 
 // linker-generated symbols
 struct WasmSym {
+  // __global_base
+  // Symbol marking the start of the global section.
+  static DefinedData *globalBase;
+
   // __stack_pointer
   // Global that holds the address of the top of the explicit value stack in
   // linear memory.
-  static GlobalSymbol *StackPointer;
+  static GlobalSymbol *stackPointer;
+
+  // __tls_base
+  // Global that holds the address of the base of the current thread's
+  // TLS block.
+  static GlobalSymbol *tlsBase;
+
+  // __tls_size
+  // Symbol whose value is the size of the TLS block.
+  static GlobalSymbol *tlsSize;
 
   // __data_end
   // Symbol marking the end of the data and bss.
-  static DefinedData *DataEnd;
+  static DefinedData *dataEnd;
 
   // __heap_base
   // Symbol marking the end of the data, bss and explicit stack.  Any linear
   // memory following this address is not used by the linked code and can
   // therefore be used as a backing store for brk()/malloc() implementations.
-  static DefinedData *HeapBase;
+  static DefinedData *heapBase;
 
   // __wasm_call_ctors
   // Function that directly calls all ctors in priority order.
-  static DefinedFunction *CallCtors;
+  static DefinedFunction *callCtors;
+
+  // __wasm_init_memory
+  // Function that initializes passive data segments post-instantiation.
+  static DefinedFunction *initMemory;
+
+  // __wasm_apply_relocs
+  // Function that applies relocations to data segment post-instantiation.
+  static DefinedFunction *applyRelocs;
+
+  // __wasm_init_tls
+  // Function that allocates thread-local storage and initializes it.
+  static DefinedFunction *initTLS;
 
   // __dso_handle
   // Symbol used in calls to __cxa_atexit to determine current DLL
-  static DefinedData *DsoHandle;
+  static DefinedData *dsoHandle;
 
   // __table_base
   // Used in PIC code for offset of indirect function table
-  static UndefinedGlobal *TableBase;
+  static UndefinedGlobal *tableBase;
 
   // __memory_base
   // Used in PIC code for offset of global data
-  static UndefinedGlobal *MemoryBase;
+  static UndefinedGlobal *memoryBase;
 };
 
 // A buffer class that is large enough to hold any Symbol-derived
 // object. We allocate memory using this class and instantiate a symbol
 // using the placement new.
 union SymbolUnion {
-  alignas(DefinedFunction) char A[sizeof(DefinedFunction)];
-  alignas(DefinedData) char B[sizeof(DefinedData)];
-  alignas(DefinedGlobal) char C[sizeof(DefinedGlobal)];
-  alignas(DefinedEvent) char D[sizeof(DefinedEvent)];
-  alignas(LazySymbol) char E[sizeof(LazySymbol)];
-  alignas(UndefinedFunction) char F[sizeof(UndefinedFunction)];
-  alignas(UndefinedData) char G[sizeof(UndefinedData)];
-  alignas(UndefinedGlobal) char H[sizeof(UndefinedGlobal)];
-  alignas(SectionSymbol) char I[sizeof(SectionSymbol)];
+  alignas(DefinedFunction) char a[sizeof(DefinedFunction)];
+  alignas(DefinedData) char b[sizeof(DefinedData)];
+  alignas(DefinedGlobal) char c[sizeof(DefinedGlobal)];
+  alignas(DefinedEvent) char d[sizeof(DefinedEvent)];
+  alignas(LazySymbol) char e[sizeof(LazySymbol)];
+  alignas(UndefinedFunction) char f[sizeof(UndefinedFunction)];
+  alignas(UndefinedData) char g[sizeof(UndefinedData)];
+  alignas(UndefinedGlobal) char h[sizeof(UndefinedGlobal)];
+  alignas(SectionSymbol) char i[sizeof(SectionSymbol)];
 };
 
+// It is important to keep the size of SymbolUnion small for performance and
+// memory usage reasons. 96 bytes is a soft limit based on the size of
+// UndefinedFunction on a 64-bit system.
+static_assert(sizeof(SymbolUnion) <= 96, "SymbolUnion too large");
+
+void printTraceSymbol(Symbol *sym);
+void printTraceSymbolUndefined(StringRef name, const InputFile* file);
+
 template <typename T, typename... ArgT>
-T *replaceSymbol(Symbol *S, ArgT &&... Arg) {
+T *replaceSymbol(Symbol *s, ArgT &&... arg) {
   static_assert(std::is_trivially_destructible<T>(),
                 "Symbol types must be trivially destructible");
   static_assert(sizeof(T) <= sizeof(SymbolUnion), "SymbolUnion too small");
@@ -397,20 +507,28 @@ T *replaceSymbol(Symbol *S, ArgT &&... Arg) {
   assert(static_cast<Symbol *>(static_cast<T *>(nullptr)) == nullptr &&
          "Not a Symbol");
 
-  Symbol SymCopy = *S;
+  Symbol symCopy = *s;
 
-  T *S2 = new (S) T(std::forward<ArgT>(Arg)...);
-  S2->IsUsedInRegularObj = SymCopy.IsUsedInRegularObj;
-  S2->ForceExport = SymCopy.ForceExport;
-  return S2;
+  T *s2 = new (s) T(std::forward<ArgT>(arg)...);
+  s2->isUsedInRegularObj = symCopy.isUsedInRegularObj;
+  s2->forceExport = symCopy.forceExport;
+  s2->canInline = symCopy.canInline;
+  s2->traced = symCopy.traced;
+
+  // Print out a log message if --trace-symbol was specified.
+  // This is for debugging.
+  if (s2->traced)
+    printTraceSymbol(s2);
+
+  return s2;
 }
 
 } // namespace wasm
 
 // Returns a symbol name for an error message.
-std::string toString(const wasm::Symbol &Sym);
-std::string toString(wasm::Symbol::Kind Kind);
-std::string maybeDemangleSymbol(StringRef Name);
+std::string toString(const wasm::Symbol &sym);
+std::string toString(wasm::Symbol::Kind kind);
+std::string maybeDemangleSymbol(StringRef name);
 
 } // namespace lld
 
diff --git a/deps/lld/wasm/SyntheticSections.cpp b/deps/lld/wasm/SyntheticSections.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..6d5d14ff40e645277a3142f9e251640dc03e3385
--- /dev/null
+++ b/deps/lld/wasm/SyntheticSections.cpp
@@ -0,0 +1,547 @@
+//===- SyntheticSections.cpp ----------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file contains linker-synthesized sections.
+//
+//===----------------------------------------------------------------------===//
+
+#include "SyntheticSections.h"
+
+#include "InputChunks.h"
+#include "InputEvent.h"
+#include "InputGlobal.h"
+#include "OutputSegment.h"
+#include "SymbolTable.h"
+#include "llvm/Support/Path.h"
+
+using namespace llvm;
+using namespace llvm::wasm;
+
+using namespace lld;
+using namespace lld::wasm;
+
+OutStruct lld::wasm::out;
+
+namespace {
+
+// Some synthetic sections (e.g. "name" and "linking") have subsections.
+// Just like the synthetic sections themselves these need to be created before
+// they can be written out (since they are preceded by their length). This
+// class is used to create subsections and then write them into the stream
+// of the parent section.
+class SubSection {
+public:
+  explicit SubSection(uint32_t type) : type(type) {}
+
+  void writeTo(raw_ostream &to) {
+    os.flush();
+    writeUleb128(to, type, "subsection type");
+    writeUleb128(to, body.size(), "subsection size");
+    to.write(body.data(), body.size());
+  }
+
+private:
+  uint32_t type;
+  std::string body;
+
+public:
+  raw_string_ostream os{body};
+};
+
+} // namespace
+
+void DylinkSection::writeBody() {
+  raw_ostream &os = bodyOutputStream;
+
+  writeUleb128(os, memSize, "MemSize");
+  writeUleb128(os, memAlign, "MemAlign");
+  writeUleb128(os, out.elemSec->numEntries(), "TableSize");
+  writeUleb128(os, 0, "TableAlign");
+  writeUleb128(os, symtab->sharedFiles.size(), "Needed");
+  for (auto *so : symtab->sharedFiles)
+    writeStr(os, llvm::sys::path::filename(so->getName()), "so name");
+}
+
+uint32_t TypeSection::registerType(const WasmSignature &sig) {
+  auto pair = typeIndices.insert(std::make_pair(sig, types.size()));
+  if (pair.second) {
+    LLVM_DEBUG(llvm::dbgs() << "type " << toString(sig) << "\n");
+    types.push_back(&sig);
+  }
+  return pair.first->second;
+}
+
+uint32_t TypeSection::lookupType(const WasmSignature &sig) {
+  auto it = typeIndices.find(sig);
+  if (it == typeIndices.end()) {
+    error("type not found: " + toString(sig));
+    return 0;
+  }
+  return it->second;
+}
+
+void TypeSection::writeBody() {
+  writeUleb128(bodyOutputStream, types.size(), "type count");
+  for (const WasmSignature *sig : types)
+    writeSig(bodyOutputStream, *sig);
+}
+
+uint32_t ImportSection::getNumImports() const {
+  assert(isSealed);
+  uint32_t numImports = importedSymbols.size() + gotSymbols.size();
+  if (config->importMemory)
+    ++numImports;
+  if (config->importTable)
+    ++numImports;
+  return numImports;
+}
+
+void ImportSection::addGOTEntry(Symbol *sym) {
+  assert(!isSealed);
+  if (sym->hasGOTIndex())
+    return;
+  sym->setGOTIndex(numImportedGlobals++);
+  gotSymbols.push_back(sym);
+}
+
+void ImportSection::addImport(Symbol *sym) {
+  assert(!isSealed);
+  importedSymbols.emplace_back(sym);
+  if (auto *f = dyn_cast<FunctionSymbol>(sym))
+    f->setFunctionIndex(numImportedFunctions++);
+  else if (auto *g = dyn_cast<GlobalSymbol>(sym))
+    g->setGlobalIndex(numImportedGlobals++);
+  else
+    cast<EventSymbol>(sym)->setEventIndex(numImportedEvents++);
+}
+
+void ImportSection::writeBody() {
+  raw_ostream &os = bodyOutputStream;
+
+  writeUleb128(os, getNumImports(), "import count");
+
+  if (config->importMemory) {
+    WasmImport import;
+    import.Module = defaultModule;
+    import.Field = "memory";
+    import.Kind = WASM_EXTERNAL_MEMORY;
+    import.Memory.Flags = 0;
+    import.Memory.Initial = out.memorySec->numMemoryPages;
+    if (out.memorySec->maxMemoryPages != 0 || config->sharedMemory) {
+      import.Memory.Flags |= WASM_LIMITS_FLAG_HAS_MAX;
+      import.Memory.Maximum = out.memorySec->maxMemoryPages;
+    }
+    if (config->sharedMemory)
+      import.Memory.Flags |= WASM_LIMITS_FLAG_IS_SHARED;
+    writeImport(os, import);
+  }
+
+  if (config->importTable) {
+    uint32_t tableSize = out.elemSec->elemOffset + out.elemSec->numEntries();
+    WasmImport import;
+    import.Module = defaultModule;
+    import.Field = functionTableName;
+    import.Kind = WASM_EXTERNAL_TABLE;
+    import.Table.ElemType = WASM_TYPE_FUNCREF;
+    import.Table.Limits = {0, tableSize, 0};
+    writeImport(os, import);
+  }
+
+  for (const Symbol *sym : importedSymbols) {
+    WasmImport import;
+    if (auto *f = dyn_cast<UndefinedFunction>(sym)) {
+      import.Field = f->importName;
+      import.Module = f->importModule;
+    } else if (auto *g = dyn_cast<UndefinedGlobal>(sym)) {
+      import.Field = g->importName;
+      import.Module = g->importModule;
+    } else {
+      import.Field = sym->getName();
+      import.Module = defaultModule;
+    }
+
+    if (auto *functionSym = dyn_cast<FunctionSymbol>(sym)) {
+      import.Kind = WASM_EXTERNAL_FUNCTION;
+      import.SigIndex = out.typeSec->lookupType(*functionSym->signature);
+    } else if (auto *globalSym = dyn_cast<GlobalSymbol>(sym)) {
+      import.Kind = WASM_EXTERNAL_GLOBAL;
+      import.Global = *globalSym->getGlobalType();
+    } else {
+      auto *eventSym = cast<EventSymbol>(sym);
+      import.Kind = WASM_EXTERNAL_EVENT;
+      import.Event.Attribute = eventSym->getEventType()->Attribute;
+      import.Event.SigIndex = out.typeSec->lookupType(*eventSym->signature);
+    }
+    writeImport(os, import);
+  }
+
+  for (const Symbol *sym : gotSymbols) {
+    WasmImport import;
+    import.Kind = WASM_EXTERNAL_GLOBAL;
+    import.Global = {WASM_TYPE_I32, true};
+    if (isa<DataSymbol>(sym))
+      import.Module = "GOT.mem";
+    else
+      import.Module = "GOT.func";
+    import.Field = sym->getName();
+    writeImport(os, import);
+  }
+}
+
+void FunctionSection::writeBody() {
+  raw_ostream &os = bodyOutputStream;
+
+  writeUleb128(os, inputFunctions.size(), "function count");
+  for (const InputFunction *func : inputFunctions)
+    writeUleb128(os, out.typeSec->lookupType(func->signature), "sig index");
+}
+
+void FunctionSection::addFunction(InputFunction *func) {
+  if (!func->live)
+    return;
+  uint32_t functionIndex =
+      out.importSec->getNumImportedFunctions() + inputFunctions.size();
+  inputFunctions.emplace_back(func);
+  func->setFunctionIndex(functionIndex);
+}
+
+void TableSection::writeBody() {
+  uint32_t tableSize = out.elemSec->elemOffset + out.elemSec->numEntries();
+
+  raw_ostream &os = bodyOutputStream;
+  writeUleb128(os, 1, "table count");
+  WasmLimits limits = {WASM_LIMITS_FLAG_HAS_MAX, tableSize, tableSize};
+  writeTableType(os, WasmTable{WASM_TYPE_FUNCREF, limits});
+}
+
+void MemorySection::writeBody() {
+  raw_ostream &os = bodyOutputStream;
+
+  bool hasMax = maxMemoryPages != 0 || config->sharedMemory;
+  writeUleb128(os, 1, "memory count");
+  unsigned flags = 0;
+  if (hasMax)
+    flags |= WASM_LIMITS_FLAG_HAS_MAX;
+  if (config->sharedMemory)
+    flags |= WASM_LIMITS_FLAG_IS_SHARED;
+  writeUleb128(os, flags, "memory limits flags");
+  writeUleb128(os, numMemoryPages, "initial pages");
+  if (hasMax)
+    writeUleb128(os, maxMemoryPages, "max pages");
+}
+
+void GlobalSection::writeBody() {
+  raw_ostream &os = bodyOutputStream;
+
+  writeUleb128(os, numGlobals(), "global count");
+  for (const InputGlobal *g : inputGlobals)
+    writeGlobal(os, g->global);
+  for (const DefinedData *sym : definedFakeGlobals) {
+    WasmGlobal global;
+    global.Type = {WASM_TYPE_I32, false};
+    global.InitExpr.Opcode = WASM_OPCODE_I32_CONST;
+    global.InitExpr.Value.Int32 = sym->getVirtualAddress();
+    writeGlobal(os, global);
+  }
+}
+
+void GlobalSection::addGlobal(InputGlobal *global) {
+  if (!global->live)
+    return;
+  uint32_t globalIndex =
+      out.importSec->getNumImportedGlobals() + inputGlobals.size();
+  LLVM_DEBUG(dbgs() << "addGlobal: " << globalIndex << "\n");
+  global->setGlobalIndex(globalIndex);
+  out.globalSec->inputGlobals.push_back(global);
+}
+
+void EventSection::writeBody() {
+  raw_ostream &os = bodyOutputStream;
+
+  writeUleb128(os, inputEvents.size(), "event count");
+  for (InputEvent *e : inputEvents) {
+    e->event.Type.SigIndex = out.typeSec->lookupType(e->signature);
+    writeEvent(os, e->event);
+  }
+}
+
+void EventSection::addEvent(InputEvent *event) {
+  if (!event->live)
+    return;
+  uint32_t eventIndex =
+      out.importSec->getNumImportedEvents() + inputEvents.size();
+  LLVM_DEBUG(dbgs() << "addEvent: " << eventIndex << "\n");
+  event->setEventIndex(eventIndex);
+  inputEvents.push_back(event);
+}
+
+void ExportSection::writeBody() {
+  raw_ostream &os = bodyOutputStream;
+
+  writeUleb128(os, exports.size(), "export count");
+  for (const WasmExport &export_ : exports)
+    writeExport(os, export_);
+}
+
+void ElemSection::addEntry(FunctionSymbol *sym) {
+  if (sym->hasTableIndex())
+    return;
+  sym->setTableIndex(elemOffset + indirectFunctions.size());
+  indirectFunctions.emplace_back(sym);
+}
+
+void ElemSection::writeBody() {
+  raw_ostream &os = bodyOutputStream;
+
+  writeUleb128(os, 1, "segment count");
+  writeUleb128(os, 0, "table index");
+  WasmInitExpr initExpr;
+  if (config->isPic) {
+    initExpr.Opcode = WASM_OPCODE_GLOBAL_GET;
+    initExpr.Value.Global = WasmSym::tableBase->getGlobalIndex();
+  } else {
+    initExpr.Opcode = WASM_OPCODE_I32_CONST;
+    initExpr.Value.Int32 = elemOffset;
+  }
+  writeInitExpr(os, initExpr);
+  writeUleb128(os, indirectFunctions.size(), "elem count");
+
+  uint32_t tableIndex = elemOffset;
+  for (const FunctionSymbol *sym : indirectFunctions) {
+    assert(sym->getTableIndex() == tableIndex);
+    writeUleb128(os, sym->getFunctionIndex(), "function index");
+    ++tableIndex;
+  }
+}
+
+void DataCountSection::writeBody() {
+  writeUleb128(bodyOutputStream, numSegments, "data count");
+}
+
+bool DataCountSection::isNeeded() const {
+  return numSegments && config->passiveSegments;
+}
+
+static uint32_t getWasmFlags(const Symbol *sym) {
+  uint32_t flags = 0;
+  if (sym->isLocal())
+    flags |= WASM_SYMBOL_BINDING_LOCAL;
+  if (sym->isWeak())
+    flags |= WASM_SYMBOL_BINDING_WEAK;
+  if (sym->isHidden())
+    flags |= WASM_SYMBOL_VISIBILITY_HIDDEN;
+  if (sym->isUndefined())
+    flags |= WASM_SYMBOL_UNDEFINED;
+  if (auto *f = dyn_cast<UndefinedFunction>(sym)) {
+    if (f->getName() != f->importName)
+      flags |= WASM_SYMBOL_EXPLICIT_NAME;
+  } else if (auto *g = dyn_cast<UndefinedGlobal>(sym)) {
+    if (g->getName() != g->importName)
+      flags |= WASM_SYMBOL_EXPLICIT_NAME;
+  }
+  return flags;
+}
+
+void LinkingSection::writeBody() {
+  raw_ostream &os = bodyOutputStream;
+
+  writeUleb128(os, WasmMetadataVersion, "Version");
+
+  if (!symtabEntries.empty()) {
+    SubSection sub(WASM_SYMBOL_TABLE);
+    writeUleb128(sub.os, symtabEntries.size(), "num symbols");
+
+    for (const Symbol *sym : symtabEntries) {
+      assert(sym->isDefined() || sym->isUndefined());
+      WasmSymbolType kind = sym->getWasmType();
+      uint32_t flags = getWasmFlags(sym);
+
+      writeU8(sub.os, kind, "sym kind");
+      writeUleb128(sub.os, flags, "sym flags");
+
+      if (auto *f = dyn_cast<FunctionSymbol>(sym)) {
+        writeUleb128(sub.os, f->getFunctionIndex(), "index");
+        if (sym->isDefined() || (flags & WASM_SYMBOL_EXPLICIT_NAME) != 0)
+          writeStr(sub.os, sym->getName(), "sym name");
+      } else if (auto *g = dyn_cast<GlobalSymbol>(sym)) {
+        writeUleb128(sub.os, g->getGlobalIndex(), "index");
+        if (sym->isDefined() || (flags & WASM_SYMBOL_EXPLICIT_NAME) != 0)
+          writeStr(sub.os, sym->getName(), "sym name");
+      } else if (auto *e = dyn_cast<EventSymbol>(sym)) {
+        writeUleb128(sub.os, e->getEventIndex(), "index");
+        if (sym->isDefined() || (flags & WASM_SYMBOL_EXPLICIT_NAME) != 0)
+          writeStr(sub.os, sym->getName(), "sym name");
+      } else if (isa<DataSymbol>(sym)) {
+        writeStr(sub.os, sym->getName(), "sym name");
+        if (auto *dataSym = dyn_cast<DefinedData>(sym)) {
+          writeUleb128(sub.os, dataSym->getOutputSegmentIndex(), "index");
+          writeUleb128(sub.os, dataSym->getOutputSegmentOffset(),
+                       "data offset");
+          writeUleb128(sub.os, dataSym->getSize(), "data size");
+        }
+      } else {
+        auto *s = cast<OutputSectionSymbol>(sym);
+        writeUleb128(sub.os, s->section->sectionIndex, "sym section index");
+      }
+    }
+
+    sub.writeTo(os);
+  }
+
+  if (dataSegments.size()) {
+    SubSection sub(WASM_SEGMENT_INFO);
+    writeUleb128(sub.os, dataSegments.size(), "num data segments");
+    for (const OutputSegment *s : dataSegments) {
+      writeStr(sub.os, s->name, "segment name");
+      writeUleb128(sub.os, s->alignment, "alignment");
+      writeUleb128(sub.os, 0, "flags");
+    }
+    sub.writeTo(os);
+  }
+
+  if (!initFunctions.empty()) {
+    SubSection sub(WASM_INIT_FUNCS);
+    writeUleb128(sub.os, initFunctions.size(), "num init functions");
+    for (const WasmInitEntry &f : initFunctions) {
+      writeUleb128(sub.os, f.priority, "priority");
+      writeUleb128(sub.os, f.sym->getOutputSymbolIndex(), "function index");
+    }
+    sub.writeTo(os);
+  }
+
+  struct ComdatEntry {
+    unsigned kind;
+    uint32_t index;
+  };
+  std::map<StringRef, std::vector<ComdatEntry>> comdats;
+
+  for (const InputFunction *f : out.functionSec->inputFunctions) {
+    StringRef comdat = f->getComdatName();
+    if (!comdat.empty())
+      comdats[comdat].emplace_back(
+          ComdatEntry{WASM_COMDAT_FUNCTION, f->getFunctionIndex()});
+  }
+  for (uint32_t i = 0; i < dataSegments.size(); ++i) {
+    const auto &inputSegments = dataSegments[i]->inputSegments;
+    if (inputSegments.empty())
+      continue;
+    StringRef comdat = inputSegments[0]->getComdatName();
+#ifndef NDEBUG
+    for (const InputSegment *isec : inputSegments)
+      assert(isec->getComdatName() == comdat);
+#endif
+    if (!comdat.empty())
+      comdats[comdat].emplace_back(ComdatEntry{WASM_COMDAT_DATA, i});
+  }
+
+  if (!comdats.empty()) {
+    SubSection sub(WASM_COMDAT_INFO);
+    writeUleb128(sub.os, comdats.size(), "num comdats");
+    for (const auto &c : comdats) {
+      writeStr(sub.os, c.first, "comdat name");
+      writeUleb128(sub.os, 0, "comdat flags"); // flags for future use
+      writeUleb128(sub.os, c.second.size(), "num entries");
+      for (const ComdatEntry &entry : c.second) {
+        writeU8(sub.os, entry.kind, "entry kind");
+        writeUleb128(sub.os, entry.index, "entry index");
+      }
+    }
+    sub.writeTo(os);
+  }
+}
+
+void LinkingSection::addToSymtab(Symbol *sym) {
+  sym->setOutputSymbolIndex(symtabEntries.size());
+  symtabEntries.emplace_back(sym);
+}
+
+unsigned NameSection::numNames() const {
+  unsigned numNames = out.importSec->getNumImportedFunctions();
+  for (const InputFunction *f : out.functionSec->inputFunctions)
+    if (!f->getName().empty() || !f->getDebugName().empty())
+      ++numNames;
+
+  return numNames;
+}
+
+// Create the custom "name" section containing debug symbol names.
+void NameSection::writeBody() {
+  SubSection sub(WASM_NAMES_FUNCTION);
+  writeUleb128(sub.os, numNames(), "name count");
+
+  // Names must appear in function index order.  As it happens importedSymbols
+  // and inputFunctions are numbered in order with imported functions coming
+  // first.
+  for (const Symbol *s : out.importSec->importedSymbols) {
+    if (auto *f = dyn_cast<FunctionSymbol>(s)) {
+      writeUleb128(sub.os, f->getFunctionIndex(), "func index");
+      writeStr(sub.os, toString(*s), "symbol name");
+    }
+  }
+  for (const InputFunction *f : out.functionSec->inputFunctions) {
+    if (!f->getName().empty()) {
+      writeUleb128(sub.os, f->getFunctionIndex(), "func index");
+      if (!f->getDebugName().empty()) {
+        writeStr(sub.os, f->getDebugName(), "symbol name");
+      } else {
+        writeStr(sub.os, maybeDemangleSymbol(f->getName()), "symbol name");
+      }
+    }
+  }
+
+  sub.writeTo(bodyOutputStream);
+}
+
+void ProducersSection::addInfo(const WasmProducerInfo &info) {
+  for (auto &producers :
+       {std::make_pair(&info.Languages, &languages),
+        std::make_pair(&info.Tools, &tools), std::make_pair(&info.SDKs, &sDKs)})
+    for (auto &producer : *producers.first)
+      if (producers.second->end() ==
+          llvm::find_if(*producers.second,
+                        [&](std::pair<std::string, std::string> seen) {
+                          return seen.first == producer.first;
+                        }))
+        producers.second->push_back(producer);
+}
+
+void ProducersSection::writeBody() {
+  auto &os = bodyOutputStream;
+  writeUleb128(os, fieldCount(), "field count");
+  for (auto &field :
+       {std::make_pair("language", languages),
+        std::make_pair("processed-by", tools), std::make_pair("sdk", sDKs)}) {
+    if (field.second.empty())
+      continue;
+    writeStr(os, field.first, "field name");
+    writeUleb128(os, field.second.size(), "number of entries");
+    for (auto &entry : field.second) {
+      writeStr(os, entry.first, "producer name");
+      writeStr(os, entry.second, "producer version");
+    }
+  }
+}
+
+void TargetFeaturesSection::writeBody() {
+  SmallVector<std::string, 8> emitted(features.begin(), features.end());
+  llvm::sort(emitted);
+  auto &os = bodyOutputStream;
+  writeUleb128(os, emitted.size(), "feature count");
+  for (auto &feature : emitted) {
+    writeU8(os, WASM_FEATURE_PREFIX_USED, "feature used prefix");
+    writeStr(os, feature, "feature name");
+  }
+}
+
+void RelocSection::writeBody() {
+  uint32_t count = sec->getNumRelocations();
+  assert(sec->sectionIndex != UINT32_MAX);
+  writeUleb128(bodyOutputStream, sec->sectionIndex, "reloc section");
+  writeUleb128(bodyOutputStream, count, "reloc count");
+  sec->writeRelocations(bodyOutputStream);
+}
diff --git a/deps/lld/wasm/SyntheticSections.h b/deps/lld/wasm/SyntheticSections.h
new file mode 100644
index 0000000000000000000000000000000000000000..1d3b8b7a369c08fbcae16d97fe056317985404c6
--- /dev/null
+++ b/deps/lld/wasm/SyntheticSections.h
@@ -0,0 +1,339 @@
+//===- SyntheticSection.h ---------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// Synthetic sections represent chunks of linker-created data. If you
+// need to create a chunk of data that to be included in some section
+// in the result, you probably want to create that as a synthetic section.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLD_WASM_SYNTHETIC_SECTIONS_H
+#define LLD_WASM_SYNTHETIC_SECTIONS_H
+
+#include "OutputSections.h"
+
+#include "llvm/ADT/SmallSet.h"
+#include "llvm/ADT/StringMap.h"
+#include "llvm/Object/WasmTraits.h"
+
+#define DEBUG_TYPE "lld"
+
+namespace lld {
+namespace wasm {
+
+// An init entry to be written to either the synthetic init func or the
+// linking metadata.
+struct WasmInitEntry {
+  const FunctionSymbol *sym;
+  uint32_t priority;
+};
+
+class SyntheticSection : public OutputSection {
+public:
+  SyntheticSection(uint32_t type, std::string name = "")
+      : OutputSection(type, name), bodyOutputStream(body) {
+    if (!name.empty())
+      writeStr(bodyOutputStream, name, "section name");
+  }
+
+  void writeTo(uint8_t *buf) override {
+    assert(offset);
+    log("writing " + toString(*this));
+    memcpy(buf + offset, header.data(), header.size());
+    memcpy(buf + offset + header.size(), body.data(), body.size());
+  }
+
+  size_t getSize() const override { return header.size() + body.size(); }
+
+  virtual void writeBody() {}
+
+  void finalizeContents() override {
+    writeBody();
+    bodyOutputStream.flush();
+    createHeader(body.size());
+  }
+
+  raw_ostream &getStream() { return bodyOutputStream; }
+
+  std::string body;
+
+protected:
+  llvm::raw_string_ostream bodyOutputStream;
+};
+
+// Create the custom "dylink" section containing information for the dynamic
+// linker.
+// See
+// https://github.com/WebAssembly/tool-conventions/blob/master/DynamicLinking.md
+class DylinkSection : public SyntheticSection {
+public:
+  DylinkSection() : SyntheticSection(llvm::wasm::WASM_SEC_CUSTOM, "dylink") {}
+  bool isNeeded() const override { return config->isPic; }
+  void writeBody() override;
+
+  uint32_t memAlign = 0;
+  uint32_t memSize = 0;
+};
+
+class TypeSection : public SyntheticSection {
+public:
+  TypeSection() : SyntheticSection(llvm::wasm::WASM_SEC_TYPE) {}
+
+  bool isNeeded() const override { return types.size() > 0; };
+  void writeBody() override;
+  uint32_t registerType(const WasmSignature &sig);
+  uint32_t lookupType(const WasmSignature &sig);
+
+protected:
+  std::vector<const WasmSignature *> types;
+  llvm::DenseMap<WasmSignature, int32_t> typeIndices;
+};
+
+class ImportSection : public SyntheticSection {
+public:
+  ImportSection() : SyntheticSection(llvm::wasm::WASM_SEC_IMPORT) {}
+  bool isNeeded() const override { return getNumImports() > 0; }
+  void writeBody() override;
+  void addImport(Symbol *sym);
+  void addGOTEntry(Symbol *sym);
+  void seal() { isSealed = true; }
+  uint32_t getNumImports() const;
+  uint32_t getNumImportedGlobals() const {
+    assert(isSealed);
+    return numImportedGlobals;
+  }
+  uint32_t getNumImportedFunctions() const {
+    assert(isSealed);
+    return numImportedFunctions;
+  }
+  uint32_t getNumImportedEvents() const {
+    assert(isSealed);
+    return numImportedEvents;
+  }
+
+  std::vector<const Symbol *> importedSymbols;
+
+protected:
+  bool isSealed = false;
+  unsigned numImportedGlobals = 0;
+  unsigned numImportedFunctions = 0;
+  unsigned numImportedEvents = 0;
+  std::vector<const Symbol *> gotSymbols;
+};
+
+class FunctionSection : public SyntheticSection {
+public:
+  FunctionSection() : SyntheticSection(llvm::wasm::WASM_SEC_FUNCTION) {}
+
+  bool isNeeded() const override { return inputFunctions.size() > 0; };
+  void writeBody() override;
+  void addFunction(InputFunction *func);
+
+  std::vector<InputFunction *> inputFunctions;
+
+protected:
+};
+
+class MemorySection : public SyntheticSection {
+public:
+  MemorySection() : SyntheticSection(llvm::wasm::WASM_SEC_MEMORY) {}
+
+  bool isNeeded() const override { return !config->importMemory; }
+  void writeBody() override;
+
+  uint32_t numMemoryPages = 0;
+  uint32_t maxMemoryPages = 0;
+};
+
+class TableSection : public SyntheticSection {
+public:
+  TableSection() : SyntheticSection(llvm::wasm::WASM_SEC_TABLE) {}
+
+  bool isNeeded() const override {
+    // Always output a table section (or table import), even if there are no
+    // indirect calls.  There are two reasons for this:
+    //  1. For executables it is useful to have an empty table slot at 0
+    //     which can be filled with a null function call handler.
+    //  2. If we don't do this, any program that contains a call_indirect but
+    //     no address-taken function will fail at validation time since it is
+    //     a validation error to include a call_indirect instruction if there
+    //     is not table.
+    return !config->importTable;
+  }
+
+  void writeBody() override;
+};
+
+class GlobalSection : public SyntheticSection {
+public:
+  GlobalSection() : SyntheticSection(llvm::wasm::WASM_SEC_GLOBAL) {}
+  uint32_t numGlobals() const {
+    return inputGlobals.size() + definedFakeGlobals.size();
+  }
+  bool isNeeded() const override { return numGlobals() > 0; }
+  void writeBody() override;
+  void addGlobal(InputGlobal *global);
+
+  std::vector<const DefinedData *> definedFakeGlobals;
+  std::vector<InputGlobal *> inputGlobals;
+};
+
+// The event section contains a list of declared wasm events associated with the
+// module. Currently the only supported event kind is exceptions. A single event
+// entry represents a single event with an event tag. All C++ exceptions are
+// represented by a single event. An event entry in this section contains
+// information on what kind of event it is (e.g. exception) and the type of
+// values contained in a single event object. (In wasm, an event can contain
+// multiple values of primitive types. But for C++ exceptions, we just throw a
+// pointer which is an i32 value (for wasm32 architecture), so the signature of
+// C++ exception is (i32)->(void), because all event types are assumed to have
+// void return type to share WasmSignature with functions.)
+class EventSection : public SyntheticSection {
+public:
+  EventSection() : SyntheticSection(llvm::wasm::WASM_SEC_EVENT) {}
+  void writeBody() override;
+  bool isNeeded() const override { return inputEvents.size() > 0; }
+  void addEvent(InputEvent *event);
+
+  std::vector<InputEvent *> inputEvents;
+};
+
+class ExportSection : public SyntheticSection {
+public:
+  ExportSection() : SyntheticSection(llvm::wasm::WASM_SEC_EXPORT) {}
+  bool isNeeded() const override { return exports.size() > 0; }
+  void writeBody() override;
+
+  std::vector<llvm::wasm::WasmExport> exports;
+};
+
+class ElemSection : public SyntheticSection {
+public:
+  ElemSection(uint32_t offset)
+      : SyntheticSection(llvm::wasm::WASM_SEC_ELEM), elemOffset(offset) {}
+  bool isNeeded() const override { return indirectFunctions.size() > 0; };
+  void writeBody() override;
+  void addEntry(FunctionSymbol *sym);
+  uint32_t numEntries() const { return indirectFunctions.size(); }
+  uint32_t elemOffset;
+
+protected:
+  std::vector<const FunctionSymbol *> indirectFunctions;
+};
+
+class DataCountSection : public SyntheticSection {
+public:
+  DataCountSection(uint32_t numSegments)
+      : SyntheticSection(llvm::wasm::WASM_SEC_DATACOUNT),
+        numSegments(numSegments) {}
+  bool isNeeded() const override;
+  void writeBody() override;
+
+protected:
+  uint32_t numSegments;
+};
+
+// Create the custom "linking" section containing linker metadata.
+// This is only created when relocatable output is requested.
+class LinkingSection : public SyntheticSection {
+public:
+  LinkingSection(const std::vector<WasmInitEntry> &initFunctions,
+                 const std::vector<OutputSegment *> &dataSegments)
+      : SyntheticSection(llvm::wasm::WASM_SEC_CUSTOM, "linking"),
+        initFunctions(initFunctions), dataSegments(dataSegments) {}
+  bool isNeeded() const override {
+    return config->relocatable || config->emitRelocs;
+  }
+  void writeBody() override;
+  void addToSymtab(Symbol *sym);
+
+protected:
+  std::vector<const Symbol *> symtabEntries;
+  llvm::StringMap<uint32_t> sectionSymbolIndices;
+  const std::vector<WasmInitEntry> &initFunctions;
+  const std::vector<OutputSegment *> &dataSegments;
+};
+
+// Create the custom "name" section containing debug symbol names.
+class NameSection : public SyntheticSection {
+public:
+  NameSection() : SyntheticSection(llvm::wasm::WASM_SEC_CUSTOM, "name") {}
+  bool isNeeded() const override {
+    return !config->stripDebug && !config->stripAll && numNames() > 0;
+  }
+  void writeBody() override;
+  unsigned numNames() const;
+};
+
+class ProducersSection : public SyntheticSection {
+public:
+  ProducersSection()
+      : SyntheticSection(llvm::wasm::WASM_SEC_CUSTOM, "producers") {}
+  bool isNeeded() const override {
+    return !config->stripAll && fieldCount() > 0;
+  }
+  void writeBody() override;
+  void addInfo(const llvm::wasm::WasmProducerInfo &info);
+
+protected:
+  int fieldCount() const {
+    return int(!languages.empty()) + int(!tools.empty()) + int(!sDKs.empty());
+  }
+  SmallVector<std::pair<std::string, std::string>, 8> languages;
+  SmallVector<std::pair<std::string, std::string>, 8> tools;
+  SmallVector<std::pair<std::string, std::string>, 8> sDKs;
+};
+
+class TargetFeaturesSection : public SyntheticSection {
+public:
+  TargetFeaturesSection()
+      : SyntheticSection(llvm::wasm::WASM_SEC_CUSTOM, "target_features") {}
+  bool isNeeded() const override {
+    return !config->stripAll && features.size() > 0;
+  }
+  void writeBody() override;
+
+  llvm::SmallSet<std::string, 8> features;
+};
+
+class RelocSection : public SyntheticSection {
+public:
+  RelocSection(StringRef name, OutputSection *sec)
+      : SyntheticSection(llvm::wasm::WASM_SEC_CUSTOM, name), sec(sec) {}
+  void writeBody() override;
+  bool isNeeded() const override { return sec->getNumRelocations() > 0; };
+
+protected:
+  OutputSection *sec;
+};
+
+// Linker generated output sections
+struct OutStruct {
+  DylinkSection *dylinkSec;
+  TypeSection *typeSec;
+  FunctionSection *functionSec;
+  ImportSection *importSec;
+  TableSection *tableSec;
+  MemorySection *memorySec;
+  GlobalSection *globalSec;
+  EventSection *eventSec;
+  ExportSection *exportSec;
+  ElemSection *elemSec;
+  DataCountSection *dataCountSec;
+  LinkingSection *linkingSec;
+  NameSection *nameSec;
+  ProducersSection *producersSec;
+  TargetFeaturesSection *targetFeaturesSec;
+};
+
+extern OutStruct out;
+
+} // namespace wasm
+} // namespace lld
+
+#endif
diff --git a/deps/lld/wasm/Writer.cpp b/deps/lld/wasm/Writer.cpp
index 902ca61ca19b71a6ed0633151bbb59d6d973daab..68e001ccc800ce7f003122ca236f9dbb33d4e7f0 100644
--- a/deps/lld/wasm/Writer.cpp
+++ b/deps/lld/wasm/Writer.cpp
@@ -1,9 +1,8 @@
 //===- Writer.cpp ---------------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -14,13 +13,17 @@
 #include "InputGlobal.h"
 #include "OutputSections.h"
 #include "OutputSegment.h"
+#include "Relocations.h"
 #include "SymbolTable.h"
+#include "SyntheticSections.h"
 #include "WriterUtils.h"
 #include "lld/Common/ErrorHandler.h"
 #include "lld/Common/Memory.h"
 #include "lld/Common/Strings.h"
 #include "lld/Common/Threads.h"
 #include "llvm/ADT/DenseSet.h"
+#include "llvm/ADT/SmallSet.h"
+#include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/BinaryFormat/Wasm.h"
 #include "llvm/Object/WasmTraits.h"
@@ -39,19 +42,10 @@ using namespace llvm::wasm;
 using namespace lld;
 using namespace lld::wasm;
 
-static constexpr int StackAlignment = 16;
-static constexpr const char *FunctionTableName = "__indirect_function_table";
-const char *lld::wasm::DefaultModule = "env";
+static constexpr int stackAlignment = 16;
 
 namespace {
 
-// An init entry to be written to either the synthetic init func or the
-// linking metadata.
-struct WasmInitEntry {
-  const FunctionSymbol *Sym;
-  uint32_t Priority;
-};
-
 // The writer writes a SymbolTable result to a file.
 class Writer {
 public:
@@ -60,613 +54,145 @@ public:
 private:
   void openFile();
 
-  uint32_t lookupType(const WasmSignature &Sig);
-  uint32_t registerType(const WasmSignature &Sig);
+  void createInitMemoryFunction();
+  void createApplyRelocationsFunction();
+  void createCallCtorsFunction();
+  void createInitTLSFunction();
 
-  void createCtorFunction();
-  void calculateInitFunctions();
   void assignIndexes();
+  void populateSymtab();
+  void populateProducers();
+  void populateTargetFeatures();
+  void calculateInitFunctions();
   void calculateImports();
   void calculateExports();
   void calculateCustomSections();
-  void assignSymtab();
   void calculateTypes();
   void createOutputSegments();
   void layoutMemory();
   void createHeader();
-  void createSections();
-  SyntheticSection *createSyntheticSection(uint32_t Type, StringRef Name = "");
 
-  // Builtin sections
-  void createTypeSection();
-  void createFunctionSection();
-  void createTableSection();
-  void createGlobalSection();
-  void createEventSection();
-  void createExportSection();
-  void createImportSection();
-  void createMemorySection();
-  void createElemSection();
-  void createCodeSection();
-  void createDataSection();
+  void addSection(OutputSection *sec);
+
+  void addSections();
+
   void createCustomSections();
+  void createSyntheticSections();
+  void finalizeSections();
 
   // Custom sections
-  void createDylinkSection();
   void createRelocSections();
-  void createLinkingSection();
-  void createNameSection();
 
   void writeHeader();
   void writeSections();
 
-  uint64_t FileSize = 0;
-  uint32_t TableBase = 0;
-  uint32_t NumMemoryPages = 0;
-  uint32_t MaxMemoryPages = 0;
-  // Memory size and aligment. Written to the "dylink" section
-  // when build with -shared or -pie.
-  uint32_t MemAlign = 0;
-  uint32_t MemSize = 0;
+  uint64_t fileSize = 0;
+  uint32_t tableBase = 0;
 
-  std::vector<const WasmSignature *> Types;
-  DenseMap<WasmSignature, int32_t> TypeIndices;
-  std::vector<const Symbol *> ImportedSymbols;
-  unsigned NumImportedFunctions = 0;
-  unsigned NumImportedGlobals = 0;
-  unsigned NumImportedEvents = 0;
-  std::vector<WasmExport> Exports;
-  std::vector<const DefinedData *> DefinedFakeGlobals;
-  std::vector<InputGlobal *> InputGlobals;
-  std::vector<InputFunction *> InputFunctions;
-  std::vector<InputEvent *> InputEvents;
-  std::vector<const FunctionSymbol *> IndirectFunctions;
-  std::vector<const Symbol *> SymtabEntries;
-  std::vector<WasmInitEntry> InitFunctions;
-
-  llvm::StringMap<std::vector<InputSection *>> CustomSectionMapping;
-  llvm::StringMap<SectionSymbol *> CustomSectionSymbols;
+  std::vector<WasmInitEntry> initFunctions;
+  llvm::StringMap<std::vector<InputSection *>> customSectionMapping;
 
   // Elements that are used to construct the final output
-  std::string Header;
-  std::vector<OutputSection *> OutputSections;
+  std::string header;
+  std::vector<OutputSection *> outputSections;
 
-  std::unique_ptr<FileOutputBuffer> Buffer;
+  std::unique_ptr<FileOutputBuffer> buffer;
 
-  std::vector<OutputSegment *> Segments;
-  llvm::SmallDenseMap<StringRef, OutputSegment *> SegmentMap;
+  std::vector<OutputSegment *> segments;
+  llvm::SmallDenseMap<StringRef, OutputSegment *> segmentMap;
 };
 
 } // anonymous namespace
 
-void Writer::createImportSection() {
-  uint32_t NumImports = ImportedSymbols.size();
-  if (Config->ImportMemory)
-    ++NumImports;
-  if (Config->ImportTable)
-    ++NumImports;
-
-  if (NumImports == 0)
-    return;
-
-  SyntheticSection *Section = createSyntheticSection(WASM_SEC_IMPORT);
-  raw_ostream &OS = Section->getStream();
-
-  writeUleb128(OS, NumImports, "import count");
-
-  if (Config->ImportMemory) {
-    WasmImport Import;
-    Import.Module = DefaultModule;
-    Import.Field = "memory";
-    Import.Kind = WASM_EXTERNAL_MEMORY;
-    Import.Memory.Flags = 0;
-    Import.Memory.Initial = NumMemoryPages;
-    if (MaxMemoryPages != 0) {
-      Import.Memory.Flags |= WASM_LIMITS_FLAG_HAS_MAX;
-      Import.Memory.Maximum = MaxMemoryPages;
-    }
-    if (Config->SharedMemory)
-      Import.Memory.Flags |= WASM_LIMITS_FLAG_IS_SHARED;
-    writeImport(OS, Import);
-  }
-
-  if (Config->ImportTable) {
-    uint32_t TableSize = TableBase + IndirectFunctions.size();
-    WasmImport Import;
-    Import.Module = DefaultModule;
-    Import.Field = FunctionTableName;
-    Import.Kind = WASM_EXTERNAL_TABLE;
-    Import.Table.ElemType = WASM_TYPE_FUNCREF;
-    Import.Table.Limits = {0, TableSize, 0};
-    writeImport(OS, Import);
-  }
-
-  for (const Symbol *Sym : ImportedSymbols) {
-    WasmImport Import;
-    if (auto *F = dyn_cast<UndefinedFunction>(Sym)) {
-      Import.Field = F->ImportName;
-      Import.Module = F->ImportModule;
-    } else if (auto *G = dyn_cast<UndefinedGlobal>(Sym)) {
-      Import.Field = G->ImportName;
-      Import.Module = G->ImportModule;
-    } else {
-      Import.Field = Sym->getName();
-      Import.Module = DefaultModule;
-    }
-
-    if (auto *FunctionSym = dyn_cast<FunctionSymbol>(Sym)) {
-      Import.Kind = WASM_EXTERNAL_FUNCTION;
-      Import.SigIndex = lookupType(*FunctionSym->Signature);
-    } else if (auto *GlobalSym = dyn_cast<GlobalSymbol>(Sym)) {
-      Import.Kind = WASM_EXTERNAL_GLOBAL;
-      Import.Global = *GlobalSym->getGlobalType();
-    } else {
-      auto *EventSym = cast<EventSymbol>(Sym);
-      Import.Kind = WASM_EXTERNAL_EVENT;
-      Import.Event.Attribute = EventSym->getEventType()->Attribute;
-      Import.Event.SigIndex = lookupType(*EventSym->Signature);
-    }
-    writeImport(OS, Import);
-  }
-}
-
-void Writer::createTypeSection() {
-  SyntheticSection *Section = createSyntheticSection(WASM_SEC_TYPE);
-  raw_ostream &OS = Section->getStream();
-  writeUleb128(OS, Types.size(), "type count");
-  for (const WasmSignature *Sig : Types)
-    writeSig(OS, *Sig);
-}
-
-void Writer::createFunctionSection() {
-  if (InputFunctions.empty())
-    return;
-
-  SyntheticSection *Section = createSyntheticSection(WASM_SEC_FUNCTION);
-  raw_ostream &OS = Section->getStream();
-
-  writeUleb128(OS, InputFunctions.size(), "function count");
-  for (const InputFunction *Func : InputFunctions)
-    writeUleb128(OS, lookupType(Func->Signature), "sig index");
-}
-
-void Writer::createMemorySection() {
-  if (Config->ImportMemory)
-    return;
-
-  SyntheticSection *Section = createSyntheticSection(WASM_SEC_MEMORY);
-  raw_ostream &OS = Section->getStream();
-
-  bool HasMax = MaxMemoryPages != 0;
-  writeUleb128(OS, 1, "memory count");
-  unsigned Flags = 0;
-  if (HasMax)
-    Flags |= WASM_LIMITS_FLAG_HAS_MAX;
-  if (Config->SharedMemory)
-    Flags |= WASM_LIMITS_FLAG_IS_SHARED;
-  writeUleb128(OS, Flags, "memory limits flags");
-  writeUleb128(OS, NumMemoryPages, "initial pages");
-  if (HasMax)
-    writeUleb128(OS, MaxMemoryPages, "max pages");
-}
-
-void Writer::createGlobalSection() {
-  unsigned NumGlobals = InputGlobals.size() + DefinedFakeGlobals.size();
-  if (NumGlobals == 0)
-    return;
-
-  SyntheticSection *Section = createSyntheticSection(WASM_SEC_GLOBAL);
-  raw_ostream &OS = Section->getStream();
-
-  writeUleb128(OS, NumGlobals, "global count");
-  for (const InputGlobal *G : InputGlobals)
-    writeGlobal(OS, G->Global);
-  for (const DefinedData *Sym : DefinedFakeGlobals) {
-    WasmGlobal Global;
-    Global.Type = {WASM_TYPE_I32, false};
-    Global.InitExpr.Opcode = WASM_OPCODE_I32_CONST;
-    Global.InitExpr.Value.Int32 = Sym->getVirtualAddress();
-    writeGlobal(OS, Global);
-  }
-}
-
-// The event section contains a list of declared wasm events associated with the
-// module. Currently the only supported event kind is exceptions. A single event
-// entry represents a single event with an event tag. All C++ exceptions are
-// represented by a single event. An event entry in this section contains
-// information on what kind of event it is (e.g. exception) and the type of
-// values contained in a single event object. (In wasm, an event can contain
-// multiple values of primitive types. But for C++ exceptions, we just throw a
-// pointer which is an i32 value (for wasm32 architecture), so the signature of
-// C++ exception is (i32)->(void), because all event types are assumed to have
-// void return type to share WasmSignature with functions.)
-void Writer::createEventSection() {
-  unsigned NumEvents = InputEvents.size();
-  if (NumEvents == 0)
-    return;
-
-  SyntheticSection *Section = createSyntheticSection(WASM_SEC_EVENT);
-  raw_ostream &OS = Section->getStream();
-
-  writeUleb128(OS, NumEvents, "event count");
-  for (InputEvent *E : InputEvents) {
-    E->Event.Type.SigIndex = lookupType(E->Signature);
-    writeEvent(OS, E->Event);
-  }
-}
-
-void Writer::createTableSection() {
-  if (Config->ImportTable)
-    return;
-
-  // Always output a table section (or table import), even if there are no
-  // indirect calls.  There are two reasons for this:
-  //  1. For executables it is useful to have an empty table slot at 0
-  //     which can be filled with a null function call handler.
-  //  2. If we don't do this, any program that contains a call_indirect but
-  //     no address-taken function will fail at validation time since it is
-  //     a validation error to include a call_indirect instruction if there
-  //     is not table.
-  uint32_t TableSize = TableBase + IndirectFunctions.size();
-
-  SyntheticSection *Section = createSyntheticSection(WASM_SEC_TABLE);
-  raw_ostream &OS = Section->getStream();
-
-  writeUleb128(OS, 1, "table count");
-  WasmLimits Limits = {WASM_LIMITS_FLAG_HAS_MAX, TableSize, TableSize};
-  writeTableType(OS, WasmTable{WASM_TYPE_FUNCREF, Limits});
-}
-
-void Writer::createExportSection() {
-  if (!Exports.size())
-    return;
-
-  SyntheticSection *Section = createSyntheticSection(WASM_SEC_EXPORT);
-  raw_ostream &OS = Section->getStream();
-
-  writeUleb128(OS, Exports.size(), "export count");
-  for (const WasmExport &Export : Exports)
-    writeExport(OS, Export);
-}
-
 void Writer::calculateCustomSections() {
   log("calculateCustomSections");
-  bool StripDebug = Config->StripDebug || Config->StripAll;
-  for (ObjFile *File : Symtab->ObjectFiles) {
-    for (InputSection *Section : File->CustomSections) {
-      StringRef Name = Section->getName();
+  bool stripDebug = config->stripDebug || config->stripAll;
+  for (ObjFile *file : symtab->objectFiles) {
+    for (InputSection *section : file->customSections) {
+      StringRef name = section->getName();
       // These custom sections are known the linker and synthesized rather than
       // blindly copied
-      if (Name == "linking" || Name == "name" || Name.startswith("reloc."))
+      if (name == "linking" || name == "name" || name == "producers" ||
+          name == "target_features" || name.startswith("reloc."))
         continue;
       // .. or it is a debug section
-      if (StripDebug && Name.startswith(".debug_"))
+      if (stripDebug && name.startswith(".debug_"))
         continue;
-      CustomSectionMapping[Name].push_back(Section);
+      customSectionMapping[name].push_back(section);
     }
   }
 }
 
 void Writer::createCustomSections() {
   log("createCustomSections");
-  for (auto &Pair : CustomSectionMapping) {
-    StringRef Name = Pair.first();
+  for (auto &pair : customSectionMapping) {
+    StringRef name = pair.first();
+    LLVM_DEBUG(dbgs() << "createCustomSection: " << name << "\n");
 
-    auto P = CustomSectionSymbols.find(Name);
-    if (P != CustomSectionSymbols.end()) {
-      uint32_t SectionIndex = OutputSections.size();
-      P->second->setOutputSectionIndex(SectionIndex);
+    OutputSection *sec = make<CustomSection>(name, pair.second);
+    if (config->relocatable || config->emitRelocs) {
+      auto *sym = make<OutputSectionSymbol>(sec);
+      out.linkingSec->addToSymtab(sym);
+      sec->sectionSym = sym;
     }
-
-    LLVM_DEBUG(dbgs() << "createCustomSection: " << Name << "\n");
-    OutputSections.push_back(make<CustomSection>(Name, Pair.second));
+    addSection(sec);
   }
 }
 
-void Writer::createElemSection() {
-  if (IndirectFunctions.empty())
-    return;
-
-  SyntheticSection *Section = createSyntheticSection(WASM_SEC_ELEM);
-  raw_ostream &OS = Section->getStream();
-
-  writeUleb128(OS, 1, "segment count");
-  writeUleb128(OS, 0, "table index");
-  WasmInitExpr InitExpr;
-  if (Config->Pic) {
-    InitExpr.Opcode = WASM_OPCODE_GLOBAL_GET;
-    InitExpr.Value.Global = WasmSym::TableBase->getGlobalIndex();
-  } else {
-    InitExpr.Opcode = WASM_OPCODE_I32_CONST;
-    InitExpr.Value.Int32 = TableBase;
-  }
-  writeInitExpr(OS, InitExpr);
-  writeUleb128(OS, IndirectFunctions.size(), "elem count");
-
-  uint32_t TableIndex = TableBase;
-  for (const FunctionSymbol *Sym : IndirectFunctions) {
-    assert(Sym->getTableIndex() == TableIndex);
-    writeUleb128(OS, Sym->getFunctionIndex(), "function index");
-    ++TableIndex;
-  }
-}
-
-void Writer::createCodeSection() {
-  if (InputFunctions.empty())
-    return;
-
-  log("createCodeSection");
-
-  auto Section = make<CodeSection>(InputFunctions);
-  OutputSections.push_back(Section);
-}
-
-void Writer::createDataSection() {
-  if (!Segments.size())
-    return;
-
-  log("createDataSection");
-  auto Section = make<DataSection>(Segments);
-  OutputSections.push_back(Section);
-}
-
 // Create relocations sections in the final output.
 // These are only created when relocatable output is requested.
 void Writer::createRelocSections() {
   log("createRelocSections");
   // Don't use iterator here since we are adding to OutputSection
-  size_t OrigSize = OutputSections.size();
-  for (size_t I = 0; I < OrigSize; I++) {
-    OutputSection *OSec = OutputSections[I];
-    uint32_t Count = OSec->numRelocations();
-    if (!Count)
+  size_t origSize = outputSections.size();
+  for (size_t i = 0; i < origSize; i++) {
+    LLVM_DEBUG(dbgs() << "check section " << i << "\n");
+    OutputSection *sec = outputSections[i];
+
+    // Count the number of needed sections.
+    uint32_t count = sec->getNumRelocations();
+    if (!count)
       continue;
 
-    StringRef Name;
-    if (OSec->Type == WASM_SEC_DATA)
-      Name = "reloc.DATA";
-    else if (OSec->Type == WASM_SEC_CODE)
-      Name = "reloc.CODE";
-    else if (OSec->Type == WASM_SEC_CUSTOM)
-      Name = Saver.save("reloc." + OSec->Name);
+    StringRef name;
+    if (sec->type == WASM_SEC_DATA)
+      name = "reloc.DATA";
+    else if (sec->type == WASM_SEC_CODE)
+      name = "reloc.CODE";
+    else if (sec->type == WASM_SEC_CUSTOM)
+      name = saver.save("reloc." + sec->name);
     else
       llvm_unreachable(
           "relocations only supported for code, data, or custom sections");
 
-    SyntheticSection *Section = createSyntheticSection(WASM_SEC_CUSTOM, Name);
-    raw_ostream &OS = Section->getStream();
-    writeUleb128(OS, I, "reloc section");
-    writeUleb128(OS, Count, "reloc count");
-    OSec->writeRelocations(OS);
+    addSection(make<RelocSection>(name, sec));
   }
 }
 
-static uint32_t getWasmFlags(const Symbol *Sym) {
-  uint32_t Flags = 0;
-  if (Sym->isLocal())
-    Flags |= WASM_SYMBOL_BINDING_LOCAL;
-  if (Sym->isWeak())
-    Flags |= WASM_SYMBOL_BINDING_WEAK;
-  if (Sym->isHidden())
-    Flags |= WASM_SYMBOL_VISIBILITY_HIDDEN;
-  if (Sym->isUndefined())
-    Flags |= WASM_SYMBOL_UNDEFINED;
-  if (auto *F = dyn_cast<UndefinedFunction>(Sym)) {
-    if (F->getName() != F->ImportName)
-      Flags |= WASM_SYMBOL_EXPLICIT_NAME;
-  } else if (auto *G = dyn_cast<UndefinedGlobal>(Sym)) {
-    if (G->getName() != G->ImportName)
-      Flags |= WASM_SYMBOL_EXPLICIT_NAME;
+void Writer::populateProducers() {
+  for (ObjFile *file : symtab->objectFiles) {
+    const WasmProducerInfo &info = file->getWasmObj()->getProducerInfo();
+    out.producersSec->addInfo(info);
   }
-  return Flags;
-}
-
-// Some synthetic sections (e.g. "name" and "linking") have subsections.
-// Just like the synthetic sections themselves these need to be created before
-// they can be written out (since they are preceded by their length). This
-// class is used to create subsections and then write them into the stream
-// of the parent section.
-class SubSection {
-public:
-  explicit SubSection(uint32_t Type) : Type(Type) {}
-
-  void writeTo(raw_ostream &To) {
-    OS.flush();
-    writeUleb128(To, Type, "subsection type");
-    writeUleb128(To, Body.size(), "subsection size");
-    To.write(Body.data(), Body.size());
-  }
-
-private:
-  uint32_t Type;
-  std::string Body;
-
-public:
-  raw_string_ostream OS{Body};
-};
-
-// Create the custom "dylink" section containing information for the dynamic
-// linker.
-// See
-// https://github.com/WebAssembly/tool-conventions/blob/master/DynamicLinking.md
-void Writer::createDylinkSection() {
-  SyntheticSection *Section = createSyntheticSection(WASM_SEC_CUSTOM, "dylink");
-  raw_ostream &OS = Section->getStream();
-
-  writeUleb128(OS, MemSize, "MemSize");
-  writeUleb128(OS, MemAlign, "MemAlign");
-  writeUleb128(OS, IndirectFunctions.size(), "TableSize");
-  writeUleb128(OS, 0, "TableAlign");
-  writeUleb128(OS, 0, "Needed");  // TODO: Support "needed" shared libraries
-}
-
-// Create the custom "linking" section containing linker metadata.
-// This is only created when relocatable output is requested.
-void Writer::createLinkingSection() {
-  SyntheticSection *Section =
-      createSyntheticSection(WASM_SEC_CUSTOM, "linking");
-  raw_ostream &OS = Section->getStream();
-
-  writeUleb128(OS, WasmMetadataVersion, "Version");
-
-  if (!SymtabEntries.empty()) {
-    SubSection Sub(WASM_SYMBOL_TABLE);
-    writeUleb128(Sub.OS, SymtabEntries.size(), "num symbols");
-
-    for (const Symbol *Sym : SymtabEntries) {
-      assert(Sym->isDefined() || Sym->isUndefined());
-      WasmSymbolType Kind = Sym->getWasmType();
-      uint32_t Flags = getWasmFlags(Sym);
-
-      writeU8(Sub.OS, Kind, "sym kind");
-      writeUleb128(Sub.OS, Flags, "sym flags");
-
-      if (auto *F = dyn_cast<FunctionSymbol>(Sym)) {
-        writeUleb128(Sub.OS, F->getFunctionIndex(), "index");
-        if (Sym->isDefined() ||
-            (Flags & WASM_SYMBOL_EXPLICIT_NAME) != 0)
-          writeStr(Sub.OS, Sym->getName(), "sym name");
-      } else if (auto *G = dyn_cast<GlobalSymbol>(Sym)) {
-        writeUleb128(Sub.OS, G->getGlobalIndex(), "index");
-        if (Sym->isDefined() ||
-            (Flags & WASM_SYMBOL_EXPLICIT_NAME) != 0)
-          writeStr(Sub.OS, Sym->getName(), "sym name");
-      } else if (auto *E = dyn_cast<EventSymbol>(Sym)) {
-        writeUleb128(Sub.OS, E->getEventIndex(), "index");
-        if (Sym->isDefined() ||
-            (Flags & WASM_SYMBOL_EXPLICIT_NAME) != 0)
-          writeStr(Sub.OS, Sym->getName(), "sym name");
-      } else if (isa<DataSymbol>(Sym)) {
-        writeStr(Sub.OS, Sym->getName(), "sym name");
-        if (auto *DataSym = dyn_cast<DefinedData>(Sym)) {
-          writeUleb128(Sub.OS, DataSym->getOutputSegmentIndex(), "index");
-          writeUleb128(Sub.OS, DataSym->getOutputSegmentOffset(),
-                       "data offset");
-          writeUleb128(Sub.OS, DataSym->getSize(), "data size");
-        }
-      } else {
-        auto *S = cast<SectionSymbol>(Sym);
-        writeUleb128(Sub.OS, S->getOutputSectionIndex(), "sym section index");
-      }
-    }
-
-    Sub.writeTo(OS);
-  }
-
-  if (Segments.size()) {
-    SubSection Sub(WASM_SEGMENT_INFO);
-    writeUleb128(Sub.OS, Segments.size(), "num data segments");
-    for (const OutputSegment *S : Segments) {
-      writeStr(Sub.OS, S->Name, "segment name");
-      writeUleb128(Sub.OS, S->Alignment, "alignment");
-      writeUleb128(Sub.OS, 0, "flags");
-    }
-    Sub.writeTo(OS);
-  }
-
-  if (!InitFunctions.empty()) {
-    SubSection Sub(WASM_INIT_FUNCS);
-    writeUleb128(Sub.OS, InitFunctions.size(), "num init functions");
-    for (const WasmInitEntry &F : InitFunctions) {
-      writeUleb128(Sub.OS, F.Priority, "priority");
-      writeUleb128(Sub.OS, F.Sym->getOutputSymbolIndex(), "function index");
-    }
-    Sub.writeTo(OS);
-  }
-
-  struct ComdatEntry {
-    unsigned Kind;
-    uint32_t Index;
-  };
-  std::map<StringRef, std::vector<ComdatEntry>> Comdats;
-
-  for (const InputFunction *F : InputFunctions) {
-    StringRef Comdat = F->getComdatName();
-    if (!Comdat.empty())
-      Comdats[Comdat].emplace_back(
-          ComdatEntry{WASM_COMDAT_FUNCTION, F->getFunctionIndex()});
-  }
-  for (uint32_t I = 0; I < Segments.size(); ++I) {
-    const auto &InputSegments = Segments[I]->InputSegments;
-    if (InputSegments.empty())
-      continue;
-    StringRef Comdat = InputSegments[0]->getComdatName();
-#ifndef NDEBUG
-    for (const InputSegment *IS : InputSegments)
-      assert(IS->getComdatName() == Comdat);
-#endif
-    if (!Comdat.empty())
-      Comdats[Comdat].emplace_back(ComdatEntry{WASM_COMDAT_DATA, I});
-  }
-
-  if (!Comdats.empty()) {
-    SubSection Sub(WASM_COMDAT_INFO);
-    writeUleb128(Sub.OS, Comdats.size(), "num comdats");
-    for (const auto &C : Comdats) {
-      writeStr(Sub.OS, C.first, "comdat name");
-      writeUleb128(Sub.OS, 0, "comdat flags"); // flags for future use
-      writeUleb128(Sub.OS, C.second.size(), "num entries");
-      for (const ComdatEntry &Entry : C.second) {
-        writeU8(Sub.OS, Entry.Kind, "entry kind");
-        writeUleb128(Sub.OS, Entry.Index, "entry index");
-      }
-    }
-    Sub.writeTo(OS);
-  }
-}
-
-// Create the custom "name" section containing debug symbol names.
-void Writer::createNameSection() {
-  unsigned NumNames = NumImportedFunctions;
-  for (const InputFunction *F : InputFunctions)
-    if (!F->getName().empty() || !F->getDebugName().empty())
-      ++NumNames;
-
-  if (NumNames == 0)
-    return;
-
-  SyntheticSection *Section = createSyntheticSection(WASM_SEC_CUSTOM, "name");
-
-  SubSection Sub(WASM_NAMES_FUNCTION);
-  writeUleb128(Sub.OS, NumNames, "name count");
-
-  // Names must appear in function index order.  As it happens ImportedSymbols
-  // and InputFunctions are numbered in order with imported functions coming
-  // first.
-  for (const Symbol *S : ImportedSymbols) {
-    if (auto *F = dyn_cast<FunctionSymbol>(S)) {
-      writeUleb128(Sub.OS, F->getFunctionIndex(), "func index");
-      writeStr(Sub.OS, toString(*S), "symbol name");
-    }
-  }
-  for (const InputFunction *F : InputFunctions) {
-    if (!F->getName().empty()) {
-      writeUleb128(Sub.OS, F->getFunctionIndex(), "func index");
-      if (!F->getDebugName().empty()) {
-        writeStr(Sub.OS, F->getDebugName(), "symbol name");
-      } else {
-        writeStr(Sub.OS, maybeDemangleSymbol(F->getName()), "symbol name");
-      }
-    }
-  }
-
-  Sub.writeTo(Section->getStream());
 }
 
 void Writer::writeHeader() {
-  memcpy(Buffer->getBufferStart(), Header.data(), Header.size());
+  memcpy(buffer->getBufferStart(), header.data(), header.size());
 }
 
 void Writer::writeSections() {
-  uint8_t *Buf = Buffer->getBufferStart();
-  parallelForEach(OutputSections, [Buf](OutputSection *S) { S->writeTo(Buf); });
+  uint8_t *buf = buffer->getBufferStart();
+  parallelForEach(outputSections, [buf](OutputSection *s) {
+    assert(s->isNeeded());
+    s->writeTo(buf);
+  });
 }
 
 // Fix the memory layout of the output binary.  This assigns memory offsets
 // to each of the input data sections as well as the explicit stack region.
 // The default memory layout is as follows, from low to high.
 //
-//  - initialized data (starting at Config->GlobalBase)
+//  - initialized data (starting at Config->globalBase)
 //  - BSS data (not currently implemented in llvm)
 //  - explicit stack (Config->ZStackSize)
 //  - heap start / unallocated
@@ -676,262 +202,347 @@ void Writer::writeSections() {
 // rather than overwriting global data, but also increases code size since all
 // static data loads and stores requires larger offsets.
 void Writer::layoutMemory() {
-  createOutputSegments();
+  uint32_t memoryPtr = 0;
 
-  uint32_t MemoryPtr = 0;
-
-  auto PlaceStack = [&]() {
-    if (Config->Relocatable || Config->Shared)
+  auto placeStack = [&]() {
+    if (config->relocatable || config->isPic)
       return;
-    MemoryPtr = alignTo(MemoryPtr, StackAlignment);
-    if (Config->ZStackSize != alignTo(Config->ZStackSize, StackAlignment))
-      error("stack size must be " + Twine(StackAlignment) + "-byte aligned");
-    log("mem: stack size  = " + Twine(Config->ZStackSize));
-    log("mem: stack base  = " + Twine(MemoryPtr));
-    MemoryPtr += Config->ZStackSize;
-    auto *SP = cast<DefinedGlobal>(WasmSym::StackPointer);
-    SP->Global->Global.InitExpr.Value.Int32 = MemoryPtr;
-    log("mem: stack top   = " + Twine(MemoryPtr));
+    memoryPtr = alignTo(memoryPtr, stackAlignment);
+    if (config->zStackSize != alignTo(config->zStackSize, stackAlignment))
+      error("stack size must be " + Twine(stackAlignment) + "-byte aligned");
+    log("mem: stack size  = " + Twine(config->zStackSize));
+    log("mem: stack base  = " + Twine(memoryPtr));
+    memoryPtr += config->zStackSize;
+    auto *sp = cast<DefinedGlobal>(WasmSym::stackPointer);
+    sp->global->global.InitExpr.Value.Int32 = memoryPtr;
+    log("mem: stack top   = " + Twine(memoryPtr));
   };
 
-  if (Config->StackFirst) {
-    PlaceStack();
+  if (config->stackFirst) {
+    placeStack();
   } else {
-    MemoryPtr = Config->GlobalBase;
-    log("mem: global base = " + Twine(Config->GlobalBase));
+    memoryPtr = config->globalBase;
+    log("mem: global base = " + Twine(config->globalBase));
   }
 
-  uint32_t DataStart = MemoryPtr;
+  if (WasmSym::globalBase)
+    WasmSym::globalBase->setVirtualAddress(config->globalBase);
+
+  uint32_t dataStart = memoryPtr;
 
   // Arbitrarily set __dso_handle handle to point to the start of the data
   // segments.
-  if (WasmSym::DsoHandle)
-    WasmSym::DsoHandle->setVirtualAddress(DataStart);
+  if (WasmSym::dsoHandle)
+    WasmSym::dsoHandle->setVirtualAddress(dataStart);
 
-  MemAlign = 0;
-  for (OutputSegment *Seg : Segments) {
-    MemAlign = std::max(MemAlign, Seg->Alignment);
-    MemoryPtr = alignTo(MemoryPtr, 1 << Seg->Alignment);
-    Seg->StartVA = MemoryPtr;
-    log(formatv("mem: {0,-15} offset={1,-8} size={2,-8} align={3}", Seg->Name,
-                MemoryPtr, Seg->Size, Seg->Alignment));
-    MemoryPtr += Seg->Size;
+  out.dylinkSec->memAlign = 0;
+  for (OutputSegment *seg : segments) {
+    out.dylinkSec->memAlign = std::max(out.dylinkSec->memAlign, seg->alignment);
+    memoryPtr = alignTo(memoryPtr, 1ULL << seg->alignment);
+    seg->startVA = memoryPtr;
+    log(formatv("mem: {0,-15} offset={1,-8} size={2,-8} align={3}", seg->name,
+                memoryPtr, seg->size, seg->alignment));
+    memoryPtr += seg->size;
+
+    if (WasmSym::tlsSize && seg->name == ".tdata") {
+      auto *tlsSize = cast<DefinedGlobal>(WasmSym::tlsSize);
+      tlsSize->global->global.InitExpr.Value.Int32 = seg->size;
+    }
   }
 
   // TODO: Add .bss space here.
-  if (WasmSym::DataEnd)
-    WasmSym::DataEnd->setVirtualAddress(MemoryPtr);
+  if (WasmSym::dataEnd)
+    WasmSym::dataEnd->setVirtualAddress(memoryPtr);
 
-  log("mem: static data = " + Twine(MemoryPtr - DataStart));
+  log("mem: static data = " + Twine(memoryPtr - dataStart));
 
-  if (Config->Shared) {
-    MemSize = MemoryPtr;
+  if (config->shared) {
+    out.dylinkSec->memSize = memoryPtr;
     return;
   }
 
-  if (!Config->StackFirst)
-    PlaceStack();
+  if (!config->stackFirst)
+    placeStack();
 
   // Set `__heap_base` to directly follow the end of the stack or global data.
   // The fact that this comes last means that a malloc/brk implementation
   // can grow the heap at runtime.
-  if (!Config->Relocatable) {
-    WasmSym::HeapBase->setVirtualAddress(MemoryPtr);
-    log("mem: heap base   = " + Twine(MemoryPtr));
-  }
+  log("mem: heap base   = " + Twine(memoryPtr));
+  if (WasmSym::heapBase)
+    WasmSym::heapBase->setVirtualAddress(memoryPtr);
 
-  if (Config->InitialMemory != 0) {
-    if (Config->InitialMemory != alignTo(Config->InitialMemory, WasmPageSize))
+  if (config->initialMemory != 0) {
+    if (config->initialMemory != alignTo(config->initialMemory, WasmPageSize))
       error("initial memory must be " + Twine(WasmPageSize) + "-byte aligned");
-    if (MemoryPtr > Config->InitialMemory)
-      error("initial memory too small, " + Twine(MemoryPtr) + " bytes needed");
+    if (memoryPtr > config->initialMemory)
+      error("initial memory too small, " + Twine(memoryPtr) + " bytes needed");
     else
-      MemoryPtr = Config->InitialMemory;
+      memoryPtr = config->initialMemory;
   }
-  MemSize = MemoryPtr;
-  NumMemoryPages = alignTo(MemoryPtr, WasmPageSize) / WasmPageSize;
-  log("mem: total pages = " + Twine(NumMemoryPages));
+  out.dylinkSec->memSize = memoryPtr;
+  out.memorySec->numMemoryPages =
+      alignTo(memoryPtr, WasmPageSize) / WasmPageSize;
+  log("mem: total pages = " + Twine(out.memorySec->numMemoryPages));
 
-  if (Config->MaxMemory != 0) {
-    if (Config->MaxMemory != alignTo(Config->MaxMemory, WasmPageSize))
+  // Check max if explicitly supplied or required by shared memory
+  if (config->maxMemory != 0 || config->sharedMemory) {
+    if (config->maxMemory != alignTo(config->maxMemory, WasmPageSize))
       error("maximum memory must be " + Twine(WasmPageSize) + "-byte aligned");
-    if (MemoryPtr > Config->MaxMemory)
-      error("maximum memory too small, " + Twine(MemoryPtr) + " bytes needed");
-    MaxMemoryPages = Config->MaxMemory / WasmPageSize;
-    log("mem: max pages   = " + Twine(MaxMemoryPages));
+    if (memoryPtr > config->maxMemory)
+      error("maximum memory too small, " + Twine(memoryPtr) + " bytes needed");
+    out.memorySec->maxMemoryPages = config->maxMemory / WasmPageSize;
+    log("mem: max pages   = " + Twine(out.memorySec->maxMemoryPages));
   }
 }
 
-SyntheticSection *Writer::createSyntheticSection(uint32_t Type,
-                                                 StringRef Name) {
-  auto Sec = make<SyntheticSection>(Type, Name);
-  log("createSection: " + toString(*Sec));
-  OutputSections.push_back(Sec);
-  return Sec;
+void Writer::addSection(OutputSection *sec) {
+  if (!sec->isNeeded())
+    return;
+  log("addSection: " + toString(*sec));
+  sec->sectionIndex = outputSections.size();
+  outputSections.push_back(sec);
 }
 
-void Writer::createSections() {
-  // Known sections
-  if (Config->Pic)
-    createDylinkSection();
-  createTypeSection();
-  createImportSection();
-  createFunctionSection();
-  createTableSection();
-  createMemorySection();
-  createGlobalSection();
-  createEventSection();
-  createExportSection();
-  createElemSection();
-  createCodeSection();
-  createDataSection();
+// If a section name is valid as a C identifier (which is rare because of
+// the leading '.'), linkers are expected to define __start_<secname> and
+// __stop_<secname> symbols. They are at beginning and end of the section,
+// respectively. This is not requested by the ELF standard, but GNU ld and
+// gold provide the feature, and used by many programs.
+static void addStartStopSymbols(const OutputSegment *seg) {
+  StringRef name = seg->name;
+  if (!isValidCIdentifier(name))
+    return;
+  LLVM_DEBUG(dbgs() << "addStartStopSymbols: " << name << "\n");
+  uint32_t start = seg->startVA;
+  uint32_t stop = start + seg->size;
+  symtab->addOptionalDataSymbol(saver.save("__start_" + name), start);
+  symtab->addOptionalDataSymbol(saver.save("__stop_" + name), stop);
+}
+
+void Writer::addSections() {
+  addSection(out.dylinkSec);
+  addSection(out.typeSec);
+  addSection(out.importSec);
+  addSection(out.functionSec);
+  addSection(out.tableSec);
+  addSection(out.memorySec);
+  addSection(out.globalSec);
+  addSection(out.eventSec);
+  addSection(out.exportSec);
+  addSection(out.elemSec);
+  addSection(out.dataCountSec);
+
+  addSection(make<CodeSection>(out.functionSec->inputFunctions));
+  addSection(make<DataSection>(segments));
+
   createCustomSections();
 
-  // Custom sections
-  if (Config->Relocatable) {
-    createLinkingSection();
+  addSection(out.linkingSec);
+  if (config->emitRelocs || config->relocatable) {
     createRelocSections();
   }
-  if (!Config->StripDebug && !Config->StripAll)
-    createNameSection();
 
-  for (OutputSection *S : OutputSections) {
-    S->setOffset(FileSize);
-    S->finalizeContents();
-    FileSize += S->getSize();
+  addSection(out.nameSec);
+  addSection(out.producersSec);
+  addSection(out.targetFeaturesSec);
+}
+
+void Writer::finalizeSections() {
+  for (OutputSection *s : outputSections) {
+    s->setOffset(fileSize);
+    s->finalizeContents();
+    fileSize += s->getSize();
+  }
+}
+
+void Writer::populateTargetFeatures() {
+  StringMap<std::string> used;
+  StringMap<std::string> required;
+  StringMap<std::string> disallowed;
+  bool tlsUsed = false;
+
+  // Only infer used features if user did not specify features
+  bool inferFeatures = !config->features.hasValue();
+
+  if (!inferFeatures) {
+    for (auto &feature : config->features.getValue())
+      out.targetFeaturesSec->features.insert(feature);
+    // No need to read or check features
+    if (!config->checkFeatures)
+      return;
+  }
+
+  // Find the sets of used, required, and disallowed features
+  for (ObjFile *file : symtab->objectFiles) {
+    StringRef fileName(file->getName());
+    for (auto &feature : file->getWasmObj()->getTargetFeatures()) {
+      switch (feature.Prefix) {
+      case WASM_FEATURE_PREFIX_USED:
+        used.insert({feature.Name, fileName});
+        break;
+      case WASM_FEATURE_PREFIX_REQUIRED:
+        used.insert({feature.Name, fileName});
+        required.insert({feature.Name, fileName});
+        break;
+      case WASM_FEATURE_PREFIX_DISALLOWED:
+        disallowed.insert({feature.Name, fileName});
+        break;
+      default:
+        error("Unrecognized feature policy prefix " +
+              std::to_string(feature.Prefix));
+      }
+    }
+
+    for (InputSegment *segment : file->segments) {
+      if (!segment->live)
+        continue;
+      StringRef name = segment->getName();
+      if (name.startswith(".tdata") || name.startswith(".tbss"))
+        tlsUsed = true;
+    }
+  }
+
+  if (inferFeatures)
+    out.targetFeaturesSec->features.insert(used.keys().begin(),
+                                           used.keys().end());
+
+  if (out.targetFeaturesSec->features.count("atomics") &&
+      !config->sharedMemory) {
+    if (inferFeatures)
+      error(Twine("'atomics' feature is used by ") + used["atomics"] +
+            ", so --shared-memory must be used");
+    else
+      error("'atomics' feature is used, so --shared-memory must be used");
+  }
+
+  if (!config->checkFeatures)
+    return;
+
+  if (disallowed.count("atomics") && config->sharedMemory)
+    error("'atomics' feature is disallowed by " + disallowed["atomics"] +
+          ", so --shared-memory must not be used");
+
+  if (!used.count("bulk-memory") && config->passiveSegments)
+    error("'bulk-memory' feature must be used in order to emit passive "
+          "segments");
+
+  if (!used.count("bulk-memory") && tlsUsed)
+    error("'bulk-memory' feature must be used in order to use thread-local "
+          "storage");
+
+  // Validate that used features are allowed in output
+  if (!inferFeatures) {
+    for (auto &feature : used.keys()) {
+      if (!out.targetFeaturesSec->features.count(feature))
+        error(Twine("Target feature '") + feature + "' used by " +
+              used[feature] + " is not allowed.");
+    }
+  }
+
+  // Validate the required and disallowed constraints for each file
+  for (ObjFile *file : symtab->objectFiles) {
+    StringRef fileName(file->getName());
+    SmallSet<std::string, 8> objectFeatures;
+    for (auto &feature : file->getWasmObj()->getTargetFeatures()) {
+      if (feature.Prefix == WASM_FEATURE_PREFIX_DISALLOWED)
+        continue;
+      objectFeatures.insert(feature.Name);
+      if (disallowed.count(feature.Name))
+        error(Twine("Target feature '") + feature.Name + "' used in " +
+              fileName + " is disallowed by " + disallowed[feature.Name] +
+              ". Use --no-check-features to suppress.");
+    }
+    for (auto &feature : required.keys()) {
+      if (!objectFeatures.count(feature))
+        error(Twine("Missing target feature '") + feature + "' in " + fileName +
+              ", required by " + required[feature] +
+              ". Use --no-check-features to suppress.");
+    }
   }
 }
 
 void Writer::calculateImports() {
-  for (Symbol *Sym : Symtab->getSymbols()) {
-    if (!Sym->isUndefined())
+  for (Symbol *sym : symtab->getSymbols()) {
+    if (!sym->isUndefined())
       continue;
-    if (isa<DataSymbol>(Sym))
+    if (sym->isWeak() && !config->relocatable)
       continue;
-    if (Sym->isWeak() && !Config->Relocatable)
+    if (!sym->isLive())
       continue;
-    if (!Sym->isLive())
+    if (!sym->isUsedInRegularObj)
       continue;
-    if (!Sym->IsUsedInRegularObj)
+    // We don't generate imports for data symbols. They however can be imported
+    // as GOT entries.
+    if (isa<DataSymbol>(sym))
       continue;
 
-    LLVM_DEBUG(dbgs() << "import: " << Sym->getName() << "\n");
-    ImportedSymbols.emplace_back(Sym);
-    if (auto *F = dyn_cast<FunctionSymbol>(Sym))
-      F->setFunctionIndex(NumImportedFunctions++);
-    else if (auto *G = dyn_cast<GlobalSymbol>(Sym))
-      G->setGlobalIndex(NumImportedGlobals++);
-    else
-      cast<EventSymbol>(Sym)->setEventIndex(NumImportedEvents++);
+    LLVM_DEBUG(dbgs() << "import: " << sym->getName() << "\n");
+    out.importSec->addImport(sym);
   }
 }
 
 void Writer::calculateExports() {
-  if (Config->Relocatable)
+  if (config->relocatable)
     return;
 
-  if (!Config->Relocatable && !Config->ImportMemory)
-    Exports.push_back(WasmExport{"memory", WASM_EXTERNAL_MEMORY, 0});
+  if (!config->relocatable && !config->importMemory)
+    out.exportSec->exports.push_back(
+        WasmExport{"memory", WASM_EXTERNAL_MEMORY, 0});
 
-  if (!Config->Relocatable && Config->ExportTable)
-    Exports.push_back(WasmExport{FunctionTableName, WASM_EXTERNAL_TABLE, 0});
+  if (!config->relocatable && config->exportTable)
+    out.exportSec->exports.push_back(
+        WasmExport{functionTableName, WASM_EXTERNAL_TABLE, 0});
 
-  unsigned FakeGlobalIndex = NumImportedGlobals + InputGlobals.size();
+  unsigned fakeGlobalIndex = out.importSec->getNumImportedGlobals() +
+                             out.globalSec->inputGlobals.size();
 
-  for (Symbol *Sym : Symtab->getSymbols()) {
-    if (!Sym->isExported())
+  for (Symbol *sym : symtab->getSymbols()) {
+    if (!sym->isExported())
       continue;
-    if (!Sym->isLive())
+    if (!sym->isLive())
       continue;
 
-    StringRef Name = Sym->getName();
-    WasmExport Export;
-    if (auto *F = dyn_cast<DefinedFunction>(Sym)) {
-      Export = {Name, WASM_EXTERNAL_FUNCTION, F->getFunctionIndex()};
-    } else if (auto *G = dyn_cast<DefinedGlobal>(Sym)) {
+    StringRef name = sym->getName();
+    WasmExport export_;
+    if (auto *f = dyn_cast<DefinedFunction>(sym)) {
+      export_ = {name, WASM_EXTERNAL_FUNCTION, f->getFunctionIndex()};
+    } else if (auto *g = dyn_cast<DefinedGlobal>(sym)) {
       // TODO(sbc): Remove this check once to mutable global proposal is
       // implement in all major browsers.
       // See: https://github.com/WebAssembly/mutable-global
-      if (G->getGlobalType()->Mutable) {
-        // Only the __stack_pointer should ever be create as mutable.
-        assert(G == WasmSym::StackPointer);
+      if (g->getGlobalType()->Mutable) {
+        // Only __stack_pointer and __tls_base should ever be create as mutable.
+        assert(g == WasmSym::stackPointer || g == WasmSym::tlsBase);
         continue;
       }
-      Export = {Name, WASM_EXTERNAL_GLOBAL, G->getGlobalIndex()};
-    } else if (auto *E = dyn_cast<DefinedEvent>(Sym)) {
-      Export = {Name, WASM_EXTERNAL_EVENT, E->getEventIndex()};
+      export_ = {name, WASM_EXTERNAL_GLOBAL, g->getGlobalIndex()};
+    } else if (auto *e = dyn_cast<DefinedEvent>(sym)) {
+      export_ = {name, WASM_EXTERNAL_EVENT, e->getEventIndex()};
     } else {
-      auto *D = cast<DefinedData>(Sym);
-      DefinedFakeGlobals.emplace_back(D);
-      Export = {Name, WASM_EXTERNAL_GLOBAL, FakeGlobalIndex++};
+      auto *d = cast<DefinedData>(sym);
+      out.globalSec->definedFakeGlobals.emplace_back(d);
+      export_ = {name, WASM_EXTERNAL_GLOBAL, fakeGlobalIndex++};
     }
 
-    LLVM_DEBUG(dbgs() << "Export: " << Name << "\n");
-    Exports.push_back(Export);
+    LLVM_DEBUG(dbgs() << "Export: " << name << "\n");
+    out.exportSec->exports.push_back(export_);
   }
 }
 
-void Writer::assignSymtab() {
-  if (!Config->Relocatable)
+void Writer::populateSymtab() {
+  if (!config->relocatable && !config->emitRelocs)
     return;
 
-  StringMap<uint32_t> SectionSymbolIndices;
-
-  unsigned SymbolIndex = SymtabEntries.size();
-
-  auto AddSymbol = [&](Symbol *Sym) {
-    if (auto *S = dyn_cast<SectionSymbol>(Sym)) {
-      StringRef Name = S->getName();
-      if (CustomSectionMapping.count(Name) == 0)
-        return;
-
-      auto SSI = SectionSymbolIndices.find(Name);
-      if (SSI != SectionSymbolIndices.end()) {
-        Sym->setOutputSymbolIndex(SSI->second);
-        return;
-      }
-
-      SectionSymbolIndices[Name] = SymbolIndex;
-      CustomSectionSymbols[Name] = cast<SectionSymbol>(Sym);
-
-      Sym->markLive();
-    }
-
-    // (Since this is relocatable output, GC is not performed so symbols must
-    // be live.)
-    assert(Sym->isLive());
-    Sym->setOutputSymbolIndex(SymbolIndex++);
-    SymtabEntries.emplace_back(Sym);
-  };
-
-  for (Symbol *Sym : Symtab->getSymbols())
-    if (!Sym->isLazy())
-      AddSymbol(Sym);
-
-  for (ObjFile *File : Symtab->ObjectFiles) {
-    LLVM_DEBUG(dbgs() << "Local symtab entries: " << File->getName() << "\n");
-    for (Symbol *Sym : File->getSymbols())
-      if (Sym->isLocal())
-        AddSymbol(Sym);
-  }
-}
-
-uint32_t Writer::lookupType(const WasmSignature &Sig) {
-  auto It = TypeIndices.find(Sig);
-  if (It == TypeIndices.end()) {
-    error("type not found: " + toString(Sig));
-    return 0;
-  }
-  return It->second;
-}
-
-uint32_t Writer::registerType(const WasmSignature &Sig) {
-  auto Pair = TypeIndices.insert(std::make_pair(Sig, Types.size()));
-  if (Pair.second) {
-    LLVM_DEBUG(dbgs() << "type " << toString(Sig) << "\n");
-    Types.push_back(&Sig);
+  for (Symbol *sym : symtab->getSymbols())
+    if (sym->isUsedInRegularObj && sym->isLive())
+      out.linkingSec->addToSymtab(sym);
+
+  for (ObjFile *file : symtab->objectFiles) {
+    LLVM_DEBUG(dbgs() << "Local symtab entries: " << file->getName() << "\n");
+    for (Symbol *sym : file->getSymbols())
+      if (sym->isLocal() && !isa<SectionSymbol>(sym) && sym->isLive())
+        out.linkingSec->addToSymtab(sym);
   }
-  return Pair.first->second;
 }
 
 void Writer::calculateTypes() {
@@ -942,244 +553,383 @@ void Writer::calculateTypes() {
   // 4. The signatures of all imported events
   // 5. The signatures of all defined events
 
-  for (ObjFile *File : Symtab->ObjectFiles) {
-    ArrayRef<WasmSignature> Types = File->getWasmObj()->types();
-    for (uint32_t I = 0; I < Types.size(); I++)
-      if (File->TypeIsUsed[I])
-        File->TypeMap[I] = registerType(Types[I]);
+  for (ObjFile *file : symtab->objectFiles) {
+    ArrayRef<WasmSignature> types = file->getWasmObj()->types();
+    for (uint32_t i = 0; i < types.size(); i++)
+      if (file->typeIsUsed[i])
+        file->typeMap[i] = out.typeSec->registerType(types[i]);
   }
 
-  for (const Symbol *Sym : ImportedSymbols) {
-    if (auto *F = dyn_cast<FunctionSymbol>(Sym))
-      registerType(*F->Signature);
-    else if (auto *E = dyn_cast<EventSymbol>(Sym))
-      registerType(*E->Signature);
+  for (const Symbol *sym : out.importSec->importedSymbols) {
+    if (auto *f = dyn_cast<FunctionSymbol>(sym))
+      out.typeSec->registerType(*f->signature);
+    else if (auto *e = dyn_cast<EventSymbol>(sym))
+      out.typeSec->registerType(*e->signature);
   }
 
-  for (const InputFunction *F : InputFunctions)
-    registerType(F->Signature);
+  for (const InputFunction *f : out.functionSec->inputFunctions)
+    out.typeSec->registerType(f->signature);
 
-  for (const InputEvent *E : InputEvents)
-    registerType(E->Signature);
+  for (const InputEvent *e : out.eventSec->inputEvents)
+    out.typeSec->registerType(e->signature);
+}
+
+static void scanRelocations() {
+  for (ObjFile *file : symtab->objectFiles) {
+    LLVM_DEBUG(dbgs() << "scanRelocations: " << file->getName() << "\n");
+    for (InputChunk *chunk : file->functions)
+      scanRelocations(chunk);
+    for (InputChunk *chunk : file->segments)
+      scanRelocations(chunk);
+    for (auto &p : file->customSections)
+      scanRelocations(p);
+  }
 }
 
 void Writer::assignIndexes() {
-  assert(InputFunctions.empty());
-  uint32_t FunctionIndex = NumImportedFunctions;
-  auto AddDefinedFunction = [&](InputFunction *Func) {
-    if (!Func->Live)
-      return;
-    InputFunctions.emplace_back(Func);
-    Func->setFunctionIndex(FunctionIndex++);
-  };
+  // Seal the import section, since other index spaces such as function and
+  // global are effected by the number of imports.
+  out.importSec->seal();
 
-  for (InputFunction *Func : Symtab->SyntheticFunctions)
-    AddDefinedFunction(Func);
+  for (InputFunction *func : symtab->syntheticFunctions)
+    out.functionSec->addFunction(func);
 
-  for (ObjFile *File : Symtab->ObjectFiles) {
-    LLVM_DEBUG(dbgs() << "Functions: " << File->getName() << "\n");
-    for (InputFunction *Func : File->Functions)
-      AddDefinedFunction(Func);
+  for (ObjFile *file : symtab->objectFiles) {
+    LLVM_DEBUG(dbgs() << "Functions: " << file->getName() << "\n");
+    for (InputFunction *func : file->functions)
+      out.functionSec->addFunction(func);
   }
 
-  uint32_t TableIndex = TableBase;
-  auto HandleRelocs = [&](InputChunk *Chunk) {
-    if (!Chunk->Live)
-      return;
-    ObjFile *File = Chunk->File;
-    ArrayRef<WasmSignature> Types = File->getWasmObj()->types();
-    for (const WasmRelocation &Reloc : Chunk->getRelocations()) {
-      if (Reloc.Type == R_WEBASSEMBLY_TABLE_INDEX_I32 ||
-          Reloc.Type == R_WEBASSEMBLY_TABLE_INDEX_SLEB) {
-        FunctionSymbol *Sym = File->getFunctionSymbol(Reloc.Index);
-        if (Sym->hasTableIndex() || !Sym->hasFunctionIndex())
-          continue;
-        Sym->setTableIndex(TableIndex++);
-        IndirectFunctions.emplace_back(Sym);
-      } else if (Reloc.Type == R_WEBASSEMBLY_TYPE_INDEX_LEB) {
-        // Mark target type as live
-        File->TypeMap[Reloc.Index] = registerType(Types[Reloc.Index]);
-        File->TypeIsUsed[Reloc.Index] = true;
-      }
-    }
-  };
+  for (InputGlobal *global : symtab->syntheticGlobals)
+    out.globalSec->addGlobal(global);
 
-  for (ObjFile *File : Symtab->ObjectFiles) {
-    LLVM_DEBUG(dbgs() << "Handle relocs: " << File->getName() << "\n");
-    for (InputChunk *Chunk : File->Functions)
-      HandleRelocs(Chunk);
-    for (InputChunk *Chunk : File->Segments)
-      HandleRelocs(Chunk);
-    for (auto &P : File->CustomSections)
-      HandleRelocs(P);
+  for (ObjFile *file : symtab->objectFiles) {
+    LLVM_DEBUG(dbgs() << "Globals: " << file->getName() << "\n");
+    for (InputGlobal *global : file->globals)
+      out.globalSec->addGlobal(global);
   }
 
-  assert(InputGlobals.empty());
-  uint32_t GlobalIndex = NumImportedGlobals;
-  auto AddDefinedGlobal = [&](InputGlobal *Global) {
-    if (Global->Live) {
-      LLVM_DEBUG(dbgs() << "AddDefinedGlobal: " << GlobalIndex << "\n");
-      Global->setGlobalIndex(GlobalIndex++);
-      InputGlobals.push_back(Global);
-    }
-  };
-
-  for (InputGlobal *Global : Symtab->SyntheticGlobals)
-    AddDefinedGlobal(Global);
-
-  for (ObjFile *File : Symtab->ObjectFiles) {
-    LLVM_DEBUG(dbgs() << "Globals: " << File->getName() << "\n");
-    for (InputGlobal *Global : File->Globals)
-      AddDefinedGlobal(Global);
-  }
-
-  assert(InputEvents.empty());
-  uint32_t EventIndex = NumImportedEvents;
-  auto AddDefinedEvent = [&](InputEvent *Event) {
-    if (Event->Live) {
-      LLVM_DEBUG(dbgs() << "AddDefinedEvent: " << EventIndex << "\n");
-      Event->setEventIndex(EventIndex++);
-      InputEvents.push_back(Event);
-    }
-  };
-
-  for (ObjFile *File : Symtab->ObjectFiles) {
-    LLVM_DEBUG(dbgs() << "Events: " << File->getName() << "\n");
-    for (InputEvent *Event : File->Events)
-      AddDefinedEvent(Event);
+  for (ObjFile *file : symtab->objectFiles) {
+    LLVM_DEBUG(dbgs() << "Events: " << file->getName() << "\n");
+    for (InputEvent *event : file->events)
+      out.eventSec->addEvent(event);
   }
 }
 
-static StringRef getOutputDataSegmentName(StringRef Name) {
+static StringRef getOutputDataSegmentName(StringRef name) {
   // With PIC code we currently only support a single data segment since
   // we only have a single __memory_base to use as our base address.
-  if (Config->Pic)
-    return "data";
-  if (!Config->MergeDataSegments)
-    return Name;
-  if (Name.startswith(".text."))
+  if (config->isPic)
+    return ".data";
+  // We only support one thread-local segment, so we must merge the segments
+  // despite --no-merge-data-segments.
+  // We also need to merge .tbss into .tdata so they share the same offsets.
+  if (name.startswith(".tdata") || name.startswith(".tbss"))
+    return ".tdata";
+  if (!config->mergeDataSegments)
+    return name;
+  if (name.startswith(".text."))
     return ".text";
-  if (Name.startswith(".data."))
+  if (name.startswith(".data."))
     return ".data";
-  if (Name.startswith(".bss."))
+  if (name.startswith(".bss."))
     return ".bss";
-  if (Name.startswith(".rodata."))
+  if (name.startswith(".rodata."))
     return ".rodata";
-  return Name;
+  return name;
 }
 
 void Writer::createOutputSegments() {
-  for (ObjFile *File : Symtab->ObjectFiles) {
-    for (InputSegment *Segment : File->Segments) {
-      if (!Segment->Live)
+  for (ObjFile *file : symtab->objectFiles) {
+    for (InputSegment *segment : file->segments) {
+      if (!segment->live)
         continue;
-      StringRef Name = getOutputDataSegmentName(Segment->getName());
-      OutputSegment *&S = SegmentMap[Name];
-      if (S == nullptr) {
-        LLVM_DEBUG(dbgs() << "new segment: " << Name << "\n");
-        S = make<OutputSegment>(Name, Segments.size());
-        Segments.push_back(S);
+      StringRef name = getOutputDataSegmentName(segment->getName());
+      OutputSegment *&s = segmentMap[name];
+      if (s == nullptr) {
+        LLVM_DEBUG(dbgs() << "new segment: " << name << "\n");
+        s = make<OutputSegment>(name, segments.size());
+        if (config->passiveSegments || name == ".tdata")
+          s->initFlags = WASM_SEGMENT_IS_PASSIVE;
+        segments.push_back(s);
       }
-      S->addInputSegment(Segment);
-      LLVM_DEBUG(dbgs() << "added data: " << Name << ": " << S->Size << "\n");
+      s->addInputSegment(segment);
+      LLVM_DEBUG(dbgs() << "added data: " << name << ": " << s->size << "\n");
     }
   }
 }
 
-static const int OPCODE_CALL = 0x10;
-static const int OPCODE_END = 0xb;
+static void createFunction(DefinedFunction *func, StringRef bodyContent) {
+  std::string functionBody;
+  {
+    raw_string_ostream os(functionBody);
+    writeUleb128(os, bodyContent.size(), "function size");
+    os << bodyContent;
+  }
+  ArrayRef<uint8_t> body = arrayRefFromStringRef(saver.save(functionBody));
+  cast<SyntheticFunction>(func->function)->setBody(body);
+}
+
+void Writer::createInitMemoryFunction() {
+  LLVM_DEBUG(dbgs() << "createInitMemoryFunction\n");
+  std::string bodyContent;
+  {
+    raw_string_ostream os(bodyContent);
+    writeUleb128(os, 0, "num locals");
+
+    // initialize passive data segments
+    for (const OutputSegment *s : segments) {
+      if (s->initFlags & WASM_SEGMENT_IS_PASSIVE && s->name != ".tdata") {
+        // destination address
+        writeU8(os, WASM_OPCODE_I32_CONST, "i32.const");
+        writeSleb128(os, s->startVA, "destination address");
+        // source segment offset
+        writeU8(os, WASM_OPCODE_I32_CONST, "i32.const");
+        writeSleb128(os, 0, "segment offset");
+        // memory region size
+        writeU8(os, WASM_OPCODE_I32_CONST, "i32.const");
+        writeSleb128(os, s->size, "memory region size");
+        // memory.init instruction
+        writeU8(os, WASM_OPCODE_MISC_PREFIX, "bulk-memory prefix");
+        writeUleb128(os, WASM_OPCODE_MEMORY_INIT, "MEMORY.INIT");
+        writeUleb128(os, s->index, "segment index immediate");
+        writeU8(os, 0, "memory index immediate");
+        // data.drop instruction
+        writeU8(os, WASM_OPCODE_MISC_PREFIX, "bulk-memory prefix");
+        writeUleb128(os, WASM_OPCODE_DATA_DROP, "DATA.DROP");
+        writeUleb128(os, s->index, "segment index immediate");
+      }
+    }
+    writeU8(os, WASM_OPCODE_END, "END");
+  }
+
+  createFunction(WasmSym::initMemory, bodyContent);
+}
+
+// For -shared (PIC) output, we create create a synthetic function which will
+// apply any relocations to the data segments on startup.  This function is
+// called __wasm_apply_relocs and is added at the beginning of __wasm_call_ctors
+// before any of the constructors run.
+void Writer::createApplyRelocationsFunction() {
+  LLVM_DEBUG(dbgs() << "createApplyRelocationsFunction\n");
+  // First write the body's contents to a string.
+  std::string bodyContent;
+  {
+    raw_string_ostream os(bodyContent);
+    writeUleb128(os, 0, "num locals");
+    for (const OutputSegment *seg : segments)
+      for (const InputSegment *inSeg : seg->inputSegments)
+        inSeg->generateRelocationCode(os);
+    writeU8(os, WASM_OPCODE_END, "END");
+  }
+
+  createFunction(WasmSym::applyRelocs, bodyContent);
+}
 
 // Create synthetic "__wasm_call_ctors" function based on ctor functions
 // in input object.
-void Writer::createCtorFunction() {
+void Writer::createCallCtorsFunction() {
+  if (!WasmSym::callCtors->isLive())
+    return;
+
   // First write the body's contents to a string.
-  std::string BodyContent;
+  std::string bodyContent;
   {
-    raw_string_ostream OS(BodyContent);
-    writeUleb128(OS, 0, "num locals");
-    for (const WasmInitEntry &F : InitFunctions) {
-      writeU8(OS, OPCODE_CALL, "CALL");
-      writeUleb128(OS, F.Sym->getFunctionIndex(), "function index");
+    raw_string_ostream os(bodyContent);
+    writeUleb128(os, 0, "num locals");
+
+    if (config->passiveSegments) {
+      writeU8(os, WASM_OPCODE_CALL, "CALL");
+      writeUleb128(os, WasmSym::initMemory->getFunctionIndex(),
+                   "function index");
+    }
+
+    if (config->isPic) {
+      writeU8(os, WASM_OPCODE_CALL, "CALL");
+      writeUleb128(os, WasmSym::applyRelocs->getFunctionIndex(),
+                   "function index");
+    }
+
+    // Call constructors
+    for (const WasmInitEntry &f : initFunctions) {
+      writeU8(os, WASM_OPCODE_CALL, "CALL");
+      writeUleb128(os, f.sym->getFunctionIndex(), "function index");
     }
-    writeU8(OS, OPCODE_END, "END");
+    writeU8(os, WASM_OPCODE_END, "END");
   }
 
-  // Once we know the size of the body we can create the final function body
-  std::string FunctionBody;
+  createFunction(WasmSym::callCtors, bodyContent);
+}
+
+void Writer::createInitTLSFunction() {
+  if (!WasmSym::initTLS->isLive())
+    return;
+
+  std::string bodyContent;
   {
-    raw_string_ostream OS(FunctionBody);
-    writeUleb128(OS, BodyContent.size(), "function size");
-    OS << BodyContent;
+    raw_string_ostream os(bodyContent);
+
+    OutputSegment *tlsSeg = nullptr;
+    for (auto *seg : segments) {
+      if (seg->name == ".tdata") {
+        tlsSeg = seg;
+        break;
+      }
+    }
+
+    writeUleb128(os, 0, "num locals");
+    if (tlsSeg) {
+      writeU8(os, WASM_OPCODE_LOCAL_GET, "local.get");
+      writeUleb128(os, 0, "local index");
+
+      writeU8(os, WASM_OPCODE_GLOBAL_SET, "global.set");
+      writeUleb128(os, WasmSym::tlsBase->getGlobalIndex(), "global index");
+
+      writeU8(os, WASM_OPCODE_LOCAL_GET, "local.get");
+      writeUleb128(os, 0, "local index");
+
+      writeU8(os, WASM_OPCODE_I32_CONST, "i32.const");
+      writeSleb128(os, 0, "segment offset");
+
+      writeU8(os, WASM_OPCODE_I32_CONST, "i32.const");
+      writeSleb128(os, tlsSeg->size, "memory region size");
+
+      writeU8(os, WASM_OPCODE_MISC_PREFIX, "bulk-memory prefix");
+      writeUleb128(os, WASM_OPCODE_MEMORY_INIT, "MEMORY.INIT");
+      writeUleb128(os, tlsSeg->index, "segment index immediate");
+      writeU8(os, 0, "memory index immediate");
+    }
+    writeU8(os, WASM_OPCODE_END, "end function");
   }
 
-  ArrayRef<uint8_t> Body = arrayRefFromStringRef(Saver.save(FunctionBody));
-  cast<SyntheticFunction>(WasmSym::CallCtors->Function)->setBody(Body);
+  createFunction(WasmSym::initTLS, bodyContent);
 }
 
 // Populate InitFunctions vector with init functions from all input objects.
 // This is then used either when creating the output linking section or to
 // synthesize the "__wasm_call_ctors" function.
 void Writer::calculateInitFunctions() {
-  for (ObjFile *File : Symtab->ObjectFiles) {
-    const WasmLinkingData &L = File->getWasmObj()->linkingData();
-    for (const WasmInitFunc &F : L.InitFunctions) {
-      FunctionSymbol *Sym = File->getFunctionSymbol(F.Symbol);
-      if (*Sym->Signature != WasmSignature{{}, {}})
-        error("invalid signature for init func: " + toString(*Sym));
-      InitFunctions.emplace_back(WasmInitEntry{Sym, F.Priority});
+  if (!config->relocatable && !WasmSym::callCtors->isLive())
+    return;
+
+  for (ObjFile *file : symtab->objectFiles) {
+    const WasmLinkingData &l = file->getWasmObj()->linkingData();
+    for (const WasmInitFunc &f : l.InitFunctions) {
+      FunctionSymbol *sym = file->getFunctionSymbol(f.Symbol);
+      // comdat exclusions can cause init functions be discarded.
+      if (sym->isDiscarded())
+        continue;
+      assert(sym->isLive());
+      if (*sym->signature != WasmSignature{{}, {}})
+        error("invalid signature for init func: " + toString(*sym));
+      LLVM_DEBUG(dbgs() << "initFunctions: " << toString(*sym) << "\n");
+      initFunctions.emplace_back(WasmInitEntry{sym, f.Priority});
     }
   }
 
   // Sort in order of priority (lowest first) so that they are called
   // in the correct order.
-  std::stable_sort(InitFunctions.begin(), InitFunctions.end(),
-                   [](const WasmInitEntry &L, const WasmInitEntry &R) {
-                     return L.Priority < R.Priority;
-                   });
+  llvm::stable_sort(initFunctions,
+                    [](const WasmInitEntry &l, const WasmInitEntry &r) {
+                      return l.priority < r.priority;
+                    });
+}
+
+void Writer::createSyntheticSections() {
+  out.dylinkSec = make<DylinkSection>();
+  out.typeSec = make<TypeSection>();
+  out.importSec = make<ImportSection>();
+  out.functionSec = make<FunctionSection>();
+  out.tableSec = make<TableSection>();
+  out.memorySec = make<MemorySection>();
+  out.globalSec = make<GlobalSection>();
+  out.eventSec = make<EventSection>();
+  out.exportSec = make<ExportSection>();
+  out.elemSec = make<ElemSection>(tableBase);
+  out.dataCountSec = make<DataCountSection>(segments.size());
+  out.linkingSec = make<LinkingSection>(initFunctions, segments);
+  out.nameSec = make<NameSection>();
+  out.producersSec = make<ProducersSection>();
+  out.targetFeaturesSec = make<TargetFeaturesSection>();
 }
 
 void Writer::run() {
-  if (Config->Relocatable || Config->Pic)
-    Config->GlobalBase = 0;
+  if (config->relocatable || config->isPic)
+    config->globalBase = 0;
 
   // For PIC code the table base is assigned dynamically by the loader.
   // For non-PIC, we start at 1 so that accessing table index 0 always traps.
-  if (!Config->Pic)
-    TableBase = 1;
+  if (!config->isPic)
+    tableBase = 1;
 
+  log("-- createOutputSegments");
+  createOutputSegments();
+  log("-- createSyntheticSections");
+  createSyntheticSections();
+  log("-- populateProducers");
+  populateProducers();
+  log("-- populateTargetFeatures");
+  populateTargetFeatures();
   log("-- calculateImports");
   calculateImports();
+  log("-- layoutMemory");
+  layoutMemory();
+
+  if (!config->relocatable) {
+    // Create linker synthesized __start_SECNAME/__stop_SECNAME symbols
+    // This has to be done after memory layout is performed.
+    for (const OutputSegment *seg : segments)
+      addStartStopSymbols(seg);
+  }
+
+  log("-- scanRelocations");
+  scanRelocations();
   log("-- assignIndexes");
   assignIndexes();
   log("-- calculateInitFunctions");
   calculateInitFunctions();
-  if (!Config->Relocatable)
-    createCtorFunction();
+
+  if (!config->relocatable) {
+    // Create linker synthesized functions
+    if (config->passiveSegments)
+      createInitMemoryFunction();
+    if (config->isPic)
+      createApplyRelocationsFunction();
+    createCallCtorsFunction();
+  }
+
+  if (config->sharedMemory && !config->shared)
+    createInitTLSFunction();
+
+  if (errorCount())
+    return;
+
   log("-- calculateTypes");
   calculateTypes();
-  log("-- layoutMemory");
-  layoutMemory();
   log("-- calculateExports");
   calculateExports();
   log("-- calculateCustomSections");
   calculateCustomSections();
-  log("-- assignSymtab");
-  assignSymtab();
+  log("-- populateSymtab");
+  populateSymtab();
+  log("-- addSections");
+  addSections();
 
-  if (errorHandler().Verbose) {
-    log("Defined Functions: " + Twine(InputFunctions.size()));
-    log("Defined Globals  : " + Twine(InputGlobals.size()));
-    log("Defined Events   : " + Twine(InputEvents.size()));
-    log("Function Imports : " + Twine(NumImportedFunctions));
-    log("Global Imports   : " + Twine(NumImportedGlobals));
-    log("Event Imports    : " + Twine(NumImportedEvents));
-    for (ObjFile *File : Symtab->ObjectFiles)
-      File->dumpInfo();
+  if (errorHandler().verbose) {
+    log("Defined Functions: " + Twine(out.functionSec->inputFunctions.size()));
+    log("Defined Globals  : " + Twine(out.globalSec->inputGlobals.size()));
+    log("Defined Events   : " + Twine(out.eventSec->inputEvents.size()));
+    log("Function Imports : " +
+        Twine(out.importSec->getNumImportedFunctions()));
+    log("Global Imports   : " + Twine(out.importSec->getNumImportedGlobals()));
+    log("Event Imports    : " + Twine(out.importSec->getNumImportedEvents()));
+    for (ObjFile *file : symtab->objectFiles)
+      file->dumpInfo();
   }
 
   createHeader();
-  log("-- createSections");
-  createSections();
+  log("-- finalizeSections");
+  finalizeSections();
 
   log("-- openFile");
   openFile();
@@ -1193,31 +943,31 @@ void Writer::run() {
   if (errorCount())
     return;
 
-  if (Error E = Buffer->commit())
-    fatal("failed to write the output file: " + toString(std::move(E)));
+  if (Error e = buffer->commit())
+    fatal("failed to write the output file: " + toString(std::move(e)));
 }
 
 // Open a result file.
 void Writer::openFile() {
-  log("writing: " + Config->OutputFile);
+  log("writing: " + config->outputFile);
 
-  Expected<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
-      FileOutputBuffer::create(Config->OutputFile, FileSize,
+  Expected<std::unique_ptr<FileOutputBuffer>> bufferOrErr =
+      FileOutputBuffer::create(config->outputFile, fileSize,
                                FileOutputBuffer::F_executable);
 
-  if (!BufferOrErr)
-    error("failed to open " + Config->OutputFile + ": " +
-          toString(BufferOrErr.takeError()));
+  if (!bufferOrErr)
+    error("failed to open " + config->outputFile + ": " +
+          toString(bufferOrErr.takeError()));
   else
-    Buffer = std::move(*BufferOrErr);
+    buffer = std::move(*bufferOrErr);
 }
 
 void Writer::createHeader() {
-  raw_string_ostream OS(Header);
-  writeBytes(OS, WasmMagic, sizeof(WasmMagic), "wasm magic");
-  writeU32(OS, WasmVersion, "wasm version");
-  OS.flush();
-  FileSize += Header.size();
+  raw_string_ostream os(header);
+  writeBytes(os, WasmMagic, sizeof(WasmMagic), "wasm magic");
+  writeU32(os, WasmVersion, "wasm version");
+  os.flush();
+  fileSize += header.size();
 }
 
 void lld::wasm::writeResult() { Writer().run(); }
diff --git a/deps/lld/wasm/Writer.h b/deps/lld/wasm/Writer.h
index e62f470642285d8ee33999a845bcb60194cd96a6..d83e4cbda628a44448d8b4e12b3756939ebd2a70 100644
--- a/deps/lld/wasm/Writer.h
+++ b/deps/lld/wasm/Writer.h
@@ -1,9 +1,8 @@
 //===- Writer.h -------------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -15,8 +14,6 @@ namespace wasm {
 
 void writeResult();
 
-extern const char *DefaultModule;
-
 } // namespace wasm
 } // namespace lld
 
diff --git a/deps/lld/wasm/WriterUtils.cpp b/deps/lld/wasm/WriterUtils.cpp
index 80bfc091612199db85cf93aa6555c27cd17d809e..913723c4b670350839b4f2bd9a71b82e970271da 100644
--- a/deps/lld/wasm/WriterUtils.cpp
+++ b/deps/lld/wasm/WriterUtils.cpp
@@ -1,9 +1,8 @@
 //===- WriterUtils.cpp ----------------------------------------------------===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -20,159 +19,159 @@ using namespace llvm::wasm;
 
 namespace lld {
 
-void wasm::debugWrite(uint64_t Offset, const Twine &Msg) {
-  LLVM_DEBUG(dbgs() << format("  | %08lld: ", Offset) << Msg << "\n");
+void wasm::debugWrite(uint64_t offset, const Twine &msg) {
+  LLVM_DEBUG(dbgs() << format("  | %08lld: ", offset) << msg << "\n");
 }
 
-void wasm::writeUleb128(raw_ostream &OS, uint32_t Number, const Twine &Msg) {
-  debugWrite(OS.tell(), Msg + "[" + utohexstr(Number) + "]");
-  encodeULEB128(Number, OS);
+void wasm::writeUleb128(raw_ostream &os, uint32_t number, const Twine &msg) {
+  debugWrite(os.tell(), msg + "[" + utohexstr(number) + "]");
+  encodeULEB128(number, os);
 }
 
-void wasm::writeSleb128(raw_ostream &OS, int32_t Number, const Twine &Msg) {
-  debugWrite(OS.tell(), Msg + "[" + utohexstr(Number) + "]");
-  encodeSLEB128(Number, OS);
+void wasm::writeSleb128(raw_ostream &os, int32_t number, const Twine &msg) {
+  debugWrite(os.tell(), msg + "[" + utohexstr(number) + "]");
+  encodeSLEB128(number, os);
 }
 
-void wasm::writeBytes(raw_ostream &OS, const char *Bytes, size_t Count,
-                      const Twine &Msg) {
-  debugWrite(OS.tell(), Msg + " [data[" + Twine(Count) + "]]");
-  OS.write(Bytes, Count);
+void wasm::writeBytes(raw_ostream &os, const char *bytes, size_t count,
+                      const Twine &msg) {
+  debugWrite(os.tell(), msg + " [data[" + Twine(count) + "]]");
+  os.write(bytes, count);
 }
 
-void wasm::writeStr(raw_ostream &OS, StringRef String, const Twine &Msg) {
-  debugWrite(OS.tell(),
-             Msg + " [str[" + Twine(String.size()) + "]: " + String + "]");
-  encodeULEB128(String.size(), OS);
-  OS.write(String.data(), String.size());
+void wasm::writeStr(raw_ostream &os, StringRef string, const Twine &msg) {
+  debugWrite(os.tell(),
+             msg + " [str[" + Twine(string.size()) + "]: " + string + "]");
+  encodeULEB128(string.size(), os);
+  os.write(string.data(), string.size());
 }
 
-void wasm::writeU8(raw_ostream &OS, uint8_t Byte, const Twine &Msg) {
-  debugWrite(OS.tell(), Msg + " [0x" + utohexstr(Byte) + "]");
-  OS << Byte;
+void wasm::writeU8(raw_ostream &os, uint8_t byte, const Twine &msg) {
+  debugWrite(os.tell(), msg + " [0x" + utohexstr(byte) + "]");
+  os << byte;
 }
 
-void wasm::writeU32(raw_ostream &OS, uint32_t Number, const Twine &Msg) {
-  debugWrite(OS.tell(), Msg + "[0x" + utohexstr(Number) + "]");
-  support::endian::write(OS, Number, support::little);
+void wasm::writeU32(raw_ostream &os, uint32_t number, const Twine &msg) {
+  debugWrite(os.tell(), msg + "[0x" + utohexstr(number) + "]");
+  support::endian::write(os, number, support::little);
 }
 
-void wasm::writeValueType(raw_ostream &OS, ValType Type, const Twine &Msg) {
-  writeU8(OS, static_cast<uint8_t>(Type),
-          Msg + "[type: " + toString(Type) + "]");
+void wasm::writeValueType(raw_ostream &os, ValType type, const Twine &msg) {
+  writeU8(os, static_cast<uint8_t>(type),
+          msg + "[type: " + toString(type) + "]");
 }
 
-void wasm::writeSig(raw_ostream &OS, const WasmSignature &Sig) {
-  writeU8(OS, WASM_TYPE_FUNC, "signature type");
-  writeUleb128(OS, Sig.Params.size(), "param Count");
-  for (ValType ParamType : Sig.Params) {
-    writeValueType(OS, ParamType, "param type");
+void wasm::writeSig(raw_ostream &os, const WasmSignature &sig) {
+  writeU8(os, WASM_TYPE_FUNC, "signature type");
+  writeUleb128(os, sig.Params.size(), "param Count");
+  for (ValType paramType : sig.Params) {
+    writeValueType(os, paramType, "param type");
   }
-  writeUleb128(OS, Sig.Returns.size(), "result Count");
-  if (Sig.Returns.size()) {
-    writeValueType(OS, Sig.Returns[0], "result type");
+  writeUleb128(os, sig.Returns.size(), "result Count");
+  if (sig.Returns.size()) {
+    writeValueType(os, sig.Returns[0], "result type");
   }
 }
 
-void wasm::writeInitExpr(raw_ostream &OS, const WasmInitExpr &InitExpr) {
-  writeU8(OS, InitExpr.Opcode, "opcode");
-  switch (InitExpr.Opcode) {
+void wasm::writeInitExpr(raw_ostream &os, const WasmInitExpr &initExpr) {
+  writeU8(os, initExpr.Opcode, "opcode");
+  switch (initExpr.Opcode) {
   case WASM_OPCODE_I32_CONST:
-    writeSleb128(OS, InitExpr.Value.Int32, "literal (i32)");
+    writeSleb128(os, initExpr.Value.Int32, "literal (i32)");
     break;
   case WASM_OPCODE_I64_CONST:
-    writeSleb128(OS, InitExpr.Value.Int64, "literal (i64)");
+    writeSleb128(os, initExpr.Value.Int64, "literal (i64)");
     break;
   case WASM_OPCODE_GLOBAL_GET:
-    writeUleb128(OS, InitExpr.Value.Global, "literal (global index)");
+    writeUleb128(os, initExpr.Value.Global, "literal (global index)");
     break;
   default:
-    fatal("unknown opcode in init expr: " + Twine(InitExpr.Opcode));
+    fatal("unknown opcode in init expr: " + Twine(initExpr.Opcode));
   }
-  writeU8(OS, WASM_OPCODE_END, "opcode:end");
+  writeU8(os, WASM_OPCODE_END, "opcode:end");
 }
 
-void wasm::writeLimits(raw_ostream &OS, const WasmLimits &Limits) {
-  writeU8(OS, Limits.Flags, "limits flags");
-  writeUleb128(OS, Limits.Initial, "limits initial");
-  if (Limits.Flags & WASM_LIMITS_FLAG_HAS_MAX)
-    writeUleb128(OS, Limits.Maximum, "limits max");
+void wasm::writeLimits(raw_ostream &os, const WasmLimits &limits) {
+  writeU8(os, limits.Flags, "limits flags");
+  writeUleb128(os, limits.Initial, "limits initial");
+  if (limits.Flags & WASM_LIMITS_FLAG_HAS_MAX)
+    writeUleb128(os, limits.Maximum, "limits max");
 }
 
-void wasm::writeGlobalType(raw_ostream &OS, const WasmGlobalType &Type) {
+void wasm::writeGlobalType(raw_ostream &os, const WasmGlobalType &type) {
   // TODO: Update WasmGlobalType to use ValType and remove this cast.
-  writeValueType(OS, ValType(Type.Type), "global type");
-  writeU8(OS, Type.Mutable, "global mutable");
+  writeValueType(os, ValType(type.Type), "global type");
+  writeU8(os, type.Mutable, "global mutable");
 }
 
-void wasm::writeGlobal(raw_ostream &OS, const WasmGlobal &Global) {
-  writeGlobalType(OS, Global.Type);
-  writeInitExpr(OS, Global.InitExpr);
+void wasm::writeGlobal(raw_ostream &os, const WasmGlobal &global) {
+  writeGlobalType(os, global.Type);
+  writeInitExpr(os, global.InitExpr);
 }
 
-void wasm::writeEventType(raw_ostream &OS, const WasmEventType &Type) {
-  writeUleb128(OS, Type.Attribute, "event attribute");
-  writeUleb128(OS, Type.SigIndex, "sig index");
+void wasm::writeEventType(raw_ostream &os, const WasmEventType &type) {
+  writeUleb128(os, type.Attribute, "event attribute");
+  writeUleb128(os, type.SigIndex, "sig index");
 }
 
-void wasm::writeEvent(raw_ostream &OS, const WasmEvent &Event) {
-  writeEventType(OS, Event.Type);
+void wasm::writeEvent(raw_ostream &os, const WasmEvent &event) {
+  writeEventType(os, event.Type);
 }
 
-void wasm::writeTableType(raw_ostream &OS, const llvm::wasm::WasmTable &Type) {
-  writeU8(OS, WASM_TYPE_FUNCREF, "table type");
-  writeLimits(OS, Type.Limits);
+void wasm::writeTableType(raw_ostream &os, const llvm::wasm::WasmTable &type) {
+  writeU8(os, WASM_TYPE_FUNCREF, "table type");
+  writeLimits(os, type.Limits);
 }
 
-void wasm::writeImport(raw_ostream &OS, const WasmImport &Import) {
-  writeStr(OS, Import.Module, "import module name");
-  writeStr(OS, Import.Field, "import field name");
-  writeU8(OS, Import.Kind, "import kind");
-  switch (Import.Kind) {
+void wasm::writeImport(raw_ostream &os, const WasmImport &import) {
+  writeStr(os, import.Module, "import module name");
+  writeStr(os, import.Field, "import field name");
+  writeU8(os, import.Kind, "import kind");
+  switch (import.Kind) {
   case WASM_EXTERNAL_FUNCTION:
-    writeUleb128(OS, Import.SigIndex, "import sig index");
+    writeUleb128(os, import.SigIndex, "import sig index");
     break;
   case WASM_EXTERNAL_GLOBAL:
-    writeGlobalType(OS, Import.Global);
+    writeGlobalType(os, import.Global);
     break;
   case WASM_EXTERNAL_EVENT:
-    writeEventType(OS, Import.Event);
+    writeEventType(os, import.Event);
     break;
   case WASM_EXTERNAL_MEMORY:
-    writeLimits(OS, Import.Memory);
+    writeLimits(os, import.Memory);
     break;
   case WASM_EXTERNAL_TABLE:
-    writeTableType(OS, Import.Table);
+    writeTableType(os, import.Table);
     break;
   default:
-    fatal("unsupported import type: " + Twine(Import.Kind));
+    fatal("unsupported import type: " + Twine(import.Kind));
   }
 }
 
-void wasm::writeExport(raw_ostream &OS, const WasmExport &Export) {
-  writeStr(OS, Export.Name, "export name");
-  writeU8(OS, Export.Kind, "export kind");
-  switch (Export.Kind) {
+void wasm::writeExport(raw_ostream &os, const WasmExport &export_) {
+  writeStr(os, export_.Name, "export name");
+  writeU8(os, export_.Kind, "export kind");
+  switch (export_.Kind) {
   case WASM_EXTERNAL_FUNCTION:
-    writeUleb128(OS, Export.Index, "function index");
+    writeUleb128(os, export_.Index, "function index");
     break;
   case WASM_EXTERNAL_GLOBAL:
-    writeUleb128(OS, Export.Index, "global index");
+    writeUleb128(os, export_.Index, "global index");
     break;
   case WASM_EXTERNAL_MEMORY:
-    writeUleb128(OS, Export.Index, "memory index");
+    writeUleb128(os, export_.Index, "memory index");
     break;
   case WASM_EXTERNAL_TABLE:
-    writeUleb128(OS, Export.Index, "table index");
+    writeUleb128(os, export_.Index, "table index");
     break;
   default:
-    fatal("unsupported export type: " + Twine(Export.Kind));
+    fatal("unsupported export type: " + Twine(export_.Kind));
   }
 }
 } // namespace lld
 
-std::string lld::toString(ValType Type) {
-  switch (Type) {
+std::string lld::toString(ValType type) {
+  switch (type) {
   case ValType::I32:
     return "i32";
   case ValType::I64:
@@ -183,34 +182,34 @@ std::string lld::toString(ValType Type) {
     return "f64";
   case ValType::V128:
     return "v128";
-  case ValType::EXCEPT_REF:
-    return "except_ref";
+  case ValType::EXNREF:
+    return "exnref";
   }
   llvm_unreachable("Invalid wasm::ValType");
 }
 
-std::string lld::toString(const WasmSignature &Sig) {
-  SmallString<128> S("(");
-  for (ValType Type : Sig.Params) {
-    if (S.size() != 1)
-      S += ", ";
-    S += toString(Type);
+std::string lld::toString(const WasmSignature &sig) {
+  SmallString<128> s("(");
+  for (ValType type : sig.Params) {
+    if (s.size() != 1)
+      s += ", ";
+    s += toString(type);
   }
-  S += ") -> ";
-  if (Sig.Returns.size() == 0)
-    S += "void";
+  s += ") -> ";
+  if (sig.Returns.empty())
+    s += "void";
   else
-    S += toString(Sig.Returns[0]);
-  return S.str();
+    s += toString(sig.Returns[0]);
+  return s.str();
 }
 
-std::string lld::toString(const WasmGlobalType &Type) {
-  return (Type.Mutable ? "var " : "const ") +
-         toString(static_cast<ValType>(Type.Type));
+std::string lld::toString(const WasmGlobalType &type) {
+  return (type.Mutable ? "var " : "const ") +
+         toString(static_cast<ValType>(type.Type));
 }
 
-std::string lld::toString(const WasmEventType &Type) {
-  if (Type.Attribute == WASM_EVENT_ATTRIBUTE_EXCEPTION)
+std::string lld::toString(const WasmEventType &type) {
+  if (type.Attribute == WASM_EVENT_ATTRIBUTE_EXCEPTION)
     return "exception";
   return "unknown";
 }
diff --git a/deps/lld/wasm/WriterUtils.h b/deps/lld/wasm/WriterUtils.h
index 7fc4b5aa83dca859e62123b1aefd09c6d47be8f8..2d4eaf9662e8d4a23e217c8c42b1238d0b763e30 100644
--- a/deps/lld/wasm/WriterUtils.h
+++ b/deps/lld/wasm/WriterUtils.h
@@ -1,9 +1,8 @@
 //===- WriterUtils.h --------------------------------------------*- C++ -*-===//
 //
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
@@ -17,50 +16,50 @@
 namespace lld {
 namespace wasm {
 
-void debugWrite(uint64_t Offset, const Twine &Msg);
+void debugWrite(uint64_t offset, const Twine &msg);
 
-void writeUleb128(raw_ostream &OS, uint32_t Number, const Twine &Msg);
+void writeUleb128(raw_ostream &os, uint32_t number, const Twine &msg);
 
-void writeSleb128(raw_ostream &OS, int32_t Number, const Twine &Msg);
+void writeSleb128(raw_ostream &os, int32_t number, const Twine &msg);
 
-void writeBytes(raw_ostream &OS, const char *Bytes, size_t count,
-                const Twine &Msg);
+void writeBytes(raw_ostream &os, const char *bytes, size_t count,
+                const Twine &msg);
 
-void writeStr(raw_ostream &OS, StringRef String, const Twine &Msg);
+void writeStr(raw_ostream &os, StringRef string, const Twine &msg);
 
-void writeU8(raw_ostream &OS, uint8_t byte, const Twine &Msg);
+void writeU8(raw_ostream &os, uint8_t byte, const Twine &msg);
 
-void writeU32(raw_ostream &OS, uint32_t Number, const Twine &Msg);
+void writeU32(raw_ostream &os, uint32_t number, const Twine &msg);
 
-void writeValueType(raw_ostream &OS, llvm::wasm::ValType Type,
-                    const Twine &Msg);
+void writeValueType(raw_ostream &os, llvm::wasm::ValType type,
+                    const Twine &msg);
 
-void writeSig(raw_ostream &OS, const llvm::wasm::WasmSignature &Sig);
+void writeSig(raw_ostream &os, const llvm::wasm::WasmSignature &sig);
 
-void writeInitExpr(raw_ostream &OS, const llvm::wasm::WasmInitExpr &InitExpr);
+void writeInitExpr(raw_ostream &os, const llvm::wasm::WasmInitExpr &initExpr);
 
-void writeLimits(raw_ostream &OS, const llvm::wasm::WasmLimits &Limits);
+void writeLimits(raw_ostream &os, const llvm::wasm::WasmLimits &limits);
 
-void writeGlobalType(raw_ostream &OS, const llvm::wasm::WasmGlobalType &Type);
+void writeGlobalType(raw_ostream &os, const llvm::wasm::WasmGlobalType &type);
 
-void writeGlobal(raw_ostream &OS, const llvm::wasm::WasmGlobal &Global);
+void writeGlobal(raw_ostream &os, const llvm::wasm::WasmGlobal &global);
 
-void writeEventType(raw_ostream &OS, const llvm::wasm::WasmEventType &Type);
+void writeEventType(raw_ostream &os, const llvm::wasm::WasmEventType &type);
 
-void writeEvent(raw_ostream &OS, const llvm::wasm::WasmEvent &Event);
+void writeEvent(raw_ostream &os, const llvm::wasm::WasmEvent &event);
 
-void writeTableType(raw_ostream &OS, const llvm::wasm::WasmTable &Type);
+void writeTableType(raw_ostream &os, const llvm::wasm::WasmTable &type);
 
-void writeImport(raw_ostream &OS, const llvm::wasm::WasmImport &Import);
+void writeImport(raw_ostream &os, const llvm::wasm::WasmImport &import);
 
-void writeExport(raw_ostream &OS, const llvm::wasm::WasmExport &Export);
+void writeExport(raw_ostream &os, const llvm::wasm::WasmExport &export_);
 
 } // namespace wasm
 
-std::string toString(llvm::wasm::ValType Type);
-std::string toString(const llvm::wasm::WasmSignature &Sig);
-std::string toString(const llvm::wasm::WasmGlobalType &Type);
-std::string toString(const llvm::wasm::WasmEventType &Type);
+std::string toString(llvm::wasm::ValType type);
+std::string toString(const llvm::wasm::WasmSignature &sig);
+std::string toString(const llvm::wasm::WasmGlobalType &type);
+std::string toString(const llvm::wasm::WasmEventType &type);
 
 } // namespace lld