[gentoo-commits] repo/gentoo:master commit in: eclass/

[Matthias Maier]

commit:     acaffff075a2be413e9dbca54cc682f2bb265bc8
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 14 15:22:54 2017 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Jun 16 08:23:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acaffff0

eclass/toolchain-glibc.eclass: skip pie check for gcc-6 or newer

For gcc-6 and newer the old logic in the toolchain-glibc eclass:

  if use hardened && gcc-specs-pie ; then
    append-cppflags -DPIC
  else
    filter-flags -fPIE
  fi

is obsolete. Simply disable the check.

 eclass/toolchain-glibc.eclass | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass
index 1667f1ac7ad..1d6a54a37f1 100644
--- a/eclass/toolchain-glibc.eclass
+++ b/eclass/toolchain-glibc.eclass
@@ -266,14 +266,20 @@ setup_flags() {
                tc-enables-ssp && append-flags $(test-flags 
-fno-stack-protector)
        fi
 
-       if use hardened && tc-enables-pie ; then
-               # Force PIC macro definition for all compilations since they're 
all
-               # either -fPIC or -fPIE with the default-PIE compiler.
-               append-cppflags -DPIC
-       else
-               # Don't build -fPIE without the default-PIE compiler and the
-               # hardened-pie patch
-               filter-flags -fPIE
+       if [[ $(gcc-major-version) -lt 6 ]]; then
+               # Starting with gcc-6 (and fully upstreamed pie patches) we 
control
+               # default enabled/disabled pie via use flags. So nothing to do
+               # here. #618160
+
+               if use hardened && tc-enables-pie ; then
+                       # Force PIC macro definition for all compilations since 
they're all
+                       # either -fPIC or -fPIE with the default-PIE compiler.
+                       append-cppflags -DPIC
+               else
+                       # Don't build -fPIE without the default-PIE compiler 
and the
+                       # hardened-pie patch
+                       filter-flags -fPIE
+               fi
        fi
 }