commit: a61b906f3aa6c3aaff64924b7a3c1ee7adda639d
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 29 16:51:21 2020 +0000
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 16:51:21 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a61b906f
kernel-2.eclass: support gcc optimization patch for gcc 10.X
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
eclass/kernel-2.eclass | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 04edee33930..4ac5cf86e77 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1238,27 +1238,37 @@ unipatch() {
if [[ ${GCC_MAJOR_VER} -lt 8 ]] && [[
${GCC_MAJOR_VER} -gt 4 ]]; then
UNIPATCH_DROP+="
5011_enable-cpu-optimizations-for-gcc8.patch"
UNIPATCH_DROP+="
5012_enable-cpu-optimizations-for-gcc91.patch"
+ UNIPATCH_DROP+="
5013_enable-cpu-optimizations-for-gcc10.patch"
# optimization patch for gcc >= 8 and kernel ge
4.13
elif [[ "${GCC_MAJOR_VER}" -eq 8 ]]; then
# support old kernels for a period. For
now, remove as all gcc versions required are masked
UNIPATCH_DROP+="
5010_enable-additional-cpu-optimizations-for-gcc.patch"
UNIPATCH_DROP+="
5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
UNIPATCH_DROP+="
5012_enable-cpu-optimizations-for-gcc91.patch"
- elif [[ "${GCC_MAJOR_VER}" -ge 9 ]] && [[
${GCC_MINOR_VER} -ge 1 ]]; then
+ UNIPATCH_DROP+="
5013_enable-cpu-optimizations-for-gcc10.patch"
+ elif [[ "${GCC_MAJOR_VER}" -eq 9 ]] && [[
${GCC_MINOR_VER} -ge 1 ]]; then
UNIPATCH_DROP+="
5010_enable-additional-cpu-optimizations-for-gcc.patch"
UNIPATCH_DROP+="
5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
UNIPATCH_DROP+="
5011_enable-cpu-optimizations-for-gcc8.patch"
+ UNIPATCH_DROP+="
5013_enable-cpu-optimizations-for-gcc10.patch"
+ elif [[ "${GCC_MAJOR_VER}" -eq 10 ]] && [[
${GCC_MINOR_VER} -ge 1 ]]; then
+ UNIPATCH_DROP+="
5010_enable-additional-cpu-optimizations-for-gcc.patch"
+ UNIPATCH_DROP+="
5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
+ UNIPATCH_DROP+="
5011_enable-cpu-optimizations-for-gcc8.patch"
+ UNIPATCH_DROP+="
5012_enable-cpu-optimizations-for-gcc91.patch"
else
UNIPATCH_DROP+="
5010_enable-additional-cpu-optimizations-for-gcc.patch"
UNIPATCH_DROP+="
5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
UNIPATCH_DROP+="
5011_enable-cpu-optimizations-for-gcc8.patch"
UNIPATCH_DROP+="
5012_enable-cpu-optimizations-for-gcc91.patch"
+ UNIPATCH_DROP+="
5013_enable-cpu-optimizations-for-gcc10.patch"
fi
else
UNIPATCH_DROP+="
5010_enable-additional-cpu-optimizations-for-gcc.patch"
UNIPATCH_DROP+="
5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
UNIPATCH_DROP+="
5011_enable-cpu-optimizations-for-gcc8.patch"
UNIPATCH_DROP+="
5012_enable-cpu-optimizations-for-gcc91.patch"
+ UNIPATCH_DROP+="
5013_enable-cpu-optimizations-for-gcc10.patch"
fi
fi
done
