resolve merge conflict

celinehoang177 · celinehoang177 · commit b3e869c67915 · 2026-04-24T03:30:40.000Z
diff --git a/src/glibc/sysdeps/unix/sysv/linux/fstat.c b/src/glibc/sysdeps/unix/sysv/linux/fstat.c
@@ -36,7 +36,7 @@ __fstat (int fd, struct stat *buf)
 
   uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);
 
-  return MAKE_LEGACY_SYSCALL (FXSTAT_SYSCALL, "syscall|fstat", (uint64_t) fd,
+  return MAKE_LEGACY_SYSCALL (FSTAT_SYSCALL, "syscall|fstat", (uint64_t) fd,
 		       host_buf, NOTUSED, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);
 }
 
diff --git a/src/glibc/sysdeps/unix/sysv/linux/fstat64.c b/src/glibc/sysdeps/unix/sysv/linux/fstat64.c
@@ -31,7 +31,7 @@
 int
 __fstat64_time64 (int fd, struct __stat64_t64 *buf)
 {
-  return MAKE_LEGACY_SYSCALL(FXSTAT_SYSCALL, "syscall|fstat", (uint64_t)fd, (uint64_t) TRANSLATE_GUEST_POINTER_TO_HOST(buf), NOTUSED, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);
+  return MAKE_LEGACY_SYSCALL(FSTAT_SYSCALL, "syscall|fstat", (uint64_t)fd, (uint64_t) TRANSLATE_GUEST_POINTER_TO_HOST(buf), NOTUSED, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);
 }
 #if __TIMESIZE != 64
 hidden_def (__fstat64_time64)
@@ -45,7 +45,7 @@ hidden_def (__fstat64_time64)
     }
   // Added MAKE_SYSCALL macro to interface with Lind - Qianxi Chen
   uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);
-  return MAKE_LEGACY_SYSCALL (FXSTAT_SYSCALL, "syscall|fstat", (uint64_t) fd,
+  return MAKE_LEGACY_SYSCALL (FSTAT_SYSCALL, "syscall|fstat", (uint64_t) fd,
 		       host_buf, NOTUSED, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);
 }
 #endif
diff --git a/src/glibc/sysdeps/unix/sysv/linux/fxstat.c b/src/glibc/sysdeps/unix/sysv/linux/fxstat.c
@@ -35,7 +35,7 @@ int
 __fxstat (int vers, int fd, struct stat *buf)
 {
   uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);
-  return MAKE_LEGACY_SYSCALL (FXSTAT_SYSCALL, "syscall|fxstat", (uint64_t) vers,
+  return MAKE_LEGACY_SYSCALL (FSTAT_SYSCALL, "syscall|fstat", (uint64_t) vers,
 		       (uint64_t) fd, host_buf,
 		       NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);
 }
diff --git a/src/glibc/sysdeps/unix/sysv/linux/fxstat64.c b/src/glibc/sysdeps/unix/sysv/linux/fxstat64.c
@@ -37,7 +37,7 @@ int
 ___fxstat64 (int vers, int fd, struct stat64 *buf)
 {
   uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);
-  return MAKE_LEGACY_SYSCALL (FXSTAT_SYSCALL, "syscall|fxstat", (uint64_t) vers,
+  return MAKE_LEGACY_SYSCALL (FSTAT_SYSCALL, "syscall|fstat", (uint64_t) vers,
 		       (uint64_t) fd, host_buf,
 		       NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);
 }
diff --git a/src/glibc/sysdeps/unix/sysv/linux/lstat64.c b/src/glibc/sysdeps/unix/sysv/linux/lstat64.c
@@ -30,10 +30,10 @@ int
 __lstat64_time64 (const char *file, struct __stat64_t64 *buf)
 {
   // BUG: we do not have fstatat syscall in rawposix
-  // so let's just use xstat - Qianxi Chen
+  // so let's just use stat - Qianxi Chen
   uint64_t host_file = TRANSLATE_GUEST_POINTER_TO_HOST (file);
   uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);
-  return MAKE_LEGACY_SYSCALL (XSTAT_SYSCALL, "syscall|xstat",
+  return MAKE_LEGACY_SYSCALL (STAT_SYSCALL, "syscall|stat",
 		       host_file, host_buf,
 		       NOTUSED, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);
 }
@@ -45,7 +45,7 @@ __lstat64 (const char *file, struct stat64 *buf)
 {
   uint64_t host_file = TRANSLATE_GUEST_POINTER_TO_HOST (file);
   uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);
-  return MAKE_LEGACY_SYSCALL (XSTAT_SYSCALL, "syscall|xstat",
+  return MAKE_LEGACY_SYSCALL (STAT_SYSCALL, "syscall|stat",
 		       host_file, host_buf,
 		       NOTUSED, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);
 }
diff --git a/src/glibc/sysdeps/unix/sysv/linux/stat.c b/src/glibc/sysdeps/unix/sysv/linux/stat.c
@@ -29,7 +29,7 @@ __stat (const char *fd, struct stat *buf)
   uint64_t host_fd = TRANSLATE_GUEST_POINTER_TO_HOST (fd);
   uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);
   
