remove any typedef for __sighandler_t, rename files

Author: nickdesaulniers

libc/include/CMakeLists.txt

@@ -275,9 +275,9 @@ add_header_macro(
   signal.h
   DEPENDS
     .llvm-libc-macros.signal_macros
-    .llvm-libc-types.__sighandler_t
     .llvm-libc-types.pid_t
     .llvm-libc-types.sig_atomic_t
+    .llvm-libc-types.sighandler_t
     .llvm-libc-types.siginfo_t
     .llvm-libc-types.sigset_t
     .llvm-libc-types.stack_t

libc/include/llvm-libc-types/CMakeLists.txt

@@ -15,7 +15,6 @@ add_header(__pthread_start_t HDR __pthread_start_t.h)
 add_header(__pthread_tss_dtor_t HDR __pthread_tss_dtor_t.h)
 add_header(__qsortcompare_t HDR __qsortcompare_t.h)
 add_header(__qsortrcompare_t HDR __qsortrcompare_t.h)
-add_header(__sighandler_t HDR __sighandler_t.h)
 add_header(__thread_type HDR __thread_type.h)
 add_header(blkcnt_t HDR blkcnt_t.h)
 add_header(blksize_t HDR blksize_t.h)
@@ -65,6 +64,7 @@ if(LIBC_TYPES_TIME_T_IS_32_BIT)
 else()
   add_header(time_t HDR time_t_64.h DEST_HDR time_t.h)
 endif()
+add_header(sighandler_t HDR sighandler_t.h)
 add_header(stack_t HDR stack_t.h DEPENDS .size_t)
 add_header(suseconds_t HDR suseconds_t.h)
 add_header(struct_flock HDR struct_flock.h DEPENDS .off_t .pid_t)

libc/include/llvm-libc-types/__sighandler_t.h

@@ -0,0 +1,17 @@
+//===-- Definition of sighandler_t ----------------------------------------===//
+//
+// 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_TYPES_SIGHANDLER_T_H
+#define LLVM_LIBC_TYPES_SIGHANDLER_T_H
+
+#ifdef __linux__
+// For compatibility with glibc.
+typedef void (*sighandler_t)(int);
+#endif
+
+#endif // LLVM_LIBC_TYPES_SIGHANDLER_T_H

libc/include/llvm-libc-types/sighandler_t.h

@@ -16,10 +16,6 @@
 
 #include "llvm-libc-macros/signal-macros.h"
 
-#ifdef __linux__
-#include "llvm-libc-types/__sighandler_t.h"
-#endif
-
 %%public_api()
 
 #endif // LLVM_LIBC_SIGNAL_H

libc/include/signal.h.def

@@ -4,6 +4,7 @@ macros: []
 types:
   - type_name: pid_t
   - type_name: sig_atomic_t
+  - type_name: sighandler_t
   - type_name: siginfo_t
   - type_name: sigset_t
   - type_name: stack_t