[libc] Small improvements to libc cmake

[mikhail.ramalho]

Summary

This patch includes:

1. Better error message when cmake finds incompatible triple
2. Added missing header dependencies libc/include/CMakeLists.txt as per app.td
3. Removed unused $LLVM_LIBC_INCLUDE_DIRS cmake variable

libc/cmake/modules/LLVMLibCArchitectures.cmake

 # LIBC_TARGET_TRIPLE or LLVM_RUNTIMES_TARGET, we will add a --target option
 # if the compiler is clang. If the compiler is GCC we just error out as there
 # is no equivalent of an option like --target.
 if(explicit_target_triple AND
    (NOT (libc_compiler_triple STREQUAL explicit_target_triple)))
   set(LIBC_CROSSBUILD TRUE)
   if(CMAKE_COMPILER_IS_GNUCXX)
     message(FATAL_ERROR
-            "GCC target triple and the explicity specified target triple do "
-            "not match.")
+            "GCC target triple (${libc_compiler_triple}) and the explicity "
+            "specified target triple (${explicit_target_triple}) do not match.")
   else()
     list(APPEND
          LIBC_COMPILE_OPTIONS_DEFAULT "--target=${explicit_target_triple}")
   endif()
 endif()
 
 message(STATUS
         "Building libc for ${LIBC_TARGET_ARCHITECTURE} on ${LIBC_TARGET_OS}")

