Fix i386/fcntl.c

Fix i386/fcntl.c

[Andreas Jaeger]

[-- Attachment #1: Type: text/plain, Size: 1276 bytes --]


building glibc fails with:
../sysdeps/unix/sysv/linux/i386/fcntl.c:36: error: conflicting types for '__fcntl_nocancel'
../include/fcntl.h:12: error: previous declaration of '__fcntl_nocancel'
make[2]: *** [/builds/glibc/gcc-3.4/io/fcntl.o] Error 1

Ok to commit?

Andreas

2003-09-05  Andreas Jaeger  <aj@suse.de>

	* sysdeps/unix/sysv/linux/i386/fcntl.c (__fcntl_nocancel): Change
	prototype to use variable argument lists and get the possible one
	argument via va_arg.


============================================================
Index: sysdeps/unix/sysv/linux/i386/fcntl.c
--- sysdeps/unix/sysv/linux/i386/fcntl.c	4 Sep 2003 13:38:44 -0000	1.17
+++ sysdeps/unix/sysv/linux/i386/fcntl.c	5 Sep 2003 05:12:12 -0000
@@ -32,8 +32,15 @@ int __have_no_fcntl64;
 
 
 int
-__fcntl_nocancel (int fd, int cmd, void *arg)
+__fcntl_nocancel (int fd, int cmd, ...)
 {
+  va_list ap;
+  void *arg;
+
+  va_start (ap, cmd);
+  arg = va_arg (ap, void *);
+  va_end (ap);
+
 #if __ASSUME_FCNTL64 == 0
 # ifdef __NR_fcntl64
   if (! __have_no_fcntl64)

-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SuSE Linux AG, Deutschherrnstr. 15-19, 90429 Nürnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: Fix i386/fcntl.c

[Ulrich Drepper]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Andreas Jaeger wrote:

> Ok to commit?

Yes.

- -- 
- --------------.                        ,-.            444 Castro Street
Ulrich Drepper \    ,-----------------'   \ Mountain View, CA 94041 USA
Red Hat         `--' drepper at redhat.com `---------------------------
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE/WCAt2ijCOnn/RHQRAlBuAJ9Fd10Oaag+qedcaJB7FeoMeJyVagCgwCe4
qsOytn08vYH5/rFIrYdbJMg=
=R9R5
-----END PGP SIGNATURE-----

Re: Fix i386/fcntl.c

[Andreas Jaeger]

[-- Attachment #1: Type: text/plain, Size: 446 bytes --]

Ulrich Drepper <drepper@redhat.com> writes:

> Andreas Jaeger wrote:
>
>> Ok to commit?
>
> Yes.

Ok, now both x86-64 and i386 work (with linuxthreads and tls) again
(with two further obvious and committed fcntl change) for me,

Andreas
-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SuSE Linux AG, Deutschherrnstr. 15-19, 90429 Nürnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

[PATCH] Fix fcntl on s390x and other arches

[Jakub Jelinek]

Hi!

On Fri, Sep 05, 2003 at 12:06:03PM +0200, Andreas Jaeger wrote:
> Ulrich Drepper <drepper@redhat.com> writes:
> 
> > Andreas Jaeger wrote:
> >
> >> Ok to commit?
> >
> > Yes.
> 
> Ok, now both x86-64 and i386 work (with linuxthreads and tls) again
> (with two further obvious and committed fcntl change) for me,

That way we'd have to update all arches not having their own fcntl.c
(e.g. s390x fails to build in current CVS).
This is IMHO better:

2003-09-07  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/syscalls.list (fcntl): Remove.
	* sysdeps/unix/sysv/linux/x86_64/fcntl.c: Remove.

--- libc/sysdeps/unix/sysv/linux/syscalls.list.jj	2003-08-26 17:07:48.000000000 -0400
+++ libc/sysdeps/unix/sysv/linux/syscalls.list	2003-09-07 06:59:15.000000000 -0400
@@ -73,7 +73,6 @@ uselib		EXTRA	uselib		i:s	uselib
 wait4		-	wait4		i:iWiP	__wait4		wait4
 
 chown		-	chown		i:sii	__libc_chown	__chown chown
-fcntl		-	fcntl		Ci:iiF	__libc_fcntl	__fcntl fcntl
 
 setxattr	-	setxattr	i:sspii	setxattr
 lsetxattr	-	lsetxattr	i:sspii	lsetxattr
--- libc/sysdeps/unix/sysv/linux/x86_64/fcntl.c.jj	2003-09-05 04:44:35.000000000 -0400
+++ libc/sysdeps/unix/sysv/linux/x86_64/fcntl.c	2003-09-07 06:59:01.000000000 -0400
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/fcntl.c>


	Jakub

Re: [PATCH] Fix fcntl on s390x and other arches

[Andreas Jaeger]

[-- Attachment #1: Type: text/plain, Size: 776 bytes --]

Jakub Jelinek <jakub@redhat.com> writes:

> Hi!
>
> On Fri, Sep 05, 2003 at 12:06:03PM +0200, Andreas Jaeger wrote:
>> Ulrich Drepper <drepper@redhat.com> writes:
>> 
>> > Andreas Jaeger wrote:
>> >
>> >> Ok to commit?
>> >
>> > Yes.
>> 
>> Ok, now both x86-64 and i386 work (with linuxthreads and tls) again
>> (with two further obvious and committed fcntl change) for me,
>
> That way we'd have to update all arches not having their own fcntl.c
> (e.g. s390x fails to build in current CVS).
> This is IMHO better:

Yes, it is indeed.

Thanks!

Andreas
-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SuSE Linux AG, Deutschherrnstr. 15-19, 90429 Nürnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]