Simplify an #if #else #endif.
Commit Message
The #else of two nested #if clauses were identical.
---
This also makes the followup patches for VDSO handling easier to read.
2018-10-09 Rafael Ávila de Espíndola <rafael@espindo.la>
[BZ #19767]
* sysdeps/unix/sysv/linux/sysdep-vdso.h: Merge nested #if.
Comments
ping?
"Rafael Avila de Espindola" <rafael@espindo.la> writes:
> The #else of two nested #if clauses were identical.
> ---
>
> This also makes the followup patches for VDSO handling easier to read.
>
> 2018-10-09 Rafael Ávila de Espíndola <rafael@espindo.la>
>
> [BZ #19767]
> * sysdeps/unix/sysv/linux/sysdep-vdso.h: Merge nested #if.
>
>
> diff --git a/sysdeps/unix/sysv/linux/sysdep-vdso.h b/sysdeps/unix/sysv/linux/sysdep-vdso.h
> index 1912c1c156..7ec175c4c4 100644
> --- a/sysdeps/unix/sysv/linux/sysdep-vdso.h
> +++ b/sysdeps/unix/sysv/linux/sysdep-vdso.h
> @@ -26,13 +26,11 @@
> funcptr (args)
> #endif
>
> -#ifdef SHARED
> +#if defined SHARED && defined HAVE_VSYSCALL
>
> -# ifdef HAVE_VSYSCALL
> +# include <libc-vdso.h>
>
> -# include <libc-vdso.h>
> -
> -# define INLINE_VSYSCALL(name, nr, args...) \
> +# define INLINE_VSYSCALL(name, nr, args...) \
> ({ \
> __label__ out; \
> __label__ iserr; \
> @@ -61,7 +59,7 @@
> sc_ret; \
> })
>
> -# define INTERNAL_VSYSCALL(name, err, nr, args...) \
> +# define INTERNAL_VSYSCALL(name, err, nr, args...) \
> ({ \
> __label__ out; \
> long v_ret; \
> @@ -79,20 +77,13 @@
> out: \
> v_ret; \
> })
> -# else
> -# define INLINE_VSYSCALL(name, nr, args...) \
> - INLINE_SYSCALL (name, nr, ##args)
> -# define INTERNAL_VSYSCALL(name, err, nr, args...) \
> - INTERNAL_SYSCALL (name, err, nr, ##args)
> -# endif /* HAVE_VSYSCALL */
> -
> -# else /* SHARED */
> +#else
>
> # define INLINE_VSYSCALL(name, nr, args...) \
> INLINE_SYSCALL (name, nr, ##args)
> # define INTERNAL_VSYSCALL(name, err, nr, args...) \
> INTERNAL_SYSCALL (name, err, nr, ##args)
>
> -#endif /* SHARED */
> +#endif /* defined SHARED && defined HAVE_VSYSCALL */
>
> #endif /* SYSDEP_VDSO_LINUX_H */
> --
> 2.17.1
On 14/10/18 18:30, Rafael Avila de Espindola wrote:
> ping?
>
> "Rafael Avila de Espindola" <rafael@espindo.la> writes:
>
>> The #else of two nested #if clauses were identical.
looks good.
Reviewed-by: Szabolcs Nagy <szabolcs.nagy@arm.com>
>> ---
>>
>> This also makes the followup patches for VDSO handling easier to read.
>>
>> 2018-10-09 Rafael Ávila de Espíndola <rafael@espindo.la>
>>
>> [BZ #19767]
>> * sysdeps/unix/sysv/linux/sysdep-vdso.h: Merge nested #if.
>>
>>
>> diff --git a/sysdeps/unix/sysv/linux/sysdep-vdso.h b/sysdeps/unix/sysv/linux/sysdep-vdso.h
>> index 1912c1c156..7ec175c4c4 100644
>> --- a/sysdeps/unix/sysv/linux/sysdep-vdso.h
>> +++ b/sysdeps/unix/sysv/linux/sysdep-vdso.h
>> @@ -26,13 +26,11 @@
>> funcptr (args)
>> #endif
>>
>> -#ifdef SHARED
>> +#if defined SHARED && defined HAVE_VSYSCALL
>>
>> -# ifdef HAVE_VSYSCALL
>> +# include <libc-vdso.h>
>>
>> -# include <libc-vdso.h>
>> -
>> -# define INLINE_VSYSCALL(name, nr, args...) \
>> +# define INLINE_VSYSCALL(name, nr, args...) \
>> ({ \
>> __label__ out; \
>> __label__ iserr; \
>> @@ -61,7 +59,7 @@
>> sc_ret; \
>> })
>>
>> -# define INTERNAL_VSYSCALL(name, err, nr, args...) \
>> +# define INTERNAL_VSYSCALL(name, err, nr, args...) \
>> ({ \
>> __label__ out; \
>> long v_ret; \
>> @@ -79,20 +77,13 @@
>> out: \
>> v_ret; \
>> })
>> -# else
>> -# define INLINE_VSYSCALL(name, nr, args...) \
>> - INLINE_SYSCALL (name, nr, ##args)
>> -# define INTERNAL_VSYSCALL(name, err, nr, args...) \
>> - INTERNAL_SYSCALL (name, err, nr, ##args)
>> -# endif /* HAVE_VSYSCALL */
>> -
>> -# else /* SHARED */
>> +#else
>>
>> # define INLINE_VSYSCALL(name, nr, args...) \
>> INLINE_SYSCALL (name, nr, ##args)
>> # define INTERNAL_VSYSCALL(name, err, nr, args...) \
>> INTERNAL_SYSCALL (name, err, nr, ##args)
>>
>> -#endif /* SHARED */
>> +#endif /* defined SHARED && defined HAVE_VSYSCALL */
>>
>> #endif /* SYSDEP_VDSO_LINUX_H */
>> --
>> 2.17.1
>
‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Monday, October 15, 2018 3:38 AM, Szabolcs Nagy <szabolcs.nagy@arm.com> wrote:
> On 14/10/18 18:30, Rafael Avila de Espindola wrote:
>
> > ping?
> > "Rafael Avila de Espindola" rafael@espindo.la writes:
> >
> > > The #else of two nested #if clauses were identical.
>
> looks good.
Could someone please commit it?
Thanks,
Rafael
‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Monday, October 22, 2018 8:23 PM, Rafael Avila de Espindola <rafael@espindo.la> wrote:
> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
> On Monday, October 15, 2018 3:38 AM, Szabolcs Nagy szabolcs.nagy@arm.com wrote:
>
> > On 14/10/18 18:30, Rafael Avila de Espindola wrote:
> >
> > > ping?
> > > "Rafael Avila de Espindola" rafael@espindo.la writes:
> > >
> > > > The #else of two nested #if clauses were identical.
> >
> > looks good.
>
> Could someone please commit it?
ping
Cheers,
Rafael
@@ -26,13 +26,11 @@
funcptr (args)
#endif
-#ifdef SHARED
+#if defined SHARED && defined HAVE_VSYSCALL
-# ifdef HAVE_VSYSCALL
+# include <libc-vdso.h>
-# include <libc-vdso.h>
-
-# define INLINE_VSYSCALL(name, nr, args...) \
+# define INLINE_VSYSCALL(name, nr, args...) \
({ \
__label__ out; \
__label__ iserr; \
@@ -61,7 +59,7 @@
sc_ret; \
})
-# define INTERNAL_VSYSCALL(name, err, nr, args...) \
+# define INTERNAL_VSYSCALL(name, err, nr, args...) \
({ \
__label__ out; \
long v_ret; \
@@ -79,20 +77,13 @@
out: \
v_ret; \
})
-# else
-# define INLINE_VSYSCALL(name, nr, args...) \
- INLINE_SYSCALL (name, nr, ##args)
-# define INTERNAL_VSYSCALL(name, err, nr, args...) \
- INTERNAL_SYSCALL (name, err, nr, ##args)
-# endif /* HAVE_VSYSCALL */
-
-# else /* SHARED */
+#else
# define INLINE_VSYSCALL(name, nr, args...) \
INLINE_SYSCALL (name, nr, ##args)
# define INTERNAL_VSYSCALL(name, err, nr, args...) \
INTERNAL_SYSCALL (name, err, nr, ##args)
-#endif /* SHARED */
+#endif /* defined SHARED && defined HAVE_VSYSCALL */
#endif /* SYSDEP_VDSO_LINUX_H */