up to 1.3.1

diff --git a/arm32-reloc.patch b/arm32-reloc.patch
deleted file mode 100644 (file)
index c7c55c0..0000000
--- a/arm32-reloc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 52943009b7dce4a0ebb5943092d47e6e33625401 Mon Sep 17 00:00:00 2001
-From: Rui Ueyama <ruiu@bluewhale.systems>
-Date: Sun, 19 Jun 2022 11:28:37 +0800
-Subject: [PATCH] [ELF] Handle R_ARM_MOVT_PREL and R_ARM_PREL31 as
- non-address-taking relocations
-
-This is an attempt to fix https://github.com/rui314/mold/issues/545 though
-I don't know if this is a correct fix.
----
- elf/arch-arm32.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/elf/arch-arm32.cc b/elf/arch-arm32.cc
-index 65a9dede..1b94e931 100644
---- a/elf/arch-arm32.cc
-+++ b/elf/arch-arm32.cc
-@@ -427,7 +427,7 @@ void InputSection<E>::scan_relocations(Context<E> &ctx) {
-     case R_ARM_PREL31: {
-       Action table[][4] = {
-         // Absolute  Local    Imported data  Imported code
--        {  ERROR,    NONE,    ERROR,         ERROR },      // DSO
-+        {  ERROR,    NONE,    ERROR,         PLT   },      // DSO
-         {  ERROR,    NONE,    COPYREL,       PLT   },      // PIE
-         {  NONE,     NONE,    COPYREL,       PLT   },      // PDE
-       };

diff --git a/atomic.patch b/atomic.patch
deleted file mode 100644 (file)
index 032b2be..0000000
--- a/atomic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.
- # 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 f39009b6718ef90fc6b2bc1be642e1c65e60cc86..9e228390655763b7356f62e055847c20fbe27e26 100644 (file)
--- a/mold.spec
+++ b/mold.spec
@@ -4,14 +4,12 @@
 
 Summary:       mold: A Modern Linker
 Name:          mold
-Version:       1.3.0
+Version:       1.3.1
 Release:       1
 License:       GPL v3+
 Group:         Development/Libraries
 Source0:       https://github.com/rui314/mold/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: f7ed6a7246e6ef945494f51e70072ad4
-Patch0:                atomic.patch
-Patch1:                arm32-reloc.patch
+# Source0-md5: caeec8fadaea5fcee6e8783534087275
 URL:           https://github.com/rui314/mold
 %{?with_tests:BuildRequires:   glibc-static}
 %ifarch %{armv6} riscv64
@@ -38,8 +36,6 @@ especially in rapid debug-edit-rebuild cycles.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %{__rm} -r third-party/{mimalloc,tbb}