libdispatch-1008.200.78

Imported from libdispatch-1008.200.78.tar.gz

Author: AppleOSSDistributions

CMakeLists.txt

@@ -25,11 +25,40 @@ include(GNUInstallDirs)
 set(WITH_BLOCKS_RUNTIME "" CACHE PATH "Path to blocks runtime")
 
 include(DispatchAppleOptions)
+include(DispatchSanitization)
+
+include(DispatchCompilerWarnings)
+dispatch_common_warnings()
 
 option(ENABLE_DISPATCH_INIT_CONSTRUCTOR "enable libdispatch_init as a constructor" ON)
 set(USE_LIBDISPATCH_INIT_CONSTRUCTOR ${ENABLE_DISPATCH_INIT_CONSTRUCTOR})
 
-# TODO(compnerd) swift options
+option(ENABLE_SWIFT "enable libdispatch swift overlay" OFF)
+if(ENABLE_SWIFT)
+  if(NOT CMAKE_SWIFT_COMPILER)
+    message(FATAL_ERROR "CMAKE_SWIFT_COMPILER must be defined to enable swift")
+  endif()
+
+  get_filename_component(SWIFT_TOOLCHAIN ${CMAKE_SWIFT_COMPILER} DIRECTORY)
+  get_filename_component(SWIFT_TOOLCHAIN ${SWIFT_TOOLCHAIN} DIRECTORY)
+
+  string(TOLOWER ${CMAKE_SYSTEM_NAME} SWIFT_OS)
+  set(SWIFT_RUNTIME_LIBDIR ${SWIFT_TOOLCHAIN}/lib/swift/${SWIFT_OS}/${CMAKE_SYSTEM_PROCESSOR})
+
+  add_library(swiftCore
+              SHARED IMPORTED GLOBAL)
+  set_target_properties(swiftCore
+                        PROPERTIES
+                          IMPORTED_LOCATION
+                            ${SWIFT_RUNTIME_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}swiftCore${CMAKE_SHARED_LIBRARY_SUFFIX})
+
+  add_library(swiftSwiftOnoneSupport
+              SHARED IMPORTED GLOBAL)
+  set_target_properties(swiftSwiftOnoneSupport
+                        PROPERTIES
+                          IMPORTED_LOCATION
+                           ${SWIFT_RUNTIME_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}swiftSwiftOnoneSupport${CMAKE_SHARED_LIBRARY_SUFFIX})
+endif()
 
 option(BUILD_SHARED_LIBS "build shared libraries" ON)
 
@@ -59,8 +88,7 @@ if(ENABLE_INTERNAL_PTHREAD_WORKQUEUES)
   set(HAVE_PTHREAD_WORKQUEUES 0)
 else()
   check_include_files(pthread/workqueue_private.h HAVE_PTHREAD_WORKQUEUE_PRIVATE_H)
-  check_include_files(pthread_workqueue.h HAVE_PTHREAD_WORKQUEUE_H)
-  if(HAVE_PTHREAD_WORKQUEUE_PRIVATE_H AND HAVE_PTHREAD_WORKQUEUE_H)
+  if(HAVE_PTHREAD_WORKQUEUE_PRIVATE_H)
     set(HAVE_PTHREAD_WORKQUEUES 1)
     set(DISPATCH_USE_INTERNAL_WORKQUEUE 0)
   else()
@@ -111,7 +139,6 @@ check_function_exists(mach_port_construct HAVE_MACH_PORT_CONSTRUCT)
 check_function_exists(malloc_create_zone HAVE_MALLOC_CREATE_ZONE)
 check_function_exists(pthread_key_init_np HAVE_PTHREAD_KEY_INIT_NP)
 check_function_exists(pthread_main_np HAVE_PTHREAD_MAIN_NP)
-check_function_exists(pthread_workqueue_setdispatch_np HAVE_PTHREAD_WORKQUEUE_SETDISPATCH_NP)
 check_function_exists(strlcpy HAVE_STRLCPY)
 check_function_exists(sysconf HAVE_SYSCONF)
 
@@ -152,7 +179,6 @@ check_include_files("stdint.h" HAVE_STDINT_H)
 check_include_files("stdlib.h" HAVE_STDLIB_H)
 check_include_files("string.h" HAVE_STRING_H)
 check_include_files("strings.h" HAVE_STRINGS_H)
