Attachment #210633 for bug #237427

Lines 1-64 Link Here

(-)b/lang/ldc/Makefile (-42 / +70 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= ldc	3	PORTNAME= ldc
4	PORTVERSION= 1.14.0	4	PORTVERSION= 1.19.0
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	CATEGORIES= lang	6	CATEGORIES= lang
7		7
8	MAINTAINER= acm@FreeBSD.org	8	# link to libexecinfo, use PIC by default
9	COMMENT= The LLVM-based D compiler	9	PATCH_SITES= https://github.com/myfreeweb/ldc/commit/
		10	PATCHFILES= 3df77e9bf1c8acee4b0bc0ce66766461a3318361.patch:-p1 \
		11	573cb1456b1074bb4ab604a838658f30beb6a797.patch:-p1
10		12
11	LICENSE= BSD3CLAUSE	13	MAINTAINER= acm@FreeBSD.org
		14	COMMENT= The LLVM-based D compiler
		15	LICENSE= BSD3CLAUSE
		16	USES= ninja cmake:insource compiler:c++14-lang
12		17
13	BUILD_DEPENDS= llvm70>0:devel/llvm70	18	OPTIONS_GROUP= BOOTSTRAP
14	RUN_DEPENDS= llvm70>0:devel/llvm70	19	BOOTSTRAP_DESC= Force using ltsmaster to bootstrap
15	LIB_DEPENDS= libconfig.so:devel/libconfig	20	OPTIONS_GROUP_BOOTSTRAP=LTSMASTER
		21
		22	LLVM_VERSION= 90
		23	BUILD_DEPENDS= llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION}
		24	RUN_DEPENDS= llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION}
		25
		26	CC= ${LOCALBASE}/bin/clang${LLVM_VERSION}
		27	CXX= ${LOCALBASE}/bin/clang++${LLVM_VERSION}
		28	LLVM_CONFIG= ${LOCALBASE}/bin/llvm-config${LLVM_VERSION}
		29	LDCVER= ${PORTVERSION}
		30
		31	PLIST_SUB= LOCALBASE=${LOCALBASE} SOVERSION=89
16		32
17	BROKEN_aarch64= fails to compile: Error: undefined identifier _jmp_buf, did you mean alias jmp_buf?
18	BROKEN_armv6= fails to compile: Error: undefined identifier _jmp_buf, did you mean alias jmp_buf?	33	BROKEN_armv6= fails to compile: Error: undefined identifier _jmp_buf, did you mean alias jmp_buf?
19	BROKEN_armv7= fails to compile: Error: undefined identifier _jmp_buf, did you mean alias jmp_buf?	34	BROKEN_armv7= fails to compile: Error: undefined identifier _jmp_buf, did you mean alias jmp_buf?
20	BROKEN_i386= function core.bitop.bsf (uint v) is not callable using argument types (ulong)	35	BROKEN_i386= function core.bitop.bsf (uint v) is not callable using argument types (ulong)
21	BROKEN_powerpc64= fails to compile: cc1plus: error: unrecognized command line option "-std=c++11"
22		36
23	USES= cmake:insource	37	USE_GITHUB= yes
24	USE_GITHUB= yes	38	GH_ACCOUNT= ldc-developers
25	GH_ACCOUNT= ldc-developers	39	GH_PROJECT= ldc
26	GH_PROJECT= ldc	40	GH_TUPLE= ldc-developers:druntime:f958e27:druntime/runtime/druntime \
27	GH_TUPLE= ldc-developers:ldc:911589c:tree/ltsmaster \	41	ldc-developers:phobos:26d14c1:phobos/runtime/phobos
28	ldc-developers:druntime:694089c:druntimelts/ltsmaster/runtime/druntime \
29	ldc-developers:phobos:1d758b2:phoboslts/ltsmaster/runtime/phobos \
30	ldc-developers:druntime:54cb25c:druntime/runtime/druntime \
31	ldc-developers:phobos:71cf74f:phobos/runtime/phobos
32
33	CMAKE_ARGS+= -DD_COMPILER:STRING="${WRKSRC}/ltsmaster/bin/ldmd2" \
34	-DBUILD_SHARED_LIBS:STRING="BOTH"
35
36	CC= clang70
37	CXX= clang++70
38
39	BOOTVER= 0.17.6
40	LLVM_CONFIG= llvm-config70
41	LDCVER= ${PORTVERSION}
42		42
43	.include <bsd.port.pre.mk>	43	.include <bsd.port.pre.mk>
44		44
45	.if ${ARCH} == "amd64"	45	.if ${ARCH} == "amd64" \|\| ${ARCH} == "aarch64"
46	CFLAGS+= -fPIC	46	CFLAGS+= -fPIC
47	.endif	47	.endif
48		48
49	.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1200029	49	# Search for a usable bootstrap compiler or fall back to building ltsmaster
50	EXTRA_PATCHES= ${PATCHDIR}/fbsd12-*	50	DRUNTIME_MINVER= 20680
		51
		52	DCOMPILERS= ldmd2 gdmd dmd
		53
		54	.if empty(PORT_OPTIONS:MLTSMASTER)
		55	.for DC_TRY in ${DCOMPILERS}
		56	.if !defined(DC_HOST)
		57	VERSION!= `which ${DC_TRY}` --version \| ${SED} -n 's!^.DMD.v$[0-9]$.$[0-9][0-9][0-9]$.$[0-9]$.*!\1\2\3!p'
		58	.if ${VERSION} > ${DRUNTIME_MINVER}
		59	DC_HOST!= which ${DC_TRY}
		60	BUILD_BOOTSTRAP= no
		61	.endif
		62	.endif
		63	.endfor
51	.endif	64	.endif
52		65
53	post-patch:	66	# falling back to creating bootstrap d-compiler
54	${REINPLACE_CMD} -e 's\|$${llvm_config_names}\|${LLVM_CONFIG}\|g' \	67	.if !defined (DC_HOST)
55	${WRKSRC}/ltsmaster/cmake/Modules/FindLLVM.cmake \	68	BUILD_BOOTSTRAP= yes
56	${WRKSRC}/cmake/Modules/FindLLVM.cmake	69	BOOTSTRAP_DIR= ${WRKDIRPREFIX}${.CURDIR}/work-bootstrap
		70	DC_HOST= ${BOOTSTRAP_DIR}/ltsmaster/bin/ldmd2
		71	BUILD_BOOTSTRAP= yes
		72	.endif
57		73
		74	CMAKE_ARGS+= -DLDC_INSTALL_PREFIX="${PREFIX}" \
		75	-DD_COMPILER:STRING="${DC_HOST}" \
		76	-DCMAKE_C_COMPILER:STRING="${CC}" \
		77	-DCMAKE_CXX_COMPILER:STRING="${CXX}" \
		78	-DLLVM_CONFIG:PATH=${LLVM_CONFIG} \
		79	-DBUILD_SHARED_LIBS:STRING="BOTH"
		80
		81	pre-build:
		82	@echo "DEBUG: bootstrap:${BUILD_BOOTSTRAP} dmd:${DC_HOST} ver:${VERSION} options:${PORT_OPTIONS}"
		83
		84	.if ${BUILD_BOOTSTRAP} == "yes"
58	pre-configure:	85	pre-configure:
59	@cd ${WRKSRC}/ltsmaster && \	86	@echo "Building Bootstrap d-compiler..."
60	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} .	87	${MAKE} -f Makefile.bootstrap FLAVOR=bootstrap
61	@cd ${WRKSRC}/ltsmaster && \	88	.else
62	${SETENV} ${MAKE_ENV} ${MAKE}	89	@echo "Reusing pre-existing d-compiler..."
		90	.endif
63		91
64	.include <bsd.port.post.mk>	92	.include <bsd.port.post.mk>




# $FreeBSD$

PORTNAME=		ldc
DISTVERSION=		0.17.6-6
DISTVERSIONPREFIX=	v
DISTVERSIONSUFFIX=	-g20ef705c
CATEGORIES=		lang

PATCHDIR=       	${MASTERDIR}/files.bootstrap
DISTINFO_FILE=  	${MASTERDIR}/distinfo.bootstrap

MAINTAINER=		acm@FreeBSD.org
COMMENT=		The LLVM-based D compiler
LICENSE=		BSD3CLAUSE
USES= 			ninja cmake:insource compiler

