Skip to content

Commit a7e28e6

Browse files
committed
Fix thinlto tests
Many thintlo tests were broken by a recent change to how musl accesses the current local (#26486). See #26506
1 parent c790379 commit a7e28e6

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,7 @@ jobs:
705705
lto0.test_exceptions_allowed_uncaught
706706
lto0.test_longjmp_standalone_standalone
707707
lto0.test_embind_i64_val
708+
thinlto0.test_pthread_dlsym
708709
core3
709710
core2g.test_externref
710711
corez.test_dylink_iostream

test/codesize/test_codesize_cxx_lto.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.out.js": 18562,
33
"a.out.js.gz": 7668,
4-
"a.out.nodebug.wasm": 101956,
5-
"a.out.nodebug.wasm.gz": 39461,
6-
"total": 120518,
7-
"total_gz": 47129,
4+
"a.out.nodebug.wasm": 101954,
5+
"a.out.nodebug.wasm.gz": 39462,
6+
"total": 120516,
7+
"total_gz": 47130,
88
"sent": [
99
"a (emscripten_resize_heap)",
1010
"b (_setitimer_js)",

tools/system_libs.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,6 +1080,8 @@ class libc(MuslInternalLibrary,
10801080

10811081
def __init__(self, **kwargs):
10821082
self.non_lto_files = self.get_libcall_files()
1083+
# TODO(https://github.com/emscripten-core/emscripten/issues/26506)
1084+
self.non_lto_files.append(utils.path_from_root('system/lib/libc/musl/src/locale/uselocale.c'))
10831085
super().__init__(**kwargs)
10841086

10851087
def get_libcall_files(self):

0 commit comments

Comments
 (0)