-check_include_files("sys/cdefs.h" HAVE_SYS_CDEFS_H)
 check_include_files("sys/guarded.h" HAVE_SYS_GUARDED_H)
 check_include_files("sys/stat.h" HAVE_SYS_STAT_H)
 check_include_files("sys/types.h" HAVE_SYS_TYPES_H)
@@ -198,21 +224,19 @@ if(leaks_EXECUTABLE)
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
-  add_custom_command(OUTPUT
-                       "${CMAKE_SOURCE_DIR}/dispatch/module.modulemap"
-                       "${CMAKE_SOURCE_DIR}/private/module.modulemap"
-                     COMMAND
-                       ${CMAKE_COMMAND} -E create_symlink "${CMAKE_SOURCE_DIR}/darwin/module.modulemap" "${CMAKE_SOURCE_DIR}/dispatch/module.modulemap"
-                     COMMAND
-                       ${CMAKE_COMMAND} -E create_symlink "${CMAKE_SOURCE_DIR}/darwin/module.modulemap" "${CMAKE_SOURCE_DIR}/private/module.modulemap")
+  add_custom_target(module-map-symlinks
+                    ALL
+                    COMMAND
+                      ${CMAKE_COMMAND} -E create_symlink "${CMAKE_SOURCE_DIR}/dispatch/darwin/module.modulemap" "${CMAKE_SOURCE_DIR}/dispatch/module.modulemap"
+                    COMMAND
+                      ${CMAKE_COMMAND} -E create_symlink "${CMAKE_SOURCE_DIR}/private/darwin/module.modulemap" "${CMAKE_SOURCE_DIR}/private/module.modulemap")
 else()
-  add_custom_command(OUTPUT
-                       "${CMAKE_SOURCE_DIR}/dispatch/module.modulemap"
-                       "${CMAKE_SOURCE_DIR}/private/module.modulemap"
-                     COMMAND
-                       ${CMAKE_COMMAND} -E create_symlink "${CMAKE_SOURCE_DIR}/generic/module.modulemap" "${CMAKE_SOURCE_DIR}/dispatch/module.modulemap"
-                     COMMAND
-                       ${CMAKE_COMMAND} -E create_symlink "${CMAKE_SOURCE_DIR}/generic/module.modulemap" "${CMAKE_SOURCE_DIR}/private/module.modulemap")
+  add_custom_target(module-map-symlinks
+                    ALL
+                    COMMAND
+                      ${CMAKE_COMMAND} -E create_symlink "${CMAKE_SOURCE_DIR}/dispatch/generic/module.modulemap" "${CMAKE_SOURCE_DIR}/dispatch/module.modulemap"
+                    COMMAND
+                      ${CMAKE_COMMAND} -E create_symlink "${CMAKE_SOURCE_DIR}/private/generic/module.modulemap" "${CMAKE_SOURCE_DIR}/private/module.modulemap")
 endif()
 configure_file("${CMAKE_SOURCE_DIR}/cmake/config.h.in"
                "${CMAKE_BINARY_DIR}/config/config_ac.h")

INSTALL.md

@@ -129,9 +129,21 @@ libdispatch for /usr/lib/system on OS X El Capitan:
 Typical configuration line for FreeBSD 8.x and 9.x to build libdispatch with
 clang and blocks support:
 
-	sh autogen.sh
-	./configure CC=clang --with-blocks-runtime=/usr/local/lib
-	make check
+    ```
+    cmake -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DWITH_BLOCKS_RUNTIME=/usr/local/lib <path-to-source>
+    ninja
+    ninja test
+    ```
+
+### Building for android
+
+Note that this assumes that you are building on Linux.  It requires that you
+have the android NDK available.  It has been tested against API Level 21.
+
+    ```
+    cmake -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_SYSTEM_NAME=Android -DCMAKE_SYSTEM_VERSION=21 -DCMAKE_ANDROID_NDK=<path to android NDK> <path-to-source>
+    ninja
+    ```
 
 ### Building and installing for Linux
 
@@ -140,19 +152,19 @@ on Ubuntu; currently supported versions are 14.04, 15.10 and 16.04.
 
 1. The first thing to do is install required packages:
 
