3 files changed, 86 insertions, 64 deletions

diff --git a/meta/recipes-devtools/debugedit/files/0001-Add-option-to-allow-disabling-inlined-xxhash.patch b/meta/recipes-devtools/debugedit/files/0001-Add-option-to-allow-disabling-inlined-xxhash.patch
new file mode 100644
index 0000000000..3aac43628b
--- /dev/null
+++ b/meta/recipes-devtools/debugedit/files/0001-Add-option-to-allow-disabling-inlined-xxhash.patch
@@ -0,0 +1,81 @@
+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
+
diff --git a/meta/recipes-devtools/debugedit/files/0002-sepdebugcrcfix.c-do-not-use-64bit-variants.patch b/meta/recipes-devtools/debugedit/files/0002-sepdebugcrcfix.c-do-not-use-64bit-variants.patch
deleted file mode 100644
index 4463bd2324..0000000000
--- a/meta/recipes-devtools/debugedit/files/0002-sepdebugcrcfix.c-do-not-use-64bit-variants.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 3e05bbc1f7909ab6f529e66f0d0f70fb1e60583a Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Thu, 23 Mar 2023 11:55:53 +0800
-Subject: [PATCH 2/2] sepdebugcrcfix.c: do not use 64bit variants
-
-configure.ac checks for largefile support via AC_SYS_LARGEFILE
-already, therefore use off_t, open and lseek instead of 64bit
-variants. Musl e.g. does not define them without _LARGEFILE64_SOURCE
-and error is not seen on glibc because _GNU_SOURCE defines
-_LARGEFILE64_SOURCE.
-
-This patch is marked as inappropriate as debugedit obviously only
-wants to support glibc or some glibc compatible libcs. We can see
-this from the error() usage. And this patch is only for musl.
-
-Upstream-Status: Inappropriate [OE Specific]
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- tools/sepdebugcrcfix.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tools/sepdebugcrcfix.c b/tools/sepdebugcrcfix.c
-index c4a9d56..882e5f5 100644
---- a/tools/sepdebugcrcfix.c
-+++ b/tools/sepdebugcrcfix.c
-@@ -144,7 +144,7 @@ crc32 (const char *fname, const char *base_fname, uint32_t *crcp)
-       error (0, errno, _("cannot open \"%s\""), debugname);
-       return false;
-     }
--  off64_t size = lseek64 (fd, 0, SEEK_END);
-+  off_t size = lseek (fd, 0, SEEK_END);
-   if (size == -1)
-     {
-       error (0, errno, _("cannot get size of \"%s\""), debugname);
-@@ -289,7 +289,7 @@ process (Elf *elf, int fd, const char *fname)
-          return true;
-        }
-       updated_count++;
--      off64_t seekto = (shdr->sh_offset + data->d_off
-+      off_t seekto = (shdr->sh_offset + data->d_off
-                        + (crcp - (const uint8_t *) data->d_buf));
-       uint32_t crc_targetendian = (ehdr->e_ident[EI_DATA] == ELFDATA2LSB
-                                   ? htole32 (crc) : htobe32 (crc));
-@@ -361,7 +361,7 @@ main (int argc, char **argv)
-        error (0, errno, _("cannot chmod \"%s\" to make sure we can read and write"), fname);
- 
-       bool failed = false;
--      int fd = open64 (fname, O_RDWR);
-+      int fd = open (fname, O_RDWR);
-       if (fd == -1)
-        {
-          error (0, errno, _("cannot open \"%s\""), fname);
--- 
-2.17.1
-
diff --git a/meta/recipes-devtools/debugedit/files/0003-Makefile.am-do-not-update-manual.patch b/meta/recipes-devtools/debugedit/files/0003-Makefile.am-do-not-update-manual.patch
index de467f5365..d0414f739a 100644
--- a/meta/recipes-devtools/debugedit/files/0003-Makefile.am-do-not-update-manual.patch
+++ b/meta/recipes-devtools/debugedit/files/0003-Makefile.am-do-not-update-manual.patch
@@ -1,7 +1,7 @@
-From 4f0d7d2f4900ce8555e09854dc681278b7a3d9a9 Mon Sep 17 00:00:00 2001
+From b2715c3f4d28fab1c238086d9b5435e269b06301 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Thu, 23 Mar 2023 13:09:23 +0800
-Subject: [PATCH 3/3] Makefile.am: do not update manual
+Subject: [PATCH] Makefile.am: do not update manual
 
 The tarball ships these manuals, no need to re-generate them.
 We have local patches for debugedit.c and sepdebugcrcfix.c,
@@ -20,7 +20,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
  1 file changed, 30 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 98b2f20..f91deea 100644
+index c590edf..692e016 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -52,36 +52,6 @@ sepdebugcrcfix_LDADD = @LIBELF_LIBS@
@@ -58,8 +58,5 @@ index 98b2f20..f91deea 100644
 -       esac
 -
  noinst_HEADERS= tools/ansidecl.h \
-                tools/hashtab.h \
-                tools/md5.h \
--- 
-2.17.1
-
+                tools/hashtab.h
+