Backed out changeset b54e8c328c32 (bug 944800) because of test failures on a CLOSED TREE

config/config.mk

@@ -415,9 +415,6 @@ endif
 endif # MOZ_PROFILE_USE
 endif # NO_PROFILE_GUIDED_OPTIMIZE
 
-ifdef _MSC_VER
-OS_LDFLAGS += $(DELAYLOAD_LDFLAGS)
-endif # _MSC_VER
 
 # Does the makefile specifies the internal XPCOM API linkage?
 ifneq (,$(MOZILLA_INTERNAL_API)$(LIBXUL_LIBRARY))

config/rules.mk

@@ -530,12 +530,6 @@ ifeq ($(OS_ARCH),GNU)
 OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024
 endif
 
-ifeq ($(OS_ARCH),WINNT)
-ifdef USE_DELAYIMP
-OS_LIBS += $(call EXPAND_LIBNAME,delayimp)
-endif
-endif
-
 #
 # MINGW32
 #

python/mozbuild/mozbuild/frontend/emitter.py

@@ -246,10 +246,6 @@ class TreeMetadataEmitter(LoggingMixin):
         if sandbox['NO_VISIBILITY_FLAGS']:
             passthru.variables['VISIBILITY_FLAGS'] = ''
 
-        if sandbox['DELAYLOAD_DLLS']:
-            passthru.variables['DELAYLOAD_LDFLAGS'] = [('-DELAYLOAD:%s' % dll) for dll in sandbox['DELAYLOAD_DLLS']]
-            passthru.variables['USE_DELAYIMP'] = True
-
         varmap = dict(
             SOURCES={
                 '.s': 'ASFILES',

python/mozbuild/mozbuild/frontend/sandbox_symbols.py

@@ -149,13 +149,6 @@ VARIABLES = {
            })
         """, None),
 
-    'DELAYLOAD_DLLS': (list, list,
-        """Delay-loaded DLLs.
-
-        This variable contains a list of DLL files which the module being linked
-        should load lazily.  This only has an effect when building with MSVC.
-        """, 'binaries'),
-
     'DIRS': (list, list,
         """Child directories to descend into looking for build frontend files.
 

python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build

@@ -33,6 +33,3 @@ FAIL_ON_WARNINGS = True
 LIBXUL_LIBRARY = True
 MSVC_ENABLE_PGO = True
 NO_VISIBILITY_FLAGS = True
-
-if CONFIG['_MSC_VER']:
-    DELAYLOAD_DLLS = ['foo.dll', 'bar.dll']

python/mozbuild/mozbuild/test/backend/test_recursivemake.py

@@ -321,9 +321,6 @@ class TestRecursiveMakeBackend(BackendTester):
             'VISIBILITY_FLAGS': [
                 'VISIBILITY_FLAGS :=',
             ],
-            'DELAYLOAD_DLLS': [
-                'EXTRA_DSO_LDOPTS :=',
-            ],
         }
 
         for var, val in expected.items():

python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build

@@ -39,6 +39,3 @@ FORCE_SHARED_LIB = True
 EXPORT_LIBRARY = True
 IS_COMPONENT = True
 NO_VISIBILITY_FLAGS = True
-
-if CONFIG['_MSC_VER']:
-    DELAYLOAD_DLLS = ['foo.dll', 'bar.dll']

python/mozbuild/mozbuild/test/frontend/test_emitter.py

@@ -169,7 +169,6 @@ class TestEmitterBasic(unittest.TestCase):
             SDK_LIBRARY=['fans.sdk', 'tans.sdk'],
             SSRCS=['bans.S', 'fans.S'],
             VISIBILITY_FLAGS='',
-            DELAYLOAD_DLLS=['foo.dll', 'bar.dll'],
         )
 
         variables = objs[0].variables

toolkit/library/Makefile.in

@@ -298,6 +298,38 @@ endif
 ifdef MOZ_METRO
 OS_LIBS += $(call EXPAND_LIBNAME,uiautomationcore runtimeobject)
 endif
