From acc7443a4feb0aa098f12207f2da44c21d382e66 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Tue, 26 Jul 2016 21:32:47 +0200
Subject: deduplicate jmpbuf-unwind.h

Reviewed-by: Max Filippov <jcmvbkbc@gmail.com>
---
 libc/sysdeps/linux/metag/bits/setjmp.h    | 10 ----------
 libc/sysdeps/linux/metag/jmpbuf-offsets.h |  7 +++++++
 libc/sysdeps/linux/metag/jmpbuf-unwind.h  |  8 +++++---
 3 files changed, 12 insertions(+), 13 deletions(-)
 create mode 100644 libc/sysdeps/linux/metag/jmpbuf-offsets.h

(limited to 'libc/sysdeps/linux/metag')

diff --git a/libc/sysdeps/linux/metag/bits/setjmp.h b/libc/sysdeps/linux/metag/bits/setjmp.h
index 8ad4b12d2..d80a355b0 100644
--- a/libc/sysdeps/linux/metag/bits/setjmp.h
+++ b/libc/sysdeps/linux/metag/bits/setjmp.h
@@ -28,17 +28,7 @@
    */
 
 #define _JBLEN 24
-#if     defined (__USE_MISC) || defined (_ASM)
-#define JB_SP 0
-#endif
 
-#ifndef	_ASM
 typedef int __jmp_buf[_JBLEN] __attribute__((aligned (8)));
-#endif
-
-/* Test if longjmp to JMPBUF would unwind the frame
-   containing a local variable at ADDRESS.  */
-#define _JMPBUF_UNWINDS(jmpbuf, address) \
-  ((void *) (address) > (void *) (jmpbuf)[JB_SP])
 
 #endif	/* bits/setjmp.h */
diff --git a/libc/sysdeps/linux/metag/jmpbuf-offsets.h b/libc/sysdeps/linux/metag/jmpbuf-offsets.h
new file mode 100644
index 000000000..e4faf4206
--- /dev/null
+++ b/libc/sysdeps/linux/metag/jmpbuf-offsets.h
@@ -0,0 +1,7 @@
+/*
+ * Copyright (C) 2013, Imagination Technologies Ltd.
+ *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ */
+
+#define JB_SP 0
diff --git a/libc/sysdeps/linux/metag/jmpbuf-unwind.h b/libc/sysdeps/linux/metag/jmpbuf-unwind.h
index 175cd7ab0..bf791413b 100644
--- a/libc/sysdeps/linux/metag/jmpbuf-unwind.h
+++ b/libc/sysdeps/linux/metag/jmpbuf-unwind.h
@@ -1,14 +1,16 @@
 /*
+ * Copyright (C) 2013, Imagination Technologies Ltd.
+ *
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
 #include <setjmp.h>
+#include <jmpbuf-offsets.h>
 
 /* Test if longjmp to JMPBUF would unwind the frame
    containing a local variable at ADDRESS.  */
-#undef _JMPBUF_UNWINDS
-#define _JMPBUF_UNWINDS(jmpbuf, address, demangle) \
-  ((void *) (address) > (void *) demangle (jmpbuf[JB_SP]))
+#define _JMPBUF_UNWINDS(jmpbuf, address) \
+  ((void *) (address) > (void *) jmpbuf[JB_SP])
 
 #ifdef __UCLIBC_HAS_THREADS_NATIVE__
 #include <stdint.h>
-- 
cgit v1.2.3