1 files changed, 3 insertions, 51 deletions
diff --git a/newlib/libc/include/machine/setjmp.h b/newlib/libc/include/machine/setjmp.h
index b74808f9c..7f35ef61d 100644
--- a/newlib/libc/include/machine/setjmp.h
+++ b/newlib/libc/include/machine/setjmp.h
@@ -9,10 +9,6 @@ _BEGIN_STD_C
 #define _JBLEN 23
 #endif
 
-#if defined(__AVR__)
-#define _JBLEN 24
-#endif
-
 #ifdef __sparc__
 /*
  * onsstack,sigmask,sp,pc,npc,psr,g1,o0,wbcnt (sigcontext).
@@ -90,7 +86,7 @@ _BEGIN_STD_C
 
 #ifdef __H8300__
 #define _JBLEN 5
-#define _JBTYPE int
+typedef int jmp_buf[_JBLEN];
 #endif
 
 #ifdef __H8300H__
@@ -99,7 +95,7 @@ _BEGIN_STD_C
 #define _JBTYPE long
 #endif
 
-#if defined (__H8300S__) || defined (__H8300SX__)
+#ifdef __H8300S__
 /* same as H8/300 but registers are twice as big */
 #define _JBLEN 5
 #define _JBTYPE long
@@ -178,10 +174,6 @@ _BEGIN_STD_C
 #define _JBTYPE double
 #endif
 
-#ifdef __CRX__
-#define _JBLEN 9
-#endif
-
 #ifdef __fr30__
 #define _JBLEN 10
 #endif
@@ -200,35 +192,17 @@ _BEGIN_STD_C
 #define _JBTYPE unsigned long
 #endif
 
-#ifdef __mt__
-#define _JBLEN 16
-#endif
-
 #ifdef __xstormy16__
 /* 4 GPRs plus SP plus PC. */
 #define _JBLEN 8
 #endif
 
-#ifdef __CRIS__
-#define _JBLEN 18
-#endif
-
-#ifdef __m32c__
-#if defined(__r8c_cpu__) || defined(__m16c_cpu__)
-#define _JBLEN (22/2)
-#else
-#define _JBLEN (34/2)
-#endif
-#define _JBTYPE unsigned short
-#endif /* __m32c__ */
-
 #ifdef _JBLEN
 #ifdef _JBTYPE
 typedef	_JBTYPE jmp_buf[_JBLEN];
 #else
 typedef	int jmp_buf[_JBLEN];
 #endif
-#endif
 
 _END_STD_C
 
@@ -249,27 +223,6 @@ typedef int sigjmp_buf[_JBLEN+2];
 # define _CYGWIN_WORKING_SIGSETJMP
 #endif
 
-#if defined(__GNUC__)
-
-#define sigsetjmp(env, savemask) \
-            ({ \
-              sigjmp_buf *_sjbuf = &(env); \
-              ((*_sjbuf)[_SAVEMASK] = savemask,\
-              sigprocmask (SIG_SETMASK, 0, (sigset_t *)((*_sjbuf) + _SIGMASK)),\
-              setjmp (*_sjbuf)); \
-            })
-
-#define siglongjmp(env, val) \
-            ({ \
-              sigjmp_buf *_sjbuf = &(env); \
-              ((((*_sjbuf)[_SAVEMASK]) ? \
-               sigprocmask (SIG_SETMASK, (sigset_t *)((*_sjbuf) + _SIGMASK), 0)\
-               : 0), \
-               longjmp (*_sjbuf, val)); \
-            })
-
-#else /* !__GNUC__ */
-
 #define sigsetjmp(env, savemask) ((env)[_SAVEMASK] = savemask,\
                sigprocmask (SIG_SETMASK, 0, (sigset_t *) ((env) + _SIGMASK)),\
                setjmp (env))
@@ -278,9 +231,8 @@ typedef int sigjmp_buf[_JBLEN+2];
                sigprocmask (SIG_SETMASK, (sigset_t *) ((env) + _SIGMASK), 0):0),\
                longjmp (env, val))
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif
 #endif /* __CYGWIN__ or __rtems__ */
+#endif