BUILD_DEPENDS=		llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION}
LIB_DEPENDS=		libconfig.so:devel/libconfig
LLVM_VERSION=		70

# fake flavor support in bootstrap (as it is being passed down)
FLAVORS=		bootstrap
FLAVOR?=		${FLAVORS[0]}

BROKEN_armv6=		fails to compile: Error: undefined identifier _jmp_buf, did you mean alias jmp_buf?
BROKEN_armv7=		fails to compile: Error: undefined identifier _jmp_buf, did you mean alias jmp_buf?
BROKEN_i386=		function core.bitop.bsf (uint v) is not callable using argument types (ulong)
BROKEN_powerpc64=	fails to compile: cc1plus: error: unrecognized command line option "-std=c++11"

USE_GITHUB=		yes
GH_ACCOUNT=		ldc-developers
GH_PROJECT=		ldc
GH_TUPLE=		ldc-developers:druntime:13b1ccf:druntimelts/runtime/druntime \
			ldc-developers:phobos:1d758b2:phoboslts/runtime/phobos

CC=			${LOCALBASE}/bin/clang${LLVM_VERSION}
CXX=			${LOCALBASE}/bin/clang++${LLVM_VERSION}
LLVM_CONFIG=		${LOCALBASE}/bin/llvm-config${LLVM_VERSION}
LDCVER=			${PORTVERSION}

.include <bsd.port.pre.mk>

.if ${ARCH} == "amd64" || ${ARCH} == "aarch64"
CFLAGS+=		-fPIC
.endif

CMAKE_ARGS+=		-DCMAKE_C_COMPILER:STRING="${CC}" \
			-DCMAKE_CXX_COMPILER:STRING="${CXX}" \
			-DLLVM_CONFIG:PATH=${LLVM_CONFIG}

post-patch:
	${LN} -sf ${WRKSRC} ${WRKDIR}/ltsmaster
	${REINPLACE_CMD} -e 's|$${llvm_config_names}|${LLVM_CONFIG}|g' \
		${WRKSRC}/cmake/Modules/FindLLVM.cmake

.include <bsd.port.post.mk>




TIMESTAMP = 1578405557
SHA256 (ldc-developers-ldc-v1.19.0_GH0.tar.gz) = d43b0224df475735095f9a349e81feec6ddc1d85f39b6680255ea880f5fa5d22
SIZE (ldc-developers-ldc-v1.19.0_GH0.tar.gz) = 1785347
SHA256 (ldc-developers-druntime-f958e27_GH0.tar.gz) = 724116667dbcde608026c5fec99b55f9819f389e90834dfa14a0a669ea00ff07
SIZE (ldc-developers-druntime-f958e27_GH0.tar.gz) = 1798153
SHA256 (ldc-developers-phobos-26d14c1_GH0.tar.gz) = 07f3a076c8e876b4e3423372705899e8911f266fcf016fccd64152aaeccf74bb
SIZE (ldc-developers-phobos-26d14c1_GH0.tar.gz) = 2386806
SHA256 (3df77e9bf1c8acee4b0bc0ce66766461a3318361.patch) = b2799b4956928d779aa99fd4992ecc6b739381362a1ff154082c54ee1a651b9f
SIZE (3df77e9bf1c8acee4b0bc0ce66766461a3318361.patch) = 1021
SHA256 (573cb1456b1074bb4ab604a838658f30beb6a797.patch) = 299cc893462af827623977be0517554311eff86933792ae7cd7d38e959e95c03
SIZE (573cb1456b1074bb4ab604a838658f30beb6a797.patch) = 1282
SHA256 (ldc-developers-phobos-71cf74f_GH0.tar.gz) = fe01cb3decccde3c5aa0defcba715c283a1f11bf2bed6aedd0e33e43030c9c72
SIZE (ldc-developers-phobos-71cf74f_GH0.tar.gz) = 2355367

Added Link Here

(-)b/lang/ldc/distinfo.bootstrap (+7 lines)
1	TIMESTAMP = 1562693900
2	SHA256 (ldc-developers-ldc-v0.17.6-6-g20ef705c_GH0.tar.gz) = 569dea918c5e164cceab4a8c73dcd7fcf3c913bd99d4f65a5e57ff343a234d6e
3	SIZE (ldc-developers-ldc-v0.17.6-6-g20ef705c_GH0.tar.gz) = 1231783
4	SHA256 (ldc-developers-druntime-13b1ccf_GH0.tar.gz) = 0be26cb90b540e972eae3660e1b865f97d5b1cb6c7ffe76e2ec4eae89ed63f4a
5	SIZE (ldc-developers-druntime-13b1ccf_GH0.tar.gz) = 953762
6	SHA256 (ldc-developers-phobos-1d758b2_GH0.tar.gz) = af70f2d4b09e0062ba986e215677f484c1cec2977a74ca1a73d3534a120992e9
7	SIZE (ldc-developers-phobos-1d758b2_GH0.tar.gz) = 1923043




- Upstreamed aarch64 support patch (but not merged into ldc's fork):
  https://github.com/dlang/druntime/pull/2269
- Remove failing (on aarch64) static assert in bootstrap compiler's math function

--- runtime/druntime/src/core/sys/posix/setjmp.d.orig	2018-12-15 16:48:11 UTC
+++ runtime/druntime/src/core/sys/posix/setjmp.d
@@ -163,6 +163,12 @@ else version( FreeBSD )
         enum _JBLEN = 5;
         struct _jmp_buf { c_long[_JBLEN + 1] _jb; }
     }
+    else version( AArch64 )
+    {
+        enum _JBLEN = 31;
+        // __int128_t
+        struct _jmp_buf { long[2][_JBLEN + 1] _jb; };
+    }
     else
         static assert(0);
     alias _jmp_buf[1] jmp_buf;
@@ -249,6 +255,11 @@ else version( FreeBSD )
         enum _JB_SIGMASK    = 3;
         enum _JB_SIGFLAG    = 5;
         struct _sigjmp_buf { c_long[_JBLEN + 1] _sjb; }
+    }
+    else version( AArch64 )
+    {
+        // __int128_t
+        struct _sigjmp_buf { long[2][_JBLEN + 1] _jb; };
     }
     else
         static assert(0);
--- runtime/druntime/src/core/sys/posix/ucontext.d.orig	2018-12-15 16:48:11 UTC
+++ runtime/druntime/src/core/sys/posix/ucontext.d
@@ -686,6 +686,38 @@ else version( FreeBSD )
             int[6]          mc_spare2;
         }
     }
+    else version( AArch64 )
+    {
+        alias __register_t = long;
+
+        struct gpregs
+        {
+            __register_t[30] gp_x;
+            __register_t     gp_lr;
+            __register_t     gp_sp;
+            __register_t     gp_elr;
+            uint             gp_spsr;
+            int              gp_pad;
+        }
+
+        struct fpregs
+        {
+            ulong[2][32]    fp_q; // __uint128_t
+            uint            fp_sr;
+            uint            fp_cr;
+            int             fp_flags;
+            int             fp_pad;
+        }
+
+        struct mcontext_t
+        {
+            gpregs          mc_gpregs;
+            fpregs          mc_fpregs;
+            int             mc_flags;
+            int             mc_pad;
+            ulong[8]        mc_spare;
+        }
+    }

     // <ucontext.h>
     enum UCF_SWAPPED = 0x00000001;
