summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pagano <mpagano@gentoo.org>2020-06-29 12:51:21 -0400
committerMike Pagano <mpagano@gentoo.org>2020-06-29 12:51:21 -0400
commita61b906f3aa6c3aaff64924b7a3c1ee7adda639d (patch)
tree7ec49ce6665844b3315c326f9cf576d2afbe3766
parentsci-libs/avogadrolibs: Bundled file patch is still needed in 1.93.0 (diff)
downloadgentoo-a61b906f3aa6c3aaff64924b7a3c1ee7adda639d.tar.gz
gentoo-a61b906f3aa6c3aaff64924b7a3c1ee7adda639d.tar.bz2
gentoo-a61b906f3aa6c3aaff64924b7a3c1ee7adda639d.zip
kernel-2.eclass: support gcc optimization patch for gcc 10.X
Signed-off-by: Mike Pagano <mpagano@gentoo.org>
-rw-r--r--eclass/kernel-2.eclass12
1 files changed, 11 insertions, 1 deletions
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