[hurd,commited] hurd 64bit: Fix pthread_t/thread_t type to long

diff --git a/htl/Makefile b/htl/Makefile
index 0587fd164c..67a2f7fe72 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -159,6 +159,8 @@  headers :=				\
               bits/types/struct___pthread_mutexattr.h	\
               bits/types/struct___pthread_rwlock.h	\
               bits/types/struct___pthread_rwlockattr.h	\
+              bits/types/__pthread_t.h		\
+              bits/types/__thrd_t.h		\
 	      bits/semaphore.h
 
 distribute :=
diff --git a/sysdeps/htl/bits/pthread.h b/sysdeps/htl/bits/pthread.h
index b966fc8824..57589a191c 100644
--- a/sysdeps/htl/bits/pthread.h
+++ b/sysdeps/htl/bits/pthread.h
@@ -19,7 +19,7 @@ 
 #ifndef _BITS_PTHREAD_H
 #define _BITS_PTHREAD_H	1
 
-typedef int __pthread_t;
+#include <bits/types/__pthread_t.h>
 
 /* Return true if __T1 and __T2 both name the same thread.  Otherwise,
    false.  */
diff --git a/sysdeps/htl/bits/thread-shared-types.h b/sysdeps/htl/bits/thread-shared-types.h
index e7135aaf49..50c9bd4724 100644
--- a/sysdeps/htl/bits/thread-shared-types.h
+++ b/sysdeps/htl/bits/thread-shared-types.h
@@ -21,9 +21,9 @@ 
 
 #include <bits/pthreadtypes-arch.h>
 #include <bits/types/struct___pthread_once.h>
+#include <bits/types/__thrd_t.h>
 
 typedef int __tss_t;
-typedef int __thrd_t;
 
 typedef union
 {
diff --git a/sysdeps/htl/bits/types/__pthread_t.h b/sysdeps/htl/bits/types/__pthread_t.h
new file mode 100644
index 0000000000..9e48351958
--- /dev/null
+++ b/sysdeps/htl/bits/types/__pthread_t.h
@@ -0,0 +1,24 @@ 
+/* Thread type.  Generic version.
+   Copyright (C) 2002-2023 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library;  if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _BITS_TYPES___PTHREAD_T_H
+#define _BITS_TYPES___PTHREAD_T_H	1
+
+typedef long int __pthread_t;
+
+#endif /* bits/types/__pthread_t.h */
diff --git a/sysdeps/htl/bits/types/__thrd_t.h b/sysdeps/htl/bits/types/__thrd_t.h
new file mode 100644
index 0000000000..8b3aa5c805
--- /dev/null
+++ b/sysdeps/htl/bits/types/__thrd_t.h
@@ -0,0 +1,24 @@ 
+/* Thread type.  Generic version.
+   Copyright (C) 2002-2023 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library;  if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _BITS_TYPES___THRD_T_H
+#define _BITS_TYPES___THRD_T_H	1
+
+typedef long int __thrd_t;
+
+#endif /* bits/types/__thrd_t.h */
diff --git a/sysdeps/mach/hurd/i386/htl/bits/types/__pthread_t.h b/sysdeps/mach/hurd/i386/htl/bits/types/__pthread_t.h
new file mode 100644
index 0000000000..b1af0f3793
--- /dev/null
+++ b/sysdeps/mach/hurd/i386/htl/bits/types/__pthread_t.h
@@ -0,0 +1,24 @@ 
+/* Thread type.  i386 version.
+   Copyright (C) 2002-2023 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library;  if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _BITS_TYPES___PTHREAD_T_H
+#define _BITS_TYPES___PTHREAD_T_H	1
+
+typedef int __pthread_t;
+
+#endif /* bits/types/__pthread_t.h */
diff --git a/sysdeps/mach/hurd/i386/htl/bits/types/__thrd_t.h b/sysdeps/mach/hurd/i386/htl/bits/types/__thrd_t.h
new file mode 100644
index 0000000000..2e20c292b3
--- /dev/null
+++ b/sysdeps/mach/hurd/i386/htl/bits/types/__thrd_t.h
@@ -0,0 +1,24 @@ 
+/* Thread type.  i386 version.
+   Copyright (C) 2002-2023 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library;  if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _BITS_TYPES___THRD_T_H
+#define _BITS_TYPES___THRD_T_H	1
+
+typedef int __thrd_t;
+
+#endif /* bits/types/__thrd_t.h */