Date: Tue, 9 Aug 2016 02:05:47 +0000 (UTC) From: "Carlos J. Puga Medina" <cpm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419897 - in head/devel/boehm-gc: . files Message-ID: <201608090205.u7925lTC073772@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cpm Date: Tue Aug 9 02:05:47 2016 New Revision: 419897 URL: https://svnweb.freebsd.org/changeset/ports/419897 Log: - Update to 7.6.0 - Remove patch which has been incorporated upstream Changelog: https://github.com/ivmai/bdwgc/blob/master/ChangeLog Reviewed by: junovitch (mentor) Approved by: junovitch (mentor) Differential Revision: D7443 Deleted: head/devel/boehm-gc/files/patch-os__dep.c Modified: head/devel/boehm-gc/Makefile head/devel/boehm-gc/distinfo head/devel/boehm-gc/files/patch-include_private_gc__priv.h head/devel/boehm-gc/files/patch-include_private_gcconfig.h Modified: head/devel/boehm-gc/Makefile ============================================================================== --- head/devel/boehm-gc/Makefile Tue Aug 9 02:00:38 2016 (r419896) +++ head/devel/boehm-gc/Makefile Tue Aug 9 02:05:47 2016 (r419897) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gc -PORTVERSION= 7.4.4 +PORTVERSION= 7.6.0 CATEGORIES= devel MASTER_SITES= http://www.hboehm.info/gc/gc_source/ PKGNAMEPREFIX= boehm- Modified: head/devel/boehm-gc/distinfo ============================================================================== --- head/devel/boehm-gc/distinfo Tue Aug 9 02:00:38 2016 (r419896) +++ head/devel/boehm-gc/distinfo Tue Aug 9 02:05:47 2016 (r419897) @@ -1,3 +1,3 @@ -TIMESTAMP = 1465514922 -SHA256 (gc-7.4.4.tar.gz) = e5ca9b628b765076b6ab26f882af3a1a29cde786341e08b9f366604f74e4db84 -SIZE (gc-7.4.4.tar.gz) = 1103245 +TIMESTAMP = 1470671691 +SHA256 (gc-7.6.0.tar.gz) = a14a28b1129be90e55cd6f71127ffc5594e1091d5d54131528c24cd0c03b7d90 +SIZE (gc-7.6.0.tar.gz) = 1111751 Modified: head/devel/boehm-gc/files/patch-include_private_gc__priv.h ============================================================================== --- head/devel/boehm-gc/files/patch-include_private_gc__priv.h Tue Aug 9 02:00:38 2016 (r419896) +++ head/devel/boehm-gc/files/patch-include_private_gc__priv.h Tue Aug 9 02:05:47 2016 (r419897) @@ -1,13 +1,11 @@ ---- include/private/gc_priv.h.orig 2014-06-03 06:08:02 UTC +--- include/private/gc_priv.h.orig 2016-08-08 20:30:31 UTC +++ include/private/gc_priv.h -@@ -2461,7 +2461,9 @@ GC_INNER ptr_t GC_store_debug_info(ptr_t - #endif - - #if defined(FREEBSD) && (defined(I386) || defined(X86_64) \ -- || defined(powerpc) || defined(__powerpc__)) -+ || defined(powerpc) || defined(__powerpc__) \ -+ || defined(__aarch64__)) -+ - # include <machine/trap.h> +@@ -2500,6 +2500,8 @@ GC_INNER ptr_t GC_store_debug_info(ptr_t # if !defined(PCR) # define NEED_FIND_LIMIT + # endif ++ GC_INNER ptr_t GC_FreeBSDGetDataStart(size_t, ptr_t); ++# define DATASTART_IS_FUNC + #endif /* DATASTART_USES_BSDGETDATASTART */ + + #if (defined(NETBSD) || defined(OPENBSD)) && defined(__ELF__) \ Modified: head/devel/boehm-gc/files/patch-include_private_gcconfig.h ============================================================================== --- head/devel/boehm-gc/files/patch-include_private_gcconfig.h Tue Aug 9 02:00:38 2016 (r419896) +++ head/devel/boehm-gc/files/patch-include_private_gcconfig.h Tue Aug 9 02:05:47 2016 (r419897) @@ -1,79 +1,14 @@ ---- include/private/gcconfig.h.orig 2014-06-03 06:08:02 UTC +--- include/private/gcconfig.h.orig 2016-08-08 20:30:40 UTC +++ include/private/gcconfig.h -@@ -97,7 +97,7 @@ - # endif - # if defined(__aarch64__) - # define AARCH64 --# if !defined(LINUX) -+# if !defined(LINUX) && !defined(FREEBSD) - # define NOSYS - # define mach_type_known - # endif -@@ -169,7 +169,7 @@ - # define EWS4800 - # endif - # if !defined(LINUX) && !defined(EWS4800) && !defined(NETBSD) \ -- && !defined(OPENBSD) -+ && !defined(OPENBSD) && !defined(FREEBSD) - # if defined(ultrix) || defined(__ultrix) - # define ULTRIX - # else -@@ -402,6 +402,10 @@ - # define I386 - # define mach_type_known - # endif -+# if defined(FREEBSD) && defined(__aarch64__) -+# define AARCH64 -+# define mach_type_known -+# endif - # if defined(FREEBSD) && (defined(__amd64__) || defined(__x86_64__)) - # define X86_64 - # define mach_type_known -@@ -1647,6 +1651,26 @@ - # define DATAEND ((ptr_t)(&_end)) - # define DYNAMIC_LOADING - # endif -+# ifdef FREEBSD -+# define OS_TYPE "FREEBSD" -+# define ALIGNMENT 4 -+# define SIG_SUSPEND SIGUSR1 -+# define SIG_THR_RESTART SIGUSR2 -+# define FREEBSD_STACKBOTTOM -+# ifdef __ELF__ -+# define DYNAMIC_LOADING -+# endif -+ extern char etext[]; -+ extern char edata[]; -+ extern char end[]; -+# define NEED_FIND_LIMIT -+# define DATASTART ((ptr_t)(&etext)) -+ ptr_t GC_find_limit(ptr_t, GC_bool); -+# define DATAEND (GC_find_limit (DATASTART, TRUE)) -+# define DATAEND_IS_FUNC -+# define DATASTART2 ((ptr_t)(&edata)) -+# define DATAEND2 ((ptr_t)(&end)) -+# endif - # if defined(NONSTOP) - # define CPP_WORDSZ 32 - # define OS_TYPE "NONSTOP" -@@ -1998,6 +2022,20 @@ - extern char _end[]; - # define DATAEND ((ptr_t)(&_end)) - # endif -+# ifdef FREEBSD -+# define OS_TYPE "FREEBSD" -+# ifndef GC_FREEBSD_THREADS -+# define MPROTECT_VDB -+# endif -+# define FREEBSD_STACKBOTTOM -+# ifdef __ELF__ -+# define DYNAMIC_LOADING -+# endif -+ 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 NOSYS - /* __data_start is usually defined in the target linker script. */ - extern int __data_start[]; +@@ -2745,11 +2745,6 @@ + # define SUNOS5SIGS + #endif + +-#ifdef DATASTART_USES_BSDGETDATASTART +- GC_INNER ptr_t GC_FreeBSDGetDataStart(size_t, ptr_t); +-# define DATASTART_IS_FUNC +-#endif +- + #if !defined(GC_EXPLICIT_SIGNALS_UNBLOCK) && defined(SUNOS5SIGS) \ + && !defined(GC_NO_PTHREAD_SIGMASK) + # define GC_EXPLICIT_SIGNALS_UNBLOCK
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608090205.u7925lTC073772>