--- runtime/phobos/std/internal/math/gammafunction.d.orig	2019-04-20 23:21:36 UTC
+++ runtime/phobos/std/internal/math/gammafunction.d
@@ -1654,7 +1654,6 @@ real logmdigammaInverse(real y)
 {
     import std.numeric: findRoot;
     enum maxY = logmdigamma(real.min_normal);
-    static assert(maxY > 0 && maxY <= real.max);

     if (y >= maxY)
     {




--- runtime/druntime/src/core/sys/freebsd/sys/event.d.orig	2018-12-15 16:48:11 UTC
+++ runtime/druntime/src/core/sys/freebsd/sys/event.d
@@ -125,6 +125,7 @@ enum
 }

 int kqueue();
+pragma(mangle, "kevent@FBSD_1.0")
 int kevent(int kq, const kevent_t *changelist, int nchanges,
            kevent_t *eventlist, int nevents,
            const timespec *timeout);
--- runtime/druntime/src/core/sys/posix/dirent.d.orig	2018-12-15 16:48:11 UTC
+++ runtime/druntime/src/core/sys/posix/dirent.d
@@ -140,7 +140,7 @@ else version( FreeBSD )

     alias void* DIR;

-    dirent* readdir(DIR*);
+    pragma(mangle, "readdir@FBSD_1.0") dirent* readdir(DIR*);
 }
 else version( DragonFlyBSD )
 {
@@ -273,7 +273,7 @@ else version( OSX )
 }
 else version( FreeBSD )
 {
-    int readdir_r(DIR*, dirent*, dirent**);
+    pragma(mangle, "readdir_r@FBSD_1.0") int readdir_r(DIR*, dirent*, dirent**);
 }
 else version( DragonFlyBSD )
 {
@@ -315,12 +315,12 @@ version( CRuntime_Glibc )
 }
 else version( FreeBSD )
 {
-    void   seekdir(DIR*, c_long);
-    c_long telldir(DIR*);
+    pragma(mangle, "seekdir@@FBSD_1.0") void   seekdir(DIR*, c_long);
+    pragma(mangle, "telldir@@FBSD_1.0") c_long telldir(DIR*);
 }
 else version( DragonFlyBSD )
 {
-    void   seekdir(DIR*, c_long);
+    void seekdir(DIR*, c_long);
     c_long telldir(DIR*);
 }
 else version (OSX)
--- runtime/druntime/src/core/sys/posix/sys/stat.d.orig	2018-12-15 16:48:11 UTC
+++ runtime/druntime/src/core/sys/posix/sys/stat.d
@@ -1190,9 +1190,9 @@ else version( OSX )
 }
 else version( FreeBSD )
 {
-    int   fstat(int, stat_t*);
-    int   lstat(in char*, stat_t*);
-    int   stat(in char*, stat_t*);
+    pragma(mangle, "fstat@FBSD_1.0") int   fstat(int, stat_t*);
+    pragma(mangle, "lstat@FBSD_1.0") int   lstat(in char*, stat_t*);
+    pragma(mangle, "stat@FBSD_1.0")  int   stat(in char*, stat_t*);
 }
 else version( DragonFlyBSD )
 {
@@ -1267,7 +1267,7 @@ else version( FreeBSD )
     enum S_IFLNK    = 0xA000; // octal 0120000
     enum S_IFSOCK   = 0xC000; // octal 0140000

-    int mknod(in char*, mode_t, dev_t);
+    pragma(mangle, "mknod@FBSD_1.0") int mknod(in char*, mode_t, dev_t);
 }
 else version( DragonFlyBSD )
 {
--- runtime/druntime/src/core/sys/posix/sys/statvfs.d.orig	2018-12-15 16:48:11 UTC
+++ runtime/druntime/src/core/sys/posix/sys/statvfs.d
@@ -107,6 +107,6 @@ else
         ST_NOSUID = 2
     }

-    int statvfs (const char * file, statvfs_t* buf);
-    int fstatvfs (int fildes, statvfs_t *buf) @trusted;
+    pragma(mangle, "fstatvfs@FBSD_1.0") int statvfs (const char * file, statvfs_t* buf);
+    pragma(mangle, "statvfs@FBSD_1.0")  int fstatvfs (int fildes, statvfs_t *buf) @trusted;
 }




--- ltsmaster/runtime/druntime/src/core/sys/freebsd/sys/event.d	2018-08-21 18:55:47.000000000 +0000
+++ ltsmaster/runtime/druntime/src/core/sys/freebsd/sys/event.d	2019-03-06 04:06:16.750660000 +0000
@@ -46,8 +46,9 @@
     short       filter; /* filter for event */
     ushort       flags;
     uint        fflags;
-    intptr_t      data;
-    void        *udata; /* opaque user data identifier */
+    long      data;
+    void*        udata; /* opaque user data identifier */
+    ulong[4]        ext;
 }
 
 enum




--- ltsmaster/runtime/druntime/src/core/sys/posix/sys/stat.d	2018-08-21 18:55:47.000000000 +0000
+++ ltsmaster/runtime/druntime/src/core/sys/posix/sys/stat.d	2019-03-06 04:13:18.999142000 +0000
@@ -714,32 +714,42 @@
 {
     struct stat_t
     {
-        dev_t       st_dev;
-        ino_t       st_ino;
-        mode_t      st_mode;
-        nlink_t     st_nlink;
-        uid_t       st_uid;
-        gid_t       st_gid;
-        dev_t       st_rdev;
+        dev_t     st_dev;
+        ino_t     st_ino;
+        nlink_t   st_nlink;
+        mode_t    st_mode;
+        short st_padding0;
+        uid_t     st_uid;
+        gid_t     st_gid;
+        int st_padding1;
+        dev_t     st_rdev;
 
+        version(X86) int st_atim_ext;
+
         time_t      st_atime;
         c_long      __st_atimensec;
+
+        version(X86) int st_mtim_ext;
+
         time_t      st_mtime;
         c_long      __st_mtimensec;
+
+        version(X86) int st_ctim_ext;
+
         time_t      st_ctime;
         c_long      __st_ctimensec;
 
-        off_t       st_size;
-        blkcnt_t    st_blocks;
-        blksize_t   st_blksize;
-        fflags_t    st_flags;
-        uint        st_gen;
-        int         st_lspare;
+        version(X86) int st_btim_ext;
 
         time_t      st_birthtime;
         c_long      st_birthtimensec;
 
-        ubyte[16 - timespec.sizeof] padding;
+	off_t     st_size;
+        blkcnt_t st_blocks;
+        blksize_t st_blksize;
+        fflags_t  st_flags;
+        ulong st_gen;
+        ulong[10] st_spare;
     }
 
     enum S_IRUSR    = 0x100; // octal 0000400




--- ltsmaster/runtime/druntime/src/core/sys/posix/sys/types.d	2019-03-06 04:17:35.909692000 +0000
+++ ltsmaster/runtime/druntime/src/core/sys/posix/sys/types.d	2019-03-06 04:18:41.162430000 +0000
@@ -124,12 +124,12 @@
 else version( FreeBSD )
 {
     alias long      blkcnt_t;
-    alias uint      blksize_t;
-    alias uint      dev_t;
+    alias ulong      blksize_t;
+    alias ulong      dev_t;
     alias uint      gid_t;
-    alias uint      ino_t;
+    alias ulong      ino_t;
     alias ushort    mode_t;
-    alias ushort    nlink_t;
+    alias ulong    nlink_t;
     alias long      off_t;
     alias int       pid_t;
     //size_t (defined in core.stdc.stddef)




--- ltsmaster/runtime/druntime/src/core/sys/posix/dirent.d	2019-03-06 04:07:06.836421000 +0000
+++ ltsmaster/runtime/druntime/src/core/sys/posix/dirent.d	2019-03-06 04:08:34.306001000 +0000
@@ -131,10 +131,12 @@
     align(4)
     struct dirent
     {
-        uint      d_fileno;
+        ino_t     d_fileno;
+        off_t     d_off;
         ushort    d_reclen;
         ubyte     d_type;
-        ubyte     d_namlen;
+        ushort    d_namlen;
+        ushort    d_pad1;
         char[256] d_name;
     }
 




--- runtime/druntime/src/core/sys/freebsd/sys/event.d	2019-02-15 17:20:40.000000000 +0000
+++ runtime/druntime/src/core/sys/freebsd/sys/event.d	2019-03-05 17:57:03.552667000 +0000
@@ -49,8 +49,9 @@
     short       filter; /* filter for event */
     ushort       flags;
     uint        fflags;
-    intptr_t      data;
-    void        *udata; /* opaque user data identifier */
+    long          data;
+    void*        udata; /* opaque user data identifier */
+    ulong[4]        ext;
 }
 
 enum




--- runtime/druntime/src/core/sys/freebsd/sys/mount.d	2019-03-05 17:38:00.882617000 +0000
+++ runtime/druntime/src/core/sys/freebsd/sys/mount.d	2019-03-05 17:38:53.720464000 +0000
@@ -32,8 +32,8 @@
 }
 
 enum MFSNAMELEN = 16;
