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.
This commit is contained in:
Vladimir Mezentsev
2024-07-29 14:15:01 -07:00
parent 4e7b18de44
commit c4ffbc564d

View File

@@ -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);