crosstool-ng: patches/glibc/2.9/440-alpha-glibc-2.4-xstat.patch@c4d124ed9f8e (annotated)

yann@1365	1	Original patch from: gentoo/src/patchsets/glibc/2.9/6001_all_alpha-glibc-2.4-xstat.patch
yann@1365	2
yann@1365	3	-= BEGIN original header =-
yann@1365	4	http://sources.redhat.com/bugzilla/show_bug.cgi?id=1026
yann@1365	5	http://sourceware.org/ml/libc-alpha/2005-02/msg00122.html
yann@1365	6
yann@1365	7	2005-02-26 GOTO Masanori <gotom@debian.or.jp>
yann@1365	8
yann@1365	9	* sysdeps/unix/sysv/linux/kernel-features.h: Define
yann@1365	10	__ASSUME_STAT64_SYSCALL.
yann@1365	11	* sysdeps/unix/sysv/linux/alpha/fxstat.c: Check
yann@1365	12	__ASSUME_STAT64_SYSCALL.
yann@1365	13	* sysdeps/unix/sysv/linux/alpha/fxstatat.c: Likewise.
yann@1365	14	* sysdeps/unix/sysv/linux/alpha/lxstat.c: Likewise.
yann@1365	15	* sysdeps/unix/sysv/linux/alpha/xstat.c: Likewise.
yann@1365	16	* sysdeps/unix/sysv/linux/alpha/xstatconv.c: Don't define
yann@1365	17	__libc_missing_axp_stat64 when it's not needed.
yann@1365	18	* sysdeps/unix/sysv/linux/alpha/xstatconv.h: Likewise.
yann@1365	19
yann@1365	20	-= END original header =-
yann@1365	21
yann@1365	22	diff -durN glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/fxstat.c glibc-2_9/sysdeps/unix/sysv/linux/alpha/fxstat.c
yann@1365	23	--- glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/fxstat.c 2004-03-11 03:58:44.000000000 +0100
yann@1365	24	+++ glibc-2_9/sysdeps/unix/sysv/linux/alpha/fxstat.c 2009-02-02 22:01:30.000000000 +0100
yann@1365	25	@@ -35,27 +35,39 @@
yann@1365	26	__fxstat (int vers, int fd, struct stat *buf)
yann@1365	27	{
yann@1365	28	INTERNAL_SYSCALL_DECL (err);
yann@1365	29	- int result, errno_out;
yann@1365	30	+ int result;
yann@1365	31	struct kernel_stat kbuf;
yann@1365	32
yann@1365	33	+#if __ASSUME_STAT64_SYSCALL > 0
yann@1365	34	+ if (vers == _STAT_VER_KERNEL64)
yann@1365	35	+ {
yann@1365	36	+ result = INTERNAL_SYSCALL (fstat64, err, 2, fd, buf);
yann@1365	37	+ if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365	38	+ return result;
yann@1365	39	+ __set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
yann@1365	40	+ return -1;
yann@1365	41	+ }
yann@1365	42	+#elif defined __NR_fstat64
yann@1365	43	if (vers == _STAT_VER_KERNEL64 && !__libc_missing_axp_stat64)
yann@1365	44	{
yann@1365	45	+ int errno_out;
yann@1365	46	result = INTERNAL_SYSCALL (fstat64, err, 2, fd, buf);
yann@1365	47	if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365	48	return result;
yann@1365	49	errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
yann@1365	50	if (errno_out != ENOSYS)
yann@1365	51	- goto fail;
yann@1365	52	+ {
yann@1365	53	+ __set_errno (errno_out);
yann@1365	54	+ return -1;
yann@1365	55	+ }
yann@1365	56	__libc_missing_axp_stat64 = 1;
yann@1365	57	}
yann@1365	58	+#endif
yann@1365	59
yann@1365	60	result = INTERNAL_SYSCALL (fstat, err, 2, fd, &kbuf);
yann@1365	61	if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365	62	return __xstat_conv (vers, &kbuf, buf);
yann@1365	63	- errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
yann@1365	64	-
yann@1365	65	- fail:
yann@1365	66	- __set_errno (errno_out);
yann@1365	67	+ __set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
yann@1365	68	return -1;
yann@1365	69	}
yann@1365	70	hidden_def (__fxstat)
yann@1365	71	diff -durN glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/fxstatat.c glibc-2_9/sysdeps/unix/sysv/linux/alpha/fxstatat.c
yann@1365	72	--- glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/fxstatat.c 2006-02-20 23:51:48.000000000 +0100
yann@1365	73	+++ glibc-2_9/sysdeps/unix/sysv/linux/alpha/fxstatat.c 2009-02-02 22:01:30.000000000 +0100
yann@1365	74	@@ -65,6 +65,20 @@
yann@1365	75	int result, errno_out;
yann@1365	76	struct kernel_stat kst;
yann@1365	77
yann@1365	78	+#if __ASSUME_STAT64_SYSCALL > 0
yann@1365	79	+ if (vers == _STAT_VER_KERNEL64)
yann@1365	80	+ {
yann@1365	81	+ if (flag & AT_SYMLINK_NOFOLLOW)
yann@1365	82	+ result = INTERNAL_SYSCALL (lstat64, err, 2, file, st);
yann@1365	83	+ else
yann@1365	84	+ result = INTERNAL_SYSCALL (stat64, err, 2, file, st);
yann@1365	85	+
yann@1365	86	+ if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365	87	+ return result;
yann@1365	88	+ errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
yann@1365	89	+ goto fail;
yann@1365	90	+ }
yann@1365	91	+#elif defined __NR_stat64
yann@1365	92	if (vers == _STAT_VER_KERNEL64 && !__libc_missing_axp_stat64)
yann@1365	93	{
yann@1365	94	if (flag & AT_SYMLINK_NOFOLLOW)
yann@1365	95	@@ -79,6 +93,7 @@
yann@1365	96	goto fail;
yann@1365	97	__libc_missing_axp_stat64 = 1;
yann@1365	98	}
yann@1365	99	+#endif
yann@1365	100
yann@1365	101	if (flag & AT_SYMLINK_NOFOLLOW)
yann@1365	102	result = INTERNAL_SYSCALL (lstat, err, 2, file, &kst);
yann@1365	103	diff -durN glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/lxstat.c glibc-2_9/sysdeps/unix/sysv/linux/alpha/lxstat.c
yann@1365	104	--- glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/lxstat.c 2004-03-11 03:58:44.000000000 +0100
yann@1365	105	+++ glibc-2_9/sysdeps/unix/sysv/linux/alpha/lxstat.c 2009-02-02 22:01:30.000000000 +0100
yann@1365	106	@@ -35,27 +35,39 @@
yann@1365	107	__lxstat (int vers, const char name, struct stat buf)
yann@1365	108	{
yann@1365	109	INTERNAL_SYSCALL_DECL (err);
yann@1365	110	- int result, errno_out;
yann@1365	111	+ int result;
yann@1365	112	struct kernel_stat kbuf;
yann@1365	113
yann@1365	114	+#if __ASSUME_STAT64_SYSCALL > 0
yann@1365	115	+ if (vers == _STAT_VER_KERNEL64)
yann@1365	116	+ {
yann@1365	117	+ result = INTERNAL_SYSCALL (lstat64, err, 2, name, buf);
yann@1365	118	+ if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365	119	+ return result;
yann@1365	120	+ __set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
yann@1365	121	+ return -1;
yann@1365	122	+ }
yann@1365	123	+#elif defined __NR_lstat64
yann@1365	124	if (vers == _STAT_VER_KERNEL64 && !__libc_missing_axp_stat64)
yann@1365	125	{
yann@1365	126	+ int errno_out;
yann@1365	127	result = INTERNAL_SYSCALL (lstat64, err, 2, name, buf);
yann@1365	128	if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365	129	return result;
yann@1365	130	errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
yann@1365	131	if (errno_out != ENOSYS)
yann@1365	132	- goto fail;
yann@1365	133	+ {
yann@1365	134	+ __set_errno (errno_out);
yann@1365	135	+ return -1;
yann@1365	136	+ }
yann@1365	137	__libc_missing_axp_stat64 = 1;
yann@1365	138	}
yann@1365	139	+#endif
yann@1365	140
yann@1365	141	result = INTERNAL_SYSCALL (lstat, err, 2, name, &kbuf);
yann@1365	142	if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365	143	return __xstat_conv (vers, &kbuf, buf);
yann@1365	144	- errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
yann@1365	145	-
yann@1365	146	- fail:
yann@1365	147	- __set_errno (errno_out);
yann@1365	148	+ __set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
yann@1365	149	return -1;
yann@1365	150	}
yann@1365	151	hidden_def (__lxstat)
yann@1365	152	diff -durN glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/xstat.c glibc-2_9/sysdeps/unix/sysv/linux/alpha/xstat.c
yann@1365	153	--- glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/xstat.c 2004-03-11 03:58:44.000000000 +0100
yann@1365	154	+++ glibc-2_9/sysdeps/unix/sysv/linux/alpha/xstat.c 2009-02-02 22:01:30.000000000 +0100
yann@1365	155	@@ -35,27 +35,39 @@
yann@1365	156	__xstat (int vers, const char name, struct stat buf)
yann@1365	157	{
yann@1365	158	INTERNAL_SYSCALL_DECL (err);
yann@1365	159	- int result, errno_out;
yann@1365	160	+ int result;
yann@1365	161	struct kernel_stat kbuf;
yann@1365	162
yann@1365	163	+#if __ASSUME_STAT64_SYSCALL > 0
yann@1365	164	+ if (vers == _STAT_VER_KERNEL64)
yann@1365	165	+ {
yann@1365	166	+ result = INTERNAL_SYSCALL (stat64, err, 2, name, buf);
yann@1365	167	+ if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365	168	+ return result;
yann@1365	169	+ __set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
yann@1365	170	+ return -1;
yann@1365	171	+ }
yann@1365	172	+#elif defined __NR_stat64
yann@1365	173	if (vers == _STAT_VER_KERNEL64 && !__libc_missing_axp_stat64)
yann@1365	174	{
yann@1365	175	+ int errno_out;
yann@1365	176	result = INTERNAL_SYSCALL (stat64, err, 2, name, buf);
yann@1365	177	if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365	178	return result;
yann@1365	179	errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
yann@1365	180	if (errno_out != ENOSYS)
yann@1365	181	- goto fail;
yann@1365	182	+ {
yann@1365	183	+ __set_errno (errno_out);
yann@1365	184	+ return -1;
yann@1365	185	+ }
yann@1365	186	__libc_missing_axp_stat64 = 1;
yann@1365	187	}
yann@1365	188	+#endif
yann@1365	189
yann@1365	190	result = INTERNAL_SYSCALL (stat, err, 2, name, &kbuf);
yann@1365	191	if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
yann@1365	192	return __xstat_conv (vers, &kbuf, buf);
yann@1365	193	- errno_out = INTERNAL_SYSCALL_ERRNO (result, err);
yann@1365	194	-
yann@1365	195	- fail:
yann@1365	196	- __set_errno (errno_out);
yann@1365	197	+ __set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
yann@1365	198	return -1;
yann@1365	199	}
yann@1365	200	hidden_def (__xstat)
yann@1365	201	diff -durN glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/xstatconv.c glibc-2_9/sysdeps/unix/sysv/linux/alpha/xstatconv.c
yann@1365	202	--- glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/xstatconv.c 2004-03-11 03:58:44.000000000 +0100
yann@1365	203	+++ glibc-2_9/sysdeps/unix/sysv/linux/alpha/xstatconv.c 2009-02-02 22:01:30.000000000 +0100
yann@1365	204	@@ -22,9 +22,14 @@
yann@1365	205	#include <sys/stat.h>
yann@1365	206	#include <kernel_stat.h>
yann@1365	207	#include <xstatconv.h>
yann@1365	208	+#include <sys/syscall.h>
yann@1365	209
yann@1365	210
yann@1365	211	+#ifdef __NR_stat64
yann@1365	212	+# if __ASSUME_STAT64_SYSCALL == 0
yann@1365	213	int __libc_missing_axp_stat64;
yann@1365	214	+# endif
yann@1365	215	+#endif
yann@1365	216
yann@1365	217	int
yann@1365	218	__xstat_conv (int vers, struct kernel_stat kbuf, void ubuf)
yann@1365	219	diff -durN glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/xstatconv.h glibc-2_9/sysdeps/unix/sysv/linux/alpha/xstatconv.h
yann@1365	220	--- glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/xstatconv.h 2006-01-08 09:21:16.000000000 +0100
yann@1365	221	+++ glibc-2_9/sysdeps/unix/sysv/linux/alpha/xstatconv.h 2009-02-02 22:01:30.000000000 +0100
yann@1365	222	@@ -18,7 +18,12 @@
yann@1365	223	02111-1307 USA. */
yann@1365	224
yann@1365	225	#include <kernel-features.h>
yann@1365	226	+#include <sys/syscall.h>
yann@1365	227
yann@1365	228	+#ifdef __NR_stat64
yann@1365	229	+# if __ASSUME_STAT64_SYSCALL == 0
yann@1365	230	extern int __libc_missing_axp_stat64 attribute_hidden;
yann@1365	231	+# endif
yann@1365	232	+#endif
yann@1365	233	extern int __xstat_conv (int vers, struct kernel_stat kbuf, void ubuf)
yann@1365	234	attribute_hidden;
yann@1365	235	diff -durN glibc-2_9.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2_9/sysdeps/unix/sysv/linux/kernel-features.h
yann@1365	236	--- glibc-2_9.orig/sysdeps/unix/sysv/linux/kernel-features.h 2008-08-01 23:51:04.000000000 +0200
yann@1365	237	+++ glibc-2_9/sysdeps/unix/sysv/linux/kernel-features.h 2009-02-02 22:01:30.000000000 +0100
yann@1365	238	@@ -395,6 +395,11 @@
yann@1365	239	# define __ASSUME_GETDENTS32_D_TYPE 1
yann@1365	240	#endif
yann@1365	241
yann@1365	242	+/* Starting with version 2.6.4, alpha stat64 syscalls are available. */
yann@1365	243	+#if __LINUX_KERNEL_VERSION >= 0x020604 && defined __alpha__
yann@1365	244	+# define __ASSUME_STAT64_SYSCALL 1
yann@1365	245	+#endif
yann@1365	246	+
yann@1365	247	/* Starting with version 2.5.3, the initial location returned by `brk'
yann@1365	248	after exec is always rounded up to the next page. */
yann@1365	249	#if __LINUX_KERNEL_VERSION >= 132355

author	"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
	Sun Apr 19 16:17:11 2009 +0000 (2009-04-19)
branch	newlib
changeset 1365	c4d124ed9f8e
permissions	-rw-r--r--