New Upstream Release - android-platform-external-libunwind
Ready changes
Summary
Merged new upstream version: 11.0.0+r48 (was: 10.0.0+r36).
Resulting package
Built on 2022-04-22T12:54 (took 8m56s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases android-libunwind-dbgsymapt install -t fresh-releases android-libunwind-devapt install -t fresh-releases android-libunwind
Lintian Result
- android-libunwind-dbgsym_11.0.0+r48-1~jan+nur1_amd64.deb
- android-libunwind-dev_11.0.0+r48-1~jan+nur1_amd64.deb
- android-libunwind_11.0.0+r48-1~jan+nur1_amd64.deb
- android-platform-external-libunwind_11.0.0+r48-1~jan+nur1.dsc
- android-platform-external-libunwind_11.0.0+r48-1~jan+nur1_amd64.buildinfo
- android-platform-external-libunwind_11.0.0+r48-1~jan+nur1_amd64.changes
Diff
diff --git a/Android.bp b/Android.bp
index dbdb2f3..d112d6b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -398,10 +398,6 @@ cc_defaults {
},
target: {
- linux_glibc: {
- // Remove dependencies on libgcc
- ldflags: ["-nostdlib"],
- },
linux_bionic: {
enabled: true,
},
@@ -423,6 +419,7 @@ cc_library_static {
name: "libunwind_static",
defaults: ["libunwind_core_defaults"],
vendor_available: true,
+ native_bridge_supported: true,
}
//-----------------------------------------------------------------------
@@ -432,6 +429,7 @@ cc_library_static {
name: "libunwindbacktrace",
defaults: ["libunwind_defaults"],
vendor_available: true,
+ native_bridge_supported: true,
sdk_version: "21",
srcs: [
"src/unwind/BacktraceWrapper.c",
diff --git a/debian/changelog b/debian/changelog
index 44c6bbd..962df79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+android-platform-external-libunwind (11.0.0+r48-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Fri, 22 Apr 2022 12:47:03 -0000
+
android-platform-external-libunwind (10.0.0+r36-4) unstable; urgency=medium
* update included 7z headers
diff --git a/debian/patches/20150704-CVE-2015-3239_dwarf_i.h.patch b/debian/patches/20150704-CVE-2015-3239_dwarf_i.h.patch
index cc1a8cb..8bd002f 100644
--- a/debian/patches/20150704-CVE-2015-3239_dwarf_i.h.patch
+++ b/debian/patches/20150704-CVE-2015-3239_dwarf_i.h.patch
@@ -1,8 +1,8 @@
Description: Fixes "20150704-CVE-2015-3239"
-Index: pkg-libunwind/include/dwarf_i.h
+Index: android-platform-external-libunwind/include/dwarf_i.h
===================================================================
---- pkg-libunwind.orig/include/dwarf_i.h 2015-07-04 10:57:29.000000000 +0900
-+++ pkg-libunwind/include/dwarf_i.h 2015-07-04 11:06:08.675616821 +0900
+--- android-platform-external-libunwind.orig/include/dwarf_i.h
++++ android-platform-external-libunwind/include/dwarf_i.h
@@ -20,7 +20,7 @@
extern const uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH];
/* REG is evaluated multiple times; it better be side-effects free! */
diff --git a/debian/patches/legacy_built-in_sync_functions.patch b/debian/patches/legacy_built-in_sync_functions.patch
index 8d78faa..3ac2e0c 100644
--- a/debian/patches/legacy_built-in_sync_functions.patch
+++ b/debian/patches/legacy_built-in_sync_functions.patch
@@ -10,9 +10,11 @@ Description: Replace the legacy __sync built-in functions with __atomic ones
[1]: https://gcc.gnu.org/onlinedocs/gcc/_005f_005fsync-Builtins.html
Author: Kai-Chung Yan ()
Last-Update: 2016-10-04
---- a/include/libunwind_i.h
-+++ b/include/libunwind_i.h
-@@ -155,8 +155,8 @@
+Index: android-platform-external-libunwind/include/libunwind_i.h
+===================================================================
+--- android-platform-external-libunwind.orig/include/libunwind_i.h
++++ android-platform-external-libunwind/include/libunwind_i.h
+@@ -155,8 +155,8 @@ cmpxchg_ptr (void *addr, void *old, void
u.vp = addr;
return __sync_bool_compare_and_swap(u.vlp, (long) old, (long) new);
}
diff --git a/debian/patches/user_pt_regs.patch b/debian/patches/user_pt_regs.patch
index 8051b6d..4bf8ac5 100644
--- a/debian/patches/user_pt_regs.patch
+++ b/debian/patches/user_pt_regs.patch
@@ -3,9 +3,11 @@ Last-Update: 2016-08-24
Description: Manual definition of struct user_pt_regs
On ARM64, libunwind uses struct user_pt_regs which is not defined in
anywhere, which causes FTBFS.
---- a/src/ptrace/_UPT_access_reg.c
-+++ b/src/ptrace/_UPT_access_reg.c
-@@ -26,6 +26,15 @@
+Index: android-platform-external-libunwind/src/ptrace/_UPT_access_reg.c
+===================================================================
+--- android-platform-external-libunwind.orig/src/ptrace/_UPT_access_reg.c
++++ android-platform-external-libunwind/src/ptrace/_UPT_access_reg.c
+@@ -26,6 +26,15 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
#include "_UPT_internal.h"