-    `sudo apt-get install autoconf libtool pkg-config clang systemtap-sdt-dev libbsd-dev linux-libc-dev`
+    `sudo apt-get install cmake ninja-build clang systemtap-sdt-dev libbsd-dev linux-libc-dev`
 
     Note: compiling libdispatch requires clang 3.8 or better and
 the gold linker. If the default clang on your Ubuntu version is
 too old, see http://apt.llvm.org/ to install a newer version.
 On older Ubuntu releases, you may need to install binutils-gold
 to get the gold linker.
 
-2. Build (as in the general instructions above)
+2. Build
 
     ```
-    sh autogen.sh
-    ./configure
-    make
-    make install
+    cmake -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ <path-to-source>
+    ninja
+    ninja install
     ```
+

PATCHES

@@ -353,3 +353,24 @@ github commits starting with 29bdc2f from
 [8947dcf] APPLIED rdar://33531111
 [5ad9208] APPLIED rdar://33531111
 [698d085] APPLIED rdar://33531111
+[ce1ce45] APPLIED rdar://35017478
+[291f34d] APPLIED rdar://35017478
+[666df60] APPLIED rdar://35017478
+[80dd736] APPLIED rdar://35017478
+[0fd5a69] APPLIED rdar://35017478
+[0e35ed9] APPLIED rdar://35017478
+[70ce56b] APPLIED rdar://35017478
+[40fc1f3] APPLIED rdar://35017478
+[9ec74ed] APPLIED rdar://35017478
+[7f330ed] APPLIED rdar://35017478
+[947b51c] APPLIED rdar://35017478
+[295f676] APPLIED rdar://35017478
+[48196a2] APPLIED rdar://35017478
+[a28fc2b] APPLIED rdar://35017478
+[791ce5d] APPLIED rdar://35017478
+[0d0a998] APPLIED rdar://35017478
+[29329b5] APPLIED rdar://35017478
+[141403a] APPLIED rdar://35017478
+[b7f1beb] APPLIED rdar://35017478
+[7ef9cde] APPLIED rdar://35017478
+[12c9ca8] APPLIED rdar://35017478

cmake/config.h.in

@@ -152,9 +152,6 @@
 /* Define to 1 if you have the <pthread/workqueue_private.h> header file. */
 #cmakedefine HAVE_PTHREAD_WORKQUEUE_PRIVATE_H
 
-/* Define to 1 if you have the `pthread_workqueue_setdispatch_np' function. */
-#cmakedefine HAVE_PTHREAD_WORKQUEUE_SETDISPATCH_NP
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #cmakedefine01 HAVE_STDINT_H
 
@@ -176,9 +173,6 @@
 /* Define to 1 if you have the `sysconf' function. */
 #cmakedefine01 HAVE_SYSCONF
 
-/* Define to 1 if you have the <sys/cdefs.h> header file. */
-#cmakedefine01 HAVE_SYS_CDEFS_H
-
 /* Define to 1 if you have the <sys/guarded.h> header file. */
 #cmakedefine HAVE_SYS_GUARDED_H
 

cmake/modules/DispatchCompilerWarnings.cmake

