diff -r 9483ff78d5a0 -r 354c672efefa mozilla-shared-nss-db.patch
--- a/mozilla-shared-nss-db.patch	Thu Oct 16 21:20:22 2014 +0200
+++ b/mozilla-shared-nss-db.patch	Thu Oct 16 23:09:58 2014 +0200
@@ -7,7 +7,7 @@
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8193,16 +8193,31 @@ if test "$MOZ_ENABLE_SKIA"; then
+@@ -8192,16 +8192,31 @@ if test "$MOZ_ENABLE_SKIA"; then
      MOZ_ENABLE_SKIA_GPU=1
      AC_DEFINE(USE_SKIA_GPU)
      AC_SUBST(MOZ_ENABLE_SKIA_GPU)
@@ -79,7 +79,7 @@
  #include "nsCertVerificationThread.h"
  #include "nsAppDirectoryServiceDefs.h"
  #include "nsComponentManagerUtils.h"
-@@ -1115,17 +1122,31 @@ nsNSSComponent::InitializeNSS()
+@@ -944,17 +951,31 @@ nsNSSComponent::InitializeNSS()
    if (NS_FAILED(rv)) {
      nsPSMInitPanic::SetPanic();
      return NS_ERROR_NOT_AVAILABLE;
@@ -115,22 +115,22 @@
 diff --git a/toolkit/library/libxul.mk b/toolkit/library/libxul.mk
 --- a/toolkit/library/libxul.mk
 +++ b/toolkit/library/libxul.mk
-@@ -145,17 +145,17 @@ endif
- ifdef MOZ_WMF
- OS_LIBS += $(call EXPAND_LIBNAME,mfuuid wmcodecdspuuid strmiids)
- endif
- 
- ifdef MOZ_DIRECTSHOW
- OS_LIBS += $(call EXPAND_LIBNAME,dmoguids wmcodecdspuuid strmiids msdmo)
+@@ -32,16 +32,18 @@ endif
+ ifeq (Linux,$(OS_ARCH))
+ # Create a GDB Python auto-load file alongside the libxul shared library in
+ # the build directory.
+ PP_TARGETS += LIBXUL_AUTOLOAD
+ LIBXUL_AUTOLOAD = $(topsrcdir)/toolkit/library/libxul.so-gdb.py.in
+ LIBXUL_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(topsrcdir))
  endif
  
--EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB)
-+EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS)
- 
- ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
- OS_LIBS += \
-   $(TK_LIBS) \
-   $(NULL)
- endif
- 
- ifeq (OpenBSD,$(OS_ARCH))
++EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS)
++
+ # BFD ld doesn't create multiple PT_LOADs as usual when an unknown section
+ # exists. Using an implicit linker script to make it fold that section in
+ # .data.rel.ro makes it create multiple PT_LOADs. That implicit linker
+ # script however makes gold misbehave, first because it doesn't like that
+ # the linker script is given after crtbegin.o, and even past that, replaces
+ # the default section rules with those from the script instead of
+ # supplementing them. Which leads to a lib with a huge load of sections.
+ ifneq (OpenBSD,$(OS_TARGET))