Page MenuHomeFreeBSD
Differential D31048

bin/ps: Avoid function name conflict with libc uname()
ClosedPublic
Actions

Authored by arichardson on Jul 5 2021, 12:20 PM.
Tags
None
Referenced Files
F115255475: D31048.diff
Mon, Apr 21, 10:30 PM
Unknown Object (File)
Mar 22 2025, 7:47 AM
Unknown Object (File)
Feb 24 2025, 7:19 AM
Unknown Object (File)
Feb 4 2025, 1:08 PM
Unknown Object (File)
Jan 27 2025, 3:19 PM
Unknown Object (File)
Jan 27 2025, 3:07 PM
Unknown Object (File)
Jan 19 2025, 4:17 PM
Unknown Object (File)
Jan 17 2025, 4:39 PM
View All Files
Subscribers
imp

Details

Reviewers
trasz
imp
Commits
rG0869d85591db: bin/ps: Avoid function name conflict with libc uname()
rG2423585b1de5: bin/ps: Avoid function name conflict with libc uname()
Summary

This prevents ps from being built with address sanitizer instrumentation.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 40299
Build 37188: arc lint + arc unit

Revision Contents
Changeset List

PathSize
bin/
ps/
2 lines
2 lines
2 lines

Diff 91786

View Options

bin/ps/extern.h

Show First 20 Lines • Show All 276 Lines • ▼ Show 20 Lines
__DEFAULT_DEPENDENT_OPTIONS+= LLVM_TARGET_${__llt:${__LLVM_TARGET_FILT}:tu}/LLVM_TARGET_ALL __DEFAULT_DEPENDENT_OPTIONS+= LLVM_TARGET_${__llt:${__LLVM_TARGET_FILT}:tu}/LLVM_TARGET_ALL
.endif .endif
.endfor .endfor
__DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF LLVM_TARGET_MIPS __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF LLVM_TARGET_MIPS
.include <bsd.compiler.mk> .include <bsd.compiler.mk>
.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386" .if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386" || ${__T:Mpowerpc*}
impUnsubmitted
Not Done
Inline Actions

so only armv and riscv are broken? Maybe it's time to reverse the sense of this conditional?

imp: so only armv and riscv are broken? Maybe it's time to reverse the sense of this conditional?
emasteUnsubmitted
Not Done
Inline Actions

I suspect that 32-bit arm is fine, so it could probably be just != riscv. In any case though I think we can do it as a separate change.

emaste: I suspect that 32-bit arm is fine, so it could probably be just != riscv. In any case though I…
__DEFAULT_YES_OPTIONS+=LLDB __DEFAULT_YES_OPTIONS+=LLDB
.else .else
__DEFAULT_NO_OPTIONS+=LLDB __DEFAULT_NO_OPTIONS+=LLDB
.endif .endif
# LIB32 is supported on amd64 and powerpc64 # LIB32 is supported on amd64 and powerpc64
.if (${__T} == "amd64" || ${__T} == "powerpc64") .if (${__T} == "amd64" || ${__T} == "powerpc64")
__DEFAULT_YES_OPTIONS+=LIB32 __DEFAULT_YES_OPTIONS+=LIB32
.else .else
▲ Show 20 Lines • Show All 206 Lines • Show Last 20 Lines
View Options

bin/ps/keyword.c

Show First 20 Lines • Show All 276 Lines • ▼ Show 20 Lines
__DEFAULT_DEPENDENT_OPTIONS+= LLVM_TARGET_${__llt:${__LLVM_TARGET_FILT}:tu}/LLVM_TARGET_ALL __DEFAULT_DEPENDENT_OPTIONS+= LLVM_TARGET_${__llt:${__LLVM_TARGET_FILT}:tu}/LLVM_TARGET_ALL
.endif .endif
.endfor .endfor
__DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF LLVM_TARGET_MIPS __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF LLVM_TARGET_MIPS
.include <bsd.compiler.mk> .include <bsd.compiler.mk>
.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386" .if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386" || ${__T:Mpowerpc*}
impUnsubmitted
Not Done
Inline Actions

so only armv and riscv are broken? Maybe it's time to reverse the sense of this conditional?

imp: so only armv and riscv are broken? Maybe it's time to reverse the sense of this conditional?
emasteUnsubmitted
Not Done
Inline Actions

I suspect that 32-bit arm is fine, so it could probably be just != riscv. In any case though I think we can do it as a separate change.

emaste: I suspect that 32-bit arm is fine, so it could probably be just != riscv. In any case though I…
__DEFAULT_YES_OPTIONS+=LLDB __DEFAULT_YES_OPTIONS+=LLDB
.else .else
__DEFAULT_NO_OPTIONS+=LLDB __DEFAULT_NO_OPTIONS+=LLDB
.endif .endif
# LIB32 is supported on amd64 and powerpc64 # LIB32 is supported on amd64 and powerpc64
.if (${__T} == "amd64" || ${__T} == "powerpc64") .if (${__T} == "amd64" || ${__T} == "powerpc64")
__DEFAULT_YES_OPTIONS+=LIB32 __DEFAULT_YES_OPTIONS+=LIB32
.else .else
▲ Show 20 Lines • Show All 206 Lines • Show Last 20 Lines
View Options

bin/ps/print.c

Show First 20 Lines • Show All 276 Lines • ▼ Show 20 Lines
__DEFAULT_DEPENDENT_OPTIONS+= LLVM_TARGET_${__llt:${__LLVM_TARGET_FILT}:tu}/LLVM_TARGET_ALL __DEFAULT_DEPENDENT_OPTIONS+= LLVM_TARGET_${__llt:${__LLVM_TARGET_FILT}:tu}/LLVM_TARGET_ALL
.endif .endif
.endfor .endfor
__DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF LLVM_TARGET_MIPS __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF LLVM_TARGET_MIPS
.include <bsd.compiler.mk> .include <bsd.compiler.mk>
.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386" .if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386" || ${__T:Mpowerpc*}
impUnsubmitted
Not Done
Inline Actions

so only armv and riscv are broken? Maybe it's time to reverse the sense of this conditional?

imp: so only armv and riscv are broken? Maybe it's time to reverse the sense of this conditional?
emasteUnsubmitted
Not Done
Inline Actions

I suspect that 32-bit arm is fine, so it could probably be just != riscv. In any case though I think we can do it as a separate change.

emaste: I suspect that 32-bit arm is fine, so it could probably be just != riscv. In any case though I…
__DEFAULT_YES_OPTIONS+=LLDB __DEFAULT_YES_OPTIONS+=LLDB
.else .else
__DEFAULT_NO_OPTIONS+=LLDB __DEFAULT_NO_OPTIONS+=LLDB
.endif .endif
# LIB32 is supported on amd64 and powerpc64 # LIB32 is supported on amd64 and powerpc64
.if (${__T} == "amd64" || ${__T} == "powerpc64") .if (${__T} == "amd64" || ${__T} == "powerpc64")
__DEFAULT_YES_OPTIONS+=LIB32 __DEFAULT_YES_OPTIONS+=LIB32
.else .else
▲ Show 20 Lines • Show All 206 Lines • Show Last 20 Lines