aboutsummaryrefslogtreecommitdiff
path: root/lib/std/os/bits/linux/securebits.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2021-09-15 14:46:31 -0700
committerAndrew Kelley <andrew@ziglang.org>2021-09-15 14:51:08 -0700
commitf3ebfcae3882c03da84821abed40167ea07a8c78 (patch)
treef1b759c94cba5b020a9ffb141fc62cb686fc5f04 /lib/std/os/bits/linux/securebits.zig
parent111a2dcf3ad53c0c8ad2c9e7c9bd042b81e90c82 (diff)
parent0395b35cee8d4082cc40b0dcd0298f797f42309d (diff)
downloadzig-f3ebfcae3882c03da84821abed40167ea07a8c78.tar.gz
zig-f3ebfcae3882c03da84821abed40167ea07a8c78.zip
Merge remote-tracking branch 'origin/master' into llvm13
Conflicts: * cmake/Findclang.cmake * cmake/Findlld.cmake * cmake/Findllvm.cmake In master branch, more search paths were added to these files with "12" in the path. In this commit I updated them to "13". * src/stage1/codegen.cpp * src/zig_llvm.cpp * src/zig_llvm.h In master branch, ZigLLVMBuildCmpXchg is improved to add `is_single_threaded`. However, the LLVM 13 C API has this already, and in the llvm13 branch, ZigLLVMBuildCmpXchg is deleted in favor of the C API. In this commit I updated stage2 to use the LLVM 13 C API rather than depending on an improved ZigLLVMBuildCmpXchg. Additionally, src/target.zig largestAtomicBits needed to be updated to include the new m68k ISA.
Diffstat (limited to 'lib/std/os/bits/linux/securebits.zig')
-rw-r--r--lib/std/os/bits/linux/securebits.zig35
1 files changed, 0 insertions, 35 deletions
diff --git a/lib/std/os/bits/linux/securebits.zig b/lib/std/os/bits/linux/securebits.zig
deleted file mode 100644
index a23ced3cf2..0000000000
--- a/lib/std/os/bits/linux/securebits.zig
+++ /dev/null
@@ -1,35 +0,0 @@
-fn issecure_mask(comptime x: comptime_int) comptime_int {
- return 1 << x;
-}
-
-pub const SECUREBITS_DEFAULT = 0x00000000;
-
-pub const SECURE_NOROOT = 0;
-pub const SECURE_NOROOT_LOCKED = 1;
-
-pub const SECBIT_NOROOT = issecure_mask(SECURE_NOROOT);
-pub const SECBIT_NOROOT_LOCKED = issecure_mask(SECURE_NOROOT_LOCKED);
-
-pub const SECURE_NO_SETUID_FIXUP = 2;
-pub const SECURE_NO_SETUID_FIXUP_LOCKED = 3;
-
-pub const SECBIT_NO_SETUID_FIXUP = issecure_mask(SECURE_NO_SETUID_FIXUP);
-pub const SECBIT_NO_SETUID_FIXUP_LOCKED = issecure_mask(SECURE_NO_SETUID_FIXUP_LOCKED);
-
-pub const SECURE_KEEP_CAPS = 4;
-pub const SECURE_KEEP_CAPS_LOCKED = 5;
-
-pub const SECBIT_KEEP_CAPS = issecure_mask(SECURE_KEEP_CAPS);
-pub const SECBIT_KEEP_CAPS_LOCKED = issecure_mask(SECURE_KEEP_CAPS_LOCKED);
-
-pub const SECURE_NO_CAP_AMBIENT_RAISE = 6;
-pub const SECURE_NO_CAP_AMBIENT_RAISE_LOCKED = 7;
-
-pub const SECBIT_NO_CAP_AMBIENT_RAISE = issecure_mask(SECURE_NO_CAP_AMBIENT_RAISE);
-pub const SECBIT_NO_CAP_AMBIENT_RAISE_LOCKED = issecure_mask(SECURE_NO_CAP_AMBIENT_RAISE_LOCKED);
-
-pub const SECURE_ALL_BITS = issecure_mask(SECURE_NOROOT) |
- issecure_mask(SECURE_NO_SETUID_FIXUP) |
- issecure_mask(SECURE_KEEP_CAPS) |
- issecure_mask(SECURE_NO_CAP_AMBIENT_RAISE);
-pub const SECURE_ALL_LOCKS = SECURE_ALL_BITS << 1;