Bug 1160146: Disable global sized deallocation for VS2015. r=glandium
authorDavid Major <dmajor@mozilla.com>
Tue, 12 May 2015 18:20:10 -0400
changeset 243617 d44f5512d5845d7746bd61d183767872b08e1785
parent 243616 cca3ce6947c2bbf6cd3ca2526e7047882dc4538a
child 243618 4f1342c1a891431373cb60e55e74e58e14f8bf0b
push id12920
push userkwierso@gmail.com
push dateWed, 13 May 2015 18:33:48 +0000
treeherderfx-team@6b9fcd51adc1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1160146
milestone41.0a1
Bug 1160146: Disable global sized deallocation for VS2015. r=glandium
configure.in
js/src/configure.in
--- a/configure.in
+++ b/configure.in
@@ -544,16 +544,19 @@ case "$target" in
             MSVC_APPCRT_DLL=appcrt140.dll
             MSVC_DESKTOPCRT_DLL=desktopcrt140.dll
 
             # -Wv:18 disables all warnings introduced after VS2013
             # See http://blogs.msdn.com/b/vcblog/archive/2014/11/12/improvements-to-warnings-in-the-c-compiler.aspx
             CFLAGS="$CFLAGS -Wv:18"
             CXXFLAGS="$CXXFLAGS -Wv:18"
 
+            # -Zc:sizedDealloc- disables C++14 global sized deallocation (see bug 1160146)
+            CXXFLAGS="$CXXFLAGS -Zc:sizedDealloc-"
+
             # https://connect.microsoft.com/VisualStudio/feedback/details/888527/warnings-on-dbghelp-h
             # for dbghelp.h, imagehlp.h, and shobj.h
             # C4091: 'typedef ': ignored on left of '' when no variable is declared
             CFLAGS="$CFLAGS -wd4091"
             CXXFLAGS="$CXXFLAGS -wd4091"
         else
             AC_MSG_ERROR([This version (${_CC_MAJOR_VERSION}.${_CC_MINOR_VERSION}.${_CC_BUILD_VERSION}) of the MSVC compiler is unsupported.
 You must install Visual C++ 2013 Update 3 or newer in order to build.
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -379,16 +379,19 @@ case "$target" in
             MSVC_CXX_RUNTIME_DLL=msvcp140.dll
             MSVC_APPCRT_DLL=appcrt140.dll
             MSVC_DESKTOPCRT_DLL=desktopcrt140.dll
 
             # -Wv:18 disables all warnings introduced after VS2013
             # See http://blogs.msdn.com/b/vcblog/archive/2014/11/12/improvements-to-warnings-in-the-c-compiler.aspx
             CFLAGS="$CFLAGS -Wv:18"
             CXXFLAGS="$CXXFLAGS -Wv:18"
+
+            # -Zc:sizedDealloc- disables C++14 global sized deallocation (see bug 1160146)
+            CXXFLAGS="$CXXFLAGS -Zc:sizedDealloc-"
         else
             AC_MSG_ERROR([This version ($CC_VERSION) of the MSVC compiler is unsupported. See https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
         fi
         AC_SUBST(MSVC_C_RUNTIME_DLL)
         AC_SUBST(MSVC_CXX_RUNTIME_DLL)
         AC_SUBST(MSVC_APPCRT_DLL)
         AC_SUBST(MSVC_DESKTOPCRT_DLL)