Fix some warnings seen on Travis

HBLvim · May 31, 2020 · e846501 · e846501
1 parent c07142f
commit e846501
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/fs/sock.c b/fs/sock.c
@@ -1161,12 +1161,11 @@ const struct fd_ops socket_fdops = {
     .ioctl = realfs_ioctl,
 };
 
-#if defined(__GNUC__)
-#if defined(__clang__)
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#else
+#if defined(__GNUC__) && __GNUC__ >= 8
 #pragma GCC diagnostic ignored "-Wcast-function-type"
 #endif
+#if defined(__clang__)
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #endif
 static struct socket_call {
     syscall_t func;

diff --git a/kernel/calls.c b/kernel/calls.c
@@ -9,7 +9,7 @@ dword_t syscall_success_stub() {
     return 0;
 }
 
-#if defined(__GNUC__) && !defined(__clang__)
+#if is_gcc(8)
 #pragma GCC diagnostic ignored "-Wcast-function-type"
 #endif
 syscall_t syscall_table[] = {

diff --git a/kernel/signal.c b/kernel/signal.c
@@ -7,7 +7,7 @@
 #include "kernel/vdso.h"
 #include "emu/interrupt.h"
 
-#if defined(__GNUC__) && !defined(__clang__)
+#if is_gcc(9)
 #pragma GCC diagnostic ignored "-Waddress-of-packed-member"
 #endif
 

diff --git a/misc.h b/misc.h
@@ -18,6 +18,10 @@
 #define str(x) _str(x)
 #define _str(x) #x
 
+// compiler checks
+#define is_clang(version) (__clang__ && __clang_major__ >= version)
+#define is_gcc(version) (__GNUC__ >= version)
+
 // keywords
 #define bits unsigned int
 #define forceinline inline __attribute__((always_inline))
@@ -30,7 +34,9 @@
 #define unlikely(x) __builtin_expect((x), 0)
 #define typecheck(type, x) ({type _x = x; x;})
 #define must_check __attribute__((warn_unused_result))
+#if is_gcc(7) || is_clang(10)
 #define fallthrough __attribute__((fallthrough))
+#endif
 
 #if defined(__has_attribute) && __has_attribute(no_sanitize)
 #define __no_instrument_msan