address CRs

Author: SchrodingerZhu

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

@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_JMP_BUF_H
 #define LLVM_LIBC_TYPES_JMP_BUF_H
 
-#include "llvm-libc-types/sigset_t.h"
+#include "sigset_t.h"
 
 typedef struct {
 #ifdef __x86_64__

libc/src/setjmp/linux/CMakeLists.txt

@@ -4,12 +4,12 @@ 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.hdr.types.jmp_buf
     libc.hdr.types.sigset_t
-  COMPILE_OPTIONS
-    ${libc_opt_high_flag}
-    -fomit-frame-pointer
 )

libc/src/setjmp/setjmp_impl.h

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

libc/src/setjmp/sigsetjmp.h

@@ -18,7 +18,7 @@ namespace LIBC_NAMESPACE_DECL {
 #ifdef LIBC_COMPILER_IS_GCC
 [[gnu::nothrow]]
 #endif
-__attribute__((returns_twice)) int sigsetjmp(sigjmp_buf buf, int savesigs);
+[[gnu::returns_twice]] int sigsetjmp(sigjmp_buf buf, int savesigs);
 
 } // namespace LIBC_NAMESPACE_DECL
 

libc/src/setjmp/x86_64/CMakeLists.txt

@@ -4,10 +4,11 @@ add_entrypoint_object(
     setjmp.cpp
   HDRS
     ../setjmp_impl.h
-  DEPENDS
-    libc.hdr.types.jmp_buf
   COMPILE_OPTIONS
     ${libc_opt_high_flag}
+    -fomit-frame-pointer
+  DEPENDS
+    libc.hdr.types.jmp_buf
 )
 
 add_entrypoint_object(
@@ -16,13 +17,13 @@ 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.src.setjmp.sigsetjmp_epilogue
     libc.src.setjmp.setjmp
-  COMPILE_OPTIONS
-    ${libc_opt_high_flag}
 )
 
 add_entrypoint_object(
@@ -31,9 +32,9 @@ add_entrypoint_object(
     longjmp.cpp
   HDRS
     ../longjmp.h
-  DEPENDS
-    libc.hdr.types.jmp_buf
   COMPILE_OPTIONS
     ${libc_opt_high_flag}
     -fomit-frame-pointer
+  DEPENDS
+    libc.hdr.types.jmp_buf
 )

libc/src/setjmp/x86_64/sigsetjmp.cpp

@@ -41,7 +41,7 @@ LLVM_LIBC_FUNCTION(int, sigsetjmp, (sigjmp_buf buf)) {
       jmp %P[setjmp])" ::[retaddr] "i"(offsetof(__jmp_buf, sig_retaddr)),
       [extra] "i"(offsetof(__jmp_buf, sig_extra)), [setjmp] "i"(setjmp),
       [epilogue] "i"(sigsetjmp_epilogue)
-      : "rax", "rbx");
+      : "eax", "ebx", "ecx");
 }
 #endif
 [[gnu::naked]]