From d77769540a51a5442296a65802f2d67bdc2d4803 Mon Sep 17 00:00:00 2001 From: David CARLIER Date: Thu, 17 Nov 2022 09:28:22 +0000 Subject: [PATCH] fixing freebsd unused import warning in core affinity. (#897) fixing clang wrapper test passing llvm pass api support when there are actual passes. Co-authored-by: Dongjia "toka" Zhang --- libafl/src/bolts/core_affinity.rs | 4 ++-- libafl_cc/src/clang.rs | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libafl/src/bolts/core_affinity.rs b/libafl/src/bolts/core_affinity.rs index 7882abc460..5c9d865f06 100644 --- a/libafl/src/bolts/core_affinity.rs +++ b/libafl/src/bolts/core_affinity.rs @@ -642,7 +642,7 @@ mod freebsd { use alloc::vec::Vec; use std::{mem, thread::available_parallelism}; - use libc::{cpuset_getaffinity, cpuset_setaffinity, cpuset_t, CPU_SET}; + use libc::{cpuset_setaffinity, cpuset_t, CPU_SET}; use super::CoreId; use crate::Error; @@ -688,7 +688,7 @@ mod freebsd { // Try to get current core affinity mask. let result = unsafe { - cpuset_getaffinity( + libc::cpuset_getaffinity( CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, // Defaults to current thread diff --git a/libafl_cc/src/clang.rs b/libafl_cc/src/clang.rs index de8e7ba725..aed7307fbc 100644 --- a/libafl_cc/src/clang.rs +++ b/libafl_cc/src/clang.rs @@ -297,10 +297,12 @@ impl CompilerWrapper for ClangWrapper { return Ok(args); } - if self.use_new_pm { - args.push("-fexperimental-new-pass-manager".into()); - } else { - args.push("-flegacy-pass-manager".into()); + if !self.passes.is_empty() { + if self.use_new_pm { + args.push("-fexperimental-new-pass-manager".into()); + } else { + args.push("-flegacy-pass-manager".into()); + } } for pass in &self.passes { if self.use_new_pm {