Version platform-specific files

dub.sdl

@@ -62,7 +62,4 @@ subPackage {
   sourcePaths "src/dmd"
   excludedSourceFiles "src/dmd/backend/*"
   excludedSourceFiles "src/dmd/{e2ir,eh,glue,iasm,objc_glue,s2ir,tocsym,toctype,toobj,todt,toir}.d"
-  excludedSourceFiles "src/dmd/{scan,lib}{mach,mscoff,omf}.d" platform="linux"
-  excludedSourceFiles "src/dmd/{scan,lib}{elf,mscoff,omf}.d" platform="osx"
-  excludedSourceFiles "src/dmd/{scan,lib}{elf,mach,mscoff}.d" platform="windows"
 }

src/dmd/backend/mach.d

@@ -6,6 +6,7 @@
 module dmd.backend.mach;
 
 // Online documentation: https://dlang.org/phobos/dmd_backend_mach.html
+version(OSX):
 
 alias cpu_type_t = int;
 alias cpu_subtype_t = int;

src/dmd/backend/mscoff.d

@@ -7,6 +7,7 @@ module dmd.backend.mscoff;
 
 // Online documentation: https://dlang.org/phobos/dmd_backend_mscoff.html
 
+version(Windows):
 align (1):
 
 /***********************************************/

src/dmd/libelf.d

@@ -11,6 +11,9 @@
 module dmd.libelf;
 
 // Online documentation: https://dlang.org/phobos/dmd_libelf.html
+version(Windows) {}
+else version(OSX) {}
+else:
 
 import core.stdc.time;
 import core.stdc.string;

src/dmd/libmach.d

@@ -11,6 +11,7 @@
 module dmd.libmach;
 
 // Online documentation: https://dlang.org/phobos/dmd_libmach.html
+version(OSX):
 
 import core.stdc.time;
 import core.stdc.string;

src/dmd/libmscoff.d

@@ -11,6 +11,7 @@
 module dmd.libmscoff;
 
 // Online documentation: https://dlang.org/phobos/dmd_libmscoff.html
+version(Windows):
 
 import core.stdc.stdlib;
 import core.stdc.string;

src/dmd/libomf.d

@@ -11,6 +11,7 @@
 module dmd.libomf;
 
 // Online documentation: https://dlang.org/phobos/dmd_libomf.html
+version(Windows):
 
 import core.stdc.stdio;
 import core.stdc.string;

src/dmd/scanelf.d

@@ -11,6 +11,9 @@
 module dmd.scanelf;
 
 // Online documentation: https://dlang.org/phobos/dmd_scanelf.html
+version(Windows) {}
+else version(OSX) {}
+else:
 
 version (linux)
     import core.sys.linux.elf;

src/dmd/scanmach.d

@@ -11,6 +11,7 @@
 module dmd.scanmach;
 
 // Online documentation: https://dlang.org/phobos/dmd_scanmach.html
+version(OSX):
 
 import core.stdc.string;
 import core.stdc.stdint;

src/dmd/scanmscoff.d

@@ -11,6 +11,7 @@
 module dmd.scanmscoff;
 
 // Online documentation: https://dlang.org/phobos/dmd_scanmscoff.html
+version(Windows):
 
 import core.stdc.string, core.stdc.stdlib, core.sys.windows.windows;
 import dmd.globals, dmd.errors;

src/dmd/scanomf.d

@@ -11,6 +11,7 @@
 module dmd.scanomf;
 
 // Online documentation: https://dlang.org/phobos/dmd_scanomf.html
+version(Windows):
 
 import core.stdc.string;
 import core.stdc.stdlib;

src/posix.mak

@@ -282,9 +282,9 @@ FRONT_SRCS=$(addsuffix .d, $(addprefix $D/,access aggregate aliasthis apply argt
 	dinifile dinterpret dmacro dmangle dmodule doc dscope dstruct dsymbol dsymbolsem	\
 	dtemplate dversion escape expression expressionsem func			\
 	hdrgen id impcnvtab imphint init initsem inline inlinecost intrange	\
-	json lib link mars mtype nogc nspace objc opover optimize parse permissivevisitor sapply templateparamsem	\
+	json lib libelf libmach link mars mtype nogc nspace objc opover optimize parse permissivevisitor sapply templateparamsem	\
 	sideeffect statement staticassert target typesem traits transitivevisitor parsetimevisitor visitor	\
-	typinf utils statement_rewrite_walker statementsem staticcond safe blockexit printast \
+	typinf utils scanelf scanmach statement_rewrite_walker statementsem staticcond safe blockexit printast \
 	semantic2 semantic3))
 
 LEXER_SRCS=$(addsuffix .d, $(addprefix $D/, console entity errors globals id identifier lexer tokens utf))
@@ -297,13 +297,6 @@ ROOT_SRCS = $(addsuffix .d,$(addprefix $(ROOT)/,aav array ctfloat file \
 	stringtable hash))
 
 GLUE_OBJS =
-
-ifeq (osx,$(OS))
-    FRONT_SRCS += $D/libmach.d $D/scanmach.d
-else
-    FRONT_SRCS += $D/libelf.d $D/scanelf.d
-endif
-
 G_GLUE_OBJS = $(addprefix $G/, $(GLUE_OBJS))
 
 GLUE_SRCS=$(addsuffix .d, $(addprefix $D/,irstate toctype glue gluelayer todt tocsym toir dmsc \