Attachment 207188 Details for Bug 219524 – svn-diff-libunwind_v5

[patch] svn-diff-libunwind_v5

svn-diff-libunwind_3 (text/plain), 7.13 KB, created by Walter Schwarzenfeld on 2019-09-04 16:42:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2019-09-04 16:42:50 UTC

Size: 7.13 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 511074)
>+++ Makefile	(working copy)
>@@ -2,10 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	libunwind
>-PORTVERSION=	20170615	# This is the release date of libunwind 1.2.1
>+PORTVERSION=	20190901	# This is the release date of libunwind 1.3.1
> CATEGORIES=	devel
> MASTER_SITES=	SAVANNAH
>-DISTNAME=	${PORTNAME}-1.2.1
>+DISTNAME=	${PORTNAME}-1.3.1
> 
> MAINTAINER=	danilo@FreeBSD.org
> COMMENT=	Generic stack unwinding library
>@@ -13,7 +13,7 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-ONLY_FOR_ARCHS= aarch64 amd64 i386
>+ONLY_FOR_ARCHS=	aarch64 amd64 i386
> 
> OPTIONS_DEFINE=	DOCS
> OPTIONS_SUB=	yes
>Index: distinfo
>===================================================================
>--- distinfo	(revision 511074)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1515854352
>-SHA256 (libunwind-1.2.1.tar.gz) = 3f3ecb90e28cbe53fba7a4a27ccce7aad188d3210bb1964a923a731a27a75acb
>-SIZE (libunwind-1.2.1.tar.gz) = 780774
>+TIMESTAMP = 1567588476
>+SHA256 (libunwind-1.3.1.tar.gz) = 43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8
>+SIZE (libunwind-1.3.1.tar.gz) = 801262
>Index: files/patch-include_libunwind-aarch64.h
>===================================================================
>--- files/patch-include_libunwind-aarch64.h	(revision 511074)
>+++ files/patch-include_libunwind-aarch64.h	(working copy)
>@@ -1,4 +1,4 @@
>---- include/libunwind-aarch64.h.orig	2018-06-15 23:58:09 UTC
>+--- include/libunwind-aarch64.h.orig	2019-09-04 09:23:13 UTC
> +++ include/libunwind-aarch64.h
> @@ -177,7 +177,7 @@ typedef ucontext_t unw_tdep_context_t;
>  
>@@ -5,7 +5,7 @@
>  #define unw_tdep_getcontext(uc) (({					\
>    unw_tdep_context_t *unw_ctx = (uc);					\
> -  register uint64_t *unw_base asm ("x0") = (uint64_t*) unw_ctx->uc_mcontext.regs;		\
>-+  register uint64_t *unw_base asm ("x0") = (uint64_t*) unw_ctx->uc_mcontext.mc_gpregs.gp_x;		\
>++  register uint64_t *unw_base asm ("x0") = (uint64_t*) 	unw_ctx->uc_mcontext.mc_gpregs.gp_x;	\
>    __asm__ __volatile__ (						\
>       "stp x0, x1, [%[base], #0]\n" \
>       "stp x2, x3, [%[base], #16]\n" \
>Index: files/patch-include_libunwind__i.h
>===================================================================
>--- files/patch-include_libunwind__i.h	(revision 511074)
>+++ files/patch-include_libunwind__i.h	(nonexistent)
>@@ -1,14 +0,0 @@
>---- include/libunwind_i.h.orig	2018-06-15 23:58:15 UTC
>-+++ include/libunwind_i.h
>-@@ -86,6 +86,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
>- #   error Host has unknown byte-order.
>- # endif
>- #endif
>-+#ifdef __FreeBSD__
>-+#define __BYTE_ORDER BYTE_ORDER
>-+#define __LITTLE_ENDIAN LITTLE_ENDIAN
>-+#define __BIG_ENDIAN BIG_ENDIAN
>-+#endif
>- 
>- #if defined(HAVE__BUILTIN_UNREACHABLE)
>- # define unreachable() __builtin_unreachable()
>
>Property changes on: files/patch-include_libunwind__i.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src_aarch64_Ginit.c
>===================================================================
>--- files/patch-src_aarch64_Ginit.c	(revision 511074)
>+++ files/patch-src_aarch64_Ginit.c	(working copy)
>@@ -1,11 +1,11 @@
>---- src/aarch64/Ginit.c.orig	2018-06-15 23:58:20 UTC
>+--- src/aarch64/Ginit.c.orig	2019-09-04 09:26:23 UTC
> +++ src/aarch64/Ginit.c
> @@ -44,7 +44,7 @@ static inline void *
>  uc_addr (ucontext_t *uc, int reg)
>  {
>-   if (reg >= UNW_AARCH64_X0 && reg <= UNW_AARCH64_V31)
>+   if (reg >= UNW_AARCH64_X0 && reg < UNW_AARCH64_V0)
> -    return &uc->uc_mcontext.regs[reg];
>-+    return &uc->uc_mcontext.mc_gpregs.gp_x[reg];
>++    return &uc->uc_mcontext.mc_gpregs.gp_x[reg]; 
>+   else if (reg >= UNW_AARCH64_V0 && reg <= UNW_AARCH64_V31)
>+     return &GET_FPCTX(uc)->vregs[reg - UNW_AARCH64_V0];
>    else
>-     return NULL;
>- }
>Index: files/patch-src_coredump___UCD__access__reg__freebsd.c
>===================================================================
>--- files/patch-src_coredump___UCD__access__reg__freebsd.c	(revision 511074)
>+++ files/patch-src_coredump___UCD__access__reg__freebsd.c	(working copy)
>@@ -1,13 +1,13 @@
>---- src/coredump/_UCD_access_reg_freebsd.c.orig	2018-06-16 00:05:10 UTC
>+--- src/coredump/_UCD_access_reg_freebsd.c.orig	2019-09-04 09:30:26 UTC
> +++ src/coredump/_UCD_access_reg_freebsd.c
> @@ -110,6 +110,10 @@ _UCD_access_reg (unw_addr_space_t as,
>        Debug(0, "bad regnum:%d\n", regnum);
>        return -UNW_EINVAL;
>-   };
>+   }
> +#elif defined(UNW_TARGET_AARCH64)
> +  if (regnum < 0 || regnum >= UNW_AARCH64_FPCR)
> +    return -UNW_EINVAL;
> +  *valp = ui->prstatus->pr_reg.x[regnum];
>- #else
>- #error Port me
>- #endif
>+ #elif defined(UNW_TARGET_ARM)
>+   if (regnum >= UNW_ARM_R0 && regnum <= UNW_ARM_R12) {
>+      *valp = ui->prstatus->pr_reg.r[regnum];
>Index: files/patch-src_ptrace___UPT__access__fpreg.c
>===================================================================
>--- files/patch-src_ptrace___UPT__access__fpreg.c	(revision 511074)
>+++ files/patch-src_ptrace___UPT__access__fpreg.c	(working copy)
>@@ -1,20 +1,20 @@
>---- src/ptrace/_UPT_access_fpreg.c.orig	2018-06-15 23:58:03 UTC
>+--- src/ptrace/_UPT_access_fpreg.c.orig	2019-09-04 09:33:38 UTC
> +++ src/ptrace/_UPT_access_fpreg.c
>-@@ -85,6 +85,8 @@ _UPT_access_fpreg (unw_addr_space_t as, unw_regnum_t r
>-           memcpy(&fpreg.fpr_xacc[reg], val, sizeof(unw_fpreg_t));
>+@@ -81,6 +81,8 @@ _UPT_access_fpreg (unw_addr_space_t as, 
>  #elif defined(__i386__)
>-           memcpy(&fpreg.fpr_acc[reg], val, sizeof(unw_fpreg_t));
>+   if ((unsigned) reg < UNW_X86_ST0 || (unsigned) reg > UNW_X86_ST7)
>+     return -UNW_EBADREG;
> +#elif defined(__aarch64__)
> +          memcpy(&fpreg.fp_q[reg], val, sizeof(unw_fpreg_t));
>- #else
>- #error Fix me
>- #endif
>-@@ -95,6 +97,8 @@ _UPT_access_fpreg (unw_addr_space_t as, unw_regnum_t r
>-           memcpy(val, &fpreg.fpr_xacc[reg], sizeof(unw_fpreg_t));
>+ #elif defined(__arm__)
>+   if ((unsigned) reg < UNW_ARM_F0 || (unsigned) reg > UNW_ARM_F7)
>+     return -UNW_EBADREG;
>+@@ -97,6 +99,8 @@ _UPT_access_fpreg (unw_addr_space_t as, 
>+           memcpy(&fpreg.fpr_xacc[reg], val, sizeof(unw_fpreg_t));
>  #elif defined(__i386__)
>-           memcpy(val, &fpreg.fpr_acc[reg], sizeof(unw_fpreg_t));
>+           memcpy(&fpreg.fpr_acc[reg], val, sizeof(unw_fpreg_t));
> +#elif defined(__aarch64__)
> +          memcpy(val, &fpreg.fp_q[reg], sizeof(unw_fpreg_t));
>+ #elif defined(__arm__)
>+           memcpy(&fpreg.fpr[reg], val, sizeof(unw_fpreg_t));
>  #else
>- #error Fix me
>- #endif
>Index: files/patch-tests-mapper.c
>===================================================================
>--- files/patch-tests-mapper.c	(revision 511074)
>+++ files/patch-tests-mapper.c	(working copy)
>@@ -1,12 +0,0 @@
>---- tests/mapper.c.orig	2014-10-06 14:46:27.000000000 -0400
>-+++ tests/mapper.c	2014-10-06 14:47:00.000000000 -0400
>-@@ -39,6 +39,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
>- #if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
>- # define MAP_ANONYMOUS MAP_ANON
>- #endif
>-+#if !defined(MAP_NORESERVE)
>-+# define MAP_NORESERVE 0
>-+#endif
>- 
>- int
>- main (void)

Actions: View | Diff

Attachments on bug 219524: 185678 | 207111 | 207112 | 207113 | 207116 | 207188