Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some typos. #21123

Merged
merged 1 commit into from
Jan 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ exclude =
./system/lib/, # system libraries
./cache/, # download/built content
.git
# The ports plugins have a lot of unused imports becuase
# The ports plugins have a lot of unused imports because
# they need to implement the specific plugin APIs
per-file-ignores =
./tools/ports/*.py: U100
Expand Down
22 changes: 11 additions & 11 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ See docs/process.md for more on how version tagging works.
-----------------
- The core stack manipulation functions (`stackSave`, `stackRestore`,
`stackAlloc`) are no longer exported by default. Users of these function
now need to depend on them explictly (either via `__deps` attributes or via
now need to depend on them explicitly (either via `__deps` attributes or via
`-sEXPORTED_FUNCTIONS`). (#21075)
- Building with `pthreads+EXPORT_ES6` will now emit the worker file as
`NAME.worker.mjs` rather than `.js`. This is a necessary breaking change to
Expand Down Expand Up @@ -66,7 +66,7 @@ See docs/process.md for more on how version tagging works.

3.1.51 - 12/13/23
-----------------
- Support for explicitly targeting the legacy Interet Explorer or EdgeHTML
- Support for explicitly targeting the legacy Internet Explorer or EdgeHTML
(edge version prior to the chromium-based edge) browsers via
`-sMIN_EDGE_VERSION/-sMIN_IE_VERSION` was removed. (#20881)
- Emscripten is now more strict about handling unsupported shared library
Expand Down Expand Up @@ -112,8 +112,8 @@ See docs/process.md for more on how version tagging works.
the `DEFAULT_TO_CXX` setting now only applies when linking and not when
compiling. (#20712)
- JavaScript library code can now use the full range of ES6 features and we rely
on closure compiler to transpile for ES5 when targetting older browsers.
For those that would rather perform transpilation seperately outside of
on closure compiler to transpile for ES5 when targeting older browsers.
For those that would rather perform transpilation separately outside of
emscripten you can use the `-sPOLYFILL=0` setting. (#20700)
- libcxx, libcxxabi, libunwind, and compiler-rt were updated to LLVM 17.0.4.
(#20705, #20707, and #20708)
Expand Down Expand Up @@ -145,7 +145,7 @@ See docs/process.md for more on how version tagging works.
JavaScript code. (#20551)
- A new top-level `bootstrap` script was added. This script is for emscripten
developers and helps take a care of post-checkout tasks such as `npm install`.
If this script needs to be run (e.g. becuase package.json was changed, emcc
If this script needs to be run (e.g. because package.json was changed, emcc
will exit with an error. (#19736)
- If exceptions are disabled, using `new` together with `std::nothrow` no
longer aborts if the allocation fails. Instead `nullptr` is returned now.
Expand Down Expand Up @@ -189,7 +189,7 @@ See docs/process.md for more on how version tagging works.
-----------------
- The `wasmTable` global is now a JS library function that will only be included
as needed. Code that references `wasmTable` will no need to declare a
dependency on it. It can also be explictly included using
dependency on it. It can also be explicitly included using
`-sEXPORTED_RUNTIME_METHODS=wasmTable`.
- libunwind updated to LLVM 16.0.6. (#20088)
- The `--minify=0` commnad line flag will now preserve comments as well as
Expand All @@ -206,7 +206,7 @@ See docs/process.md for more on how version tagging works.
- The `USE_GLFW` settings now defaults to 0 rather than 2. This matches other
other settings such as `USE_SDL` that default to 0 these days and also matches
the existing behaviour for `MINIMAL_RUNTIME` and `STRICT` mode.
If you use GLFW you now need to explictly opt into it using `-sUSE_GLFW` or
If you use GLFW you now need to explicitly opt into it using `-sUSE_GLFW` or
`-lglfw`. (#19939)
- A new settings `TABLE_BASE` was introduced that can be used to place static
function addresses (table slots) at a certain offset. This defaults to 1
Expand Down Expand Up @@ -256,7 +256,7 @@ See docs/process.md for more on how version tagging works.
`-sMIN_NODE_VERSION=101900` which will apply the previous minimum version of
10.19.0. (#19192).
- The log message that emcc will sometime print (for example when auto-building
system libraries) can now be completely supressed by running with
system libraries) can now be completely suppressed by running with
`EMCC_LOGGING=0`.
- Runtime dynamic linking symbols such as dlopen and dlsym will no longer cause
a linker error when building without `-sMAIN_MODULE`. Instead stub functions
Expand Down Expand Up @@ -333,13 +333,13 @@ See docs/process.md for more on how version tagging works.
- stringToUTF8
- lengthBytesUTF8
If you use any of these functions in your JS code you will now need to include
them explictly in one of the following ways:
them explicitly in one of the following ways:
- Add them to a `__deps` entry in your JS library file (with leading $)
- Add them to `DEFAULT_LIBRARY_FUNCS_TO_INCLUDE` (with leading $)
- Add them to `EXPORTED_FUNCTIONS` (without leading $)
- Set `-sLEGACY_RUNTIME` to include all of them at once.
- `FS.loadFilesFromDB` and `FS.saveFilesToDB` were removed. We think it's
unlikly there were any users of these functions since there is now a separate
unlikely there were any users of these functions since there is now a separate
IDBFS filesystem for folks that want persistence. (#19049)
- `allocateUTF8` and `allocateUTF8OnStack` library function moved to
`library_legacy.js`. Prefer the more accurately named `stringToNewUTF8` and
Expand All @@ -360,7 +360,7 @@ See docs/process.md for more on how version tagging works.
- Fix for using `EM_JS` functions defined in other object files. This was a bug
that was introduced when `LLD_REPORT_UNDEFINED` was enabled by default back in
3.1.28. (#18928)
- The prefered way to enable pthread is now to just the the standard `-pthread`
- The preferred way to enable pthreads is now to just use the standard `-pthread`
flag. The `-sUSE_PTHREADS` setting still works but is marked as legacy and
will generate a warning in `-sSTRICT` mode.
- When targeting node, and using `-sMODULARIZE`, we no longer internally catch
Expand Down
4 changes: 2 additions & 2 deletions site/source/docs/getting_started/FAQ.rst
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ with
Why do I get a ``NameError`` or ``a problem occurred in evaluating content after a "-s"`` when I use a ``-s`` option?
=====================================================================================================================

This can occur if you have non-trival strings in ``-s`` argument and are having
This can occur if you have non-trivial strings in ``-s`` argument and are having
trouble getting the shell quoting / escaping correct.

Using the simpler list form (without quotes, spaces or square brackets) can
Expand All @@ -603,7 +603,7 @@ It is also possible to use a **response file**, that is,
emcc a.c -sEXPORTED_RUNTIME_METHODS=@extra.txt

with ``extra.txt`` being a plain text file that contains ``foo`` and ``bar`` on
seperate lines.
separate lines.

How do I specify ``-s`` options in a CMake project?
===================================================
Expand Down
2 changes: 1 addition & 1 deletion src/library_syscall.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ var SyscallsLibrary = {
'$FS',
// The dependency of FS on `mmapAlloc` and `mmapAlloc` on
// `emscripten_builtin_memalign` are not encoding as hard dependencies,
// so we need to explictly depend on them here to ensure a working
// so we need to explicitly depend on them here to ensure a working
// `FS.mmap`.
// `emscripten_builtin_memalign`).
'$mmapAlloc',
Expand Down
6 changes: 3 additions & 3 deletions test/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ def env_modify(updates):
# on the mock library is probably not worth the benefit.
old_env = os.environ.copy()
print("env_modify: " + str(updates))
# Seting a value to None means clear the environment variable
# Setting a value to None means clear the environment variable
clears = [key for key, value in updates.items() if value is None]
updates = {key: value for key, value in updates.items() if value is not None}
os.environ.update(updates)
Expand Down Expand Up @@ -1652,7 +1652,7 @@ def get_freetype_library(self):
'-Wno-pointer-bool-conversion',
'-Wno-shift-negative-value',
'-Wno-gnu-offsetof-extensions',
# And becuase gnu-offsetof-extensions is a new warning:
# And because gnu-offsetof-extensions is a new warning:
'-Wno-unknown-warning-option',
]
return self.get_library(os.path.join('third_party', 'freetype'),
Expand Down Expand Up @@ -1861,7 +1861,7 @@ class Reporting(Enum):
NONE = 0
# Include the JS helpers for reporting results
JS_ONLY = 1
# Include C/C++ reporting code (REPORT_RESULT mactros) as well as JS helpers
# Include C/C++ reporting code (REPORT_RESULT macros) as well as JS helpers
FULL = 2


Expand Down
2 changes: 1 addition & 1 deletion test/core/test_stdio_locking.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Regression test for stdio locking. If file locking is not enabled the
* threads will race to write the file output buffer and we will see lines
* that are longer or shorter then 100 characters. When locking is
* working/enabled each 100 charactor line will be printed seperately.
* working/enabled each 100 character line will be printed separately.
*
* See:
* musl/src/stdio/__lockfile.c
Expand Down
4 changes: 2 additions & 2 deletions test/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -6098,15 +6098,15 @@ def test_unary_literal(self):
self.do_core_test('test_unary_literal.cpp')

@crossplatform
# Explictly set LANG here since new versions of node expose
# Explicitly set LANG here since new versions of node expose
# `navigator.languages` which emscripten will honor and we
# want the test output to be consistent.
@with_env_modify({'LANG': 'en_US.UTF-8'})
def test_env(self):
self.do_core_test('test_env.c', regex=True)

@crossplatform
# Explictly set LANG here since new versions of node expose
# Explicitly set LANG here since new versions of node expose
# `navigator.languages` which emscripten will honor and we
# want the test output to be consistent.
@with_env_modify({'LANG': 'en_US.UTF-8'})
Expand Down
4 changes: 2 additions & 2 deletions test/test_other.py
Original file line number Diff line number Diff line change
Expand Up @@ -7388,7 +7388,7 @@ def test_js_lib_native_deps(self):

def test_js_lib_native_deps_extra(self):
# Similar to above but the JS symbol is not used by the native code.
# Instead is it explictly injected using `extraLibraryFuncs`.
# Instead is it explicitly injected using `extraLibraryFuncs`.
create_file('lib.js', r'''
addToLibrary({
jsfunc__deps: ['raise'],
Expand Down Expand Up @@ -14222,7 +14222,7 @@ def test_memory64_proxies(self):
def test_no_minify(self):
# Test that comments are preserved with `--minify=0` is used, even in `-Oz` builds.
# This allows the output of emscripten to be run through the closure compiler as
# as a seperate build step.
# as a separate build step.
create_file('pre.js', '''
/**
* This comment should be preserved
Expand Down
2 changes: 1 addition & 1 deletion tools/building.py
Original file line number Diff line number Diff line change
Expand Up @@ -1139,7 +1139,7 @@ def map_to_js_libs(library_name):
'SDL': ['library_sdl.js'],
'uuid': ['library_uuid.js'],
'websocket': ['library_websocket.js'],
# These 4 libraries are seperate under glibc but are all rolled into
# These 4 libraries are separate under glibc but are all rolled into
# libc with musl. For compatibility with glibc we just ignore them
# completely.
'dl': [],
Expand Down
10 changes: 5 additions & 5 deletions tools/link.py
Original file line number Diff line number Diff line change
Expand Up @@ -914,10 +914,10 @@ def phase_linker_setup(options, state, newargs):

if 'GLOBAL_BASE' not in user_settings and not settings.SHRINK_LEVEL and not settings.OPT_LEVEL:
# When optimizing for size it helps to put static data first before
# the stack (sincs this makes instructions for accessing this data
# the stack (since this makes instructions for accessing this data
# use a smaller LEB encoding).
# However, for debugability is better to have the stack come first
# (becuase stack overflows will trap rather than corrupting data).
# (because stack overflows will trap rather than corrupting data).
settings.STACK_FIRST = True

# Default to TEXTDECODER=2 (always use TextDecoder to decode UTF-8 strings)
Expand Down Expand Up @@ -2327,9 +2327,9 @@ def modularize():
shared.target_environment_may_be('web'):
async_emit = 'async '

# Return the incoming `moduleArg`. This is is equeivielt to the `Module` var within the
# generated code but its not run through closure minifiection so we can reference it in
# the the return statement.
# Return the incoming `moduleArg`. This is is equivalent to the `Module` var within the
# generated code but its not run through closure minification so we can reference it in
# the return statement.
return_value = 'moduleArg'
if settings.WASM_ASYNC_COMPILATION:
return_value += '.ready'
Expand Down
2 changes: 1 addition & 1 deletion tools/system_libs.py
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ def do_build(self, out_filename, generate_only=False):
if not generate_only:
run_ninja(build_dir)
else:
# Use a seperate build directory to the ninja flavor so that building without
# Use a separate build directory to the ninja flavor so that building without
# EMCC_USE_NINJA doesn't clobber the ninja build tree
build_dir += '-tmp'
utils.safe_ensure_dirs(build_dir)
Expand Down