Update.
authorUlrich Drepper <drepper@redhat.com>
Sat, 16 Aug 2003 08:10:06 +0000 (08:10 +0000)
committerUlrich Drepper <drepper@redhat.com>
Sat, 16 Aug 2003 08:10:06 +0000 (08:10 +0000)
* sysdeps/unix/sysv/linux/i386/Versions [GLIBC_2.3.3]: Add
posix_fadvise64.
* sysdeps/unix/sysv/linux/i386/Makefile [subdir=io] (subdir_routines):
Add posix_fadvise64_64.

12 files changed:
ChangeLog
io/Versions
io/fcntl.h
sysdeps/unix/sysv/linux/Makefile
sysdeps/unix/sysv/linux/alpha/syscalls.list
sysdeps/unix/sysv/linux/i386/Makefile
sysdeps/unix/sysv/linux/i386/Versions
sysdeps/unix/sysv/linux/i386/posix_fadvise64_64.S
sysdeps/unix/sysv/linux/ia64/syscalls.list
sysdeps/unix/sysv/linux/ia64/sysdep.h
sysdeps/unix/sysv/linux/x86_64/syscalls.list
sysdeps/unix/sysv/linux/x86_64/sysdep.h

index 8450b63c2fd119004e426068be1dfa9e7502e739..f2bc208ec7814047d618155710058f629cb5812b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,10 @@
 2003-08-15  Ulrich Drepper  <drepper@redhat.com>
 
-       * io/Versions [GLIBC_2.3.3]: Add posix_fadvise64.
        * io/fcntl.h (posix_fadvise64): Change type of third parameter to
        off_t.
        * sysdeps/unix/sysv/linux/posix_fadvise.c: Adjust definition.
        * sysdeps/unix/make-syscalls.sh: Recognize V prefix to the parameter
        description indicating the error value is returned, not -1.
-       * sysdeps/unix/sysv/linux/Makefile [subdir=io] (subdir_routines): Add
-       posix_fadvise64_64.
        * sysdeps/unix/sysv/linux/kernel-features.h: Add definition of
        __ASSUME_FADVISE64_64_SYSCALL.
        * sysdeps/unix/sysv/linux/syscalls.list: Don't define madvise and
        value returned.
        Define posix_fadvise64_64 entry.  Add version info to posix_fadvise64
        entry.
-       * sysdeps/unix/sysv/linux/alpha/syscalls.list: Define
-       posix_fadvise64_64 entry.  Add version info to posix_fadvise64 entry.
-       * sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
-       * sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
        * sysdeps/unix/sysv/linux/i386/posix_fadvise.S: New file.
        * sysdeps/unix/sysv/linux/i386/sysdep.h: Define PSEUDO_ERRVAL,
        PSEUDO_END_ERRVAL, and ret_ERRVAL.
        * sysdeps/unix/sysv/linux/ia64/sysdep.h: Likewise.
        * sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise.
+       * sysdeps/unix/sysv/linux/i386/Versions [GLIBC_2.3.3]: Add
+       posix_fadvise64.
 
        * posix/Makefile (routines): Add posix_madvise.
        * sysdeps/generic/madvise.c: Don't define posix_madvise.
        * sysdeps/generic/posix_madvise.c: New file.
        * sysdeps/unix/sysv/aix/posix_madvise.c: New file.
+       * sysdeps/unix/sysv/linux/i386/Makefile [subdir=io] (subdir_routines):
+       Add posix_fadvise64_64.
 
 2003-08-15  Jakub Jelinek  <jakub@redhat.com>
 
index 9e035aecc7514f752bc9ffbc23649b8a9a88cf6c..88f3a9ac04920e7bef01024d280f4b50ed929d4a 100644 (file)
@@ -93,9 +93,6 @@ libc {
     # l*
     lchmod;
   }
