@@ -39,6 +39,10 @@ SRC_URI = "\
file://0015-gprofng-change-use-of-bignum-to-bigint.patch \
file://0016-CVE-2024-53589.patch \
file://0017-dlltool-file-name-too-long.patch \
+ file://0018-opcodes-fix-std-gnu23-compatibility-wrt-static_assert.patch \
+ file://0019-Fix-32097-Warnings-when-building-gprofng-with-Clang.patch \
+ file://0020-gprofng-fix-std-gnu23-compatibility-wrt-unprototyped.patch \
+ file://0021-gprofng-fix-build-with-std-gnu23.patch \
file://0018-CVE-2025-0840.patch \
file://CVE-2025-1176.patch \
file://CVE-2025-1178.patch \
new file mode 100644
@@ -0,0 +1,89 @@
+From 8ebe62f3f0d27806b1bf69f301f5e188b4acd2b4 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 16 Nov 2024 05:03:52 +0000
+Subject: [PATCH] opcodes: fix -std=gnu23 compatibility wrt static_assert
+
+static_assert is declared in C23 so we can't reuse that identifier:
+* Define our own static_assert conditionally;
+
+* Rename "static assert" hacks to _N as we do already in some places
+ to avoid a conflict.
+
+ChangeLog:
+ PR ld/32372
+
+ * i386-gen.c (static_assert): Define conditionally.
+ * mips-formats.h (MAPPED_INT): Rename identifier.
+ (MAPPED_REG): Rename identifier.
+ (OPTIONAL_MAPPED_REG): Rename identifier.
+ * s390-opc.c (static_assert): Define conditionally.
+Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=8ebe62f3f0d27806b1bf69f301f5e188b4acd2b4]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ opcodes/i386-gen.c | 2 ++
+ opcodes/mips-formats.h | 6 +++---
+ opcodes/s390-opc.c | 2 ++
+ 3 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c
+index 053b66675c5..7ee8a30310c 100644
+--- a/opcodes/i386-gen.c
++++ b/opcodes/i386-gen.c
+@@ -30,7 +30,9 @@
+
+ /* Build-time checks are preferrable over runtime ones. Use this construct
+ in preference where possible. */
++#ifndef static_assert
+ #define static_assert(e) ((void)sizeof (struct { int _:1 - 2 * !(e); }))
++#endif
+
+ static const char *program_name = NULL;
+ static int debug = 0;
+diff --git a/opcodes/mips-formats.h b/opcodes/mips-formats.h
+index 90df7100803..c4dec6352bf 100644
+--- a/opcodes/mips-formats.h
++++ b/opcodes/mips-formats.h
+@@ -49,7 +49,7 @@
+ #define MAPPED_INT(SIZE, LSB, MAP, PRINT_HEX) \
+ { \
+ typedef char ATTRIBUTE_UNUSED \
+- static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
++ static_assert_3[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
+ static const struct mips_mapped_int_operand op = { \
+ { OP_MAPPED_INT, SIZE, LSB }, MAP, PRINT_HEX \
+ }; \
+@@ -83,7 +83,7 @@
+ #define MAPPED_REG(SIZE, LSB, BANK, MAP) \
+ { \
+ typedef char ATTRIBUTE_UNUSED \
+- static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
++ static_assert_4[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
+ static const struct mips_reg_operand op = { \
+ { OP_REG, SIZE, LSB }, OP_REG_##BANK, MAP \
+ }; \
+@@ -93,7 +93,7 @@
+ #define OPTIONAL_MAPPED_REG(SIZE, LSB, BANK, MAP) \
+ { \
+ typedef char ATTRIBUTE_UNUSED \
+- static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
++ static_assert_5[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
+ static const struct mips_reg_operand op = { \
+ { OP_OPTIONAL_REG, SIZE, LSB }, OP_REG_##BANK, MAP \
+ }; \
+diff --git a/opcodes/s390-opc.c b/opcodes/s390-opc.c
+index 9d9f0973e55..49efd714157 100644
+--- a/opcodes/s390-opc.c
++++ b/opcodes/s390-opc.c
+@@ -36,7 +36,9 @@
+
+ /* Build-time checks are preferrable over runtime ones. Use this construct
+ in preference where possible. */
++#ifndef static_assert
+ #define static_assert(e) ((void)sizeof (struct { int _:1 - 2 * !(e); }))
++#endif
+
+ #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+
+--
+2.43.7
+
new file mode 100644
@@ -0,0 +1,767 @@
+From b7888eb5a45772ed2e9a2030c50625a15b5ef795 Mon Sep 17 00:00:00 2001
+From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
+Date: Tue, 3 Sep 2024 21:30:31 -0700
+Subject: [PATCH] Fix 32097 Warnings when building gprofng with Clang
+
+gprofng/ChangeLog
+2024-09-03 Vladimir Mezentsev <vladimir.mezentsev@oracle.com>.
+
+ PR gprofng/32097
+ * common/hwcdrv.c: Fix -Wempty-body warnings.
+ * common/hwcentry.h: Fix -Wdeprecated-non-prototype warnings.
+ * common/hwctable.c: Fix -Wdeprecated-non-prototype warnings.
+ * libcollector/collector.c: Likewise.
+ * libcollector/collector.h: Likewise.
+ * libcollector/collectorAPI.c: Likewise.
+ * libcollector/dispatcher.c: Likewise.
+ * libcollector/iotrace.c: Likewise.
+ * libcollector/libcol_util.c: Fix -Wunused-but-set-variable warnings.
+ * libcollector/libcol_util.h: Remove unused declarations.
+ * libcollector/linetrace.c: Fix -Wdeprecated-non-prototype warnings.
+ * src/BaseMetricTreeNode.h: Fix -Wunused-private-field warnings.
+ * src/Dbe.cc: Fix -Wself-assign warnings.
+ * src/DbeSession.cc: Fix -Wunused-but-set-variable warnings.
+ * src/Disasm.cc: Fix -Wunused-const-variable warnings.
+ * src/Experiment.cc: Fix -Wunused-private-field warnings.
+ * src/HashMap.h: Fix -Wself-assign warnings.
+ * src/IOActivity.h: Fix -Wunused-private-field warnings.
+ * src/collctrl.cc: Fix -Wself-assign, -Wparentheses-equality warnings.
+ * src/collctrl.h: Fix -Wunused-private-field warnings.
+ * src/collector_module.h: Fix -Wdeprecated-non-prototype warnings.
+ * src/gp-display-src.cc: Fix -Wunused-private-field warnings.
+ * src/gp-print.h: Fix -Wheader-guard warnings.
+ * src/hwc_intel_icelake.h: Fix -Winitializer-overrides warnings.
+ * src/util.cc: Fix -Wunused-but-set-variable warnings.
+Upstream-Status: Backport [https://github.com/bminor/binutils-gdb/commit/b79c457ca01df82dbe1facb708e45def4584c903]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ gprofng/common/hwcdrv.c | 3 ++-
+ gprofng/common/hwcentry.h | 7 +----
+ gprofng/common/hwctable.c | 13 +---------
+ gprofng/libcollector/collector.c | 15 ++++-------
+ gprofng/libcollector/collector.h | 2 +-
+ gprofng/libcollector/collectorAPI.c | 15 ++++++-----
+ gprofng/libcollector/dispatcher.c | 19 ++++++++------
+ gprofng/libcollector/iotrace.c | 12 ++++-----
+ gprofng/libcollector/libcol_util.c | 2 --
+ gprofng/libcollector/libcol_util.h | 6 -----
+ gprofng/libcollector/linetrace.c | 40 +++++++++++++++++------------
+ gprofng/src/BaseMetricTreeNode.h | 1 -
+ gprofng/src/Dbe.cc | 12 ++++-----
+ gprofng/src/DbeSession.cc | 3 ---
+ gprofng/src/Disasm.cc | 1 -
+ gprofng/src/Experiment.cc | 2 --
+ gprofng/src/HashMap.h | 3 +--
+ gprofng/src/IOActivity.h | 1 -
+ gprofng/src/collctrl.cc | 14 +++++-----
+ gprofng/src/collctrl.h | 1 -
+ gprofng/src/collector_module.h | 20 +++++++--------
+ gprofng/src/gp-display-src.cc | 8 ------
+ gprofng/src/gp-print.h | 2 +-
+ gprofng/src/util.cc | 10 +++-----
+ 24 files changed, 84 insertions(+), 128 deletions(-)
+
+diff --git a/gprofng/common/hwcdrv.c b/gprofng/common/hwcdrv.c
+index 2d549b0d6a5..fa1ad32430b 100644
+--- a/gprofng/common/hwcdrv.c
++++ b/gprofng/common/hwcdrv.c
+@@ -650,6 +650,7 @@ read_sample (counter_state_t *ctr_state, int msgsz, uint64_t *rvalue,
+ static void
+ dump_perf_event_attr (struct perf_event_attr *at)
+ {
++#if defined(DEBUG)
+ TprintfT (DBG_LT2, "dump_perf_event_attr: size=%d type=%d sample_period=%lld\n"
+ " config=0x%llx config1=0x%llx config2=0x%llx wakeup_events=%lld __reserved_1=%lld\n",
+ (int) at->size, (int) at->type, (unsigned long long) at->sample_period,
+@@ -665,13 +666,13 @@ dump_perf_event_attr (struct perf_event_attr *at)
+ DUMP_F (exclude_kernel);
+ DUMP_F (exclude_hv);
+ DUMP_F (exclude_idle);
+- // DUMP_F(xmmap);
+ DUMP_F (comm);
+ DUMP_F (freq);
+ DUMP_F (inherit_stat);
+ DUMP_F (enable_on_exec);
+ DUMP_F (task);
+ DUMP_F (watermark);
++#endif
+ }
+
+ static void
+diff --git a/gprofng/common/hwcentry.h b/gprofng/common/hwcentry.h
+index a35a363e693..7899875cf96 100644
+--- a/gprofng/common/hwcentry.h
++++ b/gprofng/common/hwcentry.h
+@@ -202,17 +202,12 @@ extern "C"
+ extern char *hwc_get_docref (char *buf, size_t buflen);
+ /* Return a CPU HWC document reference, or NULL. */
+
+- // TBR
+- extern char *hwc_get_default_cntrs ();
+- /* Return a default HW counter string; may be NULL, or zero-length */
+- /* NULL means none is defined in the table; or zero-length means string defined could not be loaded */
+-
+ extern char *hwc_get_default_cntrs2 (int forKernel, int style);
+ /* like hwc_get_default_cntrs() for style==1 */
+ /* but allows other styles of formatting as well */
+ /* deprecate and eventually remove hwc_get_default_cntrs() */
+
+- extern char *hwc_get_orig_default_cntrs ();
++ extern char *hwc_get_orig_default_cntrs (int forKernel);
+ /* Get the default HW counter string as set in the table */
+ /* NULL means none is defined in the table */
+
+diff --git a/gprofng/common/hwctable.c b/gprofng/common/hwctable.c
+index d0735132fac..fe9153190e7 100644
+--- a/gprofng/common/hwctable.c
++++ b/gprofng/common/hwctable.c
+@@ -3231,7 +3231,7 @@ check_tables ()
+ }
+ #endif
+
+-static int try_a_counter ();
++static int try_a_counter (int forKernel);
+ static void hwc_process_raw_ctrs (int forKernel, Hwcentry ***pstd_out,
+ Hwcentry ***praw_out, Hwcentry ***phidden_out,
+ Hwcentry**static_tables,
+@@ -4321,17 +4321,6 @@ hwc_get_docref (char *buf, size_t buflen)
+ return buf;
+ }
+
+-//TBR:
+-
+-extern char*
+-hwc_get_default_cntrs ()
+-{
+- setup_cpcx ();
+- if (cpcx_default_hwcs[0] != NULL)
+- return strdup (cpcx_default_hwcs[0]); // TBR deprecate this
+- return NULL;
+-}
+-
+ extern char*
+ hwc_get_default_cntrs2 (int forKernel, int style)
+ {
+diff --git a/gprofng/libcollector/collector.c b/gprofng/libcollector/collector.c
+index 39529758600..ef580dcbdd9 100644
+--- a/gprofng/libcollector/collector.c
++++ b/gprofng/libcollector/collector.c
+@@ -210,15 +210,10 @@ get_collector_interface ()
+ static void
+ collector_module_init (CollectorInterface *col_intf)
+ {
+- int nmodules = 0;
+-
+ ModuleInitFunc next_init = (ModuleInitFunc) dlsym (RTLD_DEFAULT, "__collector_module_init");
+ if (next_init != NULL)
+- {
+- nmodules++;
+- next_init (col_intf);
+- }
+- TprintfT (DBG_LT1, "collector_module_init: %d modules\n", nmodules);
++ next_init (col_intf);
++ TprintfT (DBG_LT1, "collector_module_init: %d modules\n", next_init ? 1 : 0);
+ }
+
+ /* Routines concerned with general experiment start and stop */
+@@ -1784,7 +1779,7 @@ __collector_pause ()
+ }
+
+ void
+-__collector_pause_m (char *reason)
++__collector_pause_m (const char *reason)
+ {
+ hrtime_t now;
+ char xreason[MAXPATHLEN];
+@@ -2451,8 +2446,8 @@ __collector_dlog (int tflag, int level, char *format, ...)
+
+ static void (*__real__exit) (int status) = NULL; /* libc only: _exit */
+ static void (*__real__Exit) (int status) = NULL; /* libc only: _Exit */
+-void _exit () __attribute__ ((weak, alias ("__collector_exit")));
+-void _Exit () __attribute__ ((weak, alias ("__collector_Exit")));
++void _exit (int status) __attribute__ ((weak, alias ("__collector_exit")));
++void _Exit (int status) __attribute__ ((weak, alias ("__collector_Exit")));
+
+ void
+ __collector_exit (int status)
+diff --git a/gprofng/libcollector/collector.h b/gprofng/libcollector/collector.h
+index 07a03bdd17a..eda68a0e4f5 100644
+--- a/gprofng/libcollector/collector.h
++++ b/gprofng/libcollector/collector.h
+@@ -123,7 +123,7 @@ extern void __collector_terminate_expt ();
+ extern void __collector_terminate_hook ();
+ extern void __collector_sample (char *name);
+ extern void __collector_pause ();
+-extern void __collector_pause_m ();
++extern void __collector_pause_m (const char *reason);
+ extern void __collector_resume ();
+ extern int collector_sigemt_sigaction (const struct sigaction*,
+ struct sigaction*);
+diff --git a/gprofng/libcollector/collectorAPI.c b/gprofng/libcollector/collectorAPI.c
+index 5fa6403ad49..449bbbaab65 100644
+--- a/gprofng/libcollector/collectorAPI.c
++++ b/gprofng/libcollector/collectorAPI.c
+@@ -26,16 +26,17 @@
+ #include "collectorAPI.h"
+ #include "gp-experiment.h"
+
+-static void *__real_collector_sample = NULL;
+-static void *__real_collector_pause = NULL;
+-static void *__real_collector_resume = NULL;
+-static void *__real_collector_terminate_expt = NULL;
+-static void *__real_collector_func_load = NULL;
+-static void *__real_collector_func_unload = NULL;
++static void (*__real_collector_sample)(const char *) = NULL;
++static void (*__real_collector_pause)() = NULL;
++static void (*__real_collector_resume)() = NULL;
++static void (*__real_collector_terminate_expt)() = NULL;
++static void (*__real_collector_func_load)(const char *, const char *,
++ const char *, void *, int, int, Lineno *) = NULL;
++static void (*__real_collector_func_unload)(void *) = NULL;
+
+ #define INIT_API if (init_API == 0) collectorAPI_initAPI()
+ #define NULL_PTR(x) (__real_##x == NULL)
+-#define CALL_REAL(x) (*(void(*)())__real_##x)
++#define CALL_REAL(x) (__real_##x)
+ #define CALL_IF_REAL(x) INIT_API; if (!NULL_PTR(x)) CALL_REAL(x)
+
+ static int init_API = 0;
+diff --git a/gprofng/libcollector/dispatcher.c b/gprofng/libcollector/dispatcher.c
+index d2a4ad0b60b..867753a22ec 100644
+--- a/gprofng/libcollector/dispatcher.c
++++ b/gprofng/libcollector/dispatcher.c
+@@ -909,8 +909,9 @@ sigset (int sig, sighandler_t handler)
+
+ // map interposed symbol versions
+ static int
+-gprofng_timer_create (int (real_func) (), clockid_t clockid,
+- struct sigevent *sevp, timer_t *timerid)
++gprofng_timer_create (int (real_func) (clockid_t, struct sigevent *, timer_t *),
++ clockid_t clockid,
++ struct sigevent *sevp, timer_t *timerid)
+ {
+ // collector reserves SIGPROF
+ if (sevp == NULL || sevp->sigev_notify != SIGEV_SIGNAL ||
+@@ -1045,7 +1046,7 @@ __collector_thr_sigsetmask (int how, const sigset_t* iset, sigset_t* oset)
+ // map interposed symbol versions
+
+ static int
+-gprofng_pthread_sigmask (int (real_func) (),
++gprofng_pthread_sigmask (int (real_func) (int, const sigset_t *, sigset_t*),
+ int how, const sigset_t *iset, sigset_t* oset)
+ {
+ sigset_t lsigset;
+@@ -1140,9 +1141,10 @@ collector_root (void *cargs)
+ // map interposed symbol versions
+
+ static int
+-gprofng_pthread_create (int (real_func) (), pthread_t *thread,
+- const pthread_attr_t *attr,
+- void *(*func)(void*), void *arg)
++gprofng_pthread_create (int (real_func) (pthread_t *, const pthread_attr_t *,
++ void *(*)(void *), void *),
++ pthread_t *thread, const pthread_attr_t *attr,
++ void *(*func)(void*), void *arg)
+ {
+ TprintfT (DBG_LTT, "gprofng_pthread_create @%p\n", real_func);
+ if (dispatch_mode != DISPATCH_ON)
+@@ -1277,6 +1279,7 @@ __collector_ext_clone_pthread (int (*fn)(void *), void *child_stack, int flags,
+ }
+
+ // weak symbols:
+-int sigprocmask () __attribute__ ((weak, alias ("__collector_sigprocmask")));
+-int thr_sigsetmask () __attribute__ ((weak, alias ("__collector_thr_sigsetmask")));
++int sigprocmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_sigprocmask")));
++int thr_sigsetmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_thr_sigsetmask")));
+ int setitimer () __attribute__ ((weak, alias ("_setitimer")));
++
+diff --git a/gprofng/libcollector/iotrace.c b/gprofng/libcollector/iotrace.c
+index 18060864796..3deb441d9c7 100644
+--- a/gprofng/libcollector/iotrace.c
++++ b/gprofng/libcollector/iotrace.c
+@@ -1350,7 +1350,7 @@ mkstemp (char *template)
+ unsigned pktSize;
+ if (NULL_PTR (mkstemp))
+ init_io_intf ();
+- if (CHCK_REENTRANCE (guard) || template == NULL)
++ if (CHCK_REENTRANCE (guard))
+ return CALL_REAL (mkstemp)(template);
+ PUSH_REENTRANCE (guard);
+ hrtime_t reqt = gethrtime ();
+@@ -1405,7 +1405,7 @@ mkstemps (char *template, int slen)
+ unsigned pktSize;
+ if (NULL_PTR (mkstemps))
+ init_io_intf ();
+- if (CHCK_REENTRANCE (guard) || template == NULL)
++ if (CHCK_REENTRANCE (guard))
+ return CALL_REAL (mkstemps)(template, slen);
+ PUSH_REENTRANCE (guard);
+ hrtime_t reqt = gethrtime ();
+@@ -1485,7 +1485,7 @@ close (int fildes)
+
+ /*------------------------------------------------------------- fopen */
+ static FILE*
+-gprofng_fopen (FILE*(real_fopen) (), const char *filename, const char *mode)
++gprofng_fopen (FILE*(real_fopen) (const char *, const char *), const char *filename, const char *mode)
+ {
+ int *guard;
+ FILE *fp = NULL;
+@@ -1559,7 +1559,7 @@ DCL_FOPEN (fopen)
+
+ /*------------------------------------------------------------- fclose */
+ static int
+-gprofng_fclose (int(real_fclose) (), FILE *stream)
++gprofng_fclose (int(real_fclose) (FILE *), FILE *stream)
+ {
+ int *guard;
+ int stat;
+@@ -1645,7 +1645,7 @@ fflush (FILE *stream)
+
+ /*------------------------------------------------------------- fdopen */
+ static FILE*
+-gprofng_fdopen (FILE*(real_fdopen) (), int fildes, const char *mode)
++gprofng_fdopen (FILE*(real_fdopen) (int, const char *), int fildes, const char *mode)
+ {
+ int *guard;
+ FILE *fp = NULL;
+@@ -2957,7 +2957,7 @@ DCL_FGETPOS (fgetpos)
+
+ /*------------------------------------------------------------- fgetpos64 */
+ static int
+-gprofng_fgetpos64 (int(real_fgetpos64) (), FILE *stream, fpos64_t *pos)
++gprofng_fgetpos64 (int(real_fgetpos64) (FILE *, fpos64_t *), FILE *stream, fpos64_t *pos)
+ {
+ int *guard;
+ int ret;
+diff --git a/gprofng/libcollector/libcol_util.c b/gprofng/libcollector/libcol_util.c
+index 15ba24d2ab5..c2b82894e6b 100644
+--- a/gprofng/libcollector/libcol_util.c
++++ b/gprofng/libcollector/libcol_util.c
+@@ -1013,7 +1013,6 @@ __collector_open (const char *path, int oflag, ...)
+ mode_t mode = 0;
+
+ hrtime_t t_timeout = __collector_gethrtime () + 5 * ((hrtime_t) NANOSEC);
+- int nretries = 0;
+ long long delay = 100; /* start at some small, arbitrary value */
+
+ /* get optional mode argument if it's expected/required */
+@@ -1058,7 +1057,6 @@ __collector_open (const char *path, int oflag, ...)
+ delay *= 2;
+ if (delay > 100000000)
+ delay = 100000000; /* cap at some large, arbitrary value */
+- nretries++;
+ }
+ return fd;
+ }
+diff --git a/gprofng/libcollector/libcol_util.h b/gprofng/libcollector/libcol_util.h
+index 2eeeaeed50b..1b1b928180a 100644
+--- a/gprofng/libcollector/libcol_util.h
++++ b/gprofng/libcollector/libcol_util.h
+@@ -81,12 +81,6 @@ extern int __collector_mutex_trylock (collector_mutex_t *mp);
+ #define __collector_mutex_init(xx) \
+ do { collector_mutex_t tmp=COLLECTOR_MUTEX_INITIALIZER; *(xx)=tmp; } while(0)
+
+-void __collector_sample (char *name);
+-void __collector_terminate_expt ();
+-void __collector_pause ();
+-void __collector_pause_m ();
+-void __collector_resume ();
+-
+ struct DT_lineno;
+
+ typedef enum
+diff --git a/gprofng/libcollector/linetrace.c b/gprofng/libcollector/linetrace.c
+index 67b2d7e9030..66844bc1337 100644
+--- a/gprofng/libcollector/linetrace.c
++++ b/gprofng/libcollector/linetrace.c
+@@ -1207,7 +1207,7 @@ __collector_vfork (void)
+ }
+
+ /*------------------------------------------------------------- execve */
+-int execve () __attribute__ ((weak, alias ("__collector_execve")));
++int execve (const char *, char *const [], char *const []) __attribute__ ((weak, alias ("__collector_execve")));
+
+ int
+ __collector_execve (const char* path, char *const argv[], char *const envp[])
+@@ -1237,7 +1237,7 @@ __collector_execve (const char* path, char *const argv[], char *const envp[])
+ return ret;
+ }
+
+-int execvp () __attribute__ ((weak, alias ("__collector_execvp")));
++int execvp (const char *, char *const []) __attribute__ ((weak, alias ("__collector_execvp")));
+
+ int
+ __collector_execvp (const char* file, char *const argv[])
+@@ -1269,7 +1269,7 @@ __collector_execvp (const char* file, char *const argv[])
+ return ret;
+ }
+
+-int execv () __attribute__ ((weak, alias ("__collector_execv")));
++int execv (const char *, char *const []) __attribute__ ((weak, alias ("__collector_execv")));
+
+ int
+ __collector_execv (const char* path, char *const argv[])
+@@ -1408,7 +1408,10 @@ __collector_execl (const char* path, const char *arg0, ...)
+ /*-------------------------------------------------------- posix_spawn */
+ // map interposed symbol versions
+ static int
+-gprofng_posix_spawn (int(real_posix_spawn) (),
++gprofng_posix_spawn (int(real_posix_spawn) (pid_t *, const char *,
++ const posix_spawn_file_actions_t *,
++ const posix_spawnattr_t *,
++ char *const [], char *const []),
+ pid_t *pidp, const char *path,
+ const posix_spawn_file_actions_t *file_actions,
+ const posix_spawnattr_t *attrp,
+@@ -1466,7 +1469,10 @@ DCL_POSIX_SPAWN (posix_spawn)
+
+ /*-------------------------------------------------------- posix_spawnp */
+ static int
+-gprofng_posix_spawnp (int (real_posix_spawnp) (),
++gprofng_posix_spawnp (int (real_posix_spawnp) (pid_t *, const char *,
++ const posix_spawn_file_actions_t *,
++ const posix_spawnattr_t *,
++ char *const [], char *const []),
+ pid_t *pidp, const char *path,
+ const posix_spawn_file_actions_t *file_actions,
+ const posix_spawnattr_t *attrp,
+@@ -1754,8 +1760,8 @@ __collector_clone (int (*fn)(void *), void *child_stack, int flags, void *arg,
+ }
+
+ /*-------------------------------------------------------------------- setuid */
+-int setuid () __attribute__ ((weak, alias ("__collector_setuid")));
+-int _setuid () __attribute__ ((weak, alias ("__collector_setuid")));
++int setuid (uid_t) __attribute__ ((weak, alias ("__collector_setuid")));
++int _setuid (uid_t) __attribute__ ((weak, alias ("__collector_setuid")));
+
+ int
+ __collector_setuid (uid_t ruid)
+@@ -1770,8 +1776,8 @@ __collector_setuid (uid_t ruid)
+ }
+
+ /*------------------------------------------------------------------- seteuid */
+-int seteuid () __attribute__ ((weak, alias ("__collector_seteuid")));
+-int _seteuid () __attribute__ ((weak, alias ("__collector_seteuid")));
++int seteuid (uid_t) __attribute__ ((weak, alias ("__collector_seteuid")));
++int _seteuid (uid_t) __attribute__ ((weak, alias ("__collector_seteuid")));
+
+ int
+ __collector_seteuid (uid_t euid)
+@@ -1786,8 +1792,8 @@ __collector_seteuid (uid_t euid)
+ }
+
+ /*------------------------------------------------------------------ setreuid */
+-int setreuid () __attribute__ ((weak, alias ("__collector_setreuid")));
+-int _setreuid () __attribute__ ((weak, alias ("__collector_setreuid")));
++int setreuid (uid_t, uid_t) __attribute__ ((weak, alias ("__collector_setreuid")));
++int _setreuid (uid_t, uid_t) __attribute__ ((weak, alias ("__collector_setreuid")));
+
+ int
+ __collector_setreuid (uid_t ruid, uid_t euid)
+@@ -1802,8 +1808,8 @@ __collector_setreuid (uid_t ruid, uid_t euid)
+ }
+
+ /*-------------------------------------------------------------------- setgid */
+-int setgid () __attribute__ ((weak, alias ("__collector_setgid")));
+-int _setgid () __attribute__ ((weak, alias ("__collector_setgid")));
++int setgid (gid_t) __attribute__ ((weak, alias ("__collector_setgid")));
++int _setgid (gid_t) __attribute__ ((weak, alias ("__collector_setgid")));
+
+ int
+ __collector_setgid (gid_t rgid)
+@@ -1818,8 +1824,8 @@ __collector_setgid (gid_t rgid)
+ }
+
+ /*------------------------------------------------------------------- setegid */
+-int setegid () __attribute__ ((weak, alias ("__collector_setegid")));
+-int _setegid () __attribute__ ((weak, alias ("__collector_setegid")));
++int setegid (gid_t) __attribute__ ((weak, alias ("__collector_setegid")));
++int _setegid (gid_t) __attribute__ ((weak, alias ("__collector_setegid")));
+
+ int
+ __collector_setegid (gid_t egid)
+@@ -1834,8 +1840,8 @@ __collector_setegid (gid_t egid)
+ }
+
+ /*------------------------------------------------------------------ setregid */
+-int setregid () __attribute__ ((weak, alias ("__collector_setregid")));
+-int _setregid () __attribute__ ((weak, alias ("__collector_setregid")));
++int setregid (gid_t, gid_t) __attribute__ ((weak, alias ("__collector_setregid")));
++int _setregid (gid_t, gid_t) __attribute__ ((weak, alias ("__collector_setregid")));
+
+ int
+ __collector_setregid (gid_t rgid, gid_t egid)
+diff --git a/gprofng/src/BaseMetricTreeNode.h b/gprofng/src/BaseMetricTreeNode.h
+index d73d244e27e..7698f9c6eaf 100644
+--- a/gprofng/src/BaseMetricTreeNode.h
++++ b/gprofng/src/BaseMetricTreeNode.h
+@@ -85,7 +85,6 @@ private:
+
+ BaseMetricTreeNode *root; // root of tree
+ BaseMetricTreeNode *parent; // my parent
+- bool aggregation; // value is based on children's values
+ char *name; // bm->get_cmd() for metrics, unique string otherwise
+ char *uname; // user-visible text
+ char *unit; // see UNIT_* defines
+diff --git a/gprofng/src/Dbe.cc b/gprofng/src/Dbe.cc
+index 91a5aa5ef05..bcbf4694565 100644
+--- a/gprofng/src/Dbe.cc
++++ b/gprofng/src/Dbe.cc
+@@ -9594,14 +9594,12 @@ dbeGetTLDataRepVals (VMode view_mode, hrtime_t start_ts, hrtime_t delta,
+ }
+ if (sampleVals != NULL)
+ {
+- Sample* sample = (Sample*) packets->getObjValue (PROP_SMPLOBJ, packetIdx);
+- if (!sample || !sample->get_usage ())
+- sample = sample;
+- else
++ Sample *sample = (Sample*) packets->getObjValue (PROP_SMPLOBJ, packetIdx);
++ if (sample != NULL)
+ {
+- PrUsage* prusage = sample->get_usage ();
+- Vector<long long> *mstateVals = prusage->getMstateValues ();
+- sampleVals->store (eventIdx, mstateVals);
++ PrUsage *prusage = sample->get_usage ();
++ if (prusage != NULL)
++ sampleVals->store (eventIdx, prusage->getMstateValues ());
+ }
+ }
+ }
+diff --git a/gprofng/src/DbeSession.cc b/gprofng/src/DbeSession.cc
+index 20329091167..5d6bab75638 100644
+--- a/gprofng/src/DbeSession.cc
++++ b/gprofng/src/DbeSession.cc
+@@ -1162,8 +1162,6 @@ DbeSession::open_experiment (Experiment *exp, char *path)
+ closedir (exp_dir);
+ exp_names->sort (dir_name_cmp);
+ Experiment **t_exp_list = new Experiment *[exp_names->size ()];
+- int nsubexps = 0;
+-
+ for (int j = 0, jsz = exp_names->size (); j < jsz; j++)
+ {
+ t_exp_list[j] = NULL;
+@@ -1220,7 +1218,6 @@ DbeSession::open_experiment (Experiment *exp, char *path)
+ dexp->open (dpath);
+ append (dexp);
+ t_exp_list[j] = dexp;
+- nsubexps++;
+ dexp->set_clock (exp->clock);
+
+ // DbeView add_experiment() is split into two parts
+diff --git a/gprofng/src/Disasm.cc b/gprofng/src/Disasm.cc
+index 1396e4fb072..d78212cee39 100644
+--- a/gprofng/src/Disasm.cc
++++ b/gprofng/src/Disasm.cc
+@@ -49,7 +49,6 @@ struct DisContext
+ };
+
+ static const int MAX_DISASM_STR = 2048;
+-static const int MAX_INSTR_SIZE = 8;
+
+ Disasm::Disasm (char *fname)
+ {
+diff --git a/gprofng/src/Experiment.cc b/gprofng/src/Experiment.cc
+index 02a24ebc40d..a31550aff66 100644
+--- a/gprofng/src/Experiment.cc
++++ b/gprofng/src/Experiment.cc
+@@ -1935,8 +1935,6 @@ private:
+ }
+
+ Experiment *exp;
+- char *hostname;
+- hrtime_t time, tstamp;
+ };
+
+ void
+diff --git a/gprofng/src/HashMap.h b/gprofng/src/HashMap.h
+index 918c0dc95f9..c5fdd345ba8 100644
+--- a/gprofng/src/HashMap.h
++++ b/gprofng/src/HashMap.h
+@@ -78,9 +78,8 @@ copy_key (uint64_t a)
+ }
+
+ template<> inline void
+-delete_key (uint64_t a)
++delete_key (uint64_t)
+ {
+- a = a;
+ }
+
+ template<> inline int
+diff --git a/gprofng/src/IOActivity.h b/gprofng/src/IOActivity.h
+index cf462cf8d55..f3a22ada6b1 100644
+--- a/gprofng/src/IOActivity.h
++++ b/gprofng/src/IOActivity.h
+@@ -78,7 +78,6 @@ private:
+ Hist_data *hist_data_file_all;
+ Hist_data *hist_data_vfd_all;
+ Hist_data *hist_data_callstack_all;
+- Hist_data *hist_data_callstack;
+
+ DbeView *dbev;
+ };
+diff --git a/gprofng/src/collctrl.cc b/gprofng/src/collctrl.cc
+index ebf888c5a20..b0ed66efcdc 100644
+--- a/gprofng/src/collctrl.cc
++++ b/gprofng/src/collctrl.cc
+@@ -952,9 +952,7 @@ Coll_Ctrl::set_clkprof (const char *string, char** warn)
+ double dval = strtod (string, &endchar);
+ if (*endchar == 'm' || *endchar == 0) /* user specified milliseconds */
+ dval = dval * 1000.;
+- else if (*endchar == 'u') /* user specified microseconds */
+- dval = dval;
+- else
++ else if (*endchar != 'u')
+ return dbe_sprintf (GTXT ("Unrecognized clock-profiling interval `%s'\n"), string);
+ nclkprof_timer = (int) (dval + 0.5);
+ }
+@@ -2901,7 +2899,7 @@ Coll_Ctrl::get (char * control)
+ }
+ if (!strncmp (control, ipc_str_javaprof, len))
+ {
+- if ((java_mode == 0))
++ if (java_mode == 0)
+ return strdup (ipc_str_off);
+ return strdup (ipc_str_on);
+ }
+@@ -2917,7 +2915,7 @@ Coll_Ctrl::get (char * control)
+ }
+ if (!strncmp (control, ipc_str_sample_sig, len))
+ {
+- if ((sample_sig == 0))
++ if (sample_sig == 0)
+ return strdup (ipc_str_off);
+ char *str_signal = find_signal_name (sample_sig);
+ if (str_signal != NULL)
+@@ -2951,15 +2949,15 @@ Coll_Ctrl::get (char * control)
+ }
+ if (!strncmp (control, ipc_str_iotrace, len))
+ {
+- if ((iotrace_enabled == 0))
++ if (iotrace_enabled == 0)
+ return strdup (ipc_str_off);
+ return strdup (ipc_str_on);
+ }
+ if (!strncmp (control, ipc_str_count, len))
+ {
+- if ((count_enabled == 0))
++ if (count_enabled == 0)
+ return strdup (ipc_str_off);
+- if ((count_enabled < 0))
++ if (count_enabled < 0)
+ return strdup ("on\nstatic");
+ return strdup (ipc_str_on);
+ }
+diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h
+index bb48eadb9f8..ebcdbca561f 100644
+--- a/gprofng/src/collector_module.h
++++ b/gprofng/src/collector_module.h
+@@ -40,12 +40,12 @@ struct tm;
+ * If you add any, please put it in the right place */
+ typedef struct CollectorUtilFuncs
+ {
+- int (*access)();
++ int (*access)(const char *, int);
+ int (*atoi)(const char *nptr);
+ void *(*calloc)(size_t nelem, size_t elsize);
+ int (*clearenv)(void);
+ int (*close)(int);
+- int (*closedir)();
++ int (*closedir)(DIR *);
+ int (*execv)(const char *path, char *const argv[]);
+ void (*exit)(int status);
+ int (*fclose)(FILE *stream);
+@@ -66,20 +66,20 @@ typedef struct CollectorUtilFuncs
+ off_t (*lseek)(int fd, off_t offset, int whence);
+ void *(*malloc)(size_t size);
+ void *(*memset)(void *s1, int c, size_t n);
+- int (*mkdir)();
++ int (*mkdir)(const char *, mode_t);
+ time_t (*mktime)(struct tm *timeptr);
+ void *(*mmap)(void *, size_t, int, int, int, off_t);
+- void *(*mmap64_)();
+- int (*munmap)();
++ void *(*mmap64_)(void *, size_t, int, int, int, off_t);
++ int (*munmap)(void *, size_t);
+ int (*open)(const char *, int, ...);
+ int (*open_bare)(const char *, int, ...);
+- DIR *(*opendir)();
++ DIR *(*opendir)(const char *);
+ int (*pclose)(FILE *stream);
+ FILE *(*popen)(const char *command, const char *mode);
+ int (*putenv)(char *string);
+- ssize_t (*pwrite)();
+- ssize_t (*pwrite64_)();
+- ssize_t (*read)();
++ ssize_t (*pwrite)(int, const void *, size_t, off_t);
++ ssize_t (*pwrite64_)(int, const void *, size_t, off_t);
++ ssize_t (*read)(int, void *, size_t);
+ int (*setenv)(const char *name, const char *value, int overwrite);
+ int (*sigfillset)(sigset_t *set);
+ int (*sigprocmask)(int how, const sigset_t *set, sigset_t *oldset);
+@@ -112,7 +112,7 @@ typedef struct CollectorUtilFuncs
+ int (*unsetenv)(const char *name);
+ int (*vsnprintf)(char *str, size_t size, const char *format, va_list ap);
+ pid_t (*waitpid)(pid_t pid, int *stat_loc, int options);
+- ssize_t (*write)();
++ ssize_t (*write)(int, void *, size_t);
+ double (*atof)();
+ void *n_a;
+ } CollectorUtilFuncs;
+diff --git a/gprofng/src/gp-display-src.cc b/gprofng/src/gp-display-src.cc
+index 200e6080d2e..24af375edf1 100644
+--- a/gprofng/src/gp-display-src.cc
++++ b/gprofng/src/gp-display-src.cc
+@@ -75,14 +75,6 @@ private:
+ bool v_opt;
+ int multiple;
+ char *str_compcom;
+- bool hex_visible;
+- int src_visible;
+- int vis_src;
+- int vis_dis;
+- int threshold_src;
+- int threshold_dis;
+- int threshold;
+- int vis_bits;
+ };
+
+ static int
+diff --git a/gprofng/src/gp-print.h b/gprofng/src/gp-print.h
+index 1b748ea60a3..1a8ad3b6c13 100644
+--- a/gprofng/src/gp-print.h
++++ b/gprofng/src/gp-print.h
+@@ -19,7 +19,7 @@
+ MA 02110-1301, USA. */
+
+ #ifndef _GP_PRINT_H
+-#define _ER_PRINT_H
++#define _GP_PRINT_H
+
+ #include "Command.h"
+ #include "DbeApplication.h"
+diff --git a/gprofng/src/util.cc b/gprofng/src/util.cc
+index 201f7088b66..228140b61ae 100644
+--- a/gprofng/src/util.cc
++++ b/gprofng/src/util.cc
+@@ -741,17 +741,13 @@ get_relative_link (const char *path_from, const char *path_to)
+ s2 = canonical_path (s2);
+ long l = dbe_sstrlen (s1);
+ // try to find common directories
+- int common_slashes = 0;
+ int last_common_slash = -1;
+ for (int i = 0; i < l; i++)
+ {
+- if (s1[i] != s2[i]) break;
+- if (s1[i] == 0) break;
++ if (s1[i] != s2[i] || s1[i] == 0)
++ break;
+ if (s1[i] == '/')
+- {
+- common_slashes++;
+- last_common_slash = i;
+- }
++ last_common_slash = i;
+ }
+ // find slashes in remaining path_to
+ int slashes = 0;
new file mode 100644
@@ -0,0 +1,606 @@
+From 610889f9e0cace025758fdd0ce8e8f9edf9f4223 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 16 Nov 2024 05:13:48 +0000
+Subject: [PATCH] gprofng: fix -std=gnu23 compatibility wrt unprototyped
+ functions
+
+C23 removes support for unprototyped functions. Fix function pointer types
+accordingly.
+
+This does not fix all instances, there's a few left as I commented on in
+PR32374 (e.g. setitimer which I have a local workaround for but it involves
+a glibc implementation detail; the Linaro precommit CI tester pointed that
+out too, so dropped that).
+
+ChangeLog:
+ PR gprofng/32374
+
+ * libcollector/collector.c (collector_sample): Fix prototype.
+ * libcollector/envmgmt.c (putenv): Ditto.
+ (_putenv): Ditto.
+ (__collector_putenv): Ditto.
+ (setenv): Ditto.
+ (_setenv): Ditto.
+ (__collector_setenv): Ditto.
+ (unsetenv): Ditto.
+ (_unsetenv): Ditto.
+ (__collector_unsetenv): Ditto.
+ * libcollector/jprofile.c (open_experiment): Ditto.
+ (__collector_jprofile_enable_synctrace): Ditto.
+ (jprof_find_asyncgetcalltrace): Ditto.
+ * libcollector/libcol_util.c (__collector_util_init): Ditto.
+ (ARCH): Ditto.
+ * libcollector/mmaptrace.c (collector_func_load): Ditto.
+ (collector_func_unload): Ditto.
+ * libcollector/unwind.c (__collector_ext_unwind_init): Ditto.
+ * src/collector_module.h: Ditto.
+
+Upstream-Status: Backport [https://github.com/bminor/binutils-gdb/commit/a2f774427e078f3da2c06bdea25f77a61979a695]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ gprofng/libcollector/collector.c | 2 +-
+ gprofng/libcollector/envmgmt.c | 24 ++++-----
+ gprofng/libcollector/jprofile.c | 10 ++--
+ gprofng/libcollector/libcol_util.c | 84 +++++++++++++++---------------
+ gprofng/libcollector/mmaptrace.c | 4 +-
+ gprofng/libcollector/unwind.c | 2 +-
+ gprofng/src/collector_module.h | 2 +-
+ 7 files changed, 64 insertions(+), 64 deletions(-)
+
+diff --git a/gprofng/libcollector/collector.c b/gprofng/libcollector/collector.c
+index ef580dcbdd9..899f08a5381 100644
+--- a/gprofng/libcollector/collector.c
++++ b/gprofng/libcollector/collector.c
+@@ -1579,7 +1579,7 @@ __collector_resume_experiment ()
+ }
+
+ /* Code to support Samples and Pause/Resume */
+-void collector_sample () __attribute__ ((weak, alias ("__collector_sample")));
++void collector_sample (char *name) __attribute__ ((weak, alias ("__collector_sample")));
+ void
+ __collector_sample (char *name)
+ {
+diff --git a/gprofng/libcollector/envmgmt.c b/gprofng/libcollector/envmgmt.c
+index ebe08f82007..0ff7621070d 100644
+--- a/gprofng/libcollector/envmgmt.c
++++ b/gprofng/libcollector/envmgmt.c
+@@ -692,8 +692,8 @@ __collector_env_update (char *envp[])
+
+
+ /*------------------------------------------------------------- putenv */
+-int putenv () __attribute__ ((weak, alias ("__collector_putenv")));
+-int _putenv () __attribute__ ((weak, alias ("__collector_putenv")));
++int putenv (char*) __attribute__ ((weak, alias ("__collector_putenv")));
++int _putenv (char*) __attribute__ ((weak, alias ("__collector_putenv")));
+
+ int
+ __collector_putenv (char * string)
+@@ -701,9 +701,9 @@ __collector_putenv (char * string)
+ if (CALL_UTIL (putenv) == __collector_putenv ||
+ CALL_UTIL (putenv) == NULL)
+ { // __collector_libc_funcs_init failed
+- CALL_UTIL (putenv) = (int(*)())dlsym (RTLD_NEXT, "putenv");
++ CALL_UTIL (putenv) = (int(*)(char*))dlsym (RTLD_NEXT, "putenv");
+ if (CALL_UTIL (putenv) == NULL || CALL_UTIL (putenv) == __collector_putenv)
+- CALL_UTIL (putenv) = (int(*)())dlsym (RTLD_DEFAULT, "putenv");
++ CALL_UTIL (putenv) = (int(*)(char*))dlsym (RTLD_DEFAULT, "putenv");
+ if (CALL_UTIL (putenv) == NULL || CALL_UTIL (putenv) == __collector_putenv)
+ {
+ TprintfT (DBG_LT2, "__collector_putenv(): ERROR: no pointer found.\n");
+@@ -719,8 +719,8 @@ __collector_putenv (char * string)
+ }
+
+ /*------------------------------------------------------------- setenv */
+-int setenv () __attribute__ ((weak, alias ("__collector_setenv")));
+-int _setenv () __attribute__ ((weak, alias ("__collector_setenv")));
++int setenv (const char*, const char*, int) __attribute__ ((weak, alias ("__collector_setenv")));
++int _setenv (const char*, const char*, int) __attribute__ ((weak, alias ("__collector_setenv")));
+
+ int
+ __collector_setenv (const char *name, const char *value, int overwrite)
+@@ -728,9 +728,9 @@ __collector_setenv (const char *name, const char *value, int overwrite)
+ if (CALL_UTIL (setenv) == __collector_setenv ||
+ CALL_UTIL (setenv) == NULL)
+ { // __collector_libc_funcs_init failed
+- CALL_UTIL (setenv) = (int(*)())dlsym (RTLD_NEXT, "setenv");
++ CALL_UTIL (setenv) = (int(*)(const char*, const char*, int))dlsym (RTLD_NEXT, "setenv");
+ if (CALL_UTIL (setenv) == NULL || CALL_UTIL (setenv) == __collector_setenv)
+- CALL_UTIL (setenv) = (int(*)())dlsym (RTLD_DEFAULT, "setenv");
++ CALL_UTIL (setenv) = (int(*)(const char*, const char*, int))dlsym (RTLD_DEFAULT, "setenv");
+ if (CALL_UTIL (setenv) == NULL || CALL_UTIL (setenv) == __collector_setenv)
+ {
+ TprintfT (DBG_LT2, "__collector_setenv(): ERROR: no pointer found.\n");
+@@ -765,8 +765,8 @@ __collector_setenv (const char *name, const char *value, int overwrite)
+ }
+
+ /*------------------------------------------------------------- unsetenv */
+-int unsetenv () __attribute__ ((weak, alias ("__collector_unsetenv")));
+-int _unsetenv () __attribute__ ((weak, alias ("__collector_unsetenv")));
++int unsetenv (const char*) __attribute__ ((weak, alias ("__collector_unsetenv")));
++int _unsetenv (const char*) __attribute__ ((weak, alias ("__collector_unsetenv")));
+
+ int
+ __collector_unsetenv (const char *name)
+@@ -774,9 +774,9 @@ __collector_unsetenv (const char *name)
+ if (CALL_UTIL (unsetenv) == __collector_unsetenv ||
+ CALL_UTIL (unsetenv) == NULL)
+ { // __collector_libc_funcs_init failed
+- CALL_UTIL (unsetenv) = (int(*)())dlsym (RTLD_NEXT, "unsetenv");
++ CALL_UTIL (unsetenv) = (int(*)(const char*))dlsym (RTLD_NEXT, "unsetenv");
+ if (CALL_UTIL (unsetenv) == NULL || CALL_UTIL (unsetenv) == __collector_unsetenv)
+- CALL_UTIL (unsetenv) = (int(*)())dlsym (RTLD_DEFAULT, "unsetenv");
++ CALL_UTIL (unsetenv) = (int(*)(const char*))dlsym (RTLD_DEFAULT, "unsetenv");
+ if (CALL_UTIL (unsetenv) == NULL || CALL_UTIL (unsetenv) == __collector_unsetenv)
+ {
+ TprintfT (DBG_LT2, "__collector_unsetenv(): ERROR: no pointer found.\n");
+diff --git a/gprofng/libcollector/jprofile.c b/gprofng/libcollector/jprofile.c
+index 1bacacc1a2a..11051f937ef 100644
+--- a/gprofng/libcollector/jprofile.c
++++ b/gprofng/libcollector/jprofile.c
+@@ -105,8 +105,8 @@ static void rwrite (int fd, const void *buf, size_t nbyte);
+ static void addToDynamicArchive (const char* name, const unsigned char* class_data, int class_data_len);
+ static void (*AsyncGetCallTrace)(JVMPI_CallTrace*, jint, ucontext_t*) = NULL;
+ static void (*collector_heap_record)(int, int, void*) = NULL;
+-static void (*collector_jsync_begin)() = NULL;
+-static void (*collector_jsync_end)(hrtime_t, void *) = NULL;
++static void (*collector_jsync_begin)(void) = NULL;
++static void (*collector_jsync_end)(hrtime_t, void*) = NULL;
+
+ #define gethrtime collector_interface->getHiResTime
+
+@@ -230,7 +230,7 @@ open_experiment (const char *exp)
+ else if (__collector_strStartWith (args, "s:") == 0)
+ {
+ java_sync_mode = 1;
+- collector_jsync_begin = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_begin");
++ collector_jsync_begin = (void(*)(void))dlsym (RTLD_DEFAULT, "__collector_jsync_begin");
+ collector_jsync_end = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_end");
+ }
+ #endif
+@@ -255,7 +255,7 @@ __collector_jprofile_enable_synctrace ()
+ return;
+ }
+ java_sync_mode = 1;
+- collector_jsync_begin = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_begin");
++ collector_jsync_begin = (void(*)(void))dlsym (RTLD_DEFAULT, "__collector_jsync_begin");
+ collector_jsync_end = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_end");
+ TprintfT (DBG_LT1, "jprofile: turning on Java synctrace, and requesting events\n");
+ }
+@@ -1129,7 +1129,7 @@ jprof_find_asyncgetcalltrace ()
+ {
+ void *jvmhandle;
+ if (__collector_VM_ReadByteInstruction == NULL)
+- __collector_VM_ReadByteInstruction = (int(*)()) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction");
++ __collector_VM_ReadByteInstruction = (int(*)(unsigned char*)) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction");
+
+ /* look for stack unwind function using default path */
+ AsyncGetCallTrace = (void (*)(JVMPI_CallTrace*, jint, ucontext_t*))
+diff --git a/gprofng/libcollector/libcol_util.c b/gprofng/libcollector/libcol_util.c
+index c2b82894e6b..688bdf19c6d 100644
+--- a/gprofng/libcollector/libcol_util.c
++++ b/gprofng/libcollector/libcol_util.c
+@@ -1114,7 +1114,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "munmap");
+ if (ptr)
+- __collector_util_funcs.munmap = (int(*)())ptr;
++ __collector_util_funcs.munmap = (int(*)(void *, size_t))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT munmap: %s\n", dlerror ());
+@@ -1123,7 +1123,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "close");
+ if (ptr)
+- __collector_util_funcs.close = (int(*)())ptr;
++ __collector_util_funcs.close = (int(*)(int))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT close: %s\n", dlerror ());
+@@ -1158,7 +1158,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "close");
+ if (ptr)
+- __collector_util_funcs.close = (int(*)())ptr;
++ __collector_util_funcs.close = (int(*)(int))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT close: %s\n", dlerror ());
+@@ -1167,7 +1167,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "read");
+ if (ptr)
+- __collector_util_funcs.read = (ssize_t (*)())ptr;
++ __collector_util_funcs.read = (ssize_t (*)(int, void*, size_t))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT read: %s\n", dlerror ());
+@@ -1176,7 +1176,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "write");
+ if (ptr)
+- __collector_util_funcs.write = (ssize_t (*)())ptr;
++ __collector_util_funcs.write = (ssize_t (*)(int, void*, size_t))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT write: %s\n", dlerror ());
+@@ -1186,14 +1186,14 @@ __collector_util_init ()
+ #if ARCH(Intel) && WSIZE(32)
+ ptr = dlvsym (libc, "pwrite", "GLIBC_2.2"); // it is in /lib/libpthread.so.0
+ if (ptr)
+- __collector_util_funcs.pwrite = (ssize_t (*)())ptr;
++ __collector_util_funcs.pwrite = (ssize_t (*)(int, void*, size_t, off_t))ptr;
+ else
+ {
+ Tprintf (DBG_LT0, "libcol_util: WARNING: dlvsym for %s@%s failed. Using dlsym() instead.", "pwrite", "GLIBC_2.2");
+ #endif /* ARCH(Intel) && WSIZE(32) */
+ ptr = dlsym (libc, "pwrite");
+ if (ptr)
+- __collector_util_funcs.pwrite = (ssize_t (*)())ptr;
++ __collector_util_funcs.pwrite = (ssize_t (*)(int, const void*, size_t, off_t))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT pwrite: %s\n", dlerror ());
+@@ -1213,7 +1213,7 @@ __collector_util_init ()
+ #endif /* ARCH(Intel) && WSIZE(32) */
+ ptr = dlsym (libc, "pwrite64");
+ if (ptr)
+- __collector_util_funcs.pwrite64_ = (ssize_t (*)())ptr;
++ __collector_util_funcs.pwrite64_ = (ssize_t (*)(int, const void*, size_t, off_t))ptr;
+ else
+ __collector_util_funcs.pwrite64_ = __collector_util_funcs.pwrite;
+ #if ARCH(Intel) && WSIZE(32)
+@@ -1222,7 +1222,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "lseek");
+ if (ptr)
+- __collector_util_funcs.lseek = (off_t (*)())ptr;
++ __collector_util_funcs.lseek = (off_t (*)(int, off_t, int))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT lseek: %s\n", dlerror ());
+@@ -1231,7 +1231,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "access");
+ if (ptr)
+- __collector_util_funcs.access = (int(*)())ptr;
++ __collector_util_funcs.access = (int(*)(const char*, int))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT access: %s\n", dlerror ());
+@@ -1240,7 +1240,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "mkdir");
+ if (ptr)
+- __collector_util_funcs.mkdir = (int(*)())ptr;
++ __collector_util_funcs.mkdir = (int(*)(const char*, mode_t))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT mkdir: %s\n", dlerror ());
+@@ -1249,7 +1249,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "opendir");
+ if (ptr)
+- __collector_util_funcs.opendir = (DIR * (*)())ptr;
++ __collector_util_funcs.opendir = (DIR * (*)(const char*))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT opendir: %s\n", dlerror ());
+@@ -1258,7 +1258,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "closedir");
+ if (ptr)
+- __collector_util_funcs.closedir = (int(*)())ptr;
++ __collector_util_funcs.closedir = (int(*)(DIR*))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT closedir: %s\n", dlerror ());
+@@ -1267,7 +1267,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "execv");
+ if (ptr)
+- __collector_util_funcs.execv = (int(*)())ptr;
++ __collector_util_funcs.execv = (int(*)(const char*, char* const*))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT execv: %s\n", dlerror ());
+@@ -1276,7 +1276,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "exit");
+ if (ptr)
+- __collector_util_funcs.exit = (void(*)())ptr;
++ __collector_util_funcs.exit = (void(*)(int))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT exit: %s\n", dlerror ());
+@@ -1285,7 +1285,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "vfork");
+ if (ptr)
+- __collector_util_funcs.vfork = (pid_t (*)())ptr;
++ __collector_util_funcs.vfork = (pid_t (*)(void))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT vfork: %s\n", dlerror ());
+@@ -1294,7 +1294,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "waitpid");
+ if (ptr)
+- __collector_util_funcs.waitpid = (pid_t (*)())ptr;
++ __collector_util_funcs.waitpid = (pid_t (*)(pid_t, int*, int))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT waitpid: %s\n", dlerror ());
+@@ -1313,7 +1313,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "getcontext");
+ if (ptr)
+- __collector_util_funcs.getcontext = (int(*)())ptr;
++ __collector_util_funcs.getcontext = (int(*)(ucontext_t*))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT getcontext: %s\n", dlerror ());
+@@ -1331,7 +1331,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "putenv");
+ if (ptr)
+- __collector_util_funcs.putenv = (int(*)())ptr;
++ __collector_util_funcs.putenv = (int(*)(char*))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT putenv: %s\n", dlerror ());
+@@ -1340,7 +1340,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "getenv");
+ if (ptr)
+- __collector_util_funcs.getenv = (char*(*)())ptr;
++ __collector_util_funcs.getenv = (char*(*)(const char*))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT getenv: %s\n", dlerror ());
+@@ -1349,7 +1349,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "time");
+ if (ptr)
+- __collector_util_funcs.time = (time_t (*)())ptr;
++ __collector_util_funcs.time = (time_t (*)(time_t*))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT time: %s\n", dlerror ());
+@@ -1358,7 +1358,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "mktime");
+ if (ptr)
+- __collector_util_funcs.mktime = (time_t (*)())ptr;
++ __collector_util_funcs.mktime = (time_t (*)(struct tm*))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT mktime: %s\n", dlerror ());
+@@ -1372,7 +1372,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "gmtime_r");
+ if (ptr)
+- __collector_util_funcs.gmtime_r = (struct tm * (*)())ptr;
++ __collector_util_funcs.gmtime_r = (struct tm * (*)(const time_t*, struct tm*))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT gmtime_r: %s\n", dlerror ());
+@@ -1381,7 +1381,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "strtol");
+ if (ptr)
+- __collector_util_funcs.strtol = (long (*)())ptr;
++ __collector_util_funcs.strtol = (long (*)(const char*, char**, int))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtol: %s\n", dlerror ());
+@@ -1390,7 +1390,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "strtoll");
+ if (ptr)
+- __collector_util_funcs.strtoll = (long long (*)())ptr;
++ __collector_util_funcs.strtoll = (long long (*)(const char*, char**, int))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtoll: %s\n", dlerror ());
+@@ -1402,7 +1402,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "setenv");
+ if (ptr)
+- __collector_util_funcs.setenv = (int(*)())ptr;
++ __collector_util_funcs.setenv = (int(*)(const char*, const char*, int))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT setenv: %s\n", dlerror ());
+@@ -1411,7 +1411,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "unsetenv");
+ if (ptr)
+- __collector_util_funcs.unsetenv = (int(*)())ptr;
++ __collector_util_funcs.unsetenv = (int(*)(const char*))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT unsetenv: %s\n", dlerror ());
+@@ -1498,7 +1498,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "pclose");
+ if (ptr)
+- __collector_util_funcs.pclose = (int(*)())ptr;
++ __collector_util_funcs.pclose = (int(*)(FILE*))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT pclose: %s\n", dlerror ());
+@@ -1507,7 +1507,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "fgets");
+ if (ptr)
+- __collector_util_funcs.fgets = (char*(*)())ptr;
++ __collector_util_funcs.fgets = (char*(*)(char*, int, FILE*))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT fgets: %s\n", dlerror ());
+@@ -1534,7 +1534,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "vsnprintf");
+ if (ptr)
+- __collector_util_funcs.vsnprintf = (int(*)())ptr;
++ __collector_util_funcs.vsnprintf = (int(*)(char*, size_t, const char*, ...))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT vsnprintf: %s\n", dlerror ());
+@@ -1543,7 +1543,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "atoi");
+ if (ptr)
+- __collector_util_funcs.atoi = (int(*)())ptr;
++ __collector_util_funcs.atoi = (int(*)(const char*))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT atoi: %s\n", dlerror ());
+@@ -1552,7 +1552,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "calloc");
+ if (ptr)
+- __collector_util_funcs.calloc = (void*(*)())ptr;
++ __collector_util_funcs.calloc = (void*(*)(size_t, size_t))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT calloc: %s\n", dlerror ());
+@@ -1562,7 +1562,7 @@ __collector_util_init ()
+ ptr = dlsym (libc, "free");
+ if (ptr)
+ {
+- __collector_util_funcs.free = (void(*)())ptr;
++ __collector_util_funcs.free = (void(*)(void*))ptr;
+ }
+ else
+ {
+@@ -1572,7 +1572,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "strdup");
+ if (ptr)
+- __collector_util_funcs.libc_strdup = (char*(*)())ptr;
++ __collector_util_funcs.libc_strdup = (char*(*)(const char*))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strdup: %s\n", dlerror ());
+@@ -1585,7 +1585,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "strerror");
+ if (ptr)
+- __collector_util_funcs.strerror = (char*(*)())ptr;
++ __collector_util_funcs.strerror = (char*(*)(int))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strerror: %s\n", dlerror ());
+@@ -1593,7 +1593,7 @@ __collector_util_init ()
+ }
+ ptr = dlsym (libc, "strerror_r");
+ if (ptr)
+- __collector_util_funcs.strerror_r = (int(*)())ptr;
++ __collector_util_funcs.strerror_r = (int(*)(int, char*, size_t))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strerror_r: %s\n", dlerror ());
+@@ -1601,7 +1601,7 @@ __collector_util_init ()
+ }
+ ptr = dlsym (libc, "strspn");
+ if (ptr)
+- __collector_util_funcs.strspn = (size_t (*)())ptr;
++ __collector_util_funcs.strspn = (size_t (*)(const char*, const char*))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strspn: %s\n", dlerror ());
+@@ -1610,7 +1610,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "strtoul");
+ if (ptr)
+- __collector_util_funcs.strtoul = (unsigned long int(*)())ptr;
++ __collector_util_funcs.strtoul = (unsigned long int(*)(const char*, char**, int))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtoul: %s\n", dlerror ());
+@@ -1619,7 +1619,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "strtoull");
+ if (ptr)
+- __collector_util_funcs.strtoull = (unsigned long long int(*)())ptr;
++ __collector_util_funcs.strtoull = (unsigned long long int(*)(const char*, char**, int))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtoull: %s\n", dlerror ());
+@@ -1664,7 +1664,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "sysconf");
+ if (ptr)
+- __collector_util_funcs.sysconf = (long(*)())ptr;
++ __collector_util_funcs.sysconf = (long(*)(int))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sysconf: %s\n", dlerror ());
+@@ -1673,7 +1673,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "sigfillset");
+ if (ptr)
+- __collector_util_funcs.sigfillset = (int(*)())ptr;
++ __collector_util_funcs.sigfillset = (int(*)(sigset_t*))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sigfillset: %s\n", dlerror ());
+@@ -1682,7 +1682,7 @@ __collector_util_init ()
+
+ ptr = dlsym (libc, "sigprocmask");
+ if (ptr)
+- __collector_util_funcs.sigprocmask = (int(*)())ptr;
++ __collector_util_funcs.sigprocmask = (int(*)(int, const sigset_t*, sigset_t*))ptr;
+ else
+ {
+ CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sigprocmask: %s\n", dlerror ());
+diff --git a/gprofng/libcollector/mmaptrace.c b/gprofng/libcollector/mmaptrace.c
+index f07f4d76513..2a6857ab58e 100644
+--- a/gprofng/libcollector/mmaptrace.c
++++ b/gprofng/libcollector/mmaptrace.c
+@@ -1209,7 +1209,7 @@ process_vsyscall_page ()
+ /*
+ * collector API for dynamic functions
+ */
+-void collector_func_load () __attribute__ ((weak, alias ("__collector_func_load")));
++void collector_func_load (char*, char*, char*, void*, int, int, DT_lineno *) __attribute__ ((weak, alias ("__collector_func_load")));
+ void
+ __collector_func_load (char *name, char *alias, char *sourcename,
+ void *vaddr, int size, int lntsize, DT_lineno *lntable)
+@@ -1218,7 +1218,7 @@ __collector_func_load (char *name, char *alias, char *sourcename,
+ vaddr, size, lntsize, lntable);
+ }
+
+-void collector_func_unload () __attribute__ ((weak, alias ("__collector_func_unload")));
++void collector_func_unload (void *vaddr) __attribute__ ((weak, alias ("__collector_func_unload")));
+ void
+ __collector_func_unload (void *vaddr)
+ {
+diff --git a/gprofng/libcollector/unwind.c b/gprofng/libcollector/unwind.c
+index 91678b1e334..cd47d4fbe0f 100644
+--- a/gprofng/libcollector/unwind.c
++++ b/gprofng/libcollector/unwind.c
+@@ -416,7 +416,7 @@ __collector_ext_unwind_init (int record)
+ omp_no_walk = 1;
+
+ if (__collector_VM_ReadByteInstruction == NULL)
+- __collector_VM_ReadByteInstruction = (int(*)()) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction");
++ __collector_VM_ReadByteInstruction = (int(*)(unsigned char*)) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction");
+
+ #if ARCH(SPARC)
+ #if WSIZE(64)
+diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h
+index ebcdbca561f..fd888cd58dd 100644
+--- a/gprofng/src/collector_module.h
++++ b/gprofng/src/collector_module.h
+@@ -110,7 +110,7 @@ typedef struct CollectorUtilFuncs
+ long (*sysinfo)(int command, char *buf, long count);
+ time_t (*time)(time_t *tloc);
+ int (*unsetenv)(const char *name);
+- int (*vsnprintf)(char *str, size_t size, const char *format, va_list ap);
++ int (*vsnprintf)(char *str, size_t size, const char *format, ...);
+ pid_t (*waitpid)(pid_t pid, int *stat_loc, int options);
+ ssize_t (*write)(int, void *, size_t);
+ double (*atof)();
new file mode 100644
@@ -0,0 +1,196 @@
+From 7683ea4411d2b76f346a8100b761615d09343448 Mon Sep 17 00:00:00 2001
+From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
+Date: Thu, 21 Nov 2024 14:48:20 -0800
+Subject: [PATCH] gprofng: fix build with -std=gnu23
+
+Fix function pointer types accordingly.
+Remove unused function pointers.
+
+gprofng/ChangeLog
+2024-11-21 Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
+
+ PR gprofng/32374
+ PR gprofng/32373
+ * common/cpuid.c: Define ATTRIBUTE_UNUSED if necessary.
+ * libcollector/libcol_util.c (sysinfo): Remove unused pointer.
+ * src/collector_module.h: Likewise.
+ * libcollector/dispatcher.c (setitimer): Fix prototype.
+ * libcollector/linetrace.c (system, grantpt, ptsname): Likewise.
+ * testsuite/gprofng.display/mttest/mttest.c (dump_arrays): Likewise.
+ * testsuite/gprofng.display/synprog/endcases.c (xinline_code,
+ s_inline_code): Likewise.
+ * testsuite/gprofng.display/synprog/inc_inline.h (ext_inline_code):
+ Likewise.
+ * testsuite/gprofng.display/synprog/synprog.c (doabort): Rename nullptr.
+Upstream-Status: Backport [https://github.com/bminor/binutils-gdb/commit/4e943705e3e8a5a9448d087502bcb390a694ad02]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ gprofng/common/cpuid.c | 2 ++
+ gprofng/libcollector/dispatcher.c | 3 +--
+ gprofng/libcollector/libcol_util.c | 9 ---------
+ gprofng/libcollector/linetrace.c | 10 +++++-----
+ gprofng/src/collector_module.h | 1 -
+ gprofng/testsuite/gprofng.display/mttest/mttest.c | 2 +-
+ gprofng/testsuite/gprofng.display/synprog/endcases.c | 4 ++--
+ gprofng/testsuite/gprofng.display/synprog/inc_inline.h | 2 +-
+ gprofng/testsuite/gprofng.display/synprog/synprog.c | 4 ++--
+ 9 files changed, 14 insertions(+), 23 deletions(-)
+
+diff --git a/gprofng/common/cpuid.c b/gprofng/common/cpuid.c
+index af15439eb27..0373969693b 100644
+--- a/gprofng/common/cpuid.c
++++ b/gprofng/common/cpuid.c
+@@ -21,7 +21,9 @@
+ #if defined(__i386__) || defined(__x86_64)
+ #include <cpuid.h> /* GCC-provided */
+ #elif defined(__aarch64__)
++#if !defined(ATTRIBUTE_UNUSED)
+ #define ATTRIBUTE_UNUSED __attribute__((unused))
++#endif
+
+ static inline uint_t __attribute_const__
+ __get_cpuid (unsigned int op ATTRIBUTE_UNUSED, unsigned int *eax,
+diff --git a/gprofng/libcollector/dispatcher.c b/gprofng/libcollector/dispatcher.c
+index 867753a22ec..e85c343c776 100644
+--- a/gprofng/libcollector/dispatcher.c
++++ b/gprofng/libcollector/dispatcher.c
+@@ -1281,5 +1281,4 @@ __collector_ext_clone_pthread (int (*fn)(void *), void *child_stack, int flags,
+ // weak symbols:
+ int sigprocmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_sigprocmask")));
+ int thr_sigsetmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_thr_sigsetmask")));
+-int setitimer () __attribute__ ((weak, alias ("_setitimer")));
+-
++__typeof(setitimer) setitimer __attribute__ ((weak, alias ("_setitimer")));
+diff --git a/gprofng/libcollector/libcol_util.c b/gprofng/libcollector/libcol_util.c
+index 688bdf19c6d..46f8b80ccb4 100644
+--- a/gprofng/libcollector/libcol_util.c
++++ b/gprofng/libcollector/libcol_util.c
+@@ -1427,15 +1427,6 @@ __collector_util_init ()
+ err = COL_ERROR_UTIL_INIT;
+ }
+
+- ptr = dlsym (libc, "sysinfo");
+- if (ptr)
+- __collector_util_funcs.sysinfo = (long (*)())ptr;
+- else
+- {
+- CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sysinfo: %s\n", dlerror ());
+- err = COL_ERROR_UTIL_INIT;
+- }
+-
+ ptr = dlsym (libc, "clearenv");
+ if (ptr)
+ __collector_util_funcs.clearenv = (int(*)())ptr;
+diff --git a/gprofng/libcollector/linetrace.c b/gprofng/libcollector/linetrace.c
+index 66844bc1337..c81ae1a2272 100644
+--- a/gprofng/libcollector/linetrace.c
++++ b/gprofng/libcollector/linetrace.c
+@@ -1527,7 +1527,7 @@ DCL_FUNC_VER (DCL_POSIX_SPAWNP, posix_spawnp_2_2, posix_spawnp@GLIBC_2.2)
+ DCL_POSIX_SPAWNP (posix_spawnp)
+
+ /*------------------------------------------------------------- system */
+-int system () __attribute__ ((weak, alias ("__collector_system")));
++int system (const char *cmd) __attribute__ ((weak, alias ("__collector_system")));
+
+ int
+ __collector_system (const char *cmd)
+@@ -1582,10 +1582,10 @@ DCL_FUNC_VER (DCL_POPEN, popen_2_0, popen@GLIBC_2.0)
+ DCL_POPEN (popen)
+
+ /*------------------------------------------------------------- grantpt */
+-int grantpt () __attribute__ ((weak, alias ("__collector_grantpt")));
++int grantpt (int fildes) __attribute__ ((weak, alias ("__collector_grantpt")));
+
+ int
+-__collector_grantpt (const int fildes)
++__collector_grantpt (int fildes)
+ {
+ if (NULL_PTR (grantpt))
+ init_lineage_intf ();
+@@ -1607,10 +1607,10 @@ __collector_grantpt (const int fildes)
+ }
+
+ /*------------------------------------------------------------- ptsname */
+-char *ptsname () __attribute__ ((weak, alias ("__collector_ptsname")));
++char *ptsname (int fildes) __attribute__ ((weak, alias ("__collector_ptsname")));
+
+ char *
+-__collector_ptsname (const int fildes)
++__collector_ptsname (int fildes)
+ {
+ if (NULL_PTR (ptsname))
+ init_lineage_intf ();
+diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h
+index fd888cd58dd..6640f12fa3c 100644
+--- a/gprofng/src/collector_module.h
++++ b/gprofng/src/collector_module.h
+@@ -107,7 +107,6 @@ typedef struct CollectorUtilFuncs
+ int (*symlink)(const char *s1, const char *s2);
+ int (*syscall)(int number, ...);
+ long (*sysconf)(int name);
+- long (*sysinfo)(int command, char *buf, long count);
+ time_t (*time)(time_t *tloc);
+ int (*unsetenv)(const char *name);
+ int (*vsnprintf)(char *str, size_t size, const char *format, ...);
+diff --git a/gprofng/testsuite/gprofng.display/mttest/mttest.c b/gprofng/testsuite/gprofng.display/mttest/mttest.c
+index e0835c833e5..3db5b8d8e86 100644
+--- a/gprofng/testsuite/gprofng.display/mttest/mttest.c
++++ b/gprofng/testsuite/gprofng.display/mttest/mttest.c
+@@ -171,7 +171,7 @@ void computeJ (workStruct_t *x);
+ void computeK (workStruct_t *x);
+ void addone (workCtr_t *x);
+ void init_arrays (int strat);
+-void dump_arrays ();
++void dump_arrays (hrtime_t real, hrtime_t cpu, int case_index);
+ void *do_work (void *v);
+ void thread_work ();
+ void nothreads (Workblk *array, struct scripttab *k);
+diff --git a/gprofng/testsuite/gprofng.display/synprog/endcases.c b/gprofng/testsuite/gprofng.display/synprog/endcases.c
+index a6a1389658a..6f1c83b6859 100644
+--- a/gprofng/testsuite/gprofng.display/synprog/endcases.c
++++ b/gprofng/testsuite/gprofng.display/synprog/endcases.c
+@@ -40,8 +40,8 @@ static void s_inline_code (int);
+ void ext_inline_code (int);
+
+ #ifndef NO_INLINE
+-void xinline_code () __attribute__ ((always_inline));
+-void s_inline_code () __attribute__ ((always_inline));
++void xinline_code (int) __attribute__ ((always_inline));
++void s_inline_code (int) __attribute__ ((always_inline));
+ #endif
+
+ #include "inc_inline.h"
+diff --git a/gprofng/testsuite/gprofng.display/synprog/inc_inline.h b/gprofng/testsuite/gprofng.display/synprog/inc_inline.h
+index da42563c828..6600eacb66d 100644
+--- a/gprofng/testsuite/gprofng.display/synprog/inc_inline.h
++++ b/gprofng/testsuite/gprofng.display/synprog/inc_inline.h
+@@ -19,7 +19,7 @@
+ MA 02110-1301, USA. */
+
+ #ifndef NO_INLINE
+-void ext_inline_code() __attribute__ ((always_inline));
++void ext_inline_code(int) __attribute__ ((always_inline));
+ #endif
+
+ void
+diff --git a/gprofng/testsuite/gprofng.display/synprog/synprog.c b/gprofng/testsuite/gprofng.display/synprog/synprog.c
+index cf1bc5b0909..05920dc7419 100644
+--- a/gprofng/testsuite/gprofng.display/synprog/synprog.c
++++ b/gprofng/testsuite/gprofng.display/synprog/synprog.c
+@@ -528,14 +528,14 @@ reapchildren ()
+ int
+ doabort (int k)
+ {
+- char *nullptr = NULL;
++ char *p = NULL;
+ char c;
+
+ /* Log the event */
+ wlog ("start of doabort", NULL);
+
+ /* and dereference a NULL */
+- c = *nullptr;
++ c = *p;
+
+ /* this should never be reached */
+ return (int) c;