1 files changed, 20 insertions, 2 deletions
diff --git a/gcc/gthr-win32.h b/gcc/gthr-win32.h
index 119cbc7d9b9..dbe5e5b4f34 100644
--- a/gcc/gthr-win32.h
+++ b/gcc/gthr-win32.h
@@ -204,7 +204,16 @@ __gthread_objc_thread_set_data(void *value)
 void *
 __gthread_objc_thread_get_data(void)
 {
-  return TlsGetValue(__gthread_objc_data_tls);          /* Return thread data.      */
+  DWORD lasterror;
+  void *ptr;
+
+  lasterror = GetLastError();
+
+  ptr = TlsGetValue(__gthread_objc_data_tls);          /* Return thread data.      */
+
+  SetLastError( lasterror );
+
+  return ptr;
 }
 
 /* Backend mutex functions */
@@ -413,7 +422,16 @@ __gthread_key_delete (__gthread_key_t key)
 static inline void *
 __gthread_getspecific (__gthread_key_t key)
 {
-  return TlsGetValue (key);
+  DWORD lasterror;
+  void *ptr;
+
+  lasterror = GetLastError();
+
+  ptr = TlsGetValue(key);
+
+  SetLastError( lasterror );
+
+  return ptr;
 }
 
 static inline int