[tbb-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] Bug 10761: Fix shutdown crashes on Windows

[mikeperry at torproject.org]

commit c9944b9ca97a238304b61e822d7509ec4ac85a12
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Apr 6 07:47:41 2015 +0000

    Bug 10761: Fix shutdown crashes on Windows
    
    Jacek Caban gave us this patch which should fix the shutdown crashes on
    Windows (#10761 and #14454) as newer GCC/Binutils versions do not need
    the workaround anymore that got implemented back then in
    https://bugzilla.mozilla.org/show_bug.cgi?id=337887.
---
 security/nss/coreconf/WIN32.mk |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/security/nss/coreconf/WIN32.mk b/security/nss/coreconf/WIN32.mk
index afece49..5c6cae0 100644
--- a/security/nss/coreconf/WIN32.mk
+++ b/security/nss/coreconf/WIN32.mk
@@ -94,10 +94,7 @@ endif
 DLL_SUFFIX   = dll
 
 ifdef NS_USE_GCC
-    # The -mnop-fun-dllimport flag allows us to avoid a drawback of
-    # the dllimport attribute that a pointer to a function marked as
-    # dllimport cannot be used as as a constant address.
-    OS_CFLAGS += -mwindows -mms-bitfields -mnop-fun-dllimport
+    OS_CFLAGS += -mwindows -mms-bitfields
     _GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY)
     DLLFLAGS  += -mwindows -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB))
     ifdef BUILD_OPT