packages/opa-psm2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!13 Fix complication failed due to gcc update to 12.3.1

Browse Source 
From: @starlet-dx 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-07-14 06:25:14 +00:00 committed by Gitee
commit b646605b84
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Fix-opa-psm2-gcc12-ips_cmpxchg-remove-compile-breaking-bad.patch Normal file
View File

@ -0,0 +1,32 @@
From c3a7d9468d5623c0164b783346bada8664a9a2c9 Mon Sep 17 00:00:00 2001
From: Brendan Cunningham <14318587+BrendanCunningham@users.noreply.github.com>
Date: Sat, 20 Nov 2021 13:02:06 -0500
Subject: [PATCH] ips_cmpxchg: remove compile-breaking bad cast-to-struct.
uint32_t ptr argument in compare-and-swap code snippet should not be
cast to pointer-to-uint32_t[100] struct.
Signed-off-by: Brendan Cunningham <bcunningham@cornelisnetworks.com>
---
include/linux-i386/sysdep.h | 5 +----
rpm_release_extension | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/include/linux-i386/sysdep.h b/include/linux-i386/sysdep.h
index bfd5746..2c48c1e 100644
--- a/include/linux-i386/sysdep.h
+++ b/include/linux-i386/sysdep.h
@@ -139,12 +139,9 @@ static __inline__ uint32_t ips_cmpxchg(volatile uint32_t *ptr,
uint32_t old_val, uint32_t new_val)
{
uint32_t prev;
- struct xchg_dummy {
- uint32_t a[100];
- };
asm volatile (LOCK_PREFIX "cmpxchgl %1,%2" : "=a"(prev)
- : "q"(new_val), "m"(*(struct xchg_dummy *)ptr), "0"(old_val)
+ : "q"(new_val), "m"(*ptr), "0"(old_val)
: "memory");
return prev;

6
libpsm2.spec
View File

@ -1,6 +1,6 @@
Name: libpsm2
Version: 10.3.58
Release: 9
Release: 10
Summary: Intel PSM Libraries
License: BSD or GPLv2
URL: https://github.com/01org/opa-psm2/
@ -11,6 +11,7 @@ Patch0: 0000-extend-fdesc-array.patch
Patch1: fix-stringop-truncation-build-error.patch
Patch2: Fix-opa-psm2-gcc10.patch
Patch3: Fix-missing-extern.patch
Patch4: Fix-opa-psm2-gcc12-ips_cmpxchg-remove-compile-breaking-bad.patch
ExclusiveArch: x86_64
BuildRequires: libuuid-devel numactl-devel gcc systemd-udev
@ -75,6 +76,9 @@ rm -f %{buildroot}%{_libdir}/*.a
%{_sysconfdir}/modprobe.d/libpsm2-compat.conf
%changelog
* Fri Jul 14 2023 yaoxin <yao_xin001@hoperun.com> - 10.3.58-10
- Fix complication failed due to gcc update to 12.3.1
* Fri Aug 06 2021 wangyong <wangyong187@huawei.com> - 10.3.58-9
- Fix downstream missing lib problem