mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
debugedit: upgrade 5.1 -> 5.2
0001-Add-option-to-allow-disabling-inlined-xxhash.patch removed since it's included in 5.2 (From OE-Core rev: 15f6172eceea91a844114d8e13051131094232f1) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
403e50f043
commit
5f3e6fc780
@@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
|
||||
file://COPYING3;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
SRC_URI = "https://sourceware.org/ftp/debugedit/${PV}/debugedit-${PV}.tar.xz \
|
||||
file://0001-Add-option-to-allow-disabling-inlined-xxhash.patch \
|
||||
file://0003-Makefile.am-do-not-update-manual.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "ee9b688b2ed8fa62551c54cb5dc31aaa05853e7dedbd9e1237c77894ea5e3626"
|
||||
SRC_URI[sha256sum] = "705296803cc4403f38764e891b4ed38f8d8d4f8a9164bd4f86c9d4bedcac68dd"
|
||||
|
||||
DEPENDS = "elfutils xxhash"
|
||||
DEPENDS:append:libc-musl = " musl-legacy-error"
|
||||
@@ -1,81 +0,0 @@
|
||||
From 820498e881401a6f4b1715dc6831da965f6e1d69 Mon Sep 17 00:00:00 2001
|
||||
From: Chen Qi <Qi.Chen@windriver.com>
|
||||
Date: Tue, 18 Feb 2025 18:50:46 -0800
|
||||
Subject: [PATCH] Add option to allow disabling inlined xxhash
|
||||
|
||||
xxhash cannot always inline. For example, when using gcc14 and
|
||||
'-Og' option, xxhash cannot inline. See links below:
|
||||
https://github.com/Cyan4973/xxHash/commit/574aabad87b2ab9440403e92e1075ef48554eb87
|
||||
https://github.com/Cyan4973/xxHash/issues/943#issuecomment-2563205130
|
||||
|
||||
To allow users successfully build debugedit with gcc14 and "-Og" option,
|
||||
add an option to allow disabling inlined xxhash.
|
||||
|
||||
This patch refers to a similar patch for libabigail:
|
||||
https://sourceware.org/cgit/libabigail/commit/?id=50497911e2590c21270e0763d277457cf7752c3f
|
||||
|
||||
Note that the default remains using inlined xxhash.
|
||||
|
||||
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
||||
|
||||
Upstream-Status: Backport [https://sourceware.org/cgit/debugedit/commit/?id=820498e881401a6f4b1715dc6831da965f6e1d69]
|
||||
|
||||
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
||||
---
|
||||
Makefile.am | 4 ++--
|
||||
configure.ac | 11 +++++++++++
|
||||
tools/debugedit.c | 1 -
|
||||
3 files changed, 13 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index c590edf..35fd947 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -42,8 +42,8 @@ find-debuginfo: $(top_srcdir)/scripts/find-debuginfo.in Makefile
|
||||
|
||||
debugedit_SOURCES = tools/debugedit.c \
|
||||
tools/hashtab.c
|
||||
-debugedit_CFLAGS = @LIBELF_CFLAGS@ @LIBDW_CFLAGS@ $(AM_CFLAGS)
|
||||
-debugedit_LDADD = @LIBELF_LIBS@ @LIBDW_LIBS@
|
||||
+debugedit_CFLAGS = @LIBELF_CFLAGS@ @LIBDW_CFLAGS@ @XXHASH_CFLAGS@ $(AM_CFLAGS)
|
||||
+debugedit_LDADD = @LIBELF_LIBS@ @LIBDW_LIBS@ @XXHASH_LIBS@
|
||||
|
||||
sepdebugcrcfix_SOURCES = tools/sepdebugcrcfix.c
|
||||
sepdebugcrcfix_CFLAGS = @LIBELF_CFLAGS@ $(AM_CFLAGS)
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index a5a6e28..32dd27d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -181,6 +181,17 @@ else
|
||||
fi
|
||||
AC_SUBST([READELF_VERSION_OK])
|
||||
|
||||
+ENABLE_INLINED_XXHASH=yes
|
||||
+AC_ARG_ENABLE(inlined-xxhash,
|
||||
+ AS_HELP_STRING([--disable-inlined-xxhash], [disable the inlined-only version of xxhash library]),
|
||||
+ ENABLE_INLINED_XXHASH=$enableval,
|
||||
+ ENABLE_INLINED_XXHASH=yes)
|
||||
+
|
||||
+if test x$ENABLE_INLINED_XXHASH = xyes; then
|
||||
+ XXHASH_CFLAGS="$XXHASH_CFLAGS -DXXH_INLINE_ALL"
|
||||
+ XXHASH_LIBS=""
|
||||
+fi
|
||||
+
|
||||
# And generate the output files.
|
||||
AC_CONFIG_FILES([Makefile])
|
||||
AC_OUTPUT
|
||||
diff --git a/tools/debugedit.c b/tools/debugedit.c
|
||||
index beefd65..43f9cee 100644
|
||||
--- a/tools/debugedit.c
|
||||
+++ b/tools/debugedit.c
|
||||
@@ -82,7 +82,6 @@ typedef struct Ebl_Strtab Strtab;
|
||||
|
||||
#include "tools/hashtab.h"
|
||||
|
||||
-#define XXH_INLINE_ALL
|
||||
#include "xxhash.h"
|
||||
|
||||
#define DW_TAG_partial_unit 0x3c
|
||||
--
|
||||
2.25.1
|
||||
|
||||
Reference in New Issue
Block a user