components/desktop/firefox/patches/firefox31-92-dtrace.patch
changeset 5527 611b2d6efdfe
parent 5526 570ac9aab8b2
child 5528 f2f5af510081
equal deleted inserted replaced
5526:570ac9aab8b2 5527:611b2d6efdfe
     1 See Mozilla bug #702179 - dtrace probes are not installed on Solaris with 
       
     2 static js lib.
       
     3 We haven't enabled dtrace. dtrace will trim the function name (too long). 
       
     4 
       
     5 --- mozilla-esr31//configure.orig	2015-06-04 17:42:52.277140630 -0700
       
     6 +++ mozilla-esr31//configure	2015-06-04 17:42:52.307036479 -0700
       
     7 @@ -6472,7 +6472,7 @@
       
     8  MOZ_PNG_CFLAGS="-I$_objdir/dist/include" # needed for freetype compilation
       
     9  MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)'
       
    10  
       
    11 -MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)'
       
    12 +MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(DEPTH)/js/src)'
       
    13  MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)'
       
    14  MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
       
    15  XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/bin)'
       
    16 --- mozilla-esr31/js/src/Makefile.in.orig	2015-06-04 17:42:52.285669989 -0700
       
    17 +++ mozilla-esr31/js/src/Makefile.in	2015-06-04 17:42:52.307164501 -0700
       
    18 @@ -20,7 +20,6 @@
       
    19  STATIC_LIBRARY_NAME = js_static
       
    20  LIBS		= $(NSPR_LIBS)
       
    21  
       
    22 -DIST_INSTALL = 1
       
    23  
       
    24  ifdef JS_STANDALONE
       
    25  SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt)
       
    26 --- mozilla-esr31/js/src/jsobj.cpp.orig	2015-06-04 17:42:52.291238156 -0700
       
    27 +++ mozilla-esr31/js/src/jsobj.cpp	2015-06-04 17:42:52.307610718 -0700
       
    28 @@ -1324,6 +1324,8 @@
       
    29      return fill(entry, clasp, proto.raw(), kind, obj);
       
    30  }
       
    31  
       
    32 +#pragma weak _ZN2js23NewObjectWithGivenProtoEPNS_16ExclusiveContextEPKNS_5ClassENS_11TaggedProtoEP8JSObjectNS_2gc9AllocKindENS_13NewObjectKi = _ZN2js23NewObjectWithGivenProtoEPNS_16ExclusiveContextEPKNS_5ClassENS_11TaggedProtoEP8JSObjectNS_2gc9AllocKindENS_13NewObjectKindE
       
    33 +
       
    34  JSObject*
       
    35  js::NewObjectWithGivenProto(ExclusiveContext* cxArg, const js::Class* clasp,
       
    36                              js::TaggedProto protoArg, JSObject* parentArg,
       
    37 --- mozilla-esr31/js/src/vm/Interpreter.cpp.orig	2015-06-04 17:42:52.296891616 -0700
       
    38 +++ mozilla-esr31/js/src/vm/Interpreter.cpp	2015-06-04 17:42:52.307913120 -0700
       
    39 @@ -603,6 +603,8 @@
       
    40      return Invoke(cx, ObjectValue(*obj), fval, argc, argv, rval);
       
    41  }
       
    42  
       
    43 +#pragma weak "__1cCjsNExecuteKernel6FpnJJSContext_nCJSGHandle4CpnIJSScript___rnIJSObject_rkn0CFValue_n0ALExecuteType_n0AQAbstractFramePtr_p9A" = "__1cCjsNExecuteKernel6FpnJJSContext_nCJSGHandle4CpnIJSScript___rnIJSObject_rkn0CFValue_n0ALExecuteType_n0AQAbstractFramePtr_p9A_b_"
       
    44 +
       
    45  bool
       
    46  js::ExecuteKernel(JSContext* cx, HandleScript script, JSObject& scopeChainArg, const Value& thisv,
       
    47                    ExecuteType type, AbstractFramePtr evalInFrame, Value* result)
       
    48 --- mozilla-esr31/js/src/vm/OldDebugAPI.cpp.orig	2015-06-04 17:42:52.302287919 -0700
       
    49 +++ mozilla-esr31/js/src/vm/OldDebugAPI.cpp	2015-06-04 17:42:52.308077570 -0700
       
    50 @@ -237,6 +237,8 @@
       
    51      return true;
       
    52  }
       
    53  
       
    54 +#pragma weak "__1cMJS_ClearTrap6FpnJJSContext_pnIJSScript_pCppF134pnCJSFValue_6_nMJSTrapStatus_7_v_" = "__1cMJS_ClearTrap6FpnJJSContext_pnIJSScript_pCppF134pnCJSFValue_6_nMJSTrapStatus_p6_v_"
       
    55 +
       
    56  JS_PUBLIC_API(void)
       
    57  JS_ClearTrap(JSContext* cx, JSScript* script, jsbytecode* pc,
       
    58               JSTrapHandler* handlerp, jsval* closurep)