From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 8 Apr 2025 09:53:34 +0000 (+0200)
Subject: lto: Add & ~CF_SET into lto-opts.cc [PR119625]
X-Git-Tag: basepoints/gcc-16~247
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15baa0055601a00b77e2e0ed6259bbc9e5ea5fa9;p=thirdparty%2Fgcc.git

lto: Add & ~CF_SET into lto-opts.cc [PR119625]

The following patch uses & ~CF_SET so that we get the -fcf-protection=
options into .gnu.lto_.opts section even when it has CF_SET bit set.

2025-04-08  Jakub Jelinek  <jakub@redhat.com>

	PR lto/119625
	* lto-opts.cc (lto_write_options): Mask of CF_SET from
	global_options.x_flag_cf_protection.
---

diff --git a/gcc/lto-opts.cc b/gcc/lto-opts.cc
index 3959598b497..62a3fb28063 100644
--- a/gcc/lto-opts.cc
+++ b/gcc/lto-opts.cc
@@ -97,7 +97,7 @@ lto_write_options (void)
   if (!OPTION_SET_P (flag_cf_protection))
     {
       const char *cf_protection = NULL;
-      switch (global_options.x_flag_cf_protection)
+      switch (global_options.x_flag_cf_protection & ~CF_SET)
 	{
 	case CF_NONE: cf_protection = "-fcf-protection=none"; break;
 	case CF_FULL: cf_protection = "-fcf-protection=full"; break;