[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r20020 - in /fsf/trunk/libc: ./ bits/ dirent/ io/ libio/ ports/ ports/sysdeps/unix/sysv/linux/alpha/bits/ ports/sysdeps/unix...
- To: commits@xxxxxxxxxx
- Subject: [Commits] r20020 - in /fsf/trunk/libc: ./ bits/ dirent/ io/ libio/ ports/ ports/sysdeps/unix/sysv/linux/alpha/bits/ ports/sysdeps/unix...
- From: eglibc@xxxxxxxxxx
- Date: Tue, 07 Aug 2012 00:01:42 -0000
Author: eglibc
Date: Tue Aug 7 00:01:41 2012
New Revision: 20020
Log:
Import glibc-mainline for 2012-08-07
Removed:
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/alphasort.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/alphasort64.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/fseeko.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/fseeko64.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/ftello.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/ftello64.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos64.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofopen.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofopen64.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos64.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/lockf.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/lockf64.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandir.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandir64.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandirat.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandirat64.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/versionsort.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/versionsort64.c
fsf/trunk/libc/sysdeps/wordsize-64/alphasort.c
fsf/trunk/libc/sysdeps/wordsize-64/alphasort64.c
fsf/trunk/libc/sysdeps/wordsize-64/fseeko.c
fsf/trunk/libc/sysdeps/wordsize-64/fseeko64.c
fsf/trunk/libc/sysdeps/wordsize-64/ftello.c
fsf/trunk/libc/sysdeps/wordsize-64/ftello64.c
fsf/trunk/libc/sysdeps/wordsize-64/iofgetpos.c
fsf/trunk/libc/sysdeps/wordsize-64/iofgetpos64.c
fsf/trunk/libc/sysdeps/wordsize-64/iofsetpos.c
fsf/trunk/libc/sysdeps/wordsize-64/iofsetpos64.c
fsf/trunk/libc/sysdeps/wordsize-64/lockf.c
fsf/trunk/libc/sysdeps/wordsize-64/lockf64.c
fsf/trunk/libc/sysdeps/wordsize-64/scandir.c
fsf/trunk/libc/sysdeps/wordsize-64/scandir64.c
fsf/trunk/libc/sysdeps/wordsize-64/scandirat.c
fsf/trunk/libc/sysdeps/wordsize-64/scandirat64.c
fsf/trunk/libc/sysdeps/wordsize-64/versionsort.c
fsf/trunk/libc/sysdeps/wordsize-64/versionsort64.c
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/bits/dirent.h
fsf/trunk/libc/bits/typesizes.h
fsf/trunk/libc/dirent/alphasort.c
fsf/trunk/libc/dirent/alphasort64.c
fsf/trunk/libc/dirent/scandir.c
fsf/trunk/libc/dirent/scandir64.c
fsf/trunk/libc/dirent/scandirat.c
fsf/trunk/libc/dirent/scandirat64.c
fsf/trunk/libc/dirent/versionsort.c
fsf/trunk/libc/dirent/versionsort64.c
fsf/trunk/libc/io/lockf.c
fsf/trunk/libc/io/lockf64.c
fsf/trunk/libc/libio/fseeko.c
fsf/trunk/libc/libio/fseeko64.c
fsf/trunk/libc/libio/ftello.c
fsf/trunk/libc/libio/ftello64.c
fsf/trunk/libc/libio/iofgetpos.c
fsf/trunk/libc/libio/iofgetpos64.c
fsf/trunk/libc/libio/iofsetpos.c
fsf/trunk/libc/libio/iofsetpos64.c
fsf/trunk/libc/ports/ChangeLog.alpha
fsf/trunk/libc/ports/ChangeLog.linux-generic
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/dirent.h
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
fsf/trunk/libc/stdlib/secure-getenv.c
fsf/trunk/libc/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/dirent.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86/bits/typesizes.h
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Aug 7 00:01:41 2012
@@ -1,3 +1,106 @@
+2012-08-06 Roland McGrath <roland@xxxxxxxxxxxxx>
+
+ * dirent/alphasort.c [_DIRENT_MATCHES_DIRENT64]:
+ Define alphasort64 as an alias.
+ * dirent/versionsort.c [_DIRENT_MATCHES_DIRENT64]:
+ Define versionsort64 as an alias.
+ * dirent/scandir.c [_DIRENT_MATCHES_DIRENT64]:
+ Define scandir64 as an alias.
+ * dirent/scandirat.c [_DIRENT_MATCHES_DIRENT64]:
+ Define scandirat64 as an alias.
+ * dirent/alphasort64.c (alphasort64):
+ Conditionalize on [!_DIRENT_MATCHES_DIRENT64].
+ * dirent/versionsort64.c: Likewise.
+ * dirent/scandir64.c: Likewise.
+ * dirent/scandirat64.c: Likewise.
+ * sysdeps/wordsize-64/alphasort.c: File removed.
+ * sysdeps/wordsize-64/alphasort64.c: File removed.
+ * sysdeps/wordsize-64/scandir.c: File removed.
+ * sysdeps/wordsize-64/scandir64.c: File removed.
+ * sysdeps/wordsize-64/scandirat.c: File removed.
+ * sysdeps/wordsize-64/scandirat64.c: File removed.
+ * sysdeps/wordsize-64/versionsort.c: File removed.
+ * sysdeps/wordsize-64/versionsort64.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/alphasort.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/alphasort64.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/scandir.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/scandir64.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/scandirat.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/scandirat64.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/versionsort.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/versionsort64.c: File removed.
+
+ * bits/typesizes.h [__LP64__] (__INO_T_MATCHES_INO64_T): New macros.
+ * sysdeps/unix/sysv/linux/s390/bits/typesizes.h:
+ [__s390x__] (__INO_T_MATCHES_INO64_T): New macro.
+ * sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
+ [defined __arch64__ || defined __sparcv9]
+ (__INO_T_MATCHES_INO64_T): New macro.
+ * sysdeps/unix/sysv/linux/x86/bits/typesizes.h
+ [__x86_64__] (__INO_T_MATCHES_INO64_T): New macro.
+ * bits/dirent.h (_DIRENT_MATCHES_DIRENT64): New macro.
+ * sysdeps/unix/sysv/linux/bits/dirent.h
+ [defined __OFF_T_MATCHES_OFF64_T && defined __INO_T_MATCHES_INO64_T]
+ (_DIRENT_MATCHES_DIRENT64): New macro.
+
+ * io/lockf.c [__OFF_T_MATCHES_OFF64_T]:
+ Define lockf64 as an alias.
+ * libio/fseeko.c [__OFF_T_MATCHES_OFF64_T]:
+ Define fseeko64 as an alias.
+ * libio/ftello.c [__OFF_T_MATCHES_OFF64_T]:
+ Define ftello64 as an alias.
+ * libio/iofgetpos.c [__OFF_T_MATCHES_OFF64_T]:
+ Define _IO_fgetpos64 and fgetpos64 as aliases.
+ * libio/iofsetpos.c [__OFF_T_MATCHES_OFF64_T]:
+ Define _IO_fsetpos64 and fsetpos64 as aliases.
+ * io/lockf64.c [!__OFF_T_MATCHES_OFF64_T]:
+ Conditionalize body on this.
+ * libio/fseeko64.c: Likewise.
+ * libio/ftello64.c: Likewise.
+ * libio/iofgetpos64.c: Likewise.
+ * libio/iofsetpos64.c: Likewise.
+ * sysdeps/wordsize-64/lockf.c: File removed.
+ * sysdeps/wordsize-64/lockf64.c: File removed.
+ * sysdeps/wordsize-64/fseeko.c: File removed.
+ * sysdeps/wordsize-64/fseeko64.c: File removed.
+ * sysdeps/wordsize-64/ftello.c: File removed.
+ * sysdeps/wordsize-64/ftello64.c: File removed.
+ * sysdeps/wordsize-64/iofgetpos.c: File removed.
+ * sysdeps/wordsize-64/iofgetpos64.c: File removed.
+ * sysdeps/wordsize-64/iofsetpos.c: File removed.
+ * sysdeps/wordsize-64/iofsetpos64.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/lockf.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/lockf64.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/fseeko.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/fseeko64.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/ftello.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/ftello64.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos64.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos64.c: File removed.
+
+ * bits/typesizes.h [__LP64__] (__OFF_T_MATCHES_OFF64_T): New macro.
+ * sysdeps/unix/sysv/linux/s390/bits/typesizes.h:
+ [__s390x__] (__OFF_T_MATCHES_OFF64_T): New macro.
+ * sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
+ [defined __arch64__ || defined __sparcv9]
+ (__OFF_T_MATCHES_OFF64_T): New macro.
+ * sysdeps/unix/sysv/linux/x86/bits/typesizes.h
+ [__x86_64__] (__OFF_T_MATCHES_OFF64_T): New macro.
+ * sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h
+ (__OFF_T_MATCHES_OFF64_T): New macro.
+
+2012-08-06 H.J. Lu <hongjiu.lu@xxxxxxxxx>
+
+ * stdlib/secure-getenv.c (__secure_getenv): Replace
+ GLIBC_2_16 with GLIBC_2_17.
+
+2012-08-06 H.J. Lu <hongjiu.lu@xxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/x86_64/x32/iofopen.c: Removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/iofopen64.c: Likewise.
+
2012-08-03 David S. Miller <davem@xxxxxxxxxxxxx>
* sysdeps/sparc/fpu/libm-test-ulps: Update.
Modified: fsf/trunk/libc/bits/dirent.h
==============================================================================
--- fsf/trunk/libc/bits/dirent.h (original)
+++ fsf/trunk/libc/bits/dirent.h Tue Aug 7 00:01:41 2012
@@ -1,5 +1,5 @@
/* Directory entry structure `struct dirent'. Stub version.
- Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1996-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
@@ -33,3 +33,6 @@
int d_fileno;
};
#endif
+
+/* Inform libc code that these two types are identical. */
+#define _DIRENT_MATCHES_DIRENT64 1
Modified: fsf/trunk/libc/bits/typesizes.h
==============================================================================
--- fsf/trunk/libc/bits/typesizes.h (original)
+++ fsf/trunk/libc/bits/typesizes.h Tue Aug 7 00:01:41 2012
@@ -61,6 +61,16 @@
#define __SYSCALL_SLONG_TYPE __SLONGWORD_TYPE
#define __SYSCALL_ULONG_TYPE __ULONGWORD_TYPE
+#ifdef __LP64__
+/* Tell the libc code that off_t and off64_t are actually the same type
+ for all ABI purposes, even if possibly expressed as different base types
+ for C type-checking purposes. */
+# define __OFF_T_MATCHES_OFF64_T 1
+
+/* Same for ino_t and ino64_t. */
+# define __INO_T_MATCHES_INO64_T 1
+#endif
+
/* Number of descriptors that can fit in an `fd_set'. */
#define __FD_SETSIZE 1024
Modified: fsf/trunk/libc/dirent/alphasort.c
==============================================================================
--- fsf/trunk/libc/dirent/alphasort.c (original)
+++ fsf/trunk/libc/dirent/alphasort.c Tue Aug 7 00:01:41 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1997, 1998, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1992-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
@@ -15,7 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+/* We need to avoid the header declaration of alphasort64, because
+ the types don't match alphasort and then the compiler will
+ complain about the mismatch when we do the alias below. */
+#define alphasort64 __renamed_alphasort64
+
#include <dirent.h>
+
+#undef alphasort64
+
#include <string.h>
int
@@ -23,3 +31,7 @@
{
return strcoll ((*a)->d_name, (*b)->d_name);
}
+
+#ifdef _DIRENT_MATCHES_DIRENT64
+weak_alias (alphasort, alphasort64)
+#endif
Modified: fsf/trunk/libc/dirent/alphasort64.c
==============================================================================
--- fsf/trunk/libc/dirent/alphasort64.c (original)
+++ fsf/trunk/libc/dirent/alphasort64.c Tue Aug 7 00:01:41 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1997, 1998, 2000, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1992-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
@@ -18,8 +18,13 @@
#include <dirent.h>
#include <string.h>
+/* alphasort.c defines alphasort64 as an alias if _DIRENT_MATCHES_DIRENT64. */
+#ifndef _DIRENT_MATCHES_DIRENT64
+
int
alphasort64 (const struct dirent64 **a, const struct dirent64 **b)
{
return strcoll ((*a)->d_name, (*b)->d_name);
}
+
+#endif
Modified: fsf/trunk/libc/dirent/scandir.c
==============================================================================
--- fsf/trunk/libc/dirent/scandir.c (original)
+++ fsf/trunk/libc/dirent/scandir.c Tue Aug 7 00:01:41 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1992-1998,2000,2002,2003,2009,2011
- Free Software Foundation, Inc.
+/* Copyright (C) 1992-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
@@ -16,7 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+/* We need to avoid the header declaration of scandir64, because
+ the types don't match scandir and then the compiler will
+ complain about the mismatch when we do the alias below. */
+#define scandir64 __renamed_scandir64
+
#include <dirent.h>
+
+#undef scandir64
+
#include <fcntl.h>
#ifndef SCANDIR
@@ -35,3 +42,7 @@
{
return SCANDIRAT (AT_FDCWD, dir, namelist, select, cmp);
}
+
+#ifdef _DIRENT_MATCHES_DIRENT64
+weak_alias (scandir, scandir64)
+#endif
Modified: fsf/trunk/libc/dirent/scandir64.c
==============================================================================
--- fsf/trunk/libc/dirent/scandir64.c (original)
+++ fsf/trunk/libc/dirent/scandir64.c Tue Aug 7 00:01:41 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2000-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
@@ -17,8 +17,13 @@
#include <dirent.h>
+/* scandir.c defines scandir64 as an alias if _DIRENT_MATCHES_DIRENT64. */
+#ifndef _DIRENT_MATCHES_DIRENT64
+
#define SCANDIR scandir64
#define SCANDIRAT scandirat64
#define DIRENT_TYPE struct dirent64
#include <dirent/scandir.c>
+
+#endif
Modified: fsf/trunk/libc/dirent/scandirat.c
==============================================================================
--- fsf/trunk/libc/dirent/scandirat.c (original)
+++ fsf/trunk/libc/dirent/scandirat.c Tue Aug 7 00:01:41 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1992-1998,2000,2002,2003,2009,2011
- Free Software Foundation, Inc.
+/* Copyright (C) 1992-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
@@ -16,7 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+/* We need to avoid the header declaration of scandir64, because
+ the types don't match scandir and then the compiler will
+ complain about the mismatch when we do the alias below. */
+#define scandirat64 __renamed_scandirat64
+
#include <dirent.h>
+
+#undef scandirat64
+
#include <stdlib.h>
#include <string.h>
#include <errno.h>
@@ -141,3 +148,7 @@
return c.cnt;
}
libc_hidden_def (SCANDIRAT)
+
+#ifdef _DIRENT_MATCHES_DIRENT64
+weak_alias (scandirat, scandirat64)
+#endif
Modified: fsf/trunk/libc/dirent/scandirat64.c
==============================================================================
--- fsf/trunk/libc/dirent/scandirat64.c (original)
+++ fsf/trunk/libc/dirent/scandirat64.c Tue Aug 7 00:01:41 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2000-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
@@ -17,9 +17,14 @@
#include <dirent.h>
+/* scandirat.c defines scandirat64 as an alias if _DIRENT_MATCHES_DIRENT64. */
+#ifndef _DIRENT_MATCHES_DIRENT64
+
#define SCANDIRAT scandirat64
#define READDIR __readdir64
#define DIRENT_TYPE struct dirent64
#define SKIP_SCANDIR_CANCEL 1
#include "scandirat.c"
+
+#endif
Modified: fsf/trunk/libc/dirent/versionsort.c
==============================================================================
--- fsf/trunk/libc/dirent/versionsort.c (original)
+++ fsf/trunk/libc/dirent/versionsort.c Tue Aug 7 00:01:41 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1997, 1998, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1992-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
@@ -15,7 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+/* We need to avoid the header declaration of versionsort64, because
+ the types don't match versionsort and then the compiler will
+ complain about the mismatch when we do the alias below. */
+#define versionsort64 __renamed_versionsort64
+
#include <dirent.h>
+
+#undef versionsort64
+
#include <string.h>
int
@@ -23,3 +31,7 @@
{
return __strverscmp ((*a)->d_name, (*b)->d_name);
}
+
+#ifdef _DIRENT_MATCHES_DIRENT64
+weak_alias (versionsort, versionsort64)
+#endif
Modified: fsf/trunk/libc/dirent/versionsort64.c
==============================================================================
--- fsf/trunk/libc/dirent/versionsort64.c (original)
+++ fsf/trunk/libc/dirent/versionsort64.c Tue Aug 7 00:01:41 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1997, 1998, 2000, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1992-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
@@ -18,8 +18,13 @@
#include <dirent.h>
#include <string.h>
+/* versionsort.c defines a versionsort64 alias if _DIRENT_MATCHES_DIRENT64. */
+#ifndef _DIRENT_MATCHES_DIRENT64
+
int
versionsort64 (const struct dirent64 **a, const struct dirent64 **b)
{
return __strverscmp ((*a)->d_name, (*b)->d_name);
}
+
+#endif
Modified: fsf/trunk/libc/io/lockf.c
==============================================================================
--- fsf/trunk/libc/io/lockf.c (original)
+++ fsf/trunk/libc/io/lockf.c Tue Aug 7 00:01:41 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1994-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
@@ -15,9 +15,17 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+/* We need to avoid the header declaration of lockf64, because
+ the types don't match lockf and then the compiler will
+ complain about the mismatch when we do the alias below. */
+#define lockf64 __renamed_lockf64
+
+#include <fcntl.h>
+
+#undef lockf64
+
#include <sys/types.h>
#include <unistd.h>
-#include <fcntl.h>
#include <errno.h>
#include <string.h>
@@ -71,3 +79,7 @@
the fcntl() function will take care of it. */
return __fcntl (fd, cmd, &fl);
}
+
+#ifdef __OFF_T_MATCHES_OFF64_T
+weak_alias (lockf, lockf64)
+#endif
Modified: fsf/trunk/libc/io/lockf64.c
==============================================================================
--- fsf/trunk/libc/io/lockf64.c (original)
+++ fsf/trunk/libc/io/lockf64.c Tue Aug 7 00:01:41 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994,96,97,98,99,2000 Free Software Foundation, Inc.
+/* Copyright (C) 1994-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
@@ -20,6 +20,9 @@
#include <fcntl.h>
#include <errno.h>
#include <string.h>
+
+/* lockf.c defines lockf64 as an lias if __OFF_T_MATCHES_OFF64_T. */
+#ifndef __OFF_T_MATCHES_OFF64_T
/* lockf is a simplified interface to fcntl's locking facilities. */
@@ -76,3 +79,5 @@
return __fcntl (fd, cmd, &fl);
}
+
+#endif
Modified: fsf/trunk/libc/libio/fseeko.c
==============================================================================
--- fsf/trunk/libc/libio/fseeko.c (original)
+++ fsf/trunk/libc/libio/fseeko.c Tue Aug 7 00:01:41 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1995,1996,1997,1998,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1993-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
@@ -40,3 +40,7 @@
_IO_release_lock (fp);
return result;
}
+
+#ifdef __OFF_T_MATCHES_OFF64_T
+weak_alias (fseeko, fseeko64)
+#endif
Modified: fsf/trunk/libc/libio/fseeko64.c
==============================================================================
--- fsf/trunk/libc/libio/fseeko64.c (original)
+++ fsf/trunk/libc/libio/fseeko64.c Tue Aug 7 00:01:41 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1995,1996,1997,1998,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1993-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
@@ -28,6 +28,9 @@
#include "libioP.h"
#include "stdio.h"
+/* fseeko.c defines this as an alias if __OFF_T_MATCHES_OFF64_T. */
+#ifndef __OFF_T_MATCHES_OFF64_T
+
int
fseeko64 (fp, offset, whence)
_IO_FILE* fp;
@@ -46,3 +49,5 @@
return -1;
#endif
}
+
+#endif
Modified: fsf/trunk/libc/libio/ftello.c
==============================================================================
--- fsf/trunk/libc/libio/ftello.c (original)
+++ fsf/trunk/libc/libio/ftello.c Tue Aug 7 00:01:41 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995-2001, 2002, 2003, 2004, 2007
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-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
@@ -63,3 +62,7 @@
return pos;
}
libc_hidden_def (ftello)
+
+#ifdef __OFF_T_MATCHES_OFF64_T
+weak_alias (ftello, ftello64)
+#endif
Modified: fsf/trunk/libc/libio/ftello64.c
==============================================================================
--- fsf/trunk/libc/libio/ftello64.c (original)
+++ fsf/trunk/libc/libio/ftello64.c Tue Aug 7 00:01:41 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995-2001, 2002, 2003, 2004
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-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
@@ -30,6 +29,7 @@
#include <libioP.h>
#include <errno.h>
+#ifndef __OFF_T_MATCHES_OFF64_T
off64_t
ftello64 (fp)
@@ -60,3 +60,5 @@
return -1;
#endif
}
+
+#endif
Modified: fsf/trunk/libc/libio/iofgetpos.c
==============================================================================
--- fsf/trunk/libc/libio/iofgetpos.c (original)
+++ fsf/trunk/libc/libio/iofgetpos.c Tue Aug 7 00:01:41 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995-2001, 2002, 2003, 2004
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-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
@@ -25,7 +24,17 @@
This exception applies to code released by its copyright holders
in files containing the exception. */
+/* We need to avoid the header declarations of these, because
+ the types don't match _IO_fgetpos and then the compiler will
+ complain about the mismatch when we do the alias below. */
+#define _IO_new_fgetpos64 __renamed__IO_new_fgetpos64
+#define _IO_fgetpos64 __renamed__IO_fgetpos64
+
#include "libioP.h"
+
+#undef _IO_new_fgetpos64
+#undef _IO_fgetpos64
+
#include <errno.h>
#include <stdlib.h>
#include <shlib-compat.h>
@@ -78,3 +87,10 @@
strong_alias (_IO_new_fgetpos, __new_fgetpos)
versioned_symbol (libc, _IO_new_fgetpos, _IO_fgetpos, GLIBC_2_2);
versioned_symbol (libc, __new_fgetpos, fgetpos, GLIBC_2_2);
+
+#ifdef __OFF_T_MATCHES_OFF64_T
+strong_alias (_IO_new_fgetpos, _IO_new_fgetpos64)
+strong_alias (_IO_new_fgetpos64, __new_fgetpos64)
+versioned_symbol (libc, _IO_new_fgetpos64, _IO_fgetpos64, GLIBC_2_2);
+versioned_symbol (libc, __new_fgetpos64, fgetpos64, GLIBC_2_2);
+#endif
Modified: fsf/trunk/libc/libio/iofgetpos64.c
==============================================================================
--- fsf/trunk/libc/libio/iofgetpos64.c (original)
+++ fsf/trunk/libc/libio/iofgetpos64.c Tue Aug 7 00:01:41 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995-2001, 2002, 2003, 2004
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-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
@@ -29,6 +28,7 @@
#include <errno.h>
#include <shlib-compat.h>
+#ifndef __OFF_T_MATCHES_OFF64_T
int
_IO_new_fgetpos64 (fp, posp)
@@ -75,3 +75,5 @@
strong_alias (_IO_new_fgetpos64, __new_fgetpos64)
versioned_symbol (libc, _IO_new_fgetpos64, _IO_fgetpos64, GLIBC_2_2);
versioned_symbol (libc, __new_fgetpos64, fgetpos64, GLIBC_2_2);
+
+#endif
Modified: fsf/trunk/libc/libio/iofsetpos.c
==============================================================================
--- fsf/trunk/libc/libio/iofsetpos.c (original)
+++ fsf/trunk/libc/libio/iofsetpos.c Tue Aug 7 00:01:41 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997, 1998, 1999, 2000, 2002, 2003
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-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
@@ -25,7 +24,17 @@
This exception applies to code released by its copyright holders
in files containing the exception. */
+/* We need to avoid the header declarations of these, because
+ the types don't match _IO_fsetpos and then the compiler will
+ complain about the mismatch when we do the alias below. */
+#define _IO_new_fsetpos64 __renamed__IO_new_fsetpos64
+#define _IO_fsetpos64 __renamed__IO_fsetpos64
+
#include <libioP.h>
+
+#undef _IO_new_fsetpos64
+#undef _IO_fsetpos64
+
#include <errno.h>
#include <shlib-compat.h>
@@ -63,3 +72,10 @@
strong_alias (_IO_new_fsetpos, __new_fsetpos)
versioned_symbol (libc, _IO_new_fsetpos, _IO_fsetpos, GLIBC_2_2);
versioned_symbol (libc, __new_fsetpos, fsetpos, GLIBC_2_2);
+
+#ifdef __OFF_T_MATCHES_OFF64_T
+strong_alias (_IO_new_fsetpos, _IO_new_fsetpos64)
+strong_alias (_IO_new_fsetpos64, __new_fsetpos64)
+versioned_symbol (libc, __new_fsetpos64, fsetpos64, GLIBC_2_2);
+versioned_symbol (libc, _IO_new_fsetpos64, _IO_fsetpos64, GLIBC_2_2);
+#endif
Modified: fsf/trunk/libc/libio/iofsetpos64.c
==============================================================================
--- fsf/trunk/libc/libio/iofsetpos64.c (original)
+++ fsf/trunk/libc/libio/iofsetpos64.c Tue Aug 7 00:01:41 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997, 1998, 1999, 2000, 2002, 2003
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-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
@@ -28,6 +27,8 @@
#include <libioP.h>
#include <errno.h>
#include <shlib-compat.h>
+
+#ifndef __OFF_T_MATCHES_OFF64_T
int
_IO_new_fsetpos64 (fp, posp)
@@ -68,3 +69,5 @@
strong_alias (_IO_new_fsetpos64, __new_fsetpos64)
versioned_symbol (libc, __new_fsetpos64, fsetpos64, GLIBC_2_2);
versioned_symbol (libc, _IO_new_fsetpos64, _IO_fsetpos64, GLIBC_2_2);
+
+#endif
Modified: fsf/trunk/libc/ports/ChangeLog.alpha
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.alpha (original)
+++ fsf/trunk/libc/ports/ChangeLog.alpha Tue Aug 7 00:01:41 2012
@@ -1,3 +1,13 @@
+2012-08-02 Roland McGrath <roland@xxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/alpha/bits/dirent.h
+ (_DIRENT_MATCHES_DIRENT64): New macro.
+
+2012-08-02 Roland McGrath <roland@xxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/alpha/bits/typesizes.h
+ (__OFF_T_MATCHES_OFF64_T): New macro.
+
2012-08-03 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* sysdeps/unix/sysv/linux/alpha/configure.in
Modified: fsf/trunk/libc/ports/ChangeLog.linux-generic
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.linux-generic (original)
+++ fsf/trunk/libc/ports/ChangeLog.linux-generic Tue Aug 7 00:01:41 2012
@@ -1,3 +1,8 @@
+2012-08-02 Roland McGrath <roland@xxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/generic/bits/typesizes.h
+ [__LP64__] (__OFF_T_MATCHES_OFF64_T): New macro.
+
2012-05-30 Chris Metcalf <cmetcalf@xxxxxxxxxx>
* sysdeps/unix/sysv/linux/generic/syscalls.list: Remove
Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/dirent.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/dirent.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/dirent.h Tue Aug 7 00:01:41 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996-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
@@ -51,4 +51,7 @@
#define _DIRENT_HAVE_D_OFF
#define _DIRENT_HAVE_D_TYPE
+/* Inform libc code that these two types are effectively identical. */
+#define _DIRENT_MATCHES_DIRENT64 1
+
#endif /* bits/dirent.h */
Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/typesizes.h Tue Aug 7 00:01:41 2012
@@ -1,5 +1,5 @@
/* bits/typesizes.h -- underlying types for *_t. Linux/Alpha version.
- Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 2002-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
@@ -61,6 +61,10 @@
#define __SYSCALL_ULONG_TYPE __ULONGWORD_TYPE
#define __FSWORD_T_TYPE __S32_TYPE
+/* Tell the libc code that off_t and off64_t are actually the same type
+ for all ABI purposes, even if possibly expressed as different base types
+ for C type-checking purposes. */
+#define __OFF_T_MATCHES_OFF64_T 1
/* Number of descriptors that can fit in an `fd_set'. */
#define __FD_SETSIZE 1024
Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h Tue Aug 7 00:01:41 2012
@@ -62,6 +62,16 @@
#define __SYSCALL_SLONG_TYPE __SLONGWORD_TYPE
#define __SYSCALL_ULONG_TYPE __ULONGWORD_TYPE
+#ifdef __LP64__
+/* Tell the libc code that off_t and off64_t are actually the same type
+ for all ABI purposes, even if possibly expressed as different base types
+ for C type-checking purposes. */
+# define __OFF_T_MATCHES_OFF64_T 1
+
+/* Same for ino_t and ino64_t. */
+# define __INO_T_MATCHES_INO64_T 1
+#endif
+
/* Number of descriptors that can fit in an `fd_set'. */
#define __FD_SETSIZE 1024
Modified: fsf/trunk/libc/stdlib/secure-getenv.c
==============================================================================
--- fsf/trunk/libc/stdlib/secure-getenv.c (original)
+++ fsf/trunk/libc/stdlib/secure-getenv.c Tue Aug 7 00:01:41 2012
@@ -32,6 +32,6 @@
weak_alias (__libc_secure_getenv, secure_getenv)
libc_hidden_weak (__libc_secure_getenv)
-#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_16)
+#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_17)
compat_symbol (libc, __libc_secure_getenv, __secure_getenv, GLIBC_2_0);
#endif
Modified: fsf/trunk/libc/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h (original)
+++ fsf/trunk/libc/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h Tue Aug 7 00:01:41 2012
@@ -61,6 +61,11 @@
#define __SYSCALL_SLONG_TYPE __SLONGWORD_TYPE
#define __SYSCALL_ULONG_TYPE __ULONGWORD_TYPE
+
+/* Tell the libc code that off_t and off64_t are actually the same type. */
+#define __OFF_T_MATCHES_OFF64_T 1
+
+
/* Number of descriptors that can fit in an `fd_set'. */
#define __FD_SETSIZE 1024
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/dirent.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/dirent.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/dirent.h Tue Aug 7 00:01:41 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996-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
@@ -50,3 +50,8 @@
#define _DIRENT_HAVE_D_RECLEN
#define _DIRENT_HAVE_D_OFF
#define _DIRENT_HAVE_D_TYPE
+
+#if defined __OFF_T_MATCHES_OFF64_T && defined __INO_T_MATCHES_INO64_T
+/* Inform libc code that these two types are effectively identical. */
+# define _DIRENT_MATCHES_DIRENT64 1
+#endif
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/bits/typesizes.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/bits/typesizes.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/bits/typesizes.h Tue Aug 7 00:01:41 2012
@@ -67,6 +67,16 @@
#define __SYSCALL_SLONG_TYPE __SLONGWORD_TYPE
#define __SYSCALL_ULONG_TYPE __ULONGWORD_TYPE
+#ifdef __s390x__
+/* Tell the libc code that off_t and off64_t are actually the same type
+ for all ABI purposes, even if possibly expressed as different base types
+ for C type-checking purposes. */
+# define __OFF_T_MATCHES_OFF64_T 1
+
+/* Same for ino_t and ino64_t. */
+# define __INO_T_MATCHES_INO64_T 1
+#endif
+
/* Number of descriptors that can fit in an `fd_set'. */
#define __FD_SETSIZE 1024
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h Tue Aug 7 00:01:41 2012
@@ -61,6 +61,16 @@
#define __SYSCALL_SLONG_TYPE __SLONGWORD_TYPE
#define __SYSCALL_ULONG_TYPE __ULONGWORD_TYPE
+#if defined __arch64__ || defined __sparcv9
+/* Tell the libc code that off_t and off64_t are actually the same type
+ for all ABI purposes, even if possibly expressed as different base types
+ for C type-checking purposes. */
+# define __OFF_T_MATCHES_OFF64_T 1
+
+/* Same for ino_t and ino64_t. */
+# define __INO_T_MATCHES_INO64_T 1
+#endif
+
/* Number of descriptors that can fit in an `fd_set'. */
#define __FD_SETSIZE 1024
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86/bits/typesizes.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86/bits/typesizes.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86/bits/typesizes.h Tue Aug 7 00:01:41 2012
@@ -73,6 +73,16 @@
#define __FSID_T_TYPE struct { int __val[2]; }
#define __SSIZE_T_TYPE __SWORD_TYPE
+#ifdef __x86_64__
+/* Tell the libc code that off_t and off64_t are actually the same type
+ for all ABI purposes, even if possibly expressed as different base types
+ for C type-checking purposes. */
+# define __OFF_T_MATCHES_OFF64_T 1
+
+/* Same for ino_t and ino64_t. */
+# define __INO_T_MATCHES_INO64_T 1
+#endif
+
/* Number of descriptors that can fit in an `fd_set'. */
#define __FD_SETSIZE 1024
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/alphasort.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/alphasort.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/alphasort.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/alphasort.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/alphasort64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/alphasort64.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/alphasort64.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/alphasort64.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/fseeko.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/fseeko.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/fseeko.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/fseeko.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/fseeko64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/fseeko64.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/fseeko64.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/fseeko64.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/ftello.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/ftello.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/ftello.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/ftello.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/ftello64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/ftello64.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/ftello64.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/ftello64.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/iofgetpos.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos64.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos64.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/iofgetpos64.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofopen.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofopen.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofopen.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/iofopen.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofopen64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofopen64.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofopen64.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/iofopen64.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/iofsetpos.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos64.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos64.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/iofsetpos64.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/lockf.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/lockf.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/lockf.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/lockf.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/lockf64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/lockf64.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/lockf64.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/lockf64.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandir.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandir.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandir.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/scandir.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandir64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandir64.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandir64.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/scandir64.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandirat.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandirat.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandirat.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/scandirat.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandirat64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandirat64.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/scandirat64.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/scandirat64.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/versionsort.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/versionsort.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/versionsort.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/versionsort.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/versionsort64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/versionsort64.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/versionsort64.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/versionsort64.c>
Removed: fsf/trunk/libc/sysdeps/wordsize-64/alphasort.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/alphasort.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/alphasort.c (removed)
@@ -1,7 +1,0 @@
-#define alphasort64 rename_alphasort64
-
-#include "../../dirent/alphasort.c"
-
-#undef alphasort64
-
-weak_alias (alphasort, alphasort64)
Removed: fsf/trunk/libc/sysdeps/wordsize-64/alphasort64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/alphasort64.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/alphasort64.c (removed)
@@ -1,1 +1,0 @@
-/* Defined in alphasort.c. */
Removed: fsf/trunk/libc/sysdeps/wordsize-64/fseeko.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/fseeko.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/fseeko.c (removed)
@@ -1,3 +1,0 @@
-#include "../../libio/fseeko.c"
-
-weak_alias (fseeko, fseeko64)
Removed: fsf/trunk/libc/sysdeps/wordsize-64/fseeko64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/fseeko64.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/fseeko64.c (removed)
@@ -1,1 +1,0 @@
-/* Defined in fseeko.c. */
Removed: fsf/trunk/libc/sysdeps/wordsize-64/ftello.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/ftello.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/ftello.c (removed)
@@ -1,3 +1,0 @@
-#include "../../libio/ftello.c"
-
-weak_alias (ftello, ftello64)
Removed: fsf/trunk/libc/sysdeps/wordsize-64/ftello64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/ftello64.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/ftello64.c (removed)
@@ -1,1 +1,0 @@
-/* Defined in ftello.c. */
Removed: fsf/trunk/libc/sysdeps/wordsize-64/iofgetpos.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/iofgetpos.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/iofgetpos.c (removed)
@@ -1,12 +1,0 @@
-#define _IO_new_fgetpos64 __renamed__IO_new_fgetpos64
-#define _IO_fgetpos64 __renamed__IO_fgetpos64
-
-#include "../../libio/iofgetpos.c"
-
-#undef _IO_new_fgetpos64
-#undef _IO_fgetpos64
-
-strong_alias (_IO_new_fgetpos, _IO_new_fgetpos64)
-strong_alias (_IO_new_fgetpos64, __new_fgetpos64)
-versioned_symbol (libc, _IO_new_fgetpos64, _IO_fgetpos64, GLIBC_2_2);
-versioned_symbol (libc, __new_fgetpos64, fgetpos64, GLIBC_2_2);
Removed: fsf/trunk/libc/sysdeps/wordsize-64/iofgetpos64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/iofgetpos64.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/iofgetpos64.c (removed)
@@ -1,1 +1,0 @@
-/* Defined in iofgetpos.c. */
Removed: fsf/trunk/libc/sysdeps/wordsize-64/iofsetpos.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/iofsetpos.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/iofsetpos.c (removed)
@@ -1,12 +1,0 @@
-#define _IO_new_fsetpos64 __renamed__IO_new_fsetpos64
-#define _IO_fsetpos64 __renamed__IO_fsetpos64
-
-#include "../../libio/iofsetpos.c"
-
-#undef _IO_new_fsetpos64
-#undef _IO_fsetpos64
-
-strong_alias (_IO_new_fsetpos, _IO_new_fsetpos64)
-strong_alias (_IO_new_fsetpos64, __new_fsetpos64)
-versioned_symbol (libc, __new_fsetpos64, fsetpos64, GLIBC_2_2);
-versioned_symbol (libc, _IO_new_fsetpos64, _IO_fsetpos64, GLIBC_2_2);
Removed: fsf/trunk/libc/sysdeps/wordsize-64/iofsetpos64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/iofsetpos64.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/iofsetpos64.c (removed)
@@ -1,1 +1,0 @@
-/* Defined in iofsetpos.c. */
Removed: fsf/trunk/libc/sysdeps/wordsize-64/lockf.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/lockf.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/lockf.c (removed)
@@ -1,3 +1,0 @@
-#include "../../io/lockf.c"
-
-weak_alias (lockf, lockf64)
Removed: fsf/trunk/libc/sysdeps/wordsize-64/lockf64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/lockf64.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/lockf64.c (removed)
@@ -1,1 +1,0 @@
-/* Defined in lockf.c. */
Removed: fsf/trunk/libc/sysdeps/wordsize-64/scandir.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/scandir.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/scandir.c (removed)
@@ -1,6 +1,0 @@
-#define scandir64 scandir64_renamed
-
-#include "../../dirent/scandir.c"
-
-#undef scandir64
-weak_alias (scandir, scandir64)
Removed: fsf/trunk/libc/sysdeps/wordsize-64/scandir64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/scandir64.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/scandir64.c (removed)
@@ -1,1 +1,0 @@
-/* Defined in scandir.c. */
Removed: fsf/trunk/libc/sysdeps/wordsize-64/scandirat.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/scandirat.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/scandirat.c (removed)
@@ -1,6 +1,0 @@
-#define scandirat64 scandirat64_renamed
-
-#include "../../dirent/scandirat.c"
-
-#undef scandirat64
-weak_alias (scandirat, scandirat64)
Removed: fsf/trunk/libc/sysdeps/wordsize-64/scandirat64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/scandirat64.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/scandirat64.c (removed)
@@ -1,1 +1,0 @@
-/* Defined in scandirat.c. */
Removed: fsf/trunk/libc/sysdeps/wordsize-64/versionsort.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/versionsort.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/versionsort.c (removed)
@@ -1,7 +1,0 @@
-#define versionsort64 rename_versionsort64
-
-#include "../../dirent/versionsort.c"
-
-#undef versionsort64
-
-weak_alias (versionsort, versionsort64)
Removed: fsf/trunk/libc/sysdeps/wordsize-64/versionsort64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/versionsort64.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/versionsort64.c (removed)
@@ -1,1 +1,0 @@
-/* Defined in versionsort.c. */
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits