Move core.elf.* to core.internal.elf.*

dlang · Jan 17, 2020 · cb4d513 · cb4d513
1 parent 40370b8
commit cb4d513
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 23 deletions.
diff --git a/mak/COPY b/mak/COPY
@@ -21,9 +21,6 @@ COPY=\
 	$(IMPDIR)\core\vararg.d \
 	$(IMPDIR)\core\volatile.d \
 	\
-	$(IMPDIR)\core\elf\dl.d \
-	$(IMPDIR)\core\elf\io.d \
-	\
 	$(IMPDIR)\core\internal\abort.d \
 	$(IMPDIR)\core\internal\atomic.d \
 	$(IMPDIR)\core\internal\attributes.d \
@@ -53,6 +50,9 @@ COPY=\
 	$(IMPDIR)\core\internal\array\operations.d \
 	$(IMPDIR)\core\internal\array\utils.d \
 	\
+	$(IMPDIR)\core\internal\elf\dl.d \
+	$(IMPDIR)\core\internal\elf\io.d \
+	\
 	$(IMPDIR)\core\internal\util\array.d \
 	\
 	$(IMPDIR)\core\stdc\assert_.d \

diff --git a/mak/DOCS b/mak/DOCS
@@ -20,9 +20,6 @@ DOCS=\
 	$(DOCDIR)\core_gc_gcinterface.html \
 	$(DOCDIR)\core_gc_registry.html \
 	\
-	$(DOCDIR)\core_elf_dl.html \
-	$(DOCDIR)\core_elf_io.html \
-	\
 	$(DOCDIR)\core_stdc_assert_.html \
 	$(DOCDIR)\core_stdc_config.html \
 	$(DOCDIR)\core_stdc_complex.html \

diff --git a/mak/SRCS b/mak/SRCS
@@ -21,9 +21,6 @@ SRCS=\
 	src\core\gc\gcinterface.d \
 	src\core\gc\registry.d \
 	\
-	src\core\elf\dl.d \
-	src\core\elf\io.d \
-	\
 	src\core\internal\abort.d \
 	src\core\internal\atomic.d \
 	src\core\internal\convert.d \
@@ -51,6 +48,10 @@ SRCS=\
 	src\core\internal\array\concatenation.d \
 	src\core\internal\array\operations.d \
 	src\core\internal\array\utils.d \
+	\
+	src\core\internal\elf\dl.d \
+	src\core\internal\elf\io.d \
+	\
 	src\core\internal\util\array.d \
 	\
 	src\core\stdc\assert_.d \

diff --git a/mak/WINDOWS b/mak/WINDOWS
@@ -110,12 +110,6 @@ $(IMPDIR)\core\vararg.d : src\core\vararg.d
 $(IMPDIR)\core\volatile.d : src\core\volatile.d
 	copy $** $@
 
-$(IMPDIR)\core\elf\dl.d : src\core\elf\dl.d
-	copy $** $@
-
-$(IMPDIR)\core\elf\io.d : src\core\elf\io.d
-	copy $** $@
-
 $(IMPDIR)\core\gc\config.d : src\core\gc\config.d
 	copy $** $@
 
@@ -206,6 +200,12 @@ $(IMPDIR)\core\internal\array\utils.d : src\core\internal\array\utils.d
 $(IMPDIR)\core\internal\array\operations.d : src\core\internal\array\operations.d
 	copy $** $@
 
+$(IMPDIR)\core\internal\elf\dl.d : src\core\internal\elf\dl.d
+	copy $** $@
+
+$(IMPDIR)\core\internal\elf\io.d : src\core\internal\elf\io.d
+	copy $** $@
+
 $(IMPDIR)\core\internal\util\array.d : src\core\internal\util\array.d
 	copy $** $@
 

diff --git a/posix.mak b/posix.mak
@@ -150,9 +150,6 @@ $(DOCDIR)/object.html : src/object.d $(DMD)
 $(DOCDIR)/core_%.html : src/core/%.d $(DMD)
 	$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
 
-$(DOCDIR)/core_elf_%.html : src/core/elf/%.d $(DMD)
-	$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
-
 $(DOCDIR)/core_experimental_%.html : src/core/experimental/%.d $(DMD)
 	$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
 
@@ -162,6 +159,9 @@ $(DOCDIR)/core_gc_%.html : src/core/gc/%.d $(DMD)
 $(DOCDIR)/core_internal_%.html : src/core/internal/%.d $(DMD)
 	$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
 
+$(DOCDIR)/core_internal_elf_%.html : src/core/internal/elf/%.d $(DMD)
+	$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
+
 $(DOCDIR)/core_stdc_%.html : src/core/stdc/%.d $(DMD)
 	$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
 

diff --git a/src/core/elf/dl.d → src/core/internal/elf/dl.d b/src/core/elf/dl.d → src/core/internal/elf/dl.d
@@ -9,7 +9,7 @@
  * Source: $(DRUNTIMESRC core/elf/dl.d)
  */
 
-module core.elf.dl;
+module core.internal.elf.dl;
 
 version (linux)
 {

diff --git a/src/core/elf/io.d → src/core/internal/elf/io.d b/src/core/elf/io.d → src/core/internal/elf/io.d
@@ -9,7 +9,7 @@
  * Source: $(DRUNTIMESRC core/elf/io.d)
  */
 
-module core.elf.io;
+module core.internal.elf.io;
 
 version (Posix):
 

diff --git a/src/rt/backtrace/elf.d b/src/rt/backtrace/elf.d
@@ -29,8 +29,8 @@ else version (DragonFlyBSD)
 
 version (LinuxOrBSD):
 
-import core.elf.dl;
-import core.elf.io;
+import core.internal.elf.dl;
+import core.internal.elf.io;
 
 struct Image
 {

diff --git a/src/rt/sections_elf_shared.d b/src/rt/sections_elf_shared.d
@@ -20,7 +20,7 @@ else enum SharedELF = false;
 static if (SharedELF):
 
 // debug = PRINTF;
-import core.elf.dl;
+import core.internal.elf.dl;
 import core.memory;
 import core.stdc.config;
 import core.stdc.stdio;