-enum MNAMELEN   = 88;
-enum STATFS_VERSION = 0x20030518;
+enum MNAMELEN   = 1024;
+enum STATFS_VERSION = 0x20140518;
 
 struct statfs_t
 {




--- runtime/druntime/src/core/sys/posix/sys/stat.d	2019-02-15 17:20:40.000000000 +0000
+++ runtime/druntime/src/core/sys/posix/sys/stat.d	2019-03-05 17:49:41.528876000 +0000
@@ -930,32 +930,41 @@
 
     struct stat_t
     {
-        dev_t       st_dev;
-        ino_t       st_ino;
-        mode_t      st_mode;
-        nlink_t     st_nlink;
-        uid_t       st_uid;
-        gid_t       st_gid;
-        dev_t       st_rdev;
+        dev_t     st_dev;
+        ino_t     st_ino;
+        nlink_t   st_nlink;
+        mode_t    st_mode;
+        short st_padding0;
+        uid_t     st_uid;
+        gid_t     st_gid;
+        int st_padding1;
+        dev_t     st_rdev;
 
+        version(X86) int st_atim_ext;
         time_t      st_atime;
         c_long      __st_atimensec;
+
+        version(X86) int st_mtim_ext;
+
         time_t      st_mtime;
         c_long      __st_mtimensec;
+
+        version(X86) int st_ctim_ext;
+
         time_t      st_ctime;
         c_long      __st_ctimensec;
 
-        off_t       st_size;
-        blkcnt_t    st_blocks;
-        blksize_t   st_blksize;
-        fflags_t    st_flags;
-        uint        st_gen;
-        int         st_lspare;
+        version(X86) int st_btim_ext;
 
         time_t      st_birthtime;
         c_long      st_birthtimensec;
 
-        ubyte[16 - timespec.sizeof] padding;
+        off_t     st_size;
+        blkcnt_t st_blocks;
+        blksize_t st_blksize;
+        fflags_t  st_flags;
+        ulong st_gen;
+        ulong[10] st_spare;
     }
 
     enum S_IRUSR    = 0x100; // octal 0000400




--- runtime/druntime/src/core/sys/posix/sys/types.d	2019-02-15 17:20:40.000000000 +0000
+++ runtime/druntime/src/core/sys/posix/sys/types.d	2019-03-05 17:51:58.972306000 +0000
@@ -145,14 +145,13 @@
 }
 else version (FreeBSD)
 {
-    // https://github.com/freebsd/freebsd/blob/master/sys/sys/_types.h
     alias long      blkcnt_t;
-    alias uint      blksize_t;
-    alias uint      dev_t;
+    alias ulong     blksize_t;
+    alias ulong     dev_t;
     alias uint      gid_t;
-    alias uint      ino_t;
+    alias ulong     ino_t;
     alias ushort    mode_t;
-    alias ushort    nlink_t;
+    alias ulong     nlink_t;
     alias long      off_t;
     alias int       pid_t;
     //size_t (defined in core.stdc.stddef)




--- runtime/druntime/src/core/sys/posix/dirent.d	2019-03-05 17:39:54.822687000 +0000
+++ runtime/druntime/src/core/sys/posix/dirent.d	2019-03-05 17:41:19.267583000 +0000
@@ -152,11 +152,13 @@
     align(4)
     struct dirent
     {
-        uint      d_fileno;
-        ushort    d_reclen;
-        ubyte     d_type;
-        ubyte     d_namlen;
-        char[256] d_name;
+         ino_t     d_fileno;
+         off_t     d_off;
+         ushort    d_reclen;
+         ubyte     d_type;
+         ushort    d_namlen;
+         ushort    d_pad1;
+         char[256] d_name;
     }
 
     alias void* DIR;




https://github.com/ldc-developers/ldc/issues/3108
https://github.com/myfreeweb/druntime/commit/4cc671669d45f14cc8fd270857d5cbeae6b38be8

--- runtime/druntime/src/core/sys/freebsd/execinfo.d.orig	2019-05-27 19:11:41 UTC
+++ runtime/druntime/src/core/sys/freebsd/execinfo.d
@@ -15,6 +15,9 @@ nothrow:
 version (GNU)
     version = BacktraceExternal;

+version (LDC)
+    version = BacktraceExternal;
+
 version (BacktraceExternal)
 {
     size_t backtrace(void**, size_t);
@@ -38,11 +41,6 @@ else
             asm nothrow @trusted { mov p[EBP], EBP; }
         else version (D_InlineAsm_X86_64)
             asm nothrow @trusted { mov p[RBP], RBP; }
-        else version (AArch64) // LDC
-        {
-            import ldc.llvmasm;
-            __asm("str x29, $0", "=*m", &p);
-        }
         else
             static assert(false, "Architecture not supported.");

--- runtime/druntime/src/core/runtime.d.orig	2019-10-15 22:07:36 UTC
+++ runtime/druntime/src/core/runtime.d
@@ -833,7 +833,7 @@
     {
         version (LDC)
         {
-            numframes = backtrace( callstack.ptr, MAXFRAMES );
+            numframes = cast(int) backtrace( callstack.ptr, MAXFRAMES );
         }
         else
         {

Lines 3-9 bin/ldc-profdata Link Here

(-)b/lang/ldc/pkg-plist (-14 / +73 lines)
3	bin/ldc-prune-cache	3	bin/ldc-prune-cache
4	bin/ldc2	4	bin/ldc2
5	bin/ldmd2	5	bin/ldmd2
6	%%ETCDIR%%2.conf	6	etc/ldc2.conf
7	include/d/core/atomic.d	7	include/d/core/atomic.d
8	include/d/core/attribute.d	8	include/d/core/attribute.d
9	include/d/core/bitop.d	9	include/d/core/bitop.d
Lines 11-25 include/d/core/checkedint.d Link Here
11	include/d/core/cpuid.d	11	include/d/core/cpuid.d
12	include/d/core/demangle.d	12	include/d/core/demangle.d
13	include/d/core/exception.d	13	include/d/core/exception.d
		14	include/d/core/gc/config.d
		15	include/d/core/gc/gcinterface.d
		16	include/d/core/gc/registry.d
14	include/d/core/internal/abort.d	17	include/d/core/internal/abort.d
15	include/d/core/internal/arrayop.d	18	include/d/core/internal/array/appending.d
		19	include/d/core/internal/array/capacity.d
		20	include/d/core/internal/array/casting.d
		21	include/d/core/internal/array/comparison.d
		22	include/d/core/internal/array/concatenation.d
		23	include/d/core/internal/array/construction.d
		24	include/d/core/internal/array/equality.d
		25	include/d/core/internal/array/operations.d
		26	include/d/core/internal/array/utils.d
		27	include/d/core/internal/atomic.d
		28	include/d/core/internal/attributes.d
16	include/d/core/internal/convert.d	29	include/d/core/internal/convert.d
		30	include/d/core/internal/dassert.d
		31	include/d/core/internal/destruction.d
		32	include/d/core/internal/entrypoint.d
17	include/d/core/internal/hash.d	33	include/d/core/internal/hash.d
		34	include/d/core/internal/lifetime.d
		35	include/d/core/internal/moving.d
18	include/d/core/internal/parseoptions.d	36	include/d/core/internal/parseoptions.d
		37	include/d/core/internal/postblit.d
19	include/d/core/internal/spinlock.d	38	include/d/core/internal/spinlock.d
20	include/d/core/internal/string.d	39	include/d/core/internal/string.d
		40	include/d/core/internal/switch_.d
21	include/d/core/internal/traits.d	41	include/d/core/internal/traits.d
22	include/d/core/internal/utf.d	42	include/d/core/internal/utf.d
		43	include/d/core/internal/util/array.d
		44	include/d/core/lifetime.d
23	include/d/core/math.d	45	include/d/core/math.d
24	include/d/core/memory.d	46	include/d/core/memory.d
25	include/d/core/runtime.d	47	include/d/core/runtime.d
Lines 46-67 include/d/core/stdc/tgmath.d Link Here
46	include/d/core/stdc/time.d	68	include/d/core/stdc/time.d
47	include/d/core/stdc/wchar_.d	69	include/d/core/stdc/wchar_.d
48	include/d/core/stdc/wctype.d	70	include/d/core/stdc/wctype.d
		71	include/d/core/stdcpp/allocator.d
49	include/d/core/stdcpp/array.d	72	include/d/core/stdcpp/array.d
50	include/d/core/stdcpp/exception.d	73	include/d/core/stdcpp/exception.d
		74	include/d/core/stdcpp/new_.d
		75	include/d/core/stdcpp/string.d
51	include/d/core/stdcpp/string_view.d	76	include/d/core/stdcpp/string_view.d
		77	include/d/core/stdcpp/type_traits.d
52	include/d/core/stdcpp/typeinfo.d	78	include/d/core/stdcpp/typeinfo.d
		79	include/d/core/stdcpp/vector.d
53	include/d/core/stdcpp/xutility.d	80	include/d/core/stdcpp/xutility.d
54	include/d/core/sync/barrier.d	81	include/d/core/sync/barrier.d
55	include/d/core/sync/condition.d	82	include/d/core/sync/condition.d
56	include/d/core/sync/config.d	83	include/d/core/sync/config.d
		84	include/d/core/sync/event.d
57	include/d/core/sync/exception.d	85	include/d/core/sync/exception.d
58	include/d/core/sync/mutex.d	86	include/d/core/sync/mutex.d
59	include/d/core/sync/rwmutex.d	87	include/d/core/sync/rwmutex.d
60	include/d/core/sync/semaphore.d	88	include/d/core/sync/semaphore.d
		89	include/d/core/sys/bionic/err.d
61	include/d/core/sys/bionic/fcntl.d	90	include/d/core/sys/bionic/fcntl.d
		91	include/d/core/sys/bionic/string.d
62	include/d/core/sys/bionic/unistd.d	92	include/d/core/sys/bionic/unistd.d
63	include/d/core/sys/darwin/crt_externs.d	93	include/d/core/sys/darwin/crt_externs.d
64	include/d/core/sys/darwin/dlfcn.d	94	include/d/core/sys/darwin/dlfcn.d
		95	include/d/core/sys/darwin/err.d
65	include/d/core/sys/darwin/execinfo.d	96	include/d/core/sys/darwin/execinfo.d
66	include/d/core/sys/darwin/mach/dyld.d	97	include/d/core/sys/darwin/mach/dyld.d
67	include/d/core/sys/darwin/mach/getsect.d	98	include/d/core/sys/darwin/mach/getsect.d
Lines 72-84 include/d/core/sys/darwin/mach/semaphore.d Link Here
72	include/d/core/sys/darwin/mach/thread_act.d	103	include/d/core/sys/darwin/mach/thread_act.d
73	include/d/core/sys/darwin/netinet/in_.d	104	include/d/core/sys/darwin/netinet/in_.d
74	include/d/core/sys/darwin/pthread.d	105	include/d/core/sys/darwin/pthread.d
		106	include/d/core/sys/darwin/string.d
75	include/d/core/sys/darwin/sys/cdefs.d	107	include/d/core/sys/darwin/sys/cdefs.d
76	include/d/core/sys/darwin/sys/event.d	108	include/d/core/sys/darwin/sys/event.d
77	include/d/core/sys/darwin/sys/mman.d	109	include/d/core/sys/darwin/sys/mman.d
78	include/d/core/sys/dragonflybsd/dlfcn.d	110	include/d/core/sys/dragonflybsd/dlfcn.d
		111	include/d/core/sys/dragonflybsd/err.d
79	include/d/core/sys/dragonflybsd/execinfo.d	112	include/d/core/sys/dragonflybsd/execinfo.d
80	include/d/core/sys/dragonflybsd/netinet/in_.d	113	include/d/core/sys/dragonflybsd/netinet/in_.d
81	include/d/core/sys/dragonflybsd/pthread_np.d	114	include/d/core/sys/dragonflybsd/pthread_np.d
		115	include/d/core/sys/dragonflybsd/string.d
82	include/d/core/sys/dragonflybsd/sys/_bitset.d	116	include/d/core/sys/dragonflybsd/sys/_bitset.d
83	include/d/core/sys/dragonflybsd/sys/_cpuset.d	117	include/d/core/sys/dragonflybsd/sys/_cpuset.d
84	include/d/core/sys/dragonflybsd/sys/cdefs.d	118	include/d/core/sys/dragonflybsd/sys/cdefs.d
Lines 89-99 include/d/core/sys/dragonflybsd/sys/elf_common.d Link Here
89	include/d/core/sys/dragonflybsd/sys/event.d	123	include/d/core/sys/dragonflybsd/sys/event.d
90	include/d/core/sys/dragonflybsd/sys/link_elf.d	124	include/d/core/sys/dragonflybsd/sys/link_elf.d
91	include/d/core/sys/dragonflybsd/sys/mman.d	125	include/d/core/sys/dragonflybsd/sys/mman.d
		126	include/d/core/sys/dragonflybsd/sys/socket.d
92	include/d/core/sys/dragonflybsd/time.d	127	include/d/core/sys/dragonflybsd/time.d
93	include/d/core/sys/freebsd/dlfcn.d	128	include/d/core/sys/freebsd/dlfcn.d
		129	include/d/core/sys/freebsd/err.d
94	include/d/core/sys/freebsd/execinfo.d	130	include/d/core/sys/freebsd/execinfo.d
95	include/d/core/sys/freebsd/netinet/in_.d	131	include/d/core/sys/freebsd/netinet/in_.d
96	include/d/core/sys/freebsd/pthread_np.d	132	include/d/core/sys/freebsd/pthread_np.d
		133	include/d/core/sys/freebsd/string.d
97	include/d/core/sys/freebsd/sys/_bitset.d	134	include/d/core/sys/freebsd/sys/_bitset.d
98	include/d/core/sys/freebsd/sys/_cpuset.d	135	include/d/core/sys/freebsd/sys/_cpuset.d
99	include/d/core/sys/freebsd/sys/cdefs.d	136	include/d/core/sys/freebsd/sys/cdefs.d
Lines 111-116 include/d/core/sys/linux/config.d Link Here
111	include/d/core/sys/linux/dlfcn.d	148	include/d/core/sys/linux/dlfcn.d
112	include/d/core/sys/linux/elf.d	149	include/d/core/sys/linux/elf.d
113	include/d/core/sys/linux/epoll.d	150	include/d/core/sys/linux/epoll.d
		151	include/d/core/sys/linux/err.d
114	include/d/core/sys/linux/errno.d	152	include/d/core/sys/linux/errno.d
115	include/d/core/sys/linux/execinfo.d	153	include/d/core/sys/linux/execinfo.d
116	include/d/core/sys/linux/fcntl.d	154	include/d/core/sys/linux/fcntl.d
Lines 120-131 include/d/core/sys/linux/netinet/in_.d Link Here
120	include/d/core/sys/linux/netinet/tcp.d	158	include/d/core/sys/linux/netinet/tcp.d
121	include/d/core/sys/linux/sched.d	159	include/d/core/sys/linux/sched.d
122	include/d/core/sys/linux/stdio.d	160	include/d/core/sys/linux/stdio.d
		161	include/d/core/sys/linux/string.d
123	include/d/core/sys/linux/sys/auxv.d	162	include/d/core/sys/linux/sys/auxv.d
124	include/d/core/sys/linux/sys/eventfd.d	163	include/d/core/sys/linux/sys/eventfd.d
125	include/d/core/sys/linux/sys/file.d	164	include/d/core/sys/linux/sys/file.d
126	include/d/core/sys/linux/sys/inotify.d	165	include/d/core/sys/linux/sys/inotify.d
127	include/d/core/sys/linux/sys/mman.d	166	include/d/core/sys/linux/sys/mman.d
128	include/d/core/sys/linux/sys/netinet/tcp.d
129	include/d/core/sys/linux/sys/prctl.d	167	include/d/core/sys/linux/sys/prctl.d
130	include/d/core/sys/linux/sys/signalfd.d	168	include/d/core/sys/linux/sys/signalfd.d
131	include/d/core/sys/linux/sys/socket.d	169	include/d/core/sys/linux/sys/socket.d
Lines 138-153 include/d/core/sys/linux/timerfd.d Link Here
138	include/d/core/sys/linux/tipc.d	176	include/d/core/sys/linux/tipc.d
139	include/d/core/sys/linux/unistd.d	177	include/d/core/sys/linux/unistd.d
140	include/d/core/sys/netbsd/dlfcn.d	178	include/d/core/sys/netbsd/dlfcn.d
		179	include/d/core/sys/netbsd/err.d
141	include/d/core/sys/netbsd/execinfo.d	180	include/d/core/sys/netbsd/execinfo.d
		181	include/d/core/sys/netbsd/string.d
142	include/d/core/sys/netbsd/sys/elf.d	182	include/d/core/sys/netbsd/sys/elf.d
143	include/d/core/sys/netbsd/sys/elf32.d	183	include/d/core/sys/netbsd/sys/elf32.d
144	include/d/core/sys/netbsd/sys/elf64.d	184	include/d/core/sys/netbsd/sys/elf64.d
145	include/d/core/sys/netbsd/sys/elf_common.d	185	include/d/core/sys/netbsd/sys/elf_common.d
146	include/d/core/sys/netbsd/sys/event.d	186	include/d/core/sys/netbsd/sys/event.d
		187	include/d/core/sys/netbsd/sys/featuretest.d
147	include/d/core/sys/netbsd/sys/link_elf.d	188	include/d/core/sys/netbsd/sys/link_elf.d
148	include/d/core/sys/netbsd/sys/mman.d	189	include/d/core/sys/netbsd/sys/mman.d
149	include/d/core/sys/netbsd/time.d	190	include/d/core/sys/netbsd/time.d
150	include/d/core/sys/openbsd/dlfcn.d	191	include/d/core/sys/openbsd/dlfcn.d
		192	include/d/core/sys/openbsd/err.d
		193	include/d/core/sys/openbsd/string.d
		194	include/d/core/sys/openbsd/sys/cdefs.d
		195	include/d/core/sys/openbsd/sys/elf.d
		196	include/d/core/sys/openbsd/sys/elf32.d
		197	include/d/core/sys/openbsd/sys/elf64.d
		198	include/d/core/sys/openbsd/sys/elf_common.d
		199	include/d/core/sys/openbsd/sys/link_elf.d
		200	include/d/core/sys/openbsd/sys/mman.d
		201	include/d/core/sys/openbsd/time.d
151	include/d/core/sys/posix/aio.d	202	include/d/core/sys/posix/aio.d
152	include/d/core/sys/posix/arpa/inet.d	203	include/d/core/sys/posix/arpa/inet.d
153	include/d/core/sys/posix/config.d	204	include/d/core/sys/posix/config.d
Lines 158-163 include/d/core/sys/posix/grp.d Link Here
158	include/d/core/sys/posix/iconv.d	209	include/d/core/sys/posix/iconv.d
159	include/d/core/sys/posix/inttypes.d	210	include/d/core/sys/posix/inttypes.d
160	include/d/core/sys/posix/libgen.d	211	include/d/core/sys/posix/libgen.d
		212	include/d/core/sys/posix/locale.d
161	include/d/core/sys/posix/mqueue.d	213	include/d/core/sys/posix/mqueue.d
162	include/d/core/sys/posix/net/if_.d	214	include/d/core/sys/posix/net/if_.d
163	include/d/core/sys/posix/netdb.d	215	include/d/core/sys/posix/netdb.d
Lines 173-178 include/d/core/sys/posix/signal.d Link Here
173	include/d/core/sys/posix/spawn.d	225	include/d/core/sys/posix/spawn.d
174	include/d/core/sys/posix/stdio.d	226	include/d/core/sys/posix/stdio.d
175	include/d/core/sys/posix/stdlib.d	227	include/d/core/sys/posix/stdlib.d
		228	include/d/core/sys/posix/string.d
		229	include/d/core/sys/posix/strings.d
176	include/d/core/sys/posix/sys/filio.d	230	include/d/core/sys/posix/sys/filio.d
177	include/d/core/sys/posix/sys/ioccom.d	231	include/d/core/sys/posix/sys/ioccom.d
178	include/d/core/sys/posix/sys/ioctl.d	232	include/d/core/sys/posix/sys/ioctl.d
Lines 200-205 include/d/core/sys/posix/unistd.d Link Here
200	include/d/core/sys/posix/utime.d	254	include/d/core/sys/posix/utime.d
201	include/d/core/sys/solaris/dlfcn.d	255	include/d/core/sys/solaris/dlfcn.d
202	include/d/core/sys/solaris/elf.d	256	include/d/core/sys/solaris/elf.d
		257	include/d/core/sys/solaris/err.d
203	include/d/core/sys/solaris/execinfo.d	258	include/d/core/sys/solaris/execinfo.d
204	include/d/core/sys/solaris/libelf.d	259	include/d/core/sys/solaris/libelf.d
205	include/d/core/sys/solaris/link.d	260	include/d/core/sys/solaris/link.d
Lines 379-387 include/d/core/sys/windows/winuser.d Link Here
379	include/d/core/sys/windows/winver.d	434	include/d/core/sys/windows/winver.d
380	include/d/core/sys/windows/wtsapi32.d	435	include/d/core/sys/windows/wtsapi32.d
381	include/d/core/sys/windows/wtypes.d	436	include/d/core/sys/windows/wtypes.d
382	include/d/core/thread.d	437	include/d/core/thread/fiber.d
		438	include/d/core/thread/osthread.d
		439	include/d/core/thread/package.d
383	include/d/core/time.d	440	include/d/core/time.d
384	include/d/core/vararg.d	441	include/d/core/vararg.d
		442	include/d/core/volatile.d
385	include/d/etc/c/curl.d	443	include/d/etc/c/curl.d
386	include/d/etc/c/odbc/sql.d	444	include/d/etc/c/odbc/sql.d
387	include/d/etc/c/odbc/sqlext.d	445	include/d/etc/c/odbc/sqlext.d
Lines 517-522 include/d/std/net/curl.d Link Here
517	include/d/std/net/isemail.d	575	include/d/std/net/isemail.d
518	include/d/std/numeric.d	576	include/d/std/numeric.d
519	include/d/std/outbuffer.d	577	include/d/std/outbuffer.d
		578	include/d/std/package.d
520	include/d/std/parallelism.d	579	include/d/std/parallelism.d
521	include/d/std/path.d	580	include/d/std/path.d
522	include/d/std/process.d	581	include/d/std/process.d
Lines 554-576 include/d/std/xml.d Link Here
554	include/d/std/zip.d	613	include/d/std/zip.d
555	include/d/std/zlib.d	614	include/d/std/zlib.d
556	lib/libdruntime-ldc-debug-shared.so	615	lib/libdruntime-ldc-debug-shared.so
557	lib/libdruntime-ldc-debug-shared.so.2.0.84	616	lib/libdruntime-ldc-debug-shared.so.2.0.%%SOVERSION%%
558	lib/libdruntime-ldc-debug-shared.so.84	617	lib/libdruntime-ldc-debug-shared.so.%%SOVERSION%%
559	lib/libdruntime-ldc-debug.a	618	lib/libdruntime-ldc-debug.a
560	lib/libdruntime-ldc-shared.so	619	lib/libdruntime-ldc-shared.so
561	lib/libdruntime-ldc-shared.so.2.0.84	620	lib/libdruntime-ldc-shared.so.2.0.%%SOVERSION%%
562	lib/libdruntime-ldc-shared.so.84	621	lib/libdruntime-ldc-shared.so.%%SOVERSION%%
563	lib/libdruntime-ldc.a	622	lib/libdruntime-ldc.a
564	lib/libldc-jit-rt.a	623	lib/libldc-jit-rt.a
565	lib/libldc-jit.so	624	lib/libldc-jit.so
566	lib/libldc-jit.so.2.0.84	625	lib/libldc-jit.so.2.0.%%SOVERSION%%
567	lib/libldc-jit.so.84	626	lib/libldc-jit.so.%%SOVERSION%%
568	lib/libphobos2-ldc-debug-shared.so	627	lib/libphobos2-ldc-debug-shared.so
569	lib/libphobos2-ldc-debug-shared.so.2.0.84	628	lib/libphobos2-ldc-debug-shared.so.2.0.%%SOVERSION%%
570	lib/libphobos2-ldc-debug-shared.so.84	629	lib/libphobos2-ldc-debug-shared.so.%%SOVERSION%%
571	lib/libphobos2-ldc-debug.a	630	lib/libphobos2-ldc-debug.a
572	lib/libphobos2-ldc-shared.so	631	lib/libphobos2-ldc-shared.so
573	lib/libphobos2-ldc-shared.so.2.0.84	632	lib/libphobos2-ldc-shared.so.2.0.%%SOVERSION%%
574	lib/libphobos2-ldc-shared.so.84	633	lib/libphobos2-ldc-shared.so.%%SOVERSION%%
575	lib/libphobos2-ldc.a	634	lib/libphobos2-ldc.a
576	@dir include/d/etc/c/zlib	635	@dir include/d/etc/c/zlib

Return to bug 237427

Added Link Here

(-)b/lang/ldc/Makefile.bootstrap (+56 lines)
1	# $FreeBSD$
2
3	PORTNAME= ldc
4	DISTVERSION= 0.17.6-6
5	DISTVERSIONPREFIX= v
6	DISTVERSIONSUFFIX= -g20ef705c
7	CATEGORIES= lang
8
9	PATCHDIR= ${MASTERDIR}/files.bootstrap
10	DISTINFO_FILE= ${MASTERDIR}/distinfo.bootstrap
11
12	MAINTAINER= acm@FreeBSD.org
13	COMMENT= The LLVM-based D compiler
14	LICENSE= BSD3CLAUSE
15	USES= ninja cmake:insource compiler
16
17	BUILD_DEPENDS= llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION}
18	LIB_DEPENDS= libconfig.so:devel/libconfig
19	LLVM_VERSION= 70
20
21	# fake flavor support in bootstrap (as it is being passed down)
22	FLAVORS= bootstrap
23	FLAVOR?= ${FLAVORS[0]}
24
25	BROKEN_armv6= fails to compile: Error: undefined identifier _jmp_buf, did you mean alias jmp_buf?
26	BROKEN_armv7= fails to compile: Error: undefined identifier _jmp_buf, did you mean alias jmp_buf?
27	BROKEN_i386= function core.bitop.bsf (uint v) is not callable using argument types (ulong)
28	BROKEN_powerpc64= fails to compile: cc1plus: error: unrecognized command line option "-std=c++11"
29
30	USE_GITHUB= yes
31	GH_ACCOUNT= ldc-developers
32	GH_PROJECT= ldc
33	GH_TUPLE= ldc-developers:druntime:13b1ccf:druntimelts/runtime/druntime \
34	ldc-developers:phobos:1d758b2:phoboslts/runtime/phobos
35
36	CC= ${LOCALBASE}/bin/clang${LLVM_VERSION}
37	CXX= ${LOCALBASE}/bin/clang++${LLVM_VERSION}
38	LLVM_CONFIG= ${LOCALBASE}/bin/llvm-config${LLVM_VERSION}
39	LDCVER= ${PORTVERSION}
40
41	.include <bsd.port.pre.mk>
42
43	.if ${ARCH} == "amd64" \|\| ${ARCH} == "aarch64"
44	CFLAGS+= -fPIC
45	.endif
46
47	CMAKE_ARGS+= -DCMAKE_C_COMPILER:STRING="${CC}" \
48	-DCMAKE_CXX_COMPILER:STRING="${CXX}" \
49	-DLLVM_CONFIG:PATH=${LLVM_CONFIG}
50
51	post-patch:
52	${LN} -sf ${WRKSRC} ${WRKDIR}/ltsmaster
53	${REINPLACE_CMD} -e 's\|$${llvm_config_names}\|${LLVM_CONFIG}\|g' \
54	${WRKSRC}/cmake/Modules/FindLLVM.cmake
55
56	.include <bsd.port.post.mk>

Lines 1-13 Link Here

(-)b/lang/ldc/distinfo (-13 / +11 lines)
1	TIMESTAMP = 1551800863	1	TIMESTAMP = 1578405557
2	SHA256 (ldc-developers-ldc-v1.14.0_GH0.tar.gz) = daa7876ce846861cd9feb92f35dc0ca537a845492ca8a3eebecc9d166bc324b3	2	SHA256 (ldc-developers-ldc-v1.19.0_GH0.tar.gz) = d43b0224df475735095f9a349e81feec6ddc1d85f39b6680255ea880f5fa5d22
3	SIZE (ldc-developers-ldc-v1.14.0_GH0.tar.gz) = 1664660	3	SIZE (ldc-developers-ldc-v1.19.0_GH0.tar.gz) = 1785347
4	SHA256 (ldc-developers-ldc-911589c_GH0.tar.gz) = c10ee47d857358ea97eccd14b49b4152c7b2621c0129eee1e8f98988f1d13f5e	4	SHA256 (ldc-developers-druntime-f958e27_GH0.tar.gz) = 724116667dbcde608026c5fec99b55f9819f389e90834dfa14a0a669ea00ff07
5	SIZE (ldc-developers-ldc-911589c_GH0.tar.gz) = 1231073	5	SIZE (ldc-developers-druntime-f958e27_GH0.tar.gz) = 1798153
6	SHA256 (ldc-developers-druntime-694089c_GH0.tar.gz) = 29b1a27f767ac9c8a0c30926991d9abcda119aaf923b05caa686a6c396ac0a83	6	SHA256 (ldc-developers-phobos-26d14c1_GH0.tar.gz) = 07f3a076c8e876b4e3423372705899e8911f266fcf016fccd64152aaeccf74bb
7	SIZE (ldc-developers-druntime-694089c_GH0.tar.gz) = 953726	7	SIZE (ldc-developers-phobos-26d14c1_GH0.tar.gz) = 2386806
8	SHA256 (ldc-developers-phobos-1d758b2_GH0.tar.gz) = af70f2d4b09e0062ba986e215677f484c1cec2977a74ca1a73d3534a120992e9	8	SHA256 (3df77e9bf1c8acee4b0bc0ce66766461a3318361.patch) = b2799b4956928d779aa99fd4992ecc6b739381362a1ff154082c54ee1a651b9f
9	SIZE (ldc-developers-phobos-1d758b2_GH0.tar.gz) = 1923043	9	SIZE (3df77e9bf1c8acee4b0bc0ce66766461a3318361.patch) = 1021
10	SHA256 (ldc-developers-druntime-54cb25c_GH0.tar.gz) = 47a71942f9f6d4c36d867eb2526a72aece36fb959cf99619e525cacb4951e864	10	SHA256 (573cb1456b1074bb4ab604a838658f30beb6a797.patch) = 299cc893462af827623977be0517554311eff86933792ae7cd7d38e959e95c03
11	SIZE (ldc-developers-druntime-54cb25c_GH0.tar.gz) = 1665530	11	SIZE (573cb1456b1074bb4ab604a838658f30beb6a797.patch) = 1282
12	SHA256 (ldc-developers-phobos-71cf74f_GH0.tar.gz) = fe01cb3decccde3c5aa0defcba715c283a1f11bf2bed6aedd0e33e43030c9c72
13	SIZE (ldc-developers-phobos-71cf74f_GH0.tar.gz) = 2355367

Added Link Here

(-)b/lang/ldc/files.bootstrap/patch-aarch64 (+82 lines)
1	- Upstreamed aarch64 support patch (but not merged into ldc's fork):
2	https://github.com/dlang/druntime/pull/2269
3	- Remove failing (on aarch64) static assert in bootstrap compiler's math function
4
5	--- runtime/druntime/src/core/sys/posix/setjmp.d.orig 2018-12-15 16:48:11 UTC
6	+++ runtime/druntime/src/core/sys/posix/setjmp.d
7	@@ -163,6 +163,12 @@ else version( FreeBSD )
8	enum _JBLEN = 5;
9	struct _jmp_buf { c_long[_JBLEN + 1] _jb; }
10	}
11	+ else version( AArch64 )
12	+ {
13	+ enum _JBLEN = 31;
14	+ // __int128_t
15	+ struct _jmp_buf { long[2][_JBLEN + 1] _jb; };
16	+ }
17	else
18	static assert(0);
19	alias _jmp_buf[1] jmp_buf;
20	@@ -249,6 +255,11 @@ else version( FreeBSD )
21	enum _JB_SIGMASK = 3;
22	enum _JB_SIGFLAG = 5;
23	struct _sigjmp_buf { c_long[_JBLEN + 1] _sjb; }
24	+ }
25	+ else version( AArch64 )
26	+ {
27	+ // __int128_t
28	+ struct _sigjmp_buf { long[2][_JBLEN + 1] _jb; };
29	}
30	else
31	static assert(0);
32	--- runtime/druntime/src/core/sys/posix/ucontext.d.orig 2018-12-15 16:48:11 UTC
33	+++ runtime/druntime/src/core/sys/posix/ucontext.d
34	@@ -686,6 +686,38 @@ else version( FreeBSD )
35	int[6] mc_spare2;
36	}
37	}
38	+ else version( AArch64 )
39	+ {
40	+ alias __register_t = long;
41	+
42	+ struct gpregs
43	+ {
44	+ __register_t[30] gp_x;
45	+ __register_t gp_lr;
46	+ __register_t gp_sp;
47	+ __register_t gp_elr;
48	+ uint gp_spsr;
49	+ int gp_pad;
50	+ }
51	+
52	+ struct fpregs
53	+ {
54	+ ulong[2][32] fp_q; // __uint128_t
55	+ uint fp_sr;
56	+ uint fp_cr;
57	+ int fp_flags;
58	+ int fp_pad;
59	+ }
60	+
61	+ struct mcontext_t
62	+ {
63	+ gpregs mc_gpregs;
64	+ fpregs mc_fpregs;
65	+ int mc_flags;
66	+ int mc_pad;
67	+ ulong[8] mc_spare;
68	+ }
69	+ }
70
71	// <ucontext.h>
72	enum UCF_SWAPPED = 0x00000001;
73	--- runtime/phobos/std/internal/math/gammafunction.d.orig 2019-04-20 23:21:36 UTC
74	+++ runtime/phobos/std/internal/math/gammafunction.d
75	@@ -1654,7 +1654,6 @@ real logmdigammaInverse(real y)
76	{
77	import std.numeric: findRoot;
78	enum maxY = logmdigamma(real.min_normal);
79	- static assert(maxY > 0 && maxY <= real.max);
80
81	if (y >= maxY)
82	{

Added Link Here

(-)b/lang/ldc/files.bootstrap/patch-fbsd12 (+81 lines)
1	--- runtime/druntime/src/core/sys/freebsd/sys/event.d.orig 2018-12-15 16:48:11 UTC
2	+++ runtime/druntime/src/core/sys/freebsd/sys/event.d
3	@@ -125,6 +125,7 @@ enum
4	}
5
6	int kqueue();
7	+pragma(mangle, "kevent@FBSD_1.0")
8	int kevent(int kq, const kevent_t *changelist, int nchanges,
9	kevent_t *eventlist, int nevents,
10	const timespec *timeout);
11	--- runtime/druntime/src/core/sys/posix/dirent.d.orig 2018-12-15 16:48:11 UTC
12	+++ runtime/druntime/src/core/sys/posix/dirent.d
13	@@ -140,7 +140,7 @@ else version( FreeBSD )
14
15	alias void* DIR;
16
17	- dirent* readdir(DIR*);
18	+ pragma(mangle, "readdir@FBSD_1.0") dirent* readdir(DIR*);
19	}
20	else version( DragonFlyBSD )
21	{
22	@@ -273,7 +273,7 @@ else version( OSX )
23	}
24	else version( FreeBSD )
25	{
26	- int readdir_r(DIR, dirent, dirent**);
27	+ pragma(mangle, "readdir_r@FBSD_1.0") int readdir_r(DIR, dirent, dirent**);
28	}
29	else version( DragonFlyBSD )
30	{
31	@@ -315,12 +315,12 @@ version( CRuntime_Glibc )
32	}
33	else version( FreeBSD )
34	{
35	- void seekdir(DIR*, c_long);
36	- c_long telldir(DIR*);
37	+ pragma(mangle, "seekdir@@FBSD_1.0") void seekdir(DIR*, c_long);
38	+ pragma(mangle, "telldir@@FBSD_1.0") c_long telldir(DIR*);
39	}
40	else version( DragonFlyBSD )
41	{
42	- void seekdir(DIR*, c_long);
43	+ void seekdir(DIR*, c_long);
44	c_long telldir(DIR*);
45	}
46	else version (OSX)
47	--- runtime/druntime/src/core/sys/posix/sys/stat.d.orig 2018-12-15 16:48:11 UTC
48	+++ runtime/druntime/src/core/sys/posix/sys/stat.d
49	@@ -1190,9 +1190,9 @@ else version( OSX )
50	}
51	else version( FreeBSD )
52	{
53	- int fstat(int, stat_t*);
54	- int lstat(in char, stat_t);
55	- int stat(in char, stat_t);
56	+ pragma(mangle, "fstat@FBSD_1.0") int fstat(int, stat_t*);
57	+ pragma(mangle, "lstat@FBSD_1.0") int lstat(in char, stat_t);
58	+ pragma(mangle, "stat@FBSD_1.0") int stat(in char, stat_t);
59	}
60	else version( DragonFlyBSD )
61	{
62	@@ -1267,7 +1267,7 @@ else version( FreeBSD )
63	enum S_IFLNK = 0xA000; // octal 0120000
64	enum S_IFSOCK = 0xC000; // octal 0140000
65
66	- int mknod(in char*, mode_t, dev_t);
67	+ pragma(mangle, "mknod@FBSD_1.0") int mknod(in char*, mode_t, dev_t);
68	}
69	else version( DragonFlyBSD )
70	{
71	--- runtime/druntime/src/core/sys/posix/sys/statvfs.d.orig 2018-12-15 16:48:11 UTC
72	+++ runtime/druntime/src/core/sys/posix/sys/statvfs.d
73	@@ -107,6 +107,6 @@ else
74	ST_NOSUID = 2
75	}
76
77	- int statvfs (const char * file, statvfs_t* buf);
78	- int fstatvfs (int fildes, statvfs_t *buf) @trusted;
79	+ pragma(mangle, "fstatvfs@FBSD_1.0") int statvfs (const char * file, statvfs_t* buf);
80	+ pragma(mangle, "statvfs@FBSD_1.0") int fstatvfs (int fildes, statvfs_t *buf) @trusted;
81	}

