[libc][darwin] cmake options, minor nits

Author: bojle

libc/cmake/modules/LLVMLibCCompileOptionRules.cmake

@@ -119,6 +119,10 @@ function(_get_compile_options_from_config output_var)
     list(APPEND config_options "-DLIBC_TRAP_ON_RAISE_FP_EXCEPT")
   endif()
 
+  if(LIBC_CONF_RAW_MUTEX_DEFAULT_SPIN_COUNT)
+    list(APPEND config_options "-DLIBC_COPT_RAW_MUTEX_DEFAULT_SPIN_COUNT=${LIBC_CONF_RAW_MUTEX_DEFAULT_SPIN_COUNT}")
+  endif()
+
   set(${output_var} ${config_options} PARENT_SCOPE)
 endfunction(_get_compile_options_from_config)
 

libc/src/__support/threads/CMakeLists.txt

@@ -25,52 +25,52 @@ endif()
 
 if(TARGET libc.src.__support.threads.${LIBC_TARGET_OS}.futex_utils)
   add_header_library(
-    mutex
+    raw_mutex
     HDRS
-    mutex.h
+    raw_mutex.h
+    COMPILE_OPTIONS
+    ${monotonicity_flags}
     DEPENDS
-    .unix_mutex
+    .${LIBC_TARGET_OS}.futex_utils
+    libc.src.__support.threads.sleep
+    libc.src.__support.time.abs_timeout
+    libc.src.__support.time.monotonicity
+    libc.src.__support.CPP.optional
+    libc.hdr.types.pid_t
   )
+
   add_header_library(
     unix_mutex
     HDRS
-      unix_mutex.h
+    unix_mutex.h
     DEPENDS
-      .raw_mutex
+    .raw_mutex
   )
 
   add_header_library(
-    raw_mutex
+    mutex
     HDRS
-      raw_mutex.h
+    mutex.h
     DEPENDS
-    .${LIBC_TARGET_OS}.futex_utils
-    libc.src.__support.threads.sleep
-    libc.src.__support.time.abs_timeout
-    libc.src.__support.time.monotonicity
-    libc.src.__support.CPP.optional
-    libc.hdr.types.pid_t
-  COMPILE_OPTIONS
-    -DLIBC_COPT_RAW_MUTEX_DEFAULT_SPIN_COUNT=${LIBC_CONF_RAW_MUTEX_DEFAULT_SPIN_COUNT}
-    ${monotonicity_flags}
+    .unix_mutex
   )
 
   add_object_library(
     fork_callbacks
     SRCS
-      fork_callbacks.cpp
+    fork_callbacks.cpp
     HDRS
-      fork_callbacks.h
+    fork_callbacks.h
     DEPENDS
-      .mutex
-      libc.src.__support.CPP.mutex
+    .mutex
+    libc.src.__support.CPP.mutex
   )
 elseif(NOT (LIBC_CONF_THREAD_MODE STREQUAL LIBC_THREAD_MODE_PLATFORM))
   add_header_library(
     mutex
-  HDRS
+    HDRS
     mutex.h
-  DEPENDS
+    DEPENDS
     .mutex_common
   )
 endif()

libc/src/__support/threads/darwin/futex_utils.h

@@ -1,10 +1,10 @@
-//===--- Futex utils for Darwin ------------------------*- C++-*-===//
+//===--- Futex utils for Darwin ----------------------------------*- C++-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-//===------------------------------------------------------------===//
+//===----------------------------------------------------------------------===//
 
 #ifndef LLVM_LIBC_SRC___SUPPORT_THREADS_DARWIN_FUTEX_UTILS_H
 #define LLVM_LIBC_SRC___SUPPORT_THREADS_DARWIN_FUTEX_UTILS_H
@@ -47,9 +47,8 @@ struct Futex : public cpp::Atomic<FutexWordType> {
             reinterpret_cast<void *>(this), static_cast<uint64_t>(val),
             sizeof(FutexWordType), OS_SYNC_WAIT_ON_ADDRESS_NONE);
       }
-      if ((ret < 0) && (errno == ETIMEDOUT)) {
+      if ((ret < 0) && (errno == ETIMEDOUT))
         return -ETIMEDOUT;
-      }
       // case when os_sync returns early with an error. retry.
       if ((ret < 0) && ((errno == EINTR) || (errno == EFAULT))) {
         continue;