llvm: don't use clEnumValEnd for LLVM 4.0

It became unnecessary when defining options and mainly undefined.

So introduce KLEE_LLVM_CL_VAL_END as suggested by @delcypher.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>

2 files changed, 6 insertions, 6 deletions

diff --git a/tools/kleaver/main.cpp b/tools/kleaver/main.cpp
index 3fde0abf..b8b32e31 100644
--- a/tools/kleaver/main.cpp
+++ b/tools/kleaver/main.cpp
@@ -68,8 +68,8 @@ namespace {
              clEnumValN(PrintAST, "print-ast",
                         "Print parsed AST nodes from the input file."),
              clEnumValN(Evaluate, "evaluate",
-                        "Print parsed AST nodes from the input file."),
-             clEnumValEnd));
+                        "Print parsed AST nodes from the input file.")
+             KLEE_LLVM_CL_VAL_END));
 
 
   enum BuilderKinds {
@@ -88,8 +88,8 @@ namespace {
               clEnumValN(ConstantFoldingBuilder, "constant-folding",
                          "Fold constant expressions."),
               clEnumValN(SimplifyingBuilder, "simplify",
-                         "Fold constants and simplify expressions."),
-              clEnumValEnd));
+                         "Fold constants and simplify expressions.")
+              KLEE_LLVM_CL_VAL_END));
 
 
   llvm::cl::opt<std::string> directoryToWriteQueryLogs("query-log-dir",llvm::cl::desc("The folder to write query logs to. Defaults is current working directory."),
diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp
index b74789fa..94798dad 100644
--- a/tools/klee/main.cpp
+++ b/tools/klee/main.cpp
@@ -145,8 +145,8 @@ namespace {
        cl::desc("Choose libc version (none by default)."),
        cl::values(clEnumValN(NoLibc, "none", "Don't link in a libc"),
                   clEnumValN(KleeLibc, "klee", "Link in klee libc"),
-		  clEnumValN(UcLibc, "uclibc", "Link in uclibc (adapted for klee)"),
-		  clEnumValEnd),
+		  clEnumValN(UcLibc, "uclibc", "Link in uclibc (adapted for klee)")
+		  KLEE_LLVM_CL_VAL_END),
        cl::init(NoLibc));