Revert of Make win_clang bot use the lld linker.

tools/mb/mb_config.pyl

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   # This is a map of buildbot master names -> buildbot builder names ->
   # config names (where each config name is a key in the 'configs' dict,
   # below). MB uses this dict to look up which config to use for a given bot.
   'masters': {
     # Take care when changing any of these builders to ensure that you do not
@@ skipping 586 matching lines @@
       'Win Builder (dbg)': 'swarming_gn_debug_bot_minimal_symbols_x86',
       'Win x64 Builder': 'swarming_gn_release_bot_minimal_symbols_x64',
       'Win x64 Builder (dbg)': 'swarming_gn_debug_bot_minimal_symbols_x64',
       'Win 7 Tests x64 (1)': 'none',
       'Win10 Tests x64': 'none',
       'Win7 (32) Tests': 'none',
       'Win7 Tests (1)': 'none',
       'Win7 Tests (dbg)(1)': 'none',
       'Win8 Aura': 'gn_release_bot_minimal_symbols_x86',
       'Win8 GN (dbg)': 'gn_debug_bot_minimal_symbols_x86',
-      'WinClang64 (dbg)': 'win_clang_debug_lld_bot',
+      'WinClang64 (dbg)': 'win_clang_debug_bot',
     },
 
     'official.desktop': {
       'blimp-engine': '//build/args/bots/official.desktop/blimp-engine.gn',
       'mac64': 'gyp_official',
       'precise64': 'gn_official',
 
       # Currently the official bots set mini_installer_official_deps=1
       # but it's not clear if that's actually used anywhere.
       'win': 'gyp_official',
@@ skipping 237 matching lines @@
       'win_chromium_syzyasan_rel': 'swarming_gyp_syzyasan_release_trybot_x86',
       'win_chromium_variable': 'findit',
       'win_chromium_variable_archive': 'findit',
       'win_chromium_variable_chrome': 'findit',
       'win_chromium_variable_gn': 'findit',
       'win_chromium_variable_webkit_builder': 'findit',
       'win_chromium_variable_webkit_layout': 'findit',
       'win_chromium_variable_webkit_win7_builder': 'findit',
       'win_chromium_variable_webkit_win7_builder_x64': 'findit',
       'win_chromium_x64_rel_ng': 'swarming_gn_release_trybot_x64',
-      'win_clang': 'win_clang_debug_lld_bot',
+      'win_clang': 'win_clang_debug_bot',
       'win_clang_dbg': 'swarming_gyp_clang_debug_trybot_x86',
       'win_clang_rel': 'swarming_gyp_clang_official_release_trybot_x86',
       'win_clang_x64_dbg': 'win_clang_debug_bot',
       'win_clang_x64_rel': 'swarming_gyp_clang_official_release_trybot_x64',
       'win_nacl_sdk': 'nacl_annotator',
       'win_nacl_sdk_build': 'nacl_annotator',
       'win_optional_gpu_tests_rel':
         'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x86',
       'win_pgo': 'gyp_official_winpgo',
       'win_upload_clang': 'gn_release_bot',
@@ skipping 950 matching lines @@
       'swarming', 'gyp', 'tsan', 'disable_nacl', 'release_trybot',
     ],
 
     'swarming_msan_gyp_release_trybot': [
       'swarming', 'msan', 'gyp', 'release_trybot',
     ],
 
     'win_clang_debug_bot': [
       'gn', 'clang', 'debug_bot_minimal_symbols',
     ],
-    'win_clang_debug_lld_bot': [
-      'gn', 'clang', 'lld', 'debug_bot_minimal_symbols',
-    ],
   },
 
   # This is a dict mapping a given 'mixin' name to a dict of settings that
   # mb should use. See //tools/mb/docs/user_guide.md for more information.
   'mixins': {
     # We build Android with codecs on most bots to ensure maximum test
     # coverage, but use 'android_without_codecs' on bots responsible for
     # building publicly advertised non-Official Android builds --
     # which are not allowed to have proprietary codecs enabled.
     'android': {
@@ skipping 86 matching lines @@
       'gn_args': 'llvm_force_head_revision=true clang_use_chrome_plugins=false',
       'gyp_defines': 'llvm_force_head_revision=1 clang_use_chrome_plugins=0',
       'mixins': ['clang'],
     },
 
     'clang': {
       'gn_args': 'is_clang=true',
       'gyp_defines': 'clang=1',
     },
 
-    'lld': {
-      'gn_args': 'use_lld=true',
-      'gyp_defines': 'use_lld=1',
-    },
-
     'cronet': {
       'gn_args': ('disable_file_support=true disable_ftp_support=true '
                   'enable_websockets=false use_platform_icu_alternatives=true '
                   'disable_brotli_filter=true'),
       'gyp_defines': ('disable_file_support=1 disable_ftp_support=1 '
                       'enable_websockets=0 use_platform_icu_alternatives=1 '
                       'disable_brotli_filter=1'),
     },
 
     'cros_chrome_sdk': {
@@ skipping 328 matching lines @@
     },
 
     'drfuzz': { 'gn_args': 'use_drfuzz=true' },
 
     'drmemory': {
       'gn_args': 'is_component_build=true enable_iterator_debugging=false',
       'gyp_defines': 'component=shared_library build_for_tool=drmemory',
     },
   },
 }