diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-06-13 11:04:19 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-06-17 14:57:19 -0400 |
commit | 4541a8bb13a86e504416a13360c8dc64d2fd612a (patch) | |
tree | a272ee5f496c7f45d40a20cd8d1afcc8de788714 /tools/build | |
parent | e01f0ef509ea7e76929f24a074d241de52c6f82a (diff) |
tools build: Check if gettid() is available before providing helper
Laura reported that the perf build failed in fedora when we got a glibc
that provides gettid(), which I reproduced using fedora rawhide with the
glibc-devel-2.29.9000-26.fc31.x86_64 package.
Add a feature check to avoid providing a gettid() helper in such
systems.
On a fedora rawhide system with this patch applied we now get:
[root@7a5f55352234 perf]# grep gettid /tmp/build/perf/FEATURE-DUMP
feature-gettid=1
[root@7a5f55352234 perf]# cat /tmp/build/perf/feature/test-gettid.make.output
[root@7a5f55352234 perf]# ldd /tmp/build/perf/feature/test-gettid.bin
linux-vdso.so.1 (0x00007ffc6b1f6000)
libc.so.6 => /lib64/libc.so.6 (0x00007f04e0a74000)
/lib64/ld-linux-x86-64.so.2 (0x00007f04e0c47000)
[root@7a5f55352234 perf]# nm /tmp/build/perf/feature/test-gettid.bin | grep -w gettid
U gettid@@GLIBC_2.30
[root@7a5f55352234 perf]#
While on a fedora:29 system:
[acme@quaco perf]$ grep gettid /tmp/build/perf/FEATURE-DUMP
feature-gettid=0
[acme@quaco perf]$ cat /tmp/build/perf/feature/test-gettid.make.output
test-gettid.c: In function ‘main’:
test-gettid.c:8:9: error: implicit declaration of function ‘gettid’; did you mean ‘getgid’? [-Werror=implicit-function-declaration]
return gettid();
^~~~~~
getgid
cc1: all warnings being treated as errors
[acme@quaco perf]$
Reported-by: Laura Abbott <labbott@redhat.com>
Tested-by: Laura Abbott <labbott@redhat.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Florian Weimer <fweimer@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: https://lkml.kernel.org/n/tip-yfy3ch53agmklwu9o7rlgf9c@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/build')
-rw-r--r-- | tools/build/Makefile.feature | 1 | ||||
-rw-r--r-- | tools/build/feature/Makefile | 4 | ||||
-rw-r--r-- | tools/build/feature/test-all.c | 5 | ||||
-rw-r--r-- | tools/build/feature/test-gettid.c | 11 |
4 files changed, 21 insertions, 0 deletions
diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature index 3b24231c58a2..50377cc2f5f9 100644 --- a/tools/build/Makefile.feature +++ b/tools/build/Makefile.feature | |||
@@ -36,6 +36,7 @@ FEATURE_TESTS_BASIC := \ | |||
36 | fortify-source \ | 36 | fortify-source \ |
37 | sync-compare-and-swap \ | 37 | sync-compare-and-swap \ |
38 | get_current_dir_name \ | 38 | get_current_dir_name \ |
39 | gettid \ | ||
39 | glibc \ | 40 | glibc \ |
40 | gtk2 \ | 41 | gtk2 \ |
41 | gtk2-infobar \ | 42 | gtk2-infobar \ |
diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile index 4b8244ee65ce..523ee42db0c8 100644 --- a/tools/build/feature/Makefile +++ b/tools/build/feature/Makefile | |||
@@ -54,6 +54,7 @@ FILES= \ | |||
54 | test-get_cpuid.bin \ | 54 | test-get_cpuid.bin \ |
55 | test-sdt.bin \ | 55 | test-sdt.bin \ |
56 | test-cxx.bin \ | 56 | test-cxx.bin \ |
57 | test-gettid.bin \ | ||
57 | test-jvmti.bin \ | 58 | test-jvmti.bin \ |
58 | test-jvmti-cmlr.bin \ | 59 | test-jvmti-cmlr.bin \ |
59 | test-sched_getcpu.bin \ | 60 | test-sched_getcpu.bin \ |
@@ -267,6 +268,9 @@ $(OUTPUT)test-sdt.bin: | |||
267 | $(OUTPUT)test-cxx.bin: | 268 | $(OUTPUT)test-cxx.bin: |
268 | $(BUILDXX) -std=gnu++11 | 269 | $(BUILDXX) -std=gnu++11 |
269 | 270 | ||
271 | $(OUTPUT)test-gettid.bin: | ||
272 | $(BUILD) | ||
273 | |||
270 | $(OUTPUT)test-jvmti.bin: | 274 | $(OUTPUT)test-jvmti.bin: |
271 | $(BUILD) | 275 | $(BUILD) |
272 | 276 | ||
diff --git a/tools/build/feature/test-all.c b/tools/build/feature/test-all.c index a59c53705093..3b3d5d72124a 100644 --- a/tools/build/feature/test-all.c +++ b/tools/build/feature/test-all.c | |||
@@ -38,6 +38,10 @@ | |||
38 | # include "test-get_current_dir_name.c" | 38 | # include "test-get_current_dir_name.c" |
39 | #undef main | 39 | #undef main |
40 | 40 | ||
41 | #define main main_test_gettid | ||
42 | # include "test-gettid.c" | ||
43 | #undef main | ||
44 | |||
41 | #define main main_test_glibc | 45 | #define main main_test_glibc |
42 | # include "test-glibc.c" | 46 | # include "test-glibc.c" |
43 | #undef main | 47 | #undef main |
@@ -195,6 +199,7 @@ int main(int argc, char *argv[]) | |||
195 | main_test_libelf(); | 199 | main_test_libelf(); |
196 | main_test_libelf_mmap(); | 200 | main_test_libelf_mmap(); |
197 | main_test_get_current_dir_name(); | 201 | main_test_get_current_dir_name(); |
202 | main_test_gettid(); | ||
198 | main_test_glibc(); | 203 | main_test_glibc(); |
199 | main_test_dwarf(); | 204 | main_test_dwarf(); |
200 | main_test_dwarf_getlocations(); | 205 | main_test_dwarf_getlocations(); |
diff --git a/tools/build/feature/test-gettid.c b/tools/build/feature/test-gettid.c new file mode 100644 index 000000000000..ef24e42d3f1b --- /dev/null +++ b/tools/build/feature/test-gettid.c | |||
@@ -0,0 +1,11 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0 | ||
2 | // Copyright (C) 2019, Red Hat Inc, Arnaldo Carvalho de Melo <acme@redhat.com> | ||
3 | #define _GNU_SOURCE | ||
4 | #include <unistd.h> | ||
5 | |||
6 | int main(void) | ||
7 | { | ||
8 | return gettid(); | ||
9 | } | ||
10 | |||
11 | #undef _GNU_SOURCE | ||