Skip to content

Commit 4873773

Browse files
giordanogiordano
authored
[deps] Add patch for libunwind to fix warnings on aarch64-linux (JuliaLang#45729)
1 parent a375fe8 commit 4873773

File tree

5 files changed

+138
-27
lines changed

5 files changed

+138
-27
lines changed

‎deps/Versions.make‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ LIBSUITESPARSE_JLL_NAME := SuiteSparse
109109
UNWIND_VER := 1.5.0
110110
UNWIND_VER_TAG := 1.5
111111
UNWIND_JLL_NAME := LibUnwind
112-
UNWIND_JLL_VER := 1.5.0+1
113112

114113
# zlib
115114
ZLIB_VER := 1.2.12

‎deps/checksums/unwind‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
LibUnwind.v1.5.0+1.aarch64-linux-gnu.tar.gz/md5/4f27fbe5a0e0897d75e3690e2f24c10b
2-
LibUnwind.v1.5.0+1.aarch64-linux-gnu.tar.gz/sha512/fad4ac07121823859bf6af322c0d3b52b353b1e7b2a12611dc14bfc18663fc4278a4eab61653b306bf07abfff8dc92ef07d55b24117d8ccc5a8662139b5301a1
3-
LibUnwind.v1.5.0+1.aarch64-linux-musl.tar.gz/md5/730455d3e334b61e9232f978a5ba9841
4-
LibUnwind.v1.5.0+1.aarch64-linux-musl.tar.gz/sha512/64a04b6d362774c5dc9534a49b58ea676cb514fc10ce0747cd79d5319841e9b0695701c631a2598499d2fa888d36a89f0560f7910d01fa4c7e2fc223a2143a8d
5-
LibUnwind.v1.5.0+1.armv6l-linux-gnueabihf.tar.gz/md5/e335c0eb5fd97e870400f472ed163722
6-
LibUnwind.v1.5.0+1.armv6l-linux-gnueabihf.tar.gz/sha512/4211fa7a4a08631a335a327cda511272527ff590507819dc9ee89ec1db7a7603c1ce9dcfcb22950acb4246fef297493eccd5260fb76d9929c84cc9c755381849
7-
LibUnwind.v1.5.0+1.armv6l-linux-musleabihf.tar.gz/md5/d8b094c08d496b45cf5e4f6f964caa43
8-
LibUnwind.v1.5.0+1.armv6l-linux-musleabihf.tar.gz/sha512/0fe159785b8f35ae5b8301754ed244f687156a9565fe2d6d6c72e8b4e0c04c26183079b69093ab4fec9de4bd8b69d248a1569d8fc539ef04787ed09d36e41bdd
9-
LibUnwind.v1.5.0+1.armv7l-linux-gnueabihf.tar.gz/md5/55289aa21e11f8fa3867dd650f863b2d
10-
LibUnwind.v1.5.0+1.armv7l-linux-gnueabihf.tar.gz/sha512/e669616bc1be3b34552b9927279e0b43df1e5ab0e72659a9e128d894df6b46d10f7d72b30eb5ad3355f01776a5f5250195633b846747fdbaefd2ac69915157fc
11-
LibUnwind.v1.5.0+1.armv7l-linux-musleabihf.tar.gz/md5/5a99cca618b56961b7108c618f8704c4
12-
LibUnwind.v1.5.0+1.armv7l-linux-musleabihf.tar.gz/sha512/7465262f611ff347fa57a910019e4a243451d801edf1fd9bb19a5f2ab9e9b84885da26781af18c1405347918e74b21b4f0a308d938cd3198b6260e0df8b5bc6b
13-
LibUnwind.v1.5.0+1.i686-linux-gnu.tar.gz/md5/bd52e05f513c8b86d8b71a9f833bde57
14-
LibUnwind.v1.5.0+1.i686-linux-gnu.tar.gz/sha512/750a082730c35b11cc1745a05e140bd83fd7511560ac90e15b472383b60b4641285b959a1a0897e2c6cb6bbf3857497ef7164642bfc79660c9c681cda189f530
15-
LibUnwind.v1.5.0+1.i686-linux-musl.tar.gz/md5/41482181efe7218a6aae785b76ad4d62
16-
LibUnwind.v1.5.0+1.i686-linux-musl.tar.gz/sha512/e1212ecc9efe16fc7401b1abafd3ab55c435a868e9a5408a4d9ca0039c4c422fb635314ae8d69913d4699a52ae070dc12db9cbb95d18f6e4fa41dd5047b22049
17-
LibUnwind.v1.5.0+1.powerpc64le-linux-gnu.tar.gz/md5/fa9dafea4ad00266188a310294b9342e
18-
LibUnwind.v1.5.0+1.powerpc64le-linux-gnu.tar.gz/sha512/d90370601804b477f588fbeba549a197150fc080ccee112b0e93a00393d03b7908a5f8ceed1a33c6ea8860c0f88c0d1e05a676336c948897f518d6130c480f5e
19-
LibUnwind.v1.5.0+1.x86_64-linux-gnu.tar.gz/md5/57b35a4b10407daf0e06c32acb942c0f
20-
LibUnwind.v1.5.0+1.x86_64-linux-gnu.tar.gz/sha512/0ab66f46a0b947c29d9ac76b1b10591435a9098e1a93b99eb64444c9fabd97439764a0fd1483ee5e26c2f617ca97d3929184bcbb9f1f2778ad109a9fb07d2daa
21-
LibUnwind.v1.5.0+1.x86_64-linux-musl.tar.gz/md5/7116a5228632a6f96bfc979d72ad530d
22-
LibUnwind.v1.5.0+1.x86_64-linux-musl.tar.gz/sha512/20c18da77864985ba8bb0a5857c23b807730de354d2fd0504b627e53a2d8763a72c2ebb5ac8bb7615f4a66a27937c12e89619489893b4ee17c3fea8acd12c704
23-
LibUnwind.v1.5.0+1.x86_64-unknown-freebsd.tar.gz/md5/79bb8128f52068faf1cb8e82f39272dc
24-
LibUnwind.v1.5.0+1.x86_64-unknown-freebsd.tar.gz/sha512/c60a09be8d945d7309e219e830f7cebcb11b7924b9d98ea4b0a93730ed4c2eda846bd0f043cdb225c86cc576d5708fd4f4fbe1324c7b71e47a02ae1d42c7e47f
1+
LibUnwind.v1.5.0+2.aarch64-linux-gnu.tar.gz/md5/95e3a6b8e1842e21f8793c489dc07f9b
2+
LibUnwind.v1.5.0+2.aarch64-linux-gnu.tar.gz/sha512/faf51cc25065f1493b32fb7520a4ababe631b918336ca51091345f75cae967977b29185476d5c12fd5f9533531c1cbcb84ec17fe941a8d7bfa5aef9396842f87
3+
LibUnwind.v1.5.0+2.aarch64-linux-musl.tar.gz/md5/c084f8c50371b3ddb85f6290534e79ef
4+
LibUnwind.v1.5.0+2.aarch64-linux-musl.tar.gz/sha512/2df5fead3bd8ea43c136431e7b1340c2a0b605c04c575e1d22edab479fe8074d898f9bd3c791eb5d91c3e52d31bb7f841dd8f11be97a3eb6d8ac61d1d809622e
5+
LibUnwind.v1.5.0+2.armv6l-linux-gnueabihf.tar.gz/md5/6c11ca045cbaeb4fe75363aa116a784e
6+
LibUnwind.v1.5.0+2.armv6l-linux-gnueabihf.tar.gz/sha512/5c337a850f184a0c514da8abca42aa5728cfa384a9ef3d0f36d67b10e322affe95d4a05c76faca69ca66cdb4e8535f4e8ee0f650ef39a27f897083e66570d6fb
7+
LibUnwind.v1.5.0+2.armv6l-linux-musleabihf.tar.gz/md5/8e4b4569abccd11fb577346f6df42d4a
8+
LibUnwind.v1.5.0+2.armv6l-linux-musleabihf.tar.gz/sha512/025660fe2dbb9d5904b865d6a3716553f368c5589b0cf8fd5f93a87e2204e5c66309b046de0d853ce643992dfa6433fc6214417bd477c4f363fd946ad6c97179
9+
LibUnwind.v1.5.0+2.armv7l-linux-gnueabihf.tar.gz/md5/c57b86157a00931608786578795e398a
10+
LibUnwind.v1.5.0+2.armv7l-linux-gnueabihf.tar.gz/sha512/f7b720f0ab208212b66fac6783e98edfc80bca9b2b903bf665da1a464a0a615aaa998ea1bee9088c73124879ded53b58fe9c5086ec547a50bcdf14be93652da1
11+
LibUnwind.v1.5.0+2.armv7l-linux-musleabihf.tar.gz/md5/a88e3a13a02c9d491ced12c7ba416508
12+
LibUnwind.v1.5.0+2.armv7l-linux-musleabihf.tar.gz/sha512/ef705a74750680e81daec6ff790797f247a7dbdb99731ab4083bc9a56f3f79da68c2c15321f5f6466d2f71b228aae5f59f793a16a06cf93a57366a051b748376
13+
LibUnwind.v1.5.0+2.i686-linux-gnu.tar.gz/md5/657a43f2b2e323ed3f298baae60bcd52
14+
LibUnwind.v1.5.0+2.i686-linux-gnu.tar.gz/sha512/138646a791044ab3106452111b5801710fccd2a0356b566751fee93d8e636a7f2cc14679d5cf515f1bdebcac5722af746c2047775a7e191f7ddc068914d29383
15+
LibUnwind.v1.5.0+2.i686-linux-musl.tar.gz/md5/cfe5281bca9498083c1da5eb787c2bac
16+
LibUnwind.v1.5.0+2.i686-linux-musl.tar.gz/sha512/b786d9000d2435f3284072ae527d172e89224373c59683ba265d24946ac89ab714d2ced6eb37a0191bea85de556a5ea1420a089aa5ba4f01ed9397e945841bd9
17+
LibUnwind.v1.5.0+2.powerpc64le-linux-gnu.tar.gz/md5/c2f19ab443307b986d9545bfce7e3f83
18+
LibUnwind.v1.5.0+2.powerpc64le-linux-gnu.tar.gz/sha512/034493ac5822d481976e4ee2d53db066788fab7fb0053bd472c6ef1d078700882487aebc4f7bb1be5bff9719eb048a24d8a7318a34154e04f9a192eef5fa56b8
19+
LibUnwind.v1.5.0+2.x86_64-linux-gnu.tar.gz/md5/f6c7ca4303e43dd3a22314dbab294037
20+
LibUnwind.v1.5.0+2.x86_64-linux-gnu.tar.gz/sha512/0c7d7793b606cbd51d1be85bbc8c62bf2a60b4b25279d4267e535d5ba53b8cc667f5cc92e607439ee8354bda8c03637315f93bee23bb09b47d83b3b4543c690d
21+
LibUnwind.v1.5.0+2.x86_64-linux-musl.tar.gz/md5/4ba92194d0e323839d2207093f365be9
22+
LibUnwind.v1.5.0+2.x86_64-linux-musl.tar.gz/sha512/49110890d2e4e0050c52c5b2f94288c2afe1c75cd3b54345a49f095a9ea6804122c7d1b4dac831a169dabf510247107c299031b732a23d8d217ab0fd4e1d0682
23+
LibUnwind.v1.5.0+2.x86_64-unknown-freebsd.tar.gz/md5/e9b4a61538244b4dc05147f94b4d31d4
24+
LibUnwind.v1.5.0+2.x86_64-unknown-freebsd.tar.gz/sha512/bcae20fdd5ac3da362b94a6059b2c055de111507a8da7ae311fe176cb3873429eb7b30aaf83210699fb24fc8a309648a30514f34c43615e02268528b6b29cb27
2525
libunwind-1.5.0.tar.gz/md5/c6923dda0675f6a4ef21426164dc8b6a
2626
libunwind-1.5.0.tar.gz/sha512/1df20ca7a8cee2f2e61294fa9b677e88fec52e9d5a329f88d05c2671c69fa462f6c18808c97ca9ff664ef57292537a844f00b18d142b1938c9da701ca95a4bab

‎deps/patches/libunwind-non-empty-structs.patch‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
From 1f35cd8f2bdcc1876af7352cc3e87bb7277e8162 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Mos=C3=A8=20Giordano?= <[email protected]>
3+
Date: Sat, 18 Jun 2022 10:35:36 +0100
4+
Subject: [PATCH 1/1] Make some structs non-empty
5+
6+
Backport of <https://github.com/libunwind/libunwind/pull/332>.
7+
---
8+
include/libunwind-aarch64.h | 6 ++++++
9+
include/libunwind-arm.h | 6 ++++++
10+
include/libunwind-x86.h | 6 ++++++
11+
3 files changed, 18 insertions(+)
12+
13+
diff --git a/include/libunwind-aarch64.h b/include/libunwind-aarch64.h
14+
index aeaef630..b7066c51 100644
15+
--- a/include/libunwind-aarch64.h
16+
+++ b/include/libunwind-aarch64.h
17+
@@ -35,6 +35,10 @@ extern "C" {
18+
#include <stddef.h>
19+
#include <ucontext.h>
20+
21+
+#ifndef UNW_EMPTY_STRUCT
22+
+# define UNW_EMPTY_STRUCT uint8_t unused;
23+
+#endif
24+
+
25+
#define UNW_TARGET aarch64
26+
#define UNW_TARGET_AARCH64 1
27+
28+
@@ -60,6 +64,7 @@ typedef long double unw_tdep_fpreg_t;
29+
typedef struct
30+
{
31+
/* no aarch64-specific auxiliary proc-info */
32+
+ UNW_EMPTY_STRUCT
33+
}
34+
unw_tdep_proc_info_t;
35+
36+
@@ -169,6 +174,7 @@ aarch64_regnum_t;
37+
typedef struct unw_tdep_save_loc
38+
{
39+
/* Additional target-dependent info on a save location. */
40+
+ UNW_EMPTY_STRUCT
41+
}
42+
unw_tdep_save_loc_t;
43+
44+
diff --git a/include/libunwind-arm.h b/include/libunwind-arm.h
45+
index 6709b7ab..7c7005d1 100644
46+
--- a/include/libunwind-arm.h
47+
+++ b/include/libunwind-arm.h
48+
@@ -32,6 +32,10 @@ extern "C" {
49+
#include <inttypes.h>
50+
#include <stddef.h>
51+
52+
+#ifndef UNW_EMPTY_STRUCT
53+
+# define UNW_EMPTY_STRUCT uint8_t unused;
54+
+#endif
55+
+
56+
#define UNW_TARGET arm
57+
#define UNW_TARGET_ARM 1
58+
59+
@@ -247,6 +251,7 @@ arm_regnum_t;
60+
typedef struct unw_tdep_save_loc
61+
{
62+
/* Additional target-dependent info on a save location. */
63+
+ UNW_EMPTY_STRUCT
64+
}
65+
unw_tdep_save_loc_t;
66+
67+
@@ -288,6 +293,7 @@ unw_tdep_context_t;
68+
typedef struct
69+
{
70+
/* no arm-specific auxiliary proc-info */
71+
+ UNW_EMPTY_STRUCT
72+
}
73+
unw_tdep_proc_info_t;
74+
75+
diff --git a/include/libunwind-x86.h b/include/libunwind-x86.h
76+
index 40fe0464..d3b741d3 100644
77+
--- a/include/libunwind-x86.h
78+
+++ b/include/libunwind-x86.h
79+
@@ -34,6 +34,10 @@ extern "C" {
80+
#include <inttypes.h>
81+
#include <ucontext.h>
82+
83+
+#ifndef UNW_EMPTY_STRUCT
84+
+# define UNW_EMPTY_STRUCT uint8_t unused;
85+
+#endif
86+
+
87+
#define UNW_TARGET x86
88+
#define UNW_TARGET_X86 1
89+
90+
@@ -158,6 +162,7 @@ x86_regnum_t;
91+
typedef struct unw_tdep_save_loc
92+
{
93+
/* Additional target-dependent info on a save location. */
94+
+ UNW_EMPTY_STRUCT
95+
}
96+
unw_tdep_save_loc_t;
97+
98+
@@ -169,6 +174,7 @@ typedef ucontext_t unw_tdep_context_t;
99+
typedef struct
100+
{
101+
/* no x86-specific auxiliary proc-info */
102+
+ UNW_EMPTY_STRUCT
103+
}
104+
unw_tdep_proc_info_t;
105+
106+
--
107+
2.36.1
108+

‎deps/unwind.mk‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ $(SRCCACHE)/libunwind-$(UNWIND_VER)/libunwind-dwarf-table.patch-applied: $(SRCCA
4040
cd $(SRCCACHE)/libunwind-$(UNWIND_VER) && patch -p1 -f -u -l < $(SRCDIR)/patches/libunwind-dwarf-table.patch
4141
echo 1 > $@
4242

43-
$(BUILDDIR)/libunwind-$(UNWIND_VER)/build-configured: $(SRCCACHE)/libunwind-$(UNWIND_VER)/source-extracted $(SRCCACHE)/libunwind-$(UNWIND_VER)/libunwind-dwarf-table.patch-applied
43+
$(SRCCACHE)/libunwind-$(UNWIND_VER)/libunwind-non-empty-structs.patch-applied: $(SRCCACHE)/libunwind-$(UNWIND_VER)/libunwind-dwarf-table.patch-applied
44+
cd $(SRCCACHE)/libunwind-$(UNWIND_VER) && patch -p1 -f -u -l < $(SRCDIR)/patches/libunwind-non-empty-structs.patch
45+
echo 1 > $@
46+
47+
$(BUILDDIR)/libunwind-$(UNWIND_VER)/build-configured: $(SRCCACHE)/libunwind-$(UNWIND_VER)/source-extracted $(SRCCACHE)/libunwind-$(UNWIND_VER)/libunwind-non-empty-structs.patch-applied
4448
mkdir -p $(dir $@)
4549
cd $(dir $@) && \
4650
$(dir $<)/configure $(CONFIGURE_COMMON) CPPFLAGS="$(CPPFLAGS) $(LIBUNWIND_CPPFLAGS)" CFLAGS="$(CFLAGS) $(LIBUNWIND_CFLAGS)" --enable-shared --disable-minidebuginfo --disable-tests --enable-zlibdebuginfo

‎stdlib/LibUnwind_jll/Project.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "LibUnwind_jll"
22
uuid = "745a5e78-f969-53e9-954f-d19f2f74f4e3"
3-
version = "1.5.0+0"
3+
version = "1.5.0+2"
44

55
[deps]
66
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"

0 commit comments

Comments
 (0)