From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6BC65158020 for ; Mon, 28 Nov 2022 22:38:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A2F5E070D; Mon, 28 Nov 2022 22:38:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6D359E070D for ; Mon, 28 Nov 2022 22:38:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 76A3033BE91 for ; Mon, 28 Nov 2022 22:38:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F37D2617 for ; Mon, 28 Nov 2022 22:38:55 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1669674966.688be5587b9259bbd1bd64be6da4ebdb14f31299.dilfridge@gentoo> Subject: [gentoo-commits] proj/gcc-patches:master commit in: 13.1.0/gentoo/ X-VCS-Repository: proj/gcc-patches X-VCS-Files: 13.1.0/gentoo/23_all_DEF_GENTOO_ZNOW-z-now.patch 13.1.0/gentoo/23_all_EXTRA_OPTIONS-z-now.patch 13.1.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch 13.1.0/gentoo/24_all_EXTRA_OPTIONS-fstack-clash-protection.patch 13.1.0/gentoo/README.history X-VCS-Directories: 13.1.0/gentoo/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 688be5587b9259bbd1bd64be6da4ebdb14f31299 X-VCS-Branch: master Date: Mon, 28 Nov 2022 22:38:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 193672dd-bc54-468f-bfa9-4ff6a7f9b100 X-Archives-Hash: eef19797cb37faba1ea92c4c9c525fd1 commit: 688be5587b9259bbd1bd64be6da4ebdb14f31299 Author: Andreas K. Hüttel gentoo org> AuthorDate: Mon Nov 28 22:36:06 2022 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Mon Nov 28 22:36:06 2022 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=688be558 13.1.0: Move -z now and -fstack-clash-protection out of EXTRA_OPTIONS Signed-off-by: Andreas K. Hüttel gentoo.org> ..._EXTRA_OPTIONS-z-now.patch => 23_all_DEF_GENTOO_ZNOW-z-now.patch} | 4 ++-- ...ion.patch => 24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch} | 4 ++-- 13.1.0/gentoo/README.history | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/13.1.0/gentoo/23_all_EXTRA_OPTIONS-z-now.patch b/13.1.0/gentoo/23_all_DEF_GENTOO_ZNOW-z-now.patch similarity index 91% rename from 13.1.0/gentoo/23_all_EXTRA_OPTIONS-z-now.patch rename to 13.1.0/gentoo/23_all_DEF_GENTOO_ZNOW-z-now.patch index 8874b32..2ed7968 100644 --- a/13.1.0/gentoo/23_all_EXTRA_OPTIONS-z-now.patch +++ b/13.1.0/gentoo/23_all_DEF_GENTOO_ZNOW-z-now.patch @@ -1,4 +1,4 @@ -On Hardened we add some options like -z now +If requested we add -z now --- a/gcc/gcc.cc +++ b/gcc/gcc.cc @@ -6,7 +6,7 @@ On Hardened we add some options like -z now #endif #endif -+#ifdef EXTRA_OPTIONS ++#ifdef DEF_GENTOO_ZNOW +#define LINK_NOW_SPEC "%{!nonow:-z now} " +#else +#define LINK_NOW_SPEC "" diff --git a/13.1.0/gentoo/24_all_EXTRA_OPTIONS-fstack-clash-protection.patch b/13.1.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch similarity index 96% rename from 13.1.0/gentoo/24_all_EXTRA_OPTIONS-fstack-clash-protection.patch rename to 13.1.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch index e1b3c54..1ed716b 100644 --- a/13.1.0/gentoo/24_all_EXTRA_OPTIONS-fstack-clash-protection.patch +++ b/13.1.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch @@ -1,4 +1,4 @@ -On Hardened we add some options like -fstack-clash-protection. +We add -fstack-clash-protection if requested --- a/gcc/common.opt +++ a/gcc/common.opt @@ -19,7 +19,7 @@ On Hardened we add some options like -fstack-clash-protection. +/* Default value for flag_clash_protector when flag_clash_protector is + initialized to -1. */ -+#ifdef EXTRA_OPTIONS ++#ifdef DEF_GENTOO_SCP +#define DEFAULT_FLAG_SCP 1 +#endif +#ifndef DEFAULT_FLAG_SCP diff --git a/13.1.0/gentoo/README.history b/13.1.0/gentoo/README.history index 6c79f5f..3d797d2 100644 --- a/13.1.0/gentoo/README.history +++ b/13.1.0/gentoo/README.history @@ -1,3 +1,8 @@ + - 23_all_EXTRA_OPTIONS-z-now.patch + + 23_all_DEF_GENTOO_ZNOW-z-now.patch + - 24_all_EXTRA_OPTIONS-fstack-clash-protection.patch + + 24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch + 2 8 November 2022 - 12_all_disable-systemtap-switch.patch