From f604a152c34812dad92d47ad8fbb8b2b768a3ce9 Mon Sep 17 00:00:00 2001 From: Heejin Ahn Date: Fri, 3 Jan 2025 23:17:31 -0800 Subject: [PATCH] Update LLVM libraries to LLVM 19.1.6 (#23294) Other than the version number in `libcxx/include/__config`, nothing has changed for our libraries, but this makes sure our libraries are up to date with the latest release. --- ChangeLog.md | 4 ++-- system/lib/compiler-rt/readme.txt | 4 ++-- system/lib/libcxx/include/__config | 2 +- system/lib/libcxx/readme.txt | 4 ++-- system/lib/libcxxabi/readme.txt | 4 ++-- system/lib/libunwind/readme.txt | 4 ++-- .../codesize/test_codesize_files_wasmfs.funcs | 14 +++++++------- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index fe37f2e976ab2..7bf5e0fca0385 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -20,8 +20,8 @@ See docs/process.md for more on how version tagging works. 4.0.0 (in development) ---------------------- -- compiler-rt, libcxx, and libcxxabi were updated to LLVM 19.1.4. (#22937 and - #22994) +- compiler-rt, libcxx, libcxxabi, and libunwind were updated to LLVM 19.1.6. + (#22937, #22994, and #23294) - The Wasm nontrapping-fptoint feature has been enabled by default. clang will generate nontrapping (saturating) float-to-int conversion instructions for C typecasts. This should have no effect on programs that do not have diff --git a/system/lib/compiler-rt/readme.txt b/system/lib/compiler-rt/readme.txt index 42b516365c85e..249f94016ba23 100644 --- a/system/lib/compiler-rt/readme.txt +++ b/system/lib/compiler-rt/readme.txt @@ -1,7 +1,7 @@ llvm's compiler-rt ------------------ -These files are from the llvm-project based on release 19.1.4. +These files are from the llvm-project based on release 19.1.6. We maintain a local fork of llvm-project that contains any emscripten specific patches: @@ -20,4 +20,4 @@ Modifications For a list of changes from upstream see the compiler-rt files that are part of: -/~https://github.com/llvm/llvm-project/compare/llvmorg-19.1.4...emscripten-core:emscripten-libs-19 +/~https://github.com/llvm/llvm-project/compare/llvmorg-19.1.6...emscripten-core:emscripten-libs-19 diff --git a/system/lib/libcxx/include/__config b/system/lib/libcxx/include/__config index a929db5d0f2d1..e97669bca411e 100644 --- a/system/lib/libcxx/include/__config +++ b/system/lib/libcxx/include/__config @@ -27,7 +27,7 @@ // _LIBCPP_VERSION represents the version of libc++, which matches the version of LLVM. // Given a LLVM release LLVM XX.YY.ZZ (e.g. LLVM 17.0.1 == 17.00.01), _LIBCPP_VERSION is // defined to XXYYZZ. -# define _LIBCPP_VERSION 190104 +# define _LIBCPP_VERSION 190106 # define _LIBCPP_CONCAT_IMPL(_X, _Y) _X##_Y # define _LIBCPP_CONCAT(_X, _Y) _LIBCPP_CONCAT_IMPL(_X, _Y) diff --git a/system/lib/libcxx/readme.txt b/system/lib/libcxx/readme.txt index 3e5b7b52e4e8d..e6ba3d33d3221 100755 --- a/system/lib/libcxx/readme.txt +++ b/system/lib/libcxx/readme.txt @@ -1,7 +1,7 @@ llvm's libcxx ------------- -These files are from the llvm-project based on release 19.1.4. +These files are from the llvm-project based on release 19.1.6. We maintain a local fork of llvm-project that contains any emscripten specific patches: @@ -20,4 +20,4 @@ Modifications For a list of changes from upstream see the libcxx files that are part of: -/~https://github.com/llvm/llvm-project/compare/llvmorg-19.1.4...emscripten-core:emscripten-libs-19 +/~https://github.com/llvm/llvm-project/compare/llvmorg-19.1.6...emscripten-core:emscripten-libs-19 diff --git a/system/lib/libcxxabi/readme.txt b/system/lib/libcxxabi/readme.txt index 9533ccf2c96c0..f4ac55e7e5b0e 100644 --- a/system/lib/libcxxabi/readme.txt +++ b/system/lib/libcxxabi/readme.txt @@ -1,7 +1,7 @@ llvm's libcxxabi ---------------- -These files are from the llvm-project based on release 19.1.4. +These files are from the llvm-project based on release 19.1.6. We maintain a local fork of llvm-project that contains any emscripten specific patches: @@ -20,4 +20,4 @@ Modifications For a list of changes from upstream see the libcxxabi files that are part of: -/~https://github.com/llvm/llvm-project/compare/llvmorg-19.1.4...emscripten-core:emscripten-libs-19 +/~https://github.com/llvm/llvm-project/compare/llvmorg-19.1.6...emscripten-core:emscripten-libs-19 diff --git a/system/lib/libunwind/readme.txt b/system/lib/libunwind/readme.txt index 70e23f3d0f0e1..df03b89696b91 100644 --- a/system/lib/libunwind/readme.txt +++ b/system/lib/libunwind/readme.txt @@ -1,7 +1,7 @@ llvm's libunwind ---------------- -These files are from the llvm-project based on release 19.1.4. +These files are from the llvm-project based on release 19.1.6. We maintain a local fork of llvm-project that contains any emscripten specific patches: @@ -20,4 +20,4 @@ Modifications For a list of changes from upstream see the libunwind files that are part of: -/~https://github.com/llvm/llvm-project/compare/llvmorg-19.1.4...emscripten-core:emscripten-libs-19 +/~https://github.com/llvm/llvm-project/compare/llvmorg-19.1.6...emscripten-core:emscripten-libs-19 diff --git a/test/other/codesize/test_codesize_files_wasmfs.funcs b/test/other/codesize/test_codesize_files_wasmfs.funcs index 1b9cf6654fa46..f623e63db651d 100644 --- a/test/other/codesize/test_codesize_files_wasmfs.funcs +++ b/test/other/codesize/test_codesize_files_wasmfs.funcs @@ -30,9 +30,9 @@ $__unlockfile $__wasm_call_ctors $abort $abort_message -$char*\20std::__2::__constexpr_memmove\5babi:nn190104\5d\28char*\2c\20char\20const*\2c\20std::__2::__element_count\29 -$decltype\28auto\29\20std::__2::__variant_detail::__visitation::__base::__dispatcher<0ul>::__dispatch\5babi:nn190104\5d>\2c\20int>\2c\20\28std::__2::__variant_detail::_Trait\291>::__destroy\5babi:nn190104\5d\28\29::'lambda'\28auto&\29&&\2c\20std::__2::__variant_detail::__base<\28std::__2::__variant_detail::_Trait\291\2c\20std::__2::vector>\2c\20int>&>\28auto\2c\20std::__2::__variant_detail::__base<\28std::__2::__variant_detail::_Trait\291\2c\20std::__2::vector>\2c\20int>&\29 -$decltype\28auto\29\20std::__2::__variant_detail::__visitation::__base::__dispatcher<1ul>::__dispatch\5babi:nn190104\5d>\2c\20\28std::__2::__variant_detail::_Trait\291>::__destroy\5babi:nn190104\5d\28\29::'lambda'\28auto&\29&&\2c\20std::__2::__variant_detail::__base<\28std::__2::__variant_detail::_Trait\291\2c\20long\2c\20std::__2::shared_ptr>&>\28auto\2c\20std::__2::__variant_detail::__base<\28std::__2::__variant_detail::_Trait\291\2c\20long\2c\20std::__2::shared_ptr>&\29 +$char*\20std::__2::__constexpr_memmove\5babi:nn190106\5d\28char*\2c\20char\20const*\2c\20std::__2::__element_count\29 +$decltype\28auto\29\20std::__2::__variant_detail::__visitation::__base::__dispatcher<0ul>::__dispatch\5babi:nn190106\5d>\2c\20int>\2c\20\28std::__2::__variant_detail::_Trait\291>::__destroy\5babi:nn190106\5d\28\29::'lambda'\28auto&\29&&\2c\20std::__2::__variant_detail::__base<\28std::__2::__variant_detail::_Trait\291\2c\20std::__2::vector>\2c\20int>&>\28auto\2c\20std::__2::__variant_detail::__base<\28std::__2::__variant_detail::_Trait\291\2c\20std::__2::vector>\2c\20int>&\29 +$decltype\28auto\29\20std::__2::__variant_detail::__visitation::__base::__dispatcher<1ul>::__dispatch\5babi:nn190106\5d>\2c\20\28std::__2::__variant_detail::_Trait\291>::__destroy\5babi:nn190106\5d\28\29::'lambda'\28auto&\29&&\2c\20std::__2::__variant_detail::__base<\28std::__2::__variant_detail::_Trait\291\2c\20long\2c\20std::__2::shared_ptr>&>\28auto\2c\20std::__2::__variant_detail::__base<\28std::__2::__variant_detail::_Trait\291\2c\20long\2c\20std::__2::shared_ptr>&\29 $dummy $emscripten_builtin_malloc $fflush @@ -69,15 +69,15 @@ $std::__2::__shared_ptr_emplace\2c\20std::__2::allocator>\2c\20wasmfs::Directory::DCacheEntry>\2c\20std::__2::__map_value_compare\2c\20std::__2::allocator>\2c\20std::__2::__value_type\2c\20std::__2::allocator>\2c\20wasmfs::Directory::DCacheEntry>\2c\20std::__2::less\2c\20std::__2::allocator>>\2c\20true>\2c\20std::__2::allocator\2c\20std::__2::allocator>\2c\20wasmfs::Directory::DCacheEntry>>>::destroy\28std::__2::__tree_node\2c\20std::__2::allocator>\2c\20wasmfs::Directory::DCacheEntry>\2c\20void*>*\29 -$std::__2::allocation_result\20std::__2::allocator_traits>::allocate_at_least\5babi:nn190104\5d>\28std::__2::allocator&\2c\20unsigned\20long\29 +$std::__2::allocation_result\20std::__2::allocator_traits>::allocate_at_least\5babi:nn190106\5d>\28std::__2::allocator&\2c\20unsigned\20long\29 $std::__2::basic_string\2c\20std::__2::allocator>&\20std::__2::basic_string\2c\20std::__2::allocator>::__assign_no_alias\28char\20const*\2c\20unsigned\20long\29 $std::__2::basic_string\2c\20std::__2::allocator>&\20std::__2::basic_string\2c\20std::__2::allocator>::__assign_no_alias\28char\20const*\2c\20unsigned\20long\29 -$std::__2::basic_string\2c\20std::__2::allocator>::__annotate_increase\5babi:nn190104\5d\28unsigned\20long\29\20const +$std::__2::basic_string\2c\20std::__2::allocator>::__annotate_increase\5babi:nn190106\5d\28unsigned\20long\29\20const $std::__2::basic_string\2c\20std::__2::allocator>::__grow_by_and_replace\28unsigned\20long\2c\20unsigned\20long\2c\20unsigned\20long\2c\20unsigned\20long\2c\20unsigned\20long\2c\20unsigned\20long\2c\20char\20const*\29 $std::__2::basic_string\2c\20std::__2::allocator>::__init_copy_ctor_external\28char\20const*\2c\20unsigned\20long\29 -$std::__2::shared_ptr\20std::__2::make_shared\5babi:nn190104\5d\28\29 +$std::__2::shared_ptr\20std::__2::make_shared\5babi:nn190106\5d\28\29 $std::__2::vector>::__append\28unsigned\20long\29 -$std::__2::vector>::erase\5babi:nn190104\5d\28std::__2::__wrap_iter\29 +$std::__2::vector>::erase\5babi:nn190106\5d\28std::__2::__wrap_iter\29 $strlen $wasmfs::DataFile::Handle::flush\28\29 $wasmfs::DataFile::Handle::write\28unsigned\20char\20const*\2c\20unsigned\20long\2c\20long\20long\29