From 4f192f39388f71cfa6cfddad0351b999b8af1456 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Mon, 18 Apr 2022 15:14:22 +0200 Subject: [PATCH] link with libatomic on %{armv6} --- atomic.patch | 11 +++++++++++ mold.spec | 7 +++++++ 2 files changed, 18 insertions(+) create mode 100644 atomic.patch diff --git a/atomic.patch b/atomic.patch new file mode 100644 index 0000000..3b6bfbe --- /dev/null +++ b/atomic.patch @@ -0,0 +1,11 @@ +--- mold-1.2.0/Makefile.orig 2022-04-15 11:08:14.000000000 +0200 ++++ mold-1.2.0/Makefile 2022-04-18 15:00:15.960428924 +0200 +@@ -110,7 +110,7 @@ + # '-latomic' flag is needed building on riscv64 system + # RV32 system doesn't tested yet + # seems like '-atomic' would be better but not working. +-ifeq ($(ARCH), riscv64) ++ifneq (,$(filter armv6% riscv64, $(ARCH))) + MOLD_LDFLAGS += -latomic + endif + diff --git a/mold.spec b/mold.spec index f6ea147..c00c253 100644 --- a/mold.spec +++ b/mold.spec @@ -6,11 +6,16 @@ License: GPL v3+ Group: Development/Libraries Source0: https://github.com/rui314/mold/archive/v%{version}/%{name}-%{version}.tar.gz # Source0-md5: 6e9dba635bd3ed1d39a8fe6411a2005e +Patch0: atomic.patch URL: https://github.com/rui314/mold +%ifarch %{armv6} riscv64 +BuildRequires: libatomic-devel +%endif BuildRequires: libstdc++-devel >= 6:10 BuildRequires: mimalloc-devel >= 1.7 BuildRequires: openssl-devel BuildRequires: pkgconfig +BuildRequires: rpmbuild(macros) >= 2.007 BuildRequires: tbb-devel >= 2021.3.0 BuildRequires: zlib-devel Requires: mimalloc >= 1.7 @@ -27,11 +32,13 @@ especially in rapid debug-edit-rebuild cycles. %prep %setup -q +%patch0 -p1 %{__rm} -r third-party/{mimalloc,tbb} %build %{__make} \ + ARCH="%{_target_cpu}" \ CC="%{__cc}" \ CXX="%{__cxx}" \ CFLAGS="%{rpmcppflags} %{rpmcflags}" \ -- 2.43.0