From 36d22d82aa202bb199967e9512281e9a53db42c9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 21:33:14 +0200 Subject: Adding upstream version 115.7.0esr. Signed-off-by: Daniel Baumann --- config/external/rlbox/moz.build | 28 +++++++++++++++++++++++++ config/external/rlbox/rlbox_config.h | 30 +++++++++++++++++++++++++++ config/external/rlbox/rlbox_thread_locals.cpp | 17 +++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 config/external/rlbox/moz.build create mode 100644 config/external/rlbox/rlbox_config.h create mode 100644 config/external/rlbox/rlbox_thread_locals.cpp (limited to 'config/external/rlbox') diff --git a/config/external/rlbox/moz.build b/config/external/rlbox/moz.build new file mode 100644 index 0000000000..d3ffdc430a --- /dev/null +++ b/config/external/rlbox/moz.build @@ -0,0 +1,28 @@ +# -*- 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/rlbox/include/rlbox.hpp", + "/third_party/rlbox/include/rlbox_app_pointer.hpp", + "/third_party/rlbox/include/rlbox_conversion.hpp", + "/third_party/rlbox/include/rlbox_helpers.hpp", + "/third_party/rlbox/include/rlbox_noop_sandbox.hpp", + "/third_party/rlbox/include/rlbox_policy_types.hpp", + "/third_party/rlbox/include/rlbox_range.hpp", + "/third_party/rlbox/include/rlbox_sandbox.hpp", + "/third_party/rlbox/include/rlbox_stdlib.hpp", + "/third_party/rlbox/include/rlbox_stdlib_polyfill.hpp", + "/third_party/rlbox/include/rlbox_struct_support.hpp", + "/third_party/rlbox/include/rlbox_type_traits.hpp", + "/third_party/rlbox/include/rlbox_types.hpp", + "/third_party/rlbox/include/rlbox_unwrap.hpp", + "/third_party/rlbox/include/rlbox_wrapper_traits.hpp", + "rlbox_config.h", +] + +SOURCES += ["rlbox_thread_locals.cpp"] + +FINAL_LIBRARY = "xul" diff --git a/config/external/rlbox/rlbox_config.h b/config/external/rlbox/rlbox_config.h new file mode 100644 index 0000000000..c9aa34e4db --- /dev/null +++ b/config/external/rlbox/rlbox_config.h @@ -0,0 +1,30 @@ +/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* 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/. */ + +#ifndef RLBOX_CONFIG +#define RLBOX_CONFIG + +#include "mozilla/Assertions.h" + +// All uses of rlbox's function and callbacks invocations are on a single +// thread right now, so we disable rlbox thread checks for performance +// See (Bug 1739298) for more details +#define RLBOX_SINGLE_THREADED_INVOCATIONS + +#define RLBOX_CUSTOM_ABORT(msg) MOZ_CRASH_UNSAFE_PRINTF("RLBox crash: %s", msg) + +// The MingW compiler does not correctly handle static thread_local inline +// members. This toggles a workaround that allows the host application (firefox) +// to provide TLS storage via functions. This can be removed if the MingW bug is +// fixed. +#define RLBOX_EMBEDDER_PROVIDES_TLS_STATIC_VARIABLES + +// When instantiating a wasm sandbox, rlbox requires the name of the wasm module +// being instantiated. LLVM and wasm2c use the module name by choosing the name +// used to generate the wasm file. In Firefox this is a static library called +// rlbox +#define RLBOX_WASM2C_MODULE_NAME rlbox + +#endif diff --git a/config/external/rlbox/rlbox_thread_locals.cpp b/config/external/rlbox/rlbox_thread_locals.cpp new file mode 100644 index 0000000000..157177c0e0 --- /dev/null +++ b/config/external/rlbox/rlbox_thread_locals.cpp @@ -0,0 +1,17 @@ +/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* 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/. */ + +// Load general firefox configuration of RLBox +#include "mozilla/rlbox/rlbox_config.h" + +#define RLBOX_USE_STATIC_CALLS() rlbox_noop_sandbox_lookup_symbol +#include "mozilla/rlbox/rlbox_noop_sandbox.hpp" + +#include "mozilla/rlbox/rlbox.hpp" + +// The MingW compiler does not correctly handle static thread_local inline +// members. We instead TLS storage via functions. This can be removed if the +// MingW bug is fixed. +RLBOX_NOOP_SANDBOX_STATIC_VARIABLES(); -- cgit v1.2.3