Revert "[libc] build fix for sigsetjmp (#137047)" (#137077)

This reverts commit f07511a.

This reverts commit 5bb4cf9.

It caused a CMake configuration issue.

Author: gulfemsavrun

libc/config/linux/x86_64/entrypoints.txt

@@ -1049,8 +1049,6 @@ if(LLVM_LIBC_FULL_BUILD)
     # setjmp.h entrypoints
     libc.src.setjmp.longjmp
     libc.src.setjmp.setjmp
-    libc.src.setjmp.siglongjmp
-    libc.src.setjmp.sigsetjmp
 
     # stdio.h entrypoints
     libc.src.stdio.clearerr

libc/hdr/CMakeLists.txt

@@ -223,14 +223,5 @@ add_proxy_header_library(
     libc.include.wchar
 )
 
-# offsetof is a macro inside compiler resource header stddef.h
-add_proxy_header_library(
-  offsetof_macros
-  HDRS
-    offsetof_macros.h
-  FULL_BUILD_DEPENDS
-    libc.include.llvm-libc-macros.offsetof_macro
-)
-
 add_subdirectory(types)
 add_subdirectory(func)

libc/hdr/offsetof_macros.h

@@ -39,6 +39,7 @@ add_header(gid_t HDR gid_t.h)
 add_header(uid_t HDR uid_t.h)
 add_header(imaxdiv_t HDR imaxdiv_t.h)
 add_header(ino_t HDR ino_t.h)
+add_header(jmp_buf HDR jmp_buf.h)
 add_header(mbstate_t HDR mbstate_t.h)
 add_header(mode_t HDR mode_t.h)
 add_header(mtx_t HDR mtx_t.h DEPENDS .__futex_word .__mutex_type)
@@ -82,7 +83,6 @@ add_header(union_sigval HDR union_sigval.h)
 add_header(siginfo_t HDR siginfo_t.h DEPENDS .union_sigval .pid_t .uid_t .clock_t)
 add_header(sig_atomic_t HDR sig_atomic_t.h)
 add_header(sigset_t HDR sigset_t.h DEPENDS libc.include.llvm-libc-macros.signal_macros)
-add_header(jmp_buf HDR jmp_buf.h DEPENDS .sigset_t)
 add_header(struct_sigaction HDR struct_sigaction.h DEPENDS .sigset_t .siginfo_t)
 add_header(struct_timespec HDR struct_timespec.h DEPENDS .time_t)
 add_header(

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

@@ -9,8 +9,6 @@
 #ifndef LLVM_LIBC_TYPES_JMP_BUF_H
 #define LLVM_LIBC_TYPES_JMP_BUF_H
 
-#include "sigset_t.h"
-
 typedef struct {
 #ifdef __x86_64__
   __UINT64_TYPE__ rbx;
@@ -51,22 +49,9 @@ typedef struct {
 #endif
 #else
 #error "__jmp_buf not available for your target architecture."
-#endif
-  // TODO: implement sigjmp_buf related functions for other architectures
-  // Issue: https://github.com/llvm/llvm-project/issues/136358
-#if defined(__i386__) || defined(__x86_64__)
-  // return address
-  void *sig_retaddr;
-  // extra register buffer to avoid indefinite stack growth in sigsetjmp
-  void *sig_extra;
-  // signal masks
-  sigset_t sigmask;
 #endif
 } __jmp_buf;
 
 typedef __jmp_buf jmp_buf[1];
 
-#if defined(__i386__) || defined(__x86_64__)
-typedef __jmp_buf sigjmp_buf[1];
-#endif
 #endif // LLVM_LIBC_TYPES_JMP_BUF_H

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

@@ -21,19 +21,3 @@ functions:
       - _Returns_twice
     arguments:
       - type: jmp_buf
-  - name: sigsetjmp
-    standards:
-      - POSIX
-    return_type: int
-    attributes:
-      - _Returns_twice
-    arguments:
-      - type: sigjmp_buf
-      - type: int
-  - name: siglongjmp
-    standards:
-      - POSIX
-    return_type: _Noreturn void
-    arguments:
-      - type: sigjmp_buf
-      - type: int

libc/include/setjmp.yaml

@@ -1,13 +1,3 @@
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LIBC_TARGET_OS})
-  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/${LIBC_TARGET_OS})
-  add_object_library(
-    sigsetjmp_epilogue
-    ALIAS
-    DEPENDS
-      .${LIBC_TARGET_OS}.sigsetjmp_epilogue
-  )
-endif()
-
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LIBC_TARGET_ARCHITECTURE})
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/${LIBC_TARGET_ARCHITECTURE})
 endif()
@@ -25,20 +15,3 @@ add_entrypoint_object(
   DEPENDS
     .${LIBC_TARGET_ARCHITECTURE}.longjmp
 )
-
-add_entrypoint_object(
-  siglongjmp
-  SRCS
-    siglongjmp.cpp
-  HDRS
-    siglongjmp.h
-  DEPENDS
-    .longjmp
-)
-
-add_entrypoint_object(
-  sigsetjmp
-  ALIAS
-  DEPENDS
-    .${LIBC_TARGET_ARCHITECTURE}.sigsetjmp
-)

libc/src/setjmp/CMakeLists.txt

@@ -29,8 +29,7 @@ namespace LIBC_NAMESPACE_DECL {
 #ifdef LIBC_COMPILER_IS_GCC
 [[gnu::nothrow]]
 #endif
-[[gnu::returns_twice]] int
-setjmp(jmp_buf buf);
+__attribute__((returns_twice)) int setjmp(jmp_buf buf);
 
 } // namespace LIBC_NAMESPACE_DECL
 

libc/src/setjmp/linux/CMakeLists.txt

@@ -5,22 +5,9 @@ add_entrypoint_object(
   HDRS
     ../setjmp_impl.h
   DEPENDS
-    libc.hdr.offsetof_macros
     libc.hdr.types.jmp_buf
-)
-
-add_entrypoint_object(
-  sigsetjmp
-  SRCS
-    sigsetjmp.cpp
-  HDRS
-    ../sigsetjmp.h
-  DEPENDS
-    libc.hdr.types.jmp_buf
-    libc.hdr.types.sigset_t
-    libc.hdr.offsetof_macros
-    libc.src.setjmp.sigsetjmp_epilogue
-    libc.src.setjmp.setjmp
+  COMPILE_OPTIONS
+    ${libc_opt_high_flag}
 )
 
 add_entrypoint_object(
@@ -31,4 +18,7 @@ add_entrypoint_object(
     ../longjmp.h
   DEPENDS
     libc.hdr.types.jmp_buf
+  COMPILE_OPTIONS
+    ${libc_opt_high_flag}
+    -fomit-frame-pointer
 )

libc/src/setjmp/linux/sigsetjmp_epilogue.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "hdr/offsetof_macros.h"
+#include "include/llvm-libc-macros/offsetof-macro.h"
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
 #include "src/setjmp/setjmp_impl.h"