-  return MAKE_LEGACY_SYSCALL (XSTAT_SYSCALL, "syscall|xstat",
+  return MAKE_LEGACY_SYSCALL (STAT_SYSCALL, "syscall|stat",
 		       host_fd, host_buf,
 		       NOTUSED, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);
 }
diff --git a/src/glibc/sysdeps/unix/sysv/linux/stat64.c b/src/glibc/sysdeps/unix/sysv/linux/stat64.c
@@ -30,10 +30,10 @@ int
 __stat64_time64 (const char *file, struct __stat64_t64 *buf)
 {
   // BUG: we do not have fstatat syscall in rawposix
-  // so let's just use xstat - Qianxi Chen
+  // so let's just use stat - Qianxi Chen
   uint64_t host_file = TRANSLATE_GUEST_POINTER_TO_HOST (file);
   uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);
-  return MAKE_LEGACY_SYSCALL (XSTAT_SYSCALL, "syscall|xstat",
+  return MAKE_LEGACY_SYSCALL (STAT_SYSCALL, "syscall|stat",
 		       host_file, host_buf,
 		       NOTUSED, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);
 }
@@ -45,7 +45,7 @@ __stat64 (const char *file, struct stat64 *buf)
 {
   uint64_t host_file = TRANSLATE_GUEST_POINTER_TO_HOST (file);
   uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);
-  return MAKE_LEGACY_SYSCALL (XSTAT_SYSCALL, "syscall|xstat",
+  return MAKE_LEGACY_SYSCALL (STAT_SYSCALL, "syscall|stat",
 		       host_file, host_buf,
 		       NOTUSED, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);
 }
diff --git a/src/glibc/sysdeps/unix/sysv/linux/xstat.c b/src/glibc/sysdeps/unix/sysv/linux/xstat.c
@@ -36,7 +36,7 @@ __xstat (int vers, const char *name, struct stat *buf)
 {
   uint64_t host_name = TRANSLATE_GUEST_POINTER_TO_HOST (name);
   uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);
-  return MAKE_LEGACY_SYSCALL (XSTAT_SYSCALL, "syscall|xstat", (uint64_t) vers,
+  return MAKE_LEGACY_SYSCALL (STAT_SYSCALL, "syscall|stat", (uint64_t) vers,
 		       host_name, host_buf,
 		       NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);
 }
diff --git a/src/glibc/sysdeps/unix/sysv/linux/xstat64.c b/src/glibc/sysdeps/unix/sysv/linux/xstat64.c
@@ -39,7 +39,7 @@ ___xstat64 (int vers, const char *name, struct stat64 *buf)
    uint64_t host_name = TRANSLATE_GUEST_POINTER_TO_HOST (name);
    uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);
    