+ifdef _MSC_VER
+OS_LIBS += $(call EXPAND_LIBNAME,delayimp)
+EXTRA_DSO_LDOPTS += \
+  -DELAYLOAD:psapi.dll \
+  -DELAYLOAD:dbghelp.dll \
+  -DELAYLOAD:rasapi32.dll \
+  -DELAYLOAD:rasdlg.dll \
+  -DELAYLOAD:comdlg32.dll \
+  -DELAYLOAD:winspool.drv \
+  -DELAYLOAD:secur32.dll \
+  -DELAYLOAD:wininet.dll \
+  $(NULL)
+
+# See nsDllMain for an explanation
+ifdef MOZ_METRO
+ifdef MOZ_DEBUG
+EXTRA_DSO_LDOPTS += -DELAYLOAD:VCCORLIB$(CRTDLLVERSION)D.DLL
+else
+EXTRA_DSO_LDOPTS += -DELAYLOAD:VCCORLIB$(CRTDLLVERSION).DLL
+endif
+EXTRA_DSO_LDOPTS += -DELAYLOAD:API-MS-WIN-CORE-WINRT-L$(CRTEXPDLLVERSION).DLL
+EXTRA_DSO_LDOPTS += -DELAYLOAD:API-MS-WIN-CORE-WINRT-STRING-L$(CRTEXPDLLVERSION).DLL
+EXTRA_DSO_LDOPTS += -DELAYLOAD:uiautomationcore.dll
+endif
+
+ifdef ACCESSIBILITY
+EXTRA_DSO_LDOPTS += -DELAYLOAD:oleacc.dll
+endif
+ifdef MOZ_WEBRTC
+EXTRA_DSO_LDOPTS += -DELAYLOAD:msdmo.dll
+endif
+endif
 ifdef MOZ_GAMEPAD
 ifndef GNU_CC
 DXSDK := $(subst \,/,$(MOZ_DIRECTX_SDK_PATH))/Lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)

toolkit/library/moz.build

@@ -20,31 +20,3 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 
 FORCE_SHARED_LIB = True
-
-DELAYLOAD_DLLS += [
-    'comdlg32.dll',
-    'dbghelp.dll',
-    'psapi.dll',
-    'rasapi32.dll',
-    'rasdlg.dll',
-    'secur32.dll',
-    'wininet.dll',
-    'winspool.dll'
-]
-
-if CONFIG['MOZ_METRO']:
-    if CONFIG['MOZ_DEBUG']:
-        DELAYLOAD_DLLS += ['VCCORLIB' + CONFIG['CRTDLLVERSION'] + 'D.DLL']
-    else:
-        DELAYLOAD_DLLS += ['VCCORLIB' + CONFIG['CRTDLLVERSION'] + '.DLL']
-    DELAYLOAD_DLLS += [
-        'API-MS-WIN-CORE-WINRT-L' + CONFIG['CRTDLLVERSION'] + '.DLL',
-        'API-MS-WIN-CORE-WINRT-STRING-L' + CONFIG['CRTDLLVERSION'] + '.DLL',
-        'uiautomationcore.dll'
-    ]
-
-if CONFIG['ACCESSIBILITY']:
-    DELAYLOAD_DLLS += ['oleacc.dll']
-
-if CONFIG['MOZ_WEBRTC']:
-    DELAYLOAD_DLLS += ['msdmo.dll']

toolkit/mozapps/update/updater/Makefile.in

@@ -64,6 +64,7 @@ include $(topsrcdir)/config/rules.mk
 
 ifdef _MSC_VER
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
+WIN32_EXE_LDFLAGS += -DELAYLOAD:wsock32.dll -DELAYLOAD:crypt32.dll -DELAYLOAD:userenv.dll
 endif
 
 ifdef MOZ_WIDGET_GTK

toolkit/mozapps/update/updater/moz.build

@@ -52,9 +52,3 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
 DEFINES['NS_NO_XPCOM'] = True
 for var in ('MAR_CHANNEL_ID', 'MOZ_APP_VERSION'):
     DEFINES[var] = '"%s"' % CONFIG[var]
-
-DELAYLOAD_DLLS += [
-    'crypt32.dll',
-    'userenv.dll',
-    'wsock32.dll',
-]