From c7d41b5e0cc43429cf6bde9077be04932bb523c9 Mon Sep 17 00:00:00 2001
From: Andre Maroneze <andre.maroneze@cea.fr>
Date: Wed, 9 Sep 2020 10:14:07 +0200
Subject: [PATCH] sync with frama-c master; avoid deprecated Eva options

---
 cerberus/.frama-c/GNUmakefile   | 2 +-
 frama-c                         | 2 +-
 gzip124/.frama-c/GNUmakefile    | 2 +-
 icpc/.frama-c/GNUmakefile       | 2 +-
 jsmn/.frama-c/GNUmakefile       | 2 +-
 kilo/.frama-c/GNUmakefile       | 2 +-
 monocypher/.frama-c/GNUmakefile | 2 +-
 papabench/.frama-c/GNUmakefile  | 2 +-
 semver/.frama-c/GNUmakefile     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cerberus/.frama-c/GNUmakefile b/cerberus/.frama-c/GNUmakefile
index c281c4c1a..18c157657 100644
--- a/cerberus/.frama-c/GNUmakefile
+++ b/cerberus/.frama-c/GNUmakefile
@@ -25,7 +25,7 @@ FCFLAGS     += \
 ## Eva-specific flags
 EVAFLAGS    += \
   -eva-warn-key builtins:missing-spec=abort \
-  -slevel 6000 \
+  -eva-slevel 6000 \
 
 ## GUI-only flags
 FCGUIFLAGS += \
diff --git a/frama-c b/frama-c
index 82ccc1c0c..eb841ff9f 160000
--- a/frama-c
+++ b/frama-c
@@ -1 +1 @@
-Subproject commit 82ccc1c0c7e8e2d3261b4b7d198fa0ba64173a0b
+Subproject commit eb841ff9f52582b05d0a0270d38fcb9d1015fcab
diff --git a/gzip124/.frama-c/GNUmakefile b/gzip124/.frama-c/GNUmakefile
index ab966e75b..4dbcec926 100644
--- a/gzip124/.frama-c/GNUmakefile
+++ b/gzip124/.frama-c/GNUmakefile
@@ -29,7 +29,7 @@ FCFLAGS  += \
 
 ## Eva-specific flags
 EVAFLAGS += \
-  -slevel 4 \
+  -eva-slevel 4 \
   -eva-no-alloc-returns-null \
   -eva-no-builtins-auto \
   -eva-widening-delay 3 \
diff --git a/icpc/.frama-c/GNUmakefile b/icpc/.frama-c/GNUmakefile
index 7890738ac..73d48a523 100644
--- a/icpc/.frama-c/GNUmakefile
+++ b/icpc/.frama-c/GNUmakefile
@@ -21,7 +21,7 @@ FCFLAGS     += \
 
 ## Eva-specific flags
 EVAFLAGS    += \
-  -slevel 16 \
+  -eva-slevel 16 \
   -eva-domains equality \
 
 ## GUI-only flags
diff --git a/jsmn/.frama-c/GNUmakefile b/jsmn/.frama-c/GNUmakefile
index e2bd5ce79..0bec8506a 100644
--- a/jsmn/.frama-c/GNUmakefile
+++ b/jsmn/.frama-c/GNUmakefile
@@ -24,7 +24,7 @@ FCFLAGS     += \
 EVAFLAGS    += \
   -eva-warn-key builtins:missing-spec=abort \
   -eva-no-alloc-returns-null \
-  -slevel 300 \
+  -eva-slevel 300 \
 
 ## GUI-only flags
 FCGUIFLAGS += \
diff --git a/kilo/.frama-c/GNUmakefile b/kilo/.frama-c/GNUmakefile
index 3a778976e..68a61c288 100644
--- a/kilo/.frama-c/GNUmakefile
+++ b/kilo/.frama-c/GNUmakefile
@@ -25,7 +25,7 @@ EVAFLAGS    += \
   -eva-warn-key builtins:missing-spec=abort \
   -eva-no-alloc-returns-null \
   -main eva_main \
-  -slevel 2 \
+  -eva-slevel 2 \
 
 ## GUI-only flags
 FCGUIFLAGS += \
diff --git a/monocypher/.frama-c/GNUmakefile b/monocypher/.frama-c/GNUmakefile
index c9675cf9b..fed791096 100644
--- a/monocypher/.frama-c/GNUmakefile
+++ b/monocypher/.frama-c/GNUmakefile
@@ -25,7 +25,7 @@ FCFLAGS     += \
 
 ## Eva-specific flags
 EVAFLAGS    += \
-  -slevel 8 \
+  -eva-slevel 8 \
   -eva-split-return auto \
   -eva-warn-key signed-overflow=inactive \
   -eva-warn-key builtins:missing-spec=abort \
diff --git a/papabench/.frama-c/GNUmakefile b/papabench/.frama-c/GNUmakefile
index 6fa8d7ff4..6e649a15b 100644
--- a/papabench/.frama-c/GNUmakefile
+++ b/papabench/.frama-c/GNUmakefile
@@ -32,7 +32,7 @@ FCFLAGS     += \
 ## Eva-specific flags
 EVAFLAGS    += \
   -eva-warn-key builtins:missing-spec=abort \
-  -slevel 1 \
+  -eva-slevel 1 \
 
 ## GUI-only flags
 FCGUIFLAGS += \
diff --git a/semver/.frama-c/GNUmakefile b/semver/.frama-c/GNUmakefile
index 14fb40e18..61ea3df74 100644
--- a/semver/.frama-c/GNUmakefile
+++ b/semver/.frama-c/GNUmakefile
@@ -24,7 +24,7 @@ FCFLAGS     += \
 EVAFLAGS    += \
   -eva-warn-key builtins:missing-spec=abort \
   -eva-alloc-builtin fresh \
-  -slevel 82 \
+  -eva-slevel 82 \
 
 ## GUI-only flags
 FCGUIFLAGS += \
-- 
GitLab