From 5ddeabd2d5aa075814b356f668cfbccd97515c07 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 6 Feb 2024 23:56:58 +0700 Subject: [PATCH] Fix some typos. --- ChangeLog.md | 28 ++++++++++++++-------------- tools/building.py | 2 +- tools/emscripten.py | 8 ++++---- tools/extract_metadata.py | 2 +- tools/link.py | 20 ++++++++++---------- tools/system_libs.py | 8 ++++---- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index caa1b73c1446c..ca86112be3adb 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -211,7 +211,7 @@ See docs/process.md for more on how version tagging works. 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 +- The `--minify=0` command line flag will now preserve comments as well as whitespace. This means the resulting output can then be run though closure compiler or some other tool that gives comments semantic meaning. (#20121) - `-sSTRICT` now implies `-sINCOMING_MODULE_API=[]` which is generally good @@ -876,7 +876,7 @@ See docs/process.md for more on how version tagging works. 3.1.2 - 01/20/2022 ------------------ - A new setting, `POLYFILL`, was added which is on by default but can be disabled - (via `-sNO_POLYFILL`) to prevent emscripten from outputing needed polyfills. + (via `-sNO_POLYFILL`) to prevent emscripten from outputting needed polyfills. For default browser targets, no polyfills are needed so this option only has meaning when targeting older browsers. - `EVAL_CTORS` has been rewritten and improved. The main differences from before @@ -1188,7 +1188,7 @@ See docs/process.md for more on how version tagging works. - When building with `-s MAIN_MODULE` emscripten will now error on undefined symbol by default. This matches the behvious of clang/gcc/msvc. This requires that your side modules be present on the command line. If you do not - specify your side modules on the command line (either direcly or via + specify your side modules on the command line (either directly or via `RUNTIME_LINKED_LIBS`) you may need to add `-s WARN_ON_UNDEFINED_SYMBOLS=0` to avoid errors about symbol that are missing at link time (but present in your side modules provided at runtime). We hope that this case is not common and @@ -1293,7 +1293,7 @@ See docs/process.md for more on how version tagging works. 2.0.15: 03/05/2021 ------------------ -- Calls to `newlocale` (and `new std::locale` in C++) with arbirary names will +- Calls to `newlocale` (and `new std::locale` in C++) with arbitrary names will now succeed. This is the behaviour of musl libc which emscripten had previously inadvertently disabled. - System libraries are now compiled with debug info (`-g`). This doesn't @@ -1310,7 +1310,7 @@ See docs/process.md for more on how version tagging works. 2.0.14: 02/14/2021 ------------------ - Add new setting: `REVERSE_DEPS`. This can be used to control how emscripten - decides which reverse dependecies to include. See `settings.js` for more + decides which reverse dependencies to include. See `settings.js` for more information. The default setting ('auto') is the traditional way emscripten has worked in the past so there should be no change unless this options is actually used. This option partially replaces the `EMCC_ONLY_FORCED_STDLIBS` @@ -1466,7 +1466,7 @@ See docs/process.md for more on how version tagging works. - Add new `COMPILER_WRAPPER` settings (with corresponding `EM_COMPILER_WRAPPER` environment variable. This replaces the existing `EMMAKEN_COMPILER` environment variable which is deprecated, but still works for the time being. - The main differences is that `EM_COMPILER_WRAPPER` only wrapps the configured + The main differences is that `EM_COMPILER_WRAPPER` only wraps the configured version of clang rather than replacing it. - ASAN_SHADOW_SIZE is deprecated. When using AddressSanitizer, the correct amount of shadow memory will now be calculated automatically. @@ -1478,7 +1478,7 @@ See docs/process.md for more on how version tagging works. - Fix a rare pthreads main thread deadlock (that worsened in 2.0.2, but existed before). (#12318) - The WebAssembly table is now created and exported by the generated wasm - module rather then constructed by the JS glue code. This is an implemention + module rather then constructed by the JS glue code. This is an implementation detail that should not affect most users, but reduces code size. (#12296) - Add `getentropy` in `sys/random.h`, and use that from libc++'s `random_device`. This is more efficient, see #12240. @@ -1626,7 +1626,7 @@ See docs/process.md for more on how version tagging works. `EM_FOO` this should be enough. - Running emscripten under python2 is now deprecated. It will show up as a warning (which can be disabled with `-Wno-deprecated`). Please update to - python3 as we hope to remove support completely in the next releaase. + python3 as we hope to remove support completely in the next release. 1.39.20: 07/20/2020 ------------------- @@ -2818,7 +2818,7 @@ v1.36.10: 9/24/2016 - Improved support for --proxy-to-worker build mode. - Improved GLES3 support for glGet() features that WebGL2 does not have. (#4514) - Added support for implementation defined glReadPixels() format. - - Improved WebGL 2 support with closure compilter. (#4554) + - Improved WebGL 2 support with closure compiler. (#4554) - Implemented support for nanosleep() when building in pthreads mode (#4578) - Added support for llvm_ceil_f64 and llvm_floor_f64 intrinsics. - Full list of changes: @@ -2852,7 +2852,7 @@ v1.36.8: 8/20/2016 options for wasm. - Added new emprofile.py script which can be used to profile toolchain wide performance. (#4491) - - Added new linker flag --output-eol, which specifices what kind of line + - Added new linker flag --output-eol, which specifies what kind of line endings to generate to the output files. (#4492) - Fixed a Windows bug where aborting execution with Ctrl-C might hang Emscripten to an infinite loop instead. (#4494) @@ -3743,7 +3743,7 @@ v1.30.2: 4/1/2015 v1.30.1: 3/24/2015 ------------------ - - Upgraded LLVM+Clang from vrsion 3.5 to version 3.6. + - Upgraded LLVM+Clang from version 3.5 to version 3.6. - Full list of changes: - Emscripten: https://github.com/emscripten-core/emscripten/compare/1.30.0...1.30.1 - Emscripten-LLVM: https://github.com/emscripten-core/emscripten-fastcomp/compare/1.30.0...1.30.1 @@ -4488,7 +4488,7 @@ v1.21.4: 7/17/2014 runtime. - Have runtime mkdir() function call normalize the path to be created before creation. - - Fixed an issue with omitting the third paramter in cwrap() call (#2511). + - Fixed an issue with omitting the third parameter in cwrap() call (#2511). - Fixed an issue where mouse event handling would throw an exception if the page did not contain a canvas object. - Fixed a GL initialization problem when user has extended Array with custom @@ -4514,7 +4514,7 @@ v1.21.3: 7/10/2014 - Added implementations for SDL function SDL_AudioQuit and SDL_VideoQuit. - Fix an issue with the optimizeShifts optimization enabled in previous version. - Fixed the -s RELOOPER command line parameter to work. - - Fixed a bug where building the system libc migt result in a compiler deadlock + - Fixed a bug where building the system libc might result in a compiler deadlock on Windows. - Removed emcc from trying to link in .dll files as static libraries on Windows. @@ -5292,7 +5292,7 @@ v1.7.0: 10/23/2013 - Several compiler stability fixes. - Adds a JavaScript implementation of cxa_demangle function for demangling call stack traces at runtime for easier debugging. - - GL context MSAA antialising is now DISABLED by default, to make the GL + - GL context MSAA antialiasing is now DISABLED by default, to make the GL behavior consistent with desktop usage. - Added support to SDL, GLUT and GLFW libraries to specify MSAA on/off at startup. - Implemented glColor4ubv in GL emulation mode. diff --git a/tools/building.py b/tools/building.py index 422281c00053e..daecb921610e4 100644 --- a/tools/building.py +++ b/tools/building.py @@ -132,7 +132,7 @@ def side_module_external_deps(external_symbols): def create_stub_object(external_symbols): - """Create a stub object, based on the JS libary symbols and their + """Create a stub object, based on the JS library symbols and their dependencies, that we can pass to wasm-ld. """ stubfile = shared.get_temp_files().get('libemscripten_js_symbols.so').name diff --git a/tools/emscripten.py b/tools/emscripten.py index a5a38a3b1439f..53e3c678f01dd 100644 --- a/tools/emscripten.py +++ b/tools/emscripten.py @@ -161,7 +161,7 @@ def update_settings_glue(wasm_file, metadata): settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$exitJS', '$handleException'] # When using dynamic linking the main function might be in a side module. - # To be safe assume they do take input parametes. + # To be safe assume they do take input parameters. settings.MAIN_READS_PARAMS = metadata.mainReadsParams or bool(settings.MAIN_MODULE) if settings.MAIN_READS_PARAMS and not settings.STANDALONE_WASM: # callMain depends on this library function @@ -241,7 +241,7 @@ def report_missing_exports(js_symbols): for symbol in sorted(missing): diagnostics.warning('undefined', f'undefined exported symbol: "{symbol}"') - # Special hanlding for the `_main` symbol + # Special handling for the `_main` symbol if settings.STANDALONE_WASM: # 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): # them through node. Without this step, syntax errors are not surfaced # until runtime. # We use subprocess directly here rather than shared.check_call since - # check_call doesn't support the `intput` argument. + # check_call doesn't support the `input` argument. if asm_consts: validate = '\n'.join([f'var tmp = {f};' for _, f in asm_consts]) proc = subprocess.run(config.NODE_JS + ['--check', '-'], input=validate.encode('utf-8')) @@ -824,7 +824,7 @@ def install_wrapper(sym): def create_receiving(function_exports): - # When not declaring asm exports this section is empty and we instead programatically export + # When not declaring asm exports this section is empty and we instead programmatically export # symbols on the global object by calling exportWasmSymbols after initialization if not settings.DECLARE_ASM_MODULE_EXPORTS: return '' diff --git a/tools/extract_metadata.py b/tools/extract_metadata.py index 2da50dfdbfa14..f9c05d501f1f5 100644 --- a/tools/extract_metadata.py +++ b/tools/extract_metadata.py @@ -231,7 +231,7 @@ def get_main_reads_params(module, export_map): main_func = module.get_function(main.index) if is_orig_main_wrapper(module, main_func): - # If main is simple wrapper function then we know that __orginial_main + # If main is simple wrapper function then we know that __original_main # doesn't read arguments. return False diff --git a/tools/link.py b/tools/link.py index d2ae78b489b7d..78563d4031dc4 100644 --- a/tools/link.py +++ b/tools/link.py @@ -203,7 +203,7 @@ def embed_memfile(options): def generate_js_sym_info(): # Runs the js compiler to generate a list of all symbols available in the JS - # libraries. This must be done separately for each linker invokation since the + # libraries. This must be done separately for each linker invocation since the # list of symbols depends on what settings are used. # TODO(sbc): Find a way to optimize this. Potentially we could add a super-set # mode of the js compiler that would generate a list of all possible symbols @@ -348,7 +348,7 @@ def get_binaryen_passes(memfile): # sign-ext is enabled by default by llvm. If the target browser settings don't support # this we lower it away here using a binaryen pass. if not feature_matrix.caniuse(feature_matrix.Feature.SIGN_EXT): - logger.debug('lowering sign-ext feature due to incompatiable target browser engines') + logger.debug('lowering sign-ext feature due to incompatible target browser engines') passes += ['--signext-lowering'] if optimizing: passes += ['--post-emscripten'] @@ -487,7 +487,7 @@ def get_worker_js_suffix(): def setup_pthreads(target): if settings.RELOCATABLE: - # phtreads + dyanmic linking has certain limitations + # pthreads + dynamic linking has certain limitations if settings.SIDE_MODULE: diagnostics.warning('experimental', '-sSIDE_MODULE + pthreads is experimental') elif settings.MAIN_MODULE: @@ -596,7 +596,7 @@ def set_max_memory(): def check_browser_versions(): # Map of setting all VM version settings to the minimum version # we support. - min_version_setttings = { + min_version_settings = { 'MIN_FIREFOX_VERSION': feature_matrix.OLDEST_SUPPORTED_FIREFOX, 'MIN_CHROME_VERSION': feature_matrix.OLDEST_SUPPORTED_CHROME, 'MIN_SAFARI_VERSION': feature_matrix.OLDEST_SUPPORTED_SAFARI, @@ -605,10 +605,10 @@ def check_browser_versions(): if settings.LEGACY_VM_SUPPORT: # Default all browser versions to zero - for key in min_version_setttings.keys(): + for key in min_version_settings.keys(): default_setting(key, 0) - for key, oldest in min_version_setttings.items(): + for key, oldest in min_version_settings.items(): if settings[key] != 0 and settings[key] < oldest: exit_with_error(f'{key} older than {oldest} is not supported') @@ -922,7 +922,7 @@ def phase_linker_setup(options, state, newargs): if settings.CLOSURE_WARNINGS not in ['quiet', 'warn', 'error']: exit_with_error('invalid option -sCLOSURE_WARNINGS=%s specified! Allowed values are "quiet", "warn" or "error".' % settings.CLOSURE_WARNINGS) - diagnostics.warning('deprecated', 'CLOSURE_WARNINGS is deprecated, use -Wclosure/-Wno-closure instread') + diagnostics.warning('deprecated', 'CLOSURE_WARNINGS is deprecated, use -Wclosure/-Wno-closure instead') closure_warnings = diagnostics.manager.warnings['closure'] if settings.CLOSURE_WARNINGS == 'error': closure_warnings['error'] = True @@ -2031,7 +2031,7 @@ def phase_final_emitting(options, state, target, wasm_target, memfile): # mode) final_js = building.closure_compiler(final_js, advanced=False, extra_closure_args=options.closure_args) # Run unsafe_optimizations.js once more. This allows the cleanup of newly - # unused things that closure compiler leaves behing (e.g `new Float64Array(x)`). + # unused things that closure compiler leaves behind (e.g `new Float64Array(x)`). shared.run_js_tool(utils.path_from_root('tools/unsafe_optimizations.js'), [final_js, '-o', final_js], cwd=utils.path_from_root('.')) save_intermediate('unsafe-optimizations2') @@ -2755,7 +2755,7 @@ def process_dynamic_libs(dylibs, lib_dirs): exports = webassembly.get_exports(dylib) exports = set(e.name for e in exports) # EM_JS function are exports with a special prefix. We need to strip - # this prefix to get the actaul symbol name. For the main module, this + # this prefix to get the actual symbol name. For the main module, this # is handled by extract_metadata.py. exports = [removeprefix(e, '__em_js__') for e in exports] settings.SIDE_MODULE_EXPORTS.extend(sorted(exports)) @@ -2873,7 +2873,7 @@ def package_files(options, target): js_manipulation.add_files_pre_js(settings.PRE_JS_FILES, file_code) else: # Otherwise, we are embedding files, which does not require --pre-js code, - # and instead relies on a static constrcutor to populate the filesystem. + # and instead relies on a static constructor to populate the filesystem. shared.check_call(cmd) return rtn diff --git a/tools/system_libs.py b/tools/system_libs.py index 2d1ccce42b67f..61a5ace7e42b8 100644 --- a/tools/system_libs.py +++ b/tools/system_libs.py @@ -228,7 +228,7 @@ def join(flags): objects = [] for src in input_files: # Resolve duplicates by appending unique. - # This is needed on case insensitve filesystem to handle, + # This is needed on case insensitive filesystem to handle, # for example, _exit.o and _Exit.o. object_basename = shared.unsuffixed_basename(src) if case_insensitive: @@ -1173,7 +1173,7 @@ def get_files(self): ignore = set(ignore) for dirpath, dirnames, filenames in os.walk(musl_srcdir): - # Don't recurse into ingored directories + # Don't recurse into ignored directories remove = [d for d in dirnames if d in ignore] for r in remove: dirnames.remove(r) @@ -1393,7 +1393,7 @@ def get_cflags(self): cflags = super().get_cflags() if self.debug: cflags += ['-D_DEBUG'] - # library_wasm_worker.c contains an assert that a nonnull paramater + # library_wasm_worker.c contains an assert that a nonnull parameter # is no NULL, which llvm now warns is redundant/tautological. cflags += ['-Wno-tautological-pointer-compare'] # Override the `-O2` default. Building library_wasm_worker.c with @@ -2399,7 +2399,7 @@ def install_system_headers(stamp): # Copy the generic arch files first then ('lib', 'libc', 'musl', 'arch', 'generic'): '', # Then overlay the emscripten directory on top. - # This mimicks how musl itself installs its headers. + # This mimics how musl itself installs its headers. ('lib', 'libc', 'musl', 'arch', 'emscripten'): '', ('lib', 'libc', 'musl', 'include'): '', ('lib', 'libcxx', 'include'): os.path.join('c++', 'v1'),