Skip to content

Commit b037fd3

Browse files
Fix some typos [NFC] (#21275)
1 parent c02cc3d commit b037fd3

File tree

6 files changed

+34
-34
lines changed

6 files changed

+34
-34
lines changed

ChangeLog.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ See docs/process.md for more on how version tagging works.
217217
dependency on it. It can also be explicitly included using
218218
`-sEXPORTED_RUNTIME_METHODS=wasmTable`.
219219
- libunwind updated to LLVM 16.0.6. (#20088)
220-
- The `--minify=0` commnad line flag will now preserve comments as well as
220+
- The `--minify=0` command line flag will now preserve comments as well as
221221
whitespace. This means the resulting output can then be run though closure
222222
compiler or some other tool that gives comments semantic meaning. (#20121)
223223
- `-sSTRICT` now implies `-sINCOMING_MODULE_API=[]` which is generally good
@@ -882,7 +882,7 @@ See docs/process.md for more on how version tagging works.
882882
3.1.2 - 01/20/2022
883883
------------------
884884
- A new setting, `POLYFILL`, was added which is on by default but can be disabled
885-
(via `-sNO_POLYFILL`) to prevent emscripten from outputing needed polyfills.
885+
(via `-sNO_POLYFILL`) to prevent emscripten from outputting needed polyfills.
886886
For default browser targets, no polyfills are needed so this option only has
887887
meaning when targeting older browsers.
888888
- `EVAL_CTORS` has been rewritten and improved. The main differences from before
@@ -1194,7 +1194,7 @@ See docs/process.md for more on how version tagging works.
11941194
- When building with `-s MAIN_MODULE` emscripten will now error on undefined
11951195
symbol by default. This matches the behvious of clang/gcc/msvc. This
11961196
requires that your side modules be present on the command line. If you do not
1197-
specify your side modules on the command line (either direcly or via
1197+
specify your side modules on the command line (either directly or via
11981198
`RUNTIME_LINKED_LIBS`) you may need to add `-s WARN_ON_UNDEFINED_SYMBOLS=0` to
11991199
avoid errors about symbol that are missing at link time (but present in your
12001200
side modules provided at runtime). We hope that this case is not common and
@@ -1299,7 +1299,7 @@ See docs/process.md for more on how version tagging works.
12991299

13001300
2.0.15: 03/05/2021
13011301
------------------
1302-
- Calls to `newlocale` (and `new std::locale` in C++) with arbirary names will
1302+
- Calls to `newlocale` (and `new std::locale` in C++) with arbitrary names will
13031303
now succeed. This is the behaviour of musl libc which emscripten had
13041304
previously inadvertently disabled.
13051305
- System libraries are now compiled with debug info (`-g`). This doesn't
@@ -1316,7 +1316,7 @@ See docs/process.md for more on how version tagging works.
13161316
2.0.14: 02/14/2021
13171317
------------------
13181318
- Add new setting: `REVERSE_DEPS`. This can be used to control how emscripten
1319-
decides which reverse dependecies to include. See `settings.js` for more
1319+
decides which reverse dependencies to include. See `settings.js` for more
13201320
information. The default setting ('auto') is the traditional way emscripten
13211321
has worked in the past so there should be no change unless this options is
13221322
actually used. This option partially replaces the `EMCC_ONLY_FORCED_STDLIBS`
@@ -1472,7 +1472,7 @@ See docs/process.md for more on how version tagging works.
14721472
- Add new `COMPILER_WRAPPER` settings (with corresponding `EM_COMPILER_WRAPPER`
14731473
environment variable. This replaces the existing `EMMAKEN_COMPILER`
14741474
environment variable which is deprecated, but still works for the time being.
1475-
The main differences is that `EM_COMPILER_WRAPPER` only wrapps the configured
1475+
The main differences is that `EM_COMPILER_WRAPPER` only wraps the configured
14761476
version of clang rather than replacing it.
14771477
- ASAN_SHADOW_SIZE is deprecated. When using AddressSanitizer, the correct
14781478
amount of shadow memory will now be calculated automatically.
@@ -1484,7 +1484,7 @@ See docs/process.md for more on how version tagging works.
14841484
- Fix a rare pthreads main thread deadlock (that worsened in 2.0.2, but existed
14851485
before). (#12318)
14861486
- The WebAssembly table is now created and exported by the generated wasm
1487-
module rather then constructed by the JS glue code. This is an implemention
1487+
module rather then constructed by the JS glue code. This is an implementation
14881488
detail that should not affect most users, but reduces code size. (#12296)
14891489
- Add `getentropy` in `sys/random.h`, and use that from libc++'s
14901490
`random_device`. This is more efficient, see #12240.
@@ -1632,7 +1632,7 @@ See docs/process.md for more on how version tagging works.
16321632
`EM_FOO` this should be enough.
16331633
- Running emscripten under python2 is now deprecated. It will show up as a
16341634
warning (which can be disabled with `-Wno-deprecated`). Please update to
1635-
python3 as we hope to remove support completely in the next releaase.
1635+
python3 as we hope to remove support completely in the next release.
16361636

16371637
1.39.20: 07/20/2020
16381638
-------------------
@@ -2824,7 +2824,7 @@ v1.36.10: 9/24/2016
28242824
- Improved support for --proxy-to-worker build mode.
28252825
- Improved GLES3 support for glGet() features that WebGL2 does not have. (#4514)
28262826
- Added support for implementation defined glReadPixels() format.
2827-
- Improved WebGL 2 support with closure compilter. (#4554)
2827+
- Improved WebGL 2 support with closure compiler. (#4554)
28282828
- Implemented support for nanosleep() when building in pthreads mode (#4578)
28292829
- Added support for llvm_ceil_f64 and llvm_floor_f64 intrinsics.
28302830
- Full list of changes:
@@ -2858,7 +2858,7 @@ v1.36.8: 8/20/2016
28582858
options for wasm.
28592859
- Added new emprofile.py script which can be used to profile toolchain wide
28602860
performance. (#4491)
2861-
- Added new linker flag --output-eol, which specifices what kind of line
2861+
- Added new linker flag --output-eol, which specifies what kind of line
28622862
endings to generate to the output files. (#4492)
28632863
- Fixed a Windows bug where aborting execution with Ctrl-C might hang
28642864
Emscripten to an infinite loop instead. (#4494)
@@ -3749,7 +3749,7 @@ v1.30.2: 4/1/2015
37493749

37503750
v1.30.1: 3/24/2015
37513751
------------------
3752-
- Upgraded LLVM+Clang from vrsion 3.5 to version 3.6.
3752+
- Upgraded LLVM+Clang from version 3.5 to version 3.6.
37533753
- Full list of changes:
37543754
- Emscripten: https://github.com/emscripten-core/emscripten/compare/1.30.0...1.30.1
37553755
- Emscripten-LLVM: https://github.com/emscripten-core/emscripten-fastcomp/compare/1.30.0...1.30.1
@@ -4494,7 +4494,7 @@ v1.21.4: 7/17/2014
44944494
runtime.
44954495
- Have runtime mkdir() function call normalize the path to be created before
44964496
creation.
4497-
- Fixed an issue with omitting the third paramter in cwrap() call (#2511).
4497+
- Fixed an issue with omitting the third parameter in cwrap() call (#2511).
44984498
- Fixed an issue where mouse event handling would throw an exception if the
44994499
page did not contain a canvas object.
45004500
- Fixed a GL initialization problem when user has extended Array with custom
@@ -4520,7 +4520,7 @@ v1.21.3: 7/10/2014
45204520
- Added implementations for SDL function SDL_AudioQuit and SDL_VideoQuit.
45214521
- Fix an issue with the optimizeShifts optimization enabled in previous version.
45224522
- Fixed the -s RELOOPER command line parameter to work.
4523-
- Fixed a bug where building the system libc migt result in a compiler deadlock
4523+
- Fixed a bug where building the system libc might result in a compiler deadlock
45244524
on Windows.
45254525
- Removed emcc from trying to link in .dll files as static libraries on
45264526
Windows.
@@ -5298,7 +5298,7 @@ v1.7.0: 10/23/2013
52985298
- Several compiler stability fixes.
52995299
- Adds a JavaScript implementation of cxa_demangle function for demangling call
53005300
stack traces at runtime for easier debugging.
5301-
- GL context MSAA antialising is now DISABLED by default, to make the GL
5301+
- GL context MSAA antialiasing is now DISABLED by default, to make the GL
53025302
behavior consistent with desktop usage.
53035303
- Added support to SDL, GLUT and GLFW libraries to specify MSAA on/off at startup.
53045304
- Implemented glColor4ubv in GL emulation mode.

tools/building.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def side_module_external_deps(external_symbols):
132132

133133

134134
def create_stub_object(external_symbols):
135-
"""Create a stub object, based on the JS libary symbols and their
135+
"""Create a stub object, based on the JS library symbols and their
136136
dependencies, that we can pass to wasm-ld.
137137
"""
138138
stubfile = shared.get_temp_files().get('libemscripten_js_symbols.so').name

tools/emscripten.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def update_settings_glue(wasm_file, metadata):
161161
settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$exitJS', '$handleException']
162162

163163
# When using dynamic linking the main function might be in a side module.
164-
# To be safe assume they do take input parametes.
164+
# To be safe assume they do take input parameters.
165165
settings.MAIN_READS_PARAMS = metadata.mainReadsParams or bool(settings.MAIN_MODULE)
166166
if settings.MAIN_READS_PARAMS and not settings.STANDALONE_WASM:
167167
# callMain depends on this library function
@@ -241,7 +241,7 @@ def report_missing_exports(js_symbols):
241241
for symbol in sorted(missing):
242242
diagnostics.warning('undefined', f'undefined exported symbol: "{symbol}"')
243243

244-
# Special hanlding for the `_main` symbol
244+
# Special handling for the `_main` symbol
245245

246246
if settings.STANDALONE_WASM:
247247
# standalone mode doesn't use main, and it always reports missing entry point at link time.
@@ -369,7 +369,7 @@ def emscript(in_wasm, out_wasm, outfile_js, js_syms, finalize=True):
369369
# them through node. Without this step, syntax errors are not surfaced
370370
# until runtime.
371371
# We use subprocess directly here rather than shared.check_call since
372-
# check_call doesn't support the `intput` argument.
372+
# check_call doesn't support the `input` argument.
373373
if asm_consts:
374374
validate = '\n'.join([f'var tmp = {f};' for _, f in asm_consts])
375375
proc = subprocess.run(config.NODE_JS + ['--check', '-'], input=validate.encode('utf-8'))
@@ -824,7 +824,7 @@ def install_wrapper(sym):
824824

825825

826826
def create_receiving(function_exports):
827-
# When not declaring asm exports this section is empty and we instead programatically export
827+
# When not declaring asm exports this section is empty and we instead programmatically export
828828
# symbols on the global object by calling exportWasmSymbols after initialization
829829
if not settings.DECLARE_ASM_MODULE_EXPORTS:
830830
return ''

tools/extract_metadata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ def get_main_reads_params(module, export_map):
231231

232232
main_func = module.get_function(main.index)
233233
if is_orig_main_wrapper(module, main_func):
234-
# If main is simple wrapper function then we know that __orginial_main
234+
# If main is simple wrapper function then we know that __original_main
235235
# doesn't read arguments.
236236
return False
237237

tools/link.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ def embed_memfile(options):
203203

204204
def generate_js_sym_info():
205205
# Runs the js compiler to generate a list of all symbols available in the JS
206-
# libraries. This must be done separately for each linker invokation since the
206+
# libraries. This must be done separately for each linker invocation since the
207207
# list of symbols depends on what settings are used.
208208
# TODO(sbc): Find a way to optimize this. Potentially we could add a super-set
209209
# mode of the js compiler that would generate a list of all possible symbols
@@ -348,7 +348,7 @@ def get_binaryen_passes(memfile):
348348
# sign-ext is enabled by default by llvm. If the target browser settings don't support
349349
# this we lower it away here using a binaryen pass.
350350
if not feature_matrix.caniuse(feature_matrix.Feature.SIGN_EXT):
351-
logger.debug('lowering sign-ext feature due to incompatiable target browser engines')
351+
logger.debug('lowering sign-ext feature due to incompatible target browser engines')
352352
passes += ['--signext-lowering']
353353
if optimizing:
354354
passes += ['--post-emscripten']
@@ -487,7 +487,7 @@ def get_worker_js_suffix():
487487

488488
def setup_pthreads(target):
489489
if settings.RELOCATABLE:
490-
# phtreads + dyanmic linking has certain limitations
490+
# pthreads + dynamic linking has certain limitations
491491
if settings.SIDE_MODULE:
492492
diagnostics.warning('experimental', '-sSIDE_MODULE + pthreads is experimental')
493493
elif settings.MAIN_MODULE:
@@ -596,7 +596,7 @@ def set_max_memory():
596596
def check_browser_versions():
597597
# Map of setting all VM version settings to the minimum version
598598
# we support.
599-
min_version_setttings = {
599+
min_version_settings = {
600600
'MIN_FIREFOX_VERSION': feature_matrix.OLDEST_SUPPORTED_FIREFOX,
601601
'MIN_CHROME_VERSION': feature_matrix.OLDEST_SUPPORTED_CHROME,
602602
'MIN_SAFARI_VERSION': feature_matrix.OLDEST_SUPPORTED_SAFARI,
@@ -605,10 +605,10 @@ def check_browser_versions():
605605

606606
if settings.LEGACY_VM_SUPPORT:
607607
# Default all browser versions to zero
608-
for key in min_version_setttings.keys():
608+
for key in min_version_settings.keys():
609609
default_setting(key, 0)
610610

611-
for key, oldest in min_version_setttings.items():
611+
for key, oldest in min_version_settings.items():
612612
if settings[key] != 0 and settings[key] < oldest:
613613
exit_with_error(f'{key} older than {oldest} is not supported')
614614

@@ -922,7 +922,7 @@ def phase_linker_setup(options, state, newargs):
922922
if settings.CLOSURE_WARNINGS not in ['quiet', 'warn', 'error']:
923923
exit_with_error('invalid option -sCLOSURE_WARNINGS=%s specified! Allowed values are "quiet", "warn" or "error".' % settings.CLOSURE_WARNINGS)
924924

925-
diagnostics.warning('deprecated', 'CLOSURE_WARNINGS is deprecated, use -Wclosure/-Wno-closure instread')
925+
diagnostics.warning('deprecated', 'CLOSURE_WARNINGS is deprecated, use -Wclosure/-Wno-closure instead')
926926
closure_warnings = diagnostics.manager.warnings['closure']
927927
if settings.CLOSURE_WARNINGS == 'error':
928928
closure_warnings['error'] = True
@@ -2031,7 +2031,7 @@ def phase_final_emitting(options, state, target, wasm_target, memfile):
20312031
# mode)
20322032
final_js = building.closure_compiler(final_js, advanced=False, extra_closure_args=options.closure_args)
20332033
# Run unsafe_optimizations.js once more. This allows the cleanup of newly
2034-
# unused things that closure compiler leaves behing (e.g `new Float64Array(x)`).
2034+
# unused things that closure compiler leaves behind (e.g `new Float64Array(x)`).
20352035
shared.run_js_tool(utils.path_from_root('tools/unsafe_optimizations.js'), [final_js, '-o', final_js], cwd=utils.path_from_root('.'))
20362036
save_intermediate('unsafe-optimizations2')
20372037

@@ -2744,7 +2744,7 @@ def process_dynamic_libs(dylibs, lib_dirs):
27442744
exports = webassembly.get_exports(dylib)
27452745
exports = set(e.name for e in exports)
27462746
# EM_JS function are exports with a special prefix. We need to strip
2747-
# this prefix to get the actaul symbol name. For the main module, this
2747+
# this prefix to get the actual symbol name. For the main module, this
27482748
# is handled by extract_metadata.py.
27492749
exports = [removeprefix(e, '__em_js__') for e in exports]
27502750
settings.SIDE_MODULE_EXPORTS.extend(sorted(exports))
@@ -2862,7 +2862,7 @@ def package_files(options, target):
28622862
js_manipulation.add_files_pre_js(settings.PRE_JS_FILES, file_code)
28632863
else:
28642864
# Otherwise, we are embedding files, which does not require --pre-js code,
2865-
# and instead relies on a static constrcutor to populate the filesystem.
2865+
# and instead relies on a static constructor to populate the filesystem.
28662866
shared.check_call(cmd)
28672867

28682868
return rtn

tools/system_libs.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ def join(flags):
228228
objects = []
229229
for src in input_files:
230230
# Resolve duplicates by appending unique.
231-
# This is needed on case insensitve filesystem to handle,
231+
# This is needed on case insensitive filesystem to handle,
232232
# for example, _exit.o and _Exit.o.
233233
object_basename = shared.unsuffixed_basename(src)
234234
if case_insensitive:
@@ -1173,7 +1173,7 @@ def get_files(self):
11731173

11741174
ignore = set(ignore)
11751175
for dirpath, dirnames, filenames in os.walk(musl_srcdir):
1176-
# Don't recurse into ingored directories
1176+
# Don't recurse into ignored directories
11771177
remove = [d for d in dirnames if d in ignore]
11781178
for r in remove:
11791179
dirnames.remove(r)
@@ -1393,7 +1393,7 @@ def get_cflags(self):
13931393
cflags = super().get_cflags()
13941394
if self.debug:
13951395
cflags += ['-D_DEBUG']
1396-
# library_wasm_worker.c contains an assert that a nonnull paramater
1396+
# library_wasm_worker.c contains an assert that a nonnull parameter
13971397
# is no NULL, which llvm now warns is redundant/tautological.
13981398
cflags += ['-Wno-tautological-pointer-compare']
13991399
# Override the `-O2` default. Building library_wasm_worker.c with
@@ -2399,7 +2399,7 @@ def install_system_headers(stamp):
23992399
# Copy the generic arch files first then
24002400
('lib', 'libc', 'musl', 'arch', 'generic'): '',
24012401
# Then overlay the emscripten directory on top.
2402-
# This mimicks how musl itself installs its headers.
2402+
# This mimics how musl itself installs its headers.
24032403
('lib', 'libc', 'musl', 'arch', 'emscripten'): '',
24042404
('lib', 'libc', 'musl', 'include'): '',
24052405
('lib', 'libcxx', 'include'): os.path.join('c++', 'v1'),

0 commit comments

Comments
 (0)