about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorptitSeb <sebastien.chev@gmail.com>2022-03-31 11:01:15 +0200
committerptitSeb <sebastien.chev@gmail.com>2022-03-31 11:01:15 +0200
commit18a1cc77d49a0dcfb1f5f00c293bcdd6f0d21821 (patch)
tree0ab59df5211b2e49e2c891e752b90b03afafa7d7
parent370286ee25efee1af73987d8b17d67a5b2c33227 (diff)
downloadbox64-18a1cc77d49a0dcfb1f5f00c293bcdd6f0d21821.tar.gz
box64-18a1cc77d49a0dcfb1f5f00c293bcdd6f0d21821.zip
Update test10 (it was a bit flaky), update libstdc++ binary, and added fake __libc_single_threadedhandling
-rwxr-xr-xsrc/wrapped/wrappedlibc.c3
-rwxr-xr-xsrc/wrapped/wrappedlibc_private.h2
-rwxr-xr-xtests/test10bin45776 -> 168496 bytes
-rw-r--r--tests/test10.cpp1
-rw-r--r--x64lib/libgcc_s.so.1bin100712 -> 125344 bytes
-rw-r--r--x64lib/libstdc++.so.6bin1570256 -> 2202728 bytes
6 files changed, 6 insertions, 0 deletions
diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c
index 4d2f2b1c..9cb00857 100755
--- a/src/wrapped/wrappedlibc.c
+++ b/src/wrapped/wrappedlibc.c
@@ -2726,6 +2726,9 @@ EXPORT char* my___progname_full = NULL;
 EXPORT char* my_program_invocation_name = NULL;
 EXPORT char* my_program_invocation_short_name = NULL;
 
+// ignoring this for now
+EXPORT char my___libc_single_threaded = 0;
+
 #define PRE_INIT\
     if(box64_tcmalloc_minimal)                                      \
         lib->priv.w.lib = dlopen(NULL, RTLD_LAZY | RTLD_GLOBAL);    \
diff --git a/src/wrapped/wrappedlibc_private.h b/src/wrapped/wrappedlibc_private.h
index a3691d83..eed71f36 100755
--- a/src/wrapped/wrappedlibc_private.h
+++ b/src/wrapped/wrappedlibc_private.h
@@ -2301,4 +2301,6 @@ GOM(__deregister_frame_info, pFp)
 DATAM(program_invocation_name, sizeof(void*))
 DATAM(program_invocation_short_name, sizeof(void*))
 
+DATAM(__libc_single_threaded, 1)
+
 GO(iconvctl, iFlip)
\ No newline at end of file
diff --git a/tests/test10 b/tests/test10
index 77185b2a..2daa4871 100755
--- a/tests/test10
+++ b/tests/test10
Binary files differdiff --git a/tests/test10.cpp b/tests/test10.cpp
index f3c61316..90e1da60 100644
--- a/tests/test10.cpp
+++ b/tests/test10.cpp
@@ -11,6 +11,7 @@ std::stringstream stream;
 void append_number(int x) {
   while (lock_stream[x].load()) {}
   stream << "thread #" << x << '\n';
+  stream.flush();
   if (x != 9) lock_stream[x + 1].store(false);
 }
 
diff --git a/x64lib/libgcc_s.so.1 b/x64lib/libgcc_s.so.1
index 10f66184..2831c461 100644
--- a/x64lib/libgcc_s.so.1
+++ b/x64lib/libgcc_s.so.1
Binary files differdiff --git a/x64lib/libstdc++.so.6 b/x64lib/libstdc++.so.6
index c47b099c..ba0be467 100644
--- a/x64lib/libstdc++.so.6
+++ b/x64lib/libstdc++.so.6
Binary files differ