diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-03-02 13:44:19 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-03-03 17:07:19 -0500 |
commit | a0f213e14bb5cf4f190809b5811e1292bd614899 (patch) | |
tree | 9e133434906ac90cb3736a5331aa2b3129f84ddf | |
parent | b8d1fd7ec661f5ccb9facd57589a563f627df230 (diff) |
perf bench futex: Fix build on musl + clang
When building with clang on a musl libc system, Alpine Linux, we end up
hitting a problem where memset() is used but its prototype is not
present, add it to avoid this:
bench/futex-wake.c:99:3: error: implicitly declaring library function 'memset' with type 'void *(void *, int, unsigned long)'
[-Werror,-Wimplicit-function-declaration]
CPU_ZERO(&cpu);
^
/usr/include/sched.h:127:23: note: expanded from macro 'CPU_ZERO'
#define CPU_ZERO(set) CPU_ZERO_S(sizeof(cpu_set_t),set)
^
/usr/include/sched.h:110:30: note: expanded from macro 'CPU_ZERO_S'
#define CPU_ZERO_S(size,set) memset(set,0,size)
^
bench/futex-wake.c:99:3: note: include the header <string.h> or explicitly provide a declaration for 'memset'
Found while updating my test build containers to build perf with clang in more
systems.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-jh10vaz2r98zl6gm5iau8prr@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r-- | tools/perf/bench/futex-hash.c | 1 | ||||
-rw-r--r-- | tools/perf/bench/futex-lock-pi.c | 1 | ||||
-rw-r--r-- | tools/perf/bench/futex-requeue.c | 1 | ||||
-rw-r--r-- | tools/perf/bench/futex-wake-parallel.c | 1 | ||||
-rw-r--r-- | tools/perf/bench/futex-wake.c | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/tools/perf/bench/futex-hash.c b/tools/perf/bench/futex-hash.c index da04b8c5568a..2499e1b0c6fb 100644 --- a/tools/perf/bench/futex-hash.c +++ b/tools/perf/bench/futex-hash.c | |||
@@ -9,6 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | /* For the CLR_() macros */ | 11 | /* For the CLR_() macros */ |
12 | #include <string.h> | ||
12 | #include <pthread.h> | 13 | #include <pthread.h> |
13 | 14 | ||
14 | #include <errno.h> | 15 | #include <errno.h> |
diff --git a/tools/perf/bench/futex-lock-pi.c b/tools/perf/bench/futex-lock-pi.c index 91877777ec6e..a20814d94af1 100644 --- a/tools/perf/bench/futex-lock-pi.c +++ b/tools/perf/bench/futex-lock-pi.c | |||
@@ -3,6 +3,7 @@ | |||
3 | */ | 3 | */ |
4 | 4 | ||
5 | /* For the CLR_() macros */ | 5 | /* For the CLR_() macros */ |
6 | #include <string.h> | ||
6 | #include <pthread.h> | 7 | #include <pthread.h> |
7 | 8 | ||
8 | #include <signal.h> | 9 | #include <signal.h> |
diff --git a/tools/perf/bench/futex-requeue.c b/tools/perf/bench/futex-requeue.c index 2b9705a8734c..9fad1e4fcd3e 100644 --- a/tools/perf/bench/futex-requeue.c +++ b/tools/perf/bench/futex-requeue.c | |||
@@ -9,6 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | /* For the CLR_() macros */ | 11 | /* For the CLR_() macros */ |
12 | #include <string.h> | ||
12 | #include <pthread.h> | 13 | #include <pthread.h> |
13 | 14 | ||
14 | #include <signal.h> | 15 | #include <signal.h> |
diff --git a/tools/perf/bench/futex-wake-parallel.c b/tools/perf/bench/futex-wake-parallel.c index 2c8fa67ad537..40f5fcf1d120 100644 --- a/tools/perf/bench/futex-wake-parallel.c +++ b/tools/perf/bench/futex-wake-parallel.c | |||
@@ -8,6 +8,7 @@ | |||
8 | */ | 8 | */ |
9 | 9 | ||
10 | /* For the CLR_() macros */ | 10 | /* For the CLR_() macros */ |
11 | #include <string.h> | ||
11 | #include <pthread.h> | 12 | #include <pthread.h> |
12 | 13 | ||
13 | #include <signal.h> | 14 | #include <signal.h> |
diff --git a/tools/perf/bench/futex-wake.c b/tools/perf/bench/futex-wake.c index e246b1b8388a..789490281ae3 100644 --- a/tools/perf/bench/futex-wake.c +++ b/tools/perf/bench/futex-wake.c | |||
@@ -9,6 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | /* For the CLR_() macros */ | 11 | /* For the CLR_() macros */ |
12 | #include <string.h> | ||
12 | #include <pthread.h> | 13 | #include <pthread.h> |
13 | 14 | ||
14 | #include <signal.h> | 15 | #include <signal.h> |