-  GLIBC_2.3.3 {
-    posix_fadvise64;
-  }
   GLIBC_PRIVATE {
     # functions which have an additional interface since they are
     # cancelable.
index 77f002b66badece669d1e6bbec5f65338882aa58..97ef27b735dc3062443a8b9a45cac33e27b959ad 100644 (file)
@@ -134,19 +134,19 @@ extern int lockf64 (int __fd, int __cmd, __off64_t __len) __THROW;
 /* Advice the system about the expected behaviour of the application with
    respect to the file associated with FD.  */
 # ifndef __USE_FILE_OFFSET64
-extern int posix_fadvise (int __fd, __off_t __offset, off_t __len,
+extern int posix_fadvise (int __fd, __off_t __offset, __off_t __len,
                          int __advise) __THROW;
 # else
 # ifdef __REDIRECT
 extern int __REDIRECT (posix_fadvise, (int __fd, __off64_t __offset,
-                                      off64_t __len, int __advise) __THROW,
+                                      __off64_t __len, int __advise) __THROW,
                       posix_fadvise64);
 # else
 #  define posix_fadvise posix_fadvise64
 # endif
 # endif
 # ifdef __USE_LARGEFILE64
-extern int posix_fadvise64 (int __fd, __off64_t __offset, off64_t __len,
+extern int posix_fadvise64 (int __fd, __off64_t __offset, __off64_t __len,
                            int __advise) __THROW;
 # endif
 
index 2d98aa58ac35c2213829f6aba9549db1aa09ba8e..f292931fb9124b6a9574f0eba831021b9cf0a51c 100644 (file)
@@ -135,7 +135,7 @@ CFLAGS-ypclnt.c = -DUSE_BINDINGDIR=1
 endif
 
 ifeq ($(subdir),io)
-sysdep_routines += xstatconv posix_fadvise64_64
+sysdep_routines += xstatconv
 endif
 
 ifeq ($(subdir),elf)
index 78feb7a57ab1aba5d3342d03fd169fc1406d5931..60235d012f3beae95cc97e090c2466df565b3187 100644 (file)
@@ -21,8 +21,7 @@ getpriority   -       getpriority     i:ii    __getpriority   getpriority
 mmap           -       mmap            b:aniiii __mmap         mmap __mmap64 mmap64
 llseek         EXTRA   lseek           C:3     __libc_lseek    __lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64
 lseek          llseek  -
-posix_fadvise64        -       fadvise64       4       posix_fadvise64 posix_fadvise@GLIBC_2.2
-posix_fadvise64_64 -   fadvise64       4       posix_fadvise64 posix_fadvise@GLIBC_2.3.3
+posix_fadvise64        -       fadvise64       4       posix_fadvise64 posix_fadvise
 pread          -       pread64         C:4     __libc_pread    __libc_pread64 __pread pread __pread64 pread64
 pwrite         -       pwrite64                C:4     __libc_pwrite   __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
 fstatfs                -       fstatfs         i:ip    __fstatfs       fstatfs __fstatfs64 fstatfs64
index 1ae69407ffe3874e7e87f911cc78e0f839235a6b..6aa5ce30ad1418b103bb40aef45085917ccb3b9a 100644 (file)
@@ -12,3 +12,7 @@ endif
 ifeq ($(subdir),resource)
 sysdep_routines += oldgetrlimit64
 endif
+
+ifeq ($(subdir),io)
+sysdep_routines += posix_fadvise64_64
+endif
index 388fe8312b00e42dd34ecb4d410dd1b628830803..1abb39741c40a87f236fbf7bc88f6923a5cffd60 100644 (file)
@@ -33,6 +33,9 @@ libc {
     # v*
     versionsort64;
   }
+  GLIBC_2.3.3 {
+    posix_fadvise64;
+  }
   GLIBC_PRIVATE {
     __modify_ldt;
   }
index e132c3b9a2f14c462c0f6217b30b0f60e7800f0b..c1ee9b99dd9a3c437b8fe0b69b4b3e0113c02fdf 100644 (file)
@@ -116,3 +116,5 @@ L(overflow):
 #endif
 
 PSEUDO_END_NOERRNO (BP_SYM (__posix_fadvise64_l64))
+
+default_symbol_version (__posix_fadvise64_l64, posix_fadvise64, GLIBC_2.3.3)
index a368226b91795a484f8da294fba24c35c41b3c36..c2027b670ffb7e792caee6b2dbd036d8d3a825e5 100644 (file)
@@ -5,8 +5,7 @@ umount2         -       umount          2       __umount2       umount2
 # Whee! 64-bit systems naturally implement llseek.
 llseek         EXTRA   lseek           C:3     __libc_lseek    __lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64
 lseek          llseek  -
-posix_fadvise64        -       fadvise64       4       posix_fadvise64 posix_fadvise@GLIBC_2.2
-posix_fadvise64_64 -   fadvise64       4       posix_fadvise64 posix_fadvise@GLIBC_2.3.3
+posix_fadvise64        -       fadvise64       4       posix_fadvise64 posix_fadvise
 pread          -       pread           C:4     __libc_pread    __libc_pread64 __pread pread __pread64 pread64
 pwrite         -       pwrite          C:4     __libc_pwrite   __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
 fstatfs                -       fstatfs         i:ip    __fstatfs       fstatfs fstatfs64 __fstatfs64
index 2fc32efd474a9fd35035d20ff6c449f0bf69ecd5..1768bd0e3e533b644aade174feec1a9f5fe4756c 100644 (file)
 
 #define ret                    br.ret.sptk.few b0
 #define ret_NOERRNO            ret
+#define ret_ERRVAL             ret
 
 #else /* not __ASSEMBLER__ */
 
index 063f9ba5df78603ed1a03b708ddee575c5dbd9f8..26f2b072501b4c33e7fdcb20a0582edb055fe7a7 100644 (file)
@@ -4,8 +4,7 @@ arch_prctl      EXTRA   arch_prctl      i:ii    __arch_prctl    arch_prctl
 mmap           -       mmap            b:aniiii __mmap         mmap __mmap64 mmap64
 modify_ldt     EXTRA   modify_ldt      i:ipi   __modify_ldt    modify_ldt
 llseek         EXTRA   lseek           Ci:iii  __libc_lseek64  __llseek llseek __lseek64 lseek64
-posix_fadvise64        -       fadvise64       i:iiii  posix_fadvise64 posix_fadvise@GLIBC_2.2.5
-posix_fadvise64_64 -   fadvise64_64    i:iiii  posix_fadvise64 posix_fadvise@GLIBC_2.3.3
+posix_fadvise64        -       fadvise64       i:iiii  posix_fadvise64 posix_fadvise
 pread          -       pread           Ci:ibni __libc_pread    __libc_pread64 __pread pread __pread64 pread64
 pwrite         -       pwrite          Ci:ibni __libc_pwrite   __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
 fstatfs                -       fstatfs         i:ip    __fstatfs       fstatfs __fstatfs64 fstatfs64
index d92869a32c51e5306e72fb7a51fe32751d8d636f..8ba7d446a8576650d0346da438201085b0f7e7ec 100644 (file)
 #define        PSEUDO_END_NOERRNO(name) \
   END (name)
 
+#define ret_NOERRNO ret
+
 #undef PSEUDO_ERRVAL
 #define        PSEUDO_ERRVAL(name, syscall_name, args) \
   .text;                                                                     \
   ENTRY (name)                                                               \
     DO_CALL (syscall_name, args);                                            \
-    negl %rax
+    negq %rax
 
 #undef PSEUDO_END_ERRVAL
 #define        PSEUDO_END_ERRVAL(name) \
   END (name)
 
-#define ret_NOERRNO ret
+#define ret_ERRVAL ret
 
 #ifndef PIC
 #define SYSCALL_ERROR_HANDLER  /* Nothing here; code in sysdep.S is used.  */