flatten lib/std/special and improve "pkg inside another" logic

stage2: change logic for detecting whether the main package is inside
the std package. Previously it relied on realpath() which is not portable.
This uses resolve() which is how imports already work.

 * stage2: fix cleanup bug when creating Module
 * flatten lib/std/special/* to lib/*
   - this was motivated by making main_pkg_is_inside_std false for
     compiler_rt & friends.
 * rename "mini libc" to "universal libc"

CMakeLists.txt

@@ -478,74 +478,74 @@ set(ZIG_STAGE2_SOURCES
     "${CMAKE_SOURCE_DIR}/lib/std/process.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/rand.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/sort.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/absv.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/addXf3.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/addo.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/arm.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/atomics.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/aulldiv.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/aullrem.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/bswap.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/ceil.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/clear_cache.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/cmp.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/compareXf2.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/cos.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/count0bits.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/divdf3.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/divsf3.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/divtf3.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/divti3.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/divxf3.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/emutls.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/exp.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/exp2.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/extendXfYf2.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/extend_f80.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/fabs.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/fixXfYi.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/floatXiYf.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/floor.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/fma.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/fmax.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/fmin.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/fmod.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/int.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/log.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/log10.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/log2.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/modti3.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/mulXf3.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/muldi3.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/mulo.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/multi3.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/negXf2.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/negXi2.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/negv.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/os_version_check.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/parity.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/popcount.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/rem_pio2.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/rem_pio2_large.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/rem_pio2f.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/round.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/shift.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/sin.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/sincos.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/sparc.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/sqrt.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/stack_probe.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/subo.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/tan.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/trig.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/trunc.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/truncXfYf2.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/trunc_f80.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/udivmod.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/udivmodti4.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/udivti3.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/umodti3.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/absv.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/addXf3.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/addo.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/arm.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/atomics.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/aulldiv.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/aullrem.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/bswap.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/ceil.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/clear_cache.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/cmp.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/compareXf2.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/cos.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/count0bits.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/divdf3.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/divsf3.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/divtf3.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/divti3.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/divxf3.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/emutls.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/exp.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/exp2.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/extendXfYf2.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/extend_f80.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/fabs.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/fixXfYi.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/floatXiYf.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/floor.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/fma.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/fmax.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/fmin.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/fmod.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/int.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/log.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/log10.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/log2.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/modti3.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/mulXf3.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/muldi3.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/mulo.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/multi3.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/negXf2.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/negXi2.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/negv.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/os_version_check.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/parity.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/popcount.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/rem_pio2.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/rem_pio2_large.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/rem_pio2f.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/round.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/shift.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/sin.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/sincos.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/sparc.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/sqrt.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/stack_probe.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/subo.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/tan.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/trig.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/trunc.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/truncXfYf2.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/trunc_f80.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/udivmod.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/udivmodti4.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/udivti3.zig"
+    "${CMAKE_SOURCE_DIR}/lib/compiler_rt/umodti3.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/start.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/std.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/target.zig"
@@ -869,7 +869,7 @@ set(BUILD_ZIG1_ARGS
     -lc
     --pkg-begin build_options "${ZIG_CONFIG_ZIG_OUT}"
     --pkg-end
-    --pkg-begin compiler_rt "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt.zig"
+    --pkg-begin compiler_rt "${CMAKE_SOURCE_DIR}/lib/compiler_rt.zig"
     --pkg-end
 )
 

build.zig

@@ -450,7 +450,7 @@ pub fn build(b: *Builder) !void {
     toolchain_step.dependOn(tests.addPkgTests(
         b,
         test_filter,
-        "lib/std/special/compiler_rt.zig",
+        "lib/compiler_rt.zig",
         "compiler-rt",
         "Run the compiler_rt tests",
         modes,
@@ -462,9 +462,9 @@ pub fn build(b: *Builder) !void {
     toolchain_step.dependOn(tests.addPkgTests(
         b,
         test_filter,
-        "lib/std/special/c.zig",
-        "minilibc",
-        "Run the mini libc tests",
+        "lib/c.zig",
+        "universal-libc",
+        "Run the universal libc tests",
         modes,
         true, // skip_single_threaded
         skip_non_native,

ci/drone/linux_script_test

@@ -28,7 +28,7 @@ case "$1" in
     ./build/zig build $BUILD_FLAGS test-std -Dskip-debug -Dskip-release-safe -Dskip-release-fast
     ;;
   6)
-    ./build/zig build $BUILD_FLAGS test-minilibc
+    ./build/zig build $BUILD_FLAGS test-universal-libc
     ./build/zig build $BUILD_FLAGS test-compare-output
     ./build/zig build $BUILD_FLAGS test-standalone -Dskip-release-safe
     ./build/zig build $BUILD_FLAGS test-stack-traces

ci/zinc/linux_test.sh

@@ -69,7 +69,7 @@ stage2/bin/zig test test/behavior.zig -I test -fno-LLVM -target  x86_64-macos --
 $ZIG build test-behavior         -fqemu -fwasmtime
 $ZIG build test-compiler-rt      -fqemu -fwasmtime
 $ZIG build test-std              -fqemu -fwasmtime
-$ZIG build test-minilibc         -fqemu -fwasmtime
+$ZIG build test-universal-libc   -fqemu -fwasmtime
 $ZIG build test-compare-output   -fqemu -fwasmtime
 $ZIG build test-standalone       -fqemu -fwasmtime
 $ZIG build test-stack-traces     -fqemu -fwasmtime

doc/langref.html.in

@@ -1040,7 +1040,7 @@ fn addOne(number: i32) i32 {
       </p>
       <aside>
         This documentation discusses the features of the default test runner as provided by the Zig Standard Library.
-        Its source code is located in <code class="file">lib/std/special/test_runner.zig</code>.
+        Its source code is located in <code class="file">lib/test_runner.zig</code>.
       </aside>
       <p>
         The shell output shown above displays two lines after the <kbd>zig test</kbd> command. These lines are