From 1e04052f49c8fa26213de2a0a7e9d43ad873d5a1 Mon Sep 17 00:00:00 2001
From: Jakob Kaivo <jkk@ung.org>
Date: Wed, 12 Aug 2020 13:26:50 -0400
Subject: migrate __errno() to using _perthread.h macros

---
 src/nonstd/__libc.c               |  5 -----
 src/nonstd/__libc_per_thread.c    | 11 +----------
 src/nonstd/__pthread_per_thread.c |  1 +
 3 files changed, 2 insertions(+), 15 deletions(-)

(limited to 'src/nonstd')

diff --git a/src/nonstd/__libc.c b/src/nonstd/__libc.c
index 9000dd46..0d8351ab 100644
--- a/src/nonstd/__libc.c
+++ b/src/nonstd/__libc.c
@@ -1,7 +1,5 @@
-#include "sys/types.h"
 #include "../_nonstd.h"
 #include "../locale/_locale.h"
-#include "../stdio/_stdio.h"
 
 void *__libc(LIBC_INTERNAL variable)
 {
@@ -11,9 +9,6 @@ void *__libc(LIBC_INTERNAL variable)
 	void *r = (void*)0;
 
 	switch (variable) {
-	case ERRNO:
-		return __libc_per_thread(ERRNO);
-
 	case THREAD_LOCALE:
 		r = __libc_per_thread(THREAD_LOCALE);
 		if (r) {
diff --git a/src/nonstd/__libc_per_thread.c b/src/nonstd/__libc_per_thread.c
index 38c7c610..ed399480 100644
--- a/src/nonstd/__libc_per_thread.c
+++ b/src/nonstd/__libc_per_thread.c
@@ -1,12 +1,6 @@
 #include "../_nonstd.h"
-#include "locale.h"
 #include "../locale/_locale.h"
-
-#if defined __STDC_VERSION__ && 201112L <= __STDC_VERSION__ && !defined __STDC_NO_THREADS__
-#define THREAD_LOCAL static _Thread_local
-#else
-#define THREAD_LOCAL static
-#endif
+#include "../_perthread.h"
 
 void *__libc_per_thread(LIBC_INTERNAL variable)
 {
@@ -14,9 +8,6 @@ void *__libc_per_thread(LIBC_INTERNAL variable)
 	THREAD_LOCAL struct __locale_t locale;
 
 	switch (variable) {
-	case ERRNO:
-		return &errno;
-
 	case THREAD_LOCALE:
 		return &locale;
 
diff --git a/src/nonstd/__pthread_per_thread.c b/src/nonstd/__pthread_per_thread.c
index 0f633a1b..9217a64a 100644
--- a/src/nonstd/__pthread_per_thread.c
+++ b/src/nonstd/__pthread_per_thread.c
@@ -24,4 +24,5 @@ static struct per_thread *per_thread(void)
 
 /*
 LINK(pthread)
+POSIX(199506)
 */
-- 
cgit v1.2.1