Sync with dlang/PR/1999

Author: dkgroot

src/core/stdc/errno.d

@@ -1103,106 +1103,106 @@ else version( FreeBSD )
 }
 else version( DragonFlyBSD )
 {
-    enum EPERM              = 1;        /// Operation not permitted
-    enum ENOENT             = 2;        /// No such file or directory
-    enum ESRCH              = 3;        /// No such process
-    enum EINTR              = 4;        /// Interrupted system call
-    enum EIO                = 5;        /// Input/output error
-    enum ENXIO              = 6;        /// Device not configured
-    enum E2BIG              = 7;        /// Argument list too long
-    enum ENOEXEC            = 8;        /// Exec format error
-    enum EBADF              = 9;        /// Bad file descriptor
-    enum ECHILD             = 10;       /// No child processes
-    enum EDEADLK            = 11;       /// Resource deadlock avoided
-    enum ENOMEM             = 12;       /// Cannot allocate memory
-    enum EACCES             = 13;       /// Permission denied
-    enum EFAULT             = 14;       /// Bad address
-    enum ENOTBLK            = 15;       /// Block device required
-    enum EBUSY              = 16;       /// Device busy
-    enum EEXIST             = 17;       /// File exists
-    enum EXDEV              = 18;       /// Cross-device link
-    enum ENODEV             = 19;       /// Operation not supported by device
-    enum ENOTDIR            = 20;       /// Not a directory
-    enum EISDIR             = 21;       /// Is a directory
-    enum EINVAL             = 22;       /// Invalid argument
-    enum ENFILE             = 23;       /// Too many open files in system
-    enum EMFILE             = 24;       /// Too many open files
-    enum ENOTTY             = 25;       /// Inappropriate ioctl for device
-    enum ETXTBSY            = 26;       /// Text file busy
-    enum EFBIG              = 27;       /// File too large
-    enum ENOSPC             = 28;       /// No space left on device
-    enum ESPIPE             = 29;       /// Illegal seek
-    enum EROFS              = 30;       /// Read-only file system
-    enum EMLINK             = 31;       /// Too many links
-    enum EPIPE              = 32;       /// Broken pipe
-    enum EDOM               = 33;       /// Numerical argument out of domain
-    enum ERANGE             = 34;       /// Result too large
-    enum EAGAIN             = 35;       /// Resource temporarily unavailable
-    enum EWOULDBLOCK        = EAGAIN;   /// Operation would block
-    enum EINPROGRESS        = 36;       /// Operation now in progress
-    enum EALREADY           = 37;       /// Operation already in progress
-    enum ENOTSOCK           = 38;       /// Socket operation on non-socket
-    enum EDESTADDRREQ       = 39;       /// Destination address required
-    enum EMSGSIZE           = 40;       /// Message too long
-    enum EPROTOTYPE         = 41;       /// Protocol wrong type for socket
-    enum ENOPROTOOPT        = 42;       /// Protocol not available
-    enum EPROTONOSUPPORT    = 43;       /// Protocol not supported
-    enum ENOTSUP            = 45;       /// Operation not supported
-    enum EOPNOTSUPP         = ENOTSUP;  /// Operation not supported on socket
-    enum EPFNOSUPPORT       = 46;       /// Protocol family not supported
-    enum EAFNOSUPPORT       = 47;       /// Address family not supported by protocol family
-    enum EADDRINUSE         = 48;       /// Address already in use
-    enum EADDRNOTAVAIL      = 49;       /// Can't assign requested address
-    enum ENETDOWN           = 50;       /// Network is down
-    enum ENETUNREACH        = 51;       /// Network is unreachable
-    enum ENETRESET          = 52;       /// Network dropped connection on reset
-    enum ECONNABORTED       = 53;       /// Software caused connection abort
-    enum ECONNRESET         = 54;       /// Connection reset by peer
-    enum ENOBUFS            = 55;       /// No buffer space available
-    enum EISCONN            = 56;       /// Socket is already connected
-    enum ENOTCONN           = 57;       /// Socket is not connected
-    enum ESHUTDOWN          = 58;       /// Can't send after socket shutdown
-    enum ETOOMANYREFS       = 59;       /// Too many refrences; can't splice
-    enum ETIMEDOUT          = 60;       /// Operation timed out
-    enum ECONNREFUSED       = 61;       /// Connection refused
-    enum ELOOP              = 62;       /// Too many levels of symbolic links
-    enum ENAMETOOLONG       = 63;       /// File name too long
-    enum EHOSTUNREACH       = 65;       /// No route to host
-    enum ENOTEMPTY          = 66;       /// Directory not empty
-    enum EPROCLIM           = 67;       /// Too many processes
-    enum EUSERS             = 68;       /// Too many users
-    enum EDQUOT             = 69;       /// Disc quota exceeded
-    enum ESTALE             = 70;       /// Stale NFS file handle
-    enum EREMOTE            = 71;       /// Too many levels of remote in path
-    enum EBADRPC            = 72;       /// RPC struct is bad
-    enum ERPCMISMATCH       = 73;       /// RPC version wrong
-    enum EPROGUNAVAIL       = 74;       /// RPC prog. not avail
-    enum EPROGMISMATCH      = 75;       /// Program version wrong
-    enum EPROCUNAVAIL       = 76;       /// Bad procedure for program
-    enum ENOLCK             = 77;       /// No locks available
-    enum ENOSYS             = 78;       /// Function not implemented
-    enum EFTYPE             = 79;       /// Inappropriate file type or format
-    enum EAUTH              = 80;       /// Authentication error
-    enum ENEEDAUTH          = 81;       /// Need authenticator
-    enum EIDRM              = 82;       /// Itendifier removed
-    enum ENOMSG             = 83;       /// No message of desired type
-    enum EOVERFLOW          = 84;       /// Value too large to be stored in data type
-    enum ECANCELED          = 85;       /// Operation canceled
-    enum EILSEQ             = 86;       /// Illegal byte sequence
-    enum ENOATTR            = 87;       /// Attribute not found
-    enum EDOOFUS            = 88;       /// Programming error
-    enum EBADMSG            = 89;       /// Bad message
-    enum EMULTIHOP          = 90;       /// Multihop attempted
-    enum ENOLINK            = 91;       /// Link has been severed
-    enum EPROTO             = 92;       /// Protocol error
+    enum EPERM              = 1;
+    enum ENOENT             = 2;
+    enum ESRCH              = 3;
+    enum EINTR              = 4;
+    enum EIO                = 5;
+    enum ENXIO              = 6;
+    enum E2BIG              = 7;
+    enum ENOEXEC            = 8;
+    enum EBADF              = 9;
+    enum ECHILD             = 10;
+    enum EDEADLK            = 11;
+    enum ENOMEM             = 12;
+    enum EACCES             = 13;
+    enum EFAULT             = 14;
+    enum ENOTBLK            = 15;
+    enum EBUSY              = 16;
+    enum EEXIST             = 17;
+    enum EXDEV              = 18;
+    enum ENODEV             = 19;
+    enum ENOTDIR            = 20;
+    enum EISDIR             = 21;
+    enum EINVAL             = 22;
+    enum ENFILE             = 23;
+    enum EMFILE             = 24;
+    enum ENOTTY             = 25;
+    enum ETXTBSY            = 26;
+    enum EFBIG              = 27;
+    enum ENOSPC             = 28;
+    enum ESPIPE             = 29;
+    enum EROFS              = 30;
+    enum EMLINK             = 31;
+    enum EPIPE              = 32;
+    enum EDOM               = 33;
+    enum ERANGE             = 34;
+    enum EAGAIN             = 35;
+    enum EWOULDBLOCK        = EAGAIN;
+    enum EINPROGRESS        = 36;
+    enum EALREADY           = 37;
+    enum ENOTSOCK           = 38;
+    enum EDESTADDRREQ       = 39;
+    enum EMSGSIZE           = 40;
+    enum EPROTOTYPE         = 41;
+    enum ENOPROTOOPT        = 42;
+    enum EPROTONOSUPPORT    = 43;
+    enum ENOTSUP            = 45;
+    enum EOPNOTSUPP         = ENOTSUP;
+    enum EPFNOSUPPORT       = 46;
+    enum EAFNOSUPPORT       = 47;
+    enum EADDRINUSE         = 48;
+    enum EADDRNOTAVAIL      = 49;
+    enum ENETDOWN           = 50;
+    enum ENETUNREACH        = 51;
+    enum ENETRESET          = 52;
+    enum ECONNABORTED       = 53;
+    enum ECONNRESET         = 54;
+    enum ENOBUFS            = 55;
+    enum EISCONN            = 56;
+    enum ENOTCONN           = 57;
+    enum ESHUTDOWN          = 58;
+    enum ETOOMANYREFS       = 59;
+    enum ETIMEDOUT          = 60;
+    enum ECONNREFUSED       = 61;
+    enum ELOOP              = 62;
+    enum ENAMETOOLONG       = 63;
+    enum EHOSTUNREACH       = 65;
+    enum ENOTEMPTY          = 66;
+    enum EPROCLIM           = 67;
+    enum EUSERS             = 68;
+    enum EDQUOT             = 69;
+    enum ESTALE             = 70;
+    enum EREMOTE            = 71;
+    enum EBADRPC            = 72;
+    enum ERPCMISMATCH       = 73;
+    enum EPROGUNAVAIL       = 74;
+    enum EPROGMISMATCH      = 75;
+    enum EPROCUNAVAIL       = 76;
+    enum ENOLCK             = 77;
+    enum ENOSYS             = 78;
+    enum EFTYPE             = 79;
+    enum EAUTH              = 80;
+    enum ENEEDAUTH          = 81;
+    enum EIDRM              = 82;
+    enum ENOMSG             = 83;
+    enum EOVERFLOW          = 84;
+    enum ECANCELED          = 85;
+    enum EILSEQ             = 86;
+    enum ENOATTR            = 87;
+    enum EDOOFUS            = 88;
+    enum EBADMSG            = 89;
+    enum EMULTIHOP          = 90;
+    enum ENOLINK            = 91;
+    enum EPROTO             = 92;
     enum ENOMEDIUM          = 93;
     enum EUNUSED94          = 94;
     enum EUNUSED95          = 95;
     enum EUNUSED96          = 96;
     enum EUNUSED97          = 97;
     enum EUNUSED98          = 98;
     enum EASYNC             = 99;
-    enum ELAST              = 99;       /// Must be equal largest errno
+    enum ELAST              = 99;
 }
 else version (Solaris)
 {

src/core/stdc/stdio.d

@@ -182,7 +182,7 @@ else version ( DragonFlyBSD )
         L_tmpnam     = 1024
     }
 
