This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH 9/9] Tilera (and Linux asm-generic) support for glibc


2011-11-03  Chris Metcalf  <cmetcalf@tilera.com>

  * sysdeps/unix/sysv/linux/fxstat64.c (fxstat64): Don't provide the
  64-bit version of the function if XSTAT_IS_XSTAT64, since in that
  case we are providing an alias from fxstat().
  * sysdeps/unix/sysv/linux/fxstatat64.c (fxstatat64): Likewise.
  * sysdeps/unix/sysv/linux/lstat64.c (lstat64): Likewise.
  * sysdeps/unix/sysv/linux/xstat64.c (xstat64): Likewise.

diff --git a/sysdeps/unix/sysv/linux/fxstat64.c b/sysdeps/unix/sysv/linux/fxstat64.c
index 6bc5601..7ac3d53 100644
--- a/sysdeps/unix/sysv/linux/fxstat64.c
+++ b/sysdeps/unix/sysv/linux/fxstat64.c
@@ -1,5 +1,5 @@
 /* fxstat64 using old-style Unix fstat system call.
-   Copyright (C) 1997-2002, 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1997-2002, 2003, 2006, 2011 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
@@ -28,6 +28,8 @@
 
 #include <kernel-features.h>
 
+#ifndef XSTAT_IS_XSTAT64
+
 #if __ASSUME_STAT64_SYSCALL == 0
 # include <xstatconv.h>
 #endif
@@ -92,3 +94,5 @@ hidden_ver (___fxstat64, __fxstat64)
 strong_alias (___fxstat64, __fxstat64)
 hidden_def (__fxstat64)
 #endif
+
+#endif
diff --git a/sysdeps/unix/sysv/linux/fxstatat64.c b/sysdeps/unix/sysv/linux/fxstatat64.c
index 442e4ca..6400400 100644
--- a/sysdeps/unix/sysv/linux/fxstatat64.c
+++ b/sysdeps/unix/sysv/linux/fxstatat64.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006, 2009, 2011 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
@@ -30,6 +30,8 @@
 
 #include <kernel-features.h>
 
+#ifndef XSTAT_IS_XSTAT64
+
 #if __ASSUME_STAT64_SYSCALL == 0
 # include <xstatconv.h>
 #endif
@@ -171,3 +173,5 @@ __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag)
 #endif
 }
 libc_hidden_def (__fxstatat64)
+
+#endif
diff --git a/sysdeps/unix/sysv/linux/lxstat64.c b/sysdeps/unix/sysv/linux/lxstat64.c
index 7444dfe..0d548ef 100644
--- a/sysdeps/unix/sysv/linux/lxstat64.c
+++ b/sysdeps/unix/sysv/linux/lxstat64.c
@@ -1,5 +1,5 @@
 /* lxstat64 using old-style Unix lstat system call.
-   Copyright (C) 1997-2002,2003,2006 Free Software Foundation, Inc.
+   Copyright (C) 1997-2002,2003,2006,2011 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
@@ -28,6 +28,8 @@
 
 #include <kernel-features.h>
 
+#ifndef XSTAT_IS_XSTAT64
+
 #if __ASSUME_STAT64_SYSCALL == 0
 # include <xstatconv.h>
 #endif
@@ -91,3 +93,5 @@ hidden_ver (___lxstat64, __lxstat64)
 strong_alias (___lxstat64, __lxstat64);
 hidden_def (__lxstat64)
 #endif
+
+#endif
diff --git a/sysdeps/unix/sysv/linux/xstat64.c b/sysdeps/unix/sysv/linux/xstat64.c
index 096aac8..9505913 100644
--- a/sysdeps/unix/sysv/linux/xstat64.c
+++ b/sysdeps/unix/sysv/linux/xstat64.c
@@ -1,5 +1,5 @@
 /* xstat64 using old-style Unix stat system call.
-   Copyright (C) 1991,1995-2002,2003,2006 Free Software Foundation, Inc.
+   Copyright (C) 1991,1995-2002,2003,2006,2011 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
@@ -28,6 +28,8 @@
 
 #include <kernel-features.h>
 
+#ifndef XSTAT_IS_XSTAT64
+
 #if __ASSUME_STAT64_SYSCALL == 0
 # include <xstatconv.h>
 #endif
@@ -95,3 +97,5 @@ hidden_ver (___xstat64, __xstat64)
 strong_alias (___xstat64, __xstat64)
 hidden_def (__xstat64)
 #endif
+
+#endif


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]