summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers/selinux/android-tools/android-tools/libunwind-debian')
-rw-r--r--dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/20150704-CVE-2015-3239_dwarf_i.h.patch14
-rw-r--r--dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/legacy_built-in_sync_functions.patch25
-rw-r--r--dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/series3
-rw-r--r--dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/user_pt_regs.patch23
4 files changed, 0 insertions, 65 deletions
diff --git a/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/20150704-CVE-2015-3239_dwarf_i.h.patch b/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/20150704-CVE-2015-3239_dwarf_i.h.patch
deleted file mode 100644
index cc1a8cb..0000000
--- a/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/20150704-CVE-2015-3239_dwarf_i.h.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Description: Fixes "20150704-CVE-2015-3239"
2Index: pkg-libunwind/include/dwarf_i.h
3===================================================================
4--- pkg-libunwind.orig/include/dwarf_i.h 2015-07-04 10:57:29.000000000 +0900
5+++ pkg-libunwind/include/dwarf_i.h 2015-07-04 11:06:08.675616821 +0900
6@@ -20,7 +20,7 @@
7 extern const uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH];
8 /* REG is evaluated multiple times; it better be side-effects free! */
9 # define dwarf_to_unw_regnum(reg) \
10- (((reg) <= DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
11+ (((reg) < DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
12 #endif
13
14 #ifdef UNW_LOCAL_ONLY
diff --git a/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/legacy_built-in_sync_functions.patch b/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/legacy_built-in_sync_functions.patch
deleted file mode 100644
index 8d78faa..0000000
--- a/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/legacy_built-in_sync_functions.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Description: Replace the legacy __sync built-in functions with __atomic ones
2 libunwind uses the built-in __sync_* functions which are deprecated by GCC and
3 should be replaced by __atomic_* ones. See the official manuals [1].
4 .
5 The legacy __sync functions do not require to specify the memory order but
6 __atomic ones do, so we choose the strongest one: __ATOMIC_SEQ_CST.
7 .
8 We do this because __sync_fetch_and_add() is not supported on armel.
9 .
10 [1]: https://gcc.gnu.org/onlinedocs/gcc/_005f_005fsync-Builtins.html
11Author: Kai-Chung Yan ()
12Last-Update: 2016-10-04
13--- a/include/libunwind_i.h
14+++ b/include/libunwind_i.h
15@@ -155,8 +155,8 @@
16 u.vp = addr;
17 return __sync_bool_compare_and_swap(u.vlp, (long) old, (long) new);
18 }
19-# define fetch_and_add1(_ptr) __sync_fetch_and_add(_ptr, 1)
20-# define fetch_and_add(_ptr, value) __sync_fetch_and_add(_ptr, value)
21+# define fetch_and_add1(_ptr) __atomic_fetch_add(_ptr, 1, __ATOMIC_SEQ_CST)
22+# define fetch_and_add(_ptr, value) __atomic_fetch_add(_ptr, value, __ATOMIC_SEQ_CST)
23 # define HAVE_CMPXCHG
24 # define HAVE_FETCH_AND_ADD
25 #endif
diff --git a/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/series b/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/series
deleted file mode 100644
index 9cac341..0000000
--- a/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/series
+++ /dev/null
@@ -1,3 +0,0 @@
1user_pt_regs.patch
2legacy_built-in_sync_functions.patch
320150704-CVE-2015-3239_dwarf_i.h.patch
diff --git a/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/user_pt_regs.patch b/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/user_pt_regs.patch
deleted file mode 100644
index 8051b6d..0000000
--- a/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/user_pt_regs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Author: Kai-Chung Yan <seamlikok@gmail.com>
2Last-Update: 2016-08-24
3Description: Manual definition of struct user_pt_regs
4 On ARM64, libunwind uses struct user_pt_regs which is not defined in
5 anywhere, which causes FTBFS.
6--- a/src/ptrace/_UPT_access_reg.c
7+++ b/src/ptrace/_UPT_access_reg.c
8@@ -26,6 +26,15 @@
9
10 #include "_UPT_internal.h"
11
12+#if defined(__aarch64__)
13+ struct user_pt_regs {
14+ __u64 regs[31];
15+ __u64 sp;
16+ __u64 pc;
17+ __u64 pstate;
18+ };
19+#endif
20+
21 #if UNW_TARGET_IA64
22 # include <elf.h>
23 # ifdef HAVE_ASM_PTRACE_OFFSETS_H