From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id B1DEF39490AD for ; Mon, 5 Dec 2022 16:40:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B1DEF39490AD Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670258425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kbZq6mjhx3UEKKnHDLyqmFpWTeSijW1dCdMp1M0CA54=; b=GvSIL2Q35LREaDRfOE+Tn3vGPwEHYtQaQEupghoU2awe3RocaC2Xbn6tG86YAuax1xXCUM o7oncjkQTzIIeiyizzl2KXsLJIP07LRhoxsc00mCJhOeBnAqHOm9SJ+OYrmkU2Cz2Kfuu2 M2gClQkLYYY2pExjrC/aKhOTnPqJhpo= Received: from mail-il1-f199.google.com (mail-il1-f199.google.com [209.85.166.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-308-sjt02CAtP1-_Nzytad2I8g-1; Mon, 05 Dec 2022 11:40:24 -0500 X-MC-Unique: sjt02CAtP1-_Nzytad2I8g-1 Received: by mail-il1-f199.google.com with SMTP id i11-20020a056e02152b00b00303642498daso2196364ilu.5 for ; Mon, 05 Dec 2022 08:40:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:organization:from:references :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=kbZq6mjhx3UEKKnHDLyqmFpWTeSijW1dCdMp1M0CA54=; b=5aym0BrFLSjSzPoMMHeNmh9Wz6p2TE7mT38esPIgrgYxwX+Bc7aXn56mg55HqNiGB/ Avm6jGLx1/VAcIytsO7m9z/pou00M2N5U3zI8FXHWDIQvqfLDDA5nOV/d8Qm7/OHShta ucROlc82lP68o9BIAZ801trHO163SXcKth9E+DJG04yHmV+dX5n1Hlf588rTkIL0JVj/ 34Dg4OhW57hwgThgi3PYAPTh0zNYSbkh7E9TE1F0L5asII25Cke0R/9auwbb7lPFEzZG rw2zXaVXPAlVgkzdo4uESmKYGFRtlSesCN0Z5V76Aw58CYhzX+dgMvDri4R6noy+tUZw a+tw== X-Gm-Message-State: ANoB5pk/E1OdgKWnrLqdWUm0wUSo7Bb/CYm+rPbZLsKVUh1Z0TTdYkIO q7bPn8NzoaWaPYFd5UAgXHguNT+fs7zaDPlnASqzW89L5D9N9S6SXt5ejPqls7hE3sh7uaM1wBL d44/JA5peF/wszZtsElTa X-Received: by 2002:a05:6e02:dc5:b0:302:e604:f814 with SMTP id l5-20020a056e020dc500b00302e604f814mr25518306ilj.113.1670258423539; Mon, 05 Dec 2022 08:40:23 -0800 (PST) X-Google-Smtp-Source: AA0mqf6ywMFfKGCCKS+AynsKUs92AWLKt9NsKKlmnoP/VGONOZXRHt+NYC6bsSgRw1+52XcxuP5/qg== X-Received: by 2002:a05:6e02:dc5:b0:302:e604:f814 with SMTP id l5-20020a056e020dc500b00302e604f814mr25518303ilj.113.1670258423325; Mon, 05 Dec 2022 08:40:23 -0800 (PST) Received: from [192.168.0.241] (192-0-145-146.cpe.teksavvy.com. [192.0.145.146]) by smtp.gmail.com with ESMTPSA id a4-20020a056638058400b0038a13e116a1sm4624931jar.61.2022.12.05.08.40.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 Dec 2022 08:40:22 -0800 (PST) Message-ID: Date: Mon, 5 Dec 2022 11:40:21 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.0 Subject: Re: [PATCH 17/30] Linux: consolidate ____longjmp_chk To: Adhemerval Zanella , libc-alpha@sourceware.org References: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> <20221019221433.1082017-18-adhemerval.zanella@linaro.org> From: Carlos O'Donell Organization: Red Hat In-Reply-To: <20221019221433.1082017-18-adhemerval.zanella@linaro.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 10/19/22 18:14, Adhemerval Zanella via Libc-alpha wrote: > Checked on x86_64-linux-gnu. LGTM. No regressions on x86_64 and i686. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell > --- > sysdeps/unix/sysv/linux/{generic => }/____longjmp_chk.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > rename sysdeps/unix/sysv/linux/{generic => }/____longjmp_chk.c (90%) > > diff --git a/sysdeps/unix/sysv/linux/generic/____longjmp_chk.c b/sysdeps/unix/sysv/linux/____longjmp_chk.c > similarity index 90% > rename from sysdeps/unix/sysv/linux/generic/____longjmp_chk.c > rename to sysdeps/unix/sysv/linux/____longjmp_chk.c > index aac1158853..687cb27133 100644 > --- a/sysdeps/unix/sysv/linux/generic/____longjmp_chk.c > +++ b/sysdeps/unix/sysv/linux/____longjmp_chk.c > @@ -1,4 +1,5 @@ > -/* Copyright (C) 2011-2022 Free Software Foundation, Inc. > +/* longjmp fortify implementation. Linux version. > + Copyright (C) 2011-2022 Free Software Foundation, Inc. > This file is part of the GNU C Library. > > The GNU C Library is free software; you can redistribute it and/or > @@ -28,8 +29,7 @@ > #define called_from(this, saved) ((this) > (saved)) > #endif > > -extern void ____longjmp_chk (__jmp_buf __env, int __val) > - __attribute__ ((__noreturn__)); > +_Noreturn extern void ____longjmp_chk (__jmp_buf __env, int __val); OK. > > void ____longjmp_chk (__jmp_buf env, int val) > { -- Cheers, Carlos.