.gc.metadata

@@ -1 +1 @@
-4b8b24534f469b64ff4bc2332a9bdf8bef8bf1d4 SOURCES/gc-8.0.4.tar.gz
+1a3f91a6ea004dcd1f5fc93defcdb2c2bc0c3941 SOURCES/gc-7.6.4.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/gc-8.0.4.tar.gz
+SOURCES/gc-7.6.4.tar.gz

SOURCES/0001-Add-initial-RISC-V-support.patch

@@ -0,0 +1,52 @@
+diff -ur gc-7.6.4.old/include/private/gcconfig.h gc-7.6.4.new/include/private/gcconfig.h
+--- gc-7.6.4.old/include/private/gcconfig.h	2018-01-26 13:16:17.000000000 +0000
++++ gc-7.6.4.new/include/private/gcconfig.h	2018-02-27 09:33:05.840680540 +0000
+@@ -602,6 +602,15 @@
+ #   define I386
+ #   define mach_type_known
+ # endif
++# if defined(__riscv) && defined(LINUX)
++#   if __riscv_xlen == 32
++#     define RISCV32
++#     define mach_type_known
++#   elif __riscv_xlen == 64
++#     define RISCV64
++#     define mach_type_known
++#   endif
++# endif
+ 
+ /* Feel free to add more clauses here */
+ 
+@@ -2650,6 +2659,32 @@
+ #   endif
+ # endif
+ 
++# ifdef RISCV32
++#   define CPP_WORDSZ 32
++#   define MACH_TYPE "RISC-V32"
++#   define ALIGNMENT 4
++#   ifdef LINUX
++#     define OS_TYPE "LINUX"
++      extern int __data_start[];
++#     define DATASTART ((ptr_t)__data_start)
++#     define LINUX_STACKBOTTOM
++#     define DYNAMIC_LOADING
++#   endif
++# endif /* RISCV32 */
++
++# ifdef RISCV64
++#   define CPP_WORDSZ 64
++#   define MACH_TYPE "RISC-V64"
++#   define ALIGNMENT 8
++#   ifdef LINUX
++#     define OS_TYPE "LINUX"
++      extern int __data_start[];
++#     define DATASTART ((ptr_t)__data_start)
++#     define LINUX_STACKBOTTOM
++#     define DYNAMIC_LOADING
++#   endif
++# endif /* RISCV64 */
++
+ #if defined(__GLIBC__) && !defined(DONT_USE_LIBC_PRIVATES)
+   /* Use glibc's stack-end marker. */
+ # define USE_LIBC_PRIVATES

SOURCES/0001-Merge-RISCV-32-64-bit-configurations-definition.patch

@@ -0,0 +1,56 @@
+diff -ur gc-7.6.4.old/include/private/gcconfig.h gc-7.6.4/include/private/gcconfig.h
+--- gc-7.6.4.old/include/private/gcconfig.h	2018-02-27 09:35:01.074561443 +0000
++++ gc-7.6.4/include/private/gcconfig.h	2018-02-27 09:35:38.571522689 +0000
+@@ -603,13 +603,8 @@
+ #   define mach_type_known
+ # endif
+ # if defined(__riscv) && defined(LINUX)
+-#   if __riscv_xlen == 32
+-#     define RISCV32
+-#     define mach_type_known
+-#   elif __riscv_xlen == 64
+-#     define RISCV64
+-#     define mach_type_known
+-#   endif
++#   define RISCV
++#   define mach_type_known
+ # endif
+ 
+ /* Feel free to add more clauses here */
+@@ -2659,23 +2654,10 @@
+ #   endif
+ # endif
+ 
+-# ifdef RISCV32
+-#   define CPP_WORDSZ 32
+-#   define MACH_TYPE "RISC-V32"
+-#   define ALIGNMENT 4
+-#   ifdef LINUX
+-#     define OS_TYPE "LINUX"
+-      extern int __data_start[];
+-#     define DATASTART ((ptr_t)__data_start)
+-#     define LINUX_STACKBOTTOM
+-#     define DYNAMIC_LOADING
+-#   endif
+-# endif /* RISCV32 */
+-
+-# ifdef RISCV64
+-#   define CPP_WORDSZ 64
+-#   define MACH_TYPE "RISC-V64"
+-#   define ALIGNMENT 8
++# ifdef RISCV
++#   define MACH_TYPE "RISC-V"
++#   define CPP_WORDSZ __riscv_xlen /* 32 or 64 */
++#   define ALIGNMENT (CPP_WORDSZ/8)
+ #   ifdef LINUX
+ #     define OS_TYPE "LINUX"
+       extern int __data_start[];
+@@ -2683,7 +2665,7 @@
+ #     define LINUX_STACKBOTTOM
+ #     define DYNAMIC_LOADING
+ #   endif
+-# endif /* RISCV64 */
++# endif /* RISCV */
+ 
+ #if defined(__GLIBC__) && !defined(DONT_USE_LIBC_PRIVATES)
+   /* Use glibc's stack-end marker. */

