about summary refs log tree commit diff
path: root/src/errno
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2014-06-10 04:49:49 -0400
committerRich Felker <dalias@aerifal.cx>2014-06-10 04:49:49 -0400
commitac31bf278d9ed855e6765bb71d64ed19d2b7c0f8 (patch)
tree7bb84ee108a4ce18d69164e3bd28ca5f586f9d30 /src/errno
parentdf15168cf8baf34fb9c94e19eaa1a5c79c853970 (diff)
downloadmusl-ac31bf278d9ed855e6765bb71d64ed19d2b7c0f8.tar.gz
musl-ac31bf278d9ed855e6765bb71d64ed19d2b7c0f8.tar.xz
musl-ac31bf278d9ed855e6765bb71d64ed19d2b7c0f8.zip
simplify errno implementation
the motivation for the errno_ptr field in the thread structure, which
this commit removes, was to allow the main thread's errno to keep its
address when lazy thread pointer initialization was used. &errno was
evaluated prior to setting up the thread pointer and stored in
errno_ptr for the main thread; subsequently created threads would have
errno_ptr pointing to their own errno_val in the thread structure.

since lazy initialization was removed, there is no need for this extra
level of indirection; __errno_location can simply return the address
of the thread's errno_val directly. this does cause &errno to change,
but the change happens before entry to application code, and thus is
not observable.
Diffstat (limited to 'src/errno')
-rw-r--r--src/errno/__errno_location.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/errno/__errno_location.c b/src/errno/__errno_location.c
index 84191076..49654efd 100644
--- a/src/errno/__errno_location.c
+++ b/src/errno/__errno_location.c
@@ -3,6 +3,6 @@
 int *__errno_location(void)
 {
 	static int e;
-	if (libc.has_thread_pointer) return __pthread_self()->errno_ptr;
+	if (libc.has_thread_pointer) return &__pthread_self()->errno_val;
 	return &e;
 }