From 08c424508965c160c3ba9ceea4c3b1ed3b3558532555e6a7141875e01447cd94 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Mon, 3 Feb 2025 12:06:58 +0000 Subject: [PATCH 1/2] up to 3.1+20250106 & llvm14 OBS-URL: https://build.opensuse.org/package/show/devel:tools:statica/klee?expand=0&rev=144 --- _servicedata | 2 +- klee-3.1+20241105.obscpio | 3 --- klee-3.1+20250106.obscpio | 3 +++ klee.changes | 14 ++++++++++++++ klee.obsinfo | 6 +++--- klee.spec | 6 +++--- 6 files changed, 24 insertions(+), 10 deletions(-) delete mode 100644 klee-3.1+20241105.obscpio create mode 100644 klee-3.1+20250106.obscpio diff --git a/_servicedata b/_servicedata index daa8c9e..7ff9401 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/klee/klee - c4bbdcd160379e5926b4d19c925215b3013b6275 \ No newline at end of file + 1a7051635daf33d666fd03b4a793c0a81a4897e3 \ No newline at end of file diff --git a/klee-3.1+20241105.obscpio b/klee-3.1+20241105.obscpio deleted file mode 100644 index 4fd2b95..0000000 --- a/klee-3.1+20241105.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0b3beef3f363b690963e8d271b18ccd44c82a21b7e8ff9a9712f786b56c5fa9 -size 19211277 diff --git a/klee-3.1+20250106.obscpio b/klee-3.1+20250106.obscpio new file mode 100644 index 0000000..a5f614c --- /dev/null +++ b/klee-3.1+20250106.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76ed15ee378cc00dbf7d69ac5cfc154738294d4d8ccd33a3ad5b43c738115e6a +size 19223053 diff --git a/klee.changes b/klee.changes index f74d819..e912e4b 100644 --- a/klee.changes +++ b/klee.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Feb 03 12:05:59 UTC 2025 - jslaby@suse.cz + +- Update to version 3.1+20250106: + * Freestanding fortify implementation + * Freestanding intrinsic implementation + * Freestanding klee-libc implementation + * Freestanding runtime implementation + * Freestanding errno implementation (falls back to host when available) + * Define _LARGEFILE64_SOURCE at the beginning of necessary files + * Add an option to generate XML test cases + * fix ASan support for GCC 14 (and modernize it) +- switch to llvm 14, as llvm 16 is used solely by klee + ------------------------------------------------------------------- Mon Dec 09 07:10:04 UTC 2024 - jslaby@suse.cz diff --git a/klee.obsinfo b/klee.obsinfo index 2934006..98a8bea 100644 --- a/klee.obsinfo +++ b/klee.obsinfo @@ -1,4 +1,4 @@ name: klee -version: 3.1+20241105 -mtime: 1730820864 -commit: c4bbdcd160379e5926b4d19c925215b3013b6275 +version: 3.1+20250106 +mtime: 1736168884 +commit: 1a7051635daf33d666fd03b4a793c0a81a4897e3 diff --git a/klee.spec b/klee.spec index 567a83a..42c41c0 100644 --- a/klee.spec +++ b/klee.spec @@ -1,7 +1,7 @@ # # spec file for package klee # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # -%define llvm_version 16 +%define llvm_version 14 %ifarch x86_64 %define with_uclibc 1 @@ -30,7 +30,7 @@ Name: klee Summary: LLVM Execution Engine License: NCSA Group: Development/Languages/Other -Version: 3.1+20241105 +Version: 3.1+20250106 Release: 0 URL: http://klee.github.io/ Source0: %{name}-%{version}.tar.xz From 4ce0cd0779079c39d666c8d951eb7c2bfa57917bf925b262ce9562a6f9198931 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Mon, 3 Feb 2025 12:11:22 +0000 Subject: [PATCH 2/2] up to 3.1+20250106 & llvm14 OBS-URL: https://build.opensuse.org/package/show/devel:tools:statica/klee?expand=0&rev=145 --- FileCheck.cpp | 12 ++++-------- not.cpp | 3 +-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/FileCheck.cpp b/FileCheck.cpp index 00d5240..28ab3bf 100644 --- a/FileCheck.cpp +++ b/FileCheck.cpp @@ -18,9 +18,7 @@ #include "llvm/FileCheck/FileCheck.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/InitLLVM.h" -#include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Process.h" -#include "llvm/Support/SourceMgr.h" #include "llvm/Support/WithColor.h" #include "llvm/Support/raw_ostream.h" #include @@ -81,7 +79,7 @@ static cl::opt AllowEmptyInput( "checks that some error message does not occur, for example.")); static cl::opt AllowUnusedPrefixes( - "allow-unused-prefixes", + "allow-unused-prefixes", cl::init(false), cl::ZeroOrMore, cl::desc("Allow prefixes to be specified but not appear in the test.")); static cl::opt MatchFullLines( @@ -104,12 +102,12 @@ static cl::opt AllowDeprecatedDagOverlap( "non-overlapping CHECK-DAG implementation.\n")); static cl::opt Verbose( - "v", + "v", cl::init(false), cl::ZeroOrMore, cl::desc("Print directive pattern matches, or add them to the input dump\n" "if enabled.\n")); static cl::opt VerboseVerbose( - "vv", + "vv", cl::init(false), cl::ZeroOrMore, cl::desc("Print information helpful in diagnosing internal FileCheck\n" "issues, or add it to the input dump if enabled. Implies\n" "-v.\n")); @@ -369,8 +367,6 @@ static std::string GetCheckTypeAbbreviation(Check::FileCheckType Ty) { return "bad-not"; case Check::CheckBadCount: return "bad-count"; - case Check::CheckMisspelled: - return "misspelled"; case Check::CheckNone: llvm_unreachable("invalid FileCheckType"); } @@ -634,7 +630,7 @@ static void DumpAnnotatedInput(raw_ostream &OS, const FileCheckRequest &Req, // -dump-input-filter. However, in case the resulting ellipsis would occupy // more lines than the input lines and annotations it elides, buffer the // elided lines and annotations so we can print them instead. - raw_ostream *LineOS; + raw_ostream *LineOS = &OS; if ((!PrevLineInFilter || PrevLineInFilter + DumpInputContext < Line) && (NextLineInFilter == UINT_MAX || Line + DumpInputContext < NextLineInFilter)) diff --git a/not.cpp b/not.cpp index 920f3fc..5519495 100644 --- a/not.cpp +++ b/not.cpp @@ -58,8 +58,7 @@ int main(int argc, const char **argv) { for (int i = 0; i < argc; ++i) Argv.push_back(argv[i]); std::string ErrMsg; - int Result = - sys::ExecuteAndWait(*Program, Argv, std::nullopt, {}, 0, 0, &ErrMsg); + int Result = sys::ExecuteAndWait(*Program, Argv, None, {}, 0, 0, &ErrMsg); #ifdef _WIN32 // Handle abort() in msvcrt -- It has exit code as 3. abort(), aka // unreachable, should be recognized as a crash. However, some binaries use