SHA256
1
0
forked from pool/dwarves

Accepting request 844380 from devel:tools

- Add _service file / move to 1.18.g19 (863e6f0f)
(bsc#1177921):

OBS-URL: https://build.opensuse.org/request/show/844380
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dwarves?expand=0&rev=24
This commit is contained in:
Dominique Leuenberger 2020-11-02 08:36:53 +00:00 committed by Git OBS Bridge
commit 47a9ed2f61
7 changed files with 50 additions and 59 deletions

16
_service Normal file
View File

@ -0,0 +1,16 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">git://git.kernel.org/pub/scm/devel/pahole/pahole</param>
<param name="filename">dwarves</param>
<param name="revision">863e6f0f2cc08592a18239824e7604f955c74134</param>
<param name="parent-tag">v1.18</param>
<param name="versionformat">1.18.g@TAG_OFFSET@</param>
<param name="submodules">enable</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled"/>
</services>

3
dwarves-1.18.g19.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:95a7ed7f417c154dcd1d7a1b2143c89347f78e94e075db56b0cf8c347089a7cd
size 677304

View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iHUEABYIAB0WIQR2GiIUctdOfX2qHhGyPKLppCJ+JwUCX3eWuAAKCRCyPKLppCJ+
J55QAQDLwpxXtKxPlDDj3rYt80cZUZpC61b++LYBLmf3n/jFIwD/ec6iNeLGJkAR
QvmKuS7pvduzR8epg0ORx/Ahoze+qg4=
=CWxS
-----END PGP SIGNATURE-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:95aaec4c1d51816f6b2ce17fb80ddc95d48578e6bbdeafead3ecaf33a323d2c9
size 324912

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Tue Oct 27 15:52:01 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Add _service file / move to 1.18.g19 (863e6f0f)
* btf_encoder: Ignore zero-sized ELF symbols
-------------------------------------------------------------------
Tue Oct 27 13:00:23 UTC 2020 - Dirk Mueller <dmueller@suse.com>
- update to 1.18_15g040fd7f (bsc#1177921):
* btf_encoder: Support cross-compiled ELF binaries with different endianness
* strings: use BTF's string APIs for strings management
* strings: Rename strings.h to avoid clashing with /usr/include/strings.h
* dwarf_loader: increase the size of lookup hash map
* btf_encoder: revamp how per-CPU variables are encoded
* btf_encoder: Discard CUs after BTF encoding
* btf_encoder: Fix emitting __ARRAY_SIZE_TYPE__ as index range type
* btf_encoder: Use libbpf APIs to encode BTF type info
* btf_loader: Use libbpf to load BTF
* dwarves: Expose and maintain active debug info loader operations
* btf_encoder: detect BTF encoding errors and exit
* libbpf: Update to latest libbpf version
* dwarf_loader: Conditionally define DW_AT_alignment
* pahole: Implement --packed
* man-pages: Fix 'coimbine' typo
- remove libbpf-Fix-libbpf-hashmap-on-I-LP32-architectures.patch (upstream)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 2 22:00:47 UTC 2020 - Jan Engelhardt <jengelh@inai.de> Fri Oct 2 22:00:47 UTC 2020 - Jan Engelhardt <jengelh@inai.de>

View File

@ -17,7 +17,7 @@
Name: dwarves Name: dwarves
Version: 1.18 Version: 1.18.g19
Release: 0 Release: 0
Summary: DWARF utilities Summary: DWARF utilities
License: GPL-2.0-only License: GPL-2.0-only
@ -25,10 +25,10 @@ Group: Development/Tools/Debuggers
URL: http://acmel.wordpress.com/ URL: http://acmel.wordpress.com/
#Git-Clone: git://git.kernel.org/pub/scm/devel/pahole/pahole #Git-Clone: git://git.kernel.org/pub/scm/devel/pahole/pahole
#Git-Web: http://git.kernel.org/cgit/devel/pahole/pahole.git #Git-Web: http://git.kernel.org/cgit/devel/pahole/pahole.git
Source: https://fedorapeople.org/~acme/dwarves/dwarves-%version.tar.xz #Source: https://fedorapeople.org/~acme/dwarves/dwarves-%version.tar.xz
Source2: https://fedorapeople.org/~acme/dwarves/dwarves-%version.tar.sign #Source2: https://fedorapeople.org/~acme/dwarves/dwarves-%version.tar.sign
Source: %name-%version.tar.xz
Source9: baselibs.conf Source9: baselibs.conf
Patch1: libbpf-Fix-libbpf-hashmap-on-I-LP32-architectures.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: libdw-devel >= 0.170 BuildRequires: libdw-devel >= 0.170
%if 0%{?suse_version} < 1550 %if 0%{?suse_version} < 1550

View File

@ -1,45 +0,0 @@
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Thu, 9 Jul 2020 15:57:23 -0700
Subject: libbpf: Fix libbpf hashmap on (I)LP32 architectures
Git-commit: b2f9f1535bb93ee5fa2ea30ac1c26fa0d676154c
Patch-mainline: 5.8-rc5
References: x86_32 crashes fix
On ILP32, 64-bit result was shifted by value calculated for 32-bit long type
and returned value was much outside hashmap capacity.
As advised by Andrii Nakryiko, this patch uses different hashing variant for
architectures with size_t shorter than long long.
Fixes: e3b924224028 ("libbpf: add resizable non-thread safe internal hashmap")
Signed-off-by: Jakub Bogusz <qboosh@pld-linux.org>
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200709225723.1069937-1-andriin@fb.com
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
lib/bpf/src/hashmap.h | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
--- a/lib/bpf/src/hashmap.h
+++ b/lib/bpf/src/hashmap.h
@@ -16,11 +16,19 @@
#include <bits/reg.h>
#endif
#include "libbpf_internal.h"
+#include <limits.h>
static inline size_t hash_bits(size_t h, int bits)
{
/* shuffle bits and return requested number of upper bits */
- return (h * 11400714819323198485llu) >> (__WORDSIZE - bits);
+#if (__SIZEOF_SIZE_T__ == __SIZEOF_LONG_LONG__)
+ /* LP64 case */
+ return (h * 11400714819323198485llu) >> (__SIZEOF_LONG_LONG__ * 8 - bits);
+#elif (__SIZEOF_SIZE_T__ <= __SIZEOF_LONG__)
+ return (h * 2654435769lu) >> (__SIZEOF_LONG__ * 8 - bits);
+#else
+# error "Unsupported size_t size"
+#endif
}
typedef size_t (*hashmap_hash_fn)(const void *key, void *ctx);