From 025a39a7c26e9f19985a392797c9499923a555d7 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 14 Jul 2020 10:36:17 +0200 Subject: [PATCH] [gdb/testsuite] Fix clone-new-thread-event.c with glibc 2.30 Starting glibc 2.30, unistd.h declares gettid (for _GNU_SOURCE). This clashes with a static gettid in test source clone-new-thread-event.c: ... gdb compile failed, gdb.threads/clone-new-thread-event.c:46:1: error: \ static declaration of 'gettid' follows non-static declaration 46 | gettid (void) | ^~~~~~ In file included from /usr/include/unistd.h:1170, from gdb.threads/clone-new-thread-event.c:27: /usr/include/bits/unistd_ext.h:34:16: note: previous declaration of 'gettid' \ was here 34 | extern __pid_t gettid (void) __THROW; | ^~~~~~ ... Fix this by renaming the static gettid to local_gettid. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-07-14 Tom de Vries * gdb.threads/clone-new-thread-event.c (gettid): Rename to ... (local_gettid): ... this. (fn): Update. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.threads/clone-new-thread-event.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 7f4b25cb521..7690acf0338 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2020-07-14 Tom de Vries + + * gdb.threads/clone-new-thread-event.c (gettid): Rename to ... + (local_gettid): ... this. + (fn): Update. + 2020-07-13 Sandra Loosemore * gdb.base/info_sources.exp: Skip directory match tests on diff --git a/gdb/testsuite/gdb.threads/clone-new-thread-event.c b/gdb/testsuite/gdb.threads/clone-new-thread-event.c index 51dbb4fae6e..b4a3c04347a 100644 --- a/gdb/testsuite/gdb.threads/clone-new-thread-event.c +++ b/gdb/testsuite/gdb.threads/clone-new-thread-event.c @@ -43,7 +43,7 @@ tkill (int lwpid, int signo) } static pid_t -gettid (void) +local_gettid (void) { return syscall (__NR_gettid); } @@ -51,7 +51,7 @@ gettid (void) static int fn (void *unused) { - tkill (gettid (), SIGUSR1); + tkill (local_gettid (), SIGUSR1); return 0; } -- 2.30.2