diff options
| author | gingerBill <bill@gingerbill.org> | 2024-01-29 17:43:55 +0000 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2024-01-29 17:43:55 +0000 |
| commit | dbb6c6f545621600725a6decc7b742535fff310d (patch) | |
| tree | fcd256f16baf4a0f0da74ff01876e5e3f2ea36ad | |
| parent | 11f1d8e73e22f826106cff0f5244b43d64d63d83 (diff) | |
Move src files to parent directory; add LICENSE for mimalloc
| -rw-r--r-- | build.bat | 2 | ||||
| -rwxr-xr-x | build_odin.sh | 2 | ||||
| -rw-r--r-- | src/mimalloc/LICENSE | 21 | ||||
| -rw-r--r-- | src/mimalloc/alloc-aligned.c (renamed from src/mimalloc/src/alloc-aligned.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/alloc-override.c (renamed from src/mimalloc/src/alloc-override.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/alloc-posix.c (renamed from src/mimalloc/src/alloc-posix.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/alloc.c (renamed from src/mimalloc/src/alloc.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/arena.c (renamed from src/mimalloc/src/arena.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/bitmap.c (renamed from src/mimalloc/src/bitmap.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/bitmap.h (renamed from src/mimalloc/src/bitmap.h) | 0 | ||||
| -rw-r--r-- | src/mimalloc/heap.c (renamed from src/mimalloc/src/heap.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/init.c (renamed from src/mimalloc/src/init.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/options.c (renamed from src/mimalloc/src/options.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/os.c (renamed from src/mimalloc/src/os.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/page-queue.c (renamed from src/mimalloc/src/page-queue.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/page.c (renamed from src/mimalloc/src/page.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/prim/osx/alloc-override-zone.c (renamed from src/mimalloc/src/prim/osx/alloc-override-zone.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/prim/osx/prim.c (renamed from src/mimalloc/src/prim/osx/prim.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/prim/prim.c (renamed from src/mimalloc/src/prim/prim.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/prim/readme.md (renamed from src/mimalloc/src/prim/readme.md) | 0 | ||||
| -rw-r--r-- | src/mimalloc/prim/unix/prim.c (renamed from src/mimalloc/src/prim/unix/prim.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/prim/wasi/prim.c (renamed from src/mimalloc/src/prim/wasi/prim.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/prim/windows/etw-mimalloc.wprp (renamed from src/mimalloc/src/prim/windows/etw-mimalloc.wprp) | 0 | ||||
| -rw-r--r-- | src/mimalloc/prim/windows/etw.h (renamed from src/mimalloc/src/prim/windows/etw.h) | 0 | ||||
| -rw-r--r-- | src/mimalloc/prim/windows/etw.man (renamed from src/mimalloc/src/prim/windows/etw.man) | bin | 3926 -> 3926 bytes | |||
| -rw-r--r-- | src/mimalloc/prim/windows/prim.c (renamed from src/mimalloc/src/prim/windows/prim.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/prim/windows/readme.md (renamed from src/mimalloc/src/prim/windows/readme.md) | 0 | ||||
| -rw-r--r-- | src/mimalloc/random.c (renamed from src/mimalloc/src/random.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/segment-map.c (renamed from src/mimalloc/src/segment-map.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/segment.c (renamed from src/mimalloc/src/segment.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/static.c (renamed from src/mimalloc/src/static.c) | 0 | ||||
| -rw-r--r-- | src/mimalloc/stats.c (renamed from src/mimalloc/src/stats.c) | 0 |
32 files changed, 23 insertions, 2 deletions
@@ -105,7 +105,7 @@ set linker_settings=%libs% %linker_flags% del *.pdb > NUL 2> NUL del *.ilk > NUL 2> NUL -cl %compiler_settings% "src\mimalloc\src\static.c" "src\main.cpp" "src\libtommath.cpp" /link %linker_settings% -OUT:%exe_name% +cl %compiler_settings% "src\mimalloc\static.c" "src\main.cpp" "src\libtommath.cpp" /link %linker_settings% -OUT:%exe_name% if %errorlevel% neq 0 goto end_of_build call build_vendor.bat diff --git a/build_odin.sh b/build_odin.sh index 2fc30c067..dbd78dbd2 100755 --- a/build_odin.sh +++ b/build_odin.sh @@ -114,7 +114,7 @@ build_odin() { esac set -x - $CXX src/mimalloc/src/static.c src/libtommath.cpp src/main.cpp $DISABLED_WARNINGS $CPPFLAGS $CXXFLAGS $EXTRAFLAGS $LDFLAGS -o odin + $CXX src/mimalloc/static.c src/libtommath.cpp src/main.cpp $DISABLED_WARNINGS $CPPFLAGS $CXXFLAGS $EXTRAFLAGS $LDFLAGS -o odin set +x } diff --git a/src/mimalloc/LICENSE b/src/mimalloc/LICENSE new file mode 100644 index 000000000..670b668a0 --- /dev/null +++ b/src/mimalloc/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018-2021 Microsoft Corporation, Daan Leijen + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/src/mimalloc/src/alloc-aligned.c b/src/mimalloc/alloc-aligned.c index 1cd809f15..1cd809f15 100644 --- a/src/mimalloc/src/alloc-aligned.c +++ b/src/mimalloc/alloc-aligned.c diff --git a/src/mimalloc/src/alloc-override.c b/src/mimalloc/alloc-override.c index 873065dc6..873065dc6 100644 --- a/src/mimalloc/src/alloc-override.c +++ b/src/mimalloc/alloc-override.c diff --git a/src/mimalloc/src/alloc-posix.c b/src/mimalloc/alloc-posix.c index 225752fd8..225752fd8 100644 --- a/src/mimalloc/src/alloc-posix.c +++ b/src/mimalloc/alloc-posix.c diff --git a/src/mimalloc/src/alloc.c b/src/mimalloc/alloc.c index ffc1747d5..ffc1747d5 100644 --- a/src/mimalloc/src/alloc.c +++ b/src/mimalloc/alloc.c diff --git a/src/mimalloc/src/arena.c b/src/mimalloc/arena.c index a04a04c8f..a04a04c8f 100644 --- a/src/mimalloc/src/arena.c +++ b/src/mimalloc/arena.c diff --git a/src/mimalloc/src/bitmap.c b/src/mimalloc/bitmap.c index a13dbe15b..a13dbe15b 100644 --- a/src/mimalloc/src/bitmap.c +++ b/src/mimalloc/bitmap.c diff --git a/src/mimalloc/src/bitmap.h b/src/mimalloc/bitmap.h index 0a765c714..0a765c714 100644 --- a/src/mimalloc/src/bitmap.h +++ b/src/mimalloc/bitmap.h diff --git a/src/mimalloc/src/heap.c b/src/mimalloc/heap.c index 58520ddf6..58520ddf6 100644 --- a/src/mimalloc/src/heap.c +++ b/src/mimalloc/heap.c diff --git a/src/mimalloc/src/init.c b/src/mimalloc/init.c index b1db14c5f..b1db14c5f 100644 --- a/src/mimalloc/src/init.c +++ b/src/mimalloc/init.c diff --git a/src/mimalloc/src/options.c b/src/mimalloc/options.c index 345b560e3..345b560e3 100644 --- a/src/mimalloc/src/options.c +++ b/src/mimalloc/options.c diff --git a/src/mimalloc/src/os.c b/src/mimalloc/os.c index b4f02ba37..b4f02ba37 100644 --- a/src/mimalloc/src/os.c +++ b/src/mimalloc/os.c diff --git a/src/mimalloc/src/page-queue.c b/src/mimalloc/page-queue.c index cb54b3740..cb54b3740 100644 --- a/src/mimalloc/src/page-queue.c +++ b/src/mimalloc/page-queue.c diff --git a/src/mimalloc/src/page.c b/src/mimalloc/page.c index 8ac0a715e..8ac0a715e 100644 --- a/src/mimalloc/src/page.c +++ b/src/mimalloc/page.c diff --git a/src/mimalloc/src/prim/osx/alloc-override-zone.c b/src/mimalloc/prim/osx/alloc-override-zone.c index 0e0a99d93..0e0a99d93 100644 --- a/src/mimalloc/src/prim/osx/alloc-override-zone.c +++ b/src/mimalloc/prim/osx/alloc-override-zone.c diff --git a/src/mimalloc/src/prim/osx/prim.c b/src/mimalloc/prim/osx/prim.c index 8a2f4e8aa..8a2f4e8aa 100644 --- a/src/mimalloc/src/prim/osx/prim.c +++ b/src/mimalloc/prim/osx/prim.c diff --git a/src/mimalloc/src/prim/prim.c b/src/mimalloc/prim/prim.c index 9a597d8eb..9a597d8eb 100644 --- a/src/mimalloc/src/prim/prim.c +++ b/src/mimalloc/prim/prim.c diff --git a/src/mimalloc/src/prim/readme.md b/src/mimalloc/prim/readme.md index 380dd3a71..380dd3a71 100644 --- a/src/mimalloc/src/prim/readme.md +++ b/src/mimalloc/prim/readme.md diff --git a/src/mimalloc/src/prim/unix/prim.c b/src/mimalloc/prim/unix/prim.c index 314281fe8..314281fe8 100644 --- a/src/mimalloc/src/prim/unix/prim.c +++ b/src/mimalloc/prim/unix/prim.c diff --git a/src/mimalloc/src/prim/wasi/prim.c b/src/mimalloc/prim/wasi/prim.c index 50511f0b5..50511f0b5 100644 --- a/src/mimalloc/src/prim/wasi/prim.c +++ b/src/mimalloc/prim/wasi/prim.c diff --git a/src/mimalloc/src/prim/windows/etw-mimalloc.wprp b/src/mimalloc/prim/windows/etw-mimalloc.wprp index b00cd7adf..b00cd7adf 100644 --- a/src/mimalloc/src/prim/windows/etw-mimalloc.wprp +++ b/src/mimalloc/prim/windows/etw-mimalloc.wprp diff --git a/src/mimalloc/src/prim/windows/etw.h b/src/mimalloc/prim/windows/etw.h index 4e0a092a1..4e0a092a1 100644 --- a/src/mimalloc/src/prim/windows/etw.h +++ b/src/mimalloc/prim/windows/etw.h diff --git a/src/mimalloc/src/prim/windows/etw.man b/src/mimalloc/prim/windows/etw.man Binary files differindex cfd1f8a9e..cfd1f8a9e 100644 --- a/src/mimalloc/src/prim/windows/etw.man +++ b/src/mimalloc/prim/windows/etw.man diff --git a/src/mimalloc/src/prim/windows/prim.c b/src/mimalloc/prim/windows/prim.c index e6b610792..e6b610792 100644 --- a/src/mimalloc/src/prim/windows/prim.c +++ b/src/mimalloc/prim/windows/prim.c diff --git a/src/mimalloc/src/prim/windows/readme.md b/src/mimalloc/prim/windows/readme.md index 217c3d174..217c3d174 100644 --- a/src/mimalloc/src/prim/windows/readme.md +++ b/src/mimalloc/prim/windows/readme.md diff --git a/src/mimalloc/src/random.c b/src/mimalloc/random.c index 4fc8b2f8f..4fc8b2f8f 100644 --- a/src/mimalloc/src/random.c +++ b/src/mimalloc/random.c diff --git a/src/mimalloc/src/segment-map.c b/src/mimalloc/segment-map.c index 4c2104bd8..4c2104bd8 100644 --- a/src/mimalloc/src/segment-map.c +++ b/src/mimalloc/segment-map.c diff --git a/src/mimalloc/src/segment.c b/src/mimalloc/segment.c index 28685f21c..28685f21c 100644 --- a/src/mimalloc/src/segment.c +++ b/src/mimalloc/segment.c diff --git a/src/mimalloc/src/static.c b/src/mimalloc/static.c index bc05dd72f..bc05dd72f 100644 --- a/src/mimalloc/src/static.c +++ b/src/mimalloc/static.c diff --git a/src/mimalloc/src/stats.c b/src/mimalloc/stats.c index 300956ce1..300956ce1 100644 --- a/src/mimalloc/src/stats.c +++ b/src/mimalloc/stats.c |