diff options
| author | gingerBill <gingerBill@users.noreply.github.com> | 2024-01-29 16:18:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-29 16:18:38 +0000 |
| commit | f588593ff15fa13e89bd869a52b2ff9bf9d91341 (patch) | |
| tree | 8f2c0a32259c405c53396ead12b1c8f3f5c261d0 /core/sys | |
| parent | a78f062499c7f0112558872a500904e6fbc6761b (diff) | |
| parent | a626adac8e8e0ca0506401cf3376727ad801091c (diff) | |
Merge pull request #3147 from odin-lang/base-work
`base` library collection work
Diffstat (limited to 'core/sys')
| -rw-r--r-- | core/sys/darwin/mach_darwin.odin | 2 | ||||
| -rw-r--r-- | core/sys/darwin/xnu_system_call_helpers.odin | 2 | ||||
| -rw-r--r-- | core/sys/darwin/xnu_system_call_wrappers.odin | 2 | ||||
| -rw-r--r-- | core/sys/info/cpu_intel.odin | 2 | ||||
| -rw-r--r-- | core/sys/info/platform_darwin.odin | 2 | ||||
| -rw-r--r-- | core/sys/info/platform_freebsd.odin | 2 | ||||
| -rw-r--r-- | core/sys/info/platform_linux.odin | 4 | ||||
| -rw-r--r-- | core/sys/info/platform_openbsd.odin | 2 | ||||
| -rw-r--r-- | core/sys/info/platform_windows.odin | 4 | ||||
| -rw-r--r-- | core/sys/linux/helpers.odin | 2 | ||||
| -rw-r--r-- | core/sys/linux/sys.odin | 2 | ||||
| -rw-r--r-- | core/sys/unix/pthread_darwin.odin | 2 | ||||
| -rw-r--r-- | core/sys/unix/syscalls_linux.odin | 2 | ||||
| -rw-r--r-- | core/sys/unix/sysctl_darwin.odin | 2 | ||||
| -rw-r--r-- | core/sys/unix/sysctl_freebsd.odin | 2 | ||||
| -rw-r--r-- | core/sys/unix/time_unix.odin | 2 | ||||
| -rw-r--r-- | core/sys/valgrind/callgrind.odin | 2 | ||||
| -rw-r--r-- | core/sys/valgrind/helgrind.odin | 2 | ||||
| -rw-r--r-- | core/sys/valgrind/memcheck.odin | 2 | ||||
| -rw-r--r-- | core/sys/valgrind/valgrind.odin | 2 | ||||
| -rw-r--r-- | core/sys/windows/util.odin | 4 |
21 files changed, 24 insertions, 24 deletions
diff --git a/core/sys/darwin/mach_darwin.odin b/core/sys/darwin/mach_darwin.odin index e6272b9aa..ac33ebb62 100644 --- a/core/sys/darwin/mach_darwin.odin +++ b/core/sys/darwin/mach_darwin.odin @@ -1,6 +1,6 @@ package darwin -foreign import pthread "System.framework" +foreign import pthread "system:System.framework" import "core:c" diff --git a/core/sys/darwin/xnu_system_call_helpers.odin b/core/sys/darwin/xnu_system_call_helpers.odin index c225c77fb..753f7f058 100644 --- a/core/sys/darwin/xnu_system_call_helpers.odin +++ b/core/sys/darwin/xnu_system_call_helpers.odin @@ -1,7 +1,7 @@ package darwin import "core:c" -import "core:runtime" +import "base:runtime" // this package uses the sys prefix for the proc names to indicate that these aren't native syscalls but directly call such sys_write_string :: proc (fd: c.int, message: string) -> bool { diff --git a/core/sys/darwin/xnu_system_call_wrappers.odin b/core/sys/darwin/xnu_system_call_wrappers.odin index c7a6d6bc4..3b051ac19 100644 --- a/core/sys/darwin/xnu_system_call_wrappers.odin +++ b/core/sys/darwin/xnu_system_call_wrappers.odin @@ -1,7 +1,7 @@ package darwin import "core:c" -import "core:intrinsics" +import "base:intrinsics" /* flock */ LOCK_SH :: 1 /* shared lock */ diff --git a/core/sys/info/cpu_intel.odin b/core/sys/info/cpu_intel.odin index 1344c3d2a..2b8f9852f 100644 --- a/core/sys/info/cpu_intel.odin +++ b/core/sys/info/cpu_intel.odin @@ -1,7 +1,7 @@ //+build i386, amd64 package sysinfo -import "core:intrinsics" +import "base:intrinsics" // cpuid :: proc(ax, cx: u32) -> (eax, ebc, ecx, edx: u32) --- cpuid :: intrinsics.x86_cpuid diff --git a/core/sys/info/platform_darwin.odin b/core/sys/info/platform_darwin.odin index 4ca542b7a..4316b2ade 100644 --- a/core/sys/info/platform_darwin.odin +++ b/core/sys/info/platform_darwin.odin @@ -4,7 +4,7 @@ package sysinfo import sys "core:sys/unix" import "core:strconv" import "core:strings" -import "core:runtime" +import "base:runtime" @(private) version_string_buf: [1024]u8 diff --git a/core/sys/info/platform_freebsd.odin b/core/sys/info/platform_freebsd.odin index 1d53da998..26b4be7e9 100644 --- a/core/sys/info/platform_freebsd.odin +++ b/core/sys/info/platform_freebsd.odin @@ -4,7 +4,7 @@ package sysinfo import sys "core:sys/unix" import "core:strings" import "core:strconv" -import "core:runtime" +import "base:runtime" @(private) version_string_buf: [1024]u8 diff --git a/core/sys/info/platform_linux.odin b/core/sys/info/platform_linux.odin index 14961c2a8..93770a460 100644 --- a/core/sys/info/platform_linux.odin +++ b/core/sys/info/platform_linux.odin @@ -1,8 +1,8 @@ // +build linux package sysinfo -import "core:intrinsics" -import "core:runtime" +import "base:intrinsics" +import "base:runtime" import "core:strings" import "core:strconv" diff --git a/core/sys/info/platform_openbsd.odin b/core/sys/info/platform_openbsd.odin index dbca6eaf3..772531ceb 100644 --- a/core/sys/info/platform_openbsd.odin +++ b/core/sys/info/platform_openbsd.odin @@ -4,7 +4,7 @@ package sysinfo import sys "core:sys/unix" import "core:strings" import "core:strconv" -import "core:runtime" +import "base:runtime" @(private) version_string_buf: [1024]u8 diff --git a/core/sys/info/platform_windows.odin b/core/sys/info/platform_windows.odin index 9c1c7b04c..250f938b1 100644 --- a/core/sys/info/platform_windows.odin +++ b/core/sys/info/platform_windows.odin @@ -2,12 +2,12 @@ package sysinfo import sys "core:sys/windows" -import "core:intrinsics" +import "base:intrinsics" import "core:strings" import "core:unicode/utf16" import "core:fmt" -import "core:runtime" +import "base:runtime" @(private) version_string_buf: [1024]u8 diff --git a/core/sys/linux/helpers.odin b/core/sys/linux/helpers.odin index cf4143924..9bee57c11 100644 --- a/core/sys/linux/helpers.odin +++ b/core/sys/linux/helpers.odin @@ -1,7 +1,7 @@ //+build linux package linux -import "core:intrinsics" +import "base:intrinsics" // Note(flysand): In the case of syscall let's get rid of extra // casting. First of all, let these syscalls return int, because diff --git a/core/sys/linux/sys.odin b/core/sys/linux/sys.odin index 9a0f18e9f..8a93f0a47 100644 --- a/core/sys/linux/sys.odin +++ b/core/sys/linux/sys.odin @@ -1,6 +1,6 @@ package linux -import "core:intrinsics" +import "base:intrinsics" /* diff --git a/core/sys/unix/pthread_darwin.odin b/core/sys/unix/pthread_darwin.odin index a28de4ad0..358b5d2fd 100644 --- a/core/sys/unix/pthread_darwin.odin +++ b/core/sys/unix/pthread_darwin.odin @@ -86,7 +86,7 @@ PTHREAD_CANCEL_DISABLE :: 1 PTHREAD_CANCEL_DEFERRED :: 0 PTHREAD_CANCEL_ASYNCHRONOUS :: 1 -foreign import pthread "System.framework" +foreign import pthread "system:System.framework" @(default_calling_convention="c") foreign pthread { diff --git a/core/sys/unix/syscalls_linux.odin b/core/sys/unix/syscalls_linux.odin index 3083c084b..038c16276 100644 --- a/core/sys/unix/syscalls_linux.odin +++ b/core/sys/unix/syscalls_linux.odin @@ -1,6 +1,6 @@ package unix -import "core:intrinsics" +import "base:intrinsics" // Linux has inconsistent system call numbering across architectures, // for largely historical reasons. This attempts to provide a unified diff --git a/core/sys/unix/sysctl_darwin.odin b/core/sys/unix/sysctl_darwin.odin index f9530b86f..76c72f478 100644 --- a/core/sys/unix/sysctl_darwin.odin +++ b/core/sys/unix/sysctl_darwin.odin @@ -2,7 +2,7 @@ package unix import "core:sys/darwin" -import "core:intrinsics" +import "base:intrinsics" _ :: darwin diff --git a/core/sys/unix/sysctl_freebsd.odin b/core/sys/unix/sysctl_freebsd.odin index 5b0bcb88d..d1acbc2a1 100644 --- a/core/sys/unix/sysctl_freebsd.odin +++ b/core/sys/unix/sysctl_freebsd.odin @@ -1,7 +1,7 @@ //+build freebsd package unix -import "core:intrinsics" +import "base:intrinsics" sysctl :: proc(mib: []i32, val: ^$T) -> (ok: bool) { mib := mib diff --git a/core/sys/unix/time_unix.odin b/core/sys/unix/time_unix.odin index fa3a7a29d..108067dd4 100644 --- a/core/sys/unix/time_unix.odin +++ b/core/sys/unix/time_unix.odin @@ -2,7 +2,7 @@ package unix when ODIN_OS == .Darwin { - foreign import libc "System.framework" + foreign import libc "system:System.framework" } else { foreign import libc "system:c" } diff --git a/core/sys/valgrind/callgrind.odin b/core/sys/valgrind/callgrind.odin index cf377e353..b1ba8c6e9 100644 --- a/core/sys/valgrind/callgrind.odin +++ b/core/sys/valgrind/callgrind.odin @@ -1,7 +1,7 @@ //+build amd64 package sys_valgrind -import "core:intrinsics" +import "base:intrinsics" Callgrind_Client_Request :: enum uintptr { Dump_Stats = 'C'<<24 | 'T'<<16, diff --git a/core/sys/valgrind/helgrind.odin b/core/sys/valgrind/helgrind.odin index 41c047d05..2f0114522 100644 --- a/core/sys/valgrind/helgrind.odin +++ b/core/sys/valgrind/helgrind.odin @@ -1,7 +1,7 @@ //+build amd64 package sys_valgrind -import "core:intrinsics" +import "base:intrinsics" Helgrind_Client_Request :: enum uintptr { Clean_Memory = 'H'<<24 | 'G'<<16, diff --git a/core/sys/valgrind/memcheck.odin b/core/sys/valgrind/memcheck.odin index 6a9fab854..dfbe4c3be 100644 --- a/core/sys/valgrind/memcheck.odin +++ b/core/sys/valgrind/memcheck.odin @@ -1,7 +1,7 @@ //+build amd64 package sys_valgrind -import "core:intrinsics" +import "base:intrinsics" Mem_Check_Client_Request :: enum uintptr { Make_Mem_No_Access = 'M'<<24 | 'C'<<16, diff --git a/core/sys/valgrind/valgrind.odin b/core/sys/valgrind/valgrind.odin index b587ea3bf..d0c46af53 100644 --- a/core/sys/valgrind/valgrind.odin +++ b/core/sys/valgrind/valgrind.odin @@ -1,7 +1,7 @@ //+build amd64 package sys_valgrind -import "core:intrinsics" +import "base:intrinsics" Client_Request :: enum uintptr { Running_On_Valgrind = 4097, diff --git a/core/sys/windows/util.odin b/core/sys/windows/util.odin index 9c9d8f7b4..c68d58de0 100644 --- a/core/sys/windows/util.odin +++ b/core/sys/windows/util.odin @@ -1,8 +1,8 @@ // +build windows package sys_windows -import "core:runtime" -import "core:intrinsics" +import "base:runtime" +import "base:intrinsics" L :: intrinsics.constant_utf16_cstring |