From patchwork Wed Oct 19 22:14:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 59111 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CF68D381FE71 for ; Wed, 19 Oct 2022 22:20:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CF68D381FE71 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666218015; bh=LRy1yKoZdLUCC582zJmV6S1x+mAsSfAjKMsJFa5+9vE=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=ZVjgc0ZeoKM5i08qDVmk/qsQKAWs8FtVTPzMNiUxuMQr35ucyIy9k9yV5jwmP3Avh xvx7APfZDJNnyMY49hiX71QEjQE5Mj7lqggWhG8uPUL+F+IvyTJmT1GqkF92R12etp zsjFoWhUU7d+GHycIabFJPZPfvuv0QrrfNmSm8SM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x34.google.com (mail-oa1-x34.google.com [IPv6:2001:4860:4864:20::34]) by sourceware.org (Postfix) with ESMTPS id AE25A3857B88 for ; Wed, 19 Oct 2022 22:15:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AE25A3857B88 Received: by mail-oa1-x34.google.com with SMTP id 586e51a60fabf-1321a1e94b3so22422622fac.1 for ; Wed, 19 Oct 2022 15:15:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LRy1yKoZdLUCC582zJmV6S1x+mAsSfAjKMsJFa5+9vE=; b=KUCxvx81kFQnmMqpir0AN95BThrt2g4Z7QR7Kw6rmiLC2f66oR2QNqsrTlI/TpFkOw hflbk6mJ4wMvWHU0/hSC2B+oNwQff/tmBeGVuZO1LB+sC54ZS51vLcYOV9KSgFBWlw2d NoWF7m9MAii5S7gphsFAY4K49LY2xi6h93FYn9wl3JuzZOpTy7EZzQF8R76gO8/rEMOt fiEpJqOpHpcSIATxlZRsNukawJXr77XvckW9ONOoIlosu1ZJj19fxW6GN7sXt5cYKxbF kAWOZkiFdaemkrLx9RcqLJb/t2ywCa+CR9CcKQWk87gLwPyJ4c3rI77/0lBKKXJ9CPyQ FRmA== X-Gm-Message-State: ACrzQf2O6arzK7CVDkwMOL3oUjrUM5cMaju959fdMFSd9bIhN466CyV7 P1UH25Q8otZ2NcebfCs7X0zi27sqmcIdZQCZ X-Google-Smtp-Source: AMsMyM4LbaLMVnGLu6pRoNqN94mUvex9Vd/Cm5JWHx1u42NWkk/Wrr9TX7Q6qEjKsLGc6S9d6uPVPA== X-Received: by 2002:a05:6870:e2cf:b0:132:9fa0:fc28 with SMTP id w15-20020a056870e2cf00b001329fa0fc28mr22145928oad.170.1666217700245; Wed, 19 Oct 2022 15:15:00 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c3:7d19:f1c1:9fb4:472a:ab68]) by smtp.gmail.com with ESMTPSA id m9-20020aca5809000000b00353fe4fb4casm7137927oib.48.2022.10.19.15.14.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 15:14:59 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 17/30] Linux: consolidate ____longjmp_chk Date: Wed, 19 Oct 2022 19:14:20 -0300 Message-Id: <20221019221433.1082017-18-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> References: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Checked on x86_64-linux-gnu. 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); void ____longjmp_chk (__jmp_buf env, int val) {