Backed out changesets 1a413186fb49 and 0f7c370491bf (bug 914174) for Linux debug mochitest-bc bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 10 Sep 2013 13:38:02 -0400
changeset 146448 4e8db3422a37c2a99de9941599e3b6a68433c81c
parent 146447 db3e565b758635cc85b82069839b36afe444d05b
child 146449 67dfa713bd14f3b1b3fe061f0195c970f3765a78
push id25260
push userryanvm@gmail.com
push dateWed, 11 Sep 2013 00:29:30 +0000
treeherdermozilla-central@f73bed2856a8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs914174
milestone26.0a1
backs out1a413186fb491eaf4de542356d10f45266cb7b29
0f7c370491bf44c2434049972ac28010d5c0a4ed
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
Backed out changesets 1a413186fb49 and 0f7c370491bf (bug 914174) for Linux debug mochitest-bc bustage.
js/src/configure.in
js/src/jit/AsmJSSignalHandlers.cpp
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -144,17 +144,16 @@ else
   JS_SHARED_LIBRARY=1
 fi
 AC_SUBST(JS_SHARED_LIBRARY)
 
 if test "$JS_STANDALONE" = no; then
   JS_STANDALONE=
 else
   JS_STANDALONE=1
-  AC_DEFINE(JS_STANDALONE)
 fi
 AC_SUBST(JS_STANDALONE)
 
 MOZ_ARG_WITH_STRING(gonk,
 [  --with-gonk=DIR
                location of gonk dir],
     gonkdir=$withval)
 
--- a/js/src/jit/AsmJSSignalHandlers.cpp
+++ b/js/src/jit/AsmJSSignalHandlers.cpp
@@ -1028,18 +1028,8 @@ js::TriggerOperationCallbackForAsmJSCode
     DWORD oldProtect;
     if (!VirtualProtect(module.functionCode(), module.functionBytes(), PAGE_NOACCESS, &oldProtect))
         MOZ_CRASH();
 #else  // assume Unix
     if (mprotect(module.functionCode(), module.functionBytes(), PROT_NONE))
         MOZ_CRASH();
 #endif
 }
-
-#if defined(MOZ_ASAN) && defined(JS_STANDALONE)
-// Usually, this definition is found in mozglue (see mozglue/build/AsanOptions.cpp).
-// However, when doing standalone JS builds, mozglue is not used and we must ensure
-// that we still allow custom SIGSEGV handlers for asm.js and ion to work correctly.
-extern "C" MOZ_ASAN_BLACKLIST
-const char* __asan_default_options() {
-    return "allow_user_segv_handler=1";
-}
-#endif