--- Libc/Libc-1725.40.4/include/sys/cdefs.h
+++ Libc/Libc-997.90.3/include/sys/cdefs.h
@@ -34,7 +34,7 @@
  */
 #include_next <sys/cdefs.h>
 #ifndef _LIBC_NO_FEATURE_VERIFICATION
-#if defined(__arm64__) || defined(__arm__) || defined(__i386__) || defined(__x86_64__)
+#if defined(__arm__) || defined(__i386__) || defined(__x86_64__)
 #  include "libc-features.h"
 #else
 #  error "Unknown architecture."
@@ -105,20 +105,22 @@
 
 extern int pthread_key_init_np(int, void (*)(void *));
 
-// Not needed anymore by this header, but other headers rely on this include being here.
 #include <TargetConditionals.h>
-
+#if TARGET_IPHONE_SIMULATOR
+/* Simulator keys are offset by 200 */
+#define	__LIBC_PTHREAD_KEY(x)		(210 + (x))
+#else
 #define	__LIBC_PTHREAD_KEY(x)		(10 + (x))
+#endif
 
 /*
  * Libc pthread key assignments
  */
 #define __LIBC_PTHREAD_KEY_XLOCALE	__LIBC_PTHREAD_KEY(0)
-//#define __LIBC_PTHREAD_KEY_RESERVED_WIN64	__LIBC_PTHREAD_KEY(1)
+#define __LIBC_PTHREAD_KEY_TTYNAME	__LIBC_PTHREAD_KEY(1)
 #define __LIBC_PTHREAD_KEY_LOCALTIME	__LIBC_PTHREAD_KEY(2)
 #define __LIBC_PTHREAD_KEY_GMTIME	__LIBC_PTHREAD_KEY(3)
 #define __LIBC_PTHREAD_KEY_GDTOA_BIGINT	__LIBC_PTHREAD_KEY(4)
 #define __LIBC_PTHREAD_KEY_PARSEFLOAT	__LIBC_PTHREAD_KEY(5)
-#define __LIBC_PTHREAD_KEY_TTYNAME	__LIBC_PTHREAD_KEY(6)
 
 #endif /* _LIBC_SYS_CDEFS_H_ */