Gentoo Archives: gentoo-commits

From: Mike Pagano <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Mon, 29 Jun 2020 16:51:44
Message-Id: 1593449481.a61b906f3aa6c3aaff64924b7a3c1ee7adda639d.mpagano@gentoo
1 commit: a61b906f3aa6c3aaff64924b7a3c1ee7adda639d
2 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 29 16:51:21 2020 +0000
4 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 29 16:51:21 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a61b906f
7
8 kernel-2.eclass: support gcc optimization patch for gcc 10.X
9
10 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
11
12 eclass/kernel-2.eclass | 12 +++++++++++-
13 1 file changed, 11 insertions(+), 1 deletion(-)
14
15 diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
16 index 04edee33930..4ac5cf86e77 100644
17 --- a/eclass/kernel-2.eclass
18 +++ b/eclass/kernel-2.eclass
19 @@ -1238,27 +1238,37 @@ unipatch() {
20 if [[ ${GCC_MAJOR_VER} -lt 8 ]] && [[ ${GCC_MAJOR_VER} -gt 4 ]]; then
21 UNIPATCH_DROP+=" 5011_enable-cpu-optimizations-for-gcc8.patch"
22 UNIPATCH_DROP+=" 5012_enable-cpu-optimizations-for-gcc91.patch"
23 + UNIPATCH_DROP+=" 5013_enable-cpu-optimizations-for-gcc10.patch"
24 # optimization patch for gcc >= 8 and kernel ge 4.13
25 elif [[ "${GCC_MAJOR_VER}" -eq 8 ]]; then
26 # support old kernels for a period. For now, remove as all gcc versions required are masked
27 UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc.patch"
28 UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
29 UNIPATCH_DROP+=" 5012_enable-cpu-optimizations-for-gcc91.patch"
30 - elif [[ "${GCC_MAJOR_VER}" -ge 9 ]] && [[ ${GCC_MINOR_VER} -ge 1 ]]; then
31 + UNIPATCH_DROP+=" 5013_enable-cpu-optimizations-for-gcc10.patch"
32 + elif [[ "${GCC_MAJOR_VER}" -eq 9 ]] && [[ ${GCC_MINOR_VER} -ge 1 ]]; then
33 UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc.patch"
34 UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
35 UNIPATCH_DROP+=" 5011_enable-cpu-optimizations-for-gcc8.patch"
36 + UNIPATCH_DROP+=" 5013_enable-cpu-optimizations-for-gcc10.patch"
37 + elif [[ "${GCC_MAJOR_VER}" -eq 10 ]] && [[ ${GCC_MINOR_VER} -ge 1 ]]; then
38 + UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc.patch"
39 + UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
40 + UNIPATCH_DROP+=" 5011_enable-cpu-optimizations-for-gcc8.patch"
41 + UNIPATCH_DROP+=" 5012_enable-cpu-optimizations-for-gcc91.patch"
42 else
43 UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc.patch"
44 UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
45 UNIPATCH_DROP+=" 5011_enable-cpu-optimizations-for-gcc8.patch"
46 UNIPATCH_DROP+=" 5012_enable-cpu-optimizations-for-gcc91.patch"
47 + UNIPATCH_DROP+=" 5013_enable-cpu-optimizations-for-gcc10.patch"
48 fi
49 else
50 UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc.patch"
51 UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
52 UNIPATCH_DROP+=" 5011_enable-cpu-optimizations-for-gcc8.patch"
53 UNIPATCH_DROP+=" 5012_enable-cpu-optimizations-for-gcc91.patch"
54 + UNIPATCH_DROP+=" 5013_enable-cpu-optimizations-for-gcc10.patch"
55 fi
56 fi
57 done