SPECS/gc.spec

@@ -1,8 +1,8 @@
 
 Summary: A garbage collector for C and C++
 Name:    gc
-Version: 8.0.4
+Version: 7.6.4
-Release: 7%{?dist}
+Release: 3%{?dist}
 
 License: BSD
 Url:     http://www.hboehm.info/gc/
@@ -11,6 +11,10 @@ Source0: http://www.hboehm.info/gc/gc_source/gc-%{version}%{?pre}.tar.gz
 ## upstreamable patches
 
 ## upstream patches
+# Upstream commit 4f7f0eebd24dcde9f2b3ec2cb98913fc39bbdda3.
+Patch1: 0001-Add-initial-RISC-V-support.patch
+# Upstream commit 3b008f79ee29dbd0d61cf163d20eee21412df95b.
+Patch2: 0001-Merge-RISCV-32-64-bit-configurations-definition.patch
 
 ## downstream patches
 # https://bugzilla.redhat.com/show_bug.cgi?id=1551671
@@ -18,10 +22,8 @@ Patch100: gc-7.6.4-dont_disable_exceptions.patch
 
 BuildRequires: automake libtool
 BuildRequires: gcc-c++
-## https://www.hboehm.info/gc/ says: "Starting with 8.0, libatomic_ops is only required if the compiler does not understand C atomics."
+BuildRequires: pkgconfig(atomic_ops) >= 7.4
-#BuildRequires: pkgconfig(atomic_ops) >= 7.4
 BuildRequires: pkgconfig
-BuildRequires: make
 
 # rpmforge compatibility
 Obsoletes: libgc < %{version}-%{release}
@@ -49,7 +51,7 @@ Provides:  libgc-devel = %{version}-%{release}
 rm -f libtool libtool.m4
 autoreconf -i -f
 
-# see https://bugzilla.redhat.com/689877
+# see bugzilla.redhat.com/689877
 CPPFLAGS="-DUSE_GET_STACKBASE_FOR_MAIN"; export CPPFLAGS
 
 %configure \
@@ -62,11 +64,11 @@ CPPFLAGS="-DUSE_GET_STACKBASE_FOR_MAIN"; export CPPFLAGS
 %endif
   --enable-threads=posix
 
-%make_build
+%{make_build}
 
 
 %install
-%make_install
+%{make_install}
 
 install -p -D -m644 doc/gc.man  %{buildroot}%{_mandir}/man3/gc.3
 
@@ -96,7 +98,7 @@ make check %{?arch_ignore}
 
 %files devel
 %doc doc/README.environment doc/README.linux
-%doc doc/*.md
+%doc doc/*.html
 %{_includedir}/gc.h
 %{_includedir}/gc_cpp.h
 %{_includedir}/gc/
@@ -108,38 +110,6 @@ make check %{?arch_ignore}
 
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 8.0.4-7
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 8.0.4-6
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jan 15 2020 Rex Dieter <rdieter@fedoraproject.org> - 8.0.4-2
-- drop libatomic_ops dep
-
-* Wed Jan 15 2020 Rex Dieter <rdieter@fedoraproject.org> - 8.0.4-1
-- 8.0.4
-- %%build: --with-libatomic-ops=yes
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.6.4-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.6.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.6.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Wed Mar 14 2018 Rex Dieter <rdieter@fedoraproject.org> - 7.6.4-3
 - gc: Effectively overrides -fexceptions flag  (#1551671)
 - move autoreconf to %%build