Removed Link Here

(-)a/lang/ldc/files/fbsd12-ltsmaster-runtime-druntime-src-core-sys-freebsd-sys_event.d (-14 lines)
1	--- ltsmaster/runtime/druntime/src/core/sys/freebsd/sys/event.d 2018-08-21 18:55:47.000000000 +0000
2	+++ ltsmaster/runtime/druntime/src/core/sys/freebsd/sys/event.d 2019-03-06 04:06:16.750660000 +0000
3	@@ -46,8 +46,9 @@
4	short filter; /* filter for event */
5	ushort flags;
6	uint fflags;
7	- intptr_t data;
8	- void udata; / opaque user data identifier */
9	+ long data;
10	+ void* udata; /* opaque user data identifier */
11	+ ulong[4] ext;
12	}
13
14	enum

Removed Link Here

(-)a/lang/ldc/files/fbsd12-runtime-druntime-src-core-sys-freebsd-sys_event.d (-14 lines)
1	--- runtime/druntime/src/core/sys/freebsd/sys/event.d 2019-02-15 17:20:40.000000000 +0000
2	+++ runtime/druntime/src/core/sys/freebsd/sys/event.d 2019-03-05 17:57:03.552667000 +0000
3	@@ -49,8 +49,9 @@
4	short filter; /* filter for event */
5	ushort flags;
6	uint fflags;
7	- intptr_t data;
8	- void udata; / opaque user data identifier */
9	+ long data;
10	+ void* udata; /* opaque user data identifier */
11	+ ulong[4] ext;
12	}
13
14	enum

