aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Mezentsev <vladimir.mezentsev@oracle.com>2024-07-29 14:15:01 -0700
committerVladimir Mezentsev <vladimir.mezentsev@oracle.com>2024-08-01 11:30:27 -0700
commit714bf4f222c35f8bde9c7b813151f5b52a79731a (patch)
tree37fc470f0f68185b65e3c8b7ada828f43daaefd3
parent5def238cf9e089e3712d9e01c425ef55fed48805 (diff)
downloadbinutils-714bf4f222c35f8bde9c7b813151f5b52a79731a.zip
binutils-714bf4f222c35f8bde9c7b813151f5b52a79731a.tar.gz
binutils-714bf4f222c35f8bde9c7b813151f5b52a79731a.tar.bz2
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.
-rw-r--r--gprofng/libcollector/hwprofile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gprofng/libcollector/hwprofile.c b/gprofng/libcollector/hwprofile.c
index cfe0d84..3b7f484 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);