Re: [LTP] [PATCH 3/4] syscalls: corrected the rest of __sparc64__ defines

chrubis
2014-05-12T13:00:15Z

Hi!
> '__sparc64__' is not defined by cpp. We should use
> '__sparc__' and '__arch64__' instead.
>
> Author: Jose E. Marchesi <jose.marchesi@oracle.com>
> Author: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
>
> Signed-off-by: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
> ---
> testcases/kernel/syscalls/recvmsg/recvmsg01.c | 3 ++-
> testcases/kernel/syscalls/sendmsg/sendmsg01.c | 3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/recvmsg/recvmsg01.c b/testcases/kernel/syscalls/recvmsg/recvmsg01.c
> index bc84a23..102a268 100644
> --- a/testcases/kernel/syscalls/recvmsg/recvmsg01.c
> +++ b/testcases/kernel/syscalls/recvmsg/recvmsg01.c
> @@ -45,7 +45,8 @@
> /* and this test to function correctly. */
> #ifndef MSG_CMSG_COMPAT
>
> -#if defined (__powerpc64__) || defined (__mips64) || defined (__x86_64__) || defined (__sparc64__)
> +#if defined(__powerpc64__) || defined(__mips64) || defined(__x86_64__) || \
> + defined(__sparc__) && defined(__arch64__)
> #define MSG_CMSG_COMPAT 0x80000000
> #else
> #define MSG_CMSG_COMPAT 0
> diff --git a/testcases/kernel/syscalls/sendmsg/sendmsg01.c b/testcases/kernel/syscalls/sendmsg/sendmsg01.c
> index 58d3364..9e5d4f2 100644
> --- a/testcases/kernel/syscalls/sendmsg/sendmsg01.c
> +++ b/testcases/kernel/syscalls/sendmsg/sendmsg01.c
> @@ -37,7 +37,8 @@
> */
> #ifndef MSG_CMSG_COMPAT
> #if defined(__powerpc64__) || defined(__mips64) || defined(__x86_64__) || \
> - defined(__sparc64__) || defined(__ia64__) || defined(__s390x__)
> + defined(__sparc__) && defined(__arch64__) || defined(__ia64__) || \
> + defined(__s390x__)
> #define MSG_CMSG_COMPAT 0x80000000
> #else
> #define MSG_CMSG_COMPAT 0

Aren't these two nearly the same? Shouldn't we pull them into a common
header first?

--
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."