diff --git a/0009-riscv64-remove-flag-latomic.patch b/0009-riscv64-remove-flag-latomic.patch new file mode 100644 index 0000000000000000000000000000000000000000..a7a54b68625875f31580718340de92e6a6303111 --- /dev/null +++ b/0009-riscv64-remove-flag-latomic.patch @@ -0,0 +1,41 @@ +From a37ca95db184fb97c55a294449fe7622a5aecdda Mon Sep 17 00:00:00 2001 +From: laokz +Date: Tue, 18 Jul 2023 19:37:14 +0800 +Subject: [PATCH] riscv64: remove flag -latomic + +Because openEuler gcc already support inline subword atomic +for RISC-V, remove the redundant flag. +--- + Makefile.am | 3 --- + Makefile.in | 1 - + 2 files changed, 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index d64df5d..ba6cd48 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -41,9 +41,6 @@ memhog_LDADD = libnuma.la + + libnuma_la_SOURCES = libnuma.c syscall.c distance.c affinity.c affinity.h sysfs.c sysfs.h rtnetlink.c rtnetlink.h versions.ldscript + libnuma_la_LDFLAGS = -version-info 1:0:0 -Wl,--version-script,$(srcdir)/versions.ldscript -Wl,-init,numa_init -Wl,-fini,numa_fini +-if RISCV64 +-libnuma_la_LDFLAGS += -latomic +-endif + + check_PROGRAMS = \ + test/distance \ +diff --git a/Makefile.in b/Makefile.in +index 8cbad1c..a196ea0 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -95,7 +95,6 @@ target_triplet = @target@ + bin_PROGRAMS = numactl$(EXEEXT) numastat$(EXEEXT) numademo$(EXEEXT) \ + migratepages$(EXEEXT) migspeed$(EXEEXT) memhog$(EXEEXT) + @HAVE_TREE_VECTORIZE_TRUE@am__append_1 = -ftree-vectorize +-@RISCV64_TRUE@am__append_2 = -latomic + check_PROGRAMS = test/distance$(EXEEXT) test/ftok$(EXEEXT) \ + test/mbind_mig_pages$(EXEEXT) test/migrate_pages$(EXEEXT) \ + test/move_pages$(EXEEXT) test/mynode$(EXEEXT) \ +-- +2.40.1 + diff --git a/numactl.spec b/numactl.spec index d7e3cc73df53e598abc0db75046b7dcb94befb56..f2b53b1aca310c21f05c0983aec7c1070330ef11 100644 --- a/numactl.spec +++ b/numactl.spec @@ -1,6 +1,6 @@ Name: numactl Version: 2.0.16 -Release: 7 +Release: 8 Summary: Library for tuning for Non Uniform Memory Access machines License: GPLv2 URL: https://github.com/numactl/numactl @@ -15,6 +15,7 @@ Patch0005: 0005-numactl.c-Remove-unused-variable.patch Patch0006: 0006-numactl.c-Fix-merging-of-neighboring-pages-policies-.patch Patch0007: 0007-shm.c-Replace-stat64-fstat64-ftruncate64mmap64-with-.patch Patch0008: 0008-numastat-Update-system-hugepages-memory-info-from-sy.patch +Patch0009: 0009-riscv64-remove-flag-latomic.patch %description Simple NUMA policy support. It consists of a numactl program to run other @@ -83,6 +84,9 @@ LD_LIBRARY_PATH=$(pwd)/.libs make check %{_mandir}/man3/*.3* %changelog +* Wed Jul 19 2023 laokz - 2.0.16-8 +- Makefile: remove redundant -latomic flag for riscv64 + * Sun Jun 25 2023 wuxu - 2.0.16-7 - numastat: Update system hugepages memory info from sysfs/node/hugepages directory