components/desktop/firefox/patches/firefox-46-dtrace.patch
changeset 6919 7972aae0fb03
parent 6918 5fc9b45c15e5
child 6920 1581d303b9b3
equal deleted inserted replaced
6918:5fc9b45c15e5 6919:7972aae0fb03
     1 See Mozilla bug #702179 - dtrace probes are not installed on Solaris with
       
     2 static js lib.
       
     3 dtrace will trim the function name (too long).
       
     4 Do not plan to send upstream.
       
     5 
       
     6 diff -r abcf3e3a52d4 js/src/Makefile.in
       
     7 --- a/js/src/Makefile.in	Sat Sep 05 10:14:47 2015 +0800
       
     8 +++ b/js/src/Makefile.in	Sun Sep 13 12:59:09 2015 +0800
       
     9 @@ -16,7 +16,6 @@
       
    10  
       
    11  run_for_side_effects := $(shell echo 'MAKE: $(MAKE)')
       
    12  
       
    13 -DIST_INSTALL = 1
       
    14  NO_EXPAND_LIBS = 1
       
    15  
       
    16  ifdef JS_HAS_CTYPES
       
    17 diff -r abcf3e3a52d4 toolkit/library/libxul.mk
       
    18 --- a/toolkit/library/libxul.mk Sat Sep 05 10:14:47 2015 +0800
       
    19 +++ b/toolkit/library/libxul.mk Sun Sep 13 12:59:09 2015 +0800
       
    20 @@ -44,7 +44,7 @@
       
    21  endif
       
    22 
       
    23  ifeq ($(OS_ARCH),SunOS)
       
    24 -OS_LDFLAGS +=  -lm -Wl,-z,defs
       
    25 +OS_LDFLAGS +=  -lm -lsendfile -Wl,-z,defs ../../js/src/js-dtrace.o
       
    26  endif
       
    27 
       
    28  # BFD ld doesn't create multiple PT_LOADs as usual when an unknown section
       
    29 diff -r abcf3e3a52d4 js/src/jsobj.cpp
       
    30 --- a/js/src/jsobj.cpp	Sat Sep 05 10:14:47 2015 +0800
       
    31 +++ b/js/src/jsobj.cpp	Sun Sep 13 12:59:09 2015 +0800
       
    32 @@ -1233,6 +1233,8 @@
       
    33             !proto.toObject()->is<GlobalObject>();
       
    34  }
       
    35  
       
    36 +#pragma weak _ZN2js29NewObjectWithGivenTaggedProtoEPNS_16ExclusiveContextEPKNS_5ClassEN2JS6HandleINS_11TaggedProtoEEENS6_IP8JSObjectEENS_2gc = _ZN2js29NewObjectWithGivenTaggedProtoEPNS_16ExclusiveContextEPKNS_5ClassEN2JS6HandleINS_11TaggedProtoEEENS6_IP8JSObjectEENS_2gc9AllocKindENS_13NewObjectKindE
       
    37 +
       
    38  JSObject*
       
    39  js::NewObjectWithGivenTaggedProto(ExclusiveContext* cxArg, const Class* clasp,
       
    40                                    Handle<TaggedProto> proto, HandleObject parentArg,
       
    41 @@ -1386,6 +1388,8 @@
       
    42             !cxArg->asJSContext()->compartment()->hasObjectMetadataCallback();
       
    43  }
       
    44  
       
    45 +#pragma weak _ZN2js29NewObjectWithClassProtoCommonEPNS_16ExclusiveContextEPKNS_5ClassEN2JS6HandleIP8JSObjectEES9_NS_2gc9AllocKindENS_13NewOb = _ZN2js29NewObjectWithClassProtoCommonEPNS_16ExclusiveContextEPKNS_5ClassEN2JS6HandleIP8JSObjectEES9_NS_2gc9AllocKindENS_13NewObjectKindE
       
    46 +
       
    47  JSObject*
       
    48  js::NewObjectWithClassProtoCommon(ExclusiveContext* cxArg, const Class* clasp,
       
    49                                    HandleObject protoArg, HandleObject maybeParent,
       
    50 @@ -1465,6 +1469,8 @@
       
    51   * Create a plain object with the specified group. This bypasses getNewGroup to
       
    52   * avoid losing creation site information for objects made by scripted 'new'.
       
    53   */
       
    54 +
       
    55 +#pragma weak _ZN2js24NewObjectWithGroupCommonEP9JSContextN2JS6HandleIPNS_11ObjectGroupEEENS3_IP8JSObjectEENS_2gc9AllocKindENS_13NewObjectKin = _ZN2js24NewObjectWithGroupCommonEP9JSContextN2JS6HandleIPNS_11ObjectGroupEEENS3_IP8JSObjectEENS_2gc9AllocKindENS_13NewObjectKindE
       
    56  JSObject*
       
    57  js::NewObjectWithGroupCommon(JSContext* cx, HandleObjectGroup group, HandleObject parent,
       
    58                               gc::AllocKind allocKind, NewObjectKind newKind)