From: Dmitry V. Levin <ldv@altlinux.org>
Date: Sat, 20 Jan 2018 00:02:57 +0000 (+0000)
Subject: Replace NEED_UID16_PARSERS with HAVE_ARCH_UID16_SYSCALLS
X-Git-Tag: v4.21~106
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2880a927a6aa8e253370a2f5e6967fa841fe1bc3;p=strace

Replace NEED_UID16_PARSERS with HAVE_ARCH_UID16_SYSCALLS

* linux/arch_defs_.h [!HAVE_ARCH_UID16_SYSCALLS]
(HAVE_ARCH_UID16_SYSCALLS): New macro.
* linux/aarch64/arch_defs_.h (HAVE_ARCH_UID16_SYSCALLS): New macro.
* linux/arm/arch_defs_.h: Likewise.
* linux/i386/arch_defs_.h: Likewise.
* linux/ia64/arch_defs_.h: Likewise.
* linux/m68k/arch_defs_.h: Likewise.
* linux/s390/arch_defs_.h: Likewise.
* linux/s390x/arch_defs_.h: Likewise.
* linux/sh/arch_defs_.h: Likewise.
* linux/sparc/arch_defs_.h: Likewise.
* linux/sparc64/arch_defs_.h: Likewise.
* linux/syscall.h: Likewise.
* linux/x32/arch_defs_.h: Likewise.
* linux/x86_64/arch_defs_.h: Likewise.
* linux/bfin/arch_defs_.h: New file.
* linux/microblaze/arch_defs_.h: Likewise.
* linux/riscv/arch_defs_.h: Likewise.
* linux/sh64/arch_defs_.h: Likewise.
* Makefile.am (EXTRA_DIST): Add them.
* defs.h (NEED_UID16_PARSERS): Remove.
* linux/syscall.h: Check for HAVE_ARCH_UID16_SYSCALLS instead of
NEED_UID16_PARSERS.
* uid.c: Likewise.
---

diff --git a/Makefile.am b/Makefile.am
index ef7e8ed8..12d473a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -464,6 +464,7 @@ EXTRA_DIST =				\
 	linux/avr32/set_scno.c		\
 	linux/avr32/syscallent.h	\
 	linux/avr32/userent.h		\
+	linux/bfin/arch_defs_.h		\
 	linux/bfin/arch_regs.c		\
 	linux/bfin/arch_rt_sigframe.c	\
 	linux/bfin/get_error.c		\
@@ -578,6 +579,7 @@ EXTRA_DIST =				\
 	linux/metag/set_error.c		\
 	linux/metag/set_scno.c		\
 	linux/metag/syscallent.h	\
+	linux/microblaze/arch_defs_.h	\
 	linux/microblaze/arch_regs.c	\
 	linux/microblaze/arch_rt_sigframe.c\
 	linux/microblaze/arch_sigreturn.c	\
@@ -677,6 +679,7 @@ EXTRA_DIST =				\
 	linux/powerpc64/syscallent.h	\
 	linux/powerpc64/syscallent1.h	\
 	linux/powerpc64/userent.h	\
+	linux/riscv/arch_defs_.h		\
 	linux/riscv/arch_regs.c		\
 	linux/riscv/arch_regs.h		\
 	linux/riscv/arch_rt_sigframe.c	\
@@ -746,6 +749,7 @@ EXTRA_DIST =				\
 	linux/sh/syscallent.h		\
 	linux/sh/userent.h		\
 	linux/sh/userent0.h		\
+	linux/sh64/arch_defs_.h		\
 	linux/sh64/arch_regs.c		\
 	linux/sh64/arch_regs.h		\
 	linux/sh64/arch_rt_sigframe.c	\
diff --git a/defs.h b/defs.h
index 0753dda3..b4450ba8 100644
--- a/defs.h
+++ b/defs.h
@@ -328,22 +328,6 @@ extern const struct xlat whence_codes[];
 
 #define indirect_ipccall(tcp) (tcp->s_ent->sys_flags & TRACE_INDIRECT_SUBCALL)
 
