Auto merge of #26062 - jdm:jsup, r=Manishearth

Update mozjs.

Fix #26040. Incorporate upstream patches to improve JIT codegen on arm64.
This commit is contained in:
bors-servo 2020-03-30 23:51:47 -04:00 committed by GitHub
commit 42463c4c44
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 2 additions and 7 deletions

4
Cargo.lock generated
View file

@ -3624,7 +3624,7 @@ dependencies = [
[[package]] [[package]]
name = "mozjs" name = "mozjs"
version = "0.13.0" version = "0.13.0"
source = "git+https://github.com/servo/rust-mozjs#2598da7110f752d29f2beedf3e47c71f72a354a3" source = "git+https://github.com/servo/rust-mozjs#81c88926aa57f8571b3784216907e4e06363b345"
dependencies = [ dependencies = [
"cc", "cc",
"lazy_static", "lazy_static",
@ -3637,7 +3637,7 @@ dependencies = [
[[package]] [[package]]
name = "mozjs_sys" name = "mozjs_sys"
version = "0.68.1" version = "0.68.1"
source = "git+https://github.com/servo/mozjs?rev=2392ebc144331184a770bee1f1ac02969946380f#2392ebc144331184a770bee1f1ac02969946380f" source = "git+https://github.com/servo/mozjs?rev=ef2d1cc249f2662b2acb31d1c1328d7960161da4#ef2d1cc249f2662b2acb31d1c1328d7960161da4"
dependencies = [ dependencies = [
"bindgen", "bindgen",
"cc", "cc",

View file

@ -21,7 +21,6 @@ webgl_backtrace = ["backtrace", "canvas_traits/webgl_backtrace"]
js_backtrace = ["backtrace"] js_backtrace = ["backtrace"]
refcell_backtrace = ["accountable-refcell"] refcell_backtrace = ["accountable-refcell"]
uwp = ["js/uwp"] uwp = ["js/uwp"]
vslatestinstalled = ["js/vslatestinstalled"]
xr-profile = ["webxr-api/profile"] xr-profile = ["webxr-api/profile"]
[build-dependencies] [build-dependencies]

View file

@ -34,7 +34,6 @@ webgl_backtrace = [
"canvas/webgl_backtrace", "canvas/webgl_backtrace",
"canvas_traits/webgl_backtrace", "canvas_traits/webgl_backtrace",
] ]
vslatestinstalled = ["script/vslatestinstalled"]
media-dummy = ["servo-media-dummy"] media-dummy = ["servo-media-dummy"]
media-gstreamer = ["servo-media-gstreamer", "gstreamer"] media-gstreamer = ["servo-media-gstreamer", "gstreamer"]
xr-profile = ["canvas/xr-profile", "canvas_traits/xr-profile", "script/xr-profile", "webxr/profile"] xr-profile = ["canvas/xr-profile", "canvas_traits/xr-profile", "script/xr-profile", "webxr/profile"]

View file

@ -44,7 +44,6 @@ refcell_backtrace = ["libservo/refcell_backtrace"]
webdriver = ["libservo/webdriver"] webdriver = ["libservo/webdriver"]
webgl_backtrace = ["libservo/webgl_backtrace"] webgl_backtrace = ["libservo/webgl_backtrace"]
webrender_debugger = ["libservo/webrender_debugger"] webrender_debugger = ["libservo/webrender_debugger"]
vslatestinstalled = ["libservo/vslatestinstalled"]
xr-profile = ["libservo/xr-profile"] xr-profile = ["libservo/xr-profile"]
[target.'cfg(not(target_os = "android"))'.dependencies] [target.'cfg(not(target_os = "android"))'.dependencies]

View file

@ -52,5 +52,4 @@ refcell_backtrace = ["libservo/refcell_backtrace"]
webdriver = ["libservo/webdriver"] webdriver = ["libservo/webdriver"]
uwp = ["libservo/uwp", "webxr/openxr-api"] uwp = ["libservo/uwp", "webxr/openxr-api"]
webgl_backtrace = ["libservo/webgl_backtrace"] webgl_backtrace = ["libservo/webgl_backtrace"]
vslatestinstalled = ["libservo/vslatestinstalled"]
xr-profile = ["libservo/xr-profile"] xr-profile = ["libservo/xr-profile"]

View file

@ -46,5 +46,4 @@ refcell_backtrace = ["simpleservo/refcell_backtrace"]
uwp = ["simpleservo/uwp"] uwp = ["simpleservo/uwp"]
webdriver = ["simpleservo/webdriver"] webdriver = ["simpleservo/webdriver"]
webgl_backtrace = ["simpleservo/webgl_backtrace"] webgl_backtrace = ["simpleservo/webgl_backtrace"]
vslatestinstalled = ["simpleservo/vslatestinstalled"]
xr-profile = ["simpleservo/xr-profile"] xr-profile = ["simpleservo/xr-profile"]