Add compile guards and a few suppress flags for a cleaner build.

Signed-off-by: Felipe Huici <felipe.huici@neclab.eu>
Reviewed-by: Simon Kuenzer <simon.kuenzer@neclab.eu>

diff --git a/Makefile.uk b/Makefile.uk
index 1f8dd88503d5ef29e4f4dfa27f82e1332f09dee6..3a3f2266ad8192c0f1fc558f215f04e7d6ab61a5 100644 (file)
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -109,13 +109,13 @@ UK_PREPARE += $(LIBCLICK_BUILD)/.prepared
 ################################################################################
 # App includes, compile flags
 ################################################################################
-LIBCLICK_CINCLUDES   += -I$(LIBCLICK_BASE)/include        \
-                       -I$(LIBCLICK_EXTRACTED)      \
-                       -I$(LIBCLICK_EXTRACTED)/include \
+LIBCLICK_CINCLUDES   += -I$(LIBCLICK_BASE)/include         \
+                       -I$(LIBCLICK_EXTRACTED)            \
+                       -I$(LIBCLICK_EXTRACTED)/include    \
                        -I$(LIBLWIP_LWIP_SRCS)/include/posix
-LIBCLICK_CXXINCLUDES += -I$(LIBCLICK_BASE)/include        \
-                       -I$(LIBCLICK_EXTRACTED)           \
-                       -I$(LIBCLICK_EXTRACTED)/include \
+LIBCLICK_CXXINCLUDES += -I$(LIBCLICK_BASE)/include         \
+                       -I$(LIBCLICK_EXTRACTED)            \
+                       -I$(LIBCLICK_EXTRACTED)/include    \
                        -I$(LIBLWIP_LWIP_SRCS)/include/posix
 
 ################################################################################
@@ -126,9 +126,9 @@ LIBCLICK_CXXFLAGS-y     += -DLWIP_TIMEVAL_PRIVATE=0 -DCLICK_USERLEVEL -DHAVE_IP6
 LIBCLICK_CXXFLAGS       += -fno-exceptions -fno-rtti -std=c++11
 
 # Suppress some warnings to make the build process look neater
-LIBCLICK_SUPPRESS_FLAGS := -Wno-strict-aliasing
+LIBCLICK_SUPPRESS_FLAGS := -Wno-strict-aliasing -Wno-parentheses -Wno-pointer-arith -Wno-unused-parameter -Wno-cast-function-type
 LIBCLICK_CFLAGS-y += $(LIBCLICK_SUPPRESS_FLAGS)
-LIBCLICK_CXXFLAGS-y += $(LIBCLICK_SUPPRESS_FLAGS)
+LIBCLICK_CXXFLAGS-y += $(LIBCLICK_SUPPRESS_FLAGS) -Wno-aligned-new -Wno-class-memaccess
 
 ################################################################################
 # Unikraft <-> Click glue code

diff --git a/include/click/config-userlevel.h b/include/click/config-userlevel.h
index 22548bcd6470bd1368fe217588a0ec072c3e8b1d..7a73bb9cf894449fd9e956617a84ed8afdbf9ef6 100644 (file)
--- a/include/click/config-userlevel.h
+++ b/include/click/config-userlevel.h
@@ -296,8 +296,12 @@ typedef unsigned long uintptr_t;
 
 /* Define likely and unlikely macros. */
 #if __GNUC__ >= 3
+#ifndef likely
 # define likely(x)     __builtin_expect(!!(x), 1)
+#endif
+#ifndef unlikely
 # define unlikely(x)   __builtin_expect(!!(x), 0)
+#endif
 #else
 # define likely(x)     (x)
 # define unlikely(x)   (x)