* [gentoo-commits] repo/gentoo:master commit in: dev-util/clippy/files/
@ 2022-06-02 4:16 Jakov Smolić
0 siblings, 0 replies; only message in thread
From: Jakov Smolić @ 2022-06-02 4:16 UTC (permalink / raw
To: gentoo-commits
commit: 0cd8f42daa39a23e8f995f2a95f1ce7b6996af18
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Jun 1 06:56:07 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Jun 2 04:16:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cd8f42d
dev-util/clippy: remove unused patch(es)
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25718
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-util/clippy/files/clippy-8.1-big-endian.patch | 57 -----------------------
1 file changed, 57 deletions(-)
diff --git a/dev-util/clippy/files/clippy-8.1-big-endian.patch b/dev-util/clippy/files/clippy-8.1-big-endian.patch
deleted file mode 100644
index fa715cf23858..000000000000
--- a/dev-util/clippy/files/clippy-8.1-big-endian.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://github.com/FRRouting/frr/commit/cfc45e911e21820bc8b703b37e947a6a7e5d798a.patch
-https://github.com/FRRouting/frr/issues/10051
-
-From: David Lamparter <equinox@opensourcerouting.org>
-Date: Tue, 18 Jan 2022 09:50:25 +0100
-Subject: [PATCH] lib/clippy: don't endian-convert twice
-
-elf_getdata_rawchunk() already endian-converts; doing it again is, uh,
-counterproductive.
-
-Fixes: #10051
-Reported-by: Lucian Cristian <lucian.cristian@gmail.com>
-Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---- a/lib/elf_py.c
-+++ b/lib/elf_py.c
-@@ -1071,26 +1071,25 @@ static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
- * always be a pointer...
- */
- if (elffile_virt2file(w, rel->r_offset, &offs)) {
-- Elf_Data *ptr, *conv;
-- GElf_Addr tmp;
-- Elf_Data mem = {
-- .d_buf = (void *)&tmp,
-- .d_type = ELF_T_ADDR,
-- .d_version = EV_CURRENT,
-- .d_size = sizeof(tmp),
-- .d_off = 0,
-- .d_align = 0,
-- };
-+ Elf_Data *ptr;
-
-+ /* NB: this endian-converts! */
- ptr = elf_getdata_rawchunk(w->elf, offs,
- w->elfclass / 8,
- ELF_T_ADDR);
-
-- conv = gelf_xlatetom(w->elf, &mem, ptr,
-- w->mmap[EI_DATA]);
-- if (conv) {
-- memcpy(&rel_offs, conv->d_buf,
-- conv->d_size);
-+ if (ptr) {
-+ char *dst = (char *)&rel_offs;
-+
-+ /* sigh. it endian-converts. but
-+ * doesn't size-convert.
-+ */
-+ if (BYTE_ORDER == BIG_ENDIAN &&
-+ ptr->d_size < sizeof(rel_offs))
-+ dst += sizeof(rel_offs) -
-+ ptr->d_size;
-+
-+ memcpy(dst, ptr->d_buf, ptr->d_size);
-
- relw->relative = false;
- relw->rela->r_addend = rel_offs;
-
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-02 4:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-02 4:16 [gentoo-commits] repo/gentoo:master commit in: dev-util/clippy/files/ Jakov Smolić
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox