diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/Makefile.in mozilla-central/Makefile.in
--- mozilla-central.orig/Makefile.in	2008-12-11 04:06:17 +0900
+++ mozilla-central/Makefile.in	2009-01-03 17:24:28 +0900
@@ -49,7 +49,6 @@
 	$(RM) -rf $(DIST)/include
 	$(RM) -rf $(DIST)/private
 	$(RM) -rf $(DIST)/public
-	$(RM) -rf $(DIST)/bin/components
 	$(RM) -rf _tests
 
 TIERS += base
diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/browser/installer/Makefile.in mozilla-central/browser/installer/Makefile.in
--- mozilla-central.orig/browser/installer/Makefile.in	2008-12-11 04:06:17 +0900
+++ mozilla-central/browser/installer/Makefile.in	2008-12-30 20:47:00 +0900
@@ -67,8 +67,6 @@
 MOZ_PKG_MANIFEST_P = $(srcdir)/unix/packages-static
 endif
 endif
-else
-$(error you need a "--enable-static or --enable-libxul" build to package a build)
 endif
 
 MOZ_NONLOCALIZED_PKG_LIST = \
diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/config/js/Makefile.in mozilla-central/config/js/Makefile.in
--- mozilla-central.orig/config/js/Makefile.in	2008-12-11 04:06:59 +0900
+++ mozilla-central/config/js/Makefile.in	2009-01-18 12:29:33 +0900
@@ -51,15 +51,5 @@
 
 include $(topsrcdir)/config/rules.mk
 
-# These rules assume that we configured js with an appropriate bindir,
-# libdir, and includedir, so that the 'make install' will put things
-# mostly in the right places.  The install-runtime-libs target takes
-# care of getting the needed libraries into the 'bin' directory as
-# well as the 'lib' directory.
-export::
-	$(MAKE) -C $(JS_OBJDIR) install
-	$(MAKE) -C $(JS_OBJDIR) install-runtime-libs libdir=$(DIST)/bin
-	$(INSTALL) $(IFLAGS2) $(JS_CONFIG) $(SDK_BIN_DIR)
-
 check::
 	$(MAKE) -C $(JS_OBJDIR) $@
diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/config/rules.mk mozilla-central/config/rules.mk
--- mozilla-central.orig/config/rules.mk	2008-12-11 04:06:59 +0900
+++ mozilla-central/config/rules.mk	2009-01-18 01:04:22 +0900
@@ -839,9 +839,15 @@
 # The compiler would do this for us automatically if they were in the right
 # place, but they're in dist/bin.
 ifdef BINARY_BASENAME
+ifdef IS_COMPONENT
+export::
+	$(PYTHON) $(topsrcdir)/build/win32/pgomerge.py \
+	  $(BINARY_BASENAME) $(DIST)/bin/components
+else
 export::
 	$(PYTHON) $(topsrcdir)/build/win32/pgomerge.py \
 	  $(BINARY_BASENAME) $(DIST)/bin
+endif # IS_COMPONENT
 endif
 endif # MOZ_PROFILE_USE
 endif # WINNT_
@@ -898,11 +904,7 @@
 	$(LD) -NOLOGO -OUT:$@ -PDB:$(LINK_PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
 ifdef MSMANIFEST_TOOL
 	@if test -f $@.manifest; then \
-		if test -f "$(srcdir)/$@.manifest"; then \
-			mt.exe -NOLOGO -MANIFEST "$(win_srcdir)/$@.manifest" $@.manifest -OUTPUTRESOURCE:$@\;1; \
-		else \
 			mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
-		fi; \
 		rm -f $@.manifest; \
 	fi
 endif	# MSVC with manifest tool
diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/configure.in mozilla-central/configure.in
--- mozilla-central.orig/configure.in	2008-12-11 04:06:59 +0900
+++ mozilla-central/configure.in	2009-01-03 15:16:07 +0900
@@ -6388,7 +6388,14 @@
     fi
     dnl need win32 paths in LIB, hence this python abuse.  extra brackets
     dnl are to avoid m4
-    _WIN_CRT_PATH=[`$PYTHON -c 'import sys, os.path; print os.path.normpath(sys.argv[1])' "$_WIN_UNIX_CRT_PATH"`]
+    case "$host" in
+    *-mingw*)
+      _WIN_CRT_PATH=[`$PYTHON -c 'import sys, os.path; print os.path.normpath(sys.argv[1])' "$_WIN_UNIX_CRT_PATH"`]
+      ;;
+    *-cygwin*|*-msvc*|*-mks*)
+      _WIN_CRT_PATH=[`$CYGPATH_W "$_WIN_UNIX_CRT_PATH"`]
+      ;;
+    esac
     MOZ_LIB="$_WIN_CRT_PATH;$LIB"
     dnl Needs to be in PATH too, since our tools will wind up linked against it.
     dnl This needs to be unix style.
diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/js/src/Makefile.in mozilla-central/js/src/Makefile.in
--- mozilla-central.orig/js/src/Makefile.in	2008-12-11 04:07:00 +0900
+++ mozilla-central/js/src/Makefile.in	2009-01-18 14:10:55 +0900
@@ -49,11 +49,6 @@
 LIBRARY_NAME	= mozjs
 GRE_MODULE	= 1
 
-PROGRAM         = js$(BIN_SUFFIX)
-# The shell uses some 'HIDDEN' symbols to produce statistics, so we
-# link directly against the .o files, not against the JS shared
-# library.
-PROGOBJS	= js.$(OBJ_SUFFIX) $(OBJS)
 LIBS		= $(NSPR_LIBS)
 
 ifdef GNU_CXX
@@ -335,6 +330,8 @@
 MOZILLA_DTRACE_SRC = $(srcdir)/javascript-trace.d
 endif
 
+EXPORTS = $(INSTALLED_HEADERS)
+
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_SYNC_BUILD_FILES
@@ -646,6 +643,8 @@
 
 host_jsoplengen.$(OBJ_SUFFIX): jsopcode.tbl
 
+jsautokw.h: $(CURDIR)/jsautokw.h
+
 # Use CURDIR to avoid finding a jsautooplen.h in the source tree (from
 # a previous build?) via VPATH when we're building in a separate tree.
 $(CURDIR)/jsautooplen.h: host_jsoplengen$(HOST_BIN_SUFFIX)
diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/js/src/config/Makefile.in mozilla-central/js/src/config/Makefile.in
--- mozilla-central.orig/js/src/config/Makefile.in	2008-12-11 04:06:24 +0900
+++ mozilla-central/js/src/config/Makefile.in	2009-01-18 11:53:38 +0900
@@ -69,12 +69,6 @@
 MODULE_OPTIMIZE_FLAGS = -O3
 endif
 
-ifndef COMPILER_DEPEND
-ifndef MOZ_NATIVE_MAKEDEPEND
-DIRS		+= mkdepend
-endif
-endif
-
 include $(topsrcdir)/config/config.mk
 
 # Do not install util programs
diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/js/src/config/autoconf.mk.in mozilla-central/js/src/config/autoconf.mk.in
--- mozilla-central.orig/js/src/config/autoconf.mk.in	2008-12-11 04:06:24 +0900
+++ mozilla-central/js/src/config/autoconf.mk.in	2009-01-18 11:44:57 +0900
@@ -64,7 +64,7 @@
 installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
 
-DIST		= $(DEPTH)/dist
+DIST		= ../../$(DEPTH)/dist
 
 MOZ_JS_LIBS		   = @MOZ_JS_LIBS@
 
diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/js/src/nanojit/nanojit.h mozilla-central/js/src/nanojit/nanojit.h
--- mozilla-central.orig/js/src/nanojit/nanojit.h	2008-12-11 04:07:00 +0900
+++ mozilla-central/js/src/nanojit/nanojit.h	2009-01-15 00:45:59 +0900
@@ -126,7 +126,13 @@
 #define NJ_PROFILE 1
 #endif
 
-#ifdef NJ_VERBOSE
+#if defined(_MSC_VER) && _MSC_VER < 1400
+	#include <stdio.h>
+	#define verbose_output						if (verbose_enabled()) Assembler::output
+	#define verbose_outputf						if (verbose_enabled()) Assembler::outputf
+	#define verbose_enabled()					(_verbose)
+	#define verbose_only(x)						x
+#elif defined(NJ_VERBOSE)
 	#include <stdio.h>
 	#define verbose_output						if (verbose_enabled()) Assembler::output
 	#define verbose_outputf						if (verbose_enabled()) Assembler::outputf
diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/memory/jemalloc/Makefile.in mozilla-central/memory/jemalloc/Makefile.in
--- mozilla-central.orig/memory/jemalloc/Makefile.in	2008-12-11 04:06:33 +0900
+++ mozilla-central/memory/jemalloc/Makefile.in	2009-01-03 15:10:35 +0900
@@ -49,6 +49,11 @@
 # symbols.
 VISIBILITY_FLAGS=
 
+CRTDIFF		= $(srcdir)/crtsp1.diff
+ifeq (,$(filter-out 1500,$(_MSC_VER)))
+CRTDIFF		= $(srcdir)/crtvc9sp1.diff
+endif # _MSC_VER
+
 ifeq (WINNT,$(OS_TARGET))
 # Two options for Windows, either you build the CRT from source,
 # or you use a pre-built DLL.
@@ -59,16 +64,18 @@
 	$(INSTALL) $< $(FINAL_TARGET)
 
 # patch if necessary
-$(CRT_OBJ_DIR)/jemalloc.c: $(srcdir)/crtsp1.diff
+$(CRT_OBJ_DIR)/jemalloc.c: $(CRTDIFF)
 	rm -rf $(CRT_OBJ_DIR)
 	cp -R "$(WIN32_CRT_SRC_DIR)" .
+ifeq (,$(filter-out 1400,$(_MSC_VER)))
 	# per http://forums.microsoft.com/MSDN/ShowPost.aspx?PostID=1189363&SiteID=1
 	for i in dll mt xdll xmt; do \
 	  pushd $(CRT_OBJ_DIR)/intel/$${i}_lib && lib -extract:..\\build\\intel\\$${i}_obj\\unhandld.obj eh.lib && popd; \
 	done
+endif # _MSC_VER
 	# truly awful
 	#XXX: get ed into mozillabuild, bug 415123
-	$(PERL) $(srcdir)/apply-ed-patches.pl $(srcdir)/crtsp1.diff \
+	$(PERL) $(srcdir)/apply-ed-patches.pl $(CRTDIFF) \
 	$(CRT_OBJ_DIR) $(srcdir)/ed.exe
 
 $(CRT_OBJ_DIR)/build/intel/mozcrt19.dll: \
diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/memory/jemalloc/Makefile.in.orig mozilla-central/memory/jemalloc/Makefile.in.orig
--- mozilla-central.orig/memory/jemalloc/Makefile.in.orig	1970-01-01 09:00:00 +0900
+++ mozilla-central/memory/jemalloc/Makefile.in.orig	2008-12-11 04:06:33 +0900
@@ -0,0 +1,122 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Mozilla Foundation
+# Portions created by the Initial Developer are Copyright (C) 2008
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#  Ted Mielczarek <ted.mielczarek@gmail.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= jemalloc
+
+# jemalloc.c properly uses 'static', so don't burden it with manually exposing
+# symbols.
+VISIBILITY_FLAGS=
+
+ifeq (WINNT,$(OS_TARGET))
+# Two options for Windows, either you build the CRT from source,
+# or you use a pre-built DLL.
+ifneq (,$(WIN32_CRT_SRC_DIR))
+# Building the CRT from source
+CRT_OBJ_DIR=./$(shell basename "$(WIN32_CRT_SRC_DIR)")
+libs:: $(CRT_OBJ_DIR)/build/intel/mozcrt19.dll
+	$(INSTALL) $< $(FINAL_TARGET)
+
+# patch if necessary
+$(CRT_OBJ_DIR)/jemalloc.c: $(srcdir)/crtsp1.diff
+	rm -rf $(CRT_OBJ_DIR)
+	cp -R "$(WIN32_CRT_SRC_DIR)" .
+	# per http://forums.microsoft.com/MSDN/ShowPost.aspx?PostID=1189363&SiteID=1
+	for i in dll mt xdll xmt; do \
+	  pushd $(CRT_OBJ_DIR)/intel/$${i}_lib && lib -extract:..\\build\\intel\\$${i}_obj\\unhandld.obj eh.lib && popd; \
+	done
+	# truly awful
+	#XXX: get ed into mozillabuild, bug 415123
+	$(PERL) $(srcdir)/apply-ed-patches.pl $(srcdir)/crtsp1.diff \
+	$(CRT_OBJ_DIR) $(srcdir)/ed.exe
+
+$(CRT_OBJ_DIR)/build/intel/mozcrt19.dll: \
+  $(CRT_OBJ_DIR)/jemalloc.c $(srcdir)/jemalloc.c $(srcdir)/jemalloc.h \
+  $(srcdir)/ql.h $(srcdir)/qr.h $(srcdir)/rb.h
+	cp $(srcdir)/jemalloc.c $(srcdir)/jemalloc.h $(srcdir)/ql.h \
+	$(srcdir)/qr.h $(srcdir)/rb.h $(CRT_OBJ_DIR)
+# this pretty much sucks, but nmake and make don't play well together
+	$(PYTHON) $(srcdir)/build-crt.py $(CRT_OBJ_DIR)
+	#XXX: these don't link right for some reason
+	rm $(CRT_OBJ_DIR)/build/intel/{libcmt,libcpmt}.lib
+else
+# Using a pre-built DLL, so just install it.
+libs:: $(WIN32_CUSTOM_CRT_DIR)/mozcrt19.dll
+	$(INSTALL) $< $(FINAL_TARGET)
+endif
+
+else
+
+MODULE_OPTIMIZE_FLAGS = -O2
+ifeq ($(OS_ARCH),SunOS)
+ifndef GNU_CC
+MODULE_OPTIMIZE_FLAGS = -xO5
+endif
+endif
+
+LIBRARY_NAME	= jemalloc
+
+# Build jemalloc as a shared lib.  This is mandatory for Darwin, since a library
+# init function is used on that platform.
+ifeq ($(OS_ARCH),Darwin)
+FORCE_SHARED_LIB= 1
+else
+DIST_INSTALL = 1
+FORCE_STATIC_LIB= 1
+endif
+
+CSRCS		= \
+		jemalloc.c \
+		$(NULL)
+
+#XXX: PGO on Linux causes problems here
+# See bug 419470
+NO_PROFILE_GUIDED_OPTIMIZE = 1
+endif
+
+include $(topsrcdir)/config/rules.mk
+
+ifeq (Darwin,$(OS_TARGET))
+LDFLAGS += -init _jemalloc_darwin_init
+endif
diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/memory/jemalloc/crtvc9sp1.diff mozilla-central/memory/jemalloc/crtvc9sp1.diff
--- mozilla-central.orig/memory/jemalloc/crtvc9sp1.diff	1970-01-01 09:00:00 +0900
+++ mozilla-central/memory/jemalloc/crtvc9sp1.diff	2009-01-03 15:10:35 +0900
@@ -0,0 +1,171 @@
+# The Microsoft C Runtime source code to which this document refers is available
+# directly from Microsoft Corporation, under a separate license.
+# Please ensure that if you are using that source code, you have appropriate
+# rights to use it.  By providing you access to this file, Mozilla Corporation
+# and its affiliates do not purport to grant any rights in that source code. 
+# Binaries are available under separate licenses at 
+# http://www.microsoft.com/downloads/details.aspx?familyid=200b2fd9-ae1a-4a14-984d-389c36f85647&displaylang=en
+# convert for VC9 SP1 by Takeshi Ichimaru
+# Microsoft Visual C++ 2008 Redistributable Package (x86) Binaries are available under
+# separate licenses at 
+# http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF&displaylang=en
+diff -re crt/src/crt0.c crt-sp1/src/crt0.c
+212c
+        /*
+         * this used to happen in _mtinit, but we need it before malloc
+         */
+        _init_pointers();       /* initialize global function pointers */
+
+        if ( malloc_init_hard() )                /* initialize heap */
+.
+87a
+extern BOOL malloc_init_hard(void);
+.
+diff -re crt/src/crt0dat.c crt-sp1/src/crt0dat.c
+837d
+826d
+diff -re crt/src/crtdll.c crt-sp1/src/crtdll.c
+31,40d
+diff -re crt/src/crtexe.c crt-sp1/src/crtexe.c
+321,323d
+35,45d
+diff -re crt/src/crtheap.c crt-sp1/src/crtheap.c
+61c
+    pv = calloc(count, size);
+.
+58,59d
+diff -re crt/src/crtlib.c crt-sp1/src/crtlib.c
+684,691d
+355d
+339a
+                 malloc_shutdown();
+
+.
+298d
+279d
+249,250d
+239d
+226c
+            /*
+             * this used to happen in _mtinit, but we need it before malloc
+             */
+            _init_pointers();       /* initialize global function pointers */
+
+            if ( malloc_init_hard() )   /* initialize heap */
+.
+43a
+extern BOOL malloc_init_hard(void);
+extern void malloc_shutdown(void);
+
+.
+diff -re crt/src/dllcrt0.c crt-sp1/src/dllcrt0.c
+189,190d
+136d
+126d
+111d
+106,108d
+diff -re crt/src/intel/_sample_.def crt-sp1/src/intel/_sample_.def
+1198d
+718,719d
+664a
+    posix_memalign
+.
+638a
+    memalign
+.
+495a
+    malloc_usable_size
+.
+331,336d
+319d
+313,314d
+81d
+9c
+LIBRARY MOZCRT19
+.
+diff -re crt/src/internal.h crt-sp1/src/internal.h
+413a
+#endif
+.
+409c
+#if 0
+.
+diff -re crt/src/makefile crt-sp1/src/makefile
+1771a
+$(DEFFILE_DIR)\$(RETAIL_LIB_NAME).def : $(DEFFILE_DIR)\_sample_.def
+	copy $** $@
+.
+1235,1237d
+760c
+dll_ :: $(OBJROOT) $(OBJCPUDIR) $(OBJDIR_DLL) $(OBJDIR_DLL)\$(PURE_OBJ_DIR) \
+   	$(OBJDIR_DLL)\$(CPP_OBJ_DIR) \
+   	$(RELDIR_CPU) $(PDBDIR_CPU_DLL) $(MAKE_DIRS_DLL)
+.
+340c
+CC_OPTS_BASE=-c -nologo -Zlp8 -W3 -GFy -DWIND32
+.
+213d
+21,22c
+RETAIL_DLL_NAME=MOZCRT19
+RETAIL_LIB_NAME=msvcrt
+.
+diff -re crt/src/makefile.inc crt-sp1/src/makefile.inc
+1635a
+
+$(OBJDIR)\unhandld.obj: $(PREOBJDIR)\unhandld.obj
+        copy $(PREOBJDIR)\unhandld.obj $@
+.
+623d
+621d
+405d
+344,356c
+        $(OBJDIR)\jemalloc.obj  \
+.
+336,337d
+331,332d
+329d
+325d
+321,322d
+diff -re crt/src/makefile.sub crt-sp1/src/makefile.sub
+66c
+CFLAGS=$(CFLAGS) -O2 -DMOZ_MEMORY=1 -DMOZ_MEMORY_WINDOWS=1
+.
+diff -re crt/src/malloc.h crt-sp1/src/malloc.h
+189a
+#endif
+.
+177a
+
+#if 0
+.
+83a
+#endif
+.
+70a
+#if 0
+.
+diff -re crt/src/mlock.c crt-sp1/src/mlock.c
+274c
+#endif
+.
+262a
+#if 0
+.
+diff -re crt/src/new.cpp crt-sp1/src/new.cpp
+60d
+52,55d
+37,38c
+        break;
+.
+diff -re crt/src/nothrownew.cpp crt-sp1/src/nothrownew.cpp
+38c
+#endif
+.
+31a
+#if 1
+        break;
+#else
+
+.
+diff -re crt/src/tidtable.c crt-sp1/src/tidtable.c
+360,361d
diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/modules/lcms/src/Makefile.in mozilla-central/modules/lcms/src/Makefile.in
--- mozilla-central.orig/modules/lcms/src/Makefile.in	2008-12-11 04:07:01 +0900
+++ mozilla-central/modules/lcms/src/Makefile.in	2009-01-15 21:28:24 +0900
@@ -62,6 +62,11 @@
 endif
 endif
 
