--- Libc/Libc-1725.40.4/gen/confstr.c
+++ Libc/Libc-583/gen/confstr.c
@@ -64,47 +64,9 @@
 #include <unistd.h>
 #include <stdio.h>	/* for P_tmpdir */
 
-#ifndef __has_include
 #include <dirhelper_priv.h>
-#else
-#if __has_include(<dirhelper_priv.h>)
-#include <dirhelper_priv.h>
-#else
-typedef enum {
-    DIRHELPER_USER_LOCAL = 0,
-    DIRHELPER_USER_LOCAL_TEMP,
-    DIRHELPER_USER_LOCAL_CACHE,
-    DIRHELPER_USER_LOCAL_LAST = DIRHELPER_USER_LOCAL_CACHE
-} dirhelper_which_t;
-#endif
-#endif
-
-#include "_libc_init.h" // for _libc_functions->dirhelper
-
-#if __DARWIN_UNIX03
-static char *(*__dirhelper_func)(int, char *, size_t);
-
-__attribute__((__visibility__("hidden")))
-void
-__confstr_init(const struct _libc_functions *funcs)
-{
-	__dirhelper_func = funcs->dirhelper;
-}
-
-__attribute__((__visibility__("hidden")))
-char *
-__dirhelper(dirhelper_which_t which, char *path, size_t pathlen)
-{
-	if (__dirhelper_func) {
-		return __dirhelper_func(which, path, pathlen);
-	} else {
-		return NULL;
-	}
-}
-#else // !__DARWIN_UNIX03
-__attribute__((__visibility__("hidden")))
-char *__dirhelper(dirhelper_which_t which, char *path, size_t pathlen);
-#endif // !__DARWIN_UNIX03
+
+extern char *_dirhelper(dirhelper_which_t which, char *path, size_t pathlen);
 
 #if __DARWIN_UNIX03
 #define CONFSTR_ERR_RET	0
@@ -113,7 +75,10 @@
 #endif /* __DARWIN_UNIX03 */
 
 size_t
-confstr(int name, char *buf, size_t len)
+confstr(name, buf, len)
+	int name;
+	char *buf;
+	size_t len;
 {
 	size_t tlen;
 	int mib[2], sverrno;
@@ -155,15 +120,33 @@
 
 	case _CS_XBS5_ILP32_OFF32_LINTFLAGS:		/* legacy */
 
+	case _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS:
+	case _CS_XBS5_ILP32_OFFBIG_CFLAGS:		/* legacy */
+
+	case _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS:
+	case _CS_XBS5_ILP32_OFFBIG_LDFLAGS:		/* legacy */
+
 	case _CS_POSIX_V6_ILP32_OFFBIG_LIBS:
 	case _CS_XBS5_ILP32_OFFBIG_LIBS:		/* legacy */
 
 	case _CS_XBS5_ILP32_OFFBIG_LINTFLAGS:		/* legacy */
 
+	case _CS_POSIX_V6_LP64_OFF64_CFLAGS:
+	case _CS_XBS5_LP64_OFF64_CFLAGS:		/* legacy */
+
+	case _CS_POSIX_V6_LP64_OFF64_LDFLAGS:
+	case _CS_XBS5_LP64_OFF64_LDFLAGS:		/* legacy */
+
 	case _CS_POSIX_V6_LP64_OFF64_LIBS:
 	case _CS_XBS5_LP64_OFF64_LIBS:			/* legacy */
 
 	case _CS_XBS5_LP64_OFF64_LINTFLAGS:		/* legacy */
+
+	case _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS:
+	case _CS_XBS5_LPBIG_OFFBIG_CFLAGS:		/* legacy */
+
+	case _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS:
+	case _CS_XBS5_LPBIG_OFFBIG_LDFLAGS:		/* legacy */
 
 	case _CS_POSIX_V6_LPBIG_OFFBIG_LIBS:
 	case _CS_XBS5_LPBIG_OFFBIG_LIBS:		/* legacy */
@@ -171,28 +154,6 @@
 	case _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS:		/* legacy */
 		/* No special flags... yet */
 		p = "";
-		goto docopy;
-
-	case _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS:
-	case _CS_XBS5_ILP32_OFFBIG_CFLAGS:		/* legacy */
-
-	case _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS:
-	case _CS_XBS5_ILP32_OFFBIG_LDFLAGS:		/* legacy */
-		p = "-W 32";
-		goto docopy;
-
-	case _CS_POSIX_V6_LP64_OFF64_CFLAGS:
-	case _CS_XBS5_LP64_OFF64_CFLAGS:		/* legacy */
-
-	case _CS_POSIX_V6_LP64_OFF64_LDFLAGS:
-	case _CS_XBS5_LP64_OFF64_LDFLAGS:		/* legacy */
-
-	case _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS:
-	case _CS_XBS5_LPBIG_OFFBIG_CFLAGS:		/* legacy */
-
-	case _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS:
-	case _CS_XBS5_LPBIG_OFFBIG_LDFLAGS:		/* legacy */
-		p = "-W 64";
 		goto docopy;
 
 	case _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS:
@@ -211,11 +172,8 @@
 			errno = ENOMEM;
 			return (CONFSTR_ERR_RET);
 		}
-		if (__dirhelper(DIRHELPER_USER_LOCAL, p, PATH_MAX) == NULL) {
-			if (errno != ENOMEM)
-				errno = EIO;
-			return (CONFSTR_ERR_RET);
-		}
+		if (_dirhelper(DIRHELPER_USER_LOCAL, p, PATH_MAX) == NULL)
+			return (CONFSTR_ERR_RET);
 		goto docopy;
 
 	case _CS_DARWIN_USER_TEMP_DIR:
@@ -223,20 +181,15 @@
 			errno = ENOMEM;
 			return (CONFSTR_ERR_RET);
 		}
-		if (__dirhelper(DIRHELPER_USER_LOCAL_TEMP, p, PATH_MAX) == NULL) {
-			int dh_errno = errno;
+		if (_dirhelper(DIRHELPER_USER_LOCAL_TEMP, p, PATH_MAX) == NULL) {
 			/*
-			 * If __dirhelper() fails, try TMPDIR and P_tmpdir,
+			 * If _dirhelper() fails, try TMPDIR and P_tmpdir,
 			 * finally failing otherwise.
 			 */
 			if ((p = getenv("TMPDIR")) && access(p, W_OK) == 0)
 				goto docopy;
 			if (access(p = P_tmpdir, W_OK) == 0)
 				goto docopy;
-			if (dh_errno == ENOMEM)
-				errno = ENOMEM;
-			else
-				errno = EIO;
 			return (CONFSTR_ERR_RET);
 		}
 		goto docopy;
@@ -246,11 +199,8 @@
 			errno = ENOMEM;
 			return (CONFSTR_ERR_RET);
 		}
-		if (__dirhelper(DIRHELPER_USER_LOCAL_CACHE, p, PATH_MAX) == NULL) {
-			if (errno != ENOMEM)
-				errno = EIO;
-			return (CONFSTR_ERR_RET);
-		}
+		if (_dirhelper(DIRHELPER_USER_LOCAL_CACHE, p, PATH_MAX) == NULL)
+			return (CONFSTR_ERR_RET);
 		goto docopy;
 
 	default: