From 678d078950b1a6a822545db44fe3f87ac302f8f3 Mon Sep 17 00:00:00 2001
From: Mara Bos <m-ou.se@m-ou.se>
Date: Wed, 7 Oct 2020 19:01:56 +0200
Subject: [PATCH] Take sys/vxworks/thread_local_key from sys/unix instead.

---
 library/std/src/sys/vxworks/mod.rs            |  1 +
 .../std/src/sys/vxworks/thread_local_key.rs   | 34 -------------------
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 library/std/src/sys/vxworks/thread_local_key.rs

diff --git a/library/std/src/sys/vxworks/mod.rs b/library/std/src/sys/vxworks/mod.rs
index 3b5f2f8561f..2ccdc80e403 100644
--- a/library/std/src/sys/vxworks/mod.rs
+++ b/library/std/src/sys/vxworks/mod.rs
@@ -35,6 +35,7 @@ pub mod stdio;
 #[path = "../unix/thread.rs"]
 pub mod thread;
 pub mod thread_local_dtor;
+#[path = "../unix/thread_local_key.rs"]
 pub mod thread_local_key;
 #[path = "../unix/time.rs"]
 pub mod time;
diff --git a/library/std/src/sys/vxworks/thread_local_key.rs b/library/std/src/sys/vxworks/thread_local_key.rs
deleted file mode 100644
index 2c5b94b1e61..00000000000
--- a/library/std/src/sys/vxworks/thread_local_key.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-#![allow(dead_code)] // not used on all platforms
-
-use crate::mem;
-
-pub type Key = libc::pthread_key_t;
-
-#[inline]
-pub unsafe fn create(dtor: Option<unsafe extern "C" fn(*mut u8)>) -> Key {
-    let mut key = 0;
-    assert_eq!(libc::pthread_key_create(&mut key, mem::transmute(dtor)), 0);
-    key
-}
-
-#[inline]
-pub unsafe fn set(key: Key, value: *mut u8) {
-    let r = libc::pthread_setspecific(key, value as *mut _);
-    debug_assert_eq!(r, 0);
-}
-
-#[inline]
-pub unsafe fn get(key: Key) -> *mut u8 {
-    libc::pthread_getspecific(key) as *mut u8
-}
-
-#[inline]
-pub unsafe fn destroy(key: Key) {
-    let r = libc::pthread_key_delete(key);
-    debug_assert_eq!(r, 0);
-}
-
-#[inline]
-pub fn requires_synchronized_create() -> bool {
-    false
-}