Commit 0b4372e8 authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1721968 - Remove support for lucetc for rlbox.... 

Bug 1721968 - Remove support for lucetc for rlbox. r=firefox-build-system-reviewers,shravanrn,mhentges

Differential Revision: https://phabricator.services.mozilla.com/D120700
parent a054bdd0

.cargo/config.in

+0 −10
Original line number Diff line number Diff line
@@ -102,16 +102,6 @@ git = "https://github.com/bytecodealliance/wasmtime" 
replace-with = "vendored-sources"

rev = "824fa69756523f2b6d49029fe25de94130b1f144"



[source."https://github.com/PLSysSec/rlbox_lucet_sandbox/"]

git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/"

replace-with = "vendored-sources"

rev = "5c8e79048d3ff6f434109e19d4aee4ff8624d3d7"



[source."https://github.com/PLSysSec/lucet_sandbox_compiler"]

git = "https://github.com/PLSysSec/lucet_sandbox_compiler"

replace-with = "vendored-sources"

rev = "d582d76bf0d17984501f3933688bf7a1eb5cf208"



[source.crates-io]

replace-with = "vendored-sources"

Cargo.lock

+4 −144
Original line number Diff line number Diff line
@@ -505,15 +505,6 @@ dependencies = [ 
 "xpcom",

]



[[package]]

name = "cast"

version = "0.2.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "cc38c385bfd7e444464011bb24820f40dd1c76bcdfa1b78611cb7c2e5cafab75"

dependencies = [

 "rustc_version",

]



[[package]]

name = "cc"

version = "1.0.68"
@@ -796,7 +787,7 @@ name = "cranelift-bforest" 
version = "0.74.0"

source = "git+https://github.com/bytecodealliance/wasmtime?rev=824fa69756523f2b6d49029fe25de94130b1f144#824fa69756523f2b6d49029fe25de94130b1f144"

dependencies = [

 "cranelift-entity 0.74.0",

 "cranelift-entity",

]



[[package]]
@@ -807,7 +798,7 @@ dependencies = [ 
 "cranelift-bforest",

 "cranelift-codegen-meta",

 "cranelift-codegen-shared",

 "cranelift-entity 0.74.0",

 "cranelift-entity",

 "log",

 "regalloc",

 "smallvec",
@@ -820,7 +811,7 @@ version = "0.74.0" 
source = "git+https://github.com/bytecodealliance/wasmtime?rev=824fa69756523f2b6d49029fe25de94130b1f144#824fa69756523f2b6d49029fe25de94130b1f144"

dependencies = [

 "cranelift-codegen-shared",

 "cranelift-entity 0.74.0",

 "cranelift-entity",

]



[[package]]
@@ -828,11 +819,6 @@ name = "cranelift-codegen-shared" 
version = "0.74.0"

source = "git+https://github.com/bytecodealliance/wasmtime?rev=824fa69756523f2b6d49029fe25de94130b1f144#824fa69756523f2b6d49029fe25de94130b1f144"



[[package]]

name = "cranelift-entity"

version = "0.41.0"

source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=d582d76bf0d17984501f3933688bf7a1eb5cf208#d582d76bf0d17984501f3933688bf7a1eb5cf208"



[[package]]

name = "cranelift-entity"

version = "0.74.0"
@@ -855,7 +841,7 @@ version = "0.74.0" 
source = "git+https://github.com/bytecodealliance/wasmtime?rev=824fa69756523f2b6d49029fe25de94130b1f144#824fa69756523f2b6d49029fe25de94130b1f144"

dependencies = [

 "cranelift-codegen",

 "cranelift-entity 0.74.0",

 "cranelift-entity",

 "cranelift-frontend",

 "itertools 0.10.1",

 "log",
@@ -1354,25 +1340,6 @@ dependencies = [ 
 "serde",

]



[[package]]

name = "failure"

version = "0.1.8"

dependencies = [

 "failure_derive",

]



[[package]]

name = "failure_derive"

version = "0.1.8"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"

dependencies = [

 "proc-macro2",

 "quote",

 "syn",

 "synstructure",

]



[[package]]

name = "fake-simd"

version = "0.1.2"
@@ -2056,7 +2023,6 @@ dependencies = [ 
 "processtools",

 "profiler_helper",

 "qcms",

 "rlbox_lucet_sandbox",

 "rsdparsa_capi",

 "rusqlite",

 "rust_minidump_writer_linux",
@@ -2897,74 +2863,6 @@ dependencies = [ 
 "cfg-if 1.0.0",

]



[[package]]

name = "lucet-module-wasmsbx"

version = "0.1.1"

source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=d582d76bf0d17984501f3933688bf7a1eb5cf208#d582d76bf0d17984501f3933688bf7a1eb5cf208"

dependencies = [

 "bincode",

 "byteorder",

 "cranelift-entity 0.41.0",

 "failure",

 "num-derive",

 "num-traits",

 "object",

 "serde",

 "serde_json",

]



[[package]]

name = "lucet-runtime-internals-wasmsbx"

version = "0.1.1"

source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=d582d76bf0d17984501f3933688bf7a1eb5cf208#d582d76bf0d17984501f3933688bf7a1eb5cf208"

dependencies = [

 "bincode",

 "bitflags",

 "byteorder",

 "cc",

 "failure",

 "lazy_static",

 "libc",

 "libloading 0.5.2",

 "lucet-module-wasmsbx",

 "memoffset",

 "nix",

 "num-derive",

 "num-traits",

 "raw-cpuid",

 "xfailure",

]



[[package]]

name = "lucet-runtime-wasmsbx"

version = "0.1.1"

source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=d582d76bf0d17984501f3933688bf7a1eb5cf208#d582d76bf0d17984501f3933688bf7a1eb5cf208"

dependencies = [

 "cc",

 "libc",

 "lucet-module-wasmsbx",

 "lucet-runtime-internals-wasmsbx",

 "num-derive",

 "num-traits",

]



[[package]]

name = "lucet-wasi-wasmsbx"

version = "0.1.1"

source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=d582d76bf0d17984501f3933688bf7a1eb5cf208#d582d76bf0d17984501f3933688bf7a1eb5cf208"

dependencies = [

 "cast",

 "failure",

 "lazy_static",

 "libc",

 "lucet-module-wasmsbx",

 "lucet-runtime-internals-wasmsbx",

 "lucet-runtime-wasmsbx",

 "mach",

 "nix",

 "rand",

]



[[package]]

name = "mach"

version = "0.3.2"
@@ -3622,9 +3520,7 @@ version = "0.16.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a3c61759aa254402e53c79a68dc519cda1ceee2ff2b6d70b3e58bf64ac2f03e3"

dependencies = [

 "flate2",

 "goblin",

 "parity-wasm",

 "scroll",

 "target-lexicon 0.9.0",

 "uuid",
@@ -3720,12 +3616,6 @@ dependencies = [ 
 "cfg-if 0.1.10",

]



[[package]]

name = "parity-wasm"

version = "0.41.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ddfc878dac00da22f8f61e7af3157988424567ab01d9920b962ef7dcbd7cd865"



[[package]]

name = "parking_lot"

version = "0.11.1"
@@ -4184,17 +4074,6 @@ name = "range-alloc" 
version = "0.1.2"

source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"



[[package]]

name = "raw-cpuid"

version = "7.0.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "beb71f708fe39b2c5e98076204c3cc094ee5a4c12c4cdb119a2b72dc34164f41"

dependencies = [

 "bitflags",

 "cc",

 "rustc_version",

]



[[package]]

name = "raw-window-handle"

version = "0.3.3"
@@ -4348,19 +4227,6 @@ dependencies = [ 
 "uuid",

]



[[package]]

name = "rlbox_lucet_sandbox"

version = "0.1.0"

source = "git+https://github.com/PLSysSec/rlbox_lucet_sandbox/?rev=5c8e79048d3ff6f434109e19d4aee4ff8624d3d7#5c8e79048d3ff6f434109e19d4aee4ff8624d3d7"

dependencies = [

 "failure",

 "goblin",

 "lucet-module-wasmsbx",

 "lucet-runtime-internals-wasmsbx",

 "lucet-runtime-wasmsbx",

 "lucet-wasi-wasmsbx",

]



[[package]]

name = "ron"

version = "0.6.2"
@@ -5952,12 +5818,6 @@ dependencies = [ 
 "euclid",

]



[[package]]

name = "xfailure"

version = "0.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "da90eac47bf1d7871b75004b9b631d107df15f37669383b23f0b5297bc7516b6"



[[package]]

name = "xml-rs"

version = "0.8.3"

Cargo.toml

+0 −5
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ chardetng = { git = "https://github.com/hsivonen/chardetng", rev="302c995f91f44c 
chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev="ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" }

libudev-sys = { path = "dom/webauthn/libudev-sys" }

packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="6a16f954950401b92b4e220fbf2dfaf6f00e1fb2" }

rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="5c8e79048d3ff6f434109e19d4aee4ff8624d3d7" }

nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }

spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu5" }

minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "85551909b95a5cf553a85dbcddfa5f117cfbbe0e" }
@@ -102,7 +101,3 @@ path = "third_party/rust/autocfg" 
# There is not going to be new version of mio 0.6, mio now being >= 0.7.11.

[patch.crates-io.mio]

path = "third_party/rust/mio"
 


# Patch failure 0.1.8 to disable the backtrace feature by default. See bug 1608157.

[patch.crates-io.failure]

path = "third_party/rust/failure"

config/external/moz.build

+4 −9
Original line number Diff line number Diff line
@@ -13,11 +13,6 @@ DIRS += [ 
]



if CONFIG["MOZ_USING_WASM_SANDBOXING"]:

    if CONFIG["LUCETC"]:

        DIRS += [

            "rlbox_lucet_sandbox",

        ]

    else:

    DIRS += [

        "rlbox_wasm2c_sandbox",

        "wasm2c_sandbox_compiler",

config/external/rlbox_lucet_sandbox/moz.build

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-

# vim: set filetype=python:

# This Source Code Form is subject to the terms of the Mozilla Public

# License, v. 2.0. If a copy of the MPL was not distributed with this

# file, You can obtain one at http://mozilla.org/MPL/2.0/.



EXPORTS.mozilla.rlbox += [

    "/third_party/rust/rlbox_lucet_sandbox/include/lucet_sandbox.h",

    "/third_party/rust/rlbox_lucet_sandbox/include/rlbox_lucet_sandbox.hpp",

]



SOURCES += ["rlbox_lucet_thread_locals.cpp"]



FINAL_LIBRARY = "xul"