This patch:

* Changes MOZ_TRACE_MALLOC ifdefs to NS_TRACE_MALLOC ifdefs
* Links against the trace-malloc utils against libxpcom instead of just xpcomds
* Builds NSPR in debug mode on win32 if trace-malloc is enabled
* Adds a few "defined()" checks to diffbloatdump.pl so that it will work for
perl 5.6.1
* Adds a couple of checks for \r so that diffbloatdump.pl works on win32.

Bug #126915 r=bryner/dbaron a=asa

configure

@@ -13967,6 +13967,9 @@ unset CONFIG_FILES
 
 if test -z "$MOZ_NATIVE_NSPR" || test "$MOZ_LDAP_XPCOM"; then
     ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
+    if test "$_WIN32_MSVC" && test "$NS_TRACE_MALLOC"; then
+       ac_configure_args="$ac_configure_args --enable-debug --disable-optimize"
+    fi
     if test -n "$HAVE_64BIT_OS"; then
         ac_configure_args="$ac_configure_args --enable-64bit"
     fi

configure.in

@@ -4534,6 +4534,9 @@ unset CONFIG_FILES
 
 if test -z "$MOZ_NATIVE_NSPR" || test "$MOZ_LDAP_XPCOM"; then
     ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
+    if test "$_WIN32_MSVC" && test "$NS_TRACE_MALLOC"; then
+       ac_configure_args="$ac_configure_args --enable-debug --disable-optimize"
+    fi
     if test -n "$HAVE_64BIT_OS"; then
         ac_configure_args="$ac_configure_args --enable-64bit"
     fi