about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2022-01-17 23:18:20 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2022-01-17 23:18:27 +0000
commitf8b765bec44e6c464a7eabf80e58c6851ca15ac3 (patch)
treed4a4a23115f37915b12a7b6fc5969bd0eac485cd
parent3a5aeba87a1b89a042237ff74ca7fe7f6aa1556a (diff)
downloadglibc-f8b765bec44e6c464a7eabf80e58c6851ca15ac3.tar.gz
glibc-f8b765bec44e6c464a7eabf80e58c6851ca15ac3.tar.xz
glibc-f8b765bec44e6c464a7eabf80e58c6851ca15ac3.zip
htl: Fix build error in annexc
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)
      |                                                              ^
-rw-r--r--sysdeps/htl/include/pthread.h6
1 files changed, 4 insertions, 2 deletions
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