musl - musl - an implementation of the standard library for Linux-based systems

musl - an implementation of the standard library for Linux-based systems

diff options

author	Rich Felker <dalias@aerifal.cx>	2013年07月24日 02:17:02 -0400
committer	Rich Felker <dalias@aerifal.cx>	2013年07月24日 02:17:02 -0400
commit	9693501c158d68431962938cb02e7d8d2ef89ca3 (patch)
tree	2596b176d5dfe6f05854a86286d52d2a233b0354 /src
parent	4a30ba5ca4072e85e42e84547572e958871952a2 (diff)
download	musl-9693501c158d68431962938cb02e7d8d2ef89ca3.tar.gz

change jmp_buf to share an underlying type and struct tag with sigjmp_buf

this is necessary to meet the C++ ABI target. alternatives were considered to avoid the size increase for non-sig jmp_buf objects, but they seemed to have worse properties. moreover, the relative size increase is only extreme on x86[_64]; one way of interpreting this is that, if the size increase from this patch makes jmp_buf use too much memory, then the program was already using too much memory when built for non-x86 archs.

Diffstat (limited to 'src')

-rw-r--r--

src/signal/siglongjmp.c

-rw-r--r--

src/signal/sigsetjmp.c

2 files changed, 2 insertions, 2 deletions

diff --git a/src/signal/siglongjmp.c b/src/signal/siglongjmp.c
index a7bcca24..2974ff7f 100644
--- a/src/signal/siglongjmp.c
+++ b/src/signal/siglongjmp.c

@@ -7,5 +7,5 @@

_Noreturn void siglongjmp(sigjmp_buf buf, int ret)

{

if (buf->__fl) __restore_sigs(buf->__ss);

- longjmp(buf->__jb, ret);

+ longjmp(buf, ret);

}

diff --git a/src/signal/sigsetjmp.c b/src/signal/sigsetjmp.c
index 01ba0dff..6a5f6f15 100644
--- a/src/signal/sigsetjmp.c
+++ b/src/signal/sigsetjmp.c

@@ -11,5 +11,5 @@ int sigsetjmp(sigjmp_buf buf, int save)

{

if ((buf->__fl = save))

pthread_sigmask(SIG_SETMASK, 0, (sigset_t *)buf->__ss);

- return setjmp(buf->__jb);

+ return setjmp(buf);

}

generated by cgit v1.2.1 (git 2.18.0) at 2025年10月06日 17:34:37 +0000