Merge.
authorMounir Lamouri <mounir.lamouri@gmail.com>
Wed, 31 Aug 2011 20:06:33 +0200
changeset 76345 e5072a22fe9510ee98e46811374f23e6e37cd854
parent 76344 5d5f7f13f0ba9cf42024ca57108bd974aae37c34 (current diff)
parent 76343 5c4506fdbde9047caa1f63facecb4d30c48c4bee (diff)
child 76346 220b6e404f1bfb626b7821ba6354c4cd2b502fae
push id21097
push userbmo@edmorley.co.uk
push dateThu, 01 Sep 2011 07:45:07 +0000
treeherdermozilla-central@7d3d1c2c75f8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone9.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge.
--- a/memory/mozalloc/Makefile.in
+++ b/memory/mozalloc/Makefile.in
@@ -80,30 +80,41 @@ CPPSRCS 		=			\
 	mozalloc_oom.cpp			\
 	$(NULL)
 
 ifdef WRAP_STL_INCLUDES #{
 ifdef GNU_CXX #{
 EXPORTS_mozilla	+= throw_gcc.h
 else
 ifdef _MSC_VER #{
-EXPORTS_mozilla	+= throw_msvc.h
-ifdef MOZ_MSVC_STL_WRAP__Throw #{
-EXPORTS_mozilla	+= msvc_throw_wrapper.h
-CPPSRCS		+= msvc_throw_wrapper.cpp
+
+ifeq ($(MOZ_MSVC_STL_WRAP__RAISE),1) #{
+BUILD_MSVC_WRAPPERS = 1
 else
-ifdef MOZ_MSVC_STL_WRAP__RAISE #{
-EXPORTS_mozilla	+= msvc_raise_wrappers.h
-CPPSRCS		+= msvc_raise_wrappers.cpp
-else
-$(error Unknown STL wrapper tactic for MSVC)
+ifeq ($(MOZ_MSVC_STL_WRAP__Throw),1) #{
+BUILD_MSVC_WRAPPERS = 1
 endif #}
 endif #}
+
+ifdef BUILD_MSVC_WRAPPERS #{
+EXPORTS_mozilla		+=			\
+	msvc_raise_wrappers.h			\
+	msvc_throw_wrapper.h			\
+	throw_msvc.h				\
+	$(NULL)
+
+CPPSRCS			+= 			\
+	msvc_raise_wrappers.cpp			\
+	msvc_throw_wrapper.cpp			\
+	$(NULL)
+endif #}
+
 endif #}
 endif #}
+
 endif #}
 
 ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 SDK_LIBRARY = $(IMPORT_LIBRARY)
 else
 SDK_LIBRARY = $(SHARED_LIBRARY)
 endif
 
--- a/memory/mozalloc/msvc_raise_wrappers.cpp
+++ b/memory/mozalloc/msvc_raise_wrappers.cpp
@@ -39,16 +39,18 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include <stdio.h>
 
 #if defined(XP_WIN) || defined(XP_OS2)
 #  define MOZALLOC_EXPORT __declspec(dllexport)
 #endif
 
+#include "mozalloc_abort.h"
+
 #define MOZALLOC_DONT_WRAP_RAISE_FUNCTIONS
 #include "mozilla/throw_msvc.h"
 
 __declspec(noreturn) static void abort_from_exception(const char* const which,
                                                       const char* const what);
 static void
 abort_from_exception(const char* const which,  const char* const what)
 {