bridges/Library_cpp_uno.mk | 3 +-- bridges/source/cpp_uno/gcc3_wasm/except.cxx | 22 ---------------------- 2 files changed, 1 insertion(+), 24 deletions(-)
New commits: commit 981542c1d218ae7ecf30431555560aed152f8ab1 Author: Stephan Bergmann <[email protected]> AuthorDate: Tue May 28 22:10:54 2024 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Wed May 29 12:59:29 2024 +0200 Clean up gcc3_wasm bridge_noopt_objects There appears to be no good reason that cpp2uno.cxx and uno2cpp.cxx are noopt (presumably that was just cargo-culted from another platform?), and except.cxx appears to be completely unused anyway. Change-Id: Ic5f4142308a56b798dad61e9ec589046cad2ae13 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168182 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Jenkins diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index 462fd538e104..5d6e7c489802 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -83,8 +83,7 @@ bridge_exception_objects := cpp2uno uno2cpp bridge_noopt_objects := except else ifeq ($(OS),EMSCRIPTEN) bridges_SELECTED_BRIDGE := gcc3_wasm -bridge_exception_objects := abi -bridge_noopt_objects := cpp2uno except uno2cpp +bridge_exception_objects := abi cpp2uno uno2cpp $(eval $(call gb_Library_add_generated_asmobjects,$(CPPU_ENV)_uno, \ CustomTarget/bridges/gcc3_wasm/callvirtualfunction-impls \ )) diff --git a/bridges/source/cpp_uno/gcc3_wasm/except.cxx b/bridges/source/cpp_uno/gcc3_wasm/except.cxx deleted file mode 100644 index 36778c65a11a..000000000000 --- a/bridges/source/cpp_uno/gcc3_wasm/except.cxx +++ /dev/null @@ -1,22 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * 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/. - */ - -#include <cstdlib> - -#include <uno/mapping.h> -#include <uno/any2.h> - -namespace CPPU_CURRENT_NAMESPACE -{ -void raiseException(uno_Any*, uno_Mapping*) { std::abort(); } - -void fillUnoException(uno_Any*, uno_Mapping*) { std::abort(); } -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
