diff options
| author |   Sam James <sam@gentoo.org> | 2023-06-24 06:07:09 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-06-24 06:07:09 +0100 |
| commit | 4c9b4d49518302cbe0982834b279a90bf7c5b304 (patch) | |
| tree | 71cda7805d59884f6d6aeba84c9fdf17c8924154 /eclass | |
| parent | toolchain.eclass: wire up --enable-host-bind-now for GCC 14 (diff) | |
| download | gentoo-4c9b4d49518302cbe0982834b279a90bf7c5b304.tar.gz gentoo-4c9b4d49518302cbe0982834b279a90bf7c5b304.tar.bz2 gentoo-4c9b4d49518302cbe0982834b279a90bf7c5b304.zip | |
toolchain.eclass: namespace hardened function
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index b6f3b4a97649..dabdd3a8f4fa 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -569,7 +569,7 @@ toolchain_src_prepare() { eapply_user if ! use vanilla ; then - make_gcc_hard + tc_enable_hardened_gcc fi # Make sure the pkg-config files install into multilib dirs. @@ -653,8 +653,8 @@ do_gcc_gentoo_patches() { } # configure to build with the hardened GCC specs as the default -make_gcc_hard() { - local gcc_hard_flags="" +tc_enable_hardened_gcc() { + local hardened_gcc_flags="" if _tc_use_if_iuse pie ; then einfo "Updating gcc to use automatic PIE building ..." @@ -667,13 +667,13 @@ make_gcc_hard() { if _tc_use_if_iuse default-stack-clash-protection ; then # The define DEF_GENTOO_SCP is checked in 24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch einfo "Updating gcc to use automatic stack clash protection ..." - gcc_hard_flags+=" -DDEF_GENTOO_SCP" + hardened_gcc_flags+=" -DDEF_GENTOO_SCP" fi if _tc_use_if_iuse default-znow ; then # The define DEF_GENTOO_ZNOW is checked in 23_all_DEF_GENTOO_ZNOW-z-now.patch einfo "Updating gcc to request symbol resolution at start (-z now) ..." - gcc_hard_flags+=" -DDEF_GENTOO_ZNOW" + hardened_gcc_flags+=" -DDEF_GENTOO_ZNOW" fi if _tc_use_if_iuse hardened ; then @@ -681,14 +681,14 @@ make_gcc_hard() { # * -fstack-clash-protection # * -z now # See gcc *_all_extra-options.patch patches. - gcc_hard_flags+=" -DEXTRA_OPTIONS" + hardened_gcc_flags+=" -DEXTRA_OPTIONS" # Default to -D_FORTIFY_SOURCE=3 instead of -D_FORTIFY_SOURCE=2 - gcc_hard_flags+=" -DGENTOO_FORTIFY_SOURCE_LEVEL=3" + hardened_gcc_flags+=" -DGENTOO_FORTIFY_SOURCE_LEVEL=3" # Add -D_GLIBCXX_ASSERTIONS - gcc_hard_flags+=" -DDEF_GENTOO_GLIBCXX_ASSERTIONS" + hardened_gcc_flags+=" -DDEF_GENTOO_GLIBCXX_ASSERTIONS" if _tc_use_if_iuse cet && [[ ${CTARGET} == *x86_64*-linux* ]] ; then - gcc_hard_flags+=" -DEXTRA_OPTIONS_CF" + hardened_gcc_flags+=" -DEXTRA_OPTIONS_CF" fi # Rebrand to make bug reports easier @@ -706,7 +706,7 @@ make_gcc_hard() { -i "${S}"/gcc/Makefile.in || die sed -i \ - -e "/^HARD_CFLAGS = /s|=|= ${gcc_hard_flags} |" \ + -e "/^HARD_CFLAGS = /s|=|= ${hardened_gcc_flags} |" \ "${S}"/gcc/Makefile.in || die } |