          AR_DELETE="$AR d"
 ***************
 *** 7504,7509 ****
---- 7504,7511 ----
+--- 7502,7509 ----
   case $target in
   *-hpux11.*)
   	;;

  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
      fi
***************
*** 5895,5901 ****
         MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'

  endif
  
  # -KPIC generates position independent code for use in shared libraries.
*** misc/mozilla/security/coreconf/WIN32.mk	Wed Sep 15 07:14:39 2004
--- misc/build/mozilla/security/coreconf/WIN32.mk	Sat Oct 13 13:47:05 2007
***************
*** 39,52 ****
  DEFAULT_COMPILER = cl
  
  ifdef NS_USE_GCC
! 	CC           = gcc
  	CCC          = g++
  	LINK         = ld
  	AR           = ar
  	AR          += cr $@
  	RANLIB       = ranlib
  	BSDECHO      = echo
! 	RC           = windres.exe -O coff --use-temp-file
  	LINK_DLL      = $(CC) $(OS_DLLFLAGS) $(DLLFLAGS)
  else
  	CC           = cl
--- 39,52 ----
  DEFAULT_COMPILER = cl
  
  ifdef NS_USE_GCC
! 	CC           = $(CYGWIN_WRAPPER) gcc
  	CCC          = g++
  	LINK         = ld
  	AR           = ar
  	AR          += cr $@
  	RANLIB       = ranlib
  	BSDECHO      = echo
! 	RC           = $(CYGWIN_WRAPPER) windres.exe -O coff --use-temp-file
  	LINK_DLL      = $(CC) $(OS_DLLFLAGS) $(DLLFLAGS)
  else
  	CC           = cl
***************
*** 64,70 ****
--- 64,74 ----
  else
  NSINSTALL_DIR  = $(CORE_DEPTH)/coreconf/nsinstall
  endif
+ ifdef NS_USE_GCC
+ NSINSTALL      = $(CYGWIN_WRAPPER) nsinstall
+ else
  NSINSTALL      = nsinstall
+ endif
  
  MKDEPEND_DIR    = $(CORE_DEPTH)/coreconf/mkdepend
  MKDEPEND        = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend.exe
***************
*** 87,93 ****
  ifdef NS_USE_GCC
      OS_CFLAGS += -mno-cygwin -mms-bitfields
      _GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY)
!     DLLFLAGS  += -mno-cygwin -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB))
      ifdef BUILD_OPT
  	OPTIMIZER  += -O2
  	DEFINES    += -UDEBUG -U_DEBUG -DNDEBUG
--- 91,97 ----
  ifdef NS_USE_GCC
      OS_CFLAGS += -mno-cygwin -mms-bitfields
      _GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY)
!     DLLFLAGS  += -mno-cygwin -o $@ -shared -Wl,--enable-runtime-pseudo-reloc,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB))
      ifdef BUILD_OPT
  	OPTIMIZER  += -O2
  	DEFINES    += -UDEBUG -U_DEBUG -DNDEBUG
*** misc/mozilla/security/coreconf/WIN954.0.mk	Fri Oct 15 19:52:29 2004
--- misc/build/mozilla/security/coreconf/WIN954.0.mk	Thu Mar 29 14:27:09 2007
***************
