From: Dmitry V. Levin <ldv@altlinux.org>
Date: Sun, 5 May 2019 22:28:34 +0000 (+0000)
Subject: Introduce HAVE_ARCH_TIME32_SYSCALLS and HAVE_ARCH_OLD_TIME64_SYSCALLS
X-Git-Tag: v5.1~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4592c85ffbd709219c3c93b3a18f0c72be596bb9;p=strace

Introduce HAVE_ARCH_TIME32_SYSCALLS and HAVE_ARCH_OLD_TIME64_SYSCALLS

These are going to control whether to compile parsers of 32-bit and
old 64-bit time syscalls.

* linux/arch_defs_.h [!MIN_WORDSIZE] (MIN_WORDSIZE): Define.
[!HAVE_ARCH_TIME32_SYSCALLS] (HAVE_ARCH_TIME32_SYSCALLS): Define.
[!HAVE_ARCH_OLD_TIME64_SYSCALLS] (HAVE_ARCH_OLD_TIME64_SYSCALLS):
Define.
* linux/alpha/arch_defs_.h (HAVE_ARCH_TIME32_SYSCALLS): Define.
* linux/x32/arch_defs_.h (HAVE_ARCH_OLD_TIME64_SYSCALLS): Define.
---

diff --git a/linux/alpha/arch_defs_.h b/linux/alpha/arch_defs_.h
index 6ae6f062..572586fa 100644
--- a/linux/alpha/arch_defs_.h
+++ b/linux/alpha/arch_defs_.h
@@ -7,3 +7,4 @@
 
 #define HAVE_ARCH_GETRVAL2 1
 #define HAVE_ARCH_DEDICATED_ERR_REG 1
+#define HAVE_ARCH_TIME32_SYSCALLS 1
diff --git a/linux/arch_defs_.h b/linux/arch_defs_.h
index ccb3e8db..69d6dbb0 100644
--- a/linux/arch_defs_.h
+++ b/linux/arch_defs_.h
@@ -46,3 +46,19 @@
 #ifndef ARCH_NEEDS_SET_ERROR_FOR_SCNO_TAMPERING
 # define ARCH_NEEDS_SET_ERROR_FOR_SCNO_TAMPERING 0
 #endif
+
+#ifndef MIN_WORDSIZE
+# if SUPPORTED_PERSONALITIES > 1
+#  define MIN_WORDSIZE 4
+# else
+#  define MIN_WORDSIZE SIZEOF_LONG
+# endif
+#endif
+
+#ifndef HAVE_ARCH_TIME32_SYSCALLS
+# define HAVE_ARCH_TIME32_SYSCALLS (MIN_WORDSIZE == 4)
+#endif
+
+#ifndef HAVE_ARCH_OLD_TIME64_SYSCALLS
+# define HAVE_ARCH_OLD_TIME64_SYSCALLS (SIZEOF_LONG == 8)
+#endif
diff --git a/linux/x32/arch_defs_.h b/linux/x32/arch_defs_.h
index ed9261f5..18321f51 100644
--- a/linux/x32/arch_defs_.h
+++ b/linux/x32/arch_defs_.h
@@ -8,4 +8,5 @@
 #define HAVE_ARCH_OLD_MMAP 1
 #define HAVE_ARCH_OLD_SELECT 1
 #define HAVE_ARCH_UID16_SYSCALLS 1
+#define HAVE_ARCH_OLD_TIME64_SYSCALLS 1
 #define SUPPORTED_PERSONALITIES 2