From 28a356d38fd4b271796e040256cbe17240583200 Mon Sep 17 00:00:00 2001 From: mdafsanhossain Date: Wed, 29 Nov 2023 17:56:57 +0530 Subject: [PATCH] fix: Rename powerpc macro and include riscv64 syscall headers Signed-off-by: mdafsanhossain --- test/drivers/test_suites/syscall_exit_suite/execveat_x.cpp | 6 +++--- userspace/libscap/engine/gvisor/parsers.cpp | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/drivers/test_suites/syscall_exit_suite/execveat_x.cpp b/test/drivers/test_suites/syscall_exit_suite/execveat_x.cpp index 4303999498..1df56ca41c 100644 --- a/test/drivers/test_suites/syscall_exit_suite/execveat_x.cpp +++ b/test/drivers/test_suites/syscall_exit_suite/execveat_x.cpp @@ -211,7 +211,7 @@ TEST(SyscallExit, execveatX_correct_exit) evt_test->disable_capture(); -#if defined(__s390x__) || defined(__riscv) || defined(__powerpc__) +#if defined(__s390x__) || defined(__riscv) || defined(__powerpc64__) /* We search for a child event. */ evt_test->assert_event_presence(ret_pid); @@ -338,7 +338,7 @@ TEST(SyscallExit, execveatX_execve_exit) evt_test->disable_capture(); /* `s390x` returns an `EXECVEAT_X` event while other architectures retun an `EXECVE_X` */ -#if defined(__s390x__) || defined(__riscv) || defined(__powerpc__) +#if defined(__s390x__) || defined(__riscv) || defined(__powerpc64__) /* We search for a child event. */ evt_test->assert_event_absence(ret_pid, PPME_SYSCALL_EXECVE_19_X); #else @@ -494,7 +494,7 @@ TEST(SyscallExit, execveatX_success_memfd) evt_test->disable_capture(); -#if defined(__s390x__) || defined(__riscv) || defined(__powerpc__) +#if defined(__s390x__) || defined(__riscv) || defined(__powerpc64__) /* We search for a child event. */ evt_test->assert_event_presence(ret_pid); diff --git a/userspace/libscap/engine/gvisor/parsers.cpp b/userspace/libscap/engine/gvisor/parsers.cpp index 50f2524439..1d300bc795 100644 --- a/userspace/libscap/engine/gvisor/parsers.cpp +++ b/userspace/libscap/engine/gvisor/parsers.cpp @@ -33,8 +33,10 @@ limitations under the License. #include "../../driver/syscall_compat_aarch64.h" #elif __s390x__ #include "../../driver/syscall_compat_s390x.h" -#elif __ppc64le__ +#elif __powerpc64__ #include "../../driver/syscall_compat_ppc64le.h" +#elif __riscv +#include "../../driver/syscall_compat_riscv64.h" #endif /* __x86_64__ */ #include