Compare commits
26 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
09708d8e63 | ||
|
a1c16ce0a0 | ||
|
849837b480 | ||
|
b66625d929 | ||
|
2886742cb0 | ||
|
74c255a166 | ||
|
e72b0fc853 | ||
|
1c74097ba6 | ||
|
fadd9f99a4 | ||
|
1ac07540e4 | ||
|
af27c5c860 | ||
|
61b9af32dd | ||
|
efb668858b | ||
|
a55e1b8ba6 | ||
|
7fe03d7b7a | ||
|
0d267b17df | ||
|
dd778107e0 | ||
|
5d7bc24451 | ||
|
ec928ec8df | ||
|
bfdacd72c0 | ||
|
ccdcb646de | ||
|
d1c7cb2e27 | ||
|
bf773e8b2a | ||
|
4a34d35cbc | ||
|
3dda0e75f7 | ||
|
a4bb342886 |
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
/libunwind-*.tar.gz
|
/libunwind-*.tar.gz
|
||||||
|
/v1.7.0-rc2.tar.gz
|
||||||
|
22
libunwind-1.3.1-multilib-fix.patch
Normal file
22
libunwind-1.3.1-multilib-fix.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
diff -up libunwind-1.3.1/include/libunwind.h.in.multilibfix libunwind-1.3.1/include/libunwind.h.in
|
||||||
|
--- libunwind-1.3.1/include/libunwind.h.in.multilibfix 2020-08-13 10:06:03.275601460 -0400
|
||||||
|
+++ libunwind-1.3.1/include/libunwind.h.in 2020-08-13 10:06:29.579522623 -0400
|
||||||
|
@@ -1,8 +1,6 @@
|
||||||
|
/* Provide a real file - not a symlink - as it would cause multiarch conflicts
|
||||||
|
when multiple different arch releases are installed simultaneously. */
|
||||||
|
|
||||||
|
-#ifndef UNW_REMOTE_ONLY
|
||||||
|
-
|
||||||
|
#if defined __aarch64__
|
||||||
|
#include "libunwind-aarch64.h"
|
||||||
|
#elif defined __arm__
|
||||||
|
@@ -28,9 +26,3 @@
|
||||||
|
#else
|
||||||
|
# error "Unsupported arch"
|
||||||
|
#endif
|
||||||
|
-
|
||||||
|
-#else /* UNW_REMOTE_ONLY */
|
||||||
|
-
|
||||||
|
-# include "libunwind-@arch@.h"
|
||||||
|
-
|
||||||
|
-#endif /* UNW_REMOTE_ONLY */
|
355
libunwind-1.6.2-dynamic-page-size.patch
Normal file
355
libunwind-1.6.2-dynamic-page-size.patch
Normal file
@ -0,0 +1,355 @@
|
|||||||
|
From cf6b9aadd60a85107afe5196251ca2ed198a96d0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Daniel Moody <daniel.moody@mongodb.com>
|
||||||
|
Date: Fri, 18 Feb 2022 14:24:37 -0600
|
||||||
|
Subject: [PATCH] Updated to determine PAGE_SIZE dynamically.
|
||||||
|
|
||||||
|
---
|
||||||
|
include/libunwind_i.h | 9 +++++++++
|
||||||
|
src/aarch64/Ginit.c | 19 ++++++++-----------
|
||||||
|
src/arm/Ginit.c | 13 ++-----------
|
||||||
|
src/mi/init.c | 28 ++++++++++++++++++++++++++--
|
||||||
|
src/riscv/Ginit.c | 22 ++++++++--------------
|
||||||
|
src/s390x/Ginit.c | 25 ++++++++++---------------
|
||||||
|
src/x86/Ginit.c | 13 ++-----------
|
||||||
|
src/x86_64/Ginit.c | 18 +++++-------------
|
||||||
|
8 files changed, 70 insertions(+), 77 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/include/libunwind_i.h b/include/libunwind_i.h
|
||||||
|
index 6c7dda9a8..bcf229566 100644
|
||||||
|
--- a/include/libunwind_i.h
|
||||||
|
+++ b/include/libunwind_i.h
|
||||||
|
@@ -55,6 +55,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||||
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <sys/mman.h>
|
||||||
|
+#include <errno.h>
|
||||||
|
+#include <stdio.h>
|
||||||
|
|
||||||
|
#if defined(HAVE_ELF_H)
|
||||||
|
# include <elf.h>
|
||||||
|
@@ -288,6 +290,13 @@ print_error (const char *string)
|
||||||
|
return write (2, string, strlen (string));
|
||||||
|
}
|
||||||
|
|
||||||
|
+HIDDEN extern long unw_page_size;
|
||||||
|
+
|
||||||
|
+static inline unw_word_t uwn_page_start(unw_word_t addr)
|
||||||
|
+{
|
||||||
|
+ return addr & ~(unw_page_size - 1);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
#define mi_init UNWI_ARCH_OBJ(mi_init)
|
||||||
|
|
||||||
|
extern void mi_init (void); /* machine-independent initializations */
|
||||||
|
diff --git a/src/aarch64/Ginit.c b/src/aarch64/Ginit.c
|
||||||
|
index 2b08feb36..fe6e511df 100644
|
||||||
|
--- a/src/aarch64/Ginit.c
|
||||||
|
+++ b/src/aarch64/Ginit.c
|
||||||
|
@@ -84,8 +84,6 @@ get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr,
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
-#define PAGE_SIZE 4096
|
||||||
|
-#define PAGE_START(a) ((a) & ~(PAGE_SIZE-1))
|
||||||
|
|
||||||
|
static int mem_validate_pipe[2] = {-1, -1};
|
||||||
|
|
||||||
|
@@ -197,11 +195,14 @@ tdep_init_mem_validate (void)
|
||||||
|
|
||||||
|
#ifdef HAVE_MINCORE
|
||||||
|
unsigned char present = 1;
|
||||||
|
- unw_word_t addr = PAGE_START((unw_word_t)&present);
|
||||||
|
+ size_t len = unw_page_size;
|
||||||
|
+ unw_word_t addr = uwn_page_start((unw_word_t)&present);
|
||||||
|
unsigned char mvec[1];
|
||||||
|
int ret;
|
||||||
|
- while ((ret = mincore ((void*)addr, PAGE_SIZE, (unsigned char *)mvec)) == -1 &&
|
||||||
|
- errno == EAGAIN) {}
|
||||||
|
+ while ((ret = mincore((void *)addr, len, (unsigned char *)mvec)) == -1 &&
|
||||||
|
+ errno == EAGAIN)
|
||||||
|
+ {
|
||||||
|
+ }
|
||||||
|
if (ret == 0)
|
||||||
|
{
|
||||||
|
Debug(1, "using mincore to validate memory\n");
|
||||||
|
@@ -295,12 +296,8 @@ validate_mem (unw_word_t addr)
|
||||||
|
{
|
||||||
|
size_t len;
|
||||||
|
|
||||||
|
- if (PAGE_START(addr + sizeof (unw_word_t) - 1) == PAGE_START(addr))
|
||||||
|
- len = PAGE_SIZE;
|
||||||
|
- else
|
||||||
|
- len = PAGE_SIZE * 2;
|
||||||
|
-
|
||||||
|
- addr = PAGE_START(addr);
|
||||||
|
+ len = unw_page_size;
|
||||||
|
+ addr = uwn_page_start(addr);
|
||||||
|
|
||||||
|
if (addr == 0)
|
||||||
|
return -1;
|
||||||
|
diff --git a/src/arm/Ginit.c b/src/arm/Ginit.c
|
||||||
|
index 0bac0d72d..bce52dc34 100644
|
||||||
|
--- a/src/arm/Ginit.c
|
||||||
|
+++ b/src/arm/Ginit.c
|
||||||
|
@@ -71,9 +71,6 @@ get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr,
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
-#define PAGE_SIZE 4096
|
||||||
|
-#define PAGE_START(a) ((a) & ~(PAGE_SIZE-1))
|
||||||
|
-
|
||||||
|
/* Cache of already validated addresses */
|
||||||
|
#define NLGA 4
|
||||||
|
static unw_word_t last_good_addr[NLGA];
|
||||||
|
@@ -83,14 +80,8 @@ static int
|
||||||
|
validate_mem (unw_word_t addr)
|
||||||
|
{
|
||||||
|
int i, victim;
|
||||||
|
- size_t len;
|
||||||
|
-
|
||||||
|
- if (PAGE_START(addr + sizeof (unw_word_t) - 1) == PAGE_START(addr))
|
||||||
|
- len = PAGE_SIZE;
|
||||||
|
- else
|
||||||
|
- len = PAGE_SIZE * 2;
|
||||||
|
-
|
||||||
|
- addr = PAGE_START(addr);
|
||||||
|
+ size_t len = unw_page_size;
|
||||||
|
+ addr = uwn_page_start(addr);
|
||||||
|
|
||||||
|
if (addr == 0)
|
||||||
|
return -1;
|
||||||
|
diff --git a/src/mi/init.c b/src/mi/init.c
|
||||||
|
index 60a48c589..aa9319981 100644
|
||||||
|
--- a/src/mi/init.c
|
||||||
|
+++ b/src/mi/init.c
|
||||||
|
@@ -39,6 +39,30 @@ static const char rcsid[] UNUSED =
|
||||||
|
long unwi_debug_level;
|
||||||
|
|
||||||
|
#endif /* UNW_DEBUG */
|
||||||
|
+long unw_page_size;
|
||||||
|
+static void
|
||||||
|
+unw_init_page_size ()
|
||||||
|
+{
|
||||||
|
+ errno = 0;
|
||||||
|
+ long result = sysconf (_SC_PAGESIZE);
|
||||||
|
+ if (result == -1)
|
||||||
|
+ {
|
||||||
|
+ if (errno != 0)
|
||||||
|
+ {
|
||||||
|
+ print_error ("Failed to get _SC_PAGESIZE: ");
|
||||||
|
+ print_error (strerror(errno));
|
||||||
|
+ print_error ("\n");
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ print_error ("Failed to get _SC_PAGESIZE, errno was not set.\n");
|
||||||
|
+
|
||||||
|
+ unw_page_size = 4096;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ unw_page_size = result;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
|
||||||
|
HIDDEN void
|
||||||
|
mi_init (void)
|
||||||
|
@@ -55,6 +79,6 @@ mi_init (void)
|
||||||
|
setbuf (stderr, NULL);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
-
|
||||||
|
- assert (sizeof (struct cursor) <= sizeof (unw_cursor_t));
|
||||||
|
+ unw_init_page_size();
|
||||||
|
+ assert(sizeof(struct cursor) <= sizeof(unw_cursor_t));
|
||||||
|
}
|
||||||
|
diff --git a/src/riscv/Ginit.c b/src/riscv/Ginit.c
|
||||||
|
index 907f72962..4faeecbfd 100644
|
||||||
|
--- a/src/riscv/Ginit.c
|
||||||
|
+++ b/src/riscv/Ginit.c
|
||||||
|
@@ -97,9 +97,6 @@ get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr,
|
||||||
|
|
||||||
|
// Memory validation routines are from aarch64
|
||||||
|
|
||||||
|
-#define PAGE_SIZE 4096
|
||||||
|
-#define PAGE_START(a) ((a) & ~(PAGE_SIZE-1))
|
||||||
|
-
|
||||||
|
static int mem_validate_pipe[2] = {-1, -1};
|
||||||
|
|
||||||
|
#ifdef HAVE_PIPE2
|
||||||
|
@@ -210,11 +207,14 @@ tdep_init_mem_validate (void)
|
||||||
|
|
||||||
|
#ifdef HAVE_MINCORE
|
||||||
|
unsigned char present = 1;
|
||||||
|
- unw_word_t addr = PAGE_START((unw_word_t)&present);
|
||||||
|
+ size_t len = unw_page_size;
|
||||||
|
+ unw_word_t addr = uwn_page_start((unw_word_t)&present);
|
||||||
|
unsigned char mvec[1];
|
||||||
|
int ret;
|
||||||
|
- while ((ret = mincore ((void*)addr, PAGE_SIZE, (unsigned char *)mvec)) == -1 &&
|
||||||
|
- errno == EAGAIN) {}
|
||||||
|
+ while ((ret = mincore((void *)addr, len, (unsigned char *)mvec)) == -1 &&
|
||||||
|
+ errno == EAGAIN)
|
||||||
|
+ {
|
||||||
|
+ }
|
||||||
|
if (ret == 0)
|
||||||
|
{
|
||||||
|
Debug(1, "using mincore to validate memory\n");
|
||||||
|
@@ -306,14 +306,8 @@ cache_valid_mem(unw_word_t addr)
|
||||||
|
static int
|
||||||
|
validate_mem (unw_word_t addr)
|
||||||
|
{
|
||||||
|
- size_t len;
|
||||||
|
-
|
||||||
|
- if (PAGE_START(addr + sizeof (unw_word_t) - 1) == PAGE_START(addr))
|
||||||
|
- len = PAGE_SIZE;
|
||||||
|
- else
|
||||||
|
- len = PAGE_SIZE * 2;
|
||||||
|
-
|
||||||
|
- addr = PAGE_START(addr);
|
||||||
|
+ size_t len = unw_page_size;
|
||||||
|
+ addr = uwn_page_start(addr);
|
||||||
|
|
||||||
|
if (addr == 0)
|
||||||
|
return -1;
|
||||||
|
diff --git a/src/s390x/Ginit.c b/src/s390x/Ginit.c
|
||||||
|
index db01743c0..2bce2f4b6 100644
|
||||||
|
--- a/src/s390x/Ginit.c
|
||||||
|
+++ b/src/s390x/Ginit.c
|
||||||
|
@@ -27,6 +27,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
|
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||||
|
|
||||||
|
+#include "libunwind_i.h"
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
#include <config.h>
|
||||||
|
#endif
|
||||||
|
@@ -93,9 +94,6 @@ get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr,
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
-#define PAGE_SIZE 4096
|
||||||
|
-#define PAGE_START(a) ((a) & ~(PAGE_SIZE-1))
|
||||||
|
-
|
||||||
|
static int mem_validate_pipe[2] = {-1, -1};
|
||||||
|
|
||||||
|
static inline void
|
||||||
|
@@ -163,7 +161,7 @@ static int mincore_validate (void *addr, size_t len)
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
- for (i = 0; i < (len + PAGE_SIZE - 1) / PAGE_SIZE; i++)
|
||||||
|
+ for (i = 0; i < (len + unw_page_size - 1) / unw_page_size; i++)
|
||||||
|
{
|
||||||
|
if (!(mvec[i] & 1)) return -1;
|
||||||
|
}
|
||||||
|
@@ -183,11 +181,14 @@ tdep_init_mem_validate (void)
|
||||||
|
|
||||||
|
#ifdef HAVE_MINCORE
|
||||||
|
unsigned char present = 1;
|
||||||
|
- unw_word_t addr = PAGE_START((unw_word_t)&present);
|
||||||
|
+ size_t len = unw_page_size;
|
||||||
|
+ unw_word_t addr = uwn_page_start((unw_word_t)&present);
|
||||||
|
unsigned char mvec[1];
|
||||||
|
int ret;
|
||||||
|
- while ((ret = mincore ((void*)addr, PAGE_SIZE, mvec)) == -1 &&
|
||||||
|
- errno == EAGAIN) {}
|
||||||
|
+ while ((ret = mincore((void *)addr, len, mvec)) == -1 &&
|
||||||
|
+ errno == EAGAIN)
|
||||||
|
+ {
|
||||||
|
+ }
|
||||||
|
if (ret == 0 && (mvec[0] & 1))
|
||||||
|
{
|
||||||
|
Debug(1, "using mincore to validate memory\n");
|
||||||
|
@@ -210,14 +211,8 @@ static int
|
||||||
|
validate_mem (unw_word_t addr)
|
||||||
|
{
|
||||||
|
int i, victim;
|
||||||
|
- size_t len;
|
||||||
|
-
|
||||||
|
- if (PAGE_START(addr + sizeof (unw_word_t) - 1) == PAGE_START(addr))
|
||||||
|
- len = PAGE_SIZE;
|
||||||
|
- else
|
||||||
|
- len = PAGE_SIZE * 2;
|
||||||
|
-
|
||||||
|
- addr = PAGE_START(addr);
|
||||||
|
+ size_t len = unw_page_size;
|
||||||
|
+ addr = uwn_page_start(addr);
|
||||||
|
|
||||||
|
if (addr == 0)
|
||||||
|
return -1;
|
||||||
|
diff --git a/src/x86/Ginit.c b/src/x86/Ginit.c
|
||||||
|
index 3cec74a21..4261fb523 100644
|
||||||
|
--- a/src/x86/Ginit.c
|
||||||
|
+++ b/src/x86/Ginit.c
|
||||||
|
@@ -74,9 +74,6 @@ get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr,
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
-#define PAGE_SIZE 4096
|
||||||
|
-#define PAGE_START(a) ((a) & ~(PAGE_SIZE-1))
|
||||||
|
-
|
||||||
|
/* Cache of already validated addresses */
|
||||||
|
#define NLGA 4
|
||||||
|
static unw_word_t last_good_addr[NLGA];
|
||||||
|
@@ -89,14 +86,8 @@ validate_mem (unw_word_t addr)
|
||||||
|
#ifdef HAVE_MINCORE
|
||||||
|
unsigned char mvec[2]; /* Unaligned access may cross page boundary */
|
||||||
|
#endif
|
||||||
|
- size_t len;
|
||||||
|
-
|
||||||
|
- if (PAGE_START(addr + sizeof (unw_word_t) - 1) == PAGE_START(addr))
|
||||||
|
- len = PAGE_SIZE;
|
||||||
|
- else
|
||||||
|
- len = PAGE_SIZE * 2;
|
||||||
|
-
|
||||||
|
- addr = PAGE_START(addr);
|
||||||
|
+ size_t len = unw_page_size;
|
||||||
|
+ addr = uwn_page_start(addr);
|
||||||
|
|
||||||
|
if (addr == 0)
|
||||||
|
return -1;
|
||||||
|
diff --git a/src/x86_64/Ginit.c b/src/x86_64/Ginit.c
|
||||||
|
index 0b121bc91..e75f92a5f 100644
|
||||||
|
--- a/src/x86_64/Ginit.c
|
||||||
|
+++ b/src/x86_64/Ginit.c
|
||||||
|
@@ -73,9 +73,6 @@ get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr,
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
-#define PAGE_SIZE 4096
|
||||||
|
-#define PAGE_START(a) ((a) & ~(PAGE_SIZE-1))
|
||||||
|
-
|
||||||
|
static int mem_validate_pipe[2] = {-1, -1};
|
||||||
|
|
||||||
|
#ifdef HAVE_PIPE2
|
||||||
|
@@ -191,10 +188,11 @@ tdep_init_mem_validate (void)
|
||||||
|
|
||||||
|
#ifdef HAVE_MINCORE
|
||||||
|
unsigned char present = 1;
|
||||||
|
- unw_word_t addr = PAGE_START((unw_word_t)&present);
|
||||||
|
+ size_t len = unw_page_size;
|
||||||
|
+ unw_word_t addr = uwn_page_start((unw_word_t)&present);
|
||||||
|
unsigned char mvec[1];
|
||||||
|
int ret;
|
||||||
|
- while ((ret = mincore ((void*)addr, PAGE_SIZE, (unsigned char *)mvec)) == -1 &&
|
||||||
|
+ while ((ret = mincore ((void*)addr, len, (unsigned char *)mvec)) == -1 &&
|
||||||
|
errno == EAGAIN) {}
|
||||||
|
if (ret == 0)
|
||||||
|
{
|
||||||
|
@@ -287,14 +285,8 @@ cache_valid_mem(unw_word_t addr)
|
||||||
|
static int
|
||||||
|
validate_mem (unw_word_t addr)
|
||||||
|
{
|
||||||
|
- size_t len;
|
||||||
|
-
|
||||||
|
- if (PAGE_START(addr + sizeof (unw_word_t) - 1) == PAGE_START(addr))
|
||||||
|
- len = PAGE_SIZE;
|
||||||
|
- else
|
||||||
|
- len = PAGE_SIZE * 2;
|
||||||
|
-
|
||||||
|
- addr = PAGE_START(addr);
|
||||||
|
+ size_t len = unw_page_size;
|
||||||
|
+ addr = uwn_page_start(addr);
|
||||||
|
|
||||||
|
if (addr == 0)
|
||||||
|
return -1;
|
@ -1,15 +1,15 @@
|
|||||||
diff -up libunwind-1.1/src/arm/Gglobal.c.default-to-exidx libunwind-1.1/src/arm/Gglobal.c
|
diff -up libunwind-1.6.2/src/arm/Gglobal.c.default-to-exidx libunwind-1.6.2/src/arm/Gglobal.c
|
||||||
--- libunwind-1.1/src/arm/Gglobal.c.default-to-exidx 2015-06-02 10:38:39.733587918 -0400
|
--- libunwind-1.6.2/src/arm/Gglobal.c.default-to-exidx 2021-12-20 12:06:56.067313075 -0500
|
||||||
+++ libunwind-1.1/src/arm/Gglobal.c 2015-06-02 10:38:53.086500142 -0400
|
+++ libunwind-1.6.2/src/arm/Gglobal.c 2021-12-20 12:08:43.063060309 -0500
|
||||||
@@ -29,7 +29,10 @@ HIDDEN define_lock (arm_lock);
|
@@ -33,7 +33,10 @@ HIDDEN atomic_bool tdep_init_done = 0;
|
||||||
HIDDEN int tdep_init_done;
|
/* Android only supports three types of unwinding methods. */
|
||||||
|
HIDDEN int unwi_unwind_method = UNW_ARM_METHOD_DWARF | UNW_ARM_METHOD_EXIDX | UNW_ARM_METHOD_LR;
|
||||||
/* Unwinding methods to use. See UNW_METHOD_ enums */
|
#else
|
||||||
-HIDDEN int unwi_unwind_method = UNW_ARM_METHOD_ALL;
|
-HIDDEN int unwi_unwind_method = UNW_ARM_METHOD_ALL;
|
||||||
+/* UNW_ARM_METHOD_ALL starts with UNW_ARM_METHOD_DWARF */
|
+/* UNW_ARM_METHOD_ALL starts with UNW_ARM_METHOD_DWARF */
|
||||||
+/* which is never right on Fedora ARM. Default instead */
|
+/* which is never right on Fedora ARM. Default instead */
|
||||||
+/* to UNW_ARM_METHOD_EXIDX. */
|
+/* to UNW_ARM_METHOD_EXIDX. */
|
||||||
+HIDDEN int unwi_unwind_method = UNW_ARM_METHOD_EXIDX;
|
+HIDDEN int unwi_unwind_method = UNW_ARM_METHOD_EXIDX;
|
||||||
|
#endif
|
||||||
|
|
||||||
HIDDEN void
|
HIDDEN void
|
||||||
tdep_init (void)
|
|
||||||
|
@ -1,43 +0,0 @@
|
|||||||
From c7ab998ec52b09d61ec3c0ea62aa07cd26077ea3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Romain Naour <romain.naour@smile.fr>
|
|
||||||
Date: Mon, 3 Jul 2017 14:43:02 +0200
|
|
||||||
Subject: [PATCH] libunwind-arm: fix build failure due to asm()
|
|
||||||
|
|
||||||
The gcc documentation [1] suggest to use __asm__ instead of asm.
|
|
||||||
|
|
||||||
Fixes:
|
|
||||||
http://autobuild.buildroot.net/results/3ef/3efe156b6494e4392b6c31de447ee2c72acc1a53
|
|
||||||
|
|
||||||
[1] https://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html#Alternate-Keywords
|
|
||||||
|
|
||||||
Signed-off-by: Romain Naour <romain.naour@smile.fr>
|
|
||||||
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
||||||
---
|
|
||||||
include/libunwind-arm.h | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/include/libunwind-arm.h b/include/libunwind-arm.h
|
|
||||||
index f208487..1c856fa 100644
|
|
||||||
--- a/include/libunwind-arm.h
|
|
||||||
+++ b/include/libunwind-arm.h
|
|
||||||
@@ -265,7 +265,7 @@ unw_tdep_context_t;
|
|
||||||
#ifndef __thumb__
|
|
||||||
#define unw_tdep_getcontext(uc) (({ \
|
|
||||||
unw_tdep_context_t *unw_ctx = (uc); \
|
|
||||||
- register unsigned long *unw_base asm ("r0") = unw_ctx->regs; \
|
|
||||||
+ register unsigned long *unw_base __asm__ ("r0") = unw_ctx->regs; \
|
|
||||||
__asm__ __volatile__ ( \
|
|
||||||
"stmia %[base], {r0-r15}" \
|
|
||||||
: : [base] "r" (unw_base) : "memory"); \
|
|
||||||
@@ -273,7 +273,7 @@ unw_tdep_context_t;
|
|
||||||
#else /* __thumb__ */
|
|
||||||
#define unw_tdep_getcontext(uc) (({ \
|
|
||||||
unw_tdep_context_t *unw_ctx = (uc); \
|
|
||||||
- register unsigned long *unw_base asm ("r0") = unw_ctx->regs; \
|
|
||||||
+ register unsigned long *unw_base __asm__ ("r0") = unw_ctx->regs; \
|
|
||||||
__asm__ __volatile__ ( \
|
|
||||||
".align 2\nbx pc\nnop\n.code 32\n" \
|
|
||||||
"stmia %[base], {r0-r15}\n" \
|
|
||||||
--
|
|
||||||
2.9.4
|
|
||||||
|
|
25
libunwind-no-dl-iterate-phdr.patch
Normal file
25
libunwind-no-dl-iterate-phdr.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
This patch disables building of the (effectively empty)
|
||||||
|
dl-iterate-phdr.c source file. Symbols generated by annobin confuse
|
||||||
|
the run-check-namespace test because nm -g prints hidden weak symbols
|
||||||
|
in DSOs (they are considered external):
|
||||||
|
|
||||||
|
ERROR: Extraneous symbols:
|
||||||
|
000000000000de51 W dl_iterate_phdr.c.a8d8d212
|
||||||
|
ERROR: Extraneous symbols:
|
||||||
|
00000000000120b0 W dl_iterate_phdr.c.a8d8d212
|
||||||
|
|
||||||
|
This patch is downstream-specific due to annobin.
|
||||||
|
|
||||||
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||||
|
index 2b5b02959e99eb8f..e5ff21515c36d30f 100644
|
||||||
|
--- a/src/Makefile.am
|
||||||
|
+++ b/src/Makefile.am
|
||||||
|
@@ -147,7 +147,7 @@ libunwind_la_SOURCES_local = \
|
||||||
|
$(libunwind_la_SOURCES_local_unwind)
|
||||||
|
|
||||||
|
noinst_HEADERS += os-linux.h
|
||||||
|
-libunwind_la_SOURCES_os_linux = os-linux.c dl-iterate-phdr.c
|
||||||
|
+libunwind_la_SOURCES_os_linux = os-linux.c
|
||||||
|
|
||||||
|
libunwind_la_SOURCES_os_hpux = os-hpux.c
|
||||||
|
|
20
libunwind-skip-no-coredump.patch
Normal file
20
libunwind-skip-no-coredump.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
This is needed because under mock (especially with a systemd-coredump
|
||||||
|
handler on the system), no core files are created.
|
||||||
|
|
||||||
|
Submitted upstream: https://github.com/libunwind/libunwind/pull/418
|
||||||
|
|
||||||
|
diff --git a/tests/run-coredump-unwind b/tests/run-coredump-unwind
|
||||||
|
index 8d07742574602328..0c2b28c942477f7d 100755
|
||||||
|
--- a/tests/run-coredump-unwind
|
||||||
|
+++ b/tests/run-coredump-unwind
|
||||||
|
@@ -48,6 +48,10 @@ fi
|
||||||
|
./crasher backing_files
|
||||||
|
) 2>/dev/null
|
||||||
|
COREFILE=$TEMPDIR/core*
|
||||||
|
+if ! test -f "$COREFILE"; then
|
||||||
|
+ echo "crasher process did not produce coredump, test skipped"
|
||||||
|
+ exit 77
|
||||||
|
+fi
|
||||||
|
|
||||||
|
# magic option -testcase enables checking for the specific contents of the stack
|
||||||
|
./test-coredump-unwind $COREFILE -testcase `cat $TEMPDIR/backing_files`
|
145
libunwind.spec
145
libunwind.spec
@ -1,22 +1,68 @@
|
|||||||
# rpmbuild parameters:
|
# The testsuite does not pass on all targets.
|
||||||
# --without check: Do not run the testsuite. Default is to run it.
|
#
|
||||||
|
# aarch64
|
||||||
|
# Gtest-exc
|
||||||
|
# Ltest-exc
|
||||||
|
# Gtest-trace
|
||||||
|
# Ltest-trace
|
||||||
|
# Ltest-init-local-signal
|
||||||
|
# Ltest-mem-validate: https://github.com/libunwind/libunwind/issues/388
|
||||||
|
# test-reg-state
|
||||||
|
# Ltest-varargs
|
||||||
|
# Lrs-race
|
||||||
|
# test-ptrace
|
||||||
|
# run-check-namespace: https://github.com/libunwind/libunwind/issues/389
|
||||||
|
# run-ptrace-mapper
|
||||||
|
# run-ptrace-misc
|
||||||
|
# i686
|
||||||
|
# Ltest-mem-validate: https://github.com/libunwind/libunwind/issues/391
|
||||||
|
# test-async-sig
|
||||||
|
# test-ptrace
|
||||||
|
# ppc64le
|
||||||
|
# Gtest-exc
|
||||||
|
# Ltest-exc
|
||||||
|
# Gtest-resume-sig
|
||||||
|
# Ltest-resume-sig
|
||||||
|
# Gtest-resume-sig-rt
|
||||||
|
# Ltest-resume-sig-rt
|
||||||
|
# test-ptrace
|
||||||
|
# run-check-namespace
|
||||||
|
# run-ptrace-mapper
|
||||||
|
# run-ptrace-misc
|
||||||
|
#
|
||||||
|
# s390x
|
||||||
|
# Gtest-resume-sig-rt
|
||||||
|
# Ltest-resume-sig-rt
|
||||||
|
# test-ptrace
|
||||||
|
|
||||||
|
%ifarch aarch64 i686 ppc64le s390x
|
||||||
|
%global test_failure_override true
|
||||||
|
%else
|
||||||
|
%global test_failure_override false
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%global prerel rc2
|
||||||
|
|
||||||
Summary: An unwinding library
|
Summary: An unwinding library
|
||||||
Name: libunwind
|
Name: libunwind
|
||||||
Version: 1.2.1
|
Version: 1.7.0
|
||||||
Release: 5%{?dist}
|
Release: 0.1.%{prerel}%{?dist}
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://savannah.nongnu.org/projects/libunwind
|
URL: http://savannah.nongnu.org/projects/libunwind
|
||||||
|
Source: https://github.com/libunwind/libunwind/archive/refs/tags/v%{version}-%{prerel}.tar.gz
|
||||||
Source: http://download-mirror.savannah.gnu.org/releases/libunwind/libunwind-%{version}.tar.gz
|
# http://download-mirror.savannah.gnu.org/releases/libunwind/libunwind-%%{version}.tar.gz
|
||||||
|
|
||||||
#Fedora specific patch
|
#Fedora specific patch
|
||||||
Patch1: libunwind-arm-default-to-exidx.patch
|
Patch1: libunwind-arm-default-to-exidx.patch
|
||||||
Patch2: libunwind-fix-arm-build-failure-due-to-asm.patch
|
# Make libunwind.h multilib friendly
|
||||||
|
Patch2: libunwind-1.3.1-multilib-fix.patch
|
||||||
|
Patch5: libunwind-no-dl-iterate-phdr.patch
|
||||||
|
|
||||||
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} %{ix86} x86_64
|
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64
|
||||||
|
|
||||||
BuildRequires: automake libtool autoconf texlive-latex2man
|
BuildRequires: automake libtool autoconf texlive-latex2man
|
||||||
|
BuildRequires: make
|
||||||
|
BuildRequires: gcc-c++
|
||||||
|
|
||||||
# host != target would cause REMOTE_ONLY build even if building i386 on x86_64.
|
# host != target would cause REMOTE_ONLY build even if building i386 on x86_64.
|
||||||
%global _host %{_target_platform}
|
%global _host %{_target_platform}
|
||||||
@ -26,7 +72,6 @@ Libunwind provides a C ABI to determine the call-chain of a program.
|
|||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Development package for libunwind
|
Summary: Development package for libunwind
|
||||||
Group: Development/Debuggers
|
|
||||||
Requires: libunwind = %{version}-%{release}
|
Requires: libunwind = %{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
@ -34,11 +79,10 @@ The libunwind-devel package includes the libraries and header files for
|
|||||||
libunwind.
|
libunwind.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -p1 -n %{name}-%{version}-%{prerel}
|
||||||
%patch1 -p1 -b .default-to-exidx
|
|
||||||
%patch2 -p1 -b .arm
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
%global optflags %{optflags} -fcommon
|
||||||
aclocal
|
aclocal
|
||||||
libtoolize --force
|
libtoolize --force
|
||||||
autoheader
|
autoheader
|
||||||
@ -63,17 +107,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libunwind-ptrace*.so*
|
|||||||
touch -r NEWS $RPM_BUILD_ROOT%{_includedir}/libunwind.h
|
touch -r NEWS $RPM_BUILD_ROOT%{_includedir}/libunwind.h
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%if 0%{?_with_check:1} || 0%{?_with_testsuite:1}
|
|
||||||
echo ====================TESTING=========================
|
echo ====================TESTING=========================
|
||||||
make check || true
|
if ! make check ; then
|
||||||
|
echo ====================FAILED TESTS=====================
|
||||||
|
cat tests/test-suite.log || true
|
||||||
|
%{test_failure_override}
|
||||||
|
fi
|
||||||
echo ====================TESTING END=====================
|
echo ====================TESTING END=====================
|
||||||
%else
|
|
||||||
echo ====================TESTSUITE DISABLED=========================
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
%postun -p /sbin/ldconfig
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license COPYING
|
%license COPYING
|
||||||
@ -90,6 +132,69 @@ echo ====================TESTSUITE DISABLED=========================
|
|||||||
%{_includedir}/libunwind*.h
|
%{_includedir}/libunwind*.h
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 20 2023 Tom Callaway <spot@fedoraproject.org> - 1.7.0-0.1.rc2
|
||||||
|
- update to 1.7.0-rc2
|
||||||
|
- disable tests on s390x (reported upstream: https://github.com/libunwind/libunwind/issues/464)
|
||||||
|
|
||||||
|
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Sep 7 2022 Florian Weimer <fweimer@redhat.com> - 1.6.2-5
|
||||||
|
- Run the testsuite during build
|
||||||
|
|
||||||
|
* Wed Sep 7 2022 Florian Weimer <fweimer@redhat.com> - 1.6.2-4
|
||||||
|
- Enable %%autosetup to apply all patches (#2118019)
|
||||||
|
|
||||||
|
* Sun Aug 28 2022 Leif Liddy <leif.liddy@gmail.com> - 1.6.2-3
|
||||||
|
- enable dynamic page size support (bz2118019)
|
||||||
|
|
||||||
|
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Dec 20 2021 Tom Callaway <spot@fedoraproject.org> - 1.6.2-1
|
||||||
|
- update to 1.6.2
|
||||||
|
|
||||||
|
* Wed Jul 21 2021 Tom Callaway <spot@fedoraproject.org> - 1.5.0-1
|
||||||
|
- update to 1.5.0
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Aug 13 2020 Tom Callaway <spot@fedoraproject.org> - 1.4.0-4
|
||||||
|
- revert previous change
|
||||||
|
- fix it properly
|
||||||
|
|
||||||
|
* Mon Aug 10 2020 Tom Callaway <spot@fedoraproject.org> - 1.4.0-3
|
||||||
|
- fix multilib issues with libunwind.h (bz1866512)
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Apr 14 2020 Dan Horák <dan[at]danny.cz> - 1.4.0-1
|
||||||
|
- Update to 1.4.0 with s390x support
|
||||||
|
|
||||||
|
* Fri Jan 31 2020 Tom Callaway <spot@fedoraproject.org> - 1.3.1-5
|
||||||
|
- backport change from upstream to fix reported test failures (bz1795896)
|
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jan 13 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.3.1-1
|
||||||
|
- Update to 1.3.1
|
||||||
|
- Remove no longer needed patch (builds on all arches without it)
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.2.1-5
|
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.2.1-5
|
||||||
- Escape macros in %%changelog
|
- Escape macros in %%changelog
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (libunwind-1.2.1.tar.gz) = af7c280d2a963779a4a2711887618bc96383011e4e5d52e4085aa7fb351e55e357468f6ff85e66a216f1c6826538f498335a917a5970575c93be74c96316319b
|
SHA512 (v1.7.0-rc2.tar.gz) = 09920dffd7ab7eb18c3ec5ed3cbb78cc66e7456e465d7454c48d2d9d015e76d2ee78af42b34ccd85f4a15a2d61b1da461dcee12adadcfcf1ae4af3a2ecc59df3
|
||||||
|
Loading…
Reference in New Issue
Block a user