Skip to content

add prctl constants on android #4531

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ const ALLOWED_CFGS: &[&str] = &[
// Corresponds to `__USE_TIME_BITS64` in UAPI
"linux_time_bits64",
"musl_v1_2_3",
// termux
"termux",
];

// Extra values to allow for check-cfg.
Expand Down Expand Up @@ -157,6 +159,11 @@ fn main() {
}
}
}

// check for termux
if target_os == "android" && env::var("TERMUX_VERSION").is_ok() {
set_cfg("termux");
}
}

/// Run `rustc --version` and capture the output, adjusting arguments as needed if `clippy-driver`
Expand Down
12 changes: 9 additions & 3 deletions libc-test/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ fn do_ctest() {
t if t.contains("windows") => test_windows(t),
t if t.contains("vxworks") => test_vxworks(t),
t if t.contains("nto-qnx") => test_neutrino(t),
t if t.contains("aix") => return test_aix(t),
t if t.contains("aix") => test_aix(t),
t => panic!("unknown target {t}"),
}
}
Expand Down Expand Up @@ -2224,6 +2224,9 @@ fn test_android(target: &str) {
// FIXME(android): Requires >= 6.12 kernel headers.
"SOF_TIMESTAMPING_OPT_RX_FILTER" => true,

// FIXME(android): c value == 0 for some reason on termux
"TCSAFLUSH" => true,

_ => false,
}
});
Expand Down Expand Up @@ -2288,7 +2291,10 @@ fn test_android(target: &str) {
// FIXME(android): bad function pointers:
"isalnum" | "isalpha" | "iscntrl" | "isdigit" | "isgraph" | "islower" | "isprint"
| "ispunct" | "isspace" | "isupper" | "isxdigit" | "isblank" | "tolower"
| "toupper" => true,
| "toupper" | "getpwuid_r" | "tmpfile" | "getpwnam" | "getpwuid" | "tcdrain"
| "cfgetispeed" | "cfgetospeed" | "cfsetispeed" | "cfsetospeed" | "tcgetattr"
| "tcsetattr" | "tcflow" | "tcflush" | "tcgetsid" | "tcsendbreak" | "cfmakeraw"
| "cfsetspeed" => true,
Comment on lines +2294 to +2297
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These don't seem relevant to the change here


// Added in API level 24
"if_nameindex" | "if_freenameindex" => true,
Expand Down Expand Up @@ -5564,7 +5570,7 @@ fn test_aix(target: &str) {
"ACTION" => ty.to_string(),

// 'sigval' is a struct in Rust, but a union in C.
"sigval" => format!("union sigval"),
"sigval" => "union sigval".to_string(),

t if t.ends_with("_t") => t.to_string(),
t if is_struct => format!("struct {}", t),
Expand Down
156 changes: 156 additions & 0 deletions libc-test/semver/android.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1947,17 +1947,171 @@ PROT_GROWSUP
PROT_NONE
PROT_READ
PROT_WRITE
PR_CAPBSET_DROP
PR_CAPBSET_READ
PR_CAP_AMBIENT
PR_CAP_AMBIENT_CLEAR_ALL
PR_CAP_AMBIENT_IS_SET
PR_CAP_AMBIENT_LOWER
PR_CAP_AMBIENT_RAISE
PR_ENDIAN_BIG
PR_ENDIAN_LITTLE
PR_ENDIAN_PPC_LITTLE
PR_FPEMU_NOPRINT
PR_FPEMU_SIGFPE
PR_FP_EXC_ASYNC
PR_FP_EXC_DISABLED
PR_FP_EXC_DIV
PR_FP_EXC_INV
PR_FP_EXC_NONRECOV
PR_FP_EXC_OVF
PR_FP_EXC_PRECISE
PR_FP_EXC_RES
PR_FP_EXC_SW_ENABLE
PR_FP_EXC_UND
PR_FP_MODE_FR
PR_FP_MODE_FRE
PR_GET_AUXV
PR_GET_CHILD_SUBREAPER
PR_GET_DUMPABLE
PR_GET_ENDIAN
PR_GET_FPEMU
PR_GET_FPEXC
PR_GET_FP_MODE
PR_GET_IO_FLUSHER
PR_GET_KEEPCAPS
PR_GET_MDWE
PR_GET_MEMORY_MERGE
PR_GET_NAME
PR_GET_NO_NEW_PRIVS
PR_GET_PDEATHSIG
PR_GET_SECCOMP
PR_GET_SECUREBITS
PR_GET_SPECULATION_CTRL
PR_GET_TAGGED_ADDR_CTRL
PR_GET_THP_DISABLE
PR_GET_TID_ADDRESS
PR_GET_TIMERSLACK
PR_GET_TIMING
PR_GET_TSC
PR_GET_UNALIGN
PR_MCE_KILL
PR_MCE_KILL_CLEAR
PR_MCE_KILL_DEFAULT
PR_MCE_KILL_EARLY
PR_MCE_KILL_GET
PR_MCE_KILL_LATE
PR_MCE_KILL_SET
PR_MDWE_NO_INHERIT
PR_MDWE_REFUSE_EXEC_GAIN
PR_MPX_DISABLE_MANAGEMENT
PR_MPX_ENABLE_MANAGEMENT
PR_MTE_TAG_MASK
PR_MTE_TAG_SHIFT
PR_MTE_TCF_ASYNC
PR_MTE_TCF_MASK
PR_MTE_TCF_NONE
PR_MTE_TCF_SHIFT
PR_MTE_TCF_SYNC
PR_PAC_APDAKEY
PR_PAC_APDBKEY
PR_PAC_APGAKEY
PR_PAC_APIAKEY
PR_PAC_APIBKEY
PR_PAC_GET_ENABLED_KEYS
PR_PAC_RESET_KEYS
PR_PAC_SET_ENABLED_KEYS
PR_RISCV_V_GET_CONTROL
PR_RISCV_V_SET_CONTROL
PR_RISCV_V_VSTATE_CTRL_CUR_MASK
PR_RISCV_V_VSTATE_CTRL_DEFAULT
PR_RISCV_V_VSTATE_CTRL_INHERIT
PR_RISCV_V_VSTATE_CTRL_MASK
PR_RISCV_V_VSTATE_CTRL_NEXT_MASK
PR_RISCV_V_VSTATE_CTRL_OFF
PR_RISCV_V_VSTATE_CTRL_ON
PR_SCHED_CORE
PR_SCHED_CORE_CREATE
PR_SCHED_CORE_GET
PR_SCHED_CORE_MAX
PR_SCHED_CORE_SCOPE_PROCESS_GROUP
PR_SCHED_CORE_SCOPE_THREAD
PR_SCHED_CORE_SCOPE_THREAD_GROUP
PR_SCHED_CORE_SHARE_FROM
PR_SCHED_CORE_SHARE_TO
PR_SET_CHILD_SUBREAPER
PR_SET_DUMPABLE
PR_SET_ENDIAN
PR_SET_FPEMU
PR_SET_FPEXC
PR_SET_FP_MODE
PR_SET_IO_FLUSHER
PR_SET_KEEPCAPS
PR_SET_MDWE
PR_SET_MEMORY_MERGE
PR_SET_MM
PR_SET_MM_ARG_END
PR_SET_MM_ARG_START
PR_SET_MM_AUXV
PR_SET_MM_BRK
PR_SET_MM_END_CODE
PR_SET_MM_END_DATA
PR_SET_MM_ENV_END
PR_SET_MM_ENV_START
PR_SET_MM_EXE_FILE
PR_SET_MM_MAP
PR_SET_MM_MAP_SIZE
PR_SET_MM_START_BRK
PR_SET_MM_START_CODE
PR_SET_MM_START_DATA
PR_SET_MM_START_STACK
PR_SET_NAME
PR_SET_NO_NEW_PRIVS
PR_SET_PDEATHSIG
PR_SET_PTRACER
PR_SET_PTRACER_ANY
PR_SET_SECCOMP
PR_SET_SECUREBITS
PR_SET_SPECULATION_CTRL
PR_SET_SYSCALL_USER_DISPATCH
PR_SET_TAGGED_ADDR_CTRL
PR_SET_THP_DISABLE
PR_SET_TIMERSLACK
PR_SET_TIMING
PR_SET_TSC
PR_SET_UNALIGN
PR_SET_VMA
PR_SET_VMA_ANON_NAME
PR_SME_GET_VL
PR_SME_SET_VL
PR_SME_SET_VL_ONEXEC
PR_SME_VL_INHERIT
PR_SME_VL_LEN_MASK
PR_SPEC_DISABLE
PR_SPEC_DISABLE_NOEXEC
PR_SPEC_ENABLE
PR_SPEC_FORCE_DISABLE
PR_SPEC_INDIRECT_BRANCH
PR_SPEC_L1D_FLUSH
PR_SPEC_NOT_AFFECTED
PR_SPEC_PRCTL
PR_SPEC_STORE_BYPASS
PR_SVE_GET_VL
PR_SVE_SET_VL
PR_SVE_SET_VL_ONEXEC
PR_SVE_VL_INHERIT
PR_SVE_VL_LEN_MASK
PR_SYS_DISPATCH_OFF
PR_SYS_DISPATCH_ON
PR_TAGGED_ADDR_ENABLE
PR_TASK_PERF_EVENTS_DISABLE
PR_TASK_PERF_EVENTS_ENABLE
PR_TIMING_STATISTICAL
PR_TIMING_TIMESTAMP
PR_TSC_ENABLE
PR_TSC_SIGSEGV
PR_UNALIGN_NOPRINT
PR_UNALIGN_SIGBUS
PTHREAD_BARRIER_SERIAL_THREAD
PTHREAD_COND_INITIALIZER
PTHREAD_CREATE_DETACHED
Expand Down Expand Up @@ -2516,6 +2670,8 @@ SW_CNT
SW_MAX
SYN_CNT
SYN_MAX
SYSCALL_DISPATCH_FILTER_ALLOW
SYSCALL_DISPATCH_FILTER_BLOCK
SYS_accept4
SYS_acct
SYS_add_key
Expand Down
Loading
Loading