From 38eb536afc067fe5bb6a8fbcbcb726cb735b4156 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 19 Feb 2018 03:02:30 +0000 Subject: drop -pie command line argument, profile builds PIE binaries by default anyway --- conf/intel/portage/env/nofortify.conf | 4 ++-- conf/intel/portage/env/ufortify.conf | 4 ++-- conf/intel/portage/global.conf/cflags.conf | 4 ++-- conf/intel/portage/package.env/00-dev.package.env | 1 - conf/intel/portage/package.env/00-sys.package.env | 1 - 5 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 conf/intel/portage/package.env/00-dev.package.env (limited to 'conf') diff --git a/conf/intel/portage/env/nofortify.conf b/conf/intel/portage/env/nofortify.conf index 1137a60..7a34013 100644 --- a/conf/intel/portage/env/nofortify.conf +++ b/conf/intel/portage/env/nofortify.conf @@ -1,5 +1,5 @@ -CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -pie" -CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -pie" +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" 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" MAKEOPTS="-j10" diff --git a/conf/intel/portage/env/ufortify.conf b/conf/intel/portage/env/ufortify.conf index 5884c4a..83fd54b 100644 --- a/conf/intel/portage/env/ufortify.conf +++ b/conf/intel/portage/env/ufortify.conf @@ -1,5 +1,5 @@ -CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -pie -Wp,-U_FORTIFY_SOURCE" -CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -pie -Wp,-U_FORTIFY_SOURCE" +CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -Wp,-U_FORTIFY_SOURCE" +CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -Wp,-U_FORTIFY_SOURCE" 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" MAKEOPTS="-j10" diff --git a/conf/intel/portage/global.conf/cflags.conf b/conf/intel/portage/global.conf/cflags.conf index 47fc39e..5b7ff0d 100644 --- a/conf/intel/portage/global.conf/cflags.conf +++ b/conf/intel/portage/global.conf/cflags.conf @@ -1,5 +1,5 @@ -CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -pie -Wp,-D_FORTIFY_SOURCE=2" -CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -pie -Wp,-D_FORTIFY_SOURCE=2" +CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -Wp,-D_FORTIFY_SOURCE=2" +CXXFLAGS="-O2 -march=x86-64 -mtune=generic -pipe -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations -fno-plt -fstack-protector-strong -Wp,-D_FORTIFY_SOURCE=2" 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" MAKEOPTS="-j10" diff --git a/conf/intel/portage/package.env/00-dev.package.env b/conf/intel/portage/package.env/00-dev.package.env deleted file mode 100644 index 6b8301e..0000000 --- a/conf/intel/portage/package.env/00-dev.package.env +++ /dev/null @@ -1 +0,0 @@ -dev-lang/perl nofortify.conf diff --git a/conf/intel/portage/package.env/00-sys.package.env b/conf/intel/portage/package.env/00-sys.package.env index 05c5a5e..849a347 100644 --- a/conf/intel/portage/package.env/00-sys.package.env +++ b/conf/intel/portage/package.env/00-sys.package.env @@ -1,2 +1 @@ sys-fs/dmraid noparallelmake.conf -sys-libs/glibc ufortify.conf -- cgit v1.2.3