Skip to content

Fix some FreeBSD libc cross-compilation bugs #24825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 13, 2025
Merged

Fix some FreeBSD libc cross-compilation bugs #24825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e37fc57
tsan: remove usage of libcrypt and libncurses headers
alexrp Aug 13, 2025
e089d21
freebsd: fix PIC macro not being defined for crt1_s.S
alexrp Aug 13, 2025
b7602a1
freebsd: correctly define __FreeBSD_version to the first stable release
alexrp Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions lib/libtsan/sanitizer_common/sanitizer_platform_limits_freebsd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,8 @@
#include <semaphore.h>
#include <signal.h>
#include <stddef.h>
#include <md5.h>
#include <sha224.h>
#include <sha256.h>
#include <sha384.h>
#include <sha512.h>
#include <stdio.h>
#include <stringlist.h>
#include <term.h>
#include <termios.h>
#include <time.h>
#include <ttyent.h>
Expand Down Expand Up @@ -378,22 +372,6 @@ const int si_SEGV_MAPERR = SEGV_MAPERR;
const int si_SEGV_ACCERR = SEGV_ACCERR;
const int unvis_valid = UNVIS_VALID;
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

using namespace __sanitizer;
Expand Down
16 changes: 0 additions & 16 deletions lib/libtsan/sanitizer_common/sanitizer_platform_limits_freebsd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,22 +708,6 @@ extern unsigned IOCTL_KDSKBMODE;
extern const int si_SEGV_MAPERR;
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 {
u64 cr_rights[2];
};
Expand Down
2 changes: 1 addition & 1 deletion src/Compilation.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6921,7 +6921,7 @@ pub fn addCCArgs(
// 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
// symbols would be inconsistent with header declarations.
min_ver.major * 100_000,
min_ver.major * 100_000 + 500,
}));
} else if (target.isNetBSDLibC()) {
const min_ver = target.os.version_range.semver.min;
Expand Down
4 changes: 2 additions & 2 deletions src/libs/freebsd.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ pub fn buildCrtFile(comp: *Compilation, crt_file: CrtFile, prog_node: std.Progre
"-O2",
"-fno-common",
"-std=gnu99",
"-DPIC",
"-w", // Disable all warnings.
});

Expand All @@ -93,11 +92,12 @@ pub fn buildCrtFile(comp: *Compilation, crt_file: CrtFile, prog_node: std.Progre
try acflags.appendSlice(&.{
"-DLOCORE",
// 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| {
try flags.appendSlice(&.{
"-DPIC",
"-DSTRIP_FBSDID",
"-I",
try includePath(comp, arena, try std.fmt.allocPrint(arena, "{s}-{s}-{s}", .{
Expand Down