Skip to content
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
1 change: 1 addition & 0 deletions .style.yapf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[style]
based_on_style = pep8
indent_width = 2
continuation_indent_width = 2
228 changes: 114 additions & 114 deletions embuilder.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,125 +27,125 @@

# Minimal subset of targets used by CI systems to build enough to be useful
MINIMAL_TASKS = [
'libclang_rt.builtins',
'libclang_rt.builtins-mt',
'libclang_rt.builtins-legacysjlj',
'libclang_rt.builtins-wasmsjlj',
'libclang_rt.builtins-ww',
'libclang_rt.asan',
'libclang_rt.asan-mt',
'libclang_rt.lsan',
'libclang_rt.lsan-mt',
'libclang_rt.lsan_common',
'libclang_rt.lsan_common-mt',
'libclang_rt.sanitizer_common',
'libclang_rt.sanitizer_common-mt',
'libclang_rt.ubsan',
'libclang_rt.ubsan-mt',
'libc',
'libc-asan-debug',
'libc-debug',
'libc-mt-debug',
'libc-mt-asan-debug',
'libc-ww-debug',
'libc_optz',
'libc_optz-debug',
'libc++abi',
'libc++abi-legacyexcept',
'libc++abi-wasmexcept',
'libc++abi-noexcept',
'libc++abi-debug',
'libc++abi-debug-legacyexcept',
'libc++abi-debug-wasmexcept',
'libc++abi-debug-noexcept',
'libc++abi-debug-mt-noexcept',
'libc++abi-debug-ww-noexcept',
'libc++',
'libc++-legacyexcept',
'libc++-wasmexcept',
'libc++-noexcept',
'libc++-ww-noexcept',
'libc++-debug',
'libc++-debug-wasmexcept',
'libc++-debug-legacyexcept',
'libc++-debug-noexcept',
'libc++-debug-mt-noexcept',
'libc++-debug-ww-noexcept',
'libal',
'libdlmalloc',
'libdlmalloc-tracing',
'libdlmalloc-debug',
'libdlmalloc-mt-debug',
'libdlmalloc-ww',
'libdlmalloc-ww-debug',
'libembind',
'libembind-rtti',
'libembind-mt-rtti',
'libemmalloc',
'libemmalloc-debug',
'libemmalloc-memvalidate',
'libemmalloc-verbose',
'libemmalloc-memvalidate-verbose',
'libmimalloc',
'libmimalloc-mt',
'libGL',
'libGL-getprocaddr',
'libGL-mt-getprocaddr',
'libGL-emu-getprocaddr',
'libGL-emu-webgl2-ofb-getprocaddr',
'libGL-webgl2-ofb-getprocaddr',
'libGL-webgl2-ofb-full_es3-getprocaddr',
'libGL-ww-getprocaddr',
'libhtml5',
'libsockets',
'libsockets-mt',
'libsockets-ww',
'libstubs',
'libstubs-debug',
'libstandalonewasm-nocatch',
'crt1',
'crt1_proxy_main',
'crtbegin-mt',
'libunwind-legacyexcept',
'libunwind-wasmexcept',
'libnoexit',
'bullet',
'libstb_image',
'libwasmfs_no_fs',
'libwasmfs-debug',
'libwasm_workers-debug',
'libclang_rt.builtins',
'libclang_rt.builtins-mt',
'libclang_rt.builtins-legacysjlj',
'libclang_rt.builtins-wasmsjlj',
'libclang_rt.builtins-ww',
'libclang_rt.asan',
'libclang_rt.asan-mt',
'libclang_rt.lsan',
'libclang_rt.lsan-mt',
'libclang_rt.lsan_common',
'libclang_rt.lsan_common-mt',
'libclang_rt.sanitizer_common',
'libclang_rt.sanitizer_common-mt',
'libclang_rt.ubsan',
'libclang_rt.ubsan-mt',
'libc',
'libc-asan-debug',
'libc-debug',
'libc-mt-debug',
'libc-mt-asan-debug',
'libc-ww-debug',
'libc_optz',
'libc_optz-debug',
'libc++abi',
'libc++abi-legacyexcept',
'libc++abi-wasmexcept',
'libc++abi-noexcept',
'libc++abi-debug',
'libc++abi-debug-legacyexcept',
'libc++abi-debug-wasmexcept',
'libc++abi-debug-noexcept',
'libc++abi-debug-mt-noexcept',
'libc++abi-debug-ww-noexcept',
'libc++',
'libc++-legacyexcept',
'libc++-wasmexcept',
'libc++-noexcept',
'libc++-ww-noexcept',
'libc++-debug',
'libc++-debug-wasmexcept',
'libc++-debug-legacyexcept',
'libc++-debug-noexcept',
'libc++-debug-mt-noexcept',
'libc++-debug-ww-noexcept',
'libal',
'libdlmalloc',
'libdlmalloc-tracing',
'libdlmalloc-debug',
'libdlmalloc-mt-debug',
'libdlmalloc-ww',
'libdlmalloc-ww-debug',
'libembind',
'libembind-rtti',
'libembind-mt-rtti',
'libemmalloc',
'libemmalloc-debug',
'libemmalloc-memvalidate',
'libemmalloc-verbose',
'libemmalloc-memvalidate-verbose',
'libmimalloc',
'libmimalloc-mt',
'libGL',
'libGL-getprocaddr',
'libGL-mt-getprocaddr',
'libGL-emu-getprocaddr',
'libGL-emu-webgl2-ofb-getprocaddr',
'libGL-webgl2-ofb-getprocaddr',
'libGL-webgl2-ofb-full_es3-getprocaddr',
'libGL-ww-getprocaddr',
'libhtml5',
'libsockets',
'libsockets-mt',
'libsockets-ww',
'libstubs',
'libstubs-debug',
'libstandalonewasm-nocatch',
'crt1',
'crt1_proxy_main',
'crtbegin-mt',
'libunwind-legacyexcept',
'libunwind-wasmexcept',
'libnoexit',
'bullet',
'libstb_image',
'libwasmfs_no_fs',
'libwasmfs-debug',
'libwasm_workers-debug',
]

# Additional tasks on top of MINIMAL_TASKS that are necessary for PIC testing on
# CI (which has slightly more tests than other modes that want to use MINIMAL)
MINIMAL_PIC_TASKS = [
*MINIMAL_TASKS,
'libc-mt',
'libc_optz-mt',
'libc_optz-mt-debug',
'libc++abi-mt',
'libc++abi-mt-noexcept',
'libc++abi-debug-mt',
'libc++-mt',
'libc++-mt-noexcept',
'libc++-debug-mt',
'libdlmalloc-mt',
'libGL-emu',
'libGL-emu-webgl2-getprocaddr',
'libGL-mt-emu',
'libGL-mt-emu-webgl2-getprocaddr',
'libGL-mt-emu-webgl2-ofb-getprocaddr',
'libsockets_proxy',
'libfetch',
'libfetch-mt',
'libwasmfs',
'giflib',
'sdl2',
'sdl2_image',
'sdl2_image-legacysjlj',
'sdl2_image-wasmsjlj',
'sdl2_gfx',
'sdl3',
*MINIMAL_TASKS,
'libc-mt',
'libc_optz-mt',
'libc_optz-mt-debug',
'libc++abi-mt',
'libc++abi-mt-noexcept',
'libc++abi-debug-mt',
'libc++-mt',
'libc++-mt-noexcept',
'libc++-debug-mt',
'libdlmalloc-mt',
'libGL-emu',
'libGL-emu-webgl2-getprocaddr',
'libGL-mt-emu',
'libGL-mt-emu-webgl2-getprocaddr',
'libGL-mt-emu-webgl2-ofb-getprocaddr',
'libsockets_proxy',
'libfetch',
'libfetch-mt',
'libwasmfs',
'giflib',
'sdl2',
'sdl2_image',
'sdl2_image-legacysjlj',
'sdl2_image-wasmsjlj',
'sdl2_gfx',
'sdl3',
]

