* [PATCH] ARM: Use <bits/fcntl-linux.h>
@ 2012-10-21 19:08 Andreas Jaeger
2012-10-21 22:53 ` Joseph S. Myers
0 siblings, 1 reply; 8+ messages in thread
From: Andreas Jaeger @ 2012-10-21 19:08 UTC (permalink / raw)
To: libc-ports
This untested patch make use of the new <bits/fcntl-linux.h> header
and depends on my patch for F_GETLK etc that I just send.
Ok to commit?
Andreas
2012-10-21 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/arm/bits/fcntl.h: Remove all
definitions and declarations that are provided by
<bits/fcntl-linux.h> and include <bits/fcntl-linux.h>.
diff --git a/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h b/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
index ef49d5f..1719335 100644
--- a/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
+++ b/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
@@ -1,6 +1,5 @@
/* O_*, F_*, FD_* bit values for Linux.
- Copyright (C) 1995-1998, 2000, 2004, 2006, 2007, 2009, 2010, 2011
- Free Software Foundation, Inc.
+ Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -21,134 +20,14 @@
# error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead."
#endif
-#include <sys/types.h>
-#ifdef __USE_GNU
-# include <bits/uio.h>
-#endif
-
-
-/* open/fcntl - O_SYNC is only implemented on blocks devices and on files
- located on an ext2 file system */
-#define O_ACCMODE 0003
-#define O_RDONLY 00
-#define O_WRONLY 01
-#define O_RDWR 02
-#define O_CREAT 0100 /* not fcntl */
-#define O_EXCL 0200 /* not fcntl */
-#define O_NOCTTY 0400 /* not fcntl */
-#define O_TRUNC 01000 /* not fcntl */
-#define O_APPEND 02000
-#define O_NONBLOCK 04000
-#define O_NDELAY O_NONBLOCK
-#define O_SYNC 04010000
-#define O_FSYNC O_SYNC
-#define O_ASYNC 020000
-
-#ifdef __USE_XOPEN2K8
-# define O_DIRECTORY 040000 /* Must be a directory. */
-# define O_NOFOLLOW 0100000 /* Do not follow links. */
-# define O_CLOEXEC 02000000 /* Set close_on_exec. */
-#endif
-#ifdef __USE_GNU
-# define O_DIRECT 0200000 /* Direct disk access. */
-# define O_NOATIME 01000000 /* Do not set atime. */
-# define O_PATH 010000000 /* Resolve pathname but do not open file. */
-#endif
-
-/* For now Linux has synchronisity options for data and read operations.
- We define the symbols here but let them do the same as O_SYNC since
- this is a superset. */
-#if defined __USE_POSIX199309 || defined __USE_UNIX98
-# define O_DSYNC 010000 /* Synchronize data. */
-# define O_RSYNC O_SYNC /* Synchronize read operations. */
-#endif
+#define __O_DIRECTORY 040000 /* Must be a directory. */
+#define __O_NOFOLLOW 0100000 /* Do not follow links. */
+#define __O_DIRECT 0200000 /* Direct disk access. */
#ifdef __USE_LARGEFILE64
# define O_LARGEFILE 0400000
#endif
-/* Values for the second argument to `fcntl'. */
-#define F_DUPFD 0 /* Duplicate file descriptor. */
-#define F_GETFD 1 /* Get file descriptor flags. */
-#define F_SETFD 2 /* Set file descriptor flags. */
-#define F_GETFL 3 /* Get file status flags. */
-#define F_SETFL 4 /* Set file status flags. */
-#ifndef __USE_FILE_OFFSET64
-# define F_GETLK 5 /* Get record locking info. */
-# define F_SETLK 6 /* Set record locking info (non-blocking). */
-# define F_SETLKW 7 /* Set record locking info (blocking). */
-#else
-# define F_GETLK F_GETLK64 /* Get record locking info. */
-# define F_SETLK F_SETLK64 /* Set record locking info (non-blocking).*/
-# define F_SETLKW F_SETLKW64 /* Set record locking info (blocking). */
-#endif
-#define F_GETLK64 12 /* Get record locking info. */
-#define F_SETLK64 13 /* Set record locking info (non-blocking). */
-#define F_SETLKW64 14 /* Set record locking info (blocking). */
-
-#if defined __USE_BSD || defined __USE_UNIX98 || defined __USE_XOPEN2K8
-# define F_SETOWN 8 /* Get owner (process receiving SIGIO). */
-# define F_GETOWN 9 /* Set owner (process receiving SIGIO). */
-#endif
-
-#ifdef __USE_GNU
-# define F_SETSIG 10 /* Set number of signal to be sent. */
-# define F_GETSIG 11 /* Get number of signal to be sent. */
-# define F_SETOWN_EX 15 /* Get owner (thread receiving SIGIO). */
-# define F_GETOWN_EX 16 /* Set owner (thread receiving SIGIO). */
-#endif
-
-#ifdef __USE_GNU
-# define F_SETLEASE 1024 /* Set a lease. */
-# define F_GETLEASE 1025 /* Enquire what lease is active. */
-# define F_NOTIFY 1026 /* Request notfications on a directory. */
-# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */
-# define F_GETPIPE_SZ 1032 /* Set pipe page size array. */
-#endif
-#ifdef __USE_XOPEN2K8
-# define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with
- close-on-exit set. */
-#endif
-
-/* For F_[GET|SET]FD. */
-#define FD_CLOEXEC 1 /* actually anything with low bit set goes */
-
-/* For posix fcntl() and `l_type' field of a `struct flock' for lockf(). */
-#define F_RDLCK 0 /* Read lock. */
-#define F_WRLCK 1 /* Write lock. */
-#define F_UNLCK 2 /* Remove lock. */
-
-/* For old implementation of bsd flock(). */
-#define F_EXLCK 4 /* or 3 */
-#define F_SHLCK 8 /* or 4 */
-
-#ifdef __USE_BSD
-/* Operations for bsd flock(), also used by the kernel implementation. */
-# define LOCK_SH 1 /* shared lock */
-# define LOCK_EX 2 /* exclusive lock */
-# define LOCK_NB 4 /* or'd with one of the above to prevent
- blocking */
-# define LOCK_UN 8 /* remove lock */
-#endif
-
-#ifdef __USE_GNU
-# define LOCK_MAND 32 /* This is a mandatory flock: */
-# define LOCK_READ 64 /* ... which allows concurrent read operations. */
-# define LOCK_WRITE 128 /* ... which allows concurrent write operations. */
-# define LOCK_RW 192 /* ... Which allows concurrent read & write operations. */
-#endif
-
-#ifdef __USE_GNU
-/* Types of directory notifications that may be requested with F_NOTIFY. */
-# define DN_ACCESS 0x00000001 /* File accessed. */
-# define DN_MODIFY 0x00000002 /* File modified. */
-# define DN_CREATE 0x00000004 /* File created. */
-# define DN_DELETE 0x00000008 /* File removed. */
-# define DN_RENAME 0x00000010 /* File renamed. */
-# define DN_ATTRIB 0x00000020 /* File changed attibutes. */
-# define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */
-#endif
-
struct flock
{
short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */
@@ -174,148 +53,5 @@ struct flock64
};
#endif
-#ifdef __USE_GNU
-/* Owner types. */
-enum __pid_type
- {
- F_OWNER_TID = 0, /* Kernel thread. */
- F_OWNER_PID, /* Process. */
- F_OWNER_PGRP, /* Process group. */
- F_OWNER_GID = F_OWNER_PGRP /* Alternative, obsolete name. */
- };
-
-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */
-struct f_owner_ex
- {
- enum __pid_type type; /* Owner type of ID. */
- __pid_t pid; /* ID of owner. */
- };
-#endif
-
-/* Define some more compatibility macros to be backward compatible with
- BSD systems which did not managed to hide these kernel macros. */
-#ifdef __USE_BSD
-# define FAPPEND O_APPEND
-# define FFSYNC O_FSYNC
-# define FASYNC O_ASYNC
-# define FNONBLOCK O_NONBLOCK
-# define FNDELAY O_NDELAY
-#endif /* Use BSD. */
-
-/* Advise to `posix_fadvise'. */
-#ifdef __USE_XOPEN2K
-# define POSIX_FADV_NORMAL 0 /* No further special treatment. */
-# define POSIX_FADV_RANDOM 1 /* Expect random page references. */
-# define POSIX_FADV_SEQUENTIAL 2 /* Expect sequential page references. */
-# define POSIX_FADV_WILLNEED 3 /* Will need these pages. */
-# define POSIX_FADV_DONTNEED 4 /* Don't need these pages. */
-# define POSIX_FADV_NOREUSE 5 /* Data will be accessed once. */
-#endif
-
-
-#ifdef __USE_GNU
-/* Flags for SYNC_FILE_RANGE. */
-# define SYNC_FILE_RANGE_WAIT_BEFORE 1 /* Wait upon writeout of all pages
- in the range before performing the
- write. */
-# define SYNC_FILE_RANGE_WRITE 2 /* Initiate writeout of all those
- dirty pages in the range which are
- not presently under writeback. */
-# define SYNC_FILE_RANGE_WAIT_AFTER 4 /* Wait upon writeout of all pages in
- the range after performing the
- write. */
-
-/* Flags for SPLICE and VMSPLICE. */
-# define SPLICE_F_MOVE 1 /* Move pages instead of copying. */
-# define SPLICE_F_NONBLOCK 2 /* Don't block on the pipe splicing
- (but we may still block on the fd
- we splice from/to). */
-# define SPLICE_F_MORE 4 /* Expect more data. */
-# define SPLICE_F_GIFT 8 /* Pages passed in are a gift. */
-
-
-/* File handle structure. */
-struct file_handle
-{
- unsigned int handle_bytes;
- int handle_type;
- /* File identifier. */
- unsigned char f_handle[0];
-};
-
-/* Maximum handle size (for now). */
-# define MAX_HANDLE_SZ 128
-#endif
-
-__BEGIN_DECLS
-
-#ifdef __USE_GNU
-
-/* Provide kernel hint to read ahead. */
-extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
- __THROW;
-
-
-/* Selective file content synch'ing. */
-extern int sync_file_range (int __fd, __off64_t __offset, __off64_t __count,
- unsigned int __flags);
-
-
-/* Splice address range into a pipe.
-
- This function is a possible cancellation point and therefore not
- marked with __THROW. */
-extern ssize_t vmsplice (int __fdout, const struct iovec *__iov,
- size_t __count, unsigned int __flags);
-
-/* Splice two files together.
-
- This function is a possible cancellation point and therefore not
- marked with __THROW. */
-extern ssize_t splice (int __fdin, __off64_t *__offin, int __fdout,
- __off64_t *__offout, size_t __len,
- unsigned int __flags);
-
-/* In-kernel implementation of tee for pipe buffers.
-
- This function is a possible cancellation point and therefore not
- marked with __THROW. */
-extern ssize_t tee (int __fdin, int __fdout, size_t __len,
- unsigned int __flags);
-
-/* Reserve storage for the data of the file associated with FD.
-
- This function is a possible cancellation point and therefore not
- marked with __THROW. */
-# ifndef __USE_FILE_OFFSET64
-extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
-# else
-# ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
- __off64_t __len),
- fallocate64);
-# else
-# define fallocate fallocate64
-# endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int fallocate64 (int __fd, int __mode, __off64_t __offset,
- __off64_t __len);
-# endif
-
-
-/* Map file name to file handle. */
-extern int name_to_handle_at (int __dfd, const char *__name,
- struct file_handle *__handle, int *__mnt_id,
- int __flags) __THROW;
-
-/* Open file using the file handle.
-
- This function is a possible cancellation point and therefore not
- marked with __THROW. */
-extern int open_by_handle_at (int __mountdirfd, struct file_handle *__handle,
- int __flags);
-
-#endif
-
-__END_DECLS
+/* Include generic Linux declarations. */
+#include <bits/fcntl-linux.h>
--
Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)
GPG fingerprint = 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ARM: Use <bits/fcntl-linux.h>
2012-10-21 19:08 [PATCH] ARM: Use <bits/fcntl-linux.h> Andreas Jaeger
@ 2012-10-21 22:53 ` Joseph S. Myers
2012-10-21 22:58 ` Joseph S. Myers
0 siblings, 1 reply; 8+ messages in thread
From: Joseph S. Myers @ 2012-10-21 22:53 UTC (permalink / raw)
To: Andreas Jaeger; +Cc: libc-ports
On Sun, 21 Oct 2012, Andreas Jaeger wrote:
> #ifdef __USE_LARGEFILE64
> # define O_LARGEFILE 0400000
> #endif
You leave this unchanged, but shouldn't you change it to an unconditional
definition of __O_LARGEFILE to work correctly with fcntl-linux.h? OK with
that change.
--
Joseph S. Myers
joseph@codesourcery.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ARM: Use <bits/fcntl-linux.h>
2012-10-21 22:53 ` Joseph S. Myers
@ 2012-10-21 22:58 ` Joseph S. Myers
2012-10-22 7:26 ` Fix O_LARGEFILE for Linux/SPARC and s390 (was: Re: [PATCH] ARM: Use <bits/fcntl-linux.h> ) Andreas Jaeger
[not found] ` <2036625.SeAZvNclbu__45590.3210131966$1350890838$gmane$org@byrd>
0 siblings, 2 replies; 8+ messages in thread
From: Joseph S. Myers @ 2012-10-21 22:58 UTC (permalink / raw)
To: Andreas Jaeger; +Cc: libc-ports
On Sun, 21 Oct 2012, Joseph S. Myers wrote:
> On Sun, 21 Oct 2012, Andreas Jaeger wrote:
>
> > #ifdef __USE_LARGEFILE64
> > # define O_LARGEFILE 0400000
> > #endif
>
> You leave this unchanged, but shouldn't you change it to an unconditional
> definition of __O_LARGEFILE to work correctly with fcntl-linux.h? OK with
> that change.
(It looks like the checked-in SPARC and S/390 versions also have this
issue.)
--
Joseph S. Myers
joseph@codesourcery.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* Fix O_LARGEFILE for Linux/SPARC and s390 (was: Re: [PATCH] ARM: Use <bits/fcntl-linux.h> )
2012-10-21 22:58 ` Joseph S. Myers
@ 2012-10-22 7:26 ` Andreas Jaeger
2012-10-22 14:06 ` Joseph S. Myers
[not found] ` <2036625.SeAZvNclbu__45590.3210131966$1350890838$gmane$org@byrd>
1 sibling, 1 reply; 8+ messages in thread
From: Andreas Jaeger @ 2012-10-22 7:26 UTC (permalink / raw)
To: Joseph S. Myers; +Cc: libc-ports, libc-alpha
On Sunday, October 21, 2012 22:58:16 Joseph S. Myers wrote:
> On Sun, 21 Oct 2012, Joseph S. Myers wrote:
> > On Sun, 21 Oct 2012, Andreas Jaeger wrote:
> > > #ifdef __USE_LARGEFILE64
> > > # define O_LARGEFILE 0400000
> > > #endif
> >
> > You leave this unchanged, but shouldn't you change it to an
> > unconditional definition of __O_LARGEFILE to work correctly with
> > fcntl-linux.h? OK with that change.
>
> (It looks like the checked-in SPARC and S/390 versions also have this
> issue.)
Yes, indeed. Here's a patch to fix this, committed as obvious,
Andreas
commit 481b90b9d6923adcbe801b7a44f784920f15da14
Author: Andreas Jaeger <aj@suse.de>
Date: Mon Oct 22 09:19:30 2012 +0200
Use __O_LARGEFILE instead of O_LARGEFILE
diff --git a/ChangeLog b/ChangeLog
index 6fbc12d..35aa29c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-22 Andreas Jaeger <aj@suse.de>
+
+ * sysdeps/unix/sysv/linux/s390/bits/fcntl.h (O_LARGEFILE): Rename
+ to __O_LARGEFILE.
+ * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (O_LARGEFILE): Rename
+ to __O_LARGEFILE.
+
2012-10-21 Jim Blandy <jimb@codesourcery.com>
Joseph Myers <joseph@codesourcery.com>
diff --git a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
index 47941c4..6f53fbc 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
@@ -25,9 +25,9 @@
#ifdef __USE_LARGEFILE64
# if __WORDSIZE == 64
/* Not necessary, files are always with 64bit off_t. */
-# define O_LARGEFILE 0
+# define __O_LARGEFILE 0
# else
-# define O_LARGEFILE 0100000
+# define __O_LARGEFILE 0100000
# endif
#endif
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
index 9c7d43c..b8496a9 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
@@ -43,9 +43,9 @@
#ifdef __USE_LARGEFILE64
# if __WORDSIZE == 64
-# define O_LARGEFILE 0
+# define __O_LARGEFILE 0
# else
-# define O_LARGEFILE 0x40000
+# define __O_LARGEFILE 0x40000
# endif
#endif
--
Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)
GPG fingerprint = 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Fix O_LARGEFILE for Linux/SPARC and s390 (was: Re: [PATCH] ARM: Use <bits/fcntl-linux.h> )
2012-10-22 7:26 ` Fix O_LARGEFILE for Linux/SPARC and s390 (was: Re: [PATCH] ARM: Use <bits/fcntl-linux.h> ) Andreas Jaeger
@ 2012-10-22 14:06 ` Joseph S. Myers
2012-10-22 14:16 ` Andreas Jaeger
0 siblings, 1 reply; 8+ messages in thread
From: Joseph S. Myers @ 2012-10-22 14:06 UTC (permalink / raw)
To: Andreas Jaeger; +Cc: libc-ports, libc-alpha
On Mon, 22 Oct 2012, Andreas Jaeger wrote:
> #ifdef __USE_LARGEFILE64
> # if __WORDSIZE == 64
> /* Not necessary, files are always with 64bit off_t. */
> -# define O_LARGEFILE 0
> +# define __O_LARGEFILE 0
> # else
> -# define O_LARGEFILE 0100000
> +# define __O_LARGEFILE 0100000
> # endif
> #endif
I think it's more consistent not to have the __USE_LARGEFILE64
conditionals here: to define the __O_* macro unconditionally (like other
__O_* macros) and have the conditional only in fcntl-linux.h on the
O_LARGEFILE definition.
--
Joseph S. Myers
joseph@codesourcery.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Fix O_LARGEFILE for Linux/SPARC and s390 (was: Re: [PATCH] ARM: Use <bits/fcntl-linux.h> )
2012-10-22 14:06 ` Joseph S. Myers
@ 2012-10-22 14:16 ` Andreas Jaeger
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Jaeger @ 2012-10-22 14:16 UTC (permalink / raw)
To: libc-alpha; +Cc: Joseph S. Myers, libc-ports
On Monday, October 22, 2012 14:06:23 Joseph S. Myers wrote:
> On Mon, 22 Oct 2012, Andreas Jaeger wrote:
> > #ifdef __USE_LARGEFILE64
> > # if __WORDSIZE == 64
> > /* Not necessary, files are always with 64bit off_t. */
> >
> > -# define O_LARGEFILE 0
> > +# define __O_LARGEFILE 0
> >
> > # else
> >
> > -# define O_LARGEFILE 0100000
> > +# define __O_LARGEFILE 0100000
> >
> > # endif
> > #endif
>
> I think it's more consistent not to have the __USE_LARGEFILE64
> conditionals here: to define the __O_* macro unconditionally (like
> other __O_* macros) and have the conditional only in fcntl-linux.h on
> the O_LARGEFILE definition.
You're right - and that's what I did for x86, I've fixed this with the
appended patch now, will commit later as obvious,
Thanks,
Andreas
2012-10-22 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (__O_LARGEFILE):
Define always.
* sysdeps/unix/sysv/linux/s390/bits/fcntl.h (__O_LARGEFILE): Likewise.
For ChangeLog.arm:
2012-10-22 Andreas Jaeger <aj@suse.de>
* ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h (__O_LARGEFILE):
Define always.
diff --git a/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h b/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
index e37285d..6ae19ae 100644
--- a/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
+++ b/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
@@ -23,10 +23,8 @@
#define __O_DIRECTORY 040000 /* Must be a directory. */
#define __O_NOFOLLOW 0100000 /* Do not follow links. */
#define __O_DIRECT 0200000 /* Direct disk access. */
+#define __O_LARGEFILE 0400000
-#ifdef __USE_LARGEFILE64
-# define __O_LARGEFILE 0400000
-#endif
struct flock
{
diff --git a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
index 6f53fbc..43eee7a 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
@@ -22,42 +22,18 @@
#include <bits/wordsize.h>
-#ifdef __USE_LARGEFILE64
-# if __WORDSIZE == 64
+#if __WORDSIZE == 64
/* Not necessary, files are always with 64bit off_t. */
-# define __O_LARGEFILE 0
-# else
-# define __O_LARGEFILE 0100000
-# endif
+# define __O_LARGEFILE 0
+#else
+# define __O_LARGEFILE 0100000
#endif
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
index b8496a9..22e71fc 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
@@ -39,14 +39,11 @@
#define __O_DIRECT 0x100000 /* direct disk access hint */
#define __O_NOATIME 0x200000 /* Do not set atime. */
#define __O_PATH 0x1000000 /* Resolve pathname but do not open file. */
-#endif
-#ifdef __USE_LARGEFILE64
-# if __WORDSIZE == 64
-# define __O_LARGEFILE 0
-# else
-# define __O_LARGEFILE 0x40000
-# endif
+#if __WORDSIZE == 64
+# define __O_LARGEFILE 0
+#else
+# define __O_LARGEFILE 0x40000
#endif
#define __O_DSYNC 0x2000 /* Synchronize data. */
--
Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)
GPG fingerprint = 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Fix O_LARGEFILE for Linux/SPARC and s390
[not found] ` <2036625.SeAZvNclbu__45590.3210131966$1350890838$gmane$org@byrd>
@ 2012-10-24 16:56 ` Andreas Schwab
2012-10-24 18:48 ` Andreas Jaeger
0 siblings, 1 reply; 8+ messages in thread
From: Andreas Schwab @ 2012-10-24 16:56 UTC (permalink / raw)
To: Andreas Jaeger; +Cc: Joseph S. Myers, libc-ports, libc-alpha
Andreas Jaeger <aj@suse.com> writes:
> diff --git a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
> b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
> index 47941c4..6f53fbc 100644
> --- a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
> +++ b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
> @@ -25,9 +25,9 @@
> #ifdef __USE_LARGEFILE64
> # if __WORDSIZE == 64
> /* Not necessary, files are always with 64bit off_t. */
> -# define O_LARGEFILE 0
> +# define __O_LARGEFILE 0
> # else
> -# define O_LARGEFILE 0100000
> +# define __O_LARGEFILE 0100000
> # endif
> #endif
__O_LARGEFILE should be defined unconditionally.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Fix O_LARGEFILE for Linux/SPARC and s390
2012-10-24 16:56 ` Fix O_LARGEFILE for Linux/SPARC and s390 Andreas Schwab
@ 2012-10-24 18:48 ` Andreas Jaeger
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Jaeger @ 2012-10-24 18:48 UTC (permalink / raw)
To: Andreas Schwab; +Cc: Joseph S. Myers, libc-ports, libc-alpha
On 10/24/2012 06:56 PM, Andreas Schwab wrote:
> Andreas Jaeger <aj@suse.com> writes:
>
>> diff --git a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
>> b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
>> index 47941c4..6f53fbc 100644
>> --- a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
>> +++ b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
>> @@ -25,9 +25,9 @@
>> #ifdef __USE_LARGEFILE64
>> # if __WORDSIZE == 64
>> /* Not necessary, files are always with 64bit off_t. */
>> -# define O_LARGEFILE 0
>> +# define __O_LARGEFILE 0
>> # else
>> -# define O_LARGEFILE 0100000
>> +# define __O_LARGEFILE 0100000
>> # endif
>> #endif
>
> __O_LARGEFILE should be defined unconditionally.
Yes - and that's how it looks in the current committed code,
Andreas
--
Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)
GPG fingerprint = 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-10-24 18:48 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-21 19:08 [PATCH] ARM: Use <bits/fcntl-linux.h> Andreas Jaeger
2012-10-21 22:53 ` Joseph S. Myers
2012-10-21 22:58 ` Joseph S. Myers
2012-10-22 7:26 ` Fix O_LARGEFILE for Linux/SPARC and s390 (was: Re: [PATCH] ARM: Use <bits/fcntl-linux.h> ) Andreas Jaeger
2012-10-22 14:06 ` Joseph S. Myers
2012-10-22 14:16 ` Andreas Jaeger
[not found] ` <2036625.SeAZvNclbu__45590.3210131966$1350890838$gmane$org@byrd>
2012-10-24 16:56 ` Fix O_LARGEFILE for Linux/SPARC and s390 Andreas Schwab
2012-10-24 18:48 ` Andreas Jaeger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).