adjust CFLAGS for profile 23.0 migration

30 files changed, 53 insertions, 54 deletions

diff --git a/conf/intel/portage/env/copydtentries.conf b/conf/intel/portage/env/00-copy-dt-needed-entries.conf
index 992b87e..992b87e 100644
--- a/conf/intel/portage/env/copydtentries.conf
+++ b/conf/intel/portage/env/00-copy-dt-needed-entries.conf
diff --git a/conf/intel/portage/env/00-disable-bind-now.conf b/conf/intel/portage/env/00-disable-bind-now.conf
new file mode 100644
index 0000000..87bb822
--- /dev/null
+++ b/conf/intel/portage/env/00-disable-bind-now.conf
@@ -0,0 +1,5 @@
+# This file has been automatically generated, do not edit.
+
+CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -Wno-deprecated -Wno-deprecated-declarations -fstack-protector-strong -fstack-clash-protection -fcf-protection=full"
+CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -Wno-deprecated -Wno-deprecated-declarations -fstack-protector-strong -fstack-clash-protection -fcf-protection=full"
+LDFLAGS="-Wl,--hash-style=gnu -Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro"
diff --git a/conf/intel/portage/env/00-disable-fcf-protection.conf b/conf/intel/portage/env/00-disable-fcf-protection.conf
new file mode 100644
index 0000000..349c82e
--- /dev/null
+++ b/conf/intel/portage/env/00-disable-fcf-protection.conf
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -fstack-clash-protection"
+CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -fstack-clash-protection"
diff --git a/conf/intel/portage/env/00-disable-hardening.conf b/conf/intel/portage/env/00-disable-hardening.conf
new file mode 100644
index 0000000..dd4a31e
--- /dev/null
+++ b/conf/intel/portage/env/00-disable-hardening.conf
@@ -0,0 +1,5 @@
+# This file has been automatically generated, do not edit.
+
+CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -Wno-deprecated -Wno-deprecated-declarations"
+CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -Wno-deprecated -Wno-deprecated-declarations"
+LDFLAGS="-Wl,--hash-style=gnu -Wl,-O1 -Wl,--sort-common -Wl,--as-needed"
diff --git a/conf/intel/portage/env/nostrict.conf b/conf/intel/portage/env/00-disable-multilib-strict.conf
index fb3bd09..fb3bd09 100644
--- a/conf/intel/portage/env/nostrict.conf
+++ b/conf/intel/portage/env/00-disable-multilib-strict.conf
diff --git a/conf/intel/portage/env/noparallelmake.conf b/conf/intel/portage/env/00-disable-parallel-make.conf
index 735195e..735195e 100644
--- a/conf/intel/portage/env/noparallelmake.conf
+++ b/conf/intel/portage/env/00-disable-parallel-make.conf
diff --git a/conf/intel/portage/env/nosseavx.conf b/conf/intel/portage/env/00-disable-sse-avx.conf
index 60b1783..60b1783 100644
--- a/conf/intel/portage/env/nosseavx.conf
+++ b/conf/intel/portage/env/00-disable-sse-avx.conf
diff --git a/conf/intel/portage/env/00-disable-stack-clash-protection.conf b/conf/intel/portage/env/00-disable-stack-clash-protection.conf
new file mode 100644
index 0000000..1dc7320
--- /dev/null
+++ b/conf/intel/portage/env/00-disable-stack-clash-protection.conf
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong"
+CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong"
diff --git a/conf/intel/portage/env/00-disable-stack-protector.conf b/conf/intel/portage/env/00-disable-stack-protector.conf
new file mode 100644
index 0000000..88f5a6f
--- /dev/null
+++ b/conf/intel/portage/env/00-disable-stack-protector.conf
@@ -0,0 +1,4 @@
+# This file has been automatically generated, do not edit.
+
+CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -Wno-deprecated -Wno-deprecated-declarations -fno-plt"
+CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -Wno-deprecated -Wno-deprecated-declarations -fno-plt"
diff --git a/conf/intel/portage/env/userpriv.conf b/conf/intel/portage/env/00-enable-userpriv.conf
index 641d058..641d058 100644
--- a/conf/intel/portage/env/userpriv.conf
+++ b/conf/intel/portage/env/00-enable-userpriv.conf
diff --git a/conf/intel/portage/env/noframepointer.conf b/conf/intel/portage/env/00-omit-frame-pointer.conf
index 8b048f7..8b048f7 100644
--- a/conf/intel/portage/env/noframepointer.conf
+++ b/conf/intel/portage/env/00-omit-frame-pointer.conf
diff --git a/conf/intel/portage/env/basic.conf b/conf/intel/portage/env/basic.conf
deleted file mode 100644
index db42aa3..0000000
--- a/conf/intel/portage/env/basic.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations"
-CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations"
-LDFLAGS="-Wl,--hash-style=gnu -Wl,-O1 -Wl,--sort-common -Wl,--as-needed"
diff --git a/conf/intel/portage/env/nofcfprotection.conf b/conf/intel/portage/env/nofcfprotection.conf
deleted file mode 100644
index 93d4d49..0000000
--- a/conf/intel/portage/env/nofcfprotection.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -fstack-clash-protection"
-CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -fstack-clash-protection"
diff --git a/conf/intel/portage/env/nostackclashprotection.conf b/conf/intel/portage/env/nostackclashprotection.conf
deleted file mode 100644
index 07b8e3a..0000000
--- a/conf/intel/portage/env/nostackclashprotection.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong"
-CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong"
diff --git a/conf/intel/portage/env/nostackprotector.conf b/conf/intel/portage/env/nostackprotector.conf
deleted file mode 100644
index 05d4e71..0000000
--- a/conf/intel/portage/env/nostackprotector.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt"
-CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt"
diff --git a/conf/intel/portage/env/pltnonow.conf b/conf/intel/portage/env/pltnonow.conf
deleted file mode 100644
index 1ba070f..0000000
--- a/conf/intel/portage/env/pltnonow.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file has been automatically generated, do not edit.
-
-CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fstack-protector-strong -fstack-clash-protection -fcf-protection=full"
-CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fstack-protector-strong -fstack-clash-protection -fcf-protection=full"
-LDFLAGS="-Wl,--hash-style=gnu -Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro"
diff --git a/conf/intel/portage/make.conf/00-cflags b/conf/intel/portage/make.conf/00-cflags
index 21bfa2f..f38c39a 100644
--- a/conf/intel/portage/make.conf/00-cflags
+++ b/conf/intel/portage/make.conf/00-cflags
@@ -1,6 +1,5 @@
 # This file has been automatically generated, do not edit.
 
-CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -fstack-clash-protection -fcf-protection=full"
-CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -fstack-clash-protection -fcf-protection=full"
+CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -fstack-clash-protection -fcf-protection=full"
+CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -fstack-clash-protection -fcf-protection=full"
 LDFLAGS="-Wl,--hash-style=gnu -Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,now -Wl,-z,relro"
-CHOST="x86_64-pc-linux-gnu"
diff --git a/conf/intel/portage/package.env/00-app-emulation b/conf/intel/portage/package.env/00-app-emulation
index e1c26b4..e1c520a 100644
--- a/conf/intel/portage/package.env/00-app-emulation
+++ b/conf/intel/portage/package.env/00-app-emulation
@@ -1,3 +1,3 @@
 # This file has been automatically generated, do not edit.
 
-app-emulation/virtualbox basic.conf
+app-emulation/virtualbox 00-disable-hardening.conf
diff --git a/conf/intel/portage/package.env/00-app-office b/conf/intel/portage/package.env/00-app-office
index cb5b821..190866a 100644
--- a/conf/intel/portage/package.env/00-app-office
+++ b/conf/intel/portage/package.env/00-app-office
@@ -1,3 +1,3 @@
 # This file has been automatically generated, do not edit.
 
-app-office/libreoffice userpriv.conf
+app-office/libreoffice 00-enable-userpriv.conf
diff --git a/conf/intel/portage/package.env/00-games-emulation b/conf/intel/portage/package.env/00-games-emulation
index 0ecb721..5e88f0c 100644
--- a/conf/intel/portage/package.env/00-games-emulation
+++ b/conf/intel/portage/package.env/00-games-emulation
@@ -1,3 +1,3 @@
 # This file has been automatically generated, do not edit.
 