-    struct __sbuf {			// <sys/sbuf.h>
+    struct __sbuf {                     // <sys/sbuf.h>
         byte*            s_buf;         // storage buffer
         int function(void *, const char *, int) sbuf_drain_func;
         void*            s_drain_arg;   // user-supplied drain argument
@@ -203,7 +203,7 @@ else version ( DragonFlyBSD )
         SBUF_INSECTION  = 0x00100000,   // set by sbuf_start_section()
     }
 
-    union __mbstate_t   		// <sys/stdint.h>
+    union __mbstate_t   		        // <sys/stdint.h>
     {
         char[128]   _mbstate8;
         long        _mbstateL;
@@ -459,7 +459,7 @@ else version( DragonFlyBSD )
     /// See /usr/include/stdio.h
     struct __FILE_public
     {
-        ubyte*		*_p;            /* current position in (some) buffer */
+        ubyte*		    *_p;            /* current position in (some) buffer */
         int             _flags;         /* flags, below; this FILE is free if 0 */
         int             _fileno;        /* fileno, if Unix descriptor, else -1 */
         ssize_t         _r;             /* read space left for getc() */

src/core/sys/freebsd/sys/elf_common.d

@@ -78,6 +78,7 @@ enum ELFOSABI_NSK =            14;
 enum ELFOSABI_AROS =           15;
 enum ELFOSABI_ARM =            97;
 enum ELFOSABI_STANDALONE =     255;
+enum ELFOSABI_DRAGONFLYBSD =   ELFOSABI_NONE;
 
 extern (D)
 {

src/core/sys/linux/elf.d

@@ -121,6 +121,7 @@ enum ELFOSABI_OPENBSD =        12;
 enum ELFOSABI_ARM_AEABI =      64;
 enum ELFOSABI_ARM =            97;
 enum ELFOSABI_STANDALONE =     255;
+enum ELFOSABI_DRAGONFLYBSD =   ELFOSABI_NONE;
 
 enum EI_ABIVERSION =   8;
 

src/core/sys/osx/sys/mman.d

@@ -1,5 +1,5 @@
 /**
- * D header file for FreeBSD
+ * D header file for OSX
  *
  * Authors: Martin Nowak
  */

src/core/sys/solaris/sys/elf.d

@@ -229,6 +229,7 @@ enum ELFOSABI_NSK         = 14;
 enum ELFOSABI_AROS        = 15;
 enum ELFOSABI_ARM         = 97;
 enum ELFOSABI_STANDALONE  = 255;
+enum ELFOSABI_DRAGONFLYBSD = ELFOSABI_NONE;
 
 enum EAV_SUNW_NONE    = 0;
 enum EAV_SUNW_CURRENT = 1;

src/core/thread.d

@@ -979,7 +979,7 @@ class Thread
             }
             else
             {
-                // NOTE: pthread_setschedprio is not implemented on OSX or FreeBSD, so use
+                // NOTE: pthread_setschedprio is not implemented on Darwin, FreeBSD or DragonFlyBSD, so use
                 //       the more complicated get/set sequence below.
                 int         policy;
                 sched_param param;

src/core/threadasm.S

@@ -13,7 +13,7 @@
  *          http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#if (defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__)) && defined(__ELF__)
+#if (__linux__ || __FreeBSD__ || __NetBSD__ || __DragonFly__) && __ELF__
 /*
  * Mark the resulting object file as not requiring execution permissions on
  * stack memory. The absence of this section would mark the whole resulting

test/shared/src/load.d

@@ -2,6 +2,7 @@ import core.runtime, core.stdc.stdio, core.thread;
 
 version (linux) import core.sys.linux.dlfcn;
 else version (FreeBSD) import core.sys.freebsd.dlfcn;
+else version (DragonFlyBSD) import core.sys.dragonflybsd.dlfcn;
 else static assert(0, "unimplemented");
 
 void loadSym(T)(void* handle, ref T val, const char* mangle)