Fix libphobos.shared/load.d compile failure on Solaris

2019-02-19  Iain Buclaw  <ibuclaw@gdcproject.org>

	* testsuite/libphobos.shared/load.d: Import core.sys.posix.dlfcn.
	[DragonFlyBSD, FreeBSD, linux, NetBSD, OSX, Solaris]: Import only
	RTLD_NOLOAD from core.sys.*.dlfcn.
	Assert RTLD_NOLOAD is available.

From-SVN: r269014

diff --git a/libphobos/ChangeLog b/libphobos/ChangeLog
index 5279c891e55a102a2fb9033f1af3762bf14ed863..16514ff650f6d2d353e4a1a554c08b641ca0ddb2 100644 (file)
--- a/libphobos/ChangeLog
+++ b/libphobos/ChangeLog
@@ -1,3 +1,10 @@
+2019-02-19  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+       * testsuite/libphobos.shared/load.d: Import core.sys.posix.dlfcn.
+       [DragonFlyBSD, FreeBSD, linux, NetBSD, OSX, Solaris]: Import only
+       RTLD_NOLOAD from core.sys.*.dlfcn.
+       Assert RTLD_NOLOAD is available.
+
 2019-02-19  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * m4/druntime/libraries.m4 (DRUNTIME_LIBRARIES_NET): New macro.

diff --git a/libphobos/testsuite/libphobos.shared/load.d b/libphobos/testsuite/libphobos.shared/load.d
index 8c13f51eac6ca7fe1ebb956f2fef4914a845e01e..5a2dd01b778e3c45fd239f6ecb2640ff00509bbb 100644 (file)
--- a/libphobos/testsuite/libphobos.shared/load.d
+++ b/libphobos/testsuite/libphobos.shared/load.d
@@ -3,10 +3,16 @@ import core.stdc.stdio;
 import core.stdc.string;
 import core.thread;
 
-version (linux) import core.sys.linux.dlfcn;
-else version (FreeBSD) import core.sys.freebsd.dlfcn;
-else version (NetBSD) import core.sys.netbsd.dlfcn;
-else static assert(0, "unimplemented");
+import core.sys.posix.dlfcn;
+
+version (DragonFlyBSD) import core.sys.dragonflybsd.dlfcn : RTLD_NOLOAD;
+version (FreeBSD) import core.sys.freebsd.dlfcn : RTLD_NOLOAD;
+version (linux) import core.sys.linux.dlfcn : RTLD_NOLOAD;
+version (NetBSD) import core.sys.netbsd.dlfcn : RTLD_NOLOAD;
+version (OSX) import core.sys.darwin.dlfcn : RTLD_NOLOAD;
+version (Solaris) import core.sys.solaris.dlfcn : RTLD_NOLOAD;
+
+static assert(__traits(compiles, RTLD_NOLOAD), "unimplemented");
 
 void loadSym(T)(void* handle, ref T val, const char* mangle)
 {