Add deleted syscall dependency

Author: hp77-creator

attach/syscall_trace_attach_impl/src/syscall_trace_attach_impl.cpp

@@ -16,10 +16,8 @@ int64_t syscall_trace_attach_impl::dispatch_syscall(int64_t sys_nr,
 						    int64_t arg3, int64_t arg4,
 						    int64_t arg5, int64_t arg6)
 {
-	#if __linux__
 	if (sys_nr == __NR_exit_group || sys_nr == __NR_exit)
 		return orig_syscall(sys_nr, arg1, arg2, arg3, arg4, arg5, arg6);
-	#endif
 	SPDLOG_DEBUG("Syscall callback {} {} {} {} {} {} {}", sys_nr, arg1,
 		     arg2, arg3, arg4, arg5, arg6);
 	// Indicate whether the return value is overridden

attach/text_segment_transformer/agent-transformer.cpp

@@ -73,12 +73,7 @@ extern "C" void bpftime_agent_main(const gchar *data, gboolean *stay_resident)
 	cs_arch_register_x86();
 	bpftime::setup_syscall_tracer();
 	SPDLOG_DEBUG("Loading dynamic library..");
-	#if __linux__
-		auto next_handle =
-		dlmopen(LM_ID_NEWLM, agent_so, RTLD_NOW | RTLD_LOCAL);
-	#elif __APPLE__
-		auto next_handle = dlopen(agent_so, RTLD_NOW | RTLD_LOCAL);
-	#endif
+	auto next_handle = dlmopen(LM_ID_NEWLM, agent_so, RTLD_NOW | RTLD_LOCAL);
 	if (next_handle == nullptr) {
 		SPDLOG_ERROR("Failed to open agent: {}", dlerror());
 		exit(1);

cmake/StandardSettings.cmake

@@ -53,10 +53,10 @@ endif()
 
 option(BPFTIME_ENABLE_CCACHE "Enable the usage of Ccache, in order to speed up rebuild times." OFF)
 find_program(CCACHE_FOUND ccache)
-# if(CCACHE_FOUND)
-#   set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-#   set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-# endif()
+if(CCACHE_FOUND)
+  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+  set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+endif()
 
 option(BPFTIME_ENABLE_ASAN "Enable Address Sanitize to detect memory error." OFF)
 if(BPFTIME_ENABLE_ASAN)

cmake/frida.cmake

@@ -26,7 +26,7 @@ elseif(${FRIDA_OS_ARCH} MATCHES "linux-arm.*")
   set(FRIDA_GUM_DEVKIT_SHA256 "6b5963eb740062aec6c22c46ec2944a68006f72d290f714fb747ffe75b448a60")
   # Frida only has armhf builds..
   set(FRIDA_OS_ARCH "linux-armhf")
-elseif(${FRIDA_OS_ARCH} MATCHES "darwin-arm.*")
+elseif(${FRIDA_OS_ARCH} MATCHES "darwin-arm64")
   set(FRIDA_CORE_DEVKIT_SHA256 "7811e516e6b7bbc0153d30095560e0b1133f154060c5542764100d3e0eb2ab2b")
   set(FRIDA_GUM_DEVKIT_SHA256 "03f6085ae5330cf38e0a498784500675fc5bd7361bb551a9097ba5fe397aceda")
   # for macos-arm m* chip series 

runtime/agent/CMakeLists.txt

@@ -25,6 +25,7 @@ target_link_libraries(bpftime-agent
   -ldl
   spdlog::spdlog
   bpftime_frida_uprobe_attach_impl
+  bpftime_syscall_trace_attach_impl
 )
 
 else()