+#Disable PGO for this module in non-libxul builds, where it breaks.
+ifndef MOZ_ENABLE_LIBXUL
+NO_PROFILE_GUIDED_OPTIMIZE = 1
+endif
+
 # LCMS is on the critical path, so force it O2 on all platforms
 MODULE_OPTIMIZE_FLAGS=-O2
 
diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/mozconfig mozilla-central/mozconfig
--- mozilla-central.orig/mozconfig	1970-01-01 09:00:00 +0900
+++ mozilla-central/mozconfig	2008-12-30 00:03:19 +0900
@@ -0,0 +1 @@
+. ${BUILDROOT}/hgconfig/mozconfig.sh
diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/security/coreconf/WIN16.mk mozilla-central/security/coreconf/WIN16.mk
--- mozilla-central.orig/security/coreconf/WIN16.mk	2008-12-11 04:06:36 +0900
+++ mozilla-central/security/coreconf/WIN16.mk	2009-01-03 03:44:02 +0900
@@ -70,7 +70,7 @@
 
 CC           = wcc
 CCC          = wcl
-LINK         = wlink
+LD           = wlink
 AR           = wlib
 AR          += -q $@
 RC           = wrc.exe
diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/security/coreconf/WIN32.mk mozilla-central/security/coreconf/WIN32.mk
--- mozilla-central.orig/security/coreconf/WIN32.mk	2008-12-11 04:06:36 +0900
+++ mozilla-central/security/coreconf/WIN32.mk	2009-01-03 03:44:02 +0900
@@ -45,7 +45,7 @@
 ifdef NS_USE_GCC
 	CC           = gcc
 	CCC          = g++
