diff options
author | wangmy <wangmy@fujitsu.com> | 2021-05-26 14:57:07 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-05-28 06:55:33 -0700 |
commit | ccacda40bcccbf27c7eebe12849a135337b8be38 (patch) | |
tree | 3f302c77627e8c301ff157d51a4ec004967c4152 /meta-oe/recipes-devtools/uftrace | |
parent | baa9453d57aa06554c823b5c7bd9c029e1858f89 (diff) | |
download | meta-openembedded-ccacda40bcccbf27c7eebe12849a135337b8be38.tar.gz |
uftrace: upgrade 0.9.4 -> 0.10
0001-aarch64-Fix-a-plthook-crash-on-aarch64-with-binutils.patch
removed since it is removed in 0.10
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/uftrace')
-rw-r--r-- | meta-oe/recipes-devtools/uftrace/uftrace/0001-aarch64-Fix-a-plthook-crash-on-aarch64-with-binutils.patch | 47 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/uftrace/uftrace_0.10.bb (renamed from meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb) | 3 |
2 files changed, 1 insertions, 49 deletions
diff --git a/meta-oe/recipes-devtools/uftrace/uftrace/0001-aarch64-Fix-a-plthook-crash-on-aarch64-with-binutils.patch b/meta-oe/recipes-devtools/uftrace/uftrace/0001-aarch64-Fix-a-plthook-crash-on-aarch64-with-binutils.patch deleted file mode 100644 index bf997d6e4b..0000000000 --- a/meta-oe/recipes-devtools/uftrace/uftrace/0001-aarch64-Fix-a-plthook-crash-on-aarch64-with-binutils.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0851278471472c6be69a936cc3698aa50a646ffd Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Wed, 12 May 2021 17:06:31 +0900 -Subject: [PATCH] aarch64: Fix a plthook crash on aarch64 with binutils2.35.1 - and later versions - -plthook is always crashed in Ubuntu 20.10 aarch64, which uses binutils 2.35.1. -Since the `plt_entsize` is not automatically set in this version, we have to -explicitly set the value. - -This patch fixes the following problem. - - $ uname -m - aarch64 - - $ cat /etc/os-release | grep PRETTY_NAME - PRETTY_NAME="Ubuntu 20.10" - - $ gcc -pg tests/s-abc.c - - $ uftrace record a.out - WARN: child terminated by signal: 7: Bus error - -Fixed: #1254 - -Upstream-status: submitted [Sent to https://github.com/namhyung/uftrace/pull/1248] - -Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> ---- - utils/symbol.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/utils/symbol.c b/utils/symbol.c -index 29a1d295..01e52dab 100644 ---- a/utils/symbol.c -+++ b/utils/symbol.c -@@ -560,6 +560,7 @@ int load_elf_dynsymtab(struct symtab *dsymtab, struct uftrace_elf_data *elf, - } - else if (elf->ehdr.e_machine == EM_AARCH64) { - plt_addr += 16; /* AARCH64 PLT0 size is 32 */ -+ plt_entsize = 16; - } - else if (elf->ehdr.e_machine == EM_386) { - plt_entsize += 12; --- -2.25.1 - diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.10.bb index a04fccca75..828c21cf9f 100644 --- a/meta-oe/recipes-devtools/uftrace/uftrace_0.9.4.bb +++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.10.bb @@ -11,9 +11,8 @@ DEPENDS_append_libc-musl = " argp-standalone" inherit autotools PV .= "+git${SRCPV}" -SRCREV = "d648bbffedef529220896283fb59e35531c13804" +SRCREV = "a5e5a51d32bdfe59af8b453ca08d78cbdf0b3c61" SRC_URI = "git://github.com/namhyung/${BPN} \ - file://0001-aarch64-Fix-a-plthook-crash-on-aarch64-with-binutils.patch \ " S = "${WORKDIR}/git" |