Revert "add basic clang support for clangd"

This reverts commit bdef92b.

.gitignore

@@ -14,9 +14,6 @@ linux_dpdk/trex-64.bz2
 linux_dpdk/*.html
 linux_dpdk/cov-int/*
 *.vscode
-*.clangd
-compile_commands.json
-
 
 linux/.waf*
 linux/build*

external_libs/bpf/bpf_api.c

@@ -76,7 +76,7 @@ bpf_run(bpf_h bpf, const char *buffer, uint32_t len) {
     assert(len > 0);
 
     const struct bpf_insn *fcode = program->bf_insns;
-    return bpf_filter(fcode, (const u_char *)buffer, len, len);
+    return bpf_filter(fcode, buffer, len, len);
 }
 
 #ifdef TREX_USE_BPFJIT

external_libs/bpf/bpf_filter.c

@@ -61,8 +61,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
-//#define	SOLARIS	(defined(sun) && (defined(__SVR4) || defined(__svr4__)))
-#if defined(__hpux) || (defined(sun) && (defined(__SVR4) || defined(__svr4__)))
+#define	SOLARIS	(defined(sun) && (defined(__SVR4) || defined(__svr4__)))
+#if defined(__hpux) || SOLARIS
 # include <sys/sysmacros.h>
 # include <sys/stream.h>
 # define	mbuf	msgb
@@ -118,7 +118,7 @@
 #endif
 
 #if defined(KERNEL) || defined(_KERNEL)
-#if !defined(__hpux) &&  !(defined(sun) && (defined(__SVR4) || defined(__svr4__)))
+# if !defined(__hpux) && !SOLARIS
 #include <sys/mbuf.h>
 # endif
 #define MINDEX(len, _m, _k) \

external_libs/valijson/include/valijson/schema_parser.hpp

@@ -1224,11 +1224,8 @@ class SchemaParser
         return dependenciesConstraint;
     }
 
-#ifndef __clang__
 #pragma GCC push_options
 #pragma GCC optimize ("O0")
-#endif
-
 
     /**
      * @brief   Make a new EnumConstraint object.
@@ -1254,10 +1251,7 @@ class SchemaParser
         /// EnumConstraint class.
         return constraint;
     }
-
-#ifndef __clang__
 #pragma GCC pop_options
-#endif
 
     /**
      * @brief   Make a new ItemsConstraint object.
@@ -2114,7 +2108,7 @@ class SchemaParser
 }  // namespace valijson
 
 #ifdef __clang__
-#pragma clang diagnostic pop
+#  pragma clang diagnostic pop
 #endif
 
 #endif

linux/b

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-waf=waf-2.0.18
+waf=waf-1.9.5
 p2=${PYTHON:-${PYTHON2:-python2.7}}
 p3=${PYTHON3:-python3}
 

linux/ws_main.py

@@ -11,13 +11,10 @@
 import os
 import shutil
 import copy
-import sys
 
 from distutils.version import StrictVersion
 from waflib import Logs
 
-sys.path.insert(0, os.path.abspath('waf-tools'))
-
 top = '../'
 out = 'build'
 b_path ="./build/linux/"
@@ -31,16 +28,6 @@
 GCC8_DIRS = ['/usr/local/gcc-8.3/bin']
 
 
-clang_flags = [  '-Wno-null-conversion', 
-                 '-Wno-sign-compare', 
-                 '-Wno-strict-aliasing',
-                 '-Wno-address-of-packed-member',
-                 '-Wno-inconsistent-missing-override',
-                 '-Wno-deprecated',
-                 '-Wno-unused-private-field']
-
-gcc_flags = ['-Wall', '-Wno-sign-compare', '-Wno-strict-aliasing']
-
 class SrcGroup:
     ' group of source by directory '
 
@@ -115,9 +102,6 @@ def verify_cc_version (env, min_ver = REQUIRED_CC_VERSION):
 
 
 def configure(conf):
-    conf.load('compiler_cxx')
-    conf.load('clang_compilation_database',tooldir=['../external_libs/waf-tools'])
-
     if int(conf.options.gcc6) + int(conf.options.gcc7) + int(conf.options.gcc8) > 1:
         conf.fatal('--gcc6, --gcc7 and --gcc8 are mutual exclusive')
 
@@ -156,19 +140,11 @@ def search_in_paths(paths):
         if os.path.exists(path):
             return path
 
-def load_compiler(conf):
-    if 'clang' in conf.environ.get('CXX',''):
-        conf.load('clang++')
-    else:   
-        conf.load('g++')
-    return
-
-
 
 def configure_gcc(conf, explicit_paths = None):
     # use the system path
     if explicit_paths is None:
-        load_compiler(conf)
+        conf.load('g++')
         return
 
     if type(explicit_paths) is not list:
@@ -181,7 +157,7 @@ def configure_gcc(conf, explicit_paths = None):
     saved = conf.environ['PATH']
     try:
         conf.environ['PATH'] = explicit_path
-        load_compiler(conf)
+        conf.load('g++')
     finally:
         conf.environ['PATH'] = saved
 
@@ -535,16 +511,6 @@ def __init__(self, name, src, debug_mode, is_pie, use = [], flags = [], rpath =
       self.use = use
       self.flags = flags
       self.rpath = rpath
-      self.env = None
-
-    def set_env(self,env):
-        self.env = env;
-
-    def is_clang(self):
-        if self.env: 
-            if 'clang' in self.env[0]:
-                return True
-        return False        
 
     def __str__(self):
        s=self.mode+","+self.platform;
@@ -602,11 +568,6 @@ def update_name (self,name,delimiter):
 
     def cxxcomp_flags (self,flags):
         result = copy.copy(flags);
-
-        if self.is_clang():
-           result += clang_flags
-        else:
-           result += gcc_flags
 
         if self.isIntelPlatform():
             if self.is64Platform () :
@@ -679,14 +640,13 @@ def get_link_flags(self, is_sanitized):
         return base_flags;
 
 
-
 build_types = [
                build_option(name = "bp-sim", src = bp, use = [''],debug_mode= DEBUG_, is_pie = False,
-                            flags = ['-Werror'],
+                            flags = ['-Wall', '-Werror', '-Wno-sign-compare', '-Wno-strict-aliasing'],
                             rpath = ['so']),
 
                build_option(name = "bp-sim", src = bp, use = [''],debug_mode= RELEASE_, is_pie = False,
-                            flags = ['-Werror'],
+                            flags = ['-Wall', '-Werror', '-Wno-sign-compare', '-Wno-strict-aliasing'],
                             rpath = ['so']),
 
               ]
@@ -696,9 +656,8 @@ def build_prog (bld, build_obj):
 
     # determine if sanitized image should be built
     is_sanitized = bld.env.SANITIZED
-    build_obj.set_env(bld.env.CXX)
 
-    cxxflags  = build_obj.get_flags(is_sanitized)+['-std=gnu++11']
+    cxxflags  = build_obj.get_flags(is_sanitized)+['-std=gnu++11',]
     linkflags = build_obj.get_link_flags(is_sanitized)
 
 

linux_dpdk/b

@@ -1,7 +1,7 @@
 #! /bin/bash
 
 export WAFLOCK=.lock-wafbuild_dpdk
-waf=waf-2.0.18
+waf=waf-1.9.5
 p2=${PYTHON:-${PYTHON2:-python2.7}}
 p3=${PYTHON3:-python3}