-#if defined(ARM) || defined(AARCH64) \
- || defined(I386) || defined(X32) || defined(X86_64) \
- || defined(IA64) \
- || defined(BFIN) \
- || defined(M68K) \
- || defined(MICROBLAZE) \
- || defined(RISCV) \
- || defined(S390) || defined(S390X) \
- || defined(SH) || defined(SH64) \
- || defined(SPARC) || defined(SPARC64) \
- /**/
-# define NEED_UID16_PARSERS 1
-#else
-# define NEED_UID16_PARSERS 0
-#endif
-
 enum sock_proto {
 	SOCK_PROTO_UNKNOWN,
 	SOCK_PROTO_UNIX,
diff --git a/linux/aarch64/arch_defs_.h b/linux/aarch64/arch_defs_.h
index 285947fd..4d264a1d 100644
--- a/linux/aarch64/arch_defs_.h
+++ b/linux/aarch64/arch_defs_.h
@@ -1 +1,2 @@
 #define HAVE_ARCH_OLD_MMAP 1
+#define HAVE_ARCH_UID16_SYSCALLS 1
diff --git a/linux/arch_defs_.h b/linux/arch_defs_.h
index 1c754820..af6625ed 100644
--- a/linux/arch_defs_.h
+++ b/linux/arch_defs_.h
@@ -11,3 +11,7 @@
 #ifndef HAVE_ARCH_OLD_MMAP_PGOFF
 # define HAVE_ARCH_OLD_MMAP_PGOFF 0
 #endif
+
+#ifndef HAVE_ARCH_UID16_SYSCALLS
+# define HAVE_ARCH_UID16_SYSCALLS 0
+#endif
diff --git a/linux/arm/arch_defs_.h b/linux/arm/arch_defs_.h
index 285947fd..4d264a1d 100644
--- a/linux/arm/arch_defs_.h
+++ b/linux/arm/arch_defs_.h
@@ -1 +1,2 @@
 #define HAVE_ARCH_OLD_MMAP 1
+#define HAVE_ARCH_UID16_SYSCALLS 1
diff --git a/linux/bfin/arch_defs_.h b/linux/bfin/arch_defs_.h
new file mode 100644
index 00000000..0c9ca195
--- /dev/null
+++ b/linux/bfin/arch_defs_.h
@@ -0,0 +1 @@
+#define HAVE_ARCH_UID16_SYSCALLS 1
diff --git a/linux/i386/arch_defs_.h b/linux/i386/arch_defs_.h
index 285947fd..4d264a1d 100644
--- a/linux/i386/arch_defs_.h
+++ b/linux/i386/arch_defs_.h
@@ -1 +1,2 @@
 #define HAVE_ARCH_OLD_MMAP 1
+#define HAVE_ARCH_UID16_SYSCALLS 1
diff --git a/linux/ia64/arch_defs_.h b/linux/ia64/arch_defs_.h
index 491f19c5..473c349e 100644
--- a/linux/ia64/arch_defs_.h
+++ b/linux/ia64/arch_defs_.h
@@ -1 +1,2 @@
 #define HAVE_ARCH_GETRVAL2 1
+#define HAVE_ARCH_UID16_SYSCALLS 1
diff --git a/linux/m68k/arch_defs_.h b/linux/m68k/arch_defs_.h
index 285947fd..4d264a1d 100644
--- a/linux/m68k/arch_defs_.h
+++ b/linux/m68k/arch_defs_.h
@@ -1 +1,2 @@
 #define HAVE_ARCH_OLD_MMAP 1
+#define HAVE_ARCH_UID16_SYSCALLS 1
diff --git a/linux/microblaze/arch_defs_.h b/linux/microblaze/arch_defs_.h
new file mode 100644
index 00000000..0c9ca195
--- /dev/null
+++ b/linux/microblaze/arch_defs_.h
@@ -0,0 +1 @@
+#define HAVE_ARCH_UID16_SYSCALLS 1
diff --git a/linux/riscv/arch_defs_.h b/linux/riscv/arch_defs_.h
new file mode 100644
index 00000000..0c9ca195
--- /dev/null
+++ b/linux/riscv/arch_defs_.h
@@ -0,0 +1 @@
+#define HAVE_ARCH_UID16_SYSCALLS 1
diff --git a/linux/s390/arch_defs_.h b/linux/s390/arch_defs_.h
index f49582bf..59fee837 100644
--- a/linux/s390/arch_defs_.h
+++ b/linux/s390/arch_defs_.h
@@ -1,2 +1,3 @@
 #define HAVE_ARCH_OLD_MMAP 1
 #define HAVE_ARCH_OLD_MMAP_PGOFF 1
+#define HAVE_ARCH_UID16_SYSCALLS 1
diff --git a/linux/s390x/arch_defs_.h b/linux/s390x/arch_defs_.h
index f49582bf..59fee837 100644
--- a/linux/s390x/arch_defs_.h
+++ b/linux/s390x/arch_defs_.h
@@ -1,2 +1,3 @@
 #define HAVE_ARCH_OLD_MMAP 1
 #define HAVE_ARCH_OLD_MMAP_PGOFF 1
+#define HAVE_ARCH_UID16_SYSCALLS 1
diff --git a/linux/sh/arch_defs_.h b/linux/sh/arch_defs_.h
index 491f19c5..473c349e 100644
--- a/linux/sh/arch_defs_.h
+++ b/linux/sh/arch_defs_.h
@@ -1 +1,2 @@
 #define HAVE_ARCH_GETRVAL2 1
+#define HAVE_ARCH_UID16_SYSCALLS 1
diff --git a/linux/sh64/arch_defs_.h b/linux/sh64/arch_defs_.h
new file mode 100644
index 00000000..0c9ca195
--- /dev/null
+++ b/linux/sh64/arch_defs_.h
@@ -0,0 +1 @@
+#define HAVE_ARCH_UID16_SYSCALLS 1
diff --git a/linux/sparc/arch_defs_.h b/linux/sparc/arch_defs_.h
index 491f19c5..473c349e 100644
--- a/linux/sparc/arch_defs_.h
+++ b/linux/sparc/arch_defs_.h
@@ -1 +1,2 @@
 #define HAVE_ARCH_GETRVAL2 1
+#define HAVE_ARCH_UID16_SYSCALLS 1
diff --git a/linux/sparc64/arch_defs_.h b/linux/sparc64/arch_defs_.h
index 491f19c5..473c349e 100644
--- a/linux/sparc64/arch_defs_.h
+++ b/linux/sparc64/arch_defs_.h
@@ -1 +1,2 @@
 #define HAVE_ARCH_GETRVAL2 1
+#define HAVE_ARCH_UID16_SYSCALLS 1
diff --git a/linux/syscall.h b/linux/syscall.h
index bd155186..11a43198 100644
--- a/linux/syscall.h
+++ b/linux/syscall.h
@@ -34,7 +34,7 @@
 #include "sys_func.h"
 #include "sen.h"
 
-#if NEED_UID16_PARSERS
+#if HAVE_ARCH_UID16_SYSCALLS
 extern SYS_FUNC(chown16);
 extern SYS_FUNC(fchown16);
 extern SYS_FUNC(getgroups16);
@@ -45,6 +45,6 @@ extern SYS_FUNC(setgroups16);
 extern SYS_FUNC(setresuid16);
 extern SYS_FUNC(setreuid16);
 extern SYS_FUNC(setuid16);
-#endif
+#endif /* HAVE_ARCH_UID16_SYSCALLS */
 
 #endif /* !STRACE_LINUX_SYSCALL_H */
diff --git a/linux/x32/arch_defs_.h b/linux/x32/arch_defs_.h
index 285947fd..4d264a1d 100644
--- a/linux/x32/arch_defs_.h
+++ b/linux/x32/arch_defs_.h
@@ -1 +1,2 @@
 #define HAVE_ARCH_OLD_MMAP 1
+#define HAVE_ARCH_UID16_SYSCALLS 1
diff --git a/linux/x86_64/arch_defs_.h b/linux/x86_64/arch_defs_.h
index 285947fd..4d264a1d 100644
--- a/linux/x86_64/arch_defs_.h
+++ b/linux/x86_64/arch_defs_.h
@@ -1 +1,2 @@
 #define HAVE_ARCH_OLD_MMAP 1
+#define HAVE_ARCH_UID16_SYSCALLS 1
diff --git a/uid.c b/uid.c
index 069cda63..6a0e14b3 100644
--- a/uid.c
+++ b/uid.c
@@ -55,7 +55,7 @@
 #include "defs.h"
 
 #ifdef STRACE_UID_SIZE
-# if !NEED_UID16_PARSERS
+# if !HAVE_ARCH_UID16_SYSCALLS
 #  undef STRACE_UID_SIZE
 # endif
 #else