Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame^] | 1 | From 5492ac3c716020a27a25253bbffe810db43202bf Mon Sep 17 00:00:00 2001 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Thu, 9 Mar 2017 18:54:02 +0200 |
| 4 | Subject: [PATCH] Add a color setting for mips64_n32 binaries |
| 5 | |
| 6 | Upstream-Status: Inappropriate [oe-core specific] |
| 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame^] | 8 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 9 | --- |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame^] | 10 | build/rpmfc.c | 4 ++++ |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 11 | rpmrc.in | 2 ++ |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame^] | 12 | 2 files changed, 6 insertions(+) |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 13 | |
| 14 | diff --git a/build/rpmfc.c b/build/rpmfc.c |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame^] | 15 | index 10c380ee9..b7655aa93 100644 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 16 | --- a/build/rpmfc.c |
| 17 | +++ b/build/rpmfc.c |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame^] | 18 | @@ -639,6 +639,7 @@ exit: |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 19 | static const struct rpmfcTokens_s rpmfcTokens[] = { |
| 20 | { "directory", RPMFC_INCLUDE }, |
| 21 | |
| 22 | + { "N32 MIPS64", RPMFC_ELFMIPSN32|RPMFC_INCLUDE }, |
| 23 | { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, |
| 24 | { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, |
| 25 | |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame^] | 26 | @@ -1149,6 +1150,9 @@ static uint32_t getElfColor(const char *fn) |
| 27 | color = RPMFC_ELF32; |
| 28 | break; |
| 29 | } |
| 30 | + if (ehdr.e_machine == EM_MIPS || ehdr.e_machine == EM_MIPS_RS3_LE) |
| 31 | + if (ehdr.e_flags & EF_MIPS_ABI2) |
| 32 | + color = RPMFC_ELFMIPSN32; |
| 33 | elf_end(elf); |
| 34 | } |
| 35 | close(fd); |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 36 | diff --git a/rpmrc.in b/rpmrc.in |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame^] | 37 | index 5bd9ba3e5..f15bb8dad 100644 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 38 | --- a/rpmrc.in |
| 39 | +++ b/rpmrc.in |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame^] | 40 | @@ -137,6 +137,8 @@ archcolor: mipsr6el 1 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 41 | archcolor: mips64r6 2 |
| 42 | archcolor: mips64r6el 2 |
| 43 | |
| 44 | +archcolor: mips64_n32 4 |
| 45 | + |
| 46 | archcolor: m68k 1 |
| 47 | |
| 48 | archcolor: m68kmint 1 |