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.

diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c
index e1a2b614f57d2741d7b0f7160b6499596c197405..f7eab8d6fbb060dfea3c2adc5b74ea067a6efa6f 100644 (file)
--- a/src/env/__init_tls.c
+++ b/src/env/__init_tls.c
@@ -16,7 +16,6 @@ int __init_tp(void *p)
        if (!r) libc.can_do_threads = 1;
        libc.has_thread_pointer = 1;
        td->tid = td->pid = __syscall(SYS_set_tid_address, &td->tid);
-       td->errno_ptr = &td->errno_val;
        return 0;
 }
 

diff --git a/src/errno/__errno_location.c b/src/errno/__errno_location.c
index 841910764590db9ae00f75270d1356428458d114..49654efd9ef2f292d5b131f843f88717d0ac8b2d 100644 (file)
--- 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;
 }

diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h
index 2e910b3e640529c50b8777fd9b366fad92f8521a..650e8115a27d325e50df703d31e9fff2e1fba086 100644 (file)
--- a/src/internal/pthread_impl.h
+++ b/src/internal/pthread_impl.h
@@ -18,7 +18,7 @@ struct pthread {
        uintptr_t sysinfo;
        uintptr_t canary;
        pid_t tid, pid;
-       int tsd_used, errno_val, *errno_ptr;
+       int tsd_used, errno_val;
        volatile int cancel, canceldisable, cancelasync;
        int detached;
        unsigned char *map_base;

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index 7a2f172cc16857489d028ee00ca523b2a147e8b5..e9c8160a4f982b0be2ea4c902810c2350a91902a 100644 (file)
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -201,7 +201,6 @@ int pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attrp
        new->stack = stack;
        new->stack_size = stack - stack_limit;
        new->pid = self->pid;
-       new->errno_ptr = &new->errno_val;
        new->start = entry;
        new->start_arg = arg;
        new->self = new;