From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
Date: Mon, 29 Jul 2024 21:15:01 +0000 (-0700)
Subject: gprofng: 32018 Compilation of binutils 2.43 failed on CentOS 6
X-Git-Tag: gdb-16-branchpoint~1287
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4ffbc564d807cac7bc52ed4617b3ab6f71205a6;p=thirdparty%2Fbinutils-gdb.git

gprofng: 32018 Compilation of binutils 2.43 failed on CentOS 6

strchr is redefined as a macro in /usr/include/bits/string.h on CentOS 6/7.
In this case, we may not use our CALL_UTIL macro for strchr.
Use __collector_strchr instead of "CALL_UTIL (strchr)".

gprofng/ChangeLog
2024-07-28  Vladimir Mezentsev  <vladimir.mezentsev@oracle.com>

	PR 32018
	* libcollector/hwprofile.c (open_experiment): Use __collector_strchr.
---

diff --git a/gprofng/libcollector/hwprofile.c b/gprofng/libcollector/hwprofile.c
index cfe0d84dc1e..3b7f4840aa0 100644
--- a/gprofng/libcollector/hwprofile.c
+++ b/gprofng/libcollector/hwprofile.c
@@ -216,13 +216,13 @@ open_experiment (const char *exp)
 	  params += 2;
 	  break;
 	}
-      params = CALL_UTIL (strchr)(params, ';');
+      params = __collector_strchr (params, ';');
       if (params)
 	params++;
     }
   if (params == NULL)  /* HWC profiling not specified */
     return COL_ERROR_HWCINIT;
-  char *s = CALL_UTIL (strchr)(params, (int) ';');
+  char *s = __collector_strchr (params, (int) ';');
   int sz = s ? s - params : CALL_UTIL (strlen)(params);
   char *defstring = (char*) alloca (sz + 1);
   CALL_UTIL (strlcpy)(defstring, params, sz + 1);