diff mbox series

[27/30] Linux: make generic xstatver.h the default one

Message ID	20221019221433.1082017-28-adhemerval.zanella@linaro.org
State	Committed
Commit	fea7abbc23d47e5d4f4077dcee0aa35a8ce66800
Headers	DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0EA343857402 To: libc-alpha@sourceware.org Subject: [PATCH 27/30] Linux: make generic xstatver.h the default one Date: Wed, 19 Oct 2022 19:14:30 -0300 Message-Id: <20221019221433.1082017-28-adhemerval.zanella@linaro.org> In-Reply-To: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> References: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list From: Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org> Reply-To: Adhemerval Zanella <adhemerval.zanella@linaro.org> Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" <libc-alpha-bounces+patchwork=sourceware.org@sourceware.org>
Series	Remove Linux generic sysdep \| [00/30] Remove Linux generic sysdep [01/30] linux: Fix generic struct_stat for 64 bit time (BZ# 29657) [02/30] linux: Consolidate dl-origin.c [03/30] Linux: consolidate chmod implementation [04/30] Linux: consolidate chown implementation [05/30] Linux: consolidate dup2 implementation [06/30] Lninux: consolidate epoll_create implementation [07/30] Linux: consolidate inotify_init implementation [08/30] Linux: consolidate lchown implementation [09/30] Linux: consolidate link implementation [10/30] Linux: consolidate mkdir implementation [11/30] Linux: consolidate readlink implementation [12/30] Linux: consolidate rmdir implementation [13/30] Linux: consolidate symlink implementation [14/30] Linux: consolidate unlink implementation [15/30] Linux: consolidate sendfile implementation [16/30] Linux: Move wordsize-32 Version to default [17/30] Linux: consolidate ____longjmp_chk [18/30] Linux: Assume and consolidate bind wire-up syscall [19/30] Linux: Assume iand consolidate socket wire-up syscall [20/30] Linux: Assume and consolidate socketpair wire-up syscall [21/30] Linux: Assume and consolidate listen wire-up syscall [22/30] Linux: Assume and consolidate getsockname wire-up syscall [23/30] Linux: Assume and consolidate getpeername wire-up syscall [24/30] Linux: Assume and consolidate shutdown wire-up syscall [25/30] Linux: Remove unused generic Makefile [26/30] Linux: Remove generic sysdep [27/30] Linux: make generic xstatver.h the default one [28/30] Linux: Make generic fcntl.h the default one [29/30] Linux: Consolidate typesizes.h [30/30] Linux: Remove generic Implies

Checks

Context	Check	Description
dj/TryBot-apply_patch	success	Patch applied to master at the time it was sent

Commit Message

Adhemerval Zanella Oct. 19, 2022, 10:14 p.m. UTC

  And copy the current default one to required ABIs.
---
 sysdeps/unix/sysv/linux/{generic => arm}/xstatver.h | 11 +++++++----
 sysdeps/unix/sysv/linux/hppa/xstatver.h             | 13 +++++++++++++
 sysdeps/unix/sysv/linux/sh/xstatver.h               | 13 +++++++++++++
 sysdeps/unix/sysv/linux/xstatver.h                  | 11 ++++-------
 4 files changed, 37 insertions(+), 11 deletions(-)
 rename sysdeps/unix/sysv/linux/{generic => arm}/xstatver.h (52%)
 create mode 100644 sysdeps/unix/sysv/linux/hppa/xstatver.h
 create mode 100644 sysdeps/unix/sysv/linux/sh/xstatver.h

Comments

Carlos O'Donell Dec. 6, 2022, 5:33 p.m. UTC | #1

On 10/19/22 18:14, Adhemerval Zanella via Libc-alpha wrote:
> And copy the current default one to required ABIs.

LGTM.

No regressions on x86_64 and i686.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>

> ---
>  sysdeps/unix/sysv/linux/{generic => arm}/xstatver.h | 11 +++++++----
>  sysdeps/unix/sysv/linux/hppa/xstatver.h             | 13 +++++++++++++
>  sysdeps/unix/sysv/linux/sh/xstatver.h               | 13 +++++++++++++
>  sysdeps/unix/sysv/linux/xstatver.h                  | 11 ++++-------
>  4 files changed, 37 insertions(+), 11 deletions(-)
>  rename sysdeps/unix/sysv/linux/{generic => arm}/xstatver.h (52%)
>  create mode 100644 sysdeps/unix/sysv/linux/hppa/xstatver.h
>  create mode 100644 sysdeps/unix/sysv/linux/sh/xstatver.h
> 
> diff --git a/sysdeps/unix/sysv/linux/generic/xstatver.h b/sysdeps/unix/sysv/linux/arm/xstatver.h
> similarity index 52%
> rename from sysdeps/unix/sysv/linux/generic/xstatver.h
> rename to sysdeps/unix/sysv/linux/arm/xstatver.h
> index d8fd35beb6..8e1801b603 100644
> --- a/sysdeps/unix/sysv/linux/generic/xstatver.h
> +++ b/sysdeps/unix/sysv/linux/arm/xstatver.h
> @@ -1,10 +1,13 @@
>  /* Versions of the 'struct stat' data structure used in compatibility xstat
>     functions.  */
> -#define _STAT_VER_KERNEL	0
> -#define _STAT_VER_LINUX		0
> -#define _STAT_VER		_STAT_VER_KERNEL
> +#define _STAT_VER_LINUX_OLD	1
> +#define _STAT_VER_KERNEL	1
> +#define _STAT_VER_SVR4		2
> +#define _STAT_VER_LINUX		3
> +#define _STAT_VER		_STAT_VER_LINUX

OK. Matches.

>  
>  /* Versions of the 'xmknod' interface used in compatibility xmknod
>     functions.  */
> -#define _MKNOD_VER_LINUX	0
> +#define _MKNOD_VER_LINUX	1
> +#define _MKNOD_VER_SVR4		2
>  #define _MKNOD_VER		_MKNOD_VER_LINUX

OK. Matches.

> diff --git a/sysdeps/unix/sysv/linux/hppa/xstatver.h b/sysdeps/unix/sysv/linux/hppa/xstatver.h
> new file mode 100644
> index 0000000000..8e1801b603
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/hppa/xstatver.h
> @@ -0,0 +1,13 @@
> +/* Versions of the 'struct stat' data structure used in compatibility xstat
> +   functions.  */
> +#define _STAT_VER_LINUX_OLD	1
> +#define _STAT_VER_KERNEL	1
> +#define _STAT_VER_SVR4		2
> +#define _STAT_VER_LINUX		3
> +#define _STAT_VER		_STAT_VER_LINUX

OK. Matches.

> +
> +/* Versions of the 'xmknod' interface used in compatibility xmknod
> +   functions.  */
> +#define _MKNOD_VER_LINUX	1
> +#define _MKNOD_VER_SVR4		2
> +#define _MKNOD_VER		_MKNOD_VER_LINUX

OK. Matches.

> diff --git a/sysdeps/unix/sysv/linux/sh/xstatver.h b/sysdeps/unix/sysv/linux/sh/xstatver.h
> new file mode 100644
> index 0000000000..8e1801b603
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/sh/xstatver.h
> @@ -0,0 +1,13 @@
> +/* Versions of the 'struct stat' data structure used in compatibility xstat
> +   functions.  */
> +#define _STAT_VER_LINUX_OLD	1
> +#define _STAT_VER_KERNEL	1
> +#define _STAT_VER_SVR4		2
> +#define _STAT_VER_LINUX		3
> +#define _STAT_VER		_STAT_VER_LINUX

OK. Matches.

> +
> +/* Versions of the 'xmknod' interface used in compatibility xmknod
> +   functions.  */
> +#define _MKNOD_VER_LINUX	1
> +#define _MKNOD_VER_SVR4		2
> +#define _MKNOD_VER		_MKNOD_VER_LINUX

OK. Matches.

> diff --git a/sysdeps/unix/sysv/linux/xstatver.h b/sysdeps/unix/sysv/linux/xstatver.h
> index 8e1801b603..d8fd35beb6 100644
> --- a/sysdeps/unix/sysv/linux/xstatver.h
> +++ b/sysdeps/unix/sysv/linux/xstatver.h
> @@ -1,13 +1,10 @@
>  /* Versions of the 'struct stat' data structure used in compatibility xstat
>     functions.  */
> -#define _STAT_VER_LINUX_OLD	1
> -#define _STAT_VER_KERNEL	1
> -#define _STAT_VER_SVR4		2
> -#define _STAT_VER_LINUX		3
> -#define _STAT_VER		_STAT_VER_LINUX

OK. Move to the targets.

> +#define _STAT_VER_KERNEL	0
> +#define _STAT_VER_LINUX		0
> +#define _STAT_VER		_STAT_VER_KERNEL
>  
>  /* Versions of the 'xmknod' interface used in compatibility xmknod
>     functions.  */
> -#define _MKNOD_VER_LINUX	1
> -#define _MKNOD_VER_SVR4		2

OK. Move to the targets.

> +#define _MKNOD_VER_LINUX	0
>  #define _MKNOD_VER		_MKNOD_VER_LINUX

diff mbox series

Patch

diff --git a/sysdeps/unix/sysv/linux/generic/xstatver.h b/sysdeps/unix/sysv/linux/arm/xstatver.h
similarity index 52%
rename from sysdeps/unix/sysv/linux/generic/xstatver.h
rename to sysdeps/unix/sysv/linux/arm/xstatver.h
index d8fd35beb6..8e1801b603 100644
--- a/sysdeps/unix/sysv/linux/generic/xstatver.h
+++ b/sysdeps/unix/sysv/linux/arm/xstatver.h
@@ -1,10 +1,13 @@ 
 /* Versions of the 'struct stat' data structure used in compatibility xstat
    functions.  */
-#define _STAT_VER_KERNEL	0
-#define _STAT_VER_LINUX		0
-#define _STAT_VER		_STAT_VER_KERNEL
+#define _STAT_VER_LINUX_OLD	1
+#define _STAT_VER_KERNEL	1
+#define _STAT_VER_SVR4		2
+#define _STAT_VER_LINUX		3
+#define _STAT_VER		_STAT_VER_LINUX
 
 /* Versions of the 'xmknod' interface used in compatibility xmknod
    functions.  */
-#define _MKNOD_VER_LINUX	0
+#define _MKNOD_VER_LINUX	1
+#define _MKNOD_VER_SVR4		2
 #define _MKNOD_VER		_MKNOD_VER_LINUX
diff --git a/sysdeps/unix/sysv/linux/hppa/xstatver.h b/sysdeps/unix/sysv/linux/hppa/xstatver.h
new file mode 100644
index 0000000000..8e1801b603
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/hppa/xstatver.h
@@ -0,0 +1,13 @@ 
+/* Versions of the 'struct stat' data structure used in compatibility xstat
+   functions.  */
+#define _STAT_VER_LINUX_OLD	1
+#define _STAT_VER_KERNEL	1
+#define _STAT_VER_SVR4		2
+#define _STAT_VER_LINUX		3
+#define _STAT_VER		_STAT_VER_LINUX
+
+/* Versions of the 'xmknod' interface used in compatibility xmknod
+   functions.  */
+#define _MKNOD_VER_LINUX	1
+#define _MKNOD_VER_SVR4		2
+#define _MKNOD_VER		_MKNOD_VER_LINUX
diff --git a/sysdeps/unix/sysv/linux/sh/xstatver.h b/sysdeps/unix/sysv/linux/sh/xstatver.h
new file mode 100644
index 0000000000..8e1801b603
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sh/xstatver.h
@@ -0,0 +1,13 @@ 
+/* Versions of the 'struct stat' data structure used in compatibility xstat
+   functions.  */
+#define _STAT_VER_LINUX_OLD	1
+#define _STAT_VER_KERNEL	1
+#define _STAT_VER_SVR4		2
+#define _STAT_VER_LINUX		3
+#define _STAT_VER		_STAT_VER_LINUX
+
+/* Versions of the 'xmknod' interface used in compatibility xmknod
+   functions.  */
+#define _MKNOD_VER_LINUX	1
+#define _MKNOD_VER_SVR4		2
+#define _MKNOD_VER		_MKNOD_VER_LINUX
diff --git a/sysdeps/unix/sysv/linux/xstatver.h b/sysdeps/unix/sysv/linux/xstatver.h
index 8e1801b603..d8fd35beb6 100644
--- a/sysdeps/unix/sysv/linux/xstatver.h
+++ b/sysdeps/unix/sysv/linux/xstatver.h
@@ -1,13 +1,10 @@ 
 /* Versions of the 'struct stat' data structure used in compatibility xstat
    functions.  */
-#define _STAT_VER_LINUX_OLD	1
-#define _STAT_VER_KERNEL	1
-#define _STAT_VER_SVR4		2
-#define _STAT_VER_LINUX		3
-#define _STAT_VER		_STAT_VER_LINUX
+#define _STAT_VER_KERNEL	0
+#define _STAT_VER_LINUX		0
+#define _STAT_VER		_STAT_VER_KERNEL
 
 /* Versions of the 'xmknod' interface used in compatibility xmknod
    functions.  */
-#define _MKNOD_VER_LINUX	1
-#define _MKNOD_VER_SVR4		2
+#define _MKNOD_VER_LINUX	0
 #define _MKNOD_VER		_MKNOD_VER_LINUX