[v4,05/18] tools/nolibc: stackprotector.h: add empty __stack_chk_init for !_NOLIBC_STACKPROTECTOR
Message ID | dd9ac1e061084703d006f0e7dafc4d08ba8d8e52.1689444638.git.falcon@tinylab.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp297482vqt; Sat, 15 Jul 2023 11:54:58 -0700 (PDT) X-Google-Smtp-Source: APBJJlEW8mQCD0qa3XToOAOrKOuJRjZAy+B6MO/OeGTecPG7+YVvjv/15WfulLR/aUUWBXgGkQI/ X-Received: by 2002:a17:906:6817:b0:992:1b2:4090 with SMTP id k23-20020a170906681700b0099201b24090mr6089224ejr.64.1689447297685; Sat, 15 Jul 2023 11:54:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689447297; cv=none; d=google.com; s=arc-20160816; b=ldPD8mKC6VMLJRzwiRifGhboT4ydlEM7R3xGaZVcDSd1kH/sIcFPCmoBfW5WXTMC7G b2/ahnvBTFhvherlD8Cq14IvDk1lDWFaSr3PJTXOKXrFKGM9127ys0E92IX8LTnzsJjR aMI97Pvx5BYppTT1bfbu4F6atX50qmSe6cFapbukzovWDU+IFLCfHdiO/4Sk6zarQbMy e8oHIznUrAzU3Yz/TA5DmE8G2gqU4uz647zsB9hMTcdaDaEHoXU+JzVfoOQbF7SdFcKl OKlTfbljYQDDgFtqCJe4WIncUKk8VyuavluB3okpKoqXG1iBmukqjMh7zWoDWLcMBwXL GGqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:feedback-id:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=ODY9KmAhFGAn95ciey0dPd3PwmG7CLkHuL40F/IvTkw=; fh=sXngqCw1oXONrSSImRxZmGyzcK67QhJYp1RgY40tBsg=; b=ptUWOE4VlQ58dqUxOUhIPSnyjxB7j/fP0G2G8mPyeLubpoVPvuIHfgId0hU+ROW/xP O7joShQOhpKBgNCUsiikLp+dNfRd1qhUSmzxXREHc181kkGFTZ3Qj4dSjYrogT9yabNH wM/3qrCJISt6shs/x+XUrM9Lxj8klWiDgiTrrLxxZ1/SJbecsNGaO2IAZmjEx4LYUqQQ c2L3kC+If1MjGDHNz7wzNJve0Y4SNvTS0Dcf83AM3rDR46RuFkPiQx1NIwpj5m8GS/9u d4eO1AYbvFx6/EEd7+KVY2firrt0mTqaRo5Jr8/Yk+hj5yILyUp4qkR6WpjmV557xINc guug== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i9-20020a170906850900b0098e444cba76si10299222ejx.91.2023.07.15.11.54.30; Sat, 15 Jul 2023 11:54:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229974AbjGOSW2 (ORCPT <rfc822;daweilics@gmail.com> + 99 others); Sat, 15 Jul 2023 14:22:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229472AbjGOSW1 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sat, 15 Jul 2023 14:22:27 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.154.54.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EBD726AF; Sat, 15 Jul 2023 11:22:25 -0700 (PDT) X-QQ-mid: bizesmtp85t1689445336th79xll2 Received: from linux-lab-host.localdomain ( [119.123.131.162]) by bizesmtp.qq.com (ESMTP) with id ; Sun, 16 Jul 2023 02:22:15 +0800 (CST) X-QQ-SSF: 01200000002000D0W000B00A0000000 X-QQ-FEAT: 3M0okmaRx3gatoYt99Gz1/q2kqkvuelsEDwFaEoa/fIfIzbezdNVYl44zta39 +9Mkt5CDuGi7yZ2m+8kVUsmZP8VMJ0/DmOyIYYpPxkVO9/aT+kX2HsKFBNC99J10jtCJveT gPL0WetTKuh/GQl32ai0hVWemT2PKcVdhPF2/jW7NWScK8L+h6JZc3GJqFnGkq2WfvTfKgT XEuEP8rxflfmz9NzLbWr76sGy8V5AOA5PvHr8ANLqFP7ASLvcFPe1hhfoX1CmC1t9uT3ygM bP+b3SLYe5CQjg718rL7Vns/jDSkHUl1JjpMkOIfvN7cY0pfYA4uw7jqbl8NtzWDPtxphJM SwqCVseIyJjVKIrX8W9yomICM+q7Yh+eNbzP/oL6YKGWhb6sDx8q8yJumfhXQ== X-QQ-GoodBg: 0 X-BIZMAIL-ID: 11069775468019924728 From: Zhangjin Wu <falcon@tinylab.org> To: w@1wt.eu Cc: arnd@arndb.de, falcon@tinylab.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, thomas@t-8ch.de Subject: [PATCH v4 05/18] tools/nolibc: stackprotector.h: add empty __stack_chk_init for !_NOLIBC_STACKPROTECTOR Date: Sun, 16 Jul 2023 02:22:15 +0800 Message-Id: <dd9ac1e061084703d006f0e7dafc4d08ba8d8e52.1689444638.git.falcon@tinylab.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <cover.1689444638.git.falcon@tinylab.org> References: <cover.1689444638.git.falcon@tinylab.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrgz:qybglogicsvrgz5a-1 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771513889830940262 X-GMAIL-MSGID: 1771513889830940262 |
Series |
tools/nolibc: shrink arch support
|
|
Commit Message
Zhangjin Wu
July 15, 2023, 6:22 p.m. UTC
Let's define an empty __stack_chk_init for the !_NOLIBC_STACKPROTECTOR
branch.
This allows to remove #ifdef around every call of __stack_chk_init().
Signed-off-by: Zhangjin Wu <falcon@tinylab.org>
---
tools/include/nolibc/stackprotector.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/include/nolibc/stackprotector.h b/tools/include/nolibc/stackprotector.h index 88f7b2d098ff..b620f2b9578d 100644 --- a/tools/include/nolibc/stackprotector.h +++ b/tools/include/nolibc/stackprotector.h @@ -45,6 +45,8 @@ void __stack_chk_init(void) if (__stack_chk_guard != (uintptr_t) &__stack_chk_guard) __stack_chk_guard ^= (uintptr_t) &__stack_chk_guard; } +#else /* !defined(_NOLIBC_STACKPROTECTOR) */ +__inline__ void __stack_chk_init(void) {} #endif /* defined(_NOLIBC_STACKPROTECTOR) */ #endif /* _NOLIBC_STACKPROTECTOR_H */