mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 14:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24825 from alexrp/freebsd-fixes

Browse Source
This commit is contained in:
Alex Rønne Petersen 2025-08-14 01:00:30 +02:00 committed by GitHub
commit 27d6614f81
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 3 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/libtsan/sanitizer_common/sanitizer_platform_limits_freebsd.cpp vendored
View File

@ -70,14 +70,8 @@
#include <semaphore.h> #include <semaphore.h>
#include <signal.h> #include <signal.h>
#include <stddef.h> #include <stddef.h>
#include <md5.h>
#include <sha224.h>
#include <sha256.h>
#include <sha384.h>
#include <sha512.h>
#include <stdio.h> #include <stdio.h>
#include <stringlist.h> #include <stringlist.h>
#include <term.h>
#include <termios.h> #include <termios.h>
#include <time.h> #include <time.h>
#include <ttyent.h> #include <ttyent.h>
@ -378,22 +372,6 @@ const int si_SEGV_MAPERR = SEGV_MAPERR;
const int si_SEGV_ACCERR = SEGV_ACCERR; const int si_SEGV_ACCERR = SEGV_ACCERR;
const int unvis_valid = UNVIS_VALID; const int unvis_valid = UNVIS_VALID;
const int unvis_validpush = UNVIS_VALIDPUSH; const int unvis_validpush = UNVIS_VALIDPUSH;
const unsigned MD5_CTX_sz = sizeof(MD5_CTX);
const unsigned MD5_return_length = MD5_DIGEST_STRING_LENGTH;
#define SHA2_CONST(LEN) \
const unsigned SHA##LEN##_CTX_sz = sizeof(SHA##LEN##_CTX); \
const unsigned SHA##LEN##_return_length = SHA##LEN##_DIGEST_STRING_LENGTH; \
const unsigned SHA##LEN##_block_length = SHA##LEN##_BLOCK_LENGTH; \
const unsigned SHA##LEN##_digest_length = SHA##LEN##_DIGEST_LENGTH
SHA2_CONST(224);
SHA2_CONST(256);
SHA2_CONST(384);
SHA2_CONST(512);
#undef SHA2_CONST
} // namespace __sanitizer } // namespace __sanitizer
using namespace __sanitizer; using namespace __sanitizer;

16
lib/libtsan/sanitizer_common/sanitizer_platform_limits_freebsd.h vendored
View File

@ -708,22 +708,6 @@ extern unsigned IOCTL_KDSKBMODE;
extern const int si_SEGV_MAPERR; extern const int si_SEGV_MAPERR;
extern const int si_SEGV_ACCERR; extern const int si_SEGV_ACCERR;
extern const unsigned MD5_CTX_sz;
extern const unsigned MD5_return_length;
#define SHA2_EXTERN(LEN) \
extern const unsigned SHA##LEN##_CTX_sz; \
extern const unsigned SHA##LEN##_return_length; \
extern const unsigned SHA##LEN##_block_length; \
extern const unsigned SHA##LEN##_digest_length
SHA2_EXTERN(224);
SHA2_EXTERN(256);
SHA2_EXTERN(384);
SHA2_EXTERN(512);
#undef SHA2_EXTERN
struct __sanitizer_cap_rights { struct __sanitizer_cap_rights {
u64 cr_rights[2]; u64 cr_rights[2];
}; };

2
src/Compilation.zig
View File

@ -6921,7 +6921,7 @@ pub fn addCCArgs(
// We don't currently respect the minor and patch components. This wouldn't be particularly // We don't currently respect the minor and patch components. This wouldn't be particularly
// helpful because our abilists file only tracks major FreeBSD releases, so the link-time stub // helpful because our abilists file only tracks major FreeBSD releases, so the link-time stub
// symbols would be inconsistent with header declarations. // symbols would be inconsistent with header declarations.
min_ver.major * 100_000, min_ver.major * 100_000 + 500,
})); }));
} else if (target.isNetBSDLibC()) { } else if (target.isNetBSDLibC()) {
const min_ver = target.os.version_range.semver.min; const min_ver = target.os.version_range.semver.min;

4
src/libs/freebsd.zig
View File

@ -81,7 +81,6 @@ pub fn buildCrtFile(comp: *Compilation, crt_file: CrtFile, prog_node: std.Progre
"-O2", "-O2",
"-fno-common", "-fno-common",
"-std=gnu99", "-std=gnu99",
"-DPIC",
"-w", // Disable all warnings. "-w", // Disable all warnings.
}); });
@ -93,11 +92,12 @@ pub fn buildCrtFile(comp: *Compilation, crt_file: CrtFile, prog_node: std.Progre
try acflags.appendSlice(&.{ try acflags.appendSlice(&.{
"-DLOCORE", "-DLOCORE",
// See `Compilation.addCCArgs`. // See `Compilation.addCCArgs`.
try std.fmt.allocPrint(arena, "-D__FreeBSD_version={d}", .{target.os.version_range.semver.min.major * 100_000}), try std.fmt.allocPrint(arena, "-D__FreeBSD_version={d}", .{target.os.version_range.semver.min.major * 100_000 + 500}),
}); });
inline for (.{ &cflags, &acflags }) |flags| { inline for (.{ &cflags, &acflags }) |flags| {
try flags.appendSlice(&.{ try flags.appendSlice(&.{
"-DPIC",
"-DSTRIP_FBSDID", "-DSTRIP_FBSDID",
"-I", "-I",
try includePath(comp, arena, try std.fmt.allocPrint(arena, "{s}-{s}-{s}", .{ try includePath(comp, arena, try std.fmt.allocPrint(arena, "{s}-{s}-{s}", .{