From bf0a3154b8c7f6c6310d749834fc22be97792684 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Thu, 10 Dec 2020 17:20:56 -0700 Subject: [PATCH] - Don't use "register" in C++17. Still FTBFS though. --- libvma-gcc11.patch | 13 +++++++++++++ libvma.spec | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 libvma-gcc11.patch diff --git a/libvma-gcc11.patch b/libvma-gcc11.patch new file mode 100644 index 0000000..e38eda8 --- /dev/null +++ b/libvma-gcc11.patch @@ -0,0 +1,13 @@ +diff --git a/src/utils/asm-x86.h b/src/utils/asm-x86.h +index 5dfb6f4..4e8f03c 100644 +--- a/src/utils/asm-x86.h ++++ b/src/utils/asm-x86.h +@@ -110,7 +110,7 @@ static inline int atomic_fetch_and_add(int x, volatile int *ptr) + */ + static inline void gettimeoftsc(unsigned long long *p_tscval) + { +- register uint32_t upper_32, lower_32; ++ uint32_t upper_32, lower_32; + + // ReaD Time Stamp Counter (RDTCS) + __asm__ __volatile__("rdtsc" : "=a" (lower_32), "=d" (upper_32)); diff --git a/libvma.spec b/libvma.spec index 30e6282..f980af7 100644 --- a/libvma.spec +++ b/libvma.spec @@ -2,7 +2,7 @@ Name: libvma Version: 9.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A library for boosting TCP and UDP traffic (over RDMA hardware) License: GPLv2 or BSD @@ -11,6 +11,7 @@ Source0: https://github.com/Mellanox/libvma/archive/%{version}/%{name}-%{version Patch0: 0002-Update-systemctl-files.patch Patch1: 0003-Remove-30-libvma-limits.patch Patch2: 0004-Use-vmad-for-systemd.patch +Patch3: %{name}-gcc11.patch # libvma currently supports only the following architectures ExclusiveArch: x86_64 ppc64le ppc64 aarch64 @@ -101,6 +102,9 @@ install -D -m 644 contrib/scripts/vma.service $RPM_BUILD_ROOT/%{_prefix}/lib/sys %{_mandir}/man8/vma_stats.* %changelog +* Thu Dec 10 2020 Jeff Law 9.1.1-2 +- Don't use "register" in C++17. Still FTBFS though. + * Sun Nov 15 2020 Igor Ivanov 9.1.1-1 - Bump version to 9.1.1