Accepting request 876179 from devel:tools:statica

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/876179
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/klee?expand=0&rev=26
This commit is contained in:
Richard Brown 2021-03-02 11:36:35 +00:00 committed by Git OBS Bridge
commit 49105e9698
7 changed files with 15 additions and 58 deletions

View File

@ -1,49 +0,0 @@
From: Jiri Slaby <jirislaby@gmail.com>
Date: Fri, 19 Feb 2021 08:02:45 +0100
Subject: runtime/POSIX: fix failures with glibc-2.33
Patch-mainline: submitted, pr #1385
References: stat
commit 8ed005daf0ab of glibc-2.33 (Remove stat wrapper functions, move
them to exported symbols) removed renames of `__fxstat`, `__xstat`, and
`__lxstat` to `__fxstat64`, `__xstat64`, and `__lxstat64`, respectively.
But we relied on the renames to build `fd_64.c` properly. With glibc
2.33, we now see link failures of the POSIX runtime:
error: Linking globals named '__xstat': symbol multiply defined!
Rename the functions using `__REDIRECT_NTH` in the code as
`__USE_FILE_OFFSET64` case (which we define at the top of the file by
`#define _FILE_OFFSET_BITS 64`) did exactly that.
Fixes #1384.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
runtime/POSIX/fd_64.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/runtime/POSIX/fd_64.c b/runtime/POSIX/fd_64.c
index eec41f113024..c8796475aca8 100644
--- a/runtime/POSIX/fd_64.c
+++ b/runtime/POSIX/fd_64.c
@@ -73,6 +73,16 @@ int openat(int fd, const char *pathname, int flags, ...) {
return __fd_openat(fd, pathname, flags, mode);
}
+/* removed in glibc 2.33 */
+#ifdef __REDIRECT_NTH
+extern int __REDIRECT_NTH(__fxstat, (int __ver, int __fildes,
+ struct stat *__stat_buf), __fxstat64);
+extern int __REDIRECT_NTH (__xstat, (int __ver, const char *__filename,
+ struct stat *__stat_buf), __xstat64);
+extern int __REDIRECT_NTH (__lxstat, (int __ver, const char *__filename,
+ struct stat *__stat_buf), __lxstat64);
+#endif
+
off64_t lseek(int fd, off64_t offset, int whence) {
return __fd_lseek(fd, offset, whence);
}
--
2.30.1

View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/klee/klee.git</param>
<param name="changesrevision">5f8d562181bce7c0d11eae0a597e3f534966e42c</param></service></servicedata>
<param name="changesrevision">148a68df793fca84a36fefd8824ea54fdf6583f4</param></service></servicedata>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7bd981b88d07405f1a51a0ce6950d7427b8a26a1f560b035813d0e7d0d84f41c
size 19321869

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f2af1879d5067dfea07ab198d064ee195a8f70c885b01cd1f542dddbccbf73b
size 19322381

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Feb 23 07:33:34 UTC 2021 - jslaby@suse.cz
- Update to version 2.2+20210222:
* runtime/POSIX: fix failures with glibc-2.33
- remove 0001-runtime-POSIX-fix-failures-with-glibc-2.33.patch
-------------------------------------------------------------------
Fri Feb 19 07:15:02 UTC 2021 - jslaby@suse.cz

View File

@ -1,5 +1,5 @@
name: klee
version: 2.2+20210216
mtime: 1613500636
commit: 5f8d562181bce7c0d11eae0a597e3f534966e42c
version: 2.2+20210222
mtime: 1614010572
commit: 148a68df793fca84a36fefd8824ea54fdf6583f4

View File

@ -31,14 +31,13 @@ Name: klee
Summary: LLVM Execution Engine
License: NCSA
Group: Development/Languages/Other
Version: 2.2+20210216
Version: 2.2+20210222
Release: 0
URL: http://klee.github.io/
Source0: %{name}-%{version}.tar.xz
Source1: %{name}-rpmlintrc
Source2: https://raw.githubusercontent.com/llvm/llvm-project/llvmorg-%{llvm_version_major}.0.0/llvm/utils/not/not.cpp
Source3: https://raw.githubusercontent.com/llvm/llvm-project/llvmorg-%{llvm_version_major}.0.0/llvm/utils/FileCheck/FileCheck.cpp
Patch0: 0001-runtime-POSIX-fix-failures-with-glibc-2.33.patch
BuildRequires: clang%{llvm_version}
BuildRequires: cmake
BuildRequires: gperftools-devel