From 66feb939e6df71b51b86d8d64024e95d20bdf376 Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Wed, 5 May 2021 14:45:09 +0200 Subject: [PATCH] cbe_tester: compile errors/warnings with gcc 10 Fixes #4113 --- repos/gems/src/app/cbe_tester/main.cc | 4 +++- repos/libports/src/lib/libc/execve.cc | 2 +- repos/libports/src/lib/libc/pthread.cc | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/repos/gems/src/app/cbe_tester/main.cc b/repos/gems/src/app/cbe_tester/main.cc index 9d1d68aacc..a54065f16e 100644 --- a/repos/gems/src/app/cbe_tester/main.cc +++ b/repos/gems/src/app/cbe_tester/main.cc @@ -2234,7 +2234,9 @@ class Main log("List snapshots (command ID ", cmd.id(), ")"); for (unsigned idx { 0 }; idx < sizeof(ids.values) / sizeof(ids.values[0]); idx++) { if (ids.values[idx] != 0) { - log(" Snapshot #", snap_nr, " is generation ", ids.values[idx]); + log(" Snapshot #", snap_nr, " is generation ", + (uint64_t)ids.values[idx]); + snap_nr++; } } diff --git a/repos/libports/src/lib/libc/execve.cc b/repos/libports/src/lib/libc/execve.cc index 73fd407db7..615002e564 100644 --- a/repos/libports/src/lib/libc/execve.cc +++ b/repos/libports/src/lib/libc/execve.cc @@ -445,4 +445,4 @@ extern "C" int execve(char const *filename, call_func(_user_stack_ptr, (void *)user_entry, nullptr); } -extern "C" int _execve(char const *, char *const[], char *const[]) __attribute__((weak, alias("execve"))); +extern "C" int _execve(char const *, char *const[], char *const[]) __attribute__((weak, alias("execve"), nothrow)); diff --git a/repos/libports/src/lib/libc/pthread.cc b/repos/libports/src/lib/libc/pthread.cc index ed71683b61..9619800dd7 100644 --- a/repos/libports/src/lib/libc/pthread.cc +++ b/repos/libports/src/lib/libc/pthread.cc @@ -709,7 +709,7 @@ extern "C" { } typeof(pthread_exit) _pthread_exit - __attribute__((alias("pthread_exit"))); + __attribute__((alias("pthread_exit"), noreturn)); /* special non-POSIX function (for example used in libresolv) */