From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 50A1D3858415; Tue, 4 Oct 2022 13:04:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 50A1D3858415 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664888655; bh=zY60rN0/mahmVO+14B8mSOM5pcYT9y9zx1WJSM7unc4=; h=From:To:Subject:Date:From; b=LmgZftfRxSYwZl+6vGGziI4deHyMYiX2JQpKyy08MMup7HrQ6AdWlatrxv8Rs3iLp kHef4QMUMSdouheMyo+4XYqC+ILMvHx8puv9Uu7cTkny9p7vBIYnaaPJtEERyKFCKQ 5spupJbvOvY22IQwpZPL4No4SnqnJ1c8K7cnmy/g= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] Handle abort call for -fexceptions call X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: 29e993bdffa157b71629a8e008e8bf86274bc5ea X-Git-Newrev: 14c66233a01b97bb650558b4ae6e268d136a25eb Message-Id: <20221004130415.50A1D3858415@sourceware.org> Date: Tue, 4 Oct 2022 13:04:15 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=14c66233a01b97bb650558b4ae6e268d136a25eb commit 14c66233a01b97bb650558b4ae6e268d136a25eb Author: Adhemerval Zanella Date: Fri Apr 1 14:17:07 2022 -0300 Handle abort call for -fexceptions call clang might generate an abort call when cleanup functions (set by __attribute__ ((cleanup)) calls functions not marked as nothrow. We can mitigate by marking some internal functions as __THROW, but it is not possible for functions that issue used-provided callbacks (for instance pthread_once). Diff: --- sysdeps/generic/symbol-hacks.h | 7 +++++++ sysdeps/nptl/lowlevellock.h | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sysdeps/generic/symbol-hacks.h b/sysdeps/generic/symbol-hacks.h index 1115e4c0a7..560116d575 100644 --- a/sysdeps/generic/symbol-hacks.h +++ b/sysdeps/generic/symbol-hacks.h @@ -6,6 +6,13 @@ asm ("memmove = __GI_memmove"); asm ("memset = __GI_memset"); asm ("memcpy = __GI_memcpy"); +/* clang might generate an abort call when cleanup functions (set by + __attribute__ ((cleanup)) calls functions not marked as nothrow. + We can mitigate by marking some internal functions as __THROW, + but it is not possible for functions that issue used-provided + callbacks (for instance pthread_once). */ +asm ("abort = __GI_abort"); + /* Some targets do not use __stack_chk_fail_local. In libc.so, redirect __stack_chk_fail to a hidden reference __stack_chk_fail_local, to avoid the PLT reference. diff --git a/sysdeps/nptl/lowlevellock.h b/sysdeps/nptl/lowlevellock.h index 29aa9adb89..cde8473d60 100644 --- a/sysdeps/nptl/lowlevellock.h +++ b/sysdeps/nptl/lowlevellock.h @@ -125,9 +125,9 @@ libc_hidden_proto (__lll_lock_wait) #define lll_cond_lock(futex, private) __lll_cond_lock (&(futex), private) -extern void __lll_lock_wake_private (int *futex); +extern void __lll_lock_wake_private (int *futex) __THROW; libc_hidden_proto (__lll_lock_wake_private) -extern void __lll_lock_wake (int *futex, int private); +extern void __lll_lock_wake (int *futex, int private) __THROW; libc_hidden_proto (__lll_lock_wake) /* This is an expression rather than a statement even though its value is