49 files changed, 950 insertions, 521 deletions
diff --git a/meta-oe/recipes-benchmark/bonnie/bonnie++_1.04.bb b/meta-oe/recipes-benchmark/bonnie/bonnie++_1.04.bb
index c305aadd02..c70f8a9ef4 100644
--- a/meta-oe/recipes-benchmark/bonnie/bonnie++_1.04.bb
+++ b/meta-oe/recipes-benchmark/bonnie/bonnie++_1.04.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://copyright.txt;md5=cd4dde95a6b9d122f0a9150ae9cc3ee0"
 SRC_URI = "http://www.coker.com.au/bonnie++/${BPN}_${PV}.tgz \
 "
-SRC_URI[md5sum] = "1414aab86e2db1b4691bd4be82031012"
 SRC_URI[sha256sum] = "507bd2ce5360c7c98b91b0fdc2bed5c9320b5c9699f7d4a3d1c86b256896c15e"
 inherit autotools-brokensep
diff --git a/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb b/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb
index c58524aa64..feda6599a8 100644
--- a/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb
+++ b/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://github.com/ssvb/cpuburn-arm.git;branch=master;protocol=https \
           file://0003-burn.S-Remove-.func-.endfunc.patch \
           "
-S = "${WORKDIR}/git"
 do_compile() {
diff --git a/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb b/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb
index 32f51fee49..d300c40a47 100644
--- a/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb
+++ b/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb
@@ -22,5 +22,4 @@ TARGET_CC_ARCH += "${LDFLAGS}"
 FILES:tbench = "${bindir}/tbench* ${prefix}/share/client.txt"
-SRC_URI[md5sum] = "1fe56ff71b9a416f8889d7150ac54da4"
 SRC_URI[sha256sum] = "6001893f34e68a3cfeb5d424e1f2bfef005df96a22d86f35dc770c5bccf3aa8a"
diff --git a/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/0001-fix-too-many-arguments-error-in-gcc15.patch b/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/0001-fix-too-many-arguments-error-in-gcc15.patch
new file mode 100644
index 0000000000..63701d9c97
--- /dev/null
+++ b/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/0001-fix-too-many-arguments-error-in-gcc15.patch
@@ -0,0 +1,32 @@
+From a0a976c0c4c2b92d61e71e00be4adfd8ea6d0d8f Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Thu, 10 Apr 2025 14:14:15 +0900
+Subject: [PATCH] fix too many arguments error in gcc15
+dhry_1.c: In function 'main':
+dhry_1.c:176:23: error: too many arguments to function 'Func_1'; expected 0, have 2
+  176 |       if (Enum_Loc == Func_1 (Ch_Index, 'C'))
+      |                       ^~~~~~  ~~~~~~~~
+dhry_1.c:33:17: note: declared here
+   33 | Enumeration     Func_1 ();
+      |                 ^~~~~~
+Upstream-Status: Inactive-Upstream [lastrelease: 1988]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ dhry_1.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/dhry_1.c b/dhry_1.c
+index b081b86..e5a4873 100644
+--- a/dhry_1.c
+++ b/dhry_1.c
+@@ -30,7 +30,7 @@ char            Ch_1_Glob,
+ int             Arr_1_Glob [50];
+ int             Arr_2_Glob [50] [50];
+ 
+-Enumeration     Func_1 ();
+Enumeration     Func_1 (Capital_Letter Ch_1_Par_Val, Capital_Letter Ch_2_Par_Val);
+   /* forward declaration necessary since Enumeration may not simply be int */
+ 
+ #ifndef REG
diff --git a/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone-c89.patch b/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone-c89.patch
new file mode 100644
index 0000000000..faf710fe12
--- /dev/null
+++ b/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone-c89.patch
@@ -0,0 +1,242 @@
+dhrystone: make it speak C89
+Update Dhrystone sources to stop using K&R C and use something close to C89.
+This fixes compilation errors reported by the GCC 14.
+Upstream-Status: Pending
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Index: dhrystone-2.1/dhry.h
+===================================================================
+--- dhrystone-2.1.orig/dhry.h
+++ dhrystone-2.1/dhry.h
+@@ -423,3 +423,13 @@ typedef struct record
+ #ifndef HZ
+    extern long HZ;
+ #endif
+
+void Proc_2 (One_Fifty   *Int_Par_Ref);
+void Proc_3 (Rec_Pointer *Ptr_Ref_Par);
+void Proc_4();
+void Proc_5();
+void Proc_6 (Enumeration  Enum_Val_Par, Enumeration *Enum_Ref_Par);
+void Proc_7 (One_Fifty Int_1_Par_Val, One_Fifty Int_2_Par_Val, One_Fifty *Int_Par_Ref);
+void Proc_8 (Arr_1_Dim Arr_1_Par_Ref, Arr_2_Dim Arr_2_Par_Ref, int Int_1_Par_Val, int Int_2_Par_Val);
+
+Boolean Func_2 (Str_30  Str_1_Par_Ref, Str_30  Str_2_Par_Ref);
+Index: dhrystone-2.1/dhry_1.c
+===================================================================
+--- dhrystone-2.1.orig/dhry_1.c
+++ dhrystone-2.1/dhry_1.c
+@@ -14,6 +14,8 @@
+  *
+  ****************************************************************************
+  */
+#include <stdlib.h>
+#include <string.h>
+ 
+ #include "dhry.h"
+ 
+@@ -28,7 +30,6 @@ char            Ch_1_Glob,
+ int             Arr_1_Glob [50];
+ int             Arr_2_Glob [50] [50];
+ 
+-extern char     *malloc ();
+ Enumeration     Func_1 ();
+   /* forward declaration necessary since Enumeration may not simply be int */
+ 
+@@ -41,6 +42,8 @@ Enumeration     Func_1 ();
+         Boolean Reg = true;
+ #endif
+ 
+void Proc_1 (REG Rec_Pointer Ptr_Val_Par);
+
+ /* variables for time measurement: */
+ 
+ #ifdef TIMES
+@@ -70,7 +73,7 @@ float           Microseconds,
+ /* end of variables for time measurement */
+ 
+ 
+-main ()
+int main (void)
+ /*****/
+ 
+   /* main program, corresponds to procedures        */
+@@ -218,7 +221,7 @@ main ()
+   printf ("Arr_2_Glob[8][7]:    %d\n", Arr_2_Glob[8][7]);
+   printf ("        should be:   Number_Of_Runs + 10\n");
+   printf ("Ptr_Glob->\n");
+-  printf ("  Ptr_Comp:          %d\n", (int) Ptr_Glob->Ptr_Comp);
+  printf ("  Ptr_Comp:          %lu\n", (unsigned long) Ptr_Glob->Ptr_Comp);
+   printf ("        should be:   (implementation-dependent)\n");
+   printf ("  Discr:             %d\n", Ptr_Glob->Discr);
+   printf ("        should be:   %d\n", 0);
+@@ -229,7 +232,7 @@ main ()
+   printf ("  Str_Comp:          %s\n", Ptr_Glob->variant.var_1.Str_Comp);
+   printf ("        should be:   DHRYSTONE PROGRAM, SOME STRING\n");
+   printf ("Next_Ptr_Glob->\n");
+-  printf ("  Ptr_Comp:          %d\n", (int) Next_Ptr_Glob->Ptr_Comp);
+  printf ("  Ptr_Comp:          %lu\n", (unsigned long) Next_Ptr_Glob->Ptr_Comp);
+   printf ("        should be:   (implementation-dependent), same as above\n");
+   printf ("  Discr:             %d\n", Next_Ptr_Glob->Discr);
+   printf ("        should be:   %d\n", 0);
+@@ -280,14 +283,13 @@ main ()
+     printf ("%6.1f \n", Dhrystones_Per_Second);
+     printf ("\n");
+   }
+-  
+  return 0;
+ }
+ 
+ 
+-Proc_1 (Ptr_Val_Par)
+void Proc_1 (REG Rec_Pointer Ptr_Val_Par)
+ /******************/
+ 
+-REG Rec_Pointer Ptr_Val_Par;
+     /* executed once */
+ {
+   REG Rec_Pointer Next_Record = Ptr_Val_Par->Ptr_Comp;  
+@@ -318,12 +320,10 @@ REG Rec_Pointer Ptr_Val_Par;
+ } /* Proc_1 */
+ 
+ 
+-Proc_2 (Int_Par_Ref)
+void Proc_2 (One_Fifty   *Int_Par_Ref)
+ /******************/
+     /* executed once */
+     /* *Int_Par_Ref == 1, becomes 4 */
+-
+-One_Fifty   *Int_Par_Ref;
+ {
+   One_Fifty  Int_Loc;  
+   Enumeration   Enum_Loc;
+@@ -341,13 +341,10 @@ One_Fifty   *Int_Par_Ref;
+ } /* Proc_2 */
+ 
+ 
+-Proc_3 (Ptr_Ref_Par)
+void Proc_3 (Rec_Pointer *Ptr_Ref_Par)
+ /******************/
+     /* executed once */
+     /* Ptr_Ref_Par becomes Ptr_Glob */
+-
+-Rec_Pointer *Ptr_Ref_Par;
+-
+ {
+   if (Ptr_Glob != Null)
+     /* then, executed */
+@@ -356,7 +353,7 @@ Rec_Pointer *Ptr_Ref_Par;
+ } /* Proc_3 */
+ 
+ 
+-Proc_4 () /* without parameters */
+void Proc_4 () /* without parameters */
+ /*******/
+     /* executed once */
+ {
+@@ -368,7 +365,7 @@ Proc_4 () /* without parameters */
+ } /* Proc_4 */
+ 
+ 
+-Proc_5 () /* without parameters */
+void Proc_5 () /* without parameters */
+ /*******/
+     /* executed once */
+ {
+Index: dhrystone-2.1/dhry_2.c
+===================================================================
+--- dhrystone-2.1.orig/dhry_2.c
+++ dhrystone-2.1/dhry_2.c
+@@ -14,6 +14,7 @@
+  *
+  ****************************************************************************
+  */
+#include <string.h>
+ 
+ #include "dhry.h"
+ 
+@@ -26,14 +27,14 @@
+ extern  int     Int_Glob;
+ extern  char    Ch_1_Glob;
+ 
+Boolean Func_3 (Enumeration Enum_Par_Val);
+ 
+-Proc_6 (Enum_Val_Par, Enum_Ref_Par)
+
+void Proc_6 (Enumeration  Enum_Val_Par, Enumeration *Enum_Ref_Par)
+ /*********************************/
+     /* executed once */
+     /* Enum_Val_Par == Ident_3, Enum_Ref_Par becomes Ident_2 */
+ 
+-Enumeration  Enum_Val_Par;
+-Enumeration *Enum_Ref_Par;
+ {
+   *Enum_Ref_Par = Enum_Val_Par;
+   if (! Func_3 (Enum_Val_Par))
+@@ -61,7 +62,7 @@ Enumeration *Enum_Ref_Par;
+ } /* Proc_6 */
+ 
+ 
+-Proc_7 (Int_1_Par_Val, Int_2_Par_Val, Int_Par_Ref)
+void Proc_7 (One_Fifty Int_1_Par_Val, One_Fifty Int_2_Par_Val, One_Fifty *Int_Par_Ref)
+ /**********************************************/
+     /* executed three times                                      */ 
+     /* first call:      Int_1_Par_Val == 2, Int_2_Par_Val == 3,  */
+@@ -70,9 +71,6 @@ Proc_7 (Int_1_Par_Val, Int_2_Par_Val, In
+     /*                  Int_Par_Ref becomes 17                   */
+     /* third call:      Int_1_Par_Val == 6, Int_2_Par_Val == 10, */
+     /*                  Int_Par_Ref becomes 18                   */
+-One_Fifty       Int_1_Par_Val;
+-One_Fifty       Int_2_Par_Val;
+-One_Fifty      *Int_Par_Ref;
+ {
+   One_Fifty Int_Loc;
+ 
+@@ -81,15 +79,11 @@ One_Fifty      *Int_Par_Ref;
+ } /* Proc_7 */
+ 
+ 
+-Proc_8 (Arr_1_Par_Ref, Arr_2_Par_Ref, Int_1_Par_Val, Int_2_Par_Val)
+void Proc_8 (Arr_1_Dim Arr_1_Par_Ref, Arr_2_Dim Arr_2_Par_Ref, int Int_1_Par_Val, int Int_2_Par_Val)
+ /*********************************************************************/
+     /* executed once      */
+     /* Int_Par_Val_1 == 3 */
+     /* Int_Par_Val_2 == 7 */
+-Arr_1_Dim       Arr_1_Par_Ref;
+-Arr_2_Dim       Arr_2_Par_Ref;
+-int             Int_1_Par_Val;
+-int             Int_2_Par_Val;
+ {
+   REG One_Fifty Int_Index;
+   REG One_Fifty Int_Loc;
+@@ -132,14 +126,11 @@ Capital_Letter   Ch_2_Par_Val;
+ } /* Func_1 */
+ 
+ 
+-Boolean Func_2 (Str_1_Par_Ref, Str_2_Par_Ref)
+Boolean Func_2 (Str_30  Str_1_Par_Ref, Str_30  Str_2_Par_Ref)
+ /*************************************************/
+     /* executed once */
+     /* Str_1_Par_Ref == "DHRYSTONE PROGRAM, 1'ST STRING" */
+     /* Str_2_Par_Ref == "DHRYSTONE PROGRAM, 2'ND STRING" */
+-
+-Str_30  Str_1_Par_Ref;
+-Str_30  Str_2_Par_Ref;
+ {
+   REG One_Thirty        Int_Loc;
+       Capital_Letter    Ch_Loc;
+@@ -174,11 +165,10 @@ Str_30  Str_2_Par_Ref;
+ } /* Func_2 */
+ 
+ 
+-Boolean Func_3 (Enum_Par_Val)
+Boolean Func_3 (Enumeration Enum_Par_Val)
+ /***************************/
+     /* executed once        */
+     /* Enum_Par_Val == Ident_3 */
+-Enumeration Enum_Par_Val;
+ {
+   Enumeration Enum_Loc;
+ 
diff --git a/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb b/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
index d809a564e9..a8d750e885 100644
--- a/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
+++ b/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
@@ -3,8 +3,10 @@ LICENSE = "PD"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/PD;md5=b3597d12946881e13cb3b548d1173851"
 SRC_URI = "http://www.netlib.org/benchmark/dhry-c;downloadfilename=dhry-c.shar \
-           file://dhrystone.patch"
+           file://dhrystone.patch \
-SRC_URI[md5sum] = "75aa5909c174eed98c134be2f56307da"
+           file://dhrystone-c89.patch \
+           file://0001-fix-too-many-arguments-error-in-gcc15.patch \
+"
 SRC_URI[sha256sum] = "038a7e9169787125c3451a6c941f3aca5db2d2f3863871afcdce154ef17f4e3e"
 # Need to override Makefile variables
diff --git a/meta-oe/recipes-benchmark/fio/fio_3.36.bb b/meta-oe/recipes-benchmark/fio/fio_3.39.bb
index a871ed8fe5..345c7f08e7 100644
--- a/meta-oe/recipes-benchmark/fio/fio_3.36.bb
+++ b/meta-oe/recipes-benchmark/fio/fio_3.39.bb
@@ -22,11 +22,11 @@ PACKAGECONFIG_NUMA:armeb = ""
 PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}"
 PACKAGECONFIG[numa] = ",--disable-numa,numactl"
-PV .= "+git"
-SRCREV = "b2403d413ee734e8835539319d8bc3429a0777ac"
 SRC_URI = "git://git.kernel.dk/fio.git;branch=master"
+SRCREV = "a6e474c9e896e4ba1eb40066a03402afb040710a"
+UPSTREAM_CHECK_GITTAGREGEX = "fio-(?P<pver>\d+(\.\d+)+)"
-S = "${WORKDIR}/git"
 # avoids build breaks when using no-static-libs.inc
 DISABLE_STATIC = ""
@@ -35,7 +35,7 @@ EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'"
 EXTRA_OECONF = "${@bb.utils.contains('MACHINE_FEATURES', 'x86', '--disable-optimizations', '', d)}"
 do_configure() {
-    ./configure ${EXTRA_OECONF}
+    ./configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS}
 }
 do_install() {
diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
index 0b61d6ed62..8bcb763f06 100644
--- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
+++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
@@ -21,7 +21,6 @@ SRC_URI = " \
 "
 SRCREV = "42e3d8fe3aa88743ef90348138f643f7b04a9237"
-S = "${WORKDIR}/git"
 inherit meson pkgconfig features_check
diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3/0001-let-system-headers-provide-pread64.patch b/meta-oe/recipes-benchmark/iozone3/iozone3/0001-let-system-headers-provide-pread64.patch
deleted file mode 100644
index a61a56a71d..0000000000
--- a/meta-oe/recipes-benchmark/iozone3/iozone3/0001-let-system-headers-provide-pread64.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 64389a67b93a53b9fb7e9e20e905a5ee4613606b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 15 Jan 2020 17:10:42 -0800
-Subject: [PATCH] let system headers provide pread64()
-The signature does not match with system headers anyway
-Fixes
-iozone.c:1270:9: error: redeclaration of 'pread64' must have the 'overloadable' attribute                                                                       ssize_t pread64();                                                                      ^                                                                       /mnt/b/yoe/build/tmp/work/core2-64-yoe-linux/iozone3/488-r0/recipe-sysroot/usr/include/bits/unistd.h:83:1: note: previous overload of function is here          pread64 (int __fd, void *const __clang_pass_object_size0 __buf,                 ^
-1 error generated.
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- iozone.c | 1 -
- 1 file changed, 1 deletion(-)
-diff --git a/iozone.c b/iozone.c
-index 090dd5f..fdea400 100644
--- a/iozone.c
-+++ b/iozone.c
-@@ -1267,7 +1267,6 @@ int pit_gettimeofday();
- #ifdef HAVE_ANSIC_C
- #if defined (HAVE_PREAD) && defined(_LARGEFILE64_SOURCE)
- ssize_t pwrite64(); 
-ssize_t pread64(); 
- #endif
- #if !defined(linux)
- char *getenv();
-- 
-2.25.0
diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3_506.bb b/meta-oe/recipes-benchmark/iozone3/iozone3_507.bb
index 5a1306b6fe..725b0af209 100644
--- a/meta-oe/recipes-benchmark/iozone3/iozone3_506.bb
+++ b/meta-oe/recipes-benchmark/iozone3/iozone3_507.bb
@@ -3,18 +3,17 @@ HOMEPAGE = "http://www.iozone.org/"
 SECTION = "console/tests"
 LICENSE = "iozone3"
 LIC_FILES_CHKSUM = "file://iozone.c;beginline=37;endline=48;md5=7331260091868dcad0f9edea735b5f4b \
-    file://iozone.c;beginline=276;endline=282;md5=77f9ee51e45b57a7e7519c4fa0b4f00b \
+    file://iozone.c;beginline=317;endline=323;md5=77f9ee51e45b57a7e7519c4fa0b4f00b \
 "
 SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \
    file://parallelism.patch \
-    file://0001-let-system-headers-provide-pread64.patch \
    file://copyright.txt \
 "
-SRC_URI[sha256sum] = "114ce5c071873b9a2c7ba6e73d05d5ef7e66564392acbfcdc0b3261db10fcbe7"
+SRC_URI[sha256sum] = "1e8087ada056f5d8018ee0bc76686d416fc2251ed03038055dbd0af78d1e5ce3"
 UPSTREAM_CHECK_REGEX = "iozone3_(?P<pver>\d+).tar"
-S = "${WORKDIR}/${BPN}_${PV}/src/current"
+S = "${UNPACKDIR}/${BPN}_${PV}/src/current"
 #
 # All other arches can use the default OEMAKE except those
@@ -37,8 +36,8 @@ do_install() {
    install -m 0755 ${S}/iozone ${D}${bindir}
    install -m 0755 ${S}/fileop ${D}${bindir}
-    install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/iozone.1 ${D}${mandir}/man1/
+    install -m 0644 ${S}/../../docs/iozone.1 ${D}${mandir}/man1/
-    install -m 0644 ${WORKDIR}/copyright.txt ${D}${datadir}/doc/${BPN}/
+    install -m 0644 ${UNPACKDIR}/copyright.txt ${D}${datadir}/doc/${BPN}/
    install -m 0644 ${S}/*.dem ${D}${datadir}/doc/${BPN}/examples
    install -m 0644 ${S}/client_list ${D}${datadir}/doc/${BPN}/examples
@@ -48,9 +47,9 @@ do_install() {
    install -m 0755 ${S}/gengnuplot.sh ${D}${datadir}/doc/${BPN}/examples
    install -m 0755 ${S}/report.pl ${D}${datadir}/doc/${BPN}/examples
-    install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/Iozone_ps.gz ${D}${datadir}/doc/${BPN}/
+    install -m 0644 ${S}/../../docs/Iozone_ps.gz ${D}${datadir}/doc/${BPN}/
-    install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/IOzone_msword_98.pdf ${D}${datadir}/doc/${BPN}/
+    install -m 0644 ${S}/../../docs/IOzone_msword_98.pdf ${D}${datadir}/doc/${BPN}/
-    install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/Run_rules.doc ${D}${datadir}/doc/${BPN}/
+    install -m 0644 ${S}/../../docs/Run_rules.doc ${D}${datadir}/doc/${BPN}/
 }
 FILES:${PN} += "${datadir}/doc/${PN}/copyright.txt"
diff --git a/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch b/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch
deleted file mode 100644
index dc3b85f8ef..0000000000
--- a/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 6df092a4153c6c37cfaddcabf2cd25a910a7f6e1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 2 Sep 2019 15:40:52 -0700
-Subject: [PATCH] Detect bool definition considering stdbool.h being present
-This helps in defining the value correctly on different platforms e.g.
-clang/libc++ depends on the definition coming from stdbool.h
-current builds fail to compile therefore
-TMPDIR/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/iperf2/2.0.13-r0/recipe-sysroot/usr/include/c++/v1/type_traits:742:29: error: redefinition of '__libcpp_is_integral<int>'
-template <>          struct __libcpp_is_integral<int>                : public true_type {};
-                            ^~~~~~~~~~~~~~~~~~~~~~~~~
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
- m4/dast.m4 | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
--- a/m4/dast.m4
-+++ b/m4/dast.m4
-@@ -11,7 +11,12 @@ AH_TEMPLATE([false])
- 
- AC_DEFUN(DAST_CHECK_BOOL, [
- 
-AC_CHECK_SIZEOF(bool)
-+if test "$ac_cv_header_stdbool_h" = yes; then
-+  AC_CHECK_SIZEOF(bool,,[#include <stdbool.h>])
-+else
-+  AC_CHECK_SIZEOF(bool)
-+fi
-+
- if test "$ac_cv_sizeof_bool" = 0 ; then
-   AC_DEFINE(bool, int)
- fi
--- a/configure.ac
-+++ b/configure.ac
-@@ -113,7 +113,7 @@ AC_SEARCH_LIBS([socket], [socket], [],
- 
- dnl Checks for header files.
- AC_HEADER_STDC
-AC_CHECK_HEADERS([arpa/inet.h libintl.h net/ethernet.h net/if.h linux/ip.h linux/udp.h linux/if_packet.h linux/filter.h netdb.h netinet/in.h stdlib.h string.h strings.h sys/socket.h sys/time.h syslog.h unistd.h signal.h ifaddrs.h])
-+AC_CHECK_HEADERS([arpa/inet.h libintl.h net/ethernet.h net/if.h linux/ip.h linux/udp.h linux/if_packet.h linux/filter.h netdb.h netinet/in.h stdbool.h stdlib.h string.h strings.h sys/socket.h sys/time.h syslog.h unistd.h signal.h ifaddrs.h])
- 
- dnl ===================================================================
- dnl Checks for typedefs, structures
--- a/include/util.h
-+++ b/include/util.h
-@@ -56,7 +56,9 @@
- #ifdef HAVE_CONFIG_H
-     #include "config.h"
- #endif
-
-+#ifdef HAVE_STDBOOL_H
-+# include <stdbool.h>
-+#endif
- #ifdef __cplusplus
- extern "C" {
- #endif
diff --git a/meta-oe/recipes-benchmark/iperf2/iperf2/0001-fix-for-buildroot-linux-breakage-ticket-342.patch b/meta-oe/recipes-benchmark/iperf2/iperf2/0001-fix-for-buildroot-linux-breakage-ticket-342.patch
new file mode 100644
index 0000000000..0a6bc7150b
--- /dev/null
+++ b/meta-oe/recipes-benchmark/iperf2/iperf2/0001-fix-for-buildroot-linux-breakage-ticket-342.patch
@@ -0,0 +1,26 @@
+From a25566dd66fb0ca951b3b6f6fa5a4bfaac276c71 Mon Sep 17 00:00:00 2001
+From: Robert McMahon <rjmcmahon@rjmcmahon.com>
+Date: Tue, 12 Nov 2024 12:06:54 -0800
+Subject: [PATCH] fix for buildroot linux breakage, ticket 342
+Upstream-Status: Backport [https://sourceforge.net/p/iperf2/code/ci/a25566dd66fb0ca951b3b6f6fa5a4bfaac276c71/]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/checksums.c | 3 +++
+ 1 file changed, 3 insertions(+)
+diff --git a/src/checksums.c b/src/checksums.c
+index 852f1952..d7a8109e 100644
+--- a/src/checksums.c
+++ b/src/checksums.c
+@@ -47,6 +47,9 @@
+  * by Robert J. McMahon (rjmcmahon@rjmcmahon.com, bob.mcmahon@broadcom.com)
+  * -------------------------------------------------------------------
+  */
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+ #include "headers.h"
+ 
+ /*
diff --git a/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb b/meta-oe/recipes-benchmark/iperf2/iperf2_2.2.1.bb
index 86e5fef530..3d965dac00 100644
--- a/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb
+++ b/meta-oe/recipes-benchmark/iperf2/iperf2_2.2.1.bb
@@ -5,13 +5,12 @@ LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e136a7b2560d80bcbf0d9b3e1356ecff"
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/iperf-${PV}.tar.gz \
-           file://0001-Detect-bool-definition-considering-stdbool.h-being-p.patch \
+           file://0001-fix-for-buildroot-linux-breakage-ticket-342.patch \
 "
-SRC_URI[md5sum] = "31ea1c6d5cbf80b16ff3abe4288dad5e"
+SRC_URI[sha256sum] = "754ab0a7e28033dbea81308ef424bc7df4d6e2fe31b60cc536b61b51fefbd8fb"
-SRC_URI[sha256sum] = "c88adec966096a81136dda91b4bd19c27aae06df4d45a7f547a8e50d723778ad"
-S = "${WORKDIR}/iperf-${PV}"
+S = "${UNPACKDIR}/iperf-${PV}"
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3/0001-fix-build-with-gcc-15.patch b/meta-oe/recipes-benchmark/iperf3/iperf3/0001-fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..d3f3e712c9
--- /dev/null
+++ b/meta-oe/recipes-benchmark/iperf3/iperf3/0001-fix-build-with-gcc-15.patch
@@ -0,0 +1,66 @@
+From a46630d4e373e9a3ef974c1b67767f6816c66572 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Mon, 9 Dec 2024 10:13:02 +0000
+Subject: [PATCH] fix build with gcc-15
+Upstream-Status: Submitted [https://github.com/esnet/iperf/pull/1805]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ src/iperf_api.c | 8 ++++----
+ src/iperf_api.h | 8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+diff --git a/src/iperf_api.c b/src/iperf_api.c
+index 7fb741e..4bb5b2f 100644
+--- a/src/iperf_api.c
+++ b/src/iperf_api.c
+@@ -599,25 +599,25 @@ iperf_set_mapped_v4(struct iperf_test *ipt, const int val)
+ }
+ 
+ void 
+-iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)())
+iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)(struct iperf_stream *))
+ {
+         ipt->on_new_stream = callback;
+ }
+ 
+ void 
+-iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)())
+iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *))
+ {
+         ipt->on_test_start = callback;
+ }
+ 
+ void 
+-iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)())
+iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *))
+ {
+         ipt->on_connect = callback;
+ }
+ 
+ void 
+-iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)())
+iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *))
+ {
+         ipt->on_test_finish = callback;
+ }
+diff --git a/src/iperf_api.h b/src/iperf_api.h
+index 1313142..df10c38 100644
+--- a/src/iperf_api.h
+++ b/src/iperf_api.h
+@@ -213,10 +213,10 @@ void    iperf_set_dont_fragment( struct iperf_test* ipt, int dont_fragment );
+ void    iperf_set_test_congestion_control(struct iperf_test* ipt, char* cc);
+ void    iperf_set_test_mss(struct iperf_test* ipt, int mss);
+ void    iperf_set_mapped_v4(struct iperf_test* ipt, const int val);
+-void    iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)());
+-void    iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)());
+-void    iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)());
+-void    iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)());
+void    iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)(struct iperf_stream *));
+void    iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *));
+void    iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *));
+void    iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *));
+ 
+ #if defined(HAVE_SSL)
+ void    iperf_set_test_client_username(struct iperf_test *ipt, const char *client_username);
diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3_3.16.bb b/meta-oe/recipes-benchmark/iperf3/iperf3_3.18.bb
index 5cec4c6874..08f29937c0 100644
--- a/meta-oe/recipes-benchmark/iperf3/iperf3_3.16.bb
+++ b/meta-oe/recipes-benchmark/iperf3/iperf3_3.18.bb
@@ -10,16 +10,16 @@ SECTION = "console/network"
 BUGTRACKER = "https://github.com/esnet/iperf/issues"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=dc6301c8256ceb8f71c9e3c2ae9096b9"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f9873a72f714e240530e759e103ac7b2"
 SRC_URI = "git://github.com/esnet/iperf.git;branch=master;protocol=https \
           file://0002-Remove-pg-from-profile_CFLAGS.patch \
           file://0001-configure.ac-check-for-CPP-prog.patch \
+           file://0001-fix-build-with-gcc-15.patch \
           "
-SRCREV = "f9481e1cd35159929458513692e4a8f9fdd1bd6f"
+SRCREV = "2a2984488d6de8f7a2d1f5938e03ca7be57e227c"
-S = "${WORKDIR}/git"
 inherit autotools
@@ -29,3 +29,5 @@ PACKAGECONFIG[lksctp] = "ac_cv_header_netinet_sctp_h=yes,ac_cv_header_netinet_sc
 PACKAGECONFIG[openssl] = "--with-openssl=${RECIPE_SYSROOT}${prefix},--without-openssl,openssl"
 CFLAGS += "-D_GNU_SOURCE"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb b/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb
index 4ace4515ad..ae87262870 100644
--- a/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb
+++ b/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb
@@ -13,7 +13,9 @@ SRC_URI = "git://git.musl-libc.org/libc-bench;branch=master \
           file://0001-build-Do-not-override-ldflags-from-environment.patch \
           "
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
 do_install () {
    install -d ${D}${bindir}
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch
deleted file mode 100644
index 0787ef27d2..0000000000
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From 0a163f60b4a316c4b6f1726a71c84755f3bd85e7 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <martin.jansa@lge.com>
-Date: Wed, 16 Sep 2020 04:36:04 -0700
-Subject: [PATCH] Revert "ld.hugetlbfs: fix -Ttext-segment argument on AArch64"
-This reverts commit 852dcc963ce44861ed7c4e225aa92ff2b5b43579.
-* works around
-  ERROR: libhugetlbfs-1_2.23-r0 do_populate_sysroot: Fatal errors occurred in subprocesses:
-  Command '['arm-oe-linux-gnueabi-strip', '--remove-section=.comment', '--remove-section=.note', 'libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw']' returned non-zero exit status 1.
-  Subprocess output:arm-oe-linux-gnueabi-strip:
-  libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/stmuFa58: error: PHDR segment not covered by LOAD segment
-  arm-oe-linux-gnueabi-strip: libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/stmuFa58[.interp]: file format not recognized
-I don't see anything suspicious in the build (the same cmdline as in 2.22
-version), but it uses
-libhugetlbfs/1_2.22-r0-old/temp/log.do_compile:arm-oe-linux-gnueabi-gcc
- -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1
-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
-fstack-protector-strong  -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
-Werror=format-security -Werror=return-type
--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.22-r0/recipe-sysroot
-I.. -O2 -Wall -g -o obj32/linkhuge_rw.o -c linkhuge_rw.c
-libhugetlbfs/1_2.22-r0-old/temp/log.do_compile:arm-oe-linux-gnueabi-gcc
- -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1
-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
-fstack-protector-strong  -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
-Werror=format-security -Werror=return-type
--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.22-r0/recipe-sysroot
-B./obj32 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
-ldl -L../obj32 -o obj32/linkhuge_rw -Wl,--no-as-needed -lpthread -ldl
-lhugetlbfs_privutils -Wl,--hugetlbfs-align obj32/linkhuge_rw.o
-obj32/testutils.o
-libhugetlbfs/1_2.23-r0-new/temp/log.do_compile:arm-oe-linux-gnueabi-gcc
- -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1
-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
-fstack-protector-strong  -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
-Werror=format-security -Werror=return-type
--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.23-r0/recipe-sysroot
-I.. -O2 -Wall -g -o obj32/linkhuge_rw.o -c linkhuge_rw.c
-libhugetlbfs/1_2.23-r0-new/temp/log.do_compile:arm-oe-linux-gnueabi-gcc
- -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1
-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
-fstack-protector-strong  -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
-Werror=format-security -Werror=return-type
--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.23-r0/recipe-sysroot
-B./obj32 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
-ldl -L../obj32 -o obj32/linkhuge_rw -Wl,--no-as-needed -lpthread -ldl
-lhugetlbfs_privutils -Wl,--hugetlbfs-align obj32/linkhuge_rw.o
-obj32/testutils.o
-And the git log between 2.22 and 2.23 is also very short and looks
-reasonable.
-https://github.com/libhugetlbfs/libhugetlbfs/compare/2.22...2.23
-When checking with readelf -l it also shows the error about PHDR segment:
-arm-oe-linux-gnueabi-readelf -l
-./1_2.22-r0-old/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw
-Elf file type is DYN (Shared object file)
-Entry point 0x201105
-There are 10 program headers, starting at offset 52
-Program Headers:
-  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  PHDR           0x000034 0x00200034 0x00200034 0x00140 0x00140 R   0x4
-  INTERP         0x000174 0x00200174 0x00200174 0x0001d 0x0001d R   0x1
-      [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3]
-  LOAD           0x000000 0x00200000 0x00200000 0x1222c 0x1222c R E 0x200000
-  LOAD           0x1ffdf0 0x005ffdf0 0x005ffdf0 0x102e0 0x202ec RW  0x200000
-  DYNAMIC        0x1ffdf8 0x005ffdf8 0x005ffdf8 0x00128 0x00128 RW  0x4
-  NOTE           0x000194 0x00200194 0x00200194 0x00044 0x00044 R   0x4
-  GNU_EH_FRAME   0x012224 0x00212224 0x00212224 0x00008 0x00008 R   0x4
-  GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RW  0x10
-  EXIDX          0x001c5c 0x00201c5c 0x00201c5c 0x00008 0x00008 R   0x4
-  GNU_RELRO      0x1ffdf0 0x005ffdf0 0x005ffdf0 0x00210 0x00210 RW  0x4
- Section to Segment mapping:
-  Segment Sections...
-   00
-   01     .interp
-   02     .interp .note.ABI-tag .note.gnu.build-id .dynsym .dynstr
-.gnu.hash .gnu.version .gnu.version_r .rel.dyn .rel.plt .init .plt .text
-.fini .ARM.extab .ARM.exidx .rodata .eh_frame .eh_frame_hdr
-   03     .fini_array .init_array .dynamic .got .data .bss
-   04     .dynamic
-   05     .note.ABI-tag .note.gnu.build-id
-   06     .eh_frame_hdr
-   07
-   08     .ARM.extab .ARM.exidx
-   09     .fini_array .init_array .dynamic .got
-arm-oe-linux-gnueabi-readelf -l
-./1_2.23-r0-new/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw
-Elf file type is DYN (Shared object file)
-Entry point 0x31cd1
-There are 10 program headers, starting at offset 52
-Program Headers:
-  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  PHDR           0x000000 0x00000000 0x00000000 0x00000 0x00000 R   0
-readelf: Error: the PHDR segment is not covered by a LOAD segment
-  INTERP         0x030d40 0x00030d40 0x00030d40 0x0001d 0x0001d R   0x1
-      [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3]
-  LOAD           0x030d40 0x00030d40 0x00030d40 0x120b8 0x120b8 R E 0x200000
-  LOAD           0x1ffdf0 0x003ffdf0 0x003ffdf0 0x102e0 0x202ec RW  0x200000
-  DYNAMIC        0x1ffdf8 0x003ffdf8 0x003ffdf8 0x00128 0x00128 RW  0x4
-  NOTE           0x030d60 0x00030d60 0x00030d60 0x00044 0x00044 R   0x4
-  GNU_EH_FRAME   0x042df0 0x00042df0 0x00042df0 0x00008 0x00008 R   0x4
-  GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RW  0x10
-  EXIDX          0x032828 0x00032828 0x00032828 0x00008 0x00008 R   0x4
-  GNU_RELRO      0x1ffdf0 0x003ffdf0 0x003ffdf0 0x00210 0x00210 RW  0x4
- Section to Segment mapping:
-  Segment Sections...
-   00
-   01     .interp
-   02     .interp .note.ABI-tag .note.gnu.build-id .dynsym .dynstr
-.gnu.hash .gnu.version .gnu.version_r .rel.dyn .rel.plt .init .plt .text
-.fini .ARM.extab .ARM.exidx .rodata .eh_frame .eh_frame_hdr
-   03     .fini_array .init_array .dynamic .got .data .bss
-   04     .dynamic
-   05     .note.ABI-tag .note.gnu.build-id
-   06     .eh_frame_hdr
-   07
-   08     .ARM.extab .ARM.exidx
-   09     .fini_array .init_array .dynamic .got
-And the diff between these 2:
-1_2.22-r0-old/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw.readelf
-1_2.23-r0-new/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw.readelf
- Elf file type is DYN (Shared object file)
-Entry point 0x201105
-+Entry point 0x31cd1
- There are 10 program headers, starting at offset 52
- Program Headers:
-   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  PHDR           0x000034 0x00200034 0x00200034 0x00140 0x00140 R   0x4
-  INTERP         0x000174 0x00200174 0x00200174 0x0001d 0x0001d R   0x1
-+  PHDR           0x000000 0x00000000 0x00000000 0x00000 0x00000 R   0
-+readelf: Error: the PHDR segment is not covered by a LOAD segment
-+  INTERP         0x030d40 0x00030d40 0x00030d40 0x0001d 0x0001d R   0x1
-       [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3]
-  LOAD           0x000000 0x00200000 0x00200000 0x1222c 0x1222c R E 0x200000
-  LOAD           0x1ffdf0 0x005ffdf0 0x005ffdf0 0x102e0 0x202ec RW  0x200000
-  DYNAMIC        0x1ffdf8 0x005ffdf8 0x005ffdf8 0x00128 0x00128 RW  0x4
-  NOTE           0x000194 0x00200194 0x00200194 0x00044 0x00044 R   0x4
-  GNU_EH_FRAME   0x012224 0x00212224 0x00212224 0x00008 0x00008 R   0x4
-+  LOAD           0x030d40 0x00030d40 0x00030d40 0x120b8 0x120b8 R E 0x200000
-+  LOAD           0x1ffdf0 0x003ffdf0 0x003ffdf0 0x102e0 0x202ec RW  0x200000
-+  DYNAMIC        0x1ffdf8 0x003ffdf8 0x003ffdf8 0x00128 0x00128 RW  0x4
-+  NOTE           0x030d60 0x00030d60 0x00030d60 0x00044 0x00044 R   0x4
-+  GNU_EH_FRAME   0x042df0 0x00042df0 0x00042df0 0x00008 0x00008 R   0x4
-   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RW  0x10
-  EXIDX          0x001c5c 0x00201c5c 0x00201c5c 0x00008 0x00008 R   0x4
-  GNU_RELRO      0x1ffdf0 0x005ffdf0 0x005ffdf0 0x00210 0x00210 RW  0x4
-+  EXIDX          0x032828 0x00032828 0x00032828 0x00008 0x00008 R   0x4
-+  GNU_RELRO      0x1ffdf0 0x003ffdf0 0x003ffdf0 0x00210 0x00210 RW  0x4
-  Section to Segment mapping:
-Revert fixes this build issue, but I still don't see why it fails this way.
-Upstream-Status: Pending
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-# Please enter the commit message for your changes. Lines starting
-# with '#' will be ignored, and an empty message aborts the commit.
-#
-# Date:      Wed Sep 16 13:43:09 2020 +0200
-#
-# On branch jansa/master
-# Changes to be committed:
-#       new file:   meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch
-#       modified:   meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
-#
-# Untracked files:
-#       counts.txt
-#       diff
-#       log.svn
-#       log.svn2
-#       wip/
-#
---
- ld.hugetlbfs | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-diff --git a/ld.hugetlbfs b/ld.hugetlbfs
-index 5e4e497..6ee8238 100755
--- a/ld.hugetlbfs
-+++ b/ld.hugetlbfs
-@@ -130,9 +130,7 @@ if [ "$HTLB_ALIGN" == "slice" ]; then
-        # targeting the ARM platform one needs to explicitly set the text segment offset
-        # otherwise it will be NULL.
-        case "$EMU" in
-       armelf*_linux_eabi|aarch64elf*|aarch64linux*)
-               printf -v TEXTADDR "%x" "$SLICE_SIZE"
-               HTLBOPTS="$HTLBOPTS -Ttext-segment=$TEXTADDR" ;;
-+       armelf*_linux_eabi|aarch64elf*|aarch64linux*)   HTLBOPTS="$HTLBOPTS -Ttext-segment=$SLICE_SIZE" ;;
-        elf_i386)               HTLBOPTS="$HTLBOPTS -Ttext-segment=0x08000000" ;;
-        elf64ppc|elf64lppc)
-                if [ "$MMU_TYPE" == "Hash" ] ; then
-- 
-2.17.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch
index a13c5389fb..3dbc34d08d 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch
@@ -1,20 +1,20 @@
-From 183a4dafe141197de5840f2e48c266ef209307aa Mon Sep 17 00:00:00 2001
+From b448672f1bc08dcef2ae07727ae6f124a3032a35 Mon Sep 17 00:00:00 2001
 From: Ting Liu <b28495@freescale.com>
 Date: Mon, 18 Jun 2012 16:37:05 +0800
 Subject: [PATCH] skip checking LIB32 and LIB64 if they point to the same place
 Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Ting Liu <b28495@freescale.com>
+Signed-off-by: Ting Liu <b28495@freescale.com>
 ---
- Makefile | 1 -
+ Makefile.in | 1 -
 1 file changed, 1 deletion(-)
-diff --git a/Makefile b/Makefile
+diff --git a/Makefile.in b/Makefile.in
-index 51e41f0..373df3c 100644
+index 65ae5a4..25be577 100644
--- a/Makefile
+--- a/Makefile.in
-+++ b/Makefile
+++ b/Makefile.in
-@@ -177,7 +177,6 @@ REALLIB32 = $(realpath $(PREFIX)/$(LIB32))
+@@ -196,7 +196,6 @@ REALLIB32 = $(realpath $(PREFIX)/$(LIB32))
 REALLIB64 = $(realpath $(PREFIX)/$(LIB64))
 ifneq ($(realpath $(PREFIX)),)
 ifeq ($(REALLIB32),$(REALLIB64))
@@ -22,3 +22,6 @@ index 51e41f0..373df3c 100644
 endif
 endif
 
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch
deleted file mode 100644
index 78a4cb0fc2..0000000000
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b6dba773491bbb7b4664dacdd87a12af860f1bd8 Mon Sep 17 00:00:00 2001
-From: Oleksiy Obitotskyy <oobitots@cisco.com>
-Date: Thu, 28 Jan 2021 05:43:33 -0800
-Subject: [PATCH] tests/makefile: Append CPPFLAGS rather then override
-CPPFLAGS overrided and we could miss some options needed.
-Upstream-Status: Submitted
-Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
---
- tests/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/tests/Makefile b/tests/Makefile
-index 0ca3716..d262932 100644
--- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -33,8 +33,8 @@ HELPERS = get_hugetlbfs_path compare_kvers
- HELPER_LIBS = libheapshrink.so
- BADTOOLCHAIN = bad-toolchain.sh
- 
-CFLAGS = -O2 -Wall -g
-CPPFLAGS = -I..
-+CFLAGS += -O2 -Wall -g
-+CPPFLAGS += -I..
- STATIC_LIBHUGE = -Wl,--whole-archive -lhugetlbfs -Wl,--no-whole-archive
- STATIC_LDLIBS = -Wl,--no-as-needed -lpthread
- LDLIBS = $(STATIC_LDLIBS) -ldl -lhugetlbfs_privutils
-- 
-2.26.2.Cisco
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-search-host-library-path-for-cros.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-libhugetlbfs-avoid-search-host-library-path-for-cros.patch
index f95e9e85a4..1b99c007f5 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-search-host-library-path-for-cros.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-libhugetlbfs-avoid-search-host-library-path-for-cros.patch
@@ -1,4 +1,4 @@
-From 82a4f60ab24dff121f5f9d3bbcd9a8a28bb7caef Mon Sep 17 00:00:00 2001
+From d3903cbe348c6ecb2f38b37f20dafa6b0ca3b114 Mon Sep 17 00:00:00 2001
 From: Chunrong Guo <B40290@freescale.com>
 Date: Sun, 8 Sep 2013 23:21:49 -0500
 Subject: [PATCH] libhugetlbfs: avoid search host library path for cross
@@ -7,7 +7,6 @@ Subject: [PATCH] libhugetlbfs: avoid search host library path for cross
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Chunrong Guo <B40290@freescale.com>
 ---
 ldscripts/elf32ppclinux.xB   | 2 +-
 ldscripts/elf32ppclinux.xBDT | 2 +-
@@ -95,3 +94,6 @@ index 1855202..c62d245 100644
 INPUT(-lhugetlbfs);
 /* Do we need any of these for elf?
    __DYNAMIC = 0;    */
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-tests-Makefile-install-static-4G-edge-testcases.patch
index b8b2f8e6fb..98cdf2f51c 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-tests-Makefile-install-static-4G-edge-testcases.patch
@@ -1,22 +1,21 @@
-From f1ad8ff887f16daee8d06eca3df0f2541bfdaac0 Mon Sep 17 00:00:00 2001
+From 3e54866a0ea3c9e933e91213cbe6e55b7ff67b87 Mon Sep 17 00:00:00 2001
 From: Ting Liu <b28495@freescale.com>
 Date: Mon, 23 Sep 2013 08:00:55 +0000
-Subject: [PATCH] libhugetlbfs: add recipe
+Subject: [PATCH] tests/Makefile: install static 4G edge testcases
-Upstream-Status: Submitted
 TESTS_64 is empty, install will fail due to missing file operand
-Signed-off-by: Ting Liu <b28495@freescale.com>
+Upstream-Status: Submitted
+Signed-off-by: Ting Liu <b28495@freescale.com>
 ---
- tests/Makefile | 2 +-
+ tests/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/tests/Makefile b/tests/Makefile
+diff --git a/tests/Makefile.in b/tests/Makefile.in
-index 073df96..0ca3716 100644
+index d33a228..d262932 100644
--- a/tests/Makefile
+--- a/tests/Makefile.in
-+++ b/tests/Makefile
+++ b/tests/Makefile.in
 @@ -295,7 +295,7 @@ obj64/install:
        $(INSTALL) -m 755 wrapper-utils.sh $(DESTDIR)$(INST_TESTSDIR64)/obj64
        $(INSTALL) -m 755 $(HELPERS:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64
@@ -26,3 +25,6 @@ index 073df96..0ca3716 100644
        $(INSTALL) -m 755 run_tests.py $(DESTDIR)$(INST_TESTSDIR64)
 
 install: $(OBJDIRS:%=%/install)
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch
index 83934abef8..6b010365a0 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch
@@ -1,4 +1,4 @@
-From 0077532b07e268347cb8557be6d70148d5f0e840 Mon Sep 17 00:00:00 2001
+From 86d3ebfc4da5ccbc82fdee4abaf2cbf758d82403 Mon Sep 17 00:00:00 2001
 From: Ting Liu <b28495@freescale.com>
 Date: Wed, 21 Aug 2013 15:44:57 +0800
 Subject: [PATCH] run_test.py: not use hard coded path ../obj/hugeadm
@@ -20,10 +20,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
 1 file changed, 11 insertions(+), 1 deletion(-)
 diff --git a/tests/run_tests.py b/tests/run_tests.py
-index 018264d..0aabcd1 100755
+index 4793262..6cd0241 100755
 --- a/tests/run_tests.py
 +++ b/tests/run_tests.py
-@@ -245,9 +245,19 @@ def get_pagesizes():
+@@ -250,9 +250,19 @@ def get_pagesizes():
     Use libhugetlbfs' hugeadm utility to get a list of page sizes that have
     active mount points and at least one huge page allocated to the pool.
     """
@@ -45,5 +45,5 @@ index 018264d..0aabcd1 100755
         return sizes
 
 -- 
-2.7.4
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
index 7cc180a4b7..fc8776af66 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
@@ -1,4 +1,4 @@
-From b5887693d90c430291b644c2f5713b5fdd1777ce Mon Sep 17 00:00:00 2001
+From 8c7a379876e3c7a32bef8620f94a85d20b7b186f Mon Sep 17 00:00:00 2001
 From: Jackie Huang <jackie.huang@windriver.com>
 Date: Tue, 4 Nov 2014 00:49:11 -0800
 Subject: [PATCH] libhugetlbfs/elf_i386: avoid search host library path for
@@ -7,7 +7,6 @@ Subject: [PATCH] libhugetlbfs/elf_i386: avoid search host library path for
 Upstream-Status: Inappropriate [cross compile specific]
 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
 ---
 ldscripts/elf_i386.xB   | 1 -
 ldscripts/elf_i386.xBDT | 1 -
@@ -37,3 +36,6 @@ index d72aebe..3bac1b1 100644
 INPUT(-lhugetlbfs);
 /* Do we need any of these for elf?
    __DYNAMIC = 0;    */
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-include-stddef.h-for-ptrdiff_t.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-stddef.h-for-ptrdiff_t.patch
index 914b0514f8..33a4efb1fa 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-include-stddef.h-for-ptrdiff_t.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-stddef.h-for-ptrdiff_t.patch
@@ -1,18 +1,17 @@
-From 351d1de09dd80049b7a2cb02c5750635d0389873 Mon Sep 17 00:00:00 2001
+From 5fe5dae674e259bcdd57b9c6a0004111ab0700ce Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 21 Jun 2018 19:25:57 -0700
 Subject: [PATCH] include stddef.h for ptrdiff_t
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
 morecore.c | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/morecore.c b/morecore.c
-index 6563bbd..0eef782 100644
+index 405c566..0edccd2 100644
 --- a/morecore.c
 +++ b/morecore.c
 @@ -19,6 +19,7 @@
@@ -23,3 +22,6 @@ index 6563bbd..0eef782 100644
 #include <stdio.h>
 #include <stdlib.h>
 #include <malloc.h>
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-Mark-glibc-specific-code-so.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0007-Mark-glibc-specific-code-so.patch
index 7ad6c43eb1..5b2c91b8a1 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-Mark-glibc-specific-code-so.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0007-Mark-glibc-specific-code-so.patch
@@ -1,21 +1,20 @@
-From 0f548286848c70aa325c6748d80e8651389b4938 Mon Sep 17 00:00:00 2001
+From c98e64c56d0118a2d5f950eaceaed0e85eaa2543 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 21 Jun 2018 19:32:59 -0700
 Subject: [PATCH] Mark glibc specific code so
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
 morecore.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 diff --git a/morecore.c b/morecore.c
-index 0eef782..d48509c 100644
+index 0edccd2..db22216 100644
 --- a/morecore.c
 +++ b/morecore.c
-@@ -364,6 +364,7 @@ void hugetlbfs_setup_morecore(void)
+@@ -371,6 +371,7 @@ void hugetlbfs_setup_morecore(void)
 
        INFO("setup_morecore(): heapaddr = 0x%lx\n", heapaddr);
 
@@ -23,7 +22,7 @@ index 0eef782..d48509c 100644
        heaptop = heapbase = (void *)heapaddr;
        if (__hugetlb_opts.thp_morecore)
                __morecore = &thp_morecore;
-@@ -371,7 +372,6 @@ void hugetlbfs_setup_morecore(void)
+@@ -378,7 +379,6 @@ void hugetlbfs_setup_morecore(void)
                __morecore = &hugetlbfs_morecore;
 
        /* Set some allocator options more appropriate for hugepages */
@@ -31,9 +30,13 @@ index 0eef782..d48509c 100644
        if (__hugetlb_opts.shrink_ok)
                mallopt(M_TRIM_THRESHOLD, hpage_size + hpage_size / 2);
        else
-@@ -381,4 +381,5 @@ void hugetlbfs_setup_morecore(void)
+@@ -388,5 +388,6 @@ void hugetlbfs_setup_morecore(void)
         * This doesn't appear to prohibit malloc() from falling back
         * to mmap() if we run out of hugepages. */
        mallopt(M_MMAP_MAX, 0);
 +#endif
 }
+ #endif /* HAS_MORECORE */
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0008-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch
index 858a8e511a..73844b71f9 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0008-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch
@@ -1,20 +1,19 @@
-From 9ff04d7acc700387e3837f8ab11a41efea5ee8b0 Mon Sep 17 00:00:00 2001
+From 4f69eb130dc2c67a90f2460cedb78f6db11dd6d2 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 21 Jun 2018 19:44:26 -0700
 Subject: [PATCH] alloc.c: Avoid sysconf(_SC_LEVEL2_CACHE_LINESIZE) on linux
 musl does not have it
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
 alloc.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
 diff --git a/alloc.c b/alloc.c
-index bce9464..cf7eb40 100644
+index b8ed663..a58c43d 100644
 --- a/alloc.c
 +++ b/alloc.c
 @@ -245,6 +245,19 @@ void free_huge_pages(void *ptr)
@@ -46,3 +45,6 @@ index bce9464..cf7eb40 100644
                linemod = time(NULL);
        }
 
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-shm.c-Mark-glibc-specific-changes-so.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0009-shm.c-Mark-glibc-specific-changes-so.patch
index c3f7b3e479..4fbf30e24b 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-shm.c-Mark-glibc-specific-changes-so.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0009-shm.c-Mark-glibc-specific-changes-so.patch
@@ -1,13 +1,12 @@
-From 9ce323432a7f4d99f617970c7e35b607b9bbf843 Mon Sep 17 00:00:00 2001
+From 37239dd5f14a34b05e77b3ca6e34f96161f1339a Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 21 Jun 2018 19:48:04 -0700
 Subject: [PATCH] shm.c: Mark glibc specific changes so
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
 shm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
@@ -28,3 +27,6 @@ index 1f82cab..9447b63 100644
 
 /* call syscall shmget through the generic syscall mechanism */
 static int syscall_shmget(key_t key, size_t size, int shmflg)
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0010-Include-dirent.h-for-ino_t.patch
index 8bd1633392..a530a5267a 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0010-Include-dirent.h-for-ino_t.patch
@@ -1,4 +1,4 @@
-From bb8c370aaaf25b1fe1fbf984e73177018026cb91 Mon Sep 17 00:00:00 2001
+From ec9163c0436d1c77cecc941aca2e524b26001b15 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 21 Jun 2018 19:51:02 -0700
 Subject: [PATCH] Include dirent.h for ino_t
@@ -6,13 +6,13 @@ Subject: [PATCH] Include dirent.h for ino_t
 Fixes
 error: unknown type name 'ino_t'; did you mean 'int'?
+Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Update for 2.22.
 Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
 ---
-Upstream-Status: Pending
 tests/hugetests.h | 1 +
 1 file changed, 1 insertion(+)
@@ -29,5 +29,5 @@ index bc4e16a..fbe4dc0 100644
 
 #include "libhugetlbfs_privutils.h"
 -- 
-2.7.4
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-limits.h-for-PATH_MAX.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0011-include-limits.h-for-PATH_MAX.patch
index e4f8030961..08de396d9f 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-limits.h-for-PATH_MAX.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0011-include-limits.h-for-PATH_MAX.patch
@@ -1,4 +1,4 @@
-From 5f64aa8c47c2d3a155a97e262f89cc47394a69eb Mon Sep 17 00:00:00 2001
+From 79b76433f4b6f2f14914817b7e8ac0db1df39250 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 21 Jun 2018 19:58:53 -0700
 Subject: [PATCH] include limits.h for PATH_MAX
@@ -7,17 +7,16 @@ Fixes
 error: 'PATH_MAX' undeclared
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
 hugeadm.c                | 1 +
 tests/gethugepagesizes.c | 1 +
 2 files changed, 2 insertions(+)
 diff --git a/hugeadm.c b/hugeadm.c
-index fe4211d..8db274c 100644
+index 79a4867..65d5136 100644
 --- a/hugeadm.c
 +++ b/hugeadm.c
 @@ -33,6 +33,7 @@
@@ -29,7 +28,7 @@ index fe4211d..8db274c 100644
 #include <sys/stat.h>
 #include <sys/types.h>
 diff --git a/tests/gethugepagesizes.c b/tests/gethugepagesizes.c
-index 9551b38..2645e3f 100644
+index 5777265..990db69 100644
 --- a/tests/gethugepagesizes.c
 +++ b/tests/gethugepagesizes.c
 @@ -29,6 +29,7 @@
@@ -40,3 +39,6 @@ index 9551b38..2645e3f 100644
 
 #include "hugetests.h"
 
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-huge_page_setup_helper-use-python3-interpreter.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0012-huge_page_setup_helper-use-python3-interpreter.patch
index e45f283b38..0583df95ad 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-huge_page_setup_helper-use-python3-interpreter.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0012-huge_page_setup_helper-use-python3-interpreter.patch
@@ -1,4 +1,4 @@
-From b77c61de4d88d2c6e5d31f4f5a5877cc4c61272e Mon Sep 17 00:00:00 2001
+From e5580e392b8764e1e6509c5a4ed13fb2ce7566b9 Mon Sep 17 00:00:00 2001
 From: Andrey Zhizhikin <andrey.z@gmail.com>
 Date: Mon, 27 Jan 2020 17:27:55 +0000
 Subject: [PATCH] huge_page_setup_helper: use python3 interpreter
@@ -15,7 +15,7 @@ Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/huge_page_setup_helper.py b/huge_page_setup_helper.py
-index a9ba2bf..7ba0c92 100755
+index 01fc8dc..79a88ca 100755
 --- a/huge_page_setup_helper.py
 +++ b/huge_page_setup_helper.py
 @@ -1,4 +1,4 @@
@@ -25,5 +25,5 @@ index a9ba2bf..7ba0c92 100755
 #
 # Tool to set up Linux large page support with minimal effort
 -- 
-2.17.1
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0013-elflink.c-include-libgen.h-for-basename.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0013-elflink.c-include-libgen.h-for-basename.patch
new file mode 100644
index 0000000000..264a535cc7
--- /dev/null
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0013-elflink.c-include-libgen.h-for-basename.patch
@@ -0,0 +1,41 @@
+From 825444522d698991be04bbfa683a7cf785c6f72c Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Wed, 2 Oct 2024 00:06:34 +0800
+Subject: [PATCH] elflink.c: include libgen.h for basename
+Basename prototype has been removed from string.h from latest musl[1].
+Compilers e.g. clang-18 flags the absense of prototype as error.
+Therefore include libgen.h for providing it.
+elflink.c: In function 'get_shared_file_name':
+elflink.c:363:19: error: implicit declaration of function 'basename' [-Wimplicit-function-declaration]
+  363 |         binary2 = basename(binary);
+      |                   ^~~~~~~~
+elflink.c:363:17: error: assignment to 'char *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
+  363 |         binary2 = basename(binary);
+      |                 ^
+[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
+Upstream-Status: Pending
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ elflink.c | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/elflink.c b/elflink.c
+index 278d338..0e78d61 100644
+--- a/elflink.c
+++ b/elflink.c
+@@ -38,6 +38,7 @@
+ #include <limits.h>
+ #include <elf.h>
+ #include <dlfcn.h>
+#include <libgen.h>
+ 
+ #include "version.h"
+ #include "hugetlbfs.h"
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb
new file mode 100644
index 0000000000..e688d6ede2
--- /dev/null
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb
@@ -0,0 +1,79 @@
+SUMMARY = "A library which provides easy access to huge pages of memory"
+HOMEPAGE = "https://github.com/libhugetlbfs/libhugetlbfs"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1"
+RDEPENDS:${PN} += "bash"
+RDEPENDS:${PN}-tests += "bash python3-core python3-resource"
+PE = "1"
+SRCREV = "1322884fb0d55dc55f53563c1aa6328d118997e7"
+SRC_URI = " \
+    git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https;branch=master \
+    file://0001-skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \
+    file://0002-libhugetlbfs-avoid-search-host-library-path-for-cros.patch \
+    file://0003-tests-Makefile-install-static-4G-edge-testcases.patch \
+    file://0004-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \
+    file://0005-libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \
+    file://0006-include-stddef.h-for-ptrdiff_t.patch \
+    file://0007-Mark-glibc-specific-code-so.patch \
+    file://0008-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch \
+    file://0009-shm.c-Mark-glibc-specific-changes-so.patch \
+    file://0010-Include-dirent.h-for-ino_t.patch \
+    file://0011-include-limits.h-for-PATH_MAX.patch \
+    file://0012-huge_page_setup_helper-use-python3-interpreter.patch \
+    file://0013-elflink.c-include-libgen.h-for-basename.patch \
+"
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
+COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*"
+LIBARGS = "LIB32=${baselib} LIB64=${baselib}"
+LIBHUGETLBFS_ARCH = "${TARGET_ARCH}"
+LIBHUGETLBFS_ARCH:powerpc = "ppc"
+LIBHUGETLBFS_ARCH:powerpc64 = "ppc64"
+LIBHUGETLBFS_ARCH:powerpc64le = "ppc64le"
+EXTRA_OEMAKE = "'ARCH=${LIBHUGETLBFS_ARCH}' 'OPT=${CFLAGS}' 'CC=${CC}' ${LIBARGS} BUILDTYPE=NATIVEONLY V=2"
+PARALLEL_MAKE = ""
+CFLAGS += "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -g0"
+export HUGETLB_LDSCRIPT_PATH = "${S}/ldscripts"
+TARGET_CC_ARCH += "${LDFLAGS}"
+LDFLAGS += "-B${S}"
+inherit autotools-brokensep
+do_configure:prepend() {
+    ln -sf ld.hugetlbfs ${S}/ld
+    ln -sf ld.hugetlbfs ${S}/ld.bfd
+    ln -sf ld.hugetlbfs ${S}/ld.lld
+}
+do_install() {
+    oe_runmake PREFIX=${prefix} DESTDIR=${D}  \
+        INST_TESTSDIR32=${libdir}/libhugetlbfs/tests \
+        INST_TESTSDIR64=${libdir}/libhugetlbfs/tests \
+        install-tests
+    sed -i \
+        -e 's|${RECIPE_SYSROOT_NATIVE}||g' \
+        -e 's|${RECIPE_SYSROOT}||g' \
+        -e 's|${S}||g' \
+        `find ${D}${libdir}/libhugetlbfs/tests -name dummy.ldscript`
+}
+PACKAGES =+ "${PN}-tests "
+FILES:${PN} += "${libdir}/*.so"
+FILES:${PN}-dev = "${includedir}"
+FILES:${PN}-dbg += "${libdir}/libhugetlbfs/tests/obj32/.debug ${libdir}/libhugetlbfs/tests/obj64/.debug"
+FILES:${PN}-tests += "${libdir}/libhugetlbfs/tests"
+INSANE_SKIP:${PN} = "dev-so"
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
deleted file mode 100644
index 80af9873b1..0000000000
--- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
+++ /dev/null
@@ -1,79 +0,0 @@
-SUMMARY = "A library which provides easy access to huge pages of memory"
-HOMEPAGE = "https://github.com/libhugetlbfs/libhugetlbfs"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1"
-DEPENDS = "sysfsutils"
-RDEPENDS:${PN} += "bash python3-core"
-RDEPENDS:${PN}-tests += "bash python3-core"
-PV = "2.23"
-PE = "1"
-SRCREV = "6b126a4d7da9490fa40fe7e1b962edcb939feddc"
-SRC_URI = " \
-    git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https;branch=master \
-    file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \
-    file://libhugetlbfs-avoid-search-host-library-path-for-cros.patch \
-    file://tests-Makefile-install-static-4G-edge-testcases.patch \
-    file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \
-    file://libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \
-    file://0001-include-stddef.h-for-ptrdiff_t.patch \
-    file://0002-Mark-glibc-specific-code-so.patch \
-    file://0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch \
-    file://0004-shm.c-Mark-glibc-specific-changes-so.patch \
-    file://0005-Include-dirent.h-for-ino_t.patch \
-    file://0006-include-limits.h-for-PATH_MAX.patch \
-    file://0001-huge_page_setup_helper-use-python3-interpreter.patch \
-    file://0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch \
-    file://0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch \
-"
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
-S = "${WORKDIR}/git"
-COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*"
-LIBARGS = "LIB32=${baselib} LIB64=${baselib}"
-LIBHUGETLBFS_ARCH = "${TARGET_ARCH}"
-LIBHUGETLBFS_ARCH:powerpc = "ppc"
-LIBHUGETLBFS_ARCH:powerpc64 = "ppc64"
-LIBHUGETLBFS_ARCH:powerpc64le = "ppc64le"
-EXTRA_OEMAKE = "'ARCH=${LIBHUGETLBFS_ARCH}' 'OPT=${CFLAGS}' 'CC=${CC}' ${LIBARGS} BUILDTYPE=NATIVEONLY V=2"
-PARALLEL_MAKE = ""
-CFLAGS += "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -g0"
-export HUGETLB_LDSCRIPT_PATH="${S}/ldscripts"
-TARGET_CC_ARCH += "${LDFLAGS}"
-#The CUSTOM_LDSCRIPTS doesn't work with the gold linker
-inherit cpan-base
-do_configure() {
-    if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then
-      sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/'  Makefile
-    fi
-}
-do_install() {
-        oe_runmake PREFIX=${prefix} DESTDIR=${D}  \
-          INST_TESTSDIR32=${libdir}/libhugetlbfs/tests \
-          INST_TESTSDIR64=${libdir}/libhugetlbfs/tests \
-          install-tests
-}
-PACKAGES =+ "${PN}-tests "
-FILES:${PN} += "${libdir}/*.so"
-FILES:${PN}-dev = "${includedir}"
-FILES:${PN}-dbg += "${libdir}/libhugetlbfs/tests/obj32/.debug ${libdir}/libhugetlbfs/tests/obj64/.debug"
-FILES:${PN}-tests += "${libdir}/libhugetlbfs/tests"
-INSANE_SKIP:${PN} = "dev-so"
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-# see https://github.com/libhugetlbfs/libhugetlbfs/issues/52
-SKIP_RECIPE[libhugetlbfs] ?= "Needs porting to glibc 2.34+"
diff --git a/meta-oe/recipes-benchmark/linpack/linpack/0001-Fix-build-error-in-gcc-15.0.1-due-to-function-redecl.patch b/meta-oe/recipes-benchmark/linpack/linpack/0001-Fix-build-error-in-gcc-15.0.1-due-to-function-redecl.patch
new file mode 100644
index 0000000000..fbde7396c2
--- /dev/null
+++ b/meta-oe/recipes-benchmark/linpack/linpack/0001-Fix-build-error-in-gcc-15.0.1-due-to-function-redecl.patch
@@ -0,0 +1,52 @@
+From a1c1211fd6fc8d82053074c6dc531340f046c8d4 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Tue, 1 Apr 2025 16:06:56 +0900
+Subject: [PATCH] Fix build error in gcc 15.0.1 due to function redeclaration.
+Fix build error:
+linpacknew.c: In function 'dgefa':
+linpacknew.c:257:9: error: conflicting types for 'idamax'; have 'int(void)'
+  257 |     int idamax(),j,k,kp1,l,nm1;
+      |         ^~~~~~
+linpacknew.c:63:13: note: previous declaration of 'idamax' with type 'int(int,  REAL *, int)' {aka 'int(int,  double *, int)'}
+   63 | static int  idamax   (int n,REAL *dx,int incx);
+      |             ^~~~~~
+linpacknew.c:272:21: error: too many arguments to function 'idamax'; expected 0, have 3
+  272 |                 l = idamax(n-k,&a[lda*k+k],1) + k;
+      |                     ^~~~~~ ~~~
+linpacknew.c:257:9: note: declared here
+  257 |     int idamax(),j,k,kp1,l,nm1;
+      |         ^~~~~~
+linpacknew.c:326:21: error: too many arguments to function 'idamax'; expected 0, have 3
+  326 |                 l = idamax(n-k,&a[lda*k+k],1) + k;
+      |                     ^~~~~~ ~~~
+linpacknew.c:257:9: note: declared here
+  257 |     int idamax(),j,k,kp1,l,nm1;
+      |         ^~~~~~
+The function was already declared as static int idamax(int n, REAL *dx, int incx);
+on line 63, but it was redeclared as int idamax() inside the dgefa function on line 257,
+causing a conflict.
+where functions are redeclared without parameters,
+causing conflicts with the original function definitions.
+Upstream-Status: Inactive-Upstream [lastrelease: 2/25/94]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ linpacknew.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/linpacknew.c b/linpacknew.c
+index c656082..5c8687b 100644
+--- a/linpacknew.c
+++ b/linpacknew.c
+@@ -254,7 +254,7 @@ static void dgefa(REAL *a,int lda,int n,int *ipvt,int *info,int roll)
+ 
+     {
+     REAL t;
+-    int idamax(),j,k,kp1,l,nm1;
+    int j,k,kp1,l,nm1;
+ 
+     /* gaussian elimination with partial pivoting */
+ 
diff --git a/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb b/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb
index 603004ddd5..6a500dbf01 100644
--- a/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb
+++ b/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb
@@ -2,15 +2,15 @@ DESCRIPTION = "LINPACK Benchmarks are a measure of a system's floating point com
 SUMMARY = "LINPACK is a software library for performing numerical linear algebra on digital computers"
 LICENSE = "PD"
-LIC_FILES_CHKSUM ="file://${WORKDIR}/linpacknew.c;beginline=1;endline=23;md5=aa025e3bc44190c71e4c5e3b084fed87"
+LIC_FILES_CHKSUM = "file://${UNPACKDIR}/linpacknew.c;beginline=1;endline=23;md5=aa025e3bc44190c71e4c5e3b084fed87"
 SRC_URI = "http://www.netlib.org/benchmark/linpackc.new;downloadfilename=linpacknew.c \
           file://0001-linpack-Define-DP-only-when-SP-is-not-defined.patch \
+                   file://0001-Fix-build-error-in-gcc-15.0.1-due-to-function-redecl.patch \
          "
-SRC_URI[md5sum] = "1c5d0b6a31264685d2e651c920e3cdf4"
 SRC_URI[sha256sum] = "a63f2ec86512959f1fd926bfafb85905b2d7b7402942ffae3af374d48745e97e"
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 do_compile () {
        ${CC} ${CFLAGS} ${LDFLAGS} -DDP -o linpack_dp linpacknew.c -lm
diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-Fix-build-errors-related-to-incorrect-function-param.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-Fix-build-errors-related-to-incorrect-function-param.patch
new file mode 100644
index 0000000000..30f52023cd
--- /dev/null
+++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-Fix-build-errors-related-to-incorrect-function-param.patch
@@ -0,0 +1,252 @@
+From 8a6b5f649fe7f42aff4f69a8d99c522adb22f54c Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Thu, 10 Apr 2025 13:19:07 +0900
+Subject: [PATCH] Fix build errors related to incorrect function parameters in
+ gcc-15
+* see more details
+  http://errors.yoctoproject.org/Errors/Details/851798/
+    lat_rpc.c:172:1: error: conflicting types for 'client_rpc_xact_1'; have 'char *(char *, CLIENT *)' {aka 'char *(char *, struct __rpc_client *)'}
+    172 | client_rpc_xact_1(char *argp, CLIENT *clnt)
+        | ^~~~~~~~~~~~~~~~~
+    bench.h:349:14: note: previous declaration of 'client_rpc_xact_1' with type 'char *(void)'
+    349 | extern char *client_rpc_xact_1();
+        |              ^~~~~~~~~~~~~~~~~
+    lat_rpc.c: In function 'rpc_xact_1':
+    lat_rpc.c:189:1: warning: old-style function definition [-Wold-style-definition]
+    189 | rpc_xact_1(msg, transp)
+        | ^~~~~~~~~~
+    lat_rpc.c:192:1: error: number of arguments doesn't match prototype
+    192 | {
+        | ^
+    bench.h:348:14: error: prototype declaration
+    348 | extern char *rpc_xact_1();
+        |              ^~~~~~~~~~
+  Fix errors due to old-style function declarations
+  The code was using old-style function declarations without proper prototypes,
+  which causes compilation errors with newer GCC versions. This patch updates
+  the function declarations to use modern C syntax with proper parameter types.
+Upstream-Status: Submitted [https://sourceforge.net/p/lmbench/patches/3]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ src/bench.h   |  4 ++--
+ src/lat_rpc.c | 24 ++++++++++--------------
+ src/lat_udp.c |  4 ++--
+ src/lmdd.c    | 18 +++++++++---------
+ src/lmhttp.c  |  4 ++--
+ 5 files changed, 25 insertions(+), 29 deletions(-)
+diff --git a/src/bench.h b/src/bench.h
+index 1768ef7..4fc2822 100644
+--- a/src/bench.h
+++ b/src/bench.h
+@@ -345,7 +345,7 @@ extern int sched_pin(int cpu);
+ #define XACT_VERS ((u_long)1)
+ #define RPC_XACT ((u_long)1)
+ #define RPC_EXIT ((u_long)2)
+-extern char *rpc_xact_1();
+-extern char *client_rpc_xact_1();
+extern char *rpc_xact_1(char *msg, struct svc_req *rqstp);
+extern char *client_rpc_xact_1(char *argp, CLIENT *clnt);
+ 
+ #endif /* _BENCH_H */
+diff --git a/src/lat_rpc.c b/src/lat_rpc.c
+index 9c02192..e1450af 100644
+--- a/src/lat_rpc.c
+++ b/src/lat_rpc.c
+@@ -185,17 +185,15 @@ client_rpc_xact_1(char *argp, CLIENT *clnt)
+  * The remote procedure[s] that will be called
+  */
+ /* ARGSUSED */
+-char   *
+-rpc_xact_1(msg, transp)
+-       char    *msg;
+-       register SVCXPRT *transp;
+char *
+rpc_xact_1(char *msg, struct svc_req *rqstp /* transp is unused */)
+ {
+        static char r = 123;
+ 
+        return &r;
+ }
+ 
+-static void xact_prog_1();
+static void xact_prog_1(struct svc_req *rqstp, register SVCXPRT *transp);
+ 
+ void
+ server_main()
+@@ -233,16 +231,14 @@ server_main()
+ }
+ 
+ static void
+-xact_prog_1(rqstp, transp)
+-       struct svc_req *rqstp;
+-       register SVCXPRT *transp;
+xact_prog_1(struct svc_req *rqstp, register SVCXPRT *transp)
+ {
+        union {
+                char rpc_xact_1_arg;
+        } argument;
+        char *result;
+-       bool_t (*xdr_argument)(), (*xdr_result)();
+-       char *(*local)();
+       bool_t (*xdr_argument)(XDR *, void *), (*xdr_result)(XDR *, void *);
+       char *(*local)(char *, struct svc_req *);
+ 
+        switch (rqstp->rq_proc) {
+        case NULLPROC:
+@@ -250,9 +246,9 @@ xact_prog_1(rqstp, transp)
+                return;
+ 
+        case RPC_XACT:
+-               xdr_argument = xdr_char;
+-               xdr_result = xdr_char;
+-               local = (char *(*)()) rpc_xact_1;
+               xdr_argument = (bool_t (*)(XDR *, void *))xdr_char;
+               xdr_result = (bool_t (*)(XDR *, void *))xdr_char;
+               local = rpc_xact_1;
+                break;
+ 
+        case RPC_EXIT:
+@@ -269,7 +265,7 @@ xact_prog_1(rqstp, transp)
+                svcerr_decode(transp);
+                return;
+        }
+-       result = (*local)(&argument, rqstp);
+       result = local(&argument.rpc_xact_1_arg, rqstp);
+        if (result != NULL && !svc_sendreply(transp, (xdrproc_t)xdr_result, result)) {
+                svcerr_systemerr(transp);
+        }
+diff --git a/src/lat_udp.c b/src/lat_udp.c
+index cdd2e9b..292d5c4 100644
+--- a/src/lat_udp.c
+++ b/src/lat_udp.c
+@@ -19,7 +19,7 @@ char  *id = "$Id$\n";
+ 
+ void   client_main(int ac, char **av);
+ void   server_main();
+-void   timeout();
+void   timeout(int sig);
+ void   init(iter_t iterations, void* cookie);
+ void   cleanup(iter_t iterations, void* cookie);
+ void    doit(iter_t iterations, void* cookie);
+@@ -164,7 +164,7 @@ cleanup(iter_t iterations, void* cookie)
+ }
+ 
+ void
+-timeout()
+timeout(__attribute__((unused)) int sig)
+ {
+        fprintf(stderr, "Recv timed out\n");
+        exit(1);
+diff --git a/src/lmdd.c b/src/lmdd.c
+index dee37b4..da64b04 100644
+--- a/src/lmdd.c
+++ b/src/lmdd.c
+@@ -76,7 +76,7 @@ int   norepeats = -1;
+        bds_msg *m1, *m2;
+ #endif
+ 
+-uint64 getarg();
+uint64 getarg(char *s, int ac, char **av);
+ int    been_there(uint64 off);
+ int    getfile(char *s, int ac, char **av);
+ 
+@@ -148,7 +148,7 @@ char   *cmds[] = {
+ 
+ 
+ void error(char *);
+-void    done();
+void    done(int sig);
+ #ifdef DBG
+ extern int dbg;
+ #endif
+@@ -162,7 +162,7 @@ main(int ac, char **av)
+        int     Fork, misses, mismatch, outpat, inpat, in, timeopen, gotcnt;
+        int     slp;
+        uint64  skip, size, count;
+-       void    chkarg();
+       void    chkarg(char *arg);
+        int     i;
+        uint64  off = 0;
+        int     touch;
+@@ -332,7 +332,7 @@ main(int ac, char **av)
+                register int moved;
+ 
+                if (gotcnt && count-- <= 0) {
+-                       done();
+                       done(0);
+                }
+ 
+                /*
+@@ -445,7 +445,7 @@ main(int ac, char **av)
+                        perror("read");
+                }
+                if (moved <= 0) {
+-                       done();
+                       done(0);
+                }
+                if (inpat != -1) {
+                        register int foo, cnt;
+@@ -458,7 +458,7 @@ main(int ac, char **av)
+                                            (uint)(off + foo*sizeof(int)),
+                                            buf[foo]);
+                                        if (mismatch != -1 && --misses == 0) {
+-                                               done();
+                                               done(0);
+                                        }
+                                }
+                        }
+@@ -523,7 +523,7 @@ main(int ac, char **av)
+                        if (moved2 != moved) {
+                                fprintf(stderr, "write: wanted=%d got=%d\n",
+                                    moved, moved2);
+-                               done();
+                               done(0);
+                        }
+                        if ((Wtmax != -1) || (Wtmin != -1)) {
+                                int mics = stop(&start_tv, &stop_tv);
+@@ -560,7 +560,7 @@ main(int ac, char **av)
+                                perror("write");
+                        }
+                        if (moved2 != moved) {
+-                               done();
+                               done(0);
+                        }
+ 
+                        if (touch) {
+@@ -626,7 +626,7 @@ chkarg(char *arg)
+ }
+ 
+ void 
+-done(void)
+done(__attribute__((unused)) int sig)
+ {
+        int     i;
+        int     step;
+diff --git a/src/lmhttp.c b/src/lmhttp.c
+index 41d9949..c2f3cb9 100644
+--- a/src/lmhttp.c
+++ b/src/lmhttp.c
+@@ -26,7 +26,7 @@ char  *buf;
+ char   *bufs[3];
+ int    Dflg, dflg, nflg, lflg, fflg, zflg;
+ int    data, logfile;
+-void   die();
+void   die(int sig);
+ void   worker();
+ char   *http_time(void);
+ char   *date(time_t *tt);
+@@ -387,7 +387,7 @@ logit(int sock, char *name, int size)
+        nbytes += len;
+ }
+ 
+-void die()
+void die(__attribute__((unused)) int sig)
+ {
+        if (nbytes) {
+                write(logfile, logbuf, nbytes);
diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
index 57f73eedc7..acd4d6decf 100644
--- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
+++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
@@ -29,8 +29,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \
           file://0001-doc-Fix-typos-in-lat_unix_connect-manual-page.patch \
           file://0001-bench.h-Fix-typo-in-specifying-string.h.patch \
           file://0001-scripts-build-Fix-the-tests-to-build-with-clang15.patch \
+           file://0001-Fix-build-errors-related-to-incorrect-function-param.patch \
           "
-SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf"
 SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551"
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/lmbench/files/development/"
@@ -75,7 +75,7 @@ do_install () {
            DESTDIR="${D}" \
            -C src install
    mv ${D}${bindir}/line ${D}${bindir}/lm_line
-    install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/
+    install -m 0755 ${UNPACKDIR}/lmbench-run ${D}${bindir}/
    install -m 0755 ${S}/bin/${TARGET_SYS}/cache ${D}${bindir}/
    sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${BPN},;' \
           -e 's,^CONFIG=.*$,CONFIG=`$SCRIPTSDIR/config`,;' \
diff --git a/meta-oe/recipes-benchmark/mbw/mbw_2.0.bb b/meta-oe/recipes-benchmark/mbw/mbw_2.0.bb
index bb8c4625d5..1fd95de038 100644
--- a/meta-oe/recipes-benchmark/mbw/mbw_2.0.bb
+++ b/meta-oe/recipes-benchmark/mbw/mbw_2.0.bb
@@ -8,7 +8,6 @@ SRC_URI = "git://github.com/raas/${BPN}.git;branch=master;protocol=https"
 SRCREV = "c3155b544a5065e8235508059c6512af6c46bd4d"
-S = "${WORKDIR}/git"
 do_install() {
    install -d ${D}${bindir}
diff --git a/meta-oe/recipes-benchmark/memtester/memtester_4.6.0.bb b/meta-oe/recipes-benchmark/memtester/memtester_4.7.1.bb
index 42cee1108d..fd6713ea9f 100644
--- a/meta-oe/recipes-benchmark/memtester/memtester_4.6.0.bb
+++ b/meta-oe/recipes-benchmark/memtester/memtester_4.7.1.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 SRC_URI = "http://pyropus.ca/software/memtester/old-versions/${BP}.tar.gz \
           file://Makefile.patch \
           "
-SRC_URI[sha256sum] = "c9fe4eb7e80c8cef5202f9065c4c0682f5616647c0455e916a5700f98e3dbb2e"
+SRC_URI[sha256sum] = "e427de663f7bd22d1ebee8af12506a852c010bd4fcbca1e0e6b02972d298b5bb"
 do_compile () {
    echo '${CC} ${CFLAGS} -DPOSIX -c' > conf-cc
diff --git a/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/0001-Fix-build-error-with-gcc-15.patch b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/0001-Fix-build-error-with-gcc-15.patch
new file mode 100644
index 0000000000..8e01e17e91
--- /dev/null
+++ b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/0001-Fix-build-error-with-gcc-15.patch
@@ -0,0 +1,34 @@
+From 3ee8798764919cd3f7d983f99f6189bbb940d639 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Thu, 10 Apr 2025 10:53:14 +0900
+Subject: [PATCH] Fix build error with gcc-15
+* Fix the following build error with gcc-15:
+nbench1.c:3520:13: error: conflicting types for 'adjust_mid_wts'; have 'void(int)'
+ 3520 | static void adjust_mid_wts(int patt)
+      |             ^~~~~~~~~~~~~~
+In file included from nbench1.c:64:
+nbench1.h:373:13: note: previous declaration of 'adjust_mid_wts' with type 'void(void)'
+  373 | static void adjust_mid_wts();
+      |             ^~~~~~~~~~~~~~
+Upstream-Status: Inappropriate [no upstream]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ nbench1.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/nbench1.h b/nbench1.h
+index 13a5907..b81ca82 100644
+--- a/nbench1.h
+++ b/nbench1.h
+@@ -370,7 +370,7 @@ static void do_out_error(int patt);
+ static void worst_pass_error();
+ static void do_mid_error();
+ static void adjust_out_wts();
+-static void adjust_mid_wts();
+static void adjust_mid_wts(int patt);
+ static void do_back_pass(int patt);
+ static void move_wt_changes();
+ static int check_out_error();
diff --git a/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb
index b4d55be1b0..da03ebb291 100644
--- a/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb
+++ b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb
@@ -9,9 +9,9 @@ SECTION = "console/utils"
 SRC_URI = "https://fossies.org/linux/misc/old/${BP}.tar.gz \
           file://nbench_32bits.patch \
-           file://Makefile-add-more-dependencies-to-pointer.h.patch"
+           file://Makefile-add-more-dependencies-to-pointer.h.patch \
+           file://0001-Fix-build-error-with-gcc-15.patch"
-SRC_URI[md5sum] = "285dfab361080759d477ea1fe7d3093a"
 SRC_URI[sha256sum] = "723dd073f80e9969639eb577d2af4b540fc29716b6eafdac488d8f5aed9101ac"
 EXTRA_OEMAKE = "-e MAKEFLAGS="
diff --git a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb
index 8de3314b3c..5f105c9f8e 100644
--- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb
+++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz \
 SRC_URI[sha256sum] = "1f2092d536c0a3193efc53e4a50f3cee65c0ef1a78d31e5404f1c663fff7b7f4"
-S = "${WORKDIR}/phoronix-test-suite"
+S = "${UNPACKDIR}/phoronix-test-suite"
 inherit systemd allarch mime mime-xdg
@@ -25,6 +25,9 @@ do_install() {
    fi
 }
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[pdf] = ",,,ttf-dejavu-sans"
 # It is not advisable to enable these services by default since they can cause
 # continual target reboots if they encounter network problems.
 #
diff --git a/meta-oe/recipes-benchmark/qperf/qperf_0.4.11.bb b/meta-oe/recipes-benchmark/qperf/qperf_0.4.11.bb
index b32f37153e..e034371604 100644
--- a/meta-oe/recipes-benchmark/qperf/qperf_0.4.11.bb
+++ b/meta-oe/recipes-benchmark/qperf/qperf_0.4.11.bb
@@ -9,7 +9,6 @@ inherit autotools-brokensep
 SRCREV = "c706363815a38ff2c5cbc07b73e2cfaaa59bae0f"
 SRC_URI = "git://github.com/linux-rdma/qperf.git;protocol=https;branch=master"
-S = "${WORKDIR}/git"
 do_configure() {
  ./cleanup
diff --git a/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb b/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb
index 629b123042..caefdb7b6b 100644
--- a/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb
+++ b/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb
@@ -6,7 +6,10 @@ SRCREV = "f97f1ae321d1fb8111a2c638075702ed2512ff07"
 PV = "3.6"
 SRC_URI = "git://github.com/Algodev-github/S.git;protocol=https;branch=master"
-S = "${WORKDIR}/git"
+# Current PV is not a git tag but a Readme content, track commits to detect
+# upstream updates
+UPSTREAM_CHECK_COMMITS = "1"
 # installing in /opt/S-suite since the package has
 # dependencies to the directory structure.
diff --git a/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.11.bb b/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.11.bb
index ba61ff971e..2d450094b7 100644
--- a/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.11.bb
+++ b/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.11.bb
@@ -18,6 +18,5 @@ GI_DATA_ENABLED:libc-musl:armv7a = "False"
 GI_DATA_ENABLED:libc-musl:armv7ve = "False"
 SRC_URI = "git://github.com/stressapptest/stressapptest;branch=master;protocol=https"
-S = "${WORKDIR}/git"
 inherit autotools
diff --git a/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb b/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb
index 11e33fec55..198552e5c6 100644
--- a/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb
+++ b/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb
@@ -13,7 +13,6 @@ inherit autotools-brokensep pkgconfig
 SRC_URI = "git://github.com/akopytov/sysbench.git;protocol=https;branch=master"
 SRCREV = "ebf1c90da05dea94648165e4f149abc20c979557"
-S = "${WORKDIR}/git"
 COMPATIBLE_HOST = "(arm|aarch64|i.86|x86_64).*-linux*"
diff --git a/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb b/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb
index 200a0de849..8f65a6135c 100644
--- a/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb
+++ b/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/ssvb/tinymembench.git;branch=master;protocol=https \
           file://0001-asm-Delete-.func-.endfunc-directives.patch \
           "
-S = "${WORKDIR}/git"
 TARGET_CC_ARCH += "${LDFLAGS}"
diff --git a/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb b/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb
index 0769715f45..98914836ed 100644
--- a/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb
+++ b/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb
@@ -11,7 +11,6 @@ SRC_URI = "\
    file://0001-Drop-inline-of-crc32-function-to-fix-build-using-GCC.patch \
    file://0001-Specify-printf-formats.patch \
 "
-SRC_URI[md5sum] = "bf485bf820e693c79e6bd2a38702a128"
 SRC_URI[sha256sum] = "8ad011059a35ac70cdb5e3d3999ceee44a8e8e9078926844b0685b7ea9db2bcc"
 EXTRA_OEMAKE = "PREFIX=${D}/usr"
diff --git a/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb b/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb
index 8fad04e365..0c6661567b 100644
--- a/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb
+++ b/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb
@@ -2,13 +2,12 @@ DESCRIPTION = "Whetstone benchmark is a synthetic benchmark for evaluating the p
 SUMMARY = "CPU benchmark to measure floating point performance"
 LICENSE = "PD"
-LIC_FILES_CHKSUM ="file://${WORKDIR}/whetstone.c;beginline=1;endline=52;md5=c795edc15e7e1d92ca8f88ad718449f5"
+LIC_FILES_CHKSUM = "file://${UNPACKDIR}/whetstone.c;beginline=1;endline=52;md5=c795edc15e7e1d92ca8f88ad718449f5"
 SRC_URI = "http://www.netlib.org/benchmark/whetstone.c"
-SRC_URI[md5sum] = "d8eb2cd7104bb5a12d614ac6d3f1f9fb"
 SRC_URI[sha256sum] = "333e4ceca042c146f63eec605573d16ae8b07166cbc44a17bec1ea97c6f1efbf"
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 do_compile () {
        ${CC} ${CFLAGS} ${LDFLAGS} -Ofast -o whetstone whetstone.c -lm