[libc-commits] [libc] Revert "[libc][RISCV] Add naked attribute to setjmp/longjmp" (PR #100193)

Paul Kirth via libc-commits libc-commits at lists.llvm.org
Tue Jul 23 13:16:58 PDT 2024


https://github.com/ilovepi created https://github.com/llvm/llvm-project/pull/100193

Reverts llvm/llvm-project#100036

This caused a failure on bots:    https://lab.llvm.org/buildbot/#/builders/183/builds/1799

We likely need to discuss the particulars here a bit more deeply before either relanding or choosing an alternate solution

>From 4c07e7f659ab91c22c1b0440080902d0b931195d Mon Sep 17 00:00:00 2001
From: Paul Kirth <paulkirth at google.com>
Date: Tue, 23 Jul 2024 13:15:47 -0700
Subject: [PATCH] Revert "[libc][RISCV] Add naked attribute to setjmp/longjmp
 (#100036)"

This reverts commit 05b586be3d70cd51c809c52a67d36517fb4b8f6f.
---
 libc/src/setjmp/riscv/longjmp.cpp | 1 -
 libc/src/setjmp/riscv/setjmp.cpp  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/libc/src/setjmp/riscv/longjmp.cpp b/libc/src/setjmp/riscv/longjmp.cpp
index b14f636659ac3..0f9537ccc4151 100644
--- a/libc/src/setjmp/riscv/longjmp.cpp
+++ b/libc/src/setjmp/riscv/longjmp.cpp
@@ -30,7 +30,6 @@
 
 namespace LIBC_NAMESPACE_DECL {
 
-[[gnu::naked]]
 LLVM_LIBC_FUNCTION(void, longjmp, (__jmp_buf * buf, int val)) {
   LOAD(ra, buf->__pc);
   LOAD(s0, buf->__regs[0]);
diff --git a/libc/src/setjmp/riscv/setjmp.cpp b/libc/src/setjmp/riscv/setjmp.cpp
index 92982cc9d74d4..12def578b56f3 100644
--- a/libc/src/setjmp/riscv/setjmp.cpp
+++ b/libc/src/setjmp/riscv/setjmp.cpp
@@ -29,7 +29,6 @@
 
 namespace LIBC_NAMESPACE_DECL {
 
-[[gnu::naked]]
 LLVM_LIBC_FUNCTION(int, setjmp, (__jmp_buf * buf)) {
   STORE(ra, buf->__pc);
   STORE(s0, buf->__regs[0]);



More information about the libc-commits mailing list