diff options
-rw-r--r-- | meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-architecture-Recognise-RISCV-32-RISCV-64.patch | 45 | ||||
-rw-r--r-- | meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb (renamed from meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb) | 5 |
2 files changed, 2 insertions, 48 deletions
diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-architecture-Recognise-RISCV-32-RISCV-64.patch b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-architecture-Recognise-RISCV-32-RISCV-64.patch deleted file mode 100644 index fc03812bb9..0000000000 --- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-architecture-Recognise-RISCV-32-RISCV-64.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From 4a6ace0a965965ea15e88c3418c7158ca5cc9f8f Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 21 Nov 2019 10:12:05 -0800 | ||
4 | Subject: [PATCH] architecture: Recognise RISCV-32/RISCV-64 | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/systemd/systemd/commit/171b53380085b1288b03b19a2b978f36a5c003d0] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | src/architecture.h | 13 +++++++++++++ | ||
10 | 1 file changed, 13 insertions(+) | ||
11 | |||
12 | diff --git a/src/architecture.h b/src/architecture.h | ||
13 | index 26679e2..89c7d32 100644 | ||
14 | --- a/src/architecture.h | ||
15 | +++ b/src/architecture.h | ||
16 | @@ -57,6 +57,8 @@ enum { | ||
17 | ARCHITECTURE_M68K, | ||
18 | ARCHITECTURE_TILEGX, | ||
19 | ARCHITECTURE_CRIS, | ||
20 | + ARCHITECTURE_RISCV32, | ||
21 | + ARCHITECTURE_RISCV64, | ||
22 | _ARCHITECTURE_MAX, | ||
23 | _ARCHITECTURE_INVALID = -1 | ||
24 | }; | ||
25 | @@ -194,6 +196,17 @@ int uname_architecture(void); | ||
26 | #elif defined(__cris__) | ||
27 | # define native_architecture() ARCHITECTURE_CRIS | ||
28 | # error "Missing LIB_ARCH_TUPLE for CRIS" | ||
29 | +#elif defined(__riscv) | ||
30 | +# if __SIZEOF_POINTER__ == 4 | ||
31 | +# define native_architecture() ARCHITECTURE_RISCV32 | ||
32 | +# define LIB_ARCH_TUPLE "riscv32-linux-gnu" | ||
33 | +# elif __SIZEOF_POINTER__ == 8 | ||
34 | +# define native_architecture() ARCHITECTURE_RISCV64 | ||
35 | +# define LIB_ARCH_TUPLE "riscv64-linux-gnu" | ||
36 | +# else | ||
37 | +# error "Unrecognized riscv architecture variant" | ||
38 | +# endif | ||
39 | +# define PROC_CPUINFO_MODEL "cpu model" | ||
40 | #else | ||
41 | # error "Please register your architecture here!" | ||
42 | #endif | ||
43 | -- | ||
44 | 2.24.0 | ||
45 | |||
diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb index bc3eee2093..25544029d5 100644 --- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb | |||
@@ -8,8 +8,7 @@ LICENSE = "LGPL-2.1-only & GPL-2.0-only" | |||
8 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \ | 8 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \ |
9 | file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe" | 9 | file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https;branch=master \ | 11 | SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https;branch=main \ |
12 | file://0001-architecture-Recognise-RISCV-32-RISCV-64.patch \ | ||
13 | file://mips64.patch \ | 12 | file://mips64.patch \ |
14 | file://no_lto.patch \ | 13 | file://no_lto.patch \ |
15 | " | 14 | " |
@@ -21,7 +20,7 @@ SRC_URI:append:libc-musl = " \ | |||
21 | " | 20 | " |
22 | 21 | ||
23 | 22 | ||
24 | SRCREV = "8183cfd9dad8beca5434d625cf6b2df87775e956" | 23 | SRCREV = "8ab9680a1bd5eb8fe7a7dcc44897af7ee41e56e7" |
25 | 24 | ||
26 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
27 | 26 | ||