-   return MAKE_LEGACY_SYSCALL(XSTAT_SYSCALL, "syscall|xstat", (uint64_t) vers, host_name, host_buf, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);
+   return MAKE_LEGACY_SYSCALL(STAT_SYSCALL, "syscall|stat", (uint64_t) vers, host_name, host_buf, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);
 }
 
 #if XSTAT_IS_XSTAT64

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ __fstat (int fd, struct stat *buf)`
`36`	`36`
`37`	`37`	`uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);`
`38`	`38`
`39`		`- return MAKE_LEGACY_SYSCALL (FXSTAT_SYSCALL, "syscall\|fstat", (uint64_t) fd,`
	`39`	`+ return MAKE_LEGACY_SYSCALL (FSTAT_SYSCALL, "syscall\|fstat", (uint64_t) fd,`
`40`	`40`	`host_buf, NOTUSED, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`int`
`32`	`32`	`__fstat64_time64 (int fd, struct __stat64_t64 *buf)`
`33`	`33`	`{`
`34`		`- return MAKE_LEGACY_SYSCALL(FXSTAT_SYSCALL, "syscall\|fstat", (uint64_t)fd, (uint64_t) TRANSLATE_GUEST_POINTER_TO_HOST(buf), NOTUSED, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);`
	`34`	`+ return MAKE_LEGACY_SYSCALL(FSTAT_SYSCALL, "syscall\|fstat", (uint64_t)fd, (uint64_t) TRANSLATE_GUEST_POINTER_TO_HOST(buf), NOTUSED, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);`
`35`	`35`	`}`
`36`	`36`	`#if __TIMESIZE != 64`
`37`	`37`	`hidden_def (__fstat64_time64)`
`@@ -45,7 +45,7 @@ hidden_def (__fstat64_time64)`
`45`	`45`	`}`
`46`	`46`	`// Added MAKE_SYSCALL macro to interface with Lind - Qianxi Chen`
`47`	`47`	`uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);`
`48`		`- return MAKE_LEGACY_SYSCALL (FXSTAT_SYSCALL, "syscall\|fstat", (uint64_t) fd,`
	`48`	`+ return MAKE_LEGACY_SYSCALL (FSTAT_SYSCALL, "syscall\|fstat", (uint64_t) fd,`
`49`	`49`	`host_buf, NOTUSED, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);`
`50`	`50`	`}`
`51`	`51`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ int`
`35`	`35`	`__fxstat (int vers, int fd, struct stat *buf)`
`36`	`36`	`{`
`37`	`37`	`uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);`
`38`		`- return MAKE_LEGACY_SYSCALL (FXSTAT_SYSCALL, "syscall\|fxstat", (uint64_t) vers,`
	`38`	`+ return MAKE_LEGACY_SYSCALL (FSTAT_SYSCALL, "syscall\|fstat", (uint64_t) vers,`
`39`	`39`	`(uint64_t) fd, host_buf,`
`40`	`40`	`NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ int`
`37`	`37`	`___fxstat64 (int vers, int fd, struct stat64 *buf)`
`38`	`38`	`{`
`39`	`39`	`uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);`
`40`		`- return MAKE_LEGACY_SYSCALL (FXSTAT_SYSCALL, "syscall\|fxstat", (uint64_t) vers,`
	`40`	`+ return MAKE_LEGACY_SYSCALL (FSTAT_SYSCALL, "syscall\|fstat", (uint64_t) vers,`
`41`	`41`	`(uint64_t) fd, host_buf,`
`42`	`42`	`NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,10 @@ int`
`30`	`30`	`__lstat64_time64 (const char file, struct __stat64_t64 buf)`
`31`	`31`	`{`
`32`	`32`	`// BUG: we do not have fstatat syscall in rawposix`
`33`		`- // so let's just use xstat - Qianxi Chen`
	`33`	`+ // so let's just use stat - Qianxi Chen`
`34`	`34`	`uint64_t host_file = TRANSLATE_GUEST_POINTER_TO_HOST (file);`
`35`	`35`	`uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);`
`36`		`- return MAKE_LEGACY_SYSCALL (XSTAT_SYSCALL, "syscall\|xstat",`
	`36`	`+ return MAKE_LEGACY_SYSCALL (STAT_SYSCALL, "syscall\|stat",`
`37`	`37`	`host_file, host_buf,`
`38`	`38`	`NOTUSED, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);`
`39`	`39`	`}`
`@@ -45,7 +45,7 @@ __lstat64 (const char file, struct stat64 buf)`
`45`	`45`	`{`
`46`	`46`	`uint64_t host_file = TRANSLATE_GUEST_POINTER_TO_HOST (file);`
`47`	`47`	`uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);`
`48`		`- return MAKE_LEGACY_SYSCALL (XSTAT_SYSCALL, "syscall\|xstat",`
	`48`	`+ return MAKE_LEGACY_SYSCALL (STAT_SYSCALL, "syscall\|stat",`
`49`	`49`	`host_file, host_buf,`
`50`	`50`	`NOTUSED, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ __stat (const char fd, struct stat buf)`
`29`	`29`	`uint64_t host_fd = TRANSLATE_GUEST_POINTER_TO_HOST (fd);`
`30`	`30`	`uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);`
`31`	`31`
`32`		`- return MAKE_LEGACY_SYSCALL (XSTAT_SYSCALL, "syscall\|xstat",`
	`32`	`+ return MAKE_LEGACY_SYSCALL (STAT_SYSCALL, "syscall\|stat",`
`33`	`33`	`host_fd, host_buf,`
`34`	`34`	`NOTUSED, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ __xstat (int vers, const char name, struct stat buf)`
`36`	`36`	`{`
`37`	`37`	`uint64_t host_name = TRANSLATE_GUEST_POINTER_TO_HOST (name);`
`38`	`38`	`uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);`
`39`		`- return MAKE_LEGACY_SYSCALL (XSTAT_SYSCALL, "syscall\|xstat", (uint64_t) vers,`
	`39`	`+ return MAKE_LEGACY_SYSCALL (STAT_SYSCALL, "syscall\|stat", (uint64_t) vers,`
`40`	`40`	`host_name, host_buf,`
`41`	`41`	`NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ ___xstat64 (int vers, const char name, struct stat64 buf)`
`39`	`39`	`uint64_t host_name = TRANSLATE_GUEST_POINTER_TO_HOST (name);`
`40`	`40`	`uint64_t host_buf = TRANSLATE_GUEST_POINTER_TO_HOST (buf);`
`41`	`41`
`42`		`- return MAKE_LEGACY_SYSCALL(XSTAT_SYSCALL, "syscall\|xstat", (uint64_t) vers, host_name, host_buf, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);`
	`42`	`+ return MAKE_LEGACY_SYSCALL(STAT_SYSCALL, "syscall\|stat", (uint64_t) vers, host_name, host_buf, NOTUSED, NOTUSED, NOTUSED, TRANSLATE_ERRNO_ON);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`#if XSTAT_IS_XSTAT64`