Added Link Here

(-)b/lang/ldc/files/patch-backtrace (+38 lines)
1	https://github.com/ldc-developers/ldc/issues/3108
2	https://github.com/myfreeweb/druntime/commit/4cc671669d45f14cc8fd270857d5cbeae6b38be8
3
4	--- runtime/druntime/src/core/sys/freebsd/execinfo.d.orig 2019-05-27 19:11:41 UTC
5	+++ runtime/druntime/src/core/sys/freebsd/execinfo.d
6	@@ -15,6 +15,9 @@ nothrow:
7	version (GNU)
8	version = BacktraceExternal;
9
10	+version (LDC)
11	+ version = BacktraceExternal;
12	+
13	version (BacktraceExternal)
14	{
15	size_t backtrace(void**, size_t);
16	@@ -38,11 +41,6 @@ else
17	asm nothrow @trusted { mov p[EBP], EBP; }
18	else version (D_InlineAsm_X86_64)
19	asm nothrow @trusted { mov p[RBP], RBP; }
20	- else version (AArch64) // LDC
21	- {
22	- import ldc.llvmasm;
23	- __asm("str x29, $0", "=*m", &p);
24	- }
25	else
26	static assert(false, "Architecture not supported.");
27
28	--- runtime/druntime/src/core/runtime.d.orig 2019-10-15 22:07:36 UTC
29	+++ runtime/druntime/src/core/runtime.d
30	@@ -833,7 +833,7 @@
31	{
32	version (LDC)
33	{
34	- numframes = backtrace( callstack.ptr, MAXFRAMES );
35	+ numframes = cast(int) backtrace( callstack.ptr, MAXFRAMES );
36	}
37	else
38	{