Merge basic-improvements-branch to trunk

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@60174 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 0 insertions, 16 deletions

diff --git a/gcc/gthr-win32.h b/gcc/gthr-win32.h
index 38b8f04a12a..fe8743a8658 100644
--- a/gcc/gthr-win32.h
+++ b/gcc/gthr-win32.h
@@ -397,13 +397,6 @@ __gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
 }
 
 static inline int
-__gthread_key_dtor (__gthread_key_t key, void *ptr)
-{
-  /* Nothing needed.  */
-  return 0;
-}
-
-static inline int
 __gthread_key_delete (__gthread_key_t key)
 {
   return __gthr_win32_key_delete (key);
@@ -511,15 +504,6 @@ __gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
   return status;
 }
 
-/* Currently, this routine is called only for Mingw runtime, and if
-   -mthreads option is chosen to link in the thread support DLL.  */
-static inline int
-__gthread_key_dtor (__gthread_key_t key, void *ptr)
-{
-  /* Nothing needed.  */
-  return 0;
-}
-
 static inline int
 __gthread_key_delete (__gthread_key_t key)
 {