From eb98f5750dab11041fb67218e6df36cf4382260c Mon Sep 17 00:00:00 2001
From: Eugen Wissner <belka@caraus.de>
Date: Mon, 6 Aug 2018 06:37:28 +0200
Subject: [PATCH 01/10] Update to gcc-9-20180805

---
 gcc.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcc.version b/gcc.version
index adcdbbd2e..4d6efce21 100644
--- a/gcc.version
+++ b/gcc.version
@@ -1 +1 @@
-gcc-9-20180729
+gcc-9-20180805

From e8c9c10e4f60e376dc90084f8e693496ccb638af Mon Sep 17 00:00:00 2001
From: Eugen Wissner <belka@caraus.de>
Date: Mon, 13 Aug 2018 07:59:46 +0200
Subject: [PATCH 02/10] Update to gcc-9-20180812

---
 gcc.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcc.version b/gcc.version
index 4d6efce21..5eef2eaa5 100644
--- a/gcc.version
+++ b/gcc.version
@@ -1 +1 @@
-gcc-9-20180805
+gcc-9-20180812

From 47685335665775950bfd3e34b747da69c1153211 Mon Sep 17 00:00:00 2001
From: Eugen Wissner <belka@caraus.de>
Date: Tue, 21 Aug 2018 06:36:14 +0200
Subject: [PATCH 03/10] Update to gcc-9-20180819

---
 gcc.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcc.version b/gcc.version
index 5eef2eaa5..662fc3d68 100644
--- a/gcc.version
+++ b/gcc.version
@@ -1 +1 @@
-gcc-9-20180812
+gcc-9-20180819

From b25ac31e995c3dc598d7c87c4bc4cf9366c7ac8e Mon Sep 17 00:00:00 2001
From: Iain Buclaw <ibuclaw@gdcproject.org>
Date: Wed, 29 Aug 2018 11:51:49 +0200
Subject: [PATCH 04/10] Remove the -fproperty command-line option

---
 gcc/d/ChangeLog                      | 6 ++++++
 gcc/d/d-builtins.cc                  | 4 ++++
 gcc/d/d-lang.cc                      | 4 ----
 gcc/d/lang.opt                       | 4 ----
 gcc/testsuite/gdc.test/d_do_test.exp | 3 ---
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/gcc/d/ChangeLog b/gcc/d/ChangeLog
index 9b8944ff0..237592ca3 100644
--- a/gcc/d/ChangeLog
+++ b/gcc/d/ChangeLog
@@ -1,4 +1,10 @@
+2018-08-25  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* lang.opt (fproperty): Remove option.
+	* d-lang.cc (d_handle_option): Remove case for OPT_fproperty.
+
 2018-07-23  Eugene Wissner  <belka@caraus.de>
+
 	* d-lang.cc (d_handle_option): Change function argument to HOST_WIDE_INT.
 	* lang.opt (Walloca-larger-than=, Wno-alloca-larger-than): New options.
 	* opt.texi (Walloca-larger-than=, Wno-alloca-larger-than): Likewise.
diff --git a/gcc/d/d-builtins.cc b/gcc/d/d-builtins.cc
index 8ff428449..2363552ac 100644
--- a/gcc/d/d-builtins.cc
+++ b/gcc/d/d-builtins.cc
@@ -430,12 +430,16 @@ d_init_versions (void)
     VersionCondition::addPredefinedGlobalIdent ("D_Coverage");
   if (flag_pic)
     VersionCondition::addPredefinedGlobalIdent ("D_PIC");
+
   if (global.params.doDocComments)
     VersionCondition::addPredefinedGlobalIdent ("D_Ddoc");
+
   if (global.params.useUnitTests)
     VersionCondition::addPredefinedGlobalIdent ("unittest");
+
   if (global.params.useAssert)
     VersionCondition::addPredefinedGlobalIdent ("assert");
+
   if (global.params.useArrayBounds == BOUNDSCHECKoff)
     VersionCondition::addPredefinedGlobalIdent ("D_NoBoundsChecks");
 
diff --git a/gcc/d/d-lang.cc b/gcc/d/d-lang.cc
index 0d908b2ec..a0d28246b 100644
--- a/gcc/d/d-lang.cc
+++ b/gcc/d/d-lang.cc
@@ -514,10 +514,6 @@ d_handle_option (size_t scode, const char *arg, HOST_WIDE_INT value,
       global.params.useIn = value;
       break;
 
-    case OPT_fproperty:
-      global.params.enforcePropertySyntax = value;
-      break;
-
     case OPT_frelease:
       global.params.release = value;
       break;
diff --git a/gcc/d/lang.opt b/gcc/d/lang.opt
index d2f8d8631..2eb74f354 100644
--- a/gcc/d/lang.opt
+++ b/gcc/d/lang.opt
@@ -269,10 +269,6 @@ fpreconditions
 D Var(flag_preconditions)
 Generate code for precondition contracts.
 
-fproperty
-D
-This switch is deprecated; do not use.
-
 frelease
 D
 Compile release version.
diff --git a/gcc/testsuite/gdc.test/d_do_test.exp b/gcc/testsuite/gdc.test/d_do_test.exp
index 4a7333913..a3c49165b 100644
--- a/gcc/testsuite/gdc.test/d_do_test.exp
+++ b/gcc/testsuite/gdc.test/d_do_test.exp
@@ -92,9 +92,6 @@ proc gdc-convert-args { base args } {
         } elseif [string match "-O" $arg] {
             lappend out "-O2"
 
-        } elseif [string match "-property" $arg] {
-            lappend out "-fproperty"
-
         } elseif [string match "-release" $arg] {
             lappend out "-frelease"
 

From b748a7d965f83aca78a68635438ed500acbbd6ef Mon Sep 17 00:00:00 2001
From: Iain Buclaw <ibuclaw@gdcproject.org>
Date: Wed, 29 Aug 2018 13:02:54 +0200
Subject: [PATCH 05/10] Backport GccAsmStatement patches

---
 gcc/d/ChangeLog                |   3 +
 gcc/d/Make-lang.in             |   2 +
 gcc/d/d-frontend.cc            |   9 -
 gcc/d/dfrontend/dinterpret.c   |  28 ---
 gcc/d/dfrontend/func.c         |   3 -
 gcc/d/dfrontend/hdrgen.c       |  60 ------
 gcc/d/dfrontend/iasm.c         |  45 +++++
 gcc/d/dfrontend/iasmgcc.c      | 359 +++++++++++++++++++++++++++++++++
 gcc/d/dfrontend/parse.c        | 234 ---------------------
 gcc/d/dfrontend/parse.h        |   6 -
 gcc/d/dfrontend/statement.c    |  57 +++---
 gcc/d/dfrontend/statement.h    |  56 ++---
 gcc/d/dfrontend/statementsem.c |  69 +------
 gcc/d/dfrontend/visitor.h      |  10 +-
 gcc/d/toir.cc                  |   4 +-
 15 files changed, 476 insertions(+), 469 deletions(-)
 create mode 100644 gcc/d/dfrontend/iasm.c
 create mode 100644 gcc/d/dfrontend/iasmgcc.c

diff --git a/gcc/d/ChangeLog b/gcc/d/ChangeLog
index 237592ca3..5c1bafa04 100644
--- a/gcc/d/ChangeLog
+++ b/gcc/d/ChangeLog
@@ -1,7 +1,10 @@
 2018-08-25  Iain Buclaw  <ibuclaw@gdcproject.org>
 
+	* Make-lang.in (D_FRONTEND_OBJS): Add iasm.o, iasmgcc.o
 	* lang.opt (fproperty): Remove option.
 	* d-lang.cc (d_handle_option): Remove case for OPT_fproperty.
+	* toir.cc (IRVisitor::visit(ExtAsmStatement)): Rename override to
+	GccAsmStatement.
 
 2018-07-23  Eugene Wissner  <belka@caraus.de>
 
diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in
index 1b87e0ac4..a224a2bdc 100644
--- a/gcc/d/Make-lang.in
+++ b/gcc/d/Make-lang.in
@@ -94,6 +94,8 @@ D_FRONTEND_OBJS = \
 	d/filename.o \
 	d/func.o \
 	d/hdrgen.o \
+	d/iasm.o \
+	d/iasmgcc.o \
 	d/identifier.o \
 	d/imphint.o \
 	d/init.o \
diff --git a/gcc/d/d-frontend.cc b/gcc/d/d-frontend.cc
index 512bf1dda..63dfda9b4 100644
--- a/gcc/d/d-frontend.cc
+++ b/gcc/d/d-frontend.cc
@@ -428,15 +428,6 @@ CTFloat::hash (real_t r)
 
 /* Implements backend-specific interfaces used by the frontend.  */
 
-/* Semantically analyze AsmStatement where SC is the scope.  */
-
-Statement *
-asmSemantic (AsmStatement *s, Scope *sc)
-{
-  sc->func->hasReturnExp |= 8;
-  return s;
-}
-
 /* Determine return style of function - whether in registers or through a
    hidden pointer to the caller's stack.  */
 
diff --git a/gcc/d/dfrontend/dinterpret.c b/gcc/d/dfrontend/dinterpret.c
index 3e980720e..0d4aed15f 100644
--- a/gcc/d/dfrontend/dinterpret.c
+++ b/gcc/d/dfrontend/dinterpret.c
@@ -689,16 +689,6 @@ class CtfeCompiler : public Visitor
         // we can't compile asm statements
     }
 
-#ifdef IN_GCC
-    void visit(ExtAsmStatement *)
-    {
-    #if LOGCOMPILE
-        printf("%s ExtAsmStatement::ctfeCompile\n", s->loc.toChars());
-    #endif
-        // we can't compile ext asm statements
-    }
-#endif
-
     void ctfeCompile(Statement *s)
     {
         s->accept(this);
@@ -1998,24 +1988,6 @@ class Interpreter : public Visitor
         result = CTFEExp::cantexp;
     }
 
-#ifdef IN_GCC
-    void visit(ExtAsmStatement *s)
-    {
-    #if LOG
-        printf("%s ExtAsmStatement::interpret()\n", s->loc.toChars());
-    #endif
-        if (istate->start)
-        {
-            if (istate->start != s)
-                return;
-            istate->start = NULL;
-        }
-
-        s->error("extended asm statements cannot be interpreted at compile time");
-        result = CTFEExp::cantexp;
-    }
-#endif
-
     void visit(ImportStatement *s)
     {
     #if LOG
diff --git a/gcc/d/dfrontend/func.c b/gcc/d/dfrontend/func.c
index afb9b06a6..124e53451 100644
--- a/gcc/d/dfrontend/func.c
+++ b/gcc/d/dfrontend/func.c
@@ -211,9 +211,6 @@ class StatementRewriteWalker : public Visitor
             visitStmt(s->statement);
     }
     void visit(AsmStatement *) {  }
-#ifdef IN_GCC
-    void visit(ExtAsmStatement *) {  }
-#endif
     void visit(ImportStatement *) {  }
 };
 
diff --git a/gcc/d/dfrontend/hdrgen.c b/gcc/d/dfrontend/hdrgen.c
index ece60b59c..f84c8885f 100644
--- a/gcc/d/dfrontend/hdrgen.c
+++ b/gcc/d/dfrontend/hdrgen.c
@@ -655,66 +655,6 @@ class PrettyPrintVisitor : public Visitor
         buf->writenl();
     }
 
-#ifdef IN_GCC
-    void visit(ExtAsmStatement *s)
-    {
-        buf->writestring ("gcc asm { ");
-
-        if (s->insn)
-            buf->writestring (s->insn->toChars());
-
-        buf->writestring (" : ");
-
-        if (s->args)
-        {
-            for (size_t i = 0; i < s->args->dim; i++)
-            {
-                Identifier *name = (*s->names)[i];
-                Expression *constr = (*s->constraints)[i];
-                Expression *arg = (*s->args)[i];
-
-                if (name)
-                {
-                    buf->writestring ("[");
-                    buf->writestring (name->toChars());
-                    buf->writestring ("] ");
-                }
-
-                if (constr)
-                {
-                    buf->writestring (constr->toChars());
-                    buf->writestring (" ");
-                }
-
-                if (arg)
-                    buf->writestring (arg->toChars());
-
-                if (i < s->outputargs - 1)
-                    buf->writestring (", ");
-                else if (i == s->outputargs - 1)
-                    buf->writestring (" : ");
-                else if (i < s->args->dim - 1)
-                    buf->writestring (", ");
-            }
-        }
-
-        if (s->clobbers)
-        {
-            buf->writestring (" : ");
-            for (size_t i = 0; i < s->clobbers->dim; i++)
-            {
-                Expression *clobber = (*s->clobbers)[i];
-                buf->writestring (clobber->toChars());
-                if (i < s->clobbers->dim - 1)
-                    buf->writestring (", ");
-            }
-        }
-
-        buf->writestring ("; }");
-        buf->writenl();
-    }
-#endif
-
     void visit(ImportStatement *s)
     {
         for (size_t i = 0; i < s->imports->dim; i++)
diff --git a/gcc/d/dfrontend/iasm.c b/gcc/d/dfrontend/iasm.c
new file mode 100644
index 000000000..79071d28a
--- /dev/null
+++ b/gcc/d/dfrontend/iasm.c
@@ -0,0 +1,45 @@
+
+/* Compiler implementation of the D programming language
+ * Copyright (C) 2018 by The D Language Foundation, All Rights Reserved
+ * All Rights Reserved
+ * written by Walter Bright
+ * http://www.digitalmars.com
+ * Distributed under the Boost Software License, Version 1.0.
+ * http://www.boost.org/LICENSE_1_0.txt
+ * https://github.com/D-Programming-Language/dmd/blob/master/src/iasm.c
+ */
+
+/* Inline assembler for the D programming language compiler
+ */
+
+#include "scope.h"
+#include "declaration.h"
+#include "statement.h"
+
+#ifdef IN_GCC
+Statement *gccAsmSemantic(GccAsmStatement *s, Scope *sc);
+#else
+Statement *inlineAsmSemantic(InlineAsmStatement *s, Scope *sc);
+#endif
+
+Statement *asmSemantic(AsmStatement *s, Scope *sc)
+{
+    //printf("AsmStatement::semantic()\n");
+
+    FuncDeclaration *fd = sc->parent->isFuncDeclaration();
+    assert(fd);
+
+    if (!s->tokens)
+        return NULL;
+
+    // Assume assembler code takes care of setting the return value
+    sc->func->hasReturnExp |= 8;
+
+#ifdef IN_GCC
+    GccAsmStatement *eas = new GccAsmStatement(s->loc, s->tokens);
+    return gccAsmSemantic(eas, sc);
+#else
+    InlineAsmStatement *ias = new InlineAsmStatement(s->loc, s->tokens);
+    return inlineAsmSemantic(ias, sc);
+#endif
+}
diff --git a/gcc/d/dfrontend/iasmgcc.c b/gcc/d/dfrontend/iasmgcc.c
new file mode 100644
index 000000000..8a8a5faa5
--- /dev/null
+++ b/gcc/d/dfrontend/iasmgcc.c
@@ -0,0 +1,359 @@
+
+/* Compiler implementation of the D programming language
+ * Copyright (C) 2018 by The D Language Foundation, All Rights Reserved
+ * All Rights Reserved
+ * written by Iain Buclaw
+ * http://www.digitalmars.com
+ * Distributed under the Boost Software License, Version 1.0.
+ * http://www.boost.org/LICENSE_1_0.txt
+ * https://github.com/D-Programming-Language/dmd/blob/master/src/iasmgcc.c
+ */
+
+/* Inline assembler for the GCC D compiler.
+ */
+
+#include "scope.h"
+#include "declaration.h"
+#include "parse.h"
+#include "statement.h"
+
+Expression *semantic(Expression *e, Scope *sc);
+Statement *semantic(Statement *s, Scope *sc);
+
+/***********************************
+ * Parse list of extended asm input or output operands.
+ * Grammar:
+ *      | Operands:
+ *      |     SymbolicName(opt) StringLiteral AssignExpression
+ *      |     SymbolicName(opt) StringLiteral AssignExpression , Operands
+ *      |
+ *      | SymbolicName:
+ *      |     [ Identifier ]
+ * Params:
+ *      p = parser state
+ *      s = asm statement to parse
+ * Returns:
+ *      number of operands added to the gcc asm statement
+ */
+static int parseExtAsmOperands(Parser *p, GccAsmStatement *s)
+{
+    int numargs = 0;
+
+    while (1)
+    {
+        Expression *arg = NULL;
+        Identifier *name = NULL;
+        Expression *constraint = NULL;
+
+        switch (p->token.value)
+        {
+            case TOKsemicolon:
+            case TOKcolon:
+            case TOKeof:
+                return numargs;
+
+            case TOKlbracket:
+                if (p->peekNext() == TOKidentifier)
+                {
+                    p->nextToken();
+                    name = p->token.ident;
+                    p->nextToken();
+                }
+                else
+                {
+                    p->error(s->loc, "expected identifier after `[`");
+                    goto Lerror;
+                }
+                p->check(TOKrbracket);
+                // fall through
+
+            case TOKstring:
+                constraint = p->parsePrimaryExp();
+                arg = p->parseAssignExp();
+
+                if (!s->args)
+                {
+                    s->names = new Identifiers();
+                    s->constraints = new Expressions();
+                    s->args = new Expressions();
+                }
+                s->names->push(name);
+                s->args->push(arg);
+                s->constraints->push(constraint);
+                numargs++;
+
+                if (p->token.value == TOKcomma)
+                    p->nextToken();
+                break;
+
+            default:
+                p->error("expected constant string constraint for operand, not `%s`",
+                        p->token.toChars());
+                goto Lerror;
+        }
+    }
+Lerror:
+    while (p->token.value != TOKrcurly &&
+           p->token.value != TOKsemicolon &&
+           p->token.value != TOKeof)
+        p->nextToken();
+
+    return numargs;
+}
+
+/***********************************
+ * Parse list of extended asm clobbers.
+ * Grammar:
+ *      | Clobbers:
+ *      |     StringLiteral
+ *      |     StringLiteral , Clobbers
+ * Params:
+ *      p = parser state
+ * Returns:
+ *      array of parsed clobber expressions
+ */
+static Expressions *parseExtAsmClobbers(Parser *p)
+{
+    Expressions *clobbers = NULL;
+
+    while (1)
+    {
+        Expression *clobber;
+
+        switch (p->token.value)
+        {
+            case TOKsemicolon:
+            case TOKcolon:
+            case TOKeof:
+                return clobbers;
+
+            case TOKstring:
+                clobber = p->parsePrimaryExp();
+                if (!clobbers)
+                    clobbers = new Expressions();
+                clobbers->push(clobber);
+
+                if (p->token.value == TOKcomma)
+                    p->nextToken();
+                break;
+
+            default:
+                p->error("expected constant string constraint for clobber name, not `%s`",
+                        p->token.toChars());
+                goto Lerror;
+        }
+    }
+Lerror:
+    while (p->token.value != TOKrcurly &&
+           p->token.value != TOKsemicolon &&
+           p->token.value != TOKeof)
+        p->nextToken();
+
+    return clobbers;
+}
+
+/***********************************
+ * Parse list of extended asm goto labels.
+ * Grammar:
+ *      | GotoLabels:
+ *      |     Identifier
+ *      |     Identifier , GotoLabels
+ * Params:
+ *      p = parser state
+ * Returns:
+ *      array of parsed goto labels
+ */
+static Identifiers *parseExtAsmGotoLabels(Parser *p)
+{
+    Identifiers *labels = NULL;
+
+    while (1)
+    {
+        switch (p->token.value)
+        {
+            case TOKsemicolon:
+            case TOKeof:
+                return labels;
+
+            case TOKidentifier:
+                if (!labels)
+                    labels = new Identifiers();
+                labels->push(p->token.ident);
+
+                if (p->nextToken() == TOKcomma)
+                    p->nextToken();
+                break;
+
+            default:
+                p->error("expected identifier for goto label name, not `%s`",
+                        p->token.toChars());
+                goto Lerror;
+        }
+    }
+Lerror:
+    while (p->token.value != TOKrcurly &&
+           p->token.value != TOKsemicolon &&
+           p->token.value != TOKeof)
+        p->nextToken();
+
+    return labels;
+}
+
+/***********************************
+ * Parse a gcc asm statement.
+ * There are three forms of inline asm statements, basic, extended, and goto.
+ * Grammar:
+ *      | AsmInstruction:
+ *      |     BasicAsmInstruction
+ *      |     ExtAsmInstruction
+ *      |     GotoAsmInstruction
+ *      |
+ *      | BasicAsmInstruction:
+ *      |     Expression
+ *      |
+ *      | ExtAsmInstruction:
+ *      |     Expression : Operands(opt) : Operands(opt) : Clobbers(opt)
+ *      |
+ *      | GotoAsmInstruction:
+ *      |     Expression : : Operands(opt) : Clobbers(opt) : GotoLabels(opt)
+ * Params:
+ *      p = parser state
+ *      s = asm statement to parse
+ * Returns:
+ *      the parsed gcc asm statement
+ */
+static GccAsmStatement *parseGccAsm(Parser *p, GccAsmStatement *s)
+{
+    s->insn = p->parseExpression();
+    if (p->token.value == TOKsemicolon)
+        goto Ldone;
+
+    // No semicolon followed after instruction template, treat as extended asm.
+    for (int section = 0; section < 4; ++section)
+    {
+        p->check(TOKcolon);
+
+        switch (section)
+        {
+            case 0:
+                s->outputargs = parseExtAsmOperands(p, s);
+                break;
+
+            case 1:
+                parseExtAsmOperands(p, s);
+                break;
+
+            case 2:
+                s->clobbers = parseExtAsmClobbers(p);
+                break;
+
+            case 3:
+                s->labels = parseExtAsmGotoLabels(p);
+                break;
+
+            default:
+                assert(0);
+        }
+
+        if (p->token.value == TOKsemicolon)
+            goto Ldone;
+    }
+Ldone:
+    p->check(TOKsemicolon);
+
+    return s;
+}
+
+/***********************************
+ * Parse and run semantic analysis on a GccAsmStatement.
+ * Params:
+ *      s  = gcc asm statement being parsed
+ *      sc = the scope where the asm statement is located
+ * Returns:
+ *      the completed gcc asm statement, or null if errors occurred
+ */
+Statement *gccAsmSemantic(GccAsmStatement *s, Scope *sc)
+{
+    //printf("GccAsmStatement::semantic()\n");
+    Parser p(sc->_module, (const utf8_t *)";", 1, false);
+
+    // Make a safe copy of the token list before parsing.
+    Token *toklist = NULL;
+    Token **ptoklist = &toklist;
+
+    for (Token *token = s->tokens; token; token = token->next)
+    {
+        *ptoklist = Token::alloc();
+        memcpy(*ptoklist, token, sizeof(Token));
+        ptoklist = &(*ptoklist)->next;
+        *ptoklist = NULL;
+    }
+    p.token = *toklist;
+
+    // Parse the gcc asm statement.
+    s = parseGccAsm(&p, s);
+    if (p.errors)
+        return NULL;
+    s->stc = sc->stc;
+
+    // Fold the instruction template string.
+    if (s->insn->op == TOKmixin)
+        s->insn = ((CompileExp *)s->insn)->e1;
+    s->insn = semantic(s->insn, sc);
+    s->insn->ctfeInterpret();
+
+    if (s->insn->op != TOKstring || ((StringExp *) s->insn)->sz != 1)
+        s->insn->error("asm instruction template must be a constant char string");
+
+    if (s->labels && s->outputargs)
+        s->error("extended asm statements with labels cannot have output constraints");
+
+    // Analyse all input and output operands.
+    if (s->args)
+    {
+        for (size_t i = 0; i < s->args->dim; i++)
+        {
+            Expression *e = (*s->args)[i];
+            e = semantic(e, sc);
+            // Check argument is a valid lvalue/rvalue.
+            if (i < s->outputargs)
+                e = e->modifiableLvalue(sc, NULL);
+            else if (e->checkValue())
+                e = new ErrorExp();
+            (*s->args)[i] = e;
+
+            e = (*s->constraints)[i];
+            e = semantic(e, sc);
+            assert(e->op == TOKstring && ((StringExp *) e)->sz == 1);
+            (*s->constraints)[i] = e;
+        }
+    }
+
+    // Analyse all clobbers.
+    if (s->clobbers)
+    {
+        for (size_t i = 0; i < s->clobbers->dim; i++)
+        {
+            Expression *e = (*s->clobbers)[i];
+            e = semantic(e, sc);
+            assert(e->op == TOKstring && ((StringExp *) e)->sz == 1);
+            (*s->clobbers)[i] = e;
+        }
+    }
+
+    // Analyse all goto labels.
+    if (s->labels)
+    {
+        for (size_t i = 0; i < s->labels->dim; i++)
+        {
+            Identifier *ident = (*s->labels)[i];
+            GotoStatement *gs = new GotoStatement(s->loc, ident);
+            if (!s->gotos)
+                s->gotos = new GotoStatements();
+            s->gotos->push(gs);
+            semantic(gs, sc);
+        }
+    }
+
+    return s;
+}
diff --git a/gcc/d/dfrontend/parse.c b/gcc/d/dfrontend/parse.c
index 87502903f..f29559209 100644
--- a/gcc/d/dfrontend/parse.c
+++ b/gcc/d/dfrontend/parse.c
@@ -5773,17 +5773,6 @@ Statement *Parser::parseStatement(int flags, const utf8_t** endPtr, Loc *pEndloc
                         /* { */
                         error("matching '}' expected, not end of file");
                         goto Lerror;
-
-#ifdef IN_GCC
-                    case TOKstring:
-                        // If the first token is a string, parse as extended asm.
-                        if (! toklist)
-                        {
-                            s = parseExtAsm(stc);
-                            statements->push(s);
-                            continue;
-                        }
-#endif
                         /* fall through */
 
                     default:
@@ -5838,229 +5827,6 @@ Statement *Parser::parseStatement(int flags, const utf8_t** endPtr, Loc *pEndloc
     return s;
 }
 
-#ifdef IN_GCC
-/***********************************
- * Parse list of extended asm input or output operands.
- * ExtAsmOperand:
- *     [Identifier] StringLiteral (Identifier), ...
- */
-int Parser::parseExtAsmOperands(Expressions *args, Identifiers *names, Expressions *constraints)
-{
-    int numargs = 0;
-
-    while (1)
-    {
-        Expression *arg = NULL;
-        Identifier *name = NULL;
-        Expression *constraint = NULL;
-
-        switch (token.value)
-        {
-            case TOKsemicolon:
-            case TOKcolon:
-            case TOKeof:
-                return numargs;
-
-            case TOKlbracket:
-                nextToken();
-                if (token.value == TOKidentifier)
-                {
-                    name = token.ident;
-                    nextToken();
-                }
-                else
-                {
-                    error("expected identifier after '['");
-                    return numargs;
-                }
-                check(TOKrbracket);
-                // fall through
-
-            default:
-                constraint = parsePrimaryExp();
-                if (constraint->op != TOKstring)
-                {
-                    error(constraint->loc, "expected constant string constraint for operand, not '%s'", constraint->toChars());
-                    goto Lerror;
-                }
-                arg = parseAssignExp();
-
-                args->push(arg);
-                names->push(name);
-                constraints->push(constraint);
-                numargs++;
-
-                if (token.value == TOKcomma)
-                    nextToken();
-                break;
-        }
-    }
-Lerror:
-    while (token.value != TOKrcurly &&
-           token.value != TOKsemicolon &&
-           token.value != TOKeof)
-        nextToken();
-
-    return numargs;
-}
-
-/***********************************
- * Parse list of extended asm clobbers.
- * ExtAsmClobbers:
- *     StringLiteral, ...
- */
-Expressions *Parser::parseExtAsmClobbers()
-{
-    Expressions *clobbers = NULL;
-
-    while (1)
-    {
-        Expression *clobber;
-
-        switch (token.value)
-        {
-            case TOKsemicolon:
-            case TOKcolon:
-            case TOKeof:
-                return clobbers;
-
-            case TOKstring:
-                clobber = parseAssignExp();
-                if (!clobbers)
-                    clobbers = new Expressions;
-                clobbers->push(clobber);
-
-                if (token.value == TOKcomma)
-                    nextToken();
-                break;
-
-            default:
-                error("expected constant string constraint for clobber name, not '%s'", token.toChars());
-                goto Lerror;
-        }
-    }
-Lerror:
-    while (token.value != TOKrcurly &&
-           token.value != TOKsemicolon &&
-           token.value != TOKeof)
-        nextToken();
-
-    return clobbers;
-}
-
-/***********************************
- * Parse list of extended asm goto labels.
- * ExtAsmGotoLabels:
- *     Identifier, ...
- */
-Identifiers *Parser::parseExtAsmGotoLabels()
-{
-    Identifiers *labels = NULL;
-
-    while (1)
-    {
-        switch (token.value)
-        {
-            case TOKsemicolon:
-            case TOKeof:
-                return labels;
-
-            case TOKidentifier:
-                if (!labels)
-                    labels = new Identifiers();
-                labels->push(token.ident);
-
-                if (nextToken() == TOKcomma)
-                    nextToken();
-                break;
-
-            default:
-                error("expected identifier for goto label name, not '%s'", token.toChars());
-                goto Lerror;
-        }
-    }
-Lerror:
-    while (token.value != TOKrcurly &&
-           token.value != TOKsemicolon &&
-           token.value != TOKeof)
-        nextToken();
-
-    return labels;
-}
-
-/***********************************
- * Parse an extended asm statement.
- * ExtAsmStatement:
- *     asm { StringLiterals [ : InputOperands [ : OutputOperands [ : Clobbers [ : GotoLabels ] ] ] ] }
- */
-
-Statement *Parser::parseExtAsm(StorageClass stc)
-{
-    Expressions *args = NULL;
-    Identifiers *names = NULL;
-    Expressions *constraints = NULL;
-    int outputargs = 0;
-    Expressions *clobbers = NULL;
-    Identifiers *labels = NULL;
-    Loc loc = token.loc;
-
-    Expression *insn = parseExpression();
-    if (token.value == TOKsemicolon)
-        goto Ldone;
-
-    for (int section = 0; section < 4; ++section)
-    {
-        check(TOKcolon);
-
-        switch (section)
-        {
-            case 0:
-                if (!args)
-                {
-                    args = new Expressions;
-                    constraints = new Expressions;
-                    names = new Identifiers;
-                }
-                outputargs = parseExtAsmOperands(args, names, constraints);
-                break;
-
-            case 1:
-                parseExtAsmOperands(args, names, constraints);
-                break;
-
-            case 2:
-                clobbers = parseExtAsmClobbers();
-                break;
-
-            case 3:
-                labels = parseExtAsmGotoLabels();
-                break;
-
-            default:
-                assert(0);
-        }
-
-        switch (token.value)
-        {
-            case TOKsemicolon:
-                goto Ldone;
-
-            case TOKeof:
-                error("matching '}' expected, not end of file");
-                goto Ldone;
-
-            default:
-                continue;
-        }
-    }
-  Ldone:
-    check(TOKsemicolon);
-
-    return new ExtAsmStatement(loc, stc, insn, args, names,
-                               constraints, outputargs, clobbers, labels);
-}
-#endif
-
 void Parser::check(TOK value)
 {
     check(token.loc, value);
diff --git a/gcc/d/dfrontend/parse.h b/gcc/d/dfrontend/parse.h
index 5a2e64253..9403c0a20 100644
--- a/gcc/d/dfrontend/parse.h
+++ b/gcc/d/dfrontend/parse.h
@@ -128,12 +128,6 @@ class Parser : public Lexer
     void checkCstyleTypeSyntax(Loc loc, Type *t, int alt, Identifier *ident);
     /** endPtr used for documented unittests */
     Statement *parseStatement(int flags, const utf8_t** endPtr = NULL, Loc *pEndloc = NULL);
-#ifdef IN_GCC
-    Statement *parseExtAsm(StorageClass stc);
-    int parseExtAsmOperands(Expressions *args, Identifiers *names, Expressions *constraints);
-    Expressions *parseExtAsmClobbers();
-    Identifiers *parseExtAsmGotoLabels();
-#endif
     Initializer *parseInitializer();
     Expression *parseDefaultInitExp();
     void check(Loc loc, TOK value);
diff --git a/gcc/d/dfrontend/statement.c b/gcc/d/dfrontend/statement.c
index 886fc5a7c..02aa1af6c 100644
--- a/gcc/d/dfrontend/statement.c
+++ b/gcc/d/dfrontend/statement.c
@@ -192,9 +192,6 @@ bool Statement::comeFrom()
         void visit(DefaultStatement *) { stop = true; }
         void visit(LabelStatement *)   { stop = true; }
         void visit(AsmStatement *)     { stop = true; }
-#ifdef IN_GCC
-        void visit(ExtAsmStatement *)  { stop = true; }
-#endif
     };
 
     ComeFrom cf;
@@ -1579,6 +1576,19 @@ AsmStatement::AsmStatement(Loc loc, Token *tokens)
     : Statement(loc)
 {
     this->tokens = tokens;
+}
+
+Statement *AsmStatement::syntaxCopy()
+{
+    return new AsmStatement(loc, tokens);
+}
+
+
+/************************ InlineAsmStatement **********************************/
+
+InlineAsmStatement::InlineAsmStatement(Loc loc, Token *tokens)
+    : AsmStatement(loc, tokens)
+{
     asmcode = NULL;
     asmalign = 0;
     refparam = false;
@@ -1586,44 +1596,33 @@ AsmStatement::AsmStatement(Loc loc, Token *tokens)
     regs = 0;
 }
 
-Statement *AsmStatement::syntaxCopy()
+Statement *InlineAsmStatement::syntaxCopy()
 {
-    return new AsmStatement(loc, tokens);
+    return new InlineAsmStatement(loc, tokens);
 }
 
 
-#ifdef IN_GCC
-/************************ ExtAsmStatement ***************************************/
+/************************ GccAsmStatement ***************************************/
 
-ExtAsmStatement::ExtAsmStatement(Loc loc, StorageClass stc, Expression *insn,
-                                 Expressions *args, Identifiers *names,
-                                 Expressions *constraints, int outputargs,
-                                 Expressions *clobbers, Identifiers *labels)
-        : Statement(loc)
+GccAsmStatement::GccAsmStatement(Loc loc, Token *tokens)
+        : AsmStatement(loc, tokens)
 {
-    this->stc = stc;
-    this->insn = insn;
-    this->args = args;
-    this->names = names;
-    this->constraints = constraints;
-    this->outputargs = outputargs;
-    this->clobbers = clobbers;
-    this->labels = labels;
+    this->stc = STCundefined;
+    this->insn = NULL;
+    this->args = NULL;
+    this->outputargs = 0;
+    this->names = NULL;
+    this->constraints = NULL;
+    this->clobbers = NULL;
+    this->labels = NULL;
     this->gotos = NULL;
 }
 
-Statement *ExtAsmStatement::syntaxCopy()
+Statement *GccAsmStatement::syntaxCopy()
 {
-    Expressions *c_args = Expression::arraySyntaxCopy(args);
-    Expressions *c_constraints = Expression::arraySyntaxCopy(constraints);
-    Expressions *c_clobbers = Expression::arraySyntaxCopy(clobbers);
-
-    return new ExtAsmStatement(loc, stc, insn->syntaxCopy(), c_args, names,
-                               c_constraints, outputargs, c_clobbers, labels);
+    return new GccAsmStatement(loc, tokens);
 }
 
-#endif
-
 /************************ CompoundAsmStatement ***************************************/
 
 CompoundAsmStatement::CompoundAsmStatement(Loc loc, Statements *s, StorageClass stc)
diff --git a/gcc/d/dfrontend/statement.h b/gcc/d/dfrontend/statement.h
index 02b4bd7ed..fb16cd39c 100644
--- a/gcc/d/dfrontend/statement.h
+++ b/gcc/d/dfrontend/statement.h
@@ -725,15 +725,42 @@ class AsmStatement : public Statement
 {
 public:
     Token *tokens;
+
+    AsmStatement(Loc loc, Token *tokens);
+    Statement *syntaxCopy();
+    void accept(Visitor *v) { v->visit(this); }
+};
+
+class InlineAsmStatement : public AsmStatement
+{
+public:
     code *asmcode;
     unsigned asmalign;          // alignment of this statement
     unsigned regs;              // mask of registers modified (must match regm_t in back end)
     bool refparam;              // true if function parameter is referenced
     bool naked;                 // true if function is to be naked
 
-    AsmStatement(Loc loc, Token *tokens);
+    InlineAsmStatement(Loc loc, Token *tokens);
     Statement *syntaxCopy();
+    void accept(Visitor *v) { v->visit(this); }
+};
 
+// A GCC asm statement - assembler instructions with D expression operands
+class GccAsmStatement : public AsmStatement
+{
+public:
+    StorageClass stc;           // attributes of the asm {} block
+    Expression *insn;           // string expression that is the template for assembler code
+    Expressions *args;          // input and output operands of the statement
+    unsigned outputargs;        // of the operands in 'args', the number of output operands
+    Identifiers *names;         // list of symbolic names for the operands
+    Expressions *constraints;   // list of string constants specifying constraints on operands
+    Expressions *clobbers;      // list of string constants specifying clobbers and scratch registers
+    Identifiers *labels;        // list of goto labels
+    GotoStatements *gotos;      // of the goto labels, the equivalent statements they represent
+
+    GccAsmStatement(Loc loc, Token *tokens);
+    Statement *syntaxCopy();
     void accept(Visitor *v) { v->visit(this); }
 };
 
@@ -761,31 +788,4 @@ class ImportStatement : public Statement
     void accept(Visitor *v) { v->visit(this); }
 };
 
-#ifdef IN_GCC
-
-// Assembler instructions with D expression operands
-class ExtAsmStatement : public Statement
-{
-public:
-    StorageClass stc;
-    Expression *insn;
-    Expressions *args;
-    Identifiers *names;
-    Expressions *constraints;   // Array of StringExp's
-    unsigned outputargs;
-    Expressions *clobbers;      // Array of StringExp's
-    Identifiers *labels;
-    GotoStatements *gotos;
-
-    ExtAsmStatement(Loc loc, StorageClass stc, Expression *insn,
-                    Expressions *args, Identifiers *names,
-                    Expressions *constraints, int outputargs,
-                    Expressions *clobbers, Identifiers *labels);
-    Statement *syntaxCopy();
-
-    void accept(Visitor *v) { v->visit(this); }
-};
-
-#endif
-
 #endif /* DMD_STATEMENT_H */
diff --git a/gcc/d/dfrontend/statementsem.c b/gcc/d/dfrontend/statementsem.c
index e986dcdb1..0bc6b5db5 100644
--- a/gcc/d/dfrontend/statementsem.c
+++ b/gcc/d/dfrontend/statementsem.c
@@ -3453,72 +3453,12 @@ class StatementSemanticVisitor : public Visitor
         result = asmSemantic(s, sc);
     }
 
-#ifdef IN_GCC
-    void visit(ExtAsmStatement *s)
-    {
-        // Fold the instruction template string.
-        s->insn = semantic(s->insn, sc);
-        s->insn->ctfeInterpret();
-
-        if (s->insn->op != TOKstring || ((StringExp *) s->insn)->sz != 1)
-            s->insn->error("instruction template must be a constant char string");
-
-        if (s->labels && s->outputargs)
-            s->error("extended asm statements with labels cannot have output constraints");
-
-        // Analyse all input and output operands.
-        if (s->args)
-        {
-            for (size_t i = 0; i < s->args->dim; i++)
-            {
-                Expression *e = (*s->args)[i];
-                e = semantic(e, sc);
-                // Check argument is a valid lvalue/rvalue.
-                if (i < s->outputargs)
-                    e = e->modifiableLvalue(sc, NULL);
-                else if (e->checkValue())
-                    e = new ErrorExp();
-                (*s->args)[i] = e;
-
-                e = (*s->constraints)[i];
-                e = semantic(e, sc);
-                assert(e->op == TOKstring && ((StringExp *) e)->sz == 1);
-                (*s->constraints)[i] = e;
-            }
-        }
-
-        // Analyse all clobbers.
-        if (s->clobbers)
-        {
-            for (size_t i = 0; i < s->clobbers->dim; i++)
-            {
-                Expression *e = (*s->clobbers)[i];
-                e = semantic(e, sc);
-                assert(e->op == TOKstring && ((StringExp *) e)->sz == 1);
-                (*s->clobbers)[i] = e;
-            }
-        }
-
-        // Analyse all goto labels.
-        if (s->labels)
-        {
-            for (size_t i = 0; i < s->labels->dim; i++)
-            {
-                Identifier *ident = (*s->labels)[i];
-                GotoStatement *gs = new GotoStatement(s->loc, ident);
-                if (!s->gotos)
-                    s->gotos = new GotoStatements();
-                s->gotos->push(gs);
-                semantic(gs, sc);
-            }
-        }
-
-        result = s;
-    }
-#endif
-
     void visit(CompoundAsmStatement *cas)
     {
+        // Apply postfix attributes of the asm block to each statement.
+        sc = sc->push();
+        sc->stc |= cas->stc;
+
         for (size_t i = 0; i < cas->statements->dim; i++)
         {
             Statement *s = (*cas->statements)[i];
@@ -3535,6 +3475,7 @@ class StatementSemanticVisitor : public Visitor
         if (!(cas->stc & (STCtrusted|STCsafe)) && sc->func->setUnsafe())
             cas->error("asm statement is assumed to be @system - mark it with '@trusted' if it is not");
 
+        sc->pop();
         result = cas;
     }
 
diff --git a/gcc/d/dfrontend/visitor.h b/gcc/d/dfrontend/visitor.h
index 27371987b..37e20e6f1 100644
--- a/gcc/d/dfrontend/visitor.h
+++ b/gcc/d/dfrontend/visitor.h
@@ -54,9 +54,8 @@ class DebugStatement;
 class GotoStatement;
 class LabelStatement;
 class AsmStatement;
-#ifdef IN_GCC
-class ExtAsmStatement;
-#endif
+class InlineAsmStatement;
+class GccAsmStatement;
 class CompoundAsmStatement;
 class ImportStatement;
 
@@ -346,9 +345,8 @@ class Visitor
     virtual void visit(GotoStatement *s) { visit((Statement *)s); }
     virtual void visit(LabelStatement *s) { visit((Statement *)s); }
     virtual void visit(AsmStatement *s) { visit((Statement *)s); }
-#ifdef IN_GCC
-    virtual void visit(ExtAsmStatement *s) { visit((Statement *)s); }
-#endif
+    virtual void visit(InlineAsmStatement *s) { visit((AsmStatement *)s); }
+    virtual void visit(GccAsmStatement *s) { visit((AsmStatement *)s); }
     virtual void visit(CompoundAsmStatement *s) { visit((CompoundStatement *)s); }
     virtual void visit(ImportStatement *s) { visit((Statement *)s); }
 
diff --git a/gcc/d/toir.cc b/gcc/d/toir.cc
index 197588155..6fa1c38c1 100644
--- a/gcc/d/toir.cc
+++ b/gcc/d/toir.cc
@@ -1254,7 +1254,7 @@ class IRVisitor : public Visitor
 
   /* D Inline Assembler is not implemented, as would require a writing
      an assembly parser for each supported target.  Instead we leverage
-     GCC extended assembler using the ExtAsmStatement class.  */
+     GCC extended assembler using the GccAsmStatement class.  */
 
   void visit (AsmStatement *)
   {
@@ -1264,7 +1264,7 @@ class IRVisitor : public Visitor
   /* Build a GCC extended assembler expression, whose components are
      an INSN string, some OUTPUTS, some INPUTS, and some CLOBBERS.  */
 
-  void visit (ExtAsmStatement *s)
+  void visit (GccAsmStatement *s)
   {
     StringExp *insn = (StringExp *)s->insn;
     tree outputs = NULL_TREE;

From c15cf439dda9dc5bc39537a153e2ec1a01a13612 Mon Sep 17 00:00:00 2001
From: Eugen Wissner <belka@caraus.de>
Date: Mon, 27 Aug 2018 08:23:54 +0200
Subject: [PATCH 06/10] Update to gcc-9-20180826

---
 gcc.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcc.version b/gcc.version
index 662fc3d68..d31312091 100644
--- a/gcc.version
+++ b/gcc.version
@@ -1 +1 @@
-gcc-9-20180819
+gcc-9-20180826

From 7b2e6a51ff26d30a1520fafff14af893bf6a543d Mon Sep 17 00:00:00 2001
From: Iain Buclaw <ibuclaw@gdcproject.org>
Date: Wed, 29 Aug 2018 13:19:07 +0200
Subject: [PATCH 07/10] Refresh GCC patches against 9-20180826

---
 gcc/d/patches/patch-gcc-9.patch      | 26 +++++++++++++-------------
 gcc/d/patches/patch-targetdm-9.patch | 18 +++++++++---------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/gcc/d/patches/patch-gcc-9.patch b/gcc/d/patches/patch-gcc-9.patch
index f8e3f8ebd..270555de1 100644
--- a/gcc/d/patches/patch-gcc-9.patch
+++ b/gcc/d/patches/patch-gcc-9.patch
@@ -4,7 +4,7 @@ relevant documentation about the GDC front end.
 
 --- a/gcc/config/powerpcspe/powerpcspe.c
 +++ b/gcc/config/powerpcspe/powerpcspe.c
-@@ -32025,11 +32025,12 @@ rs6000_output_function_epilogue (FILE *f
+@@ -32026,11 +32026,12 @@ rs6000_output_function_epilogue (FILE *f
  	 use language_string.
  	 C is 0.  Fortran is 1.  Pascal is 2.  Ada is 3.  C++ is 9.
  	 Java is 13.  Objective-C is 14.  Objective-C++ isn't assigned
@@ -21,7 +21,7 @@ relevant documentation about the GDC front end.
        else if (! strcmp (language_string, "GNU F77")
 --- a/gcc/config/rs6000/rs6000.c
 +++ b/gcc/config/rs6000/rs6000.c
-@@ -28146,11 +28146,12 @@ rs6000_output_function_epilogue (FILE *f
+@@ -28333,11 +28333,12 @@ rs6000_output_function_epilogue (FILE *f
  	 use language_string.
  	 C is 0.  Fortran is 1.  Pascal is 2.  Ada is 3.  C++ is 9.
  	 Java is 13.  Objective-C is 14.  Objective-C++ isn't assigned
@@ -93,7 +93,7 @@ relevant documentation about the GDC front end.
  in the @file{gcc} subdirectory of the object directory.  You can also
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -1424,6 +1424,15 @@ Go source code.
+@@ -1438,6 +1438,15 @@ Go source code.
  @item @var{file}.brig
  BRIG files (binary representation of HSAIL).
  
@@ -109,7 +109,7 @@ relevant documentation about the GDC front end.
  @item @var{file}.ads
  Ada source code file that contains a library unit declaration (a
  declaration of a package, subprogram, or generic, or a generic
-@@ -1470,6 +1479,7 @@ objective-c  objective-c-header  objecti
+@@ -1484,6 +1493,7 @@ objective-c  objective-c-header  objecti
  objective-c++ objective-c++-header objective-c++-cpp-output
  assembler  assembler-with-cpp
  ada
@@ -147,7 +147,7 @@ relevant documentation about the GDC front end.
  @xref{Top, GNAT Reference Manual, About This Guide, gnat_rm,
 --- a/gcc/dwarf2out.c
 +++ b/gcc/dwarf2out.c
-@@ -5498,6 +5498,16 @@ is_ada (void)
+@@ -5506,6 +5506,16 @@ is_ada (void)
    return lang == DW_LANG_Ada95 || lang == DW_LANG_Ada83;
  }
  
@@ -164,7 +164,7 @@ relevant documentation about the GDC front end.
  /* Remove the specified attribute if present.  Return TRUE if removal
     was successful.  */
  
-@@ -24438,6 +24448,8 @@ gen_compile_unit_die (const char *filena
+@@ -24472,6 +24482,8 @@ gen_compile_unit_die (const char *filena
  	language = DW_LANG_ObjC;
        else if (strcmp (language_string, "GNU Objective-C++") == 0)
  	language = DW_LANG_ObjC_plus_plus;
@@ -173,7 +173,7 @@ relevant documentation about the GDC front end.
        else if (dwarf_version >= 5 || !dwarf_strict)
  	{
  	  if (strcmp (language_string, "GNU Go") == 0)
-@@ -26038,7 +26050,7 @@ declare_in_namespace (tree thing, dw_die
+@@ -26072,7 +26084,7 @@ declare_in_namespace (tree thing, dw_die
  
    if (ns_context != context_die)
      {
@@ -182,7 +182,7 @@ relevant documentation about the GDC front end.
  	return ns_context;
        if (DECL_P (thing))
  	gen_decl_die (thing, NULL, NULL, ns_context);
-@@ -26061,7 +26073,7 @@ gen_namespace_die (tree decl, dw_die_ref
+@@ -26095,7 +26107,7 @@ gen_namespace_die (tree decl, dw_die_ref
      {
        /* Output a real namespace or module.  */
        context_die = setup_namespace_context (decl, comp_unit_die ());
@@ -191,7 +191,7 @@ relevant documentation about the GDC front end.
  			       ? DW_TAG_module : DW_TAG_namespace,
  			       context_die, decl);
        /* For Fortran modules defined in different CU don't add src coords.  */
-@@ -26127,7 +26139,7 @@ gen_decl_die (tree decl, tree origin, st
+@@ -26161,7 +26173,7 @@ gen_decl_die (tree decl, tree origin, st
        break;
  
      case CONST_DECL:
@@ -200,7 +200,7 @@ relevant documentation about the GDC front end.
  	{
  	  /* The individual enumerators of an enum type get output when we output
  	     the Dwarf representation of the relevant enum type itself.  */
-@@ -26727,7 +26739,7 @@ dwarf2out_decl (tree decl)
+@@ -26761,7 +26773,7 @@ dwarf2out_decl (tree decl)
      case CONST_DECL:
        if (debug_info_level <= DINFO_LEVEL_TERSE)
  	return;
@@ -209,7 +209,7 @@ relevant documentation about the GDC front end.
  	return;
        if (TREE_STATIC (decl) && decl_function_context (decl))
  	context_die = lookup_decl_die (DECL_CONTEXT (decl));
-@@ -29122,6 +29134,7 @@ prune_unused_types_walk_local_classes (d
+@@ -29162,6 +29174,7 @@ prune_unused_types_walk_local_classes (d
      case DW_TAG_structure_type:
      case DW_TAG_union_type:
      case DW_TAG_class_type:
@@ -217,7 +217,7 @@ relevant documentation about the GDC front end.
        break;
  
      case DW_TAG_subprogram:
-@@ -29155,6 +29168,7 @@ prune_unused_types_walk (dw_die_ref die)
+@@ -29195,6 +29208,7 @@ prune_unused_types_walk (dw_die_ref die)
      case DW_TAG_structure_type:
      case DW_TAG_union_type:
      case DW_TAG_class_type:
@@ -225,7 +225,7 @@ relevant documentation about the GDC front end.
        if (die->die_perennial_p)
  	break;
  
-@@ -29181,7 +29195,6 @@ prune_unused_types_walk (dw_die_ref die)
+@@ -29221,7 +29235,6 @@ prune_unused_types_walk (dw_die_ref die)
      case DW_TAG_volatile_type:
      case DW_TAG_typedef:
      case DW_TAG_array_type:
diff --git a/gcc/d/patches/patch-targetdm-9.patch b/gcc/d/patches/patch-targetdm-9.patch
index f64337c3d..9589d18b2 100644
--- a/gcc/d/patches/patch-targetdm-9.patch
+++ b/gcc/d/patches/patch-targetdm-9.patch
@@ -82,7 +82,7 @@ The following OS versions are implemented:
  MACHMODE_H = machmode.h mode-classes.def
  HOOKS_H = hooks.h
  HOSTHOOKS_DEF_H = hosthooks-def.h $(HOOKS_H)
-@@ -1188,6 +1193,9 @@ C_TARGET_OBJS=@c_target_objs@
+@@ -1187,6 +1192,9 @@ C_TARGET_OBJS=@c_target_objs@
  # Target specific, C++ specific object file
  CXX_TARGET_OBJS=@cxx_target_objs@
  
@@ -225,7 +225,7 @@ The following OS versions are implemented:
  	c_target_objs="aarch64-c.o"
  	cxx_target_objs="aarch64-c.o"
 +	d_target_objs="aarch64-d.o"
- 	extra_objs="aarch64-builtins.o aarch-common.o cortex-a57-fma-steering.o"
+ 	extra_objs="aarch64-builtins.o aarch-common.o cortex-a57-fma-steering.o aarch64-speculation.o"
  	target_gtfiles="\$(srcdir)/config/aarch64/aarch64-builtins.c"
  	target_has_targetm_common=yes
  	;;
@@ -308,7 +308,7 @@ The following OS versions are implemented:
    ;;
  *-*-netbsd*)
    tm_p_file="${tm_p_file} netbsd-protos.h"
-@@ -3203,6 +3227,10 @@ if [ "$common_out_file" = "" ]; then
+@@ -3231,6 +3255,10 @@ if [ "$common_out_file" = "" ]; then
    fi
  fi
  
@@ -319,7 +319,7 @@ The following OS versions are implemented:
  # Support for --with-cpu and related options (and a few unrelated options,
  # too).
  case ${with_cpu} in
-@@ -4813,6 +4841,7 @@ case ${target} in
+@@ -4845,6 +4873,7 @@ case ${target} in
  		out_file="${cpu_type}/${cpu_type}.c"
  		c_target_objs="${c_target_objs} ${cpu_type}-c.o"
  		cxx_target_objs="${cxx_target_objs} ${cpu_type}-c.o"
@@ -381,9 +381,9 @@ The following OS versions are implemented:
 +/* Defined in aarch64-d.c  */
 +extern void aarch64_d_target_versions (void);
 +
- rtl_opt_pass *make_pass_fma_steering (gcc::context *ctxt);
+ rtl_opt_pass *make_pass_fma_steering (gcc::context *);
+ rtl_opt_pass *make_pass_track_speculation (gcc::context *);
  
- poly_uint64 aarch64_regmode_natural_size (machine_mode);
 --- a/gcc/config/aarch64/aarch64.h
 +++ b/gcc/config/aarch64/aarch64.h
 @@ -26,6 +26,9 @@
@@ -565,7 +565,7 @@ The following OS versions are implemented:
 +}
 --- a/gcc/config/arm/arm-protos.h
 +++ b/gcc/config/arm/arm-protos.h
-@@ -373,6 +373,9 @@ extern void arm_lang_object_attributes_i
+@@ -375,6 +375,9 @@ extern void arm_lang_object_attributes_i
  extern void arm_register_target_pragmas (void);
  extern void arm_cpu_cpp_builtins (struct cpp_reader *);
  
@@ -1300,7 +1300,7 @@ The following OS versions are implemented:
 +extern void s390_d_target_versions (void);
 --- a/gcc/config/s390/s390.h
 +++ b/gcc/config/s390/s390.h
-@@ -194,6 +194,9 @@ enum processor_flags
+@@ -200,6 +200,9 @@ enum processor_flags
  /* Target CPU builtins.  */
  #define TARGET_CPU_CPP_BUILTINS() s390_cpu_cpp_builtins (pfile)
  
@@ -1309,7 +1309,7 @@ The following OS versions are implemented:
 +
  #ifdef DEFAULT_TARGET_64BIT
  #define TARGET_DEFAULT     (MASK_64BIT | MASK_ZARCH | MASK_HARD_DFP	\
-                             | MASK_OPT_HTM | MASK_OPT_VX)
+ 			    | MASK_OPT_HTM | MASK_OPT_VX)
 --- a/gcc/config/s390/t-s390
 +++ b/gcc/config/s390/t-s390
 @@ -25,3 +25,7 @@ s390-c.o: $(srcdir)/config/s390/s390-c.c

From fe63ab35706beee47c57e7b253ba8287803a657d Mon Sep 17 00:00:00 2001
From: Iain Buclaw <ibuclaw@gdcproject.org>
Date: Wed, 29 Aug 2018 13:20:59 +0200
Subject: [PATCH 08/10] fix Bug 303: libgphobos.spec not found linking stage2

---
 gcc/d/patches/patch-toplev-9.patch | 108 +++++++++++++++--------------
 1 file changed, 56 insertions(+), 52 deletions(-)

diff --git a/gcc/d/patches/patch-toplev-9.patch b/gcc/d/patches/patch-toplev-9.patch
index 55d9d8095..b57a069da 100644
--- a/gcc/d/patches/patch-toplev-9.patch
+++ b/gcc/d/patches/patch-toplev-9.patch
@@ -78,20 +78,22 @@ This implements building of libphobos library in GCC.
  	AR="$(AR)"; export AR; \
  	AS="$(AS)"; export AS; \
  	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-@@ -256,6 +259,12 @@ POSTSTAGE1_HOST_EXPORTS = \
+@@ -256,6 +259,14 @@ POSTSTAGE1_HOST_EXPORTS = \
  	CC_FOR_BUILD="$$CC"; export CC_FOR_BUILD; \
  	$(POSTSTAGE1_CXX_EXPORT) \
  	$(LTO_EXPORTS) \
 +	GDC="$$r/$(HOST_SUBDIR)/prev-gcc/gdc$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
 +	  -B$(build_tooldir)/bin/ $(GDC_FLAGS_FOR_TARGET) \
++	  -B$$r/prev-$(TARGET_SUBDIR)/libphobos/src \
 +	  -I$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime -I$$s/libphobos/libdruntime \
-+	  -L$$r/prev-$(TARGET_SUBDIR)/libphobos/src/.libs"; \
++	  -L$$r/prev-$(TARGET_SUBDIR)/libphobos/src/.libs \
++	  -L$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime/.libs"; \
 +	export GDC; \
 +	GDC_FOR_BUILD="$$GDC"; export GDC_FOR_BUILD; \
  	GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND; \
  	LDFLAGS="$(POSTSTAGE1_LDFLAGS) $(BOOT_LDFLAGS)"; export LDFLAGS; \
  	HOST_LIBS="$(POSTSTAGE1_LIBS)"; export HOST_LIBS;
-@@ -278,6 +287,7 @@ BASE_TARGET_EXPORTS = \
+@@ -278,6 +289,7 @@ BASE_TARGET_EXPORTS = \
  	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
  	GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \
  	GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \
@@ -99,7 +101,7 @@ This implements building of libphobos library in GCC.
  	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
  	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
  	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-@@ -342,6 +352,7 @@ CXX_FOR_BUILD = @CXX_FOR_BUILD@
+@@ -342,6 +354,7 @@ CXX_FOR_BUILD = @CXX_FOR_BUILD@
  DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
  GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
  GOC_FOR_BUILD = @GOC_FOR_BUILD@
@@ -107,7 +109,7 @@ This implements building of libphobos library in GCC.
  LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
  LD_FOR_BUILD = @LD_FOR_BUILD@
  NM_FOR_BUILD = @NM_FOR_BUILD@
-@@ -399,6 +410,7 @@ STRIP = @STRIP@
+@@ -399,6 +412,7 @@ STRIP = @STRIP@
  WINDRES = @WINDRES@
  WINDMC = @WINDMC@
  
@@ -115,7 +117,7 @@ This implements building of libphobos library in GCC.
  GNATBIND = @GNATBIND@
  GNATMAKE = @GNATMAKE@
  
-@@ -408,6 +420,7 @@ LIBCFLAGS = $(CFLAGS)
+@@ -408,6 +422,7 @@ LIBCFLAGS = $(CFLAGS)
  CXXFLAGS = @CXXFLAGS@
  LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
  GOCFLAGS = $(CFLAGS)
@@ -123,7 +125,7 @@ This implements building of libphobos library in GCC.
  
  CREATE_GCOV = create_gcov
  
-@@ -574,6 +587,7 @@ CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_
+@@ -574,6 +589,7 @@ CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_
  RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@
  GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@
  GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@
@@ -131,7 +133,7 @@ This implements building of libphobos library in GCC.
  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
  LD_FOR_TARGET=@LD_FOR_TARGET@
  
-@@ -598,6 +612,7 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARG
+@@ -598,6 +614,7 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARG
  LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
  LDFLAGS_FOR_TARGET = @LDFLAGS_FOR_TARGET@
  GOCFLAGS_FOR_TARGET = -O2 -g
@@ -139,7 +141,7 @@ This implements building of libphobos library in GCC.
  
  FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
  SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
-@@ -622,7 +637,7 @@ all:
+@@ -622,7 +639,7 @@ all:
  
  # This is the list of directories that may be needed in RPATH_ENVVAR
  # so that programs built for the target machine work.
@@ -148,7 +150,7 @@ This implements building of libphobos library in GCC.
  
  @if target-libstdc++-v3
  TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:
-@@ -644,6 +659,10 @@ TARGET_LIB_PATH_liboffloadmic = $$r/$(TA
+@@ -644,6 +661,10 @@ TARGET_LIB_PATH_liboffloadmic = $$r/$(TA
  TARGET_LIB_PATH_libssp = $$r/$(TARGET_SUBDIR)/libssp/.libs:
  @endif target-libssp
  
@@ -159,7 +161,7 @@ This implements building of libphobos library in GCC.
  @if target-libgomp
  TARGET_LIB_PATH_libgomp = $$r/$(TARGET_SUBDIR)/libgomp/.libs:
  @endif target-libgomp
-@@ -778,6 +797,8 @@ BASE_FLAGS_TO_PASS = \
+@@ -778,6 +799,8 @@ BASE_FLAGS_TO_PASS = \
  	"STAGE1_LANGUAGES=$(STAGE1_LANGUAGES)" \
  	"GNATBIND=$(GNATBIND)" \
  	"GNATMAKE=$(GNATMAKE)" \
@@ -168,7 +170,7 @@ This implements building of libphobos library in GCC.
  	"AR_FOR_TARGET=$(AR_FOR_TARGET)" \
  	"AS_FOR_TARGET=$(AS_FOR_TARGET)" \
  	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
-@@ -789,6 +810,8 @@ BASE_FLAGS_TO_PASS = \
+@@ -789,6 +812,8 @@ BASE_FLAGS_TO_PASS = \
  	"GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \
  	"GOC_FOR_TARGET=$(GOC_FOR_TARGET)" \
  	"GOCFLAGS_FOR_TARGET=$(GOCFLAGS_FOR_TARGET)" \
@@ -177,7 +179,7 @@ This implements building of libphobos library in GCC.
  	"LD_FOR_TARGET=$(LD_FOR_TARGET)" \
  	"LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \
  	"LDFLAGS_FOR_TARGET=$(LDFLAGS_FOR_TARGET)" \
-@@ -851,6 +874,7 @@ EXTRA_HOST_FLAGS = \
+@@ -851,6 +876,7 @@ EXTRA_HOST_FLAGS = \
  	'DLLTOOL=$(DLLTOOL)' \
  	'GFORTRAN=$(GFORTRAN)' \
  	'GOC=$(GOC)' \
@@ -185,7 +187,7 @@ This implements building of libphobos library in GCC.
  	'LD=$(LD)' \
  	'LIPO=$(LIPO)' \
  	'NM=$(NM)' \
-@@ -875,6 +899,7 @@ STAGE1_FLAGS_TO_PASS = \
+@@ -875,6 +901,7 @@ STAGE1_FLAGS_TO_PASS = \
  POSTSTAGE1_FLAGS_TO_PASS = \
  	CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
  	CXX="$${CXX}" CXX_FOR_BUILD="$${CXX_FOR_BUILD}" \
@@ -193,7 +195,7 @@ This implements building of libphobos library in GCC.
  	GNATBIND="$${GNATBIND}" \
  	LDFLAGS="$${LDFLAGS}" \
  	HOST_LIBS="$${HOST_LIBS}" \
-@@ -907,6 +932,8 @@ EXTRA_TARGET_FLAGS = \
+@@ -907,6 +934,8 @@ EXTRA_TARGET_FLAGS = \
  	'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
  	'GOC=$$(GOC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
  	'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \
@@ -202,7 +204,7 @@ This implements building of libphobos library in GCC.
  	'LD=$(COMPILER_LD_FOR_TARGET)' \
  	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
  	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
-@@ -1008,6 +1035,7 @@ configure-target:  \
+@@ -1008,6 +1037,7 @@ configure-target:  \
      maybe-configure-target-libobjc \
      maybe-configure-target-libgo \
      maybe-configure-target-libhsail-rt \
@@ -210,7 +212,7 @@ This implements building of libphobos library in GCC.
      maybe-configure-target-libtermcap \
      maybe-configure-target-winsup \
      maybe-configure-target-libgloss \
-@@ -1170,6 +1198,7 @@ all-target: maybe-all-target-libgfortran
+@@ -1170,6 +1200,7 @@ all-target: maybe-all-target-libgfortran
  all-target: maybe-all-target-libobjc
  all-target: maybe-all-target-libgo
  all-target: maybe-all-target-libhsail-rt
@@ -218,7 +220,7 @@ This implements building of libphobos library in GCC.
  all-target: maybe-all-target-libtermcap
  all-target: maybe-all-target-winsup
  all-target: maybe-all-target-libgloss
-@@ -1261,6 +1290,7 @@ info-target: maybe-info-target-libgfortr
+@@ -1261,6 +1292,7 @@ info-target: maybe-info-target-libgfortr
  info-target: maybe-info-target-libobjc
  info-target: maybe-info-target-libgo
  info-target: maybe-info-target-libhsail-rt
@@ -226,7 +228,7 @@ This implements building of libphobos library in GCC.
  info-target: maybe-info-target-libtermcap
  info-target: maybe-info-target-winsup
  info-target: maybe-info-target-libgloss
-@@ -1345,6 +1375,7 @@ dvi-target: maybe-dvi-target-libgfortran
+@@ -1345,6 +1377,7 @@ dvi-target: maybe-dvi-target-libgfortran
  dvi-target: maybe-dvi-target-libobjc
  dvi-target: maybe-dvi-target-libgo
  dvi-target: maybe-dvi-target-libhsail-rt
@@ -234,7 +236,7 @@ This implements building of libphobos library in GCC.
  dvi-target: maybe-dvi-target-libtermcap
  dvi-target: maybe-dvi-target-winsup
  dvi-target: maybe-dvi-target-libgloss
-@@ -1429,6 +1460,7 @@ pdf-target: maybe-pdf-target-libgfortran
+@@ -1429,6 +1462,7 @@ pdf-target: maybe-pdf-target-libgfortran
  pdf-target: maybe-pdf-target-libobjc
  pdf-target: maybe-pdf-target-libgo
  pdf-target: maybe-pdf-target-libhsail-rt
@@ -242,7 +244,7 @@ This implements building of libphobos library in GCC.
  pdf-target: maybe-pdf-target-libtermcap
  pdf-target: maybe-pdf-target-winsup
  pdf-target: maybe-pdf-target-libgloss
-@@ -1513,6 +1545,7 @@ html-target: maybe-html-target-libgfortr
+@@ -1513,6 +1547,7 @@ html-target: maybe-html-target-libgfortr
  html-target: maybe-html-target-libobjc
  html-target: maybe-html-target-libgo
  html-target: maybe-html-target-libhsail-rt
@@ -250,7 +252,7 @@ This implements building of libphobos library in GCC.
  html-target: maybe-html-target-libtermcap
  html-target: maybe-html-target-winsup
  html-target: maybe-html-target-libgloss
-@@ -1597,6 +1630,7 @@ TAGS-target: maybe-TAGS-target-libgfortr
+@@ -1597,6 +1632,7 @@ TAGS-target: maybe-TAGS-target-libgfortr
  TAGS-target: maybe-TAGS-target-libobjc
  TAGS-target: maybe-TAGS-target-libgo
  TAGS-target: maybe-TAGS-target-libhsail-rt
@@ -258,7 +260,7 @@ This implements building of libphobos library in GCC.
  TAGS-target: maybe-TAGS-target-libtermcap
  TAGS-target: maybe-TAGS-target-winsup
  TAGS-target: maybe-TAGS-target-libgloss
-@@ -1681,6 +1715,7 @@ install-info-target: maybe-install-info-
+@@ -1681,6 +1717,7 @@ install-info-target: maybe-install-info-
  install-info-target: maybe-install-info-target-libobjc
  install-info-target: maybe-install-info-target-libgo
  install-info-target: maybe-install-info-target-libhsail-rt
@@ -266,7 +268,7 @@ This implements building of libphobos library in GCC.
  install-info-target: maybe-install-info-target-libtermcap
  install-info-target: maybe-install-info-target-winsup
  install-info-target: maybe-install-info-target-libgloss
-@@ -1765,6 +1800,7 @@ install-pdf-target: maybe-install-pdf-ta
+@@ -1765,6 +1802,7 @@ install-pdf-target: maybe-install-pdf-ta
  install-pdf-target: maybe-install-pdf-target-libobjc
  install-pdf-target: maybe-install-pdf-target-libgo
  install-pdf-target: maybe-install-pdf-target-libhsail-rt
@@ -274,7 +276,7 @@ This implements building of libphobos library in GCC.
  install-pdf-target: maybe-install-pdf-target-libtermcap
  install-pdf-target: maybe-install-pdf-target-winsup
  install-pdf-target: maybe-install-pdf-target-libgloss
-@@ -1849,6 +1885,7 @@ install-html-target: maybe-install-html-
+@@ -1849,6 +1887,7 @@ install-html-target: maybe-install-html-
  install-html-target: maybe-install-html-target-libobjc
  install-html-target: maybe-install-html-target-libgo
  install-html-target: maybe-install-html-target-libhsail-rt
@@ -282,7 +284,7 @@ This implements building of libphobos library in GCC.
  install-html-target: maybe-install-html-target-libtermcap
  install-html-target: maybe-install-html-target-winsup
  install-html-target: maybe-install-html-target-libgloss
-@@ -1933,6 +1970,7 @@ installcheck-target: maybe-installcheck-
+@@ -1933,6 +1972,7 @@ installcheck-target: maybe-installcheck-
  installcheck-target: maybe-installcheck-target-libobjc
  installcheck-target: maybe-installcheck-target-libgo
  installcheck-target: maybe-installcheck-target-libhsail-rt
@@ -290,7 +292,7 @@ This implements building of libphobos library in GCC.
  installcheck-target: maybe-installcheck-target-libtermcap
  installcheck-target: maybe-installcheck-target-winsup
  installcheck-target: maybe-installcheck-target-libgloss
-@@ -2017,6 +2055,7 @@ mostlyclean-target: maybe-mostlyclean-ta
+@@ -2017,6 +2057,7 @@ mostlyclean-target: maybe-mostlyclean-ta
  mostlyclean-target: maybe-mostlyclean-target-libobjc
  mostlyclean-target: maybe-mostlyclean-target-libgo
  mostlyclean-target: maybe-mostlyclean-target-libhsail-rt
@@ -298,7 +300,7 @@ This implements building of libphobos library in GCC.
  mostlyclean-target: maybe-mostlyclean-target-libtermcap
  mostlyclean-target: maybe-mostlyclean-target-winsup
  mostlyclean-target: maybe-mostlyclean-target-libgloss
-@@ -2101,6 +2140,7 @@ clean-target: maybe-clean-target-libgfor
+@@ -2101,6 +2142,7 @@ clean-target: maybe-clean-target-libgfor
  clean-target: maybe-clean-target-libobjc
  clean-target: maybe-clean-target-libgo
  clean-target: maybe-clean-target-libhsail-rt
@@ -306,7 +308,7 @@ This implements building of libphobos library in GCC.
  clean-target: maybe-clean-target-libtermcap
  clean-target: maybe-clean-target-winsup
  clean-target: maybe-clean-target-libgloss
-@@ -2185,6 +2225,7 @@ distclean-target: maybe-distclean-target
+@@ -2185,6 +2227,7 @@ distclean-target: maybe-distclean-target
  distclean-target: maybe-distclean-target-libobjc
  distclean-target: maybe-distclean-target-libgo
  distclean-target: maybe-distclean-target-libhsail-rt
@@ -314,7 +316,7 @@ This implements building of libphobos library in GCC.
  distclean-target: maybe-distclean-target-libtermcap
  distclean-target: maybe-distclean-target-winsup
  distclean-target: maybe-distclean-target-libgloss
-@@ -2269,6 +2310,7 @@ maintainer-clean-target: maybe-maintaine
+@@ -2269,6 +2312,7 @@ maintainer-clean-target: maybe-maintaine
  maintainer-clean-target: maybe-maintainer-clean-target-libobjc
  maintainer-clean-target: maybe-maintainer-clean-target-libgo
  maintainer-clean-target: maybe-maintainer-clean-target-libhsail-rt
@@ -322,7 +324,7 @@ This implements building of libphobos library in GCC.
  maintainer-clean-target: maybe-maintainer-clean-target-libtermcap
  maintainer-clean-target: maybe-maintainer-clean-target-winsup
  maintainer-clean-target: maybe-maintainer-clean-target-libgloss
-@@ -2409,6 +2451,7 @@ check-target:  \
+@@ -2409,6 +2453,7 @@ check-target:  \
      maybe-check-target-libobjc \
      maybe-check-target-libgo \
      maybe-check-target-libhsail-rt \
@@ -330,7 +332,7 @@ This implements building of libphobos library in GCC.
      maybe-check-target-libtermcap \
      maybe-check-target-winsup \
      maybe-check-target-libgloss \
-@@ -2589,6 +2632,7 @@ install-target:  \
+@@ -2589,6 +2634,7 @@ install-target:  \
      maybe-install-target-libobjc \
      maybe-install-target-libgo \
      maybe-install-target-libhsail-rt \
@@ -338,7 +340,7 @@ This implements building of libphobos library in GCC.
      maybe-install-target-libtermcap \
      maybe-install-target-winsup \
      maybe-install-target-libgloss \
-@@ -2693,6 +2737,7 @@ install-strip-target:  \
+@@ -2693,6 +2739,7 @@ install-strip-target:  \
      maybe-install-strip-target-libobjc \
      maybe-install-strip-target-libgo \
      maybe-install-strip-target-libhsail-rt \
@@ -346,7 +348,7 @@ This implements building of libphobos library in GCC.
      maybe-install-strip-target-libtermcap \
      maybe-install-strip-target-winsup \
      maybe-install-strip-target-libgloss \
-@@ -46944,6 +46989,464 @@ maintainer-clean-target-libhsail-rt:
+@@ -46944,6 +46991,464 @@ maintainer-clean-target-libhsail-rt:
  
  
  
@@ -811,7 +813,7 @@ This implements building of libphobos library in GCC.
  .PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
  maybe-configure-target-libtermcap:
  @if gcc-bootstrap
-@@ -52329,6 +52832,14 @@ check-gcc-brig:
+@@ -52329,6 +52834,14 @@ check-gcc-brig:
  	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-brig);
  check-brig: check-gcc-brig check-target-libhsail-rt
  
@@ -826,7 +828,7 @@ This implements building of libphobos library in GCC.
  
  # The gcc part of install-no-fixedincludes, which relies on an intimate
  # knowledge of how a number of gcc internal targets (inter)operate.  Delegate.
-@@ -55521,6 +56032,7 @@ configure-target-libgfortran: stage_last
+@@ -55521,6 +56034,7 @@ configure-target-libgfortran: stage_last
  configure-target-libobjc: stage_last
  configure-target-libgo: stage_last
  configure-target-libhsail-rt: stage_last
@@ -834,7 +836,7 @@ This implements building of libphobos library in GCC.
  configure-target-libtermcap: stage_last
  configure-target-winsup: stage_last
  configure-target-libgloss: stage_last
-@@ -55555,6 +56067,7 @@ configure-target-libgfortran: maybe-all-
+@@ -55555,6 +56069,7 @@ configure-target-libgfortran: maybe-all-
  configure-target-libobjc: maybe-all-gcc
  configure-target-libgo: maybe-all-gcc
  configure-target-libhsail-rt: maybe-all-gcc
@@ -842,7 +844,7 @@ This implements building of libphobos library in GCC.
  configure-target-libtermcap: maybe-all-gcc
  configure-target-winsup: maybe-all-gcc
  configure-target-libgloss: maybe-all-gcc
-@@ -56550,6 +57063,11 @@ configure-target-libgo: maybe-configure-
+@@ -56550,6 +57065,11 @@ configure-target-libgo: maybe-configure-
  all-target-libgo: maybe-all-target-libbacktrace
  all-target-libgo: maybe-all-target-libffi
  all-target-libgo: maybe-all-target-libatomic
@@ -854,7 +856,7 @@ This implements building of libphobos library in GCC.
  configure-target-libstdc++-v3: maybe-configure-target-libgomp
  configure-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp
  configure-stage2-target-libstdc++-v3: maybe-configure-stage2-target-libgomp
-@@ -56593,6 +57111,7 @@ all-stageautofeedback-target-libstdc++-v
+@@ -56593,6 +57113,7 @@ all-stageautofeedback-target-libstdc++-v
  install-target-libgo: maybe-install-target-libatomic
  install-target-libgfortran: maybe-install-target-libquadmath
  install-target-libgfortran: maybe-install-target-libgcc
@@ -862,7 +864,7 @@ This implements building of libphobos library in GCC.
  install-target-libsanitizer: maybe-install-target-libstdc++-v3
  install-target-libsanitizer: maybe-install-target-libgcc
  install-target-libvtv: maybe-install-target-libstdc++-v3
-@@ -56717,6 +57236,7 @@ configure-target-libgfortran: maybe-all-
+@@ -56717,6 +57238,7 @@ configure-target-libgfortran: maybe-all-
  configure-target-libobjc: maybe-all-target-libgcc
  configure-target-libgo: maybe-all-target-libgcc
  configure-target-libhsail-rt: maybe-all-target-libgcc
@@ -870,7 +872,7 @@ This implements building of libphobos library in GCC.
  configure-target-libtermcap: maybe-all-target-libgcc
  configure-target-winsup: maybe-all-target-libgcc
  configure-target-libgloss: maybe-all-target-libgcc
-@@ -56755,6 +57275,8 @@ configure-target-libgo: maybe-all-target
+@@ -56755,6 +57277,8 @@ configure-target-libgo: maybe-all-target
  
  configure-target-libhsail-rt: maybe-all-target-newlib maybe-all-target-libgloss
  
@@ -898,20 +900,22 @@ This implements building of libphobos library in GCC.
  	AR="$(AR)"; export AR; \
  	AS="$(AS)"; export AS; \
  	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-@@ -259,6 +262,12 @@ POSTSTAGE1_HOST_EXPORTS = \
+@@ -259,6 +262,14 @@ POSTSTAGE1_HOST_EXPORTS = \
  	CC_FOR_BUILD="$$CC"; export CC_FOR_BUILD; \
  	$(POSTSTAGE1_CXX_EXPORT) \
  	$(LTO_EXPORTS) \
 +	GDC="$$r/$(HOST_SUBDIR)/prev-gcc/gdc$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
 +	  -B$(build_tooldir)/bin/ $(GDC_FLAGS_FOR_TARGET) \
++	  -B$$r/prev-$(TARGET_SUBDIR)/libphobos/src \
 +	  -I$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime -I$$s/libphobos/libdruntime \
-+	  -L$$r/prev-$(TARGET_SUBDIR)/libphobos/src/.libs"; \
++	  -L$$r/prev-$(TARGET_SUBDIR)/libphobos/src/.libs \
++	  -L$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime/.libs"; \
 +	export GDC; \
 +	GDC_FOR_BUILD="$$GDC"; export GDC_FOR_BUILD; \
  	GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND; \
  	LDFLAGS="$(POSTSTAGE1_LDFLAGS) $(BOOT_LDFLAGS)"; export LDFLAGS; \
  	HOST_LIBS="$(POSTSTAGE1_LIBS)"; export HOST_LIBS;
-@@ -281,6 +290,7 @@ BASE_TARGET_EXPORTS = \
+@@ -281,6 +292,7 @@ BASE_TARGET_EXPORTS = \
  	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
  	GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \
  	GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \
@@ -919,7 +923,7 @@ This implements building of libphobos library in GCC.
  	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
  	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
  	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-@@ -345,6 +355,7 @@ CXX_FOR_BUILD = @CXX_FOR_BUILD@
+@@ -345,6 +357,7 @@ CXX_FOR_BUILD = @CXX_FOR_BUILD@
  DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
  GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
  GOC_FOR_BUILD = @GOC_FOR_BUILD@
@@ -927,7 +931,7 @@ This implements building of libphobos library in GCC.
  LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
  LD_FOR_BUILD = @LD_FOR_BUILD@
  NM_FOR_BUILD = @NM_FOR_BUILD@
-@@ -402,6 +413,7 @@ STRIP = @STRIP@
+@@ -402,6 +415,7 @@ STRIP = @STRIP@
  WINDRES = @WINDRES@
  WINDMC = @WINDMC@
  
@@ -935,7 +939,7 @@ This implements building of libphobos library in GCC.
  GNATBIND = @GNATBIND@
  GNATMAKE = @GNATMAKE@
  
-@@ -411,6 +423,7 @@ LIBCFLAGS = $(CFLAGS)
+@@ -411,6 +425,7 @@ LIBCFLAGS = $(CFLAGS)
  CXXFLAGS = @CXXFLAGS@
  LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
  GOCFLAGS = $(CFLAGS)
@@ -943,7 +947,7 @@ This implements building of libphobos library in GCC.
  
  CREATE_GCOV = create_gcov
  
-@@ -497,6 +510,7 @@ CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_
+@@ -497,6 +512,7 @@ CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_
  RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@
  GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@
  GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@
@@ -951,7 +955,7 @@ This implements building of libphobos library in GCC.
  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
  LD_FOR_TARGET=@LD_FOR_TARGET@
  
-@@ -521,6 +535,7 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARG
+@@ -521,6 +537,7 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARG
  LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
  LDFLAGS_FOR_TARGET = @LDFLAGS_FOR_TARGET@
  GOCFLAGS_FOR_TARGET = -O2 -g
@@ -959,7 +963,7 @@ This implements building of libphobos library in GCC.
  
  FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
  SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
-@@ -622,6 +637,7 @@ EXTRA_HOST_FLAGS = \
+@@ -622,6 +639,7 @@ EXTRA_HOST_FLAGS = \
  	'DLLTOOL=$(DLLTOOL)' \
  	'GFORTRAN=$(GFORTRAN)' \
  	'GOC=$(GOC)' \
@@ -967,7 +971,7 @@ This implements building of libphobos library in GCC.
  	'LD=$(LD)' \
  	'LIPO=$(LIPO)' \
  	'NM=$(NM)' \
-@@ -646,6 +662,7 @@ STAGE1_FLAGS_TO_PASS = \
+@@ -646,6 +664,7 @@ STAGE1_FLAGS_TO_PASS = \
  POSTSTAGE1_FLAGS_TO_PASS = \
  	CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
  	CXX="$${CXX}" CXX_FOR_BUILD="$${CXX_FOR_BUILD}" \
@@ -975,7 +979,7 @@ This implements building of libphobos library in GCC.
  	GNATBIND="$${GNATBIND}" \
  	LDFLAGS="$${LDFLAGS}" \
  	HOST_LIBS="$${HOST_LIBS}" \
-@@ -678,6 +695,8 @@ EXTRA_TARGET_FLAGS = \
+@@ -678,6 +697,8 @@ EXTRA_TARGET_FLAGS = \
  	'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
  	'GOC=$$(GOC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
  	'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \

From 005e6ffe1ba8ee989c1fa0caa30076856fe9e54e Mon Sep 17 00:00:00 2001
From: Iain Buclaw <ibuclaw@gdcproject.org>
Date: Wed, 29 Aug 2018 23:09:20 +0200
Subject: [PATCH 09/10] Backport C++ mangling fixes

---
 gcc/d/ChangeLog             |    5 +
 gcc/d/d-target.cc           |   38 +-
 gcc/d/dfrontend/cppmangle.c | 2342 +++++++++++------------------------
 gcc/d/dfrontend/denum.c     |   28 +
 gcc/d/dfrontend/enum.h      |    1 +
 gcc/d/dfrontend/idgen.c     |    2 +
 gcc/d/dfrontend/mtype.c     |   21 +-
 gcc/d/dfrontend/target.h    |    2 +-
 8 files changed, 806 insertions(+), 1633 deletions(-)

diff --git a/gcc/d/ChangeLog b/gcc/d/ChangeLog
index 5c1bafa04..4f8233e76 100644
--- a/gcc/d/ChangeLog
+++ b/gcc/d/ChangeLog
@@ -1,3 +1,8 @@
+2018-08-29  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* d-target.cc (Target::prefixName): Remove function.
+	(Target::cppParameterType): New function.
+
 2018-08-25  Iain Buclaw  <ibuclaw@gdcproject.org>
 
 	* Make-lang.in (D_FRONTEND_OBJS): Add iasm.o, iasmgcc.o
diff --git a/gcc/d/d-target.cc b/gcc/d/d-target.cc
index a178564ef..0c0be1822 100644
--- a/gcc/d/d-target.cc
+++ b/gcc/d/d-target.cc
@@ -431,13 +431,6 @@ Target::isVectorOpSupported (Type *type, TOK op, Type *)
   return true;
 }
 
-/* Apply any target-specific prefixes based on the given linkage.  */
-
-void
-Target::prefixName (OutBuffer *, LINK)
-{
-}
-
 /* Return the symbol mangling of S for C++ linkage. */
 
 const char *
@@ -469,6 +462,37 @@ Target::cppTypeMangle (Type *type)
     return NULL;
 }
 
+/* Return the type that will really be used for passing the given parameter
+   ARG to an extern(C++) function.  */
+
+Type *
+Target::cppParameterType (Parameter *arg)
+{
+    Type *t = arg->type->merge2 ();
+    if (arg->storageClass & (STCout | STCref))
+      t = t->referenceTo ();
+    else if (arg->storageClass & STClazy)
+      {
+	/* Mangle as delegate.  */
+	Type *td = TypeFunction::create (NULL, t, 0, LINKd);
+	td = TypeDelegate::create (td);
+	t = t->merge2 ();
+      }
+
+    /* Could be a va_list, which we mangle as a pointer.  */
+    if (t->ty == Tsarray && Type::tvalist->ty == Tsarray)
+      {
+	Type *tb = t->toBasetype ()->mutableOf ();
+	if (tb == Type::tvalist)
+	  {
+	    tb = t->nextOf ()->pointerTo ();
+	    t = tb->castMod (t->mod);
+	  }
+      }
+
+    return t;
+}
+
 /* Return the default system linkage for the target.  */
 
 LINK
diff --git a/gcc/d/dfrontend/cppmangle.c b/gcc/d/dfrontend/cppmangle.c
index bd548105a..dc1705cca 100644
--- a/gcc/d/dfrontend/cppmangle.c
+++ b/gcc/d/dfrontend/cppmangle.c
@@ -9,6 +9,19 @@
  * https://github.com/D-Programming-Language/dmd/blob/master/src/cppmangle.c
  */
 
+/**
+ * Do mangling for C++ linkage.
+ *
+ * References:
+ *  Follows Itanium C++ ABI 1.86 section 5.1
+ *  http://refspecs.linux-foundation.org/cxxabi-1.86.html#mangling
+ *  which is where the grammar comments come from.
+ *
+ * Bugs:
+ *  https://issues.dlang.org/query.cgi
+ *  enter `C++, mangling` as the keywords.
+ */
+
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
@@ -31,269 +44,387 @@
 typedef int (*ForeachDg)(void *ctx, size_t paramidx, Parameter *param);
 int Parameter_foreach(Parameters *parameters, ForeachDg dg, void *ctx, size_t *pn = NULL);
 
-/* Do mangling for C++ linkage.
- * No attempt is made to support mangling of templates, operator
- * overloading, or special functions.
- *
- * So why don't we use the C++ ABI for D name mangling?
- * Because D supports a lot of things (like modules) that the C++
- * ABI has no concept of. These affect every D mangled name,
- * so nothing would be compatible anyway.
- */
-
-/*
- * Follows Itanium C++ ABI 1.86
- */
-
 class CppMangleVisitor : public Visitor
 {
-    Objects components;
-    OutBuffer buf;
-    bool is_top_level;
-    bool components_on;
+    Objects components;         // array of components available for substitution
+    OutBuffer *buf;             // append the mangling to buf[]
+    Loc loc;                    // location for use in error messages
 
-    void writeBase36(size_t i)
+    public:
+    // Write <seq-id> to buf
+    void write_seq_id(size_t i)
     {
         if (i >= 36)
         {
-            writeBase36(i / 36);
+            write_seq_id(i / 36);
             i %= 36;
         }
-        if (i < 10)
-            buf.writeByte((char)(i + '0'));
-        else if (i < 36)
-            buf.writeByte((char)(i - 10 + 'A'));
-        else
-            assert(0);
+        i += (i < 10) ? '0' : 'A' - 10;
+        buf->writeByte((char)i);
     }
 
     bool substitute(RootObject *p)
     {
         //printf("substitute %s\n", p ? p->toChars() : NULL);
-        if (components_on)
-            for (size_t i = 0; i < components.dim; i++)
+        int i = find(p);
+        if (i >= 0)
+        {
+            //printf("\tmatch\n");
+            /* Sequence is S_, S0_, .., S9_, SA_, ..., SZ_, S10_, ...
+             */
+            buf->writeByte('S');
+            if (i)
             {
-                //printf("    component[%d] = %s\n", i, components[i] ? components[i]->toChars() : NULL);
-                if (p == components[i])
-                {
-                    //printf("\tmatch\n");
-                    /* Sequence is S_, S0_, .., S9_, SA_, ..., SZ_, S10_, ...
-                     */
-                    buf.writeByte('S');
-                    if (i)
-                        writeBase36(i - 1);
-                    buf.writeByte('_');
-                    return true;
-                }
+                write_seq_id(i - 1);
             }
+            buf->writeByte('_');
+            return true;
+        }
         return false;
     }
 
-    bool exist(RootObject *p)
+    /******
+     * See if `p` exists in components[]
+     * Returns:
+     *  index if found, -1 if not
+     */
+    int find(RootObject *p)
     {
-        //printf("exist %s\n", p ? p->toChars() : "NULL");
-        if (components_on)
-            for (size_t i = 0; i < components.dim; i++)
-            {
-                if (p == components[i])
-                {
-                    return true;
-                }
-            }
-        return false;
+        //printf("find %p %d %s\n", p, p.dyncast(), p ? p.toChars() : NULL);
+        for (size_t i = 0; i < components.dim; i++)
+        {
+            if (p == components[i])
+                return (int)i;
+        }
+        return -1;
     }
 
-    void store(RootObject *p)
+    /*********************
+     * Append p to components[]
+     */
+    void append(RootObject *p)
     {
-        //printf("store %s\n", p ? p->toChars() : NULL);
-        if (components_on)
-            components.push(p);
+        //printf("append %p %d %s\n", p, p.dyncast(), p ? p.toChars() : "null");
+        components.push(p);
     }
 
-    void source_name(Dsymbol *s, bool skipname = false)
+    /************************
+     * Determine if symbol is indeed the global ::std namespace.
+     * Params:
+     *  s = symbol to check
+     * Returns:
+     *  true if it is ::std
+     */
+    static bool isStd(Dsymbol *s)
     {
-        //printf("source_name(%s)\n", s->toChars());
-        TemplateInstance *ti = s->isTemplateInstance();
-        if (ti)
-        {
-            if (!skipname && !substitute(ti->tempdecl))
-            {
-                store(ti->tempdecl);
-                const char *name = ti->tempdecl->toAlias()->ident->toChars();
-                buf.printf("%d%s", strlen(name), name);
-            }
-            buf.writeByte('I');
-            bool is_var_arg = false;
-            for (size_t i = 0; i < ti->tiargs->dim; i++)
-            {
-                RootObject *o = (RootObject *)(*ti->tiargs)[i];
+        return (s &&
+                s->ident == Id::std &&  // the right name
+                s->isNspace() &&        // g++ disallows global "std" for other than a namespace
+                !getQualifier(s));      // at global level
+    }
 
-                TemplateParameter *tp = NULL;
-                TemplateValueParameter *tv = NULL;
-                TemplateTupleParameter *tt = NULL;
-                if (!is_var_arg)
-                {
-                    TemplateDeclaration *td = ti->tempdecl->isTemplateDeclaration();
-                    assert(td);
-                    tp = (*td->parameters)[i];
-                    tv = tp->isTemplateValueParameter();
-                    tt = tp->isTemplateTupleParameter();
-                }
-                /*
-                 *           <template-arg> ::= <type>            # type or template
-                 *                          ::= <expr-primary>   # simple expressions
-                 */
+    /******************************
+     * Write the mangled representation of the template arguments.
+     * Params:
+     *  ti = the template instance
+     */
+    void template_args(TemplateInstance *ti)
+    {
+        /* <template-args> ::= I <template-arg>+ E
+         */
+        if (!ti)                // could happen if std::basic_string is not a template
+            return;
+        buf->writeByte('I');
+        for (size_t i = 0; i < ti->tiargs->dim; i++)
+        {
+            RootObject *o = (*ti->tiargs)[i];
+            TemplateDeclaration *td = ti->tempdecl->isTemplateDeclaration();
+            assert(td);
+            TemplateParameter *tp = (*td->parameters)[i];
+
+            /*
+             * <template-arg> ::= <type>               # type or template
+             *                ::= X <expression> E     # expression
+             *                ::= <expr-primary>       # simple expressions
+             *                ::= I <template-arg>* E  # argument pack
+             */
+            if (tp->isTemplateTupleParameter())
+            {
+                buf->writeByte('I');     // argument pack
 
-                if (tt)
+                // mangle the rest of the arguments as types
+                for (size_t j = i; j < ti->tiargs->dim; j++)
                 {
-                    buf.writeByte('I');
-                    is_var_arg = true;
-                    tp = NULL;
+                    Type *t = isType((*ti->tiargs)[j]);
+                    assert(t);
+                    t->accept(this);
                 }
 
-                if (tv)
+                buf->writeByte('E');
+                break;
+            }
+            if (tp->isTemplateTypeParameter())
+            {
+                Type *t = isType(o);
+                assert(t);
+                t->accept(this);
+            }
+            else if (TemplateValueParameter *tv = tp->isTemplateValueParameter())
+            {
+                // <expr-primary> ::= L <type> <value number> E  # integer literal
+                if (tv->valType->isintegral())
                 {
-                    // <expr-primary> ::= L <type> <value number> E                   # integer literal
-                    if (tv->valType->isintegral())
-                    {
-                        Expression *e = isExpression(o);
-                        assert(e);
-                        buf.writeByte('L');
-                        tv->valType->accept(this);
-                        if (tv->valType->isunsigned())
-                        {
-                            buf.printf("%llu", e->toUInteger());
-                        }
-                        else
-                        {
-                            sinteger_t val = e->toInteger();
-                            if (val < 0)
-                            {
-                                val = -val;
-                                buf.writeByte('n');
-                            }
-                            buf.printf("%lld", val);
-                        }
-                        buf.writeByte('E');
-                    }
-                    else
+                    Expression *e = isExpression(o);
+                    assert(e);
+                    buf->writeByte('L');
+                    tv->valType->accept(this);
+                    uinteger_t val = e->toUInteger();
+                    if (!tv->valType->isunsigned() && (sinteger_t)val < 0)
                     {
-                        s->error("Internal Compiler Error: C++ %s template value parameter is not supported", tv->valType->toChars());
-                        fatal();
+                        val = -val;
+                        buf->writeByte('n');
                     }
+                    buf->printf("%llu", val);
+                    buf->writeByte('E');
                 }
-                else if (!tp || tp->isTemplateTypeParameter())
+                else
                 {
-                    Type *t = isType(o);
-                    assert(t);
-                    t->accept(this);
+                    ti->error("Internal Compiler Error: C++ `%s` template value parameter is not supported", tv->valType->toChars());
+                    fatal();
                 }
-                else if (tp->isTemplateAliasParameter())
+            }
+            else if (tp->isTemplateAliasParameter())
+            {
+                Dsymbol *d = isDsymbol(o);
+                Expression *e = isExpression(o);
+                if (d && d->isFuncDeclaration())
                 {
-                    Dsymbol *d = isDsymbol(o);
-                    Expression *e = isExpression(o);
-                    if (!d && !e)
-                    {
-                        s->error("Internal Compiler Error: %s is unsupported parameter for C++ template: (%s)", o->toChars());
-                        fatal();
-                    }
-                    if (d && d->isFuncDeclaration())
-                    {
-                        bool is_nested = d->toParent() && !d->toParent()->isModule() && ((TypeFunction *)d->isFuncDeclaration()->type)->linkage == LINKcpp;
-                        if (is_nested) buf.writeByte('X');
-                        buf.writeByte('L');
-                        mangle_function(d->isFuncDeclaration());
-                        buf.writeByte('E');
-                        if (is_nested) buf.writeByte('E');
-                    }
-                    else if (e && e->op == TOKvar && ((VarExp*)e)->var->isVarDeclaration())
-                    {
-                        VarDeclaration *vd = ((VarExp*)e)->var->isVarDeclaration();
-                        buf.writeByte('L');
-                        mangle_variable(vd, true);
-                        buf.writeByte('E');
-                    }
-                    else if (d && d->isTemplateDeclaration() && d->isTemplateDeclaration()->onemember)
-                    {
-                        if (!substitute(d))
-                        {
-                            cpp_mangle_name(d, false);
-                        }
-                    }
-                    else
+                    bool is_nested = d->toParent() &&
+                        !d->toParent()->isModule() &&
+                        ((TypeFunction*)d->isFuncDeclaration()->type)->linkage == LINKcpp;
+                    if (is_nested)
+                        buf->writeByte('X');
+                    buf->writeByte('L');
+                    mangle_function(d->isFuncDeclaration());
+                    buf->writeByte('E');
+                    if (is_nested)
+                        buf->writeByte('E');
+                }
+                else if (e && e->op == TOKvar && ((VarExp*)e)->var->isVarDeclaration())
+                {
+                    VarDeclaration *vd = ((VarExp*)e)->var->isVarDeclaration();
+                    buf->writeByte('L');
+                    mangle_variable(vd, true);
+                    buf->writeByte('E');
+                }
+                else if (d && d->isTemplateDeclaration() && d->isTemplateDeclaration()->onemember)
+                {
+                    if (!substitute(d))
                     {
-                        s->error("Internal Compiler Error: %s is unsupported parameter for C++ template", o->toChars());
-                        fatal();
+                        cpp_mangle_name(d, false);
                     }
-
                 }
                 else
                 {
-                    s->error("Internal Compiler Error: C++ templates support only integral value, type parameters, alias templates and alias function parameters");
+                    ti->error("Internal Compiler Error: `%s` is unsupported parameter for C++ template", o->toChars());
                     fatal();
                 }
             }
-            if (is_var_arg)
+            else if(tp->isTemplateThisParameter())
             {
-                buf.writeByte('E');
+                ti->error("Internal Compiler Error: C++ `%s` template this parameter is not supported", o->toChars());
+                fatal();
             }
-            buf.writeByte('E');
-            return;
+            else
+            {
+                assert(0);
+            }
+        }
+        buf->writeByte('E');
+    }
+
+    void source_name(Dsymbol *s)
+    {
+        //printf("source_name(%s)\n", s->toChars());
+        if (TemplateInstance *ti = s->isTemplateInstance())
+        {
+            if (!substitute(ti->tempdecl))
+            {
+                append(ti->tempdecl);
+                const char *name = ti->tempdecl->toAlias()->ident->toChars();
+                buf->printf("%d", strlen(name));
+                buf->writestring(name);
+            }
+            template_args(ti);
         }
         else
         {
             const char *name = s->ident->toChars();
-            buf.printf("%d%s", strlen(name), name);
+            buf->printf("%d", strlen(name));
+            buf->writestring(name);
+        }
+    }
+
+    /********
+     * See if s is actually an instance of a template
+     * Params:
+     *  s = symbol
+     * Returns:
+     *  if s is instance of a template, return the instance, otherwise return s
+     */
+    Dsymbol *getInstance(Dsymbol *s)
+    {
+        Dsymbol *p = s->toParent();
+        if (p)
+        {
+            if (TemplateInstance *ti = p->isTemplateInstance())
+                return ti;
+        }
+        return s;
+    }
+
+    /********
+     * Get qualifier for `s`, meaning the symbol
+     * that s is in the symbol table of.
+     * The module does not count as a qualifier, because C++
+     * does not have modules.
+     * Params:
+     *  s = symbol that may have a qualifier
+     * Returns:
+     *  qualifier, NULL if none
+     */
+    static Dsymbol *getQualifier(Dsymbol *s)
+    {
+        Dsymbol *p = s->toParent();
+        return (p && !p->isModule()) ? p : NULL;
+    }
+
+    // Detect type char
+    static bool isChar(RootObject *o)
+    {
+        Type *t = isType(o);
+        return (t && t->equals(Type::tchar));
+    }
+
+    // Detect type ::std::char_traits<char>
+    static bool isChar_traits_char(RootObject *o)
+    {
+        return isIdent_char(Id::char_traits, o);
+    }
+
+    // Detect type ::std::allocator<char>
+    static bool isAllocator_char(RootObject *o)
+    {
+        return isIdent_char(Id::allocator, o);
+    }
+
+    // Detect type ::std::ident<char>
+    static bool isIdent_char(Identifier *ident, RootObject *o)
+    {
+        Type *t = isType(o);
+        if (!t || t->ty != Tstruct)
+            return false;
+        Dsymbol *s = ((TypeStruct*)t)->toDsymbol(NULL);
+        if (s->ident != ident)
+            return false;
+        Dsymbol *p = s->toParent();
+        if (!p)
+            return false;
+        TemplateInstance *ti = p->isTemplateInstance();
+        if (!ti)
+            return false;
+        Dsymbol *q = getQualifier(ti);
+        return isStd(q) && ti->tiargs->dim == 1 && isChar((*ti->tiargs)[0]);
+    }
+
+    /***
+     * Detect template args <char, ::std::char_traits<char>>
+     * and write st if found.
+     * Returns:
+     *  true if found
+     */
+    bool char_std_char_traits_char(TemplateInstance *ti, const char *st)
+    {
+        if (ti->tiargs->dim == 2 &&
+            isChar((*ti->tiargs)[0]) &&
+            isChar_traits_char((*ti->tiargs)[1]))
+        {
+            buf->writestring(st);
+            return true;
         }
+        return false;
     }
 
+
     void prefix_name(Dsymbol *s)
     {
         //printf("prefix_name(%s)\n", s->toChars());
         if (!substitute(s))
         {
-            Dsymbol *p = s->toParent();
-            if (p && p->isTemplateInstance())
+            Dsymbol *si = getInstance(s);
+            Dsymbol *p = getQualifier(si);
+            if (p)
             {
-                s = p;
-                if (exist(p->isTemplateInstance()->tempdecl))
+                if (isStd(p))
                 {
-                    p = NULL;
-                }
-                else
-                {
-                    p = p->toParent();
-                }
-            }
+                    TemplateInstance *ti = si->isTemplateInstance();
+                    if (ti)
+                    {
+                        if (s->ident == Id::allocator)
+                        {
+                            buf->writestring("Sa");
+                            template_args(ti);
+                            append(ti);
+                            return;
+                        }
+                        if (s->ident == Id::basic_string)
+                        {
+                            // ::std::basic_string<char, ::std::char_traits<char>, ::std::allocator<char>>
+                            if (ti->tiargs->dim == 3 &&
+                                isChar((*ti->tiargs)[0]) &&
+                                isChar_traits_char((*ti->tiargs)[1]) &&
+                                isAllocator_char((*ti->tiargs)[2]))
 
-            if (p && !p->isModule())
-            {
-                if (p->ident == Id::std && is_initial_qualifier(p))
-                    buf.writestring("St");
+                            {
+                                buf->writestring("Ss");
+                                return;
+                            }
+                            buf->writestring("Sb");      // ::std::basic_string
+                            template_args(ti);
+                            append(ti);
+                            return;
+                        }
+
+                        // ::std::basic_istream<char, ::std::char_traits<char>>
+                        if (s->ident == Id::basic_istream &&
+                            char_std_char_traits_char(ti, "Si"))
+                            return;
+
+                        // ::std::basic_ostream<char, ::std::char_traits<char>>
+                        if (s->ident == Id::basic_ostream &&
+                            char_std_char_traits_char(ti, "So"))
+                            return;
+
+                        // ::std::basic_iostream<char, ::std::char_traits<char>>
+                        if (s->ident == Id::basic_iostream &&
+                            char_std_char_traits_char(ti, "Sd"))
+                            return;
+                    }
+                    buf->writestring("St");
+                }
                 else
                     prefix_name(p);
             }
-            if (!(s->ident == Id::std && is_initial_qualifier(s)))
-                store(s);
-            source_name(s);
-        }
-    }
-
-    /* Is s the initial qualifier?
-     */
-    bool is_initial_qualifier(Dsymbol *s)
-    {
-        Dsymbol *p = s->toParent();
-        if (p && p->isTemplateInstance())
-        {
-            if (exist(p->isTemplateInstance()->tempdecl))
+            source_name(si);
+            if (!isStd(si))
             {
-                return true;
+                /* Do this after the source_name() call to keep components[]
+                 * in the right order.
+                 * https://issues.dlang.org/show_bug.cgi?id=17947
+                 */
+                append(si);
             }
-            p = p->toParent();
         }
-
-        return !p || p->isModule();
     }
 
     void cpp_mangle_name(Dsymbol *s, bool qualified)
@@ -301,12 +432,12 @@ class CppMangleVisitor : public Visitor
         //printf("cpp_mangle_name(%s, %d)\n", s->toChars(), qualified);
         Dsymbol *p = s->toParent();
         Dsymbol *se = s;
-        bool dont_write_prefix = false;
+        bool write_prefix = true;
         if (p && p->isTemplateInstance())
         {
             se = p;
-            if (exist(p->isTemplateInstance()->tempdecl))
-                dont_write_prefix = true;
+            if (find(p->isTemplateInstance()->tempdecl) >= 0)
+                write_prefix = false;
             p = p->toParent();
         }
 
@@ -318,87 +449,70 @@ class CppMangleVisitor : public Visitor
              * 3. there is no CV-qualifier or a ref-qualifier for a member function
              * ABI 5.1.8
              */
-            if (p->ident == Id::std &&
-                is_initial_qualifier(p) &&
-                !qualified)
+            if (isStd(p) && !qualified)
             {
+                TemplateInstance *ti = se->isTemplateInstance();
                 if (s->ident == Id::allocator)
                 {
-                    buf.writestring("Sa");      // "Sa" is short for ::std::allocator
-                    source_name(se, true);
+                    buf->writestring("Sa");      // "Sa" is short for ::std::allocator
+                    template_args(ti);
                 }
                 else if (s->ident == Id::basic_string)
                 {
-                    components_on = false;      // turn off substitutions
-                    buf.writestring("Sb");      // "Sb" is short for ::std::basic_string
-                    size_t off = buf.offset;
-                    source_name(se, true);
-                    components_on = true;
-
-                    // Replace ::std::basic_string < char, ::std::char_traits<char>, ::std::allocator<char> >
-                    // with Ss
-                    //printf("xx: '%.*s'\n", (int)(buf.offset - off), buf.data + off);
-                    if (buf.offset - off >= 26 &&
-                        memcmp(buf.data + off, "IcSt11char_traitsIcESaIcEE", 26) == 0)
+                    // ::std::basic_string<char, ::std::char_traits<char>, ::std::allocator<char>>
+                    if (ti->tiargs->dim == 3 &&
+                        isChar((*ti->tiargs)[0]) &&
+                        isChar_traits_char((*ti->tiargs)[1]) &&
+                        isAllocator_char((*ti->tiargs)[2]))
+
                     {
-                        buf.remove(off - 2, 28);
-                        buf.insert(off - 2, (const char *)"Ss", 2);
+                        buf->writestring("Ss");
                         return;
                     }
-                    buf.setsize(off);
-                    source_name(se, true);
+                    buf->writestring("Sb");      // ::std::basic_string
+                    template_args(ti);
                 }
-                else if (s->ident == Id::basic_istream ||
-                         s->ident == Id::basic_ostream ||
-                         s->ident == Id::basic_iostream)
+                else
                 {
-                    /* Replace
-                     * ::std::basic_istream<char,  std::char_traits<char> > with Si
-                     * ::std::basic_ostream<char,  std::char_traits<char> > with So
-                     * ::std::basic_iostream<char, std::char_traits<char> > with Sd
-                     */
-                    size_t off = buf.offset;
-                    components_on = false;      // turn off substitutions
-                    source_name(se, true);
-                    components_on = true;
-
-                    //printf("xx: '%.*s'\n", (int)(buf.offset - off), buf.data + off);
-                    if (buf.offset - off >= 21 &&
-                        memcmp(buf.data + off, "IcSt11char_traitsIcEE", 21) == 0)
+                    // ::std::basic_istream<char, ::std::char_traits<char>>
+                    if (s->ident == Id::basic_istream)
                     {
-                        buf.remove(off, 21);
-                        char mbuf[2];
-                        mbuf[0] = 'S';
-                        mbuf[1] = 'i';
-                        if (s->ident == Id::basic_ostream)
-                            mbuf[1] = 'o';
-                        else if(s->ident == Id::basic_iostream)
-                            mbuf[1] = 'd';
-                        buf.insert(off, mbuf, 2);
-                        return;
+                        if (char_std_char_traits_char(ti, "Si"))
+                            return;
                     }
-                    buf.setsize(off);
-                    buf.writestring("St");
-                    source_name(se);
-                }
-                else
-                {
-                    buf.writestring("St");
+                    else if (s->ident == Id::basic_ostream)
+                    {
+                        if (char_std_char_traits_char(ti, "So"))
+                            return;
+                    }
+                    else if (s->ident == Id::basic_iostream)
+                    {
+                        if (char_std_char_traits_char(ti, "Sd"))
+                            return;
+                    }
+                    buf->writestring("St");
                     source_name(se);
                 }
             }
             else
             {
-                buf.writeByte('N');
-                if (!dont_write_prefix)
+                buf->writeByte('N');
+                if (write_prefix)
                     prefix_name(p);
                 source_name(se);
-                buf.writeByte('E');
+                buf->writeByte('E');
             }
         }
         else
             source_name(se);
-        store(s);
+        append(s);
+    }
+
+    void CV_qualifiers(Type *t)
+    {
+        // CV-qualifiers are 'r': restrict, 'V': volatile, 'K': const
+        if (t->isConst())
+            buf->writeByte('K');
     }
 
     void mangle_variable(VarDeclaration *d, bool is_temp_arg_ref)
@@ -406,27 +520,27 @@ class CppMangleVisitor : public Visitor
         // fake mangling for fields to fix https://issues.dlang.org/show_bug.cgi?id=16525
         if (!(d->storage_class & (STCextern | STCfield | STCgshared)))
         {
-            d->error("Internal Compiler Error: C++ static non- __gshared non-extern variables not supported");
+            d->error("Internal Compiler Error: C++ static non-`__gshared` non-`extern` variables not supported");
             fatal();
         }
 
         Dsymbol *p = d->toParent();
         if (p && !p->isModule()) //for example: char Namespace1::beta[6] should be mangled as "_ZN10Namespace14betaE"
         {
-            buf.writestring("_ZN");
+            buf->writestring("_ZN");
             prefix_name(p);
             source_name(d);
-            buf.writeByte('E');
+            buf->writeByte('E');
         }
         else //char beta[6] should mangle as "beta"
         {
             if (!is_temp_arg_ref)
             {
-                buf.writestring(d->ident->toChars());
+                buf->writestring(d->ident->toChars());
             }
             else
             {
-                buf.writestring("_Z");
+                buf->writestring("_Z");
                 source_name(d);
             }
         }
@@ -438,153 +552,140 @@ class CppMangleVisitor : public Visitor
         /*
          * <mangled-name> ::= _Z <encoding>
          * <encoding> ::= <function name> <bare-function-type>
-         *         ::= <data name>
-         *         ::= <special-name>
+         *            ::= <data name>
+         *            ::= <special-name>
          */
         TypeFunction *tf = (TypeFunction *)d->type;
 
-        buf.writestring("_Z");
-        Dsymbol *p = d->toParent();
-        TemplateDeclaration *ftd = getFuncTemplateDecl(d);
-
-        if (p && !p->isModule() && tf->linkage == LINKcpp && !ftd)
+        buf->writestring("_Z");
+        if (getFuncTemplateDecl(d))
         {
-            buf.writeByte('N');
-            if (d->type->isConst())
-                buf.writeByte('K');
-            prefix_name(p);
-
-            // See ABI 5.1.8 Compression
-
-            // Replace ::std::allocator with Sa
-            if (buf.offset >= 17 && memcmp(buf.data, "_ZN3std9allocator", 17) == 0)
-            {
-                buf.remove(3, 14);
-                buf.insert(3, (const char *)"Sa", 2);
-            }
-
-            // Replace ::std::basic_string with Sb
-            if (buf.offset >= 21 && memcmp(buf.data, "_ZN3std12basic_string", 21) == 0)
-            {
-                buf.remove(3, 18);
-                buf.insert(3, (const char *)"Sb", 2);
-            }
-
-            // Replace ::std with St
-            if (buf.offset >= 7 && memcmp(buf.data, "_ZN3std", 7) == 0)
+            /* It's an instance of a function template
+             */
+            TemplateInstance *ti = d->parent->isTemplateInstance();
+            assert(ti);
+            Dsymbol *p = ti->toParent();
+            if (p && !p->isModule() && tf->linkage == LINKcpp)
             {
-                buf.remove(3, 4);
-                buf.insert(3, (const char *)"St", 2);
+                buf->writeByte('N');
+                CV_qualifiers(d->type);
+                prefix_name(p);
+                if (d->isCtorDeclaration())
+                    buf->writestring("C1");
+                else if (d->isDtorDeclaration())
+                    buf->writestring("D1");
+                else
+                    source_name(ti);
+                buf->writeByte('E');
             }
-            if (buf.offset >= 8 && memcmp(buf.data, "_ZNK3std", 8) == 0)
+            else
+                source_name(ti);
+            headOfType(tf->nextOf());  // mangle return type
+        }
+        else
+        {
+            Dsymbol *p = d->toParent();
+            if (p && !p->isModule() && tf->linkage == LINKcpp)
             {
-                buf.remove(4, 4);
-                buf.insert(4, (const char *)"St", 2);
-            }
+                /* <nested-name> ::= N [<CV-qualifiers>] <prefix> <unqualified-name> E
+                 *               ::= N [<CV-qualifiers>] <template-prefix> <template-args> E
+                 */
+                buf->writeByte('N');
+                CV_qualifiers(d->type);
+
+                /* <prefix> ::= <prefix> <unqualified-name>
+                 *          ::= <template-prefix> <template-args>
+                 *          ::= <template-param>
+                 *          ::= # empty
+                 *          ::= <substitution>
+                 *          ::= <prefix> <data-member-prefix>
+                 */
+                prefix_name(p);
+                //printf("p: %s\n", buf.peekString());
 
-            if (d->isDtorDeclaration())
-            {
-                buf.writestring("D1");
+                if (d->isCtorDeclaration())
+                {
+                    buf->writestring("C1");
+                }
+                else if (d->isDtorDeclaration())
+                {
+                    buf->writestring("D1");
+                }
+                else
+                {
+                    source_name(d);
+                }
+                buf->writeByte('E');
             }
             else
             {
                 source_name(d);
             }
-            buf.writeByte('E');
-        }
-        else if (ftd)
-        {
-            source_name(p);
-            this->is_top_level = true;
-            tf->nextOf()->accept(this);
-            this->is_top_level = false;
-        }
-        else
-        {
-            source_name(d);
         }
 
         if (tf->linkage == LINKcpp) //Template args accept extern "C" symbols with special mangling
         {
             assert(tf->ty == Tfunction);
-            argsCppMangle(tf->parameters, tf->varargs);
+            mangleFunctionParameters(tf->parameters, tf->varargs);
         }
     }
 
-    static int paramsCppMangleDg(void *ctx, size_t, Parameter *fparam)
+    void mangleFunctionParameters(Parameters *parameters, int varargs)
     {
-        CppMangleVisitor *mangler = (CppMangleVisitor *)ctx;
-
-        Type *t = fparam->type->merge2();
-        if (fparam->storageClass & (STCout | STCref))
-            t = t->referenceTo();
-        else if (fparam->storageClass & STClazy)
-        {
-            // Mangle as delegate
-            Type *td = new TypeFunction(NULL, t, 0, LINKd);
-            td = new TypeDelegate(td);
-            t = t->merge();
-        }
-#ifdef IN_GCC
-        if (t->ty == Tsarray && Type::tvalist->ty == Tsarray)
+        struct ParamsCppMangle
         {
-            // Could be a va_list, which we mangle as a pointer.
-            Type *tb = t->toBasetype()->mutableOf();
-            if (tb == Type::tvalist)
+            int numparams;
+            CppMangleVisitor *mangler;
+
+            static int dg(void *ctx, size_t, Parameter *fparam)
             {
-                tb = t->nextOf()->pointerTo();
-                t = tb->castMod(t->mod);
+                ParamsCppMangle *p = (ParamsCppMangle *)ctx;
+                CppMangleVisitor *mangler = p->mangler;
+                Type *t = Target::cppParameterType(fparam);
+                if (t->ty == Tsarray)
+                {
+                    // Static arrays in D are passed by value; no counterpart in C++
+                    t->error(mangler->loc, "Internal Compiler Error: unable to pass static array `%s` to extern(C++) function, use pointer instead",
+                        t->toChars());
+                    fatal();
+                }
+                mangler->headOfType(t);
+                p->numparams++;
+                return 0;
             }
-        }
-#else
-        if (t->ty == Tsarray)
-        {
-            // Mangle static arrays as pointers
-            t->error(Loc(), "Internal Compiler Error: unable to pass static array to extern(C++) function.");
-            t->error(Loc(), "Use pointer instead.");
-            fatal();
-            //t = t->nextOf()->pointerTo();
-        }
-#endif
+        };
 
-        /* If it is a basic, enum or struct type,
-         * then don't mark it const
-         */
-        mangler->is_top_level = true;
-        if ((t->ty == Tenum || t->ty == Tstruct || t->ty == Tpointer || t->isTypeBasic()) && t->isConst())
-            t->mutableOf()->accept(mangler);
-        else
-            t->accept(mangler);
-        mangler->is_top_level = false;
-        return 0;
-    }
+        ParamsCppMangle p;
+        p.numparams = 0;
+        p.mangler = this;
 
-    void argsCppMangle(Parameters *parameters, int varargs)
-    {
         if (parameters)
-            Parameter_foreach(parameters, &paramsCppMangleDg, (void*)this);
+            Parameter_foreach(parameters, &ParamsCppMangle::dg, (void*)&p);
 
         if (varargs)
-            buf.writestring("z");
-        else if (!parameters || !parameters->dim)
-            buf.writeByte('v');            // encode ( ) parameters
+            buf->writeByte('z');
+        else if (!p.numparams)
+            buf->writeByte('v'); // encode (void) parameters
     }
 
 public:
-    CppMangleVisitor()
-        : components(), buf(), is_top_level(false), components_on(true)
+    CppMangleVisitor(OutBuffer *buf, Loc loc)
+        : components(), buf(buf), loc(loc)
     {
     }
 
-    char *mangleOf(Dsymbol *s)
+    /*****
+     * Entry point. Append mangling to buf[]
+     * Params:
+     *  s = symbol to mangle
+     */
+    void mangleOf(Dsymbol *s)
     {
-        VarDeclaration *vd = s->isVarDeclaration();
-        FuncDeclaration *fd = s->isFuncDeclaration();
-        if (vd)
+        if (VarDeclaration *vd = s->isVarDeclaration())
         {
             mangle_variable(vd, false);
         }
-        else if (fd)
+        else if (FuncDeclaration *fd = s->isFuncDeclaration())
         {
             mangle_function(fd);
         }
@@ -592,45 +693,91 @@ class CppMangleVisitor : public Visitor
         {
             assert(0);
         }
-        Target::prefixName(&buf, LINKcpp);
-        return buf.extractString();
     }
 
-    void visit(Type *t)
+    /****** The rest is type mangling ************/
+
+    void error(Type *t)
     {
-#ifdef IN_GCC
-        /* Make this the 'vendor extended type' when there is no
-         * C++ analog.
-         * u <source-name>
-         */
-        if (substitute(t))
-            return;
-        assert(t->deco);
-        buf.printf("u%d%s", strlen(t->deco), t->deco);
-        store(t);
-#else
-        if (t->isImmutable() || t->isShared())
+        const char *p;
+        if (t->isImmutable())
+            p = "`immutable` ";
+        else if (t->isShared())
+            p = "`shared` ";
+        else
+            p = "";
+        t->error(loc, "Internal Compiler Error: %stype `%s` can not be mapped to C++", p, t->toChars());
+        fatal(); //Fatal, because this error should be handled in frontend
+    }
+
+    /****************************
+     * Mangle a type,
+     * treating it as a Head followed by a Tail.
+     * Params:
+     *  t = Head of a type
+     */
+    void headOfType(Type *t)
+    {
+        if (t->ty == Tclass)
         {
-            t->error(Loc(), "Internal Compiler Error: shared or immutable types can not be mapped to C++ (%s)", t->toChars());
+            mangleTypeClass((TypeClass*)t, true);
         }
         else
         {
-            t->error(Loc(), "Internal Compiler Error: type %s can not be mapped to C++\n", t->toChars());
+            // For value types, strip const/immutable/shared from the head of the type
+            t->mutableOf()->unSharedOf()->accept(this);
         }
-        fatal(); //Fatal, because this error should be handled in frontend
-#endif
     }
 
-    void visit(TypeBasic *t)
+    void visit(Type *t)
     {
-        /* ABI spec says:
-         * v        void
-         * w        wchar_t
-         * b        bool
-         * c        char
-         * a        signed char
-         * h        unsigned char
-         * s        short
+        error(t);
+    }
+
+    /******
+     * Write out 1 or 2 character basic type mangling.
+     * Handle const and substitutions.
+     * Params:
+     *  t = type to mangle
+     *  p = if not 0, then character prefix
+     *  c = mangling character
+     */
+    void writeBasicType(Type *t, char p, char c)
+    {
+        if (p || t->isConst())
+        {
+            if (substitute(t))
+                return;
+            else
+                append(t);
+        }
+        CV_qualifiers(t);
+        if (p)
+            buf->writeByte(p);
+        buf->writeByte(c);
+    }
+
+    void visit(TypeNull *t)
+    {
+        if (t->isImmutable() || t->isShared())
+            return error(t);
+
+        writeBasicType(t, 'D', 'n');
+    }
+
+    void visit(TypeBasic *t)
+    {
+        if (t->isImmutable() || t->isShared())
+            return error(t);
+
+        /* <builtin-type>:
+         * v        void
+         * w        wchar_t
+         * b        bool
+         * c        char
+         * a        signed char
+         * h        unsigned char
+         * s        short
          * t        unsigned short
          * i        int
          * j        unsigned int
@@ -645,6 +792,12 @@ class CppMangleVisitor : public Visitor
          * e        long double, __float80
          * g        __float128
          * z        ellipsis
+         * Dd       64 bit IEEE 754r decimal floating point
+         * De       128 bit IEEE 754r decimal floating point
+         * Df       32 bit IEEE 754r decimal floating point
+         * Dh       16 bit IEEE 754r half-precision floating point
+         * Di       char32_t
+         * Ds       char16_t
          * u <source-name>  # vendor extended type
          */
 
@@ -652,149 +805,121 @@ class CppMangleVisitor : public Visitor
         char p = 0;
         switch (t->ty)
         {
-            case Tvoid:     c = 'v';        break;
-            case Tint8:     c = 'a';        break;
-            case Tuns8:     c = 'h';        break;
-            case Tint16:    c = 's';        break;
-            case Tuns16:    c = 't';        break;
-            case Tint32:    c = 'i';        break;
-            case Tuns32:    c = 'j';        break;
-            case Tfloat32:  c = 'f';        break;
-            case Tint64:    c = (Target::c_longsize == 8 ? 'l' : 'x'); break;
-            case Tuns64:    c = (Target::c_longsize == 8 ? 'm' : 'y'); break;
-            case Tint128:   c = 'n';        break;
-            case Tuns128:   c = 'o';        break;
-            case Tfloat64:  c = 'd';        break;
-            case Tfloat80:  c = 'e';        break;
-            case Tbool:     c = 'b';        break;
-            case Tchar:     c = 'c';        break;
-            case Twchar:    c = 't';        break; // unsigned short
-            case Tdchar:    c = 'w';        break; // wchar_t (UTF-32)
-
-            case Timaginary32: p = 'G'; c = 'f';    break;
-            case Timaginary64: p = 'G'; c = 'd';    break;
-            case Timaginary80: p = 'G'; c = 'e';    break;
-            case Tcomplex32:   p = 'C'; c = 'f';    break;
-            case Tcomplex64:   p = 'C'; c = 'd';    break;
-            case Tcomplex80:   p = 'C'; c = 'e';    break;
-
-            default:        visit((Type *)t); return;
-        }
-        if (t->isImmutable() || t->isShared())
-        {
-            visit((Type *)t);
-        }
-        if (p || t->isConst())
-        {
-            if (substitute(t))
-            {
-                return;
-            }
-            else
-            {
-                store(t);
-            }
-        }
-
-        if (t->isConst())
-            buf.writeByte('K');
+            case Tvoid:                 c = 'v';        break;
+            case Tint8:                 c = 'a';        break;
+            case Tuns8:                 c = 'h';        break;
+            case Tint16:                c = 's';        break;
+            case Tuns16:                c = 't';        break;
+            case Tint32:                c = 'i';        break;
+            case Tuns32:                c = 'j';        break;
+            case Tfloat32:              c = 'f';        break;
+            case Tint64:
+                c = (Target::c_longsize == 8 ? 'l' : 'x');
+                break;
+            case Tuns64:
+                c = (Target::c_longsize == 8 ? 'm' : 'y');
+                break;
+            case Tint128:                c = 'n';       break;
+            case Tuns128:                c = 'o';       break;
+            case Tfloat64:               c = 'd';       break;
+            case Tfloat80:               c = 'e';       break;
+            case Tbool:                  c = 'b';       break;
+            case Tchar:                  c = 'c';       break;
+            case Twchar:                 c = 't';       break;  // unsigned short (perhaps use 'Ds' ?
+            case Tdchar:                 c = 'w';       break;  // wchar_t (UTF-32) (perhaps use 'Di' ?
+            case Timaginary32:  p = 'G'; c = 'f';       break;  // 'G' means imaginary
+            case Timaginary64:  p = 'G'; c = 'd';       break;
+            case Timaginary80:  p = 'G'; c = 'e';       break;
+            case Tcomplex32:    p = 'C'; c = 'f';       break;  // 'C' means complex
+            case Tcomplex64:    p = 'C'; c = 'd';       break;
+            case Tcomplex80:    p = 'C'; c = 'e';       break;
 
-        // Handle any target-specific basic types.
-        if (const char *tm = Target::cppTypeMangle(t))
-        {
-            buf.writestring(tm);
-        }
-        else
-        {
-            if (p)
-                buf.writeByte(p);
-            buf.writeByte(c);
+            default:
+                // Handle any target-specific basic types.
+                if (const char *tm = Target::cppTypeMangle(t))
+                {
+                    if (substitute(t))
+                        return;
+                    else
+                        append(t);
+                    CV_qualifiers(t);
+                    buf->writestring(tm);
+                    return;
+                }
+                return error(t);
         }
+        writeBasicType(t, p, c);
     }
 
-
     void visit(TypeVector *t)
     {
-        is_top_level = false;
+        if (t->isImmutable() || t->isShared())
+            return error(t);
+
         if (substitute(t))
             return;
-        store(t);
-        if (t->isImmutable() || t->isShared())
-        {
-            visit((Type *)t);
-        }
-        if (t->isConst())
-            buf.writeByte('K');
+        append(t);
+        CV_qualifiers(t);
 
         // Handle any target-specific vector types.
         if (const char *tm = Target::cppTypeMangle(t))
         {
-            buf.writestring(tm);
+            buf->writestring(tm);
         }
         else
         {
             assert(t->basetype && t->basetype->ty == Tsarray);
             assert(((TypeSArray *)t->basetype)->dim);
-            //buf.printf("Dv%llu_", ((TypeSArray *)t->basetype)->dim->toInteger());// -- Gnu ABI v.4
-            buf.writestring("U8__vector"); //-- Gnu ABI v.3
+#if 0
+            buf->writestring("Dv");
+            buf->printf("%llu", ((TypeSArray *)t->basetype)->dim->toInteger()); // -- Gnu ABI v.4
+            buf->writeByte('_');
+#else
+            buf->writestring("U8__vector"); //-- Gnu ABI v.3
+#endif
             t->basetype->nextOf()->accept(this);
         }
     }
 
     void visit(TypeSArray *t)
     {
-        is_top_level = false;
-        if (!substitute(t))
-            store(t);
         if (t->isImmutable() || t->isShared())
-        {
-            visit((Type *)t);
-        }
-        if (t->isConst())
-            buf.writeByte('K');
-        buf.printf("A%llu_", t->dim ? t->dim->toInteger() : 0);
-        t->next->accept(this);
-    }
-
-    void visit(TypeDArray *t)
-    {
-        visit((Type *)t);
-    }
+            return error(t);
 
-    void visit(TypeAArray *t)
-    {
-        visit((Type *)t);
+        if (!substitute(t))
+            append(t);
+        CV_qualifiers(t);
+        buf->writeByte('A');
+        buf->printf("%llu", t->dim ? t->dim->toInteger() : 0);
+        buf->writeByte('_');
+        t->next->accept(this);
     }
 
     void visit(TypePointer *t)
     {
-        is_top_level = false;
+        if (t->isImmutable() || t->isShared())
+            return error(t);
+
         if (substitute(t))
             return;
-        if (t->isImmutable() || t->isShared())
-        {
-            visit((Type *)t);
-        }
-        if (t->isConst())
-            buf.writeByte('K');
-        buf.writeByte('P');
+        CV_qualifiers(t);
+        buf->writeByte('P');
         t->next->accept(this);
-        store(t);
+        append(t);
     }
 
     void visit(TypeReference *t)
     {
-        is_top_level = false;
+        //printf("TypeReference %s\n", t->toChars());
         if (substitute(t))
             return;
-        buf.writeByte('R');
+        buf->writeByte('R');
         t->next->accept(this);
-        store(t);
+        append(t);
     }
 
     void visit(TypeFunction *t)
     {
-        is_top_level = false;
         /*
          *  <function-type> ::= F [Y] <bare-function-type> E
          *  <bare-function-type> ::= <signature type>+
@@ -819,1198 +944,167 @@ class CppMangleVisitor : public Visitor
          */
         if (substitute(t))
             return;
-        buf.writeByte('F');
+        buf->writeByte('F');
         if (t->linkage == LINKc)
-            buf.writeByte('Y');
+            buf->writeByte('Y');
         Type *tn = t->next;
         if (t->isref)
             tn  = tn->referenceTo();
         tn->accept(this);
-        argsCppMangle(t->parameters, t->varargs);
-        buf.writeByte('E');
-        store(t);
-    }
-
-    void visit(TypeDelegate *t)
-    {
-        visit((Type *)t);
+        mangleFunctionParameters(t->parameters, t->varargs);
+        buf->writeByte('E');
+        append(t);
     }
 
     void visit(TypeStruct *t)
     {
+        if (t->isImmutable() || t->isShared())
+            return error(t);
+
+        /* __c_long and __c_ulong get special mangling
+         */
         Identifier *id = t->sym->ident;
         //printf("struct id = '%s'\n", id->toChars());
-        char c;
         if (id == Id::__c_long)
-            c = 'l';
+            return writeBasicType(t, 0, 'l');
         else if (id == Id::__c_ulong)
-            c = 'm';
-        else
-            c = 0;
-        if (c)
-        {
-            if (t->isImmutable() || t->isShared())
-            {
-                visit((Type *)t);
-            }
-            if (t->isConst())
-            {
-                if (substitute(t))
-                {
-                    return;
-                }
-                else
-                {
-                    store(t);
-                }
-            }
+            return writeBasicType(t, 0, 'm');
 
-            if (t->isConst())
-                buf.writeByte('K');
+        //printf("TypeStruct %s\n", t->toChars());
+        doSymbol(t);
+    }
 
-            buf.writeByte(c);
-            return;
-        }
 
-        is_top_level = false;
+    void visit(TypeEnum *t)
+    {
+        if (t->isImmutable() || t->isShared())
+            return error(t);
+
+        /* __c_(u)long(long) get special mangling
+         */
+        Identifier *id = t->sym->ident;
+        //printf("enum id = '%s'\n", id->toChars());
+        if (id == Id::__c_long)
+            return writeBasicType(t, 0, 'l');
+        else if (id == Id::__c_ulong)
+            return writeBasicType(t, 0, 'm');
+        else if (id == Id::__c_longlong)
+            return writeBasicType(t, 0, 'x');
+        else if (id == Id::__c_ulonglong)
+            return writeBasicType(t, 0, 'y');
+
+        doSymbol(t);
+    }
 
+    /****************
+     * Write structs and enums.
+     * Params:
+     *  t = TypeStruct or TypeEnum
+     */
+    void doSymbol(Type *t)
+    {
         if (substitute(t))
             return;
-        if (t->isImmutable() || t->isShared())
-        {
-            visit((Type *)t);
-        }
-        if (t->isConst())
-            buf.writeByte('K');
+        CV_qualifiers(t);
 
         // Handle any target-specific struct types.
         if (const char *tm = Target::cppTypeMangle(t))
         {
-            buf.writestring(tm);
+            buf->writestring(tm);
         }
         else
         {
-            if (!substitute(t->sym))
+            Dsymbol *s = t->toDsymbol(NULL);
+            Dsymbol *p = s->toParent();
+            if (p && p->isTemplateInstance())
             {
-                cpp_mangle_name(t->sym, t->isConst());
+                /* https://issues.dlang.org/show_bug.cgi?id=17947
+                 * Substitute the template instance symbol, not the struct/enum symbol
+                 */
+                if (substitute(p))
+                    return;
             }
-
-            if (t->isImmutable() || t->isShared())
+            if (!substitute(s))
             {
-                visit((Type *)t);
+                cpp_mangle_name(s, t->isConst());
             }
         }
-
         if (t->isConst())
-            store(t);
+            append(t);
     }
 
-    void visit(TypeEnum *t)
+    void visit(TypeClass *t)
     {
-        is_top_level = false;
-        if (substitute(t))
-            return;
-
-        if (t->isConst())
-            buf.writeByte('K');
-
-        if (!substitute(t->sym))
-        {
-            cpp_mangle_name(t->sym, t->isConst());
-        }
-
-        if (t->isImmutable() || t->isShared())
-        {
-            visit((Type *)t);
-        }
-
-        if (t->isConst())
-            store(t);
+        mangleTypeClass(t, false);
     }
 
-    void visit(TypeClass *t)
+    /************************
+     * Mangle a class type.
+     * If it's the head, treat the initial pointer as a value type.
+     * Params:
+     *  t = class type
+     *  head = true for head of a type
+     */
+    void mangleTypeClass(TypeClass *t, bool head)
     {
+        if (t->isImmutable() || t->isShared())
+            return error(t);
+
+        /* Mangle as a <pointer to><struct>
+         */
         if (substitute(t))
             return;
-        if (t->isImmutable() || t->isShared())
+        if (!head)
+            CV_qualifiers(t);
+        buf->writeByte('P');
+
+        CV_qualifiers(t);
+
         {
-            visit((Type *)t);
+            Dsymbol *s = t->toDsymbol(NULL);
+            Dsymbol *p = s->toParent();
+            if (p && p->isTemplateInstance())
+            {
+                 /* https://issues.dlang.org/show_bug.cgi?id=17947
+                  * Substitute the template instance symbol, not the class symbol
+                  */
+                if (substitute(p))
+                    return;
+            }
         }
-        if (t->isConst() && !is_top_level)
-            buf.writeByte('K');
-        is_top_level = false;
-        buf.writeByte('P');
-
-        if (t->isConst())
-            buf.writeByte('K');
 
         if (!substitute(t->sym))
         {
             cpp_mangle_name(t->sym, t->isConst());
         }
         if (t->isConst())
-            store(NULL);
-        store(t);
+            append(NULL);  // C++ would have an extra type here
+        append(t);
     }
 
     const char *mangle_typeinfo(Dsymbol *s)
     {
-        buf.writestring("_ZTI");
+        buf->writestring("_ZTI");
         cpp_mangle_name(s, false);
-        return buf.extractString();
+        return buf->extractString();
     }
 };
 
 const char *toCppMangleItanium(Dsymbol *s)
 {
     //printf("toCppMangleItanium(%s)\n", s->toChars());
-    CppMangleVisitor v;
-    return v.mangleOf(s);
+    OutBuffer buf;
+    CppMangleVisitor v(&buf, s->loc);
+    v.mangleOf(s);
+    return buf.extractString();
 }
 
 const char *cppTypeInfoMangleItanium(Dsymbol *s)
 {
     //printf("cppTypeInfoMangleItanium(%s)\n", s->toChars());
-    CppMangleVisitor v;
-    return v.mangle_typeinfo(s);
-}
-
-// Windows DMC and Microsoft Visual C++ mangling
-#define VC_SAVED_TYPE_CNT 10
-#define VC_SAVED_IDENT_CNT 10
-
-class VisualCPPMangler : public Visitor
-{
-    const char *saved_idents[VC_SAVED_IDENT_CNT];
-    Type *saved_types[VC_SAVED_TYPE_CNT];
-
-    // IS_NOT_TOP_TYPE: when we mangling one argument, we can call visit several times (for base types of arg type)
-    // but we must save only arg type:
-    // For example: if we have an int** argument, we should save "int**" but visit will be called for "int**", "int*", "int"
-    // This flag is set up by the visit(NextType, ) function  and should be reset when the arg type output is finished.
-    // MANGLE_RETURN_TYPE: return type shouldn't be saved and substituted in arguments
-    // IGNORE_CONST: in some cases we should ignore CV-modifiers.
-
-    enum Flags
-    {
-        IS_NOT_TOP_TYPE    = 0x1,
-        MANGLE_RETURN_TYPE = 0x2,
-        IGNORE_CONST       = 0x4,
-        IS_DMC             = 0x8
-    };
-
-    int flags;
     OutBuffer buf;
-
-    VisualCPPMangler(VisualCPPMangler *rvl)
-        : flags(0), buf()
-    {
-        flags |= (rvl->flags & IS_DMC);
-        memcpy(&saved_idents, &rvl->saved_idents, sizeof(const char*) * VC_SAVED_IDENT_CNT);
-        memcpy(&saved_types, &rvl->saved_types, sizeof(Type*) * VC_SAVED_TYPE_CNT);
-    }
-
-public:
-    VisualCPPMangler(bool isdmc)
-        : flags(0), buf()
-    {
-        if (isdmc)
-        {
-            flags |= IS_DMC;
-        }
-        memset(&saved_idents, 0, sizeof(const char*) * VC_SAVED_IDENT_CNT);
-        memset(&saved_types, 0, sizeof(Type*) * VC_SAVED_TYPE_CNT);
-    }
-
-    void visit(Type *type)
-    {
-        if (type->isImmutable() || type->isShared())
-        {
-            type->error(Loc(), "Internal Compiler Error: shared or immutable types can not be mapped to C++ (%s)", type->toChars());
-        }
-        else
-        {
-            type->error(Loc(), "Internal Compiler Error: type %s can not be mapped to C++\n", type->toChars());
-        }
-        fatal(); // Fatal, because this error should be handled in frontend
-    }
-
-    void visit(TypeBasic *type)
-    {
-        //printf("visit(TypeBasic); is_not_top_type = %d\n", (int)(flags & IS_NOT_TOP_TYPE));
-        if (type->isImmutable() || type->isShared())
-        {
-            visit((Type*)type);
-            return;
-        }
-
-        if (type->isConst() && ((flags & IS_NOT_TOP_TYPE) || (flags & IS_DMC)))
-        {
-            if (checkTypeSaved(type))
-                return;
-        }
-
-        if ((type->ty == Tbool) && checkTypeSaved(type))// try to replace long name with number
-        {
-            return;
-        }
-        mangleModifier(type);
-        switch (type->ty)
-        {
-            case Tvoid:     buf.writeByte('X');        break;
-            case Tint8:     buf.writeByte('C');        break;
-            case Tuns8:     buf.writeByte('E');        break;
-            case Tint16:    buf.writeByte('F');        break;
-            case Tuns16:    buf.writeByte('G');        break;
-            case Tint32:    buf.writeByte('H');        break;
-            case Tuns32:    buf.writeByte('I');        break;
-            case Tfloat32:  buf.writeByte('M');        break;
-            case Tint64:    buf.writestring("_J");     break;
-            case Tuns64:    buf.writestring("_K");     break;
-            case Tint128:   buf.writestring("_L");     break;
-            case Tuns128:   buf.writestring("_M");     break;
-            case Tfloat64:  buf.writeByte('N');        break;
-            case Tbool:     buf.writestring("_N");     break;
-            case Tchar:     buf.writeByte('D');        break;
-            case Tdchar:    buf.writeByte('I');        break; // unsigned int
-
-            case Tfloat80:
-                if (flags & IS_DMC)
-                    buf.writestring("_Z"); // DigitalMars long double
-                else
-                    buf.writestring("_T"); // Intel long double
-                break;
-
-            case Twchar:
-                if (flags & IS_DMC)
-                    buf.writestring("_Y"); // DigitalMars wchar_t
-                else
-                    buf.writestring("_W"); // Visual C++ wchar_t
-                break;
-
-            default:        visit((Type*)type); return;
-        }
-        flags &= ~IS_NOT_TOP_TYPE;
-        flags &= ~IGNORE_CONST;
-    }
-
-    void visit(TypeVector *type)
-    {
-        //printf("visit(TypeVector); is_not_top_type = %d\n", (int)(flags & IS_NOT_TOP_TYPE));
-        if (checkTypeSaved(type))
-            return;
-        buf.writestring("T__m128@@"); // may be better as __m128i or __m128d?
-        flags &= ~IS_NOT_TOP_TYPE;
-        flags &= ~IGNORE_CONST;
-    }
-
-    void visit(TypeSArray *type)
-    {
-        // This method can be called only for static variable type mangling.
-        //printf("visit(TypeSArray); is_not_top_type = %d\n", (int)(flags & IS_NOT_TOP_TYPE));
-        if (checkTypeSaved(type))
-            return;
-        // first dimension always mangled as const pointer
-        if (flags & IS_DMC)
-            buf.writeByte('Q');
-        else
-            buf.writeByte('P');
-
-        flags |= IS_NOT_TOP_TYPE;
-        assert(type->next);
-        if (type->next->ty == Tsarray)
-        {
-            mangleArray((TypeSArray*)type->next);
-        }
-        else
-        {
-            type->next->accept(this);
-        }
-    }
-
-    // attention: D int[1][2]* arr mapped to C++ int arr[][2][1]; (because it's more typical situation)
-    // There is not way to map int C++ (*arr)[2][1] to D
-    void visit(TypePointer *type)
-    {
-        //printf("visit(TypePointer); is_not_top_type = %d\n", (int)(flags & IS_NOT_TOP_TYPE));
-        if (type->isImmutable() || type->isShared())
-        {
-            visit((Type*)type);
-            return;
-        }
-
-        assert(type->next);
-        if (type->next->ty == Tfunction)
-        {
-            const char *arg = mangleFunctionType((TypeFunction*)type->next); // compute args before checking to save; args should be saved before function type
-
-            // If we've mangled this function early, previous call is meaningless.
-            // However we should do it before checking to save types of function arguments before function type saving.
-            // If this function was already mangled, types of all it arguments are save too, thus previous can't save
-            // anything if function is saved.
-            if (checkTypeSaved(type))
-                return;
-
-            if (type->isConst())
-                buf.writeByte('Q'); // const
-            else
-                buf.writeByte('P'); // mutable
-
-            buf.writeByte('6'); // pointer to a function
-            buf.writestring(arg);
-            flags &= ~IS_NOT_TOP_TYPE;
-            flags &= ~IGNORE_CONST;
-            return;
-        }
-        else if (type->next->ty == Tsarray)
-        {
-            if (checkTypeSaved(type))
-                return;
-            mangleModifier(type);
-
-            if (type->isConst() || !(flags & IS_DMC))
-                buf.writeByte('Q'); // const
-            else
-                buf.writeByte('P'); // mutable
-
-            if (global.params.is64bit)
-                buf.writeByte('E');
-            flags |= IS_NOT_TOP_TYPE;
-
-            mangleArray((TypeSArray*)type->next);
-            return;
-        }
-        else
-        {
-            if (checkTypeSaved(type))
-                return;
-            mangleModifier(type);
-
-            if (type->isConst())
-            {
-                buf.writeByte('Q'); // const
-            }
-            else
-            {
-                buf.writeByte('P'); // mutable
-            }
-
-            if (global.params.is64bit)
-                buf.writeByte('E');
-            flags |= IS_NOT_TOP_TYPE;
-            type->next->accept(this);
-        }
-    }
-
-    void visit(TypeReference *type)
-    {
-        //printf("visit(TypeReference); type = %s\n", type->toChars());
-        if (checkTypeSaved(type))
-            return;
-
-        if (type->isImmutable() || type->isShared())
-        {
-            visit((Type*)type);
-            return;
-        }
-
-        buf.writeByte('A'); // mutable
-
-        if (global.params.is64bit)
-            buf.writeByte('E');
-        flags |= IS_NOT_TOP_TYPE;
-        assert(type->next);
-        if (type->next->ty == Tsarray)
-        {
-            mangleArray((TypeSArray*)type->next);
-        }
-        else
-        {
-            type->next->accept(this);
-        }
-    }
-
-    void visit(TypeFunction *type)
-    {
-        const char *arg = mangleFunctionType(type);
-
-        if ((flags & IS_DMC))
-        {
-            if (checkTypeSaved(type))
-                return;
-        }
-        else
-        {
-            buf.writestring("$$A6");
-        }
-        buf.writestring(arg);
-        flags &= ~(IS_NOT_TOP_TYPE | IGNORE_CONST);
-    }
-
-    void visit(TypeStruct *type)
-    {
-        Identifier *id = type->sym->ident;
-        char c;
-        if (id == Id::__c_long_double)
-            c = 'O';                    // VC++ long double
-        else if (id == Id::__c_long)
-            c = 'J';                    // VC++ long
-        else if (id == Id::__c_ulong)
-            c = 'K';                    // VC++ unsigned long
-        else
-            c = 0;
-
-        if (c)
-        {
-            if (type->isImmutable() || type->isShared())
-            {
-                visit((Type*)type);
-                return;
-            }
-
-            if (type->isConst() && ((flags & IS_NOT_TOP_TYPE) || (flags & IS_DMC)))
-            {
-                if (checkTypeSaved(type))
-                    return;
-            }
-
-            mangleModifier(type);
-            buf.writeByte(c);
-        }
-        else
-        {
-            if (checkTypeSaved(type))
-                return;
-            //printf("visit(TypeStruct); is_not_top_type = %d\n", (int)(flags & IS_NOT_TOP_TYPE));
-            mangleModifier(type);
-            if (type->sym->isUnionDeclaration())
-                buf.writeByte('T');
-            else
-                buf.writeByte(type->cppmangle == CPPMANGLEclass ? 'V' : 'U');
-            mangleIdent(type->sym);
-        }
-        flags &= ~IS_NOT_TOP_TYPE;
-        flags &= ~IGNORE_CONST;
-    }
-
-    void visit(TypeEnum *type)
-    {
-        //printf("visit(TypeEnum); is_not_top_type = %d\n", (int)(flags & IS_NOT_TOP_TYPE));
-        if (checkTypeSaved(type))
-            return;
-        mangleModifier(type);
-        buf.writeByte('W');
-
-        switch (type->sym->memtype->ty)
-        {
-            case Tchar:
-            case Tint8:
-                buf.writeByte('0');
-                break;
-            case Tuns8:
-                buf.writeByte('1');
-                break;
-            case Tint16:
-                buf.writeByte('2');
-                break;
-            case Tuns16:
-                buf.writeByte('3');
-                break;
-            case Tint32:
-                buf.writeByte('4');
-                break;
-            case Tuns32:
-                buf.writeByte('5');
-                break;
-            case Tint64:
-                buf.writeByte('6');
-                break;
-            case Tuns64:
-                buf.writeByte('7');
-                break;
-            default:
-                visit((Type*)type);
-                break;
-        }
-
-        mangleIdent(type->sym);
-        flags &= ~IS_NOT_TOP_TYPE;
-        flags &= ~IGNORE_CONST;
-    }
-
-    // D class mangled as pointer to C++ class
-    // const(Object) mangled as Object const* const
-    void visit(TypeClass *type)
-    {
-        //printf("visit(TypeClass); is_not_top_type = %d\n", (int)(flags & IS_NOT_TOP_TYPE));
-        if (checkTypeSaved(type))
-            return;
-        if (flags & IS_NOT_TOP_TYPE)
-            mangleModifier(type);
-
-        if (type->isConst())
-            buf.writeByte('Q');
-        else
-            buf.writeByte('P');
-
-        if (global.params.is64bit)
-            buf.writeByte('E');
-
-        flags |= IS_NOT_TOP_TYPE;
-        mangleModifier(type);
-
-        buf.writeByte(type->cppmangle == CPPMANGLEstruct ? 'U' : 'V');
-
-        mangleIdent(type->sym);
-        flags &= ~IS_NOT_TOP_TYPE;
-        flags &= ~IGNORE_CONST;
-    }
-
-    char *mangleOf(Dsymbol *s)
-    {
-        VarDeclaration *vd = s->isVarDeclaration();
-        FuncDeclaration *fd = s->isFuncDeclaration();
-        if (vd)
-        {
-            mangleVariable(vd);
-        }
-        else if (fd)
-        {
-            mangleFunction(fd);
-        }
-        else
-        {
-            assert(0);
-        }
-        return buf.extractString();
-    }
-private:
-
-    void mangleFunction(FuncDeclaration *d)
-    {
-        // <function mangle> ? <qualified name> <flags> <return type> <arg list>
-        assert(d);
-        buf.writeByte('?');
-        mangleIdent(d);
-
-        if (d->needThis()) // <flags> ::= <virtual/protection flag> <const/volatile flag> <calling convention flag>
-        {
-            // Pivate methods always non-virtual in D and it should be mangled as non-virtual in C++
-            //printf("%s: isVirtualMethod = %d, isVirtual = %d, vtblIndex = %d, interfaceVirtual = %p\n",
-                //d->toChars(), d->isVirtualMethod(), d->isVirtual(), (int)d->vtblIndex, d->interfaceVirtual);
-            if (d->isVirtual() && (d->vtblIndex != -1 || d->interfaceVirtual || d->overrideInterface()))
-            {
-                switch (d->protection.kind)
-                {
-                    case PROTprivate:
-                        buf.writeByte('E');
-                        break;
-                    case PROTprotected:
-                        buf.writeByte('M');
-                        break;
-                    default:
-                        buf.writeByte('U');
-                        break;
-                }
-            }
-            else
-            {
-                switch (d->protection.kind)
-                {
-                    case PROTprivate:
-                        buf.writeByte('A');
-                        break;
-                    case PROTprotected:
-                        buf.writeByte('I');
-                        break;
-                    default:
-                        buf.writeByte('Q');
-                        break;
-                }
-            }
-            if (global.params.is64bit)
-                buf.writeByte('E');
-            if (d->type->isConst())
-            {
-                buf.writeByte('B');
-            }
-            else
-            {
-                buf.writeByte('A');
-            }
-        }
-        else if (d->isMember2()) // static function
-        {                        // <flags> ::= <virtual/protection flag> <calling convention flag>
-            switch (d->protection.kind)
-            {
-                case PROTprivate:
-                    buf.writeByte('C');
-                    break;
-                case PROTprotected:
-                    buf.writeByte('K');
-                    break;
-                default:
-                    buf.writeByte('S');
-                    break;
-            }
-        }
-        else // top-level function
-        {    // <flags> ::= Y <calling convention flag>
-            buf.writeByte('Y');
-        }
-
-        const char *args = mangleFunctionType((TypeFunction *)d->type, (bool)d->needThis(), d->isCtorDeclaration() || d->isDtorDeclaration());
-        buf.writestring(args);
-    }
-
-    void mangleVariable(VarDeclaration *d)
-    {
-        // <static variable mangle> ::= ? <qualified name> <protection flag> <const/volatile flag> <type>
-        assert(d);
-        // fake mangling for fields to fix https://issues.dlang.org/show_bug.cgi?id=16525
-        if (!(d->storage_class & (STCextern | STCfield | STCgshared)))
-        {
-            d->error("Internal Compiler Error: C++ static non- __gshared non-extern variables not supported");
-            fatal();
-        }
-        buf.writeByte('?');
-        mangleIdent(d);
-
-        assert((d->storage_class & STCfield) || !d->needThis());
-
-        Dsymbol *parent = d->toParent();
-        while (parent && parent->isNspace())
-        {
-            parent = parent->toParent();
-        }
-        if (parent && parent->isModule()) // static member
-        {
-            buf.writeByte('3');
-        }
-        else
-        {
-            switch (d->protection.kind)
-            {
-                case PROTprivate:
-                    buf.writeByte('0');
-                    break;
-                case PROTprotected:
-                    buf.writeByte('1');
-                    break;
-                default:
-                    buf.writeByte('2');
-                    break;
-            }
-        }
-
-        char cv_mod = 0;
-        Type *t = d->type;
-
-        if (t->isImmutable() || t->isShared())
-        {
-            visit((Type*)t);
-            return;
-        }
-        if (t->isConst())
-        {
-            cv_mod = 'B'; // const
-        }
-        else
-        {
-            cv_mod = 'A'; // mutable
-        }
-
-        if (t->ty != Tpointer)
-            t = t->mutableOf();
-
-        t->accept(this);
-
-        if ((t->ty == Tpointer || t->ty == Treference || t->ty == Tclass) && global.params.is64bit)
-        {
-            buf.writeByte('E');
-        }
-
-        buf.writeByte(cv_mod);
-    }
-
-    void mangleName(Dsymbol *sym, bool dont_use_back_reference = false)
-    {
-        //printf("mangleName('%s')\n", sym->toChars());
-        const char *name = NULL;
-        bool is_dmc_template = false;
-        if (sym->isDtorDeclaration())
-        {
-            buf.writestring("?1");
-            return;
-        }
-        if (TemplateInstance *ti = sym->isTemplateInstance())
-        {
-            VisualCPPMangler tmp((flags & IS_DMC) ? true : false);
-            tmp.buf.writeByte('?');
-            tmp.buf.writeByte('$');
-            tmp.buf.writestring(ti->name->toChars());
-            tmp.saved_idents[0] = ti->name->toChars();
-            tmp.buf.writeByte('@');
-            if (flags & IS_DMC)
-            {
-                tmp.mangleIdent(sym->parent, true);
-                is_dmc_template = true;
-            }
-
-            bool is_var_arg = false;
-            for (size_t i = 0; i < ti->tiargs->dim; i++)
-            {
-                RootObject *o = (*ti->tiargs)[i];
-
-                TemplateParameter *tp = NULL;
-                TemplateValueParameter *tv = NULL;
-                TemplateTupleParameter *tt = NULL;
-                if (!is_var_arg)
-                {
-                    TemplateDeclaration *td = ti->tempdecl->isTemplateDeclaration();
-                    assert(td);
-                    tp = (*td->parameters)[i];
-                    tv = tp->isTemplateValueParameter();
-                    tt = tp->isTemplateTupleParameter();
-                }
-
-                if (tt)
-                {
-                    is_var_arg = true;
-                    tp = NULL;
-                }
-                if (tv)
-                {
-                    if (tv->valType->isintegral())
-                    {
-
-                        tmp.buf.writeByte('$');
-                        tmp.buf.writeByte('0');
-
-                        Expression *e = isExpression(o);
-                        assert(e);
-
-                        if (tv->valType->isunsigned())
-                        {
-                            tmp.mangleNumber(e->toUInteger());
-                        }
-                        else if(is_dmc_template)
-                        {
-                            // NOTE: DMC mangles everything based on
-                            // unsigned int
-                            tmp.mangleNumber(e->toInteger());
-                        }
-                        else
-                        {
-                            sinteger_t val = e->toInteger();
-                            if (val < 0)
-                            {
-                                val = -val;
-                                tmp.buf.writeByte('?');
-                            }
-                            tmp.mangleNumber(val);
-                        }
-                    }
-                    else
-                    {
-                        sym->error("Internal Compiler Error: C++ %s template value parameter is not supported", tv->valType->toChars());
-                        fatal();
-                    }
-                }
-                else if (!tp || tp->isTemplateTypeParameter())
-                {
-                    Type *t = isType(o);
-                    assert(t);
-                    t->accept(&tmp);
-                }
-                else if (tp->isTemplateAliasParameter())
-                {
-                    Dsymbol *d = isDsymbol(o);
-                    Expression *e = isExpression(o);
-                    if (!d && !e)
-                    {
-                        sym->error("Internal Compiler Error: %s is unsupported parameter for C++ template", o->toChars());
-                        fatal();
-                    }
-                    if (d && d->isFuncDeclaration())
-                    {
-                        tmp.buf.writeByte('$');
-                        tmp.buf.writeByte('1');
-                        tmp.mangleFunction(d->isFuncDeclaration());
-                    }
-                    else if (e && e->op == TOKvar && ((VarExp*)e)->var->isVarDeclaration())
-                    {
-                        tmp.buf.writeByte('$');
-                        if (flags & IS_DMC)
-                            tmp.buf.writeByte('1');
-                        else
-                            tmp.buf.writeByte('E');
-                        tmp.mangleVariable(((VarExp*)e)->var->isVarDeclaration());
-                    }
-                    else if (d && d->isTemplateDeclaration() && d->isTemplateDeclaration()->onemember)
-                    {
-
-                        Dsymbol *ds = d->isTemplateDeclaration()->onemember;
-                        if (flags & IS_DMC)
-                        {
-                            tmp.buf.writeByte('V');
-                        }
-                        else
-                        {
-                            if (ds->isUnionDeclaration())
-                            {
-                                tmp.buf.writeByte('T');
-                            }
-                            else if (ds->isStructDeclaration())
-                            {
-                                tmp.buf.writeByte('U');
-                            }
-                            else if (ds->isClassDeclaration())
-                            {
-                                tmp.buf.writeByte('V');
-                            }
-                            else
-                            {
-                                sym->error("Internal Compiler Error: C++ templates support only integral value, type parameters, alias templates and alias function parameters");
-                                fatal();
-                            }
-                        }
-                        tmp.mangleIdent(d);
-                    }
-                    else
-                    {
-                        sym->error("Internal Compiler Error: %s is unsupported parameter for C++ template: (%s)", o->toChars());
-                        fatal();
-                    }
-
-                }
-                else
-                {
-                    sym->error("Internal Compiler Error: C++ templates support only integral value, type parameters, alias templates and alias function parameters");
-                    fatal();
-                }
-            }
-            name = tmp.buf.extractString();
-        }
-        else
-        {
-            name = sym->ident->toChars();
-        }
-        assert(name);
-        if (is_dmc_template)
-        {
-            if (checkAndSaveIdent(name))
-                return;
-        }
-        else
-        {
-            if (dont_use_back_reference)
-            {
-                saveIdent(name);
-            }
-            else
-            {
-                if (checkAndSaveIdent(name))
-                    return;
-            }
-        }
-        buf.writestring(name);
-        buf.writeByte('@');
-    }
-
-    // returns true if name already saved
-    bool checkAndSaveIdent(const char *name)
-    {
-        for (size_t i = 0; i < VC_SAVED_IDENT_CNT; i++)
-        {
-            if (!saved_idents[i]) // no saved same name
-            {
-                saved_idents[i] = name;
-                break;
-            }
-
-            if (!strcmp(saved_idents[i], name)) // ok, we've found same name. use index instead of name
-            {
-                buf.writeByte(i + '0');
-                return true;
-            }
-        }
-        return false;
-    }
-
-    void saveIdent(const char *name)
-    {
-        for (size_t i = 0; i < VC_SAVED_IDENT_CNT; i++)
-        {
-            if (!saved_idents[i]) // no saved same name
-            {
-                saved_idents[i] = name;
-                break;
-            }
-
-            if (!strcmp(saved_idents[i], name)) // ok, we've found same name. use index instead of name
-            {
-                return;
-            }
-        }
-    }
-
-    void mangleIdent(Dsymbol *sym, bool dont_use_back_reference = false)
-    {
-        // <qualified name> ::= <sub-name list> @
-        // <sub-name list>  ::= <sub-name> <name parts>
-        //                  ::= <sub-name>
-
-        // <sub-name> ::= <identifier> @
-        //            ::= ?$ <identifier> @ <template args> @
-        //            :: <back reference>
-
-        // <back reference> ::= 0-9
-
-        // <template args> ::= <template arg> <template args>
-        //                ::= <template arg>
-
-        // <template arg>  ::= <type>
-        //                ::= $0<encoded integral number>
-
-        //printf("mangleIdent('%s')\n", sym->toChars());
-        Dsymbol *p = sym;
-        if (p->toParent() && p->toParent()->isTemplateInstance())
-        {
-            p = p->toParent();
-        }
-        while (p && !p->isModule())
-        {
-            mangleName(p, dont_use_back_reference);
-
-            p = p->toParent();
-            if (p->toParent() && p->toParent()->isTemplateInstance())
-            {
-                p = p->toParent();
-            }
-        }
-        if (!dont_use_back_reference)
-            buf.writeByte('@');
-    }
-
-    void mangleNumber(dinteger_t num)
-    {
-        if (!num) // 0 encoded as "A@"
-        {
-            buf.writeByte('A');
-            buf.writeByte('@');
-            return;
-        }
-        if (num <= 10) // 5 encoded as "4"
-        {
-            buf.writeByte((char)(num - 1 + '0'));
-            return;
-        }
-
-        char buff[17];
-        buff[16] = 0;
-        size_t i = 16;
-        while (num)
-        {
-            --i;
-            buff[i] = num % 16 + 'A';
-            num /=16;
-        }
-        buf.writestring(&buff[i]);
-        buf.writeByte('@');
-    }
-
-    bool checkTypeSaved(Type *type)
-    {
-        if (flags & IS_NOT_TOP_TYPE)
-            return false;
-        if (flags & MANGLE_RETURN_TYPE)
-            return false;
-        for (size_t i = 0; i < VC_SAVED_TYPE_CNT; i++)
-        {
-            if (!saved_types[i]) // no saved same type
-            {
-                saved_types[i] = type;
-                return false;
-            }
-            if (saved_types[i]->equals(type)) // ok, we've found same type. use index instead of type
-            {
-                buf.writeByte(i + '0');
-                flags &= ~IS_NOT_TOP_TYPE;
-                flags &= ~IGNORE_CONST;
-                return true;
-            }
-        }
-        return false;
-    }
-
-    void mangleModifier(Type *type)
-    {
-        if (flags & IGNORE_CONST)
-            return;
-        if (type->isImmutable() || type->isShared())
-        {
-            visit((Type*)type);
-            return;
-        }
-        if (type->isConst())
-        {
-            if (flags & IS_NOT_TOP_TYPE)
-                buf.writeByte('B'); // const
-                else if ((flags & IS_DMC) && type->ty != Tpointer)
-                    buf.writestring("_O");
-        }
-        else if (flags & IS_NOT_TOP_TYPE)
-            buf.writeByte('A'); // mutable
-    }
-
-    void mangleArray(TypeSArray *type)
-    {
-        mangleModifier(type);
-        size_t i=0;
-        Type *cur = type;
-        while (cur && cur->ty == Tsarray)
-        {
-            i++;
-            cur = cur->nextOf();
-        }
-        buf.writeByte('Y');
-        mangleNumber(i); // count of dimensions
-        cur = type;
-        while (cur && cur->ty == Tsarray) // sizes of dimensions
-        {
-            TypeSArray *sa = (TypeSArray*)cur;
-            mangleNumber(sa->dim ? sa->dim->toInteger() : 0);
-            cur = cur->nextOf();
-        }
-        flags |= IGNORE_CONST;
-        cur->accept(this);
-    }
-
-    static int mangleParameterDg(void *ctx, size_t, Parameter *p)
-    {
-        VisualCPPMangler *mangler = (VisualCPPMangler *)ctx;
-
-        Type *t = p->type;
-        if (p->storageClass & (STCout | STCref))
-        {
-            t = t->referenceTo();
-        }
-        else if (p->storageClass & STClazy)
-        {
-            // Mangle as delegate
-            Type *td = new TypeFunction(NULL, t, 0, LINKd);
-            td = new TypeDelegate(td);
-            t = t->merge();
-        }
-        if (t->ty == Tsarray)
-        {
-            t->error(Loc(), "Internal Compiler Error: unable to pass static array to extern(C++) function.");
-            t->error(Loc(), "Use pointer instead.");
-            fatal();
-        }
-        mangler->flags &= ~IS_NOT_TOP_TYPE;
-        mangler->flags &= ~IGNORE_CONST;
-        t->accept(mangler);
-
-        return 0;
-    }
-
-    const char *mangleFunctionType(TypeFunction *type, bool needthis = false, bool noreturn = false)
-    {
-        VisualCPPMangler tmp(this);
-        // Calling convention
-        if (global.params.is64bit) // always Microsoft x64 calling convention
-        {
-            tmp.buf.writeByte('A');
-        }
-        else
-        {
-            switch (type->linkage)
-            {
-                case LINKc:
-                    tmp.buf.writeByte('A');
-                    break;
-                case LINKcpp:
-                    if (needthis && type->varargs != 1)
-                        tmp.buf.writeByte('E'); // thiscall
-                    else
-                        tmp.buf.writeByte('A'); // cdecl
-                    break;
-                case LINKwindows:
-                    tmp.buf.writeByte('G'); // stdcall
-                    break;
-                case LINKpascal:
-                    tmp.buf.writeByte('C');
-                    break;
-                default:
-                    tmp.visit((Type*)type);
-                    break;
-            }
-        }
-
-        tmp.flags &= ~IS_NOT_TOP_TYPE;
-        if (noreturn)
-        {
-            tmp.buf.writeByte('@');
-        }
-        else
-        {
-            Type *rettype = type->next;
-            if (type->isref)
-                rettype = rettype->referenceTo();
-            flags &= ~IGNORE_CONST;
-            if (rettype->ty == Tstruct || rettype->ty == Tenum)
-            {
-                Identifier *id = rettype->toDsymbol(NULL)->ident;
-                if (id != Id::__c_long_double &&
-                    id != Id::__c_long &&
-                    id != Id::__c_ulong)
-                {
-                    tmp.buf.writeByte('?');
-                    tmp.buf.writeByte('A');
-                }
-            }
-            tmp.flags |= MANGLE_RETURN_TYPE;
-            rettype->accept(&tmp);
-            tmp.flags &= ~MANGLE_RETURN_TYPE;
-        }
-        if (!type->parameters || !type->parameters->dim)
-        {
-            if (type->varargs == 1)
-                tmp.buf.writeByte('Z');
-            else
-                tmp.buf.writeByte('X');
-        }
-        else
-        {
-            Parameter_foreach(type->parameters, &mangleParameterDg, (void*)&tmp);
-            if (type->varargs == 1)
-            {
-                tmp.buf.writeByte('Z');
-            }
-            else
-            {
-                tmp.buf.writeByte('@');
-            }
-        }
-
-        tmp.buf.writeByte('Z');
-        const char *ret = tmp.buf.extractString();
-        memcpy(&saved_idents, &tmp.saved_idents, sizeof(const char*) * VC_SAVED_IDENT_CNT);
-        memcpy(&saved_types, &tmp.saved_types, sizeof(Type*) * VC_SAVED_TYPE_CNT);
-        return ret;
-    }
-};
-
-const char *toCppMangleMSVC(Dsymbol *s)
-{
-    VisualCPPMangler v(!global.params.mscoff);
-    return v.mangleOf(s);
-}
-
-const char *cppTypeInfoMangleMSVC(Dsymbol *)
-{
-    //printf("cppTypeInfoMangleMSVC(%s)\n", s->toChars());
-    assert(0);
+    buf.writestring("_ZTI");    // "TI" means typeinfo structure
+    CppMangleVisitor v(&buf, s->loc);
+    v.cpp_mangle_name(s, false);
+    return buf.extractString();
 }
diff --git a/gcc/d/dfrontend/denum.c b/gcc/d/dfrontend/denum.c
index 20f0e1a1c..330a106b6 100644
--- a/gcc/d/dfrontend/denum.c
+++ b/gcc/d/dfrontend/denum.c
@@ -303,6 +303,13 @@ Expression *EnumDeclaration::getMaxMinValue(Loc loc, Identifier *id)
         goto Lerrors;
     if (semanticRun == PASSinit || !members)
     {
+        if (isSpecial())
+        {
+            /* Allow these special enums to not need a member list
+             */
+            return memtype->getProperty(loc, id, 0);
+        }
+
         error("is forward referenced looking for .%s", id->toChars());
         goto Lerrors;
     }
@@ -365,6 +372,20 @@ Expression *EnumDeclaration::getMaxMinValue(Loc loc, Identifier *id)
     return *pval;
 }
 
+/****************
+ * Determine if enum is a 'special' one.
+ * Returns:
+ *  true if special
+ */
+bool EnumDeclaration::isSpecial() const
+{
+    return (ident == Id::__c_long ||
+            ident == Id::__c_ulong ||
+            ident == Id::__c_longlong ||
+            ident == Id::__c_ulonglong ||
+            ident == Id::__c_long_double) && memtype;
+}
+
 Expression *EnumDeclaration::getDefaultValue(Loc loc)
 {
     //printf("EnumDeclaration::getDefaultValue() %p %s\n", this, toChars());
@@ -377,6 +398,13 @@ Expression *EnumDeclaration::getDefaultValue(Loc loc)
         goto Lerrors;
     if (semanticRun == PASSinit || !members)
     {
+        if (isSpecial())
+        {
+            /* Allow these special enums to not need a member list
+             */
+            return memtype->defaultInit(loc);
+        }
+
         error(loc, "forward reference of %s.init", toChars());
         goto Lerrors;
     }
diff --git a/gcc/d/dfrontend/enum.h b/gcc/d/dfrontend/enum.h
index 753983c85..39ff95baf 100644
--- a/gcc/d/dfrontend/enum.h
+++ b/gcc/d/dfrontend/enum.h
@@ -61,6 +61,7 @@ class EnumDeclaration : public ScopeDsymbol
     bool isDeprecated();                // is Dsymbol deprecated?
     Prot prot();
     Expression *getMaxMinValue(Loc loc, Identifier *id);
+    bool isSpecial() const;
     Expression *getDefaultValue(Loc loc);
     Type *getMemtype(Loc loc);
 
diff --git a/gcc/d/dfrontend/idgen.c b/gcc/d/dfrontend/idgen.c
index 3ae7b998f..e8b9d6aad 100644
--- a/gcc/d/dfrontend/idgen.c
+++ b/gcc/d/dfrontend/idgen.c
@@ -87,6 +87,8 @@ Msgtable msgtable[] =
     { "gate", "__gate" },
     { "__c_long", NULL },
     { "__c_ulong", NULL },
+    { "__c_longlong", NULL },
+    { "__c_ulonglong", NULL },
     { "__c_long_double", NULL },
     { "cpp_type_info_ptr", "__cpp_type_info_ptr" },
     { "_assert", "assert" },
diff --git a/gcc/d/dfrontend/mtype.c b/gcc/d/dfrontend/mtype.c
index 9d4011f0b..2737f8a82 100644
--- a/gcc/d/dfrontend/mtype.c
+++ b/gcc/d/dfrontend/mtype.c
@@ -3630,6 +3630,19 @@ MATCH TypeBasic::implicitConvTo(Type *to)
         TypeVector *tv = (TypeVector *)to;
         tob = tv->elementType();
     }
+    else if (to->ty == Tenum)
+    {
+        EnumDeclaration *ed = ((TypeEnum *)to)->sym;
+        if (ed->isSpecial())
+        {
+            /* Special enums that allow implicit conversions to them.  */
+            tob = to->toBasetype()->isTypeBasic();
+            if (tob)
+                return implicitConvTo(tob);
+        }
+        else
+            return MATCHnomatch;
+    }
     else
         tob = to->isTypeBasic();
     if (!tob)
@@ -7563,7 +7576,13 @@ Expression *TypeEnum::dotExp(Scope *sc, Expression *e, Identifier *ident, int fl
         sym->semantic(sym->_scope);
     if (!sym->members)
     {
-        if (!(flag & 1))
+        if (sym->isSpecial())
+        {
+            /* Special enums forward to the base type
+             */
+            e = sym->memtype->dotExp(sc, e, ident, flag);
+        }
+        else if (!(flag & 1))
         {
             sym->error("is forward referenced when looking for '%s'", ident->toChars());
             e = new ErrorExp();
diff --git a/gcc/d/dfrontend/target.h b/gcc/d/dfrontend/target.h
index 3fef64528..71e185656 100644
--- a/gcc/d/dfrontend/target.h
+++ b/gcc/d/dfrontend/target.h
@@ -72,10 +72,10 @@ struct Target
     static Expression *paintAsType(Expression *e, Type *type);
     // ABI and backend.
     static void loadModule(Module *m);
-    static void prefixName(OutBuffer *buf, LINK linkage);
     static const char *toCppMangle(Dsymbol *s);
     static const char *cppTypeInfoMangle(ClassDeclaration *cd);
     static const char *cppTypeMangle(Type *t);
+    static Type *cppParameterType(Parameter *p);
     static LINK systemLinkage();
 };
 

From 01672cc1c74ceb2382a7c162c47b1335a85e5c70 Mon Sep 17 00:00:00 2001
From: Iain Buclaw <ibuclaw@gdcproject.org>
Date: Wed, 29 Aug 2018 23:22:33 +0200
Subject: [PATCH 10/10] Update druntime core.stdc bindings

---
 libphobos/libdruntime/Makefile.am             |   96 +-
 libphobos/libdruntime/Makefile.in             |  213 +-
 libphobos/libdruntime/core/bitop.d            |   74 +-
 libphobos/libdruntime/core/stdc/assert_.d     |   26 +
 libphobos/libdruntime/core/stdc/config.d      |  199 +-
 libphobos/libdruntime/core/stdc/errno.d       |  201 +-
 libphobos/libdruntime/core/stdc/fenv.d        |  144 +-
 libphobos/libdruntime/core/stdc/locale.d      |   63 +
 libphobos/libdruntime/core/stdc/math.d        | 2909 +++++++++++------
 libphobos/libdruntime/core/stdc/stdarg.d      |    2 +-
 libphobos/libdruntime/core/stdc/stddef.d      |    3 +
 libphobos/libdruntime/core/stdc/stdint.d      |  266 +-
 libphobos/libdruntime/core/stdc/stdio.d       |  395 ++-
 libphobos/libdruntime/core/stdc/stdlib.d      |   66 +-
 libphobos/libdruntime/core/stdc/string.d      |   14 +
 libphobos/libdruntime/core/stdc/time.d        |   55 +-
 libphobos/libdruntime/core/stdc/wchar_.d      |   51 +-
 libphobos/libdruntime/core/stdcpp/exception.d |    5 +-
 libphobos/libdruntime/core/stdcpp/typeinfo.d  |    4 +-
 libphobos/libdruntime/core/sys/darwin/dlfcn.d |    2 +-
 .../libdruntime/core/sys/darwin/mach/dyld.d   |    2 +-
 .../core/sys/darwin/mach/getsect.d            |  466 ++-
 .../core/sys/darwin/mach/kern_return.d        |    2 +-
 .../libdruntime/core/sys/darwin/mach/loader.d |  324 +-
 .../libdruntime/core/sys/darwin/mach/port.d   |    2 +-
 .../core/sys/darwin/mach/semaphore.d          |    2 +-
 .../core/sys/darwin/mach/thread_act.d         |    2 +-
 .../libdruntime/core/sys/darwin/netinet/in_.d |  611 ++++
 .../libdruntime/core/sys/darwin/pthread.d     |    2 +-
 .../libdruntime/core/sys/darwin/sys/event.d   |  202 +-
 .../libdruntime/core/sys/dragonflybsd/dlfcn.d |  107 +
 .../core/sys/dragonflybsd/execinfo.d          |  133 +
 .../core/sys/dragonflybsd/netinet/in_.d       |  550 ++++
 .../core/sys/dragonflybsd/pthread_np.d        |   45 +
 .../core/sys/dragonflybsd/sys/_bitset.d       |   46 +
 .../core/sys/dragonflybsd/sys/_cpuset.d       |   29 +
 .../core/sys/dragonflybsd/sys/cdefs.d         |   16 +
 .../core/sys/dragonflybsd/sys/elf.d           |   12 +
 .../core/sys/dragonflybsd/sys/elf32.d         |  187 ++
 .../core/sys/dragonflybsd/sys/elf64.d         |  193 ++
 .../core/sys/dragonflybsd/sys/elf_common.d    |  676 ++++
 .../core/sys/dragonflybsd/sys/event.d         |  124 +
 .../core/sys/dragonflybsd/sys/link_elf.d      |   82 +
 .../core/sys/dragonflybsd/sys/mman.d          |  127 +
 .../libdruntime/core/sys/dragonflybsd/time.d  |   29 +
 .../libdruntime/core/sys/freebsd/dlfcn.d      |    2 +-
 .../core/sys/freebsd/netinet/in_.d            |  570 ++++
 .../core/sys/freebsd/sys/elf_common.d         |    1 +
 .../libdruntime/core/sys/freebsd/sys/event.d  |    2 +-
 .../libdruntime/core/sys/freebsd/sys/mount.d  |  304 ++
 libphobos/libdruntime/core/sys/freebsd/time.d |    4 +-
 libphobos/libdruntime/core/sys/linux/config.d |   14 +-
 libphobos/libdruntime/core/sys/linux/elf.d    |    2 +
 libphobos/libdruntime/core/sys/linux/epoll.d  |    1 +
 .../libdruntime/core/sys/linux/ifaddrs.d      |    2 +-
 libphobos/libdruntime/core/sys/linux/link.d   |    2 +-
 .../libdruntime/core/sys/linux/netinet/in_.d  |  393 +++
 .../libdruntime/core/sys/linux/netinet/tcp.d  |   79 +
 libphobos/libdruntime/core/sys/linux/sched.d  |    2 +-
 libphobos/libdruntime/core/sys/linux/stdio.d  |    2 +-
 .../libdruntime/core/sys/linux/sys/file.d     |    2 +-
 .../libdruntime/core/sys/linux/sys/mman.d     |   57 +-
 .../core/sys/linux/sys/netinet/tcp.d          |   84 +-
 .../libdruntime/core/sys/linux/sys/time.d     |    2 +-
 libphobos/libdruntime/core/sys/linux/time.d   |    4 +-
 libphobos/libdruntime/core/sys/netbsd/dlfcn.d |    2 +-
 .../core/sys/netbsd/sys/elf_common.d          |    1 +
 .../libdruntime/core/sys/netbsd/sys/event.d   |    2 +-
 libphobos/libdruntime/core/sys/netbsd/time.d  |    4 +-
 .../libdruntime/core/sys/osx/mach/dyld.d      |    2 +-
 .../libdruntime/core/sys/osx/mach/getsect.d   |    2 +-
 .../core/sys/osx/mach/kern_return.d           |    2 +-
 .../libdruntime/core/sys/osx/mach/loader.d    |    2 +-
 .../libdruntime/core/sys/osx/mach/port.d      |    2 +-
 .../libdruntime/core/sys/osx/mach/semaphore.d |    2 +-
 .../core/sys/osx/mach/thread_act.d            |    2 +-
 libphobos/libdruntime/core/sys/osx/pthread.d  |    2 +-
 .../libdruntime/core/sys/osx/sys/event.d      |    2 +-
 libphobos/libdruntime/core/sys/osx/sys/mman.d |    2 +-
 libphobos/libdruntime/core/sys/posix/aio.d    |  251 ++
 .../libdruntime/core/sys/posix/arpa/inet.d    |   85 +-
 libphobos/libdruntime/core/sys/posix/config.d |   58 +-
 libphobos/libdruntime/core/sys/posix/dirent.d |  153 +-
 libphobos/libdruntime/core/sys/posix/dlfcn.d  |   78 +-
 libphobos/libdruntime/core/sys/posix/fcntl.d  |  290 +-
 libphobos/libdruntime/core/sys/posix/grp.d    |   65 +-
 libphobos/libdruntime/core/sys/posix/iconv.d  |    2 +-
 .../libdruntime/core/sys/posix/inttypes.d     |    2 +-
 libphobos/libdruntime/core/sys/posix/mqueue.d |    4 +-
 .../libdruntime/core/sys/posix/net/if_.d      |   32 +-
 libphobos/libdruntime/core/sys/posix/netdb.d  |  271 +-
 .../libdruntime/core/sys/posix/netinet/in_.d  |  410 ++-
 .../libdruntime/core/sys/posix/netinet/tcp.d  |    6 +-
 libphobos/libdruntime/core/sys/posix/poll.d   |   93 +-
 .../libdruntime/core/sys/posix/pthread.d      |  396 ++-
 libphobos/libdruntime/core/sys/posix/pwd.d    |   80 +-
 libphobos/libdruntime/core/sys/posix/sched.d  |   68 +-
 .../libdruntime/core/sys/posix/semaphore.d    |   47 +-
 libphobos/libdruntime/core/sys/posix/setjmp.d |  116 +-
 libphobos/libdruntime/core/sys/posix/signal.d | 1117 ++++++-
 libphobos/libdruntime/core/sys/posix/stdio.d  |   86 +-
 libphobos/libdruntime/core/sys/posix/stdlib.d |  129 +-
 .../libdruntime/core/sys/posix/sys/filio.d    |    2 +-
 .../libdruntime/core/sys/posix/sys/ioccom.d   |    2 +-
 .../libdruntime/core/sys/posix/sys/ioctl.d    |  349 +-
 .../libdruntime/core/sys/posix/sys/ipc.d      |   70 +-
 .../libdruntime/core/sys/posix/sys/mman.d     |  200 +-
 .../libdruntime/core/sys/posix/sys/resource.d |  169 +-
 .../libdruntime/core/sys/posix/sys/select.d   |  146 +-
 .../libdruntime/core/sys/posix/sys/shm.d      |   91 +-
 .../libdruntime/core/sys/posix/sys/socket.d   |  857 ++++-
 .../libdruntime/core/sys/posix/sys/stat.d     |  454 ++-
 .../libdruntime/core/sys/posix/sys/statvfs.d  |  124 +-
 .../libdruntime/core/sys/posix/sys/time.d     |   61 +-
 .../libdruntime/core/sys/posix/sys/ttycom.d   |    2 +-
 .../libdruntime/core/sys/posix/sys/types.d    |  388 ++-
 .../libdruntime/core/sys/posix/sys/uio.d      |   39 +-
 libphobos/libdruntime/core/sys/posix/sys/un.d |   11 +-
 .../libdruntime/core/sys/posix/sys/utsname.d  |   86 +-
 .../libdruntime/core/sys/posix/sys/wait.d     |   99 +-
 libphobos/libdruntime/core/sys/posix/syslog.d |  123 +
 .../libdruntime/core/sys/posix/termios.d      |  292 +-
 libphobos/libdruntime/core/sys/posix/time.d   |  157 +-
 .../libdruntime/core/sys/posix/ucontext.d     |  279 +-
 libphobos/libdruntime/core/sys/posix/unistd.d |  962 +++++-
 libphobos/libdruntime/core/sys/posix/utime.d  |   32 +-
 .../libdruntime/core/sys/solaris/sys/elf.d    |    1 +
 .../core/sys/solaris/sys/priocntl.d           |    3 +-
 .../core/sys/solaris/sys/procset.d            |    2 +-
 .../libdruntime/core/sys/solaris/sys/types.d  |    2 +-
 libphobos/libdruntime/core/sys/solaris/time.d |    2 +-
 .../libdruntime/core/sys/windows/mswsock.d    |   27 +-
 .../libdruntime/core/sys/windows/odbcinst.d   |    2 +-
 .../libdruntime/core/sys/windows/stacktrace.d |    4 +-
 libphobos/libdruntime/core/sys/windows/uuid.d |    3 -
 .../libdruntime/core/sys/windows/winbase.d    |    2 +-
 .../libdruntime/core/sys/windows/wincon.d     |   22 +-
 .../libdruntime/core/sys/windows/wincrypt.d   |    2 +-
 .../libdruntime/core/sys/windows/winsock2.d   |    3 +
 libphobos/libdruntime/core/threadasm.S        |   74 +-
 libphobos/libdruntime/gcc/backtrace.d         |  190 +-
 libphobos/libdruntime/rt/backtrace/dwarf.d    |  525 ---
 libphobos/libdruntime/rt/backtrace/elf.d      |  234 --
 143 files changed, 17451 insertions(+), 2798 deletions(-)
 create mode 100644 libphobos/libdruntime/core/sys/darwin/netinet/in_.d
 create mode 100644 libphobos/libdruntime/core/sys/dragonflybsd/dlfcn.d
 create mode 100644 libphobos/libdruntime/core/sys/dragonflybsd/execinfo.d
 create mode 100644 libphobos/libdruntime/core/sys/dragonflybsd/netinet/in_.d
 create mode 100644 libphobos/libdruntime/core/sys/dragonflybsd/pthread_np.d
 create mode 100644 libphobos/libdruntime/core/sys/dragonflybsd/sys/_bitset.d
 create mode 100644 libphobos/libdruntime/core/sys/dragonflybsd/sys/_cpuset.d
 create mode 100644 libphobos/libdruntime/core/sys/dragonflybsd/sys/cdefs.d
 create mode 100644 libphobos/libdruntime/core/sys/dragonflybsd/sys/elf.d
 create mode 100644 libphobos/libdruntime/core/sys/dragonflybsd/sys/elf32.d
 create mode 100644 libphobos/libdruntime/core/sys/dragonflybsd/sys/elf64.d
 create mode 100644 libphobos/libdruntime/core/sys/dragonflybsd/sys/elf_common.d
 create mode 100644 libphobos/libdruntime/core/sys/dragonflybsd/sys/event.d
 create mode 100644 libphobos/libdruntime/core/sys/dragonflybsd/sys/link_elf.d
 create mode 100644 libphobos/libdruntime/core/sys/dragonflybsd/sys/mman.d
 create mode 100644 libphobos/libdruntime/core/sys/dragonflybsd/time.d
 create mode 100644 libphobos/libdruntime/core/sys/freebsd/netinet/in_.d
 create mode 100644 libphobos/libdruntime/core/sys/freebsd/sys/mount.d
 create mode 100644 libphobos/libdruntime/core/sys/linux/netinet/in_.d
 create mode 100644 libphobos/libdruntime/core/sys/linux/netinet/tcp.d
 create mode 100644 libphobos/libdruntime/core/sys/posix/aio.d
 delete mode 100644 libphobos/libdruntime/rt/backtrace/dwarf.d
 delete mode 100644 libphobos/libdruntime/rt/backtrace/elf.d

diff --git a/libphobos/libdruntime/Makefile.am b/libphobos/libdruntime/Makefile.am
index f6630d5dc..f8739c315 100644
--- a/libphobos/libdruntime/Makefile.am
+++ b/libphobos/libdruntime/Makefile.am
@@ -171,19 +171,18 @@ DRUNTIME_DSOURCES = core/atomic.d core/attribute.d core/bitop.d \
 	gcc/builtins.d gcc/deh.d gcc/unwind/arm.d gcc/unwind/arm_common.d \
 	gcc/unwind/c6x.d gcc/unwind/generic.d gcc/unwind/package.d \
 	gcc/unwind/pe.d object.d rt/aApply.d rt/aApplyR.d rt/aaA.d rt/adi.d \
-	rt/arrayassign.d rt/arraycast.d rt/arraycat.d rt/backtrace/dwarf.d \
-	rt/backtrace/elf.d rt/cast_.d rt/config.d rt/critical_.d rt/deh.d \
-	rt/dmain2.d rt/invariant.d rt/lifetime.d rt/memory.d rt/minfo.d \
-	rt/monitor_.d rt/obj.d rt/qsort.d rt/sections.d rt/sections_android.d \
-	rt/sections_elf_shared.d rt/sections_osx.d rt/sections_solaris.d \
-	rt/sections_win32.d rt/sections_win64.d rt/switch_.d rt/tlsgc.d \
-	rt/typeinfo/ti_Acdouble.d rt/typeinfo/ti_Acfloat.d \
-	rt/typeinfo/ti_Acreal.d rt/typeinfo/ti_Adouble.d \
-	rt/typeinfo/ti_Afloat.d rt/typeinfo/ti_Ag.d rt/typeinfo/ti_Aint.d \
-	rt/typeinfo/ti_Along.d rt/typeinfo/ti_Areal.d rt/typeinfo/ti_Ashort.d \
-	rt/typeinfo/ti_C.d rt/typeinfo/ti_byte.d rt/typeinfo/ti_cdouble.d \
-	rt/typeinfo/ti_cent.d rt/typeinfo/ti_cfloat.d rt/typeinfo/ti_char.d \
-	rt/typeinfo/ti_creal.d rt/typeinfo/ti_dchar.d \
+	rt/arrayassign.d rt/arraycast.d rt/arraycat.d rt/cast_.d rt/config.d \
+	rt/critical_.d rt/deh.d rt/dmain2.d rt/invariant.d rt/lifetime.d \
+	rt/memory.d rt/minfo.d rt/monitor_.d rt/obj.d rt/qsort.d rt/sections.d \
+	rt/sections_android.d rt/sections_elf_shared.d rt/sections_osx.d \
+	rt/sections_solaris.d rt/sections_win32.d rt/sections_win64.d \
+	rt/switch_.d rt/tlsgc.d rt/typeinfo/ti_Acdouble.d \
+	rt/typeinfo/ti_Acfloat.d rt/typeinfo/ti_Acreal.d \
+	rt/typeinfo/ti_Adouble.d rt/typeinfo/ti_Afloat.d rt/typeinfo/ti_Ag.d \
+	rt/typeinfo/ti_Aint.d rt/typeinfo/ti_Along.d rt/typeinfo/ti_Areal.d \
+	rt/typeinfo/ti_Ashort.d rt/typeinfo/ti_C.d rt/typeinfo/ti_byte.d \
+	rt/typeinfo/ti_cdouble.d rt/typeinfo/ti_cent.d rt/typeinfo/ti_cfloat.d \
+	rt/typeinfo/ti_char.d rt/typeinfo/ti_creal.d rt/typeinfo/ti_dchar.d \
 	rt/typeinfo/ti_delegate.d rt/typeinfo/ti_double.d \
 	rt/typeinfo/ti_float.d rt/typeinfo/ti_idouble.d \
 	rt/typeinfo/ti_ifloat.d rt/typeinfo/ti_int.d rt/typeinfo/ti_ireal.d \
@@ -212,22 +211,35 @@ DRUNTIME_DSOURCES_DARWIN = core/sys/darwin/dlfcn.d \
 	core/sys/darwin/mach/getsect.d core/sys/darwin/mach/kern_return.d \
 	core/sys/darwin/mach/loader.d core/sys/darwin/mach/port.d \
 	core/sys/darwin/mach/semaphore.d core/sys/darwin/mach/thread_act.d \
-	core/sys/darwin/pthread.d core/sys/darwin/sys/cdefs.d \
-	core/sys/darwin/sys/event.d core/sys/darwin/sys/mman.d
+	core/sys/darwin/netinet/in_.d core/sys/darwin/pthread.d \
+	core/sys/darwin/sys/cdefs.d core/sys/darwin/sys/event.d \
+	core/sys/darwin/sys/mman.d
+
+DRUNTIME_DSOURCES_DRAGONFLYBSD = core/sys/dragonflybsd/dlfcn.d \
+	core/sys/dragonflybsd/execinfo.d core/sys/dragonflybsd/netinet/in_.d \
+	core/sys/dragonflybsd/pthread_np.d core/sys/dragonflybsd/sys/_bitset.d \
+	core/sys/dragonflybsd/sys/_cpuset.d core/sys/dragonflybsd/sys/cdefs.d \
+	core/sys/dragonflybsd/sys/elf.d core/sys/dragonflybsd/sys/elf32.d \
+	core/sys/dragonflybsd/sys/elf64.d \
+	core/sys/dragonflybsd/sys/elf_common.d \
+	core/sys/dragonflybsd/sys/event.d core/sys/dragonflybsd/sys/link_elf.d \
+	core/sys/dragonflybsd/sys/mman.d core/sys/dragonflybsd/time.d
 
 DRUNTIME_DSOURCES_FREEBSD = core/sys/freebsd/dlfcn.d \
-	core/sys/freebsd/execinfo.d core/sys/freebsd/pthread_np.d \
-	core/sys/freebsd/sys/_bitset.d core/sys/freebsd/sys/_cpuset.d \
-	core/sys/freebsd/sys/cdefs.d core/sys/freebsd/sys/elf.d \
-	core/sys/freebsd/sys/elf32.d core/sys/freebsd/sys/elf64.d \
-	core/sys/freebsd/sys/elf_common.d core/sys/freebsd/sys/event.d \
-	core/sys/freebsd/sys/link_elf.d core/sys/freebsd/sys/mman.d \
+	core/sys/freebsd/execinfo.d core/sys/freebsd/netinet/in_.d \
+	core/sys/freebsd/pthread_np.d core/sys/freebsd/sys/_bitset.d \
+	core/sys/freebsd/sys/_cpuset.d core/sys/freebsd/sys/cdefs.d \
+	core/sys/freebsd/sys/elf.d core/sys/freebsd/sys/elf32.d \
+	core/sys/freebsd/sys/elf64.d core/sys/freebsd/sys/elf_common.d \
+	core/sys/freebsd/sys/event.d core/sys/freebsd/sys/link_elf.d \
+	core/sys/freebsd/sys/mman.d core/sys/freebsd/sys/mount.d \
 	core/sys/freebsd/time.d
 
 DRUNTIME_DSOURCES_LINUX = core/sys/linux/config.d \
 	core/sys/linux/dlfcn.d core/sys/linux/elf.d core/sys/linux/epoll.d \
 	core/sys/linux/errno.d core/sys/linux/execinfo.d \
 	core/sys/linux/fcntl.d core/sys/linux/ifaddrs.d core/sys/linux/link.d \
+	core/sys/linux/netinet/in_.d core/sys/linux/netinet/tcp.d \
 	core/sys/linux/sched.d core/sys/linux/stdio.d \
 	core/sys/linux/sys/auxv.d core/sys/linux/sys/eventfd.d \
 	core/sys/linux/sys/file.d core/sys/linux/sys/inotify.d \
@@ -255,27 +267,27 @@ DRUNTIME_DSOURCES_OSX = core/sys/osx/execinfo.d \
 	core/sys/osx/sys/cdefs.d core/sys/osx/sys/event.d \
 	core/sys/osx/sys/mman.d
 
-DRUNTIME_DSOURCES_POSIX = core/sys/posix/arpa/inet.d \
-	core/sys/posix/config.d core/sys/posix/dirent.d core/sys/posix/dlfcn.d \
-	core/sys/posix/fcntl.d core/sys/posix/grp.d core/sys/posix/iconv.d \
-	core/sys/posix/inttypes.d core/sys/posix/libgen.d \
-	core/sys/posix/mqueue.d core/sys/posix/net/if_.d \
-	core/sys/posix/netdb.d core/sys/posix/netinet/in_.d \
-	core/sys/posix/netinet/tcp.d core/sys/posix/poll.d \
-	core/sys/posix/pthread.d core/sys/posix/pwd.d core/sys/posix/sched.d \
-	core/sys/posix/semaphore.d core/sys/posix/setjmp.d \
-	core/sys/posix/signal.d core/sys/posix/stdio.d core/sys/posix/stdlib.d \
-	core/sys/posix/sys/filio.d core/sys/posix/sys/ioccom.d \
-	core/sys/posix/sys/ioctl.d core/sys/posix/sys/ipc.d \
-	core/sys/posix/sys/mman.d core/sys/posix/sys/msg.d \
-	core/sys/posix/sys/resource.d core/sys/posix/sys/select.d \
-	core/sys/posix/sys/shm.d core/sys/posix/sys/socket.d \
-	core/sys/posix/sys/stat.d core/sys/posix/sys/statvfs.d \
-	core/sys/posix/sys/time.d core/sys/posix/sys/ttycom.d \
-	core/sys/posix/sys/types.d core/sys/posix/sys/uio.d \
-	core/sys/posix/sys/un.d core/sys/posix/sys/utsname.d \
-	core/sys/posix/sys/wait.d core/sys/posix/syslog.d \
-	core/sys/posix/termios.d core/sys/posix/time.d \
+DRUNTIME_DSOURCES_POSIX = core/sys/posix/aio.d \
+	core/sys/posix/arpa/inet.d core/sys/posix/config.d \
+	core/sys/posix/dirent.d core/sys/posix/dlfcn.d core/sys/posix/fcntl.d \
+	core/sys/posix/grp.d core/sys/posix/iconv.d core/sys/posix/inttypes.d \
+	core/sys/posix/libgen.d core/sys/posix/mqueue.d \
+	core/sys/posix/net/if_.d core/sys/posix/netdb.d \
+	core/sys/posix/netinet/in_.d core/sys/posix/netinet/tcp.d \
+	core/sys/posix/poll.d core/sys/posix/pthread.d core/sys/posix/pwd.d \
+	core/sys/posix/sched.d core/sys/posix/semaphore.d \
+	core/sys/posix/setjmp.d core/sys/posix/signal.d core/sys/posix/stdio.d \
+	core/sys/posix/stdlib.d core/sys/posix/sys/filio.d \
+	core/sys/posix/sys/ioccom.d core/sys/posix/sys/ioctl.d \
+	core/sys/posix/sys/ipc.d core/sys/posix/sys/mman.d \
+	core/sys/posix/sys/msg.d core/sys/posix/sys/resource.d \
+	core/sys/posix/sys/select.d core/sys/posix/sys/shm.d \
+	core/sys/posix/sys/socket.d core/sys/posix/sys/stat.d \
+	core/sys/posix/sys/statvfs.d core/sys/posix/sys/time.d \
+	core/sys/posix/sys/ttycom.d core/sys/posix/sys/types.d \
+	core/sys/posix/sys/uio.d core/sys/posix/sys/un.d \
+	core/sys/posix/sys/utsname.d core/sys/posix/sys/wait.d \
+	core/sys/posix/syslog.d core/sys/posix/termios.d core/sys/posix/time.d \
 	core/sys/posix/ucontext.d core/sys/posix/unistd.d \
 	core/sys/posix/utime.d
 
diff --git a/libphobos/libdruntime/Makefile.in b/libphobos/libdruntime/Makefile.in
index 37edc1cc3..eb8290c1b 100644
--- a/libphobos/libdruntime/Makefile.in
+++ b/libphobos/libdruntime/Makefile.in
@@ -168,8 +168,7 @@ am__objects_1 = core/atomic.lo core/attribute.lo core/bitop.lo \
 	gcc/unwind/arm_common.lo gcc/unwind/c6x.lo \
 	gcc/unwind/generic.lo gcc/unwind/package.lo gcc/unwind/pe.lo \
 	object.lo rt/aApply.lo rt/aApplyR.lo rt/aaA.lo rt/adi.lo \
-	rt/arrayassign.lo rt/arraycast.lo rt/arraycat.lo \
-	rt/backtrace/dwarf.lo rt/backtrace/elf.lo rt/cast_.lo \
+	rt/arrayassign.lo rt/arraycast.lo rt/arraycat.lo rt/cast_.lo \
 	rt/config.lo rt/critical_.lo rt/deh.lo rt/dmain2.lo \
 	rt/invariant.lo rt/lifetime.lo rt/memory.lo rt/minfo.lo \
 	rt/monitor_.lo rt/obj.lo rt/qsort.lo rt/sections.lo \
@@ -205,37 +204,39 @@ am__objects_2 = gc/bits.lo gc/config.lo gc/gcinterface.lo \
 @DRUNTIME_GC_ENABLE_TRUE@am__objects_3 = $(am__objects_2)
 am__objects_4 = gcstub/gc.lo
 @DRUNTIME_GC_ENABLE_FALSE@am__objects_5 = $(am__objects_4)
-am__objects_6 = core/sys/posix/arpa/inet.lo core/sys/posix/config.lo \
-	core/sys/posix/dirent.lo core/sys/posix/dlfcn.lo \
-	core/sys/posix/fcntl.lo core/sys/posix/grp.lo \
-	core/sys/posix/iconv.lo core/sys/posix/inttypes.lo \
-	core/sys/posix/libgen.lo core/sys/posix/mqueue.lo \
-	core/sys/posix/net/if_.lo core/sys/posix/netdb.lo \
-	core/sys/posix/netinet/in_.lo core/sys/posix/netinet/tcp.lo \
-	core/sys/posix/poll.lo core/sys/posix/pthread.lo \
-	core/sys/posix/pwd.lo core/sys/posix/sched.lo \
-	core/sys/posix/semaphore.lo core/sys/posix/setjmp.lo \
-	core/sys/posix/signal.lo core/sys/posix/stdio.lo \
-	core/sys/posix/stdlib.lo core/sys/posix/sys/filio.lo \
-	core/sys/posix/sys/ioccom.lo core/sys/posix/sys/ioctl.lo \
-	core/sys/posix/sys/ipc.lo core/sys/posix/sys/mman.lo \
-	core/sys/posix/sys/msg.lo core/sys/posix/sys/resource.lo \
-	core/sys/posix/sys/select.lo core/sys/posix/sys/shm.lo \
-	core/sys/posix/sys/socket.lo core/sys/posix/sys/stat.lo \
-	core/sys/posix/sys/statvfs.lo core/sys/posix/sys/time.lo \
-	core/sys/posix/sys/ttycom.lo core/sys/posix/sys/types.lo \
-	core/sys/posix/sys/uio.lo core/sys/posix/sys/un.lo \
-	core/sys/posix/sys/utsname.lo core/sys/posix/sys/wait.lo \
-	core/sys/posix/syslog.lo core/sys/posix/termios.lo \
-	core/sys/posix/time.lo core/sys/posix/ucontext.lo \
-	core/sys/posix/unistd.lo core/sys/posix/utime.lo
+am__objects_6 = core/sys/posix/aio.lo core/sys/posix/arpa/inet.lo \
+	core/sys/posix/config.lo core/sys/posix/dirent.lo \
+	core/sys/posix/dlfcn.lo core/sys/posix/fcntl.lo \
+	core/sys/posix/grp.lo core/sys/posix/iconv.lo \
+	core/sys/posix/inttypes.lo core/sys/posix/libgen.lo \
+	core/sys/posix/mqueue.lo core/sys/posix/net/if_.lo \
+	core/sys/posix/netdb.lo core/sys/posix/netinet/in_.lo \
+	core/sys/posix/netinet/tcp.lo core/sys/posix/poll.lo \
+	core/sys/posix/pthread.lo core/sys/posix/pwd.lo \
+	core/sys/posix/sched.lo core/sys/posix/semaphore.lo \
+	core/sys/posix/setjmp.lo core/sys/posix/signal.lo \
+	core/sys/posix/stdio.lo core/sys/posix/stdlib.lo \
+	core/sys/posix/sys/filio.lo core/sys/posix/sys/ioccom.lo \
+	core/sys/posix/sys/ioctl.lo core/sys/posix/sys/ipc.lo \
+	core/sys/posix/sys/mman.lo core/sys/posix/sys/msg.lo \
+	core/sys/posix/sys/resource.lo core/sys/posix/sys/select.lo \
+	core/sys/posix/sys/shm.lo core/sys/posix/sys/socket.lo \
+	core/sys/posix/sys/stat.lo core/sys/posix/sys/statvfs.lo \
+	core/sys/posix/sys/time.lo core/sys/posix/sys/ttycom.lo \
+	core/sys/posix/sys/types.lo core/sys/posix/sys/uio.lo \
+	core/sys/posix/sys/un.lo core/sys/posix/sys/utsname.lo \
+	core/sys/posix/sys/wait.lo core/sys/posix/syslog.lo \
+	core/sys/posix/termios.lo core/sys/posix/time.lo \
+	core/sys/posix/ucontext.lo core/sys/posix/unistd.lo \
+	core/sys/posix/utime.lo
 @DRUNTIME_OS_UNIX_TRUE@am__objects_7 = $(am__objects_6)
 am__objects_8 = core/sys/darwin/dlfcn.lo core/sys/darwin/execinfo.lo \
 	core/sys/darwin/mach/dyld.lo core/sys/darwin/mach/getsect.lo \
 	core/sys/darwin/mach/kern_return.lo \
 	core/sys/darwin/mach/loader.lo core/sys/darwin/mach/port.lo \
 	core/sys/darwin/mach/semaphore.lo \
-	core/sys/darwin/mach/thread_act.lo core/sys/darwin/pthread.lo \
+	core/sys/darwin/mach/thread_act.lo \
+	core/sys/darwin/netinet/in_.lo core/sys/darwin/pthread.lo \
 	core/sys/darwin/sys/cdefs.lo core/sys/darwin/sys/event.lo \
 	core/sys/darwin/sys/mman.lo
 am__objects_9 = core/sys/osx/execinfo.lo core/sys/osx/mach/dyld.lo \
@@ -249,14 +250,15 @@ am__objects_9 = core/sys/osx/execinfo.lo core/sys/osx/mach/dyld.lo \
 am__objects_11 = core/sys/bionic/fcntl.lo core/sys/bionic/unistd.lo
 @DRUNTIME_OS_ANDROID_TRUE@am__objects_12 = $(am__objects_11)
 am__objects_13 = core/sys/freebsd/dlfcn.lo \
-	core/sys/freebsd/execinfo.lo core/sys/freebsd/pthread_np.lo \
-	core/sys/freebsd/sys/_bitset.lo \
+	core/sys/freebsd/execinfo.lo core/sys/freebsd/netinet/in_.lo \
+	core/sys/freebsd/pthread_np.lo core/sys/freebsd/sys/_bitset.lo \
 	core/sys/freebsd/sys/_cpuset.lo core/sys/freebsd/sys/cdefs.lo \
 	core/sys/freebsd/sys/elf.lo core/sys/freebsd/sys/elf32.lo \
 	core/sys/freebsd/sys/elf64.lo \
 	core/sys/freebsd/sys/elf_common.lo \
 	core/sys/freebsd/sys/event.lo core/sys/freebsd/sys/link_elf.lo \
-	core/sys/freebsd/sys/mman.lo core/sys/freebsd/time.lo
+	core/sys/freebsd/sys/mman.lo core/sys/freebsd/sys/mount.lo \
+	core/sys/freebsd/time.lo
 @DRUNTIME_OS_FREEBSD_TRUE@am__objects_14 = $(am__objects_13)
 am__objects_15 = core/sys/openbsd/dlfcn.lo
 @DRUNTIME_OS_OPENBSD_TRUE@am__objects_16 = $(am__objects_15)
@@ -264,7 +266,8 @@ am__objects_17 = core/sys/linux/config.lo core/sys/linux/dlfcn.lo \
 	core/sys/linux/elf.lo core/sys/linux/epoll.lo \
 	core/sys/linux/errno.lo core/sys/linux/execinfo.lo \
 	core/sys/linux/fcntl.lo core/sys/linux/ifaddrs.lo \
-	core/sys/linux/link.lo core/sys/linux/sched.lo \
+	core/sys/linux/link.lo core/sys/linux/netinet/in_.lo \
+	core/sys/linux/netinet/tcp.lo core/sys/linux/sched.lo \
 	core/sys/linux/stdio.lo core/sys/linux/sys/auxv.lo \
 	core/sys/linux/sys/eventfd.lo core/sys/linux/sys/file.lo \
 	core/sys/linux/sys/inotify.lo core/sys/linux/sys/mman.lo \
@@ -707,19 +710,18 @@ DRUNTIME_DSOURCES = core/atomic.d core/attribute.d core/bitop.d \
 	gcc/builtins.d gcc/deh.d gcc/unwind/arm.d gcc/unwind/arm_common.d \
 	gcc/unwind/c6x.d gcc/unwind/generic.d gcc/unwind/package.d \
 	gcc/unwind/pe.d object.d rt/aApply.d rt/aApplyR.d rt/aaA.d rt/adi.d \
-	rt/arrayassign.d rt/arraycast.d rt/arraycat.d rt/backtrace/dwarf.d \
-	rt/backtrace/elf.d rt/cast_.d rt/config.d rt/critical_.d rt/deh.d \
-	rt/dmain2.d rt/invariant.d rt/lifetime.d rt/memory.d rt/minfo.d \
-	rt/monitor_.d rt/obj.d rt/qsort.d rt/sections.d rt/sections_android.d \
-	rt/sections_elf_shared.d rt/sections_osx.d rt/sections_solaris.d \
-	rt/sections_win32.d rt/sections_win64.d rt/switch_.d rt/tlsgc.d \
-	rt/typeinfo/ti_Acdouble.d rt/typeinfo/ti_Acfloat.d \
-	rt/typeinfo/ti_Acreal.d rt/typeinfo/ti_Adouble.d \
-	rt/typeinfo/ti_Afloat.d rt/typeinfo/ti_Ag.d rt/typeinfo/ti_Aint.d \
-	rt/typeinfo/ti_Along.d rt/typeinfo/ti_Areal.d rt/typeinfo/ti_Ashort.d \
-	rt/typeinfo/ti_C.d rt/typeinfo/ti_byte.d rt/typeinfo/ti_cdouble.d \
-	rt/typeinfo/ti_cent.d rt/typeinfo/ti_cfloat.d rt/typeinfo/ti_char.d \
-	rt/typeinfo/ti_creal.d rt/typeinfo/ti_dchar.d \
+	rt/arrayassign.d rt/arraycast.d rt/arraycat.d rt/cast_.d rt/config.d \
+	rt/critical_.d rt/deh.d rt/dmain2.d rt/invariant.d rt/lifetime.d \
+	rt/memory.d rt/minfo.d rt/monitor_.d rt/obj.d rt/qsort.d rt/sections.d \
+	rt/sections_android.d rt/sections_elf_shared.d rt/sections_osx.d \
+	rt/sections_solaris.d rt/sections_win32.d rt/sections_win64.d \
+	rt/switch_.d rt/tlsgc.d rt/typeinfo/ti_Acdouble.d \
+	rt/typeinfo/ti_Acfloat.d rt/typeinfo/ti_Acreal.d \
+	rt/typeinfo/ti_Adouble.d rt/typeinfo/ti_Afloat.d rt/typeinfo/ti_Ag.d \
+	rt/typeinfo/ti_Aint.d rt/typeinfo/ti_Along.d rt/typeinfo/ti_Areal.d \
+	rt/typeinfo/ti_Ashort.d rt/typeinfo/ti_C.d rt/typeinfo/ti_byte.d \
+	rt/typeinfo/ti_cdouble.d rt/typeinfo/ti_cent.d rt/typeinfo/ti_cfloat.d \
+	rt/typeinfo/ti_char.d rt/typeinfo/ti_creal.d rt/typeinfo/ti_dchar.d \
 	rt/typeinfo/ti_delegate.d rt/typeinfo/ti_double.d \
 	rt/typeinfo/ti_float.d rt/typeinfo/ti_idouble.d \
 	rt/typeinfo/ti_ifloat.d rt/typeinfo/ti_int.d rt/typeinfo/ti_ireal.d \
@@ -747,22 +749,35 @@ DRUNTIME_DSOURCES_DARWIN = core/sys/darwin/dlfcn.d \
 	core/sys/darwin/mach/getsect.d core/sys/darwin/mach/kern_return.d \
 	core/sys/darwin/mach/loader.d core/sys/darwin/mach/port.d \
 	core/sys/darwin/mach/semaphore.d core/sys/darwin/mach/thread_act.d \
-	core/sys/darwin/pthread.d core/sys/darwin/sys/cdefs.d \
-	core/sys/darwin/sys/event.d core/sys/darwin/sys/mman.d
+	core/sys/darwin/netinet/in_.d core/sys/darwin/pthread.d \
+	core/sys/darwin/sys/cdefs.d core/sys/darwin/sys/event.d \
+	core/sys/darwin/sys/mman.d
+
+DRUNTIME_DSOURCES_DRAGONFLYBSD = core/sys/dragonflybsd/dlfcn.d \
+	core/sys/dragonflybsd/execinfo.d core/sys/dragonflybsd/netinet/in_.d \
+	core/sys/dragonflybsd/pthread_np.d core/sys/dragonflybsd/sys/_bitset.d \
+	core/sys/dragonflybsd/sys/_cpuset.d core/sys/dragonflybsd/sys/cdefs.d \
+	core/sys/dragonflybsd/sys/elf.d core/sys/dragonflybsd/sys/elf32.d \
+	core/sys/dragonflybsd/sys/elf64.d \
+	core/sys/dragonflybsd/sys/elf_common.d \
+	core/sys/dragonflybsd/sys/event.d core/sys/dragonflybsd/sys/link_elf.d \
+	core/sys/dragonflybsd/sys/mman.d core/sys/dragonflybsd/time.d
 
 DRUNTIME_DSOURCES_FREEBSD = core/sys/freebsd/dlfcn.d \
-	core/sys/freebsd/execinfo.d core/sys/freebsd/pthread_np.d \
-	core/sys/freebsd/sys/_bitset.d core/sys/freebsd/sys/_cpuset.d \
-	core/sys/freebsd/sys/cdefs.d core/sys/freebsd/sys/elf.d \
-	core/sys/freebsd/sys/elf32.d core/sys/freebsd/sys/elf64.d \
-	core/sys/freebsd/sys/elf_common.d core/sys/freebsd/sys/event.d \
-	core/sys/freebsd/sys/link_elf.d core/sys/freebsd/sys/mman.d \
+	core/sys/freebsd/execinfo.d core/sys/freebsd/netinet/in_.d \
+	core/sys/freebsd/pthread_np.d core/sys/freebsd/sys/_bitset.d \
+	core/sys/freebsd/sys/_cpuset.d core/sys/freebsd/sys/cdefs.d \
+	core/sys/freebsd/sys/elf.d core/sys/freebsd/sys/elf32.d \
+	core/sys/freebsd/sys/elf64.d core/sys/freebsd/sys/elf_common.d \
+	core/sys/freebsd/sys/event.d core/sys/freebsd/sys/link_elf.d \
+	core/sys/freebsd/sys/mman.d core/sys/freebsd/sys/mount.d \
 	core/sys/freebsd/time.d
 
 DRUNTIME_DSOURCES_LINUX = core/sys/linux/config.d \
 	core/sys/linux/dlfcn.d core/sys/linux/elf.d core/sys/linux/epoll.d \
 	core/sys/linux/errno.d core/sys/linux/execinfo.d \
 	core/sys/linux/fcntl.d core/sys/linux/ifaddrs.d core/sys/linux/link.d \
+	core/sys/linux/netinet/in_.d core/sys/linux/netinet/tcp.d \
 	core/sys/linux/sched.d core/sys/linux/stdio.d \
 	core/sys/linux/sys/auxv.d core/sys/linux/sys/eventfd.d \
 	core/sys/linux/sys/file.d core/sys/linux/sys/inotify.d \
@@ -789,27 +804,27 @@ DRUNTIME_DSOURCES_OSX = core/sys/osx/execinfo.d \
 	core/sys/osx/sys/cdefs.d core/sys/osx/sys/event.d \
 	core/sys/osx/sys/mman.d
 
-DRUNTIME_DSOURCES_POSIX = core/sys/posix/arpa/inet.d \
-	core/sys/posix/config.d core/sys/posix/dirent.d core/sys/posix/dlfcn.d \
-	core/sys/posix/fcntl.d core/sys/posix/grp.d core/sys/posix/iconv.d \
-	core/sys/posix/inttypes.d core/sys/posix/libgen.d \
-	core/sys/posix/mqueue.d core/sys/posix/net/if_.d \
-	core/sys/posix/netdb.d core/sys/posix/netinet/in_.d \
-	core/sys/posix/netinet/tcp.d core/sys/posix/poll.d \
-	core/sys/posix/pthread.d core/sys/posix/pwd.d core/sys/posix/sched.d \
-	core/sys/posix/semaphore.d core/sys/posix/setjmp.d \
-	core/sys/posix/signal.d core/sys/posix/stdio.d core/sys/posix/stdlib.d \
-	core/sys/posix/sys/filio.d core/sys/posix/sys/ioccom.d \
-	core/sys/posix/sys/ioctl.d core/sys/posix/sys/ipc.d \
-	core/sys/posix/sys/mman.d core/sys/posix/sys/msg.d \
-	core/sys/posix/sys/resource.d core/sys/posix/sys/select.d \
-	core/sys/posix/sys/shm.d core/sys/posix/sys/socket.d \
-	core/sys/posix/sys/stat.d core/sys/posix/sys/statvfs.d \
-	core/sys/posix/sys/time.d core/sys/posix/sys/ttycom.d \
-	core/sys/posix/sys/types.d core/sys/posix/sys/uio.d \
-	core/sys/posix/sys/un.d core/sys/posix/sys/utsname.d \
-	core/sys/posix/sys/wait.d core/sys/posix/syslog.d \
-	core/sys/posix/termios.d core/sys/posix/time.d \
+DRUNTIME_DSOURCES_POSIX = core/sys/posix/aio.d \
+	core/sys/posix/arpa/inet.d core/sys/posix/config.d \
+	core/sys/posix/dirent.d core/sys/posix/dlfcn.d core/sys/posix/fcntl.d \
+	core/sys/posix/grp.d core/sys/posix/iconv.d core/sys/posix/inttypes.d \
+	core/sys/posix/libgen.d core/sys/posix/mqueue.d \
+	core/sys/posix/net/if_.d core/sys/posix/netdb.d \
+	core/sys/posix/netinet/in_.d core/sys/posix/netinet/tcp.d \
+	core/sys/posix/poll.d core/sys/posix/pthread.d core/sys/posix/pwd.d \
+	core/sys/posix/sched.d core/sys/posix/semaphore.d \
+	core/sys/posix/setjmp.d core/sys/posix/signal.d core/sys/posix/stdio.d \
+	core/sys/posix/stdlib.d core/sys/posix/sys/filio.d \
+	core/sys/posix/sys/ioccom.d core/sys/posix/sys/ioctl.d \
+	core/sys/posix/sys/ipc.d core/sys/posix/sys/mman.d \
+	core/sys/posix/sys/msg.d core/sys/posix/sys/resource.d \
+	core/sys/posix/sys/select.d core/sys/posix/sys/shm.d \
+	core/sys/posix/sys/socket.d core/sys/posix/sys/stat.d \
+	core/sys/posix/sys/statvfs.d core/sys/posix/sys/time.d \
+	core/sys/posix/sys/ttycom.d core/sys/posix/sys/types.d \
+	core/sys/posix/sys/uio.d core/sys/posix/sys/un.d \
+	core/sys/posix/sys/utsname.d core/sys/posix/sys/wait.d \
+	core/sys/posix/syslog.d core/sys/posix/termios.d core/sys/posix/time.d \
 	core/sys/posix/ucontext.d core/sys/posix/unistd.d \
 	core/sys/posix/utime.d
 
@@ -1076,11 +1091,6 @@ rt/adi.lo: rt/$(am__dirstamp)
 rt/arrayassign.lo: rt/$(am__dirstamp)
 rt/arraycast.lo: rt/$(am__dirstamp)
 rt/arraycat.lo: rt/$(am__dirstamp)
-rt/backtrace/$(am__dirstamp):
-	@$(MKDIR_P) rt/backtrace
-	@: > rt/backtrace/$(am__dirstamp)
-rt/backtrace/dwarf.lo: rt/backtrace/$(am__dirstamp)
-rt/backtrace/elf.lo: rt/backtrace/$(am__dirstamp)
 rt/cast_.lo: rt/$(am__dirstamp)
 rt/config.lo: rt/$(am__dirstamp)
 rt/critical_.lo: rt/$(am__dirstamp)
@@ -1178,13 +1188,14 @@ gcstub/$(am__dirstamp):
 	@$(MKDIR_P) gcstub
 	@: > gcstub/$(am__dirstamp)
 gcstub/gc.lo: gcstub/$(am__dirstamp)
+core/sys/posix/$(am__dirstamp):
+	@$(MKDIR_P) core/sys/posix
+	@: > core/sys/posix/$(am__dirstamp)
+core/sys/posix/aio.lo: core/sys/posix/$(am__dirstamp)
 core/sys/posix/arpa/$(am__dirstamp):
 	@$(MKDIR_P) core/sys/posix/arpa
 	@: > core/sys/posix/arpa/$(am__dirstamp)
 core/sys/posix/arpa/inet.lo: core/sys/posix/arpa/$(am__dirstamp)
-core/sys/posix/$(am__dirstamp):
-	@$(MKDIR_P) core/sys/posix
-	@: > core/sys/posix/$(am__dirstamp)
 core/sys/posix/config.lo: core/sys/posix/$(am__dirstamp)
 core/sys/posix/dirent.lo: core/sys/posix/$(am__dirstamp)
 core/sys/posix/dlfcn.lo: core/sys/posix/$(am__dirstamp)
@@ -1259,6 +1270,11 @@ core/sys/darwin/mach/semaphore.lo:  \
 	core/sys/darwin/mach/$(am__dirstamp)
 core/sys/darwin/mach/thread_act.lo:  \
 	core/sys/darwin/mach/$(am__dirstamp)
+core/sys/darwin/netinet/$(am__dirstamp):
+	@$(MKDIR_P) core/sys/darwin/netinet
+	@: > core/sys/darwin/netinet/$(am__dirstamp)
+core/sys/darwin/netinet/in_.lo:  \
+	core/sys/darwin/netinet/$(am__dirstamp)
 core/sys/darwin/pthread.lo: core/sys/darwin/$(am__dirstamp)
 core/sys/darwin/sys/$(am__dirstamp):
 	@$(MKDIR_P) core/sys/darwin/sys
@@ -1297,6 +1313,11 @@ core/sys/freebsd/$(am__dirstamp):
 	@: > core/sys/freebsd/$(am__dirstamp)
 core/sys/freebsd/dlfcn.lo: core/sys/freebsd/$(am__dirstamp)
 core/sys/freebsd/execinfo.lo: core/sys/freebsd/$(am__dirstamp)
+core/sys/freebsd/netinet/$(am__dirstamp):
+	@$(MKDIR_P) core/sys/freebsd/netinet
+	@: > core/sys/freebsd/netinet/$(am__dirstamp)
+core/sys/freebsd/netinet/in_.lo:  \
+	core/sys/freebsd/netinet/$(am__dirstamp)
 core/sys/freebsd/pthread_np.lo: core/sys/freebsd/$(am__dirstamp)
 core/sys/freebsd/sys/$(am__dirstamp):
 	@$(MKDIR_P) core/sys/freebsd/sys
@@ -1313,6 +1334,7 @@ core/sys/freebsd/sys/event.lo: core/sys/freebsd/sys/$(am__dirstamp)
 core/sys/freebsd/sys/link_elf.lo:  \
 	core/sys/freebsd/sys/$(am__dirstamp)
 core/sys/freebsd/sys/mman.lo: core/sys/freebsd/sys/$(am__dirstamp)
+core/sys/freebsd/sys/mount.lo: core/sys/freebsd/sys/$(am__dirstamp)
 core/sys/freebsd/time.lo: core/sys/freebsd/$(am__dirstamp)
 core/sys/openbsd/$(am__dirstamp):
 	@$(MKDIR_P) core/sys/openbsd
@@ -1330,6 +1352,11 @@ core/sys/linux/execinfo.lo: core/sys/linux/$(am__dirstamp)
 core/sys/linux/fcntl.lo: core/sys/linux/$(am__dirstamp)
 core/sys/linux/ifaddrs.lo: core/sys/linux/$(am__dirstamp)
 core/sys/linux/link.lo: core/sys/linux/$(am__dirstamp)
+core/sys/linux/netinet/$(am__dirstamp):
+	@$(MKDIR_P) core/sys/linux/netinet
+	@: > core/sys/linux/netinet/$(am__dirstamp)
+core/sys/linux/netinet/in_.lo: core/sys/linux/netinet/$(am__dirstamp)
+core/sys/linux/netinet/tcp.lo: core/sys/linux/netinet/$(am__dirstamp)
 core/sys/linux/sched.lo: core/sys/linux/$(am__dirstamp)
 core/sys/linux/stdio.lo: core/sys/linux/$(am__dirstamp)
 core/sys/linux/sys/$(am__dirstamp):
@@ -1696,6 +1723,8 @@ mostlyclean-compile:
 	-rm -f core/sys/darwin/mach/semaphore.lo
 	-rm -f core/sys/darwin/mach/thread_act.$(OBJEXT)
 	-rm -f core/sys/darwin/mach/thread_act.lo
+	-rm -f core/sys/darwin/netinet/in_.$(OBJEXT)
+	-rm -f core/sys/darwin/netinet/in_.lo
 	-rm -f core/sys/darwin/pthread.$(OBJEXT)
 	-rm -f core/sys/darwin/pthread.lo
 	-rm -f core/sys/darwin/sys/cdefs.$(OBJEXT)
@@ -1708,6 +1737,8 @@ mostlyclean-compile:
 	-rm -f core/sys/freebsd/dlfcn.lo
 	-rm -f core/sys/freebsd/execinfo.$(OBJEXT)
 	-rm -f core/sys/freebsd/execinfo.lo
+	-rm -f core/sys/freebsd/netinet/in_.$(OBJEXT)
+	-rm -f core/sys/freebsd/netinet/in_.lo
 	-rm -f core/sys/freebsd/pthread_np.$(OBJEXT)
 	-rm -f core/sys/freebsd/pthread_np.lo
 	-rm -f core/sys/freebsd/sys/_bitset.$(OBJEXT)
@@ -1730,6 +1761,8 @@ mostlyclean-compile:
 	-rm -f core/sys/freebsd/sys/link_elf.lo
 	-rm -f core/sys/freebsd/sys/mman.$(OBJEXT)
 	-rm -f core/sys/freebsd/sys/mman.lo
+	-rm -f core/sys/freebsd/sys/mount.$(OBJEXT)
+	-rm -f core/sys/freebsd/sys/mount.lo
 	-rm -f core/sys/freebsd/time.$(OBJEXT)
 	-rm -f core/sys/freebsd/time.lo
 	-rm -f core/sys/linux/config.$(OBJEXT)
@@ -1750,6 +1783,10 @@ mostlyclean-compile:
 	-rm -f core/sys/linux/ifaddrs.lo
 	-rm -f core/sys/linux/link.$(OBJEXT)
 	-rm -f core/sys/linux/link.lo
+	-rm -f core/sys/linux/netinet/in_.$(OBJEXT)
+	-rm -f core/sys/linux/netinet/in_.lo
+	-rm -f core/sys/linux/netinet/tcp.$(OBJEXT)
+	-rm -f core/sys/linux/netinet/tcp.lo
 	-rm -f core/sys/linux/sched.$(OBJEXT)
 	-rm -f core/sys/linux/sched.lo
 	-rm -f core/sys/linux/stdio.$(OBJEXT)
@@ -1814,6 +1851,8 @@ mostlyclean-compile:
 	-rm -f core/sys/osx/sys/event.lo
 	-rm -f core/sys/osx/sys/mman.$(OBJEXT)
 	-rm -f core/sys/osx/sys/mman.lo
+	-rm -f core/sys/posix/aio.$(OBJEXT)
+	-rm -f core/sys/posix/aio.lo
 	-rm -f core/sys/posix/arpa/inet.$(OBJEXT)
 	-rm -f core/sys/posix/arpa/inet.lo
 	-rm -f core/sys/posix/config.$(OBJEXT)
@@ -2336,10 +2375,6 @@ mostlyclean-compile:
 	-rm -f rt/arraycast.lo
 	-rm -f rt/arraycat.$(OBJEXT)
 	-rm -f rt/arraycat.lo
-	-rm -f rt/backtrace/dwarf.$(OBJEXT)
-	-rm -f rt/backtrace/dwarf.lo
-	-rm -f rt/backtrace/elf.$(OBJEXT)
-	-rm -f rt/backtrace/elf.lo
 	-rm -f rt/cast_.$(OBJEXT)
 	-rm -f rt/cast_.lo
 	-rm -f rt/config.$(OBJEXT)
@@ -2544,10 +2579,13 @@ clean-libtool:
 	-rm -rf core/sys/bionic/.libs core/sys/bionic/_libs
 	-rm -rf core/sys/darwin/.libs core/sys/darwin/_libs
 	-rm -rf core/sys/darwin/mach/.libs core/sys/darwin/mach/_libs
+	-rm -rf core/sys/darwin/netinet/.libs core/sys/darwin/netinet/_libs
 	-rm -rf core/sys/darwin/sys/.libs core/sys/darwin/sys/_libs
 	-rm -rf core/sys/freebsd/.libs core/sys/freebsd/_libs
+	-rm -rf core/sys/freebsd/netinet/.libs core/sys/freebsd/netinet/_libs
 	-rm -rf core/sys/freebsd/sys/.libs core/sys/freebsd/sys/_libs
 	-rm -rf core/sys/linux/.libs core/sys/linux/_libs
+	-rm -rf core/sys/linux/netinet/.libs core/sys/linux/netinet/_libs
 	-rm -rf core/sys/linux/sys/.libs core/sys/linux/sys/_libs
 	-rm -rf core/sys/linux/sys/netinet/.libs core/sys/linux/sys/netinet/_libs
 	-rm -rf core/sys/openbsd/.libs core/sys/openbsd/_libs
@@ -2570,7 +2608,6 @@ clean-libtool:
 	-rm -rf gcc/unwind/.libs gcc/unwind/_libs
 	-rm -rf gcstub/.libs gcstub/_libs
 	-rm -rf rt/.libs rt/_libs
-	-rm -rf rt/backtrace/.libs rt/backtrace/_libs
 	-rm -rf rt/typeinfo/.libs rt/typeinfo/_libs
 	-rm -rf rt/util/.libs rt/util/_libs
 	-rm -rf rt/util/container/.libs rt/util/container/_libs
@@ -2668,10 +2705,13 @@ distclean-generic:
 	-rm -f core/sys/bionic/$(am__dirstamp)
 	-rm -f core/sys/darwin/$(am__dirstamp)
 	-rm -f core/sys/darwin/mach/$(am__dirstamp)
+	-rm -f core/sys/darwin/netinet/$(am__dirstamp)
 	-rm -f core/sys/darwin/sys/$(am__dirstamp)
 	-rm -f core/sys/freebsd/$(am__dirstamp)
+	-rm -f core/sys/freebsd/netinet/$(am__dirstamp)
 	-rm -f core/sys/freebsd/sys/$(am__dirstamp)
 	-rm -f core/sys/linux/$(am__dirstamp)
+	-rm -f core/sys/linux/netinet/$(am__dirstamp)
 	-rm -f core/sys/linux/sys/$(am__dirstamp)
 	-rm -f core/sys/linux/sys/netinet/$(am__dirstamp)
 	-rm -f core/sys/openbsd/$(am__dirstamp)
@@ -2694,7 +2734,6 @@ distclean-generic:
 	-rm -f gcc/unwind/$(am__dirstamp)
 	-rm -f gcstub/$(am__dirstamp)
 	-rm -f rt/$(am__dirstamp)
-	-rm -f rt/backtrace/$(am__dirstamp)
 	-rm -f rt/typeinfo/$(am__dirstamp)
 	-rm -f rt/util/$(am__dirstamp)
 	-rm -f rt/util/container/$(am__dirstamp)
diff --git a/libphobos/libdruntime/core/bitop.d b/libphobos/libdruntime/core/bitop.d
index 4f871756e..df1394f77 100644
--- a/libphobos/libdruntime/core/bitop.d
+++ b/libphobos/libdruntime/core/bitop.d
@@ -381,8 +381,8 @@ struct BitRange
      * Construct a BitRange.
      *
      * Params:
-     *   bitarr - The array of bits to iterate over
-     *   numBits - The total number of valid bits in the given bit array
+     *   bitarr = The array of bits to iterate over
+     *   numBits = The total number of valid bits in the given bit array
      */
     this(const(size_t)* bitarr, size_t numBits) @system
     {
@@ -561,24 +561,17 @@ version (DigitalMars) version (AnyX86) @system // not pure
 int popcnt(uint x) pure
 {
     // Select the fastest method depending on the compiler and CPU architecture
-    version(LDC)
+    version(DigitalMars)
     {
-        return _popcnt(x);
-    }
-    else
-    {
-        version(DigitalMars)
+        static if (is(typeof(_popcnt(uint.max))))
         {
-            static if (is(typeof(_popcnt(uint.max))))
-            {
-                import core.cpuid;
-                if (!__ctfe && hasPopcnt)
-                    return _popcnt(x);
-            }
+            import core.cpuid;
+            if (!__ctfe && hasPopcnt)
+                return _popcnt(x);
         }
-
-        return softPopcnt!uint(x);
     }
+
+    return softPopcnt!uint(x);
 }
 
 unittest
@@ -600,44 +593,37 @@ unittest
 int popcnt(ulong x) pure
 {
     // Select the fastest method depending on the compiler and CPU architecture
-    version(LDC)
-    {
-        return _popcnt(x);
-    }
-    else
-    {
-        import core.cpuid;
+    import core.cpuid;
 
-        static if (size_t.sizeof == uint.sizeof)
+    static if (size_t.sizeof == uint.sizeof)
+    {
+        const sx = Split64(x);
+        version(DigitalMars)
         {
-            const sx = Split64(x);
-            version(DigitalMars)
+            static if (is(typeof(_popcnt(uint.max))))
             {
-                static if (is(typeof(_popcnt(uint.max))))
-                {
-                    if (!__ctfe && hasPopcnt)
-                        return _popcnt(sx.lo) + _popcnt(sx.hi);
-                }
+                if (!__ctfe && hasPopcnt)
+                    return _popcnt(sx.lo) + _popcnt(sx.hi);
             }
-
-            return softPopcnt!uint(sx.lo) + softPopcnt!uint(sx.hi);
         }
-        else static if (size_t.sizeof == ulong.sizeof)
+
+        return softPopcnt!uint(sx.lo) + softPopcnt!uint(sx.hi);
+    }
+    else static if (size_t.sizeof == ulong.sizeof)
+    {
+        version(DigitalMars)
         {
-            version(DigitalMars)
+            static if (is(typeof(_popcnt(ulong.max))))
             {
-                static if (is(typeof(_popcnt(ulong.max))))
-                {
-                    if (!__ctfe && hasPopcnt)
-                        return _popcnt(x);
-                }
+                if (!__ctfe && hasPopcnt)
+                    return _popcnt(x);
             }
-
-            return softPopcnt!ulong(x);
         }
-        else
-            static assert(false);
+
+        return softPopcnt!ulong(x);
     }
+    else
+        static assert(false);
 }
 
 unittest
diff --git a/libphobos/libdruntime/core/stdc/assert_.d b/libphobos/libdruntime/core/stdc/assert_.d
index a3675b70a..ead9c05f3 100644
--- a/libphobos/libdruntime/core/stdc/assert_.d
+++ b/libphobos/libdruntime/core/stdc/assert_.d
@@ -53,6 +53,13 @@ else version (FreeBSD)
      */
     void __assert(const(char)* exp, const(char)* file, uint line);
 }
+else version (DragonFlyBSD)
+{
+    /***
+     * Assert failure function in the DragonFlyBSD C library.
+     */
+    void __assert(const(char)* exp, const(char)* file, uint line);
+}
 else version (CRuntime_Glibc)
 {
     /***
@@ -64,6 +71,25 @@ else version (CRuntime_Glibc)
     ///
     void __assert_perror_fail(int errnum, const(char)* file, uint line, const(char)* func);
 }
+else version (CRuntime_Bionic)
+{
+    void __assert(const(char)* __file, int __line, const(char)* __msg);
+}
+else version (CRuntime_Musl)
+{
+     /***
+     * Assert failure function in the Musl C library.
+     */
+    void __assert_fail(const(char)* exp, const(char)* file, uint line, const(char)* func);
+}
+else version (CRuntime_UClibc)
+{
+    void __assert(const(char)* exp, const(char)* file, uint line, const(char)* func);
+}
+else version (Solaris)
+{
+    void __assert_c99(const(char)* exp, const(char)* file, uint line, const(char)* func);
+}
 else
 {
     static assert(0);
diff --git a/libphobos/libdruntime/core/stdc/config.d b/libphobos/libdruntime/core/stdc/config.d
index f0ddb9af7..042b31ce8 100644
--- a/libphobos/libdruntime/core/stdc/config.d
+++ b/libphobos/libdruntime/core/stdc/config.d
@@ -1,5 +1,6 @@
-/**
- * D header file for C99.
+/***
+ * D compatible types that correspond to various basic types in associated
+ * C and C++ compilers.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
  * License: Distributed under the
@@ -15,6 +16,83 @@
  */
 module core.stdc.config;
 
+version (StdDdoc)
+{
+    private
+    {
+        version (Posix)
+            enum isPosix = true;
+        else
+            enum isPosix = false;
+        static if (isPosix && (void*).sizeof > int.sizeof)
+        {
+            alias ddoc_long = long;
+            alias ddoc_ulong = ulong;
+        }
+        else
+        {
+            alias ddoc_long = int;
+            alias ddoc_ulong = uint;
+        }
+    }
+
+    /***
+     * Used for a signed integer type that corresponds in size to the associated
+     * C compiler's `long` type.
+     */
+    alias c_long = ddoc_long;
+
+    /***
+     * Used for an unsigned integer type that corresponds in size to the associated
+     * C compiler's `unsigned long` type.
+     */
+    alias c_ulong = ddoc_ulong;
+
+    /***
+     * Used for a signed integer type that corresponds in size and mangling to the associated
+     * C++ compiler's `long` type.
+     */
+    alias cpp_long = c_long;
+
+    /***
+     * Used for an unsigned integer type that corresponds in size and mangling to the associated
+     * C++ compiler's `unsigned long` type.
+     */
+    alias cpp_ulong = c_ulong;
+
+    /***
+     * Used for a signed integer type that corresponds in size and mangling to the associated
+     * C++ compiler's `long long` type.
+     */
+    alias cpp_longlong = long;
+
+    /***
+     * Used for an unsigned integer type that corresponds in size and mangling to the associated
+     * C++ compiler's `unsigned long long` type.
+     */
+    alias cpp_ulonglong = ulong;
+
+    /***
+     * Used for a floating point type that corresponds in size and mangling to the associated
+     * C++ compiler's `long double` type.
+     */
+    alias c_long_double = real;
+
+    /***
+     * Used for an unsigned integer type that corresponds in size and mangling to the associated
+     * C++ compiler's `size_t` type.
+     */
+    alias cpp_size_t = size_t;
+
+    /***
+     * Used for a signed integer type that corresponds in size and mangling to the associated
+     * C++ compiler's `ptrdiff_t` type.
+     */
+    alias cpp_ptrdiff_t = ptrdiff_t;
+}
+else
+{
+
 version (OSX)
     version = Darwin;
 else version (iOS)
@@ -24,83 +102,68 @@ else version (TVOS)
 else version (WatchOS)
     version = Darwin;
 
-extern (C):
-@trusted: // Types only.
-nothrow:
-@nogc:
-
 version( GNU )
 {
     import gcc.builtins;
-    alias __builtin_clong c_long;
+
+    alias __builtin_clong  c_long;
     alias __builtin_culong c_ulong;
+
+    enum __c_long  : __builtin_clong;
+    enum __c_ulong : __builtin_culong;
+
+    alias __c_long  cpp_long;
+    alias __c_ulong cpp_ulong;
+
+    enum __c_longlong  : __builtin_clonglong;
+    enum __c_ulonglong : __builtin_culonglong;
+
+    alias __c_longlong  cpp_longlong;
+    alias __c_ulonglong cpp_ulonglong;
 }
 else version( Windows )
 {
-    struct __c_long
-    {
-      pure nothrow @nogc @safe:
-        this(int x) { lng = x; }
-        int lng;
-        alias lng this;
-    }
+    enum __c_long  : int;
+    enum __c_ulong : uint;
 
-    struct __c_ulong
-    {
-      pure nothrow @nogc @safe:
-        this(uint x) { lng = x; }
-        uint lng;
-        alias lng this;
-    }
-
-    /*
-     * This is cpp_long instead of c_long because:
-     * 1. Implicit casting of an int to __c_long doesn't happen, because D doesn't
-     *    allow constructor calls in implicit conversions.
-     * 2. long lng;
-     *    cast(__c_long)lng;
-     *    does not work because lng has to be implicitly cast to an int in the constructor,
-     *    and since that truncates it is not done.
-     * Both of these break existing code, so until we find a resolution the types are named
-     * cpp_xxxx.
-     */
+    alias int   c_long;
+    alias uint  c_ulong;
 
     alias __c_long   cpp_long;
     alias __c_ulong  cpp_ulong;
 
-    alias int   c_long;
-    alias uint  c_ulong;
+    alias long  cpp_longlong;
+    alias ulong cpp_ulonglong;
 }
 else version( Posix )
 {
   static if( (void*).sizeof > int.sizeof )
   {
+    enum __c_longlong  : long;
+    enum __c_ulonglong : ulong;
+
     alias long  c_long;
     alias ulong c_ulong;
+
+    alias long   cpp_long;
+    alias ulong  cpp_ulong;
+
+    alias __c_longlong  cpp_longlong;
+    alias __c_ulonglong cpp_ulonglong;
   }
   else
   {
-    struct __c_long
-    {
-      pure nothrow @nogc @safe:
-        this(int x) { lng = x; }
-        int lng;
-        alias lng this;
-    }
+    enum __c_long  : int;
+    enum __c_ulong : uint;
 
-    struct __c_ulong
-    {
-      pure nothrow @nogc @safe:
-        this(uint x) { lng = x; }
-        uint lng;
-        alias lng this;
-    }
+    alias int   c_long;
+    alias uint  c_ulong;
 
     alias __c_long   cpp_long;
     alias __c_ulong  cpp_ulong;
 
-    alias int   c_long;
-    alias uint  c_ulong;
+    alias long  cpp_longlong;
+    alias ulong cpp_ulonglong;
   }
 }
 
@@ -112,13 +175,7 @@ version( CRuntime_Microsoft )
      * to generate the correct name mangling and correct function call/return
      * ABI conformance.
      */
-    struct __c_long_double
-    {
-      pure nothrow @nogc @safe:
-        this(double d) { ld = d; }
-        double ld;
-        alias ld this;
-    }
+    enum __c_long_double : double;
 
     alias __c_long_double c_long_double;
 }
@@ -138,6 +195,8 @@ else version( DigitalMars )
             alias real c_long_double;
         else version( NetBSD )
             alias real c_long_double;
+        else version( DragonFlyBSD )
+            alias real c_long_double;
         else version( Solaris )
             alias real c_long_double;
         else version( Darwin )
@@ -147,12 +206,7 @@ else version( DigitalMars )
 else version( GNU )
     alias real c_long_double;
 else version( LDC )
-{
-    version( X86 )
-        alias real c_long_double;
-    else version( X86_64 )
-        alias real c_long_double;
-}
+    alias real c_long_double;
 else version( SDC )
 {
     version( X86 )
@@ -162,3 +216,18 @@ else version( SDC )
 }
 
 static assert(is(c_long_double), "c_long_double needs to be declared for this platform/architecture.");
+
+version (Darwin)
+{
+    alias cpp_size_t = cpp_ulong;
+    version (D_LP64)
+        alias cpp_ptrdiff_t = cpp_long;
+    else
+        alias cpp_ptrdiff_t = ptrdiff_t;
+}
+else
+{
+    alias cpp_size_t = size_t;
+    alias cpp_ptrdiff_t = ptrdiff_t;
+}
+}
diff --git a/libphobos/libdruntime/core/stdc/errno.d b/libphobos/libdruntime/core/stdc/errno.d
index 019b57023..1489f24ed 100644
--- a/libphobos/libdruntime/core/stdc/errno.d
+++ b/libphobos/libdruntime/core/stdc/errno.d
@@ -8,7 +8,7 @@
  *      $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost Software License 1.0).
  *    (See accompanying file LICENSE)
  * Authors:   Sean Kelly, Alex Rønne Petersen
- * Source:    $(DRUNTIMESRC core/stdc/_errno.d)
+ * Source:    https://github.com/dlang/druntime/blob/master/src/core/stdc/errno.d
  * Standards: ISO/IEC 9899:1999 (E)
  */
 
@@ -27,15 +27,99 @@ else version (WatchOS)
 nothrow:
 @nogc:
 
-///
-@property int errno() { return getErrno(); }
-///
-@property int errno(int n) { return setErrno(n); }
+version (CRuntime_DigitalMars)
+{
+    extern (C)
+    {
+        ref int _errno();
+        alias errno = _errno;
+    }
+}
+else version (CRuntime_Microsoft)
+{
+    extern (C)
+    {
+        ref int _errno();
+        alias errno = _errno;
+    }
+}
+else version (CRuntime_Glibc)
+{
+    extern (C)
+    {
+        ref int __errno_location();
+        alias errno = __errno_location;
+    }
+}
+else version (CRuntime_Musl)
+{
+    extern (C)
+    {
+        ref int __errno_location();
+        alias errno = __errno_location;
+    }
+}
+else version (FreeBSD)
+{
+    extern (C)
+    {
+        ref int __error();
+        alias errno = __error;
+    }
+}
+else version (DragonFlyBSD)
+{
+    pragma(mangle, "errno") extern int __errno;
+    ref int errno() { return __errno;}
+}
+else version (CRuntime_Bionic)
+{
+    extern (C)
+    {
+        ref int __errno();
+        alias errno = __errno;
+    }
+}
+else version (CRuntime_UClibc)
+{
+    extern (C)
+    {
+        ref int __errno_location();
+        alias errno = __errno_location;
+    }
+}
+else version (Darwin)
+{
+    extern (C)
+    {
+        ref int __error();
+        alias errno = __error;
+    }
+}
+else version (Solaris)
+{
+    extern (C)
+    {
+        ref int ___errno();
+        alias errno = ___errno;
+    }
+}
+else
+{
+    ///
+    @property int errno() { return getErrno(); }
+    ///
+    @property int errno(int n) { return setErrno(n); }
+
+    extern (C)
+    {
+        private int getErrno();      // for internal use
+        private int setErrno(int);   // for internal use
+    }
+}
 
 extern (C):
 
-private extern (C) int getErrno();      // for internal use
-private extern (C) int setErrno(int);   // for internal use
 
 version( Windows )
 {
@@ -1767,6 +1851,109 @@ else version( OpenBSD )
     enum ENOTSUP            = 91;       /// Not supported
     enum ELAST              = 91;       /// Must be equal largest errno
 }
+else version( DragonFlyBSD )
+{
+    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;
+}
 else version (Solaris)
 {
     enum EPERM =  1       /** Not super-user                       */;
diff --git a/libphobos/libdruntime/core/stdc/fenv.d b/libphobos/libdruntime/core/stdc/fenv.d
index f2f90fcaf..330b3b09f 100644
--- a/libphobos/libdruntime/core/stdc/fenv.d
+++ b/libphobos/libdruntime/core/stdc/fenv.d
@@ -28,6 +28,11 @@ extern (C):
 nothrow:
 @nogc:
 
+version (PPC)
+    version = PPC_Any;
+else version (PPC64)
+    version = PPC_Any;
+
 version( MinGW )
     version = GNUFP;
 version( CRuntime_Glibc )
@@ -120,7 +125,7 @@ version( GNUFP )
         alias fexcept_t = uint;
     }
     // https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/powerpc/bits/fenv.h
-    else version (PPC64)
+    else version (PPC_Any)
     {
         alias fenv_t = double;
         alias fexcept_t = uint;
@@ -258,6 +263,24 @@ else version ( OpenBSD )
 
     alias fexcept_t = uint;
 }
+else version ( DragonFlyBSD )
+{
+    struct fenv_t
+    {
+        struct _x87
+        {
+                uint control;
+                uint status;
+                uint tag;
+                uint[4] others;
+        };
+        _x87 x87;
+
+        uint mxcsr;
+    }
+
+    alias uint fexcept_t;
+}
 else version( CRuntime_Bionic )
 {
     version(X86)
@@ -279,6 +302,16 @@ else version( CRuntime_Bionic )
         alias uint fenv_t;
         alias uint fexcept_t;
     }
+    else version(AArch64)
+    {
+        struct fenv_t
+        {
+            uint   __control;
+            uint   __status;
+        }
+
+        alias uint fexcept_t;
+    }
     else
     {
         static assert(false, "Architecture not supported.");
@@ -304,6 +337,99 @@ else version( Solaris )
 
     alias int fexcept_t;
 }
+else version( CRuntime_Musl )
+{
+    version (X86_64)
+    {
+        struct fenv_t
+        {
+            ushort __control_word;
+            ushort __unused1;
+            ushort __status_word;
+            ushort __unused2;
+            ushort __tags;
+            ushort __unused3;
+            uint   __eip;
+            ushort __cs_selector;
+            ushort __opcode;
+            uint   __data_offset;
+            ushort __data_selector;
+            ushort __unused5;
+            uint   __mxcsr;
+        }
+        alias ushort fexcept_t;
+    }
+    else
+    {
+        static assert(false, "Architecture not supported.");
+    }
+}
+else version( CRuntime_UClibc )
+{
+    version (X86)
+    {
+        struct fenv_t
+        {
+            ushort __control_word;
+            ushort __unused1;
+            ushort __status_word;
+            ushort __unused2;
+            ushort __tags;
+            ushort __unused3;
+            uint   __eip;
+            ushort __cs_selector;
+            ushort __opcode;
+            uint   __data_offset;
+            ushort __data_selector;
+            ushort __unused5;
+        }
+
+        alias fexcept_t = ushort;
+    }
+    else version (X86_64)
+    {
+        struct fenv_t
+        {
+            ushort __control_word;
+            ushort __unused1;
+            ushort __status_word;
+            ushort __unused2;
+            ushort __tags;
+            ushort __unused3;
+            uint   __eip;
+            ushort __cs_selector;
+            ushort __opcode;
+            uint   __data_offset;
+            ushort __data_selector;
+            ushort __unused5;
+            uint   __mxcsr;
+        }
+
+        alias fexcept_t = ushort;
+    }
+    else version (MIPS32)
+    {
+        struct fenv_t
+        {
+            uint __fp_control_register;
+        }
+
+        alias fexcept_t = ushort;
+    }
+    else version (ARM)
+    {
+        struct fenv_t
+        {
+            uint __cw;
+        }
+
+        alias fexcept_t = uint;
+    }
+    else
+    {
+        static assert(false, "Architecture not supported.");
+    }
+}
 else
 {
     static assert( false, "Unsupported platform" );
@@ -617,6 +743,12 @@ else version( OpenBSD )
     ///
     enum FE_DFL_ENV = &__fe_dfl_env;
 }
+else version( DragonFlyBSD )
+{
+    private extern const fenv_t __fe_dfl_env;
+    ///
+    enum FE_DFL_ENV = &__fe_dfl_env;
+}
 else version( CRuntime_Bionic )
 {
     private extern const fenv_t __fe_dfl_env;
@@ -629,6 +761,16 @@ else version( Solaris )
     ///
     enum FE_DFL_ENV = &__fenv_def_env;
 }
+else version( CRuntime_Musl )
+{
+    ///
+    enum FE_DFL_ENV = cast(fenv_t*)(-1);
+}
+else version( CRuntime_UClibc )
+{
+    ///
+    enum FE_DFL_ENV = cast(fenv_t*)(-1);
+}
 else
 {
     static assert( false, "Unsupported platform" );
diff --git a/libphobos/libdruntime/core/stdc/locale.d b/libphobos/libdruntime/core/stdc/locale.d
index aa7c61ed9..a8de6ccc3 100644
--- a/libphobos/libdruntime/core/stdc/locale.d
+++ b/libphobos/libdruntime/core/stdc/locale.d
@@ -169,6 +169,23 @@ else version(OpenBSD)
     ///
     enum LC_MESSAGES       = 6;
 }
+else version(DragonFlyBSD)
+{
+    ///
+    enum LC_ALL            = 0;
+    ///
+    enum LC_COLLATE        = 1;
+    ///
+    enum LC_CTYPE          = 2;
+    ///
+    enum LC_MONETARY       = 3;
+    ///
+    enum LC_NUMERIC        = 4;
+    ///
+    enum LC_TIME           = 5;
+    ///
+    enum LC_MESSAGES       = 6;
+}
 else version(CRuntime_Bionic)
 {
     enum
@@ -218,6 +235,52 @@ else version(Solaris)
     ///
     enum LC_ALL         = 6;
 }
+else version(CRuntime_Musl)
+{
+    ///
+    enum LC_CTYPE          = 0;
+    ///
+    enum LC_NUMERIC        = 1;
+    ///
+    enum LC_TIME           = 2;
+    ///
+    enum LC_COLLATE        = 3;
+    ///
+    enum LC_MONETARY       = 4;
+    ///
+    enum LC_MESSAGES       = 5;
+    ///
+    enum LC_ALL            = 6;
+}
+else version(CRuntime_UClibc)
+{
+    ///
+    enum LC_CTYPE          = 0;
+    ///
+    enum LC_NUMERIC        = 1;
+    ///
+    enum LC_TIME           = 2;
+    ///
+    enum LC_COLLATE        = 3;
+    ///
+    enum LC_MONETARY       = 4;
+    ///
+    enum LC_MESSAGES       = 5;
+    ///
+    enum LC_ALL            = 6;
+    ///
+    enum LC_PAPER          = 7;
+    ///
+    enum LC_NAME           = 8;
+    ///
+    enum LC_ADDRESS        = 9;
+    ///
+    enum LC_TELEPHONE      = 10;
+    ///
+    enum LC_MEASUREMENT    = 11;
+    ///
+    enum LC_IDENTIFICATION = 12;
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/stdc/math.d b/libphobos/libdruntime/core/stdc/math.d
index 7f8285b03..2b94af18e 100644
--- a/libphobos/libdruntime/core/stdc/math.d
+++ b/libphobos/libdruntime/core/stdc/math.d
@@ -67,6 +67,13 @@ else version (OpenBSD)
     ///
     enum int FP_ILOGBNAN      = int.max;
 }
+else version (DragonFlyBSD)
+{
+    ///
+    enum int FP_ILOGB0        = -int.max;
+    ///
+    enum int FP_ILOGBNAN      = int.max;
+}
 else version (CRuntime_Bionic)
 {
     ///
@@ -74,6 +81,41 @@ else version (CRuntime_Bionic)
     ///
     enum int FP_ILOGBNAN      = int.max;
 }
+else version (CRuntime_UClibc)
+{
+    version (X86)
+    {
+        ///
+        enum int FP_ILOGB0        = int.min;
+        ///
+        enum int FP_ILOGBNAN      = int.min;
+    }
+    else version (X86_64)
+    {
+        ///
+        enum int FP_ILOGB0        = int.min;
+        ///
+        enum int FP_ILOGBNAN      = int.min;
+    }
+    else version (MIPS32)
+    {
+        ///
+        enum int FP_ILOGB0        = -int.max;
+        ///
+        enum int FP_ILOGBNAN      = int.max;
+    }
+    else version (ARM)
+    {
+        ///
+        enum int FP_ILOGB0        = -int.max;
+        ///
+        enum int FP_ILOGBNAN      = int.max;
+    }
+    else
+    {
+        static assert(false, "Architecture not supported.");
+    }
+}
 else version (CRuntime_Glibc)
 {
     version (X86)
@@ -173,64 +215,64 @@ version( none )
     //
 
     //int fpclassify(real-floating x);
-    int fpclassify(float x);
-    int fpclassify(double x);
-    int fpclassify(real x);
+    pure int fpclassify(float x);
+    pure int fpclassify(double x);
+    pure int fpclassify(real x);
 
     //int isfinite(real-floating x);
-    int isfinite(float x);
-    int isfinite(double x);
-    int isfinite(real x);
+    pure int isfinite(float x);
+    pure int isfinite(double x);
+    pure int isfinite(real x);
 
     //int isinf(real-floating x);
-    int isinf(float x);
-    int isinf(double x);
-    int isinf(real x);
+    pure int isinf(float x);
+    pure int isinf(double x);
+    pure int isinf(real x);
 
     //int isnan(real-floating x);
-    int isnan(float x);
-    int isnan(double x);
-    int isnan(real x);
+    pure int isnan(float x);
+    pure int isnan(double x);
+    pure int isnan(real x);
 
     //int isnormal(real-floating x);
-    int isnormal(float x);
-    int isnormal(double x);
-    int isnormal(real x);
+    pure int isnormal(float x);
+    pure int isnormal(double x);
+    pure int isnormal(real x);
 
     //int signbit(real-floating x);
-    int signbit(float x);
-    int signbit(double x);
-    int signbit(real x);
+    pure int signbit(float x);
+    pure int signbit(double x);
+    pure int signbit(real x);
 
     //int isgreater(real-floating x, real-floating y);
-    int isgreater(float x, float y);
-    int isgreater(double x, double y);
-    int isgreater(real x, real y);
+    pure int isgreater(float x, float y);
+    pure int isgreater(double x, double y);
+    pure int isgreater(real x, real y);
 
     //int isgreaterequal(real-floating x, real-floating y);
-    int isgreaterequal(float x, float y);
-    int isgreaterequal(double x, double y);
-    int isgreaterequal(real x, real y);
+    pure int isgreaterequal(float x, float y);
+    pure int isgreaterequal(double x, double y);
+    pure int isgreaterequal(real x, real y);
 
     //int isless(real-floating x, real-floating y);
-    int isless(float x, float y);
-    int isless(double x, double y);
-    int isless(real x, real y);
+    pure int isless(float x, float y);
+    pure int isless(double x, double y);
+    pure int isless(real x, real y);
 
     //int islessequal(real-floating x, real-floating y);
-    int islessequal(float x, float y);
-    int islessequal(double x, double y);
-    int islessequal(real x, real y);
+    pure int islessequal(float x, float y);
+    pure int islessequal(double x, double y);
+    pure int islessequal(real x, real y);
 
     //int islessgreater(real-floating x, real-floating y);
-    int islessgreater(float x, float y);
-    int islessgreater(double x, double y);
-    int islessgreater(real x, real y);
+    pure int islessgreater(float x, float y);
+    pure int islessgreater(double x, double y);
+    pure int islessgreater(real x, real y);
 
     //int isunordered(real-floating x, real-floating y);
-    int isunordered(float x, float y);
-    int isunordered(double x, double y);
-    int isunordered(real x, real y);
+    pure int isunordered(float x, float y);
+    pure int isunordered(double x, double y);
+    pure int isunordered(real x, real y);
 }
 
 version( CRuntime_DigitalMars )
@@ -267,19 +309,19 @@ version( CRuntime_DigitalMars )
         FP_FAST_FMAL = 0,
     }
 
-    uint __fpclassify_f(float x);
-    uint __fpclassify_d(double x);
-    uint __fpclassify_ld(real x);
+    pure uint __fpclassify_f(float x);
+    pure uint __fpclassify_d(double x);
+    pure uint __fpclassify_ld(real x);
 
   extern (D)
   {
     //int fpclassify(real-floating x);
     ///
-    int fpclassify(float x)     { return __fpclassify_f(x); }
+    pure int fpclassify(float x)     { return __fpclassify_f(x); }
     ///
-    int fpclassify(double x)    { return __fpclassify_d(x); }
+    pure int fpclassify(double x)    { return __fpclassify_d(x); }
     ///
-    int fpclassify(real x)
+    pure int fpclassify(real x)
     {
         return (real.sizeof == double.sizeof)
             ? __fpclassify_d(x)
@@ -288,43 +330,43 @@ version( CRuntime_DigitalMars )
 
     //int isfinite(real-floating x);
     ///
-    int isfinite(float x)       { return fpclassify(x) >= FP_NORMAL; }
+    pure int isfinite(float x)       { return fpclassify(x) >= FP_NORMAL; }
     ///
-    int isfinite(double x)      { return fpclassify(x) >= FP_NORMAL; }
+    pure int isfinite(double x)      { return fpclassify(x) >= FP_NORMAL; }
     ///
-    int isfinite(real x)        { return fpclassify(x) >= FP_NORMAL; }
+    pure int isfinite(real x)        { return fpclassify(x) >= FP_NORMAL; }
 
     //int isinf(real-floating x);
     ///
-    int isinf(float x)          { return fpclassify(x) == FP_INFINITE; }
+    pure int isinf(float x)          { return fpclassify(x) == FP_INFINITE; }
     ///
-    int isinf(double x)         { return fpclassify(x) == FP_INFINITE; }
+    pure int isinf(double x)         { return fpclassify(x) == FP_INFINITE; }
     ///
-    int isinf(real x)           { return fpclassify(x) == FP_INFINITE; }
+    pure int isinf(real x)           { return fpclassify(x) == FP_INFINITE; }
 
     //int isnan(real-floating x);
     ///
-    int isnan(float x)          { return fpclassify(x) <= FP_NANQ;   }
+    pure int isnan(float x)          { return fpclassify(x) <= FP_NANQ;   }
     ///
-    int isnan(double x)         { return fpclassify(x) <= FP_NANQ;   }
+    pure int isnan(double x)         { return fpclassify(x) <= FP_NANQ;   }
     ///
-    int isnan(real x)           { return fpclassify(x) <= FP_NANQ;   }
+    pure int isnan(real x)           { return fpclassify(x) <= FP_NANQ;   }
 
     //int isnormal(real-floating x);
     ///
-    int isnormal(float x)       { return fpclassify(x) == FP_NORMAL; }
+    pure int isnormal(float x)       { return fpclassify(x) == FP_NORMAL; }
     ///
-    int isnormal(double x)      { return fpclassify(x) == FP_NORMAL; }
+    pure int isnormal(double x)      { return fpclassify(x) == FP_NORMAL; }
     ///
-    int isnormal(real x)        { return fpclassify(x) == FP_NORMAL; }
+    pure int isnormal(real x)        { return fpclassify(x) == FP_NORMAL; }
 
     //int signbit(real-floating x);
     ///
-    int signbit(float x)     { return (cast(short*)&(x))[1] & 0x8000; }
+    pure int signbit(float x)     { return (cast(short*)&(x))[1] & 0x8000; }
     ///
-    int signbit(double x)    { return (cast(short*)&(x))[3] & 0x8000; }
+    pure int signbit(double x)    { return (cast(short*)&(x))[3] & 0x8000; }
     ///
-    int signbit(real x)
+    pure int signbit(real x)
     {
         return (real.sizeof == double.sizeof)
             ? (cast(short*)&(x))[3] & 0x8000
@@ -351,37 +393,37 @@ else version( CRuntime_Microsoft ) // fully supported since MSVCRT 12 (VS 2013)
     }
 
     //deprecated("Please use the standard C99 function copysignf() instead.")
-    float _copysignf(float x, float s);
+    pure float _copysignf(float x, float s);
 
     //deprecated("_chgsignf(x) is a non-standard MS extension. Please consider using -x instead.")
-    float _chgsignf(float x);
+    pure float _chgsignf(float x);
 
     version( Win64 ) // not available in 32-bit runtimes
     {
         //deprecated("Please use the standard C99 function isfinite() instead.")
-        int _finitef(float x);
+        pure int _finitef(float x);
 
         //deprecated("Please use the standard C99 function isnan() instead.")
-        int _isnanf(float x);
+        pure int _isnanf(float x);
 
         //deprecated("Please use the standard C99 function fpclassify() instead.")
-        int _fpclassf(float x);
+        pure int _fpclassf(float x);
     }
 
     //deprecated("Please use the standard C99 function copysign() instead.")
-    double _copysign(double x, double s);
+    pure double _copysign(double x, double s);
 
     //deprecated("_chgsign(x) is a non-standard MS extension. Please consider using -x instead.")
-    double _chgsign(double x);
+    pure double _chgsign(double x);
 
     //deprecated("Please use the standard C99 function isfinite() instead.")
-    int _finite(double x);
+    pure int _finite(double x);
 
     //deprecated("Please use the standard C99 function isnan() instead.")
-    int _isnan(double x);
+    pure int _isnan(double x);
 
     //deprecated("Please use the standard C99 function fpclassify() instead.")
-    int _fpclass(double x);
+    pure int _fpclass(double x);
   }
 
     enum
@@ -398,21 +440,21 @@ else version( CRuntime_Microsoft ) // fully supported since MSVCRT 12 (VS 2013)
         FP_NAN       =  2,
     }
 
-    private short _fdclass(float x);
-    private short _dclass(double x);
+    pure private short _fdclass(float x);
+    pure private short _dclass(double x);
 
-    private int _fdsign(float x);
-    private int _dsign(double x);
+    pure private int _fdsign(float x);
+    pure private int _dsign(double x);
 
   extern(D)
   {
     //int fpclassify(real-floating x);
     ///
-    int fpclassify()(float x)   { return _fdclass(x); }
+    pure int fpclassify()(float x)   { return _fdclass(x); }
     ///
-    int fpclassify()(double x)  { return _dclass(x);  }
+    pure int fpclassify()(double x)  { return _dclass(x);  }
     ///
-    int fpclassify()(real x)
+    pure int fpclassify()(real x)
     {
         static if (real.sizeof == double.sizeof)
             return _dclass(cast(double) x);
@@ -422,55 +464,55 @@ else version( CRuntime_Microsoft ) // fully supported since MSVCRT 12 (VS 2013)
 
     //int isfinite(real-floating x);
     ///
-    int isfinite()(float x)     { return fpclassify(x) <= 0; }
+    pure int isfinite()(float x)     { return fpclassify(x) <= 0; }
     ///
-    int isfinite()(double x)    { return fpclassify(x) <= 0; }
+    pure int isfinite()(double x)    { return fpclassify(x) <= 0; }
     ///
-    int isfinite()(real x)      { return fpclassify(x) <= 0; }
+    pure int isfinite()(real x)      { return fpclassify(x) <= 0; }
 
     //int isinf(real-floating x);
     ///
-    int isinf()(float x)        { return fpclassify(x) == FP_INFINITE; }
+    pure int isinf()(float x)        { return fpclassify(x) == FP_INFINITE; }
     ///
-    int isinf()(double x)       { return fpclassify(x) == FP_INFINITE; }
+    pure int isinf()(double x)       { return fpclassify(x) == FP_INFINITE; }
     ///
-    int isinf()(real x)         { return fpclassify(x) == FP_INFINITE; }
+    pure int isinf()(real x)         { return fpclassify(x) == FP_INFINITE; }
 
     //int isnan(real-floating x);
     version( none ) // requires MSVCRT 12+ (VS 2013)
     {
         ///
-        int isnan(float x)      { return fpclassify(x) == FP_NAN; }
+        pure int isnan(float x)      { return fpclassify(x) == FP_NAN; }
         ///
-        int isnan(double x)     { return fpclassify(x) == FP_NAN; }
+        pure int isnan(double x)     { return fpclassify(x) == FP_NAN; }
         ///
-        int isnan(real x)       { return fpclassify(x) == FP_NAN; }
+        pure int isnan(real x)       { return fpclassify(x) == FP_NAN; }
     }
     else // for backward compatibility with older runtimes
     {
         ///
-        int isnan(float x)      { version(Win64) return _isnanf(x); else return _isnan(cast(double) x); }
+        pure int isnan(float x)      { version(Win64) return _isnanf(x); else return _isnan(cast(double) x); }
         ///
-        int isnan(double x)     { return _isnan(x); }
+        pure int isnan(double x)     { return _isnan(x); }
         ///
-        int isnan(real x)       { return _isnan(cast(double) x); }
+        pure int isnan(real x)       { return _isnan(cast(double) x); }
     }
 
     //int isnormal(real-floating x);
     ///
-    int isnormal()(float x)     { return fpclassify(x) == FP_NORMAL; }
+    pure int isnormal()(float x)     { return fpclassify(x) == FP_NORMAL; }
     ///
-    int isnormal()(double x)    { return fpclassify(x) == FP_NORMAL; }
+    pure int isnormal()(double x)    { return fpclassify(x) == FP_NORMAL; }
     ///
-    int isnormal()(real x)      { return fpclassify(x) == FP_NORMAL; }
+    pure int isnormal()(real x)      { return fpclassify(x) == FP_NORMAL; }
 
     //int signbit(real-floating x);
     ///
-    int signbit()(float x)   { return _fdsign(x); }
+    pure int signbit()(float x)   { return _fdsign(x); }
     ///
-    int signbit()(double x)  { return _dsign(x);  }
+    pure int signbit()(double x)  { return _dsign(x);  }
     ///
-    int signbit()(real x)
+    pure int signbit()(real x)
     {
         static if (real.sizeof == double.sizeof)
             return _dsign(cast(double) x);
@@ -505,35 +547,35 @@ else version( CRuntime_Glibc )
         FP_FAST_FMAL = 0,
     }
 
-    int __fpclassifyf(float x);
-    int __fpclassify(double x);
-    int __fpclassifyl(real x);
+    pure int __fpclassifyf(float x);
+    pure int __fpclassify(double x);
+    pure int __fpclassifyl(real x);
 
-    int __finitef(float x);
-    int __finite(double x);
-    int __finitel(real x);
+    pure int __finitef(float x);
+    pure int __finite(double x);
+    pure int __finitel(real x);
 
-    int __isinff(float x);
-    int __isinf(double x);
-    int __isinfl(real x);
+    pure int __isinff(float x);
+    pure int __isinf(double x);
+    pure int __isinfl(real x);
 
-    int __isnanf(float x);
-    int __isnan(double x);
-    int __isnanl(real x);
+    pure int __isnanf(float x);
+    pure int __isnan(double x);
+    pure int __isnanl(real x);
 
-    int __signbitf(float x);
-    int __signbit(double x);
-    int __signbitl(real x);
+    pure int __signbitf(float x);
+    pure int __signbit(double x);
+    pure int __signbitl(real x);
 
   extern (D)
   {
     //int fpclassify(real-floating x);
       ///
-    int fpclassify(float x)     { return __fpclassifyf(x); }
+    pure int fpclassify(float x)     { return __fpclassifyf(x); }
     ///
-    int fpclassify(double x)    { return __fpclassify(x);  }
+    pure int fpclassify(double x)    { return __fpclassify(x);  }
     ///
-    int fpclassify(real x)
+    pure int fpclassify(real x)
     {
         return (real.sizeof == double.sizeof)
             ? __fpclassify(x)
@@ -542,11 +584,11 @@ else version( CRuntime_Glibc )
 
     //int isfinite(real-floating x);
     ///
-    int isfinite(float x)       { return __finitef(x); }
+    pure int isfinite(float x)       { return __finitef(x); }
     ///
-    int isfinite(double x)      { return __finite(x);  }
+    pure int isfinite(double x)      { return __finite(x);  }
     ///
-    int isfinite(real x)
+    pure int isfinite(real x)
     {
         return (real.sizeof == double.sizeof)
             ? __finite(x)
@@ -555,11 +597,11 @@ else version( CRuntime_Glibc )
 
     //int isinf(real-floating x);
     ///
-    int isinf(float x)          { return __isinff(x);  }
+    pure int isinf(float x)          { return __isinff(x);  }
     ///
-    int isinf(double x)         { return __isinf(x);   }
+    pure int isinf(double x)         { return __isinf(x);   }
     ///
-    int isinf(real x)
+    pure int isinf(real x)
     {
         return (real.sizeof == double.sizeof)
             ? __isinf(x)
@@ -568,11 +610,11 @@ else version( CRuntime_Glibc )
 
     //int isnan(real-floating x);
     ///
-    int isnan(float x)          { return __isnanf(x);  }
+    pure int isnan(float x)          { return __isnanf(x);  }
     ///
-    int isnan(double x)         { return __isnan(x);   }
+    pure int isnan(double x)         { return __isnan(x);   }
     ///
-    int isnan(real x)
+    pure int isnan(real x)
     {
         return (real.sizeof == double.sizeof)
             ? __isnan(x)
@@ -581,19 +623,19 @@ else version( CRuntime_Glibc )
 
     //int isnormal(real-floating x);
     ///
-    int isnormal(float x)       { return fpclassify(x) == FP_NORMAL; }
+    pure int isnormal(float x)       { return fpclassify(x) == FP_NORMAL; }
     ///
-    int isnormal(double x)      { return fpclassify(x) == FP_NORMAL; }
+    pure int isnormal(double x)      { return fpclassify(x) == FP_NORMAL; }
     ///
-    int isnormal(real x)        { return fpclassify(x) == FP_NORMAL; }
+    pure int isnormal(real x)        { return fpclassify(x) == FP_NORMAL; }
 
     //int signbit(real-floating x);
     ///
-    int signbit(float x)     { return __signbitf(x); }
+    pure int signbit(float x)     { return __signbitf(x); }
     ///
-    int signbit(double x)    { return __signbit(x);  }
+    pure int signbit(double x)    { return __signbit(x);  }
     ///
-    int signbit(real x)
+    pure int signbit(real x)
     {
         return (real.sizeof == double.sizeof)
             ? __signbit(x)
@@ -601,35 +643,43 @@ else version( CRuntime_Glibc )
     }
   }
 }
-else version( MinGW )
+else version( CRuntime_Musl )
 {
     enum
     {
         ///
-        FP_NAN = 0x0100,
+        FP_NAN,
         ///
-        FP_NORMAL = 0x0400,
+        FP_INFINITE,
         ///
-        FP_INFINITE = FP_NAN | FP_NORMAL,
+        FP_ZERO,
         ///
-        FP_ZERO = 0x0400,
+        FP_SUBNORMAL,
         ///
-        FP_SUBNORMAL = FP_NORMAL | FP_ZERO
+        FP_NORMAL,
+    }
+
+    enum
+    {
+        ///
+        FP_FAST_FMA  = 0,
+        ///
+        FP_FAST_FMAF = 0,
+        ///
+        FP_FAST_FMAL = 0,
     }
 
+  pure {
     int __fpclassifyf(float x);
     int __fpclassify(double x);
     int __fpclassifyl(real x);
 
-    int __isnanf(float x);
-    int __isnan(double x);
-    int __isnanl(real x);
-
     int __signbitf(float x);
     int __signbit(double x);
     int __signbitl(real x);
+  }
 
-  extern (D)
+  extern (D) pure
   {
     //int fpclassify(real-floating x);
       ///
@@ -643,34 +693,64 @@ else version( MinGW )
             ? __fpclassify(x)
             : __fpclassifyl(x);
     }
+    private uint __FLOAT_BITS(float __f)
+    {
+        union __u_t {
+            float __f;
+            uint __i;
+        }
+        __u_t __u;
+        __u.__f = __f;
+        return __u.__i;
+    }
+    private ulong __DOUBLE_BITS(double __f)
+    {
+        union __u_t {
+            double __f;
+            ulong __i;
+        }
+        __u_t __u;
+        __u.__f = __f;
+        return __u.__i;
+    }
 
     //int isfinite(real-floating x);
     ///
-    int isfinite(float x)       { return (fpclassify(x) & FP_NORMAL) == 0; }
+    int isfinite(float x)       { return (__FLOAT_BITS(x) & 0x7fffffff) < 0x7f800000; }
     ///
-    int isfinite(double x)      { return (fpclassify(x) & FP_NORMAL) == 0; }
+    int isfinite(double x)      { return (__DOUBLE_BITS(x) & -1UL>>1) < 0x7ffUL<<52;  }
     ///
-    int isfinite(real x)        { return (fpclassify(x) & FP_NORMAL) == 0; }
+    int isfinite(real x)
+    {
+        return (real.sizeof == double.sizeof)
+            ? isfinite(cast(double)x)
+            : __fpclassifyl(x) > FP_INFINITE;
+    }
 
     //int isinf(real-floating x);
     ///
-    int isinf(float x)          { return fpclassify(x) == FP_INFINITE; }
+    int isinf(float x)          { return (__FLOAT_BITS(x) & 0x7fffffff) == 0x7f800000;  }
     ///
-    int isinf(double x)         { return fpclassify(x) == FP_INFINITE; }
+    int isinf(double x)         { return (__DOUBLE_BITS(x) & -1UL>>1) == 0x7ffUL<<52;   }
     ///
-    int isinf(real x)           { return fpclassify(x) == FP_INFINITE; }
+    int isinf(real x)
+    {
+        return (real.sizeof == double.sizeof)
+            ? isinf(cast(double)x)
+            : __fpclassifyl(x) == FP_INFINITE;
+    }
 
     //int isnan(real-floating x);
     ///
-    int isnan(float x)          { return __isnanf(x);  }
+    int isnan(float x)          { return (__FLOAT_BITS(x) & 0x7fffffff) > 0x7f800000;  }
     ///
-    int isnan(double x)         { return __isnan(x);   }
+    int isnan(double x)         { return (__DOUBLE_BITS(x) & -1UL>>1) > 0x7ffUL<<52;   }
     ///
     int isnan(real x)
     {
         return (real.sizeof == double.sizeof)
-            ? __isnan(x)
-            : __isnanl(x);
+            ? isnan(cast(double)x)
+            : __fpclassifyl(x) == FP_NAN;
     }
 
     //int isnormal(real-floating x);
@@ -695,20 +775,20 @@ else version( MinGW )
     }
   }
 }
-else version( Darwin )
+else version( CRuntime_UClibc )
 {
     enum
     {
         ///
-        FP_NAN         = 1,
+        FP_NAN,
         ///
-        FP_INFINITE    = 2,
+        FP_INFINITE,
         ///
-        FP_ZERO        = 3,
+        FP_ZERO,
         ///
-        FP_NORMAL      = 4,
+        FP_SUBNORMAL,
         ///
-        FP_SUBNORMAL   = 5,
+        FP_NORMAL,
     }
 
     enum
@@ -722,82 +802,75 @@ else version( Darwin )
     }
 
     int __fpclassifyf(float x);
-    int __fpclassifyd(double x);
+    int __fpclassify(double x);
+    int __fpclassifyl(real x);
 
-    int __isfinitef(float x);
-    int __isfinited(double x);
+    int __finitef(float x);
+    int __finite(double x);
+    int __finitel(real x);
 
     int __isinff(float x);
-    int __isinfd(double x);
+    int __isinf(double x);
+    int __isinfl(real x);
 
     int __isnanf(float x);
-    int __isnand(double x);
-
-    // __isnormal family exists, but iOS implementation returns wrong results
-    // for subnormals
+    int __isnan(double x);
+    int __isnanl(real x);
 
     int __signbitf(float x);
-    int __signbitd(double x);
+    int __signbit(double x);
     int __signbitl(real x);
 
-    // Support of OSX < 10.8 needs legacy function names without "l" suffix
-    // with exception of __signbitl.  Otherwise could use else version like
-    // other Darwins
-    version (OSX)
-    {
-        int __fpclassify(real x);
-        int __isfinite(real x);
-        int __isinf(real x);
-        int __isnan(real x);
-        alias __fpclassifyl = __fpclassify;
-        alias __isfinitel = __isfinite;
-        alias __isinfl = __isinf;
-        alias __isnanl = __isnan;
-    }
-    else
-    {
-        // Available OSX >= 10.8, iOS >= 6.0, all TVOS and WatchOS
-        int __fpclassifyl(real x);
-        int __isfinitel(real x);
-        int __isinfl(real x);
-        int __isnanl(real x);
-    }
-
   extern (D)
   {
-    //int fpclassify(real-floating x);
     ///
     int fpclassify(float x)     { return __fpclassifyf(x); }
     ///
-    int fpclassify(double x)    { return __fpclassifyd(x); }
+    int fpclassify(double x)    { return __fpclassify(x);  }
     ///
-    int fpclassify(real x)      { return __fpclassifyl(x); }
+    int fpclassify(real x)
+    {
+        return (real.sizeof == double.sizeof)
+            ? __fpclassify(x)
+            : __fpclassifyl(x);
+    }
 
-    //int isfinite(real-floating x);
     ///
-    int isfinite(float x)       { return __isfinitef(x); }
+    int isfinite(float x)       { return __finitef(x); }
     ///
-    int isfinite(double x)      { return __isfinited(x); }
+    int isfinite(double x)      { return __finite(x);  }
     ///
-    int isfinite(real x)        { return __isfinitel(x); }
+    int isfinite(real x)
+    {
+        return (real.sizeof == double.sizeof)
+            ? __finite(x)
+            : __finitel(x);
+    }
 
-    //int isinf(real-floating x);
     ///
-    int isinf(float x)          { return __isinff(x); }
+    int isinf(float x)          { return __isinff(x);  }
     ///
-    int isinf(double x)         { return __isinfd(x); }
+    int isinf(double x)         { return __isinf(x);   }
     ///
-    int isinf(real x)           { return __isinfl(x); }
+    int isinf(real x)
+    {
+        return (real.sizeof == double.sizeof)
+            ? __isinf(x)
+            : __isinfl(x);
+    }
 
-    //int isnan(real-floating x);
     ///
-    int isnan(float x)          { return __isnanf(x); }
+    int isnan(float x)          { return __isnanf(x);  }
     ///
-    int isnan(double x)         { return __isnand(x); }
+    int isnan(double x)         { return __isnan(x);   }
     ///
-    int isnan(real x)           { return __isnanl(x); }
+    int isnan(real x)
+    {
+        return (real.sizeof == double.sizeof)
+            ? __isnan(x)
+            : __isnanl(x);
+    }
 
-    //int isnormal(real-floating x);
     ///
     int isnormal(float x)       { return fpclassify(x) == FP_NORMAL; }
     ///
@@ -805,116 +878,333 @@ else version( Darwin )
     ///
     int isnormal(real x)        { return fpclassify(x) == FP_NORMAL; }
 
-    //int signbit(real-floating x);
     ///
     int signbit(float x)     { return __signbitf(x); }
     ///
-    int signbit(double x)    { return __signbitd(x); }
+    int signbit(double x)    { return __signbit(x);  }
     ///
-    int signbit(real x)      { return __signbitl(x); }
+    int signbit(real x)
+    {
+        return (real.sizeof == double.sizeof)
+            ? __signbit(x)
+            : __signbitl(x);
+    }
   }
 }
-else version( FreeBSD )
+else version( MinGW )
 {
     enum
     {
         ///
-        FP_INFINITE  = 0x01,
+        FP_NAN = 0x0100,
         ///
-        FP_NAN       = 0x02,
+        FP_NORMAL = 0x0400,
         ///
-        FP_NORMAL    = 0x04,
+        FP_INFINITE = FP_NAN | FP_NORMAL,
         ///
-        FP_SUBNORMAL = 0x08,
+        FP_ZERO = 0x0400,
         ///
-        FP_ZERO      = 0x10,
+        FP_SUBNORMAL = FP_NORMAL | FP_ZERO
     }
 
-    enum
-    {
-        ///
-        FP_FAST_FMA  = 0,
-        ///
-        FP_FAST_FMAF = 0,
-        ///
-        FP_FAST_FMAL = 0,
-    }
+    pure int __fpclassifyf(float x);
+    pure int __fpclassify(double x);
+    pure int __fpclassifyl(real x);
+
+    pure int __isnanf(float x);
+    pure int __isnan(double x);
+    pure int __isnanl(real x);
 
-    int __fpclassifyd(double);
-    int __fpclassifyf(float);
-    int __fpclassifyl(real);
-    int __isfinitef(float);
-    int __isfinite(double);
-    int __isfinitel(real);
-    int __isinff(float);
-    int __isinfl(real);
-    int __isnanl(real);
-    int __isnormalf(float);
-    int __isnormal(double);
-    int __isnormall(real);
-    int __signbit(double);
-    int __signbitf(float);
-    int __signbitl(real);
+    pure int __signbitf(float x);
+    pure int __signbit(double x);
+    pure int __signbitl(real x);
 
   extern (D)
   {
     //int fpclassify(real-floating x);
       ///
-    int fpclassify(float x)     { return __fpclassifyf(x); }
+    pure int fpclassify(float x)     { return __fpclassifyf(x); }
     ///
-    int fpclassify(double x)    { return __fpclassifyd(x); }
+    pure int fpclassify(double x)    { return __fpclassify(x);  }
     ///
-    int fpclassify(real x)      { return __fpclassifyl(x); }
+    pure int fpclassify(real x)
+    {
+        return (real.sizeof == double.sizeof)
+            ? __fpclassify(x)
+            : __fpclassifyl(x);
+    }
 
     //int isfinite(real-floating x);
     ///
-    int isfinite(float x)       { return __isfinitef(x); }
+    pure int isfinite(float x)       { return (fpclassify(x) & FP_NORMAL) == 0; }
     ///
-    int isfinite(double x)      { return __isfinite(x); }
+    pure int isfinite(double x)      { return (fpclassify(x) & FP_NORMAL) == 0; }
     ///
-    int isfinite(real x)        { return __isfinitel(x); }
+    pure int isfinite(real x)        { return (fpclassify(x) & FP_NORMAL) == 0; }
 
     //int isinf(real-floating x);
     ///
-    int isinf(float x)          { return __isinff(x); }
+    pure int isinf(float x)          { return fpclassify(x) == FP_INFINITE; }
     ///
-    int isinf(double x)         { return __isinfl(x); }
+    pure int isinf(double x)         { return fpclassify(x) == FP_INFINITE; }
     ///
-    int isinf(real x)           { return __isinfl(x); }
+    pure int isinf(real x)           { return fpclassify(x) == FP_INFINITE; }
 
     //int isnan(real-floating x);
     ///
-    int isnan(float x)          { return __isnanl(x); }
+    pure int isnan(float x)          { return __isnanf(x);  }
     ///
-    int isnan(double x)         { return __isnanl(x); }
+    pure int isnan(double x)         { return __isnan(x);   }
     ///
-    int isnan(real x)           { return __isnanl(x); }
+    pure int isnan(real x)
+    {
+        return (real.sizeof == double.sizeof)
+            ? __isnan(x)
+            : __isnanl(x);
+    }
 
     //int isnormal(real-floating x);
     ///
-    int isnormal(float x)       { return __isnormalf(x); }
+    int isnormal(float x)       { return fpclassify(x) == FP_NORMAL; }
     ///
-    int isnormal(double x)      { return __isnormal(x); }
+    int isnormal(double x)      { return fpclassify(x) == FP_NORMAL; }
     ///
-    int isnormal(real x)        { return __isnormall(x); }
+    int isnormal(real x)        { return fpclassify(x) == FP_NORMAL; }
 
     //int signbit(real-floating x);
     ///
-    int signbit(float x)        { return __signbitf(x); }
+    int signbit(float x)     { return __signbitf(x); }
     ///
-    int signbit(double x)       { return __signbit(x); }
+    int signbit(double x)    { return __signbit(x);  }
     ///
-    int signbit(real x)         { return __signbit(x); }
+    int signbit(real x)
+    {
+        return (real.sizeof == double.sizeof)
+            ? __signbit(x)
+            : __signbitl(x);
+    }
   }
 }
-else version( OpenBSD )
+else version( Darwin )
 {
     enum
     {
         ///
-        FP_INFINITE  = 0x01,
+        FP_NAN         = 1,
         ///
-        FP_NAN       = 0x02,
+        FP_INFINITE    = 2,
+        ///
+        FP_ZERO        = 3,
+        ///
+        FP_NORMAL      = 4,
+        ///
+        FP_SUBNORMAL   = 5,
+    }
+
+    enum
+    {
+        ///
+        FP_FAST_FMA  = 0,
+        ///
+        FP_FAST_FMAF = 0,
+        ///
+        FP_FAST_FMAL = 0,
+    }
+
+    pure int __fpclassifyf(float x);
+    pure int __fpclassifyd(double x);
+
+    pure int __isfinitef(float x);
+    pure int __isfinited(double x);
+
+    pure int __isinff(float x);
+    pure int __isinfd(double x);
+
+    pure int __isnanf(float x);
+    pure int __isnand(double x);
+
+    // __isnormal family exists, but iOS implementation returns wrong results
+    // for subnormals
+
+    pure int __signbitf(float x);
+    pure int __signbitd(double x);
+    pure int __signbitl(real x);
+
+    // Support of OSX < 10.8 needs legacy function names without "l" suffix
+    // with exception of __signbitl.  Otherwise could use else version like
+    // other Darwins
+    version (OSX)
+    {
+        pure int __fpclassify(real x);
+        pure int __isfinite(real x);
+        pure int __isinf(real x);
+        pure int __isnan(real x);
+        alias __fpclassifyl = __fpclassify;
+        alias __isfinitel = __isfinite;
+        alias __isinfl = __isinf;
+        alias __isnanl = __isnan;
+    }
+    else
+    {
+        // Available OSX >= 10.8, iOS >= 6.0, all TVOS and WatchOS
+        pure int __fpclassifyl(real x);
+        pure int __isfinitel(real x);
+        pure int __isinfl(real x);
+        pure int __isnanl(real x);
+    }
+
+  extern (D)
+  {
+    //int fpclassify(real-floating x);
+    ///
+    pure int fpclassify(float x)     { return __fpclassifyf(x); }
+    ///
+    pure int fpclassify(double x)    { return __fpclassifyd(x); }
+    ///
+    pure int fpclassify(real x)      { return __fpclassifyl(x); }
+
+    //int isfinite(real-floating x);
+    ///
+    pure int isfinite(float x)       { return __isfinitef(x); }
+    ///
+    pure int isfinite(double x)      { return __isfinited(x); }
+    ///
+    pure int isfinite(real x)        { return __isfinitel(x); }
+
+    //int isinf(real-floating x);
+    ///
+    pure int isinf(float x)          { return __isinff(x); }
+    ///
+    pure int isinf(double x)         { return __isinfd(x); }
+    ///
+    pure int isinf(real x)           { return __isinfl(x); }
+
+    //int isnan(real-floating x);
+    ///
+    pure int isnan(float x)          { return __isnanf(x); }
+    ///
+    pure int isnan(double x)         { return __isnand(x); }
+    ///
+    pure int isnan(real x)           { return __isnanl(x); }
+
+    //int isnormal(real-floating x);
+    ///
+    pure int isnormal(float x)       { return fpclassify(x) == FP_NORMAL; }
+    ///
+    pure int isnormal(double x)      { return fpclassify(x) == FP_NORMAL; }
+    ///
+    pure int isnormal(real x)        { return fpclassify(x) == FP_NORMAL; }
+
+    //int signbit(real-floating x);
+    ///
+    pure int signbit(float x)     { return __signbitf(x); }
+    ///
+    pure int signbit(double x)    { return __signbitd(x); }
+    ///
+    pure int signbit(real x)      { return __signbitl(x); }
+  }
+}
+else version( FreeBSD )
+{
+    enum
+    {
+        ///
+        FP_INFINITE  = 0x01,
+        ///
+        FP_NAN       = 0x02,
+        ///
+        FP_NORMAL    = 0x04,
+        ///
+        FP_SUBNORMAL = 0x08,
+        ///
+        FP_ZERO      = 0x10,
+    }
+
+    enum
+    {
+        ///
+        FP_FAST_FMA  = 0,
+        ///
+        FP_FAST_FMAF = 0,
+        ///
+        FP_FAST_FMAL = 0,
+    }
+
+    pure int __fpclassifyd(double);
+    pure int __fpclassifyf(float);
+    pure int __fpclassifyl(real);
+    pure int __isfinitef(float);
+    pure int __isfinite(double);
+    pure int __isfinitel(real);
+    pure int __isinff(float);
+    pure int __isinfl(real);
+    pure int __isnanl(real);
+    pure int __isnormalf(float);
+    pure int __isnormal(double);
+    pure int __isnormall(real);
+    pure int __signbit(double);
+    pure int __signbitf(float);
+    pure int __signbitl(real);
+
+  extern (D)
+  {
+    //int fpclassify(real-floating x);
+      ///
+    pure int fpclassify(float x)     { return __fpclassifyf(x); }
+    ///
+    pure int fpclassify(double x)    { return __fpclassifyd(x); }
+    ///
+    pure int fpclassify(real x)      { return __fpclassifyl(x); }
+
+    //int isfinite(real-floating x);
+    ///
+    pure int isfinite(float x)       { return __isfinitef(x); }
+    ///
+    pure int isfinite(double x)      { return __isfinite(x); }
+    ///
+    pure int isfinite(real x)        { return __isfinitel(x); }
+
+    //int isinf(real-floating x);
+    ///
+    pure int isinf(float x)          { return __isinff(x); }
+    ///
+    pure int isinf(double x)         { return __isinfl(x); }
+    ///
+    pure int isinf(real x)           { return __isinfl(x); }
+
+    //int isnan(real-floating x);
+    ///
+    pure int isnan(float x)          { return __isnanl(x); }
+    ///
+    pure int isnan(double x)         { return __isnanl(x); }
+    ///
+    pure int isnan(real x)           { return __isnanl(x); }
+
+    //int isnormal(real-floating x);
+    ///
+    pure int isnormal(float x)       { return __isnormalf(x); }
+    ///
+    pure int isnormal(double x)      { return __isnormal(x); }
+    ///
+    pure int isnormal(real x)        { return __isnormall(x); }
+
+    //int signbit(real-floating x);
+    ///
+    pure int signbit(float x)        { return __signbitf(x); }
+    ///
+    pure int signbit(double x)       { return __signbit(x); }
+    ///
+    pure int signbit(real x)         { return __signbit(x); }
+  }
+}
+else version( OpenBSD )
+{
+    enum
+    {
+        ///
+        FP_INFINITE  = 0x01,
+        ///
+        FP_NAN       = 0x02,
         ///
         FP_NORMAL    = 0x04,
         ///
@@ -933,71 +1223,71 @@ else version( OpenBSD )
         FP_FAST_FMAL = 1,
     }
 
-    int __fpclassifyd(double);
-    int __fpclassifyf(float);
-    int __fpclassifyl(real);
-    int __isfinitef(float);
-    int __isfinite(double);
-    int __isfinitel(real);
-    int __isinff(float);
-    int __isinfl(real);
-    int __isnanl(real);
-    int __isnormalf(float);
-    int __isnormal(double);
-    int __isnormall(real);
-    int __signbit(double);
-    int __signbitf(float);
-    int __signbitl(real);
+    pure int __fpclassifyd(double);
+    pure int __fpclassifyf(float);
+    pure int __fpclassifyl(real);
+    pure int __isfinitef(float);
+    pure int __isfinite(double);
+    pure int __isfinitel(real);
+    pure int __isinff(float);
+    pure int __isinfl(real);
+    pure int __isnanl(real);
+    pure int __isnormalf(float);
+    pure int __isnormal(double);
+    pure int __isnormall(real);
+    pure int __signbit(double);
+    pure int __signbitf(float);
+    pure int __signbitl(real);
 
   extern (D)
   {
     //int fpclassify(real-floating x);
       ///
-    int fpclassify(float x)     { return __fpclassifyf(x); }
+    pure int fpclassify(float x)     { return __fpclassifyf(x); }
     ///
-    int fpclassify(double x)    { return __fpclassifyd(x); }
+    pure int fpclassify(double x)    { return __fpclassifyd(x); }
     ///
-    int fpclassify(real x)      { return __fpclassifyl(x); }
+    pure int fpclassify(real x)      { return __fpclassifyl(x); }
 
     //int isfinite(real-floating x);
     ///
-    int isfinite(float x)       { return __isfinitef(x); }
+    pure int isfinite(float x)       { return __isfinitef(x); }
     ///
-    int isfinite(double x)      { return __isfinite(x); }
+    pure int isfinite(double x)      { return __isfinite(x); }
     ///
-    int isfinite(real x)        { return __isfinitel(x); }
+    pure int isfinite(real x)        { return __isfinitel(x); }
 
     //int isinf(real-floating x);
     ///
-    int isinf(float x)          { return __isinff(x); }
+    pure int isinf(float x)          { return __isinff(x); }
     ///
-    int isinf(double x)         { return __isinfl(x); }
+    pure int isinf(double x)         { return __isinfl(x); }
     ///
-    int isinf(real x)           { return __isinfl(x); }
+    pure int isinf(real x)           { return __isinfl(x); }
 
     //int isnan(real-floating x);
     ///
-    int isnan(float x)          { return __isnanl(x); }
+    pure int isnan(float x)          { return __isnanl(x); }
     ///
-    int isnan(double x)         { return __isnanl(x); }
+    pure int isnan(double x)         { return __isnanl(x); }
     ///
-    int isnan(real x)           { return __isnanl(x); }
+    pure int isnan(real x)           { return __isnanl(x); }
 
     //int isnormal(real-floating x);
     ///
-    int isnormal(float x)       { return __isnormalf(x); }
+    pure int isnormal(float x)       { return __isnormalf(x); }
     ///
-    int isnormal(double x)      { return __isnormal(x); }
+    pure int isnormal(double x)      { return __isnormal(x); }
     ///
-    int isnormal(real x)        { return __isnormall(x); }
+    pure int isnormal(real x)        { return __isnormall(x); }
 
     //int signbit(real-floating x);
     ///
-    int signbit(float x)        { return __signbitf(x); }
+    pure int signbit(float x)        { return __signbitf(x); }
     ///
-    int signbit(double x)       { return __signbit(x); }
+    pure int signbit(double x)       { return __signbit(x); }
     ///
-    int signbit(real x)         { return __signbit(x); }
+    pure int signbit(real x)         { return __signbit(x); }
   }
 }
 else version( NetBSD )
@@ -1026,19 +1316,19 @@ else version( NetBSD )
         FP_FAST_FMAL = 0,
     }
 
-    uint __fpclassifyf(float x);
-    uint __fpclassifyd(double x);
-    uint __fpclassifyl(real x);
+    pure uint __fpclassifyf(float x);
+    pure uint __fpclassifyd(double x);
+    pure uint __fpclassifyl(real x);
 
   extern (D)
   {
     //int fpclassify(real-floating x);
     ///
-    int fpclassify(float x)     { return __fpclassifyf(x); }
+    pure int fpclassify(float x)     { return __fpclassifyf(x); }
     ///
-    int fpclassify(double x)    { return __fpclassifyd(x); }
+    pure int fpclassify(double x)    { return __fpclassifyd(x); }
     ///
-    int fpclassify(real x)
+    pure int fpclassify(real x)
     {
         return (real.sizeof == double.sizeof)
             ? __fpclassifyd(x)
@@ -1047,43 +1337,43 @@ else version( NetBSD )
 
     //int isfinite(real-floating x);
     ///
-    int isfinite(float x)       { return fpclassify(x) >= FP_NORMAL; }
+    pure int isfinite(float x)       { return fpclassify(x) >= FP_NORMAL; }
     ///
-    int isfinite(double x)      { return fpclassify(x) >= FP_NORMAL; }
+    pure int isfinite(double x)      { return fpclassify(x) >= FP_NORMAL; }
     ///
-    int isfinite(real x)        { return fpclassify(x) >= FP_NORMAL; }
+    pure int isfinite(real x)        { return fpclassify(x) >= FP_NORMAL; }
 
     //int isinf(real-floating x);
     ///
-    int isinf(float x)          { return fpclassify(x) == FP_INFINITE; }
+    pure int isinf(float x)          { return fpclassify(x) == FP_INFINITE; }
     ///
-    int isinf(double x)         { return fpclassify(x) == FP_INFINITE; }
+    pure int isinf(double x)         { return fpclassify(x) == FP_INFINITE; }
     ///
-    int isinf(real x)           { return fpclassify(x) == FP_INFINITE; }
+    pure int isinf(real x)           { return fpclassify(x) == FP_INFINITE; }
 
     //int isnan(real-floating x);
     ///
-    int isnan(float x)          { return fpclassify(x) == FP_NAN;   }
+    pure int isnan(float x)          { return fpclassify(x) == FP_NAN;   }
     ///
-    int isnan(double x)         { return fpclassify(x) == FP_NAN;   }
+    pure int isnan(double x)         { return fpclassify(x) == FP_NAN;   }
     ///
-    int isnan(real x)           { return fpclassify(x) == FP_NAN;   }
+    pure int isnan(real x)           { return fpclassify(x) == FP_NAN;   }
 
     //int isnormal(real-floating x);
     ///
-    int isnormal(float x)       { return fpclassify(x) == FP_NORMAL; }
+    pure int isnormal(float x)       { return fpclassify(x) == FP_NORMAL; }
     ///
-    int isnormal(double x)      { return fpclassify(x) == FP_NORMAL; }
+    pure int isnormal(double x)      { return fpclassify(x) == FP_NORMAL; }
     ///
-    int isnormal(real x)        { return fpclassify(x) == FP_NORMAL; }
+    pure int isnormal(real x)        { return fpclassify(x) == FP_NORMAL; }
 
     //int signbit(real-floating x);
     ///
-    int signbit(float x)     { return (cast(short*)&(x))[1] & 0x8000; }
+    pure int signbit(float x)     { return (cast(short*)&(x))[1] & 0x8000; }
     ///
-    int signbit(double x)    { return (cast(short*)&(x))[3] & 0x8000; }
+    pure int signbit(double x)    { return (cast(short*)&(x))[3] & 0x8000; }
     ///
-    int signbit(real x)
+    pure int signbit(real x)
     {
         return (real.sizeof == double.sizeof)
             ? (cast(short*)&(x))[3] & 0x8000
@@ -1091,21 +1381,85 @@ else version( NetBSD )
     }
   }
 }
+else version( DragonFlyBSD )
+{
+    enum
+    {
+        FP_INFINITE  = 0x01,
+        FP_NAN       = 0x02,
+        FP_NORMAL    = 0x04,
+        FP_SUBNORMAL = 0x08,
+        FP_ZERO      = 0x10,
+    }
+
+    /*
+     * /usr/include/math.h : martynas@openbsd believes only F version is true.
+       enum FP_FAST_FMA  = 1;
+       enum FP_FAST_FMAL = 1;
+     */
+    enum  FP_FAST_FMAF = 1;
+
+    pure int __fpclassifyd(double);
+    pure int __fpclassifyf(float);
+    pure int __fpclassifyl(real);
+    pure int __isfinitef(float);
+    pure int __isfinite(double);
+    pure int __isfinitel(real);
+    pure int __isinff(float);
+    pure int __isinf(double);
+    pure int __isinfl(real);
+    pure int __isnanf(float);
+    pure int __isnan(double);
+    pure int __isnanl(real);
+    pure int __isnormalf(float);
+    pure int __isnormal(double);
+    pure int __isnormall(real);
+    pure int __signbit(double);
+    pure int __signbitf(float);
+    pure int __signbitl(real);
+
+  extern (D)
+  {
+    pure int fpclassify(float x)     { return __fpclassifyf(x); }
+    pure int fpclassify(double x)    { return __fpclassifyd(x); }
+    pure int fpclassify(real x)      { return __fpclassifyl(x); }
+
+    pure int isfinite(float x)       { return __isfinitef(x); }
+    pure int isfinite(double x)      { return __isfinite(x); }
+    pure int isfinite(real x)        { return __isfinitel(x); }
+
+    pure int isinf(float x)          { return __isinff(x); }
+    pure int isinf(double x)         { return __isinf(x); }
+    pure int isinf(real x)           { return __isinfl(x); }
+
+    pure int isnan(float x)          { return __isnanf(x); }
+    pure int isnan(double x)         { return __isnan(x); }
+    pure int isnan(real x)           { return __isnanl(x); }
+
+    pure int isnormal(float x)       { return __isnormalf(x); }
+    pure int isnormal(double x)      { return __isnormal(x); }
+    pure int isnormal(real x)        { return __isnormall(x); }
+
+    pure int signbit(float x)        { return __signbitf(x); }
+    pure int signbit(double x)       { return __signbit(x); }
+    pure int signbit(real x)         { return __signbitl(x); }
+  }
+}
 else version( Solaris )
 {
-    int __isnanf(float x);
-    int __isnan(double x);
-    int __isnanl(real x);
+    pure int __isnanf(float x);
+    pure int __isnan(double x);
+    pure int __isnanl(real x);
 
   extern (D)
   {
     //int isnan(real-floating x);
       ///
-    int isnan(float x)          { return __isnanf(x);  }
+    pure int isnan(float x)          { return __isnanf(x);  }
     ///
-    int isnan(double x)         { return __isnan(x);   }
+    pure int isnan(double x)         { return __isnan(x);   }
     ///
-    int isnan(real x)
+    pure int isnan(real x)
     {
         return (real.sizeof == double.sizeof)
             ? __isnan(x)
@@ -1132,77 +1486,77 @@ else version( CRuntime_Bionic )
     ///
     enum FP_FAST_FMAF;
 
-    int __fpclassifyd(double);
-    int __fpclassifyf(float);
-    int __fpclassifyl(real);
+    pure int __fpclassifyd(double);
+    pure int __fpclassifyf(float);
+    pure int __fpclassifyl(real);
 
-    int __isfinitef(float);
-    int __isfinite(double);
-    int __isfinitel(real);
+    pure int __isfinitef(float);
+    pure int __isfinite(double);
+    pure int __isfinitel(real);
 
-    int __isinff(float);
-    int __isinf(double);
-    int __isinfl(real);
+    pure int __isinff(float);
+    pure int __isinf(double);
+    pure int __isinfl(real);
 
-    int isnanf(float);
-    int isnan(double);
-    int __isnanl(real);
+    pure int isnanf(float);
+    pure int isnan(double);
+    pure int __isnanl(real);
 
-    int __isnormalf(float);
-    int __isnormal(double);
-    int __isnormall(real);
+    pure int __isnormalf(float);
+    pure int __isnormal(double);
+    pure int __isnormall(real);
 
-    int __signbit(double);
-    int __signbitf(float);
-    int __signbitl(real);
+    pure int __signbit(double);
+    pure int __signbitf(float);
+    pure int __signbitl(real);
 
   extern (D)
   {
     //int fpclassify(real-floating x);
       ///
-    int fpclassify(float x)     { return __fpclassifyf(x); }
+    pure int fpclassify(float x)     { return __fpclassifyf(x); }
     ///
-    int fpclassify(double x)    { return __fpclassifyd(x); }
+    pure int fpclassify(double x)    { return __fpclassifyd(x); }
     ///
-    int fpclassify(real x)      { return __fpclassifyl(x); }
+    pure int fpclassify(real x)      { return __fpclassifyl(x); }
 
     //int isfinite(real-floating x);
     ///
-    int isfinite(float x)       { return __isfinitef(x); }
+    pure int isfinite(float x)       { return __isfinitef(x); }
     ///
-    int isfinite(double x)      { return __isfinite(x); }
+    pure int isfinite(double x)      { return __isfinite(x); }
     ///
-    int isfinite(real x)        { return __isfinitel(x); }
+    pure int isfinite(real x)        { return __isfinitel(x); }
 
     //int isinf(real-floating x);
     ///
-    int isinf(float x)          { return __isinff(x); }
+    pure int isinf(float x)          { return __isinff(x); }
     ///
-    int isinf(double x)         { return __isinf(x); }
+    pure int isinf(double x)         { return __isinf(x); }
     ///
-    int isinf(real x)           { return __isinfl(x); }
+    pure int isinf(real x)           { return __isinfl(x); }
 
     //int isnan(real-floating x);
     ///
-    int isnan(float x)          { return isnanf(x); }
+    pure int isnan(float x)          { return isnanf(x); }
     ///
-    int isnan(real x)           { return __isnanl(x); }
+    pure int isnan(real x)           { return __isnanl(x); }
 
     //int isnormal(real-floating x);
     ///
-    int isnormal(float x)       { return __isnormalf(x); }
+    pure int isnormal(float x)       { return __isnormalf(x); }
     ///
-    int isnormal(double x)      { return __isnormal(x); }
+    pure int isnormal(double x)      { return __isnormal(x); }
     ///
-    int isnormal(real x)        { return __isnormall(x); }
+    pure int isnormal(real x)        { return __isnormall(x); }
 
     //int signbit(real-floating x);
     ///
-    int signbit(float x)        { return __signbitf(x); }
+    pure int signbit(float x)        { return __signbitf(x); }
     ///
-    int signbit(double x)       { return __signbit(x); }
+    pure int signbit(double x)       { return __signbit(x); }
     ///
-    int signbit(real x)         { return __signbitl(x); }
+    pure int signbit(real x)         { return __signbitl(x); }
   }
 }
 
@@ -1210,51 +1564,51 @@ extern (D)
 {
     //int isgreater(real-floating x, real-floating y);
     ///
-    int isgreater(float x, float y)        { return x > y && !isunordered(x, y); }
+    pure int isgreater(float x, float y)        { return x > y && !isunordered(x, y); }
     ///
-    int isgreater(double x, double y)      { return x > y && !isunordered(x, y); }
+    pure int isgreater(double x, double y)      { return x > y && !isunordered(x, y); }
     ///
-    int isgreater(real x, real y)          { return x > y && !isunordered(x, y); }
+    pure int isgreater(real x, real y)          { return x > y && !isunordered(x, y); }
 
     //int isgreaterequal(real-floating x, real-floating y);
     ///
-    int isgreaterequal(float x, float y)   { return x >= y && !isunordered(x, y); }
+    pure int isgreaterequal(float x, float y)   { return x >= y && !isunordered(x, y); }
     ///
-    int isgreaterequal(double x, double y) { return x >= y && !isunordered(x, y); }
+    pure int isgreaterequal(double x, double y) { return x >= y && !isunordered(x, y); }
     ///
-    int isgreaterequal(real x, real y)     { return x >= y && !isunordered(x, y); }
+    pure int isgreaterequal(real x, real y)     { return x >= y && !isunordered(x, y); }
 
     //int isless(real-floating x, real-floating y);
     ///
-    int isless(float x, float y)           { return x < y && !isunordered(x, y); }
+    pure int isless(float x, float y)           { return x < y && !isunordered(x, y); }
     ///
-    int isless(double x, double y)         { return x < y && !isunordered(x, y); }
+    pure int isless(double x, double y)         { return x < y && !isunordered(x, y); }
     ///
-    int isless(real x, real y)             { return x < y && !isunordered(x, y); }
+    pure int isless(real x, real y)             { return x < y && !isunordered(x, y); }
 
     //int islessequal(real-floating x, real-floating y);
     ///
-    int islessequal(float x, float y)      { return x <= y && !isunordered(x, y); }
+    pure int islessequal(float x, float y)      { return x <= y && !isunordered(x, y); }
     ///
-    int islessequal(double x, double y)    { return x <= y && !isunordered(x, y); }
+    pure int islessequal(double x, double y)    { return x <= y && !isunordered(x, y); }
     ///
-    int islessequal(real x, real y)        { return x <= y && !isunordered(x, y); }
+    pure int islessequal(real x, real y)        { return x <= y && !isunordered(x, y); }
 
     //int islessgreater(real-floating x, real-floating y);
     ///
-    int islessgreater(float x, float y)    { return x != y && !isunordered(x, y); }
+    pure int islessgreater(float x, float y)    { return x != y && !isunordered(x, y); }
     ///
-    int islessgreater(double x, double y)  { return x != y && !isunordered(x, y); }
+    pure int islessgreater(double x, double y)  { return x != y && !isunordered(x, y); }
     ///
-    int islessgreater(real x, real y)      { return x != y && !isunordered(x, y); }
+    pure int islessgreater(real x, real y)      { return x != y && !isunordered(x, y); }
 
     //int isunordered(real-floating x, real-floating y);
     ///
-    int isunordered(float x, float y)      { return isnan(x) || isnan(y); }
+    pure int isunordered(float x, float y)      { return isnan(x) || isnan(y); }
     ///
-    int isunordered(double x, double y)    { return isnan(x) || isnan(y); }
+    pure int isunordered(double x, double y)    { return isnan(x) || isnan(y); }
     ///
-    int isunordered(real x, real y)        { return isnan(x) || isnan(y); }
+    pure int isunordered(real x, real y)        { return isnan(x) || isnan(y); }
 }
 
 /* MS define some functions inline.
@@ -1280,11 +1634,11 @@ version( CRuntime_Microsoft ) // fully supported since MSVCRT 12 (VS 2013) only
     extern(D) real asinl()(real x)   { return asin(cast(double) x); }
 
     ///
-    double  atan(double x);
+    pure double  atan(double x);
     ///
-    float   atanf(float x);
+    pure float   atanf(float x);
     ///
-    extern(D) real atanl()(real x)   { return atan(cast(double) x); }
+    pure extern(D) real atanl()(real x)   { return atan(cast(double) x); }
 
     ///
     double  atan2(double y, double x);
@@ -1294,25 +1648,25 @@ version( CRuntime_Microsoft ) // fully supported since MSVCRT 12 (VS 2013) only
     extern(D) real atan2l()(real y, real x) { return atan2(cast(double) y, cast(double) x); }
 
     ///
-    double  cos(double x);
+    pure double  cos(double x);
     ///
-    float   cosf(float x);
+    pure float   cosf(float x);
     ///
-    extern(D) real cosl()(real x)    { return cos(cast(double) x); }
+    extern(D) pure real cosl()(real x)    { return cos(cast(double) x); }
 
     ///
-    double  sin(double x);
+    pure double  sin(double x);
     ///
-    float   sinf(float x);
+    pure float   sinf(float x);
     ///
-    extern(D) real sinl()(real x)    { return sin(cast(double) x); }
+    extern(D) pure real sinl()(real x)    { return sin(cast(double) x); }
 
     ///
-    double  tan(double x);
+    pure double  tan(double x);
     ///
-    float   tanf(float x);
+    pure float   tanf(float x);
     ///
-    extern(D) real tanl()(real x)    { return tan(cast(double) x); }
+    extern(D) pure real tanl()(real x)    { return tan(cast(double) x); }
 
     ///
     double  acosh(double x);
@@ -1322,11 +1676,11 @@ version( CRuntime_Microsoft ) // fully supported since MSVCRT 12 (VS 2013) only
     extern(D) real acoshl()(real x)  { return acosh(cast(double) x); }
 
     ///
-    double  asinh(double x);
+    pure double  asinh(double x);
     ///
-    float   asinhf(float x);
+    pure float   asinhf(float x);
     ///
-    extern(D) real asinhl()(real x)  { return asinh(cast(double) x); }
+    pure extern(D) real asinhl()(real x)  { return asinh(cast(double) x); }
 
     ///
     double  atanh(double x);
@@ -1350,11 +1704,11 @@ version( CRuntime_Microsoft ) // fully supported since MSVCRT 12 (VS 2013) only
     extern(D) real sinhl()(real x)   { return sinh(cast(double) x); }
 
     ///
-    double  tanh(double x);
+    pure double  tanh(double x);
     ///
-    float   tanhf(float x);
+    pure float   tanhf(float x);
     ///
-    extern(D) real tanhl()(real x)   { return tanh(cast(double) x); }
+    extern(D) pure real tanhl()(real x)   { return tanh(cast(double) x); }
 
     ///
     double  exp(double x);
@@ -1378,11 +1732,11 @@ version( CRuntime_Microsoft ) // fully supported since MSVCRT 12 (VS 2013) only
     extern(D) real expm1l()(real x)  { return expm1(cast(double) x); }
 
     ///
-    double  frexp(double value, int* exp);
+    pure double  frexp(double value, int* exp);
     ///
-    extern(D) float frexpf()(float value, int* exp) { return cast(float) frexp(value, exp); }
+    extern(D) pure float frexpf()(float value, int* exp) { return cast(float) frexp(value, exp); }
     ///
-    extern(D) real  frexpl()(real value, int* exp)  { return frexp(cast(double) value, exp); }
+    extern(D) pure real  frexpl()(real value, int* exp)  { return frexp(cast(double) value, exp); }
 
     ///
     int     ilogb(double x);
@@ -1434,11 +1788,11 @@ version( CRuntime_Microsoft ) // fully supported since MSVCRT 12 (VS 2013) only
     extern(D) real logbl()(real x)   { return logb(cast(double) x); }
 
     ///
-    double  modf(double value, double* iptr);
+    pure double  modf(double value, double* iptr);
     ///
-    float   modff(float value, float* iptr);
+    pure float   modff(float value, float* iptr);
     ///
-    extern(D) real modfl()(real value, real* iptr)
+    extern(D) pure real modfl()(real value, real* iptr)
     {
         double i;
         double r = modf(cast(double) value, &i);
@@ -1461,18 +1815,18 @@ version( CRuntime_Microsoft ) // fully supported since MSVCRT 12 (VS 2013) only
     extern(D) real scalblnl()(real x, c_long n) { return scalbln(cast(double) x, n); }
 
     ///
-    double  cbrt(double x);
+    pure double  cbrt(double x);
     ///
-    float   cbrtf(float x);
+    pure float   cbrtf(float x);
     ///
-    extern(D) real cbrtl()(real x)   { return cbrt(cast(double) x); }
+    extern(D) pure real cbrtl()(real x)   { return cbrt(cast(double) x); }
 
     ///
-    double  fabs(double x);
+    pure double  fabs(double x);
     ///
-    extern(D) float fabsf()(float x) { return cast(float) fabs(x); }
+    extern(D) pure float fabsf()(float x) { return cast(float) fabs(x); }
     ///
-    extern(D) real  fabsl()(real x)  { return fabs(cast(double) x); }
+    extern(D) pure real  fabsl()(real x)  { return fabs(cast(double) x); }
 
     private double _hypot(double x, double y);
     private float  _hypotf(float x, float y);
@@ -1498,11 +1852,11 @@ version( CRuntime_Microsoft ) // fully supported since MSVCRT 12 (VS 2013) only
     extern(D) real sqrtl()(real x)   { return sqrt(cast(double) x); }
 
     ///
-    double  erf(double x);
+    pure double  erf(double x);
     ///
-    float   erff(float x);
+    pure float   erff(float x);
     ///
-    extern(D) real erfl()(real x)    { return erf(cast(double) x); }
+    extern(D) pure real erfl()(real x)    { return erf(cast(double) x); }
 
     ///
     double  erfc(double x);
@@ -1526,32 +1880,32 @@ version( CRuntime_Microsoft ) // fully supported since MSVCRT 12 (VS 2013) only
     extern(D) real tgammal()(real x) { return tgamma(cast(double) x); }
 
     ///
-    double  ceil(double x);
+    pure double  ceil(double x);
     ///
-    float   ceilf(float x);
+    pure float   ceilf(float x);
     ///
-    extern(D) real ceill()(real x)   { return ceil(cast(double) x); }
+    extern(D) pure real ceill()(real x)   { return ceil(cast(double) x); }
 
     ///
-    double  floor(double x);
+    pure double  floor(double x);
     ///
-    float   floorf(float x);
+    pure float   floorf(float x);
     ///
-    extern(D) real floorl()(real x)  { return floor(cast(double) x); }
+    extern(D) pure real floorl()(real x)  { return floor(cast(double) x); }
 
     ///
-    double  nearbyint(double x);
+    pure double  nearbyint(double x);
     ///
-    float   nearbyintf(float x);
+    pure float   nearbyintf(float x);
     ///
-    extern(D) real nearbyintl()(real x) { return nearbyint(cast(double) x); }
+    extern(D) pure real nearbyintl()(real x) { return nearbyint(cast(double) x); }
 
     ///
-    double  rint(double x);
+    pure double  rint(double x);
     ///
-    float   rintf(float x);
+    pure float   rintf(float x);
     ///
-    extern(D) real rintl()(real x)   { return rint(cast(double) x); }
+    extern(D) pure real rintl()(real x)   { return rint(cast(double) x); }
 
     ///
     c_long  lrint(double x);
@@ -1568,11 +1922,11 @@ version( CRuntime_Microsoft ) // fully supported since MSVCRT 12 (VS 2013) only
     extern(D) long llrintl()(real x) { return llrint(cast(double) x); }
 
     ///
-    double  round(double x);
+    pure double  round(double x);
     ///
-    float   roundf(float x);
+    pure float   roundf(float x);
     ///
-    extern(D) real roundl()(real x)  { return round(cast(double) x); }
+    extern(D) pure real roundl()(real x)  { return round(cast(double) x); }
 
     ///
     c_long  lround(double x);
@@ -1589,11 +1943,11 @@ version( CRuntime_Microsoft ) // fully supported since MSVCRT 12 (VS 2013) only
     extern(D) long llroundl()(real x) { return llround(cast(double) x); }
 
     ///
-    double  trunc(double x);
+    pure double  trunc(double x);
     ///
-    float   truncf(float x);
+    pure float   truncf(float x);
     ///
-    extern(D) real truncl()(real x)  { return trunc(cast(double) x); }
+    extern(D) pure real truncl()(real x)  { return trunc(cast(double) x); }
 
     ///
     double  fmod(double x, double y);
@@ -1617,18 +1971,18 @@ version( CRuntime_Microsoft ) // fully supported since MSVCRT 12 (VS 2013) only
     extern(D) real remquol()(real x, real y, int* quo) { return remquo(cast(double) x, cast(double) y, quo); }
 
     ///
-    double  copysign(double x, double y);
+    pure double  copysign(double x, double y);
     ///
-    float   copysignf(float x, float y);
+    pure float   copysignf(float x, float y);
     ///
-    extern(D) real copysignl()(real x, real y) { return copysign(cast(double) x, cast(double) y); }
+    extern(D) pure real copysignl()(real x, real y) { return copysign(cast(double) x, cast(double) y); }
 
     ///
-    double  nan(char* tagp);
+    pure double  nan(char* tagp);
     ///
-    float   nanf(char* tagp);
+    pure float   nanf(char* tagp);
     ///
-    extern(D) real nanl()(char* tagp) { return nan(tagp); }
+    extern(D) pure real nanl()(char* tagp) { return nan(tagp); }
 
     ///
     double  nextafter(double x, double y);
@@ -1652,25 +2006,25 @@ version( CRuntime_Microsoft ) // fully supported since MSVCRT 12 (VS 2013) only
     extern(D) real fdiml()(real x, real y) { return fdim(cast(double) x, cast(double) y); }
 
     ///
-    double  fmax(double x, double y);
+    pure double  fmax(double x, double y);
     ///
-    float   fmaxf(float x, float y);
+    pure float   fmaxf(float x, float y);
     ///
-    extern(D) real fmaxl()(real x, real y) { return fmax(cast(double) x, cast(double) y); }
+    extern(D) pure real fmaxl()(real x, real y) { return fmax(cast(double) x, cast(double) y); }
 
     ///
-    double  fmin(double x, double y);
+    pure double  fmin(double x, double y);
     ///
-    float   fminf(float x, float y);
+    pure float   fminf(float x, float y);
     ///
-    extern(D) real fminl()(real x, real y) { return fmin(cast(double) x, cast(double) y); }
+    extern(D) pure real fminl()(real x, real y) { return fmin(cast(double) x, cast(double) y); }
 
     ///
-    double  fma(double x, double y, double z);
+    pure double  fma(double x, double y, double z);
     ///
-    float   fmaf(float x, float y, float z);
+    pure float   fmaf(float x, float y, float z);
     ///
-    extern(D) real fmal()(real x, real y, real z) { return fma(cast(double) x, cast(double) y, cast(double) z); }
+    extern(D) pure real fmal()(real x, real y, real z) { return fma(cast(double) x, cast(double) y, cast(double) z); }
 }
 /* NOTE: freebsd < 8-CURRENT doesn't appear to support *l, but we can
  *       approximate.
@@ -1687,44 +2041,44 @@ else version( FreeBSD )
   {
     real    acosl(real x) { return acos(x); }
     real    asinl(real x) { return asin(x); }
-    real    atanl(real x) { return atan(x); }
+    pure real    atanl(real x) { return atan(x); }
     real    atan2l(real y, real x) { return atan2(y, x); }
-    real    cosl(real x) { return cos(x); }
-    real    sinl(real x) { return sin(x); }
-    real    tanl(real x) { return tan(x); }
+    pure real    cosl(real x) { return cos(x); }
+    pure real    sinl(real x) { return sin(x); }
+    pure real    tanl(real x) { return tan(x); }
     real    exp2l(real x) { return exp2(x); }
-    real    frexpl(real value, int* exp) { return frexp(value, exp); }
+    pure real    frexpl(real value, int* exp) { return frexp(value, exp); }
     int     ilogbl(real x) { return ilogb(x); }
     real    ldexpl(real x, int exp) { return ldexp(x, exp); }
     real    logbl(real x) { return logb(x); }
     //real    modfl(real value, real *iptr); // nontrivial conversion
     real    scalbnl(real x, int n) { return scalbn(x, n); }
     real    scalblnl(real x, c_long n) { return scalbln(x, n); }
-    real    fabsl(real x) { return fabs(x); }
+    pure real    fabsl(real x) { return fabs(x); }
     real    hypotl(real x, real y) { return hypot(x, y); }
     real    sqrtl(real x) { return sqrt(x); }
-    real    ceill(real x) { return ceil(x); }
-    real    floorl(real x) { return floor(x); }
-    real    nearbyintl(real x) { return nearbyint(x); }
-    real    rintl(real x) { return rint(x); }
+    pure real    ceill(real x) { return ceil(x); }
+    pure real    floorl(real x) { return floor(x); }
+    pure real    nearbyintl(real x) { return nearbyint(x); }
+    pure real    rintl(real x) { return rint(x); }
     c_long  lrintl(real x) { return lrint(x); }
-    real    roundl(real x) { return round(x); }
+    pure real    roundl(real x) { return round(x); }
     c_long  lroundl(real x) { return lround(x); }
     long    llroundl(real x) { return llround(x); }
-    real    truncl(real x) { return trunc(x); }
+    pure real    truncl(real x) { return trunc(x); }
     real    fmodl(real x, real y) { return fmod(x, y); }
     real    remainderl(real x, real y) { return remainder(x, y); }
     real    remquol(real x, real y, int* quo) { return remquo(x, y, quo); }
-    real    copysignl(real x, real y) { return copysign(x, y); }
-//  double  nan(char* tagp);
-//  float   nanf(char* tagp);
-//  real    nanl(char* tagp);
+    pure real    copysignl(real x, real y) { return copysign(x, y); }
+//  pure double  nan(char* tagp);
+//  pure float   nanf(char* tagp);
+//  pure real    nanl(char* tagp);
     real    nextafterl(real x, real y) { return nextafter(x, y); }
     real    nexttowardl(real x, real y) { return nexttoward(x, y); }
     real    fdiml(real x, real y) { return fdim(x, y); }
-    real    fmaxl(real x, real y) { return fmax(x, y); }
-    real    fminl(real x, real y) { return fmin(x, y); }
-    real    fmal(real x, real y, real z) { return fma(x, y, z); }
+    pure real    fmaxl(real x, real y) { return fmax(x, y); }
+    pure real    fminl(real x, real y) { return fmin(x, y); }
+    pure real    fmal(real x, real y, real z) { return fma(x, y, z); }
   }
   else
   {
@@ -1733,19 +2087,19 @@ else version( FreeBSD )
     ///
     real    asinl(real x);
     ///
-    real    atanl(real x);
+    pure real    atanl(real x);
     ///
     real    atan2l(real y, real x);
     ///
-    real    cosl(real x);
+    pure real    cosl(real x);
     ///
-    real    sinl(real x);
+    pure real    sinl(real x);
     ///
-    real    tanl(real x);
+    pure real    tanl(real x);
     ///
     real    exp2l(real x);
     ///
-    real    frexpl(real value, int* exp);
+    pure real    frexpl(real value, int* exp);
     ///
     int     ilogbl(real x);
     ///
@@ -1753,35 +2107,35 @@ else version( FreeBSD )
     ///
     real    logbl(real x);
     ///
-    real    modfl(real value, real *iptr);
+    pure real    modfl(real value, real *iptr);
     ///
     real    scalbnl(real x, int n);
     ///
     real    scalblnl(real x, c_long n);
     ///
-    real    fabsl(real x);
+    pure real    fabsl(real x);
     ///
     real    hypotl(real x, real y);
     ///
     real    sqrtl(real x);
     ///
-    real    ceill(real x);
+    pure real    ceill(real x);
     ///
-    real    floorl(real x);
+    pure real    floorl(real x);
     ///
-    real    nearbyintl(real x);
+    pure real    nearbyintl(real x);
     ///
-    real    rintl(real x);
+    pure real    rintl(real x);
     ///
     c_long  lrintl(real x);
     ///
-    real    roundl(real x);
+    pure real    roundl(real x);
     ///
     c_long  lroundl(real x);
     ///
     long    llroundl(real x);
     ///
-    real    truncl(real x);
+    pure real    truncl(real x);
     ///
     real    fmodl(real x, real y);
     ///
@@ -1789,13 +2143,13 @@ else version( FreeBSD )
     ///
     real    remquol(real x, real y, int* quo);
     ///
-    real    copysignl(real x, real y);
+    pure real    copysignl(real x, real y);
     ///
-    double  nan(char* tagp);
+    pure double  nan(char* tagp);
     ///
-    float   nanf(char* tagp);
+    pure float   nanf(char* tagp);
     ///
-    real    nanl(char* tagp);
+    pure real    nanl(char* tagp);
     ///
     real    nextafterl(real x, real y);
     ///
@@ -1803,11 +2157,11 @@ else version( FreeBSD )
     ///
     real    fdiml(real x, real y);
     ///
-    real    fmaxl(real x, real y);
+    pure real    fmaxl(real x, real y);
     ///
-    real    fminl(real x, real y);
+    pure real    fminl(real x, real y);
     ///
-    real    fmal(real x, real y, real z);
+    pure real    fmal(real x, real y, real z);
   }
   ///
     double  acos(double x);
@@ -1820,9 +2174,9 @@ else version( FreeBSD )
     float   asinf(float x);
 
     ///
-    double  atan(double x);
+    pure double  atan(double x);
     ///
-    float   atanf(float x);
+    pure float   atanf(float x);
 
     ///
     double  atan2(double y, double x);
@@ -1830,19 +2184,19 @@ else version( FreeBSD )
     float   atan2f(float y, float x);
 
     ///
-    double  cos(double x);
+    pure double  cos(double x);
     ///
-    float   cosf(float x);
+    pure float   cosf(float x);
 
     ///
-    double  sin(double x);
+    pure double  sin(double x);
     ///
-    float   sinf(float x);
+    pure float   sinf(float x);
 
     ///
-    double  tan(double x);
+    pure double  tan(double x);
     ///
-    float   tanf(float x);
+    pure float   tanf(float x);
 
     ///
     double  acosh(double x);
@@ -1852,11 +2206,11 @@ else version( FreeBSD )
     real    acoshl(real x) { return acosh(x); }
 
     ///
-    double  asinh(double x);
+    pure double  asinh(double x);
     ///
-    float   asinhf(float x);
+    pure float   asinhf(float x);
     ///
-    real    asinhl(real x) { return asinh(x); }
+    pure real    asinhl(real x) { return asinh(x); }
 
     ///
     double  atanh(double x);
@@ -1880,11 +2234,11 @@ else version( FreeBSD )
     real    sinhl(real x) { return sinh(x); }
 
     ///
-    double  tanh(double x);
+    pure double  tanh(double x);
     ///
-    float   tanhf(float x);
+    pure float   tanhf(float x);
     ///
-    real    tanhl(real x) { return tanh(x); }
+    pure real    tanhl(real x) { return tanh(x); }
 
     ///
     double  exp(double x);
@@ -1906,9 +2260,9 @@ else version( FreeBSD )
     real    expm1l(real x) { return expm1(x); }
 
     ///
-    double  frexp(double value, int* exp);
+    pure double  frexp(double value, int* exp);
     ///
-    float   frexpf(float value, int* exp);
+    pure float   frexpf(float value, int* exp);
 
     ///
     int     ilogb(double x);
@@ -1955,9 +2309,9 @@ else version( FreeBSD )
     float   logbf(float x);
 
     ///
-    double  modf(double value, double* iptr);
+    pure double  modf(double value, double* iptr);
     ///
-    float   modff(float value, float* iptr);
+    pure float   modff(float value, float* iptr);
 
     ///
     double  scalbn(double x, int n);
@@ -1970,16 +2324,16 @@ else version( FreeBSD )
     float   scalblnf(float x, c_long n);
 
     ///
-    double  cbrt(double x);
+    pure double  cbrt(double x);
     ///
-    float   cbrtf(float x);
+    pure float   cbrtf(float x);
     ///
-    real    cbrtl(real x) { return cbrt(x); }
+    pure real    cbrtl(real x) { return cbrt(x); }
 
     ///
-    double  fabs(double x);
+    pure double  fabs(double x);
     ///
-    float   fabsf(float x);
+    pure float   fabsf(float x);
 
     ///
     double  hypot(double x, double y);
@@ -1999,11 +2353,11 @@ else version( FreeBSD )
     float   sqrtf(float x);
 
     ///
-    double  erf(double x);
+    pure double  erf(double x);
     ///
-    float   erff(float x);
+    pure float   erff(float x);
     ///
-    real    erfl(real x) { return erf(x); }
+    pure real    erfl(real x) { return erf(x); }
 
     ///
     double  erfc(double x);
@@ -2027,24 +2381,24 @@ else version( FreeBSD )
     real    tgammal(real x) { return tgamma(x); }
 
     ///
-    double  ceil(double x);
+    pure double  ceil(double x);
     ///
-    float   ceilf(float x);
+    pure float   ceilf(float x);
 
     ///
-    double  floor(double x);
+    pure double  floor(double x);
     ///
-    float   floorf(float x);
+    pure float   floorf(float x);
 
     ///
-    double  nearbyint(double x);
+    pure double  nearbyint(double x);
     ///
-    float   nearbyintf(float x);
+    pure float   nearbyintf(float x);
 
     ///
-    double  rint(double x);
+    pure double  rint(double x);
     ///
-    float   rintf(float x);
+    pure float   rintf(float x);
 
     ///
     c_long  lrint(double x);
@@ -2059,9 +2413,9 @@ else version( FreeBSD )
     long    llrintl(real x) { return llrint(x); }
 
     ///
-    double  round(double x);
+    pure double  round(double x);
     ///
-    float   roundf(float x);
+    pure float   roundf(float x);
 
     ///
     c_long  lround(double x);
@@ -2074,9 +2428,9 @@ else version( FreeBSD )
     long    llroundf(float x);
 
     ///
-    double  trunc(double x);
+    pure double  trunc(double x);
     ///
-    float   truncf(float x);
+    pure float   truncf(float x);
 
     ///
     double  fmod(double x, double y);
@@ -2094,9 +2448,9 @@ else version( FreeBSD )
     float   remquof(float x, float y, int* quo);
 
     ///
-    double  copysign(double x, double y);
+    pure double  copysign(double x, double y);
     ///
-    float   copysignf(float x, float y);
+    pure float   copysignf(float x, float y);
 
     ///
     double  nextafter(double x, double y);
@@ -2114,19 +2468,19 @@ else version( FreeBSD )
     float   fdimf(float x, float y);
 
     ///
-    double  fmax(double x, double y);
+    pure double  fmax(double x, double y);
     ///
-    float   fmaxf(float x, float y);
+    pure float   fmaxf(float x, float y);
 
     ///
-    double  fmin(double x, double y);
+    pure double  fmin(double x, double y);
     ///
-    float   fminf(float x, float y);
+    pure float   fminf(float x, float y);
 
     ///
-    double  fma(double x, double y, double z);
+    pure double  fma(double x, double y, double z);
     ///
-    float   fmaf(float x, float y, float z);
+    pure float   fmaf(float x, float y, float z);
 }
 else version(NetBSD)
 {
@@ -2136,19 +2490,19 @@ else version(NetBSD)
     ///
     real    asinl(real x);
     ///
-    real    atanl(real x);
+    pure real    atanl(real x);
     ///
     real    atan2l(real y, real x);
     ///
-    real    cosl(real x);
+    pure real    cosl(real x);
     ///
-    real    sinl(real x);
+    pure real    sinl(real x);
     ///
-    real    tanl(real x);
+    pure real    tanl(real x);
     ///
     real    exp2l(real x);
     ///
-    real    frexpl(real value, int* exp);
+    pure real    frexpl(real value, int* exp);
     ///
     int     ilogbl(real x);
     ///
@@ -2156,35 +2510,35 @@ else version(NetBSD)
     ///
     real    logbl(real x);
     ///
-    real    modfl(real value, real *iptr);
+    pure real    modfl(real value, real *iptr);
     ///
     real    scalbnl(real x, int n);
     ///
     real    scalblnl(real x, c_long n);
     ///
-    real    fabsl(real x);
+    pure real    fabsl(real x);
     ///
     real    hypotl(real x, real y);
     ///
     real    sqrtl(real x);
     ///
-    real    ceill(real x);
+    pure real    ceill(real x);
     ///
-    real    floorl(real x);
+    pure real    floorl(real x);
     ///
-    real    nearbyintl(real x);
+    pure real    nearbyintl(real x);
     ///
-    real    rintl(real x);
+    pure real    rintl(real x);
     ///
     c_long  lrintl(real x) { return cast(c_long)rintl(x); }
     ///
-    real    roundl(real x);
+    pure real    roundl(real x);
     ///
     c_long  lroundl(real x) { return cast(c_long)roundl(x);}
     ///
     long    llroundl(real x) { return cast(long)roundl(x);}
     ///
-    real    truncl(real x);
+    pure real    truncl(real x);
     ///
     real    fmodl(real x, real y);
     ///
@@ -2192,13 +2546,13 @@ else version(NetBSD)
     ///
     real    remquol(real x, real y, int* quo){ return remquo(x,y,quo); }
     ///
-    real    copysignl(real x, real y);
+    pure real    copysignl(real x, real y);
     ///
-    double  nan(char* tagp);
+    pure double  nan(char* tagp);
     ///
-    float   nanf(char* tagp);
+    pure float   nanf(char* tagp);
     ///
-    real    nanl(char* tagp);
+    pure real    nanl(char* tagp);
     ///
     real    nextafterl(real x, real y);
     ///
@@ -2206,11 +2560,11 @@ else version(NetBSD)
     ///
     real    fdiml(real x, real y);
     ///
-    real    fmaxl(real x, real y);
+    pure real    fmaxl(real x, real y);
     ///
-    real    fminl(real x, real y);
+    pure real    fminl(real x, real y);
     ///
-    real    fmal(real x, real y, real z);
+    pure real    fmal(real x, real y, real z);
 
     ///
     double  acos(double x);
@@ -2223,9 +2577,9 @@ else version(NetBSD)
     float   asinf(float x);
 
     ///
-    double  atan(double x);
+    pure double  atan(double x);
     ///
-    float   atanf(float x);
+    pure float   atanf(float x);
 
     ///
     double  atan2(double y, double x);
@@ -2233,19 +2587,19 @@ else version(NetBSD)
     float   atan2f(float y, float x);
 
     ///
-    double  cos(double x);
+    pure double  cos(double x);
     ///
-    float   cosf(float x);
+    pure float   cosf(float x);
 
     ///
-    double  sin(double x);
+    pure double  sin(double x);
     ///
-    float   sinf(float x);
+    pure float   sinf(float x);
 
     ///
-    double  tan(double x);
+    pure double  tan(double x);
     ///
-    float   tanf(float x);
+    pure float   tanf(float x);
 
     ///
     double  acosh(double x);
@@ -2255,11 +2609,11 @@ else version(NetBSD)
     real    acoshl(real x);
 
     ///
-    double  asinh(double x);
+    pure double  asinh(double x);
     ///
-    float   asinhf(float x);
+    pure float   asinhf(float x);
     ///
-    real    asinhl(real x);
+    pure real    asinhl(real x);
 
     ///
     double  atanh(double x);
@@ -2283,11 +2637,11 @@ else version(NetBSD)
     real    sinhl(real x);
 
     ///
-    double  tanh(double x);
+    pure double  tanh(double x);
     ///
-    float   tanhf(float x);
+    pure float   tanhf(float x);
     ///
-    real    tanhl(real x);
+    pure real    tanhl(real x);
 
     ///
     double  exp(double x);
@@ -2309,9 +2663,9 @@ else version(NetBSD)
     real    expm1l(real x)  { return expm1(cast(double) x); }
 
     ///
-    double  frexp(double value, int* exp);
+    pure double  frexp(double value, int* exp);
     ///
-    float   frexpf(float value, int* exp);
+    pure float   frexpf(float value, int* exp);
 
     ///
     int     ilogb(double x);
@@ -2383,16 +2737,427 @@ else version(NetBSD)
     double  log1p(double x);
     ///
     float   log1pf(float x);
-    ///
-    real    log1pl(real x) { return log1p(cast(double) x); }
+    ///
+    real    log1pl(real x) { return log1p(cast(double) x); }
+
+    private enum real ONE_LN2 = 1 / 0x1.62e42fefa39ef358p-1L;
+    ///
+    double  log2(double x) { return log(x) * ONE_LN2; }
+    ///
+    float   log2f(float x) { return logf(x) * ONE_LN2; }
+    ///
+    real    log2l(real x)  { return logl(x) * ONE_LN2; }
+
+    ///
+    double  logb(double x);
+    ///
+    float   logbf(float x);
+
+    ///
+    pure double  modf(double value, double* iptr);
+    ///
+    pure float   modff(float value, float* iptr);
+
+    ///
+    double  scalbn(double x, int n);
+    ///
+    float   scalbnf(float x, int n);
+
+    ///
+    double  scalbln(double x, c_long n);
+    ///
+    float   scalblnf(float x, c_long n);
+
+    ///
+    pure double  cbrt(double x);
+    ///
+    pure float   cbrtf(float x);
+    ///
+    pure real    cbrtl(real x);
+
+    ///
+    pure double  fabs(double x);
+    ///
+    pure float   fabsf(float x);
+
+    ///
+    double  hypot(double x, double y);
+    ///
+    float   hypotf(float x, float y);
+
+    ///
+    double  pow(double x, double y);
+    ///
+    float   powf(float x, float y);
+    ///
+    real    powl(real x, real y);
+
+    ///
+    double  sqrt(double x);
+    ///
+    float   sqrtf(float x);
+
+    ///
+    pure double  erf(double x);
+    ///
+    pure float   erff(float x);
+    ///
+    pure real    erfl(real x) { return erf(cast(double) x); }
+
+    ///
+    double  erfc(double x);
+    ///
+    float   erfcf(float x);
+    ///
+    real    erfcl(real x)  { return erfc(cast(double) x); }
+
+    ///
+    double  lgamma(double x);
+    ///
+    float   lgammaf(float x);
+    ///
+    real    lgammal(real x){ return lgamma(x); }
+
+    ///
+    double  tgamma(double x);
+    ///
+    float   tgammaf(float x);
+    ///
+    real    tgammal(real x){ return tgamma(cast(double) x); }
+
+    ///
+    pure double  ceil(double x);
+    ///
+    pure float   ceilf(float x);
+
+    ///
+    pure double  floor(double x);
+    ///
+    pure float   floorf(float x);
+
+    ///
+    pure double  nearbyint(double x);
+    ///
+    pure float   nearbyintf(float x);
+
+    ///
+    pure double  rint(double x);
+    ///
+    pure float   rintf(float x);
+
+    ///
+    c_long  lrint(double x);
+    ///
+    c_long  lrintf(float x);
+
+    ///
+    long    llrint(double x);
+    ///
+    long    llrintf(float x);
+    ///
+    long    llrintl(real x) { return cast(long)rintl(x); }
+
+    ///
+    pure double  round(double x);
+    ///
+    pure float   roundf(float x);
+
+    ///
+    c_long  lround(double x);
+    ///
+    c_long  lroundf(float x);
+
+    ///
+    long    llround(double x);
+    ///
+    long    llroundf(float x);
+
+    ///
+    pure double  trunc(double x);
+    ///
+    pure float   truncf(float x);
+
+    ///
+    double  fmod(double x, double y);
+    ///
+    float   fmodf(float x, float y);
+
+    ///
+    double  remainder(double x, double y);
+    ///
+    float   remainderf(float x, float y);
+
+    ///
+    double  remquo(double x, double y, int* quo);
+    ///
+    float   remquof(float x, float y, int* quo);
+
+    ///
+    pure double  copysign(double x, double y);
+    ///
+    pure float   copysignf(float x, float y);
+
+    ///
+    double  nextafter(double x, double y);
+    ///
+    float   nextafterf(float x, float y);
+
+    ///
+    double  nexttoward(double x, real y);
+    ///
+    float   nexttowardf(float x, real y);
+
+    ///
+    double  fdim(double x, double y);
+    ///
+    float   fdimf(float x, float y);
+
+    ///
+    pure double  fmax(double x, double y);
+    ///
+    pure float   fmaxf(float x, float y);
+
+    ///
+    pure double  fmin(double x, double y);
+    ///
+    pure float   fminf(float x, float y);
+
+    ///
+    pure double  fma(double x, double y, double z);
+    ///
+    pure float   fmaf(float x, float y, float z);
+}
+else version( OpenBSD )
+{
+    ///
+    real    acosl(real x);
+    ///
+    real    asinl(real x);
+    ///
+    pure real    atanl(real x);
+    ///
+    real    atan2l(real y, real x);
+    ///
+    pure real    cosl(real x);
+    ///
+    pure real    sinl(real x);
+    ///
+    pure real    tanl(real x);
+    ///
+    real    acoshl(real x);
+    ///
+    pure real    asinhl(real x);
+    ///
+    real    atanhl(real x);
+    ///
+    real    coshl(real x);
+    ///
+    real    sinhl(real x);
+    ///
+    pure real    tanhl(real x);
+    ///
+    real    expl(real x);
+    ///
+    real    exp2l(real x);
+    ///
+    real    expm1l(real x);
+    ///
+    pure real    frexpl(real value, int* exp);
+    ///
+    int     ilogbl(real x);
+    ///
+    real    ldexpl(real x, int exp);
+    ///
+    real    logbl(real x);
+    ///
+    real    logb10l(real x);
+    ///
+    real    logb1pl(real x);
+    ///
+    real    logb2l(real x);
+    ///
+    real    logbl(real x);
+    ///
+    pure real    modfl(real value, real *iptr);
+    ///
+    real    scalbnl(real x, int n);
+    ///
+    real    scalblnl(real x, c_long n);
+    ///
+    pure real    cbrtl(real x);
+    ///
+    pure real    fabsl(real x);
+    ///
+    real    hypotl(real x, real y);
+    ///
+    real    powl(real x, real y);
+    ///
+    real    sqrtl(real x);
+    ///
+    pure real    ceill(real x);
+    ///
+    pure real    floorl(real x);
+    ///
+    pure real    nearbyintl(real x);
+    ///
+    pure real    rintl(real x);
+    ///
+    c_long  lrintl(real x);
+    ///
+    long    llrintl(real x);
+    ///
+    pure real    roundl(real x);
+    ///
+    c_long  lroundl(real x);
+    ///
+    long    llroundl(real x);
+    ///
+    pure real    truncl(real x);
+    ///
+    real    fmodl(real x, real y);
+    ///
+    real    remainderl(real x, real y);
+    ///
+    real    remquol(real x, real y, int* quo);
+    ///
+    pure real    copysignl(real x, real y);
+    ///
+    pure double  nan(char* tagp);
+    ///
+    pure float   nanf(char* tagp);
+    ///
+    pure real    nanl(char* tagp);
+    ///
+    real    nextafterl(real x, real y);
+    ///
+    real    nexttowardl(real x, real y);
+    ///
+    real    fdiml(real x, real y);
+    ///
+    pure real    fmaxl(real x, real y);
+    ///
+    pure real    fminl(real x, real y);
+    ///
+    pure real    fmal(real x, real y, real z);
+
+    ///
+    double  acos(double x);
+    ///
+    float   acosf(float x);
+
+    ///
+    double  asin(double x);
+    ///
+    float   asinf(float x);
+
+    ///
+    pure double  atan(double x);
+    ///
+    pure float   atanf(float x);
+
+    ///
+    double  atan2(double y, double x);
+    ///
+    float   atan2f(float y, float x);
+
+    ///
+    pure double  cos(double x);
+    ///
+    pure float   cosf(float x);
+
+    ///
+    pure double  sin(double x);
+    ///
+    pure float   sinf(float x);
+
+    ///
+    pure double  tan(double x);
+    ///
+    pure float   tanf(float x);
+
+    ///
+    double  acosh(double x);
+    ///
+    float   acoshf(float x);
+
+    ///
+    pure double  asinh(double x);
+    ///
+    pure float   asinhf(float x);
+
+    ///
+    double  atanh(double x);
+    ///
+    float   atanhf(float x);
+
+    ///
+    double  cosh(double x);
+    ///
+    float   coshf(float x);
+
+    ///
+    double  sinh(double x);
+    ///
+    float   sinhf(float x);
+
+    ///
+    pure double  tanh(double x);
+    ///
+    pure float   tanhf(float x);
+
+    ///
+    double  exp(double x);
+    ///
+    float   expf(float x);
+
+    ///
+    double  exp2(double x);
+    ///
+    float   exp2f(float x);
+    ///
+    real    exp2l(real x);
+
+    ///
+    double  expm1(double x);
+    ///
+    float   expm1f(float x);
+
+    ///
+    pure double  frexp(double value, int* exp);
+    ///
+    pure float   frexpf(float value, int* exp);
+
+    ///
+    int     ilogb(double x);
+    ///
+    int     ilogbf(float x);
+
+    ///
+    double  ldexp(double x, int exp);
+    ///
+    float   ldexpf(float x, int exp);
+
+    ///
+    double  log(double x);
+    ///
+    float   logf(float x);
+
+    ///
+    double  log10(double x);
+    ///
+    float   log10f(float x);
+
+    ///
+    double  log1p(double x);
+    ///
+    float   log1pf(float x);
 
-    private enum real ONE_LN2 = 1 / 0x1.62e42fefa39ef358p-1L;
     ///
-    double  log2(double x) { return log(x) * ONE_LN2; }
+    double  log2(double x);
     ///
-    float   log2f(float x) { return logf(x) * ONE_LN2; }
+    float   log2f(float x);
     ///
-    real    log2l(real x)  { return logl(x) * ONE_LN2; }
+    real    log2l(real x);
 
     ///
     double  logb(double x);
@@ -2400,9 +3165,9 @@ else version(NetBSD)
     float   logbf(float x);
 
     ///
-    double  modf(double value, double* iptr);
+    pure double  modf(double value, double* iptr);
     ///
-    float   modff(float value, float* iptr);
+    pure float   modff(float value, float* iptr);
 
     ///
     double  scalbn(double x, int n);
@@ -2415,16 +3180,14 @@ else version(NetBSD)
     float   scalblnf(float x, c_long n);
 
     ///
-    double  cbrt(double x);
-    ///
-    float   cbrtf(float x);
+    pure double  cbrt(double x);
     ///
-    real    cbrtl(real x);
+    pure float   cbrtf(float x);
 
     ///
-    double  fabs(double x);
+    pure double  fabs(double x);
     ///
-    float   fabsf(float x);
+    pure float   fabsf(float x);
 
     ///
     double  hypot(double x, double y);
@@ -2435,8 +3198,6 @@ else version(NetBSD)
     double  pow(double x, double y);
     ///
     float   powf(float x, float y);
-    ///
-    real    powl(real x, real y);
 
     ///
     double  sqrt(double x);
@@ -2444,52 +3205,52 @@ else version(NetBSD)
     float   sqrtf(float x);
 
     ///
-    double  erf(double x);
+    pure double  erf(double x);
     ///
-    float   erff(float x);
+    pure float   erff(float x);
     ///
-    real    erfl(real x) { return erf(cast(double) x); }
+    pure real    erfl(real x);
 
     ///
     double  erfc(double x);
     ///
     float   erfcf(float x);
     ///
-    real    erfcl(real x)  { return erfc(cast(double) x); }
+    real    erfcl(real x);
 
     ///
     double  lgamma(double x);
     ///
     float   lgammaf(float x);
     ///
-    real    lgammal(real x){ return lgamma(x); }
+    real    lgammal(real x);
 
     ///
     double  tgamma(double x);
     ///
     float   tgammaf(float x);
     ///
-    real    tgammal(real x){ return tgamma(cast(double) x); }
+    real    tgammal(real x);
 
     ///
-    double  ceil(double x);
+    pure double  ceil(double x);
     ///
-    float   ceilf(float x);
+    pure float   ceilf(float x);
 
     ///
-    double  floor(double x);
+    pure double  floor(double x);
     ///
-    float   floorf(float x);
+    pure float   floorf(float x);
 
     ///
-    double  nearbyint(double x);
+    pure double  nearbyint(double x);
     ///
-    float   nearbyintf(float x);
+    pure float   nearbyintf(float x);
 
     ///
-    double  rint(double x);
+    pure double  rint(double x);
     ///
-    float   rintf(float x);
+    pure float   rintf(float x);
 
     ///
     c_long  lrint(double x);
@@ -2500,13 +3261,11 @@ else version(NetBSD)
     long    llrint(double x);
     ///
     long    llrintf(float x);
-    ///
-    long    llrintl(real x) { return cast(long)rintl(x); }
 
     ///
-    double  round(double x);
+    pure double  round(double x);
     ///
-    float   roundf(float x);
+    pure float   roundf(float x);
 
     ///
     c_long  lround(double x);
@@ -2519,9 +3278,9 @@ else version(NetBSD)
     long    llroundf(float x);
 
     ///
-    double  trunc(double x);
+    pure double  trunc(double x);
     ///
-    float   truncf(float x);
+    pure float   truncf(float x);
 
     ///
     double  fmod(double x, double y);
@@ -2539,9 +3298,9 @@ else version(NetBSD)
     float   remquof(float x, float y, int* quo);
 
     ///
-    double  copysign(double x, double y);
+    pure double  copysign(double x, double y);
     ///
-    float   copysignf(float x, float y);
+    pure float   copysignf(float x, float y);
 
     ///
     double  nextafter(double x, double y);
@@ -2559,244 +3318,419 @@ else version(NetBSD)
     float   fdimf(float x, float y);
 
     ///
-    double  fmax(double x, double y);
+    pure double  fmax(double x, double y);
     ///
-    float   fmaxf(float x, float y);
+    pure float   fmaxf(float x, float y);
 
     ///
-    double  fmin(double x, double y);
+    pure double  fmin(double x, double y);
     ///
-    float   fminf(float x, float y);
+    pure float   fminf(float x, float y);
 
     ///
-    double  fma(double x, double y, double z);
+    pure double  fma(double x, double y, double z);
     ///
-    float   fmaf(float x, float y, float z);
+    pure float   fmaf(float x, float y, float z);
 }
-else version( OpenBSD )
+else version(DragonFlyBSD)
+{
+    /* double */
+    double acos(double x);
+    double asin(double x);
+    pure double atan(double x);
+    double atan2(double, double);
+    pure double cos(double x);
+    pure double sin(double x);
+    pure double tan(double x);
+
+    double cosh(double x);
+    double sinh(double x);
+    pure double tanh(double x);
+
+    double exp(double x);
+    pure double frexp(double, int *exp);
+    double ldexp(double, int exp);
+    double log(double x);
+    double log10(double x);
+    pure double modf(double x, double *iptr);
+
+    double pow(double x, double y);
+    double sqrt(double x);
+
+    pure double ceil(double x);
+    pure double fabs(double x);
+    pure double floor(double x);
+    double fmod(double x, double);
+
+    double acosh(double x);
+    pure double asinh(double x);
+    double atanh(double x);
+
+    double exp2(double x);
+    double expm1(double x);
+    int ilogb(double x);
+    double log1p(double x);
+    double log2(double x);
+    double logb(double x);
+    double scalbn(double x, int n);
+    double scalbln(double x, c_long n);
+
+    pure double cbrt(double x);
+    double hypot(double x, double y);
+
+    pure double erf(double x);
+    double erfc(double x);
+    double lgamma(double x);
+    double tgamma(double x);
+
+    pure double nearbyint(double x);
+    pure double rint(double x);
+    c_long lrint(double x);
+    long llrint(double x);
+    pure double round(double x);
+    c_long lround(double x);
+    long  llround(double x);
+    pure double trunc(double x);
+
+    double remainder(double x , double y);
+    double remquo(double x, double y, int * quo);
+
+    pure double copysign(double x, double y);
+    pure double nan(const char *);
+    double nextafter(double x, double y);
+    double nexttoward(double x, real y);
+
+    double fdim(double x, double y);
+    pure double fmax(double x, double y);
+    pure double fmin(double x, double y);
+
+    pure double fma(double x, double y, double z);
+
+    double j0(double x);
+    double j1(double x);
+    double jn(int, double);
+    double y0(double x);
+    double y1(double x);
+    double yn(int, double);
+
+    double gamma(double x);
+    double scalb(double x, double y);
+
+    double drem(double x, double y);
+    int finite(double x);
+    double gamma_r(double x, int *);
+    double lgamma_r(double x, int *);
+
+    double significand(double x);
+
+    /* float */
+    float acosf(float x);
+    float asinf(float x);
+    pure float atanf(float x);
+    float atan2f(float x, float y);
+    pure float cosf(float x);
+    pure float sinf(float x);
+    pure float tanf(float x);
+
+    float acoshf(float x);
+    pure float asinhf(float x);
+    float atanhf(float x);
+    float coshf(float x);
+    float sinhf(float x);
+    pure float tanhf(float x);
+
+    float expf(float x);
+    float exp2f(float x);
+    float expm1f(float x);
+    pure float frexpf(float x, int *exp);
+    int ilogbf(float x);
+    float ldexpf(float x, int exp);
+    float logf(float x);
+    float log10f(float x);
+    float log1pf(float x);
+    float log2f(float x);
+    float logbf(float x);
+    pure float modff(float x, float *iptr);
+    float scalbnf(float x, int y);
+    float scalblnf(float x, c_long y);
+
+    pure float cbrtf(float x);
+    pure float fabsf(float x);
+    float hypotf(float x, float y);
+    float powf(float x, float y);
+    float sqrtf(float x);
+
+    pure float erff(float x);
+    float erfcf(float x);
+    float lgammaf(float x);
+    float tgammaf(float x);
+
+    pure float ceilf(float x);
+    pure float floorf(float x);
+    pure float nearbyintf(float x);
+    pure float rintf(float x);
+    c_long lrintf(float x);
+    long llrintf(float x);
+    pure float roundf(float x);
+    c_long lroundf(float x);
+    long llroundf(float x);
+    pure float truncf(float x);
+
+    pure float fmodf(float x, float y);
+    float remainderf(float x, float y);
+    float remquof(float x, float y, int *iptr);
+
+    pure float copysignf(float x, float y);
+    pure float nanf(const char *);
+    float nextafterf(float x, float y);
+    float nexttowardf(float x, real y);
+
+    float fdimf(float x, float y);
+    pure float fmaxf(float x, float y);
+    pure float fminf(float x, float y);
+
+    pure float fmaf(float x, float y, float z);
+
+    float j0f(float x);
+    float j1f(float x);
+    float jnf(int, float);
+    float scalbf(float x, float);
+    float y0f(float x);
+    float y1f(float x);
+    float ynf(int, float);
+    float gammaf(float x);
+    float dremf(float x, float);
+    pure int finitef(float x);
+    pure int isinff(float x);
+    pure int isnanf(float x);
+
+    float gammaf_r(float x, int *);
+    float lgammaf_r(float x, int *);
+    float significandf(float x);
+
+    /* real */
+    pure real acosl(real x);
+    pure real asinl(real x);
+    pure real atanl(real x);
+    real atan2l(real x, real y);
+    pure real cosl(real x);
+    pure real sinl(real x);
+    pure real tanl(real x);
+
+    real acoshl(real x);
+    pure real asinhl(real x);
+    real atanhl(real x);
+    real coshl(real x);
+    real sinhl(real x);
+    pure real tanhl(real x);
+
+    real expl(real x);
+    real exp2l(real x);
+    real expm1l(real x);
+    pure real frexpl(real x, int *exp);
+    int ilogbl(real x);
+    real ldexpl(real x, int exp);
+    real logl(real x);
+    real log10l(real x);
+    real log1pl(real x);
+    real log2l(real x);
+    real logbl(real x);
+    pure real modfl(real x, real *iptr);
+    real scalbnl(real x, int y);
+    real scalblnl(real x, c_long y);
+
+    pure real cbrtl(real x);
+    pure real fabsl(real x);
+    real hypotl(real x, real y);
+    real powl(real x, real y);
+    real sqrtl(real x);
+
+    pure real erfl(real x);
+    real erfcl(real x);
+    real lgammal(real x);
+    real tgammal(real x);
+
+    pure real ceill(real x);
+    pure real floorl(real x);
+    pure real nearbyintl(real x);
+    pure real rintl(real x);
+    c_long lrintl(real x);
+    long llrintl(real x);
+    pure real roundl(real x);
+    c_long lroundl(real x);
+    long llroundl(real x);
+    pure real truncl(real x);
+
+    pure real fmodl(real x, real);
+    pure real remainderl(real x, real);
+    pure real remquol(real x, real y, int *iptr);
+
+    pure real copysignl(real x, real y);
+    pure real nanl(const char *);
+    real nextafterl(real x, real y);
+    real nexttowardl(real x, real y);
+
+    real fdiml(real x, real y);
+    pure real fmaxl(real x, real y);
+    pure real fminl(real x, real y);
+
+    pure real fmal(real x, real, real);
+}
+else version(CRuntime_Bionic)
 {
-    ///
-    real    acosl(real x);
-    ///
-    real    asinl(real x);
-    ///
-    real    atanl(real x);
-    ///
-    real    atan2l(real y, real x);
-    ///
-    real    cosl(real x);
-    ///
-    real    sinl(real x);
-    ///
-    real    tanl(real x);
-    ///
-    real    acoshl(real x);
-    ///
-    real    asinhl(real x);
-    ///
-    real    atanhl(real x);
-    ///
-    real    coshl(real x);
-    ///
-    real    sinhl(real x);
-    ///
-    real    tanhl(real x);
-    ///
-    real    expl(real x);
-    ///
-    real    exp2l(real x);
-    ///
-    real    expm1l(real x);
-    ///
-    real    frexpl(real value, int* exp);
-    ///
-    int     ilogbl(real x);
-    ///
-    real    ldexpl(real x, int exp);
-    ///
-    real    logbl(real x);
-    ///
-    real    logb10l(real x);
-    ///
-    real    logb1pl(real x);
-    ///
-    real    logb2l(real x);
-    ///
-    real    logbl(real x);
-    ///
-    real    modfl(real value, real *iptr);
-    ///
-    real    scalbnl(real x, int n);
-    ///
-    real    scalblnl(real x, c_long n);
-    ///
-    real    cbrtl(real x);
-    ///
-    real    fabsl(real x);
-    ///
-    real    hypotl(real x, real y);
-    ///
-    real    powl(real x, real y);
-    ///
-    real    sqrtl(real x);
-    ///
-    real    ceill(real x);
-    ///
-    real    floorl(real x);
-    ///
-    real    nearbyintl(real x);
-    ///
-    real    rintl(real x);
-    ///
-    c_long  lrintl(real x);
-    ///
-    long    llrintl(real x);
-    ///
-    real    roundl(real x);
-    ///
-    c_long  lroundl(real x);
-    ///
-    long    llroundl(real x);
-    ///
-    real    truncl(real x);
-    ///
-    real    fmodl(real x, real y);
-    ///
-    real    remainderl(real x, real y);
-    ///
-    real    remquol(real x, real y, int* quo);
-    ///
-    real    copysignl(real x, real y);
-    ///
-    double  nan(char* tagp);
-    ///
-    float   nanf(char* tagp);
-    ///
-    real    nanl(char* tagp);
-    ///
-    real    nextafterl(real x, real y);
-    ///
-    real    nexttowardl(real x, real y);
-    ///
-    real    fdiml(real x, real y);
-    ///
-    real    fmaxl(real x, real y);
-    ///
-    real    fminl(real x, real y);
-    ///
-    real    fmal(real x, real y, real z);
-
     ///
     double  acos(double x);
     ///
     float   acosf(float x);
+    /// Added since Lollipop
+    real    acosl(real x);
 
     ///
     double  asin(double x);
     ///
     float   asinf(float x);
+    /// Added since Lollipop
+    real    asinl(real x);
 
     ///
-    double  atan(double x);
+    pure double  atan(double x);
     ///
-    float   atanf(float x);
+    pure float   atanf(float x);
+    /// Added since Lollipop
+    pure real    atanl(real x);
 
     ///
     double  atan2(double y, double x);
     ///
     float   atan2f(float y, float x);
+    /// Added since Lollipop
+    real    atan2l(real y, real x);
 
     ///
-    double  cos(double x);
+    pure double  cos(double x);
+    ///
+    pure float   cosf(float x);
     ///
-    float   cosf(float x);
+    pure real    cosl(real x);
 
     ///
-    double  sin(double x);
+    pure double  sin(double x);
     ///
-    float   sinf(float x);
+    pure float   sinf(float x);
+    /// Added since Lollipop
+    pure real    sinl(real x);
 
     ///
-    double  tan(double x);
+    pure double  tan(double x);
     ///
-    float   tanf(float x);
+    pure float   tanf(float x);
+    /// Added since Lollipop
+    pure real    tanl(real x);
 
     ///
     double  acosh(double x);
     ///
     float   acoshf(float x);
+    /// Added since Lollipop
+    real    acoshl(real x);
 
     ///
-    double  asinh(double x);
+    pure double  asinh(double x);
     ///
-    float   asinhf(float x);
+    pure float   asinhf(float x);
+    /// Added since Lollipop
+    pure real    asinhl(real x);
 
     ///
     double  atanh(double x);
     ///
     float   atanhf(float x);
+    /// Added since Lollipop
+    real    atanhl(real x);
 
     ///
     double  cosh(double x);
     ///
     float   coshf(float x);
+    /// Added since Lollipop
+    real    coshl(real x);
 
     ///
     double  sinh(double x);
     ///
     float   sinhf(float x);
+    /// Added since Lollipop
+    real    sinhl(real x);
 
     ///
-    double  tanh(double x);
+    pure double  tanh(double x);
     ///
-    float   tanhf(float x);
+    pure float   tanhf(float x);
+    /// Added since Lollipop
+    pure real    tanhl(real x);
 
     ///
     double  exp(double x);
     ///
     float   expf(float x);
+    ///
+    real    expl(real x);
 
     ///
     double  exp2(double x);
     ///
     float   exp2f(float x);
-    ///
+    /// Added since Lollipop
     real    exp2l(real x);
 
     ///
     double  expm1(double x);
     ///
     float   expm1f(float x);
+    /// Added since Lollipop
+    real    expm1l(real x);
 
     ///
-    double  frexp(double value, int* exp);
+    pure double  frexp(double value, int* exp);
     ///
-    float   frexpf(float value, int* exp);
+    pure float   frexpf(float value, int* exp);
+    /// Added since Lollipop
+    pure real    frexpl(real value, int* exp);
 
     ///
     int     ilogb(double x);
     ///
     int     ilogbf(float x);
+    ///
+    int     ilogbl(real x);
 
     ///
     double  ldexp(double x, int exp);
     ///
     float   ldexpf(float x, int exp);
+    ///
+    real    ldexpl(real x, int exp);
 
     ///
     double  log(double x);
     ///
     float   logf(float x);
+    /// Added since Lollipop
+    real    logl(real x);
 
     ///
     double  log10(double x);
     ///
     float   log10f(float x);
+    /// Added since Lollipop
+    real    log10l(real x);
 
     ///
     double  log1p(double x);
     ///
     float   log1pf(float x);
+    /// Added since Lollipop
+    real    log1pl(real x);
 
     ///
     double  log2(double x);
@@ -2809,531 +3743,642 @@ else version( OpenBSD )
     double  logb(double x);
     ///
     float   logbf(float x);
+    ///
+    real    logbl(real x);
 
     ///
-    double  modf(double value, double* iptr);
+    pure double  modf(double value, double* iptr);
     ///
-    float   modff(float value, float* iptr);
+    pure float   modff(float value, float* iptr);
+    /// Added since Lollipop
+    pure real    modfl(real value, real *iptr);
 
     ///
     double  scalbn(double x, int n);
     ///
     float   scalbnf(float x, int n);
+    ///
+    real    scalbnl(real x, int n);
 
     ///
     double  scalbln(double x, c_long n);
     ///
     float   scalblnf(float x, c_long n);
+    ///
+    real    scalblnl(real x, c_long n);
 
     ///
-    double  cbrt(double x);
+    pure double  cbrt(double x);
     ///
-    float   cbrtf(float x);
+    pure float   cbrtf(float x);
+    /// Added since Lollipop
+    pure real    cbrtl(real x);
 
     ///
-    double  fabs(double x);
+    pure double  fabs(double x);
+    ///
+    pure float   fabsf(float x);
     ///
-    float   fabsf(float x);
+    pure real    fabsl(real x);
 
     ///
     double  hypot(double x, double y);
     ///
     float   hypotf(float x, float y);
+    /// Added since Lollipop
+    real    hypotl(real x, real y);
 
     ///
     double  pow(double x, double y);
     ///
     float   powf(float x, float y);
+    /// Added since Lollipop
+    real    powl(real x, real y);
 
     ///
     double  sqrt(double x);
     ///
     float   sqrtf(float x);
+    /// Added since Lollipop
+    real    sqrtl(real x);
 
     ///
-    double  erf(double x);
-    ///
-    float   erff(float x);
+    pure double  erf(double x);
     ///
-    real    erfl(real x);
+    pure float   erff(float x);
+    /// Added since Lollipop
+    pure real    erfl(real x);
 
     ///
     double  erfc(double x);
     ///
     float   erfcf(float x);
-    ///
+    /// Added since Lollipop
     real    erfcl(real x);
 
     ///
     double  lgamma(double x);
     ///
     float   lgammaf(float x);
-    ///
+    /// Added since Lollipop
     real    lgammal(real x);
 
     ///
     double  tgamma(double x);
     ///
     float   tgammaf(float x);
-    ///
+    /// Added since Lollipop
     real    tgammal(real x);
 
     ///
-    double  ceil(double x);
+    pure double  ceil(double x);
+    ///
+    pure float   ceilf(float x);
     ///
-    float   ceilf(float x);
+    pure real    ceill(real x);
 
     ///
-    double  floor(double x);
+    pure double  floor(double x);
     ///
-    float   floorf(float x);
+    pure float   floorf(float x);
+    ///
+    pure real    floorl(real x);
 
     ///
-    double  nearbyint(double x);
+    pure double  nearbyint(double x);
     ///
-    float   nearbyintf(float x);
+    pure float   nearbyintf(float x);
+    /// Added since Lollipop
+    pure real    nearbyintl(real x);
 
     ///
-    double  rint(double x);
+    pure double  rint(double x);
     ///
-    float   rintf(float x);
+    pure float   rintf(float x);
+    /// Added since Lollipop
+    pure real    rintl(real x);
 
     ///
     c_long  lrint(double x);
     ///
     c_long  lrintf(float x);
+    /// Added since Lollipop
+    c_long  lrintl(real x);
 
     ///
     long    llrint(double x);
     ///
     long    llrintf(float x);
+    /// Added since Lollipop
+    long    llrintl(real x);
 
     ///
-    double  round(double x);
+    pure double  round(double x);
+    ///
+    pure float   roundf(float x);
     ///
-    float   roundf(float x);
+    pure real    roundl(real x);
 
     ///
     c_long  lround(double x);
     ///
     c_long  lroundf(float x);
+    ///
+    c_long  lroundl(real x);
 
     ///
     long    llround(double x);
     ///
     long    llroundf(float x);
+    ///
+    long    llroundl(real x);
 
     ///
-    double  trunc(double x);
+    pure double  trunc(double x);
     ///
-    float   truncf(float x);
+    pure float   truncf(float x);
+    ///
+    pure real    truncl(real x);
 
     ///
     double  fmod(double x, double y);
     ///
     float   fmodf(float x, float y);
+    /// Added since Lollipop
+    real    fmodl(real x, real y);
 
     ///
     double  remainder(double x, double y);
     ///
     float   remainderf(float x, float y);
+    /// Added since Lollipop
+    real    remainderl(real x, real y);
 
     ///
     double  remquo(double x, double y, int* quo);
     ///
     float   remquof(float x, float y, int* quo);
+    /// Added since Lollipop
+    real    remquol(real x, real y, int* quo);
+
+    ///
+    pure double  copysign(double x, double y);
+    ///
+    pure float   copysignf(float x, float y);
+    ///
+    pure real    copysignl(real x, real y);
 
     ///
-    double  copysign(double x, double y);
+    pure double  nan(char* tagp);
     ///
-    float   copysignf(float x, float y);
+    pure float   nanf(char* tagp);
+    ///
+    pure real    nanl(char* tagp);
 
     ///
     double  nextafter(double x, double y);
     ///
     float   nextafterf(float x, float y);
+    /// Added since Lollipop
+    real    nextafterl(real x, real y);
 
     ///
     double  nexttoward(double x, real y);
     ///
     float   nexttowardf(float x, real y);
+    ///
+    real    nexttowardl(real x, real y);
 
     ///
     double  fdim(double x, double y);
     ///
     float   fdimf(float x, float y);
+    ///
+    real    fdiml(real x, real y);
 
     ///
-    double  fmax(double x, double y);
+    pure double  fmax(double x, double y);
     ///
-    float   fmaxf(float x, float y);
+    pure float   fmaxf(float x, float y);
+    ///
+    pure real    fmaxl(real x, real y);
 
     ///
-    double  fmin(double x, double y);
+    pure double  fmin(double x, double y);
+    ///
+    pure float   fminf(float x, float y);
     ///
-    float   fminf(float x, float y);
+    pure real    fminl(real x, real y);
 
     ///
-    double  fma(double x, double y, double z);
+    pure double  fma(double x, double y, double z);
     ///
-    float   fmaf(float x, float y, float z);
+    pure float   fmaf(float x, float y, float z);
+    /// Added since Lollipop
+    pure real    fmal(real x, real y, real z);
 }
-else version(CRuntime_Bionic)
+else version (CRuntime_UClibc)
 {
-    // Bionic defines long double as 64 bits, same as double, so several long
-    // double functions are missing.  nexttoward was modified to reflect this.
+    // uClibc wraps 'long double' to double, so we do the same for 'real'
+
     ///
     double  acos(double x);
     ///
     float   acosf(float x);
-    //real    acosl(real x);
+    ///
+    real    acosl(real x) { return acos(cast(double) x); }
 
     ///
     double  asin(double x);
     ///
     float   asinf(float x);
-    //real    asinl(real x);
+    ///
+    real    asinl(real x) { return asin(cast(double) x); }
 
     ///
-    double  atan(double x);
+    pure double  atan(double x);
     ///
-    float   atanf(float x);
-    //real    atanl(real x);
+    pure float   atanf(float x);
+    ///
+    pure real    atanl(real x) { return atan(cast(double) x); }
 
     ///
     double  atan2(double y, double x);
     ///
     float   atan2f(float y, float x);
-    //real    atan2l(real y, real x);
+    ///
+    real    atan2l(real y, real x) { return atan2(cast(double) x, cast(double) y); }
 
     ///
-    double  cos(double x);
+    pure double  cos(double x);
     ///
-    float   cosf(float x);
-    //real    cosl(real x);
+    pure float   cosf(float x);
+    ///
+    pure real    cosl(real x) { return cos(cast(double) x); }
 
     ///
-    double  sin(double x);
+    pure double  sin(double x);
+    ///
+    pure float   sinf(float x);
     ///
-    float   sinf(float x);
-    //real    sinl(real x);
+    pure real    sinl(real x) { return sin(cast(double) x); }
 
     ///
-    double  tan(double x);
+    pure double  tan(double x);
     ///
-    float   tanf(float x);
-    // Added since Lollipop
-    real    tanl(real x);
+    pure float   tanf(float x);
+    ///
+    pure real    tanl(real x) { return tan(cast(double) x); }
 
     ///
     double  acosh(double x);
     ///
     float   acoshf(float x);
-    //real    acoshl(real x);
+    ///
+    real    acoshl(real x) { return acosh(cast(double) x); }
 
     ///
-    double  asinh(double x);
+    pure double  asinh(double x);
     ///
-    float   asinhf(float x);
-    //real    asinhl(real x);
+    pure float   asinhf(float x);
+    ///
+    pure real    asinhl(real x) { return asinh(cast(double) x); }
 
     ///
     double  atanh(double x);
     ///
     float   atanhf(float x);
-    //real    atanhl(real x);
+    ///
+    real    atanhl(real x) { return atanh(cast(double) x); }
 
     ///
     double  cosh(double x);
     ///
     float   coshf(float x);
-    //real    coshl(real x);
+    ///
+    real    coshl(real x) { return cosh(cast(double) x); }
 
     ///
     double  sinh(double x);
     ///
     float   sinhf(float x);
-    //real    sinhl(real x);
+    ///
+    real    sinhl(real x) { return sinh(cast(double) x); }
 
     ///
     double  tanh(double x);
     ///
     float   tanhf(float x);
-    //real    tanhl(real x);
+    ///
+    real    tanhl(real x) { return tanh(cast(double) x); }
 
     ///
     double  exp(double x);
     ///
     float   expf(float x);
-    //real    expl(real x);
+    ///
+    real    expl(real x) { return exp(cast(double) x); }
 
     ///
     double  exp2(double x);
     ///
     float   exp2f(float x);
     ///
-    real    exp2l(real x) { return exp2(x); }
+    real    exp2l(real x) { return exp2(cast(double) x); }
 
     ///
     double  expm1(double x);
     ///
     float   expm1f(float x);
-    //real    expm1l(real x);
+    ///
+    real    expm1l(real x) { return expm1(cast(double) x); }
 
     ///
-    double  frexp(double value, int* exp);
+    pure double  frexp(double value, int* exp);
     ///
-    float   frexpf(float value, int* exp);
-    // alias for double: real    frexpl(real value, int* exp);
+    pure float   frexpf(float value, int* exp);
+    ///
+    pure real    frexpl(real value, int* exp) { return frexp(cast(double) value, exp); }
 
     ///
     int     ilogb(double x);
     ///
     int     ilogbf(float x);
     ///
-    int     ilogbl(real x) { return ilogb(x); }
+    int     ilogbl(real x) { return ilogb(cast(double) x); }
 
     ///
     double  ldexp(double x, int exp);
     ///
     float   ldexpf(float x, int exp);
     ///
-    real    ldexpl(real x, int exp);
+    real    ldexpl(real x, int exp) { return ldexp(cast(double) x, exp); }
 
     ///
     double  log(double x);
     ///
     float   logf(float x);
-    //real    logl(real x);
+    ///
+    real    logl(real x) { return log(cast(double) x); }
 
     ///
     double  log10(double x);
     ///
     float   log10f(float x);
-    //real    log10l(real x);
+    ///
+    real    log10l(real x) { return log10(cast(double) x); }
 
     ///
     double  log1p(double x);
     ///
     float   log1pf(float x);
-    //real    log1pl(real x);
+    ///
+    real    log1pl(real x) { return log1p(cast(double) x); }
 
-    // Added since Lollipop
+    ///
     double  log2(double x);
-    //float   log2f(float x);
-    //real    log2l(real x);
+    ///
+    float   log2f(float x);
+    ///
+    real    log2l(real x) { return log2(cast(double) x); }
 
     ///
     double  logb(double x);
     ///
     float   logbf(float x);
     ///
-    real    logbl(real x) { return logb(x); }
+    real    logbl(real x) { return logb(cast(double) x); }
 
     ///
-    double  modf(double value, double* iptr);
+    pure double  modf(double value, double* iptr);
     ///
-    float   modff(float value, float* iptr);
+    pure float   modff(float value, float* iptr);
     ///
-    real    modfl(real value, real *iptr) { return modf(value, cast(double*)iptr); }
+    pure real    modfl(real value, real *iptr) { return modf(cast(double) value, cast(double*) iptr); }
 
     ///
     double  scalbn(double x, int n);
     ///
     float   scalbnf(float x, int n);
     ///
-    real    scalbnl(real x, int n);
+    real    scalbnl(real x, int n) { return scalbln(cast(double) x, n); }
 
     ///
     double  scalbln(double x, c_long n);
     ///
     float   scalblnf(float x, c_long n);
-    // alias for double: real    scalblnl(real x, c_long n);
+    ///
+    real    scalblnl(real x, c_long n) { return scalbln(cast(double) x, n); }
 
     ///
-    double  cbrt(double x);
+    pure double  cbrt(double x);
     ///
-    float   cbrtf(float x);
+    pure float   cbrtf(float x);
     ///
-    real    cbrtl(real x) { return cbrt(x); }
+    pure real    cbrtl(real x) { return cbrt(cast(double) x); }
 
     ///
-    double  fabs(double x);
+    pure double  fabs(double x);
     ///
-    float   fabsf(float x);
-    // alias for double: real    fabsl(real x);
+    pure float   fabsf(float x);
+    ///
+    pure real    fabsl(real x) { return fabs(cast(double) x); }
 
     ///
     double  hypot(double x, double y);
     ///
     float   hypotf(float x, float y);
-    //real    hypotl(real x, real y);
+    ///
+    real    hypotl(real x, real y) { return hypot(cast(double) x, cast(double) y); }
 
     ///
     double  pow(double x, double y);
     ///
     float   powf(float x, float y);
-    //real    powl(real x, real y);
+    ///
+    real    powl(real x, real y) { return pow(cast(double) x, cast(double) y); }
 
     ///
     double  sqrt(double x);
     ///
     float   sqrtf(float x);
-    //real    sqrtl(real x);
+    ///
+    real    sqrtl(real x) { return sqrt(cast(double) x); }
 
     ///
-    double  erf(double x);
+    pure double  erf(double x);
     ///
-    float   erff(float x);
-    //real    erfl(real x);
+    pure float   erff(float x);
+    ///
+    pure real    erfl(real x) { return erf(cast(double) x); }
 
     ///
     double  erfc(double x);
     ///
     float   erfcf(float x);
-    //real    erfcl(real x);
+    ///
+    real    erfcl(real x) { return erfc(cast(double) x); }
 
     ///
     double  lgamma(double x);
     ///
     float   lgammaf(float x);
-    //real    lgammal(real x);
+    ///
+    real    lgammal(real x) { return lgamma(cast(double) x); }
 
     ///
     double  tgamma(double x);
-    //float   tgammaf(float x);
-    //real    tgammal(real x);
+    ///
+    float   tgammaf(float x);
+    ///
+    real    tgammal(real x) { return tgamma(cast(double) x); }
 
     ///
-    double  ceil(double x);
+    pure double  ceil(double x);
     ///
-    float   ceilf(float x);
-    // alias for double: real    ceill(real x);
+    pure float   ceilf(float x);
+    ///
+    pure real    ceill(real x) { return ceil(cast(double) x); }
 
     ///
-    double  floor(double x);
+    pure double  floor(double x);
+    ///
+    pure float   floorf(float x);
     ///
-    float   floorf(float x);
-    // alias for double: real    floorl(real x);
+    pure real    floorl(real x) { return floor(cast(double) x); }
 
     ///
-    double  nearbyint(double x);
+    pure double  nearbyint(double x);
     ///
-    float   nearbyintf(float x);
+    pure float   nearbyintf(float x);
     ///
-    real    nearbyintl(real x) { return nearbyint(x); }
+    pure real    nearbyintl(real x) { return nearbyint(cast(double) x); }
 
     ///
-    double  rint(double x);
+    pure double  rint(double x);
     ///
-    float   rintf(float x);
-    //real    rintl(real x);
+    pure float   rintf(float x);
+    ///
+    pure real    rintl(real x) { return rint(cast(double) x); }
 
     ///
     c_long  lrint(double x);
     ///
     c_long  lrintf(float x);
-    //c_long  lrintl(real x);
+    ///
+    c_long  lrintl(real x) { return lrint(cast(double) x); }
 
     ///
     long    llrint(double x);
     ///
     long    llrintf(float x);
-    //long    llrintl(real x);
+    ///
+    long    llrintl(real x) { return llrint(cast(double) x); }
 
     ///
-    double  round(double x);
+    pure double  round(double x);
     ///
-    float   roundf(float x);
+    pure float   roundf(float x);
     ///
-    real    roundl(real x) { return round(x); }
+    pure real    roundl(real x) { return round(cast(double) x); }
 
     ///
     c_long  lround(double x);
     ///
     c_long  lroundf(float x);
-    // alias for double: c_long  lroundl(real x);
+    ///
+    c_long  lroundl(real x) { return lround(cast(double) x); }
 
     ///
     long    llround(double x);
     ///
     long    llroundf(float x);
     ///
-    long    llroundl(real x) { return llround(x); }
+    long    llroundl(real x) { return llround(cast(double) x); }
 
     ///
-    double  trunc(double x);
+    pure double  trunc(double x);
     ///
-    float   truncf(float x);
+    pure float   truncf(float x);
     ///
-    real    truncl(real x) { return trunc(x); }
+    pure real    truncl(real x) { return trunc(cast(double) x); }
 
     ///
     double  fmod(double x, double y);
     ///
     float   fmodf(float x, float y);
     ///
-    real    fmodl(real x, real y) { return fmod(x,y); }
+    real    fmodl(real x, real y) { return fmod(cast(double) x, cast(double) y); }
 
     ///
     double  remainder(double x, double y);
     ///
     float   remainderf(float x, float y);
     ///
-    real    remainderl(real x, real y) { return remainder(x,y); }
+    real    remainderl(real x, real y) { return remainder(cast(double) x, cast(double) y); }
 
     ///
     double  remquo(double x, double y, int* quo);
     ///
     float   remquof(float x, float y, int* quo);
     ///
-    real    remquol(real x, real y, int* quo) { return remquo(x,y,quo); }
+    real    remquol(real x, real y, int* quo) { return remquo(cast(double) x, cast(double) y, quo); }
 
     ///
-    double  copysign(double x, double y);
+    pure double  copysign(double x, double y);
+    ///
+    pure float   copysignf(float x, float y);
     ///
-    float   copysignf(float x, float y);
-    // alias for double: real    copysignl(real x, real y);
+    pure real    copysignl(real x, real y) { return copysign(cast(double) x, cast(double) y); }
 
-    //double  nan(char* tagp);
-    //float   nanf(char* tagp);
-    //real    nanl(char* tagp);
+    ///
+    pure double  nan(char* tagp);
+    ///
+    pure float   nanf(char* tagp);
+    ///
+    pure real    nanl(char* tagp) { return nan(tagp); }
 
     ///
     double  nextafter(double x, double y);
     ///
     float   nextafterf(float x, float y);
-    // alias for double: real    nextafterl(real x, real y);
+    ///
+    real    nextafterl(real x, real y) { return nextafter(cast(double) x, cast(double) y); }
 
     ///
-    double  nexttoward(double x, double y);
+    double  nexttoward(double x, real y);
+    ///
+    float   nexttowardf(float x, real y);
     ///
-    float   nexttowardf(float x, double y);
-    // alias for double: real    nexttowardl(real x, real y);
+    real    nexttowardl(real x, real y) { return nexttoward(cast(double) x, cast(double) y); }
 
     ///
     double  fdim(double x, double y);
     ///
     float   fdimf(float x, float y);
-    // alias for double: real    fdiml(real x, real y);
+    ///
+    real    fdiml(real x, real y) { return fdim(cast(double) x, cast(double) y); }
 
     ///
-    double  fmax(double x, double y);
+    pure double  fmax(double x, double y);
+    ///
+    pure float   fmaxf(float x, float y);
     ///
-    float   fmaxf(float x, float y);
-    // alias for double: real    fmaxl(real x, real y);
+    pure real    fmaxl(real x, real y) { return fmax(cast(double) x, cast(double) y); }
 
     ///
-    double  fmin(double x, double y);
+    pure double  fmin(double x, double y);
     ///
-    float   fminf(float x, float y);
-    // alias for double: real    fminl(real x, real y);
+    pure float   fminf(float x, float y);
+    ///
+    pure real    fminl(real x, real y) { return fmin(cast(double) x, cast(double) y); }
 
     ///
-    double  fma(double x, double y, double z);
+    pure double  fma(double x, double y, double z);
+    ///
+    pure float   fmaf(float x, float y, float z);
     ///
-    float   fmaf(float x, float y, float z);
-    // alias for double: real    fmal(real x, real y, real z);
+    pure real    fmal(real x, real y, real z) { return fma(cast(double) x, cast(double) y, cast(double) z); }
 }
 else
 {
@@ -3352,11 +4397,11 @@ else
     real    asinl(real x);
 
     ///
-    double  atan(double x);
+    pure double  atan(double x);
     ///
-    float   atanf(float x);
+    pure float   atanf(float x);
     ///
-    real    atanl(real x);
+    pure real    atanl(real x);
 
     ///
     double  atan2(double y, double x);
@@ -3366,25 +4411,25 @@ else
     real    atan2l(real y, real x);
 
     ///
-    double  cos(double x);
+    pure double  cos(double x);
     ///
-    float   cosf(float x);
+    pure float   cosf(float x);
     ///
-    real    cosl(real x);
+    pure real    cosl(real x);
 
     ///
-    double  sin(double x);
+    pure double  sin(double x);
     ///
-    float   sinf(float x);
+    pure float   sinf(float x);
     ///
-    real    sinl(real x);
+    pure real    sinl(real x);
 
     ///
-    double  tan(double x);
+    pure double  tan(double x);
     ///
-    float   tanf(float x);
+    pure float   tanf(float x);
     ///
-    real    tanl(real x);
+    pure real    tanl(real x);
 
     ///
     double  acosh(double x);
@@ -3394,11 +4439,11 @@ else
     real    acoshl(real x);
 
     ///
-    double  asinh(double x);
+    pure double  asinh(double x);
     ///
-    float   asinhf(float x);
+    pure float   asinhf(float x);
     ///
-    real    asinhl(real x);
+    pure real    asinhl(real x);
 
     ///
     double  atanh(double x);
@@ -3422,11 +4467,11 @@ else
     real    sinhl(real x);
 
     ///
-    double  tanh(double x);
+    pure double  tanh(double x);
     ///
-    float   tanhf(float x);
+    pure float   tanhf(float x);
     ///
-    real    tanhl(real x);
+    pure real    tanhl(real x);
 
     ///
     double  exp(double x);
@@ -3450,11 +4495,11 @@ else
     real    expm1l(real x);
 
     ///
-    double  frexp(double value, int* exp);
+    pure double  frexp(double value, int* exp);
     ///
-    float   frexpf(float value, int* exp);
+    pure float   frexpf(float value, int* exp);
     ///
-    real    frexpl(real value, int* exp);
+    pure real    frexpl(real value, int* exp);
 
     ///
     int     ilogb(double x);
@@ -3506,11 +4551,11 @@ else
     real    logbl(real x);
 
     ///
-    double  modf(double value, double* iptr);
+    pure double  modf(double value, double* iptr);
     ///
-    float   modff(float value, float* iptr);
+    pure float   modff(float value, float* iptr);
     ///
-    real    modfl(real value, real *iptr);
+    pure real    modfl(real value, real *iptr);
 
     ///
     double  scalbn(double x, int n);
@@ -3527,23 +4572,23 @@ else
     real    scalblnl(real x, c_long n);
 
     ///
-    double  cbrt(double x);
+    pure double  cbrt(double x);
     ///
-    float   cbrtf(float x);
+    pure float   cbrtf(float x);
     ///
-    real    cbrtl(real x);
+    pure real    cbrtl(real x);
 
     ///
-    double  fabs(double x);
+    pure double  fabs(double x);
     version( CRuntime_Microsoft )
     {
     }
     else
     {
         ///
-        float   fabsf(float x);
+        pure float   fabsf(float x);
         ///
-        real    fabsl(real x);
+        pure real    fabsl(real x);
     }
 
     ///
@@ -3568,11 +4613,11 @@ else
     real    sqrtl(real x);
 
     ///
-    double  erf(double x);
+    pure double  erf(double x);
     ///
-    float   erff(float x);
+    pure float   erff(float x);
     ///
-    real    erfl(real x);
+    pure real    erfl(real x);
 
     ///
     double  erfc(double x);
@@ -3596,32 +4641,32 @@ else
     real    tgammal(real x);
 
     ///
-    double  ceil(double x);
+    pure double  ceil(double x);
     ///
-    float   ceilf(float x);
+    pure float   ceilf(float x);
     ///
-    real    ceill(real x);
+    pure real    ceill(real x);
 
     ///
-    double  floor(double x);
+    pure double  floor(double x);
     ///
-    float   floorf(float x);
+    pure float   floorf(float x);
     ///
-    real    floorl(real x);
+    pure real    floorl(real x);
 
     ///
-    double  nearbyint(double x);
+    pure double  nearbyint(double x);
     ///
-    float   nearbyintf(float x);
+    pure float   nearbyintf(float x);
     ///
-    real    nearbyintl(real x);
+    pure real    nearbyintl(real x);
 
     ///
-    double  rint(double x);
+    pure double  rint(double x);
     ///
-    float   rintf(float x);
+    pure float   rintf(float x);
     ///
-    real    rintl(real x);
+    pure real    rintl(real x);
 
     ///
     c_long  lrint(double x);
@@ -3638,11 +4683,11 @@ else
     long    llrintl(real x);
 
     ///
-    double  round(double x);
+    pure double  round(double x);
     ///
-    float   roundf(float x);
+    pure float   roundf(float x);
     ///
-    real    roundl(real x);
+    pure real    roundl(real x);
 
     ///
     c_long  lround(double x);
@@ -3659,11 +4704,11 @@ else
     long    llroundl(real x);
 
     ///
-    double  trunc(double x);
+    pure double  trunc(double x);
     ///
-    float   truncf(float x);
+    pure float   truncf(float x);
     ///
-    real    truncl(real x);
+    pure real    truncl(real x);
 
     ///
     double  fmod(double x, double y);
@@ -3687,18 +4732,18 @@ else
     real    remquol(real x, real y, int* quo);
 
     ///
-    double  copysign(double x, double y);
+    pure double  copysign(double x, double y);
     ///
-    float   copysignf(float x, float y);
+    pure float   copysignf(float x, float y);
     ///
-    real    copysignl(real x, real y);
+    pure real    copysignl(real x, real y);
 
     ///
-    double  nan(char* tagp);
+    pure double  nan(char* tagp);
     ///
-    float   nanf(char* tagp);
+    pure float   nanf(char* tagp);
     ///
-    real    nanl(char* tagp);
+    pure real    nanl(char* tagp);
 
     ///
     double  nextafter(double x, double y);
@@ -3722,23 +4767,23 @@ else
     real    fdiml(real x, real y);
 
     ///
-    double  fmax(double x, double y);
+    pure double  fmax(double x, double y);
     ///
-    float   fmaxf(float x, float y);
+    pure float   fmaxf(float x, float y);
     ///
-    real    fmaxl(real x, real y);
+    pure real    fmaxl(real x, real y);
 
     ///
-    double  fmin(double x, double y);
+    pure double  fmin(double x, double y);
     ///
-    float   fminf(float x, float y);
+    pure float   fminf(float x, float y);
     ///
-    real    fminl(real x, real y);
+    pure real    fminl(real x, real y);
 
     ///
-    double  fma(double x, double y, double z);
+    pure double  fma(double x, double y, double z);
     ///
-    float   fmaf(float x, float y, float z);
+    pure float   fmaf(float x, float y, float z);
     ///
-    real    fmal(real x, real y, real z);
+    pure real    fmal(real x, real y, real z);
 }
diff --git a/libphobos/libdruntime/core/stdc/stdarg.d b/libphobos/libdruntime/core/stdc/stdarg.d
index 667e7be25..c70fc0292 100644
--- a/libphobos/libdruntime/core/stdc/stdarg.d
+++ b/libphobos/libdruntime/core/stdc/stdarg.d
@@ -4,7 +4,7 @@
  * $(C_HEADER_DESCRIPTION pubs.opengroup.org/onlinepubs/009695399/basedefs/_stdarg.h.html, _stdarg.h)
  *
  * Copyright: Copyright Digital Mars 2000 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Walter Bright, Hauke Duden
  * Standards: ISO/IEC 9899:1999 (E)
  * Source: $(DRUNTIMESRC core/stdc/_stdarg.d)
diff --git a/libphobos/libdruntime/core/stdc/stddef.d b/libphobos/libdruntime/core/stdc/stddef.d
index 5dcaa8985..4b268f509 100644
--- a/libphobos/libdruntime/core/stdc/stddef.d
+++ b/libphobos/libdruntime/core/stdc/stddef.d
@@ -19,6 +19,9 @@ extern (C):
 nothrow:
 @nogc:
 
+///
+alias nullptr_t = typeof(null);
+
 // size_t and ptrdiff_t are defined in the object module.
 
 version( Windows )
diff --git a/libphobos/libdruntime/core/stdc/stdint.d b/libphobos/libdruntime/core/stdc/stdint.d
index f69447cd0..ae60f7f8c 100644
--- a/libphobos/libdruntime/core/stdc/stdint.d
+++ b/libphobos/libdruntime/core/stdc/stdint.d
@@ -3,7 +3,7 @@
  *
  * $(C_HEADER_DESCRIPTION pubs.opengroup.org/onlinepubs/009695399/basedefs/_stdint.h.html, _stdint.h)
  *
- * Copyright: Copyright Sean Kelly 2005 - 2009.
+ * Copyright: Copyright Sean Kelly 2005 - 2018
  * License: Distributed under the
  *      $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost Software License 1.0).
  *    (See accompanying file LICENSE)
@@ -12,13 +12,9 @@
  * Standards: ISO/IEC 9899:1999 (E)
  */
 
-/* NOTE: This file has been patched from the original DMD distribution to
- * work with the GDC compiler.
- */
 module core.stdc.stdint;
 
-version(GNU) import gcc.builtins;
-
+private import core.stdc.config;
 private import core.stdc.stddef; // for wchar_t
 private import core.stdc.signal; // for sig_atomic_t
 private import core.stdc.wchar_; // for wint_t
@@ -32,92 +28,200 @@ extern (C):
 nothrow:
 @nogc:
 
-///
-alias int8_t  = byte ;
-///
-alias int16_t = short;
-///
-alias int32_t = int  ;
-///
-alias int64_t = long ;
-///
-static if (is(ucent))
-    alias int128_t = cent;
 
-///
-alias uint8_t  = ubyte ;
-///
-alias uint16_t = ushort;
-///
-alias uint32_t = uint  ;
-///
-alias uint64_t = ulong ;
-///
 static if (is(ucent))
-    alias uint128_t = ucent;
-
-///
-alias int_least8_t  = byte ;
-///
-alias int_least16_t = short;
-///
-alias int_least32_t = int  ;
-///
-alias int_least64_t = long ;
-
-///
-alias uint_least8_t  = ubyte ;
-///
-alias uint_least16_t = ushort;
-///
-alias uint_least32_t = uint  ;
-///
-alias uint_least64_t = ulong ;
-
-///
-alias int_fast8_t  = byte;
-///
-alias int_fast16_t = int ;
-///
-alias int_fast32_t = int ;
-///
-alias int_fast64_t = long;
-
-///
-alias uint_fast8_t  = ubyte;
-///
-alias uint_fast16_t = uint ;
-///
-alias uint_fast32_t = uint ;
-///
-alias uint_fast64_t = ulong;
+{
+    alias int128_t = cent;   ///
+    alias uint128_t = ucent; ///
+}
 
-version( GNU )
+version (Win32)
+{
+    alias int8_t   = byte;      ///
+    alias int16_t  = short;     ///
+    alias uint8_t  = ubyte;     ///
+    alias uint16_t = ushort;    ///
+    alias int32_t  = cpp_long;  ///
+    alias uint32_t = cpp_ulong; ///
+    alias int64_t  = long;      ///
+    alias uint64_t = ulong;     ///
+
+    alias int_least8_t   = byte;      ///
+    alias uint_least8_t  = ubyte;     ///
+    alias int_least16_t  = short;     ///
+    alias uint_least16_t = ushort;    ///
+    alias int_least32_t  = cpp_long;  ///
+    alias uint_least32_t = cpp_ulong; ///
+    alias int_least64_t  = long;      ///
+    alias uint_least64_t = ulong;     ///
+
+    alias int_fast8_t   = byte;      ///
+    alias uint_fast8_t  = ubyte;     ///
+    alias int_fast16_t  = int;       ///
+    alias uint_fast16_t = uint;      ///
+    alias int_fast32_t  = cpp_long;  ///
+    alias uint_fast32_t = cpp_ulong; ///
+    alias int_fast64_t  = long;      ///
+    alias uint_fast64_t = ulong;     ///
+
+    alias intptr_t  = int;   ///
+    alias uintptr_t = uint;  ///
+    alias intmax_t  = long;  ///
+    alias uintmax_t = ulong; ///
+}
+else version (Win64)
 {
-    ///
-    alias intptr_t = __builtin_pointer_int;
-    ///
-    alias uintptr_t = __builtin_pointer_uint;
+    alias int8_t   = byte;   ///
+    alias int16_t  = short;  ///
+    alias uint8_t  = ubyte;  ///
+    alias uint16_t = ushort; ///
+    alias int32_t  = int;    ///
+    alias uint32_t = uint;   ///
+    alias int64_t  = long;   ///
+    alias uint64_t = ulong;  ///
+
+    alias int_least8_t   = byte;   ///
+    alias uint_least8_t  = ubyte;  ///
+    alias int_least16_t  = short;  ///
+    alias uint_least16_t = ushort; ///
+    alias int_least32_t  = int;    ///
+    alias uint_least32_t = uint;   ///
+    alias int_least64_t  = long;   ///
+    alias uint_least64_t = ulong;  ///
+
+    alias int_fast8_t   = char;  ///
+    alias uint_fast8_t  = ubyte; ///
+    alias int_fast16_t  = int;   ///
+    alias uint_fast16_t = uint;  ///
+    alias int_fast32_t  = int;   ///
+    alias uint_fast32_t = uint;  ///
+    alias int_fast64_t  = long;  ///
+    alias uint_fast64_t = ulong; ///
+
+    alias intptr_t  = long;  ///
+    alias uintptr_t = ulong; ///
+    alias intmax_t  = long;  ///
+    alias uintmax_t = ulong; ///
 }
-else version( D_LP64 )
+else version (OSX)
 {
-    ///
-    alias intptr_t  = long ;
-    ///
-    alias uintptr_t = ulong;
+    alias int8_t   = byte;   ///
+    alias int16_t  = short;  ///
+    alias uint8_t  = ubyte;  ///
+    alias uint16_t = ushort; ///
+    alias int32_t  = int;    ///
+    alias uint32_t = uint;   ///
+    alias int64_t  = cpp_longlong;  ///
+    alias uint64_t = cpp_ulonglong; ///
+
+    alias int_least8_t   = byte;   ///
+    alias uint_least8_t  = ubyte;  ///
+    alias int_least16_t  = short;  ///
+    alias uint_least16_t = ushort; ///
+    alias int_least32_t  = int;    ///
+    alias uint_least32_t = uint;   ///
+    alias int_least64_t  = int64_t;  ///
+    alias uint_least64_t = uint64_t; ///
+
+    alias int_fast8_t   = byte;  ///
+    alias uint_fast8_t  = ubyte; ///
+    alias int_fast16_t  = short;  ///
+    alias uint_fast16_t = ushort; ///
+    alias int_fast32_t  = int;   ///
+    alias uint_fast32_t = uint;  ///
+    alias int_fast64_t  = int64_t;  ///
+    alias uint_fast64_t = uint64_t; ///
+
+    alias intptr_t  = cpp_long;  ///
+    alias uintptr_t = cpp_ulong; ///
+    version (D_LP64)
+    {
+        alias intmax_t  = cpp_long;  ///
+        alias uintmax_t = cpp_ulong; ///
+    }
+    else
+    {
+        alias intmax_t  = long;  ///
+        alias uintmax_t = ulong; ///
+    }
+}
+else version (Posix)
+{
+    version (D_LP64)
+    {
+        alias int8_t   = byte;      ///
+        alias int16_t  = short;     ///
+        alias uint8_t  = ubyte;     ///
+        alias uint16_t = ushort;    ///
+        alias int32_t  = int;       ///
+        alias uint32_t = uint;      ///
+        alias int64_t  = cpp_long;  ///
+        alias uint64_t = cpp_ulong; ///
+
+        alias int_least8_t   = byte;      ///
+        alias uint_least8_t  = ubyte;     ///
+        alias int_least16_t  = short;     ///
+        alias uint_least16_t = ushort;    ///
+        alias int_least32_t  = int;       ///
+        alias uint_least32_t = uint;      ///
+        alias int_least64_t  = cpp_long;  ///
+        alias uint_least64_t = cpp_ulong; ///
+
+        alias int_fast8_t   = byte;      ///
+        alias uint_fast8_t  = ubyte;     ///
+        alias int_fast16_t  = cpp_long;  ///
+        alias uint_fast16_t = cpp_ulong; ///
+        alias int_fast32_t  = cpp_long;  ///
+        alias uint_fast32_t = cpp_ulong; ///
+        alias int_fast64_t  = cpp_long;  ///
+        alias uint_fast64_t = cpp_ulong; ///
+
+        alias intptr_t  = cpp_long;  ///
+        alias uintptr_t = cpp_ulong; ///
+        alias intmax_t  = cpp_long;  ///
+        alias uintmax_t = cpp_ulong; ///
+    }
+    else
+    {
+        alias int8_t   = byte;   ///
+        alias int16_t  = short;  ///
+        alias uint8_t  = ubyte;  ///
+        alias uint16_t = ushort; ///
+        alias int32_t  = int;    ///
+        alias uint32_t = uint;   ///
+        alias int64_t  = long;   ///
+        alias uint64_t = ulong;  ///
+
+        alias int_least8_t   = byte;   ///
+        alias uint_least8_t  = ubyte;  ///
+        alias int_least16_t  = short;  ///
+        alias uint_least16_t = ushort; ///
+        alias int_least32_t  = int;    ///
+        alias uint_least32_t = uint;   ///
+        alias int_least64_t  = long;   ///
+        alias uint_least64_t = ulong;  ///
+
+        alias int_fast8_t   = byte;  ///
+        alias uint_fast8_t  = ubyte; ///
+        alias int_fast16_t  = int;   ///
+        alias uint_fast16_t = uint;  ///
+        alias int_fast32_t  = int;   ///
+        alias uint_fast32_t = uint;  ///
+        alias int_fast64_t  = long;  ///
+        alias uint_fast64_t = ulong; ///
+
+        alias intptr_t  = int ;  ///
+        alias uintptr_t = uint;  ///
+        alias intmax_t  = long;  ///
+        alias uintmax_t = ulong; ///
+    }
 }
 else
 {
-    ///
-    alias intptr_t  = int ;
-    ///
-    alias uintptr_t = uint;
+    static assert(0);
 }
 
-///
-alias intmax_t  = long ;
-///
-alias uintmax_t = ulong;
+
 
 ///
 enum int8_t   INT8_MIN  = int8_t.min;
diff --git a/libphobos/libdruntime/core/stdc/stdio.d b/libphobos/libdruntime/core/stdc/stdio.d
index 7e1476f0e..94d9acedc 100644
--- a/libphobos/libdruntime/core/stdc/stdio.d
+++ b/libphobos/libdruntime/core/stdc/stdio.d
@@ -1,5 +1,5 @@
 /**
- * D header file for C99.
+ * D header file for C99 <stdio.h>
  *
  * $(C_HEADER_DESCRIPTION pubs.opengroup.org/onlinepubs/009695399/basedefs/_stdio.h.html, _stdio.h)
  *
@@ -9,7 +9,7 @@
  *    (See accompanying file LICENSE)
  * Authors:   Sean Kelly,
  *            Alex Rønne Petersen
- * Source:    $(DRUNTIMESRC core/stdc/_stdio.d)
+ * Source:    https://github.com/dlang/druntime/blob/master/src/core/stdc/stdio.d
  * Standards: ISO/IEC 9899:1999 (E)
  */
 
@@ -42,6 +42,10 @@ private
   {
     import core.sys.posix.sys.types;
   }
+  version (DragonFlyBSD)
+  {
+    import core.sys.posix.sys.types;
+  }
 }
 
 extern (C):
@@ -121,6 +125,24 @@ else version( CRuntime_Glibc )
         L_tmpnam     = 20
     }
 }
+else version( CRuntime_Musl )
+{
+    enum
+    {
+        ///
+        BUFSIZ       = 1024,
+        ///
+        EOF          = -1,
+        ///
+        FOPEN_MAX    = 1000,
+        ///
+        FILENAME_MAX = 4096,
+        ///
+        TMP_MAX      = 10000,
+        ///
+        L_tmpnam     = 20
+    }
+}
 else version( Darwin )
 {
     enum
@@ -243,6 +265,45 @@ else version ( OpenBSD )
         long        __mbstateL;
     }
 }
+else version ( DragonFlyBSD )
+{
+    enum
+    {
+        BUFSIZ       = 1024,
+        EOF          = -1,
+        FOPEN_MAX    = 20,
+        FILENAME_MAX = 1024,
+        TMP_MAX      = 308915776,
+        L_tmpnam     = 1024
+    }
+
+    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
+        int              s_error;       // current error code
+        ssize_t          s_size;        // size of storage buffer
+        ssize_t          s_len;         // current length of string
+        int              s_flags;       // flags
+        ssize_t          s_sect_len;    // current length of section
+    };
+
+    enum {
+        SBUF_FIXEDLEN   = 0x00000000,   // fixed length buffer (default)
+        SBUF_AUTOEXTEND = 0x00000001,   // automatically extend buffer
+        SBUF_USRFLAGMSK = 0x0000ffff,   // mask of flags the user may specify
+        SBUF_DYNAMIC    = 0x00010000,   // s_buf must be freed
+        SBUF_FINISHED   = 0x00020000,   // set by sbuf_finish()
+        SBUF_DYNSTRUCT  = 0x00080000,   // sbuf must be freed
+        SBUF_INSECTION  = 0x00100000,   // set by sbuf_start_section()
+    }
+
+    union __mbstate_t                   // <sys/stdint.h>
+    {
+        char[128]   _mbstate8;
+        long        _mbstateL;
+    }
+}
 else version (Solaris)
 {
     enum
@@ -292,6 +353,24 @@ else version( CRuntime_Bionic )
         int _size;
     }
 }
+else version( CRuntime_UClibc )
+{
+    enum
+    {
+        ///
+        BUFSIZ       = 4096,
+        ///
+        EOF          = -1,
+        ///
+        FOPEN_MAX    = 16,
+        ///
+        FILENAME_MAX = 4095,
+        ///
+        TMP_MAX      = 238328,
+        ///
+        L_tmpnam     = 20
+    }
+}
 else
 {
     static assert( false, "Unsupported platform" );
@@ -383,6 +462,20 @@ else version( CRuntime_Glibc )
     ///
     alias shared(_IO_FILE) FILE;
 }
+else version( CRuntime_Musl )
+{
+    union fpos_t
+    {
+        char[16] __opaque;
+        double __align;
+    }
+    struct _IO_FILE;
+
+    ///
+    alias _IO_FILE _iobuf; // needed for phobos
+    ///
+    alias shared(_IO_FILE) FILE;
+}
 else version( Darwin )
 {
     ///
@@ -551,6 +644,24 @@ else version( OpenBSD )
     ///
     alias shared(__sFILE) FILE;
 }
+else version( DragonFlyBSD )
+{
+    alias off_t fpos_t;
+
+    /// See /usr/include/stdio.h
+    struct __FILE_public
+    {
+        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() */
+        ssize_t         _w;             /* write space left for putc() */
+        ssize_t         _lbfsize;       /* 0 or -_bf._size, for inline putc */
+    }
+
+    alias __FILE_public _iobuf;
+    alias shared(__FILE_public) FILE;
+}
 else version (Solaris)
 {
     import core.stdc.wchar_ : __mbstate_t;
@@ -639,6 +750,59 @@ else version( CRuntime_Bionic )
     ///
     alias shared(__sFILE) FILE;
 }
+else version( CRuntime_UClibc )
+{
+    import core.stdc.wchar_ : mbstate_t;
+    import core.stdc.stddef : wchar_t;
+    import core.sys.posix.sys.types : ssize_t, pthread_mutex_t;
+
+    alias long off_t;
+
+    ///
+    struct fpos_t
+    {
+        off_t __pos;
+        mbstate_t __state;
+        int __mblen_pending;
+    }
+
+    struct _IO_cookie_io_functions_t
+    {
+       ssize_t function(void* __cookie, char* __buf, size_t __bufsize)          read;
+       ssize_t function(void* __cookie, const char* __buf, size_t __bufsize)    write;
+       int function(void* __cookie, off_t* __pos, int __whence)                 seek;
+       int function(void* __cookie)                                             close;
+    }
+
+    alias _IO_cookie_io_functions_t cookie_io_functions_t;
+
+    ///
+    struct __STDIO_FILE_STRUCT
+    {
+        ushort __modeflags;
+        char[2] __ungot_width;
+        int __filedes;
+        char* __bufstart;
+        char* __bufend;
+        char* __bufpos;
+        char* __bufread;
+        char* __bufgetc_u;
+        char*__bufputc_u;
+        __STDIO_FILE_STRUCT* __nextopen;
+        void *__cookie;
+        _IO_cookie_io_functions_t __gcs;
+        wchar_t[2] __ungot;
+        mbstate_t __state;
+        void *__unused;
+        int __user_locking;
+        pthread_mutex_t __lock;
+    }
+
+    ///
+    alias __STDIO_FILE_STRUCT _iobuf;
+    ///
+    alias shared(__STDIO_FILE_STRUCT) FILE;
+}
 else
 {
     static assert( false, "Unsupported platform" );
@@ -705,15 +869,15 @@ version( CRuntime_DigitalMars )
     private extern shared FILE[_NFILE] _iob;
 
     ///
-    shared stdin  = &_iob[0];
+    enum stdin  = &_iob[0];
     ///
-    shared stdout = &_iob[1];
+    enum stdout = &_iob[1];
     ///
-    shared stderr = &_iob[2];
+    enum stderr = &_iob[2];
     ///
-    shared stdaux = &_iob[3];
+    enum stdaux = &_iob[3];
     ///
-    shared stdprn = &_iob[4];
+    enum stdprn = &_iob[4];
 }
 else version( CRuntime_Microsoft )
 {
@@ -832,9 +996,9 @@ else version( NetBSD )
     }
 
     private extern __gshared FILE[3] __sF;
-    @property auto __stdin() { return &__sF[0]; }
-    @property auto __stdout() { return &__sF[1]; }
-    @property auto __stderr() { return &__sF[2]; }
+    @property auto __stdin()() { return &__sF[0]; }
+    @property auto __stdout()() { return &__sF[1]; }
+    @property auto __stderr()() { return &__sF[2]; }
     ///
     alias __stdin stdin;
     ///
@@ -863,6 +1027,23 @@ else version( OpenBSD )
     ///
     shared stderr = &__sF[2];
 }
+else version( DragonFlyBSD )
+{
+    enum
+    {
+        _IOFBF = 0,
+        _IOLBF = 1,
+        _IONBF = 2,
+    }
+
+    private extern shared FILE* __stdinp;
+    private extern shared FILE* __stdoutp;
+    private extern shared FILE* __stderrp;
+
+    alias __stdinp  stdin;
+    alias __stdoutp stdout;
+    alias __stderrp stderr;
+}
 else version (Solaris)
 {
     enum
@@ -917,6 +1098,43 @@ else version( CRuntime_Bionic )
     ///
     shared stderr = &__sF[2];
 }
+else version( CRuntime_Musl )
+{
+    // needs tail const
+    extern shared FILE* stdin;
+    ///
+    extern shared FILE* stdout;
+    ///
+    extern shared FILE* stderr;
+    enum
+    {
+        ///
+        _IOFBF = 0,
+        ///
+        _IOLBF = 1,
+        ///
+        _IONBF = 2,
+    }
+}
+else version( CRuntime_UClibc )
+{
+    enum
+    {
+        ///
+        _IOFBF = 0,
+        ///
+        _IOLBF = 1,
+        ///
+        _IONBF = 2,
+    }
+
+    ///
+    extern shared FILE* stdin;
+    ///
+    extern shared FILE* stdout;
+    ///
+    extern shared FILE* stderr;
+}
 else
 {
     static assert( false, "Unsupported platform" );
@@ -1066,13 +1284,13 @@ int   puts(scope const char* s);
 extern (D) @trusted
 {
     ///
-    int getchar()                 { return getc(stdin);     }
+    int getchar()()                 { return getc(stdin);     }
     ///
-    int putchar(int c)            { return putc(c,stdout);  }
+    int putchar()(int c)            { return putc(c,stdout);  }
     ///
-    int getc(FILE* stream)        { return fgetc(stream);   }
+    int getc()(FILE* stream)        { return fgetc(stream);   }
     ///
-    int putc(int c, FILE* stream) { return fputc(c,stream); }
+    int putc()(int c, FILE* stream) { return fputc(c,stream); }
 }
 
 ///
@@ -1102,14 +1320,14 @@ version( MinGW )
   // No unsafe pointer manipulation.
   extern (D) @trusted
   {
-      ///
-    void rewind(FILE* stream)   { fseek(stream,0L,SEEK_SET); stream._flag = stream._flag & ~_IOERR; }
     ///
-    pure void clearerr(FILE* stream) { stream._flag = stream._flag & ~(_IOERR|_IOEOF);                 }
+    void rewind()(FILE* stream)   { fseek(stream,0L,SEEK_SET); stream._flag = stream._flag & ~_IOERR; }
+    ///
+    pure void clearerr()(FILE* stream) { stream._flag = stream._flag & ~(_IOERR|_IOEOF); }
     ///
-    pure int  feof(FILE* stream)     { return stream._flag&_IOEOF;                       }
+    pure int  feof()(FILE* stream)     { return stream._flag&_IOEOF; }
     ///
-    pure int  ferror(FILE* stream)   { return stream._flag&_IOERR;                       }
+    pure int  ferror()(FILE* stream)   { return stream._flag&_IOERR; }
   }
   ///
     int   __mingw_snprintf(scope char* s, size_t n, scope const char* fmt, ...);
@@ -1130,16 +1348,16 @@ else version( CRuntime_DigitalMars )
   // No unsafe pointer manipulation.
   extern (D) @trusted
   {
-      ///
-    void rewind(FILE* stream)   { fseek(stream,0L,SEEK_SET); stream._flag= stream._flag & ~_IOERR; }
     ///
-    pure void clearerr(FILE* stream) { stream._flag = stream._flag & ~(_IOERR|_IOEOF);                 }
+    void rewind()(FILE* stream)   { fseek(stream,0L,SEEK_SET); stream._flag= stream._flag & ~_IOERR; }
     ///
-    pure int  feof(FILE* stream)     { return stream._flag&_IOEOF;                       }
+    pure void clearerr()(FILE* stream) { stream._flag = stream._flag & ~(_IOERR|_IOEOF); }
     ///
-    pure int  ferror(FILE* stream)   { return stream._flag&_IOERR;                       }
+    pure int  feof()(FILE* stream)     { return stream._flag&_IOEOF; }
     ///
-    pure int  fileno(FILE* stream)   { return stream._file;                              }
+    pure int  ferror()(FILE* stream)   { return stream._flag&_IOERR; }
+    ///
+    pure int  fileno()(FILE* stream)   { return stream._file; }
   }
   ///
     int   _snprintf(scope char* s, size_t n, scope const char* fmt, ...);
@@ -1156,7 +1374,7 @@ else version( CRuntime_Microsoft )
   // No unsafe pointer manipulation.
   @trusted
   {
-      ///
+    ///
     void rewind(FILE* stream);
     ///
     pure void clearerr(FILE* stream);
@@ -1168,7 +1386,7 @@ else version( CRuntime_Microsoft )
     pure int  fileno(FILE* stream);
   }
 
-  ///
+    ///
     int _snprintf(scope char* s, size_t n, scope const char* format, ...);
     ///
     int  snprintf(scope char* s, size_t n, scope const char* format, ...);
@@ -1198,7 +1416,7 @@ else version( CRuntime_Glibc )
   // No unsafe pointer manipulation.
   @trusted
   {
-      ///
+    ///
     void rewind(FILE* stream);
     ///
     pure void clearerr(FILE* stream);
@@ -1210,7 +1428,7 @@ else version( CRuntime_Glibc )
     int  fileno(FILE *);
   }
 
-  ///
+    ///
     int  snprintf(scope char* s, size_t n, scope const char* format, ...);
     ///
     int  vsnprintf(scope char* s, size_t n, scope const char* format, va_list arg);
@@ -1220,7 +1438,7 @@ else version( Darwin )
   // No unsafe pointer manipulation.
   @trusted
   {
-      ///
+    ///
     void rewind(FILE*);
     ///
     pure void clearerr(FILE*);
@@ -1232,7 +1450,7 @@ else version( Darwin )
     int  fileno(FILE*);
   }
 
-  ///
+    ///
     int  snprintf(scope char* s, size_t n, scope const char* format, ...);
     ///
     int  vsnprintf(scope char* s, size_t n, scope const char* format, va_list arg);
@@ -1242,7 +1460,7 @@ else version( FreeBSD )
   // No unsafe pointer manipulation.
   @trusted
   {
-      ///
+    ///
     void rewind(FILE*);
     ///
     pure void clearerr(FILE*);
@@ -1254,7 +1472,7 @@ else version( FreeBSD )
     int  fileno(FILE*);
   }
 
-  ///
+    ///
     int  snprintf(scope char* s, size_t n, scope const char* format, ...);
     ///
     int  vsnprintf(scope char* s, size_t n, scope const char* format, va_list arg);
@@ -1264,7 +1482,7 @@ else version( NetBSD )
   // No unsafe pointer manipulation.
   @trusted
   {
-      ///
+    ///
     void rewind(FILE*);
     ///
     pure void clearerr(FILE*);
@@ -1276,7 +1494,7 @@ else version( NetBSD )
     int  fileno(FILE*);
   }
 
-  ///
+    ///
     int  snprintf(char* s, size_t n, in char* format, ...);
     ///
     int  vsnprintf(char* s, size_t n, in char* format, va_list arg);
@@ -1326,42 +1544,42 @@ else version( OpenBSD )
 
     extern (D)
     {
-        void __sclearerr(FILE* p)
+        void __sclearerr()(FILE* p)
         {
             p._flags &= ~(__SERR|__SEOF);
         }
 
-        int __sfeof(FILE* p)
+        int __sfeof()(FILE* p)
         {
             return (p._flags & __SEOF) != 0;
         }
 
-        int __sferror(FILE* p)
+        int __sferror()(FILE* p)
         {
             return (p._flags & __SERR) != 0;
         }
 
-        int __sfileno(FILE* p)
+        int __sfileno()(FILE* p)
         {
             return p._file;
         }
 
-        int clearerr(FILE* file)
+        int clearerr()(FILE* file)
         {
             return !__isthreaded ? __sclearerr(file) : __clearerr(file);
         }
 
-        int feof(FILE* file)
+        int feof()(FILE* file)
         {
             return !__isthreaded ? __sfeof(file) : __feof(file);
         }
 
-        int ferror(FILE* file)
+        int ferror()(FILE* file)
         {
             return !__isthreaded ? __sferror(file) : __ferror(file);
         }
 
-        int fileno(FILE* file)
+        int fileno()(FILE* file)
         {
             return !__isthreaded ? __sfileno(file) : __fileno(file);
         }
@@ -1372,12 +1590,43 @@ else version( OpenBSD )
     ///
     int  vsnprintf(scope char* s, size_t n, scope const char* format, va_list arg);
 }
+else version( DragonFlyBSD )
+{
+  // No unsafe pointer manipulation.
+  @trusted
+  {
+    void rewind(FILE*);
+    pure void clearerr(FILE*);
+    pure int  feof(FILE*);
+    pure int  ferror(FILE*);
+    int  fileno(FILE*);
+  }
+  enum __SLBF = 0x0001;
+  enum __SNBF = 0x0002;
+  enum __SRD  = 0x0004;
+  enum __SWR  = 0x0008;
+  enum __SRW  = 0x0010;
+  enum __SEOF = 0x0020;
+  enum __SERR = 0x0040;
+  enum __SMBF = 0x0080;
+  enum __SAPP = 0x0100;
+  enum __SSTR = 0x0200;
+  enum __SOPT = 0x0400;
+  enum __SNPT = 0x0800;
+  enum __SOFF = 0x1000;
+  enum __SMOD = 0x2000;
+  enum __SALC = 0x4000;
+  enum __SIGN = 0x8000;
+
+  int  snprintf(scope char* s, size_t n, scope const char* format, ...);
+  int  vsnprintf(scope char* s, size_t n, scope const char* format, va_list arg);
+}
 else version (Solaris)
 {
   // No unsafe pointer manipulation.
   @trusted
   {
-      ///
+    ///
     void rewind(FILE*);
     ///
     pure void clearerr(FILE*);
@@ -1389,7 +1638,7 @@ else version (Solaris)
     int  fileno(FILE*);
   }
 
-  ///
+    ///
     int  snprintf(scope char* s, size_t n, scope const char* format, ...);
     ///
     int  vsnprintf(scope char* s, size_t n, scope const char* format, va_list arg);
@@ -1399,7 +1648,7 @@ else version( CRuntime_Bionic )
   // No unsafe pointer manipulation.
   @trusted
   {
-      ///
+    ///
     void rewind(FILE*);
     ///
     pure void clearerr(FILE*);
@@ -1416,6 +1665,52 @@ else version( CRuntime_Bionic )
     ///
     int  vsnprintf(scope char* s, size_t n, scope const char* format, va_list arg);
 }
+else version( CRuntime_Musl )
+{
+    import core.sys.posix.sys.types : off_t;
+    ///
+    int fseeko(FILE *, off_t, int);
+    @trusted
+    {
+        ///
+        void rewind(FILE* stream);
+        ///
+        pure void clearerr(FILE* stream);
+        ///
+        pure int  feof(FILE* stream);
+        ///
+        pure int  ferror(FILE* stream);
+        ///
+        int  fileno(FILE *);
+    }
+
+    ///
+    int snprintf(scope char* s, size_t n, scope const char* format, ...);
+    ///
+    int vsnprintf(scope char* s, size_t n, scope const char* format, va_list arg);
+}
+else version( CRuntime_UClibc )
+{
+  // No unsafe pointer manipulation.
+  @trusted
+  {
+    ///
+    void rewind(FILE* stream);
+    ///
+    pure void clearerr(FILE* stream);
+    ///
+    pure int  feof(FILE* stream);
+    ///
+    pure int  ferror(FILE* stream);
+    ///
+    int  fileno(FILE *);
+  }
+
+    ///
+    int  snprintf(scope char* s, size_t n, scope const char* format, ...);
+    ///
+    int  vsnprintf(scope char* s, size_t n, scope const char* format, va_list arg);
+}
 else
 {
     static assert( false, "Unsupported platform" );
@@ -1455,7 +1750,7 @@ version(CRuntime_DigitalMars)
     private void _ReleaseSemaphore(int iSemaphore);
 
     // this is copied from semlock.h in DMC's runtime.
-    private void LockSemaphore(uint num)
+    private void LockSemaphore()(uint num)
     {
         asm nothrow @nogc
         {
@@ -1472,7 +1767,7 @@ version(CRuntime_DigitalMars)
     }
 
     // this is copied from semlock.h in DMC's runtime.
-    private void UnlockSemaphore(uint num)
+    private void UnlockSemaphore()(uint num)
     {
         asm nothrow @nogc
         {
@@ -1490,7 +1785,7 @@ version(CRuntime_DigitalMars)
 
     // This converts a HANDLE to a file descriptor in DMC's runtime
     ///
-    int _handleToFD(HANDLE h, int flags)
+    int _handleToFD()(HANDLE h, int flags)
     {
         LockSemaphore(_semIO);
         scope(exit) UnlockSemaphore(_semIO);
@@ -1509,7 +1804,7 @@ version(CRuntime_DigitalMars)
     }
 
     ///
-    HANDLE _fdToHandle(int fd)
+    HANDLE _fdToHandle()(int fd)
     {
         // no semaphore is required, once inserted, a file descriptor
         // doesn't change.
diff --git a/libphobos/libdruntime/core/stdc/stdlib.d b/libphobos/libdruntime/core/stdc/stdlib.d
index f3b8a7b7f..86da1df7c 100644
--- a/libphobos/libdruntime/core/stdc/stdlib.d
+++ b/libphobos/libdruntime/core/stdc/stdlib.d
@@ -29,19 +29,32 @@ else version (WatchOS)
 extern (C):
 @system:
 
-/* Placed outside @nogc in order to not constrain what the callback does.
+/* Placed outside `nothrow` and `@nogc` in order to not constrain what the callback does.
  */
 ///
-alias int function(scope const void*, scope const void*) _compare_fp_t;
-///
-inout(void)* bsearch(scope const void* key, scope inout(void)* base, size_t nmemb, size_t size, _compare_fp_t compar);
-///
-void    qsort(scope void* base, size_t nmemb, size_t size, _compare_fp_t compar);
-
+alias _compare_fp_t = int function(const void*, const void*);
 
 nothrow:
 @nogc:
 
+///
+inout(void)* bsearch(const void* key, inout(void)* base, size_t nmemb, size_t size, _compare_fp_t compar);
+///
+void    qsort(void* base, size_t nmemb, size_t size, _compare_fp_t compar);
+
+// https://issues.dlang.org/show_bug.cgi?id=17188
+@system unittest
+{
+    struct S
+    {
+        extern(C) static int cmp(const void*, const void*) { return 0; }
+    }
+    int[4] arr;
+    qsort(arr.ptr, arr[0].sizeof, arr.length, &S.cmp);
+    int key;
+    bsearch(&key, arr.ptr, arr[0].sizeof, arr.length, &S.cmp);
+}
+
 ///
 struct div_t
 {
@@ -74,11 +87,14 @@ enum MB_CUR_MAX   = 1;
 version(Windows)      enum RAND_MAX = 0x7fff;
 else version(CRuntime_Glibc)  enum RAND_MAX = 0x7fffffff;
 else version(Darwin)  enum RAND_MAX = 0x7fffffff;
-else version(FreeBSD) enum RAND_MAX = 0x7fffffff;
+else version(FreeBSD) enum RAND_MAX = 0x7ffffffd;
 else version(NetBSD)  enum RAND_MAX = 0x7fffffff;
 else version(OpenBSD) enum RAND_MAX = 0x7fffffff;
+else version(DragonFlyBSD) enum RAND_MAX = 0x7fffffff;
 else version(Solaris) enum RAND_MAX = 0x7fff;
 else version(CRuntime_Bionic) enum RAND_MAX = 0x7fffffff;
+else version(CRuntime_Musl) enum RAND_MAX = 0x7fffffff;
+else version(CRuntime_UClibc) enum RAND_MAX = 0x7fffffff;
 else static assert( false, "Unsupported platform" );
 
 ///
@@ -119,38 +135,19 @@ else version (MinGW)
     ///
     alias __mingw_strtold strtold;
 }
-else version (CRuntime_Bionic)
-{
-    ///
-    real strtold(scope inout(char)* nptr, scope inout(char)** endptr)
-    {   // Fake it again till we make it
-        return strtod(nptr, endptr);
-    }
-}
 else
 {
-    ///
+    /// Added to Bionic since Lollipop.
     real strtold(scope inout(char)* nptr, scope inout(char)** endptr);
 }
 
 // No unsafe pointer manipulation.
 @trusted
 {
-    version(CRuntime_Bionic)
-    {
-       import core.sys.posix.stdlib: lrand48, srand48;
-       ///
-       alias core.sys.posix.stdlib.lrand48 rand;
-       ///
-       alias core.sys.posix.stdlib.srand48 srand;
-    }
-    else
-    {
-        ///
-       int     rand();
-       ///
-       void    srand(uint seed);
-    }
+    /// These two were added to Bionic in Lollipop.
+    int     rand();
+    ///
+    void    srand(uint seed);
 }
 
 // We don't mark these @trusted. Given that they return a void*, one has
@@ -219,6 +216,11 @@ else version( GNU )
 {
     void* alloca(size_t size) pure; // compiler intrinsic
 }
+else version( LDC )
+{
+    pragma(LDC_alloca)
+    void* alloca(size_t size) pure;
+}
 
 version( CRuntime_Microsoft )
 {
diff --git a/libphobos/libdruntime/core/stdc/string.d b/libphobos/libdruntime/core/stdc/string.d
index 8135cfe9b..b7660d8f8 100644
--- a/libphobos/libdruntime/core/stdc/string.d
+++ b/libphobos/libdruntime/core/stdc/string.d
@@ -97,6 +97,10 @@ else version (OpenBSD)
 {
     int strerror_r(int errnum, scope char* buf, size_t buflen);
 }
+else version (DragonFlyBSD)
+{
+    int strerror_r(int errnum, scope char* buf, size_t buflen);
+}
 else version (Solaris)
 {
     int strerror_r(int errnum, scope char* buf, size_t buflen);
@@ -106,6 +110,16 @@ else version (CRuntime_Bionic)
     ///
     int strerror_r(int errnum, scope char* buf, size_t buflen);
 }
+else version (CRuntime_Musl)
+{
+    ///
+    int strerror_r(int errnum, scope char *buf, size_t buflen);
+}
+else version (CRuntime_UClibc)
+{
+    ///
+    const(char)* strerror_r(int errnum, return char* buf, size_t buflen);
+}
 ///
 pure size_t strlen(scope const char* s);
 ///
diff --git a/libphobos/libdruntime/core/stdc/time.d b/libphobos/libdruntime/core/stdc/time.d
index 4325ca342..baccf6bff 100644
--- a/libphobos/libdruntime/core/stdc/time.d
+++ b/libphobos/libdruntime/core/stdc/time.d
@@ -82,38 +82,66 @@ else version ( Windows )
 version( Windows )
 {
     enum clock_t CLOCKS_PER_SEC = 1000;
+    clock_t clock();
 }
 else version( OSX )
 {
-    enum clock_t CLOCKS_PER_SEC = 100;
+    enum clock_t CLOCKS_PER_SEC = 1_000_000; // was 100 until OSX 10.4/10.5
+    version (X86)
+        extern (C) pragma(mangle, "clock$UNIX2003") clock_t clock();
+    else
+        clock_t clock();
 }
 else version( Darwin ) // other Darwins (iOS, TVOS, WatchOS)
 {
     enum clock_t CLOCKS_PER_SEC = 1_000_000;
+    clock_t clock();
 }
 else version( FreeBSD )
 {
     enum clock_t CLOCKS_PER_SEC = 128;
+    clock_t clock();
 }
 else version( NetBSD )
 {
     enum clock_t CLOCKS_PER_SEC = 100;
+    clock_t clock();
 }
 else version( OpenBSD )
 {
     enum clock_t CLOCKS_PER_SEC = 100;
+    clock_t clock();
+}
+else version( DragonFlyBSD )
+{
+    enum clock_t CLOCKS_PER_SEC = 128;
+    clock_t clock();
 }
 else version (CRuntime_Glibc)
 {
     enum clock_t CLOCKS_PER_SEC = 1_000_000;
+    clock_t clock();
+}
+else version (CRuntime_Musl)
+{
+    enum clock_t CLOCKS_PER_SEC = 1_000_000;
+    clock_t clock();
 }
 else version (CRuntime_Bionic)
 {
     enum clock_t CLOCKS_PER_SEC = 1_000_000;
+    clock_t clock();
+}
+else version (CRuntime_UClibc)
+{
+    enum clock_t CLOCKS_PER_SEC = 1_000_000;
+    clock_t clock();
+}
+else
+{
+    static assert(0, "unsupported system");
 }
 
-///
-clock_t clock();
 ///
 double  difftime(time_t time1, time_t time0);
 ///
@@ -180,6 +208,13 @@ else version( OpenBSD )
     ///
     extern __gshared const(char)*[2] tzname; // non-standard
 }
+else version( DragonFlyBSD )
+{
+    ///
+    void tzset();                            // non-standard
+    ///
+    extern __gshared const(char)*[2] tzname; // non-standard
+}
 else version (Solaris)
 {
     ///
@@ -194,6 +229,20 @@ else version( CRuntime_Bionic )
     ///
     extern __gshared const(char)*[2] tzname;
 }
+else version( CRuntime_Musl )
+{
+    ///
+    void tzset();                            // non-standard
+    ///
+    extern __gshared const(char)*[2] tzname; // non-standard
+}
+else version( CRuntime_UClibc )
+{
+    ///
+    void tzset();
+    ///
+    extern __gshared const(char)*[2] tzname;
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/stdc/wchar_.d b/libphobos/libdruntime/core/stdc/wchar_.d
index a4a1a0f1c..39bae22b2 100644
--- a/libphobos/libdruntime/core/stdc/wchar_.d
+++ b/libphobos/libdruntime/core/stdc/wchar_.d
@@ -67,6 +67,15 @@ else version (Solaris)
         }
     }
 }
+else version( CRuntime_UClibc )
+{
+    ///
+    struct mbstate_t
+    {
+        wchar_t __mask;
+        wchar_t __wc;
+    }
+}
 else
 {
     ///
@@ -179,48 +188,48 @@ c_ulong wcstoul(in wchar_t* nptr, wchar_t** endptr, int base);
 ulong   wcstoull(in wchar_t* nptr, wchar_t** endptr, int base);
 
 ///
-wchar_t* wcscpy(wchar_t* s1, in wchar_t* s2);
+pure wchar_t* wcscpy(return wchar_t* s1, scope const wchar_t* s2);
 ///
-wchar_t* wcsncpy(wchar_t* s1, in wchar_t* s2, size_t n);
+pure wchar_t* wcsncpy(return wchar_t* s1, scope const wchar_t* s2, size_t n);
 ///
-wchar_t* wcscat(wchar_t* s1, in wchar_t* s2);
+pure wchar_t* wcscat(return wchar_t* s1, scope const wchar_t* s2);
 ///
-wchar_t* wcsncat(wchar_t* s1, in wchar_t* s2, size_t n);
+pure wchar_t* wcsncat(return wchar_t* s1, scope const wchar_t* s2, size_t n);
 ///
-int      wcscmp(in wchar_t* s1, in wchar_t* s2);
+pure int wcscmp(scope const wchar_t* s1, scope const wchar_t* s2);
 ///
-int      wcscoll(in wchar_t* s1, in wchar_t* s2);
+int      wcscoll(scope const wchar_t* s1, scope const wchar_t* s2);
 ///
-int      wcsncmp(in wchar_t* s1, in wchar_t* s2, size_t n);
+pure int wcsncmp(scope const wchar_t* s1, scope const wchar_t* s2, size_t n);
 ///
-size_t   wcsxfrm(wchar_t* s1, in wchar_t* s2, size_t n);
+size_t   wcsxfrm(scope wchar_t* s1, scope const wchar_t* s2, size_t n);
 ///
-wchar_t* wcschr(in wchar_t* s, wchar_t c);
+pure inout(wchar_t)* wcschr(return inout(wchar_t)* s, wchar_t c);
 ///
-size_t   wcscspn(in wchar_t* s1, in wchar_t* s2);
+pure size_t wcscspn(scope const wchar_t* s1, scope const wchar_t* s2);
 ///
-wchar_t* wcspbrk(in wchar_t* s1, in wchar_t* s2);
+pure inout(wchar_t)* wcspbrk(return inout(wchar_t)* s1, scope const wchar_t* s2);
 ///
-wchar_t* wcsrchr(in wchar_t* s, wchar_t c);
+pure inout(wchar_t)* wcsrchr(return inout(wchar_t)* s, wchar_t c);
 ///
-size_t   wcsspn(in wchar_t* s1, in wchar_t* s2);
+pure size_t wcsspn(scope const wchar_t* s1, scope const wchar_t* s2);
 ///
-wchar_t* wcsstr(in wchar_t* s1, in wchar_t* s2);
+pure inout(wchar_t)* wcsstr(return inout(wchar_t)* s1, scope const wchar_t* s2);
 ///
-wchar_t* wcstok(wchar_t* s1, in wchar_t* s2, wchar_t** ptr);
+wchar_t* wcstok(return wchar_t* s1, scope const wchar_t* s2, wchar_t** ptr);
 ///
-size_t   wcslen(in wchar_t* s);
+pure size_t wcslen(scope const wchar_t* s);
 
 ///
-wchar_t* wmemchr(in wchar_t* s, wchar_t c, size_t n);
+pure wchar_t* wmemchr(return const wchar_t* s, wchar_t c, size_t n);
 ///
-int      wmemcmp(in wchar_t* s1, in wchar_t* s2, size_t n);
+pure int      wmemcmp(scope const wchar_t* s1, scope const wchar_t* s2, size_t n);
 ///
-wchar_t* wmemcpy(wchar_t* s1, in wchar_t* s2, size_t n);
+pure wchar_t* wmemcpy(return wchar_t* s1, scope const wchar_t* s2, size_t n);
 ///
-wchar_t* wmemmove(wchar_t*s1, in wchar_t* s2, size_t n);
+pure wchar_t* wmemmove(return wchar_t* s1, scope const wchar_t* s2, size_t n);
 ///
-wchar_t* wmemset(wchar_t* s, wchar_t c, size_t n);
+pure wchar_t* wmemset(return wchar_t* s, wchar_t c, size_t n);
 
 ///
 size_t wcsftime(wchar_t* s, size_t maxsize, in wchar_t* format, in tm* timeptr);
diff --git a/libphobos/libdruntime/core/stdcpp/exception.d b/libphobos/libdruntime/core/stdcpp/exception.d
index 7e02eb2da..1a54ccc4d 100644
--- a/libphobos/libdruntime/core/stdcpp/exception.d
+++ b/libphobos/libdruntime/core/stdcpp/exception.d
@@ -4,8 +4,8 @@
  * Interface to C++ <exception>
  *
  * Copyright: Copyright (c) 2016 D Language Foundation
- * License:   $(WEB boost.org/LICENSE_1_0.txt, Boost License 1.0).
- * Authors:   $(WEB digitalmars.com, Walter Bright)
+ * License:   $(HTTP boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * Authors:   $(HTTP digitalmars.com, Walter Bright)
  * Source:    $(DRUNTIMESRC core/stdcpp/_exception.d)
  */
 
@@ -59,7 +59,6 @@ else version (CRuntime_Glibc)
         terminate_handler set_terminate(terminate_handler f) nothrow;
         void terminate();
 
-        void unexpected();
         pure bool uncaught_exception();
 
         class exception
diff --git a/libphobos/libdruntime/core/stdcpp/typeinfo.d b/libphobos/libdruntime/core/stdcpp/typeinfo.d
index 5dc3e18a7..085b10b74 100644
--- a/libphobos/libdruntime/core/stdcpp/typeinfo.d
+++ b/libphobos/libdruntime/core/stdcpp/typeinfo.d
@@ -4,8 +4,8 @@
  * Interface to C++ <typeinfo>
  *
  * Copyright: Copyright (c) 2016 D Language Foundation
- * License:   $(WEB boost.org/LICENSE_1_0.txt, Boost License 1.0).
- * Authors:   $(WEB digitalmars.com, Walter Bright)
+ * License:   $(HTTP boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * Authors:   $(HTTP digitalmars.com, Walter Bright)
  * Source:    $(DRUNTIMESRC core/stdcpp/_typeinfo.d)
  */
 
diff --git a/libphobos/libdruntime/core/sys/darwin/dlfcn.d b/libphobos/libdruntime/core/sys/darwin/dlfcn.d
index 6666769bb..c22424f3b 100644
--- a/libphobos/libdruntime/core/sys/darwin/dlfcn.d
+++ b/libphobos/libdruntime/core/sys/darwin/dlfcn.d
@@ -4,7 +4,7 @@
  * $(LINK2 https://opensource.apple.com/source/dyld/dyld-360.22/include/dlfcn.h, Apple dyld/dlfcn.h)
  *
  * Copyright: Copyright David Nadlinger 2016.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   David Nadlinger
  */
 module core.sys.darwin.dlfcn;
diff --git a/libphobos/libdruntime/core/sys/darwin/mach/dyld.d b/libphobos/libdruntime/core/sys/darwin/mach/dyld.d
index 487ccc88e..cee31a444 100644
--- a/libphobos/libdruntime/core/sys/darwin/mach/dyld.d
+++ b/libphobos/libdruntime/core/sys/darwin/mach/dyld.d
@@ -1,6 +1,6 @@
 /**
  * Copyright: Copyright Digital Mars 2010.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Jacob Carlborg
  * Version: Initial created: Feb 20, 2010
  */
diff --git a/libphobos/libdruntime/core/sys/darwin/mach/getsect.d b/libphobos/libdruntime/core/sys/darwin/mach/getsect.d
index c5e77d48c..e6dbf5fec 100644
--- a/libphobos/libdruntime/core/sys/darwin/mach/getsect.d
+++ b/libphobos/libdruntime/core/sys/darwin/mach/getsect.d
@@ -1,18 +1,347 @@
 /**
- * Copyright: Copyright Digital Mars 2010.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * D header file for $(LINK2 https://opensource.apple.com/source/cctools/cctools-895/include/mach-o/getsect.h.auto.html, mach-o/getsect.h).
+ *
+ * Copyright: Copyright Digital Mars 2010-2018.
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Jacob Carlborg
  * Version: Initial created: Mar 16, 2010
- */
-
-/*          Copyright Digital Mars 2010.
- * Distributed under the Boost Software License, Version 1.0.
- *    (See accompanying file LICENSE or copy at
- *          http://www.boost.org/LICENSE_1_0.txt)
+ * Source: $(DRUNTIMESRC core/sys/darwin/mach/_getsect.d)
  */
 module core.sys.darwin.mach.getsect;
 
-version (OSX)
+extern (C):
+nothrow:
+@nogc:
+
+version (CoreDdoc)
+{
+    import core.stdc.config : c_ulong;
+
+    /**
+     * In reality this will be $(REF mach_header, core, sys, darwin, mach, loader)
+     * on 32-bit platforms and $(REF mach_header_64, core, sys, darwin, mach, loader)
+     * 64-bit platforms.
+     */
+    struct MachHeader;
+
+    /**
+     * In reality this will be $(REF segment_command, core, sys, darwin, mach, loader)
+     * on 32-bit platforms and $(REF segment_command_64, core, sys, darwin, mach, loader)
+     * 64-bit platforms.
+     */
+    struct SegmentCommand;
+
+    /**
+     * In reality this will be $(REF section, core, sys, darwin, mach, loader)
+     * on 32-bit platforms and $(REF section_64, core, sys, darwin, mach, loader)
+     * 64-bit platforms.
+     */
+    struct Section;
+
+    /**
+     * Returns the section data of section with the given section name.
+     *
+     * Returns the section data of the given section in the given segment in the
+     * mach executable it is linked into.
+     *
+     * ___
+     * void main()
+     * {
+     *      import core.sys.darwin.mach.getsect;
+     *      int size;
+     *      assert(getsectdata("__TEXT", "__text", &size));
+     *      assert(size > 0);
+     * }
+     * ___
+     *
+     * Params:
+     *  segname = the name of the segment
+     *  sectname = the name of the section
+     *  size = this will be set to the size of the section or 0 if the section
+     *      doesn't exist
+     *
+     * Returns: a pointer to the section data or `null` if it doesn't exist
+     */
+    char* getsectdata(
+        in char* segname,
+        in char* sectname,
+        c_ulong *size
+    );
+
+    /**
+     * Returns the section data of section with the given section name.
+     *
+     * Returns the section data of the given section in the given segment in the
+     * given framework.
+     *
+     * ___
+     * void main()
+     * {
+     *      import core.sys.darwin.mach.getsect;
+     *      int size;
+     *      assert(getsectdatafromFramework("Foundation", "__TEXT", "__text", &size));
+     *      assert(size > 0);
+     * }
+     * ___
+     *
+     * Params:
+     *  FrameworkName = the name of the framework to get the section data from
+     *  segname = the name of the segment
+     *  sectname = the name of the section
+     *  size = this will be set to the size of the section or 0 if the section
+     *      doesn't exist
+     *
+     * Returns: a pointer to the section data or `null` if it doesn't exist
+     */
+    char* getsectdatafromFramework(
+        in char* FrameworkName,
+        in char* segname,
+        in char* sectname,
+        c_ulong* size
+    );
+
+    ///
+    c_ulong get_end();
+
+    ///
+    c_ulong get_etext();
+
+    ///
+    c_ulong get_edata();
+
+    /**
+     * Returns the section with the given section name.
+     *
+     * Returns the section structure of the given section in the given segment
+     * in the mach executable it is linked into.
+     *
+     * ___
+     * void main()
+     * {
+     *      import core.sys.darwin.mach.getsect;
+     *      assert(getsectbyname("__TEXT", "__text"));
+     * }
+     * ___
+     *
+     * Params:
+     *  segname = the name of the segment
+     *  sectname = the name of the section
+     *
+     * Returns: a pointer to the section structure or `null` if it doesn't exist
+     */
+    const(Section)* getsectbyname(
+        in char* segname,
+        in char* sectname
+    );
+
+    /**
+     * Returns the section data of section with the given section name.
+     *
+     * Returns the section data of the given section in the given segment in the
+     * image pointed to by the given mach header.
+     *
+     * ___
+     * void main()
+     * {
+     *      import core.sys.darwin.mach.getsect;
+     *      import core.sys.darwin.crt_externs;
+     *
+     *      auto mph = _NSGetMachExecuteHeader();
+     *      int size;
+     *      assert(getsectdata(mph, "__TEXT", "__text", &size));
+     *      assert(size > 0);
+     * }
+     * ___
+     *
+     * Params:
+     *  mhp = the mach header to get the section data from
+     *  segname = the name of the segment
+     *  sectname = the name of the section
+     *  size = this will be set to the size of the section or 0 if the section
+     *      doesn't exist
+     *
+     * Returns: a pointer to the section data or `null` if it doesn't exist
+     */
+    ubyte* getsectiondata(
+        in MachHeader* mhp,
+        in char* segname,
+        in char* sectname,
+        c_ulong* size
+    );
+
+    /**
+     * Returns the segment with the given segment name.
+     *
+     * Returns the segment structure of the given segment in the mach executable
+     * it is linked into.
+     *
+     * ___
+     * void main()
+     * {
+     *      import core.sys.darwin.mach.getsect;
+     *      assert(getsegbyname("__TEXT"));
+     * }
+     * ___
+     *
+     * Params:
+     *  segname = the name of the segment
+     *
+     * Returns: a pointer to the section structure or `null` if it doesn't exist
+     */
+    const(SegmentCommand)* getsegbyname(
+        in char* segname
+    );
+
+    /**
+     * Returns the segment data of segment with the given segment name.
+     *
+     * Returns the segment data of the given segment in the image pointed to by
+     * the given mach header.
+     *
+     * ___
+     * void main()
+     * {
+     *      import core.sys.darwin.mach.getsect;
+     *      import core.sys.darwin.crt_externs;
+     *
+     *      auto mph = _NSGetMachExecuteHeader();
+     *      int size;
+     *      assert(getsegmentdata(mph, "__TEXT", &size));
+     *      assert(size > 0);
+     * }
+     * ___
+     *
+     * Params:
+     *  mhp = the mach header to get the section data from
+     *  segname = the name of the segment
+     *  size = this will be set to the size of the section or 0 if the section
+     *      doesn't exist
+     *
+     * Returns: a pointer to the section data or `null` if it doesn't exist
+     */
+    ubyte* getsegmentdata(
+        in MachHeader* mhp,
+        in char* segname,
+        c_ulong* size
+    );
+
+    struct mach_header;
+    struct mach_header_64;
+    struct section;
+    struct section_64;
+
+    /**
+     * Returns the section data of section with the given section name.
+     *
+     * Returns the section data of the given section in the given segment in the
+     * image pointed to by the given mach header.
+     *
+     * ___
+     * void main()
+     * {
+     *      import core.sys.darwin.mach.getsect;
+     *      import core.sys.darwin.crt_externs;
+     *
+     *      auto mph = _NSGetMachExecuteHeader();
+     *      int size;
+     *      assert(getsectdatafromheader(mph, "__TEXT", "__text", &size));
+     *      assert(size > 0);
+     * }
+     * ___
+     *
+     * Params:
+     *  mhp = the mach header to get the section data from
+     *  segname = the name of the segment
+     *  sectname = the name of the section
+     *  size = this will be set to the size of the section or 0 if the section
+     *      doesn't exist
+     *
+     * Returns: a pointer to the section data or `null` if it doesn't exist
+     */
+    ubyte* getsectdatafromheader(
+        in mach_header* mhp,
+        in char* segname,
+        in char* sectname,
+        c_ulong* size
+    );
+
+    /// ditto
+    ubyte* getsectdatafromheader_64(
+        in mach_header_64* mhp,
+        in char* segname,
+        in char* sectname,
+        c_ulong* size
+    );
+
+
+    /**
+     * Returns the section with the given section name.
+     *
+     * Returns the section structure of the given section in the given segment
+     * in image pointed to by the given mach header.
+     *
+     * ___
+     * void main()
+     * {
+     *      import core.sys.darwin.mach.getsect;
+     *      import core.sys.darwin.crt_externs;
+     *
+     *      auto mph = _NSGetMachExecuteHeader();
+     *      assert(getsectbynamefromheader(mph, "__TEXT", "__text"));
+     * }
+     * ___
+     *
+     * Params:
+     *  mhp = the mach header to get the section from
+     *  segname = the name of the segment
+     *  sectname = the name of the section
+     *
+     * Returns: a pointer to the section structure or `null` if it doesn't exist
+     */
+    const(section)* getsectbynamefromheader(
+        in mach_header* mhp,
+        in char* segname,
+        in char* sectname
+    );
+
+    /// ditto
+    const(section_64)* getsectbynamefromheader_64(
+        in mach_header_64* mhp,
+        in char* segname,
+        in char* sectname
+    );
+
+    /**
+     * Returns the section with the given section name.
+     *
+     * Returns the section structure of the given section in the given segment
+     * in image pointed to by the given mach header.
+     *
+     * Params:
+     *  mhp = the mach header to get the section from
+     *  segname = the name of the segment
+     *  sectname = the name of the section
+     *  fSwap = ?
+     *
+     * Returns: a pointer to the section structure or `null` if it doesn't exist
+     */
+    const(section)* getsectbynamefromheaderwithswap(
+        in mach_header* mhp,
+        in char* segname,
+        in char* section,
+        int fSwap
+    );
+
+    /// ditto
+    const(section)* getsectbynamefromheaderwithswap_64(
+        in mach_header_64* mhp,
+        in char* segname,
+        in char* section,
+        int fSwap
+    );
+}
+
+else version (OSX)
     version = Darwin;
 else version (iOS)
     version = Darwin;
@@ -22,12 +351,121 @@ else version (WatchOS)
     version = Darwin;
 
 version (Darwin):
-extern (C):
-nothrow:
-@nogc:
 
 public import core.sys.darwin.mach.loader;
 
-const(section)*    getsectbynamefromheader(in mach_header* mhp, in char* segname, in char* sectname);
-const(section_64)* getsectbynamefromheader_64(in mach_header_64* mhp, in char* segname, in char* sectname);
+import core.stdc.config : c_ulong;
+
+char* getsectdata(
+    in char* segname,
+    in char* sectname,
+    c_ulong *size
+);
+
+char* getsectdatafromFramework(
+    in char* FrameworkName,
+    in char* segname,
+    in char* sectname,
+    c_ulong* size
+);
+
+c_ulong get_end();
+c_ulong get_etext();
+c_ulong get_edata();
+
+// Runtime interfaces for 64-bit Mach-O programs.
+version (D_LP64)
+{
+    const(section_64)* getsectbyname(
+        in char* segname,
+        in char* sectname
+    );
+
+    ubyte* getsectiondata(
+        in mach_header_64* mhp,
+        in char* segname,
+        in char* sectname,
+        c_ulong* size
+    );
+
+    const(segment_command_64)* getsegbyname(
+        in char* segname
+    );
+
+    ubyte* getsegmentdata(
+        in mach_header_64* mhp,
+        in char* segname,
+        c_ulong* size
+    );
+}
+
+// Runtime interfaces for 32-bit Mach-O programs.
+else
+{
+    const(section)* getsectbyname(
+        in char* segname,
+        in char* sectname
+    );
+
+    ubyte* getsectiondata(
+        in mach_header* mhp,
+        in char* segname,
+        in char* sectname,
+        c_ulong* size
+    );
+
+    const(segment_command)* getsegbyname(
+        in char* segname
+    );
+
+    ubyte* getsegmentdata(
+        in mach_header* mhp,
+        in char* segname,
+        c_ulong* size
+    );
+}
+
+// Interfaces for tools working with 32-bit Mach-O files.
+
+ubyte* getsectdatafromheader(
+    in mach_header* mhp,
+    in char* segname,
+    in char* sectname,
+    c_ulong* size
+);
+
+const(section)* getsectbynamefromheader(
+    in mach_header* mhp,
+    in char* segname,
+    in char* sectname
+);
+
+const(section)* getsectbynamefromheaderwithswap(
+    in mach_header* mhp,
+    in char* segname,
+    in char* section,
+    int fSwap
+);
+
+// Interfaces for tools working with 64-bit Mach-O files.
+
+ubyte* getsectdatafromheader_64(
+    in mach_header_64* mhp,
+    in char* segname,
+    in char* sectname,
+    c_ulong* size
+);
+
+const(section_64)* getsectbynamefromheader_64(
+    in mach_header_64* mhp,
+    in char* segname,
+    in char* sectname
+);
+
+const(section)* getsectbynamefromheaderwithswap_64(
+    in mach_header_64* mhp,
+    in char* segname,
+    in char* section,
+    int fSwap
+);
 
diff --git a/libphobos/libdruntime/core/sys/darwin/mach/kern_return.d b/libphobos/libdruntime/core/sys/darwin/mach/kern_return.d
index e939c8788..3714e0171 100644
--- a/libphobos/libdruntime/core/sys/darwin/mach/kern_return.d
+++ b/libphobos/libdruntime/core/sys/darwin/mach/kern_return.d
@@ -2,7 +2,7 @@
  * D header file for Darwin.
  *
  * Copyright: Copyright Sean Kelly 2008 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  */
 
diff --git a/libphobos/libdruntime/core/sys/darwin/mach/loader.d b/libphobos/libdruntime/core/sys/darwin/mach/loader.d
index cf760a4b1..1254f3ff9 100644
--- a/libphobos/libdruntime/core/sys/darwin/mach/loader.d
+++ b/libphobos/libdruntime/core/sys/darwin/mach/loader.d
@@ -1,18 +1,292 @@
 /**
- * Copyright: Copyright Digital Mars 2010.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * Copyright: Copyright Digital Mars 2010-2018.
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Jacob Carlborg
- * Version: Initial created: Feb 20, 2010
- */
-
-/*          Copyright Digital Mars 2010.
- * Distributed under the Boost Software License, Version 1.0.
- *    (See accompanying file LICENSE or copy at
- *          http://www.boost.org/LICENSE_1_0.txt)
+ * Version: Initial created: Feb 20, 2010-2018
+ * Source: $(DRUNTIMESRC core/sys/darwin/mach/_loade.d)
  */
 module core.sys.darwin.mach.loader;
 
-version (OSX)
+version (CoreDdoc)
+{
+    /// Represents the header of a Mach-O file for 32-bit architecture.
+    struct mach_header
+    {
+        /// The mach magic number identifier.
+        uint magic;
+
+        /// CPU specifier.
+        int cputype;
+
+        /// Machine specifier.
+        int cpusubtype;
+
+        /// The type of the file.
+        uint filetype;
+
+        /// Number of load commands.
+        uint ncmds;
+
+        /// The size of all the load commands.
+        uint sizeofcmds;
+
+        /// Flags.
+        uint flags;
+    }
+
+    /// Represents the header of a Mach-O file for 64-bit architecture.
+    struct mach_header_64
+    {
+        /// The mach magic number identifier.
+        uint magic;
+
+        /// CPU specifier.
+        int cputype;
+
+        /// Machine specifier.
+        int cpusubtype;
+
+        /// The type of the file.
+        uint filetype;
+
+        /// Number of load commands.
+        uint ncmds;
+
+        /// The size of all the load commands.
+        uint sizeofcmds;
+
+        /// Flags.
+        uint flags;
+
+        /// Reserved.
+        uint reserved;
+    }
+
+    ///
+    enum MH_MAGIC : uint;
+
+    ///
+    enum MH_CIGAM : uint;
+
+    ///
+    enum MH_MAGIC_64 : uint;
+
+    ///
+    enum MH_CIGAM_64 : uint;
+
+    ///
+    enum SEG_PAGEZERO : string;
+
+    ///
+    enum SEG_TEXT : string;
+
+    ///
+    enum SECT_TEXT : string;
+
+    ///
+    enum SECT_FVMLIB_INIT0 : string;
+
+    ///
+    enum SECT_FVMLIB_INIT1 : string;
+
+    ///
+    enum SEG_DATA : string;
+
+    ///
+    enum SECT_DATA : string;
+
+    ///
+    enum SECT_BSS : string;
+
+    ///
+    enum SECT_COMMON : string;
+
+    ///
+    enum SEG_OBJC : string;
+
+    ///
+    enum SECT_OBJC_SYMBOLS : string;
+
+    ///
+    enum SECT_OBJC_MODULES : string;
+
+    ///
+    enum SECT_OBJC_STRINGS : string;
+
+    ///
+    enum SECT_OBJC_REFS : string;
+
+    ///
+    enum SEG_ICON : string;
+
+    ///
+    enum SECT_ICON_HEADER : string;
+
+    ///
+    enum SECT_ICON_TIFF : string;
+
+    ///
+    enum SEG_LINKEDIT : string;
+
+    ///
+    enum SEG_UNIXSTACK : string;
+
+    ///
+    enum SEG_IMPORT : string;
+
+    /// Represents a segment command in a Mach-O file for 32-bit architecture.
+    struct segment_command
+    {
+        /// Type of load command, i.e. `LC_SEGMENT`.
+        uint cmd;
+
+        /// The size of this segment, includes size of section structs.
+        uint cmdsize;
+
+        /// The name of this segment.
+        char[16] segname;
+
+        /// Memory address of this segment.
+        uint vmaddr;
+
+        /// Memory size of this segment.
+        uint vmsize;
+
+        /// File offset of this segment.
+        uint fileoff;
+
+        /// Amount to map from the file.
+        uint filesize;
+
+        /// Maximum VM protection.
+        int maxprot;
+
+        /// Initial VM protection.
+        int initprot;
+
+        /// Number of sections in this segment.
+        uint nsects;
+
+        /// Flags.
+        uint flags;
+    }
+
+    /// Represents a segment command in a Mach-O file for 64-bit architecture.
+    struct segment_command_64
+    {
+        /// Type of load command, i.e. `LC_SEGMENT`.
+        uint cmd;
+
+        /// The size of this segment, includes size of section structs.
+        uint cmdsize;
+
+        /// The name of this segment.
+        char[16] segname;
+
+        /// Memory address of this segment.
+        long vmaddr;
+
+        /// Memory size of this segment.
+        long vmsize;
+
+        /// File offset of this segment.
+        long fileoff;
+
+        /// Amount to map from the file.
+        long filesize;
+
+        /// Maximum VM protection.
+        int maxprot;
+
+        /// Initial VM protection.
+        int initprot;
+
+        /// Number of sections in this segment.
+        uint nsects;
+
+        /// Flags.
+        uint flags;
+    }
+
+    /// Represents a section in a Mach-O file for 32-bit architecture.
+    struct section
+    {
+        /// The name of this this section.
+        char[16] sectname;
+
+        /// The name of the segment this section belongs to.
+        char[16] segname;
+
+        /// The memory address of this section.
+        uint addr;
+
+        /// The size of this section in bytes.
+        uint size;
+
+        /// The file offset of this section.
+        uint offset;
+
+        /// The alignment (power of two) of this section.
+        uint align_;
+
+        /// The file offset of the relocation entries.
+        uint reloff;
+
+        /// The number of relocation entries.
+        uint nreloc;
+
+        /// Flags, section type and attributes.
+        uint flags;
+
+        /// Reserved.
+        uint reserved1;
+
+        /// Reserved.
+        uint reserved2;
+    }
+
+    /// Represents a section in a Mach-O file for 64-bit architecture.
+    struct section_64
+    {
+        /// The name of this this section.
+        char[16] sectname;
+
+        /// The name of the segment this section belongs to.
+        char[16] segname;
+
+        /// The memory address of this section.
+        ulong addr;
+
+        /// The size of this section in bytes.
+        ulong size;
+
+        /// The file offset of this section.
+        uint offset;
+
+        /// The alignment (power of two) of this section.
+        uint align_;
+
+        /// The file offset of the relocation entries.
+        uint reloff;
+
+        /// The number of relocation entries.
+        uint nreloc;
+
+        /// Flags, section type and attributes.
+        uint flags;
+
+        /// Reserved.
+        uint reserved1;
+
+        /// Reserved.
+        uint reserved2;
+
+        /// Reserved.
+        uint reserved3;
+    }
+}
+
+else version (OSX)
     version = Darwin;
 else version (iOS)
     version = Darwin;
@@ -73,6 +347,36 @@ enum SEG_LINKEDIT       = "__LINKEDIT";
 enum SEG_UNIXSTACK      = "__UNIXSTACK";
 enum SEG_IMPORT         = "__IMPORT";
 
+struct segment_command
+{
+    uint cmd;
+    uint cmdsize;
+    char[16] segname;
+    uint vmaddr;
+    uint vmsize;
+    uint fileoff;
+    uint filesize;
+    int maxprot;
+    int initprot;
+    uint nsects;
+    uint flags;
+}
+
+struct segment_command_64
+{
+    uint cmd;
+    uint cmdsize;
+    char[16] segname;
+    long vmaddr;
+    long vmsize;
+    long fileoff;
+    long filesize;
+    int maxprot;
+    int initprot;
+    uint nsects;
+    uint flags;
+}
+
 struct section
 {
     char[16] sectname;
diff --git a/libphobos/libdruntime/core/sys/darwin/mach/port.d b/libphobos/libdruntime/core/sys/darwin/mach/port.d
index 863a81349..c2eee826c 100644
--- a/libphobos/libdruntime/core/sys/darwin/mach/port.d
+++ b/libphobos/libdruntime/core/sys/darwin/mach/port.d
@@ -2,7 +2,7 @@
  * D header file for Darwin.
  *
  * Copyright: Copyright Sean Kelly 2008 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  */
 
diff --git a/libphobos/libdruntime/core/sys/darwin/mach/semaphore.d b/libphobos/libdruntime/core/sys/darwin/mach/semaphore.d
index 0151435a5..abaa26711 100644
--- a/libphobos/libdruntime/core/sys/darwin/mach/semaphore.d
+++ b/libphobos/libdruntime/core/sys/darwin/mach/semaphore.d
@@ -2,7 +2,7 @@
  * D header file for Darwin.
  *
  * Copyright: Copyright Sean Kelly 2008 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  */
 
diff --git a/libphobos/libdruntime/core/sys/darwin/mach/thread_act.d b/libphobos/libdruntime/core/sys/darwin/mach/thread_act.d
index b4e57d348..ef4c99b2c 100644
--- a/libphobos/libdruntime/core/sys/darwin/mach/thread_act.d
+++ b/libphobos/libdruntime/core/sys/darwin/mach/thread_act.d
@@ -2,7 +2,7 @@
  * D header file for Darwin.
  *
  * Copyright: Copyright Sean Kelly 2008 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  */
 
diff --git a/libphobos/libdruntime/core/sys/darwin/netinet/in_.d b/libphobos/libdruntime/core/sys/darwin/netinet/in_.d
new file mode 100644
index 000000000..a2f5ed004
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/darwin/netinet/in_.d
@@ -0,0 +1,611 @@
+//Written in the D programming language
+
+/++
+    D header file for Darwin's extensions to POSIX's netinet/in.h.
+
+    Copyright: Copyright 2017 -
+    License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+    Authors:   $(HTTP jmdavisprog.com, Jonathan M Davis)
+ +/
+module core.sys.darwin.netinet.in_;
+
+import core.sys.darwin.sys.cdefs;
+
+public import core.sys.posix.netinet.in_;
+
+version(OSX)
+    version = Darwin;
+else version(iOS)
+    version = Darwin;
+else version(TVOS)
+    version = Darwin;
+else version(WatchOS)
+    version = Darwin;
+
+version(Darwin):
+extern(C) nothrow @nogc:
+
+enum IPPROTO_IP = 0;
+static if (_DARWIN_C_SOURCE)
+    enum IPPROTO_HOPOPTS = 0;
+enum IPPROTO_ICMP = 1;
+static if (_DARWIN_C_SOURCE)
+{
+    enum IPPROTO_IGMP = 2;
+    enum IPPROTO_GGP  = 3;
+    enum IPPROTO_IPV4 = 4;
+    enum IPPROTO_IPIP = IPPROTO_IPV4;
+}
+enum IPPROTO_TCP = 6;
+static if (_DARWIN_C_SOURCE)
+{
+    enum IPPROTO_ST     = 7;
+    enum IPPROTO_EGP    = 8;
+    enum IPPROTO_PIGP   = 9;
+    enum IPPROTO_RCCMON = 10;
+    enum IPPROTO_NVPII  = 11;
+    enum IPPROTO_PUP    = 12;
+    enum IPPROTO_ARGUS  = 13;
+    enum IPPROTO_EMCON  = 14;
+    enum IPPROTO_XNET   = 15;
+    enum IPPROTO_CHAOS  = 16;
+}
+enum IPPROTO_UDP = 17;
+static if (_DARWIN_C_SOURCE)
+{
+    enum IPPROTO_MUX    = 18;
+    enum IPPROTO_MEAS   = 19;
+    enum IPPROTO_HMP    = 20;
+    enum IPPROTO_PRM    = 21;
+    enum IPPROTO_IDP    = 22;
+    enum IPPROTO_TRUNK1 = 23;
+    enum IPPROTO_TRUNK2 = 24;
+    enum IPPROTO_LEAF1  = 25;
+    enum IPPROTO_LEAF2  = 26;
+    enum IPPROTO_RDP    = 27;
+    enum IPPROTO_IRTP   = 28;
+    enum IPPROTO_TP     = 29;
+    enum IPPROTO_BLT    = 30;
+    enum IPPROTO_NSP    = 31;
+    enum IPPROTO_INP    = 32;
+    enum IPPROTO_SEP    = 33;
+    enum IPPROTO_3PC    = 34;
+    enum IPPROTO_IDPR   = 35;
+    enum IPPROTO_XTP    = 36;
+    enum IPPROTO_DDP    = 37;
+    enum IPPROTO_CMTP   = 38;
+    enum IPPROTO_TPXX   = 39;
+    enum IPPROTO_IL     = 40;
+}
+enum IPPROTO_IPV6 = 41;
+static if (_DARWIN_C_SOURCE)
+{
+    enum IPPROTO_SDRP      = 42;
+    enum IPPROTO_ROUTING   = 43;
+    enum IPPROTO_FRAGMENT  = 44;
+    enum IPPROTO_IDRP      = 45;
+    enum IPPROTO_RSVP      = 46;
+    enum IPPROTO_GRE       = 47;
+    enum IPPROTO_MHRP      = 48;
+    enum IPPROTO_BHA       = 49;
+    enum IPPROTO_ESP       = 50;
+    enum IPPROTO_AH        = 51;
+    enum IPPROTO_INLSP     = 52;
+    enum IPPROTO_SWIPE     = 53;
+    enum IPPROTO_NHRP      = 54;
+    enum IPPROTO_ICMPV6    = 58;
+    enum IPPROTO_NONE      = 59;
+    enum IPPROTO_DSTOPTS   = 60;
+    enum IPPROTO_AHIP      = 61;
+    enum IPPROTO_CFTP      = 62;
+    enum IPPROTO_HELLO     = 63;
+    enum IPPROTO_SATEXPAK  = 64;
+    enum IPPROTO_KRYPTOLAN = 65;
+    enum IPPROTO_RVD       = 66;
+    enum IPPROTO_IPPC      = 67;
+    enum IPPROTO_ADFS      = 68;
+    enum IPPROTO_SATMON    = 69;
+    enum IPPROTO_VISA      = 70;
+    enum IPPROTO_IPCV      = 71;
+    enum IPPROTO_CPNX      = 72;
+    enum IPPROTO_CPHB      = 73;
+    enum IPPROTO_WSN       = 74;
+    enum IPPROTO_PVP       = 75;
+    enum IPPROTO_BRSATMON  = 76;
+    enum IPPROTO_ND        = 77;
+    enum IPPROTO_WBMON     = 78;
+    enum IPPROTO_WBEXPAK   = 79;
+    enum IPPROTO_EON       = 80;
+    enum IPPROTO_VMTP      = 81;
+    enum IPPROTO_SVMTP     = 82;
+    enum IPPROTO_VINES     = 83;
+    enum IPPROTO_TTP       = 84;
+    enum IPPROTO_IGP       = 85;
+    enum IPPROTO_DGP       = 86;
+    enum IPPROTO_TCF       = 87;
+    enum IPPROTO_IGRP      = 88;
+    enum IPPROTO_OSPFIGP   = 89;
+    enum IPPROTO_SRPC      = 90;
+    enum IPPROTO_LARP      = 91;
+    enum IPPROTO_MTP       = 92;
+    enum IPPROTO_AX25      = 93;
+    enum IPPROTO_IPEIP     = 94;
+    enum IPPROTO_MICP      = 95;
+    enum IPPROTO_SCCSP     = 96;
+    enum IPPROTO_ETHERIP   = 97;
+    enum IPPROTO_ENCAP     = 98;
+    enum IPPROTO_APES      = 99;
+    enum IPPROTO_GMTP      = 100;
+    enum IPPROTO_PIM       = 103;
+    enum IPPROTO_IPCOMP    = 108;
+    enum IPPROTO_PGM       = 113;
+    enum IPPROTO_SCTP      = 132;
+    enum IPPROTO_DIVERT    = 254;
+}
+enum IPPROTO_RAW = 255;
+
+static if (_DARWIN_C_SOURCE)
+{
+    enum IPPROTO_MAX  = 256;
+    enum IPPROTO_DONE = 257;
+}
+
+static if (_DARWIN_C_SOURCE)
+{
+    enum IPPORT_RESERVED = 1024;
+    enum IPPORT_USERRESERVED = 5000;
+
+    enum IPPORT_HIFIRSTAUTO = 49152;
+    enum IPPORT_HILASTAUTO  = 65535;
+
+    enum IPPORT_RESERVEDSTART = 600;
+}
+
+static if (_DARWIN_C_SOURCE)
+{
+    extern(D) bool IN_CLASSA(in_addr_t i) pure @safe { return (i & 0x80000000) == 0; }
+    enum IN_CLASSA_NET    = 0xff000000;
+    enum IN_CLASSA_NSHIFT = 24;
+    enum IN_CLASSA_HOST   = 0x00ffffff;
+    enum IN_CLASSA_MAX    = 128;
+
+    extern(D) bool IN_CLASSB(in_addr_t i) pure @safe { return (i & 0xc0000000) == 0x80000000; }
+    enum IN_CLASSB_NET    = 0xffff0000;
+    enum IN_CLASSB_NSHIFT = 16;
+    enum IN_CLASSB_HOST   = 0x0000ffff;
+    enum IN_CLASSB_MAX    = 65536;
+
+    extern(D) bool IN_CLASSC(in_addr_t i) pure @safe { return (i & 0xe0000000) == 0xc0000000; }
+    enum IN_CLASSC_NET    = 0xffffff00;
+    enum IN_CLASSC_NSHIFT = 8;
+    enum IN_CLASSC_HOST   = 0x000000ff;
+
+    extern(D) bool IN_CLASSD(in_addr_t i) pure @safe { return (i & 0xf0000000) == 0xe0000000; }
+    enum IN_CLASSD_NET    = 0xf0000000;
+    enum IN_CLASSD_NSHIFT = 28;
+    enum IN_CLASSD_HOST   = 0x0fffffff;
+    extern(D) bool IN_MULTICAST(in_addr_t i) pure @safe { return IN_CLASSD(i); }
+
+    // The fact that these are identical looks suspicious (they're not quite
+    // identical on Linux). However, this _is_ how they're defined in FreeBSD
+    // and on OS X. So, while it _might_ be a bug, if it is, it's an upstream
+    // one, and we're compatible with it.
+    extern(D) bool IN_EXPERIMENTAL(in_addr_t i) pure @safe { return (i & 0xf0000000) == 0xf0000000; }
+    extern(D) bool IN_BADCLASS(in_addr_t i) pure @safe { return (i & 0xf0000000) == 0xf0000000; }
+
+    enum INADDR_UNSPEC_GROUP    = 0xe0000000;
+    enum INADDR_ALLHOSTS_GROUP  = 0xe0000001;
+    enum INADDR_ALLRTRS_GROUP   = 0xe0000002;
+    enum INADDR_ALLRPTS_GROUP   = 0xe0000016;
+    enum INADDR_CARP_GROUP      = 0xe0000012;
+    enum INADDR_PFSYNC_GROUP    = 0xe00000f0;
+    enum INADDR_ALLMDNS_GROUP   = 0xe00000fb;
+    enum INADDR_MAX_LOCAL_GROUP = 0xe00000ff;
+
+    enum IN_LINKLOCALNETNUM = 0xA9FE0000;
+    extern(D) bool IN_LINKLOCAL(in_addr_t i) pure @safe { return (i & IN_CLASSB_NET) == IN_LINKLOCALNETNUM; }
+    extern(D) bool IN_LOOPBACK(in_addr_t i) pure @safe { return (i & 0xff000000) == 0x7f000000; }
+    extern(D) bool IN_ZERONET(in_addr_t i) pure @safe { return (i & 0xff000000) == 0; }
+
+    extern(D) bool IN_PRIVATE(in_addr_t i) pure @safe
+    {
+        return (i & 0xff000000) == 0x0a000000 ||
+               (i & 0xfff00000) == 0xac100000 ||
+               (i & 0xffff0000) == 0xc0a80000;
+    }
+
+    extern(D) bool IN_LOCAL_GROUP(in_addr_t i) pure @safe { return (i & 0xffffff00) == 0xe0000000; }
+
+    extern(D) bool IN_ANY_LOCAL(in_addr_t i) pure @safe { return IN_LINKLOCAL(i) || IN_LOCAL_GROUP(i); }
+
+    enum IN_LOOPBACKNET = 127;
+
+
+    struct ip_opts
+    {
+        in_addr  ip_dst;
+        char[40] ip_opts;
+    };
+
+    enum IP_OPTIONS         = 1;
+    enum IP_HDRINCL         = 2;
+    enum IP_TOS             = 3;
+    enum IP_TTL             = 4;
+    enum IP_RECVOPTS        = 5;
+    enum IP_RECVRETOPTS     = 6;
+    enum IP_RECVDSTADDR     = 7;
+    enum IP_RETOPTS         = 8;
+    enum IP_MULTICAST_IF    = 9;
+    enum IP_MULTICAST_TTL   = 10;
+    enum IP_MULTICAST_LOOP  = 11;
+    enum IP_ADD_MEMBERSHIP  = 12;
+    enum IP_DROP_MEMBERSHIP = 13;
+    enum IP_MULTICAST_VIF   = 14;
+    enum IP_RSVP_ON         = 15;
+    enum IP_RSVP_OFF        = 16;
+    enum IP_RSVP_VIF_ON     = 17;
+    enum IP_RSVP_VIF_OFF    = 18;
+    enum IP_PORTRANGE       = 19;
+    enum IP_RECVIF          = 20;
+
+    enum IP_IPSEC_POLICY = 21;
+    enum IP_STRIPHDR     = 23;
+    enum IP_RECVTTL      = 24;
+    enum IP_BOUND_IF     = 25;
+    enum IP_PKTINFO      = 26;
+    enum IP_RECVPKTINFO  = IP_PKTINFO;
+    enum IP_RECVTOS      = 27;
+
+    enum IP_FW_ADD      = 40;
+    enum IP_FW_DEL      = 41;
+    enum IP_FW_FLUSH    = 42;
+    enum IP_FW_ZERO     = 43;
+    enum IP_FW_GET      = 44;
+    enum IP_FW_RESETLOG = 45;
+
+    enum IP_OLD_FW_ADD      = 50;
+    enum IP_OLD_FW_DEL      = 51;
+    enum IP_OLD_FW_FLUSH    = 52;
+    enum IP_OLD_FW_ZERO     = 53;
+    enum IP_OLD_FW_GET      = 54;
+    enum IP_NAT__XXX        = 55;
+    enum IP_OLD_FW_RESETLOG = 56;
+
+    enum IP_DUMMYNET_CONFIGURE = 60;
+    enum IP_DUMMYNET_DEL       = 61;
+    enum IP_DUMMYNET_FLUSH     = 62;
+    enum IP_DUMMYNET_GET       = 64;
+
+    enum IP_TRAFFIC_MGT_BACKGROUND = 65;
+    enum IP_MULTICAST_IFINDEX      = 66;
+
+    enum IP_ADD_SOURCE_MEMBERSHIP  = 70;
+    enum IP_DROP_SOURCE_MEMBERSHIP = 71;
+    enum IP_BLOCK_SOURCE           = 72;
+    enum IP_UNBLOCK_SOURCE         = 73;
+
+    enum IP_MSFILTER = 74;
+
+    enum MCAST_JOIN_GROUP         = 80;
+    enum MCAST_LEAVE_GROUP        = 81;
+    enum MCAST_JOIN_SOURCE_GROUP  = 82;
+    enum MCAST_LEAVE_SOURCE_GROUP = 83;
+    enum MCAST_BLOCK_SOURCE       = 84;
+    enum MCAST_UNBLOCK_SOURCE     = 85;
+
+    enum IP_DEFAULT_MULTICAST_TTL  = 1;
+    enum IP_DEFAULT_MULTICAST_LOOP = 1;
+
+    enum IP_MIN_MEMBERSHIPS = 31;
+    enum IP_MAX_MEMBERSHIPS = 4095;
+
+    enum IP_MAX_GROUP_SRC_FILTER = 512;
+    enum IP_MAX_SOCK_SRC_FILTER  = 128;
+    enum IP_MAX_SOCK_MUTE_FILTER = 128;
+
+    struct ip_mreq
+    {
+        in_addr imr_multiaddr;
+        in_addr imr_interface;
+    };
+
+    struct ip_mreqn
+    {
+        in_addr imr_multiaddr;
+        in_addr imr_address;
+        int     imr_ifindex;
+    };
+
+    struct ip_mreq_source
+    {
+        align(4):
+        in_addr imr_multiaddr;
+        in_addr imr_sourceaddr;
+        in_addr imr_interface;
+    };
+
+    struct group_req
+    {
+        align(4):
+        uint             gr_interface;
+        sockaddr_storage gr_group;
+    };
+
+    struct group_source_req
+    {
+        align(4):
+        uint             gsr_interface;
+        sockaddr_storage gsr_group;
+        sockaddr_storage gsr_source;
+    };
+
+    int setipv4sourcefilter(int, in_addr, in_addr, uint, uint, in_addr*);
+    int getipv4sourcefilter(int, in_addr, in_addr, uint*, uint*, in_addr*);
+    int setsourcefilter(int, uint, sockaddr*, socklen_t, uint, uint, sockaddr_storage*);
+    int getsourcefilter(int, uint, sockaddr*, socklen_t, uint*, uint*, sockaddr_storage*);
+
+    enum MCAST_UNDEFINED = 0;
+    enum MCAST_INCLUDE   = 1;
+    enum MCAST_EXCLUDE   = 2;
+
+    enum IP_PORTRANGE_DEFAULT = 0;
+    enum IP_PORTRANGE_HIGH    = 1;
+    enum IP_PORTRANGE_LOW     = 2;
+
+    struct in_pktinfo
+    {
+        uint     ipi_ifindex;
+        in_addr  ipi_spec_dst;
+        in_addr  ipi_addr;
+    };
+
+    enum IPPROTO_MAXID = IPPROTO_AH + 1;
+
+
+    enum IPCTL_FORWARDING        = 1;
+    enum IPCTL_SENDREDIRECTS     = 2;
+    enum IPCTL_DEFTTL            = 3;
+    enum IPCTL_DEFMTU            = 4;
+    enum IPCTL_RTEXPIRE          = 5;
+    enum IPCTL_RTMINEXPIRE       = 6;
+    enum IPCTL_RTMAXCACHE        = 7;
+    enum IPCTL_SOURCEROUTE       = 8;
+    enum IPCTL_DIRECTEDBROADCAST = 9;
+    enum IPCTL_INTRQMAXLEN       = 10;
+    enum IPCTL_INTRQDROPS        = 11;
+    enum IPCTL_STATS             = 12;
+    enum IPCTL_ACCEPTSOURCEROUTE = 13;
+    enum IPCTL_FASTFORWARDING    = 14;
+    enum IPCTL_KEEPFAITH         = 15;
+    enum IPCTL_GIF_TTL           = 16;
+    enum IPCTL_MAXID             = 17;
+
+    int bindresvport(int, sockaddr_in*);
+    int bindresvport_sa(int, sockaddr*);
+}
+
+// =============================================================================
+// What follows is from netinet6/in6.h, but since netinet6/in6.h specifically
+// says that it should only be #included by #including netinet/in.h, it makes
+// more sense to put them in here so that the way they're imported corresponds
+// with the correct way of #including them in C/C++.
+// =============================================================================
+
+static if (_DARWIN_C_SOURCE)
+{
+    enum IPV6PORT_RESERVED    = 1024;
+    enum IPV6PORT_ANONMIN     = 49152;
+    enum IPV6PORT_ANONMAX     = 65535;
+    enum IPV6PORT_RESERVEDMIN = 600;
+    enum IPV6PORT_RESERVEDMAX = IPV6PORT_RESERVED - 1;
+}
+
+
+enum IN6ADDR_ANY_INIT = in6_addr.init;
+enum IN6ADDR_LOOPBACK_INIT = in6_addr([0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01]);
+
+static if (_DARWIN_C_SOURCE)
+{
+    enum IN6ADDR_NODELOCAL_ALLNODES_INIT = in6_addr([0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01]);
+    enum IN6ADDR_INTFACELOCAL_ALLNODES_INIT = in6_addr([0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01]);
+    enum IN6ADDR_LINKLOCAL_ALLNODES_INIT = in6_addr([0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01]);
+    enum IN6ADDR_LINKLOCAL_ALLROUTERS_INIT = in6_addr([0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02]);
+    enum IN6ADDR_LINKLOCAL_ALLV2ROUTERS_INIT = in6_addr([0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16]);
+    enum IN6ADDR_V4MAPPED_INIT = in6_addr([0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                           0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00]);
+}
+
+__gshared const in6_addr in6addr_any;
+__gshared const in6_addr in6addr_loopback;
+static if (_DARWIN_C_SOURCE)
+{
+    __gshared const in6_addr in6addr_nodelocal_allnodes;
+    __gshared const in6_addr in6addr_linklocal_allnodes;
+    __gshared const in6_addr in6addr_linklocal_allrouters;
+    __gshared const in6_addr in6addr_linklocal_allv2routers;
+
+    extern(D) bool IN6_ARE_ADDR_EQUAL(in6_addr* a, in6_addr* b) pure @safe { return *a == *b; }
+}
+
+extern(D) bool IN6_IS_ADDR_6TO4(in6_addr* x) pure @safe { return ntohs(x.s6_addr16[0]) == 0x2002; }
+
+enum __IPV6_ADDR_SCOPE_NODELOCAL    = 0x01;
+enum __IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01;
+enum __IPV6_ADDR_SCOPE_LINKLOCAL    = 0x02;
+enum __IPV6_ADDR_SCOPE_SITELOCAL    = 0x05;
+enum __IPV6_ADDR_SCOPE_GLOBAL       = 0x0e;
+
+extern(D) bool IN6_IS_ADDR_UNIQUE_LOCAL(in6_addr* a) pure @safe
+{
+    return a.s6_addr[0] == 0xfc || a.s6_addr[0] == 0xfd;
+}
+
+static if (_DARWIN_C_SOURCE)
+    enum IPV6_SOCKOPT_RESERVED1 = 3;
+enum IPV6_UNICAST_HOPS   = 4;
+enum IPV6_MULTICAST_IF   = 9;
+enum IPV6_MULTICAST_HOPS = 10;
+enum IPV6_MULTICAST_LOOP = 11;
+enum IPV6_JOIN_GROUP     = 12;
+enum IPV6_LEAVE_GROUP    = 13;
+
+static if (_DARWIN_C_SOURCE)
+{
+    enum IPV6_PORTRANGE    = 14;
+    enum ICMP6_FILTER      = 18;
+
+    enum IPV6_CHECKSUM = 26;
+}
+enum IPV6_V6ONLY = 27;
+static if (_DARWIN_C_SOURCE)
+{
+    enum IPV6_BINDV6ONLY = IPV6_V6ONLY;
+
+    enum IPV6_IPSEC_POLICY = 28;
+
+    enum IPV6_FW_ADD   = 30;
+    enum IPV6_FW_DEL   = 31;
+    enum IPV6_FW_FLUSH = 32;
+    enum IPV6_FW_ZERO  = 33;
+    enum IPV6_FW_GET   = 34;
+
+    enum IPV6_RECVTCLASS = 35;
+    enum IPV6_TCLASS     = 36;
+
+    enum IPV6_RTHDRDSTOPTS = 57;
+
+    enum IPV6_RECVPKTINFO = 61;
+
+    enum IPV6_RECVHOPLIMIT = 37;
+    enum IPV6_RECVRTHDR    = 38;
+    enum IPV6_RECVHOPOPTS  = 39;
+    enum IPV6_RECVDSTOPTS  = 40;
+
+    enum IPV6_USE_MIN_MTU  = 42;
+    enum IPV6_RECVPATHMTU  = 43;
+
+    enum IPV6_PATHMTU = 44;
+
+    enum IPV6_PKTINFO  = 46;
+    enum IPV6_HOPLIMIT = 47;
+    enum IPV6_NEXTHOP  = 48;
+    enum IPV6_HOPOPTS  = 49;
+    enum IPV6_DSTOPTS  = 50;
+    enum IPV6_RTHDR    = 51;
+
+    enum IPV6_AUTOFLOWLABEL = 59;
+
+    enum IPV6_DONTFRAG = 62;
+
+    enum IPV6_PREFER_TEMPADDR = 63;
+
+    enum IPV6_BOUND_IF = 125;
+
+    enum IPV6_RTHDR_LOOSE  = 0;
+    enum IPV6_RTHDR_STRICT = 1;
+    enum IPV6_RTHDR_TYPE_0 = 0;
+
+    enum IPV6_DEFAULT_MULTICAST_HOPS = 1;
+    enum IPV6_DEFAULT_MULTICAST_LOOP = 1;
+
+    enum IPV6_MIN_MEMBERSHIPS = 31;
+    enum IPV6_MAX_MEMBERSHIPS = 4095;
+
+    enum IPV6_MAX_GROUP_SRC_FILTER = 512;
+    enum IPV6_MAX_SOCK_SRC_FILTER  = 128;
+
+    struct in6_pktinfo
+    {
+        in6_addr ipi6_addr;
+        uint     ipi6_ifindex;
+    };
+
+    struct ip6_mtuinfo
+    {
+        sockaddr_in6 ip6m_addr;
+        uint         ip6m_mtu;
+    };
+
+    enum IPV6_PORTRANGE_DEFAULT = 0;
+    enum IPV6_PORTRANGE_HIGH    = 1;
+    enum IPV6_PORTRANGE_LOW     = 2;
+
+    enum IPV6PROTO_MAXID = IPPROTO_PIM + 1;
+
+    enum IPV6CTL_FORWARDING         = 1;
+    enum IPV6CTL_SENDREDIRECTS      = 2;
+    enum IPV6CTL_DEFHLIM            = 3;
+    enum IPV6CTL_DEFMTU             = 4;
+    enum IPV6CTL_FORWSRCRT          = 5;
+    enum IPV6CTL_STATS              = 6;
+    enum IPV6CTL_MRTSTATS           = 7;
+    enum IPV6CTL_MRTPROTO           = 8;
+    enum IPV6CTL_MAXFRAGPACKETS     = 9;
+    enum IPV6CTL_SOURCECHECK        = 10;
+    enum IPV6CTL_SOURCECHECK_LOGINT = 11;
+    enum IPV6CTL_ACCEPT_RTADV       = 12;
+
+    enum IPV6CTL_LOG_INTERVAL   = 14;
+    enum IPV6CTL_HDRNESTLIMIT   = 15;
+    enum IPV6CTL_DAD_COUNT      = 16;
+    enum IPV6CTL_AUTO_FLOWLABEL = 17;
+    enum IPV6CTL_DEFMCASTHLIM   = 18;
+    enum IPV6CTL_GIF_HLIM       = 19;
+    enum IPV6CTL_KAME_VERSION   = 20;
+    enum IPV6CTL_USE_DEPRECATED = 21;
+    enum IPV6CTL_RR_PRUNE       = 22;
+    enum IPV6CTL_V6ONLY         = 24;
+    enum IPV6CTL_RTEXPIRE       = 25;
+    enum IPV6CTL_RTMINEXPIRE    = 26;
+    enum IPV6CTL_RTMAXCACHE     = 27;
+
+    enum IPV6CTL_USETEMPADDR     = 32;
+    enum IPV6CTL_TEMPPLTIME      = 33;
+    enum IPV6CTL_TEMPVLTIME      = 34;
+    enum IPV6CTL_AUTO_LINKLOCAL  = 35;
+    enum IPV6CTL_RIP6STATS       = 36;
+    enum IPV6CTL_PREFER_TEMPADDR = 37;
+    enum IPV6CTL_ADDRCTLPOLICY   = 38;
+    enum IPV6CTL_USE_DEFAULTZONE = 39;
+
+    enum IPV6CTL_MAXFRAGS   = 41;
+    enum IPV6CTL_MCAST_PMTU = 44;
+
+    enum IPV6CTL_NEIGHBORGCTHRESH      = 46;
+    enum IPV6CTL_MAXIFPREFIXES         = 47;
+    enum IPV6CTL_MAXIFDEFROUTERS       = 48;
+    enum IPV6CTL_MAXDYNROUTES          = 49;
+    enum ICMPV6CTL_ND6_ONLINKNSRFC4861 = 50;
+
+    enum IPV6CTL_MAXID = 51;
+
+    size_t inet6_rthdr_space(int, int) @trusted;
+    cmsghdr* inet6_rthdr_init(void*, int);
+    int inet6_rthdr_add(cmsghdr*, const in6_addr*, uint);
+    int inet6_rthdr_lasthop(cmsghdr*, uint);
+    int inet6_rthdr_segments(const cmsghdr*);
+    in6_addr* inet6_rthdr_getaddr(cmsghdr*, int);
+    int inet6_rthdr_getflags(const cmsghdr*, int);
+
+    int inet6_opt_init(void*, socklen_t);
+    int inet6_opt_append(void*, socklen_t, int, ubyte, socklen_t, ubyte, void**);
+    int inet6_opt_finish(void*, socklen_t, int);
+    int inet6_opt_set_val(void*, int, void*, socklen_t);
+
+    int inet6_opt_next(void*, socklen_t, int, ubyte*, socklen_t*, void**);
+    int inet6_opt_find(void*, socklen_t, int, ubyte, socklen_t*, void**);
+    int inet6_opt_get_val(void*, int, void*, socklen_t);
+    socklen_t inet6_rth_space(int, int) @trusted;
+    void* inet6_rth_init(void*, socklen_t, int, int);
+    int inet6_rth_add(void*, const in6_addr*);
+    int inet6_rth_reverse(const void*, void*);
+    int inet6_rth_segments(const void*);
+    in6_addr* inet6_rth_getaddr(const void*, int);
+    void addrsel_policy_init();
+}
diff --git a/libphobos/libdruntime/core/sys/darwin/pthread.d b/libphobos/libdruntime/core/sys/darwin/pthread.d
index 8c27d9b07..786d9f283 100644
--- a/libphobos/libdruntime/core/sys/darwin/pthread.d
+++ b/libphobos/libdruntime/core/sys/darwin/pthread.d
@@ -2,7 +2,7 @@
  * D header file for Darwin.
  *
  * Copyright: Copyright Sean Kelly 2008 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  */
 
diff --git a/libphobos/libdruntime/core/sys/darwin/sys/event.d b/libphobos/libdruntime/core/sys/darwin/sys/event.d
index fbb912790..24f1cbe65 100644
--- a/libphobos/libdruntime/core/sys/darwin/sys/event.d
+++ b/libphobos/libdruntime/core/sys/darwin/sys/event.d
@@ -2,7 +2,7 @@
  * D header file for Darwin.
  *
  * Copyright: Copyright Martin Nowak 2012. Etienne Cimon 2015.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Martin Nowak
  */
 
@@ -34,16 +34,16 @@ enum : short
 {
     EVFILT_READ     =  -1,
     EVFILT_WRITE    =  -2,
-    EVFILT_AIO      =  -3, /* attached to aio requests */
-    EVFILT_VNODE    =  -4, /* attached to vnodes */
-    EVFILT_PROC     =  -5, /* attached to struct proc */
-    EVFILT_SIGNAL   =  -6, /* attached to struct proc */
-    EVFILT_TIMER    =  -7, /* timers */
-    EVFILT_MACHPORT =  -8, /* Mach portsets */
-    EVFILT_FS       =  -9, /* filesystem events */
-    EVFILT_USER     = -10, /* User events */
-    EVFILT_VM       = -12, /* virtual memory events */
-    EVFILT_SYSCOUNT =  11
+    EVFILT_AIO      =  -3,
+    EVFILT_VNODE    =  -4,
+    EVFILT_PROC     =  -5,
+    EVFILT_SIGNAL   =  -6,
+    EVFILT_TIMER    =  -7,
+    EVFILT_MACHPORT =  -8,
+    EVFILT_FS       =  -9,
+    EVFILT_USER     = -10,
+    EVFILT_VM       = -12,
+    EVFILT_EXCEPT   = -15,
 }
 
 extern(D) void EV_SET(kevent_t* kevp, typeof(kevent_t.tupleof) args)
@@ -51,91 +51,137 @@ extern(D) void EV_SET(kevent_t* kevp, typeof(kevent_t.tupleof) args)
     *kevp = kevent_t(args);
 }
 
+extern(D) void EV_SET64(kevent64_s* kevp, typeof(kevent64_s.tupleof) args)
+{
+    *kevp = kevent64_s(args);
+}
+
 struct kevent_t
 {
-    uintptr_t    ident; /* identifier for this event */
-    short       filter; /* filter for event */
+    uintptr_t    ident;
+    short       filter;
     ushort       flags;
     uint        fflags;
     intptr_t      data;
-    void        *udata; /* opaque user data identifier */
+    void        *udata;
+}
+
+struct kevent64_s
+{
+    ulong        ident;
+    short       filter;
+    ushort       flags;
+    uint        fflags;
+    long          data;
+    ulong        udata;
+    ulong[2]       ext;
 }
 
 enum
 {
-    /* actions */
-    EV_ADD      = 0x0001, /* add event to kq (implies enable) */
-    EV_DELETE   = 0x0002, /* delete event from kq */
-    EV_ENABLE   = 0x0004, /* enable event */
-    EV_DISABLE  = 0x0008, /* disable event (not reported) */
-
-    /* flags */
-    EV_ONESHOT  = 0x0010, /* only report one occurrence */
-    EV_CLEAR    = 0x0020, /* clear event state after reporting */
-    EV_RECEIPT  = 0x0040, /* force EV_ERROR on success, data=0 */
-    EV_DISPATCH = 0x0080, /* disable event after reporting */
-
-    EV_SYSFLAGS = 0xF000, /* reserved by system */
-    EV_FLAG1    = 0x2000, /* filter-specific flag */
-
-    /* returned values */
-    EV_EOF      = 0x8000, /* EOF detected */
-    EV_ERROR    = 0x4000, /* error, data contains errno */
+
+    KEVENT_FLAG_NONE         = 0x000,
+    KEVENT_FLAG_IMMEDIATE    = 0x001,
+    KEVENT_FLAG_ERROR_EVENTS = 0x002,
+
+    EV_ADD      = 0x0001,
+    EV_DELETE   = 0x0002,
+    EV_ENABLE   = 0x0004,
+    EV_DISABLE  = 0x0008,
+
+    EV_ONESHOT        = 0x0010,
+    EV_CLEAR          = 0x0020,
+    EV_RECEIPT        = 0x0040,
+
+    EV_DISPATCH       = 0x0080,
+    EV_UDATA_SPECIFIC = 0x0100,
+
+    EV_DISPATCH2      = EV_DISPATCH | EV_UDATA_SPECIFIC,
+
+    EV_VANISHED       = 0x0200,
+
+    EV_SYSFLAGS       = 0xF000,
+    EV_FLAG0          = 0x1000,
+    EV_FLAG1          = 0x2000,
+
+    EV_EOF      = 0x8000,
+    EV_ERROR    = 0x4000,
 }
 
 enum
 {
-    /*
-     * data/hint flags/masks for EVFILT_USER, shared with userspace
-     *
-     * On input, the top two bits of fflags specifies how the lower twenty four
-     * bits should be applied to the stored value of fflags.
-     *
-     * On output, the top two bits will always be set to NOTE_FFNOP and the
-     * remaining twenty four bits will contain the stored fflags value.
-     */
-    NOTE_FFNOP      = 0x00000000, /* ignore input fflags */
-    NOTE_FFAND      = 0x40000000, /* AND fflags */
-    NOTE_FFOR       = 0x80000000, /* OR fflags */
-    NOTE_FFCOPY     = 0xc0000000, /* copy fflags */
-    NOTE_FFCTRLMASK = 0xc0000000, /* masks for operations */
+    EV_POLL   = EV_FLAG0,
+    EV_OOBAND = EV_FLAG1,
+}
+
+enum
+{
+    NOTE_TRIGGER = 0x01000000,
+
+    NOTE_FFNOP      = 0x00000000,
+    NOTE_FFAND      = 0x40000000,
+    NOTE_FFOR       = 0x80000000,
+    NOTE_FFCOPY     = 0xc0000000,
+    NOTE_FFCTRLMASK = 0xc0000000,
     NOTE_FFLAGSMASK = 0x00ffffff,
 
-    NOTE_TRIGGER    = 0x01000000, /* Cause the event to be
-                                  triggered for output. */
-
-    /*
-     * data/hint flags for EVFILT_{READ|WRITE}, shared with userspace
-     */
-    NOTE_LOWAT      = 0x0001, /* low water mark */
-
-    /*
-     * data/hint flags for EVFILT_VNODE, shared with userspace
-     */
-    NOTE_DELETE     = 0x0001, /* vnode was removed */
-    NOTE_WRITE      = 0x0002, /* data contents changed */
-    NOTE_EXTEND     = 0x0004, /* size increased */
-    NOTE_ATTRIB     = 0x0008, /* attributes changed */
-    NOTE_LINK       = 0x0010, /* link count changed */
-    NOTE_RENAME     = 0x0020, /* vnode was renamed */
-    NOTE_REVOKE     = 0x0040, /* vnode access was revoked */
-
-    /*
-     * data/hint flags for EVFILT_PROC, shared with userspace
-     */
-    NOTE_EXIT       = 0x80000000, /* process exited */
-    NOTE_FORK       = 0x40000000, /* process forked */
-    NOTE_EXEC       = 0x20000000, /* process exec'd */
-    NOTE_PCTRLMASK  = 0xf0000000, /* mask for hint bits */
-    NOTE_PDATAMASK  = 0x000fffff, /* mask for pid */
-
-    /* additional flags for EVFILT_PROC */
-    NOTE_TRACK      = 0x00000001, /* follow across forks */
-    NOTE_TRACKERR   = 0x00000002, /* could not track child */
-    NOTE_CHILD      = 0x00000004, /* am a child process */
+    NOTE_LOWAT      = 0x0001,
+
+    NOTE_OOB        = 0x0002,
+
+    NOTE_DELETE     = 0x0001,
+    NOTE_WRITE      = 0x0002,
+    NOTE_EXTEND     = 0x0004,
+    NOTE_ATTRIB     = 0x0008,
+    NOTE_LINK       = 0x0010,
+    NOTE_RENAME     = 0x0020,
+    NOTE_REVOKE     = 0x0040,
+    NOTE_NONE       = 0x0080,
+    NOTE_FUNLOCK    = 0x0100,
+
+    NOTE_EXIT        = 0x80000000,
+    NOTE_FORK        = 0x40000000,
+    NOTE_EXEC        = 0x20000000,
+    NOTE_REAP        = 0x10000000,
+    NOTE_SIGNAL      = 0x08000000,
+    NOTE_EXITSTATUS  = 0x04000000,
+    NOTE_EXIT_DETAIL = 0x02000000,
+    NOTE_PDATAMASK   = 0x000fffff,
+    NOTE_PCTRLMASK   = ~NOTE_PDATAMASK,
+
+    NOTE_EXIT_REPARENTED = 0x00080000,
+
+    NOTE_EXIT_DETAIL_MASK = 0x00070000,
+    NOTE_EXIT_DECRYPTFAIL = 0x00010000,
+    NOTE_EXIT_MEMORY      = 0x00020000,
+    NOTE_EXIT_CSERROR     = 0x00040000,
+
+    NOTE_VM_PRESSURE                  = 0x80000000,
+    NOTE_VM_PRESSURE_TERMINATE        = 0x40000000,
+    NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000,
+    NOTE_VM_ERROR                     = 0x10000000,
+
+    NOTE_SECONDS              = 0x00000001,
+    NOTE_USECONDS             = 0x00000002,
+    NOTE_NSECONDS             = 0x00000004,
+    NOTE_ABSOLUTE             = 0x00000008,
+
+    NOTE_LEEWAY               = 0x00000010,
+    NOTE_CRITICAL             = 0x00000020,
+    NOTE_BACKGROUND           = 0x00000040,
+    NOTE_MACH_CONTINUOUS_TIME = 0x00000080,
+
+    NOTE_TRACK      = 0x00000001,
+    NOTE_TRACKERR   = 0x00000002,
+    NOTE_CHILD      = 0x00000004,
 }
 
 int kqueue();
 int kevent(int kq, const kevent_t *changelist, int nchanges,
            kevent_t *eventlist, int nevents,
            const timespec *timeout);
+int kevent64(int kq,
+             const kevent64_s *changelist, int nchanges,
+             kevent64_s *eventlist, int nevents,
+             uint flags,
+             const timespec *timeout);
diff --git a/libphobos/libdruntime/core/sys/dragonflybsd/dlfcn.d b/libphobos/libdruntime/core/sys/dragonflybsd/dlfcn.d
new file mode 100644
index 000000000..3ffa1b93d
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/dragonflybsd/dlfcn.d
@@ -0,0 +1,107 @@
+/**
+ * D header file for DragonFlyBSD
+ *
+ * Copyright: Copyright Martin Nowak 2012.
+ * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * Authors: Martin Nowak,Diederik de Groot(port:DragonFlyBSD)
+ * Copied:  From core/sys/freebsd/sys
+ */
+module core.sys.dragonflybsd.dlfcn;
+
+version (DragonFlyBSD):
+
+public import core.sys.posix.dlfcn;
+
+extern (C) nothrow @nogc @system:
+
+/*
+ * Modes and flags for dlopen().
+ */
+static assert(RTLD_LAZY   == 1);
+static assert(RTLD_NOW    == 2);
+enum RTLD_MODEMASK        =  0x3;
+static assert(RTLD_GLOBAL == 0x100);
+static assert(RTLD_LOCAL  == 0);
+enum RTLD_TRACE           =  0x200;
+enum RTLD_NODELETE        =  0x01000;
+enum RTLD_NOLOAD          =  0x02000;
+
+/*
+ * Request arguments for dlinfo().
+ */
+enum RTLD_DI_LINKMAP     = 2;    /* Obtain link map. */
+enum RTLD_DI_SERINFO     = 4;    /* Obtain search path info. */
+enum RTLD_DI_SERINFOSIZE = 5;    /*  ... query for required space. */
+enum RTLD_DI_ORIGIN      = 6;    /* Obtain object origin */
+enum RTLD_DI_MAX         = RTLD_DI_ORIGIN;
+
+/*
+ * Special handle arguments for dlsym()/dlinfo().
+ */
+enum RTLD_NEXT    = cast(void *)-1;    /* Search subsequent objects. */
+enum RTLD_DEFAULT = cast(void *)-2;    /* Use default search algorithm. */
+enum RTLD_SELF    = cast(void *)-3;    /* Search the caller itself. */
+
+/*
+ * Structure filled in by dladdr().
+ */
+struct Dl_info {
+    const(char)     *dli_fname;     /* Pathname of shared object. */
+    void            *dli_fbase;     /* Base address of shared object. */
+    const(char)     *dli_sname;     /* Name of nearest symbol. */
+    void            *dli_saddr;     /* Address of nearest symbol. */
+};
+
+
+/*
+ * Structures, returned by the RTLD_DI_SERINFO dlinfo() request.
+ */
+struct Dl_serpath {
+    char *          dls_name;       /* single search path entry */
+    uint            dls_flags;      /* path information */
+};
+
+struct Dl_serinfo {
+    size_t          dls_size;       /* total buffer size */
+    uint            dls_cnt;        /* number of path entries */
+    Dl_serpath[1]   dls_serpath;    /* there may be more than one */
+};
+
+/*-
+ * The actual type declared by this typedef is immaterial, provided that
+ * it is a function pointer.  Its purpose is to provide a return type for
+ * dlfunc() which can be cast to a function pointer type without depending
+ * on behavior undefined by the C standard, which might trigger a compiler
+ * diagnostic.  We intentionally declare a unique type signature to force
+ * a diagnostic should the application not cast the return value of dlfunc()
+ * appropriately.
+ */
+struct __dlfunc_arg {
+    int     __dlfunc_dummy;
+};
+
+alias dlfunc_t = void function(__dlfunc_arg);
+
+private template __externC(RT, P...)
+{
+    alias __externC = extern(C) RT function(P) nothrow @nogc @system;
+}
+
+/* XSI functions first. */
+static assert(is(typeof(&dlclose) == __externC!(int, void*)));
+static assert(is(typeof(&dlerror) == __externC!(char*)));
+static assert(is(typeof(&dlopen)  == __externC!(void*, const char*, int)));
+static assert(is(typeof(&dlsym)   == __externC!(void*, void*, const char*)));
+
+void*    fdlopen(int, int);
+int      dladdr(const(void)*, Dl_info*);
+dlfunc_t dlfunc(void*, const(char)*);
+int      dlinfo(void*, int, void*);
+/*void     dllockinit(void* _context,
+    void* function(void* _context) _lock_create,
+    void  function(void* _lock)    _rlock_acquire,
+    void  function(void* _lock)    _wlock_acquire,
+    void  function(void* _lock)    _lock_release,
+    void  function(void* _lock)    _lock_destroy,
+    void  function(void* _context) _context_destroy);*/
+void*    dlvsym(void*, const(char)*, const(char)*);
diff --git a/libphobos/libdruntime/core/sys/dragonflybsd/execinfo.d b/libphobos/libdruntime/core/sys/dragonflybsd/execinfo.d
new file mode 100644
index 000000000..9d2d615f7
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/dragonflybsd/execinfo.d
@@ -0,0 +1,133 @@
+/**
+ * DragonFlyBSD implementation of glibc's $(LINK2 http://www.gnu.org/software/libc/manual/html_node/Backtraces.html backtrace) facility.
+ *
+ * Copyright: Copyright Martin Nowak 2012.
+ * License:   $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
+ * Authors: Martin Nowak,Diederik de Groot(port:DragonFlyBSD)
+ * Copied:  From core/sys/freebsd/sys
+ */
+module core.sys.dragonflybsd.execinfo;
+
+version (DragonFlyBSD):
+
+extern (C) nothrow @system:
+
+import core.sys.dragonflybsd.dlfcn;
+
+// Use extern (D) so that these functions don't collide with libexecinfo.
+
+extern (D) int backtrace(void** buffer, int size)
+{
+    import core.thread : thread_stackBottom;
+
+    void** p, pend=cast(void**)thread_stackBottom();
+    version (D_InlineAsm_X86)
+        asm nothrow @trusted { mov p[EBP], EBP; }
+    else version (D_InlineAsm_X86_64)
+        asm nothrow @trusted { mov p[RBP], RBP; }
+    else
+        static assert(false, "Architecture not supported.");
+
+    int i;
+    for (; i < size && p < pend; ++i)
+    {
+        buffer[i] = *(p + 1);
+        auto pnext = cast(void**)*p;
+        if (pnext <= p) break;
+        p = pnext;
+    }
+    return i;
+}
+
+
+extern (D) char** backtrace_symbols(const(void*)* buffer, int size)
+{
+    static void* realloc(void* p, size_t len) nothrow
+    {
+        static import cstdlib=core.stdc.stdlib;
+        auto res = cstdlib.realloc(p, len);
+        if (res is null) cstdlib.free(p);
+        return res;
+    }
+
+    if (size <= 0) return null;
+
+    size_t pos = size * (char*).sizeof;
+    char** p = cast(char**)realloc(null, pos);
+    if (p is null) return null;
+
+    Dl_info info;
+    foreach (i, addr; buffer[0 .. size])
+    {
+        if (dladdr(addr, &info) == 0)
+            (cast(ubyte*)&info)[0 .. info.sizeof] = 0;
+        fixupDLInfo(addr, info);
+
+        immutable len = formatStackFrame(null, 0, addr, info);
+        assert(len > 0);
+
+        p = cast(char**)realloc(p, pos + len);
+        if (p is null) return null;
+
+        formatStackFrame(cast(char*)p + pos, len, addr, info) == len || assert(0);
+
+        p[i] = cast(char*)pos;
+        pos += len;
+    }
+    foreach (i; 0 .. size)
+    {
+        pos = cast(size_t)p[i];
+        p[i] = cast(char*)p + pos;
+    }
+    return p;
+}
+
+
+extern (D) void backtrace_symbols_fd(const(void*)* buffer, int size, int fd)
+{
+    import core.sys.posix.unistd : write;
+    import core.stdc.stdlib : alloca;
+
+    if (size <= 0) return;
+
+    Dl_info info;
+    foreach (i, addr; buffer[0 .. size])
+    {
+        if (dladdr(addr, &info) == 0)
+            (cast(ubyte*)&info)[0 .. info.sizeof] = 0;
+        fixupDLInfo(addr, info);
+
+        enum maxAlloca = 1024;
+        enum min = (size_t a, size_t b) => a <= b ? a : b;
+        immutable len = min(formatStackFrame(null, 0, addr, info), maxAlloca);
+        assert(len > 0);
+
+        auto p = cast(char*)alloca(len);
+        if (p is null) return;
+
+        formatStackFrame(p, len, addr, info) >= len || assert(0);
+        p[len - 1] = '\n';
+        write(fd, p, len);
+    }
+}
+
+
+private void fixupDLInfo(const(void)* addr, ref Dl_info info)
+{
+    if (info.dli_fname is null) info.dli_fname = "???";
+    if (info.dli_fbase is null) info.dli_fbase = null;
+    if (info.dli_sname is null) info.dli_sname = "???";
+    if (info.dli_saddr is null) info.dli_saddr = cast(void*)addr;
+}
+
+
+private size_t formatStackFrame(char* p, size_t plen, const(void)* addr, const ref Dl_info info)
+{
+    import core.stdc.stdio : snprintf;
+
+    immutable off = addr - info.dli_saddr;
+    immutable len = snprintf(p, plen, "%p <%s+%zd> at %s",
+                             addr, info.dli_sname, off, info.dli_fname);
+    assert(len > 0);
+    return cast(size_t)len + 1; // + '\0'
+}
diff --git a/libphobos/libdruntime/core/sys/dragonflybsd/netinet/in_.d b/libphobos/libdruntime/core/sys/dragonflybsd/netinet/in_.d
new file mode 100644
index 000000000..02fbfe992
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/dragonflybsd/netinet/in_.d
@@ -0,0 +1,550 @@
+/**
+    D header file for DragonFlyBSD's extensions to POSIX's netinet/in.h.
+
+    Copyright: Copyright 2017 -
+    License: $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+    Authors: $(HTTP jmdavisprog.com, Jonathan M Davis) and Diederik de Groot
+ */
+module core.sys.dragonflybsd.netinet.in_;
+
+version(DragonFlyBSD):
+
+import core.sys.dragonflybsd.sys.cdefs;
+
+public import core.sys.posix.netinet.in_;
+
+extern(C) nothrow @nogc @system:
+
+enum IPPROTO_HOPOPTS   = 0;
+
+enum IPPROTO_IPV4      = 4;
+enum IPPROTO_IPIP      = IPPROTO_IPV4;
+enum IPPROTO_ST        = 7;
+enum IPPROTO_EGP       = 8;
+enum IPPROTO_PIGP      = 9;
+enum IPPROTO_RCCMON    = 10;
+enum IPPROTO_NVPII     = 11;
+
+enum IPPROTO_ARGUS     = 13;
+enum IPPROTO_EMCON     = 14;
+enum IPPROTO_XNET      = 15;
+enum IPPROTO_CHAOS     = 16;
+enum IPPROTO_MUX       = 18;
+enum IPPROTO_MEAS      = 19;
+enum IPPROTO_HMP       = 20;
+enum IPPROTO_PRM       = 21;
+
+enum IPPROTO_TRUNK1    = 23;
+enum IPPROTO_TRUNK2    = 24;
+enum IPPROTO_LEAF1     = 25;
+enum IPPROTO_LEAF2     = 26;
+enum IPPROTO_RDP       = 27;
+enum IPPROTO_IRTP      = 28;
+enum IPPROTO_TP        = 29;
+enum IPPROTO_BLT       = 30;
+enum IPPROTO_NSP       = 31;
+enum IPPROTO_INP       = 32;
+enum IPPROTO_SEP       = 33;
+enum IPPROTO_3PC       = 34;
+enum IPPROTO_IDPR      = 35;
+enum IPPROTO_XTP       = 36;
+enum IPPROTO_DDP       = 37;
+enum IPPROTO_CMTP      = 38;
+enum IPPROTO_TPXX      = 39;
+enum IPPROTO_IL        = 40;
+enum IPPROTO_SDRP      = 42;
+enum IPPROTO_ROUTING   = 43;
+enum IPPROTO_FRAGMENT  = 44;
+enum IPPROTO_IDRP      = 45;
+enum IPPROTO_RSVP      = 46;
+enum IPPROTO_GRE       = 47;
+enum IPPROTO_MHRP      = 48;
+enum IPPROTO_BHA       = 49;
+enum IPPROTO_ESP       = 50;
+enum IPPROTO_AH        = 51;
+enum IPPROTO_INLSP     = 52;
+enum IPPROTO_SWIPE     = 53;
+enum IPPROTO_NHRP      = 54;
+enum IPPROTO_MOBILE    = 55;
+enum IPPROTO_TLSP      = 56;
+enum IPPROTO_SKIP      = 57;
+enum IPPROTO_ICMPV6    = 58;
+enum IPPROTO_NONE      = 59;
+enum IPPROTO_DSTOPTS   = 60;
+enum IPPROTO_AHIP      = 61;
+enum IPPROTO_CFTP      = 62;
+enum IPPROTO_HELLO     = 63;
+enum IPPROTO_SATEXPAK  = 64;
+enum IPPROTO_KRYPTOLAN = 65;
+enum IPPROTO_RVD       = 66;
+enum IPPROTO_IPPC      = 67;
+enum IPPROTO_ADFS      = 68;
+enum IPPROTO_SATMON    = 69;
+enum IPPROTO_VISA      = 70;
+enum IPPROTO_IPCV      = 71;
+enum IPPROTO_CPNX      = 72;
+enum IPPROTO_CPHB      = 73;
+enum IPPROTO_WSN       = 74;
+enum IPPROTO_PVP       = 75;
+enum IPPROTO_BRSATMON  = 76;
+
+enum IPPROTO_WBMON     = 78;
+enum IPPROTO_WBEXPAK   = 79;
+enum IPPROTO_EON       = 80;
+enum IPPROTO_VMTP      = 81;
+enum IPPROTO_SVMTP     = 82;
+enum IPPROTO_VINES     = 83;
+enum IPPROTO_TTP       = 84;
+enum IPPROTO_IGP       = 85;
+enum IPPROTO_DGP       = 86;
+enum IPPROTO_TCF       = 87;
+enum IPPROTO_IGRP      = 88;
+enum IPPROTO_OSPFIGP   = 89;
+enum IPPROTO_SRPC      = 90;
+enum IPPROTO_LARP      = 91;
+enum IPPROTO_MTP       = 92;
+enum IPPROTO_AX25      = 93;
+enum IPPROTO_IPEIP     = 94;
+enum IPPROTO_MICP      = 95;
+enum IPPROTO_SCCSP     = 96;
+enum IPPROTO_ETHERIP   = 97;
+enum IPPROTO_ENCAP     = 98;
+enum IPPROTO_APES      = 99;
+enum IPPROTO_GMTP      = 100;
+enum IPPROTO_IPCOMP    = 108;
+enum IPPROTO_SCTP      = 132;
+enum IPPROTO_MH        = 135;
+enum IPPROTO_UDPLITE   = 136;
+enum IPPROTO_HIP       = 139;
+enum IPPROTO_SHIM6     = 140;
+
+enum IPPROTO_PIM          = 103;
+enum IPPROTO_CARP         = 112;
+enum IPPROTO_PGM          = 113;
+enum IPPROTO_MPLS         = 137;
+enum IPPROTO_PFSYNC       = 240;
+enum IPPROTO_RESERVED_253 = 253;
+enum IPPROTO_RESERVED_254 = 254;
+
+enum IPPROTO_DONE = 257;
+
+enum IPPORT_RESERVED = 1024;
+
+enum IPPORT_EPHEMERALFIRST = 10000;
+enum IPPORT_EPHEMERALLAST  = 65535;
+
+enum IPPORT_HIFIRSTAUTO = 49152;
+enum IPPORT_HILASTAUTO  = 65535;
+
+enum IPPORT_RESERVEDSTART = 600;
+
+enum IPPORT_MAX = 65535;
+
+extern(D) bool IN_CLASSA(in_addr_t i) pure @safe { return (i & 0x80000000) == 0; }
+enum IN_CLASSA_NET    = 0xff000000;
+enum IN_CLASSA_NSHIFT = 24;
+enum IN_CLASSA_HOST   = 0x00ffffff;
+enum IN_CLASSA_MAX    = 128;
+
+extern(D) bool IN_CLASSB(in_addr_t i) pure @safe { return (i & 0xc0000000) == 0x80000000; }
+enum IN_CLASSB_NET    = 0xffff0000;
+enum IN_CLASSB_NSHIFT = 16;
+enum IN_CLASSB_HOST   = 0x0000ffff;
+enum IN_CLASSB_MAX    = 65536;
+
+extern(D) bool IN_CLASSC(in_addr_t i) pure @safe { return (i & 0xe0000000) == 0xc0000000; }
+enum IN_CLASSC_NET    = 0xffffff00;
+enum IN_CLASSC_NSHIFT = 8;
+enum IN_CLASSC_HOST   = 0x000000ff;
+
+extern(D) bool IN_CLASSD(in_addr_t i) pure @safe { return (i & 0xf0000000) == 0xe0000000; }
+enum IN_CLASSD_NET     = 0xf0000000;
+enum IN_CLASSD_NSHIFT  = 28;
+enum IN_CLASSD_HOST    = 0x0fffffff;
+extern(D) bool IN_MULTICAST(in_addr_t i) { return IN_CLASSD(i); }
+
+// The fact that these are identical looks suspicious (they're not quite
+// identical on Linux). However, this _is_ how they're defined in DragonFlyBSD
+// and on OS X. So, while it _might_ be a bug, if it is, it's an upstream
+// one, and we're compatible with it.
+extern(D) bool IN_EXPERIMENTAL(in_addr_t i) pure @safe { return (i & 0xf0000000) == 0xf0000000; }
+extern(D) bool IN_BADCLASS(in_addr_t i) pure @safe { return (i & 0xf0000000) == 0xf0000000; }
+
+extern(D) bool IN_LINKLOCAL(in_addr_t i) pure @safe { return (i & 0xffff0000) == 0xa9fe0000; }
+extern(D) bool IN_LOOPBACK(in_addr_t i) pure @safe { return (i & 0xff000000) == 0x7f000000; }
+extern(D) bool IN_ZERONET(in_addr_t i) pure @safe { return (i & 0xff000000) == 0; }
+
+extern(D) bool IN_PRIVATE(in_addr_t i) pure @safe
+{
+    return  (i & 0xff000000) == 0x0a000000 ||
+            (i & 0xfff00000) == 0xac100000 ||
+            (i & 0xffff0000) == 0xc0a80000;
+}
+
+extern(D) bool IN_LOCAL_GROUP(in_addr_t i) pure @safe { return (i & 0xffffff00) == 0xe0000000; }
+
+extern(D) bool IN_ANY_LOCAL(in_addr_t i) pure @safe { return IN_LINKLOCAL(i) || IN_LOCAL_GROUP(i); }
+
+enum INADDR_UNSPEC_GROUP    = 0xe0000000;
+enum INADDR_ALLHOSTS_GROUP  = 0xe0000001;
+enum INADDR_ALLRTRS_GROUP   = 0xe0000002;
+enum INADDR_ALLRPTS_GROUP   = 0xe0000016;
+enum INADDR_CARP_GROUP      = 0xe0000012;
+enum INADDR_PFSYNC_GROUP    = 0xe00000f0;
+enum INADDR_ALLMDNS_GROUP   = 0xe00000fb;
+enum INADDR_MAX_LOCAL_GROUP = 0xe00000ff;
+
+enum IN_LOOPBACKNET = 127;
+
+enum IN_RFC3021_MASK = 0xfffffffe;
+
+enum IP_OPTIONS      = 1;
+enum IP_HDRINCL      = 2;
+enum IP_TOS          = 3;
+enum IP_TTL          = 4;
+enum IP_RECVOPTS     = 5;
+enum IP_RECVRETOPTS  = 6;
+enum IP_RECVDSTADDR  = 7;
+enum IP_SENDSRCADDR  = IP_RECVDSTADDR;
+enum IP_RETOPTS      = 8;
+enum IP_MULTICAST_IF = 9;
+
+enum IP_MULTICAST_TTL   = 10;
+enum IP_MULTICAST_LOOP  = 11;
+enum IP_ADD_MEMBERSHIP  = 12;
+enum IP_DROP_MEMBERSHIP = 13;
+enum IP_MULTICAST_VIF   = 14;
+enum IP_RSVP_ON         = 15;
+enum IP_RSVP_OFF        = 16;
+enum IP_RSVP_VIF_ON     = 17;
+enum IP_RSVP_VIF_OFF    = 18;
+enum IP_PORTRANGE       = 19;
+enum IP_RECVIF          = 20;
+
+enum IP_IPSEC_POLICY = 21;
+
+enum IP_ONESBCAST         = 23;
+enum IP_BINDANY           = 24;
+enum IP_BINDMULTI         = 25;
+enum IP_RSS_LISTEN_BUCKET = 26;
+enum IP_ORIGDSTADDR       = 27;
+enum IP_RECVORIGDSTADDR   = IP_ORIGDSTADDR;
+
+enum IP_FW3       = 48;
+enum IP_DUMMYNET3 = 49;
+
+enum IP_ADD_SOURCE_MEMBERSHIP  = 70;
+enum IP_DROP_SOURCE_MEMBERSHIP = 71;
+enum IP_BLOCK_SOURCE           = 72;
+enum IP_UNBLOCK_SOURCE         = 73;
+
+enum MCAST_JOIN_GROUP         = 80;
+enum MCAST_LEAVE_GROUP        = 81;
+enum MCAST_JOIN_SOURCE_GROUP  = 82;
+enum MCAST_LEAVE_SOURCE_GROUP = 83;
+enum MCAST_BLOCK_SOURCE       = 84;
+enum MCAST_UNBLOCK_SOURCE     = 85;
+
+enum IP_FLOWID          = 90;
+enum IP_FLOWTYPE        = 91;
+enum IP_RSSBUCKETID     = 92;
+enum IP_RECVFLOWID      = 93;
+enum IP_RECVRSSBUCKETID = 94;
+
+enum IP_DEFAULT_MULTICAST_TTL  = 1;
+enum IP_DEFAULT_MULTICAST_LOOP = 1;
+
+enum IP_MIN_MEMBERSHIPS   = 31;
+enum IP_MAX_MEMBERSHIPS   = 4095;
+
+enum IP_MAX_GROUP_SRC_FILTER = 512;
+enum IP_MAX_SOCK_SRC_FILTER  = 128;
+
+struct ip_mreq
+{
+    in_addr imr_multiaddr;
+    in_addr imr_interface;
+};
+
+struct ip_mreqn
+{
+    in_addr imr_multiaddr;
+    in_addr imr_address;
+    int     imr_ifindex;
+};
+
+struct ip_mreq_source
+{
+    in_addr imr_multiaddr;
+    in_addr imr_sourceaddr;
+    in_addr imr_interface;
+};
+
+struct group_req
+{
+    uint gr_interface;
+    sockaddr_storage gr_group;
+};
+
+struct group_source_req
+{
+    uint gsr_interface;
+    sockaddr_storage gsr_group;
+    sockaddr_storage gsr_source;
+};
+
+int setipv4sourcefilter(int, in_addr, in_addr, uint, uint, in_addr*);
+int getipv4sourcefilter(int, in_addr, in_addr, uint*, uint*, in_addr*);
+int setsourcefilter(int, uint, sockaddr*, socklen_t, uint, uint, sockaddr_storage*);
+int getsourcefilter(int, uint, sockaddr*, socklen_t, uint*, uint*, sockaddr_storage*);
+
+enum MCAST_UNDEFINED = 0;
+enum MCAST_INCLUDE   = 1;
+enum MCAST_EXCLUDE   = 2;
+
+enum IP_PORTRANGE_DEFAULT = 0;
+enum IP_PORTRANGE_HIGH    = 1;
+enum IP_PORTRANGE_LOW     = 2;
+
+enum IPCTL_FORWARDING        = 1;
+enum IPCTL_SENDREDIRECTS     = 2;
+enum IPCTL_DEFTTL            = 3;
+enum IPCTL_DEFMTU            = 4;
+enum IPCTL_SOURCEROUTE       = 8;
+enum IPCTL_DIRECTEDBROADCAST = 9;
+enum IPCTL_INTRQMAXLEN       = 10;
+enum IPCTL_INTRQDROPS        = 11;
+enum IPCTL_STATS             = 12;
+enum IPCTL_ACCEPTSOURCEROUTE = 13;
+enum IPCTL_FASTFORWARDING    = 14;
+enum IPCTL_GIF_TTL           = 16;
+enum IPCTL_INTRDQMAXLEN      = 17;
+enum IPCTL_INTRDQDROPS       = 18;
+
+// =============================================================================
+// What follows is from netinet6/in6.h, but since netinet6/in6.h specifically
+// says that it should only be #included by #including netinet/in.h, it makes
+// more sense to put them in here so that the way they're imported corresponds
+// with the correct way of #including them in C/C++.
+// =============================================================================
+
+// The #if was around the #include of in6.h at the end of in.h.
+enum IPV6PORT_RESERVED    = 1024;
+enum IPV6PORT_ANONMIN     = 49152;
+enum IPV6PORT_ANONMAX     = 65535;
+enum IPV6PORT_RESERVEDMIN = 600;
+enum IPV6PORT_RESERVEDMAX = IPV6PORT_RESERVED - 1;
+
+enum IN6ADDR_ANY_INIT = in6_addr.init;
+enum IN6ADDR_LOOPBACK_INIT = in6_addr([0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01]);
+enum IN6ADDR_NODELOCAL_ALLNODES_INIT = in6_addr([0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01]);
+enum IN6ADDR_INTFACELOCAL_ALLNODES_INIT = in6_addr([0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01]);
+enum IN6ADDR_LINKLOCAL_ALLNODES_INIT = in6_addr([0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01]);
+enum IN6ADDR_LINKLOCAL_ALLROUTERS_INIT = in6_addr([0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02]);
+enum IN6ADDR_LINKLOCAL_ALLV2ROUTERS_INIT = in6_addr([0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16]);
+
+__gshared const in6_addr in6addr_nodelocal_allnodes;
+__gshared const in6_addr in6addr_linklocal_allnodes;
+__gshared const in6_addr in6addr_linklocal_allrouters;
+__gshared const in6_addr in6addr_linklocal_allv2routers;
+
+extern(D) bool IN6_ARE_ADDR_EQUAL(in6_addr* a, in6_addr* b) pure @safe { return *a == *b; }
+
+enum __IPV6_ADDR_SCOPE_NODELOCAL    = 0x01;
+enum __IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01;
+enum __IPV6_ADDR_SCOPE_LINKLOCAL    = 0x02;
+enum __IPV6_ADDR_SCOPE_SITELOCAL    = 0x05;
+enum __IPV6_ADDR_SCOPE_GLOBAL       = 0x0e;
+
+// TODO - requires declarations from elsewhere that we don't currently have bindings for.
+/+
+    struct route_in6
+    {
+        rtentry* ro_rt;
+        llentry* ro_lle;
+        char*    ro_prepend;
+        ushort   ro_plen;
+        ushort   ro_flags;
+        ushort   ro_mtu;
+        ushort   spare;
+        sockaddr_in6 ro_dst;
+    };
++/
+
+enum IPV6_SOCKOPT_RESERVED1 = 3;
+enum IPV6_PORTRANGE         = 14;
+enum ICMP6_FILTER           = 18;
+
+enum IPV6_CHECKSUM = 26;
+
+enum IPV6_IPSEC_POLICY = 28;
+
+enum IPV6_FW_ADD   = 30;
+enum IPV6_FW_DEL   = 31;
+enum IPV6_FW_FLUSH = 32;
+enum IPV6_FW_ZERO  = 33;
+enum IPV6_FW_GET   = 34;
+
+enum IPV6_RTHDRDSTOPTS = 35;
+
+enum IPV6_RECVPKTINFO  = 36;
+enum IPV6_RECVHOPLIMIT = 37;
+enum IPV6_RECVRTHDR    = 38;
+enum IPV6_RECVHOPOPTS  = 39;
+enum IPV6_RECVDSTOPTS  = 40;
+
+enum IPV6_USE_MIN_MTU = 42;
+enum IPV6_RECVPATHMTU = 43;
+
+enum IPV6_PATHMTU = 44;
+
+enum IPV6_PKTINFO  = 46;
+enum IPV6_HOPLIMIT = 47;
+enum IPV6_NEXTHOP  = 48;
+enum IPV6_HOPOPTS  = 49;
+enum IPV6_DSTOPTS  = 50;
+enum IPV6_RTHDR    = 51;
+
+enum IPV6_RECVTCLASS = 57;
+
+enum IPV6_AUTOFLOWLABEL = 59;
+
+enum IPV6_TCLASS   = 61;
+enum IPV6_DONTFRAG = 62;
+
+enum IPV6_PREFER_TEMPADDR = 63;
+
+enum IPV6_BINDANY   = 64;
+
+enum IPV6_BINDMULTI         = 65;
+enum IPV6_RSS_LISTEN_BUCKET = 66;
+enum IPV6_FLOWID            = 67;
+enum IPV6_FLOWTYPE          = 68;
+enum IPV6_RSSBUCKETID       = 69;
+enum IPV6_RECVFLOWID        = 70;
+enum IPV6_RECVRSSBUCKETID   = 71;
+
+enum IPV6_ORIGDSTADDR     = 72;
+enum IPV6_RECVORIGDSTADDR = IPV6_ORIGDSTADDR;
+
+enum IPV6_RTHDR_LOOSE  = 0;
+enum IPV6_RTHDR_STRICT = 1;
+enum IPV6_RTHDR_TYPE_0 = 0;
+
+enum IPV6_DEFAULT_MULTICAST_HOPS = 1;
+enum IPV6_DEFAULT_MULTICAST_LOOP = 1;
+
+enum IPV6_MIN_MEMBERSHIPS = 31;
+enum IPV6_MAX_MEMBERSHIPS = 4095;
+
+enum IPV6_MAX_GROUP_SRC_FILTER = 512;
+enum IPV6_MAX_SOCK_SRC_FILTER  = 128;
+
+struct in6_pktinfo
+{
+    in6_addr ipi6_addr;
+    uint     ipi6_ifindex;
+};
+
+struct ip6_mtuinfo
+{
+    sockaddr_in6 ip6m_addr;
+    uint         ip6m_mtu;
+};
+
+enum IPV6_PORTRANGE_DEFAULT = 0;
+enum IPV6_PORTRANGE_HIGH    = 1;
+enum IPV6_PORTRANGE_LOW     = 2;
+
+enum IPV6PROTO_MAXID =  IPPROTO_PIM + 1;
+
+enum IPV6CTL_FORWARDING         = 1;
+enum IPV6CTL_SENDREDIRECTS      = 2;
+enum IPV6CTL_DEFHLIM            = 3;
+enum IPV6CTL_DEFMTU             = 4;
+enum IPV6CTL_FORWSRCRT          = 5;
+enum IPV6CTL_STATS              = 6;
+enum IPV6CTL_MRTSTATS           = 7;
+enum IPV6CTL_MRTPROTO           = 8;
+enum IPV6CTL_MAXFRAGPACKETS     = 9;
+enum IPV6CTL_SOURCECHECK        = 10;
+enum IPV6CTL_SOURCECHECK_LOGINT = 11;
+enum IPV6CTL_ACCEPT_RTADV       = 12;
+
+enum IPV6CTL_LOG_INTERVAL   = 14;
+enum IPV6CTL_HDRNESTLIMIT   = 15;
+enum IPV6CTL_DAD_COUNT      = 16;
+enum IPV6CTL_AUTO_FLOWLABEL = 17;
+enum IPV6CTL_DEFMCASTHLIM   = 18;
+enum IPV6CTL_GIF_HLIM       = 19;
+enum IPV6CTL_KAME_VERSION   = 20;
+enum IPV6CTL_USE_DEPRECATED = 21;
+enum IPV6CTL_RR_PRUNE       = 22;
+enum IPV6CTL_V6ONLY         = 24;
+
+enum IPV6CTL_USETEMPADDR     = 32;
+enum IPV6CTL_TEMPPLTIME      = 33;
+enum IPV6CTL_TEMPVLTIME      = 34;
+enum IPV6CTL_AUTO_LINKLOCAL  = 35;
+enum IPV6CTL_RIP6STATS       = 36;
+enum IPV6CTL_PREFER_TEMPADDR = 37;
+enum IPV6CTL_ADDRCTLPOLICY   = 38;
+enum IPV6CTL_USE_DEFAULTZONE = 39;
+
+enum IPV6CTL_MAXFRAGS   = 41;
+enum IPV6CTL_MCAST_PMTU = 44;
+
+enum IPV6CTL_STEALTH = 45;
+
+enum ICMPV6CTL_ND6_ONLINKNSRFC4861 = 47;
+enum IPV6CTL_NO_RADR     = 48;
+enum IPV6CTL_NORBIT_RAIF = 49;
+
+enum IPV6CTL_RFC6204W3 = 50;
+
+enum IPV6CTL_INTRQMAXLEN  = 51;
+enum IPV6CTL_INTRDQMAXLEN = 52;
+
+enum IPV6CTL_MAXID = 53;
+
+// TODO - require declarations from elsewhere that we don't currently have bindings for.
+/+
+enum M_FASTFWD_OURS  = M_PROTO1;
+enum M_IP6_NEXTHOP   = M_PROTO2;
+enum M_IP_NEXTHOP    = M_PROTO2;
+enum M_SKIP_FIREWALL = M_PROTO3;
+enum M_AUTHIPHDR     = M_PROTO4;
+enum M_DECRYPTED     = M_PROTO5;
+enum M_LOOP          = M_PROTO6;
+enum M_AUTHIPDGM     = M_PROTO7;
+enum M_RTALERT_MLD   = M_PROTO8;
++/
+
+size_t inet6_rthdr_space(int, int) @trusted;
+cmsghdr* inet6_rthdr_init(void*, int);
+int inet6_rthdr_add(cmsghdr*, const in6_addr*, uint);
+int inet6_rthdr_lasthop(cmsghdr*, uint);
+int inet6_rthdr_segments(const cmsghdr*);
+in6_addr* inet6_rthdr_getaddr(cmsghdr*, int);
+int inet6_rthdr_getflags(const cmsghdr*, int);
+
+int inet6_opt_init(void*, socklen_t);
+int inet6_opt_append(void*, socklen_t, int, ubyte, socklen_t, ubyte, void**);
+int inet6_opt_finish(void*, socklen_t, int);
+int inet6_opt_set_val(void*, int, void*, socklen_t);
+
+int inet6_opt_next(void*, socklen_t, int, ubyte*, socklen_t*, void**);
+int inet6_opt_find(void*, socklen_t, int, ubyte, socklen_t*, void**);
+int inet6_opt_get_val(void*, int, void*, socklen_t);
+socklen_t inet6_rth_space(int, int) @trusted;
+void* inet6_rth_init(void*, socklen_t, int, int);
+int inet6_rth_add(void*, const in6_addr*);
+int inet6_rth_reverse(const void*, void*);
+int inet6_rth_segments(const void*);
+in6_addr* inet6_rth_getaddr(const void*, int);
diff --git a/libphobos/libdruntime/core/sys/dragonflybsd/pthread_np.d b/libphobos/libdruntime/core/sys/dragonflybsd/pthread_np.d
new file mode 100644
index 000000000..7912b3b8d
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/dragonflybsd/pthread_np.d
@@ -0,0 +1,45 @@
+/**
+ * D header file for DragonFlyBSD
+ *
+ * Authors: Martin Nowak,Diederik de Groot(port:DragonFlyBSD)
+ * Copied:  From core/sys/freebsd/sys
+ */
+module core.sys.dragonflybsd.pthread_np;
+
+version (DragonFlyBSD):
+
+extern (C) nothrow @nogc @system:
+
+public import core.sys.posix.sys.types;
+// TODO: add full core.sys.dragonflybsd.sys.cpuset;
+public import core.sys.dragonflybsd.sys._cpuset;
+public import core.sys.posix.time;
+
+alias pthread_switch_routine_t = void function(pthread_t, pthread_t);
+
+int pthread_attr_get_np(pthread_t, pthread_attr_t *);
+int pthread_attr_getaffinity_np(const(pthread_attr_t)*, size_t, cpuset_t *);
+int pthread_attr_setaffinity_np(pthread_attr_t *, size_t, const(cpuset_t)*);
+int pthread_attr_setcreatesuspend_np(pthread_attr_t *);
+int pthread_getaffinity_np(pthread_t, size_t, cpuset_t *);
+int pthread_main_np();
+int pthread_multi_np();
+int pthread_mutexattr_getkind_np(pthread_mutexattr_t);
+int pthread_mutexattr_setkind_np(pthread_mutexattr_t *, int);
+void pthread_resume_all_np();
+int pthread_resume_np(pthread_t);
+void pthread_set_name_np(pthread_t, const(char)*);
+int pthread_setaffinity_np(pthread_t, size_t, const(cpuset_t)*);
+int pthread_single_np();
+void pthread_suspend_all_np();
+int pthread_suspend_np(pthread_t);
+int pthread_switch_add_np(pthread_switch_routine_t);
+int pthread_switch_delete_np(pthread_switch_routine_t);
+int pthread_timedjoin_np(pthread_t, void **, const(timespec)*);
+
+//int pthread_getthreadid_np();
+//int pthread_mutex_getspinloops_np(pthread_mutex_t *mutex, int *count);
+//int pthread_mutex_setspinloops_np(pthread_mutex_t *mutex, int count);
+//int pthread_mutex_getyieldloops_np(pthread_mutex_t *mutex, int *count);
+//int pthread_mutex_setyieldloops_np(pthread_mutex_t *mutex, int count);
+//int pthread_mutex_isowned_np(pthread_mutex_t *mutex);
diff --git a/libphobos/libdruntime/core/sys/dragonflybsd/sys/_bitset.d b/libphobos/libdruntime/core/sys/dragonflybsd/sys/_bitset.d
new file mode 100644
index 000000000..24f9d9c1f
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/dragonflybsd/sys/_bitset.d
@@ -0,0 +1,46 @@
+/**
+ * D header file for DragonFlyBSD.
+ *
+ * Authors: Martin Nowak, Diederik de Groot(port:DragonFlyBSD)
+ * Copied:  From core/sys/freebsd/sys
+ */
+module core.sys.dragonflybsd.sys._bitset;
+
+version (DragonFlyBSD):
+extern (C) pure nothrow @nogc @system:
+
+import core.stdc.config : c_long;
+
+enum NBBY = 8; // number of bits per byte
+
+enum _BITSET_BITS = c_long.sizeof * NBBY;
+
+enum __bitset_words(size_t s) = (s + _BITSET_BITS - 1) / _BITSET_BITS;
+
+c_long __bitset_mask(size_t s)(size_t n)
+{
+    static if (__bitset_words!s == 1)
+        return (cast(c_long)1) << n;
+    else
+        return (cast(c_long)1) << n % _BITSET_BITS;
+}
+
+size_t __bitset_word(size_t s)(size_t n)
+{
+    static if (__bitset_words!s == 1)
+        return 0;
+    else
+        return n / _BITSET_BITS;
+}
+
+struct BITSET_DEFINE(size_t s)
+{
+    c_long[__bitset_words!s] __bits;
+}
+
+// no idea how to translate those
+//#define BITSET_T_INITIALIZER(x)                     \
+//    { .__bits = { x } }
+//
+//#define BITSET_FSET(n)                          \
+//    [ 0 ... ((n) - 1) ] = (-1L)
diff --git a/libphobos/libdruntime/core/sys/dragonflybsd/sys/_cpuset.d b/libphobos/libdruntime/core/sys/dragonflybsd/sys/_cpuset.d
new file mode 100644
index 000000000..d975d1064
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/dragonflybsd/sys/_cpuset.d
@@ -0,0 +1,29 @@
+/**
+ * D header file for DragonFlyBSD.
+ *
+ * Authors: Martin Nowak, Diederik de Groot(port:DragonFlyBSD)
+ * Copied:  From core/sys/freebsd/sys
+ */
+module core.sys.dragonflybsd.sys._cpuset;
+
+version (DragonFlyBSD):
+
+public import core.sys.dragonflybsd.sys._bitset;
+
+static if (is(typeof(_KERNEL)))
+    alias CPU_SETSIZE = MAXCPU;
+
+enum CPU_MAXSIZE = 256;
+
+static if (!is(typeof(CPU_SETSIZE)))
+    alias CPU_SETSIZE = CPU_MAXSIZE;
+
+enum _NCPUBITS = _BITSET_BITS;
+enum _NCPUWORDS = __bitset_words!CPU_SETSIZE;
+
+alias _cpuset = BITSET_DEFINE!(CPU_SETSIZE);
+alias cpuset_t = _cpuset;
+
+// no idea how to translate those
+//#define CPUSET_FSET BITSET_FSET(_NCPUWORDS)
+//#define CPUSET_T_INITIALIZER BITSET_T_INITIALIZER
diff --git a/libphobos/libdruntime/core/sys/dragonflybsd/sys/cdefs.d b/libphobos/libdruntime/core/sys/dragonflybsd/sys/cdefs.d
new file mode 100644
index 000000000..ede6b6425
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/dragonflybsd/sys/cdefs.d
@@ -0,0 +1,16 @@
+/**
+ * D header file for DragonFlyBSD
+ *
+ * Authors: Martin Nowak,Diederik de Groot(port:DragonFlyBSD)
+ * Copied:  From core/sys/freebsd/sys
+ */
+module core.sys.dragonflybsd.sys.cdefs;
+
+version (DragonFlyBSD):
+
+public import core.sys.posix.config;
+
+enum __POSIX_VISIBLE = 200112;
+enum __XSI_VISIBLE = 700;
+enum __BSD_VISIBLE = true;
+enum __ISO_C_VISIBLE = 1999;
diff --git a/libphobos/libdruntime/core/sys/dragonflybsd/sys/elf.d b/libphobos/libdruntime/core/sys/dragonflybsd/sys/elf.d
new file mode 100644
index 000000000..ef032014d
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/dragonflybsd/sys/elf.d
@@ -0,0 +1,12 @@
+/**
+ * D header file for DragonFlyBSD.
+ *
+ * Authors: Diederik de Groot(port:DragonFlyBSD)
+ * Copied:  From core/sys/freebsd/sys
+ */
+module core.sys.dragonflybsd.sys.elf;
+
+version (DragonFlyBSD):
+
+public import core.sys.dragonflybsd.sys.elf32;
+public import core.sys.dragonflybsd.sys.elf64;
diff --git a/libphobos/libdruntime/core/sys/dragonflybsd/sys/elf32.d b/libphobos/libdruntime/core/sys/dragonflybsd/sys/elf32.d
new file mode 100644
index 000000000..92d4a4621
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/dragonflybsd/sys/elf32.d
@@ -0,0 +1,187 @@
+/**
+ * D header file for DragonFlyBSD.
+ *
+ * Authors: Diederik de Groot(port:DragonFlyBSD)
+ * Copied:  From core/sys/freebsd/sys
+ */
+module core.sys.dragonflybsd.sys.elf32;
+
+version (DragonFlyBSD):
+
+extern (C):
+
+import core.stdc.stdint;
+public import core.sys.dragonflybsd.sys.elf_common;
+
+alias uint16_t Elf32_Half;
+alias uint32_t Elf32_Word;
+alias int32_t  Elf32_Sword;
+alias uint64_t Elf32_Lword;
+alias uint32_t Elf32_Addr;
+alias uint32_t Elf32_Off;
+alias Elf32_Word Elf32_Hashelt;
+alias Elf32_Word Elf32_Size;
+alias Elf32_Sword Elf32_Ssize;
+
+struct Elf32_Ehdr
+{
+    char[EI_NIDENT] e_ident;
+    Elf32_Half    e_type;
+    Elf32_Half    e_machine;
+    Elf32_Word    e_version;
+    Elf32_Addr    e_entry;
+    Elf32_Off     e_phoff;
+    Elf32_Off     e_shoff;
+    Elf32_Word    e_flags;
+    Elf32_Half    e_ehsize;
+    Elf32_Half    e_phentsize;
+    Elf32_Half    e_phnum;
+    Elf32_Half    e_shentsize;
+    Elf32_Half    e_shnum;
+    Elf32_Half    e_shstrndx;
+}
+
+struct Elf32_Shdr
+{
+    Elf32_Word    sh_name;
+    Elf32_Word    sh_type;
+    Elf32_Word    sh_flags;
+    Elf32_Addr    sh_addr;
+    Elf32_Off     sh_offset;
+    Elf32_Word    sh_size;
+    Elf32_Word    sh_link;
+    Elf32_Word    sh_info;
+    Elf32_Word    sh_addralign;
+    Elf32_Word    sh_entsize;
+}
+
+struct Elf32_Phdr
+{
+    Elf32_Word    p_type;
+    Elf32_Off     p_offset;
+    Elf32_Addr    p_vaddr;
+    Elf32_Addr    p_paddr;
+    Elf32_Word    p_filesz;
+    Elf32_Word    p_memsz;
+    Elf32_Word    p_flags;
+    Elf32_Word    p_align;
+}
+
+struct Elf32_Dyn
+{
+  Elf32_Sword   d_tag;
+  union _d_un
+  {
+      Elf32_Word d_val;
+      Elf32_Addr d_ptr;
+  } _d_un d_un;
+}
+
+struct Elf32_Rel
+{
+    Elf32_Addr    r_offset;
+    Elf32_Word    r_info;
+}
+
+struct Elf32_Rela
+{
+    Elf32_Addr    r_offset;
+    Elf32_Word    r_info;
+    Elf32_Sword   r_addend;
+}
+
+extern (D) pure @safe
+{
+    auto ELF32_R_SYM(V)(V val) { return val >> 8; }
+    auto ELF32_R_TYPE(V)(V val) { return val & 0xff; }
+    auto ELF32_R_INFO(S, T)(S sym, T type) { return (sym << 8) + (type & 0xff); }
+}
+
+alias Elf_Note Elf32_Nhdr;
+
+struct Elf32_Move
+{
+    Elf32_Lword   m_value;
+    Elf32_Word    m_info;
+    Elf32_Word    m_poffset;
+    Elf32_Half    m_repeat;
+    Elf32_Half    m_stride;
+}
+
+extern (D) pure
+{
+    auto ELF32_M_SYM(I)(I info) @safe { return info >> 8; }
+    auto ELF32_M_SIZE(I)(I info) { return cast(ubyte)info; }
+    auto ELF32_M_INFO(S, SZ)(S sym, SZ size) { return (sym << 8) + cast(ubye)size; }
+}
+
+struct Elf32_Cap
+{
+    Elf32_Word    c_tag;
+    union _c_un
+    {
+        Elf32_Word      c_val;
+        Elf32_Addr      c_ptr;
+    } _c_un c_un;
+}
+
+struct Elf32_Sym
+{
+    Elf32_Word    st_name;
+    Elf32_Addr    st_value;
+    Elf32_Word    st_size;
+    ubyte st_info;
+    ubyte st_other;
+    Elf32_Half st_shndx;
+}
+
+extern (D) pure
+{
+    auto ELF32_ST_BIND(T)(T val) { return cast(ubyte)val >> 4; }
+    auto ELF32_ST_TYPE(T)(T val) @safe { return val & 0xf; }
+    auto ELF32_ST_INFO(B, T)(B bind, T type) @safe { return (bind << 4) + (type & 0xf); }
+    auto ELF32_ST_VISIBILITY(O)(O o) @safe { return o & 0x03; }
+}
+
+struct Elf32_Verdef
+{
+    Elf32_Half    vd_version;
+    Elf32_Half    vd_flags;
+    Elf32_Half    vd_ndx;
+    Elf32_Half    vd_cnt;
+    Elf32_Word    vd_hash;
+    Elf32_Word    vd_aux;
+    Elf32_Word    vd_next;
+}
+
+struct Elf32_Verdaux
+{
+    Elf32_Word    vda_name;
+    Elf32_Word    vda_next;
+}
+
+struct Elf32_Verneed
+{
+    Elf32_Half    vn_version;
+    Elf32_Half    vn_cnt;
+    Elf32_Word    vn_file;
+    Elf32_Word    vn_aux;
+    Elf32_Word    vn_next;
+}
+
+struct Elf32_Vernaux
+{
+    Elf32_Word    vna_hash;
+    Elf32_Half    vna_flags;
+    Elf32_Half    vna_other;
+    Elf32_Word    vna_name;
+    Elf32_Word    vna_next;
+}
+
+alias Elf32_Half Elf32_Versym;
+
+struct Elf32_Syminfo
+{
+    Elf32_Half si_boundto;
+    Elf32_Half si_flags;
+}
diff --git a/libphobos/libdruntime/core/sys/dragonflybsd/sys/elf64.d b/libphobos/libdruntime/core/sys/dragonflybsd/sys/elf64.d
new file mode 100644
index 000000000..38db4cd8e
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/dragonflybsd/sys/elf64.d
@@ -0,0 +1,193 @@
+/**
+ * D header file for DragonFlyBSD.
+ *
+ * Authors: Diederik de Groot(port:DragonFlyBSD)
+ * Copied:  From core/sys/freebsd/sys
+ */
+module core.sys.dragonflybsd.sys.elf64;
+
+version (DragonFlyBSD):
+
+extern (C):
+
+import core.stdc.stdint;
+public import core.sys.dragonflybsd.sys.elf_common;
+
+alias uint16_t Elf64_Half;
+alias uint32_t Elf64_Word;
+alias int32_t  Elf64_Sword;
+alias uint64_t Elf64_Lword;
+alias uint64_t Elf64_Xword;
+alias int64_t  Elf64_Sxword;
+alias uint64_t Elf64_Addr;
+alias uint64_t Elf64_Off;
+alias Elf64_Word Elf64_Hashelt;
+alias Elf64_Xword Elf64_Size;
+alias Elf64_Sxword Elf64_Ssize;
+
+struct Elf64_Ehdr
+{
+    char[EI_NIDENT] e_ident;
+    Elf64_Half    e_type;
+    Elf64_Half    e_machine;
+    Elf64_Word    e_version;
+    Elf64_Addr    e_entry;
+    Elf64_Off     e_phoff;
+    Elf64_Off     e_shoff;
+    Elf64_Word    e_flags;
+    Elf64_Half    e_ehsize;
+    Elf64_Half    e_phentsize;
+    Elf64_Half    e_phnum;
+    Elf64_Half    e_shentsize;
+    Elf64_Half    e_shnum;
+    Elf64_Half    e_shstrndx;
+}
+
+struct Elf64_Shdr
+{
+    Elf64_Word    sh_name;
+    Elf64_Word    sh_type;
+    Elf64_Xword   sh_flags;
+    Elf64_Addr    sh_addr;
+    Elf64_Off     sh_offset;
+    Elf64_Xword   sh_size;
+    Elf64_Word    sh_link;
+    Elf64_Word    sh_info;
+    Elf64_Xword   sh_addralign;
+    Elf64_Xword   sh_entsize;
+}
+
+struct Elf64_Phdr
+{
+    Elf64_Word    p_type;
+    Elf64_Word    p_flags;
+    Elf64_Off     p_offset;
+    Elf64_Addr    p_vaddr;
+    Elf64_Addr    p_paddr;
+    Elf64_Xword   p_filesz;
+    Elf64_Xword   p_memsz;
+    Elf64_Xword   p_align;
+}
+
+struct Elf64_Dyn
+{
+  Elf64_Sxword  d_tag;
+  union _d_un
+  {
+      Elf64_Xword d_val;
+      Elf64_Addr d_ptr;
+  } _d_un d_un;
+}
+
+struct Elf64_Rel
+{
+    Elf64_Addr    r_offset;
+    Elf64_Xword   r_info;
+}
+
+struct Elf64_Rela
+{
+    Elf64_Addr    r_offset;
+    Elf64_Xword   r_info;
+    Elf64_Sxword  r_addend;
+}
+
+extern (D) pure
+{
+    auto ELF64_R_SYM(I)(I i) @safe { return i >> 32; }
+    auto ELF64_R_TYPE(I)(I i) @safe { return i & 0xffffffff; }
+    auto ELF64_R_INFO(S, T)(S sym, T type) @safe { return (sym << 32) + (type & 0xffffffff); }
+
+    auto ELF64_R_TYPE_DATA(I)(I i) { return (cast(Elf64_Xword) i << 32) >> 40; }
+    auto ELF64_R_TYPE_ID(I)(I i) { return (cast(Elf64_Xword) i << 56 ) >> 56; }
+    auto ELF64_R_TYPE_INFO(D, T)(D d, T t) { return cast(Elf64_Xword) d << 8 + cast(Elf64_Xword) t; }
+}
+
+alias Elf_Note Elf64_Nhdr;
+
+struct Elf64_Move
+{
+    Elf64_Lword   m_value;
+    Elf64_Xword   m_info;
+    Elf64_Xword   m_poffset;
+    Elf64_Half    m_repeat;
+    Elf64_Half    m_stride;
+}
+
+extern (D) pure
+{
+    auto ELF64_M_SYM(I)(I info) @safe { return info >> 8; }
+    auto ELF64_M_SIZE(I)(I info) { return cast(ubyte)info; }
+    auto ELF64_M_INFO(S, SZ)(S sym, SZ size) @safe { return (sym << 8) + cast(ubye)size; }
+}
+
+struct Elf64_Cap
+{
+    Elf64_Xword   c_tag;
+    union _c_un
+    {
+        Elf64_Xword     c_val;
+        Elf64_Addr      c_ptr;
+    } _c_un c_un;
+}
+
+struct Elf64_Sym
+{
+    Elf64_Word    st_name;
+    ubyte st_info;
+    ubyte st_other;
+    Elf64_Half st_shndx;
+    Elf64_Addr    st_value;
+    Elf64_Xword   st_size;
+}
+
+extern (D) pure
+{
+    auto ELF64_ST_BIND(T)(T val) { return cast(ubyte)val >> 4; }
+    auto ELF64_ST_TYPE(T)(T val) @safe { return val & 0xf; }
+    auto ELF64_ST_INFO(B, T)(B bind, T type) @safe { return (bind << 4) + (type & 0xf); }
+    auto ELF64_ST_VISIBILITY(O)(O o) @safe { return o & 0x03; }
+}
+
+struct Elf64_Verdef
+{
+    Elf64_Half    vd_version;
+    Elf64_Half    vd_flags;
+    Elf64_Half    vd_ndx;
+    Elf64_Half    vd_cnt;
+    Elf64_Word    vd_hash;
+    Elf64_Word    vd_aux;
+    Elf64_Word    vd_next;
+}
+
+struct Elf64_Verdaux
+{
+    Elf64_Word    vda_name;
+    Elf64_Word    vda_next;
+}
+
+struct Elf64_Verneed
+{
+    Elf64_Half    vn_version;
+    Elf64_Half    vn_cnt;
+    Elf64_Word    vn_file;
+    Elf64_Word    vn_aux;
+    Elf64_Word    vn_next;
+}
+
+struct Elf64_Vernaux
+{
+    Elf64_Word    vna_hash;
+    Elf64_Half    vna_flags;
+    Elf64_Half    vna_other;
+    Elf64_Word    vna_name;
+    Elf64_Word    vna_next;
+}
+
+alias Elf64_Half Elf64_Versym;
+
+struct Elf64_Syminfo
+{
+    Elf64_Half si_boundto;
+    Elf64_Half si_flags;
+}
diff --git a/libphobos/libdruntime/core/sys/dragonflybsd/sys/elf_common.d b/libphobos/libdruntime/core/sys/dragonflybsd/sys/elf_common.d
new file mode 100644
index 000000000..eef6a89e7
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/dragonflybsd/sys/elf_common.d
@@ -0,0 +1,676 @@
+/**
+ * D header file for DragonFlyBSD.
+ *
+ * Authors: Diederik de Groot(port:DragonFlyBSD)
+ * Copied:  From core/sys/freebsd/sys
+ */
+module core.sys.dragonflybsd.sys.elf_common;
+
+version (DragonFlyBSD):
+
+extern (C):
+
+import core.stdc.stdint;
+
+struct Elf_Note
+{
+    uint32_t      n_namesz;
+    uint32_t      n_descsz;
+    uint32_t      n_type;
+}
+
+struct Elf_GNU_Hash_Header
+{
+    uint32_t      gh_nbuckets;
+    uint32_t      gh_symndx;
+    uint32_t      gh_maskwords;
+    uint32_t      gh_shift2;
+}
+
+enum EI_MAG0 =         0;
+enum EI_MAG1 =         1;
+enum EI_MAG2 =         2;
+enum EI_MAG3 =         3;
+enum EI_CLASS =        4;
+enum EI_DATA =         5;
+enum EI_VERSION =      6;
+enum EI_OSABI =        7;
+enum EI_ABIVERSION =   8;
+enum OLD_EI_BRAND =    8;
+enum EI_PAD =          9;
+enum EI_NIDENT =       16;
+
+enum ELFMAG0 =         0x7f;
+enum ELFMAG1 =         'E';
+enum ELFMAG2 =         'L';
+enum ELFMAG3 =         'F';
+enum ELFMAG =          "\177ELF";
+enum SELFMAG =         4;
+
+enum EV_NONE =         0;
+enum EV_CURRENT =      1;
+
+enum ELFCLASSNONE =    0;
+enum ELFCLASS32 =      1;
+enum ELFCLASS64 =      2;
+
+enum ELFDATANONE =     0;
+enum ELFDATA2LSB =     1;
+enum ELFDATA2MSB =     2;
+
+enum ELFOSABI_NONE =           0;
+enum ELFOSABI_SYSV =           0;
+enum ELFOSABI_HPUX =           1;
+enum ELFOSABI_NETBSD =         2;
+enum ELFOSABI_LINUX =          3;
+enum ELFOSABI_HURD  =          4;
+enum ELFOSABI_86OPEN =         5;
+enum ELFOSABI_SOLARIS =        6;
+enum ELFOSABI_AIX =            7;
+enum ELFOSABI_MONTEREY =       7;
+enum ELFOSABI_IRIX =           8;
+enum ELFOSABI_FREEBSD =        9;
+enum ELFOSABI_TRU64 =          10;
+enum ELFOSABI_MODESTO =        11;
+enum ELFOSABI_OPENBSD =        12;
+enum ELFOSABI_OPENVMS =        13;
+enum ELFOSABI_NSK =            14;
+enum ELFOSABI_AROS =           15;
+enum ELFOSABI_ARM =            97;
+enum ELFOSABI_STANDALONE =     255;
+
+// just a pointer
+enum ELFOSABI_DRAGONFLYBSD =   ELFOSABI_NONE;
+
+extern (D) pure @safe
+{
+    auto IS_ELF(T)(T ehdr) { return ehdr.e_ident[EI_MAG0] == ELFMAG0 &&
+                                    ehdr.e_ident[EI_MAG1] == ELFMAG1 &&
+                                    ehdr.e_ident[EI_MAG2] == ELFMAG2 &&
+                                    ehdr.e_ident[EI_MAG3] == ELFMAG3; }
+}
+
+enum ET_NONE =         0;
+enum ET_REL =          1;
+enum ET_EXEC =         2;
+enum ET_DYN =          3;
+enum ET_CORE =         4;
+enum ET_LOOS =         0xfe00;
+enum ET_HIOS =         0xfeff;
+enum ET_LOPROC =       0xff00;
+enum ET_HIPROC =       0xffff;
+
+enum EM_NONE =          0;
+enum EM_M32 =           1;
+enum EM_SPARC =         2;
+enum EM_386 =           3;
+enum EM_68K =           4;
+enum EM_88K =           5;
+enum EM_860 =           7;
+enum EM_MIPS =          8;
+enum EM_S370 =          9;
+enum EM_MIPS_RS3_LE =  10;
+enum EM_PARISC =       15;
+enum EM_VPP500 =       17;
+enum EM_SPARC32PLUS =  18;
+enum EM_960 =          19;
+enum EM_PPC =          20;
+enum EM_PPC64 =        21;
+enum EM_S390 =         22;
+enum EM_V800 =         36;
+enum EM_FR20 =         37;
+enum EM_RH32 =         38;
+enum EM_RCE =          39;
+enum EM_ARM =          40;
+enum EM_SH =           42;
+enum EM_SPARCV9 =      43;
+enum EM_TRICORE =      44;
+enum EM_ARC =          45;
+enum EM_H8_300 =       46;
+enum EM_H8_300H =      47;
+enum EM_H8S =          48;
+enum EM_H8_500 =       49;
+enum EM_IA_64 =        50;
+enum EM_MIPS_X =       51;
+enum EM_COLDFIRE =     52;
+enum EM_68HC12 =       53;
+enum EM_MMA =          54;
+enum EM_PCP =          55;
+enum EM_NCPU =         56;
+enum EM_NDR1 =         57;
+enum EM_STARCORE =     58;
+enum EM_ME16 =         59;
+enum EM_ST100 =        60;
+enum EM_TINYJ =        61;
+enum EM_X86_64 =       62;
+enum EM_AMD64 =        62;
+enum EM_PDSP =         63;
+enum EM_FX66 =         66;
+enum EM_ST9PLUS =      67;
+enum EM_ST7 =          68;
+enum EM_68HC16 =       69;
+enum EM_68HC11 =       70;
+enum EM_68HC08 =       71;
+enum EM_68HC05 =       72;
+enum EM_SVX =          73;
+enum EM_ST19 =         74;
+enum EM_VAX =          75;
+enum EM_CRIS =         76;
+enum EM_JAVELIN =      77;
+enum EM_FIREPATH =     78;
+enum EM_ZSP =          79;
+enum EM_MMIX =         80;
+enum EM_HUANY =        81;
+enum EM_PRISM =        82;
+enum EM_AVR =          83;
+enum EM_FR30 =         84;
+enum EM_D10V =         85;
+enum EM_D30V =         86;
+enum EM_V850 =         87;
+enum EM_M32R =         88;
+enum EM_MN10300 =      89;
+enum EM_MN10200 =      90;
+enum EM_PJ =           91;
+enum EM_OPENRISC =     92;
+enum EM_ARC_A5 =       93;
+enum EM_XTENSA =       94;
+enum EM_VIDEOCORE =    95;
+enum EM_TMM_GPP =      96;
+enum EM_NS32K =        97;
+enum EM_TPC =          98;
+enum EM_SNP1K =        99;
+enum EM_ST200 =       100;
+enum EM_IP2K =        101;
+enum EM_MAX =         102;
+enum EM_CR =          103;
+enum EM_F2MC16 =      104;
+enum EM_MSP430 =      105;
+enum EM_BLACKFIN =    106;
+enum EM_SE_C33 =      107;
+enum EM_SEP =         108;
+enum EM_ARCA =        109;
+enum EM_UNICORE =     110;
+enum EM_DXP =         112;
+enum EM_ALTERA_NIOS2 =113;
+enum EM_CRX =         114;
+enum EM_XGATE =       115;
+enum EM_C166  =       116;
+enum EM_M16C  =       117;
+enum EM_DSPIC30F =    118;
+enum EM_CE =          119;
+enum EM_M32C  =       120;
+enum EM_res121 =      121;
+enum EM_res122 =      122;
+enum EM_res123 =      123;
+enum EM_res124 =      124;
+enum EM_res125 =      125;
+enum EM_res126 =      126;
+enum EM_res127 =      127;
+enum EM_res128 =      128;
+enum EM_res129 =      129;
+enum EM_res130 =      130;
+enum EM_TSK3000 =     131;
+enum EM_RS08  =       132;
+enum EM_res133 =      133;
+enum EM_ECOG2 =       134;
+enum EM_SCORE =       135;
+enum EM_SCORE7 =      135;
+enum EM_DSP24 =       136;
+enum EM_VIDEOCORE3 =  137;
+enum EM_LATTICEMICO32 = 138;
+enum EM_SE_C17 =      139;
+enum EM_TI_C6000 =    140;
+enum EM_TI_C2000 =    141;
+enum EM_TI_C5500 =    142;
+enum EM_res143 =      143;
+enum EM_res144 =      144;
+enum EM_res145 =      145;
+enum EM_res146 =      146;
+enum EM_res147 =      147;
+enum EM_res148 =      148;
+enum EM_res149 =      149;
+enum EM_res150 =      150;
+enum EM_res151 =      151;
+enum EM_res152 =      152;
+enum EM_res153 =      153;
+enum EM_res154 =      154;
+enum EM_res155 =      155;
+enum EM_res156 =      156;
+enum EM_res157 =      157;
+enum EM_res158 =      158;
+enum EM_res159 =      159;
+enum EM_MMDSP_PLUS =  160;
+enum EM_CYPRESS_M8C = 161;
+enum EM_R32C  =       162;
+enum EM_TRIMEDIA =    163;
+enum EM_QDSP6 =       164;
+enum EM_8051  =       165;
+enum EM_STXP7X =      166;
+enum EM_NDS32 =       167;
+enum EM_ECOG1 =       168;
+enum EM_ECOG1X =      168;
+enum EM_MAXQ30 =      169;
+enum EM_XIMO16 =      170;
+enum EM_MANIK =       171;
+enum EM_CRAYNV2 =     172;
+enum EM_RX =          173;
+enum EM_METAG =       174;
+enum EM_MCST_ELBRUS = 175;
+enum EM_ECOG16 =      176;
+enum EM_CR16  =       177;
+enum EM_ETPU  =       178;
+enum EM_SLE9X =       179;
+enum EM_L1OM  =       180;
+enum EM_K1OM  =       181;
+enum EM_INTEL182 =    182;
+enum EM_res183 =      183;
+enum EM_res184 =      184;
+enum EM_AVR32 =       185;
+enum EM_STM8  =       186;
+enum EM_TILE64 =      187;
+enum EM_TILEPRO =     188;
+enum EM_MICROBLAZE =  189;
+enum EM_CUDA  =       190;
+enum EM_TILEGX =      191;
+
+enum EM_486 =           6;
+enum EM_MIPS_RS4_BE =  10;
+enum EM_ALPHA_STD =    41;
+enum EM_ALPHA =    0x9026;
+
+enum SHN_UNDEF =       0;
+enum SHN_LORESERVE =   0xff00;
+enum SHN_LOPROC =      0xff00;
+enum SHN_HIPROC =      0xff1f;
+enum SHN_LOOS =        0xff20;
+enum SHN_HIOS =        0xff3f;
+enum SHN_ABS =         0xfff1;
+enum SHN_COMMON =      0xfff2;
+enum SHN_XINDEX =      0xffff;
+enum SHN_HIRESERVE =   0xffff;
+
+enum PT_NULL =         0;
+enum PT_LOAD =         1;
+enum PT_DYNAMIC =      2;
+enum PT_INTERP =       3;
+enum PT_NOTE =         4;
+enum PT_SHLIB =        5;
+enum PT_PHDR =         6;
+enum PT_TLS =          7;
+enum PT_LOOS =         0x60000000;
+enum PT_HIOS =         0x6fffffff;
+enum PT_LOPROC =       0x70000000;
+enum PT_HIPROC =       0x7fffffff;
+
+enum PT_GNU_EH_FRAME =  PT_LOOS + 0x474e550; /* Frame unwind information */
+enum PT_SUNW_EH_FRAME = PT_GNU_EH_FRAME;     /* Solaris uses the same value */
+enum PT_GNU_STACK =     PT_LOOS + 0x474e551; /* Stack flags */
+enum PT_GNU_RELRO =     PT_LOOS + 0x474e552;  /* Read-only after relocation */
+
+enum PF_X =            0x1;
+enum PF_W =            0x2;
+enum PF_R =            0x4;
+enum PF_MASKOS =       0x0ff00000;
+enum PF_MASKPROC =     0xf0000000;
+
+enum PN_XNUM =         0xffff;
+
+enum SHT_NULL =          0;
+enum SHT_PROGBITS =      1;
+enum SHT_SYMTAB =        2;
+enum SHT_STRTAB =        3;
+enum SHT_RELA =          4;
+enum SHT_HASH =          5;
+enum SHT_DYNAMIC =       6;
+enum SHT_NOTE =          7;
+enum SHT_NOBITS =        8;
+enum SHT_REL =           9;
+enum SHT_SHLIB =         10;
+enum SHT_DYNSYM =        11;
+
+enum SHT_INIT_ARRAY =    14;
+enum SHT_FINI_ARRAY =    15;
+enum SHT_PREINIT_ARRAY = 16;
+enum SHT_GROUP =         17;
+enum SHT_SYMTAB_SHNDX =  18;
+
+enum SHT_LOOS =          0x60000000;
+enum SHT_LOSUNW =        0x6ffffff4;
+
+enum SHT_GNU_INCREMENTAL_INPUTS =  0x6fff4700;
+enum SHT_GNU_ATTRIBUTES =       0x6ffffff5;
+enum SHT_GNU_HASH =             0x6ffffff6;
+enum SHT_GNU_LIBLIST =          0x6ffffff7;
+
+//enum SHT_SUNW_dof =      0x6ffffff4;
+//enum SHT_SUNW_cap =      0x6ffffff5;
+//enum SHT_SUNW_SIGNATURE = 0x6ffffff6;
+enum SHT_SUNW_verdef =   0x6ffffffd;
+enum SHT_SUNW_verneed =  0x6ffffffe;
+enum SHT_SUNW_versym =   0x6fffffff;
+
+enum SHT_GNU_verdef =    SHT_SUNW_verdef;
+enum SHT_GNU_verneed =   SHT_SUNW_verneed;
+enum SHT_GNU_versym =    SHT_SUNW_versym;
+
+enum SHT_LOPROC =        0x70000000;
+enum SHT_HIPROC =        0x7fffffff;
+enum SHT_LOUSER =        0x80000000;
+enum SHT_HIUSER =        0x8fffffff;
+
+/*
+enum SHT_GNU_HASH =      0x6ffffff6;
+enum SHT_SUNW_ANNOTATE = 0x6ffffff7;
+enum SHT_SUNW_DEBUGSTR = 0x6ffffff8;
+enum SHT_SUNW_DEBUG =    0x6ffffff9;
+enum SHT_SUNW_move =     0x6ffffffa;
+enum SHT_SUNW_COMDAT =   0x6ffffffb;
+enum SHT_SUNW_syminfo =  0x6ffffffc;
+enum SHT_HISUNW =        0x6fffffff;
+enum SHT_HIOS =          0x6fffffff;
+enum SHT_AMD64_UNWIND =  0x70000001;
+enum SHT_ARM_EXIDX =     0x70000001;
+enum SHT_ARM_PREEMPTMAP = 0x70000002;
+enum SHT_ARM_ATTRIBUTES = 0x70000003;
+enum SHT_ARM_DEBUGOVERLAY = 0x70000004;
+enum SHT_ARM_OVERLAYSECTION = 0x70000005;
+enum SHT_MIPS_REGINFO =  0x70000006;
+enum SHT_MIPS_OPTIONS =  0x7000000d;
+enum SHT_MIPS_DWARF =    0x7000001e;
+*/
+
+enum SHF_WRITE =            (1 << 0);
+enum SHF_ALLOC =            (1 << 1);
+enum SHF_EXECINSTR =        (1 << 2);
+enum SHF_MERGE =            (1 << 4);
+enum SHF_STRINGS =          (1 << 5);
+enum SHF_INFO_LINK =        (1 << 6);
+enum SHF_LINK_ORDER =       (1 << 7);
+enum SHF_OS_NONCONFORMING = (1 << 8);
+enum SHF_GROUP =            (1 << 9);
+enum SHF_TLS =              (1 << 10);
+enum SHF_COMPRESSED =       (1 << 11);
+
+enum SHF_MASKOS =           0x0ff00000;
+enum SHF_MASKPROC =         0xf0000000;
+
+enum NT_PRSTATUS =     1;
+enum NT_FPREGSET =     2;
+enum NT_PRPSINFO =     3;
+enum NT_TASKSTRUCT =   4;
+enum NT_AUXV =         6;
+
+/*
+enum NT_THRMISC =      7;
+enum NT_PROCSTAT_PROC = 8;
+enum NT_PROCSTAT_FILES = 9;
+enum NT_PROCSTAT_VMMAP = 10;
+enum NT_PROCSTAT_GROUPS = 11;
+enum NT_PROCSTAT_UMASK = 12;
+enum NT_PROCSTAT_RLIMIT = 13;
+enum NT_PROCSTAT_OSREL = 14;
+enum NT_PROCSTAT_PSSTRINGS = 15;
+enum NT_PROCSTAT_AUXV = 16;
+*/
+
+enum STN_UNDEF =       0;
+
+enum STB_LOCAL =       0;
+enum STB_GLOBAL =      1;
+enum STB_WEAK =        2;
+enum STB_NUM =         3;
+enum STB_LOOS =        10;
+enum STB_HIOS =        12;
+enum STB_LOPROC =      13;
+enum STB_HIPROC =      15;
+
+enum STT_NOTYPE =      0;
+enum STT_OBJECT =      1;
+enum STT_FUNC =        2;
+enum STT_SECTION =     3;
+enum STT_FILE =        4;
+enum STT_COMMON =      5;
+enum STT_TLS =         6;
+enum STT_NUM =         7;
+enum STT_LOOS =        10;
+enum STT_GNU_IFUNC =   10;
+enum STT_HIOS =        12;
+enum STT_LOPROC =      13;
+enum STT_HIPROC =      15;
+
+enum STV_DEFAULT =     0;
+enum STV_INTERNAL =    1;
+enum STV_HIDDEN =      2;
+enum STV_PROTECTED =   3;
+/*
+enum STV_EXPORTED =    4;
+enum STV_SINGLETON =   5;
+enum STV_ELIMINATE =   6;
+*/
+
+enum DT_NULL =         0;
+enum DT_NEEDED =       1;
+enum DT_PLTRELSZ =     2;
+enum DT_PLTGOT =       3;
+enum DT_HASH =         4;
+enum DT_STRTAB =       5;
+enum DT_SYMTAB =       6;
+enum DT_RELA =         7;
+enum DT_RELASZ =       8;
+enum DT_RELAENT =      9;
+enum DT_STRSZ =        10;
+enum DT_SYMENT =       11;
+enum DT_INIT =         12;
+enum DT_FINI =         13;
+enum DT_SONAME =       14;
+enum DT_RPATH =        15;
+enum DT_SYMBOLIC =     16;
+enum DT_REL =          17;
+enum DT_RELSZ =        18;
+enum DT_RELENT =       19;
+enum DT_PLTREL =       20;
+enum DT_DEBUG =        21;
+enum DT_TEXTREL =      22;
+enum DT_JMPREL =       23;
+enum DT_BIND_NOW =     24;
+enum DT_INIT_ARRAY =   25;
+enum DT_FINI_ARRAY =   26;
+enum DT_INIT_ARRAYSZ = 27;
+enum DT_FINI_ARRAYSZ = 28;
+enum DT_RUNPATH =      29;
+enum DT_FLAGS =        30;
+
+enum DT_ENCODING =     32;
+enum DT_PREINIT_ARRAY = 32;
+enum DT_PREINIT_ARRAYSZ = 33;
+//enum DT_MAXPOSTAGS =   34;
+enum DT_LOOS =         0x6000000d;
+enum DT_HIOS =         0x6ffff000;
+/*
+enum DT_SUNW_AUXILIARY = 0x6000000d;
+enum DT_SUNW_RTLDINF = 0x6000000e;
+enum DT_SUNW_FILTER =  0x6000000f;
+enum DT_SUNW_CAP =     0x60000010;
+*/
+
+enum DT_VALRNGLO =     0x6ffffd00;
+enum DT_GNU_PRELINKED = 0x6ffffdf5;
+enum DT_GNU_CONFLICTSZ =0x6ffffdf6;
+enum DT_GNU_LIBLISTSZ = 0x6ffffdf7;
+enum DT_CHECKSUM =     0x6ffffdf8;
+enum DT_PLTPADSZ =     0x6ffffdf9;
+enum DT_MOVEENT =      0x6ffffdfa;
+enum DT_MOVESZ =       0x6ffffdfb;
+enum DT_FEATURE_1 =    0x6ffffdfc;
+enum DT_POSFLAG_1 =    0x6ffffdfd;
+enum DT_SYMINSZ =      0x6ffffdfe;
+enum DT_SYMINENT =     0x6ffffdff;
+enum DT_VALRNGHI =     0x6ffffdff;
+enum DT_ADDRRNGLO =    0x6ffffe00;
+enum DT_GNU_HASH =     0x6ffffef5;
+enum DT_TLSDESC_PLT =  0x6ffffef6;
+enum DT_TLSDESC_GOT =  0x6ffffef7;
+enum DT_GNU_CONFLICT = 0x6ffffef8;
+enum DT_GNU_LIBLIST =  0x6ffffef9;
+enum DT_CONFIG =       0x6ffffefa;
+enum DT_DEPAUDIT =     0x6ffffefb;
+enum DT_AUDIT =        0x6ffffefc;
+enum DT_PLTPAD =       0x6ffffefd;
+enum DT_MOVETAB =      0x6ffffefe;
+enum DT_SYMINFO =      0x6ffffeff;
+enum DT_ADDRRNGHI =    0x6ffffeff;
+enum DT_RELACOUNT =    0x6ffffff9;
+enum DT_RELCOUNT =     0x6ffffffa;
+enum DT_FLAGS_1 =      0x6ffffffb;
+enum DT_VERDEF =       0x6ffffffc;
+enum DT_VERDEFNUM =    0x6ffffffd;
+enum DT_VERNEED =      0x6ffffffe;
+enum DT_VERNEEDNUM =   0x6fffffff;
+enum DT_VERSYM =       0x6ffffff0;
+enum DT_LOPROC =       0x70000000;
+//enum DT_DEPRECATED_SPARC_REGISTER = 0x7000001;
+enum DT_AUXILIARY =    0x7ffffffd;
+enum DT_USED =         0x7ffffffe;
+enum DT_FILTER =       0x7fffffff;
+enum DT_HIPROC =       0x7fffffff;
+
+enum DTF_1_PARINIT =   0x00000001;
+enum DTF_1_CONFEXP =   0x00000002;
+
+enum DF_P1_LAZYLOAD =  0x00000001;
+enum DF_P1_GROUPPERM=  0x00000002;
+
+enum DF_1_NOW =        0x00000001;
+enum DF_1_BIND_NOW =   0x00000001;
+enum DF_1_GLOBAL =     0x00000002;
+enum DF_1_GROUP =      0x00000004;
+enum DF_1_NODELETE =   0x00000008;
+enum DF_1_LOADFLTR =   0x00000010;
+enum DF_1_INITFIRST =  0x00000020;
+enum DF_1_NOOPEN =     0x00000040;
+enum DF_1_ORIGIN =     0x00000080;
+enum DF_1_DIRECT =     0x00000100;
+enum DF_1_TRANS =      0x00000200;
+enum DF_1_INTERPOSE =  0x00000400;
+enum DF_1_NODEFLIB =   0x00000800;
+enum DF_1_NODUMP =     0x00001000;
+enum DF_1_CONLFAT =    0x00002000;
+
+enum DF_ORIGIN =       0x00000001;
+enum DF_SYMBOLIC =     0x00000002;
+enum DF_TEXTREL =      0x00000004;
+enum DF_BIND_NOW =     0x00000008;
+enum DF_STATIC_TLS =   0x00000010;
+
+enum VER_DEF_NONE =    0;
+enum VER_DEF_CURRENT = 1;
+alias VER_NDX VER_DEF_IDX;
+
+enum VER_FLG_BASE =    0x1;
+enum VER_FLG_WEAK =    0x2;
+enum VER_FLG_INFO =    0x4;
+
+enum VER_NDX_LOCAL =           0;
+enum VER_NDX_GLOBAL =          1;
+enum VER_NDX_GIVEN =           2;
+enum VER_NDX_HIDDEN =      32768;
+extern (D) pure @safe
+{
+    auto VER_NDX(V)(V v) { return v & ~(1u << 15); }
+}
+
+enum VER_NEED_NONE   = 0;
+enum VER_NEED_CURRENT = 1;
+enum VER_NEED_WEAK =    32768;
+enum VER_NEED_HIDDEN = VER_NDX_HIDDEN;
+alias VER_NDX VER_NEED_IDX;
+
+/*
+enum CA_SUNW_NULL =    0;
+enum CA_SUNW_HW_1 =    1;
+enum CA_SUNW_SF_1 =    2;
+*/
+
+enum VERSYM_HIDDEN =   0x8000;
+enum VERSYM_VERSION =  0x7fff;
+enum ELF_VER_CHR =     '@';
+
+enum SYMINFO_BT_SELF =         0xffff;
+enum SYMINFO_BT_PARENT =       0xfffe;
+//enum SYMINFO_BT_NONE =         0xfffd;
+//enum SYMINFO_BT_EXTERN =       0xfffc;
+enum SYMINFO_BT_LOWRESERVE =   0xff00;
+
+enum SYMINFO_FLG_DIRECT =      0x0001;
+enum SYMINFO_FLG_PASSTHRU =    0x0002;
+enum SYMINFO_FLG_COPY =        0x0004;
+enum SYMINFO_FLG_LAZYLOAD =    0x0008;
+//enum SYMINFO_FLG_DIRECTBIND =  0x0010;
+//enum SYMINFO_FLG_NOEXTDIRECT = 0x0020;
+//enum SYMINFO_FLG_FILTER =      0x0002;
+//enum SYMINFO_FLG_AUXILIARY =   0x0040;
+
+enum SYMINFO_NONE =            0;
+enum SYMINFO_CURRENT =         1;
+enum SYMINFO_NUM =             2;
+
+enum GRP_COMDAT =              0x1;
+
+enum R_386_NONE =               0;
+enum R_386_32 =                 1;
+enum R_386_PC32 =               2;
+enum R_386_GOT32 =              3;
+enum R_386_PLT32 =              4;
+enum R_386_COPY =               5;
+enum R_386_GLOB_DAT =           6;
+enum R_386_JMP_SLOT =           7;
+enum R_386_RELATIVE =           8;
+enum R_386_GOTOFF =             9;
+enum R_386_GOTPC =              10;
+enum R_386_TLS_TPOFF =          14;
+enum R_386_TLS_IE =             15;
+enum R_386_TLS_GOTIE =          16;
+enum R_386_TLS_LE =             17;
+enum R_386_TLS_GD =             18;
+enum R_386_TLS_LDM =            19;
+enum R_386_TLS_GD_32 =          24;
+enum R_386_TLS_GD_PUSH =        25;
+enum R_386_TLS_GD_CALL =        26;
+enum R_386_TLS_GD_POP =         27;
+enum R_386_TLS_LDM_32 =         28;
+enum R_386_TLS_LDM_PUSH =       29;
+enum R_386_TLS_LDM_CALL =       30;
+enum R_386_TLS_LDM_POP =        31;
+enum R_386_TLS_LDO_32 =         32;
+enum R_386_TLS_IE_32 =          33;
+enum R_386_TLS_LE_32 =          34;
+enum R_386_TLS_DTPMOD32 =       35;
+enum R_386_TLS_DTPOFF32 =       36;
+enum R_386_TLS_TPOFF32 =        37;
+enum R_386_IRELATIVE =          42;
+
+enum R_X86_64_NONE =            0;
+enum R_X86_64_64 =              1;
+enum R_X86_64_PC32 =            2;
+enum R_X86_64_GOT32 =           3;
+enum R_X86_64_PLT32 =           4;
+enum R_X86_64_COPY =            5;
+enum R_X86_64_GLOB_DAT =        6;
+enum R_X86_64_JMP_SLOT =        7;
+enum R_X86_64_RELATIVE =        8;
+enum R_X86_64_GOTPCREL =        9;
+enum R_X86_64_32 =              10;
+enum R_X86_64_32S =             11;
+enum R_X86_64_16 =              12;
+enum R_X86_64_PC16 =            13;
+enum R_X86_64_8 =               14;
+enum R_X86_64_PC8 =             15;
+enum R_X86_64_DTPMOD64 =        16;
+enum R_X86_64_DTPOFF64 =        17;
+enum R_X86_64_TPOFF64 =         18;
+enum R_X86_64_TLSGD =           19;
+enum R_X86_64_TLSLD =           20;
+enum R_X86_64_DTPOFF32 =        21;
+enum R_X86_64_GOTTPOFF =        22;
+enum R_X86_64_TPOFF32 =         23;
+enum R_X86_64_IRELATIVE =       37;
diff --git a/libphobos/libdruntime/core/sys/dragonflybsd/sys/event.d b/libphobos/libdruntime/core/sys/dragonflybsd/sys/event.d
new file mode 100644
index 000000000..867b55b69
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/dragonflybsd/sys/event.d
@@ -0,0 +1,124 @@
+/**
+ * D header file for DragonFlyBSD.
+ *
+ * Copyright: Copyright Martin Nowak 2012.
+ * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * Authors:   Martin Nowak,Diederik de Groot(port:DragonFlyBSD)
+ * Copied:    From core/sys/freebsd/sys
+ */
+module core.sys.dragonflybsd.sys.event;
+
+version (DragonFlyBSD):
+
+extern (C) nothrow @nogc @system:
+
+import core.stdc.stdint;    // intptr_t, uintptr_t
+import core.sys.posix.time; // timespec
+
+enum
+{
+    EVFILT_READ     =  -1,
+    EVFILT_WRITE    =  -2,
+    EVFILT_AIO      =  -3, /* attached to aio requests */
+    EVFILT_VNODE    =  -4, /* attached to vnodes */
+    EVFILT_PROC     =  -5, /* attached to struct proc */
+    EVFILT_SIGNAL   =  -6, /* attached to struct proc */
+    EVFILT_TIMER    =  -7, /* timers */
+    EVFILT_EXCEPT   =  -8, /* exceptional conditions */
+    EVFILT_USER     =  -9, /* user events */
+    EVFILT_FS       = -10, /* filesystem events */
+    EVFILT_MARKER   = 0xF, /* placemarker for tailq */
+    EVFILT_SYSCOUNT =  10,
+}
+
+extern(D) void EV_SET(kevent_t* kevp, typeof(kevent_t.tupleof) args)
+{
+    *kevp = kevent_t(args);
+}
+
+struct kevent_t
+{
+    uintptr_t    ident; /* identifier for this event */
+    short       filter; /* filter for event */
+    ushort       flags;
+    uint        fflags;
+    intptr_t      data;
+    void        *udata; /* opaque user data identifier */
+}
+
+enum
+{
+    /* actions */
+    EV_ADD          = 0x0001, /* add event to kq (implies enable) */
+    EV_DELETE       = 0x0002, /* delete event from kq */
+    EV_ENABLE       = 0x0004, /* enable event */
+    EV_DISABLE      = 0x0008, /* disable event (not reported) */
+
+    /* flags */
+    EV_ONESHOT      = 0x0010, /* only report one occurrence */
+    EV_CLEAR        = 0x0020, /* clear event state after reporting */
+    EV_RECEIPT      = 0x0040, /* force EV_ERROR on success, data=0 */
+    EV_DISPATCH     = 0x0080, /* disable event after reporting */
+
+    EV_SYSFLAGS     = 0xF000, /* reserved by system */
+    EV_FLAG1        = 0x2000, /* filter-specific flag */
+
+    /* returned values */
+    EV_EOF          = 0x8000, /* EOF detected */
+    EV_ERROR        = 0x4000, /* error, data contains errno */
+    EV_NODATA       = 0x1000, /* EOF and no more data */
+}
+
+enum
+{
+    /*
+     * data/hint flags/masks for EVFILT_USER, shared with userspace
+     *
+     * On input, the top two bits of fflags specifies how the lower twenty four
+     * bits should be applied to the stored value of fflags.
+     *
+     * On output, the top two bits will always be set to NOTE_FFNOP and the
+     * remaining twenty four bits will contain the stored fflags value.
+     */
+    NOTE_FFNOP      = 0x00000000, /* ignore input fflags */
+    NOTE_FFAND      = 0x40000000, /* AND fflags */
+    NOTE_FFOR       = 0x80000000, /* OR fflags */
+    NOTE_FFCOPY     = 0xc0000000, /* copy fflags */
+    NOTE_FFCTRLMASK = 0xc0000000, /* masks for operations */
+    NOTE_FFLAGSMASK = 0x00ffffff,
+
+    NOTE_TRIGGER    = 0x01000000, /* Cause the event to be
+                                  triggered for output. */
+
+    /*
+     * data/hint flags for EVFILT_{READ|WRITE}, shared with userspace
+     */
+    NOTE_LOWAT      = 0x0001, /* low water mark */
+    NOTE_OOB        = 0x0002, /* OOB data on a socket */
+
+    /*
+     * data/hint flags for EVFILT_VNODE, shared with userspace
+     */
+    NOTE_DELETE     = 0x0001, /* vnode was removed */
+    NOTE_WRITE      = 0x0002, /* data contents changed */
+    NOTE_EXTEND     = 0x0004, /* size increased */
+    NOTE_ATTRIB     = 0x0008, /* attributes changed */
+    NOTE_LINK       = 0x0010, /* link count changed */
+    NOTE_RENAME     = 0x0020, /* vnode was renamed */
+    NOTE_REVOKE     = 0x0040, /* vnode access was revoked */
+
+    NOTE_EXIT       = 0x80000000, /* process exited */
+    NOTE_FORK       = 0x40000000, /* process forked */
+    NOTE_EXEC       = 0x20000000, /* process exec'd */
+    NOTE_PCTRLMASK  = 0xf0000000, /* mask for hint bits */
+    NOTE_PDATAMASK  = 0x000fffff, /* mask for pid */
+
+    /* additional flags for EVFILT_PROC */
+    NOTE_TRACK      = 0x00000001, /* follow across forks */
+    NOTE_TRACKERR   = 0x00000002, /* could not track child */
+    NOTE_CHILD      = 0x00000004, /* am a child process */
+}
+
+int kqueue();
+int kevent(int kq, const kevent_t *changelist, int nchanges,
+           int nevents, const timespec *timeout);
diff --git a/libphobos/libdruntime/core/sys/dragonflybsd/sys/link_elf.d b/libphobos/libdruntime/core/sys/dragonflybsd/sys/link_elf.d
new file mode 100644
index 000000000..b1a41a805
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/dragonflybsd/sys/link_elf.d
@@ -0,0 +1,82 @@
+/**
+ * D header file for DragonFlyBSD.
+ *
+ * $(LINK2 http://svnweb.freebsd.org/base/head/sys/sys/link_elf.h?view=markup, sys/link_elf.h)
+ * Authors: Diederik de Groot(port:DragonFlyBSD)
+ * Copied:  From core/sys/freebsd/sys
+ */
+module core.sys.dragonflybsd.sys.link_elf;
+
+version (DragonFlyBSD):
+
+extern (C) nothrow @system:
+
+import core.stdc.stdint : uint64_t;
+import core.sys.dragonflybsd.sys.elf;
+
+version(D_LP64)
+    enum __ELF_NATIVE_CLASS = 64;
+else
+    enum __ELF_NATIVE_CLASS = 32;
+
+template ElfW(string type)
+{
+    mixin("alias Elf"~__ELF_NATIVE_CLASS.stringof~"_"~type~" ElfW;");
+}
+
+enum LA_SER_ORIG =      0x01;
+enum LA_SER_LIBPATH =   0x02;
+enum LA_SER_RUNPATH =   0x04;
+enum LA_SER_CONFIG =    0x08;
+enum LA_SER_DEFAULT =   0x40;
+enum LA_SER_SECURE =    0x80;
+
+struct link_map
+{
+    char*           l_addr;
+
+    version (MIPS32)
+        char*       l_offs;
+    version (MIPS64)
+        char*       l_offs;
+
+    char*           l_name;
+    void*           l_ld;
+    link_map*       l_next, l_prev;
+}
+alias link_map Link_map;
+
+enum
+{
+    RT_CONSISTENT,
+    RT_ADD,
+    RT_DELETE,
+}
+
+struct r_debug
+{
+    int             r_version;
+    link_map*       r_map;
+    void function(r_debug*, link_map*) r_brk;
+};
+
+struct dl_phdr_info
+{
+    ElfW!"Addr"     dlpi_addr;
+    char*           dlpi_name;
+    ElfW!"Phdr"*    dlpi_phdr;
+    ElfW!"Half"     dlpi_phnum;
+    uint64_t        dlpi_adds;
+    uint64_t        dlpi_subs;
+    size_t          dlpi_tls_modid;
+    void*           dlpi_tls_data;
+};
+
+
+private alias int function(dl_phdr_info*, size_t, void *) dl_iterate_phdr_cb;
+private alias int function(dl_phdr_info*, size_t, void *) @nogc dl_iterate_phdr_cb_ngc;
+
+int dl_iterate_phdr(dl_iterate_phdr_cb __callback, void*__data);
+int dl_iterate_phdr(dl_iterate_phdr_cb_ngc __callback, void*__data) @nogc;
+int _rtld_addr_phdr(const void*, dl_phdr_info*) @nogc;
+int _rtld_get_stack_prot() @nogc;
diff --git a/libphobos/libdruntime/core/sys/dragonflybsd/sys/mman.d b/libphobos/libdruntime/core/sys/dragonflybsd/sys/mman.d
new file mode 100644
index 000000000..3733d9f31
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/dragonflybsd/sys/mman.d
@@ -0,0 +1,127 @@
+/**
+ * D header file for DragonFlyBSD
+ *
+ * Authors:   Martin Nowak,Diederik de Groot(port:DragonFlyBSD)
+ * Copied:  From core/sys/freebsd/sys
+ */
+module core.sys.dragonflybsd.sys.mman;
+
+version (DragonFlyBSD):
+extern (C) nothrow @nogc @system:
+
+public import core.sys.posix.sys.mman;
+import core.sys.dragonflybsd.sys.cdefs;
+import core.sys.posix.sys.types;
+
+enum INHERIT_SHARE        = 0;
+enum INHERIT_COPY         = 1;
+enum INHERIT_NONE         = 2;
+
+// already in core.sys.posix.sys.mman
+// enum PROT_NONE             = 0x00;
+// enum PROT_READ             = 0x01;
+// enum PROT_WRITE            = 0x02;
+// enum PROT_EXEC             = 0x04;
+// enum MAP_SHARED            = 0x0001;
+// enum MAP_PRIVATE           = 0x0002;
+alias MAP_COPY            = MAP_PRIVATE;
+
+enum MAP_FIXED                = 0x00010;
+enum MAP_RENAME           = 0x00020;
+enum MAP_NORESERVE        = 0x00040;
+enum MAP_INHERIT          = 0x00080;
+enum MAP_NOEXTEND         = 0x00100;
+enum MAP_HASSEMAPHORE     = 0x00200;
+enum MAP_STACK            = 0x00400;
+enum MAP_NOSYNC           = 0x00800;
+
+enum MAP_FILE             = 0x00000;
+//enum MAP_ANON           = 0x01000;        // already in core.sys.posix.sys.mman
+alias MAP_ANONYMOUS       = MAP_ANON;
+enum MAP_VPAGETABLE       = 0x02000;
+
+enum MAP_TRYFIXED         = 0x10000;
+enum MAP_NOCORE           = 0x20000;
+enum MAP_SIZEALIGN        = 0x40000;
+
+//enum MAP_EXCL           = 0x00004000;
+//enum MAP_NOCORE         = 0x00020000;
+//enum MAP_PREFAULT_READ  = 0x00040000;
+//version (LP64)
+//    enum MAP_32BIT      = 0x00080000;
+
+//extern(D) int MAP_ALIGNED(int n) { return n << MAP_ALIGNMENT_SHIFT; }
+//enum MAP_ALIGNMENT_SHIFT = 24;
+//enum MAP_ALIGNMENT_MASK = MAP_ALIGNED(0xff);
+//enum MAP_ALIGNED_SUPER = MAP_ALIGNED(1);
+
+// enum MCL_CURRENT       = 0x0001;           // already in core.sys.posix.sys.mman
+// enum MCL_FUTURE        = 0x0002;            // already in core.sys.posix.sys.mman
+
+// already in core.sys.posix.sys.mman
+enum MAP_FAILED = cast(void*)-1;
+// enum MS_SYNC               = 0x0000;         // already in core.sys.posix.sys.mman
+// enum MS_ASYNC              = 0x0001;         // already in core.sys.posix.sys.mman
+// enum MS_INVALIDATE         = 0x0002;         // already in core.sys.posix.sys.mman
+
+enum _MADV_NORMAL             = 0;
+enum _MADV_RANDOM             = 1;
+enum _MADV_SEQUENTIAL         = 2;
+enum _MADV_WILLNEED           = 3;
+enum _MADV_DONTNEED           = 4;
+
+alias MADV_NORMAL         = _MADV_NORMAL;
+alias MADV_RANDOM         = _MADV_RANDOM;
+alias MADV_SEQUENTIAL     = _MADV_SEQUENTIAL;
+alias MADV_WILLNEED       = _MADV_WILLNEED;
+alias MADV_DONTNEED       = _MADV_DONTNEED;
+enum MADV_FREE            = 5;
+enum MADV_NOSYNC          = 6;
+enum MADV_AUTOSYNC        = 7;
+enum MADV_NOCORE          = 8;
+enum MADV_CORE            = 9;
+enum MADV_INVAL           = 10;
+enum MADV_SETMAP          = 11;
+
+alias MADV_CONTROL_START  = MADV_INVAL;
+alias MADV_CONTROL_END    = MADV_SETMAP;
+
+enum MINCORE_INCORE       = 0x1;
+enum MINCORE_REFERENCED   = 0x2;
+enum MINCORE_MODIFIED     = 0x4;
+enum MINCORE_REFERENCED_OTHER = 0x8;
+enum MINCORE_MODIFIED_OTHER   = 0x10;
+enum MINCORE_SUPER        = 0x20;
+
+enum SHM_ANON             = cast(const(char) *)1;
+
+// already in core.sys.posix.sys.mman
+// alias POSIX_MADV_NORMAL    = _MADV_NORMAL;
+// alias POSIX_MADV_RANDOM    = _MADV_RANDOM;
+// alias POSIX_MADV_SEQUENTIAL= _MADV_SEQUENTIAL;
+// alias POSIX_MADV_WILLNEED  = _MADV_WILLNEED;
+// alias POSIX_MADV_DONTNEED  = _MADV_DONTNEED;
+
+int getpagesizes(size_t *, int);
+int madvise(void *, size_t, int);
+int mincore(const(void) *, size_t, char *);
+int minherit(void *, size_t, int);
+
+// already in core.sys.posix.sys.mman
+// int mlock(const void *, size_t);
+// void * mmap(void *, size_t, int, int, int, off_t);
+// int mprotect(const void *, size_t, int);
+// int msync(void *, size_t, int);
+// int munlock(const void *, size_t);
+// int munmap(void *, size_t);
+// int posix_madvise(void *, size_t, int);
+
+// int mlockall(int);
+// int munlockall();
+// int shm_open(const(char) *, int, mode_t);
+// int shm_unlink(const(char) *);
+
+// int madvise(void *, size_t, int);
+// int mcontrol(void *, size_t, int, off_t);
+// int mincore(const void *, size_t, char *);
+// int minherit(void *, size_t, int);
diff --git a/libphobos/libdruntime/core/sys/dragonflybsd/time.d b/libphobos/libdruntime/core/sys/dragonflybsd/time.d
new file mode 100644
index 000000000..75fa4e6d8
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/dragonflybsd/time.d
@@ -0,0 +1,29 @@
+/**
+    D header file for DragonFlyBSD's extensions to POSIX's time.h.
+
+    Copyright: Copyright 2014
+    License: $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+    Authors: $(HTTP jmdavisprog.com, Jonathan M Davis) and Diederik de Groot
+ */
+module core.sys.dragonflybsd.time;
+
+version(DragonFlyBSD):
+
+public import core.sys.posix.time;
+
+import core.sys.dragonflybsd.sys.cdefs;
+
+enum CLOCK_REALTIME          = 0;
+enum CLOCK_VIRTUAL           = 1;
+enum CLOCK_PROF              = 2;
+enum CLOCK_MONOTONIC         = 4;
+enum CLOCK_UPTIME            = 5;
+enum CLOCK_UPTIME_PRECISE    = 7;
+enum CLOCK_UPTIME_FAST       = 8;
+enum CLOCK_REALTIME_PRECISE  = 9;
+enum CLOCK_REALTIME_FAST     = 10;
+enum CLOCK_MONOTONIC_PRECISE = 11;
+enum CLOCK_MONOTONIC_FAST    = 12;
+enum CLOCK_SECOND            = 13;
+enum CLOCK_THREAD_CPUTIME_ID = 14;
+enum CLOCK_PROCESS_CPUTIME_ID= 15;
diff --git a/libphobos/libdruntime/core/sys/freebsd/dlfcn.d b/libphobos/libdruntime/core/sys/freebsd/dlfcn.d
index 812cb4c17..e39074369 100644
--- a/libphobos/libdruntime/core/sys/freebsd/dlfcn.d
+++ b/libphobos/libdruntime/core/sys/freebsd/dlfcn.d
@@ -2,7 +2,7 @@
  * D header file for FreeBSD.
  *
  * Copyright: Copyright Martin Nowak 2012.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Martin Nowak
  */
 module core.sys.freebsd.dlfcn;
diff --git a/libphobos/libdruntime/core/sys/freebsd/netinet/in_.d b/libphobos/libdruntime/core/sys/freebsd/netinet/in_.d
new file mode 100644
index 000000000..f5c5580a4
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/freebsd/netinet/in_.d
@@ -0,0 +1,570 @@
+//Written in the D programming language
+
+/++
+    D header file for FreeBSD's extensions to POSIX's netinet/in.h.
+
+    Copyright: Copyright 2017 -
+    License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+    Authors:   $(HTTP jmdavisprog.com, Jonathan M Davis)
+ +/
+module core.sys.freebsd.netinet.in_;
+
+import core.sys.freebsd.sys.cdefs;
+
+public import core.sys.posix.netinet.in_;
+
+version(FreeBSD):
+
+extern(C) nothrow @nogc:
+
+static if (__BSD_VISIBLE)
+{
+    enum IPPROTO_HOPOPTS   = 0;
+
+    enum IPPROTO_IPV4      = 4;
+    enum IPPROTO_IPIP      = IPPROTO_IPV4;
+    enum IPPROTO_ST        = 7;
+    enum IPPROTO_EGP       = 8;
+    enum IPPROTO_PIGP      = 9;
+    enum IPPROTO_RCCMON    = 10;
+    enum IPPROTO_NVPII     = 11;
+
+    enum IPPROTO_ARGUS     = 13;
+    enum IPPROTO_EMCON     = 14;
+    enum IPPROTO_XNET      = 15;
+    enum IPPROTO_CHAOS     = 16;
+    enum IPPROTO_MUX       = 18;
+    enum IPPROTO_MEAS      = 19;
+    enum IPPROTO_HMP       = 20;
+    enum IPPROTO_PRM       = 21;
+
+    enum IPPROTO_TRUNK1    = 23;
+    enum IPPROTO_TRUNK2    = 24;
+    enum IPPROTO_LEAF1     = 25;
+    enum IPPROTO_LEAF2     = 26;
+    enum IPPROTO_RDP       = 27;
+    enum IPPROTO_IRTP      = 28;
+    enum IPPROTO_TP        = 29;
+    enum IPPROTO_BLT       = 30;
+    enum IPPROTO_NSP       = 31;
+    enum IPPROTO_INP       = 32;
+    enum IPPROTO_SEP       = 33;
+    enum IPPROTO_3PC       = 34;
+    enum IPPROTO_IDPR      = 35;
+    enum IPPROTO_XTP       = 36;
+    enum IPPROTO_DDP       = 37;
+    enum IPPROTO_CMTP      = 38;
+    enum IPPROTO_TPXX      = 39;
+    enum IPPROTO_IL        = 40;
+    enum IPPROTO_SDRP      = 42;
+    enum IPPROTO_ROUTING   = 43;
+    enum IPPROTO_FRAGMENT  = 44;
+    enum IPPROTO_IDRP      = 45;
+    enum IPPROTO_RSVP      = 46;
+    enum IPPROTO_GRE       = 47;
+    enum IPPROTO_MHRP      = 48;
+    enum IPPROTO_BHA       = 49;
+    enum IPPROTO_ESP       = 50;
+    enum IPPROTO_AH        = 51;
+    enum IPPROTO_INLSP     = 52;
+    enum IPPROTO_SWIPE     = 53;
+    enum IPPROTO_NHRP      = 54;
+    enum IPPROTO_MOBILE    = 55;
+    enum IPPROTO_TLSP      = 56;
+    enum IPPROTO_SKIP      = 57;
+    enum IPPROTO_ICMPV6    = 58;
+    enum IPPROTO_NONE      = 59;
+    enum IPPROTO_DSTOPTS   = 60;
+    enum IPPROTO_AHIP      = 61;
+    enum IPPROTO_CFTP      = 62;
+    enum IPPROTO_HELLO     = 63;
+    enum IPPROTO_SATEXPAK  = 64;
+    enum IPPROTO_KRYPTOLAN = 65;
+    enum IPPROTO_RVD       = 66;
+    enum IPPROTO_IPPC      = 67;
+    enum IPPROTO_ADFS      = 68;
+    enum IPPROTO_SATMON    = 69;
+    enum IPPROTO_VISA      = 70;
+    enum IPPROTO_IPCV      = 71;
+    enum IPPROTO_CPNX      = 72;
+    enum IPPROTO_CPHB      = 73;
+    enum IPPROTO_WSN       = 74;
+    enum IPPROTO_PVP       = 75;
+    enum IPPROTO_BRSATMON  = 76;
+
+    enum IPPROTO_WBMON     = 78;
+    enum IPPROTO_WBEXPAK   = 79;
+    enum IPPROTO_EON       = 80;
+    enum IPPROTO_VMTP      = 81;
+    enum IPPROTO_SVMTP     = 82;
+    enum IPPROTO_VINES     = 83;
+    enum IPPROTO_TTP       = 84;
+    enum IPPROTO_IGP       = 85;
+    enum IPPROTO_DGP       = 86;
+    enum IPPROTO_TCF       = 87;
+    enum IPPROTO_IGRP      = 88;
+    enum IPPROTO_OSPFIGP   = 89;
+    enum IPPROTO_SRPC      = 90;
+    enum IPPROTO_LARP      = 91;
+    enum IPPROTO_MTP       = 92;
+    enum IPPROTO_AX25      = 93;
+    enum IPPROTO_IPEIP     = 94;
+    enum IPPROTO_MICP      = 95;
+    enum IPPROTO_SCCSP     = 96;
+    enum IPPROTO_ETHERIP   = 97;
+    enum IPPROTO_ENCAP     = 98;
+    enum IPPROTO_APES      = 99;
+    enum IPPROTO_GMTP      = 100;
+    enum IPPROTO_IPCOMP    = 108;
+    enum IPPROTO_SCTP      = 132;
+    enum IPPROTO_MH        = 135;
+    enum IPPROTO_UDPLITE   = 136;
+    enum IPPROTO_HIP       = 139;
+    enum IPPROTO_SHIM6     = 140;
+
+    enum IPPROTO_PIM          = 103;
+    enum IPPROTO_CARP         = 112;
+    enum IPPROTO_PGM          = 113;
+    enum IPPROTO_MPLS         = 137;
+    enum IPPROTO_PFSYNC       = 240;
+    enum IPPROTO_RESERVED_253 = 253;
+    enum IPPROTO_RESERVED_254 = 254;
+
+    enum IPPROTO_DONE = 257;
+
+    enum IPPORT_RESERVED = 1024;
+
+    enum IPPORT_EPHEMERALFIRST = 10000;
+    enum IPPORT_EPHEMERALLAST  = 65535;
+
+    enum IPPORT_HIFIRSTAUTO = 49152;
+    enum IPPORT_HILASTAUTO  = 65535;
+
+    enum IPPORT_RESERVEDSTART = 600;
+
+    enum IPPORT_MAX = 65535;
+
+    extern(D) bool IN_CLASSA(in_addr_t i) pure @safe { return (i & 0x80000000) == 0; }
+    enum IN_CLASSA_NET    = 0xff000000;
+    enum IN_CLASSA_NSHIFT = 24;
+    enum IN_CLASSA_HOST   = 0x00ffffff;
+    enum IN_CLASSA_MAX    = 128;
+
+    extern(D) bool IN_CLASSB(in_addr_t i) pure @safe { return (i & 0xc0000000) == 0x80000000; }
+    enum IN_CLASSB_NET    = 0xffff0000;
+    enum IN_CLASSB_NSHIFT = 16;
+    enum IN_CLASSB_HOST   = 0x0000ffff;
+    enum IN_CLASSB_MAX    = 65536;
+
+    extern(D) bool IN_CLASSC(in_addr_t i) pure @safe { return (i & 0xe0000000) == 0xc0000000; }
+    enum IN_CLASSC_NET    = 0xffffff00;
+    enum IN_CLASSC_NSHIFT = 8;
+    enum IN_CLASSC_HOST   = 0x000000ff;
+
+    extern(D) bool IN_CLASSD(in_addr_t i) pure @safe { return (i & 0xf0000000) == 0xe0000000; }
+    enum IN_CLASSD_NET     = 0xf0000000;
+    enum IN_CLASSD_NSHIFT  = 28;
+    enum IN_CLASSD_HOST    = 0x0fffffff;
+    extern(D) bool IN_MULTICAST(in_addr_t i) { return IN_CLASSD(i); }
+
+    // The fact that these are identical looks suspicious (they're not quite
+    // identical on Linux). However, this _is_ how they're defined in FreeBSD
+    // and on OS X. So, while it _might_ be a bug, if it is, it's an upstream
+    // one, and we're compatible with it.
+    extern(D) bool IN_EXPERIMENTAL(in_addr_t i) pure @safe { return (i & 0xf0000000) == 0xf0000000; }
+    extern(D) bool IN_BADCLASS(in_addr_t i) pure @safe { return (i & 0xf0000000) == 0xf0000000; }
+
+    extern(D) bool IN_LINKLOCAL(in_addr_t i) pure @safe { return (i & 0xffff0000) == 0xa9fe0000; }
+    extern(D) bool IN_LOOPBACK(in_addr_t i) pure @safe { return (i & 0xff000000) == 0x7f000000; }
+    extern(D) bool IN_ZERONET(in_addr_t i) pure @safe { return (i & 0xff000000) == 0; }
+
+    extern(D) bool IN_PRIVATE(in_addr_t i) pure @safe
+    {
+        return  (i & 0xff000000) == 0x0a000000 ||
+                (i & 0xfff00000) == 0xac100000 ||
+                (i & 0xffff0000) == 0xc0a80000;
+    }
+
+    extern(D) bool IN_LOCAL_GROUP(in_addr_t i) pure @safe { return (i & 0xffffff00) == 0xe0000000; }
+
+    extern(D) bool IN_ANY_LOCAL(in_addr_t i) pure @safe { return IN_LINKLOCAL(i) || IN_LOCAL_GROUP(i); }
+
+    enum INADDR_UNSPEC_GROUP    = 0xe0000000;
+    enum INADDR_ALLHOSTS_GROUP  = 0xe0000001;
+    enum INADDR_ALLRTRS_GROUP   = 0xe0000002;
+    enum INADDR_ALLRPTS_GROUP   = 0xe0000016;
+    enum INADDR_CARP_GROUP      = 0xe0000012;
+    enum INADDR_PFSYNC_GROUP    = 0xe00000f0;
+    enum INADDR_ALLMDNS_GROUP   = 0xe00000fb;
+    enum INADDR_MAX_LOCAL_GROUP = 0xe00000ff;
+
+    enum IN_LOOPBACKNET = 127;
+
+    enum IN_RFC3021_MASK = 0xfffffffe;
+
+    enum IP_OPTIONS      = 1;
+    enum IP_HDRINCL      = 2;
+    enum IP_TOS          = 3;
+    enum IP_TTL          = 4;
+    enum IP_RECVOPTS     = 5;
+    enum IP_RECVRETOPTS  = 6;
+    enum IP_RECVDSTADDR  = 7;
+    enum IP_SENDSRCADDR  = IP_RECVDSTADDR;
+    enum IP_RETOPTS      = 8;
+    enum IP_MULTICAST_IF = 9;
+
+    enum IP_MULTICAST_TTL   = 10;
+    enum IP_MULTICAST_LOOP  = 11;
+    enum IP_ADD_MEMBERSHIP  = 12;
+    enum IP_DROP_MEMBERSHIP = 13;
+    enum IP_MULTICAST_VIF   = 14;
+    enum IP_RSVP_ON         = 15;
+    enum IP_RSVP_OFF        = 16;
+    enum IP_RSVP_VIF_ON     = 17;
+    enum IP_RSVP_VIF_OFF    = 18;
+    enum IP_PORTRANGE       = 19;
+    enum IP_RECVIF          = 20;
+
+    enum IP_IPSEC_POLICY = 21;
+
+    enum IP_ONESBCAST         = 23;
+    enum IP_BINDANY           = 24;
+    enum IP_BINDMULTI         = 25;
+    enum IP_RSS_LISTEN_BUCKET = 26;
+    enum IP_ORIGDSTADDR       = 27;
+    enum IP_RECVORIGDSTADDR   = IP_ORIGDSTADDR;
+
+    enum IP_FW3       = 48;
+    enum IP_DUMMYNET3 = 49;
+
+    enum IP_ADD_SOURCE_MEMBERSHIP  = 70;
+    enum IP_DROP_SOURCE_MEMBERSHIP = 71;
+    enum IP_BLOCK_SOURCE           = 72;
+    enum IP_UNBLOCK_SOURCE         = 73;
+
+    enum MCAST_JOIN_GROUP         = 80;
+    enum MCAST_LEAVE_GROUP        = 81;
+    enum MCAST_JOIN_SOURCE_GROUP  = 82;
+    enum MCAST_LEAVE_SOURCE_GROUP = 83;
+    enum MCAST_BLOCK_SOURCE       = 84;
+    enum MCAST_UNBLOCK_SOURCE     = 85;
+
+    enum IP_FLOWID          = 90;
+    enum IP_FLOWTYPE        = 91;
+    enum IP_RSSBUCKETID     = 92;
+    enum IP_RECVFLOWID      = 93;
+    enum IP_RECVRSSBUCKETID = 94;
+
+    enum IP_DEFAULT_MULTICAST_TTL  = 1;
+    enum IP_DEFAULT_MULTICAST_LOOP = 1;
+
+    enum IP_MIN_MEMBERSHIPS   = 31;
+    enum IP_MAX_MEMBERSHIPS   = 4095;
+
+    enum IP_MAX_GROUP_SRC_FILTER = 512;
+    enum IP_MAX_SOCK_SRC_FILTER  = 128;
+
+    struct ip_mreq
+    {
+        in_addr imr_multiaddr;
+        in_addr imr_interface;
+    };
+
+    struct ip_mreqn
+    {
+        in_addr imr_multiaddr;
+        in_addr imr_address;
+        int     imr_ifindex;
+    };
+
+    struct ip_mreq_source
+    {
+        in_addr imr_multiaddr;
+        in_addr imr_sourceaddr;
+        in_addr imr_interface;
+    };
+
+    struct group_req
+    {
+        uint gr_interface;
+        sockaddr_storage gr_group;
+    };
+
+    struct group_source_req
+    {
+        uint gsr_interface;
+        sockaddr_storage gsr_group;
+        sockaddr_storage gsr_source;
+    };
+
+    int setipv4sourcefilter(int, in_addr, in_addr, uint, uint, in_addr*);
+    int getipv4sourcefilter(int, in_addr, in_addr, uint*, uint*, in_addr*);
+    int setsourcefilter(int, uint, sockaddr*, socklen_t, uint, uint, sockaddr_storage*);
+    int getsourcefilter(int, uint, sockaddr*, socklen_t, uint*, uint*, sockaddr_storage*);
+
+    enum MCAST_UNDEFINED = 0;
+    enum MCAST_INCLUDE   = 1;
+    enum MCAST_EXCLUDE   = 2;
+
+    enum IP_PORTRANGE_DEFAULT = 0;
+    enum IP_PORTRANGE_HIGH    = 1;
+    enum IP_PORTRANGE_LOW     = 2;
+
+    enum IPCTL_FORWARDING        = 1;
+    enum IPCTL_SENDREDIRECTS     = 2;
+    enum IPCTL_DEFTTL            = 3;
+    enum IPCTL_DEFMTU            = 4;
+    enum IPCTL_SOURCEROUTE       = 8;
+    enum IPCTL_DIRECTEDBROADCAST = 9;
+    enum IPCTL_INTRQMAXLEN       = 10;
+    enum IPCTL_INTRQDROPS        = 11;
+    enum IPCTL_STATS             = 12;
+    enum IPCTL_ACCEPTSOURCEROUTE = 13;
+    enum IPCTL_FASTFORWARDING    = 14;
+    enum IPCTL_GIF_TTL           = 16;
+    enum IPCTL_INTRDQMAXLEN      = 17;
+    enum IPCTL_INTRDQDROPS       = 18;
+}
+
+// =============================================================================
+// What follows is from netinet6/in6.h, but since netinet6/in6.h specifically
+// says that it should only be #included by #including netinet/in.h, it makes
+// more sense to put them in here so that the way they're imported corresponds
+// with the correct way of #including them in C/C++.
+// =============================================================================
+
+// The #if was around the #include of in6.h at the end of in.h.
+static if (__POSIX_VISIBLE)
+{
+    static if (__BSD_VISIBLE)
+    {
+        enum IPV6PORT_RESERVED    = 1024;
+        enum IPV6PORT_ANONMIN     = 49152;
+        enum IPV6PORT_ANONMAX     = 65535;
+        enum IPV6PORT_RESERVEDMIN = 600;
+        enum IPV6PORT_RESERVEDMAX = IPV6PORT_RESERVED - 1;
+
+        enum IN6ADDR_ANY_INIT = in6_addr.init;
+        enum IN6ADDR_LOOPBACK_INIT = in6_addr([0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01]);
+        enum IN6ADDR_NODELOCAL_ALLNODES_INIT = in6_addr([0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01]);
+        enum IN6ADDR_INTFACELOCAL_ALLNODES_INIT = in6_addr([0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01]);
+        enum IN6ADDR_LINKLOCAL_ALLNODES_INIT = in6_addr([0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01]);
+        enum IN6ADDR_LINKLOCAL_ALLROUTERS_INIT = in6_addr([0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02]);
+        enum IN6ADDR_LINKLOCAL_ALLV2ROUTERS_INIT = in6_addr([0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16]);
+
+        __gshared const in6_addr in6addr_nodelocal_allnodes;
+        __gshared const in6_addr in6addr_linklocal_allnodes;
+        __gshared const in6_addr in6addr_linklocal_allrouters;
+        __gshared const in6_addr in6addr_linklocal_allv2routers;
+
+        extern(D) bool IN6_ARE_ADDR_EQUAL(in6_addr* a, in6_addr* b) pure @safe { return *a == *b; }
+    }
+
+    enum __IPV6_ADDR_SCOPE_NODELOCAL    = 0x01;
+    enum __IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01;
+    enum __IPV6_ADDR_SCOPE_LINKLOCAL    = 0x02;
+    enum __IPV6_ADDR_SCOPE_SITELOCAL    = 0x05;
+    enum __IPV6_ADDR_SCOPE_GLOBAL       = 0x0e;
+
+    static if (__BSD_VISIBLE)
+    {
+// TODO - requires declarations from elsewhere that we don't currently have bindings for.
+/+
+        struct route_in6
+        {
+            rtentry* ro_rt;
+            llentry* ro_lle;
+            char*    ro_prepend;
+            ushort   ro_plen;
+            ushort   ro_flags;
+            ushort   ro_mtu;
+            ushort   spare;
+            sockaddr_in6 ro_dst;
+        };
+ +/
+    }
+
+    enum IPV6_SOCKOPT_RESERVED1 = 3;
+    enum IPV6_PORTRANGE         = 14;
+    enum ICMP6_FILTER           = 18;
+
+    enum IPV6_CHECKSUM = 26;
+
+    enum IPV6_IPSEC_POLICY = 28;
+
+    enum IPV6_FW_ADD   = 30;
+    enum IPV6_FW_DEL   = 31;
+    enum IPV6_FW_FLUSH = 32;
+    enum IPV6_FW_ZERO  = 33;
+    enum IPV6_FW_GET   = 34;
+
+    enum IPV6_RTHDRDSTOPTS = 35;
+
+    enum IPV6_RECVPKTINFO  = 36;
+    enum IPV6_RECVHOPLIMIT = 37;
+    enum IPV6_RECVRTHDR    = 38;
+    enum IPV6_RECVHOPOPTS  = 39;
+    enum IPV6_RECVDSTOPTS  = 40;
+
+    enum IPV6_USE_MIN_MTU = 42;
+    enum IPV6_RECVPATHMTU = 43;
+
+    enum IPV6_PATHMTU = 44;
+
+    enum IPV6_PKTINFO  = 46;
+    enum IPV6_HOPLIMIT = 47;
+    enum IPV6_NEXTHOP  = 48;
+    enum IPV6_HOPOPTS  = 49;
+    enum IPV6_DSTOPTS  = 50;
+    enum IPV6_RTHDR    = 51;
+
+    enum IPV6_RECVTCLASS = 57;
+
+    enum IPV6_AUTOFLOWLABEL = 59;
+
+    enum IPV6_TCLASS   = 61;
+    enum IPV6_DONTFRAG = 62;
+
+    enum IPV6_PREFER_TEMPADDR = 63;
+
+    enum IPV6_BINDANY   = 64;
+
+    enum IPV6_BINDMULTI         = 65;
+    enum IPV6_RSS_LISTEN_BUCKET = 66;
+    enum IPV6_FLOWID            = 67;
+    enum IPV6_FLOWTYPE          = 68;
+    enum IPV6_RSSBUCKETID       = 69;
+    enum IPV6_RECVFLOWID        = 70;
+    enum IPV6_RECVRSSBUCKETID   = 71;
+
+    enum IPV6_ORIGDSTADDR     = 72;
+    enum IPV6_RECVORIGDSTADDR = IPV6_ORIGDSTADDR;
+
+    enum IPV6_RTHDR_LOOSE  = 0;
+    enum IPV6_RTHDR_STRICT = 1;
+    enum IPV6_RTHDR_TYPE_0 = 0;
+
+    enum IPV6_DEFAULT_MULTICAST_HOPS = 1;
+    enum IPV6_DEFAULT_MULTICAST_LOOP = 1;
+
+    enum IPV6_MIN_MEMBERSHIPS = 31;
+    enum IPV6_MAX_MEMBERSHIPS = 4095;
+
+    enum IPV6_MAX_GROUP_SRC_FILTER = 512;
+    enum IPV6_MAX_SOCK_SRC_FILTER  = 128;
+
+    struct in6_pktinfo
+    {
+        in6_addr ipi6_addr;
+        uint     ipi6_ifindex;
+    };
+
+    struct ip6_mtuinfo
+    {
+        sockaddr_in6 ip6m_addr;
+        uint         ip6m_mtu;
+    };
+
+    enum IPV6_PORTRANGE_DEFAULT = 0;
+    enum IPV6_PORTRANGE_HIGH    = 1;
+    enum IPV6_PORTRANGE_LOW     = 2;
+
+    static if (__BSD_VISIBLE)
+    {
+        enum IPV6PROTO_MAXID =  IPPROTO_PIM + 1;
+
+        enum IPV6CTL_FORWARDING         = 1;
+        enum IPV6CTL_SENDREDIRECTS      = 2;
+        enum IPV6CTL_DEFHLIM            = 3;
+        enum IPV6CTL_DEFMTU             = 4;
+        enum IPV6CTL_FORWSRCRT          = 5;
+        enum IPV6CTL_STATS              = 6;
+        enum IPV6CTL_MRTSTATS           = 7;
+        enum IPV6CTL_MRTPROTO           = 8;
+        enum IPV6CTL_MAXFRAGPACKETS     = 9;
+        enum IPV6CTL_SOURCECHECK        = 10;
+        enum IPV6CTL_SOURCECHECK_LOGINT = 11;
+        enum IPV6CTL_ACCEPT_RTADV       = 12;
+
+        enum IPV6CTL_LOG_INTERVAL   = 14;
+        enum IPV6CTL_HDRNESTLIMIT   = 15;
+        enum IPV6CTL_DAD_COUNT      = 16;
+        enum IPV6CTL_AUTO_FLOWLABEL = 17;
+        enum IPV6CTL_DEFMCASTHLIM   = 18;
+        enum IPV6CTL_GIF_HLIM       = 19;
+        enum IPV6CTL_KAME_VERSION   = 20;
+        enum IPV6CTL_USE_DEPRECATED = 21;
+        enum IPV6CTL_RR_PRUNE       = 22;
+        enum IPV6CTL_V6ONLY         = 24;
+
+        enum IPV6CTL_USETEMPADDR     = 32;
+        enum IPV6CTL_TEMPPLTIME      = 33;
+        enum IPV6CTL_TEMPVLTIME      = 34;
+        enum IPV6CTL_AUTO_LINKLOCAL  = 35;
+        enum IPV6CTL_RIP6STATS       = 36;
+        enum IPV6CTL_PREFER_TEMPADDR = 37;
+        enum IPV6CTL_ADDRCTLPOLICY   = 38;
+        enum IPV6CTL_USE_DEFAULTZONE = 39;
+
+        enum IPV6CTL_MAXFRAGS   = 41;
+        enum IPV6CTL_MCAST_PMTU = 44;
+
+        enum IPV6CTL_STEALTH = 45;
+
+        enum ICMPV6CTL_ND6_ONLINKNSRFC4861 = 47;
+        enum IPV6CTL_NO_RADR     = 48;
+        enum IPV6CTL_NORBIT_RAIF = 49;
+
+        enum IPV6CTL_RFC6204W3 = 50;
+
+        enum IPV6CTL_INTRQMAXLEN  = 51;
+        enum IPV6CTL_INTRDQMAXLEN = 52;
+
+        enum IPV6CTL_MAXID = 53;
+    }
+
+// TODO - require declarations from elsewhere that we don't currently have bindings for.
+/+
+    enum M_FASTFWD_OURS  = M_PROTO1;
+    enum M_IP6_NEXTHOP   = M_PROTO2;
+    enum M_IP_NEXTHOP    = M_PROTO2;
+    enum M_SKIP_FIREWALL = M_PROTO3;
+    enum M_AUTHIPHDR     = M_PROTO4;
+    enum M_DECRYPTED     = M_PROTO5;
+    enum M_LOOP          = M_PROTO6;
+    enum M_AUTHIPDGM     = M_PROTO7;
+    enum M_RTALERT_MLD   = M_PROTO8;
+ +/
+
+    static if (__BSD_VISIBLE)
+    {
+        size_t inet6_rthdr_space(int, int) @trusted;
+        cmsghdr* inet6_rthdr_init(void*, int);
+        int inet6_rthdr_add(cmsghdr*, const in6_addr*, uint);
+        int inet6_rthdr_lasthop(cmsghdr*, uint);
+        int inet6_rthdr_segments(const cmsghdr*);
+        in6_addr* inet6_rthdr_getaddr(cmsghdr*, int);
+        int inet6_rthdr_getflags(const cmsghdr*, int);
+
+        int inet6_opt_init(void*, socklen_t);
+        int inet6_opt_append(void*, socklen_t, int, ubyte, socklen_t, ubyte, void**);
+        int inet6_opt_finish(void*, socklen_t, int);
+        int inet6_opt_set_val(void*, int, void*, socklen_t);
+
+        int inet6_opt_next(void*, socklen_t, int, ubyte*, socklen_t*, void**);
+        int inet6_opt_find(void*, socklen_t, int, ubyte, socklen_t*, void**);
+        int inet6_opt_get_val(void*, int, void*, socklen_t);
+        socklen_t inet6_rth_space(int, int) @trusted;
+        void* inet6_rth_init(void*, socklen_t, int, int);
+        int inet6_rth_add(void*, const in6_addr*);
+        int inet6_rth_reverse(const void*, void*);
+        int inet6_rth_segments(const void*);
+        in6_addr* inet6_rth_getaddr(const void*, int);
+    }
+}
diff --git a/libphobos/libdruntime/core/sys/freebsd/sys/elf_common.d b/libphobos/libdruntime/core/sys/freebsd/sys/elf_common.d
index fb8fcba1a..6188d0ef7 100644
--- a/libphobos/libdruntime/core/sys/freebsd/sys/elf_common.d
+++ b/libphobos/libdruntime/core/sys/freebsd/sys/elf_common.d
@@ -265,6 +265,7 @@ enum SHF_LINK_ORDER =       (1 << 7);
 enum SHF_OS_NONCONFORMING = (1 << 8);
 enum SHF_GROUP =            (1 << 9);
 enum SHF_TLS =              (1 << 10);
+enum SHF_COMPRESSED =       (1 << 11);
 enum SHF_MASKOS =           0x0ff00000;
 enum SHF_MASKPROC =         0xf0000000;
 
diff --git a/libphobos/libdruntime/core/sys/freebsd/sys/event.d b/libphobos/libdruntime/core/sys/freebsd/sys/event.d
index 0e951f18b..2ae10b3db 100644
--- a/libphobos/libdruntime/core/sys/freebsd/sys/event.d
+++ b/libphobos/libdruntime/core/sys/freebsd/sys/event.d
@@ -2,7 +2,7 @@
  * D header file for FreeBSD.
  *
  * Copyright: Copyright Martin Nowak 2012.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Martin Nowak
  */
 
diff --git a/libphobos/libdruntime/core/sys/freebsd/sys/mount.d b/libphobos/libdruntime/core/sys/freebsd/sys/mount.d
new file mode 100644
index 000000000..203834215
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/freebsd/sys/mount.d
@@ -0,0 +1,304 @@
+//Written in the D programming language
+
+/++
+    D header file for FreeBSD's sys/mount.h.
+
+    Copyright: Copyright 2018 -
+    License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+    Authors:   $(HTTP jmdavisprog.com, Jonathan M Davis)
+ +/
+module core.sys.freebsd.sys.mount;
+
+version(FreeBSD):
+
+import core.stdc.config : c_long;
+import core.sys.posix.sys.stat : stat_t;
+import core.sys.posix.sys.types : uid_t;
+
+extern(C) @nogc nothrow:
+
+struct fsid_t
+{
+    int[2] val;
+}
+
+enum MAXFIDSZ = 16;
+
+struct fid
+{
+    ushort         fid_len;
+    ushort         fid_data0;
+    char[MAXFIDSZ] fid_data;
+}
+
+enum MFSNAMELEN = 16;
+enum MNAMELEN   = 88;
+enum STATFS_VERSION = 0x20030518;
+
+struct statfs_t
+{
+    uint f_version;
+    uint f_type;
+    ulong f_flags;
+    ulong f_bsize;
+    ulong f_iosize;
+    ulong f_blocks;
+    ulong f_bfree;
+    long  f_bavail;
+    ulong f_files;
+    long  f_ffree;
+    ulong f_syncwrites;
+    ulong f_asyncwrites;
+    ulong f_syncreads;
+    ulong f_asyncreads;
+    ulong[10] f_spare;
+    uint f_namemax;
+    uid_t f_owner;
+    fsid_t f_fsid;
+    char[80] f_charspare;
+    char[MFSNAMELEN] f_fstypename;
+    char[MNAMELEN] f_mntfromname;
+    char[MNAMELEN] f_mntonname;
+}
+
+
+enum ulong MNT_RDONLY = 0x0000000000000001;
+enum ulong MNT_SYNCHRONOUS = 0x0000000000000002;
+enum ulong MNT_NOEXEC = 0x0000000000000004;
+enum ulong MNT_NOSUID = 0x0000000000000008;
+enum ulong MNT_NFS4ACLS = 0x0000000000000010;
+enum ulong MNT_UNION = 0x0000000000000020;
+enum ulong MNT_ASYNC = 0x0000000000000040;
+enum ulong MNT_SUIDDIR = 0x0000000000100000;
+enum ulong MNT_SOFTDEP = 0x0000000000200000;
+enum ulong MNT_NOSYMFOLLOW = 0x0000000000400000;
+enum ulong MNT_GJOURNAL = 0x0000000002000000;
+enum ulong MNT_MULTILABEL = 0x0000000004000000;
+enum ulong MNT_ACLS = 0x0000000008000000;
+enum ulong MNT_NOATIME = 0x0000000010000000;
+enum ulong MNT_NOCLUSTERR = 0x0000000040000000;
+enum ulong MNT_NOCLUSTERW = 0x0000000080000000;
+enum ulong MNT_SUJ = 0x0000000100000000;
+enum ulong MNT_AUTOMOUNTED = 0x0000000200000000;
+
+enum ulong MNT_EXRDONLY = 0x0000000000000080;
+enum ulong MNT_EXPORTED = 0x0000000000000100;
+enum ulong MNT_DEFEXPORTED = 0x0000000000000200;
+enum ulong MNT_EXPORTANON = 0x0000000000000400;
+enum ulong MNT_EXKERB = 0x0000000000000800;
+enum ulong MNT_EXPUBLIC = 0x0000000020000000;
+
+enum ulong MNT_LOCAL  = 0x0000000000001000;
+enum ulong MNT_QUOTA  = 0x0000000000002000;
+enum ulong MNT_ROOTFS = 0x0000000000004000;
+enum ulong MNT_USER   = 0x0000000000008000;
+enum ulong MNT_IGNORE = 0x0000000000800000;
+
+enum MNT_VISFLAGMASK = MNT_RDONLY | MNT_SYNCHRONOUS | MNT_NOEXEC |
+                       MNT_NOSUID | MNT_UNION | MNT_SUJ |
+                       MNT_ASYNC | MNT_EXRDONLY  | MNT_EXPORTED |
+                       MNT_DEFEXPORTED | MNT_EXPORTANON| MNT_EXKERB |
+                       MNT_LOCAL | MNT_USER  | MNT_QUOTA |
+                       MNT_ROOTFS | MNT_NOATIME   | MNT_NOCLUSTERR |
+                       MNT_NOCLUSTERW | MNT_SUIDDIR | MNT_SOFTDEP |
+                       MNT_IGNORE | MNT_EXPUBLIC  | MNT_NOSYMFOLLOW |
+                       MNT_GJOURNAL | MNT_MULTILABEL | MNT_ACLS |
+                       MNT_NFS4ACLS | MNT_AUTOMOUNTED;
+
+enum MNT_UPDATEMASK = MNT_NOSUID | MNT_NOEXEC |
+                      MNT_SYNCHRONOUS | MNT_UNION | MNT_ASYNC |
+                      MNT_NOATIME |
+                      MNT_NOSYMFOLLOW | MNT_IGNORE |
+                      MNT_NOCLUSTERR | MNT_NOCLUSTERW | MNT_SUIDDIR |
+                      MNT_ACLS | MNT_USER | MNT_NFS4ACLS  |
+                      MNT_AUTOMOUNTED;
+
+enum ulong MNT_UPDATE = 0x0000000000010000;
+enum ulong MNT_DELEXPORT = 0x0000000000020000;
+enum ulong MNT_RELOAD = 0x0000000000040000;
+enum ulong MNT_FORCE = 0x0000000000080000;
+enum ulong MNT_SNAPSHOT = 0x0000000001000000;
+enum ulong MNT_NONBUSY = 0x0000000004000000;
+enum ulong MNT_BYFSID = 0x0000000008000000;
+enum ulong MNT_CMDFLAGS = MNT_UPDATE | MNT_DELEXPORT | MNT_RELOAD |
+                          MNT_FORCE  | MNT_SNAPSHOT  | MNT_NONBUSY |
+                          MNT_BYFSID;
+
+enum uint MNTK_UNMOUNTF = 0x00000001;
+enum uint MNTK_ASYNC = 0x00000002;
+enum uint MNTK_SOFTDEP = 0x00000004;
+enum uint MNTK_NOINSMNTQ = 0x00000008;
+enum uint MNTK_DRAINING = 0x00000010;
+enum uint MNTK_REFEXPIRE = 0x00000020;
+enum uint MNTK_EXTENDED_SHARED = 0x00000040;
+enum uint MNTK_SHARED_WRITES = 0x00000080;
+enum uint MNTK_NO_IOPF = 0x00000100;
+enum uint MNTK_VGONE_UPPER = 0x00000200;
+enum uint MNTK_VGONE_WAITER = 0x00000400;
+enum uint MNTK_LOOKUP_EXCL_DOTDOT = 0x00000800;
+enum uint MNTK_MARKER = 0x00001000;
+enum uint MNTK_UNMAPPED_BUFS = 0x00002000;
+enum uint MNTK_USES_BCACHE = 0x00004000;
+enum uint MNTK_NOASYNC = 0x00800000;
+enum uint MNTK_UNMOUNT = 0x01000000;
+enum uint MNTK_MWAIT = 0x02000000;
+enum uint MNTK_SUSPEND = 0x08000000;
+enum uint MNTK_SUSPEND2 = 0x04000000;
+enum uint MNTK_SUSPENDED = 0x10000000;
+enum uint MNTK_NULL_NOCACHE = 0x20000000;
+enum uint MNTK_LOOKUP_SHARED = 0x40000000;
+enum uint MNTK_NOKNOTE = 0x80000000;
+
+enum VFS_VFSCONF = 0;
+enum VFS_GENERIC = 0;
+
+enum VFS_MAXTYPENUM = 1;
+enum VFS_CONF       = 2;
+
+enum MNT_WAIT    = 1;
+enum MNT_NOWAIT  = 2;
+enum MNT_LAZY    = 3;
+enum MNT_SUSPEND = 4;
+
+struct fhandle_t
+{
+    fsid_t fh_fsid;
+    fid fh_fid;
+}
+
+// TODO - requires declarations from elsewhere that we don't currently have bindings for.
+/+
+struct oexport_args
+{
+    int ex_flags;
+    uid_t ex_root;
+    xucred ex_anon;
+    sockaddr* ex_addr;
+    ubyte ex_addrlen;
+    sockaddr* ex_mask;
+    ubyte ex_masklen;
+    char* ex_indexfile;
+}
+
+enum MAXSECFLAVORS = 5;
+
+struct export_args
+{
+    int ex_flags;
+    uid_t ex_root;
+    xucred ex_anon;
+    sockaddr* ex_addr;
+    ubyte ex_addrlen;
+    sockaddr* ex_mask;
+    ubyte ex_masklen;
+    char* ex_indexfile;
+    int ex_numsecflavors;
+    int[MAXSECFLAVORS] ex_secflavors;
+}
+
+struct nfs_public
+{
+    int np_valid;
+    fhandle_t np_handle;
+    mount_t* np_mount;
+    char* np_index;
+}
+
+struct vfsconf
+{
+    uint vfc_version;
+    char[MFSNAMELEN] vfc_name;
+    vfsops* vfc_vfsops;
+    int vfc_typenum;
+    int vfc_refcount;
+    int vfc_flags;
+    vfsoptdecl* vfc_opts;
+    TAILQ_ENTRY(vfsconf) vfc_list;
+}
+
+struct xvfsconf
+{
+    vfsops* vfc_vfsops;
+    char[MFSNAMELEN] vfc_name;
+    int vfc_typenum;
+    int vfc_refcount;
+    int vfc_flags;
+    vfsconf* vfc_next;
+}
++/
+
+struct ovfsconf
+{
+    void* vfc_vfsops;
+    char[32] vfc_name;
+    int vfc_index;
+    int vfc_refcount;
+    int vfc_flags;
+}
+
+enum uint VFCF_STATIC = 0x00010000;
+enum uint VFCF_NETWORK = 0x00020000;
+enum uint VFCF_READONLY = 0x00040000;
+enum uint VFCF_SYNTHETIC = 0x00080000;
+enum uint VFCF_LOOPBACK = 0x00100000;
+enum uint VFCF_UNICODE = 0x00200000;
+enum uint VFCF_JAIL = 0x00400000;
+enum uint VFCF_DELEGADMIN = 0x00800000;
+enum uint VFCF_SBDRY = 0x01000000;
+
+alias fsctlop_t = uint;
+
+struct vfsidctl
+{
+    int vc_vers;
+    fsid_t vc_fsid;
+    char[MFSNAMELEN] vc_fstypename;
+    fsctlop_t vc_op;
+    void* vc_ptr;
+    size_t vc_len;
+    uint[12] vc_spare;
+}
+
+enum uint VFS_CTL_VERS1 = 0x01;
+
+enum uint VFS_CTL_QUERY   = 0x00010001;
+enum uint VFS_CTL_TIMEO   = 0x00010002;
+enum uint VFS_CTL_NOLOCKS = 0x00010003;
+
+struct vfsquery
+{
+    uint vq_flags;
+    uint[31] vq_spare;
+}
+
+enum uint VQ_NOTRESP  = 0x0001;
+enum uint VQ_NEEDAUTH = 0x0002;
+enum uint VQ_LOWDISK  = 0x0004;
+enum uint VQ_MOUNT    = 0x0008;
+enum uint VQ_UNMOUNT  = 0x0010;
+enum uint VQ_DEAD     = 0x0020;
+enum uint VQ_ASSIST   = 0x0040;
+enum uint VQ_NOTRESPLOCK = 0x0080;
+enum uint VQ_FLAG0100 = 0x0100;
+enum uint VQ_FLAG0200 = 0x0200;
+enum uint VQ_FLAG0400 = 0x0400;
+enum uint VQ_FLAG0800 = 0x0800;
+enum uint VQ_FLAG1000 = 0x1000;
+enum uint VQ_FLAG2000 = 0x2000;
+enum uint VQ_FLAG4000 = 0x4000;
+enum uint VQ_FLAG8000 = 0x8000;
+
+int fhopen(const fhandle_t*, int);
+int fhstat(const fhandle_t*, stat_t*);
+int fhstatfs(const fhandle_t*, statfs_t*);
+int fstatfs(int, statfs_t*);
+int getfh(const char*, fhandle_t*);
+int getfsstat(statfs_t*, c_long, int);
+int getmntinfo(statfs_t**, int);
+int lgetfh(const char*, fhandle_t*);
+int mount(const char*, const char*, int, void*);
+//int nmount(iovec*, uint, int);
+int statfs(const char*, statfs_t*);
+int unmount(const char*, int);
+
+//int getvfsbyname(const char*, xvfsconf*);
diff --git a/libphobos/libdruntime/core/sys/freebsd/time.d b/libphobos/libdruntime/core/sys/freebsd/time.d
index 8878ec951..d913b0c99 100644
--- a/libphobos/libdruntime/core/sys/freebsd/time.d
+++ b/libphobos/libdruntime/core/sys/freebsd/time.d
@@ -4,8 +4,8 @@
     D header file for FreeBSD's extensions to POSIX's time.h.
 
     Copyright: Copyright 2014
-    License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
-    Authors:   Jonathan M Davis
+    License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+    Authors:   $(HTTP jmdavisprog.com, Jonathan M Davis)
  +/
 module core.sys.freebsd.time;
 
diff --git a/libphobos/libdruntime/core/sys/linux/config.d b/libphobos/libdruntime/core/sys/linux/config.d
index e867ecaf3..e3e61ebd2 100644
--- a/libphobos/libdruntime/core/sys/linux/config.d
+++ b/libphobos/libdruntime/core/sys/linux/config.d
@@ -14,13 +14,17 @@ public import core.sys.posix.config;
 enum _GNU_SOURCE = true;
 // deduced <features.h>
 // http://sourceware.org/git/?p=glibc.git;a=blob;f=include/features.h
-enum _BSD_SOURCE = true;
-enum _SVID_SOURCE = true;
+enum _DEFAULT_SOURCE = true;
 enum _ATFILE_SOURCE = true;
 
-enum __USE_MISC = _BSD_SOURCE || _SVID_SOURCE;
-enum __USE_BSD = _BSD_SOURCE;
-enum __USE_SVID = _SVID_SOURCE;
+// _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for _DEFAULT_SOURCE.
+deprecated("use _DEFAULT_SOURCE")
+{
+    enum _BSD_SOURCE = true;
+    enum _SVID_SOURCE = true;
+}
+
+enum __USE_MISC = _DEFAULT_SOURCE;
 enum __USE_ATFILE = _ATFILE_SOURCE;
 enum __USE_GNU = _GNU_SOURCE;
 
diff --git a/libphobos/libdruntime/core/sys/linux/elf.d b/libphobos/libdruntime/core/sys/linux/elf.d
index f467371ed..45e89eae6 100644
--- a/libphobos/libdruntime/core/sys/linux/elf.d
+++ b/libphobos/libdruntime/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;
 
@@ -313,6 +314,7 @@ enum SHF_LINK_ORDER =       (1 << 7);
 enum SHF_OS_NONCONFORMING = (1 << 8);
 enum SHF_GROUP =            (1 << 9);
 enum SHF_TLS =              (1 << 10);
+enum SHF_COMPRESSED =       (1 << 11);
 enum SHF_MASKOS =           0x0ff00000;
 enum SHF_MASKPROC =         0xf0000000;
 enum SHF_ORDERED =          (1 << 30);
diff --git a/libphobos/libdruntime/core/sys/linux/epoll.d b/libphobos/libdruntime/core/sys/linux/epoll.d
index f3e2cedc2..3d58c5262 100644
--- a/libphobos/libdruntime/core/sys/linux/epoll.d
+++ b/libphobos/libdruntime/core/sys/linux/epoll.d
@@ -12,6 +12,7 @@ version (linux):
 
 extern (C):
 @system:
+@nogc:
 nothrow:
 
 enum
diff --git a/libphobos/libdruntime/core/sys/linux/ifaddrs.d b/libphobos/libdruntime/core/sys/linux/ifaddrs.d
index bfdd59bf8..d7b6d6de7 100644
--- a/libphobos/libdruntime/core/sys/linux/ifaddrs.d
+++ b/libphobos/libdruntime/core/sys/linux/ifaddrs.d
@@ -9,7 +9,7 @@
     freeifaddrs(3)  deallocates the structure returned from getifaddrs
 
     Copyright:  Copyright (c) 2016 Sociomantic Labs. All rights reserved.
-    License:    $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+    License:    $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
     Authors:    Nemanja Boric
 
 *******************************************************************************/
diff --git a/libphobos/libdruntime/core/sys/linux/link.d b/libphobos/libdruntime/core/sys/linux/link.d
index 155929bbe..f69f15801 100644
--- a/libphobos/libdruntime/core/sys/linux/link.d
+++ b/libphobos/libdruntime/core/sys/linux/link.d
@@ -71,7 +71,7 @@ else version (SPARC64)
 }
 else version (SystemZ)
 {
-    // https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/s390/bits/elfclass.h
+    // http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/s390/bits/elfclass.h
     alias __WORDSIZE __ELF_NATIVE_CLASS;
     alias uint64_t Elf_Symndx;
 }
diff --git a/libphobos/libdruntime/core/sys/linux/netinet/in_.d b/libphobos/libdruntime/core/sys/linux/netinet/in_.d
new file mode 100644
index 000000000..bbc37e140
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/linux/netinet/in_.d
@@ -0,0 +1,393 @@
+//Written in the D programming language
+
+/++
+    D header file for Linux's extensions to POSIX's netinet/in.h.
+
+    Copyright: Copyright 2017 -
+    License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+    Authors:   $(HTTP jmdavisprog.com, Jonathan M Davis)
+ +/
+module core.sys.linux.netinet.in_;
+
+import core.sys.posix.config;
+
+public import core.sys.posix.netinet.in_;
+
+version(CRuntime_Glibc)         version = linux_libc;
+else version(CRuntime_Musl)     version = linux_libc;
+else version(CRuntime_Bionic)   version = linux_libc;
+else version(CRuntime_UClibc)   version = linux_libc;
+
+version(CRuntime_Glibc)         version = gnu_libc;
+else version(CRuntime_UClibc)   version = gnu_libc;
+
+version(linux_libc)
+{
+    extern(C) nothrow @nogc:
+
+    enum IPPROTO_IPIP    = 4;
+    enum IPPROTO_EGP     = 8;
+    enum IPPROTO_TP      = 29;
+    enum IPPROTO_DCCP    = 33;
+    enum IPPROTO_RSVP    = 46;
+    enum IPPROTO_GRE     = 47;
+    enum IPPROTO_ESP     = 50;
+    enum IPPROTO_AH      = 51;
+    enum IPPROTO_MTP     = 92;
+    enum IPPROTO_BEETPH  = 94;
+    enum IPPROTO_ENCAP   = 98;
+    enum IPPROTO_PIM     = 103;
+    enum IPPROTO_COMP    = 108;
+    enum IPPROTO_SCTP    = 132;
+    enum IPPROTO_UDPLITE = 136;
+    enum IPPROTO_MPLS    = 137;
+
+    enum IPPROTO_HOPOPTS  = 0;
+    enum IPPROTO_ROUTING  = 43;
+    enum IPPROTO_FRAGMENT = 44;
+    enum IPPROTO_ICMPV6   = 58;
+    enum IPPROTO_NONE     = 59;
+    enum IPPROTO_DSTOPTS  = 60;
+    enum IPPROTO_MH       = 135;
+
+    enum IPPORT_ECHO       = 7;
+    enum IPPORT_DISCARD    = 9;
+    enum IPPORT_SYSTAT     = 11;
+    enum IPPORT_DAYTIME    = 13;
+    enum IPPORT_NETSTAT    = 15;
+    enum IPPORT_FTP        = 21;
+    enum IPPORT_TELNET     = 23;
+    enum IPPORT_SMTP       = 25;
+    enum IPPORT_TIMESERVER = 37;
+    enum IPPORT_NAMESERVER = 42;
+    enum IPPORT_WHOIS      = 43;
+    enum IPPORT_MTP        = 57;
+
+    enum IPPORT_TFTP    = 69;
+    enum IPPORT_RJE     = 77;
+    enum IPPORT_FINGER  = 79;
+    enum IPPORT_TTYLINK = 87;
+    enum IPPORT_SUPDUP  = 95;
+
+    enum IPPORT_EXECSERVER = 512;
+    enum IPPORT_LOGINSERVER = 513;
+    enum IPPORT_CMDSERVER = 514;
+    enum IPPORT_EFSSERVER = 520;
+
+    enum IPPORT_BIFFUDP = 512;
+    enum IPPORT_WHOSERVER = 513;
+    enum IPPORT_ROUTESERVER = 520;
+
+    enum IPPORT_RESERVED = 1024;
+
+    enum IPPORT_USERRESERVED = 5000;
+
+    extern(D) bool IN_CLASSA(in_addr_t i) pure @safe { return (i & 0x80000000) == 0; }
+    enum IN_CLASSA_NET    = 0xff000000;
+    enum IN_CLASSA_NSHIFT = 24;
+    enum IN_CLASSA_HOST   = 0xffffffff & ~IN_CLASSA_NET;
+    enum IN_CLASSA_MAX    = 128;
+
+    extern(D) bool IN_CLASSB(in_addr_t i) pure @safe { return (i & 0xc0000000) == 0x80000000; }
+    enum IN_CLASSB_NET    = 0xffff0000;
+    enum IN_CLASSB_NSHIFT = 16;
+    enum IN_CLASSB_HOST   = 0xffffffff & ~IN_CLASSB_NET;
+    enum IN_CLASSB_MAX    = 65536;
+
+    extern(D) bool IN_CLASSC(in_addr_t i) pure @safe { return (i & 0xe0000000) == 0xc0000000; }
+    enum IN_CLASSC_NET    = 0xffffff00;
+    enum IN_CLASSC_NSHIFT = 8;
+    enum IN_CLASSC_HOST   = 0xffffffff & ~IN_CLASSC_NET;
+
+    extern(D) bool IN_CLASSD(in_addr_t i) pure @safe { return (i & 0xf0000000) == 0xe0000000; }
+    extern(D) bool IN_MULTICAST(in_addr_t i) { return IN_CLASSD(i); }
+
+    extern(D) bool IN_EXPERIMENTAL(in_addr_t i) pure @safe { return (i & 0xe0000000) == 0xe0000000; }
+    extern(D) bool IN_BADCLASS(in_addr_t i) pure @safe { return (i & 0xf0000000) == 0xf0000000; }
+
+    enum IN_LOOPBACKNET = 127;
+
+    enum INADDR_UNSPEC_GROUP    = 0xe0000000;
+    enum INADDR_ALLHOSTS_GROUP  = 0xe0000001;
+    enum INADDR_ALLRTRS_GROUP   = 0xe0000002;
+    enum INADDR_MAX_LOCAL_GROUP = 0xe00000ff;
+
+    enum IN6ADDR_ANY_INIT      = in6_addr.init;
+    enum IN6ADDR_LOOPBACK_INIT = in6_addr([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
+
+    version(gnu_libc) static if (__USE_MISC)
+    {
+        struct ip_mreq
+        {
+            in_addr imr_multiaddr;
+            in_addr imr_interface;
+        };
+
+        struct ip_mreq_source
+        {
+            in_addr imr_multiaddr;
+            in_addr imr_interface;
+            in_addr imr_sourceaddr;
+        };
+
+        struct group_req
+        {
+            uint gr_interface;
+            sockaddr_storage gr_group;
+        };
+
+        struct group_source_req
+        {
+            uint gsr_interface;
+            sockaddr_storage gsr_group;
+            sockaddr_storage gsr_source;
+        };
+
+        struct ip_msfilter
+        {
+            in_addr imsf_multiaddr;
+            in_addr imsf_interface;
+            uint imsf_fmode;
+            uint imsf_numsrc;
+            in_addr[1] imsf_slist;
+        };
+
+        extern(D) size_t IP_MSFILTER_SIZE(int numsrc)
+        {
+            return ip_msfilter.sizeof - in_addr.sizeof + numsrc * in_addr.sizeof;
+        }
+
+        struct group_filter
+        {
+            uint gf_interface;
+            sockaddr_storage gf_group;
+            uint gf_fmode;
+            uint gf_numsrc;
+            sockaddr_storage[1] gf_slist;
+        };
+
+        extern(D) size_t GROUP_FILTER_SIZE(int numsrc) pure @safe
+        {
+            return group_filter.sizeof - sockaddr_storage.sizeof + numsrc * sockaddr_storage.sizeof;
+        }
+    }
+
+    extern(D) bool IN6_ARE_ADDR_EQUAL(in6_addr* a, in6_addr* b) pure @safe { return *a == *b; }
+
+    version(gnu_libc) static if (__USE_MISC)
+    {
+        int bindresvport(int __sockfd, sockaddr_in* __sock_in);
+        int bindresvport6(int __sockfd, sockaddr_in6* _);
+    }
+
+    version(gnu_libc) static if (__USE_GNU)
+    {
+        struct in6_pktinfo
+        {
+            in6_addr ipi6_addr;
+            uint ipi6_ifindex;
+        };
+
+        struct ip6_mtuinfo
+        {
+            sockaddr_in6 ip6m_addr;
+            uint ip6m_mtu;
+        };
+
+        int inet6_opt_init(void* __extbuf, socklen_t __extlen);
+        int inet6_opt_append(void* __extbuf, socklen_t __extlen, int __offset,
+                             ubyte __type, socklen_t __len, ubyte __align, void** __databufp);
+        int inet6_opt_finish(void* __extbuf, socklen_t __extlen, int __offset);
+        int inet6_opt_set_val(void* __databuf, int __offset, void* __val, socklen_t __vallen);
+        int inet6_opt_next(void* __extbuf, socklen_t __extlen, int __offset,
+                           ubyte* __typep, socklen_t* __lenp, void** __databufp);
+        int inet6_opt_find(void* __extbuf, socklen_t __extlen, int __offset,
+                           ubyte __type, socklen_t* __lenp, void** __databufp);
+        int inet6_opt_get_val(void* __databuf, int __offset, void* __val, socklen_t __vallen);
+
+        socklen_t inet6_rth_space(int __type, int __segments);
+        void* inet6_rth_init(void* __bp, socklen_t __bp_len, int __type, int __segments);
+        int inet6_rth_add(void* __bp, const in6_addr* __addr);
+        int inet6_rth_reverse(const void* __in, void* __out);
+        int inet6_rth_segments(const void* __bp);
+        in6_addr* inet6_rth_getaddr(const void* __bp, int __index);
+
+        int getipv4sourcefilter(int __s, in_addr __interface_addr, in_addr __group,
+                                uint* __fmode, uint* __numsrc, in_addr* __slist);
+
+        int setipv4sourcefilter(int __s, in_addr __interface_addr, in_addr __group,
+                                uint __fmode, uint __numsrc, const in_addr* __slist);
+
+
+        int getsourcefilter(int __s, uint __interface_addr, const sockaddr* __group,
+                            socklen_t __grouplen, uint* __fmode, uint* __numsrc,
+                            sockaddr_storage* __slist);
+
+        int setsourcefilter(int __s, uint __interface_addr, const sockaddr* __group,
+                            socklen_t __grouplen, uint __fmode, uint __numsrc,
+                            const sockaddr_storage* __slist);
+    }
+
+    // =============================================================================
+    // What follows is from bits/in.h, but since bits/in.h specifically says that it
+    // should only be #included by #including netinet/in.h, it makes more sense to
+    // put them in here so that the way they're imported corresponds with the
+    // correct way of #including them in C/C++.
+    // =============================================================================
+
+    enum IP_OPTIONS  = 4;
+    enum IP_HDRINCL  = 3;
+    enum IP_TOS      = 1;
+    enum IP_TTL      = 2;
+    enum IP_RECVOPTS = 6;
+
+    enum IP_RECVRETOPTS            = IP_RETOPTS;
+    enum IP_RETOPTS                = 7;
+    enum IP_MULTICAST_IF           = 32;
+    enum IP_MULTICAST_TTL          = 33;
+    enum IP_MULTICAST_LOOP         = 34;
+    enum IP_ADD_MEMBERSHIP         = 35;
+    enum IP_DROP_MEMBERSHIP        = 36;
+    enum IP_UNBLOCK_SOURCE         = 37;
+    enum IP_BLOCK_SOURCE           = 38;
+    enum IP_ADD_SOURCE_MEMBERSHIP  = 39;
+    enum IP_DROP_SOURCE_MEMBERSHIP = 40;
+    enum IP_MSFILTER               = 41;
+
+    version(gnu_libc) static if (__USE_MISC)
+    {
+        enum MCAST_JOIN_GROUP         = 42;
+        enum MCAST_BLOCK_SOURCE       = 43;
+        enum MCAST_UNBLOCK_SOURCE     = 44;
+        enum MCAST_LEAVE_GROUP        = 45;
+        enum MCAST_JOIN_SOURCE_GROUP  = 46;
+        enum MCAST_LEAVE_SOURCE_GROUP = 47;
+        enum MCAST_MSFILTER           = 48;
+        enum IP_MULTICAST_ALL         = 49;
+        enum IP_UNICAST_IF            = 50;
+
+        enum MCAST_EXCLUDE = 0;
+        enum MCAST_INCLUDE = 1;
+    }
+
+    enum IP_ROUTER_ALERT  = 5;
+    enum IP_PKTINFO       = 8;
+    enum IP_PKTOPTIONS    = 9;
+    enum IP_PMTUDISC      = 10;
+    enum IP_MTU_DISCOVER  = 10;
+    enum IP_RECVERR       = 11;
+    enum IP_RECVTTL       = 12;
+    enum IP_RECVTOS       = 13;
+    enum IP_MTU           = 14;
+    enum IP_FREEBIND      = 15;
+    enum IP_IPSEC_POLICY  = 16;
+    enum IP_XFRM_POLICY   = 17;
+    enum IP_PASSSEC       = 18;
+    enum IP_TRANSPARENT   = 19;
+    enum IP_MULTICAST_ALL = 49;
+
+    enum IP_ORIGDSTADDR     = 20;
+    enum IP_RECVORIGDSTADDR = IP_ORIGDSTADDR;
+
+    enum IP_MINTTL               = 21;
+    enum IP_NODEFRAG             = 22;
+    enum IP_CHECKSUM             = 23;
+    enum IP_BIND_ADDRESS_NO_PORT = 24;
+
+    enum IP_PMTUDISC_DONT      = 0;
+    enum IP_PMTUDISC_WANT      = 1;
+    enum IP_PMTUDISC_DO        = 2;
+    enum IP_PMTUDISC_PROBE     = 3;
+    enum IP_PMTUDISC_INTERFACE = 4;
+    enum IP_PMTUDISC_OMIT      = 5;
+
+    enum SOL_IP = 0;
+
+    enum IP_DEFAULT_MULTICAST_TTL  = 1;
+    enum IP_DEFAULT_MULTICAST_LOOP = 1;
+    enum IP_MAX_MEMBERSHIPS        = 20;
+
+    version(gnu_libc) static if (__USE_MISC)
+    {
+        struct ip_opts
+        {
+            in_addr ip_dst;
+            char[40] ip_opts;
+        };
+
+        struct ip_mreqn
+        {
+            in_addr imr_multiaddr;
+            in_addr imr_address;
+            int imr_ifindex;
+        };
+
+        struct in_pktinfo
+        {
+            int ipi_ifindex;
+            in_addr ipi_spec_dst;
+            in_addr ipi_addr;
+        };
+    }
+
+    enum IPV6_ADDRFORM       = 1;
+    enum IPV6_2292PKTINFO    = 2;
+    enum IPV6_2292HOPOPTS    = 3;
+    enum IPV6_2292DSTOPTS    = 4;
+    enum IPV6_2292RTHDR      = 5;
+    enum IPV6_2292PKTOPTIONS = 6;
+    enum IPV6_CHECKSUM       = 7;
+    enum IPV6_2292HOPLIMIT   = 8;
+
+    enum IPV6_NEXTHOP        = 9;
+    enum IPV6_AUTHHDR        = 10;
+    enum IPV6_UNICAST_HOPS   = 16;
+    enum IPV6_MULTICAST_IF   = 17;
+    enum IPV6_MULTICAST_HOPS = 18;
+    enum IPV6_MULTICAST_LOOP = 19;
+    enum IPV6_JOIN_GROUP     = 20;
+    enum IPV6_LEAVE_GROUP    = 21;
+    enum IPV6_ROUTER_ALERT   = 22;
+    enum IPV6_MTU_DISCOVER   = 23;
+    enum IPV6_MTU            = 24;
+    enum IPV6_RECVERR        = 25;
+    enum IPV6_V6ONLY         = 26;
+    enum IPV6_JOIN_ANYCAST   = 27;
+    enum IPV6_LEAVE_ANYCAST  = 28;
+    enum IPV6_IPSEC_POLICY   = 34;
+    enum IPV6_XFRM_POLICY    = 35;
+    enum IPV6_HDRINCL        = 36;
+
+    enum IPV6_RECVPKTINFO  = 49;
+    enum IPV6_PKTINFO      = 50;
+    enum IPV6_RECVHOPLIMIT = 51;
+    enum IPV6_HOPLIMIT     = 52;
+    enum IPV6_RECVHOPOPTS  = 53;
+    enum IPV6_HOPOPTS      = 54;
+    enum IPV6_RTHDRDSTOPTS = 55;
+    enum IPV6_RECVRTHDR    = 56;
+    enum IPV6_RTHDR        = 57;
+    enum IPV6_RECVDSTOPTS  = 58;
+    enum IPV6_DSTOPTS      = 59;
+    enum IPV6_RECVPATHMTU  = 60;
+    enum IPV6_PATHMTU      = 61;
+    enum IPV6_DONTFRAG     = 62;
+
+    enum IPV6_RECVTCLASS = 66;
+    enum IPV6_TCLASS     = 67;
+
+    enum IPV6_PMTUDISC_DONT      = 0;
+    enum IPV6_PMTUDISC_WANT      = 1;
+    enum IPV6_PMTUDISC_DO        = 2;
+    enum IPV6_PMTUDISC_PROBE     = 3;
+    enum IPV6_PMTUDISC_INTERFACE = 4;
+    enum IPV6_PMTUDISC_OMIT      = 5;
+
+    enum SOL_IPV6   = 41;
+    enum SOL_ICMPV6 = 58;
+
+    enum IPV6_RTHDR_LOOSE  = 0;
+    enum IPV6_RTHDR_STRICT = 1;
+
+    enum IPV6_RTHDR_TYPE_0 = 0;
+}
diff --git a/libphobos/libdruntime/core/sys/linux/netinet/tcp.d b/libphobos/libdruntime/core/sys/linux/netinet/tcp.d
new file mode 100644
index 000000000..996c1ae84
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/linux/netinet/tcp.d
@@ -0,0 +1,79 @@
+/*******************************************************************************
+
+    D bindings for the Linux's netinet/tcp.h structures.
+
+    Defines constants found in tcp.h header on Linux system.
+
+    Copyright:  Copyright (c) 2016 Sociomantic Labs. All rights reserved.
+    License:    $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+    Authors:    Nemanja Boric
+
+*******************************************************************************/
+
+module core.sys.linux.netinet.tcp;
+
+/*
+* Copyright (c) 1982, 1986, 1993
+* The Regents of the University of California.  All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+*    notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above copyright
+*    notice, this list of conditions and the following disclaimer in the
+*    documentation and/or other materials provided with the distribution.
+* 4. Neither the name of the University nor the names of its contributors
+*    may be used to endorse or promote products derived from this software
+*    without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+* SUCH DAMAGE.
+*
+* @(#)tcp.h 8.1 (Berkeley) 6/10/93
+*/
+
+version (linux):
+
+/// User-settable options (used with setsockopt).
+enum
+{
+     TCP_NODELAY            = 1,  /// Don't delay send to coalesce packets
+     TCP_MAXSEG             = 2,  /// Set maximum segment size
+     TCP_CORK               = 3,  /// Control sending of partial frames
+     TCP_KEEPIDLE           = 4,  /// Start keeplives after this period
+     TCP_KEEPINTVL          = 5,  /// Interval between keepalives
+     TCP_KEEPCNT            = 6,  /// Number of keepalives before death
+     TCP_SYNCNT             = 7,  /// Number of SYN retransmits
+     TCP_LINGER2            = 8,  /// Life time of orphaned FIN-WAIT-2 state
+     TCP_DEFER_ACCEPT       = 9,  /// Wake up listener only when data arrive
+     TCP_WINDOW_CLAMP       = 10, /// Bound advertised window
+     TCP_INFO               = 11, /// Information about this connection.
+     TCP_QUICKACK           = 12, /// Bock/reenable quick ACKs.
+     TCP_CONGESTION         = 13, /// Congestion control algorithm.
+     TCP_MD5SIG             = 14, /// TCP MD5 Signature (RFC2385)
+     TCP_COOKIE_TRANSACTIONS     = 15, /// TCP Cookie Transactions
+     TCP_THIN_LINEAR_TIMEOUTS    = 16, /// Use linear timeouts for thin streams
+     TCP_THIN_DUPACK             = 17, /// Fast retrans. after 1 dupack
+     TCP_USER_TIMEOUT       = 18, /// How long for loss retry before timeout
+     TCP_REPAIR             = 19, /// TCP sock is under repair right now
+     TCP_REPAIR_QUEUE       = 20, /// Set TCP queue to repair
+     TCP_QUEUE_SEQ          = 21, /// Set sequence number of repaired queue.
+     TCP_REPAIR_OPTIONS     = 22, /// Repair TCP connection options
+     TCP_FASTOPEN           = 23, /// Enable FastOpen on listeners
+     TCP_TIMESTAMP          = 24, /// TCP time stamp
+     TCP_NOTSENT_LOWAT      = 25, /// Limit number of unsent bytes in  write queue.
+     TCP_CC_INFO            = 26, /// Get Congestion Control (optional) info.
+     TCP_SAVE_SYN           = 27, /// Record SYN headers for new connections.
+     TCP_SAVED_SYN          = 28, /// Get SYN headers recorded for connection.
+}
diff --git a/libphobos/libdruntime/core/sys/linux/sched.d b/libphobos/libdruntime/core/sys/linux/sched.d
index fe5fd72b8..a5f334acd 100644
--- a/libphobos/libdruntime/core/sys/linux/sched.d
+++ b/libphobos/libdruntime/core/sys/linux/sched.d
@@ -6,7 +6,7 @@
     types they operate on.
 
     Copyright:  Copyright (c) 2016 Sociomantic Labs. All rights reserved.
-    License:    $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+    License:    $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
     Authors:    Nemanja Boric
 
 *******************************************************************************/
diff --git a/libphobos/libdruntime/core/sys/linux/stdio.d b/libphobos/libdruntime/core/sys/linux/stdio.d
index ba6cdc058..01242f381 100644
--- a/libphobos/libdruntime/core/sys/linux/stdio.d
+++ b/libphobos/libdruntime/core/sys/linux/stdio.d
@@ -28,7 +28,7 @@ extern(C) nothrow
         cookie_close_function_t close;
     }
     FILE* fopencookie(in void* cookie, in char* mode, cookie_io_functions_t io_funcs);
-    void setbuffer(FILE *stream, char *buf, size_t size); // note: _BSD_SOURCE
+    void setbuffer(FILE *stream, char *buf, size_t size); // note: _DEFAULT_SOURCE
 }
 
 unittest
diff --git a/libphobos/libdruntime/core/sys/linux/sys/file.d b/libphobos/libdruntime/core/sys/linux/sys/file.d
index ccdfd2450..ec4e90344 100644
--- a/libphobos/libdruntime/core/sys/linux/sys/file.d
+++ b/libphobos/libdruntime/core/sys/linux/sys/file.d
@@ -2,7 +2,7 @@
  * D header file for Linux file ops.
  *
  * Copyright: Copyright Nemanja Boric 2016.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Nemanja Boric
  */
 module core.sys.linux.sys.file;
diff --git a/libphobos/libdruntime/core/sys/linux/sys/mman.d b/libphobos/libdruntime/core/sys/linux/sys/mman.d
index 4a6f91d9e..26b0d2fcd 100644
--- a/libphobos/libdruntime/core/sys/linux/sys/mman.d
+++ b/libphobos/libdruntime/core/sys/linux/sys/mman.d
@@ -13,7 +13,7 @@ public import core.sys.posix.sys.mman;
 import core.sys.linux.config;
 
 // <bits/mman.h>
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/powerpc/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/powerpc/bits/mman.h
 version (PPC)
 {
     enum PROT_SAO = 0x10;
@@ -38,7 +38,7 @@ version (PPC)
     //     MCL_FUTURE = 0x4000,
     // }
 }
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/powerpc/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/powerpc/bits/mman.h
 else version (PPC64)
 {
     enum PROT_SAO = 0x10;
@@ -63,7 +63,7 @@ else version (PPC64)
     //     MCL_FUTURE = 0x4000,
     // }
 }
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/s390/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/s390/bits/mman.h
 else version (S390)
 {
     static if (__USE_MISC) enum
@@ -79,7 +79,7 @@ else version (S390)
         MAP_HUGETLB = 0x40000,
     }
 }
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/s390/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/s390/bits/mman.h
 else version (SystemZ)
 {
     static if (__USE_MISC) enum
@@ -95,7 +95,7 @@ else version (SystemZ)
         MAP_HUGETLB = 0x40000,
     }
 }
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/sh/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/sh/bits/mman.h
 else version (SH)
 {
     static if (__USE_MISC) enum
@@ -111,7 +111,7 @@ else version (SH)
         MAP_HUGETLB = 0x40000,
     }
 }
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/sparc/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/sparc/bits/mman.h
 else version (SPARC)
 {
     static if (__USE_MISC) enum
@@ -135,7 +135,7 @@ else version (SPARC)
     //     MCL_FUTURE = 0x4000,
     // }
 }
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/sparc/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/sparc/bits/mman.h
 else version (SPARC64)
 {
     static if (__USE_MISC) enum
@@ -159,7 +159,7 @@ else version (SPARC64)
     //     MCL_FUTURE = 0x4000,
     // }
 }
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/x86/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/x86/bits/mman.h
 else version (X86)
 {
     static if (__USE_MISC) enum MAP_32BIT = 0x40;
@@ -177,7 +177,7 @@ else version (X86)
         MAP_HUGETLB = 0x40000,
     }
 }
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/x86/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/x86/bits/mman.h
 else version (X86_64)
 {
     static if (__USE_MISC) enum MAP_32BIT = 0x40;
@@ -195,7 +195,7 @@ else version (X86_64)
         MAP_HUGETLB = 0x40000,
     }
 }
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/aarch64/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/aarch64/bits/mman.h
 else version (AArch64)
 {
     static if (__USE_MISC) enum
@@ -211,7 +211,7 @@ else version (AArch64)
         MAP_HUGETLB = 0x40000,
     }
 }
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/alpha/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/alpha/bits/mman.h
 else version (Alpha)
 {
     enum
@@ -274,7 +274,7 @@ else version (Alpha)
         MREMAP_FIXED = 2,
     }
 
-    static if (__USE_BSD) enum
+    static if (__USE_MISC) enum
     {
         MADV_NORMAL = 0,
         MADV_RANDOM = 1,
@@ -303,7 +303,7 @@ else version (Alpha)
     //         POSIX_MADV_DONTNEED = 6,
     // }
 }
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/arm/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/arm/bits/mman.h
 else version (ARM)
 {
     static if (__USE_MISC) enum
@@ -319,7 +319,7 @@ else version (ARM)
         MAP_HUGETLB = 0x40000,
     }
 }
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/hppa/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/hppa/bits/mman.h
 else version (HPPA)
 {
     enum
@@ -381,7 +381,7 @@ else version (HPPA)
         MREMAP_FIXED = 2,
     }
 
-    static if (__USE_BSD) enum
+    static if (__USE_MISC) enum
     {
         MADV_NORMAL = 0,
         MADV_RANDOM = 1,
@@ -423,7 +423,7 @@ else version (HPPA)
     //     POSIX_MADV_DONTNEED = 4,
     // }
 }
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/hppa/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/hppa/bits/mman.h
 else version (HPPA64)
 {
     enum
@@ -485,7 +485,7 @@ else version (HPPA64)
         MREMAP_FIXED = 2,
     }
 
-    static if (__USE_BSD) enum
+    static if (__USE_MISC) enum
     {
         MADV_NORMAL = 0,
         MADV_RANDOM = 1,
@@ -528,7 +528,7 @@ else version (HPPA64)
     //     POSIX_MADV_DONTNEED = 4,
     // }
 }
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/ia64/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/ia64/bits/mman.h
 else version (IA64)
 {
     static if (__USE_MISC) enum
@@ -545,7 +545,7 @@ else version (IA64)
         MAP_HUGETLB = 0x40000,
     }
 }
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/m68k/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/m68k/bits/mman.h
 else version (M68K)
 {
     static if (__USE_MISC) enum
@@ -561,7 +561,7 @@ else version (M68K)
         MAP_HUGETLB = 0x40000,
     }
 }
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/mips/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/mips/bits/mman.h
 else version (MIPS32)
 {
     static if (__USE_MISC) enum
@@ -577,7 +577,7 @@ else version (MIPS32)
         MAP_HUGETLB = 0x80000,
     }
 }
-// https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/mips/bits/mman.h
+// https://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/mips/bits/mman.h
 else version (MIPS64)
 {
     static if (__USE_MISC) enum
@@ -599,7 +599,8 @@ else
 }
 
 
-// https://sourceware.org/git/?p=glibc.git;a=blob;f=bits/mman-linux.h
+// <bits/mman-linux.h>
+// https://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=bits/mman-linux.h
 version (Alpha)
 {
 }
@@ -650,7 +651,7 @@ else
         MREMAP_FIXED = 2,
     }
 
-    static if (__USE_BSD) enum
+    static if (__USE_MISC) enum
     {
         MADV_NORMAL = 0,
         MADV_RANDOM = 1,
@@ -689,22 +690,22 @@ else
 }
 
 // Workaround https://issues.dlang.org/show_bug.cgi?id=17883
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/sparc/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/sparc/bits/mman.h
 version (SPARC)
 {
     static if (__USE_MISC) enum MAP_RENAME = MAP_ANONYMOUS;
 }
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/sparc/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/sparc/bits/mman.h
 else version (SPARC64)
 {
     static if (__USE_MISC) enum MAP_RENAME = MAP_ANONYMOUS;
 }
-// http://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/mips/bits/mman.h
+// http://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/mips/bits/mman.h
 else version (MIPS32)
 {
     static if (__USE_MISC) enum MAP_RENAME = MAP_ANONYMOUS;
 }
-// https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/mips/bits/mman.h
+// https://sourceware.org/git/?p=glibc.git;a=blob;hb=51e945a8f950a6695754b11c1e6fba8bb750e100;f=sysdeps/unix/sysv/linux/mips/bits/mman.h
 else version (MIPS64)
 {
     static if (__USE_MISC) enum MAP_RENAME = MAP_ANONYMOUS;
@@ -720,7 +721,7 @@ else version (MIPS64)
 // int munmap(void*, size_t);
 // int mprotect(void *__addr, size_t __len, int __prot);
 // int msync(void *__addr, size_t __len, int __flags);
-static if (__USE_BSD) int madvise(void *__addr, size_t __len, int __advice);
+static if (__USE_MISC) int madvise(void *__addr, size_t __len, int __advice);
 // static if (__USE_XOPEN2K) int posix_madvise(void *__addr, size_t __len, int __advice);
 // int mlock(const(void) *__addr, size_t __len);
 // int munlock(const(void) *__addr, size_t __len);
diff --git a/libphobos/libdruntime/core/sys/linux/sys/netinet/tcp.d b/libphobos/libdruntime/core/sys/linux/sys/netinet/tcp.d
index 67458f63c..d49573639 100644
--- a/libphobos/libdruntime/core/sys/linux/sys/netinet/tcp.d
+++ b/libphobos/libdruntime/core/sys/linux/sys/netinet/tcp.d
@@ -1,79 +1,9 @@
-/*******************************************************************************
-
-    D bindings for the Linux's netinet/tcp.h structures.
-
-    Defines constants found in tcp.h header on Linux system.
-
-    Copyright:  Copyright (c) 2016 Sociomantic Labs. All rights reserved.
-    License:    $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
-    Authors:    Nemanja Boric
-
-*******************************************************************************/
-
+/**
+ * D header file for GNU/Linux
+ *
+ * Authors: Martin Nowak
+ */
+deprecated("Import core.sys.linux.netinet.tcp instead")
 module core.sys.linux.sys.netinet.tcp;
 
-/*
-* Copyright (c) 1982, 1986, 1993
-* The Regents of the University of California.  All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-* 1. Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-* 2. Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the distribution.
-* 4. Neither the name of the University nor the names of its contributors
-*    may be used to endorse or promote products derived from this software
-*    without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-* SUCH DAMAGE.
-*
-* @(#)tcp.h 8.1 (Berkeley) 6/10/93
-*/
-
-version (linux):
-
-/// User-settable options (used with setsockopt).
-enum
-{
-     TCP_NODELAY            = 1,  /// Don't delay send to coalesce packets
-     TCP_MAXSEG             = 2,  /// Set maximum segment size
-     TCP_CORK               = 3,  /// Control sending of partial frames
-     TCP_KEEPIDLE           = 4,  /// Start keeplives after this period
-     TCP_KEEPINTVL          = 5,  /// Interval between keepalives
-     TCP_KEEPCNT            = 6,  /// Number of keepalives before death
-     TCP_SYNCNT             = 7,  /// Number of SYN retransmits
-     TCP_LINGER2            = 8,  /// Life time of orphaned FIN-WAIT-2 state
-     TCP_DEFER_ACCEPT       = 9,  /// Wake up listener only when data arrive
-     TCP_WINDOW_CLAMP       = 10, /// Bound advertised window
-     TCP_INFO               = 11, /// Information about this connection.
-     TCP_QUICKACK           = 12, /// Bock/reenable quick ACKs.
-     TCP_CONGESTION         = 13, /// Congestion control algorithm.
-     TCP_MD5SIG             = 14, /// TCP MD5 Signature (RFC2385)
-     TCP_COOKIE_TRANSACTIONS     = 15, /// TCP Cookie Transactions
-     TCP_THIN_LINEAR_TIMEOUTS    = 16, /// Use linear timeouts for thin streams
-     TCP_THIN_DUPACK             = 17, /// Fast retrans. after 1 dupack
-     TCP_USER_TIMEOUT       = 18, /// How long for loss retry before timeout
-     TCP_REPAIR             = 19, /// TCP sock is under repair right now
-     TCP_REPAIR_QUEUE       = 20, /// Set TCP queue to repair
-     TCP_QUEUE_SEQ          = 21, /// Set sequence number of repaired queue.
-     TCP_REPAIR_OPTIONS     = 22, /// Repair TCP connection options
-     TCP_FASTOPEN           = 23, /// Enable FastOpen on listeners
-     TCP_TIMESTAMP          = 24, /// TCP time stamp
-     TCP_NOTSENT_LOWAT      = 25, /// Limit number of unsent bytes in  write queue.
-     TCP_CC_INFO            = 26, /// Get Congestion Control (optional) info.
-     TCP_SAVE_SYN           = 27, /// Record SYN headers for new connections.
-     TCP_SAVED_SYN          = 28, /// Get SYN headers recorded for connection.
-}
+public import core.sys.linux.netinet.tcp;
diff --git a/libphobos/libdruntime/core/sys/linux/sys/time.d b/libphobos/libdruntime/core/sys/linux/sys/time.d
index cc1344210..4b55f7086 100644
--- a/libphobos/libdruntime/core/sys/linux/sys/time.d
+++ b/libphobos/libdruntime/core/sys/linux/sys/time.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sociomantic Labs GmbH.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Leandro Lucarella
  */
 
diff --git a/libphobos/libdruntime/core/sys/linux/time.d b/libphobos/libdruntime/core/sys/linux/time.d
index 7fb8e35ec..da121e813 100644
--- a/libphobos/libdruntime/core/sys/linux/time.d
+++ b/libphobos/libdruntime/core/sys/linux/time.d
@@ -4,8 +4,8 @@
     D header file for Linux extensions to POSIX's time.h.
 
     Copyright: Copyright 2014
-    License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
-    Authors:   Jonathan M Davis
+    License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+    Authors:   $(HTTP jmdavisprog.com, Jonathan M Davis)
  +/
 module core.sys.linux.time;
 
diff --git a/libphobos/libdruntime/core/sys/netbsd/dlfcn.d b/libphobos/libdruntime/core/sys/netbsd/dlfcn.d
index 5815cc201..e56b5f58c 100644
--- a/libphobos/libdruntime/core/sys/netbsd/dlfcn.d
+++ b/libphobos/libdruntime/core/sys/netbsd/dlfcn.d
@@ -2,7 +2,7 @@
  * D header file for NetBSD.
  *
  * Copyright: Copyright Martin Nowak 2012.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Martin Nowak
  *
  * http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/include/dlfcn.h
diff --git a/libphobos/libdruntime/core/sys/netbsd/sys/elf_common.d b/libphobos/libdruntime/core/sys/netbsd/sys/elf_common.d
index 3bfb48c44..91d893399 100644
--- a/libphobos/libdruntime/core/sys/netbsd/sys/elf_common.d
+++ b/libphobos/libdruntime/core/sys/netbsd/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)
 {
diff --git a/libphobos/libdruntime/core/sys/netbsd/sys/event.d b/libphobos/libdruntime/core/sys/netbsd/sys/event.d
index f83651c6a..a2bffb200 100644
--- a/libphobos/libdruntime/core/sys/netbsd/sys/event.d
+++ b/libphobos/libdruntime/core/sys/netbsd/sys/event.d
@@ -2,7 +2,7 @@
  * D header file for NetBSD.
  *
  * Copyright: Copyright Martin Nowak 2012.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Martin Nowak
  *
  * http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/sys/sys/event.h
diff --git a/libphobos/libdruntime/core/sys/netbsd/time.d b/libphobos/libdruntime/core/sys/netbsd/time.d
index 4fb1e2f4d..21bda1649 100644
--- a/libphobos/libdruntime/core/sys/netbsd/time.d
+++ b/libphobos/libdruntime/core/sys/netbsd/time.d
@@ -4,8 +4,8 @@
     D header file for NetBSD's extensions to POSIX's time.h.
 
     Copyright: Copyright 2014
-    License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
-    Authors:   Jonathan M Davis
+    License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+    Authors:   $(HTTP jmdavisprog.com, Jonathan M Davis)
 
     http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/sys/sys/time.h
  +/
diff --git a/libphobos/libdruntime/core/sys/osx/mach/dyld.d b/libphobos/libdruntime/core/sys/osx/mach/dyld.d
index 2514ed0a7..af61ff326 100644
--- a/libphobos/libdruntime/core/sys/osx/mach/dyld.d
+++ b/libphobos/libdruntime/core/sys/osx/mach/dyld.d
@@ -3,7 +3,7 @@
  *       will be removed in June 2018.)
  *
  * Copyright: Copyright Digital Mars 2010.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Jacob Carlborg
  * Version: Initial created: Feb 20, 2010
  */
diff --git a/libphobos/libdruntime/core/sys/osx/mach/getsect.d b/libphobos/libdruntime/core/sys/osx/mach/getsect.d
index d3b907e2a..b2b311ef2 100644
--- a/libphobos/libdruntime/core/sys/osx/mach/getsect.d
+++ b/libphobos/libdruntime/core/sys/osx/mach/getsect.d
@@ -3,7 +3,7 @@
  *       module will be removed in June 2018.)
  *
  * Copyright: Copyright Digital Mars 2010.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Jacob Carlborg
  * Version: Initial created: Mar 16, 2010
  */
diff --git a/libphobos/libdruntime/core/sys/osx/mach/kern_return.d b/libphobos/libdruntime/core/sys/osx/mach/kern_return.d
index 24b4cce6d..e1ca352db 100644
--- a/libphobos/libdruntime/core/sys/osx/mach/kern_return.d
+++ b/libphobos/libdruntime/core/sys/osx/mach/kern_return.d
@@ -5,7 +5,7 @@
  * D header file for OSX.
  *
  * Copyright: Copyright Sean Kelly 2008 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  */
 
diff --git a/libphobos/libdruntime/core/sys/osx/mach/loader.d b/libphobos/libdruntime/core/sys/osx/mach/loader.d
index a0e15453b..d43059884 100644
--- a/libphobos/libdruntime/core/sys/osx/mach/loader.d
+++ b/libphobos/libdruntime/core/sys/osx/mach/loader.d
@@ -3,7 +3,7 @@
  *       will be removed in June 2018.)
  *
  * Copyright: Copyright Digital Mars 2010.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Jacob Carlborg
  * Version: Initial created: Feb 20, 2010
  */
diff --git a/libphobos/libdruntime/core/sys/osx/mach/port.d b/libphobos/libdruntime/core/sys/osx/mach/port.d
index ddfc7664b..ddbcac6c6 100644
--- a/libphobos/libdruntime/core/sys/osx/mach/port.d
+++ b/libphobos/libdruntime/core/sys/osx/mach/port.d
@@ -5,7 +5,7 @@
  * D header file for OSX.
  *
  * Copyright: Copyright Sean Kelly 2008 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  */
 
diff --git a/libphobos/libdruntime/core/sys/osx/mach/semaphore.d b/libphobos/libdruntime/core/sys/osx/mach/semaphore.d
index 949335818..392d9312e 100644
--- a/libphobos/libdruntime/core/sys/osx/mach/semaphore.d
+++ b/libphobos/libdruntime/core/sys/osx/mach/semaphore.d
@@ -5,7 +5,7 @@
  * D header file for OSX.
  *
  * Copyright: Copyright Sean Kelly 2008 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  */
 
diff --git a/libphobos/libdruntime/core/sys/osx/mach/thread_act.d b/libphobos/libdruntime/core/sys/osx/mach/thread_act.d
index 10339bf44..b118a3d4e 100644
--- a/libphobos/libdruntime/core/sys/osx/mach/thread_act.d
+++ b/libphobos/libdruntime/core/sys/osx/mach/thread_act.d
@@ -5,7 +5,7 @@
  * D header file for OSX.
  *
  * Copyright: Copyright Sean Kelly 2008 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  */
 
diff --git a/libphobos/libdruntime/core/sys/osx/pthread.d b/libphobos/libdruntime/core/sys/osx/pthread.d
index 89bd70e6b..08e8bc00a 100644
--- a/libphobos/libdruntime/core/sys/osx/pthread.d
+++ b/libphobos/libdruntime/core/sys/osx/pthread.d
@@ -5,7 +5,7 @@
  * D header file for OSX.
  *
  * Copyright: Copyright Sean Kelly 2008 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  */
 
diff --git a/libphobos/libdruntime/core/sys/osx/sys/event.d b/libphobos/libdruntime/core/sys/osx/sys/event.d
index 4050e386c..f83325b30 100644
--- a/libphobos/libdruntime/core/sys/osx/sys/event.d
+++ b/libphobos/libdruntime/core/sys/osx/sys/event.d
@@ -5,7 +5,7 @@
  * D header file for OSX.
  *
  * Copyright: Copyright Martin Nowak 2012. Etienne Cimon 2015.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Martin Nowak
  */
 
diff --git a/libphobos/libdruntime/core/sys/osx/sys/mman.d b/libphobos/libdruntime/core/sys/osx/sys/mman.d
index 066ea93cc..b5a8719a1 100644
--- a/libphobos/libdruntime/core/sys/osx/sys/mman.d
+++ b/libphobos/libdruntime/core/sys/osx/sys/mman.d
@@ -2,7 +2,7 @@
  * $(RED Deprecated. Use $(D core.sys.darwin.sys.mman) instead. This module
  *       will be removed in June 2018.)
  *
- * D header file for FreeBSD
+ * D header file for OSX
  *
  * Authors: Martin Nowak
  */
diff --git a/libphobos/libdruntime/core/sys/posix/aio.d b/libphobos/libdruntime/core/sys/posix/aio.d
new file mode 100644
index 000000000..372152ab0
--- /dev/null
+++ b/libphobos/libdruntime/core/sys/posix/aio.d
@@ -0,0 +1,251 @@
+/**
+ * D header file to interface with the
+ * $(HTTP pubs.opengroup.org/onlinepubs/9699919799/basedefs/aio.h.html, Posix AIO API).
+ *
+ * Copyright: Copyright D Language Foundation 2018.
+ * License:   $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
+ * Authors:   $(HTTPS github.com/darredevil, Alexandru Razvan Caciulescu)
+ */
+module core.sys.posix.aio;
+
+private import core.sys.posix.signal;
+private import core.sys.posix.sys.types;
+
+version (Posix):
+
+extern (C):
+@system:
+@nogc:
+nothrow:
+
+version (CRuntime_Glibc)
+{
+    import core.sys.posix.config;
+
+    struct aiocb
+    {
+        int aio_fildes;
+        int aio_lio_opcode;
+        int aio_reqprio;
+        void* aio_buf;   //volatile
+        size_t aio_nbytes;
+        sigevent aio_sigevent;
+
+        aiocb* __next_prio;
+        int __abs_prio;
+        int __policy;
+        int __error_code;
+        ssize_t __return_value;
+
+        off_t aio_offset;
+        ubyte[32] __glibc_reserved;
+    }
+
+    static if (__USE_LARGEFILE64)
+    {
+        struct aiocb64
+        {
+            int aio_fildes;
+            int aio_lio_opcode;
+            int aio_reqprio;
+            void* aio_buf;   //volatile
+            size_t aio_nbytes;
+            sigevent aio_sigevent;
+
+            aiocb* __next_prio;
+            int __abs_prio;
+            int __policy;
+            int __error_code;
+            ssize_t __return_value;
+
+            off_t aio_offset;
+            ubyte[32] __glibc_reserved;
+        }
+    }
+}
+else version (FreeBSD)
+{
+    struct __aiocb_private
+    {
+        long status;
+        long error;
+        void* kernelinfo;
+    }
+
+    struct aiocb
+    {
+        int aio_fildes;
+        off_t aio_offset;
+        void* aio_buf;   // volatile
+        size_t aio_nbytes;
+        private int[2] __spare;
+        private void* _spare2__;
+        int aio_lio_opcode;
+        int aio_reqprio;
+        private __aiocb_private _aiocb_private;
+        sigevent aio_sigevent;
+    }
+
+    version = BSD_Posix;
+}
+else version (NetBSD)
+{
+    struct aiocb
+    {
+        off_t aio_offset;
+        void* aio_buf;   // volatile
+        size_t aio_nbytes;
+        int aio_fildes;
+        int aio_lio_opcode;
+        int aio_reqprio;
+        sigevent aio_sigevent;
+        private int _state;
+        private int _errno;
+        private ssize_t _retval;
+    }
+
+    version = BSD_Posix;
+}
+else version (DragonFlyBSD)
+{
+    struct aiocb
+    {
+        int aio_fildes;
+        off_t aio_offset;
+        void* aio_buf;   // volatile
+        size_t aio_nbytes;
+        sigevent aio_sigevent;
+        int aio_lio_opcode;
+        int aio_reqprio;
+        private int _aio_val;
+        private int _aio_err;
+    }
+
+    version = BSD_Posix;
+}
+else
+    static assert(false, "Unsupported platform");
+
+/* Return values of cancelation function.  */
+enum
+{
+    AIO_CANCELED,
+    AIO_NOTCANCELED,
+    AIO_ALLDONE
+}
+
+/* Operation codes for `aio_lio_opcode'.  */
+version (CRuntime_Glibc)
+{
+    enum
+    {
+        LIO_READ,
+        LIO_WRITE,
+        LIO_NOP
+    }
+}
+else version (BSD_Posix)
+{
+    enum
+    {
+        LIO_NOP,
+        LIO_WRITE,
+        LIO_READ
+    }
+}
+
+/* Synchronization options for `lio_listio' function.  */
+version (CRuntime_Glibc)
+{
+    enum
+    {
+        LIO_WAIT,
+        LIO_NOWAIT
+    }
+}
+else version (BSD_Posix)
+{
+    enum
+    {
+        LIO_NOWAIT,
+        LIO_WAIT
+    }
+}
+
+/* Functions implementing POSIX AIO.  */
+version (CRuntime_Glibc)
+{
+    static if (__USE_LARGEFILE64)
+    {
+        int aio_read64(aiocb64* aiocbp);
+        int aio_write64(aiocb64* aiocbp);
+        int aio_fsync64(int op, aiocb64* aiocbp);
+        int aio_error64(const(aiocb64)* aiocbp);
+        ssize_t aio_return64(aiocb64* aiocbp);
+        int aio_suspend64(const(aiocb64*)* aiocb_list, int nitems, const(timespec)* timeout);
+        int aio_cancel64(int fd, aiocb64* aiocbp);
+        int lio_listio64(int mode, const(aiocb64*)* aiocb_list, int nitems, sigevent* sevp);
+
+        alias aio_read = aio_read64;
+        alias aio_write = aio_write64;
+        alias aio_fsync = aio_fsync64;
+        alias aio_error = aio_error64;
+        alias aio_return = aio_return64;
+        alias aio_suspend = aio_suspend64;
+        alias aio_cancel = aio_cancel64;
+        alias lio_listio = lio_listio64;
+    }
+    else
+    {
+        int aio_read(aiocb* aiocbp);
+        int aio_write(aiocb* aiocbp);
+        int aio_fsync(int op, aiocb* aiocbp);
+        int aio_error(const(aiocb)* aiocbp);
+        ssize_t aio_return(aiocb* aiocbp);
+        int aio_suspend(const(aiocb*)* aiocb_list, int nitems, const(timespec)* timeout);
+        int aio_cancel(int fd, aiocb* aiocbp);
+        int lio_listio(int mode, const(aiocb*)* aiocb_list, int nitems, sigevent* sevp);
+    }
+}
+else
+{
+    int aio_read(aiocb* aiocbp);
+    int aio_write(aiocb* aiocbp);
+    int aio_fsync(int op, aiocb* aiocbp);
+    int aio_error(const(aiocb)* aiocbp);
+    ssize_t aio_return(aiocb* aiocbp);
+    int aio_suspend(const(aiocb*)* aiocb_list, int nitems, const(timespec)* timeout);
+    int aio_cancel(int fd, aiocb* aiocbp);
+    int lio_listio(int mode, const(aiocb*)* aiocb_list, int nitems, sigevent* sevp);
+}
+
+/* Functions outside/extending POSIX requirement.  */
+version (CRuntime_Glibc)
+{
+    static if (__USE_GNU)
+    {
+        /* To customize the implementation one can use the following struct.  */
+        struct aioinit
+        {
+            int aio_threads;
+            int aio_num;
+            int aio_locks;
+            int aio_usedba;
+            int aio_debug;
+            int aio_numusers;
+            int aio_idle_time;
+            int aio_reserved;
+        }
+
+        void aio_init(const(aioinit)* init);
+    }
+}
+else version (FreeBSD)
+{
+    int aio_waitcomplete(aiocb** aiocb_list, const(timespec)* timeout);
+    int aio_mlock(aiocb* aiocbp);
+}
+else version (DragonFlyBSD)
+{
+    int aio_waitcomplete(aiocb** aiocb_list, const(timespec)* timeout);
+}
diff --git a/libphobos/libdruntime/core/sys/posix/arpa/inet.d b/libphobos/libdruntime/core/sys/posix/arpa/inet.d
index 675a197e6..b63ff6a04 100644
--- a/libphobos/libdruntime/core/sys/posix/arpa/inet.d
+++ b/libphobos/libdruntime/core/sys/posix/arpa/inet.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -158,6 +158,31 @@ else version(NetBSD)
     const(char)*    inet_ntop(int, in void*, char*, socklen_t);
     int             inet_pton(int, in char*, void*);
 }
+else version( DragonFlyBSD )
+{
+    alias uint16_t in_port_t;
+    alias uint32_t in_addr_t;
+
+    struct in_addr
+    {
+        in_addr_t s_addr;
+    }
+
+    enum INET_ADDRSTRLEN = 16;
+
+    @trusted pure
+    {
+    uint32_t htonl(uint32_t);
+    uint16_t htons(uint16_t);
+    uint32_t ntohl(uint32_t);
+    uint16_t ntohs(uint16_t);
+    }
+
+    in_addr_t       inet_addr(in char*);
+    char*           inet_ntoa(in_addr);
+    const(char)*    inet_ntop(int, in void*, char*, socklen_t);
+    int             inet_pton(int, in char*, void*);
+}
 else version( Solaris )
 {
     alias uint16_t in_port_t;
@@ -222,6 +247,56 @@ else version( CRuntime_Bionic )
     const(char)*    inet_ntop(int, in void*, char*, size_t);
     int             inet_pton(int, in char*, void*);
 }
+else version( CRuntime_Musl )
+{
+    alias uint16_t in_port_t;
+    alias uint32_t in_addr_t;
+
+    struct in_addr
+    {
+        in_addr_t s_addr;
+    }
+
+    enum INET_ADDRSTRLEN = 16;
+
+    @trusted pure
+    {
+    uint32_t htonl(uint32_t);
+    uint16_t htons(uint16_t);
+    uint32_t ntohl(uint32_t);
+    uint16_t ntohs(uint16_t);
+    }
+
+    in_addr_t       inet_addr(in char*);
+    char*           inet_ntoa(in_addr);
+    const(char)*    inet_ntop(int, in void*, char*, socklen_t);
+    int             inet_pton(int, in char*, void*);
+}
+else version( CRuntime_UClibc )
+{
+    alias uint16_t in_port_t;
+    alias uint32_t in_addr_t;
+
+    struct in_addr
+    {
+        in_addr_t s_addr;
+    }
+
+    enum INET_ADDRSTRLEN = 16;
+
+    @trusted pure
+    {
+    uint32_t htonl(uint32_t);
+    uint16_t htons(uint16_t);
+    uint32_t ntohl(uint32_t);
+    uint16_t ntohs(uint16_t);
+    }
+
+    in_addr_t       inet_addr(in char*);
+    char*           inet_ntoa(in_addr);
+    const(char)*    inet_ntop(int, in void*, char*, socklen_t);
+    int             inet_pton(int, in char*, void*);
+}
 
 //
 // IPV6 (IP6)
@@ -249,6 +324,10 @@ else version(NetBSD)
 {
     enum INET6_ADDRSTRLEN = 46;
 }
+else version( DragonFlyBSD )
+{
+    enum INET6_ADDRSTRLEN = 46;
+}
 else version( Solaris )
 {
     enum INET6_ADDRSTRLEN = 46;
@@ -257,3 +336,7 @@ else version( CRuntime_Bionic )
 {
     enum INET6_ADDRSTRLEN = 46;
 }
+else version( CRuntime_UClibc )
+{
+    enum INET6_ADDRSTRLEN = 46;
+}
diff --git a/libphobos/libdruntime/core/sys/posix/config.d b/libphobos/libdruntime/core/sys/posix/config.d
index a6c435232..1861946f7 100644
--- a/libphobos/libdruntime/core/sys/posix/config.d
+++ b/libphobos/libdruntime/core/sys/posix/config.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly,
               Alex Rønne Petersen
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
@@ -29,10 +29,16 @@ version (CRuntime_Glibc)
     // man 7 feature_test_macros
     // http://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html
     enum _GNU_SOURCE         = false;
-    enum _BSD_SOURCE         = false;
-    enum _SVID_SOURCE        = false;
+    enum _DEFAULT_SOURCE     = false;
     enum _ATFILE_SOURCE      = false;
 
+    // _BSD_SOURCE and _SVID_SOURCE are deprecated aliases for _DEFAULT_SOURCE.
+    deprecated("use _DEFAULT_SOURCE")
+    {
+        enum _BSD_SOURCE = false;
+        enum _SVID_SOURCE = false;
+    }
+
     enum _FILE_OFFSET_BITS   = 64;
     // <sys/cdefs.h>
     enum __REDIRECT          = false;
@@ -49,9 +55,49 @@ version (CRuntime_Glibc)
     enum __USE_XOPEN2K8      = _XOPEN_SOURCE >= 700;
     enum __USE_XOPEN2K8XSI   = _XOPEN_SOURCE >= 700;
 
-    enum __USE_MISC          = _BSD_SOURCE || _SVID_SOURCE;
-    enum __USE_BSD           = _BSD_SOURCE;
-    enum __USE_SVID          = _SVID_SOURCE;
+    enum __USE_MISC          = _DEFAULT_SOURCE;
+    enum __USE_ATFILE        = _ATFILE_SOURCE;
+    enum __USE_GNU           = _GNU_SOURCE;
+    enum __USE_REENTRANT     = _REENTRANT;
+
+    version(D_LP64)
+        enum __WORDSIZE=64;
+    else
+        enum __WORDSIZE=32;
+}
+else version (CRuntime_Musl)
+{
+    enum _FILE_OFFSET_BITS   = 64;
+
+    enum __REDIRECT          = false;
+
+    enum __USE_FILE_OFFSET64 = _FILE_OFFSET_BITS == 64;
+    enum __USE_LARGEFILE     = __USE_FILE_OFFSET64 && !__REDIRECT;
+    enum __USE_LARGEFILE64   = __USE_FILE_OFFSET64 && !__REDIRECT;
+
+    enum __WORDSIZE=64;
+}
+else version (CRuntime_UClibc)
+{
+    enum _GNU_SOURCE         = false;
+    enum _DEFAULT_SOURCE     = false;
+    enum _ATFILE_SOURCE      = false;
+
+    enum _FILE_OFFSET_BITS   = 64;
+    enum __REDIRECT          = false;
+
+    enum _REENTRANT          = true;
+
+    enum __USE_FILE_OFFSET64 = _FILE_OFFSET_BITS == 64;
+    enum __USE_LARGEFILE     = __USE_FILE_OFFSET64 && !__REDIRECT;
+    enum __USE_LARGEFILE64   = __USE_FILE_OFFSET64 && !__REDIRECT;
+
+    enum __USE_XOPEN2K       = _XOPEN_SOURCE >= 600;
+    enum __USE_XOPEN2KXSI    = _XOPEN_SOURCE >= 600;
+    enum __USE_XOPEN2K8      = _XOPEN_SOURCE >= 700;
+    enum __USE_XOPEN2K8XSI   = _XOPEN_SOURCE >= 700;
+
+    enum __USE_MISC          = _DEFAULT_SOURCE;
     enum __USE_ATFILE        = _ATFILE_SOURCE;
     enum __USE_GNU           = _GNU_SOURCE;
     enum __USE_REENTRANT     = _REENTRANT;
diff --git a/libphobos/libdruntime/core/sys/posix/dirent.d b/libphobos/libdruntime/core/sys/posix/dirent.d
index 5a51cc737..5ce8748e0 100644
--- a/libphobos/libdruntime/core/sys/posix/dirent.d
+++ b/libphobos/libdruntime/core/sys/posix/dirent.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly,
               Alex Rønne Petersn
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
@@ -135,6 +135,7 @@ else version( Darwin )
 }
 else version( FreeBSD )
 {
+    // https://github.com/freebsd/freebsd/blob/master/sys/sys/dirent.h
     enum
     {
         DT_UNKNOWN  = 0,
@@ -221,6 +222,36 @@ else version( OpenBSD )
 
     dirent* readdir(DIR*);
 }
+else version( DragonFlyBSD )
+{
+    enum
+    {
+        DT_UNKNOWN  = 0,
+        DT_FIFO     = 1,
+        DT_CHR      = 2,
+        DT_DIR      = 4,
+        DT_BLK      = 6,
+        DT_REG      = 8,
+        DT_LNK      = 10,
+        DT_SOCK     = 12,
+        DT_WHT      = 14,
+        DT_DBF      = 15,         /* database record file */
+    }
+
+    struct dirent
+    {
+        ino_t     d_fileno;       /* file number of entry */
+        ushort    d_reclen;       /* strlen(d_name) */
+        ubyte     d_type;         /* file type, see blow */
+        ubyte     d_unused1;      /* padding, reserved */
+        uint      d_unused2;      /* reserved */
+        char[256] d_name;         /* name, NUL-terminated */
+    }
+
+    alias void* DIR;
+
+    dirent* readdir(DIR*);
+}
 else version (Solaris)
 {
     struct dirent
@@ -287,6 +318,93 @@ else version( CRuntime_Bionic )
 
     dirent* readdir(DIR*);
 }
+else version( CRuntime_Musl )
+{
+    enum
+    {
+        DT_UNKNOWN  = 0,
+        DT_FIFO     = 1,
+        DT_CHR      = 2,
+        DT_DIR      = 4,
+        DT_BLK      = 6,
+        DT_REG      = 8,
+        DT_LNK      = 10,
+        DT_SOCK     = 12,
+        DT_WHT      = 14
+    }
+
+    struct dirent
+    {
+        ino_t       d_ino;
+        off_t       d_off;
+        ushort      d_reclen;
+        ubyte       d_type;
+        char[256]   d_name;
+    }
+
+    struct DIR
+    {
+    }
+
+    static if( __USE_FILE_OFFSET64 )
+    {
+        dirent* readdir64(DIR*);
+        alias   readdir64 readdir;
+    }
+    else
+    {
+        dirent* readdir(DIR*);
+    }
+}
+else version( CRuntime_UClibc )
+{
+    // NOTE: The following constants are non-standard Linux definitions
+    //       for dirent.d_type.
+    enum
+    {
+        DT_UNKNOWN  = 0,
+        DT_FIFO     = 1,
+        DT_CHR      = 2,
+        DT_DIR      = 4,
+        DT_BLK      = 6,
+        DT_REG      = 8,
+        DT_LNK      = 10,
+        DT_SOCK     = 12,
+        DT_WHT      = 14
+    }
+
+    struct dirent
+    {
+        static if (__USE_FILE_OFFSET64)
+        {
+            ino64_t d_ino;
+            off64_t d_off;
+        }
+        else
+        {
+            ino_t d_ino;
+            off_t d_off;
+        }
+        ushort      d_reclen;
+        ubyte       d_type;
+        char[256]   d_name;
+    }
+
+    struct DIR
+    {
+        // Managed by OS
+    }
+
+    static if( __USE_FILE_OFFSET64 )
+    {
+        dirent* readdir64(DIR*);
+        alias   readdir64 readdir;
+    }
+    else
+    {
+        dirent* readdir(DIR*);
+    }
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -357,6 +475,10 @@ else version( FreeBSD )
 {
     int readdir_r(DIR*, dirent*, dirent**);
 }
+else version( DragonFlyBSD )
+{
+    int readdir_r(DIR*, dirent*, dirent**);
+}
 else version(NetBSD)
 {
     int __readdir_r30(DIR*, dirent*, dirent**);
@@ -382,6 +504,22 @@ else version( CRuntime_Bionic )
 {
     int readdir_r(DIR*, dirent*, dirent**);
 }
+else version( CRuntime_Musl )
+{
+
+}
+else version( CRuntime_UClibc )
+{
+  static if( __USE_LARGEFILE64 )
+  {
+    int   readdir64_r(DIR*, dirent*, dirent**);
+    alias readdir64_r readdir_r;
+  }
+  else
+  {
+    int readdir_r(DIR*, dirent*, dirent**);
+  }
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -415,6 +553,11 @@ else version( OpenBSD )
     void   seekdir(DIR*, c_long);
     c_long telldir(DIR*);
 }
+else version( DragonFlyBSD )
+{
+    void   seekdir(DIR*, c_long);
+    c_long telldir(DIR*);
+}
 else version (Darwin)
 {
     version( OSX )
@@ -446,6 +589,14 @@ else version (Solaris)
 else version (CRuntime_Bionic)
 {
 }
+else version (CRuntime_Musl)
+{
+}
+else version (CRuntime_UClibc)
+{
+    void   seekdir(DIR*, c_long);
+    c_long telldir(DIR*);
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/sys/posix/dlfcn.d b/libphobos/libdruntime/core/sys/posix/dlfcn.d
index e90873d36..56e43bf39 100644
--- a/libphobos/libdruntime/core/sys/posix/dlfcn.d
+++ b/libphobos/libdruntime/core/sys/posix/dlfcn.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly, Alex Rønne Petersen
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -225,6 +225,27 @@ else version( OpenBSD )
         void*        dli_saddr;
     }
 }
+else version( DragonFlyBSD )
+{
+    enum RTLD_LAZY      = 1;
+    enum RTLD_NOW       = 2;
+    enum RTLD_GLOBAL    = 0x100;
+    enum RTLD_LOCAL     = 0;
+
+    int   dlclose(void*);
+    char* dlerror();
+    void* dlopen(in char*, int);
+    void* dlsym(void*, in char*);
+    int   dladdr(const(void)* addr, Dl_info* info);
+
+    struct Dl_info
+    {
+        const(char)* dli_fname;
+        void*        dli_fbase;
+        const(char)* dli_sname;
+        void*        dli_saddr;
+    }
+}
 else version( Solaris )
 {
     enum RTLD_LAZY      = 1;
@@ -270,3 +291,58 @@ else version( CRuntime_Bionic )
         void*        dli_saddr;
     }
 }
+else version( CRuntime_Musl )
+{
+    enum {
+        RTLD_LAZY     = 1,
+        RTLD_NOW      = 2,
+        RTLD_NOLOAD   = 4,
+        RTLD_NODELETE = 4096,
+        RTLD_GLOBAL   = 256,
+        RTLD_LOCAL    = 0,
+    }
+    int          dlclose(void*);
+    const(char)* dlerror();
+    void*        dlopen(in char*, int);
+    void*        dlsym(void*, in char*);
+}
+else version( CRuntime_UClibc )
+{
+    version (X86_64)
+    {
+        enum RTLD_LAZY              = 0x0001;
+        enum RTLD_NOW               = 0x0002;
+        enum RTLD_BINDING_MASK      = 0x3;
+        enum RTLD_NOLOAD            = 0x00004;
+        enum RTLD_GLOBAL            = 0x00100;
+        enum RTLD_LOCAL             = 0;
+        enum RTLD_NODELETE          = 0x01000;
+    }
+    else version (MIPS32)
+    {
+        enum RTLD_LAZY              = 0x0001;
+        enum RTLD_NOW               = 0x0002;
+        enum RTLD_BINDING_MASK      = 0x3;
+        enum RTLD_NOLOAD            = 0x00008;
+        enum RTLD_GLOBAL            = 0x0004;
+        enum RTLD_LOCAL             = 0;
+        enum RTLD_NODELETE          = 0x01000;
+    }
+    else version (ARM)
+    {
+        enum RTLD_LAZY              = 0x0001;
+        enum RTLD_NOW               = 0x0002;
+        enum RTLD_BINDING_MASK      = 0x3;
+        enum RTLD_NOLOAD            = 0x00004;
+        enum RTLD_GLOBAL            = 0x00100;
+        enum RTLD_LOCAL             = 0;
+        enum RTLD_NODELETE          = 0x01000;
+    }
+    else
+        static assert(0, "unimplemented");
+
+    int   dlclose(void*);
+    char* dlerror();
+    void* dlopen(in char*, int);
+    void* dlsym(void*, in char*);
+}
diff --git a/libphobos/libdruntime/core/sys/posix/fcntl.d b/libphobos/libdruntime/core/sys/posix/fcntl.d
index ee78f7199..80b248d24 100644
--- a/libphobos/libdruntime/core/sys/posix/fcntl.d
+++ b/libphobos/libdruntime/core/sys/posix/fcntl.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly, Alex Rønne Petersen
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -98,6 +98,12 @@ version( CRuntime_Glibc )
     enum F_SETLK        = 6;
     enum F_SETLKW       = 7;
   }
+  else version(AArch64)
+  {
+    enum F_GETLK        = 5;
+    enum F_SETLK        = 6;
+    enum F_SETLKW       = 7;
+  }
   else
   static if( __USE_FILE_OFFSET64 )
   {
@@ -517,6 +523,95 @@ else version(NetBSD)
     int creat(in char*, mode_t);
     int open(in char*, int, ...);
 }
+else version( DragonFlyBSD )
+{
+    enum O_RDONLY       = 0x0000;
+    enum O_WRONLY       = 0x0001;
+    enum O_RDWR         = 0x0002;
+    enum O_ACCMODE      = 0x0003;
+
+    enum FREAD          = 0x0001;
+    enum FWRITE         = 0x0002;
+    enum O_NONBLOCK     = 0x0000004;
+    enum O_APPEND       = 0x0000008;
+    enum O_SHLOCK       = 0x0000010;
+    enum O_EXLOCK       = 0x0000020;
+    enum O_ASYNC        = 0x0000040;
+    enum O_FSYNC        = 0x0000080;
+    enum O_SYNC         = 0x0000080;
+    enum O_NOFOLLOW     = 0x0000100;
+    enum O_CREAT        = 0x0000200;
+    enum O_TRUNC        = 0x0000400;
+    enum O_EXCL         = 0x0000800;
+    enum O_NOCTTY       = 0x0008000;
+    enum O_DIRECT       = 0x0010000;
+    enum O_CLOEXEC      = 0x0020000;
+    enum O_FBLOCKING    = 0x0040000;
+    enum O_FNONBLOCKING = 0x0080000;
+    enum O_FAPPEND      = 0x0100000;
+    enum O_FOFFSET      = 0x0200000;
+    enum O_FSYNCWRITE   = 0x0400000;
+    enum O_FASYNCWRITE  = 0x0800000;
+    enum O_DIRECTORY    = 0x8000000;
+
+    enum FAPPEND        = O_APPEND;
+    enum FASYNC         = O_ASYNC;
+    enum FFSYNC         = O_FSYNC;
+    enum FNONBLOCK      = O_NONBLOCK;
+    enum FNDELAY        = O_NONBLOCK;
+    enum O_NDELAY       = O_NONBLOCK;
+    enum FPOSIXSHM      = O_NOFOLLOW;
+
+    enum FCNTLFLAGS = (FAPPEND|FASYNC|FFSYNC|FNONBLOCK|FPOSIXSHM|O_DIRECT);
+
+    enum F_DUPFD        = 0;
+    enum F_GETFD        = 1;
+    enum F_SETFD        = 2;
+    enum F_GETFL        = 3;
+    enum F_SETFL        = 4;
+    enum F_GETOWN       = 5;
+    enum F_SETOWN       = 6;
+    enum F_GETLK        = 7;
+//    enum F_SETLK        = 8;
+    enum F_SETLK        = 8;
+    enum F_SETLKW       = 9;
+    enum F_OGETLK       = F_GETLK;
+    enum F_OSETLK       = F_SETLK;
+    enum F_OSETLKW      = F_SETLKW;
+    enum F_DUP2FD       = 10;
+    //enum F_GETLK        = 11;
+    //enum F_SETLK        = 12;
+    //enum F_SETLKW       = 13;
+    enum F_DUPFD_CLOEXEC = 17;
+    enum F_DUP2FD_CLOEXEC = 18;
+
+    enum FD_CLOEXEC     = 1;
+
+    enum F_RDLCK        = 1;
+    enum F_UNLCK        = 2;
+    enum F_WRLCK        = 3;
+
+    enum LOCK_SH        = 0x01;
+    enum LOCK_EX        = 0x02;
+    enum LOCK_NB        = 0x04;
+    enum LOCK_UN        = 0x08;
+
+    struct flock
+    {
+        off_t   l_start;
+        off_t   l_len;
+        pid_t   l_pid;
+        short   l_type;
+        short   l_whence;
+    }
+
+    alias oflock = flock;
+
+    int creat(in char*, mode_t);
+    int open(in char*, int, ...);
+    //int fcntl(int, int, ...);  /*defined below*/
+    //int flock(int, int);
+}
 else version (Solaris)
 {
     enum F_DUPFD = 0;
@@ -671,6 +766,17 @@ else version( CRuntime_Bionic )
         enum O_NONBLOCK     = 0x800;    // octal    04000
         enum O_SYNC         = 0x1000;   // octal   010000
     }
+    else version (AArch64)
+    {
+        enum O_CREAT        = 0x40;     // octal     0100
+        enum O_EXCL         = 0x80;     // octal     0200
+        enum O_NOCTTY       = 0x100;    // octal     0400
+        enum O_TRUNC        = 0x200;    // octal    01000
+
+        enum O_APPEND       = 0x400;    // octal    02000
+        enum O_NONBLOCK     = 0x800;    // octal    04000
+        enum O_SYNC         = 0x101000; // octal 04010000
+    }
     else
     {
         static assert(false, "Architecture not supported.");
@@ -695,6 +801,188 @@ else version( CRuntime_Bionic )
 
     enum AT_FDCWD = -100;
 }
+else version( CRuntime_Musl )
+{
+    enum {
+        O_CREAT         = 0x40,     // octal     0100
+        O_EXCL          = 0x80,     // octal     0200
+        O_NOCTTY        = 0x100,    // octal     0400
+        O_TRUNC         = 0x200,    // octal    01000
+
+        O_APPEND        = 0x400,    // octal    02000
+        O_NONBLOCK      = 0x800,    // octal    04000
+        O_DSYNC         = 0x1000,   // octal   010000
+        O_SYNC          = 0x101000, // octal 04010000
+        O_RSYNC         = O_SYNC,
+        O_DIRECTORY     = 0x10000,
+        O_NOFOLLOW      = 0x20000,
+        O_CLOEXEC       = 0x80000,
+
+        O_ASYNC         = 0x2000,
+        O_DIRECT        = 0x4000,
+        O_LARGEFILE     =      0,
+        O_NOATIME       = 0x40000,
+        O_PATH          = 0x200000,
+        O_TMPFILE       = 0x410000,
+        O_NDELAY        = O_NONBLOCK,
+        O_SEARCH        = O_PATH,
+        O_EXEC          = O_PATH,
+
+        O_ACCMODE       = (03|O_SEARCH),
+        O_RDONLY        = 00,
+        O_WRONLY        = 01,
+        O_RDWR          = 02,
+    }
+    enum {
+        F_DUPFD        = 0,
+        F_GETFD        = 1,
+        F_SETFD        = 2,
+        F_GETFL        = 3,
+        F_SETFL        = 4,
+        F_GETLK        = 5,
+        F_SETLK        = 6,
+        F_SETLKW       = 7,
+        F_SETOWN       = 8,
+        F_GETOWN       = 9,
+    }
+    enum {
+        F_RDLCK        = 0,
+        F_WRLCK        = 1,
+        F_UNLCK        = 2,
+    }
+    struct flock
+    {
+        short   l_type;
+        short   l_whence;
+        off_t   l_start;
+        off_t   l_len;
+        pid_t   l_pid;
+    }
+    enum FD_CLOEXEC     = 1;
+    int open(in char*, int, ...);
+
+    enum AT_FDCWD = -100;
+}
+else version( CRuntime_UClibc )
+{
+    enum F_DUPFD        = 0;
+    enum F_GETFD        = 1;
+    enum F_SETFD        = 2;
+    enum F_GETFL        = 3;
+    enum F_SETFL        = 4;
+
+    version(X86_64)
+    {
+        enum F_GETLK        = 5;
+        enum F_SETLK        = 6;
+        enum F_SETLKW       = 7;
+    }
+    else static if (__USE_FILE_OFFSET64)
+    {
+        enum F_GETLK        = 5;
+        enum F_SETLK        = 6;
+        enum F_SETLKW       = 7;
+    }
+    else
+    {
+        enum F_GETLK        = 12;
+        enum F_SETLK        = 13;
+        enum F_SETLKW       = 14;
+    }
+
+    enum F_GETOWN       = 9;
+    enum F_SETOWN       = 8;
+
+    enum FD_CLOEXEC     = 1;
+
+    enum F_RDLCK        = 0;
+    enum F_UNLCK        = 2;
+    enum F_WRLCK        = 1;
+
+    version (X86_64)
+    {
+        enum O_CREAT        = 0x40;     // octal     0100
+        enum O_EXCL         = 0x80;     // octal     0200
+        enum O_NOCTTY       = 0x100;    // octal     0400
+        enum O_TRUNC        = 0x200;    // octal    01000
+
+        enum O_APPEND       = 0x400;    // octal    02000
+        enum O_NONBLOCK     = 0x800;    // octal    04000
+        enum O_SYNC         = 0x1000;   // octal    010000
+        enum O_NDELAY       = O_NONBLOCK;
+        enum O_FSYNC        = O_SYNC;
+        enum O_ASYNC        = 0x2000;   // octal    020000
+    }
+    else version (MIPS32)
+    {
+        enum O_CREAT        = 0x0100;
+        enum O_EXCL         = 0x0400;
+        enum O_NOCTTY       = 0x0800;
+        enum O_TRUNC        = 0x0200;
+
+        enum O_APPEND       = 0x0008;
+        enum O_SYNC         = 0x0010;
+        enum O_NONBLOCK     = 0x0080;
+        enum O_NDELAY       = O_NONBLOCK;
+        enum O_FSYNC        = O_SYNC;
+        enum O_ASYNC        = 0x1000;
+    }
+    else version (ARM)
+    {
+        enum O_CREAT        = 0x40;     // octal     0100
+        enum O_EXCL         = 0x80;     // octal     0200
+        enum O_NOCTTY       = 0x100;    // octal     0400
+        enum O_TRUNC        = 0x200;    // octal    01000
+
+        enum O_APPEND       = 0x400;    // octal    02000
+        enum O_NONBLOCK     = 0x800;    // octal    04000
+        enum O_SYNC         = 0x1000;   // octal    010000
+        enum O_NDELAY       = O_NONBLOCK;
+        enum O_FSYNC        = O_SYNC;
+        enum O_ASYNC        = 0x2000;     // octal 020000
+    }
+    else
+        static assert(0, "unimplemented");
+
+    enum O_ACCMODE      = 0x3;
+    enum O_RDONLY       = 0x0;
+    enum O_WRONLY       = 0x1;
+    enum O_RDWR         = 0x2;
+
+    struct flock
+    {
+        short   l_type;
+        short   l_whence;
+        static if (__USE_FILE_OFFSET64)
+        {
+            off64_t   l_start;
+            off64_t   l_len;
+        }
+        else
+        {
+            off_t   l_start;
+            off_t   l_len;
+        }
+        pid_t   l_pid;
+    }
+
+    static if( __USE_FILE_OFFSET64 )
+    {
+        int   creat64(in char*, mode_t);
+        alias creat64 creat;
+
+        int   open64(in char*, int, ...);
+        alias open64 open;
+    }
+    else
+    {
+        int   creat(in char*, mode_t);
+        int   open(in char*, int, ...);
+    }
+
+    enum AT_SYMLINK_NOFOLLOW    = 0x100;
+    enum AT_FDCWD               = -100;
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/sys/posix/grp.d b/libphobos/libdruntime/core/sys/posix/grp.d
index 1f6ec9514..462758255 100644
--- a/libphobos/libdruntime/core/sys/posix/grp.d
+++ b/libphobos/libdruntime/core/sys/posix/grp.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009, Sönke Ludwig 2013.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly, Alex Rønne Petersen, Sönke Ludwig
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -97,6 +97,16 @@ else version( OpenBSD )
         char**  gr_mem;
     }
 }
+else version( DragonFlyBSD )
+{
+    struct group
+    {
+        char*   gr_name;
+        char*   gr_passwd;
+        gid_t   gr_gid;
+        char**  gr_mem;
+    }
+}
 else version( Solaris )
 {
     struct group
@@ -117,6 +127,26 @@ else version( CRuntime_Bionic )
         char**  gr_mem;
     }
 }
+else version( CRuntime_UClibc )
+{
+    struct group
+    {
+        char*   gr_name;
+        char*   gr_passwd;
+        gid_t   gr_gid;
+        char**  gr_mem;
+    }
+}
+else version( CRuntime_Musl )
+{
+    struct group
+    {
+        char*   gr_name;
+        char*   gr_passwd;
+        gid_t   gr_gid;
+        char**  gr_mem;
+    }
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -158,6 +188,11 @@ else version( OpenBSD )
     int getgrnam_r(in char*, group*, char*, size_t, group**);
     int getgrgid_r(gid_t, group*, char*, size_t, group**);
 }
+else version( DragonFlyBSD )
+{
+    int getgrnam_r(in char*, group*, char*, size_t, group**);
+    int getgrgid_r(gid_t, group*, char*, size_t, group**);
+}
 else version( Solaris )
 {
     int getgrnam_r(in char*, group*, char*, int, group**);
@@ -166,6 +201,16 @@ else version( Solaris )
 else version( CRuntime_Bionic )
 {
 }
+else version( CRuntime_UClibc )
+{
+    int getgrnam_r(in char*, group*, char*, size_t, group**);
+    int getgrgid_r(gid_t, group*, char*, size_t, group**);
+}
+else version( CRuntime_Musl )
+{
+    int getgrnam_r(in char*, group*, char*, size_t, group**);
+    int getgrgid_r(gid_t, group*, char*, size_t, group**);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -210,6 +255,12 @@ else version( OpenBSD )
     @trusted void endgrent();
     @trusted void setgrent();
 }
+else version( DragonFlyBSD )
+{
+    group* getgrent();
+    @trusted void endgrent();
+    @trusted void setgrent();
+}
 else version( Solaris )
 {
     group* getgrent();
@@ -219,6 +270,18 @@ else version( Solaris )
 else version( CRuntime_Bionic )
 {
 }
+else version( CRuntime_UClibc )
+{
+    group* getgrent();
+    @trusted void endgrent();
+    @trusted void setgrent();
+}
+else version( CRuntime_Musl )
+{
+    group* getgrent();
+    @trusted void endgrent();
+    @trusted void setgrent();
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/sys/posix/iconv.d b/libphobos/libdruntime/core/sys/posix/iconv.d
index 1bde829f5..9ba6fddee 100644
--- a/libphobos/libdruntime/core/sys/posix/iconv.d
+++ b/libphobos/libdruntime/core/sys/posix/iconv.d
@@ -11,7 +11,7 @@
     iconv_close(3)  Deallocates allocated resources
 
     Copyright:  Copyright (c) 2016 Sociomantic Labs. All rights reserved.
-    License:    $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+    License:    $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
     Authors:    Nemanja Boric
     Standards:  POSIX.1-2001, POSIX.1-2008
     See_Also:
diff --git a/libphobos/libdruntime/core/sys/posix/inttypes.d b/libphobos/libdruntime/core/sys/posix/inttypes.d
index 7bca85bb6..e2954eda5 100644
--- a/libphobos/libdruntime/core/sys/posix/inttypes.d
+++ b/libphobos/libdruntime/core/sys/posix/inttypes.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
diff --git a/libphobos/libdruntime/core/sys/posix/mqueue.d b/libphobos/libdruntime/core/sys/posix/mqueue.d
index 67ea678c8..d55437680 100644
--- a/libphobos/libdruntime/core/sys/posix/mqueue.d
+++ b/libphobos/libdruntime/core/sys/posix/mqueue.d
@@ -15,10 +15,10 @@
  * mq_notify(3)        register asynchronous notify
  *
  * Copyright: Copyright (c) 2016 sociomantic labs. All rights reserved
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Andreas Bok Andersen, Mathias Lang
  * Standards: POSIX.1-2001.
- * See_Also:  $(WEB pubs.opengroup.org/onlinepubs/9699919799/basedefs/mqueue.h.html, Standard)
+ * See_Also:  $(HTTP pubs.opengroup.org/onlinepubs/9699919799/basedefs/mqueue.h.html, Standard)
  */
 module core.sys.posix.mqueue;
 
diff --git a/libphobos/libdruntime/core/sys/posix/net/if_.d b/libphobos/libdruntime/core/sys/posix/net/if_.d
index 60e51a844..a27727a61 100644
--- a/libphobos/libdruntime/core/sys/posix/net/if_.d
+++ b/libphobos/libdruntime/core/sys/posix/net/if_.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -106,6 +106,21 @@ else version(NetBSD)
     if_nameindex_t* if_nameindex();
     void            if_freenameindex(if_nameindex_t*);
 }
+else version( DragonFlyBSD )
+{
+    struct if_nameindex_t
+    {
+        uint    if_index;
+        char*   if_name;
+    }
+
+    enum IF_NAMESIZE = 16;
+
+    uint            if_nametoindex(in char*);
+    char*           if_indextoname(uint, char*);
+    if_nameindex_t* if_nameindex();
+    void            if_freenameindex(if_nameindex_t*);
+}
 else version( CRuntime_Bionic )
 {
     enum IF_NAMESIZE = 16;
@@ -113,3 +128,18 @@ else version( CRuntime_Bionic )
     uint            if_nametoindex(in char*);
     char*           if_indextoname(uint, char*);
 }
+else version( CRuntime_UClibc )
+{
+    struct if_nameindex_t
+    {
+        uint    if_index;
+        char*   if_name;
+    }
+
+    enum IF_NAMESIZE = 16;
+
+    uint            if_nametoindex(in char*);
+    char*           if_indextoname(uint, char*);
+    if_nameindex_t* if_nameindex();
+    void            if_freenameindex(if_nameindex_t*);
+}
diff --git a/libphobos/libdruntime/core/sys/posix/netdb.d b/libphobos/libdruntime/core/sys/posix/netdb.d
index 60ae944d8..12b5262d4 100644
--- a/libphobos/libdruntime/core/sys/posix/netdb.d
+++ b/libphobos/libdruntime/core/sys/posix/netdb.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright David Nadlinger 2011.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   David Nadlinger, Sean Kelly, Alex Rønne Petersen
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -594,6 +594,107 @@ else version( OpenBSD )
     enum EAI_PROTOCOL       = -13;
     enum EAI_OVERFLOW       = -14;
 }
+else version( DragonFlyBSD )
+{
+    /*
+     * Error return codes from gethostbyname() and gethostbyaddr()
+     * (left in h_errno).
+     */
+    struct hostent
+    {
+        char*   h_name;
+        char**  h_aliases;
+        int     h_addrtype;
+        int     h_length;
+        char**  h_addr_list;
+        extern (D) char* h_addr() @property { return h_addr_list[0]; } // non-standard
+    }
+
+    struct netent
+    {
+        char*   n_name;
+        char**  n_aliases;
+        int     n_addrtype;
+        uint32_t n_net;
+    }
+
+    struct protoent
+    {
+        char*   p_name;
+        char**  p_aliases;
+        int     p_proto;
+    }
+
+    struct servent
+    {
+        char*   s_name;
+        char**  s_aliases;
+        int     s_port;
+        char*   s_proto;
+    }
+
+    struct addrinfo
+    {
+        int         ai_flags;
+        int         ai_family;
+        int         ai_socktype = SOCK_STREAM;           /* socktype default value required to be able to perform getAddrInfo on DragonFlyBSD
+                                                          * without socktype set, you get 'servname not supported for ai_socktype'
+                                                          */
+        int         ai_protocol;
+        socklen_t   ai_addrlen;
+        char*       ai_canonname;
+        sockaddr*   ai_addr;
+        addrinfo*   ai_next;
+    }
+
+    enum IPPORT_RESERVED = 1024;
+
+    enum NETDB_INTERNAL = -1;
+    enum NETDB_SUCCESS  = 0;
+    enum HOST_NOT_FOUND = 1;
+    enum TRY_AGAIN      = 2;
+    enum NO_RECOVERY    = 3;
+    enum NO_DATA        = 4;
+    enum NO_ADDRESS     = NO_DATA;
+
+    //enum EAI_ADDRFAMILY     = 1; // deprecated
+    enum EAI_AGAIN          = 2;
+    enum EAI_BADFLAGS       = 3;
+    enum EAI_FAIL           = 4;
+    enum EAI_FAMILY         = 5;
+    enum EAI_MEMORY         = 6;
+    //enum EAI_NODATA         = 7; // deprecated
+    enum EAI_NONAME         = 8;
+    enum EAI_SERVICE        = 9;
+    enum EAI_SOCKTYPE       = 10;
+    enum EAI_SYSTEM         = 11;
+    enum EAI_BADHINTS       = 12;
+    enum EAI_PROTOCOL       = 13;
+    enum EAI_OVERFLOW       = 14;
+
+    enum AI_PASSIVE         = 0x001;
+    enum AI_CANONNAME       = 0x002;
+    enum AI_NUMERICHOST     = 0x004;
+    enum AI_NUMERICSERV     = 0x008;
+    enum AI_MASK            = (AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_NUMERICSERV | AI_ADDRCONFIG);   // valid flags for addrinfo (not a standard def, apps should not use it)
+    enum AI_ALL             = 0x100;
+    enum AI_V4MAPPED_CFG    = 0x200;
+    enum AI_ADDRCONFIG      = 0x400;
+    enum AI_V4MAPPED        = 0x800;
+    enum AI_DEFAULT         = (AI_V4MAPPED_CFG | AI_ADDRCONFIG);
+
+    enum NI_MAXHOST         = 1025; // non-standard
+    enum NI_MAXSERV         = 32;   // non-standard
+
+    enum NI_NOFQDN          = 0x01;
+    enum NI_NUMERICHOST     = 0x02;
+    enum NI_NAMEREQD        = 0x04;
+    enum NI_NUMERICSERV     = 0x08;
+    enum NI_DGRAM           = 0x10;
+    //enum NI_WITHSCOPEID     = 0x20; // deprecated
+    enum NI_NUMERICSCOPE    = 0x40;
+
+}
 else version (Solaris)
 {
     struct hostent
@@ -765,6 +866,174 @@ else version( CRuntime_Bionic )
     enum EAI_SYSTEM         = 11;
     enum EAI_OVERFLOW       = 14;
 }
+else version( CRuntime_Musl )
+{
+    struct hostent
+    {
+        char*   h_name;
+        char**  h_aliases;
+        int     h_addrtype;
+        int     h_length;
+        char**  h_addr_list;
+        char*   h_addr() @property { return h_addr_list[0]; } // non-standard
+    }
+
+    struct netent
+    {
+        char*     n_name;
+        char**    n_aliases;
+        int       n_addrtype;
+        uint32_t n_net;
+    }
+
+    struct protoent
+    {
+        char*   p_name;
+        char**  p_aliases;
+        int     p_proto;
+    }
+
+    struct servent
+    {
+        char*     s_name;
+        char**    s_aliases;
+        int       s_port;
+        char*     s_proto;
+    }
+
+    struct addrinfo
+    {
+        int         ai_flags;
+        int         ai_family;
+        int         ai_socktype;
+        int         ai_protocol;
+        socklen_t   ai_addrlen;
+        sockaddr*   ai_addr;
+        char*       ai_canonname;
+        addrinfo*   ai_next;
+    }
+
+    enum {
+        AI_PASSIVE         = 0x1,
+        AI_CANONNAME       = 0x2,
+        AI_NUMERICHOST     = 0x4,
+        AI_NUMERICSERV     = 0x400,
+        AI_V4MAPPED        = 0x8,
+        AI_ALL             = 0x10,
+        AI_ADDRCONFIG      = 0x20,
+    }
+    enum {
+        NI_NUMERICHOST     = 1,
+        NI_NUMERICSERV     = 2,
+        NI_NOFQDN          = 4,
+        NI_NAMEREQD        = 8,
+        NI_DGRAM           = 16,
+        NI_MAXSERV         = 32,
+        NI_MAXHOST         = 255,
+    }
+    enum {
+        EAI_BADFLAGS       = -1,
+        EAI_NONAME         = -2,
+        EAI_AGAIN          = -3,
+        EAI_FAIL           = -4,
+        EAI_FAMILY         = -6,
+        EAI_SOCKTYPE       = -7,
+        EAI_SERVICE        = -8,
+        EAI_MEMORY         = -10,
+        EAI_SYSTEM         = -11,
+        EAI_OVERFLOW       = -12,
+    }
+}
+else version( CRuntime_UClibc )
+{
+    struct hostent
+    {
+        char*   h_name;
+        char**  h_aliases;
+        int     h_addrtype;
+        int     h_length;
+        char**  h_addr_list;
+        extern (D) char* h_addr() @property { return h_addr_list[0]; } // non-standard
+    }
+
+    struct netent
+    {
+        char*   n_name;
+        char**  n_aliases;
+        int     n_addrtype;
+        uint32_t n_net;
+    }
+
+    struct protoent
+    {
+        char*   p_name;
+        char**  p_aliases;
+        int     p_proto;
+    }
+
+    struct servent
+    {
+        char*   s_name;
+        char**  s_aliases;
+        int     s_port;
+        char*   s_proto;
+    }
+
+    enum IPPORT_RESERVED = 1024;
+
+    enum HOST_NOT_FOUND = 1;
+    enum NO_DATA        = 4;
+    enum NO_RECOVERY    = 3;
+    enum TRY_AGAIN      = 2;
+
+    struct addrinfo
+    {
+        int         ai_flags;
+        int         ai_family;
+        int         ai_socktype;
+        int         ai_protocol;
+        socklen_t   ai_addrlen;
+        sockaddr*   ai_addr;
+        char*       ai_canonname;
+        addrinfo*   ai_next;
+    }
+
+    enum AI_PASSIVE         = 0x1;
+    enum AI_CANONNAME       = 0x2;
+    enum AI_NUMERICHOST     = 0x4;
+    enum AI_NUMERICSERV     = 0x400;
+    enum AI_V4MAPPED        = 0x8;
+    enum AI_ALL             = 0x10;
+    enum AI_ADDRCONFIG      = 0x20;
+
+    enum NI_NOFQDN          = 4;
+    enum NI_NUMERICHOST     = 1;
+    enum NI_NAMEREQD        = 8;
+    enum NI_NUMERICSERV     = 2;
+    enum NI_DGRAM           = 16;
+    enum NI_MAXHOST         = 1025; // non-standard
+    enum NI_MAXSERV         = 32;   // non-standard
+
+    enum EAI_AGAIN          = -3;
+    enum EAI_BADFLAGS       = -1;
+    enum EAI_FAIL           = -4;
+    enum EAI_FAMILY         = -6;
+    enum EAI_MEMORY         = -10;
+    enum EAI_NONAME         = -2;
+    enum EAI_SERVICE        = -8;
+    enum EAI_SOCKTYPE       = -7;
+    enum EAI_SYSTEM         = -11;
+    enum EAI_OVERFLOW       = -12;
+
+    enum EAI_NODATA         = -5;
+    enum EAI_ADDRFAMILY     = -9;
+    enum EAI_INPROGRESS     = -100;
+    enum EAI_CANCELED       = -101;
+    enum EAI_NOTCANCELED    = -102;
+    enum EAI_ALLDONE        = -103;
+    enum EAI_INTR           = -104;
+    enum EAI_IDN_ENCODE     = -105;
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/sys/posix/netinet/in_.d b/libphobos/libdruntime/core/sys/posix/netinet/in_.d
index 061ed4893..82ce9e86d 100644
--- a/libphobos/libdruntime/core/sys/posix/netinet/in_.d
+++ b/libphobos/libdruntime/core/sys/posix/netinet/in_.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -246,6 +246,101 @@ else version(NetBSD)
 
     //enum INET_ADDRSTRLEN       = 16;
 }
+else version( DragonFlyBSD )
+{
+    //alias uint16_t in_port_t;
+    //alias uint32_t in_addr_t;
+
+    //struct in_addr
+    //{
+    //    in_addr_t s_addr;
+    //}
+
+    struct sockaddr_in
+    {
+        ubyte       sin_len;
+        sa_family_t sin_family;
+        in_port_t   sin_port;
+        in_addr     sin_addr;
+        ubyte[8]    sin_zero;
+    }
+
+    enum
+    {
+        IPPROTO_IP   = 0,
+        IPPROTO_ICMP = 1,
+        IPPROTO_IGMP = 2,
+        IPPROTO_GGP  = 3,
+        IPPROTO_TCP  = 6,
+        IPPROTO_PUP  = 12,
+        IPPROTO_UDP  = 17,
+        IPPROTO_IDP  = 22,
+        IPPROTO_ND   = 77,
+        IPPROTO_MAX  = 256
+    }
+
+    enum : uint
+    {
+        INADDR_ANY       = 0x00000000,
+        INADDR_LOOPBACK  = 0x7f000001,
+        INADDR_BROADCAST = 0xffffffff,
+        INADDR_NONE      = 0xffffffff,
+    }
+
+    //enum INET_ADDRSTRLEN       = 16;
+}
+else version( CRuntime_UClibc )
+{
+    private enum __SOCK_SIZE__ = 16;
+
+    struct sockaddr_in
+    {
+        sa_family_t sin_family;
+        in_port_t   sin_port;
+        in_addr     sin_addr;
+
+        ubyte[__SOCK_SIZE__ - short.sizeof -
+              ushort.sizeof - in_addr.sizeof] __pad;
+    }
+
+    enum
+    {
+        IPPROTO_IP      = 0,
+        IPPROTO_ICMP    = 1,
+        IPPROTO_IGMP    = 2,
+        IPPROTO_GGP     = 3,
+        IPPROTO_IPIP    = 4,
+        IPPROTO_TCP     = 6,
+        IPPROTO_EGP     = 8,
+        IPPROTO_PUP     = 12,
+        IPPROTO_UDP     = 17,
+        IPPROTO_IDP     = 22,
+        IPPROTO_TP      = 29,
+        IPPROTO_DCCP    = 33,
+        IPPROTO_RSVP    = 46,
+        IPPROTO_GRE     = 47,
+        IPPROTO_ESP     = 50,
+        IPPROTO_AH      = 51,
+        IPPROTO_MTP     = 92,
+        IPPROTO_BEETPH  = 94,
+        IPPROTO_ENCAP   = 98,
+        IPPROTO_PIM     = 103,
+        IPPROTO_COMP    = 108,
+        IPPROTO_SCTP    = 132,
+        IPPROTO_UDPLITE = 136,
+        IPPROTO_MPLS    = 137,
+        IPPROTO_MAX     = 256
+    }
+
+    enum : uint
+    {
+        INADDR_ANY       = 0x00000000,
+        INADDR_BROADCAST = 0xffffffff,
+        IN_LOOPBACKNET   = 127,
+        INADDR_LOOPBACK  = 0x7F000001,
+        INADDR_NONE      = 0xFFFFFFFF
+    }
+}
 else version( Solaris )
 {
     struct sockaddr_in
@@ -896,6 +991,145 @@ else version(NetBSD)
                __IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_GLOBAL;
     }
 }
+else version( DragonFlyBSD )
+{
+    struct in6_addr
+    {
+        union
+        {
+            uint8_t[16] s6_addr;
+            uint16_t[8] s6_addr16;
+            uint32_t[4] s6_addr32;
+        }
+    }
+
+    struct sockaddr_in6
+    {
+        uint8_t     sin6_len;
+        sa_family_t sin6_family;
+        in_port_t   sin6_port;
+        uint32_t    sin6_flowinfo;
+        in6_addr    sin6_addr;
+        uint32_t    sin6_scope_id;
+    }
+
+    extern __gshared immutable in6_addr in6addr_any;
+    extern __gshared immutable in6_addr in6addr_loopback;
+
+    struct ipv6_mreq
+    {
+        in6_addr    ipv6mr_multiaddr;
+        uint        ipv6mr_interface;
+    }
+
+    enum : uint
+    {
+        IPPROTO_IPV6        = 41,
+
+        //INET6_ADDRSTRLEN    = 46,
+
+        IPV6_JOIN_GROUP     = 12,
+        IPV6_LEAVE_GROUP    = 13,
+        IPV6_MULTICAST_HOPS = 10,
+        IPV6_MULTICAST_IF   = 9,
+        IPV6_MULTICAST_LOOP = 11,
+        IPV6_UNICAST_HOPS   = 4,
+        IPV6_V6ONLY         = 27,
+    }
+
+    private enum
+    {
+        __IPV6_ADDR_SCOPE_NODELOCAL     = 0x01,
+        __IPV6_ADDR_SCOPE_INTFACELOCAL  = 0x01,
+        __IPV6_ADDR_SCOPE_LINKLOCAL     = 0x02,
+        __IPV6_ADDR_SCOPE_SITELOCAL     = 0x05,
+        __IPV6_ADDR_SCOPE_ORGLOCAL      = 0x08,
+        __IPV6_ADDR_SCOPE_GLOBAL        = 0x0e,
+    }
+
+    // macros
+    extern (D) int IN6_IS_ADDR_UNSPECIFIED( in in6_addr* a ) pure
+    {
+        return (*cast(const uint32_t*) cast(const void*) (&a.s6_addr[0]) == 0) &&
+               (*cast(const uint32_t*) cast(const void*) (&a.s6_addr[4]) == 0) &&
+               (*cast(const uint32_t*) cast(const void*) (&a.s6_addr[8]) == 0) &&
+               (*cast(const uint32_t*) cast(const void*) (&a.s6_addr[12]) == 0);
+    }
+
+    extern (D) int IN6_IS_ADDR_LOOPBACK( in in6_addr* a ) pure
+    {
+        return (*cast(const uint32_t*) cast(const void*) (&a.s6_addr[0]) == 0) &&
+               (*cast(const uint32_t*) cast(const void*) (&a.s6_addr[4]) == 0) &&
+               (*cast(const uint32_t*) cast(const void*) (&a.s6_addr[8]) == 0) &&
+               (*cast(const uint32_t*) cast(const void*) (&a.s6_addr[12]) == ntohl(1));
+    }
+
+    extern (D) int IN6_IS_ADDR_V4COMPAT( in in6_addr* a ) pure
+    {
+        return (*cast(const uint32_t*) cast(const void*) (&a.s6_addr[0]) == 0) &&
+               (*cast(const uint32_t*) cast(const void*) (&a.s6_addr[4]) == 0) &&
+               (*cast(const uint32_t*) cast(const void*) (&a.s6_addr[8]) == 0) &&
+               (*cast(const uint32_t*) cast(const void*) (&a.s6_addr[12]) != 0) &&
+               (*cast(const uint32_t*) cast(const void*) (&a.s6_addr[12]) != ntohl(1));
+    }
+
+    extern (D) int IN6_IS_ADDR_V4MAPPED( in in6_addr* a ) pure
+    {
+        return (*cast(const uint32_t*) cast(const void*) (&a.s6_addr[0]) == 0) &&
+               (*cast(const uint32_t*) cast(const void*) (&a.s6_addr[4]) == 0) &&
+               (*cast(const uint32_t*) cast(const void*) (&a.s6_addr[8]) == ntohl(0x0000ffff));
+    }
+
+    extern (D) int IN6_IS_ADDR_LINKLOCAL( in in6_addr* a ) pure
+    {
+        return a.s6_addr[0] == 0xfe && (a.s6_addr[1] & 0xc0) == 0x80;
+    }
+
+    extern (D) int IN6_IS_ADDR_SITELOCAL( in in6_addr* a ) pure
+    {
+        return a.s6_addr[0] == 0xfe && (a.s6_addr[1] & 0xc0) == 0xc0;
+    }
+
+    extern (D) int IN6_IS_ADDR_MULTICAST( in in6_addr* a ) pure
+    {
+        return a.s6_addr[0] == 0xff;
+    }
+
+    extern (D) uint8_t __IPV6_ADDR_MC_SCOPE( in in6_addr* a ) pure
+    {
+        return a.s6_addr[1] & 0x0f;
+    }
+
+    extern (D) int IN6_IS_ADDR_MC_NODELOCAL( in in6_addr* a ) pure
+    {
+        return IN6_IS_ADDR_MULTICAST(a) &&
+               __IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_NODELOCAL;
+    }
+
+    extern (D) int IN6_IS_ADDR_MC_LINKLOCAL( in in6_addr* a ) pure
+    {
+        return IN6_IS_ADDR_MULTICAST(a) &&
+               __IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_LINKLOCAL;
+    }
+
+    extern (D) int IN6_IS_ADDR_MC_SITELOCAL( in in6_addr* a ) pure
+    {
+        return IN6_IS_ADDR_MULTICAST(a) &&
+               __IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_SITELOCAL;
+    }
+
+    extern (D) int IN6_IS_ADDR_MC_ORGLOCAL( in in6_addr* a ) pure
+    {
+        return IN6_IS_ADDR_MULTICAST(a) &&
+               __IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_ORGLOCAL;
+    }
+
+    extern (D) int IN6_IS_ADDR_MC_GLOBAL( in in6_addr* a ) pure
+    {
+        return IN6_IS_ADDR_MULTICAST(a) &&
+               __IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_GLOBAL;
+    }
+}
 else version( Solaris )
 {
     struct in6_addr
@@ -1151,6 +1385,172 @@ else version( CRuntime_Bionic )
         }
     }
 }
+else version( CRuntime_Musl )
+{
+
+    struct in6_addr {
+        union {
+            uint8_t[16] s6_addr;
+            uint16_t[8] s6_addr16;
+            uint32_t[4] s6_addr32;
+        }
+    }
+    struct sockaddr_in6 {
+        sa_family_t     sin6_family;
+        in_port_t       sin6_port;
+        uint32_t        sin6_flowinfo;
+        in6_addr        sin6_addr;
+        uint32_t        sin6_scope_id;
+    }
+
+    struct ipv6_mreq
+    {
+        in6_addr    ipv6mr_multiaddr;
+        uint        ipv6mr_interface;
+    }
+
+    enum : uint
+    {
+        IPPROTO_IPV6 = 41,
+
+        IPV6_UNICAST_HOPS   = 16,
+        IPV6_MULTICAST_IF   = 17,
+        IPV6_MULTICAST_HOPS = 18,
+        IPV6_MULTICAST_LOOP = 19,
+        IPV6_JOIN_GROUP     = 20,
+        IPV6_LEAVE_GROUP    = 21,
+        IPV6_V6ONLY         = 26
+    }
+    extern __gshared immutable in6_addr in6addr_any;
+    extern __gshared immutable in6_addr in6addr_loopback;
+}
+else version ( CRuntime_UClibc )
+{
+    struct in6_addr
+    {
+        union
+        {
+            uint8_t[16] s6_addr;
+            uint16_t[8] s6_addr16;
+            uint32_t[4] s6_addr32;
+        }
+    }
+
+    struct sockaddr_in6
+    {
+        sa_family_t sin6_family;
+        in_port_t   sin6_port;
+        uint32_t    sin6_flowinfo;
+        in6_addr    sin6_addr;
+        uint32_t    sin6_scope_id;
+    }
+
+    extern __gshared immutable in6_addr in6addr_any;
+    extern __gshared immutable in6_addr in6addr_loopback;
+
+    struct ipv6_mreq
+    {
+        in6_addr    ipv6mr_multiaddr;
+        uint        ipv6mr_interface;
+    }
+
+    enum : uint
+    {
+        IPPROTO_IPV6        = 41,
+        IPV6_JOIN_GROUP     = 20,
+        IPV6_LEAVE_GROUP    = 21,
+        IPV6_MULTICAST_HOPS = 18,
+        IPV6_MULTICAST_IF   = 17,
+        IPV6_MULTICAST_LOOP = 19,
+        IPV6_UNICAST_HOPS   = 16,
+        IPV6_V6ONLY         = 26
+    }
+
+    // macros
+    extern (D) int IN6_IS_ADDR_UNSPECIFIED( in6_addr* addr ) pure
+    {
+        return (cast(uint32_t*) addr)[0] == 0 &&
+               (cast(uint32_t*) addr)[1] == 0 &&
+               (cast(uint32_t*) addr)[2] == 0 &&
+               (cast(uint32_t*) addr)[3] == 0;
+    }
+
+    extern (D) int IN6_IS_ADDR_LOOPBACK( in6_addr* addr ) pure
+    {
+        return (cast(uint32_t*) addr)[0] == 0  &&
+               (cast(uint32_t*) addr)[1] == 0  &&
+               (cast(uint32_t*) addr)[2] == 0  &&
+               (cast(uint32_t*) addr)[3] == htonl( 1 );
+    }
+
+    extern (D) int IN6_IS_ADDR_MULTICAST( in6_addr* addr ) pure
+    {
+        return (cast(uint8_t*) addr)[0] == 0xff;
+    }
+
+    extern (D) int IN6_IS_ADDR_LINKLOCAL( in6_addr* addr ) pure
+    {
+        return ((cast(uint32_t*) addr)[0] & htonl( 0xffc00000 )) == htonl( 0xfe800000 );
+    }
+
+    extern (D) int IN6_IS_ADDR_SITELOCAL( in6_addr* addr ) pure
+    {
+        return ((cast(uint32_t*) addr)[0] & htonl( 0xffc00000 )) == htonl( 0xfec00000 );
+    }
+
+    extern (D) int IN6_IS_ADDR_V4MAPPED( in6_addr* addr ) pure
+    {
+        return (cast(uint32_t*) addr)[0] == 0 &&
+               (cast(uint32_t*) addr)[1] == 0 &&
+               (cast(uint32_t*) addr)[2] == htonl( 0xffff );
+    }
+
+    extern (D) int IN6_IS_ADDR_V4COMPAT( in6_addr* addr ) pure
+    {
+        return (cast(uint32_t*) addr)[0] == 0 &&
+               (cast(uint32_t*) addr)[1] == 0 &&
+               (cast(uint32_t*) addr)[2] == 0 &&
+               ntohl( (cast(uint32_t*) addr)[3] ) > 1;
+    }
+
+    extern (D) int IN6_ARE_ADDR_EQUAL( in6_addr* a, in6_addr* b ) pure
+    {
+        return (cast(uint32_t*) a)[0] == (cast(uint32_t*) b)[0] &&
+               (cast(uint32_t*) a)[1] == (cast(uint32_t*) b)[1] &&
+               (cast(uint32_t*) a)[2] == (cast(uint32_t*) b)[2] &&
+               (cast(uint32_t*) a)[3] == (cast(uint32_t*) b)[3];
+    }
+
+    extern (D) int IN6_IS_ADDR_MC_NODELOCAL( in6_addr* addr ) pure
+    {
+        return IN6_IS_ADDR_MULTICAST( addr ) &&
+               ((cast(uint8_t*) addr)[1] & 0xf) == 0x1;
+    }
+
+    extern (D) int IN6_IS_ADDR_MC_LINKLOCAL( in6_addr* addr ) pure
+    {
+        return IN6_IS_ADDR_MULTICAST( addr ) &&
+               ((cast(uint8_t*) addr)[1] & 0xf) == 0x2;
+    }
+
+    extern (D) int IN6_IS_ADDR_MC_SITELOCAL( in6_addr* addr ) pure
+    {
+        return IN6_IS_ADDR_MULTICAST(addr) &&
+               ((cast(uint8_t*) addr)[1] & 0xf) == 0x5;
+    }
+
+    extern (D) int IN6_IS_ADDR_MC_ORGLOCAL( in6_addr* addr ) pure
+    {
+        return IN6_IS_ADDR_MULTICAST( addr) &&
+               ((cast(uint8_t*) addr)[1] & 0xf) == 0x8;
+    }
+
+    extern (D) int IN6_IS_ADDR_MC_GLOBAL( in6_addr* addr ) pure
+    {
+        return IN6_IS_ADDR_MULTICAST( addr ) &&
+               ((cast(uint8_t*) addr)[1] & 0xf) == 0xe;
+    }
+}
 
 
 //
@@ -1176,6 +1576,10 @@ else version(NetBSD)
 {
     enum uint IPPROTO_RAW = 255;
 }
+else version( DragonFlyBSD )
+{
+    enum uint IPPROTO_RAW = 255;
+}
 else version( Solaris )
 {
     enum uint IPPROTO_RAW = 255;
@@ -1184,3 +1588,7 @@ else version( linux )
 {
     enum uint IPPROTO_RAW = 255;
 }
+else version( CRuntime_UClibc )
+{
+    enum uint IPPROTO_RAW = 255;
+}
diff --git a/libphobos/libdruntime/core/sys/posix/netinet/tcp.d b/libphobos/libdruntime/core/sys/posix/netinet/tcp.d
index 40ac9dd36..6ce826fb1 100644
--- a/libphobos/libdruntime/core/sys/posix/netinet/tcp.d
+++ b/libphobos/libdruntime/core/sys/posix/netinet/tcp.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -51,6 +51,10 @@ else version(NetBSD)
 {
     enum TCP_NODELAY = 1;
 }
+else version( DragonFlyBSD )
+{
+    enum TCP_NODELAY = 1;
+}
 else version( Solaris )
 {
     enum TCP_NODELAY = 1;
diff --git a/libphobos/libdruntime/core/sys/posix/poll.d b/libphobos/libdruntime/core/sys/posix/poll.d
index 4e67b4a37..3de942e24 100644
--- a/libphobos/libdruntime/core/sys/posix/poll.d
+++ b/libphobos/libdruntime/core/sys/posix/poll.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -217,6 +217,40 @@ else version( OpenBSD )
 
     int poll(pollfd*, nfds_t, int);
 }
+else version( DragonFlyBSD )
+{
+    alias uint nfds_t;
+
+    struct pollfd
+    {
+        int     fd;
+        short   events;
+        short   revents;
+    };
+
+    enum
+    {
+        POLLIN      = 0x0001,
+        POLLPRI     = 0x0002,
+        POLLOUT     = 0x0004,
+        POLLRDNORM  = 0x0040,
+        POLLWRNORM  = POLLOUT,
+        POLLRDBAND  = 0x0080,
+        POLLWRBAND  = 0x0100,
+        //POLLEXTEND  = 0x0200,
+        //POLLATTRIB  = 0x0400,
+        //POLLNLINK   = 0x0800,
+        //POLLWRITE   = 0x1000,
+        POLLERR     = 0x0008,
+        POLLHUP     = 0x0010,
+        POLLNVAL    = 0x0020,
+
+        POLLSTANDARD = (POLLIN|POLLPRI|POLLOUT|POLLRDNORM|POLLRDBAND|
+        POLLWRBAND|POLLERR|POLLHUP|POLLNVAL)
+    }
+
+    int poll(pollfd*, nfds_t, int);
+}
 else version( Solaris )
 {
     alias c_ulong nfds_t;
@@ -271,3 +305,60 @@ else version( CRuntime_Bionic )
 
     int poll(pollfd*, nfds_t, c_long);
 }
+else version( CRuntime_Musl )
+{
+    struct pollfd
+    {
+        int     fd;
+        short   events;
+        short   revents;
+    }
+
+    alias uint nfds_t;
+
+    enum
+    {
+        POLLIN      = 0x001,
+        POLLPRI     = 0x002,
+        POLLOUT     = 0x004,
+        POLLERR     = 0x008,
+        POLLHUP     = 0x010,
+        POLLNVAL    = 0x020,
+        POLLRDNORM  = 0x040,
+        POLLRDBAND  = 0x080,
+        POLLWRNORM  = 0x100,
+        POLLWRBAND  = 0x200,
+    }
+
+    int poll(pollfd*, nfds_t, c_long);
+}
+else version( CRuntime_UClibc )
+{
+    struct pollfd
+    {
+        int     fd;
+        short   events;
+        short   revents;
+    }
+
+    alias c_ulong nfds_t;
+
+    enum
+    {
+        POLLIN      = 0x001,
+        POLLRDNORM  = 0x040,
+        POLLRDBAND  = 0x080,
+        POLLPRI     = 0x002,
+        POLLOUT     = 0x004,
+        POLLWRNORM  = 0x100,
+        POLLWRBAND  = 0x200,
+        POLLMSG     = 0x400,
+        POLLREMOVE  = 0x1000,
+        POLLRDHUP   = 0x2000,
+        POLLERR     = 0x008,
+        POLLHUP     = 0x010,
+        POLLNVAL    = 0x020,
+    }
+
+    int poll(pollfd*, nfds_t, int);
+}
diff --git a/libphobos/libdruntime/core/sys/posix/pthread.d b/libphobos/libdruntime/core/sys/posix/pthread.d
index 488eee5d7..c3dbc16ff 100644
--- a/libphobos/libdruntime/core/sys/posix/pthread.d
+++ b/libphobos/libdruntime/core/sys/posix/pthread.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly, Alex Rønne Petersen
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -294,6 +294,46 @@ else version( OpenBSD )
     enum PTHREAD_COND_INITIALIZER               = null;
     enum PTHREAD_RWLOCK_INITIALIZER             = null;
 }
+else version( DragonFlyBSD )
+{
+    enum
+    {
+        PTHREAD_DETACHED            = 0x1,
+        //PTHREAD_SCOPE_SYSTEM        = 0x2,    // defined below
+        PTHREAD_INHERIT_SCHED       = 0x4,
+        PTHREAD_NOFLOAT             = 0x8,
+
+        PTHREAD_CREATE_DETACHED     = PTHREAD_DETACHED,
+        PTHREAD_CREATE_JOINABLE     = 0,
+        //PTHREAD_SCOPE_PROCESS       = 0,      // defined below
+        PTHREAD_EXPLICIT_SCHED      = 0,
+    }
+
+    enum
+    {
+        PTHREAD_PROCESS_PRIVATE     = 0,
+        PTHREAD_PROCESS_SHARED      = 1,
+    }
+
+    enum
+    {
+        PTHREAD_CANCEL_ENABLE       = 0,
+        PTHREAD_CANCEL_DISABLE      = 1,
+        PTHREAD_CANCEL_DEFERRED     = 0,
+        PTHREAD_CANCEL_ASYNCHRONOUS = 2,
+    }
+
+    enum PTHREAD_CANCELED = cast(void*) -1;
+
+    enum PTHREAD_NEEDS_INIT = 0;
+    enum PTHREAD_DONE_INIT  = 1;
+
+    enum PTHREAD_MUTEX_INITIALIZER              = null;
+    //enum PTHREAD_ONCE_INIT                      = { PTHREAD_NEEDS_INIT, NULL };
+    enum PTHREAD_ONCE_INIT                      = pthread_once_t.init;;
+    enum PTHREAD_COND_INITIALIZER               = null;
+    enum PTHREAD_RWLOCK_INITIALIZER             = null;
+}
 else version (Solaris)
 {
     enum
@@ -341,6 +381,60 @@ else version( CRuntime_Bionic )
         PTHREAD_PROCESS_SHARED
     }
 }
+else version( CRuntime_Musl )
+{
+    enum
+    {
+        PTHREAD_CREATE_JOINABLE = 0,
+        PTHREAD_CREATE_DETACHED = 1
+    }
+
+    enum PTHREAD_MUTEX_INITIALIZER = pthread_mutex_t.init;
+    enum PTHREAD_ONCE_INIT = pthread_once_t.init;
+
+    enum
+    {
+        PTHREAD_PROCESS_PRIVATE = 0,
+        PTHREAD_PROCESS_SHARED = 1
+    }
+}
+else version( CRuntime_UClibc )
+{
+    enum
+    {
+        PTHREAD_CANCEL_ENABLE,
+        PTHREAD_CANCEL_DISABLE
+    }
+
+    enum
+    {
+        PTHREAD_CANCEL_DEFERRED,
+        PTHREAD_CANCEL_ASYNCHRONOUS
+    }
+
+    enum PTHREAD_CANCELED   = cast(void*) -1;
+
+    enum PTHREAD_MUTEX_INITIALIZER  = pthread_mutex_t.init;
+    enum PTHREAD_ONCE_INIT          = pthread_once_t.init;
+
+    enum
+    {
+        PTHREAD_CREATE_JOINABLE,
+        PTHREAD_CREATE_DETACHED
+    }
+
+    enum
+    {
+        PTHREAD_INHERIT_SCHED,
+        PTHREAD_EXPLICIT_SCHED
+    }
+
+    enum
+    {
+        PTHREAD_PROCESS_PRIVATE,
+        PTHREAD_PROCESS_SHARED
+    }
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -448,6 +542,31 @@ else version( FreeBSD )
     void __pthread_cleanup_push_imp(_pthread_cleanup_routine_nogc, void*, _pthread_cleanup_info*) @nogc;
     void __pthread_cleanup_pop_imp(int);
 }
+else version( DragonFlyBSD )
+{
+    struct _pthread_cleanup_info
+    {
+        uintptr_t[8]    pthread_cleanup_pad;
+    }
+
+    struct pthread_cleanup
+    {
+        _pthread_cleanup_info __cleanup_info__ = void;
+
+        extern (D) void push()( _pthread_cleanup_routine cleanup_routine, void* cleanup_arg )
+        {
+            _pthread_cleanup_push( cleanup_routine, cleanup_arg, &__cleanup_info__ );
+        }
+
+        extern (D) void pop()( int execute )
+        {
+            _pthread_cleanup_pop( execute );
+        }
+    }
+
+    void _pthread_cleanup_push(_pthread_cleanup_routine, void*, _pthread_cleanup_info*);
+    void _pthread_cleanup_pop(int);
+}
 else version(NetBSD)
 {
     struct _pthread_cleanup_store
@@ -534,6 +653,60 @@ else version( CRuntime_Bionic )
         }
     }
 }
+else version( CRuntime_Musl )
+{
+    struct __ptcb {
+        _pthread_cleanup_routine f;
+        void* __x;
+        __ptcb* __next;
+    }
+    void _pthread_cleanup_push(__ptcb*, _pthread_cleanup_routine, void*);
+    void _pthread_cleanup_pop(__ptcb*, int);
+
+    struct pthread_cleanup
+    {
+        __ptcb __cleanup = void;
+
+        extern (D) void push(F: _pthread_cleanup_routine)(F routine, void* arg )
+        {
+            _pthread_cleanup_push( &__cleanup, routine, arg );
+        }
+
+        extern (D) void pop()( int execute )
+        {
+            _pthread_cleanup_pop( &__cleanup, execute );
+        }
+    }
+}
+else version( CRuntime_UClibc )
+{
+    struct _pthread_cleanup_buffer
+    {
+        _pthread_cleanup_routine    __routine;
+        void*                       __arg;
+        int                         __canceltype;
+        _pthread_cleanup_buffer*    __prev;
+    }
+
+    void _pthread_cleanup_push(_pthread_cleanup_buffer*, _pthread_cleanup_routine, void*);
+    void _pthread_cleanup_push(_pthread_cleanup_buffer*, _pthread_cleanup_routine_nogc, void*) @nogc;
+    void _pthread_cleanup_pop(_pthread_cleanup_buffer*, int);
+
+    struct pthread_cleanup
+    {
+        _pthread_cleanup_buffer buffer = void;
+
+        extern (D) void push(F: _pthread_cleanup_routine)(F routine, void* arg )
+        {
+            _pthread_cleanup_push( &buffer, routine, arg );
+        }
+
+        extern (D) void pop()( int execute )
+        {
+            _pthread_cleanup_pop( &buffer, execute );
+        }
+    }
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -622,6 +795,21 @@ else version( FreeBSD )
     int pthread_barrierattr_init(pthread_barrierattr_t*);
     int pthread_barrierattr_setpshared(pthread_barrierattr_t*, int);
 }
+else version( DragonFlyBSD )
+{
+    enum PTHREAD_BARRIER_SERIAL_THREAD = -1;
+    enum PTHREAD_KEYS_MAX              = 256;
+    enum PTHREAD_STACK_MIN             = 16384;
+    enum PTHREAD_THREADS_MAX           = c_ulong.max;
+
+    int pthread_barrier_destroy(pthread_barrier_t*);
+    int pthread_barrier_init(pthread_barrier_t*, in pthread_barrierattr_t*, uint);
+    int pthread_barrier_wait(pthread_barrier_t*);
+    int pthread_barrierattr_destroy(pthread_barrierattr_t*);
+    int pthread_barrierattr_getpshared(in pthread_barrierattr_t*, int*);
+    int pthread_barrierattr_init(pthread_barrierattr_t*);
+    int pthread_barrierattr_setpshared(pthread_barrierattr_t*, int);
+}
 else version(NetBSD)
 {
     enum PTHREAD_BARRIER_SERIAL_THREAD = 1234567;
@@ -664,6 +852,22 @@ else version (Solaris)
 else version (CRuntime_Bionic)
 {
 }
+else version (CRuntime_Musl)
+{
+
+}
+else version( CRuntime_UClibc )
+{
+    enum PTHREAD_BARRIER_SERIAL_THREAD = -1;
+
+    int pthread_barrier_destroy(pthread_barrier_t*);
+    int pthread_barrier_init(pthread_barrier_t*, in pthread_barrierattr_t*, uint);
+    int pthread_barrier_wait(pthread_barrier_t*);
+    int pthread_barrierattr_destroy(pthread_barrierattr_t*);
+    int pthread_barrierattr_getpshared(in pthread_barrierattr_t*, int*);
+    int pthread_barrierattr_init(pthread_barrierattr_t*);
+    int pthread_barrierattr_setpshared(pthread_barrierattr_t*, int);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -704,6 +908,14 @@ else version( FreeBSD )
     int pthread_spin_trylock(pthread_spinlock_t*);
     int pthread_spin_unlock(pthread_spinlock_t*);
 }
+else version( DragonFlyBSD )
+{
+    int pthread_spin_init(pthread_spinlock_t*, int);
+    int pthread_spin_destroy(pthread_spinlock_t*);
+    int pthread_spin_lock(pthread_spinlock_t*);
+    int pthread_spin_trylock(pthread_spinlock_t*);
+    int pthread_spin_unlock(pthread_spinlock_t*);
+}
 else version(NetBSD)
 {
     int pthread_spin_init(pthread_spinlock_t*, int);
@@ -734,6 +946,18 @@ else version (Solaris)
 else version (CRuntime_Bionic)
 {
 }
+else version (CRuntime_Musl)
+{
+
+}
+else version( CRuntime_UClibc )
+{
+    int pthread_spin_destroy(pthread_spinlock_t*);
+    int pthread_spin_init(pthread_spinlock_t*, int);
+    int pthread_spin_lock(pthread_spinlock_t*);
+    int pthread_spin_trylock(pthread_spinlock_t*);
+    int pthread_spin_unlock(pthread_spinlock_t*);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -840,6 +1064,24 @@ else version( OpenBSD )
     int pthread_mutexattr_settype(pthread_mutexattr_t*, int) @trusted;
     int pthread_setconcurrency(int);
 }
+else version( DragonFlyBSD )
+{
+    enum
+    {
+        PTHREAD_MUTEX_ERRORCHECK    = 1,
+        PTHREAD_MUTEX_RECURSIVE     = 2,
+        PTHREAD_MUTEX_NORMAL        = 3,
+        PTHREAD_MUTEX_TYPE_MAX
+    }
+    enum PTHREAD_MUTEX_DEFAULT = PTHREAD_MUTEX_ERRORCHECK;
+
+    int pthread_attr_getguardsize(in pthread_attr_t*, size_t*);
+    int pthread_attr_setguardsize(pthread_attr_t*, size_t);
+    int pthread_getconcurrency();
+    int pthread_mutexattr_gettype(pthread_mutexattr_t*, int*);
+    int pthread_mutexattr_settype(pthread_mutexattr_t*, int) @trusted;
+    int pthread_setconcurrency(int);
+}
 else version (Solaris)
 {
     enum
@@ -870,6 +1112,38 @@ else version (CRuntime_Bionic)
     int pthread_mutexattr_gettype(in pthread_mutexattr_t*, int*);
     int pthread_mutexattr_settype(pthread_mutexattr_t*, int) @trusted;
 }
+else version (CRuntime_Musl)
+{
+    enum {
+        PTHREAD_MUTEX_NORMAL      = 0,
+        PTHREAD_MUTEX_RECURSIVE   = 1,
+        PTHREAD_MUTEX_ERRORCHECK  = 2,
+        PTHREAD_MUTEX_DEFAULT     = PTHREAD_MUTEX_NORMAL,
+    }
+    int pthread_mutexattr_settype(pthread_mutexattr_t*, int) @trusted;
+}
+else version( CRuntime_UClibc )
+{
+    enum
+    {
+      PTHREAD_MUTEX_TIMED_NP,
+      PTHREAD_MUTEX_RECURSIVE_NP,
+      PTHREAD_MUTEX_ERRORCHECK_NP,
+      PTHREAD_MUTEX_ADAPTIVE_NP,
+      PTHREAD_MUTEX_NORMAL = PTHREAD_MUTEX_TIMED_NP,
+      PTHREAD_MUTEX_RECURSIVE = PTHREAD_MUTEX_RECURSIVE_NP,
+      PTHREAD_MUTEX_ERRORCHECK = PTHREAD_MUTEX_ERRORCHECK_NP,
+      PTHREAD_MUTEX_DEFAULT = PTHREAD_MUTEX_NORMAL,
+      PTHREAD_MUTEX_FAST_NP = PTHREAD_MUTEX_TIMED_NP
+    }
+
+    int pthread_attr_getguardsize(in pthread_attr_t*, size_t*);
+    int pthread_attr_setguardsize(pthread_attr_t*, size_t);
+    int pthread_getconcurrency();
+    int pthread_mutexattr_gettype(in pthread_mutexattr_t*, int*);
+    int pthread_mutexattr_settype(pthread_mutexattr_t*, int) @trusted;
+    int pthread_setconcurrency(int);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -890,6 +1164,10 @@ else version( FreeBSD )
 {
     int pthread_getcpuclockid(pthread_t, clockid_t*);
 }
+else version( DragonFlyBSD )
+{
+    int pthread_getcpuclockid(pthread_t, clockid_t*);
+}
 else version(NetBSD)
 {
 }
@@ -907,6 +1185,14 @@ else version( CRuntime_Bionic )
 {
     int pthread_getcpuclockid(pthread_t, clockid_t*);
 }
+else version( CRuntime_Musl )
+{
+
+}
+else version( CRuntime_UClibc )
+{
+    int pthread_getcpuclockid(pthread_t, clockid_t*);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -951,6 +1237,12 @@ else version( OpenBSD )
     int pthread_rwlock_timedrdlock(pthread_rwlock_t*, in timespec*);
     int pthread_rwlock_timedwrlock(pthread_rwlock_t*, in timespec*);
 }
+else version( DragonFlyBSD )
+{
+    int pthread_mutex_timedlock(pthread_mutex_t*, in timespec*);
+    int pthread_rwlock_timedrdlock(pthread_rwlock_t*, in timespec*);
+    int pthread_rwlock_timedwrlock(pthread_rwlock_t*, in timespec*);
+}
 else version (Solaris)
 {
     int pthread_mutex_timedlock(pthread_mutex_t*, in timespec*);
@@ -962,6 +1254,16 @@ else version( CRuntime_Bionic )
     int pthread_rwlock_timedrdlock(pthread_rwlock_t*, in timespec*);
     int pthread_rwlock_timedwrlock(pthread_rwlock_t*, in timespec*);
 }
+else version( CRuntime_Musl )
+{
+
+}
+else version( CRuntime_UClibc )
+{
+    int pthread_mutex_timedlock(pthread_mutex_t*, in timespec*);
+    int pthread_rwlock_timedrdlock(pthread_rwlock_t*, in timespec*);
+    int pthread_rwlock_timedwrlock(pthread_rwlock_t*, in timespec*);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -1123,6 +1425,23 @@ else version( OpenBSD )
     int pthread_setschedparam(pthread_t, int, sched_param*);
     // int pthread_setschedprio(pthread_t, int); // not implemented
 }
+else version( DragonFlyBSD )
+{
+    enum
+    {
+        PTHREAD_SCOPE_PROCESS   = 0,
+        PTHREAD_SCOPE_SYSTEM    = 0x2
+    }
+
+    int pthread_attr_getinheritsched(in pthread_attr_t*, int*);
+    int pthread_attr_getschedpolicy(in pthread_attr_t*, int*);
+    int pthread_attr_getscope(in pthread_attr_t*, int*);
+    int pthread_attr_setinheritsched(pthread_attr_t*, int);
+    int pthread_attr_setschedpolicy(pthread_attr_t*, int);
+    int pthread_attr_setscope(in pthread_attr_t*, int);
+    int pthread_getschedparam(pthread_t, int*, sched_param*);
+    int pthread_setschedparam(pthread_t, int, sched_param*);
+}
 else version (Solaris)
 {
     enum
@@ -1156,6 +1475,36 @@ else version (CRuntime_Bionic)
     int pthread_getschedparam(pthread_t, int*, sched_param*);
     int pthread_setschedparam(pthread_t, int, in sched_param*);
 }
+else version (CRuntime_Musl)
+{
+    enum
+    {
+        PTHREAD_SCOPE_SYSTEM,
+        PTHREAD_SCOPE_PROCESS
+    }
+
+    int pthread_getschedparam(pthread_t, int*, sched_param*);
+    int pthread_setschedparam(pthread_t, int, in sched_param*);
+    int pthread_setschedprio(pthread_t, int);
+}
+else version( CRuntime_UClibc )
+{
+    enum
+    {
+        PTHREAD_SCOPE_SYSTEM,
+        PTHREAD_SCOPE_PROCESS
+    }
+
+    int pthread_attr_getinheritsched(in pthread_attr_t*, int*);
+    int pthread_attr_getschedpolicy(in pthread_attr_t*, int*);
+    int pthread_attr_getscope(in pthread_attr_t*, int*);
+    int pthread_attr_setinheritsched(pthread_attr_t*, int);
+    int pthread_attr_setschedpolicy(pthread_attr_t*, int);
+    int pthread_attr_setscope(pthread_attr_t*, int);
+    int pthread_getschedparam(pthread_t, int*, sched_param*);
+    int pthread_setschedparam(pthread_t, int, in sched_param*);
+    int pthread_setschedprio(pthread_t, int);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -1218,6 +1567,15 @@ else version( OpenBSD )
     int pthread_attr_setstackaddr(pthread_attr_t*, void*);
     int pthread_attr_setstacksize(pthread_attr_t*, size_t);
 }
+else version( DragonFlyBSD )
+{
+    int pthread_attr_getstack(in pthread_attr_t*, void**, size_t*);
+    int pthread_attr_getstackaddr(in pthread_attr_t*, void**);
+    int pthread_attr_getstacksize(in pthread_attr_t*, size_t*);
+    int pthread_attr_setstack(pthread_attr_t*, void*, size_t);
+    int pthread_attr_setstackaddr(pthread_attr_t*, void*);
+    int pthread_attr_setstacksize(pthread_attr_t*, size_t);
+}
 else version (Solaris)
 {
     int pthread_attr_getstack(in pthread_attr_t*, void**, size_t*);
@@ -1236,6 +1594,20 @@ else version (CRuntime_Bionic)
     int pthread_attr_setstackaddr(pthread_attr_t*, void*);
     int pthread_attr_setstacksize(pthread_attr_t*, size_t);
 }
+else version (CRuntime_Musl)
+{
+    int pthread_attr_getstack(in pthread_attr_t*, void**, size_t*);
+    int pthread_attr_setstacksize(pthread_attr_t*, size_t);
+}
+else version( CRuntime_UClibc )
+{
+    int pthread_attr_getstack(in pthread_attr_t*, void**, size_t*);
+    int pthread_attr_getstackaddr(in pthread_attr_t*, void**);
+    int pthread_attr_getstacksize(in pthread_attr_t*, size_t*);
+    int pthread_attr_setstack(pthread_attr_t*, void*, size_t);
+    int pthread_attr_setstackaddr(pthread_attr_t*, void*);
+    int pthread_attr_setstacksize(pthread_attr_t*, size_t);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -1283,6 +1655,15 @@ else version(NetBSD)
 else version( OpenBSD )
 {
 }
+else version( DragonFlyBSD )
+{
+    int pthread_condattr_getpshared(in pthread_condattr_t*, int*);
+    int pthread_condattr_setpshared(pthread_condattr_t*, int);
+    int pthread_mutexattr_getpshared(in pthread_mutexattr_t*, int*);
+    int pthread_mutexattr_setpshared(pthread_mutexattr_t*, int);
+    int pthread_rwlockattr_getpshared(in pthread_rwlockattr_t*, int*);
+    int pthread_rwlockattr_setpshared(pthread_rwlockattr_t*, int);
+}
 else version( Darwin )
 {
     int pthread_condattr_getpshared(in pthread_condattr_t*, int*);
@@ -1310,6 +1691,19 @@ else version (CRuntime_Bionic)
     int pthread_rwlockattr_getpshared(pthread_rwlockattr_t*, int*);
     int pthread_rwlockattr_setpshared(pthread_rwlockattr_t*, int);
 }
+else version (CRuntime_Musl)
+{
+
+}
+else version (CRuntime_UClibc)
+{
+    int pthread_condattr_getpshared(in pthread_condattr_t*, int*);
+    int pthread_condattr_setpshared(pthread_condattr_t*, int);
+    int pthread_mutexattr_getpshared(in pthread_mutexattr_t*, int*);
+    int pthread_mutexattr_setpshared(pthread_mutexattr_t*, int);
+    int pthread_rwlockattr_getpshared(in pthread_rwlockattr_t*, int*);
+    int pthread_rwlockattr_setpshared(pthread_rwlockattr_t*, int);
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/sys/posix/pwd.d b/libphobos/libdruntime/core/sys/posix/pwd.d
index 34590c7fe..308d3d8bb 100644
--- a/libphobos/libdruntime/core/sys/posix/pwd.d
+++ b/libphobos/libdruntime/core/sys/posix/pwd.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly, Alex Rønne Petersen
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -126,6 +126,23 @@ else version( OpenBSD )
         time_t  pw_expire;      /* account expiration */
     }
 }
+else version( DragonFlyBSD )
+{
+    struct passwd
+    {
+        char*   pw_name;        /* user name */
+        char*   pw_passwd;      /* encrypted password */
+        uid_t   pw_uid;         /* user uid */
+        gid_t   pw_gid;         /* user gid */
+        time_t  pw_change;      /* password change time */
+        char*   pw_class;       /* user access class */
+        char*   pw_gecos;       /* Honeywell login info */
+        char*   pw_dir;         /* home directory */
+        char*   pw_shell;       /* default shell */
+        time_t  pw_expire;      /* account expiration */
+        int pw_fields;          /* internal: fields filled in */
+    }
+}
 else version (Solaris)
 {
     struct passwd
@@ -153,6 +170,31 @@ else version( CRuntime_Bionic )
         char*   pw_shell;
     }
 }
+else version( CRuntime_Musl )
+{
+    struct passwd {
+        char *pw_name;
+        char *pw_passwd;
+        uid_t pw_uid;
+        gid_t pw_gid;
+        char *pw_gecos;
+        char *pw_dir;
+        char *pw_shell;
+    }
+}
+else version( CRuntime_UClibc )
+{
+    struct passwd
+    {
+        char*   pw_name;
+        char*   pw_passwd;
+        uid_t   pw_uid;
+        gid_t   pw_gid;
+        char*   pw_gecos;
+        char*   pw_dir;
+        char*   pw_shell;
+    }
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -196,14 +238,31 @@ else version( OpenBSD )
     int getpwnam_r(in char*, passwd*, char*, size_t, passwd**);
     int getpwuid_r(uid_t, passwd*, char*, size_t, passwd**);
 }
-else version (Solaris)
+else version( DragonFlyBSD )
 {
     int getpwnam_r(in char*, passwd*, char*, size_t, passwd**);
     int getpwuid_r(uid_t, passwd*, char*, size_t, passwd**);
 }
+else version (Solaris)
+{
+    alias getpwnam_r = __posix_getpwnam_r;
+    alias getpwuid_r = __posix_getpwuid_r;
+
+    // POSIX.1c standard version of the functions
+    int __posix_getpwnam_r(in char*, passwd*, char*, size_t, passwd**);
+    int __posix_getpwuid_r(uid_t, passwd*, char*, size_t, passwd**);
+}
 else version( CRuntime_Bionic )
 {
 }
+else version( CRuntime_Musl )
+{
+}
+else version( CRuntime_UClibc )
+{
+    int getpwnam_r(in char*, passwd*, char*, size_t, passwd**);
+    int getpwuid_r(uid_t, passwd*, char*, size_t, passwd**);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -248,6 +307,12 @@ else version ( OpenBSD )
     passwd* getpwent();
     void    setpwent();
 }
+else version ( DragonFlyBSD )
+{
+    void    endpwent();
+    passwd* getpwent();
+    void    setpwent();
+}
 else version (Solaris)
 {
     void endpwent();
@@ -258,6 +323,17 @@ else version ( CRuntime_Bionic )
 {
     void    endpwent();
 }
+else version( CRuntime_Musl )
+{
+    int getpwnam_r(in char*, passwd*, char*, size_t, passwd**);
+    int getpwuid_r(uid_t, passwd*, char*, size_t, passwd**);
+}
+else version( CRuntime_UClibc )
+{
+    void    endpwent();
+    passwd* getpwent();
+    void    setpwent();
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/sys/posix/sched.d b/libphobos/libdruntime/core/sys/posix/sched.d
index 3f93b989b..9703e52b9 100644
--- a/libphobos/libdruntime/core/sys/posix/sched.d
+++ b/libphobos/libdruntime/core/sys/posix/sched.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly,
               Alex Rønne Petersen
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
@@ -69,6 +69,16 @@ version( CRuntime_Glibc )
     enum SCHED_RR       = 2;
     //SCHED_SPORADIC (SS|TSP)
 }
+else version( CRuntime_Musl )
+{
+    struct sched_param {
+        int sched_priority;
+        int sched_ss_low_priority;
+        timespec sched_ss_repl_period;
+        timespec sched_ss_init_budget;
+        int sched_ss_max_repl;
+    }
+}
 else version( Darwin )
 {
     enum SCHED_OTHER    = 1;
@@ -117,6 +127,17 @@ else version( OpenBSD )
     enum SCHED_OTHER    = 2;
     enum SCHED_RR       = 3;
 }
+else version( DragonFlyBSD )
+{
+    struct sched_param
+    {
+        int sched_priority;
+    }
+
+    enum SCHED_FIFO     = 1;
+    enum SCHED_OTHER    = 2;
+    enum SCHED_RR       = 3;
+}
 else version (Solaris)
 {
     struct sched_param
@@ -146,6 +167,21 @@ else version( CRuntime_Bionic )
     enum SCHED_FIFO     = 1;
     enum SCHED_RR       = 2;
 }
+else version( CRuntime_UClibc )
+{
+    struct sched_param
+    {
+        int sched_priority;
+    }
+
+    enum SCHED_OTHER    = 0;
+    enum SCHED_FIFO     = 1;
+    enum SCHED_RR       = 2;
+    enum SCHED_BATCH    = 3;
+    enum SCHED_IDLE     = 5;
+
+    enum SCHED_RESET_ON_FORK    = 0x40000000;
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -183,6 +219,10 @@ else version( OpenBSD )
 {
     int sched_yield();
 }
+else version( DragonFlyBSD )
+{
+    int sched_yield();
+}
 else version (Solaris)
 {
     int sched_yield();
@@ -191,6 +231,14 @@ else version (CRuntime_Bionic)
 {
     int sched_yield();
 }
+else version (CRuntime_Musl)
+{
+    int sched_yield();
+}
+else version( CRuntime_UClibc )
+{
+    int sched_yield();
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -235,6 +283,12 @@ else version( OpenBSD )
     int sched_get_priority_max(int);
     int sched_rr_get_interval(pid_t, timespec*);
 }
+else version( DragonFlyBSD )
+{
+    int sched_get_priority_min(int);
+    int sched_get_priority_max(int);
+    int sched_rr_get_interval(pid_t, timespec*);
+}
 else version (Solaris)
 {
     int sched_get_priority_max(int);
@@ -247,6 +301,18 @@ else version (CRuntime_Bionic)
     int sched_get_priority_min(int);
     int sched_rr_get_interval(pid_t, timespec*);
 }
+else version (CRuntime_Musl)
+{
+    int sched_get_priority_max(int);
+    int sched_get_priority_min(int);
+    int sched_rr_get_interval(pid_t, timespec*);
+}
+else version( CRuntime_UClibc )
+{
+    int sched_get_priority_max(int);
+    int sched_get_priority_min(int);
+    int sched_rr_get_interval(pid_t, timespec*);
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/sys/posix/semaphore.d b/libphobos/libdruntime/core/sys/posix/semaphore.d
index 32027eefb..8f1ac005a 100644
--- a/libphobos/libdruntime/core/sys/posix/semaphore.d
+++ b/libphobos/libdruntime/core/sys/posix/semaphore.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly, Alex Rønne Petersen
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -103,6 +103,21 @@ else version( OpenBSD )
 
     enum SEM_FAILED = cast(sem_t*) null;
 }
+else version( DragonFlyBSD )
+{
+    struct sem_t
+    {
+        uint _magic;
+        struct _usem
+        {
+            shared uint _has_waiters;
+            shared uint _count;
+            uint _flags;
+        } _usem _kern;
+    }
+
+    enum SEM_FAILED = cast(sem_t*) null;
+}
 else version (Solaris)
 {
     struct sem_t
@@ -125,6 +140,24 @@ else version( CRuntime_Bionic )
 
     enum SEM_FAILED = null;
 }
+else version( CRuntime_Musl )
+{
+    struct sem_t {
+        int[4*long.sizeof/int.sizeof] __val;
+    }
+}
+else version( CRuntime_UClibc )
+{
+    enum __SIZEOF_SEM_T  = 16;
+
+    union sem_t
+    {
+        byte[__SIZEOF_SEM_T] __size;
+        c_long __align;
+    }
+
+    enum SEM_FAILED      = cast(sem_t*) null;
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -167,6 +200,10 @@ else version( OpenBSD )
 {
     int sem_timedwait(sem_t*, in timespec*);
 }
+else version( DragonFlyBSD )
+{
+    int sem_timedwait(sem_t*, in timespec*);
+}
 else version (Solaris)
 {
     int sem_timedwait(sem_t*, in timespec*);
@@ -175,6 +212,14 @@ else version( CRuntime_Bionic )
 {
     int sem_timedwait(sem_t*, in timespec*);
 }
+else version( CRuntime_Musl )
+{
+    int sem_timedwait(sem_t*, in timespec*);
+}
+else version( CRuntime_UClibc )
+{
+    int sem_timedwait(sem_t*, in timespec*);
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/sys/posix/setjmp.d b/libphobos/libdruntime/core/sys/posix/setjmp.d
index e3b39cf6f..ad6b0cdb4 100644
--- a/libphobos/libdruntime/core/sys/posix/setjmp.d
+++ b/libphobos/libdruntime/core/sys/posix/setjmp.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -167,6 +167,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;
@@ -233,6 +239,21 @@ else version( OpenBSD )
     int  setjmp(ref jmp_buf);
     void longjmp(ref jmp_buf, int);
 }
+else version( DragonFlyBSD )
+{
+    // <machine/setjmp.h>
+    version( X86_64)
+    {
+        enum _JBLEN = 12;
+        struct _jmp_buf { c_long[_JBLEN] _jb; }
+    }
+    else
+        static assert(0);
+    alias _jmp_buf[1] jmp_buf;
+
+    int  setjmp(ref jmp_buf);
+    void longjmp(ref jmp_buf, int);
+}
 else version( CRuntime_Bionic )
 {
     // <machine/setjmp.h>
@@ -244,6 +265,10 @@ else version( CRuntime_Bionic )
     {
         enum _JBLEN = 64;
     }
+    else version( AArch64 )
+    {
+        enum _JBLEN = 32;
+    }
     else
     {
         static assert(false, "Architecture not supported.");
@@ -254,6 +279,58 @@ else version( CRuntime_Bionic )
     int  setjmp(ref jmp_buf);
     void longjmp(ref jmp_buf, int);
 }
+else version( CRuntime_UClibc )
+{
+    version( X86_64 )
+    {
+        alias long[8] __jmp_buf;
+    }
+    else version (ARM)
+    {
+        align(8) alias int[64] __jmp_buf;
+    }
+    else version (MIPS32)
+    {
+        struct __jmp_buf
+        {
+            version (MIPS_O32)
+            {
+                void * __pc;
+                void * __sp;
+                int[8] __regs;
+                void * __fp;
+                void * __gp;
+            }
+            else
+            {
+                long __pc;
+                long __sp;
+                long[8] __regs;
+                long __fp;
+                long __gp;
+            }
+            int __fpc_csr;
+            version (MIPS_N64)
+                double[8] __fpregs;
+            else
+                double[6] __fpregs;
+        };
+    }
+    else
+        static assert(0, "unimplemented");
+
+    struct __jmp_buf_tag
+    {
+        __jmp_buf   __jmpbuf;
+        int         __mask_was_saved;
+        sigset_t    __saved_mask;
+    }
+
+    alias __jmp_buf_tag[1] jmp_buf;
+
+    alias _setjmp setjmp;
+    void longjmp(ref jmp_buf, int);
+}
 
 //
 // C Extension (CX)
@@ -294,6 +371,11 @@ else version( FreeBSD )
         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);
     alias _sigjmp_buf[1] sigjmp_buf;
@@ -326,6 +408,20 @@ else version( OpenBSD )
     int  sigsetjmp(ref sigjmp_buf);
     void siglongjmp(ref sigjmp_buf, int);
 }
+else version( DragonFlyBSD )
+{
+    // <machine/setjmp.h>
+    version( X86_64)
+    {
+        struct _sigjmp_buf { c_long[_JBLEN] _sjb; }
+    }
+    else
+        static assert(0);
+    alias _sigjmp_buf[1] sigjmp_buf;
+
+    int  sigsetjmp(ref sigjmp_buf);
+    void siglongjmp(ref sigjmp_buf, int);
+}
 else version( CRuntime_Bionic )
 {
     alias c_long[_JBLEN + 1] sigjmp_buf;
@@ -333,6 +429,14 @@ else version( CRuntime_Bionic )
     int  sigsetjmp(ref sigjmp_buf, int);
     void siglongjmp(ref sigjmp_buf, int);
 }
+else version( CRuntime_UClibc )
+{
+    alias jmp_buf sigjmp_buf;
+
+    int __sigsetjmp(ref sigjmp_buf, int);
+    alias __sigsetjmp sigsetjmp;
+    void siglongjmp(ref sigjmp_buf, int);
+}
 
 //
 // XOpen (XSI)
@@ -362,8 +466,18 @@ else version( OpenBSD )
     int  _setjmp(ref jmp_buf);
     void _longjmp(ref jmp_buf, int);
 }
+else version( DragonFlyBSD )
+{
+    int  _setjmp(ref jmp_buf);
+    void _longjmp(ref jmp_buf, int);
+}
 else version( CRuntime_Bionic )
 {
     int  _setjmp(ref jmp_buf);
     void _longjmp(ref jmp_buf, int);
 }
+else version( CRuntime_UClibc )
+{
+    int  _setjmp(ref jmp_buf);
+    void _longjmp(ref jmp_buf, int);
+}
diff --git a/libphobos/libdruntime/core/sys/posix/signal.d b/libphobos/libdruntime/core/sys/posix/signal.d
index f8067af0f..eb500ff9b 100644
--- a/libphobos/libdruntime/core/sys/posix/signal.d
+++ b/libphobos/libdruntime/core/sys/posix/signal.d
@@ -164,6 +164,10 @@ else version (FreeBSD) {
     enum SIGRTMIN = 65;
     enum SIGRTMAX = 126;
 }
+else version (DragonFlyBSD) {
+    enum SIGRTMIN = 35;
+    enum SIGRTMAX = 126;
+}
 else version(NetBSD)
 {
     enum SIGRTMIN = 33;
@@ -171,15 +175,46 @@ else version(NetBSD)
 }
 else version (CRuntime_Bionic)
 {
-    enum SIGRTMIN = 32;
-    version(ARM)
-        enum SIGRTMAX = 64;
-    else version(X86)
-        enum SIGRTMAX = 64;
-    else version(MIPS32)
-        enum SIGRTMAX = 128;
-    else
-        static assert(false, "Architecture not supported.");
+    // Switched to calling these functions since Lollipop
+    private extern (C) nothrow @nogc
+    {
+        int __libc_current_sigrtmin();
+        int __libc_current_sigrtmax();
+    }
+
+    @property int SIGRTMIN() nothrow @nogc {
+        __gshared static int sig = -1;
+        if (sig == -1) {
+            sig = __libc_current_sigrtmin();
+        }
+        return sig;
+    }
+
+    @property int SIGRTMAX() nothrow @nogc {
+        __gshared static int sig = -1;
+        if (sig == -1) {
+            sig = __libc_current_sigrtmax();
+        }
+        return sig;
+    }
+}
+else version( CRuntime_UClibc )
+{
+    private extern (C) nothrow @nogc
+    {
+        int __libc_current_sigrtmin();
+        int __libc_current_sigrtmax();
+    }
+
+    @property int SIGRTMIN() nothrow @nogc
+    {
+        return __libc_current_sigrtmin();
+    }
+
+    @property int SIGRTMAX() nothrow @nogc
+    {
+        return __libc_current_sigrtmax();
+    }
 }
 
 version( linux )
@@ -523,6 +558,30 @@ else version( OpenBSD )
     enum SIGUSR2    = 31;
     enum SIGURG     = 16;
 }
+else version( DragonFlyBSD )
+{
+    //SIGABRT (defined in core.stdc.signal)
+    enum SIGALRM    = 14;
+    enum SIGBUS     = 10;
+    enum SIGCHLD    = 20;
+    enum SIGCONT    = 19;
+    //SIGFPE (defined in core.stdc.signal)
+    enum SIGHUP     = 1;
+    //SIGILL (defined in core.stdc.signal)
+    //SIGINT (defined in core.stdc.signal)
+    enum SIGKILL    = 9;
+    enum SIGPIPE    = 13;
+    enum SIGQUIT    = 3;
+    //SIGSEGV (defined in core.stdc.signal)
+    enum SIGSTOP    = 17;
+    //SIGTERM (defined in core.stdc.signal)
+    enum SIGTSTP    = 18;
+    enum SIGTTIN    = 21;
+    enum SIGTTOU    = 22;
+    enum SIGUSR1    = 30;
+    enum SIGUSR2    = 31;
+    enum SIGURG     = 16;
+}
 else version (Solaris)
 {
     enum SIGALRM = 14;
@@ -568,6 +627,28 @@ version( CRuntime_Glibc )
         void function() sa_restorer;
     }
 }
+else version( CRuntime_Musl )
+{
+    struct sigaction_t
+    {
+        static if( true /* __USE_POSIX199309 */ )
+        {
+            union
+            {
+                sigfn_t     sa_handler;
+                sigactfn_t  sa_sigaction;
+            }
+        }
+        else
+        {
+            sigfn_t     sa_handler;
+        }
+        sigset_t        sa_mask;
+        int             sa_flags;
+
+        void function() sa_restorer;
+    }
+}
 else version( FreeBSD )
 {
     struct sigaction_t
@@ -609,6 +690,19 @@ else version(OpenBSD)
         int      sa_flags;
     }
 }
+else version( DragonFlyBSD )
+{
+    struct sigaction_t
+    {
+        union
+        {
+            sigfn_t     sa_handler;
+            sigactfn_t  sa_sigaction;
+        }
+        int      sa_flags;
+        sigset_t sa_mask;
+    }
+}
 else version (Solaris)
 {
     struct sigaction_t
@@ -627,7 +721,59 @@ else version (Solaris)
             int[2] sa_resv;
     }
 }
-else version (linux)
+else version( CRuntime_UClibc )
+{
+    version (ARM)           version = sigaction_common;
+    else version (X86_64)   version = sigaction_common;
+
+    version (sigaction_common)
+    {
+        struct sigaction_t
+        {
+            static if( true /* __USE_POSIX199309 */ )
+            {
+                union
+                {
+                    sigfn_t     sa_handler;
+                    sigactfn_t  sa_sigaction;
+                }
+            }
+            else
+            {
+                sigfn_t     sa_handler;
+            }
+            c_ulong     sa_flags;
+            void function() sa_restorer;
+            sigset_t    sa_mask;
+        }
+    }
+    else version (MIPS32)
+    {
+        struct sigaction_t
+        {
+            uint     sa_flags;
+            static if( true /* __USE_POSIX199309 */ )
+            {
+                union
+                {
+                    sigfn_t     sa_handler;
+                    sigactfn_t  sa_sigaction;
+                }
+            }
+            else
+            {
+                sigfn_t     sa_handler;
+            }
+            sigset_t    sa_mask;
+            void function() sa_restorer;
+        }
+    }
+    else
+    {
+        static assert(false, "Architecture not supported.");
+    }
+}
+else version (CRuntime_Bionic)
 {
     version (X86)
     {
@@ -640,7 +786,7 @@ else version (linux)
             }
 
             sigset_t        sa_mask;
-            c_ulong         sa_flags;
+            int             sa_flags;
             void function() sa_restorer;
         }
     }
@@ -655,7 +801,22 @@ else version (linux)
             }
 
             sigset_t        sa_mask;
-            c_ulong         sa_flags;
+            int             sa_flags;
+            void function() sa_restorer;
+        }
+    }
+    else version (AArch64)
+    {
+        struct sigaction_t
+        {
+            int            sa_flags;
+            union
+            {
+                sigfn_t    sa_handler;
+                sigactfn_t sa_sigaction;
+            }
+
+            sigset_t        sa_mask;
             void function() sa_restorer;
         }
     }
@@ -780,7 +941,7 @@ version( CRuntime_Glibc )
 
     private enum __SI_MAX_SIZE = 128;
 
-    static if( false /* __WORDSIZE == 64 */ )
+    static if( __WORDSIZE == 64 )
     {
         private enum __SI_PAD_SIZE = ((__SI_MAX_SIZE / int.sizeof) - 4);
     }
@@ -1181,6 +1342,55 @@ else version( OpenBSD )
     int sigsuspend(in sigset_t *);
     int sigwait(in sigset_t*, int*);
 }
+else version( DragonFlyBSD )
+{
+    enum SIG_CATCH = cast(sigfn_t2) 2;
+    enum SIG_HOLD = cast(sigfn_t2) 3;
+
+    struct sigset_t
+    {
+        uint[4] __bits;
+    }
+
+    enum SA_NOCLDSTOP = 8;
+
+    enum SIG_BLOCK = 1;
+    enum SIG_UNBLOCK = 2;
+    enum SIG_SETMASK = 3;
+
+    struct siginfo_t
+    {
+        int si_signo;
+        int si_errno;
+        int si_code;
+        int si_pid;
+        uint si_uid;
+        int si_status;
+        void* si_addr;
+        sigval si_value;
+        c_long si_band;
+        int[7]   __spare;
+    }
+
+    enum SI_UNDEFINED = 0x00000;
+    enum SI_USER      =  0;
+    enum SI_QUEUE     = -1;
+    enum SI_TIMER     = -2;
+    enum SI_ASYNCIO   = -3;
+    enum SI_MESGQ     = -4;
+
+    int kill(pid_t, int);
+    int sigaction(int, in sigaction_t*, sigaction_t*);
+    int sigaddset(sigset_t*, int);
+    int sigdelset(sigset_t*, int);
+    int sigemptyset(sigset_t *);
+    int sigfillset(sigset_t *);
+    int sigismember(in sigset_t *, int);
+    int sigpending(sigset_t *);
+    int sigprocmask(int, in sigset_t*, sigset_t*);
+    int sigsuspend(in sigset_t *);
+    int sigwait(in sigset_t*, int*);
+}
 else version (Solaris)
 {
     enum SIG_HOLD = cast(sigfn_t2)2;
@@ -1305,6 +1515,11 @@ else version( CRuntime_Bionic )
         alias c_ulong sigset_t;
         enum int LONG_BIT = 32;
     }
+    else version (AArch64)
+    {
+        struct sigset_t { ulong[1] sig; }
+        enum int LONG_BIT = 64;
+    }
     else
     {
         static assert(false, "Architecture not supported.");
@@ -1418,67 +1633,395 @@ else version( CRuntime_Bionic )
     int sigsuspend(in sigset_t*);
     int sigwait(in sigset_t*, int*);
 }
-else
+else version( CRuntime_Musl )
 {
-    static assert(false, "Unsupported platform");
-}
-}
+    struct sigset_t {
+        ulong[128/long.sizeof] __bits;
+    }
 
-//
-// XOpen (XSI)
-//
-/*
-SIGPOLL
-SIGPROF
-SIGSYS
-SIGTRAP
-SIGVTALRM
-SIGXCPU
-SIGXFSZ
+    enum SIG_BLOCK      = 0;
+    enum SIG_UNBLOCK    = 1;
+    enum SIG_SETMASK    = 2;
 
-SA_ONSTACK
-SA_RESETHAND
-SA_RESTART
-SA_SIGINFO
-SA_NOCLDWAIT
-SA_NODEFER
-SS_ONSTACK
-SS_DISABLE
-MINSIGSTKSZ
-SIGSTKSZ
+    struct siginfo_t {
+        int si_signo, si_errno, si_code;
+        union __si_fields_t {
+            char[128 - 2*int.sizeof - long.sizeof] __pad;
+            struct __si_common_t {
+                union __first_t {
+                    struct __piduid_t {
+                        pid_t si_pid;
+                        uid_t si_uid;
+                    }
+                    __piduid_t __piduid;
 
-ucontext_t // from ucontext
-mcontext_t // from ucontext
+                    struct __timer_t {
+                        int si_timerid;
+                        int si_overrun;
+                    }
+                    __timer_t __timer;
+                }
+                __first_t __first;
 
-struct stack_t
-{
-    void*   ss_sp;
-    size_t  ss_size;
-    int     ss_flags;
-}
+                union __second_t {
+                    sigval si_value;
+                    struct __sigchld_t {
+                        int si_status;
+                        clock_t si_utime, si_stime;
+                    }
+                    __sigchld_t __sigchld;
+                }
+                __second_t __second;
+            }
+            __si_common_t __si_common;
+
+            struct __sigfault_t {
+                void *si_addr;
+                short si_addr_lsb;
+                union __first_t {
+                    struct __addr_bnd_t {
+                        void *si_lower;
+                        void *si_upper;
+                    }
+                    __addr_bnd_t __addr_bnd;
+                    uint si_pkey;
+                }
+                __first_t __first;
+            }
+            __sigfault_t __sigfault;
 
-struct sigstack
-{
-    int   ss_onstack;
-    void* ss_sp;
-}
+            struct __sigpoll_t {
+                long si_band;
+                int si_fd;
+            }
+            __sigpoll_t __sigpoll;
 
-ILL_ILLOPC
-ILL_ILLOPN
-ILL_ILLADR
-ILL_ILLTRP
-ILL_PRVOPC
-ILL_PRVREG
-ILL_COPROC
-ILL_BADSTK
+            struct __sigsys_t {
+                void *si_call_addr;
+                int si_syscall;
+                uint si_arch;
+            }
+            __sigsys_t __sigsys;
+        }
+        __si_fields_t __si_fields;
+    }
 
-FPE_INTDIV
-FPE_INTOVF
-FPE_FLTDIV
-FPE_FLTOVF
-FPE_FLTUND
-FPE_FLTRES
-FPE_FLTINV
+    int kill(pid_t, int);
+    int sigaction(int, in sigaction_t*, sigaction_t*);
+    int sigaddset(sigset_t*, int);
+    int sigdelset(sigset_t*, int);
+    int sigemptyset(sigset_t*);
+    int sigfillset(sigset_t*);
+    int sigismember(in sigset_t*, int);
+    int sigpending(sigset_t*);
+    int sigprocmask(int, in sigset_t*, sigset_t*);
+    int sigsuspend(in sigset_t*);
+    int sigwait(in sigset_t*, int*);
+}
+else version( CRuntime_UClibc )
+{
+    enum SIG_HOLD = cast(sigfn_t2) 2;
+
+    version ( MIPS32 )
+        private enum _SIGSET_NWORDS = 128 / (8 * c_ulong.sizeof);
+    else
+        private enum _SIGSET_NWORDS = 64 / (8 * c_ulong.sizeof);
+
+    struct sigset_t
+    {
+        c_ulong[_SIGSET_NWORDS] __val;
+    }
+
+    enum SA_NOCLDSTOP   = 1;
+
+    enum SIG_BLOCK      = 0;
+    enum SIG_UNBLOCK    = 1;
+    enum SIG_SETMASK    = 2;
+
+    private enum __SI_MAX_SIZE = 128;
+
+    static if( __WORDSIZE == 64 )
+    {
+        private enum __SI_PAD_SIZE = ((__SI_MAX_SIZE / int.sizeof) - 4);
+    }
+    else
+    {
+        private enum __SI_PAD_SIZE = ((__SI_MAX_SIZE / int.sizeof) - 3);
+    }
+
+    version (ARM)           version = siginfo_common;
+    else version (X86_64)   version = siginfo_common;
+
+    version (siginfo_common)
+    {
+        struct siginfo_t
+        {
+            int si_signo;       // Signal number
+            int si_errno;       // If non-zero, an errno value associated with
+                                // this signal, as defined in <errno.h>
+            int si_code;        // Signal code
+
+            union _sifields_t
+            {
+                int[__SI_PAD_SIZE] _pad;
+
+                // kill()
+                struct _kill_t
+                {
+                    pid_t si_pid; // Sending process ID
+                    uid_t si_uid; // Real user ID of sending process
+                } _kill_t _kill;
+
+                // POSIX.1b timers.
+                struct _timer_t
+                {
+                    int    si_tid;     // Timer ID
+                    int    si_overrun; // Overrun count
+                    sigval si_sigval;  // Signal value
+                } _timer_t _timer;
+
+                // POSIX.1b signals
+                struct _rt_t
+                {
+                    pid_t  si_pid;    // Sending process ID
+                    uid_t  si_uid;    // Real user ID of sending process
+                    sigval si_sigval; // Signal value
+                } _rt_t _rt;
+
+                // SIGCHLD
+                struct _sigchild_t
+                {
+                    pid_t   si_pid;    // Which child
+                    uid_t   si_uid;    // Real user ID of sending process
+                    int     si_status; // Exit value or signal
+                    clock_t si_utime;
+                    clock_t si_stime;
+                } _sigchild_t _sigchld;
+
+                // SIGILL, SIGFPE, SIGSEGV, SIGBUS
+                struct _sigfault_t
+                {
+                    void*     si_addr;  // Faulting insn/memory ref
+                } _sigfault_t _sigfault;
+
+                // SIGPOLL
+                struct _sigpoll_t
+                {
+                    c_long si_band; // Band event for SIGPOLL;
+                    int      si_fd;
+                } _sigpoll_t _sigpoll;
+
+                // SIGSYS
+                struct _sigsys_t
+                {
+                    void*   _call_addr;   // Calling user insn.
+                    int     _syscall;     // Triggering system call number.
+                    uint    _arch;        // AUDIT_ARCH_* of syscall.
+                } _sigsys_t _sigsys;
+
+            } _sifields_t _sifields;
+
+        nothrow @nogc:
+            @property ref pid_t si_pid()() { return _sifields._kill.si_pid; }
+            @property ref uid_t si_uid()() { return _sifields._kill.si_uid; }
+            @property ref int si_timerid()() { return _sifields._timer.si_tid;}
+            @property ref int si_overrun()() { return _sifields._timer.si_overrun; }
+            @property ref int si_status()() { return _sifields._sigchld.si_status; }
+            @property ref clock_t si_utime()() { return _sifields._sigchld.si_utime; }
+            @property ref clock_t si_stime()() { return _sifields._sigchld.si_stime; }
+            @property ref sigval si_value()() { return _sifields._rt.si_sigval; }
+            @property ref int si_int()() { return _sifields._rt.si_sigval.sival_int; }
+            @property ref void* si_ptr()() { return _sifields._rt.si_sigval.sival_ptr; }
+            @property ref void* si_addr()() { return _sifields._sigfault.si_addr; }
+            @property ref c_long si_band()() { return _sifields._sigpoll.si_band; }
+            @property ref int  si_fd()() { return _sifields._sigpoll.si_fd; }
+            @property ref void*  si_call_addr()() { return _sifields._sigsys._call_addr; }
+            @property ref int  si_syscall()() { return _sifields._sigsys._syscall; }
+            @property ref uint  si_arch()() { return _sifields._sigsys._arch; }
+        }
+    }
+    else version (MIPS32)
+    {
+        struct siginfo_t
+        {
+            int si_signo;       // Signal number
+            int si_errno;       // If non-zero, an errno value associated with
+                                // this signal, as defined in <errno.h>
+            int si_code;        // Signal code
+
+            int[__SI_MAX_SIZE / int.sizeof - __SI_PAD_SIZE - 3] __pad0;
+
+            union _sifields_t
+            {
+                int[__SI_PAD_SIZE] _pad;
+
+                // kill()
+                struct _kill_t
+                {
+                    pid_t si_pid; // Sending process ID
+                    uid_t si_uid; // Real user ID of sending process
+                } _kill_t _kill;
+
+                // POSIX.1b timers.
+                struct _timer_t
+                {
+                    int    si_tid;     // Timer ID
+                    int    si_overrun; // Overrun count
+                    sigval si_sigval;  // Signal value
+                } _timer_t _timer;
+
+                // POSIX.1b signals
+                struct _rt_t
+                {
+                    pid_t  si_pid;    // Sending process ID
+                    uid_t  si_uid;    // Real user ID of sending process
+                    sigval si_sigval; // Signal value
+                } _rt_t _rt;
+
+                // SIGCHLD
+                struct _sigchild_t
+                {
+                    pid_t   si_pid;    // Which child
+                    uid_t   si_uid;    // Real user ID of sending process
+                    int     si_status; // Exit value or signal
+                    clock_t si_utime;
+                    clock_t si_stime;
+                } _sigchild_t _sigchld;
+
+                // SIGILL, SIGFPE, SIGSEGV, SIGBUS
+                struct _sigfault_t
+                {
+                    void*   si_addr;  // Faulting insn/memory ref
+                    short   si_addr_lsb;
+                } _sigfault_t _sigfault;
+
+                // SIGPOLL
+                struct _sigpoll_t
+                {
+                    c_long si_band; // Band event for SIGPOLL;
+                    int      si_fd;
+                } _sigpoll_t _sigpoll;
+
+                // SIGSYS
+                struct _sigsys_t
+                {
+                    void*   _call_addr;   // Calling user insn.
+                    int     _syscall;     // Triggering system call number.
+                    uint    _arch;        // AUDIT_ARCH_* of syscall.
+                } _sigsys_t _sigsys;
+
+            } _sifields_t _sifields;
+
+        nothrow @nogc:
+            @property ref pid_t si_pid()() { return _sifields._kill.si_pid; }
+            @property ref uid_t si_uid()() { return _sifields._kill.si_uid; }
+            @property ref int si_timerid()() { return _sifields._timer.si_tid;}
+            @property ref int si_overrun()() { return _sifields._timer.si_overrun; }
+            @property ref int si_status()() { return _sifields._sigchld.si_status; }
+            @property ref clock_t si_utime()() { return _sifields._sigchld.si_utime; }
+            @property ref clock_t si_stime()() { return _sifields._sigchld.si_stime; }
+            @property ref sigval si_value()() { return _sifields._rt.si_sigval; }
+            @property ref int si_int()() { return _sifields._rt.si_sigval.sival_int; }
+            @property ref void* si_ptr()() { return _sifields._rt.si_sigval.sival_ptr; }
+            @property ref void* si_addr()() { return _sifields._sigfault.si_addr; }
+            @property ref c_long si_band()() { return _sifields._sigpoll.si_band; }
+            @property ref int  si_fd()() { return _sifields._sigpoll.si_fd; }
+            @property ref void*  si_call_addr()() { return _sifields._sigsys._call_addr; }
+            @property ref int  si_syscall()() { return _sifields._sigsys._syscall; }
+            @property ref uint  si_arch()() { return _sifields._sigsys._arch; }
+        }
+    }
+    else
+    {
+        static assert(false, "Architecture not supported.");
+    }
+
+    enum
+    {
+        SI_ASYNCNL = -60,
+        SI_TKILL   = -6,
+        SI_SIGIO,
+        SI_ASYNCIO,
+        SI_MESGQ,
+        SI_TIMER,
+        SI_QUEUE,
+        SI_USER,
+        SI_KERNEL  = 0x80
+    }
+
+    int kill(pid_t, int);
+    int sigaction(int, in sigaction_t*, sigaction_t*);
+    int sigaddset(sigset_t*, int);
+    int sigdelset(sigset_t*, int);
+    int sigemptyset(sigset_t*);
+    int sigfillset(sigset_t*);
+    int sigismember(in sigset_t*, int);
+    int sigpending(sigset_t*);
+    int sigprocmask(int, in sigset_t*, sigset_t*);
+    int sigsuspend(in sigset_t*);
+    int sigwait(in sigset_t*, int*);
+}
+else
+{
+    static assert(false, "Unsupported platform");
+}
+}
+
+//
+// XOpen (XSI)
+//
+/*
+SIGPOLL
+SIGPROF
+SIGSYS
+SIGTRAP
+SIGVTALRM
+SIGXCPU
+SIGXFSZ
+
+SA_ONSTACK
+SA_RESETHAND
+SA_RESTART
+SA_SIGINFO
+SA_NOCLDWAIT
+SA_NODEFER
+SS_ONSTACK
+SS_DISABLE
+MINSIGSTKSZ
+SIGSTKSZ
+
+ucontext_t // from ucontext
+mcontext_t // from ucontext
+
+struct stack_t
+{
+    void*   ss_sp;
+    size_t  ss_size;
+    int     ss_flags;
+}
+
+struct sigstack
+{
+    int   ss_onstack;
+    void* ss_sp;
+}
+
+ILL_ILLOPC
+ILL_ILLOPN
+ILL_ILLADR
+ILL_ILLTRP
+ILL_PRVOPC
+ILL_PRVREG
+ILL_COPROC
+ILL_BADSTK
+
+FPE_INTDIV
+FPE_INTOVF
+FPE_FLTDIV
+FPE_FLTOVF
+FPE_FLTUND
+FPE_FLTRES
+FPE_FLTINV
 FPE_FLTSUB
 
 SEGV_MAPERR
@@ -2202,6 +2745,130 @@ else version (OpenBSD)
     int siginterrupt(int, int);
     int sigpause(int);
 }
+else version( DragonFlyBSD )
+{
+    // No SIGPOLL on *BSD
+    enum SIGPROF        = 27;
+    enum SIGSYS         = 12;
+    enum SIGTRAP        = 5;
+    enum SIGVTALRM      = 26;
+    enum SIGXCPU        = 24;
+    enum SIGXFSZ        = 25;
+
+    enum
+    {
+        SA_ONSTACK      = 0x0001,
+        SA_RESTART      = 0x0002,
+        SA_RESETHAND    = 0x0004,
+        SA_NODEFER      = 0x0010,
+        SA_NOCLDWAIT    = 0x0020,
+        SA_SIGINFO      = 0x0040,
+    }
+
+    enum
+    {
+        SS_ONSTACK = 0x0001,
+        SS_DISABLE = 0x0004,
+    }
+
+    enum MINSIGSTKSZ = 8192;
+    enum SIGSTKSZ    = (MINSIGSTKSZ + 32768);
+;
+    //ucontext_t (defined in core.sys.posix.ucontext)
+    //mcontext_t (defined in core.sys.posix.ucontext)
+
+    struct stack_t
+    {
+        void*   ss_sp;
+        size_t  ss_size;
+        int     ss_flags;
+    }
+
+    struct sigstack
+    {
+        void*   ss_sp;
+        int     ss_onstack;
+    }
+
+    enum
+    {
+        ILL_ILLOPC = 1,
+        ILL_ILLOPN,
+        ILL_ILLADR,
+        ILL_ILLTRP,
+        ILL_PRVOPC,
+        ILL_PRVREG,
+        ILL_COPROC,
+        ILL_BADSTK,
+    }
+
+    enum
+    {
+        BUS_ADRALN = 1,
+        BUS_ADRERR,
+        BUS_OBJERR,
+    }
+
+    enum
+    {
+        SEGV_MAPERR = 1,
+        SEGV_ACCERR,
+    }
+
+    enum
+    {
+        FPE_INTOVF = 1,
+        FPE_INTDIV,
+        FPE_FLTDIV,
+        FPE_FLTOVF,
+        FPE_FLTUND,
+        FPE_FLTRES,
+        FPE_FLTINV,
+        FPE_FLTSUB,
+    }
+
+    enum
+    {
+        TRAP_BRKPT = 1,
+        TRAP_TRACE,
+    }
+
+    enum
+    {
+        CLD_EXITED = 1,
+        CLD_KILLED,
+        CLD_DUMPED,
+        CLD_TRAPPED,
+        CLD_STOPPED,
+        CLD_CONTINUED,
+    }
+
+    enum
+    {
+        POLL_IN = 1,
+        POLL_OUT,
+        POLL_MSG,
+        POLL_ERR,
+        POLL_PRI,
+        POLL_HUP,
+    }
+
+    //sigfn_t bsd_signal(int sig, sigfn_t func);
+    sigfn_t sigset(int sig, sigfn_t func);
+
+  nothrow:
+  @nogc:
+    //sigfn_t2 bsd_signal(int sig, sigfn_t2 func);
+    sigfn_t2 sigset(int sig, sigfn_t2 func);
+
+    int killpg(pid_t, int);
+    int sigaltstack(in stack_t*, stack_t*);
+    int sighold(int);
+    int sigignore(int);
+    int siginterrupt(int, int);
+    int sigpause(int);
+    int sigrelse(int);
+}
 else version (Solaris)
 {
     enum SIGPOLL = 22;
@@ -2384,6 +3051,34 @@ else version (CRuntime_Bionic)
             size_t  ss_size;
         }
     }
+    else version (AArch64)
+    {
+        enum SIGPOLL   = 29;
+        enum SIGPROF   = 27;
+        enum SIGSYS    = 31;
+        enum SIGTRAP   = 5;
+        enum SIGVTALRM = 26;
+        enum SIGXCPU   = 24;
+        enum SIGXFSZ   = 25;
+
+        enum SA_ONSTACK     = 0x08000000;
+        enum SA_RESETHAND   = 0x80000000;
+        enum SA_RESTART     = 0x10000000;
+        enum SA_SIGINFO     = 4;
+        enum SA_NOCLDWAIT   = 2;
+        enum SA_NODEFER     = 0x40000000;
+        enum SS_ONSTACK     = 1;
+        enum SS_DISABLE     = 2;
+        enum MINSIGSTKSZ    = 2048;
+        enum SIGSTKSZ       = 8192;
+
+        struct stack_t
+        {
+            void*   ss_sp;
+            int     ss_flags;
+            size_t  ss_size;
+        }
+    }
     else
     {
         static assert(false, "Architecture not supported.");
@@ -2462,6 +3157,192 @@ else version (CRuntime_Bionic)
     int sigaltstack(in stack_t*, stack_t*);
     int siginterrupt(int, int);
 }
+else version( CRuntime_Musl )
+{
+    enum SA_RESTART     = 0x10000000;
+}
+else version( CRuntime_UClibc )
+{
+    version (X86_64)
+    {
+        enum SIGTRAP         = 5;
+        enum SIGIOT          = 6;
+        enum SIGSTKFLT       = 16;
+        enum SIGCLD          = SIGCHLD;
+        enum SIGXCPU         = 24;
+        enum SIGXFSZ         = 25;
+        enum SIGVTALRM       = 26;
+        enum SIGPROF         = 27;
+        enum SIGWINCH        = 28;
+        enum SIGPOLL         = SIGIO;
+        enum SIGIO           = 29;
+        enum SIGPWR          = 30;
+        enum SIGSYS          = 31;
+        enum SIGUNUSED       = 31;
+    }
+    else version (MIPS32)
+    {
+        enum SIGTRAP = 5;
+        enum SIGIOT           = 6;
+        enum SIGEMT           = 7;
+        enum SIGFPE           = 8;
+        enum SIGSYS           = 12;
+        enum SIGCLD           = SIGCHLD;
+        enum SIGPWR           = 19;
+        enum SIGWINCH         = 20;
+        enum SIGIO            = 22;
+        enum SIGPOLL          = SIGIO;
+        enum SIGVTALRM        = 28;
+        enum SIGPROF          = 29;
+        enum SIGXCPU          = 30;
+        enum SIGXFSZ          = 31;
+    }
+    else version (ARM)
+    {
+        enum SIGTRAP = 5;
+        enum SIGIOT = 6;
+        enum SIGSTKFLT = 16;
+        enum SIGCLD = SIGCHLD;
+        enum SIGXCPU = 24;
+        enum SIGXFSZ = 25;
+        enum SIGVTALRM = 26;
+        enum SIGPROF = 27;
+        enum SIGWINCH = 28;
+        enum SIGPOLL = SIGIO;
+        enum SIGIO = 29;
+        enum SIGPWR = 30;
+        enum SIGSYS = 31;
+        enum SIGUNUSED = 31;
+    }
+    else
+        static assert(0, "unimplemented");
+
+    enum SA_ONSTACK     = 0x08000000;
+    enum SA_RESETHAND   = 0x80000000;
+    enum SA_RESTART     = 0x10000000;
+    enum SA_SIGINFO     = 4;
+    enum SA_NOCLDWAIT   = 2;
+    enum SA_NODEFER     = 0x40000000;
+    enum SS_ONSTACK     = 1;
+    enum SS_DISABLE     = 2;
+    enum MINSIGSTKSZ    = 2048;
+    enum SIGSTKSZ       = 8192;
+
+    enum SA_INTERRUPT   = 0x20000000;
+
+    enum SA_NOMASK      = SA_NODEFER;
+    enum SA_ONESHOT     = SA_RESETHAND;
+    enum SA_STACK       = SA_ONSTACK;
+
+    version (MIPS32)
+    {
+        struct stack_t
+        {
+            void *ss_sp;
+            size_t ss_size;
+            int ss_flags;
+        }
+    }
+    else
+    {
+        struct stack_t
+        {
+            void*   ss_sp;
+            int     ss_flags;
+            size_t  ss_size;
+        }
+     }
+
+    struct sigstack
+    {
+        void*   ss_sp;
+        int     ss_onstack;
+    }
+
+    // `si_code' values for SIGILL signal.
+    enum
+    {
+      ILL_ILLOPC = 1,       // Illegal opcode.
+      ILL_ILLOPN,           // Illegal operand.
+      ILL_ILLADR,           // Illegal addressing mode.
+      ILL_ILLTRP,           // Illegal trap.
+      ILL_PRVOPC,           // Privileged opcode.
+      ILL_PRVREG,           // Privileged register.
+      ILL_COPROC,           // Coprocessor error.
+      ILL_BADSTK            // Internal stack error.
+    }
+
+    // `si_code' values for SIGFPE signal.
+    enum
+    {
+      FPE_INTDIV = 1,       // Integer divide by zero.
+      FPE_INTOVF,           // Integer overflow.
+      FPE_FLTDIV,           // Floating point divide by zero.
+      FPE_FLTOVF,           // Floating point overflow.
+      FPE_FLTUND,           // Floating point underflow.
+      FPE_FLTRES,           // Floating point inexact result.
+      FPE_FLTINV,           // Floating point invalid operation.
+      FPE_FLTSUB            // Subscript out of range.
+    }
+
+    // `si_code' values for SIGSEGV signal.
+    enum
+    {
+      SEGV_MAPERR = 1,      // Address not mapped to object.
+      SEGV_ACCERR           // Invalid permissions for mapped object.
+    }
+
+    // `si_code' values for SIGBUS signal.
+    enum
+    {
+      BUS_ADRALN = 1,       // Invalid address alignment.
+      BUS_ADRERR,           // Non-existant physical address.
+      BUS_OBJERR            // Object specific hardware error.
+    }
+
+    // `si_code' values for SIGTRAP signal.
+    enum
+    {
+      TRAP_BRKPT = 1,       // Process breakpoint.
+      TRAP_TRACE            // Process trace trap.
+    }
+
+    // `si_code' values for SIGCHLD signal.
+    enum
+    {
+      CLD_EXITED = 1,       // Child has exited.
+      CLD_KILLED,           // Child was killed.
+      CLD_DUMPED,           // Child terminated abnormally.
+      CLD_TRAPPED,          // Traced child has trapped.
+      CLD_STOPPED,          // Child has stopped.
+      CLD_CONTINUED         // Stopped child has continued.
+    }
+
+    // `si_code' values for SIGPOLL signal.
+    enum
+    {
+      POLL_IN = 1,          // Data input available.
+      POLL_OUT,         // Output buffers available.
+      POLL_MSG,         // Input message available.
+      POLL_ERR,         // I/O error.
+      POLL_PRI,         // High priority input available.
+      POLL_HUP          // Device disconnected.
+    }
+
+    sigfn_t sigset(int sig, sigfn_t func);
+
+  nothrow:
+  @nogc:
+    sigfn_t2 sigset(int sig, sigfn_t2 func);
+
+    int killpg(pid_t, int);
+    int sigaltstack(in stack_t*, stack_t*);
+    int sighold(int);
+    int sigignore(int);
+    int siginterrupt(int, int);
+    int sigpause(int);
+    int sigrelse(int);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -2521,6 +3402,14 @@ else version( OpenBSD )
         c_long  tv_nsec;
     }
 }
+else version( DragonFlyBSD )
+{
+    struct timespec
+    {
+        time_t  tv_sec;
+        c_long  tv_nsec;
+    }
+}
 else version (Solaris)
 {
     struct timespec
@@ -2561,7 +3450,7 @@ version( CRuntime_Glibc )
 {
     private enum __SIGEV_MAX_SIZE = 64;
 
-    static if( false /* __WORDSIZE == 64 */ )
+    static if( __WORDSIZE == 64 )
     {
         private enum __SIGEV_PAD_SIZE = ((__SIGEV_MAX_SIZE / int.sizeof) - 4);
     }
@@ -2634,6 +3523,33 @@ else version(NetBSD)
 else version (OpenBSD)
 {
 }
+else version( DragonFlyBSD )
+{
+    union  _sigev_un_t
+    {
+        int                       sigev_signo;
+        int                       sigev_notify_kqueue;
+        void /*pthread_attr_t*/ * sigev_notify_attributes;
+    };
+    union _sigval_t
+    {
+        int                       sival_int;
+        void                    * sival_ptr;
+        int                       sigval_int;
+        void                    * sigval_ptr;
+    };
+    struct sigevent
+    {
+        int                       sigev_notify;
+        _sigev_un_t               sigev_un;
+        _sigval_t                 sigev_value;
+        void function(_sigval_t)  sigev_notify_function;
+    }
+
+    int sigqueue(pid_t, int, in sigval);
+    int sigtimedwait(in sigset_t*, siginfo_t*, in timespec*);
+    int sigwaitinfo(in sigset_t*, siginfo_t*);
+}
 else version (Darwin)
 {
 }
@@ -2679,6 +3595,57 @@ else version( CRuntime_Bionic )
         } _sigev_un_t _sigev_un;
     }
 }
+else version( CRuntime_Musl )
+{
+    struct sigevent
+    {
+        sigval sigev_value;
+        int sigev_signo;
+        int sigev_notify;
+        void function(sigval) sigev_notify_function;
+        pthread_attr_t *sigev_notify_attributes;
+        char[56 - 3 * long.sizeof] __pad;
+    }
+}
+else version( CRuntime_UClibc )
+{
+    private enum __SIGEV_MAX_SIZE = 64;
+
+    static if( __WORDSIZE == 64 )
+    {
+        private enum __SIGEV_PAD_SIZE = ((__SIGEV_MAX_SIZE / int.sizeof) - 4);
+    }
+    else
+    {
+        private enum __SIGEV_PAD_SIZE = ((__SIGEV_MAX_SIZE / int.sizeof) - 3);
+    }
+
+    struct sigevent
+    {
+        sigval      sigev_value;
+        int         sigev_signo;
+        int         sigev_notify;
+
+        union _sigev_un_t
+        {
+            int[__SIGEV_PAD_SIZE] _pad;
+            pid_t                 _tid;
+
+            struct _sigev_thread_t
+            {
+                void function(sigval)   _function;
+                void*                   _attribute;
+            } _sigev_thread_t _sigev_thread;
+        } _sigev_un_t _sigev_un;
+    }
+
+    @property void function(sigval) sigev_notify_function(ref sigevent _sigevent) { return _sigevent._sigev_un._sigev_thread._function; }
+    @property void* sigev_notify_attributes(ref sigevent _sigevent) { return  _sigevent._sigev_un._sigev_thread._attribute; }
+
+    int sigqueue(pid_t, int, in sigval);
+    int sigtimedwait(in sigset_t*, siginfo_t*, in timespec*);
+    int sigwaitinfo(in sigset_t*, siginfo_t*);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -2717,6 +3684,11 @@ else version( OpenBSD )
     int pthread_kill(pthread_t, int);
     int pthread_sigmask(int, in sigset_t*, sigset_t*);
 }
+else version( DragonFlyBSD )
+{
+    int pthread_kill(pthread_t, int);
+    int pthread_sigmask(int, in sigset_t*, sigset_t*);
+}
 else version (Solaris)
 {
     int pthread_kill(pthread_t, int);
@@ -2727,6 +3699,17 @@ else version( CRuntime_Bionic )
     int pthread_kill(pthread_t, int);
     int pthread_sigmask(int, in sigset_t*, sigset_t*);
 }
+else version( CRuntime_Musl )
+{
+    int pthread_kill(pthread_t, int);
+    int pthread_sigmask(int, in sigset_t*, sigset_t*);
+}
+else version( CRuntime_UClibc )
+{
+    int pthread_kill(pthread_t, int);
+    int pthread_sigmask(int, in sigset_t*, sigset_t*);
+    int pthread_sigqueue(pthread_t, int, sigval);
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/sys/posix/stdio.d b/libphobos/libdruntime/core/sys/posix/stdio.d
index 2650af5f9..c9d2cc53f 100644
--- a/libphobos/libdruntime/core/sys/posix/stdio.d
+++ b/libphobos/libdruntime/core/sys/posix/stdio.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -149,6 +149,37 @@ else version( CRuntime_Bionic )
     int   fseek(FILE*, c_long, int);
     int   fsetpos(FILE*, in fpos_t*);
 }
+else version( CRuntime_UClibc )
+{
+    static if( __USE_FILE_OFFSET64 )
+    {
+        int   fgetpos64(FILE*, fpos_t *);
+        alias fgetpos64 fgetpos;
+
+        FILE* fopen64(in char*, in char*);
+        alias fopen64 fopen;
+
+        FILE* freopen64(in char*, in char*, FILE*);
+        alias freopen64 freopen;
+
+        int   fseek(FILE*, c_long, int);
+
+        int   fsetpos64(FILE*, in fpos_t*);
+        alias fsetpos64 fsetpos;
+
+        FILE* tmpfile64();
+        alias tmpfile64 tmpfile;
+    }
+    else
+    {
+        int   fgetpos(FILE*, fpos_t *);
+        FILE* fopen(in char*, in char*);
+        FILE* freopen(in char*, in char*, FILE*);
+        int   fseek(FILE*, c_long, int);
+        int   fsetpos(FILE*, in fpos_t*);
+        FILE* tmpfile();
+    }
+}
 
 //
 // C Extension (CX)
@@ -190,6 +221,31 @@ version( CRuntime_Glibc )
     off_t ftello(FILE*);
   }
 }
+else version( CRuntime_UClibc )
+{
+    enum L_ctermid = 9;
+    enum L_cuserid = 9;
+
+  static if( __USE_FILE_OFFSET64 )
+  {
+    int   fseeko64(FILE*, off_t, int);
+    alias fseeko64 fseeko;
+  }
+  else
+  {
+    int   fseeko(FILE*, off_t, int);
+  }
+
+  static if( __USE_FILE_OFFSET64 )
+  {
+    off_t ftello64(FILE*);
+    alias ftello64 ftello;
+  }
+  else
+  {
+    off_t ftello(FILE*);
+  }
+}
 else version( Posix )
 {
     int   fseeko(FILE*, off_t, int);
@@ -213,13 +269,18 @@ version( CRuntime_Glibc )                     // as of glibc 1.0x
     version = HaveMemstream;
 else version( FreeBSD )                      // as of FreeBSD 9.2
     version = HaveMemstream;
+else version( DragonFlyBSD )                 // for DragonFlyBSD
+    version = HaveMemstream;
 else version( OpenBSD )                      // as of OpenBSD 5.4
     version = HaveMemstream;
+else version( CRuntime_UClibc )
+    version = HaveMemstream;
 
 version( HaveMemstream )
 {
     FILE*  fmemopen(in void* buf, in size_t size, in char* mode);
     FILE*  open_memstream(char** ptr, size_t* sizeloc);
+    version( CRuntime_UClibc ) {} else
     FILE*  open_wmemstream(wchar_t** ptr, size_t* sizeloc);
 }
 
@@ -266,6 +327,16 @@ else version( Solaris )
     int    putc_unlocked(int, FILE*);
     int    putchar_unlocked(int);
 }
+else version( CRuntime_UClibc )
+{
+    void   flockfile(FILE*);
+    int    ftrylockfile(FILE*);
+    void   funlockfile(FILE*);
+    int    getc_unlocked(FILE*);
+    int    getchar_unlocked();
+    int    putc_unlocked(int, FILE*);
+    int    putchar_unlocked(int);
+}
 
 //
 // XOpen (XSI)
@@ -283,6 +354,10 @@ version( CRuntime_Glibc )
 {
     enum P_tmpdir  = "/tmp";
 }
+version( CRuntime_Musl )
+{
+    enum P_tmpdir  = "/tmp";
+}
 version( Darwin )
 {
     enum P_tmpdir  = "/var/tmp";
@@ -299,10 +374,18 @@ version( OpenBSD )
 {
     enum P_tmpdir  = "/tmp/";
 }
+version( DragonFlyBSD )
+{
+    enum P_tmpdir  = "/var/tmp/";
+}
 version( Solaris )
 {
     enum P_tmpdir  = "/var/tmp/";
 }
+version( CRuntime_UClibc )
+{
+    enum P_tmpdir  = "/tmp";
+}
 
 version( HaveMemstream )
 unittest
@@ -333,6 +416,7 @@ unittest
     assert(fclose(f) == 0);
 }
 
+version( CRuntime_UClibc ) {} else
 version( HaveMemstream )
 unittest
 { /* Note: open_wmemstream is only useful for writing */
diff --git a/libphobos/libdruntime/core/sys/posix/stdlib.d b/libphobos/libdruntime/core/sys/posix/stdlib.d
index 3d239469f..be952c847 100644
--- a/libphobos/libdruntime/core/sys/posix/stdlib.d
+++ b/libphobos/libdruntime/core/sys/posix/stdlib.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -108,6 +108,10 @@ else version( OpenBSD )
 {
     int posix_memalign(void**, size_t, size_t);
 }
+else version( DragonFlyBSD )
+{
+    int posix_memalign(void**, size_t, size_t);
+}
 else version( Solaris )
 {
     int posix_memalign(void**, size_t, size_t);
@@ -121,6 +125,14 @@ else version( CRuntime_Bionic )
     // Added since Lollipop
     int posix_memalign(void**, size_t, size_t);
 }
+else version( CRuntime_Musl )
+{
+    int posix_memalign(void**, size_t, size_t);
+}
+else version( CRuntime_UClibc )
+{
+    int posix_memalign(void**, size_t, size_t);
+}
 
 //
 // C Extension (CX)
@@ -165,6 +177,13 @@ else version( OpenBSD )
 
     void* valloc(size_t); // LEGACY non-standard
 }
+else version( DragonFlyBSD )
+{
+    int setenv(in char*, in char*, int);
+    int unsetenv(in char*);
+
+    void* valloc(size_t); // LEGACY non-standard
+}
 else version( CRuntime_Bionic )
 {
     int setenv(in char*, in char*, int);
@@ -179,6 +198,17 @@ else version( Solaris )
 
     void* valloc(size_t); // LEGACY non-standard
 }
+else version( CRuntime_Musl )
+{
+    int setenv(in char*, in char*, int);
+    int unsetenv(in char*);
+}
+else version( CRuntime_UClibc )
+{
+    int setenv(in char*, in char*, int);
+    int unsetenv(in char*);
+    void* valloc(size_t);
+}
 
 //
 // Thread-Safe Functions (TSF)
@@ -207,10 +237,18 @@ else version( OpenBSD )
 {
     int rand_r(uint*);
 }
+else version( DragonFlyBSD )
+{
+    int rand_r(uint*);
+}
 else version( Solaris )
 {
     int rand_r(uint*);
 }
+else version( CRuntime_UClibc )
+{
+    int rand_r(uint*);
+}
 
 //
 // XOpen (XSI)
@@ -472,6 +510,47 @@ else version( OpenBSD )
     void   srandom(uint);
     int    unlockpt(int);
 }
+else version( DragonFlyBSD )
+{
+    //WNOHANG     (defined in core.sys.posix.sys.wait)
+    //WUNTRACED   (defined in core.sys.posix.sys.wait)
+    //WEXITSTATUS (defined in core.sys.posix.sys.wait)
+    //WIFEXITED   (defined in core.sys.posix.sys.wait)
+    //WIFSIGNALED (defined in core.sys.posix.sys.wait)
+    //WIFSTOPPED  (defined in core.sys.posix.sys.wait)
+    //WSTOPSIG    (defined in core.sys.posix.sys.wait)
+    //WTERMSIG    (defined in core.sys.posix.sys.wait)
+
+    c_long a64l(in char*);
+    double drand48();
+    //char*  ecvt(double, int, int *, int *); // LEGACY
+    double erand48(ref ushort[3]);
+    //char*  fcvt(double, int, int *, int *); // LEGACY
+    //char*  gcvt(double, int, char*); // LEGACY
+    int    getsubopt(char**, in char**, char**);
+    int    grantpt(int);
+    char*  initstate(uint, char*, size_t);
+    c_long jrand48(ref ushort[3]);
+    char*  l64a(c_long);
+    void   lcong48(ref ushort[7]);
+    c_long lrand48();
+    char*  mktemp(char*); // LEGACY
+    int    mkstemp(char*);
+    char*  mkdtemp(char*); // Defined in IEEE 1003.1, 2008 Edition
+    c_long mrand48();
+    c_long nrand48(ref ushort[3]);
+    int    posix_openpt(int);
+    char*  ptsname(int);
+    int    putenv(char*);
+    c_long random();
+    char*  realpath(in char*, char*);
+    ushort *seed48(ref ushort[3]);
+    void   setkey(in char*);
+    char*  setstate(in char*);
+    void   srand48(c_long);
+    void   srandom(uint);
+    int    unlockpt(int);
+}
 else version( CRuntime_Bionic )
 {
     double  drand48();
@@ -493,6 +572,13 @@ else version( CRuntime_Bionic )
     void    srandom(uint s) { srand48(s); }
     int     unlockpt(int);
 }
+else version( CRuntime_Musl )
+{
+    char*  realpath(in char*, char*);
+    int    putenv(char*);
+    int    mkstemp(char*);
+
+}
 else version( Solaris )
 {
     //WNOHANG     (defined in core.sys.posix.sys.wait)
@@ -551,3 +637,44 @@ else version( Solaris )
             int mkstemp(char*);
     }
 }
+else version( CRuntime_UClibc )
+{
+    c_long a64l(in char*);
+    double drand48();
+    char*  ecvt(double, int, int *, int *);
+    double erand48(ref ushort[3]);
+    char*  fcvt(double, int, int *, int *);
+    char*  gcvt(double, int, char*);
+    int    getsubopt(char**, in char**, char**);
+    int    grantpt(int);
+    char*  initstate(uint, char*, size_t);
+    c_long jrand48(ref ushort[3]);
+    char*  l64a(c_long);
+    void   lcong48(ref ushort[7]);
+    c_long lrand48();
+    char*  mktemp(char*);
+    char*  mkdtemp(char*);
+    c_long mrand48();
+    c_long nrand48(ref ushort[3]);
+    int    posix_openpt(int);
+    char*  ptsname(int);
+    int    putenv(char*);
+    c_long random();
+    char*  realpath(in char*, char*);
+    ushort* seed48(ref ushort[3]);
+    void   setkey(in char*);
+    char*  setstate(in char*);
+    void   srand48(c_long);
+    void   srandom(uint);
+    int    unlockpt(int);
+
+  static if( __USE_LARGEFILE64 )
+  {
+    int    mkstemp64(char*);
+    alias  mkstemp64 mkstemp;
+  }
+  else
+  {
+    int    mkstemp(char*);
+  }
+}
diff --git a/libphobos/libdruntime/core/sys/posix/sys/filio.d b/libphobos/libdruntime/core/sys/posix/sys/filio.d
index da8385680..0ca070b46 100644
--- a/libphobos/libdruntime/core/sys/posix/sys/filio.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/filio.d
@@ -1,7 +1,7 @@
 /**
  * D header file for POSIX.
  *
- * License: $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License: $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  */
 
 module core.sys.posix.sys.filio;
diff --git a/libphobos/libdruntime/core/sys/posix/sys/ioccom.d b/libphobos/libdruntime/core/sys/posix/sys/ioccom.d
index 1094f9bff..5d6aa08d9 100755
--- a/libphobos/libdruntime/core/sys/posix/sys/ioccom.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/ioccom.d
@@ -1,7 +1,7 @@
 /**
  * D header file for POSIX.
  *
- * License: $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License: $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  */
 
 module core.sys.posix.sys.ioccom;
diff --git a/libphobos/libdruntime/core/sys/posix/sys/ioctl.d b/libphobos/libdruntime/core/sys/posix/sys/ioctl.d
index 8c2e778d8..63d30195b 100644
--- a/libphobos/libdruntime/core/sys/posix/sys/ioctl.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/ioctl.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Alex Rønne Petersen 2011 - 2012.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Alex Rønne Petersen
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -379,6 +379,24 @@ else version (NetBSD)
 
     int ioctl(int, c_ulong, ...);
 }
+else version (DragonFlyBSD)
+{
+    struct fiodgname_arg
+    {
+        int len;
+        void* buf;
+    }
+
+    struct winsize
+    {
+        ushort ws_row;
+        ushort ws_col;
+        ushort ws_xpixel;
+        ushort ws_ypixel;
+    }
+
+    int ioctl(int, c_ulong, ...);
+}
 else version (Solaris)
 {
     int ioctl(int fildes, int request, ...);
@@ -387,6 +405,335 @@ else version (CRuntime_Bionic)
 {
     int ioctl(int, int, ...);
 }
+else version (CRuntime_Musl)
+{
+
+}
+else version (CRuntime_UClibc)
+{
+    import core.sys.posix.termios;
+
+    enum _IOC_NRBITS = 8;
+    enum _IOC_TYPEBITS = 8;
+    enum _IOC_SIZEBITS = 14;
+    enum _IOC_DIRBITS = 2;
+
+    enum _IOC_NRMASK = (1 << _IOC_NRBITS) - 1;
+    enum _IOC_TYPEMASK = (1 << _IOC_TYPEBITS) - 1;
+    enum _IOC_SIZEMASK = (1 << _IOC_SIZEBITS) - 1;
+    enum _IOC_DIRMASK = (1 << _IOC_DIRBITS) - 1;
+
+    enum _IOC_NRSHIFT = 0;
+    enum _IOC_TYPESHIFT = _IOC_NRSHIFT + _IOC_NRBITS;
+    enum _IOC_SIZESHIFT = _IOC_TYPESHIFT + _IOC_TYPEBITS;
+    enum _IOC_DIRSHIFT = _IOC_SIZESHIFT + _IOC_SIZEBITS;
+
+    enum _IOC_NONE = 0;
+    enum _IOC_WRITE = 1;
+    enum _IOC_READ = 2;
+
+    extern (D) int _IOC(T = typeof(null))(int dir, int type, int nr)
+    {
+        return (dir << _IOC_DIRSHIFT) |
+               (type << _IOC_TYPESHIFT) |
+               (nr << _IOC_NRSHIFT) |
+               (is(T == typeof(null)) ? 0 : T.sizeof << _IOC_SIZESHIFT);
+    }
+
+    extern (D) int _IO(int type, int nr)
+    {
+        return _IOC(_IOC_NONE, type, nr);
+    }
+
+    extern (D) int _IOR(T)(int type, int nr)
+    {
+        return _IOC!T(_IOC_READ, type, nr);
+    }
+
+    extern (D) int _IOW(T)(int type, int nr)
+    {
+        return _IOC!T(_IOC_WRITE, type, nr);
+    }
+
+    extern (D) int _IOWR(T)(int type, int nr)
+    {
+        return _IOC!T(_IOC_READ | _IOC_WRITE, type, nr);
+    }
+
+    extern (D) int _IOR_BAD(T)(int type, int nr)
+    {
+        return _IOC!T(_IOC_READ, type, nr);
+    }
+
+    extern (D) int _IOW_BAD(T)(int type, int nr)
+    {
+        return _IOC!T(_IOC_WRITE, type, nr);
+    }
+
+    extern (D) int _IORW_BAD(T)(int type, int nr)
+    {
+        return _IOC!T(_IOC_READ | _IOC_WRITE, type, nr);
+    }
+
+    extern (D) int _IOC_DIR(int nr)
+    {
+        return (nr >> _IOC_DIRSHIFT) & _IOC_DIRMASK;
+    }
+
+    extern (D) int _IOC_TYPE(int nr)
+    {
+        return (nr >> _IOC_TYPESHIFT) & _IOC_TYPEMASK;
+    }
+
+    extern (D) int _IOC_NR(int nr)
+    {
+        return (nr >> _IOC_NRSHIFT) & _IOC_NRMASK;
+    }
+
+    extern (D) int _IOC_SIZE(int nr)
+    {
+        return (nr >> _IOC_SIZESHIFT) & _IOC_SIZEMASK;
+    }
+
+    enum IOC_IN = _IOC_WRITE << _IOC_DIRSHIFT;
+    enum IOC_OUT = _IOC_READ << _IOC_DIRSHIFT;
+    enum IOC_INOUT = (_IOC_READ | _IOC_WRITE) << _IOC_DIRSHIFT;
+    enum IOCSIZE_MASK = _IOC_SIZEMASK << _IOC_DIRSHIFT;
+    enum IOCSIZE_SHIFT = _IOC_SIZESHIFT;
+
+    enum NCCS = 19;
+
+    struct termios
+    {
+        tcflag_t c_iflag;
+        tcflag_t c_oflag;
+        tcflag_t c_cflag;
+        tcflag_t c_lflag;
+        cc_t c_line;
+        cc_t[NCCS] c_cc;
+    }
+
+    struct termios2
+    {
+        tcflag_t c_iflag;
+        tcflag_t c_oflag;
+        tcflag_t c_cflag;
+        tcflag_t c_lflag;
+        cc_t c_line;
+        cc_t[NCCS] c_cc;
+        speed_t c_ispeed;
+        speed_t c_ospeed;
+    }
+
+    alias termios2 ktermios;
+
+    struct winsize
+    {
+        ushort ws_row;
+        ushort ws_col;
+        ushort ws_xpixel;
+        ushort ws_ypixel;
+    }
+
+    enum NCC = 8;
+
+    struct termio
+    {
+        ushort c_iflag;
+        ushort c_oflag;
+        ushort c_cflag;
+        ushort c_lflag;
+        ubyte c_line;
+        ubyte[NCC] c_cc;
+    }
+
+    enum TIOCM_LE = 0x001;
+    enum TIOCM_DTR = 0x002;
+    enum TIOCM_RTS = 0x004;
+    enum TIOCM_ST = 0x008;
+    enum TIOCM_SR = 0x010;
+    enum TIOCM_CTS = 0x020;
+    enum TIOCM_CAR = 0x040;
+    enum TIOCM_RNG = 0x080;
+    enum TIOCM_DSR = 0x100;
+    enum TIOCM_CD = TIOCM_CAR;
+    enum TIOCM_RI = TIOCM_RNG;
+
+    enum N_TTY = 0;
+    enum N_SLIP = 1;
+    enum N_MOUSE = 2;
+    enum N_PPP = 3;
+    enum N_STRIP = 4;
+    enum N_AX25 = 5;
+    enum N_X25 = 6;
+    enum N_6PACK = 7;
+    enum N_MASC = 8;
+    enum N_R3964 = 9;
+    enum N_PROFIBUS_FDL = 10;
+    enum N_IRDA = 11;
+    enum N_SMSBLOCK = 12;
+    enum N_HDLC = 13;
+    enum N_SYNC_PPP = 14;
+    enum N_HCI = 15;
+
+    enum TCGETS = 0x5401;
+    enum TCSETS = 0x5402;
+    enum TCSETSW = 0x5403;
+    enum TCSETSF = 0x5404;
+    enum TCGETA = 0x5405;
+    enum TCSETA = 0x5406;
+    enum TCSETAW = 0x5407;
+    enum TCSETAF = 0x5408;
+    enum TCSBRK = 0x5409;
+    enum TCXONC = 0x540A;
+    enum TCFLSH = 0x540B;
+    enum TIOCEXCL = 0x540C;
+    enum TIOCNXCL = 0x540D;
+    enum TIOCSCTTY = 0x540E;
+    enum TIOCGPGRP = 0x540F;
+    enum TIOCSPGRP = 0x5410;
+    enum TIOCOUTQ = 0x5411;
+    enum TIOCSTI = 0x5412;
+    enum TIOCGWINSZ = 0x5413;
+    enum TIOCSWINSZ = 0x5414;
+    enum TIOCMGET = 0x5415;
+    enum TIOCMBIS = 0x5416;
+    enum TIOCMBIC = 0x5417;
+    enum TIOCMSET = 0x5418;
+    enum TIOCGSOFTCAR = 0x5419;
+    enum TIOCSSOFTCAR = 0x541A;
+    enum FIONREAD = 0x541B;
+    enum TIOCINQ = FIONREAD;
+    enum TIOCLINUX = 0x541C;
+    enum TIOCCONS = 0x541D;
+    enum TIOCGSERIAL = 0x541E;
+    enum TIOCSSERIAL = 0x541F;
+    enum TIOCPKT = 0x5420;
+    enum FIONBIO = 0x5421;
+    enum TIOCNOTTY = 0x5422;
+    enum TIOCSETD = 0x5423;
+    enum TIOCGETD = 0x5424;
+    enum TCSBRKP = 0x5425;
+    enum TIOCSBRK = 0x5427;
+    enum TIOCCBRK = 0x5428;
+    enum TIOCGSID = 0x5429;
+
+    enum TCGETS2 = _IOR!termios2('T', 0x2A);
+    enum TCSETS2 = _IOR!termios2('T', 0x2B);
+    enum TCSETSW2 = _IOW!termios2('T', 0x2C);
+    enum TCSETSF2 = _IOW!termios2('T', 0x2D);
+
+    enum TIOCGRS485 = 0x542E;
+    enum TIOCSRS485 = 0x542F;
+
+    enum TIOCGPTN   = _IOR!uint('T', 0x30);
+    enum TIOCSPTLCK = _IOW!int('T', 0x31);
+    enum TIOCGDEV   = _IOR!uint('T', 0x32);
+
+    enum TCGETX = 0x5432;
+    enum TCSETX = 0x5433;
+    enum TCSETXF = 0x5434;
+    enum TCSETXW = 0x5435;
+
+    enum TIOCSIG = _IOW!int('T', 0x36);
+
+    enum TIOCVHANGUP = 0x5437;
+
+    enum FIONCLEX = 0x5450;
+    enum FIOCLEX = 0x5451;
+    enum FIOASYNC = 0x5452;
+    enum TIOCSERCONFIG = 0x5453;
+    enum TIOCSERGWILD = 0x5454;
+    enum TIOCSERSWILD = 0x5455;
+    enum TIOCGLCKTRMIOS = 0x5456;
+    enum TIOCSLCKTRMIOS = 0x5457;
+    enum TIOCSERGSTRUCT = 0x5458;
+    enum TIOCSERGETLSR = 0x5459;
+    enum TIOCSERGETMULTI = 0x545A;
+    enum TIOCSERSETMULTI = 0x545B;
+
+    enum TIOCMIWAIT = 0x545C;
+    enum TIOCGICOUNT = 0x545D;
+
+    enum FIOQSIZE = 0x5460;
+
+    enum TIOCPKT_DATA = 0;
+    enum TIOCPKT_FLUSHREAD = 1;
+    enum TIOCPKT_FLUSHWRITE = 2;
+    enum TIOCPKT_STOP = 4;
+    enum TIOCPKT_START = 8;
+    enum TIOCPKT_NOSTOP = 16;
+    enum TIOCPKT_DOSTOP = 32;
+    enum TIOCPKT_IOCTL = 64;
+
+    enum TIOCSER_TEMT = 0x01;
+
+    enum SIOCADDRT = 0x890B;
+    enum SIOCDELRT = 0x890C;
+    enum SIOCRTMSG = 0x890D;
+
+    enum SIOCGIFNAME = 0x8910;
+    enum SIOCSIFLINK = 0x8911;
+    enum SIOCGIFCONF = 0x8912;
+    enum SIOCGIFFLAGS = 0x8913;
+    enum SIOCSIFFLAGS = 0x8914;
+    enum SIOCGIFADDR = 0x8915;
+    enum SIOCSIFADDR = 0x8916;
+    enum SIOCGIFDSTADDR = 0x8917;
+    enum SIOCSIFDSTADDR = 0x8918;
+    enum SIOCGIFBRDADDR = 0x8919;
+    enum SIOCSIFBRDADDR = 0x891a;
+    enum SIOCGIFNETMASK = 0x891b;
+    enum SIOCSIFNETMASK = 0x891c;
+    enum SIOCGIFMETRIC = 0x891d;
+    enum SIOCSIFMETRIC = 0x891e;
+    enum SIOCGIFMEM = 0x891f;
+    enum SIOCSIFMEM = 0x8920;
+    enum SIOCGIFMTU = 0x8921;
+    enum SIOCSIFMTU = 0x8922;
+    enum SIOCSIFNAME = 0x8923;
+    enum SIOCSIFHWADDR = 0x8924;
+    enum SIOCGIFENCAP = 0x8925;
+    enum SIOCSIFENCAP = 0x8926;
+    enum SIOCGIFHWADDR = 0x8927;
+    enum SIOCGIFSLAVE = 0x8929;
+    enum SIOCSIFSLAVE = 0x8930;
+    enum SIOCADDMULTI = 0x8931;
+    enum SIOCDELMULTI = 0x8932;
+    enum SIOCGIFINDEX = 0x8933;
+    enum SIOGIFINDEX = SIOCGIFINDEX;
+    enum SIOCSIFPFLAGS = 0x8934;
+    enum SIOCGIFPFLAGS = 0x8935;
+    enum SIOCDIFADDR = 0x8936;
+    enum SIOCSIFHWBROADCAST = 0x8937;
+    enum SIOCGIFCOUNT = 0x8938;
+
+    enum SIOCGIFBR = 0x8940;
+    enum SIOCSIFBR = 0x8941;
+
+    enum SIOCGIFTXQLEN = 0x8942;
+    enum SIOCSIFTXQLEN = 0x8943;
+
+    enum SIOCDARP = 0x8953;
+    enum SIOCGARP = 0x8954;
+    enum SIOCSARP = 0x8955;
+
+    enum SIOCDRARP = 0x8960;
+    enum SIOCGRARP = 0x8961;
+    enum SIOCSRARP = 0x8962;
+
+    enum SIOCGIFMAP = 0x8970;
+    enum SIOCSIFMAP = 0x8971;
+
+    enum SIOCADDDLCI = 0x8980;
+    enum SIOCDELDLCI = 0x8981;
+
+    enum SIOCDEVPRIVATE = 0x89F0;
+
+    enum SIOCPROTOPRIVATE = 0x89E0;
+
+    int ioctl(int __fd, c_ulong __request, ...);
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/sys/posix/sys/ipc.d b/libphobos/libdruntime/core/sys/posix/sys/ipc.d
index 5c9c2526b..e0636d928 100644
--- a/libphobos/libdruntime/core/sys/posix/sys/ipc.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/ipc.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -149,6 +149,31 @@ else version(NetBSD)
 
     key_t ftok(in char*, int);
 }
+else version( DragonFlyBSD )
+{
+    struct ipc_perm
+    {
+        uid_t   cuid;
+        gid_t   cgid;
+        uid_t   uid;
+        gid_t   gid;
+        mode_t  mode;
+        ushort  seq;
+        key_t   key;
+    }
+
+    enum IPC_CREAT      = 0x0200; // 01000
+    enum IPC_EXCL       = 0x0400; // 02000
+    enum IPC_NOWAIT     = 0x0800; // 04000
+
+    enum key_t IPC_PRIVATE = 0;
+
+    enum IPC_RMID       = 0;
+    enum IPC_SET        = 1;
+    enum IPC_STAT       = 2;
+
+    key_t ftok(in char*, int);
+}
 else version( CRuntime_Bionic )
 {
     // All except ftok are from the linux kernel headers.
@@ -178,6 +203,19 @@ else version( CRuntime_Bionic )
             ushort  seq;
         }
     }
+    else version (AArch64)
+    {
+        struct ipc_perm
+        {
+            key_t   key;
+            uint    uid;
+            uint    gid;
+            uint    cuid;
+            uint    cgid;
+            mode_t  mode;
+            ushort  seq;
+        }
+    }
     else
     {
         static assert(false, "Architecture not supported.");
@@ -195,3 +233,33 @@ else version( CRuntime_Bionic )
 
     key_t ftok(in char*, int);
 }
+else version( CRuntime_UClibc )
+{
+    struct ipc_perm
+    {
+        key_t   __key;
+        uid_t   uid;
+        gid_t   gid;
+        uid_t   cuid;
+        gid_t   cgid;
+        ushort  mode;
+        ushort  __pad1;
+        ushort  __seq;
+        ushort  __pad2;
+        c_ulong __unused1;
+        c_ulong __unused2;
+    }
+
+    enum IPC_CREAT      = 0x0200; // 01000
+    enum IPC_EXCL       = 0x0400; // 02000
+    enum IPC_NOWAIT     = 0x0800; // 04000
+
+    enum key_t IPC_PRIVATE = 0;
+
+    enum IPC_RMID       = 0;
+    enum IPC_SET        = 1;
+    enum IPC_STAT       = 2;
+    enum IPC_INFO       = 3;
+
+    key_t ftok(in char*, int);
+}
diff --git a/libphobos/libdruntime/core/sys/posix/sys/mman.d b/libphobos/libdruntime/core/sys/posix/sys/mman.d
index c3cfec645..3deb6ef44 100644
--- a/libphobos/libdruntime/core/sys/posix/sys/mman.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/mman.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly, Alex Rønne Petersen
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -94,12 +94,36 @@ else version(NetBSD)
     enum POSIX_MADV_DONTNEED    = 4;
     int posix_madvise(void *addr, size_t len, int advice);
 }
+else version( DragonFlyBSD )
+{
+    enum POSIX_MADV_NORMAL      = 0;
+    enum POSIX_MADV_RANDOM      = 1;
+    enum POSIX_MADV_SEQUENTIAL  = 2;
+    enum POSIX_MADV_WILLNEED    = 3;
+    enum POSIX_MADV_DONTNEED    = 4;
+    int posix_madvise(void *addr, size_t len, int advice);
+}
 else version (Solaris)
 {
 }
 else version (CRuntime_Bionic)
 {
 }
+else version (CRuntime_Musl)
+{
+}
+else version( CRuntime_UClibc )
+{
+    enum
+    {
+        POSIX_MADV_NORMAL = 0,
+        POSIX_MADV_RANDOM = 1,
+        POSIX_MADV_SEQUENTIAL = 2,
+        POSIX_MADV_WILLNEED = 3,
+        POSIX_MADV_DONTNEED = 4,
+    }
+    int posix_madvise(void *__addr, size_t __len, int __advice);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -143,6 +167,13 @@ else version(NetBSD)
     enum PROT_WRITE     = 0x02;
     enum PROT_EXEC      = 0x04;
 }
+else version( DragonFlyBSD )
+{
+    enum PROT_NONE      = 0x00;
+    enum PROT_READ      = 0x01;
+    enum PROT_WRITE     = 0x02;
+    enum PROT_EXEC      = 0x04;
+}
 else version (Solaris)
 {
     enum PROT_NONE = 0x00;
@@ -157,6 +188,20 @@ else version (CRuntime_Bionic)
     enum PROT_WRITE = 0x02;
     enum PROT_EXEC = 0x04;
 }
+else version (CRuntime_Musl)
+{
+    enum PROT_NONE      = 0x0;
+    enum PROT_READ      = 0x1;
+    enum PROT_WRITE     = 0x2;
+    enum PROT_EXEC      = 0x4;
+}
+else version( CRuntime_UClibc )
+{
+    enum PROT_NONE      = 0x0;
+    enum PROT_READ      = 0x1;
+    enum PROT_WRITE     = 0x2;
+    enum PROT_EXEC      = 0x4;
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -194,6 +239,11 @@ else version(NetBSD)
     void* mmap(void*, size_t, int, int, int, off_t);
     int   munmap(void*, size_t);
 }
+else version( DragonFlyBSD )
+{
+    void* mmap(void*, size_t, int, int, int, off_t);
+    int   munmap(void*, size_t);
+}
 else version (Solaris)
 {
     void* mmap(void*, size_t, int, int, int, off_t);
@@ -204,6 +254,24 @@ else version (CRuntime_Bionic)
     void* mmap(void*, size_t, int, int, int, off_t);
     int   munmap(void*, size_t);
 }
+else version (CRuntime_Musl)
+{
+    static if (__USE_LARGEFILE64) void* mmap64(void*, size_t, int, int, int, off_t);
+    static if (__USE_FILE_OFFSET64)
+        alias mmap = mmap64;
+    else
+        void* mmap(void*, size_t, int, int, int, off_t);
+    int munmap(void*, size_t);
+}
+else version( CRuntime_UClibc )
+{
+    static if (__USE_LARGEFILE64) void* mmap64(void*, size_t, int, int, int, off64_t);
+    static if (__USE_FILE_OFFSET64)
+        alias mmap = mmap64;
+    else
+        void* mmap(void*, size_t, int, int, int, off_t);
+    int munmap(void*, size_t);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -362,6 +430,21 @@ else version(NetBSD)
     int __msync13(void*, size_t, int);
     alias msync = __msync13;
 }
+else version( DragonFlyBSD )
+{
+    enum MAP_SHARED     = 0x0001;
+    enum MAP_PRIVATE    = 0x0002;
+    enum MAP_FIXED      = 0x0010;
+    enum MAP_ANON       = 0x1000;
+
+    enum MAP_FAILED     = cast(void*)-1;
+
+    enum MS_SYNC        = 0x0000;
+    enum MS_ASYNC       = 0x0001;
+    enum MS_INVALIDATE  = 0x0002;
+
+    int msync(void*, size_t, int);
+}
 else version (Solaris)
 {
     enum MAP_SHARED = 0x0001;
@@ -391,6 +474,10 @@ else version (CRuntime_Bionic)
     {
         enum MAP_ANON       = 0x0020;
     }
+    else version (AArch64)
+    {
+        enum MAP_ANON       = 0x0020;
+    }
     else
     {
         static assert(false, "Architecture not supported.");
@@ -404,6 +491,56 @@ else version (CRuntime_Bionic)
 
     int msync(in void*, size_t, int);
 }
+else version (CRuntime_Musl)
+{
+    enum MAP_SHARED     = 0x01;
+    enum MAP_PRIVATE    = 0x02;
+    enum MAP_FIXED      = 0x10;
+
+    enum MAP_FAILED     = cast(void*) -1;
+    enum MAP_ANON = 0x20;
+    enum MS_ASYNC = 1;
+    enum MS_INVALIDATE = 2;
+    enum MS_SYNC = 4;
+    int msync(void*, size_t, int);
+}
+else version( CRuntime_UClibc )
+{
+    enum MAP_SHARED     = 0x01;
+    enum MAP_PRIVATE    = 0x02;
+    enum MAP_FIXED      = 0x10;
+
+    enum MAP_FAILED     = cast(void*) -1;
+
+    version (X86_64)
+    {
+        enum MAP_ANON       = 0x20;
+        enum MS_ASYNC       = 1;
+        enum MS_INVALIDATE  = 2;
+        enum MS_SYNC        = 4;
+    }
+    else version (MIPS32)
+    {
+        enum MAP_ANON       = 0x0800;
+        enum MS_ASYNC       = 1;
+        enum MS_INVALIDATE  = 2;
+        enum MS_SYNC        = 4;
+    }
+    else version (ARM)
+    {
+        enum MAP_ANON       = 0x020;
+        enum MS_ASYNC       = 1;
+        enum MS_INVALIDATE  = 2;
+        enum MS_SYNC        = 4;
+    }
+    else
+    {
+        static assert(false, "Architecture not supported.");
+    }
+
+
+    int msync(void*, size_t, int);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -481,6 +618,14 @@ else version(NetBSD)
     int mlockall(int);
     int munlockall();
 }
+else version( DragonFlyBSD )
+{
+    enum MCL_CURRENT    = 0x0001;
+    enum MCL_FUTURE     = 0x0002;
+
+    int mlockall(int);
+    int munlockall();
+}
 else version (Solaris)
 {
     enum MCL_CURRENT = 0x0001;
@@ -497,6 +642,21 @@ else version (CRuntime_Bionic)
     int mlockall(int);
     int munlockall();
 }
+else version (CRuntime_Musl)
+{
+}
+else version( CRuntime_UClibc )
+{
+    enum
+    {
+        MCL_CURRENT = 1,
+        MCL_FUTURE = 2,
+    }
+
+    int mlockall(int);
+    int munlockall();
+
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -530,6 +690,11 @@ else version(NetBSD)
     int mlock(in void*, size_t);
     int munlock(in void*, size_t);
 }
+else version( DragonFlyBSD )
+{
+    int mlock(in void*, size_t);
+    int munlock(in void*, size_t);
+}
 else version (Solaris)
 {
     int mlock(in void*, size_t);
@@ -540,6 +705,14 @@ else version (CRuntime_Bionic)
     int mlock(in void*, size_t);
     int munlock(in void*, size_t);
 }
+else version (CRuntime_Musl)
+{
+}
+else version( CRuntime_UClibc )
+{
+    int mlock(in void*, size_t);
+    int munlock(in void*, size_t);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -568,6 +741,10 @@ else version(NetBSD)
 {
     int mprotect(void*, size_t, int);
 }
+else version( DragonFlyBSD )
+{
+    int mprotect(void*, size_t, int);
+}
 else version (Solaris)
 {
     int mprotect(void*, size_t, int);
@@ -576,6 +753,14 @@ else version (CRuntime_Bionic)
 {
     int mprotect(in void*, size_t, int);
 }
+else version (CRuntime_Musl)
+{
+    int mprotect(void*, size_t, int);
+}
+else version (CRuntime_UClibc)
+{
+    int mprotect(void*, size_t, int);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -609,6 +794,11 @@ else version(NetBSD)
     int shm_open(in char*, int, mode_t);
     int shm_unlink(in char*);
 }
+else version( DragonFlyBSD )
+{
+    int shm_open(in char*, int, mode_t);
+    int shm_unlink(in char*);
+}
 else version (Solaris)
 {
     int shm_open(in char*, int, mode_t);
@@ -617,6 +807,14 @@ else version (Solaris)
 else version (CRuntime_Bionic)
 {
 }
+else version (CRuntime_Musl)
+{
+}
+else version( CRuntime_UClibc )
+{
+    int shm_open(in char*, int, mode_t);
+    int shm_unlink(in char*);
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/sys/posix/sys/resource.d b/libphobos/libdruntime/core/sys/posix/sys/resource.d
index 2823aa506..dca526563 100644
--- a/libphobos/libdruntime/core/sys/posix/sys/resource.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/resource.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright (c) 2013 Lars Tandle Kyllingstad.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Lars Tandle Kyllingstad
  * Standards: The Open Group Base Specifications Issue 7, IEEE Std 1003.1-2008
  */
@@ -301,6 +301,64 @@ else version (NetBSD)
         RLIMIT_AS     = 10,
     }
 }
+else version (DragonFlyBSD)
+{
+    enum
+    {
+        PRIO_PROCESS = 0,
+        PRIO_PGRP    = 1,
+        PRIO_USER    = 2,
+    }
+
+    alias long rlim_t;
+
+    enum
+    {
+        RLIM_INFINITY   = (cast(rlim_t)((cast(ulong) 1 << 63) - 1)),
+        // DragonFlyBSD explicitly does not define the following:
+        //RLIM_SAVED_MAX,
+        //RLIM_SAVED_CUR,
+    }
+
+    enum
+    {
+        RUSAGE_SELF     =  0,
+        RUSAGE_CHILDREN = -1,
+    }
+
+    struct rusage
+    {
+        timeval ru_utime;
+        timeval ru_stime;
+        c_long ru_maxrss;
+        alias ru_ixrss ru_first;
+        c_long ru_ixrss;
+        c_long ru_idrss;
+        c_long ru_isrss;
+        c_long ru_minflt;
+        c_long ru_majflt;
+        c_long ru_nswap;
+        c_long ru_inblock;
+        c_long ru_oublock;
+        c_long ru_msgsnd;
+        c_long ru_msgrcv;
+        c_long ru_nsignals;
+        c_long ru_nvcsw;
+        c_long ru_nivcsw;
+        alias ru_nivcsw ru_last;
+    }
+
+    enum
+    {
+        RLIMIT_CORE   =  4,
+        RLIMIT_CPU    =  0,
+        RLIMIT_DATA   =  2,
+        RLIMIT_FSIZE  =  1,
+        RLIMIT_NOFILE =  8,
+        RLIMIT_STACK  =  3,
+        RLIMIT_AS     = 10,
+    }
+}
 else version (Solaris)
 {
     enum
@@ -405,6 +463,83 @@ else version (CRuntime_Bionic)
         RLIMIT_AS     = 9,
     }
 }
+else version (CRuntime_Musl)
+{
+    alias ulong rlim_t;
+    enum
+    {
+        RLIMIT_CPU    = 0,
+        RLIMIT_FSIZE  = 1,
+        RLIMIT_DATA   = 2,
+        RLIMIT_STACK  = 3,
+        RLIMIT_CORE   = 4,
+        RLIMIT_NOFILE = 7,
+        RLIMIT_AS     = 9,
+    }
+    int getrlimit(int, rlimit*);
+    int setrlimit(int, in rlimit*);
+    alias getrlimit getrlimit64;
+    alias setrlimit setrlimit64;
+}
+else version (CRuntime_UClibc)
+{
+    enum
+    {
+        PRIO_PROCESS = 0,
+        PRIO_PGRP    = 1,
+        PRIO_USER    = 2,
+    }
+
+    static if (__USE_FILE_OFFSET64)
+         alias ulong rlim_t;
+    else
+         alias c_ulong rlim_t;
+
+    static if (__USE_FILE_OFFSET64)
+        enum RLIM_INFINITY = 0xffffffffffffffffUL;
+    else
+        enum RLIM_INFINITY = cast(c_ulong)(~0UL);
+
+    enum RLIM_SAVED_MAX = RLIM_INFINITY;
+    enum RLIM_SAVED_CUR = RLIM_INFINITY;
+
+    enum
+    {
+        RUSAGE_SELF     =  0,
+        RUSAGE_CHILDREN = -1,
+    }
+
+    struct rusage
+    {
+        timeval ru_utime;
+        timeval ru_stime;
+        c_long ru_maxrss;
+        c_long ru_ixrss;
+        c_long ru_idrss;
+        c_long ru_isrss;
+        c_long ru_minflt;
+        c_long ru_majflt;
+        c_long ru_nswap;
+        c_long ru_inblock;
+        c_long ru_oublock;
+        c_long ru_msgsnd;
+        c_long ru_msgrcv;
+        c_long ru_nsignals;
+        c_long ru_nvcsw;
+        c_long ru_nivcsw;
+    }
+
+    enum
+    {
+        RLIMIT_CORE   = 4,
+        RLIMIT_CPU    = 0,
+        RLIMIT_DATA   = 2,
+        RLIMIT_FSIZE  = 1,
+        RLIMIT_NOFILE = 7,
+        RLIMIT_STACK  = 3,
+        RLIMIT_AS     = 9,
+    }
+}
 else static assert (false, "Unsupported platform");
 
 struct rlimit
@@ -423,6 +558,11 @@ else version (FreeBSD)
     int getpriority(int, int);
     int setpriority(int, int, int);
 }
+else version (DragonFlyBSD)
+{
+    int getpriority(int, int);
+    int setpriority(int, int, int);
+}
 else version (CRuntime_Bionic)
 {
     int getpriority(int, int);
@@ -438,6 +578,11 @@ else version (Darwin)
     int getpriority(int, id_t);
     int setpriority(int, id_t, int);
 }
+else version (CRuntime_UClibc)
+{
+    int getpriority(int, id_t);
+    int setpriority(int, id_t, int);
+}
 
 version (CRuntime_Glibc)
 {
@@ -479,9 +624,31 @@ else version (NetBSD)
     int getrusage(int, rusage*);
     int setrlimit(int, in rlimit*);
 }
+else version (DragonFlyBSD)
+{
+    int getrlimit(int, rlimit*);
+    int getrusage(int, rusage*);
+    int setrlimit(int, in rlimit*);
+}
 else version (Solaris)
 {
     int getrlimit(int, rlimit*);
     int getrusage(int, rusage*);
     int setrlimit(int, in rlimit*);
 }
+else version (CRuntime_UClibc)
+{
+    static if (__USE_FILE_OFFSET64)
+    {
+        int getrlimit64(int, rlimit*);
+        int setrlimit64(int, in rlimit*);
+        alias getrlimit = getrlimit64;
+        alias setrlimit = setrlimit64;
+    }
+    else
+    {
+        int getrlimit(int, rlimit*);
+        int setrlimit(int, in rlimit*);
+    }
+    int getrusage(int, rusage*);
+}
diff --git a/libphobos/libdruntime/core/sys/posix/sys/select.d b/libphobos/libdruntime/core/sys/posix/sys/select.d
index 47fe922de..af7d20290 100644
--- a/libphobos/libdruntime/core/sys/posix/sys/select.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/select.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2016.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly, Alex Rønne Petersen
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -270,6 +270,55 @@ else version(NetBSD)
     int pselect(int, fd_set*, fd_set*, fd_set*, in timespec*, in sigset_t*);
     int select(int, fd_set*, fd_set*, fd_set*, timeval*);
 }
+else version( DragonFlyBSD )
+{
+    private
+    {
+        alias c_ulong __fd_mask;
+        enum _NFDBITS = __fd_mask.sizeof * 8;
+    }
+
+    enum uint FD_SETSIZE = 1024;
+
+    struct fd_set
+    {
+        __fd_mask[(FD_SETSIZE + (_NFDBITS - 1)) / _NFDBITS] __fds_bits;
+    }
+
+    extern (D) __fd_mask __fdset_mask(uint n) pure
+    {
+        return cast(__fd_mask) 1 << (n % _NFDBITS);
+    }
+
+    extern (D) void FD_CLR( int n, fd_set* p ) pure
+    {
+        p.__fds_bits[n / _NFDBITS] &= ~__fdset_mask(n);
+    }
+
+    extern (D) bool FD_ISSET( int n, const(fd_set)* p ) pure
+    {
+        return (p.__fds_bits[n / _NFDBITS] & __fdset_mask(n)) != 0;
+    }
+
+    extern (D) void FD_SET( int n, fd_set* p ) pure
+    {
+        p.__fds_bits[n / _NFDBITS] |= __fdset_mask(n);
+    }
+
+    extern (D) void FD_ZERO( fd_set* p ) pure
+    {
+        fd_set *_p;
+        size_t _n;
+
+        _p = p;
+        _n = (FD_SETSIZE + (_NFDBITS - 1)) / _NFDBITS;
+        while (_n > 0)
+            _p.__fds_bits[--_n] = 0;
+    }
+
+    int pselect(int, fd_set*, fd_set*, fd_set*, in timespec*, in sigset_t*);
+    int select(int, fd_set*, fd_set*, fd_set*, timeval*);
+}
 else version (Solaris)
 {
     private
@@ -362,6 +411,101 @@ else version( CRuntime_Bionic )
     int pselect(int, fd_set*, fd_set*, fd_set*, in timespec*, in sigset_t*);
     int select(int, fd_set*, fd_set*, fd_set*, timeval*);
 }
+else version( CRuntime_Musl )
+{
+    enum FD_SETSIZE = 1024;
+
+    alias ulong fd_mask;
+
+    private
+    {
+        enum uint __NFDBITS = 8 * fd_mask.sizeof;
+
+        extern (D) auto __FDELT( int d ) pure
+        {
+            return d / __NFDBITS;
+        }
+
+        extern (D) auto __FDMASK( int d ) pure
+        {
+            return cast(fd_mask) 1 << ( d % __NFDBITS );
+        }
+    }
+
+    struct fd_set {
+        ulong[FD_SETSIZE / 8 / long.sizeof] fds_bits;
+    }
+
+    extern (D) void FD_CLR( int fd, fd_set* fdset ) pure
+    {
+        fdset.fds_bits[__FDELT( fd )] &= ~__FDMASK( fd );
+    }
+
+    extern (D) bool FD_ISSET( int fd, const(fd_set)* fdset ) pure
+    {
+        return (fdset.fds_bits[__FDELT( fd )] & __FDMASK( fd )) != 0;
+    }
+
+    extern (D) void FD_SET( int fd, fd_set* fdset ) pure
+    {
+        fdset.fds_bits[__FDELT( fd )] |= __FDMASK( fd );
+    }
+
+    extern (D) void FD_ZERO( fd_set* fdset ) pure
+    {
+        fdset.fds_bits[0 .. $] = 0;
+    }
+    int pselect(int, fd_set*, fd_set*, fd_set*, in timespec*, in sigset_t*);
+    int select(int, fd_set*, fd_set*, fd_set*, timeval*);
+}
+else version( CRuntime_UClibc )
+{
+    private
+    {
+        alias c_long __fd_mask;
+        enum uint __NFDBITS = 8 * __fd_mask.sizeof;
+
+        extern (D) auto __FDELT( int d ) pure
+        {
+            return d / __NFDBITS;
+        }
+
+        extern (D) auto __FDMASK( int d ) pure
+        {
+            return cast(__fd_mask) 1 << ( d % __NFDBITS );
+        }
+    }
+
+    enum FD_SETSIZE = 1024;
+
+    struct fd_set
+    {
+        __fd_mask[FD_SETSIZE / __NFDBITS] fds_bits;
+    }
+
+    extern (D) void FD_CLR( int fd, fd_set* fdset ) pure
+    {
+        fdset.fds_bits[__FDELT( fd )] &= ~__FDMASK( fd );
+    }
+
+    extern (D) bool FD_ISSET( int fd, const(fd_set)* fdset ) pure
+    {
+        return (fdset.fds_bits[__FDELT( fd )] & __FDMASK( fd )) != 0;
+    }
+
+    extern (D) void FD_SET( int fd, fd_set* fdset ) pure
+    {
+        fdset.fds_bits[__FDELT( fd )] |= __FDMASK( fd );
+    }
+
+    extern (D) void FD_ZERO( fd_set* fdset ) pure
+    {
+        fdset.fds_bits[0 .. $] = 0;
+    }
+
+    int pselect(int, fd_set*, fd_set*, fd_set*, in timespec*, in sigset_t*);
+    int select(int, fd_set*, fd_set*, fd_set*, timeval*);
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/sys/posix/sys/shm.d b/libphobos/libdruntime/core/sys/posix/sys/shm.d
index 3f20acb68..537412634 100644
--- a/libphobos/libdruntime/core/sys/posix/sys/shm.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/shm.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -156,7 +156,96 @@ else version(NetBSD)
     int   shmdt(in void*);
     int   shmget(key_t, size_t, int);
 }
+else version(DragonFlyBSD)
+{
+    enum SHM_RDONLY     = 0x01000; // 010000
+    enum SHM_RND        = 0x02000; // 020000
+    enum SHMLBA         = 1 << 12; // PAGE_SIZE = (1<<PAGE_SHIFT)
+
+    alias c_ulong   shmatt_t;
+
+    struct shmid_ds
+    {
+         ipc_perm       shm_perm;
+         int            shm_segsz;
+         pid_t          shm_lpid;
+         pid_t          shm_cpid;
+         short          shm_nattch;
+         time_t         shm_atime;
+         time_t         shm_dtime;
+         time_t         shm_ctime;
+         private void*  shm_internal;
+    }
+
+    void* shmat(int, in void*, int);
+    int   shmctl(int, int, shmid_ds*);
+    int   shmdt(in void*);
+    int   shmget(key_t, size_t, int);
+}
 else version( Darwin )
 {
 
 }
+else version( CRuntime_UClibc )
+{
+    enum SHM_RDONLY     = 0x1000; // 010000
+    enum SHM_RND        = 0x2000; // 020000
+    enum SHM_REMAP      = 0x4000; // 040000
+
+    int   __getpagesize();
+    alias __getpagesize SHMLBA;
+
+    alias c_ulong   shmatt_t;
+
+    version( X86_64 )
+        enum includeUnused  = false;
+    else version ( MIPS32 )
+        enum includeUnused  = false;
+    else
+        enum includeUnused  = true;
+
+    struct shmid_ds
+    {
+        ipc_perm    shm_perm;
+        size_t      shm_segsz;
+        time_t      shm_atime;
+        static if (includeUnused) c_ulong     __unused1;
+        time_t      shm_dtime;
+        static if (includeUnused) c_ulong     __unused2;
+        time_t      shm_ctime;
+        static if (includeUnused) c_ulong     __unused3;
+        pid_t       shm_cpid;
+        pid_t       shm_lpid;
+        shmatt_t    shm_nattch;
+        c_ulong     __unused4;
+        c_ulong     __unused5;
+    }
+
+    struct shminfo
+    {
+        c_ulong shmmax;
+        c_ulong shmmin;
+        c_ulong shmmni;
+        c_ulong shmseg;
+        c_ulong shmall;
+        c_ulong __unused1;
+        c_ulong __unused2;
+        c_ulong __unused3;
+        c_ulong __unused4;
+    }
+
+    struct shm_info
+    {
+        int used_ids;
+        c_ulong shm_tot;
+        c_ulong shm_rss;
+        c_ulong shm_swp;
+        c_ulong swap_attempts;
+        c_ulong swap_successes;
+    }
+
+    void* shmat(int, in void*, int);
+    int   shmctl(int, int, shmid_ds*);
+    int   shmdt(in void*);
+    int   shmget(key_t, size_t, int);
+}
diff --git a/libphobos/libdruntime/core/sys/posix/sys/socket.d b/libphobos/libdruntime/core/sys/posix/sys/socket.d
index a17e1e60c..2f9f4cc1d 100644
--- a/libphobos/libdruntime/core/sys/posix/sys/socket.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/socket.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly, Alex Rønne Petersen
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -268,6 +268,7 @@ version( CRuntime_Glibc )
             SO_RCVLOWAT     = 18,
             SO_RCVTIMEO     = 20,
             SO_REUSEADDR    = 2,
+            SO_REUSEPORT    = 15,
             SO_SNDBUF       = 7,
             SO_SNDLOWAT     = 19,
             SO_SNDTIMEO     = 21,
@@ -302,6 +303,7 @@ version( CRuntime_Glibc )
             SO_RCVLOWAT     = 18,
             SO_RCVTIMEO     = 20,
             SO_REUSEADDR    = 2,
+            SO_REUSEPORT    = 15,
             SO_SNDBUF       = 7,
             SO_SNDLOWAT     = 19,
             SO_SNDTIMEO     = 21,
@@ -472,6 +474,7 @@ version( CRuntime_Glibc )
             SO_RCVLOWAT     = 18,
             SO_RCVTIMEO     = 20,
             SO_REUSEADDR    = 2,
+            SO_REUSEPORT    = 15,
             SO_SNDBUF       = 7,
             SO_SNDLOWAT     = 19,
             SO_SNDTIMEO     = 21,
@@ -506,6 +509,7 @@ version( CRuntime_Glibc )
             SO_RCVLOWAT     = 18,
             SO_RCVTIMEO     = 20,
             SO_REUSEADDR    = 2,
+            SO_REUSEPORT    = 15,
             SO_SNDBUF       = 7,
             SO_SNDLOWAT     = 19,
             SO_SNDTIMEO     = 21,
@@ -620,24 +624,24 @@ version( CRuntime_Glibc )
         SHUT_RDWR
     }
 
-    int     accept(int, sockaddr*, socklen_t*);
-    int     bind(int, in sockaddr*, socklen_t);
-    int     connect(int, in sockaddr*, socklen_t);
-    int     getpeername(int, sockaddr*, socklen_t*);
-    int     getsockname(int, sockaddr*, socklen_t*);
-    int     getsockopt(int, int, int, void*, socklen_t*);
-    int     listen(int, int);
-    ssize_t recv(int, void*, size_t, int);
-    ssize_t recvfrom(int, void*, size_t, int, sockaddr*, socklen_t*);
-    ssize_t recvmsg(int, msghdr*, int);
-    ssize_t send(int, in void*, size_t, int);
-    ssize_t sendmsg(int, in msghdr*, int);
-    ssize_t sendto(int, in void*, size_t, int, in sockaddr*, socklen_t);
-    int     setsockopt(int, int, int, in void*, socklen_t);
-    int     shutdown(int, int);
-    int     socket(int, int, int);
-    int     sockatmark(int);
-    int     socketpair(int, int, int, ref int[2]);
+    int     accept(int, scope sockaddr*, scope socklen_t*);
+    int     bind(int, const scope sockaddr*, socklen_t);
+    int     connect(int, const scope sockaddr*, socklen_t);
+    int     getpeername(int, scope sockaddr*, scope socklen_t*);
+    int     getsockname(int, scope sockaddr*, scope socklen_t*);
+    int     getsockopt(int, int, int, scope void*, scope socklen_t*);
+    int     listen(int, int) @safe;
+    ssize_t recv(int, scope void*, size_t, int);
+    ssize_t recvfrom(int, scope void*, size_t, int, scope sockaddr*, scope socklen_t*);
+    ssize_t recvmsg(int, scope msghdr*, int);
+    ssize_t send(int, const scope void*, size_t, int);
+    ssize_t sendmsg(int, const scope msghdr*, int);
+    ssize_t sendto(int, const scope void*, size_t, int, const scope sockaddr*, socklen_t);
+    int     setsockopt(int, int, int, const scope void*, socklen_t);
+    int     shutdown(int, int) @safe;
+    int     socket(int, int, int) @safe;
+    int     sockatmark(int) @safe;
+    int     socketpair(int, int, int, ref int[2]) @safe;
 }
 else version( Darwin )
 {
@@ -735,6 +739,7 @@ else version( Darwin )
         SO_RCVLOWAT     = 0x1004,
         SO_RCVTIMEO     = 0x1006,
         SO_REUSEADDR    = 0x0004,
+        SO_REUSEPORT    = 0x0200,
         SO_SNDBUF       = 0x1001,
         SO_SNDLOWAT     = 0x1003,
         SO_SNDTIMEO     = 0x1005,
@@ -775,24 +780,24 @@ else version( Darwin )
         SHUT_RDWR
     }
 
-    int     accept(int, sockaddr*, socklen_t*);
-    int     bind(int, in sockaddr*, socklen_t);
-    int     connect(int, in sockaddr*, socklen_t);
-    int     getpeername(int, sockaddr*, socklen_t*);
-    int     getsockname(int, sockaddr*, socklen_t*);
-    int     getsockopt(int, int, int, void*, socklen_t*);
-    int     listen(int, int);
-    ssize_t recv(int, void*, size_t, int);
-    ssize_t recvfrom(int, void*, size_t, int, sockaddr*, socklen_t*);
-    ssize_t recvmsg(int, msghdr*, int);
-    ssize_t send(int, in void*, size_t, int);
-    ssize_t sendmsg(int, in msghdr*, int);
-    ssize_t sendto(int, in void*, size_t, int, in sockaddr*, socklen_t);
-    int     setsockopt(int, int, int, in void*, socklen_t);
-    int     shutdown(int, int);
-    int     socket(int, int, int);
-    int     sockatmark(int);
-    int     socketpair(int, int, int, ref int[2]);
+    int     accept(int, scope sockaddr*, scope socklen_t*);
+    int     bind(int, const scope sockaddr*, socklen_t);
+    int     connect(int, const scope sockaddr*, socklen_t);
+    int     getpeername(int, scope sockaddr*, scope socklen_t*);
+    int     getsockname(int, scope sockaddr*, scope socklen_t*);
+    int     getsockopt(int, int, int, scope void*, scope socklen_t*);
+    int     listen(int, int) @safe;
+    ssize_t recv(int, scope void*, size_t, int);
+    ssize_t recvfrom(int, scope void*, size_t, int, scope sockaddr*, scope socklen_t*);
+    ssize_t recvmsg(int, scope msghdr*, int);
+    ssize_t send(int, const scope void*, size_t, int);
+    ssize_t sendmsg(int, const scope msghdr*, int);
+    ssize_t sendto(int, const scope void*, size_t, int, const scope sockaddr*, socklen_t);
+    int     setsockopt(int, int, int, const scope void*, socklen_t);
+    int     shutdown(int, int) @safe;
+    int     socket(int, int, int) @safe;
+    int     sockatmark(int) @safe;
+    int     socketpair(int, int, int, ref int[2]) @safe;
 }
 else version( FreeBSD )
 {
@@ -912,6 +917,7 @@ else version( FreeBSD )
         SO_RCVLOWAT     = 0x1004,
         SO_RCVTIMEO     = 0x1006,
         SO_REUSEADDR    = 0x0004,
+        SO_REUSEPORT    = 0x0200,
         SO_SNDBUF       = 0x1001,
         SO_SNDLOWAT     = 0x1003,
         SO_SNDTIMEO     = 0x1005,
@@ -951,24 +957,24 @@ else version( FreeBSD )
         SHUT_RDWR = 2
     }
 
-    int     accept(int, sockaddr*, socklen_t*);
-    int     bind(int, in sockaddr*, socklen_t);
-    int     connect(int, in sockaddr*, socklen_t);
-    int     getpeername(int, sockaddr*, socklen_t*);
-    int     getsockname(int, sockaddr*, socklen_t*);
-    int     getsockopt(int, int, int, void*, socklen_t*);
-    int     listen(int, int);
-    ssize_t recv(int, void*, size_t, int);
-    ssize_t recvfrom(int, void*, size_t, int, sockaddr*, socklen_t*);
-    ssize_t recvmsg(int, msghdr*, int);
-    ssize_t send(int, in void*, size_t, int);
-    ssize_t sendmsg(int, in msghdr*, int);
-    ssize_t sendto(int, in void*, size_t, int, in sockaddr*, socklen_t);
-    int     setsockopt(int, int, int, in void*, socklen_t);
-    int     shutdown(int, int);
-    int     socket(int, int, int);
-    int     sockatmark(int);
-    int     socketpair(int, int, int, ref int[2]);
+    int     accept(int, scope sockaddr*, scope socklen_t*);
+    int     bind(int, const scope sockaddr*, socklen_t);
+    int     connect(int, const scope sockaddr*, socklen_t);
+    int     getpeername(int, scope sockaddr*, scope socklen_t*);
+    int     getsockname(int, scope sockaddr*, scope socklen_t*);
+    int     getsockopt(int, int, int, scope void*, scope socklen_t*);
+    int     listen(int, int) @safe;
+    ssize_t recv(int, scope void*, size_t, int);
+    ssize_t recvfrom(int, scope void*, size_t, int, scope sockaddr*, scope socklen_t*);
+    ssize_t recvmsg(int, scope msghdr*, int);
+    ssize_t send(int, const scope void*, size_t, int);
+    ssize_t sendmsg(int, const scope msghdr*, int);
+    ssize_t sendto(int, const scope void*, size_t, int, const scope sockaddr*, socklen_t);
+    int     setsockopt(int, int, int, const scope void*, socklen_t);
+    int     shutdown(int, int) @safe;
+    int     socket(int, int, int) @safe;
+    int     sockatmark(int) @safe;
+    int     socketpair(int, int, int, ref int[2]) @safe;
 }
 else version(NetBSD)
 {
@@ -1148,9 +1154,310 @@ else version(NetBSD)
         SHUT_RDWR = 2
     }
 
+    int     accept(int, scope sockaddr*, scope socklen_t*);
+    int     bind(int, const scope sockaddr*, socklen_t);
+    int     connect(int, const scope sockaddr*, socklen_t);
+    int     getpeername(int, scope sockaddr*, scope socklen_t*);
+    int     getsockname(int, scope sockaddr*, scope socklen_t*);
+    int     getsockopt(int, int, int, scope void*, scope socklen_t*);
+    int     listen(int, int) @safe;
+    ssize_t recv(int, scope void*, size_t, int);
+    ssize_t recvfrom(int, scope void*, size_t, int, scope sockaddr*, scope socklen_t*);
+    ssize_t recvmsg(int, scope msghdr*, int);
+    ssize_t send(int, const scope void*, size_t, int);
+    ssize_t sendmsg(int, const scope msghdr*, int);
+    ssize_t sendto(int, const scope void*, size_t, int, const scope sockaddr*, socklen_t);
+    int     setsockopt(int, int, int, const scope void*, socklen_t);
+    int     shutdown(int, int) @safe;
+    int     socket(int, int, int) @safe;
+    int     sockatmark(int) @safe;
+    int     socketpair(int, int, int, ref int[2]) @safe;
+}
+else version( DragonFlyBSD )
+{
+    alias uint   socklen_t;
+    alias ubyte  sa_family_t;
+
+    enum
+    {
+        SOCK_STREAM         = 1,
+        SOCK_DGRAM          = 2,
+        //SOCK_RAW          = 3,      // defined below
+        SOCK_RDM            = 4,
+        SOCK_SEQPACKET      = 5,
+    }
+
+    enum SOCK_CLOEXEC       = 0x10000000;
+    enum SOCK_NONBLOCK      = 0x20000000;
+
+    enum : uint
+    {
+        SO_DEBUG            = 0x0001,
+        SO_ACCEPTCONN       = 0x0002,
+        SO_REUSEADDR        = 0x0004,
+        SO_KEEPALIVE        = 0x0008,
+        SO_DONTROUTE        = 0x0010,
+        SO_BROADCAST        = 0x0020,
+        SO_USELOOPBACK      = 0x0040,
+        SO_LINGER           = 0x0080,
+        SO_OOBINLINE        = 0x0100,
+        SO_REUSEPORT        = 0x0200,
+        SO_TIMESTAMP        = 0x0400,
+        SO_NOSIGPIPE        = 0x0800, // non-standard
+        SO_ACCEPTFILTER     = 0x1000,
+
+        SO_SNDBUF           = 0x1001,
+        SO_RCVBUF           = 0x1002,
+        SO_SNDLOWAT         = 0x1003,
+        SO_RCVLOWAT         = 0x1004,
+        SO_SNDTIMEO         = 0x1005,
+        SO_RCVTIMEO         = 0x1006,
+        SO_ERROR            = 0x1007,
+        SO_TYPE             = 0x1008,
+        SO_SNDSPACE         = 0x100a, // get appr. send buffer free space
+        SO_CPUHINT          = 0x1030, // get socket's owner cpuid hint
+    }
+
+    struct linger
+    {
+        int l_onoff;
+        int l_linger;
+    }
+
+    struct  accept_filter_arg {
+        byte[16] af_name;
+        byte[256-16] af_arg;
+    }
+
+    enum : uint
+    {
+        SOL_SOCKET          = 0xffff
+    }
+
+    enum
+    {
+        AF_UNSPEC           = 0,
+        AF_LOCAL            = 1,
+        AF_UNIX             = AF_LOCAL,
+        AF_INET             = 2,
+        AF_IMPLINK          = 3,
+        AF_PUP              = 4,
+        AF_CHAOS            = 5,
+        AF_NETBIOS          = 6,
+        AF_ISO              = 7,
+        AF_OSI              = AF_ISO,
+        AF_ECMA             = 8,
+        AF_DATAKIT          = 9,
+        AF_CCITT            = 10,
+        AF_SNA              = 11,
+        AF_DECnet           = 12,
+        AF_DLI              = 13,
+        AF_LAT              = 14,
+        AF_HYLINK           = 15,
+        AF_APPLETALK        = 16,
+        AF_ROUTE            = 17,
+        AF_LINK             = 18,
+        pseudo_AF_XTP       = 19,
+        AF_COIP             = 20,
+        AF_CNT              = 21,
+        pseudo_AF_RTIP      = 22,
+        AF_IPX              = 23,
+        AF_SIP              = 24,
+        pseudo_AF_PIP       = 25,
+        AF_ISDN             = 26,
+        AF_E164             = AF_ISDN,
+        pseudo_AF_KEY       = 27,
+        //AF_INET6            = 28,   // defined below
+        AF_NATM             = 29,
+        AF_ATM              = 30,
+        pseudo_AF_HDRCMPLT  = 31,
+        AF_NETGRAPH         = 32,
+        AF_BLUETOOTH        = 33,
+        AF_MPLS             = 34,
+        AF_IEEE80211        = 35,
+    }
+
+    struct sockaddr
+    {
+        ubyte               sa_len;
+        sa_family_t         sa_family;
+        byte[14]            sa_data;
+    }
+
+    enum SOCK_MAXADDRLEN = 255;
+
+    struct sockproto {
+        ushort              sp_family;
+        ushort              sp_protocol;
+    }
+
+    private
+    {
+        enum _SS_ALIGNSIZE  = long.sizeof;
+        enum _SS_MAXSIZE    = 128;
+        enum _SS_PAD1SIZE   = _SS_ALIGNSIZE - ubyte.sizeof - sa_family_t.sizeof;
+        enum _SS_PAD2SIZE   = _SS_MAXSIZE - ubyte.sizeof - sa_family_t.sizeof - _SS_PAD1SIZE - _SS_ALIGNSIZE;
+    }
+
+    struct sockaddr_storage
+    {
+        ubyte              ss_len;
+        sa_family_t        ss_family;
+        byte[_SS_PAD1SIZE] __ss_pad1;
+        long               __ss_align;
+        byte[_SS_PAD2SIZE] __ss_pad2;
+    }
+
+    /* protocol families */
+    enum PF_UNSPEC          = AF_UNSPEC;
+    enum PF_LOCAL           = AF_LOCAL;
+    enum PF_UNIX            = PF_LOCAL;
+    enum PF_INET            = AF_INET;
+    enum PF_IMPLINK         = AF_IMPLINK;
+    enum PF_PUP             = AF_PUP;
+    enum PF_CHAOS           = AF_CHAOS;
+    enum PF_NETBIOS         = AF_NETBIOS;
+    enum PF_ISO             = AF_ISO;
+    enum PF_OSI             = AF_ISO;
+    enum PF_ECMA            = AF_ECMA;
+    enum PF_DATAKIT         = AF_DATAKIT;
+    enum PF_CCITT           = AF_CCITT;
+    enum PF_SNA             = AF_SNA;
+    enum PF_DECnet          = AF_DECnet;
+    enum PF_DLI             = AF_DLI;
+    enum PF_LAT             = AF_LAT;
+    enum PF_HYLINK          = AF_HYLINK;
+    enum PF_APPLETALK       = AF_APPLETALK;
+    enum PF_ROUTE           = AF_ROUTE;
+    enum PF_LINK            = AF_LINK;
+    enum PF_XTP             = pseudo_AF_XTP;
+    enum PF_COIP            = AF_COIP;
+    enum PF_CNT             = AF_CNT;
+    enum PF_SIP             = AF_SIP;
+    enum PF_IPX             = AF_IPX;
+    enum PF_RTIP            = pseudo_AF_RTIP;
+    enum PF_PIP             = pseudo_AF_PIP;
+    enum PF_ISDN            = AF_ISDN;
+    enum PF_KEY             = pseudo_AF_KEY;
+    enum PF_INET6           = AF_INET6;
+    enum PF_NATM            = AF_NATM;
+    enum PF_ATM             = AF_ATM;
+    enum PF_NETGRAPH        = AF_NETGRAPH;
+    enum PF_BLUETOOTH       = AF_BLUETOOTH;
+
+    struct msghdr
+    {
+        void*               msg_name;
+        socklen_t           msg_namelen;
+        iovec*              msg_iov;
+        int                 msg_iovlen;
+        void*               msg_control;
+        socklen_t           msg_controllen;
+        int                 msg_flags;
+    }
+
+    enum SOMAXCONN          = 128;
+    enum SOMAXOPT_SIZE      = 65536;
+    enum SOMAXOPT_SIZE0     = (32 * 1024 * 1024);
+
+    enum : uint
+    {
+        MSG_OOB             = 0x00000001,
+        MSG_PEEK            = 0x00000002,
+        MSG_DONTROUTE       = 0x00000004,
+        MSG_EOR             = 0x00000008,
+        MSG_TRUNC           = 0x00000010,
+        MSG_CTRUNC          = 0x00000020,
+        MSG_WAITALL         = 0x00000040,
+        MSG_DONTWAIT        = 0x00000080,
+        MSG_EOF             = 0x00000100,
+        MSG_UNUSED09        = 0x00000200,
+        MSG_NOSIGNAL        = 0x00000400,
+        MSG_SYNC            = 0x00000800,
+        MSG_CMSG_CLOEXEC    = 0x00001000,
+        /* These override FIONBIO.  MSG_FNONBLOCKING is functionally equivalent to MSG_DONTWAIT.*/
+        MSG_FBLOCKING       = 0x00010000,
+        MSG_FNONBLOCKING    = 0x00020000,
+        MSG_FMASK           = 0xFFFF0000,
+    }
+
+    struct cmsghdr
+    {
+         socklen_t          cmsg_len;
+         int                cmsg_level;
+         int                cmsg_type;
+    }
+
+    enum CMGROUP_MAX        = 16;
+
+    struct cmsgcred {
+            pid_t           cmcred_pid;
+            uid_t           cmcred_uid;
+            uid_t           cmcred_euid;
+            gid_t           cmcred_gid;
+            short           cmcred_ngroups;
+            gid_t[CMGROUP_MAX] cmcred_groups;
+    };
+
+    enum : uint
+    {
+        SCM_RIGHTS = 0x01
+    }
+
+    private // <machine/param.h>
+    {
+        enum _ALIGNBYTES = /+c_int+/ int.sizeof - 1;
+        extern (D) size_t _ALIGN( size_t p ) { return (p + _ALIGNBYTES) & ~_ALIGNBYTES; }
+    }
+
+    extern (D) ubyte* CMSG_DATA( cmsghdr* cmsg )
+    {
+        return cast(ubyte*) cmsg + _ALIGN( cmsghdr.sizeof );
+    }
+
+    extern (D) cmsghdr* CMSG_NXTHDR( msghdr* mhdr, cmsghdr* cmsg )
+    {
+        if( cmsg == null )
+        {
+           return CMSG_FIRSTHDR( mhdr );
+        }
+        else
+        {
+            if( cast(ubyte*) cmsg + _ALIGN( cmsg.cmsg_len ) + _ALIGN( cmsghdr.sizeof ) >
+                    cast(ubyte*) mhdr.msg_control + mhdr.msg_controllen )
+                return null;
+            else
+                return cast(cmsghdr*) (cast(ubyte*) cmsg + _ALIGN( cmsg.cmsg_len ));
+        }
+    }
+
+    extern (D) cmsghdr* CMSG_FIRSTHDR( msghdr* mhdr )
+    {
+        return mhdr.msg_controllen >= cmsghdr.sizeof ? cast(cmsghdr*) mhdr.msg_control : null;
+    }
+
+    enum
+    {
+        SHUT_RD             = 0,
+        SHUT_WR             = 1,
+        SHUT_RDWR           = 2
+    }
+
+/*
+    /+ sendfile(2) header/trailer struct +/
+    struct sf_hdtr {
+        iovec *             headers;
+        int                 hdr_cnt;
+        iovec *             trailers;
+        int                 trl_cnt;
+    };
+*/
+
     int     accept(int, sockaddr*, socklen_t*);
+//    int     accept4(int, sockaddr*, socklen_t*, int);
     int     bind(int, in sockaddr*, socklen_t);
     int     connect(int, in sockaddr*, socklen_t);
+//    int     extconnect(int, int, sockaddr*, socklen_t);
     int     getpeername(int, sockaddr*, socklen_t*);
     int     getsockname(int, sockaddr*, socklen_t*);
     int     getsockopt(int, int, int, void*, socklen_t*);
@@ -1159,13 +1466,15 @@ else version(NetBSD)
     ssize_t recvfrom(int, void*, size_t, int, sockaddr*, socklen_t*);
     ssize_t recvmsg(int, msghdr*, int);
     ssize_t send(int, in void*, size_t, int);
-    ssize_t sendmsg(int, in msghdr*, int);
     ssize_t sendto(int, in void*, size_t, int, in sockaddr*, socklen_t);
+    ssize_t sendmsg(int, in msghdr*, int);
+//    int     sendfile(int, int, off_t, size_t, sf_hdtr *, off_t *, int);
     int     setsockopt(int, int, int, in void*, socklen_t);
     int     shutdown(int, int);
-    int     socket(int, int, int);
     int     sockatmark(int);
+    int     socket(int, int, int);
     int     socketpair(int, int, int, ref int[2]);
+//  void    pfctlinput(int, struct sockaddr *);
 }
 else version (Solaris)
 {
@@ -1296,24 +1605,24 @@ else version (Solaris)
         SHUT_RDWR
     }
 
-    int accept(int, sockaddr*, socklen_t*);
-    int bind(int, in sockaddr*, socklen_t);
-    int connect(int, in sockaddr*, socklen_t);
-    int getpeername(int, sockaddr*, socklen_t*);
-    int getsockname(int, sockaddr*, socklen_t*);
-    int getsockopt(int, int, int, void*, socklen_t*);
-    int listen(int, int);
-    ssize_t recv(int, void*, size_t, int);
-    ssize_t recvfrom(int, void*, size_t, int, sockaddr*, socklen_t*);
-    ssize_t recvmsg(int, msghdr*, int);
-    ssize_t send(int, in void*, size_t, int);
-    ssize_t sendmsg(int, in msghdr*, int);
-    ssize_t sendto(int, in void*, size_t, int, in sockaddr*, socklen_t);
-    int setsockopt(int, int, int, in void*, socklen_t);
-    int shutdown(int, int);
-    int socket(int, int, int);
-    int sockatmark(int);
-    int socketpair(int, int, int, ref int[2]);
+    int     accept(int, scope sockaddr*, scope socklen_t*);
+    int     bind(int, const scope sockaddr*, socklen_t);
+    int     connect(int, const scope sockaddr*, socklen_t);
+    int     getpeername(int, scope sockaddr*, scope socklen_t*);
+    int     getsockname(int, scope sockaddr*, scope socklen_t*);
+    int     getsockopt(int, int, int, scope void*, scope socklen_t*);
+    int     listen(int, int) @safe;
+    ssize_t recv(int, scope void*, size_t, int);
+    ssize_t recvfrom(int, scope void*, size_t, int, scope sockaddr*, scope socklen_t*);
+    ssize_t recvmsg(int, scope msghdr*, int);
+    ssize_t send(int, const scope void*, size_t, int);
+    ssize_t sendmsg(int, const scope msghdr*, int);
+    ssize_t sendto(int, const scope void*, size_t, int, const scope sockaddr*, socklen_t);
+    int     setsockopt(int, int, int, const scope void*, socklen_t);
+    int     shutdown(int, int) @safe;
+    int     socket(int, int, int) @safe;
+    int     sockatmark(int) @safe;
+    int     socketpair(int, int, int, ref int[2]) @safe;
 }
 else version( CRuntime_Bionic )
 {
@@ -1461,6 +1770,42 @@ else version( CRuntime_Bionic )
             SO_TYPE         = 3
         }
     }
+    else version (AArch64)
+    {
+        alias ulong __kernel_size_t;
+
+        enum
+        {
+            SOCK_DGRAM      = 2,
+            SOCK_SEQPACKET  = 5,
+            SOCK_STREAM     = 1
+        }
+
+        enum
+        {
+            SOL_SOCKET      = 1
+        }
+
+        enum
+        {
+            SO_ACCEPTCONN   = 30,
+            SO_BROADCAST    = 6,
+            SO_DEBUG        = 1,
+            SO_DONTROUTE    = 5,
+            SO_ERROR        = 4,
+            SO_KEEPALIVE    = 9,
+            SO_LINGER       = 13,
+            SO_OOBINLINE    = 10,
+            SO_RCVBUF       = 8,
+            SO_RCVLOWAT     = 18,
+            SO_RCVTIMEO     = 20,
+            SO_REUSEADDR    = 2,
+            SO_SNDBUF       = 7,
+            SO_SNDLOWAT     = 19,
+            SO_SNDTIMEO     = 21,
+            SO_TYPE         = 3
+        }
+    }
     else
     {
         static assert(false, "Architecture not supported.");
@@ -1500,22 +1845,337 @@ else version( CRuntime_Bionic )
 
     enum SOCK_RDM = 4;
 
+    int     accept(int, scope sockaddr*, scope socklen_t*);
+    int     bind(int, const scope sockaddr*, socklen_t);
+    int     connect(int, const scope sockaddr*, socklen_t);
+    int     getpeername(int, scope sockaddr*, scope socklen_t*);
+    int     getsockname(int, scope sockaddr*, scope socklen_t*);
+    int     getsockopt(int, int, int, scope void*, scope socklen_t*);
+    int     listen(int, int) @safe;
+    ssize_t recv(int, scope void*, size_t, int);
+    ssize_t recvfrom(int, scope void*, size_t, int, scope sockaddr*, scope socklen_t*);
+    int     recvmsg(int, scope msghdr*, int);
+    ssize_t send(int, const scope void*, size_t, int);
+    int     sendmsg(int, const scope msghdr*, int);
+    ssize_t sendto(int, const scope void*, size_t, int, const scope sockaddr*, socklen_t);
+    int     setsockopt(int, int, int, const scope void*, socklen_t);
+    int     shutdown(int, int) @safe;
+    int     socket(int, int, int) @safe;
+    int     sockatmark(int) @safe;
+    int     socketpair(int, int, int, ref int[2]) @safe;
+}
+else version( CRuntime_Musl )
+{
+    alias uint socklen_t;
+    alias ushort sa_family_t;
+
+    struct sockaddr
+    {
+        sa_family_t sa_family;
+        byte[14]    sa_data;
+    }
+
+    private enum : size_t
+    {
+        _SS_SIZE    = 128,
+        _SS_PADSIZE = _SS_SIZE - c_ulong.sizeof - sa_family_t.sizeof
+    }
+
+    struct sockaddr_storage
+    {
+        sa_family_t ss_family;
+        byte[_SS_PADSIZE] __ss_padding;
+        c_ulong     __ss_align;
+    }
+
+    enum {
+        SOCK_STREAM = 1,
+        SOCK_DGRAM = 2,
+        SOCK_RAW = 3,
+        SOCK_RDM = 4,
+        SOCK_SEQPACKET = 5,
+        SOCK_DCCP = 6,
+        SOCK_PACKET = 10
+    }
+    enum
+    {
+        AF_UNSPEC       = 0,
+        AF_LOCAL        = 1,
+        AF_UNIX         = AF_LOCAL,
+        AF_FILE         = AF_LOCAL,
+        AF_INET         = 2,
+        AF_AX25         = 3,
+        AF_IPX          = 4,
+        AF_APPLETALK    = 5,
+        PF_APPLETALK    = AF_APPLETALK,
+        PF_IPX          = AF_IPX
+    }
+
+    enum
+    {
+        SHUT_RD,
+        SHUT_WR,
+        SHUT_RDWR
+    }
+
+    enum
+    {
+        SOL_SOCKET      = 1
+    }
+
+    enum
+    {
+        SO_DEBUG        = 1,
+        SO_REUSEADDR    = 2,
+        SO_TYPE         = 3,
+        SO_ERROR        = 4,
+        SO_DONTROUTE    = 5,
+        SO_BROADCAST    = 6,
+        SO_SNDBUF       = 7,
+        SO_RCVBUF       = 8,
+        SO_KEEPALIVE    = 9,
+        SO_OOBINLINE    = 10,
+        SO_LINGER       = 13,
+        SO_RCVLOWAT     = 18,
+        SO_SNDLOWAT     = 19,
+        SO_RCVTIMEO     = 20,
+        SO_SNDTIMEO     = 21,
+        SO_ACCEPTCONN   = 30
+    }
+
+    enum : uint
+    {
+        MSG_OOB         = 0x01,
+        MSG_PEEK        = 0x02,
+        MSG_DONTROUTE   = 0x04,
+        MSG_CTRUNC      = 0x08,
+        MSG_TRUNC       = 0x20,
+        MSG_EOR         = 0x80,
+        MSG_WAITALL     = 0x100,
+        MSG_NOSIGNAL    = 0x4000
+    }
+
+    struct linger
+    {
+        int l_onoff;
+        int l_linger;
+    }
+    struct msghdr {
+        void *msg_name;
+        socklen_t msg_namelen;
+        iovec *msg_iov;
+        int msg_iovlen, __pad1;
+        void *msg_control;
+        socklen_t msg_controllen, __pad2;
+        int msg_flags;
+    }
     int     accept(int, sockaddr*, socklen_t*);
-    int     bind(int, in sockaddr*, int);
+    int     bind(int, in sockaddr*, socklen_t);
     int     connect(int, in sockaddr*, socklen_t);
     int     getpeername(int, sockaddr*, socklen_t*);
     int     getsockname(int, sockaddr*, socklen_t*);
     int     getsockopt(int, int, int, void*, socklen_t*);
     int     listen(int, int);
-    ssize_t recv(int, void*, size_t, uint);
-    ssize_t recvfrom(int, void*, size_t, uint, in sockaddr*, socklen_t*);
-    int     recvmsg(int, msghdr*, uint);
-    ssize_t send(int, in void*, size_t, uint);
-    int     sendmsg(int, in msghdr*, uint);
+    ssize_t recv(int, void*, size_t, int);
+    ssize_t recvfrom(int, void*, size_t, int, sockaddr*, socklen_t*);
+    ssize_t recvmsg(int, msghdr*, int);
+    ssize_t send(int, in void*, size_t, int);
+    ssize_t sendmsg(int, in msghdr*, int);
     ssize_t sendto(int, in void*, size_t, int, in sockaddr*, socklen_t);
     int     setsockopt(int, int, int, in void*, socklen_t);
     int     shutdown(int, int);
     int     socket(int, int, int);
+    int     sockatmark(int);
+    int     socketpair(int, int, int, ref int[2]);
+}
+else version( CRuntime_UClibc )
+{
+    alias uint   socklen_t;
+    alias ushort sa_family_t;
+
+    struct sockaddr
+    {
+        sa_family_t sa_family;
+        byte[14]    sa_data;
+    }
+
+    private enum : size_t
+    {
+        _SS_SIZE    = 128,
+        _SS_PADSIZE = _SS_SIZE - (c_ulong.sizeof * 2)
+    }
+
+    struct sockaddr_storage
+    {
+        sa_family_t ss_family;
+        c_ulong     __ss_align;
+        byte[_SS_PADSIZE] __ss_padding;
+    }
+
+    struct msghdr
+    {
+        void*     msg_name;
+        socklen_t msg_namelen;
+        iovec*    msg_iov;
+        size_t    msg_iovlen;
+        void*     msg_control;
+        size_t    msg_controllen;
+        int       msg_flags;
+    }
+
+    struct cmsghdr
+    {
+        size_t cmsg_len;
+        int    cmsg_level;
+        int    cmsg_type;
+    }
+
+    enum : uint
+    {
+        SCM_RIGHTS = 0x01
+    }
+
+    extern (D) inout(ubyte)*   CMSG_DATA( inout(cmsghdr)* cmsg ) pure nothrow @nogc { return cast(ubyte*)( cmsg + 1 ); }
+
+    private inout(cmsghdr)* __cmsg_nxthdr(inout(msghdr)*, inout(cmsghdr)*) pure nothrow @nogc;
+    extern (D)  inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
+    {
+        return __cmsg_nxthdr(msg, cmsg);
+    }
+
+    extern (D) inout(cmsghdr)* CMSG_FIRSTHDR( inout(msghdr)* mhdr ) pure nothrow @nogc
+    {
+        return ( cast(size_t)mhdr.msg_controllen >= cmsghdr.sizeof
+                             ? cast(inout(cmsghdr)*) mhdr.msg_control
+                             : cast(inout(cmsghdr)*) null );
+    }
+
+    extern (D)
+    {
+        size_t CMSG_ALIGN( size_t len ) pure nothrow @nogc
+        {
+            return (len + size_t.sizeof - 1) & cast(size_t) (~(size_t.sizeof - 1));
+        }
+
+        size_t CMSG_LEN( size_t len ) pure nothrow @nogc
+        {
+            return CMSG_ALIGN(cmsghdr.sizeof) + len;
+        }
+    }
+
+    extern (D) size_t CMSG_SPACE(size_t len) pure nothrow @nogc
+    {
+        return CMSG_ALIGN(len) + CMSG_ALIGN(cmsghdr.sizeof);
+    }
+
+    struct linger
+    {
+        int l_onoff;
+        int l_linger;
+    }
+
+    version (X86_64)
+    {
+        enum
+        {
+            SOCK_DGRAM      = 2,
+            SOCK_SEQPACKET  = 5,
+            SOCK_STREAM     = 1
+        }
+    }
+    else version (MIPS32)
+    {
+        enum
+        {
+            SOCK_DGRAM      = 1,
+            SOCK_SEQPACKET  = 5,
+            SOCK_STREAM     = 2,
+        }
+    }
+    else version (ARM)
+    {
+        enum
+        {
+            SOCK_DGRAM      = 2,
+            SOCK_SEQPACKET  = 5,
+            SOCK_STREAM     = 1
+        }
+    }
+    else
+        static assert(0, "unimplemented");
+
+    enum
+    {
+        SO_ACCEPTCONN   = 30,
+        SO_BROADCAST    = 6,
+        SO_DEBUG        = 1,
+        SO_DONTROUTE    = 5,
+        SO_ERROR        = 4,
+        SO_KEEPALIVE    = 9,
+        SO_LINGER       = 13,
+        SO_OOBINLINE    = 10,
+        SO_RCVBUF       = 8,
+        SO_RCVLOWAT     = 18,
+        SO_RCVTIMEO     = 20,
+        SO_REUSEADDR    = 2,
+        SO_SNDBUF       = 7,
+        SO_SNDLOWAT     = 19,
+        SO_SNDTIMEO     = 21,
+        SO_TYPE         = 3,
+
+        SOL_SOCKET      = 1,
+        SOMAXCONN       = 128
+    }
+
+    enum : uint
+    {
+        MSG_CTRUNC      = 0x08,
+        MSG_DONTROUTE   = 0x04,
+        MSG_EOR         = 0x80,
+        MSG_OOB         = 0x01,
+        MSG_PEEK        = 0x02,
+        MSG_TRUNC       = 0x20,
+        MSG_WAITALL     = 0x100,
+        MSG_NOSIGNAL    = 0x4000
+    }
+
+    enum
+    {
+        AF_APPLETALK    = 5,
+        AF_INET         = 2,
+        AF_IPX          = 4,
+        AF_UNIX         = 1,
+        AF_UNSPEC       = 0,
+        PF_APPLETALK    = AF_APPLETALK,
+        PF_IPX          = AF_IPX
+    }
+
+    enum int SOCK_RDM   = 4;
+
+    enum
+    {
+        SHUT_RD,
+        SHUT_WR,
+        SHUT_RDWR
+    }
+
+    int     accept(int, sockaddr*, socklen_t*);
+    int     bind(int, in sockaddr*, socklen_t);
+    int     connect(int, in sockaddr*, socklen_t);
+    int     getpeername(int, sockaddr*, socklen_t*);
+    int     getsockname(int, sockaddr*, socklen_t*);
+    int     getsockopt(int, int, int, void*, socklen_t*);
+    int     listen(int, int);
+    ssize_t recv(int, void*, size_t, int);
+    ssize_t recvfrom(int, void*, size_t, int, sockaddr*, socklen_t*);
+    ssize_t recvmsg(int, msghdr*, int);
+    ssize_t send(int, in void*, size_t, int);
+    ssize_t sendmsg(int, in msghdr*, int);
+    ssize_t sendto(int, in void*, size_t, int, in sockaddr*, socklen_t);
+    int     setsockopt(int, int, int, in void*, socklen_t);
+    int     shutdown(int, int);
+    int     socket(int, int, int);
+    int     sockatmark(int);
     int     socketpair(int, int, int, ref int[2]);
 }
 else
@@ -1558,6 +2218,13 @@ else version(NetBSD)
         AF_INET6    = 24
     }
 }
+else version( DragonFlyBSD )
+{
+    enum
+    {
+        AF_INET6    = 28
+    }
+}
 else version (Solaris)
 {
     enum
@@ -1572,6 +2239,17 @@ else version( CRuntime_Bionic )
         AF_INET6    = 10
     }
 }
+else version( CRuntime_Musl )
+{
+    enum AF_INET6 = 10;
+}
+else version( CRuntime_UClibc )
+{
+    enum
+    {
+        AF_INET6    = 10
+    }
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -1612,6 +2290,13 @@ else version(NetBSD)
         SOCK_RAW    = 3
     }
 }
+else version( DragonFlyBSD )
+{
+    enum
+    {
+        SOCK_RAW    = 3
+    }
+}
 else version (Solaris)
 {
     enum
@@ -1626,6 +2311,16 @@ else version( CRuntime_Bionic )
         SOCK_RAW    = 3
     }
 }
+else version( CRuntime_Musl )
+{
+}
+else version( CRuntime_UClibc )
+{
+    enum
+    {
+        SOCK_RAW    = 3
+    }
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/sys/posix/sys/stat.d b/libphobos/libdruntime/core/sys/posix/sys/stat.d
index 40f2a53ee..067a79a06 100644
--- a/libphobos/libdruntime/core/sys/posix/sys/stat.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/stat.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly, Alex Rønne Petersen
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -584,7 +584,7 @@ version( CRuntime_Glibc )
                 __blkcnt64_t st_blocks;
             }
 
-            static if( __USE_MISC || __USE_XOPEN2K8)
+            static if(__USE_XOPEN2K8)
             {
                 __timespec st_atim;
                 __timespec st_mtim;
@@ -804,6 +804,8 @@ else version( Darwin )
 }
 else version( FreeBSD )
 {
+    // https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h
+
     struct stat_t
     {
         dev_t       st_dev;
@@ -942,6 +944,68 @@ else version(NetBSD)
     extern (D) bool S_ISLNK( mode_t mode )  { return S_ISTYPE( mode, S_IFLNK );  }
     extern (D) bool S_ISSOCK( mode_t mode ) { return S_ISTYPE( mode, S_IFSOCK ); }
 }
+else version( DragonFlyBSD )
+{
+    struct stat_t {
+            ino_t     st_ino;               /* inode's number */
+            nlink_t   st_nlink;             /* number of hard links */
+            dev_t     st_dev;               /* inode's device */
+            mode_t    st_mode;              /* inode protection mode */
+            uint16_t  st_padding1;
+            uid_t     st_uid;               /* user ID of the file's owner */
+            gid_t     st_gid;               /* group ID of the file's group */
+            dev_t     st_rdev;              /* device type */
+            time_t      st_atime;
+            c_long      __st_atimensec;
+            time_t      st_mtime;
+            c_long      __st_mtimensec;
+            time_t      st_ctime;
+            c_long      __st_ctimensec;
+            off_t     st_size;              /* file size, in bytes */
+            int64_t   st_blocks;            /* blocks allocated for file */
+            uint32_t  st_blksize;           /* optimal blocksize for I/O */
+            uint32_t  st_flags;             /* user defined flags for file */
+            uint32_t  st_gen;               /* file generation number */
+            int32_t   st_lspare;
+            int64_t   st_qspare1;           /* was recursive change detect */
+            int64_t   st_qspare2;
+    };
+
+    enum S_IRUSR    = 0x100; // octal 0000400
+    enum S_IWUSR    = 0x080; // octal 0000200
+    enum S_IXUSR    = 0x040; // octal 0000100
+    enum S_IRWXU    = 0x1C0; // octal 0000700
+
+    enum S_IRGRP    = 0x020;  // octal 0000040
+    enum S_IWGRP    = 0x010;  // octal 0000020
+    enum S_IXGRP    = 0x008;  // octal 0000010
+    enum S_IRWXG    = 0x038;  // octal 0000070
+
+    enum S_IROTH    = 0x4; // 0000004
+    enum S_IWOTH    = 0x2; // 0000002
+    enum S_IXOTH    = 0x1; // 0000001
+    enum S_IRWXO    = 0x7; // 0000007
+
+    enum S_ISUID    = 0x800; // octal 0004000
+    enum S_ISGID    = 0x400; // octal 0002000
+    enum S_ISVTX    = 0x200; // octal 0001000
+
+    private
+    {
+        extern (D) bool S_ISTYPE( mode_t mode, uint mask )
+        {
+            return ( mode & S_IFMT ) == mask;
+        }
+    }
+
+    extern (D) bool S_ISBLK( mode_t mode )  { return S_ISTYPE( mode, S_IFBLK );  }
+    extern (D) bool S_ISCHR( mode_t mode )  { return S_ISTYPE( mode, S_IFCHR );  }
+    extern (D) bool S_ISDIR( mode_t mode )  { return S_ISTYPE( mode, S_IFDIR );  }
+    extern (D) bool S_ISFIFO( mode_t mode ) { return S_ISTYPE( mode, S_IFIFO );  }
+    extern (D) bool S_ISREG( mode_t mode )  { return S_ISTYPE( mode, S_IFREG );  }
+    extern (D) bool S_ISLNK( mode_t mode )  { return S_ISTYPE( mode, S_IFLNK );  }
+    extern (D) bool S_ISSOCK( mode_t mode ) { return S_ISTYPE( mode, S_IFSOCK ); }
+}
 else version (Solaris)
 {
     private enum _ST_FSTYPSZ = 16;
@@ -1148,6 +1212,33 @@ else version( CRuntime_Bionic )
             ulong       st_ino;
         }
     }
+    else version (AArch64)
+    {
+        struct stat_t
+        {
+            ulong       st_dev;
+            ulong       st_ino;
+            uint        st_mode;
+            uint        st_nlink;
+            uid_t       st_uid;
+            gid_t       st_gid;
+            ulong       st_rdev;
+            ulong       __pad1;
+
+            long        st_size;
+            int         st_blksize;
+            int         __pad2;
+            long        st_blocks;
+            long        st_atime;
+            ulong       st_atime_nsec;
+            long        st_mtime;
+            ulong       st_mtime_nsec;
+            long        st_ctime;
+            ulong       st_ctime_nsec;
+            uint        __unused4;
+            uint        __unused5;
+        }
+    }
     else
     {
         static assert(false, "Architecture not supported.");
@@ -1192,6 +1283,288 @@ else version( CRuntime_Bionic )
     int utimensat(int dirfd, const char *pathname,
         ref const(timespec)[2] times, int flags);
 }
+else version (CRuntime_Musl)
+{
+    alias __mode_t = uint;
+    enum {
+        S_IRUSR    = 0x100, // octal 0400
+        S_IWUSR    = 0x080, // octal 0200
+        S_IXUSR    = 0x040, // octal 0100
+        S_IRWXU    = S_IRUSR | S_IWUSR | S_IXUSR,
+
+        S_IRGRP    = S_IRUSR >> 3,
+        S_IWGRP    = S_IWUSR >> 3,
+        S_IXGRP    = S_IXUSR >> 3,
+        S_IRWXG    = S_IRWXU >> 3,
+
+        S_IROTH    = S_IRGRP >> 3,
+        S_IWOTH    = S_IWGRP >> 3,
+        S_IXOTH    = S_IXGRP >> 3,
+        S_IRWXO    = S_IRWXG >> 3,
+
+        S_ISUID    = 0x800, // octal 04000
+        S_ISGID    = 0x400, // octal 02000
+        S_ISVTX    = 0x200, // octal 01000
+    }
+    struct stat_t {
+        dev_t st_dev;
+        ino_t st_ino;
+        nlink_t st_nlink;
+
+        mode_t st_mode;
+        uid_t st_uid;
+        gid_t st_gid;
+        uint    __pad0;
+        dev_t st_rdev;
+        off_t st_size;
+        blksize_t st_blksize;
+        blkcnt_t st_blocks;
+
+        timespec st_atim;
+        timespec st_mtim;
+        timespec st_ctim;
+        extern(D) @safe @property
+        {
+            ref time_t st_atime() return { return st_atim.tv_sec; }
+            ref time_t st_mtime() return { return st_mtim.tv_sec; }
+            ref time_t st_ctime() return { return st_ctim.tv_sec; }
+        }
+        long[3] __unused;
+    }
+    private
+    {
+        extern (D) bool S_ISTYPE( mode_t mode, uint mask )
+        {
+            return ( mode & S_IFMT ) == mask;
+        }
+    }
+
+    extern (D) bool S_ISBLK( mode_t mode )  { return S_ISTYPE( mode, S_IFBLK );  }
+    extern (D) bool S_ISCHR( mode_t mode )  { return S_ISTYPE( mode, S_IFCHR );  }
+    extern (D) bool S_ISDIR( mode_t mode )  { return S_ISTYPE( mode, S_IFDIR );  }
+    extern (D) bool S_ISFIFO( mode_t mode ) { return S_ISTYPE( mode, S_IFIFO );  }
+    extern (D) bool S_ISREG( mode_t mode )  { return S_ISTYPE( mode, S_IFREG );  }
+    extern (D) bool S_ISLNK( mode_t mode )  { return S_ISTYPE( mode, S_IFLNK );  }
+    extern (D) bool S_ISSOCK( mode_t mode ) { return S_ISTYPE( mode, S_IFSOCK ); }
+
+    int utimensat(int dirfd, const char *pathname,
+        ref const(timespec)[2] times, int flags);
+}
+else version( CRuntime_UClibc )
+{
+    version (X86_64)
+    {
+        struct stat_t
+        {
+            dev_t       st_dev;
+            ino_t       st_ino;
+            nlink_t     st_nlink;
+            mode_t      st_mode;
+            uid_t       st_uid;
+            gid_t       st_gid;
+            uint        __pad0;
+            dev_t       st_rdev;
+            off_t       st_size;
+            blksize_t   st_blksize;
+            blkcnt_t    st_blocks;
+            time_t      st_atime;
+            ulong_t     st_atimensec;
+            time_t      st_mtime;
+            ulong_t     st_mtimensec;
+            time_t      st_ctime;
+            ulong_t     st_ctimensec;
+            slong_t[3]     __unused;
+        }
+    }
+    else version (MIPS_O32)
+    {
+        struct stat_t
+        {
+            c_ulong     st_dev;
+            c_long[3]   st_pad1;
+            ino_t       st_ino;
+            mode_t      st_mode;
+            nlink_t     st_nlink;
+            uid_t       st_uid;
+            gid_t       st_gid;
+            c_ulong     st_rdev;
+            static if (!__USE_FILE_OFFSET64)
+            {
+                c_long[2]   st_pad2;
+                off_t       st_size;
+                c_long      st_pad3;
+            }
+            else
+            {
+                c_long[3]   st_pad2;
+                off_t       st_size;
+            }
+            static if (__USE_MISC || __USE_XOPEN2K8)
+            {
+                timespec    st_atim;
+                timespec    st_mtim;
+                timespec    st_ctim;
+                extern(D)
+                {
+                    @property ref time_t st_atime() { return st_atim.tv_sec; }
+                    @property ref time_t st_mtime() { return st_mtim.tv_sec; }
+                    @property ref time_t st_ctime() { return st_ctim.tv_sec; }
+                }
+            }
+            else
+            {
+                time_t      st_atime;
+                c_ulong     st_atimensec;
+                time_t      st_mtime;
+                c_ulong     st_mtimensec;
+                time_t      st_ctime;
+                c_ulong     st_ctimensec;
+            }
+            blksize_t   st_blksize;
+            static if (!__USE_FILE_OFFSET64)
+            {
+                blkcnt_t    st_blocks;
+            }
+            else
+            {
+                c_long      st_pad4;
+                blkcnt_t    st_blocks;
+            }
+            c_long[14]  st_pad5;
+        }
+    }
+    else version (ARM)
+    {
+        private
+        {
+            alias __dev_t = ulong;
+            alias __ino_t = c_ulong;
+            alias __ino64_t = ulong;
+            alias __mode_t = uint;
+            alias __nlink_t = size_t;
+            alias __uid_t = uint;
+            alias __gid_t = uint;
+            alias __off_t = c_long;
+            alias __off64_t = long;
+            alias __blksize_t = c_long;
+            alias __blkcnt_t = c_long;
+            alias __blkcnt64_t = long;
+            alias __timespec = timespec;
+            alias __time_t = time_t;
+        }
+        struct stat_t
+        {
+            __dev_t st_dev;
+            ushort __pad1;
+
+            static if(!__USE_FILE_OFFSET64)
+            {
+                __ino_t st_ino;
+            }
+            else
+            {
+                __ino_t __st_ino;
+            }
+            __mode_t st_mode;
+            __nlink_t st_nlink;
+            __uid_t st_uid;
+            __gid_t st_gid;
+            __dev_t st_rdev;
+            ushort __pad2;
+
+            static if(!__USE_FILE_OFFSET64)
+            {
+                __off_t st_size;
+            }
+            else
+            {
+                __off64_t st_size;
+            }
+            __blksize_t st_blksize;
+
+            static if(!__USE_FILE_OFFSET64)
+            {
+                __blkcnt_t st_blocks;
+            }
+            else
+            {
+                __blkcnt64_t st_blocks;
+            }
+
+            __time_t st_atime;
+            c_ulong st_atimensec;
+            __time_t st_mtime;
+            c_ulong st_mtimensec;
+            __time_t st_ctime;
+            c_ulong st_ctimensec;
+
+            static if(!__USE_FILE_OFFSET64)
+            {
+                c_ulong __unused4;
+                c_ulong __unused5;
+            }
+            else
+            {
+                __ino64_t st_ino;
+            }
+        }
+        static if(__USE_FILE_OFFSET64)
+            static assert(stat_t.sizeof == 104);
+        else
+            static assert(stat_t.sizeof == 88);
+    }
+    else
+        static assert(0, "unimplemented");
+
+    enum S_IRUSR    = 0x100; // octal 0400
+    enum S_IWUSR    = 0x080; // octal 0200
+    enum S_IXUSR    = 0x040; // octal 0100
+    enum S_IRWXU    = S_IRUSR | S_IWUSR | S_IXUSR;
+
+    enum S_IRGRP    = S_IRUSR >> 3;
+    enum S_IWGRP    = S_IWUSR >> 3;
+    enum S_IXGRP    = S_IXUSR >> 3;
+    enum S_IRWXG    = S_IRWXU >> 3;
+
+    enum S_IROTH    = S_IRGRP >> 3;
+    enum S_IWOTH    = S_IWGRP >> 3;
+    enum S_IXOTH    = S_IXGRP >> 3;
+    enum S_IRWXO    = S_IRWXG >> 3;
+
+    enum S_ISUID    = 0x800; // octal 04000
+    enum S_ISGID    = 0x400; // octal 02000
+    enum S_ISVTX    = 0x200; // octal 01000
+
+    private
+    {
+        extern (D) bool S_ISTYPE( mode_t mode, uint mask )
+        {
+            return ( mode & S_IFMT ) == mask;
+        }
+    }
+
+    extern (D) bool S_ISBLK( mode_t mode )  { return S_ISTYPE( mode, S_IFBLK );  }
+    extern (D) bool S_ISCHR( mode_t mode )  { return S_ISTYPE( mode, S_IFCHR );  }
+    extern (D) bool S_ISDIR( mode_t mode )  { return S_ISTYPE( mode, S_IFDIR );  }
+    extern (D) bool S_ISFIFO( mode_t mode ) { return S_ISTYPE( mode, S_IFIFO );  }
+    extern (D) bool S_ISREG( mode_t mode )  { return S_ISTYPE( mode, S_IFREG );  }
+    extern (D) bool S_ISLNK( mode_t mode )  { return S_ISTYPE( mode, S_IFLNK );  }
+    extern (D) bool S_ISSOCK( mode_t mode ) { return S_ISTYPE( mode, S_IFSOCK ); }
+
+    static if( true /*__USE_POSIX199309*/ )
+    {
+        extern bool S_TYPEISMQ( stat_t* buf )  { return false; }
+        extern bool S_TYPEISSEM( stat_t* buf ) { return false; }
+        extern bool S_TYPEISSHM( stat_t* buf ) { return false; }
+    }
+
+    enum UTIME_NOW = 0x3fffffff;
+    enum UTIME_OMIT = 0x3ffffffe;
+
+    int utimensat(int dirfd, const char *pathname,
+    ref const(timespec)[2] times, int flags);
+    int futimens(int fd, ref const(timespec)[2] times);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -1294,12 +1667,48 @@ else version(NetBSD)
     alias __lstat50 lstat;
     alias __stat50 stat;
 }
+else version( DragonFlyBSD )
+{
+    int   fstat(int, stat_t*);
+    int   lstat(in char*, stat_t*);
+    int   stat(in char*, stat_t*);
+}
 else version( CRuntime_Bionic )
 {
     int   fstat(int, stat_t*) @trusted;
     int   lstat(in char*, stat_t*);
     int   stat(in char*, stat_t*);
 }
+else version( CRuntime_Musl )
+{
+    int stat(in char*, stat_t*);
+    int fstat(int, stat_t*);
+    int lstat(in char*, stat_t*);
+
+    alias fstat fstat64;
+    alias lstat lstat64;
+    alias stat stat64;
+}
+else version( CRuntime_UClibc )
+{
+  static if( __USE_LARGEFILE64 )
+  {
+    int   fstat64(int, stat_t*) @trusted;
+    alias fstat64 fstat;
+
+    int   lstat64(in char*, stat_t*);
+    alias lstat64 lstat;
+
+    int   stat64(in char*, stat_t*);
+    alias stat64 stat;
+  }
+  else
+  {
+    int   fstat(int, stat_t*) @trusted;
+    int   lstat(in char*, stat_t*);
+    int   stat(in char*, stat_t*);
+  }
+}
 
 //
 // Typed Memory Objects (TYM)
@@ -1376,6 +1785,19 @@ else version(NetBSD)
 
     int mknod(in char*, mode_t, dev_t);
 }
+else version( DragonFlyBSD )
+{
+    enum S_IFMT     = 0xF000; // octal 0170000
+    enum S_IFBLK    = 0x6000; // octal 0060000
+    enum S_IFCHR    = 0x2000; // octal 0020000
+    enum S_IFIFO    = 0x1000; // octal 0010000
+    enum S_IFREG    = 0x8000; // octal 0100000
+    enum S_IFDIR    = 0x4000; // octal 0040000
+    enum S_IFLNK    = 0xA000; // octal 0120000
+    enum S_IFSOCK   = 0xC000; // octal 0140000
+
+    int mknod(in char*, mode_t, dev_t);
+}
 else version (Solaris)
 {
     enum S_IFMT = 0xF000;
@@ -1404,6 +1826,34 @@ else version( CRuntime_Bionic )
 
     int mknod(in char*, mode_t, dev_t);
 }
+else version( CRuntime_Musl )
+{
+    enum {
+        S_IFMT     = 0xF000, // octal 0170000
+        S_IFBLK    = 0x6000, // octal 0060000
+        S_IFCHR    = 0x2000, // octal 0020000
+        S_IFIFO    = 0x1000, // octal 0010000
+        S_IFREG    = 0x8000, // octal 0100000
+        S_IFDIR    = 0x4000, // octal 0040000
+        S_IFLNK    = 0xA000, // octal 0120000
+        S_IFSOCK   = 0xC000, // octal 0140000
+    }
+
+    int mknod(in char*, mode_t, dev_t);
+}
+else version( CRuntime_UClibc )
+{
+    enum S_IFMT     = 0xF000; // octal 0170000
+    enum S_IFBLK    = 0x6000; // octal 0060000
+    enum S_IFCHR    = 0x2000; // octal 0020000
+    enum S_IFIFO    = 0x1000; // octal 0010000
+    enum S_IFREG    = 0x8000; // octal 0100000
+    enum S_IFDIR    = 0x4000; // octal 0040000
+    enum S_IFLNK    = 0xA000; // octal 0120000
+    enum S_IFSOCK   = 0xC000; // octal 0140000
+
+    int mknod(in char*, mode_t, dev_t);
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/sys/posix/sys/statvfs.d b/libphobos/libdruntime/core/sys/posix/sys/statvfs.d
index 57a64aef7..926e4670d 100644
--- a/libphobos/libdruntime/core/sys/posix/sys/statvfs.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/statvfs.d
@@ -1,12 +1,12 @@
-/**
- * D header file for POSIX.
- *
- * Copyright: Copyright Robert Klotzner 2012
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
- * Authors:   Robert Klotzner
- * Standards: The Open Group Base Specifications Issue 6 IEEE Std 1003.1, 2004 Edition
- */
+/++
+    D header file correspoding to sys/statvfs.h.
 
+    Copyright: Copyright 2012 -
+    License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+    Authors:   Robert Klotzner and $(HTTP jmdavisprog.com, Jonathan M Davis)
+    Standards: $(HTTP http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_statvfs.h.html,
+                      The Open Group Base Specifications Issue 7 IEEE Std 1003.1, 2018 Edition)
+ +/
 module core.sys.posix.sys.statvfs;
 private import core.stdc.config;
 private import core.sys.posix.config;
@@ -14,6 +14,8 @@ public import core.sys.posix.sys.types;
 
 version (Posix):
 extern (C) :
+nothrow:
+@nogc:
 
 version(CRuntime_Glibc) {
     static if(__WORDSIZE == 32)
@@ -131,6 +133,112 @@ else version(NetBSD)
     int statvfs (const char * file, statvfs_t* buf);
     int fstatvfs (int fildes, statvfs_t *buf) @trusted;
 }
+else version (FreeBSD)
+{
+    import core.sys.freebsd.sys.mount;
+
+    // @@@DEPRECATED_2.091@@@
+    deprecated("Moved to core.sys.freebsd.sys.mount to correspond to C header file sys/mount.h")
+    alias MFSNAMELEN = core.sys.freebsd.sys.mount.MFSNAMELEN;
+
+    // @@@DEPRECATED_2.091@@@
+    deprecated("Moved to core.sys.freebsd.sys.mount to correspond to C header file sys/mount.h")
+    alias MNAMELEN = core.sys.freebsd.sys.mount.MNAMELEN;
+
+    // @@@DEPRECATED_2.091@@@
+    deprecated("Moved to core.sys.freebsd.sys.mount to correspond to C header file sys/mount.h")
+    alias fsid_t = core.sys.freebsd.sys.mount.fsid_t;
+
+    // @@@DEPRECATED_2.091@@@
+    deprecated("Moved to core.sys.freebsd.sys.mount to correspond to C header file sys/mount.h")
+    alias statfs_t = core.sys.freebsd.sys.mount.statfs_t;
+
+    // @@@DEPRECATED_2.091@@@
+    deprecated("Values moved to core.sys.freebsd.sys.mount to correspond to C header file sys/mount.h")
+    enum FFlag
+    {
+        // @@@DEPRECATED_2.091@@@
+        MNT_RDONLY = 1,          /* read only filesystem */
+
+        // @@@DEPRECATED_2.091@@@
+        MNT_SYNCHRONOUS = 2,     /* fs written synchronously */
+
+        // @@@DEPRECATED_2.091@@@
+        MNT_NOEXEC = 4,          /* can't exec from filesystem */
+
+        // @@@DEPRECATED_2.091@@@
+        MNT_NOSUID  = 8,         /* don't honor setuid fs bits */
+
+        // @@@DEPRECATED_2.091@@@
+        MNT_NFS4ACLS = 16,       /* enable NFS version 4 ACLs */
+
+        // @@@DEPRECATED_2.091@@@
+        MNT_UNION = 32,          /* union with underlying fs */
+
+        // @@@DEPRECATED_2.091@@@
+        MNT_ASYNC = 64,          /* fs written asynchronously */
+
+        // @@@DEPRECATED_2.091@@@
+        MNT_SUIDDIR = 128,       /* special SUID dir handling */
+
+        // @@@DEPRECATED_2.091@@@
+        MNT_SOFTDEP = 256,       /* using soft updates */
+
+        // @@@DEPRECATED_2.091@@@
+        MNT_NOSYMFOLLOW = 512,   /* do not follow symlinks */
+
+        // @@@DEPRECATED_2.091@@@
+        MNT_GJOURNAL = 1024,     /* GEOM journal support enabled */
+
+        // @@@DEPRECATED_2.091@@@
+        MNT_MULTILABEL = 2048,   /* MAC support for objects */
+
+        // @@@DEPRECATED_2.091@@@
+        MNT_ACLS = 4096,         /* ACL support enabled */
+
+        // @@@DEPRECATED_2.091@@@
+        MNT_NOATIME = 8192,      /* dont update file access time */
+
+        // @@@DEPRECATED_2.091@@@
+        MNT_NOCLUSTERR = 16384,  /* disable cluster read */
+
+        // @@@DEPRECATED_2.091@@@
+        MNT_NOCLUSTERW = 32768,  /* disable cluster write */
+
+        // @@@DEPRECATED_2.091@@@
+        MNT_SUJ = 65536,         /* using journaled soft updates */
+
+        // @@@DEPRECATED_2.091@@@
+        MNT_AUTOMOUNTED = 131072 /* mounted by automountd(8) */
+    }
+
+    deprecated("Moved to core.sys.freebsd.sys.mount to correspond to C header file sys/mount.h")
+    alias statfs = core.sys.freebsd.sys.mount.statfs;
+
+    deprecated("Moved to core.sys.freebsd.sys.mount to correspond to C header file sys/mount.h")
+    alias fstatfs = core.sys.freebsd.sys.mount.fstatfs;
+
+    struct statvfs_t
+    {
+        fsblkcnt_t f_bavail;
+        fsblkcnt_t f_bfree;
+        fsblkcnt_t f_blocks;
+        fsfilcnt_t f_favail;
+        fsfilcnt_t f_ffree;
+        fsfilcnt_t f_files;
+        ulong f_bsize;
+        ulong f_flag;
+        ulong f_frsize;
+        ulong f_fsid;
+        ulong f_namemax;
+    }
+
+    enum uint ST_RDONLY = 0x1;
+    enum uint ST_NOSUID = 0x2;
+
+    int fstatvfs(int, statvfs_t*);
+    int statvfs(const char*, statvfs_t*);
+}
 else
 {
     struct statvfs_t
diff --git a/libphobos/libdruntime/core/sys/posix/sys/time.d b/libphobos/libdruntime/core/sys/posix/sys/time.d
index a4bfd68f0..45d49f5d3 100644
--- a/libphobos/libdruntime/core/sys/posix/sys/time.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/time.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly, Alex Rønne Petersen
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -82,6 +82,16 @@ version( CRuntime_Glibc )
     int setitimer(int, in itimerval*, itimerval*);
     int utimes(in char*, ref const(timeval)[2]); // LEGACY
 }
+else version( CRuntime_Musl )
+{
+    struct timeval
+    {
+        time_t      tv_sec;
+        suseconds_t tv_usec;
+    }
+    int gettimeofday(timeval*, void*);
+    int utimes(in char*, ref const(timeval)[2]);
+}
 else version( Darwin )
 {
     struct timeval
@@ -153,6 +163,32 @@ else version(NetBSD)
     int setitimer(int, in itimerval*, itimerval*);
     int utimes(in char*, ref const(timeval)[2]);
 }
+else version( DragonFlyBSD )
+{
+    struct timeval
+    {
+        time_t      tv_sec;
+        suseconds_t tv_usec;
+    }
+
+    struct itimerval
+    {
+        timeval it_interval;
+        timeval it_value;
+    }
+
+    // non-standard
+    struct timezone_t
+    {
+        int tz_minuteswest;
+        int tz_dsttime;
+    }
+
+    int getitimer(int, itimerval*);
+    int gettimeofday(timeval*, timezone_t*); // timezone_t* is normally void*
+    int setitimer(int, in itimerval*, itimerval*);
+    int utimes(in char*, ref const(timeval)[2]);
+}
 else version (Solaris)
 {
     struct timeval
@@ -201,6 +237,29 @@ else version( CRuntime_Bionic )
     int setitimer(int, in itimerval*, itimerval*);
     int utimes(in char*, ref const(timeval)[2]);
 }
+else version( CRuntime_UClibc )
+{
+    struct timeval
+    {
+        time_t      tv_sec;
+        suseconds_t tv_usec;
+    }
+
+    struct itimerval
+    {
+        timeval it_interval;
+        timeval it_value;
+    }
+
+    enum ITIMER_REAL    = 0;
+    enum ITIMER_VIRTUAL = 1;
+    enum ITIMER_PROF    = 2;
+
+    int getitimer(int, itimerval*);
+    int gettimeofday(timeval*, void*);
+    int setitimer(int, in itimerval*, itimerval*);
+    int utimes(in char*, ref const(timeval)[2]);
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/sys/posix/sys/ttycom.d b/libphobos/libdruntime/core/sys/posix/sys/ttycom.d
index 638bd6e99..a559b1e35 100755
--- a/libphobos/libdruntime/core/sys/posix/sys/ttycom.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/ttycom.d
@@ -1,7 +1,7 @@
 /**
  * D header file for POSIX.
  *
- * License: $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License: $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  */
 
 module core.sys.posix.sys.ttycom;
diff --git a/libphobos/libdruntime/core/sys/posix/sys/types.d b/libphobos/libdruntime/core/sys/posix/sys/types.d
index ae87677c9..6d21d83ea 100644
--- a/libphobos/libdruntime/core/sys/posix/sys/types.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/types.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly,
               Alex Rønne Petersen
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
@@ -110,6 +110,23 @@ version( CRuntime_Glibc )
     alias slong_t   time_t;
     alias uint      uid_t;
 }
+else version( CRuntime_Musl )
+{
+    alias long      blksize_t;
+    alias ulong     nlink_t;
+    alias long      dev_t;
+    alias long      blkcnt_t;
+    alias ulong     ino_t;
+    alias long      off_t;
+    alias long      _Addr;
+    alias int       pid_t;
+    alias uint      uid_t;
+    alias uint      gid_t;
+    alias long      time_t;
+    alias long      clock_t;
+    alias ulong     pthread_t;
+    alias _Addr     ssize_t;
+}
 else version( Darwin )
 {
     alias long      blkcnt_t;
@@ -128,6 +145,7 @@ else version( Darwin )
 }
 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;
@@ -159,6 +177,21 @@ else version(NetBSD)
     alias c_long      time_t;
     alias uint        uid_t;
 }
+else version( DragonFlyBSD )
+{
+    alias long      blkcnt_t;
+    alias long      blksize_t;
+    alias uint      dev_t;
+    alias uint      gid_t;
+    alias long      ino_t;
+    alias ushort    mode_t;
+    alias uint      nlink_t;
+    alias long      off_t;      //__off_t (defined in /usr/include/sys/stdint.h -> core.stdc.stddef)
+    alias int       pid_t;      // size_t (defined in /usr/include/sys/stdint.h -> core.stdc.stddef)
+    alias c_long    ssize_t;
+    alias long      time_t;
+    alias uint      uid_t;
+}
 else version (Solaris)
 {
     alias char* caddr_t;
@@ -205,12 +238,12 @@ else version( CRuntime_Bionic )
 {
     alias c_ulong   blkcnt_t;
     alias c_ulong   blksize_t;
-    alias uint      dev_t;
+    alias size_t    dev_t;
     alias uint      gid_t;
     alias c_ulong   ino_t;
     alias c_long    off_t;
     alias int       pid_t;
-    alias int       ssize_t;
+    alias c_long    ssize_t;
     alias c_long    time_t;
     alias uint      uid_t;
 
@@ -219,11 +252,21 @@ else version( CRuntime_Bionic )
         alias ushort    mode_t;
         alias ushort    nlink_t;
     }
+    else version(X86_64)
+    {
+        alias ushort    mode_t;
+        alias uint      nlink_t;
+    }
     else version(ARM)
     {
         alias ushort    mode_t;
         alias ushort    nlink_t;
     }
+    else version(AArch64)
+    {
+        alias uint      mode_t;
+        alias uint      nlink_t;
+    }
     else version(MIPS32)
     {
         alias uint      mode_t;
@@ -234,6 +277,43 @@ else version( CRuntime_Bionic )
         static assert(false, "Architecture not supported.");
     }
 }
+else version( CRuntime_UClibc )
+{
+    static if( __USE_FILE_OFFSET64 )
+    {
+        alias long      blkcnt_t;
+        alias ulong     ino_t;
+        alias long      off_t;
+    }
+    else
+    {
+        alias slong_t   blkcnt_t;
+        alias ulong_t   ino_t;
+        alias slong_t   off_t;
+    }
+
+    version (D_LP64)
+    {
+        alias ino_t ino64_t;
+        alias off_t off64_t;
+    }
+    else
+    {
+        alias ulong ino64_t;
+        alias long off64_t;
+    }
+
+    alias slong_t   blksize_t;
+    alias c_ulong   dev_t;
+    alias uint      gid_t;
+    alias uint      mode_t;
+    alias uint      nlink_t;
+    alias int       pid_t;
+    //size_t (defined in core.stdc.stddef)
+    alias c_long    ssize_t;
+    alias slong_t   time_t;
+    alias uint      uid_t;
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -300,6 +380,16 @@ else version(NetBSD)
     alias c_long    suseconds_t;
     alias uint      useconds_t;
 }
+else version( DragonFlyBSD )
+{
+    alias ulong     fsblkcnt_t;
+    alias ulong     fsfilcnt_t;
+    alias c_long    clock_t;
+    alias long      id_t;
+    alias c_long    key_t;
+    alias c_long    suseconds_t;
+    alias uint      useconds_t;
+}
 else version (Solaris)
 {
     static if (__USE_FILE_OFFSET64)
@@ -333,7 +423,41 @@ else version( CRuntime_Bionic )
     alias uint     id_t;
     alias int      key_t;
     alias c_long   suseconds_t;
-    alias c_long   useconds_t;
+    alias uint     useconds_t; // Updated in Lollipop
+}
+else version( CRuntime_Musl )
+{
+  static if( __USE_FILE_OFFSET64 )
+  {
+    alias ulong     fsblkcnt_t;
+    alias ulong     fsfilcnt_t;
+  }
+  else
+  {
+    alias ulong_t   fsblkcnt_t;
+    alias ulong_t   fsfilcnt_t;
+  }
+    alias uint mode_t;
+    alias uint id_t;
+    alias long suseconds_t;
+}
+else version( CRuntime_UClibc )
+{
+  static if( __USE_FILE_OFFSET64 )
+  {
+    alias ulong     fsblkcnt_t;
+    alias ulong     fsfilcnt_t;
+  }
+  else
+  {
+    alias ulong_t   fsblkcnt_t;
+    alias ulong_t   fsfilcnt_t;
+  }
+    alias slong_t   clock_t;
+    alias uint      id_t;
+    alias int       key_t;
+    alias slong_t   suseconds_t;
+    alias uint      useconds_t;
 }
 else
 {
@@ -604,6 +728,43 @@ version (CRuntime_Glibc)
 
     alias c_ulong pthread_t;
 }
+else version( CRuntime_Musl )
+{
+    version(X86_64) {
+        union pthread_attr_t
+        {
+            int[14] __i;
+            ulong[7] __s;
+        }
+        union pthread_cond_t
+        {
+            int[12] __i;
+            void*[6] __p;
+        }
+        union pthread_mutex_t
+        {
+            int[10] __i;
+            void*[5] __p;
+        }
+        union pthread_rwlock_t
+        {
+            int[14] __i;
+            void*[7] __p;
+        }
+        struct pthread_rwlockattr_t
+        {
+            uint[2] __attr;
+        }
+        alias uint pthread_key_t;
+        alias uint pthread_condattr_t;
+        alias uint pthread_mutexattr_t;
+        alias int pthread_once_t;
+    }
+    else
+    {
+        static assert (false, "Architecture unsupported");
+    }
+}
 else version( Darwin )
 {
     version( D_LP64 )
@@ -780,6 +941,21 @@ else version(NetBSD)
     alias uint pthread_key_t;
     alias void* pthread_t;
 }
+else version( DragonFlyBSD )
+{
+    alias int lwpid_t;
+
+    alias void* pthread_attr_t;
+    alias void* pthread_cond_t;
+    alias void* pthread_condattr_t;
+    alias void* pthread_key_t;
+    alias void* pthread_mutex_t;
+    alias void* pthread_mutexattr_t;
+    alias void* pthread_once_t;
+    alias void* pthread_rwlock_t;
+    alias void* pthread_rwlockattr_t;
+    alias void* pthread_t;
+}
 else version (Solaris)
 {
     alias uint pthread_t;
@@ -880,11 +1056,15 @@ else version( CRuntime_Bionic )
         size_t  guard_size;
         int     sched_policy;
         int     sched_priority;
+        version(D_LP64) char[16] __reserved;
     }
 
     struct pthread_cond_t
     {
-        int value; //volatile
+        version(D_LP64)
+            int[12] __private;
+        else
+            int[1] __private;
     }
 
     alias c_long pthread_condattr_t;
@@ -892,26 +1072,174 @@ else version( CRuntime_Bionic )
 
     struct pthread_mutex_t
     {
-        int value; //volatile
+        version(D_LP64)
+            int[10] __private;
+        else
+            int[1] __private;
     }
 
     alias c_long pthread_mutexattr_t;
-    alias int    pthread_once_t; //volatile
+    alias int    pthread_once_t;
 
     struct pthread_rwlock_t
     {
-        pthread_mutex_t  lock;
-        pthread_cond_t   cond;
-        int              numLocks;
-        int              writerThreadId;
-        int              pendingReaders;
-        int              pendingWriters;
-        void*[4]         reserved;
+        version(D_LP64)
+            int[14] __private;
+        else
+            int[10] __private;
     }
 
-    alias int    pthread_rwlockattr_t;
+    alias c_long pthread_rwlockattr_t;
     alias c_long pthread_t;
 }
+else version ( CRuntime_UClibc )
+{
+     version (X86_64)
+     {
+        enum __SIZEOF_PTHREAD_ATTR_T        = 56;
+        enum __SIZEOF_PTHREAD_MUTEX_T       = 40;
+        enum __SIZEOF_PTHREAD_MUTEXATTR_T   = 4;
+        enum __SIZEOF_PTHREAD_COND_T        = 48;
+        enum __SIZEOF_PTHREAD_CONDATTR_T    = 4;
+        enum __SIZEOF_PTHREAD_RWLOCK_T      = 56;
+        enum __SIZEOF_PTHREAD_RWLOCKATTR_T  = 8;
+        enum __SIZEOF_PTHREAD_BARRIER_T     = 32;
+        enum __SIZEOF_PTHREAD_BARRIERATTR_T = 4;
+     }
+     else version (MIPS32)
+     {
+        enum __SIZEOF_PTHREAD_ATTR_T        = 36;
+        enum __SIZEOF_PTHREAD_MUTEX_T       = 24;
+        enum __SIZEOF_PTHREAD_MUTEXATTR_T   = 4;
+        enum __SIZEOF_PTHREAD_COND_T        = 48;
+        enum __SIZEOF_PTHREAD_CONDATTR_T    = 4;
+        enum __SIZEOF_PTHREAD_RWLOCK_T      = 32;
+        enum __SIZEOF_PTHREAD_RWLOCKATTR_T  = 8;
+        enum __SIZEOF_PTHREAD_BARRIER_T     = 20;
+        enum __SIZEOF_PTHREAD_BARRIERATTR_T = 4;
+     }
+     else version (ARM)
+     {
+        enum __SIZEOF_PTHREAD_ATTR_T = 36;
+        enum __SIZEOF_PTHREAD_MUTEX_T = 24;
+        enum __SIZEOF_PTHREAD_MUTEXATTR_T = 4;
+        enum __SIZEOF_PTHREAD_COND_T = 48;
+        enum __SIZEOF_PTHREAD_COND_COMPAT_T = 12;
+        enum __SIZEOF_PTHREAD_CONDATTR_T = 4;
+        enum __SIZEOF_PTHREAD_RWLOCK_T = 32;
+        enum __SIZEOF_PTHREAD_RWLOCKATTR_T = 8;
+        enum __SIZEOF_PTHREAD_BARRIER_T = 20;
+        enum __SIZEOF_PTHREAD_BARRIERATTR_T = 4;
+     }
+     else
+     {
+        static assert (false, "Architecture unsupported");
+     }
+
+    union pthread_attr_t
+    {
+        byte[__SIZEOF_PTHREAD_ATTR_T] __size;
+        c_long __align;
+    }
+
+    union pthread_cond_t
+    {
+        struct data
+        {
+            int __lock;
+            uint __futex;
+            ulong __total_seq;
+            ulong __wakeup_seq;
+            ulong __woken_seq;
+            void *__mutex;
+            uint __nwaiters;
+            uint __broadcast_seq;
+        } data __data;
+        byte[__SIZEOF_PTHREAD_COND_T] __size;
+        long  __align;
+    }
+
+    union pthread_condattr_t
+    {
+        byte[__SIZEOF_PTHREAD_CONDATTR_T] __size;
+        c_long __align;
+    }
+
+    alias uint pthread_key_t;
+
+    struct __pthread_slist_t
+    {
+      __pthread_slist_t* __next;
+    }
+
+    union pthread_mutex_t
+    {
+      struct __pthread_mutex_s
+      {
+        int __lock;
+        uint __count;
+        int __owner;
+        /* KIND must stay at this position in the structure to maintain
+           binary compatibility.  */
+        int __kind;
+        uint __nusers;
+        union
+        {
+          int __spins;
+          __pthread_slist_t __list;
+        }
+      }
+      __pthread_mutex_s __data;
+        byte[__SIZEOF_PTHREAD_MUTEX_T] __size;
+        c_long __align;
+    }
+
+    union pthread_mutexattr_t
+    {
+        byte[__SIZEOF_PTHREAD_MUTEXATTR_T] __size;
+        c_long __align;
+    }
+
+    alias int pthread_once_t;
+
+    struct pthread_rwlock_t
+    {
+        struct data
+        {
+            int __lock;
+            uint __nr_readers;
+            uint __readers_wakeup;
+            uint __writer_wakeup;
+            uint __nr_readers_queued;
+            uint __nr_writers_queued;
+            version( BigEndian )
+            {
+                ubyte __pad1;
+                ubyte __pad2;
+                ubyte __shared;
+                ubyte __flags;
+            }
+            else
+            {
+                ubyte __flags;
+                ubyte __shared;
+                ubyte __pad1;
+                ubyte __pad2;
+            }
+            int __writer;
+        } data __data;
+        byte[__SIZEOF_PTHREAD_RWLOCK_T] __size;
+        c_long __align;
+    }
+
+    struct pthread_rwlockattr_t
+    {
+        byte[__SIZEOF_PTHREAD_RWLOCKATTR_T] __size;
+        c_long __align;
+    }
+
+    alias c_ulong pthread_t;
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -949,6 +1277,11 @@ else version(NetBSD)
     alias void* pthread_barrier_t;
     alias void* pthread_barrierattr_t;
 }
+else version( DragonFlyBSD )
+{
+    alias void* pthread_barrier_t;
+    alias void* pthread_barrierattr_t;
+}
 else version( Darwin )
 {
 }
@@ -972,6 +1305,23 @@ else version (Solaris)
 else version( CRuntime_Bionic )
 {
 }
+else version( CRuntime_Musl )
+{
+}
+else version( CRuntime_UClibc )
+{
+    struct pthread_barrier_t
+    {
+        byte[__SIZEOF_PTHREAD_BARRIER_T] __size;
+        c_long __align;
+    }
+
+    struct pthread_barrierattr_t
+    {
+        byte[__SIZEOF_PTHREAD_BARRIERATTR_T] __size;
+        int __align;
+    }
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -996,10 +1346,18 @@ else version(NetBSD)
 {
     //already defined
 }
+else version( DragonFlyBSD )
+{
+    alias void* pthread_spinlock_t;
+}
 else version (Solaris)
 {
     alias pthread_mutex_t pthread_spinlock_t;
 }
+else version( CRuntime_UClibc )
+{
+    alias int pthread_spinlock_t; // volatile
+}
 
 //
 // Timer (TMR)
diff --git a/libphobos/libdruntime/core/sys/posix/sys/uio.d b/libphobos/libdruntime/core/sys/posix/sys/uio.d
index 9b5758742..851f21c20 100644
--- a/libphobos/libdruntime/core/sys/posix/sys/uio.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/uio.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly, Alex Rønne Petersen
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -90,6 +90,17 @@ else version(NetBSD)
     ssize_t readv(int, in iovec*, int);
     ssize_t writev(int, in iovec*, int);
 }
+else version( DragonFlyBSD )
+{
+    struct iovec
+    {
+        void*  iov_base;
+        size_t iov_len;
+    }
+
+    ssize_t readv(int, in iovec*, int);
+    ssize_t writev(int, in iovec*, int);
+}
 else version (Solaris)
 {
     struct iovec
@@ -105,13 +116,35 @@ else version( CRuntime_Bionic )
 {
     struct iovec
     {
-        void* iov_base;
-        uint  iov_len;
+        void*  iov_base;
+        size_t iov_len;
     }
 
     int readv(int, in iovec*, int);
     int writev(int, in iovec*, int);
 }
+else version( CRuntime_Musl )
+{
+    struct iovec
+    {
+        void* iov_base;
+        uint  iov_len;
+    }
+
+    ssize_t readv(int, in iovec*, int);
+    ssize_t writev(int, in iovec*, int);
+}
+else version( CRuntime_UClibc )
+{
+    struct iovec
+    {
+        void*  iov_base;
+        size_t iov_len;
+    }
+
+    ssize_t readv(int, in iovec*, int);
+    ssize_t writev(int, in iovec*, int);
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/sys/posix/sys/un.d b/libphobos/libdruntime/core/sys/posix/sys/un.d
index 1b6c7b08e..9b737f883 100644
--- a/libphobos/libdruntime/core/sys/posix/sys/un.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/un.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -78,6 +78,15 @@ else version(NetBSD)
         byte[104]   sun_path;
     }
 }
+else version( DragonFlyBSD )
+{
+    struct sockaddr_un
+    {
+        ubyte       sun_len;
+        sa_family_t sun_family;
+        byte[104]   sun_path;
+    }
+}
 else version( Solaris )
 {
     struct sockaddr_un
diff --git a/libphobos/libdruntime/core/sys/posix/sys/utsname.d b/libphobos/libdruntime/core/sys/posix/sys/utsname.d
index b41030a2e..fa14328a6 100644
--- a/libphobos/libdruntime/core/sys/posix/sys/utsname.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/utsname.d
@@ -1,3 +1,6 @@
+
+// Interface to <sys/utsname.h>
+
 module core.sys.posix.sys.utsname;
 
 version (OSX)
@@ -11,6 +14,8 @@ else version (WatchOS)
 
 version (Posix):
 extern(C):
+nothrow:
+@nogc:
 
 version(CRuntime_Glibc)
 {
@@ -21,8 +26,9 @@ version(CRuntime_Glibc)
         char[utsNameLength] sysname;
         char[utsNameLength] nodename;
         char[utsNameLength] release;
-        // The field name is version but version is a keyword in D.
-        char[utsNameLength] update;
+        char[utsNameLength] version_;
+        // TODO Deprecate after version_ has been in an official release.
+        alias update = version_;
         char[utsNameLength] machine;
 
         char[utsNameLength] __domainname;
@@ -39,8 +45,9 @@ else version(Darwin)
         char[utsNameLength] sysname;
         char[utsNameLength] nodename;
         char[utsNameLength] release;
-        // The field name is version but version is a keyword in D.
-        char[utsNameLength] update;
+        char[utsNameLength] version_;
+        // TODO Deprecate after version_ has been in an official release.
+        alias update = version_;
         char[utsNameLength] machine;
     }
 
@@ -48,31 +55,52 @@ else version(Darwin)
 }
 else version(FreeBSD)
 {
-    private enum utsNameLength = 32;
+    //private enum SYS_NMLN = 32;       // old FreeBSD 1.1 ABI
+    private enum SYS_NMLN = 256;
+
+    struct utsname
+    {
+        char[SYS_NMLN] sysname;
+        char[SYS_NMLN] nodename;
+        char[SYS_NMLN] release;
+        char[SYS_NMLN] version_;
+        // TODO Deprecate after version_ has been in an official release.
+        alias update = version_;
+        char[SYS_NMLN] machine;
+    }
+
+    int __xuname(int, void*);
+    int uname()(utsname* __name) { return __xuname(SYS_NMLN, cast(void*) __name); }
+}
+else version(NetBSD)
+{
+    private enum utsNameLength = 256;
 
     struct utsname
     {
         char[utsNameLength] sysname;
         char[utsNameLength] nodename;
         char[utsNameLength] release;
-        // The field name is version but version is a keyword in D.
-        char[utsNameLength] update;
+        char[utsNameLength] version_;
+        // TODO Deprecate after version_ has been in an official release.
+        alias update = version_;
         char[utsNameLength] machine;
     }
 
     int uname(utsname* __name);
 }
-else version(NetBSD)
+else version(DragonFlyBSD)
 {
-    private enum utsNameLength = 256;
+    private enum utsNameLength = 32;
 
     struct utsname
     {
         char[utsNameLength] sysname;
         char[utsNameLength] nodename;
         char[utsNameLength] release;
-        // The field name is version but version is a keyword in D.
-        char[utsNameLength] update;
+        char[utsNameLength] version_;
+        // TODO Deprecate after version_ has been in an official release.
+        alias update = version_;
         char[utsNameLength] machine;
     }
 
@@ -111,3 +139,39 @@ else version(CRuntime_Bionic)
 
     int uname(utsname*);
 }
+else version(CRuntime_Musl)
+{
+    private enum SYS_NMLN = 65;
+
+    struct utsname
+    {
+        char[SYS_NMLN] sysname;
+        char[SYS_NMLN] nodename;
+        char[SYS_NMLN] release;
+        char[SYS_NMLN] _version;
+        char[SYS_NMLN] machine;
+        char[SYS_NMLN] domainname;
+    }
+
+    int uname(utsname*);
+}
+else version(CRuntime_UClibc)
+{
+    private enum utsNameLength = 65;
+
+    struct utsname
+    {
+        char[utsNameLength] sysname;
+        char[utsNameLength] nodename;
+        char[utsNameLength] release;
+        char[utsNameLength] version_;
+        char[utsNameLength] machine;
+        char[utsNameLength] domainname;
+    }
+
+    int uname(utsname*);
+}
+else
+{
+    static assert(false, "unsupported system");
+}
diff --git a/libphobos/libdruntime/core/sys/posix/sys/wait.d b/libphobos/libdruntime/core/sys/posix/sys/wait.d
index 6d39de7f8..18fff9fd4 100644
--- a/libphobos/libdruntime/core/sys/posix/sys/wait.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/wait.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly, Alex Rønne Petersen
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -63,7 +63,7 @@ version( CRuntime_Glibc )
     }
 
     //
-    // NOTE: These macros assume __USE_BSD is not defined in the relevant
+    // NOTE: These macros assume __USE_MISC is not defined in the relevant
     //       C headers as the parameter definition there is different and
     //       much more complicated.
     //
@@ -144,6 +144,28 @@ else version(NetBSD)
     extern (D) int  WSTOPSIG( int status )     { return status >> 8;                     }
     extern (D) int  WTERMSIG( int status )     { return _WSTATUS( status );              }
 }
+else version( DragonFlyBSD )
+{
+    enum WNOHANG        = 1;
+    enum WUNTRACED      = 2;
+
+    private
+    {
+        enum _WSTOPPED = 0x7F; // octal 0177
+    }
+
+    extern (D) int _WSTATUS(int status)         { return (status & 0x7F);           }
+    extern (D) int  WEXITSTATUS( int status )   { return (status >> 8);             }
+    extern (D) int  WIFCONTINUED( int status )  { return status == 0x13;            }
+    extern (D) bool WIFEXITED( int status )     { return _WSTATUS(status) == 0;     }
+    extern (D) bool WIFSIGNALED( int status )
+    {
+        return _WSTATUS( status ) != _WSTOPPED && _WSTATUS( status ) != 0;
+    }
+    extern (D) bool WIFSTOPPED( int status )   { return _WSTATUS( status ) == _WSTOPPED; }
+    extern (D) int  WSTOPSIG( int status )     { return status >> 8;                     }
+    extern (D) int  WTERMSIG( int status )     { return _WSTATUS( status );              }
+}
 else version (Solaris)
 {
     enum WNOHANG        = 64;
@@ -169,6 +191,54 @@ else version( CRuntime_Bionic )
     extern (D) int  WSTOPSIG( int status ) { return WEXITSTATUS(status); }
     extern (D) int  WTERMSIG( int status ) { return status & 0x7F; }
 }
+else version( CRuntime_Musl )
+{
+    enum WNOHANG        = 1;
+    enum WUNTRACED      = 2;
+
+    extern (D) int  WEXITSTATUS( int status ) { return ( status & 0xFF00 ) >> 8; }
+    extern (D) int  WIFCONTINUED( int status ) { return status == 0xffff; }
+    extern (D) bool WIFEXITED( int status ) { return WTERMSIG( status ) == 0; }
+    extern (D) bool WIFSIGNALED( int status ) { return (status&0xffff)-1U < 0xffU; }
+    extern (D) bool WIFSTOPPED( int status ) { return cast(short)(((status&0xffff)*0x10001)>>8) > 0x7f00; }
+    extern (D) int  WTERMSIG( int status ) { return status & 0x7F; }
+    alias WEXITSTATUS WSTOPSIG;
+}
+else version( CRuntime_UClibc )
+{
+    enum WNOHANG        = 1;
+    enum WUNTRACED      = 2;
+
+    private
+    {
+        enum __W_CONTINUED = 0xFFFF;
+
+        extern (D) int __WTERMSIG( int status ) { return status & 0x7F; }
+    }
+
+    //
+    // NOTE: These macros assume __USE_BSD is not defined in the relevant
+    //       C headers as the parameter definition there is different and
+    //       much more complicated.
+    //
+    extern (D) int  WEXITSTATUS( int status )  { return ( status & 0xFF00 ) >> 8;   }
+    extern (D) int  WIFCONTINUED( int status ) { return status == __W_CONTINUED;    }
+    extern (D) bool WIFEXITED( int status )    { return __WTERMSIG( status ) == 0;  }
+    extern (D) bool WIFSIGNALED( int status )
+    {
+        return ( cast(ulong) ( ( status & 0xffff ) - 1U ) >> 1 ) < 0xffU;
+    }
+    version (MIPS32)
+    {
+        extern (D) bool WIFSTOPPED( int status )   { return ( status & 0xFF ) == 0x7F;  }
+    }
+    else
+    {
+        extern (D) bool WIFSTOPPED( int status )   { return ( status & 0xFF ) == 0x7F && ( status & 0xFF00 );  }
+    }
+    extern (D) int  WSTOPSIG( int status )     { return WEXITSTATUS( status );      }
+    extern (D) int  WTERMSIG( int status )     { return status & 0x7F;              }
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -242,6 +312,12 @@ else version (NetBSD)
     //enum WCONTINUED     = 4;
     enum WNOWAIT        = 0x00010000;
 }
+else version (DragonFlyBSD)
+{
+    enum WSTOPPED       = WUNTRACED;
+    enum WCONTINUED     = 4;
+    enum WNOWAIT        = 8;
+}
 else version (Solaris)
 {
     enum WEXITED = 1;
@@ -284,6 +360,25 @@ else version( CRuntime_Bionic )
 
     int waitid(idtype_t, id_t, siginfo_t*, int);
 }
+else version( CRuntime_Musl )
+{
+}
+else version( CRuntime_UClibc )
+{
+    enum WEXITED    = 4;
+    enum WSTOPPED   = 2;
+    enum WCONTINUED = 8;
+    enum WNOWAIT    = 0x01000000;
+
+    enum idtype_t
+    {
+        P_ALL,
+        P_PID,
+        P_PGID
+    }
+
+    int waitid(idtype_t, id_t, siginfo_t*, int);
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/sys/posix/syslog.d b/libphobos/libdruntime/core/sys/posix/syslog.d
index 20939aa50..4b987c1e3 100644
--- a/libphobos/libdruntime/core/sys/posix/syslog.d
+++ b/libphobos/libdruntime/core/sys/posix/syslog.d
@@ -276,6 +276,69 @@ else version(NetBSD)
     void syslog (int __pri, const char *__fmt, ...);
     void closelog();
 }
+else version( DragonFlyBSD )
+{
+    //PRIORITY
+    enum {
+        LOG_EMERG = 0,     /* system is unusable */
+        LOG_ALERT = 1,     /* action must be taken immediately */
+        LOG_CRIT  = 2,     /* critical conditions */
+        LOG_ERR   = 3,     /* error conditions */
+        LOG_WARNING = 4,   /* warning conditions */
+        LOG_NOTICE  = 5,   /* normal but significant condition */
+        LOG_INFO    = 6,   /* informational */
+        LOG_DEBUG   = 7,   /* debug-level messages */
+    };
+
+    //OPTIONS
+    enum {
+        LOG_PID    = 0x01,    /* log the pid with each message */
+        LOG_CONS   = 0x02,    /* log on the console if errors in sending */
+        LOG_ODELAY = 0x04,    /* delay open until first syslog() (default) */
+        LOG_NDELAY = 0x08,    /* don't delay open */
+        LOG_NOWAIT = 0x10,    /* don't wait for console forks: DEPRECATED */
+        LOG_PERROR = 0x20,    /* log to stderr as well */
+    };
+
+    //FACILITY
+    enum {
+        LOG_KERN   = (0<<3),  /* kernel messages */
+        LOG_USER   = (1<<3),  /* random user-level messages */
+        LOG_MAIL   = (2<<3),  /* mail system */
+        LOG_DAEMON = (3<<3),  /* system daemons */
+        LOG_AUTH   = (4<<3),  /* security/authorization messages */
+        LOG_SYSLOG = (5<<3),  /* messages generated internally by syslogd */
+        LOG_LPR    = (6<<3),  /* line printer subsystem */
+        LOG_NEWS   = (7<<3),  /* network news subsystem */
+        LOG_UUCP   = (8<<3),  /* UUCP subsystem */
+        LOG_CRON   = (9<<3),  /* clock daemon */
+        LOG_AUTHPRIV = (10<<3), /* security/authorization messages (private), */
+        LOG_FTP    =  (11<<3), /* ftp daemon */
+        LOG_NTP    = (12<<3), /* NTP subsystem */
+        LOG_SECURITY = (13<<3), /* security subsystems (firewalling, etc.) */
+        LOG_CONSOLE  = (14<<3), /* /dev/console output */
+
+        /* other codes through 15 reserved for system use */
+        LOG_LOCAL0 = (16<<3), /* reserved for local use */
+        LOG_LOCAL1 = (17<<3), /* reserved for local use */
+        LOG_LOCAL2 = (18<<3), /* reserved for local use */
+        LOG_LOCAL3 = (19<<3), /* reserved for local use */
+        LOG_LOCAL4 = (20<<3), /* reserved for local use */
+        LOG_LOCAL5 = (21<<3), /* reserved for local use */
+        LOG_LOCAL6 = (22<<3), /* reserved for local use */
+        LOG_LOCAL7 = (23<<3), /* reserved for local use */
+
+        LOG_NFACILITIES = 24,  /* current number of facilities */
+    };
+
+    int LOG_MASK(int pri) { return 1 << pri; }        /* mask for one priority */
+    int LOG_UPTO(int pri) { return (1 << (pri+1)) - 1; }  /* all priorities through pri */
+
+    void openlog (const char *, int __option, int __facility);
+    int  setlogmask (int __mask);
+    void syslog (int __pri, const char *__fmt, ...);
+    void closelog();
+}
 else version( Solaris )
 {
     //http://pubs.opengroup.org/onlinepubs/007904875/basedefs/syslog.h.html
@@ -336,3 +399,63 @@ else version( Solaris )
     void syslog (int __pri, const char *__fmt, ...);
     void closelog();
 }
+else version(CRuntime_UClibc)
+{
+    //PRIORITY
+    enum {
+        LOG_EMERG = 0,     /* system is unusable */
+        LOG_ALERT = 1,     /* action must be taken immediately */
+        LOG_CRIT  = 2,     /* critical conditions */
+        LOG_ERR   = 3,     /* error conditions */
+        LOG_WARNING = 4,   /* warning conditions */
+        LOG_NOTICE  = 5,   /* normal but significant condition */
+        LOG_INFO    = 6,   /* informational */
+        LOG_DEBUG   = 7,   /* debug-level messages */
+    };
+
+    //OPTIONS
+    enum {
+        LOG_PID    = 0x01,  /* log the pid with each message */
+        LOG_CONS   = 0x02,  /* log on the console if errors in sending */
+        LOG_ODELAY = 0x04,  /* delay open until first syslog() (default) */
+        LOG_NDELAY = 0x08,  /* don't delay open */
+        LOG_NOWAIT = 0x10,  /* don't wait for console forks: DEPRECATED */
+        LOG_PERROR = 0x20,  /* log to stderr as well */
+    };
+
+    //FACILITY
+    enum {
+        LOG_KERN   = (0<<3),  /* kernel messages */
+        LOG_USER   = (1<<3),  /* random user-level messages */
+        LOG_MAIL   = (2<<3),  /* mail system */
+        LOG_DAEMON = (3<<3),  /* system daemons */
+        LOG_AUTH   = (4<<3),  /* security/authorization messages */
+        LOG_SYSLOG = (5<<3),  /* messages generated internally by syslogd */
+        LOG_LPR    = (6<<3),  /* line printer subsystem */
+        LOG_NEWS   = (7<<3),  /* network news subsystem */
+        LOG_UUCP   = (8<<3),  /* UUCP subsystem */
+        LOG_CRON   = (9<<3),  /* clock daemon */
+        LOG_AUTHPRIV = (10<<3), /* security/authorization messages (private), */
+        LOG_FTP    =  (11<<3), /* ftp daemon */
+
+        /* other codes through 15 reserved for system use */
+        LOG_LOCAL0 = (16<<3), /* reserved for local use */
+        LOG_LOCAL1 = (17<<3), /* reserved for local use */
+        LOG_LOCAL2 = (18<<3), /* reserved for local use */
+        LOG_LOCAL3 = (19<<3), /* reserved for local use */
+        LOG_LOCAL4 = (20<<3), /* reserved for local use */
+        LOG_LOCAL5 = (21<<3), /* reserved for local use */
+        LOG_LOCAL6 = (22<<3), /* reserved for local use */
+        LOG_LOCAL7 = (23<<3), /* reserved for local use */
+
+        LOG_NFACILITIES = 24,  /* current number of facilities */
+    };
+
+    int LOG_MASK(int pri) { return 1 << pri; }        /* mask for one priority */
+    int LOG_UPTO(int pri) { return (1 << (pri+1)) - 1; }  /* all priorities through pri */
+
+    void openlog (const char *, int __option, int __facility);
+    int  setlogmask (int __mask);
+    void syslog (int __pri, const char *__fmt, ...);
+    void closelog();
+}
diff --git a/libphobos/libdruntime/core/sys/posix/termios.d b/libphobos/libdruntime/core/sys/posix/termios.d
index 8642f540e..8551cd193 100644
--- a/libphobos/libdruntime/core/sys/posix/termios.d
+++ b/libphobos/libdruntime/core/sys/posix/termios.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly, Alex Rønne Petersen
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -466,7 +466,114 @@ else version ( FreeBSD )
     int     tcgetattr(int, termios*);
     int     tcsendbreak(int, int);
     int     tcsetattr(int, int, in termios*);
+}
+else version ( DragonFlyBSD )
+{
+    alias ubyte cc_t;
+    alias uint  speed_t;
+    alias uint  tcflag_t;
+
+    enum NCCS   = 20;
+
+    struct termios
+    {
+        tcflag_t   c_iflag;
+        tcflag_t   c_oflag;
+        tcflag_t   c_cflag;
+        tcflag_t   c_lflag;
+        cc_t[NCCS] c_cc;
+        speed_t    c_ispeed;
+        speed_t    c_ospeed;
+    }
+
+    enum VEOF       = 0;
+    enum VEOL       = 1;
+    enum VERASE     = 3;
+    enum VINTR      = 8;
+    enum VKILL      = 5;
+    enum VMIN       = 16;
+    enum VQUIT      = 9;
+    enum VSTART     = 12;
+    enum VSTOP      = 13;
+    enum VSUSP      = 10;
+    enum VTIME      = 17;
+
+    enum BRKINT     = 0x0000002;
+    enum ICRNL      = 0x0000100;
+    enum IGNBRK     = 0x0000001;
+    enum IGNCR      = 0x0000080;
+    enum IGNPAR     = 0x0000004;
+    enum INLCR      = 0x0000040;
+    enum INPCK      = 0x0000010;
+    enum ISTRIP     = 0x0000020;
+    enum IXOFF      = 0x0000400;
+    enum IXON       = 0x0000200;
+    enum PARMRK     = 0x0000008;
+
+    enum OPOST      = 0x0000001;
+
+    enum B0         = 0;
+    enum B50        = 50;
+    enum B75        = 75;
+    enum B110       = 110;
+    enum B134       = 134;
+    enum B150       = 150;
+    enum B200       = 200;
+    enum B300       = 300;
+    enum B600       = 600;
+    enum B1200      = 1200;
+    enum B1800      = 1800;
+    enum B2400      = 2400;
+    enum B4800      = 4800;
+    enum B9600      = 9600;
+    enum B19200     = 19200;
+    enum B38400     = 38400;
+
+    enum CSIZE      = 0x0000300;
+    enum   CS5      = 0x0000000;
+    enum   CS6      = 0x0000100;
+    enum   CS7      = 0x0000200;
+    enum   CS8      = 0x0000300;
+    enum CSTOPB     = 0x0000400;
+    enum CREAD      = 0x0000800;
+    enum PARENB     = 0x0001000;
+    enum PARODD     = 0x0002000;
+    enum HUPCL      = 0x0004000;
+    enum CLOCAL     = 0x0008000;
+
+    enum ECHO       = 0x00000008;
+    enum ECHOE      = 0x00000002;
+    enum ECHOK      = 0x00000004;
+    enum ECHONL     = 0x00000010;
+    enum ICANON     = 0x00000100;
+    enum IEXTEN     = 0x00000400;
+    enum ISIG       = 0x00000080;
+    enum NOFLSH     = 0x80000000;
+    enum TOSTOP     = 0x00400000;
 
+    enum TCSANOW    = 0;
+    enum TCSADRAIN  = 1;
+    enum TCSAFLUSH  = 2;
+
+    enum TCIFLUSH   = 1;
+    enum TCOFLUSH   = 2;
+    enum TCIOFLUSH  = 3;
+
+    enum TCIOFF     = 3;
+    enum TCION      = 4;
+    enum TCOOFF     = 1;
+    enum TCOON      = 2;
+
+    speed_t cfgetispeed(in termios*);
+    speed_t cfgetospeed(in termios*);
+    int     cfsetispeed(termios*, speed_t);
+    int     cfsetospeed(termios*, speed_t);
+    int     tcdrain(int);
+    int     tcflow(int, int);
+    int     tcflush(int, int);
+    int     tcgetattr(int, termios*);
+    int     tcsendbreak(int, int);
+    int     tcsetattr(int, int, in termios*);
 }
 else version (NetBSD)
 {
@@ -709,6 +816,121 @@ else version (Solaris)
     int     tcflush(int, int);
     int     tcflow(int, int);
 }
+else version( CRuntime_UClibc )
+{
+    alias ubyte cc_t;
+    alias uint  speed_t;
+    alias uint  tcflag_t;
+
+    enum NCCS   = 32;
+
+    struct termios
+    {
+        tcflag_t   c_iflag;
+        tcflag_t   c_oflag;
+        tcflag_t   c_cflag;
+        tcflag_t   c_lflag;
+        cc_t       c_line;
+        cc_t[NCCS] c_cc;
+        speed_t    c_ispeed;
+        speed_t    c_ospeed;
+    }
+
+    enum VINTR      = 0;
+    enum VQUIT      = 1;
+    enum VERASE     = 2;
+    enum VKILL      = 3;
+    enum VEOF       = 4;
+    enum VTIME      = 5;
+    enum VMIN       = 6;
+    enum VSWTC      = 7;
+    enum VSTART     = 8;
+    enum VSTOP      = 9;
+    enum VSUSP      = 10;
+    enum VEOL       = 11;
+    enum VREPRINT   = 12;
+    enum VDISCARD   = 13;
+    enum VWERASE    = 14;
+    enum VLNEXT     = 15;
+    enum VEOL2      = 16;
+
+    enum BRKINT     = 0x0000002; // 0000002
+    enum ICRNL      = 0x0000100; // 0000400
+    enum IGNBRK     = 0x0000001; // 0000001
+    enum IGNCR      = 0x0000080; // 0000200
+    enum IGNPAR     = 0x0000004; // 0000004
+    enum INLCR      = 0x0000040; // 0000100
+    enum INPCK      = 0x0000010; // 0000020
+    enum ISTRIP     = 0x0000020; // 0000040
+    enum IXOFF      = 0x0001000; // 0010000
+    enum IXON       = 0x0000400; // 0002000
+    enum PARMRK     = 0x0000008; // 0000010
+
+    enum OPOST      = 0x0000001; // 0000001
+
+    enum B0         = 0x0000000; // 0000000
+    enum B50        = 0x0000001; // 0000001
+    enum B75        = 0x0000002; // 0000002
+    enum B110       = 0x0000003; // 0000003
+    enum B134       = 0x0000004; // 0000004
+    enum B150       = 0x0000005; // 0000005
+    enum B200       = 0x0000006; // 0000006
+    enum B300       = 0x0000007; // 0000007
+    enum B600       = 0x0000008; // 0000010
+    enum B1200      = 0x0000009; // 0000011
+    enum B1800      = 0x000000A; // 0000012
+    enum B2400      = 0x000000B; // 0000013
+    enum B4800      = 0x000000C; // 0000014
+    enum B9600      = 0x000000D; // 0000015
+    enum B19200     = 0x000000E; // 0000016
+    enum B38400     = 0x000000F; // 0000017
+
+    enum CSIZE      = 0x0000030; // 0000060
+    enum   CS5      = 0x0000000; // 0000000
+    enum   CS6      = 0x0000010; // 0000020
+    enum   CS7      = 0x0000020; // 0000040
+    enum   CS8      = 0x0000030; // 0000060
+    enum CSTOPB     = 0x0000040; // 0000100
+    enum CREAD      = 0x0000080; // 0000200
+    enum PARENB     = 0x0000100; // 0000400
+    enum PARODD     = 0x0000200; // 0001000
+    enum HUPCL      = 0x0000400; // 0002000
+    enum CLOCAL     = 0x0000800; // 0004000
+
+    enum ECHO       = 0x0000008; // 0000010
+    enum ECHOE      = 0x0000010; // 0000020
+    enum ECHOK      = 0x0000020; // 0000040
+    enum ECHONL     = 0x0000040; // 0000100
+    enum ICANON     = 0x0000002; // 0000002
+    enum IEXTEN     = 0x0008000; // 0100000
+    enum ISIG       = 0x0000001; // 0000001
+    enum NOFLSH     = 0x0000080; // 0000200
+    enum TOSTOP     = 0x0000100; // 0000400
+
+    enum TCSANOW    = 0;
+    enum TCSADRAIN  = 1;
+    enum TCSAFLUSH  = 2;
+
+    enum TCIFLUSH   = 0;
+    enum TCOFLUSH   = 1;
+    enum TCIOFLUSH  = 2;
+
+    enum TCIOFF     = 2;
+    enum TCION      = 3;
+    enum TCOOFF     = 0;
+    enum TCOON      = 1;
+
+    speed_t cfgetispeed(in termios*);
+    speed_t cfgetospeed(in termios*);
+    int     cfsetispeed(termios*, speed_t);
+    int     cfsetospeed(termios*, speed_t);
+    int     tcdrain(int);
+    int     tcflow(int, int);
+    int     tcflush(int, int);
+    int     tcgetattr(int, termios*);
+    int     tcsendbreak(int, int);
+    int     tcsetattr(int, int, in termios*);
+}
 
 //
 // XOpen (XSI)
@@ -851,6 +1073,40 @@ else version( FreeBSD )
 
     pid_t   tcgetsid(int);
 }
+else version( DragonFlyBSD )
+{
+    enum IXANY      = 0x00000800;
+
+    enum ONLCR      = 0x00000002;
+    enum OCRNL      = 0x00000010;
+    enum ONOCR      = 0x00000020;
+    enum ONLRET     = 0x00000040;
+    //enum OFILL
+    //enum NLDLY
+    //enum     NL0
+    //enum     NL1
+    //enum CRDLY
+    //enum     CR0
+    //enum     CR1
+    //enum     CR2
+    //enum     CR3
+    enum TABDLY     = 0x00000004;
+    enum     TAB0   = 0x00000000;
+    //enum     TAB1
+    //enum     TAB2
+    enum     TAB3   = 0x00000004;
+    //enum BSDLY
+    //enum     BS0
+    //enum     BS1
+    //enum VTDLY
+    //enum     VT0
+    //enum     VT1
+    //enum FFDLY
+    //enum     FF0
+    //enum     FF1
+
+    pid_t   tcgetsid(int);
+}
 else version(NetBSD)
 {
     enum IXANY      = 0x00000800;
@@ -921,3 +1177,37 @@ else version (Solaris)
 
     pid_t   tcgetsid(int);
 }
+else version( CRuntime_UClibc )
+{
+    enum IXANY      = 0x0000800; // 0004000
+
+    enum ONLCR      = 0x0000004; // 0000004
+    enum OCRNL      = 0x0000008; // 0000010
+    enum ONOCR      = 0x0000010; // 0000020
+    enum ONLRET     = 0x0000020; // 0000040
+    enum OFILL      = 0x0000040; // 0000100
+    enum NLDLY      = 0x0000100; // 0000400
+    enum   NL0      = 0x0000000; // 0000000
+    enum   NL1      = 0x0000100; // 0000400
+    enum CRDLY      = 0x0000600; // 0003000
+    enum   CR0      = 0x0000000; // 0000000
+    enum   CR1      = 0x0000200; // 0001000
+    enum   CR2      = 0x0000400; // 0002000
+    enum   CR3      = 0x0000600; // 0003000
+    enum TABDLY     = 0x0001800; // 0014000
+    enum   TAB0     = 0x0000000; // 0000000
+    enum   TAB1     = 0x0000800; // 0004000
+    enum   TAB2     = 0x0001000; // 0010000
+    enum   TAB3     = 0x0001800; // 0014000
+    enum BSDLY      = 0x0002000; // 0020000
+    enum   BS0      = 0x0000000; // 0000000
+    enum   BS1      = 0x0002000; // 0020000
+    enum VTDLY      = 0x0004000; // 0040000
+    enum   VT0      = 0x0000000; // 0000000
+    enum   VT1      = 0x0004000; // 0040000
+    enum FFDLY      = 0x0008000; // 0100000
+    enum   FF0      = 0x0000000; // 0000000
+    enum   FF1      = 0x0008000; // 0100000
+
+    pid_t   tcgetsid(int);
+}
diff --git a/libphobos/libdruntime/core/sys/posix/time.d b/libphobos/libdruntime/core/sys/posix/time.d
index 2bf9e96fd..0b63e62ff 100644
--- a/libphobos/libdruntime/core/sys/posix/time.d
+++ b/libphobos/libdruntime/core/sys/posix/time.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly,
               Alex Rønne Petersen
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
@@ -65,6 +65,10 @@ else version(NetBSD)
 {
     time_t timegm(tm*); // non-standard
 }
+else version( DragonFlyBSD )
+{
+    time_t timegm(tm*); // non-standard
+}
 else version (Solaris)
 {
     time_t timegm(tm*); // non-standard
@@ -73,6 +77,14 @@ else version (CRuntime_Bionic)
 {
     // Not supported.
 }
+else version (CRuntime_Musl)
+{
+    time_t timegm(tm*);
+}
+else version( CRuntime_UClibc )
+{
+    time_t timegm(tm*);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -133,6 +145,16 @@ else version (NetBSD)
     // time.h
     enum CLOCK_MONOTONIC         = 3;
 }
+else version (DragonFlyBSD)
+{   // time.h
+    enum CLOCK_MONOTONIC         = 4;
+    // To be removed in December 2015.
+    static import core.sys.dragonflybsd.time;
+    deprecated("Please import it from core.sys.dragonflybsd.time instead.")
+        alias CLOCK_MONOTONIC_PRECISE = core.sys.dragonflybsd.time.CLOCK_MONOTONIC_PRECISE;
+    deprecated("Please import it from core.sys.dragonflybsd.time instead.")
+        alias CLOCK_MONOTONIC_FAST = core.sys.dragonflybsd.time.CLOCK_MONOTONIC_FAST;
+}
 else version (Darwin)
 {
     // No CLOCK_MONOTONIC defined
@@ -263,6 +285,32 @@ else version( FreeBSD )
     int timer_getoverrun(timer_t);
     int timer_settime(timer_t, int, in itimerspec*, itimerspec*);
 }
+else version( DragonFlyBSD )
+{
+    enum CLOCK_THREAD_CPUTIME_ID  = 15;
+
+    struct itimerspec
+    {
+        timespec it_interval;
+        timespec it_value;
+    }
+
+    enum CLOCK_REALTIME      = 0;
+    enum TIMER_ABSTIME       = 0x01;
+
+    alias int clockid_t; // <sys/_types.h>
+    alias int timer_t;
+
+    int clock_getres(clockid_t, timespec*);
+    int clock_gettime(clockid_t, timespec*);
+    int clock_settime(clockid_t, in timespec*);
+    int nanosleep(in timespec*, timespec*);
+    int timer_create(clockid_t, sigevent*, timer_t*);
+    int timer_delete(timer_t);
+    int timer_gettime(timer_t, itimerspec*);
+    int timer_getoverrun(timer_t);
+    int timer_settime(timer_t, int, in itimerspec*, itimerspec*);
+}
 else version(NetBSD)
 {
     struct itimerspec
@@ -332,8 +380,8 @@ else version( CRuntime_Bionic )
     enum CLOCK_REALTIME_HR = 4;
     enum TIMER_ABSTIME     = 0x01;
 
-    alias int clockid_t;
-    alias int timer_t;
+    alias int   clockid_t;
+    alias void* timer_t; // Updated since Lollipop
 
     int clock_getres(int, timespec*);
     int clock_gettime(int, timespec*);
@@ -344,6 +392,70 @@ else version( CRuntime_Bionic )
     int timer_getoverrun(timer_t);
     int timer_settime(timer_t, int, in itimerspec*, itimerspec*);
 }
+else version( CRuntime_Musl )
+{
+    alias int clockid_t;
+    alias void* timer_t;
+
+    struct itimerspec
+    {
+        timespec it_interval;
+        timespec it_value;
+    }
+
+    enum TIMER_ABSTIME = 1;
+
+    enum CLOCK_REALTIME = 0;
+    enum CLOCK_PROCESS_CPUTIME_ID = 2;
+    enum CLOCK_THREAD_CPUTIME_ID = 3;
+    enum CLOCK_REALTIME_COARSE = 5;
+    enum CLOCK_BOOTTIME = 7;
+    enum CLOCK_REALTIME_ALARM = 8;
+    enum CLOCK_BOOTTIME_ALARM = 9;
+    enum CLOCK_SGI_CYCLE = 10;
+    enum CLOCK_TAI = 11;
+
+    int nanosleep(in timespec*, timespec*);
+
+    int clock_getres(clockid_t, timespec*);
+    int clock_gettime(clockid_t, timespec*);
+    int clock_settime(clockid_t, in timespec*);
+    int clock_nanosleep(clockid_t, int, in timespec*, timespec*);
+    int clock_getcpuclockid(pid_t, clockid_t *);
+
+    int timer_create(clockid_t, sigevent*, timer_t*);
+    int timer_delete(timer_t);
+    int timer_gettime(timer_t, itimerspec*);
+    int timer_settime(timer_t, int, in itimerspec*, itimerspec*);
+    int timer_getoverrun(timer_t);
+}
+else version( CRuntime_UClibc )
+{
+    enum CLOCK_REALTIME             = 0;
+    enum CLOCK_PROCESS_CPUTIME_ID   = 2;
+    enum CLOCK_THREAD_CPUTIME_ID    = 3;
+
+    struct itimerspec
+    {
+        timespec it_interval;
+        timespec it_value;
+    }
+
+    enum TIMER_ABSTIME          = 0x01;
+
+    alias int clockid_t;
+    alias void* timer_t;
+
+    int clock_getres(clockid_t, timespec*);
+    int clock_gettime(clockid_t, timespec*);
+    int clock_settime(clockid_t, in timespec*);
+    int nanosleep(in timespec*, timespec*);
+    int timer_create(clockid_t, sigevent*, timer_t*);
+    int timer_delete(timer_t);
+    int timer_gettime(timer_t, itimerspec*);
+    int timer_getoverrun(timer_t);
+    int timer_settime(timer_t, int, in itimerspec*, itimerspec*);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -387,6 +499,13 @@ else version(NetBSD)
     tm*   gmtime_r(in time_t*, tm*);
     tm*   localtime_r(in time_t*, tm*);
 }
+else version( DragonFlyBSD )
+{
+    char* asctime_r(in tm*, char*);
+    char* ctime_r(in time_t*, char*);
+    tm*   gmtime_r(in time_t*, tm*);
+    tm*   localtime_r(in time_t*, tm*);
+}
 else version (Solaris)
 {
     char* asctime_r(in tm*, char*);
@@ -401,6 +520,20 @@ else version (CRuntime_Bionic)
     tm* gmtime_r(in time_t*, tm*);
     tm* localtime_r(in time_t*, tm*);
 }
+else version (CRuntime_Musl)
+{
+    char* asctime_r(in tm*, char*);
+    char* ctime_r(in time_t*, char*);
+    tm*   gmtime_r(in time_t*, tm*);
+    tm*   localtime_r(in time_t*, tm*);
+}
+else version( CRuntime_UClibc )
+{
+    char* asctime_r(in tm*, char*);
+    char* ctime_r(in time_t*, char*);
+    tm*   gmtime_r(in time_t*, tm*);
+    tm*   localtime_r(in time_t*, tm*);
+}
 else
 {
     static assert(false, "Unsupported platform");
@@ -445,6 +578,11 @@ else version(NetBSD)
     tm*   getdate(in char*);
     char* strptime(in char*, in char*, tm*);
 }
+else version( DragonFlyBSD )
+{
+    //tm*   getdate(in char*);
+    char* strptime(in char*, in char*, tm*);
+}
 else version (Solaris)
 {
     extern __gshared c_long timezone, altzone;
@@ -461,6 +599,19 @@ else version( CRuntime_Bionic )
 
     char* strptime(in char*, in char*, tm*);
 }
+else version( CRuntime_Musl )
+{
+    tm*   getdate(in char*);
+    char* strptime(in char*, in char*, tm*);
+}
+else version( CRuntime_UClibc )
+{
+    extern __gshared int    daylight;
+    extern __gshared c_long timezone;
+
+    tm*   getdate(in char*);
+    char* strptime(in char*, in char*, tm*);
+}
 else
 {
     static assert(false, "Unsupported platform");
diff --git a/libphobos/libdruntime/core/sys/posix/ucontext.d b/libphobos/libdruntime/core/sys/posix/ucontext.d
index c3fbcc0d7..3e0e92b62 100644
--- a/libphobos/libdruntime/core/sys/posix/ucontext.d
+++ b/libphobos/libdruntime/core/sys/posix/ucontext.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -765,6 +765,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;
@@ -836,6 +868,71 @@ else version(NetBSD)
 
     }
 }
+else version( DragonFlyBSD )
+{
+    // <machine/ucontext.h>
+    version( X86_64 )
+    {
+      alias long __register_t;
+      alias uint __uint32_t;
+      alias ushort __uint16_t;
+
+      struct mcontext_t {
+        __register_t    mc_onstack;
+        __register_t    mc_rdi;
+        __register_t    mc_rsi;
+        __register_t    mc_rdx;
+        __register_t    mc_rcx;
+        __register_t    mc_r8;
+        __register_t    mc_r9;
+        __register_t    mc_rax;
+        __register_t    mc_rbx;
+        __register_t    mc_rbp;
+        __register_t    mc_r10;
+        __register_t    mc_r11;
+        __register_t    mc_r12;
+        __register_t    mc_r13;
+        __register_t    mc_r14;
+        __register_t    mc_r15;
+        __register_t    mc_xflags;
+        __register_t    mc_trapno;
+        __register_t    mc_addr;
+        __register_t    mc_flags;
+        __register_t    mc_err;
+        __register_t    mc_rip;
+        __register_t    mc_cs;
+        __register_t    mc_rflags;
+        __register_t    mc_rsp;
+        __register_t    mc_ss;
+
+        uint            mc_len;
+        uint            mc_fpformat;
+        uint            mc_ownedfp;
+        uint            mc_reserved;
+        uint[8]         mc_unused;
+        int[256]        mc_fpregs;
+      };  // __attribute__((aligned(64)));
+    }
+    else
+    {
+        static assert(0, "Only X86_64 support on DragonFlyBSD");
+    }
+
+    // <ucontext.h>
+    enum UCF_SWAPPED = 0x00000001;
+
+    struct ucontext_t
+    {
+        sigset_t        uc_sigmask;
+        mcontext_t      uc_mcontext;
+
+        ucontext_t*     uc_link;
+        stack_t         uc_stack;
+        void            function(ucontext_t *, void *) uc_cofunc;
+        void*           uc_arg;
+        int[4]          __spare__;
+    }
+}
 else version ( Solaris )
 {
     alias uint[4] upad128_t;
@@ -930,6 +1027,186 @@ else version ( Solaris )
         c_long[5]   uc_filler;
     }
 }
+else version( CRuntime_UClibc )
+{
+    version( X86_64 )
+    {
+        enum
+        {
+            REG_R8 = 0,
+            REG_R9,
+            REG_R10,
+            REG_R11,
+            REG_R12,
+            REG_R13,
+            REG_R14,
+            REG_R15,
+            REG_RDI,
+            REG_RSI,
+            REG_RBP,
+            REG_RBX,
+            REG_RDX,
+            REG_RAX,
+            REG_RCX,
+            REG_RSP,
+            REG_RIP,
+            REG_EFL,
+            REG_CSGSFS,     /* Actually short cs, gs, fs, __pad0.  */
+            REG_ERR,
+            REG_TRAPNO,
+            REG_OLDMASK,
+            REG_CR2
+        }
+
+        alias sigcontext mcontext_t;
+
+        struct ucontext_t
+        {
+            c_ulong         uc_flags;
+            ucontext_t*     uc_link;
+            stack_t         uc_stack;
+            mcontext_t      uc_mcontext;
+            sigset_t        uc_sigmask;
+        }
+    }
+    else version(MIPS32)
+    {
+        alias greg_t    = ulong;
+        enum NGREG      = 32;
+        enum NFPREG     = 32;
+        alias gregset_t = greg_t[NGREG];
+
+        struct fpregset_t
+        {
+            union fp_r
+            {
+                double[NFPREG]  fp_dregs;
+                struct _fp_fregs
+                {
+                    float   _fp_fregs;
+                    uint    _fp_pad;
+                }
+                _fp_fregs[NFPREG] fp_fregs;
+            }
+        }
+
+        version (MIPS_O32)
+        {
+            struct mcontext_t
+            {
+                uint regmask;
+                uint status;
+                greg_t pc;
+                gregset_t gregs;
+                fpregset_t fpregs;
+                uint fp_owned;
+                uint fpc_csr;
+                uint fpc_eir;
+                uint used_math;
+                uint dsp;
+                greg_t mdhi;
+                greg_t mdlo;
+                c_ulong hi1;
+                c_ulong lo1;
+                c_ulong hi2;
+                c_ulong lo2;
+                c_ulong hi3;
+                c_ulong lo3;
+            }
+        }
+        else
+        {
+            struct mcontext_t
+            {
+                gregset_t gregs;
+                fpregset_t fpregs;
+                greg_t mdhi;
+                greg_t hi1;
+                greg_t hi2;
+                greg_t hi3;
+                greg_t mdlo;
+                greg_t lo1;
+                greg_t lo2;
+                greg_t lo3;
+                greg_t pc;
+                uint fpc_csr;
+                uint used_math;
+                uint dsp;
+                uint reserved;
+            }
+        }
+
+        struct ucontext_t
+        {
+            c_ulong uc_flags;
+            ucontext_t* uc_link;
+            stack_t uc_stack;
+            mcontext_t uc_mcontext;
+            sigset_t uc_sigmask;
+        }
+    }
+    else version(ARM)
+    {
+        enum
+        {
+            R0 = 0,
+            R1 = 1,
+            R2 = 2,
+            R3 = 3,
+            R4 = 4,
+            R5 = 5,
+            R6 = 6,
+            R7 = 7,
+            R8 = 8,
+            R9 = 9,
+            R10 = 10,
+            R11 = 11,
+            R12 = 12,
+            R13 = 13,
+            R14 = 14,
+            R15 = 15
+        }
+
+        struct sigcontext
+        {
+            c_ulong trap_no;
+            c_ulong error_code;
+            c_ulong oldmask;
+            c_ulong arm_r0;
+            c_ulong arm_r1;
+            c_ulong arm_r2;
+            c_ulong arm_r3;
+            c_ulong arm_r4;
+            c_ulong arm_r5;
+            c_ulong arm_r6;
+            c_ulong arm_r7;
+            c_ulong arm_r8;
+            c_ulong arm_r9;
+            c_ulong arm_r10;
+            c_ulong arm_fp;
+            c_ulong arm_ip;
+            c_ulong arm_sp;
+            c_ulong arm_lr;
+            c_ulong arm_pc;
+            c_ulong arm_cpsr;
+            c_ulong fault_address;
+        }
+
+        alias sigcontext mcontext_t;
+
+        struct ucontext_t
+        {
+            c_ulong uc_flags;
+            ucontext_t* uc_link;
+            stack_t uc_stack;
+            mcontext_t uc_mcontext;
+            sigset_t uc_sigmask;
+            align(8) c_ulong[128] uc_regspace;
+        }
+    }
+    else
+        static assert(0, "unimplemented");
+}
 
 //
 // Obsolescent (OB)
diff --git a/libphobos/libdruntime/core/sys/posix/unistd.d b/libphobos/libdruntime/core/sys/posix/unistd.d
index 8821e544d..6438a6aa5 100644
--- a/libphobos/libdruntime/core/sys/posix/unistd.d
+++ b/libphobos/libdruntime/core/sys/posix/unistd.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -86,6 +86,7 @@ int     rmdir(in char*);
 int     setegid(gid_t) @trusted;
 int     seteuid(uid_t) @trusted;
 int     setgid(gid_t) @trusted;
+int     setgroups(size_t, in gid_t*) @trusted;
 int     setpgid(pid_t, pid_t) @trusted;
 pid_t   setsid() @trusted;
 int     setuid(uid_t) @trusted;
@@ -130,6 +131,11 @@ else version(NetBSD)
     off_t lseek(int, off_t, int) @trusted;
     int   ftruncate(int, off_t) @trusted;
 }
+else version( DragonFlyBSD )
+{
+    off_t lseek(int, off_t, int) @trusted;
+    int   ftruncate(int, off_t) @trusted;
+}
 else version( Solaris )
 {
     version ( D_LP64 )
@@ -167,6 +173,34 @@ else version( CRuntime_Bionic )
     off_t lseek(int, off_t, int) @trusted;
     int   ftruncate(int, off_t) @trusted;
 }
+else version( CRuntime_Musl )
+{
+    int ftruncate(int, off_t) @trusted;
+    off_t lseek(int, off_t, int) @trusted;
+    alias ftruncate ftruncate64;
+    alias lseek lseek64;
+}
+else version( CRuntime_UClibc )
+{
+  static if( __USE_FILE_OFFSET64 )
+  {
+    off_t lseek64(int, off_t, int) @trusted;
+    alias lseek64 lseek;
+  }
+  else
+  {
+    off_t lseek(int, off_t, int) @trusted;
+  }
+  static if( __USE_LARGEFILE64 )
+  {
+    int   ftruncate64(int, off_t) @trusted;
+    alias ftruncate64 ftruncate;
+  }
+  else
+  {
+    int   ftruncate(int, off_t) @trusted;
+  }
+}
 
 version( CRuntime_Glibc )
 {
@@ -959,6 +993,161 @@ else version(NetBSD)
         _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS =  14,
     }
 }
+else version( DragonFlyBSD )
+{
+    enum F_OK       = 0;
+    enum R_OK       = 0x04;
+    enum W_OK       = 0x02;
+    enum X_OK       = 0x01;
+
+    enum F_ULOCK    = 0;
+    enum F_LOCK     = 1;
+    enum F_TLOCK    = 2;
+    enum F_TEST     = 3;
+
+    enum
+    {
+        _SC_ARG_MAX                        =   1,
+        _SC_CHILD_MAX                      =   2,
+        _SC_CLK_TCK                        =   3,
+        _SC_NGROUPS_MAX                    =   4,
+        _SC_OPEN_MAX                       =   5,
+        _SC_JOB_CONTROL                    =   6,
+        _SC_SAVED_IDS                      =   7,
+        _SC_VERSION                        =   8,
+        _SC_BC_BASE_MAX                    =   9,
+        _SC_BC_DIM_MAX                     =  10,
+        _SC_BC_SCALE_MAX                   =  11,
+        _SC_BC_STRING_MAX                  =  12,
+        _SC_COLL_WEIGHTS_MAX               =  13,
+        _SC_EXPR_NEST_MAX                  =  14,
+        _SC_LINE_MAX                       =  15,
+        _SC_RE_DUP_MAX                     =  16,
+        _SC_2_VERSION                      =  17,
+        _SC_2_C_BIND                       =  18,
+        _SC_2_C_DEV                        =  19,
+        _SC_2_CHAR_TERM                    =  20,
+        _SC_2_FORT_DEV                     =  21,
+        _SC_2_FORT_RUN                     =  22,
+        _SC_2_LOCALEDEF                    =  23,
+        _SC_2_SW_DEV                       =  24,
+        _SC_2_UPE                          =  25,
+        _SC_STREAM_MAX                     =  26,
+        _SC_TZNAME_MAX                     =  27,
+        _SC_ASYNCHRONOUS_IO                =  28,
+        _SC_MAPPED_FILES                   =  29,
+        _SC_MEMLOCK                        =  30,
+        _SC_MEMLOCK_RANGE                  =  31,
+        _SC_MEMORY_PROTECTION              =  32,
+        _SC_MESSAGE_PASSING                =  33,
+        _SC_PRIORITIZED_IO                 =  34,
+        _SC_PRIORITY_SCHEDULING            =  35,
+        _SC_REALTIME_SIGNALS               =  36,
+        _SC_SEMAPHORES                     =  37,
+        _SC_FSYNC                          =  38,
+        _SC_SHARED_MEMORY_OBJECTS          =  39,
+        _SC_SYNCHRONIZED_IO                =  40,
+        _SC_TIMERS                         =  41,
+        _SC_AIO_LISTIO_MAX                 =  42,
+        _SC_AIO_MAX                        =  43,
+        _SC_AIO_PRIO_DELTA_MAX             =  44,
+        _SC_DELAYTIMER_MAX                 =  45,
+        _SC_MQ_OPEN_MAX                    =  46,
+        _SC_PAGESIZE                       =  47,
+        _SC_RTSIG_MAX                      =  48,
+        _SC_SEM_NSEMS_MAX                  =  49,
+        _SC_SEM_VALUE_MAX                  =  50,
+        _SC_SIGQUEUE_MAX                   =  51,
+        _SC_TIMER_MAX                      =  52,
+        _SC_IOV_MAX                        =  56,
+        _SC_NPROCESSORS_CONF               =  57,
+        _SC_NPROCESSORS_ONLN               =  58,
+        _SC_2_PBS                          =  59,
+        _SC_2_PBS_ACCOUNTING               =  60,
+        _SC_2_PBS_CHECKPOINT               =  61,
+        _SC_2_PBS_LOCATE                   =  62,
+        _SC_2_PBS_MESSAGE                  =  63,
+        _SC_2_PBS_TRACK                    =  64,
+        _SC_ADVISORY_INFO                  =  65,
+        _SC_BARRIERS                       =  66,
+        _SC_CLOCK_SELECTION                =  67,
+        _SC_CPUTIME                        =  68,
+        _SC_FILE_LOCKING                   =  69,
+        _SC_GETGR_R_SIZE_MAX               =  70,
+        _SC_GETPW_R_SIZE_MAX               =  71,
+        _SC_HOST_NAME_MAX                  =  72,
+        _SC_LOGIN_NAME_MAX                 =  73,
+        _SC_MONOTONIC_CLOCK                =  74,
+        _SC_MQ_PRIO_MAX                    =  75,
+        _SC_READER_WRITER_LOCKS            =  76,
+        _SC_REGEXP                         =  77,
+        _SC_SHELL                          =  78,
+        _SC_SPAWN                          =  79,
+        _SC_SPIN_LOCKS                     =  80,
+        _SC_SPORADIC_SERVER                =  81,
+        _SC_THREAD_ATTR_STACKADDR          =  82,
+        _SC_THREAD_ATTR_STACKSIZE          =  83,
+        _SC_THREAD_CPUTIME                 =  84,
+        _SC_THREAD_DESTRUCTOR_ITERATIONS   =  85,
+        _SC_THREAD_KEYS_MAX                =  86,
+        _SC_THREAD_PRIO_INHERIT            =  87,
+        _SC_THREAD_PRIO_PROTECT            =  88,
+        _SC_THREAD_PRIORITY_SCHEDULING     =  89,
+        _SC_THREAD_PROCESS_SHARED          =  90,
+        _SC_THREAD_SAFE_FUNCTIONS          =  91,
+        _SC_THREAD_SPORADIC_SERVER         =  92,
+        _SC_THREAD_STACK_MIN               =  93,
+        _SC_THREAD_THREADS_MAX             =  94,
+        _SC_TIMEOUTS                       =  95,
+        _SC_THREADS                        =  96,
+        _SC_TRACE                          =  97,
+        _SC_TRACE_EVENT_FILTER             =  98,
+        _SC_TRACE_INHERIT                  =  99,
+        _SC_TRACE_LOG                      = 100,
+        _SC_TTY_NAME_MAX                   = 101,
+        _SC_TYPED_MEMORY_OBJECTS           = 102,
+        _SC_V6_ILP32_OFF32                 = 103,
+        _SC_V6_ILP32_OFFBIG                = 104,
+        _SC_V6_LP64_OFF64                  = 105,
+        _SC_V6_LPBIG_OFFBIG                = 106,
+        _SC_IPV6                           = 118,
+        _SC_RAW_SOCKETS                    = 119,
+        _SC_SYMLOOP_MAX                    = 120,
+        _SC_ATEXIT_MAX                     = 107,
+        _SC_XOPEN_CRYPT                    = 108,
+        _SC_XOPEN_ENH_I18N                 = 109,
+        _SC_XOPEN_LEGACY                   = 110,
+        _SC_XOPEN_REALTIME                 = 111,
+        _SC_XOPEN_REALTIME_THREADS         = 112,
+        _SC_XOPEN_SHM                      = 113,
+        _SC_XOPEN_STREAMS                  = 114,
+        _SC_XOPEN_UNIX                     = 115,
+        _SC_XOPEN_VERSION                  = 116,
+        _SC_XOPEN_XCU_VERSION              = 117,
+        _SC_CPUSET_SIZE                    = 122,
+        _SC_PHYS_PAGES                     = 121,
+    }
+
+    enum _SC_PAGE_SIZE = _SC_PAGESIZE;
+
+    enum
+    {
+        _CS_PATH                           =   1,
+        _CS_POSIX_V6_ILP32_OFF32_CFLAGS    =   2,
+        _CS_POSIX_V6_ILP32_OFF32_LDFLAGS   =   3,
+        _CS_POSIX_V6_ILP32_OFF32_LIBS      =   4,
+        _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS   =   5,
+        _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS  =   6,
+        _CS_POSIX_V6_ILP32_OFFBIG_LIBS     =   7,
+        _CS_POSIX_V6_LP64_OFF64_CFLAGS     =   8,
+        _CS_POSIX_V6_LP64_OFF64_LDFLAGS    =   9,
+        _CS_POSIX_V6_LP64_OFF64_LIBS       =  10,
+        _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS   =  11,
+        _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS  =  12,
+        _CS_POSIX_V6_LPBIG_OFFBIG_LIBS     =  13,
+        _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS =  14,
+    }
+}
 else version( CRuntime_Bionic )
 {
     enum F_OK       = 0;
@@ -1237,72 +1426,645 @@ else version( Solaris )
 
     enum _PC_LAST = 101;
 }
-
-//
-// File Synchronization (FSC)
-//
-/*
-int fsync(int);
-*/
-
-version( CRuntime_Glibc )
-{
-    int fsync(int) @trusted;
-}
-else version( Darwin )
-{
-    int fsync(int) @trusted;
-}
-else version( FreeBSD )
-{
-    int fsync(int) @trusted;
-}
-else version(NetBSD)
-{
-    int fsync(int) @trusted;
-}
-else version( CRuntime_Bionic )
-{
-    int fsync(int) @trusted;
-}
-else version( Solaris )
+else version( CRuntime_Musl )
 {
-    int fsync(int) @trusted;
-}
+    enum F_OK       = 0;
+    enum R_OK       = 4;
+    enum W_OK       = 2;
+    enum X_OK       = 1;
 
-//
-// Synchronized I/O (SIO)
-//
-/*
-int fdatasync(int);
-*/
+    enum F_ULOCK    = 0;
+    enum F_LOCK     = 1;
+    enum F_TLOCK    = 2;
+    enum F_TEST     = 3;
 
-version( CRuntime_Glibc )
-{
-    int fdatasync(int) @trusted;
-}
-else version( Solaris )
-{
-    int fdatasync(int) @trusted;
-}
-else version( CRuntime_Bionic )
-{
-    int fdatasync(int) @trusted;
-}
+    enum
+    {
+        _CS_PATH,
+        _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS,
+        _CS_GNU_LIBC_VERSION,
+        _CS_GNU_LIBPTHREAD_VERSION,
+        _CS_POSIX_V5_WIDTH_RESTRICTED_ENVS,
+        _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS,
 
-//
-// XOpen (XSI)
-//
-/*
-char*      crypt(in char*, in char*);
-char*      ctermid(char*);
-void       encrypt(ref char[64], int);
-int        fchdir(int);
-c_long     gethostid();
-pid_t      getpgid(pid_t);
-pid_t      getsid(pid_t);
-char*      getwd(char*); // LEGACY
-int        lchown(in char*, uid_t, gid_t);
+        _CS_POSIX_V6_ILP32_OFF32_CFLAGS = 1116,
+        _CS_POSIX_V6_ILP32_OFF32_LDFLAGS,
+        _CS_POSIX_V6_ILP32_OFF32_LIBS,
+        _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS,
+        _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS,
+        _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS,
+        _CS_POSIX_V6_ILP32_OFFBIG_LIBS,
+        _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS,
+        _CS_POSIX_V6_LP64_OFF64_CFLAGS,
+        _CS_POSIX_V6_LP64_OFF64_LDFLAGS,
+        _CS_POSIX_V6_LP64_OFF64_LIBS,
+        _CS_POSIX_V6_LP64_OFF64_LINTFLAGS,
+        _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS,
+        _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS,
+        _CS_POSIX_V6_LPBIG_OFFBIG_LIBS,
+        _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS,
+        _CS_POSIX_V7_ILP32_OFF32_CFLAGS,
+        _CS_POSIX_V7_ILP32_OFF32_LDFLAGS,
+        _CS_POSIX_V7_ILP32_OFF32_LIBS,
+        _CS_POSIX_V7_ILP32_OFF32_LINTFLAGS,
+        _CS_POSIX_V7_ILP32_OFFBIG_CFLAGS,
+        _CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS,
+        _CS_POSIX_V7_ILP32_OFFBIG_LIBS,
+        _CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS,
+        _CS_POSIX_V7_LP64_OFF64_CFLAGS,
+        _CS_POSIX_V7_LP64_OFF64_LDFLAGS,
+        _CS_POSIX_V7_LP64_OFF64_LIBS,
+        _CS_POSIX_V7_LP64_OFF64_LINTFLAGS,
+        _CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS,
+        _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS,
+        _CS_POSIX_V7_LPBIG_OFFBIG_LIBS,
+        _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS,
+        _CS_V6_ENV,
+        _CS_V7_ENV
+    }
+
+    enum
+    {
+        _PC_LINK_MAX,
+        _PC_MAX_CANON,
+        _PC_MAX_INPUT,
+        _PC_NAME_MAX,
+        _PC_PATH_MAX,
+        _PC_PIPE_BUF,
+        _PC_CHOWN_RESTRICTED,
+        _PC_NO_TRUNC,
+        _PC_VDISABLE,
+        _PC_SYNC_IO,
+        _PC_ASYNC_IO,
+        _PC_PRIO_IO,
+        _PC_SOCK_MAXBUF,
+        _PC_FILESIZEBITS,
+        _PC_REC_INCR_XFER_SIZE,
+        _PC_REC_MAX_XFER_SIZE,
+        _PC_REC_MIN_XFER_SIZE,
+        _PC_REC_XFER_ALIGN,
+        _PC_ALLOC_SIZE_MIN,
+        _PC_SYMLINK_MAX,
+        _PC_2_SYMLINKS
+    }
+
+    enum
+    {
+        _SC_ARG_MAX,
+        _SC_CHILD_MAX,
+        _SC_CLK_TCK,
+        _SC_NGROUPS_MAX,
+        _SC_OPEN_MAX,
+        _SC_STREAM_MAX,
+        _SC_TZNAME_MAX,
+        _SC_JOB_CONTROL,
+        _SC_SAVED_IDS,
+        _SC_REALTIME_SIGNALS,
+        _SC_PRIORITY_SCHEDULING,
+        _SC_TIMERS,
+        _SC_ASYNCHRONOUS_IO,
+        _SC_PRIORITIZED_IO,
+        _SC_SYNCHRONIZED_IO,
+        _SC_FSYNC,
+        _SC_MAPPED_FILES,
+        _SC_MEMLOCK,
+        _SC_MEMLOCK_RANGE,
+        _SC_MEMORY_PROTECTION,
+        _SC_MESSAGE_PASSING,
+        _SC_SEMAPHORES,
+        _SC_SHARED_MEMORY_OBJECTS,
+        _SC_AIO_LISTIO_MAX,
+        _SC_AIO_MAX,
+        _SC_AIO_PRIO_DELTA_MAX,
+        _SC_DELAYTIMER_MAX,
+        _SC_MQ_OPEN_MAX,
+        _SC_MQ_PRIO_MAX,
+        _SC_VERSION,
+        _SC_PAGE_SIZE,
+        _SC_PAGESIZE = _SC_PAGE_SIZE,
+        _SC_RTSIG_MAX,
+        _SC_SEM_NSEMS_MAX,
+        _SC_SEM_VALUE_MAX,
+        _SC_SIGQUEUE_MAX,
+        _SC_TIMER_MAX,
+        _SC_BC_BASE_MAX,
+        _SC_BC_DIM_MAX,
+        _SC_BC_SCALE_MAX,
+        _SC_BC_STRING_MAX,
+        _SC_COLL_WEIGHTS_MAX,
+
+        _SC_EXPR_NEST_MAX = 42,
+        _SC_LINE_MAX,
+        _SC_RE_DUP_MAX,
+
+        _SC_2_VERSION = 46,
+        _SC_2_C_BIND,
+        _SC_2_C_DEV,
+        _SC_2_FORT_DEV,
+        _SC_2_FORT_RUN,
+        _SC_2_SW_DEV,
+        _SC_2_LOCALEDEF,
+
+        _SC_UIO_MAXIOV = 60,
+        _SC_IOV_MAX = _SC_UIO_MAXIOV,
+
+        _SC_THREADS = 67,
+        _SC_THREAD_SAFE_FUNCTIONS,
+        _SC_GETGR_R_SIZE_MAX,
+        _SC_GETPW_R_SIZE_MAX,
+        _SC_LOGIN_NAME_MAX,
+        _SC_TTY_NAME_MAX,
+        _SC_THREAD_DESTRUCTOR_ITERATIONS,
+        _SC_THREAD_KEYS_MAX,
+        _SC_THREAD_STACK_MIN,
+        _SC_THREAD_THREADS_MAX,
+        _SC_THREAD_ATTR_STACKADDR,
+        _SC_THREAD_ATTR_STACKSIZE,
+        _SC_THREAD_PRIORITY_SCHEDULING,
+        _SC_THREAD_PRIO_INHERIT,
+        _SC_THREAD_PRIO_PROTECT,
+        _SC_THREAD_PROCESS_SHARED,
+
+        _SC_NPROCESSORS_CONF,
+        _SC_NPROCESSORS_ONLN,
+        _SC_PHYS_PAGES,
+        _SC_AVPHYS_PAGES,
+        _SC_ATEXIT_MAX,
+        _SC_PASS_MAX,
+
+        _SC_XOPEN_VERSION,
+        _SC_XOPEN_XCU_VERSION,
+        _SC_XOPEN_UNIX,
+        _SC_XOPEN_CRYPT,
+        _SC_XOPEN_ENH_I18N,
+        _SC_XOPEN_SHM,
+
+        _SC_2_CHAR_TERM,
+        _SC_2_UPE = 97,
+
+        _SC_XOPEN_XPG2,
+        _SC_XOPEN_XPG3,
+        _SC_XOPEN_XPG4,
+
+        _SC_NZERO = 109,
+
+        _SC_XBS5_ILP32_OFF32 = 125,
+        _SC_XBS5_ILP32_OFFBIG,
+        _SC_XBS5_LP64_OFF64,
+        _SC_XBS5_LPBIG_OFFBIG,
+
+        _SC_XOPEN_LEGACY,
+        _SC_XOPEN_REALTIME,
+        _SC_XOPEN_REALTIME_THREADS,
+
+        _SC_ADVISORY_INFO,
+        _SC_BARRIERS,
+        _SC_CLOCK_SELECTION = 137,
+        _SC_CPUTIME,
+        _SC_THREAD_CPUTIME,
+        _SC_MONOTONIC_CLOCK = 149,
+        _SC_READER_WRITER_LOCKS = 153,
+        _SC_SPIN_LOCKS,
+        _SC_REGEXP,
+        _SC_SHELL = 157,
+        _SC_SPAWN = 159,
+        _SC_SPORADIC_SERVER,
+        _SC_THREAD_SPORADIC_SERVER,
+        _SC_TIMEOUTS = 164,
+        _SC_TYPED_MEMORY_OBJECTS,
+        _SC_2_PBS = 168,
+        _SC_2_PBS_ACCOUNTING,
+        _SC_2_PBS_LOCATE,
+        _SC_2_PBS_MESSAGE,
+        _SC_2_PBS_TRACK,
+        _SC_SYMLOOP_MAX,
+        _SC_STREAMS,
+        _SC_2_PBS_CHECKPOINT,
+
+        _SC_V6_ILP32_OFF32,
+        _SC_V6_ILP32_OFFBIG,
+        _SC_V6_LP64_OFF64,
+        _SC_V6_LPBIG_OFFBIG,
+
+        _SC_HOST_NAME_MAX,
+        _SC_TRACE,
+        _SC_TRACE_EVENT_FILTER,
+        _SC_TRACE_INHERIT,
+        _SC_TRACE_LOG,
+
+        _SC_IPV6 = 235,
+        _SC_RAW_SOCKETS,
+        _SC_V7_ILP32_OFF32,
+        _SC_V7_ILP32_OFFBIG,
+        _SC_V7_LP64_OFF64,
+        _SC_V7_LPBIG_OFFBIG,
+        _SC_SS_REPL_MAX,
+        _SC_TRACE_EVENT_NAME_MAX,
+        _SC_TRACE_NAME_MAX,
+        _SC_TRACE_SYS_MAX,
+        _SC_TRACE_USER_EVENT_MAX,
+        _SC_XOPEN_STREAMS,
+        _SC_THREAD_ROBUST_PRIO_INHERIT,
+        _SC_THREAD_ROBUST_PRIO_PROTECT
+    }
+}
+else version( CRuntime_UClibc )
+{
+    enum F_OK       = 0;
+    enum R_OK       = 4;
+    enum W_OK       = 2;
+    enum X_OK       = 1;
+
+    enum F_ULOCK    = 0;
+    enum F_LOCK     = 1;
+    enum F_TLOCK    = 2;
+    enum F_TEST     = 3;
+
+    enum
+    {
+        _CS_PATH,
+
+        _CS_V6_WIDTH_RESTRICTED_ENVS,
+
+        _CS_GNU_LIBC_VERSION,
+        _CS_GNU_LIBPTHREAD_VERSION,
+
+        _CS_LFS_CFLAGS = 1000,
+        _CS_LFS_LDFLAGS,
+        _CS_LFS_LIBS,
+        _CS_LFS_LINTFLAGS,
+        _CS_LFS64_CFLAGS,
+        _CS_LFS64_LDFLAGS,
+        _CS_LFS64_LIBS,
+        _CS_LFS64_LINTFLAGS,
+
+        _CS_XBS5_ILP32_OFF32_CFLAGS = 1100,
+        _CS_XBS5_ILP32_OFF32_LDFLAGS,
+        _CS_XBS5_ILP32_OFF32_LIBS,
+        _CS_XBS5_ILP32_OFF32_LINTFLAGS,
+        _CS_XBS5_ILP32_OFFBIG_CFLAGS,
+        _CS_XBS5_ILP32_OFFBIG_LDFLAGS,
+        _CS_XBS5_ILP32_OFFBIG_LIBS,
+        _CS_XBS5_ILP32_OFFBIG_LINTFLAGS,
+        _CS_XBS5_LP64_OFF64_CFLAGS,
+        _CS_XBS5_LP64_OFF64_LDFLAGS,
+        _CS_XBS5_LP64_OFF64_LIBS,
+        _CS_XBS5_LP64_OFF64_LINTFLAGS,
+        _CS_XBS5_LPBIG_OFFBIG_CFLAGS,
+        _CS_XBS5_LPBIG_OFFBIG_LDFLAGS,
+        _CS_XBS5_LPBIG_OFFBIG_LIBS,
+        _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS,
+
+        _CS_POSIX_V6_ILP32_OFF32_CFLAGS,
+        _CS_POSIX_V6_ILP32_OFF32_LDFLAGS,
+        _CS_POSIX_V6_ILP32_OFF32_LIBS,
+        _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS,
+        _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS,
+        _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS,
+        _CS_POSIX_V6_ILP32_OFFBIG_LIBS,
+        _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS,
+        _CS_POSIX_V6_LP64_OFF64_CFLAGS,
+        _CS_POSIX_V6_LP64_OFF64_LDFLAGS,
+        _CS_POSIX_V6_LP64_OFF64_LIBS,
+        _CS_POSIX_V6_LP64_OFF64_LINTFLAGS,
+        _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS,
+        _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS,
+        _CS_POSIX_V6_LPBIG_OFFBIG_LIBS,
+        _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS
+    }
+
+    enum
+    {
+        _PC_LINK_MAX,
+        _PC_MAX_CANON,
+        _PC_MAX_INPUT,
+        _PC_NAME_MAX,
+        _PC_PATH_MAX,
+        _PC_PIPE_BUF,
+        _PC_CHOWN_RESTRICTED,
+        _PC_NO_TRUNC,
+        _PC_VDISABLE,
+        _PC_SYNC_IO,
+        _PC_ASYNC_IO,
+        _PC_PRIO_IO,
+        _PC_SOCK_MAXBUF,
+        _PC_FILESIZEBITS,
+        _PC_REC_INCR_XFER_SIZE,
+        _PC_REC_MAX_XFER_SIZE,
+        _PC_REC_MIN_XFER_SIZE,
+        _PC_REC_XFER_ALIGN,
+        _PC_ALLOC_SIZE_MIN,
+        _PC_SYMLINK_MAX,
+        _PC_2_SYMLINKS
+    }
+
+    enum
+    {
+        _SC_ARG_MAX,
+        _SC_CHILD_MAX,
+        _SC_CLK_TCK,
+        _SC_NGROUPS_MAX,
+        _SC_OPEN_MAX,
+        _SC_STREAM_MAX,
+        _SC_TZNAME_MAX,
+        _SC_JOB_CONTROL,
+        _SC_SAVED_IDS,
+        _SC_REALTIME_SIGNALS,
+        _SC_PRIORITY_SCHEDULING,
+        _SC_TIMERS,
+        _SC_ASYNCHRONOUS_IO,
+        _SC_PRIORITIZED_IO,
+        _SC_SYNCHRONIZED_IO,
+        _SC_FSYNC,
+        _SC_MAPPED_FILES,
+        _SC_MEMLOCK,
+        _SC_MEMLOCK_RANGE,
+        _SC_MEMORY_PROTECTION,
+        _SC_MESSAGE_PASSING,
+        _SC_SEMAPHORES,
+        _SC_SHARED_MEMORY_OBJECTS,
+        _SC_AIO_LISTIO_MAX,
+        _SC_AIO_MAX,
+        _SC_AIO_PRIO_DELTA_MAX,
+        _SC_DELAYTIMER_MAX,
+        _SC_MQ_OPEN_MAX,
+        _SC_MQ_PRIO_MAX,
+        _SC_VERSION,
+        _SC_PAGESIZE,
+        _SC_PAGE_SIZE = _SC_PAGESIZE,
+        _SC_RTSIG_MAX,
+        _SC_SEM_NSEMS_MAX,
+        _SC_SEM_VALUE_MAX,
+        _SC_SIGQUEUE_MAX,
+        _SC_TIMER_MAX,
+
+        _SC_BC_BASE_MAX,
+        _SC_BC_DIM_MAX,
+        _SC_BC_SCALE_MAX,
+        _SC_BC_STRING_MAX,
+        _SC_COLL_WEIGHTS_MAX,
+        _SC_EQUIV_CLASS_MAX,
+        _SC_EXPR_NEST_MAX,
+        _SC_LINE_MAX,
+        _SC_RE_DUP_MAX,
+        _SC_CHARCLASS_NAME_MAX,
+
+        _SC_2_VERSION,
+        _SC_2_C_BIND,
+        _SC_2_C_DEV,
+        _SC_2_FORT_DEV,
+        _SC_2_FORT_RUN,
+        _SC_2_SW_DEV,
+        _SC_2_LOCALEDEF,
+
+        _SC_PII,
+        _SC_PII_XTI,
+        _SC_PII_SOCKET,
+        _SC_PII_INTERNET,
+        _SC_PII_OSI,
+        _SC_POLL,
+        _SC_SELECT,
+        _SC_UIO_MAXIOV,
+        _SC_IOV_MAX = _SC_UIO_MAXIOV,
+        _SC_PII_INTERNET_STREAM,
+        _SC_PII_INTERNET_DGRAM,
+        _SC_PII_OSI_COTS,
+        _SC_PII_OSI_CLTS,
+        _SC_PII_OSI_M,
+        _SC_T_IOV_MAX,
+
+        _SC_THREADS,
+        _SC_THREAD_SAFE_FUNCTIONS,
+        _SC_GETGR_R_SIZE_MAX,
+        _SC_GETPW_R_SIZE_MAX,
+        _SC_LOGIN_NAME_MAX,
+        _SC_TTY_NAME_MAX,
+        _SC_THREAD_DESTRUCTOR_ITERATIONS,
+        _SC_THREAD_KEYS_MAX,
+        _SC_THREAD_STACK_MIN,
+        _SC_THREAD_THREADS_MAX,
+        _SC_THREAD_ATTR_STACKADDR,
+        _SC_THREAD_ATTR_STACKSIZE,
+        _SC_THREAD_PRIORITY_SCHEDULING,
+        _SC_THREAD_PRIO_INHERIT,
+        _SC_THREAD_PRIO_PROTECT,
+        _SC_THREAD_PROCESS_SHARED,
+
+        _SC_NPROCESSORS_CONF,
+        _SC_NPROCESSORS_ONLN,
+        _SC_PHYS_PAGES,
+        _SC_AVPHYS_PAGES,
+        _SC_ATEXIT_MAX,
+        _SC_PASS_MAX,
+
+        _SC_XOPEN_VERSION,
+        _SC_XOPEN_XCU_VERSION,
+        _SC_XOPEN_UNIX,
+        _SC_XOPEN_CRYPT,
+        _SC_XOPEN_ENH_I18N,
+        _SC_XOPEN_SHM,
+
+        _SC_2_CHAR_TERM,
+        _SC_2_C_VERSION,
+        _SC_2_UPE,
+
+        _SC_XOPEN_XPG2,
+        _SC_XOPEN_XPG3,
+        _SC_XOPEN_XPG4,
+
+        _SC_CHAR_BIT,
+        _SC_CHAR_MAX,
+        _SC_CHAR_MIN,
+        _SC_INT_MAX,
+        _SC_INT_MIN,
+        _SC_LONG_BIT,
+        _SC_WORD_BIT,
+        _SC_MB_LEN_MAX,
+        _SC_NZERO,
+        _SC_SSIZE_MAX,
+        _SC_SCHAR_MAX,
+        _SC_SCHAR_MIN,
+        _SC_SHRT_MAX,
+        _SC_SHRT_MIN,
+        _SC_UCHAR_MAX,
+        _SC_UINT_MAX,
+        _SC_ULONG_MAX,
+        _SC_USHRT_MAX,
+
+        _SC_NL_ARGMAX,
+        _SC_NL_LANGMAX,
+        _SC_NL_MSGMAX,
+        _SC_NL_NMAX,
+        _SC_NL_SETMAX,
+        _SC_NL_TEXTMAX,
+
+        _SC_XBS5_ILP32_OFF32,
+        _SC_XBS5_ILP32_OFFBIG,
+        _SC_XBS5_LP64_OFF64,
+        _SC_XBS5_LPBIG_OFFBIG,
+
+        _SC_XOPEN_LEGACY,
+        _SC_XOPEN_REALTIME,
+        _SC_XOPEN_REALTIME_THREADS,
+
+        _SC_ADVISORY_INFO,
+        _SC_BARRIERS,
+        _SC_BASE,
+        _SC_C_LANG_SUPPORT,
+        _SC_C_LANG_SUPPORT_R,
+        _SC_CLOCK_SELECTION,
+        _SC_CPUTIME,
+        _SC_THREAD_CPUTIME,
+        _SC_DEVICE_IO,
+        _SC_DEVICE_SPECIFIC,
+        _SC_DEVICE_SPECIFIC_R,
+        _SC_FD_MGMT,
+        _SC_FIFO,
+        _SC_PIPE,
+        _SC_FILE_ATTRIBUTES,
+        _SC_FILE_LOCKING,
+        _SC_FILE_SYSTEM,
+        _SC_MONOTONIC_CLOCK,
+        _SC_MULTI_PROCESS,
+        _SC_SINGLE_PROCESS,
+        _SC_NETWORKING,
+        _SC_READER_WRITER_LOCKS,
+        _SC_SPIN_LOCKS,
+        _SC_REGEXP,
+        _SC_REGEX_VERSION,
+        _SC_SHELL,
+        _SC_SIGNALS,
+        _SC_SPAWN,
+        _SC_SPORADIC_SERVER,
+        _SC_THREAD_SPORADIC_SERVER,
+        _SC_SYSTEM_DATABASE,
+        _SC_SYSTEM_DATABASE_R,
+        _SC_TIMEOUTS,
+        _SC_TYPED_MEMORY_OBJECTS,
+        _SC_USER_GROUPS,
+        _SC_USER_GROUPS_R,
+        _SC_2_PBS,
+        _SC_2_PBS_ACCOUNTING,
+        _SC_2_PBS_LOCATE,
+        _SC_2_PBS_MESSAGE,
+        _SC_2_PBS_TRACK,
+        _SC_SYMLOOP_MAX,
+        _SC_STREAMS,
+        _SC_2_PBS_CHECKPOINT,
+
+        _SC_V6_ILP32_OFF32,
+        _SC_V6_ILP32_OFFBIG,
+        _SC_V6_LP64_OFF64,
+        _SC_V6_LPBIG_OFFBIG,
+
+        _SC_HOST_NAME_MAX,
+        _SC_TRACE,
+        _SC_TRACE_EVENT_FILTER,
+        _SC_TRACE_INHERIT,
+        _SC_TRACE_LOG,
+
+        _SC_LEVEL1_ICACHE_SIZE,
+        _SC_LEVEL1_ICACHE_ASSOC,
+        _SC_LEVEL1_ICACHE_LINESIZE,
+        _SC_LEVEL1_DCACHE_SIZE,
+        _SC_LEVEL1_DCACHE_ASSOC,
+        _SC_LEVEL1_DCACHE_LINESIZE,
+        _SC_LEVEL2_CACHE_SIZE,
+        _SC_LEVEL2_CACHE_ASSOC,
+        _SC_LEVEL2_CACHE_LINESIZE,
+        _SC_LEVEL3_CACHE_SIZE,
+        _SC_LEVEL3_CACHE_ASSOC,
+        _SC_LEVEL3_CACHE_LINESIZE,
+        _SC_LEVEL4_CACHE_SIZE,
+        _SC_LEVEL4_CACHE_ASSOC,
+        _SC_LEVEL4_CACHE_LINESIZE,
+
+        _SC_IPV6 = _SC_LEVEL1_ICACHE_SIZE + 50,
+        _SC_RAW_SOCKETS
+    }
+}
+
+//
+// File Synchronization (FSC)
+//
+/*
+int fsync(int);
+*/
+
+version( CRuntime_Glibc )
+{
+    int fsync(int) @trusted;
+}
+else version( Darwin )
+{
+    int fsync(int) @trusted;
+}
+else version( FreeBSD )
+{
+    int fsync(int) @trusted;
+}
+else version(NetBSD)
+{
+    int fsync(int) @trusted;
+}
+else version( DragonFlyBSD )
+{
+    int fsync(int) @trusted;
+}
+else version( CRuntime_Bionic )
+{
+    int fsync(int) @trusted;
+}
+else version( CRuntime_Musl )
+{
+    int fsync(int) @trusted;
+}
+else version( Solaris )
+{
+    int fsync(int) @trusted;
+}
+else version( CRuntime_UClibc )
+{
+    int fsync(int) @trusted;
+}
+
+//
+// Synchronized I/O (SIO)
+//
+/*
+int fdatasync(int);
+*/
+
+version( CRuntime_Glibc )
+{
+    int fdatasync(int) @trusted;
+}
+else version( Solaris )
+{
+    int fdatasync(int) @trusted;
+}
+else version( CRuntime_Bionic )
+{
+    int fdatasync(int) @trusted;
+}
+else version( CRuntime_UClibc )
+{
+    int fdatasync(int) @trusted;
+}
+
+//
+// XOpen (XSI)
+//
+/*
+char*      crypt(in char*, in char*);
+char*      ctermid(char*);
+void       encrypt(ref char[64], int);
+int        fchdir(int);
+c_long     gethostid();
+pid_t      getpgid(pid_t);
+pid_t      getsid(pid_t);
+char*      getwd(char*); // LEGACY
+int        lchown(in char*, uid_t, gid_t);
 int        lockf(int, int, off_t);
 int        nice(int);
 ssize_t    pread(int, void*, size_t, off_t);
@@ -1365,6 +2127,12 @@ version( CRuntime_Glibc )
     int        truncate(in char*, off_t);
   }
 }
+else version( CRuntime_Musl )
+{
+    int fchdir(int) @trusted;
+    int lockf(int, int, off_t);
+    alias lockf lockf64;
+}
 else version( Darwin )
 {
     char*      crypt(in char*, in char*);
@@ -1440,6 +2208,31 @@ else version(NetBSD)
     int        usleep(useconds_t) @trusted;
     pid_t      vfork();
 }
+else version( DragonFlyBSD )
+{
+    char*      crypt(in char*, in char*);
+    //char*      ctermid(char*);
+    void       encrypt(ref char[64], int) @trusted;
+    int        fchdir(int) @trusted;
+    c_long     gethostid() @trusted;
+    int        getpgid(pid_t) @trusted;
+    int        getsid(pid_t) @trusted;
+    char*      getwd(char*); // LEGACY
+    int        lchown(in char*, uid_t, gid_t);
+    int        lockf(int, int, off_t) @trusted;
+    int        nice(int) @trusted;
+    ssize_t    pread(int, void*, size_t, off_t);
+    ssize_t    pwrite(int, in void*, size_t, off_t);
+    int        setpgrp(pid_t, pid_t) @trusted;
+    int        setregid(gid_t, gid_t) @trusted;
+    int        setreuid(uid_t, uid_t) @trusted;
+    void       swab(in void*, void*, ssize_t);
+    void       sync() @trusted;
+    int        truncate(in char*, off_t);
+    useconds_t ualarm(useconds_t, useconds_t) @trusted;
+    int        usleep(useconds_t) @trusted;
+    pid_t      vfork();
+}
 else version( CRuntime_Bionic )
 {
     int        fchdir(int) @trusted;
@@ -1516,3 +2309,46 @@ else version( Solaris )
         }
     }
 }
+else version( CRuntime_UClibc )
+{
+    char*      crypt(in char*, in char*);
+    char*      ctermid(char*);
+    void       encrypt(ref char[64], int) @trusted;
+    int        fchdir(int) @trusted;
+    c_long     gethostid() @trusted;
+    pid_t      getpgid(pid_t) @trusted;
+    pid_t      getsid(pid_t) @trusted;
+    char*      getwd(char*); // LEGACY
+    int        lchown(in char*, uid_t, gid_t);
+    int        nice(int) @trusted;
+    pid_t      setpgrp() @trusted;
+    int        setregid(gid_t, gid_t) @trusted;
+    int        setreuid(uid_t, uid_t) @trusted;
+    void       swab(in void*, void*, ssize_t);
+    void       sync() @trusted;
+    useconds_t ualarm(useconds_t, useconds_t) @trusted;
+    int        usleep(useconds_t) @trusted;
+    pid_t      vfork();
+
+  static if( __USE_FILE_OFFSET64 )
+  {
+    int        lockf64(int, int, off_t) @trusted;
+    alias      lockf64 lockf;
+
+    ssize_t    pread64(int, void*, size_t, off_t);
+    alias      pread64 pread;
+
+    ssize_t    pwrite64(int, in void*, size_t, off_t);
+    alias      pwrite64 pwrite;
+
+    int        truncate64(in char*, off_t);
+    alias      truncate64 truncate;
+  }
+  else
+  {
+    int        lockf(int, int, off_t) @trusted;
+    ssize_t    pread(int, void*, size_t, off_t);
+    ssize_t    pwrite(int, in void*, size_t, off_t);
+    int        truncate(in char*, off_t);
+  }
+}
diff --git a/libphobos/libdruntime/core/sys/posix/utime.d b/libphobos/libdruntime/core/sys/posix/utime.d
index 89d15f56e..a45182854 100644
--- a/libphobos/libdruntime/core/sys/posix/utime.d
+++ b/libphobos/libdruntime/core/sys/posix/utime.d
@@ -2,7 +2,7 @@
  * D header file for POSIX.
  *
  * Copyright: Copyright Sean Kelly 2005 - 2009.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Sean Kelly
  * Standards: The Open Group Base Specifications Issue 6, IEEE Std 1003.1, 2004 Edition
  */
@@ -54,6 +54,16 @@ version( CRuntime_Glibc )
 
     int utime(in char*, in utimbuf*);
 }
+else version( CRuntime_Musl )
+{
+    struct utimbuf
+    {
+        time_t  actime;
+        time_t  modtime;
+    }
+
+    int utime(in char*, in utimbuf*);
+}
 else version( Darwin )
 {
     struct utimbuf
@@ -84,6 +94,16 @@ else version(NetBSD)
 
     int utime(in char*, in utimbuf*);
 }
+else version( DragonFlyBSD )
+{
+    struct utimbuf
+    {
+        time_t  actime;
+        time_t  modtime;
+    }
+
+    int utime(in char*, in utimbuf*);
+}
 else version( Solaris )
 {
     struct utimbuf
@@ -104,3 +124,13 @@ else version( CRuntime_Bionic )
 
     int utime(in char*, in utimbuf*);
 }
+else version( CRuntime_UClibc )
+{
+    struct utimbuf
+    {
+        time_t  actime;
+        time_t  modtime;
+    }
+
+    int utime(in char*, in utimbuf*);
+}
diff --git a/libphobos/libdruntime/core/sys/solaris/sys/elf.d b/libphobos/libdruntime/core/sys/solaris/sys/elf.d
index 5b59f22ab..c0312fc2b 100644
--- a/libphobos/libdruntime/core/sys/solaris/sys/elf.d
+++ b/libphobos/libdruntime/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;
diff --git a/libphobos/libdruntime/core/sys/solaris/sys/priocntl.d b/libphobos/libdruntime/core/sys/solaris/sys/priocntl.d
index 9640f1e39..81b8bbb7f 100644
--- a/libphobos/libdruntime/core/sys/solaris/sys/priocntl.d
+++ b/libphobos/libdruntime/core/sys/solaris/sys/priocntl.d
@@ -2,7 +2,7 @@
  * D header file for the Solaris priocntl(2) and priocntlset(2) functions.
  *
  * Copyright:   Copyright 2014 Jason King.
- * License:     $(WEB www.boost.org/LICENSE_1.0.txt, Boost License 1.0).
+ * License:     $(HTTP www.boost.org/LICENSE_1.0.txt, Boost License 1.0).
  * Authors:     Jason King
  */
 
@@ -20,6 +20,7 @@ nothrow:
 extern (C):
 
 import core.sys.posix.sys.types : caddr_t, id_t;
+import core.sys.posix.sys.wait : idtype_t;
 import core.stdc.config : c_long;
 import core.sys.solaris.sys.procset;
 import core.sys.solaris.sys.types : pri_t;
diff --git a/libphobos/libdruntime/core/sys/solaris/sys/procset.d b/libphobos/libdruntime/core/sys/solaris/sys/procset.d
index 856efffe3..43fa9978a 100644
--- a/libphobos/libdruntime/core/sys/solaris/sys/procset.d
+++ b/libphobos/libdruntime/core/sys/solaris/sys/procset.d
@@ -2,7 +2,7 @@
  * D header file defining a process set.
  *
  * Copyright:   Copyright 2014 Jason King.
- * License:     $(WEB www.boost.org/LICENSE_1.0.txt, Boost License 1.0).
+ * License:     $(HTTP www.boost.org/LICENSE_1.0.txt, Boost License 1.0).
  * Authors:     Jason King
  */
 
diff --git a/libphobos/libdruntime/core/sys/solaris/sys/types.d b/libphobos/libdruntime/core/sys/solaris/sys/types.d
index 0ec7f2695..4b30a686a 100644
--- a/libphobos/libdruntime/core/sys/solaris/sys/types.d
+++ b/libphobos/libdruntime/core/sys/solaris/sys/types.d
@@ -2,7 +2,7 @@
  * D header file that defines Solaris-specific types.
  *
  * Copyright:   Copyright 2014 Jason King.
- * License:     $(WEB www.boost.org/LICENSE_1.0.txt, Boost License 1.0).
+ * License:     $(HTTP www.boost.org/LICENSE_1.0.txt, Boost License 1.0).
  * Authors:     Jason King
  */
 
diff --git a/libphobos/libdruntime/core/sys/solaris/time.d b/libphobos/libdruntime/core/sys/solaris/time.d
index c5407ee5e..b785d1d97 100644
--- a/libphobos/libdruntime/core/sys/solaris/time.d
+++ b/libphobos/libdruntime/core/sys/solaris/time.d
@@ -4,7 +4,7 @@
     D header file for Solaris's extensions to POSIX's time.h.
 
     Copyright: Copyright 2014
-    License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+    License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
     Authors:   Kai Nacke
  +/
 module core.sys.solaris.time;
diff --git a/libphobos/libdruntime/core/sys/windows/mswsock.d b/libphobos/libdruntime/core/sys/windows/mswsock.d
index 295244e5c..f7088ee1d 100644
--- a/libphobos/libdruntime/core/sys/windows/mswsock.d
+++ b/libphobos/libdruntime/core/sys/windows/mswsock.d
@@ -106,7 +106,7 @@ extern(Windows) {
     const GUID WSAID_CONNECTEX = {0x25a207b9,0xddf3,0x4660,[0x8e,0xe9,0x76,0xe5,0x8c,0x74,0x06,0x3e]};
 }
 
-static if (_WIN32_WINNT > 0x501) {
+static if (_WIN32_WINNT >= 0x501) {
     /*  These appear to be constants for the TRANSMIT_PACKETS_ELEMENT
      *  structure below, so I've given them the same minimum version
      */
@@ -162,7 +162,9 @@ static if (_WIN32_WINNT > 0x501) {
         INT  cmsg_type;
         // followed by UCHAR cmsg_data[];
     }
+}
 
+static if (_WIN32_WINNT >= 0x600) {
     /* TODO: Standard Posix.1g macros as per RFC 2292, with WSA_uglification. */
     /* DK: MinGW doesn't define these, and neither does the MSDN docs.  Might have
        to actually look up RFC 2292... */
@@ -175,16 +177,15 @@ static if (_WIN32_WINNT > 0x501) {
     #endif
     +/
 
-    extern(Windows)
-    {
-        /*  WinXP+, Srv2k3+
-         *  ms-help://MS.MSDNQTR.2003FEB.1033/winsock/winsock/disconnectex_2.htm
-         */
-        BOOL DisconnectEx(SOCKET, LPOVERLAPPED, DWORD, DWORD);
-
-        /*  WinXP+, Srv2k3+
-         *  ms-help://MS.MSDNQTR.2003FEB.1033/winsock/winsock/wsarecvmsg_2.htm
-         */
-        int WSARecvMsg(SOCKET, LPWSAMSG, LPDWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE);
-    }
+    /*  Win Vista+, Srv2k3+
+     *  ms-help://MS.MSDNQTR.2003FEB.1033/winsock/winsock/disconnectex_2.htm
+     */
+    extern(Windows) BOOL DisconnectEx(SOCKET, LPOVERLAPPED, DWORD, DWORD);
+}
+
+static if (_WIN32_WINNT >= 0x501) {
+    /*  WinXP+, Srv2k3+
+     *  ms-help://MS.MSDNQTR.2003FEB.1033/winsock/winsock/wsarecvmsg_2.htm
+     */
+    extern(Windows) int WSARecvMsg(SOCKET, LPWSAMSG, LPDWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE);
 }
diff --git a/libphobos/libdruntime/core/sys/windows/odbcinst.d b/libphobos/libdruntime/core/sys/windows/odbcinst.d
index 9cf7921e1..8947b39ab 100644
--- a/libphobos/libdruntime/core/sys/windows/odbcinst.d
+++ b/libphobos/libdruntime/core/sys/windows/odbcinst.d
@@ -114,7 +114,7 @@ static if (ODBCVER >= 0x0250) {
     BOOL  ConfigDriverW(HWND,WORD,LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*);
     BOOL  SQLConfigDriver(HWND,WORD,LPCSTR,LPCSTR,LPSTR,WORD,WORD*);
     BOOL  SQLConfigDriverW(HWND,WORD,LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*);
-    deprecated {
+    deprecated ("Use SQLInstallTranslatorExW instead") {
         BOOL  SQLInstallTranslator(LPCSTR,LPCSTR,LPCSTR,LPSTR,WORD,WORD*,WORD,LPDWORD);
         BOOL  SQLInstallTranslatorW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*,WORD,LPDWORD);
     }
diff --git a/libphobos/libdruntime/core/sys/windows/stacktrace.d b/libphobos/libdruntime/core/sys/windows/stacktrace.d
index 1a6925f19..8bef6584a 100644
--- a/libphobos/libdruntime/core/sys/windows/stacktrace.d
+++ b/libphobos/libdruntime/core/sys/windows/stacktrace.d
@@ -293,9 +293,9 @@ private:
 
         auto res = formatStackFrame(pc);
         res ~= " in ";
-const(char)[] tempSymName = symName[0 .. strlen(symName)];
+        const(char)[] tempSymName = symName[0 .. strlen(symName)];
         //Deal with dmd mangling of long names
-        version(DigitalMars) version(Win32)
+        version(CRuntime_DigitalMars)
         {
             size_t decodeIndex = 0;
             tempSymName = decodeDmdString(tempSymName, decodeIndex);
diff --git a/libphobos/libdruntime/core/sys/windows/uuid.d b/libphobos/libdruntime/core/sys/windows/uuid.d
index 9a588f295..d3b979dac 100644
--- a/libphobos/libdruntime/core/sys/windows/uuid.d
+++ b/libphobos/libdruntime/core/sys/windows/uuid.d
@@ -3,8 +3,6 @@ version (Windows):
 
 import core.sys.windows.basetyps;
 
-export
-extern(C) {
 const IID _DBBMKGUID = {0xF6304BB0, 0xD188, 0x11CD, [0xAD, 0x48, 0x00, 0xAA, 0x00, 0x3C, 0x9C, 0xB6]};
 const IID _DBCIDGUID = {0xFE284700, 0xD188, 0x11CD, [0xAD, 0x48, 0x00, 0xAA, 0x00, 0x3C, 0x9C, 0xB6]};
 const IID _GUID_NAMEONLY = {0xE8BF1170, 0xD188, 0x11CD, [0xAD, 0x48, 0x00, 0xAA, 0x00, 0x3C, 0x9C, 0xB6]};
@@ -4077,4 +4075,3 @@ const IID TID_D3DRMVector = {0x3D82AB5E, 0x62DA, 0x11CF, [0xAB, 0x39, 0x00, 0x20
 const IID TID_DXFILEHeader = {0x3D82AB43, 0x62DA, 0x11CF, [0xAB, 0x39, 0x00, 0x20, 0xAF, 0x71, 0xE4, 0x33]};
 const IID WKPDID_D3DDebugObjectName = {1117490210, 37256, 19212, [135, 66, 172, 176, 191, 133, 194, 0]};
 const IID WKPDID_D3DDebugObjectNameW = {1288331224, 37407, 17096, [133, 102, 112, 202, 242, 169, 183, 65]};
-}
diff --git a/libphobos/libdruntime/core/sys/windows/winbase.d b/libphobos/libdruntime/core/sys/windows/winbase.d
index 8667de035..a8e40b19c 100644
--- a/libphobos/libdruntime/core/sys/windows/winbase.d
+++ b/libphobos/libdruntime/core/sys/windows/winbase.d
@@ -1845,7 +1845,6 @@ WINBASEAPI DWORD WINAPI GetCurrentThreadId(void);
     BOOL GetDiskFreeSpaceExW(LPCWSTR, PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER);
     UINT GetDriveTypeA(LPCSTR);
     UINT GetDriveTypeW(LPCWSTR);
-    LPSTR GetEnvironmentStrings(); // ???
     LPSTR GetEnvironmentStringsA();
     LPWSTR GetEnvironmentStringsW();
     DWORD GetEnvironmentVariableA(LPCSTR, LPSTR, DWORD);
@@ -2724,6 +2723,7 @@ version (Unicode) {
     alias GetDiskFreeSpaceA GetDiskFreeSpace;
     alias GetDiskFreeSpaceExA GetDiskFreeSpaceEx;
     alias GetDriveTypeA GetDriveType;
+    alias GetEnvironmentStringsA GetEnvironmentStrings;
     alias GetEnvironmentVariableA GetEnvironmentVariable;
     alias GetFileAttributesA GetFileAttributes;
     alias GetFullPathNameA GetFullPathName;
diff --git a/libphobos/libdruntime/core/sys/windows/wincon.d b/libphobos/libdruntime/core/sys/windows/wincon.d
index 130855fc0..6cebf9bf6 100644
--- a/libphobos/libdruntime/core/sys/windows/wincon.d
+++ b/libphobos/libdruntime/core/sys/windows/wincon.d
@@ -54,16 +54,24 @@ enum {
 }
 
 enum {
-    ENABLE_PROCESSED_INPUT  = 1,
-    ENABLE_LINE_INPUT       = 2,
-    ENABLE_ECHO_INPUT       = 4,
-    ENABLE_WINDOW_INPUT     = 8,
-    ENABLE_MOUSE_INPUT      = 16
+    ENABLE_PROCESSED_INPUT        = 1,
+    ENABLE_LINE_INPUT             = 2,
+    ENABLE_ECHO_INPUT             = 4,
+    ENABLE_WINDOW_INPUT           = 8,
+    ENABLE_MOUSE_INPUT            = 16,
+    ENABLE_INSERT_MODE            = 32,
+    ENABLE_QUICK_EDIT_MODE        = 64,
+    ENABLE_EXTENDED_FLAGS         = 128,
+    ENABLE_AUTO_POSITION          = 256,
+    ENABLE_VIRTUAL_TERMINAL_INPUT = 512
 }
 
 enum {
-    ENABLE_PROCESSED_OUTPUT    = 1,
-    ENABLE_WRAP_AT_EOL_OUTPUT  = 2
+    ENABLE_PROCESSED_OUTPUT            = 1,
+    ENABLE_WRAP_AT_EOL_OUTPUT          = 2,
+    ENABLE_VIRTUAL_TERMINAL_PROCESSING = 4,
+    DISABLE_NEWLINE_AUTO_RETURN        = 8,
+    ENABLE_LVB_GRID_WORLDWIDE          = 16
 }
 
 enum {
diff --git a/libphobos/libdruntime/core/sys/windows/wincrypt.d b/libphobos/libdruntime/core/sys/windows/wincrypt.d
index c78b10f95..d5294d8c9 100644
--- a/libphobos/libdruntime/core/sys/windows/wincrypt.d
+++ b/libphobos/libdruntime/core/sys/windows/wincrypt.d
@@ -822,7 +822,7 @@ struct HMAC_INFO {
 }
 alias HMAC_INFO* PHMAC_INFO;
 
-extern (Windows) {
+extern (Windows) @nogc nothrow {
     BOOL CertCloseStore(HCERTSTORE, DWORD);
     BOOL CertGetCertificateChain(HCERTCHAINENGINE, PCCERT_CONTEXT, LPFILETIME,
       HCERTSTORE, PCERT_CHAIN_PARA, DWORD, LPVOID, PCCERT_CHAIN_CONTEXT*);
diff --git a/libphobos/libdruntime/core/sys/windows/winsock2.d b/libphobos/libdruntime/core/sys/windows/winsock2.d
index 8706e1b0f..075a40503 100644
--- a/libphobos/libdruntime/core/sys/windows/winsock2.d
+++ b/libphobos/libdruntime/core/sys/windows/winsock2.d
@@ -7,6 +7,9 @@
 module core.sys.windows.winsock2;
 version (Windows):
 
+version (GNU) {}
+else pragma(lib, "ws2_32");
+
 extern(Windows):
 nothrow:
 
diff --git a/libphobos/libdruntime/core/threadasm.S b/libphobos/libdruntime/core/threadasm.S
index 90577edc5..02bd756de 100644
--- a/libphobos/libdruntime/core/threadasm.S
+++ b/libphobos/libdruntime/core/threadasm.S
@@ -2,7 +2,7 @@
  * Support code for mutithreading.
  *
  * Copyright: Copyright Mikola Lysenko 2005 - 2012.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Mikola Lysenko, Martin Nowak, Kai Nacke
  */
 
@@ -16,7 +16,7 @@
 /* NOTE: This file has been patched from the original DMD distribution to
  * work with the GDC compiler.
  */
-#if (defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)) && 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
@@ -462,11 +462,67 @@ fiber_switchContext:
     // return by writing lr into pc
     mov pc, r1
     .fnend
-#endif
+
+#elif defined(__aarch64__)
+/************************************************************************************
+ * AArch64 (arm64) ASM BITS
+ ************************************************************************************/
+/**
+ * preserve/restore AAPCS64 registers
+ *   x19-x28 5.1.1 64-bit callee saved
+ *   x29 fp, or possibly callee saved reg - depends on platform choice 5.2.3)
+ *   x30 lr
+ *   d8-d15  5.1.2 says callee only must save bottom 64-bits (the "d" regs)
+ *
+ * saved regs on stack will look like:
+ *   19: x19
+ *   18: x20
+ *   ...
+ *   10: x28
+ *    9: x29 (fp)  <-- oldp / *newp save stack top
+ *    8: x30 (lr)
+ *    7: d8
+ *   ...
+ *    0: d15       <-- sp
+ */
+        .text
+        .global CSYM(fiber_switchContext)
+        .p2align  2
+CSYM(fiber_switchContext):
+        stp     d15, d14, [sp, #-20*8]!
+        stp     d13, d12, [sp, #2*8]
+        stp     d11, d10, [sp, #4*8]
+        stp     d9, d8,   [sp, #6*8]
+        stp     x30, x29, [sp, #8*8] // lr, fp
+        stp     x28, x27, [sp, #10*8]
+        stp     x26, x25, [sp, #12*8]
+        stp     x24, x23, [sp, #14*8]
+        stp     x22, x21, [sp, #16*8]
+        stp     x20, x19, [sp, #18*8]
+
+        // oldp is set above saved lr (x30) to hide it and float regs
+        // from GC
+        add     x19, sp, #9*8
+        str     x19, [x0]       // *oldp tstack
+        sub     sp, x1, #9*8    // switch to newp sp
+
+        ldp     x20, x19, [sp, #18*8]
+        ldp     x22, x21, [sp, #16*8]
+        ldp     x24, x23, [sp, #14*8]
+        ldp     x26, x25, [sp, #12*8]
+        ldp     x28, x27, [sp, #10*8]
+        ldp     x30, x29, [sp, #8*8] // lr, fp
+        ldp     d9, d8,   [sp, #6*8]
+        ldp     d11, d10, [sp, #4*8]
+        ldp     d13, d12, [sp, #2*8]
+        ldp     d15, d14, [sp], #20*8
+        ret
+
+#elif defined(__MINGW32__)
 /************************************************************************************
  * GDC MinGW ASM BITS
  ************************************************************************************/
-#if defined(__x86_64__) && defined(__MINGW32__)
+#if defined(__x86_64__)
 .global fiber_switchContext
 fiber_switchContext:
     pushq %RBP;
@@ -499,8 +555,7 @@ fiber_switchContext:
     // 'return' to complete switch
     popq %RCX;
     jmp *%RCX;
-#endif
-#if defined(_X86_) && defined(__MINGW32__)
+#elif defined(_X86_)
 .global _fiber_switchContext
 _fiber_switchContext:
     // Save current stack state.save current stack state
@@ -534,11 +589,12 @@ _fiber_switchContext:
     // 'return' to complete switch
     ret;
 #endif
+
+// if POSIX boils down to this (reference http://nadeausoftware.com)
+#elif !defined(_WIN32) && (defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__)))
 /************************************************************************************
  * i386- and x86_64-apple-darwin POSIX ASM BITS
  ************************************************************************************/
-// if POSIX boils down to this (reference http://nadeausoftware.com)
-#if !defined(_WIN32) && (defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__)))
 #if defined(__i386__)
 .text
 .p2align 4
@@ -567,6 +623,7 @@ CSYM(fiber_switchContext):
 
     // 'return' to complete switch
     ret
+
 #elif defined(__x86_64__) && !defined(__ILP32__)
 .text
 .p2align 4
@@ -597,4 +654,5 @@ CSYM(fiber_switchContext):
     // 'return' to complete switch
     ret
 #endif	// __x86_64__ && !__ILP32__
+
 #endif	// posix
diff --git a/libphobos/libdruntime/gcc/backtrace.d b/libphobos/libdruntime/gcc/backtrace.d
index 996c17ea8..9c76e6117 100644
--- a/libphobos/libdruntime/gcc/backtrace.d
+++ b/libphobos/libdruntime/gcc/backtrace.d
@@ -31,7 +31,7 @@ version (Posix)
     //       these for readability.  The alternative would be to
     //       exclude the first N frames that are in a list of
     //       mangled function names.
-    static enum FIRSTFRAME = 5;
+    private enum FIRSTFRAME = 5;
 }
 else
 {
@@ -39,13 +39,16 @@ else
     //       whether the exception is user or system-generated, so
     //       it may be necessary to exclude a list of function names
     //       instead.
-    static enum FIRSTFRAME = 0;
+    private enum FIRSTFRAME = 0;
 }
 
+// Max size per line of the traceback.
+private enum MAX_BUFSIZE = 1536;
+
 static if (BACKTRACE_SUPPORTED && !BACKTRACE_USES_MALLOC)
 {
     import core.stdc.stdint, core.stdc.string, core.stdc.stdio;
-    enum MAXFRAMES = 128;
+    private enum MAXFRAMES = 128;
 
     extern(C) int simpleCallback(void* data, uintptr_t pc)
     {
@@ -63,7 +66,7 @@ static if (BACKTRACE_SUPPORTED && !BACKTRACE_USES_MALLOC)
      */
     extern(C) void simpleErrorCallback(void* data, const(char)* msg, int errnum)
     {
-        if (data) //context is not available in backtrace_create_state
+        if (data) // context is not available in backtrace_create_state
         {
             auto context = cast(LibBacktrace)data;
             strncpy(context.errorBuf.ptr, msg, context.errorBuf.length - 1);
@@ -79,7 +82,7 @@ static if (BACKTRACE_SUPPORTED && !BACKTRACE_USES_MALLOC)
     {
         auto context = cast(SymbolCallbackInfo*)data;
 
-        //Try to get the function name via backtrace_syminfo
+        // Try to get the function name via backtrace_syminfo
         if (func is null)
         {
             SymbolCallbackInfo2 info;
@@ -160,12 +163,12 @@ static if (BACKTRACE_SUPPORTED && !BACKTRACE_USES_MALLOC)
      */
     struct SymbolCallbackInfo
     {
-        bool noInfo = false;       //True if debug info / symbol table is not available
-        size_t num = 0;            //Counter for opApply
-        int retval;                //Value returned by applyCB
+        bool noInfo = false;       // True if debug info / symbol table is not available
+        size_t num = 0;            // Counter for opApply
+        int retval;                // Value returned by applyCB
         backtrace_state* state;
 
-        //info.fileName / funcName / errmsg may become invalid after this delegate returned
+        // info.fileName / funcName / errmsg may become invalid after this delegate returned
         ApplyCallback applyCB;
 
         void reset()
@@ -199,7 +202,7 @@ static if (BACKTRACE_SUPPORTED && !BACKTRACE_USES_MALLOC)
         }
     }
 
-    //FIXME: state is never freed as libbacktrace doesn't provide a free function...
+    // FIXME: state is never freed as libbacktrace doesn't provide a free function...
     public class LibBacktrace : Throwable.TraceInfo
     {
         enum MaxAlignment = (void*).alignof;
@@ -228,38 +231,47 @@ static if (BACKTRACE_SUPPORTED && !BACKTRACE_USES_MALLOC)
 
         override int opApply(scope int delegate(ref const(char[])) dg) const
         {
-            return opApply( (ref size_t, ref const(char[]) buf)
-                            {
-                                return dg(buf);
-                            });
+            return opApply(
+                (ref size_t, ref const(char[]) buf)
+                {
+                    return dg(buf);
+                }
+            );
         }
 
         override int opApply(scope int delegate(ref size_t, ref const(char[])) dg) const
         {
-            return opApply( (ref size_t i, ref SymbolOrError sym)
-                            {
-                                char[512] buffer = '\0';
-                                char[] msg;
-                                if (sym.errnum != 0)
-                                {
-                                    auto retval = snprintf(buffer.ptr, buffer.length,
-                                                           "libbacktrace error: '%s' errno: %d", sym.msg, sym.errnum);
-                                    if (retval >= buffer.length)
-                                        msg = buffer[0 .. $-1]; //Ignore zero terminator
-                                    else if (retval > 0)
-                                        msg = buffer[0 .. retval];
-                                }
-                                else
-                                {
-                                    msg = formatLine(sym.symbol, buffer);
-                                }
-                                return dg(i, msg);
-                            });
+            return opApply(
+                (ref size_t i, ref SymbolOrError sym)
+                {
+                    char[MAX_BUFSIZE] buffer = void;
+                    char[] msg;
+                    if (sym.errnum != 0)
+                    {
+                        auto retval = snprintf(buffer.ptr, buffer.length,
+                                               "libbacktrace error: '%s' errno: %d", sym.msg, sym.errnum);
+                        if (retval >= buffer.length)
+                            retval = buffer.length - 1; // Ignore zero terminator
+                        if (retval > 0)
+                            msg = buffer[0 .. retval];
+                        return dg(i, msg);
+                    }
+                    else
+                    {
+                        msg = formatLine(sym.symbol, buffer);
+                        int ret = dg(i, msg);
+
+                        if (!ret && sym.symbol.funcName && strcmp(sym.symbol.funcName, "_Dmain") == 0)
+                            return 1;
+                        return ret;
+                    }
+                }
+            );
         }
 
         int opApply(scope ApplyCallback dg) const
         {
-            //If backtrace_simple produced an error report it and exit
+            // If backtrace_simple produced an error report it and exit
             if (!state || error != 0)
             {
                 size_t pos = 0;
@@ -274,22 +286,22 @@ static if (BACKTRACE_SUPPORTED && !BACKTRACE_USES_MALLOC)
             cinfo.applyCB = dg;
             cinfo.state = cast(backtrace_state*)state;
 
-            //Try using debug info first
+            // Try using debug info first
             foreach (i, pc; pcs[0 .. numPCs])
             {
-                //FIXME: We may violate const guarantees here...
+                // FIXME: We may violate const guarantees here...
                 if (backtrace_pcinfo(cast(backtrace_state*)state, pc, &pcinfoCallback,
                     &pcinfoErrorCallback, &cinfo) != 0)
                 {
-                    break; //User delegate requested abort or no debug info at all
+                    break; // User delegate requested abort or no debug info at all
                 }
             }
 
-            //If no error or other error which has already been reported via callback
+            // If no error or other error which has already been reported via callback
             if (!cinfo.noInfo)
                 return cinfo.retval;
 
-            //Try using symbol table
+            // Try using symbol table
             cinfo.reset();
             foreach (pc; pcs[0 .. numPCs])
             {
@@ -303,7 +315,7 @@ static if (BACKTRACE_SUPPORTED && !BACKTRACE_USES_MALLOC)
             if (!cinfo.noInfo)
                 return cinfo.retval;
 
-            //No symbol table
+            // No symbol table
             foreach (i, pc; pcs[0 .. numPCs])
             {
                 auto sym = SymbolOrError(0, SymbolInfo(null, null, 0, cast(void*)pc));
@@ -352,22 +364,24 @@ else
 
         override int opApply(scope int delegate(ref const(char[])) dg) const
         {
-            return opApply( (ref size_t, ref const(char[]) buf)
-                            {
-                                return dg(buf);
-                            });
+            return opApply(
+                (ref size_t, ref const(char[]) buf)
+                {
+                    return dg(buf);
+                }
+            );
         }
 
         override int opApply(scope int delegate(ref size_t, ref const(char[])) dg) const
         {
+            char[MAX_BUFSIZE] buffer = void;
             int ret = 0;
-            char[512] fixbuf = '\0';
 
             for (int i = _firstFrame; i < _framelist.entries; ++i)
             {
                 auto pos = cast(size_t)(i - _firstFrame);
-                auto buf = formatLine(_framelist.symbols[i], fixbuf);
-                ret = dg(pos, buf);
+                auto msg = formatLine(_framelist.symbols[i], buffer);
+                ret = dg(pos, msg);
                 if (ret)
                     break;
             }
@@ -405,7 +419,7 @@ private:
     else version (Posix)
         import core.sys.posix.dlfcn;
 
-    static enum MAXFRAMES = 128;
+    private enum MAXFRAMES = 128;
 
     struct UnwindBacktraceData
     {
@@ -483,52 +497,56 @@ struct SymbolInfo
 
 /*
  * Format one output line for symbol sym.
- * Returns a slice of fixbuf.
+ * Returns a slice of buffer.
  */
-char[] formatLine(const SymbolInfo sym, return ref char[512] fixbuf)
+char[] formatLine(const SymbolInfo sym, return ref char[MAX_BUFSIZE] buffer)
 {
     import core.demangle, core.stdc.config;
     import core.stdc.stdio : snprintf, printf;
     import core.stdc.string : strlen;
 
-    int ret;
+    size_t bufferLength = 0;
 
-    ret = snprintf(fixbuf.ptr, fixbuf.sizeof, "0x%lx ", cast(c_ulong)sym.address);
-    if (ret >= fixbuf.sizeof)
-        return fixbuf[0 .. $-1]; //Ignore zero terminator
-
-    if (sym.funcName is null)
+    void appendToBuffer(Args...)(const(char)* format, Args args)
     {
-        if (!(fixbuf.sizeof - ret > 3))
-            return fixbuf[0 .. ret];
-
-        fixbuf[ret] = fixbuf[ret+1] = fixbuf[ret+2] = '?';
-        ret += 3;
+        const count = snprintf(buffer.ptr + bufferLength,
+                               buffer.length - bufferLength,
+                               format, args);
+        assert(count >= 0);
+        bufferLength += count;
+        if (bufferLength >= buffer.length)
+            bufferLength = buffer.length - 1;
     }
+
+
+    if (sym.fileName is null)
+        appendToBuffer("??:? ");
+    else
+        appendToBuffer("%s:%d ", sym.fileName, sym.line);
+
+    if (sym.funcName is null)
+        appendToBuffer("???");
     else
     {
-        auto demangled = demangle(sym.funcName[0 .. strlen(sym.funcName)],
-            fixbuf[ret .. $-1]);
+        char[1024] symbol = void;
+        auto demangled = demangle(sym.funcName[0 .. strlen(sym.funcName)], symbol);
 
-        ret += demangled.length;
-        if (ret + 1 >= fixbuf.sizeof)
-            return fixbuf[0 .. $-1]; //Ignore zero terminator
+        if (demangled.length > 0)
+            appendToBuffer("%.*s ", cast(int) demangled.length, demangled.ptr);
     }
 
-    ret += snprintf(fixbuf.ptr + ret, fixbuf.sizeof - ret, "\n\t%s:%d",
-        sym.fileName is null ? "???" : sym.fileName,
-        sym.line);
-
-    if (ret >= fixbuf.sizeof)
-        return fixbuf[0 .. $-1]; //Ignore zero terminator
+    version (D_LP64)
+        appendToBuffer("[0x%llx]", cast(size_t)sym.address);
     else
-        return fixbuf[0 .. ret];
+        appendToBuffer("[0x%x]", cast(size_t)sym.address);
+
+    return buffer[0 .. bufferLength];
 }
 
 
 unittest
 {
-    char[512] sbuf = '\0';
+    char[MAX_BUFSIZE] sbuf = '\0';
     char[] result;
     string longString;
     for (size_t i = 0; i < 60; i++)
@@ -537,49 +555,49 @@ unittest
 
     auto symbol = SymbolInfo(null, null, 0, null);
     result = formatLine(symbol, sbuf);
-    assert(result.length < 512 && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
+    assert(result.length < MAX_BUFSIZE && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
 
     symbol = SymbolInfo(longString.ptr, null, 0, null);
     result = formatLine(symbol, sbuf);
-    assert(result.length < 512 && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
+    assert(result.length < MAX_BUFSIZE && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
 
     symbol = SymbolInfo("func", "test.d", 0, null);
     result = formatLine(symbol, sbuf);
-    assert(result.length < 512 && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
+    assert(result.length < MAX_BUFSIZE && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
 
     symbol = SymbolInfo("func", longString.ptr, 0, null);
     result = formatLine(symbol, sbuf);
-    assert(result.length < 512 && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
+    assert(result.length < MAX_BUFSIZE && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
 
     symbol = SymbolInfo(longString.ptr, "test.d", 0, null);
     result = formatLine(symbol, sbuf);
-    assert(result.length < 512 && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
+    assert(result.length < MAX_BUFSIZE && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
 
     symbol = SymbolInfo(longString.ptr, longString.ptr, 0, null);
     result = formatLine(symbol, sbuf);
-    assert(result.length < 512 && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
+    assert(result.length < MAX_BUFSIZE && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
 
     symbol = SymbolInfo("func", "test.d", 1000, null);
     result = formatLine(symbol, sbuf);
-    assert(result.length < 512 && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
+    assert(result.length < MAX_BUFSIZE && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
 
     symbol = SymbolInfo(null, (longString[0..500] ~ '\0').ptr, 100000000, null);
     result = formatLine(symbol, sbuf);
-    assert(result.length < 512 && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
+    assert(result.length < MAX_BUFSIZE && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
 
     symbol = SymbolInfo("func", "test.d", 0, cast(void*)0x100000);
     result = formatLine(symbol, sbuf);
-    assert(result.length < 512 && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
+    assert(result.length < MAX_BUFSIZE && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
 
     symbol = SymbolInfo("func", null, 0, cast(void*)0x100000);
     result = formatLine(symbol, sbuf);
-    assert(result.length < 512 && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
+    assert(result.length < MAX_BUFSIZE && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
 
     symbol = SymbolInfo(null, "test.d", 0, cast(void*)0x100000);
     result = formatLine(symbol, sbuf);
-    assert(result.length < 512 && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
+    assert(result.length < MAX_BUFSIZE && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
 
     symbol = SymbolInfo(longString.ptr, "test.d", 0, cast(void*)0x100000);
     result = formatLine(symbol, sbuf);
-    assert(result.length < 512 && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
+    assert(result.length < MAX_BUFSIZE && result.ptr[result.length] == '\0' && sbuf[$-1] == '\0');
 }
diff --git a/libphobos/libdruntime/rt/backtrace/dwarf.d b/libphobos/libdruntime/rt/backtrace/dwarf.d
deleted file mode 100644
index 139c09b9f..000000000
--- a/libphobos/libdruntime/rt/backtrace/dwarf.d
+++ /dev/null
@@ -1,525 +0,0 @@
-/**
- * This code handles backtrace generation using dwarf .debug_line section
- * in ELF files for linux.
- *
- * Reference: http://www.dwarfstd.org/
- *
- * Copyright: Copyright Digital Mars 2015 - 2015.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
- * Authors:   Yazan Dabain, Sean Kelly
- * Source: $(DRUNTIMESRC src/rt/backtrace/dwarf.d)
- */
-
-module rt.backtrace.dwarf;
-
-version(CRuntime_Glibc) version = linux_or_freebsd;
-else version(FreeBSD) version = linux_or_freebsd;
-
-version(linux_or_freebsd):
-
-import rt.util.container.array;
-import rt.backtrace.elf;
-
-import core.stdc.string : strlen, memchr;
-
-//debug = DwarfDebugMachine;
-
-struct Location
-{
-    const(char)[] file = null; // file is missing directory, but DMD emits directory directly into file
-    int line = -1;
-    size_t address;
-}
-
-int traceHandlerOpApplyImpl(const void*[] callstack, scope int delegate(ref size_t, ref const(char[])) dg)
-{
-    import core.stdc.stdio : snprintf;
-    version(linux) import core.sys.linux.execinfo : backtrace_symbols;
-    else version(FreeBSD) import core.sys.freebsd.execinfo : backtrace_symbols;
-    import core.sys.posix.stdlib : free;
-
-    const char** frameList = backtrace_symbols(callstack.ptr, cast(int) callstack.length);
-    scope(exit) free(cast(void*) frameList);
-
-    // find address -> file, line mapping using dwarf debug_line
-    ElfFile file;
-    ElfSection dbgSection;
-    Array!Location locations;
-    if (ElfFile.openSelf(&file))
-    {
-        auto stringSectionHeader = ElfSectionHeader(&file, file.ehdr.e_shstrndx);
-        auto stringSection = ElfSection(&file, &stringSectionHeader);
-
-        auto dbgSectionIndex = findSectionByName(&file, &stringSection, ".debug_line");
-        if (dbgSectionIndex != -1)
-        {
-            auto dbgSectionHeader = ElfSectionHeader(&file, dbgSectionIndex);
-            dbgSection = ElfSection(&file, &dbgSectionHeader);
-            // debug_line section found and loaded
-
-            // resolve addresses
-            locations.length = callstack.length;
-            foreach(size_t i; 0 .. callstack.length)
-                locations[i].address = cast(size_t) callstack[i];
-
-            resolveAddresses(&dbgSection, locations[]);
-        }
-    }
-
-    int ret = 0;
-    foreach (size_t i; 0 .. callstack.length)
-    {
-        char[1536] buffer = void; buffer[0] = 0;
-        char[256] addressBuffer = void; addressBuffer[0] = 0;
-
-        if (locations.length > 0 && locations[i].line != -1)
-            snprintf(addressBuffer.ptr, addressBuffer.length, "%.*s:%d ", cast(int) locations[i].file.length, locations[i].file.ptr, locations[i].line);
-        else
-            addressBuffer[] = "??:? \0";
-
-        char[1024] symbolBuffer = void;
-        int bufferLength;
-        auto symbol = getDemangledSymbol(frameList[i][0 .. strlen(frameList[i])], symbolBuffer);
-        if (symbol.length > 0)
-            bufferLength = snprintf(buffer.ptr, buffer.length, "%s%.*s [0x%x]", addressBuffer.ptr, cast(int) symbol.length, symbol.ptr, callstack[i]);
-        else
-            bufferLength = snprintf(buffer.ptr, buffer.length, "%s[0x%x]", addressBuffer.ptr, callstack[i]);
-
-        assert(bufferLength >= 0);
-
-        auto output = buffer[0 .. bufferLength];
-        auto pos = i;
-        ret = dg(pos, output);
-        if (ret || symbol == "_Dmain") break;
-    }
-    return ret;
-}
-
-private:
-
-// the lifetime of the Location data is the lifetime of the mmapped ElfSection
-void resolveAddresses(ElfSection* debugLineSection, Location[] locations) @nogc nothrow
-{
-    debug(DwarfDebugMachine) import core.stdc.stdio;
-
-    size_t numberOfLocationsFound = 0;
-
-    const(ubyte)[] dbg = debugLineSection.get();
-    while (dbg.length > 0)
-    {
-        debug(DwarfDebugMachine) printf("new debug program\n");
-        const(LPHeader)* lph = cast(const(LPHeader)*) dbg.ptr;
-
-        if (lph.unitLength == 0xffff_ffff) // is 64-bit dwarf?
-            return; // unable to read 64-bit dwarf
-
-        const(ubyte)[] program = dbg[
-            lph.headerLength + LPHeader.minimumInstructionLength.offsetof ..
-            lph.unitLength + LPHeader.dwarfVersion.offsetof
-        ];
-
-        const(ubyte)[] standardOpcodeLengths = dbg[
-            LPHeader.sizeof .. LPHeader.sizeof + lph.opcodeBase - 1
-        ];
-
-        const(ubyte)[] pathData = dbg[
-            LPHeader.sizeof + lph.opcodeBase - 1 .. $
-        ];
-
-        Array!(const(char)[]) directories;
-        directories.length = (const(ubyte)[] bytes) {
-            // count number of directories
-            int count = 0;
-            foreach (i; 0 .. bytes.length - 1)
-            {
-                if (bytes[i] == 0)
-                {
-                    count++;
-                    if (bytes[i + 1] == 0) return count;
-                }
-            }
-            return count;
-        }(pathData);
-
-        // fill directories array from dwarf section
-        int currentDirectoryIndex = 0;
-        while (pathData[0] != 0)
-        {
-            directories[currentDirectoryIndex] = cast(const(char)[]) pathData[0 .. strlen(cast(char*) (pathData.ptr))];
-            debug(DwarfDebugMachine) printf("dir: %s\n", pathData.ptr);
-            pathData = pathData[directories[currentDirectoryIndex].length + 1 .. $];
-            currentDirectoryIndex++;
-        }
-
-        pathData = pathData[1 .. $];
-
-        Array!(const(char)[]) filenames;
-        filenames.length = (const(ubyte)[] bytes)
-        {
-            // count number of files
-            int count = 0;
-            while (bytes[0] != 0)
-            {
-                auto filename = cast(const(char)[]) bytes[0 .. strlen(cast(char*) (bytes.ptr))];
-                bytes = bytes[filename.length + 1 .. $];
-                bytes.readULEB128(); // dir index
-                bytes.readULEB128(); // last mod
-                bytes.readULEB128(); // file len
-                count++;
-            }
-            return count;
-        }(pathData);
-
-        // fill filenames array from dwarf section
-        int currentFileIndex = 0;
-        while (pathData[0] != 0)
-        {
-            filenames[currentFileIndex] = cast(const(char)[]) pathData[0 .. strlen(cast(char*) (pathData.ptr))];
-            debug(DwarfDebugMachine) printf("file: %s\n", pathData.ptr);
-            pathData = pathData[filenames[currentFileIndex].length + 1 .. $];
-
-            auto dirIndex = pathData.readULEB128(); // unused
-            auto lastMod = pathData.readULEB128();  // unused
-            auto fileLen = pathData.readULEB128();  // unused
-
-            currentFileIndex++;
-        }
-
-        LocationInfo lastLoc = LocationInfo(-1, -1);
-        size_t lastAddress = 0x0;
-
-        debug(DwarfDebugMachine) printf("program:\n");
-        runStateMachine(lph, program, standardOpcodeLengths,
-            (size_t address, LocationInfo locInfo, bool isEndSequence)
-            {
-                // If loc.line != -1, then it has been set previously.
-                // Some implementations (eg. dmd) write an address to
-                // the debug data multiple times, but so far I have found
-                // that the first occurrence to be the correct one.
-                foreach (ref loc; locations) if (loc.line == -1)
-                {
-                    if (loc.address == address)
-                    {
-                        debug(DwarfDebugMachine) printf("-- found for [0x%x]:\n", loc.address);
-                        debug(DwarfDebugMachine) printf("--   file: %.*s\n", filenames[locInfo.file - 1].length, filenames[locInfo.file - 1].ptr);
-                        debug(DwarfDebugMachine) printf("--   line: %d\n", locInfo.line);
-                        loc.file = filenames[locInfo.file - 1];
-                        loc.line = locInfo.line;
-                        numberOfLocationsFound++;
-                    }
-                    else if (loc.address < address && lastAddress < loc.address && lastAddress != 0)
-                    {
-                        debug(DwarfDebugMachine) printf("-- found for [0x%x]:\n", loc.address);
-                        debug(DwarfDebugMachine) printf("--   file: %.*s\n", filenames[lastLoc.file - 1].length, filenames[lastLoc.file - 1].ptr);
-                        debug(DwarfDebugMachine) printf("--   line: %d\n", lastLoc.line);
-                        loc.file = filenames[lastLoc.file - 1];
-                        loc.line = lastLoc.line;
-                        numberOfLocationsFound++;
-                    }
-                }
-
-                if (isEndSequence)
-                {
-                    lastAddress = 0;
-                }
-                else
-                {
-                    lastAddress = address;
-                    lastLoc = locInfo;
-                }
-
-                return numberOfLocationsFound < locations.length;
-            }
-        );
-
-        if (numberOfLocationsFound == locations.length) return;
-        dbg = dbg[lph.unitLength + LPHeader.dwarfVersion.offsetof .. $];
-    }
-}
-
-alias RunStateMachineCallback = bool delegate(size_t, LocationInfo, bool) @nogc nothrow;
-bool runStateMachine(const(LPHeader)* lpHeader, const(ubyte)[] program, const(ubyte)[] standardOpcodeLengths, scope RunStateMachineCallback callback) @nogc nothrow
-{
-    debug(DwarfDebugMachine) import core.stdc.stdio;
-
-    StateMachine machine;
-    machine.isStatement = lpHeader.defaultIsStatement;
-
-    while (program.length > 0)
-    {
-        ubyte opcode = program.read!ubyte();
-        if (opcode < lpHeader.opcodeBase)
-        {
-            switch (opcode) with (StandardOpcode)
-            {
-                case extendedOp:
-                    size_t len = cast(size_t) program.readULEB128();
-                    ubyte eopcode = program.read!ubyte();
-
-                    switch (eopcode) with (ExtendedOpcode)
-                    {
-                        case endSequence:
-                            machine.isEndSequence = true;
-                            debug(DwarfDebugMachine) printf("endSequence 0x%x\n", machine.address);
-                            if (!callback(machine.address, LocationInfo(machine.fileIndex, machine.line), true)) return true;
-                            machine = StateMachine.init;
-                            machine.isStatement = lpHeader.defaultIsStatement;
-                            break;
-
-                        case setAddress:
-                            size_t address = program.read!size_t();
-                            debug(DwarfDebugMachine) printf("setAddress 0x%x\n", address);
-                            machine.address = address;
-                            break;
-
-                        case defineFile: // TODO: add proper implementation
-                            debug(DwarfDebugMachine) printf("defineFile\n");
-                            program = program[len - 1 .. $];
-                            break;
-
-                        default:
-                            // unknown opcode
-                            debug(DwarfDebugMachine) printf("unknown extended opcode %d\n", cast(int) eopcode);
-                            program = program[len - 1 .. $];
-                            break;
-                    }
-
-                    break;
-
-                case copy:
-                    debug(DwarfDebugMachine) printf("copy 0x%x\n", machine.address);
-                    if (!callback(machine.address, LocationInfo(machine.fileIndex, machine.line), false)) return true;
-                    machine.isBasicBlock = false;
-                    machine.isPrologueEnd = false;
-                    machine.isEpilogueBegin = false;
-                    break;
-
-                case advancePC:
-                    ulong op = readULEB128(program);
-                    machine.address += op * lpHeader.minimumInstructionLength;
-                    debug(DwarfDebugMachine) printf("advancePC %d to 0x%x\n", cast(int) (op * lpHeader.minimumInstructionLength), machine.address);
-                    break;
-
-                case advanceLine:
-                    long ad = readSLEB128(program);
-                    machine.line += ad;
-                    debug(DwarfDebugMachine) printf("advanceLine %d to %d\n", cast(int) ad, cast(int) machine.line);
-                    break;
-
-                case setFile:
-                    uint index = cast(uint) readULEB128(program);
-                    debug(DwarfDebugMachine) printf("setFile to %d\n", cast(int) index);
-                    machine.fileIndex = index;
-                    break;
-
-                case setColumn:
-                    uint col = cast(uint) readULEB128(program);
-                    debug(DwarfDebugMachine) printf("setColumn %d\n", cast(int) col);
-                    machine.column = col;
-                    break;
-
-                case negateStatement:
-                    debug(DwarfDebugMachine) printf("negateStatement\n");
-                    machine.isStatement = !machine.isStatement;
-                    break;
-
-                case setBasicBlock:
-                    debug(DwarfDebugMachine) printf("setBasicBlock\n");
-                    machine.isBasicBlock = true;
-                    break;
-
-                case constAddPC:
-                    machine.address += (255 - lpHeader.opcodeBase) / lpHeader.lineRange * lpHeader.minimumInstructionLength;
-                    debug(DwarfDebugMachine) printf("constAddPC 0x%x\n", machine.address);
-                    break;
-
-                case fixedAdvancePC:
-                    uint add = program.read!uint();
-                    machine.address += add;
-                    debug(DwarfDebugMachine) printf("fixedAdvancePC %d to 0x%x\n", cast(int) add, machine.address);
-                    break;
-
-                case setPrologueEnd:
-                    machine.isPrologueEnd = true;
-                    debug(DwarfDebugMachine) printf("setPrologueEnd\n");
-                    break;
-
-                case setEpilogueBegin:
-                    machine.isEpilogueBegin = true;
-                    debug(DwarfDebugMachine) printf("setEpilogueBegin\n");
-                    break;
-
-                case setISA:
-                    machine.isa = cast(uint) readULEB128(program);
-                    debug(DwarfDebugMachine) printf("setISA %d\n", cast(int) machine.isa);
-                    break;
-
-                default:
-                    // unimplemented/invalid opcode
-                    return false;
-            }
-        }
-        else
-        {
-            opcode -= lpHeader.opcodeBase;
-            auto ainc = (opcode / lpHeader.lineRange) * lpHeader.minimumInstructionLength;
-            machine.address += ainc;
-            auto linc = lpHeader.lineBase + (opcode % lpHeader.lineRange);
-            machine.line += linc;
-
-            debug(DwarfDebugMachine) printf("special %d %d to 0x%x line %d\n", cast(int) ainc, cast(int) linc, machine.address, cast(int) machine.line);
-            if (!callback(machine.address, LocationInfo(machine.fileIndex, machine.line), false)) return true;
-        }
-    }
-
-    return true;
-}
-
-const(char)[] getDemangledSymbol(const(char)[] btSymbol, ref char[1024] buffer)
-{
-    version(linux)
-    {
-        // format is:  module(_D6module4funcAFZv) [0x00000000]
-        // or:         module(_D6module4funcAFZv+0x78) [0x00000000]
-        auto bptr = cast(char*) memchr(btSymbol.ptr, '(', btSymbol.length);
-        auto eptr = cast(char*) memchr(btSymbol.ptr, ')', btSymbol.length);
-        auto pptr = cast(char*) memchr(btSymbol.ptr, '+', btSymbol.length);
-    }
-    else version(FreeBSD)
-    {
-        // format is: 0x00000000 <_D6module4funcAFZv+0x78> at module
-        auto bptr = cast(char*) memchr(btSymbol.ptr, '<', btSymbol.length);
-        auto eptr = cast(char*) memchr(btSymbol.ptr, '>', btSymbol.length);
-        auto pptr = cast(char*) memchr(btSymbol.ptr, '+', btSymbol.length);
-    }
-
-    if (pptr && pptr < eptr)
-        eptr = pptr;
-
-    size_t symBeg, symEnd;
-    if (bptr++ && eptr)
-    {
-        symBeg = bptr - btSymbol.ptr;
-        symEnd = eptr - btSymbol.ptr;
-    }
-
-    assert(symBeg <= symEnd);
-    assert(symEnd < btSymbol.length);
-
-    import core.demangle;
-    return demangle(btSymbol[symBeg .. symEnd], buffer[]);
-}
-
-T read(T)(ref const(ubyte)[] buffer) @nogc nothrow
-{
-    T result = *(cast(T*) buffer[0 .. T.sizeof].ptr);
-    buffer = buffer[T.sizeof .. $];
-    return result;
-}
-
-ulong readULEB128(ref const(ubyte)[] buffer) @nogc nothrow
-{
-    ulong val = 0;
-    uint shift = 0;
-
-    while (true)
-    {
-        ubyte b = buffer.read!ubyte();
-
-        val |= (b & 0x7f) << shift;
-        if ((b & 0x80) == 0) break;
-        shift += 7;
-    }
-
-    return val;
-}
-
-unittest
-{
-    const(ubyte)[] data = [0xe5, 0x8e, 0x26, 0xDE, 0xAD, 0xBE, 0xEF];
-    assert(readULEB128(data) == 624_485);
-    assert(data[] == [0xDE, 0xAD, 0xBE, 0xEF]);
-}
-
-long readSLEB128(ref const(ubyte)[] buffer) @nogc nothrow
-{
-    long val = 0;
-    uint shift = 0;
-    int size = 8 << 3;
-    ubyte b;
-
-    while (true)
-    {
-        b = buffer.read!ubyte();
-        val |= (b & 0x7f) << shift;
-        shift += 7;
-        if ((b & 0x80) == 0)
-            break;
-    }
-
-    if (shift < size && (b & 0x40) != 0)
-        val |= -(1 << shift);
-
-    return val;
-}
-
-enum StandardOpcode : ubyte
-{
-    extendedOp = 0,
-    copy = 1,
-    advancePC = 2,
-    advanceLine = 3,
-    setFile = 4,
-    setColumn = 5,
-    negateStatement = 6,
-    setBasicBlock = 7,
-    constAddPC = 8,
-    fixedAdvancePC = 9,
-    setPrologueEnd = 10,
-    setEpilogueBegin = 11,
-    setISA = 12,
-}
-
-enum ExtendedOpcode : ubyte
-{
-    endSequence = 1,
-    setAddress = 2,
-    defineFile = 3,
-}
-
-struct StateMachine
-{
-    size_t address = 0;
-    uint operationIndex = 0;
-    uint fileIndex = 1;
-    uint line = 1;
-    uint column = 0;
-    bool isStatement;
-    bool isBasicBlock = false;
-    bool isEndSequence = false;
-    bool isPrologueEnd = false;
-    bool isEpilogueBegin = false;
-    uint isa = 0;
-    uint discriminator = 0;
-}
-
-struct LocationInfo
-{
-    int file;
-    int line;
-}
-
-// 32-bit DWARF
-align(1)
-struct LPHeader
-{
-align(1):
-    uint unitLength;
-    ushort dwarfVersion;
-    uint headerLength;
-    ubyte minimumInstructionLength;
-    bool defaultIsStatement;
-    byte lineBase;
-    ubyte lineRange;
-    ubyte opcodeBase;
-}
diff --git a/libphobos/libdruntime/rt/backtrace/elf.d b/libphobos/libdruntime/rt/backtrace/elf.d
deleted file mode 100644
index 2c75eb8c1..000000000
--- a/libphobos/libdruntime/rt/backtrace/elf.d
+++ /dev/null
@@ -1,234 +0,0 @@
-/**
- * This code reads ELF files and sections using memory mapped IO.
- *
- * Reference: http://www.dwarfstd.org/
- *
- * Copyright: Copyright Digital Mars 2015 - 2015.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
- * Authors:   Yazan Dabain
- * Source: $(DRUNTIMESRC src/rt/backtrace/elf.d)
- */
-
-module rt.backtrace.elf;
-
-version(linux) version = linux_or_freebsd;
-else version(FreeBSD) version = linux_or_freebsd;
-
-version(linux_or_freebsd):
-
-import core.sys.posix.fcntl;
-import core.sys.posix.unistd;
-
-version(linux) public import core.sys.linux.elf;
-version(FreeBSD) public import core.sys.freebsd.sys.elf;
-
-struct ElfFile
-{
-    static bool openSelf(ElfFile* file) @nogc nothrow
-    {
-        version (linux)
-        {
-            auto selfPath = "/proc/self/exe".ptr;
-        }
-        else version (FreeBSD)
-        {
-            char[1024] selfPathBuffer = void;
-            auto selfPath = getFreeBSDExePath(selfPathBuffer[]);
-            if (selfPath is null) return false;
-        }
-
-        file.fd = open(selfPath, O_RDONLY);
-        if (file.fd >= 0)
-        {
-            // memory map header
-            file.ehdr = MMapRegion!Elf_Ehdr(file.fd, 0, Elf_Ehdr.sizeof);
-            if (file.ehdr.isValidElfHeader())
-                return true;
-            else
-                return false;
-        }
-        else
-            return false;
-    }
-
-    @disable this(this);
-
-    ~this() @nogc nothrow
-    {
-        if (fd != -1) close(fd);
-    }
-
-    int fd = -1;
-    MMapRegion!Elf_Ehdr ehdr;
-}
-
-struct ElfSectionHeader
-{
-    this(const(ElfFile)* file, size_t index) @nogc nothrow
-    {
-        assert(Elf_Shdr.sizeof == file.ehdr.e_shentsize);
-        shdr = MMapRegion!Elf_Shdr(
-            file.fd,
-            file.ehdr.e_shoff + index * file.ehdr.e_shentsize,
-            file.ehdr.e_shentsize
-        );
-    }
-
-    @disable this(this);
-
-    alias shdr this;
-    MMapRegion!Elf_Shdr shdr;
-}
-
-struct ElfSection
-{
-    this(ElfFile* file, ElfSectionHeader* shdr) @nogc nothrow
-    {
-        data = MMapRegion!ubyte(
-            file.fd,
-            shdr.sh_offset,
-            shdr.sh_size,
-        );
-
-        length = shdr.sh_size;
-    }
-
-    @disable this(this);
-
-    const(ubyte)[] get() @nogc nothrow
-    {
-        return data.get()[0 .. length];
-    }
-
-    alias get this;
-
-    MMapRegion!ubyte data;
-    size_t length;
-}
-
-const(char)[] getSectionName(const(ElfFile)* file, ElfSection* stringSection, size_t nameIndex) @nogc nothrow
-{
-    const(ubyte)[] data = stringSection.get();
-
-    foreach (i; nameIndex .. data.length)
-    {
-        if (data[i] == 0)
-            return cast(const(char)[])data[nameIndex .. i];
-    }
-
-    return null;
-}
-
-size_t findSectionByName(const(ElfFile)* file, ElfSection* stringSection, const(char)[] sectionName) @nogc nothrow
-{
-    foreach (s; 0 .. file.ehdr.e_shnum)
-    {
-        auto sectionHeader = ElfSectionHeader(file, s);
-        auto currentName = getSectionName(file, stringSection, sectionHeader.sh_name);
-        if (sectionName == currentName)
-            return s; // TODO: attempt to move ElfSectionHeader instead of returning index
-    }
-
-    // not found
-    return -1;
-}
-
-private:
-
-version (FreeBSD)
-{
-    extern (C) int sysctl(const int* name, uint namelen, void* oldp, size_t* oldlenp, const void* newp, size_t newlen) @nogc nothrow;
-    const(char)* getFreeBSDExePath(char[] buffer) @nogc nothrow
-    {
-        enum
-        {
-            CTL_KERN = 1,
-            KERN_PROC = 14,
-            KERN_PROC_PATHNAME = 12
-        }
-
-        int[4] mib = [CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1];
-        size_t len = buffer.length;
-
-        auto result = sysctl(mib.ptr, mib.length, buffer.ptr, &len, null, 0); // get the length of the path
-        if (result != 0) return null;
-        if (len + 1 > buffer.length) return null;
-        buffer[len] = 0;
-        return buffer.ptr;
-    }
-}
-
-bool isValidElfHeader(const(Elf_Ehdr)* ehdr) @nogc nothrow
-{
-    if (ehdr.e_ident[EI_MAG0] != ELFMAG0) return false;
-    if (ehdr.e_ident[EI_MAG1] != ELFMAG1) return false;
-    if (ehdr.e_ident[EI_MAG2] != ELFMAG2) return false;
-    if (ehdr.e_ident[EI_MAG3] != ELFMAG3) return false;
-
-    // elf class and data encoding should match target's config
-    if (ehdr.e_ident[EI_CLASS] != ELFCLASS) return false;
-    if (ehdr.e_ident[EI_DATA]  != ELFDATA ) return false;
-
-    return true;
-}
-
-struct MMapRegion(T)
-{
-    import core.sys.posix.sys.mman;
-    import core.sys.posix.unistd;
-
-    this(int fd, size_t offset, size_t length) @nogc nothrow
-    {
-        auto pagesize = sysconf(_SC_PAGESIZE);
-
-        auto realOffset = (offset / pagesize) * pagesize;
-        offsetDiff = offset - realOffset;
-        realLength = length + offsetDiff;
-
-        mptr = mmap(null, realLength, PROT_READ, MAP_PRIVATE, fd, realOffset);
-    }
-
-    @disable this(this);
-
-    ~this() @nogc nothrow
-    {
-        if (mptr) munmap(mptr, realLength);
-    }
-
-    const(T)* get() const @nogc nothrow
-    {
-        return cast(T*)(mptr + offsetDiff);
-    }
-
-    alias get this;
-
-    size_t realLength;
-    size_t offsetDiff;
-    void* mptr;
-}
-
-version(D_LP64)
-{
-    alias Elf_Ehdr = Elf64_Ehdr;
-    alias Elf_Shdr = Elf64_Shdr;
-    enum ELFCLASS = ELFCLASS64;
-}
-else
-{
-    alias Elf_Ehdr = Elf32_Ehdr;
-    alias Elf_Shdr = Elf32_Shdr;
-    enum ELFCLASS = ELFCLASS32;
-}
-
-version(LittleEndian)
-{
-    alias ELFDATA = ELFDATA2LSB;
-}
-else version(BigEndian)
-{
-    alias ELFDATA = ELFDATA2MSB;
-}
-else
-{
-    static assert(0, "unsupported byte order");
-}