PORTS = sorted(list(ports.ports_by_name.keys()) + list(ports.port_variants.keys()))
Expand Down
14 changes: 7 additions & 7 deletions emcc.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@
} | PREPROCESSED_EXTENSIONS

LINK_ONLY_FLAGS = {
'--bind', '--closure', '--cpuprofiler', '--embed-file',
'--emit-symbol-map', '--emrun', '--exclude-file', '--extern-post-js',
'--extern-pre-js', '--ignore-dynamic-linking', '--js-library',
'--js-transform', '--oformat', '--output_eol', '--output-eol',
'--post-js', '--pre-js', '--preload-file', '--profiling-funcs',
'--proxy-to-worker', '--shell-file', '--source-map-base',
'--threadprofiler', '--use-preload-plugins',
'--bind', '--closure', '--cpuprofiler', '--embed-file',
'--emit-symbol-map', '--emrun', '--exclude-file', '--extern-post-js',
'--extern-pre-js', '--ignore-dynamic-linking', '--js-library',
'--js-transform', '--oformat', '--output_eol', '--output-eol',
'--post-js', '--pre-js', '--preload-file', '--profiling-funcs',
'--proxy-to-worker', '--shell-file', '--source-map-base',
'--threadprofiler', '--use-preload-plugins',
}

PASSTHROUGH_FLAGS = {
Expand Down
20 changes: 10 additions & 10 deletions system/lib/update_compiler_rt.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
local_src = os.path.join(script_dir, 'compiler-rt')

copy_dirs = [
('include', 'sanitizer'),
('include', 'profile'),
('lib', 'sanitizer_common'),
('lib', 'asan'),
('lib', 'interception'),
('lib', 'builtins'),
('lib', 'lsan'),
('lib', 'ubsan'),
('lib', 'ubsan_minimal'),
('lib', 'profile'),
('include', 'sanitizer'),
('include', 'profile'),
('lib', 'sanitizer_common'),
('lib', 'asan'),
('lib', 'interception'),
('lib', 'builtins'),
('lib', 'lsan'),
('lib', 'ubsan'),
('lib', 'ubsan_minimal'),
('lib', 'profile'),
]

preserve_files = ('readme.txt',)
Expand Down
50 changes: 25 additions & 25 deletions system/lib/update_llvm_libc.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,36 +21,36 @@
excludes = ('CMakeLists.txt', 'ryu_long_double_constants.h')

libc_copy_dirs = [
'hdr',
'include/llvm-libc-macros',
'include/llvm-libc-types',
'shared',
'config',
'src/__support',
'src/assert',
'src/complex',
'src/errno',
'src/inttypes',
'src/math',
'src/setjmp',
'src/stdio/printf_core',
'src/stdlib',
'src/string',
'src/strings',
'src/wchar',
'hdr',
'include/llvm-libc-macros',
'include/llvm-libc-types',
'shared',
'config',
'src/__support',
'src/assert',
'src/complex',
'src/errno',
'src/inttypes',
'src/math',
'src/setjmp',
'src/stdio/printf_core',
'src/stdlib',
'src/string',
'src/strings',
'src/wchar',
]

libc_exclusion_patterns = [
# float16 is unsupported in Emscripten.
'src/complex/**/*f16*',
'src/math/generic/*f16*',
# float16 is unsupported in Emscripten.
'src/complex/**/*f16*',
'src/math/generic/*f16*',

'src/setjmp/**/*', # setjmp in Emscripten is implemented by the clang backend.
'src/setjmp/**/*', # setjmp in Emscripten is implemented by the clang backend.

# locale_t is unsupported in Overlay Mode.
'src/strings/str*casecmp_l*',
'src/stdlib/str*_l.*',
'src/string/str*_l.*',
# locale_t is unsupported in Overlay Mode.
'src/strings/str*casecmp_l*',
'src/stdlib/str*_l.*',
'src/string/str*_l.*',
]


Expand Down
Loading
Loading