summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2020-08-30 21:30:37 -0400
committerRich Felker <dalias@aerifal.cx>2020-08-30 21:30:37 -0400
commitcf27184d00c1588eccac71a3bc89c9798e60bbd9 (patch)
treeda4a97411eaf7a9f307fbf8aaab2ec0a959882ef
parentcab0a8fb8d9a1095de3e4c2227bfc37fae93f781 (diff)
downloadmusl-cf27184d00c1588eccac71a3bc89c9798e60bbd9.tar.gz
musl-cf27184d00c1588eccac71a3bc89c9798e60bbd9.tar.bz2
musl-cf27184d00c1588eccac71a3bc89c9798e60bbd9.tar.xz
musl-cf27184d00c1588eccac71a3bc89c9798e60bbd9.zip
restore h_errno ABI compatibility with ancient binaries
prior to commit e68c51ac46a9f273927aef8dcebc89912ab19ece, h_errno was actually an external data object not a macro. bring back the symbol, and use it as the storage for the main thread's h_errno. technically this still doesn't provide full compatibility if the application was multithreaded, but at the time there were no res_* functions (and they did not set h_errno anyway), so any use of h_errno would have been via thread-unsafe functions. thus a solution that just fixes single-threaded applications seems acceptable.
-rw-r--r--src/network/h_errno.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/h_errno.c b/src/network/h_errno.c
index 8677a92b..638f7718 100644
--- a/src/network/h_errno.c
+++ b/src/network/h_errno.c
@@ -1,7 +1,11 @@
#include <netdb.h>
#include "pthread_impl.h"
+#undef h_errno
+int h_errno;
+
int *__h_errno_location(void)
{
+ if (!__pthread_self()->stack) return &h_errno;
return &__pthread_self()->h_errno_val;
}