libc/config/linux/api.td

 }
 
 def SchedAPI : PublicAPI<"sched.h"> {
   let Types = ["pid_t", "size_t", "cpu_set_t"];
 }
 
 def SysMManAPI : PublicAPI<"sys/mman.h"> {
   let Types = ["off_t", "size_t"];
-  let Macros = [
-  ];
-
 }
 
 def SignalAPI : PublicAPI<"signal.h"> {
   let Types = [
     "sig_atomic_t",
     "sigset_t",
     "struct sigaction",
     "union sigval",
def DirentAPI : PublicAPI<"dirent.h"> {
   let Types = [
     "ino_t",
     "DIR",
     "struct dirent",
   ];
 }
 
 def UniStdAPI : PublicAPI<"unistd.h"> {
-  let Types = ["__exec_argv_t", "__exec_envp_t", "off_t", "pid_t", "size_t", "ssize_t", "uid_t", "__getoptargv_t"];
+  let Types = ["__exec_argv_t", "__exec_envp_t", "off_t", "pid_t", "size_t",
+               "ssize_t", "uid_t", "__getoptargv_t"];
 }
 
 def SysRandomAPI : PublicAPI<"sys/random.h"> {
   let Types = ["size_t", "ssize_t"];
 }
 
 def SysSelectAPI : PublicAPI<"sys/select.h"> {
-  let Types = ["fd_set", "sigset_t", "suseconds_t", "time_t", "struct timespec", "struct timeval"];
+  let Types = ["fd_set", "sigset_t", "suseconds_t", "time_t", "struct timespec",
+               "struct timeval"];
 }
 
 def SysResourceAPI : PublicAPI<"sys/resource.h"> {
   let Types = ["rlim_t", "struct rlimit"];
 }
 
 def SysStatAPI : PublicAPI<"sys/stat.h"> {
   let Types = ["mode_t", "dev_t", "ino_t", "nlink_t", "uid_t", "gid_t", "off_t",

libc/include/CMakeLists.txt

 )
 
 add_gen_header(
   dirent
   DEF_FILE dirent.h.def
   GEN_HDR dirent.h
   DEPENDS
     .llvm_libc_common_h
-    .llvm-libc-types.DIR
     .llvm-libc-types.ino_t
+    .llvm-libc-types.DIR
     .llvm-libc-types.struct_dirent
 )
 
 add_gen_header(
   fcntl
   DEF_FILE fcntl.h.def
   GEN_HDR fcntl.h
   DEPENDS

 
 add_gen_header(
   time
   DEF_FILE time.h.def
   GEN_HDR time.h
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-macros.time_macros
-    .llvm-libc-types.time_t
     .llvm-libc-types.clock_t
-    .llvm-libc-types.clockid_t
+    .llvm-libc-types.time_t
     .llvm-libc-types.struct_tm
     .llvm-libc-types.struct_timespec
     .llvm-libc-types.struct_timeval
+    .llvm-libc-types.clockid_t
 )
 
 add_gen_header(
   threads
   DEF_FILE threads.h.def
   GEN_HDR threads.h
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-types.__call_once_func_t
+    .llvm-libc-types.once_flag
     .llvm-libc-types.cnd_t
     .llvm-libc-types.mtx_t
-    .llvm-libc-types.once_flag
-    .llvm-libc-types.thrd_start_t
     .llvm-libc-types.thrd_t
+    .llvm-libc-types.thrd_start_t
     .llvm-libc-types.tss_t
     .llvm-libc-types.tss_dtor_t
 )
 
 add_gen_header(
   errno
   DEF_FILE errno.h.def
   GEN_HDR errno.h
   DEPENDS
     .llvm-libc-macros.generic_error_number_macros
 )
 
 add_gen_header(
   signal
   DEF_FILE signal.h.def
   PARAMS
     platform_signal=../config/${LIBC_TARGET_OS}/signal.h.in
   GEN_HDR signal.h
   DATA_FILES
     ../config/${LIBC_TARGET_OS}/signal.h.in
   DEPENDS
     .llvm-libc-macros.signal_macros
-    .llvm-libc-types.__sighandler_t
-    .llvm-libc-types.sigset_t
     .llvm-libc-types.sig_atomic_t
-    .llvm-libc-types.stack_t
+    .llvm-libc-types.sigset_t
     .llvm-libc-types.struct_sigaction
+    .llvm-libc-types.union_sigval
+    .llvm-libc-types.siginfo_t
+    .llvm-libc-types.stack_t
     .llvm-libc-types.pid_t
 )
 
 add_gen_header(
   stdio
   DEF_FILE stdio.h.def
   GEN_HDR stdio.h
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-macros.file_seek_macros
     .llvm-libc-macros.stdio_macros
-    .llvm-libc-types.cookie_io_functions_t
-    .llvm-libc-types.FILE
-    .llvm-libc-types.off_t
     .llvm-libc-types.size_t
+    .llvm-libc-types.FILE
+    .llvm-libc-types.cookie_io_functions_t
 )
 
 add_gen_header(
   stdlib
   DEF_FILE stdlib.h.def
   GEN_HDR stdlib.h
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-macros.stdlib_macros
-    .llvm-libc-types.__bsearchcompare_t
-    .llvm-libc-types.__qsortcompare_t
     .llvm-libc-types.div_t
     .llvm-libc-types.ldiv_t
     .llvm-libc-types.lldiv_t
     .llvm-libc-types.size_t
+    .llvm-libc-types.__bsearchcompare_t
+    .llvm-libc-types.__qsortcompare_t
     .llvm-libc-types.__atexithandler_t
 )
 
 add_gen_header(
   unistd
   DEF_FILE unistd.h.def
   GEN_HDR unistd.h
   DEPENDS

 
 add_gen_header(
   pthread
   DEF_FILE pthread.h.def
   GEN_HDR pthread.h
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-types.__atfork_callback_t
+    .llvm-libc-types.__pthread_once_func_t
     .llvm-libc-types.__pthread_start_t
     .llvm-libc-types.__pthread_tss_dtor_t
     .llvm-libc-types.pthread_attr_t
-    .llvm-libc-types.pthread_key_t
     .llvm-libc-types.pthread_mutex_t
     .llvm-libc-types.pthread_mutexattr_t
-    .llvm-libc-types.pthread_once_t
-    .llvm-libc-types.__pthread_once_func_t
     .llvm-libc-types.pthread_t
+    .llvm-libc-types.pthread_key_t
+    .llvm-libc-types.pthread_once_t
 )
 
 add_gen_header(
   sched
   DEF_FILE sched.h.def
   GEN_HDR sched.h
   DEPENDS
     .llvm_libc_common_h
-    .llvm-libc-types.cpu_set_t
     .llvm-libc-macros.sched_macros
+    .llvm-libc-types.pid_t
+    .llvm-libc-types.size_t
+    .llvm-libc-types.cpu_set_t
 )
 
 add_gen_header(
   spawn
   DEF_FILE spawn.h.def
   GEN_HDR spawn.h
   DEPENDS
     .llvm_libc_common_h

 )
 
 add_gen_header(
   sys_mman
   DEF_FILE sys/mman.h.def
   GEN_HDR sys/mman.h
   DEPENDS
     .llvm_libc_common_h
+    .llvm-libc-macros.sys_mman_macros
     .llvm-libc-types.off_t
     .llvm-libc-types.ssize_t
-    .llvm-libc-macros.sys_mman_macros
 )
 
 add_gen_header(
   sys_prctl
   DEF_FILE sys/prctl.h.def
   GEN_HDR sys/prctl.h
   DEPENDS
     .llvm_libc_common_h
 )
 
 add_gen_header(
   sys_random
   DEF_FILE sys/random.h.def
   GEN_HDR sys/random.h
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-macros.sys_random_macros
-    .llvm-libc-types.ssize_t
     .llvm-libc-types.size_t
+    .llvm-libc-types.ssize_t
 )
 
 add_gen_header(
   sys_resource
   DEF_FILE sys/resource.h.def
   GEN_HDR sys/resource.h
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-macros.sys_resource_macros
     .llvm-libc-types.rlim_t
     .llvm-libc-types.struct_rlimit
 )
 
 add_gen_header(
   sys_stat
   DEF_FILE sys/stat.h.def
   GEN_HDR sys/stat.h
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-macros.sys_stat_macros
     .llvm-libc-types.mode_t
+    .llvm-libc-types.dev_t
+    .llvm-libc-types.ino_t
+    .llvm-libc-types.nlink_t
+    .llvm-libc-types.uid_t
+    .llvm-libc-types.gid_t
+    .llvm-libc-types.off_t
+    .llvm-libc-types.struct_timespec
+    .llvm-libc-types.struct_timeval
+    .llvm-libc-types.blksize_t
+    .llvm-libc-types.blkcnt_t
     .llvm-libc-types.struct_stat
 )
 
 add_gen_header(
   sys_select
   DEF_FILE sys/select.h.def
   GEN_HDR sys/select.h
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-macros.sys_select_macros
     .llvm-libc-types.fd_set
     .llvm-libc-types.sigset_t
-    .llvm-libc-types.struct_timespec
-    .llvm-libc-types.struct_timeval
     .llvm-libc-types.suseconds_t
     .llvm-libc-types.time_t
-    .llvm-libc-types.ssize_t
+    .llvm-libc-types.struct_timespec
+    .llvm-libc-types.struct_timeval
 )
 
 add_gen_header(
   sys_sendfile
   DEF_FILE sys/sendfile.h.def
   GEN_HDR sys/sendfile.h
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-types.off_t
+    .llvm-libc-types.size_t
     .llvm-libc-types.ssize_t
 )
 
 add_gen_header(
   sys_socket
   DEF_FILE sys/socket.h.def
   GEN_HDR sys/socket.h
   DEPENDS

 add_gen_header(
   termios
   DEF_FILE termios.h.def
   GEN_HDR termios.h
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-macros.termios_macros
     .llvm-libc-types.cc_t
+    .llvm-libc-types.pid_t
     .llvm-libc-types.speed_t
     .llvm-libc-types.struct_termios
     .llvm-libc-types.tcflag_t
 )
 
 if(NOT LLVM_LIBC_FULL_BUILD)
   # We don't install headers in non-fullbuild mode.
   return()

libc/src/stdlib/linux/CMakeLists.txt

add_entrypoint_object(
   abort
   SRCS
     abort.cpp
   HDRS
     ../abort.h
   DEPENDS
     libc.include.stdlib
     libc.src.signal.raise
-    ._Exit
+    libc.src.stdlib._Exit
 )

libc/utils/HdrGen/CMakeLists.txt

 include(TableGen)
 
 set(LLVM_LINK_COMPONENTS Support)
 
 add_tablegen(libc-hdrgen LIBC
   Command.h
   Command.cpp
   Generator.cpp
   Generator.h
   IncludeFileCommand.cpp
   IncludeFileCommand.h
   Main.cpp
   PublicAPICommand.cpp
   PublicAPICommand.h
 )
 
-target_include_directories(libc-hdrgen PRIVATE ${LIBC_SOURCE_DIR} ${LLVM_LIBC_INCLUDE_DIRS})
+target_include_directories(libc-hdrgen PRIVATE ${LIBC_SOURCE_DIR})
 target_link_libraries(libc-hdrgen PRIVATE LibcTableGenUtil)
 
 add_subdirectory(PrototypeTestGen)

libc/utils/LibcTableGenUtil/CMakeLists.txt

 add_llvm_library(
   LibcTableGenUtil
   APIIndexer.cpp
   APIIndexer.h
   LINK_COMPONENTS Support TableGen
 )
-target_include_directories(LibcTableGenUtil PUBLIC ${LIBC_SOURCE_DIR} ${LLVM_LIBC_INCLUDE_DIRS})
+target_include_directories(LibcTableGenUtil PUBLIC ${LIBC_SOURCE_DIR})