From 535b5c9a0797490d3ad92c159d7679cd24ef2c04 Mon Sep 17 00:00:00 2001
From: Packit Service <user-cont-team+packit-service@redhat.com>
Date: Dec 09 2020 13:45:37 +0000
Subject: Prepare for a new update


Reverting patches so we can apply the latest update
and changes can be seen in the spec file and sources.

---

diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index ef9f9e2..ffbdc14 100644
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -602,10 +602,6 @@
 #   define I386
 #   define mach_type_known
 # endif
-# if defined(__riscv) && defined(LINUX)
-#   define RISCV
-#   define mach_type_known
-# endif
 
 /* Feel free to add more clauses here */
 
@@ -2654,19 +2650,6 @@
 #   endif
 # endif
 
-# 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[];
-#     define DATASTART ((ptr_t)__data_start)
-#     define LINUX_STACKBOTTOM
-#     define DYNAMIC_LOADING
-#   endif
-# endif /* RISCV */
-
 #if defined(__GLIBC__) && !defined(DONT_USE_LIBC_PRIVATES)
   /* Use glibc's stack-end marker. */
 # define USE_LIBC_PRIVATES
diff --git a/pthread_start.c b/pthread_start.c
index eb3d3cb..bd4fc4a 100644
--- a/pthread_start.c
+++ b/pthread_start.c
@@ -22,7 +22,7 @@
 /* case at the top of the file.  FIXME: it's still unclear whether this */
 /* will actually cause the exit handler to be invoked last when         */
 /* thread_exit is called (and if -fexceptions is used).                 */
-#if 0 && defined(__GNUC__) && defined(__linux__)
+#if defined(__GNUC__) && defined(__linux__)
   /* We undefine __EXCEPTIONS to avoid using GCC __cleanup__ attribute. */
   /* The current NPTL implementation of pthread_cleanup_push uses       */
   /* __cleanup__ attribute when __EXCEPTIONS is defined (-fexceptions). */