Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dep/soname/, pym/portage/util/elf/
Date: Fri, 29 Dec 2017 19:35:56
Message-Id: 1514497042.d6a6b7c54a01a17f17a228e3d736bca255862816.zmedico@gentoo
1 commit: d6a6b7c54a01a17f17a228e3d736bca255862816
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 28 21:35:44 2017 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 28 21:37:22 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d6a6b7c5
7
8 multilib_category.py: add ALTERA_NIOS2 ELF type
9
10 Discovered as missing ELF as:
11
12 * QA Notice: Unrecognized ELF file(s):
13 * ALTERA_NIOS2;/lib/libz.so.1.2.11;libz.so.1;;libc.so.6;
14
15 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
16
17 pym/portage/dep/soname/multilib_category.py | 4 +++-
18 pym/portage/util/elf/constants.py | 1 +
19 2 files changed, 4 insertions(+), 1 deletion(-)
20
21 diff --git a/pym/portage/dep/soname/multilib_category.py b/pym/portage/dep/soname/multilib_category.py
22 index 62d064e38..84e018fb0 100644
23 --- a/pym/portage/dep/soname/multilib_category.py
24 +++ b/pym/portage/dep/soname/multilib_category.py
25 @@ -35,7 +35,8 @@ from __future__ import unicode_literals
26
27 from portage.util.elf.constants import (
28 EF_MIPS_ABI, EF_MIPS_ABI2, ELFCLASS32, ELFCLASS64,
29 - EM_386, EM_68K, EM_AARCH64, EM_ALPHA, EM_ARM, EM_IA_64, EM_MIPS,
30 + EM_386, EM_68K, EM_AARCH64, EM_ALPHA, EM_ARM, EM_ALTERA_NIOS2,
31 + EM_IA_64, EM_MIPS,
32 EM_PARISC, EM_PPC, EM_PPC64, EM_S390, EM_SH, EM_SPARC,
33 EM_SPARC32PLUS, EM_SPARCV9, EM_X86_64, E_MIPS_ABI_EABI32,
34 E_MIPS_ABI_EABI64, E_MIPS_ABI_O32, E_MIPS_ABI_O64)
35 @@ -45,6 +46,7 @@ _machine_prefix_map = {
36 EM_68K: "m68k",
37 EM_AARCH64: "arm",
38 EM_ALPHA: "alpha",
39 + EM_ALTERA_NIOS2: "nios2",
40 EM_ARM: "arm",
41 EM_IA_64: "ia64",
42 EM_MIPS: "mips",
43
44 diff --git a/pym/portage/util/elf/constants.py b/pym/portage/util/elf/constants.py
45 index f687fdbcc..4761cf427 100644
46 --- a/pym/portage/util/elf/constants.py
47 +++ b/pym/portage/util/elf/constants.py
48 @@ -33,6 +33,7 @@ EM_SH = 42
49 EM_SPARCV9 = 43
50 EM_IA_64 = 50
51 EM_X86_64 = 62
52 +EM_ALTERA_NIOS2 = 113
53 EM_AARCH64 = 183
54 EM_ALPHA = 0x9026