-	LINK         = ld
+	LD           = ld
 	AR           = ar
 	AR          += cr $@
 	RANLIB       = ranlib
@@ -55,7 +55,7 @@
 else
 	CC           = cl
 	CCC          = cl
-	LINK         = link
+	LD           = link
 	AR           = lib
 	AR          += -NOLOGO -OUT:"$@"
 	RANLIB       = echo
diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/security/coreconf/WINCE.mk mozilla-central/security/coreconf/WINCE.mk
--- mozilla-central.orig/security/coreconf/WINCE.mk	2008-12-11 04:06:36 +0900
+++ mozilla-central/security/coreconf/WINCE.mk	2009-01-03 03:44:02 +0900
@@ -54,7 +54,7 @@
 endif
 endif
 
-LINK         = link
+LD           = link
 AR           = lib
 AR          += -NOLOGO -OUT:"$@"
 RANLIB       = echo
diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/security/coreconf/WINCE3.0.mk mozilla-central/security/coreconf/WINCE3.0.mk
--- mozilla-central.orig/security/coreconf/WINCE3.0.mk	2008-12-11 04:06:36 +0900
+++ mozilla-central/security/coreconf/WINCE3.0.mk	2009-01-03 03:44:02 +0900
@@ -83,7 +83,7 @@
     LINKFLAGS += -PDB:NONE
 endif
 
-LINK    += $(LINKFLAGS)
+LD      += $(LINKFLAGS)
 LDFLAGS += $(LINKFLAGS)
 
 OS_LIBS= coredll.lib corelibc.lib
diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/security/coreconf/command.mk mozilla-central/security/coreconf/command.mk
--- mozilla-central.orig/security/coreconf/command.mk	2008-12-11 04:06:36 +0900
+++ mozilla-central/security/coreconf/command.mk	2009-01-03 03:44:02 +0900
@@ -43,8 +43,8 @@
 AS            = $(CC)
 ASFLAGS      += $(CFLAGS)
 CCF           = $(CC) $(CFLAGS)
-LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
-LINK_EXE      = $(LINK) $(OS_LFLAGS) $(LFLAGS)
+LINK_DLL      = $(LD) $(OS_DLLFLAGS) $(DLLFLAGS)
+LINK_EXE      = $(LD) $(OS_LFLAGS) $(LFLAGS)
 CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
 		$(XCFLAGS)
 PERL          = perl
diff -urN --strip-trailing-cr -x '*.pyc' mozilla-central.orig/security/manager/Makefile.in mozilla-central/security/manager/Makefile.in
--- mozilla-central.orig/security/manager/Makefile.in	2008-12-11 04:07:01 +0900
+++ mozilla-central/security/manager/Makefile.in	2009-01-03 03:44:03 +0900
@@ -216,7 +216,7 @@
 	NATIVE_CC="$(HOST_CC)" \
 	CC="$(CC)" \
 	CCC="$(CXX)" \
-	LINK="$(LD)" \
+	LD="$(LD)" \
 	AS="$(AS)" \
 	AR='$(AR) $(AR_FLAGS:$@=$$@)' \
 	RANLIB="$(RANLIB)" \