Attachment 158608 Details for Bug 201473 – Patch to update the arm code

[patch] Patch to update the arm code

boehm-gc-arm.diff (text/plain), 4.05 KB, created by Andrew Turner on 2015-07-11 10:06:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Turner

Created: 2015-07-11 10:06:01 UTC

Size: 4.05 KB

patch

obsolete

>Index: devel/boehm-gc/Makefile
>===================================================================
>--- devel/boehm-gc/Makefile	(revision 391730)
>+++ devel/boehm-gc/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gc
> PORTVERSION=	7.4.2
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	devel
> MASTER_SITES=	http://www.hboehm.info/gc/gc_source/
> PKGNAMEPREFIX=	boehm-
>Index: devel/boehm-gc/files/patch-include_private_gc__priv.h
>===================================================================
>--- devel/boehm-gc/files/patch-include_private_gc__priv.h	(revision 391730)
>+++ devel/boehm-gc/files/patch-include_private_gc__priv.h	(working copy)
>@@ -1,5 +1,5 @@
>---- include/private/gc_priv.h.orig	2014-06-03 06:08:02 UTC
>-+++ include/private/gc_priv.h
>+--- include/private/gc_priv.h.orig	2014-06-03 07:08:02.000000000 +0100
>++++ include/private/gc_priv.h	2015-07-11 10:21:44.309885000 +0100
> @@ -2461,7 +2461,9 @@ GC_INNER ptr_t GC_store_debug_info(ptr_t
>  #endif
>  
>@@ -6,7 +6,7 @@
>  #if defined(FREEBSD) && (defined(I386) || defined(X86_64) \
> -                        || defined(powerpc) || defined(__powerpc__))
> +                        || defined(powerpc) || defined(__powerpc__) \
>-+			|| defined(__aarch64__))
>++			|| defined(__aarch64__) || defined(__arm__))
> +
>  # include <machine/trap.h>
>  # if !defined(PCR)
>Index: devel/boehm-gc/files/patch-include_private_gcconfig.h
>===================================================================
>--- devel/boehm-gc/files/patch-include_private_gcconfig.h	(revision 391730)
>+++ devel/boehm-gc/files/patch-include_private_gcconfig.h	(working copy)
>@@ -1,5 +1,5 @@
>---- include/private/gcconfig.h.orig	2014-06-03 06:08:02 UTC
>-+++ include/private/gcconfig.h
>+--- include/private/gcconfig.h.orig	2014-06-03 07:08:02.000000000 +0100
>++++ include/private/gcconfig.h	2015-07-11 10:20:30.032141000 +0100
> @@ -97,7 +97,7 @@
>  # endif
>  # if defined(__aarch64__)
>@@ -77,3 +77,28 @@
>  #   ifdef NOSYS
>        /* __data_start is usually defined in the target linker script.   */
>        extern int __data_start[];
>+@@ -2059,14 +2097,20 @@
>+ #   endif
>+ #   ifdef FREEBSD
>+       /* FreeBSD/arm */
>+-#     define ALIGNMENT 4
>+ #     define OS_TYPE "FREEBSD"
>++#       ifndef GC_FREEBSD_THREADS
>++#           define MPROTECT_VDB
>++#       endif
>++#       define SIG_SUSPEND SIGUSR1
>++#       define SIG_THR_RESTART SIGUSR2
>++#       define FREEBSD_STACKBOTTOM
>+ #     ifdef __ELF__
>+ #       define DYNAMIC_LOADING
>+ #     endif
>+-#     define HEURISTIC2
>+-      extern char etext[];
>+-#     define SEARCH_FOR_DATA_START
>++        extern char etext[];
>++        ptr_t GC_FreeBSDGetDataStart(size_t, ptr_t);
>++#       define DATASTART GC_FreeBSDGetDataStart(0x1000, (ptr_t)etext)
>++#       define DATASTART_IS_FUNC
>+ #   endif
>+ #   ifdef DARWIN
>+       /* iPhone */
>Index: devel/boehm-gc/files/patch-os__dep.c
>===================================================================
>--- devel/boehm-gc/files/patch-os__dep.c	(revision 391730)
>+++ devel/boehm-gc/files/patch-os__dep.c	(working copy)
>@@ -1,5 +1,5 @@
>---- os_dep.c.orig	2014-06-03 06:08:02 UTC
>-+++ os_dep.c
>+--- os_dep.c.orig	2014-06-03 07:08:02.000000000 +0100
>++++ os_dep.c	2015-07-11 10:27:52.729539000 +0100
> @@ -1869,7 +1869,8 @@ void GC_register_data_segments(void)
>  # endif
>  
>@@ -6,7 +6,7 @@
>  # if defined(FREEBSD) && !defined(PCR) && (defined(I386) || defined(X86_64) \
> -                                || defined(powerpc) || defined(__powerpc__))
> +                                || defined(powerpc) || defined(__powerpc__) \
>-+				|| defined(__aarch64__))
>++				|| defined(__aarch64__) || defined(__arm__))
>  
>  /* Its unclear whether this should be identical to the above, or        */
>  /* whether it should apply to non-X86 architectures.                    */
>@@ -14,7 +14,7 @@
>  #       include <machine/trap.h>
>  #       define CODE_OK (si -> si_code == EXC_DSI \
>                          || si -> si_code == SEGV_ACCERR)
>-+#     elif defined(AARCH64)
>++#     elif defined(AARCH64) || defined(ARM32)
> +#       define CODE_OK (si -> si_code == SEGV_ACCERR)
>  #     else
>  #       define CODE_OK (si -> si_code == BUS_PAGE_FAULT \

Actions: View | Diff

Attachments on bug 201473: 158608 | 158743 | 158795 | 158796 | 158933 | 159604