Page MenuHomeFreeBSD
Differential D28156

Add missing no-ctfconvert to C generation rules
ClosedPublic
Actions

Authored by andrew on Jan 14 2021, 3:42 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 4, 5:13 PM
Unknown Object (File)
Tue, Mar 4, 12:48 AM
Unknown Object (File)
Sat, Feb 22, 6:23 AM
Unknown Object (File)
Fri, Feb 21, 7:14 PM
Unknown Object (File)
Feb 6 2025, 12:06 PM
Unknown Object (File)
Jan 30 2025, 7:49 PM
Unknown Object (File)
Jan 30 2025, 10:27 AM
Unknown Object (File)
Jan 26 2025, 6:26 PM
View All 70 Files
Subscribers
emaste
imp
mmel

Details

Reviewers
emaste
mmel
Commits
rG94611a838866: Add missing no-ctfconvert to C generation rules
Summary

Stop running ctfconvert over generated C files in the kernel by marking
them with no-ctfconvert.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

andrew created this revision.Jan 14 2021, 3:42 PM
Herald added subscribers: emaste, imp. · View Herald TranscriptJan 14 2021, 3:42 PM
andrew requested review of this revision.Jan 14 2021, 3:42 PM
Harbormaster completed remote builds in B36199: Diff 82266.Jan 14 2021, 3:42 PM
emaste accepted this revision.Jan 15 2021, 3:27 AM

Looks fine to me. Is there anything specific that made you notice this?

This revision is now accepted and ready to land.Jan 15 2021, 3:27 AM
mmel accepted this revision.Jan 15 2021, 9:09 AM
mmel added a subscriber: mmel.

