[hurd,commited] htl: Fix build error in annexc

Message ID 20220117232137.3823187-1-samuel.thibault@ens-lyon.org
State Committed, archived
Headers
Series [hurd,commited] htl: Fix build error in annexc |

Checks

Context Check Description
dj/TryBot-apply_patch fail Patch failed to apply to master at the time it was sent
dj/TryBot-32bit fail Patch series failed to apply

Commit Message

Samuel Thibault Jan. 17, 2022, 11:21 p.m. UTC
  We were getting

../scripts/evaluate-test.sh posix/annexc $? true false > /usr/src/glibc-upstream/build/posix/annexc.test-result
In file included from ../include/pthread.h:1,
                 from <stdin>:1:
../sysdeps/htl/include/pthread.h:7:62: error: missing binary operator before token "("
    7 | # if defined __USE_EXTERN_INLINES && defined _LIBC && !IS_IN (libsupport)
      |                                                              ^
---
 sysdeps/htl/include/pthread.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
  

Patch

diff --git a/sysdeps/htl/include/pthread.h b/sysdeps/htl/include/pthread.h
index f040c2f957..699fabfbc8 100644
--- a/sysdeps/htl/include/pthread.h
+++ b/sysdeps/htl/include/pthread.h
@@ -4,8 +4,9 @@ 
 
 # define ARCH_MIN_GUARD_SIZE 0
 
-# if defined __USE_EXTERN_INLINES && defined _LIBC && !IS_IN (libsupport)
-#  include <bits/spin-lock-inline.h>
+# if defined __USE_EXTERN_INLINES && defined _LIBC
+#  if !IS_IN (libsupport)
+#   include <bits/spin-lock-inline.h>
 
 __extern_inline int
 pthread_spin_destroy (pthread_spinlock_t *__lock)
@@ -36,6 +37,7 @@  pthread_spin_unlock (pthread_spinlock_t *__lock)
 {
   return __pthread_spin_unlock (__lock);
 }
+#  endif
 # endif
 #endif
 #endif