@@ -0,0 +1,74 @@
+
+if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
+  # TODO: someone needs to provide the msvc equivalent warning flags
+  macro(dispatch_common_warnings)
+  endmacro()
+else()
+  macro(dispatch_common_warnings)
+    add_compile_options(-Werror)
+    add_compile_options(-Wall)
+    add_compile_options(-Wextra)
+    add_compile_options(-Wmissing-prototypes)
+    add_compile_options(-Wdocumentation)
+    add_compile_options(-Wunreachable-code)
+    add_compile_options(-Wshadow)
+    add_compile_options(-Wconversion)
+    add_compile_options(-Wconstant-conversion)
+    add_compile_options(-Wint-conversion)
+    add_compile_options(-Wbool-conversion)
+    add_compile_options(-Wenum-conversion)
+    add_compile_options(-Wassign-enum)
+    add_compile_options(-Wshorten-64-to-32)
+    add_compile_options(-Wnewline-eof)
+    add_compile_options(-Wdeprecated-declarations)
+    add_compile_options(-Wsign-conversion)
+    add_compile_options(-Winfinite-recursion)
+    add_compile_options(-Warray-bounds-pointer-arithmetic)
+    add_compile_options(-Watomic-properties)
+    add_compile_options(-Wcomma)
+    add_compile_options(-Wconditional-uninitialized)
+    add_compile_options(-Wcovered-switch-default)
+    add_compile_options(-Wdate-time)
+    add_compile_options(-Wdeprecated)
+    add_compile_options(-Wdouble-promotion)
+    add_compile_options(-Wduplicate-enum)
+    add_compile_options(-Wexpansion-to-defined)
+    add_compile_options(-Wfloat-equal)
+    add_compile_options(-Widiomatic-parentheses)
+    add_compile_options(-Wnullable-to-nonnull-conversion)
+    add_compile_options(-Wobjc-interface-ivars)
+    add_compile_options(-Wover-aligned)
+    add_compile_options(-Wpacked)
+    add_compile_options(-Wpointer-arith)
+    add_compile_options(-Wselector)
+    add_compile_options(-Wstatic-in-inline)
+    add_compile_options(-Wsuper-class-method-mismatch)
+    add_compile_options(-Wswitch-enum)
+    add_compile_options(-Wunguarded-availability)
+    add_compile_options(-Wunused)
+
+    add_compile_options(-Wno-unknown-warning-option)
+    add_compile_options(-Wno-trigraphs)
+    add_compile_options(-Wno-four-char-constants)
+    add_compile_options(-Wno-disabled-macro-expansion)
+    add_compile_options(-Wno-pedantic)
+    add_compile_options(-Wno-bad-function-cast)
+    add_compile_options(-Wno-c++-compat)
+    add_compile_options(-Wno-c++98-compat)
+    add_compile_options(-Wno-c++98-compat-pedantic)
+    add_compile_options(-Wno-cast-align)
+    add_compile_options(-Wno-cast-qual)
+    add_compile_options(-Wno-documentation-unknown-command)
+    add_compile_options(-Wno-format-nonliteral)
+    add_compile_options(-Wno-missing-variable-declarations)
+    add_compile_options(-Wno-old-style-cast)
+    add_compile_options(-Wno-padded)
+    add_compile_options(-Wno-reserved-id-macro)
+    add_compile_options(-Wno-shift-sign-overflow)
+    add_compile_options(-Wno-undef)
+    add_compile_options(-Wno-unreachable-code-aggressive)
+    add_compile_options(-Wno-unused-macros)
+    add_compile_options(-Wno-used-but-marked-unused)
+    add_compile_options(-Wno-vla)
+  endmacro()
+endif()

cmake/modules/DispatchSanitization.cmake