-games-emulation/zsnes nofcfprotection.conf
+games-emulation/zsnes 00-disable-fcf-protection.conf
diff --git a/conf/intel/portage/package.env/00-mail-client b/conf/intel/portage/package.env/00-mail-client
index 926e68c..a1d24d6 100644
--- a/conf/intel/portage/package.env/00-mail-client
+++ b/conf/intel/portage/package.env/00-mail-client
@@ -1,3 +1,3 @@
 # This file has been automatically generated, do not edit.
 
-mail-client/thunderbird userpriv.conf
+mail-client/thunderbird 00-enable-userpriv.conf
diff --git a/conf/intel/portage/package.env/00-media-libs b/conf/intel/portage/package.env/00-media-libs
index a048701..a91f1ee 100644
--- a/conf/intel/portage/package.env/00-media-libs
+++ b/conf/intel/portage/package.env/00-media-libs
@@ -1,4 +1,4 @@
 # This file has been automatically generated, do not edit.
 
-media-libs/libaom nosseavx.conf
-media-libs/x264 noframepointer.conf
+media-libs/libaom 00-disable-sse-avx.conf
+media-libs/x264 00-omit-frame-pointer.conf
diff --git a/conf/intel/portage/package.env/00-media-video b/conf/intel/portage/package.env/00-media-video
index afe64ae..ff747b1 100644
--- a/conf/intel/portage/package.env/00-media-video
+++ b/conf/intel/portage/package.env/00-media-video
@@ -1,3 +1,3 @@
 # This file has been automatically generated, do not edit.
 
-media-video/handbrake copydtentries.conf
+media-video/handbrake 00-copy-dt-needed-entries.conf
diff --git a/conf/intel/portage/package.env/00-net-dns b/conf/intel/portage/package.env/00-net-dns
index 0234be8..ad73dc9 100644
--- a/conf/intel/portage/package.env/00-net-dns
+++ b/conf/intel/portage/package.env/00-net-dns
@@ -1,3 +1,3 @@
 # This file has been automatically generated, do not edit.
 
-net-dns/getdns nostrict.conf
+net-dns/getdns 00-disable-multilib-strict.conf
diff --git a/conf/intel/portage/package.env/00-sys-boot b/conf/intel/portage/package.env/00-sys-boot
index d111417..6bc8662 100644
--- a/conf/intel/portage/package.env/00-sys-boot
+++ b/conf/intel/portage/package.env/00-sys-boot
@@ -1,4 +1,4 @@
 # This file has been automatically generated, do not edit.
 
-sys-boot/plymouth nostackclashprotection.conf
-sys-boot/syslinux nofcfprotection.conf
+sys-boot/plymouth 00-disable-stack-clash-protection.conf
+sys-boot/syslinux 00-disable-fcf-protection.conf
diff --git a/conf/intel/portage/package.env/00-sys-fs b/conf/intel/portage/package.env/00-sys-fs
index 0486099..b3aa22a 100644
--- a/conf/intel/portage/package.env/00-sys-fs
+++ b/conf/intel/portage/package.env/00-sys-fs
@@ -1,3 +1,3 @@
 # This file has been automatically generated, do not edit.
 
