diff options
| -rw-r--r-- | README.wasm | 14 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk | 2 | ||||
| -rw-r--r-- | sw/qa/extras/layout/layout.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/fly.cxx | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/README.wasm b/README.wasm index a09d4d61762c..926f6565452c 100644 --- a/README.wasm +++ b/README.wasm @@ -5,7 +5,7 @@ $ emrun --serve_after_close instdir/program/ui-previewer.html The ui-previewer "binary" will "crash" with memory alignment problems. -You can run the WASM mandelbrot Qt example, if you copy it's HTML +You can run the WASM mandelbrot Qt example, if you copy its HTML and the qtloader.js from the Qt's example folder after build with: $ emrun --serve_after_close workdir/LinkTarget/Executable/mandelbrot.html @@ -109,7 +109,7 @@ in the lode/docker dir to get the container prepared. Run PARALLELISM=4 BUILD_OPTIONS= BUILD_TARGET=build docker-compose run --rm -e PARALLELISM -e BUILD_TARGET -e BUILD_OPTIONS builder -to perform an actual srcdir != buildir build; the container mounts +to perform an actual srcdir != builddir build; the container mounts checked-out git repo and output dir via docker-compose.yml (so make sure the path names there match your setup): @@ -124,7 +124,7 @@ The lode setup expects, inside the lode/docker subdir, the following directories = Ideas for an UNO bridge implementation = My post to Discord #emscripten: "I'm looking for a way to do an abstract call -from one WASM C++ object to an other WASM C++ object, so like FFI / WebIDL, +from one WASM C++ object to another WASM C++ object, so like FFI / WebIDL, just within WASM. All my code is C++ and normally I have bridge code, with assembler to implement the function call /RTTI and exception semantics of the specified platform. Code is at @@ -186,7 +186,7 @@ This is mentioned at the end of: https://github.com/emscripten-core/emscripten/w The usage of MAIN_MODULE and SIDE_MODULE has other problems, a major one IMHO is symbol resolution at runtime only. So this works really more like plugins in the sense of symbol resolution without dependencies / rpath. -There is some clang-level dynamic-linking in progress (WASM dlload). The follwing link is already a bit old, +There is some clang-level dynamic-linking in progress (WASM dlload). The following link is already a bit old, but I found it a god summary of problems to expect: https://iandouglasscott.com/2019/07/18/experimenting-with-webassembly-dynamic-linking-with-clang/ @@ -195,8 +195,8 @@ https://iandouglasscott.com/2019/07/18/experimenting-with-webassembly-dynamic-li More info on Qt WASM emscripten pthreads: https://wiki.qt.io/Qt_for_WebAssembly#Multithreading_Support -WASM needs -pthread at compile, not just link time for atomics support. Alternativel< you can provide --s USE_PTHREADS=1, but both don't seem to work relyable, so best provide both. +WASM needs -pthread at compile, not just link time for atomics support. Alternatively you can provide +-s USE_PTHREADS=1, but both don't seem to work reliable, so best provide both. https://github.com/emscripten-core/emscripten/issues/10370 The output file must have the prefix .o, otherwise the WASM files will get a @@ -219,7 +219,7 @@ But with the know problems with exceptions and threads, this might change: - https://github.com/emscripten-core/emscripten/issues/12035 We're also using emconfigure at the moment. Originally I patched emscripten, because it -woulden't create the correct a.out file for C++ configure tests. Later I found that +wouldn't create the correct a.out file for C++ configure tests. Later I found that the emconfigure sets EMMAKEN_JUST_CONFIGURE to work around the problem. ICU bug: https://github.com/emscripten-core/emscripten/issues/10129 diff --git a/configure.ac b/configure.ac index 44ea1276283c..d802a66a2d8f 100644 --- a/configure.ac +++ b/configure.ac @@ -1508,7 +1508,7 @@ libo_FUZZ_ARG_ENABLE(optimized, By default, disabled for --enable-debug and --enable-dbgutil, enabled otherwise. Using 'debug' will try to use only optimizations that should not interfere with debugging. For Emscripten we default to optimized (-O1) - debug build, as otherwise biaries become too large.])) + debug build, as otherwise binaries become too large.])) libo_FUZZ_ARG_ENABLE(runtime-optimizations, AS_HELP_STRING([--disable-runtime-optimizations], diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk index 3131bbec0959..3a7441454f0d 100644 --- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk +++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk @@ -27,7 +27,7 @@ gb_LinkTarget_LDFLAGS += $(gb_EMSCRIPTEN_LDFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS) $(gb # Linker and compiler optimize + debug flags are handled in LinkTarget.mk gb_LINKEROPTFLAGS := gb_LINKERSTRIPDEBUGFLAGS := -# This maps to g4, AKA sorce maps. The LO default would otherwise be g2! +# This maps to g4, AKA source maps. The LO default would otherwise be g2! gb_DEBUGINFO_FLAGS = -g # We need at least code elimination, otherwise linking OOMs even with 64GB. # So we "fake" -Og support to mean -O1 for Emscripten and always enable it for debug in configure. diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 88dd06078ec2..1e8878da6887 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -1312,7 +1312,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf142080) load(DATA_DIRECTORY, "fdo43573-2-min.docx"); xmlDocUniquePtr pLayout = parseLayoutDump(); - // check the first paragraph on page 9 with its fly; the colum was empty too + // check the first paragraph on page 9 with its fly; the column was empty too assertXPath(pLayout, "/root/page[9]/body/section[1]/column[1]/body/txt[1]/Text[1]", "Portion", "De kleur u (rood) in het rechtervlak (R), de kleur r (wit) beneden (D),"); SwTwips nPage9Top = getXPath(pLayout, "/root/page[9]/infos/bounds", "top").toInt32(); diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 989870bfcb92..688c1b6503e7 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -1609,7 +1609,7 @@ void CalcContent( SwLayoutFrame *pLay, bool bNoColl ) // #i28701# - restart layout process, if // requested by floating screen object formatting if (bRestartLayoutProcess - // tdf#142080 if it was aleady on next page, and still is, + // tdf#142080 if it was already on next page, and still is, // ignore restart, as restart could cause infinite loop && (wasFrameLowerOfLay || pLay->IsAnLower(pFrame))) { |