@@ -0,0 +1,44 @@
+
+set(DISPATCH_USE_SANITIZER "" CACHE STRING
+    "Define the sanitizer used to build binaries and tests.")
+
+if(CMAKE_SYSTEM_NAME STREQUAL Darwin AND DISPATCH_USE_SANITIZER)
+  message(FATAL_ERROR "building libdispatch with sanitization is not supported on Darwin")
+endif()
+
+if(DISPATCH_USE_SANITIZER)
+  # TODO(compnerd) ensure that the compiler supports these options before adding
+  # them.  At the moment, assume that this will just be used with a GNU
+  # compatible driver and that the options are spelt correctly in light of that.
+  add_compile_options("-fno-omit-frame-pointer")
+  if(CMAKE_BUILD_TYPE MATCHES "Debug")
+    add_compile_options("-O1")
+  elseif(NOT CMAKE_BUILD_TYPE MATCHES "Debug" AND
+         NOT CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo")
+    add_compile_options("-gline-tables-only")
+  endif()
+
+  if(LLVM_USE_SANITIZER STREQUAL "Address")
+    add_compile_options("-fsanitize=address")
+  elseif(DISPATCH_USE_SANITIZER MATCHES "Memory(WithOrigins)?")
+    add_compile_options("-fsanitize=memory")
+    if(DISPATCH_USE_SANITIZER STREQUAL "MemoryWithOrigins")
+    add_compile_options("-fsanitize-memory-track-origins")
+    endif()
+  elseif(DISPATCH_USE_SANITIZER STREQUAL "Undefined")
+    add_compile_options("-fsanitize=undefined")
+    add_compile_options("-fno-sanitize=vptr,function")
+    add_compile_options("-fno-sanitize-recover=all")
+  elseif(DISPATCH_USE_SANITIZER STREQUAL "Thread")
+    add_compile_options("-fsanitize=thread")
+  elseif(DISPATCH_USE_SANITIZER STREQUAL "Address;Undefined" OR
+         DISPATCH_USE_SANITIZER STREQUAL "Undefined;Address")
+    add_compile_options("-fsanitize=address,undefined")
+    add_compile_options("-fno-sanitize=vptr,function")
+    add_compile_options("-fno-sanitize-recover=all")
+  elseif(DISPATCH_USE_SANITIZER STREQUAL "Leaks")
+    add_compile_options("-fsanitize=leak")
+  else()
+    message(FATAL_ERROR "unsupported value of DISPATCH_USE_SANITIZER: ${DISPATCH_USE_SANITIZER}")
+  endif()
+endif()

cmake/modules/SwiftSupport.cmake

@@ -57,6 +57,7 @@ function(add_swift_library library)
                        ${module_directory}/${ASL_MODULE_NAME}.swiftdoc
                      DEPENDS
                        ${ASL_SOURCES}
+                       ${CMAKE_SWIFT_COMPILER}
                      COMMAND
                        ${CMAKE_COMMAND} -E make_directory ${module_directory}
                      COMMAND

config/config.h

@@ -106,9 +106,6 @@
 /* Define to 1 if you have the `mach_approximate_time' function. */
 #define HAVE_MACH_APPROXIMATE_TIME 1
 
-/* Define to 1 if you have the `mach_port_construct' function. */
-#define HAVE_MACH_PORT_CONSTRUCT 1
-
 /* Define to 1 if you have the `malloc_create_zone' function. */
 #define HAVE_MALLOC_CREATE_ZONE 1
 
@@ -148,9 +145,6 @@
 /* Define to 1 if you have the <pthread/workqueue_private.h> header file. */
 #define HAVE_PTHREAD_WORKQUEUE_PRIVATE_H 1
 
-/* Define to 1 if you have the `pthread_workqueue_setdispatch_np' function. */
-#define HAVE_PTHREAD_WORKQUEUE_SETDISPATCH_NP 1
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
 

configure.ac

@@ -190,6 +190,9 @@ AC_ARG_WITH([swift-toolchain],
 		    armv7l*)
 			target_cpu="armv7"
 			;;
+		    armv6l*)
+			target_cpu="armv6"
+			;;
 			*)
             esac
 	    ;;

dispatch/CMakeLists.txt

@@ -14,11 +14,12 @@ install(FILES
           source.h
           time.h
         DESTINATION
-          ${CMAKE_INSTALL_FULL_INCLUDEDIR}/dispatch/)
+          ${CMAKE_INSTALL_FULL_INCLUDEDIR}/dispatch)
 if(ENABLE_SWIFT)
+  get_filename_component(MODULE_MAP module.modulemap REALPATH)
   install(FILES
-            module.modulemap
+            ${MODULE_MAP}
           DESTINATION
-            ${CMAKE_INSTALL_FULL_INCLUEDIR}/dispatch/)
+            ${CMAKE_INSTALL_FULL_INCLUDEDIR}/dispatch)
 endif()
 

dispatch/base.h

@@ -120,15 +120,20 @@
 #endif
 #endif
 
-#if TARGET_OS_WIN32 && defined(__DISPATCH_BUILDING_DISPATCH__) && \
-		defined(__cplusplus)
+#if TARGET_OS_WIN32
+#ifdef __cplusplus
+#ifdef __DISPATCH_BUILDING_DISPATCH__
 #define DISPATCH_EXPORT extern "C" extern __declspec(dllexport)
-#elif TARGET_OS_WIN32 && defined(__DISPATCH_BUILDING_DISPATCH__)
+#else
 #define DISPATCH_EXPORT extern __declspec(dllexport)
-#elif TARGET_OS_WIN32 && defined(__cplusplus)
+#endif // __DISPATCH_BUILDING_DISPATCH__
+#else // __cplusplus
+#ifdef __DISPATCH_BUILDING_DISPATCH__
 #define DISPATCH_EXPORT extern "C" extern __declspec(dllimport)
-#elif TARGET_OS_WIN32
+#else
 #define DISPATCH_EXPORT extern __declspec(dllimport)
+#endif // __DISPATCH_BUILDING_DISPATCH__
+#endif // __cplusplus
 #elif __GNUC__
 #define DISPATCH_EXPORT extern __attribute__((visibility("default")))
 #else