-sys-fs/dmraid noparallelmake.conf
+sys-fs/dmraid 00-disable-parallel-make.conf
diff --git a/conf/intel/portage/package.env/00-sys-libs b/conf/intel/portage/package.env/00-sys-libs
index 398a48a..a319c3c 100644
--- a/conf/intel/portage/package.env/00-sys-libs
+++ b/conf/intel/portage/package.env/00-sys-libs
@@ -1,4 +1,4 @@
 # This file has been automatically generated, do not edit.
 
-sys-libs/glibc noparallelmake.conf
-sys-libs/libstdc++-v3 nostackprotector.conf
+sys-libs/glibc 00-disable-parallel-make.conf
+sys-libs/libstdc++-v3 00-disable-stack-protector.conf
diff --git a/conf/intel/portage/package.env/00-www-client b/conf/intel/portage/package.env/00-www-client
index 645590b..436a266 100644
--- a/conf/intel/portage/package.env/00-www-client
+++ b/conf/intel/portage/package.env/00-www-client
@@ -1,3 +1,3 @@
 # This file has been automatically generated, do not edit.
 
-www-client/firefox userpriv.conf
+www-client/firefox 00-enable-userpriv.conf
diff --git a/conf/intel/portage/package.env/00-x11-base b/conf/intel/portage/package.env/00-x11-base
index ee3adec..8b82cc8 100644
--- a/conf/intel/portage/package.env/00-x11-base
+++ b/conf/intel/portage/package.env/00-x11-base
@@ -1,4 +1,4 @@
 # This file has been automatically generated, do not edit.
 
-x11-base/xorg-server pltnonow.conf
-x11-base/xwayland pltnonow.conf
+x11-base/xorg-server 00-disable-bind-now.conf
+x11-base/xwayland 00-disable-bind-now.conf
diff --git a/conf/intel/portage/package.env/00-x11-drivers b/conf/intel/portage/package.env/00-x11-drivers
index 9393188..ae57335 100644
--- a/conf/intel/portage/package.env/00-x11-drivers
+++ b/conf/intel/portage/package.env/00-x11-drivers
@@ -1,15 +1,15 @@
 # This file has been automatically generated, do not edit.
 
-x11-drivers/xf86-input-evdev pltnonow.conf
-x11-drivers/xf86-input-joystick pltnonow.conf
-x11-drivers/xf86-input-libinput pltnonow.conf
-x11-drivers/xf86-input-synaptics pltnonow.conf
-x11-drivers/xf86-input-wacom pltnonow.conf
-x11-drivers/xf86-video-amdgpu pltnonow.conf
-x11-drivers/xf86-video-ati pltnonow.conf
-x11-drivers/xf86-video-intel pltnonow.conf
-x11-drivers/xf86-video-nouveau pltnonow.conf
-x11-drivers/xf86-video-qxl pltnonow.conf
-x11-drivers/xf86-video-vboxvideo pltnonow.conf
-x11-drivers/xf86-video-vesa pltnonow.conf
-x11-drivers/xf86-video-vmware pltnonow.conf
+x11-drivers/xf86-input-evdev 00-disable-bind-now.conf
+x11-drivers/xf86-input-joystick 00-disable-bind-now.conf
+x11-drivers/xf86-input-libinput 00-disable-bind-now.conf
+x11-drivers/xf86-input-synaptics 00-disable-bind-now.conf
+x11-drivers/xf86-input-wacom 00-disable-bind-now.conf
+x11-drivers/xf86-video-amdgpu 00-disable-bind-now.conf
+x11-drivers/xf86-video-ati 00-disable-bind-now.conf
+x11-drivers/xf86-video-intel 00-disable-bind-now.conf
+x11-drivers/xf86-video-nouveau 00-disable-bind-now.conf
+x11-drivers/xf86-video-qxl 00-disable-bind-now.conf
+x11-drivers/xf86-video-vboxvideo 00-disable-bind-now.conf
+x11-drivers/xf86-video-vesa 00-disable-bind-now.conf
+x11-drivers/xf86-video-vmware 00-disable-bind-now.conf