Changeset 8591b31 in mainline

Timestamp:

2018-09-20T16:13:43Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cbc3587

Parents:

9a5ae815

Message:

Fix most clang issues

Build error in futex.c remains because the proper solution of using
type _Atomic(fibril_t *) can't be parsed by sycek.

Files:

• kernel/generic/include/atomic.h (modified) (1 diff)
• uspace/Makefile.common (modified) (3 diffs)
• uspace/app/tester/print/print3.c (modified) (1 diff)
• uspace/lib/c/generic/private/futex.h (modified) (1 diff)
• uspace/lib/c/test/string.c (modified) (1 diff)
• uspace/lib/virtio/virtio.c (modified) (1 diff)

kernel/generic/include/atomic.h

@@ -68 +68 @@
 
 #define local_atomic_exchange(var_addr, new_val) \
-        atomic_exchange_explicit(var_addr, new_val, memory_order_relaxed)
+        atomic_exchange_explicit( \
+            (_Atomic typeof(*(var_addr)) *) (var_addr), \
+            (new_val), memory_order_relaxed)
 
 #endif

uspace/Makefile.common

@@ -181 +181 @@
         -Wextra \
         -Wno-unused-parameter \
-        -Wno-nonnull-compare \
         -Wmissing-prototypes \
         -Wwrite-strings \
@@ -200 +199 @@
 ifeq ($(COMPILER),clang)
         DEFAULT_CFLAGS += \
+                -Wno-missing-braces \
                 -Wno-missing-field-initializers \
                 -Wno-typedef-redefinition \
@@ -205 +205 @@
 else
         DEFAULT_CFLAGS += \
+                -Wno-nonnull-compare \
                 -Wno-clobbered
 endif

uspace/app/tester/print/print3.c

@@ -34 +34 @@
 #define BUFFER_SIZE  32
 
+#ifndef __clang__
 #pragma GCC diagnostic ignored "-Wformat-truncation"
+#endif
 
 const char *test_print3(void)

uspace/lib/c/generic/private/futex.h

@@ -41 +41 @@
 #include <libc.h>
 #include <time.h>
+#include <fibril.h>
 
 typedef struct futex {
         volatile atomic_int val;
 #ifdef CONFIG_DEBUG_FUTEX
-        void *owner;
+        // FIXME: Should be _Atomic(fibril_t *)
+        fibril_t *owner;
 #endif
 } futex_t;

uspace/lib/c/test/string.c

@@ -33 +33 @@
 #include <pcut/pcut.h>
 
+#ifndef __clang__
 #pragma GCC diagnostic ignored "-Wstringop-truncation"
 #pragma GCC diagnostic ignored "-Wstringop-overflow"
+#endif
 
 PCUT_INIT;

uspace/lib/virtio/virtio.c

@@ -127 +127 @@
         for (unsigned i = 0; i < size; i++) {
                 virtio_virtq_desc_set(vdev, num, i, 0, 0,
-                    VIRTQ_DESC_F_NEXT, (i + 1 == size) ? -1U : i + 1);
+                    VIRTQ_DESC_F_NEXT, (i + 1 == size) ? 0xffffu : i + 1);
         }
         *head = 0;