Incl. fixes for libatomic

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

203f3060dd363361b172f7295f42bb6bf5ac0b3b.patch

@@ -0,0 +1,41 @@
+From 203f3060dd363361b172f7295f42bb6bf5ac0b3b Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@suse.de>
+Date: Sat, 23 Apr 2022 15:48:42 +0200
+Subject: [PATCH] riscv/linux: Don't add -latomic with -pthread
+
+Now that we have support for inline subword atomic operations, it is no
+longer necessary to link against libatomic.  This also fixes testsuite
+failures because the framework does not properly set up the linker flags
+for finding libatomic.
+The use of atomic operations is also independent of the use of libpthread.
+
+gcc/
+	* config/riscv/linux.h (LIB_SPEC): Don't redefine.
+---
+ gcc/config/riscv/linux.h | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
+index b9557a75dc7..2fdfd930cf2 100644
+--- a/gcc/config/riscv/linux.h
++++ b/gcc/config/riscv/linux.h
+@@ -35,16 +35,6 @@ along with GCC; see the file COPYING3.  If not see
+ #undef MUSL_DYNAMIC_LINKER
+ #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-riscv" XLEN_SPEC MUSL_ABI_SUFFIX ".so.1"
+ 
+-/* Because RISC-V only has word-sized atomics, it requries libatomic where
+-   others do not.  So link libatomic by default, as needed.  */
+-#undef LIB_SPEC
+-#ifdef LD_AS_NEEDED_OPTION
+-#define LIB_SPEC GNU_USER_TARGET_LIB_SPEC \
+-  " %{pthread:" LD_AS_NEEDED_OPTION " -latomic " LD_NO_AS_NEEDED_OPTION "}"
+-#else
+-#define LIB_SPEC GNU_USER_TARGET_LIB_SPEC " -latomic "
+-#endif
+-
+ #define ICACHE_FLUSH_FUNC "__riscv_flush_icache"
+ 
+ #define CPP_SPEC "%{pthread:-D_REENTRANT}"
+-- 
+2.39.1
+

gcc.spec

@@ -136,7 +136,7 @@
 Summary: Various compilers (C, C++, Objective-C, ...)
 Name: gcc
 Version: %{gcc_version}
-Release: %{gcc_release}.1.riscv64%{?dist}
+Release: %{gcc_release}.2.riscv64%{?dist}
 # libgcc, libgfortran, libgomp, libstdc++ and crtstuff have
 # GCC Runtime Exception.
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
@@ -294,6 +294,10 @@ Patch101: gcc13-fortran-flogical-as-integer.patch
 Patch102: gcc13-fortran-fdec-override-kind.patch
 Patch103: gcc13-fortran-fdec-non-logical-if.patch
 
+# RISCV (atomic)
+Patch150: 55088cf384d4c43e280ec794217e32fab64070ba.patch
+Patch151: 203f3060dd363361b172f7295f42bb6bf5ac0b3b.patch
+
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
 %ifnarch %{arm}
@@ -873,6 +877,11 @@ touch -r isl-0.24/m4/ax_prog_cxx_for_build.m4 isl-0.24/m4/ax_prog_cc_for_build.m
 %patch -P103 -p1 -b .fortran-fdec-non-logical-if~
 %endif
 
+%ifarch riscv64
+%patch -P150 -p1 -b .riscv-inline-atomics~
+%patch -P151 -p1 -b .riscv-nolibatomic-pthread~
+%endif
+
 %ifarch %{arm}
 rm -f gcc/testsuite/go.test/test/fixedbugs/issue19182.go
 %endif
@@ -3469,6 +3478,11 @@ end
 %endif
 
 %changelog
+* Thu May 18 2023 David Abdurachmanov <davidlt@rivosinc.com> 13.1.1-2.2.riscv64
+- On riscv64 include these backports to fix libatomic issues:
+  - 55088cf384d4c43e280ec794217e32fab64070ba (from gcc13 branch)
+  - 203f3060dd363361b172f7295f42bb6bf5ac0b3b (from master branch)
+
 * Sat May 13 2023 David Abdurachmanov <davidlt@rivosinc.com> 13.1.1-2.0.riscv64
 - Update config.{sub,guess} scripts for ISL
 - Fix annobin plugin Fedora version check