address CRs

Author: SchrodingerZhu

libc/hdr/CMakeLists.txt

@@ -223,5 +223,9 @@ add_proxy_header_library(
     libc.include.wchar
 )
 
+# offsetof is a macro inside compiler resource header stddef.h
+# defining it directly as a header library
+add_header_library(offsetof-macros HDRS offsetof_macros.h)
+
 add_subdirectory(types)
 add_subdirectory(func)

libc/hdr/offsetof_macros.h

@@ -0,0 +1,22 @@
+//===-- Definition of macros for offsetof ---------------------------------===//
+//
+// 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_HDR_OFFSETOF_MACROS_H
+#define LLVM_LIBC_HDR_OFFSETOF_MACROS_H
+
+#undef offsetof
+
+// Simplify the inclusion if builtin function is available.
+#if __has_builtin(__builtin_offsetof)
+#define offsetof(t, d) __builtin_offsetof(t, d)
+#else
+#define __need_offsetof
+#include <stddef.h> // compiler resource header
+#endif
+
+#endif // LLVM_LIBC_HDR_OFFSETOF_MACROS_H

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

@@ -52,7 +52,8 @@ typedef struct {
 #else
 #error "__jmp_buf not available for your target architecture."
 #endif
-  // TODO: implement sigjmp_buf related functions
+  // 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;

libc/src/setjmp/linux/CMakeLists.txt

@@ -4,9 +4,6 @@ add_object_library(
     ../sigsetjmp_epilogue.h
   SRCS
     sigsetjmp_epilogue.cpp
-  COMPILE_OPTIONS
-    ${libc_opt_high_flag}
-    -fomit-frame-pointer
   DEPENDS
     libc.src.__support.common
     libc.src.__support.OSUtil.osutil

libc/src/setjmp/siglongjmp.cpp

@@ -14,8 +14,10 @@ namespace LIBC_NAMESPACE_DECL {
 
 // siglongjmp is the same as longjmp. The additional recovery work is done in
 // the epilogue of the sigsetjmp function.
+// TODO: move this inside the TU of longjmp and making it an alias after
+//       sigsetjmp is implemented for all architectures.
 LLVM_LIBC_FUNCTION(void, siglongjmp, (jmp_buf buf, int val)) {
-  return longjmp(buf, val);
+  return LIBC_NAMESPACE::longjmp(buf, val);
 }
 
 } // namespace LIBC_NAMESPACE_DECL

libc/src/setjmp/x86_64/CMakeLists.txt

@@ -4,10 +4,8 @@ add_entrypoint_object(
     setjmp.cpp
   HDRS
     ../setjmp_impl.h
-  COMPILE_OPTIONS
-    ${libc_opt_high_flag}
-    -fomit-frame-pointer
   DEPENDS
+    libc.hdr.offsetof_macros
     libc.hdr.types.jmp_buf
 )
 
@@ -17,11 +15,10 @@ add_entrypoint_object(
     sigsetjmp.cpp
   HDRS
     ../sigsetjmp.h
-  COMPILE_OPTIONS
-    ${libc_opt_high_flag}
   DEPENDS
     libc.hdr.types.jmp_buf
     libc.hdr.types.sigset_t
+    libc.hdr.offsetof_macros
     libc.src.setjmp.sigsetjmp_epilogue
     libc.src.setjmp.setjmp
 )
@@ -32,9 +29,6 @@ add_entrypoint_object(
     longjmp.cpp
   HDRS
     ../longjmp.h
-  COMPILE_OPTIONS
-    ${libc_opt_high_flag}
-    -fomit-frame-pointer
   DEPENDS
     libc.hdr.types.jmp_buf
 )

libc/src/setjmp/x86_64/setjmp.cpp

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

libc/src/setjmp/x86_64/sigsetjmp.cpp

@@ -11,9 +11,7 @@
 #include "src/__support/macros/config.h"
 #include "src/setjmp/setjmp_impl.h"
 #include "src/setjmp/sigsetjmp_epilogue.h"
-
-#define __need_offsetof
-#include <stddef.h> // compiler resource header
+#include "hdr/offsetof_macros.h"
 
 #if !defined(LIBC_TARGET_ARCH_IS_X86)
 #error "Invalid file include"