- Bump to dd36656ada05731c069ecd5b1878380294fb1f3e, git7364.

* Includes the RISC-V atomic changes
- Remove riscv-atomic.patch and riscv-pthread.patch now included
- Make libstdc++6-devel packages own their directories since they
  can be installed standalone.  [bsc#1211427]

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc13?expand=0&rev=46

cross-aarch64-gcc13-bootstrap.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-aarch64-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-amdgcn-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-arm-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-arm-none-gcc13-bootstrap.spec

@@ -108,7 +108,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,8 +134,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -336,8 +334,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-arm-none-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-avr-gcc13-bootstrap.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-avr-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-bpf-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-epiphany-gcc13-bootstrap.spec

@@ -108,7 +108,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,8 +134,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -336,8 +334,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-epiphany-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-hppa-gcc13-bootstrap.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-hppa-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-m68k-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-mips-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-nvptx-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-ppc64-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-ppc64le-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-pru-gcc13-bootstrap.spec

@@ -108,7 +108,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,8 +134,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -336,8 +334,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-pru-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-riscv64-elf-gcc13-bootstrap.spec

@@ -108,7 +108,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,8 +134,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -336,8 +334,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-riscv64-elf-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-riscv64-gcc13-bootstrap.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-riscv64-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-rx-gcc13-bootstrap.spec

@@ -108,7 +108,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -134,8 +134,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -336,8 +334,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-rx-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-s390x-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-sparc-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-sparc64-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

cross-x86_64-gcc13.spec

@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -133,8 +133,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -335,8 +333,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

gcc-13.1.1+git7256.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dbed814f4ff143ad4d4cfc53a3ccdce5b5ff12de30f856dc262290d4f0dc4911
-size 87952832

gcc-13.1.1+git7364.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a3368bca3b7d5e231bd20d12fd75869aaea08373b8863668c37d22611b8639d7
+size 87100668

gcc.spec.in

@@ -204,7 +204,7 @@
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:          https://gcc.gnu.org/
-Version: 13.1.1+git7256
+Version: 13.1.1+git7364
 Release:      1
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -385,8 +385,6 @@ Patch17:	gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:	gcc10-amdgcn-llvm-as.patch
 Patch19:	gcc11-gdwarf-4-default.patch
 Patch20:	gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:	gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -1346,8 +1344,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -2549,6 +2545,9 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc@base_ver@-locale.lang
 
 %files -n libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix}
 %defattr(-,root,root)
+%dir %{_libdir}/gcc
+%dir %{_libdir}/gcc/%{GCCDIST}
+%dir %{libsubdir}
 %versmainlib libstdc++.a
 %versmainlib libstdc++fs.a
 %versmainlib libstdc++exp.a
@@ -2568,6 +2567,9 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc@base_ver@-locale.lang
 %if %{separate_biarch}
 %files -n libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix}%{separate_biarch_suffix}
 %defattr(-,root,root)
+%dir %{_libdir}/gcc
+%dir %{_libdir}/gcc/%{GCCDIST}
+%dir %{libsubdir}
 %versbiarchlib libstdc++.a
 %versbiarchlib libstdc++fs.a
 %versbiarchlib libstdc++exp.a

gcc13-testresults.spec

@@ -221,7 +221,7 @@
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -401,8 +401,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -537,8 +535,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1

gcc13.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon May 22 09:05:30 UTC 2023 - Richard Biener <rguenther@suse.com>
+
+- Bump to dd36656ada05731c069ecd5b1878380294fb1f3e, git7364.
+  * Includes the RISC-V atomic changes
+- Remove riscv-atomic.patch and riscv-pthread.patch now included
+- Make libstdc++6-devel packages own their directories since they
+  can be installed standalone.  [bsc#1211427]
+
 -------------------------------------------------------------------
 Thu Apr 27 07:29:05 UTC 2023 - Richard Biener <rguenther@suse.com>
 

gcc13.spec

@@ -200,7 +200,7 @@
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7256
+Version:        13.1.1+git7364
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -380,8 +380,6 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
-Patch21:        riscv-atomic.patch
-Patch22:        riscv-pthread.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -2354,8 +2352,6 @@ ln -s newlib-4.3.0.20230120/newlib .
 %patch18 -p1
 %patch20 -p1
 %endif
-%patch21 -p1
-%patch22 -p1
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
 %patch19 -p1
@@ -3549,6 +3545,9 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc13-locale.lang
 
 %files -n libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix}
 %defattr(-,root,root)
+%dir %{_libdir}/gcc
+%dir %{_libdir}/gcc/%{GCCDIST}
+%dir %{libsubdir}
 %versmainlib libstdc++.a
 %versmainlib libstdc++fs.a
 %versmainlib libstdc++exp.a
@@ -3568,6 +3567,9 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc13-locale.lang
 %if %{separate_biarch}
 %files -n libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix}%{separate_biarch_suffix}
 %defattr(-,root,root)
+%dir %{_libdir}/gcc
+%dir %{_libdir}/gcc/%{GCCDIST}
+%dir %{libsubdir}
 %versbiarchlib libstdc++.a
 %versbiarchlib libstdc++fs.a
 %versbiarchlib libstdc++exp.a

riscv-pthread.patch

@@ -1,33 +0,0 @@
-From 79dc619188c0b42ae7a329c6abe50dee19000895 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@suse.de>
-Date: Sat, 23 Apr 2022 15:48:42 +0200
-Subject: [PATCH] Don't add -latomic with -pthread
-
----
- 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.40.0
-