i#4474: Port client.nudge_ex test to AARCH64

Port client.nudge_ex test to AARCH64. Issue: #4474
DynamoRIO · Jul 4, 2024 · 9d8a88e · 9d8a88e
1 parent 628314d
commit 9d8a88e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/suite/tests/CMakeLists.txt b/suite/tests/CMakeLists.txt
@@ -3470,10 +3470,10 @@ if (X86)
   endif ()
 endif ()
 
-if (X86) # FIXME i#1551, i#1569: fix bugs on ARM and AArch64
+if (X86 OR AARCH64) # FIXME i#1551: fix bugs on ARM
   tobuild_ci(client.nudge_ex client-interface/nudge_ex.c "" "" "")
   use_DynamoRIO_extension(client.nudge_ex.dll drmgr)
-endif (X86)
+endif (X86 OR AARCH64)
 
 tobuild_ci(client.app_args client-interface/app_args.c "" "" "Test;Test2;Test3")
 

diff --git a/suite/tests/client-interface/nudge_ex.dll.c b/suite/tests/client-interface/nudge_ex.dll.c
@@ -51,6 +51,12 @@ static bool sent_self;
 
 static process_id_t child_pid;
 
+#ifdef SYS_fork
+static const int SYS_FORK_VALUE = SYS_fork;
+#else
+static const int SYS_FORK_VALUE = -1; /* Make sure the comparison fails*/
+#endif
+
 typedef struct {
     ptr_int_t saved_param;
     process_id_t child_pid;
@@ -158,7 +164,7 @@ event_post_syscall(void *drcontext, int sysnum)
     per_thread_t *data = (per_thread_t *)drmgr_get_cls_field(drcontext, cls_idx);
     /* XXX i#752: should DR provide a child creation event that gives us the pid? */
 #ifdef UNIX
-    if (sysnum == SYS_fork
+    if (sysnum == SYS_FORK_VALUE
 #    ifdef LINUX
         || (sysnum == SYS_clone && !TEST(CLONE_VM, data->saved_param))
 #    endif