LGTM. thanks.
It is a bit questionable whether ctfconvert should generate an error in this case (I don't think so), but calling it is clearly unnecessary in this case.

andrew added a comment.Jan 15 2021, 9:44 AM

It fixes warning similar to the following. This is because it's running ctfconvert on the .c file rather than a .o file.

ctfconvert: rtwn-rtl8821aufw.c: Couldn't read ehdr: Invalid argument

Closed by commit rG94611a838866: Add missing no-ctfconvert to C generation rules (authored by andrew). · Explain WhyJan 15 2021, 9:48 AM
This revision was automatically updated to reflect the committed changes.
andrew added a commit: rG94611a838866: Add missing no-ctfconvert to C generation rules.

Revision Contents
Changeset List

PathSize
sys/
conf/
98 lines
2 lines
4 lines

Diff 82307

View Options

sys/conf/files

Show First 20 Lines • Show All 924 Lines • ▼ Show 20 Lines
ErrorOr<basic_file_status> directory_entry::status() const { ErrorOr<basic_file_status> directory_entry::status() const {
file_status s; file_status s;
if (auto EC = fs::status(Path, s, FollowSymlinks)) if (auto EC = fs::status(Path, s, FollowSymlinks))
return EC; return EC;
return s; return s;
} }
#if !defined(F_GETPATH) //
// FreeBSD optionally provides /proc/self/fd, but it is incompatible with
// Linux. The thing to use is realpath.
//
#if !defined(__FreeBSD__)
#define TRY_PROC_SELF_FD
#endif
#if !defined(F_GETPATH) && defined(TRY_PROC_SELF_FD)
static bool hasProcSelfFD() { static bool hasProcSelfFD() {
// If we have a /proc filesystem mounted, we can quickly establish the // If we have a /proc filesystem mounted, we can quickly establish the
// real name of the file with readlink // real name of the file with readlink
static const bool Result = (::access("/proc/self/fd", R_OK) == 0); static const bool Result = (::access("/proc/self/fd", R_OK) == 0);
return Result; return Result;
} }
#endif #endif
▲ Show 20 Lines • Show All 170 Lines • ▼ Show 20 Lines
#if defined(F_GETPATH) #if defined(F_GETPATH)
// When F_GETPATH is availble, it is the quickest way to get // When F_GETPATH is availble, it is the quickest way to get
// the real path name. // the real path name.
char Buffer[PATH_MAX]; char Buffer[PATH_MAX];
if (::fcntl(ResultFD, F_GETPATH, Buffer) != -1) if (::fcntl(ResultFD, F_GETPATH, Buffer) != -1)
RealPath->append(Buffer, Buffer + strlen(Buffer)); RealPath->append(Buffer, Buffer + strlen(Buffer));
#else #else
char Buffer[PATH_MAX]; char Buffer[PATH_MAX];
#if defined(TRY_PROC_SELF_FD)
if (hasProcSelfFD()) { if (hasProcSelfFD()) {
char ProcPath[64]; char ProcPath[64];
snprintf(ProcPath, sizeof(ProcPath), "/proc/self/fd/%d", ResultFD); snprintf(ProcPath, sizeof(ProcPath), "/proc/self/fd/%d", ResultFD);
ssize_t CharCount = ::readlink(ProcPath, Buffer, sizeof(Buffer)); ssize_t CharCount = ::readlink(ProcPath, Buffer, sizeof(Buffer));
if (CharCount > 0) if (CharCount > 0)
RealPath->append(Buffer, Buffer + CharCount); RealPath->append(Buffer, Buffer + CharCount);
} else { } else {
#endif
SmallString<128> Storage; SmallString<128> Storage;
StringRef P = Name.toNullTerminatedStringRef(Storage); StringRef P = Name.toNullTerminatedStringRef(Storage);
// Use ::realpath to get the real path name // Use ::realpath to get the real path name
if (::realpath(P.begin(), Buffer) != nullptr) if (::realpath(P.begin(), Buffer) != nullptr)
RealPath->append(Buffer, Buffer + strlen(Buffer)); RealPath->append(Buffer, Buffer + strlen(Buffer));
#if defined(TRY_PROC_SELF_FD)
} }
#endif
#endif #endif
return std::error_code(); return std::error_code();
} }
Expected<file_t> openNativeFileForRead(const Twine &Name, OpenFlags Flags, Expected<file_t> openNativeFileForRead(const Twine &Name, OpenFlags Flags,
SmallVectorImpl<char> *RealPath) { SmallVectorImpl<char> *RealPath) {
file_t ResultFD; file_t ResultFD;
std::error_code EC = openFileForRead(Name, ResultFD, Flags, RealPath); std::error_code EC = openFileForRead(Name, ResultFD, Flags, RealPath);
▲ Show 20 Lines • Show All 328 Lines • Show Last 20 Lines
View Options

sys/conf/files.amd64

Show First 20 Lines • Show All 924 Lines • ▼ Show 20 Lines
ErrorOr<basic_file_status> directory_entry::status() const { ErrorOr<basic_file_status> directory_entry::status() const {
file_status s; file_status s;
if (auto EC = fs::status(Path, s, FollowSymlinks)) if (auto EC = fs::status(Path, s, FollowSymlinks))
return EC; return EC;
return s; return s;
} }
#if !defined(F_GETPATH) //
// FreeBSD optionally provides /proc/self/fd, but it is incompatible with
// Linux. The thing to use is realpath.
//
#if !defined(__FreeBSD__)
#define TRY_PROC_SELF_FD
#endif
#if !defined(F_GETPATH) && defined(TRY_PROC_SELF_FD)
static bool hasProcSelfFD() { static bool hasProcSelfFD() {
// If we have a /proc filesystem mounted, we can quickly establish the // If we have a /proc filesystem mounted, we can quickly establish the
// real name of the file with readlink // real name of the file with readlink
static const bool Result = (::access("/proc/self/fd", R_OK) == 0); static const bool Result = (::access("/proc/self/fd", R_OK) == 0);
return Result; return Result;
} }
#endif #endif
▲ Show 20 Lines • Show All 170 Lines • ▼ Show 20 Lines
#if defined(F_GETPATH) #if defined(F_GETPATH)
// When F_GETPATH is availble, it is the quickest way to get // When F_GETPATH is availble, it is the quickest way to get
// the real path name. // the real path name.
char Buffer[PATH_MAX]; char Buffer[PATH_MAX];
if (::fcntl(ResultFD, F_GETPATH, Buffer) != -1) if (::fcntl(ResultFD, F_GETPATH, Buffer) != -1)
RealPath->append(Buffer, Buffer + strlen(Buffer)); RealPath->append(Buffer, Buffer + strlen(Buffer));
#else #else
char Buffer[PATH_MAX]; char Buffer[PATH_MAX];
#if defined(TRY_PROC_SELF_FD)
if (hasProcSelfFD()) { if (hasProcSelfFD()) {
char ProcPath[64]; char ProcPath[64];
snprintf(ProcPath, sizeof(ProcPath), "/proc/self/fd/%d", ResultFD); snprintf(ProcPath, sizeof(ProcPath), "/proc/self/fd/%d", ResultFD);
ssize_t CharCount = ::readlink(ProcPath, Buffer, sizeof(Buffer)); ssize_t CharCount = ::readlink(ProcPath, Buffer, sizeof(Buffer));
if (CharCount > 0) if (CharCount > 0)
RealPath->append(Buffer, Buffer + CharCount); RealPath->append(Buffer, Buffer + CharCount);
} else { } else {
#endif
SmallString<128> Storage; SmallString<128> Storage;
StringRef P = Name.toNullTerminatedStringRef(Storage); StringRef P = Name.toNullTerminatedStringRef(Storage);
// Use ::realpath to get the real path name // Use ::realpath to get the real path name
if (::realpath(P.begin(), Buffer) != nullptr) if (::realpath(P.begin(), Buffer) != nullptr)
RealPath->append(Buffer, Buffer + strlen(Buffer)); RealPath->append(Buffer, Buffer + strlen(Buffer));
#if defined(TRY_PROC_SELF_FD)
} }
#endif
#endif #endif
return std::error_code(); return std::error_code();
} }
Expected<file_t> openNativeFileForRead(const Twine &Name, OpenFlags Flags, Expected<file_t> openNativeFileForRead(const Twine &Name, OpenFlags Flags,
SmallVectorImpl<char> *RealPath) { SmallVectorImpl<char> *RealPath) {
file_t ResultFD; file_t ResultFD;
std::error_code EC = openFileForRead(Name, ResultFD, Flags, RealPath); std::error_code EC = openFileForRead(Name, ResultFD, Flags, RealPath);
▲ Show 20 Lines • Show All 328 Lines • Show Last 20 Lines
View Options

sys/conf/files.arm64

Show First 20 Lines • Show All 924 Lines • ▼ Show 20 Lines
ErrorOr<basic_file_status> directory_entry::status() const { ErrorOr<basic_file_status> directory_entry::status() const {
file_status s; file_status s;
if (auto EC = fs::status(Path, s, FollowSymlinks)) if (auto EC = fs::status(Path, s, FollowSymlinks))
return EC; return EC;
return s; return s;
} }
#if !defined(F_GETPATH) //
// FreeBSD optionally provides /proc/self/fd, but it is incompatible with
// Linux. The thing to use is realpath.
//
#if !defined(__FreeBSD__)
#define TRY_PROC_SELF_FD
#endif
#if !defined(F_GETPATH) && defined(TRY_PROC_SELF_FD)
static bool hasProcSelfFD() { static bool hasProcSelfFD() {
// If we have a /proc filesystem mounted, we can quickly establish the // If we have a /proc filesystem mounted, we can quickly establish the
// real name of the file with readlink // real name of the file with readlink
static const bool Result = (::access("/proc/self/fd", R_OK) == 0); static const bool Result = (::access("/proc/self/fd", R_OK) == 0);
return Result; return Result;
} }
#endif #endif
▲ Show 20 Lines • Show All 170 Lines • ▼ Show 20 Lines
#if defined(F_GETPATH) #if defined(F_GETPATH)
// When F_GETPATH is availble, it is the quickest way to get // When F_GETPATH is availble, it is the quickest way to get
// the real path name. // the real path name.
char Buffer[PATH_MAX]; char Buffer[PATH_MAX];
if (::fcntl(ResultFD, F_GETPATH, Buffer) != -1) if (::fcntl(ResultFD, F_GETPATH, Buffer) != -1)
RealPath->append(Buffer, Buffer + strlen(Buffer)); RealPath->append(Buffer, Buffer + strlen(Buffer));
#else #else
char Buffer[PATH_MAX]; char Buffer[PATH_MAX];
#if defined(TRY_PROC_SELF_FD)
if (hasProcSelfFD()) { if (hasProcSelfFD()) {
char ProcPath[64]; char ProcPath[64];
snprintf(ProcPath, sizeof(ProcPath), "/proc/self/fd/%d", ResultFD); snprintf(ProcPath, sizeof(ProcPath), "/proc/self/fd/%d", ResultFD);
ssize_t CharCount = ::readlink(ProcPath, Buffer, sizeof(Buffer)); ssize_t CharCount = ::readlink(ProcPath, Buffer, sizeof(Buffer));
if (CharCount > 0) if (CharCount > 0)
RealPath->append(Buffer, Buffer + CharCount); RealPath->append(Buffer, Buffer + CharCount);
} else { } else {
#endif
SmallString<128> Storage; SmallString<128> Storage;
StringRef P = Name.toNullTerminatedStringRef(Storage); StringRef P = Name.toNullTerminatedStringRef(Storage);
// Use ::realpath to get the real path name // Use ::realpath to get the real path name
if (::realpath(P.begin(), Buffer) != nullptr) if (::realpath(P.begin(), Buffer) != nullptr)
RealPath->append(Buffer, Buffer + strlen(Buffer)); RealPath->append(Buffer, Buffer + strlen(Buffer));
#if defined(TRY_PROC_SELF_FD)
} }
#endif
#endif #endif
return std::error_code(); return std::error_code();
} }
Expected<file_t> openNativeFileForRead(const Twine &Name, OpenFlags Flags, Expected<file_t> openNativeFileForRead(const Twine &Name, OpenFlags Flags,
SmallVectorImpl<char> *RealPath) { SmallVectorImpl<char> *RealPath) {
file_t ResultFD; file_t ResultFD;
std::error_code EC = openFileForRead(Name, ResultFD, Flags, RealPath); std::error_code EC = openFileForRead(Name, ResultFD, Flags, RealPath);
▲ Show 20 Lines • Show All 328 Lines • Show Last 20 Lines